From fe01450ea0edb1727e6c0dc17b0e81c5aaaa62b1 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Wed, 3 Aug 2016 20:11:30 -0400 Subject: [PATCH 0001/1115] Allow individually publishable API client libraries. --- handwritten/pubsub/package.json | 75 ++ handwritten/pubsub/src/iam.js | 257 ++++++ handwritten/pubsub/src/index.js | 621 +++++++++++++ handwritten/pubsub/src/subscription.js | 733 ++++++++++++++++ handwritten/pubsub/src/topic.js | 457 ++++++++++ handwritten/pubsub/system-test/pubsub.js | 401 +++++++++ handwritten/pubsub/test/iam.js | 182 ++++ handwritten/pubsub/test/index.js | 793 +++++++++++++++++ handwritten/pubsub/test/subscription.js | 1015 ++++++++++++++++++++++ handwritten/pubsub/test/topic.js | 305 +++++++ 10 files changed, 4839 insertions(+) create mode 100644 handwritten/pubsub/package.json create mode 100644 handwritten/pubsub/src/iam.js create mode 100644 handwritten/pubsub/src/index.js create mode 100644 handwritten/pubsub/src/subscription.js create mode 100644 handwritten/pubsub/src/topic.js create mode 100644 handwritten/pubsub/system-test/pubsub.js create mode 100644 handwritten/pubsub/test/iam.js create mode 100644 handwritten/pubsub/test/index.js create mode 100644 handwritten/pubsub/test/subscription.js create mode 100644 handwritten/pubsub/test/topic.js diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json new file mode 100644 index 00000000000..5adcef08975 --- /dev/null +++ b/handwritten/pubsub/package.json @@ -0,0 +1,75 @@ +{ + "name": "@google-cloud/pubsub", + "version": "0.0.0", + "author": "Google Inc.", + "description": "Google Cloud Pub/Sub Client Library for Node.js", + "contributors": [ + { + "name": "Burcu Dogan", + "email": "jbd@google.com" + }, + { + "name": "Johan Euphrosine", + "email": "proppy@google.com" + }, + { + "name": "Patrick Costello", + "email": "pcostell@google.com" + }, + { + "name": "Ryan Seys", + "email": "ryan@ryanseys.com" + }, + { + "name": "Silvano Luciani", + "email": "silvano@google.com" + }, + { + "name": "Stephen Sawchuk", + "email": "sawchuk@gmail.com" + } + ], + "main": "./src/index.js", + "files": [ + "./src/*", + "AUTHORS", + "CONTRIBUTORS", + "COPYING" + ], + "repository": "googlecloudplatform/gcloud-node", + "keywords": [ + "google apis client", + "google api client", + "google apis", + "google api", + "google", + "google cloud platform", + "google cloud", + "cloud", + "google pubsub", + "pubsub" + ], + "dependencies": { + "arrify": "^1.0.0", + "extend": "^3.0.0", + "@google-cloud/common": "^0.1.0", + "is": "^3.0.1", + "modelo": "^4.2.0", + "propprop": "^0.3.0" + }, + "devDependencies": { + "async": "^1.4.2", + "mocha": "^2.1.0", + "node-uuid": "^1.4.3", + "proxyquire": "^1.7.10" + }, + "scripts": { + "publish": "../../scripts/publish", + "test": "mocha test/*.js", + "system-test": "mocha system-test/*.js --no-timeouts --bail" + }, + "license": "Apache-2.0", + "engines": { + "node": ">=0.12.0" + } +} diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js new file mode 100644 index 00000000000..176bf7193cb --- /dev/null +++ b/handwritten/pubsub/src/iam.js @@ -0,0 +1,257 @@ +/*! + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/*! + * @module pubsub/iam + */ + +'use strict'; + +var arrify = require('arrify'); +var common = require('@google-cloud/common'); +var is = require('is'); +var nodeutil = require('util'); + +/** + * @type {module:common/grpc-service} + * @private + */ +var GrpcService = common.GrpcService; + +/*! Developer Documentation + * + * @param {module:pubsub} pubsub - PubSub Object. + * @param {object} config - Configuration object. + * @param {string} config.baseUrl - The base URL to apply to API requests. + * @param {string} config.id - The name of the topic or subscription. + */ +/** + * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) + * allows you to set permissions on invidual resources and offers a wider range + * of roles: editor, owner, publisher, subscriber, and viewer. This gives you + * greater flexibility and allows you to set more fine-grained access control. + * + * For example: + * * Grant access on a per-topic or per-subscription basis, rather than for + * the whole Cloud project. + * * Grant access with limited capabilities, such as to only publish messages + * to a topic, or to only to consume messages from a subscription, but not + * to delete the topic or subscription. + * + * + * *The IAM access control features described in this document are Beta, + * including the API methods to get and set IAM policies, and to test IAM + * permissions. Google Cloud Pub/Sub's use of IAM features is not covered by any + * SLA or deprecation policy, and may be subject to backward-incompatible + * changes.* + * + * @constructor + * @alias module:pubsub/iam + * + * @resource [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} + * @resource [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * + * @example + * var pubsub = gcloud.pubsub({ + * projectId: 'grape-spaceship-123', + * keyFilename: '/path/to/keyfile.json' + * }); + * + * var topic = pubsub.topic('my-topic'); + * // topic.iam + * + * var subscription = pubsub.subscription('my-subscription'); + * // subscription.iam + */ +function IAM(pubsub, id) { + var config = { + baseUrl: pubsub.defaultBaseUrl_, + service: 'iam', + apiVersion: 'v1', + scopes: [ + 'https://www.googleapis.com/auth/pubsub', + 'https://www.googleapis.com/auth/cloud-platform' + ] + }; + + this.id = id; + + GrpcService.call(this, config, pubsub.options); +} + +nodeutil.inherits(IAM, GrpcService); + +/** + * Get the IAM policy + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this request. + * @param {object} callback.policy - The [policy](https://cloud.google.com/pubsub/reference/rest/Shared.Types/Policy). + * @param {object} callback.apiResponse - The full API response. + * + * @resource [Topics: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/getIamPolicy} + * @resource [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/getIamPolicy} + * + * @example + * topic.iam.getPolicy(function(err, policy, apiResponse) {}); + * + * subscription.iam.getPolicy(function(err, policy, apiResponse) {}); + */ +IAM.prototype.getPolicy = function(callback) { + var protoOpts = { + service: 'IAMPolicy', + method: 'getIamPolicy' + }; + + var reqOpts = { + resource: this.id + }; + + this.request(protoOpts, reqOpts, callback); +}; + +/** + * Set the IAM policy + * + * @throws {Error} If no policy is provided. + * + * @param {object} policy - The [policy](https://cloud.google.com/pubsub/reference/rest/Shared.Types/Policy). + * @param {array=} policy.bindings - Bindings associate members with roles. + * @param {object[]=} policy.rules - Rules to be applied to the policy. + * @param {string=} policy.etag - Etags are used to perform a read-modify-write. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this request. + * @param {object} callback.policy - The updated policy. + * @param {object} callback.apiResponse - The full API response. + * + * @resource [Topics: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/setIamPolicy} + * @resource [Subscriptions: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/setIamPolicy} + * @resource [Policy]{@link https://cloud.google.com/pubsub/reference/rest/Shared.Types/Policy} + * + * @example + * var myPolicy = { + * bindings: [ + * { + * role: 'roles/pubsub.subscriber', + * members: ['serviceAccount:myotherproject@appspot.gserviceaccount.com'] + * } + * ] + * }; + * + * topic.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); + * + * subscription.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); + */ +IAM.prototype.setPolicy = function(policy, callback) { + if (!is.object(policy)) { + throw new Error('A policy object is required.'); + } + + var protoOpts = { + service: 'IAMPolicy', + method: 'setIamPolicy' + }; + + var reqOpts = { + resource: this.id, + policy: policy + }; + + this.request(protoOpts, reqOpts, callback); +}; + +/** + * Test a set of permissions for a resource. + * + * Permissions with wildcards such as `*` or `storage.*` are not allowed. + * + * @throws {Error} If permissions are not provided. + * + * @param {string|string[]} permissions - The permission(s) to test for. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this request. + * @param {array} callback.permissions - A subset of permissions that the caller + * is allowed + * @param {object} callback.apiResponse - The full API response. + * + * @resource [Topics: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/testIamPermissions} + * @resource [Subscriptions: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/testIamPermissions} + * @resource [Permissions Reference]{@link https://cloud.google.com/pubsub/access_control#permissions} + * + * @example + * //- + * // Test a single permission. + * //- + * var test = 'pubsub.topics.update'; + * + * topic.iam.testPermissions(test, function(err, permissions, apiResponse) { + * console.log(permissions); + * // { + * // "pubsub.topics.update": true + * // } + * }); + * + * //- + * // Test several permissions at once. + * //- + * var tests = [ + * 'pubsub.subscriptions.consume', + * 'pubsub.subscriptions.update' + * ]; + * + * subscription.iam.testPermissions(tests, function(err, permissions) { + * console.log(permissions); + * // { + * // "pubsub.subscriptions.consume": true, + * // "pubsub.subscriptions.update": false + * // } + * }); + */ +IAM.prototype.testPermissions = function(permissions, callback) { + if (!is.array(permissions) && !is.string(permissions)) { + throw new Error('Permissions are required.'); + } + + permissions = arrify(permissions); + + var protoOpts = { + service: 'IAMPolicy', + method: 'testIamPermissions' + }; + + var reqOpts = { + resource: this.id, + permissions: permissions + }; + + this.request(protoOpts, reqOpts, function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } + + var availablePermissions = arrify(resp.permissions); + + var permissionsHash = permissions.reduce(function(acc, permission) { + acc[permission] = availablePermissions.indexOf(permission) > -1; + return acc; + }, {}); + + callback(null, permissionsHash, resp); + }); +}; + +module.exports = IAM; diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js new file mode 100644 index 00000000000..f5ee4fa3a85 --- /dev/null +++ b/handwritten/pubsub/src/index.js @@ -0,0 +1,621 @@ +/*! + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/*! + * @module pubsub + */ + +'use strict'; + +var arrify = require('arrify'); +var common = require('@google-cloud/common'); +var extend = require('extend'); +var is = require('is'); +var nodeutil = require('util'); +var PKG = require('../package.json'); + +/** + * @type {module:common/grpc-service} + * @private + */ +var GrpcService = common.GrpcService; + +/** + * @type {module:pubsub/subscription} + * @private + */ +var Subscription = require('./subscription.js'); + +/** + * @type {module:common/stream-router} + * @private + */ +var streamRouter = common.streamRouter; + +/** + * @type {module:pubsub/topic} + * @private + */ +var Topic = require('./topic.js'); + +/** + * @type {module:common/util} + * @private + */ +var util = common.util; + +/** + * [Google Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a + * reliable, many-to-many, asynchronous messaging service from Google Cloud + * Platform. + * + * The `PUBSUB_EMULATOR_HOST` environment variable from the gcloud SDK is + * honored, otherwise the actual API endpoint will be used. + * + * @constructor + * @alias module:pubsub + * + * The `gcloud.pubsub` method will return a `pubsub` object, allowing you to + * create topics, publish messages, subscribe to topics, and more. + * + * To learn more about Pub/Sub, see the + * [Google Cloud Pub/Sub overview](https://developers.google.com/pubsub/overview). + * + * @param {object} options - [Configuration object](#/docs). + * + * @example + * var gcloud = require('google-cloud')({ + * keyFilename: '/path/to/keyfile.json', + * projectId: 'my-project' + * }); + * + * var pubsub = gcloud.pubsub(); + */ +function PubSub(options) { + if (!(this instanceof PubSub)) { + options = util.normalizeArguments(this, options); + return new PubSub(options); + } + + this.defaultBaseUrl_ = 'pubsub.googleapis.com'; + this.determineBaseUrl_(); + + var config = { + baseUrl: this.baseUrl_, + customEndpoint: this.customEndpoint_, + service: 'pubsub', + apiVersion: 'v1', + scopes: [ + 'https://www.googleapis.com/auth/pubsub', + 'https://www.googleapis.com/auth/cloud-platform' + ], + userAgent: PKG.name + '/' + PKG.version + }; + + this.options = options; + + GrpcService.call(this, config, options); +} + +nodeutil.inherits(PubSub, GrpcService); + +/** + * Create a topic with the given name. + * + * @resource [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/create} + * + * @param {string} name - Name of the topic. + * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {module:pubsub/topic} callback.topic - The newly created topic. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * pubsub.createTopic('my-new-topic', function(err, topic, apiResponse) { + * if (!err) { + * // The topic was created successfully. + * } + * }); + */ +PubSub.prototype.createTopic = function(name, callback) { + var self = this; + + callback = callback || util.noop; + + var protoOpts = { + service: 'Publisher', + method: 'createTopic' + }; + + var reqOpts = { + name: Topic.formatName_(this.projectId, name) + }; + + this.request(protoOpts, reqOpts, function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } + + var topic = self.topic(name); + topic.metadata = resp; + + callback(null, topic, resp); + }); +}; + +/** + * Get a list of the subscriptions registered to all of your project's topics. + * You may optionally provide a query object as the first argument to customize + * the response. + * + * Your provided callback will be invoked with an error object if an API error + * occurred or an array of {module:pubsub/subscription} objects. + * + * To get subscriptions for a topic, see {module:pubsub/topic}. + * + * @resource [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/list} + * + * @param {object=} options - Configuration object. + * @param {boolean} options.autoPaginate - Have pagination handled + * automatically. Default: true. + * @param {number} options.maxApiCalls - Maximum number of API calls to make. + * @param {number} options.maxResults - Maximum number of results to return. + * @param {number} options.pageSize - Maximum number of results to return. + * @param {string} options.pageToken - Page token. + * @param {string|module:pubsub/topic} options.topic - The name of the topic to + * list subscriptions from. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {module:pubsub/subscription[]} callback.subscriptions - The list of + * subscriptions returned. + * @param {?object} callback.nextQuery - A query object representing the next + * page of topics. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * pubsub.getSubscriptions(function(err, subscriptions) { + * if (!err) { + * // subscriptions is an array of Subscription objects. + * } + * }); + * + * //- + * // To control how many API requests are made and page through the results + * // manually, set `autoPaginate` to `false`. + * //- + * var callback = function(err, subscriptions, nextQuery, apiResponse) { + * if (nextQuery) { + * // More results exist. + * pubsub.getSubscriptions(nextQuery, callback); + * } + * }; + * + * pubsub.getSubscriptions({ + * autoPaginate: false + * }, callback); + * + * //- + * // Get the subscriptions as a readable object stream. + * //- + * pubsub.getSubscriptions() + * .on('error', console.error) + * .on('data', function(subscription) { + * // subscription is a Subscription object. + * }) + * .on('end', function() { + * // All subscriptions retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * pubsub.getSubscriptions() + * .on('data', function(topic) { + * this.end(); + * }); + */ +PubSub.prototype.getSubscriptions = function(options, callback) { + var self = this; + + if (is.fn(options)) { + callback = options; + options = {}; + } + + var protoOpts = {}; + var reqOpts = extend({}, options); + + if (options.topic) { + protoOpts = { + service: 'Publisher', + method: 'listTopicSubscriptions' + }; + + if (options.topic instanceof Topic) { + reqOpts.topic = options.topic.name; + } else { + reqOpts.topic = options.topic; + } + } else { + protoOpts = { + service: 'Subscriber', + method: 'listSubscriptions' + }; + + reqOpts.project = 'projects/' + this.projectId; + } + + this.request(protoOpts, reqOpts, function(err, resp) { + if (err) { + callback(err, null, null, resp); + return; + } + + var subscriptions = arrify(resp.subscriptions).map(function(sub) { + // Depending on if we're using a subscriptions.list or + // topics.subscriptions.list API endpoint, we will get back a + // Subscription resource or just the name of the subscription. + var subscriptionInstance = self.subscription(sub.name || sub); + + if (sub.name) { + subscriptionInstance.metadata = sub; + } + + return subscriptionInstance; + }); + + var nextQuery = null; + + if (resp.nextPageToken) { + nextQuery = options; + nextQuery.pageToken = resp.nextPageToken; + } + + callback(null, subscriptions, nextQuery, resp); + }); +}; + +/** + * Get a list of the topics registered to your project. You may optionally + * provide a query object as the first argument to customize the response. + * + * @resource [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/list} + * + * @param {object=} query - Query object. + * @param {boolean} options.autoPaginate - Have pagination handled + * automatically. Default: true. + * @param {number} options.maxApiCalls - Maximum number of API calls to make. + * @param {number} options.maxResults - Maximum number of results to return. + * @param {number} query.pageSize - Max number of results to return. + * @param {string} query.pageToken - Page token. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {module:pubsub/topic[]} callback.topics - The list of topics returned. + * @param {?object} callback.nextQuery - A query object representing the next + * page of topics. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * pubsub.getTopics(function(err, topics) { + * if (!err) { + * // topics is an array of Topic objects. + * } + * }); + * + * //- + * // Customize the query. + * //- + * pubsub.getTopics({ + * pageSize: 3 + * }, function(err, topics) {}); + * + * //- + * // To control how many API requests are made and page through the results + * // manually, set `autoPaginate` to `false`. + * //- + * var callback = function(err, rows, nextQuery, apiResponse) { + * if (nextQuery) { + * // More results exist. + * pubsub.getTopics(nextQuery, callback); + * } + * }; + * + * pubsub.getTopics({ + * autoPaginate: false + * }, callback); + * + * //- + * // Get the topics as a readable object stream. + * //- + * pubsub.getTopics() + * .on('error', console.error) + * .on('data', function(topic) { + * // topic is a Topic object. + * }) + * .on('end', function() { + * // All topics retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * pubsub.getTopics() + * .on('data', function(topic) { + * this.end(); + * }); + */ +PubSub.prototype.getTopics = function(query, callback) { + var self = this; + + if (!callback) { + callback = query; + query = {}; + } + + var protoOpts = { + service: 'Publisher', + method: 'listTopics' + }; + + var reqOpts = extend({ + project: 'projects/' + this.projectId + }, query); + + this.request(protoOpts, reqOpts, function(err, result) { + if (err) { + callback(err, null, result); + return; + } + + var topics = arrify(result.topics).map(function(topic) { + var topicInstance = self.topic(topic.name); + topicInstance.metadata = topic; + return topicInstance; + }); + + var nextQuery = null; + if (result.nextPageToken) { + nextQuery = query; + nextQuery.pageToken = result.nextPageToken; + } + + callback(null, topics, nextQuery, result); + }); +}; + +/** + * Create a subscription to a topic. You may optionally provide an object to + * customize the subscription. + * + * Your provided callback will be invoked with an error object if an API error + * occurred or a {module:pubsub/subscription} object. + * + * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/create} + * + * @throws {Error} If a Topic instance or topic name is not provided. + * @throws {Error} If a subName is not provided. + * + * @param {module:pubsub/topic|string} topic - The Topic to create a + * subscription to. + * @param {string} subName - The name of the subscription. + * @param {object=} options - See a + * [Subscription resource](https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions) + * @param {number} options.ackDeadlineSeconds - The maximum time after receiving + * a message that you must ack a message before it is redelivered. + * @param {boolean} options.autoAck - Automatically acknowledge the message once + * it's pulled. (default: false) + * @param {string} options.encoding - When pulling for messages, this type is + * used when converting a message's data to a string. (default: 'utf-8') + * @param {number} options.interval - Interval in milliseconds to check for new + * messages. (default: 10) + * @param {number} options.maxInProgress - Maximum messages to consume + * simultaneously. + * @param {boolean} options.reuseExisting - If the subscription already exists, + * reuse it. The options of the existing subscription are not changed. If + * false, attempting to create a subscription that already exists will fail. + * (default: false) + * @param {number} options.timeout - Set a maximum amount of time in + * milliseconds on an HTTP request to pull new messages to wait for a + * response before the connection is broken. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this request + * @param {module:pubsub/subscription} callback.subscription - The subscription. + * @param {object} callback.apiResponse - The full API response. + * + * @example + * //- + * // Subscribe to a topic. (Also see {module:pubsub/topic#subscribe}). + * //- + * var topic = 'messageCenter'; + * var name = 'newMessages'; + * + * pubsub.subscribe(topic, name, function(err, subscription, apiResponse) {}); + * + * //- + * // Customize the subscription. + * //- + * pubsub.subscribe(topic, name, { + * ackDeadlineSeconds: 90, + * autoAck: true, + * interval: 30 + * }, function(err, subscription, apiResponse) {}); + * + * //- + * // Create a subscription to a topic from another project. + * //- + * var anotherProject = gcloud.pubsub({ + * projectId: 'another-project' + * }); + * + * var topic = anotherProject.topic('messageCenter'); + * + * pubsub.subscribe(topic, name, function(err, subscription, apiResponse) {}); + */ +PubSub.prototype.subscribe = function(topic, subName, options, callback) { + if (!is.string(topic) && !(topic instanceof Topic)) { + throw new Error('A Topic is required for a new subscription.'); + } + + if (!is.string(subName)) { + throw new Error('A subscription name is required for a new subscription.'); + } + + if (!callback) { + callback = options; + options = {}; + } + + options = options || {}; + + if (is.string(topic)) { + topic = this.topic(topic); + } + + var subscription = this.subscription(subName, options); + + var protoOpts = { + service: 'Subscriber', + method: 'createSubscription', + timeout: options.timeout + }; + + var reqOpts = extend(true, {}, options, { + topic: topic.name, + name: subscription.name + }); + + delete reqOpts.autoAck; + delete reqOpts.encoding; + delete reqOpts.interval; + delete reqOpts.maxInProgress; + delete reqOpts.reuseExisting; + delete reqOpts.timeout; + + this.request(protoOpts, reqOpts, function(err, resp) { + if (err && !(err.code === 409 && options.reuseExisting)) { + callback(err, null, resp); + return; + } + + callback(null, subscription, resp); + }); +}; + +/** + * Create a Subscription object. This command by itself will not run any API + * requests. You will receive a {module:pubsub/subscription} object, + * which will allow you to interact with a subscription. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name - The name of the subscription. + * @param {object=} options - Configuration object. + * @param {boolean} options.autoAck - Automatically acknowledge the message once + * it's pulled. (default: false) + * @param {string} options.encoding - When pulling for messages, this type is + * used when converting a message's data to a string. (default: 'utf-8') + * @param {number} options.interval - Interval in milliseconds to check for new + * messages. (default: 10) + * @param {number} options.maxInProgress - Maximum messages to consume + * simultaneously. + * @param {number} options.timeout - Set a maximum amount of time in + * milliseconds on an HTTP request to pull new messages to wait for a + * response before the connection is broken. + * @return {module:pubsub/subscription} + * + * @example + * var subscription = pubsub.subscription('my-subscription'); + * + * // Register a listener for `message` events. + * subscription.on('message', function(message) { + * // Called every time a message is received. + * // message.id = ID used to acknowledge its receival. + * // message.data = Contents of the message. + * // message.attributes = Attributes of the message. + * }); + */ +PubSub.prototype.subscription = function(name, options) { + if (!name) { + throw new Error('The name of a subscription is required.'); + } + + options = options || {}; + options.name = name; + return new Subscription(this, options); +}; + +/** + * Create a Topic object. See {module:pubsub/createTopic} to create a topic. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name - The name of the topic. + * @return {module:pubsub/topic} + * + * @example + * var topic = pubsub.topic('my-topic'); + * + * topic.publish({ + * data: 'New message!' + * }, function(err) {}); + */ +PubSub.prototype.topic = function(name) { + if (!name) { + throw new Error('A name must be specified for a new topic.'); + } + + return new Topic(this, name); +}; + +/** + * Determine the appropriate endpoint to use for API requests, first trying the + * local Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise + * the default JSON API. + * + * @private + */ +PubSub.prototype.determineBaseUrl_ = function() { + var baseUrl = this.defaultBaseUrl_; + var leadingProtocol = new RegExp('^https*://'); + var trailingSlashes = new RegExp('/*$'); + + if (process.env.PUBSUB_EMULATOR_HOST) { + this.customEndpoint_ = true; + baseUrl = process.env.PUBSUB_EMULATOR_HOST; + } + + this.baseUrl_ = baseUrl + .replace(leadingProtocol, '') + .replace(trailingSlashes, ''); +}; + +/*! Developer Documentation + * + * These methods can be used with either a callback or as a readable object + * stream. `streamRouter` is used to add this dual behavior. + */ +streamRouter.extend(PubSub, ['getSubscriptions', 'getTopics']); + +PubSub.Subscription = Subscription; +PubSub.Topic = Topic; + +module.exports = PubSub; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js new file mode 100644 index 00000000000..53a321c9a08 --- /dev/null +++ b/handwritten/pubsub/src/subscription.js @@ -0,0 +1,733 @@ +/*! + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/*! + * @module pubsub/subscription + */ + +'use strict'; + +var arrify = require('arrify'); +var common = require('@google-cloud/common'); +var events = require('events'); +var is = require('is'); +var modelo = require('modelo'); +var prop = require('propprop'); + +/** + * @type {module:common/grpc-service-object} + * @private + */ +var GrpcServiceObject = common.GrpcServiceObject; + +/** + * @type {module:pubsub/iam} + * @private + */ +var IAM = require('./iam.js'); + +/** + * @type {module:common/util} + * @private + */ +var util = common.util; + +/** + * @const {number} - The amount of time a subscription pull HTTP connection to + * Pub/Sub stays open. + * @private + */ +var PUBSUB_API_TIMEOUT = 90000; + +/*! Developer Documentation + * + * @param {module:pubsub} pubsub - PubSub object. + * @param {object} options - Configuration object. + * @param {boolean} options.autoAck - Automatically acknowledge the message once + * it's pulled. (default: false) + * @param {string} options.encoding - When pulling for messages, this type is + * used when converting a message's data to a string. (default: 'utf-8') + * @param {number} options.interval - Interval in milliseconds to check for new + * messages. (default: 10) + * @param {string} options.name - Name of the subscription. + * @param {number} options.maxInProgress - Maximum messages to consume + * simultaneously. + * @param {number} options.timeout - Set a maximum amount of time in + * milliseconds on an HTTP request to pull new messages to wait for a + * response before the connection is broken. (default: 90000) + */ +/** + * A Subscription object will give you access to your Google Cloud Pub/Sub + * subscription. + * + * Subscriptions are sometimes retrieved when using various methods: + * + * - {module:pubsub#getSubscriptions} + * - {module:pubsub/topic#getSubscriptions} + * - {module:pubsub/topic#subscribe} + * + * Subscription objects may be created directly with: + * + * - {module:pubsub/topic#subscription} + * + * All Subscription objects are instances of an + * [EventEmitter](http://nodejs.org/api/events.html). The subscription will pull + * for messages automatically as long as there is at least one listener assigned + * for the `message` event. + * + * @alias module:pubsub/subscription + * @constructor + * + * @example + * var gcloud = require('google-cloud'); + * var pubsub = gcloud.pubsub({ + * projectId: 'grape-spaceship-123' + * }); + * + * //- + * // From {module:pubsub#getSubscriptions}: + * //- + * pubsub.getSubscriptions(function(err, subscriptions) { + * // `subscriptions` is an array of Subscription objects. + * }); + * + * //- + * // From {module:pubsub/topic#getSubscriptions}: + * //- + * var topic = pubsub.topic('my-topic'); + * topic.getSubscriptions(function(err, subscriptions) { + * // `subscriptions` is an array of Subscription objects. + * }); + * + * //- + * // From {module:pubsub/topic#subscribe}: + * //- + * var topic = pubsub.topic('my-topic'); + * topic.subscribe('new-subscription', function(err, subscription) { + * // `subscription` is a Subscription object. + * }); + * + * //- + * // From {module:pubsub/topic#subscription}: + * //- + * var topic = pubsub.topic('my-topic'); + * var subscription = topic.subscription('my-subscription'); + * // `subscription` is a Subscription object. + * + * //- + * // Once you have obtained a subscription object, you may begin to register + * // listeners. This will automatically trigger pulling for messages. + * //- + * + * // Register an error handler. + * subscription.on('error', function(err) {}); + * + * // Register a listener for `message` events. + * function onMessage(message) { + * // Called every time a message is received. + * + * // message.id = ID of the message. + * // message.ackId = ID used to acknowledge the message receival. + * // message.data = Contents of the message. + * + * // Ack the message: + * // message.ack(callback); + * + * // Skip the message. This is useful with `maxInProgress` option when + * // creating your subscription. This doesn't ack the message, but allows + * // more messages to be retrieved if your limit was hit. + * // message.skip(); + * } + * subscription.on('message', onMessage); + * + * // Remove the listener from receiving `message` events. + * subscription.removeListener('message', onMessage); + */ +function Subscription(pubsub, options) { + this.name = Subscription.formatName_(pubsub.projectId, options.name); + + var methods = { + /** + * Check if the subscription exists. + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {boolean} callback.exists - Whether the subscription exists or + * not. + * + * @example + * subscription.exists(function(err, exists) {}); + */ + exists: true, + + /** + * Get a subscription if it exists. + * + * You may optionally use this to "get or create" an object by providing an + * object with `autoCreate` set to `true`. Any extra configuration that is + * normally required for the `create` method must be contained within this + * object as well. + * + * **`autoCreate` is only available if you accessed this object + * through {module:pubsub/topic#subscription}.** + * + * @param {options=} options - Configuration object. + * @param {boolean} options.autoCreate - Automatically create the object if + * it does not exist. Default: `false` + * + * @example + * subscription.get(function(err, subscription, apiResponse) { + * // `subscription.metadata` has been populated. + * }); + */ + get: true, + + /** + * Get the metadata for the subscription. + * + * @resource [Subscriptions: get API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/get} + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {?object} callback.metadata - Metadata of the subscription from + * the API. + * @param {object} callback.apiResponse - Raw API response. + * + * @example + * subscription.getMetadata(function(err, metadata, apiResponse) {}); + */ + getMetadata: { + protoOpts: { + service: 'Subscriber', + method: 'getSubscription' + }, + reqOpts: { + subscription: this.name + } + } + }; + + var config = { + parent: pubsub, + id: this.name, + methods: methods + }; + + if (options.topic) { + // Only a subscription with knowledge of its topic can be created. + config.createMethod = pubsub.subscribe.bind(pubsub, options.topic); + delete options.topic; + + /** + * Create a subscription. + * + * **This is only available if you accessed this object through + * {module:pubsub/topic#subscription}.** + * + * @param {object} config - See {module:pubsub#subscribe}. + * + * @example + * subscription.create(function(err, subscription, apiResponse) { + * if (!err) { + * // The subscription was created successfully. + * } + * }); + */ + config.methods.create = true; + } + + GrpcServiceObject.call(this, config); + events.EventEmitter.call(this); + + this.autoAck = is.boolean(options.autoAck) ? options.autoAck : false; + this.closed = true; + this.encoding = options.encoding || 'utf-8'; + this.inProgressAckIds = {}; + this.interval = is.number(options.interval) ? options.interval : 10; + this.maxInProgress = + is.number(options.maxInProgress) ? options.maxInProgress : Infinity; + this.messageListeners = 0; + this.paused = false; + + if (is.number(options.timeout)) { + this.timeout = options.timeout; + } else { + // The default timeout used in gcloud-node is 60s, but a pull request times + // out around 90 seconds. Allow an extra couple of seconds to give the API a + // chance to respond on its own before terminating the connection. + this.timeout = PUBSUB_API_TIMEOUT + 2000; + } + + /** + * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) + * allows you to set permissions on individual resources and offers a wider + * range of roles: editor, owner, publisher, subscriber, and viewer. This + * gives you greater flexibility and allows you to set more fine-grained + * access control. + * + * *The IAM access control features described in this document are Beta, + * including the API methods to get and set IAM policies, and to test IAM + * permissions. Google Cloud Pub/Sub's use of IAM features is not covered by + * any SLA or deprecation policy, and may be subject to backward-incompatible + * changes.* + * + * @mixes module:pubsub/iam + * + * @resource [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} + * @resource [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * + * @example + * //- + * // Get the IAM policy for your subscription. + * //- + * subscription.iam.getPolicy(function(err, policy) { + * console.log(policy); + * }); + */ + this.iam = new IAM(pubsub, this.name); + + this.listenForEvents_(); +} + +modelo.inherits(Subscription, GrpcServiceObject, events.EventEmitter); + +/** + * Simplify a message from an API response to have three properties, `id`, + * `data` and `attributes`. `data` is always converted to a string. + * + * @private + */ +Subscription.formatMessage_ = function(msg, encoding) { + var innerMessage = msg.message; + var message = { + ackId: msg.ackId + }; + + if (innerMessage) { + message.id = innerMessage.messageId; + + if (innerMessage.data) { + message.data = new Buffer(innerMessage.data, 'base64').toString(encoding); + + try { + message.data = JSON.parse(message.data); + } catch(e) {} + } + + if (innerMessage.attributes) { + message.attributes = innerMessage.attributes; + } + } + + return message; +}; + +/** + * Format the name of a subscription. A subscription's full name is in the + * format of projects/{projectId}/subscriptions/{subName}. + * + * @private + */ +Subscription.formatName_ = function(projectId, name) { + // Simple check if the name is already formatted. + if (name.indexOf('/') > -1) { + return name; + } + + return 'projects/' + projectId + '/subscriptions/' + name; +}; + +/** + * Acknowledge to the backend that the message was retrieved. You must provide + * either a single ackId or an array of ackIds. + * + * @resource [Subscriptions: acknowledge API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/acknowledge} + * + * @throws {Error} If at least one ackId is not provided. + * + * @param {string|string[]} ackIds - An ackId or array of ackIds. + * @param {function=} callback - The callback function. + * + * @example + * subscription.ack('ePHEESyhuE8e...', function(err, apiResponse) {}); + */ +Subscription.prototype.ack = function(ackIds, callback) { + var self = this; + + ackIds = arrify(ackIds); + + if (ackIds.length === 0) { + throw new Error([ + 'At least one ID must be specified before it can be acknowledged.' + ].join('')); + } + + callback = callback || util.noop; + + var protoOpts = { + service: 'Subscriber', + method: 'acknowledge' + }; + + var reqOpts = { + subscription: this.name, + ackIds: ackIds + }; + + this.request(protoOpts, reqOpts, function(err, resp) { + if (!err) { + ackIds.forEach(function(ackId) { + delete self.inProgressAckIds[ackId]; + }); + + self.refreshPausedStatus_(); + } + + callback(err, resp); + }); +}; + +/** + * Add functionality on top of a message returned from the API, including the + * ability to `ack` and `skip` the message. + * + * This also records the message as being "in progress". See + * {module:subscription#refreshPausedStatus_}. + * + * @private + * + * @param {object} message - A message object. + * @return {object} message - The original message after being decorated. + * @param {function} message.ack - Ack the message. + * @param {function} message.skip - Increate the number of available messages to + * simultaneously receive. + */ +Subscription.prototype.decorateMessage_ = function(message) { + var self = this; + + this.inProgressAckIds[message.ackId] = true; + + message.ack = self.ack.bind(self, message.ackId); + + message.skip = function() { + delete self.inProgressAckIds[message.ackId]; + self.refreshPausedStatus_(); + }; + + return message; +}; + +/** + * Delete the subscription. Pull requests from the current subscription will be + * errored once unsubscription is complete. + * + * @resource [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/delete} + * + * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {object} callback.apiResponse - Raw API response. + * + * @example + * subscription.delete(function(err, apiResponse) {}); + */ +Subscription.prototype.delete = function(callback) { + var self = this; + + callback = callback || util.noop; + + var protoOpts = { + service: 'Subscriber', + method: 'deleteSubscription' + }; + + var reqOpts = { + subscription: this.name + }; + + this.request(protoOpts, reqOpts, function(err, resp) { + if (err) { + callback(err, resp); + return; + } + + self.closed = true; + self.removeAllListeners(); + + callback(null, resp); + }); +}; + +/** + * Pull messages from the subscribed topic. If messages were found, your + * callback is executed with an array of message objects. + * + * Note that messages are pulled automatically once you register your first + * event listener to the subscription, thus the call to `pull` is handled for + * you. If you don't want to start pulling, simply don't register a + * `subscription.on('message', function() {})` event handler. + * + * @todo Should not be racing with other pull. + * + * @resource [Subscriptions: pull API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/pull} + * + * @param {object=} options - Configuration object. + * @param {number} options.maxResults - Limit the amount of messages pulled. + * @param {boolean} options.returnImmediately - If set, the system will respond + * immediately. Otherwise, wait until new messages are available. Returns if + * timeout is reached. + * @param {function} callback - The callback function. + * + * @example + * //- + * // Pull all available messages. + * //- + * subscription.pull(function(err, messages) { + * // messages = [ + * // { + * // ackId: '', // ID used to acknowledge its receival. + * // id: '', // Unique message ID. + * // data: '', // Contents of the message. + * // attributes: {} // Attributes of the message. + * // + * // Helper functions: + * // ack(callback): // Ack the message. + * // skip(): // Free up 1 slot on the sub's maxInProgress value. + * // }, + * // // ... + * // ] + * }); + * + * //- + * // Pull a single message. + * //- + * var opts = { + * maxResults: 1 + * }; + * + * subscription.pull(opts, function(err, messages, apiResponse) {}); + */ +Subscription.prototype.pull = function(options, callback) { + var self = this; + var MAX_EVENTS_LIMIT = 1000; + + if (!callback) { + callback = options; + options = {}; + } + + if (!is.number(options.maxResults)) { + options.maxResults = MAX_EVENTS_LIMIT; + } + + var protoOpts = { + service: 'Subscriber', + method: 'pull', + timeout: this.timeout + }; + + var reqOpts = { + subscription: this.name, + returnImmediately: !!options.returnImmediately, + maxMessages: options.maxResults + }; + + this.activeRequest_ = this.request(protoOpts, reqOpts, function(err, resp) { + self.activeRequest_ = null; + + if (err) { + if (err.code === 504) { + // Simulate a server timeout where no messages were received. + resp = { + receivedMessages: [] + }; + } else { + callback(err, null, resp); + return; + } + } + + var messages = arrify(resp.receivedMessages) + .map(function(msg) { + return Subscription.formatMessage_(msg, self.encoding); + }) + .map(self.decorateMessage_.bind(self)); + + self.refreshPausedStatus_(); + + if (self.autoAck && messages.length !== 0) { + var ackIds = messages.map(prop('ackId')); + + self.ack(ackIds, function(err) { + callback(err, messages, resp); + }); + } else { + callback(null, messages, resp); + } + }); +}; + +/** + * Modify the ack deadline for a specific message. This method is useful to + * indicate that more time is needed to process a message by the subscriber, or + * to make the message available for redelivery if the processing was + * interrupted. + * + * @resource [Subscriptions: modifyAckDeadline API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/modifyAckDeadline} + * + * @param {object} options - The configuration object. + * @param {string|string[]} options.ackIds - The ack id(s) to change. + * @param {number} options.seconds - Number of seconds after call is made to + * set the deadline of the ack. + * @param {Function=} callback - The callback function. + * + * @example + * var options = { + * ackIds: ['abc'], + * seconds: 10 // Expire in 10 seconds from call. + * }; + * + * subscription.setAckDeadline(options, function(err, apiResponse) {}); + */ +Subscription.prototype.setAckDeadline = function(options, callback) { + callback = callback || util.noop; + + var protoOpts = { + service: 'Subscriber', + method: 'modifyAckDeadline' + }; + + var reqOpts = { + subscription: this.name, + ackIds: arrify(options.ackIds), + ackDeadlineSeconds: options.seconds + }; + + this.request(protoOpts, reqOpts, function(err, resp) { + callback(err, resp); + }); +}; + +/** + * Begin listening for events on the subscription. This method keeps track of + * how many message listeners are assigned, and then removed, making sure + * polling is handled automatically. + * + * As long as there is one active message listener, the connection is open. As + * soon as there are no more message listeners, the connection is closed. + * + * @private + * + * @example + * subscription.listenForEvents_(); + */ +Subscription.prototype.listenForEvents_ = function() { + var self = this; + + this.on('newListener', function(event) { + if (event === 'message') { + self.messageListeners++; + if (self.closed) { + self.closed = false; + self.startPulling_(); + } + } + }); + + this.on('removeListener', function(event) { + if (event === 'message' && --self.messageListeners === 0) { + self.closed = true; + + if (self.activeRequest_ && self.activeRequest_.cancel) { + self.activeRequest_.cancel(); + } + } + }); +}; + +/** + * Update the status of `maxInProgress`. Å subscription becomes "paused" (not + * pulling) when the number of messages that have yet to be ack'd or skipped + * exceeds the user's specified `maxInProgress` value. + * + * This will start pulling when that event reverses: we were paused, but one or + * more messages were just ack'd or skipped, freeing up room for more messages + * to be consumed. + * + * @private + */ +Subscription.prototype.refreshPausedStatus_ = function() { + var isCurrentlyPaused = this.paused; + var inProgress = Object.keys(this.inProgressAckIds).length; + + this.paused = inProgress >= this.maxInProgress; + + if (isCurrentlyPaused && !this.paused && this.messageListeners > 0) { + this.startPulling_(); + } +}; + +/** + * Poll the backend for new messages. This runs a loop to ping the API at the + * provided interval from the subscription's instantiation. If one wasn't + * provided, the default value is 10 milliseconds. + * + * If messages are received, they are emitted on the `message` event. + * + * Note: This method is automatically called once a message event handler is + * assigned to the description. + * + * To stop pulling, see {module:pubsub/subscription#close}. + * + * @private + * + * @example + * subscription.startPulling_(); + */ +Subscription.prototype.startPulling_ = function() { + var self = this; + + if (this.closed || this.paused) { + return; + } + + var maxResults; + + if (this.maxInProgress < Infinity) { + maxResults = this.maxInProgress - Object.keys(this.inProgressAckIds).length; + } + + this.pull({ + returnImmediately: false, + maxResults: maxResults + }, function(err, messages, apiResponse) { + if (err) { + self.emit('error', err, apiResponse); + } + + if (messages) { + messages.forEach(function(message) { + self.emit('message', message, apiResponse); + }); + } + + setTimeout(self.startPulling_.bind(self), self.interval); + }); +}; + +module.exports = Subscription; diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js new file mode 100644 index 00000000000..155616c8e7b --- /dev/null +++ b/handwritten/pubsub/src/topic.js @@ -0,0 +1,457 @@ +/*! + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/*! + * @module pubsub/topic + */ + +'use strict'; + +var arrify = require('arrify'); +var common = require('@google-cloud/common'); +var is = require('is'); +var nodeutil = require('util'); +var prop = require('propprop'); + +/** + * @type {module:common/util} + * @private + */ +var util = common.util; + +/** + * @type {module:pubsub/iam} + * @private + */ +var IAM = require('./iam.js'); + +/** + * @type {module:common/grpc-service-object} + * @private + */ +var GrpcServiceObject = common.GrpcServiceObject; + +/*! Developer Documentation + * + * @param {module:pubsub} pubsub - PubSub object. + * @param {string} name - Name of the topic. + */ +/** + * A Topic object allows you to interact with a Google Cloud Pub/Sub topic. + * + * @constructor + * @alias module:pubsub/topic + * + * @example + * var gcloud = require('google-cloud'); + * var pubsub = gcloud.pubsub({ + * projectId: 'grape-spaceship-123' + * }); + * + * var topic = pubsub.topic('my-topic'); + */ +function Topic(pubsub, name) { + this.name = Topic.formatName_(pubsub.projectId, name); + this.pubsub = pubsub; + + var methods = { + /** + * Create a topic. + * + * @param {object=} config - See {module:pubsub#createTopic}. + * + * @example + * topic.create(function(err, topic, apiResponse) { + * if (!err) { + * // The topic was created successfully. + * } + * }); + */ + create: true, + + /** + * Delete the topic. This will not delete subscriptions to this topic. + * + * @resource [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/delete} + * + * @param {function=} callback - The callback function. + * + * @example + * topic.delete(function(err, apiResponse) {}); + */ + delete: { + protoOpts: { + service: 'Publisher', + method: 'deleteTopic' + }, + reqOpts: { + topic: this.name + } + }, + + /** + * Check if the topic exists. + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {boolean} callback.exists - Whether the topic exists or not. + * + * @example + * topic.exists(function(err, exists) {}); + */ + exists: true, + + /** + * Get a topic if it exists. + * + * You may optionally use this to "get or create" an object by providing an + * object with `autoCreate` set to `true`. Any extra configuration that is + * normally required for the `create` method must be contained within this + * object as well. + * + * @param {options=} options - Configuration object. + * @param {boolean} options.autoCreate - Automatically create the object if + * it does not exist. Default: `false` + * + * @example + * topic.get(function(err, topic, apiResponse) { + * // `topic.metadata` has been populated. + * }); + */ + get: true, + + /** + * Get the official representation of this topic from the API. + * + * @resource [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/get} + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {object} callback.metadata - The metadata of the Topic. + * @param {object} callback.apiResponse - The full API response. + */ + getMetadata: { + protoOpts: { + service: 'Publisher', + method: 'getTopic' + }, + reqOpts: { + topic: this.name + } + } + }; + + GrpcServiceObject.call(this, { + parent: pubsub, + id: this.name, + createMethod: pubsub.createTopic.bind(pubsub), + methods: methods + }); + + /** + * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) + * allows you to set permissions on individual resources and offers a wider + * range of roles: editor, owner, publisher, subscriber, and viewer. This + * gives you greater flexibility and allows you to set more fine-grained + * access control. + * + * *The IAM access control features described in this document are Beta, + * including the API methods to get and set IAM policies, and to test IAM + * permissions. Google Cloud Pub/Sub's use of IAM features is not covered by + * any SLA or deprecation policy, and may be subject to backward-incompatible + * changes.* + * + * @mixes module:pubsub/iam + * + * @resource [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} + * @resource [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * + * @example + * //- + * // Get the IAM policy for your topic. + * //- + * topic.iam.getPolicy(function(err, policy) { + * console.log(policy); + * }); + */ + this.iam = new IAM(pubsub, this.name); +} + +nodeutil.inherits(Topic, GrpcServiceObject); + +/** + * Format a message object as the upstream API expects it. + * + * @private + * + * @return {object} + */ +Topic.formatMessage_ = function(message) { + if (!(message.data instanceof Buffer)) { + message.data = new Buffer(JSON.stringify(message.data)); + } + + message.data = message.data.toString('base64'); + + return message; +}; + +/** + * Format the name of a topic. A Topic's full name is in the format of + * 'projects/{projectId}/topics/{topicName}'. + * + * @private + * + * @return {string} + */ +Topic.formatName_ = function(projectId, name) { + // Simple check if the name is already formatted. + if (name.indexOf('/') > -1) { + return name; + } + return 'projects/' + projectId + '/topics/' + name; +}; + +/** + * Get a list of the subscriptions registered to this topic. You may optionally + * provide a query object as the first argument to customize the response. + * + * Your provided callback will be invoked with an error object if an API error + * occurred or an array of {module:pubsub/subscription} objects. + * + * @resource [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics.subscriptions/list} + * + * @param {object=} options - Configuration object. + * @param {boolean} options.autoPaginate - Have pagination handled + * automatically. Default: true. + * @param {number} options.maxApiCalls - Maximum number of API calls to make. + * @param {number} options.maxResults - Maximum number of results to return. + * @param {number} options.pageSize - Maximum number of results to return. + * @param {string} options.pageToken - Page token. + * @param {function} callback - The callback function. + * + * @example + * var callback = function(err, subscriptions, nextQuery, apiResponse) { + * // If `nextQuery` is non-null, there may be more results to fetch. To do + * // so, run `topic.getSubscriptions(nextQuery, callback);`. + * }; + * + * // Get all subscriptions for this topic. + * topic.getSubscriptions(callback); + * + * // Customize the query. + * topic.getSubscriptions({ + * pageSize: 3 + * }, callback); + * + * //- + * // Get the subscriptions for this topic as a readable object stream. + * //- + * topic.getSubscriptions() + * .on('error', console.error) + * .on('data', function(subscription) { + * // subscription is a Subscription object. + * }) + * .on('end', function() { + * // All subscriptions retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * topic.getSubscriptions() + * .on('data', function(subscription) { + * this.end(); + * }); + */ +Topic.prototype.getSubscriptions = function(options, callback) { + if (is.fn(options)) { + callback = options; + options = {}; + } + + options = options || {}; + options.topic = this; + + return this.pubsub.getSubscriptions(options, callback); +}; + +/** + * Publish the provided message or array of messages. On success, an array of + * messageIds is returned in the response. + * + * @resource [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/publish} + * + * @throws {Error} If no message is provided. + * @throws {Error} If a message is missing a data property. + * + * @param {object|object[]} message - The message(s) to publish. + * @param {*} message.data - The contents of the message. + * @param {array=} message.attributes - Key/value pair of attributes to apply to + * the message. All values must be strings. + * @param {function=} callback - The callback function. + * + * @example + * topic.publish({ + * data: 'Hello, world!' + * }, function(err, messageIds, apiResponse) {}); + * + * //- + * // The data property can be a JSON object as well. + * //- + * var registerMessage = { + * data: { + * userId: 3, + * name: 'Stephen', + * event: 'new user' + * }, + * attributes: { + * key: 'value', + * hello: 'world' + * } + * }; + * + * topic.publish(registerMessage, function(err, messageIds, apiResponse) {}); + * + * //- + * // You can publish a batch of messages at once by supplying an array. + * //- + * var purchaseMessage = { + * data: { + * userId: 3, + * product: 'computer', + * event: 'purchase' + * } + * }; + * + * topic.publish([ + * registerMessage, + * purchaseMessage + * ], function(err, messageIds, apiResponse) {}); + */ +Topic.prototype.publish = function(messages, callback) { + messages = arrify(messages); + + if (messages.length === 0) { + throw new Error('Cannot publish without a message.'); + } + + if (!messages.every(prop('data'))) { + throw new Error('Cannot publish message without a `data` property.'); + } + + callback = callback || util.noop; + + var protoOpts = { + service: 'Publisher', + method: 'publish', + }; + + var reqOpts = { + topic: this.name, + messages: messages.map(Topic.formatMessage_) + }; + + this.request(protoOpts, reqOpts, function(err, result) { + if (err) { + callback(err, null, result); + return; + } + + callback(null, arrify(result.messageIds), result); + }); +}; + +/** + * Create a subscription to this topic. You may optionally provide an object to + * customize the subscription. + * + * Your provided callback will be invoked with an error object if an API error + * occurred or a {module:pubsub/subscription} object. + * + * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/create} + * + * @param {string} subName - The name of the subscription. + * @param {object=} options - Configuration object. + * @param {number=} options.ackDeadlineSeconds - The maximum time after + * receiving a message that you must ack a message before it is redelivered. + * @param {boolean=} options.autoAck - Automatically acknowledge the message + * once it's pulled. (default: false) + * @param {string} options.encoding - When pulling for messages, this type is + * used when converting a message's data to a string. (default: 'utf-8') + * @param {number=} options.interval - Interval in milliseconds to check for new + * messages. (default: 10) + * @param {number} options.maxInProgress - Maximum messages to consume + * simultaneously. + * @param {boolean=} options.reuseExisting - If the subscription already exists, + * reuse it. The options of the existing subscription are not changed. If + * false, attempting to create a subscription that already exists will fail. + * (default: false) + * @param {number} options.timeout - Set a maximum amount of time in + * milliseconds on an HTTP request to pull new messages to wait for a + * response before the connection is broken. + * @param {function} callback - The callback function. + * + * @example + * // Without specifying any options. + * topic.subscribe('newMessages', function(err, subscription, apiResponse) {}); + * + * // With options. + * topic.subscribe('newMessages', { + * ackDeadlineSeconds: 90, + * autoAck: true, + * interval: 30 + * }, function(err, subscription, apiResponse) {}); + */ +Topic.prototype.subscribe = function(subName, options, callback) { + this.pubsub.subscribe(this, subName, options, callback); +}; + +/** + * Create a Subscription object. This command by itself will not run any API + * requests. You will receive a {module:pubsub/subscription} object, + * which will allow you to interact with a subscription. + * + * @param {string} name - Name of the subscription. + * @param {object=} options - Configuration object. + * @param {boolean=} options.autoAck - Automatically acknowledge the message + * once it's pulled. + * @param {number=} options.interval - Interval in milliseconds to check for new + * messages. + * @return {module:pubsub/subscription} + * + * @example + * var subscription = topic.subscription('my-subscription'); + * + * // Register a listener for `message` events. + * subscription.on('message', function(message) { + * // Called every time a message is received. + * // message.id = ID used to acknowledge its receival. + * // message.data = Contents of the message. + * // message.attributes = Attributes of the message. + * }); + */ +Topic.prototype.subscription = function(name, options) { + options = options || {}; + options.topic = this; + + return this.pubsub.subscription(name, options); +}; + +module.exports = Topic; diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js new file mode 100644 index 00000000000..de9d371f631 --- /dev/null +++ b/handwritten/pubsub/system-test/pubsub.js @@ -0,0 +1,401 @@ +/** + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); +var async = require('async'); +var uuid = require('node-uuid'); + +var env = require('../../../system-test/env.js'); +var Subscription = require('../src/subscription.js'); +var pubsub = require('../')(env); + +function generateTopicName() { + return 'test-topic-' + uuid.v4(); +} + +function generateSubName() { + return 'test-subscription-' + uuid.v4(); +} + +describe('pubsub', function() { + var TOPIC_NAMES = [ + generateTopicName(), + generateTopicName(), + generateTopicName() + ]; + + var TOPICS = [ + pubsub.topic(TOPIC_NAMES[0]), + pubsub.topic(TOPIC_NAMES[1]), + pubsub.topic(TOPIC_NAMES[2]) + ]; + + var TOPIC_FULL_NAMES = [ + TOPICS[0].name, + TOPICS[1].name, + TOPICS[2].name + ]; + + before(function(done) { + // create all needed topics + async.each(TOPICS, function(topic, cb) { + topic.create(cb); + }, done); + }); + + after(function(done) { + // Delete topics + async.each(TOPICS, function(topic, callback) { + topic.delete(callback); + }, done); + }); + + describe('Topic', function() { + it('should be listed', function(done) { + pubsub.getTopics(function(err, topics) { + assert.ifError(err); + + var results = topics.filter(function(topic) { + return TOPIC_FULL_NAMES.indexOf(topic.name) !== -1; + }); + + // get all topics in list of known names + assert.equal(results.length, TOPIC_NAMES.length); + done(); + }); + }); + + it('should list topics in a stream', function(done) { + var topicsEmitted = []; + + pubsub.getTopics() + .on('error', done) + .on('data', function(topic) { + topicsEmitted.push(topic); + }) + .on('end', function() { + var results = topicsEmitted.filter(function(topic) { + return TOPIC_FULL_NAMES.indexOf(topic.name) !== -1; + }); + + assert.equal(results.length, TOPIC_NAMES.length); + done(); + }); + }); + + it('should allow manual paging', function(done) { + pubsub.getTopics({ + pageSize: TOPIC_NAMES.length - 1 + }, function(err, topics, nextQuery) { + assert.ifError(err); + assert(topics.length, TOPIC_NAMES.length - 1); + assert(nextQuery.pageSize, TOPIC_NAMES.length - 1); + assert(!!nextQuery.pageToken, true); + done(); + }); + }); + + it('should be created and deleted', function(done) { + var TOPIC_NAME = generateTopicName(); + pubsub.createTopic(TOPIC_NAME, function(err) { + assert.ifError(err); + pubsub.topic(TOPIC_NAME).delete(done); + }); + }); + + it('should publish a message', function(done) { + var topic = pubsub.topic(TOPIC_NAMES[0]); + topic.publish({ data: 'message from me' }, function(err, messageIds) { + assert.ifError(err); + assert.equal(messageIds.length, 1); + done(); + }); + }); + + it('should get the metadata of a topic', function(done) { + var topic = pubsub.topic(TOPIC_NAMES[0]); + topic.getMetadata(function(err, metadata) { + assert.ifError(err); + assert.strictEqual(metadata.name, topic.name); + done(); + }); + }); + }); + + describe('Subscription', function() { + var TOPIC_NAME = generateTopicName(); + var topic = pubsub.topic(TOPIC_NAME); + + var SUB_NAMES = [ + generateSubName(), + generateSubName() + ]; + + var SUBSCRIPTIONS = [ + topic.subscription(SUB_NAMES[0], { ackDeadlineSeconds: 30 }), + topic.subscription(SUB_NAMES[1], { ackDeadlineSeconds: 60 }) + ]; + + before(function(done) { + topic.create(function(err) { + assert.ifError(err); + + function createSubscription(subscription, callback) { + subscription.create(callback); + } + + async.each(SUBSCRIPTIONS, createSubscription, function(err) { + if (err) { + done(err); + return; + } + + async.times(10, function(_, next) { + topic.publish({ data: 'hello' }, next); + }, done); + }); + }); + }); + + after(function(done) { + // Delete subscriptions + async.each(SUBSCRIPTIONS, function(sub, callback) { + sub.delete(callback); + }, function(err) { + assert.ifError(err); + topic.delete(done); + }); + }); + + it('should list all subscriptions registered to the topic', function(done) { + topic.getSubscriptions(function(err, subs) { + assert.ifError(err); + assert.equal(subs.length, SUBSCRIPTIONS.length); + assert(subs[0] instanceof Subscription); + done(); + }); + }); + + it('should list all topic subscriptions as a stream', function(done) { + var subscriptionsEmitted = []; + + topic.getSubscriptions() + .on('error', done) + .on('data', function(subscription) { + subscriptionsEmitted.push(subscription); + }) + .on('end', function() { + assert.equal(subscriptionsEmitted.length, SUBSCRIPTIONS.length); + done(); + }); + }); + + it('should list all subscriptions regardless of topic', function(done) { + pubsub.getSubscriptions(function(err, subscriptions) { + assert.ifError(err); + assert(subscriptions instanceof Array); + done(); + }); + }); + + it('should list all subscriptions as a stream', function(done) { + var subscriptionEmitted = false; + + pubsub.getSubscriptions() + .on('error', done) + .on('data', function(subscription) { + subscriptionEmitted = subscription instanceof Subscription; + }) + .on('end', function() { + assert.strictEqual(subscriptionEmitted, true); + done(); + }); + }); + + it('should allow creation and deletion of a subscription', function(done) { + var subName = generateSubName(); + topic.subscribe(subName, function(err, sub) { + assert.ifError(err); + assert(sub instanceof Subscription); + sub.delete(done); + }); + }); + + it('should re-use an existing subscription', function(done) { + pubsub.subscribe(topic, SUB_NAMES[0], { reuseExisting: true }, done); + }); + + it('should error when using a non-existent subscription', function(done) { + var subscription = topic.subscription(generateSubName()); + + subscription.pull(function(err) { + assert.equal(err.code, 404); + done(); + }); + }); + + it('should be able to pull and ack', function(done) { + var subscription = topic.subscription(SUB_NAMES[0]); + + subscription.pull({ + returnImmediately: true, + maxResults: 1 + }, function(err, msgs) { + assert.ifError(err); + + assert.strictEqual(msgs.length, 1); + + subscription.ack(msgs[0].ackId, done); + }); + }); + + it('should be able to set a new ack deadline', function(done) { + var subscription = topic.subscription(SUB_NAMES[0]); + + subscription.pull({ + returnImmediately: true, + maxResults: 1 + }, function(err, msgs) { + assert.ifError(err); + + assert.strictEqual(msgs.length, 1); + + var options = { + ackIds: [msgs[0].ackId], + seconds: 10 + }; + + subscription.setAckDeadline(options, done); + }); + }); + + it('should receive the published message', function(done) { + var subscription = topic.subscription(SUB_NAMES[1]); + + subscription.pull({ + returnImmediately: true, + maxResults: 1 + }, function(err, msgs) { + assert.ifError(err); + assert.strictEqual(msgs.length, 1); + assert.equal(msgs[0].data, 'hello'); + subscription.ack(msgs[0].ackId, done); + }); + }); + + it('should receive the chosen amount of results', function(done) { + var subscription = topic.subscription(SUB_NAMES[1]); + var opts = { returnImmediately: true, maxResults: 3 }; + + subscription.pull(opts, function(err, messages) { + assert.ifError(err); + + assert.equal(messages.length, opts.maxResults); + + var ackIds = messages.map(function(message) { + return message.ackId; + }); + + subscription.ack(ackIds, done); + }); + }); + + it('should allow a custom timeout', function(done) { + var timeout = 5000; + + // We need to use a topic without any pending messages to allow the + // connection to stay open. + var topic = pubsub.topic(generateTopicName()); + var subscription = topic.subscription(generateSubName(), { + timeout: timeout + }); + + async.series([ + topic.create.bind(topic), + subscription.create.bind(subscription), + ], function(err) { + assert.ifError(err); + + var times = [Date.now()]; + + subscription.pull({ + returnImmediately: false + }, function(err) { + assert.ifError(err); + + times.push(Date.now()); + var runTime = times.pop() - times.pop(); + + assert(runTime >= timeout - 1000); + assert(runTime <= timeout + 1000); + + done(); + }); + }); + }); + }); + + describe('IAM', function() { + it('should get a policy', function(done) { + var topic = pubsub.topic(TOPIC_NAMES[0]); + + topic.iam.getPolicy(function(err, policy) { + assert.ifError(err); + + assert.deepEqual(policy.bindings, []); + assert.strictEqual(policy.etag, 'ACAB'); + assert.strictEqual(policy.version, 0); + + done(); + }); + }); + + it('should set a policy', function(done) { + var topic = pubsub.topic(TOPIC_NAMES[0]); + var policy = { + bindings: [{ + role: 'roles/pubsub.publisher', + members: ['serviceAccount:gmail-api-push@system.gserviceaccount.com'] + }] + }; + + topic.iam.setPolicy(policy, function(err, newPolicy) { + assert.ifError(err); + assert.deepEqual(newPolicy.bindings, policy.bindings); + done(); + }); + }); + + it('should test the iam permissions', function(done) { + var topic = pubsub.topic(TOPIC_NAMES[0]); + var testPermissions = [ + 'pubsub.topics.get', + 'pubsub.topics.update' + ]; + + topic.iam.testPermissions(testPermissions, function(err, permissions) { + assert.ifError(err); + assert.deepEqual(permissions, { + 'pubsub.topics.get': true, + 'pubsub.topics.update': true + }); + done(); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js new file mode 100644 index 00000000000..cdf6310aa88 --- /dev/null +++ b/handwritten/pubsub/test/iam.js @@ -0,0 +1,182 @@ +/** + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); +var proxyquire = require('proxyquire'); +var nodeutil = require('util'); + +var GrpcService = require('@google-cloud/common').GrpcService; +var util = require('@google-cloud/common').util; + +function FakeGrpcService() { + this.calledWith_ = arguments; + GrpcService.apply(this, arguments); +} + +nodeutil.inherits(FakeGrpcService, GrpcService); + +describe('IAM', function() { + var IAM; + var iam; + + var PUBSUB = { + defaultBaseUrl_: 'base-url', + options: {} + }; + var ID = 'id'; + + before(function() { + IAM = proxyquire('../src/iam.js', { + '@google-cloud/common': { + GrpcService: FakeGrpcService + } + }); + }); + + beforeEach(function() { + iam = new IAM(PUBSUB, ID); + }); + + describe('initialization', function() { + it('should inherit from GrpcService', function() { + assert(iam instanceof GrpcService); + + var config = iam.calledWith_[0]; + var options = iam.calledWith_[1]; + + assert.strictEqual(config.baseUrl, PUBSUB.defaultBaseUrl_); + assert.strictEqual(config.service, 'iam'); + assert.strictEqual(config.apiVersion, 'v1'); + assert.deepEqual(config.scopes, [ + 'https://www.googleapis.com/auth/pubsub', + 'https://www.googleapis.com/auth/cloud-platform' + ]); + + assert.strictEqual(options, PUBSUB.options); + }); + + it('should localize the ID', function() { + assert.strictEqual(iam.id, ID); + }); + }); + + describe('getPolicy', function() { + it('should make the correct API request', function(done) { + iam.request = function(protoOpts, reqOpts, callback) { + assert.strictEqual(protoOpts.service, 'IAMPolicy'); + assert.strictEqual(protoOpts.method, 'getIamPolicy'); + + assert.strictEqual(reqOpts.resource, iam.id); + + callback(); // done() + }; + + iam.getPolicy(done); + }); + }); + + describe('setPolicy', function() { + it('should throw an error if a policy is not supplied', function() { + assert.throws(function() { + iam.setPolicy(util.noop); + }, /A policy object is required/); + }); + + it('should make the correct API request', function(done) { + var policy = { etag: 'ACAB' }; + + iam.request = function(protoOpts, reqOpts, callback) { + assert.strictEqual(protoOpts.service, 'IAMPolicy'); + assert.strictEqual(protoOpts.method, 'setIamPolicy'); + + assert.strictEqual(reqOpts.resource, iam.id); + assert.strictEqual(reqOpts.policy, policy); + + callback(); // done() + }; + + iam.setPolicy(policy, done); + }); + }); + + describe('testPermissions', function() { + it('should throw an error if permissions are missing', function() { + assert.throws(function() { + iam.testPermissions(util.noop); + }, /Permissions are required/); + }); + + it('should make the correct API request', function(done) { + var permissions = 'storage.bucket.list'; + + iam.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'IAMPolicy'); + assert.strictEqual(protoOpts.method, 'testIamPermissions'); + + assert.strictEqual(reqOpts.resource, iam.id); + assert.deepEqual(reqOpts.permissions, [permissions]); + + done(); + }; + + iam.testPermissions(permissions, assert.ifError); + }); + + it('should send an error back if the request fails', function(done) { + var permissions = ['storage.bucket.list']; + var error = new Error('Error.'); + var apiResponse = {}; + + iam.request = function(protoOpts, reqOpts, callback) { + callback(error, apiResponse); + }; + + iam.testPermissions(permissions, function(err, permissions, apiResp) { + assert.strictEqual(err, error); + assert.strictEqual(permissions, null); + assert.strictEqual(apiResp, apiResponse); + done(); + }); + }); + + it('should pass back a hash of permissions the user has', function(done) { + var permissions = [ + 'storage.bucket.list', + 'storage.bucket.consume' + ]; + var apiResponse = { + permissions: ['storage.bucket.consume'] + }; + + iam.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + + iam.testPermissions(permissions, function(err, permissions, apiResp) { + assert.ifError(err); + assert.deepEqual(permissions, { + 'storage.bucket.list': false, + 'storage.bucket.consume': true + }); + assert.strictEqual(apiResp, apiResponse); + + done(); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js new file mode 100644 index 00000000000..e980bc64772 --- /dev/null +++ b/handwritten/pubsub/test/index.js @@ -0,0 +1,793 @@ +/** + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var arrify = require('arrify'); +var assert = require('assert'); +var extend = require('extend'); +var proxyquire = require('proxyquire'); + +var Topic = require('../src/topic.js'); +var util = require('@google-cloud/common').util; +var PKG = require('../package.json'); + +var SubscriptionCached = require('../src/subscription.js'); +var SubscriptionOverride; + +function Subscription(a, b) { + var OverrideFn = SubscriptionOverride || SubscriptionCached; + return new OverrideFn(a, b); +} + +var fakeUtil = extend({}, util); + +function FakeGrpcService() { + this.calledWith_ = arguments; +} + +var extended = false; +var fakeStreamRouter = { + extend: function(Class, methods) { + if (Class.name !== 'PubSub') { + return; + } + + methods = arrify(methods); + assert.equal(Class.name, 'PubSub'); + assert.deepEqual(methods, ['getSubscriptions', 'getTopics']); + extended = true; + } +}; + +describe('PubSub', function() { + var PubSub; + var PROJECT_ID = 'test-project'; + var pubsub; + var OPTIONS = { projectId: PROJECT_ID }; + + var PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; + + before(function() { + delete process.env.PUBSUB_EMULATOR_HOST; + PubSub = proxyquire('../', { + '@google-cloud/common': { + GrpcService: FakeGrpcService, + streamRouter: fakeStreamRouter, + util: fakeUtil + }, + './subscription.js': Subscription, + './topic.js': Topic + }); + }); + + after(function() { + if (PUBSUB_EMULATOR_HOST) { + process.env.PUBSUB_EMULATOR_HOST = PUBSUB_EMULATOR_HOST; + } + }); + + beforeEach(function() { + SubscriptionOverride = null; + pubsub = new PubSub(OPTIONS); + pubsub.projectId = PROJECT_ID; + }); + + describe('instantiation', function() { + it('should extend the correct methods', function() { + assert(extended); // See `fakeStreamRouter.extend` + }); + + it('should normalize the arguments', function() { + var normalizeArguments = fakeUtil.normalizeArguments; + var normalizeArgumentsCalled = false; + var fakeOptions = { projectId: PROJECT_ID }; + var fakeContext = {}; + + fakeUtil.normalizeArguments = function(context, options) { + normalizeArgumentsCalled = true; + assert.strictEqual(context, fakeContext); + assert.strictEqual(options, fakeOptions); + return options; + }; + + PubSub.call(fakeContext, fakeOptions); + assert(normalizeArgumentsCalled); + + fakeUtil.normalizeArguments = normalizeArguments; + }); + + it('should inherit from GrpcService', function() { + assert(pubsub instanceof FakeGrpcService); + + var calledWith = pubsub.calledWith_[0]; + + var baseUrl = 'pubsub.googleapis.com'; + assert.strictEqual(calledWith.baseUrl, baseUrl); + assert.strictEqual(calledWith.service, 'pubsub'); + assert.strictEqual(calledWith.apiVersion, 'v1'); + assert.deepEqual(calledWith.scopes, [ + 'https://www.googleapis.com/auth/pubsub', + 'https://www.googleapis.com/auth/cloud-platform' + ]); + assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version); + }); + + it('should set the defaultBaseUrl_', function() { + assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com'); + }); + + it('should use the PUBSUB_EMULATOR_HOST env var', function() { + var pubSubHost = 'pubsub-host'; + process.env.PUBSUB_EMULATOR_HOST = pubSubHost; + + var pubsub = new PubSub({ projectId: 'project-id' }); + delete process.env.PUBSUB_EMULATOR_HOST; + + var calledWith = pubsub.calledWith_[0]; + assert.strictEqual(calledWith.baseUrl, pubSubHost); + }); + + it('should localize the options provided', function() { + assert.strictEqual(pubsub.options, OPTIONS); + }); + }); + + describe('createTopic', function() { + it('should make the correct API request', function(done) { + var topicName = 'new-topic-name'; + var formattedName = 'formatted-name'; + + var formatName_ = Topic.formatName_; + Topic.formatName_ = function(projectId, name) { + Topic.formatName_ = formatName_; + assert.strictEqual(projectId, pubsub.projectId); + assert.strictEqual(name, topicName); + return formattedName; + }; + + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Publisher'); + assert.strictEqual(protoOpts.method, 'createTopic'); + assert.strictEqual(reqOpts.name, formattedName); + done(); + }; + + pubsub.createTopic(topicName, function() {}); + }); + + describe('error', function() { + var error = new Error('Error.'); + var apiResponse = {}; + + beforeEach(function() { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(error, apiResponse); + }; + }); + + it('should return an error & API response', function(done) { + pubsub.createTopic('new-topic', function(err, topic, apiResponse_) { + assert.strictEqual(err, error); + assert.strictEqual(topic, null); + assert.strictEqual(apiResponse_, apiResponse); + done(); + }); + }); + }); + + describe('success', function() { + var apiResponse = {}; + + beforeEach(function() { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + }); + + it('should return a Topic object', function(done) { + var topicName = 'new-topic'; + var topicInstance = {}; + + pubsub.topic = function(name) { + assert.strictEqual(name, topicName); + return topicInstance; + }; + + pubsub.createTopic(topicName, function(err, topic) { + assert.ifError(err); + assert.strictEqual(topic, topicInstance); + done(); + }); + }); + + it('should pass apiResponse to callback', function(done) { + pubsub.createTopic('new-topic', function(err, topic, apiResponse_) { + assert.ifError(err); + assert.strictEqual(apiResponse_, apiResponse); + done(); + }); + }); + }); + }); + + describe('getSubscriptions', function() { + beforeEach(function() { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, { subscriptions: [{ name: 'fake-subscription' }] }); + }; + }); + + it('should accept a query and a callback', function(done) { + pubsub.getSubscriptions({}, done); + }); + + it('should accept just a callback', function(done) { + pubsub.getSubscriptions(done); + }); + + it('should pass the correct arguments to the API', function(done) { + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'listSubscriptions'); + assert.strictEqual(reqOpts.project, 'projects/' + pubsub.projectId); + done(); + }; + + pubsub.getSubscriptions(assert.ifError); + }); + + describe('topics', function() { + var TOPIC; + var TOPIC_NAME = 'topic'; + + beforeEach(function() { + TOPIC = new Topic(pubsub, TOPIC_NAME); + }); + + it('should subscribe to a topic by string', function(done) { + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Publisher'); + assert.strictEqual(protoOpts.method, 'listTopicSubscriptions'); + assert.strictEqual(reqOpts.topic, TOPIC_NAME); + done(); + }; + + pubsub.getSubscriptions({ topic: TOPIC_NAME }, assert.ifError); + }); + + it('should subscribe to a topic by Topic instance', function(done) { + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(reqOpts.topic, TOPIC.name); + done(); + }; + + pubsub.getSubscriptions({ topic: TOPIC }, assert.ifError); + }); + }); + + it('should pass options to API request', function(done) { + var opts = { pageSize: 10, pageToken: 'abc' }; + + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(reqOpts.pageSize, opts.pageSize); + assert.strictEqual(reqOpts.pageToken, opts.pageToken); + done(); + }; + + pubsub.getSubscriptions(opts, assert.ifError); + }); + + it('should pass error & response if api returns an error', function(done) { + var error = new Error('Error'); + var resp = { error: true }; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(error, resp); + }; + + pubsub.getSubscriptions(function(err, subs, nextQuery, apiResponse) { + assert.equal(err, error); + assert.deepEqual(apiResponse, resp); + done(); + }); + }); + + describe('returning Subscription instances', function() { + it('should handle subscriptions.list response', function(done) { + pubsub.getSubscriptions(function(err, subscriptions) { + assert.ifError(err); + assert(subscriptions[0] instanceof SubscriptionCached); + done(); + }); + }); + + it('should handle topics.subscriptions.list response', function(done) { + var subName = 'sub-name'; + var subFullName = + 'projects/' + PROJECT_ID + '/subscriptions/' + subName; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, { subscriptions: [subName] }); + }; + + pubsub.getSubscriptions(function(err, subscriptions) { + assert.ifError(err); + assert(subscriptions[0] instanceof SubscriptionCached); + assert.equal(subscriptions[0].name, subFullName); + done(); + }); + }); + }); + + it('should return a query if more results exist', function() { + var token = 'next-page-token'; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, { nextPageToken: token }); + }; + + var query = { maxResults: 1 }; + + pubsub.getSubscriptions(query, function(err, subscriptions, nextQuery) { + assert.ifError(err); + assert.strictEqual(query.maxResults, nextQuery.maxResults); + assert.equal(query.pageToken, token); + }); + }); + + it('should pass apiResponse to callback', function(done) { + var resp = { success: true }; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + + pubsub.getSubscriptions(function(err, subs, nextQuery, apiResponse) { + assert.equal(resp, apiResponse); + done(); + }); + }); + }); + + describe('getTopics', function() { + var topicName = 'fake-topic'; + var apiResponse = { topics: [{ name: topicName }]}; + + beforeEach(function() { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + }); + + it('should accept a query and a callback', function(done) { + pubsub.getTopics({}, done); + }); + + it('should accept just a callback', function(done) { + pubsub.getTopics(done); + }); + + it('should build the right request', function(done) { + var options = { a: 'b', c: 'd' }; + var originalOptions = extend({}, options); + var expectedOptions = extend({}, options, { + project: 'projects/' + pubsub.projectId + }); + + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Publisher'); + assert.strictEqual(protoOpts.method, 'listTopics'); + assert.deepEqual(reqOpts, expectedOptions); + assert.deepEqual(options, originalOptions); + done(); + }; + pubsub.getTopics(options, function() {}); + }); + + it('should return Topic instances with metadata', function(done) { + var topic = {}; + + pubsub.topic = function(name) { + assert.strictEqual(name, topicName); + return topic; + }; + + pubsub.getTopics(function(err, topics) { + assert.ifError(err); + assert.strictEqual(topics[0], topic); + assert.strictEqual(topics[0].metadata, apiResponse.topics[0]); + done(); + }); + }); + + it('should return a query if more results exist', function() { + var token = 'next-page-token'; + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, { nextPageToken: token }); + }; + var query = { pageSize: 1 }; + pubsub.getTopics(query, function(err, topics, nextQuery) { + assert.ifError(err); + assert.strictEqual(query.pageSize, nextQuery.pageSize); + assert.equal(query.pageToken, token); + }); + }); + + it('should pass error if api returns an error', function() { + var error = new Error('Error'); + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(error); + }; + pubsub.getTopics(function(err) { + assert.equal(err, error); + }); + }); + + it('should pass apiResponse to callback', function(done) { + var resp = { success: true }; + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + pubsub.getTopics(function(err, topics, nextQuery, apiResponse) { + assert.equal(resp, apiResponse); + done(); + }); + }); + }); + + describe('subscribe', function() { + var TOPIC_NAME = 'topic'; + var TOPIC = { + name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME + }; + + var SUB_NAME = 'subscription'; + var SUBSCRIPTION = { + name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME + }; + + var apiResponse = { + name: 'subscription-name' + }; + + it('should throw if no Topic is provided', function() { + assert.throws(function() { + pubsub.subscribe(); + }, /A Topic is required.*/); + }); + + it('should throw if no sub name is provided', function() { + assert.throws(function() { + pubsub.subscribe('topic'); + }, /A subscription name is required.*/); + }); + + it('should not require configuration options', function(done) { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, done); + }); + + it('should allow undefined/optional configuration options', function(done) { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, undefined, done); + }); + + it('should create a Subscription', function(done) { + var opts = { a: 'b', c: 'd' }; + + pubsub.request = util.noop; + + pubsub.subscription = function(subName, options) { + assert.strictEqual(subName, SUB_NAME); + assert.deepEqual(options, opts); + setImmediate(done); + return SUBSCRIPTION; + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, opts, assert.ifError); + }); + + it('should create a Topic object from a string', function(done) { + pubsub.request = util.noop; + + pubsub.topic = function(topicName) { + assert.strictEqual(topicName, TOPIC_NAME); + setImmediate(done); + return TOPIC; + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, assert.ifError); + }); + + it('should send correct request', function(done) { + pubsub.topic = function(topicName) { + return { + name: topicName + }; + }; + + pubsub.subscription = function(subName) { + return { + name: subName + }; + }; + + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'createSubscription'); + assert.strictEqual(protoOpts.timeout, pubsub.timeout); + assert.strictEqual(reqOpts.topic, TOPIC_NAME); + assert.strictEqual(reqOpts.name, SUB_NAME); + done(); + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, assert.ifError); + }); + + it('should pass options to the api request', function(done) { + var options = { + ackDeadlineSeconds: 90, + autoAck: true, + encoding: 'utf-8', + interval: 3, + maxInProgress: 5, + pushConfig: { + pushEndpoint: 'https://domain/push' + }, + reuseExisting: false, + timeout: 30000 + }; + + var expectedBody = extend({ + topic: TOPIC_NAME, + name: SUB_NAME + }, options); + + delete expectedBody.autoAck; + delete expectedBody.encoding; + delete expectedBody.interval; + delete expectedBody.maxInProgress; + delete expectedBody.reuseExisting; + delete expectedBody.timeout; + + pubsub.topic = function() { + return { + name: TOPIC_NAME + }; + }; + + pubsub.subscription = function() { + return { + name: SUB_NAME + }; + }; + + pubsub.request = function(protoOpts, reqOpts) { + assert.notStrictEqual(reqOpts, options); + assert.deepEqual(reqOpts, expectedBody); + done(); + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, options, assert.ifError); + }); + + describe('error', function() { + var error = new Error('Error.'); + var apiResponse = { name: SUB_NAME }; + + beforeEach(function() { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(error, apiResponse); + }; + }); + + it('should re-use existing subscription if specified', function(done) { + var apiResponse = { code: 409 }; + + pubsub.subscription = function() { + return SUBSCRIPTION; + }; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback({ code: 409 }, apiResponse); + }; + + // Don't re-use an existing subscription (error if one exists). + pubsub.subscribe(TOPIC_NAME, SUB_NAME, function(err, sub, resp) { + assert.equal(err.code, 409); + assert.strictEqual(resp, apiResponse); + }); + + // Re-use an existing subscription (ignore error if one exists). + var opts = { reuseExisting: true }; + pubsub.subscribe(TOPIC_NAME, SUB_NAME, opts, function(err, sub) { + assert.ifError(err); + assert.deepEqual(sub, SUBSCRIPTION); + + done(); + }); + }); + + it('should return error & API response to the callback', function(done) { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(error, apiResponse); + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, function(err, sub, resp) { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + }); + }); + }); + + describe('success', function() { + var apiResponse = { name: SUB_NAME }; + + beforeEach(function() { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + }); + + it('should return Subscription & resp to the callback', function(done) { + var subscription = {}; + + pubsub.subscription = function() { + return subscription; + }; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, function(err, sub, resp) { + assert.ifError(err); + assert.strictEqual(sub, subscription); + assert.strictEqual(resp, apiResponse); + done(); + }); + }); + }); + }); + + describe('subscription', function() { + var SUB_NAME = 'new-sub-name'; + var CONFIG = { autoAck: true, interval: 90 }; + + it('should throw if no name is provided', function() { + assert.throws(function() { + pubsub.subscription(); + }, /The name of a subscription is required/); + }); + + it('should return a Subscription object', function() { + SubscriptionOverride = function() {}; + var subscription = pubsub.subscription(SUB_NAME, {}); + assert(subscription instanceof SubscriptionOverride); + }); + + it('should honor settings', function(done) { + SubscriptionOverride = function(pubsub, options) { + assert.deepEqual(options, CONFIG); + done(); + }; + pubsub.subscription(SUB_NAME, CONFIG); + }); + + it('should pass specified name to the Subscription', function(done) { + SubscriptionOverride = function(pubsub, options) { + assert.equal(options.name, SUB_NAME); + done(); + }; + pubsub.subscription(SUB_NAME, {}); + }); + + it('should not require options', function() { + assert.doesNotThrow(function() { + pubsub.subscription(SUB_NAME); + }); + }); + }); + + describe('topic', function() { + it('should throw if a name is not provided', function() { + assert.throws(function() { + pubsub.topic(); + }, /name must be specified/); + }); + + it('should return a Topic object', function() { + assert(pubsub.topic('new-topic') instanceof Topic); + }); + }); + + describe('determineBaseUrl_', function() { + function setHost(host) { + process.env.PUBSUB_EMULATOR_HOST = host; + } + + beforeEach(function() { + delete process.env.PUBSUB_EMULATOR_HOST; + }); + + it('should default to defaultBaseUrl_', function() { + var defaultBaseUrl_ = 'defaulturl'; + pubsub.defaultBaseUrl_ = defaultBaseUrl_; + + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.baseUrl_, defaultBaseUrl_); + }); + + it('should remove slashes from the baseUrl', function() { + var expectedBaseUrl = 'localhost:8080'; + + setHost('localhost:8080/'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.baseUrl_, expectedBaseUrl); + + setHost('localhost:8080//'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.baseUrl_, expectedBaseUrl); + }); + + it('should remove the protocol if specified', function() { + setHost('http://localhost:8080'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.baseUrl_, 'localhost:8080'); + + setHost('https://localhost:8080'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.baseUrl_, 'localhost:8080'); + }); + + it('should not set customEndpoint_ when using default baseurl', function() { + var pubsub = new PubSub({ projectId: PROJECT_ID }); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.customEndpoint_, undefined); + }); + + describe('with PUBSUB_EMULATOR_HOST environment variable', function() { + var PUBSUB_EMULATOR_HOST = 'localhost:9090'; + + beforeEach(function() { + setHost(PUBSUB_EMULATOR_HOST); + }); + + after(function() { + delete process.env.PUBSUB_EMULATOR_HOST; + }); + + it('should use the PUBSUB_EMULATOR_HOST env var', function() { + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.baseUrl_, PUBSUB_EMULATOR_HOST); + }); + + it('should set customEndpoint_', function() { + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.customEndpoint_, true); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js new file mode 100644 index 00000000000..e54beda2abe --- /dev/null +++ b/handwritten/pubsub/test/subscription.js @@ -0,0 +1,1015 @@ +/** + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); +var extend = require('extend'); +var proxyquire = require('proxyquire'); +var nodeutil = require('util'); + +var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; +var util = require('@google-cloud/common').util; + +function FakeIAM() { + this.calledWith_ = [].slice.call(arguments); +} + +function FakeGrpcServiceObject() { + this.calledWith_ = arguments; + GrpcServiceObject.apply(this, arguments); +} + +nodeutil.inherits(FakeGrpcServiceObject, GrpcServiceObject); + +var formatMessageOverride; + +describe('Subscription', function() { + var Subscription; + var subscription; + + var PROJECT_ID = 'test-project'; + var SUB_NAME = 'test-subscription'; + var SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; + var PUBSUB = { + projectId: PROJECT_ID + }; + var message = 'howdy'; + var messageBuffer = new Buffer(message).toString('base64'); + var messageBinary = new Buffer(message).toString('binary'); + var messageObj = { + receivedMessages: [{ + ackId: 'abc', + message: { + data: messageBuffer, + messageId: 7 + } + }] + }; + var expectedMessage = { + ackId: 'abc', + data: message, + id: 7 + }; + var expectedMessageAsBinary = { + ackId: 'abc', + data: messageBinary, + id: 7 + }; + + before(function() { + Subscription = proxyquire('../src/subscription.js', { + '@google-cloud/common': { + GrpcServiceObject: FakeGrpcServiceObject + }, + './iam.js': FakeIAM + }); + + var formatMessage = Subscription.formatMessage_; + Subscription.formatMessage_ = function() { + return (formatMessageOverride || formatMessage).apply(null, arguments); + }; + }); + + beforeEach(function() { + subscription = new Subscription(PUBSUB, { name: SUB_NAME }); + }); + + afterEach(function() { + formatMessageOverride = null; + }); + + describe('initialization', function() { + it('should format name', function(done) { + var formatName_ = Subscription.formatName_; + Subscription.formatName_ = function() { + Subscription.formatName_ = formatName_; + done(); + }; + new Subscription(PUBSUB, { name: SUB_NAME }); + }); + + it('should honor configuration settings', function() { + var CONFIG = { + name: SUB_NAME, + autoAck: true, + interval: 100, + maxInProgress: 3, + encoding: 'binary', + timeout: 30000 + }; + var sub = new Subscription(PUBSUB, CONFIG); + assert.strictEqual(sub.autoAck, CONFIG.autoAck); + assert.strictEqual(sub.interval, CONFIG.interval); + assert.strictEqual(sub.encoding, CONFIG.encoding); + assert.strictEqual(sub.maxInProgress, CONFIG.maxInProgress); + assert.strictEqual(sub.timeout, CONFIG.timeout); + }); + + it('should be closed', function() { + assert.strictEqual(subscription.closed, true); + }); + + it('should default autoAck to false if not specified', function() { + assert.strictEqual(subscription.autoAck, false); + }); + + it('should set default interval if one is not specified', function() { + assert.equal(subscription.interval, 10); + }); + + it('should start inProgressAckIds as an empty object', function() { + assert.deepEqual(subscription.inProgressAckIds, {}); + }); + + it('should default maxInProgress to Infinity if not specified', function() { + assert.strictEqual(subscription.maxInProgress, Infinity); + }); + + it('should set messageListeners to 0', function() { + assert.strictEqual(subscription.messageListeners, 0); + }); + + it('should not be paused', function() { + assert.strictEqual(subscription.paused, false); + }); + + it('should default encoding to utf-8 if not specified', function() { + assert.strictEqual(subscription.encoding, 'utf-8'); + }); + + it('should default timeout to 92 seconds', function() { + assert.strictEqual(subscription.timeout, 92000); + }); + + it('should create an iam object', function() { + assert.deepEqual(subscription.iam.calledWith_, [ + PUBSUB, + SUB_FULL_NAME + ]); + }); + + it('should inherit from GrpcServiceObject', function() { + assert(subscription instanceof GrpcServiceObject); + + var calledWith = subscription.calledWith_[0]; + + assert.strictEqual(calledWith.parent, PUBSUB); + assert.strictEqual(calledWith.id, SUB_FULL_NAME); + assert.deepEqual(calledWith.methods, { + exists: true, + get: true, + getMetadata: { + protoOpts: { + service: 'Subscriber', + method: 'getSubscription' + }, + reqOpts: { + subscription: subscription.name + } + } + }); + }); + + it('should allow creating if it is a Topic', function(done) { + var topicInstance = {}; + + var pubSubInstance = extend({}, PUBSUB, { + subscribe: { + bind: function(context, topic) { + assert.strictEqual(context, pubSubInstance); + assert.strictEqual(topic, topicInstance); + done(); + } + } + }); + + var subscription = new Subscription(pubSubInstance, { + name: SUB_NAME, + topic: topicInstance + }); + assert(subscription instanceof GrpcServiceObject); + + var calledWith = subscription.calledWith_[0]; + assert.deepEqual(calledWith.methods.create, true); + }); + }); + + describe('formatMessage_', function() { + it('should decode stringified JSON to object', function() { + var obj = { hi: 'there' }; + var stringified = new Buffer(JSON.stringify(obj)).toString('base64'); + var attributes = {}; + + var msg = Subscription.formatMessage_({ + ackId: 'abc', + message: { + data: stringified, + messageId: 7, + attributes: attributes + } + }); + + assert.deepEqual(msg, { + ackId: 'abc', + id: 7, + data: obj, + attributes: attributes + }); + }); + + it('should decode buffer to string', function() { + var msg = Subscription.formatMessage_(messageObj.receivedMessages[0]); + assert.deepEqual(msg, expectedMessage); + }); + + it('should decode buffer to specified encoding', function() { + var msg = Subscription + .formatMessage_(messageObj.receivedMessages[0], 'binary'); + assert.deepEqual(msg, expectedMessageAsBinary); + }); + }); + + describe('formatName_', function() { + it('should format name', function() { + var formattedName = Subscription.formatName_(PROJECT_ID, SUB_NAME); + assert.equal(formattedName, SUB_FULL_NAME); + }); + + it('should format name when given a complete name', function() { + var formattedName = Subscription.formatName_(PROJECT_ID, SUB_FULL_NAME); + assert.equal(formattedName, SUB_FULL_NAME); + }); + }); + + describe('ack', function() { + it('should throw if no IDs are provided', function() { + assert.throws(function() { + subscription.ack(); + }, /At least one ID/); + assert.throws(function() { + subscription.ack([]); + }, /At least one ID/); + }); + + it('should accept a single id', function() { + assert.doesNotThrow(function() { + subscription.request = util.noop; + subscription.ack(1, util.noop); + }); + }); + + it('should accept an array of ids', function() { + assert.doesNotThrow(function() { + subscription.request = util.noop; + subscription.ack([1], util.noop); + }); + }); + + it('should make an array out of ids', function(done) { + var ID = 'abc'; + + subscription.request = function(protoOpts, reqOpts) { + assert.deepEqual(reqOpts.ackIds, [ID]); + done(); + }; + + subscription.ack(ID, assert.ifError); + }); + + it('should make correct api request', function(done) { + var IDS = [1, 2, 3]; + + subscription.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'acknowledge'); + + assert.strictEqual(reqOpts.subscription, subscription.name); + assert.strictEqual(reqOpts.ackIds, IDS); + + done(); + }; + + subscription.ack(IDS, assert.ifError); + }); + + it('should unmark the ack ids as being in progress', function(done) { + subscription.request = function(protoOpts, reqOpts, callback) { + callback(); + }; + + subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; + + subscription.ack(['id1', 'id2'], function(err) { + assert.ifError(err); + + var inProgressAckIds = subscription.inProgressAckIds; + assert.strictEqual(inProgressAckIds.id1, undefined); + assert.strictEqual(inProgressAckIds.id2, undefined); + assert.strictEqual(inProgressAckIds.id3, true); + + done(); + }); + }); + + it('should not unmark if there was an error', function(done) { + subscription.request = function(protoOpts, reqOpts, callback) { + callback(new Error('Error.')); + }; + + subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; + + subscription.ack(['id1', 'id2'], function() { + var inProgressAckIds = subscription.inProgressAckIds; + assert.strictEqual(inProgressAckIds.id1, true); + assert.strictEqual(inProgressAckIds.id2, true); + assert.strictEqual(inProgressAckIds.id3, true); + + done(); + }); + }); + + it('should refresh paused status', function(done) { + subscription.request = function(protoOpts, reqOpts, callback) { + callback(); + }; + + subscription.refreshPausedStatus_ = done; + + subscription.ack(1, assert.ifError); + }); + + it('should pass error to callback', function(done) { + var error = new Error('Error.'); + + subscription.request = function(protoOpts, reqOpts, callback) { + callback(error); + }; + + subscription.ack(1, function(err) { + assert.strictEqual(err, error); + done(); + }); + }); + + it('should pass apiResponse to callback', function(done) { + var resp = { success: true }; + subscription.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + subscription.ack(1, function(err, apiResponse) { + assert.deepEqual(resp, apiResponse); + done(); + }); + }); + }); + + describe('delete', function() { + it('should delete a subscription', function(done) { + subscription.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'deleteSubscription'); + + assert.strictEqual(reqOpts.subscription, subscription.name); + + done(); + }; + + subscription.delete(); + }); + + it('should close a subscription once deleted', function() { + subscription.request = function(protoOpts, reqOpts, callback) { + callback(); + }; + subscription.closed = false; + subscription.delete(); + assert.strictEqual(subscription.closed, true); + }); + + it('should remove all listeners', function(done) { + subscription.request = function(protoOpts, reqOpts, callback) { + callback(); + }; + subscription.removeAllListeners = function() { + done(); + }; + subscription.delete(); + }); + + it('should execute callback when deleted', function(done) { + subscription.request = function(protoOpts, reqOpts, callback) { + callback(); + }; + subscription.delete(done); + }); + + it('should execute callback with an api error', function(done) { + var error = new Error('Error.'); + subscription.request = function(protoOpts, reqOpts, callback) { + callback(error); + }; + subscription.delete(function(err) { + assert.equal(err, error); + done(); + }); + }); + + it('should execute callback with apiResponse', function(done) { + var resp = { success: true }; + subscription.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + subscription.delete(function(err, apiResponse) { + assert.deepEqual(resp, apiResponse); + done(); + }); + }); + }); + + describe('pull', function() { + beforeEach(function() { + subscription.ack = util.noop; + subscription.request = function(protoOpts, reqOpts, callback) { + callback(null, messageObj); + }; + }); + + it('should not require configuration options', function(done) { + subscription.pull(done); + }); + + it('should default returnImmediately to false', function(done) { + subscription.request = function(protoOpts, reqOpts) { + assert.strictEqual(reqOpts.returnImmediately, false); + done(); + }; + subscription.pull({}, assert.ifError); + }); + + it('should honor options', function(done) { + subscription.request = function(protoOpts, reqOpts) { + assert.strictEqual(reqOpts.returnImmediately, true); + done(); + }; + subscription.pull({ returnImmediately: true }, assert.ifError); + }); + + it('should make correct api request', function(done) { + subscription.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'pull'); + assert.strictEqual(protoOpts.timeout, 92000); + + assert.strictEqual(reqOpts.subscription, subscription.name); + assert.strictEqual(reqOpts.returnImmediately, false); + assert.strictEqual(reqOpts.maxMessages, 1); + + done(); + }; + + subscription.pull({ maxResults: 1 }, assert.ifError); + }); + + it('should pass a timeout if specified', function(done) { + var timeout = 30000; + + var subscription = new Subscription(PUBSUB, { + name: SUB_NAME, + timeout: timeout + }); + + subscription.request = function(protoOpts) { + assert.strictEqual(protoOpts.timeout, 30000); + done(); + }; + + subscription.pull(assert.ifError); + }); + + it('should store the active request', function() { + var requestInstance = {}; + + subscription.request = function() { + return requestInstance; + }; + + subscription.pull(assert.ifError); + assert.strictEqual(subscription.activeRequest_, requestInstance); + }); + + it('should clear the active request', function(done) { + var requestInstance = {}; + + subscription.request = function(protoOpts, reqOpts, callback) { + setImmediate(function() { + callback(null, {}); + assert.strictEqual(subscription.activeRequest_, null); + done(); + }); + + return requestInstance; + }; + + subscription.pull(assert.ifError); + }); + + it('should pass error to callback', function(done) { + var error = new Error('Error.'); + subscription.request = function(protoOpts, reqOpts, callback) { + callback(error); + }; + subscription.pull(function(err) { + assert.equal(err, error); + done(); + }); + }); + + it('should not return messages if request timed out', function(done) { + subscription.request = function(protoOpts, reqOpts, callback) { + callback({ code: 504 }); + }; + + subscription.pull({}, function(err, messages) { + assert.ifError(err); + assert.deepEqual(messages, []); + done(); + }); + }); + + it('should call formatMessage_ with encoding', function(done) { + subscription.encoding = 'encoding-value'; + + formatMessageOverride = function(msg, encoding) { + assert.strictEqual(msg, messageObj.receivedMessages[0]); + assert.strictEqual(encoding, subscription.encoding); + setImmediate(done); + return msg; + }; + + subscription.pull({}, assert.ifError); + }); + + it('should decorate the message', function(done) { + subscription.decorateMessage_ = function() { + done(); + }; + + subscription.pull({}, assert.ifError); + }); + + it('should refresh paused status', function(done) { + subscription.refreshPausedStatus_ = function() { + done(); + }; + + subscription.pull({}, assert.ifError); + }); + + describe('autoAck false', function() { + beforeEach(function() { + subscription.autoAck = false; + }); + + it('should not ack', function() { + subscription.ack = function() { + throw new Error('Should not have acked.'); + }; + subscription.pull({}, assert.ifError); + }); + + it('should execute callback with message', function(done) { + subscription.decorateMessage_ = function(msg) { return msg; }; + subscription.pull({}, function(err, msgs) { + assert.ifError(err); + assert.deepEqual(msgs, [expectedMessage]); + done(); + }); + }); + + it('should pass apiResponse to callback', function(done) { + subscription.pull(function(err, msgs, apiResponse) { + assert.ifError(err); + assert.strictEqual(apiResponse, messageObj); + done(); + }); + }); + }); + + describe('autoAck true', function() { + beforeEach(function() { + subscription.autoAck = true; + subscription.ack = function(id, callback) { + callback(); + }; + }); + + it('should ack', function(done) { + subscription.ack = function() { + done(); + }; + subscription.pull({}, assert.ifError); + }); + + it('should not autoAck if no messages returned', function(done) { + subscription.request = function(protoOpts, reqOpts, callback) { + callback(null, { receivedMessages: [] }); + }; + subscription.ack = function() { + throw new Error('I should not run.'); + }; + subscription.pull(function() { + done(); + }); + }); + + it('should pass id to ack', function(done) { + subscription.ack = function(id) { + assert.equal(id, expectedMessage.ackId); + done(); + }; + subscription.pull({}, assert.ifError); + }); + + it('should pass callback to ack', function(done) { + subscription.pull({}, done); + }); + + it('should invoke callback with error from ack', function(done) { + var error = new Error('Error.'); + subscription.ack = function(id, callback) { + callback(error); + }; + subscription.pull({}, function(err) { + assert.equal(err, error); + done(); + }); + }); + + it('should execute callback', function(done) { + subscription.pull({}, done); + }); + + it('should return pull response as apiResponse', function(done) { + var resp = { + receivedMessages: [{ + ackId: 1, + message: { + messageId: 'abc', + data: new Buffer('message').toString('base64') + } + }] + }; + + subscription.ack = function(id, callback) { + callback(null, { success: true }); + }; + + subscription.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + + subscription.pull({}, function(err, msgs, apiResponse) { + assert.deepEqual(resp, apiResponse); + done(); + }); + }); + }); + }); + + describe('setAckDeadline', function() { + it('should set the ack deadline', function(done) { + subscription.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'modifyAckDeadline'); + + assert.deepEqual(reqOpts, { + subscription: subscription.name, + ackIds: ['abc'], + ackDeadlineSeconds: 10 + }); + + done(); + }; + + subscription.setAckDeadline({ ackIds: ['abc'], seconds: 10 }, done); + }); + + it('should execute the callback', function(done) { + subscription.request = function(protoOpts, reqOpts, callback) { + callback(); + }; + subscription.setAckDeadline({}, done); + }); + + it('should execute the callback with apiResponse', function(done) { + var resp = { success: true }; + subscription.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + subscription.setAckDeadline({}, function(err, apiResponse) { + assert.deepEqual(resp, apiResponse); + done(); + }); + }); + }); + + describe('decorateMessage_', function() { + var message = { + ackId: 'b' + }; + + it('should return the message', function() { + var decoratedMessage = subscription.decorateMessage_(message); + assert.strictEqual(decoratedMessage.ackId, message.ackId); + }); + + it('should mark the message as being in progress', function() { + subscription.decorateMessage_(message); + assert.strictEqual(subscription.inProgressAckIds[message.ackId], true); + }); + + describe('ack', function() { + it('should add an ack function to ack', function() { + var decoratedMessage = subscription.decorateMessage_(message); + assert.equal(typeof decoratedMessage.ack, 'function'); + }); + + it('should pass the ackId to subscription.ack', function(done) { + subscription.ack = function(ackId, callback) { + assert.strictEqual(ackId, message.ackId); + callback(); + }; + + subscription.decorateMessage_(message).ack(done); + }); + }); + + describe('skip', function() { + it('should add a skip function', function() { + var decoratedMessage = subscription.decorateMessage_(message); + assert.equal(typeof decoratedMessage.skip, 'function'); + }); + + it('should unmark the message as being in progress', function() { + subscription.decorateMessage_(message).skip(); + + var inProgressAckIds = subscription.inProgressAckIds; + assert.strictEqual(inProgressAckIds[message.ackId], undefined); + }); + + it('should refresh the paused status', function(done) { + subscription.refreshPausedStatus_ = done; + subscription.decorateMessage_(message).skip(); + }); + }); + }); + + describe('refreshPausedStatus_', function() { + it('should pause if the ackIds in progress is too high', function() { + subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; + + subscription.maxInProgress = 2; + subscription.refreshPausedStatus_(); + assert.strictEqual(subscription.paused, true); + + subscription.maxInProgress = 3; + subscription.refreshPausedStatus_(); + assert.strictEqual(subscription.paused, true); + + subscription.maxInProgress = Infinity; + subscription.refreshPausedStatus_(); + assert.strictEqual(subscription.paused, false); + }); + + it('should start pulling if paused and listeners exist', function(done) { + subscription.startPulling_ = done; + + subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; + subscription.paused = true; + subscription.maxInProgress = Infinity; + subscription.messageListeners = 1; + subscription.refreshPausedStatus_(); + }); + }); + + describe('listenForEvents_', function() { + afterEach(function() { + subscription.removeAllListeners(); + }); + + it('should start pulling once a message listener is bound', function(done) { + subscription.startPulling_ = function() { + done(); + }; + subscription.on('message', util.noop); + }); + + it('should track the number of listeners', function() { + subscription.startPulling_ = util.noop; + + assert.strictEqual(subscription.messageListeners, 0); + + subscription.on('message', util.noop); + assert.strictEqual(subscription.messageListeners, 1); + + subscription.removeListener('message', util.noop); + assert.strictEqual(subscription.messageListeners, 0); + }); + + it('should only run a single pulling loop', function() { + var startPullingCallCount = 0; + + subscription.startPulling_ = function() { + startPullingCallCount++; + }; + + subscription.on('message', util.noop); + subscription.on('message', util.noop); + + assert.strictEqual(startPullingCallCount, 1); + }); + + it('should close when no more message listeners are bound', function() { + subscription.startPulling_ = util.noop; + subscription.on('message', util.noop); + subscription.on('message', util.noop); + // 2 listeners: sub should be open. + assert.strictEqual(subscription.closed, false); + subscription.removeListener('message', util.noop); + // 1 listener: sub should be open. + assert.strictEqual(subscription.closed, false); + subscription.removeListener('message', util.noop); + // 0 listeners: sub should be closed. + assert.strictEqual(subscription.closed, true); + }); + + it('should cancel the HTTP request when listeners removed', function(done) { + subscription.startPulling_ = util.noop; + + subscription.activeRequest_ = { + cancel: done + }; + + subscription.on('message', util.noop); + subscription.removeAllListeners(); + }); + }); + + describe('startPulling_', function() { + beforeEach(function() { + subscription.pull = util.noop; + }); + + it('should not pull if subscription is closed', function() { + subscription.pull = function() { + throw new Error('Should not be called.'); + }; + + subscription.closed = true; + subscription.startPulling_(); + }); + + it('should not pull if subscription is paused', function() { + subscription.pull = function() { + throw new Error('Should not be called.'); + }; + + subscription.paused = true; + subscription.startPulling_(); + }); + + it('should set returnImmediately to false when pulling', function(done) { + subscription.pull = function(options) { + assert.strictEqual(options.returnImmediately, false); + done(); + }; + + subscription.closed = false; + subscription.startPulling_(); + }); + + it('should not set maxResults if no maxInProgress is set', function(done) { + subscription.pull = function(options) { + assert.strictEqual(options.maxResults, undefined); + done(); + }; + + subscription.closed = false; + subscription.startPulling_(); + }); + + it('should set maxResults properly with maxInProgress', function(done) { + subscription.pull = function(options) { + assert.strictEqual(options.maxResults, 1); + done(); + }; + + subscription.closed = false; + subscription.maxInProgress = 4; + subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; + subscription.startPulling_(); + }); + + it('should emit an error event if one is encountered', function(done) { + var error = new Error('Error.'); + subscription.pull = function(options, callback) { + subscription.pull = function() {}; + setImmediate(function() { + callback(error); + }); + }; + + subscription.closed = false; + subscription + .once('error', function(err) { + assert.equal(err, error); + done(); + }) + .startPulling_(); + }); + + it('should emit an error event with apiResponse', function(done) { + var error = new Error('Error.'); + var resp = { success: false }; + subscription.pull = function(options, callback) { + subscription.pull = function() {}; + setImmediate(function() { + callback(error, null, resp); + }); + }; + + subscription.closed = false; + subscription + .once('error', function(err, apiResponse) { + assert.equal(err, error); + assert.deepEqual(resp, apiResponse); + done(); + }) + .startPulling_(); + }); + + it('should emit a message event', function(done) { + subscription.pull = function(options, callback) { + callback(null, [{ hi: 'there' }]); + }; + + subscription + .once('message', function(msg) { + assert.deepEqual(msg, { hi: 'there' }); + done(); + }); + }); + + it('should emit a message event with apiResponse', function(done) { + var resp = { success: true, msgs: [{ hi: 'there' }] }; + subscription.pull = function(options, callback) { + callback(null, [{ hi: 'there' }], resp); + }; + subscription + .once('message', function(msg, apiResponse) { + assert.deepEqual(resp, apiResponse); + done(); + }); + }); + + it('should pull at specified interval', function(done) { + var INTERVAL = 5; + subscription.pull = function(options, callback) { + assert.strictEqual(options.returnImmediately, false); + // After pull is called once, overwrite with `done`. + // This is to override the function passed to `setTimeout`, so we are + // sure it's the same pull function when we execute it. + subscription.pull = function() { + done(); + }; + callback(); + }; + var setTimeout = global.setTimeout; + global.setTimeout = function(fn, interval) { + global.setTimeout = setTimeout; + assert.equal(interval, INTERVAL); + // This should execute the `done` function from when we overrided it + // above. + fn(); + }; + + subscription.closed = false; + subscription.interval = INTERVAL; + subscription.startPulling_(); + }); + }); +}); diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js new file mode 100644 index 00000000000..58675909371 --- /dev/null +++ b/handwritten/pubsub/test/topic.js @@ -0,0 +1,305 @@ +/** + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); +var extend = require('extend'); +var nodeutil = require('util'); +var proxyquire = require('proxyquire'); + +var util = require('@google-cloud/common').util; +var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; + +function FakeIAM() { + this.calledWith_ = [].slice.call(arguments); +} + +function FakeGrpcServiceObject() { + this.calledWith_ = arguments; + GrpcServiceObject.apply(this, arguments); +} + +nodeutil.inherits(FakeGrpcServiceObject, GrpcServiceObject); + +describe('Topic', function() { + var Topic; + var topic; + + var PROJECT_ID = 'test-project'; + var TOPIC_NAME = 'projects/' + PROJECT_ID + '/topics/test-topic'; + var TOPIC_UNFORMATTED_NAME = TOPIC_NAME.split('/').pop(); + var PUBSUB = { + projectId: PROJECT_ID, + createTopic: util.noop + }; + + before(function() { + Topic = proxyquire('../src/topic.js', { + './iam.js': FakeIAM, + '@google-cloud/common': { + GrpcServiceObject: FakeGrpcServiceObject + } + }); + }); + + beforeEach(function() { + topic = new Topic(PUBSUB, TOPIC_NAME); + }); + + describe('initialization', function() { + it('should inherit from GrpcServiceObject', function() { + var pubsubInstance = extend({}, PUBSUB, { + createTopic: { + bind: function(context) { + assert.strictEqual(context, pubsubInstance); + } + } + }); + + var topic = new Topic(pubsubInstance, TOPIC_NAME); + assert(topic instanceof GrpcServiceObject); + + var calledWith = topic.calledWith_[0]; + + assert.strictEqual(calledWith.parent, pubsubInstance); + assert.strictEqual(calledWith.id, TOPIC_NAME); + assert.deepEqual(calledWith.methods, { + create: true, + delete: { + protoOpts: { + service: 'Publisher', + method: 'deleteTopic' + }, + reqOpts: { + topic: TOPIC_NAME + } + }, + exists: true, + get: true, + getMetadata: { + protoOpts: { + service: 'Publisher', + method: 'getTopic' + }, + reqOpts: { + topic: TOPIC_NAME + } + } + }); + }); + + it('should create an iam object', function() { + assert.deepEqual(topic.iam.calledWith_, [PUBSUB, TOPIC_NAME]); + }); + + it('should format name', function(done) { + var formatName_ = Topic.formatName_; + Topic.formatName_ = function() { + Topic.formatName_ = formatName_; + done(); + }; + new Topic(PUBSUB, TOPIC_NAME); + }); + + it('should assign pubsub object to `this`', function() { + assert.deepEqual(topic.pubsub, PUBSUB); + }); + }); + + describe('formatMessage_', function() { + var messageString = 'string'; + var messageBuffer = new Buffer(messageString); + + var messageObjectWithString = { data: messageString }; + var messageObjectWithBuffer = { data: messageBuffer }; + + it('should handle string data', function() { + assert.deepEqual( + Topic.formatMessage_(messageObjectWithString), + { data: new Buffer(JSON.stringify(messageString)).toString('base64') } + ); + }); + + it('should handle buffer data', function() { + assert.deepEqual( + Topic.formatMessage_(messageObjectWithBuffer), + { data: messageBuffer.toString('base64') } + ); + }); + }); + + describe('formatName_', function() { + it('should format name', function() { + var formattedName = Topic.formatName_(PROJECT_ID, TOPIC_UNFORMATTED_NAME); + assert.equal(formattedName, TOPIC_NAME); + }); + + it('should format name when given a complete name', function() { + var formattedName = Topic.formatName_(PROJECT_ID, TOPIC_NAME); + assert.equal(formattedName, TOPIC_NAME); + }); + }); + + describe('getSubscriptions', function() { + it('should accept just a callback', function(done) { + topic.pubsub.getSubscriptions = function(options, callback) { + assert.deepEqual(options, { topic: topic }); + callback(); + }; + + topic.getSubscriptions(done); + }); + + it('should pass correct args to pubsub#getSubscriptions', function(done) { + var opts = { a: 'b', c: 'd' }; + + topic.pubsub = { + getSubscriptions: function(options, callback) { + assert.deepEqual(options, opts); + assert.deepEqual(options.topic, topic); + callback(); + } + }; + + topic.getSubscriptions(opts, done); + }); + }); + + describe('publish', function() { + var message = 'howdy'; + var messageObject = { data: message }; + + it('should throw if no message is provided', function() { + assert.throws(function() { + topic.publish(); + }, /Cannot publish without a message/); + + assert.throws(function() { + topic.publish([]); + }, /Cannot publish without a message/); + }); + + it('should throw if a message has no data', function() { + assert.throws(function() { + topic.publish({}); + }, /Cannot publish message without a `data` property/); + }); + + it('should send correct api request', function(done) { + topic.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Publisher'); + assert.strictEqual(protoOpts.method, 'publish'); + + assert.strictEqual(reqOpts.topic, topic.name); + assert.deepEqual(reqOpts.messages, [ + { data: new Buffer(JSON.stringify(message)).toString('base64') } + ]); + + done(); + }; + + topic.publish(messageObject, assert.ifError); + }); + + it('should execute callback', function(done) { + topic.request = function(protoOpts, reqOpts, callback) { + callback(null, {}); + }; + + topic.publish(messageObject, done); + }); + + it('should execute callback with error', function(done) { + var error = new Error('Error.'); + var apiResponse = {}; + + topic.request = function(protoOpts, reqOpts, callback) { + callback(error, apiResponse); + }; + + topic.publish(messageObject, function(err, ackIds, apiResponse_) { + assert.strictEqual(err, error); + assert.strictEqual(ackIds, null); + assert.strictEqual(apiResponse_, apiResponse); + + done(); + }); + }); + + it('should execute callback with apiResponse', function(done) { + var resp = { success: true }; + + topic.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + + topic.publish(messageObject, function(err, ackIds, apiResponse) { + assert.deepEqual(resp, apiResponse); + done(); + }); + }); + }); + + describe('subscribe', function() { + it('should pass correct arguments to pubsub#subscribe', function(done) { + var subscriptionName = 'subName'; + var opts = {}; + + topic.pubsub.subscribe = function(t, subName, options, callback) { + assert.deepEqual(t, topic); + assert.equal(subName, subscriptionName); + assert.deepEqual(options, opts); + callback(); + }; + + topic.subscribe(subscriptionName, opts, done); + }); + }); + + describe('subscription', function() { + it('should pass correct arguments to pubsub#subscription', function(done) { + var subscriptionName = 'subName'; + var opts = {}; + + topic.pubsub.subscription = function(name, options) { + assert.equal(name, subscriptionName); + assert.deepEqual(options, opts); + done(); + }; + + topic.subscription(subscriptionName, opts); + }); + + it('should attach the topic instance to the options', function(done) { + topic.pubsub.subscription = function(name, options) { + assert.strictEqual(options.topic, topic); + done(); + }; + + topic.subscription(); + }); + + it('should return the result', function(done) { + topic.pubsub.subscription = function() { + return done; + }; + + var doneFn = topic.subscription(); + doneFn(); + }); + }); +}); From b4bfbb62252cc6fd23055e4ce2dca26290a47e1a Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 3 Aug 2016 20:26:08 -0400 Subject: [PATCH 0002/1115] set starting version points --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5adcef08975..114249a2423 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.0.0", + "version": "0.1.0", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ @@ -72,4 +72,4 @@ "engines": { "node": ">=0.12.0" } -} +} \ No newline at end of file From 9a2bc5495d33eec24c48db2c20beba7d1afad50a Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Thu, 4 Aug 2016 15:21:59 -0400 Subject: [PATCH 0003/1115] modular code style --- handwritten/pubsub/package.json | 4 +-- handwritten/pubsub/src/iam.js | 12 +++------ handwritten/pubsub/src/index.js | 31 ++++++------------------ handwritten/pubsub/src/subscription.js | 22 ++++------------- handwritten/pubsub/src/topic.js | 20 +++------------ handwritten/pubsub/system-test/pubsub.js | 21 +++++++++++----- handwritten/pubsub/test/iam.js | 5 ++-- handwritten/pubsub/test/index.js | 5 ++-- handwritten/pubsub/test/subscription.js | 13 +++++----- handwritten/pubsub/test/topic.js | 11 ++++----- 10 files changed, 52 insertions(+), 92 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 114249a2423..da06eb9b571 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -59,7 +59,7 @@ }, "devDependencies": { "async": "^1.4.2", - "mocha": "^2.1.0", + "mocha": "^3.0.1", "node-uuid": "^1.4.3", "proxyquire": "^1.7.10" }, @@ -72,4 +72,4 @@ "engines": { "node": ">=0.12.0" } -} \ No newline at end of file +} diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 176bf7193cb..e689f2270c1 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -23,13 +23,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); var is = require('is'); -var nodeutil = require('util'); - -/** - * @type {module:common/grpc-service} - * @private - */ -var GrpcService = common.GrpcService; +var util = require('util'); /*! Developer Documentation * @@ -89,10 +83,10 @@ function IAM(pubsub, id) { this.id = id; - GrpcService.call(this, config, pubsub.options); + common.GrpcService.call(this, config, pubsub.options); } -nodeutil.inherits(IAM, GrpcService); +util.inherits(IAM, common.GrpcService); /** * Get the IAM policy diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index f5ee4fa3a85..ecd9049690d 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -24,14 +24,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); var extend = require('extend'); var is = require('is'); -var nodeutil = require('util'); -var PKG = require('../package.json'); - -/** - * @type {module:common/grpc-service} - * @private - */ -var GrpcService = common.GrpcService; +var util = require('util'); /** * @type {module:pubsub/subscription} @@ -39,23 +32,13 @@ var GrpcService = common.GrpcService; */ var Subscription = require('./subscription.js'); -/** - * @type {module:common/stream-router} - * @private - */ -var streamRouter = common.streamRouter; - /** * @type {module:pubsub/topic} * @private */ var Topic = require('./topic.js'); -/** - * @type {module:common/util} - * @private - */ -var util = common.util; +var PKG = require('../package.json'); /** * [Google Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a @@ -86,7 +69,7 @@ var util = common.util; */ function PubSub(options) { if (!(this instanceof PubSub)) { - options = util.normalizeArguments(this, options); + options = common.util.normalizeArguments(this, options); return new PubSub(options); } @@ -107,10 +90,10 @@ function PubSub(options) { this.options = options; - GrpcService.call(this, config, options); + common.GrpcService.call(this, config, options); } -nodeutil.inherits(PubSub, GrpcService); +util.inherits(PubSub, common.GrpcService); /** * Create a topic with the given name. @@ -134,7 +117,7 @@ nodeutil.inherits(PubSub, GrpcService); PubSub.prototype.createTopic = function(name, callback) { var self = this; - callback = callback || util.noop; + callback = callback || common.util.noop; var protoOpts = { service: 'Publisher', @@ -613,7 +596,7 @@ PubSub.prototype.determineBaseUrl_ = function() { * These methods can be used with either a callback or as a readable object * stream. `streamRouter` is used to add this dual behavior. */ -streamRouter.extend(PubSub, ['getSubscriptions', 'getTopics']); +common.streamRouter.extend(PubSub, ['getSubscriptions', 'getTopics']); PubSub.Subscription = Subscription; PubSub.Topic = Topic; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 53a321c9a08..616ff6f186b 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -27,24 +27,12 @@ var is = require('is'); var modelo = require('modelo'); var prop = require('propprop'); -/** - * @type {module:common/grpc-service-object} - * @private - */ -var GrpcServiceObject = common.GrpcServiceObject; - /** * @type {module:pubsub/iam} * @private */ var IAM = require('./iam.js'); -/** - * @type {module:common/util} - * @private - */ -var util = common.util; - /** * @const {number} - The amount of time a subscription pull HTTP connection to * Pub/Sub stays open. @@ -251,7 +239,7 @@ function Subscription(pubsub, options) { config.methods.create = true; } - GrpcServiceObject.call(this, config); + common.GrpcServiceObject.call(this, config); events.EventEmitter.call(this); this.autoAck = is.boolean(options.autoAck) ? options.autoAck : false; @@ -304,7 +292,7 @@ function Subscription(pubsub, options) { this.listenForEvents_(); } -modelo.inherits(Subscription, GrpcServiceObject, events.EventEmitter); +modelo.inherits(Subscription, common.GrpcServiceObject, events.EventEmitter); /** * Simplify a message from an API response to have three properties, `id`, @@ -377,7 +365,7 @@ Subscription.prototype.ack = function(ackIds, callback) { ].join('')); } - callback = callback || util.noop; + callback = callback || common.util.noop; var protoOpts = { service: 'Subscriber', @@ -449,7 +437,7 @@ Subscription.prototype.decorateMessage_ = function(message) { Subscription.prototype.delete = function(callback) { var self = this; - callback = callback || util.noop; + callback = callback || common.util.noop; var protoOpts = { service: 'Subscriber', @@ -605,7 +593,7 @@ Subscription.prototype.pull = function(options, callback) { * subscription.setAckDeadline(options, function(err, apiResponse) {}); */ Subscription.prototype.setAckDeadline = function(options, callback) { - callback = callback || util.noop; + callback = callback || common.util.noop; var protoOpts = { service: 'Subscriber', diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 155616c8e7b..0c29b184959 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -23,14 +23,8 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); var is = require('is'); -var nodeutil = require('util'); var prop = require('propprop'); - -/** - * @type {module:common/util} - * @private - */ -var util = common.util; +var util = require('util'); /** * @type {module:pubsub/iam} @@ -38,12 +32,6 @@ var util = common.util; */ var IAM = require('./iam.js'); -/** - * @type {module:common/grpc-service-object} - * @private - */ -var GrpcServiceObject = common.GrpcServiceObject; - /*! Developer Documentation * * @param {module:pubsub} pubsub - PubSub object. @@ -156,7 +144,7 @@ function Topic(pubsub, name) { } }; - GrpcServiceObject.call(this, { + common.GrpcServiceObject.call(this, { parent: pubsub, id: this.name, createMethod: pubsub.createTopic.bind(pubsub), @@ -192,7 +180,7 @@ function Topic(pubsub, name) { this.iam = new IAM(pubsub, this.name); } -nodeutil.inherits(Topic, GrpcServiceObject); +util.inherits(Topic, common.GrpcServiceObject); /** * Format a message object as the upstream API expects it. @@ -356,7 +344,7 @@ Topic.prototype.publish = function(messages, callback) { throw new Error('Cannot publish message without a `data` property.'); } - callback = callback || util.noop; + callback = callback || common.util.noop; var protoOpts = { service: 'Publisher', diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index de9d371f631..58b88446fa4 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -18,20 +18,20 @@ var assert = require('assert'); var async = require('async'); +var Subscription = require('../src/subscription.js'); var uuid = require('node-uuid'); var env = require('../../../system-test/env.js'); -var Subscription = require('../src/subscription.js'); var pubsub = require('../')(env); -function generateTopicName() { - return 'test-topic-' + uuid.v4(); -} - function generateSubName() { return 'test-subscription-' + uuid.v4(); } +function generateTopicName() { + return 'test-topic-' + uuid.v4(); +} + describe('pubsub', function() { var TOPIC_NAMES = [ generateTopicName(), @@ -167,7 +167,16 @@ describe('pubsub', function() { async.times(10, function(_, next) { topic.publish({ data: 'hello' }, next); - }, done); + }, function(err) { + if (err) { + done(err); + return; + } + + // Consistency delay for subscriptions to be returned via + // `topic.getSubscriptions`. + setTimeout(done, 2500); + }); }); }); }); diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index cdf6310aa88..c1478de42fa 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -17,10 +17,9 @@ 'use strict'; var assert = require('assert'); -var proxyquire = require('proxyquire'); -var nodeutil = require('util'); - var GrpcService = require('@google-cloud/common').GrpcService; +var nodeutil = require('util'); +var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; function FakeGrpcService() { diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index e980bc64772..0879562d14f 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -20,14 +20,15 @@ var arrify = require('arrify'); var assert = require('assert'); var extend = require('extend'); var proxyquire = require('proxyquire'); - -var Topic = require('../src/topic.js'); var util = require('@google-cloud/common').util; + var PKG = require('../package.json'); var SubscriptionCached = require('../src/subscription.js'); var SubscriptionOverride; +var Topic = require('../src/topic.js'); + function Subscription(a, b) { var OverrideFn = SubscriptionOverride || SubscriptionCached; return new OverrideFn(a, b); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index e54beda2abe..4c35a7f80d7 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -18,16 +18,11 @@ var assert = require('assert'); var extend = require('extend'); -var proxyquire = require('proxyquire'); -var nodeutil = require('util'); - var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; +var nodeutil = require('util'); +var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; -function FakeIAM() { - this.calledWith_ = [].slice.call(arguments); -} - function FakeGrpcServiceObject() { this.calledWith_ = arguments; GrpcServiceObject.apply(this, arguments); @@ -35,6 +30,10 @@ function FakeGrpcServiceObject() { nodeutil.inherits(FakeGrpcServiceObject, GrpcServiceObject); +function FakeIAM() { + this.calledWith_ = [].slice.call(arguments); +} + var formatMessageOverride; describe('Subscription', function() { diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 58675909371..767c95d2a39 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -18,15 +18,10 @@ var assert = require('assert'); var extend = require('extend'); +var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; var nodeutil = require('util'); var proxyquire = require('proxyquire'); - var util = require('@google-cloud/common').util; -var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; - -function FakeIAM() { - this.calledWith_ = [].slice.call(arguments); -} function FakeGrpcServiceObject() { this.calledWith_ = arguments; @@ -35,6 +30,10 @@ function FakeGrpcServiceObject() { nodeutil.inherits(FakeGrpcServiceObject, GrpcServiceObject); +function FakeIAM() { + this.calledWith_ = [].slice.call(arguments); +} + describe('Topic', function() { var Topic; var topic; From 9d6a9b34461a37c214c94fdb6761d28c3d7aec2f Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Thu, 4 Aug 2016 15:46:09 -0400 Subject: [PATCH 0004/1115] more code style fixes --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index da06eb9b571..4f00494edaa 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -64,7 +64,7 @@ "proxyquire": "^1.7.10" }, "scripts": { - "publish": "../../scripts/publish", + "publish": "node ../../scripts/publish.js", "test": "mocha test/*.js", "system-test": "mocha system-test/*.js --no-timeouts --bail" }, From 5cb4c1d6f043e4390764937e415fe703a672d9b9 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 11 Aug 2016 15:03:40 -0400 Subject: [PATCH 0005/1115] docs: individual package support (#1479) docs: refactor doc scripts for modularization --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4f00494edaa..e363592c103 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -64,7 +64,7 @@ "proxyquire": "^1.7.10" }, "scripts": { - "publish": "node ../../scripts/publish.js", + "publish": "node ../../scripts/publish.js pubsub", "test": "mocha test/*.js", "system-test": "mocha system-test/*.js --no-timeouts --bail" }, From 503cad023d1c20bb189912c38eea6a0ad309433e Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Thu, 11 Aug 2016 20:32:57 -0400 Subject: [PATCH 0006/1115] fix publish script (#1480) --- handwritten/pubsub/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e363592c103..f4ae9fa3bac 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.1.0", + "version": "0.1.1", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ @@ -31,7 +31,7 @@ ], "main": "./src/index.js", "files": [ - "./src/*", + "src", "AUTHORS", "CONTRIBUTORS", "COPYING" @@ -64,7 +64,7 @@ "proxyquire": "^1.7.10" }, "scripts": { - "publish": "node ../../scripts/publish.js pubsub", + "publish-module": "node ../../scripts/publish.js pubsub", "test": "mocha test/*.js", "system-test": "mocha system-test/*.js --no-timeouts --bail" }, From 96260ed2bc29ef7d092dfede36ee6399b1ea016c Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 15 Aug 2016 08:21:22 -0700 Subject: [PATCH 0007/1115] docs: generate uniform service overviews (#1475) --- handwritten/pubsub/src/iam.js | 5 ----- handwritten/pubsub/src/index.js | 25 +------------------------ handwritten/pubsub/src/subscription.js | 5 ----- handwritten/pubsub/src/topic.js | 5 ----- 4 files changed, 1 insertion(+), 39 deletions(-) diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index e689f2270c1..036e5e8751a 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -59,11 +59,6 @@ var util = require('util'); * @resource [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example - * var pubsub = gcloud.pubsub({ - * projectId: 'grape-spaceship-123', - * keyFilename: '/path/to/keyfile.json' - * }); - * * var topic = pubsub.topic('my-topic'); * // topic.iam * diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index ecd9049690d..07bd5542074 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -51,21 +51,9 @@ var PKG = require('../package.json'); * @constructor * @alias module:pubsub * - * The `gcloud.pubsub` method will return a `pubsub` object, allowing you to - * create topics, publish messages, subscribe to topics, and more. - * - * To learn more about Pub/Sub, see the - * [Google Cloud Pub/Sub overview](https://developers.google.com/pubsub/overview). + * @resource [Google Cloud Pub/Sub overview]{@link https://developers.google.com/pubsub/overview} * * @param {object} options - [Configuration object](#/docs). - * - * @example - * var gcloud = require('google-cloud')({ - * keyFilename: '/path/to/keyfile.json', - * projectId: 'my-project' - * }); - * - * var pubsub = gcloud.pubsub(); */ function PubSub(options) { if (!(this instanceof PubSub)) { @@ -441,17 +429,6 @@ PubSub.prototype.getTopics = function(query, callback) { * autoAck: true, * interval: 30 * }, function(err, subscription, apiResponse) {}); - * - * //- - * // Create a subscription to a topic from another project. - * //- - * var anotherProject = gcloud.pubsub({ - * projectId: 'another-project' - * }); - * - * var topic = anotherProject.topic('messageCenter'); - * - * pubsub.subscribe(topic, name, function(err, subscription, apiResponse) {}); */ PubSub.prototype.subscribe = function(topic, subName, options, callback) { if (!is.string(topic) && !(topic instanceof Topic)) { diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 616ff6f186b..41571b6af29 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -80,11 +80,6 @@ var PUBSUB_API_TIMEOUT = 90000; * @constructor * * @example - * var gcloud = require('google-cloud'); - * var pubsub = gcloud.pubsub({ - * projectId: 'grape-spaceship-123' - * }); - * * //- * // From {module:pubsub#getSubscriptions}: * //- diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 0c29b184959..d282f9c4d96 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -44,11 +44,6 @@ var IAM = require('./iam.js'); * @alias module:pubsub/topic * * @example - * var gcloud = require('google-cloud'); - * var pubsub = gcloud.pubsub({ - * projectId: 'grape-spaceship-123' - * }); - * * var topic = pubsub.topic('my-topic'); */ function Topic(pubsub, name) { From 1d9d25040c22ec5eb99f65dc53d4c5c3981ec629 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 16 Aug 2016 13:47:46 -0400 Subject: [PATCH 0008/1115] tests: fix assert.throws() usage (#1468) --- handwritten/pubsub/test/iam.js | 4 ++-- handwritten/pubsub/test/index.js | 8 ++++---- handwritten/pubsub/test/subscription.js | 4 ++-- handwritten/pubsub/test/topic.js | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index c1478de42fa..dc394497ddb 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -93,7 +93,7 @@ describe('IAM', function() { it('should throw an error if a policy is not supplied', function() { assert.throws(function() { iam.setPolicy(util.noop); - }, /A policy object is required/); + }, /A policy object is required\./); }); it('should make the correct API request', function(done) { @@ -117,7 +117,7 @@ describe('IAM', function() { it('should throw an error if permissions are missing', function() { assert.throws(function() { iam.testPermissions(util.noop); - }, /Permissions are required/); + }, /Permissions are required\./); }); it('should make the correct API request', function(done) { diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 0879562d14f..f4c72c91947 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -468,13 +468,13 @@ describe('PubSub', function() { it('should throw if no Topic is provided', function() { assert.throws(function() { pubsub.subscribe(); - }, /A Topic is required.*/); + }, /A Topic is required for a new subscription\./); }); it('should throw if no sub name is provided', function() { assert.throws(function() { pubsub.subscribe('topic'); - }, /A subscription name is required.*/); + }, /A subscription name is required for a new subscription\./); }); it('should not require configuration options', function(done) { @@ -680,7 +680,7 @@ describe('PubSub', function() { it('should throw if no name is provided', function() { assert.throws(function() { pubsub.subscription(); - }, /The name of a subscription is required/); + }, /The name of a subscription is required\./); }); it('should return a Subscription object', function() { @@ -716,7 +716,7 @@ describe('PubSub', function() { it('should throw if a name is not provided', function() { assert.throws(function() { pubsub.topic(); - }, /name must be specified/); + }, /A name must be specified for a new topic\./); }); it('should return a Topic object', function() { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 4c35a7f80d7..e7dbc5d2dcd 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -258,10 +258,10 @@ describe('Subscription', function() { it('should throw if no IDs are provided', function() { assert.throws(function() { subscription.ack(); - }, /At least one ID/); + }, /At least one ID must be specified before it can be acknowledged\./); assert.throws(function() { subscription.ack([]); - }, /At least one ID/); + }, /At least one ID must be specified before it can be acknowledged\./); }); it('should accept a single id', function() { diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 767c95d2a39..1b2868a74a9 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -185,17 +185,17 @@ describe('Topic', function() { it('should throw if no message is provided', function() { assert.throws(function() { topic.publish(); - }, /Cannot publish without a message/); + }, /Cannot publish without a message\./); assert.throws(function() { topic.publish([]); - }, /Cannot publish without a message/); + }, /Cannot publish without a message\./); }); it('should throw if a message has no data', function() { assert.throws(function() { topic.publish({}); - }, /Cannot publish message without a `data` property/); + }, /Cannot publish message without a `data` property\./); }); it('should send correct api request', function(done) { From 8ef34991cc54ea708509e77eda728ae3b01029f5 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 23 Aug 2016 14:38:50 -0400 Subject: [PATCH 0009/1115] gcloud-node -> google-cloud-node (#1521) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/subscription.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f4ae9fa3bac..a24efc5aed8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -36,7 +36,7 @@ "CONTRIBUTORS", "COPYING" ], - "repository": "googlecloudplatform/gcloud-node", + "repository": "googlecloudplatform/google-cloud-node", "keywords": [ "google apis client", "google api client", diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 41571b6af29..d716c820e07 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -250,9 +250,9 @@ function Subscription(pubsub, options) { if (is.number(options.timeout)) { this.timeout = options.timeout; } else { - // The default timeout used in gcloud-node is 60s, but a pull request times - // out around 90 seconds. Allow an extra couple of seconds to give the API a - // chance to respond on its own before terminating the connection. + // The default timeout used in google-cloud-node is 60s, but a pull request + // times out around 90 seconds. Allow an extra couple of seconds to give the + // API a chance to respond on its own before terminating the connection. this.timeout = PUBSUB_API_TIMEOUT + 2000; } From a8f1b217eb37971a316a44152353f5f61de450fe Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 26 Aug 2016 13:25:29 -0400 Subject: [PATCH 0010/1115] add readmes for all packages (#1495) * add bigquery readme * add all readmes * copy readme as part of release script * gcloud-node -> google-cloud-node * fix youre good to gos * add resource manager scope * exclude unecessary files --- handwritten/pubsub/README.md | 98 ++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 handwritten/pubsub/README.md diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md new file mode 100644 index 00000000000..8cd929de5aa --- /dev/null +++ b/handwritten/pubsub/README.md @@ -0,0 +1,98 @@ +# @google-cloud/pubsub +> Google Cloud Pub/Sub Client Library for Node.js + +*Looking for more Google APIs than just Pub/Sub? You might want to check out [`google-cloud`][google-cloud].* + +- [API Documentation][gcloud-pubsub-docs] +- [Official Documentation][cloud-pubsub-docs] + + +```sh +$ npm install --save @google-cloud/pubsub +``` +```js +var pubsub = require('@google-cloud/pubsub')({ + projectId: 'grape-spaceship-123', + keyFilename: '/path/to/keyfile.json' +}); + +// Reference a topic that has been previously created. +var topic = pubsub.topic('my-topic'); + +// Publish a message to the topic. +topic.publish({ + data: 'New message!' +}, function(err) {}); + +// Subscribe to the topic. +var options = { + reuseExisting: true +}; + +topic.subscribe('subscription-name', options, function(err, subscription) { + // Register listeners to start pulling for messages. + function onError(err) {} + function onMessage(message) {} + subscription.on('error', onError); + subscription.on('message', onMessage); + + // Remove listeners to stop pulling for messages. + subscription.removeListener('message', onMessage); + subscription.removeListener('error', onError); +}); +``` + + +## Authentication + +It's incredibly easy to get authenticated and start using Google's APIs. You can set your credentials on a global basis as well as on a per-API basis. See each individual API section below to see how you can auth on a per-API-basis. This is useful if you want to use different accounts for different Google Cloud services. + +### On Google Compute Engine + +If you are running this client on Google Compute Engine, we handle authentication for you with no configuration. You just need to make sure that when you [set up the GCE instance][gce-how-to], you add the correct scopes for the APIs you want to access. + +``` js +// Authenticating on a global basis. +var projectId = process.env.GCLOUD_PROJECT; // E.g. 'grape-spaceship-123' + +var pubsub = require('@google-cloud/pubsub')({ + projectId: projectId +}); + +// ...you're good to go! +``` + +### Elsewhere + +If you are not running this client on Google Compute Engine, you need a Google Developers service account. To create a service account: + +1. Visit the [Google Developers Console][dev-console]. +2. Create a new project or click on an existing project. +3. Navigate to **APIs & auth** > **APIs section** and turn on the following APIs (you may need to enable billing in order to use these services): + * Google Cloud Pub/Sub API +4. Navigate to **APIs & auth** > **Credentials** and then: + * If you want to use a new service account, click on **Create new Client ID** and select **Service account**. After the account is created, you will be prompted to download the JSON key file that the library uses to authenticate your requests. + * If you want to generate a new key for an existing service account, click on **Generate new JSON key** and download the JSON key file. + +``` js +var projectId = process.env.GCLOUD_PROJECT; // E.g. 'grape-spaceship-123' + +var pubsub = require('@google-cloud/pubsub')({ + projectId: projectId, + + // The path to your key file: + keyFilename: '/path/to/keyfile.json' + + // Or the contents of the key file: + credentials: require('./path/to/keyfile.json') +}); + +// ...you're good to go! +``` + + +[google-cloud]: https://github.com/GoogleCloudPlatform/google-cloud-node/ +[gce-how-to]: https://cloud.google.com/compute/docs/authentication#using +[dev-console]: https://console.developers.google.com/project +[gcloud-pubsub-docs]: https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub +[cloud-pubsub-docs]: https://cloud.google.com/pubsub/docs From d3b25d42e4f4a2464dc9ee8e9b17ef11ca8bbfdc Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 26 Aug 2016 17:47:55 -0400 Subject: [PATCH 0011/1115] bigquery/language/logging/prediction/vision: decouple packages (#1531) * bigquery/language/logging/prediction/vision: decouple packages * tests: allow more time for docs tests to run * add vision test * resort dependencies like npm does --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a24efc5aed8..45063745e46 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,9 +50,9 @@ "pubsub" ], "dependencies": { + "@google-cloud/common": "^0.1.0", "arrify": "^1.0.0", "extend": "^3.0.0", - "@google-cloud/common": "^0.1.0", "is": "^3.0.1", "modelo": "^4.2.0", "propprop": "^0.3.0" From 47794d6ea003522604a36144e68a0d08edbab8ee Mon Sep 17 00:00:00 2001 From: Song Wang Date: Thu, 1 Sep 2016 13:59:45 -0700 Subject: [PATCH 0012/1115] Introduce Gapic-generated files for pubsub API (#1550) --- handwritten/pubsub/package.json | 2 + handwritten/pubsub/src/index.js | 1 + handwritten/pubsub/src/v1/index.js | 36 + handwritten/pubsub/src/v1/publisher_api.js | 503 +++++++++++++ .../src/v1/publisher_client_config.json | 93 +++ handwritten/pubsub/src/v1/subscriber_api.js | 686 ++++++++++++++++++ .../src/v1/subscriber_client_config.json | 92 +++ 7 files changed, 1413 insertions(+) create mode 100644 handwritten/pubsub/src/v1/index.js create mode 100644 handwritten/pubsub/src/v1/publisher_api.js create mode 100644 handwritten/pubsub/src/v1/publisher_client_config.json create mode 100644 handwritten/pubsub/src/v1/subscriber_api.js create mode 100644 handwritten/pubsub/src/v1/subscriber_client_config.json diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 45063745e46..5a58bca8cd1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,8 +51,10 @@ ], "dependencies": { "@google-cloud/common": "^0.1.0", + "arguejs": "^0.2.3", "arrify": "^1.0.0", "extend": "^3.0.0", + "google-gax": "^0.6.0", "is": "^3.0.1", "modelo": "^4.2.0", "propprop": "^0.3.0" diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 07bd5542074..3c3ace2eebc 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -579,3 +579,4 @@ PubSub.Subscription = Subscription; PubSub.Topic = Topic; module.exports = PubSub; +module.exports.v1 = require('./v1'); diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js new file mode 100644 index 00000000000..462855d97b5 --- /dev/null +++ b/handwritten/pubsub/src/v1/index.js @@ -0,0 +1,36 @@ +/*! + * Copyright 2016 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +'use strict'; + +var publisherApi = require('./publisher_api'); +var subscriberApi = require('./subscriber_api'); +var extend = require('extend'); +var gax = require('google-gax'); + +function v1(options) { + options = extend({ + scopes: v1.ALL_SCOPES + }, options); + var gaxGrpc = gax.grpc(options); + var result = {}; + extend(result, publisherApi(gaxGrpc)); + extend(result, subscriberApi(gaxGrpc)); + return result; +} + +v1.SERVICE_ADDRESS = publisherApi.SERVICE_ADDRESS; +v1.ALL_SCOPES = publisherApi.ALL_SCOPES; +module.exports = v1; diff --git a/handwritten/pubsub/src/v1/publisher_api.js b/handwritten/pubsub/src/v1/publisher_api.js new file mode 100644 index 00000000000..7b5751a5d8b --- /dev/null +++ b/handwritten/pubsub/src/v1/publisher_api.js @@ -0,0 +1,503 @@ +/* + * Copyright 2016 Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * EDITING INSTRUCTIONS + * This file was generated from the file + * https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto, + * and updates to that file get reflected here through a refresh process. + * For the short term, the refresh process will only be runnable by Google + * engineers. + * + * The only allowed edits are to method and file documentation. A 3-way + * merge preserves those additions if the generated source changes. + */ +/* TODO: introduce line-wrapping so that it never exceeds the limit. */ +/* jscs: disable maximumLineLength */ +'use strict'; + +var arguejs = require('arguejs'); +var configData = require('./publisher_client_config'); +var extend = require('extend'); +var gax = require('google-gax'); + +var SERVICE_ADDRESS = 'pubsub.googleapis.com'; + +var DEFAULT_SERVICE_PORT = 443; + +var CODE_GEN_NAME_VERSION = 'gapic/0.1.0'; + +var DEFAULT_TIMEOUT = 30; + +var PAGE_DESCRIPTORS = { + listTopics: new gax.PageDescriptor( + 'page_token', + 'next_page_token', + 'topics'), + listTopicSubscriptions: new gax.PageDescriptor( + 'page_token', + 'next_page_token', + 'subscriptions') +}; + +/** + * The scopes needed to make gRPC calls to all of the methods defined in + * this service. + */ +var ALL_SCOPES = [ + 'https://www.googleapis.com/auth/cloud-platform', + 'https://www.googleapis.com/auth/pubsub' +]; + +/** + * The service that an application uses to manipulate topics, and to send + * messages to a topic. + * + * This will be created through a builder function which can be obtained by the module. + * See the following example of how to initialize the module and how to access to the builder. + * @see {@link publisherApi} + * + * @example + * var pubsubV1 = require('@google-cloud/pubsub').v1({ + * // optional auth parameters. + * }); + * var api = pubsubV1.publisherApi(); + * + * @class + */ +function PublisherApi(gaxGrpc, grpcClient, opts) { + opts = opts || {}; + var servicePath = opts.servicePath || SERVICE_ADDRESS; + var port = opts.port || DEFAULT_SERVICE_PORT; + var sslCreds = opts.sslCreds || null; + var clientConfig = opts.clientConfig || {}; + var timeout = opts.timeout || DEFAULT_TIMEOUT; + var appName = opts.appName || 'gax'; + var appVersion = opts.appVersion || gax.Version; + + var googleApiClient = [ + appName + '/' + appVersion, + CODE_GEN_NAME_VERSION, + 'nodejs/' + process.version].join(' '); + + + var bundleDescriptors = { + publish: new gax.BundleDescriptor( + 'messages', + [ + 'topic' + ], + 'message_ids', + gax.createByteLengthFunction(grpcClient.google.pubsub.v1.PubsubMessage)) + }; + var defaults = gaxGrpc.constructSettings( + 'google.pubsub.v1.Publisher', + configData, + clientConfig, + timeout, + PAGE_DESCRIPTORS, + bundleDescriptors, + {'x-goog-api-client': googleApiClient}); + + var stub = gaxGrpc.createStub( + servicePath, + port, + grpcClient.google.pubsub.v1.Publisher, + {sslCreds: sslCreds}); + var methods = [ + 'createTopic', + 'publish', + 'getTopic', + 'listTopics', + 'listTopicSubscriptions', + 'deleteTopic' + ]; + methods.forEach(function(methodName) { + this['_' + methodName] = gax.createApiCall( + stub.then(function(stub) { return stub[methodName].bind(stub); }), + defaults[methodName]); + }.bind(this)); +} + +// Path templates + +var PROJECT_PATH_TEMPLATE = new gax.PathTemplate( + 'projects/{project}'); + +var TOPIC_PATH_TEMPLATE = new gax.PathTemplate( + 'projects/{project}/topics/{topic}'); + +/** + * Returns a fully-qualified project resource name string. + * @param {String} project + * @returns {String} + */ +PublisherApi.prototype.projectPath = function projectPath(project) { + return PROJECT_PATH_TEMPLATE.render({ + project: project + }); +}; + +/** + * Parses the projectName from a project resource. + * @param {String} projectName + * A fully-qualified path representing a project resources. + * @returns {String} - A string representing the project. + */ +PublisherApi.prototype.matchProjectFromProjectName = + function matchProjectFromProjectName(projectName) { + return PROJECT_PATH_TEMPLATE.match(projectName).project; +}; + +/** + * Returns a fully-qualified topic resource name string. + * @param {String} project + * @param {String} topic + * @returns {String} + */ +PublisherApi.prototype.topicPath = function topicPath(project, topic) { + return TOPIC_PATH_TEMPLATE.render({ + project: project, + topic: topic + }); +}; + +/** + * Parses the topicName from a topic resource. + * @param {String} topicName + * A fully-qualified path representing a topic resources. + * @returns {String} - A string representing the project. + */ +PublisherApi.prototype.matchProjectFromTopicName = + function matchProjectFromTopicName(topicName) { + return TOPIC_PATH_TEMPLATE.match(topicName).project; +}; + +/** + * Parses the topicName from a topic resource. + * @param {String} topicName + * A fully-qualified path representing a topic resources. + * @returns {String} - A string representing the topic. + */ +PublisherApi.prototype.matchTopicFromTopicName = + function matchTopicFromTopicName(topicName) { + return TOPIC_PATH_TEMPLATE.match(topicName).topic; +}; + +// Service calls + +/** + * Creates the given topic with the given name. + * + * @param {string} name + * The name of the topic. It must have the format + * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, + * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), + * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent + * signs (`%`). It must be between 3 and 255 characters in length, and it + * must not start with `"goog"`. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Topic]{@link Topic} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedName = api.topicPath("[PROJECT]", "[TOPIC]"); + * api.createTopic(formattedName, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +PublisherApi.prototype.createTopic = function createTopic() { + var args = arguejs({ + name: String, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + name: args.name + }; + return this._createTopic(req, args.options, args.callback); +}; + +/** + * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic + * does not exist. The message payload must not be empty; it must contain + * either a non-empty data field, or at least one attribute. + * + * @param {string} topic + * The messages in the request will be published on this topic. + * @param {Object[]} messages + * The messages to publish. + * + * This object should have the same structure as [PubsubMessage]{@link PubsubMessage} + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [PublishResponse]{@link PublishResponse} + * @returns {gax.BundleEventEmitter} - the event emitter to handle the call + * status. When isBundling: false is specified in the options, it still returns + * a gax.BundleEventEmitter but the API is immediately invoked, so it behaves same + * as a gax.EventEmitter does. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * var data = ''; + * var messagesElement = { + * data : data + * }; + * var messages = [messagesElement]; + * api.publish(formattedTopic, messages, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +PublisherApi.prototype.publish = function publish() { + var args = arguejs({ + topic: String, + messages: Array, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + topic: args.topic, + messages: args.messages + }; + return this._publish(req, args.options, args.callback); +}; + +/** + * Gets the configuration of a topic. + * + * @param {string} topic + * The name of the topic to get. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Topic]{@link Topic} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * api.getTopic(formattedTopic, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +PublisherApi.prototype.getTopic = function getTopic() { + var args = arguejs({ + topic: String, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + topic: args.topic + }; + return this._getTopic(req, args.options, args.callback); +}; + +/** + * Lists matching topics. + * + * @param {string} project + * The name of the cloud project that topics belong to. + * @param {Object=} otherArgs + * @param {number=} otherArgs.pageSize + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @returns {Stream} + * An object stream. By default, this emits an object representing + * [Topic]{@link Topic} on 'data' event. + * This object can also be configured to emit + * pages of the responses through the options parameter. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedProject = api.projectPath("[PROJECT]"); + * api.listTopics(formattedProject).on('data', function(element) { + * // doThingsWith(element) + * }); + */ +PublisherApi.prototype.listTopics = function listTopics() { + var args = arguejs({ + project: String, + otherArgs: [Object, {}], + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + project: args.project + }; + if ('pageSize' in args.otherArgs) { + req.page_size = args.otherArgs.pageSize; + } + return this._listTopics(req, args.options, args.callback); +}; + +/** + * Lists the name of the subscriptions for this topic. + * + * @param {string} topic + * The name of the topic that subscriptions are attached to. + * @param {Object=} otherArgs + * @param {number=} otherArgs.pageSize + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @returns {Stream} + * An object stream. By default, this emits a string on 'data' event. + * This object can also be configured to emit + * pages of the responses through the options parameter. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * api.listTopicSubscriptions(formattedTopic).on('data', function(element) { + * // doThingsWith(element) + * }); + */ +PublisherApi.prototype.listTopicSubscriptions = function listTopicSubscriptions() { + var args = arguejs({ + topic: String, + otherArgs: [Object, {}], + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + topic: args.topic + }; + if ('pageSize' in args.otherArgs) { + req.page_size = args.otherArgs.pageSize; + } + return this._listTopicSubscriptions(req, args.options, args.callback); +}; + +/** + * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic + * does not exist. After a topic is deleted, a new topic may be created with + * the same name; this is an entirely new topic with none of the old + * configuration or subscriptions. Existing subscriptions to this topic are + * not deleted, but their `topic` field is set to `_deleted-topic_`. + * + * @param {string} topic + * Name of the topic to delete. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error)=} callback + * The function which will be called with the result of the API call. + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * api.deleteTopic(formattedTopic, function(err) { + * if (err) { + * console.error(err); + * } + * }); + */ +PublisherApi.prototype.deleteTopic = function deleteTopic() { + var args = arguejs({ + topic: String, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + topic: args.topic + }; + return this._deleteTopic(req, args.options, args.callback); +}; + +function PublisherApiBuilder(gaxGrpc) { + if (!(this instanceof PublisherApiBuilder)) { + return new PublisherApiBuilder(gaxGrpc); + } + + var grpcClient = gaxGrpc.load([{ + root: require('google-proto-files')('..'), + file: 'google/pubsub/v1/pubsub.proto' + }]); + extend(this, grpcClient.google.pubsub.v1); + + /** + * Build a new instance of {@link PublisherApi}. + * + * @param {Object=} opts - The optional parameters. + * @param {String=} opts.servicePath + * The domain name of the API remote host. + * @param {number=} opts.port + * The port on which to connect to the remote host. + * @param {grpc.ClientCredentials=} opts.sslCreds + * A ClientCredentials for use with an SSL-enabled channel. + * @param {Object=} opts.clientConfig + * The customized config to build the call settings. See + * {@link gax.constructSettings} for the format. + * @param {number=} opts.timeout + * The default timeout, in seconds, for calls made through this client. + * @param {number=} opts.appName + * The codename of the calling service. + * @param {String=} opts.appVersion + * The version of the calling service. + */ + this.publisherApi = function(opts) { + return new PublisherApi(gaxGrpc, grpcClient, opts); + }; + extend(this.publisherApi, PublisherApi); +} +module.exports = PublisherApiBuilder; +module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS; +module.exports.ALL_SCOPES = ALL_SCOPES; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json new file mode 100644 index 00000000000..4df74e5170e --- /dev/null +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -0,0 +1,93 @@ +{ + "interfaces": { + "google.pubsub.v1.Publisher": { + "retry_codes": { + "retry_codes_def": { + "idempotent": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "one_plus_delivery": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "non_idempotent": [] + } + }, + "retry_params": { + "default": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 1.3, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 60000, + "rpc_timeout_multiplier": 1.0, + "max_rpc_timeout_millis": 60000, + "total_timeout_millis": 600000 + }, + "messaging": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 1.3, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 12000, + "rpc_timeout_multiplier": 1.0, + "max_rpc_timeout_millis": 12000, + "total_timeout_millis": 600000 + } + }, + "methods": { + "CreateTopic": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "Publish": { + "timeout_millis": 60000, + "retry_codes_name": "one_plus_delivery", + "retry_params_name": "messaging", + "bundling": { + "element_count_threshold": 10, + "element_count_limit": 1000, + "request_byte_threshold": 1024, + "request_byte_limit": 10485760, + "delay_threshold_millis": 10 + } + }, + "GetTopic": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "ListTopics": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "ListTopicSubscriptions": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "DeleteTopic": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "SetIamPolicy": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "GetIamPolicy": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "TestIamPermissions": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + } + } + } + } +} diff --git a/handwritten/pubsub/src/v1/subscriber_api.js b/handwritten/pubsub/src/v1/subscriber_api.js new file mode 100644 index 00000000000..4a46e1e0258 --- /dev/null +++ b/handwritten/pubsub/src/v1/subscriber_api.js @@ -0,0 +1,686 @@ +/* + * Copyright 2016 Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * EDITING INSTRUCTIONS + * This file was generated from the file + * https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto, + * and updates to that file get reflected here through a refresh process. + * For the short term, the refresh process will only be runnable by Google + * engineers. + * + * The only allowed edits are to method and file documentation. A 3-way + * merge preserves those additions if the generated source changes. + */ +/* TODO: introduce line-wrapping so that it never exceeds the limit. */ +/* jscs: disable maximumLineLength */ +'use strict'; + +var arguejs = require('arguejs'); +var configData = require('./subscriber_client_config'); +var extend = require('extend'); +var gax = require('google-gax'); + +var SERVICE_ADDRESS = 'pubsub.googleapis.com'; + +var DEFAULT_SERVICE_PORT = 443; + +var CODE_GEN_NAME_VERSION = 'gapic/0.1.0'; + +var DEFAULT_TIMEOUT = 30; + +var PAGE_DESCRIPTORS = { + listSubscriptions: new gax.PageDescriptor( + 'page_token', + 'next_page_token', + 'subscriptions') +}; + +/** + * The scopes needed to make gRPC calls to all of the methods defined in + * this service. + */ +var ALL_SCOPES = [ + 'https://www.googleapis.com/auth/cloud-platform', + 'https://www.googleapis.com/auth/pubsub' +]; + +/** + * The service that an application uses to manipulate subscriptions and to + * consume messages from a subscription via the `Pull` method. + * + * This will be created through a builder function which can be obtained by the module. + * See the following example of how to initialize the module and how to access to the builder. + * @see {@link subscriberApi} + * + * @example + * var pubsubV1 = require('@google-cloud/pubsub').v1({ + * // optional auth parameters. + * }); + * var api = pubsubV1.subscriberApi(); + * + * @class + */ +function SubscriberApi(gaxGrpc, grpcClient, opts) { + opts = opts || {}; + var servicePath = opts.servicePath || SERVICE_ADDRESS; + var port = opts.port || DEFAULT_SERVICE_PORT; + var sslCreds = opts.sslCreds || null; + var clientConfig = opts.clientConfig || {}; + var timeout = opts.timeout || DEFAULT_TIMEOUT; + var appName = opts.appName || 'gax'; + var appVersion = opts.appVersion || gax.Version; + + var googleApiClient = [ + appName + '/' + appVersion, + CODE_GEN_NAME_VERSION, + 'nodejs/' + process.version].join(' '); + + var defaults = gaxGrpc.constructSettings( + 'google.pubsub.v1.Subscriber', + configData, + clientConfig, + timeout, + PAGE_DESCRIPTORS, + null, + {'x-goog-api-client': googleApiClient}); + + var stub = gaxGrpc.createStub( + servicePath, + port, + grpcClient.google.pubsub.v1.Subscriber, + {sslCreds: sslCreds}); + var methods = [ + 'createSubscription', + 'getSubscription', + 'listSubscriptions', + 'deleteSubscription', + 'modifyAckDeadline', + 'acknowledge', + 'pull', + 'modifyPushConfig' + ]; + methods.forEach(function(methodName) { + this['_' + methodName] = gax.createApiCall( + stub.then(function(stub) { return stub[methodName].bind(stub); }), + defaults[methodName]); + }.bind(this)); +} + +// Path templates + +var PROJECT_PATH_TEMPLATE = new gax.PathTemplate( + 'projects/{project}'); + +var SUBSCRIPTION_PATH_TEMPLATE = new gax.PathTemplate( + 'projects/{project}/subscriptions/{subscription}'); + +var TOPIC_PATH_TEMPLATE = new gax.PathTemplate( + 'projects/{project}/topics/{topic}'); + +/** + * Returns a fully-qualified project resource name string. + * @param {String} project + * @returns {String} + */ +SubscriberApi.prototype.projectPath = function projectPath(project) { + return PROJECT_PATH_TEMPLATE.render({ + project: project + }); +}; + +/** + * Parses the projectName from a project resource. + * @param {String} projectName + * A fully-qualified path representing a project resources. + * @returns {String} - A string representing the project. + */ +SubscriberApi.prototype.matchProjectFromProjectName = + function matchProjectFromProjectName(projectName) { + return PROJECT_PATH_TEMPLATE.match(projectName).project; +}; + +/** + * Returns a fully-qualified subscription resource name string. + * @param {String} project + * @param {String} subscription + * @returns {String} + */ +SubscriberApi.prototype.subscriptionPath = function subscriptionPath(project, subscription) { + return SUBSCRIPTION_PATH_TEMPLATE.render({ + project: project, + subscription: subscription + }); +}; + +/** + * Parses the subscriptionName from a subscription resource. + * @param {String} subscriptionName + * A fully-qualified path representing a subscription resources. + * @returns {String} - A string representing the project. + */ +SubscriberApi.prototype.matchProjectFromSubscriptionName = + function matchProjectFromSubscriptionName(subscriptionName) { + return SUBSCRIPTION_PATH_TEMPLATE.match(subscriptionName).project; +}; + +/** + * Parses the subscriptionName from a subscription resource. + * @param {String} subscriptionName + * A fully-qualified path representing a subscription resources. + * @returns {String} - A string representing the subscription. + */ +SubscriberApi.prototype.matchSubscriptionFromSubscriptionName = + function matchSubscriptionFromSubscriptionName(subscriptionName) { + return SUBSCRIPTION_PATH_TEMPLATE.match(subscriptionName).subscription; +}; + +/** + * Returns a fully-qualified topic resource name string. + * @param {String} project + * @param {String} topic + * @returns {String} + */ +SubscriberApi.prototype.topicPath = function topicPath(project, topic) { + return TOPIC_PATH_TEMPLATE.render({ + project: project, + topic: topic + }); +}; + +/** + * Parses the topicName from a topic resource. + * @param {String} topicName + * A fully-qualified path representing a topic resources. + * @returns {String} - A string representing the project. + */ +SubscriberApi.prototype.matchProjectFromTopicName = + function matchProjectFromTopicName(topicName) { + return TOPIC_PATH_TEMPLATE.match(topicName).project; +}; + +/** + * Parses the topicName from a topic resource. + * @param {String} topicName + * A fully-qualified path representing a topic resources. + * @returns {String} - A string representing the topic. + */ +SubscriberApi.prototype.matchTopicFromTopicName = + function matchTopicFromTopicName(topicName) { + return TOPIC_PATH_TEMPLATE.match(topicName).topic; +}; + +// Service calls + +/** + * Creates a subscription to a given topic for a given subscriber. + * If the subscription already exists, returns `ALREADY_EXISTS`. + * If the corresponding topic doesn't exist, returns `NOT_FOUND`. + * + * If the name is not provided in the request, the server will assign a random + * name for this subscription on the same project as the topic. + * + * @param {string} name + * The name of the subscription. It must have the format + * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must + * start with a letter, and contain only letters (`[A-Za-z]`), numbers + * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), + * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters + * in length, and it must not start with `"goog"`. + * @param {string} topic + * The name of the topic from which this subscription is receiving messages. + * The value of this field will be `_deleted-topic_` if the topic has been + * deleted. + * @param {Object=} otherArgs + * @param {Object=} otherArgs.pushConfig + * If push delivery is used with this subscription, this field is + * used to configure it. An empty `pushConfig` signifies that the subscriber + * will pull and ack messages using API methods. + * + * This object should have the same structure as [PushConfig]{@link PushConfig} + * @param {number=} otherArgs.ackDeadlineSeconds + * This value is the maximum time after a subscriber receives a message + * before the subscriber should acknowledge the message. After message + * delivery but before the ack deadline expires and before the message is + * acknowledged, it is an outstanding message and will not be delivered + * again during that time (on a best-effort basis). + * + * For pull subscriptions, this value is used as the initial value for the ack + * deadline. To override this value for a given message, call + * `ModifyAckDeadline` with the corresponding `ack_id` if using + * pull. + * + * For push delivery, this value is also used to set the request timeout for + * the call to the push endpoint. + * + * If the subscriber never acknowledges the message, the Pub/Sub + * system will eventually redeliver the message. + * + * If this parameter is not set, the default value of 10 seconds is used. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Subscription]{@link Subscription} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedName = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * api.createSubscription(formattedName, formattedTopic, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +SubscriberApi.prototype.createSubscription = function createSubscription() { + var args = arguejs({ + name: String, + topic: String, + otherArgs: [Object, {}], + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + name: args.name, + topic: args.topic + }; + if ('pushConfig' in args.otherArgs) { + req.push_config = args.otherArgs.pushConfig; + } + if ('ackDeadlineSeconds' in args.otherArgs) { + req.ack_deadline_seconds = args.otherArgs.ackDeadlineSeconds; + } + return this._createSubscription(req, args.options, args.callback); +}; + +/** + * Gets the configuration details of a subscription. + * + * @param {string} subscription + * The name of the subscription to get. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Subscription]{@link Subscription} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * api.getSubscription(formattedSubscription, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +SubscriberApi.prototype.getSubscription = function getSubscription() { + var args = arguejs({ + subscription: String, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + subscription: args.subscription + }; + return this._getSubscription(req, args.options, args.callback); +}; + +/** + * Lists matching subscriptions. + * + * @param {string} project + * The name of the cloud project that subscriptions belong to. + * @param {Object=} otherArgs + * @param {number=} otherArgs.pageSize + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @returns {Stream} + * An object stream. By default, this emits an object representing + * [Subscription]{@link Subscription} on 'data' event. + * This object can also be configured to emit + * pages of the responses through the options parameter. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedProject = api.projectPath("[PROJECT]"); + * api.listSubscriptions(formattedProject).on('data', function(element) { + * // doThingsWith(element) + * }); + */ +SubscriberApi.prototype.listSubscriptions = function listSubscriptions() { + var args = arguejs({ + project: String, + otherArgs: [Object, {}], + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + project: args.project + }; + if ('pageSize' in args.otherArgs) { + req.page_size = args.otherArgs.pageSize; + } + return this._listSubscriptions(req, args.options, args.callback); +}; + +/** + * Deletes an existing subscription. All pending messages in the subscription + * are immediately dropped. Calls to `Pull` after deletion will return + * `NOT_FOUND`. After a subscription is deleted, a new one may be created with + * the same name, but the new one has no association with the old + * subscription, or its topic unless the same topic is specified. + * + * @param {string} subscription + * The subscription to delete. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error)=} callback + * The function which will be called with the result of the API call. + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * api.deleteSubscription(formattedSubscription, function(err) { + * if (err) { + * console.error(err); + * } + * }); + */ +SubscriberApi.prototype.deleteSubscription = function deleteSubscription() { + var args = arguejs({ + subscription: String, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + subscription: args.subscription + }; + return this._deleteSubscription(req, args.options, args.callback); +}; + +/** + * Modifies the ack deadline for a specific message. This method is useful + * to indicate that more time is needed to process a message by the + * subscriber, or to make the message available for redelivery if the + * processing was interrupted. + * + * @param {string} subscription + * The name of the subscription. + * @param {string[]} ackIds + * List of acknowledgment IDs. + * @param {number} ackDeadlineSeconds + * The new ack deadline with respect to the time this request was sent to + * the Pub/Sub system. Must be >= 0. For example, if the value is 10, the new + * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call + * was made. Specifying zero may immediately make the message available for + * another pull request. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error)=} callback + * The function which will be called with the result of the API call. + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var ackIds = []; + * var ackDeadlineSeconds = 0; + * api.modifyAckDeadline(formattedSubscription, ackIds, ackDeadlineSeconds, function(err) { + * if (err) { + * console.error(err); + * } + * }); + */ +SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline() { + var args = arguejs({ + subscription: String, + ackIds: Array, + ackDeadlineSeconds: Number, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + subscription: args.subscription, + ack_ids: args.ackIds, + ack_deadline_seconds: args.ackDeadlineSeconds + }; + return this._modifyAckDeadline(req, args.options, args.callback); +}; + +/** + * Acknowledges the messages associated with the `ack_ids` in the + * `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages + * from the subscription. + * + * Acknowledging a message whose ack deadline has expired may succeed, + * but such a message may be redelivered later. Acknowledging a message more + * than once will not result in an error. + * + * @param {string} subscription + * The subscription whose message is being acknowledged. + * @param {string[]} ackIds + * The acknowledgment ID for the messages being acknowledged that was returned + * by the Pub/Sub system in the `Pull` response. Must not be empty. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error)=} callback + * The function which will be called with the result of the API call. + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var ackIds = []; + * api.acknowledge(formattedSubscription, ackIds, function(err) { + * if (err) { + * console.error(err); + * } + * }); + */ +SubscriberApi.prototype.acknowledge = function acknowledge() { + var args = arguejs({ + subscription: String, + ackIds: Array, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + subscription: args.subscription, + ack_ids: args.ackIds + }; + return this._acknowledge(req, args.options, args.callback); +}; + +/** + * Pulls messages from the server. Returns an empty list if there are no + * messages available in the backlog. The server may return `UNAVAILABLE` if + * there are too many concurrent pull requests pending for the given + * subscription. + * + * @param {string} subscription + * The subscription from which messages should be pulled. + * @param {number} maxMessages + * The maximum number of messages returned for this request. The Pub/Sub + * system may return fewer than the number specified. + * @param {Object=} otherArgs + * @param {boolean=} otherArgs.returnImmediately + * If this is specified as true the system will respond immediately even if + * it is not able to return a message in the `Pull` response. Otherwise the + * system is allowed to wait until at least one message is available rather + * than returning no messages. The client may cancel the request if it does + * not wish to wait any longer for the response. + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [PullResponse]{@link PullResponse} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var maxMessages = 0; + * api.pull(formattedSubscription, maxMessages, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +SubscriberApi.prototype.pull = function pull() { + var args = arguejs({ + subscription: String, + maxMessages: Number, + otherArgs: [Object, {}], + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + subscription: args.subscription, + max_messages: args.maxMessages + }; + if ('returnImmediately' in args.otherArgs) { + req.return_immediately = args.otherArgs.returnImmediately; + } + return this._pull(req, args.options, args.callback); +}; + +/** + * Modifies the `PushConfig` for a specified subscription. + * + * This may be used to change a push subscription to a pull one (signified by + * an empty `PushConfig`) or vice versa, or change the endpoint URL and other + * attributes of a push subscription. Messages will accumulate for delivery + * continuously through the call regardless of changes to the `PushConfig`. + * + * @param {string} subscription + * The name of the subscription. + * @param {Object} pushConfig + * The push configuration for future deliveries. + * + * An empty `pushConfig` indicates that the Pub/Sub system should + * stop pushing messages from the given subscription and allow + * messages to be pulled and acknowledged - effectively pausing + * the subscription if `Pull` is not called. + * + * This object should have the same structure as [PushConfig]{@link PushConfig} + * @param {gax.CallOptions=} options + * Overrides the default settings for this call, e.g, timeout, + * retries, etc. + * @param {function(?Error)=} callback + * The function which will be called with the result of the API call. + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var pushConfig = {}; + * api.modifyPushConfig(formattedSubscription, pushConfig, function(err) { + * if (err) { + * console.error(err); + * } + * }); + */ +SubscriberApi.prototype.modifyPushConfig = function modifyPushConfig() { + var args = arguejs({ + subscription: String, + pushConfig: Object, + options: [gax.CallOptions], + callback: [Function] + }, arguments); + var req = { + subscription: args.subscription, + push_config: args.pushConfig + }; + return this._modifyPushConfig(req, args.options, args.callback); +}; + +function SubscriberApiBuilder(gaxGrpc) { + if (!(this instanceof SubscriberApiBuilder)) { + return new SubscriberApiBuilder(gaxGrpc); + } + + var grpcClient = gaxGrpc.load([{ + root: require('google-proto-files')('..'), + file: 'google/pubsub/v1/pubsub.proto' + }]); + extend(this, grpcClient.google.pubsub.v1); + + /** + * Build a new instance of {@link SubscriberApi}. + * + * @param {Object=} opts - The optional parameters. + * @param {String=} opts.servicePath + * The domain name of the API remote host. + * @param {number=} opts.port + * The port on which to connect to the remote host. + * @param {grpc.ClientCredentials=} opts.sslCreds + * A ClientCredentials for use with an SSL-enabled channel. + * @param {Object=} opts.clientConfig + * The customized config to build the call settings. See + * {@link gax.constructSettings} for the format. + * @param {number=} opts.timeout + * The default timeout, in seconds, for calls made through this client. + * @param {number=} opts.appName + * The codename of the calling service. + * @param {String=} opts.appVersion + * The version of the calling service. + */ + this.subscriberApi = function(opts) { + return new SubscriberApi(gaxGrpc, grpcClient, opts); + }; + extend(this.subscriberApi, SubscriberApi); +} +module.exports = SubscriberApiBuilder; +module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS; +module.exports.ALL_SCOPES = ALL_SCOPES; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json new file mode 100644 index 00000000000..c39ebcb51e6 --- /dev/null +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -0,0 +1,92 @@ +{ + "interfaces": { + "google.pubsub.v1.Subscriber": { + "retry_codes": { + "retry_codes_def": { + "idempotent": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "non_idempotent": [] + } + }, + "retry_params": { + "default": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 1.3, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 60000, + "rpc_timeout_multiplier": 1.0, + "max_rpc_timeout_millis": 60000, + "total_timeout_millis": 600000 + }, + "messaging": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 1.3, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 12000, + "rpc_timeout_multiplier": 1.0, + "max_rpc_timeout_millis": 12000, + "total_timeout_millis": 600000 + } + }, + "methods": { + "CreateSubscription": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "GetSubscription": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "ListSubscriptions": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "DeleteSubscription": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "ModifyAckDeadline": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "Acknowledge": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "messaging" + }, + "Pull": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "messaging" + }, + "ModifyPushConfig": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "SetIamPolicy": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "GetIamPolicy": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "TestIamPermissions": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + } + } + } + } +} From 1865397e38164e077273779bd99b9ddc15aa60a8 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 6 Sep 2016 10:15:14 -0400 Subject: [PATCH 0013/1115] docs: remove `nextQuery` docs & annotate arrays correctly (#1559) --- handwritten/pubsub/src/index.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 3c3ace2eebc..8a5b237c62c 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -153,9 +153,7 @@ PubSub.prototype.createTopic = function(name, callback) { * @param {function} callback - The callback function. * @param {?error} callback.err - An error from the API call, may be null. * @param {module:pubsub/subscription[]} callback.subscriptions - The list of - * subscriptions returned. - * @param {?object} callback.nextQuery - A query object representing the next - * page of topics. + * subscriptions in your project. * @param {object} callback.apiResponse - The full API response from the * service. * @@ -279,8 +277,6 @@ PubSub.prototype.getSubscriptions = function(options, callback) { * @param {function} callback - The callback function. * @param {?error} callback.err - An error from the API call, may be null. * @param {module:pubsub/topic[]} callback.topics - The list of topics returned. - * @param {?object} callback.nextQuery - A query object representing the next - * page of topics. * @param {object} callback.apiResponse - The full API response from the * service. * From 2c2ef12ec46493ae358eb4ef7f678c5406de0a48 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 7 Sep 2016 12:47:14 -0400 Subject: [PATCH 0014/1115] pubsub: update dependencies --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5a58bca8cd1..95c6dcca6dc 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.1.0", + "@google-cloud/common": "^0.4.0", "arguejs": "^0.2.3", "arrify": "^1.0.0", "extend": "^3.0.0", @@ -60,7 +60,7 @@ "propprop": "^0.3.0" }, "devDependencies": { - "async": "^1.4.2", + "async": "^1.5.2", "mocha": "^3.0.1", "node-uuid": "^1.4.3", "proxyquire": "^1.7.10" From db73f6cbc3a571626e722275220a2f7f0daa5037 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 7 Sep 2016 12:47:46 -0400 Subject: [PATCH 0015/1115] pubsub @ 0.2.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 95c6dcca6dc..cf6decc3391 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.1.1", + "version": "0.2.0", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 45f1e3c93ac4d4af90a364ad48135ab8bf1b90dd Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 9 Sep 2016 15:19:15 -0400 Subject: [PATCH 0016/1115] all modules: ensure all User-Agents are set (#1568) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/iam.js | 3 ++- handwritten/pubsub/src/index.js | 4 +--- handwritten/pubsub/test/iam.js | 1 + handwritten/pubsub/test/index.js | 4 +--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cf6decc3391..8f9fed2b64b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.4.0", + "@google-cloud/common": "^0.5.0", "arguejs": "^0.2.3", "arrify": "^1.0.0", "extend": "^3.0.0", diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 036e5e8751a..30501f8471d 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -73,7 +73,8 @@ function IAM(pubsub, id) { scopes: [ 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' - ] + ], + packageJson: require('../package.json') }; this.id = id; diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 8a5b237c62c..d76f4968a95 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -38,8 +38,6 @@ var Subscription = require('./subscription.js'); */ var Topic = require('./topic.js'); -var PKG = require('../package.json'); - /** * [Google Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a * reliable, many-to-many, asynchronous messaging service from Google Cloud @@ -73,7 +71,7 @@ function PubSub(options) { 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' ], - userAgent: PKG.name + '/' + PKG.version + packageJson: require('../package.json') }; this.options = options; diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index dc394497ddb..d13eda5c7d3 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -65,6 +65,7 @@ describe('IAM', function() { 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' ]); + assert.deepEqual(config.packageJson, require('../package.json')); assert.strictEqual(options, PUBSUB.options); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index f4c72c91947..111e31f098e 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -22,8 +22,6 @@ var extend = require('extend'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; -var PKG = require('../package.json'); - var SubscriptionCached = require('../src/subscription.js'); var SubscriptionOverride; @@ -124,7 +122,7 @@ describe('PubSub', function() { 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' ]); - assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version); + assert.deepEqual(calledWith.packageJson, require('../package.json')); }); it('should set the defaultBaseUrl_', function() { From 35ff903bb00fc152331af6a631e5523ef3794f59 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 26 Sep 2016 18:55:38 -0400 Subject: [PATCH 0017/1115] all: update @google-cloud/common dependency --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8f9fed2b64b..a377a88adbe 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.5.0", + "@google-cloud/common": "^0.6.0", "arguejs": "^0.2.3", "arrify": "^1.0.0", "extend": "^3.0.0", From 42abd4598e83e3945e20258cbdfd8f3c2906437c Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 26 Sep 2016 18:58:28 -0400 Subject: [PATCH 0018/1115] pubsub @ 0.3.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a377a88adbe..03c48ec2653 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.2.0", + "version": "0.3.0", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ From a4d228832abc3d8fd44158443924ba17aa2e7958 Mon Sep 17 00:00:00 2001 From: Jun Mukai Date: Wed, 28 Sep 2016 05:06:33 -0700 Subject: [PATCH 0019/1115] Regenerate the codegen files to sync with the latest version. (#1640) --- handwritten/pubsub/package.json | 4 +- handwritten/pubsub/src/v1/publisher_api.js | 471 +++++++++++++---- handwritten/pubsub/src/v1/subscriber_api.js | 536 ++++++++++++++------ 3 files changed, 755 insertions(+), 256 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 03c48ec2653..55438b3aa8d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,10 +51,10 @@ ], "dependencies": { "@google-cloud/common": "^0.6.0", - "arguejs": "^0.2.3", "arrify": "^1.0.0", "extend": "^3.0.0", - "google-gax": "^0.6.0", + "google-gax": "^0.7.0", + "google-proto-files": "^0.8.0", "is": "^3.0.1", "modelo": "^4.2.0", "propprop": "^0.3.0" diff --git a/handwritten/pubsub/src/v1/publisher_api.js b/handwritten/pubsub/src/v1/publisher_api.js index 7b5751a5d8b..1cdc9d7551c 100644 --- a/handwritten/pubsub/src/v1/publisher_api.js +++ b/handwritten/pubsub/src/v1/publisher_api.js @@ -27,7 +27,6 @@ /* jscs: disable maximumLineLength */ 'use strict'; -var arguejs = require('arguejs'); var configData = require('./publisher_client_config'); var extend = require('extend'); var gax = require('google-gax'); @@ -38,16 +37,15 @@ var DEFAULT_SERVICE_PORT = 443; var CODE_GEN_NAME_VERSION = 'gapic/0.1.0'; -var DEFAULT_TIMEOUT = 30; var PAGE_DESCRIPTORS = { listTopics: new gax.PageDescriptor( - 'page_token', - 'next_page_token', + 'pageToken', + 'nextPageToken', 'topics'), listTopicSubscriptions: new gax.PageDescriptor( - 'page_token', - 'next_page_token', + 'pageToken', + 'nextPageToken', 'subscriptions') }; @@ -76,19 +74,19 @@ var ALL_SCOPES = [ * * @class */ -function PublisherApi(gaxGrpc, grpcClient, opts) { +function PublisherApi(gaxGrpc, grpcClients, opts) { opts = opts || {}; var servicePath = opts.servicePath || SERVICE_ADDRESS; var port = opts.port || DEFAULT_SERVICE_PORT; var sslCreds = opts.sslCreds || null; var clientConfig = opts.clientConfig || {}; - var timeout = opts.timeout || DEFAULT_TIMEOUT; var appName = opts.appName || 'gax'; - var appVersion = opts.appVersion || gax.Version; + var appVersion = opts.appVersion || gax.version; var googleApiClient = [ appName + '/' + appVersion, CODE_GEN_NAME_VERSION, + 'gax/' + gax.version, 'nodejs/' + process.version].join(' '); @@ -98,24 +96,41 @@ function PublisherApi(gaxGrpc, grpcClient, opts) { [ 'topic' ], - 'message_ids', - gax.createByteLengthFunction(grpcClient.google.pubsub.v1.PubsubMessage)) + 'messageIds', + gax.createByteLengthFunction(grpcClients.publisherClient.google.pubsub.v1.PubsubMessage)) }; var defaults = gaxGrpc.constructSettings( 'google.pubsub.v1.Publisher', configData, clientConfig, - timeout, PAGE_DESCRIPTORS, bundleDescriptors, {'x-goog-api-client': googleApiClient}); - var stub = gaxGrpc.createStub( + var iamPolicyStub = gaxGrpc.createStub( servicePath, port, - grpcClient.google.pubsub.v1.Publisher, + grpcClients.iamPolicyClient.google.iam.v1.IAMPolicy, {sslCreds: sslCreds}); - var methods = [ + var iamPolicyStubMethods = [ + 'setIamPolicy', + 'getIamPolicy', + 'testIamPermissions' + ]; + iamPolicyStubMethods.forEach(function(methodName) { + this['_' + methodName] = gax.createApiCall( + iamPolicyStub.then(function(iamPolicyStub) { + return iamPolicyStub[methodName].bind(iamPolicyStub); + }), + defaults[methodName]); + }.bind(this)); + + var publisherStub = gaxGrpc.createStub( + servicePath, + port, + grpcClients.publisherClient.google.pubsub.v1.Publisher, + {sslCreds: sslCreds}); + var publisherStubMethods = [ 'createTopic', 'publish', 'getTopic', @@ -123,10 +138,12 @@ function PublisherApi(gaxGrpc, grpcClient, opts) { 'listTopicSubscriptions', 'deleteTopic' ]; - methods.forEach(function(methodName) { + publisherStubMethods.forEach(function(methodName) { this['_' + methodName] = gax.createApiCall( - stub.then(function(stub) { return stub[methodName].bind(stub); }), - defaults[methodName]); + publisherStub.then(function(publisherStub) { + return publisherStub[methodName].bind(publisherStub); + }), + defaults[methodName]); }.bind(this)); } @@ -207,9 +224,9 @@ PublisherApi.prototype.matchTopicFromTopicName = * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent * signs (`%`). It must be between 3 and 255 characters in length, and it * must not start with `"goog"`. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * @@ -229,16 +246,21 @@ PublisherApi.prototype.matchTopicFromTopicName = * // doThingsWith(response) * }); */ -PublisherApi.prototype.createTopic = function createTopic() { - var args = arguejs({ - name: String, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +PublisherApi.prototype.createTopic = function createTopic( + name, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - name: args.name + name: name }; - return this._createTopic(req, args.options, args.callback); + return this._createTopic(req, options, callback); }; /** @@ -252,9 +274,9 @@ PublisherApi.prototype.createTopic = function createTopic() { * The messages to publish. * * This object should have the same structure as [PubsubMessage]{@link PubsubMessage} - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * @@ -281,18 +303,23 @@ PublisherApi.prototype.createTopic = function createTopic() { * // doThingsWith(response) * }); */ -PublisherApi.prototype.publish = function publish() { - var args = arguejs({ - topic: String, - messages: Array, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +PublisherApi.prototype.publish = function publish( + topic, + messages, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - topic: args.topic, - messages: args.messages + topic: topic, + messages: messages }; - return this._publish(req, args.options, args.callback); + return this._publish(req, options, callback); }; /** @@ -300,9 +327,9 @@ PublisherApi.prototype.publish = function publish() { * * @param {string} topic * The name of the topic to get. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * @@ -322,16 +349,21 @@ PublisherApi.prototype.publish = function publish() { * // doThingsWith(response) * }); */ -PublisherApi.prototype.getTopic = function getTopic() { - var args = arguejs({ - topic: String, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +PublisherApi.prototype.getTopic = function getTopic( + topic, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - topic: args.topic + topic: topic }; - return this._getTopic(req, args.options, args.callback); + return this._getTopic(req, options, callback); }; /** @@ -339,44 +371,71 @@ PublisherApi.prototype.getTopic = function getTopic() { * * @param {string} project * The name of the cloud project that topics belong to. - * @param {Object=} otherArgs - * @param {number=} otherArgs.pageSize + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * + * In addition, options may contain the following optional parameters. + * @param {number=} options.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this * parameter does not affect the return value. If page streaming is * performed per-page, this determines the maximum number of * resources in a page. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. - * @returns {Stream} - * An object stream. By default, this emits an object representing + * + * @param {function(?Error, ?Object, ?string)=} callback + * When specified, the results are not streamed but this callback + * will be called with the response object representing [ListTopicsResponse]{@link ListTopicsResponse}. + * The third item will be set if the response contains the token for the further results + * and can be reused to `pageToken` field in the options in the next request. + * @returns {Stream|gax.EventEmitter} + * An object stream which emits an object representing * [Topic]{@link Topic} on 'data' event. - * This object can also be configured to emit - * pages of the responses through the options parameter. + * When the callback is specified or streaming is suppressed through options, + * it will return an event emitter to handle the call status and the callback + * will be called with the response object. * * @example * * var api = pubsubV1.publisherApi(); * var formattedProject = api.projectPath("[PROJECT]"); + * // Iterate over all elements. * api.listTopics(formattedProject).on('data', function(element) { * // doThingsWith(element) * }); + * + * // Or obtain the paged response through the callback. + * function callback(err, response, nextPageToken) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * if (nextPageToken) { + * // fetch the next page. + * api.listTopics(formattedProject, {pageToken: nextPageToken}, callback); + * } + * } + * api.listTopics(formattedProject, {flattenPages: false}, callback); */ -PublisherApi.prototype.listTopics = function listTopics() { - var args = arguejs({ - project: String, - otherArgs: [Object, {}], - options: [gax.CallOptions], - callback: [Function] - }, arguments); +PublisherApi.prototype.listTopics = function listTopics( + project, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - project: args.project + project: project }; - if ('pageSize' in args.otherArgs) { - req.page_size = args.otherArgs.pageSize; + if ('pageSize' in options) { + req.pageSize = options.pageSize; } - return this._listTopics(req, args.options, args.callback); + return this._listTopics(req, options, callback); }; /** @@ -384,43 +443,70 @@ PublisherApi.prototype.listTopics = function listTopics() { * * @param {string} topic * The name of the topic that subscriptions are attached to. - * @param {Object=} otherArgs - * @param {number=} otherArgs.pageSize + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * + * In addition, options may contain the following optional parameters. + * @param {number=} options.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this * parameter does not affect the return value. If page streaming is * performed per-page, this determines the maximum number of * resources in a page. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. - * @returns {Stream} - * An object stream. By default, this emits a string on 'data' event. - * This object can also be configured to emit - * pages of the responses through the options parameter. + * + * @param {function(?Error, ?Object, ?string)=} callback + * When specified, the results are not streamed but this callback + * will be called with the response object representing [ListTopicSubscriptionsResponse]{@link ListTopicSubscriptionsResponse}. + * The third item will be set if the response contains the token for the further results + * and can be reused to `pageToken` field in the options in the next request. + * @returns {Stream|gax.EventEmitter} + * An object stream which emits a string on 'data' event. + * When the callback is specified or streaming is suppressed through options, + * it will return an event emitter to handle the call status and the callback + * will be called with the response object. * * @example * * var api = pubsubV1.publisherApi(); * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * // Iterate over all elements. * api.listTopicSubscriptions(formattedTopic).on('data', function(element) { * // doThingsWith(element) * }); + * + * // Or obtain the paged response through the callback. + * function callback(err, response, nextPageToken) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * if (nextPageToken) { + * // fetch the next page. + * api.listTopicSubscriptions(formattedTopic, {pageToken: nextPageToken}, callback); + * } + * } + * api.listTopicSubscriptions(formattedTopic, {flattenPages: false}, callback); */ -PublisherApi.prototype.listTopicSubscriptions = function listTopicSubscriptions() { - var args = arguejs({ - topic: String, - otherArgs: [Object, {}], - options: [gax.CallOptions], - callback: [Function] - }, arguments); +PublisherApi.prototype.listTopicSubscriptions = function listTopicSubscriptions( + topic, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - topic: args.topic + topic: topic }; - if ('pageSize' in args.otherArgs) { - req.page_size = args.otherArgs.pageSize; + if ('pageSize' in options) { + req.pageSize = options.pageSize; } - return this._listTopicSubscriptions(req, args.options, args.callback); + return this._listTopicSubscriptions(req, options, callback); }; /** @@ -432,9 +518,9 @@ PublisherApi.prototype.listTopicSubscriptions = function listTopicSubscriptions( * * @param {string} topic * Name of the topic to delete. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. * @returns {gax.EventEmitter} - the event emitter to handle the call @@ -450,16 +536,174 @@ PublisherApi.prototype.listTopicSubscriptions = function listTopicSubscriptions( * } * }); */ -PublisherApi.prototype.deleteTopic = function deleteTopic() { - var args = arguejs({ - topic: String, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +PublisherApi.prototype.deleteTopic = function deleteTopic( + topic, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - topic: args.topic + topic: topic }; - return this._deleteTopic(req, args.options, args.callback); + return this._deleteTopic(req, options, callback); +}; + +/** + * Sets the access control policy on the specified resource. Replaces any + * existing policy. + * + * @param {string} resource + * REQUIRED: The resource for which policy is being specified. + * Resource is usually specified as a path, such as, + * projects/{project}/zones/{zone}/disks/{disk}. + * @param {Object} policy + * REQUIRED: The complete policy to be applied to the 'resource'. The size of + * the policy is limited to a few 10s of KB. An empty policy is in general a + * valid policy but certain services (like Projects) might reject them. + * + * This object should have the same structure as [Policy]{@link Policy} + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link Policy} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); + * var policy = {}; + * api.setIamPolicy(formattedResource, policy, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +PublisherApi.prototype.setIamPolicy = function setIamPolicy( + resource, + policy, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + var req = { + resource: resource, + policy: policy + }; + return this._setIamPolicy(req, options, callback); +}; + +/** + * Gets the access control policy for a resource. Is empty if the + * policy or the resource does not exist. + * + * @param {string} resource + * REQUIRED: The resource for which policy is being requested. Resource + * is usually specified as a path, such as, projects/{project}. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link Policy} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); + * api.getIamPolicy(formattedResource, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +PublisherApi.prototype.getIamPolicy = function getIamPolicy( + resource, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + var req = { + resource: resource + }; + return this._getIamPolicy(req, options, callback); +}; + +/** + * Returns permissions that a caller has on the specified resource. + * + * @param {string} resource + * REQUIRED: The resource for which policy detail is being requested. + * Resource is usually specified as a path, such as, projects/{project}. + * @param {string[]} permissions + * The set of permissions to check for the 'resource'. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.publisherApi(); + * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); + * var permissions = []; + * api.testIamPermissions(formattedResource, permissions, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +PublisherApi.prototype.testIamPermissions = function testIamPermissions( + resource, + permissions, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + var req = { + resource: resource, + permissions: permissions + }; + return this._testIamPermissions(req, options, callback); }; function PublisherApiBuilder(gaxGrpc) { @@ -467,11 +711,22 @@ function PublisherApiBuilder(gaxGrpc) { return new PublisherApiBuilder(gaxGrpc); } - var grpcClient = gaxGrpc.load([{ + var iamPolicyClient = gaxGrpc.load([{ + root: require('google-proto-files')('..'), + file: 'google/iam/v1/iam_policy.proto' + }]); + extend(this, iamPolicyClient.google.iam.v1); + + var publisherClient = gaxGrpc.load([{ root: require('google-proto-files')('..'), file: 'google/pubsub/v1/pubsub.proto' }]); - extend(this, grpcClient.google.pubsub.v1); + extend(this, publisherClient.google.pubsub.v1); + + var grpcClients = { + iamPolicyClient: iamPolicyClient, + publisherClient: publisherClient + }; /** * Build a new instance of {@link PublisherApi}. @@ -486,15 +741,13 @@ function PublisherApiBuilder(gaxGrpc) { * @param {Object=} opts.clientConfig * The customized config to build the call settings. See * {@link gax.constructSettings} for the format. - * @param {number=} opts.timeout - * The default timeout, in seconds, for calls made through this client. * @param {number=} opts.appName * The codename of the calling service. * @param {String=} opts.appVersion * The version of the calling service. */ this.publisherApi = function(opts) { - return new PublisherApi(gaxGrpc, grpcClient, opts); + return new PublisherApi(gaxGrpc, grpcClients, opts); }; extend(this.publisherApi, PublisherApi); } diff --git a/handwritten/pubsub/src/v1/subscriber_api.js b/handwritten/pubsub/src/v1/subscriber_api.js index 4a46e1e0258..652a7b4873e 100644 --- a/handwritten/pubsub/src/v1/subscriber_api.js +++ b/handwritten/pubsub/src/v1/subscriber_api.js @@ -27,7 +27,6 @@ /* jscs: disable maximumLineLength */ 'use strict'; -var arguejs = require('arguejs'); var configData = require('./subscriber_client_config'); var extend = require('extend'); var gax = require('google-gax'); @@ -38,12 +37,11 @@ var DEFAULT_SERVICE_PORT = 443; var CODE_GEN_NAME_VERSION = 'gapic/0.1.0'; -var DEFAULT_TIMEOUT = 30; var PAGE_DESCRIPTORS = { listSubscriptions: new gax.PageDescriptor( - 'page_token', - 'next_page_token', + 'pageToken', + 'nextPageToken', 'subscriptions') }; @@ -72,36 +70,53 @@ var ALL_SCOPES = [ * * @class */ -function SubscriberApi(gaxGrpc, grpcClient, opts) { +function SubscriberApi(gaxGrpc, grpcClients, opts) { opts = opts || {}; var servicePath = opts.servicePath || SERVICE_ADDRESS; var port = opts.port || DEFAULT_SERVICE_PORT; var sslCreds = opts.sslCreds || null; var clientConfig = opts.clientConfig || {}; - var timeout = opts.timeout || DEFAULT_TIMEOUT; var appName = opts.appName || 'gax'; - var appVersion = opts.appVersion || gax.Version; + var appVersion = opts.appVersion || gax.version; var googleApiClient = [ appName + '/' + appVersion, CODE_GEN_NAME_VERSION, + 'gax/' + gax.version, 'nodejs/' + process.version].join(' '); var defaults = gaxGrpc.constructSettings( 'google.pubsub.v1.Subscriber', configData, clientConfig, - timeout, PAGE_DESCRIPTORS, null, {'x-goog-api-client': googleApiClient}); - var stub = gaxGrpc.createStub( + var iamPolicyStub = gaxGrpc.createStub( servicePath, port, - grpcClient.google.pubsub.v1.Subscriber, + grpcClients.iamPolicyClient.google.iam.v1.IAMPolicy, {sslCreds: sslCreds}); - var methods = [ + var iamPolicyStubMethods = [ + 'setIamPolicy', + 'getIamPolicy', + 'testIamPermissions' + ]; + iamPolicyStubMethods.forEach(function(methodName) { + this['_' + methodName] = gax.createApiCall( + iamPolicyStub.then(function(iamPolicyStub) { + return iamPolicyStub[methodName].bind(iamPolicyStub); + }), + defaults[methodName]); + }.bind(this)); + + var subscriberStub = gaxGrpc.createStub( + servicePath, + port, + grpcClients.subscriberClient.google.pubsub.v1.Subscriber, + {sslCreds: sslCreds}); + var subscriberStubMethods = [ 'createSubscription', 'getSubscription', 'listSubscriptions', @@ -111,10 +126,12 @@ function SubscriberApi(gaxGrpc, grpcClient, opts) { 'pull', 'modifyPushConfig' ]; - methods.forEach(function(methodName) { + subscriberStubMethods.forEach(function(methodName) { this['_' + methodName] = gax.createApiCall( - stub.then(function(stub) { return stub[methodName].bind(stub); }), - defaults[methodName]); + subscriberStub.then(function(subscriberStub) { + return subscriberStub[methodName].bind(subscriberStub); + }), + defaults[methodName]); }.bind(this)); } @@ -224,12 +241,13 @@ SubscriberApi.prototype.matchTopicFromTopicName = // Service calls /** - * Creates a subscription to a given topic for a given subscriber. + * Creates a subscription to a given topic. * If the subscription already exists, returns `ALREADY_EXISTS`. * If the corresponding topic doesn't exist, returns `NOT_FOUND`. * * If the name is not provided in the request, the server will assign a random - * name for this subscription on the same project as the topic. + * name for this subscription on the same project as the topic. Note that + * for REST API requests, you must specify a name. * * @param {string} name * The name of the subscription. It must have the format @@ -242,14 +260,18 @@ SubscriberApi.prototype.matchTopicFromTopicName = * The name of the topic from which this subscription is receiving messages. * The value of this field will be `_deleted-topic_` if the topic has been * deleted. - * @param {Object=} otherArgs - * @param {Object=} otherArgs.pushConfig + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * + * In addition, options may contain the following optional parameters. + * @param {Object=} options.pushConfig * If push delivery is used with this subscription, this field is * used to configure it. An empty `pushConfig` signifies that the subscriber * will pull and ack messages using API methods. * * This object should have the same structure as [PushConfig]{@link PushConfig} - * @param {number=} otherArgs.ackDeadlineSeconds + * @param {number=} options.ackDeadlineSeconds * This value is the maximum time after a subscriber receives a message * before the subscriber should acknowledge the message. After message * delivery but before the ack deadline expires and before the message is @@ -260,6 +282,7 @@ SubscriberApi.prototype.matchTopicFromTopicName = * deadline. To override this value for a given message, call * `ModifyAckDeadline` with the corresponding `ack_id` if using * pull. + * The maximum custom deadline you can specify is 600 seconds (10 minutes). * * For push delivery, this value is also used to set the request timeout for * the call to the push endpoint. @@ -267,10 +290,8 @@ SubscriberApi.prototype.matchTopicFromTopicName = * If the subscriber never acknowledges the message, the Pub/Sub * system will eventually redeliver the message. * - * If this parameter is not set, the default value of 10 seconds is used. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * If this parameter is 0, a default value of 10 seconds is used. + * * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * @@ -291,25 +312,29 @@ SubscriberApi.prototype.matchTopicFromTopicName = * // doThingsWith(response) * }); */ -SubscriberApi.prototype.createSubscription = function createSubscription() { - var args = arguejs({ - name: String, - topic: String, - otherArgs: [Object, {}], - options: [gax.CallOptions], - callback: [Function] - }, arguments); +SubscriberApi.prototype.createSubscription = function createSubscription( + name, + topic, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - name: args.name, - topic: args.topic + name: name, + topic: topic }; - if ('pushConfig' in args.otherArgs) { - req.push_config = args.otherArgs.pushConfig; + if ('pushConfig' in options) { + req.pushConfig = options.pushConfig; } - if ('ackDeadlineSeconds' in args.otherArgs) { - req.ack_deadline_seconds = args.otherArgs.ackDeadlineSeconds; + if ('ackDeadlineSeconds' in options) { + req.ackDeadlineSeconds = options.ackDeadlineSeconds; } - return this._createSubscription(req, args.options, args.callback); + return this._createSubscription(req, options, callback); }; /** @@ -317,9 +342,9 @@ SubscriberApi.prototype.createSubscription = function createSubscription() { * * @param {string} subscription * The name of the subscription to get. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * @@ -339,16 +364,21 @@ SubscriberApi.prototype.createSubscription = function createSubscription() { * // doThingsWith(response) * }); */ -SubscriberApi.prototype.getSubscription = function getSubscription() { - var args = arguejs({ - subscription: String, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +SubscriberApi.prototype.getSubscription = function getSubscription( + subscription, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - subscription: args.subscription + subscription: subscription }; - return this._getSubscription(req, args.options, args.callback); + return this._getSubscription(req, options, callback); }; /** @@ -356,44 +386,71 @@ SubscriberApi.prototype.getSubscription = function getSubscription() { * * @param {string} project * The name of the cloud project that subscriptions belong to. - * @param {Object=} otherArgs - * @param {number=} otherArgs.pageSize + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * + * In addition, options may contain the following optional parameters. + * @param {number=} options.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this * parameter does not affect the return value. If page streaming is * performed per-page, this determines the maximum number of * resources in a page. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. - * @returns {Stream} - * An object stream. By default, this emits an object representing + * + * @param {function(?Error, ?Object, ?string)=} callback + * When specified, the results are not streamed but this callback + * will be called with the response object representing [ListSubscriptionsResponse]{@link ListSubscriptionsResponse}. + * The third item will be set if the response contains the token for the further results + * and can be reused to `pageToken` field in the options in the next request. + * @returns {Stream|gax.EventEmitter} + * An object stream which emits an object representing * [Subscription]{@link Subscription} on 'data' event. - * This object can also be configured to emit - * pages of the responses through the options parameter. + * When the callback is specified or streaming is suppressed through options, + * it will return an event emitter to handle the call status and the callback + * will be called with the response object. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedProject = api.projectPath("[PROJECT]"); + * // Iterate over all elements. * api.listSubscriptions(formattedProject).on('data', function(element) { * // doThingsWith(element) * }); + * + * // Or obtain the paged response through the callback. + * function callback(err, response, nextPageToken) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * if (nextPageToken) { + * // fetch the next page. + * api.listSubscriptions(formattedProject, {pageToken: nextPageToken}, callback); + * } + * } + * api.listSubscriptions(formattedProject, {flattenPages: false}, callback); */ -SubscriberApi.prototype.listSubscriptions = function listSubscriptions() { - var args = arguejs({ - project: String, - otherArgs: [Object, {}], - options: [gax.CallOptions], - callback: [Function] - }, arguments); +SubscriberApi.prototype.listSubscriptions = function listSubscriptions( + project, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - project: args.project + project: project }; - if ('pageSize' in args.otherArgs) { - req.page_size = args.otherArgs.pageSize; + if ('pageSize' in options) { + req.pageSize = options.pageSize; } - return this._listSubscriptions(req, args.options, args.callback); + return this._listSubscriptions(req, options, callback); }; /** @@ -405,9 +462,9 @@ SubscriberApi.prototype.listSubscriptions = function listSubscriptions() { * * @param {string} subscription * The subscription to delete. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. * @returns {gax.EventEmitter} - the event emitter to handle the call @@ -423,23 +480,29 @@ SubscriberApi.prototype.listSubscriptions = function listSubscriptions() { * } * }); */ -SubscriberApi.prototype.deleteSubscription = function deleteSubscription() { - var args = arguejs({ - subscription: String, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +SubscriberApi.prototype.deleteSubscription = function deleteSubscription( + subscription, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - subscription: args.subscription + subscription: subscription }; - return this._deleteSubscription(req, args.options, args.callback); + return this._deleteSubscription(req, options, callback); }; /** * Modifies the ack deadline for a specific message. This method is useful * to indicate that more time is needed to process a message by the * subscriber, or to make the message available for redelivery if the - * processing was interrupted. + * processing was interrupted. Note that this does not modify the + * subscription-level `ackDeadlineSeconds` used for subsequent messages. * * @param {string} subscription * The name of the subscription. @@ -451,9 +514,9 @@ SubscriberApi.prototype.deleteSubscription = function deleteSubscription() { * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call * was made. Specifying zero may immediately make the message available for * another pull request. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. * @returns {gax.EventEmitter} - the event emitter to handle the call @@ -471,20 +534,25 @@ SubscriberApi.prototype.deleteSubscription = function deleteSubscription() { * } * }); */ -SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline() { - var args = arguejs({ - subscription: String, - ackIds: Array, - ackDeadlineSeconds: Number, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline( + subscription, + ackIds, + ackDeadlineSeconds, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - subscription: args.subscription, - ack_ids: args.ackIds, - ack_deadline_seconds: args.ackDeadlineSeconds + subscription: subscription, + ackIds: ackIds, + ackDeadlineSeconds: ackDeadlineSeconds }; - return this._modifyAckDeadline(req, args.options, args.callback); + return this._modifyAckDeadline(req, options, callback); }; /** @@ -501,9 +569,9 @@ SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline() { * @param {string[]} ackIds * The acknowledgment ID for the messages being acknowledged that was returned * by the Pub/Sub system in the `Pull` response. Must not be empty. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. * @returns {gax.EventEmitter} - the event emitter to handle the call @@ -520,18 +588,23 @@ SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline() { * } * }); */ -SubscriberApi.prototype.acknowledge = function acknowledge() { - var args = arguejs({ - subscription: String, - ackIds: Array, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +SubscriberApi.prototype.acknowledge = function acknowledge( + subscription, + ackIds, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - subscription: args.subscription, - ack_ids: args.ackIds + subscription: subscription, + ackIds: ackIds }; - return this._acknowledge(req, args.options, args.callback); + return this._acknowledge(req, options, callback); }; /** @@ -545,16 +618,18 @@ SubscriberApi.prototype.acknowledge = function acknowledge() { * @param {number} maxMessages * The maximum number of messages returned for this request. The Pub/Sub * system may return fewer than the number specified. - * @param {Object=} otherArgs - * @param {boolean=} otherArgs.returnImmediately + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * + * In addition, options may contain the following optional parameters. + * @param {boolean=} options.returnImmediately * If this is specified as true the system will respond immediately even if * it is not able to return a message in the `Pull` response. Otherwise the * system is allowed to wait until at least one message is available rather * than returning no messages. The client may cancel the request if it does * not wish to wait any longer for the response. - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * @@ -575,22 +650,26 @@ SubscriberApi.prototype.acknowledge = function acknowledge() { * // doThingsWith(response) * }); */ -SubscriberApi.prototype.pull = function pull() { - var args = arguejs({ - subscription: String, - maxMessages: Number, - otherArgs: [Object, {}], - options: [gax.CallOptions], - callback: [Function] - }, arguments); +SubscriberApi.prototype.pull = function pull( + subscription, + maxMessages, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - subscription: args.subscription, - max_messages: args.maxMessages + subscription: subscription, + maxMessages: maxMessages }; - if ('returnImmediately' in args.otherArgs) { - req.return_immediately = args.otherArgs.returnImmediately; + if ('returnImmediately' in options) { + req.returnImmediately = options.returnImmediately; } - return this._pull(req, args.options, args.callback); + return this._pull(req, options, callback); }; /** @@ -612,9 +691,9 @@ SubscriberApi.prototype.pull = function pull() { * the subscription if `Pull` is not called. * * This object should have the same structure as [PushConfig]{@link PushConfig} - * @param {gax.CallOptions=} options - * Overrides the default settings for this call, e.g, timeout, - * retries, etc. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. * @returns {gax.EventEmitter} - the event emitter to handle the call @@ -631,18 +710,176 @@ SubscriberApi.prototype.pull = function pull() { * } * }); */ -SubscriberApi.prototype.modifyPushConfig = function modifyPushConfig() { - var args = arguejs({ - subscription: String, - pushConfig: Object, - options: [gax.CallOptions], - callback: [Function] - }, arguments); +SubscriberApi.prototype.modifyPushConfig = function modifyPushConfig( + subscription, + pushConfig, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + var req = { + subscription: subscription, + pushConfig: pushConfig + }; + return this._modifyPushConfig(req, options, callback); +}; + +/** + * Sets the access control policy on the specified resource. Replaces any + * existing policy. + * + * @param {string} resource + * REQUIRED: The resource for which policy is being specified. + * Resource is usually specified as a path, such as, + * projects/{project}/zones/{zone}/disks/{disk}. + * @param {Object} policy + * REQUIRED: The complete policy to be applied to the 'resource'. The size of + * the policy is limited to a few 10s of KB. An empty policy is in general a + * valid policy but certain services (like Projects) might reject them. + * + * This object should have the same structure as [Policy]{@link Policy} + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link Policy} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var policy = {}; + * api.setIamPolicy(formattedResource, policy, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +SubscriberApi.prototype.setIamPolicy = function setIamPolicy( + resource, + policy, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + var req = { + resource: resource, + policy: policy + }; + return this._setIamPolicy(req, options, callback); +}; + +/** + * Gets the access control policy for a resource. Is empty if the + * policy or the resource does not exist. + * + * @param {string} resource + * REQUIRED: The resource for which policy is being requested. Resource + * is usually specified as a path, such as, projects/{project}. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link Policy} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * api.getIamPolicy(formattedResource, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +SubscriberApi.prototype.getIamPolicy = function getIamPolicy( + resource, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } var req = { - subscription: args.subscription, - push_config: args.pushConfig + resource: resource }; - return this._modifyPushConfig(req, args.options, args.callback); + return this._getIamPolicy(req, options, callback); +}; + +/** + * Returns permissions that a caller has on the specified resource. + * + * @param {string} resource + * REQUIRED: The resource for which policy detail is being requested. + * Resource is usually specified as a path, such as, projects/{project}. + * @param {string[]} permissions + * The set of permissions to check for the 'resource'. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse} + * @returns {gax.EventEmitter} - the event emitter to handle the call + * status. + * + * @example + * + * var api = pubsubV1.subscriberApi(); + * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var permissions = []; + * api.testIamPermissions(formattedResource, permissions, function(err, response) { + * if (err) { + * console.error(err); + * return; + * } + * // doThingsWith(response) + * }); + */ +SubscriberApi.prototype.testIamPermissions = function testIamPermissions( + resource, + permissions, + options, + callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + var req = { + resource: resource, + permissions: permissions + }; + return this._testIamPermissions(req, options, callback); }; function SubscriberApiBuilder(gaxGrpc) { @@ -650,11 +887,22 @@ function SubscriberApiBuilder(gaxGrpc) { return new SubscriberApiBuilder(gaxGrpc); } - var grpcClient = gaxGrpc.load([{ + var iamPolicyClient = gaxGrpc.load([{ + root: require('google-proto-files')('..'), + file: 'google/iam/v1/iam_policy.proto' + }]); + extend(this, iamPolicyClient.google.iam.v1); + + var subscriberClient = gaxGrpc.load([{ root: require('google-proto-files')('..'), file: 'google/pubsub/v1/pubsub.proto' }]); - extend(this, grpcClient.google.pubsub.v1); + extend(this, subscriberClient.google.pubsub.v1); + + var grpcClients = { + iamPolicyClient: iamPolicyClient, + subscriberClient: subscriberClient + }; /** * Build a new instance of {@link SubscriberApi}. @@ -669,15 +917,13 @@ function SubscriberApiBuilder(gaxGrpc) { * @param {Object=} opts.clientConfig * The customized config to build the call settings. See * {@link gax.constructSettings} for the format. - * @param {number=} opts.timeout - * The default timeout, in seconds, for calls made through this client. * @param {number=} opts.appName * The codename of the calling service. * @param {String=} opts.appVersion * The version of the calling service. */ this.subscriberApi = function(opts) { - return new SubscriberApi(gaxGrpc, grpcClient, opts); + return new SubscriberApi(gaxGrpc, grpcClients, opts); }; extend(this.subscriberApi, SubscriberApi); } From 35e030dd2e9aff65303573399902c588db2a8ba2 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 10 Oct 2016 11:12:51 -0400 Subject: [PATCH 0020/1115] pubsub: allow simple publishing (#1662) --- handwritten/pubsub/README.md | 4 +- handwritten/pubsub/src/topic.js | 79 ++++++++++++++++-------- handwritten/pubsub/system-test/pubsub.js | 79 ++++++++++++++++++++---- handwritten/pubsub/test/topic.js | 50 +++++++++++---- 4 files changed, 160 insertions(+), 52 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 8cd929de5aa..648dd668b8b 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -20,9 +20,7 @@ var pubsub = require('@google-cloud/pubsub')({ var topic = pubsub.topic('my-topic'); // Publish a message to the topic. -topic.publish({ - data: 'New message!' -}, function(err) {}); +topic.publish('New message!', function(err) {}); // Subscribe to the topic. var options = { diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index d282f9c4d96..051ea58285d 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -22,8 +22,8 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var extend = require('extend'); var is = require('is'); -var prop = require('propprop'); var util = require('util'); /** @@ -282,32 +282,27 @@ Topic.prototype.getSubscriptions = function(options, callback) { * @resource [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/publish} * * @throws {Error} If no message is provided. - * @throws {Error} If a message is missing a data property. * - * @param {object|object[]} message - The message(s) to publish. - * @param {*} message.data - The contents of the message. - * @param {array=} message.attributes - Key/value pair of attributes to apply to - * the message. All values must be strings. + * @param {*|*[]} message - The message(s) to publish. If you need to + * provide attributes for the message, you must enable `options.raw`, then + * box your message in to an object with a `data` and `attributes` property. + * `data` will be the raw message value you want to publish, and + * `attributes` is a key/value pair of attributes to apply to the message. + * @param {object=} options - Configuration object. + * @param {boolean} options.raw - Enable if you require setting attributes on + * your messages. * @param {function=} callback - The callback function. * * @example - * topic.publish({ - * data: 'Hello, world!' - * }, function(err, messageIds, apiResponse) {}); + * topic.publish('Hello, world!', function(err, messageIds, apiResponse) {}); * * //- - * // The data property can be a JSON object as well. + * // You can also publish a JSON object. * //- * var registerMessage = { - * data: { - * userId: 3, - * name: 'Stephen', - * event: 'new user' - * }, - * attributes: { - * key: 'value', - * hello: 'world' - * } + * userId: 3, + * name: 'Stephen', + * event: 'new user' * }; * * topic.publish(registerMessage, function(err, messageIds, apiResponse) {}); @@ -327,20 +322,43 @@ Topic.prototype.getSubscriptions = function(options, callback) { * registerMessage, * purchaseMessage * ], function(err, messageIds, apiResponse) {}); + * + * //- + * // Set attributes with your message. + * //- + * var message = { + * data: { + * userId: 3, + * product: 'book', + * event: 'rent' + * }, + * attributes: { + * key: 'value', + * hello: 'world' + * } + * }; + * + * var options = { + * raw: true + * }; + * + * topic.publish(message, options, function(err, messageIds, apiResponse) {}); */ -Topic.prototype.publish = function(messages, callback) { +Topic.prototype.publish = function(messages, options, callback) { messages = arrify(messages); - if (messages.length === 0) { - throw new Error('Cannot publish without a message.'); - } - - if (!messages.every(prop('data'))) { - throw new Error('Cannot publish message without a `data` property.'); + if (is.fn(options)) { + callback = options; + options = {}; } + options = options || {}; callback = callback || common.util.noop; + if (messages.length === 0) { + throw new Error('Cannot publish without a message.'); + } + var protoOpts = { service: 'Publisher', method: 'publish', @@ -348,7 +366,14 @@ Topic.prototype.publish = function(messages, callback) { var reqOpts = { topic: this.name, - messages: messages.map(Topic.formatMessage_) + messages: messages + .map(function(message) { + if (is.object(message)) { + message = extend(true, {}, message); + } + return options.raw ? message : { data: message }; + }) + .map(Topic.formatMessage_) }; this.request(protoOpts, reqOpts, function(err, result) { diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 58b88446fa4..2549ab686b7 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -24,14 +24,6 @@ var uuid = require('node-uuid'); var env = require('../../../system-test/env.js'); var pubsub = require('../')(env); -function generateSubName() { - return 'test-subscription-' + uuid.v4(); -} - -function generateTopicName() { - return 'test-topic-' + uuid.v4(); -} - describe('pubsub', function() { var TOPIC_NAMES = [ generateTopicName(), @@ -51,6 +43,53 @@ describe('pubsub', function() { TOPICS[2].name ]; + function generateSubName() { + return 'test-subscription-' + uuid.v4(); + } + + function generateTopicName() { + return 'test-topic-' + uuid.v4(); + } + + function publishPop(message, options, callback) { + if (!callback) { + callback = options; + options = {}; + } + + options = options || {}; + + var topic = pubsub.topic(generateTopicName()); + var subscription = topic.subscription(generateSubName()); + + async.series([ + topic.create.bind(topic), + subscription.create.bind(subscription), + function(callback) { + async.times(6, function(_, callback) { + topic.publish(message, options, callback); + }, callback); + } + ], function(err) { + if (err) { + callback(err); + return; + } + + subscription.pull({ + returnImmediately: true, + maxResults: 1 + }, function(err, messages) { + if (err) { + callback(err); + return; + } + + callback(null, messages.pop()); + }); + }); + } + before(function(done) { // create all needed topics async.each(TOPICS, function(topic, cb) { @@ -120,9 +159,27 @@ describe('pubsub', function() { it('should publish a message', function(done) { var topic = pubsub.topic(TOPIC_NAMES[0]); - topic.publish({ data: 'message from me' }, function(err, messageIds) { + topic.publish('message from me', function(err, messageIds) { assert.ifError(err); - assert.equal(messageIds.length, 1); + assert.strictEqual(messageIds.length, 1); + done(); + }); + }); + + it('should publish a message with attributes', function(done) { + var rawMessage = { + data: 'raw message data', + attributes: { + customAttribute: 'value' + } + }; + + publishPop(rawMessage, { raw: true }, function(err, message) { + assert.ifError(err); + + assert.strictEqual(message.data, rawMessage.data); + assert.deepEqual(message.attributes, rawMessage.attributes); + done(); }); }); @@ -166,7 +223,7 @@ describe('pubsub', function() { } async.times(10, function(_, next) { - topic.publish({ data: 'hello' }, next); + topic.publish('hello', next); }, function(err) { if (err) { done(err); diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 1b2868a74a9..96bedd9fe80 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -180,7 +180,9 @@ describe('Topic', function() { describe('publish', function() { var message = 'howdy'; - var messageObject = { data: message }; + var attributes = { + key: 'value' + }; it('should throw if no message is provided', function() { assert.throws(function() { @@ -192,12 +194,6 @@ describe('Topic', function() { }, /Cannot publish without a message\./); }); - it('should throw if a message has no data', function() { - assert.throws(function() { - topic.publish({}); - }, /Cannot publish message without a `data` property\./); - }); - it('should send correct api request', function(done) { topic.request = function(protoOpts, reqOpts) { assert.strictEqual(protoOpts.service, 'Publisher'); @@ -211,7 +207,39 @@ describe('Topic', function() { done(); }; - topic.publish(messageObject, assert.ifError); + topic.publish(message, assert.ifError); + }); + + it('should send correct api request for raw message', function(done) { + topic.request = function(protoOpts, reqOpts) { + assert.deepEqual(reqOpts.messages, [ + { + data: new Buffer(JSON.stringify(message)).toString('base64'), + attributes: attributes + } + ]); + + done(); + }; + + topic.publish({ + data: message, + attributes: attributes + }, { raw: true }, assert.ifError); + }); + + it('should clone the provided message', function(done) { + var message = { + data: 'data' + }; + var originalMessage = extend({}, message); + + topic.request = function() { + assert.deepEqual(message, originalMessage); + done(); + }; + + topic.publish(message, { raw: true }, assert.ifError); }); it('should execute callback', function(done) { @@ -219,7 +247,7 @@ describe('Topic', function() { callback(null, {}); }; - topic.publish(messageObject, done); + topic.publish(message, done); }); it('should execute callback with error', function(done) { @@ -230,7 +258,7 @@ describe('Topic', function() { callback(error, apiResponse); }; - topic.publish(messageObject, function(err, ackIds, apiResponse_) { + topic.publish(message, function(err, ackIds, apiResponse_) { assert.strictEqual(err, error); assert.strictEqual(ackIds, null); assert.strictEqual(apiResponse_, apiResponse); @@ -246,7 +274,7 @@ describe('Topic', function() { callback(null, resp); }; - topic.publish(messageObject, function(err, ackIds, apiResponse) { + topic.publish(message, function(err, ackIds, apiResponse) { assert.deepEqual(resp, apiResponse); done(); }); From 255edd686782d6c08e5bc949a4f35a106f039563 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 17 Oct 2016 17:30:00 -0400 Subject: [PATCH 0021/1115] pubsub: add promise support (#1702) --- handwritten/pubsub/README.md | 10 ++ handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/iam.js | 31 ++++++ handwritten/pubsub/src/index.js | 133 ++++++++++++++++------- handwritten/pubsub/src/subscription.js | 79 +++++++++++++- handwritten/pubsub/src/topic.js | 113 +++++++++++++++++-- handwritten/pubsub/system-test/pubsub.js | 6 +- handwritten/pubsub/test/iam.js | 17 ++- handwritten/pubsub/test/index.js | 30 ++++- handwritten/pubsub/test/subscription.js | 16 ++- handwritten/pubsub/test/topic.js | 44 +++++++- 11 files changed, 420 insertions(+), 61 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 648dd668b8b..b8d8ca252ec 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -38,6 +38,16 @@ topic.subscribe('subscription-name', options, function(err, subscription) { subscription.removeListener('message', onMessage); subscription.removeListener('error', onError); }); + +// Promises are also supported by omitting callbacks. +topic.publish('New message!').then(function(data) { + var messageIds = data[0]; +}); + +// It's also possible to integrate with third-party Promise libraries. +var pubsub = require('@google-cloud/pubsub')({ + promise: require('bluebird') +}); ``` diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 55438b3aa8d..520eb93f7fb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.6.0", + "@google-cloud/common": "^0.7.0", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.7.0", diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 30501f8471d..1f953bfdc9e 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -99,6 +99,14 @@ util.inherits(IAM, common.GrpcService); * topic.iam.getPolicy(function(err, policy, apiResponse) {}); * * subscription.iam.getPolicy(function(err, policy, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.iam.getPolicy().then(function(data) { + * var policy = data[0]; + * var apiResponse = data[1]; + * }); */ IAM.prototype.getPolicy = function(callback) { var protoOpts = { @@ -144,6 +152,14 @@ IAM.prototype.getPolicy = function(callback) { * topic.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); * * subscription.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.iam.setPolicy(myPolicy).then(function(data) { + * var policy = data[0]; + * var apiResponse = data[1]; + * }); */ IAM.prototype.setPolicy = function(policy, callback) { if (!is.object(policy)) { @@ -209,6 +225,14 @@ IAM.prototype.setPolicy = function(policy, callback) { * // "pubsub.subscriptions.update": false * // } * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.iam.testPermissions(test).then(function(data) { + * var permissions = data[0]; + * var apiResponse = data[1]; + * }); */ IAM.prototype.testPermissions = function(permissions, callback) { if (!is.array(permissions) && !is.string(permissions)) { @@ -244,4 +268,11 @@ IAM.prototype.testPermissions = function(permissions, callback) { }); }; +/*! Developer Documentation + * + * All async methods (except for streams) will return a Promise in the event + * that a callback is omitted. + */ +common.util.promisifyAll(IAM); + module.exports = IAM; diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index d76f4968a95..3d104d0f240 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -99,6 +99,14 @@ util.inherits(PubSub, common.GrpcService); * // The topic was created successfully. * } * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.createTopic('my-new-topic').then(function(data) { + * var topic = data[0]; + * var apiResponse = data[1]; + * }); */ PubSub.prototype.createTopic = function(name, callback) { var self = this; @@ -178,25 +186,11 @@ PubSub.prototype.createTopic = function(name, callback) { * }, callback); * * //- - * // Get the subscriptions as a readable object stream. - * //- - * pubsub.getSubscriptions() - * .on('error', console.error) - * .on('data', function(subscription) { - * // subscription is a Subscription object. - * }) - * .on('end', function() { - * // All subscriptions retrieved. - * }); - * - * //- - * // If you anticipate many results, you can end a stream early to prevent - * // unnecessary processing and API requests. + * // If the callback is omitted, we'll return a Promise. * //- - * pubsub.getSubscriptions() - * .on('data', function(topic) { - * this.end(); - * }); + * pubsub.getSubscriptions().then(function(data) { + * var subscriptions = data[0]; + * }); */ PubSub.prototype.getSubscriptions = function(options, callback) { var self = this; @@ -259,6 +253,36 @@ PubSub.prototype.getSubscriptions = function(options, callback) { }); }; +/** + * Get a list of the {module:pubsub/subscription} objects registered to all of + * your project's topics as a readable object stream. + * + * @param {object=} options - Configuration object. See + * {module:pubsub#getSubscriptions} for a complete list of options. + * @return {stream} + * + * @example + * pubsub.getSubscriptionsStream() + * .on('error', console.error) + * .on('data', function(subscription) { + * // subscription is a Subscription object. + * }) + * .on('end', function() { + * // All subscriptions retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * pubsub.getSubscriptionsStream() + * .on('data', function(topic) { + * this.end(); + * }); + */ +PubSub.prototype.getSubscriptionsStream = + common.paginator.streamify('getSubscriptions'); + /** * Get a list of the topics registered to your project. You may optionally * provide a query object as the first argument to customize the response. @@ -308,25 +332,11 @@ PubSub.prototype.getSubscriptions = function(options, callback) { * }, callback); * * //- - * // Get the topics as a readable object stream. - * //- - * pubsub.getTopics() - * .on('error', console.error) - * .on('data', function(topic) { - * // topic is a Topic object. - * }) - * .on('end', function() { - * // All topics retrieved. - * }); - * - * //- - * // If you anticipate many results, you can end a stream early to prevent - * // unnecessary processing and API requests. + * // If the callback is omitted, we'll return a Promise. * //- - * pubsub.getTopics() - * .on('data', function(topic) { - * this.end(); - * }); + * pubsub.getTopics().then(function(data) { + * var topics = data[0]; + * }); */ PubSub.prototype.getTopics = function(query, callback) { var self = this; @@ -367,6 +377,35 @@ PubSub.prototype.getTopics = function(query, callback) { }); }; +/** + * Get a list of the {module:pubsub/topic} objects registered to your project as + * a readable object stream. + * + * @param {object=} query - Configuration object. See + * {module:pubsub#getTopics} for a complete list of options. + * @return {stream} + * + * @example + * pubsub.getTopicsStream() + * .on('error', console.error) + * .on('data', function(topic) { + * // topic is a Topic object. + * }) + * .on('end', function() { + * // All topics retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * pubsub.getTopicsStream() + * .on('data', function(topic) { + * this.end(); + * }); + */ +PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); + /** * Create a subscription to a topic. You may optionally provide an object to * customize the subscription. @@ -423,6 +462,14 @@ PubSub.prototype.getTopics = function(query, callback) { * autoAck: true, * interval: 30 * }, function(err, subscription, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.subscribe(topic, name).then(function(data) { + * var subscription = data[0]; + * var apiResponse = data[1]; + * }); */ PubSub.prototype.subscribe = function(topic, subName, options, callback) { if (!is.string(topic) && !(topic instanceof Topic)) { @@ -564,10 +611,18 @@ PubSub.prototype.determineBaseUrl_ = function() { /*! Developer Documentation * - * These methods can be used with either a callback or as a readable object - * stream. `streamRouter` is used to add this dual behavior. + * These methods can be auto-paginated. + */ +common.paginator.extend(PubSub, ['getSubscriptions', 'getTopics']); + +/*! Developer Documentation + * + * All async methods (except for streams) will return a Promise in the event + * that a callback is omitted. */ -common.streamRouter.extend(PubSub, ['getSubscriptions', 'getTopics']); +common.util.promisifyAll(PubSub, { + exclude: ['subscription', 'topic'] +}); PubSub.Subscription = Subscription; PubSub.Topic = Topic; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index d716c820e07..c0ca4912148 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -154,6 +154,13 @@ function Subscription(pubsub, options) { * * @example * subscription.exists(function(err, exists) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.exists().then(function(data) { + * var exists = data[0]; + * }); */ exists: true, @@ -176,6 +183,14 @@ function Subscription(pubsub, options) { * subscription.get(function(err, subscription, apiResponse) { * // `subscription.metadata` has been populated. * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.get().then(function(data) { + * var subscription = data[0]; + * var apiResponse = data[1]; + * }); */ get: true, @@ -193,6 +208,14 @@ function Subscription(pubsub, options) { * * @example * subscription.getMetadata(function(err, metadata, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.getMetadata().then(function(data) { + * var metadata = data[0]; + * var apiResponse = data[1]; + * }); */ getMetadata: { protoOpts: { @@ -230,6 +253,14 @@ function Subscription(pubsub, options) { * // The subscription was created successfully. * } * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.create().then(function(data) { + * var subscription = data[0]; + * var apiResponse = data[1]; + * }); */ config.methods.create = true; } @@ -281,6 +312,14 @@ function Subscription(pubsub, options) { * subscription.iam.getPolicy(function(err, policy) { * console.log(policy); * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.iam.getPolicy().then(function(data) { + * var policy = data[0]; + * var apiResponse = data[1]; + * }); */ this.iam = new IAM(pubsub, this.name); @@ -347,7 +386,16 @@ Subscription.formatName_ = function(projectId, name) { * @param {function=} callback - The callback function. * * @example - * subscription.ack('ePHEESyhuE8e...', function(err, apiResponse) {}); + * var ackId = 'ePHEESyhuE8e...'; + * + * subscription.ack(ackId, function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.ack(ackId).then(function(data) { + * var apiResponse = data[0]; + * }); */ Subscription.prototype.ack = function(ackIds, callback) { var self = this; @@ -428,6 +476,13 @@ Subscription.prototype.decorateMessage_ = function(message) { * * @example * subscription.delete(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.delete().then(function(data) { + * var apiResponse = data[0]; + * }); */ Subscription.prototype.delete = function(callback) { var self = this; @@ -504,6 +559,14 @@ Subscription.prototype.delete = function(callback) { * }; * * subscription.pull(opts, function(err, messages, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.pull(opts).then(function(data) { + * var messages = data[0]; + * var apiResponse = data[1]; + * }); */ Subscription.prototype.pull = function(options, callback) { var self = this; @@ -586,6 +649,13 @@ Subscription.prototype.pull = function(options, callback) { * }; * * subscription.setAckDeadline(options, function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.setAckDeadline(options).then(function(data) { + * var apiResponse = data[0]; + * }); */ Subscription.prototype.setAckDeadline = function(options, callback) { callback = callback || common.util.noop; @@ -713,4 +783,11 @@ Subscription.prototype.startPulling_ = function() { }); }; +/*! Developer Documentation + * + * All async methods (except for streams) will return a Promise in the event + * that a callback is omitted. + */ +common.util.promisifyAll(Subscription); + module.exports = Subscription; diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 051ea58285d..6c31502108b 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -62,6 +62,14 @@ function Topic(pubsub, name) { * // The topic was created successfully. * } * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.create().then(function(data) { + * var topic = data[0]; + * var apiResponse = data[1]; + * }); */ create: true, @@ -74,6 +82,13 @@ function Topic(pubsub, name) { * * @example * topic.delete(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.delete().then(function(data) { + * var apiResponse = data[0]; + * }); */ delete: { protoOpts: { @@ -95,6 +110,13 @@ function Topic(pubsub, name) { * * @example * topic.exists(function(err, exists) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.exists().then(function(data) { + * var exists = data[0]; + * }); */ exists: true, @@ -114,6 +136,14 @@ function Topic(pubsub, name) { * topic.get(function(err, topic, apiResponse) { * // `topic.metadata` has been populated. * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.get().then(function(data) { + * var topic = data[0]; + * var apiResponse = data[1]; + * }); */ get: true, @@ -127,6 +157,17 @@ function Topic(pubsub, name) { * request. * @param {object} callback.metadata - The metadata of the Topic. * @param {object} callback.apiResponse - The full API response. + * + * @example + * topic.getMetadata(function(err, metadata, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.getMetadata().then(function(data) { + * var metadata = data[0]; + * var apiResponse = data[1]; + * }); */ getMetadata: { protoOpts: { @@ -171,6 +212,14 @@ function Topic(pubsub, name) { * topic.iam.getPolicy(function(err, policy) { * console.log(policy); * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.iam.getPolicy().then(function(data) { + * var policy = data[0]; + * var apiResponse = data[1]; + * }); */ this.iam = new IAM(pubsub, this.name); } @@ -243,9 +292,34 @@ Topic.formatName_ = function(projectId, name) { * }, callback); * * //- - * // Get the subscriptions for this topic as a readable object stream. + * // If the callback is omitted, we'll return a Promise. * //- - * topic.getSubscriptions() + * topic.getSubscriptions().then(function(data) { + * var subscriptions = data[0]; + * }); + */ +Topic.prototype.getSubscriptions = function(options, callback) { + if (is.fn(options)) { + callback = options; + options = {}; + } + + options = options || {}; + options.topic = this; + + return this.pubsub.getSubscriptions(options, callback); +}; + +/** + * Get a list of the {module:pubsub/subscription} objects registered to this + * topic as a readable object stream. + * + * @param {object=} query - Configuration object. See + * {module:pubsub/topic#getSubscriptions} for a complete list of options. + * @return {stream} + * + * @example + * topic.getSubscriptionsStream() * .on('error', console.error) * .on('data', function(subscription) { * // subscription is a Subscription object. @@ -258,21 +332,16 @@ Topic.formatName_ = function(projectId, name) { * // If you anticipate many results, you can end a stream early to prevent * // unnecessary processing and API requests. * //- - * topic.getSubscriptions() + * topic.getSubscriptionsStream() * .on('data', function(subscription) { * this.end(); * }); */ -Topic.prototype.getSubscriptions = function(options, callback) { - if (is.fn(options)) { - callback = options; - options = {}; - } - +Topic.prototype.getSubscriptionsStream = function(options) { options = options || {}; options.topic = this; - return this.pubsub.getSubscriptions(options, callback); + return this.pubsub.getSubscriptionsStream(options); }; /** @@ -343,6 +412,13 @@ Topic.prototype.getSubscriptions = function(options, callback) { * }; * * topic.publish(message, options, function(err, messageIds, apiResponse) {}); + * + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.publish(message).then(function(data) { + * var messageIds = data[0]; + * var apiResponse = data[1]; + * }); */ Topic.prototype.publish = function(messages, options, callback) { messages = arrify(messages); @@ -426,6 +502,14 @@ Topic.prototype.publish = function(messages, options, callback) { * autoAck: true, * interval: 30 * }, function(err, subscription, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.subscribe('newMessages').then(function(data) { + * var subscription = data[0]; + * var apiResponse = data[1]; + * }); */ Topic.prototype.subscribe = function(subName, options, callback) { this.pubsub.subscribe(this, subName, options, callback); @@ -462,4 +546,13 @@ Topic.prototype.subscription = function(name, options) { return this.pubsub.subscription(name, options); }; +/*! Developer Documentation + * + * All async methods (except for streams) will return a Promise in the event + * that a callback is omitted. + */ +common.util.promisifyAll(Topic, { + exclude: ['subscription'] +}); + module.exports = Topic; diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 2549ab686b7..2679591acff 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -122,7 +122,7 @@ describe('pubsub', function() { it('should list topics in a stream', function(done) { var topicsEmitted = []; - pubsub.getTopics() + pubsub.getTopicsStream() .on('error', done) .on('data', function(topic) { topicsEmitted.push(topic); @@ -260,7 +260,7 @@ describe('pubsub', function() { it('should list all topic subscriptions as a stream', function(done) { var subscriptionsEmitted = []; - topic.getSubscriptions() + topic.getSubscriptionsStream() .on('error', done) .on('data', function(subscription) { subscriptionsEmitted.push(subscription); @@ -282,7 +282,7 @@ describe('pubsub', function() { it('should list all subscriptions as a stream', function(done) { var subscriptionEmitted = false; - pubsub.getSubscriptions() + pubsub.getSubscriptionsStream() .on('error', done) .on('data', function(subscription) { subscriptionEmitted = subscription instanceof Subscription; diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index d13eda5c7d3..21cfa8a3f1b 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -17,11 +17,21 @@ 'use strict'; var assert = require('assert'); +var extend = require('extend'); var GrpcService = require('@google-cloud/common').GrpcService; var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; +var promisified = false; +var fakeUtil = extend({}, util, { + promisifyAll: function(Class) { + if (Class.name === 'IAM') { + promisified = true; + } + } +}); + function FakeGrpcService() { this.calledWith_ = arguments; GrpcService.apply(this, arguments); @@ -42,7 +52,8 @@ describe('IAM', function() { before(function() { IAM = proxyquire('../src/iam.js', { '@google-cloud/common': { - GrpcService: FakeGrpcService + GrpcService: FakeGrpcService, + util: fakeUtil } }); }); @@ -70,6 +81,10 @@ describe('IAM', function() { assert.strictEqual(options, PUBSUB.options); }); + it('should promisify all the things', function() { + assert(promisified); + }); + it('should localize the ID', function() { assert.strictEqual(iam.id, ID); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 111e31f098e..ddf07c84f21 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -32,14 +32,24 @@ function Subscription(a, b) { return new OverrideFn(a, b); } -var fakeUtil = extend({}, util); +var promisified = false; +var fakeUtil = extend({}, util, { + promisifyAll: function(Class, options) { + if (Class.name !== 'PubSub') { + return; + } + + promisified = true; + assert.deepEqual(options.exclude, ['subscription', 'topic']); + } +}); function FakeGrpcService() { this.calledWith_ = arguments; } var extended = false; -var fakeStreamRouter = { +var fakePaginator = { extend: function(Class, methods) { if (Class.name !== 'PubSub') { return; @@ -49,6 +59,9 @@ var fakeStreamRouter = { assert.equal(Class.name, 'PubSub'); assert.deepEqual(methods, ['getSubscriptions', 'getTopics']); extended = true; + }, + streamify: function(methodName) { + return methodName; } }; @@ -65,7 +78,7 @@ describe('PubSub', function() { PubSub = proxyquire('../', { '@google-cloud/common': { GrpcService: FakeGrpcService, - streamRouter: fakeStreamRouter, + paginator: fakePaginator, util: fakeUtil }, './subscription.js': Subscription, @@ -87,7 +100,16 @@ describe('PubSub', function() { describe('instantiation', function() { it('should extend the correct methods', function() { - assert(extended); // See `fakeStreamRouter.extend` + assert(extended); // See `fakePaginator.extend` + }); + + it('should streamify the correct methods', function() { + assert.strictEqual(pubsub.getSubscriptionsStream, 'getSubscriptions'); + assert.strictEqual(pubsub.getTopicsStream, 'getTopics'); + }); + + it('should promisify all the things', function() { + assert(promisified); }); it('should normalize the arguments', function() { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index e7dbc5d2dcd..81fcc475dcc 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -23,6 +23,15 @@ var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; +var promisified = false; +var fakeUtil = extend({}, util, { + promisifyAll: function(Class) { + if (Class.name === 'Subscription') { + promisified = true; + } + } +}); + function FakeGrpcServiceObject() { this.calledWith_ = arguments; GrpcServiceObject.apply(this, arguments); @@ -72,7 +81,8 @@ describe('Subscription', function() { before(function() { Subscription = proxyquire('../src/subscription.js', { '@google-cloud/common': { - GrpcServiceObject: FakeGrpcServiceObject + GrpcServiceObject: FakeGrpcServiceObject, + util: fakeUtil }, './iam.js': FakeIAM }); @@ -92,6 +102,10 @@ describe('Subscription', function() { }); describe('initialization', function() { + it('should promisify all the things', function() { + assert(promisified); + }); + it('should format name', function(done) { var formatName_ = Subscription.formatName_; Subscription.formatName_ = function() { diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 96bedd9fe80..30180f77dee 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -23,6 +23,18 @@ var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; +var promisified = false; +var fakeUtil = extend({}, util, { + promisifyAll: function(Class, options) { + if (Class.name !== 'Topic') { + return; + } + + promisified = true; + assert.deepEqual(options.exclude, ['subscription']); + } +}); + function FakeGrpcServiceObject() { this.calledWith_ = arguments; GrpcServiceObject.apply(this, arguments); @@ -50,7 +62,8 @@ describe('Topic', function() { Topic = proxyquire('../src/topic.js', { './iam.js': FakeIAM, '@google-cloud/common': { - GrpcServiceObject: FakeGrpcServiceObject + GrpcServiceObject: FakeGrpcServiceObject, + util: fakeUtil } }); }); @@ -178,6 +191,35 @@ describe('Topic', function() { }); }); + describe('getSubscriptionsStream', function() { + it('should return a stream', function(done) { + var fakeStream = {}; + + topic.pubsub.getSubscriptions = function(options) { + assert.deepEqual(options, { topic: topic }); + setImmediate(done); + return fakeStream; + }; + + var stream = topic.getSubscriptions(); + assert.strictEqual(stream, fakeStream); + }); + + it('should pass correct args to getSubscriptionsStream', function(done) { + var opts = { a: 'b', c: 'd' }; + + topic.pubsub = { + getSubscriptions: function(options) { + assert.deepEqual(options, opts); + assert.deepEqual(options.topic, topic); + done(); + } + }; + + topic.getSubscriptions(opts); + }); + }); + describe('publish', function() { var message = 'howdy'; var attributes = { From 426079bc5ca307a0ca9777d25361c62bfc73c042 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 17 Oct 2016 17:30:40 -0400 Subject: [PATCH 0022/1115] pubsub @ 0.4.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 520eb93f7fb..a1e0a21e73e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.3.0", + "version": "0.4.0", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ From d85105e21d4a50fa2fc2c9b298e2904afdc688dd Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 17 Oct 2016 22:43:33 -0400 Subject: [PATCH 0023/1115] pubsub: fixed docs typo --- handwritten/pubsub/src/topic.js | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 6c31502108b..fe1b8a20371 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -413,6 +413,7 @@ Topic.prototype.getSubscriptionsStream = function(options) { * * topic.publish(message, options, function(err, messageIds, apiResponse) {}); * + * //- * // If the callback is omitted, we'll return a Promise. * //- * topic.publish(message).then(function(data) { From c5783cf756bab12ab0862ee7331e6e963ce52740 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 19 Oct 2016 17:18:45 -0400 Subject: [PATCH 0024/1115] pubsub: fixed test typos (#1729) --- handwritten/pubsub/test/topic.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 30180f77dee..c6f91d34182 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -195,13 +195,13 @@ describe('Topic', function() { it('should return a stream', function(done) { var fakeStream = {}; - topic.pubsub.getSubscriptions = function(options) { + topic.pubsub.getSubscriptionsStream = function(options) { assert.deepEqual(options, { topic: topic }); setImmediate(done); return fakeStream; }; - var stream = topic.getSubscriptions(); + var stream = topic.getSubscriptionsStream(); assert.strictEqual(stream, fakeStream); }); @@ -209,14 +209,14 @@ describe('Topic', function() { var opts = { a: 'b', c: 'd' }; topic.pubsub = { - getSubscriptions: function(options) { + getSubscriptionsStream: function(options) { assert.deepEqual(options, opts); assert.deepEqual(options.topic, topic); done(); } }; - topic.getSubscriptions(opts); + topic.getSubscriptionsStream(opts); }); }); From 73e43427e0c8a626d2b14dd476601c9fda265837 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Thu, 20 Oct 2016 20:00:14 -0400 Subject: [PATCH 0025/1115] docs: properly document autoPaginate (#1720) --- handwritten/pubsub/src/topic.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index fe1b8a20371..efa07268c88 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -278,13 +278,9 @@ Topic.formatName_ = function(projectId, name) { * @param {function} callback - The callback function. * * @example - * var callback = function(err, subscriptions, nextQuery, apiResponse) { - * // If `nextQuery` is non-null, there may be more results to fetch. To do - * // so, run `topic.getSubscriptions(nextQuery, callback);`. - * }; - * - * // Get all subscriptions for this topic. - * topic.getSubscriptions(callback); + * topic.getSubscriptions(function(err, subscriptions) { + * // subscriptions is an array of `Subscription` objects. + * }); * * // Customize the query. * topic.getSubscriptions({ @@ -292,6 +288,21 @@ Topic.formatName_ = function(projectId, name) { * }, callback); * * //- + * // To control how many API requests are made and page through the results + * // manually, set `autoPaginate` to `false`. + * //- + * function callback(err, subscriptions, nextQuery, apiResponse) { + * if (nextQuery) { + * // More results exist. + * topic.getSubscriptions(nextQuery, callback); + * } + * } + * + * topic.getSubscriptions({ + * autoPaginate: false + * }, callback); + * + * //- * // If the callback is omitted, we'll return a Promise. * //- * topic.getSubscriptions().then(function(data) { From 7db0b35ef609adc5ef6b673811b1ccadc39c8447 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 21 Oct 2016 15:12:19 -0400 Subject: [PATCH 0026/1115] pubsub: update gapic layer (#1734) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/v1/publisher_api.js | 335 +++++++-------- handwritten/pubsub/src/v1/subscriber_api.js | 443 ++++++++------------ 3 files changed, 327 insertions(+), 453 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a1e0a21e73e..ca8cfdf1a2d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,7 +53,7 @@ "@google-cloud/common": "^0.7.0", "arrify": "^1.0.0", "extend": "^3.0.0", - "google-gax": "^0.7.0", + "google-gax": "^0.8.1", "google-proto-files": "^0.8.0", "is": "^3.0.1", "modelo": "^4.2.0", diff --git a/handwritten/pubsub/src/v1/publisher_api.js b/handwritten/pubsub/src/v1/publisher_api.js index 1cdc9d7551c..0f81aadc141 100644 --- a/handwritten/pubsub/src/v1/publisher_api.js +++ b/handwritten/pubsub/src/v1/publisher_api.js @@ -160,7 +160,7 @@ var TOPIC_PATH_TEMPLATE = new gax.PathTemplate( * @param {String} project * @returns {String} */ -PublisherApi.prototype.projectPath = function projectPath(project) { +PublisherApi.prototype.projectPath = function(project) { return PROJECT_PATH_TEMPLATE.render({ project: project }); @@ -172,8 +172,7 @@ PublisherApi.prototype.projectPath = function projectPath(project) { * A fully-qualified path representing a project resources. * @returns {String} - A string representing the project. */ -PublisherApi.prototype.matchProjectFromProjectName = - function matchProjectFromProjectName(projectName) { +PublisherApi.prototype.matchProjectFromProjectName = function(projectName) { return PROJECT_PATH_TEMPLATE.match(projectName).project; }; @@ -183,7 +182,7 @@ PublisherApi.prototype.matchProjectFromProjectName = * @param {String} topic * @returns {String} */ -PublisherApi.prototype.topicPath = function topicPath(project, topic) { +PublisherApi.prototype.topicPath = function(project, topic) { return TOPIC_PATH_TEMPLATE.render({ project: project, topic: topic @@ -196,8 +195,7 @@ PublisherApi.prototype.topicPath = function topicPath(project, topic) { * A fully-qualified path representing a topic resources. * @returns {String} - A string representing the project. */ -PublisherApi.prototype.matchProjectFromTopicName = - function matchProjectFromTopicName(topicName) { +PublisherApi.prototype.matchProjectFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).project; }; @@ -207,8 +205,7 @@ PublisherApi.prototype.matchProjectFromTopicName = * A fully-qualified path representing a topic resources. * @returns {String} - A string representing the topic. */ -PublisherApi.prototype.matchTopicFromTopicName = - function matchTopicFromTopicName(topicName) { +PublisherApi.prototype.matchTopicFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).topic; }; @@ -217,7 +214,9 @@ PublisherApi.prototype.matchTopicFromTopicName = /** * Creates the given topic with the given name. * - * @param {string} name + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name * The name of the topic. It must have the format * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), @@ -231,25 +230,20 @@ PublisherApi.prototype.matchTopicFromTopicName = * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [Topic]{@link Topic} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.publisherApi(); * var formattedName = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.createTopic(formattedName, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * api.createTopic({name: formattedName}).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -PublisherApi.prototype.createTopic = function createTopic( - name, - options, - callback) { +PublisherApi.prototype.createTopic = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -257,10 +251,7 @@ PublisherApi.prototype.createTopic = function createTopic( if (options === undefined) { options = {}; } - var req = { - name: name - }; - return this._createTopic(req, options, callback); + return this._createTopic(request, options, callback); }; /** @@ -268,9 +259,11 @@ PublisherApi.prototype.createTopic = function createTopic( * does not exist. The message payload must not be empty; it must contain * either a non-empty data field, or at least one attribute. * - * @param {string} topic + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic * The messages in the request will be published on this topic. - * @param {Object[]} messages + * @param {Object[]} request.messages * The messages to publish. * * This object should have the same structure as [PubsubMessage]{@link PubsubMessage} @@ -281,10 +274,8 @@ PublisherApi.prototype.createTopic = function createTopic( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [PublishResponse]{@link PublishResponse} - * @returns {gax.BundleEventEmitter} - the event emitter to handle the call - * status. When isBundling: false is specified in the options, it still returns - * a gax.BundleEventEmitter but the API is immediately invoked, so it behaves same - * as a gax.EventEmitter does. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * @@ -295,19 +286,17 @@ PublisherApi.prototype.createTopic = function createTopic( * data : data * }; * var messages = [messagesElement]; - * api.publish(formattedTopic, messages, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * var request = { + * topic: formattedTopic, + * messages: messages + * }; + * api.publish(request).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -PublisherApi.prototype.publish = function publish( - topic, - messages, - options, - callback) { +PublisherApi.prototype.publish = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -315,17 +304,15 @@ PublisherApi.prototype.publish = function publish( if (options === undefined) { options = {}; } - var req = { - topic: topic, - messages: messages - }; - return this._publish(req, options, callback); + return this._publish(request, options, callback); }; /** * Gets the configuration of a topic. * - * @param {string} topic + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic * The name of the topic to get. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -334,25 +321,20 @@ PublisherApi.prototype.publish = function publish( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [Topic]{@link Topic} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.publisherApi(); * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.getTopic(formattedTopic, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * api.getTopic({topic: formattedTopic}).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -PublisherApi.prototype.getTopic = function getTopic( - topic, - options, - callback) { +PublisherApi.prototype.getTopic = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -360,47 +342,43 @@ PublisherApi.prototype.getTopic = function getTopic( if (options === undefined) { options = {}; } - var req = { - topic: topic - }; - return this._getTopic(req, options, callback); + return this._getTopic(request, options, callback); }; /** * Lists matching topics. * - * @param {string} project + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project * The name of the cloud project that topics belong to. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * - * In addition, options may contain the following optional parameters. - * @param {number=} options.pageSize + * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this * parameter does not affect the return value. If page streaming is * performed per-page, this determines the maximum number of * resources in a page. - * + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object, ?string)=} callback * When specified, the results are not streamed but this callback * will be called with the response object representing [ListTopicsResponse]{@link ListTopicsResponse}. * The third item will be set if the response contains the token for the further results * and can be reused to `pageToken` field in the options in the next request. - * @returns {Stream|gax.EventEmitter} + * @returns {Stream|Promise} * An object stream which emits an object representing * [Topic]{@link Topic} on 'data' event. * When the callback is specified or streaming is suppressed through options, - * it will return an event emitter to handle the call status and the callback - * will be called with the response object. + * it will return a promise that resolves to the response object. The promise + * has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.publisherApi(); * var formattedProject = api.projectPath("[PROJECT]"); * // Iterate over all elements. - * api.listTopics(formattedProject).on('data', function(element) { + * api.listTopics({project: formattedProject}).on('data', function(element) { * // doThingsWith(element) * }); * @@ -413,15 +391,12 @@ PublisherApi.prototype.getTopic = function getTopic( * // doThingsWith(response) * if (nextPageToken) { * // fetch the next page. - * api.listTopics(formattedProject, {pageToken: nextPageToken}, callback); + * api.listTopics({project: formattedProject}, {pageToken: nextPageToken}, callback); * } * } - * api.listTopics(formattedProject, {flattenPages: false}, callback); + * api.listTopics({project: formattedProject}, {flattenPages: false}, callback); */ -PublisherApi.prototype.listTopics = function listTopics( - project, - options, - callback) { +PublisherApi.prototype.listTopics = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -429,49 +404,42 @@ PublisherApi.prototype.listTopics = function listTopics( if (options === undefined) { options = {}; } - var req = { - project: project - }; - if ('pageSize' in options) { - req.pageSize = options.pageSize; - } - return this._listTopics(req, options, callback); + return this._listTopics(request, options, callback); }; /** * Lists the name of the subscriptions for this topic. * - * @param {string} topic + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic * The name of the topic that subscriptions are attached to. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * - * In addition, options may contain the following optional parameters. - * @param {number=} options.pageSize + * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this * parameter does not affect the return value. If page streaming is * performed per-page, this determines the maximum number of * resources in a page. - * + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object, ?string)=} callback * When specified, the results are not streamed but this callback * will be called with the response object representing [ListTopicSubscriptionsResponse]{@link ListTopicSubscriptionsResponse}. * The third item will be set if the response contains the token for the further results * and can be reused to `pageToken` field in the options in the next request. - * @returns {Stream|gax.EventEmitter} + * @returns {Stream|Promise} * An object stream which emits a string on 'data' event. * When the callback is specified or streaming is suppressed through options, - * it will return an event emitter to handle the call status and the callback - * will be called with the response object. + * it will return a promise that resolves to the response object. The promise + * has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.publisherApi(); * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); * // Iterate over all elements. - * api.listTopicSubscriptions(formattedTopic).on('data', function(element) { + * api.listTopicSubscriptions({topic: formattedTopic}).on('data', function(element) { * // doThingsWith(element) * }); * @@ -484,15 +452,12 @@ PublisherApi.prototype.listTopics = function listTopics( * // doThingsWith(response) * if (nextPageToken) { * // fetch the next page. - * api.listTopicSubscriptions(formattedTopic, {pageToken: nextPageToken}, callback); + * api.listTopicSubscriptions({topic: formattedTopic}, {pageToken: nextPageToken}, callback); * } * } - * api.listTopicSubscriptions(formattedTopic, {flattenPages: false}, callback); + * api.listTopicSubscriptions({topic: formattedTopic}, {flattenPages: false}, callback); */ -PublisherApi.prototype.listTopicSubscriptions = function listTopicSubscriptions( - topic, - options, - callback) { +PublisherApi.prototype.listTopicSubscriptions = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -500,13 +465,7 @@ PublisherApi.prototype.listTopicSubscriptions = function listTopicSubscriptions( if (options === undefined) { options = {}; } - var req = { - topic: topic - }; - if ('pageSize' in options) { - req.pageSize = options.pageSize; - } - return this._listTopicSubscriptions(req, options, callback); + return this._listTopicSubscriptions(request, options, callback); }; /** @@ -516,30 +475,27 @@ PublisherApi.prototype.listTopicSubscriptions = function listTopicSubscriptions( * configuration or subscriptions. Existing subscriptions to this topic are * not deleted, but their `topic` field is set to `_deleted-topic_`. * - * @param {string} topic + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic * Name of the topic to delete. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.publisherApi(); * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.deleteTopic(formattedTopic, function(err) { - * if (err) { - * console.error(err); - * } + * api.deleteTopic({topic: formattedTopic}).catch(function(err) { + * console.error(err); * }); */ -PublisherApi.prototype.deleteTopic = function deleteTopic( - topic, - options, - callback) { +PublisherApi.prototype.deleteTopic = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -547,24 +503,24 @@ PublisherApi.prototype.deleteTopic = function deleteTopic( if (options === undefined) { options = {}; } - var req = { - topic: topic - }; - return this._deleteTopic(req, options, callback); + return this._deleteTopic(request, options, callback); }; /** * Sets the access control policy on the specified resource. Replaces any * existing policy. * - * @param {string} resource - * REQUIRED: The resource for which policy is being specified. - * Resource is usually specified as a path, such as, - * projects/{project}/zones/{zone}/disks/{disk}. - * @param {Object} policy - * REQUIRED: The complete policy to be applied to the 'resource'. The size of - * the policy is limited to a few 10s of KB. An empty policy is in general a - * valid policy but certain services (like Projects) might reject them. + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being specified. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {Object} request.policy + * REQUIRED: The complete policy to be applied to the `resource`. The size of + * the policy is limited to a few 10s of KB. An empty policy is a + * valid policy but certain Cloud Platform services (such as Projects) + * might reject them. * * This object should have the same structure as [Policy]{@link Policy} * @param {Object=} options @@ -574,27 +530,25 @@ PublisherApi.prototype.deleteTopic = function deleteTopic( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [Policy]{@link Policy} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.publisherApi(); * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); * var policy = {}; - * api.setIamPolicy(formattedResource, policy, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * var request = { + * resource: formattedResource, + * policy: policy + * }; + * api.setIamPolicy(request).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -PublisherApi.prototype.setIamPolicy = function setIamPolicy( - resource, - policy, - options, - callback) { +PublisherApi.prototype.setIamPolicy = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -602,20 +556,20 @@ PublisherApi.prototype.setIamPolicy = function setIamPolicy( if (options === undefined) { options = {}; } - var req = { - resource: resource, - policy: policy - }; - return this._setIamPolicy(req, options, callback); + return this._setIamPolicy(request, options, callback); }; /** - * Gets the access control policy for a resource. Is empty if the - * policy or the resource does not exist. - * - * @param {string} resource - * REQUIRED: The resource for which policy is being requested. Resource - * is usually specified as a path, such as, projects/{project}. + * Gets the access control policy for a resource. + * Returns an empty policy if the resource exists and does not have a policy + * set. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -623,25 +577,20 @@ PublisherApi.prototype.setIamPolicy = function setIamPolicy( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [Policy]{@link Policy} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.publisherApi(); * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.getIamPolicy(formattedResource, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * api.getIamPolicy({resource: formattedResource}).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -PublisherApi.prototype.getIamPolicy = function getIamPolicy( - resource, - options, - callback) { +PublisherApi.prototype.getIamPolicy = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -649,21 +598,23 @@ PublisherApi.prototype.getIamPolicy = function getIamPolicy( if (options === undefined) { options = {}; } - var req = { - resource: resource - }; - return this._getIamPolicy(req, options, callback); + return this._getIamPolicy(request, options, callback); }; /** * Returns permissions that a caller has on the specified resource. * - * @param {string} resource - * REQUIRED: The resource for which policy detail is being requested. - * Resource is usually specified as a path, such as, projects/{project}. - * @param {string[]} permissions - * The set of permissions to check for the 'resource'. Permissions with - * wildcards (such as '*' or 'storage.*') are not allowed. + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -671,27 +622,25 @@ PublisherApi.prototype.getIamPolicy = function getIamPolicy( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.publisherApi(); * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); * var permissions = []; - * api.testIamPermissions(formattedResource, permissions, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * var request = { + * resource: formattedResource, + * permissions: permissions + * }; + * api.testIamPermissions(request).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -PublisherApi.prototype.testIamPermissions = function testIamPermissions( - resource, - permissions, - options, - callback) { +PublisherApi.prototype.testIamPermissions = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -699,11 +648,7 @@ PublisherApi.prototype.testIamPermissions = function testIamPermissions( if (options === undefined) { options = {}; } - var req = { - resource: resource, - permissions: permissions - }; - return this._testIamPermissions(req, options, callback); + return this._testIamPermissions(request, options, callback); }; function PublisherApiBuilder(gaxGrpc) { diff --git a/handwritten/pubsub/src/v1/subscriber_api.js b/handwritten/pubsub/src/v1/subscriber_api.js index 652a7b4873e..de173d3b614 100644 --- a/handwritten/pubsub/src/v1/subscriber_api.js +++ b/handwritten/pubsub/src/v1/subscriber_api.js @@ -151,7 +151,7 @@ var TOPIC_PATH_TEMPLATE = new gax.PathTemplate( * @param {String} project * @returns {String} */ -SubscriberApi.prototype.projectPath = function projectPath(project) { +SubscriberApi.prototype.projectPath = function(project) { return PROJECT_PATH_TEMPLATE.render({ project: project }); @@ -163,8 +163,7 @@ SubscriberApi.prototype.projectPath = function projectPath(project) { * A fully-qualified path representing a project resources. * @returns {String} - A string representing the project. */ -SubscriberApi.prototype.matchProjectFromProjectName = - function matchProjectFromProjectName(projectName) { +SubscriberApi.prototype.matchProjectFromProjectName = function(projectName) { return PROJECT_PATH_TEMPLATE.match(projectName).project; }; @@ -174,7 +173,7 @@ SubscriberApi.prototype.matchProjectFromProjectName = * @param {String} subscription * @returns {String} */ -SubscriberApi.prototype.subscriptionPath = function subscriptionPath(project, subscription) { +SubscriberApi.prototype.subscriptionPath = function(project, subscription) { return SUBSCRIPTION_PATH_TEMPLATE.render({ project: project, subscription: subscription @@ -187,8 +186,7 @@ SubscriberApi.prototype.subscriptionPath = function subscriptionPath(project, su * A fully-qualified path representing a subscription resources. * @returns {String} - A string representing the project. */ -SubscriberApi.prototype.matchProjectFromSubscriptionName = - function matchProjectFromSubscriptionName(subscriptionName) { +SubscriberApi.prototype.matchProjectFromSubscriptionName = function(subscriptionName) { return SUBSCRIPTION_PATH_TEMPLATE.match(subscriptionName).project; }; @@ -198,8 +196,7 @@ SubscriberApi.prototype.matchProjectFromSubscriptionName = * A fully-qualified path representing a subscription resources. * @returns {String} - A string representing the subscription. */ -SubscriberApi.prototype.matchSubscriptionFromSubscriptionName = - function matchSubscriptionFromSubscriptionName(subscriptionName) { +SubscriberApi.prototype.matchSubscriptionFromSubscriptionName = function(subscriptionName) { return SUBSCRIPTION_PATH_TEMPLATE.match(subscriptionName).subscription; }; @@ -209,7 +206,7 @@ SubscriberApi.prototype.matchSubscriptionFromSubscriptionName = * @param {String} topic * @returns {String} */ -SubscriberApi.prototype.topicPath = function topicPath(project, topic) { +SubscriberApi.prototype.topicPath = function(project, topic) { return TOPIC_PATH_TEMPLATE.render({ project: project, topic: topic @@ -222,8 +219,7 @@ SubscriberApi.prototype.topicPath = function topicPath(project, topic) { * A fully-qualified path representing a topic resources. * @returns {String} - A string representing the project. */ -SubscriberApi.prototype.matchProjectFromTopicName = - function matchProjectFromTopicName(topicName) { +SubscriberApi.prototype.matchProjectFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).project; }; @@ -233,8 +229,7 @@ SubscriberApi.prototype.matchProjectFromTopicName = * A fully-qualified path representing a topic resources. * @returns {String} - A string representing the topic. */ -SubscriberApi.prototype.matchTopicFromTopicName = - function matchTopicFromTopicName(topicName) { +SubscriberApi.prototype.matchTopicFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).topic; }; @@ -249,29 +244,26 @@ SubscriberApi.prototype.matchTopicFromTopicName = * name for this subscription on the same project as the topic. Note that * for REST API requests, you must specify a name. * - * @param {string} name + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name * The name of the subscription. It must have the format * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must * start with a letter, and contain only letters (`[A-Za-z]`), numbers * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters * in length, and it must not start with `"goog"`. - * @param {string} topic + * @param {string} request.topic * The name of the topic from which this subscription is receiving messages. * The value of this field will be `_deleted-topic_` if the topic has been * deleted. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * - * In addition, options may contain the following optional parameters. - * @param {Object=} options.pushConfig + * @param {Object=} request.pushConfig * If push delivery is used with this subscription, this field is * used to configure it. An empty `pushConfig` signifies that the subscriber * will pull and ack messages using API methods. * * This object should have the same structure as [PushConfig]{@link PushConfig} - * @param {number=} options.ackDeadlineSeconds + * @param {number=} request.ackDeadlineSeconds * This value is the maximum time after a subscriber receives a message * before the subscriber should acknowledge the message. After message * delivery but before the ack deadline expires and before the message is @@ -291,32 +283,32 @@ SubscriberApi.prototype.matchTopicFromTopicName = * system will eventually redeliver the message. * * If this parameter is 0, a default value of 10 seconds is used. - * + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [Subscription]{@link Subscription} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedName = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.createSubscription(formattedName, formattedTopic, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * var request = { + * name: formattedName, + * topic: formattedTopic + * }; + * api.createSubscription(request).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.createSubscription = function createSubscription( - name, - topic, - options, - callback) { +SubscriberApi.prototype.createSubscription = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -324,23 +316,15 @@ SubscriberApi.prototype.createSubscription = function createSubscription( if (options === undefined) { options = {}; } - var req = { - name: name, - topic: topic - }; - if ('pushConfig' in options) { - req.pushConfig = options.pushConfig; - } - if ('ackDeadlineSeconds' in options) { - req.ackDeadlineSeconds = options.ackDeadlineSeconds; - } - return this._createSubscription(req, options, callback); + return this._createSubscription(request, options, callback); }; /** * Gets the configuration details of a subscription. * - * @param {string} subscription + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription * The name of the subscription to get. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -349,25 +333,20 @@ SubscriberApi.prototype.createSubscription = function createSubscription( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [Subscription]{@link Subscription} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * api.getSubscription(formattedSubscription, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * api.getSubscription({subscription: formattedSubscription}).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.getSubscription = function getSubscription( - subscription, - options, - callback) { +SubscriberApi.prototype.getSubscription = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -375,47 +354,43 @@ SubscriberApi.prototype.getSubscription = function getSubscription( if (options === undefined) { options = {}; } - var req = { - subscription: subscription - }; - return this._getSubscription(req, options, callback); + return this._getSubscription(request, options, callback); }; /** * Lists matching subscriptions. * - * @param {string} project + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project * The name of the cloud project that subscriptions belong to. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * - * In addition, options may contain the following optional parameters. - * @param {number=} options.pageSize + * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this * parameter does not affect the return value. If page streaming is * performed per-page, this determines the maximum number of * resources in a page. - * + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object, ?string)=} callback * When specified, the results are not streamed but this callback * will be called with the response object representing [ListSubscriptionsResponse]{@link ListSubscriptionsResponse}. * The third item will be set if the response contains the token for the further results * and can be reused to `pageToken` field in the options in the next request. - * @returns {Stream|gax.EventEmitter} + * @returns {Stream|Promise} * An object stream which emits an object representing * [Subscription]{@link Subscription} on 'data' event. * When the callback is specified or streaming is suppressed through options, - * it will return an event emitter to handle the call status and the callback - * will be called with the response object. + * it will return a promise that resolves to the response object. The promise + * has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedProject = api.projectPath("[PROJECT]"); * // Iterate over all elements. - * api.listSubscriptions(formattedProject).on('data', function(element) { + * api.listSubscriptions({project: formattedProject}).on('data', function(element) { * // doThingsWith(element) * }); * @@ -428,15 +403,12 @@ SubscriberApi.prototype.getSubscription = function getSubscription( * // doThingsWith(response) * if (nextPageToken) { * // fetch the next page. - * api.listSubscriptions(formattedProject, {pageToken: nextPageToken}, callback); + * api.listSubscriptions({project: formattedProject}, {pageToken: nextPageToken}, callback); * } * } - * api.listSubscriptions(formattedProject, {flattenPages: false}, callback); + * api.listSubscriptions({project: formattedProject}, {flattenPages: false}, callback); */ -SubscriberApi.prototype.listSubscriptions = function listSubscriptions( - project, - options, - callback) { +SubscriberApi.prototype.listSubscriptions = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -444,13 +416,7 @@ SubscriberApi.prototype.listSubscriptions = function listSubscriptions( if (options === undefined) { options = {}; } - var req = { - project: project - }; - if ('pageSize' in options) { - req.pageSize = options.pageSize; - } - return this._listSubscriptions(req, options, callback); + return this._listSubscriptions(request, options, callback); }; /** @@ -460,30 +426,27 @@ SubscriberApi.prototype.listSubscriptions = function listSubscriptions( * the same name, but the new one has no association with the old * subscription, or its topic unless the same topic is specified. * - * @param {string} subscription + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription * The subscription to delete. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * api.deleteSubscription(formattedSubscription, function(err) { - * if (err) { - * console.error(err); - * } + * api.deleteSubscription({subscription: formattedSubscription}).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.deleteSubscription = function deleteSubscription( - subscription, - options, - callback) { +SubscriberApi.prototype.deleteSubscription = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -491,10 +454,7 @@ SubscriberApi.prototype.deleteSubscription = function deleteSubscription( if (options === undefined) { options = {}; } - var req = { - subscription: subscription - }; - return this._deleteSubscription(req, options, callback); + return this._deleteSubscription(request, options, callback); }; /** @@ -504,11 +464,13 @@ SubscriberApi.prototype.deleteSubscription = function deleteSubscription( * processing was interrupted. Note that this does not modify the * subscription-level `ackDeadlineSeconds` used for subsequent messages. * - * @param {string} subscription + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription * The name of the subscription. - * @param {string[]} ackIds + * @param {string[]} request.ackIds * List of acknowledgment IDs. - * @param {number} ackDeadlineSeconds + * @param {number} request.ackDeadlineSeconds * The new ack deadline with respect to the time this request was sent to * the Pub/Sub system. Must be >= 0. For example, if the value is 10, the new * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call @@ -519,8 +481,8 @@ SubscriberApi.prototype.deleteSubscription = function deleteSubscription( * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * @@ -528,18 +490,16 @@ SubscriberApi.prototype.deleteSubscription = function deleteSubscription( * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var ackIds = []; * var ackDeadlineSeconds = 0; - * api.modifyAckDeadline(formattedSubscription, ackIds, ackDeadlineSeconds, function(err) { - * if (err) { - * console.error(err); - * } + * var request = { + * subscription: formattedSubscription, + * ackIds: ackIds, + * ackDeadlineSeconds: ackDeadlineSeconds + * }; + * api.modifyAckDeadline(request).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline( - subscription, - ackIds, - ackDeadlineSeconds, - options, - callback) { +SubscriberApi.prototype.modifyAckDeadline = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -547,12 +507,7 @@ SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline( if (options === undefined) { options = {}; } - var req = { - subscription: subscription, - ackIds: ackIds, - ackDeadlineSeconds: ackDeadlineSeconds - }; - return this._modifyAckDeadline(req, options, callback); + return this._modifyAckDeadline(request, options, callback); }; /** @@ -564,9 +519,11 @@ SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline( * but such a message may be redelivered later. Acknowledging a message more * than once will not result in an error. * - * @param {string} subscription + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription * The subscription whose message is being acknowledged. - * @param {string[]} ackIds + * @param {string[]} request.ackIds * The acknowledgment ID for the messages being acknowledged that was returned * by the Pub/Sub system in the `Pull` response. Must not be empty. * @param {Object=} options @@ -574,25 +531,23 @@ SubscriberApi.prototype.modifyAckDeadline = function modifyAckDeadline( * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var ackIds = []; - * api.acknowledge(formattedSubscription, ackIds, function(err) { - * if (err) { - * console.error(err); - * } + * var request = { + * subscription: formattedSubscription, + * ackIds: ackIds + * }; + * api.acknowledge(request).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.acknowledge = function acknowledge( - subscription, - ackIds, - options, - callback) { +SubscriberApi.prototype.acknowledge = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -600,11 +555,7 @@ SubscriberApi.prototype.acknowledge = function acknowledge( if (options === undefined) { options = {}; } - var req = { - subscription: subscription, - ackIds: ackIds - }; - return this._acknowledge(req, options, callback); + return this._acknowledge(request, options, callback); }; /** @@ -613,48 +564,45 @@ SubscriberApi.prototype.acknowledge = function acknowledge( * there are too many concurrent pull requests pending for the given * subscription. * - * @param {string} subscription + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription * The subscription from which messages should be pulled. - * @param {number} maxMessages + * @param {number} request.maxMessages * The maximum number of messages returned for this request. The Pub/Sub * system may return fewer than the number specified. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * - * In addition, options may contain the following optional parameters. - * @param {boolean=} options.returnImmediately + * @param {boolean=} request.returnImmediately * If this is specified as true the system will respond immediately even if * it is not able to return a message in the `Pull` response. Otherwise the * system is allowed to wait until at least one message is available rather * than returning no messages. The client may cancel the request if it does * not wish to wait any longer for the response. - * + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [PullResponse]{@link PullResponse} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var maxMessages = 0; - * api.pull(formattedSubscription, maxMessages, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * var request = { + * subscription: formattedSubscription, + * maxMessages: maxMessages + * }; + * api.pull(request).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.pull = function pull( - subscription, - maxMessages, - options, - callback) { +SubscriberApi.prototype.pull = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -662,14 +610,7 @@ SubscriberApi.prototype.pull = function pull( if (options === undefined) { options = {}; } - var req = { - subscription: subscription, - maxMessages: maxMessages - }; - if ('returnImmediately' in options) { - req.returnImmediately = options.returnImmediately; - } - return this._pull(req, options, callback); + return this._pull(request, options, callback); }; /** @@ -680,9 +621,11 @@ SubscriberApi.prototype.pull = function pull( * attributes of a push subscription. Messages will accumulate for delivery * continuously through the call regardless of changes to the `PushConfig`. * - * @param {string} subscription + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription * The name of the subscription. - * @param {Object} pushConfig + * @param {Object} request.pushConfig * The push configuration for future deliveries. * * An empty `pushConfig` indicates that the Pub/Sub system should @@ -696,25 +639,23 @@ SubscriberApi.prototype.pull = function pull( * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var pushConfig = {}; - * api.modifyPushConfig(formattedSubscription, pushConfig, function(err) { - * if (err) { - * console.error(err); - * } + * var request = { + * subscription: formattedSubscription, + * pushConfig: pushConfig + * }; + * api.modifyPushConfig(request).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.modifyPushConfig = function modifyPushConfig( - subscription, - pushConfig, - options, - callback) { +SubscriberApi.prototype.modifyPushConfig = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -722,25 +663,24 @@ SubscriberApi.prototype.modifyPushConfig = function modifyPushConfig( if (options === undefined) { options = {}; } - var req = { - subscription: subscription, - pushConfig: pushConfig - }; - return this._modifyPushConfig(req, options, callback); + return this._modifyPushConfig(request, options, callback); }; /** * Sets the access control policy on the specified resource. Replaces any * existing policy. * - * @param {string} resource - * REQUIRED: The resource for which policy is being specified. - * Resource is usually specified as a path, such as, - * projects/{project}/zones/{zone}/disks/{disk}. - * @param {Object} policy - * REQUIRED: The complete policy to be applied to the 'resource'. The size of - * the policy is limited to a few 10s of KB. An empty policy is in general a - * valid policy but certain services (like Projects) might reject them. + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being specified. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {Object} request.policy + * REQUIRED: The complete policy to be applied to the `resource`. The size of + * the policy is limited to a few 10s of KB. An empty policy is a + * valid policy but certain Cloud Platform services (such as Projects) + * might reject them. * * This object should have the same structure as [Policy]{@link Policy} * @param {Object=} options @@ -750,27 +690,25 @@ SubscriberApi.prototype.modifyPushConfig = function modifyPushConfig( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [Policy]{@link Policy} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var policy = {}; - * api.setIamPolicy(formattedResource, policy, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * var request = { + * resource: formattedResource, + * policy: policy + * }; + * api.setIamPolicy(request).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.setIamPolicy = function setIamPolicy( - resource, - policy, - options, - callback) { +SubscriberApi.prototype.setIamPolicy = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -778,20 +716,20 @@ SubscriberApi.prototype.setIamPolicy = function setIamPolicy( if (options === undefined) { options = {}; } - var req = { - resource: resource, - policy: policy - }; - return this._setIamPolicy(req, options, callback); + return this._setIamPolicy(request, options, callback); }; /** - * Gets the access control policy for a resource. Is empty if the - * policy or the resource does not exist. - * - * @param {string} resource - * REQUIRED: The resource for which policy is being requested. Resource - * is usually specified as a path, such as, projects/{project}. + * Gets the access control policy for a resource. + * Returns an empty policy if the resource exists and does not have a policy + * set. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -799,25 +737,20 @@ SubscriberApi.prototype.setIamPolicy = function setIamPolicy( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [Policy]{@link Policy} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * api.getIamPolicy(formattedResource, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * api.getIamPolicy({resource: formattedResource}).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.getIamPolicy = function getIamPolicy( - resource, - options, - callback) { +SubscriberApi.prototype.getIamPolicy = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -825,21 +758,23 @@ SubscriberApi.prototype.getIamPolicy = function getIamPolicy( if (options === undefined) { options = {}; } - var req = { - resource: resource - }; - return this._getIamPolicy(req, options, callback); + return this._getIamPolicy(request, options, callback); }; /** * Returns permissions that a caller has on the specified resource. * - * @param {string} resource - * REQUIRED: The resource for which policy detail is being requested. - * Resource is usually specified as a path, such as, projects/{project}. - * @param {string[]} permissions - * The set of permissions to check for the 'resource'. Permissions with - * wildcards (such as '*' or 'storage.*') are not allowed. + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -847,27 +782,25 @@ SubscriberApi.prototype.getIamPolicy = function getIamPolicy( * The function which will be called with the result of the API call. * * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse} - * @returns {gax.EventEmitter} - the event emitter to handle the call - * status. + * @returns {Promise} - The promise which resolves to the response object. + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * * var api = pubsubV1.subscriberApi(); * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var permissions = []; - * api.testIamPermissions(formattedResource, permissions, function(err, response) { - * if (err) { - * console.error(err); - * return; - * } + * var request = { + * resource: formattedResource, + * permissions: permissions + * }; + * api.testIamPermissions(request).then(function(response) { * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); * }); */ -SubscriberApi.prototype.testIamPermissions = function testIamPermissions( - resource, - permissions, - options, - callback) { +SubscriberApi.prototype.testIamPermissions = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -875,11 +808,7 @@ SubscriberApi.prototype.testIamPermissions = function testIamPermissions( if (options === undefined) { options = {}; } - var req = { - resource: resource, - permissions: permissions - }; - return this._testIamPermissions(req, options, callback); + return this._testIamPermissions(request, options, callback); }; function SubscriberApiBuilder(gaxGrpc) { From 80901fc4e27be285c8ea57fb77c48b4243a5076e Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 21 Oct 2016 16:52:36 -0400 Subject: [PATCH 0027/1115] pubsub @ 0.5.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ca8cfdf1a2d..df6334d8797 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.4.0", + "version": "0.5.0", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ From f5555bcb33a9af7cae7e519dd39ee7771421d2df Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 24 Oct 2016 19:57:09 -0400 Subject: [PATCH 0028/1115] pubsub: docs: correct links & add options.pushEndpoint (#1745) * pubsub: docs: correct links * pubsub: add pushEndpoint shortcut --- handwritten/pubsub/src/iam.js | 18 +++++++++--------- handwritten/pubsub/src/index.js | 25 +++++++++++++++---------- handwritten/pubsub/src/subscription.js | 10 +++++----- handwritten/pubsub/src/topic.js | 25 ++++++++++++------------- handwritten/pubsub/test/index.js | 11 +++++++---- 5 files changed, 48 insertions(+), 41 deletions(-) diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 1f953bfdc9e..8192b4a8977 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -89,11 +89,11 @@ util.inherits(IAM, common.GrpcService); * * @param {function} callback - The callback function. * @param {?error} callback.err - An error returned while making this request. - * @param {object} callback.policy - The [policy](https://cloud.google.com/pubsub/reference/rest/Shared.Types/Policy). + * @param {object} callback.policy - The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). * @param {object} callback.apiResponse - The full API response. * - * @resource [Topics: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/getIamPolicy} - * @resource [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/getIamPolicy} + * @resource [Topics: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/getIamPolicy} + * @resource [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy} * * @example * topic.iam.getPolicy(function(err, policy, apiResponse) {}); @@ -126,7 +126,7 @@ IAM.prototype.getPolicy = function(callback) { * * @throws {Error} If no policy is provided. * - * @param {object} policy - The [policy](https://cloud.google.com/pubsub/reference/rest/Shared.Types/Policy). + * @param {object} policy - The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). * @param {array=} policy.bindings - Bindings associate members with roles. * @param {object[]=} policy.rules - Rules to be applied to the policy. * @param {string=} policy.etag - Etags are used to perform a read-modify-write. @@ -135,9 +135,9 @@ IAM.prototype.getPolicy = function(callback) { * @param {object} callback.policy - The updated policy. * @param {object} callback.apiResponse - The full API response. * - * @resource [Topics: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/setIamPolicy} - * @resource [Subscriptions: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/setIamPolicy} - * @resource [Policy]{@link https://cloud.google.com/pubsub/reference/rest/Shared.Types/Policy} + * @resource [Topics: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/setIamPolicy} + * @resource [Subscriptions: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/setIamPolicy} + * @resource [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy} * * @example * var myPolicy = { @@ -193,8 +193,8 @@ IAM.prototype.setPolicy = function(policy, callback) { * is allowed * @param {object} callback.apiResponse - The full API response. * - * @resource [Topics: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/testIamPermissions} - * @resource [Subscriptions: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/testIamPermissions} + * @resource [Topics: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/testIamPermissions} + * @resource [Subscriptions: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/testIamPermissions} * @resource [Permissions Reference]{@link https://cloud.google.com/pubsub/access_control#permissions} * * @example diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 3d104d0f240..c45ee1357df 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -84,7 +84,7 @@ util.inherits(PubSub, common.GrpcService); /** * Create a topic with the given name. * - * @resource [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/create} + * @resource [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create} * * @param {string} name - Name of the topic. * @param {function=} callback - The callback function. @@ -145,7 +145,7 @@ PubSub.prototype.createTopic = function(name, callback) { * * To get subscriptions for a topic, see {module:pubsub/topic}. * - * @resource [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/list} + * @resource [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list} * * @param {object=} options - Configuration object. * @param {boolean} options.autoPaginate - Have pagination handled @@ -287,7 +287,7 @@ PubSub.prototype.getSubscriptionsStream = * Get a list of the topics registered to your project. You may optionally * provide a query object as the first argument to customize the response. * - * @resource [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/list} + * @resource [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list} * * @param {object=} query - Query object. * @param {boolean} options.autoPaginate - Have pagination handled @@ -407,13 +407,9 @@ PubSub.prototype.getTopics = function(query, callback) { PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); /** - * Create a subscription to a topic. You may optionally provide an object to - * customize the subscription. + * Create a subscription to a topic. * - * Your provided callback will be invoked with an error object if an API error - * occurred or a {module:pubsub/subscription} object. - * - * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/create} + * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} * * @throws {Error} If a Topic instance or topic name is not provided. * @throws {Error} If a subName is not provided. @@ -422,7 +418,7 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); * subscription to. * @param {string} subName - The name of the subscription. * @param {object=} options - See a - * [Subscription resource](https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions) + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) * @param {number} options.ackDeadlineSeconds - The maximum time after receiving * a message that you must ack a message before it is redelivered. * @param {boolean} options.autoAck - Automatically acknowledge the message once @@ -433,6 +429,8 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); * messages. (default: 10) * @param {number} options.maxInProgress - Maximum messages to consume * simultaneously. + * @param {string} options.pushEndpoint - A URL to a custom endpoint that + * messages should be pushed to. * @param {boolean} options.reuseExisting - If the subscription already exists, * reuse it. The options of the existing subscription are not changed. If * false, attempting to create a subscription that already exists will fail. @@ -504,10 +502,17 @@ PubSub.prototype.subscribe = function(topic, subName, options, callback) { name: subscription.name }); + if (reqOpts.pushEndpoint) { + reqOpts.pushConfig = { + pushEndpoint: reqOpts.pushEndpoint + }; + } + delete reqOpts.autoAck; delete reqOpts.encoding; delete reqOpts.interval; delete reqOpts.maxInProgress; + delete reqOpts.pushEndpoint; delete reqOpts.reuseExisting; delete reqOpts.timeout; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index c0ca4912148..a5fb904762c 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -197,7 +197,7 @@ function Subscription(pubsub, options) { /** * Get the metadata for the subscription. * - * @resource [Subscriptions: get API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/get} + * @resource [Subscriptions: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/get} * * @param {function} callback - The callback function. * @param {?error} callback.err - An error returned while making this @@ -378,7 +378,7 @@ Subscription.formatName_ = function(projectId, name) { * Acknowledge to the backend that the message was retrieved. You must provide * either a single ackId or an array of ackIds. * - * @resource [Subscriptions: acknowledge API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/acknowledge} + * @resource [Subscriptions: acknowledge API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/acknowledge} * * @throws {Error} If at least one ackId is not provided. * @@ -467,7 +467,7 @@ Subscription.prototype.decorateMessage_ = function(message) { * Delete the subscription. Pull requests from the current subscription will be * errored once unsubscription is complete. * - * @resource [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/delete} + * @resource [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete} * * @param {function=} callback - The callback function. * @param {?error} callback.err - An error returned while making this @@ -522,7 +522,7 @@ Subscription.prototype.delete = function(callback) { * * @todo Should not be racing with other pull. * - * @resource [Subscriptions: pull API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/pull} + * @resource [Subscriptions: pull API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/pull} * * @param {object=} options - Configuration object. * @param {number} options.maxResults - Limit the amount of messages pulled. @@ -634,7 +634,7 @@ Subscription.prototype.pull = function(options, callback) { * to make the message available for redelivery if the processing was * interrupted. * - * @resource [Subscriptions: modifyAckDeadline API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/modifyAckDeadline} + * @resource [Subscriptions: modifyAckDeadline API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyAckDeadline} * * @param {object} options - The configuration object. * @param {string|string[]} options.ackIds - The ack id(s) to change. diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index efa07268c88..466aaedacea 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -76,7 +76,7 @@ function Topic(pubsub, name) { /** * Delete the topic. This will not delete subscriptions to this topic. * - * @resource [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/delete} + * @resource [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete} * * @param {function=} callback - The callback function. * @@ -150,7 +150,7 @@ function Topic(pubsub, name) { /** * Get the official representation of this topic from the API. * - * @resource [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/get} + * @resource [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get} * * @param {function} callback - The callback function. * @param {?error} callback.err - An error returned while making this @@ -266,7 +266,7 @@ Topic.formatName_ = function(projectId, name) { * Your provided callback will be invoked with an error object if an API error * occurred or an array of {module:pubsub/subscription} objects. * - * @resource [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics.subscriptions/list} + * @resource [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics.subscriptions/list} * * @param {object=} options - Configuration object. * @param {boolean} options.autoPaginate - Have pagination handled @@ -359,7 +359,7 @@ Topic.prototype.getSubscriptionsStream = function(options) { * Publish the provided message or array of messages. On success, an array of * messageIds is returned in the response. * - * @resource [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.topics/publish} + * @resource [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} * * @throws {Error} If no message is provided. * @@ -475,26 +475,25 @@ Topic.prototype.publish = function(messages, options, callback) { }; /** - * Create a subscription to this topic. You may optionally provide an object to - * customize the subscription. + * Create a subscription to this topic. * - * Your provided callback will be invoked with an error object if an API error - * occurred or a {module:pubsub/subscription} object. - * - * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/create} + * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} * * @param {string} subName - The name of the subscription. - * @param {object=} options - Configuration object. - * @param {number=} options.ackDeadlineSeconds - The maximum time after + * @param {object=} options - See a + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) + * @param {number} options.ackDeadlineSeconds - The maximum time after * receiving a message that you must ack a message before it is redelivered. * @param {boolean=} options.autoAck - Automatically acknowledge the message * once it's pulled. (default: false) * @param {string} options.encoding - When pulling for messages, this type is * used when converting a message's data to a string. (default: 'utf-8') - * @param {number=} options.interval - Interval in milliseconds to check for new + * @param {number} options.interval - Interval in milliseconds to check for new * messages. (default: 10) * @param {number} options.maxInProgress - Maximum messages to consume * simultaneously. + * @param {string} options.pushEndpoint - A URL to a custom endpoint that + * messages should be pushed to. * @param {boolean=} options.reuseExisting - If the subscription already exists, * reuse it. The options of the existing subscription are not changed. If * false, attempting to create a subscription that already exists will fail. diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index ddf07c84f21..9d81a9cc152 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -572,9 +572,7 @@ describe('PubSub', function() { encoding: 'utf-8', interval: 3, maxInProgress: 5, - pushConfig: { - pushEndpoint: 'https://domain/push' - }, + pushEndpoint: 'https://domain/push', reuseExisting: false, timeout: 30000 }; @@ -582,12 +580,17 @@ describe('PubSub', function() { var expectedBody = extend({ topic: TOPIC_NAME, name: SUB_NAME - }, options); + }, options, { + pushConfig: { + pushEndpoint: options.pushEndpoint + } + }); delete expectedBody.autoAck; delete expectedBody.encoding; delete expectedBody.interval; delete expectedBody.maxInProgress; + delete expectedBody.pushEndpoint; delete expectedBody.reuseExisting; delete expectedBody.timeout; From 9224d33b31610c41381f432a32314cc7a54020a5 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 16 Nov 2016 11:16:08 -0500 Subject: [PATCH 0029/1115] docs: update API key generation steps (#1791) --- handwritten/pubsub/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index b8d8ca252ec..f61b991eb52 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -79,8 +79,8 @@ If you are not running this client on Google Compute Engine, you need a Google D 3. Navigate to **APIs & auth** > **APIs section** and turn on the following APIs (you may need to enable billing in order to use these services): * Google Cloud Pub/Sub API 4. Navigate to **APIs & auth** > **Credentials** and then: - * If you want to use a new service account, click on **Create new Client ID** and select **Service account**. After the account is created, you will be prompted to download the JSON key file that the library uses to authenticate your requests. - * If you want to generate a new key for an existing service account, click on **Generate new JSON key** and download the JSON key file. + * If you want to use a new service account key, click on **Create credentials** and select **Service account key**. After the account key is created, you will be prompted to download the JSON key file that the library uses to authenticate your requests. + * If you want to generate a new service account key for an existing service account, click on **Generate new JSON key** and download the JSON key file. ``` js var projectId = process.env.GCLOUD_PROJECT; // E.g. 'grape-spaceship-123' From cf58df69e4bc9b7ab611d9d93b22f61232c59e9b Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 16 Nov 2016 14:39:40 -0500 Subject: [PATCH 0030/1115] update dependencies --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index df6334d8797..025facd4a24 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,10 +50,10 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.7.0", + "@google-cloud/common": "^0.8.0", "arrify": "^1.0.0", "extend": "^3.0.0", - "google-gax": "^0.8.1", + "google-gax": "^0.9.1", "google-proto-files": "^0.8.0", "is": "^3.0.1", "modelo": "^4.2.0", From b4d007b6b9947a228c6d7d70c9bd5b49adc9bb8a Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 16 Nov 2016 16:28:01 -0500 Subject: [PATCH 0031/1115] pubsub @ 0.6.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 025facd4a24..46beec11475 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.5.0", + "version": "0.6.0", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 4b46f4a96a71cd91d623cca6ceeedc4e52886ea2 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 28 Nov 2016 12:58:34 -0500 Subject: [PATCH 0032/1115] pubsub: support generated subscription names (#1799) --- handwritten/pubsub/README.md | 6 +- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/index.js | 52 ++++++++++----- handwritten/pubsub/src/subscription.js | 14 +++- handwritten/pubsub/src/topic.js | 17 +++-- handwritten/pubsub/system-test/pubsub.js | 9 ++- handwritten/pubsub/test/index.js | 85 +++++++++++++++--------- handwritten/pubsub/test/subscription.js | 59 ++++++++++++++-- 8 files changed, 176 insertions(+), 68 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index f61b991eb52..877bb0846ae 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -23,11 +23,7 @@ var topic = pubsub.topic('my-topic'); topic.publish('New message!', function(err) {}); // Subscribe to the topic. -var options = { - reuseExisting: true -}; - -topic.subscribe('subscription-name', options, function(err, subscription) { +topic.subscribe('subscription-name', function(err, subscription) { // Register listeners to start pulling for messages. function onError(err) {} function onMessage(message) {} diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 46beec11475..ff44918d4ed 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,12 +57,12 @@ "google-proto-files": "^0.8.0", "is": "^3.0.1", "modelo": "^4.2.0", + "node-uuid": "^1.4.3", "propprop": "^0.3.0" }, "devDependencies": { "async": "^1.5.2", "mocha": "^3.0.1", - "node-uuid": "^1.4.3", "proxyquire": "^1.7.10" }, "scripts": { diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index c45ee1357df..ca4c916cca8 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -409,6 +409,8 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); /** * Create a subscription to a topic. * + * All generated subscription names share a common prefix, `autogenerated-`. + * * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} * * @throws {Error} If a Topic instance or topic name is not provided. @@ -416,7 +418,8 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); * * @param {module:pubsub/topic|string} topic - The Topic to create a * subscription to. - * @param {string} subName - The name of the subscription. + * @param {string=} subName - The name of the subscription. If a name is not + * provided, a random subscription name will be generated and created. * @param {object=} options - See a * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) * @param {number} options.ackDeadlineSeconds - The maximum time after receiving @@ -431,10 +434,6 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); * simultaneously. * @param {string} options.pushEndpoint - A URL to a custom endpoint that * messages should be pushed to. - * @param {boolean} options.reuseExisting - If the subscription already exists, - * reuse it. The options of the existing subscription are not changed. If - * false, attempting to create a subscription that already exists will fail. - * (default: false) * @param {number} options.timeout - Set a maximum amount of time in * milliseconds on an HTTP request to pull new messages to wait for a * response before the connection is broken. @@ -453,6 +452,14 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); * pubsub.subscribe(topic, name, function(err, subscription, apiResponse) {}); * * //- + * // Omit the name to have one generated automatically. All generated names + * // share a common prefix, `autogenerated-`. + * //- + * pubsub.subscribe(topic, function(err, subscription, apiResponse) { + * // subscription.name = The generated name. + * }); + * + * //- * // Customize the subscription. * //- * pubsub.subscribe(topic, name, { @@ -474,21 +481,28 @@ PubSub.prototype.subscribe = function(topic, subName, options, callback) { throw new Error('A Topic is required for a new subscription.'); } - if (!is.string(subName)) { - throw new Error('A subscription name is required for a new subscription.'); + if (is.string(topic)) { + topic = this.topic(topic); } - if (!callback) { + if (is.object(subName)) { callback = options; - options = {}; + options = subName; + subName = ''; } - options = options || {}; + if (is.fn(subName)) { + callback = subName; + subName = ''; + } - if (is.string(topic)) { - topic = this.topic(topic); + if (is.fn(options)) { + callback = options; + options = {}; } + options = options || {}; + var subscription = this.subscription(subName, options); var protoOpts = { @@ -513,11 +527,10 @@ PubSub.prototype.subscribe = function(topic, subName, options, callback) { delete reqOpts.interval; delete reqOpts.maxInProgress; delete reqOpts.pushEndpoint; - delete reqOpts.reuseExisting; delete reqOpts.timeout; this.request(protoOpts, reqOpts, function(err, resp) { - if (err && !(err.code === 409 && options.reuseExisting)) { + if (err && err.code !== 409) { callback(err, null, resp); return; } @@ -531,9 +544,10 @@ PubSub.prototype.subscribe = function(topic, subName, options, callback) { * requests. You will receive a {module:pubsub/subscription} object, * which will allow you to interact with a subscription. * - * @throws {Error} If a name is not provided. + * All generated names share a common prefix, `autogenerated-`. * - * @param {string} name - The name of the subscription. + * @param {string=} name - The name of the subscription. If a name is not + * provided, a random subscription name will be generated. * @param {object=} options - Configuration object. * @param {boolean} options.autoAck - Automatically acknowledge the message once * it's pulled. (default: false) @@ -560,12 +574,14 @@ PubSub.prototype.subscribe = function(topic, subName, options, callback) { * }); */ PubSub.prototype.subscription = function(name, options) { - if (!name) { - throw new Error('The name of a subscription is required.'); + if (is.object(name)) { + options = name; + name = undefined; } options = options || {}; options.name = name; + return new Subscription(this, options); }; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index a5fb904762c..101570e7dda 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -26,6 +26,7 @@ var events = require('events'); var is = require('is'); var modelo = require('modelo'); var prop = require('propprop'); +var uuid = require('node-uuid'); /** * @type {module:pubsub/iam} @@ -140,7 +141,9 @@ var PUBSUB_API_TIMEOUT = 90000; * subscription.removeListener('message', onMessage); */ function Subscription(pubsub, options) { - this.name = Subscription.formatName_(pubsub.projectId, options.name); + var name = options.name || Subscription.generateName_(); + + this.name = Subscription.formatName_(pubsub.projectId, name); var methods = { /** @@ -374,6 +377,15 @@ Subscription.formatName_ = function(projectId, name) { return 'projects/' + projectId + '/subscriptions/' + name; }; +/** + * Generate a random name to use for a name-less subscription. + * + * @private + */ +Subscription.generateName_ = function() { + return 'autogenerated-' + uuid.v4(); +}; + /** * Acknowledge to the backend that the message was retrieved. You must provide * either a single ackId or an array of ackIds. diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 466aaedacea..8a3b3e0f688 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -477,9 +477,12 @@ Topic.prototype.publish = function(messages, options, callback) { /** * Create a subscription to this topic. * + * All generated subscription names share a common prefix, `autogenerated-`. + * * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} * - * @param {string} subName - The name of the subscription. + * @param {string=} subName - The name of the subscription. If a name is not + * provided, a random subscription name will be generated and created. * @param {object=} options - See a * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) * @param {number} options.ackDeadlineSeconds - The maximum time after @@ -494,10 +497,6 @@ Topic.prototype.publish = function(messages, options, callback) { * simultaneously. * @param {string} options.pushEndpoint - A URL to a custom endpoint that * messages should be pushed to. - * @param {boolean=} options.reuseExisting - If the subscription already exists, - * reuse it. The options of the existing subscription are not changed. If - * false, attempting to create a subscription that already exists will fail. - * (default: false) * @param {number} options.timeout - Set a maximum amount of time in * milliseconds on an HTTP request to pull new messages to wait for a * response before the connection is broken. @@ -507,6 +506,14 @@ Topic.prototype.publish = function(messages, options, callback) { * // Without specifying any options. * topic.subscribe('newMessages', function(err, subscription, apiResponse) {}); * + * //- + * // Omit the name to have one generated automatically. All generated names + * // share a common prefix, `autogenerated-`. + * //- + * topic.subscribe(function(err, subscription, apiResponse) { + * // subscription.name = The generated name. + * }); + * * // With options. * topic.subscribe('newMessages', { * ackDeadlineSeconds: 90, diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 2679591acff..56b28f129c9 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -302,8 +302,15 @@ describe('pubsub', function() { }); }); + it('should create a subscription with a generated name', function(done) { + topic.subscribe(function(err, sub) { + assert.ifError(err); + sub.delete(done); + }); + }); + it('should re-use an existing subscription', function(done) { - pubsub.subscribe(topic, SUB_NAMES[0], { reuseExisting: true }, done); + pubsub.subscribe(topic, SUB_NAMES[0], done); }); it('should error when using a non-existent subscription', function(done) { diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 9d81a9cc152..df69e1d3cff 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -491,10 +491,22 @@ describe('PubSub', function() { }, /A Topic is required for a new subscription\./); }); - it('should throw if no sub name is provided', function() { - assert.throws(function() { - pubsub.subscribe('topic'); - }, /A subscription name is required for a new subscription\./); + it('should not require a subscription name', function(done) { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + + pubsub.subscribe(TOPIC_NAME, done); + }); + + it('should not require a sub name and accept options', function(done) { + var opts = {}; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + + pubsub.subscribe(TOPIC_NAME, opts, done); }); it('should not require configuration options', function(done) { @@ -573,7 +585,6 @@ describe('PubSub', function() { interval: 3, maxInProgress: 5, pushEndpoint: 'https://domain/push', - reuseExisting: false, timeout: 30000 }; @@ -591,7 +602,6 @@ describe('PubSub', function() { delete expectedBody.interval; delete expectedBody.maxInProgress; delete expectedBody.pushEndpoint; - delete expectedBody.reuseExisting; delete expectedBody.timeout; pubsub.topic = function() { @@ -625,7 +635,7 @@ describe('PubSub', function() { }; }); - it('should re-use existing subscription if specified', function(done) { + it('should re-use existing subscription', function(done) { var apiResponse = { code: 409 }; pubsub.subscription = function() { @@ -636,18 +646,9 @@ describe('PubSub', function() { callback({ code: 409 }, apiResponse); }; - // Don't re-use an existing subscription (error if one exists). - pubsub.subscribe(TOPIC_NAME, SUB_NAME, function(err, sub, resp) { - assert.equal(err.code, 409); - assert.strictEqual(resp, apiResponse); - }); - - // Re-use an existing subscription (ignore error if one exists). - var opts = { reuseExisting: true }; - pubsub.subscribe(TOPIC_NAME, SUB_NAME, opts, function(err, sub) { + pubsub.subscribe(TOPIC_NAME, SUB_NAME, function(err, subscription) { assert.ifError(err); - assert.deepEqual(sub, SUBSCRIPTION); - + assert.strictEqual(subscription, SUBSCRIPTION); done(); }); }); @@ -700,18 +701,20 @@ describe('PubSub', function() { var SUB_NAME = 'new-sub-name'; var CONFIG = { autoAck: true, interval: 90 }; - it('should throw if no name is provided', function() { - assert.throws(function() { - pubsub.subscription(); - }, /The name of a subscription is required\./); - }); - it('should return a Subscription object', function() { SubscriptionOverride = function() {}; var subscription = pubsub.subscription(SUB_NAME, {}); assert(subscription instanceof SubscriptionOverride); }); + it('should pass specified name to the Subscription', function(done) { + SubscriptionOverride = function(pubsub, options) { + assert.equal(options.name, SUB_NAME); + done(); + }; + pubsub.subscription(SUB_NAME, {}); + }); + it('should honor settings', function(done) { SubscriptionOverride = function(pubsub, options) { assert.deepEqual(options, CONFIG); @@ -720,18 +723,38 @@ describe('PubSub', function() { pubsub.subscription(SUB_NAME, CONFIG); }); - it('should pass specified name to the Subscription', function(done) { + it('should not require a name', function(done) { SubscriptionOverride = function(pubsub, options) { - assert.equal(options.name, SUB_NAME); + assert.deepEqual(options, { + name: undefined + }); done(); }; - pubsub.subscription(SUB_NAME, {}); + + pubsub.subscription(); }); - it('should not require options', function() { - assert.doesNotThrow(function() { - pubsub.subscription(SUB_NAME); - }); + it('should not require a name and accept options', function(done) { + SubscriptionOverride = function(pubsub, options) { + var expectedOptions = extend({}, CONFIG); + expectedOptions.name = undefined; + + assert.deepEqual(options, expectedOptions); + done(); + }; + + pubsub.subscription(CONFIG); + }); + + it('should not require options', function(done) { + SubscriptionOverride = function(pubsub, options) { + assert.deepEqual(options, { + name: SUB_NAME + }); + done(); + }; + + pubsub.subscription(SUB_NAME); }); }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 81fcc475dcc..8498099f47a 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -106,13 +106,60 @@ describe('Subscription', function() { assert(promisified); }); - it('should format name', function(done) { - var formatName_ = Subscription.formatName_; - Subscription.formatName_ = function() { + describe('name', function() { + var FORMATTED_NAME = 'formatted-name'; + var GENERATED_NAME = 'generated-name'; + + var formatName_; + var generateName_; + + before(function() { + formatName_ = Subscription.formatName_; + generateName_ = Subscription.generateName_; + + Subscription.formatName_ = function() { + return FORMATTED_NAME; + }; + + Subscription.generateName_ = function() { + return GENERATED_NAME; + }; + }); + + afterEach(function() { + Subscription.formatName_ = function() { + return FORMATTED_NAME; + }; + + Subscription.generateName_ = function() { + return GENERATED_NAME; + }; + }); + + after(function() { Subscription.formatName_ = formatName_; - done(); - }; - new Subscription(PUBSUB, { name: SUB_NAME }); + Subscription.generateName_ = generateName_; + }); + + it('should generate name', function(done) { + Subscription.formatName_ = function(projectId, name) { + assert.strictEqual(name, GENERATED_NAME); + done(); + }; + + new Subscription(PUBSUB, {}); + }); + + it('should format name', function() { + Subscription.formatName_ = function(projectId, name) { + assert.strictEqual(projectId, PROJECT_ID); + assert.strictEqual(name, SUB_NAME); + return FORMATTED_NAME; + }; + + var subscription = new Subscription(PUBSUB, { name: SUB_NAME }); + assert.strictEqual(subscription.name, FORMATTED_NAME); + }); }); it('should honor configuration settings', function() { From 8f950ff43bca5bd299eb60c71df11654739a787d Mon Sep 17 00:00:00 2001 From: Jun Mukai Date: Mon, 28 Nov 2016 13:12:44 -0800 Subject: [PATCH 0033/1115] Regenerate pubsub API client. (#1832) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/v1/index.js | 12 +- .../{publisher_api.js => publisher_client.js} | 387 ++++++++++++------ ...subscriber_api.js => subscriber_client.js} | 305 +++++++++----- 4 files changed, 478 insertions(+), 228 deletions(-) rename handwritten/pubsub/src/v1/{publisher_api.js => publisher_client.js} (60%) rename handwritten/pubsub/src/v1/{subscriber_api.js => subscriber_client.js} (72%) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ff44918d4ed..1976e8b7b64 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,7 +53,7 @@ "@google-cloud/common": "^0.8.0", "arrify": "^1.0.0", "extend": "^3.0.0", - "google-gax": "^0.9.1", + "google-gax": "^0.10.0", "google-proto-files": "^0.8.0", "is": "^3.0.1", "modelo": "^4.2.0", diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js index 462855d97b5..32c431e9bc3 100644 --- a/handwritten/pubsub/src/v1/index.js +++ b/handwritten/pubsub/src/v1/index.js @@ -15,8 +15,8 @@ */ 'use strict'; -var publisherApi = require('./publisher_api'); -var subscriberApi = require('./subscriber_api'); +var publisherClient = require('./publisher_client'); +var subscriberClient = require('./subscriber_client'); var extend = require('extend'); var gax = require('google-gax'); @@ -26,11 +26,11 @@ function v1(options) { }, options); var gaxGrpc = gax.grpc(options); var result = {}; - extend(result, publisherApi(gaxGrpc)); - extend(result, subscriberApi(gaxGrpc)); + extend(result, publisherClient(gaxGrpc)); + extend(result, subscriberClient(gaxGrpc)); return result; } -v1.SERVICE_ADDRESS = publisherApi.SERVICE_ADDRESS; -v1.ALL_SCOPES = publisherApi.ALL_SCOPES; +v1.SERVICE_ADDRESS = publisherClient.SERVICE_ADDRESS; +v1.ALL_SCOPES = publisherClient.ALL_SCOPES; module.exports = v1; diff --git a/handwritten/pubsub/src/v1/publisher_api.js b/handwritten/pubsub/src/v1/publisher_client.js similarity index 60% rename from handwritten/pubsub/src/v1/publisher_api.js rename to handwritten/pubsub/src/v1/publisher_client.js index 0f81aadc141..66fcba2b9d7 100644 --- a/handwritten/pubsub/src/v1/publisher_api.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -37,7 +37,6 @@ var DEFAULT_SERVICE_PORT = 443; var CODE_GEN_NAME_VERSION = 'gapic/0.1.0'; - var PAGE_DESCRIPTORS = { listTopics: new gax.PageDescriptor( 'pageToken', @@ -64,17 +63,17 @@ var ALL_SCOPES = [ * * This will be created through a builder function which can be obtained by the module. * See the following example of how to initialize the module and how to access to the builder. - * @see {@link publisherApi} + * @see {@link publisherClient} * * @example * var pubsubV1 = require('@google-cloud/pubsub').v1({ * // optional auth parameters. * }); - * var api = pubsubV1.publisherApi(); + * var client = pubsubV1.publisherClient(); * * @class */ -function PublisherApi(gaxGrpc, grpcClients, opts) { +function PublisherClient(gaxGrpc, grpcClients, opts) { opts = opts || {}; var servicePath = opts.servicePath || SERVICE_ADDRESS; var port = opts.port || DEFAULT_SERVICE_PORT; @@ -89,7 +88,6 @@ function PublisherApi(gaxGrpc, grpcClients, opts) { 'gax/' + gax.version, 'nodejs/' + process.version].join(' '); - var bundleDescriptors = { publish: new gax.BundleDescriptor( 'messages', @@ -99,12 +97,11 @@ function PublisherApi(gaxGrpc, grpcClients, opts) { 'messageIds', gax.createByteLengthFunction(grpcClients.publisherClient.google.pubsub.v1.PubsubMessage)) }; + var defaults = gaxGrpc.constructSettings( 'google.pubsub.v1.Publisher', configData, clientConfig, - PAGE_DESCRIPTORS, - bundleDescriptors, {'x-goog-api-client': googleApiClient}); var iamPolicyStub = gaxGrpc.createStub( @@ -122,7 +119,8 @@ function PublisherApi(gaxGrpc, grpcClients, opts) { iamPolicyStub.then(function(iamPolicyStub) { return iamPolicyStub[methodName].bind(iamPolicyStub); }), - defaults[methodName]); + defaults[methodName], + PAGE_DESCRIPTORS[methodName] || bundleDescriptors[methodName]); }.bind(this)); var publisherStub = gaxGrpc.createStub( @@ -143,7 +141,8 @@ function PublisherApi(gaxGrpc, grpcClients, opts) { publisherStub.then(function(publisherStub) { return publisherStub[methodName].bind(publisherStub); }), - defaults[methodName]); + defaults[methodName], + PAGE_DESCRIPTORS[methodName] || bundleDescriptors[methodName]); }.bind(this)); } @@ -160,7 +159,7 @@ var TOPIC_PATH_TEMPLATE = new gax.PathTemplate( * @param {String} project * @returns {String} */ -PublisherApi.prototype.projectPath = function(project) { +PublisherClient.prototype.projectPath = function(project) { return PROJECT_PATH_TEMPLATE.render({ project: project }); @@ -172,7 +171,7 @@ PublisherApi.prototype.projectPath = function(project) { * A fully-qualified path representing a project resources. * @returns {String} - A string representing the project. */ -PublisherApi.prototype.matchProjectFromProjectName = function(projectName) { +PublisherClient.prototype.matchProjectFromProjectName = function(projectName) { return PROJECT_PATH_TEMPLATE.match(projectName).project; }; @@ -182,7 +181,7 @@ PublisherApi.prototype.matchProjectFromProjectName = function(projectName) { * @param {String} topic * @returns {String} */ -PublisherApi.prototype.topicPath = function(project, topic) { +PublisherClient.prototype.topicPath = function(project, topic) { return TOPIC_PATH_TEMPLATE.render({ project: project, topic: topic @@ -195,7 +194,7 @@ PublisherApi.prototype.topicPath = function(project, topic) { * A fully-qualified path representing a topic resources. * @returns {String} - A string representing the project. */ -PublisherApi.prototype.matchProjectFromTopicName = function(topicName) { +PublisherClient.prototype.matchProjectFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).project; }; @@ -205,7 +204,7 @@ PublisherApi.prototype.matchProjectFromTopicName = function(topicName) { * A fully-qualified path representing a topic resources. * @returns {String} - A string representing the topic. */ -PublisherApi.prototype.matchTopicFromTopicName = function(topicName) { +PublisherClient.prototype.matchTopicFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).topic; }; @@ -229,21 +228,23 @@ PublisherApi.prototype.matchTopicFromTopicName = function(topicName) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Topic]{@link Topic} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [Topic]{@link Topic}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link Topic}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedName = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.createTopic({name: formattedName}).then(function(response) { + * var client = pubsubV1.publisherClient(); + * var formattedName = client.topicPath("[PROJECT]", "[TOPIC]"); + * client.createTopic({name: formattedName}).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -PublisherApi.prototype.createTopic = function(request, options, callback) { +PublisherClient.prototype.createTopic = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -251,6 +252,7 @@ PublisherApi.prototype.createTopic = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._createTopic(request, options, callback); }; @@ -273,14 +275,15 @@ PublisherApi.prototype.createTopic = function(request, options, callback) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [PublishResponse]{@link PublishResponse} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [PublishResponse]{@link PublishResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [PublishResponse]{@link PublishResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * var client = pubsubV1.publisherClient(); + * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); * var data = ''; * var messagesElement = { * data : data @@ -290,13 +293,14 @@ PublisherApi.prototype.createTopic = function(request, options, callback) { * topic: formattedTopic, * messages: messages * }; - * api.publish(request).then(function(response) { + * client.publish(request).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -PublisherApi.prototype.publish = function(request, options, callback) { +PublisherClient.prototype.publish = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -304,6 +308,7 @@ PublisherApi.prototype.publish = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._publish(request, options, callback); }; @@ -320,21 +325,23 @@ PublisherApi.prototype.publish = function(request, options, callback) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Topic]{@link Topic} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [Topic]{@link Topic}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link Topic}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.getTopic({topic: formattedTopic}).then(function(response) { + * var client = pubsubV1.publisherClient(); + * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); + * client.getTopic({topic: formattedTopic}).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -PublisherApi.prototype.getTopic = function(request, options, callback) { +PublisherClient.prototype.getTopic = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -342,6 +349,7 @@ PublisherApi.prototype.getTopic = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._getTopic(request, options, callback); }; @@ -361,42 +369,64 @@ PublisherApi.prototype.getTopic = function(request, options, callback) { * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object, ?string)=} callback - * When specified, the results are not streamed but this callback - * will be called with the response object representing [ListTopicsResponse]{@link ListTopicsResponse}. - * The third item will be set if the response contains the token for the further results - * and can be reused to `pageToken` field in the options in the next request. - * @returns {Stream|Promise} - * An object stream which emits an object representing - * [Topic]{@link Topic} on 'data' event. - * When the callback is specified or streaming is suppressed through options, - * it will return a promise that resolves to the response object. The promise - * has a method named "cancel" which cancels the ongoing API call. + * @param {function(?Error, ?Array, ?Object, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is Array of [Topic]{@link Topic}. + * + * When autoPaginate: false is specified through options, it contains the result + * in a single response. If the response indicates the next page exists, the third + * parameter is set to be used for the next request object. The fourth parameter keeps + * the raw response object of an object representing [ListTopicsResponse]{@link ListTopicsResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Topic]{@link Topic}. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Topic]{@link Topic} in a single response. + * The second element is the next request object if the response + * indicates the next page exists, or null. The third element is + * an object representing [ListTopicsResponse]{@link ListTopicsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedProject = api.projectPath("[PROJECT]"); + * var client = pubsubV1.publisherClient(); + * var formattedProject = client.projectPath("[PROJECT]"); * // Iterate over all elements. - * api.listTopics({project: formattedProject}).on('data', function(element) { - * // doThingsWith(element) + * client.listTopics({project: formattedProject}).then(function(responses) { + * var resources = responses[0]; + * for (var i = 0; i < resources.length; ++i) { + * // doThingsWith(resources[i]) + * } + * }).catch(function(err) { + * console.error(err); * }); * - * // Or obtain the paged response through the callback. - * function callback(err, response, nextPageToken) { - * if (err) { - * console.error(err); - * return; + * // Or obtain the paged response. + * var options = {autoPaginate: false}; + * function callback(responses) { + * // The actual resources in a response. + * var resources = responses[0]; + * // The next request if the response shows there's more responses. + * var nextRequest = responses[1]; + * // The actual response object, if necessary. + * // var rawResponse = responses[2]; + * for (var i = 0; i < resources.length; ++i) { + * // doThingsWith(resources[i]); * } - * // doThingsWith(response) - * if (nextPageToken) { - * // fetch the next page. - * api.listTopics({project: formattedProject}, {pageToken: nextPageToken}, callback); + * if (nextRequest) { + * // Fetch the next page. + * return client.listTopics(nextRequest, options).then(callback); * } * } - * api.listTopics({project: formattedProject}, {flattenPages: false}, callback); + * client.listTopics({project: formattedProject}, options) + * .then(callback) + * .catch(function(err) { + * console.error(err); + * }); */ -PublisherApi.prototype.listTopics = function(request, options, callback) { +PublisherClient.prototype.listTopics = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -404,9 +434,57 @@ PublisherApi.prototype.listTopics = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._listTopics(request, options, callback); }; +/** + * Equivalent to {@link listTopics}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopics} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that topics belong to. + * @param {number=} request.pageSize + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @return {Stream} + * An object stream which emits an object representing [Topic]{@link Topic} on 'data' event. + * + * @example + * + * var client = pubsubV1.publisherClient(); + * var formattedProject = client.projectPath("[PROJECT]"); + * client.listTopicsStream({project: formattedProject}).on('data', function(element) { + * // doThingsWith(element) + * }).on('error', function(err) { + * console.error(err); + * }); + */ +PublisherClient.prototype.listTopicsStream = function(request, options) { + if (options === undefined) { + options = {}; + } + + return PAGE_DESCRIPTORS.listTopics.createStream(this._listTopics, request, options); +}; + /** * Lists the name of the subscriptions for this topic. * @@ -423,41 +501,64 @@ PublisherApi.prototype.listTopics = function(request, options, callback) { * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object, ?string)=} callback - * When specified, the results are not streamed but this callback - * will be called with the response object representing [ListTopicSubscriptionsResponse]{@link ListTopicSubscriptionsResponse}. - * The third item will be set if the response contains the token for the further results - * and can be reused to `pageToken` field in the options in the next request. - * @returns {Stream|Promise} - * An object stream which emits a string on 'data' event. - * When the callback is specified or streaming is suppressed through options, - * it will return a promise that resolves to the response object. The promise - * has a method named "cancel" which cancels the ongoing API call. + * @param {function(?Error, ?Array, ?Object, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is Array of string. + * + * When autoPaginate: false is specified through options, it contains the result + * in a single response. If the response indicates the next page exists, the third + * parameter is set to be used for the next request object. The fourth parameter keeps + * the raw response object of an object representing [ListTopicSubscriptionsResponse]{@link ListTopicSubscriptionsResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is Array of string. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of string in a single response. + * The second element is the next request object if the response + * indicates the next page exists, or null. The third element is + * an object representing [ListTopicSubscriptionsResponse]{@link ListTopicSubscriptionsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * var client = pubsubV1.publisherClient(); + * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); * // Iterate over all elements. - * api.listTopicSubscriptions({topic: formattedTopic}).on('data', function(element) { - * // doThingsWith(element) + * client.listTopicSubscriptions({topic: formattedTopic}).then(function(responses) { + * var resources = responses[0]; + * for (var i = 0; i < resources.length; ++i) { + * // doThingsWith(resources[i]) + * } + * }).catch(function(err) { + * console.error(err); * }); * - * // Or obtain the paged response through the callback. - * function callback(err, response, nextPageToken) { - * if (err) { - * console.error(err); - * return; + * // Or obtain the paged response. + * var options = {autoPaginate: false}; + * function callback(responses) { + * // The actual resources in a response. + * var resources = responses[0]; + * // The next request if the response shows there's more responses. + * var nextRequest = responses[1]; + * // The actual response object, if necessary. + * // var rawResponse = responses[2]; + * for (var i = 0; i < resources.length; ++i) { + * // doThingsWith(resources[i]); * } - * // doThingsWith(response) - * if (nextPageToken) { - * // fetch the next page. - * api.listTopicSubscriptions({topic: formattedTopic}, {pageToken: nextPageToken}, callback); + * if (nextRequest) { + * // Fetch the next page. + * return client.listTopicSubscriptions(nextRequest, options).then(callback); * } * } - * api.listTopicSubscriptions({topic: formattedTopic}, {flattenPages: false}, callback); + * client.listTopicSubscriptions({topic: formattedTopic}, options) + * .then(callback) + * .catch(function(err) { + * console.error(err); + * }); */ -PublisherApi.prototype.listTopicSubscriptions = function(request, options, callback) { +PublisherClient.prototype.listTopicSubscriptions = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -465,9 +566,57 @@ PublisherApi.prototype.listTopicSubscriptions = function(request, options, callb if (options === undefined) { options = {}; } + return this._listTopicSubscriptions(request, options, callback); }; +/** + * Equivalent to {@link listTopicSubscriptions}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopicSubscriptions} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * The name of the topic that subscriptions are attached to. + * @param {number=} request.pageSize + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @return {Stream} + * An object stream which emits a string on 'data' event. + * + * @example + * + * var client = pubsubV1.publisherClient(); + * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); + * client.listTopicSubscriptionsStream({topic: formattedTopic}).on('data', function(element) { + * // doThingsWith(element) + * }).on('error', function(err) { + * console.error(err); + * }); + */ +PublisherClient.prototype.listTopicSubscriptionsStream = function(request, options) { + if (options === undefined) { + options = {}; + } + + return PAGE_DESCRIPTORS.listTopicSubscriptions.createStream(this._listTopicSubscriptions, request, options); +}; + /** * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic * does not exist. After a topic is deleted, a new topic may be created with @@ -484,18 +633,18 @@ PublisherApi.prototype.listTopicSubscriptions = function(request, options, callb * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves to the response object. + * @return {Promise} - The promise which resolves when API call finishes. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.deleteTopic({topic: formattedTopic}).catch(function(err) { + * var client = pubsubV1.publisherClient(); + * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); + * client.deleteTopic({topic: formattedTopic}).catch(function(err) { * console.error(err); * }); */ -PublisherApi.prototype.deleteTopic = function(request, options, callback) { +PublisherClient.prototype.deleteTopic = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -503,6 +652,7 @@ PublisherApi.prototype.deleteTopic = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._deleteTopic(request, options, callback); }; @@ -529,26 +679,28 @@ PublisherApi.prototype.deleteTopic = function(request, options, callback) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Policy]{@link Policy} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [Policy]{@link Policy}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link Policy}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); + * var client = pubsubV1.publisherClient(); + * var formattedResource = client.topicPath("[PROJECT]", "[TOPIC]"); * var policy = {}; * var request = { * resource: formattedResource, * policy: policy * }; - * api.setIamPolicy(request).then(function(response) { + * client.setIamPolicy(request).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -PublisherApi.prototype.setIamPolicy = function(request, options, callback) { +PublisherClient.prototype.setIamPolicy = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -556,6 +708,7 @@ PublisherApi.prototype.setIamPolicy = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._setIamPolicy(request, options, callback); }; @@ -576,21 +729,23 @@ PublisherApi.prototype.setIamPolicy = function(request, options, callback) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Policy]{@link Policy} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [Policy]{@link Policy}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link Policy}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); - * api.getIamPolicy({resource: formattedResource}).then(function(response) { + * var client = pubsubV1.publisherClient(); + * var formattedResource = client.topicPath("[PROJECT]", "[TOPIC]"); + * client.getIamPolicy({resource: formattedResource}).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -PublisherApi.prototype.getIamPolicy = function(request, options, callback) { +PublisherClient.prototype.getIamPolicy = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -598,6 +753,7 @@ PublisherApi.prototype.getIamPolicy = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._getIamPolicy(request, options, callback); }; @@ -621,26 +777,28 @@ PublisherApi.prototype.getIamPolicy = function(request, options, callback) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.publisherApi(); - * var formattedResource = api.topicPath("[PROJECT]", "[TOPIC]"); + * var client = pubsubV1.publisherClient(); + * var formattedResource = client.topicPath("[PROJECT]", "[TOPIC]"); * var permissions = []; * var request = { * resource: formattedResource, * permissions: permissions * }; - * api.testIamPermissions(request).then(function(response) { + * client.testIamPermissions(request).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -PublisherApi.prototype.testIamPermissions = function(request, options, callback) { +PublisherClient.prototype.testIamPermissions = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -648,12 +806,13 @@ PublisherApi.prototype.testIamPermissions = function(request, options, callback) if (options === undefined) { options = {}; } + return this._testIamPermissions(request, options, callback); }; -function PublisherApiBuilder(gaxGrpc) { - if (!(this instanceof PublisherApiBuilder)) { - return new PublisherApiBuilder(gaxGrpc); +function PublisherClientBuilder(gaxGrpc) { + if (!(this instanceof PublisherClientBuilder)) { + return new PublisherClientBuilder(gaxGrpc); } var iamPolicyClient = gaxGrpc.load([{ @@ -674,7 +833,7 @@ function PublisherApiBuilder(gaxGrpc) { }; /** - * Build a new instance of {@link PublisherApi}. + * Build a new instance of {@link PublisherClient}. * * @param {Object=} opts - The optional parameters. * @param {String=} opts.servicePath @@ -691,11 +850,11 @@ function PublisherApiBuilder(gaxGrpc) { * @param {String=} opts.appVersion * The version of the calling service. */ - this.publisherApi = function(opts) { - return new PublisherApi(gaxGrpc, grpcClients, opts); + this.publisherClient = function(opts) { + return new PublisherClient(gaxGrpc, grpcClients, opts); }; - extend(this.publisherApi, PublisherApi); + extend(this.publisherClient, PublisherClient); } -module.exports = PublisherApiBuilder; +module.exports = PublisherClientBuilder; module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS; module.exports.ALL_SCOPES = ALL_SCOPES; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/subscriber_api.js b/handwritten/pubsub/src/v1/subscriber_client.js similarity index 72% rename from handwritten/pubsub/src/v1/subscriber_api.js rename to handwritten/pubsub/src/v1/subscriber_client.js index de173d3b614..064e34a33b8 100644 --- a/handwritten/pubsub/src/v1/subscriber_api.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -37,7 +37,6 @@ var DEFAULT_SERVICE_PORT = 443; var CODE_GEN_NAME_VERSION = 'gapic/0.1.0'; - var PAGE_DESCRIPTORS = { listSubscriptions: new gax.PageDescriptor( 'pageToken', @@ -60,17 +59,17 @@ var ALL_SCOPES = [ * * This will be created through a builder function which can be obtained by the module. * See the following example of how to initialize the module and how to access to the builder. - * @see {@link subscriberApi} + * @see {@link subscriberClient} * * @example * var pubsubV1 = require('@google-cloud/pubsub').v1({ * // optional auth parameters. * }); - * var api = pubsubV1.subscriberApi(); + * var client = pubsubV1.subscriberClient(); * * @class */ -function SubscriberApi(gaxGrpc, grpcClients, opts) { +function SubscriberClient(gaxGrpc, grpcClients, opts) { opts = opts || {}; var servicePath = opts.servicePath || SERVICE_ADDRESS; var port = opts.port || DEFAULT_SERVICE_PORT; @@ -89,8 +88,6 @@ function SubscriberApi(gaxGrpc, grpcClients, opts) { 'google.pubsub.v1.Subscriber', configData, clientConfig, - PAGE_DESCRIPTORS, - null, {'x-goog-api-client': googleApiClient}); var iamPolicyStub = gaxGrpc.createStub( @@ -108,7 +105,8 @@ function SubscriberApi(gaxGrpc, grpcClients, opts) { iamPolicyStub.then(function(iamPolicyStub) { return iamPolicyStub[methodName].bind(iamPolicyStub); }), - defaults[methodName]); + defaults[methodName], + PAGE_DESCRIPTORS[methodName]); }.bind(this)); var subscriberStub = gaxGrpc.createStub( @@ -131,7 +129,8 @@ function SubscriberApi(gaxGrpc, grpcClients, opts) { subscriberStub.then(function(subscriberStub) { return subscriberStub[methodName].bind(subscriberStub); }), - defaults[methodName]); + defaults[methodName], + PAGE_DESCRIPTORS[methodName]); }.bind(this)); } @@ -151,7 +150,7 @@ var TOPIC_PATH_TEMPLATE = new gax.PathTemplate( * @param {String} project * @returns {String} */ -SubscriberApi.prototype.projectPath = function(project) { +SubscriberClient.prototype.projectPath = function(project) { return PROJECT_PATH_TEMPLATE.render({ project: project }); @@ -163,7 +162,7 @@ SubscriberApi.prototype.projectPath = function(project) { * A fully-qualified path representing a project resources. * @returns {String} - A string representing the project. */ -SubscriberApi.prototype.matchProjectFromProjectName = function(projectName) { +SubscriberClient.prototype.matchProjectFromProjectName = function(projectName) { return PROJECT_PATH_TEMPLATE.match(projectName).project; }; @@ -173,7 +172,7 @@ SubscriberApi.prototype.matchProjectFromProjectName = function(projectName) { * @param {String} subscription * @returns {String} */ -SubscriberApi.prototype.subscriptionPath = function(project, subscription) { +SubscriberClient.prototype.subscriptionPath = function(project, subscription) { return SUBSCRIPTION_PATH_TEMPLATE.render({ project: project, subscription: subscription @@ -186,7 +185,7 @@ SubscriberApi.prototype.subscriptionPath = function(project, subscription) { * A fully-qualified path representing a subscription resources. * @returns {String} - A string representing the project. */ -SubscriberApi.prototype.matchProjectFromSubscriptionName = function(subscriptionName) { +SubscriberClient.prototype.matchProjectFromSubscriptionName = function(subscriptionName) { return SUBSCRIPTION_PATH_TEMPLATE.match(subscriptionName).project; }; @@ -196,7 +195,7 @@ SubscriberApi.prototype.matchProjectFromSubscriptionName = function(subscription * A fully-qualified path representing a subscription resources. * @returns {String} - A string representing the subscription. */ -SubscriberApi.prototype.matchSubscriptionFromSubscriptionName = function(subscriptionName) { +SubscriberClient.prototype.matchSubscriptionFromSubscriptionName = function(subscriptionName) { return SUBSCRIPTION_PATH_TEMPLATE.match(subscriptionName).subscription; }; @@ -206,7 +205,7 @@ SubscriberApi.prototype.matchSubscriptionFromSubscriptionName = function(subscri * @param {String} topic * @returns {String} */ -SubscriberApi.prototype.topicPath = function(project, topic) { +SubscriberClient.prototype.topicPath = function(project, topic) { return TOPIC_PATH_TEMPLATE.render({ project: project, topic: topic @@ -219,7 +218,7 @@ SubscriberApi.prototype.topicPath = function(project, topic) { * A fully-qualified path representing a topic resources. * @returns {String} - A string representing the project. */ -SubscriberApi.prototype.matchProjectFromTopicName = function(topicName) { +SubscriberClient.prototype.matchProjectFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).project; }; @@ -229,7 +228,7 @@ SubscriberApi.prototype.matchProjectFromTopicName = function(topicName) { * A fully-qualified path representing a topic resources. * @returns {String} - A string representing the topic. */ -SubscriberApi.prototype.matchTopicFromTopicName = function(topicName) { +SubscriberClient.prototype.matchTopicFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).topic; }; @@ -289,26 +288,28 @@ SubscriberApi.prototype.matchTopicFromTopicName = function(topicName) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Subscription]{@link Subscription} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [Subscription]{@link Subscription}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link Subscription}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedName = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var formattedTopic = api.topicPath("[PROJECT]", "[TOPIC]"); + * var client = pubsubV1.subscriberClient(); + * var formattedName = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); * var request = { * name: formattedName, * topic: formattedTopic * }; - * api.createSubscription(request).then(function(response) { + * client.createSubscription(request).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.createSubscription = function(request, options, callback) { +SubscriberClient.prototype.createSubscription = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -316,6 +317,7 @@ SubscriberApi.prototype.createSubscription = function(request, options, callback if (options === undefined) { options = {}; } + return this._createSubscription(request, options, callback); }; @@ -332,21 +334,23 @@ SubscriberApi.prototype.createSubscription = function(request, options, callback * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Subscription]{@link Subscription} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [Subscription]{@link Subscription}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link Subscription}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * api.getSubscription({subscription: formattedSubscription}).then(function(response) { + * var client = pubsubV1.subscriberClient(); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * client.getSubscription({subscription: formattedSubscription}).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.getSubscription = function(request, options, callback) { +SubscriberClient.prototype.getSubscription = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -354,6 +358,7 @@ SubscriberApi.prototype.getSubscription = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._getSubscription(request, options, callback); }; @@ -373,42 +378,64 @@ SubscriberApi.prototype.getSubscription = function(request, options, callback) { * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object, ?string)=} callback - * When specified, the results are not streamed but this callback - * will be called with the response object representing [ListSubscriptionsResponse]{@link ListSubscriptionsResponse}. - * The third item will be set if the response contains the token for the further results - * and can be reused to `pageToken` field in the options in the next request. - * @returns {Stream|Promise} - * An object stream which emits an object representing - * [Subscription]{@link Subscription} on 'data' event. - * When the callback is specified or streaming is suppressed through options, - * it will return a promise that resolves to the response object. The promise - * has a method named "cancel" which cancels the ongoing API call. + * @param {function(?Error, ?Array, ?Object, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is Array of [Subscription]{@link Subscription}. + * + * When autoPaginate: false is specified through options, it contains the result + * in a single response. If the response indicates the next page exists, the third + * parameter is set to be used for the next request object. The fourth parameter keeps + * the raw response object of an object representing [ListSubscriptionsResponse]{@link ListSubscriptionsResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Subscription]{@link Subscription}. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Subscription]{@link Subscription} in a single response. + * The second element is the next request object if the response + * indicates the next page exists, or null. The third element is + * an object representing [ListSubscriptionsResponse]{@link ListSubscriptionsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedProject = api.projectPath("[PROJECT]"); + * var client = pubsubV1.subscriberClient(); + * var formattedProject = client.projectPath("[PROJECT]"); * // Iterate over all elements. - * api.listSubscriptions({project: formattedProject}).on('data', function(element) { - * // doThingsWith(element) + * client.listSubscriptions({project: formattedProject}).then(function(responses) { + * var resources = responses[0]; + * for (var i = 0; i < resources.length; ++i) { + * // doThingsWith(resources[i]) + * } + * }).catch(function(err) { + * console.error(err); * }); * - * // Or obtain the paged response through the callback. - * function callback(err, response, nextPageToken) { - * if (err) { - * console.error(err); - * return; + * // Or obtain the paged response. + * var options = {autoPaginate: false}; + * function callback(responses) { + * // The actual resources in a response. + * var resources = responses[0]; + * // The next request if the response shows there's more responses. + * var nextRequest = responses[1]; + * // The actual response object, if necessary. + * // var rawResponse = responses[2]; + * for (var i = 0; i < resources.length; ++i) { + * // doThingsWith(resources[i]); * } - * // doThingsWith(response) - * if (nextPageToken) { - * // fetch the next page. - * api.listSubscriptions({project: formattedProject}, {pageToken: nextPageToken}, callback); + * if (nextRequest) { + * // Fetch the next page. + * return client.listSubscriptions(nextRequest, options).then(callback); * } * } - * api.listSubscriptions({project: formattedProject}, {flattenPages: false}, callback); + * client.listSubscriptions({project: formattedProject}, options) + * .then(callback) + * .catch(function(err) { + * console.error(err); + * }); */ -SubscriberApi.prototype.listSubscriptions = function(request, options, callback) { +SubscriberClient.prototype.listSubscriptions = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -416,9 +443,57 @@ SubscriberApi.prototype.listSubscriptions = function(request, options, callback) if (options === undefined) { options = {}; } + return this._listSubscriptions(request, options, callback); }; +/** + * Equivalent to {@link listSubscriptions}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listSubscriptions} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that subscriptions belong to. + * @param {number=} request.pageSize + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @return {Stream} + * An object stream which emits an object representing [Subscription]{@link Subscription} on 'data' event. + * + * @example + * + * var client = pubsubV1.subscriberClient(); + * var formattedProject = client.projectPath("[PROJECT]"); + * client.listSubscriptionsStream({project: formattedProject}).on('data', function(element) { + * // doThingsWith(element) + * }).on('error', function(err) { + * console.error(err); + * }); + */ +SubscriberClient.prototype.listSubscriptionsStream = function(request, options) { + if (options === undefined) { + options = {}; + } + + return PAGE_DESCRIPTORS.listSubscriptions.createStream(this._listSubscriptions, request, options); +}; + /** * Deletes an existing subscription. All pending messages in the subscription * are immediately dropped. Calls to `Pull` after deletion will return @@ -435,18 +510,18 @@ SubscriberApi.prototype.listSubscriptions = function(request, options, callback) * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves to the response object. + * @return {Promise} - The promise which resolves when API call finishes. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * api.deleteSubscription({subscription: formattedSubscription}).catch(function(err) { + * var client = pubsubV1.subscriberClient(); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * client.deleteSubscription({subscription: formattedSubscription}).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.deleteSubscription = function(request, options, callback) { +SubscriberClient.prototype.deleteSubscription = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -454,6 +529,7 @@ SubscriberApi.prototype.deleteSubscription = function(request, options, callback if (options === undefined) { options = {}; } + return this._deleteSubscription(request, options, callback); }; @@ -481,13 +557,13 @@ SubscriberApi.prototype.deleteSubscription = function(request, options, callback * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves to the response object. + * @return {Promise} - The promise which resolves when API call finishes. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var client = pubsubV1.subscriberClient(); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var ackIds = []; * var ackDeadlineSeconds = 0; * var request = { @@ -495,11 +571,11 @@ SubscriberApi.prototype.deleteSubscription = function(request, options, callback * ackIds: ackIds, * ackDeadlineSeconds: ackDeadlineSeconds * }; - * api.modifyAckDeadline(request).catch(function(err) { + * client.modifyAckDeadline(request).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.modifyAckDeadline = function(request, options, callback) { +SubscriberClient.prototype.modifyAckDeadline = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -507,6 +583,7 @@ SubscriberApi.prototype.modifyAckDeadline = function(request, options, callback) if (options === undefined) { options = {}; } + return this._modifyAckDeadline(request, options, callback); }; @@ -531,23 +608,23 @@ SubscriberApi.prototype.modifyAckDeadline = function(request, options, callback) * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves to the response object. + * @return {Promise} - The promise which resolves when API call finishes. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var client = pubsubV1.subscriberClient(); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var ackIds = []; * var request = { * subscription: formattedSubscription, * ackIds: ackIds * }; - * api.acknowledge(request).catch(function(err) { + * client.acknowledge(request).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.acknowledge = function(request, options, callback) { +SubscriberClient.prototype.acknowledge = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -555,6 +632,7 @@ SubscriberApi.prototype.acknowledge = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._acknowledge(request, options, callback); }; @@ -583,26 +661,28 @@ SubscriberApi.prototype.acknowledge = function(request, options, callback) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [PullResponse]{@link PullResponse} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [PullResponse]{@link PullResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [PullResponse]{@link PullResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var client = pubsubV1.subscriberClient(); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var maxMessages = 0; * var request = { * subscription: formattedSubscription, * maxMessages: maxMessages * }; - * api.pull(request).then(function(response) { + * client.pull(request).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.pull = function(request, options, callback) { +SubscriberClient.prototype.pull = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -610,6 +690,7 @@ SubscriberApi.prototype.pull = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._pull(request, options, callback); }; @@ -639,23 +720,23 @@ SubscriberApi.prototype.pull = function(request, options, callback) { * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. * @param {function(?Error)=} callback * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves to the response object. + * @return {Promise} - The promise which resolves when API call finishes. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedSubscription = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var client = pubsubV1.subscriberClient(); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var pushConfig = {}; * var request = { * subscription: formattedSubscription, * pushConfig: pushConfig * }; - * api.modifyPushConfig(request).catch(function(err) { + * client.modifyPushConfig(request).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.modifyPushConfig = function(request, options, callback) { +SubscriberClient.prototype.modifyPushConfig = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -663,6 +744,7 @@ SubscriberApi.prototype.modifyPushConfig = function(request, options, callback) if (options === undefined) { options = {}; } + return this._modifyPushConfig(request, options, callback); }; @@ -689,26 +771,28 @@ SubscriberApi.prototype.modifyPushConfig = function(request, options, callback) * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Policy]{@link Policy} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [Policy]{@link Policy}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link Policy}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var client = pubsubV1.subscriberClient(); + * var formattedResource = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var policy = {}; * var request = { * resource: formattedResource, * policy: policy * }; - * api.setIamPolicy(request).then(function(response) { + * client.setIamPolicy(request).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.setIamPolicy = function(request, options, callback) { +SubscriberClient.prototype.setIamPolicy = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -716,6 +800,7 @@ SubscriberApi.prototype.setIamPolicy = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._setIamPolicy(request, options, callback); }; @@ -736,21 +821,23 @@ SubscriberApi.prototype.setIamPolicy = function(request, options, callback) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Policy]{@link Policy} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [Policy]{@link Policy}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link Policy}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * api.getIamPolicy({resource: formattedResource}).then(function(response) { + * var client = pubsubV1.subscriberClient(); + * var formattedResource = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * client.getIamPolicy({resource: formattedResource}).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.getIamPolicy = function(request, options, callback) { +SubscriberClient.prototype.getIamPolicy = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -758,6 +845,7 @@ SubscriberApi.prototype.getIamPolicy = function(request, options, callback) { if (options === undefined) { options = {}; } + return this._getIamPolicy(request, options, callback); }; @@ -781,26 +869,28 @@ SubscriberApi.prototype.getIamPolicy = function(request, options, callback) { * @param {function(?Error, ?Object)=} callback * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse} - * @returns {Promise} - The promise which resolves to the response object. + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. * * @example * - * var api = pubsubV1.subscriberApi(); - * var formattedResource = api.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var client = pubsubV1.subscriberClient(); + * var formattedResource = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); * var permissions = []; * var request = { * resource: formattedResource, * permissions: permissions * }; - * api.testIamPermissions(request).then(function(response) { + * client.testIamPermissions(request).then(function(responses) { + * var response = responses[0]; * // doThingsWith(response) * }).catch(function(err) { * console.error(err); * }); */ -SubscriberApi.prototype.testIamPermissions = function(request, options, callback) { +SubscriberClient.prototype.testIamPermissions = function(request, options, callback) { if (options instanceof Function && callback === undefined) { callback = options; options = {}; @@ -808,12 +898,13 @@ SubscriberApi.prototype.testIamPermissions = function(request, options, callback if (options === undefined) { options = {}; } + return this._testIamPermissions(request, options, callback); }; -function SubscriberApiBuilder(gaxGrpc) { - if (!(this instanceof SubscriberApiBuilder)) { - return new SubscriberApiBuilder(gaxGrpc); +function SubscriberClientBuilder(gaxGrpc) { + if (!(this instanceof SubscriberClientBuilder)) { + return new SubscriberClientBuilder(gaxGrpc); } var iamPolicyClient = gaxGrpc.load([{ @@ -834,7 +925,7 @@ function SubscriberApiBuilder(gaxGrpc) { }; /** - * Build a new instance of {@link SubscriberApi}. + * Build a new instance of {@link SubscriberClient}. * * @param {Object=} opts - The optional parameters. * @param {String=} opts.servicePath @@ -851,11 +942,11 @@ function SubscriberApiBuilder(gaxGrpc) { * @param {String=} opts.appVersion * The version of the calling service. */ - this.subscriberApi = function(opts) { - return new SubscriberApi(gaxGrpc, grpcClients, opts); + this.subscriberClient = function(opts) { + return new SubscriberClient(gaxGrpc, grpcClients, opts); }; - extend(this.subscriberApi, SubscriberApi); + extend(this.subscriberClient, SubscriberClient); } -module.exports = SubscriberApiBuilder; +module.exports = SubscriberClientBuilder; module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS; module.exports.ALL_SCOPES = ALL_SCOPES; \ No newline at end of file From 83b8a2edbc897915f6b7be8446762e3a29dd3da6 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 29 Nov 2016 13:18:19 -0500 Subject: [PATCH 0034/1115] pubsub: return timestamp on message (#1843) --- handwritten/pubsub/src/index.js | 4 +++- handwritten/pubsub/src/subscription.js | 17 +++++++++++++++-- handwritten/pubsub/src/topic.js | 4 +++- handwritten/pubsub/test/subscription.js | 14 ++++++++++++-- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index ca4c916cca8..c51344c64e4 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -568,9 +568,11 @@ PubSub.prototype.subscribe = function(topic, subName, options, callback) { * // Register a listener for `message` events. * subscription.on('message', function(message) { * // Called every time a message is received. - * // message.id = ID used to acknowledge its receival. + * // message.id = ID of the message. + * // message.ackId = ID used to acknowledge the message receival. * // message.data = Contents of the message. * // message.attributes = Attributes of the message. + * // message.timestamp = Timestamp when Pub/Sub received the message. * }); */ PubSub.prototype.subscription = function(name, options) { diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 101570e7dda..4f03144f1a4 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -126,6 +126,8 @@ var PUBSUB_API_TIMEOUT = 90000; * // message.id = ID of the message. * // message.ackId = ID used to acknowledge the message receival. * // message.data = Contents of the message. + * // message.attributes = Attributes of the message. + * // message.timestamp = Timestamp when Pub/Sub received the message. * * // Ack the message: * // message.ack(callback); @@ -332,8 +334,9 @@ function Subscription(pubsub, options) { modelo.inherits(Subscription, common.GrpcServiceObject, events.EventEmitter); /** - * Simplify a message from an API response to have three properties, `id`, - * `data` and `attributes`. `data` is always converted to a string. + * Simplify a message from an API response to have five properties: `id`, + * `ackId`, `data`, `attributes`, and `timestamp`. `data` is always converted to + * a string. * * @private */ @@ -357,6 +360,16 @@ Subscription.formatMessage_ = function(msg, encoding) { if (innerMessage.attributes) { message.attributes = innerMessage.attributes; } + + if (innerMessage.publishTime) { + var publishTime = innerMessage.publishTime; + + if (publishTime.seconds && publishTime.nanos) { + var seconds = parseInt(publishTime.seconds, 10); + var milliseconds = parseInt(publishTime.nanos, 10) / 1e6; + message.timestamp = new Date(seconds * 1000 + milliseconds); + } + } } return message; diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 8a3b3e0f688..02183424070 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -552,9 +552,11 @@ Topic.prototype.subscribe = function(subName, options, callback) { * // Register a listener for `message` events. * subscription.on('message', function(message) { * // Called every time a message is received. - * // message.id = ID used to acknowledge its receival. + * // message.id = ID of the message. + * // message.ackId = ID used to acknowledge the message receival. * // message.data = Contents of the message. * // message.attributes = Attributes of the message. + * // message.timestamp = Timestamp when Pub/Sub received the message. * }); */ Topic.prototype.subscription = function(name, options) { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 8498099f47a..0dac75db1f6 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -273,13 +273,22 @@ describe('Subscription', function() { var obj = { hi: 'there' }; var stringified = new Buffer(JSON.stringify(obj)).toString('base64'); var attributes = {}; + var publishTime = { + seconds: '1480413405', + nanos: 617000000 + }; + + var seconds = parseInt(publishTime.seconds, 10); + var milliseconds = parseInt(publishTime.nanos, 10) / 1e6; + var expectedDate = new Date(seconds * 1000 + milliseconds); var msg = Subscription.formatMessage_({ ackId: 'abc', message: { data: stringified, messageId: 7, - attributes: attributes + attributes: attributes, + publishTime: publishTime } }); @@ -287,7 +296,8 @@ describe('Subscription', function() { ackId: 'abc', id: 7, data: obj, - attributes: attributes + attributes: attributes, + timestamp: expectedDate }); }); From a23e45fa4eb963e10840fdf00a32e73e79f377c9 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 5 Dec 2016 14:12:43 -0500 Subject: [PATCH 0035/1115] bump packages (#1856) --- handwritten/pubsub/package.json | 6 +++--- handwritten/pubsub/src/subscription.js | 2 +- handwritten/pubsub/system-test/pubsub.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1976e8b7b64..94d4a8d85f9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,11 +57,11 @@ "google-proto-files": "^0.8.0", "is": "^3.0.1", "modelo": "^4.2.0", - "node-uuid": "^1.4.3", - "propprop": "^0.3.0" + "propprop": "^0.3.0", + "uuid": "^3.0.1" }, "devDependencies": { - "async": "^1.5.2", + "async": "^2.1.4", "mocha": "^3.0.1", "proxyquire": "^1.7.10" }, diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 4f03144f1a4..a380a47fc7d 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -26,7 +26,7 @@ var events = require('events'); var is = require('is'); var modelo = require('modelo'); var prop = require('propprop'); -var uuid = require('node-uuid'); +var uuid = require('uuid'); /** * @type {module:pubsub/iam} diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 56b28f129c9..6bcaf82f227 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -19,7 +19,7 @@ var assert = require('assert'); var async = require('async'); var Subscription = require('../src/subscription.js'); -var uuid = require('node-uuid'); +var uuid = require('uuid'); var env = require('../../../system-test/env.js'); var pubsub = require('../')(env); From 3cdd5aa4bb92795557c366e201f17be20e909219 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Thu, 8 Dec 2016 18:34:53 -0500 Subject: [PATCH 0036/1115] prepare READMEs for beta release (#1864) --- handwritten/pubsub/README.md | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 877bb0846ae..11d79515f49 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -1,4 +1,4 @@ -# @google-cloud/pubsub +# @google-cloud/pubsub ([Alpha][versioning]) > Google Cloud Pub/Sub Client Library for Node.js *Looking for more Google APIs than just Pub/Sub? You might want to check out [`google-cloud`][google-cloud].* @@ -51,24 +51,18 @@ var pubsub = require('@google-cloud/pubsub')({ It's incredibly easy to get authenticated and start using Google's APIs. You can set your credentials on a global basis as well as on a per-API basis. See each individual API section below to see how you can auth on a per-API-basis. This is useful if you want to use different accounts for different Google Cloud services. -### On Google Compute Engine +### On Google Cloud Platform -If you are running this client on Google Compute Engine, we handle authentication for you with no configuration. You just need to make sure that when you [set up the GCE instance][gce-how-to], you add the correct scopes for the APIs you want to access. +If you are running this client on Google Cloud Platform, we handle authentication for you with no configuration. You just need to make sure that when you [set up the GCE instance][gce-how-to], you add the correct scopes for the APIs you want to access. ``` js -// Authenticating on a global basis. -var projectId = process.env.GCLOUD_PROJECT; // E.g. 'grape-spaceship-123' - -var pubsub = require('@google-cloud/pubsub')({ - projectId: projectId -}); - +var pubsub = require('@google-cloud/pubsub')(); // ...you're good to go! ``` ### Elsewhere -If you are not running this client on Google Compute Engine, you need a Google Developers service account. To create a service account: +If you are not running this client on Google Cloud Platform, you need a Google Developers service account. To create a service account: 1. Visit the [Google Developers Console][dev-console]. 2. Create a new project or click on an existing project. @@ -95,6 +89,7 @@ var pubsub = require('@google-cloud/pubsub')({ ``` +[versioning]: https://github.com/GoogleCloudPlatform/google-cloud-node#versioning [google-cloud]: https://github.com/GoogleCloudPlatform/google-cloud-node/ [gce-how-to]: https://cloud.google.com/compute/docs/authentication#using [dev-console]: https://console.developers.google.com/project From 2290fba1ca383bcfb94fe1b222490eda7e11a1a3 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Thu, 8 Dec 2016 19:43:39 -0500 Subject: [PATCH 0037/1115] all: update dependencies --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 94d4a8d85f9..80dcde8b4e8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.8.0", + "@google-cloud/common": "^0.9.0", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.10.0", From 2b468b15f20991145f198282bd66e87b43e4b376 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Thu, 8 Dec 2016 19:49:16 -0500 Subject: [PATCH 0038/1115] pubsub @ 0.7.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 80dcde8b4e8..90c6d91a294 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.6.0", + "version": "0.7.0", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 9ec9f11acdb951c23567b6a6c1605dc609f550a1 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 9 Jan 2017 20:44:57 -0500 Subject: [PATCH 0039/1115] update dependencies --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 90c6d91a294..ba3b2eb3ae6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.9.0", + "@google-cloud/common": "^0.11.0", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.10.0", From f811049febde7ae70274adb42a7aef002de15d67 Mon Sep 17 00:00:00 2001 From: Matthew Arbesfeld Date: Mon, 23 Jan 2017 09:38:19 -0500 Subject: [PATCH 0040/1115] Fix pub/sub with 0 nanos (#1931) --- handwritten/pubsub/src/subscription.js | 2 +- handwritten/pubsub/test/subscription.js | 32 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index a380a47fc7d..0fda9769605 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -364,7 +364,7 @@ Subscription.formatMessage_ = function(msg, encoding) { if (innerMessage.publishTime) { var publishTime = innerMessage.publishTime; - if (publishTime.seconds && publishTime.nanos) { + if (is.defined(publishTime.seconds) && is.defined(publishTime.nanos)) { var seconds = parseInt(publishTime.seconds, 10); var milliseconds = parseInt(publishTime.nanos, 10) / 1e6; message.timestamp = new Date(seconds * 1000 + milliseconds); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 0dac75db1f6..c1ef84d6096 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -301,6 +301,38 @@ describe('Subscription', function() { }); }); + it('should work if nanos is 0', function() { + var obj = { hi: 'there' }; + var stringified = new Buffer(JSON.stringify(obj)).toString('base64'); + var attributes = {}; + var publishTime = { + seconds: '1480413405', + nanos: 0 + }; + + var seconds = parseInt(publishTime.seconds, 10); + var milliseconds = parseInt(publishTime.nanos, 10) / 1e6; + var expectedDate = new Date(seconds * 1000 + milliseconds); + + var msg = Subscription.formatMessage_({ + ackId: 'abc', + message: { + data: stringified, + messageId: 7, + attributes: attributes, + publishTime: publishTime + } + }); + + assert.deepEqual(msg, { + ackId: 'abc', + id: 7, + data: obj, + attributes: attributes, + timestamp: expectedDate + }); + }); + it('should decode buffer to string', function() { var msg = Subscription.formatMessage_(messageObj.receivedMessages[0]); assert.deepEqual(msg, expectedMessage); From 4613bd7d37cdacb144725b428f7d94bc5ca14bb3 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 31 Jan 2017 14:45:38 -0500 Subject: [PATCH 0041/1115] pubsub: incorporate @google-cloud/common-grpc (#1950) --- handwritten/pubsub/package.json | 3 ++- handwritten/pubsub/src/iam.js | 5 +++-- handwritten/pubsub/src/index.js | 5 +++-- handwritten/pubsub/src/subscription.js | 5 +++-- handwritten/pubsub/src/topic.js | 5 +++-- handwritten/pubsub/test/iam.js | 6 ++++-- handwritten/pubsub/test/index.js | 4 +++- handwritten/pubsub/test/subscription.js | 6 ++++-- handwritten/pubsub/test/topic.js | 10 ++++++---- 9 files changed, 31 insertions(+), 18 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ba3b2eb3ae6..03cfdd9a573 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,8 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.11.0", + "@google-cloud/common": "^0.12.0", + "@google-cloud/common-grpc": "^0.1.1", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.10.0", diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 8192b4a8977..61c6980b789 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -22,6 +22,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var commonGrpc = require('@google-cloud/common-grpc'); var is = require('is'); var util = require('util'); @@ -79,10 +80,10 @@ function IAM(pubsub, id) { this.id = id; - common.GrpcService.call(this, config, pubsub.options); + commonGrpc.Service.call(this, config, pubsub.options); } -util.inherits(IAM, common.GrpcService); +util.inherits(IAM, commonGrpc.Service); /** * Get the IAM policy diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index c51344c64e4..c1d452313ef 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -22,6 +22,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var commonGrpc = require('@google-cloud/common-grpc'); var extend = require('extend'); var is = require('is'); var util = require('util'); @@ -76,10 +77,10 @@ function PubSub(options) { this.options = options; - common.GrpcService.call(this, config, options); + commonGrpc.Service.call(this, config, options); } -util.inherits(PubSub, common.GrpcService); +util.inherits(PubSub, commonGrpc.Service); /** * Create a topic with the given name. diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 0fda9769605..53b968f9019 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -22,6 +22,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var commonGrpc = require('@google-cloud/common-grpc'); var events = require('events'); var is = require('is'); var modelo = require('modelo'); @@ -270,7 +271,7 @@ function Subscription(pubsub, options) { config.methods.create = true; } - common.GrpcServiceObject.call(this, config); + commonGrpc.ServiceObject.call(this, config); events.EventEmitter.call(this); this.autoAck = is.boolean(options.autoAck) ? options.autoAck : false; @@ -331,7 +332,7 @@ function Subscription(pubsub, options) { this.listenForEvents_(); } -modelo.inherits(Subscription, common.GrpcServiceObject, events.EventEmitter); +modelo.inherits(Subscription, commonGrpc.ServiceObject, events.EventEmitter); /** * Simplify a message from an API response to have five properties: `id`, diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 02183424070..ffead1a73d5 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -22,6 +22,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); +var commonGrpc = require('@google-cloud/common-grpc'); var extend = require('extend'); var is = require('is'); var util = require('util'); @@ -180,7 +181,7 @@ function Topic(pubsub, name) { } }; - common.GrpcServiceObject.call(this, { + commonGrpc.ServiceObject.call(this, { parent: pubsub, id: this.name, createMethod: pubsub.createTopic.bind(pubsub), @@ -224,7 +225,7 @@ function Topic(pubsub, name) { this.iam = new IAM(pubsub, this.name); } -util.inherits(Topic, common.GrpcServiceObject); +util.inherits(Topic, commonGrpc.ServiceObject); /** * Format a message object as the upstream API expects it. diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index 21cfa8a3f1b..14151ef892d 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -18,7 +18,7 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcService = require('@google-cloud/common').GrpcService; +var GrpcService = require('@google-cloud/common-grpc').Service; var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -52,8 +52,10 @@ describe('IAM', function() { before(function() { IAM = proxyquire('../src/iam.js', { '@google-cloud/common': { - GrpcService: FakeGrpcService, util: fakeUtil + }, + '@google-cloud/common-grpc': { + Service: FakeGrpcService } }); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index df69e1d3cff..b6f822ebc28 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -77,10 +77,12 @@ describe('PubSub', function() { delete process.env.PUBSUB_EMULATOR_HOST; PubSub = proxyquire('../', { '@google-cloud/common': { - GrpcService: FakeGrpcService, paginator: fakePaginator, util: fakeUtil }, + '@google-cloud/common-grpc': { + Service: FakeGrpcService + }, './subscription.js': Subscription, './topic.js': Topic }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index c1ef84d6096..f28bb98c63a 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -18,7 +18,7 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; +var GrpcServiceObject = require('@google-cloud/common-grpc').ServiceObject; var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -81,9 +81,11 @@ describe('Subscription', function() { before(function() { Subscription = proxyquire('../src/subscription.js', { '@google-cloud/common': { - GrpcServiceObject: FakeGrpcServiceObject, util: fakeUtil }, + '@google-cloud/common-grpc': { + ServiceObject: FakeGrpcServiceObject + }, './iam.js': FakeIAM }); diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index c6f91d34182..2a06c2ec2e7 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -18,7 +18,7 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcServiceObject = require('@google-cloud/common').GrpcServiceObject; +var GrpcServiceObject = require('@google-cloud/common-grpc').ServiceObject; var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -60,11 +60,13 @@ describe('Topic', function() { before(function() { Topic = proxyquire('../src/topic.js', { - './iam.js': FakeIAM, '@google-cloud/common': { - GrpcServiceObject: FakeGrpcServiceObject, util: fakeUtil - } + }, + '@google-cloud/common-grpc': { + ServiceObject: FakeGrpcServiceObject + }, + './iam.js': FakeIAM }); }); From 4d700fafa1a8512e8d7b35442bccc25846ea5dfe Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 31 Jan 2017 16:01:24 -0500 Subject: [PATCH 0042/1115] pubsub @ 0.8.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 03cfdd9a573..d015e7f4833 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.7.0", + "version": "0.8.0", "author": "Google Inc.", "description": "Google Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 51069613635518962616a1fe4a038e5808e13d64 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 8 Feb 2017 15:01:44 -0500 Subject: [PATCH 0043/1115] common-grpc: return requests to allow abort() (#1973) --- handwritten/pubsub/src/subscription.js | 4 ++-- handwritten/pubsub/test/subscription.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 53b968f9019..e3e759d1d00 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -732,8 +732,8 @@ Subscription.prototype.listenForEvents_ = function() { if (event === 'message' && --self.messageListeners === 0) { self.closed = true; - if (self.activeRequest_ && self.activeRequest_.cancel) { - self.activeRequest_.cancel(); + if (self.activeRequest_ && self.activeRequest_.abort) { + self.activeRequest_.abort(); } } }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index f28bb98c63a..4f8002615bd 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -961,11 +961,11 @@ describe('Subscription', function() { assert.strictEqual(subscription.closed, true); }); - it('should cancel the HTTP request when listeners removed', function(done) { + it('should abort the HTTP request when listeners removed', function(done) { subscription.startPulling_ = util.noop; subscription.activeRequest_ = { - cancel: done + abort: done }; subscription.on('message', util.noop); From 741f99d8b391bc2cb38b27492b72c04425ec195a Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 14 Feb 2017 12:18:51 -0500 Subject: [PATCH 0044/1115] update deps --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d015e7f4833..eb7e7e56d41 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -55,7 +55,7 @@ "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.10.0", - "google-proto-files": "^0.8.0", + "google-proto-files": "^0.9.1", "is": "^3.0.1", "modelo": "^4.2.0", "propprop": "^0.3.0", From 4fe3146fbf1840cd890a6674699c574d5bec1254 Mon Sep 17 00:00:00 2001 From: Jun Mukai Date: Fri, 24 Feb 2017 08:22:38 -0800 Subject: [PATCH 0045/1115] Creates the new x-goog-api-client header. (#2020) This will send x-goog-api-client with the following format: gl-node/(node version) gccl/(library version) grpc/(grpc version) We will use this information for future tracking. The GAPIC autogen files will have a slightly different format, and that will be addressed later. This PR only changes the APIs using gRPC without the GAPIC. --- handwritten/pubsub/src/index.js | 4 ++++ handwritten/pubsub/test/index.js | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index c1d452313ef..9b1687f8719 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -60,6 +60,10 @@ function PubSub(options) { return new PubSub(options); } + options = extend({}, options, { + libVersion: require('../package.json').version + }); + this.defaultBaseUrl_ = 'pubsub.googleapis.com'; this.determineBaseUrl_(); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index b6f822ebc28..b69166e6e01 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -165,7 +165,10 @@ describe('PubSub', function() { }); it('should localize the options provided', function() { - assert.strictEqual(pubsub.options, OPTIONS); + var expected = extend({}, OPTIONS, { + libVersion: require('../package.json').version + }); + assert.deepStrictEqual(pubsub.options, expected); }); }); From 55a604d75da254008be9ea6de4276b9dd2d93d69 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 24 Feb 2017 11:23:48 -0500 Subject: [PATCH 0046/1115] Revert "Creates the new x-goog-api-client header." (#2024) --- handwritten/pubsub/src/index.js | 4 ---- handwritten/pubsub/test/index.js | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 9b1687f8719..c1d452313ef 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -60,10 +60,6 @@ function PubSub(options) { return new PubSub(options); } - options = extend({}, options, { - libVersion: require('../package.json').version - }); - this.defaultBaseUrl_ = 'pubsub.googleapis.com'; this.determineBaseUrl_(); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index b69166e6e01..b6f822ebc28 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -165,10 +165,7 @@ describe('PubSub', function() { }); it('should localize the options provided', function() { - var expected = extend({}, OPTIONS, { - libVersion: require('../package.json').version - }); - assert.deepStrictEqual(pubsub.options, expected); + assert.strictEqual(pubsub.options, OPTIONS); }); }); From 5780d8aef0d702decfcfe78ef10967abd3381a52 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 2 Mar 2017 20:27:44 -0500 Subject: [PATCH 0047/1115] docs: change Google Cloud to Cloud (#1995) --- handwritten/pubsub/README.md | 4 ++-- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/iam.js | 2 +- handwritten/pubsub/src/index.js | 6 +++--- handwritten/pubsub/src/subscription.js | 4 ++-- handwritten/pubsub/src/topic.js | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 11d79515f49..eae849cf6eb 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -1,5 +1,5 @@ # @google-cloud/pubsub ([Alpha][versioning]) -> Google Cloud Pub/Sub Client Library for Node.js +> Cloud Pub/Sub Client Library for Node.js *Looking for more Google APIs than just Pub/Sub? You might want to check out [`google-cloud`][google-cloud].* @@ -49,7 +49,7 @@ var pubsub = require('@google-cloud/pubsub')({ ## Authentication -It's incredibly easy to get authenticated and start using Google's APIs. You can set your credentials on a global basis as well as on a per-API basis. See each individual API section below to see how you can auth on a per-API-basis. This is useful if you want to use different accounts for different Google Cloud services. +It's incredibly easy to get authenticated and start using Google's APIs. You can set your credentials on a global basis as well as on a per-API basis. See each individual API section below to see how you can auth on a per-API-basis. This is useful if you want to use different accounts for different Cloud services. ### On Google Cloud Platform diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index eb7e7e56d41..1880777fe61 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -2,7 +2,7 @@ "name": "@google-cloud/pubsub", "version": "0.8.0", "author": "Google Inc.", - "description": "Google Cloud Pub/Sub Client Library for Node.js", + "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ { "name": "Burcu Dogan", diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 61c6980b789..8a8565e4150 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -49,7 +49,7 @@ var util = require('util'); * * *The IAM access control features described in this document are Beta, * including the API methods to get and set IAM policies, and to test IAM - * permissions. Google Cloud Pub/Sub's use of IAM features is not covered by any + * permissions. Cloud Pub/Sub's use of IAM features is not covered by any * SLA or deprecation policy, and may be subject to backward-incompatible * changes.* * diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index c1d452313ef..85db7e0e4f4 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -40,8 +40,8 @@ var Subscription = require('./subscription.js'); var Topic = require('./topic.js'); /** - * [Google Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a - * reliable, many-to-many, asynchronous messaging service from Google Cloud + * [Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a + * reliable, many-to-many, asynchronous messaging service from Cloud * Platform. * * The `PUBSUB_EMULATOR_HOST` environment variable from the gcloud SDK is @@ -50,7 +50,7 @@ var Topic = require('./topic.js'); * @constructor * @alias module:pubsub * - * @resource [Google Cloud Pub/Sub overview]{@link https://developers.google.com/pubsub/overview} + * @resource [Cloud Pub/Sub overview]{@link https://developers.google.com/pubsub/overview} * * @param {object} options - [Configuration object](#/docs). */ diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index e3e759d1d00..e49f6479c3d 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -60,7 +60,7 @@ var PUBSUB_API_TIMEOUT = 90000; * response before the connection is broken. (default: 90000) */ /** - * A Subscription object will give you access to your Google Cloud Pub/Sub + * A Subscription object will give you access to your Cloud Pub/Sub * subscription. * * Subscriptions are sometimes retrieved when using various methods: @@ -302,7 +302,7 @@ function Subscription(pubsub, options) { * * *The IAM access control features described in this document are Beta, * including the API methods to get and set IAM policies, and to test IAM - * permissions. Google Cloud Pub/Sub's use of IAM features is not covered by + * permissions. Cloud Pub/Sub's use of IAM features is not covered by * any SLA or deprecation policy, and may be subject to backward-incompatible * changes.* * diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index ffead1a73d5..ab58d94f584 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -39,7 +39,7 @@ var IAM = require('./iam.js'); * @param {string} name - Name of the topic. */ /** - * A Topic object allows you to interact with a Google Cloud Pub/Sub topic. + * A Topic object allows you to interact with a Cloud Pub/Sub topic. * * @constructor * @alias module:pubsub/topic @@ -197,7 +197,7 @@ function Topic(pubsub, name) { * * *The IAM access control features described in this document are Beta, * including the API methods to get and set IAM policies, and to test IAM - * permissions. Google Cloud Pub/Sub's use of IAM features is not covered by + * permissions. Cloud Pub/Sub's use of IAM features is not covered by * any SLA or deprecation policy, and may be subject to backward-incompatible * changes.* * From f08c45cfc3bfb91fdbd73fe9f1d9d55245f37ebe Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 3 Mar 2017 15:23:24 -0500 Subject: [PATCH 0048/1115] update gax & google-proto-files --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1880777fe61..74c3362ddad 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,8 +54,8 @@ "@google-cloud/common-grpc": "^0.1.1", "arrify": "^1.0.0", "extend": "^3.0.0", - "google-gax": "^0.10.0", - "google-proto-files": "^0.9.1", + "google-gax": "^0.12.2", + "google-proto-files": "^0.10.0", "is": "^3.0.1", "modelo": "^4.2.0", "propprop": "^0.3.0", From 5beee49b906a24d65918fbc7419a3fd09af6ffee Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 3 Mar 2017 15:58:26 -0500 Subject: [PATCH 0049/1115] pubsub @ 0.8.1 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 74c3362ddad..eb035c60160 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.8.0", + "version": "0.8.1", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 8a7bf0ef8a78bae4ccdcb06637ba5fc08d7f2a9b Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 6 Mar 2017 12:27:34 -0500 Subject: [PATCH 0050/1115] pubsub: depend on ^0.1.6 (https://github.com/GoogleCloudPlatform/google-cloud-node/issues/2045#issuecomment-284169993) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index eb035c60160..3589f3c15e9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.1.1", + "@google-cloud/common-grpc": "^0.1.6", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.12.2", From a028becf4fbbbbc4172624d691a8193ef3793036 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 6 Mar 2017 12:30:30 -0500 Subject: [PATCH 0051/1115] pubsub @ 0.8.2 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3589f3c15e9..8389696b83c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.8.1", + "version": "0.8.2", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 459cf559f1e2508b0fb0d7184f0334710226e566 Mon Sep 17 00:00:00 2001 From: Jun Mukai Date: Mon, 6 Mar 2017 13:14:30 -0800 Subject: [PATCH 0052/1115] Regenerate pubsub autogen API client (#2032) --- handwritten/pubsub/src/v1/index.js | 9 +- handwritten/pubsub/src/v1/publisher_client.js | 105 +-- .../src/v1/publisher_client_config.json | 20 +- .../pubsub/src/v1/subscriber_client.js | 601 ++++++++++++++++-- .../src/v1/subscriber_client_config.json | 42 +- 5 files changed, 665 insertions(+), 112 deletions(-) diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js index 32c431e9bc3..984bda91adc 100644 --- a/handwritten/pubsub/src/v1/index.js +++ b/handwritten/pubsub/src/v1/index.js @@ -1,11 +1,11 @@ -/*! - * Copyright 2016 Google Inc. All Rights Reserved. +/* + * Copyright 2016 Google Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,8 +17,8 @@ var publisherClient = require('./publisher_client'); var subscriberClient = require('./subscriber_client'); -var extend = require('extend'); var gax = require('google-gax'); +var extend = require('extend'); function v1(options) { options = extend({ @@ -33,4 +33,5 @@ function v1(options) { v1.SERVICE_ADDRESS = publisherClient.SERVICE_ADDRESS; v1.ALL_SCOPES = publisherClient.ALL_SCOPES; + module.exports = v1; diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 66fcba2b9d7..1452ef81a8b 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -74,60 +74,66 @@ var ALL_SCOPES = [ * @class */ function PublisherClient(gaxGrpc, grpcClients, opts) { - opts = opts || {}; - var servicePath = opts.servicePath || SERVICE_ADDRESS; - var port = opts.port || DEFAULT_SERVICE_PORT; - var sslCreds = opts.sslCreds || null; - var clientConfig = opts.clientConfig || {}; - var appName = opts.appName || 'gax'; - var appVersion = opts.appVersion || gax.version; + opts = extend({ + servicePath: SERVICE_ADDRESS, + port: DEFAULT_SERVICE_PORT, + clientConfig: {} + }, opts); var googleApiClient = [ - appName + '/' + appVersion, + 'gl-node/' + process.versions.node + ]; + if (opts.libName && opts.libVersion) { + googleApiClient.push(opts.libName + '/' + opts.libVersion); + } + googleApiClient.push( CODE_GEN_NAME_VERSION, 'gax/' + gax.version, - 'nodejs/' + process.version].join(' '); + 'grpc/' + gaxGrpc.grpcVersion + ); var bundleDescriptors = { publish: new gax.BundleDescriptor( - 'messages', - [ - 'topic' - ], - 'messageIds', - gax.createByteLengthFunction(grpcClients.publisherClient.google.pubsub.v1.PubsubMessage)) + 'messages', + [ + 'topic' + ], + 'messageIds', + gax.createByteLengthFunction(grpcClients.google.pubsub.v1.PubsubMessage)) }; var defaults = gaxGrpc.constructSettings( 'google.pubsub.v1.Publisher', configData, - clientConfig, - {'x-goog-api-client': googleApiClient}); + opts.clientConfig, + {'x-goog-api-client': googleApiClient.join(' ')}); + + var self = this; + this.auth = gaxGrpc.auth; var iamPolicyStub = gaxGrpc.createStub( - servicePath, - port, - grpcClients.iamPolicyClient.google.iam.v1.IAMPolicy, - {sslCreds: sslCreds}); + grpcClients.google.iam.v1.IAMPolicy, + opts); var iamPolicyStubMethods = [ 'setIamPolicy', 'getIamPolicy', 'testIamPermissions' ]; iamPolicyStubMethods.forEach(function(methodName) { - this['_' + methodName] = gax.createApiCall( + self['_' + methodName] = gax.createApiCall( iamPolicyStub.then(function(iamPolicyStub) { - return iamPolicyStub[methodName].bind(iamPolicyStub); + return function() { + var args = Array.prototype.slice.call(arguments, 0); + return iamPolicyStub[methodName].apply(iamPolicyStub, args); + }; }), defaults[methodName], PAGE_DESCRIPTORS[methodName] || bundleDescriptors[methodName]); - }.bind(this)); + }); var publisherStub = gaxGrpc.createStub( - servicePath, - port, - grpcClients.publisherClient.google.pubsub.v1.Publisher, - {sslCreds: sslCreds}); + grpcClients.google.pubsub.v1.Publisher, + opts); var publisherStubMethods = [ 'createTopic', 'publish', @@ -137,13 +143,16 @@ function PublisherClient(gaxGrpc, grpcClients, opts) { 'deleteTopic' ]; publisherStubMethods.forEach(function(methodName) { - this['_' + methodName] = gax.createApiCall( + self['_' + methodName] = gax.createApiCall( publisherStub.then(function(publisherStub) { - return publisherStub[methodName].bind(publisherStub); + return function() { + var args = Array.prototype.slice.call(arguments, 0); + return publisherStub[methodName].apply(publisherStub, args); + }; }), defaults[methodName], PAGE_DESCRIPTORS[methodName] || bundleDescriptors[methodName]); - }.bind(this)); + }); } // Path templates @@ -208,6 +217,15 @@ PublisherClient.prototype.matchTopicFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).topic; }; +/** + * Get the project ID used by this class. + * @aram {function(Error, string)} callback - the callback to be called with + * the current project Id. + */ +PublisherClient.prototype.getProjectId = function(callback) { + return this.auth.getProjectId(callback); +}; + // Service calls /** @@ -265,6 +283,7 @@ PublisherClient.prototype.createTopic = function(request, options, callback) { * The request object that will be sent. * @param {string} request.topic * The messages in the request will be published on this topic. + * Format is `projects/{project}/topics/{topic}`. * @param {Object[]} request.messages * The messages to publish. * @@ -319,6 +338,7 @@ PublisherClient.prototype.publish = function(request, options, callback) { * The request object that will be sent. * @param {string} request.topic * The name of the topic to get. + * Format is `projects/{project}/topics/{topic}`. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -360,6 +380,7 @@ PublisherClient.prototype.getTopic = function(request, options, callback) { * The request object that will be sent. * @param {string} request.project * The name of the cloud project that topics belong to. + * Format is `projects/{project}`. * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -455,6 +476,7 @@ PublisherClient.prototype.listTopics = function(request, options, callback) { * The request object that will be sent. * @param {string} request.project * The name of the cloud project that topics belong to. + * Format is `projects/{project}`. * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -492,6 +514,7 @@ PublisherClient.prototype.listTopicsStream = function(request, options) { * The request object that will be sent. * @param {string} request.topic * The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -587,6 +610,7 @@ PublisherClient.prototype.listTopicSubscriptions = function(request, options, ca * The request object that will be sent. * @param {string} request.topic * The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -628,6 +652,7 @@ PublisherClient.prototype.listTopicSubscriptionsStream = function(request, optio * The request object that will be sent. * @param {string} request.topic * Name of the topic to delete. + * Format is `projects/{project}/topics/{topic}`. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -759,6 +784,8 @@ PublisherClient.prototype.getIamPolicy = function(request, options, callback) { /** * Returns permissions that a caller has on the specified resource. + * If the resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. * * @param {Object} request * The request object that will be sent. @@ -827,10 +854,12 @@ function PublisherClientBuilder(gaxGrpc) { }]); extend(this, publisherClient.google.pubsub.v1); - var grpcClients = { - iamPolicyClient: iamPolicyClient, - publisherClient: publisherClient - }; + var grpcClients = extend( + true, + {}, + iamPolicyClient, + publisherClient + ); /** * Build a new instance of {@link PublisherClient}. @@ -845,10 +874,6 @@ function PublisherClientBuilder(gaxGrpc) { * @param {Object=} opts.clientConfig * The customized config to build the call settings. See * {@link gax.constructSettings} for the format. - * @param {number=} opts.appName - * The codename of the calling service. - * @param {String=} opts.appVersion - * The version of the calling service. */ this.publisherClient = function(opts) { return new PublisherClient(gaxGrpc, grpcClients, opts); @@ -857,4 +882,4 @@ function PublisherClientBuilder(gaxGrpc) { } module.exports = PublisherClientBuilder; module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS; -module.exports.ALL_SCOPES = ALL_SCOPES; \ No newline at end of file +module.exports.ALL_SCOPES = ALL_SCOPES; diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 4df74e5170e..d576c1b62d9 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -2,17 +2,15 @@ "interfaces": { "google.pubsub.v1.Publisher": { "retry_codes": { - "retry_codes_def": { - "idempotent": [ - "DEADLINE_EXCEEDED", - "UNAVAILABLE" - ], - "one_plus_delivery": [ - "DEADLINE_EXCEEDED", - "UNAVAILABLE" - ], - "non_idempotent": [] - } + "idempotent": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "one_plus_delivery": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "non_idempotent": [] }, "retry_params": { "default": { diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 064e34a33b8..e9c92bc73c7 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -41,7 +41,15 @@ var PAGE_DESCRIPTORS = { listSubscriptions: new gax.PageDescriptor( 'pageToken', 'nextPageToken', - 'subscriptions') + 'subscriptions'), + listSnapshots: new gax.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'snapshots') +}; + +var STREAM_DESCRIPTORS = { + streamingPull: new gax.StreamDescriptor(gax.StreamType.BIDI_STREAMING) }; /** @@ -70,68 +78,83 @@ var ALL_SCOPES = [ * @class */ function SubscriberClient(gaxGrpc, grpcClients, opts) { - opts = opts || {}; - var servicePath = opts.servicePath || SERVICE_ADDRESS; - var port = opts.port || DEFAULT_SERVICE_PORT; - var sslCreds = opts.sslCreds || null; - var clientConfig = opts.clientConfig || {}; - var appName = opts.appName || 'gax'; - var appVersion = opts.appVersion || gax.version; + opts = extend({ + servicePath: SERVICE_ADDRESS, + port: DEFAULT_SERVICE_PORT, + clientConfig: {} + }, opts); var googleApiClient = [ - appName + '/' + appVersion, + 'gl-node/' + process.versions.node + ]; + if (opts.libName && opts.libVersion) { + googleApiClient.push(opts.libName + '/' + opts.libVersion); + } + googleApiClient.push( CODE_GEN_NAME_VERSION, 'gax/' + gax.version, - 'nodejs/' + process.version].join(' '); + 'grpc/' + gaxGrpc.grpcVersion + ); var defaults = gaxGrpc.constructSettings( 'google.pubsub.v1.Subscriber', configData, - clientConfig, - {'x-goog-api-client': googleApiClient}); + opts.clientConfig, + {'x-goog-api-client': googleApiClient.join(' ')}); + + var self = this; + this.auth = gaxGrpc.auth; var iamPolicyStub = gaxGrpc.createStub( - servicePath, - port, - grpcClients.iamPolicyClient.google.iam.v1.IAMPolicy, - {sslCreds: sslCreds}); + grpcClients.google.iam.v1.IAMPolicy, + opts); var iamPolicyStubMethods = [ 'setIamPolicy', 'getIamPolicy', 'testIamPermissions' ]; iamPolicyStubMethods.forEach(function(methodName) { - this['_' + methodName] = gax.createApiCall( + self['_' + methodName] = gax.createApiCall( iamPolicyStub.then(function(iamPolicyStub) { - return iamPolicyStub[methodName].bind(iamPolicyStub); + return function() { + var args = Array.prototype.slice.call(arguments, 0); + return iamPolicyStub[methodName].apply(iamPolicyStub, args); + }; }), defaults[methodName], - PAGE_DESCRIPTORS[methodName]); - }.bind(this)); + PAGE_DESCRIPTORS[methodName] || STREAM_DESCRIPTORS[methodName]); + }); var subscriberStub = gaxGrpc.createStub( - servicePath, - port, - grpcClients.subscriberClient.google.pubsub.v1.Subscriber, - {sslCreds: sslCreds}); + grpcClients.google.pubsub.v1.Subscriber, + opts); var subscriberStubMethods = [ 'createSubscription', 'getSubscription', + 'updateSubscription', 'listSubscriptions', 'deleteSubscription', 'modifyAckDeadline', 'acknowledge', 'pull', - 'modifyPushConfig' + 'streamingPull', + 'modifyPushConfig', + 'listSnapshots', + 'createSnapshot', + 'deleteSnapshot', + 'seek' ]; subscriberStubMethods.forEach(function(methodName) { - this['_' + methodName] = gax.createApiCall( + self['_' + methodName] = gax.createApiCall( subscriberStub.then(function(subscriberStub) { - return subscriberStub[methodName].bind(subscriberStub); + return function() { + var args = Array.prototype.slice.call(arguments, 0); + return subscriberStub[methodName].apply(subscriberStub, args); + }; }), defaults[methodName], - PAGE_DESCRIPTORS[methodName]); - }.bind(this)); + PAGE_DESCRIPTORS[methodName] || STREAM_DESCRIPTORS[methodName]); + }); } // Path templates @@ -139,6 +162,9 @@ function SubscriberClient(gaxGrpc, grpcClients, opts) { var PROJECT_PATH_TEMPLATE = new gax.PathTemplate( 'projects/{project}'); +var SNAPSHOT_PATH_TEMPLATE = new gax.PathTemplate( + 'projects/{project}/snapshots/{snapshot}'); + var SUBSCRIPTION_PATH_TEMPLATE = new gax.PathTemplate( 'projects/{project}/subscriptions/{subscription}'); @@ -166,6 +192,39 @@ SubscriberClient.prototype.matchProjectFromProjectName = function(projectName) { return PROJECT_PATH_TEMPLATE.match(projectName).project; }; +/** + * Returns a fully-qualified snapshot resource name string. + * @param {String} project + * @param {String} snapshot + * @returns {String} + */ +SubscriberClient.prototype.snapshotPath = function(project, snapshot) { + return SNAPSHOT_PATH_TEMPLATE.render({ + project: project, + snapshot: snapshot + }); +}; + +/** + * Parses the snapshotName from a snapshot resource. + * @param {String} snapshotName + * A fully-qualified path representing a snapshot resources. + * @returns {String} - A string representing the project. + */ +SubscriberClient.prototype.matchProjectFromSnapshotName = function(snapshotName) { + return SNAPSHOT_PATH_TEMPLATE.match(snapshotName).project; +}; + +/** + * Parses the snapshotName from a snapshot resource. + * @param {String} snapshotName + * A fully-qualified path representing a snapshot resources. + * @returns {String} - A string representing the snapshot. + */ +SubscriberClient.prototype.matchSnapshotFromSnapshotName = function(snapshotName) { + return SNAPSHOT_PATH_TEMPLATE.match(snapshotName).snapshot; +}; + /** * Returns a fully-qualified subscription resource name string. * @param {String} project @@ -232,6 +291,15 @@ SubscriberClient.prototype.matchTopicFromTopicName = function(topicName) { return TOPIC_PATH_TEMPLATE.match(topicName).topic; }; +/** + * Get the project ID used by this class. + * @aram {function(Error, string)} callback - the callback to be called with + * the current project Id. + */ +SubscriberClient.prototype.getProjectId = function(callback) { + return this.auth.getProjectId(callback); +}; + // Service calls /** @@ -240,8 +308,11 @@ SubscriberClient.prototype.matchTopicFromTopicName = function(topicName) { * If the corresponding topic doesn't exist, returns `NOT_FOUND`. * * If the name is not provided in the request, the server will assign a random - * name for this subscription on the same project as the topic. Note that - * for REST API requests, you must specify a name. + * name for this subscription on the same project as the topic, conforming + * to the + * [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + * The generated name is populated in the returned Subscription object. + * Note that for REST API requests, you must specify a name in the request. * * @param {Object} request * The request object that will be sent. @@ -254,6 +325,7 @@ SubscriberClient.prototype.matchTopicFromTopicName = function(topicName) { * in length, and it must not start with `"goog"`. * @param {string} request.topic * The name of the topic from which this subscription is receiving messages. + * Format is `projects/{project}/topics/{topic}`. * The value of this field will be `_deleted-topic_` if the topic has been * deleted. * @param {Object=} request.pushConfig @@ -273,15 +345,29 @@ SubscriberClient.prototype.matchTopicFromTopicName = function(topicName) { * deadline. To override this value for a given message, call * `ModifyAckDeadline` with the corresponding `ack_id` if using * pull. + * The minimum custom deadline you can specify is 10 seconds. * The maximum custom deadline you can specify is 600 seconds (10 minutes). + * If this parameter is 0, a default value of 10 seconds is used. * * For push delivery, this value is also used to set the request timeout for * the call to the push endpoint. * * If the subscriber never acknowledges the message, the Pub/Sub * system will eventually redeliver the message. - * - * If this parameter is 0, a default value of 10 seconds is used. + * @param {boolean=} request.retainAckedMessages + * Indicates whether to retain acknowledged messages. If true, then + * messages are not expunged from the subscription's backlog, even if they are + * acknowledged, until they fall out of the `message_retention_duration` + * window. + * @param {Object=} request.messageRetentionDuration + * How long to retain unacknowledged messages in the subscription's backlog, + * from the moment a message is published. + * If `retain_acked_messages` is true, then this also configures the retention + * of acknowledged messages, and thus configures how far back in time a `Seek` + * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 + * minutes. + * + * This object should have the same structure as [google.protobuf.Duration]{@link external:"google.protobuf.Duration"} * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -328,6 +414,7 @@ SubscriberClient.prototype.createSubscription = function(request, options, callb * The request object that will be sent. * @param {string} request.subscription * The name of the subscription to get. + * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -362,6 +449,60 @@ SubscriberClient.prototype.getSubscription = function(request, options, callback return this._getSubscription(request, options, callback); }; +/** + * Updates an existing subscription. Note that certain properties of a + * subscription, such as its topic, are not modifiable. + * + * @param {Object} request + * The request object that will be sent. + * @param {Object} request.subscription + * The updated subscription object. + * + * This object should have the same structure as [Subscription]{@link Subscription} + * @param {Object} request.updateMask + * Indicates which fields in the provided subscription to update. + * Must be specified and non-empty. + * + * This object should have the same structure as [google.protobuf.FieldMask]{@link external:"google.protobuf.FieldMask"} + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Subscription]{@link Subscription}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link Subscription}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * var client = pubsubV1.subscriberClient(); + * var subscription = {}; + * var updateMask = {}; + * var request = { + * subscription: subscription, + * updateMask: updateMask + * }; + * client.updateSubscription(request).then(function(responses) { + * var response = responses[0]; + * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); + * }); + */ +SubscriberClient.prototype.updateSubscription = function(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + + return this._updateSubscription(request, options, callback); +}; + /** * Lists matching subscriptions. * @@ -369,6 +510,7 @@ SubscriberClient.prototype.getSubscription = function(request, options, callback * The request object that will be sent. * @param {string} request.project * The name of the cloud project that subscriptions belong to. + * Format is `projects/{project}`. * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -464,6 +606,7 @@ SubscriberClient.prototype.listSubscriptions = function(request, options, callba * The request object that will be sent. * @param {string} request.project * The name of the cloud project that subscriptions belong to. + * Format is `projects/{project}`. * @param {number=} request.pageSize * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -495,16 +638,17 @@ SubscriberClient.prototype.listSubscriptionsStream = function(request, options) }; /** - * Deletes an existing subscription. All pending messages in the subscription + * Deletes an existing subscription. All messages retained in the subscription * are immediately dropped. Calls to `Pull` after deletion will return * `NOT_FOUND`. After a subscription is deleted, a new one may be created with * the same name, but the new one has no association with the old - * subscription, or its topic unless the same topic is specified. + * subscription or its topic unless the same topic is specified. * * @param {Object} request * The request object that will be sent. * @param {string} request.subscription * The subscription to delete. + * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -544,14 +688,17 @@ SubscriberClient.prototype.deleteSubscription = function(request, options, callb * The request object that will be sent. * @param {string} request.subscription * The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. * @param {string[]} request.ackIds * List of acknowledgment IDs. * @param {number} request.ackDeadlineSeconds * The new ack deadline with respect to the time this request was sent to - * the Pub/Sub system. Must be >= 0. For example, if the value is 10, the new + * the Pub/Sub system. For example, if the value is 10, the new * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call * was made. Specifying zero may immediately make the message available for * another pull request. + * The minimum deadline you can specify is 0 seconds. + * The maximum deadline you can specify is 600 seconds (10 minutes). * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -600,6 +747,7 @@ SubscriberClient.prototype.modifyAckDeadline = function(request, options, callba * The request object that will be sent. * @param {string} request.subscription * The subscription whose message is being acknowledged. + * Format is `projects/{project}/subscriptions/{sub}`. * @param {string[]} request.ackIds * The acknowledgment ID for the messages being acknowledged that was returned * by the Pub/Sub system in the `Pull` response. Must not be empty. @@ -646,15 +794,17 @@ SubscriberClient.prototype.acknowledge = function(request, options, callback) { * The request object that will be sent. * @param {string} request.subscription * The subscription from which messages should be pulled. + * Format is `projects/{project}/subscriptions/{sub}`. * @param {number} request.maxMessages * The maximum number of messages returned for this request. The Pub/Sub * system may return fewer than the number specified. * @param {boolean=} request.returnImmediately - * If this is specified as true the system will respond immediately even if - * it is not able to return a message in the `Pull` response. Otherwise the - * system is allowed to wait until at least one message is available rather - * than returning no messages. The client may cancel the request if it does - * not wish to wait any longer for the response. + * If this field set to true, the system will respond immediately even if + * it there are no messages available to return in the `Pull` response. + * Otherwise, the system may wait (for a bounded amount of time) until at + * least one message is available, rather than returning no messages. The + * client may cancel the request if it does not wish to wait any longer for + * the response. * @param {Object=} options * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -694,6 +844,54 @@ SubscriberClient.prototype.pull = function(request, options, callback) { return this._pull(request, options, callback); }; +/** + * (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will + * respond with UNIMPLEMENTED errors unless you have been invited to test + * this feature. Contact cloud-pubsub@google.com with any questions. + * + * Establishes a stream with the server, which sends messages down to the + * client. The client streams acknowledgements and ack deadline modifications + * back to the server. The server will close the stream and return the status + * on any error. The server may close the stream with status `OK` to reassign + * server-side resources, in which case, the client should re-establish the + * stream. `UNAVAILABLE` may also be returned in the case of a transient error + * (e.g., a server restart). These should also be retried by the client. Flow + * control can be achieved by configuring the underlying RPC channel. + * + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @returns {Stream} + * An object stream which is both readable and writable. It accepts objects + * representing [StreamingPullRequest]{@link StreamingPullRequest} for write() method, and + * will emit objects representing [StreamingPullResponse]{@link StreamingPullResponse} on 'data' event asynchronously. + * + * @example + * + * var client = pubsubV1.subscriberClient(); + * var stream = client.streamingPull().on('data', function(response) { + * // doThingsWith(response); + * }); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var streamAckDeadlineSeconds = 0; + * var request = { + * subscription : formattedSubscription, + * streamAckDeadlineSeconds : streamAckDeadlineSeconds + * }; + * var request = { + * root: request + * }; + * // Write request objects. + * stream.write(request); + */ +SubscriberClient.prototype.streamingPull = function(options) { + if (options === undefined) { + options = {}; + } + + return this._streamingPull(options); +}; + /** * Modifies the `PushConfig` for a specified subscription. * @@ -706,6 +904,7 @@ SubscriberClient.prototype.pull = function(request, options, callback) { * The request object that will be sent. * @param {string} request.subscription * The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object} request.pushConfig * The push configuration for future deliveries. * @@ -748,6 +947,308 @@ SubscriberClient.prototype.modifyPushConfig = function(request, options, callbac return this._modifyPushConfig(request, options, callback); }; +/** + * Lists the existing snapshots. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that snapshots belong to. + * Format is `projects/{project}`. + * @param {number=} request.pageSize + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Array, ?Object, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is Array of [Snapshot]{@link Snapshot}. + * + * When autoPaginate: false is specified through options, it contains the result + * in a single response. If the response indicates the next page exists, the third + * parameter is set to be used for the next request object. The fourth parameter keeps + * the raw response object of an object representing [ListSnapshotsResponse]{@link ListSnapshotsResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Snapshot]{@link Snapshot}. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Snapshot]{@link Snapshot} in a single response. + * The second element is the next request object if the response + * indicates the next page exists, or null. The third element is + * an object representing [ListSnapshotsResponse]{@link ListSnapshotsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * var client = pubsubV1.subscriberClient(); + * var formattedProject = client.projectPath("[PROJECT]"); + * // Iterate over all elements. + * client.listSnapshots({project: formattedProject}).then(function(responses) { + * var resources = responses[0]; + * for (var i = 0; i < resources.length; ++i) { + * // doThingsWith(resources[i]) + * } + * }).catch(function(err) { + * console.error(err); + * }); + * + * // Or obtain the paged response. + * var options = {autoPaginate: false}; + * function callback(responses) { + * // The actual resources in a response. + * var resources = responses[0]; + * // The next request if the response shows there's more responses. + * var nextRequest = responses[1]; + * // The actual response object, if necessary. + * // var rawResponse = responses[2]; + * for (var i = 0; i < resources.length; ++i) { + * // doThingsWith(resources[i]); + * } + * if (nextRequest) { + * // Fetch the next page. + * return client.listSnapshots(nextRequest, options).then(callback); + * } + * } + * client.listSnapshots({project: formattedProject}, options) + * .then(callback) + * .catch(function(err) { + * console.error(err); + * }); + */ +SubscriberClient.prototype.listSnapshots = function(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + + return this._listSnapshots(request, options, callback); +}; + +/** + * Equivalent to {@link listSnapshots}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listSnapshots} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that snapshots belong to. + * Format is `projects/{project}`. + * @param {number=} request.pageSize + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @return {Stream} + * An object stream which emits an object representing [Snapshot]{@link Snapshot} on 'data' event. + * + * @example + * + * var client = pubsubV1.subscriberClient(); + * var formattedProject = client.projectPath("[PROJECT]"); + * client.listSnapshotsStream({project: formattedProject}).on('data', function(element) { + * // doThingsWith(element) + * }).on('error', function(err) { + * console.error(err); + * }); + */ +SubscriberClient.prototype.listSnapshotsStream = function(request, options) { + if (options === undefined) { + options = {}; + } + + return PAGE_DESCRIPTORS.listSnapshots.createStream(this._listSnapshots, request, options); +}; + +/** + * Creates a snapshot from the requested subscription. + * If the snapshot already exists, returns `ALREADY_EXISTS`. + * If the requested subscription doesn't exist, returns `NOT_FOUND`. + * + * If the name is not provided in the request, the server will assign a random + * name for this snapshot on the same project as the subscription, conforming + * to the + * [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + * The generated name is populated in the returned Snapshot object. + * Note that for REST API requests, you must specify a name in the request. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Optional user-provided name for this snapshot. + * If the name is not provided in the request, the server will assign a random + * name for this snapshot on the same project as the subscription. + * Note that for REST API requests, you must specify a name. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {string} request.subscription + * The subscription whose backlog the snapshot retains. + * Specifically, the created snapshot is guaranteed to retain: + * (a) The existing backlog on the subscription. More precisely, this is + * defined as the messages in the subscription's backlog that are + * unacknowledged upon the successful completion of the + * `CreateSnapshot` request; as well as: + * (b) Any messages published to the subscription's topic following the + * successful completion of the CreateSnapshot request. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Snapshot]{@link Snapshot}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Snapshot]{@link Snapshot}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * var client = pubsubV1.subscriberClient(); + * var formattedName = client.snapshotPath("[PROJECT]", "[SNAPSHOT]"); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * var request = { + * name: formattedName, + * subscription: formattedSubscription + * }; + * client.createSnapshot(request).then(function(responses) { + * var response = responses[0]; + * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); + * }); + */ +SubscriberClient.prototype.createSnapshot = function(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + + return this._createSnapshot(request, options, callback); +}; + +/** + * Removes an existing snapshot. All messages retained in the snapshot + * are immediately dropped. After a snapshot is deleted, a new one may be + * created with the same name, but the new one has no association with the old + * snapshot or its subscription, unless the same subscription is specified. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.snapshot + * The name of the snapshot to delete. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error)=} callback + * The function which will be called with the result of the API call. + * @return {Promise} - The promise which resolves when API call finishes. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * var client = pubsubV1.subscriberClient(); + * var formattedSnapshot = client.snapshotPath("[PROJECT]", "[SNAPSHOT]"); + * client.deleteSnapshot({snapshot: formattedSnapshot}).catch(function(err) { + * console.error(err); + * }); + */ +SubscriberClient.prototype.deleteSnapshot = function(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + + return this._deleteSnapshot(request, options, callback); +}; + +/** + * Seeks an existing subscription to a point in time or to a given snapshot, + * whichever is provided in the request. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * The subscription to affect. + * @param {Object=} request.time + * The time to seek to. + * Messages retained in the subscription that were published before this + * time are marked as acknowledged, and messages retained in the + * subscription that were published after this time are marked as + * unacknowledged. Note that this operation affects only those messages + * retained in the subscription (configured by the combination of + * `message_retention_duration` and `retain_acked_messages`). For example, + * if `time` corresponds to a point before the message retention + * window (or to a point before the system's notion of the subscription + * creation time), only retained messages will be marked as unacknowledged, + * and already-expunged messages will not be restored. + * + * This object should have the same structure as [google.protobuf.Timestamp]{@link external:"google.protobuf.Timestamp"} + * @param {string=} request.snapshot + * The snapshot to seek to. The snapshot's topic must be the same as that of + * the provided subscription. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {Object=} options + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)=} callback + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [SeekResponse]{@link SeekResponse}. + * @return {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [SeekResponse]{@link SeekResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * var client = pubsubV1.subscriberClient(); + * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); + * client.seek({subscription: formattedSubscription}).then(function(responses) { + * var response = responses[0]; + * // doThingsWith(response) + * }).catch(function(err) { + * console.error(err); + * }); + */ +SubscriberClient.prototype.seek = function(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + if (options === undefined) { + options = {}; + } + + return this._seek(request, options, callback); +}; + /** * Sets the access control policy on the specified resource. Replaces any * existing policy. @@ -851,6 +1352,8 @@ SubscriberClient.prototype.getIamPolicy = function(request, options, callback) { /** * Returns permissions that a caller has on the specified resource. + * If the resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. * * @param {Object} request * The request object that will be sent. @@ -919,10 +1422,12 @@ function SubscriberClientBuilder(gaxGrpc) { }]); extend(this, subscriberClient.google.pubsub.v1); - var grpcClients = { - iamPolicyClient: iamPolicyClient, - subscriberClient: subscriberClient - }; + var grpcClients = extend( + true, + {}, + iamPolicyClient, + subscriberClient + ); /** * Build a new instance of {@link SubscriberClient}. @@ -937,10 +1442,6 @@ function SubscriberClientBuilder(gaxGrpc) { * @param {Object=} opts.clientConfig * The customized config to build the call settings. See * {@link gax.constructSettings} for the format. - * @param {number=} opts.appName - * The codename of the calling service. - * @param {String=} opts.appVersion - * The version of the calling service. */ this.subscriberClient = function(opts) { return new SubscriberClient(gaxGrpc, grpcClients, opts); @@ -949,4 +1450,4 @@ function SubscriberClientBuilder(gaxGrpc) { } module.exports = SubscriberClientBuilder; module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS; -module.exports.ALL_SCOPES = ALL_SCOPES; \ No newline at end of file +module.exports.ALL_SCOPES = ALL_SCOPES; diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index c39ebcb51e6..7b2299e951b 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -2,13 +2,11 @@ "interfaces": { "google.pubsub.v1.Subscriber": { "retry_codes": { - "retry_codes_def": { - "idempotent": [ - "DEADLINE_EXCEEDED", - "UNAVAILABLE" - ], - "non_idempotent": [] - } + "idempotent": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "non_idempotent": [] }, "retry_params": { "default": { @@ -41,6 +39,11 @@ "retry_codes_name": "idempotent", "retry_params_name": "default" }, + "UpdateSubscription": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, "ListSubscriptions": { "timeout_millis": 60000, "retry_codes_name": "idempotent", @@ -66,11 +69,36 @@ "retry_codes_name": "non_idempotent", "retry_params_name": "messaging" }, + "StreamingPull": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "messaging" + }, "ModifyPushConfig": { "timeout_millis": 60000, "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, + "ListSnapshots": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "CreateSnapshot": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "DeleteSnapshot": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, + "Seek": { + "timeout_millis": 60000, + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, "SetIamPolicy": { "timeout_millis": 60000, "retry_codes_name": "non_idempotent", From 9fd07b4bafbc1a873aa8f8a013e623f9b746561b Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 13 Mar 2017 15:01:18 -0400 Subject: [PATCH 0053/1115] update @google-cloud/common-grpc deps --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8389696b83c..4b809772a7c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.1.6", + "@google-cloud/common-grpc": "^0.2.0", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.12.2", From 8e7105308663df56895eed0f00d1f16314408a57 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 13 Mar 2017 19:08:25 -0400 Subject: [PATCH 0054/1115] update @google-cloud/common-grpc deps --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4b809772a7c..9a1f272bd01 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.0", + "@google-cloud/common-grpc": "^0.2.1", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.12.2", From e86c31a952f52a5aa867bc54283a1f69da882f15 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 14 Mar 2017 17:09:40 -0400 Subject: [PATCH 0055/1115] pubsub @ 0.8.3 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9a1f272bd01..0436dcc85a5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.8.2", + "version": "0.8.3", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 97bf62c23aa85020e4f7687af81d072a287d59cb Mon Sep 17 00:00:00 2001 From: Justin King Date: Mon, 27 Mar 2017 11:14:17 -0700 Subject: [PATCH 0056/1115] pubsub: add ability to pass timeout to ack (#2042) --- handwritten/pubsub/src/subscription.js | 15 ++++++++++++++- handwritten/pubsub/test/subscription.js | 25 ++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index e49f6479c3d..7d8e40b3ee7 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -409,6 +409,9 @@ Subscription.generateName_ = function() { * @throws {Error} If at least one ackId is not provided. * * @param {string|string[]} ackIds - An ackId or array of ackIds. + * @param {options=} options - Configuration object. + * @param {number} options.timeout - Set a maximum amount of time in + * milliseconds before giving up if no response is received. * @param {function=} callback - The callback function. * * @example @@ -423,7 +426,7 @@ Subscription.generateName_ = function() { * var apiResponse = data[0]; * }); */ -Subscription.prototype.ack = function(ackIds, callback) { +Subscription.prototype.ack = function(ackIds, options, callback) { var self = this; ackIds = arrify(ackIds); @@ -434,6 +437,12 @@ Subscription.prototype.ack = function(ackIds, callback) { ].join('')); } + if (is.fn(options)) { + callback = options; + options = {}; + } + + options = options || {}; callback = callback || common.util.noop; var protoOpts = { @@ -441,6 +450,10 @@ Subscription.prototype.ack = function(ackIds, callback) { method: 'acknowledge' }; + if (options && is.number(options.timeout)) { + protoOpts.timeout = options.timeout; + } + var reqOpts = { subscription: this.name, ackIds: ackIds diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 4f8002615bd..4f365cc4342 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -53,7 +53,8 @@ describe('Subscription', function() { var SUB_NAME = 'test-subscription'; var SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; var PUBSUB = { - projectId: PROJECT_ID + projectId: PROJECT_ID, + request: util.noop }; var message = 'howdy'; var messageBuffer = new Buffer(message).toString('base64'); @@ -410,6 +411,28 @@ describe('Subscription', function() { subscription.ack(IDS, assert.ifError); }); + it('should honor the timeout setting', function(done) { + var options = { + timeout: 10 + }; + + subscription.request = function(protoOpts) { + assert.strictEqual(protoOpts.timeout, options.timeout); + done(); + }; + + subscription.ack('abc', options, assert.ifError); + }); + + it('should not require a callback', function() { + assert.doesNotThrow(function() { + subscription.ack('abc'); + subscription.ack('abc', { + timeout: 10 + }); + }); + }); + it('should unmark the ack ids as being in progress', function(done) { subscription.request = function(protoOpts, reqOpts, callback) { callback(); From 159a162af1c04781ca0c0d68932f68591d312107 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 31 Mar 2017 13:50:44 -0400 Subject: [PATCH 0057/1115] drop support for 0.12 (#2171) * all: drop support for 0.12 [ci skip] * scripts: add more modules to blacklist for now * update common deps for service modules --- handwritten/pubsub/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0436dcc85a5..6a2982d2f05 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,8 +50,8 @@ "pubsub" ], "dependencies": { - "@google-cloud/common": "^0.12.0", - "@google-cloud/common-grpc": "^0.2.1", + "@google-cloud/common": "^0.13.0", + "@google-cloud/common-grpc": "^0.3.0", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.12.2", @@ -73,6 +73,6 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=0.12.0" + "node": ">=4.0.0" } } From c526bb22a2833f4152d340332af6c6b886d1e46b Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 31 Mar 2017 14:59:04 -0400 Subject: [PATCH 0058/1115] pubsub @ 0.9.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6a2982d2f05..cbc495cda7a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.8.3", + "version": "0.9.0", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From d5ac9520af076a240df11844d3e750c3558b1568 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 10 Apr 2017 21:38:40 -0400 Subject: [PATCH 0059/1115] update deps --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cbc495cda7a..e3807d5fd04 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,8 +54,8 @@ "@google-cloud/common-grpc": "^0.3.0", "arrify": "^1.0.0", "extend": "^3.0.0", - "google-gax": "^0.12.2", - "google-proto-files": "^0.10.0", + "google-gax": "^0.13.0", + "google-proto-files": "^0.11.0", "is": "^3.0.1", "modelo": "^4.2.0", "propprop": "^0.3.0", From 3d01ecd11f0ed25614e1ac6ab957e6c3281810a0 Mon Sep 17 00:00:00 2001 From: Jan Pretzel Date: Tue, 11 Apr 2017 22:31:24 +0200 Subject: [PATCH 0060/1115] docs: messages published as JSON (#2212) --- handwritten/pubsub/src/topic.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index ab58d94f584..e5fe34c40d5 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -369,6 +369,9 @@ Topic.prototype.getSubscriptionsStream = function(options) { * box your message in to an object with a `data` and `attributes` property. * `data` will be the raw message value you want to publish, and * `attributes` is a key/value pair of attributes to apply to the message. + * All messages not provided as `Buffer` will be published in JSON format. + * If your receiving end uses another library, make sure it parses the + * message properly. * @param {object=} options - Configuration object. * @param {boolean} options.raw - Enable if you require setting attributes on * your messages. From 1772a0f4f071c7c1e1f49075d1ddb6d43874a222 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 13 Apr 2017 21:32:30 -0400 Subject: [PATCH 0061/1115] pubsub: add support for snapshots + seek (#2200) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/index.js | 152 +++++++++++++++- handwritten/pubsub/src/snapshot.js | 221 +++++++++++++++++++++++ handwritten/pubsub/src/subscription.js | 135 +++++++++++++- handwritten/pubsub/system-test/pubsub.js | 100 ++++++++++ handwritten/pubsub/test/index.js | 129 ++++++++++++- handwritten/pubsub/test/snapshot.js | 149 +++++++++++++++ handwritten/pubsub/test/subscription.js | 146 ++++++++++++++- 8 files changed, 1025 insertions(+), 9 deletions(-) create mode 100644 handwritten/pubsub/src/snapshot.js create mode 100644 handwritten/pubsub/test/snapshot.js diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e3807d5fd04..f983af61fa8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@google-cloud/common": "^0.13.0", - "@google-cloud/common-grpc": "^0.3.0", + "@google-cloud/common-grpc": "^0.3.1", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.13.0", diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 85db7e0e4f4..9c51a7af586 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -27,6 +27,12 @@ var extend = require('extend'); var is = require('is'); var util = require('util'); +/** + * @type {module:pubsub/snapshot} + * @private + */ +var Snapshot = require('./snapshot.js'); + /** * @type {module:pubsub/subscription} * @private @@ -136,6 +142,120 @@ PubSub.prototype.createTopic = function(name, callback) { }); }; +/** + * Get a list of snapshots. + * + * @param {object=} options - Configuration object. + * @param {boolean} options.autoPaginate - Have pagination handled + * automatically. Default: true. + * @param {number} options.maxApiCalls - Maximum number of API calls to make. + * @param {number} options.maxResults - Maximum number of results to return. + * @param {number} options.pageSize - Maximum number of results to return. + * @param {string} options.pageToken - Page token. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {module:pubsub/snapshot[]} callback.snapshots - The list of snapshots + * in your project. + * + * @example + * pubsub.getSnapshots(function(err, snapshots) { + * if (!err) { + * // snapshots is an array of Snapshot objects. + * } + * }); + * + * //- + * // To control how many API requests are made and page through the results + * // manually, set `autoPaginate` to `false`. + * //- + * var callback = function(err, snapshots, nextQuery, apiResponse) { + * if (nextQuery) { + * // More results exist. + * pubsub.getSnapshots(nextQuery, callback); + * } + * }; + * + * pubsub.getSnapshots({ + * autoPaginate: false + * }, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.getSnapshots().then(function(data) { + * var snapshots = data[0]; + * }); + */ +PubSub.prototype.getSnapshots = function(options, callback) { + var self = this; + + if (is.fn(options)) { + callback = options; + options = {}; + } + + var protoOpts = { + service: 'Subscriber', + method: 'listSnapshots' + }; + + var reqOpts = extend({}, options); + + reqOpts.project = 'projects/' + this.projectId; + + this.request(protoOpts, reqOpts, function(err, resp) { + if (err) { + callback(err, null, null, resp); + return; + } + + var snapshots = arrify(resp.snapshots).map(function(snapshot) { + var snapshotInstance = self.snapshot(snapshot.name); + snapshotInstance.metadata = snapshot; + return snapshotInstance; + }); + + var nextQuery = null; + + if (resp.nextPageToken) { + nextQuery = options; + nextQuery.pageToken = resp.nextPageToken; + } + + callback(null, snapshots, nextQuery, resp); + }); +}; + +/** + * Get a list of the {module:pubsub/snapshot} objects as a readable object + * stream. + * + * @param {object=} options - Configuration object. See + * {module:pubsub#getSnapshots} for a complete list of options. + * @return {stream} + * + * @example + * pubsub.getSnapshotsStream() + * .on('error', console.error) + * .on('data', function(snapshot) { + * // snapshot is a Snapshot object. + * }) + * .on('end', function() { + * // All snapshots retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * pubsub.getSnapshotsStream() + * .on('data', function(snapshot) { + * this.end(); + * }); + */ +PubSub.prototype.getSnapshotsStream = + common.paginator.streamify('getSnapshots'); + /** * Get a list of the subscriptions registered to all of your project's topics. * You may optionally provide a query object as the first argument to customize @@ -277,7 +397,7 @@ PubSub.prototype.getSubscriptions = function(options, callback) { * // unnecessary processing and API requests. * //- * pubsub.getSubscriptionsStream() - * .on('data', function(topic) { + * .on('data', function(subscription) { * this.end(); * }); */ @@ -540,6 +660,26 @@ PubSub.prototype.subscribe = function(topic, subName, options, callback) { }); }; +/** + * Create a Snapshot object. See {module:pubsub/subscription#createSnapshot} to + * create a snapshot. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name - The name of the snapshot. + * @return {module:pubsub/snapshot} + * + * @example + * var snapshot = pubsub.snapshot('my-snapshot'); + */ +PubSub.prototype.snapshot = function(name) { + if (!is.string(name)) { + throw new Error('You must supply a valid name for the snapshot.'); + } + + return new Snapshot(this, name); +}; + /** * Create a Subscription object. This command by itself will not run any API * requests. You will receive a {module:pubsub/subscription} object, @@ -589,7 +729,7 @@ PubSub.prototype.subscription = function(name, options) { }; /** - * Create a Topic object. See {module:pubsub/createTopic} to create a topic. + * Create a Topic object. See {module:pubsub#createTopic} to create a topic. * * @throws {Error} If a name is not provided. * @@ -637,7 +777,11 @@ PubSub.prototype.determineBaseUrl_ = function() { * * These methods can be auto-paginated. */ -common.paginator.extend(PubSub, ['getSubscriptions', 'getTopics']); +common.paginator.extend(PubSub, [ + 'getSnapshots', + 'getSubscriptions', + 'getTopics' +]); /*! Developer Documentation * @@ -645,7 +789,7 @@ common.paginator.extend(PubSub, ['getSubscriptions', 'getTopics']); * that a callback is omitted. */ common.util.promisifyAll(PubSub, { - exclude: ['subscription', 'topic'] + exclude: ['snapshot', 'subscription', 'topic'] }); PubSub.Subscription = Subscription; diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js new file mode 100644 index 00000000000..4a578191e49 --- /dev/null +++ b/handwritten/pubsub/src/snapshot.js @@ -0,0 +1,221 @@ +/*! + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/*! + * @module pubsub/snapshot + */ + +'use strict'; + +var commonGrpc = require('@google-cloud/common-grpc'); +var is = require('is'); +var util = require('util'); + +/** + * A Snapshot object will give you access to your Cloud Pub/Sub snapshot. + * + * Snapshots are sometimes retrieved when using various methods: + * + * - {module:pubsub#getSnapshots} + * - {module:pubsub#getSnapshotsStream} + * - {module:pubsub#snapshot} + * + * Snapshots may be created with: + * + * - {module:pubsub/subscription#createSnapshot} + * + * You can use snapshots to seek a subscription to a specific point in time. + * + * - {module:pubsub/subscription#seek} + * + * @alias module:pubsub/snapshot + * @constructor + * + * @example + * //- + * // From {module:pubsub#getSnapshots}: + * //- + * pubsub.getSnapshots(function(err, snapshots) { + * // `snapshots` is an array of Snapshot objects. + * }); + * + * //- + * // From {module:pubsub#getSnapshotsStream}: + * //- + * pubsub.getSnapshotsStream() + * .on('error', console.error) + * .on('data', function(snapshot) { + * // `snapshot` is a Snapshot object. + * }); + * + * //- + * // From {module:pubsub#snapshot}: + * //- + * var snapshot = pubsub.snapshot('my-snapshot'); + * // snapshot is a Snapshot object. + * + * //- + * // Create a snapshot with {module:pubsub/subscription#createSnapshot}: + * //- + * var subscription = pubsub.subscription('my-subscription'); + * + * subscription.createSnapshot('my-snapshot', function(err, snapshot) { + * if (!err) { + * // `snapshot` is a Snapshot object. + * } + * }); + * + * //- + * // Seek to your snapshot: + * //- + * var subscription = pubsub.subscription('my-subscription'); + * + * subscription.seek('my-snapshot', function(err) { + * if (err) { + * // Error handling omitted. + * } + * }); + */ +function Snapshot(parent, name) { + var projectId = parent.projectId; + + if (!projectId && parent.parent) { + projectId = parent.parent.projectId; + } + + this.name = Snapshot.formatName_(projectId, name); + + var methods = { + /** + * Delete the snapshot. + * + * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * snapshot.delete(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.delete().then(function(data) { + * var apiResponse = data[0]; + * }); + */ + delete: { + protoOpts: { + service: 'Subscriber', + method: 'deleteSnapshot' + }, + reqOpts: { + snapshot: this.name + } + } + }; + + var config = { + parent: parent, + id: this.name, + methods: methods + }; + + var isSubscription = is.fn(parent.createSnapshot); + + if (isSubscription) { + config.createMethod = parent.createSnapshot.bind(parent); + + /** + * Create a snapshot with the given name. + * + * **This is only available if you accessed this object through + * {module:pubsub/subscription#snapshot}.** + * + * @param {string} name - Name of the snapshot. + * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {module:pubsub/snapshot} callback.snapshot - The newly created + * snapshot. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * var subscription = pubsub.subscription('my-subscription'); + * var snapshot = subscription.snapshot('my-snapshot'); + * + * var callback = function(err, snapshot, apiResponse) { + * if (!err) { + * // The snapshot was created successfully. + * } + * }; + * + * snapshot.create('my-snapshot', callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.create('my-snapshot').then(function(data) { + * var snapshot = data[0]; + * var apiResponse = data[1]; + * }); + */ + methods.create = true; + + /** + * Seeks an existing subscription to the snapshot. + * + * **This is only available if you accessed this object through + * {module:pubsub/subscription#snapshot}.** + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * var subscription = pubsub.subscription('my-subscription'); + * var snapshot = subscription.snapshot('my-snapshot'); + * + * snapshot.seek(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.seek().then(function(data) { + * var apiResponse = data[0]; + * }); + */ + this.seek = parent.seek.bind(parent, name); + } + + commonGrpc.ServiceObject.call(this, config); +} + +util.inherits(Snapshot, commonGrpc.ServiceObject); + +/** + * Format the name of a snapshot. A snapshot's full name is in the format of + * projects/{projectId}/snapshots/{snapshotName} + * + * @private + */ +Snapshot.formatName_ = function(projectId, name) { + return 'projects/' + projectId + '/snapshots/' + name.split('/').pop(); +}; + +module.exports = Snapshot; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 7d8e40b3ee7..69b564b726a 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -35,6 +35,12 @@ var uuid = require('uuid'); */ var IAM = require('./iam.js'); +/** + * @type {module:pubsub/snapshot} + * @private + */ +var Snapshot = require('./snapshot.js'); + /** * @const {number} - The amount of time a subscription pull HTTP connection to * Pub/Sub stays open. @@ -472,6 +478,64 @@ Subscription.prototype.ack = function(ackIds, options, callback) { }); }; +/** + * Create a snapshot with the given name. + * + * @param {string} name - Name of the snapshot. + * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {module:pubsub/snapshot} callback.snapshot - The newly created + * snapshot. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * var callback = function(err, snapshot, apiResponse) { + * if (!err) { + * // The snapshot was created successfully. + * } + * }; + * + * subscription.createSnapshot('my-snapshot', callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.createSnapshot('my-snapshot').then(function(data) { + * var snapshot = data[0]; + * var apiResponse = data[1]; + * }); + */ +Subscription.prototype.createSnapshot = function(name, callback) { + var self = this; + + if (!is.string(name)) { + throw new Error('A name is required to create a snapshot.'); + } + + var protoOpts = { + service: 'Subscriber', + method: 'createSnapshot' + }; + + var reqOpts = { + name: Snapshot.formatName_(this.parent.projectId, name), + subscription: this.name + }; + + this.request(protoOpts, reqOpts, function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } + + var snapshot = self.snapshot(name); + snapshot.metadata = resp; + + callback(null, snapshot, resp); + }); +}; + /** * Add functionality on top of a message returned from the API, including the * ability to `ack` and `skip` the message. @@ -667,6 +731,57 @@ Subscription.prototype.pull = function(options, callback) { }); }; +/** + * Seeks an existing subscription to a point in time or a given snapshot. + * + * @param {string|date} snapshot - The point to seek to. This will accept the + * name of the snapshot or a Date object. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * var callback = function(err, resp) { + * if (!err) { + * // Seek was successful. + * } + * }; + * + * subscription.seek('my-snapshot', callback); + * + * //- + * // Alternatively, to specify a certain point in time, you can provide a Date + * // object. + * //- + * var date = new Date('October 21 2015'); + * + * subscription.seek(date, callback); + */ +Subscription.prototype.seek = function(snapshot, callback) { + var protoOpts = { + service: 'Subscriber', + method: 'seek' + }; + + var reqOpts = { + subscription: this.name + }; + + if (is.string(snapshot)) { + reqOpts.snapshot = Snapshot.formatName_(this.parent.projectId, snapshot); + } else if (is.date(snapshot)) { + reqOpts.time = { + seconds: Math.floor(snapshot.getTime() / 1000), + nanos: snapshot.getMilliseconds() * 1e6 + }; + } else { + throw new Error('Either a snapshot name or Date is needed to seek to.'); + } + + this.request(protoOpts, reqOpts, callback); +}; + /** * Modify the ack deadline for a specific message. This method is useful to * indicate that more time is needed to process a message by the subscriber, or @@ -715,6 +830,22 @@ Subscription.prototype.setAckDeadline = function(options, callback) { }); }; +/** + * Create a Snapshot object. See {module:pubsub/subscription#createSnapshot} to + * create a snapshot. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name - The name of the snapshot. + * @return {module:pubsub/snapshot} + * + * @example + * var snapshot = subscription.snapshot('my-snapshot'); + */ +Subscription.prototype.snapshot = function(name) { + return this.parent.snapshot.call(this, name); +}; + /** * Begin listening for events on the subscription. This method keeps track of * how many message listeners are assigned, and then removed, making sure @@ -827,6 +958,8 @@ Subscription.prototype.startPulling_ = function() { * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -common.util.promisifyAll(Subscription); +common.util.promisifyAll(Subscription, { + exclude: ['snapshot'] +}); module.exports = Subscription; diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 6bcaf82f227..ddc6ccdaa74 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -43,6 +43,10 @@ describe('pubsub', function() { TOPICS[2].name ]; + function generateSnapshotName() { + return 'test-snapshot-' + uuid.v4(); + } + function generateSubName() { return 'test-subscription-' + uuid.v4(); } @@ -471,4 +475,100 @@ describe('pubsub', function() { }); }); }); + + describe('Snapshot', function() { + var SNAPSHOT_NAME = generateSnapshotName(); + + var topic; + var subscription; + var snapshot; + + before(function(done) { + topic = pubsub.topic(TOPIC_NAMES[0]); + subscription = topic.subscription(generateSubName()); + snapshot = subscription.snapshot(SNAPSHOT_NAME); + subscription.create(done); + }); + + after(function() { + return pubsub.getSnapshots().then(function(data) { + return Promise.all(data[0].map(function(snapshot) { + return snapshot.delete(); + })); + }); + }); + + it('should create a snapshot', function(done) { + snapshot.create(done); + }); + + it('should get a list of snapshots', function(done) { + pubsub.getSnapshots(function(err, snapshots) { + assert.ifError(err); + assert.strictEqual(snapshots.length, 1); + assert.strictEqual(snapshots[0].name.split('/').pop(), SNAPSHOT_NAME); + done(); + }); + }); + + it('should get a list of snapshots as a stream', function(done) { + var snapshots = []; + + pubsub.getSnapshotsStream() + .on('error', done) + .on('data', function(snapshot) { + snapshots.push(snapshot); + }) + .on('end', function() { + assert.strictEqual(snapshots.length, 1); + assert.strictEqual(snapshots[0].name.split('/').pop(), SNAPSHOT_NAME); + done(); + }); + }); + + describe('seeking', function() { + var subscription; + var messageId; + + beforeEach(function() { + subscription = topic.subscription(); + + return subscription.create().then(function() { + return topic.publish('Hello, world!'); + }).then(function(data) { + messageId = data[0][0]; + }); + }); + + function checkMessage() { + return subscription.pull().then(function(data) { + var message = data[0][0]; + assert.strictEqual(message.id, messageId); + return message.ack(); + }); + } + + it('should seek to a snapshot', function() { + var snapshotName = generateSnapshotName(); + + return subscription.createSnapshot(snapshotName).then(function() { + return checkMessage(); + }).then(function() { + return subscription.seek(snapshotName); + }).then(function() { + return checkMessage(); + }); + }); + + it('should seek to a date', function() { + var date = new Date(); + + return checkMessage().then(function() { + return subscription.seek(date); + }).then(function() { + return checkMessage(); + }); + }); + }); + }); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index b6f822ebc28..c5ad67e6e8e 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -40,7 +40,7 @@ var fakeUtil = extend({}, util, { } promisified = true; - assert.deepEqual(options.exclude, ['subscription', 'topic']); + assert.deepEqual(options.exclude, ['snapshot', 'subscription', 'topic']); } }); @@ -48,6 +48,10 @@ function FakeGrpcService() { this.calledWith_ = arguments; } +function FakeSnapshot() { + this.calledWith_ = arguments; +} + var extended = false; var fakePaginator = { extend: function(Class, methods) { @@ -57,7 +61,12 @@ var fakePaginator = { methods = arrify(methods); assert.equal(Class.name, 'PubSub'); - assert.deepEqual(methods, ['getSubscriptions', 'getTopics']); + assert.deepEqual(methods, [ + 'getSnapshots', + 'getSubscriptions', + 'getTopics' + ]); + extended = true; }, streamify: function(methodName) { @@ -83,6 +92,7 @@ describe('PubSub', function() { '@google-cloud/common-grpc': { Service: FakeGrpcService }, + './snapshot.js': FakeSnapshot, './subscription.js': Subscription, './topic.js': Topic }); @@ -106,6 +116,7 @@ describe('PubSub', function() { }); it('should streamify the correct methods', function() { + assert.strictEqual(pubsub.getSnapshotsStream, 'getSnapshots'); assert.strictEqual(pubsub.getSubscriptionsStream, 'getSubscriptions'); assert.strictEqual(pubsub.getTopicsStream, 'getTopics'); }); @@ -247,6 +258,102 @@ describe('PubSub', function() { }); }); + describe('getSnapshots', function() { + var SNAPSHOT_NAME = 'fake-snapshot'; + var apiResponse = { snapshots: [{ name: SNAPSHOT_NAME }]}; + + beforeEach(function() { + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, apiResponse); + }; + }); + + it('should accept a query and a callback', function(done) { + pubsub.getSnapshots({}, done); + }); + + it('should accept just a callback', function(done) { + pubsub.getSnapshots(done); + }); + + it('should build the right request', function(done) { + var options = { a: 'b', c: 'd' }; + var originalOptions = extend({}, options); + var expectedOptions = extend({}, options, { + project: 'projects/' + pubsub.projectId + }); + + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'listSnapshots'); + assert.deepEqual(reqOpts, expectedOptions); + assert.deepEqual(options, originalOptions); + done(); + }; + + pubsub.getSnapshots(options, assert.ifError); + }); + + it('should return Snapshot instances with metadata', function(done) { + var snapshot = {}; + + pubsub.snapshot = function(name) { + assert.strictEqual(name, SNAPSHOT_NAME); + return snapshot; + }; + + pubsub.getSnapshots(function(err, snapshots) { + assert.ifError(err); + assert.strictEqual(snapshots[0], snapshot); + assert.strictEqual(snapshots[0].metadata, apiResponse.snapshots[0]); + done(); + }); + }); + + it('should return a query if more results exist', function() { + var token = 'next-page-token'; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, { nextPageToken: token }); + }; + + var query = { pageSize: 1 }; + + pubsub.getSnapshots(query, function(err, snapshots, nextQuery) { + assert.ifError(err); + assert.strictEqual(query.pageSize, nextQuery.pageSize); + assert.equal(query.pageToken, token); + }); + }); + + it('should pass error if api returns an error', function(done) { + var error = new Error('Error'); + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(error); + }; + + pubsub.getSnapshots(function(err) { + assert.equal(err, error); + done(); + }); + }); + + it('should pass apiResponse to callback', function(done) { + var resp = { success: true }; + + pubsub.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + + pubsub.getSnapshots(function(err, snapshots, nextQuery, apiResponse) { + assert.ifError(err); + assert.equal(resp, apiResponse); + done(); + }); + }); + }); + describe('getSubscriptions', function() { beforeEach(function() { pubsub.request = function(protoOpts, reqOpts, callback) { @@ -699,6 +806,24 @@ describe('PubSub', function() { }); }); + describe('snapshot', function() { + it('should throw if a name is not provided', function() { + assert.throws(function() { + pubsub.snapshot(); + }, /You must supply a valid name for the snapshot\./); + }); + + it('should return a Snapshot object', function() { + var SNAPSHOT_NAME = 'new-snapshot'; + var snapshot = pubsub.snapshot(SNAPSHOT_NAME); + var args = snapshot.calledWith_; + + assert(snapshot instanceof FakeSnapshot); + assert.strictEqual(args[0], pubsub); + assert.strictEqual(args[1], SNAPSHOT_NAME); + }); + }); + describe('subscription', function() { var SUB_NAME = 'new-sub-name'; var CONFIG = { autoAck: true, interval: 90 }; diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.js new file mode 100644 index 00000000000..d97f76a6559 --- /dev/null +++ b/handwritten/pubsub/test/snapshot.js @@ -0,0 +1,149 @@ +/** + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); +var proxyquire = require('proxyquire'); + +function FakeGrpcServiceObject() { + this.calledWith_ = arguments; +} + +describe('Snapshot', function() { + var Snapshot; + + var SNAPSHOT_NAME = 'a'; + var PROJECT_ID = 'grape-spaceship-123'; + + var PUBSUB = { + projectId: PROJECT_ID + }; + + var SUBSCRIPTION = { + parent: PUBSUB, + createSnapshot: function() {}, + seek: function() {} + }; + + before(function() { + Snapshot = proxyquire('../src/snapshot.js', { + '@google-cloud/common-grpc': { + ServiceObject: FakeGrpcServiceObject + } + }); + }); + + describe('initialization', function() { + var FULL_SNAPSHOT_NAME = 'a/b/c/d'; + var formatName_; + + before(function() { + formatName_ = Snapshot.formatName_; + Snapshot.formatName_ = function() { + return FULL_SNAPSHOT_NAME; + }; + }); + + after(function() { + Snapshot.formatName_ = formatName_; + }); + + describe('name', function() { + it('should create and cache the full name', function() { + Snapshot.formatName_ = function(projectId, name) { + assert.strictEqual(projectId, PROJECT_ID); + assert.strictEqual(name, SNAPSHOT_NAME); + return FULL_SNAPSHOT_NAME; + }; + + var snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); + assert.strictEqual(snapshot.name, FULL_SNAPSHOT_NAME); + }); + + it('should pull the projectId from subscription parent', function() { + Snapshot.formatName_ = function(projectId, name) { + assert.strictEqual(projectId, PROJECT_ID); + assert.strictEqual(name, SNAPSHOT_NAME); + return FULL_SNAPSHOT_NAME; + }; + + var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + assert.strictEqual(snapshot.name, FULL_SNAPSHOT_NAME); + }); + }); + + it('should inherit from GrpcServiceObject', function() { + var snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); + var calledWith = snapshot.calledWith_[0]; + + assert(snapshot instanceof FakeGrpcServiceObject); + assert.strictEqual(calledWith.parent, PUBSUB); + assert.strictEqual(calledWith.id, FULL_SNAPSHOT_NAME); + assert.deepEqual(calledWith.methods, { + delete: { + protoOpts: { + service: 'Subscriber', + method: 'deleteSnapshot' + }, + reqOpts: { + snapshot: FULL_SNAPSHOT_NAME + } + } + }); + }); + + describe('with Subscription parent', function() { + it('should include the create method', function(done) { + SUBSCRIPTION.createSnapshot = function(callback) { + callback(); // The done function + }; + + var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + var calledWith = snapshot.calledWith_[0]; + + assert(calledWith.methods.create); + calledWith.createMethod(done); + }); + + it('should create a seek method', function(done) { + SUBSCRIPTION.seek = function(name, callback) { + assert.strictEqual(name, SNAPSHOT_NAME); + callback(); // The done function + }; + + var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + snapshot.seek(done); + }); + }); + }); + + describe('formatName_', function() { + var EXPECTED = 'projects/' + PROJECT_ID + '/snapshots/' + SNAPSHOT_NAME; + + it('should format the name', function() { + var name = Snapshot.formatName_(PROJECT_ID, SNAPSHOT_NAME); + + assert.strictEqual(name, EXPECTED); + }); + + it('should not re-format the name', function() { + var name = Snapshot.formatName_(PROJECT_ID, EXPECTED); + + assert.strictEqual(name, EXPECTED); + }); + }); +}); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 4f365cc4342..b635e6be055 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -43,6 +43,10 @@ function FakeIAM() { this.calledWith_ = [].slice.call(arguments); } +function FakeSnapshot() { + this.calledWith_ = arguments; +} + var formatMessageOverride; describe('Subscription', function() { @@ -87,7 +91,8 @@ describe('Subscription', function() { '@google-cloud/common-grpc': { ServiceObject: FakeGrpcServiceObject }, - './iam.js': FakeIAM + './iam.js': FakeIAM, + './snapshot.js': FakeSnapshot }); var formatMessage = Subscription.formatMessage_; @@ -504,6 +509,80 @@ describe('Subscription', function() { }); }); + describe('createSnapshot', function() { + var SNAPSHOT_NAME = 'a'; + + it('should throw if a name is not provided', function() { + assert.throws(function() { + subscription.createSnapshot(); + }, /A name is required to create a snapshot\./); + }); + + it('should make the correct api request', function(done) { + var FULL_SNAPSHOT_NAME = 'a/b/c/d'; + + FakeSnapshot.formatName_ = function(projectId, name) { + assert.strictEqual(projectId, PROJECT_ID); + assert.strictEqual(name, SNAPSHOT_NAME); + return FULL_SNAPSHOT_NAME; + }; + + subscription.request = function(protoOpts, reqOpts) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'createSnapshot'); + + assert.strictEqual(reqOpts.name, FULL_SNAPSHOT_NAME); + assert.strictEqual(reqOpts.subscription, subscription.name); + + done(); + }; + + subscription.createSnapshot(SNAPSHOT_NAME, assert.ifError); + }); + + it('should return an error to the callback', function(done) { + var error = new Error('err'); + var resp = {}; + + subscription.request = function(protoOpts, reqOpts, callback) { + callback(error, resp); + }; + + function callback(err, snapshot, apiResponse) { + assert.strictEqual(err, error); + assert.strictEqual(snapshot, null); + assert.strictEqual(apiResponse, resp); + done(); + } + + subscription.createSnapshot(SNAPSHOT_NAME, callback); + }); + + it('should return a snapshot object to the callback', function(done) { + var fakeSnapshot = {}; + var resp = {}; + + subscription.request = function(protoOpts, reqOpts, callback) { + callback(null, resp); + }; + + subscription.snapshot = function(name) { + assert.strictEqual(name, SNAPSHOT_NAME); + return fakeSnapshot; + }; + + function callback(err, snapshot, apiResponse) { + assert.strictEqual(err, null); + assert.strictEqual(snapshot, fakeSnapshot); + assert.strictEqual(snapshot.metadata, resp); + assert.strictEqual(apiResponse, resp); + done(); + } + + subscription.createSnapshot(SNAPSHOT_NAME, callback); + }); + }); + describe('delete', function() { it('should delete a subscription', function(done) { subscription.request = function(protoOpts, reqOpts) { @@ -817,6 +896,55 @@ describe('Subscription', function() { }); }); + describe('seek', function() { + it('should throw if a name or date is not provided', function() { + assert.throws(function() { + subscription.seek(); + }, /Either a snapshot name or Date is needed to seek to\./); + }); + + it('should make the correct api request', function(done) { + var FAKE_SNAPSHOT_NAME = 'a'; + var FAKE_FULL_SNAPSHOT_NAME = 'a/b/c/d'; + + FakeSnapshot.formatName_ = function(projectId, name) { + assert.strictEqual(projectId, PROJECT_ID); + assert.strictEqual(name, FAKE_SNAPSHOT_NAME); + return FAKE_FULL_SNAPSHOT_NAME; + }; + + subscription.request = function(protoOpts, reqOpts, callback) { + assert.strictEqual(protoOpts.service, 'Subscriber'); + assert.strictEqual(protoOpts.method, 'seek'); + + assert.strictEqual(reqOpts.subscription, subscription.name); + assert.strictEqual(reqOpts.snapshot, FAKE_FULL_SNAPSHOT_NAME); + + // done function + callback(); + }; + + subscription.seek(FAKE_SNAPSHOT_NAME, done); + }); + + it('should optionally accept a Date object', function(done) { + var date = new Date(); + + subscription.request = function(protoOpts, reqOpts, callback) { + var seconds = Math.floor(date.getTime() / 1000); + assert.strictEqual(reqOpts.time.seconds, seconds); + + var nanos = date.getMilliseconds() * 1e6; + assert.strictEqual(reqOpts.time.nanos, nanos); + + // done function + callback(); + }; + + subscription.seek(date, done); + }); + }); + describe('setAckDeadline', function() { it('should set the ack deadline', function(done) { subscription.request = function(protoOpts, reqOpts) { @@ -854,6 +982,22 @@ describe('Subscription', function() { }); }); + describe('snapshot', function() { + it('should call through to pubsub#snapshot', function() { + var FAKE_SNAPSHOT_NAME = 'a'; + var FAKE_SNAPSHOT = {}; + + PUBSUB.snapshot = function(name) { + assert.strictEqual(this, subscription); + assert.strictEqual(name, FAKE_SNAPSHOT_NAME); + return FAKE_SNAPSHOT; + }; + + var snapshot = subscription.snapshot(FAKE_SNAPSHOT_NAME); + assert.strictEqual(snapshot, FAKE_SNAPSHOT); + }); + }); + describe('decorateMessage_', function() { var message = { ackId: 'b' From c89e02fb1c29613a3a71db6b9341d5a48abc383d Mon Sep 17 00:00:00 2001 From: Eric Uldall Date: Fri, 14 Apr 2017 09:19:55 -0700 Subject: [PATCH 0062/1115] updated FQDN's to googleapis.com with a trailing dot (#2214) --- handwritten/pubsub/src/index.js | 2 +- handwritten/pubsub/test/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 9c51a7af586..f226d325106 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -66,7 +66,7 @@ function PubSub(options) { return new PubSub(options); } - this.defaultBaseUrl_ = 'pubsub.googleapis.com'; + this.defaultBaseUrl_ = 'pubsub.googleapis.com.'; this.determineBaseUrl_(); var config = { diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index c5ad67e6e8e..6eabd31dd1c 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -149,7 +149,7 @@ describe('PubSub', function() { var calledWith = pubsub.calledWith_[0]; - var baseUrl = 'pubsub.googleapis.com'; + var baseUrl = 'pubsub.googleapis.com.'; assert.strictEqual(calledWith.baseUrl, baseUrl); assert.strictEqual(calledWith.service, 'pubsub'); assert.strictEqual(calledWith.apiVersion, 'v1'); @@ -161,7 +161,7 @@ describe('PubSub', function() { }); it('should set the defaultBaseUrl_', function() { - assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com'); + assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com.'); }); it('should use the PUBSUB_EMULATOR_HOST env var', function() { From d2d8b9034472f3a9c05483365326ab1473a696b5 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 14 Apr 2017 12:35:27 -0400 Subject: [PATCH 0063/1115] pubsub @ 0.10.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f983af61fa8..c693fd2ec71 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.9.0", + "version": "0.10.0", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From c5750a5e1254416e07509179ee9a82bef26abd79 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 20 Apr 2017 19:03:59 +0200 Subject: [PATCH 0064/1115] pubsub: add ability to pass timeout to publish (#2232) --- handwritten/pubsub/src/topic.js | 7 +++++++ handwritten/pubsub/test/topic.js | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index e5fe34c40d5..8bf664a0696 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -375,6 +375,8 @@ Topic.prototype.getSubscriptionsStream = function(options) { * @param {object=} options - Configuration object. * @param {boolean} options.raw - Enable if you require setting attributes on * your messages. + * @param {number} options.timeout - Set a maximum amount of time in + * milliseconds before giving up if no response is received. * @param {function=} callback - The callback function. * * @example @@ -435,6 +437,7 @@ Topic.prototype.getSubscriptionsStream = function(options) { * var messageIds = data[0]; * var apiResponse = data[1]; * }); + * */ Topic.prototype.publish = function(messages, options, callback) { messages = arrify(messages); @@ -456,6 +459,10 @@ Topic.prototype.publish = function(messages, options, callback) { method: 'publish', }; + if (is.number(options.timeout)) { + protoOpts.timeout = options.timeout; + } + var reqOpts = { topic: this.name, messages: messages diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 2a06c2ec2e7..5e432f3a021 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -254,6 +254,19 @@ describe('Topic', function() { topic.publish(message, assert.ifError); }); + it('should honor the timeout setting', function(done) { + var options = { + timeout: 10 + }; + + topic.request = function(protoOpts) { + assert.strictEqual(protoOpts.timeout, options.timeout); + done(); + }; + + topic.publish(message, options, assert.ifError); + }); + it('should send correct api request for raw message', function(done) { topic.request = function(protoOpts, reqOpts) { assert.deepEqual(reqOpts.messages, [ From 627b02d3d7ed674ab85cf43c2e407e596e8d60ed Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 21 Apr 2017 14:23:39 -0400 Subject: [PATCH 0065/1115] pubsub: borrow request config from GAX (#2242) * pubsub: borrow request config from GAX [ci skip] * tests * rm .only --- handwritten/pubsub/src/index.js | 37 +++++++- handwritten/pubsub/src/subscription.js | 14 +-- handwritten/pubsub/src/topic.js | 11 ++- handwritten/pubsub/test/index.js | 114 +++++++++++++++++++++++- handwritten/pubsub/test/subscription.js | 84 +++++++++-------- handwritten/pubsub/test/topic.js | 35 ++++---- 6 files changed, 216 insertions(+), 79 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index f226d325106..73184308460 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -45,6 +45,16 @@ var Subscription = require('./subscription.js'); */ var Topic = require('./topic.js'); +/** + * @type {object} - GAX's default configuration. + */ +var GAX_CONFIG = { + Publisher: require('./v1/publisher_client_config.json'). + interfaces['google.pubsub.v1.Publisher'], + Subscriber: require('./v1/subscriber_client_config.json'). + interfaces['google.pubsub.v1.Subscriber'] +}; + /** * [Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a * reliable, many-to-many, asynchronous messaging service from Cloud @@ -751,6 +761,24 @@ PubSub.prototype.topic = function(name) { return new Topic(this, name); }; +/** + * Intercept the call to {module:common/grpc-service#request}, making sure the + * correct timeouts are set. + * + * @private + */ +PubSub.prototype.request = function(protoOpts) { + var method = protoOpts.method; + var camelCaseMethod = method[0].toUpperCase() + method.substr(1); + var config = GAX_CONFIG[protoOpts.service].methods[camelCaseMethod]; + + if (is.undefined(arguments[0].timeout)) { + arguments[0].timeout = config.timeout_millis; + } + + commonGrpc.Service.prototype.request.apply(this, arguments); +}; + /** * Determine the appropriate endpoint to use for API requests, first trying the * local Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise @@ -775,7 +803,7 @@ PubSub.prototype.determineBaseUrl_ = function() { /*! Developer Documentation * - * These methods can be auto-paginated. + * These methods can be agto-paginated. */ common.paginator.extend(PubSub, [ 'getSnapshots', @@ -789,7 +817,12 @@ common.paginator.extend(PubSub, [ * that a callback is omitted. */ common.util.promisifyAll(PubSub, { - exclude: ['snapshot', 'subscription', 'topic'] + exclude: [ + 'request', + 'snapshot', + 'subscription', + 'topic' + ] }); PubSub.Subscription = Subscription; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 69b564b726a..6610e7ef814 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -465,7 +465,7 @@ Subscription.prototype.ack = function(ackIds, options, callback) { ackIds: ackIds }; - this.request(protoOpts, reqOpts, function(err, resp) { + this.parent.request(protoOpts, reqOpts, function(err, resp) { if (!err) { ackIds.forEach(function(ackId) { delete self.inProgressAckIds[ackId]; @@ -523,7 +523,7 @@ Subscription.prototype.createSnapshot = function(name, callback) { subscription: this.name }; - this.request(protoOpts, reqOpts, function(err, resp) { + this.parent.request(protoOpts, reqOpts, function(err, resp) { if (err) { callback(err, null, resp); return; @@ -601,7 +601,7 @@ Subscription.prototype.delete = function(callback) { subscription: this.name }; - this.request(protoOpts, reqOpts, function(err, resp) { + this.parent.request(protoOpts, reqOpts, function(err, resp) { if (err) { callback(err, resp); return; @@ -696,9 +696,11 @@ Subscription.prototype.pull = function(options, callback) { maxMessages: options.maxResults }; - this.activeRequest_ = this.request(protoOpts, reqOpts, function(err, resp) { + this.activeRequest_ = this.parent.request(protoOpts, reqOpts, function(err) { self.activeRequest_ = null; + var resp = arguments[1]; + if (err) { if (err.code === 504) { // Simulate a server timeout where no messages were received. @@ -779,7 +781,7 @@ Subscription.prototype.seek = function(snapshot, callback) { throw new Error('Either a snapshot name or Date is needed to seek to.'); } - this.request(protoOpts, reqOpts, callback); + this.parent.request(protoOpts, reqOpts, callback); }; /** @@ -825,7 +827,7 @@ Subscription.prototype.setAckDeadline = function(options, callback) { ackDeadlineSeconds: options.seconds }; - this.request(protoOpts, reqOpts, function(err, resp) { + this.parent.request(protoOpts, reqOpts, function(err, resp) { callback(err, resp); }); }; diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 8bf664a0696..1cd3dbed632 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -49,7 +49,6 @@ var IAM = require('./iam.js'); */ function Topic(pubsub, name) { this.name = Topic.formatName_(pubsub.projectId, name); - this.pubsub = pubsub; var methods = { /** @@ -319,7 +318,7 @@ Topic.prototype.getSubscriptions = function(options, callback) { options = options || {}; options.topic = this; - return this.pubsub.getSubscriptions(options, callback); + return this.parent.getSubscriptions(options, callback); }; /** @@ -353,7 +352,7 @@ Topic.prototype.getSubscriptionsStream = function(options) { options = options || {}; options.topic = this; - return this.pubsub.getSubscriptionsStream(options); + return this.parent.getSubscriptionsStream(options); }; /** @@ -475,7 +474,7 @@ Topic.prototype.publish = function(messages, options, callback) { .map(Topic.formatMessage_) }; - this.request(protoOpts, reqOpts, function(err, result) { + this.parent.request(protoOpts, reqOpts, function(err, result) { if (err) { callback(err, null, result); return; @@ -541,7 +540,7 @@ Topic.prototype.publish = function(messages, options, callback) { * }); */ Topic.prototype.subscribe = function(subName, options, callback) { - this.pubsub.subscribe(this, subName, options, callback); + this.parent.subscribe(this, subName, options, callback); }; /** @@ -574,7 +573,7 @@ Topic.prototype.subscription = function(name, options) { options = options || {}; options.topic = this; - return this.pubsub.subscription(name, options); + return this.parent.subscription(name, options); }; /*! Developer Documentation diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 6eabd31dd1c..e307ab652c4 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -40,7 +40,12 @@ var fakeUtil = extend({}, util, { } promisified = true; - assert.deepEqual(options.exclude, ['snapshot', 'subscription', 'topic']); + assert.deepEqual(options.exclude, [ + 'request', + 'snapshot', + 'subscription', + 'topic' + ]); } }); @@ -48,6 +53,11 @@ function FakeGrpcService() { this.calledWith_ = arguments; } +var grpcServiceRequestOverride; +FakeGrpcService.prototype.request = function() { + return (grpcServiceRequestOverride || util.noop).apply(this, arguments); +}; + function FakeSnapshot() { this.calledWith_ = arguments; } @@ -74,6 +84,22 @@ var fakePaginator = { } }; +var GAX_CONFIG_PUBLISHER_OVERRIDE = {}; +var GAX_CONFIG_SUBSCRIBER_OVERRIDE = {}; + +var GAX_CONFIG = { + Publisher: { + interfaces: { + 'google.pubsub.v1.Publisher': GAX_CONFIG_PUBLISHER_OVERRIDE + } + }, + Subscriber: { + interfaces: { + 'google.pubsub.v1.Subscriber': GAX_CONFIG_SUBSCRIBER_OVERRIDE + } + } +}; + describe('PubSub', function() { var PubSub; var PROJECT_ID = 'test-project'; @@ -94,7 +120,10 @@ describe('PubSub', function() { }, './snapshot.js': FakeSnapshot, './subscription.js': Subscription, - './topic.js': Topic + './topic.js': Topic, + + './v1/publisher_client_config.json': GAX_CONFIG.Publisher, + './v1/subscriber_client_config.json': GAX_CONFIG.Subscriber }); }); @@ -105,6 +134,7 @@ describe('PubSub', function() { }); beforeEach(function() { + grpcServiceRequestOverride = null; SubscriptionOverride = null; pubsub = new PubSub(OPTIONS); pubsub.projectId = PROJECT_ID; @@ -897,6 +927,86 @@ describe('PubSub', function() { }); }); + describe('request', function() { + var TIMEOUT = Math.random(); + + beforeEach(function() { + GAX_CONFIG_PUBLISHER_OVERRIDE.methods = { + MethodName: { + timeout_millis: TIMEOUT + } + }; + }); + + after(function() { + GAX_CONFIG_PUBLISHER_OVERRIDE.methods = {}; + }); + + it('should pass through the request', function(done) { + var args = [ + { + service: 'Publisher', + method: 'MethodName' + }, + { + value: true + }, + { + anotherValue: true + } + ]; + + grpcServiceRequestOverride = function() { + assert.strictEqual(this, pubsub); + assert.strictEqual(args[0], arguments[0]); + assert.strictEqual(args[1], arguments[1]); + assert.strictEqual(args[2], arguments[2]); + done(); + }; + + pubsub.request.apply(pubsub, args); + }); + + it('should assign a timeout', function(done) { + grpcServiceRequestOverride = function(protoOpts) { + assert.strictEqual(protoOpts.timeout, TIMEOUT); + done(); + }; + + pubsub.request({ + service: 'Publisher', + method: 'MethodName' + }); + }); + + it('should not override a timeout if set', function(done) { + var timeout = 0; + + grpcServiceRequestOverride = function(protoOpts) { + assert.strictEqual(protoOpts.timeout, timeout); + done(); + }; + + pubsub.request({ + service: 'Publisher', + method: 'MethodName', + timeout: timeout + }); + }); + + it('should camel case the method name', function(done) { + grpcServiceRequestOverride = function(protoOpts) { + assert.strictEqual(protoOpts.timeout, TIMEOUT); + done(); + }; + + pubsub.request({ + service: 'Publisher', + method: 'methodName' + }); + }); + }); + describe('determineBaseUrl_', function() { function setHost(host) { process.env.PUBSUB_EMULATOR_HOST = host; diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index b635e6be055..bb0f65b9b14 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -18,8 +18,6 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcServiceObject = require('@google-cloud/common-grpc').ServiceObject; -var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -34,11 +32,8 @@ var fakeUtil = extend({}, util, { function FakeGrpcServiceObject() { this.calledWith_ = arguments; - GrpcServiceObject.apply(this, arguments); } -nodeutil.inherits(FakeGrpcServiceObject, GrpcServiceObject); - function FakeIAM() { this.calledWith_ = [].slice.call(arguments); } @@ -103,6 +98,8 @@ describe('Subscription', function() { beforeEach(function() { subscription = new Subscription(PUBSUB, { name: SUB_NAME }); + PUBSUB.request = util.noop; + subscription.parent = PUBSUB; }); afterEach(function() { @@ -231,7 +228,7 @@ describe('Subscription', function() { }); it('should inherit from GrpcServiceObject', function() { - assert(subscription instanceof GrpcServiceObject); + assert(subscription instanceof FakeGrpcServiceObject); var calledWith = subscription.calledWith_[0]; @@ -269,7 +266,6 @@ describe('Subscription', function() { name: SUB_NAME, topic: topicInstance }); - assert(subscription instanceof GrpcServiceObject); var calledWith = subscription.calledWith_[0]; assert.deepEqual(calledWith.methods.create, true); @@ -377,14 +373,12 @@ describe('Subscription', function() { it('should accept a single id', function() { assert.doesNotThrow(function() { - subscription.request = util.noop; subscription.ack(1, util.noop); }); }); it('should accept an array of ids', function() { assert.doesNotThrow(function() { - subscription.request = util.noop; subscription.ack([1], util.noop); }); }); @@ -392,7 +386,7 @@ describe('Subscription', function() { it('should make an array out of ids', function(done) { var ID = 'abc'; - subscription.request = function(protoOpts, reqOpts) { + subscription.parent.request = function(protoOpts, reqOpts) { assert.deepEqual(reqOpts.ackIds, [ID]); done(); }; @@ -403,7 +397,7 @@ describe('Subscription', function() { it('should make correct api request', function(done) { var IDS = [1, 2, 3]; - subscription.request = function(protoOpts, reqOpts) { + subscription.parent.request = function(protoOpts, reqOpts) { assert.strictEqual(protoOpts.service, 'Subscriber'); assert.strictEqual(protoOpts.method, 'acknowledge'); @@ -421,7 +415,7 @@ describe('Subscription', function() { timeout: 10 }; - subscription.request = function(protoOpts) { + subscription.parent.request = function(protoOpts) { assert.strictEqual(protoOpts.timeout, options.timeout); done(); }; @@ -439,7 +433,7 @@ describe('Subscription', function() { }); it('should unmark the ack ids as being in progress', function(done) { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(); }; @@ -458,7 +452,7 @@ describe('Subscription', function() { }); it('should not unmark if there was an error', function(done) { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(new Error('Error.')); }; @@ -475,7 +469,7 @@ describe('Subscription', function() { }); it('should refresh paused status', function(done) { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(); }; @@ -487,7 +481,7 @@ describe('Subscription', function() { it('should pass error to callback', function(done) { var error = new Error('Error.'); - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(error); }; @@ -499,7 +493,7 @@ describe('Subscription', function() { it('should pass apiResponse to callback', function(done) { var resp = { success: true }; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(null, resp); }; subscription.ack(1, function(err, apiResponse) { @@ -527,7 +521,7 @@ describe('Subscription', function() { return FULL_SNAPSHOT_NAME; }; - subscription.request = function(protoOpts, reqOpts) { + subscription.parent.request = function(protoOpts, reqOpts) { assert.strictEqual(protoOpts.service, 'Subscriber'); assert.strictEqual(protoOpts.method, 'createSnapshot'); @@ -544,7 +538,7 @@ describe('Subscription', function() { var error = new Error('err'); var resp = {}; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(error, resp); }; @@ -562,7 +556,7 @@ describe('Subscription', function() { var fakeSnapshot = {}; var resp = {}; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(null, resp); }; @@ -585,7 +579,7 @@ describe('Subscription', function() { describe('delete', function() { it('should delete a subscription', function(done) { - subscription.request = function(protoOpts, reqOpts) { + subscription.parent.request = function(protoOpts, reqOpts) { assert.strictEqual(protoOpts.service, 'Subscriber'); assert.strictEqual(protoOpts.method, 'deleteSubscription'); @@ -598,7 +592,7 @@ describe('Subscription', function() { }); it('should close a subscription once deleted', function() { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(); }; subscription.closed = false; @@ -607,7 +601,7 @@ describe('Subscription', function() { }); it('should remove all listeners', function(done) { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(); }; subscription.removeAllListeners = function() { @@ -617,7 +611,7 @@ describe('Subscription', function() { }); it('should execute callback when deleted', function(done) { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(); }; subscription.delete(done); @@ -625,7 +619,7 @@ describe('Subscription', function() { it('should execute callback with an api error', function(done) { var error = new Error('Error.'); - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(error); }; subscription.delete(function(err) { @@ -636,7 +630,7 @@ describe('Subscription', function() { it('should execute callback with apiResponse', function(done) { var resp = { success: true }; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(null, resp); }; subscription.delete(function(err, apiResponse) { @@ -649,7 +643,7 @@ describe('Subscription', function() { describe('pull', function() { beforeEach(function() { subscription.ack = util.noop; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(null, messageObj); }; }); @@ -659,7 +653,7 @@ describe('Subscription', function() { }); it('should default returnImmediately to false', function(done) { - subscription.request = function(protoOpts, reqOpts) { + subscription.parent.request = function(protoOpts, reqOpts) { assert.strictEqual(reqOpts.returnImmediately, false); done(); }; @@ -667,7 +661,7 @@ describe('Subscription', function() { }); it('should honor options', function(done) { - subscription.request = function(protoOpts, reqOpts) { + subscription.parent.request = function(protoOpts, reqOpts) { assert.strictEqual(reqOpts.returnImmediately, true); done(); }; @@ -675,7 +669,7 @@ describe('Subscription', function() { }); it('should make correct api request', function(done) { - subscription.request = function(protoOpts, reqOpts) { + subscription.parent.request = function(protoOpts, reqOpts) { assert.strictEqual(protoOpts.service, 'Subscriber'); assert.strictEqual(protoOpts.method, 'pull'); assert.strictEqual(protoOpts.timeout, 92000); @@ -698,9 +692,11 @@ describe('Subscription', function() { timeout: timeout }); - subscription.request = function(protoOpts) { - assert.strictEqual(protoOpts.timeout, 30000); - done(); + subscription.parent = { + request: function(protoOpts) { + assert.strictEqual(protoOpts.timeout, 30000); + done(); + } }; subscription.pull(assert.ifError); @@ -709,7 +705,7 @@ describe('Subscription', function() { it('should store the active request', function() { var requestInstance = {}; - subscription.request = function() { + subscription.parent.request = function() { return requestInstance; }; @@ -720,7 +716,7 @@ describe('Subscription', function() { it('should clear the active request', function(done) { var requestInstance = {}; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { setImmediate(function() { callback(null, {}); assert.strictEqual(subscription.activeRequest_, null); @@ -735,7 +731,7 @@ describe('Subscription', function() { it('should pass error to callback', function(done) { var error = new Error('Error.'); - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(error); }; subscription.pull(function(err) { @@ -745,7 +741,7 @@ describe('Subscription', function() { }); it('should not return messages if request timed out', function(done) { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback({ code: 504 }); }; @@ -831,7 +827,7 @@ describe('Subscription', function() { }); it('should not autoAck if no messages returned', function(done) { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(null, { receivedMessages: [] }); }; subscription.ack = function() { @@ -884,7 +880,7 @@ describe('Subscription', function() { callback(null, { success: true }); }; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(null, resp); }; @@ -913,7 +909,7 @@ describe('Subscription', function() { return FAKE_FULL_SNAPSHOT_NAME; }; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { assert.strictEqual(protoOpts.service, 'Subscriber'); assert.strictEqual(protoOpts.method, 'seek'); @@ -930,7 +926,7 @@ describe('Subscription', function() { it('should optionally accept a Date object', function(done) { var date = new Date(); - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { var seconds = Math.floor(date.getTime() / 1000); assert.strictEqual(reqOpts.time.seconds, seconds); @@ -947,7 +943,7 @@ describe('Subscription', function() { describe('setAckDeadline', function() { it('should set the ack deadline', function(done) { - subscription.request = function(protoOpts, reqOpts) { + subscription.parent.request = function(protoOpts, reqOpts) { assert.strictEqual(protoOpts.service, 'Subscriber'); assert.strictEqual(protoOpts.method, 'modifyAckDeadline'); @@ -964,7 +960,7 @@ describe('Subscription', function() { }); it('should execute the callback', function(done) { - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(); }; subscription.setAckDeadline({}, done); @@ -972,7 +968,7 @@ describe('Subscription', function() { it('should execute the callback with apiResponse', function(done) { var resp = { success: true }; - subscription.request = function(protoOpts, reqOpts, callback) { + subscription.parent.request = function(protoOpts, reqOpts, callback) { callback(null, resp); }; subscription.setAckDeadline({}, function(err, apiResponse) { diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 5e432f3a021..48985c6353a 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -72,6 +72,7 @@ describe('Topic', function() { beforeEach(function() { topic = new Topic(PUBSUB, TOPIC_NAME); + topic.parent = PUBSUB; }); describe('initialization', function() { @@ -128,10 +129,6 @@ describe('Topic', function() { }; new Topic(PUBSUB, TOPIC_NAME); }); - - it('should assign pubsub object to `this`', function() { - assert.deepEqual(topic.pubsub, PUBSUB); - }); }); describe('formatMessage_', function() { @@ -170,7 +167,7 @@ describe('Topic', function() { describe('getSubscriptions', function() { it('should accept just a callback', function(done) { - topic.pubsub.getSubscriptions = function(options, callback) { + topic.parent.getSubscriptions = function(options, callback) { assert.deepEqual(options, { topic: topic }); callback(); }; @@ -181,7 +178,7 @@ describe('Topic', function() { it('should pass correct args to pubsub#getSubscriptions', function(done) { var opts = { a: 'b', c: 'd' }; - topic.pubsub = { + topic.parent = { getSubscriptions: function(options, callback) { assert.deepEqual(options, opts); assert.deepEqual(options.topic, topic); @@ -197,7 +194,7 @@ describe('Topic', function() { it('should return a stream', function(done) { var fakeStream = {}; - topic.pubsub.getSubscriptionsStream = function(options) { + topic.parent.getSubscriptionsStream = function(options) { assert.deepEqual(options, { topic: topic }); setImmediate(done); return fakeStream; @@ -210,7 +207,7 @@ describe('Topic', function() { it('should pass correct args to getSubscriptionsStream', function(done) { var opts = { a: 'b', c: 'd' }; - topic.pubsub = { + topic.parent = { getSubscriptionsStream: function(options) { assert.deepEqual(options, opts); assert.deepEqual(options.topic, topic); @@ -239,7 +236,7 @@ describe('Topic', function() { }); it('should send correct api request', function(done) { - topic.request = function(protoOpts, reqOpts) { + topic.parent.request = function(protoOpts, reqOpts) { assert.strictEqual(protoOpts.service, 'Publisher'); assert.strictEqual(protoOpts.method, 'publish'); @@ -259,7 +256,7 @@ describe('Topic', function() { timeout: 10 }; - topic.request = function(protoOpts) { + topic.parent.request = function(protoOpts) { assert.strictEqual(protoOpts.timeout, options.timeout); done(); }; @@ -268,7 +265,7 @@ describe('Topic', function() { }); it('should send correct api request for raw message', function(done) { - topic.request = function(protoOpts, reqOpts) { + topic.parent.request = function(protoOpts, reqOpts) { assert.deepEqual(reqOpts.messages, [ { data: new Buffer(JSON.stringify(message)).toString('base64'), @@ -291,7 +288,7 @@ describe('Topic', function() { }; var originalMessage = extend({}, message); - topic.request = function() { + topic.parent.request = function() { assert.deepEqual(message, originalMessage); done(); }; @@ -300,7 +297,7 @@ describe('Topic', function() { }); it('should execute callback', function(done) { - topic.request = function(protoOpts, reqOpts, callback) { + topic.parent.request = function(protoOpts, reqOpts, callback) { callback(null, {}); }; @@ -311,7 +308,7 @@ describe('Topic', function() { var error = new Error('Error.'); var apiResponse = {}; - topic.request = function(protoOpts, reqOpts, callback) { + topic.parent.request = function(protoOpts, reqOpts, callback) { callback(error, apiResponse); }; @@ -327,7 +324,7 @@ describe('Topic', function() { it('should execute callback with apiResponse', function(done) { var resp = { success: true }; - topic.request = function(protoOpts, reqOpts, callback) { + topic.parent.request = function(protoOpts, reqOpts, callback) { callback(null, resp); }; @@ -343,7 +340,7 @@ describe('Topic', function() { var subscriptionName = 'subName'; var opts = {}; - topic.pubsub.subscribe = function(t, subName, options, callback) { + topic.parent.subscribe = function(t, subName, options, callback) { assert.deepEqual(t, topic); assert.equal(subName, subscriptionName); assert.deepEqual(options, opts); @@ -359,7 +356,7 @@ describe('Topic', function() { var subscriptionName = 'subName'; var opts = {}; - topic.pubsub.subscription = function(name, options) { + topic.parent.subscription = function(name, options) { assert.equal(name, subscriptionName); assert.deepEqual(options, opts); done(); @@ -369,7 +366,7 @@ describe('Topic', function() { }); it('should attach the topic instance to the options', function(done) { - topic.pubsub.subscription = function(name, options) { + topic.parent.subscription = function(name, options) { assert.strictEqual(options.topic, topic); done(); }; @@ -378,7 +375,7 @@ describe('Topic', function() { }); it('should return the result', function(done) { - topic.pubsub.subscription = function() { + topic.parent.subscription = function() { return done; }; From 035aa8afc19ccdf49c00430d26aadda958d628fc Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 21 Apr 2017 14:33:47 -0400 Subject: [PATCH 0066/1115] pubsub @ 0.11.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c693fd2ec71..aa5909b99a1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.10.0", + "version": "0.11.0", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 59761e8782d394c5eea2b249bd19253022c2f077 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Fri, 21 Apr 2017 15:32:05 -0400 Subject: [PATCH 0067/1115] pubsub: mark GAX_CONFIG as private --- handwritten/pubsub/src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 73184308460..dba840bf75d 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -47,6 +47,7 @@ var Topic = require('./topic.js'); /** * @type {object} - GAX's default configuration. + * @private */ var GAX_CONFIG = { Publisher: require('./v1/publisher_client_config.json'). From d632f7a3504cf9398e769c7c1319fa60c81ef1fd Mon Sep 17 00:00:00 2001 From: David Fox Date: Tue, 25 Apr 2017 15:56:37 -0500 Subject: [PATCH 0068/1115] Prevent decoding and then re-encoding to base64 (#2256) --- handwritten/pubsub/src/subscription.js | 15 ++++++++++----- handwritten/pubsub/test/subscription.js | 11 +++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 6610e7ef814..91847efe974 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -347,7 +347,7 @@ modelo.inherits(Subscription, commonGrpc.ServiceObject, events.EventEmitter); * * @private */ -Subscription.formatMessage_ = function(msg, encoding) { +Subscription.formatMessage_ = function(msg, enc) { var innerMessage = msg.message; var message = { ackId: msg.ackId @@ -357,11 +357,16 @@ Subscription.formatMessage_ = function(msg, encoding) { message.id = innerMessage.messageId; if (innerMessage.data) { - message.data = new Buffer(innerMessage.data, 'base64').toString(encoding); + if (enc === 'base64') { + // Prevent decoding and then re-encoding to base64. + message.data = innerMessage.data; + } else { + message.data = Buffer.from(innerMessage.data, 'base64').toString(enc); - try { - message.data = JSON.parse(message.data); - } catch(e) {} + try { + message.data = JSON.parse(message.data); + } catch(e) {} + } } if (innerMessage.attributes) { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index bb0f65b9b14..a84bc9b9c2d 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -77,6 +77,11 @@ describe('Subscription', function() { data: messageBinary, id: 7 }; + var expectedMessageAsBase64 = { + ackId: 'abc', + data: messageBuffer, + id: 7 + }; before(function() { Subscription = proxyquire('../src/subscription.js', { @@ -342,6 +347,12 @@ describe('Subscription', function() { assert.deepEqual(msg, expectedMessage); }); + it('should decode buffer to base64', function() { + var msg = Subscription + .formatMessage_(messageObj.receivedMessages[0], 'base64'); + assert.deepEqual(msg, expectedMessageAsBase64); + }); + it('should decode buffer to specified encoding', function() { var msg = Subscription .formatMessage_(messageObj.receivedMessages[0], 'binary'); From 00040c5a412abd67765cced3a323c330690fc9f9 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 1 May 2017 09:55:06 -0400 Subject: [PATCH 0069/1115] pubsub: implement message retention (#2240) * pubsub: implement message retention * pubsub: fix test * extend boundaries for test * correctly specify duration * lint --- handwritten/pubsub/src/index.js | 15 ++++++++++++++ handwritten/pubsub/src/topic.js | 6 ++++++ handwritten/pubsub/system-test/pubsub.js | 26 ++++++++++++++++++++++++ handwritten/pubsub/test/index.js | 24 ++++++++++++++++++++++ 4 files changed, 71 insertions(+) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index dba840bf75d..0a3e32caeca 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -564,8 +564,14 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); * messages. (default: 10) * @param {number} options.maxInProgress - Maximum messages to consume * simultaneously. + * @param {number|date} options.messageRetentionDuration - Set this to override + * the default duration of 7 days. This value is expected in seconds. + * Acceptable values are in the range of 10 minutes and 7 days. * @param {string} options.pushEndpoint - A URL to a custom endpoint that * messages should be pushed to. + * @param {boolean} options.retainAckedMessages - If set, acked messages are + * retained in the subscription's backlog for 7 days (unless overriden by + * `options.messageRetentionDuration`). Default: `false` * @param {number} options.timeout - Set a maximum amount of time in * milliseconds on an HTTP request to pull new messages to wait for a * response before the connection is broken. @@ -648,6 +654,15 @@ PubSub.prototype.subscribe = function(topic, subName, options, callback) { name: subscription.name }); + if (reqOpts.messageRetentionDuration) { + reqOpts.retainAckedMessages = true; + + reqOpts.messageRetentionDuration = { + seconds: reqOpts.messageRetentionDuration, + nanos: 0 + }; + } + if (reqOpts.pushEndpoint) { reqOpts.pushConfig = { pushEndpoint: reqOpts.pushEndpoint diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 1cd3dbed632..812a6ce92bf 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -505,8 +505,14 @@ Topic.prototype.publish = function(messages, options, callback) { * messages. (default: 10) * @param {number} options.maxInProgress - Maximum messages to consume * simultaneously. + * @param {number|date} options.messageRetentionDuration - Set this to override + * the default duration of 7 days. This value is expected in seconds. + * Acceptable values are in the range of 10 minutes and 7 days. * @param {string} options.pushEndpoint - A URL to a custom endpoint that * messages should be pushed to. + * @param {boolean} options.retainAckedMessages - If set, acked messages are + * retained in the subscription's backlog for 7 days (unless overriden by + * `options.messageRetentionDuration`). Default: `false` * @param {number} options.timeout - Set a maximum amount of time in * milliseconds on an HTTP request to pull new messages to wait for a * response before the connection is broken. diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index ddc6ccdaa74..01e0966516c 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -313,6 +313,32 @@ describe('pubsub', function() { }); }); + it('should create a subscription with message retention', function(done) { + var threeDaysInSeconds = 3 * 24 * 60 * 60; + + topic.subscribe({ + messageRetentionDuration: threeDaysInSeconds + }, function(err, sub) { + assert.ifError(err); + + sub.getMetadata(function(err, metadata) { + assert.ifError(err); + + assert.strictEqual(metadata.retainAckedMessages, true); + assert.strictEqual( + parseInt(metadata.messageRetentionDuration.seconds, 10), + threeDaysInSeconds + ); + assert.strictEqual( + parseInt(metadata.messageRetentionDuration.nanos, 10), + 0 + ); + + sub.delete(done); + }); + }); + }); + it('should re-use an existing subscription', function(done) { pubsub.subscribe(topic, SUB_NAMES[0], done); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index e307ab652c4..e05fe603032 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -723,6 +723,7 @@ describe('PubSub', function() { encoding: 'utf-8', interval: 3, maxInProgress: 5, + retainAckedMessages: true, pushEndpoint: 'https://domain/push', timeout: 30000 }; @@ -764,6 +765,29 @@ describe('PubSub', function() { pubsub.subscribe(TOPIC_NAME, SUB_NAME, options, assert.ifError); }); + describe('message retention', function() { + it('should accept a number', function(done) { + var threeDaysInSeconds = 3 * 24 * 60 * 60; + + pubsub.request = function(protoOpts, reqOpts) { + assert.strictEqual(reqOpts.retainAckedMessages, true); + + assert.strictEqual( + reqOpts.messageRetentionDuration.seconds, + threeDaysInSeconds + ); + + assert.strictEqual(reqOpts.messageRetentionDuration.nanos, 0); + + done(); + }; + + pubsub.subscribe(TOPIC_NAME, SUB_NAME, { + messageRetentionDuration: threeDaysInSeconds + }, assert.ifError); + }); + }); + describe('error', function() { var error = new Error('Error.'); var apiResponse = { name: SUB_NAME }; From e19991d934ac8274d719a5bd27b8245d48f47262 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 9 May 2017 11:25:42 -0400 Subject: [PATCH 0070/1115] Revert "updated FQDN's to googleapis.com with a trailing dot (#2214)" (#2283) This reverts commit 13d4ed52402bfb4394aea505b4bab8e6caace989. --- handwritten/pubsub/src/index.js | 2 +- handwritten/pubsub/test/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 0a3e32caeca..a5b3d529ad5 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -77,7 +77,7 @@ function PubSub(options) { return new PubSub(options); } - this.defaultBaseUrl_ = 'pubsub.googleapis.com.'; + this.defaultBaseUrl_ = 'pubsub.googleapis.com'; this.determineBaseUrl_(); var config = { diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index e05fe603032..96197677c03 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -179,7 +179,7 @@ describe('PubSub', function() { var calledWith = pubsub.calledWith_[0]; - var baseUrl = 'pubsub.googleapis.com.'; + var baseUrl = 'pubsub.googleapis.com'; assert.strictEqual(calledWith.baseUrl, baseUrl); assert.strictEqual(calledWith.service, 'pubsub'); assert.strictEqual(calledWith.apiVersion, 'v1'); @@ -191,7 +191,7 @@ describe('PubSub', function() { }); it('should set the defaultBaseUrl_', function() { - assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com.'); + assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com'); }); it('should use the PUBSUB_EMULATOR_HOST env var', function() { From 3d10769006661cf8209bd89cd292d0388ece67e2 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Sat, 13 May 2017 15:18:21 -0400 Subject: [PATCH 0071/1115] pubsub @ 0.12.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index aa5909b99a1..46ad2dc9701 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.11.0", + "version": "0.12.0", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 0824921fc9c736b9ca31501459d76042271bb27b Mon Sep 17 00:00:00 2001 From: mkamioner Date: Thu, 25 May 2017 14:53:30 +0300 Subject: [PATCH 0072/1115] Allow for custom host with pubsub (#2330) --- handwritten/pubsub/src/index.js | 16 +++++++++------- handwritten/pubsub/test/index.js | 11 +++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index a5b3d529ad5..4185bd757b9 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -61,7 +61,8 @@ var GAX_CONFIG = { * reliable, many-to-many, asynchronous messaging service from Cloud * Platform. * - * The `PUBSUB_EMULATOR_HOST` environment variable from the gcloud SDK is + * The `apiEndpoint` from options will set the host. If not set, the + * `PUBSUB_EMULATOR_HOST` environment variable from the gcloud SDK is * honored, otherwise the actual API endpoint will be used. * * @constructor @@ -78,7 +79,7 @@ function PubSub(options) { } this.defaultBaseUrl_ = 'pubsub.googleapis.com'; - this.determineBaseUrl_(); + this.determineBaseUrl_(options.apiEndpoint); var config = { baseUrl: this.baseUrl_, @@ -797,19 +798,20 @@ PubSub.prototype.request = function(protoOpts) { /** * Determine the appropriate endpoint to use for API requests, first trying the - * local Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise - * the default JSON API. + * local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null we try + * Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise the + * default JSON API. * * @private */ -PubSub.prototype.determineBaseUrl_ = function() { +PubSub.prototype.determineBaseUrl_ = function(apiEndpoint) { var baseUrl = this.defaultBaseUrl_; var leadingProtocol = new RegExp('^https*://'); var trailingSlashes = new RegExp('/*$'); - if (process.env.PUBSUB_EMULATOR_HOST) { + if (apiEndpoint || process.env.PUBSUB_EMULATOR_HOST) { this.customEndpoint_ = true; - baseUrl = process.env.PUBSUB_EMULATOR_HOST; + baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; } this.baseUrl_ = baseUrl diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 96197677c03..13a6d9fa58e 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -1040,6 +1040,17 @@ describe('PubSub', function() { delete process.env.PUBSUB_EMULATOR_HOST; }); + it('should set base url to parameter sent', function() { + var defaultBaseUrl_ = 'defaulturl'; + var testingUrl = 'localhost:8085'; + + setHost(defaultBaseUrl_); + pubsub.defaultBaseUrl_ = defaultBaseUrl_; + + pubsub.determineBaseUrl_(testingUrl); + assert.strictEqual(pubsub.baseUrl_, testingUrl); + }); + it('should default to defaultBaseUrl_', function() { var defaultBaseUrl_ = 'defaulturl'; pubsub.defaultBaseUrl_ = defaultBaseUrl_; From 0c61a2fdece5be68272db31508afa9f42e0dcb1a Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Sun, 4 Jun 2017 14:48:28 -0400 Subject: [PATCH 0073/1115] update deps --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 46ad2dc9701..d0a2a59023a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -55,7 +55,7 @@ "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.13.0", - "google-proto-files": "^0.11.0", + "google-proto-files": "^0.12.0", "is": "^3.0.1", "modelo": "^4.2.0", "propprop": "^0.3.0", From f851599362935a29d607369892f2081d1a2ca21c Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Sun, 4 Jun 2017 14:53:36 -0400 Subject: [PATCH 0074/1115] pubsub @ 0.13.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d0a2a59023a..28fb2a6cedf 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.12.0", + "version": "0.13.0", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 7a1ba367ba91409d143c7d44691a25acce21f941 Mon Sep 17 00:00:00 2001 From: Song Wang Date: Thu, 15 Jun 2017 09:58:13 -0700 Subject: [PATCH 0075/1115] update gapic retry config (#2390) --- .../pubsub/src/v1/publisher_client_config.json | 5 +++++ .../pubsub/src/v1/subscriber_client_config.json | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index d576c1b62d9..905e790b218 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -7,7 +7,12 @@ "UNAVAILABLE" ], "one_plus_delivery": [ + "CANCELLED", + "UNKNOWN", "DEADLINE_EXCEEDED", + "RESOURCE_EXHAUSTED", + "ABORTED", + "INTERNAL", "UNAVAILABLE" ], "non_idempotent": [] diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 7b2299e951b..2c8efffba81 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -6,7 +6,14 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [] + "non_idempotent": [], + "pull": [ + "CANCELLED", + "DEADLINE_EXCEEDED", + "RESOURCE_EXHAUSTED", + "INTERNAL", + "UNAVAILABLE" + ] }, "retry_params": { "default": { @@ -66,12 +73,12 @@ }, "Pull": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "pull", "retry_params_name": "messaging" }, "StreamingPull": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "pull", "retry_params_name": "messaging" }, "ModifyPushConfig": { From dc08274848f65521f3cb1a1e3d4c161a97a250ea Mon Sep 17 00:00:00 2001 From: Song Wang Date: Fri, 30 Jun 2017 06:00:51 -0700 Subject: [PATCH 0076/1115] Add dummy js files for gapic-based logging, pubsub and spanner (#2423) --- .../v1/doc/doc_google_protobuf_duration.js | 84 ++ .../v1/doc/doc_google_protobuf_field_mask.js | 230 ++++++ .../v1/doc/doc_google_protobuf_timestamp.js | 88 ++ handwritten/pubsub/src/v1/doc/doc_pubsub.js | 757 ++++++++++++++++++ 4 files changed, 1159 insertions(+) create mode 100644 handwritten/pubsub/src/v1/doc/doc_google_protobuf_duration.js create mode 100644 handwritten/pubsub/src/v1/doc/doc_google_protobuf_field_mask.js create mode 100644 handwritten/pubsub/src/v1/doc/doc_google_protobuf_timestamp.js create mode 100644 handwritten/pubsub/src/v1/doc/doc_pubsub.js diff --git a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_duration.js b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_duration.js new file mode 100644 index 00000000000..b81fd71f130 --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_duration.js @@ -0,0 +1,84 @@ +/* + * Copyright 2017, Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Note: this file is purely for documentation. Any contents are not expected + * to be loaded as the JS file. + */ + +/** + * A Duration represents a signed, fixed-length span of time represented + * as a count of seconds and fractions of seconds at nanosecond + * resolution. It is independent of any calendar and concepts like "day" + * or "month". It is related to Timestamp in that the difference between + * two Timestamp values is a Duration and it can be added or subtracted + * from a Timestamp. Range is approximately +-10,000 years. + * + * Example 1: Compute Duration from two Timestamps in pseudo code. + * + * Timestamp start = ...; + * Timestamp end = ...; + * Duration duration = ...; + * + * duration.seconds = end.seconds - start.seconds; + * duration.nanos = end.nanos - start.nanos; + * + * if (duration.seconds < 0 && duration.nanos > 0) { + * duration.seconds += 1; + * duration.nanos -= 1000000000; + * } else if (durations.seconds > 0 && duration.nanos < 0) { + * duration.seconds -= 1; + * duration.nanos += 1000000000; + * } + * + * Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. + * + * Timestamp start = ...; + * Duration duration = ...; + * Timestamp end = ...; + * + * end.seconds = start.seconds + duration.seconds; + * end.nanos = start.nanos + duration.nanos; + * + * if (end.nanos < 0) { + * end.seconds -= 1; + * end.nanos += 1000000000; + * } else if (end.nanos >= 1000000000) { + * end.seconds += 1; + * end.nanos -= 1000000000; + * } + * + * Example 3: Compute Duration from datetime.timedelta in Python. + * + * td = datetime.timedelta(days=3, minutes=10) + * duration = Duration() + * duration.FromTimedelta(td) + * + * @external "google.protobuf.Duration" + * @property {number} seconds + * Signed seconds of the span of time. Must be from -315,576,000,000 + * to +315,576,000,000 inclusive. + * + * @property {number} nanos + * Signed fractions of a second at nanosecond resolution of the span + * of time. Durations less than one second are represented with a 0 + * `seconds` field and a positive or negative `nanos` field. For durations + * of one second or more, a non-zero value for the `nanos` field must be + * of the same sign as the `seconds` field. Must be from -999,999,999 + * to +999,999,999 inclusive. + * + * @see [google.protobuf.Duration definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/duration.proto} + */ \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_field_mask.js b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_field_mask.js new file mode 100644 index 00000000000..db0cea463fe --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_field_mask.js @@ -0,0 +1,230 @@ +/* + * Copyright 2017, Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Note: this file is purely for documentation. Any contents are not expected + * to be loaded as the JS file. + */ + +/** + * `FieldMask` represents a set of symbolic field paths, for example: + * + * paths: "f.a" + * paths: "f.b.d" + * + * Here `f` represents a field in some root message, `a` and `b` + * fields in the message found in `f`, and `d` a field found in the + * message in `f.b`. + * + * Field masks are used to specify a subset of fields that should be + * returned by a get operation or modified by an update operation. + * Field masks also have a custom JSON encoding (see below). + * + * # Field Masks in Projections + * + * When used in the context of a projection, a response message or + * sub-message is filtered by the API to only contain those fields as + * specified in the mask. For example, if the mask in the previous + * example is applied to a response message as follows: + * + * f { + * a : 22 + * b { + * d : 1 + * x : 2 + * } + * y : 13 + * } + * z: 8 + * + * The result will not contain specific values for fields x,y and z + * (their value will be set to the default, and omitted in proto text + * output): + * + * + * f { + * a : 22 + * b { + * d : 1 + * } + * } + * + * A repeated field is not allowed except at the last position of a + * paths string. + * + * If a FieldMask object is not present in a get operation, the + * operation applies to all fields (as if a FieldMask of all fields + * had been specified). + * + * Note that a field mask does not necessarily apply to the + * top-level response message. In case of a REST get operation, the + * field mask applies directly to the response, but in case of a REST + * list operation, the mask instead applies to each individual message + * in the returned resource list. In case of a REST custom method, + * other definitions may be used. Where the mask applies will be + * clearly documented together with its declaration in the API. In + * any case, the effect on the returned resource/resources is required + * behavior for APIs. + * + * # Field Masks in Update Operations + * + * A field mask in update operations specifies which fields of the + * targeted resource are going to be updated. The API is required + * to only change the values of the fields as specified in the mask + * and leave the others untouched. If a resource is passed in to + * describe the updated values, the API ignores the values of all + * fields not covered by the mask. + * + * If a repeated field is specified for an update operation, the existing + * repeated values in the target resource will be overwritten by the new values. + * Note that a repeated field is only allowed in the last position of a `paths` + * string. + * + * If a sub-message is specified in the last position of the field mask for an + * update operation, then the existing sub-message in the target resource is + * overwritten. Given the target message: + * + * f { + * b { + * d : 1 + * x : 2 + * } + * c : 1 + * } + * + * And an update message: + * + * f { + * b { + * d : 10 + * } + * } + * + * then if the field mask is: + * + * paths: "f.b" + * + * then the result will be: + * + * f { + * b { + * d : 10 + * } + * c : 1 + * } + * + * However, if the update mask was: + * + * paths: "f.b.d" + * + * then the result would be: + * + * f { + * b { + * d : 10 + * x : 2 + * } + * c : 1 + * } + * + * In order to reset a field's value to the default, the field must + * be in the mask and set to the default value in the provided resource. + * Hence, in order to reset all fields of a resource, provide a default + * instance of the resource and set all fields in the mask, or do + * not provide a mask as described below. + * + * If a field mask is not present on update, the operation applies to + * all fields (as if a field mask of all fields has been specified). + * Note that in the presence of schema evolution, this may mean that + * fields the client does not know and has therefore not filled into + * the request will be reset to their default. If this is unwanted + * behavior, a specific service may require a client to always specify + * a field mask, producing an error if not. + * + * As with get operations, the location of the resource which + * describes the updated values in the request message depends on the + * operation kind. In any case, the effect of the field mask is + * required to be honored by the API. + * + * ## Considerations for HTTP REST + * + * The HTTP kind of an update operation which uses a field mask must + * be set to PATCH instead of PUT in order to satisfy HTTP semantics + * (PUT must only be used for full updates). + * + * # JSON Encoding of Field Masks + * + * In JSON, a field mask is encoded as a single string where paths are + * separated by a comma. Fields name in each path are converted + * to/from lower-camel naming conventions. + * + * As an example, consider the following message declarations: + * + * message Profile { + * User user = 1; + * Photo photo = 2; + * } + * message User { + * string display_name = 1; + * string address = 2; + * } + * + * In proto a field mask for `Profile` may look as such: + * + * mask { + * paths: "user.display_name" + * paths: "photo" + * } + * + * In JSON, the same mask is represented as below: + * + * { + * mask: "user.displayName,photo" + * } + * + * # Field Masks and Oneof Fields + * + * Field masks treat fields in oneofs just as regular fields. Consider the + * following message: + * + * message SampleMessage { + * oneof test_oneof { + * string name = 4; + * SubMessage sub_message = 9; + * } + * } + * + * The field mask can be: + * + * mask { + * paths: "name" + * } + * + * Or: + * + * mask { + * paths: "sub_message" + * } + * + * Note that oneof type names ("test_oneof" in this case) cannot be used in + * paths. + * + * @external "google.protobuf.FieldMask" + * @property {string[]} paths + * The set of field mask paths. + * + * @see [google.protobuf.FieldMask definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/field_mask.proto} + */ \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_timestamp.js b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_timestamp.js new file mode 100644 index 00000000000..ed8fc627b92 --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_timestamp.js @@ -0,0 +1,88 @@ +/* + * Copyright 2017, Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Note: this file is purely for documentation. Any contents are not expected + * to be loaded as the JS file. + */ + +/** + * A Timestamp represents a point in time independent of any time zone + * or calendar, represented as seconds and fractions of seconds at + * nanosecond resolution in UTC Epoch time. It is encoded using the + * Proleptic Gregorian Calendar which extends the Gregorian calendar + * backwards to year one. It is encoded assuming all minutes are 60 + * seconds long, i.e. leap seconds are "smeared" so that no leap second + * table is needed for interpretation. Range is from + * 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. + * By restricting to that range, we ensure that we can convert to + * and from RFC 3339 date strings. + * See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt). + * + * Example 1: Compute Timestamp from POSIX `time()`. + * + * Timestamp timestamp; + * timestamp.set_seconds(time(NULL)); + * timestamp.set_nanos(0); + * + * Example 2: Compute Timestamp from POSIX `gettimeofday()`. + * + * struct timeval tv; + * gettimeofday(&tv, NULL); + * + * Timestamp timestamp; + * timestamp.set_seconds(tv.tv_sec); + * timestamp.set_nanos(tv.tv_usec * 1000); + * + * Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. + * + * FILETIME ft; + * GetSystemTimeAsFileTime(&ft); + * UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; + * + * // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z + * // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. + * Timestamp timestamp; + * timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); + * timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); + * + * Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. + * + * long millis = System.currentTimeMillis(); + * + * Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) + * .setNanos((int) ((millis % 1000) * 1000000)).build(); + * + * + * Example 5: Compute Timestamp from current time in Python. + * + * timestamp = Timestamp() + * timestamp.GetCurrentTime() + * + * @external "google.protobuf.Timestamp" + * @property {number} seconds + * Represents seconds of UTC time since Unix epoch + * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to + * 9999-12-31T23:59:59Z inclusive. + * + * @property {number} nanos + * Non-negative fractions of a second at nanosecond resolution. Negative + * second values with fractions must still have non-negative nanos values + * that count forward in time. Must be from 0 to 999,999,999 + * inclusive. + * + * @see [google.protobuf.Timestamp definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto} + */ \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/doc_pubsub.js new file mode 100644 index 00000000000..bd0c11239ec --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/doc_pubsub.js @@ -0,0 +1,757 @@ +/* + * Copyright 2017, Google Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Note: this file is purely for documentation. Any contents are not expected + * to be loaded as the JS file. + */ + +/** + * A topic resource. + * + * @property {string} name + * The name of the topic. It must have the format + * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, + * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), + * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent + * signs (`%`). It must be between 3 and 255 characters in length, and it + * must not start with `"goog"`. + * + * @class + * @see [google.pubsub.v1.Topic definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var Topic = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A message data and its attributes. The message payload must not be empty; + * it must contain either a non-empty data field, or at least one attribute. + * + * @property {string} data + * The message payload. + * + * @property {Object.} attributes + * Optional attributes for this message. + * + * @property {string} messageId + * ID of this message, assigned by the server when the message is published. + * Guaranteed to be unique within the topic. This value may be read by a + * subscriber that receives a `PubsubMessage` via a `Pull` call or a push + * delivery. It must not be populated by the publisher in a `Publish` call. + * + * @property {Object} publishTime + * The time at which the message was published, populated by the server when + * it receives the `Publish` call. It must not be populated by the + * publisher in a `Publish` call. + * + * This object should have the same structure as [google.protobuf.Timestamp]{@link external:"google.protobuf.Timestamp"} + * + * @class + * @see [google.pubsub.v1.PubsubMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PubsubMessage = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the GetTopic method. + * + * @property {string} topic + * The name of the topic to get. + * Format is `projects/{project}/topics/{topic}`. + * + * @class + * @see [google.pubsub.v1.GetTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var GetTopicRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the Publish method. + * + * @property {string} topic + * The messages in the request will be published on this topic. + * Format is `projects/{project}/topics/{topic}`. + * + * @property {Object[]} messages + * The messages to publish. + * + * This object should have the same structure as [PubsubMessage]{@link PubsubMessage} + * + * @class + * @see [google.pubsub.v1.PublishRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PublishRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `Publish` method. + * + * @property {string[]} messageIds + * The server-assigned ID of each published message, in the same order as + * the messages in the request. IDs are guaranteed to be unique within + * the topic. + * + * @class + * @see [google.pubsub.v1.PublishResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PublishResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListTopics` method. + * + * @property {string} project + * The name of the cloud project that topics belong to. + * Format is `projects/{project}`. + * + * @property {number} pageSize + * Maximum number of topics to return. + * + * @property {string} pageToken + * The value returned by the last `ListTopicsResponse`; indicates that this is + * a continuation of a prior `ListTopics` call, and that the system should + * return the next page of data. + * + * @class + * @see [google.pubsub.v1.ListTopicsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListTopics` method. + * + * @property {Object[]} topics + * The resulting topics. + * + * This object should have the same structure as [Topic]{@link Topic} + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more topics that match the + * request; this value should be passed in a new `ListTopicsRequest`. + * + * @class + * @see [google.pubsub.v1.ListTopicsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListTopicSubscriptions` method. + * + * @property {string} topic + * The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. + * + * @property {number} pageSize + * Maximum number of subscription names to return. + * + * @property {string} pageToken + * The value returned by the last `ListTopicSubscriptionsResponse`; indicates + * that this is a continuation of a prior `ListTopicSubscriptions` call, and + * that the system should return the next page of data. + * + * @class + * @see [google.pubsub.v1.ListTopicSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicSubscriptionsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListTopicSubscriptions` method. + * + * @property {string[]} subscriptions + * The names of the subscriptions that match the request. + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more subscriptions that match + * the request; this value should be passed in a new + * `ListTopicSubscriptionsRequest` to get more subscriptions. + * + * @class + * @see [google.pubsub.v1.ListTopicSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicSubscriptionsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `DeleteTopic` method. + * + * @property {string} topic + * Name of the topic to delete. + * Format is `projects/{project}/topics/{topic}`. + * + * @class + * @see [google.pubsub.v1.DeleteTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var DeleteTopicRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A subscription resource. + * + * @property {string} name + * The name of the subscription. It must have the format + * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must + * start with a letter, and contain only letters (`[A-Za-z]`), numbers + * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), + * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters + * in length, and it must not start with `"goog"`. + * + * @property {string} topic + * The name of the topic from which this subscription is receiving messages. + * Format is `projects/{project}/topics/{topic}`. + * The value of this field will be `_deleted-topic_` if the topic has been + * deleted. + * + * @property {Object} pushConfig + * If push delivery is used with this subscription, this field is + * used to configure it. An empty `pushConfig` signifies that the subscriber + * will pull and ack messages using API methods. + * + * This object should have the same structure as [PushConfig]{@link PushConfig} + * + * @property {number} ackDeadlineSeconds + * This value is the maximum time after a subscriber receives a message + * before the subscriber should acknowledge the message. After message + * delivery but before the ack deadline expires and before the message is + * acknowledged, it is an outstanding message and will not be delivered + * again during that time (on a best-effort basis). + * + * For pull subscriptions, this value is used as the initial value for the ack + * deadline. To override this value for a given message, call + * `ModifyAckDeadline` with the corresponding `ack_id` if using + * pull. + * The minimum custom deadline you can specify is 10 seconds. + * The maximum custom deadline you can specify is 600 seconds (10 minutes). + * If this parameter is 0, a default value of 10 seconds is used. + * + * For push delivery, this value is also used to set the request timeout for + * the call to the push endpoint. + * + * If the subscriber never acknowledges the message, the Pub/Sub + * system will eventually redeliver the message. + * + * @property {boolean} retainAckedMessages + * Indicates whether to retain acknowledged messages. If true, then + * messages are not expunged from the subscription's backlog, even if they are + * acknowledged, until they fall out of the `message_retention_duration` + * window. + * + * @property {Object} messageRetentionDuration + * How long to retain unacknowledged messages in the subscription's backlog, + * from the moment a message is published. + * If `retain_acked_messages` is true, then this also configures the retention + * of acknowledged messages, and thus configures how far back in time a `Seek` + * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 + * minutes. + * + * This object should have the same structure as [google.protobuf.Duration]{@link external:"google.protobuf.Duration"} + * + * @class + * @see [google.pubsub.v1.Subscription definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var Subscription = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Configuration for a push delivery endpoint. + * + * @property {string} pushEndpoint + * A URL locating the endpoint to which messages should be pushed. + * For example, a Webhook endpoint might use "https://example.com/push". + * + * @property {Object.} attributes + * Endpoint configuration attributes. + * + * Every endpoint has a set of API supported attributes that can be used to + * control different aspects of the message delivery. + * + * The currently supported attribute is `x-goog-version`, which you can + * use to change the format of the pushed message. This attribute + * indicates the version of the data expected by the endpoint. This + * controls the shape of the pushed message (i.e., its fields and metadata). + * The endpoint version is based on the version of the Pub/Sub API. + * + * If not present during the `CreateSubscription` call, it will default to + * the version of the API used to make such call. If not present during a + * `ModifyPushConfig` call, its value will not be changed. `GetSubscription` + * calls will always return a valid version, even if the subscription was + * created without this attribute. + * + * The possible values for this attribute are: + * + * * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. + * * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. + * + * @class + * @see [google.pubsub.v1.PushConfig definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PushConfig = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A message and its corresponding acknowledgment ID. + * + * @property {string} ackId + * This ID can be used to acknowledge the received message. + * + * @property {Object} message + * The message. + * + * This object should have the same structure as [PubsubMessage]{@link PubsubMessage} + * + * @class + * @see [google.pubsub.v1.ReceivedMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ReceivedMessage = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the GetSubscription method. + * + * @property {string} subscription + * The name of the subscription to get. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @class + * @see [google.pubsub.v1.GetSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var GetSubscriptionRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the UpdateSubscription method. + * + * @property {Object} subscription + * The updated subscription object. + * + * This object should have the same structure as [Subscription]{@link Subscription} + * + * @property {Object} updateMask + * Indicates which fields in the provided subscription to update. + * Must be specified and non-empty. + * + * This object should have the same structure as [google.protobuf.FieldMask]{@link external:"google.protobuf.FieldMask"} + * + * @class + * @see [google.pubsub.v1.UpdateSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var UpdateSubscriptionRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListSubscriptions` method. + * + * @property {string} project + * The name of the cloud project that subscriptions belong to. + * Format is `projects/{project}`. + * + * @property {number} pageSize + * Maximum number of subscriptions to return. + * + * @property {string} pageToken + * The value returned by the last `ListSubscriptionsResponse`; indicates that + * this is a continuation of a prior `ListSubscriptions` call, and that the + * system should return the next page of data. + * + * @class + * @see [google.pubsub.v1.ListSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListSubscriptionsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListSubscriptions` method. + * + * @property {Object[]} subscriptions + * The subscriptions that match the request. + * + * This object should have the same structure as [Subscription]{@link Subscription} + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more subscriptions that match + * the request; this value should be passed in a new + * `ListSubscriptionsRequest` to get more subscriptions. + * + * @class + * @see [google.pubsub.v1.ListSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListSubscriptionsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the DeleteSubscription method. + * + * @property {string} subscription + * The subscription to delete. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @class + * @see [google.pubsub.v1.DeleteSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var DeleteSubscriptionRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the ModifyPushConfig method. + * + * @property {string} subscription + * The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {Object} pushConfig + * The push configuration for future deliveries. + * + * An empty `pushConfig` indicates that the Pub/Sub system should + * stop pushing messages from the given subscription and allow + * messages to be pulled and acknowledged - effectively pausing + * the subscription if `Pull` is not called. + * + * This object should have the same structure as [PushConfig]{@link PushConfig} + * + * @class + * @see [google.pubsub.v1.ModifyPushConfigRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ModifyPushConfigRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `Pull` method. + * + * @property {string} subscription + * The subscription from which messages should be pulled. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {boolean} returnImmediately + * If this field set to true, the system will respond immediately even if + * it there are no messages available to return in the `Pull` response. + * Otherwise, the system may wait (for a bounded amount of time) until at + * least one message is available, rather than returning no messages. The + * client may cancel the request if it does not wish to wait any longer for + * the response. + * + * @property {number} maxMessages + * The maximum number of messages returned for this request. The Pub/Sub + * system may return fewer than the number specified. + * + * @class + * @see [google.pubsub.v1.PullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PullRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `Pull` method. + * + * @property {Object[]} receivedMessages + * Received Pub/Sub messages. The Pub/Sub system will return zero messages if + * there are no more available in the backlog. The Pub/Sub system may return + * fewer than the `maxMessages` requested even if there are more messages + * available in the backlog. + * + * This object should have the same structure as [ReceivedMessage]{@link ReceivedMessage} + * + * @class + * @see [google.pubsub.v1.PullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PullResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the ModifyAckDeadline method. + * + * @property {string} subscription + * The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {string[]} ackIds + * List of acknowledgment IDs. + * + * @property {number} ackDeadlineSeconds + * The new ack deadline with respect to the time this request was sent to + * the Pub/Sub system. For example, if the value is 10, the new + * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call + * was made. Specifying zero may immediately make the message available for + * another pull request. + * The minimum deadline you can specify is 0 seconds. + * The maximum deadline you can specify is 600 seconds (10 minutes). + * + * @class + * @see [google.pubsub.v1.ModifyAckDeadlineRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ModifyAckDeadlineRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the Acknowledge method. + * + * @property {string} subscription + * The subscription whose message is being acknowledged. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {string[]} ackIds + * The acknowledgment ID for the messages being acknowledged that was returned + * by the Pub/Sub system in the `Pull` response. Must not be empty. + * + * @class + * @see [google.pubsub.v1.AcknowledgeRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var AcknowledgeRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `StreamingPull` streaming RPC method. This request is used to + * establish the initial stream as well as to stream acknowledgements and ack + * deadline modifications from the client to the server. + * + * @property {string} subscription + * The subscription for which to initialize the new stream. This must be + * provided in the first request on the stream, and must not be set in + * subsequent requests from client to server. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {string[]} ackIds + * List of acknowledgement IDs for acknowledging previously received messages + * (received on this stream or a different stream). If an ack ID has expired, + * the corresponding message may be redelivered later. Acknowledging a message + * more than once will not result in an error. If the acknowledgement ID is + * malformed, the stream will be aborted with status `INVALID_ARGUMENT`. + * + * @property {number[]} modifyDeadlineSeconds + * The list of new ack deadlines for the IDs listed in + * `modify_deadline_ack_ids`. The size of this list must be the same as the + * size of `modify_deadline_ack_ids`. If it differs the stream will be aborted + * with `INVALID_ARGUMENT`. Each element in this list is applied to the + * element in the same position in `modify_deadline_ack_ids`. The new ack + * deadline is with respect to the time this request was sent to the Pub/Sub + * system. Must be >= 0. For example, if the value is 10, the new ack deadline + * will expire 10 seconds after this request is received. If the value is 0, + * the message is immediately made available for another streaming or + * non-streaming pull request. If the value is < 0 (an error), the stream will + * be aborted with status `INVALID_ARGUMENT`. + * + * @property {string[]} modifyDeadlineAckIds + * List of acknowledgement IDs whose deadline will be modified based on the + * corresponding element in `modify_deadline_seconds`. This field can be used + * to indicate that more time is needed to process a message by the + * subscriber, or to make the message available for redelivery if the + * processing was interrupted. + * + * @property {number} streamAckDeadlineSeconds + * The ack deadline to use for the stream. This must be provided in the + * first request on the stream, but it can also be updated on subsequent + * requests from client to server. The minimum deadline you can specify is 10 + * seconds. The maximum deadline you can specify is 600 seconds (10 minutes). + * + * @class + * @see [google.pubsub.v1.StreamingPullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var StreamingPullRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `StreamingPull` method. This response is used to stream + * messages from the server to the client. + * + * @property {Object[]} receivedMessages + * Received Pub/Sub messages. This will not be empty. + * + * This object should have the same structure as [ReceivedMessage]{@link ReceivedMessage} + * + * @class + * @see [google.pubsub.v1.StreamingPullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var StreamingPullResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `CreateSnapshot` method. + * + * @property {string} name + * Optional user-provided name for this snapshot. + * If the name is not provided in the request, the server will assign a random + * name for this snapshot on the same project as the subscription. + * Note that for REST API requests, you must specify a name. + * Format is `projects/{project}/snapshots/{snap}`. + * + * @property {string} subscription + * The subscription whose backlog the snapshot retains. + * Specifically, the created snapshot is guaranteed to retain: + * (a) The existing backlog on the subscription. More precisely, this is + * defined as the messages in the subscription's backlog that are + * unacknowledged upon the successful completion of the + * `CreateSnapshot` request; as well as: + * (b) Any messages published to the subscription's topic following the + * successful completion of the CreateSnapshot request. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @class + * @see [google.pubsub.v1.CreateSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var CreateSnapshotRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A snapshot resource. + * + * @property {string} name + * The name of the snapshot. + * + * @property {string} topic + * The name of the topic from which this snapshot is retaining messages. + * + * @property {Object} expireTime + * The snapshot is guaranteed to exist up until this time. + * A newly-created snapshot expires no later than 7 days from the time of its + * creation. Its exact lifetime is determined at creation by the existing + * backlog in the source subscription. Specifically, the lifetime of the + * snapshot is `7 days - (age of oldest unacked message in the subscription)`. + * For example, consider a subscription whose oldest unacked message is 3 days + * old. If a snapshot is created from this subscription, the snapshot -- which + * will always capture this 3-day-old backlog as long as the snapshot + * exists -- will expire in 4 days. + * + * This object should have the same structure as [google.protobuf.Timestamp]{@link external:"google.protobuf.Timestamp"} + * + * @class + * @see [google.pubsub.v1.Snapshot definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var Snapshot = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListSnapshots` method. + * + * @property {string} project + * The name of the cloud project that snapshots belong to. + * Format is `projects/{project}`. + * + * @property {number} pageSize + * Maximum number of snapshots to return. + * + * @property {string} pageToken + * The value returned by the last `ListSnapshotsResponse`; indicates that this + * is a continuation of a prior `ListSnapshots` call, and that the system + * should return the next page of data. + * + * @class + * @see [google.pubsub.v1.ListSnapshotsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListSnapshotsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListSnapshots` method. + * + * @property {Object[]} snapshots + * The resulting snapshots. + * + * This object should have the same structure as [Snapshot]{@link Snapshot} + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more snapshot that match the + * request; this value should be passed in a new `ListSnapshotsRequest`. + * + * @class + * @see [google.pubsub.v1.ListSnapshotsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListSnapshotsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `DeleteSnapshot` method. + * + * @property {string} snapshot + * The name of the snapshot to delete. + * Format is `projects/{project}/snapshots/{snap}`. + * + * @class + * @see [google.pubsub.v1.DeleteSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var DeleteSnapshotRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `Seek` method. + * + * @property {string} subscription + * The subscription to affect. + * + * @property {Object} time + * The time to seek to. + * Messages retained in the subscription that were published before this + * time are marked as acknowledged, and messages retained in the + * subscription that were published after this time are marked as + * unacknowledged. Note that this operation affects only those messages + * retained in the subscription (configured by the combination of + * `message_retention_duration` and `retain_acked_messages`). For example, + * if `time` corresponds to a point before the message retention + * window (or to a point before the system's notion of the subscription + * creation time), only retained messages will be marked as unacknowledged, + * and already-expunged messages will not be restored. + * + * This object should have the same structure as [google.protobuf.Timestamp]{@link external:"google.protobuf.Timestamp"} + * + * @property {string} snapshot + * The snapshot to seek to. The snapshot's topic must be the same as that of + * the provided subscription. + * Format is `projects/{project}/snapshots/{snap}`. + * + * @class + * @see [google.pubsub.v1.SeekRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var SeekRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * @class + * @see [google.pubsub.v1.SeekResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var SeekResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; \ No newline at end of file From c77711f1a3ff32369740aceef49c5762325166df Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 5 Jul 2017 17:13:02 -0400 Subject: [PATCH 0077/1115] pubsub @ 0.13.1 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 28fb2a6cedf..951b03806fa 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.13.0", + "version": "0.13.1", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From a26b9ddb4ff73c1f3113230aec6f5548ad6a9f50 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 19 Jul 2017 20:10:17 -0400 Subject: [PATCH 0078/1115] remove google-proto-files (#2458) --- handwritten/pubsub/package.json | 1 + .../protos/google/api/annotations.proto | 31 + .../pubsub/protos/google/api/auth.proto | 183 ++++ .../pubsub/protos/google/api/backend.proto | 47 + .../pubsub/protos/google/api/billing.proto | 98 +++ .../protos/google/api/config_change.proto | 85 ++ .../pubsub/protos/google/api/consumer.proto | 83 ++ .../pubsub/protos/google/api/context.proto | 63 ++ .../pubsub/protos/google/api/control.proto | 33 + .../protos/google/api/distribution.proto | 185 ++++ .../protos/google/api/documentation.proto | 159 ++++ .../pubsub/protos/google/api/endpoint.proto | 74 ++ .../experimental/authorization_config.proto | 40 + .../api/experimental/experimental.proto | 34 + .../pubsub/protos/google/api/http.proto | 291 ++++++ .../pubsub/protos/google/api/httpbody.proto | 70 ++ .../pubsub/protos/google/api/label.proto | 49 ++ .../pubsub/protos/google/api/log.proto | 55 ++ .../pubsub/protos/google/api/logging.proto | 83 ++ .../pubsub/protos/google/api/metric.proto | 196 +++++ .../google/api/monitored_resource.proto | 91 ++ .../pubsub/protos/google/api/monitoring.proto | 89 ++ .../pubsub/protos/google/api/quota.proto | 259 ++++++ .../pubsub/protos/google/api/service.proto | 176 ++++ .../api/servicecontrol/v1/check_error.proto | 95 ++ .../api/servicecontrol/v1/distribution.proto | 159 ++++ .../api/servicecontrol/v1/log_entry.proto | 67 ++ .../api/servicecontrol/v1/metric_value.proto | 78 ++ .../api/servicecontrol/v1/operation.proto | 112 +++ .../v1/service_controller.proto | 161 ++++ .../api/servicemanagement/v1/resources.proto | 286 ++++++ .../servicemanagement/v1/servicemanager.proto | 392 +++++++++ .../protos/google/api/source_info.proto | 32 + .../protos/google/api/system_parameter.proto | 96 ++ .../pubsub/protos/google/api/usage.proto | 85 ++ .../protos/google/iam/admin/v1/iam.proto | 469 ++++++++++ .../protos/google/iam/v1/iam_policy.proto | 118 +++ .../pubsub/protos/google/iam/v1/policy.proto | 149 ++++ .../pubsub/protos/google/protobuf/any.proto | 139 +++ .../pubsub/protos/google/protobuf/api.proto | 202 +++++ .../protos/google/protobuf/descriptor.proto | 831 ++++++++++++++++++ .../protos/google/protobuf/duration.proto | 117 +++ .../pubsub/protos/google/protobuf/empty.proto | 52 ++ .../protos/google/protobuf/field_mask.proto | 246 ++++++ .../google/protobuf/source_context.proto | 48 + .../protos/google/protobuf/struct.proto | 96 ++ .../protos/google/protobuf/timestamp.proto | 133 +++ .../pubsub/protos/google/protobuf/type.proto | 187 ++++ .../protobuf/util/json_format_proto3.proto | 183 ++++ .../protos/google/protobuf/wrappers.proto | 118 +++ .../protos/google/pubsub/v1/pubsub.proto | 687 +++++++++++++++ handwritten/pubsub/src/iam.js | 10 +- handwritten/pubsub/src/index.js | 14 +- handwritten/pubsub/test/iam.js | 14 +- handwritten/pubsub/test/index.js | 18 +- 55 files changed, 7861 insertions(+), 8 deletions(-) create mode 100644 handwritten/pubsub/protos/google/api/annotations.proto create mode 100644 handwritten/pubsub/protos/google/api/auth.proto create mode 100644 handwritten/pubsub/protos/google/api/backend.proto create mode 100644 handwritten/pubsub/protos/google/api/billing.proto create mode 100644 handwritten/pubsub/protos/google/api/config_change.proto create mode 100644 handwritten/pubsub/protos/google/api/consumer.proto create mode 100644 handwritten/pubsub/protos/google/api/context.proto create mode 100644 handwritten/pubsub/protos/google/api/control.proto create mode 100644 handwritten/pubsub/protos/google/api/distribution.proto create mode 100644 handwritten/pubsub/protos/google/api/documentation.proto create mode 100644 handwritten/pubsub/protos/google/api/endpoint.proto create mode 100644 handwritten/pubsub/protos/google/api/experimental/authorization_config.proto create mode 100644 handwritten/pubsub/protos/google/api/experimental/experimental.proto create mode 100644 handwritten/pubsub/protos/google/api/http.proto create mode 100644 handwritten/pubsub/protos/google/api/httpbody.proto create mode 100644 handwritten/pubsub/protos/google/api/label.proto create mode 100644 handwritten/pubsub/protos/google/api/log.proto create mode 100644 handwritten/pubsub/protos/google/api/logging.proto create mode 100644 handwritten/pubsub/protos/google/api/metric.proto create mode 100644 handwritten/pubsub/protos/google/api/monitored_resource.proto create mode 100644 handwritten/pubsub/protos/google/api/monitoring.proto create mode 100644 handwritten/pubsub/protos/google/api/quota.proto create mode 100644 handwritten/pubsub/protos/google/api/service.proto create mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/check_error.proto create mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/distribution.proto create mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/log_entry.proto create mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/metric_value.proto create mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/operation.proto create mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/service_controller.proto create mode 100644 handwritten/pubsub/protos/google/api/servicemanagement/v1/resources.proto create mode 100644 handwritten/pubsub/protos/google/api/servicemanagement/v1/servicemanager.proto create mode 100644 handwritten/pubsub/protos/google/api/source_info.proto create mode 100644 handwritten/pubsub/protos/google/api/system_parameter.proto create mode 100644 handwritten/pubsub/protos/google/api/usage.proto create mode 100644 handwritten/pubsub/protos/google/iam/admin/v1/iam.proto create mode 100644 handwritten/pubsub/protos/google/iam/v1/iam_policy.proto create mode 100644 handwritten/pubsub/protos/google/iam/v1/policy.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/any.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/api.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/descriptor.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/duration.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/empty.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/field_mask.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/source_context.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/struct.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/timestamp.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/type.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/util/json_format_proto3.proto create mode 100644 handwritten/pubsub/protos/google/protobuf/wrappers.proto create mode 100644 handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 951b03806fa..d5cab84f979 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -31,6 +31,7 @@ ], "main": "./src/index.js", "files": [ + "protos", "src", "AUTHORS", "CONTRIBUTORS", diff --git a/handwritten/pubsub/protos/google/api/annotations.proto b/handwritten/pubsub/protos/google/api/annotations.proto new file mode 100644 index 00000000000..85c361b47fe --- /dev/null +++ b/handwritten/pubsub/protos/google/api/annotations.proto @@ -0,0 +1,31 @@ +// Copyright (c) 2015, Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/http.proto"; +import "google/protobuf/descriptor.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; +option java_multiple_files = true; +option java_outer_classname = "AnnotationsProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + +extend google.protobuf.MethodOptions { + // See `HttpRule`. + HttpRule http = 72295728; +} diff --git a/handwritten/pubsub/protos/google/api/auth.proto b/handwritten/pubsub/protos/google/api/auth.proto new file mode 100644 index 00000000000..0ef63863192 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/auth.proto @@ -0,0 +1,183 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "AuthProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// `Authentication` defines the authentication configuration for an API. +// +// Example for an API targeted for external use: +// +// name: calendar.googleapis.com +// authentication: +// providers: +// - id: google_calendar_auth +// jwks_uri: https://www.googleapis.com/oauth2/v1/certs +// issuer: https://securetoken.google.com +// rules: +// - selector: "*" +// requirements: +// provider_id: google_calendar_auth +message Authentication { + // A list of authentication rules that apply to individual API methods. + // + // **NOTE:** All service configuration rules follow "last one wins" order. + repeated AuthenticationRule rules = 3; + + // Defines a set of authentication providers that a service supports. + repeated AuthProvider providers = 4; +} + +// Authentication rules for the service. +// +// By default, if a method has any authentication requirements, every request +// must include a valid credential matching one of the requirements. +// It's an error to include more than one kind of credential in a single +// request. +// +// If a method doesn't have any auth requirements, request credentials will be +// ignored. +message AuthenticationRule { + // Selects the methods to which this rule applies. + // + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // The requirements for OAuth credentials. + OAuthRequirements oauth = 2; + + // Whether to allow requests without a credential. The credential can be + // an OAuth token, Google cookies (first-party auth) or EndUserCreds. + // + // For requests without credentials, if the service control environment is + // specified, each incoming request **must** be associated with a service + // consumer. This can be done by passing an API key that belongs to a consumer + // project. + bool allow_without_credential = 5; + + // Requirements for additional authentication providers. + repeated AuthRequirement requirements = 7; +} + +// Configuration for an anthentication provider, including support for +// [JSON Web Token (JWT)](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32). +message AuthProvider { + // The unique identifier of the auth provider. It will be referred to by + // `AuthRequirement.provider_id`. + // + // Example: "bookstore_auth". + string id = 1; + + // Identifies the principal that issued the JWT. See + // https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1 + // Usually a URL or an email address. + // + // Example: https://securetoken.google.com + // Example: 1234567-compute@developer.gserviceaccount.com + string issuer = 2; + + // URL of the provider's public key set to validate signature of the JWT. See + // [OpenID Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata). + // Optional if the key set document: + // - can be retrieved from + // [OpenID Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html + // of the issuer. + // - can be inferred from the email domain of the issuer (e.g. a Google service account). + // + // Example: https://www.googleapis.com/oauth2/v1/certs + string jwks_uri = 3; + + // The list of JWT + // [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3). + // that are allowed to access. A JWT containing any of these audiences will + // be accepted. When this setting is absent, only JWTs with audience + // "https://[Service_name][google.api.Service.name]/[API_name][google.protobuf.Api.name]" + // will be accepted. For example, if no audiences are in the setting, + // LibraryService API will only accept JWTs with the following audience + // "https://library-example.googleapis.com/google.example.library.v1.LibraryService". + // + // Example: + // + // audiences: bookstore_android.apps.googleusercontent.com, + // bookstore_web.apps.googleusercontent.com + string audiences = 4; +} + +// OAuth scopes are a way to define data and permissions on data. For example, +// there are scopes defined for "Read-only access to Google Calendar" and +// "Access to Cloud Platform". Users can consent to a scope for an application, +// giving it permission to access that data on their behalf. +// +// OAuth scope specifications should be fairly coarse grained; a user will need +// to see and understand the text description of what your scope means. +// +// In most cases: use one or at most two OAuth scopes for an entire family of +// products. If your product has multiple APIs, you should probably be sharing +// the OAuth scope across all of those APIs. +// +// When you need finer grained OAuth consent screens: talk with your product +// management about how developers will use them in practice. +// +// Please note that even though each of the canonical scopes is enough for a +// request to be accepted and passed to the backend, a request can still fail +// due to the backend requiring additional scopes or permissions. +message OAuthRequirements { + // The list of publicly documented OAuth scopes that are allowed access. An + // OAuth token containing any of these scopes will be accepted. + // + // Example: + // + // canonical_scopes: https://www.googleapis.com/auth/calendar, + // https://www.googleapis.com/auth/calendar.read + string canonical_scopes = 1; +} + +// User-defined authentication requirements, including support for +// [JSON Web Token (JWT)](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32). +message AuthRequirement { + // [id][google.api.AuthProvider.id] from authentication provider. + // + // Example: + // + // provider_id: bookstore_auth + string provider_id = 1; + + // NOTE: This will be deprecated soon, once AuthProvider.audiences is + // implemented and accepted in all the runtime components. + // + // The list of JWT + // [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3). + // that are allowed to access. A JWT containing any of these audiences will + // be accepted. When this setting is absent, only JWTs with audience + // "https://[Service_name][google.api.Service.name]/[API_name][google.protobuf.Api.name]" + // will be accepted. For example, if no audiences are in the setting, + // LibraryService API will only accept JWTs with the following audience + // "https://library-example.googleapis.com/google.example.library.v1.LibraryService". + // + // Example: + // + // audiences: bookstore_android.apps.googleusercontent.com, + // bookstore_web.apps.googleusercontent.com + string audiences = 2; +} diff --git a/handwritten/pubsub/protos/google/api/backend.proto b/handwritten/pubsub/protos/google/api/backend.proto new file mode 100644 index 00000000000..61a72e14d19 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/backend.proto @@ -0,0 +1,47 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "BackendProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// `Backend` defines the backend configuration for a service. +message Backend { + // A list of API backend rules that apply to individual API methods. + // + // **NOTE:** All service configuration rules follow "last one wins" order. + repeated BackendRule rules = 1; +} + +// A backend rule provides configuration for an individual API element. +message BackendRule { + // Selects the methods to which this rule applies. + // + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // The address of the API backend. + string address = 2; + + // The number of seconds to wait for a response from a request. The + // default depends on the deployment context. + double deadline = 3; +} diff --git a/handwritten/pubsub/protos/google/api/billing.proto b/handwritten/pubsub/protos/google/api/billing.proto new file mode 100644 index 00000000000..6ecffd5451e --- /dev/null +++ b/handwritten/pubsub/protos/google/api/billing.proto @@ -0,0 +1,98 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; +import "google/api/metric.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "BillingProto"; +option java_package = "com.google.api"; + + +// Billing related configuration of the service. +// +// The following example shows how to configure metrics for billing: +// +// metrics: +// - name: library.googleapis.com/read_calls +// metric_kind: DELTA +// value_type: INT64 +// - name: library.googleapis.com/write_calls +// metric_kind: DELTA +// value_type: INT64 +// billing: +// metrics: +// - library.googleapis.com/read_calls +// - library.googleapis.com/write_calls +// +// The next example shows how to enable billing status check and customize the +// check behavior. It makes sure billing status check is included in the `Check` +// method of [Service Control API](https://cloud.google.com/service-control/). +// In the example, "google.storage.Get" method can be served when the billing +// status is either `current` or `delinquent`, while "google.storage.Write" +// method can only be served when the billing status is `current`: +// +// billing: +// rules: +// - selector: google.storage.Get +// allowed_statuses: +// - current +// - delinquent +// - selector: google.storage.Write +// allowed_statuses: current +// +// Mostly services should only allow `current` status when serving requests. +// In addition, services can choose to allow both `current` and `delinquent` +// statuses when serving read-only requests to resources. If there's no +// matching selector for operation, no billing status check will be performed. +// +message Billing { + // Names of the metrics to report to billing. Each name must + // be defined in [Service.metrics][google.api.Service.metrics] section. + repeated string metrics = 1; + + // A list of billing status rules for configuring billing status check. + repeated BillingStatusRule rules = 5; +} + +// Defines the billing status requirements for operations. +// +// When used with +// [Service Control API](https://cloud.google.com/service-control/), the +// following statuses are supported: +// +// - **current**: the associated billing account is up to date and capable of +// paying for resource usages. +// - **delinquent**: the associated billing account has a correctable problem, +// such as late payment. +// +// Mostly services should only allow `current` status when serving requests. +// In addition, services can choose to allow both `current` and `delinquent` +// statuses when serving read-only requests to resources. If the list of +// allowed_statuses is empty, it means no billing requirement. +// +message BillingStatusRule { + // Selects the operation names to which this rule applies. + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // Allowed billing statuses. The billing status check passes if the actual + // billing status matches any of the provided values here. + repeated string allowed_statuses = 2; +} diff --git a/handwritten/pubsub/protos/google/api/config_change.proto b/handwritten/pubsub/protos/google/api/config_change.proto new file mode 100644 index 00000000000..3c416164ec5 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/config_change.proto @@ -0,0 +1,85 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api/configchange;configchange"; +option java_multiple_files = true; +option java_outer_classname = "ConfigChangeProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Output generated from semantically comparing two versions of a service +// configuration. +// +// Includes detailed information about a field that have changed with +// applicable advice about potential consequences for the change, such as +// backwards-incompatibility. +message ConfigChange { + // Object hierarchy path to the change, with levels separated by a '.' + // character. For repeated fields, an applicable unique identifier field is + // used for the index (usually selector, name, or id). For maps, the term + // 'key' is used. If the field has no unique identifier, the numeric index + // is used. + // Examples: + // - visibility.rules[selector=="google.LibraryService.CreateBook"].restriction + // - quota.metric_rules[selector=="google"].metric_costs[key=="reads"].value + // - logging.producer_destinations[0] + string element = 1; + + // Value of the changed object in the old Service configuration, + // in JSON format. This field will not be populated if ChangeType == ADDED. + string old_value = 2; + + // Value of the changed object in the new Service configuration, + // in JSON format. This field will not be populated if ChangeType == REMOVED. + string new_value = 3; + + // The type for this change, either ADDED, REMOVED, or MODIFIED. + ChangeType change_type = 4; + + // Collection of advice provided for this change, useful for determining the + // possible impact of this change. + repeated Advice advices = 5; +} + +// Generated advice about this change, used for providing more +// information about how a change will affect the existing service. +message Advice { + // Useful description for why this advice was applied and what actions should + // be taken to mitigate any implied risks. + string description = 2; +} + +// Classifies set of possible modifications to an object in the service +// configuration. +enum ChangeType { + // No value was provided. + CHANGE_TYPE_UNSPECIFIED = 0; + + // The changed object exists in the 'new' service configuration, but not + // in the 'old' service configuration. + ADDED = 1; + + // The changed object exists in the 'old' service configuration, but not + // in the 'new' service configuration. + REMOVED = 2; + + // The changed object exists in both service configurations, but its value + // is different. + MODIFIED = 3; +} diff --git a/handwritten/pubsub/protos/google/api/consumer.proto b/handwritten/pubsub/protos/google/api/consumer.proto new file mode 100644 index 00000000000..4e963168efc --- /dev/null +++ b/handwritten/pubsub/protos/google/api/consumer.proto @@ -0,0 +1,83 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "ConsumerProto"; +option java_package = "com.google.api"; + + +// A descriptor for defining project properties for a service. One service may +// have many consumer projects, and the service may want to behave differently +// depending on some properties on the project. For example, a project may be +// associated with a school, or a business, or a government agency, a business +// type property on the project may affect how a service responds to the client. +// This descriptor defines which properties are allowed to be set on a project. +// +// Example: +// +// project_properties: +// properties: +// - name: NO_WATERMARK +// type: BOOL +// description: Allows usage of the API without watermarks. +// - name: EXTENDED_TILE_CACHE_PERIOD +// type: INT64 +message ProjectProperties { + // List of per consumer project-specific properties. + repeated Property properties = 1; +} + +// Defines project properties. +// +// API services can define properties that can be assigned to consumer projects +// so that backends can perform response customization without having to make +// additional calls or maintain additional storage. For example, Maps API +// defines properties that controls map tile cache period, or whether to embed a +// watermark in a result. +// +// These values can be set via API producer console. Only API providers can +// define and set these properties. +message Property { + // Supported data type of the property values + enum PropertyType { + // The type is unspecified, and will result in an error. + UNSPECIFIED = 0; + + // The type is `int64`. + INT64 = 1; + + // The type is `bool`. + BOOL = 2; + + // The type is `string`. + STRING = 3; + + // The type is 'double'. + DOUBLE = 4; + } + + // The name of the property (a.k.a key). + string name = 1; + + // The type of this property. + PropertyType type = 2; + + // The description of the property + string description = 3; +} diff --git a/handwritten/pubsub/protos/google/api/context.proto b/handwritten/pubsub/protos/google/api/context.proto new file mode 100644 index 00000000000..fd03fcae916 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/context.proto @@ -0,0 +1,63 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "ContextProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// `Context` defines which contexts an API requests. +// +// Example: +// +// context: +// rules: +// - selector: "*" +// requested: +// - google.rpc.context.ProjectContext +// - google.rpc.context.OriginContext +// +// The above specifies that all methods in the API request +// `google.rpc.context.ProjectContext` and +// `google.rpc.context.OriginContext`. +// +// Available context types are defined in package +// `google.rpc.context`. +message Context { + // A list of RPC context rules that apply to individual API methods. + // + // **NOTE:** All service configuration rules follow "last one wins" order. + repeated ContextRule rules = 1; +} + +// A context rule provides information about the context for an individual API +// element. +message ContextRule { + // Selects the methods to which this rule applies. + // + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // A list of full type names of requested contexts. + repeated string requested = 2; + + // A list of full type names of provided contexts. + repeated string provided = 3; +} diff --git a/handwritten/pubsub/protos/google/api/control.proto b/handwritten/pubsub/protos/google/api/control.proto new file mode 100644 index 00000000000..acad56cbdde --- /dev/null +++ b/handwritten/pubsub/protos/google/api/control.proto @@ -0,0 +1,33 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "ControlProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Selects and configures the service controller used by the service. The +// service controller handles features like abuse, quota, billing, logging, +// monitoring, etc. +message Control { + // The service control environment to use. If empty, no control plane + // feature (like quota and billing) will be enabled. + string environment = 1; +} diff --git a/handwritten/pubsub/protos/google/api/distribution.proto b/handwritten/pubsub/protos/google/api/distribution.proto new file mode 100644 index 00000000000..2861e9b6f3a --- /dev/null +++ b/handwritten/pubsub/protos/google/api/distribution.proto @@ -0,0 +1,185 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/timestamp.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/distribution;distribution"; +option java_multiple_files = true; +option java_outer_classname = "DistributionProto"; +option java_package = "com.google.api"; + + +// Distribution contains summary statistics for a population of values and, +// optionally, a histogram representing the distribution of those values across +// a specified set of histogram buckets. +// +// The summary statistics are the count, mean, sum of the squared deviation from +// the mean, the minimum, and the maximum of the set of population of values. +// +// The histogram is based on a sequence of buckets and gives a count of values +// that fall into each bucket. The boundaries of the buckets are given either +// explicitly or by specifying parameters for a method of computing them +// (buckets of fixed width or buckets of exponentially increasing width). +// +// Although it is not forbidden, it is generally a bad idea to include +// non-finite values (infinities or NaNs) in the population of values, as this +// will render the `mean` and `sum_of_squared_deviation` fields meaningless. +message Distribution { + // The range of the population values. + message Range { + // The minimum of the population values. + double min = 1; + + // The maximum of the population values. + double max = 2; + } + + // A Distribution may optionally contain a histogram of the values in the + // population. The histogram is given in `bucket_counts` as counts of values + // that fall into one of a sequence of non-overlapping buckets. The sequence + // of buckets is described by `bucket_options`. + // + // A bucket specifies an inclusive lower bound and exclusive upper bound for + // the values that are counted for that bucket. The upper bound of a bucket + // is strictly greater than the lower bound. + // + // The sequence of N buckets for a Distribution consists of an underflow + // bucket (number 0), zero or more finite buckets (number 1 through N - 2) and + // an overflow bucket (number N - 1). The buckets are contiguous: the lower + // bound of bucket i (i > 0) is the same as the upper bound of bucket i - 1. + // The buckets span the whole range of finite values: lower bound of the + // underflow bucket is -infinity and the upper bound of the overflow bucket is + // +infinity. The finite buckets are so-called because both bounds are + // finite. + // + // `BucketOptions` describes bucket boundaries in one of three ways. Two + // describe the boundaries by giving parameters for a formula to generate + // boundaries and one gives the bucket boundaries explicitly. + // + // If `bucket_boundaries` is not given, then no `bucket_counts` may be given. + message BucketOptions { + // Specify a sequence of buckets that all have the same width (except + // overflow and underflow). Each bucket represents a constant absolute + // uncertainty on the specific value in the bucket. + // + // Defines `num_finite_buckets + 2` (= N) buckets with these boundaries for + // bucket `i`: + // + // Upper bound (0 <= i < N-1): offset + (width * i). + // Lower bound (1 <= i < N): offset + (width * (i - 1)). + message Linear { + // Must be greater than 0. + int32 num_finite_buckets = 1; + + // Must be greater than 0. + double width = 2; + + // Lower bound of the first bucket. + double offset = 3; + } + + // Specify a sequence of buckets that have a width that is proportional to + // the value of the lower bound. Each bucket represents a constant relative + // uncertainty on a specific value in the bucket. + // + // Defines `num_finite_buckets + 2` (= N) buckets with these boundaries for + // bucket i: + // + // Upper bound (0 <= i < N-1): scale * (growth_factor ^ i). + // Lower bound (1 <= i < N): scale * (growth_factor ^ (i - 1)). + message Exponential { + // Must be greater than 0. + int32 num_finite_buckets = 1; + + // Must be greater than 1. + double growth_factor = 2; + + // Must be greater than 0. + double scale = 3; + } + + // A set of buckets with arbitrary widths. + // + // Defines `size(bounds) + 1` (= N) buckets with these boundaries for + // bucket i: + // + // Upper bound (0 <= i < N-1): bounds[i] + // Lower bound (1 <= i < N); bounds[i - 1] + // + // There must be at least one element in `bounds`. If `bounds` has only one + // element, there are no finite buckets, and that single element is the + // common boundary of the overflow and underflow buckets. + message Explicit { + // The values must be monotonically increasing. + repeated double bounds = 1; + } + + // Exactly one of these three fields must be set. + oneof options { + // The linear bucket. + Linear linear_buckets = 1; + + // The exponential buckets. + Exponential exponential_buckets = 2; + + // The explicit buckets. + Explicit explicit_buckets = 3; + } + } + + // The number of values in the population. Must be non-negative. + int64 count = 1; + + // The arithmetic mean of the values in the population. If `count` is zero + // then this field must be zero. + double mean = 2; + + // The sum of squared deviations from the mean of the values in the + // population. For values x_i this is: + // + // Sum[i=1..n]((x_i - mean)^2) + // + // Knuth, "The Art of Computer Programming", Vol. 2, page 323, 3rd edition + // describes Welford's method for accumulating this sum in one pass. + // + // If `count` is zero then this field must be zero. + double sum_of_squared_deviation = 3; + + // If specified, contains the range of the population values. The field + // must not be present if the `count` is zero. + Range range = 4; + + // Defines the histogram bucket boundaries. + BucketOptions bucket_options = 6; + + // If `bucket_options` is given, then the sum of the values in `bucket_counts` + // must equal the value in `count`. If `bucket_options` is not given, no + // `bucket_counts` fields may be given. + // + // Bucket counts are given in order under the numbering scheme described + // above (the underflow bucket has number 0; the finite buckets, if any, + // have numbers 1 through N-2; the overflow bucket has number N-1). + // + // The size of `bucket_counts` must be no greater than N as defined in + // `bucket_options`. + // + // Any suffix of trailing zero bucket_count fields may be omitted. + repeated int64 bucket_counts = 7; +} diff --git a/handwritten/pubsub/protos/google/api/documentation.proto b/handwritten/pubsub/protos/google/api/documentation.proto new file mode 100644 index 00000000000..0b85eca51e5 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/documentation.proto @@ -0,0 +1,159 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "DocumentationProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// `Documentation` provides the information for describing a service. +// +// Example: +// 
documentation:
+//   summary: >
+//     The Google Calendar API gives access
+//     to most calendar features.
+//   pages:
+//   - name: Overview
+//     content: (== include google/foo/overview.md ==)
+//   - name: Tutorial
+//     content: (== include google/foo/tutorial.md ==)
+//     subpages;
+//     - name: Java
+//       content: (== include google/foo/tutorial_java.md ==)
+//   rules:
+//   - selector: google.calendar.Calendar.Get
+//     description: >
+//       ...
+//   - selector: google.calendar.Calendar.Put
+//     description: >
+//       ...
+//
+// Documentation is provided in markdown syntax. In addition to +// standard markdown features, definition lists, tables and fenced +// code blocks are supported. Section headers can be provided and are +// interpreted relative to the section nesting of the context where +// a documentation fragment is embedded. +// +// Documentation from the IDL is merged with documentation defined +// via the config at normalization time, where documentation provided +// by config rules overrides IDL provided. +// +// A number of constructs specific to the API platform are supported +// in documentation text. +// +// In order to reference a proto element, the following +// notation can be used: +// 
[fully.qualified.proto.name][]
+// To override the display text used for the link, this can be used: +// 
[display text][fully.qualified.proto.name]
+// Text can be excluded from doc using the following notation: +// 
(-- internal comment --)
+// Comments can be made conditional using a visibility label. The below +// text will be only rendered if the `BETA` label is available: +// 
(--BETA: comment for BETA users --)
+// A few directives are available in documentation. Note that +// directives must appear on a single line to be properly +// identified. The `include` directive includes a markdown file from +// an external source: +// 
(== include path/to/file ==)
+// The `resource_for` directive marks a message to be the resource of +// a collection in REST view. If it is not specified, tools attempt +// to infer the resource from the operations in a collection: +// 
(== resource_for v1.shelves.books ==)
+// The directive `suppress_warning` does not directly affect documentation +// and is documented together with service config validation. +message Documentation { + // A short summary of what the service does. Can only be provided by + // plain text. + string summary = 1; + + // The top level pages for the documentation set. + repeated Page pages = 5; + + // A list of documentation rules that apply to individual API elements. + // + // **NOTE:** All service configuration rules follow "last one wins" order. + repeated DocumentationRule rules = 3; + + // The URL to the root of documentation. + string documentation_root_url = 4; + + // Declares a single overview page. For example: + // 
documentation:
+  //   summary: ...
+  //   overview: (== include overview.md ==)
+  //
+ // This is a shortcut for the following declaration (using pages style): + // 
documentation:
+  //   summary: ...
+  //   pages:
+  //   - name: Overview
+  //     content: (== include overview.md ==)
+  //
+ // Note: you cannot specify both `overview` field and `pages` field. + string overview = 2; +} + +// A documentation rule provides information about individual API elements. +message DocumentationRule { + // The selector is a comma-separated list of patterns. Each pattern is a + // qualified name of the element which may end in "*", indicating a wildcard. + // Wildcards are only allowed at the end and for a whole component of the + // qualified name, i.e. "foo.*" is ok, but not "foo.b*" or "foo.*.bar". To + // specify a default for all applicable elements, the whole pattern "*" + // is used. + string selector = 1; + + // Description of the selected API(s). + string description = 2; + + // Deprecation description of the selected element(s). It can be provided if an + // element is marked as `deprecated`. + string deprecation_description = 3; +} + +// Represents a documentation page. A page can contain subpages to represent +// nested documentation set structure. +message Page { + // The name of the page. It will be used as an identity of the page to + // generate URI of the page, text of the link to this page in navigation, + // etc. The full page name (start from the root page name to this page + // concatenated with `.`) can be used as reference to the page in your + // documentation. For example: + // 
pages:
+  // - name: Tutorial
+  //   content: (== include tutorial.md ==)
+  //   subpages:
+  //   - name: Java
+  //     content: (== include tutorial_java.md ==)
+  //
+ // You can reference `Java` page using Markdown reference link syntax: + // `[Java][Tutorial.Java]`. + string name = 1; + + // The Markdown content of the page. You can use (== include {path} ==) + // to include content from a Markdown file. + string content = 2; + + // Subpages of this page. The order of subpages specified here will be + // honored in the generated docset. + repeated Page subpages = 3; +} diff --git a/handwritten/pubsub/protos/google/api/endpoint.proto b/handwritten/pubsub/protos/google/api/endpoint.proto new file mode 100644 index 00000000000..68655b26a08 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/endpoint.proto @@ -0,0 +1,74 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "EndpointProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// `Endpoint` describes a network endpoint that serves a set of APIs. +// A service may expose any number of endpoints, and all endpoints share the +// same service configuration, such as quota configuration and monitoring +// configuration. +// +// Example service configuration: +// +// name: library-example.googleapis.com +// endpoints: +// # Below entry makes 'google.example.library.v1.Library' +// # API be served from endpoint address library-example.googleapis.com. +// # It also allows HTTP OPTIONS calls to be passed to the backend, for +// # it to decide whether the subsequent cross-origin request is +// # allowed to proceed. +// - name: library-example.googleapis.com +// allow_cors: true +message Endpoint { + // The canonical name of this endpoint. + string name = 1; + + // DEPRECATED: This field is no longer supported. Instead of using aliases, + // please specify multiple [google.api.Endpoint][google.api.Endpoint] for each of the intented + // alias. + // + // Additional names that this endpoint will be hosted on. + repeated string aliases = 2; + + // The list of APIs served by this endpoint. + repeated string apis = 3; + + // The list of features enabled on this endpoint. + repeated string features = 4; + + // The specification of an Internet routable address of API frontend that will + // handle requests to this [API Endpoint](https://cloud.google.com/apis/design/glossary). + // It should be either a valid IPv4 address or a fully-qualified domain name. + // For example, "8.8.8.8" or "myservice.appspot.com". + string target = 101; + + // Allowing + // [CORS](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing), aka + // cross-domain traffic, would allow the backends served from this endpoint to + // receive and respond to HTTP OPTIONS requests. The response will be used by + // the browser to determine whether the subsequent cross-origin request is + // allowed to proceed. + bool allow_cors = 5; +} diff --git a/handwritten/pubsub/protos/google/api/experimental/authorization_config.proto b/handwritten/pubsub/protos/google/api/experimental/authorization_config.proto new file mode 100644 index 00000000000..5c213c62531 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/experimental/authorization_config.proto @@ -0,0 +1,40 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api;api"; +option java_multiple_files = true; +option java_outer_classname = "AuthorizationConfigProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Configuration of authorization. +// +// This section determines the authorization provider, if unspecified, then no +// authorization check will be done. +// +// Example: +// +// experimental: +// authorization: +// provider: firebaserules.googleapis.com +message AuthorizationConfig { + // The name of the authorization provider, such as + // firebaserules.googleapis.com. + string provider = 1; +} diff --git a/handwritten/pubsub/protos/google/api/experimental/experimental.proto b/handwritten/pubsub/protos/google/api/experimental/experimental.proto new file mode 100644 index 00000000000..b98097df54a --- /dev/null +++ b/handwritten/pubsub/protos/google/api/experimental/experimental.proto @@ -0,0 +1,34 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; +import "google/api/experimental/authorization_config.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api;api"; +option java_multiple_files = true; +option java_outer_classname = "ExperimentalProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Experimental service configuration. These configuration options can +// only be used by whitelisted users. +message Experimental { + // Authorization configuration. + AuthorizationConfig authorization = 8; +} diff --git a/handwritten/pubsub/protos/google/api/http.proto b/handwritten/pubsub/protos/google/api/http.proto new file mode 100644 index 00000000000..5f8538a0164 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/http.proto @@ -0,0 +1,291 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; +option java_multiple_files = true; +option java_outer_classname = "HttpProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Defines the HTTP configuration for a service. It contains a list of +// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method +// to one or more HTTP REST API methods. +message Http { + // A list of HTTP configuration rules that apply to individual API methods. + // + // **NOTE:** All service configuration rules follow "last one wins" order. + repeated HttpRule rules = 1; +} + +// `HttpRule` defines the mapping of an RPC method to one or more HTTP +// REST APIs. The mapping determines what portions of the request +// message are populated from the path, query parameters, or body of +// the HTTP request. The mapping is typically specified as an +// `google.api.http` annotation, see "google/api/annotations.proto" +// for details. +// +// The mapping consists of a field specifying the path template and +// method kind. The path template can refer to fields in the request +// message, as in the example below which describes a REST GET +// operation on a resource collection of messages: +// +// +// service Messaging { +// rpc GetMessage(GetMessageRequest) returns (Message) { +// option (google.api.http).get = "/v1/messages/{message_id}/{sub.subfield}"; +// } +// } +// message GetMessageRequest { +// message SubMessage { +// string subfield = 1; +// } +// string message_id = 1; // mapped to the URL +// SubMessage sub = 2; // `sub.subfield` is url-mapped +// } +// message Message { +// string text = 1; // content of the resource +// } +// +// The same http annotation can alternatively be expressed inside the +// `GRPC API Configuration` YAML file. +// +// http: +// rules: +// - selector: .Messaging.GetMessage +// get: /v1/messages/{message_id}/{sub.subfield} +// +// This definition enables an automatic, bidrectional mapping of HTTP +// JSON to RPC. Example: +// +// HTTP | RPC +// -----|----- +// `GET /v1/messages/123456/foo` | `GetMessage(message_id: "123456" sub: SubMessage(subfield: "foo"))` +// +// In general, not only fields but also field paths can be referenced +// from a path pattern. Fields mapped to the path pattern cannot be +// repeated and must have a primitive (non-message) type. +// +// Any fields in the request message which are not bound by the path +// pattern automatically become (optional) HTTP query +// parameters. Assume the following definition of the request message: +// +// +// message GetMessageRequest { +// message SubMessage { +// string subfield = 1; +// } +// string message_id = 1; // mapped to the URL +// int64 revision = 2; // becomes a parameter +// SubMessage sub = 3; // `sub.subfield` becomes a parameter +// } +// +// +// This enables a HTTP JSON to RPC mapping as below: +// +// HTTP | RPC +// -----|----- +// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: "foo"))` +// +// Note that fields which are mapped to HTTP parameters must have a +// primitive type or a repeated primitive type. Message types are not +// allowed. In the case of a repeated type, the parameter can be +// repeated in the URL, as in `...?param=A¶m=B`. +// +// For HTTP method kinds which allow a request body, the `body` field +// specifies the mapping. Consider a REST update method on the +// message resource collection: +// +// +// service Messaging { +// rpc UpdateMessage(UpdateMessageRequest) returns (Message) { +// option (google.api.http) = { +// put: "/v1/messages/{message_id}" +// body: "message" +// }; +// } +// } +// message UpdateMessageRequest { +// string message_id = 1; // mapped to the URL +// Message message = 2; // mapped to the body +// } +// +// +// The following HTTP JSON to RPC mapping is enabled, where the +// representation of the JSON in the request body is determined by +// protos JSON encoding: +// +// HTTP | RPC +// -----|----- +// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })` +// +// The special name `*` can be used in the body mapping to define that +// every field not bound by the path template should be mapped to the +// request body. This enables the following alternative definition of +// the update method: +// +// service Messaging { +// rpc UpdateMessage(Message) returns (Message) { +// option (google.api.http) = { +// put: "/v1/messages/{message_id}" +// body: "*" +// }; +// } +// } +// message Message { +// string message_id = 1; +// string text = 2; +// } +// +// +// The following HTTP JSON to RPC mapping is enabled: +// +// HTTP | RPC +// -----|----- +// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")` +// +// Note that when using `*` in the body mapping, it is not possible to +// have HTTP parameters, as all fields not bound by the path end in +// the body. This makes this option more rarely used in practice of +// defining REST APIs. The common usage of `*` is in custom methods +// which don't use the URL at all for transferring data. +// +// It is possible to define multiple HTTP methods for one RPC by using +// the `additional_bindings` option. Example: +// +// service Messaging { +// rpc GetMessage(GetMessageRequest) returns (Message) { +// option (google.api.http) = { +// get: "/v1/messages/{message_id}" +// additional_bindings { +// get: "/v1/users/{user_id}/messages/{message_id}" +// } +// }; +// } +// } +// message GetMessageRequest { +// string message_id = 1; +// string user_id = 2; +// } +// +// +// This enables the following two alternative HTTP JSON to RPC +// mappings: +// +// HTTP | RPC +// -----|----- +// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` +// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")` +// +// # Rules for HTTP mapping +// +// The rules for mapping HTTP path, query parameters, and body fields +// to the request message are as follows: +// +// 1. The `body` field specifies either `*` or a field path, or is +// omitted. If omitted, it assumes there is no HTTP body. +// 2. Leaf fields (recursive expansion of nested messages in the +// request) can be classified into three types: +// (a) Matched in the URL template. +// (b) Covered by body (if body is `*`, everything except (a) fields; +// else everything under the body field) +// (c) All other fields. +// 3. URL query parameters found in the HTTP request are mapped to (c) fields. +// 4. Any body sent with an HTTP request can contain only (b) fields. +// +// The syntax of the path template is as follows: +// +// Template = "/" Segments [ Verb ] ; +// Segments = Segment { "/" Segment } ; +// Segment = "*" | "**" | LITERAL | Variable ; +// Variable = "{" FieldPath [ "=" Segments ] "}" ; +// FieldPath = IDENT { "." IDENT } ; +// Verb = ":" LITERAL ; +// +// The syntax `*` matches a single path segment. It follows the semantics of +// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String +// Expansion. +// +// The syntax `**` matches zero or more path segments. It follows the semantics +// of [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.3 Reserved +// Expansion. NOTE: it must be the last segment in the path except the Verb. +// +// The syntax `LITERAL` matches literal text in the URL path. +// +// The syntax `Variable` matches the entire path as specified by its template; +// this nested template must not contain further variables. If a variable +// matches a single path segment, its template may be omitted, e.g. `{var}` +// is equivalent to `{var=*}`. +// +// NOTE: the field paths in variables and in the `body` must not refer to +// repeated fields or map fields. +// +// Use CustomHttpPattern to specify any HTTP method that is not included in the +// `pattern` field, such as HEAD, or "*" to leave the HTTP method unspecified for +// a given URL path rule. The wild-card rule is useful for services that provide +// content to Web (HTML) clients. +message HttpRule { + // Selects methods to which this rule applies. + // + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // Determines the URL pattern is matched by this rules. This pattern can be + // used with any of the {get|put|post|delete|patch} methods. A custom method + // can be defined using the 'custom' field. + oneof pattern { + // Used for listing and getting information about resources. + string get = 2; + + // Used for updating a resource. + string put = 3; + + // Used for creating a resource. + string post = 4; + + // Used for deleting a resource. + string delete = 5; + + // Used for updating a resource. + string patch = 6; + + // Custom pattern is used for defining custom verbs. + CustomHttpPattern custom = 8; + } + + // The name of the request field whose value is mapped to the HTTP body, or + // `*` for mapping all fields not captured by the path pattern to the HTTP + // body. NOTE: the referred field must not be a repeated field and must be + // present at the top-level of request message type. + string body = 7; + + // Additional HTTP bindings for the selector. Nested bindings must + // not contain an `additional_bindings` field themselves (that is, + // the nesting may only be one level deep). + repeated HttpRule additional_bindings = 11; +} + +// A custom pattern is used for defining custom HTTP verb. +message CustomHttpPattern { + // The name of this custom HTTP verb. + string kind = 1; + + // The path matched by this custom verb. + string path = 2; +} diff --git a/handwritten/pubsub/protos/google/api/httpbody.proto b/handwritten/pubsub/protos/google/api/httpbody.proto new file mode 100644 index 00000000000..f5176634b0b --- /dev/null +++ b/handwritten/pubsub/protos/google/api/httpbody.proto @@ -0,0 +1,70 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api/httpbody;httpbody"; +option java_multiple_files = true; +option java_outer_classname = "HttpBodyProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Message that represents an arbitrary HTTP body. It should only be used for +// payload formats that can't be represented as JSON, such as raw binary or +// an HTML page. +// +// +// This message can be used both in streaming and non-streaming API methods in +// the request as well as the response. +// +// It can be used as a top-level request field, which is convenient if one +// wants to extract parameters from either the URL or HTTP template into the +// request fields and also want access to the raw HTTP body. +// +// Example: +// +// message GetResourceRequest { +// // A unique request id. +// string request_id = 1; +// +// // The raw HTTP body is bound to this field. +// google.api.HttpBody http_body = 2; +// } +// +// service ResourceService { +// rpc GetResource(GetResourceRequest) returns (google.api.HttpBody); +// rpc UpdateResource(google.api.HttpBody) returns (google.protobuf.Empty); +// } +// +// Example with streaming methods: +// +// service CaldavService { +// rpc GetCalendar(stream google.api.HttpBody) +// returns (stream google.api.HttpBody); +// rpc UpdateCalendar(stream google.api.HttpBody) +// returns (stream google.api.HttpBody); +// } +// +// Use of this type only changes how the request and response bodies are +// handled, all other features will continue to work unchanged. +message HttpBody { + // The HTTP Content-Type string representing the content type of the body. + string content_type = 1; + + // HTTP body binary data. + bytes data = 2; +} diff --git a/handwritten/pubsub/protos/google/api/label.proto b/handwritten/pubsub/protos/google/api/label.proto new file mode 100644 index 00000000000..ec2c14f0c35 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/label.proto @@ -0,0 +1,49 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/label;label"; +option java_multiple_files = true; +option java_outer_classname = "LabelProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// A description of a label. +message LabelDescriptor { + // Value types that can be used as label values. + enum ValueType { + // A variable-length string. This is the default. + STRING = 0; + + // Boolean; true or false. + BOOL = 1; + + // A 64-bit signed integer. + INT64 = 2; + } + + // The label key. + string key = 1; + + // The type of data that can be assigned to the label. + ValueType value_type = 2; + + // A human-readable description for the label. + string description = 3; +} diff --git a/handwritten/pubsub/protos/google/api/log.proto b/handwritten/pubsub/protos/google/api/log.proto new file mode 100644 index 00000000000..d64f2439581 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/log.proto @@ -0,0 +1,55 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/label.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "LogProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// A description of a log type. Example in YAML format: +// +// - name: library.googleapis.com/activity_history +// description: The history of borrowing and returning library items. +// display_name: Activity +// labels: +// - key: /customer_id +// description: Identifier of a library customer +message LogDescriptor { + // The name of the log. It must be less than 512 characters long and can + // include the following characters: upper- and lower-case alphanumeric + // characters [A-Za-z0-9], and punctuation characters including + // slash, underscore, hyphen, period [/_-.]. + string name = 1; + + // The set of labels that are available to describe a specific log entry. + // Runtime requests that contain labels not specified here are + // considered invalid. + repeated LabelDescriptor labels = 2; + + // A human-readable description of this log. This information appears in + // the documentation and can contain details. + string description = 3; + + // The human-readable name for this log. This information appears on + // the user interface and should be concise. + string display_name = 4; +} diff --git a/handwritten/pubsub/protos/google/api/logging.proto b/handwritten/pubsub/protos/google/api/logging.proto new file mode 100644 index 00000000000..15c8a996e97 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/logging.proto @@ -0,0 +1,83 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "LoggingProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Logging configuration of the service. +// +// The following example shows how to configure logs to be sent to the +// producer and consumer projects. In the example, the `activity_history` +// log is sent to both the producer and consumer projects, whereas the +// `purchase_history` log is only sent to the producer project. +// +// monitored_resources: +// - type: library.googleapis.com/branch +// labels: +// - key: /city +// description: The city where the library branch is located in. +// - key: /name +// description: The name of the branch. +// logs: +// - name: activity_history +// labels: +// - key: /customer_id +// - name: purchase_history +// logging: +// producer_destinations: +// - monitored_resource: library.googleapis.com/branch +// logs: +// - activity_history +// - purchase_history +// consumer_destinations: +// - monitored_resource: library.googleapis.com/branch +// logs: +// - activity_history +message Logging { + // Configuration of a specific logging destination (the producer project + // or the consumer project). + message LoggingDestination { + // The monitored resource type. The type must be defined in the + // [Service.monitored_resources][google.api.Service.monitored_resources] section. + string monitored_resource = 3; + + // Names of the logs to be sent to this destination. Each name must + // be defined in the [Service.logs][google.api.Service.logs] section. If the log name is + // not a domain scoped name, it will be automatically prefixed with + // the service name followed by "/". + repeated string logs = 1; + } + + // Logging configurations for sending logs to the producer project. + // There can be multiple producer destinations, each one must have a + // different monitored resource type. A log can be used in at most + // one producer destination. + repeated LoggingDestination producer_destinations = 1; + + // Logging configurations for sending logs to the consumer project. + // There can be multiple consumer destinations, each one must have a + // different monitored resource type. A log can be used in at most + // one consumer destination. + repeated LoggingDestination consumer_destinations = 2; +} diff --git a/handwritten/pubsub/protos/google/api/metric.proto b/handwritten/pubsub/protos/google/api/metric.proto new file mode 100644 index 00000000000..17b7263a334 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/metric.proto @@ -0,0 +1,196 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/label.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/metric;metric"; +option java_multiple_files = true; +option java_outer_classname = "MetricProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Defines a metric type and its schema. Once a metric descriptor is created, +// deleting or altering it stops data collection and makes the metric type's +// existing data unusable. +message MetricDescriptor { + // The kind of measurement. It describes how the data is reported. + enum MetricKind { + // Do not use this default value. + METRIC_KIND_UNSPECIFIED = 0; + + // An instantaneous measurement of a value. + GAUGE = 1; + + // The change in a value during a time interval. + DELTA = 2; + + // A value accumulated over a time interval. Cumulative + // measurements in a time series should have the same start time + // and increasing end times, until an event resets the cumulative + // value to zero and sets a new start time for the following + // points. + CUMULATIVE = 3; + } + + // The value type of a metric. + enum ValueType { + // Do not use this default value. + VALUE_TYPE_UNSPECIFIED = 0; + + // The value is a boolean. + // This value type can be used only if the metric kind is `GAUGE`. + BOOL = 1; + + // The value is a signed 64-bit integer. + INT64 = 2; + + // The value is a double precision floating point number. + DOUBLE = 3; + + // The value is a text string. + // This value type can be used only if the metric kind is `GAUGE`. + STRING = 4; + + // The value is a [`Distribution`][google.api.Distribution]. + DISTRIBUTION = 5; + + // The value is money. + MONEY = 6; + } + + // The resource name of the metric descriptor. Depending on the + // implementation, the name typically includes: (1) the parent resource name + // that defines the scope of the metric type or of its data; and (2) the + // metric's URL-encoded type, which also appears in the `type` field of this + // descriptor. For example, following is the resource name of a custom + // metric within the GCP project `my-project-id`: + // + // "projects/my-project-id/metricDescriptors/custom.googleapis.com%2Finvoice%2Fpaid%2Famount" + string name = 1; + + // The metric type, including its DNS name prefix. The type is not + // URL-encoded. All user-defined custom metric types have the DNS name + // `custom.googleapis.com`. Metric types should use a natural hierarchical + // grouping. For example: + // + // "custom.googleapis.com/invoice/paid/amount" + // "appengine.googleapis.com/http/server/response_latencies" + string type = 8; + + // The set of labels that can be used to describe a specific + // instance of this metric type. For example, the + // `appengine.googleapis.com/http/server/response_latencies` metric + // type has a label for the HTTP response code, `response_code`, so + // you can look at latencies for successful responses or just + // for responses that failed. + repeated LabelDescriptor labels = 2; + + // Whether the metric records instantaneous values, changes to a value, etc. + // Some combinations of `metric_kind` and `value_type` might not be supported. + MetricKind metric_kind = 3; + + // Whether the measurement is an integer, a floating-point number, etc. + // Some combinations of `metric_kind` and `value_type` might not be supported. + ValueType value_type = 4; + + // The unit in which the metric value is reported. It is only applicable + // if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The + // supported units are a subset of [The Unified Code for Units of + // Measure](http://unitsofmeasure.org/ucum.html) standard: + // + // **Basic units (UNIT)** + // + // * `bit` bit + // * `By` byte + // * `s` second + // * `min` minute + // * `h` hour + // * `d` day + // + // **Prefixes (PREFIX)** + // + // * `k` kilo (10**3) + // * `M` mega (10**6) + // * `G` giga (10**9) + // * `T` tera (10**12) + // * `P` peta (10**15) + // * `E` exa (10**18) + // * `Z` zetta (10**21) + // * `Y` yotta (10**24) + // * `m` milli (10**-3) + // * `u` micro (10**-6) + // * `n` nano (10**-9) + // * `p` pico (10**-12) + // * `f` femto (10**-15) + // * `a` atto (10**-18) + // * `z` zepto (10**-21) + // * `y` yocto (10**-24) + // * `Ki` kibi (2**10) + // * `Mi` mebi (2**20) + // * `Gi` gibi (2**30) + // * `Ti` tebi (2**40) + // + // **Grammar** + // + // The grammar includes the dimensionless unit `1`, such as `1/s`. + // + // The grammar also includes these connectors: + // + // * `/` division (as an infix operator, e.g. `1/s`). + // * `.` multiplication (as an infix operator, e.g. `GBy.d`) + // + // The grammar for a unit is as follows: + // + // Expression = Component { "." Component } { "/" Component } ; + // + // Component = [ PREFIX ] UNIT [ Annotation ] + // | Annotation + // | "1" + // ; + // + // Annotation = "{" NAME "}" ; + // + // Notes: + // + // * `Annotation` is just a comment if it follows a `UNIT` and is + // equivalent to `1` if it is used alone. For examples, + // `{requests}/s == 1/s`, `By{transmitted}/s == By/s`. + // * `NAME` is a sequence of non-blank printable ASCII characters not + // containing '{' or '}'. + string unit = 5; + + // A detailed description of the metric, which can be used in documentation. + string description = 6; + + // A concise name for the metric, which can be displayed in user interfaces. + // Use sentence case without an ending period, for example "Request count". + string display_name = 7; +} + +// A specific metric, identified by specifying values for all of the +// labels of a [`MetricDescriptor`][google.api.MetricDescriptor]. +message Metric { + // An existing metric type, see [google.api.MetricDescriptor][google.api.MetricDescriptor]. + // For example, `custom.googleapis.com/invoice/paid/amount`. + string type = 3; + + // The set of label values that uniquely identify this metric. All + // labels listed in the `MetricDescriptor` must be assigned values. + map labels = 2; +} diff --git a/handwritten/pubsub/protos/google/api/monitored_resource.proto b/handwritten/pubsub/protos/google/api/monitored_resource.proto new file mode 100644 index 00000000000..612ffa18da4 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/monitored_resource.proto @@ -0,0 +1,91 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/label.proto"; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/monitoredres;monitoredres"; +option java_multiple_files = true; +option java_outer_classname = "MonitoredResourceProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// An object that describes the schema of a [MonitoredResource][google.api.MonitoredResource] object using a +// type name and a set of labels. For example, the monitored resource +// descriptor for Google Compute Engine VM instances has a type of +// `"gce_instance"` and specifies the use of the labels `"instance_id"` and +// `"zone"` to identify particular VM instances. +// +// Different APIs can support different monitored resource types. APIs generally +// provide a `list` method that returns the monitored resource descriptors used +// by the API. +message MonitoredResourceDescriptor { + // Optional. The resource name of the monitored resource descriptor: + // `"projects/{project_id}/monitoredResourceDescriptors/{type}"` where + // {type} is the value of the `type` field in this object and + // {project_id} is a project ID that provides API-specific context for + // accessing the type. APIs that do not use project information can use the + // resource name format `"monitoredResourceDescriptors/{type}"`. + string name = 5; + + // Required. The monitored resource type. For example, the type + // `"cloudsql_database"` represents databases in Google Cloud SQL. + // The maximum length of this value is 256 characters. + string type = 1; + + // Optional. A concise name for the monitored resource type that might be + // displayed in user interfaces. It should be a Title Cased Noun Phrase, + // without any article or other determiners. For example, + // `"Google Cloud SQL Database"`. + string display_name = 2; + + // Optional. A detailed description of the monitored resource type that might + // be used in documentation. + string description = 3; + + // Required. A set of labels used to describe instances of this monitored + // resource type. For example, an individual Google Cloud SQL database is + // identified by values for the labels `"database_id"` and `"zone"`. + repeated LabelDescriptor labels = 4; +} + +// An object representing a resource that can be used for monitoring, logging, +// billing, or other purposes. Examples include virtual machine instances, +// databases, and storage devices such as disks. The `type` field identifies a +// [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] object that describes the resource's +// schema. Information in the `labels` field identifies the actual resource and +// its attributes according to the schema. For example, a particular Compute +// Engine VM instance could be represented by the following object, because the +// [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] for `"gce_instance"` has labels +// `"instance_id"` and `"zone"`: +// +// { "type": "gce_instance", +// "labels": { "instance_id": "12345678901234", +// "zone": "us-central1-a" }} +message MonitoredResource { + // Required. The monitored resource type. This field must match + // the `type` field of a [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] object. For + // example, the type of a Cloud SQL database is `"cloudsql_database"`. + string type = 1; + + // Required. Values for all of the labels listed in the associated monitored + // resource descriptor. For example, Cloud SQL databases use the labels + // `"database_id"` and `"zone"`. + map labels = 2; +} diff --git a/handwritten/pubsub/protos/google/api/monitoring.proto b/handwritten/pubsub/protos/google/api/monitoring.proto new file mode 100644 index 00000000000..f49c85f85ee --- /dev/null +++ b/handwritten/pubsub/protos/google/api/monitoring.proto @@ -0,0 +1,89 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "MonitoringProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Monitoring configuration of the service. +// +// The example below shows how to configure monitored resources and metrics +// for monitoring. In the example, a monitored resource and two metrics are +// defined. The `library.googleapis.com/book/returned_count` metric is sent +// to both producer and consumer projects, whereas the +// `library.googleapis.com/book/overdue_count` metric is only sent to the +// consumer project. +// +// monitored_resources: +// - type: library.googleapis.com/branch +// labels: +// - key: /city +// description: The city where the library branch is located in. +// - key: /name +// description: The name of the branch. +// metrics: +// - name: library.googleapis.com/book/returned_count +// metric_kind: DELTA +// value_type: INT64 +// labels: +// - key: /customer_id +// - name: library.googleapis.com/book/overdue_count +// metric_kind: GAUGE +// value_type: INT64 +// labels: +// - key: /customer_id +// monitoring: +// producer_destinations: +// - monitored_resource: library.googleapis.com/branch +// metrics: +// - library.googleapis.com/book/returned_count +// consumer_destinations: +// - monitored_resource: library.googleapis.com/branch +// metrics: +// - library.googleapis.com/book/returned_count +// - library.googleapis.com/book/overdue_count +message Monitoring { + // Configuration of a specific monitoring destination (the producer project + // or the consumer project). + message MonitoringDestination { + // The monitored resource type. The type must be defined in + // [Service.monitored_resources][google.api.Service.monitored_resources] section. + string monitored_resource = 1; + + // Names of the metrics to report to this monitoring destination. + // Each name must be defined in [Service.metrics][google.api.Service.metrics] section. + repeated string metrics = 2; + } + + // Monitoring configurations for sending metrics to the producer project. + // There can be multiple producer destinations, each one must have a + // different monitored resource type. A metric can be used in at most + // one producer destination. + repeated MonitoringDestination producer_destinations = 1; + + // Monitoring configurations for sending metrics to the consumer project. + // There can be multiple consumer destinations, each one must have a + // different monitored resource type. A metric can be used in at most + // one consumer destination. + repeated MonitoringDestination consumer_destinations = 2; +} diff --git a/handwritten/pubsub/protos/google/api/quota.proto b/handwritten/pubsub/protos/google/api/quota.proto new file mode 100644 index 00000000000..aa327a19694 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/quota.proto @@ -0,0 +1,259 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "QuotaProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Quota configuration helps to achieve fairness and budgeting in service +// usage. +// +// The quota configuration works this way: +// - The service configuration defines a set of metrics. +// - For API calls, the quota.metric_rules maps methods to metrics with +// corresponding costs. +// - The quota.limits defines limits on the metrics, which will be used for +// quota checks at runtime. +// +// An example quota configuration in yaml format: +// +// quota: +// limits: +// +// - name: apiWriteQpsPerProject +// metric: library.googleapis.com/write_calls +// unit: "1/min/{project}" # rate limit for consumer projects +// values: +// STANDARD: 10000 +// +// # The metric rules bind all methods to the read_calls metric, +// # except for the UpdateBook and DeleteBook methods. These two methods +// # are mapped to the write_calls metric, with the UpdateBook method +// # consuming at twice rate as the DeleteBook method. +// metric_rules: +// - selector: "*" +// metric_costs: +// library.googleapis.com/read_calls: 1 +// - selector: google.example.library.v1.LibraryService.UpdateBook +// metric_costs: +// library.googleapis.com/write_calls: 2 +// - selector: google.example.library.v1.LibraryService.DeleteBook +// metric_costs: +// library.googleapis.com/write_calls: 1 +// +// Corresponding Metric definition: +// +// metrics: +// - name: library.googleapis.com/read_calls +// display_name: Read requests +// metric_kind: DELTA +// value_type: INT64 +// +// - name: library.googleapis.com/write_calls +// display_name: Write requests +// metric_kind: DELTA +// value_type: INT64 +// +message Quota { + // List of `QuotaLimit` definitions for the service. + // + // Used by metric-based quotas only. + repeated QuotaLimit limits = 3; + + // List of `MetricRule` definitions, each one mapping a selected method to one + // or more metrics. + // + // Used by metric-based quotas only. + repeated MetricRule metric_rules = 4; +} + +// Bind API methods to metrics. Binding a method to a metric causes that +// metric's configured quota, billing, and monitoring behaviors to apply to the +// method call. +// +// Used by metric-based quotas only. +message MetricRule { + // Selects the methods to which this rule applies. + // + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // Metrics to update when the selected methods are called, and the associated + // cost applied to each metric. + // + // The key of the map is the metric name, and the values are the amount + // increased for the metric against which the quota limits are defined. + // The value must not be negative. + map metric_costs = 2; +} + +// `QuotaLimit` defines a specific limit that applies over a specified duration +// for a limit type. There can be at most one limit for a duration and limit +// type combination defined within a `QuotaGroup`. +message QuotaLimit { + // Name of the quota limit. The name is used to refer to the limit when + // overriding the default limit on per-consumer basis. + // + // For group-based quota limits, the name must be unique within the quota + // group. If a name is not provided, it will be generated from the limit_by + // and duration fields. + // + // For metric-based quota limits, the name must be provided, and it must be + // unique within the service. The name can only include alphanumeric + // characters as well as '-'. + // + // The maximum length of the limit name is 64 characters. + // + // The name of a limit is used as a unique identifier for this limit. + // Therefore, once a limit has been put into use, its name should be + // immutable. You can use the display_name field to provide a user-friendly + // name for the limit. The display name can be evolved over time without + // affecting the identity of the limit. + string name = 6; + + // Optional. User-visible, extended description for this quota limit. + // Should be used only when more context is needed to understand this limit + // than provided by the limit's display name (see: `display_name`). + string description = 2; + + // Default number of tokens that can be consumed during the specified + // duration. This is the number of tokens assigned when a client + // application developer activates the service for his/her project. + // + // Specifying a value of 0 will block all requests. This can be used if you + // are provisioning quota to selected consumers and blocking others. + // Similarly, a value of -1 will indicate an unlimited quota. No other + // negative values are allowed. + // + // Used by group-based quotas only. + int64 default_limit = 3; + + // Maximum number of tokens that can be consumed during the specified + // duration. Client application developers can override the default limit up + // to this maximum. If specified, this value cannot be set to a value less + // than the default limit. If not specified, it is set to the default limit. + // + // To allow clients to apply overrides with no upper bound, set this to -1, + // indicating unlimited maximum quota. + // + // Used by group-based quotas only. + int64 max_limit = 4; + + // Free tier value displayed in the Developers Console for this limit. + // The free tier is the number of tokens that will be subtracted from the + // billed amount when billing is enabled. + // This field can only be set on a limit with duration "1d", in a billable + // group; it is invalid on any other limit. If this field is not set, it + // defaults to 0, indicating that there is no free tier for this service. + // + // Used by group-based quotas only. + int64 free_tier = 7; + + // Duration of this limit in textual notation. Example: "100s", "24h", "1d". + // For duration longer than a day, only multiple of days is supported. We + // support only "100s" and "1d" for now. Additional support will be added in + // the future. "0" indicates indefinite duration. + // + // Used by group-based quotas only. + string duration = 5; + + // The name of the metric this quota limit applies to. The quota limits with + // the same metric will be checked together during runtime. The metric must be + // defined within the service config. + // + // Used by metric-based quotas only. + string metric = 8; + + // Specify the unit of the quota limit. It uses the same syntax as + // [Metric.unit][]. The supported unit kinds are determined by the quota + // backend system. + // + // The [Google Service Control](https://cloud.google.com/service-control) + // supports the following unit components: + // * One of the time intevals: + // * "/min" for quota every minute. + // * "/d" for quota every 24 hours, starting 00:00 US Pacific Time. + // * Otherwise the quota won't be reset by time, such as storage limit. + // * One and only one of the granted containers: + // * "/{organization}" quota for an organization. + // * "/{project}" quota for a project. + // * "/{folder}" quota for a folder. + // * "/{resource}" quota for a universal resource. + // * Zero or more quota segmentation dimension. Not all combos are valid. + // * "/{region}" quota for every region. Not to be used with time intervals. + // * Otherwise the resources granted on the target is not segmented. + // * "/{zone}" quota for every zone. Not to be used with time intervals. + // * Otherwise the resources granted on the target is not segmented. + // * "/{resource}" quota for a resource associated with a project or org. + // + // Here are some examples: + // * "1/min/{project}" for quota per minute per project. + // * "1/min/{user}" for quota per minute per user. + // * "1/min/{organization}" for quota per minute per organization. + // + // Note: the order of unit components is insignificant. + // The "1" at the beginning is required to follow the metric unit syntax. + // + // Used by metric-based quotas only. + string unit = 9; + + // Tiered limit values. Also allows for regional or zone overrides for these + // values if "/{region}" or "/{zone}" is specified in the unit field. + // + // Currently supported tiers from low to high: + // VERY_LOW, LOW, STANDARD, HIGH, VERY_HIGH + // + // To apply different limit values for users according to their tiers, specify + // the values for the tiers you want to differentiate. For example: + // {LOW:100, STANDARD:500, HIGH:1000, VERY_HIGH:5000} + // + // The limit value for each tier is optional except for the tier STANDARD. + // The limit value for an unspecified tier falls to the value of its next + // tier towards tier STANDARD. For the above example, the limit value for tier + // STANDARD is 500. + // + // To apply the same limit value for all users, just specify limit value for + // tier STANDARD. For example: {STANDARD:500}. + // + // To apply a regional overide for a tier, add a map entry with key + // "/", where is a region name. Similarly, for a zone + // override, add a map entry with key "/{zone}". + // Further, a wildcard can be used at the end of a zone name in order to + // specify zone level overrides. For example: + // LOW: 10, STANDARD: 50, HIGH: 100, + // LOW/us-central1: 20, STANDARD/us-central1: 60, HIGH/us-central1: 200, + // LOW/us-central1-*: 10, STANDARD/us-central1-*: 20, HIGH/us-central1-*: 80 + // + // The regional overrides tier set for each region must be the same as + // the tier set for default limit values. Same rule applies for zone overrides + // tier as well. + // + // Used by metric-based quotas only. + map values = 10; + + // User-visible display name for this limit. + // Optional. If not set, the UI will provide a default display name based on + // the quota configuration. This field can be used to override the default + // display name generated from the configuration. + string display_name = 12; +} diff --git a/handwritten/pubsub/protos/google/api/service.proto b/handwritten/pubsub/protos/google/api/service.proto new file mode 100644 index 00000000000..04c7fd700b1 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/service.proto @@ -0,0 +1,176 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; +import "google/api/auth.proto"; +import "google/api/backend.proto"; +import "google/api/context.proto"; +import "google/api/control.proto"; +import "google/api/documentation.proto"; +import "google/api/endpoint.proto"; +import "google/api/experimental/experimental.proto"; +import "google/api/http.proto"; +import "google/api/label.proto"; +import "google/api/log.proto"; +import "google/api/logging.proto"; +import "google/api/metric.proto"; +import "google/api/monitored_resource.proto"; +import "google/api/monitoring.proto"; +import "google/api/quota.proto"; +import "google/api/source_info.proto"; +import "google/api/system_parameter.proto"; +import "google/api/usage.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/api.proto"; +import "google/protobuf/type.proto"; +import "google/protobuf/wrappers.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "ServiceProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// `Service` is the root object of Google service configuration schema. It +// describes basic information about a service, such as the name and the +// title, and delegates other aspects to sub-sections. Each sub-section is +// either a proto message or a repeated proto message that configures a +// specific aspect, such as auth. See each proto message definition for details. +// +// Example: +// +// type: google.api.Service +// config_version: 3 +// name: calendar.googleapis.com +// title: Google Calendar API +// apis: +// - name: google.calendar.v3.Calendar +// authentication: +// providers: +// - id: google_calendar_auth +// jwks_uri: https://www.googleapis.com/oauth2/v1/certs +// issuer: https://securetoken.google.com +// rules: +// - selector: "*" +// requirements: +// provider_id: google_calendar_auth +message Service { + // The version of the service configuration. The config version may + // influence interpretation of the configuration, for example, to + // determine defaults. This is documented together with applicable + // options. The current default for the config version itself is `3`. + google.protobuf.UInt32Value config_version = 20; + + // The DNS address at which this service is available, + // e.g. `calendar.googleapis.com`. + string name = 1; + + // A unique ID for a specific instance of this message, typically assigned + // by the client for tracking purpose. If empty, the server may choose to + // generate one instead. + string id = 33; + + // The product title associated with this service. + string title = 2; + + // The id of the Google developer project that owns the service. + // Members of this project can manage the service configuration, + // manage consumption of the service, etc. + string producer_project_id = 22; + + // A list of API interfaces exported by this service. Only the `name` field + // of the [google.protobuf.Api][google.protobuf.Api] needs to be provided by the configuration + // author, as the remaining fields will be derived from the IDL during the + // normalization process. It is an error to specify an API interface here + // which cannot be resolved against the associated IDL files. + repeated google.protobuf.Api apis = 3; + + // A list of all proto message types included in this API service. + // Types referenced directly or indirectly by the `apis` are + // automatically included. Messages which are not referenced but + // shall be included, such as types used by the `google.protobuf.Any` type, + // should be listed here by name. Example: + // + // types: + // - name: google.protobuf.Int32 + repeated google.protobuf.Type types = 4; + + // A list of all enum types included in this API service. Enums + // referenced directly or indirectly by the `apis` are automatically + // included. Enums which are not referenced but shall be included + // should be listed here by name. Example: + // + // enums: + // - name: google.someapi.v1.SomeEnum + repeated google.protobuf.Enum enums = 5; + + // Additional API documentation. + Documentation documentation = 6; + + // API backend configuration. + Backend backend = 8; + + // HTTP configuration. + Http http = 9; + + // Quota configuration. + Quota quota = 10; + + // Auth configuration. + Authentication authentication = 11; + + // Context configuration. + Context context = 12; + + // Configuration controlling usage of this service. + Usage usage = 15; + + // Configuration for network endpoints. If this is empty, then an endpoint + // with the same name as the service is automatically generated to service all + // defined APIs. + repeated Endpoint endpoints = 18; + + // Configuration for the service control plane. + Control control = 21; + + // Defines the logs used by this service. + repeated LogDescriptor logs = 23; + + // Defines the metrics used by this service. + repeated MetricDescriptor metrics = 24; + + // Defines the monitored resources used by this service. This is required + // by the [Service.monitoring][google.api.Service.monitoring] and [Service.logging][google.api.Service.logging] configurations. + repeated MonitoredResourceDescriptor monitored_resources = 25; + + // Logging configuration. + Logging logging = 27; + + // Monitoring configuration. + Monitoring monitoring = 28; + + // System parameter configuration. + SystemParameters system_parameters = 29; + + // Output only. The source information for this configuration if available. + SourceInfo source_info = 37; + + // Experimental configuration. + Experimental experimental = 101; +} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/check_error.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/check_error.proto new file mode 100644 index 00000000000..4fa31cf4c26 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/servicecontrol/v1/check_error.proto @@ -0,0 +1,95 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api.servicecontrol.v1; + +import "google/api/annotations.proto"; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; +option java_multiple_files = true; +option java_outer_classname = "CheckErrorProto"; +option java_package = "com.google.api.servicecontrol.v1"; + + +// Defines the errors to be returned in +// [google.api.servicecontrol.v1.CheckResponse.check_errors][google.api.servicecontrol.v1.CheckResponse.check_errors]. +message CheckError { + // Error codes for Check responses. + enum Code { + // This is never used in `CheckResponse`. + ERROR_CODE_UNSPECIFIED = 0; + + // The consumer's project id was not found. + // Same as [google.rpc.Code.NOT_FOUND][]. + NOT_FOUND = 5; + + // The consumer doesn't have access to the specified resource. + // Same as [google.rpc.Code.PERMISSION_DENIED][]. + PERMISSION_DENIED = 7; + + // Quota check failed. Same as [google.rpc.Code.RESOURCE_EXHAUSTED][]. + RESOURCE_EXHAUSTED = 8; + + // The consumer hasn't activated the service. + SERVICE_NOT_ACTIVATED = 104; + + // The consumer cannot access the service because billing is disabled. + BILLING_DISABLED = 107; + + // The consumer's project has been marked as deleted (soft deletion). + PROJECT_DELETED = 108; + + // The consumer's project number or id does not represent a valid project. + PROJECT_INVALID = 114; + + // The IP address of the consumer is invalid for the specific consumer + // project. + IP_ADDRESS_BLOCKED = 109; + + // The referer address of the consumer request is invalid for the specific + // consumer project. + REFERER_BLOCKED = 110; + + // The client application of the consumer request is invalid for the + // specific consumer project. + CLIENT_APP_BLOCKED = 111; + + // The consumer's API key is invalid. + API_KEY_INVALID = 105; + + // The consumer's API Key has expired. + API_KEY_EXPIRED = 112; + + // The consumer's API Key was not found in config record. + API_KEY_NOT_FOUND = 113; + + // The backend server for looking up project id/number is unavailable. + NAMESPACE_LOOKUP_UNAVAILABLE = 300; + + // The backend server for checking service status is unavailable. + SERVICE_STATUS_UNAVAILABLE = 301; + + // The backend server for checking billing status is unavailable. + BILLING_STATUS_UNAVAILABLE = 302; + } + + // The error code. + Code code = 1; + + // Free-form text providing details on the error cause of the error. + string detail = 2; +} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/distribution.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/distribution.proto new file mode 100644 index 00000000000..93ec2e4d675 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/servicecontrol/v1/distribution.proto @@ -0,0 +1,159 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api.servicecontrol.v1; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; +option java_multiple_files = true; +option java_outer_classname = "DistributionProto"; +option java_package = "com.google.api.servicecontrol.v1"; + + +// Distribution represents a frequency distribution of double-valued sample +// points. It contains the size of the population of sample points plus +// additional optional information: +// +// - the arithmetic mean of the samples +// - the minimum and maximum of the samples +// - the sum-squared-deviation of the samples, used to compute variance +// - a histogram of the values of the sample points +message Distribution { + // Describing buckets with constant width. + message LinearBuckets { + // The number of finite buckets. With the underflow and overflow buckets, + // the total number of buckets is `num_finite_buckets` + 2. + // See comments on `bucket_options` for details. + int32 num_finite_buckets = 1; + + // The i'th linear bucket covers the interval + // [offset + (i-1) * width, offset + i * width) + // where i ranges from 1 to num_finite_buckets, inclusive. + // Must be strictly positive. + double width = 2; + + // The i'th linear bucket covers the interval + // [offset + (i-1) * width, offset + i * width) + // where i ranges from 1 to num_finite_buckets, inclusive. + double offset = 3; + } + + // Describing buckets with exponentially growing width. + message ExponentialBuckets { + // The number of finite buckets. With the underflow and overflow buckets, + // the total number of buckets is `num_finite_buckets` + 2. + // See comments on `bucket_options` for details. + int32 num_finite_buckets = 1; + + // The i'th exponential bucket covers the interval + // [scale * growth_factor^(i-1), scale * growth_factor^i) + // where i ranges from 1 to num_finite_buckets inclusive. + // Must be larger than 1.0. + double growth_factor = 2; + + // The i'th exponential bucket covers the interval + // [scale * growth_factor^(i-1), scale * growth_factor^i) + // where i ranges from 1 to num_finite_buckets inclusive. + // Must be > 0. + double scale = 3; + } + + // Describing buckets with arbitrary user-provided width. + message ExplicitBuckets { + // 'bound' is a list of strictly increasing boundaries between + // buckets. Note that a list of length N-1 defines N buckets because + // of fenceposting. See comments on `bucket_options` for details. + // + // The i'th finite bucket covers the interval + // [bound[i-1], bound[i]) + // where i ranges from 1 to bound_size() - 1. Note that there are no + // finite buckets at all if 'bound' only contains a single element; in + // that special case the single bound defines the boundary between the + // underflow and overflow buckets. + // + // bucket number lower bound upper bound + // i == 0 (underflow) -inf bound[i] + // 0 < i < bound_size() bound[i-1] bound[i] + // i == bound_size() (overflow) bound[i-1] +inf + repeated double bounds = 1; + } + + // The total number of samples in the distribution. Must be >= 0. + int64 count = 1; + + // The arithmetic mean of the samples in the distribution. If `count` is + // zero then this field must be zero. + double mean = 2; + + // The minimum of the population of values. Ignored if `count` is zero. + double minimum = 3; + + // The maximum of the population of values. Ignored if `count` is zero. + double maximum = 4; + + // The sum of squared deviations from the mean: + // Sum[i=1..count]((x_i - mean)^2) + // where each x_i is a sample values. If `count` is zero then this field + // must be zero, otherwise validation of the request fails. + double sum_of_squared_deviation = 5; + + // The number of samples in each histogram bucket. `bucket_counts` are + // optional. If present, they must sum to the `count` value. + // + // The buckets are defined below in `bucket_option`. There are N buckets. + // `bucket_counts[0]` is the number of samples in the underflow bucket. + // `bucket_counts[1]` to `bucket_counts[N-1]` are the numbers of samples + // in each of the finite buckets. And `bucket_counts[N] is the number + // of samples in the overflow bucket. See the comments of `bucket_option` + // below for more details. + // + // Any suffix of trailing zeros may be omitted. + repeated int64 bucket_counts = 6; + + // Defines the buckets in the histogram. `bucket_option` and `bucket_counts` + // must be both set, or both unset. + // + // Buckets are numbered the the range of [0, N], with a total of N+1 buckets. + // There must be at least two buckets (a single-bucket histogram gives + // no information that isn't already provided by `count`). + // + // The first bucket is the underflow bucket which has a lower bound + // of -inf. The last bucket is the overflow bucket which has an + // upper bound of +inf. All other buckets (if any) are called "finite" + // buckets because they have finite lower and upper bounds. As described + // below, there are three ways to define the finite buckets. + // + // (1) Buckets with constant width. + // (2) Buckets with exponentially growing widths. + // (3) Buckets with arbitrary user-provided widths. + // + // In all cases, the buckets cover the entire real number line (-inf, + // +inf). Bucket upper bounds are exclusive and lower bounds are + // inclusive. The upper bound of the underflow bucket is equal to the + // lower bound of the smallest finite bucket; the lower bound of the + // overflow bucket is equal to the upper bound of the largest finite + // bucket. + oneof bucket_option { + // Buckets with constant width. + LinearBuckets linear_buckets = 7; + + // Buckets with exponentially growing width. + ExponentialBuckets exponential_buckets = 8; + + // Buckets with arbitrary user-provided width. + ExplicitBuckets explicit_buckets = 9; + } +} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/log_entry.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/log_entry.proto new file mode 100644 index 00000000000..fddb9851eca --- /dev/null +++ b/handwritten/pubsub/protos/google/api/servicecontrol/v1/log_entry.proto @@ -0,0 +1,67 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api.servicecontrol.v1; + +import "google/api/annotations.proto"; +import "google/logging/type/log_severity.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/struct.proto"; +import "google/protobuf/timestamp.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; +option java_multiple_files = true; +option java_outer_classname = "LogEntryProto"; +option java_package = "com.google.api.servicecontrol.v1"; + + +// An individual log entry. +message LogEntry { + // Required. The log to which this log entry belongs. Examples: `"syslog"`, + // `"book_log"`. + string name = 10; + + // The time the event described by the log entry occurred. If + // omitted, defaults to operation start time. + google.protobuf.Timestamp timestamp = 11; + + // The severity of the log entry. The default value is + // `LogSeverity.DEFAULT`. + google.logging.type.LogSeverity severity = 12; + + // A unique ID for the log entry used for deduplication. If omitted, + // the implementation will generate one based on operation_id. + string insert_id = 4; + + // A set of user-defined (key, value) data that provides additional + // information about the log entry. + map labels = 13; + + // The log entry payload, which can be one of multiple types. + oneof payload { + // The log entry payload, represented as a protocol buffer that is + // expressed as a JSON object. You can only pass `protoPayload` + // values that belong to a set of approved types. + google.protobuf.Any proto_payload = 2; + + // The log entry payload, represented as a Unicode string (UTF-8). + string text_payload = 3; + + // The log entry payload, represented as a structure that + // is expressed as a JSON object. + google.protobuf.Struct struct_payload = 6; + } +} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/metric_value.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/metric_value.proto new file mode 100644 index 00000000000..d5e5803b7a0 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/servicecontrol/v1/metric_value.proto @@ -0,0 +1,78 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api.servicecontrol.v1; + +import "google/api/annotations.proto"; +import "google/api/servicecontrol/v1/distribution.proto"; +import "google/protobuf/timestamp.proto"; +import "google/type/money.proto"; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; +option java_multiple_files = true; +option java_outer_classname = "MetricValueSetProto"; +option java_package = "com.google.api.servicecontrol.v1"; + + +// Represents a single metric value. +message MetricValue { + // The labels describing the metric value. + // See comments on [google.api.servicecontrol.v1.Operation.labels][google.api.servicecontrol.v1.Operation.labels] for + // the overriding relationship. + map labels = 1; + + // The start of the time period over which this metric value's measurement + // applies. The time period has different semantics for different metric + // types (cumulative, delta, and gauge). See the metric definition + // documentation in the service configuration for details. + google.protobuf.Timestamp start_time = 2; + + // The end of the time period over which this metric value's measurement + // applies. + google.protobuf.Timestamp end_time = 3; + + // The value. The type of value used in the request must + // agree with the metric definition in the service configuration, otherwise + // the MetricValue is rejected. + oneof value { + // A boolean value. + bool bool_value = 4; + + // A signed 64-bit integer value. + int64 int64_value = 5; + + // A double precision floating point value. + double double_value = 6; + + // A text string value. + string string_value = 7; + + // A distribution value. + Distribution distribution_value = 8; + } +} + +// Represents a set of metric values in the same metric. +// Each metric value in the set should have a unique combination of start time, +// end time, and label values. +message MetricValueSet { + // The metric name defined in the service configuration. + string metric_name = 1; + + // The values in this metric. + repeated MetricValue metric_values = 2; +} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/operation.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/operation.proto new file mode 100644 index 00000000000..568108af539 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/servicecontrol/v1/operation.proto @@ -0,0 +1,112 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api.servicecontrol.v1; + +import "google/api/annotations.proto"; +import "google/api/servicecontrol/v1/log_entry.proto"; +import "google/api/servicecontrol/v1/metric_value.proto"; +import "google/protobuf/timestamp.proto"; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; +option java_multiple_files = true; +option java_outer_classname = "OperationProto"; +option java_package = "com.google.api.servicecontrol.v1"; + + +// Represents information regarding an operation. +message Operation { + // Defines the importance of the data contained in the operation. + enum Importance { + // The API implementation may cache and aggregate the data. + // The data may be lost when rare and unexpected system failures occur. + LOW = 0; + + // The API implementation doesn't cache and aggregate the data. + // If the method returns successfully, it's guaranteed that the data has + // been persisted in durable storage. + HIGH = 1; + } + + // Identity of the operation. This must be unique within the scope of the + // service that generated the operation. If the service calls + // Check() and Report() on the same operation, the two calls should carry + // the same id. + // + // UUID version 4 is recommended, though not required. + // In scenarios where an operation is computed from existing information + // and an idempotent id is desirable for deduplication purpose, UUID version 5 + // is recommended. See RFC 4122 for details. + string operation_id = 1; + + // Fully qualified name of the operation. Reserved for future use. + string operation_name = 2; + + // Identity of the consumer who is using the service. + // This field should be filled in for the operations initiated by a + // consumer, but not for service-initiated operations that are + // not related to a specific consumer. + // + // This can be in one of the following formats: + // project:, + // project_number:, + // api_key:. + string consumer_id = 3; + + // Required. Start time of the operation. + google.protobuf.Timestamp start_time = 4; + + // End time of the operation. + // Required when the operation is used in [ServiceController.Report][google.api.servicecontrol.v1.ServiceController.Report], + // but optional when the operation is used in [ServiceController.Check][google.api.servicecontrol.v1.ServiceController.Check]. + google.protobuf.Timestamp end_time = 5; + + // Labels describing the operation. Only the following labels are allowed: + // + // - Labels describing monitored resources as defined in + // the service configuration. + // - Default labels of metric values. When specified, labels defined in the + // metric value override these default. + // - The following labels defined by Google Cloud Platform: + // - `cloud.googleapis.com/location` describing the location where the + // operation happened, + // - `servicecontrol.googleapis.com/user_agent` describing the user agent + // of the API request, + // - `servicecontrol.googleapis.com/service_agent` describing the service + // used to handle the API request (e.g. ESP), + // - `servicecontrol.googleapis.com/platform` describing the platform + // where the API is served (e.g. GAE, GCE, GKE). + map labels = 6; + + // Represents information about this operation. Each MetricValueSet + // corresponds to a metric defined in the service configuration. + // The data type used in the MetricValueSet must agree with + // the data type specified in the metric definition. + // + // Within a single operation, it is not allowed to have more than one + // MetricValue instances that have the same metric names and identical + // label value combinations. If a request has such duplicated MetricValue + // instances, the entire request is rejected with + // an invalid argument error. + repeated MetricValueSet metric_value_sets = 7; + + // Represents information to be logged. + repeated LogEntry log_entries = 8; + + // DO NOT USE. This is an experimental field. + Importance importance = 11; +} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/service_controller.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/service_controller.proto new file mode 100644 index 00000000000..2d0ec8e9fd7 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/servicecontrol/v1/service_controller.proto @@ -0,0 +1,161 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api.servicecontrol.v1; + +import "google/api/annotations.proto"; +import "google/api/servicecontrol/v1/check_error.proto"; +import "google/api/servicecontrol/v1/operation.proto"; +import "google/rpc/status.proto"; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; +option java_multiple_files = true; +option java_outer_classname = "ServiceControllerProto"; +option java_package = "com.google.api.servicecontrol.v1"; +option objc_class_prefix = "GASC"; + + +// [Google Service Control API](/service-control/overview) +// +// Lets clients check and report operations against +// a [managed service][google.api.servicemanagement.v1.ManagedService]. +service ServiceController { + // Checks an operation with Google Service Control to decide whether + // the given operation should proceed. It should be called before the + // operation is executed. + // + // If feasible, the client should cache the check results and reuse them for + // up to 60s. In case of server errors, the client may rely on the cached + // results for longer time. + // + // This method requires the `servicemanagement.services.check` permission + // on the specified service. For more information, see + // [Google Cloud IAM](https://cloud.google.com/iam). + rpc Check(CheckRequest) returns (CheckResponse) { + option (google.api.http) = { post: "/v1/services/{service_name}:check" body: "*" }; + } + + // Reports operations to Google Service Control. It should be called + // after the operation is completed. + // + // If feasible, the client should aggregate reporting data for up to 5s to + // reduce API traffic. Limiting aggregation to 5s is to reduce data loss + // during client crashes. Clients should carefully choose the aggregation + // window to avoid data loss risk more than 0.01% for business and + // compliance reasons. + // + // This method requires the `servicemanagement.services.report` permission + // on the specified service. For more information, see + // [Google Cloud IAM](https://cloud.google.com/iam). + rpc Report(ReportRequest) returns (ReportResponse) { + option (google.api.http) = { post: "/v1/services/{service_name}:report" body: "*" }; + } +} + +// Request message for the Check method. +message CheckRequest { + // The service name as specified in its service configuration. For example, + // `"pubsub.googleapis.com"`. + // + // See [google.api.Service][google.api.Service] for the definition of a service name. + string service_name = 1; + + // The operation to be checked. + Operation operation = 2; + + // Specifies which version of service configuration should be used to process + // the request. + // + // If unspecified or no matching version can be found, the + // latest one will be used. + string service_config_id = 4; +} + +// Response message for the Check method. +message CheckResponse { + // The same operation_id value used in the CheckRequest. + // Used for logging and diagnostics purposes. + string operation_id = 1; + + // Indicate the decision of the check. + // + // If no check errors are present, the service should process the operation. + // Otherwise the service should use the list of errors to determine the + // appropriate action. + repeated CheckError check_errors = 2; + + // The actual config id used to process the request. + string service_config_id = 5; +} + +// Request message for the Report method. +message ReportRequest { + // The service name as specified in its service configuration. For example, + // `"pubsub.googleapis.com"`. + // + // See [google.api.Service][google.api.Service] for the definition of a service name. + string service_name = 1; + + // Operations to be reported. + // + // Typically the service should report one operation per request. + // Putting multiple operations into a single request is allowed, but should + // be used only when multiple operations are natually available at the time + // of the report. + // + // If multiple operations are in a single request, the total request size + // should be no larger than 1MB. See [ReportResponse.report_errors][google.api.servicecontrol.v1.ReportResponse.report_errors] for + // partial failure behavior. + repeated Operation operations = 2; + + // Specifies which version of service config should be used to process the + // request. + // + // If unspecified or no matching version can be found, the + // latest one will be used. + string service_config_id = 3; +} + +// Response message for the Report method. +message ReportResponse { + // Represents the processing error of one `Operation` in the request. + message ReportError { + // The [Operation.operation_id][google.api.servicecontrol.v1.Operation.operation_id] value from the request. + string operation_id = 1; + + // Details of the error when processing the `Operation`. + google.rpc.Status status = 2; + } + + // Partial failures, one for each `Operation` in the request that failed + // processing. There are three possible combinations of the RPC status: + // + // 1. The combination of a successful RPC status and an empty `report_errors` + // list indicates a complete success where all `Operations` in the + // request are processed successfully. + // 2. The combination of a successful RPC status and a non-empty + // `report_errors` list indicates a partial success where some + // `Operations` in the request succeeded. Each + // `Operation` that failed processing has a corresponding item + // in this list. + // 3. A failed RPC status indicates a complete failure where none of the + // `Operations` in the request succeeded. + repeated ReportError report_errors = 1; + + // The actual config id used to process the request. + string service_config_id = 2; +} diff --git a/handwritten/pubsub/protos/google/api/servicemanagement/v1/resources.proto b/handwritten/pubsub/protos/google/api/servicemanagement/v1/resources.proto new file mode 100644 index 00000000000..0d0f34d62ef --- /dev/null +++ b/handwritten/pubsub/protos/google/api/servicemanagement/v1/resources.proto @@ -0,0 +1,286 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api.servicemanagement.v1; + +import "google/api/annotations.proto"; +import "google/api/config_change.proto"; +import "google/api/service.proto"; +import "google/longrunning/operations.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/field_mask.proto"; +import "google/protobuf/struct.proto"; +import "google/protobuf/timestamp.proto"; +import "google/rpc/status.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/servicemanagement/v1;servicemanagement"; +option java_multiple_files = true; +option java_outer_classname = "ResourcesProto"; +option java_package = "com.google.api.servicemanagement.v1"; +option objc_class_prefix = "GASM"; + + +// The full representation of a Service that is managed by +// Google Service Management. +message ManagedService { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. + string service_name = 2; + + // ID of the project that produces and owns this service. + string producer_project_id = 3; +} + +// The metadata associated with a long running operation resource. +message OperationMetadata { + // Represents the status of one operation step. + message Step { + // The short description of the step. + string description = 2; + + // The status code. + Status status = 4; + } + + // Code describes the status of one operation step. + enum Status { + // Unspecifed code. + STATUS_UNSPECIFIED = 0; + + // The step has completed without errors. + DONE = 1; + + // The step has not started yet. + NOT_STARTED = 2; + + // The step is in progress. + IN_PROGRESS = 3; + + // The step has completed with errors. + FAILED = 4; + + // The step has completed with cancellation. + CANCELLED = 5; + } + + // The full name of the resources that this operation is directly + // associated with. + repeated string resource_names = 1; + + // Detailed status information for each step. The order is undetermined. + repeated Step steps = 2; + + // Percentage of completion of this operation, ranging from 0 to 100. + int32 progress_percentage = 3; + + // The start time of the operation. + google.protobuf.Timestamp start_time = 4; +} + +// Represents a diagnostic message (error or warning) +message Diagnostic { + // The kind of diagnostic information possible. + enum Kind { + // Warnings and errors + WARNING = 0; + + // Only errors + ERROR = 1; + } + + // File name and line number of the error or warning. + string location = 1; + + // The kind of diagnostic information provided. + Kind kind = 2; + + // Message describing the error or warning. + string message = 3; +} + +// Represents a source file which is used to generate the service configuration +// defined by `google.api.Service`. +message ConfigSource { + // A unique ID for a specific instance of this message, typically assigned + // by the client for tracking purpose. If empty, the server may choose to + // generate one instead. + string id = 5; + + // Set of source configuration files that are used to generate a service + // configuration (`google.api.Service`). + repeated ConfigFile files = 2; +} + +// Generic specification of a source configuration file +message ConfigFile { + enum FileType { + // Unknown file type. + FILE_TYPE_UNSPECIFIED = 0; + + // YAML-specification of service. + SERVICE_CONFIG_YAML = 1; + + // OpenAPI specification, serialized in JSON. + OPEN_API_JSON = 2; + + // OpenAPI specification, serialized in YAML. + OPEN_API_YAML = 3; + + // FileDescriptorSet, generated by protoc. + // + // To generate, use protoc with imports and source info included. + // For an example test.proto file, the following command would put the value + // in a new file named out.pb. + // + // $protoc --include_imports --include_source_info test.proto -o out.pb + FILE_DESCRIPTOR_SET_PROTO = 4; + } + + // The file name of the configuration file (full or relative path). + string file_path = 1; + + // The bytes that constitute the file. + bytes file_contents = 3; + + // The type of configuration file this represents. + FileType file_type = 4; +} + +// Represents a service configuration with its name and id. +message ConfigRef { + // Resource name of a service config. It must have the following + // format: "services/{service name}/configs/{config id}". + string name = 1; +} + +// Change report associated with a particular service configuration. +// +// It contains a list of ConfigChanges based on the comparison between +// two service configurations. +message ChangeReport { + // List of changes between two service configurations. + // The changes will be alphabetically sorted based on the identifier + // of each change. + // A ConfigChange identifier is a dot separated path to the configuration. + // Example: visibility.rules[selector='LibraryService.CreateBook'].restriction + repeated google.api.ConfigChange config_changes = 1; +} + +// A rollout resource that defines how service configuration versions are pushed +// to control plane systems. Typically, you create a new version of the +// service config, and then create a Rollout to push the service config. +message Rollout { + // Strategy that specifies how Google Service Control should select + // different + // versions of service configurations based on traffic percentage. + // + // One example of how to gradually rollout a new service configuration using + // this + // strategy: + // Day 1 + // + // Rollout { + // id: "example.googleapis.com/rollout_20160206" + // traffic_percent_strategy { + // percentages: { + // "example.googleapis.com/20160201": 70.00 + // "example.googleapis.com/20160206": 30.00 + // } + // } + // } + // + // Day 2 + // + // Rollout { + // id: "example.googleapis.com/rollout_20160207" + // traffic_percent_strategy: { + // percentages: { + // "example.googleapis.com/20160206": 100.00 + // } + // } + // } + message TrafficPercentStrategy { + // Maps service configuration IDs to their corresponding traffic percentage. + // Key is the service configuration ID, Value is the traffic percentage + // which must be greater than 0.0 and the sum must equal to 100.0. + map percentages = 1; + } + + // Strategy used to delete a service. This strategy is a placeholder only + // used by the system generated rollout to delete a service. + message DeleteServiceStrategy { + + } + + // Status of a Rollout. + enum RolloutStatus { + // No status specified. + ROLLOUT_STATUS_UNSPECIFIED = 0; + + // The Rollout is in progress. + IN_PROGRESS = 1; + + // The Rollout has completed successfully. + SUCCESS = 2; + + // The Rollout has been cancelled. This can happen if you have overlapping + // Rollout pushes, and the previous ones will be cancelled. + CANCELLED = 3; + + // The Rollout has failed. It is typically caused by configuration errors. + FAILED = 4; + + // The Rollout has not started yet and is pending for execution. + PENDING = 5; + } + + // Optional unique identifier of this Rollout. Only lower case letters, digits + // and '-' are allowed. + // + // If not specified by client, the server will generate one. The generated id + // will have the form of , where "date" is the create + // date in ISO 8601 format. "revision number" is a monotonically increasing + // positive number that is reset every day for each service. + // An example of the generated rollout_id is '2016-02-16r1' + string rollout_id = 1; + + // Creation time of the rollout. Readonly. + google.protobuf.Timestamp create_time = 2; + + // The user who created the Rollout. Readonly. + string created_by = 3; + + // The status of this rollout. Readonly. In case of a failed rollout, + // the system will automatically rollback to the current Rollout + // version. Readonly. + RolloutStatus status = 4; + + // Strategy that defines which versions of service configurations should be + // pushed + // and how they should be used at runtime. + oneof strategy { + // Google Service Control selects service configurations based on + // traffic percentage. + TrafficPercentStrategy traffic_percent_strategy = 5; + + // The strategy associated with a rollout to delete a `ManagedService`. + // Readonly. + DeleteServiceStrategy delete_service_strategy = 200; + } + + // The name of the service associated with this Rollout. + string service_name = 8; +} diff --git a/handwritten/pubsub/protos/google/api/servicemanagement/v1/servicemanager.proto b/handwritten/pubsub/protos/google/api/servicemanagement/v1/servicemanager.proto new file mode 100644 index 00000000000..62af1893ec2 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/servicemanagement/v1/servicemanager.proto @@ -0,0 +1,392 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api.servicemanagement.v1; + +import "google/api/annotations.proto"; +import "google/api/service.proto"; +import "google/api/servicemanagement/v1/resources.proto"; +import "google/longrunning/operations.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/empty.proto"; +import "google/protobuf/field_mask.proto"; +import "google/protobuf/struct.proto"; +import "google/rpc/status.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/servicemanagement/v1;servicemanagement"; +option java_multiple_files = true; +option java_outer_classname = "ServiceManagerProto"; +option java_package = "com.google.api.servicemanagement.v1"; +option objc_class_prefix = "GASM"; + + +// [Google Service Management API](/service-management/overview) +service ServiceManager { + // Lists all managed services. + rpc ListServices(ListServicesRequest) returns (ListServicesResponse) { + option (google.api.http) = { get: "/v1/services" }; + } + + // Gets a managed service. + rpc GetService(GetServiceRequest) returns (ManagedService) { + option (google.api.http) = { get: "/v1/services/{service_name}" }; + } + + // Creates a new managed service. + // Please note one producer project can own no more than 20 services. + // + // Operation + rpc CreateService(CreateServiceRequest) returns (google.longrunning.Operation) { + option (google.api.http) = { post: "/v1/services" body: "service" }; + } + + // Deletes a managed service. This method will change the serivce in the + // `Soft-Delete` state for 30 days. Within this period, service producers may + // call [UndeleteService][google.api.servicemanagement.v1.ServiceManager.UndeleteService] to restore the service. + // After 30 days, the service will be permanently deleted. + // + // Operation + rpc DeleteService(DeleteServiceRequest) returns (google.longrunning.Operation) { + option (google.api.http) = { delete: "/v1/services/{service_name}" }; + } + + // Revives a previously deleted managed service. The method restores the + // service using the configuration at the time the service was deleted. + // The target service must exist and must have been deleted within the + // last 30 days. + // + // Operation + rpc UndeleteService(UndeleteServiceRequest) returns (google.longrunning.Operation) { + option (google.api.http) = { post: "/v1/services/{service_name}:undelete" body: "" }; + } + + // Lists the history of the service configuration for a managed service, + // from the newest to the oldest. + rpc ListServiceConfigs(ListServiceConfigsRequest) returns (ListServiceConfigsResponse) { + option (google.api.http) = { get: "/v1/services/{service_name}/configs" }; + } + + // Gets a service configuration (version) for a managed service. + rpc GetServiceConfig(GetServiceConfigRequest) returns (google.api.Service) { + option (google.api.http) = { get: "/v1/services/{service_name}/configs/{config_id}" }; + } + + // Creates a new service configuration (version) for a managed service. + // This method only stores the service configuration. To roll out the service + // configuration to backend systems please call + // [CreateServiceRollout][google.api.servicemanagement.v1.ServiceManager.CreateServiceRollout]. + rpc CreateServiceConfig(CreateServiceConfigRequest) returns (google.api.Service) { + option (google.api.http) = { post: "/v1/services/{service_name}/configs" body: "service_config" }; + } + + // Creates a new service configuration (version) for a managed service based + // on + // user-supplied configuration source files (for example: OpenAPI + // Specification). This method stores the source configurations as well as the + // generated service configuration. To rollout the service configuration to + // other services, + // please call [CreateServiceRollout][google.api.servicemanagement.v1.ServiceManager.CreateServiceRollout]. + // + // Operation + rpc SubmitConfigSource(SubmitConfigSourceRequest) returns (google.longrunning.Operation) { + option (google.api.http) = { post: "/v1/services/{service_name}/configs:submit" body: "*" }; + } + + // Lists the history of the service configuration rollouts for a managed + // service, from the newest to the oldest. + rpc ListServiceRollouts(ListServiceRolloutsRequest) returns (ListServiceRolloutsResponse) { + option (google.api.http) = { get: "/v1/services/{service_name}/rollouts" }; + } + + // Gets a service configuration [rollout][google.api.servicemanagement.v1.Rollout]. + rpc GetServiceRollout(GetServiceRolloutRequest) returns (Rollout) { + option (google.api.http) = { get: "/v1/services/{service_name}/rollouts/{rollout_id}" }; + } + + // Creates a new service configuration rollout. Based on rollout, the + // Google Service Management will roll out the service configurations to + // different backend services. For example, the logging configuration will be + // pushed to Google Cloud Logging. + // + // Please note that any previous pending and running Rollouts and associated + // Operations will be automatically cancelled so that the latest Rollout will + // not be blocked by previous Rollouts. + // + // Operation + rpc CreateServiceRollout(CreateServiceRolloutRequest) returns (google.longrunning.Operation) { + option (google.api.http) = { post: "/v1/services/{service_name}/rollouts" body: "rollout" }; + } + + // Generates and returns a report (errors, warnings and changes from + // existing configurations) associated with + // GenerateConfigReportRequest.new_value + // + // If GenerateConfigReportRequest.old_value is specified, + // GenerateConfigReportRequest will contain a single ChangeReport based on the + // comparison between GenerateConfigReportRequest.new_value and + // GenerateConfigReportRequest.old_value. + // If GenerateConfigReportRequest.old_value is not specified, this method + // will compare GenerateConfigReportRequest.new_value with the last pushed + // service configuration. + rpc GenerateConfigReport(GenerateConfigReportRequest) returns (GenerateConfigReportResponse) { + option (google.api.http) = { post: "/v1/services:generateConfigReport" body: "*" }; + } + + // Enable a managed service for a project with default setting. + // + // Operation + // + // [google.rpc.Status][google.rpc.Status] errors may contain a + // [google.rpc.PreconditionFailure][] error detail. + rpc EnableService(EnableServiceRequest) returns (google.longrunning.Operation) { + option (google.api.http) = { post: "/v1/services/{service_name}:enable" body: "*" }; + } + + // Disable a managed service for a project. + // + // Operation + rpc DisableService(DisableServiceRequest) returns (google.longrunning.Operation) { + option (google.api.http) = { post: "/v1/services/{service_name}:disable" body: "*" }; + } +} + +// Request message for `ListServices` method. +message ListServicesRequest { + // Include services produced by the specified project. + string producer_project_id = 1; + + // Requested size of the next page of data. + int32 page_size = 5; + + // Token identifying which result to start with; returned by a previous list + // call. + string page_token = 6; +} + +// Response message for `ListServices` method. +message ListServicesResponse { + // The results of the query. + repeated ManagedService services = 1; + + // Token that can be passed to `ListServices` to resume a paginated query. + string next_page_token = 2; +} + +// Request message for `GetService` method. +message GetServiceRequest { + // The name of the service. See the `ServiceManager` overview for naming + // requirements. For example: `example.googleapis.com`. + string service_name = 1; +} + +// Request message for CreateService method. +message CreateServiceRequest { + // Initial values for the service resource. + ManagedService service = 1; +} + +// Request message for DeleteService method. +message DeleteServiceRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; +} + +// Request message for UndeleteService method. +message UndeleteServiceRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; +} + +// Response message for UndeleteService method. +message UndeleteServiceResponse { + // Revived service resource. + ManagedService service = 1; +} + +// Request message for GetServiceConfig method. +message GetServiceConfigRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; + + string config_id = 2; +} + +// Request message for ListServiceConfigs method. +message ListServiceConfigsRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; + + // The token of the page to retrieve. + string page_token = 2; + + // The max number of items to include in the response list. + int32 page_size = 3; +} + +// Response message for ListServiceConfigs method. +message ListServiceConfigsResponse { + // The list of service configuration resources. + repeated google.api.Service service_configs = 1; + + // The token of the next page of results. + string next_page_token = 2; +} + +// Request message for CreateServiceConfig method. +message CreateServiceConfigRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; + + // The service configuration resource. + google.api.Service service_config = 2; +} + +// Request message for SubmitConfigSource method. +message SubmitConfigSourceRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; + + // The source configuration for the service. + ConfigSource config_source = 2; + + // Optional. If set, this will result in the generation of a + // `google.api.Service` configuration based on the `ConfigSource` provided, + // but the generated config and the sources will NOT be persisted. + bool validate_only = 3; +} + +// Response message for SubmitConfigSource method. +message SubmitConfigSourceResponse { + // The generated service configuration. + google.api.Service service_config = 1; +} + +// Request message for 'CreateServiceRollout' +message CreateServiceRolloutRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; + + // The rollout resource. The `service_name` field is output only. + Rollout rollout = 2; +} + +// Request message for 'ListServiceRollouts' +message ListServiceRolloutsRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; + + // The token of the page to retrieve. + string page_token = 2; + + // The max number of items to include in the response list. + int32 page_size = 3; +} + +// Response message for ListServiceRollouts method. +message ListServiceRolloutsResponse { + // The list of rollout resources. + repeated Rollout rollouts = 1; + + // The token of the next page of results. + string next_page_token = 2; +} + +// Request message for GetServiceRollout method. +message GetServiceRolloutRequest { + // The name of the service. See the [overview](/service-management/overview) + // for naming requirements. For example: `example.googleapis.com`. + string service_name = 1; + + // The id of the rollout resource. + string rollout_id = 2; +} + +// Request message for EnableService method. +message EnableServiceRequest { + // Name of the service to enable. Specifying an unknown service name will + // cause the request to fail. + string service_name = 1; + + // The identity of consumer resource which service enablement will be + // applied to. + // + // The Google Service Management implementation accepts the following + // forms: "project:", "project_number:". + // + // Note: this is made compatible with + // google.api.servicecontrol.v1.Operation.consumer_id. + string consumer_id = 2; +} + +// Request message for DisableService method. +message DisableServiceRequest { + // Name of the service to disable. Specifying an unknown service name + // will cause the request to fail. + string service_name = 1; + + // The identity of consumer resource which service disablement will be + // applied to. + // + // The Google Service Management implementation accepts the following + // forms: "project:", "project_number:". + // + // Note: this is made compatible with + // google.api.servicecontrol.v1.Operation.consumer_id. + string consumer_id = 2; +} + +// Request message for GenerateConfigReport method. +message GenerateConfigReportRequest { + // Service configuration for which we want to generate the report. + // For this version of API, the supported types are + // [google.api.servicemanagement.v1.ConfigRef][google.api.servicemanagement.v1.ConfigRef], + // [google.api.servicemanagement.v1.ConfigSource][google.api.servicemanagement.v1.ConfigSource], + // and [google.api.Service][google.api.Service] + google.protobuf.Any new_config = 1; + + // Service configuration against which the comparison will be done. + // For this version of API, the supported types are + // [google.api.servicemanagement.v1.ConfigRef][google.api.servicemanagement.v1.ConfigRef], + // [google.api.servicemanagement.v1.ConfigSource][google.api.servicemanagement.v1.ConfigSource], + // and [google.api.Service][google.api.Service] + google.protobuf.Any old_config = 2; +} + +// Response message for GenerateConfigReport method. +message GenerateConfigReportResponse { + // Name of the service this report belongs to. + string service_name = 1; + + // ID of the service configuration this report belongs to. + string id = 2; + + // list of ChangeReport, each corresponding to comparison between two + // service configurations. + repeated ChangeReport change_reports = 3; + + // Errors / Linter warnings associated with the service definition this + // report + // belongs to. + repeated Diagnostic diagnostics = 4; +} diff --git a/handwritten/pubsub/protos/google/api/source_info.proto b/handwritten/pubsub/protos/google/api/source_info.proto new file mode 100644 index 00000000000..5d0f7bd721f --- /dev/null +++ b/handwritten/pubsub/protos/google/api/source_info.proto @@ -0,0 +1,32 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/protobuf/any.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "SourceInfoProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Source information used to create a Service Config +message SourceInfo { + // All files used during config generation. + repeated google.protobuf.Any source_files = 1; +} diff --git a/handwritten/pubsub/protos/google/api/system_parameter.proto b/handwritten/pubsub/protos/google/api/system_parameter.proto new file mode 100644 index 00000000000..ed36a3d0bce --- /dev/null +++ b/handwritten/pubsub/protos/google/api/system_parameter.proto @@ -0,0 +1,96 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "SystemParameterProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// ### System parameter configuration +// +// A system parameter is a special kind of parameter defined by the API +// system, not by an individual API. It is typically mapped to an HTTP header +// and/or a URL query parameter. This configuration specifies which methods +// change the names of the system parameters. +message SystemParameters { + // Define system parameters. + // + // The parameters defined here will override the default parameters + // implemented by the system. If this field is missing from the service + // config, default system parameters will be used. Default system parameters + // and names is implementation-dependent. + // + // Example: define api key for all methods + // + // system_parameters + // rules: + // - selector: "*" + // parameters: + // - name: api_key + // url_query_parameter: api_key + // + // + // Example: define 2 api key names for a specific method. + // + // system_parameters + // rules: + // - selector: "/ListShelves" + // parameters: + // - name: api_key + // http_header: Api-Key1 + // - name: api_key + // http_header: Api-Key2 + // + // **NOTE:** All service configuration rules follow "last one wins" order. + repeated SystemParameterRule rules = 1; +} + +// Define a system parameter rule mapping system parameter definitions to +// methods. +message SystemParameterRule { + // Selects the methods to which this rule applies. Use '*' to indicate all + // methods in all APIs. + // + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // Define parameters. Multiple names may be defined for a parameter. + // For a given method call, only one of them should be used. If multiple + // names are used the behavior is implementation-dependent. + // If none of the specified names are present the behavior is + // parameter-dependent. + repeated SystemParameter parameters = 2; +} + +// Define a parameter's name and location. The parameter may be passed as either +// an HTTP header or a URL query parameter, and if both are passed the behavior +// is implementation-dependent. +message SystemParameter { + // Define the name of the parameter, such as "api_key" . It is case sensitive. + string name = 1; + + // Define the HTTP header name to use for the parameter. It is case + // insensitive. + string http_header = 2; + + // Define the URL query parameter name to use for the parameter. It is case + // sensitive. + string url_query_parameter = 3; +} diff --git a/handwritten/pubsub/protos/google/api/usage.proto b/handwritten/pubsub/protos/google/api/usage.proto new file mode 100644 index 00000000000..29c601382d4 --- /dev/null +++ b/handwritten/pubsub/protos/google/api/usage.proto @@ -0,0 +1,85 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/annotations.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; +option java_multiple_files = true; +option java_outer_classname = "UsageProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + + +// Configuration controlling usage of a service. +message Usage { + // Requirements that must be satisfied before a consumer project can use the + // service. Each requirement is of the form /; + // for example 'serviceusage.googleapis.com/billing-enabled'. + repeated string requirements = 1; + + // A list of usage rules that apply to individual API methods. + // + // **NOTE:** All service configuration rules follow "last one wins" order. + repeated UsageRule rules = 6; + + // The full resource name of a channel used for sending notifications to the + // service producer. + // + // Google Service Management currently only supports + // [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification + // channel. To use Google Cloud Pub/Sub as the channel, this must be the name + // of a Cloud Pub/Sub topic that uses the Cloud Pub/Sub topic name format + // documented in https://cloud.google.com/pubsub/docs/overview. + string producer_notification_channel = 7; +} + +// Usage configuration rules for the service. +// +// NOTE: Under development. +// +// +// Use this rule to configure unregistered calls for the service. Unregistered +// calls are calls that do not contain consumer project identity. +// (Example: calls that do not contain an API key). +// By default, API methods do not allow unregistered calls, and each method call +// must be identified by a consumer project identity. Use this rule to +// allow/disallow unregistered calls. +// +// Example of an API that wants to allow unregistered calls for entire service. +// +// usage: +// rules: +// - selector: "*" +// allow_unregistered_calls: true +// +// Example of a method that wants to allow unregistered calls. +// +// usage: +// rules: +// - selector: "google.example.library.v1.LibraryService.CreateBook" +// allow_unregistered_calls: true +message UsageRule { + // Selects the methods to which this rule applies. Use '*' to indicate all + // methods in all APIs. + // + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // True, if the method allows unregistered calls; false otherwise. + bool allow_unregistered_calls = 2; +} diff --git a/handwritten/pubsub/protos/google/iam/admin/v1/iam.proto b/handwritten/pubsub/protos/google/iam/admin/v1/iam.proto new file mode 100644 index 00000000000..2e2fe2b72fc --- /dev/null +++ b/handwritten/pubsub/protos/google/iam/admin/v1/iam.proto @@ -0,0 +1,469 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.iam.admin.v1; + +import "google/api/annotations.proto"; +import "google/iam/v1/iam_policy.proto"; +import "google/iam/v1/policy.proto"; +import "google/protobuf/empty.proto"; +import "google/protobuf/field_mask.proto"; +import "google/protobuf/timestamp.proto"; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/iam/admin/v1;admin"; +option java_multiple_files = true; +option java_outer_classname = "IamProto"; +option java_package = "com.google.iam.admin.v1"; + + +// Creates and manages service account objects. +// +// Service account is an account that belongs to your project instead +// of to an individual end user. It is used to authenticate calls +// to a Google API. +// +// To create a service account, specify the `project_id` and `account_id` +// for the account. The `account_id` is unique within the project, and used +// to generate the service account email address and a stable +// `unique_id`. +// +// All other methods can identify accounts using the format +// `projects/{project}/serviceAccounts/{account}`. +// Using `-` as a wildcard for the project will infer the project from +// the account. The `account` value can be the `email` address or the +// `unique_id` of the service account. +service IAM { + // Lists [ServiceAccounts][google.iam.admin.v1.ServiceAccount] for a project. + rpc ListServiceAccounts(ListServiceAccountsRequest) returns (ListServiceAccountsResponse) { + option (google.api.http) = { get: "/v1/{name=projects/*}/serviceAccounts" }; + } + + // Gets a [ServiceAccount][google.iam.admin.v1.ServiceAccount]. + rpc GetServiceAccount(GetServiceAccountRequest) returns (ServiceAccount) { + option (google.api.http) = { get: "/v1/{name=projects/*/serviceAccounts/*}" }; + } + + // Creates a [ServiceAccount][google.iam.admin.v1.ServiceAccount] + // and returns it. + rpc CreateServiceAccount(CreateServiceAccountRequest) returns (ServiceAccount) { + option (google.api.http) = { post: "/v1/{name=projects/*}/serviceAccounts" body: "*" }; + } + + // Updates a [ServiceAccount][google.iam.admin.v1.ServiceAccount]. + // + // Currently, only the following fields are updatable: + // `display_name` . + // The `etag` is mandatory. + rpc UpdateServiceAccount(ServiceAccount) returns (ServiceAccount) { + option (google.api.http) = { put: "/v1/{name=projects/*/serviceAccounts/*}" body: "*" }; + } + + // Deletes a [ServiceAccount][google.iam.admin.v1.ServiceAccount]. + rpc DeleteServiceAccount(DeleteServiceAccountRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { delete: "/v1/{name=projects/*/serviceAccounts/*}" }; + } + + // Lists [ServiceAccountKeys][google.iam.admin.v1.ServiceAccountKey]. + rpc ListServiceAccountKeys(ListServiceAccountKeysRequest) returns (ListServiceAccountKeysResponse) { + option (google.api.http) = { get: "/v1/{name=projects/*/serviceAccounts/*}/keys" }; + } + + // Gets the [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey] + // by key id. + rpc GetServiceAccountKey(GetServiceAccountKeyRequest) returns (ServiceAccountKey) { + option (google.api.http) = { get: "/v1/{name=projects/*/serviceAccounts/*/keys/*}" }; + } + + // Creates a [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey] + // and returns it. + rpc CreateServiceAccountKey(CreateServiceAccountKeyRequest) returns (ServiceAccountKey) { + option (google.api.http) = { post: "/v1/{name=projects/*/serviceAccounts/*}/keys" body: "*" }; + } + + // Deletes a [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey]. + rpc DeleteServiceAccountKey(DeleteServiceAccountKeyRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { delete: "/v1/{name=projects/*/serviceAccounts/*/keys/*}" }; + } + + // Signs a blob using a service account's system-managed private key. + rpc SignBlob(SignBlobRequest) returns (SignBlobResponse) { + option (google.api.http) = { post: "/v1/{name=projects/*/serviceAccounts/*}:signBlob" body: "*" }; + } + + // Returns the IAM access control policy for a + // [ServiceAccount][google.iam.admin.v1.ServiceAccount]. + rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest) returns (google.iam.v1.Policy) { + option (google.api.http) = { post: "/v1/{resource=projects/*/serviceAccounts/*}:getIamPolicy" body: "" }; + } + + // Sets the IAM access control policy for a + // [ServiceAccount][google.iam.admin.v1.ServiceAccount]. + rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest) returns (google.iam.v1.Policy) { + option (google.api.http) = { post: "/v1/{resource=projects/*/serviceAccounts/*}:setIamPolicy" body: "*" }; + } + + // Tests the specified permissions against the IAM access control policy + // for a [ServiceAccount][google.iam.admin.v1.ServiceAccount]. + rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest) returns (google.iam.v1.TestIamPermissionsResponse) { + option (google.api.http) = { post: "/v1/{resource=projects/*/serviceAccounts/*}:testIamPermissions" body: "*" }; + } + + // Queries roles that can be granted on a particular resource. + // A role is grantable if it can be used as the role in a binding for a policy + // for that resource. + rpc QueryGrantableRoles(QueryGrantableRolesRequest) returns (QueryGrantableRolesResponse) { + option (google.api.http) = { post: "/v1/roles:queryGrantableRoles" body: "*" }; + } +} + +// A service account in the Identity and Access Management API. +// +// To create a service account, specify the `project_id` and the `account_id` +// for the account. The `account_id` is unique within the project, and is used +// to generate the service account email address and a stable +// `unique_id`. +// +// If the account already exists, the account's resource name is returned +// in util::Status's ResourceInfo.resource_name in the format of +// projects/{project}/serviceAccounts/{email}. The caller can use the name in +// other methods to access the account. +// +// All other methods can identify the service account using the format +// `projects/{project}/serviceAccounts/{account}`. +// Using `-` as a wildcard for the project will infer the project from +// the account. The `account` value can be the `email` address or the +// `unique_id` of the service account. +message ServiceAccount { + // The resource name of the service account in the following format: + // `projects/{project}/serviceAccounts/{account}`. + // + // Requests using `-` as a wildcard for the project will infer the project + // from the `account` and the `account` value can be the `email` address or + // the `unique_id` of the service account. + // + // In responses the resource name will always be in the format + // `projects/{project}/serviceAccounts/{email}`. + string name = 1; + + // @OutputOnly The id of the project that owns the service account. + string project_id = 2; + + // @OutputOnly The unique and stable id of the service account. + string unique_id = 4; + + // @OutputOnly The email address of the service account. + string email = 5; + + // Optional. A user-specified description of the service account. Must be + // fewer than 100 UTF-8 bytes. + string display_name = 6; + + // Used to perform a consistent read-modify-write. + bytes etag = 7; + + // @OutputOnly. The OAuth2 client id for the service account. + // This is used in conjunction with the OAuth2 clientconfig API to make + // three legged OAuth2 (3LO) flows to access the data of Google users. + string oauth2_client_id = 9; +} + +// The service account create request. +message CreateServiceAccountRequest { + // Required. The resource name of the project associated with the service + // accounts, such as `projects/my-project-123`. + string name = 1; + + // Required. The account id that is used to generate the service account + // email address and a stable unique id. It is unique within a project, + // must be 6-30 characters long, and match the regular expression + // `[a-z]([-a-z0-9]*[a-z0-9])` to comply with RFC1035. + string account_id = 2; + + // The [ServiceAccount][google.iam.admin.v1.ServiceAccount] resource to create. + // Currently, only the following values are user assignable: + // `display_name` . + ServiceAccount service_account = 3; +} + +// The service account list request. +message ListServiceAccountsRequest { + // Required. The resource name of the project associated with the service + // accounts, such as `projects/my-project-123`. + string name = 1; + + // Optional limit on the number of service accounts to include in the + // response. Further accounts can subsequently be obtained by including the + // [ListServiceAccountsResponse.next_page_token][google.iam.admin.v1.ListServiceAccountsResponse.next_page_token] + // in a subsequent request. + int32 page_size = 2; + + // Optional pagination token returned in an earlier + // [ListServiceAccountsResponse.next_page_token][google.iam.admin.v1.ListServiceAccountsResponse.next_page_token]. + string page_token = 3; +} + +// The service account list response. +message ListServiceAccountsResponse { + // The list of matching service accounts. + repeated ServiceAccount accounts = 1; + + // To retrieve the next page of results, set + // [ListServiceAccountsRequest.page_token][google.iam.admin.v1.ListServiceAccountsRequest.page_token] + // to this value. + string next_page_token = 2; +} + +// The service account get request. +message GetServiceAccountRequest { + // The resource name of the service account in the following format: + // `projects/{project}/serviceAccounts/{account}`. + // Using `-` as a wildcard for the project will infer the project from + // the account. The `account` value can be the `email` address or the + // `unique_id` of the service account. + string name = 1; +} + +// The service account delete request. +message DeleteServiceAccountRequest { + // The resource name of the service account in the following format: + // `projects/{project}/serviceAccounts/{account}`. + // Using `-` as a wildcard for the project will infer the project from + // the account. The `account` value can be the `email` address or the + // `unique_id` of the service account. + string name = 1; +} + +// The service account keys list request. +message ListServiceAccountKeysRequest { + // `KeyType` filters to selectively retrieve certain varieties + // of keys. + enum KeyType { + // Unspecified key type. The presence of this in the + // message will immediately result in an error. + KEY_TYPE_UNSPECIFIED = 0; + + // User-managed keys (managed and rotated by the user). + USER_MANAGED = 1; + + // System-managed keys (managed and rotated by Google). + SYSTEM_MANAGED = 2; + } + + // The resource name of the service account in the following format: + // `projects/{project}/serviceAccounts/{account}`. + // + // Using `-` as a wildcard for the project, will infer the project from + // the account. The `account` value can be the `email` address or the + // `unique_id` of the service account. + string name = 1; + + // Filters the types of keys the user wants to include in the list + // response. Duplicate key types are not allowed. If no key type + // is provided, all keys are returned. + repeated KeyType key_types = 2; +} + +// The service account keys list response. +message ListServiceAccountKeysResponse { + // The public keys for the service account. + repeated ServiceAccountKey keys = 1; +} + +// The service account key get by id request. +message GetServiceAccountKeyRequest { + // The resource name of the service account key in the following format: + // `projects/{project}/serviceAccounts/{account}/keys/{key}`. + // + // Using `-` as a wildcard for the project will infer the project from + // the account. The `account` value can be the `email` address or the + // `unique_id` of the service account. + string name = 1; + + // The output format of the public key requested. + // X509_PEM is the default output format. + ServiceAccountPublicKeyType public_key_type = 2; +} + +// Represents a service account key. +// +// A service account has two sets of key-pairs: user-managed, and +// system-managed. +// +// User-managed key-pairs can be created and deleted by users. Users are +// responsible for rotating these keys periodically to ensure security of +// their service accounts. Users retain the private key of these key-pairs, +// and Google retains ONLY the public key. +// +// System-managed key-pairs are managed automatically by Google, and rotated +// daily without user intervention. The private key never leaves Google's +// servers to maximize security. +// +// Public keys for all service accounts are also published at the OAuth2 +// Service Account API. +message ServiceAccountKey { + // The resource name of the service account key in the following format + // `projects/{project}/serviceAccounts/{account}/keys/{key}`. + string name = 1; + + // The output format for the private key. + // Only provided in `CreateServiceAccountKey` responses, not + // in `GetServiceAccountKey` or `ListServiceAccountKey` responses. + // + // Google never exposes system-managed private keys, and never retains + // user-managed private keys. + ServiceAccountPrivateKeyType private_key_type = 2; + + // Specifies the algorithm (and possibly key size) for the key. + ServiceAccountKeyAlgorithm key_algorithm = 8; + + // The private key data. Only provided in `CreateServiceAccountKey` + // responses. + bytes private_key_data = 3; + + // The public key data. Only provided in `GetServiceAccountKey` responses. + bytes public_key_data = 7; + + // The key can be used after this timestamp. + google.protobuf.Timestamp valid_after_time = 4; + + // The key can be used before this timestamp. + google.protobuf.Timestamp valid_before_time = 5; +} + +// The service account key create request. +message CreateServiceAccountKeyRequest { + // The resource name of the service account in the following format: + // `projects/{project}/serviceAccounts/{account}`. + // Using `-` as a wildcard for the project will infer the project from + // the account. The `account` value can be the `email` address or the + // `unique_id` of the service account. + string name = 1; + + // The output format of the private key. `GOOGLE_CREDENTIALS_FILE` is the + // default output format. + ServiceAccountPrivateKeyType private_key_type = 2; + + // Which type of key and algorithm to use for the key. + // The default is currently a 4K RSA key. However this may change in the + // future. + ServiceAccountKeyAlgorithm key_algorithm = 3; +} + +// The service account key delete request. +message DeleteServiceAccountKeyRequest { + // The resource name of the service account key in the following format: + // `projects/{project}/serviceAccounts/{account}/keys/{key}`. + // Using `-` as a wildcard for the project will infer the project from + // the account. The `account` value can be the `email` address or the + // `unique_id` of the service account. + string name = 1; +} + +// The service account sign blob request. +message SignBlobRequest { + // The resource name of the service account in the following format: + // `projects/{project}/serviceAccounts/{account}`. + // Using `-` as a wildcard for the project will infer the project from + // the account. The `account` value can be the `email` address or the + // `unique_id` of the service account. + string name = 1; + + // The bytes to sign. + bytes bytes_to_sign = 2; +} + +// The service account sign blob response. +message SignBlobResponse { + // The id of the key used to sign the blob. + string key_id = 1; + + // The signed blob. + bytes signature = 2; +} + +// A role in the Identity and Access Management API. +message Role { + // The name of the role. + // + // When Role is used in CreateRole, the role name must not be set. + // + // When Role is used in output and other input such as UpdateRole, the role + // name is the complete path, e.g., roles/logging.viewer for curated roles + // and organizations/{organization-id}/roles/logging.viewer for custom roles. + string name = 1; + + // Optional. A human-readable title for the role. Typically this + // is limited to 100 UTF-8 bytes. + string title = 2; + + // Optional. A human-readable description for the role. + string description = 3; +} + +// The grantable role query request. +message QueryGrantableRolesRequest { + // Required. The full resource name to query from the list of grantable roles. + // + // The name follows the Google Cloud Platform resource format. + // For example, a Cloud Platform project with id `my-project` will be named + // `//cloudresourcemanager.googleapis.com/projects/my-project`. + string full_resource_name = 1; +} + +// The grantable role query response. +message QueryGrantableRolesResponse { + // The list of matching roles. + repeated Role roles = 1; +} + +// Supported key algorithms. +enum ServiceAccountKeyAlgorithm { + // An unspecified key algorithm. + KEY_ALG_UNSPECIFIED = 0; + + // 1k RSA Key. + KEY_ALG_RSA_1024 = 1; + + // 2k RSA Key. + KEY_ALG_RSA_2048 = 2; +} + +// Supported private key output formats. +enum ServiceAccountPrivateKeyType { + // Unspecified. Equivalent to `TYPE_GOOGLE_CREDENTIALS_FILE`. + TYPE_UNSPECIFIED = 0; + + // PKCS12 format. + // The password for the PKCS12 file is `notasecret`. + // For more information, see https://tools.ietf.org/html/rfc7292. + TYPE_PKCS12_FILE = 1; + + // Google Credentials File format. + TYPE_GOOGLE_CREDENTIALS_FILE = 2; +} + +// Supported public key output formats. +enum ServiceAccountPublicKeyType { + // Unspecified. Returns nothing here. + TYPE_NONE = 0; + + // X509 PEM format. + TYPE_X509_PEM_FILE = 1; + + // Raw public key. + TYPE_RAW_PUBLIC_KEY = 2; +} diff --git a/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto b/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto new file mode 100644 index 00000000000..15e216f194d --- /dev/null +++ b/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto @@ -0,0 +1,118 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.iam.v1; + +import "google/api/annotations.proto"; +import "google/iam/v1/policy.proto"; + +option cc_enable_arenas = true; +option csharp_namespace = "Google.Cloud.Iam.V1"; +option go_package = "google.golang.org/genproto/googleapis/iam/v1;iam"; +option java_multiple_files = true; +option java_outer_classname = "IamPolicyProto"; +option java_package = "com.google.iam.v1"; + + +// ## API Overview +// +// Manages Identity and Access Management (IAM) policies. +// +// Any implementation of an API that offers access control features +// implements the google.iam.v1.IAMPolicy interface. +// +// ## Data model +// +// Access control is applied when a principal (user or service account), takes +// some action on a resource exposed by a service. Resources, identified by +// URI-like names, are the unit of access control specification. Service +// implementations can choose the granularity of access control and the +// supported permissions for their resources. +// For example one database service may allow access control to be +// specified only at the Table level, whereas another might allow access control +// to also be specified at the Column level. +// +// ## Policy Structure +// +// See google.iam.v1.Policy +// +// This is intentionally not a CRUD style API because access control policies +// are created and deleted implicitly with the resources to which they are +// attached. +service IAMPolicy { + // Sets the access control policy on the specified resource. Replaces any + // existing policy. + rpc SetIamPolicy(SetIamPolicyRequest) returns (Policy) { + option (google.api.http) = { post: "/v1/{resource=**}:setIamPolicy" body: "*" }; + } + + // Gets the access control policy for a resource. + // Returns an empty policy if the resource exists and does not have a policy + // set. + rpc GetIamPolicy(GetIamPolicyRequest) returns (Policy) { + option (google.api.http) = { post: "/v1/{resource=**}:getIamPolicy" body: "*" }; + } + + // Returns permissions that a caller has on the specified resource. + // If the resource does not exist, this will return an empty set of + // permissions, not a NOT_FOUND error. + rpc TestIamPermissions(TestIamPermissionsRequest) returns (TestIamPermissionsResponse) { + option (google.api.http) = { post: "/v1/{resource=**}:testIamPermissions" body: "*" }; + } +} + +// Request message for `SetIamPolicy` method. +message SetIamPolicyRequest { + // REQUIRED: The resource for which the policy is being specified. + // `resource` is usually specified as a path. For example, a Project + // resource is specified as `projects/{project}`. + string resource = 1; + + // REQUIRED: The complete policy to be applied to the `resource`. The size of + // the policy is limited to a few 10s of KB. An empty policy is a + // valid policy but certain Cloud Platform services (such as Projects) + // might reject them. + Policy policy = 2; +} + +// Request message for `GetIamPolicy` method. +message GetIamPolicyRequest { + // REQUIRED: The resource for which the policy is being requested. + // `resource` is usually specified as a path. For example, a Project + // resource is specified as `projects/{project}`. + string resource = 1; +} + +// Request message for `TestIamPermissions` method. +message TestIamPermissionsRequest { + // REQUIRED: The resource for which the policy detail is being requested. + // `resource` is usually specified as a path. For example, a Project + // resource is specified as `projects/{project}`. + string resource = 1; + + // The set of permissions to check for the `resource`. Permissions with + // wildcards (such as '*' or 'storage.*') are not allowed. For more + // information see + // [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + repeated string permissions = 2; +} + +// Response message for `TestIamPermissions` method. +message TestIamPermissionsResponse { + // A subset of `TestPermissionsRequest.permissions` that the caller is + // allowed. + repeated string permissions = 1; +} diff --git a/handwritten/pubsub/protos/google/iam/v1/policy.proto b/handwritten/pubsub/protos/google/iam/v1/policy.proto new file mode 100644 index 00000000000..a09b5443138 --- /dev/null +++ b/handwritten/pubsub/protos/google/iam/v1/policy.proto @@ -0,0 +1,149 @@ +// Copyright 2016 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.iam.v1; + +import "google/api/annotations.proto"; + +option cc_enable_arenas = true; +option csharp_namespace = "Google.Cloud.Iam.V1"; +option go_package = "google.golang.org/genproto/googleapis/iam/v1;iam"; +option java_multiple_files = true; +option java_outer_classname = "PolicyProto"; +option java_package = "com.google.iam.v1"; + + +// Defines an Identity and Access Management (IAM) policy. It is used to +// specify access control policies for Cloud Platform resources. +// +// +// A `Policy` consists of a list of `bindings`. A `Binding` binds a list of +// `members` to a `role`, where the members can be user accounts, Google groups, +// Google domains, and service accounts. A `role` is a named list of permissions +// defined by IAM. +// +// **Example** +// +// { +// "bindings": [ +// { +// "role": "roles/owner", +// "members": [ +// "user:mike@example.com", +// "group:admins@example.com", +// "domain:google.com", +// "serviceAccount:my-other-app@appspot.gserviceaccount.com", +// ] +// }, +// { +// "role": "roles/viewer", +// "members": ["user:sean@example.com"] +// } +// ] +// } +// +// For a description of IAM and its features, see the +// [IAM developer's guide](https://cloud.google.com/iam). +message Policy { + // Version of the `Policy`. The default version is 0. + int32 version = 1; + + // Associates a list of `members` to a `role`. + // Multiple `bindings` must not be specified for the same `role`. + // `bindings` with no members will result in an error. + repeated Binding bindings = 4; + + // `etag` is used for optimistic concurrency control as a way to help + // prevent simultaneous updates of a policy from overwriting each other. + // It is strongly suggested that systems make use of the `etag` in the + // read-modify-write cycle to perform policy updates in order to avoid race + // conditions: An `etag` is returned in the response to `getIamPolicy`, and + // systems are expected to put that etag in the request to `setIamPolicy` to + // ensure that their change will be applied to the same version of the policy. + // + // If no `etag` is provided in the call to `setIamPolicy`, then the existing + // policy is overwritten blindly. + bytes etag = 3; +} + +// Associates `members` with a `role`. +message Binding { + // Role that is assigned to `members`. + // For example, `roles/viewer`, `roles/editor`, or `roles/owner`. + // Required + string role = 1; + + // Specifies the identities requesting access for a Cloud Platform resource. + // `members` can have the following values: + // + // * `allUsers`: A special identifier that represents anyone who is + // on the internet; with or without a Google account. + // + // * `allAuthenticatedUsers`: A special identifier that represents anyone + // who is authenticated with a Google account or a service account. + // + // * `user:{emailid}`: An email address that represents a specific Google + // account. For example, `alice@gmail.com` or `joe@example.com`. + // + // + // * `serviceAccount:{emailid}`: An email address that represents a service + // account. For example, `my-other-app@appspot.gserviceaccount.com`. + // + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. + // + // * `domain:{domain}`: A Google Apps domain name that represents all the + // users of that domain. For example, `google.com` or `example.com`. + // + // + repeated string members = 2; +} + +// The difference delta between two policies. +message PolicyDelta { + // The delta for Bindings between two policies. + repeated BindingDelta binding_deltas = 1; +} + +// One delta entry for Binding. Each individual change (only one member in each +// entry) to a binding will be a separate entry. +message BindingDelta { + // The type of action performed on a Binding in a policy. + enum Action { + // Unspecified. + ACTION_UNSPECIFIED = 0; + + // Addition of a Binding. + ADD = 1; + + // Removal of a Binding. + REMOVE = 2; + } + + // The action that was performed on a Binding. + // Required + Action action = 1; + + // Role that is assigned to `members`. + // For example, `roles/viewer`, `roles/editor`, or `roles/owner`. + // Required + string role = 2; + + // A single identity requesting access for a Cloud Platform resource. + // Follows the same format of Binding.members. + // Required + string member = 3; +} diff --git a/handwritten/pubsub/protos/google/protobuf/any.proto b/handwritten/pubsub/protos/google/protobuf/any.proto new file mode 100644 index 00000000000..9bd3f50a453 --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/any.proto @@ -0,0 +1,139 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option go_package = "github.com/golang/protobuf/ptypes/any"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "AnyProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// `Any` contains an arbitrary serialized protocol buffer message along with a +// URL that describes the type of the serialized message. +// +// Protobuf library provides support to pack/unpack Any values in the form +// of utility functions or additional generated methods of the Any type. +// +// Example 1: Pack and unpack a message in C++. +// +// Foo foo = ...; +// Any any; +// any.PackFrom(foo); +// ... +// if (any.UnpackTo(&foo)) { +// ... +// } +// +// Example 2: Pack and unpack a message in Java. +// +// Foo foo = ...; +// Any any = Any.pack(foo); +// ... +// if (any.is(Foo.class)) { +// foo = any.unpack(Foo.class); +// } +// +// Example 3: Pack and unpack a message in Python. +// +// foo = Foo(...) +// any = Any() +// any.Pack(foo) +// ... +// if any.Is(Foo.DESCRIPTOR): +// any.Unpack(foo) +// ... +// +// The pack methods provided by protobuf library will by default use +// 'type.googleapis.com/full.type.name' as the type URL and the unpack +// methods only use the fully qualified type name after the last '/' +// in the type URL, for example "foo.bar.com/x/y.z" will yield type +// name "y.z". +// +// +// JSON +// ==== +// The JSON representation of an `Any` value uses the regular +// representation of the deserialized, embedded message, with an +// additional field `@type` which contains the type URL. Example: +// +// package google.profile; +// message Person { +// string first_name = 1; +// string last_name = 2; +// } +// +// { +// "@type": "type.googleapis.com/google.profile.Person", +// "firstName": , +// "lastName": +// } +// +// If the embedded message type is well-known and has a custom JSON +// representation, that representation will be embedded adding a field +// `value` which holds the custom JSON in addition to the `@type` +// field. Example (for message [google.protobuf.Duration][]): +// +// { +// "@type": "type.googleapis.com/google.protobuf.Duration", +// "value": "1.212s" +// } +// +message Any { + // A URL/resource name whose content describes the type of the + // serialized protocol buffer message. + // + // For URLs which use the scheme `http`, `https`, or no scheme, the + // following restrictions and interpretations apply: + // + // * If no scheme is provided, `https` is assumed. + // * The last segment of the URL's path must represent the fully + // qualified name of the type (as in `path/google.protobuf.Duration`). + // The name should be in a canonical form (e.g., leading "." is + // not accepted). + // * An HTTP GET on the URL must yield a [google.protobuf.Type][] + // value in binary format, or produce an error. + // * Applications are allowed to cache lookup results based on the + // URL, or have them precompiled into a binary to avoid any + // lookup. Therefore, binary compatibility needs to be preserved + // on changes to types. (Use versioned type names to manage + // breaking changes.) + // + // Schemes other than `http`, `https` (or the empty scheme) might be + // used with implementation specific semantics. + // + string type_url = 1; + + // Must be a valid serialized protocol buffer of the above specified type. + bytes value = 2; +} diff --git a/handwritten/pubsub/protos/google/protobuf/api.proto b/handwritten/pubsub/protos/google/protobuf/api.proto new file mode 100644 index 00000000000..7c30e8b7ad3 --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/api.proto @@ -0,0 +1,202 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +import "google/protobuf/source_context.proto"; +import "google/protobuf/type.proto"; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "ApiProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option go_package = "google.golang.org/genproto/protobuf/api;api"; + +// Api is a light-weight descriptor for a protocol buffer service. +message Api { + + // The fully qualified name of this api, including package name + // followed by the api's simple name. + string name = 1; + + // The methods of this api, in unspecified order. + repeated Method methods = 2; + + // Any metadata attached to the API. + repeated Option options = 3; + + // A version string for this api. If specified, must have the form + // `major-version.minor-version`, as in `1.10`. If the minor version + // is omitted, it defaults to zero. If the entire version field is + // empty, the major version is derived from the package name, as + // outlined below. If the field is not empty, the version in the + // package name will be verified to be consistent with what is + // provided here. + // + // The versioning schema uses [semantic + // versioning](http://semver.org) where the major version number + // indicates a breaking change and the minor version an additive, + // non-breaking change. Both version numbers are signals to users + // what to expect from different versions, and should be carefully + // chosen based on the product plan. + // + // The major version is also reflected in the package name of the + // API, which must end in `v`, as in + // `google.feature.v1`. For major versions 0 and 1, the suffix can + // be omitted. Zero major versions must only be used for + // experimental, none-GA apis. + // + // + string version = 4; + + // Source context for the protocol buffer service represented by this + // message. + SourceContext source_context = 5; + + // Included APIs. See [Mixin][]. + repeated Mixin mixins = 6; + + // The source syntax of the service. + Syntax syntax = 7; +} + +// Method represents a method of an api. +message Method { + + // The simple name of this method. + string name = 1; + + // A URL of the input message type. + string request_type_url = 2; + + // If true, the request is streamed. + bool request_streaming = 3; + + // The URL of the output message type. + string response_type_url = 4; + + // If true, the response is streamed. + bool response_streaming = 5; + + // Any metadata attached to the method. + repeated Option options = 6; + + // The source syntax of this method. + Syntax syntax = 7; +} + +// Declares an API to be included in this API. The including API must +// redeclare all the methods from the included API, but documentation +// and options are inherited as follows: +// +// - If after comment and whitespace stripping, the documentation +// string of the redeclared method is empty, it will be inherited +// from the original method. +// +// - Each annotation belonging to the service config (http, +// visibility) which is not set in the redeclared method will be +// inherited. +// +// - If an http annotation is inherited, the path pattern will be +// modified as follows. Any version prefix will be replaced by the +// version of the including API plus the [root][] path if specified. +// +// Example of a simple mixin: +// +// package google.acl.v1; +// service AccessControl { +// // Get the underlying ACL object. +// rpc GetAcl(GetAclRequest) returns (Acl) { +// option (google.api.http).get = "/v1/{resource=**}:getAcl"; +// } +// } +// +// package google.storage.v2; +// service Storage { +// rpc GetAcl(GetAclRequest) returns (Acl); +// +// // Get a data record. +// rpc GetData(GetDataRequest) returns (Data) { +// option (google.api.http).get = "/v2/{resource=**}"; +// } +// } +// +// Example of a mixin configuration: +// +// apis: +// - name: google.storage.v2.Storage +// mixins: +// - name: google.acl.v1.AccessControl +// +// The mixin construct implies that all methods in `AccessControl` are +// also declared with same name and request/response types in +// `Storage`. A documentation generator or annotation processor will +// see the effective `Storage.GetAcl` method after inherting +// documentation and annotations as follows: +// +// service Storage { +// // Get the underlying ACL object. +// rpc GetAcl(GetAclRequest) returns (Acl) { +// option (google.api.http).get = "/v2/{resource=**}:getAcl"; +// } +// ... +// } +// +// Note how the version in the path pattern changed from `v1` to `v2`. +// +// If the `root` field in the mixin is specified, it should be a +// relative path under which inherited HTTP paths are placed. Example: +// +// apis: +// - name: google.storage.v2.Storage +// mixins: +// - name: google.acl.v1.AccessControl +// root: acls +// +// This implies the following inherited HTTP annotation: +// +// service Storage { +// // Get the underlying ACL object. +// rpc GetAcl(GetAclRequest) returns (Acl) { +// option (google.api.http).get = "/v2/acls/{resource=**}:getAcl"; +// } +// ... +// } +message Mixin { + // The fully qualified name of the API which is included. + string name = 1; + + // If non-empty specifies a path under which inherited HTTP paths + // are rooted. + string root = 2; +} diff --git a/handwritten/pubsub/protos/google/protobuf/descriptor.proto b/handwritten/pubsub/protos/google/protobuf/descriptor.proto new file mode 100644 index 00000000000..f859c42972f --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/descriptor.proto @@ -0,0 +1,831 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Author: kenton@google.com (Kenton Varda) +// Based on original Protocol Buffers design by +// Sanjay Ghemawat, Jeff Dean, and others. +// +// The messages in this file describe the definitions found in .proto files. +// A valid .proto file can be translated directly to a FileDescriptorProto +// without any other information (e.g. without reading its imports). + + +syntax = "proto2"; + +package google.protobuf; +option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "DescriptorProtos"; +option csharp_namespace = "Google.Protobuf.Reflection"; +option objc_class_prefix = "GPB"; + +// descriptor.proto must be optimized for speed because reflection-based +// algorithms don't work during bootstrapping. +option optimize_for = SPEED; + +// The protocol compiler can output a FileDescriptorSet containing the .proto +// files it parses. +message FileDescriptorSet { + repeated FileDescriptorProto file = 1; +} + +// Describes a complete .proto file. +message FileDescriptorProto { + optional string name = 1; // file name, relative to root of source tree + optional string package = 2; // e.g. "foo", "foo.bar", etc. + + // Names of files imported by this file. + repeated string dependency = 3; + // Indexes of the public imported files in the dependency list above. + repeated int32 public_dependency = 10; + // Indexes of the weak imported files in the dependency list. + // For Google-internal migration only. Do not use. + repeated int32 weak_dependency = 11; + + // All top-level definitions in this file. + repeated DescriptorProto message_type = 4; + repeated EnumDescriptorProto enum_type = 5; + repeated ServiceDescriptorProto service = 6; + repeated FieldDescriptorProto extension = 7; + + optional FileOptions options = 8; + + // This field contains optional information about the original source code. + // You may safely remove this entire field without harming runtime + // functionality of the descriptors -- the information is needed only by + // development tools. + optional SourceCodeInfo source_code_info = 9; + + // The syntax of the proto file. + // The supported values are "proto2" and "proto3". + optional string syntax = 12; +} + +// Describes a message type. +message DescriptorProto { + optional string name = 1; + + repeated FieldDescriptorProto field = 2; + repeated FieldDescriptorProto extension = 6; + + repeated DescriptorProto nested_type = 3; + repeated EnumDescriptorProto enum_type = 4; + + message ExtensionRange { + optional int32 start = 1; + optional int32 end = 2; + } + repeated ExtensionRange extension_range = 5; + + repeated OneofDescriptorProto oneof_decl = 8; + + optional MessageOptions options = 7; + + // Range of reserved tag numbers. Reserved tag numbers may not be used by + // fields or extension ranges in the same message. Reserved ranges may + // not overlap. + message ReservedRange { + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. + } + repeated ReservedRange reserved_range = 9; + // Reserved field names, which may not be used by fields in the same message. + // A given name may only be reserved once. + repeated string reserved_name = 10; +} + +// Describes a field within a message. +message FieldDescriptorProto { + enum Type { + // 0 is reserved for errors. + // Order is weird for historical reasons. + TYPE_DOUBLE = 1; + TYPE_FLOAT = 2; + // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if + // negative values are likely. + TYPE_INT64 = 3; + TYPE_UINT64 = 4; + // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if + // negative values are likely. + TYPE_INT32 = 5; + TYPE_FIXED64 = 6; + TYPE_FIXED32 = 7; + TYPE_BOOL = 8; + TYPE_STRING = 9; + // Tag-delimited aggregate. + // Group type is deprecated and not supported in proto3. However, Proto3 + // implementations should still be able to parse the group wire format and + // treat group fields as unknown fields. + TYPE_GROUP = 10; + TYPE_MESSAGE = 11; // Length-delimited aggregate. + + // New in version 2. + TYPE_BYTES = 12; + TYPE_UINT32 = 13; + TYPE_ENUM = 14; + TYPE_SFIXED32 = 15; + TYPE_SFIXED64 = 16; + TYPE_SINT32 = 17; // Uses ZigZag encoding. + TYPE_SINT64 = 18; // Uses ZigZag encoding. + }; + + enum Label { + // 0 is reserved for errors + LABEL_OPTIONAL = 1; + LABEL_REQUIRED = 2; + LABEL_REPEATED = 3; + }; + + optional string name = 1; + optional int32 number = 3; + optional Label label = 4; + + // If type_name is set, this need not be set. If both this and type_name + // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. + optional Type type = 5; + + // For message and enum types, this is the name of the type. If the name + // starts with a '.', it is fully-qualified. Otherwise, C++-like scoping + // rules are used to find the type (i.e. first the nested types within this + // message are searched, then within the parent, on up to the root + // namespace). + optional string type_name = 6; + + // For extensions, this is the name of the type being extended. It is + // resolved in the same manner as type_name. + optional string extendee = 2; + + // For numeric types, contains the original text representation of the value. + // For booleans, "true" or "false". + // For strings, contains the default text contents (not escaped in any way). + // For bytes, contains the C escaped value. All bytes >= 128 are escaped. + // TODO(kenton): Base-64 encode? + optional string default_value = 7; + + // If set, gives the index of a oneof in the containing type's oneof_decl + // list. This field is a member of that oneof. + optional int32 oneof_index = 9; + + // JSON name of this field. The value is set by protocol compiler. If the + // user has set a "json_name" option on this field, that option's value + // will be used. Otherwise, it's deduced from the field's name by converting + // it to camelCase. + optional string json_name = 10; + + optional FieldOptions options = 8; +} + +// Describes a oneof. +message OneofDescriptorProto { + optional string name = 1; + optional OneofOptions options = 2; +} + +// Describes an enum type. +message EnumDescriptorProto { + optional string name = 1; + + repeated EnumValueDescriptorProto value = 2; + + optional EnumOptions options = 3; +} + +// Describes a value within an enum. +message EnumValueDescriptorProto { + optional string name = 1; + optional int32 number = 2; + + optional EnumValueOptions options = 3; +} + +// Describes a service. +message ServiceDescriptorProto { + optional string name = 1; + repeated MethodDescriptorProto method = 2; + + optional ServiceOptions options = 3; +} + +// Describes a method of a service. +message MethodDescriptorProto { + optional string name = 1; + + // Input and output type names. These are resolved in the same way as + // FieldDescriptorProto.type_name, but must refer to a message type. + optional string input_type = 2; + optional string output_type = 3; + + optional MethodOptions options = 4; + + // Identifies if client streams multiple client messages + optional bool client_streaming = 5 [default=false]; + // Identifies if server streams multiple server messages + optional bool server_streaming = 6 [default=false]; +} + + +// =================================================================== +// Options + +// Each of the definitions above may have "options" attached. These are +// just annotations which may cause code to be generated slightly differently +// or may contain hints for code that manipulates protocol messages. +// +// Clients may define custom options as extensions of the *Options messages. +// These extensions may not yet be known at parsing time, so the parser cannot +// store the values in them. Instead it stores them in a field in the *Options +// message called uninterpreted_option. This field must have the same name +// across all *Options messages. We then use this field to populate the +// extensions when we build a descriptor, at which point all protos have been +// parsed and so all extensions are known. +// +// Extension numbers for custom options may be chosen as follows: +// * For options which will only be used within a single application or +// organization, or for experimental options, use field numbers 50000 +// through 99999. It is up to you to ensure that you do not use the +// same number for multiple options. +// * For options which will be published and used publicly by multiple +// independent entities, e-mail protobuf-global-extension-registry@google.com +// to reserve extension numbers. Simply provide your project name (e.g. +// Objective-C plugin) and your project website (if available) -- there's no +// need to explain how you intend to use them. Usually you only need one +// extension number. You can declare multiple options with only one extension +// number by putting them in a sub-message. See the Custom Options section of +// the docs for examples: +// https://developers.google.com/protocol-buffers/docs/proto#options +// If this turns out to be popular, a web service will be set up +// to automatically assign option numbers. + + +message FileOptions { + + // Sets the Java package where classes generated from this .proto will be + // placed. By default, the proto package is used, but this is often + // inappropriate because proto packages do not normally start with backwards + // domain names. + optional string java_package = 1; + + + // If set, all the classes from the .proto file are wrapped in a single + // outer class with the given name. This applies to both Proto1 + // (equivalent to the old "--one_java_file" option) and Proto2 (where + // a .proto always translates to a single class, but you may want to + // explicitly choose the class name). + optional string java_outer_classname = 8; + + // If set true, then the Java code generator will generate a separate .java + // file for each top-level message, enum, and service defined in the .proto + // file. Thus, these types will *not* be nested inside the outer class + // named by java_outer_classname. However, the outer class will still be + // generated to contain the file's getDescriptor() method as well as any + // top-level extensions defined in the file. + optional bool java_multiple_files = 10 [default=false]; + + // This option does nothing. + optional bool java_generate_equals_and_hash = 20 [deprecated=true]; + + // If set true, then the Java2 code generator will generate code that + // throws an exception whenever an attempt is made to assign a non-UTF-8 + // byte sequence to a string field. + // Message reflection will do the same. + // However, an extension field still accepts non-UTF-8 byte sequences. + // This option has no effect on when used with the lite runtime. + optional bool java_string_check_utf8 = 27 [default=false]; + + + // Generated classes can be optimized for speed or code size. + enum OptimizeMode { + SPEED = 1; // Generate complete code for parsing, serialization, + // etc. + CODE_SIZE = 2; // Use ReflectionOps to implement these methods. + LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. + } + optional OptimizeMode optimize_for = 9 [default=SPEED]; + + // Sets the Go package where structs generated from this .proto will be + // placed. If omitted, the Go package will be derived from the following: + // - The basename of the package import path, if provided. + // - Otherwise, the package statement in the .proto file, if present. + // - Otherwise, the basename of the .proto file, without extension. + optional string go_package = 11; + + + + // Should generic services be generated in each language? "Generic" services + // are not specific to any particular RPC system. They are generated by the + // main code generators in each language (without additional plugins). + // Generic services were the only kind of service generation supported by + // early versions of google.protobuf. + // + // Generic services are now considered deprecated in favor of using plugins + // that generate code specific to your particular RPC system. Therefore, + // these default to false. Old code which depends on generic services should + // explicitly set them to true. + optional bool cc_generic_services = 16 [default=false]; + optional bool java_generic_services = 17 [default=false]; + optional bool py_generic_services = 18 [default=false]; + + // Is this file deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for everything in the file, or it will be completely ignored; in the very + // least, this is a formalization for deprecating files. + optional bool deprecated = 23 [default=false]; + + // Enables the use of arenas for the proto messages in this file. This applies + // only to generated classes for C++. + optional bool cc_enable_arenas = 31 [default=false]; + + + // Sets the objective c class prefix which is prepended to all objective c + // generated classes from this .proto. There is no default. + optional string objc_class_prefix = 36; + + // Namespace for generated classes; defaults to the package. + optional string csharp_namespace = 37; + + // By default Swift generators will take the proto package and CamelCase it + // replacing '.' with underscore and use that to prefix the types/symbols + // defined. When this options is provided, they will use this value instead + // to prefix the types/symbols defined. + optional string swift_prefix = 39; + + // Sets the php class prefix which is prepended to all php generated classes + // from this .proto. Default is empty. + optional string php_class_prefix = 40; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; + + reserved 38; +} + +message MessageOptions { + // Set true to use the old proto1 MessageSet wire format for extensions. + // This is provided for backwards-compatibility with the MessageSet wire + // format. You should not use this for any other reason: It's less + // efficient, has fewer features, and is more complicated. + // + // The message must be defined exactly as follows: + // message Foo { + // option message_set_wire_format = true; + // extensions 4 to max; + // } + // Note that the message cannot have any defined fields; MessageSets only + // have extensions. + // + // All extensions of your type must be singular messages; e.g. they cannot + // be int32s, enums, or repeated messages. + // + // Because this is an option, the above two restrictions are not enforced by + // the protocol compiler. + optional bool message_set_wire_format = 1 [default=false]; + + // Disables the generation of the standard "descriptor()" accessor, which can + // conflict with a field of the same name. This is meant to make migration + // from proto1 easier; new code should avoid fields named "descriptor". + optional bool no_standard_descriptor_accessor = 2 [default=false]; + + // Is this message deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the message, or it will be completely ignored; in the very least, + // this is a formalization for deprecating messages. + optional bool deprecated = 3 [default=false]; + + // Whether the message is an automatically generated map entry type for the + // maps field. + // + // For maps fields: + // map map_field = 1; + // The parsed descriptor looks like: + // message MapFieldEntry { + // option map_entry = true; + // optional KeyType key = 1; + // optional ValueType value = 2; + // } + // repeated MapFieldEntry map_field = 1; + // + // Implementations may choose not to generate the map_entry=true message, but + // use a native map in the target language to hold the keys and values. + // The reflection APIs in such implementions still need to work as + // if the field is a repeated message field. + // + // NOTE: Do not set the option in .proto files. Always use the maps syntax + // instead. The option should only be implicitly set by the proto compiler + // parser. + optional bool map_entry = 7; + + reserved 8; // javalite_serializable + reserved 9; // javanano_as_lite + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message FieldOptions { + // The ctype option instructs the C++ code generator to use a different + // representation of the field than it normally would. See the specific + // options below. This option is not yet implemented in the open source + // release -- sorry, we'll try to include it in a future version! + optional CType ctype = 1 [default = STRING]; + enum CType { + // Default mode. + STRING = 0; + + CORD = 1; + + STRING_PIECE = 2; + } + // The packed option can be enabled for repeated primitive fields to enable + // a more efficient representation on the wire. Rather than repeatedly + // writing the tag and type for each element, the entire array is encoded as + // a single length-delimited blob. In proto3, only explicit setting it to + // false will avoid using packed encoding. + optional bool packed = 2; + + // The jstype option determines the JavaScript type used for values of the + // field. The option is permitted only for 64 bit integral and fixed types + // (int64, uint64, sint64, fixed64, sfixed64). By default these types are + // represented as JavaScript strings. This avoids loss of precision that can + // happen when a large value is converted to a floating point JavaScript + // numbers. Specifying JS_NUMBER for the jstype causes the generated + // JavaScript code to use the JavaScript "number" type instead of strings. + // This option is an enum to permit additional types to be added, + // e.g. goog.math.Integer. + optional JSType jstype = 6 [default = JS_NORMAL]; + enum JSType { + // Use the default type. + JS_NORMAL = 0; + + // Use JavaScript strings. + JS_STRING = 1; + + // Use JavaScript numbers. + JS_NUMBER = 2; + } + + // Should this field be parsed lazily? Lazy applies only to message-type + // fields. It means that when the outer message is initially parsed, the + // inner message's contents will not be parsed but instead stored in encoded + // form. The inner message will actually be parsed when it is first accessed. + // + // This is only a hint. Implementations are free to choose whether to use + // eager or lazy parsing regardless of the value of this option. However, + // setting this option true suggests that the protocol author believes that + // using lazy parsing on this field is worth the additional bookkeeping + // overhead typically needed to implement it. + // + // This option does not affect the public interface of any generated code; + // all method signatures remain the same. Furthermore, thread-safety of the + // interface is not affected by this option; const methods remain safe to + // call from multiple threads concurrently, while non-const methods continue + // to require exclusive access. + // + // + // Note that implementations may choose not to check required fields within + // a lazy sub-message. That is, calling IsInitialized() on the outer message + // may return true even if the inner message has missing required fields. + // This is necessary because otherwise the inner message would have to be + // parsed in order to perform the check, defeating the purpose of lazy + // parsing. An implementation which chooses not to check required fields + // must be consistent about it. That is, for any particular sub-message, the + // implementation must either *always* check its required fields, or *never* + // check its required fields, regardless of whether or not the message has + // been parsed. + optional bool lazy = 5 [default=false]; + + // Is this field deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for accessors, or it will be completely ignored; in the very least, this + // is a formalization for deprecating fields. + optional bool deprecated = 3 [default=false]; + + // For Google-internal migration only. Do not use. + optional bool weak = 10 [default=false]; + + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; + + reserved 4; // removed jtype +} + +message OneofOptions { + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message EnumOptions { + + // Set this option to true to allow mapping different tag names to the same + // value. + optional bool allow_alias = 2; + + // Is this enum deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the enum, or it will be completely ignored; in the very least, this + // is a formalization for deprecating enums. + optional bool deprecated = 3 [default=false]; + + reserved 5; // javanano_as_lite + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message EnumValueOptions { + // Is this enum value deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the enum value, or it will be completely ignored; in the very least, + // this is a formalization for deprecating enum values. + optional bool deprecated = 1 [default=false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message ServiceOptions { + + // Note: Field numbers 1 through 32 are reserved for Google's internal RPC + // framework. We apologize for hoarding these numbers to ourselves, but + // we were already using them long before we decided to release Protocol + // Buffers. + + // Is this service deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the service, or it will be completely ignored; in the very least, + // this is a formalization for deprecating services. + optional bool deprecated = 33 [default=false]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + +message MethodOptions { + + // Note: Field numbers 1 through 32 are reserved for Google's internal RPC + // framework. We apologize for hoarding these numbers to ourselves, but + // we were already using them long before we decided to release Protocol + // Buffers. + + // Is this method deprecated? + // Depending on the target platform, this can emit Deprecated annotations + // for the method, or it will be completely ignored; in the very least, + // this is a formalization for deprecating methods. + optional bool deprecated = 33 [default=false]; + + // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, + // or neither? HTTP based RPC implementation may choose GET verb for safe + // methods, and PUT verb for idempotent methods instead of the default POST. + enum IdempotencyLevel { + IDEMPOTENCY_UNKNOWN = 0; + NO_SIDE_EFFECTS = 1; // implies idempotent + IDEMPOTENT = 2; // idempotent, but may have side effects + } + optional IdempotencyLevel idempotency_level = + 34 [default=IDEMPOTENCY_UNKNOWN]; + + // The parser stores options it doesn't recognize here. See above. + repeated UninterpretedOption uninterpreted_option = 999; + + // Clients can define custom options in extensions of this message. See above. + extensions 1000 to max; +} + + +// A message representing a option the parser does not recognize. This only +// appears in options protos created by the compiler::Parser class. +// DescriptorPool resolves these when building Descriptor objects. Therefore, +// options protos in descriptor objects (e.g. returned by Descriptor::options(), +// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions +// in them. +message UninterpretedOption { + // The name of the uninterpreted option. Each string represents a segment in + // a dot-separated name. is_extension is true iff a segment represents an + // extension (denoted with parentheses in options specs in .proto files). + // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents + // "foo.(bar.baz).qux". + message NamePart { + required string name_part = 1; + required bool is_extension = 2; + } + repeated NamePart name = 2; + + // The value of the uninterpreted option, in whatever type the tokenizer + // identified it as during parsing. Exactly one of these should be set. + optional string identifier_value = 3; + optional uint64 positive_int_value = 4; + optional int64 negative_int_value = 5; + optional double double_value = 6; + optional bytes string_value = 7; + optional string aggregate_value = 8; +} + +// =================================================================== +// Optional source code info + +// Encapsulates information about the original source file from which a +// FileDescriptorProto was generated. +message SourceCodeInfo { + // A Location identifies a piece of source code in a .proto file which + // corresponds to a particular definition. This information is intended + // to be useful to IDEs, code indexers, documentation generators, and similar + // tools. + // + // For example, say we have a file like: + // message Foo { + // optional string foo = 1; + // } + // Let's look at just the field definition: + // optional string foo = 1; + // ^ ^^ ^^ ^ ^^^ + // a bc de f ghi + // We have the following locations: + // span path represents + // [a,i) [ 4, 0, 2, 0 ] The whole field definition. + // [a,b) [ 4, 0, 2, 0, 4 ] The label (optional). + // [c,d) [ 4, 0, 2, 0, 5 ] The type (string). + // [e,f) [ 4, 0, 2, 0, 1 ] The name (foo). + // [g,h) [ 4, 0, 2, 0, 3 ] The number (1). + // + // Notes: + // - A location may refer to a repeated field itself (i.e. not to any + // particular index within it). This is used whenever a set of elements are + // logically enclosed in a single code segment. For example, an entire + // extend block (possibly containing multiple extension definitions) will + // have an outer location whose path refers to the "extensions" repeated + // field without an index. + // - Multiple locations may have the same path. This happens when a single + // logical declaration is spread out across multiple places. The most + // obvious example is the "extend" block again -- there may be multiple + // extend blocks in the same scope, each of which will have the same path. + // - A location's span is not always a subset of its parent's span. For + // example, the "extendee" of an extension declaration appears at the + // beginning of the "extend" block and is shared by all extensions within + // the block. + // - Just because a location's span is a subset of some other location's span + // does not mean that it is a descendent. For example, a "group" defines + // both a type and a field in a single declaration. Thus, the locations + // corresponding to the type and field and their components will overlap. + // - Code which tries to interpret locations should probably be designed to + // ignore those that it doesn't understand, as more types of locations could + // be recorded in the future. + repeated Location location = 1; + message Location { + // Identifies which part of the FileDescriptorProto was defined at this + // location. + // + // Each element is a field number or an index. They form a path from + // the root FileDescriptorProto to the place where the definition. For + // example, this path: + // [ 4, 3, 2, 7, 1 ] + // refers to: + // file.message_type(3) // 4, 3 + // .field(7) // 2, 7 + // .name() // 1 + // This is because FileDescriptorProto.message_type has field number 4: + // repeated DescriptorProto message_type = 4; + // and DescriptorProto.field has field number 2: + // repeated FieldDescriptorProto field = 2; + // and FieldDescriptorProto.name has field number 1: + // optional string name = 1; + // + // Thus, the above path gives the location of a field name. If we removed + // the last element: + // [ 4, 3, 2, 7 ] + // this path refers to the whole field declaration (from the beginning + // of the label to the terminating semicolon). + repeated int32 path = 1 [packed=true]; + + // Always has exactly three or four elements: start line, start column, + // end line (optional, otherwise assumed same as start line), end column. + // These are packed into a single field for efficiency. Note that line + // and column numbers are zero-based -- typically you will want to add + // 1 to each before displaying to a user. + repeated int32 span = 2 [packed=true]; + + // If this SourceCodeInfo represents a complete declaration, these are any + // comments appearing before and after the declaration which appear to be + // attached to the declaration. + // + // A series of line comments appearing on consecutive lines, with no other + // tokens appearing on those lines, will be treated as a single comment. + // + // leading_detached_comments will keep paragraphs of comments that appear + // before (but not connected to) the current element. Each paragraph, + // separated by empty lines, will be one comment element in the repeated + // field. + // + // Only the comment content is provided; comment markers (e.g. //) are + // stripped out. For block comments, leading whitespace and an asterisk + // will be stripped from the beginning of each line other than the first. + // Newlines are included in the output. + // + // Examples: + // + // optional int32 foo = 1; // Comment attached to foo. + // // Comment attached to bar. + // optional int32 bar = 2; + // + // optional string baz = 3; + // // Comment attached to baz. + // // Another line attached to baz. + // + // // Comment attached to qux. + // // + // // Another line attached to qux. + // optional double qux = 4; + // + // // Detached comment for corge. This is not leading or trailing comments + // // to qux or corge because there are blank lines separating it from + // // both. + // + // // Detached comment for corge paragraph 2. + // + // optional string corge = 5; + // /* Block comment attached + // * to corge. Leading asterisks + // * will be removed. */ + // /* Block comment attached to + // * grault. */ + // optional int32 grault = 6; + // + // // ignored detached comments. + optional string leading_comments = 3; + optional string trailing_comments = 4; + repeated string leading_detached_comments = 6; + } +} + +// Describes the relationship between generated code and its original source +// file. A GeneratedCodeInfo message is associated with only one generated +// source file, but may contain references to different source .proto files. +message GeneratedCodeInfo { + // An Annotation connects some span of text in generated code to an element + // of its generating .proto file. + repeated Annotation annotation = 1; + message Annotation { + // Identifies the element in the original source .proto file. This field + // is formatted the same as SourceCodeInfo.Location.path. + repeated int32 path = 1 [packed=true]; + + // Identifies the filesystem path to the original source .proto. + optional string source_file = 2; + + // Identifies the starting offset in bytes in the generated code + // that relates to the identified object. + optional int32 begin = 3; + + // Identifies the ending offset in bytes in the generated code that + // relates to the identified offset. The end offset should be one past + // the last relevant byte (so the length of the text = end - begin). + optional int32 end = 4; + } +} diff --git a/handwritten/pubsub/protos/google/protobuf/duration.proto b/handwritten/pubsub/protos/google/protobuf/duration.proto new file mode 100644 index 00000000000..975fce41aae --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/duration.proto @@ -0,0 +1,117 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "github.com/golang/protobuf/ptypes/duration"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "DurationProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// A Duration represents a signed, fixed-length span of time represented +// as a count of seconds and fractions of seconds at nanosecond +// resolution. It is independent of any calendar and concepts like "day" +// or "month". It is related to Timestamp in that the difference between +// two Timestamp values is a Duration and it can be added or subtracted +// from a Timestamp. Range is approximately +-10,000 years. +// +// # Examples +// +// Example 1: Compute Duration from two Timestamps in pseudo code. +// +// Timestamp start = ...; +// Timestamp end = ...; +// Duration duration = ...; +// +// duration.seconds = end.seconds - start.seconds; +// duration.nanos = end.nanos - start.nanos; +// +// if (duration.seconds < 0 && duration.nanos > 0) { +// duration.seconds += 1; +// duration.nanos -= 1000000000; +// } else if (durations.seconds > 0 && duration.nanos < 0) { +// duration.seconds -= 1; +// duration.nanos += 1000000000; +// } +// +// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. +// +// Timestamp start = ...; +// Duration duration = ...; +// Timestamp end = ...; +// +// end.seconds = start.seconds + duration.seconds; +// end.nanos = start.nanos + duration.nanos; +// +// if (end.nanos < 0) { +// end.seconds -= 1; +// end.nanos += 1000000000; +// } else if (end.nanos >= 1000000000) { +// end.seconds += 1; +// end.nanos -= 1000000000; +// } +// +// Example 3: Compute Duration from datetime.timedelta in Python. +// +// td = datetime.timedelta(days=3, minutes=10) +// duration = Duration() +// duration.FromTimedelta(td) +// +// # JSON Mapping +// +// In JSON format, the Duration type is encoded as a string rather than an +// object, where the string ends in the suffix "s" (indicating seconds) and +// is preceded by the number of seconds, with nanoseconds expressed as +// fractional seconds. For example, 3 seconds with 0 nanoseconds should be +// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should +// be expressed in JSON format as "3.000000001s", and 3 seconds and 1 +// microsecond should be expressed in JSON format as "3.000001s". +// +// +message Duration { + + // Signed seconds of the span of time. Must be from -315,576,000,000 + // to +315,576,000,000 inclusive. Note: these bounds are computed from: + // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years + int64 seconds = 1; + + // Signed fractions of a second at nanosecond resolution of the span + // of time. Durations less than one second are represented with a 0 + // `seconds` field and a positive or negative `nanos` field. For durations + // of one second or more, a non-zero value for the `nanos` field must be + // of the same sign as the `seconds` field. Must be from -999,999,999 + // to +999,999,999 inclusive. + int32 nanos = 2; +} diff --git a/handwritten/pubsub/protos/google/protobuf/empty.proto b/handwritten/pubsub/protos/google/protobuf/empty.proto new file mode 100644 index 00000000000..03cacd23308 --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/empty.proto @@ -0,0 +1,52 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option go_package = "github.com/golang/protobuf/ptypes/empty"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "EmptyProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option cc_enable_arenas = true; + +// A generic empty message that you can re-use to avoid defining duplicated +// empty messages in your APIs. A typical example is to use it as the request +// or the response type of an API method. For instance: +// +// service Foo { +// rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty); +// } +// +// The JSON representation for `Empty` is empty JSON object `{}`. +message Empty {} diff --git a/handwritten/pubsub/protos/google/protobuf/field_mask.proto b/handwritten/pubsub/protos/google/protobuf/field_mask.proto new file mode 100644 index 00000000000..c68d247c8a4 --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/field_mask.proto @@ -0,0 +1,246 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "FieldMaskProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option go_package = "google.golang.org/genproto/protobuf/field_mask;field_mask"; + +// `FieldMask` represents a set of symbolic field paths, for example: +// +// paths: "f.a" +// paths: "f.b.d" +// +// Here `f` represents a field in some root message, `a` and `b` +// fields in the message found in `f`, and `d` a field found in the +// message in `f.b`. +// +// Field masks are used to specify a subset of fields that should be +// returned by a get operation or modified by an update operation. +// Field masks also have a custom JSON encoding (see below). +// +// # Field Masks in Projections +// +// When used in the context of a projection, a response message or +// sub-message is filtered by the API to only contain those fields as +// specified in the mask. For example, if the mask in the previous +// example is applied to a response message as follows: +// +// f { +// a : 22 +// b { +// d : 1 +// x : 2 +// } +// y : 13 +// } +// z: 8 +// +// The result will not contain specific values for fields x,y and z +// (their value will be set to the default, and omitted in proto text +// output): +// +// +// f { +// a : 22 +// b { +// d : 1 +// } +// } +// +// A repeated field is not allowed except at the last position of a +// paths string. +// +// If a FieldMask object is not present in a get operation, the +// operation applies to all fields (as if a FieldMask of all fields +// had been specified). +// +// Note that a field mask does not necessarily apply to the +// top-level response message. In case of a REST get operation, the +// field mask applies directly to the response, but in case of a REST +// list operation, the mask instead applies to each individual message +// in the returned resource list. In case of a REST custom method, +// other definitions may be used. Where the mask applies will be +// clearly documented together with its declaration in the API. In +// any case, the effect on the returned resource/resources is required +// behavior for APIs. +// +// # Field Masks in Update Operations +// +// A field mask in update operations specifies which fields of the +// targeted resource are going to be updated. The API is required +// to only change the values of the fields as specified in the mask +// and leave the others untouched. If a resource is passed in to +// describe the updated values, the API ignores the values of all +// fields not covered by the mask. +// +// If a repeated field is specified for an update operation, the existing +// repeated values in the target resource will be overwritten by the new values. +// Note that a repeated field is only allowed in the last position of a `paths` +// string. +// +// If a sub-message is specified in the last position of the field mask for an +// update operation, then the existing sub-message in the target resource is +// overwritten. Given the target message: +// +// f { +// b { +// d : 1 +// x : 2 +// } +// c : 1 +// } +// +// And an update message: +// +// f { +// b { +// d : 10 +// } +// } +// +// then if the field mask is: +// +// paths: "f.b" +// +// then the result will be: +// +// f { +// b { +// d : 10 +// } +// c : 1 +// } +// +// However, if the update mask was: +// +// paths: "f.b.d" +// +// then the result would be: +// +// f { +// b { +// d : 10 +// x : 2 +// } +// c : 1 +// } +// +// In order to reset a field's value to the default, the field must +// be in the mask and set to the default value in the provided resource. +// Hence, in order to reset all fields of a resource, provide a default +// instance of the resource and set all fields in the mask, or do +// not provide a mask as described below. +// +// If a field mask is not present on update, the operation applies to +// all fields (as if a field mask of all fields has been specified). +// Note that in the presence of schema evolution, this may mean that +// fields the client does not know and has therefore not filled into +// the request will be reset to their default. If this is unwanted +// behavior, a specific service may require a client to always specify +// a field mask, producing an error if not. +// +// As with get operations, the location of the resource which +// describes the updated values in the request message depends on the +// operation kind. In any case, the effect of the field mask is +// required to be honored by the API. +// +// ## Considerations for HTTP REST +// +// The HTTP kind of an update operation which uses a field mask must +// be set to PATCH instead of PUT in order to satisfy HTTP semantics +// (PUT must only be used for full updates). +// +// # JSON Encoding of Field Masks +// +// In JSON, a field mask is encoded as a single string where paths are +// separated by a comma. Fields name in each path are converted +// to/from lower-camel naming conventions. +// +// As an example, consider the following message declarations: +// +// message Profile { +// User user = 1; +// Photo photo = 2; +// } +// message User { +// string display_name = 1; +// string address = 2; +// } +// +// In proto a field mask for `Profile` may look as such: +// +// mask { +// paths: "user.display_name" +// paths: "photo" +// } +// +// In JSON, the same mask is represented as below: +// +// { +// mask: "user.displayName,photo" +// } +// +// # Field Masks and Oneof Fields +// +// Field masks treat fields in oneofs just as regular fields. Consider the +// following message: +// +// message SampleMessage { +// oneof test_oneof { +// string name = 4; +// SubMessage sub_message = 9; +// } +// } +// +// The field mask can be: +// +// mask { +// paths: "name" +// } +// +// Or: +// +// mask { +// paths: "sub_message" +// } +// +// Note that oneof type names ("test_oneof" in this case) cannot be used in +// paths. +message FieldMask { + // The set of field mask paths. + repeated string paths = 1; +} diff --git a/handwritten/pubsub/protos/google/protobuf/source_context.proto b/handwritten/pubsub/protos/google/protobuf/source_context.proto new file mode 100644 index 00000000000..f3b2c966811 --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/source_context.proto @@ -0,0 +1,48 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "SourceContextProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option go_package = "google.golang.org/genproto/protobuf/source_context;source_context"; + +// `SourceContext` represents information about the source of a +// protobuf element, like the file in which it is defined. +message SourceContext { + // The path-qualified name of the .proto file that contained the associated + // protobuf element. For example: `"google/protobuf/source_context.proto"`. + string file_name = 1; +} diff --git a/handwritten/pubsub/protos/google/protobuf/struct.proto b/handwritten/pubsub/protos/google/protobuf/struct.proto new file mode 100644 index 00000000000..7d7808e7fbb --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/struct.proto @@ -0,0 +1,96 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "github.com/golang/protobuf/ptypes/struct;structpb"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "StructProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + + +// `Struct` represents a structured data value, consisting of fields +// which map to dynamically typed values. In some languages, `Struct` +// might be supported by a native representation. For example, in +// scripting languages like JS a struct is represented as an +// object. The details of that representation are described together +// with the proto support for the language. +// +// The JSON representation for `Struct` is JSON object. +message Struct { + // Unordered map of dynamically typed values. + map fields = 1; +} + +// `Value` represents a dynamically typed value which can be either +// null, a number, a string, a boolean, a recursive struct value, or a +// list of values. A producer of value is expected to set one of that +// variants, absence of any variant indicates an error. +// +// The JSON representation for `Value` is JSON value. +message Value { + // The kind of value. + oneof kind { + // Represents a null value. + NullValue null_value = 1; + // Represents a double value. + double number_value = 2; + // Represents a string value. + string string_value = 3; + // Represents a boolean value. + bool bool_value = 4; + // Represents a structured value. + Struct struct_value = 5; + // Represents a repeated `Value`. + ListValue list_value = 6; + } +} + +// `NullValue` is a singleton enumeration to represent the null value for the +// `Value` type union. +// +// The JSON representation for `NullValue` is JSON `null`. +enum NullValue { + // Null value. + NULL_VALUE = 0; +} + +// `ListValue` is a wrapper around a repeated field of values. +// +// The JSON representation for `ListValue` is JSON array. +message ListValue { + // Repeated field of dynamically typed values. + repeated Value values = 1; +} diff --git a/handwritten/pubsub/protos/google/protobuf/timestamp.proto b/handwritten/pubsub/protos/google/protobuf/timestamp.proto new file mode 100644 index 00000000000..b7cbd17502f --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/timestamp.proto @@ -0,0 +1,133 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "github.com/golang/protobuf/ptypes/timestamp"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "TimestampProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// A Timestamp represents a point in time independent of any time zone +// or calendar, represented as seconds and fractions of seconds at +// nanosecond resolution in UTC Epoch time. It is encoded using the +// Proleptic Gregorian Calendar which extends the Gregorian calendar +// backwards to year one. It is encoded assuming all minutes are 60 +// seconds long, i.e. leap seconds are "smeared" so that no leap second +// table is needed for interpretation. Range is from +// 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. +// By restricting to that range, we ensure that we can convert to +// and from RFC 3339 date strings. +// See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt). +// +// # Examples +// +// Example 1: Compute Timestamp from POSIX `time()`. +// +// Timestamp timestamp; +// timestamp.set_seconds(time(NULL)); +// timestamp.set_nanos(0); +// +// Example 2: Compute Timestamp from POSIX `gettimeofday()`. +// +// struct timeval tv; +// gettimeofday(&tv, NULL); +// +// Timestamp timestamp; +// timestamp.set_seconds(tv.tv_sec); +// timestamp.set_nanos(tv.tv_usec * 1000); +// +// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. +// +// FILETIME ft; +// GetSystemTimeAsFileTime(&ft); +// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; +// +// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z +// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. +// Timestamp timestamp; +// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); +// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); +// +// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. +// +// long millis = System.currentTimeMillis(); +// +// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) +// .setNanos((int) ((millis % 1000) * 1000000)).build(); +// +// +// Example 5: Compute Timestamp from current time in Python. +// +// timestamp = Timestamp() +// timestamp.GetCurrentTime() +// +// # JSON Mapping +// +// In JSON format, the Timestamp type is encoded as a string in the +// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the +// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z" +// where {year} is always expressed using four digits while {month}, {day}, +// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional +// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), +// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone +// is required, though only UTC (as indicated by "Z") is presently supported. +// +// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past +// 01:30 UTC on January 15, 2017. +// +// In JavaScript, one can convert a Date object to this format using the +// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString] +// method. In Python, a standard `datetime.datetime` object can be converted +// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) +// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one +// can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( +// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()) +// to obtain a formatter capable of generating timestamps in this format. +// +// +message Timestamp { + + // Represents seconds of UTC time since Unix epoch + // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to + // 9999-12-31T23:59:59Z inclusive. + int64 seconds = 1; + + // Non-negative fractions of a second at nanosecond resolution. Negative + // second values with fractions must still have non-negative nanos values + // that count forward in time. Must be from 0 to 999,999,999 + // inclusive. + int32 nanos = 2; +} diff --git a/handwritten/pubsub/protos/google/protobuf/type.proto b/handwritten/pubsub/protos/google/protobuf/type.proto new file mode 100644 index 00000000000..624c15ee616 --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/type.proto @@ -0,0 +1,187 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package google.protobuf; + +import "google/protobuf/any.proto"; +import "google/protobuf/source_context.proto"; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option java_package = "com.google.protobuf"; +option java_outer_classname = "TypeProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; +option go_package = "google.golang.org/genproto/protobuf/ptype;ptype"; + +// A protocol buffer message type. +message Type { + // The fully qualified message name. + string name = 1; + // The list of fields. + repeated Field fields = 2; + // The list of types appearing in `oneof` definitions in this type. + repeated string oneofs = 3; + // The protocol buffer options. + repeated Option options = 4; + // The source context. + SourceContext source_context = 5; + // The source syntax. + Syntax syntax = 6; +} + +// A single field of a message type. +message Field { + // Basic field types. + enum Kind { + // Field type unknown. + TYPE_UNKNOWN = 0; + // Field type double. + TYPE_DOUBLE = 1; + // Field type float. + TYPE_FLOAT = 2; + // Field type int64. + TYPE_INT64 = 3; + // Field type uint64. + TYPE_UINT64 = 4; + // Field type int32. + TYPE_INT32 = 5; + // Field type fixed64. + TYPE_FIXED64 = 6; + // Field type fixed32. + TYPE_FIXED32 = 7; + // Field type bool. + TYPE_BOOL = 8; + // Field type string. + TYPE_STRING = 9; + // Field type group. Proto2 syntax only, and deprecated. + TYPE_GROUP = 10; + // Field type message. + TYPE_MESSAGE = 11; + // Field type bytes. + TYPE_BYTES = 12; + // Field type uint32. + TYPE_UINT32 = 13; + // Field type enum. + TYPE_ENUM = 14; + // Field type sfixed32. + TYPE_SFIXED32 = 15; + // Field type sfixed64. + TYPE_SFIXED64 = 16; + // Field type sint32. + TYPE_SINT32 = 17; + // Field type sint64. + TYPE_SINT64 = 18; + }; + + // Whether a field is optional, required, or repeated. + enum Cardinality { + // For fields with unknown cardinality. + CARDINALITY_UNKNOWN = 0; + // For optional fields. + CARDINALITY_OPTIONAL = 1; + // For required fields. Proto2 syntax only. + CARDINALITY_REQUIRED = 2; + // For repeated fields. + CARDINALITY_REPEATED = 3; + }; + + // The field type. + Kind kind = 1; + // The field cardinality. + Cardinality cardinality = 2; + // The field number. + int32 number = 3; + // The field name. + string name = 4; + // The field type URL, without the scheme, for message or enumeration + // types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`. + string type_url = 6; + // The index of the field type in `Type.oneofs`, for message or enumeration + // types. The first type has index 1; zero means the type is not in the list. + int32 oneof_index = 7; + // Whether to use alternative packed wire representation. + bool packed = 8; + // The protocol buffer options. + repeated Option options = 9; + // The field JSON name. + string json_name = 10; + // The string value of the default value of this field. Proto2 syntax only. + string default_value = 11; +} + +// Enum type definition. +message Enum { + // Enum type name. + string name = 1; + // Enum value definitions. + repeated EnumValue enumvalue = 2; + // Protocol buffer options. + repeated Option options = 3; + // The source context. + SourceContext source_context = 4; + // The source syntax. + Syntax syntax = 5; +} + +// Enum value definition. +message EnumValue { + // Enum value name. + string name = 1; + // Enum value number. + int32 number = 2; + // Protocol buffer options. + repeated Option options = 3; +} + +// A protocol buffer option, which can be attached to a message, field, +// enumeration, etc. +message Option { + // The option's name. For protobuf built-in options (options defined in + // descriptor.proto), this is the short name. For example, `"map_entry"`. + // For custom options, it should be the fully-qualified name. For example, + // `"google.api.http"`. + string name = 1; + // The option's value packed in an Any message. If the value is a primitive, + // the corresponding wrapper type defined in google/protobuf/wrappers.proto + // should be used. If the value is an enum, it should be stored as an int32 + // value using the google.protobuf.Int32Value type. + Any value = 2; +} + +// The syntax in which a protocol buffer element is defined. +enum Syntax { + // Syntax `proto2`. + SYNTAX_PROTO2 = 0; + // Syntax `proto3`. + SYNTAX_PROTO3 = 1; +} diff --git a/handwritten/pubsub/protos/google/protobuf/util/json_format_proto3.proto b/handwritten/pubsub/protos/google/protobuf/util/json_format_proto3.proto new file mode 100644 index 00000000000..8a0441c8f64 --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/util/json_format_proto3.proto @@ -0,0 +1,183 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package proto3; + +option java_package = "com.google.protobuf.util"; +option java_outer_classname = "JsonFormatProto3"; + +import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; +import "google/protobuf/wrappers.proto"; +import "google/protobuf/struct.proto"; +import "google/protobuf/any.proto"; +import "google/protobuf/field_mask.proto"; +import "google/protobuf/unittest.proto"; + +enum EnumType { + FOO = 0; + BAR = 1; +} + +message MessageType { + int32 value = 1; +} + +message TestMessage { + bool bool_value = 1; + int32 int32_value = 2; + int64 int64_value = 3; + uint32 uint32_value = 4; + uint64 uint64_value = 5; + float float_value = 6; + double double_value = 7; + string string_value = 8; + bytes bytes_value = 9; + EnumType enum_value = 10; + MessageType message_value = 11; + + repeated bool repeated_bool_value = 21; + repeated int32 repeated_int32_value = 22; + repeated int64 repeated_int64_value = 23; + repeated uint32 repeated_uint32_value = 24; + repeated uint64 repeated_uint64_value = 25; + repeated float repeated_float_value = 26; + repeated double repeated_double_value = 27; + repeated string repeated_string_value = 28; + repeated bytes repeated_bytes_value = 29; + repeated EnumType repeated_enum_value = 30; + repeated MessageType repeated_message_value = 31; +} + +message TestOneof { + // In JSON format oneof fields behave mostly the same as optional + // fields except that: + // 1. Oneof fields have field presence information and will be + // printed if it's set no matter whether it's the default value. + // 2. Multiple oneof fields in the same oneof cannot appear at the + // same time in the input. + oneof oneof_value { + int32 oneof_int32_value = 1; + string oneof_string_value = 2; + bytes oneof_bytes_value = 3; + EnumType oneof_enum_value = 4; + MessageType oneof_message_value = 5; + } +} + +message TestMap { + map bool_map = 1; + map int32_map = 2; + map int64_map = 3; + map uint32_map = 4; + map uint64_map = 5; + map string_map = 6; +} + +message TestNestedMap { + map bool_map = 1; + map int32_map = 2; + map int64_map = 3; + map uint32_map = 4; + map uint64_map = 5; + map string_map = 6; + map map_map = 7; +} + +message TestWrapper { + google.protobuf.BoolValue bool_value = 1; + google.protobuf.Int32Value int32_value = 2; + google.protobuf.Int64Value int64_value = 3; + google.protobuf.UInt32Value uint32_value = 4; + google.protobuf.UInt64Value uint64_value = 5; + google.protobuf.FloatValue float_value = 6; + google.protobuf.DoubleValue double_value = 7; + google.protobuf.StringValue string_value = 8; + google.protobuf.BytesValue bytes_value = 9; + + repeated google.protobuf.BoolValue repeated_bool_value = 11; + repeated google.protobuf.Int32Value repeated_int32_value = 12; + repeated google.protobuf.Int64Value repeated_int64_value = 13; + repeated google.protobuf.UInt32Value repeated_uint32_value = 14; + repeated google.protobuf.UInt64Value repeated_uint64_value = 15; + repeated google.protobuf.FloatValue repeated_float_value = 16; + repeated google.protobuf.DoubleValue repeated_double_value = 17; + repeated google.protobuf.StringValue repeated_string_value = 18; + repeated google.protobuf.BytesValue repeated_bytes_value = 19; +} + +message TestTimestamp { + google.protobuf.Timestamp value = 1; + repeated google.protobuf.Timestamp repeated_value = 2; +} + +message TestDuration { + google.protobuf.Duration value = 1; + repeated google.protobuf.Duration repeated_value = 2; +} + +message TestFieldMask { + google.protobuf.FieldMask value = 1; +} + +message TestStruct { + google.protobuf.Struct value = 1; + repeated google.protobuf.Struct repeated_value = 2; +} + +message TestAny { + google.protobuf.Any value = 1; + repeated google.protobuf.Any repeated_value = 2; +} + +message TestValue { + google.protobuf.Value value = 1; + repeated google.protobuf.Value repeated_value = 2; +} + +message TestListValue { + google.protobuf.ListValue value = 1; + repeated google.protobuf.ListValue repeated_value = 2; +} + +message TestBoolValue { + bool bool_value = 1; + map bool_map = 2; +} + +message TestCustomJsonName { + int32 value = 1 [json_name = "@value"]; +} + +message TestExtensions { + .protobuf_unittest.TestAllExtensions extensions = 1; +} diff --git a/handwritten/pubsub/protos/google/protobuf/wrappers.proto b/handwritten/pubsub/protos/google/protobuf/wrappers.proto new file mode 100644 index 00000000000..01947639ac4 --- /dev/null +++ b/handwritten/pubsub/protos/google/protobuf/wrappers.proto @@ -0,0 +1,118 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Wrappers for primitive (non-message) types. These types are useful +// for embedding primitives in the `google.protobuf.Any` type and for places +// where we need to distinguish between the absence of a primitive +// typed field and its default value. + +syntax = "proto3"; + +package google.protobuf; + +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; +option cc_enable_arenas = true; +option go_package = "github.com/golang/protobuf/ptypes/wrappers"; +option java_package = "com.google.protobuf"; +option java_outer_classname = "WrappersProto"; +option java_multiple_files = true; +option objc_class_prefix = "GPB"; + +// Wrapper message for `double`. +// +// The JSON representation for `DoubleValue` is JSON number. +message DoubleValue { + // The double value. + double value = 1; +} + +// Wrapper message for `float`. +// +// The JSON representation for `FloatValue` is JSON number. +message FloatValue { + // The float value. + float value = 1; +} + +// Wrapper message for `int64`. +// +// The JSON representation for `Int64Value` is JSON string. +message Int64Value { + // The int64 value. + int64 value = 1; +} + +// Wrapper message for `uint64`. +// +// The JSON representation for `UInt64Value` is JSON string. +message UInt64Value { + // The uint64 value. + uint64 value = 1; +} + +// Wrapper message for `int32`. +// +// The JSON representation for `Int32Value` is JSON number. +message Int32Value { + // The int32 value. + int32 value = 1; +} + +// Wrapper message for `uint32`. +// +// The JSON representation for `UInt32Value` is JSON number. +message UInt32Value { + // The uint32 value. + uint32 value = 1; +} + +// Wrapper message for `bool`. +// +// The JSON representation for `BoolValue` is JSON `true` and `false`. +message BoolValue { + // The bool value. + bool value = 1; +} + +// Wrapper message for `string`. +// +// The JSON representation for `StringValue` is JSON string. +message StringValue { + // The string value. + string value = 1; +} + +// Wrapper message for `bytes`. +// +// The JSON representation for `BytesValue` is JSON string. +message BytesValue { + // The bytes value. + bytes value = 1; +} diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto new file mode 100644 index 00000000000..a5a57604022 --- /dev/null +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -0,0 +1,687 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.pubsub.v1; + +import "google/api/annotations.proto"; +import "google/protobuf/duration.proto"; +import "google/protobuf/empty.proto"; +import "google/protobuf/field_mask.proto"; +import "google/protobuf/timestamp.proto"; + +option cc_enable_arenas = true; +option csharp_namespace = "Google.Cloud.PubSub.V1"; +option go_package = "google.golang.org/genproto/googleapis/pubsub/v1;pubsub"; +option java_multiple_files = true; +option java_outer_classname = "PubsubProto"; +option java_package = "com.google.pubsub.v1"; + + +// The service that an application uses to manipulate subscriptions and to +// consume messages from a subscription via the `Pull` method. +service Subscriber { + // Creates a subscription to a given topic. + // If the subscription already exists, returns `ALREADY_EXISTS`. + // If the corresponding topic doesn't exist, returns `NOT_FOUND`. + // + // If the name is not provided in the request, the server will assign a random + // name for this subscription on the same project as the topic, conforming + // to the + // [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + // The generated name is populated in the returned Subscription object. + // Note that for REST API requests, you must specify a name in the request. + rpc CreateSubscription(Subscription) returns (Subscription) { + option (google.api.http) = { put: "/v1/{name=projects/*/subscriptions/*}" body: "*" }; + } + + // Gets the configuration details of a subscription. + rpc GetSubscription(GetSubscriptionRequest) returns (Subscription) { + option (google.api.http) = { get: "/v1/{subscription=projects/*/subscriptions/*}" }; + } + + // Updates an existing subscription. Note that certain properties of a + // subscription, such as its topic, are not modifiable. + rpc UpdateSubscription(UpdateSubscriptionRequest) returns (Subscription) { + option (google.api.http) = { patch: "/v1/{subscription.name=projects/*/subscriptions/*}" body: "*" }; + } + + // Lists matching subscriptions. + rpc ListSubscriptions(ListSubscriptionsRequest) returns (ListSubscriptionsResponse) { + option (google.api.http) = { get: "/v1/{project=projects/*}/subscriptions" }; + } + + // Deletes an existing subscription. All messages retained in the subscription + // are immediately dropped. Calls to `Pull` after deletion will return + // `NOT_FOUND`. After a subscription is deleted, a new one may be created with + // the same name, but the new one has no association with the old + // subscription or its topic unless the same topic is specified. + rpc DeleteSubscription(DeleteSubscriptionRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { delete: "/v1/{subscription=projects/*/subscriptions/*}" }; + } + + // Modifies the ack deadline for a specific message. This method is useful + // to indicate that more time is needed to process a message by the + // subscriber, or to make the message available for redelivery if the + // processing was interrupted. Note that this does not modify the + // subscription-level `ackDeadlineSeconds` used for subsequent messages. + rpc ModifyAckDeadline(ModifyAckDeadlineRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline" body: "*" }; + } + + // Acknowledges the messages associated with the `ack_ids` in the + // `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages + // from the subscription. + // + // Acknowledging a message whose ack deadline has expired may succeed, + // but such a message may be redelivered later. Acknowledging a message more + // than once will not result in an error. + rpc Acknowledge(AcknowledgeRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:acknowledge" body: "*" }; + } + + // Pulls messages from the server. Returns an empty list if there are no + // messages available in the backlog. The server may return `UNAVAILABLE` if + // there are too many concurrent pull requests pending for the given + // subscription. + rpc Pull(PullRequest) returns (PullResponse) { + option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:pull" body: "*" }; + } + + // (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will + // respond with UNIMPLEMENTED errors unless you have been invited to test + // this feature. Contact cloud-pubsub@google.com with any questions. + // + // Establishes a stream with the server, which sends messages down to the + // client. The client streams acknowledgements and ack deadline modifications + // back to the server. The server will close the stream and return the status + // on any error. The server may close the stream with status `OK` to reassign + // server-side resources, in which case, the client should re-establish the + // stream. `UNAVAILABLE` may also be returned in the case of a transient error + // (e.g., a server restart). These should also be retried by the client. Flow + // control can be achieved by configuring the underlying RPC channel. + rpc StreamingPull(stream StreamingPullRequest) returns (stream StreamingPullResponse); + + // Modifies the `PushConfig` for a specified subscription. + // + // This may be used to change a push subscription to a pull one (signified by + // an empty `PushConfig`) or vice versa, or change the endpoint URL and other + // attributes of a push subscription. Messages will accumulate for delivery + // continuously through the call regardless of changes to the `PushConfig`. + rpc ModifyPushConfig(ModifyPushConfigRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig" body: "*" }; + } + + // Lists the existing snapshots. + rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) { + option (google.api.http) = { get: "/v1/{project=projects/*}/snapshots" }; + } + + // Creates a snapshot from the requested subscription. + // If the snapshot already exists, returns `ALREADY_EXISTS`. + // If the requested subscription doesn't exist, returns `NOT_FOUND`. + // + // If the name is not provided in the request, the server will assign a random + // name for this snapshot on the same project as the subscription, conforming + // to the + // [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + // The generated name is populated in the returned Snapshot object. + // Note that for REST API requests, you must specify a name in the request. + rpc CreateSnapshot(CreateSnapshotRequest) returns (Snapshot) { + option (google.api.http) = { put: "/v1/{name=projects/*/snapshots/*}" body: "*" }; + } + + // Removes an existing snapshot. All messages retained in the snapshot + // are immediately dropped. After a snapshot is deleted, a new one may be + // created with the same name, but the new one has no association with the old + // snapshot or its subscription, unless the same subscription is specified. + rpc DeleteSnapshot(DeleteSnapshotRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { delete: "/v1/{snapshot=projects/*/snapshots/*}" }; + } + + // Seeks an existing subscription to a point in time or to a given snapshot, + // whichever is provided in the request. + rpc Seek(SeekRequest) returns (SeekResponse) { + option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:seek" body: "*" }; + } +} + +// The service that an application uses to manipulate topics, and to send +// messages to a topic. +service Publisher { + // Creates the given topic with the given name. + rpc CreateTopic(Topic) returns (Topic) { + option (google.api.http) = { put: "/v1/{name=projects/*/topics/*}" body: "*" }; + } + + // Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic + // does not exist. The message payload must not be empty; it must contain + // either a non-empty data field, or at least one attribute. + rpc Publish(PublishRequest) returns (PublishResponse) { + option (google.api.http) = { post: "/v1/{topic=projects/*/topics/*}:publish" body: "*" }; + } + + // Gets the configuration of a topic. + rpc GetTopic(GetTopicRequest) returns (Topic) { + option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}" }; + } + + // Lists matching topics. + rpc ListTopics(ListTopicsRequest) returns (ListTopicsResponse) { + option (google.api.http) = { get: "/v1/{project=projects/*}/topics" }; + } + + // Lists the name of the subscriptions for this topic. + rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) returns (ListTopicSubscriptionsResponse) { + option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}/subscriptions" }; + } + + // Deletes the topic with the given name. Returns `NOT_FOUND` if the topic + // does not exist. After a topic is deleted, a new topic may be created with + // the same name; this is an entirely new topic with none of the old + // configuration or subscriptions. Existing subscriptions to this topic are + // not deleted, but their `topic` field is set to `_deleted-topic_`. + rpc DeleteTopic(DeleteTopicRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { delete: "/v1/{topic=projects/*/topics/*}" }; + } +} + +// A topic resource. +message Topic { + // The name of the topic. It must have the format + // `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, + // and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), + // underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent + // signs (`%`). It must be between 3 and 255 characters in length, and it + // must not start with `"goog"`. + string name = 1; +} + +// A message data and its attributes. The message payload must not be empty; +// it must contain either a non-empty data field, or at least one attribute. +message PubsubMessage { + // The message payload. + bytes data = 1; + + // Optional attributes for this message. + map attributes = 2; + + // ID of this message, assigned by the server when the message is published. + // Guaranteed to be unique within the topic. This value may be read by a + // subscriber that receives a `PubsubMessage` via a `Pull` call or a push + // delivery. It must not be populated by the publisher in a `Publish` call. + string message_id = 3; + + // The time at which the message was published, populated by the server when + // it receives the `Publish` call. It must not be populated by the + // publisher in a `Publish` call. + google.protobuf.Timestamp publish_time = 4; +} + +// Request for the GetTopic method. +message GetTopicRequest { + // The name of the topic to get. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; +} + +// Request for the Publish method. +message PublishRequest { + // The messages in the request will be published on this topic. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; + + // The messages to publish. + repeated PubsubMessage messages = 2; +} + +// Response for the `Publish` method. +message PublishResponse { + // The server-assigned ID of each published message, in the same order as + // the messages in the request. IDs are guaranteed to be unique within + // the topic. + repeated string message_ids = 1; +} + +// Request for the `ListTopics` method. +message ListTopicsRequest { + // The name of the cloud project that topics belong to. + // Format is `projects/{project}`. + string project = 1; + + // Maximum number of topics to return. + int32 page_size = 2; + + // The value returned by the last `ListTopicsResponse`; indicates that this is + // a continuation of a prior `ListTopics` call, and that the system should + // return the next page of data. + string page_token = 3; +} + +// Response for the `ListTopics` method. +message ListTopicsResponse { + // The resulting topics. + repeated Topic topics = 1; + + // If not empty, indicates that there may be more topics that match the + // request; this value should be passed in a new `ListTopicsRequest`. + string next_page_token = 2; +} + +// Request for the `ListTopicSubscriptions` method. +message ListTopicSubscriptionsRequest { + // The name of the topic that subscriptions are attached to. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; + + // Maximum number of subscription names to return. + int32 page_size = 2; + + // The value returned by the last `ListTopicSubscriptionsResponse`; indicates + // that this is a continuation of a prior `ListTopicSubscriptions` call, and + // that the system should return the next page of data. + string page_token = 3; +} + +// Response for the `ListTopicSubscriptions` method. +message ListTopicSubscriptionsResponse { + // The names of the subscriptions that match the request. + repeated string subscriptions = 1; + + // If not empty, indicates that there may be more subscriptions that match + // the request; this value should be passed in a new + // `ListTopicSubscriptionsRequest` to get more subscriptions. + string next_page_token = 2; +} + +// Request for the `DeleteTopic` method. +message DeleteTopicRequest { + // Name of the topic to delete. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; +} + +// A subscription resource. +message Subscription { + // The name of the subscription. It must have the format + // `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must + // start with a letter, and contain only letters (`[A-Za-z]`), numbers + // (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), + // plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters + // in length, and it must not start with `"goog"`. + string name = 1; + + // The name of the topic from which this subscription is receiving messages. + // Format is `projects/{project}/topics/{topic}`. + // The value of this field will be `_deleted-topic_` if the topic has been + // deleted. + string topic = 2; + + // If push delivery is used with this subscription, this field is + // used to configure it. An empty `pushConfig` signifies that the subscriber + // will pull and ack messages using API methods. + PushConfig push_config = 4; + + // This value is the maximum time after a subscriber receives a message + // before the subscriber should acknowledge the message. After message + // delivery but before the ack deadline expires and before the message is + // acknowledged, it is an outstanding message and will not be delivered + // again during that time (on a best-effort basis). + // + // For pull subscriptions, this value is used as the initial value for the ack + // deadline. To override this value for a given message, call + // `ModifyAckDeadline` with the corresponding `ack_id` if using + // pull. + // The minimum custom deadline you can specify is 10 seconds. + // The maximum custom deadline you can specify is 600 seconds (10 minutes). + // If this parameter is 0, a default value of 10 seconds is used. + // + // For push delivery, this value is also used to set the request timeout for + // the call to the push endpoint. + // + // If the subscriber never acknowledges the message, the Pub/Sub + // system will eventually redeliver the message. + int32 ack_deadline_seconds = 5; + + // Indicates whether to retain acknowledged messages. If true, then + // messages are not expunged from the subscription's backlog, even if they are + // acknowledged, until they fall out of the `message_retention_duration` + // window. + bool retain_acked_messages = 7; + + // How long to retain unacknowledged messages in the subscription's backlog, + // from the moment a message is published. + // If `retain_acked_messages` is true, then this also configures the retention + // of acknowledged messages, and thus configures how far back in time a `Seek` + // can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 + // minutes. + google.protobuf.Duration message_retention_duration = 8; +} + +// Configuration for a push delivery endpoint. +message PushConfig { + // A URL locating the endpoint to which messages should be pushed. + // For example, a Webhook endpoint might use "https://example.com/push". + string push_endpoint = 1; + + // Endpoint configuration attributes. + // + // Every endpoint has a set of API supported attributes that can be used to + // control different aspects of the message delivery. + // + // The currently supported attribute is `x-goog-version`, which you can + // use to change the format of the pushed message. This attribute + // indicates the version of the data expected by the endpoint. This + // controls the shape of the pushed message (i.e., its fields and metadata). + // The endpoint version is based on the version of the Pub/Sub API. + // + // If not present during the `CreateSubscription` call, it will default to + // the version of the API used to make such call. If not present during a + // `ModifyPushConfig` call, its value will not be changed. `GetSubscription` + // calls will always return a valid version, even if the subscription was + // created without this attribute. + // + // The possible values for this attribute are: + // + // * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. + // * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. + map attributes = 2; +} + +// A message and its corresponding acknowledgment ID. +message ReceivedMessage { + // This ID can be used to acknowledge the received message. + string ack_id = 1; + + // The message. + PubsubMessage message = 2; +} + +// Request for the GetSubscription method. +message GetSubscriptionRequest { + // The name of the subscription to get. + // Format is `projects/{project}/subscriptions/{sub}`. + string subscription = 1; +} + +// Request for the UpdateSubscription method. +message UpdateSubscriptionRequest { + // The updated subscription object. + Subscription subscription = 1; + + // Indicates which fields in the provided subscription to update. + // Must be specified and non-empty. + google.protobuf.FieldMask update_mask = 2; +} + +// Request for the `ListSubscriptions` method. +message ListSubscriptionsRequest { + // The name of the cloud project that subscriptions belong to. + // Format is `projects/{project}`. + string project = 1; + + // Maximum number of subscriptions to return. + int32 page_size = 2; + + // The value returned by the last `ListSubscriptionsResponse`; indicates that + // this is a continuation of a prior `ListSubscriptions` call, and that the + // system should return the next page of data. + string page_token = 3; +} + +// Response for the `ListSubscriptions` method. +message ListSubscriptionsResponse { + // The subscriptions that match the request. + repeated Subscription subscriptions = 1; + + // If not empty, indicates that there may be more subscriptions that match + // the request; this value should be passed in a new + // `ListSubscriptionsRequest` to get more subscriptions. + string next_page_token = 2; +} + +// Request for the DeleteSubscription method. +message DeleteSubscriptionRequest { + // The subscription to delete. + // Format is `projects/{project}/subscriptions/{sub}`. + string subscription = 1; +} + +// Request for the ModifyPushConfig method. +message ModifyPushConfigRequest { + // The name of the subscription. + // Format is `projects/{project}/subscriptions/{sub}`. + string subscription = 1; + + // The push configuration for future deliveries. + // + // An empty `pushConfig` indicates that the Pub/Sub system should + // stop pushing messages from the given subscription and allow + // messages to be pulled and acknowledged - effectively pausing + // the subscription if `Pull` is not called. + PushConfig push_config = 2; +} + +// Request for the `Pull` method. +message PullRequest { + // The subscription from which messages should be pulled. + // Format is `projects/{project}/subscriptions/{sub}`. + string subscription = 1; + + // If this field set to true, the system will respond immediately even if + // it there are no messages available to return in the `Pull` response. + // Otherwise, the system may wait (for a bounded amount of time) until at + // least one message is available, rather than returning no messages. The + // client may cancel the request if it does not wish to wait any longer for + // the response. + bool return_immediately = 2; + + // The maximum number of messages returned for this request. The Pub/Sub + // system may return fewer than the number specified. + int32 max_messages = 3; +} + +// Response for the `Pull` method. +message PullResponse { + // Received Pub/Sub messages. The Pub/Sub system will return zero messages if + // there are no more available in the backlog. The Pub/Sub system may return + // fewer than the `maxMessages` requested even if there are more messages + // available in the backlog. + repeated ReceivedMessage received_messages = 1; +} + +// Request for the ModifyAckDeadline method. +message ModifyAckDeadlineRequest { + // The name of the subscription. + // Format is `projects/{project}/subscriptions/{sub}`. + string subscription = 1; + + // List of acknowledgment IDs. + repeated string ack_ids = 4; + + // The new ack deadline with respect to the time this request was sent to + // the Pub/Sub system. For example, if the value is 10, the new + // ack deadline will expire 10 seconds after the `ModifyAckDeadline` call + // was made. Specifying zero may immediately make the message available for + // another pull request. + // The minimum deadline you can specify is 0 seconds. + // The maximum deadline you can specify is 600 seconds (10 minutes). + int32 ack_deadline_seconds = 3; +} + +// Request for the Acknowledge method. +message AcknowledgeRequest { + // The subscription whose message is being acknowledged. + // Format is `projects/{project}/subscriptions/{sub}`. + string subscription = 1; + + // The acknowledgment ID for the messages being acknowledged that was returned + // by the Pub/Sub system in the `Pull` response. Must not be empty. + repeated string ack_ids = 2; +} + +// Request for the `StreamingPull` streaming RPC method. This request is used to +// establish the initial stream as well as to stream acknowledgements and ack +// deadline modifications from the client to the server. +message StreamingPullRequest { + // The subscription for which to initialize the new stream. This must be + // provided in the first request on the stream, and must not be set in + // subsequent requests from client to server. + // Format is `projects/{project}/subscriptions/{sub}`. + string subscription = 1; + + // List of acknowledgement IDs for acknowledging previously received messages + // (received on this stream or a different stream). If an ack ID has expired, + // the corresponding message may be redelivered later. Acknowledging a message + // more than once will not result in an error. If the acknowledgement ID is + // malformed, the stream will be aborted with status `INVALID_ARGUMENT`. + repeated string ack_ids = 2; + + // The list of new ack deadlines for the IDs listed in + // `modify_deadline_ack_ids`. The size of this list must be the same as the + // size of `modify_deadline_ack_ids`. If it differs the stream will be aborted + // with `INVALID_ARGUMENT`. Each element in this list is applied to the + // element in the same position in `modify_deadline_ack_ids`. The new ack + // deadline is with respect to the time this request was sent to the Pub/Sub + // system. Must be >= 0. For example, if the value is 10, the new ack deadline + // will expire 10 seconds after this request is received. If the value is 0, + // the message is immediately made available for another streaming or + // non-streaming pull request. If the value is < 0 (an error), the stream will + // be aborted with status `INVALID_ARGUMENT`. + repeated int32 modify_deadline_seconds = 3; + + // List of acknowledgement IDs whose deadline will be modified based on the + // corresponding element in `modify_deadline_seconds`. This field can be used + // to indicate that more time is needed to process a message by the + // subscriber, or to make the message available for redelivery if the + // processing was interrupted. + repeated string modify_deadline_ack_ids = 4; + + // The ack deadline to use for the stream. This must be provided in the + // first request on the stream, but it can also be updated on subsequent + // requests from client to server. The minimum deadline you can specify is 10 + // seconds. The maximum deadline you can specify is 600 seconds (10 minutes). + int32 stream_ack_deadline_seconds = 5; +} + +// Response for the `StreamingPull` method. This response is used to stream +// messages from the server to the client. +message StreamingPullResponse { + // Received Pub/Sub messages. This will not be empty. + repeated ReceivedMessage received_messages = 1; +} + +// Request for the `CreateSnapshot` method. +message CreateSnapshotRequest { + // Optional user-provided name for this snapshot. + // If the name is not provided in the request, the server will assign a random + // name for this snapshot on the same project as the subscription. + // Note that for REST API requests, you must specify a name. + // Format is `projects/{project}/snapshots/{snap}`. + string name = 1; + + // The subscription whose backlog the snapshot retains. + // Specifically, the created snapshot is guaranteed to retain: + // (a) The existing backlog on the subscription. More precisely, this is + // defined as the messages in the subscription's backlog that are + // unacknowledged upon the successful completion of the + // `CreateSnapshot` request; as well as: + // (b) Any messages published to the subscription's topic following the + // successful completion of the CreateSnapshot request. + // Format is `projects/{project}/subscriptions/{sub}`. + string subscription = 2; +} + +// A snapshot resource. +message Snapshot { + // The name of the snapshot. + string name = 1; + + // The name of the topic from which this snapshot is retaining messages. + string topic = 2; + + // The snapshot is guaranteed to exist up until this time. + // A newly-created snapshot expires no later than 7 days from the time of its + // creation. Its exact lifetime is determined at creation by the existing + // backlog in the source subscription. Specifically, the lifetime of the + // snapshot is `7 days - (age of oldest unacked message in the subscription)`. + // For example, consider a subscription whose oldest unacked message is 3 days + // old. If a snapshot is created from this subscription, the snapshot -- which + // will always capture this 3-day-old backlog as long as the snapshot + // exists -- will expire in 4 days. + google.protobuf.Timestamp expire_time = 3; +} + +// Request for the `ListSnapshots` method. +message ListSnapshotsRequest { + // The name of the cloud project that snapshots belong to. + // Format is `projects/{project}`. + string project = 1; + + // Maximum number of snapshots to return. + int32 page_size = 2; + + // The value returned by the last `ListSnapshotsResponse`; indicates that this + // is a continuation of a prior `ListSnapshots` call, and that the system + // should return the next page of data. + string page_token = 3; +} + +// Response for the `ListSnapshots` method. +message ListSnapshotsResponse { + // The resulting snapshots. + repeated Snapshot snapshots = 1; + + // If not empty, indicates that there may be more snapshot that match the + // request; this value should be passed in a new `ListSnapshotsRequest`. + string next_page_token = 2; +} + +// Request for the `DeleteSnapshot` method. +message DeleteSnapshotRequest { + // The name of the snapshot to delete. + // Format is `projects/{project}/snapshots/{snap}`. + string snapshot = 1; +} + +// Request for the `Seek` method. +message SeekRequest { + // The subscription to affect. + string subscription = 1; + + oneof target { + // The time to seek to. + // Messages retained in the subscription that were published before this + // time are marked as acknowledged, and messages retained in the + // subscription that were published after this time are marked as + // unacknowledged. Note that this operation affects only those messages + // retained in the subscription (configured by the combination of + // `message_retention_duration` and `retain_acked_messages`). For example, + // if `time` corresponds to a point before the message retention + // window (or to a point before the system's notion of the subscription + // creation time), only retained messages will be marked as unacknowledged, + // and already-expunged messages will not be restored. + google.protobuf.Timestamp time = 2; + + // The snapshot to seek to. The snapshot's topic must be the same as that of + // the provided subscription. + // Format is `projects/{project}/snapshots/{snap}`. + string snapshot = 3; + } +} + +message SeekResponse { + +} diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 8a8565e4150..fe6e3b997ac 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -24,6 +24,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); var commonGrpc = require('@google-cloud/common-grpc'); var is = require('is'); +var path = require('path'); var util = require('util'); /*! Developer Documentation @@ -69,8 +70,13 @@ var util = require('util'); function IAM(pubsub, id) { var config = { baseUrl: pubsub.defaultBaseUrl_, - service: 'iam', - apiVersion: 'v1', + protosDir: path.resolve(__dirname, '../protos'), + protoServices: { + IAMPolicy: { + path: 'google/iam/v1/iam_policy.proto', + service: 'iam.v1' + } + }, scopes: [ 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 4185bd757b9..a5b13483b11 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -25,6 +25,7 @@ var common = require('@google-cloud/common'); var commonGrpc = require('@google-cloud/common-grpc'); var extend = require('extend'); var is = require('is'); +var path = require('path'); var util = require('util'); /** @@ -84,8 +85,17 @@ function PubSub(options) { var config = { baseUrl: this.baseUrl_, customEndpoint: this.customEndpoint_, - service: 'pubsub', - apiVersion: 'v1', + protosDir: path.resolve(__dirname, '../protos'), + protoServices: { + Publisher: { + path: 'google/pubsub/v1/pubsub.proto', + service: 'pubsub.v1' + }, + Subscriber: { + path: 'google/pubsub/v1/pubsub.proto', + service: 'pubsub.v1' + } + }, scopes: [ 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index 14151ef892d..46d77e74158 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -20,6 +20,7 @@ var assert = require('assert'); var extend = require('extend'); var GrpcService = require('@google-cloud/common-grpc').Service; var nodeutil = require('util'); +var path = require('path'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -72,8 +73,17 @@ describe('IAM', function() { var options = iam.calledWith_[1]; assert.strictEqual(config.baseUrl, PUBSUB.defaultBaseUrl_); - assert.strictEqual(config.service, 'iam'); - assert.strictEqual(config.apiVersion, 'v1'); + + var protosDir = path.resolve(__dirname, '../protos'); + assert.strictEqual(config.protosDir, protosDir); + + assert.deepStrictEqual(config.protoServices, { + IAMPolicy: { + path: 'google/iam/v1/iam_policy.proto', + service: 'iam.v1' + } + }); + assert.deepEqual(config.scopes, [ 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 13a6d9fa58e..eaa656babda 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -19,6 +19,7 @@ var arrify = require('arrify'); var assert = require('assert'); var extend = require('extend'); +var path = require('path'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -181,8 +182,21 @@ describe('PubSub', function() { var baseUrl = 'pubsub.googleapis.com'; assert.strictEqual(calledWith.baseUrl, baseUrl); - assert.strictEqual(calledWith.service, 'pubsub'); - assert.strictEqual(calledWith.apiVersion, 'v1'); + + var protosDir = path.resolve(__dirname, '../protos'); + assert.strictEqual(calledWith.protosDir, protosDir); + + assert.deepStrictEqual(calledWith.protoServices, { + Publisher: { + path: 'google/pubsub/v1/pubsub.proto', + service: 'pubsub.v1' + }, + Subscriber: { + path: 'google/pubsub/v1/pubsub.proto', + service: 'pubsub.v1' + } + }); + assert.deepEqual(calledWith.scopes, [ 'https://www.googleapis.com/auth/pubsub', 'https://www.googleapis.com/auth/cloud-platform' From 495efa1305f3564ff972765b7c7a2b1425fab226 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 19 Jul 2017 20:14:28 -0400 Subject: [PATCH 0079/1115] bigtable/datastore/logging/pubsub/spanner/vision: update common-grpc --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d5cab84f979..70944b3794b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ ], "dependencies": { "@google-cloud/common": "^0.13.0", - "@google-cloud/common-grpc": "^0.3.1", + "@google-cloud/common-grpc": "^0.4.0", "arrify": "^1.0.0", "extend": "^3.0.0", "google-gax": "^0.13.0", From aee8300e829e887964d1cc624219538eedcd7e78 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Wed, 19 Jul 2017 20:34:18 -0400 Subject: [PATCH 0080/1115] pubsub @ 0.13.2 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 70944b3794b..5f0c14e6422 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.13.1", + "version": "0.13.2", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From f10a2d17582ff24f7c2b57db8d813cad63ba2d76 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 24 Aug 2017 10:53:24 -0700 Subject: [PATCH 0081/1115] pubsub: api redesign (#2380) --- handwritten/pubsub/README.md | 11 +- handwritten/pubsub/package.json | 4 +- handwritten/pubsub/src/connection-pool.js | 423 ++++ handwritten/pubsub/src/histogram.js | 80 + handwritten/pubsub/src/iam.js | 2 +- handwritten/pubsub/src/index.js | 727 +++--- handwritten/pubsub/src/publisher.js | 226 ++ handwritten/pubsub/src/snapshot.js | 105 +- handwritten/pubsub/src/subscription.js | 1195 +++++---- handwritten/pubsub/src/topic.js | 716 +++--- .../src/v1/subscriber_client_config.json | 2 +- handwritten/pubsub/system-test/pubsub.js | 345 +-- handwritten/pubsub/test/connection-pool.js | 1013 ++++++++ handwritten/pubsub/test/histogram.js | 120 + handwritten/pubsub/test/iam.js | 3 +- handwritten/pubsub/test/index.js | 1276 +++++----- handwritten/pubsub/test/publisher.js | 329 +++ handwritten/pubsub/test/snapshot.js | 106 +- handwritten/pubsub/test/subscription.js | 2195 ++++++++++------- handwritten/pubsub/test/topic.js | 523 ++-- 20 files changed, 6119 insertions(+), 3282 deletions(-) create mode 100644 handwritten/pubsub/src/connection-pool.js create mode 100644 handwritten/pubsub/src/histogram.js create mode 100644 handwritten/pubsub/src/publisher.js create mode 100644 handwritten/pubsub/test/connection-pool.js create mode 100644 handwritten/pubsub/test/histogram.js create mode 100644 handwritten/pubsub/test/publisher.js diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index eae849cf6eb..d225bdf5f92 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -1,4 +1,4 @@ -# @google-cloud/pubsub ([Alpha][versioning]) +# @google-cloud/pubsub ([Beta][versioning]) > Cloud Pub/Sub Client Library for Node.js *Looking for more Google APIs than just Pub/Sub? You might want to check out [`google-cloud`][google-cloud].* @@ -20,10 +20,13 @@ var pubsub = require('@google-cloud/pubsub')({ var topic = pubsub.topic('my-topic'); // Publish a message to the topic. -topic.publish('New message!', function(err) {}); +var publisher = topic.publisher(); +var message = new Buffer('New message!'); + +publisher.publish(message, function(err, messageId) {}); // Subscribe to the topic. -topic.subscribe('subscription-name', function(err, subscription) { +topic.createSubscription('subscription-name', function(err, subscription) { // Register listeners to start pulling for messages. function onError(err) {} function onMessage(message) {} @@ -36,7 +39,7 @@ topic.subscribe('subscription-name', function(err, subscription) { }); // Promises are also supported by omitting callbacks. -topic.publish('New message!').then(function(data) { +publisher.publish(message).then(function(data) { var messageIds = data[0]; }); diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5f0c14e6422..36e14de2610 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,12 +54,12 @@ "@google-cloud/common": "^0.13.0", "@google-cloud/common-grpc": "^0.4.0", "arrify": "^1.0.0", + "async-each": "^1.0.1", "extend": "^3.0.0", + "google-auto-auth": "^0.7.1", "google-gax": "^0.13.0", "google-proto-files": "^0.12.0", "is": "^3.0.1", - "modelo": "^4.2.0", - "propprop": "^0.3.0", "uuid": "^3.0.1" }, "devDependencies": { diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js new file mode 100644 index 00000000000..4899f953054 --- /dev/null +++ b/handwritten/pubsub/src/connection-pool.js @@ -0,0 +1,423 @@ +/*! + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/*! + * @module pubsub/connectionPool + */ + +'use strict'; + +var arrify = require('arrify'); +var common = require('@google-cloud/common'); +var each = require('async-each'); +var events = require('events'); +var grpc = require('grpc'); +var is = require('is'); +var util = require('util'); +var uuid = require('uuid'); + +var PKG = require('../package.json'); +var v1 = require('./v1'); + +// codes to retry streams +var RETRY_CODES = [ + 0, // ok + 1, // canceled + 4, // deadline exceeded + 8, // resource exhausted + 13, // internal error + 14 // unavailable +]; + +/** + * ConnectionPool is used to manage the stream connections created via + * StreamingPull rpc. + * + * @param {module:pubsub/subscription} subscription - The subscription to create + * connections for. + * @param {object=} options - Pool options. + * @param {number} options.maxConnections - Number of connections to create. + * Default: 5. + * @param {number} options.ackDeadline - The ack deadline to send when + * creating a connection. + */ +function ConnectionPool(subscription) { + this.subscription = subscription; + this.connections = new Map(); + + this.isPaused = false; + this.isOpen = false; + + this.failedConnectionAttempts = 0; + this.noConnectionsTime = 0; + + this.settings = { + maxConnections: subscription.maxConnections || 5, + ackDeadline: subscription.ackDeadline || 10000 + }; + + this.queue = []; + events.EventEmitter.call(this); + + // grpc related fields we need since we're bypassing gax + this.metadata_ = new grpc.Metadata(); + + this.metadata_.add('x-goog-api-client', [ + 'gl-node/' + process.versions.node, + 'gccl/' + PKG.version, + 'grpc/' + require('grpc/package.json').version + ].join(' ')); + + this.open(); +} + +util.inherits(ConnectionPool, events.EventEmitter); + +/** + * Acquires a connection from the pool. Optionally you can specify an id for a + * specific connection, but if it is no longer available it will return the + * first available connection. + * + * @param {string=} id - The id of the connection to retrieve. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while acquiring a + * connection. + * @param {stream} callback.connection - A duplex stream. + */ +ConnectionPool.prototype.acquire = function(id, callback) { + var self = this; + + if (is.fn(id)) { + callback = id; + id = null; + } + + if (!this.isOpen) { + callback(new Error('No connections available to make request.')); + return; + } + + // it's possible that by the time a user acks the connection could have + // closed, so in that case we'll just return any connection + if (!this.connections.has(id)) { + id = getFirstConnectionId(); + } + + var connection = this.connections.get(id); + + if (connection) { + callback(null, connection); + return; + } + + this.once('connected', function(connection) { + callback(null, connection); + }); + + function getFirstConnectionId() { + return self.connections.keys().next().value; + } +}; + +/** + * Ends each connection in the pool and closes the pool, preventing new + * connections from being created. + * + * @param {function} callback - The callback function. + * @param {?error} callback.error - An error returned while closing the pool. + */ +ConnectionPool.prototype.close = function(callback) { + var self = this; + var connections = Array.from(this.connections.values()); + + callback = callback || common.util.noop; + + this.isOpen = false; + self.connections.clear(); + this.queue.forEach(clearTimeout); + + this.queue.length = 0; + this.failedConnectionAttempts = 0; + this.noConnectionsTime = 0; + + each(connections, function(connection, onEndCallback) { + connection.end(onEndCallback); + }, callback); +}; + +/** + * Creates a connection. This is async but instead of providing a callback + * a `connected` event will fire once the connection is ready. + */ +ConnectionPool.prototype.createConnection = function() { + var self = this; + + this.getClient(function(err, client) { + if (err) { + self.emit('error', err); + return; + } + + var id = uuid.v4(); + var connection = client.streamingPull(self.metadata_); + var errorImmediateHandle; + + connection.on('error', function(err) { + // since this is a bidi stream it's possible that we recieve errors from + // reads or writes. We also want to try and cut down on the number of + // errors that we emit if other connections are still open. So by using + // setImmediate we're able to cancel the error message if it gets passed + // to the `status` event where we can check if the connection should be + // re-opened or if we should send the error to the user + errorImmediateHandle = setImmediate(self.emit.bind(self), 'error', err); + }); + + connection.on('metadata', function(metadata) { + if (!metadata.get('date').length) { + return; + } + + connection.isConnected = true; + self.noConnectionsTime = 0; + self.failedConnectionAttempts = 0; + self.emit('connected', connection); + }); + + connection.on('status', function(status) { + clearImmediate(errorImmediateHandle); + + connection.end(); + self.connections.delete(id); + + if (!connection.isConnected) { + self.failedConnectionAttempts += 1; + } + + if (!self.isConnected() && !self.noConnectionsTime) { + self.noConnectionsTime = Date.now(); + } + + if (self.shouldReconnect(status)) { + self.queueConnection(); + } else if (self.isOpen && !self.connections.size) { + var error = new Error(status.details); + error.code = status.code; + self.emit('error', error); + } + }); + + connection.on('data', function(data) { + arrify(data.receivedMessages).forEach(function(message) { + self.emit('message', self.createMessage(id, message)); + }); + }); + + if (self.isPaused) { + connection.pause(); + } + + connection.write({ + subscription: self.subscription.name, + streamAckDeadlineSeconds: self.settings.ackDeadline / 1000 + }); + + self.connections.set(id, connection); + }); +}; + +/** + * Creates a message object for the user. + * + * @param {string} connectionId - The connection id that the message was + * received on. + * @param {object} resp - The message response data from StreamingPull. + * @return {object} message - The message object. + */ +ConnectionPool.prototype.createMessage = function(connectionId, resp) { + var self = this; + + var pt = resp.message.publishTime; + var milliseconds = parseInt(pt.nanos, 10) / 1e6; + var originalDataLength = resp.message.data.length; + + return { + connectionId: connectionId, + ackId: resp.ackId, + id: resp.message.messageId, + attributes: resp.message.attributes, + publishTime: new Date(parseInt(pt.seconds, 10) * 1000 + milliseconds), + received: Date.now(), + data: resp.message.data, + // using get here to prevent user from overwriting data + get length() { + return originalDataLength; + }, + ack: function() { + self.subscription.ack_(this); + }, + nack: function() { + self.subscription.nack_(this); + } + }; +}; + +/** + * Gets the Subscriber client. We need to bypass GAX until they allow deadlines + * to be optional. + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error occurred while getting the client. + * @param {object} callback.client - The Subscriber client. + */ +ConnectionPool.prototype.getClient = function(callback) { + if (this.client) { + callback(null, this.client); + return; + } + + var self = this; + var pubsub = this.subscription.pubsub; + + pubsub.auth.getAuthClient(function(err, authClient) { + if (err) { + callback(err); + return; + } + + var credentials = grpc.credentials.combineChannelCredentials( + grpc.credentials.createSsl(), + grpc.credentials.createFromGoogleCredential(authClient) + ); + + var Subscriber = v1(pubsub.options).Subscriber; + + self.client = new Subscriber(v1.SERVICE_ADDRESS, credentials, { + 'grpc.max_receive_message_length': 20000001, + 'grpc.primary_user_agent': common.util.getUserAgentFromPackageJson(PKG) + }); + + callback(null, self.client); + }); +}; + +/** + * Check to see if at least one stream in the pool is connected. + * @return {boolean} + */ +ConnectionPool.prototype.isConnected = function() { + var interator = this.connections.values(); + var connection = interator.next().value; + + while (connection) { + if (connection.isConnected) { + return true; + } + + connection = interator.next().value; + } + + return false; +}; + +/** + * Creates specified number of connections and puts pool in open state. + */ +ConnectionPool.prototype.open = function() { + var existing = this.connections.size; + var max = this.settings.maxConnections; + + for (; existing < max; existing++) { + this.queueConnection(); + } + + this.isOpen = true; + this.failedConnectionAttempts = 0; + this.noConnectionsTime = Date.now(); +}; + +/** + * Pauses each of the connections, causing `message` events to stop firing. + */ +ConnectionPool.prototype.pause = function() { + this.isPaused = true; + + this.connections.forEach(function(connection) { + connection.pause(); + }); +}; + +/** + * Queues a connection to be created. If any previous connections have failed, + * it will apply a back off based on the number of failures. + */ +ConnectionPool.prototype.queueConnection = function() { + var self = this; + var delay = 0; + + if (this.failedConnectionAttempts > 0) { + delay = (Math.pow(2, this.failedConnectionAttempts) * 1000) + + (Math.floor(Math.random() * 1000)); + } + + var timeoutHandle = setTimeout(createConnection, delay); + this.queue.push(timeoutHandle); + + function createConnection() { + self.createConnection(); + self.queue.splice(self.queue.indexOf(timeoutHandle), 1); + } +}; + +/** + * Calls resume on each connection, allowing `message` events to fire off again. + */ +ConnectionPool.prototype.resume = function() { + this.isPaused = false; + + this.connections.forEach(function(connection) { + connection.resume(); + }); +}; + +/** + * Inspects a status object to determine whether or not we should try and + * reconnect. + * + * @param {object} status - The gRPC status object. + * @return {boolean} + */ +ConnectionPool.prototype.shouldReconnect = function(status) { + // If the pool was closed, we should definitely not reconnect + if (!this.isOpen) { + return false; + } + + // We should check to see if the status code is a non-recoverable error + if (RETRY_CODES.indexOf(status.code) === -1) { + return false; + } + + var exceededRetryLimit = this.noConnectionsTime && + Date.now() - this.noConnectionsTime > 300000; + + if (exceededRetryLimit) { + return false; + } + + return true; +}; + +module.exports = ConnectionPool; diff --git a/handwritten/pubsub/src/histogram.js b/handwritten/pubsub/src/histogram.js new file mode 100644 index 00000000000..e0674851721 --- /dev/null +++ b/handwritten/pubsub/src/histogram.js @@ -0,0 +1,80 @@ +/*! + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/*! + * @module pubsub/histogram + */ + +'use strict'; + +var MIN_VALUE = 10000; +var MAX_VALUE = 600000; + +/** + * The Histogram class is used to capture the lifespan of messages within the + * the client. These durations are then used to calculate the 99th percentile + * of ack deadlines for future messages. + */ +function Histogram() { + this.data = new Map(); + this.length = 0; +} + +/** + * Adds a value to the histogram. + * + * @param {numnber} value - The value in milliseconds. + */ +Histogram.prototype.add = function(value) { + value = Math.max(value, MIN_VALUE); + value = Math.min(value, MAX_VALUE); + value = Math.ceil(value / 1000) * 1000; + + if (!this.data.has(value)) { + this.data.set(value, 0); + } + + var count = this.data.get(value); + this.data.set(value, count + 1); + this.length += 1; +}; + +/** + * Retrieves the nth percentile of recorded values. + * + * @param {number} percent - The requested percentage. + * @return {number} + */ +Histogram.prototype.percentile = function(percent) { + percent = Math.min(percent, 100); + + var target = this.length - (this.length * (percent / 100)); + var keys = Array.from(this.data.keys()); + var key; + + for (var i = keys.length - 1; i > -1; i--) { + key = keys[i]; + target -= this.data.get(key); + + if (target <= 0) { + return key; + } + } + + return MIN_VALUE; +}; + +module.exports = Histogram; diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index fe6e3b997ac..a64a32fb8d8 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -69,7 +69,7 @@ var util = require('util'); */ function IAM(pubsub, id) { var config = { - baseUrl: pubsub.defaultBaseUrl_, + baseUrl: 'pubsub.googleapis.com', protosDir: path.resolve(__dirname, '../protos'), protoServices: { IAMPolicy: { diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index a5b13483b11..e70bc171d63 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -20,13 +20,13 @@ 'use strict'; -var arrify = require('arrify'); var common = require('@google-cloud/common'); -var commonGrpc = require('@google-cloud/common-grpc'); var extend = require('extend'); +var googleAuth = require('google-auto-auth'); var is = require('is'); -var path = require('path'); -var util = require('util'); + +var PKG = require('../package.json'); +var v1 = require('./v1'); /** * @type {module:pubsub/snapshot} @@ -46,17 +46,6 @@ var Subscription = require('./subscription.js'); */ var Topic = require('./topic.js'); -/** - * @type {object} - GAX's default configuration. - * @private - */ -var GAX_CONFIG = { - Publisher: require('./v1/publisher_client_config.json'). - interfaces['google.pubsub.v1.Publisher'], - Subscriber: require('./v1/subscriber_client_config.json'). - interfaces['google.pubsub.v1.Subscriber'] -}; - /** * [Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a * reliable, many-to-many, asynchronous messaging service from Cloud @@ -79,36 +68,145 @@ function PubSub(options) { return new PubSub(options); } - this.defaultBaseUrl_ = 'pubsub.googleapis.com'; - this.determineBaseUrl_(options.apiEndpoint); - - var config = { - baseUrl: this.baseUrl_, - customEndpoint: this.customEndpoint_, - protosDir: path.resolve(__dirname, '../protos'), - protoServices: { - Publisher: { - path: 'google/pubsub/v1/pubsub.proto', - service: 'pubsub.v1' - }, - Subscriber: { - path: 'google/pubsub/v1/pubsub.proto', - service: 'pubsub.v1' - } - }, - scopes: [ - 'https://www.googleapis.com/auth/pubsub', - 'https://www.googleapis.com/auth/cloud-platform' - ], - packageJson: require('../package.json') - }; + this.options = extend({ + scopes: v1.ALL_SCOPES, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version + }, options); - this.options = options; + this.determineBaseUrl_(); - commonGrpc.Service.call(this, config, options); + this.api = {}; + this.auth = googleAuth(this.options); + this.projectId = this.options.projectId || '{{projectId}}'; } -util.inherits(PubSub, commonGrpc.Service); +/** + * Create a subscription to a topic. + * + * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * + * @throws {Error} If a Topic instance or topic name is not provided. + * @throws {Error} If a subscription name is not provided. + * + * @param {module:pubsub/topic|string} topic - The Topic to create a + * subscription to. + * @param {string=} name - The name of the subscription. + * @param {object=} options - See a + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) + * @param {object} options.flowControl - Flow control configurations for + * receiving messages. Note that these options do not persist across + * subscription instances. + * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @param {number} options.flowControl.maxMessages - The maximum number of + * un-acked messages to allow before the subscription pauses incoming + * messages. Default: Infinity. + * @param {object} options.gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {number|date} options.messageRetentionDuration - Set this to override + * the default duration of 7 days. This value is expected in seconds. + * Acceptable values are in the range of 10 minutes and 7 days. + * @param {string} options.pushEndpoint - A URL to a custom endpoint that + * messages should be pushed to. + * @param {boolean} options.retainAckedMessages - If set, acked messages are + * retained in the subscription's backlog for the length of time specified + * by `options.messageRetentionDuration`. Default: `false` + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this request + * @param {module:pubsub/subscription} callback.subscription - The subscription. + * @param {object} callback.apiResponse - The full API response. + * + * @example + * //- + * // Subscribe to a topic. (Also see {module:pubsub/topic#createSubscription}). + * //- + * var topic = 'messageCenter'; + * var name = 'newMessages'; + * + * var callback = function(err, subscription, apiResponse) {}; + * + * pubsub.createSubscription(topic, name, callback); + * + * //- + * // Customize the subscription. + * //- + * pubsub.createSubscription(topic, name, { + * ackDeadline: 90000 // 90 seconds + * }, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.createSubscription(topic, name).then(function(data) { + * var subscription = data[0]; + * var apiResponse = data[1]; + * }); + */ +PubSub.prototype.createSubscription = function(topic, name, options, callback) { + if (!is.string(topic) && !(topic instanceof Topic)) { + throw new Error('A Topic is required for a new subscription.'); + } + + if (!is.string(name)) { + throw new Error('A subscription name is required.'); + } + + if (is.string(topic)) { + topic = this.topic(topic); + } + + if (is.fn(options)) { + callback = options; + options = {}; + } + + options = options || {}; + + var subscription = this.subscription(name, options); + + var reqOpts = extend({ + topic: topic.name, + name: subscription.name + }, options); + + delete reqOpts.gaxOpts; + delete reqOpts.flowControl; + + if (options.messageRetentionDuration) { + reqOpts.retainAckedMessages = true; + + reqOpts.messageRetentionDuration = { + seconds: options.messageRetentionDuration, + nanos: 0 + }; + } + + if (options.pushEndpoint) { + delete reqOpts.pushEndpoint; + + reqOpts.pushConfig = { + pushEndpoint: options.pushEndpoint + }; + } + + this.request({ + client: 'subscriberClient', + method: 'createSubscription', + reqOpts: reqOpts, + gaxOpts: options.gaxOpts + }, function(err, resp) { + if (err && err.code !== 6) { + callback(err, null, resp); + return; + } + + subscription.metadata = resp; + callback(null, subscription, resp); + }); +}; /** * Create a topic with the given name. @@ -116,6 +214,8 @@ util.inherits(PubSub, commonGrpc.Service); * @resource [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create} * * @param {string} name - Name of the topic. + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {function=} callback - The callback function. * @param {?error} callback.err - An error from the API call, may be null. * @param {module:pubsub/topic} callback.topic - The newly created topic. @@ -137,41 +237,70 @@ util.inherits(PubSub, commonGrpc.Service); * var apiResponse = data[1]; * }); */ -PubSub.prototype.createTopic = function(name, callback) { - var self = this; - - callback = callback || common.util.noop; - - var protoOpts = { - service: 'Publisher', - method: 'createTopic' - }; +PubSub.prototype.createTopic = function(name, gaxOpts, callback) { + var topic = this.topic(name); var reqOpts = { - name: Topic.formatName_(this.projectId, name) + name: topic.name }; - this.request(protoOpts, reqOpts, function(err, resp) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + + this.request({ + client: 'publisherClient', + method: 'createTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function(err, resp) { if (err) { callback(err, null, resp); return; } - var topic = self.topic(name); topic.metadata = resp; - callback(null, topic, resp); }); }; +/** + * Determine the appropriate endpoint to use for API requests, first trying the + * local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null we try + * Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise the + * default JSON API. + * + * @private + */ +PubSub.prototype.determineBaseUrl_ = function() { + var apiEndpoint = this.options.apiEndpoint; + + if (!apiEndpoint && !process.env.PUBSUB_EMULATOR_HOST) { + return; + } + + var baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; + var leadingProtocol = new RegExp('^https*://'); + var trailingSlashes = new RegExp('/*$'); + + var baseUrlParts = baseUrl + .replace(leadingProtocol, '') + .replace(trailingSlashes, '') + .split(':'); + + this.options.servicePath = baseUrlParts[0]; + this.options.port = baseUrlParts[1]; +}; + /** * Get a list of snapshots. * * @param {object=} options - Configuration object. * @param {boolean} options.autoPaginate - Have pagination handled * automatically. Default: true. - * @param {number} options.maxApiCalls - Maximum number of API calls to make. - * @param {number} options.maxResults - Maximum number of results to return. + * @param {object} options.gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {number} options.pageSize - Maximum number of results to return. * @param {string} options.pageToken - Page token. * @param {function} callback - The callback function. @@ -187,21 +316,6 @@ PubSub.prototype.createTopic = function(name, callback) { * }); * * //- - * // To control how many API requests are made and page through the results - * // manually, set `autoPaginate` to `false`. - * //- - * var callback = function(err, snapshots, nextQuery, apiResponse) { - * if (nextQuery) { - * // More results exist. - * pubsub.getSnapshots(nextQuery, callback); - * } - * }; - * - * pubsub.getSnapshots({ - * autoPaginate: false - * }, callback); - * - * //- * // If the callback is omitted, we'll return a Promise. * //- * pubsub.getSnapshots().then(function(data) { @@ -216,35 +330,34 @@ PubSub.prototype.getSnapshots = function(options, callback) { options = {}; } - var protoOpts = { - service: 'Subscriber', - method: 'listSnapshots' - }; - - var reqOpts = extend({}, options); - - reqOpts.project = 'projects/' + this.projectId; - - this.request(protoOpts, reqOpts, function(err, resp) { - if (err) { - callback(err, null, null, resp); - return; - } - - var snapshots = arrify(resp.snapshots).map(function(snapshot) { - var snapshotInstance = self.snapshot(snapshot.name); - snapshotInstance.metadata = snapshot; - return snapshotInstance; - }); - - var nextQuery = null; - - if (resp.nextPageToken) { - nextQuery = options; - nextQuery.pageToken = resp.nextPageToken; + var reqOpts = extend({ + project: 'projects/' + this.projectId + }, options); + + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + + var gaxOpts = extend({ + autoPaginate: options.autoPaginate + }, options.gaxOpts); + + this.request({ + client: 'subscriberClient', + method: 'listSnapshots', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function() { + var snapshots = arguments[1]; + + if (snapshots) { + arguments[1] = snapshots.map(function(snapshot) { + var snapshotInstance = self.snapshot(snapshot.name); + snapshotInstance.metadata = snapshot; + return snapshotInstance; + }); } - callback(null, snapshots, nextQuery, resp); + callback.apply(null, arguments); }); }; @@ -293,8 +406,8 @@ PubSub.prototype.getSnapshotsStream = * @param {object=} options - Configuration object. * @param {boolean} options.autoPaginate - Have pagination handled * automatically. Default: true. - * @param {number} options.maxApiCalls - Maximum number of API calls to make. - * @param {number} options.maxResults - Maximum number of results to return. + * @param {object} options.gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {number} options.pageSize - Maximum number of results to return. * @param {string} options.pageToken - Page token. * @param {string|module:pubsub/topic} options.topic - The name of the topic to @@ -314,21 +427,6 @@ PubSub.prototype.getSnapshotsStream = * }); * * //- - * // To control how many API requests are made and page through the results - * // manually, set `autoPaginate` to `false`. - * //- - * var callback = function(err, subscriptions, nextQuery, apiResponse) { - * if (nextQuery) { - * // More results exist. - * pubsub.getSubscriptions(nextQuery, callback); - * } - * }; - * - * pubsub.getSubscriptions({ - * autoPaginate: false - * }, callback); - * - * //- * // If the callback is omitted, we'll return a Promise. * //- * pubsub.getSubscriptions().then(function(data) { @@ -343,56 +441,44 @@ PubSub.prototype.getSubscriptions = function(options, callback) { options = {}; } - var protoOpts = {}; - var reqOpts = extend({}, options); + var topic = options.topic; - if (options.topic) { - protoOpts = { - service: 'Publisher', - method: 'listTopicSubscriptions' - }; - - if (options.topic instanceof Topic) { - reqOpts.topic = options.topic.name; - } else { - reqOpts.topic = options.topic; + if (topic) { + if (!(topic instanceof Topic)) { + topic = this.topic(topic); } - } else { - protoOpts = { - service: 'Subscriber', - method: 'listSubscriptions' - }; - reqOpts.project = 'projects/' + this.projectId; + return topic.getSubscriptions(options, callback); } - this.request(protoOpts, reqOpts, function(err, resp) { - if (err) { - callback(err, null, null, resp); - return; - } - var subscriptions = arrify(resp.subscriptions).map(function(sub) { - // Depending on if we're using a subscriptions.list or - // topics.subscriptions.list API endpoint, we will get back a - // Subscription resource or just the name of the subscription. - var subscriptionInstance = self.subscription(sub.name || sub); + var reqOpts = extend({}, options); - if (sub.name) { + reqOpts.project = 'projects/' + this.projectId; + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + + var gaxOpts = extend({ + autoPaginate: options.autoPaginate + }, options.gaxOpts); + + this.request({ + client: 'subscriberClient', + method: 'listSubscriptions', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function() { + var subscriptions = arguments[1]; + + if (subscriptions) { + arguments[1] = subscriptions.map(function(sub) { + var subscriptionInstance = self.subscription(sub.name); subscriptionInstance.metadata = sub; - } - - return subscriptionInstance; - }); - - var nextQuery = null; - - if (resp.nextPageToken) { - nextQuery = options; - nextQuery.pageToken = resp.nextPageToken; + return subscriptionInstance; + }); } - callback(null, subscriptions, nextQuery, resp); + callback.apply(null, arguments); }); }; @@ -433,10 +519,10 @@ PubSub.prototype.getSubscriptionsStream = * @resource [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list} * * @param {object=} query - Query object. - * @param {boolean} options.autoPaginate - Have pagination handled + * @param {boolean} query.autoPaginate - Have pagination handled * automatically. Default: true. - * @param {number} options.maxApiCalls - Maximum number of API calls to make. - * @param {number} options.maxResults - Maximum number of results to return. + * @param {object} query.gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {number} query.pageSize - Max number of results to return. * @param {string} query.pageToken - Page token. * @param {function} callback - The callback function. @@ -460,63 +546,48 @@ PubSub.prototype.getSubscriptionsStream = * }, function(err, topics) {}); * * //- - * // To control how many API requests are made and page through the results - * // manually, set `autoPaginate` to `false`. - * //- - * var callback = function(err, rows, nextQuery, apiResponse) { - * if (nextQuery) { - * // More results exist. - * pubsub.getTopics(nextQuery, callback); - * } - * }; - * - * pubsub.getTopics({ - * autoPaginate: false - * }, callback); - * - * //- * // If the callback is omitted, we'll return a Promise. * //- * pubsub.getTopics().then(function(data) { * var topics = data[0]; * }); */ -PubSub.prototype.getTopics = function(query, callback) { +PubSub.prototype.getTopics = function(options, callback) { var self = this; - if (!callback) { - callback = query; - query = {}; + if (is.fn(options)) { + callback = options; + options = {}; } - var protoOpts = { - service: 'Publisher', - method: 'listTopics' - }; - var reqOpts = extend({ project: 'projects/' + this.projectId - }, query); - - this.request(protoOpts, reqOpts, function(err, result) { - if (err) { - callback(err, null, result); - return; - } - - var topics = arrify(result.topics).map(function(topic) { - var topicInstance = self.topic(topic.name); - topicInstance.metadata = topic; - return topicInstance; - }); - - var nextQuery = null; - if (result.nextPageToken) { - nextQuery = query; - nextQuery.pageToken = result.nextPageToken; + }, options); + + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + + var gaxOpts = extend({ + autoPaginate: options.autoPaginate + }, options.gaxOpts); + + this.request({ + client: 'publisherClient', + method: 'listTopics', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function() { + var topics = arguments[1]; + + if (topics) { + arguments[1] = topics.map(function(topic) { + var topicInstance = self.topic(topic.name); + topicInstance.metadata = topic; + return topicInstance; + }); } - callback(null, topics, nextQuery, result); + callback.apply(null, arguments); }); }; @@ -550,150 +621,41 @@ PubSub.prototype.getTopics = function(query, callback) { PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); /** - * Create a subscription to a topic. - * - * All generated subscription names share a common prefix, `autogenerated-`. - * - * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * Funnel all API requests through this method, to be sure we have a project ID. * - * @throws {Error} If a Topic instance or topic name is not provided. - * @throws {Error} If a subName is not provided. - * - * @param {module:pubsub/topic|string} topic - The Topic to create a - * subscription to. - * @param {string=} subName - The name of the subscription. If a name is not - * provided, a random subscription name will be generated and created. - * @param {object=} options - See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) - * @param {number} options.ackDeadlineSeconds - The maximum time after receiving - * a message that you must ack a message before it is redelivered. - * @param {boolean} options.autoAck - Automatically acknowledge the message once - * it's pulled. (default: false) - * @param {string} options.encoding - When pulling for messages, this type is - * used when converting a message's data to a string. (default: 'utf-8') - * @param {number} options.interval - Interval in milliseconds to check for new - * messages. (default: 10) - * @param {number} options.maxInProgress - Maximum messages to consume - * simultaneously. - * @param {number|date} options.messageRetentionDuration - Set this to override - * the default duration of 7 days. This value is expected in seconds. - * Acceptable values are in the range of 10 minutes and 7 days. - * @param {string} options.pushEndpoint - A URL to a custom endpoint that - * messages should be pushed to. - * @param {boolean} options.retainAckedMessages - If set, acked messages are - * retained in the subscription's backlog for 7 days (unless overriden by - * `options.messageRetentionDuration`). Default: `false` - * @param {number} options.timeout - Set a maximum amount of time in - * milliseconds on an HTTP request to pull new messages to wait for a - * response before the connection is broken. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this request - * @param {module:pubsub/subscription} callback.subscription - The subscription. - * @param {object} callback.apiResponse - The full API response. - * - * @example - * //- - * // Subscribe to a topic. (Also see {module:pubsub/topic#subscribe}). - * //- - * var topic = 'messageCenter'; - * var name = 'newMessages'; - * - * pubsub.subscribe(topic, name, function(err, subscription, apiResponse) {}); - * - * //- - * // Omit the name to have one generated automatically. All generated names - * // share a common prefix, `autogenerated-`. - * //- - * pubsub.subscribe(topic, function(err, subscription, apiResponse) { - * // subscription.name = The generated name. - * }); - * - * //- - * // Customize the subscription. - * //- - * pubsub.subscribe(topic, name, { - * ackDeadlineSeconds: 90, - * autoAck: true, - * interval: 30 - * }, function(err, subscription, apiResponse) {}); + * @private * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.subscribe(topic, name).then(function(data) { - * var subscription = data[0]; - * var apiResponse = data[1]; - * }); + * @param {object} config - Configuration object. + * @param {object} config.gaxOpts - GAX options. + * @param {function} config.method - The gax method to call. + * @param {object} config.reqOpts - Request options. + * @param {function=} callback - The callback function. */ -PubSub.prototype.subscribe = function(topic, subName, options, callback) { - if (!is.string(topic) && !(topic instanceof Topic)) { - throw new Error('A Topic is required for a new subscription.'); - } - - if (is.string(topic)) { - topic = this.topic(topic); - } - - if (is.object(subName)) { - callback = options; - options = subName; - subName = ''; - } - - if (is.fn(subName)) { - callback = subName; - subName = ''; - } - - if (is.fn(options)) { - callback = options; - options = {}; - } - - options = options || {}; - - var subscription = this.subscription(subName, options); - - var protoOpts = { - service: 'Subscriber', - method: 'createSubscription', - timeout: options.timeout - }; - - var reqOpts = extend(true, {}, options, { - topic: topic.name, - name: subscription.name - }); - - if (reqOpts.messageRetentionDuration) { - reqOpts.retainAckedMessages = true; +PubSub.prototype.request = function(config, callback) { + var self = this; - reqOpts.messageRetentionDuration = { - seconds: reqOpts.messageRetentionDuration, - nanos: 0 - }; + if (global.GCLOUD_SANDBOX_ENV) { + return; } - if (reqOpts.pushEndpoint) { - reqOpts.pushConfig = { - pushEndpoint: reqOpts.pushEndpoint - }; - } + self.auth.getProjectId(function(err, projectId) { + if (err) { + callback(err); + return; + } - delete reqOpts.autoAck; - delete reqOpts.encoding; - delete reqOpts.interval; - delete reqOpts.maxInProgress; - delete reqOpts.pushEndpoint; - delete reqOpts.timeout; + var gaxClient = self.api[config.client]; - this.request(protoOpts, reqOpts, function(err, resp) { - if (err && err.code !== 409) { - callback(err, null, resp); - return; + if (!gaxClient) { + // Lazily instantiate client. + gaxClient = v1(self.options)[config.client](self.options); + self.api[config.client] = gaxClient; } - callback(null, subscription, resp); + var reqOpts = extend(true, {}, config.reqOpts); + reqOpts = common.util.replaceProjectIdToken(reqOpts, projectId); + + gaxClient[config.method](reqOpts, config.gaxOpts, callback); }); }; @@ -722,22 +684,21 @@ PubSub.prototype.snapshot = function(name) { * requests. You will receive a {module:pubsub/subscription} object, * which will allow you to interact with a subscription. * - * All generated names share a common prefix, `autogenerated-`. + * @throws {Error} If subscription name is omitted. * - * @param {string=} name - The name of the subscription. If a name is not - * provided, a random subscription name will be generated. + * @param {string} name - Name of the subscription. * @param {object=} options - Configuration object. - * @param {boolean} options.autoAck - Automatically acknowledge the message once - * it's pulled. (default: false) - * @param {string} options.encoding - When pulling for messages, this type is - * used when converting a message's data to a string. (default: 'utf-8') - * @param {number} options.interval - Interval in milliseconds to check for new - * messages. (default: 10) - * @param {number} options.maxInProgress - Maximum messages to consume - * simultaneously. - * @param {number} options.timeout - Set a maximum amount of time in - * milliseconds on an HTTP request to pull new messages to wait for a - * response before the connection is broken. + * @param {object} options.flowControl - Flow control configurations for + * receiving messages. Note that these options do not persist across + * subscription instances. + * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @param {number} options.flowControl.maxMessages - The maximum number of + * un-acked messages to allow before the subscription pauses incoming + * messages. Default: Infinity. + * @param {number} options.maxConnections - Use this to limit the number of + * connections to be used when sending and receiving messages. Default: 5. * @return {module:pubsub/subscription} * * @example @@ -750,19 +711,15 @@ PubSub.prototype.snapshot = function(name) { * // message.ackId = ID used to acknowledge the message receival. * // message.data = Contents of the message. * // message.attributes = Attributes of the message. - * // message.timestamp = Timestamp when Pub/Sub received the message. + * // message.publishTime = Timestamp when Pub/Sub received the message. * }); */ PubSub.prototype.subscription = function(name, options) { - if (is.object(name)) { - options = name; - name = undefined; + if (!name) { + throw new Error('A name must be specified for a subscription.'); } - options = options || {}; - options.name = name; - - return new Subscription(this, options); + return new Subscription(this, name, options); }; /** @@ -775,58 +732,13 @@ PubSub.prototype.subscription = function(name, options) { * * @example * var topic = pubsub.topic('my-topic'); - * - * topic.publish({ - * data: 'New message!' - * }, function(err) {}); */ -PubSub.prototype.topic = function(name) { +PubSub.prototype.topic = function(name, options) { if (!name) { - throw new Error('A name must be specified for a new topic.'); - } - - return new Topic(this, name); -}; - -/** - * Intercept the call to {module:common/grpc-service#request}, making sure the - * correct timeouts are set. - * - * @private - */ -PubSub.prototype.request = function(protoOpts) { - var method = protoOpts.method; - var camelCaseMethod = method[0].toUpperCase() + method.substr(1); - var config = GAX_CONFIG[protoOpts.service].methods[camelCaseMethod]; - - if (is.undefined(arguments[0].timeout)) { - arguments[0].timeout = config.timeout_millis; - } - - commonGrpc.Service.prototype.request.apply(this, arguments); -}; - -/** - * Determine the appropriate endpoint to use for API requests, first trying the - * local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null we try - * Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise the - * default JSON API. - * - * @private - */ -PubSub.prototype.determineBaseUrl_ = function(apiEndpoint) { - var baseUrl = this.defaultBaseUrl_; - var leadingProtocol = new RegExp('^https*://'); - var trailingSlashes = new RegExp('/*$'); - - if (apiEndpoint || process.env.PUBSUB_EMULATOR_HOST) { - this.customEndpoint_ = true; - baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; + throw new Error('A name must be specified for a topic.'); } - this.baseUrl_ = baseUrl - .replace(leadingProtocol, '') - .replace(trailingSlashes, ''); + return new Topic(this, name, options); }; /*! Developer Documentation @@ -853,8 +765,5 @@ common.util.promisifyAll(PubSub, { ] }); -PubSub.Subscription = Subscription; -PubSub.Topic = Topic; - module.exports = PubSub; -module.exports.v1 = require('./v1'); +module.exports.v1 = v1; diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js new file mode 100644 index 00000000000..b84f634a590 --- /dev/null +++ b/handwritten/pubsub/src/publisher.js @@ -0,0 +1,226 @@ +/*! + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/*! + * @module pubsub/publisher + */ + +'use strict'; + +var arrify = require('arrify'); +var common = require('@google-cloud/common'); +var each = require('async-each'); +var extend = require('extend'); +var is = require('is'); + +/*! Developer Documentation. + * + * @param {module:pubsub/topic} topic - The topic associated with this + * publisher. + * @param {object=} options - Configuration object. + * @param {object} options.batching - Batching settings. + * @param {number} options.batching.maxBytes - The maximum number of bytes to + * buffer before sending a payload. + * @param {number} options.batching.maxMessages - The maximum number of messages + * to buffer before sending a payload. + * @param {number} options.batching.maxMilliseconds - The maximum duration to + * wait before sending a payload. + */ +/** + * A Publisher object allows you to publish messages to a specific topic. + * + * @constructor + * @alias module:pubsub/publisher + * + * @resource [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} + * + * @example + * var topic = pubsub.topic('my-topic'); + * var publisher = topic.publisher(); + */ +function Publisher(topic, options) { + options = extend(true, { + batching: { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 1000 + } + }, options); + + this.topic = topic; + + // this object keeps track of all messages scheduled to be published + // queued is essentially the `messages` field for the publish rpc req opts + // bytes is used to track the size of the combined payload + // callbacks is an array of callbacks - each callback is associated with a + // specific message. + this.inventory_ = { + callbacks: [], + queued: [], + bytes: 0 + }; + + this.settings = { + batching: { + maxBytes: Math.min(options.batching.maxBytes, Math.pow(1024, 2) * 9), + maxMessages: Math.min(options.batching.maxMessages, 1000), + maxMilliseconds: options.batching.maxMilliseconds + } + }; + + this.timeoutHandle_ = null; +} + +/** + * Publish the provided message. + * + * @throws {TypeError} If data is not a Buffer object. + * + * @param {buffer} data - The message data. This must come in the form of a + * Buffer object. + * @param {object=} attributes - Optional attributes for this message. + * @param {function=} callback - The callback function. If omitted a Promise + * will be returned. + * @param {?error} callback.error - An error returned while making this request. + * @param {string} callback.messageId - The id for the message. + * + * @example + * var data = new Buffer('Hello, world!'); + * + * var callback = function(err, messageId) { + * if (err) { + * // Error handling omitted. + * } + * }; + * + * publisher.publish(data, callback); + * + * //- + * // Optionally you can provide an object containing attributes for the + * // message. + * //- + * var attributes = { + * key: 'value' + * }; + * + * publisher.publish(data, attributes, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * publisher.publish(data).then(function(messageId) {}); + */ +Publisher.prototype.publish = function(data, attrs, callback) { + if (!(data instanceof Buffer)) { + throw new TypeError('Data must be in the form of a Buffer.'); + } + + if (is.fn(attrs)) { + callback = attrs; + attrs = {}; + } + + var opts = this.settings.batching; + + // if this message puts us over the maxBytes option, then let's ship + // what we have and add it to the next batch + if ((this.inventory_.bytes + data.length) > opts.maxBytes) { + this.publish_(); + } + + // add it to the queue! + this.queue_(data, attrs, callback); + + // next lets check if this message brings us to the message cap or if we + // magically hit the max byte limit + var hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; + + if (this.inventory_.bytes === opts.maxBytes || hasMaxMessages) { + this.publish_(); + return; + } + + // otherwise let's set a timeout to send the next batch + if (!this.timeoutHandle_) { + this.timeoutHandle_ = setTimeout( + this.publish_.bind(this), opts.maxMilliseconds); + } +}; + +/** + * This publishes a batch of messages and should never be called directly. + * + * @private + */ +Publisher.prototype.publish_ = function() { + var callbacks = this.inventory_.callbacks; + var messages = this.inventory_.queued; + + this.inventory_.callbacks = []; + this.inventory_.queued = []; + this.inventory_.bytes = 0; + + clearTimeout(this.timeoutHandle_); + this.timeoutHandle_ = null; + + var reqOpts = { + topic: this.topic.name, + messages: messages + }; + + this.topic.request({ + client: 'publisherClient', + method: 'publish', + reqOpts: reqOpts + }, function(err, resp) { + var messageIds = arrify(resp && resp.messageIds); + + each(callbacks, function(callback, next) { + var messageId = messageIds[callbacks.indexOf(callback)]; + + callback(err, messageId); + next(); + }); + }); +}; + +/** + * Queues message to be sent to the server. + * + * @private + * + * @param {buffer} data - The message data. + * @param {object} attributes - The message attributes. + * @param {function} callback - The callback function. + */ +Publisher.prototype.queue_ = function(data, attrs, callback) { + this.inventory_.queued.push({ + data: data, + attributes: attrs + }); + + this.inventory_.bytes += data.length; + this.inventory_.callbacks.push(callback); +}; + +/*! Developer Documentation + * + * All async methods (except for streams) will return a Promise in the event + * that a callback is omitted. + */ +common.util.promisifyAll(Publisher); + +module.exports = Publisher; diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index 4a578191e49..ff25e0f1340 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -1,5 +1,5 @@ /*! - * Copyright 2014 Google Inc. All Rights Reserved. + * Copyright 2017 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,8 @@ 'use strict'; -var commonGrpc = require('@google-cloud/common-grpc'); +var common = require('@google-cloud/common'); var is = require('is'); -var util = require('util'); /** * A Snapshot object will give you access to your Cloud Pub/Sub snapshot. @@ -90,56 +89,10 @@ var util = require('util'); * }); */ function Snapshot(parent, name) { - var projectId = parent.projectId; - - if (!projectId && parent.parent) { - projectId = parent.parent.projectId; - } - - this.name = Snapshot.formatName_(projectId, name); - - var methods = { - /** - * Delete the snapshot. - * - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {object} callback.apiResponse - The full API response from the - * service. - * - * @example - * snapshot.delete(function(err, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * snapshot.delete().then(function(data) { - * var apiResponse = data[0]; - * }); - */ - delete: { - protoOpts: { - service: 'Subscriber', - method: 'deleteSnapshot' - }, - reqOpts: { - snapshot: this.name - } - } - }; - - var config = { - parent: parent, - id: this.name, - methods: methods - }; - - var isSubscription = is.fn(parent.createSnapshot); - - if (isSubscription) { - config.createMethod = parent.createSnapshot.bind(parent); + this.parent = parent; + this.name = Snapshot.formatName_(parent.projectId, name); + if (is.fn(parent.createSnapshot)) { /** * Create a snapshot with the given name. * @@ -174,8 +127,10 @@ function Snapshot(parent, name) { * var apiResponse = data[1]; * }); */ - methods.create = true; + this.create = parent.createSnapshot.bind(parent, name); + } + if (is.fn(parent.seek)) { /** * Seeks an existing subscription to the snapshot. * @@ -202,12 +157,8 @@ function Snapshot(parent, name) { */ this.seek = parent.seek.bind(parent, name); } - - commonGrpc.ServiceObject.call(this, config); } -util.inherits(Snapshot, commonGrpc.ServiceObject); - /** * Format the name of a snapshot. A snapshot's full name is in the format of * projects/{projectId}/snapshots/{snapshotName} @@ -218,4 +169,44 @@ Snapshot.formatName_ = function(projectId, name) { return 'projects/' + projectId + '/snapshots/' + name.split('/').pop(); }; +/** + * Delete the snapshot. + * + * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * snapshot.delete(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.delete().then(function(data) { + * var apiResponse = data[0]; + * }); + */ +Snapshot.prototype.delete = function(callback) { + var reqOpts = { + snapshot: this.name + }; + + callback = callback || common.util.noop; + + this.parent.request({ + client: 'subscriberClient', + method: 'deleteSnapshot', + reqOpts: reqOpts + }, callback); +}; + +/*! Developer Documentation + * + * All async methods (except for streams) will return a Promise in the event + * that a callback is omitted. + */ +common.util.promisifyAll(Snapshot); + module.exports = Snapshot; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 91847efe974..42683f15c35 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -20,50 +20,40 @@ 'use strict'; -var arrify = require('arrify'); var common = require('@google-cloud/common'); -var commonGrpc = require('@google-cloud/common-grpc'); var events = require('events'); +var extend = require('extend'); var is = require('is'); -var modelo = require('modelo'); -var prop = require('propprop'); -var uuid = require('uuid'); +var os = require('os'); +var util = require('util'); /** - * @type {module:pubsub/iam} + * @type {module:pubsub/connectionPool} * @private */ -var IAM = require('./iam.js'); +var ConnectionPool = require('./connection-pool.js'); /** - * @type {module:pubsub/snapshot} + * @type {module:pubsub/histogram} * @private */ -var Snapshot = require('./snapshot.js'); +var Histogram = require('./histogram.js'); + +/** + * @type {module:pubsub/iam} + * @private + */ +var IAM = require('./iam.js'); /** - * @const {number} - The amount of time a subscription pull HTTP connection to - * Pub/Sub stays open. + * @type {module:pubsub/snapshot} * @private */ -var PUBSUB_API_TIMEOUT = 90000; +var Snapshot = require('./snapshot.js'); /*! Developer Documentation - * * @param {module:pubsub} pubsub - PubSub object. - * @param {object} options - Configuration object. - * @param {boolean} options.autoAck - Automatically acknowledge the message once - * it's pulled. (default: false) - * @param {string} options.encoding - When pulling for messages, this type is - * used when converting a message's data to a string. (default: 'utf-8') - * @param {number} options.interval - Interval in milliseconds to check for new - * messages. (default: 10) - * @param {string} options.name - Name of the subscription. - * @param {number} options.maxInProgress - Maximum messages to consume - * simultaneously. - * @param {number} options.timeout - Set a maximum amount of time in - * milliseconds on an HTTP request to pull new messages to wait for a - * response before the connection is broken. (default: 90000) + * @param {string=} name - The name of the subscription. */ /** * A Subscription object will give you access to your Cloud Pub/Sub @@ -73,7 +63,7 @@ var PUBSUB_API_TIMEOUT = 90000; * * - {module:pubsub#getSubscriptions} * - {module:pubsub/topic#getSubscriptions} - * - {module:pubsub/topic#subscribe} + * - {module:pubsub/topic#createSubscription} * * Subscription objects may be created directly with: * @@ -87,6 +77,20 @@ var PUBSUB_API_TIMEOUT = 90000; * @alias module:pubsub/subscription * @constructor * + * @param {object=} options - See a + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) + * @param {object} options.flowControl - Flow control configurations for + * receiving messages. Note that these options do not persist across + * subscription instances. + * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @param {number} options.flowControl.maxMessages - The maximum number of + * un-acked messages to allow before the subscription pauses incoming + * messages. Default: Infinity. + * @param {number} options.maxConnections - Use this to limit the number of + * connections to be used when sending and receiving messages. Default: 5. + * * @example * //- * // From {module:pubsub#getSubscriptions}: @@ -104,10 +108,10 @@ var PUBSUB_API_TIMEOUT = 90000; * }); * * //- - * // From {module:pubsub/topic#subscribe}: + * // From {module:pubsub/topic#createSubscription}: * //- * var topic = pubsub.topic('my-topic'); - * topic.subscribe('new-subscription', function(err, subscription) { + * topic.createSubscription('new-subscription', function(err, subscription) { * // `subscription` is a Subscription object. * }); * @@ -137,166 +141,52 @@ var PUBSUB_API_TIMEOUT = 90000; * // message.timestamp = Timestamp when Pub/Sub received the message. * * // Ack the message: - * // message.ack(callback); + * // message.ack(); * - * // Skip the message. This is useful with `maxInProgress` option when - * // creating your subscription. This doesn't ack the message, but allows - * // more messages to be retrieved if your limit was hit. - * // message.skip(); + * // This doesn't ack the message, but allows more messages to be retrieved + * // if your limit was hit or if you don't want to ack the message. + * // message.nack(); * } * subscription.on('message', onMessage); * * // Remove the listener from receiving `message` events. * subscription.removeListener('message', onMessage); */ -function Subscription(pubsub, options) { - var name = options.name || Subscription.generateName_(); +function Subscription(pubsub, name, options) { + options = options || {}; + + this.pubsub = pubsub; + this.projectId = pubsub.projectId; + this.request = pubsub.request.bind(pubsub); + this.histogram = new Histogram(); this.name = Subscription.formatName_(pubsub.projectId, name); - var methods = { - /** - * Check if the subscription exists. - * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {boolean} callback.exists - Whether the subscription exists or - * not. - * - * @example - * subscription.exists(function(err, exists) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.exists().then(function(data) { - * var exists = data[0]; - * }); - */ - exists: true, - - /** - * Get a subscription if it exists. - * - * You may optionally use this to "get or create" an object by providing an - * object with `autoCreate` set to `true`. Any extra configuration that is - * normally required for the `create` method must be contained within this - * object as well. - * - * **`autoCreate` is only available if you accessed this object - * through {module:pubsub/topic#subscription}.** - * - * @param {options=} options - Configuration object. - * @param {boolean} options.autoCreate - Automatically create the object if - * it does not exist. Default: `false` - * - * @example - * subscription.get(function(err, subscription, apiResponse) { - * // `subscription.metadata` has been populated. - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.get().then(function(data) { - * var subscription = data[0]; - * var apiResponse = data[1]; - * }); - */ - get: true, - - /** - * Get the metadata for the subscription. - * - * @resource [Subscriptions: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/get} - * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {?object} callback.metadata - Metadata of the subscription from - * the API. - * @param {object} callback.apiResponse - Raw API response. - * - * @example - * subscription.getMetadata(function(err, metadata, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.getMetadata().then(function(data) { - * var metadata = data[0]; - * var apiResponse = data[1]; - * }); - */ - getMetadata: { - protoOpts: { - service: 'Subscriber', - method: 'getSubscription' - }, - reqOpts: { - subscription: this.name - } - } - }; + this.connectionPool = null; + this.ackDeadline = 10000; + this.maxConnections = options.maxConnections || 5; - var config = { - parent: pubsub, - id: this.name, - methods: methods + this.inventory_ = { + lease: [], + ack: [], + nack: [], + bytes: 0 }; - if (options.topic) { - // Only a subscription with knowledge of its topic can be created. - config.createMethod = pubsub.subscribe.bind(pubsub, options.topic); - delete options.topic; - - /** - * Create a subscription. - * - * **This is only available if you accessed this object through - * {module:pubsub/topic#subscription}.** - * - * @param {object} config - See {module:pubsub#subscribe}. - * - * @example - * subscription.create(function(err, subscription, apiResponse) { - * if (!err) { - * // The subscription was created successfully. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.create().then(function(data) { - * var subscription = data[0]; - * var apiResponse = data[1]; - * }); - */ - config.methods.create = true; - } + this.flowControl = extend({ + maxBytes: os.freemem() * 0.2, + maxMessages: Infinity + }, options.flowControl); - commonGrpc.ServiceObject.call(this, config); - events.EventEmitter.call(this); + this.flushTimeoutHandle_ = null; + this.leaseTimeoutHandle_ = null; + this.userClosed_ = false; - this.autoAck = is.boolean(options.autoAck) ? options.autoAck : false; - this.closed = true; - this.encoding = options.encoding || 'utf-8'; - this.inProgressAckIds = {}; - this.interval = is.number(options.interval) ? options.interval : 10; - this.maxInProgress = - is.number(options.maxInProgress) ? options.maxInProgress : Infinity; + events.EventEmitter.call(this); this.messageListeners = 0; - this.paused = false; - if (is.number(options.timeout)) { - this.timeout = options.timeout; - } else { - // The default timeout used in google-cloud-node is 60s, but a pull request - // times out around 90 seconds. Allow an extra couple of seconds to give the - // API a chance to respond on its own before terminating the connection. - this.timeout = PUBSUB_API_TIMEOUT + 2000; + if (options.topic) { + this.create = pubsub.createSubscription.bind(pubsub, options.topic, name); } /** @@ -338,54 +228,7 @@ function Subscription(pubsub, options) { this.listenForEvents_(); } -modelo.inherits(Subscription, commonGrpc.ServiceObject, events.EventEmitter); - -/** - * Simplify a message from an API response to have five properties: `id`, - * `ackId`, `data`, `attributes`, and `timestamp`. `data` is always converted to - * a string. - * - * @private - */ -Subscription.formatMessage_ = function(msg, enc) { - var innerMessage = msg.message; - var message = { - ackId: msg.ackId - }; - - if (innerMessage) { - message.id = innerMessage.messageId; - - if (innerMessage.data) { - if (enc === 'base64') { - // Prevent decoding and then re-encoding to base64. - message.data = innerMessage.data; - } else { - message.data = Buffer.from(innerMessage.data, 'base64').toString(enc); - - try { - message.data = JSON.parse(message.data); - } catch(e) {} - } - } - - if (innerMessage.attributes) { - message.attributes = innerMessage.attributes; - } - - if (innerMessage.publishTime) { - var publishTime = innerMessage.publishTime; - - if (is.defined(publishTime.seconds) && is.defined(publishTime.nanos)) { - var seconds = parseInt(publishTime.seconds, 10); - var milliseconds = parseInt(publishTime.nanos, 10) / 1e6; - message.timestamp = new Date(seconds * 1000 + milliseconds); - } - } - } - - return message; -}; +util.inherits(Subscription, events.EventEmitter); /** * Format the name of a subscription. A subscription's full name is in the @@ -403,90 +246,121 @@ Subscription.formatName_ = function(projectId, name) { }; /** - * Generate a random name to use for a name-less subscription. + * Acks the provided message. If the connection pool is absent, it will be + * placed in an internal queue and sent out after 1 second or if the pool is + * re-opened before the timeout hits. * * @private + * + * @param {object} message - The message object. */ -Subscription.generateName_ = function() { - return 'autogenerated-' + uuid.v4(); +Subscription.prototype.ack_ = function(message) { + this.breakLease_(message); + this.histogram.add(Date.now() - message.received); + + if (!this.connectionPool || !this.connectionPool.isConnected()) { + this.inventory_.ack.push(message.ackId); + this.setFlushTimeout_(); + return; + } + + var self = this; + + this.connectionPool.acquire(message.connectionId, function(err, connection) { + if (err) { + self.emit('error', err); + return; + } + + connection.write({ ackIds: [message.ackId] }); + }); }; /** - * Acknowledge to the backend that the message was retrieved. You must provide - * either a single ackId or an array of ackIds. + * Breaks the lease on a message. Essentially this means we no longer treat the + * message as being un-acked and count it towards the flow control limits. * - * @resource [Subscriptions: acknowledge API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/acknowledge} + * If the pool was previously paused and we freed up space, we'll continue to + * recieve messages. * - * @throws {Error} If at least one ackId is not provided. + * @private + * + * @param {object} message - The message object. + */ +Subscription.prototype.breakLease_ = function(message) { + var messageIndex = this.inventory_.lease.indexOf(message.ackId); + + this.inventory_.lease.splice(messageIndex, 1); + this.inventory_.bytes -= message.length; + + if (this.connectionPool) { + if (this.connectionPool.isPaused && !this.hasMaxMessages_()) { + this.connectionPool.resume(); + } + } + + if (!this.inventory_.lease.length) { + clearTimeout(this.leaseTimeoutHandle_); + this.leaseTimeoutHandle_ = null; + } +}; + +/** + * Closes the subscription, once this is called you will no longer receive + * message events unless you add a new message listener. * - * @param {string|string[]} ackIds - An ackId or array of ackIds. - * @param {options=} options - Configuration object. - * @param {number} options.timeout - Set a maximum amount of time in - * milliseconds before giving up if no response is received. * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error returned while closing the + * Subscription. * * @example - * var ackId = 'ePHEESyhuE8e...'; - * - * subscription.ack(ackId, function(err, apiResponse) {}); + * subscription.close(function(err) { + * if (err) { + * // Error handling omitted. + * } + * }); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.ack(ackId).then(function(data) { - * var apiResponse = data[0]; - * }); + * subscription.close().then(function() {}); */ -Subscription.prototype.ack = function(ackIds, options, callback) { - var self = this; - - ackIds = arrify(ackIds); - - if (ackIds.length === 0) { - throw new Error([ - 'At least one ID must be specified before it can be acknowledged.' - ].join('')); - } +Subscription.prototype.close = function(callback) { + this.userClosed_ = true; - if (is.fn(options)) { - callback = options; - options = {}; - } + clearTimeout(this.leaseTimeoutHandle_); + this.leaseTimeoutHandle_ = null; - options = options || {}; - callback = callback || common.util.noop; + clearTimeout(this.flushTimeoutHandle_); + this.flushTimeoutHandle_ = null; - var protoOpts = { - service: 'Subscriber', - method: 'acknowledge' - }; + this.flushQueues_(); + this.closeConnection_(callback); +}; - if (options && is.number(options.timeout)) { - protoOpts.timeout = options.timeout; +/** + * Closes the connection pool. + * + * @private + * + * @param {function=} callback - The callback function. + * @param {?error} err - An error returned from this request. + */ +Subscription.prototype.closeConnection_ = function(callback) { + if (this.connectionPool) { + this.connectionPool.close(callback || common.util.noop); + this.connectionPool = null; + } else if (is.fn(callback)) { + setImmediate(callback); } - - var reqOpts = { - subscription: this.name, - ackIds: ackIds - }; - - this.parent.request(protoOpts, reqOpts, function(err, resp) { - if (!err) { - ackIds.forEach(function(ackId) { - delete self.inProgressAckIds[ackId]; - }); - - self.refreshPausedStatus_(); - } - - callback(err, resp); - }); }; /** * Create a snapshot with the given name. * * @param {string} name - Name of the snapshot. + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {function=} callback - The callback function. * @param {?error} callback.err - An error from the API call, may be null. * @param {module:pubsub/snapshot} callback.snapshot - The newly created @@ -511,72 +385,49 @@ Subscription.prototype.ack = function(ackIds, options, callback) { * var apiResponse = data[1]; * }); */ -Subscription.prototype.createSnapshot = function(name, callback) { +Subscription.prototype.createSnapshot = function(name, gaxOpts, callback) { var self = this; if (!is.string(name)) { throw new Error('A name is required to create a snapshot.'); } - var protoOpts = { - service: 'Subscriber', - method: 'createSnapshot' - }; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + + var snapshot = self.snapshot(name); var reqOpts = { - name: Snapshot.formatName_(this.parent.projectId, name), + name: snapshot.name, subscription: this.name }; - this.parent.request(protoOpts, reqOpts, function(err, resp) { + this.request({ + client: 'subscriberClient', + method: 'createSnapshot', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function(err, resp) { if (err) { callback(err, null, resp); return; } - var snapshot = self.snapshot(name); snapshot.metadata = resp; - callback(null, snapshot, resp); }); }; -/** - * Add functionality on top of a message returned from the API, including the - * ability to `ack` and `skip` the message. - * - * This also records the message as being "in progress". See - * {module:subscription#refreshPausedStatus_}. - * - * @private - * - * @param {object} message - A message object. - * @return {object} message - The original message after being decorated. - * @param {function} message.ack - Ack the message. - * @param {function} message.skip - Increate the number of available messages to - * simultaneously receive. - */ -Subscription.prototype.decorateMessage_ = function(message) { - var self = this; - - this.inProgressAckIds[message.ackId] = true; - - message.ack = self.ack.bind(self, message.ackId); - - message.skip = function() { - delete self.inProgressAckIds[message.ackId]; - self.refreshPausedStatus_(); - }; - - return message; -}; - /** * Delete the subscription. Pull requests from the current subscription will be * errored once unsubscription is complete. * * @resource [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete} * + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {function=} callback - The callback function. * @param {?error} callback.err - An error returned while making this * request. @@ -592,265 +443,277 @@ Subscription.prototype.decorateMessage_ = function(message) { * var apiResponse = data[0]; * }); */ -Subscription.prototype.delete = function(callback) { +Subscription.prototype.delete = function(gaxOpts, callback) { var self = this; - callback = callback || common.util.noop; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } - var protoOpts = { - service: 'Subscriber', - method: 'deleteSubscription' - }; + callback = callback || common.util.noop; var reqOpts = { subscription: this.name }; - this.parent.request(protoOpts, reqOpts, function(err, resp) { - if (err) { - callback(err, resp); - return; + this.request({ + client: 'subscriberClient', + method: 'deleteSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function(err, resp) { + if (!err) { + self.removeAllListeners(); + self.close(); } - self.closed = true; - self.removeAllListeners(); - - callback(null, resp); + callback(err, resp); }); }; /** - * Pull messages from the subscribed topic. If messages were found, your - * callback is executed with an array of message objects. - * - * Note that messages are pulled automatically once you register your first - * event listener to the subscription, thus the call to `pull` is handled for - * you. If you don't want to start pulling, simply don't register a - * `subscription.on('message', function() {})` event handler. - * - * @todo Should not be racing with other pull. - * - * @resource [Subscriptions: pull API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/pull} + * Check if a subscription exists. * - * @param {object=} options - Configuration object. - * @param {number} options.maxResults - Limit the amount of messages pulled. - * @param {boolean} options.returnImmediately - If set, the system will respond - * immediately. Otherwise, wait until new messages are available. Returns if - * timeout is reached. * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {boolean} callback.exists - Whether the subscription exists or not. * * @example + * subscription.exists(function(err, exists) {}); + * * //- - * // Pull all available messages. + * // If the callback is omitted, we'll return a Promise. * //- - * subscription.pull(function(err, messages) { - * // messages = [ - * // { - * // ackId: '', // ID used to acknowledge its receival. - * // id: '', // Unique message ID. - * // data: '', // Contents of the message. - * // attributes: {} // Attributes of the message. - * // - * // Helper functions: - * // ack(callback): // Ack the message. - * // skip(): // Free up 1 slot on the sub's maxInProgress value. - * // }, - * // // ... - * // ] + * subscription.exists().then(function(data) { + * var exists = data[0]; * }); + */ +Subscription.prototype.exists = function(callback) { + this.getMetadata(function(err) { + if (!err) { + callback(null, true); + return; + } + + if (err.code === 5) { + callback(null, false); + return; + } + + callback(err); + }); +}; + +/** + * Flushes internal queues. These can build up if a user attempts to ack/nack + * while there is no connection pool (e.g. after they called close). * - * //- - * // Pull a single message. - * //- - * var opts = { - * maxResults: 1 - * }; + * Typically this will only be called either after a timeout or when a + * connection is re-opened. * - * subscription.pull(opts, function(err, messages, apiResponse) {}); + * Any errors that occur will be emitted via `error` events. * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.pull(opts).then(function(data) { - * var messages = data[0]; - * var apiResponse = data[1]; - * }); + * @private */ -Subscription.prototype.pull = function(options, callback) { +Subscription.prototype.flushQueues_ = function() { var self = this; - var MAX_EVENTS_LIMIT = 1000; - if (!callback) { - callback = options; - options = {}; - } + var acks = this.inventory_.ack; + var nacks = this.inventory_.nack; - if (!is.number(options.maxResults)) { - options.maxResults = MAX_EVENTS_LIMIT; + if (!acks.length && !nacks.length) { + return; } - var protoOpts = { - service: 'Subscriber', - method: 'pull', - timeout: this.timeout - }; - - var reqOpts = { - subscription: this.name, - returnImmediately: !!options.returnImmediately, - maxMessages: options.maxResults - }; + if (this.connectionPool) { + this.connectionPool.acquire(function(err, connection) { + if (err) { + self.emit('error', err); + return; + } - this.activeRequest_ = this.parent.request(protoOpts, reqOpts, function(err) { - self.activeRequest_ = null; + var reqOpts = {}; - var resp = arguments[1]; + if (acks.length) { + reqOpts.ackIds = acks; + } - if (err) { - if (err.code === 504) { - // Simulate a server timeout where no messages were received. - resp = { - receivedMessages: [] - }; - } else { - callback(err, null, resp); - return; + if (nacks.length) { + reqOpts.modifyDeadlineAckIds = nacks; + reqOpts.modifyDeadlineSeconds = Array(nacks.length).fill(0); } - } - var messages = arrify(resp.receivedMessages) - .map(function(msg) { - return Subscription.formatMessage_(msg, self.encoding); - }) - .map(self.decorateMessage_.bind(self)); + connection.write(reqOpts); - self.refreshPausedStatus_(); + self.inventory_.ack = []; + self.inventory_.nack = []; + }); + return; + } - if (self.autoAck && messages.length !== 0) { - var ackIds = messages.map(prop('ackId')); + if (acks.length) { + this.request({ + client: 'subscriberClient', + method: 'acknowledge', + reqOpts: { + subscription: this.name, + ackIds: acks + } + }, function(err) { + if (err) { + self.emit('error', err); + } else { + self.inventory_.ack = []; + } + }); + } - self.ack(ackIds, function(err) { - callback(err, messages, resp); - }); - } else { - callback(null, messages, resp); - } - }); + if (nacks.length) { + this.request({ + client: 'subscriberClient', + method: 'modifyAckDeadline', + reqOpts: { + subscription: this.name, + ackIds: nacks, + ackDeadlineSeconds: 0 + } + }, function(err) { + if (err) { + self.emit('error', err); + } else { + self.inventory_.nack = []; + } + }); + } }; /** - * Seeks an existing subscription to a point in time or a given snapshot. + * Get a subscription if it exists. * - * @param {string|date} snapshot - The point to seek to. This will accept the - * name of the snapshot or a Date object. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {object} callback.apiResponse - The full API response from the - * service. + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {boolean} gaxOpts.autoCreate - Automatically create the subscription + * does not already exist. Default: false. * * @example - * var callback = function(err, resp) { - * if (!err) { - * // Seek was successful. - * } - * }; - * - * subscription.seek('my-snapshot', callback); + * subscription.get(function(err, subscription, apiResponse) { + * // The `subscription` data has been populated. + * }); * * //- - * // Alternatively, to specify a certain point in time, you can provide a Date - * // object. + * // If the callback is omitted, we'll return a Promise. * //- - * var date = new Date('October 21 2015'); - * - * subscription.seek(date, callback); + * subscription.get().then(function(data) { + * var subscription = data[0]; + * var apiResponse = data[1]; + * }); */ -Subscription.prototype.seek = function(snapshot, callback) { - var protoOpts = { - service: 'Subscriber', - method: 'seek' - }; - - var reqOpts = { - subscription: this.name - }; +Subscription.prototype.get = function(gaxOpts, callback) { + var self = this; - if (is.string(snapshot)) { - reqOpts.snapshot = Snapshot.formatName_(this.parent.projectId, snapshot); - } else if (is.date(snapshot)) { - reqOpts.time = { - seconds: Math.floor(snapshot.getTime() / 1000), - nanos: snapshot.getMilliseconds() * 1e6 - }; - } else { - throw new Error('Either a snapshot name or Date is needed to seek to.'); + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; } - this.parent.request(protoOpts, reqOpts, callback); + var autoCreate = !!gaxOpts.autoCreate && is.fn(this.create); + delete gaxOpts.autoCreate; + + this.getMetadata(gaxOpts, function(err, apiResponse) { + if (!err) { + callback(null, self, apiResponse); + return; + } + + if (err.code !== 5 || !autoCreate) { + callback(err, null, apiResponse); + return; + } + + self.create(gaxOpts, callback); + }); }; /** - * Modify the ack deadline for a specific message. This method is useful to - * indicate that more time is needed to process a message by the subscriber, or - * to make the message available for redelivery if the processing was - * interrupted. + * Fetches the subscriptions metadata. * - * @resource [Subscriptions: modifyAckDeadline API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/modifyAckDeadline} - * - * @param {object} options - The configuration object. - * @param {string|string[]} options.ackIds - The ack id(s) to change. - * @param {number} options.seconds - Number of seconds after call is made to - * set the deadline of the ack. - * @param {Function=} callback - The callback function. + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {object} callback.apiResponse - Raw API response. * * @example - * var options = { - * ackIds: ['abc'], - * seconds: 10 // Expire in 10 seconds from call. - * }; - * - * subscription.setAckDeadline(options, function(err, apiResponse) {}); + * subscription.getMetadata(function(err, apiResponse) { + * if (err) { + * // Error handling omitted. + * } + * }); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.setAckDeadline(options).then(function(data) { + * subscription.getMetadata().then(function(data) { * var apiResponse = data[0]; * }); */ -Subscription.prototype.setAckDeadline = function(options, callback) { - callback = callback || common.util.noop; +Subscription.prototype.getMetadata = function(gaxOpts, callback) { + var self = this; - var protoOpts = { - service: 'Subscriber', - method: 'modifyAckDeadline' - }; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } var reqOpts = { - subscription: this.name, - ackIds: arrify(options.ackIds), - ackDeadlineSeconds: options.seconds + subscription: this.name }; - this.parent.request(protoOpts, reqOpts, function(err, resp) { - callback(err, resp); + this.request({ + client: 'subscriberClient', + method: 'getSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function(err, apiResponse) { + if (!err) { + self.metadata = apiResponse; + } + + callback(err, apiResponse); }); }; /** - * Create a Snapshot object. See {module:pubsub/subscription#createSnapshot} to - * create a snapshot. + * Checks to see if this Subscription has hit any of the flow control + * thresholds. * - * @throws {Error} If a name is not provided. + * @private * - * @param {string} name - The name of the snapshot. - * @return {module:pubsub/snapshot} + * @return {boolean} + */ +Subscription.prototype.hasMaxMessages_ = function() { + return this.inventory_.lease.length >= this.flowControl.maxMessages || + this.inventory_.bytes >= this.flowControl.maxBytes; +}; + +/** + * Leases a message. This will add the message to our inventory list and then + * modifiy the ack deadline for the user if they exceed the specified ack + * deadline. * - * @example - * var snapshot = subscription.snapshot('my-snapshot'); + * @private + * + * @param {object} message - The message object. */ -Subscription.prototype.snapshot = function(name) { - return this.parent.snapshot.call(this, name); +Subscription.prototype.leaseMessage_ = function(message) { + this.inventory_.lease.push(message.ackId); + this.inventory_.bytes += message.length; + this.setLeaseTimeout_(); + + return message; }; /** @@ -872,92 +735,332 @@ Subscription.prototype.listenForEvents_ = function() { this.on('newListener', function(event) { if (event === 'message') { self.messageListeners++; - if (self.closed) { - self.closed = false; - self.startPulling_(); + + if (!self.connectionPool) { + self.userClosed_ = false; + self.openConnection_(); } } }); this.on('removeListener', function(event) { if (event === 'message' && --self.messageListeners === 0) { - self.closed = true; + self.closeConnection_(); + } + }); +}; - if (self.activeRequest_ && self.activeRequest_.abort) { - self.activeRequest_.abort(); - } +/** + * Modify the push config for the subscription. + * + * @param {object} config - The push config. + * @param {string} config.pushEndpoint - A URL locating the endpoint to which + * messages should be published. + * @param {object} config.attributes - [PushConfig attributes](https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#google.pubsub.v1.PushConfig). + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error from the API call. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * var pushConfig = { + * pushEndpoint: 'https://mydomain.com/push', + * attributes: { + * key: 'value' + * } + * }; + * + * subscription.modifyPushConfig(pushConfig, function(err, apiResponse) { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.modifyPushConfig(pushConfig).then(function(data) { + * var apiResponse = data[0]; + * }); + */ +Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + + var reqOpts = { + subscription: this.name, + pushConfig: config + }; + + this.request({ + client: 'subscriberClient', + method: 'modifyPushConfig', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, callback); +}; + +/** + * Nacks the provided message. If the connection pool is absent, it will be + * placed in an internal queue and sent out after 1 second or if the pool is + * re-opened before the timeout hits. + * + * @private + * + * @param {object} message - The message object. + */ +Subscription.prototype.nack_ = function(message) { + this.breakLease_(message); + + if (!this.connectionPool || !this.connectionPool.isConnected()) { + this.inventory_.nack.push(message.ackId); + this.setFlushTimeout_(); + return; + } + + var self = this; + + this.connectionPool.acquire(message.connectionId, function(err, connection) { + if (err) { + self.emit('error', err); + return; } + + connection.write({ + modifyDeadlineAckIds: [message.ackId], + modifyDeadlineSeconds: [0] + }); }); }; /** - * Update the status of `maxInProgress`. Å subscription becomes "paused" (not - * pulling) when the number of messages that have yet to be ack'd or skipped - * exceeds the user's specified `maxInProgress` value. + * Opens the ConnectionPool. * - * This will start pulling when that event reverses: we were paused, but one or - * more messages were just ack'd or skipped, freeing up room for more messages - * to be consumed. + * @private + */ +Subscription.prototype.openConnection_ = function() { + var self = this; + var pool = this.connectionPool = new ConnectionPool(this); + + pool.on('error', function(err) { + self.emit('error', err); + }); + + pool.on('message', function(message) { + self.emit('message', self.leaseMessage_(message)); + + if (self.hasMaxMessages_() && !pool.isPaused) { + pool.pause(); + } + }); + + pool.once('connected', function() { + clearTimeout(self.flushTimeoutHandle_); + self.flushTimeoutHandle_ = null; + self.flushQueues_(); + }); +}; + +/** + * Modifies the ack deadline on messages that have yet to be acked. We update + * the ack deadline to the 99th percentile of known ack times. * * @private */ -Subscription.prototype.refreshPausedStatus_ = function() { - var isCurrentlyPaused = this.paused; - var inProgress = Object.keys(this.inProgressAckIds).length; +Subscription.prototype.renewLeases_ = function() { + var self = this; - this.paused = inProgress >= this.maxInProgress; + this.leaseTimeoutHandle_ = null; - if (isCurrentlyPaused && !this.paused && this.messageListeners > 0) { - this.startPulling_(); + if (!this.inventory_.lease.length) { + return; } + + var ackIds = this.inventory_.lease; + this.ackDeadline = this.histogram.percentile(99); + var ackDeadlineSeconds = this.ackDeadline / 1000; + + if (this.connectionPool) { + this.connectionPool.acquire(function(err, connection) { + if (err) { + self.emit('error', err); + return; + } + + connection.write({ + modifyDeadlineAckIds: ackIds, + modifyDeadlineSeconds: Array(ackIds.length).fill(ackDeadlineSeconds) + }); + }); + } else { + this.request({ + client: 'subscriberClient', + method: 'modifyAckDeadline', + reqOpts: { + subscription: self.name, + ackIds: ackIds, + ackDeadlineSeconds: ackDeadlineSeconds + } + }, function(err) { + if (err) { + self.emit('error', err); + } + }); + } + + this.setLeaseTimeout_(); }; /** - * Poll the backend for new messages. This runs a loop to ping the API at the - * provided interval from the subscription's instantiation. If one wasn't - * provided, the default value is 10 milliseconds. + * Seeks an existing subscription to a point in time or a given snapshot. * - * If messages are received, they are emitted on the `message` event. + * @param {string|date} snapshot - The point to seek to. This will accept the + * name of the snapshot or a Date object. + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error from the API call, may be null. + * @param {object} callback.apiResponse - The full API response from the + * service. * - * Note: This method is automatically called once a message event handler is - * assigned to the description. + * @example + * var callback = function(err, resp) { + * if (!err) { + * // Seek was successful. + * } + * }; * - * To stop pulling, see {module:pubsub/subscription#close}. + * subscription.seek('my-snapshot', callback); * - * @private + * //- + * // Alternatively, to specify a certain point in time, you can provide a Date + * // object. + * //- + * var date = new Date('October 21 2015'); * - * @example - * subscription.startPulling_(); + * subscription.seek(date, callback); */ -Subscription.prototype.startPulling_ = function() { - var self = this; +Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } - if (this.closed || this.paused) { + var reqOpts = { + subscription: this.name + }; + + if (is.string(snapshot)) { + reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); + } else if (is.date(snapshot)) { + reqOpts.time = snapshot; + } else { + throw new Error('Either a snapshot name or Date is needed to seek to.'); + } + + this.request({ + client: 'subscriberClient', + method: 'seek', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, callback); +}; + +/** + * Sets a timeout to flush any acks/nacks that have been made since the pool has + * closed. + * + * @private + */ +Subscription.prototype.setFlushTimeout_ = function() { + if (this.flushTimeoutHandle_) { return; } - var maxResults; + this.flushTimeoutHandle_ = setTimeout(this.flushQueues_.bind(this), 1000); +}; - if (this.maxInProgress < Infinity) { - maxResults = this.maxInProgress - Object.keys(this.inProgressAckIds).length; +/** + * Sets a timeout to modify the ack deadlines for any unacked/unnacked messages, + * renewing their lease. + * + * @private + */ +Subscription.prototype.setLeaseTimeout_ = function() { + if (this.leaseTimeoutHandle_) { + return; } - this.pull({ - returnImmediately: false, - maxResults: maxResults - }, function(err, messages, apiResponse) { - if (err) { - self.emit('error', err, apiResponse); - } + var timeout = Math.random() * this.ackDeadline * 0.9; + this.leaseTimeoutHandle_ = setTimeout(this.renewLeases_.bind(this), timeout); +}; - if (messages) { - messages.forEach(function(message) { - self.emit('message', message, apiResponse); - }); - } +/** + * Update the subscription object. + * + * @param {object} metadata - The subscription metadata. + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error from the API call. + * @param {object} callback.apiResponse - The full API response from the + * service. + * + * @example + * var metadata = { + * key: 'value' + * }; + * + * subscription.setMetadata(metadata, function(err, apiResponse) { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.setMetadata(metadata).then(function(data) { + * var apiResponse = data[0]; + * }); + */ +Subscription.prototype.setMetadata = function(metadata, gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } - setTimeout(self.startPulling_.bind(self), self.interval); - }); + var reqOpts = { + subscription: this.name, + updateMask: metadata + }; + + this.request({ + client: 'subscriberClient', + method: 'updateSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, callback); +}; + +/** + * Create a Snapshot object. See {module:pubsub/subscription#createSnapshot} to + * create a snapshot. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name - The name of the snapshot. + * @return {module:pubsub/snapshot} + * + * @example + * var snapshot = subscription.snapshot('my-snapshot'); + */ +Subscription.prototype.snapshot = function(name) { + return this.pubsub.snapshot.call(this, name); }; /*! Developer Documentation diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 812a6ce92bf..6fe37cb300b 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -1,5 +1,5 @@ /*! - * Copyright 2014 Google Inc. All Rights Reserved. + * Copyright 2017 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,12 +20,9 @@ 'use strict'; -var arrify = require('arrify'); var common = require('@google-cloud/common'); -var commonGrpc = require('@google-cloud/common-grpc'); var extend = require('extend'); var is = require('is'); -var util = require('util'); /** * @type {module:pubsub/iam} @@ -33,6 +30,12 @@ var util = require('util'); */ var IAM = require('./iam.js'); +/** + * @type {module:pubsub/publisher} + * @private + */ +var Publisher = require('./publisher.js'); + /*! Developer Documentation * * @param {module:pubsub} pubsub - PubSub object. @@ -49,143 +52,8 @@ var IAM = require('./iam.js'); */ function Topic(pubsub, name) { this.name = Topic.formatName_(pubsub.projectId, name); - - var methods = { - /** - * Create a topic. - * - * @param {object=} config - See {module:pubsub#createTopic}. - * - * @example - * topic.create(function(err, topic, apiResponse) { - * if (!err) { - * // The topic was created successfully. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.create().then(function(data) { - * var topic = data[0]; - * var apiResponse = data[1]; - * }); - */ - create: true, - - /** - * Delete the topic. This will not delete subscriptions to this topic. - * - * @resource [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete} - * - * @param {function=} callback - The callback function. - * - * @example - * topic.delete(function(err, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.delete().then(function(data) { - * var apiResponse = data[0]; - * }); - */ - delete: { - protoOpts: { - service: 'Publisher', - method: 'deleteTopic' - }, - reqOpts: { - topic: this.name - } - }, - - /** - * Check if the topic exists. - * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {boolean} callback.exists - Whether the topic exists or not. - * - * @example - * topic.exists(function(err, exists) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.exists().then(function(data) { - * var exists = data[0]; - * }); - */ - exists: true, - - /** - * Get a topic if it exists. - * - * You may optionally use this to "get or create" an object by providing an - * object with `autoCreate` set to `true`. Any extra configuration that is - * normally required for the `create` method must be contained within this - * object as well. - * - * @param {options=} options - Configuration object. - * @param {boolean} options.autoCreate - Automatically create the object if - * it does not exist. Default: `false` - * - * @example - * topic.get(function(err, topic, apiResponse) { - * // `topic.metadata` has been populated. - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.get().then(function(data) { - * var topic = data[0]; - * var apiResponse = data[1]; - * }); - */ - get: true, - - /** - * Get the official representation of this topic from the API. - * - * @resource [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get} - * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {object} callback.metadata - The metadata of the Topic. - * @param {object} callback.apiResponse - The full API response. - * - * @example - * topic.getMetadata(function(err, metadata, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.getMetadata().then(function(data) { - * var metadata = data[0]; - * var apiResponse = data[1]; - * }); - */ - getMetadata: { - protoOpts: { - service: 'Publisher', - method: 'getTopic' - }, - reqOpts: { - topic: this.name - } - } - }; - - commonGrpc.ServiceObject.call(this, { - parent: pubsub, - id: this.name, - createMethod: pubsub.createTopic.bind(pubsub), - methods: methods - }); + this.pubsub = pubsub; + this.request = pubsub.request.bind(pubsub); /** * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) @@ -224,39 +92,275 @@ function Topic(pubsub, name) { this.iam = new IAM(pubsub, this.name); } -util.inherits(Topic, commonGrpc.ServiceObject); - /** - * Format a message object as the upstream API expects it. + * Format the name of a topic. A Topic's full name is in the format of + * 'projects/{projectId}/topics/{topicName}'. * * @private * - * @return {object} + * @return {string} */ -Topic.formatMessage_ = function(message) { - if (!(message.data instanceof Buffer)) { - message.data = new Buffer(JSON.stringify(message.data)); +Topic.formatName_ = function(projectId, name) { + // Simple check if the name is already formatted. + if (name.indexOf('/') > -1) { + return name; } + return 'projects/' + projectId + '/topics/' + name; +}; - message.data = message.data.toString('base64'); +/** + * Create a topic. + * + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function=} callback - The callback function. + * @param {?error} callback.err - An error returned while making this request. + * @param {module:pubsub/topic} callback.topic - The topic. + * @param {object} callback.apiResponse - The full API response. + * + * @example + * topic.create(function(err, topic, apiResponse) { + * if (!err) { + * // The topic was created successfully. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.create().then(function(data) { + * var topic = data[0]; + * var apiResponse = data[1]; + * }); + */ +Topic.prototype.create = function(gaxOpts, callback) { + this.pubsub.createTopic(this.name, gaxOpts, callback); +}; - return message; +/** + * Create a subscription to this topic. + * + * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * + * @throws {Error} If subscription name is omitted. + * + * @param {string=} name - The name of the subscription. + * @param {object=} options - See a + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) + * @param {number} options.ackDeadline - The maximum time after receiving a + * message that you must ack a message before it is redelivered. + * @param {object} options.flowControl - Flow control configurations for + * receiving messages. + * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @param {number} options.flowControl.maxMessages - The maximum number of + * un-acked messages to allow before the subscription pauses incoming + * messages. Default: Infinity. + * @param {object} options.gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {number|date} options.messageRetentionDuration - Set this to override + * the default duration of 7 days. This value is expected in seconds. + * Acceptable values are in the range of 10 minutes and 7 days. + * @param {string} options.pushEndpoint - A URL to a custom endpoint that + * messages should be pushed to. + * @param {boolean} options.retainAckedMessages - If set, acked messages are + * retained in the subscription's backlog for 7 days (unless overriden by + * `options.messageRetentionDuration`). Default: `false` + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this request. + * @param {module:pubsub/subscription} callback.subscription - The subscription. + * @param {object} callback.apiResponse - The full API response. + * + * @example + * var callback = function(err, subscription, apiResponse) {}; + * + * // Without specifying any options. + * topic.createSubscription('newMessages', callback); + * + * // With options. + * topic.createSubscription('newMessages', { + * ackDeadline: 90000 // 90 seconds + * }, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.createSubscription('newMessages').then(function(data) { + * var subscription = data[0]; + * var apiResponse = data[1]; + * }); + */ +Topic.prototype.createSubscription = function(name, options, callback) { + this.pubsub.createSubscription(this, name, options, callback); }; /** - * Format the name of a topic. A Topic's full name is in the format of - * 'projects/{projectId}/topics/{topicName}'. + * Delete the topic. This will not delete subscriptions to this topic. * - * @private + * @resource [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete} * - * @return {string} + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function=} callback - The callback function. + * + * @example + * topic.delete(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.delete().then(function(data) { + * var apiResponse = data[0]; + * }); */ -Topic.formatName_ = function(projectId, name) { - // Simple check if the name is already formatted. - if (name.indexOf('/') > -1) { - return name; +Topic.prototype.delete = function(gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; } - return 'projects/' + projectId + '/topics/' + name; + + callback = callback || common.util.noop; + + var reqOpts = { + topic: this.name + }; + + this.request({ + client: 'publisherClient', + method: 'deleteTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, callback); +}; + +/** + * Check if a topic exists. + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {boolean} callback.exists - Whether the topic exists or not. + * + * @example + * topic.exists(function(err, exists) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.exists().then(function(data) { + * var exists = data[0]; + * }); + */ +Topic.prototype.exists = function(callback) { + this.getMetadata(function(err) { + if (!err) { + callback(null, true); + return; + } + + if (err.code === 5) { + callback(null, false); + return; + } + + callback(err); + }); +}; + +/** + * Get a topic if it exists. + * + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {boolean} gaxOpts.autoCreate - Automatically create the topic does not + * already exist. Default: false. + * + * @example + * topic.get(function(err, topic, apiResponse) { + * // The `topic` data has been populated. + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.get().then(function(data) { + * var topic = data[0]; + * var apiResponse = data[1]; + * }); + */ +Topic.prototype.get = function(gaxOpts, callback) { + var self = this; + + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + + var autoCreate = !!gaxOpts.autoCreate; + delete gaxOpts.autoCreate; + + this.getMetadata(gaxOpts, function(err, apiResponse) { + if (!err) { + callback(null, self, apiResponse); + return; + } + + if (err.code !== 5 || !autoCreate) { + callback(err, null, apiResponse); + return; + } + + self.create(gaxOpts, callback); + }); +}; + +/** + * Get the official representation of this topic from the API. + * + * @resource [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get} + * + * @param {object=} gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {object} callback.apiResponse - The full API response. + * + * @example + * topic.getMetadata(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.getMetadata().then(function(data) { + * var apiResponse = data[0]; + * }); + */ +Topic.prototype.getMetadata = function(gaxOpts, callback) { + var self = this; + + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + + var reqOpts = { + topic: this.name + }; + + this.request({ + client: 'publisherClient', + method: 'getTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function(err, apiResponse) { + if (!err) { + self.metadata = apiResponse; + } + + callback(err, apiResponse); + }); }; /** @@ -271,11 +375,15 @@ Topic.formatName_ = function(projectId, name) { * @param {object=} options - Configuration object. * @param {boolean} options.autoPaginate - Have pagination handled * automatically. Default: true. - * @param {number} options.maxApiCalls - Maximum number of API calls to make. - * @param {number} options.maxResults - Maximum number of results to return. + * @param {object} options.gaxOpts - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {number} options.pageSize - Maximum number of results to return. * @param {string} options.pageToken - Page token. * @param {function} callback - The callback function. + * @param {?error} callback.err - An error returned while making this + * request. + * @param {module:pubsub/subscription[]} callback.subscriptions - List of + * subscriptions. * * @example * topic.getSubscriptions(function(err, subscriptions) { @@ -288,21 +396,6 @@ Topic.formatName_ = function(projectId, name) { * }, callback); * * //- - * // To control how many API requests are made and page through the results - * // manually, set `autoPaginate` to `false`. - * //- - * function callback(err, subscriptions, nextQuery, apiResponse) { - * if (nextQuery) { - * // More results exist. - * topic.getSubscriptions(nextQuery, callback); - * } - * } - * - * topic.getSubscriptions({ - * autoPaginate: false - * }, callback); - * - * //- * // If the callback is omitted, we'll return a Promise. * //- * topic.getSubscriptions().then(function(data) { @@ -310,15 +403,41 @@ Topic.formatName_ = function(projectId, name) { * }); */ Topic.prototype.getSubscriptions = function(options, callback) { + var self = this; + if (is.fn(options)) { callback = options; options = {}; } - options = options || {}; - options.topic = this; + var reqOpts = extend({ + topic: this.name + }, options); + + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + + var gaxOpts = extend({ + autoPaginate: options.autoPaginate + }, options.gaxOpts); + + this.request({ + client: 'publisherClient', + method: 'listTopicSubscriptions', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function() { + var subscriptions = arguments[1]; + + if (subscriptions) { + arguments[1] = subscriptions.map(function(sub) { + // ListTopicSubscriptions only returns sub names + return self.subscription(sub); + }); + } - return this.parent.getSubscriptions(options, callback); + callback.apply(null, arguments); + }); }; /** @@ -348,205 +467,32 @@ Topic.prototype.getSubscriptions = function(options, callback) { * this.end(); * }); */ -Topic.prototype.getSubscriptionsStream = function(options) { - options = options || {}; - options.topic = this; - - return this.parent.getSubscriptionsStream(options); -}; +Topic.prototype.getSubscriptionsStream = + common.paginator.streamify('getSubscriptions'); /** - * Publish the provided message or array of messages. On success, an array of - * messageIds is returned in the response. - * - * @resource [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} + * Creates a Publisher object that allows you to publish messages to this topic. * - * @throws {Error} If no message is provided. - * - * @param {*|*[]} message - The message(s) to publish. If you need to - * provide attributes for the message, you must enable `options.raw`, then - * box your message in to an object with a `data` and `attributes` property. - * `data` will be the raw message value you want to publish, and - * `attributes` is a key/value pair of attributes to apply to the message. - * All messages not provided as `Buffer` will be published in JSON format. - * If your receiving end uses another library, make sure it parses the - * message properly. * @param {object=} options - Configuration object. - * @param {boolean} options.raw - Enable if you require setting attributes on - * your messages. - * @param {number} options.timeout - Set a maximum amount of time in - * milliseconds before giving up if no response is received. - * @param {function=} callback - The callback function. + * @param {object} options.batching - Batching settings. + * @param {number} options.batching.maxBytes - The maximum number of bytes to + * buffer before sending a payload. + * @param {number} options.batching.maxMessages - The maximum number of messages + * to buffer before sending a payload. + * @param {number} options.batching.maxMilliseconds - The maximum duration to + * wait before sending a payload. * * @example - * topic.publish('Hello, world!', function(err, messageIds, apiResponse) {}); - * - * //- - * // You can also publish a JSON object. - * //- - * var registerMessage = { - * userId: 3, - * name: 'Stephen', - * event: 'new user' - * }; - * - * topic.publish(registerMessage, function(err, messageIds, apiResponse) {}); - * - * //- - * // You can publish a batch of messages at once by supplying an array. - * //- - * var purchaseMessage = { - * data: { - * userId: 3, - * product: 'computer', - * event: 'purchase' - * } - * }; + * var publisher = topic.publisher(); * - * topic.publish([ - * registerMessage, - * purchaseMessage - * ], function(err, messageIds, apiResponse) {}); - * - * //- - * // Set attributes with your message. - * //- - * var message = { - * data: { - * userId: 3, - * product: 'book', - * event: 'rent' - * }, - * attributes: { - * key: 'value', - * hello: 'world' + * publisher.publish(new Buffer('Hello, world!'), function(err, messageId) { + * if (err) { + * // Error handling omitted. * } - * }; - * - * var options = { - * raw: true - * }; - * - * topic.publish(message, options, function(err, messageIds, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.publish(message).then(function(data) { - * var messageIds = data[0]; - * var apiResponse = data[1]; - * }); - * - */ -Topic.prototype.publish = function(messages, options, callback) { - messages = arrify(messages); - - if (is.fn(options)) { - callback = options; - options = {}; - } - - options = options || {}; - callback = callback || common.util.noop; - - if (messages.length === 0) { - throw new Error('Cannot publish without a message.'); - } - - var protoOpts = { - service: 'Publisher', - method: 'publish', - }; - - if (is.number(options.timeout)) { - protoOpts.timeout = options.timeout; - } - - var reqOpts = { - topic: this.name, - messages: messages - .map(function(message) { - if (is.object(message)) { - message = extend(true, {}, message); - } - return options.raw ? message : { data: message }; - }) - .map(Topic.formatMessage_) - }; - - this.parent.request(protoOpts, reqOpts, function(err, result) { - if (err) { - callback(err, null, result); - return; - } - - callback(null, arrify(result.messageIds), result); - }); -}; - -/** - * Create a subscription to this topic. - * - * All generated subscription names share a common prefix, `autogenerated-`. - * - * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} - * - * @param {string=} subName - The name of the subscription. If a name is not - * provided, a random subscription name will be generated and created. - * @param {object=} options - See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) - * @param {number} options.ackDeadlineSeconds - The maximum time after - * receiving a message that you must ack a message before it is redelivered. - * @param {boolean=} options.autoAck - Automatically acknowledge the message - * once it's pulled. (default: false) - * @param {string} options.encoding - When pulling for messages, this type is - * used when converting a message's data to a string. (default: 'utf-8') - * @param {number} options.interval - Interval in milliseconds to check for new - * messages. (default: 10) - * @param {number} options.maxInProgress - Maximum messages to consume - * simultaneously. - * @param {number|date} options.messageRetentionDuration - Set this to override - * the default duration of 7 days. This value is expected in seconds. - * Acceptable values are in the range of 10 minutes and 7 days. - * @param {string} options.pushEndpoint - A URL to a custom endpoint that - * messages should be pushed to. - * @param {boolean} options.retainAckedMessages - If set, acked messages are - * retained in the subscription's backlog for 7 days (unless overriden by - * `options.messageRetentionDuration`). Default: `false` - * @param {number} options.timeout - Set a maximum amount of time in - * milliseconds on an HTTP request to pull new messages to wait for a - * response before the connection is broken. - * @param {function} callback - The callback function. - * - * @example - * // Without specifying any options. - * topic.subscribe('newMessages', function(err, subscription, apiResponse) {}); - * - * //- - * // Omit the name to have one generated automatically. All generated names - * // share a common prefix, `autogenerated-`. - * //- - * topic.subscribe(function(err, subscription, apiResponse) { - * // subscription.name = The generated name. - * }); - * - * // With options. - * topic.subscribe('newMessages', { - * ackDeadlineSeconds: 90, - * autoAck: true, - * interval: 30 - * }, function(err, subscription, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.subscribe('newMessages').then(function(data) { - * var subscription = data[0]; - * var apiResponse = data[1]; * }); */ -Topic.prototype.subscribe = function(subName, options, callback) { - this.parent.subscribe(this, subName, options, callback); +Topic.prototype.publisher = function(options) { + return new Publisher(this, options); }; /** @@ -554,12 +500,21 @@ Topic.prototype.subscribe = function(subName, options, callback) { * requests. You will receive a {module:pubsub/subscription} object, * which will allow you to interact with a subscription. * + * @throws {Error} If subscription name is omitted. + * * @param {string} name - Name of the subscription. * @param {object=} options - Configuration object. - * @param {boolean=} options.autoAck - Automatically acknowledge the message - * once it's pulled. - * @param {number=} options.interval - Interval in milliseconds to check for new - * messages. + * @param {object} options.flowControl - Flow control configurations for + * receiving messages. Note that these options do not persist across + * subscription instances. + * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @param {number} options.flowControl.maxMessages - The maximum number of + * un-acked messages to allow before the subscription pauses incoming + * messages. Default: Infinity. + * @param {number} options.maxConnections - Use this to limit the number of + * connections to be used when sending and receiving messages. Default: 5. * @return {module:pubsub/subscription} * * @example @@ -572,23 +527,34 @@ Topic.prototype.subscribe = function(subName, options, callback) { * // message.ackId = ID used to acknowledge the message receival. * // message.data = Contents of the message. * // message.attributes = Attributes of the message. - * // message.timestamp = Timestamp when Pub/Sub received the message. + * // message.publishTime = Timestamp when Pub/Sub received the message. * }); */ Topic.prototype.subscription = function(name, options) { options = options || {}; options.topic = this; - return this.parent.subscription(name, options); + return this.pubsub.subscription(name, options); }; +/*! Developer Documentation + * + * These methods can be agto-paginated. + */ +common.paginator.extend(Topic, [ + 'getSubscriptions' +]); + /*! Developer Documentation * * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ common.util.promisifyAll(Topic, { - exclude: ['subscription'] + exclude: [ + 'publisher', + 'subscription' + ] }); module.exports = Topic; diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 2c8efffba81..a8e53152d79 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -77,7 +77,7 @@ "retry_params_name": "messaging" }, "StreamingPull": { - "timeout_millis": 60000, + "timeout_millis": 900000, "retry_codes_name": "pull", "retry_params_name": "messaging" }, diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 01e0966516c..895eb6d6443 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -64,6 +64,7 @@ describe('pubsub', function() { options = options || {}; var topic = pubsub.topic(generateTopicName()); + var publisher = topic.publisher(); var subscription = topic.subscription(generateSubName()); async.series([ @@ -71,7 +72,7 @@ describe('pubsub', function() { subscription.create.bind(subscription), function(callback) { async.times(6, function(_, callback) { - topic.publish(message, options, callback); + publisher.publish(new Buffer(message), options, callback); }, callback); } ], function(err) { @@ -80,16 +81,10 @@ describe('pubsub', function() { return; } - subscription.pull({ - returnImmediately: true, - maxResults: 1 - }, function(err, messages) { - if (err) { - callback(err); - return; - } + subscription.on('error', callback); - callback(null, messages.pop()); + subscription.once('message', function(message) { + callback(null, message); }); }); } @@ -98,7 +93,14 @@ describe('pubsub', function() { // create all needed topics async.each(TOPICS, function(topic, cb) { topic.create(cb); - }, done); + }, function(err) { + if (err) { + done(err); + return; + } + + setTimeout(done, 5000); + }); }); after(function(done) { @@ -143,12 +145,11 @@ describe('pubsub', function() { it('should allow manual paging', function(done) { pubsub.getTopics({ - pageSize: TOPIC_NAMES.length - 1 - }, function(err, topics, nextQuery) { + pageSize: TOPIC_NAMES.length - 1, + gaxOpts: { autoPaginate: false } + }, function(err, topics) { assert.ifError(err); assert(topics.length, TOPIC_NAMES.length - 1); - assert(nextQuery.pageSize, TOPIC_NAMES.length - 1); - assert(!!nextQuery.pageToken, true); done(); }); }); @@ -161,28 +162,55 @@ describe('pubsub', function() { }); }); + it('should honor the autoCreate option', function(done) { + var topic = pubsub.topic(generateTopicName()); + + topic.get({ autoCreate: true }, done); + }); + + it('should confirm if a topic exists', function(done) { + var topic = pubsub.topic(TOPIC_NAMES[0]); + + topic.exists(function(err, exists) { + assert.ifError(err); + assert.strictEqual(exists, true); + done(); + }); + }); + + it('should confirm if a topic does not exist', function(done) { + var topic = pubsub.topic('should-not-exist'); + + topic.exists(function(err, exists) { + assert.ifError(err); + assert.strictEqual(exists, false); + done(); + }); + }); + it('should publish a message', function(done) { var topic = pubsub.topic(TOPIC_NAMES[0]); - topic.publish('message from me', function(err, messageIds) { + var publisher = topic.publisher(); + var message = new Buffer('message from me'); + + publisher.publish(message, function(err, messageId) { assert.ifError(err); - assert.strictEqual(messageIds.length, 1); + assert.strictEqual(typeof messageId, 'string'); done(); }); }); it('should publish a message with attributes', function(done) { - var rawMessage = { - data: 'raw message data', - attributes: { - customAttribute: 'value' - } + var data = new Buffer('raw message data'); + var attrs = { + customAttribute: 'value' }; - publishPop(rawMessage, { raw: true }, function(err, message) { + publishPop(data, attrs, function(err, message) { assert.ifError(err); - assert.strictEqual(message.data, rawMessage.data); - assert.deepEqual(message.attributes, rawMessage.attributes); + assert.deepEqual(message.data, data); + assert.deepEqual(message.attributes, attrs); done(); }); @@ -201,6 +229,7 @@ describe('pubsub', function() { describe('Subscription', function() { var TOPIC_NAME = generateTopicName(); var topic = pubsub.topic(TOPIC_NAME); + var publisher = topic.publisher(); var SUB_NAMES = [ generateSubName(), @@ -208,8 +237,8 @@ describe('pubsub', function() { ]; var SUBSCRIPTIONS = [ - topic.subscription(SUB_NAMES[0], { ackDeadlineSeconds: 30 }), - topic.subscription(SUB_NAMES[1], { ackDeadlineSeconds: 60 }) + topic.subscription(SUB_NAMES[0], { ackDeadline: 30000 }), + topic.subscription(SUB_NAMES[1], { ackDeadline: 60000 }) ]; before(function(done) { @@ -227,7 +256,7 @@ describe('pubsub', function() { } async.times(10, function(_, next) { - topic.publish('hello', next); + publisher.publish(new Buffer('hello'), next); }, function(err) { if (err) { done(err); @@ -299,24 +328,44 @@ describe('pubsub', function() { it('should allow creation and deletion of a subscription', function(done) { var subName = generateSubName(); - topic.subscribe(subName, function(err, sub) { + topic.createSubscription(subName, function(err, sub) { assert.ifError(err); assert(sub instanceof Subscription); sub.delete(done); }); }); - it('should create a subscription with a generated name', function(done) { - topic.subscribe(function(err, sub) { + it('should honor the autoCreate option', function(done) { + var sub = topic.subscription(generateSubName()); + + sub.get({ autoCreate: true }, done); + }); + + it('should confirm if a sub exists', function(done) { + var sub = topic.subscription(SUB_NAMES[0]); + + sub.exists(function(err, exists) { + assert.ifError(err); + assert.strictEqual(exists, true); + done(); + }); + }); + + it('should confirm if a sub does not exist', function(done) { + var sub = topic.subscription('should-not-exist'); + + sub.exists(function(err, exists) { assert.ifError(err); - sub.delete(done); + assert.strictEqual(exists, false); + done(); }); }); it('should create a subscription with message retention', function(done) { + var subName = generateSubName(); var threeDaysInSeconds = 3 * 24 * 60 * 60; - topic.subscribe({ + topic.createSubscription(subName, { messageRetentionDuration: threeDaysInSeconds }, function(err, sub) { assert.ifError(err); @@ -340,116 +389,67 @@ describe('pubsub', function() { }); it('should re-use an existing subscription', function(done) { - pubsub.subscribe(topic, SUB_NAMES[0], done); + pubsub.createSubscription(topic, SUB_NAMES[0], done); }); it('should error when using a non-existent subscription', function(done) { - var subscription = topic.subscription(generateSubName()); - - subscription.pull(function(err) { - assert.equal(err.code, 404); - done(); + var subscription = topic.subscription(generateSubName(), { + maxConnections: 1 }); - }); - - it('should be able to pull and ack', function(done) { - var subscription = topic.subscription(SUB_NAMES[0]); - subscription.pull({ - returnImmediately: true, - maxResults: 1 - }, function(err, msgs) { - assert.ifError(err); - - assert.strictEqual(msgs.length, 1); - - subscription.ack(msgs[0].ackId, done); + subscription.once('error', function(err) { + assert.strictEqual(err.code, 5); + subscription.close(done); }); - }); - - it('should be able to set a new ack deadline', function(done) { - var subscription = topic.subscription(SUB_NAMES[0]); - - subscription.pull({ - returnImmediately: true, - maxResults: 1 - }, function(err, msgs) { - assert.ifError(err); - assert.strictEqual(msgs.length, 1); - - var options = { - ackIds: [msgs[0].ackId], - seconds: 10 - }; - - subscription.setAckDeadline(options, done); + subscription.on('message', function() { + done(new Error('Should not have been called.')); }); }); - it('should receive the published message', function(done) { + it('should receive the published messages', function(done) { + var messageCount = 0; var subscription = topic.subscription(SUB_NAMES[1]); - subscription.pull({ - returnImmediately: true, - maxResults: 1 - }, function(err, msgs) { - assert.ifError(err); - assert.strictEqual(msgs.length, 1); - assert.equal(msgs[0].data, 'hello'); - subscription.ack(msgs[0].ackId, done); - }); - }); + subscription.on('error', done); - it('should receive the chosen amount of results', function(done) { - var subscription = topic.subscription(SUB_NAMES[1]); - var opts = { returnImmediately: true, maxResults: 3 }; + subscription.on('message', function(message) { + assert.deepEqual(message.data, new Buffer('hello')); - subscription.pull(opts, function(err, messages) { - assert.ifError(err); - - assert.equal(messages.length, opts.maxResults); - - var ackIds = messages.map(function(message) { - return message.ackId; - }); - - subscription.ack(ackIds, done); + if (++messageCount === 10) { + subscription.close(done); + } }); }); - it('should allow a custom timeout', function(done) { - var timeout = 5000; + it('should ack the message', function(done) { + var subscription = topic.subscription(SUB_NAMES[1]); - // We need to use a topic without any pending messages to allow the - // connection to stay open. - var topic = pubsub.topic(generateTopicName()); - var subscription = topic.subscription(generateSubName(), { - timeout: timeout - }); + subscription.on('error', done); + subscription.on('message', ack); - async.series([ - topic.create.bind(topic), - subscription.create.bind(subscription), - ], function(err) { - assert.ifError(err); + function ack(message) { + // remove listener to we only ack first message + subscription.removeListener('message', ack); - var times = [Date.now()]; + message.ack(); + setTimeout(() => subscription.close(done), 2500); + } + }); - subscription.pull({ - returnImmediately: false - }, function(err) { - assert.ifError(err); + it('should nack the message', function(done) { + var subscription = topic.subscription(SUB_NAMES[1]); - times.push(Date.now()); - var runTime = times.pop() - times.pop(); + subscription.on('error', done); + subscription.on('message', nack); - assert(runTime >= timeout - 1000); - assert(runTime <= timeout + 1000); + function nack(message) { + // remove listener to we only ack first message + subscription.removeListener('message', nack); - done(); - }); - }); + message.nack(); + setTimeout(() => subscription.close(done), 2500); + } }); }); @@ -506,26 +506,41 @@ describe('pubsub', function() { var SNAPSHOT_NAME = generateSnapshotName(); var topic; + var publisher; var subscription; var snapshot; - before(function(done) { - topic = pubsub.topic(TOPIC_NAMES[0]); - subscription = topic.subscription(generateSubName()); - snapshot = subscription.snapshot(SNAPSHOT_NAME); - subscription.create(done); - }); - - after(function() { + function deleteAllSnapshots() { return pubsub.getSnapshots().then(function(data) { return Promise.all(data[0].map(function(snapshot) { return snapshot.delete(); })); }); + } + + function wait(milliseconds) { + return function() { + return new Promise(function(resolve) { + setTimeout(resolve, milliseconds); + }); + }; + } + + before(function() { + topic = pubsub.topic(TOPIC_NAMES[0]); + publisher = topic.publisher(); + subscription = topic.subscription(generateSubName()); + snapshot = subscription.snapshot(SNAPSHOT_NAME); + + return deleteAllSnapshots() + .then(wait(2500)) + .then(subscription.create.bind(subscription)) + .then(snapshot.create.bind(snapshot)) + .then(wait(2500)); }); - it('should create a snapshot', function(done) { - snapshot.create(done); + after(function() { + return deleteAllSnapshots(); }); it('should get a list of snapshots', function(done) { @@ -557,42 +572,64 @@ describe('pubsub', function() { var messageId; beforeEach(function() { - subscription = topic.subscription(); + subscription = topic.subscription(generateSubName()); return subscription.create().then(function() { - return topic.publish('Hello, world!'); - }).then(function(data) { - messageId = data[0][0]; + return publisher.publish(new Buffer('Hello, world!')); + }).then(function(messageIds) { + messageId = messageIds[0]; }); }); - function checkMessage() { - return subscription.pull().then(function(data) { - var message = data[0][0]; - assert.strictEqual(message.id, messageId); - return message.ack(); - }); - } - - it('should seek to a snapshot', function() { + it('should seek to a snapshot', function(done) { var snapshotName = generateSnapshotName(); - return subscription.createSnapshot(snapshotName).then(function() { - return checkMessage(); - }).then(function() { - return subscription.seek(snapshotName); - }).then(function() { - return checkMessage(); + subscription.createSnapshot(snapshotName, function(err, snapshot) { + assert.ifError(err); + + var messageCount = 0; + + subscription.on('error', done); + subscription.on('message', function(message) { + if (message.id !== messageId) { + return; + } + + message.ack(); + + if (++messageCount === 1) { + snapshot.seek(function(err) { + assert.ifError(err); + }); + return; + } + + assert.strictEqual(messageCount, 2); + subscription.close(done); + }); }); }); - it('should seek to a date', function() { - var date = new Date(); + it('should seek to a date', function(done) { + var messageCount = 0; + + subscription.on('error', done); + subscription.on('message', function(message) { + if (message.id !== messageId) { + return; + } + + message.ack(); + + if (++messageCount === 1) { + subscription.seek(message.publishTime, function(err) { + assert.ifError(err); + }); + return; + } - return checkMessage().then(function() { - return subscription.seek(date); - }).then(function() { - return checkMessage(); + assert.strictEqual(messageCount, 2); + subscription.close(done); }); }); }); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js new file mode 100644 index 00000000000..e610035c22b --- /dev/null +++ b/handwritten/pubsub/test/connection-pool.js @@ -0,0 +1,1013 @@ +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); +var common = require('@google-cloud/common'); +var events = require('events'); +var extend = require('extend'); +var grpc = require('grpc'); +var proxyquire = require('proxyquire'); +var uuid = require('uuid'); +var util = require('util'); + +var PKG = require('../package.json'); +var v1 = require('../src/v1'); + +var fakeUtil = extend({}, common.util); +var fakeUuid = extend({}, uuid); +var fakeGrpc = extend({}, grpc); + +var v1Override; +function fakeV1(options) { + return (v1Override || v1)(options); +} + +function FakeConnection() { + this.isConnected = false; + this.isPaused = false; + this.ended = false; + + events.EventEmitter.call(this); +} + +util.inherits(FakeConnection, events.EventEmitter); + +FakeConnection.prototype.write = function() {}; + +FakeConnection.prototype.end = function() { + this.ended = true; +}; + +FakeConnection.prototype.pause = function() { + this.isPaused = true; +}; + +FakeConnection.prototype.resume = function() { + this.isPaused = false; +}; + +describe('ConnectionPool', function() { + var ConnectionPool; + var pool; + + var FAKE_PUBSUB_OPTIONS = {}; + + var PUBSUB = { + auth: { + getAuthClient: fakeUtil.noop + }, + options: FAKE_PUBSUB_OPTIONS + }; + + var SUB_NAME = 'test-subscription'; + var SUBSCRIPTION = { + name: SUB_NAME, + pubsub: PUBSUB, + request: fakeUtil.noop + }; + + before(function() { + ConnectionPool = proxyquire('../src/connection-pool.js', { + '@google-cloud/common': { + util: fakeUtil + }, + grpc: fakeGrpc, + uuid: fakeUuid, + './v1': fakeV1 + }); + }); + + beforeEach(function() { + SUBSCRIPTION.request = fakeUtil.noop; + PUBSUB.auth.getAuthClient = fakeUtil.noop; + + pool = new ConnectionPool(SUBSCRIPTION); + pool.queue.forEach(clearTimeout); + pool.queue.length = 0; + }); + + afterEach(function() { + if (pool.isOpen) { + pool.close(); + } + }); + + describe('initialization', function() { + it('should initialize internally used properties', function() { + var open = ConnectionPool.prototype.open; + ConnectionPool.prototype.open = fakeUtil.noop; + + var pool = new ConnectionPool(SUBSCRIPTION); + + assert.strictEqual(pool.subscription, SUBSCRIPTION); + assert(pool.connections instanceof Map); + assert.strictEqual(pool.isPaused, false); + assert.strictEqual(pool.isOpen, false); + assert.strictEqual(pool.failedConnectionAttempts, 0); + assert.strictEqual(pool.noConnectionsTime, 0); + assert.strictEqual(pool.settings.maxConnections, 5); + assert.strictEqual(pool.settings.ackDeadline, 10000); + assert.deepEqual(pool.queue, []); + + ConnectionPool.prototype.open = open; + }); + + it('should create grpc metadata', function() { + assert(pool.metadata_ instanceof grpc.Metadata); + + assert.deepEqual(pool.metadata_.get('x-goog-api-client'), [ + [ + 'gl-node/' + process.versions.node, + 'gccl/' + PKG.version, + 'grpc/' + require('grpc/package.json').version + ].join(' ') + ]); + }); + + it('should respect user specified settings', function() { + var options = { + maxConnections: 10, + ackDeadline: 100 + }; + + var subscription = extend({}, SUBSCRIPTION, options); + var subscriptionCopy = extend({}, subscription); + var pool = new ConnectionPool(subscription); + + assert.deepEqual(pool.settings, options); + assert.deepEqual(subscription, subscriptionCopy); + }); + + it('should inherit from EventEmitter', function() { + assert(pool instanceof events.EventEmitter); + }); + + it('should call open', function(done) { + var open = ConnectionPool.prototype.open; + + ConnectionPool.prototype.open = function() { + ConnectionPool.prototype.open = open; + done(); + }; + + new ConnectionPool(SUBSCRIPTION); + }); + }); + + describe('acquire', function() { + it('should return an error if the pool is closed', function(done) { + var expectedErr = 'No connections available to make request.'; + + pool.isOpen = false; + + pool.acquire(function(err) { + assert(err instanceof Error); + assert.strictEqual(err.message, expectedErr); + done(); + }); + }); + + it('should return a specified connection', function(done) { + var id = 'a'; + var fakeConnection = new FakeConnection(); + + pool.connections.set(id, fakeConnection); + pool.connections.set('b', new FakeConnection()); + + pool.acquire(id, function(err, connection) { + assert.ifError(err); + assert.strictEqual(connection, fakeConnection); + done(); + }); + }); + + it('should return any conn when the specified is missing', function(done) { + var fakeConnection = new FakeConnection(); + + pool.connections.set('a', fakeConnection); + + pool.acquire('b', function(err, connection) { + assert.ifError(err); + assert.strictEqual(connection, fakeConnection); + done(); + }); + }); + + it('should return any connection when id is missing', function(done) { + var fakeConnection = new FakeConnection(); + + pool.connections.set('a', fakeConnection); + + pool.acquire(function(err, connection) { + assert.ifError(err); + assert.strictEqual(connection, fakeConnection); + done(); + }); + }); + + it('should listen for connected event if no conn is ready', function(done) { + var fakeConnection = new FakeConnection(); + + pool.acquire(function(err, connection) { + assert.ifError(err); + assert.strictEqual(connection, fakeConnection); + done(); + }); + + pool.emit('connected', fakeConnection); + }); + }); + + describe('close',function() { + it('should set isOpen to false', function() { + pool.close(); + assert.strictEqual(pool.isOpen, false); + }); + + it('should call end on all active connections', function() { + var a = new FakeConnection(); + var b = new FakeConnection(); + + pool.connections.set('a', a); + pool.connections.set('b', b); + + pool.close(); + + assert.strictEqual(a.ended, true); + assert.strictEqual(b.ended, true); + }); + + it('should clear the connections map', function(done) { + pool.connections.clear = done; + pool.close(); + }); + + it('should clear any timeouts in the queue', function() { + var _clearTimeout = global.clearTimeout; + var clearCalls = 0; + + var fakeHandles = ['a', 'b', 'c', 'd']; + + global.clearTimeout = function(handle) { + assert.strictEqual(handle, fakeHandles[clearCalls++]); + }; + + pool.queue = Array.from(fakeHandles); + pool.close(); + + assert.strictEqual(clearCalls, fakeHandles.length); + assert.strictEqual(pool.queue.length, 0); + + global.clearTimeout = _clearTimeout; + }); + + it('should reset internally used props', function() { + pool.failedConnectionAttempts = 100; + pool.noConnectionsTime = Date.now(); + + pool.close(); + + assert.strictEqual(pool.failedConnectionAttempts, 0); + assert.strictEqual(pool.noConnectionsTime, 0); + }); + + it('should exec a callback when finished closing', function(done) { + pool.close(done); + }); + + it('should use noop when callback is omitted', function(done) { + fakeUtil.noop = function() { + fakeUtil.noop = function() {}; + done(); + }; + + pool.close(); + }); + }); + + describe('createConnection', function() { + var fakeClient; + var fakeConnection; + + beforeEach(function() { + fakeConnection = new FakeConnection(); + + fakeClient = { + streamingPull: function() { + return fakeConnection; + } + }; + + pool.getClient = function(callback) { + callback(null, fakeClient); + }; + }); + + it('should make the correct request', function(done) { + fakeClient.streamingPull = function(metadata) { + assert.strictEqual(metadata, pool.metadata_); + setImmediate(done); + return fakeConnection; + }; + + pool.createConnection(); + }); + + it('should emit any errors that occur when getting client', function(done) { + var error = new Error('err'); + + pool.getClient = function(callback) { + callback(error); + }; + + pool.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + pool.createConnection(); + }); + + describe('connection', function() { + var fakeId; + + beforeEach(function() { + fakeId = uuid.v4(); + + fakeUuid.v4 = function() { + return fakeId; + }; + }); + + it('should create a connection', function(done) { + fakeConnection.write = function(reqOpts) { + assert.deepEqual(reqOpts, { + subscription: SUB_NAME, + streamAckDeadlineSeconds: pool.settings.ackDeadline / 1000 + }); + }; + + pool.connections.set = function(id, connection) { + assert.strictEqual(id, fakeId); + assert.strictEqual(connection, fakeConnection); + done(); + }; + + pool.createConnection(); + }); + + it('should pause the connection if the pool is paused', function(done) { + fakeConnection.pause = done; + pool.isPaused = true; + pool.createConnection(); + }); + + describe('error events', function() { + it('should emit errors to the pool', function(done) { + var error = new Error('err'); + + pool.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + pool.createConnection(); + fakeConnection.emit('error', error); + }); + }); + + describe('metadata events', function() { + it('should do nothing if the metadata is empty', function(done) { + var metadata = new grpc.Metadata(); + + pool.on('connected', done); // should not fire + pool.createConnection(); + + fakeConnection.emit('metadata', metadata); + done(); + }); + + it('should reset counters and fire connected', function(done) { + var metadata = new grpc.Metadata(); + + metadata.set('date', 'abc'); + + pool.on('connected', function(connection) { + assert.strictEqual(connection, fakeConnection); + assert(fakeConnection.isConnected); + assert.strictEqual(pool.noConnectionsTime, 0); + assert.strictEqual(pool.failedConnectionAttempts, 0); + done(); + }); + + pool.createConnection(); + fakeConnection.emit('metadata', metadata); + }); + }); + + describe('status events', function() { + beforeEach(function() { + pool.connections.set('a', new FakeConnection()); + }); + + it('should cancel any error events', function(done) { + var fakeError = { code: 4 }; + + pool.on('error', done); // should not fire + pool.createConnection(); + + fakeConnection.emit('error', fakeError); + fakeConnection.emit('status', fakeError); + + done(); + }); + + it('should close and delete the connection', function(done) { + var endCalled = false; + + pool.createConnection(); + + fakeConnection.end = function() { + endCalled = true; + }; + + pool.connections.delete = function(id) { + assert.strictEqual(id, fakeId); + done(); + }; + + fakeConnection.emit('status', {}); + }); + + it('should increment the failed connection counter', function() { + pool.failedConnectionAttempts = 0; + fakeConnection.isConnected = false; + + pool.createConnection(); + fakeConnection.emit('status', {}); + + assert.strictEqual(pool.failedConnectionAttempts, 1); + }); + + it('should not incr. the failed connection counter', function() { + pool.failedConnectionAttempts = 0; + fakeConnection.isConnected = true; + + pool.createConnection(); + fakeConnection.emit('status', {}); + + assert.strictEqual(pool.failedConnectionAttempts, 0); + }); + + it('should capture the date when no connections are found', function() { + var dateNow = global.Date.now; + + var fakeDate = Date.now(); + global.Date.now = function() { + return fakeDate; + }; + + pool.noConnectionsTime = 0; + pool.isConnected = function() { + return false; + }; + + pool.createConnection(); + fakeConnection.emit('status', {}); + + assert.strictEqual(pool.noConnectionsTime, fakeDate); + global.Date.now = dateNow; + }); + + it('should not capture the date when already set', function() { + pool.noConnectionsTime = 123; + pool.isConnected = function() { + return false; + }; + + pool.createConnection(); + fakeConnection.emit('status', {}); + + assert.strictEqual(pool.noConnectionsTime, 123); + }); + + it('should not capture the date if a conn. is found', function() { + pool.noConnectionsTime = 0; + pool.isConnected = function() { + return true; + }; + + pool.createConnection(); + fakeConnection.emit('status', {}); + + assert.strictEqual(pool.noConnectionsTime, 0); + }); + + it('should queue a connection if status is retryable', function(done) { + var fakeStatus = {}; + + pool.shouldReconnect = function(status) { + assert.strictEqual(status, fakeStatus); + return true; + }; + + pool.queueConnection = done; + + pool.createConnection(); + fakeConnection.emit('status', fakeStatus); + }); + + it('should emit error if no pending conn. are found', function(done) { + var error = { + code: 4, + details: 'Deadline Exceeded' + }; + + pool.shouldReconnect = function() { + return false; + }; + + // will only emit status errors if pool is empty + pool.connections = new Map(); + + pool.on('error', function(err) { + assert.strictEqual(err.code, error.code); + assert.strictEqual(err.message, error.details); + done(); + }); + + pool.createConnection(); + fakeConnection.emit('status', error); + }); + }); + + describe('data events', function() { + it('should emit messages', function(done) { + var fakeResp = {}; + var fakeMessage = {}; + + pool.createMessage = function(id, resp) { + assert.strictEqual(id, fakeId); + assert.strictEqual(resp, fakeResp); + return fakeMessage; + }; + + pool.on('message', function(message) { + assert.strictEqual(message, fakeMessage); + done(); + }); + + pool.createConnection(); + fakeConnection.emit('data', { receivedMessages: [fakeResp] }); + }); + }); + }); + }); + + describe('createMessage', function() { + var message; + var globalDateNow; + + var CONNECTION_ID = 'abc'; + var FAKE_DATE_NOW = Date.now(); + + var PT = { + seconds: 6838383, + nanos: 20323838 + }; + + var RESP = { + ackId: 'def', + message: { + messageId: 'ghi', + data: new Buffer('hello'), + attributes: { + a: 'a' + }, + publishTime: PT + } + }; + + before(function() { + globalDateNow = global.Date.now; + global.Date.now = function() { + return FAKE_DATE_NOW; + }; + }); + + beforeEach(function() { + message = pool.createMessage(CONNECTION_ID, RESP); + }); + + after(function() { + global.Date.now = globalDateNow; + }); + + it('should capture the connection id', function() { + assert.strictEqual(message.connectionId, CONNECTION_ID); + }); + + it('should capture the message data', function() { + var expectedPublishTime = new Date( + parseInt(PT.seconds, 10) * 1000 + parseInt(PT.nanos, 10) / 1e6); + + assert.strictEqual(message.ackId, RESP.ackId); + assert.strictEqual(message.id, RESP.message.messageId); + assert.strictEqual(message.data, RESP.message.data); + assert.strictEqual(message.attributes, RESP.message.attributes); + assert.deepEqual(message.publishTime, expectedPublishTime); + assert.strictEqual(message.received, FAKE_DATE_NOW); + }); + + it('should create a read-only message length property', function() { + assert.strictEqual(message.length, RESP.message.data.length); + + assert.throws(function() { + message.length = 3; + }); + }); + + it('should create an ack method', function(done) { + SUBSCRIPTION.ack_ = function(message_) { + assert.strictEqual(message_, message); + done(); + }; + + message.ack(); + }); + + it('should create a nack method', function(done) { + SUBSCRIPTION.nack_ = function(message_) { + assert.strictEqual(message_, message); + done(); + }; + + message.nack(); + }); + }); + + describe('getClient', function() { + var fakeAuthClient = {}; + + function FakeSubscriber(address, creds, options) { + this.address = address; + this.creds = creds; + this.options = options; + } + + beforeEach(function() { + PUBSUB.auth.getAuthClient = function(callback) { + callback(null, fakeAuthClient); + }; + + v1Override = function() { + return { + Subscriber: FakeSubscriber + }; + }; + }); + + it('should return the cached client when available', function(done) { + var fakeClient = pool.client = {}; + + pool.getClient(function(err, client) { + assert.ifError(err); + assert.strictEqual(client, fakeClient); + done(); + }); + }); + + it('should return any auth errors', function(done) { + var error = new Error('err'); + + PUBSUB.auth.getAuthClient = function(callback) { + callback(error); + }; + + pool.getClient(function(err, client) { + assert.strictEqual(err, error); + assert.strictEqual(client, undefined); + done(); + }); + }); + + it('should create/use grpc credentials', function(done) { + var fakeSslCreds = {}; + var fakeGoogCreds = {}; + var fakeCombinedCreds = {}; + + fakeGrpc.credentials = { + createSsl: function() { + return fakeSslCreds; + }, + createFromGoogleCredential: function(authClient) { + assert.strictEqual(authClient, fakeAuthClient); + return fakeGoogCreds; + }, + combineChannelCredentials: function(sslCreds, googCreds) { + assert.strictEqual(sslCreds, fakeSslCreds); + assert.strictEqual(googCreds, fakeGoogCreds); + return fakeCombinedCreds; + } + }; + + pool.getClient(function(err, client) { + assert.ifError(err); + assert(client instanceof FakeSubscriber); + assert.strictEqual(client.creds, fakeCombinedCreds); + done(); + }); + }); + + it('should pass the pubsub options into the gax fn', function(done) { + v1Override = function(options) { + assert.strictEqual(options, FAKE_PUBSUB_OPTIONS); + setImmediate(done); + + return { + Subscriber: FakeSubscriber + }; + }; + + pool.getClient(assert.ifError); + }); + + it('should pass in the correct the args to the Subscriber', function(done) { + var fakeCreds = {}; + fakeGrpc.credentials.combineChannelCredentials = function() { + return fakeCreds; + }; + + var fakeAddress = 'a.b.c'; + fakeV1.SERVICE_ADDRESS = fakeAddress; + + var fakeUserAgent = 'a-b-c'; + fakeUtil.getUserAgentFromPackageJson = function(packageJson) { + assert.deepEqual(packageJson, PKG); + return fakeUserAgent; + }; + + pool.getClient(function(err, client) { + assert.ifError(err); + assert(client instanceof FakeSubscriber); + assert.strictEqual(client.address, fakeAddress); + assert.strictEqual(client.creds, fakeCreds); + + assert.deepEqual(client.options, { + 'grpc.max_receive_message_length': 20000001, + 'grpc.primary_user_agent': fakeUserAgent + }); + + done(); + }); + }); + }); + + describe('isConnected', function() { + it('should return true when at least one stream is connected', function() { + var connections = pool.connections = new Map(); + + connections.set('a', new FakeConnection()); + connections.set('b', new FakeConnection()); + connections.set('c', new FakeConnection()); + connections.set('d', new FakeConnection()); + + var conn = new FakeConnection(); + conn.isConnected = true; + connections.set('e', conn); + + assert(pool.isConnected()); + }); + + it('should return false when there is no connection', function() { + var connections = pool.connections = new Map(); + + connections.set('a', new FakeConnection()); + connections.set('b', new FakeConnection()); + connections.set('c', new FakeConnection()); + connections.set('d', new FakeConnection()); + connections.set('e', new FakeConnection()); + + assert(!pool.isConnected()); + }); + + it('should return false when the map is empty', function() { + pool.connections = new Map(); + assert(!pool.isConnected()); + }); + }); + + describe('open', function() { + beforeEach(function() { + pool.queueConnection = fakeUtil.noop; + }); + + it('should make the specified number of connections', function() { + var expectedCount = 5; + var connectionCount = 0; + + pool.queueConnection = function() { + connectionCount += 1; + }; + + pool.settings.maxConnections = expectedCount; + pool.open(); + + assert.strictEqual(expectedCount, connectionCount); + }); + + it('should set the isOpen flag to true', function() { + pool.open(); + assert(pool.isOpen); + }); + + it('should reset internal used props', function() { + pool.failedConnectionAttempts = 100; + pool.noConnectionsTime = 0; + + pool.open(); + + assert.strictEqual(pool.failedConnectionAttempts, 0); + assert.strictEqual(pool.noConnectionsTime, Date.now()); + }); + }); + + describe('pause', function() { + it('should set the isPaused flag to true', function() { + pool.pause(); + assert(pool.isPaused); + }); + + it('should pause all the connections', function() { + var a = new FakeConnection(); + var b = new FakeConnection(); + + pool.connections.set('a', a); + pool.connections.set('b', b); + + pool.pause(); + + assert(a.isPaused); + assert(b.isPaused); + }); + }); + + describe('queueConnection', function() { + var fakeTimeoutHandle = 123; + + var _setTimeout; + var _random; + var _open; + + before(function() { + _setTimeout = global.setTimeout; + _random = global.Math.random; + + _open = ConnectionPool.prototype.open; + // prevent open from calling queueConnection + ConnectionPool.prototype.open = fakeUtil.noop; + }); + + beforeEach(function() { + Math.random = function() { + return 1; + }; + + global.setTimeout = function(cb) { + cb(); + return fakeTimeoutHandle; + }; + + pool.failedConnectionAttempts = 0; + pool.createConnection = fakeUtil.noop; + }); + + after(function() { + global.setTimeout = _setTimeout; + global.Math.random = _random; + ConnectionPool.prototype.open = _open; + }); + + it('should set a timeout to create the connection', function(done) { + pool.createConnection = done; + + global.setTimeout = function(cb, delay) { + assert.strictEqual(delay, 0); + cb(); // should call the done fn + }; + + pool.queueConnection(); + }); + + it('should factor in the number of failed requests', function(done) { + pool.createConnection = done; + pool.failedConnectionAttempts = 3; + + global.setTimeout = function(cb, delay) { + assert.strictEqual(delay, 9000); + cb(); // should call the done fn + }; + + pool.queueConnection(); + }); + + it('should capture the timeout handle', function() { + pool.queueConnection(); + assert.deepEqual(pool.queue, [fakeTimeoutHandle]); + }); + + it('should remove the timeout handle once it fires', function(done) { + pool.createConnection = function() { + assert.strictEqual(pool.queue.length, 0); + done(); + }; + + pool.queueConnection(); + }); + }); + + describe('resume', function() { + it('should set the isPaused flag to false', function() { + pool.resume(); + assert.strictEqual(pool.isPaused, false); + }); + + it('should resume all the connections', function() { + var a = new FakeConnection(); + var b = new FakeConnection(); + + pool.connections.set('a', a); + pool.connections.set('b', b); + + pool.resume(); + + assert.strictEqual(a.isPaused, false); + assert.strictEqual(b.isPaused, false); + }); + }); + + describe('shouldReconnect', function() { + it('should not reconnect if the pool is closed', function() { + pool.isOpen = false; + assert.strictEqual(pool.shouldReconnect({}), false); + }); + + it('should return true for retryable errors', function() { + assert(pool.shouldReconnect({ code: 0 })); // OK + assert(pool.shouldReconnect({ code: 1 })); // Canceled + assert(pool.shouldReconnect({ code: 4 })); // DeadlineExceeded + assert(pool.shouldReconnect({ code: 8 })); // ResourceExhausted + assert(pool.shouldReconnect({ code: 13 })); // Internal + assert(pool.shouldReconnect({ code: 14 })); // Unavailable + }); + + it('should return false for non-retryable errors', function() { + assert(!pool.shouldReconnect({ code: 2 })); // Unknown + assert(!pool.shouldReconnect({ code: 3 })); // InvalidArgument + assert(!pool.shouldReconnect({ code: 5 })); // NotFound + assert(!pool.shouldReconnect({ code: 6 })); // AlreadyExists + assert(!pool.shouldReconnect({ code: 7 })); // PermissionDenied + assert(!pool.shouldReconnect({ code: 9 })); // FailedPrecondition + assert(!pool.shouldReconnect({ code: 10 })); // Aborted + assert(!pool.shouldReconnect({ code: 11 })); // OutOfRange + assert(!pool.shouldReconnect({ code: 12 })); // Unimplemented + assert(!pool.shouldReconnect({ code: 15 })); // DataLoss + assert(!pool.shouldReconnect({ code: 16 })); // Unauthenticated + }); + + it('should not retry if no connection can be made', function() { + var fakeStatus = { + code: 4 + }; + + pool.noConnectionsTime = Date.now() - 300001; + + assert.strictEqual(pool.shouldReconnect(fakeStatus), false); + }); + + it('should return true if all conditions are met', function() { + var fakeStatus = { + code: 4 + }; + + pool.noConnectionsTime = 0; + + assert.strictEqual(pool.shouldReconnect(fakeStatus), true); + }); + }); +}); diff --git a/handwritten/pubsub/test/histogram.js b/handwritten/pubsub/test/histogram.js new file mode 100644 index 00000000000..eee2693c194 --- /dev/null +++ b/handwritten/pubsub/test/histogram.js @@ -0,0 +1,120 @@ +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); + +var Histogram = require('../src/histogram.js'); + +describe('Histogram', function() { + var histogram; + + var MIN_VALUE = 10000; + var MAX_VALUE = 600000; + + beforeEach(function() { + histogram = new Histogram(); + }); + + describe('initialization', function() { + it('should create a data map', function() { + assert(histogram.data instanceof Map); + }); + + it('should set the initial length to 0', function() { + assert.strictEqual(histogram.length, 0); + }); + }); + + describe('add', function() { + it('should increment a value', function() { + histogram.data.set(MIN_VALUE, 1); + histogram.add(MIN_VALUE); + + assert.strictEqual(histogram.data.get(MIN_VALUE), 2); + }); + + it('should initialize a value if absent', function() { + histogram.add(MIN_VALUE); + + assert.strictEqual(histogram.data.get(MIN_VALUE), 1); + }); + + it('should adjust the length for each item added', function() { + histogram.add(MIN_VALUE); + histogram.add(MIN_VALUE); + histogram.add(MIN_VALUE * 2); + + assert.strictEqual(histogram.length, 3); + }); + + it('should cap the value', function() { + var outOfBounds = MAX_VALUE + MIN_VALUE; + + histogram.add(outOfBounds); + + assert.strictEqual(histogram.data.get(outOfBounds), undefined); + assert.strictEqual(histogram.data.get(MAX_VALUE), 1); + }); + + it('should apply a minimum', function() { + var outOfBounds = MIN_VALUE - 1000; + + histogram.add(outOfBounds); + + assert.strictEqual(histogram.data.get(outOfBounds), undefined); + assert.strictEqual(histogram.data.get(MIN_VALUE), 1); + }); + + it('should use seconds level precision', function() { + var ms = 303823; + var expected = 304000; + + histogram.add(ms); + + assert.strictEqual(histogram.data.get(ms), undefined); + assert.strictEqual(histogram.data.get(expected), 1); + }); + }); + + describe('percentile', function() { + function range(a, b) { + var result = []; + + for (; a < b; a++) { + result.push(a); + } + + return result; + } + + it('should return the nth percentile', function() { + range(100, 201).forEach(function(value) { + histogram.add(value * 1000); + }); + + assert.strictEqual(histogram.percentile(100), 200000); + assert.strictEqual(histogram.percentile(101), 200000); + assert.strictEqual(histogram.percentile(99), 199000); + assert.strictEqual(histogram.percentile(1), 101000); + }); + + it('should return the min value if unable to determine', function() { + assert.strictEqual(histogram.percentile(99), MIN_VALUE); + }); + }); +}); diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index 46d77e74158..25dde7ed8fc 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -45,7 +45,6 @@ describe('IAM', function() { var iam; var PUBSUB = { - defaultBaseUrl_: 'base-url', options: {} }; var ID = 'id'; @@ -72,7 +71,7 @@ describe('IAM', function() { var config = iam.calledWith_[0]; var options = iam.calledWith_[1]; - assert.strictEqual(config.baseUrl, PUBSUB.defaultBaseUrl_); + assert.strictEqual(config.baseUrl, 'pubsub.googleapis.com'); var protosDir = path.resolve(__dirname, '../protos'); assert.strictEqual(config.protosDir, protosDir); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index eaa656babda..a7fc25c9d67 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -19,18 +19,18 @@ var arrify = require('arrify'); var assert = require('assert'); var extend = require('extend'); -var path = require('path'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; +var PKG = require('../package.json'); +var v1 = require('../src/v1/index.js'); + var SubscriptionCached = require('../src/subscription.js'); var SubscriptionOverride; -var Topic = require('../src/topic.js'); - -function Subscription(a, b) { +function Subscription(a, b, c) { var OverrideFn = SubscriptionOverride || SubscriptionCached; - return new OverrideFn(a, b); + return new OverrideFn(a, b, c); } var promisified = false; @@ -50,16 +50,11 @@ var fakeUtil = extend({}, util, { } }); -function FakeGrpcService() { +function FakeSnapshot() { this.calledWith_ = arguments; } -var grpcServiceRequestOverride; -FakeGrpcService.prototype.request = function() { - return (grpcServiceRequestOverride || util.noop).apply(this, arguments); -}; - -function FakeSnapshot() { +function FakeTopic() { this.calledWith_ = arguments; } @@ -85,6 +80,16 @@ var fakePaginator = { } }; +var googleAutoAuthOverride; +function fakeGoogleAutoAuth() { + return (googleAutoAuthOverride || util.noop).apply(null, arguments); +} + +var v1Override; +function fakeV1() { + return (v1Override || util.noop).apply(null, arguments); +} + var GAX_CONFIG_PUBLISHER_OVERRIDE = {}; var GAX_CONFIG_SUBSCRIBER_OVERRIDE = {}; @@ -116,13 +121,11 @@ describe('PubSub', function() { paginator: fakePaginator, util: fakeUtil }, - '@google-cloud/common-grpc': { - Service: FakeGrpcService - }, + 'google-auto-auth': fakeGoogleAutoAuth, './snapshot.js': FakeSnapshot, './subscription.js': Subscription, - './topic.js': Topic, - + './topic.js': FakeTopic, + './v1': fakeV1, './v1/publisher_client_config.json': GAX_CONFIG.Publisher, './v1/subscriber_client_config.json': GAX_CONFIG.Subscriber }); @@ -135,7 +138,8 @@ describe('PubSub', function() { }); beforeEach(function() { - grpcServiceRequestOverride = null; + v1Override = null; + googleAutoAuthOverride = null; SubscriptionOverride = null; pubsub = new PubSub(OPTIONS); pubsub.projectId = PROJECT_ID; @@ -175,52 +179,328 @@ describe('PubSub', function() { fakeUtil.normalizeArguments = normalizeArguments; }); - it('should inherit from GrpcService', function() { - assert(pubsub instanceof FakeGrpcService); + it('should attempt to determine the service path and port', function() { + var determineBaseUrl_ = PubSub.prototype.determineBaseUrl_; + var called = false; - var calledWith = pubsub.calledWith_[0]; + PubSub.prototype.determineBaseUrl_ = function() { + PubSub.prototype.determineBaseUrl_ = determineBaseUrl_; + called = true; + }; - var baseUrl = 'pubsub.googleapis.com'; - assert.strictEqual(calledWith.baseUrl, baseUrl); + new PubSub({}); + assert(called); + }); - var protosDir = path.resolve(__dirname, '../protos'); - assert.strictEqual(calledWith.protosDir, protosDir); + it('should initialize the API object', function() { + assert.deepEqual(pubsub.api, {}); + }); - assert.deepStrictEqual(calledWith.protoServices, { - Publisher: { - path: 'google/pubsub/v1/pubsub.proto', - service: 'pubsub.v1' - }, - Subscriber: { - path: 'google/pubsub/v1/pubsub.proto', - service: 'pubsub.v1' + it('should cache a local google-auto-auth instance', function() { + var fakeGoogleAutoAuthInstance = {}; + var options = { + a: 'b', + c: 'd' + }; + + googleAutoAuthOverride = function(options_) { + assert.deepEqual(options_, extend({ + scopes: v1.ALL_SCOPES, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version + }, options)); + return fakeGoogleAutoAuthInstance; + }; + + var pubsub = new PubSub(options); + assert.strictEqual(pubsub.auth, fakeGoogleAutoAuthInstance); + }); + + it('should localize the options provided', function() { + assert.deepEqual(pubsub.options, extend({ + scopes: v1.ALL_SCOPES, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version + }, OPTIONS)); + }); + + it('should set the projectId', function() { + assert.strictEqual(pubsub.projectId, PROJECT_ID); + }); + + it('should default the projectId to the token', function() { + var pubsub = new PubSub({}); + assert.strictEqual(pubsub.projectId, '{{projectId}}'); + }); + }); + + + describe('createSubscription', function() { + var TOPIC_NAME = 'topic'; + var TOPIC = extend(new FakeTopic(), { + name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME + }); + + var SUB_NAME = 'subscription'; + var SUBSCRIPTION = { + name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME + }; + + var apiResponse = { + name: 'subscription-name' + }; + + it('should throw if no Topic is provided', function() { + assert.throws(function() { + pubsub.createSubscription(); + }, /A Topic is required for a new subscription\./); + }); + + it('should throw if no subscription name is provided', function() { + assert.throws(function() { + pubsub.createSubscription(TOPIC_NAME); + }, /A subscription name is required./); + }); + + it('should not require configuration options', function(done) { + pubsub.request = function(config, callback) { + callback(null, apiResponse); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, done); + }); + + it('should allow undefined/optional configuration options', function(done) { + pubsub.request = function(config, callback) { + callback(null, apiResponse); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, undefined, done); + }); + + it('should create a Subscription', function(done) { + var opts = { a: 'b', c: 'd' }; + + pubsub.request = util.noop; + + pubsub.subscription = function(subName, options) { + assert.strictEqual(subName, SUB_NAME); + assert.deepEqual(options, opts); + setImmediate(done); + return SUBSCRIPTION; + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, opts, assert.ifError); + }); + + it('should create a Topic object from a string', function(done) { + pubsub.request = util.noop; + + pubsub.topic = function(topicName) { + assert.strictEqual(topicName, TOPIC_NAME); + setImmediate(done); + return TOPIC; + }; + + pubsub.createSubscription(TOPIC_NAME, SUB_NAME, assert.ifError); + }); + + it('should send correct request', function(done) { + var options = { + gaxOpts: {} + }; + + pubsub.topic = function(topicName) { + return { + name: topicName + }; + }; + + pubsub.subscription = function(subName) { + return { + name: subName + }; + }; + + pubsub.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'createSubscription'); + assert.strictEqual(config.reqOpts.topic, TOPIC.name); + assert.strictEqual(config.reqOpts.name, SUB_NAME); + assert.strictEqual(config.gaxOpts, options.gaxOpts); + done(); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); + }); + + it('should pass options to the api request', function(done) { + var options = { + retainAckedMessages: true, + pushEndpoint: 'https://domain/push', + }; + + var expectedBody = extend({ + topic: TOPIC.name, + name: SUB_NAME + }, options, { + pushConfig: { + pushEndpoint: options.pushEndpoint } }); - assert.deepEqual(calledWith.scopes, [ - 'https://www.googleapis.com/auth/pubsub', - 'https://www.googleapis.com/auth/cloud-platform' - ]); - assert.deepEqual(calledWith.packageJson, require('../package.json')); + delete expectedBody.pushEndpoint; + + pubsub.topic = function() { + return { + name: TOPIC_NAME + }; + }; + + pubsub.subscription = function() { + return { + name: SUB_NAME + }; + }; + + pubsub.request = function(config) { + assert.notStrictEqual(config.reqOpts, options); + assert.deepEqual(config.reqOpts, expectedBody); + done(); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); }); - it('should set the defaultBaseUrl_', function() { - assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com'); + it('should discard flow control options', function(done) { + var options = { + flowControl: {} + }; + + var expectedBody = { + topic: TOPIC.name, + name: SUB_NAME + }; + + pubsub.topic = function() { + return { + name: TOPIC_NAME + }; + }; + + pubsub.subscription = function() { + return { + name: SUB_NAME + }; + }; + + pubsub.request = function(config) { + assert.notStrictEqual(config.reqOpts, options); + assert.deepEqual(config.reqOpts, expectedBody); + done(); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); }); - it('should use the PUBSUB_EMULATOR_HOST env var', function() { - var pubSubHost = 'pubsub-host'; - process.env.PUBSUB_EMULATOR_HOST = pubSubHost; + describe('message retention', function() { + it('should accept a number', function(done) { + var threeDaysInSeconds = 3 * 24 * 60 * 60; - var pubsub = new PubSub({ projectId: 'project-id' }); - delete process.env.PUBSUB_EMULATOR_HOST; + pubsub.request = function(config) { + assert.strictEqual(config.reqOpts.retainAckedMessages, true); + + assert.strictEqual( + config.reqOpts.messageRetentionDuration.seconds, + threeDaysInSeconds + ); - var calledWith = pubsub.calledWith_[0]; - assert.strictEqual(calledWith.baseUrl, pubSubHost); + assert.strictEqual(config.reqOpts.messageRetentionDuration.nanos, 0); + + done(); + }; + + pubsub.createSubscription(TOPIC_NAME, SUB_NAME, { + messageRetentionDuration: threeDaysInSeconds + }, assert.ifError); + }); }); - it('should localize the options provided', function() { - assert.strictEqual(pubsub.options, OPTIONS); + describe('error', function() { + var error = new Error('Error.'); + var apiResponse = { name: SUB_NAME }; + + beforeEach(function() { + pubsub.request = function(config, callback) { + callback(error, apiResponse); + }; + }); + + it('should re-use existing subscription', function(done) { + var apiResponse = { code: 6 }; + + pubsub.subscription = function() { + return SUBSCRIPTION; + }; + + pubsub.request = function(config, callback) { + callback({ code: 6 }, apiResponse); + }; + + pubsub.createSubscription(TOPIC_NAME, SUB_NAME, function(err, sub) { + assert.ifError(err); + assert.strictEqual(sub, SUBSCRIPTION); + done(); + }); + }); + + it('should return error & API response to the callback', function(done) { + pubsub.request = function(config, callback) { + callback(error, apiResponse); + }; + + function callback(err, sub, resp) { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + } + + pubsub.createSubscription(TOPIC_NAME, SUB_NAME, callback); + }); + }); + + describe('success', function() { + var apiResponse = { name: SUB_NAME }; + + beforeEach(function() { + pubsub.request = function(config, callback) { + callback(null, apiResponse); + }; + }); + + it('should return Subscription & resp to the callback', function(done) { + var subscription = {}; + + pubsub.subscription = function() { + return subscription; + }; + + pubsub.request = function(config, callback) { + callback(null, apiResponse); + }; + + function callback(err, sub, resp) { + assert.ifError(err); + assert.strictEqual(sub, subscription); + assert.strictEqual(resp, apiResponse); + done(); + } + + pubsub.createSubscription(TOPIC_NAME, SUB_NAME, callback); + }); }); }); @@ -228,23 +508,25 @@ describe('PubSub', function() { it('should make the correct API request', function(done) { var topicName = 'new-topic-name'; var formattedName = 'formatted-name'; + var gaxOpts = {}; - var formatName_ = Topic.formatName_; - Topic.formatName_ = function(projectId, name) { - Topic.formatName_ = formatName_; - assert.strictEqual(projectId, pubsub.projectId); + pubsub.topic = function(name) { assert.strictEqual(name, topicName); - return formattedName; + + return { + name: formattedName + }; }; - pubsub.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Publisher'); - assert.strictEqual(protoOpts.method, 'createTopic'); - assert.strictEqual(reqOpts.name, formattedName); + pubsub.request = function(config) { + assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.method, 'createTopic'); + assert.deepEqual(config.reqOpts, { name: formattedName }); + assert.deepEqual(config.gaxOpts, gaxOpts); done(); }; - pubsub.createTopic(topicName, function() {}); + pubsub.createTopic(topicName, gaxOpts, function() {}); }); describe('error', function() { @@ -252,7 +534,7 @@ describe('PubSub', function() { var apiResponse = {}; beforeEach(function() { - pubsub.request = function(protoOpts, reqOpts, callback) { + pubsub.request = function(config, callback) { callback(error, apiResponse); }; }); @@ -271,7 +553,7 @@ describe('PubSub', function() { var apiResponse = {}; beforeEach(function() { - pubsub.request = function(protoOpts, reqOpts, callback) { + pubsub.request = function(config, callback) { callback(null, apiResponse); }; }); @@ -302,36 +584,116 @@ describe('PubSub', function() { }); }); - describe('getSnapshots', function() { - var SNAPSHOT_NAME = 'fake-snapshot'; - var apiResponse = { snapshots: [{ name: SNAPSHOT_NAME }]}; + describe('determineBaseUrl_', function() { + function setHost(host) { + process.env.PUBSUB_EMULATOR_HOST = host; + } beforeEach(function() { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, apiResponse); - }; + delete process.env.PUBSUB_EMULATOR_HOST; }); - it('should accept a query and a callback', function(done) { - pubsub.getSnapshots({}, done); - }); + it('should do nothing if correct options are not set', function() { + pubsub.determineBaseUrl_(); - it('should accept just a callback', function(done) { - pubsub.getSnapshots(done); + assert.strictEqual(pubsub.options.servicePath, undefined); + assert.strictEqual(pubsub.options.port, undefined); + }); + + it('should use the apiEndpoint option', function() { + var defaultBaseUrl_ = 'defaulturl'; + var testingUrl = 'localhost:8085'; + + setHost(defaultBaseUrl_); + pubsub.options.apiEndpoint = testingUrl; + pubsub.determineBaseUrl_(); + + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, '8085'); + }); + + it('should remove slashes from the baseUrl', function() { + setHost('localhost:8080/'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, '8080'); + + setHost('localhost:8081//'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, '8081'); + }); + + it('should set the port to undefined if not set', function() { + setHost('localhost'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, undefined); + }); + + describe('with PUBSUB_EMULATOR_HOST environment variable', function() { + var PUBSUB_EMULATOR_HOST = 'localhost:9090'; + + beforeEach(function() { + setHost(PUBSUB_EMULATOR_HOST); + }); + + after(function() { + delete process.env.PUBSUB_EMULATOR_HOST; + }); + + it('should use the PUBSUB_EMULATOR_HOST env var', function() { + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, '9090'); + }); + }); + }); + + describe('getSnapshots', function() { + var SNAPSHOT_NAME = 'fake-snapshot'; + var apiResponse = { snapshots: [{ name: SNAPSHOT_NAME }]}; + + beforeEach(function() { + pubsub.request = function(config, callback) { + callback(null, apiResponse.snapshots, {}, apiResponse); + }; + }); + + it('should accept a query and a callback', function(done) { + pubsub.getSnapshots({}, done); + }); + + it('should accept just a callback', function(done) { + pubsub.getSnapshots(done); }); it('should build the right request', function(done) { - var options = { a: 'b', c: 'd' }; - var originalOptions = extend({}, options); + var options = { + a: 'b', + c: 'd', + gaxOpts: { + e: 'f' + }, + autoPaginate: false + }; + var expectedOptions = extend({}, options, { project: 'projects/' + pubsub.projectId }); - pubsub.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'listSnapshots'); - assert.deepEqual(reqOpts, expectedOptions); - assert.deepEqual(options, originalOptions); + var expectedGaxOpts = extend({ + autoPaginate: options.autoPaginate + }, options.gaxOpts); + + delete expectedOptions.gaxOpts; + delete expectedOptions.autoPaginate; + + pubsub.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'listSnapshots'); + assert.deepEqual(config.reqOpts, expectedOptions); + assert.deepEqual(config.gaxOpts, expectedGaxOpts); done(); }; @@ -354,54 +716,32 @@ describe('PubSub', function() { }); }); - it('should return a query if more results exist', function() { - var token = 'next-page-token'; - - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, { nextPageToken: token }); - }; - - var query = { pageSize: 1 }; - - pubsub.getSnapshots(query, function(err, snapshots, nextQuery) { - assert.ifError(err); - assert.strictEqual(query.pageSize, nextQuery.pageSize); - assert.equal(query.pageToken, token); - }); - }); - - it('should pass error if api returns an error', function(done) { - var error = new Error('Error'); + it('should pass back all parameters', function(done) { + var err_ = new Error('abc'); + var snapshots_ = null; + var nextQuery_ = {}; + var apiResponse_ = {}; - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(error); - }; - - pubsub.getSnapshots(function(err) { - assert.equal(err, error); - done(); - }); - }); - - it('should pass apiResponse to callback', function(done) { - var resp = { success: true }; - - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); + pubsub.request = function(config, callback) { + callback(err_, snapshots_, nextQuery_, apiResponse_); }; pubsub.getSnapshots(function(err, snapshots, nextQuery, apiResponse) { - assert.ifError(err); - assert.equal(resp, apiResponse); + assert.strictEqual(err, err_); + assert.deepEqual(snapshots, snapshots_); + assert.strictEqual(nextQuery, nextQuery_); + assert.strictEqual(apiResponse, apiResponse_); done(); }); }); }); describe('getSubscriptions', function() { + var apiResponse = { subscriptions: [{ name: 'fake-subscription' }] }; + beforeEach(function() { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, { subscriptions: [{ name: 'fake-subscription' }] }); + pubsub.request = function(config, callback) { + callback(null, apiResponse.subscriptions, {}, apiResponse); }; }); @@ -414,49 +754,35 @@ describe('PubSub', function() { }); it('should pass the correct arguments to the API', function(done) { - pubsub.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'listSubscriptions'); - assert.strictEqual(reqOpts.project, 'projects/' + pubsub.projectId); - done(); + var options = { + gaxOpts: { + a: 'b' + }, + autoPaginate: false }; - pubsub.getSubscriptions(assert.ifError); - }); + var expectedGaxOpts = extend({ + autoPaginate: options.autoPaginate + }, options.gaxOpts); - describe('topics', function() { - var TOPIC; - var TOPIC_NAME = 'topic'; + var project = 'projects/' + pubsub.projectId; - beforeEach(function() { - TOPIC = new Topic(pubsub, TOPIC_NAME); - }); - - it('should subscribe to a topic by string', function(done) { - pubsub.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Publisher'); - assert.strictEqual(protoOpts.method, 'listTopicSubscriptions'); - assert.strictEqual(reqOpts.topic, TOPIC_NAME); - done(); - }; - - pubsub.getSubscriptions({ topic: TOPIC_NAME }, assert.ifError); - }); - - it('should subscribe to a topic by Topic instance', function(done) { - pubsub.request = function(protoOpts, reqOpts) { - assert.strictEqual(reqOpts.topic, TOPIC.name); - done(); - }; + pubsub.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'listSubscriptions'); + assert.deepEqual(config.reqOpts, { project: project }); + assert.deepEqual(config.gaxOpts, expectedGaxOpts); + done(); + }; - pubsub.getSubscriptions({ topic: TOPIC }, assert.ifError); - }); + pubsub.getSubscriptions(options, assert.ifError); }); it('should pass options to API request', function(done) { var opts = { pageSize: 10, pageToken: 'abc' }; - pubsub.request = function(protoOpts, reqOpts) { + pubsub.request = function(config) { + var reqOpts = config.reqOpts; assert.strictEqual(reqOpts.pageSize, opts.pageSize); assert.strictEqual(reqOpts.pageToken, opts.pageToken); done(); @@ -465,74 +791,69 @@ describe('PubSub', function() { pubsub.getSubscriptions(opts, assert.ifError); }); - it('should pass error & response if api returns an error', function(done) { - var error = new Error('Error'); - var resp = { error: true }; + it('should return Subscription instances', function(done) { + pubsub.getSubscriptions(function(err, subscriptions) { + assert.ifError(err); + assert(subscriptions[0] instanceof SubscriptionCached); + done(); + }); + }); + + it('should pass back all params', function(done) { + var err_ = new Error('err'); + var subs_ = false; + var nextQuery_ = {}; + var apiResponse_ = {}; - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(error, resp); + pubsub.request = function(config, callback) { + callback(err_, subs_, nextQuery_, apiResponse_); }; pubsub.getSubscriptions(function(err, subs, nextQuery, apiResponse) { - assert.equal(err, error); - assert.deepEqual(apiResponse, resp); + assert.strictEqual(err, err_); + assert.deepEqual(subs, subs_); + assert.strictEqual(nextQuery, nextQuery_); + assert.strictEqual(apiResponse, apiResponse_); done(); }); }); - describe('returning Subscription instances', function() { - it('should handle subscriptions.list response', function(done) { - pubsub.getSubscriptions(function(err, subscriptions) { - assert.ifError(err); - assert(subscriptions[0] instanceof SubscriptionCached); - done(); - }); - }); + describe('with topic', function() { + var TOPIC_NAME = 'topic-name'; - it('should handle topics.subscriptions.list response', function(done) { - var subName = 'sub-name'; - var subFullName = - 'projects/' + PROJECT_ID + '/subscriptions/' + subName; + it('should call topic.getSubscriptions', function(done) { + var topic = new FakeTopic(); - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, { subscriptions: [subName] }); + var opts = { + topic: topic }; - pubsub.getSubscriptions(function(err, subscriptions) { - assert.ifError(err); - assert(subscriptions[0] instanceof SubscriptionCached); - assert.equal(subscriptions[0].name, subFullName); - done(); - }); - }); - }); - - it('should return a query if more results exist', function() { - var token = 'next-page-token'; - - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, { nextPageToken: token }); - }; - - var query = { maxResults: 1 }; + topic.getSubscriptions = function(options, callback) { + assert.strictEqual(options, opts); + callback(); // the done fn + }; - pubsub.getSubscriptions(query, function(err, subscriptions, nextQuery) { - assert.ifError(err); - assert.strictEqual(query.maxResults, nextQuery.maxResults); - assert.equal(query.pageToken, token); + pubsub.getSubscriptions(opts, done); }); - }); - it('should pass apiResponse to callback', function(done) { - var resp = { success: true }; + it('should create a topic instance from a name', function(done) { + var opts = { + topic: TOPIC_NAME + }; - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); - }; + var fakeTopic = { + getSubscriptions: function(options, callback) { + assert.strictEqual(options, opts); + callback(); // the done fn + } + }; - pubsub.getSubscriptions(function(err, subs, nextQuery, apiResponse) { - assert.equal(resp, apiResponse); - done(); + pubsub.topic = function(name) { + assert.strictEqual(name, TOPIC_NAME); + return fakeTopic; + }; + + pubsub.getSubscriptions(opts, done); }); }); }); @@ -542,8 +863,8 @@ describe('PubSub', function() { var apiResponse = { topics: [{ name: topicName }]}; beforeEach(function() { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, apiResponse); + pubsub.request = function(config, callback) { + callback(null, apiResponse.topics, {}, apiResponse); }; }); @@ -556,20 +877,35 @@ describe('PubSub', function() { }); it('should build the right request', function(done) { - var options = { a: 'b', c: 'd' }; - var originalOptions = extend({}, options); + var options = { + a: 'b', + c: 'd', + gaxOpts: { + e: 'f' + }, + autoPaginate: false + }; + var expectedOptions = extend({}, options, { project: 'projects/' + pubsub.projectId }); - pubsub.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Publisher'); - assert.strictEqual(protoOpts.method, 'listTopics'); - assert.deepEqual(reqOpts, expectedOptions); - assert.deepEqual(options, originalOptions); + var expectedGaxOpts = extend({ + autoPaginate: options.autoPaginate + }, options.gaxOpts); + + delete expectedOptions.gaxOpts; + delete expectedOptions.autoPaginate; + + pubsub.request = function(config) { + assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.method, 'listTopics'); + assert.deepEqual(config.reqOpts, expectedOptions); + assert.deepEqual(config.gaxOpts, expectedGaxOpts); done(); }; - pubsub.getTopics(options, function() {}); + + pubsub.getTopics(options, assert.ifError); }); it('should return Topic instances with metadata', function(done) { @@ -588,289 +924,114 @@ describe('PubSub', function() { }); }); - it('should return a query if more results exist', function() { - var token = 'next-page-token'; - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, { nextPageToken: token }); - }; - var query = { pageSize: 1 }; - pubsub.getTopics(query, function(err, topics, nextQuery) { - assert.ifError(err); - assert.strictEqual(query.pageSize, nextQuery.pageSize); - assert.equal(query.pageToken, token); - }); - }); + it('should pass back all params', function(done) { + var err_ = new Error('err'); + var topics_ = false; + var nextQuery_ = {}; + var apiResponse_ = {}; - it('should pass error if api returns an error', function() { - var error = new Error('Error'); - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(error); + pubsub.request = function(config, callback) { + callback(err_, topics_, nextQuery_, apiResponse_); }; - pubsub.getTopics(function(err) { - assert.equal(err, error); - }); - }); - it('should pass apiResponse to callback', function(done) { - var resp = { success: true }; - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); - }; pubsub.getTopics(function(err, topics, nextQuery, apiResponse) { - assert.equal(resp, apiResponse); + assert.strictEqual(err, err_); + assert.deepEqual(topics, topics_); + assert.strictEqual(nextQuery, nextQuery_); + assert.strictEqual(apiResponse, apiResponse_); done(); }); }); }); - describe('subscribe', function() { - var TOPIC_NAME = 'topic'; - var TOPIC = { - name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME - }; - - var SUB_NAME = 'subscription'; - var SUBSCRIPTION = { - name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME - }; - - var apiResponse = { - name: 'subscription-name' + describe('request', function() { + var CONFIG = { + client: 'fakeClient', + method: 'fakeMethod', + reqOpts: { a: 'a' }, + gaxOpts: {} }; - it('should throw if no Topic is provided', function() { - assert.throws(function() { - pubsub.subscribe(); - }, /A Topic is required for a new subscription\./); - }); - - it('should not require a subscription name', function(done) { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, apiResponse); - }; - - pubsub.subscribe(TOPIC_NAME, done); - }); - - it('should not require a sub name and accept options', function(done) { - var opts = {}; - - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, apiResponse); + beforeEach(function() { + pubsub.auth = { + getProjectId: function(callback) { + callback(null, PROJECT_ID); + } }; - pubsub.subscribe(TOPIC_NAME, opts, done); - }); - - it('should not require configuration options', function(done) { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, apiResponse); + pubsub.api = { + fakeClient: { + fakeMethod: function(reqOpts, gaxOpts, callback) { + callback(); // in most cases, the done fn + } + } }; - pubsub.subscribe(TOPIC_NAME, SUB_NAME, done); - }); - - it('should allow undefined/optional configuration options', function(done) { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, apiResponse); + fakeUtil.replaceProjectIdToken = function(reqOpts) { + return reqOpts; }; - - pubsub.subscribe(TOPIC_NAME, SUB_NAME, undefined, done); }); - it('should create a Subscription', function(done) { - var opts = { a: 'b', c: 'd' }; - - pubsub.request = util.noop; - - pubsub.subscription = function(subName, options) { - assert.strictEqual(subName, SUB_NAME); - assert.deepEqual(options, opts); - setImmediate(done); - return SUBSCRIPTION; + it('should get the project id', function(done) { + pubsub.auth.getProjectId = function(callback) { + assert.strictEqual(typeof callback, 'function'); + done(); }; - pubsub.subscribe(TOPIC_NAME, SUB_NAME, opts, assert.ifError); + pubsub.request(CONFIG, assert.ifError); }); - it('should create a Topic object from a string', function(done) { - pubsub.request = util.noop; + it('should return auth errors to the callback', function(done) { + var error = new Error('err'); - pubsub.topic = function(topicName) { - assert.strictEqual(topicName, TOPIC_NAME); - setImmediate(done); - return TOPIC; + pubsub.auth.getProjectId = function(callback) { + callback(error); }; - pubsub.subscribe(TOPIC_NAME, SUB_NAME, assert.ifError); + pubsub.request(CONFIG, function(err) { + assert.strictEqual(err, error); + done(); + }); }); - it('should send correct request', function(done) { - pubsub.topic = function(topicName) { - return { - name: topicName - }; - }; - - pubsub.subscription = function(subName) { - return { - name: subName - }; - }; - - pubsub.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'createSubscription'); - assert.strictEqual(protoOpts.timeout, pubsub.timeout); - assert.strictEqual(reqOpts.topic, TOPIC_NAME); - assert.strictEqual(reqOpts.name, SUB_NAME); + it('should replace the project id token on reqOpts', function(done) { + fakeUtil.replaceProjectIdToken = function(reqOpts, projectId) { + assert.deepEqual(reqOpts, CONFIG.reqOpts); + assert.strictEqual(projectId, PROJECT_ID); done(); }; - pubsub.subscribe(TOPIC_NAME, SUB_NAME, assert.ifError); + pubsub.request(CONFIG, assert.ifError); }); - it('should pass options to the api request', function(done) { - var options = { - ackDeadlineSeconds: 90, - autoAck: true, - encoding: 'utf-8', - interval: 3, - maxInProgress: 5, - retainAckedMessages: true, - pushEndpoint: 'https://domain/push', - timeout: 30000 - }; - - var expectedBody = extend({ - topic: TOPIC_NAME, - name: SUB_NAME - }, options, { - pushConfig: { - pushEndpoint: options.pushEndpoint + it('should instantiate the client lazily', function(done) { + var fakeClientInstance = { + fakeMethod: function(reqOpts, gaxOpts, callback) { + assert.strictEqual(pubsub.api.fakeClient, fakeClientInstance); + callback(); // the done function } - }); - - delete expectedBody.autoAck; - delete expectedBody.encoding; - delete expectedBody.interval; - delete expectedBody.maxInProgress; - delete expectedBody.pushEndpoint; - delete expectedBody.timeout; - - pubsub.topic = function() { - return { - name: TOPIC_NAME - }; }; - pubsub.subscription = function() { + v1Override = function(options) { + assert.strictEqual(options, pubsub.options); + return { - name: SUB_NAME + fakeClient: function(options) { + assert.strictEqual(options, pubsub.options); + return fakeClientInstance; + } }; }; - pubsub.request = function(protoOpts, reqOpts) { - assert.notStrictEqual(reqOpts, options); - assert.deepEqual(reqOpts, expectedBody); - done(); - }; - - pubsub.subscribe(TOPIC_NAME, SUB_NAME, options, assert.ifError); - }); - - describe('message retention', function() { - it('should accept a number', function(done) { - var threeDaysInSeconds = 3 * 24 * 60 * 60; - - pubsub.request = function(protoOpts, reqOpts) { - assert.strictEqual(reqOpts.retainAckedMessages, true); - - assert.strictEqual( - reqOpts.messageRetentionDuration.seconds, - threeDaysInSeconds - ); - - assert.strictEqual(reqOpts.messageRetentionDuration.nanos, 0); - - done(); - }; - - pubsub.subscribe(TOPIC_NAME, SUB_NAME, { - messageRetentionDuration: threeDaysInSeconds - }, assert.ifError); - }); - }); - - describe('error', function() { - var error = new Error('Error.'); - var apiResponse = { name: SUB_NAME }; - - beforeEach(function() { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(error, apiResponse); - }; - }); - - it('should re-use existing subscription', function(done) { - var apiResponse = { code: 409 }; - - pubsub.subscription = function() { - return SUBSCRIPTION; - }; - - pubsub.request = function(protoOpts, reqOpts, callback) { - callback({ code: 409 }, apiResponse); - }; - - pubsub.subscribe(TOPIC_NAME, SUB_NAME, function(err, subscription) { - assert.ifError(err); - assert.strictEqual(subscription, SUBSCRIPTION); - done(); - }); - }); - - it('should return error & API response to the callback', function(done) { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(error, apiResponse); - }; - - pubsub.subscribe(TOPIC_NAME, SUB_NAME, function(err, sub, resp) { - assert.strictEqual(err, error); - assert.strictEqual(sub, null); - assert.strictEqual(resp, apiResponse); - done(); - }); - }); + delete pubsub.api.fakeClient; + pubsub.request(CONFIG, done); }); - describe('success', function() { - var apiResponse = { name: SUB_NAME }; - - beforeEach(function() { - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, apiResponse); - }; - }); - - it('should return Subscription & resp to the callback', function(done) { - var subscription = {}; - - pubsub.subscription = function() { - return subscription; - }; - - pubsub.request = function(protoOpts, reqOpts, callback) { - callback(null, apiResponse); - }; - - pubsub.subscribe(TOPIC_NAME, SUB_NAME, function(err, sub, resp) { - assert.ifError(err); - assert.strictEqual(sub, subscription); - assert.strictEqual(resp, apiResponse); - done(); - }); - }); + it('should do nothing if sandbox env var is set', function(done) { + global.GCLOUD_SANDBOX_ENV = true; + pubsub.request(CONFIG, done); // should not fire done + global.GCLOUD_SANDBOX_ENV = false; + done(); }); }); @@ -894,7 +1055,7 @@ describe('PubSub', function() { describe('subscription', function() { var SUB_NAME = 'new-sub-name'; - var CONFIG = { autoAck: true, interval: 90 }; + var CONFIG = {}; it('should return a Subscription object', function() { SubscriptionOverride = function() {}; @@ -903,53 +1064,25 @@ describe('PubSub', function() { }); it('should pass specified name to the Subscription', function(done) { - SubscriptionOverride = function(pubsub, options) { - assert.equal(options.name, SUB_NAME); + SubscriptionOverride = function(pubsub, name) { + assert.equal(name, SUB_NAME); done(); }; - pubsub.subscription(SUB_NAME, {}); + pubsub.subscription(SUB_NAME); }); it('should honor settings', function(done) { - SubscriptionOverride = function(pubsub, options) { - assert.deepEqual(options, CONFIG); + SubscriptionOverride = function(pubsub, name, options) { + assert.strictEqual(options, CONFIG); done(); }; pubsub.subscription(SUB_NAME, CONFIG); }); - it('should not require a name', function(done) { - SubscriptionOverride = function(pubsub, options) { - assert.deepEqual(options, { - name: undefined - }); - done(); - }; - - pubsub.subscription(); - }); - - it('should not require a name and accept options', function(done) { - SubscriptionOverride = function(pubsub, options) { - var expectedOptions = extend({}, CONFIG); - expectedOptions.name = undefined; - - assert.deepEqual(options, expectedOptions); - done(); - }; - - pubsub.subscription(CONFIG); - }); - - it('should not require options', function(done) { - SubscriptionOverride = function(pubsub, options) { - assert.deepEqual(options, { - name: SUB_NAME - }); - done(); - }; - - pubsub.subscription(SUB_NAME); + it('should throw if a name is not provided', function() { + assert.throws(function() { + return pubsub.subscription(); + }, /A name must be specified for a subscription\./); }); }); @@ -957,170 +1090,11 @@ describe('PubSub', function() { it('should throw if a name is not provided', function() { assert.throws(function() { pubsub.topic(); - }, /A name must be specified for a new topic\./); + }, /A name must be specified for a topic\./); }); it('should return a Topic object', function() { - assert(pubsub.topic('new-topic') instanceof Topic); - }); - }); - - describe('request', function() { - var TIMEOUT = Math.random(); - - beforeEach(function() { - GAX_CONFIG_PUBLISHER_OVERRIDE.methods = { - MethodName: { - timeout_millis: TIMEOUT - } - }; - }); - - after(function() { - GAX_CONFIG_PUBLISHER_OVERRIDE.methods = {}; - }); - - it('should pass through the request', function(done) { - var args = [ - { - service: 'Publisher', - method: 'MethodName' - }, - { - value: true - }, - { - anotherValue: true - } - ]; - - grpcServiceRequestOverride = function() { - assert.strictEqual(this, pubsub); - assert.strictEqual(args[0], arguments[0]); - assert.strictEqual(args[1], arguments[1]); - assert.strictEqual(args[2], arguments[2]); - done(); - }; - - pubsub.request.apply(pubsub, args); - }); - - it('should assign a timeout', function(done) { - grpcServiceRequestOverride = function(protoOpts) { - assert.strictEqual(protoOpts.timeout, TIMEOUT); - done(); - }; - - pubsub.request({ - service: 'Publisher', - method: 'MethodName' - }); - }); - - it('should not override a timeout if set', function(done) { - var timeout = 0; - - grpcServiceRequestOverride = function(protoOpts) { - assert.strictEqual(protoOpts.timeout, timeout); - done(); - }; - - pubsub.request({ - service: 'Publisher', - method: 'MethodName', - timeout: timeout - }); - }); - - it('should camel case the method name', function(done) { - grpcServiceRequestOverride = function(protoOpts) { - assert.strictEqual(protoOpts.timeout, TIMEOUT); - done(); - }; - - pubsub.request({ - service: 'Publisher', - method: 'methodName' - }); - }); - }); - - describe('determineBaseUrl_', function() { - function setHost(host) { - process.env.PUBSUB_EMULATOR_HOST = host; - } - - beforeEach(function() { - delete process.env.PUBSUB_EMULATOR_HOST; - }); - - it('should set base url to parameter sent', function() { - var defaultBaseUrl_ = 'defaulturl'; - var testingUrl = 'localhost:8085'; - - setHost(defaultBaseUrl_); - pubsub.defaultBaseUrl_ = defaultBaseUrl_; - - pubsub.determineBaseUrl_(testingUrl); - assert.strictEqual(pubsub.baseUrl_, testingUrl); - }); - - it('should default to defaultBaseUrl_', function() { - var defaultBaseUrl_ = 'defaulturl'; - pubsub.defaultBaseUrl_ = defaultBaseUrl_; - - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.baseUrl_, defaultBaseUrl_); - }); - - it('should remove slashes from the baseUrl', function() { - var expectedBaseUrl = 'localhost:8080'; - - setHost('localhost:8080/'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.baseUrl_, expectedBaseUrl); - - setHost('localhost:8080//'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.baseUrl_, expectedBaseUrl); - }); - - it('should remove the protocol if specified', function() { - setHost('http://localhost:8080'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.baseUrl_, 'localhost:8080'); - - setHost('https://localhost:8080'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.baseUrl_, 'localhost:8080'); - }); - - it('should not set customEndpoint_ when using default baseurl', function() { - var pubsub = new PubSub({ projectId: PROJECT_ID }); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.customEndpoint_, undefined); - }); - - describe('with PUBSUB_EMULATOR_HOST environment variable', function() { - var PUBSUB_EMULATOR_HOST = 'localhost:9090'; - - beforeEach(function() { - setHost(PUBSUB_EMULATOR_HOST); - }); - - after(function() { - delete process.env.PUBSUB_EMULATOR_HOST; - }); - - it('should use the PUBSUB_EMULATOR_HOST env var', function() { - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.baseUrl_, PUBSUB_EMULATOR_HOST); - }); - - it('should set customEndpoint_', function() { - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.customEndpoint_, true); - }); + assert(pubsub.topic('new-topic') instanceof FakeTopic); }); }); }); diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js new file mode 100644 index 00000000000..d5e0487b24a --- /dev/null +++ b/handwritten/pubsub/test/publisher.js @@ -0,0 +1,329 @@ +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); +var common = require('@google-cloud/common'); +var extend = require('extend'); +var proxyquire = require('proxyquire'); + +var promisified = false; +var fakeUtil = extend({}, common.util, { + promisifyAll: function(Class) { + if (Class.name === 'Publisher') { + promisified = true; + } + } +}); + +describe('Publisher', function() { + var Publisher; + var publisher; + var batchOpts; + + var TOPIC_NAME = 'test-topic'; + var TOPIC = { + name: TOPIC_NAME, + request: fakeUtil.noop + }; + + before(function() { + Publisher = proxyquire('../src/publisher.js', { + '@google-cloud/common': { + util: fakeUtil + } + }); + }); + + beforeEach(function() { + TOPIC.request = fakeUtil.noop; + publisher = new Publisher(TOPIC); + batchOpts = publisher.settings.batching; + }); + + describe('initialization', function() { + it('should promisify all the things', function() { + assert(promisified); + }); + + it('should localize the topic object', function() { + assert.strictEqual(publisher.topic, TOPIC); + }); + + it('should create an inventory object', function() { + assert.deepEqual(publisher.inventory_, { + callbacks: [], + queued: [], + bytes: 0 + }); + }); + + describe('options', function() { + it('should provide default values for batching', function() { + assert.deepEqual(publisher.settings.batching, { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 1000 + }); + }); + + it('should capture user specified options', function() { + var options = { + maxBytes: 10, + maxMessages: 11, + maxMilliseconds: 12 + }; + var optionsCopy = extend({}, options); + + var publisher = new Publisher(TOPIC, { + batching: options + }); + + assert.deepEqual(publisher.settings.batching, options); + assert.deepEqual(options, optionsCopy); + }); + + it('should cap maxBytes', function() { + var expected = Math.pow(1024, 2) * 9; + + var publisher = new Publisher(TOPIC, { + batching: { maxBytes: expected + 1024 } + }); + + assert.strictEqual(publisher.settings.batching.maxBytes, expected); + }); + + it('should cap maxMessages', function() { + var publisher = new Publisher(TOPIC, { + batching: { maxMessages: 2000 } + }); + + assert.strictEqual(publisher.settings.batching.maxMessages, 1000); + }); + }); + }); + + describe('publish', function() { + var DATA = new Buffer('hello'); + var ATTRS = { a: 'a' }; + + var globalSetTimeout; + + before(function() { + globalSetTimeout = global.setTimeout; + }); + + beforeEach(function() { + publisher.publish_ = fakeUtil.noop; + global.setTimeout = fakeUtil.noop; + }); + + after(function() { + global.setTimeout = globalSetTimeout; + }); + + it('should throw an error when data is not a buffer', function() { + assert.throws(function() { + publisher.publish('hello', {}, fakeUtil.noop); + }, /Data must be in the form of a Buffer\./); + }); + + it('should queue the data', function(done) { + publisher.queue_ = function(data, attrs, callback) { + assert.strictEqual(data, DATA); + assert.strictEqual(attrs, ATTRS); + callback(); // the done fn + }; + + publisher.publish(DATA, ATTRS, done); + }); + + it('should optionally accept attributes', function(done) { + publisher.queue_ = function(data, attrs, callback) { + assert.strictEqual(data, DATA); + assert.deepEqual(attrs, {}); + callback(); // the done fn + }; + + publisher.publish(DATA, done); + }); + + it('should publish if data puts payload size over cap', function(done) { + var queueCalled = false; + + publisher.publish_ = function() { + assert.strictEqual(queueCalled, false); + publisher.inventory_.bytes = 0; + }; + + publisher.queue_ = function(data, attrs, callback) { + assert.strictEqual(publisher.inventory_.bytes, 0); + queueCalled = true; + callback(); // the done fn + }; + + publisher.inventory_.bytes = batchOpts.maxBytes - 1; + publisher.publish(DATA, done); + }); + + it('should publish if data puts payload at size cap', function(done) { + publisher.queue_ = function() { + publisher.inventory_.bytes += DATA.length; + }; + + publisher.publish_ = done; + publisher.inventory_.bytes = batchOpts.maxBytes - DATA.length; + publisher.publish(DATA, fakeUtil.noop); + }); + + it('should publish if data puts payload at message cap', function(done) { + var queueCalled = false; + + publisher.queue_ = function() { + queueCalled = true; + }; + + publisher.publish_ = function() { + assert(queueCalled); + done(); + }; + + publisher.inventory_.queued = Array(batchOpts.maxMessages).fill({}); + publisher.publish(DATA, fakeUtil.noop); + }); + + it('should set a timeout if a publish did not occur', function(done) { + var globalSetTimeout = global.setTimeout; + var fakeTimeoutHandle = 12345; + + global.setTimeout = function(callback, duration) { + assert.strictEqual(duration, batchOpts.maxMilliseconds); + global.setTimeout = globalSetTimeout; + setImmediate(callback); + return fakeTimeoutHandle; + }; + + publisher.publish_ = done; + publisher.publish(DATA, fakeUtil.noop); + + assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); + }); + + it('should not set a timeout if one exists', function() { + var fakeTimeoutHandle = 'not-a-real-handle'; + + publisher.timeoutHandle_ = 'not-a-real-handle'; + publisher.publish(DATA, fakeUtil.noop); + assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); + }); + }); + + describe('publish_', function() { + it('should cancel any publish timeouts', function(done) { + publisher.timeoutHandle_ = setTimeout(done, 1); + publisher.publish_(); + assert.strictEqual(publisher.timeoutHandle_, null); + done(); + }); + + it('should reset the inventory object', function() { + publisher.inventory_.callbacks.push(fakeUtil.noop); + publisher.inventory_.queued.push({}); + publisher.inventory_.bytes = 5; + + publisher.publish_(); + + assert.deepEqual(publisher.inventory_.callbacks, []); + assert.deepEqual(publisher.inventory_.queued, []); + assert.strictEqual(publisher.inventory_.bytes, 0); + }); + + it('should make the correct request', function(done) { + var FAKE_MESSAGE = {}; + + TOPIC.request = function(config) { + assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.method, 'publish'); + assert.deepEqual(config.reqOpts, { + topic: TOPIC_NAME, + messages: [FAKE_MESSAGE] + }); + done(); + }; + + publisher.inventory_.queued.push(FAKE_MESSAGE); + publisher.publish_(); + }); + + it('should pass back the err/msg id to correct callback', function(done) { + var error = new Error('err'); + var FAKE_IDS = ['abc', 'def']; + var callbackCalls = 0; + + publisher.inventory_.callbacks = [ + function(err, messageId) { + assert.strictEqual(err, error); + assert.strictEqual(messageId, FAKE_IDS[0]); + callbackCalls += 1; + }, + function(err, messageId) { + assert.strictEqual(err, error); + assert.strictEqual(messageId, FAKE_IDS[1]); + callbackCalls += 1; + }, + function(err, messageId) { + assert.strictEqual(err, error); + assert.strictEqual(messageId, undefined); + assert.strictEqual(callbackCalls, 2); + done(); + } + ]; + + TOPIC.request = function(config, callback) { + callback(error, { messageIds: FAKE_IDS }); + }; + + publisher.publish_(); + }); + }); + + describe('queue_', function() { + var DATA = new Buffer('hello'); + var ATTRS = { a: 'a' }; + + it('should add the data and attrs to the inventory', function() { + publisher.queue_(DATA, ATTRS, fakeUtil.noop); + + assert.deepEqual(publisher.inventory_.queued, [{ + data: DATA, + attributes: ATTRS + }]); + }); + + it('should update the inventory size', function() { + publisher.queue_(DATA, ATTRS, fakeUtil.noop); + + assert.strictEqual(publisher.inventory_.bytes, DATA.length); + }); + + it('should capture the callback', function() { + publisher.queue_(DATA, ATTRS, fakeUtil.noop); + + assert.deepEqual(publisher.inventory_.callbacks, [fakeUtil.noop]); + }); + }); +}); diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.js index d97f76a6559..0e9f1d711eb 100644 --- a/handwritten/pubsub/test/snapshot.js +++ b/handwritten/pubsub/test/snapshot.js @@ -17,14 +17,22 @@ 'use strict'; var assert = require('assert'); +var common = require('@google-cloud/common'); +var extend = require('extend'); var proxyquire = require('proxyquire'); -function FakeGrpcServiceObject() { - this.calledWith_ = arguments; -} +var promisified = false; +var fakeUtil = extend({}, common.util, { + promisifyAll: function(Class) { + if (Class.name === 'Snapshot') { + promisified = true; + } + } +}); describe('Snapshot', function() { var Snapshot; + var snapshot; var SNAPSHOT_NAME = 'a'; var PROJECT_ID = 'grape-spaceship-123'; @@ -34,19 +42,26 @@ describe('Snapshot', function() { }; var SUBSCRIPTION = { - parent: PUBSUB, + pubsub: PUBSUB, + projectId: PROJECT_ID, + api: {}, createSnapshot: function() {}, seek: function() {} }; before(function() { Snapshot = proxyquire('../src/snapshot.js', { - '@google-cloud/common-grpc': { - ServiceObject: FakeGrpcServiceObject + '@google-cloud/common': { + util: fakeUtil } }); }); + beforeEach(function() { + fakeUtil.noop = function() {}; + snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + }); + describe('initialization', function() { var FULL_SNAPSHOT_NAME = 'a/b/c/d'; var formatName_; @@ -62,6 +77,14 @@ describe('Snapshot', function() { Snapshot.formatName_ = formatName_; }); + it('should promisify all the things', function() { + assert(promisified); + }); + + it('should localize the parent', function() { + assert.strictEqual(snapshot.parent, SUBSCRIPTION); + }); + describe('name', function() { it('should create and cache the full name', function() { Snapshot.formatName_ = function(projectId, name) { @@ -70,11 +93,11 @@ describe('Snapshot', function() { return FULL_SNAPSHOT_NAME; }; - var snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); + var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); assert.strictEqual(snapshot.name, FULL_SNAPSHOT_NAME); }); - it('should pull the projectId from subscription parent', function() { + it('should pull the projectId from parent object', function() { Snapshot.formatName_ = function(projectId, name) { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, SNAPSHOT_NAME); @@ -86,37 +109,15 @@ describe('Snapshot', function() { }); }); - it('should inherit from GrpcServiceObject', function() { - var snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); - var calledWith = snapshot.calledWith_[0]; - - assert(snapshot instanceof FakeGrpcServiceObject); - assert.strictEqual(calledWith.parent, PUBSUB); - assert.strictEqual(calledWith.id, FULL_SNAPSHOT_NAME); - assert.deepEqual(calledWith.methods, { - delete: { - protoOpts: { - service: 'Subscriber', - method: 'deleteSnapshot' - }, - reqOpts: { - snapshot: FULL_SNAPSHOT_NAME - } - } - }); - }); - describe('with Subscription parent', function() { it('should include the create method', function(done) { - SUBSCRIPTION.createSnapshot = function(callback) { + SUBSCRIPTION.createSnapshot = function(name, callback) { + assert.strictEqual(name, SNAPSHOT_NAME); callback(); // The done function }; var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); - var calledWith = snapshot.calledWith_[0]; - - assert(calledWith.methods.create); - calledWith.createMethod(done); + snapshot.create(done); }); it('should create a seek method', function(done) { @@ -129,6 +130,22 @@ describe('Snapshot', function() { snapshot.seek(done); }); }); + + describe('with PubSub parent', function() { + var snapshot; + + beforeEach(function() { + snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); + }); + + it('should not include the create method', function() { + assert.strictEqual(snapshot.create, undefined); + }); + + it('should not include a seek method', function() { + assert.strictEqual(snapshot.seek, undefined); + }); + }); }); describe('formatName_', function() { @@ -146,4 +163,27 @@ describe('Snapshot', function() { assert.strictEqual(name, EXPECTED); }); }); + + describe('delete', function() { + it('should make the correct request', function(done) { + snapshot.parent.request = function(config, callback) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'deleteSnapshot'); + assert.deepEqual(config.reqOpts, { snapshot: snapshot.name }); + callback(); // the done fn + }; + + snapshot.delete(done); + }); + + it('should optionally accept a callback', function(done) { + fakeUtil.noop = done; + + snapshot.parent.request = function(config, callback) { + callback(); // the done fn + }; + + snapshot.delete(); + }); + }); }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index a84bc9b9c2d..63fa029b502 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -17,21 +17,41 @@ 'use strict'; var assert = require('assert'); +var common = require('@google-cloud/common'); +var events = require('events'); var extend = require('extend'); +var is = require('is'); var proxyquire = require('proxyquire'); -var util = require('@google-cloud/common').util; +var util = require('util'); + +var FAKE_FREE_MEM = 168222720; +var fakeOs = { + freemem: function() { + return FAKE_FREE_MEM; + } +}; var promisified = false; -var fakeUtil = extend({}, util, { - promisifyAll: function(Class) { - if (Class.name === 'Subscription') { - promisified = true; +var fakeUtil = extend({}, common.util, { + promisifyAll: function(Class, options) { + if (Class.name !== 'Subscription') { + return; } + + promisified = true; + assert.deepEqual(options.exclude, ['snapshot']); } }); -function FakeGrpcServiceObject() { - this.calledWith_ = arguments; +function FakeConnectionPool() { + this.calledWith_ = [].slice.call(arguments); + events.EventEmitter.call(this); +} + +util.inherits(FakeConnectionPool, events.EventEmitter); + +function FakeHistogram() { + this.calledWith_ = [].slice.call(arguments); } function FakeIAM() { @@ -39,11 +59,9 @@ function FakeIAM() { } function FakeSnapshot() { - this.calledWith_ = arguments; + this.calledWith_ = [].slice.call(arguments); } -var formatMessageOverride; - describe('Subscription', function() { var Subscription; var subscription; @@ -51,36 +69,10 @@ describe('Subscription', function() { var PROJECT_ID = 'test-project'; var SUB_NAME = 'test-subscription'; var SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; + var PUBSUB = { projectId: PROJECT_ID, - request: util.noop - }; - var message = 'howdy'; - var messageBuffer = new Buffer(message).toString('base64'); - var messageBinary = new Buffer(message).toString('binary'); - var messageObj = { - receivedMessages: [{ - ackId: 'abc', - message: { - data: messageBuffer, - messageId: 7 - } - }] - }; - var expectedMessage = { - ackId: 'abc', - data: message, - id: 7 - }; - var expectedMessageAsBinary = { - ackId: 'abc', - data: messageBinary, - id: 7 - }; - var expectedMessageAsBase64 = { - ackId: 'abc', - data: messageBuffer, - id: 7 + request: fakeUtil.noop }; before(function() { @@ -88,27 +80,17 @@ describe('Subscription', function() { '@google-cloud/common': { util: fakeUtil }, - '@google-cloud/common-grpc': { - ServiceObject: FakeGrpcServiceObject - }, + os: fakeOs, + './connection-pool.js': FakeConnectionPool, + './histogram.js': FakeHistogram, './iam.js': FakeIAM, './snapshot.js': FakeSnapshot }); - - var formatMessage = Subscription.formatMessage_; - Subscription.formatMessage_ = function() { - return (formatMessageOverride || formatMessage).apply(null, arguments); - }; }); beforeEach(function() { - subscription = new Subscription(PUBSUB, { name: SUB_NAME }); - PUBSUB.request = util.noop; - subscription.parent = PUBSUB; - }); - - afterEach(function() { - formatMessageOverride = null; + PUBSUB.request = fakeUtil.noop = function() {}; + subscription = new Subscription(PUBSUB, SUB_NAME); }); describe('initialization', function() { @@ -116,247 +98,123 @@ describe('Subscription', function() { assert(promisified); }); - describe('name', function() { - var FORMATTED_NAME = 'formatted-name'; - var GENERATED_NAME = 'generated-name'; - - var formatName_; - var generateName_; - - before(function() { - formatName_ = Subscription.formatName_; - generateName_ = Subscription.generateName_; - - Subscription.formatName_ = function() { - return FORMATTED_NAME; - }; - - Subscription.generateName_ = function() { - return GENERATED_NAME; - }; - }); - - afterEach(function() { - Subscription.formatName_ = function() { - return FORMATTED_NAME; - }; - - Subscription.generateName_ = function() { - return GENERATED_NAME; - }; - }); - - after(function() { - Subscription.formatName_ = formatName_; - Subscription.generateName_ = generateName_; - }); - - it('should generate name', function(done) { - Subscription.formatName_ = function(projectId, name) { - assert.strictEqual(name, GENERATED_NAME); - done(); - }; - - new Subscription(PUBSUB, {}); - }); - - it('should format name', function() { - Subscription.formatName_ = function(projectId, name) { - assert.strictEqual(projectId, PROJECT_ID); - assert.strictEqual(name, SUB_NAME); - return FORMATTED_NAME; - }; - - var subscription = new Subscription(PUBSUB, { name: SUB_NAME }); - assert.strictEqual(subscription.name, FORMATTED_NAME); - }); - }); - - it('should honor configuration settings', function() { - var CONFIG = { - name: SUB_NAME, - autoAck: true, - interval: 100, - maxInProgress: 3, - encoding: 'binary', - timeout: 30000 - }; - var sub = new Subscription(PUBSUB, CONFIG); - assert.strictEqual(sub.autoAck, CONFIG.autoAck); - assert.strictEqual(sub.interval, CONFIG.interval); - assert.strictEqual(sub.encoding, CONFIG.encoding); - assert.strictEqual(sub.maxInProgress, CONFIG.maxInProgress); - assert.strictEqual(sub.timeout, CONFIG.timeout); + it('should localize the pubsub object', function() { + assert.strictEqual(subscription.pubsub, PUBSUB); }); - it('should be closed', function() { - assert.strictEqual(subscription.closed, true); + it('should localize the project id', function() { + assert.strictEqual(subscription.projectId, PROJECT_ID); }); - it('should default autoAck to false if not specified', function() { - assert.strictEqual(subscription.autoAck, false); - }); + it('should localize pubsub request method', function(done) { + PUBSUB.request = function(callback) { + callback(); // the done fn + }; - it('should set default interval if one is not specified', function() { - assert.equal(subscription.interval, 10); + var subscription = new Subscription(PUBSUB, SUB_NAME); + subscription.request(done); }); - it('should start inProgressAckIds as an empty object', function() { - assert.deepEqual(subscription.inProgressAckIds, {}); + it('should create a histogram instance', function() { + assert(subscription.histogram instanceof FakeHistogram); }); - it('should default maxInProgress to Infinity if not specified', function() { - assert.strictEqual(subscription.maxInProgress, Infinity); - }); + it('should format the sub name', function() { + var formattedName = 'a/b/c/d'; + var formatName = Subscription.formatName_; - it('should set messageListeners to 0', function() { - assert.strictEqual(subscription.messageListeners, 0); - }); + Subscription.formatName_ = function(projectId, name) { + assert.strictEqual(projectId, PROJECT_ID); + assert.strictEqual(name, SUB_NAME); - it('should not be paused', function() { - assert.strictEqual(subscription.paused, false); - }); + Subscription.formatName_ = formatName; - it('should default encoding to utf-8 if not specified', function() { - assert.strictEqual(subscription.encoding, 'utf-8'); - }); + return formattedName; + }; - it('should default timeout to 92 seconds', function() { - assert.strictEqual(subscription.timeout, 92000); + var subscription = new Subscription(PUBSUB, SUB_NAME); + assert.strictEqual(subscription.name, formattedName); }); - it('should create an iam object', function() { - assert.deepEqual(subscription.iam.calledWith_, [ - PUBSUB, - SUB_FULL_NAME - ]); - }); + it('should honor configuration settings', function() { + var options = { + maxConnections: 2, + flowControl: { + maxBytes: 5, + maxMessages: 10 + } + }; - it('should inherit from GrpcServiceObject', function() { - assert(subscription instanceof FakeGrpcServiceObject); + var subscription = new Subscription(PUBSUB, SUB_NAME, options); - var calledWith = subscription.calledWith_[0]; + assert.strictEqual(subscription.maxConnections, options.maxConnections); - assert.strictEqual(calledWith.parent, PUBSUB); - assert.strictEqual(calledWith.id, SUB_FULL_NAME); - assert.deepEqual(calledWith.methods, { - exists: true, - get: true, - getMetadata: { - protoOpts: { - service: 'Subscriber', - method: 'getSubscription' - }, - reqOpts: { - subscription: subscription.name - } - } + assert.deepEqual(subscription.flowControl, { + maxBytes: options.flowControl.maxBytes, + maxMessages: options.flowControl.maxMessages }); }); - it('should allow creating if it is a Topic', function(done) { - var topicInstance = {}; + it('should set sensible defaults', function() { + assert.strictEqual(subscription.ackDeadline, 10000); + assert.strictEqual(subscription.maxConnections, 5); + assert.strictEqual(subscription.userClosed_, false); + assert.strictEqual(subscription.messageListeners, 0); - var pubSubInstance = extend({}, PUBSUB, { - subscribe: { - bind: function(context, topic) { - assert.strictEqual(context, pubSubInstance); - assert.strictEqual(topic, topicInstance); - done(); - } - } + assert.deepEqual(subscription.flowControl, { + maxBytes: FAKE_FREE_MEM * 0.2, + maxMessages: Infinity }); + }); - var subscription = new Subscription(pubSubInstance, { - name: SUB_NAME, - topic: topicInstance - }); + it('should create an inventory object', function() { + assert(is.object(subscription.inventory_)); + assert(is.array(subscription.inventory_.lease)); + assert(is.array(subscription.inventory_.ack)); + assert(is.array(subscription.inventory_.nack)); + assert.strictEqual(subscription.inventory_.bytes, 0); + }); - var calledWith = subscription.calledWith_[0]; - assert.deepEqual(calledWith.methods.create, true); + it('should inherit from EventEmitter', function() { + assert(subscription instanceof events.EventEmitter); }); - }); - describe('formatMessage_', function() { - it('should decode stringified JSON to object', function() { - var obj = { hi: 'there' }; - var stringified = new Buffer(JSON.stringify(obj)).toString('base64'); - var attributes = {}; - var publishTime = { - seconds: '1480413405', - nanos: 617000000 + it('should make a create method if a topic is found', function(done) { + var TOPIC_NAME = 'test-topic'; + + PUBSUB.createSubscription = function(topic, subName, callback) { + assert.strictEqual(topic, TOPIC_NAME); + assert.strictEqual(subName, SUB_NAME); + callback(); // the done function }; - var seconds = parseInt(publishTime.seconds, 10); - var milliseconds = parseInt(publishTime.nanos, 10) / 1e6; - var expectedDate = new Date(seconds * 1000 + milliseconds); - - var msg = Subscription.formatMessage_({ - ackId: 'abc', - message: { - data: stringified, - messageId: 7, - attributes: attributes, - publishTime: publishTime - } + var subscription = new Subscription(PUBSUB, SUB_NAME, { + topic: TOPIC_NAME }); - assert.deepEqual(msg, { - ackId: 'abc', - id: 7, - data: obj, - attributes: attributes, - timestamp: expectedDate - }); + subscription.create(done); }); - it('should work if nanos is 0', function() { - var obj = { hi: 'there' }; - var stringified = new Buffer(JSON.stringify(obj)).toString('base64'); - var attributes = {}; - var publishTime = { - seconds: '1480413405', - nanos: 0 - }; + it('should create an IAM object', function() { + assert(subscription.iam instanceof FakeIAM); - var seconds = parseInt(publishTime.seconds, 10); - var milliseconds = parseInt(publishTime.nanos, 10) / 1e6; - var expectedDate = new Date(seconds * 1000 + milliseconds); - - var msg = Subscription.formatMessage_({ - ackId: 'abc', - message: { - data: stringified, - messageId: 7, - attributes: attributes, - publishTime: publishTime - } - }); + var args = subscription.iam.calledWith_; - assert.deepEqual(msg, { - ackId: 'abc', - id: 7, - data: obj, - attributes: attributes, - timestamp: expectedDate - }); + assert.strictEqual(args[0], PUBSUB); + assert.strictEqual(args[1], subscription.name); }); - it('should decode buffer to string', function() { - var msg = Subscription.formatMessage_(messageObj.receivedMessages[0]); - assert.deepEqual(msg, expectedMessage); - }); + it('should listen for events', function() { + var called = false; + var listenForEvents = Subscription.prototype.listenForEvents_; - it('should decode buffer to base64', function() { - var msg = Subscription - .formatMessage_(messageObj.receivedMessages[0], 'base64'); - assert.deepEqual(msg, expectedMessageAsBase64); - }); + Subscription.prototype.listenForEvents_ = function() { + Subscription.prototype.listenForEvents_ = listenForEvents; + called = true; + }; - it('should decode buffer to specified encoding', function() { - var msg = Subscription - .formatMessage_(messageObj.receivedMessages[0], 'binary'); - assert.deepEqual(msg, expectedMessageAsBinary); + new Subscription(PUBSUB, SUB_NAME); + assert(called); }); }); @@ -372,922 +230,1531 @@ describe('Subscription', function() { }); }); - describe('ack', function() { - it('should throw if no IDs are provided', function() { - assert.throws(function() { - subscription.ack(); - }, /At least one ID must be specified before it can be acknowledged\./); - assert.throws(function() { - subscription.ack([]); - }, /At least one ID must be specified before it can be acknowledged\./); - }); - - it('should accept a single id', function() { - assert.doesNotThrow(function() { - subscription.ack(1, util.noop); - }); - }); + describe('ack_', function() { + var MESSAGE = { + ackId: 'abc', + received: 12345, + connectionId: 'def' + }; - it('should accept an array of ids', function() { - assert.doesNotThrow(function() { - subscription.ack([1], util.noop); - }); + beforeEach(function() { + subscription.setFlushTimeout_ = fakeUtil.noop; + subscription.breakLease_ = fakeUtil.noop; + subscription.histogram.add = fakeUtil.noop; }); - it('should make an array out of ids', function(done) { - var ID = 'abc'; - - subscription.parent.request = function(protoOpts, reqOpts) { - assert.deepEqual(reqOpts.ackIds, [ID]); + it('should break the lease on the message', function(done) { + subscription.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); done(); }; - subscription.ack(ID, assert.ifError); + subscription.ack_(MESSAGE); }); - it('should make correct api request', function(done) { - var IDS = [1, 2, 3]; - - subscription.parent.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'acknowledge'); - - assert.strictEqual(reqOpts.subscription, subscription.name); - assert.strictEqual(reqOpts.ackIds, IDS); - - done(); - }; - - subscription.ack(IDS, assert.ifError); - }); + it('should add the time it took to ack to the histogram', function(done) { + var fakeNow = 12381832; + var now = global.Date.now; - it('should honor the timeout setting', function(done) { - var options = { - timeout: 10 + global.Date.now = function() { + global.Date.now = now; + return fakeNow; }; - subscription.parent.request = function(protoOpts) { - assert.strictEqual(protoOpts.timeout, options.timeout); + subscription.histogram.add = function(time) { + assert.strictEqual(time, fakeNow - MESSAGE.received); done(); }; - subscription.ack('abc', options, assert.ifError); + subscription.ack_(MESSAGE); }); - it('should not require a callback', function() { - assert.doesNotThrow(function() { - subscription.ack('abc'); - subscription.ack('abc', { - timeout: 10 - }); + describe('without connection pool', function() { + it('should store the ack id in the inventory object', function(done) { + subscription.setFlushTimeout_ = function() { + assert.deepEqual(subscription.inventory_.ack, [MESSAGE.ackId]); + done(); + }; + + subscription.ack_(MESSAGE); }); }); - it('should unmark the ack ids as being in progress', function(done) { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(); - }; - - subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; + describe('with connection pool', function() { + var pool; - subscription.ack(['id1', 'id2'], function(err) { - assert.ifError(err); + beforeEach(function() { + subscription.setFlushTimeout_ = function() { + throw new Error('Should not be called.'); + }; - var inProgressAckIds = subscription.inProgressAckIds; - assert.strictEqual(inProgressAckIds.id1, undefined); - assert.strictEqual(inProgressAckIds.id2, undefined); - assert.strictEqual(inProgressAckIds.id3, true); + pool = { + isConnected: function() { + return true; + } + }; - done(); + subscription.connectionPool = pool; }); - }); - - it('should not unmark if there was an error', function(done) { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(new Error('Error.')); - }; - subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; + it('should set a timeout if pool is not connected', function(done) { + subscription.setFlushTimeout_ = function() { + assert.deepEqual(subscription.inventory_.ack, [MESSAGE.ackId]); + done(); + }; - subscription.ack(['id1', 'id2'], function() { - var inProgressAckIds = subscription.inProgressAckIds; - assert.strictEqual(inProgressAckIds.id1, true); - assert.strictEqual(inProgressAckIds.id2, true); - assert.strictEqual(inProgressAckIds.id3, true); + pool.isConnected = function() { + return false; + }; - done(); + subscription.ack_(MESSAGE); }); - }); - it('should refresh paused status', function(done) { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(); - }; + it('should write to the connection it came in on', function(done) { + var fakeConnection = { + write: function(data) { + assert.deepEqual(data, { ackIds: [MESSAGE.ackId] }); + done(); + } + }; - subscription.refreshPausedStatus_ = done; + pool.acquire = function(connectionId, callback) { + assert.strictEqual(connectionId, MESSAGE.connectionId); + callback(null, fakeConnection); + }; - subscription.ack(1, assert.ifError); - }); + subscription.ack_(MESSAGE); + }); - it('should pass error to callback', function(done) { - var error = new Error('Error.'); + it('should emit an error when unable to get a conn', function(done) { + var error = new Error('err'); - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(error); - }; + pool.acquire = function(connectionId, callback) { + callback(error); + }; - subscription.ack(1, function(err) { - assert.strictEqual(err, error); - done(); - }); - }); + subscription.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); - it('should pass apiResponse to callback', function(done) { - var resp = { success: true }; - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); - }; - subscription.ack(1, function(err, apiResponse) { - assert.deepEqual(resp, apiResponse); - done(); + subscription.ack_(MESSAGE); }); }); }); - describe('createSnapshot', function() { - var SNAPSHOT_NAME = 'a'; + describe('breakLease_', function() { + var MESSAGE = { + ackId: 'abc', + data: new Buffer('hello'), + length: 5 + }; - it('should throw if a name is not provided', function() { - assert.throws(function() { - subscription.createSnapshot(); - }, /A name is required to create a snapshot\./); + beforeEach(function() { + subscription.inventory_.lease.push(MESSAGE.ackId); + subscription.inventory_.bytes += MESSAGE.length; }); - it('should make the correct api request', function(done) { - var FULL_SNAPSHOT_NAME = 'a/b/c/d'; + it('should remove the message from the lease array', function() { + assert.strictEqual(subscription.inventory_.lease.length, 1); + assert.strictEqual(subscription.inventory_.bytes, MESSAGE.length); - FakeSnapshot.formatName_ = function(projectId, name) { - assert.strictEqual(projectId, PROJECT_ID); - assert.strictEqual(name, SNAPSHOT_NAME); - return FULL_SNAPSHOT_NAME; - }; + subscription.breakLease_(MESSAGE); - subscription.parent.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'createSnapshot'); + assert.strictEqual(subscription.inventory_.lease.length, 0); + assert.strictEqual(subscription.inventory_.bytes, 0); + }); - assert.strictEqual(reqOpts.name, FULL_SNAPSHOT_NAME); - assert.strictEqual(reqOpts.subscription, subscription.name); + describe('with connection pool', function() { + it('should resume receiving messages if paused', function(done) { + subscription.connectionPool = { + isPaused: true, + resume: done + }; - done(); - }; + subscription.hasMaxMessages_ = function() { + return false; + }; - subscription.createSnapshot(SNAPSHOT_NAME, assert.ifError); - }); + subscription.breakLease_(MESSAGE); + }); - it('should return an error to the callback', function(done) { - var error = new Error('err'); - var resp = {}; + it('should not resume if it is not paused', function() { + subscription.connectionPool = { + isPaused: false, + resume: function() { + throw new Error('Should not be called.'); + } + }; - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(error, resp); - }; + subscription.hasMaxMessages_ = function() { + return false; + }; - function callback(err, snapshot, apiResponse) { - assert.strictEqual(err, error); - assert.strictEqual(snapshot, null); - assert.strictEqual(apiResponse, resp); - done(); - } + subscription.breakLease_(MESSAGE); + }); - subscription.createSnapshot(SNAPSHOT_NAME, callback); - }); + it('should not resume if the max message limit is hit', function() { + subscription.connectionPool = { + isPaused: true, + resume: function() { + throw new Error('Should not be called.'); + } + }; - it('should return a snapshot object to the callback', function(done) { - var fakeSnapshot = {}; - var resp = {}; + subscription.hasMaxMessages_ = function() { + return true; + }; - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); - }; + subscription.breakLease_(MESSAGE); + }); + }); - subscription.snapshot = function(name) { - assert.strictEqual(name, SNAPSHOT_NAME); - return fakeSnapshot; - }; + it('should quit auto-leasing if all leases are gone', function(done) { + subscription.leaseTimeoutHandle_ = setTimeout(done, 1); + subscription.breakLease_(MESSAGE); - function callback(err, snapshot, apiResponse) { - assert.strictEqual(err, null); - assert.strictEqual(snapshot, fakeSnapshot); - assert.strictEqual(snapshot.metadata, resp); - assert.strictEqual(apiResponse, resp); - done(); - } + assert.strictEqual(subscription.leaseTimeoutHandle_, null); + setImmediate(done); + }); + + it('should continue to auto-lease if leases exist', function(done) { + subscription.inventory_.lease.push(MESSAGE.ackId); + subscription.inventory_.lease.push('abcd'); - subscription.createSnapshot(SNAPSHOT_NAME, callback); + subscription.leaseTimeoutHandle_ = setTimeout(done, 1); + subscription.breakLease_(MESSAGE); }); }); - describe('delete', function() { - it('should delete a subscription', function(done) { - subscription.parent.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'deleteSubscription'); + describe('close', function() { + it('should set the userClosed_ flag', function() { + subscription.close(); - assert.strictEqual(reqOpts.subscription, subscription.name); + assert.strictEqual(subscription.userClosed_, true); + }); - done(); - }; + it('should stop auto-leasing', function(done) { + subscription.leaseTimeoutHandle_ = setTimeout(done, 1); + subscription.close(); - subscription.delete(); + assert.strictEqual(subscription.leaseTimeoutHandle_, null); + setImmediate(done); }); - it('should close a subscription once deleted', function() { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(); - }; - subscription.closed = false; - subscription.delete(); - assert.strictEqual(subscription.closed, true); + it('should stop any queued flushes', function(done) { + subscription.flushTimeoutHandle_ = setTimeout(done, 1); + subscription.close(); + + assert.strictEqual(subscription.flushTimeoutHandle_, null); + setImmediate(done); }); - it('should remove all listeners', function(done) { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(); - }; - subscription.removeAllListeners = function() { - done(); - }; - subscription.delete(); + it('should flush immediately', function(done) { + subscription.flushQueues_ = done; + subscription.close(); }); - it('should execute callback when deleted', function(done) { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(); + it('should call closeConnection_', function(done) { + subscription.closeConnection_ = function(callback) { + callback(); // the done fn }; - subscription.delete(done); + + subscription.close(done); }); + }); - it('should execute callback with an api error', function(done) { - var error = new Error('Error.'); - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(error); - }; - subscription.delete(function(err) { - assert.equal(err, error); - done(); + describe('closeConnection_', function() { + afterEach(function() { + fakeUtil.noop = function() {}; + }); + + describe('with connection pool', function() { + beforeEach(function() { + subscription.connectionPool = { + close: function(callback) { + setImmediate(callback); // the done fn + } + }; + }); + + it('should call close on the connection pool', function(done) { + subscription.closeConnection_(done); + assert.strictEqual(subscription.connectionPool, null); + }); + + it('should use a noop when callback is absent', function(done) { + fakeUtil.noop = done; + subscription.closeConnection_(); + assert.strictEqual(subscription.connectionPool, null); }); }); - it('should execute callback with apiResponse', function(done) { - var resp = { success: true }; - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); - }; - subscription.delete(function(err, apiResponse) { - assert.deepEqual(resp, apiResponse); - done(); + describe('without connection pool', function() { + beforeEach(function() { + subscription.connectionPool = null; + }); + + it('should exec the callback if one is passed in', function(done) { + subscription.closeConnection_(done); + }); + + it('should optionally accept a callback', function() { + subscription.closeConnection_(); }); }); }); - describe('pull', function() { + describe('createSnapshot', function() { + var SNAPSHOT_NAME = 'test-snapshot'; + beforeEach(function() { - subscription.ack = util.noop; - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, messageObj); + subscription.snapshot = function(name) { + return { + name: name + }; }; }); - it('should not require configuration options', function(done) { - subscription.pull(done); + it('should throw an error if a snapshot name is not found', function() { + assert.throws(function() { + subscription.createSnapshot(); + }, /A name is required to create a snapshot\./); }); - it('should default returnImmediately to false', function(done) { - subscription.parent.request = function(protoOpts, reqOpts) { - assert.strictEqual(reqOpts.returnImmediately, false); + it('should make the correct request', function(done) { + subscription.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'createSnapshot'); + assert.deepEqual(config.reqOpts, { + name: SNAPSHOT_NAME, + subscription: subscription.name + }); done(); }; - subscription.pull({}, assert.ifError); + + subscription.createSnapshot(SNAPSHOT_NAME, assert.ifError); }); - it('should honor options', function(done) { - subscription.parent.request = function(protoOpts, reqOpts) { - assert.strictEqual(reqOpts.returnImmediately, true); + it('should optionally accept gax options', function(done) { + var gaxOpts = {}; + + subscription.request = function(config) { + assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; - subscription.pull({ returnImmediately: true }, assert.ifError); - }); - it('should make correct api request', function(done) { - subscription.parent.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'pull'); - assert.strictEqual(protoOpts.timeout, 92000); + subscription.createSnapshot(SNAPSHOT_NAME, gaxOpts, assert.ifError); + }); - assert.strictEqual(reqOpts.subscription, subscription.name); - assert.strictEqual(reqOpts.returnImmediately, false); - assert.strictEqual(reqOpts.maxMessages, 1); + it('should pass back any errors to the callback', function(done) { + var error = new Error('err'); + var apiResponse = {}; - done(); + subscription.request = function(config, callback) { + callback(error, apiResponse); }; - subscription.pull({ maxResults: 1 }, assert.ifError); + subscription.createSnapshot(SNAPSHOT_NAME, function(err, snapshot, resp) { + assert.strictEqual(err, error); + assert.strictEqual(snapshot, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); - it('should pass a timeout if specified', function(done) { - var timeout = 30000; + it('should return a snapshot object with metadata', function(done) { + var apiResponse = {}; + var fakeSnapshot = {}; - var subscription = new Subscription(PUBSUB, { - name: SUB_NAME, - timeout: timeout - }); + subscription.snapshot = function() { + return fakeSnapshot; + }; - subscription.parent = { - request: function(protoOpts) { - assert.strictEqual(protoOpts.timeout, 30000); - done(); - } + subscription.request = function(config, callback) { + callback(null, apiResponse); }; - subscription.pull(assert.ifError); + subscription.createSnapshot(SNAPSHOT_NAME, function(err, snapshot, resp) { + assert.ifError(err); + assert.strictEqual(snapshot, fakeSnapshot); + assert.strictEqual(snapshot.metadata, apiResponse); + assert.strictEqual(resp, apiResponse); + done(); + }); }); + }); - it('should store the active request', function() { - var requestInstance = {}; - - subscription.parent.request = function() { - return requestInstance; + describe('delete', function() { + it('should make the correct request', function(done) { + subscription.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'deleteSubscription'); + assert.deepEqual(config.reqOpts, { subscription: subscription.name }); + done(); }; - subscription.pull(assert.ifError); - assert.strictEqual(subscription.activeRequest_, requestInstance); + subscription.delete(assert.ifError); }); - it('should clear the active request', function(done) { - var requestInstance = {}; - - subscription.parent.request = function(protoOpts, reqOpts, callback) { - setImmediate(function() { - callback(null, {}); - assert.strictEqual(subscription.activeRequest_, null); - done(); - }); + it('should optionally accept gax options', function(done) { + var gaxOpts = {}; - return requestInstance; + subscription.request = function(config) { + assert.strictEqual(config.gaxOpts, gaxOpts); + done(); }; - subscription.pull(assert.ifError); + subscription.delete(gaxOpts, assert.ifError); }); - it('should pass error to callback', function(done) { - var error = new Error('Error.'); - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(error); - }; - subscription.pull(function(err) { - assert.equal(err, error); - done(); + describe('success', function() { + var apiResponse = {}; + + beforeEach(function() { + subscription.request = function(config, callback) { + callback(null, apiResponse); + }; + }); + + it('should optionally accept a callback', function(done) { + fakeUtil.noop = function(err, resp) { + assert.ifError(err); + assert.strictEqual(resp, apiResponse); + done(); + }; + + subscription.delete(); + }); + + it('should return the api response', function(done) { + subscription.delete(function(err, resp) { + assert.ifError(err); + assert.strictEqual(resp, apiResponse); + done(); + }); + }); + + it('should remove all message listeners', function(done) { + var called = false; + + subscription.removeAllListeners = function() { + called = true; + }; + + subscription.delete(function(err) { + assert.ifError(err); + assert(called); + done(); + }); + }); + + it('should close the subscription', function(done) { + var called = false; + + subscription.close = function() { + called = true; + }; + + subscription.delete(function(err) { + assert.ifError(err); + assert(called); + done(); + }); + }); + }); + + describe('error', function() { + var error = new Error('err'); + + beforeEach(function() { + subscription.request = function(config, callback) { + callback(error); + }; + }); + + it('should return the error to the callback', function(done) { + subscription.delete(function(err) { + assert.strictEqual(err, error); + done(); + }); + }); + + it('should not remove all the listeners', function(done) { + subscription.removeAllListeners = function() { + done(new Error('Should not be called.')); + }; + + subscription.delete(function() { + done(); + }); + }); + + it('should not close the subscription', function(done) { + subscription.close = function() { + done(new Error('Should not be called.')); + }; + + subscription.delete(function() { + done(); + }); }); }); + }); - it('should not return messages if request timed out', function(done) { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback({ code: 504 }); + describe('exists', function() { + it('should return true if it finds metadata', function(done) { + subscription.getMetadata = function(callback) { + callback(null, {}); }; - subscription.pull({}, function(err, messages) { + subscription.exists(function(err, exists) { assert.ifError(err); - assert.deepEqual(messages, []); + assert(exists); done(); }); }); - it('should call formatMessage_ with encoding', function(done) { - subscription.encoding = 'encoding-value'; - - formatMessageOverride = function(msg, encoding) { - assert.strictEqual(msg, messageObj.receivedMessages[0]); - assert.strictEqual(encoding, subscription.encoding); - setImmediate(done); - return msg; + it('should return false if a not found error occurs', function(done) { + subscription.getMetadata = function(callback) { + callback({ code: 5 }); }; - subscription.pull({}, assert.ifError); + subscription.exists(function(err, exists) { + assert.ifError(err); + assert.strictEqual(exists, false); + done(); + }); }); - it('should decorate the message', function(done) { - subscription.decorateMessage_ = function() { - done(); + it('should pass back any other type of error', function(done) { + var error = { code: 4 }; + + subscription.getMetadata = function(callback) { + callback(error); }; - subscription.pull({}, assert.ifError); + subscription.exists(function(err, exists) { + assert.strictEqual(err, error); + assert.strictEqual(exists, undefined); + done(); + }); + }); + }); + + describe('flushQueues_', function() { + beforeEach(function() { + subscription.inventory_.ack = ['abc', 'def']; + subscription.inventory_.nack = ['ghi', 'jkl']; }); - it('should refresh paused status', function(done) { - subscription.refreshPausedStatus_ = function() { - done(); + it('should do nothing if theres nothing to ack/nack', function() { + subscription.inventory_.ack = []; + subscription.inventory_.nack = []; + + subscription.connectionPool = { + acquire: function() { + throw new Error('Should not be called.'); + } }; - subscription.pull({}, assert.ifError); + subscription.flushQueues_(); }); - describe('autoAck false', function() { + describe('with connection pool', function() { + var fakeConnection; + beforeEach(function() { - subscription.autoAck = false; - }); + fakeConnection = { + write: fakeUtil.noop + }; - it('should not ack', function() { - subscription.ack = function() { - throw new Error('Should not have acked.'); + subscription.connectionPool = { + acquire: function(callback) { + callback(null, fakeConnection); + } }; - subscription.pull({}, assert.ifError); }); - it('should execute callback with message', function(done) { - subscription.decorateMessage_ = function(msg) { return msg; }; - subscription.pull({}, function(err, msgs) { - assert.ifError(err); - assert.deepEqual(msgs, [expectedMessage]); + it('should emit any connection acquiring errors', function(done) { + var error = new Error('err'); + + subscription.connectionPool.acquire = function(callback) { + callback(error); + }; + + subscription.on('error', function(err) { + assert.strictEqual(err, error); done(); }); + + subscription.flushQueues_(); }); - it('should pass apiResponse to callback', function(done) { - subscription.pull(function(err, msgs, apiResponse) { - assert.ifError(err); - assert.strictEqual(apiResponse, messageObj); + it('should write the acks to the connection', function(done) { + fakeConnection.write = function(reqOpts) { + assert.deepEqual(reqOpts, { + ackIds: ['abc', 'def'] + }); + done(); + }; + + subscription.inventory_.nack = []; + subscription.flushQueues_(); + }); + + it('should write the nacks to the connection', function(done) { + fakeConnection.write = function(reqOpts) { + assert.deepEqual(reqOpts, { + modifyDeadlineAckIds: ['ghi', 'jkl'], + modifyDeadlineSeconds: [0, 0] + }); done(); + }; + + subscription.inventory_.ack = []; + subscription.flushQueues_(); + }); + + it('should clear the inventory after writing', function() { + subscription.flushQueues_(); + + assert.strictEqual(subscription.inventory_.ack.length, 0); + assert.strictEqual(subscription.inventory_.nack.length, 0); + }); + }); + + describe('without connection pool', function() { + describe('acking', function() { + beforeEach(function() { + subscription.inventory_.nack = []; + }); + + it('should make the correct request', function(done) { + subscription.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'acknowledge'); + assert.deepEqual(config.reqOpts, { + subscription: subscription.name, + ackIds: ['abc', 'def'] + }); + done(); + }; + + subscription.flushQueues_(); + }); + + it('should emit any request errors', function(done) { + var error = new Error('err'); + + subscription.request = function(config, callback) { + callback(error); + }; + + subscription.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + subscription.flushQueues_(); + }); + + it('should clear the inventory on success', function(done) { + subscription.request = function(config, callback) { + callback(null); + assert.strictEqual(subscription.inventory_.ack.length, 0); + done(); + }; + + subscription.flushQueues_(); }); }); + + describe('nacking', function() { + beforeEach(function() { + subscription.inventory_.ack = []; + }); + + it('should make the correct request', function(done) { + subscription.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'modifyAckDeadline'); + assert.deepEqual(config.reqOpts, { + subscription: subscription.name, + ackIds: ['ghi', 'jkl'], + ackDeadlineSeconds: 0 + }); + done(); + }; + + subscription.flushQueues_(); + }); + + it('should emit any request errors', function(done) { + var error = new Error('err'); + + subscription.request = function(config, callback) { + callback(error); + }; + + subscription.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + subscription.flushQueues_(); + }); + + it('should clear the inventory on success', function(done) { + subscription.request = function(config, callback) { + callback(null); + assert.strictEqual(subscription.inventory_.nack.length, 0); + done(); + }; + + subscription.flushQueues_(); + }); + }); + }); + }); + + describe('get', function() { + beforeEach(function() { + subscription.create = fakeUtil.noop; + }); + + it('should delete the autoCreate option', function(done) { + var options = { + autoCreate: true, + a: 'a' + }; + + subscription.getMetadata = function(gaxOpts) { + assert.strictEqual(gaxOpts, options); + assert.strictEqual(gaxOpts.autoCreate, undefined); + done(); + }; + + subscription.get(options, assert.ifError); }); - describe('autoAck true', function() { + describe('success', function() { + var fakeMetadata = {}; + beforeEach(function() { - subscription.autoAck = true; - subscription.ack = function(id, callback) { - callback(); + subscription.getMetadata = function(gaxOpts, callback) { + callback(null, fakeMetadata); }; }); - it('should ack', function(done) { - subscription.ack = function() { + it('should call through to getMetadata', function(done) { + subscription.get(function(err, sub, resp) { + assert.ifError(err); + assert.strictEqual(sub, subscription); + assert.strictEqual(resp, fakeMetadata); done(); - }; - subscription.pull({}, assert.ifError); + }); }); - it('should not autoAck if no messages returned', function(done) { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, { receivedMessages: [] }); + it('should optionally accept options', function(done) { + var options = {}; + + subscription.getMetadata = function(gaxOpts, callback) { + assert.strictEqual(gaxOpts, options); + callback(); // the done fn }; - subscription.ack = function() { - throw new Error('I should not run.'); + + subscription.get(options, done); + }); + }); + + describe('error', function() { + it('should pass back errors when not auto-creating', function(done) { + var error = { code: 4 }; + var apiResponse = {}; + + subscription.getMetadata = function(gaxOpts, callback) { + callback(error, apiResponse); }; - subscription.pull(function() { + + subscription.get(function(err, sub, resp) { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); done(); }); }); - it('should pass id to ack', function(done) { - subscription.ack = function(id) { - assert.equal(id, expectedMessage.ackId); - done(); + it('should pass back 404 errors if autoCreate is false', function(done) { + var error = { code: 5 }; + var apiResponse = {}; + + subscription.getMetadata = function(gaxOpts, callback) { + callback(error, apiResponse); }; - subscription.pull({}, assert.ifError); - }); - it('should pass callback to ack', function(done) { - subscription.pull({}, done); + subscription.get(function(err, sub, resp) { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); - it('should invoke callback with error from ack', function(done) { - var error = new Error('Error.'); - subscription.ack = function(id, callback) { - callback(error); + it('should pass back 404 errors if create doesnt exist', function(done) { + var error = { code: 5 }; + var apiResponse = {}; + + subscription.getMetadata = function(gaxOpts, callback) { + callback(error, apiResponse); }; - subscription.pull({}, function(err) { - assert.equal(err, error); + + delete subscription.create; + + subscription.get(function(err, sub, resp) { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); done(); }); }); - it('should execute callback', function(done) { - subscription.pull({}, done); - }); + it('should create the sub if 404 + autoCreate is true', function(done) { + var error = { code: 5 }; + var apiResponse = {}; - it('should return pull response as apiResponse', function(done) { - var resp = { - receivedMessages: [{ - ackId: 1, - message: { - messageId: 'abc', - data: new Buffer('message').toString('base64') - } - }] + var fakeOptions = { + autoCreate: true }; - subscription.ack = function(id, callback) { - callback(null, { success: true }); + subscription.getMetadata = function(gaxOpts, callback) { + callback(error, apiResponse); }; - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); + subscription.create = function(options, callback) { + assert.strictEqual(options, fakeOptions); + callback(); // the done fn }; - subscription.pull({}, function(err, msgs, apiResponse) { - assert.deepEqual(resp, apiResponse); - done(); - }); + subscription.get(fakeOptions, done); }); }); }); - describe('seek', function() { - it('should throw if a name or date is not provided', function() { - assert.throws(function() { - subscription.seek(); - }, /Either a snapshot name or Date is needed to seek to\./); + describe('getMetadata', function() { + it('should make the correct request', function(done) { + subscription.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'getSubscription'); + assert.deepEqual(config.reqOpts, { subscription: subscription.name }); + done(); + }; + + subscription.getMetadata(assert.ifError); }); - it('should make the correct api request', function(done) { - var FAKE_SNAPSHOT_NAME = 'a'; - var FAKE_FULL_SNAPSHOT_NAME = 'a/b/c/d'; + it('should optionally accept gax options', function(done) { + var gaxOpts = {}; - FakeSnapshot.formatName_ = function(projectId, name) { - assert.strictEqual(projectId, PROJECT_ID); - assert.strictEqual(name, FAKE_SNAPSHOT_NAME); - return FAKE_FULL_SNAPSHOT_NAME; + subscription.request = function(config) { + assert.strictEqual(config.gaxOpts, gaxOpts); + done(); }; - subscription.parent.request = function(protoOpts, reqOpts, callback) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'seek'); + subscription.getMetadata(gaxOpts, assert.ifError); + }); - assert.strictEqual(reqOpts.subscription, subscription.name); - assert.strictEqual(reqOpts.snapshot, FAKE_FULL_SNAPSHOT_NAME); + it('should pass back any errors that occur', function(done) { + var error = new Error('err'); + var apiResponse = {}; - // done function - callback(); + subscription.request = function(config, callback) { + callback(error, apiResponse); }; - subscription.seek(FAKE_SNAPSHOT_NAME, done); + subscription.getMetadata(function(err, metadata) { + assert.strictEqual(err, error); + assert.strictEqual(metadata, apiResponse); + done(); + }); }); - it('should optionally accept a Date object', function(done) { - var date = new Date(); - - subscription.parent.request = function(protoOpts, reqOpts, callback) { - var seconds = Math.floor(date.getTime() / 1000); - assert.strictEqual(reqOpts.time.seconds, seconds); + it('should set the metadata if no error occurs', function(done) { + var apiResponse = {}; - var nanos = date.getMilliseconds() * 1e6; - assert.strictEqual(reqOpts.time.nanos, nanos); - - // done function - callback(); + subscription.request = function(config, callback) { + callback(null, apiResponse); }; - subscription.seek(date, done); + subscription.getMetadata(function(err, metadata) { + assert.ifError(err); + assert.strictEqual(metadata, apiResponse); + assert.strictEqual(subscription.metadata, apiResponse); + done(); + }); }); }); - describe('setAckDeadline', function() { - it('should set the ack deadline', function(done) { - subscription.parent.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Subscriber'); - assert.strictEqual(protoOpts.method, 'modifyAckDeadline'); + describe('hasMaxMessages_', function() { + it('should return true if the number of leases == maxMessages', function() { + subscription.inventory_.lease = ['a', 'b', 'c']; + subscription.flowControl.maxMessages = 3; - assert.deepEqual(reqOpts, { - subscription: subscription.name, - ackIds: ['abc'], - ackDeadlineSeconds: 10 - }); + assert(subscription.hasMaxMessages_()); + }); - done(); - }; + it('should return true if bytes == maxBytes', function() { + subscription.inventory_.bytes = 1000; + subscription.flowControl.maxBytes = 1000; - subscription.setAckDeadline({ ackIds: ['abc'], seconds: 10 }, done); + assert(subscription.hasMaxMessages_()); }); - it('should execute the callback', function(done) { - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(); - }; - subscription.setAckDeadline({}, done); - }); + it('should return false if neither condition is met', function() { + subscription.inventory_.lease = ['a', 'b']; + subscription.flowControl.maxMessages = 3; - it('should execute the callback with apiResponse', function(done) { - var resp = { success: true }; - subscription.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); - }; - subscription.setAckDeadline({}, function(err, apiResponse) { - assert.deepEqual(resp, apiResponse); - done(); - }); + subscription.inventory_.bytes = 900; + subscription.flowControl.maxBytes = 1000; + + assert.strictEqual(subscription.hasMaxMessages_(), false); }); }); - describe('snapshot', function() { - it('should call through to pubsub#snapshot', function() { - var FAKE_SNAPSHOT_NAME = 'a'; - var FAKE_SNAPSHOT = {}; + describe('leaseMessage_', function() { + var MESSAGE = { + ackId: 'abc', + data: new Buffer('hello'), + length: 5 + }; - PUBSUB.snapshot = function(name) { - assert.strictEqual(this, subscription); - assert.strictEqual(name, FAKE_SNAPSHOT_NAME); - return FAKE_SNAPSHOT; - }; + beforeEach(function() { + subscription.setLeaseTimeout_ = fakeUtil.noop; + }); - var snapshot = subscription.snapshot(FAKE_SNAPSHOT_NAME); - assert.strictEqual(snapshot, FAKE_SNAPSHOT); + it('should add the ackId to the inventory', function() { + subscription.leaseMessage_(MESSAGE); + assert.deepEqual(subscription.inventory_.lease, [MESSAGE.ackId]); }); - }); - describe('decorateMessage_', function() { - var message = { - ackId: 'b' - }; + it('should update the byte count', function() { + assert.strictEqual(subscription.inventory_.bytes, 0); + subscription.leaseMessage_(MESSAGE); + assert.strictEqual(subscription.inventory_.bytes, MESSAGE.length); + }); + + it('should begin auto-leasing', function(done) { + subscription.setLeaseTimeout_ = done; + subscription.leaseMessage_(MESSAGE); + }); it('should return the message', function() { - var decoratedMessage = subscription.decorateMessage_(message); - assert.strictEqual(decoratedMessage.ackId, message.ackId); + var message = subscription.leaseMessage_(MESSAGE); + assert.strictEqual(message, MESSAGE); }); + }); - it('should mark the message as being in progress', function() { - subscription.decorateMessage_(message); - assert.strictEqual(subscription.inProgressAckIds[message.ackId], true); + describe('listenForEvents_', function() { + beforeEach(function() { + subscription.openConnection_ = fakeUtil.noop; + subscription.closeConnection_ = fakeUtil.noop; }); - describe('ack', function() { - it('should add an ack function to ack', function() { - var decoratedMessage = subscription.decorateMessage_(message); - assert.equal(typeof decoratedMessage.ack, 'function'); + describe('on new listener', function() { + it('should increment messageListeners', function() { + assert.strictEqual(subscription.messageListeners, 0); + subscription.on('message', fakeUtil.noop); + assert.strictEqual(subscription.messageListeners, 1); }); - it('should pass the ackId to subscription.ack', function(done) { - subscription.ack = function(ackId, callback) { - assert.strictEqual(ackId, message.ackId); - callback(); + it('should ignore non-message events', function() { + subscription.on('data', fakeUtil.noop); + assert.strictEqual(subscription.messageListeners, 0); + }); + + it('should open a connection', function(done) { + subscription.openConnection_ = done; + subscription.on('message', fakeUtil.noop); + }); + + it('should set the userClosed_ flag to false', function() { + subscription.userClosed_ = true; + subscription.on('message', fakeUtil.noop); + assert.strictEqual(subscription.userClosed_, false); + }); + + it('should not open a connection when one exists', function() { + subscription.connectionPool = {}; + + subscription.openConnection_ = function() { + throw new Error('Should not be called.'); }; - subscription.decorateMessage_(message).ack(done); + subscription.on('message', fakeUtil.noop); }); }); - describe('skip', function() { - it('should add a skip function', function() { - var decoratedMessage = subscription.decorateMessage_(message); - assert.equal(typeof decoratedMessage.skip, 'function'); + describe('on remove listener', function() { + var noop = function() {}; + + it('should decrement messageListeners', function() { + subscription.on('message', fakeUtil.noop); + subscription.on('message', noop); + assert.strictEqual(subscription.messageListeners, 2); + + subscription.removeListener('message', noop); + assert.strictEqual(subscription.messageListeners, 1); }); - it('should unmark the message as being in progress', function() { - subscription.decorateMessage_(message).skip(); + it('should ignore non-message events', function() { + subscription.on('message', fakeUtil.noop); + subscription.on('message', noop); + assert.strictEqual(subscription.messageListeners, 2); - var inProgressAckIds = subscription.inProgressAckIds; - assert.strictEqual(inProgressAckIds[message.ackId], undefined); + subscription.removeListener('data', noop); + assert.strictEqual(subscription.messageListeners, 2); }); - it('should refresh the paused status', function(done) { - subscription.refreshPausedStatus_ = done; - subscription.decorateMessage_(message).skip(); + it('should close the connection when no listeners', function(done) { + subscription.closeConnection_ = done; + + subscription.on('message', noop); + subscription.removeListener('message', noop); }); }); }); - describe('refreshPausedStatus_', function() { - it('should pause if the ackIds in progress is too high', function() { - subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; + describe('modifyPushConfig', function() { + var fakeConfig = {}; - subscription.maxInProgress = 2; - subscription.refreshPausedStatus_(); - assert.strictEqual(subscription.paused, true); - - subscription.maxInProgress = 3; - subscription.refreshPausedStatus_(); - assert.strictEqual(subscription.paused, true); + it('should make the correct request', function(done) { + subscription.request = function(config, callback) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'modifyPushConfig'); + assert.deepEqual(config.reqOpts, { + subscription: subscription.name, + pushConfig: fakeConfig + }); + callback(); // the done fn + }; - subscription.maxInProgress = Infinity; - subscription.refreshPausedStatus_(); - assert.strictEqual(subscription.paused, false); + subscription.modifyPushConfig(fakeConfig, done); }); - it('should start pulling if paused and listeners exist', function(done) { - subscription.startPulling_ = done; + it('should optionally accept gaxOpts', function(done) { + var gaxOpts = {}; + + subscription.request = function(config, callback) { + assert.strictEqual(config.gaxOpts, gaxOpts); + callback(); // the done fn + }; - subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; - subscription.paused = true; - subscription.maxInProgress = Infinity; - subscription.messageListeners = 1; - subscription.refreshPausedStatus_(); + subscription.modifyPushConfig(fakeConfig, gaxOpts, done); }); }); - describe('listenForEvents_', function() { - afterEach(function() { - subscription.removeAllListeners(); + describe('nack_', function() { + var MESSAGE = { + ackId: 'abc', + connectionId: 'def' + }; + + beforeEach(function() { + subscription.setFlushTimeout_ = fakeUtil.noop; + subscription.breakLease_ = fakeUtil.noop; }); - it('should start pulling once a message listener is bound', function(done) { - subscription.startPulling_ = function() { + it('should break the lease on the message', function(done) { + subscription.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); done(); }; - subscription.on('message', util.noop); + + subscription.nack_(MESSAGE); }); - it('should track the number of listeners', function() { - subscription.startPulling_ = util.noop; + describe('without connection pool', function() { + it('should store the ack id in the inventory object', function(done) { + subscription.setFlushTimeout_ = function() { + assert.deepEqual(subscription.inventory_.nack, [MESSAGE.ackId]); + done(); + }; - assert.strictEqual(subscription.messageListeners, 0); + subscription.nack_(MESSAGE); + }); + }); - subscription.on('message', util.noop); - assert.strictEqual(subscription.messageListeners, 1); + describe('with connection pool', function() { + var pool; - subscription.removeListener('message', util.noop); - assert.strictEqual(subscription.messageListeners, 0); - }); + beforeEach(function() { + subscription.setFlushTimeout_ = function() { + throw new Error('Should not be called.'); + }; - it('should only run a single pulling loop', function() { - var startPullingCallCount = 0; + pool = { + isConnected: function() { + return true; + } + }; - subscription.startPulling_ = function() { - startPullingCallCount++; - }; + subscription.connectionPool = pool; + }); + + it('should not write to the pool if not connected', function(done) { + subscription.setFlushTimeout_ = function() { + assert.deepEqual(subscription.inventory_.nack, [MESSAGE.ackId]); + done(); + }; + + pool.isConnected = function() { + return false; + }; + + subscription.nack_(MESSAGE); + }); + + it('should write to the connection it came in on', function(done) { + var fakeConnection = { + write: function(data) { + assert.deepEqual(data, { + modifyDeadlineAckIds: [MESSAGE.ackId], + modifyDeadlineSeconds: [0] + }); + done(); + } + }; - subscription.on('message', util.noop); - subscription.on('message', util.noop); + pool.acquire = function(connectionId, callback) { + assert.strictEqual(connectionId, MESSAGE.connectionId); + callback(null, fakeConnection); + }; + + subscription.nack_(MESSAGE); + }); + + it('should emit an error when unable to get a conn', function(done) { + var error = new Error('err'); + + pool.acquire = function(connectionId, callback) { + callback(error); + }; - assert.strictEqual(startPullingCallCount, 1); + subscription.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + subscription.nack_(MESSAGE); + }); }); + }); + + describe('openConnection_', function() { + it('should create a ConnectionPool instance', function() { + subscription.openConnection_(); + assert(subscription.connectionPool instanceof FakeConnectionPool); - it('should close when no more message listeners are bound', function() { - subscription.startPulling_ = util.noop; - subscription.on('message', util.noop); - subscription.on('message', util.noop); - // 2 listeners: sub should be open. - assert.strictEqual(subscription.closed, false); - subscription.removeListener('message', util.noop); - // 1 listener: sub should be open. - assert.strictEqual(subscription.closed, false); - subscription.removeListener('message', util.noop); - // 0 listeners: sub should be closed. - assert.strictEqual(subscription.closed, true); + var args = subscription.connectionPool.calledWith_; + assert.strictEqual(args[0], subscription); }); - it('should abort the HTTP request when listeners removed', function(done) { - subscription.startPulling_ = util.noop; + it('should emit pool errors', function(done) { + var error = new Error('err'); - subscription.activeRequest_ = { - abort: done - }; + subscription.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); - subscription.on('message', util.noop); - subscription.removeAllListeners(); + subscription.openConnection_(); + subscription.connectionPool.emit('error', error); }); - }); - describe('startPulling_', function() { - beforeEach(function() { - subscription.pull = util.noop; + it('should lease & emit messages from pool', function(done) { + var message = {}; + var leasedMessage = {}; + + subscription.leaseMessage_ = function(message_) { + assert.strictEqual(message_, message); + return leasedMessage; + }; + + subscription.on('message', function(message) { + assert.strictEqual(message, leasedMessage); + done(); + }); + + subscription.openConnection_(); + subscription.connectionPool.emit('message', message); }); - it('should not pull if subscription is closed', function() { - subscription.pull = function() { - throw new Error('Should not be called.'); + it('should pause the pool if sub is at max messages', function(done) { + var message = {}; + var leasedMessage = {}; + + subscription.leaseMessage_ = function() { + return leasedMessage; }; - subscription.closed = true; - subscription.startPulling_(); + subscription.hasMaxMessages_ = function() { + return true; + }; + + subscription.openConnection_(); + subscription.connectionPool.isPaused = false; + subscription.connectionPool.pause = done; + subscription.connectionPool.emit('message', message); }); - it('should not pull if subscription is paused', function() { - subscription.pull = function() { - throw new Error('Should not be called.'); + it('should not re-pause the pool', function(done) { + var message = {}; + var leasedMessage = {}; + + subscription.leaseMessage_ = function() { + return leasedMessage; + }; + + subscription.hasMaxMessages_ = function() { + return true; + }; + + subscription.openConnection_(); + subscription.connectionPool.isPaused = true; + + subscription.connectionPool.pause = function() { + done(new Error('Should not have been called.')); }; - subscription.paused = true; - subscription.startPulling_(); + subscription.connectionPool.emit('message', message); + done(); }); - it('should set returnImmediately to false when pulling', function(done) { - subscription.pull = function(options) { - assert.strictEqual(options.returnImmediately, false); + it('should flush the queue when connected', function(done) { + subscription.flushQueues_ = function() { + assert.strictEqual(subscription.flushTimeoutHandle_, null); done(); }; - subscription.closed = false; - subscription.startPulling_(); + subscription.flushTimeoutHandle_ = setTimeout(done, 1); + subscription.openConnection_(); + subscription.connectionPool.emit('connected'); }); + }); - it('should not set maxResults if no maxInProgress is set', function(done) { - subscription.pull = function(options) { - assert.strictEqual(options.maxResults, undefined); - done(); + describe('renewLeases_', function() { + var fakeDeadline = 9999; + + beforeEach(function() { + subscription.inventory_.lease = ['abc', 'def']; + subscription.setLeaseTimeout_ = fakeUtil.noop; + + subscription.histogram.percentile = function() { + return fakeDeadline; + }; + }); + + it('should update the ackDeadline', function() { + subscription.request = subscription.setLeaseTimeout_ = fakeUtil.noop; + + subscription.histogram.percentile = function(percent) { + assert.strictEqual(percent, 99); + return fakeDeadline; }; - subscription.closed = false; - subscription.startPulling_(); + subscription.renewLeases_(); + assert.strictEqual(subscription.ackDeadline, fakeDeadline); }); - it('should set maxResults properly with maxInProgress', function(done) { - subscription.pull = function(options) { - assert.strictEqual(options.maxResults, 1); - done(); + it('should set the auto-lease timeout', function(done) { + subscription.request = fakeUtil.noop; + subscription.setLeaseTimeout_ = done; + subscription.renewLeases_(); + }); + + it('should not renew leases if inventory is empty', function() { + subscription.connectionPool = { + acquire: function() { + throw new Error('Should not have been called.'); + } }; - subscription.closed = false; - subscription.maxInProgress = 4; - subscription.inProgressAckIds = { id1: true, id2: true, id3: true }; - subscription.startPulling_(); + subscription.inventory_.lease = []; + subscription.renewLeases_(); }); - it('should emit an error event if one is encountered', function(done) { - var error = new Error('Error.'); - subscription.pull = function(options, callback) { - subscription.pull = function() {}; - setImmediate(function() { + describe('with connection pool', function() { + var fakeConnection; + + beforeEach(function() { + fakeConnection = { + acquire: fakeUtil.noop + }; + + subscription.connectionPool = { + acquire: function(callback) { + callback(null, fakeConnection); + } + }; + }); + + it('should emit any pool acquiring errors', function(done) { + var error = new Error('err'); + + subscription.connectionPool.acquire = function(callback) { callback(error); + }; + + subscription.on('error', function(err) { + assert.strictEqual(err, error); + done(); }); - }; - subscription.closed = false; - subscription - .once('error', function(err) { - assert.equal(err, error); + subscription.renewLeases_(); + }); + + it('should write to the connection', function(done) { + fakeConnection.write = function(reqOpts) { + assert.deepEqual(reqOpts, { + modifyDeadlineAckIds: ['abc', 'def'], + modifyDeadlineSeconds: Array(2).fill(fakeDeadline / 1000) + }); done(); - }) - .startPulling_(); + }; + + subscription.renewLeases_(); + }); }); - it('should emit an error event with apiResponse', function(done) { - var error = new Error('Error.'); - var resp = { success: false }; - subscription.pull = function(options, callback) { - subscription.pull = function() {}; - setImmediate(function() { - callback(error, null, resp); + describe('without connection pool', function() { + it('should make the correct request', function(done) { + subscription.request = function(config, callback) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'modifyAckDeadline'); + assert.deepEqual(config.reqOpts, { + subscription: subscription.name, + ackIds: ['abc', 'def'], + ackDeadlineSeconds: fakeDeadline / 1000 + }); + callback(); + done(); + }; + + subscription.on('error', function(err) { + done(err); }); - }; - subscription.closed = false; - subscription - .once('error', function(err, apiResponse) { - assert.equal(err, error); - assert.deepEqual(resp, apiResponse); + subscription.renewLeases_(); + }); + + it('should emit any request errors', function(done) { + var error = new Error('err'); + + subscription.request = function(config, callback) { + callback(error); + }; + + subscription.on('error', function(err) { + assert.strictEqual(err, error); done(); - }) - .startPulling_(); + }); + + subscription.renewLeases_(); + }); }); + }); + + describe('seek', function() { + var FAKE_SNAPSHOT_NAME = 'a'; + var FAKE_FULL_SNAPSHOT_NAME = 'a/b/c/d'; - it('should emit a message event', function(done) { - subscription.pull = function(options, callback) { - callback(null, [{ hi: 'there' }]); + beforeEach(function() { + FakeSnapshot.formatName_ = function() { + return FAKE_FULL_SNAPSHOT_NAME; }; + }); - subscription - .once('message', function(msg) { - assert.deepEqual(msg, { hi: 'there' }); - done(); + it('should throw if a name or date is not provided', function() { + assert.throws(function() { + subscription.seek(); + }, /Either a snapshot name or Date is needed to seek to\./); + }); + + it('should make the correct api request', function(done) { + FakeSnapshot.formatName_ = function(projectId, name) { + assert.strictEqual(projectId, PROJECT_ID); + assert.strictEqual(name, FAKE_SNAPSHOT_NAME); + return FAKE_FULL_SNAPSHOT_NAME; + }; + + subscription.request = function(config, callback) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'seek'); + assert.deepEqual(config.reqOpts, { + subscription: subscription.name, + snapshot: FAKE_FULL_SNAPSHOT_NAME }); + callback(); // the done fn + }; + + subscription.seek(FAKE_SNAPSHOT_NAME, done); }); - it('should emit a message event with apiResponse', function(done) { - var resp = { success: true, msgs: [{ hi: 'there' }] }; - subscription.pull = function(options, callback) { - callback(null, [{ hi: 'there' }], resp); + it('should optionally accept a Date object', function(done) { + var date = new Date(); + + subscription.request = function(config, callback) { + assert.strictEqual(config.reqOpts.time, date); + callback(); // the done fn }; - subscription - .once('message', function(msg, apiResponse) { - assert.deepEqual(resp, apiResponse); - done(); + + subscription.seek(date, done); + }); + + it('should optionally accept gax options', function(done) { + var gaxOpts = {}; + + subscription.request = function(config, callback) { + assert.strictEqual(config.gaxOpts, gaxOpts); + callback(); // the done fn + }; + + subscription.seek(FAKE_SNAPSHOT_NAME, gaxOpts, done); + }); + }); + + describe('setFlushTimeout_', function() { + var fakeTimeoutHandle = 1234; + var globalSetTimeout; + + before(function() { + globalSetTimeout = global.setTimeout; + }); + + after(function() { + global.setTimeout = globalSetTimeout; + }); + + it('should set a timeout to call flushQueues', function(done) { + subscription.flushQueues_ = done; + + global.setTimeout = function(callback, duration) { + assert.strictEqual(duration, 1000); + setImmediate(callback); // the done fn + return fakeTimeoutHandle; + }; + + subscription.setFlushTimeout_(); + assert.strictEqual(subscription.flushTimeoutHandle_, fakeTimeoutHandle); + }); + + it('should not set a timeout if one already exists', function() { + subscription.flushQueues_ = function() { + throw new Error('Should not be called.'); + }; + + global.setTimeout = function() { + throw new Error('Should not be called.'); + }; + + subscription.flushTimeoutHandle_ = fakeTimeoutHandle; + subscription.setFlushTimeout_(); + }); + }); + + describe('setLeaseTimeout_', function() { + var fakeTimeoutHandle = 1234; + var fakeRandom = 2; + + var globalSetTimeout; + var globalMathRandom; + + before(function() { + globalSetTimeout = global.setTimeout; + globalMathRandom = global.Math.random; + }); + + after(function() { + global.setTimeout = globalSetTimeout; + global.Math.random = globalMathRandom; + }); + + it('should set a timeout to call renewLeases_', function(done) { + var ackDeadline = subscription.ackDeadline = 1000; + + global.Math.random = function() { + return fakeRandom; + }; + + global.setTimeout = function(callback, duration) { + assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9); + setImmediate(callback); // the done fn + return fakeTimeoutHandle; + }; + + subscription.renewLeases_ = done; + subscription.setLeaseTimeout_(); + assert.strictEqual(subscription.leaseTimeoutHandle_, fakeTimeoutHandle); + }); + + it('should not set a timeout if one already exists', function() { + subscription.renewLeases_ = function() { + throw new Error('Should not be called.'); + }; + + global.Math.random = function() { + throw new Error('Should not be called.'); + }; + + global.setTimeout = function() { + throw new Error('Should not be called.'); + }; + + subscription.leaseTimeoutHandle_ = fakeTimeoutHandle; + subscription.setLeaseTimeout_(); + }); + }); + + describe('setMetadata', function() { + var METADATA = {}; + + it('should make the correct request', function(done) { + subscription.request = function(config, callback) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'updateSubscription'); + assert.deepEqual(config.reqOpts, { + subscription: subscription.name, + updateMask: METADATA }); + callback(); // the done fn + }; + + subscription.setMetadata(METADATA, done); }); - it('should pull at specified interval', function(done) { - var INTERVAL = 5; - subscription.pull = function(options, callback) { - assert.strictEqual(options.returnImmediately, false); - // After pull is called once, overwrite with `done`. - // This is to override the function passed to `setTimeout`, so we are - // sure it's the same pull function when we execute it. - subscription.pull = function() { - done(); - }; - callback(); + it('should optionally accept gax options', function(done) { + var gaxOpts = {}; + + subscription.request = function(config, callback) { + assert.strictEqual(config.gaxOpts, gaxOpts); + callback(); // the done fn }; - var setTimeout = global.setTimeout; - global.setTimeout = function(fn, interval) { - global.setTimeout = setTimeout; - assert.equal(interval, INTERVAL); - // This should execute the `done` function from when we overrided it - // above. - fn(); + + subscription.setMetadata(METADATA, gaxOpts, done); + }); + }); + + describe('snapshot', function() { + var SNAPSHOT_NAME = 'a'; + + it('should call through to pubsub.snapshot', function(done) { + PUBSUB.snapshot = function(name) { + assert.strictEqual(this, subscription); + assert.strictEqual(name, SNAPSHOT_NAME); + done(); }; - subscription.closed = false; - subscription.interval = INTERVAL; - subscription.startPulling_(); + subscription.snapshot(SNAPSHOT_NAME); }); }); }); diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 48985c6353a..ef73a6464ff 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -18,8 +18,6 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcServiceObject = require('@google-cloud/common-grpc').ServiceObject; -var nodeutil = require('util'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -31,21 +29,36 @@ var fakeUtil = extend({}, util, { } promisified = true; - assert.deepEqual(options.exclude, ['subscription']); + assert.deepEqual(options.exclude, [ + 'publisher', + 'subscription' + ]); } }); -function FakeGrpcServiceObject() { - this.calledWith_ = arguments; - GrpcServiceObject.apply(this, arguments); +function FakeIAM() { + this.calledWith_ = [].slice.call(arguments); } -nodeutil.inherits(FakeGrpcServiceObject, GrpcServiceObject); - -function FakeIAM() { +function FakePublisher() { this.calledWith_ = [].slice.call(arguments); } +var extended = false; +var fakePaginator = { + extend: function(Class, methods) { + if (Class.name !== 'Topic') { + return; + } + + assert.deepEqual(methods, ['getSubscriptions']); + extended = true; + }, + streamify: function(methodName) { + return methodName; + } +}; + describe('Topic', function() { var Topic; var topic; @@ -53,20 +66,21 @@ describe('Topic', function() { var PROJECT_ID = 'test-project'; var TOPIC_NAME = 'projects/' + PROJECT_ID + '/topics/test-topic'; var TOPIC_UNFORMATTED_NAME = TOPIC_NAME.split('/').pop(); + var PUBSUB = { projectId: PROJECT_ID, - createTopic: util.noop + createTopic: util.noop, + request: util.noop }; before(function() { Topic = proxyquire('../src/topic.js', { '@google-cloud/common': { + paginator: fakePaginator, util: fakeUtil }, - '@google-cloud/common-grpc': { - ServiceObject: FakeGrpcServiceObject - }, - './iam.js': FakeIAM + './iam.js': FakeIAM, + './publisher.js': FakePublisher }); }); @@ -76,80 +90,50 @@ describe('Topic', function() { }); describe('initialization', function() { - it('should inherit from GrpcServiceObject', function() { - var pubsubInstance = extend({}, PUBSUB, { - createTopic: { - bind: function(context) { - assert.strictEqual(context, pubsubInstance); - } - } - }); + it('should extend the correct methods', function() { + assert(extended); // See `fakePaginator.extend` + }); - var topic = new Topic(pubsubInstance, TOPIC_NAME); - assert(topic instanceof GrpcServiceObject); - - var calledWith = topic.calledWith_[0]; - - assert.strictEqual(calledWith.parent, pubsubInstance); - assert.strictEqual(calledWith.id, TOPIC_NAME); - assert.deepEqual(calledWith.methods, { - create: true, - delete: { - protoOpts: { - service: 'Publisher', - method: 'deleteTopic' - }, - reqOpts: { - topic: TOPIC_NAME - } - }, - exists: true, - get: true, - getMetadata: { - protoOpts: { - service: 'Publisher', - method: 'getTopic' - }, - reqOpts: { - topic: TOPIC_NAME - } - } - }); + it('should streamify the correct methods', function() { + assert.strictEqual(topic.getSubscriptionsStream, 'getSubscriptions'); }); - it('should create an iam object', function() { - assert.deepEqual(topic.iam.calledWith_, [PUBSUB, TOPIC_NAME]); + it('should promisify all the things', function() { + assert(promisified); }); - it('should format name', function(done) { + it('should format the name', function() { + var formattedName = 'a/b/c/d'; + var formatName_ = Topic.formatName_; - Topic.formatName_ = function() { + Topic.formatName_ = function(projectId, name) { + assert.strictEqual(projectId, PROJECT_ID); + assert.strictEqual(name, TOPIC_NAME); + Topic.formatName_ = formatName_; - done(); + + return formattedName; }; - new Topic(PUBSUB, TOPIC_NAME); + + var topic = new Topic(PUBSUB, TOPIC_NAME); + assert.strictEqual(topic.name, formattedName); }); - }); - describe('formatMessage_', function() { - var messageString = 'string'; - var messageBuffer = new Buffer(messageString); + it('should localize the parent object', function() { + assert.strictEqual(topic.pubsub, PUBSUB); + }); - var messageObjectWithString = { data: messageString }; - var messageObjectWithBuffer = { data: messageBuffer }; + it('should localize the request function', function(done) { + PUBSUB.request = function(callback) { + callback(); // the done fn + }; - it('should handle string data', function() { - assert.deepEqual( - Topic.formatMessage_(messageObjectWithString), - { data: new Buffer(JSON.stringify(messageString)).toString('base64') } - ); + var topic = new Topic(PUBSUB, TOPIC_NAME); + topic.request(done); }); - it('should handle buffer data', function() { - assert.deepEqual( - Topic.formatMessage_(messageObjectWithBuffer), - { data: messageBuffer.toString('base64') } - ); + it('should create an iam object', function() { + assert.deepEqual(topic.iam.calledWith_, [PUBSUB, TOPIC_NAME]); }); }); @@ -165,189 +149,362 @@ describe('Topic', function() { }); }); - describe('getSubscriptions', function() { - it('should accept just a callback', function(done) { - topic.parent.getSubscriptions = function(options, callback) { - assert.deepEqual(options, { topic: topic }); - callback(); + describe('create', function() { + it('should call the parent createTopic method', function(done) { + var options_ = {}; + + PUBSUB.createTopic = function(name, options, callback) { + assert.strictEqual(name, topic.name); + assert.strictEqual(options, options_); + callback(); // the done fn }; - topic.getSubscriptions(done); + topic.create(options_, done); }); + }); - it('should pass correct args to pubsub#getSubscriptions', function(done) { - var opts = { a: 'b', c: 'd' }; + describe('createSubscription', function() { + it('should call the parent createSubscription method', function(done) { + var NAME = 'sub-name'; + var OPTIONS = { a: 'a' }; - topic.parent = { - getSubscriptions: function(options, callback) { - assert.deepEqual(options, opts); - assert.deepEqual(options.topic, topic); - callback(); - } + PUBSUB.createSubscription = function(topic_, name, options, callback) { + assert.strictEqual(topic_, topic); + assert.strictEqual(name, NAME); + assert.strictEqual(options, OPTIONS); + callback(); // the done fn }; - topic.getSubscriptions(opts, done); + topic.createSubscription(NAME, OPTIONS, done); }); }); - describe('getSubscriptionsStream', function() { - it('should return a stream', function(done) { - var fakeStream = {}; + describe('delete', function() { + it('should make the proper request', function(done) { + topic.request = function(config, callback) { + assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.method, 'deleteTopic'); + assert.deepEqual(config.reqOpts, { topic: topic.name }); + callback(); // the done fn + }; + + topic.delete(done); + }); + + it('should optionally accept gax options', function(done) { + var options = {}; - topic.parent.getSubscriptionsStream = function(options) { - assert.deepEqual(options, { topic: topic }); - setImmediate(done); - return fakeStream; + topic.request = function(config, callback) { + assert.strictEqual(config.gaxOpts, options); + callback(); // the done fn }; - var stream = topic.getSubscriptionsStream(); - assert.strictEqual(stream, fakeStream); + topic.delete(options, done); }); - it('should pass correct args to getSubscriptionsStream', function(done) { - var opts = { a: 'b', c: 'd' }; + it('should optionally accept a callback', function(done) { + fakeUtil.noop = done; - topic.parent = { - getSubscriptionsStream: function(options) { - assert.deepEqual(options, opts); - assert.deepEqual(options.topic, topic); - done(); - } + topic.request = function(config, callback) { + callback(); // the done fn }; - topic.getSubscriptionsStream(opts); + topic.delete(); }); }); - describe('publish', function() { - var message = 'howdy'; - var attributes = { - key: 'value' - }; + describe('get', function() { + it('should delete the autoCreate option', function(done) { + var options = { + autoCreate: true, + a: 'a' + }; - it('should throw if no message is provided', function() { - assert.throws(function() { - topic.publish(); - }, /Cannot publish without a message\./); + topic.getMetadata = function(gaxOpts) { + assert.strictEqual(gaxOpts, options); + assert.strictEqual(gaxOpts.autoCreate, undefined); + done(); + }; - assert.throws(function() { - topic.publish([]); - }, /Cannot publish without a message\./); + topic.get(options, assert.ifError); }); - it('should send correct api request', function(done) { - topic.parent.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'Publisher'); - assert.strictEqual(protoOpts.method, 'publish'); + describe('success', function() { + var fakeMetadata = {}; - assert.strictEqual(reqOpts.topic, topic.name); - assert.deepEqual(reqOpts.messages, [ - { data: new Buffer(JSON.stringify(message)).toString('base64') } - ]); + beforeEach(function() { + topic.getMetadata = function(gaxOpts, callback) { + callback(null, fakeMetadata); + }; + }); + + it('should call through to getMetadata', function(done) { + topic.get(function(err, _topic, resp) { + assert.ifError(err); + assert.strictEqual(_topic, topic); + assert.strictEqual(resp, fakeMetadata); + done(); + }); + }); + + it('should optionally accept options', function(done) { + var options = {}; + + topic.getMetadata = function(gaxOpts, callback) { + assert.strictEqual(gaxOpts, options); + callback(); // the done fn + }; + + topic.get(options, done); + }); + }); + + describe('error', function() { + it('should pass back errors when not auto-creating', function(done) { + var error = { code: 4 }; + var apiResponse = {}; + + topic.getMetadata = function(gaxOpts, callback) { + callback(error, apiResponse); + }; + + topic.get(function(err, _topic, resp) { + assert.strictEqual(err, error); + assert.strictEqual(_topic, null); + assert.strictEqual(resp, apiResponse); + done(); + }); + }); + + it('should pass back 404 errors if autoCreate is false', function(done) { + var error = { code: 5 }; + var apiResponse = {}; + + topic.getMetadata = function(gaxOpts, callback) { + callback(error, apiResponse); + }; + + topic.get(function(err, _topic, resp) { + assert.strictEqual(err, error); + assert.strictEqual(_topic, null); + assert.strictEqual(resp, apiResponse); + done(); + }); + }); + + it('should create the topic if 404 + autoCreate is true', function(done) { + var error = { code: 5 }; + var apiResponse = {}; + var fakeOptions = { + autoCreate: true + }; + + topic.getMetadata = function(gaxOpts, callback) { + callback(error, apiResponse); + }; + + topic.create = function(options, callback) { + assert.strictEqual(options, fakeOptions); + callback(); // the done fn + }; + + topic.get(fakeOptions, done); + }); + }); + }); + + describe('exists', function() { + it('should return true if it finds metadata', function(done) { + topic.getMetadata = function(callback) { + callback(null, {}); + }; + + topic.exists(function(err, exists) { + assert.ifError(err); + assert(exists); + done(); + }); + }); + + it('should return false if a not found error occurs', function(done) { + topic.getMetadata = function(callback) { + callback({ code: 5 }); + }; + + topic.exists(function(err, exists) { + assert.ifError(err); + assert.strictEqual(exists, false); done(); + }); + }); + + it('should pass back any other type of error', function(done) { + var error = { code: 4 }; + + topic.getMetadata = function(callback) { + callback(error); }; - topic.publish(message, assert.ifError); + topic.exists(function(err, exists) { + assert.strictEqual(err, error); + assert.strictEqual(exists, undefined); + done(); + }); }); + }); - it('should honor the timeout setting', function(done) { - var options = { - timeout: 10 + describe('getMetadata', function() { + it('should make the proper request', function(done) { + topic.request = function(config) { + assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.method, 'getTopic'); + assert.deepEqual(config.reqOpts, { topic: topic.name }); + done(); }; - topic.parent.request = function(protoOpts) { - assert.strictEqual(protoOpts.timeout, options.timeout); + topic.getMetadata(assert.ifError); + }); + + it('should optionally accept gax options', function(done) { + var options = {}; + + topic.request = function(config) { + assert.strictEqual(config.gaxOpts, options); done(); }; - topic.publish(message, options, assert.ifError); + topic.getMetadata(options, assert.ifError); }); - it('should send correct api request for raw message', function(done) { - topic.parent.request = function(protoOpts, reqOpts) { - assert.deepEqual(reqOpts.messages, [ - { - data: new Buffer(JSON.stringify(message)).toString('base64'), - attributes: attributes - } - ]); + it('should pass back any errors that occur', function(done) { + var error = new Error('err'); + var apiResponse = {}; + + topic.request = function(config, callback) { + callback(error, apiResponse); + }; + topic.getMetadata(function(err, metadata) { + assert.strictEqual(err, error); + assert.strictEqual(metadata, apiResponse); done(); + }); + }); + + it('should set the metadata if no error occurs', function(done) { + var apiResponse = {}; + + topic.request = function(config, callback) { + callback(null, apiResponse); }; - topic.publish({ - data: message, - attributes: attributes - }, { raw: true }, assert.ifError); + topic.getMetadata(function(err, metadata) { + assert.ifError(err); + assert.strictEqual(metadata, apiResponse); + assert.strictEqual(topic.metadata, apiResponse); + done(); + }); }); + }); - it('should clone the provided message', function(done) { - var message = { - data: 'data' + describe('getSubscriptions', function() { + it('should make the correct request', function(done) { + var options = { + a: 'a', + b: 'b', + gaxOpts: { + e: 'f' + }, + autoPaginate: false }; - var originalMessage = extend({}, message); - topic.parent.request = function() { - assert.deepEqual(message, originalMessage); + var expectedOptions = extend({ + topic: topic.name + }, options); + + var expectedGaxOpts = extend({ + autoPaginate: options.autoPaginate + }, options.gaxOpts); + + delete expectedOptions.gaxOpts; + delete expectedOptions.autoPaginate; + + topic.request = function(config) { + assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.method, 'listTopicSubscriptions'); + assert.deepEqual(config.reqOpts, expectedOptions); + assert.deepEqual(config.gaxOpts, expectedGaxOpts); done(); }; - topic.publish(message, { raw: true }, assert.ifError); + topic.getSubscriptions(options, assert.ifError); }); - it('should execute callback', function(done) { - topic.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, {}); + it('should accept only a callback', function(done) { + topic.request = function(config) { + assert.deepEqual(config.reqOpts, { topic: topic.name }); + assert.deepEqual(config.gaxOpts, { autoPaginate: undefined }); + done(); }; - topic.publish(message, done); + topic.getSubscriptions(assert.ifError); }); - it('should execute callback with error', function(done) { - var error = new Error('Error.'); - var apiResponse = {}; + it('should create subscription objects', function(done) { + var fakeSubs = ['a', 'b', 'c']; - topic.parent.request = function(protoOpts, reqOpts, callback) { - callback(error, apiResponse); + topic.subscription = function(name) { + return { + name: name + }; }; - topic.publish(message, function(err, ackIds, apiResponse_) { - assert.strictEqual(err, error); - assert.strictEqual(ackIds, null); - assert.strictEqual(apiResponse_, apiResponse); + topic.request = function(config, callback) { + callback(null, fakeSubs); + }; + topic.getSubscriptions(function(err, subscriptions) { + assert.ifError(err); + assert.deepEqual(subscriptions, [ + { name: 'a' }, + { name: 'b' }, + { name: 'c' } + ]); done(); }); }); - it('should execute callback with apiResponse', function(done) { - var resp = { success: true }; + it('should pass all params to the callback', function(done) { + var err_ = new Error('err'); + var subs_ = false; + var nextQuery_ = {}; + var apiResponse_ = {}; - topic.parent.request = function(protoOpts, reqOpts, callback) { - callback(null, resp); + topic.request = function(config, callback) { + callback(err_, subs_, nextQuery_, apiResponse_); }; - topic.publish(message, function(err, ackIds, apiResponse) { - assert.deepEqual(resp, apiResponse); + topic.getSubscriptions(function(err, subs, nextQuery, apiResponse) { + assert.strictEqual(err, err_); + assert.deepEqual(subs, subs_); + assert.strictEqual(nextQuery, nextQuery_); + assert.strictEqual(apiResponse, apiResponse_); done(); }); }); }); - describe('subscribe', function() { - it('should pass correct arguments to pubsub#subscribe', function(done) { - var subscriptionName = 'subName'; - var opts = {}; + describe('publisher', function() { + it('should return a Publisher instance', function() { + var options = {}; - topic.parent.subscribe = function(t, subName, options, callback) { - assert.deepEqual(t, topic); - assert.equal(subName, subscriptionName); - assert.deepEqual(options, opts); - callback(); - }; + var publisher = topic.publisher(options); + var args = publisher.calledWith_; - topic.subscribe(subscriptionName, opts, done); + assert(publisher instanceof FakePublisher); + assert.strictEqual(args[0], topic); + assert.strictEqual(args[1], options); }); }); From 4285e54c4addea3d03fa08778d58ffe0eb63bce4 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 24 Aug 2017 10:59:09 -0700 Subject: [PATCH 0082/1115] pubsub @ 0.14.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 36e14de2610..6b96ac08c5a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.13.2", + "version": "0.14.0", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 3c234946628a7dc75418b3281f832d0a9b005b00 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Sun, 27 Aug 2017 11:03:58 -0700 Subject: [PATCH 0083/1115] pubsub: publicly document publisher options (#2570) --- handwritten/pubsub/src/publisher.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index b84f634a590..927e5a605bf 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -30,14 +30,6 @@ var is = require('is'); * * @param {module:pubsub/topic} topic - The topic associated with this * publisher. - * @param {object=} options - Configuration object. - * @param {object} options.batching - Batching settings. - * @param {number} options.batching.maxBytes - The maximum number of bytes to - * buffer before sending a payload. - * @param {number} options.batching.maxMessages - The maximum number of messages - * to buffer before sending a payload. - * @param {number} options.batching.maxMilliseconds - The maximum duration to - * wait before sending a payload. */ /** * A Publisher object allows you to publish messages to a specific topic. @@ -47,6 +39,15 @@ var is = require('is'); * * @resource [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} * + * @param {object=} options - Configuration object. + * @param {object} options.batching - Batching settings. + * @param {number} options.batching.maxBytes - The maximum number of bytes to + * buffer before sending a payload. + * @param {number} options.batching.maxMessages - The maximum number of messages + * to buffer before sending a payload. + * @param {number} options.batching.maxMilliseconds - The maximum duration to + * wait before sending a payload. + * * @example * var topic = pubsub.topic('my-topic'); * var publisher = topic.publisher(); From 1689a5f9f7bafb3b6b6563d6706066238ac37772 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Sun, 27 Aug 2017 18:18:44 -0700 Subject: [PATCH 0084/1115] pubsub: remove ackDeadline option from docs (#2571) --- handwritten/pubsub/src/topic.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 6fe37cb300b..9bf0ce80a21 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -147,8 +147,6 @@ Topic.prototype.create = function(gaxOpts, callback) { * @param {string=} name - The name of the subscription. * @param {object=} options - See a * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) - * @param {number} options.ackDeadline - The maximum time after receiving a - * message that you must ack a message before it is redelivered. * @param {object} options.flowControl - Flow control configurations for * receiving messages. * @param {number} options.flowControl.maxBytes - The maximum number of bytes From 2515cdd2e1dcb5d0386f2007b334cb0a37666037 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 31 Aug 2017 09:54:00 -0400 Subject: [PATCH 0085/1115] pubsub: tokenize connection pool project id (#2579) * pubsub: interpolate projectId in connection pool * add delay between making sub & snap --- handwritten/pubsub/src/connection-pool.js | 9 +++++- handwritten/pubsub/system-test/pubsub.js | 1 + handwritten/pubsub/test/connection-pool.js | 37 +++++++++++++++++++++- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 4899f953054..8684544b257 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -56,6 +56,8 @@ var RETRY_CODES = [ */ function ConnectionPool(subscription) { this.subscription = subscription; + this.projectId = subscription.projectId; + this.connections = new Map(); this.isPaused = false; @@ -230,7 +232,8 @@ ConnectionPool.prototype.createConnection = function() { } connection.write({ - subscription: self.subscription.name, + subscription: common.util.replaceProjectIdToken( + self.subscription.name, self.projectId), streamAckDeadlineSeconds: self.settings.ackDeadline / 1000 }); @@ -302,6 +305,10 @@ ConnectionPool.prototype.getClient = function(callback) { grpc.credentials.createFromGoogleCredential(authClient) ); + if (!self.projectId || self.projectId === '{{projectId}}') { + self.projectId = pubsub.auth.projectId; + } + var Subscriber = v1(pubsub.options).Subscriber; self.client = new Subscriber(v1.SERVICE_ADDRESS, credentials, { diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 895eb6d6443..fdc3a59c4b9 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -535,6 +535,7 @@ describe('pubsub', function() { return deleteAllSnapshots() .then(wait(2500)) .then(subscription.create.bind(subscription)) + .then(wait(2500)) .then(snapshot.create.bind(snapshot)) .then(wait(2500)); }); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index e610035c22b..b2ff7297c03 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -66,9 +66,12 @@ describe('ConnectionPool', function() { var pool; var FAKE_PUBSUB_OPTIONS = {}; + var PROJECT_ID = 'grapce-spacheship-123'; var PUBSUB = { + projectId: PROJECT_ID, auth: { + projectId: PROJECT_ID, getAuthClient: fakeUtil.noop }, options: FAKE_PUBSUB_OPTIONS @@ -76,6 +79,7 @@ describe('ConnectionPool', function() { var SUB_NAME = 'test-subscription'; var SUBSCRIPTION = { + projectId: PROJECT_ID, name: SUB_NAME, pubsub: PUBSUB, request: fakeUtil.noop @@ -344,6 +348,7 @@ describe('ConnectionPool', function() { }); describe('connection', function() { + var TOKENIZED_SUB_NAME = 'project/p/subscriptions/' + SUB_NAME; var fakeId; beforeEach(function() { @@ -352,12 +357,20 @@ describe('ConnectionPool', function() { fakeUuid.v4 = function() { return fakeId; }; + + fakeUtil.replaceProjectIdToken = common.util.replaceProjectIdToken; }); it('should create a connection', function(done) { + fakeUtil.replaceProjectIdToken = function(subName, projectId) { + assert.strictEqual(subName, SUB_NAME); + assert.strictEqual(projectId, PROJECT_ID); + return TOKENIZED_SUB_NAME; + }; + fakeConnection.write = function(reqOpts) { assert.deepEqual(reqOpts, { - subscription: SUB_NAME, + subscription: TOKENIZED_SUB_NAME, streamAckDeadlineSeconds: pool.settings.ackDeadline / 1000 }); }; @@ -662,6 +675,7 @@ describe('ConnectionPool', function() { }); describe('getClient', function() { + var AUTH_PROJECT_ID = 'auth-project-id-123'; var fakeAuthClient = {}; function FakeSubscriber(address, creds, options) { @@ -671,6 +685,7 @@ describe('ConnectionPool', function() { } beforeEach(function() { + PUBSUB.auth.projectId = AUTH_PROJECT_ID; PUBSUB.auth.getAuthClient = function(callback) { callback(null, fakeAuthClient); }; @@ -734,6 +749,26 @@ describe('ConnectionPool', function() { }); }); + it('should capture the projectId when falsey', function(done) { + delete pool.projectId; + + pool.getClient(function(err) { + assert.ifError(err); + assert.strictEqual(pool.projectId, AUTH_PROJECT_ID); + done(); + }); + }); + + it('should capture the projectId if it needs tokenization', function(done) { + pool.projectId = '{{projectId}}'; + + pool.getClient(function(err) { + assert.ifError(err); + assert.strictEqual(pool.projectId, AUTH_PROJECT_ID); + done(); + }); + }); + it('should pass the pubsub options into the gax fn', function(done) { v1Override = function(options) { assert.strictEqual(options, FAKE_PUBSUB_OPTIONS); From a5a0523d77c41e320319db7229c1c705930bd23c Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 7 Sep 2017 09:17:24 -0400 Subject: [PATCH 0086/1115] pubsub: set sslCreds when apiEndpoint is used (#2583) --- handwritten/pubsub/src/index.js | 2 ++ handwritten/pubsub/test/index.js | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index e70bc171d63..4ab7b04e7c9 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -23,6 +23,7 @@ var common = require('@google-cloud/common'); var extend = require('extend'); var googleAuth = require('google-auto-auth'); +var grpc = require('grpc'); var is = require('is'); var PKG = require('../package.json'); @@ -291,6 +292,7 @@ PubSub.prototype.determineBaseUrl_ = function() { this.options.servicePath = baseUrlParts[0]; this.options.port = baseUrlParts[1]; + this.options.sslCreds = grpc.credentials.createInsecure(); }; /** diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index a7fc25c9d67..017d587d67f 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -19,12 +19,15 @@ var arrify = require('arrify'); var assert = require('assert'); var extend = require('extend'); +var grpc = require('grpc'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; var PKG = require('../package.json'); var v1 = require('../src/v1/index.js'); +var fakeGrpc = extend({}, grpc); + var SubscriptionCached = require('../src/subscription.js'); var SubscriptionOverride; @@ -122,6 +125,7 @@ describe('PubSub', function() { util: fakeUtil }, 'google-auto-auth': fakeGoogleAutoAuth, + grpc: fakeGrpc, './snapshot.js': FakeSnapshot, './subscription.js': Subscription, './topic.js': FakeTopic, @@ -604,12 +608,18 @@ describe('PubSub', function() { var defaultBaseUrl_ = 'defaulturl'; var testingUrl = 'localhost:8085'; + var fakeCreds = {}; + fakeGrpc.credentials.createInsecure = function() { + return fakeCreds; + }; + setHost(defaultBaseUrl_); pubsub.options.apiEndpoint = testingUrl; pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, '8085'); + assert.strictEqual(pubsub.options.sslCreds, fakeCreds); }); it('should remove slashes from the baseUrl', function() { From 76ca58332772e20d00c56059318b22c2da51df12 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 12 Sep 2017 16:53:41 -0700 Subject: [PATCH 0087/1115] Rename COPYING to LICENSE. (#2605) * Rename COPYING to LICENSE. The open source team is asking that we use LICENSE for the license filename consistently across our repos. * Fix references of COPYING to LICENSE. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6b96ac08c5a..6f2a1b67c83 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -35,7 +35,7 @@ "src", "AUTHORS", "CONTRIBUTORS", - "COPYING" + "LICENSE" ], "repository": "googlecloudplatform/google-cloud-node", "keywords": [ From 8ffd8b429a7fffc00b9463c2d833c2a948c25ef9 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 14 Sep 2017 12:39:01 -0400 Subject: [PATCH 0088/1115] pubsub @ 0.14.1 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6f2a1b67c83..f9d7084345d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.0", + "version": "0.14.1", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 4659a059a5bb62ed3706d400e4be0ed824f33b31 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 19 Sep 2017 13:57:26 -0400 Subject: [PATCH 0089/1115] pubsub: skip getProjectId for emulator usage (#2617) * pubsub: skip getProjectId for emulator usage * use emulator service address when set * add tests for isEmulator flag --- handwritten/pubsub/src/connection-pool.js | 52 +++++-- handwritten/pubsub/src/index.js | 49 ++++-- handwritten/pubsub/test/connection-pool.js | 171 +++++++++++++++------ handwritten/pubsub/test/index.js | 27 ++++ 4 files changed, 222 insertions(+), 77 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 8684544b257..33fc4cc3e9c 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -294,24 +294,24 @@ ConnectionPool.prototype.getClient = function(callback) { var self = this; var pubsub = this.subscription.pubsub; - pubsub.auth.getAuthClient(function(err, authClient) { + this.getCredentials(function(err, credentials) { if (err) { callback(err); return; } - var credentials = grpc.credentials.combineChannelCredentials( - grpc.credentials.createSsl(), - grpc.credentials.createFromGoogleCredential(authClient) - ); + var Subscriber = v1(pubsub.options).Subscriber; + var address = v1.SERVICE_ADDRESS; - if (!self.projectId || self.projectId === '{{projectId}}') { - self.projectId = pubsub.auth.projectId; - } + if (pubsub.isEmulator) { + address = pubsub.options.servicePath; - var Subscriber = v1(pubsub.options).Subscriber; + if (pubsub.options.port) { + address += ':' + pubsub.options.port; + } + } - self.client = new Subscriber(v1.SERVICE_ADDRESS, credentials, { + self.client = new Subscriber(address, credentials, { 'grpc.max_receive_message_length': 20000001, 'grpc.primary_user_agent': common.util.getUserAgentFromPackageJson(PKG) }); @@ -320,6 +320,38 @@ ConnectionPool.prototype.getClient = function(callback) { }); }; +/** + * Get/create client credentials. + * + * @param {function} callback - The callback function. + * @param {?error} callback.err - An error occurred while getting the client. + * @param {object} callback.credentials - The client credentials. + */ +ConnectionPool.prototype.getCredentials = function(callback) { + var self = this; + var pubsub = this.subscription.pubsub; + + if (pubsub.isEmulator) { + setImmediate(callback, null, grpc.credentials.createInsecure()); + return; + } + + pubsub.auth.getAuthClient(function(err, authClient) { + if (err) { + callback(err); + return; + } + + var credentials = grpc.credentials.combineChannelCredentials( + grpc.credentials.createSsl(), + grpc.credentials.createFromGoogleCredential(authClient) + ); + + self.projectId = pubsub.auth.projectId; + callback(null, credentials); + }); +}; + /** * Check to see if at least one stream in the pool is connected. * @return {boolean} diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 4ab7b04e7c9..f8f98d72c45 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -47,6 +47,12 @@ var Subscription = require('./subscription.js'); */ var Topic = require('./topic.js'); +/** + * @type {string} - Project ID placeholder. + * @private + */ +var PROJECT_ID_PLACEHOLDER = '{{projectId}}'; + /** * [Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a * reliable, many-to-many, asynchronous messaging service from Cloud @@ -76,11 +82,12 @@ function PubSub(options) { libVersion: PKG.version }, options); + this.isEmulator = false; this.determineBaseUrl_(); this.api = {}; this.auth = googleAuth(this.options); - this.projectId = this.options.projectId || '{{projectId}}'; + this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; } /** @@ -293,6 +300,7 @@ PubSub.prototype.determineBaseUrl_ = function() { this.options.servicePath = baseUrlParts[0]; this.options.port = baseUrlParts[1]; this.options.sslCreds = grpc.credentials.createInsecure(); + this.isEmulator = true; }; /** @@ -640,25 +648,34 @@ PubSub.prototype.request = function(config, callback) { return; } - self.auth.getProjectId(function(err, projectId) { - if (err) { - callback(err); - return; - } + var hasProjectId = this.projectId && + this.projectId !== PROJECT_ID_PLACEHOLDER; - var gaxClient = self.api[config.client]; + if (!hasProjectId && !this.isEmulator) { + this.auth.getProjectId(function(err, projectId) { + if (err) { + callback(err); + return; + } - if (!gaxClient) { - // Lazily instantiate client. - gaxClient = v1(self.options)[config.client](self.options); - self.api[config.client] = gaxClient; - } + self.projectId = projectId; + self.request(config, callback); + }); + return; + } - var reqOpts = extend(true, {}, config.reqOpts); - reqOpts = common.util.replaceProjectIdToken(reqOpts, projectId); + var gaxClient = this.api[config.client]; - gaxClient[config.method](reqOpts, config.gaxOpts, callback); - }); + if (!gaxClient) { + // Lazily instantiate client. + gaxClient = v1(this.options)[config.client](this.options); + this.api[config.client] = gaxClient; + } + + var reqOpts = extend(true, {}, config.reqOpts); + reqOpts = common.util.replaceProjectIdToken(reqOpts, this.projectId); + + gaxClient[config.method](reqOpts, config.gaxOpts, callback); }; /** diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index b2ff7297c03..be58be32756 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -675,8 +675,7 @@ describe('ConnectionPool', function() { }); describe('getClient', function() { - var AUTH_PROJECT_ID = 'auth-project-id-123'; - var fakeAuthClient = {}; + var fakeCreds = {}; function FakeSubscriber(address, creds, options) { this.address = address; @@ -685,9 +684,8 @@ describe('ConnectionPool', function() { } beforeEach(function() { - PUBSUB.auth.projectId = AUTH_PROJECT_ID; - PUBSUB.auth.getAuthClient = function(callback) { - callback(null, fakeAuthClient); + pool.getCredentials = function(callback) { + callback(null, fakeCreds); }; v1Override = function() { @@ -710,7 +708,7 @@ describe('ConnectionPool', function() { it('should return any auth errors', function(done) { var error = new Error('err'); - PUBSUB.auth.getAuthClient = function(callback) { + pool.getCredentials = function(callback) { callback(error); }; @@ -722,49 +720,10 @@ describe('ConnectionPool', function() { }); it('should create/use grpc credentials', function(done) { - var fakeSslCreds = {}; - var fakeGoogCreds = {}; - var fakeCombinedCreds = {}; - - fakeGrpc.credentials = { - createSsl: function() { - return fakeSslCreds; - }, - createFromGoogleCredential: function(authClient) { - assert.strictEqual(authClient, fakeAuthClient); - return fakeGoogCreds; - }, - combineChannelCredentials: function(sslCreds, googCreds) { - assert.strictEqual(sslCreds, fakeSslCreds); - assert.strictEqual(googCreds, fakeGoogCreds); - return fakeCombinedCreds; - } - }; - pool.getClient(function(err, client) { assert.ifError(err); assert(client instanceof FakeSubscriber); - assert.strictEqual(client.creds, fakeCombinedCreds); - done(); - }); - }); - - it('should capture the projectId when falsey', function(done) { - delete pool.projectId; - - pool.getClient(function(err) { - assert.ifError(err); - assert.strictEqual(pool.projectId, AUTH_PROJECT_ID); - done(); - }); - }); - - it('should capture the projectId if it needs tokenization', function(done) { - pool.projectId = '{{projectId}}'; - - pool.getClient(function(err) { - assert.ifError(err); - assert.strictEqual(pool.projectId, AUTH_PROJECT_ID); + assert.strictEqual(client.creds, fakeCreds); done(); }); }); @@ -783,11 +742,6 @@ describe('ConnectionPool', function() { }); it('should pass in the correct the args to the Subscriber', function(done) { - var fakeCreds = {}; - fakeGrpc.credentials.combineChannelCredentials = function() { - return fakeCreds; - }; - var fakeAddress = 'a.b.c'; fakeV1.SERVICE_ADDRESS = fakeAddress; @@ -811,6 +765,121 @@ describe('ConnectionPool', function() { done(); }); }); + + it('should respect the emulator service address', function(done) { + fakeV1.SERVICE_ADDRESS = 'should.not.use'; + + PUBSUB.isEmulator = true; + PUBSUB.options.servicePath = 'should.use'; + + pool.getClient(function(err, client) { + assert.ifError(err); + assert.strictEqual(client.address, 'should.use'); + done(); + }); + }); + + it('should respect the emulator service port', function(done) { + fakeV1.SERVICE_ADDRESS = 'should.not.use'; + + PUBSUB.isEmulator = true; + PUBSUB.options.servicePath = 'should.use'; + PUBSUB.options.port = 9999; + + pool.getClient(function(err, client) { + assert.ifError(err); + assert.strictEqual(client.address, 'should.use:9999'); + done(); + }); + }); + }); + + describe('getCredentials', function() { + beforeEach(function() { + fakeGrpc.credentials = { + createInsecure: fakeUtil.noop, + createSsl: fakeUtil.noop, + createFromGoogleCredential: fakeUtil.noop, + combineChannelCredentials: fakeUtil.noop + }; + }); + + it('should return insecure creds for emulator usage', function(done) { + var fakeCreds = {}; + fakeGrpc.credentials.createInsecure = function() { + return fakeCreds; + }; + + PUBSUB.isEmulator = true; + + pool.getCredentials(function(err, creds) { + assert.ifError(err); + assert.strictEqual(creds, fakeCreds); + done(); + }); + }); + + it('should get grpc creds', function(done) { + var fakeAuthClient = {}; + var fakeSslCreds = {}; + var fakeGoogCreds = {}; + var fakeCombinedCreds = {}; + + PUBSUB.isEmulator = false; + PUBSUB.auth.getAuthClient = function(callback) { + callback(null, fakeAuthClient); + }; + + fakeGrpc.credentials = { + createSsl: function() { + return fakeSslCreds; + }, + createFromGoogleCredential: function(authClient) { + assert.strictEqual(authClient, fakeAuthClient); + return fakeGoogCreds; + }, + combineChannelCredentials: function(sslCreds, googCreds) { + assert.strictEqual(sslCreds, fakeSslCreds); + assert.strictEqual(googCreds, fakeGoogCreds); + return fakeCombinedCreds; + } + }; + + + pool.getCredentials(function(err, creds) { + assert.ifError(err); + assert.strictEqual(creds, fakeCombinedCreds); + done(); + }); + }); + + it('should return getAuthClient errors', function(done) { + var error = new Error('err'); + + PUBSUB.auth.getAuthClient = function(callback) { + callback(error); + }; + + pool.getCredentials(function(err) { + assert.strictEqual(err, error); + done(); + }); + }); + + it('should cache the project ID', function(done) { + PUBSUB.auth.getAuthClient = function(callback) { + PUBSUB.auth.projectId = PROJECT_ID; + callback(null, {}); + }; + + delete pool.projectId; + + pool.getCredentials(function(err) { + assert.ifError(err); + assert.strictEqual(pool.projectId, PROJECT_ID); + done(); + }); + }); }); describe('isConnected', function() { diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 017d587d67f..049036469fd 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -238,6 +238,10 @@ describe('PubSub', function() { var pubsub = new PubSub({}); assert.strictEqual(pubsub.projectId, '{{projectId}}'); }); + + it('should set isEmulator to false by default', function() { + assert.strictEqual(pubsub.isEmulator, false); + }); }); @@ -620,6 +624,7 @@ describe('PubSub', function() { assert.strictEqual(pubsub.options.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, '8085'); assert.strictEqual(pubsub.options.sslCreds, fakeCreds); + assert.strictEqual(pubsub.isEmulator, true); }); it('should remove slashes from the baseUrl', function() { @@ -656,6 +661,7 @@ describe('PubSub', function() { pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, '9090'); + assert.strictEqual(pubsub.isEmulator, true); }); }); }); @@ -963,6 +969,8 @@ describe('PubSub', function() { }; beforeEach(function() { + delete pubsub.projectId; + pubsub.auth = { getProjectId: function(callback) { callback(null, PROJECT_ID); @@ -1043,6 +1051,25 @@ describe('PubSub', function() { global.GCLOUD_SANDBOX_ENV = false; done(); }); + + describe('on emulator', function() { + beforeEach(function() { + pubsub.isEmulator = true; + pubsub.auth.getProjectId = function() { + throw new Error('getProjectId should not be called.'); + }; + }); + + it('should not get the projectId if null', function(done) { + pubsub.projectId = null; + pubsub.request(CONFIG, done); + }); + + it('should not get the projectId if placeholder', function(done) { + pubsub.projectId = '{{projectId}}'; + pubsub.request(CONFIG, done); + }); + }); }); describe('snapshot', function() { From a77c9e2c319f40de06324cb6421b0f825525ef48 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 19 Sep 2017 14:02:44 -0400 Subject: [PATCH 0090/1115] pubsub @ 0.14.2 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f9d7084345d..56a1fa9d135 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.1", + "version": "0.14.2", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From b7081adf2febd7cd7362d5ae6ee07c5a6aa09791 Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 29 Sep 2017 18:38:13 -0400 Subject: [PATCH 0091/1115] Assign `topic.parent` to pubsub instance. (#2637) * Assign `topic.parent` to pubsub instance. * Update tests. --- handwritten/pubsub/src/topic.js | 2 +- handwritten/pubsub/test/topic.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 9bf0ce80a21..2b71548b846 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -52,7 +52,7 @@ var Publisher = require('./publisher.js'); */ function Topic(pubsub, name) { this.name = Topic.formatName_(pubsub.projectId, name); - this.pubsub = pubsub; + this.parent = this.pubsub = pubsub; this.request = pubsub.request.bind(pubsub); /** diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index ef73a6464ff..6b983b1798d 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -120,6 +120,7 @@ describe('Topic', function() { }); it('should localize the parent object', function() { + assert.strictEqual(topic.parent, PUBSUB); assert.strictEqual(topic.pubsub, PUBSUB); }); From deb93b2c8032c6addffeb49cd1ae89babe29bf66 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 2 Oct 2017 09:17:37 -0400 Subject: [PATCH 0092/1115] pubsub: refactor subscription connection (#2627) --- handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/connection-pool.js | 171 ++++++++--- handwritten/pubsub/src/subscription.js | 22 +- handwritten/pubsub/test/connection-pool.js | 318 +++++++++++++++++++-- handwritten/pubsub/test/subscription.js | 111 ++++++- 5 files changed, 532 insertions(+), 91 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 56a1fa9d135..3733c3b5321 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -59,6 +59,7 @@ "google-auto-auth": "^0.7.1", "google-gax": "^0.13.0", "google-proto-files": "^0.12.0", + "grpc": "^1.6.0", "is": "^3.0.1", "uuid": "^3.0.1" }, diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 33fc4cc3e9c..a7d9b64f9c7 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -32,6 +32,13 @@ var uuid = require('uuid'); var PKG = require('../package.json'); var v1 = require('./v1'); +var CHANNEL_READY_EVENT = 'channel.ready'; +var CHANNEL_ERROR_EVENT = 'channel.error'; + +// if we can't establish a connection within 5 minutes, we need to back off +// and emit an error to the user. +var MAX_TIMEOUT = 300000; + // codes to retry streams var RETRY_CODES = [ 0, // ok @@ -62,6 +69,7 @@ function ConnectionPool(subscription) { this.isPaused = false; this.isOpen = false; + this.isGettingChannelState = false; this.failedConnectionAttempts = 0; this.noConnectionsTime = 0; @@ -72,7 +80,6 @@ function ConnectionPool(subscription) { }; this.queue = []; - events.EventEmitter.call(this); // grpc related fields we need since we're bypassing gax this.metadata_ = new grpc.Metadata(); @@ -83,6 +90,7 @@ function ConnectionPool(subscription) { 'grpc/' + require('grpc/package.json').version ].join(' ')); + events.EventEmitter.call(this); this.open(); } @@ -142,16 +150,25 @@ ConnectionPool.prototype.acquire = function(id, callback) { * @param {?error} callback.error - An error returned while closing the pool. */ ConnectionPool.prototype.close = function(callback) { - var self = this; var connections = Array.from(this.connections.values()); callback = callback || common.util.noop; - this.isOpen = false; - self.connections.clear(); - this.queue.forEach(clearTimeout); + if (this.client) { + this.client.close(); + } + this.connections.clear(); + this.queue.forEach(clearTimeout); this.queue.length = 0; + + this.isOpen = false; + this.isGettingChannelState = false; + + this.removeAllListeners('newListener') + .removeAllListeners(CHANNEL_READY_EVENT) + .removeAllListeners(CHANNEL_ERROR_EVENT); + this.failedConnectionAttempts = 0; this.noConnectionsTime = 0; @@ -177,28 +194,60 @@ ConnectionPool.prototype.createConnection = function() { var connection = client.streamingPull(self.metadata_); var errorImmediateHandle; - connection.on('error', function(err) { - // since this is a bidi stream it's possible that we recieve errors from - // reads or writes. We also want to try and cut down on the number of - // errors that we emit if other connections are still open. So by using - // setImmediate we're able to cancel the error message if it gets passed - // to the `status` event where we can check if the connection should be - // re-opened or if we should send the error to the user - errorImmediateHandle = setImmediate(self.emit.bind(self), 'error', err); - }); + if (self.isPaused) { + connection.pause(); + } - connection.on('metadata', function(metadata) { - if (!metadata.get('date').length) { - return; - } + self + .once(CHANNEL_ERROR_EVENT, onChannelError) + .once(CHANNEL_READY_EVENT, onChannelReady); + + connection + .on('error', onConnectionError) + .on('data', onConnectionData) + .on('status', onConnectionStatus) + .write({ + subscription: common.util.replaceProjectIdToken( + self.subscription.name, self.projectId), + streamAckDeadlineSeconds: self.settings.ackDeadline / 1000 + }); + + self.connections.set(id, connection); + + function onChannelError() { + self.removeListener(CHANNEL_READY_EVENT, onChannelReady); + + connection.cancel(); + } + + function onChannelReady() { + self.removeListener(CHANNEL_ERROR_EVENT, onChannelError); connection.isConnected = true; + self.noConnectionsTime = 0; self.failedConnectionAttempts = 0; + self.emit('connected', connection); - }); + } + + // since this is a bidi stream it's possible that we recieve errors from + // reads or writes. We also want to try and cut down on the number of + // errors that we emit if other connections are still open. So by using + // setImmediate we're able to cancel the error message if it gets passed + // to the `status` event where we can check if the connection should be + // re-opened or if we should send the error to the user + function onConnectionError(err) { + errorImmediateHandle = setImmediate(self.emit.bind(self), 'error', err); + } - connection.on('status', function(status) { + function onConnectionData(data) { + arrify(data.receivedMessages).forEach(function(message) { + self.emit('message', self.createMessage(id, message)); + }); + } + + function onConnectionStatus(status) { clearImmediate(errorImmediateHandle); connection.end(); @@ -219,25 +268,7 @@ ConnectionPool.prototype.createConnection = function() { error.code = status.code; self.emit('error', error); } - }); - - connection.on('data', function(data) { - arrify(data.receivedMessages).forEach(function(message) { - self.emit('message', self.createMessage(id, message)); - }); - }); - - if (self.isPaused) { - connection.pause(); } - - connection.write({ - subscription: common.util.replaceProjectIdToken( - self.subscription.name, self.projectId), - streamAckDeadlineSeconds: self.settings.ackDeadline / 1000 - }); - - self.connections.set(id, connection); }); }; @@ -277,6 +308,59 @@ ConnectionPool.prototype.createMessage = function(connectionId, resp) { }; }; +/** + * Gets the channels connectivity state and emits channel events accordingly. + * + * @fires CHANNEL_ERROR_EVENT + * @fires CHANNEL_READY_EVENT + */ +ConnectionPool.prototype.getAndEmitChannelState = function() { + var self = this; + + this.isGettingChannelState = true; + + this.getClient(function(err, client) { + if (err) { + self.isGettingChannelState = false; + self.emit(CHANNEL_ERROR_EVENT); + self.emit('error', err); + return; + } + + var READY_STATE = 2; + + var channel = client.getChannel(); + var connectivityState = channel.getConnectivityState(false); + + if (connectivityState === READY_STATE) { + self.isGettingChannelState = false; + self.emit(CHANNEL_READY_EVENT); + return; + } + + var elapsedTimeWithoutConnection = 0; + var now = Date.now(); + var deadline; + + if (self.noConnectionsTime) { + elapsedTimeWithoutConnection = now - self.noConnectionsTime; + } + + deadline = now + (MAX_TIMEOUT - elapsedTimeWithoutConnection); + + client.waitForReady(deadline, function(err) { + self.isGettingChannelState = false; + + if (err) { + self.emit(CHANNEL_ERROR_EVENT, err); + return; + } + + self.emit(CHANNEL_READY_EVENT); + }); + }); +}; + /** * Gets the Subscriber client. We need to bypass GAX until they allow deadlines * to be optional. @@ -312,6 +396,7 @@ ConnectionPool.prototype.getClient = function(callback) { } self.client = new Subscriber(address, credentials, { + 'grpc.keepalive_time_ms': MAX_TIMEOUT, 'grpc.max_receive_message_length': 20000001, 'grpc.primary_user_agent': common.util.getUserAgentFromPackageJson(PKG) }); @@ -375,6 +460,8 @@ ConnectionPool.prototype.isConnected = function() { * Creates specified number of connections and puts pool in open state. */ ConnectionPool.prototype.open = function() { + var self = this; + var existing = this.connections.size; var max = this.settings.maxConnections; @@ -385,6 +472,12 @@ ConnectionPool.prototype.open = function() { this.isOpen = true; this.failedConnectionAttempts = 0; this.noConnectionsTime = Date.now(); + + this.on('newListener', function(eventName) { + if (eventName === CHANNEL_READY_EVENT && !self.isGettingChannelState) { + self.getAndEmitChannelState(); + } + }); }; /** @@ -450,7 +543,7 @@ ConnectionPool.prototype.shouldReconnect = function(status) { } var exceededRetryLimit = this.noConnectionsTime && - Date.now() - this.noConnectionsTime > 300000; + Date.now() - this.noConnectionsTime > MAX_TIMEOUT; if (exceededRetryLimit) { return false; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 42683f15c35..1ecccbb1b8b 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -181,6 +181,7 @@ function Subscription(pubsub, name, options) { this.flushTimeoutHandle_ = null; this.leaseTimeoutHandle_ = null; this.userClosed_ = false; + this.isOpen = false; events.EventEmitter.call(this); this.messageListeners = 0; @@ -328,12 +329,12 @@ Subscription.prototype.breakLease_ = function(message) { Subscription.prototype.close = function(callback) { this.userClosed_ = true; + var inventory = this.inventory_; + inventory.lease.length = inventory.bytes = 0; + clearTimeout(this.leaseTimeoutHandle_); this.leaseTimeoutHandle_ = null; - clearTimeout(this.flushTimeoutHandle_); - this.flushTimeoutHandle_ = null; - this.flushQueues_(); this.closeConnection_(callback); }; @@ -347,6 +348,8 @@ Subscription.prototype.close = function(callback) { * @param {?error} err - An error returned from this request. */ Subscription.prototype.closeConnection_ = function(callback) { + this.isOpen = false; + if (this.connectionPool) { this.connectionPool.close(callback || common.util.noop); this.connectionPool = null; @@ -520,6 +523,9 @@ Subscription.prototype.exists = function(callback) { Subscription.prototype.flushQueues_ = function() { var self = this; + clearTimeout(this.flushTimeoutHandle_); + this.flushTimeoutHandle_ = null; + var acks = this.inventory_.ack; var nacks = this.inventory_.nack; @@ -846,6 +852,8 @@ Subscription.prototype.openConnection_ = function() { var self = this; var pool = this.connectionPool = new ConnectionPool(this); + this.isOpen = true; + pool.on('error', function(err) { self.emit('error', err); }); @@ -859,8 +867,6 @@ Subscription.prototype.openConnection_ = function() { }); pool.once('connected', function() { - clearTimeout(self.flushTimeoutHandle_); - self.flushTimeoutHandle_ = null; self.flushQueues_(); }); }; @@ -874,14 +880,16 @@ Subscription.prototype.openConnection_ = function() { Subscription.prototype.renewLeases_ = function() { var self = this; + clearTimeout(this.leaseTimeoutHandle_); this.leaseTimeoutHandle_ = null; if (!this.inventory_.lease.length) { return; } - var ackIds = this.inventory_.lease; this.ackDeadline = this.histogram.percentile(99); + + var ackIds = this.inventory_.lease.slice(); var ackDeadlineSeconds = this.ackDeadline / 1000; if (this.connectionPool) { @@ -991,7 +999,7 @@ Subscription.prototype.setFlushTimeout_ = function() { * @private */ Subscription.prototype.setLeaseTimeout_ = function() { - if (this.leaseTimeoutHandle_) { + if (this.leaseTimeoutHandle_ || !this.isOpen) { return; } diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index be58be32756..2fb5097634f 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -41,6 +41,7 @@ function FakeConnection() { this.isConnected = false; this.isPaused = false; this.ended = false; + this.canceled = false; events.EventEmitter.call(this); } @@ -61,6 +62,10 @@ FakeConnection.prototype.resume = function() { this.isPaused = false; }; +FakeConnection.prototype.cancel = function() { + this.canceled = true; +}; + describe('ConnectionPool', function() { var ConnectionPool; var pool; @@ -122,6 +127,7 @@ describe('ConnectionPool', function() { assert(pool.connections instanceof Map); assert.strictEqual(pool.isPaused, false); assert.strictEqual(pool.isOpen, false); + assert.strictEqual(pool.isGettingChannelState, false); assert.strictEqual(pool.failedConnectionAttempts, 0); assert.strictEqual(pool.noConnectionsTime, 0); assert.strictEqual(pool.settings.maxConnections, 5); @@ -238,11 +244,23 @@ describe('ConnectionPool', function() { }); describe('close',function() { + it('should close the client', function(done) { + pool.client = { close: done }; + pool.close(); + }); + it('should set isOpen to false', function() { pool.close(); assert.strictEqual(pool.isOpen, false); }); + it('should set isGettingChannelState to false', function() { + pool.isGettingChannelState = true; + pool.close(); + + assert.strictEqual(pool.isGettingChannelState, false); + }); + it('should call end on all active connections', function() { var a = new FakeConnection(); var b = new FakeConnection(); @@ -290,6 +308,23 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.noConnectionsTime, 0); }); + it('should remove event listeners', function() { + pool + .on('channel.ready', nope) + .on('channel.error', nope) + .on('newListener', nope); + + pool.close(); + + assert.strictEqual(pool.listenerCount('channel.ready'), 0); + assert.strictEqual(pool.listenerCount('channel.error'), 0); + assert.strictEqual(pool.listenerCount('newListener'), 0); + + function nope() { + throw new Error('Should not be called!'); + } + }); + it('should exec a callback when finished closing', function(done) { pool.close(done); }); @@ -307,13 +342,23 @@ describe('ConnectionPool', function() { describe('createConnection', function() { var fakeClient; var fakeConnection; + var fakeChannel; beforeEach(function() { fakeConnection = new FakeConnection(); + fakeChannel = { + getConnectivityState: function() { + return 2; + } + }; + fakeClient = { streamingPull: function() { return fakeConnection; + }, + getChannel: function() { + return fakeChannel; } }; @@ -347,6 +392,66 @@ describe('ConnectionPool', function() { pool.createConnection(); }); + describe('channel', function() { + var channelReadyEvent = 'channel.ready'; + var channelErrorEvent = 'channel.error'; + + describe('error', function() { + it('should remove the channel ready event listener', function() { + pool.createConnection(); + assert.strictEqual(pool.listenerCount(channelReadyEvent), 1); + + pool.emit(channelErrorEvent); + assert.strictEqual(pool.listenerCount(channelReadyEvent), 0); + }); + + it('should cancel the connection', function() { + pool.createConnection(); + pool.emit(channelErrorEvent); + + assert.strictEqual(fakeConnection.canceled, true); + }); + }); + + describe('success', function() { + it('should remove the channel error event', function() { + pool.createConnection(); + assert.strictEqual(pool.listenerCount(channelErrorEvent), 1); + + pool.emit(channelReadyEvent); + assert.strictEqual(pool.listenerCount(channelErrorEvent), 0); + }); + + it('should set the isConnected flag to true', function() { + pool.createConnection(); + pool.emit(channelReadyEvent); + + assert.strictEqual(fakeConnection.isConnected, true); + }); + + it('should reset internally used properties', function() { + pool.noConnectionsTime = Date.now(); + pool.failedConnectionAttempts = 10; + + pool.createConnection(); + pool.emit(channelReadyEvent); + + assert.strictEqual(pool.noConnectionsTime, 0); + assert.strictEqual(pool.failedConnectionAttempts, 0); + }); + + it('should emit a connected event', function(done) { + pool.on('connected', function(connection) { + assert.strictEqual(connection, fakeConnection); + done(); + }); + + pool.createConnection(); + pool.emit(channelReadyEvent); + }); + }); + }); + describe('connection', function() { var TOKENIZED_SUB_NAME = 'project/p/subscriptions/' + SUB_NAME; var fakeId; @@ -404,35 +509,6 @@ describe('ConnectionPool', function() { }); }); - describe('metadata events', function() { - it('should do nothing if the metadata is empty', function(done) { - var metadata = new grpc.Metadata(); - - pool.on('connected', done); // should not fire - pool.createConnection(); - - fakeConnection.emit('metadata', metadata); - done(); - }); - - it('should reset counters and fire connected', function(done) { - var metadata = new grpc.Metadata(); - - metadata.set('date', 'abc'); - - pool.on('connected', function(connection) { - assert.strictEqual(connection, fakeConnection); - assert(fakeConnection.isConnected); - assert.strictEqual(pool.noConnectionsTime, 0); - assert.strictEqual(pool.failedConnectionAttempts, 0); - done(); - }); - - pool.createConnection(); - fakeConnection.emit('metadata', metadata); - }); - }); - describe('status events', function() { beforeEach(function() { pool.connections.set('a', new FakeConnection()); @@ -674,6 +750,153 @@ describe('ConnectionPool', function() { }); }); + describe('getAndEmitChannelState', function() { + var channelErrorEvent = 'channel.error'; + var channelReadyEvent = 'channel.ready'; + var channelReadyState = 2; + var fakeChannelState; + var dateNow; + var fakeTimestamp; + var fakeChannel = {}; + + var fakeClient = { + getChannel: function() { + return fakeChannel; + } + }; + + before(function() { + dateNow = global.Date.now; + }); + + beforeEach(function() { + fakeChannel.getConnectivityState = function() { + return fakeChannelState; + }; + + fakeChannelState = 0; + fakeClient.waitForReady = fakeUtil.noop; + + pool.getClient = function(callback) { + callback(null, fakeClient); + }; + + fakeTimestamp = dateNow.call(global.Date); + pool.noConnectionsTime = 0; + + global.Date.now = function() { + return fakeTimestamp; + }; + }); + + after(function() { + global.Date.now = dateNow; + }); + + it('should set the isGettingChannelState flag to true', function() { + pool.getAndEmitChannelState(); + assert.strictEqual(pool.isGettingChannelState, true); + }); + + it('should emit any client errors', function(done) { + var channelErrorEmitted = false; + + pool.on(channelErrorEvent, function() { + channelErrorEmitted = true; + }); + + var fakeError = new Error('nope'); + var errorEmitted = false; + + pool.on('error', function(err) { + assert.strictEqual(err, fakeError); + errorEmitted = true; + }); + + pool.getClient = function(callback) { + callback(fakeError); + + assert.strictEqual(pool.isGettingChannelState, false); + assert.strictEqual(channelErrorEmitted, true); + assert.strictEqual(errorEmitted, true); + + done(); + }; + + pool.getAndEmitChannelState(); + }); + + it('should emit the ready event if the channel is ready', function(done) { + fakeChannelState = channelReadyState; + + fakeChannel.getConnectivityState = function(shouldConnect) { + assert.strictEqual(shouldConnect, false); + return fakeChannelState; + }; + + pool.on(channelReadyEvent, function() { + assert.strictEqual(pool.isGettingChannelState, false); + done(); + }); + + pool.getAndEmitChannelState(); + }); + + it('should wait for the channel to be ready', function(done) { + var expectedDeadline = fakeTimestamp + 300000; + + fakeClient.waitForReady = function(deadline) { + assert.strictEqual(deadline, expectedDeadline); + done(); + }; + + pool.getAndEmitChannelState(); + }); + + it('should factor in the noConnectionsTime property', function(done) { + pool.noConnectionsTime = 10; + + var fakeElapsedTime = fakeTimestamp - pool.noConnectionsTime; + var expectedDeadline = fakeTimestamp + (300000 - fakeElapsedTime); + + fakeClient.waitForReady = function(deadline) { + assert.strictEqual(deadline, expectedDeadline); + done(); + }; + + pool.getAndEmitChannelState(); + }); + + it('should emit any waitForReady errors', function(done) { + var fakeError = new Error('err'); + + pool.on(channelErrorEvent, function(err) { + assert.strictEqual(err, fakeError); + assert.strictEqual(pool.isGettingChannelState, false); + done(); + }); + + fakeClient.waitForReady = function(deadline, callback) { + callback(fakeError); + }; + + pool.getAndEmitChannelState(); + }); + + it('should emit the ready event when ready', function(done) { + pool.on(channelReadyEvent, function() { + assert.strictEqual(pool.isGettingChannelState, false); + done(); + }); + + fakeClient.waitForReady = function(deadline, callback) { + callback(null); + }; + + pool.getAndEmitChannelState(); + }); + }); + describe('getClient', function() { var fakeCreds = {}; @@ -681,8 +904,13 @@ describe('ConnectionPool', function() { this.address = address; this.creds = creds; this.options = options; + this.closed = false; } + FakeSubscriber.prototype.close = function() { + this.closed = true; + }; + beforeEach(function() { pool.getCredentials = function(callback) { callback(null, fakeCreds); @@ -696,7 +924,7 @@ describe('ConnectionPool', function() { }); it('should return the cached client when available', function(done) { - var fakeClient = pool.client = {}; + var fakeClient = pool.client = new FakeSubscriber(); pool.getClient(function(err, client) { assert.ifError(err); @@ -758,6 +986,7 @@ describe('ConnectionPool', function() { assert.strictEqual(client.creds, fakeCreds); assert.deepEqual(client.options, { + 'grpc.keepalive_time_ms': 300000, 'grpc.max_receive_message_length': 20000001, 'grpc.primary_user_agent': fakeUserAgent }); @@ -949,6 +1178,35 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.failedConnectionAttempts, 0); assert.strictEqual(pool.noConnectionsTime, Date.now()); }); + + it('should listen for newListener events', function() { + pool.removeAllListeners('newListener'); + pool.open(); + + assert.strictEqual(pool.listenerCount('newListener'), 1); + }); + + describe('newListener callback', function() { + beforeEach(function() { + pool.getAndEmitChannelState = function() { + throw new Error('Should not be called!'); + }; + }); + + it('should call getAndEmitChannelState', function(done) { + pool.getAndEmitChannelState = done; + pool.emit('newListener', 'channel.ready'); + }); + + it('should do nothing for unknown events', function() { + pool.emit('newListener', 'channel.error'); + }); + + it('should do nothing when already getting state', function() { + pool.isGettingChannelState = true; + pool.emit('newListener', 'channel.ready'); + }); + }); }); describe('pause', function() { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 63fa029b502..c07bfa644a4 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -160,6 +160,7 @@ describe('Subscription', function() { assert.strictEqual(subscription.maxConnections, 5); assert.strictEqual(subscription.userClosed_, false); assert.strictEqual(subscription.messageListeners, 0); + assert.strictEqual(subscription.isOpen, false); assert.deepEqual(subscription.flowControl, { maxBytes: FAKE_FREE_MEM * 0.2, @@ -428,25 +429,36 @@ describe('Subscription', function() { }); describe('close', function() { + beforeEach(function() { + subscription.flushQueues_ = fakeUtil.noop; + subscription.closeConnection_ = fakeUtil.noop; + }); + it('should set the userClosed_ flag', function() { subscription.close(); assert.strictEqual(subscription.userClosed_, true); }); - it('should stop auto-leasing', function(done) { - subscription.leaseTimeoutHandle_ = setTimeout(done, 1); + it('should dump the inventory', function() { + subscription.inventory_ = { + lease: [0, 1, 2], + bytes: 123 + }; + subscription.close(); - assert.strictEqual(subscription.leaseTimeoutHandle_, null); - setImmediate(done); + assert.deepEqual(subscription.inventory_, { + lease: [], + bytes: 0 + }); }); - it('should stop any queued flushes', function(done) { - subscription.flushTimeoutHandle_ = setTimeout(done, 1); + it('should stop auto-leasing', function(done) { + subscription.leaseTimeoutHandle_ = setTimeout(done, 1); subscription.close(); - assert.strictEqual(subscription.flushTimeoutHandle_, null); + assert.strictEqual(subscription.leaseTimeoutHandle_, null); setImmediate(done); }); @@ -469,6 +481,11 @@ describe('Subscription', function() { fakeUtil.noop = function() {}; }); + it('should set isOpen to false', function() { + subscription.closeConnection_(); + assert.strictEqual(subscription.isOpen, false); + }); + describe('with connection pool', function() { beforeEach(function() { subscription.connectionPool = { @@ -761,6 +778,26 @@ describe('Subscription', function() { subscription.flushQueues_(); }); + it('should cancel any pending flushes', function() { + var fakeHandle = 'abc'; + var cleared = false; + + var _clearTimeout = global.clearTimeout; + + global.clearTimeout = function(handle) { + assert.strictEqual(handle, fakeHandle); + cleared = true; + }; + + subscription.flushTimeoutHandle_ = fakeHandle; + subscription.flushQueues_(); + + assert.strictEqual(subscription.flushTimeoutHandle_, null); + assert.strictEqual(cleared, true); + + global.clearTimeout = _clearTimeout; + }); + describe('with connection pool', function() { var fakeConnection; @@ -1371,6 +1408,11 @@ describe('Subscription', function() { subscription.connectionPool.emit('error', error); }); + it('should set isOpen to true', function() { + subscription.openConnection_(); + assert.strictEqual(subscription.isOpen, true); + }); + it('should lease & emit messages from pool', function(done) { var message = {}; var leasedMessage = {}; @@ -1431,12 +1473,8 @@ describe('Subscription', function() { }); it('should flush the queue when connected', function(done) { - subscription.flushQueues_ = function() { - assert.strictEqual(subscription.flushTimeoutHandle_, null); - done(); - }; + subscription.flushQueues_ = done; - subscription.flushTimeoutHandle_ = setTimeout(done, 1); subscription.openConnection_(); subscription.connectionPool.emit('connected'); }); @@ -1444,9 +1482,10 @@ describe('Subscription', function() { describe('renewLeases_', function() { var fakeDeadline = 9999; + var fakeAckIds = ['abc', 'def']; beforeEach(function() { - subscription.inventory_.lease = ['abc', 'def']; + subscription.inventory_.lease = fakeAckIds; subscription.setLeaseTimeout_ = fakeUtil.noop; subscription.histogram.percentile = function() { @@ -1454,6 +1493,25 @@ describe('Subscription', function() { }; }); + it('should clean up the old timeout handle', function() { + var fakeHandle = 123; + var clearTimeoutCalled = false; + var _clearTimeout = global.clearTimeout; + + global.clearTimeout = function(handle) { + assert.strictEqual(handle, fakeHandle); + clearTimeoutCalled = true; + }; + + subscription.leaseTimeoutHandle_ = fakeHandle; + subscription.renewLeases_(); + + assert.strictEqual(subscription.leaseTimeoutHandle_, null); + assert.strictEqual(clearTimeoutCalled, true); + + global.clearTimeout = _clearTimeout; + }); + it('should update the ackDeadline', function() { subscription.request = subscription.setLeaseTimeout_ = fakeUtil.noop; @@ -1515,8 +1573,9 @@ describe('Subscription', function() { it('should write to the connection', function(done) { fakeConnection.write = function(reqOpts) { + assert.notStrictEqual(reqOpts.modifyDeadlineAckIds, fakeAckIds); assert.deepEqual(reqOpts, { - modifyDeadlineAckIds: ['abc', 'def'], + modifyDeadlineAckIds: fakeAckIds, modifyDeadlineSeconds: Array(2).fill(fakeDeadline / 1000) }); done(); @@ -1531,9 +1590,10 @@ describe('Subscription', function() { subscription.request = function(config, callback) { assert.strictEqual(config.client, 'subscriberClient'); assert.strictEqual(config.method, 'modifyAckDeadline'); + assert.notStrictEqual(config.reqOpts.ackIds, fakeAckIds); assert.deepEqual(config.reqOpts, { subscription: subscription.name, - ackIds: ['abc', 'def'], + ackIds: fakeAckIds, ackDeadlineSeconds: fakeDeadline / 1000 }); callback(); @@ -1674,6 +1734,10 @@ describe('Subscription', function() { globalMathRandom = global.Math.random; }); + beforeEach(function() { + subscription.isOpen = true; + }); + after(function() { global.setTimeout = globalSetTimeout; global.Math.random = globalMathRandom; @@ -1713,6 +1777,23 @@ describe('Subscription', function() { subscription.leaseTimeoutHandle_ = fakeTimeoutHandle; subscription.setLeaseTimeout_(); }); + + it('should not set a timeout if the sub is closed', function() { + subscription.renewLeases_ = function() { + throw new Error('Should not be called.'); + }; + + global.Math.random = function() { + throw new Error('Should not be called.'); + }; + + global.setTimeout = function() { + throw new Error('Should not be called.'); + }; + + subscription.isOpen = false; + subscription.setLeaseTimeout_(); + }); }); describe('setMetadata', function() { From 88068e4bd529f40ea087b05ca4f387ade3a6ef72 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 2 Oct 2017 10:32:23 -0400 Subject: [PATCH 0093/1115] pubsub @ 0.14.3 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3733c3b5321..9020bfe0cc9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.2", + "version": "0.14.3", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 9b978e778a23047fcde94031a2fd909678379fd4 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 3 Oct 2017 17:39:06 -0400 Subject: [PATCH 0094/1115] pubsub: fix setMetadata method (#2643) --- handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/index.js | 24 ++------ handwritten/pubsub/src/subscription.js | 40 ++++++++++++- handwritten/pubsub/system-test/pubsub.js | 28 +++++++++ handwritten/pubsub/test/index.js | 46 +++++++-------- handwritten/pubsub/test/subscription.js | 72 ++++++++++++++++++++++-- 6 files changed, 159 insertions(+), 52 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9020bfe0cc9..b0f0669b838 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -61,6 +61,7 @@ "google-proto-files": "^0.12.0", "grpc": "^1.6.0", "is": "^3.0.1", + "lodash.snakecase": "^4.1.1", "uuid": "^3.0.1" }, "devDependencies": { diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index f8f98d72c45..93f18c030d8 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -173,33 +173,17 @@ PubSub.prototype.createSubscription = function(topic, name, options, callback) { options = options || {}; - var subscription = this.subscription(name, options); + var metadata = Subscription.formatMetadata_(options); + var subscription = this.subscription(name, metadata); - var reqOpts = extend({ + var reqOpts = extend(metadata, { topic: topic.name, name: subscription.name - }, options); + }); delete reqOpts.gaxOpts; delete reqOpts.flowControl; - if (options.messageRetentionDuration) { - reqOpts.retainAckedMessages = true; - - reqOpts.messageRetentionDuration = { - seconds: options.messageRetentionDuration, - nanos: 0 - }; - } - - if (options.pushEndpoint) { - delete reqOpts.pushEndpoint; - - reqOpts.pushConfig = { - pushEndpoint: options.pushEndpoint - }; - } - this.request({ client: 'subscriberClient', method: 'createSubscription', diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 1ecccbb1b8b..0193f81ac71 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -25,6 +25,7 @@ var events = require('events'); var extend = require('extend'); var is = require('is'); var os = require('os'); +var snakeCase = require('lodash.snakecase'); var util = require('util'); /** @@ -231,6 +232,34 @@ function Subscription(pubsub, name, options) { util.inherits(Subscription, events.EventEmitter); +/** + * Formats Subscription metadata. + * + * @private + */ +Subscription.formatMetadata_ = function(metadata) { + var formatted = extend({}, metadata); + + if (metadata.messageRetentionDuration) { + formatted.retainAckedMessages = true; + + formatted.messageRetentionDuration = { + seconds: metadata.messageRetentionDuration, + nanos: 0 + }; + } + + if (metadata.pushEndpoint) { + delete formatted.pushEndpoint; + + formatted.pushConfig = { + pushEndpoint: metadata.pushEndpoint + }; + } + + return formatted; +}; + /** * Format the name of a subscription. A subscription's full name is in the * format of projects/{projectId}/subscriptions/{subName}. @@ -1042,9 +1071,16 @@ Subscription.prototype.setMetadata = function(metadata, gaxOpts, callback) { gaxOpts = {}; } + var subscription = Subscription.formatMetadata_(metadata); + var fields = Object.keys(subscription).map(snakeCase); + + subscription.name = this.name; + var reqOpts = { - subscription: this.name, - updateMask: metadata + subscription: subscription, + updateMask: { + paths: fields + } }; this.request({ diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index fdc3a59c4b9..ff49e59388c 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -388,6 +388,34 @@ describe('pubsub', function() { }); }); + it('should set metadata for a subscription', function() { + var subscription = topic.subscription(generateSubName()); + var threeDaysInSeconds = 3 * 24 * 60 * 60; + + return subscription.create() + .then(function() { + return subscription.setMetadata({ + messageRetentionDuration: threeDaysInSeconds + }); + }) + .then(function() { + return subscription.getMetadata(); + }) + .then(function(data) { + var metadata = data[0]; + + assert.strictEqual(metadata.retainAckedMessages, true); + assert.strictEqual( + parseInt(metadata.messageRetentionDuration.seconds, 10), + threeDaysInSeconds + ); + assert.strictEqual( + parseInt(metadata.messageRetentionDuration.nanos, 10), + 0 + ); + }); + }); + it('should re-use an existing subscription', function(done) { pubsub.createSubscription(topic, SUB_NAMES[0], done); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 049036469fd..595739b52c9 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -260,6 +260,12 @@ describe('PubSub', function() { name: 'subscription-name' }; + beforeEach(function() { + Subscription.formatMetadata_ = function(metadata) { + return extend({}, metadata); + }; + }); + it('should throw if no Topic is provided', function() { assert.throws(function() { pubsub.createSubscription(); @@ -353,13 +359,7 @@ describe('PubSub', function() { var expectedBody = extend({ topic: TOPIC.name, name: SUB_NAME - }, options, { - pushConfig: { - pushEndpoint: options.pushEndpoint - } - }); - - delete expectedBody.pushEndpoint; + }, options); pubsub.topic = function() { return { @@ -413,27 +413,23 @@ describe('PubSub', function() { pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); }); - describe('message retention', function() { - it('should accept a number', function(done) { - var threeDaysInSeconds = 3 * 24 * 60 * 60; - - pubsub.request = function(config) { - assert.strictEqual(config.reqOpts.retainAckedMessages, true); - - assert.strictEqual( - config.reqOpts.messageRetentionDuration.seconds, - threeDaysInSeconds - ); + it('should format the metadata', function(done) { + var fakeMetadata = {}; + var formatted = { + a: 'a' + }; - assert.strictEqual(config.reqOpts.messageRetentionDuration.nanos, 0); + Subscription.formatMetadata_ = function(metadata) { + assert.strictEqual(metadata, fakeMetadata); + return formatted; + }; - done(); - }; + pubsub.request = function(config) { + assert.strictEqual(config.reqOpts, formatted); + done(); + }; - pubsub.createSubscription(TOPIC_NAME, SUB_NAME, { - messageRetentionDuration: threeDaysInSeconds - }, assert.ifError); - }); + pubsub.createSubscription(TOPIC, SUB_NAME, fakeMetadata, assert.ifError); }); describe('error', function() { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index c07bfa644a4..192421fd7d4 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -219,6 +219,47 @@ describe('Subscription', function() { }); }); + describe('formatMetadata_', function() { + it('should make a copy of the metadata', function() { + var metadata = { a: 'a' }; + var formatted = Subscription.formatMetadata_(metadata); + + assert.deepEqual(metadata, formatted); + assert.notStrictEqual(metadata, formatted); + }); + + it('should format messageRetentionDuration', function() { + var threeDaysInSeconds = 3 * 24 * 60 * 60; + + var metadata = { + messageRetentionDuration: threeDaysInSeconds + }; + + var formatted = Subscription.formatMetadata_(metadata); + + assert.strictEqual(formatted.retainAckedMessages, true); + assert.strictEqual(formatted.messageRetentionDuration.nanos, 0); + + assert.strictEqual( + formatted.messageRetentionDuration.seconds, + threeDaysInSeconds + ); + }); + + it('should format pushEndpoint', function() { + var pushEndpoint = 'http://noop.com/push'; + + var metadata = { + pushEndpoint: pushEndpoint + }; + + var formatted = Subscription.formatMetadata_(metadata); + + assert.strictEqual(formatted.pushConfig.pushEndpoint, pushEndpoint); + assert.strictEqual(formatted.pushEndpoint, undefined); + }); + }); + describe('formatName_', function() { it('should format name', function() { var formattedName = Subscription.formatName_(PROJECT_ID, SUB_NAME); @@ -1797,16 +1838,37 @@ describe('Subscription', function() { }); describe('setMetadata', function() { - var METADATA = {}; + var METADATA = { + pushEndpoint: 'http://noop.com/push' + }; + + beforeEach(function() { + Subscription.formatMetadata_ = function(metadata) { + return extend({}, metadata); + }; + }); it('should make the correct request', function(done) { + var formattedMetadata = { + pushConfig: { + pushEndpoint: METADATA.pushEndpoint + } + }; + + var expectedBody = extend({ + name: SUB_FULL_NAME + }, formattedMetadata); + + Subscription.formatMetadata_ = function(metadata) { + assert.strictEqual(metadata, METADATA); + return formattedMetadata; + }; + subscription.request = function(config, callback) { assert.strictEqual(config.client, 'subscriberClient'); assert.strictEqual(config.method, 'updateSubscription'); - assert.deepEqual(config.reqOpts, { - subscription: subscription.name, - updateMask: METADATA - }); + assert.deepEqual(config.reqOpts.subscription, expectedBody); + assert.deepEqual(config.reqOpts.updateMask, { paths: ['push_config'] }); callback(); // the done fn }; From 046986fe6a4b1fcda2f5392d8727af0d618cea4b Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 5 Oct 2017 18:03:41 -0400 Subject: [PATCH 0095/1115] pubsub: nack overflow messages (#2650) --- handwritten/pubsub/src/subscription.js | 23 +++++++++---- handwritten/pubsub/system-test/pubsub.js | 24 ++++++++++++++ handwritten/pubsub/test/connection-pool.js | 11 ++++++- handwritten/pubsub/test/subscription.js | 38 +++++++++++++++++++--- 4 files changed, 84 insertions(+), 12 deletions(-) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 0193f81ac71..685b46ff1c5 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -320,13 +320,17 @@ Subscription.prototype.ack_ = function(message) { Subscription.prototype.breakLease_ = function(message) { var messageIndex = this.inventory_.lease.indexOf(message.ackId); + if (messageIndex === -1) { + return; + } + this.inventory_.lease.splice(messageIndex, 1); this.inventory_.bytes -= message.length; - if (this.connectionPool) { - if (this.connectionPool.isPaused && !this.hasMaxMessages_()) { - this.connectionPool.resume(); - } + var pool = this.connectionPool; + + if (pool && pool.isPaused && !this.hasMaxMessages_()) { + pool.resume(); } if (!this.inventory_.lease.length) { @@ -730,7 +734,7 @@ Subscription.prototype.getMetadata = function(gaxOpts, callback) { * @return {boolean} */ Subscription.prototype.hasMaxMessages_ = function() { - return this.inventory_.lease.length >= this.flowControl.maxMessages || + return this.inventory_.lease.length > this.flowControl.maxMessages || this.inventory_.bytes >= this.flowControl.maxBytes; }; @@ -888,11 +892,16 @@ Subscription.prototype.openConnection_ = function() { }); pool.on('message', function(message) { - self.emit('message', self.leaseMessage_(message)); + if (!self.hasMaxMessages_()) { + self.emit('message', self.leaseMessage_(message)); + return; + } - if (self.hasMaxMessages_() && !pool.isPaused) { + if (!pool.isPaused) { pool.pause(); } + + message.nack(); }); pool.once('connected', function() { diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index ff49e59388c..58e59c2ca5f 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -479,6 +479,30 @@ describe('pubsub', function() { setTimeout(() => subscription.close(done), 2500); } }); + + it('should respect flow control limits', function(done) { + var maxMessages = 3; + var messageCount = 0; + + var subscription = topic.subscription(SUB_NAMES[0], { + flowControl: { + maxMessages: maxMessages + } + }); + + subscription.on('error', done); + subscription.on('message', onMessage); + + function onMessage() { + if (++messageCount < (maxMessages + 1)) { + return; + } + + setImmediate(function() { + subscription.close(done); + }); + } + }); }); describe('IAM', function() { diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index 2fb5097634f..b4fe57da855 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -1170,13 +1170,22 @@ describe('ConnectionPool', function() { }); it('should reset internal used props', function() { + var fakeDate = Date.now(); + var dateNow = Date.now; + + global.Date.now = function() { + return fakeDate; + }; + pool.failedConnectionAttempts = 100; pool.noConnectionsTime = 0; pool.open(); assert.strictEqual(pool.failedConnectionAttempts, 0); - assert.strictEqual(pool.noConnectionsTime, Date.now()); + assert.strictEqual(pool.noConnectionsTime, fakeDate); + + global.Date.now = dateNow; }); it('should listen for newListener events', function() { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 192421fd7d4..b2d206c501d 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -407,6 +407,19 @@ describe('Subscription', function() { assert.strictEqual(subscription.inventory_.bytes, 0); }); + it('should noop for unknown messages', function() { + var message = { + ackId: 'def', + data: new Buffer('world'), + length: 5 + }; + + subscription.breakLease_(message); + + assert.strictEqual(subscription.inventory_.lease.length, 1); + assert.strictEqual(subscription.inventory_.bytes, 5); + }); + describe('with connection pool', function() { it('should resume receiving messages if paused', function(done) { subscription.connectionPool = { @@ -1174,9 +1187,9 @@ describe('Subscription', function() { }); describe('hasMaxMessages_', function() { - it('should return true if the number of leases == maxMessages', function() { + it('should return true if the number of leases > maxMessages', function() { subscription.inventory_.lease = ['a', 'b', 'c']; - subscription.flowControl.maxMessages = 3; + subscription.flowControl.maxMessages = 2; assert(subscription.hasMaxMessages_()); }); @@ -1473,7 +1486,7 @@ describe('Subscription', function() { }); it('should pause the pool if sub is at max messages', function(done) { - var message = {}; + var message = { nack: fakeUtil.noop }; var leasedMessage = {}; subscription.leaseMessage_ = function() { @@ -1491,7 +1504,7 @@ describe('Subscription', function() { }); it('should not re-pause the pool', function(done) { - var message = {}; + var message = { nack: fakeUtil.noop }; var leasedMessage = {}; subscription.leaseMessage_ = function() { @@ -1513,6 +1526,23 @@ describe('Subscription', function() { done(); }); + it('should nack messages if over limit', function(done) { + var message = { nack: done }; + var leasedMessage = {}; + + subscription.leaseMessage_ = function() { + return leasedMessage; + }; + + subscription.hasMaxMessages_ = function() { + return true; + }; + + subscription.openConnection_(); + subscription.connectionPool.isPaused = true; + subscription.connectionPool.emit('message', message); + }); + it('should flush the queue when connected', function(done) { subscription.flushQueues_ = done; From 7b4b95bfbfa1e613dada6f1ec9d2cdc2541f1e15 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 5 Oct 2017 18:04:35 -0400 Subject: [PATCH 0096/1115] pubsub @ 0.14.4 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b0f0669b838..2247764f34c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.3", + "version": "0.14.4", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From a22f25ae2c7ccb2d28a984fe7f5aa222681d63ee Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 10 Oct 2017 16:26:50 -0400 Subject: [PATCH 0097/1115] pubsub: subscription config changes (#2665) --- handwritten/pubsub/src/connection-pool.js | 5 ++++- handwritten/pubsub/src/subscription.js | 2 +- handwritten/pubsub/system-test/pubsub.js | 2 +- handwritten/pubsub/test/connection-pool.js | 6 +++--- handwritten/pubsub/test/subscription.js | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index a7d9b64f9c7..3846e45b47a 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -43,10 +43,13 @@ var MAX_TIMEOUT = 300000; var RETRY_CODES = [ 0, // ok 1, // canceled + 2, // unknown 4, // deadline exceeded 8, // resource exhausted + 10, // aborted 13, // internal error - 14 // unavailable + 14, // unavailable + 15 // dataloss ]; /** diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 685b46ff1c5..86196880dae 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -734,7 +734,7 @@ Subscription.prototype.getMetadata = function(gaxOpts, callback) { * @return {boolean} */ Subscription.prototype.hasMaxMessages_ = function() { - return this.inventory_.lease.length > this.flowControl.maxMessages || + return this.inventory_.lease.length >= this.flowControl.maxMessages || this.inventory_.bytes >= this.flowControl.maxBytes; }; diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 58e59c2ca5f..6483a361a60 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -494,7 +494,7 @@ describe('pubsub', function() { subscription.on('message', onMessage); function onMessage() { - if (++messageCount < (maxMessages + 1)) { + if (++messageCount < maxMessages) { return; } diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index b4fe57da855..8f1b7654f8c 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -1341,23 +1341,23 @@ describe('ConnectionPool', function() { it('should return true for retryable errors', function() { assert(pool.shouldReconnect({ code: 0 })); // OK assert(pool.shouldReconnect({ code: 1 })); // Canceled + assert(pool.shouldReconnect({ code: 2 })); // Unknown assert(pool.shouldReconnect({ code: 4 })); // DeadlineExceeded assert(pool.shouldReconnect({ code: 8 })); // ResourceExhausted + assert(pool.shouldReconnect({ code: 10 })); // Aborted assert(pool.shouldReconnect({ code: 13 })); // Internal assert(pool.shouldReconnect({ code: 14 })); // Unavailable + assert(pool.shouldReconnect({ code: 15 })); // Dataloss }); it('should return false for non-retryable errors', function() { - assert(!pool.shouldReconnect({ code: 2 })); // Unknown assert(!pool.shouldReconnect({ code: 3 })); // InvalidArgument assert(!pool.shouldReconnect({ code: 5 })); // NotFound assert(!pool.shouldReconnect({ code: 6 })); // AlreadyExists assert(!pool.shouldReconnect({ code: 7 })); // PermissionDenied assert(!pool.shouldReconnect({ code: 9 })); // FailedPrecondition - assert(!pool.shouldReconnect({ code: 10 })); // Aborted assert(!pool.shouldReconnect({ code: 11 })); // OutOfRange assert(!pool.shouldReconnect({ code: 12 })); // Unimplemented - assert(!pool.shouldReconnect({ code: 15 })); // DataLoss assert(!pool.shouldReconnect({ code: 16 })); // Unauthenticated }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index b2d206c501d..256b6c1a002 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -1187,9 +1187,9 @@ describe('Subscription', function() { }); describe('hasMaxMessages_', function() { - it('should return true if the number of leases > maxMessages', function() { + it('should return true if the number of leases >= maxMessages', function() { subscription.inventory_.lease = ['a', 'b', 'c']; - subscription.flowControl.maxMessages = 2; + subscription.flowControl.maxMessages = 3; assert(subscription.hasMaxMessages_()); }); From 75f849e86b149c3e0ce71727e6597b31ca7379d3 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 10 Oct 2017 16:27:57 -0400 Subject: [PATCH 0098/1115] pubsub @ 0.14.5 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2247764f34c..930438c9b33 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.4", + "version": "0.14.5", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 177d42d8676d613b621d061546c6b48e8c5e2261 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Sat, 14 Oct 2017 16:28:35 -0400 Subject: [PATCH 0099/1115] pubsub: pass back messageId as string (#2672) --- handwritten/pubsub/src/publisher.js | 4 +++- handwritten/pubsub/test/publisher.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index 927e5a605bf..e7e9724230d 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -222,6 +222,8 @@ Publisher.prototype.queue_ = function(data, attrs, callback) { * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -common.util.promisifyAll(Publisher); +common.util.promisifyAll(Publisher, { + singular: true +}); module.exports = Publisher; diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index d5e0487b24a..3589e87e5c9 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -23,8 +23,9 @@ var proxyquire = require('proxyquire'); var promisified = false; var fakeUtil = extend({}, common.util, { - promisifyAll: function(Class) { + promisifyAll: function(Class, options) { if (Class.name === 'Publisher') { + assert.deepEqual(options, { singular: true }); promisified = true; } } From f870aa84865019aebbc5036a27463cb8dc8423b9 Mon Sep 17 00:00:00 2001 From: Ali Ijaz Sheikh Date: Mon, 23 Oct 2017 16:14:38 -0700 Subject: [PATCH 0100/1115] chore: update deps: google-{gax,proto-files} (#2691) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 930438c9b33..b5aca103b71 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,8 +57,8 @@ "async-each": "^1.0.1", "extend": "^3.0.0", "google-auto-auth": "^0.7.1", - "google-gax": "^0.13.0", - "google-proto-files": "^0.12.0", + "google-gax": "^0.14.2", + "google-proto-files": "^0.13.1", "grpc": "^1.6.0", "is": "^3.0.1", "lodash.snakecase": "^4.1.1", From e7d29998a1217ebdb73d580a5585156dfac9ca7e Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 1 Nov 2017 13:20:07 -0400 Subject: [PATCH 0101/1115] pubsub @ 0.14.6 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b5aca103b71..5f30fcc30e1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.5", + "version": "0.14.6", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 893acaf1717cb870c025efd4bb524d1d63f62c2c Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 2 Nov 2017 14:55:24 -0400 Subject: [PATCH 0102/1115] pubsub: pull grpc module from common-grpc (#2701) --- handwritten/pubsub/package.json | 5 ++--- handwritten/pubsub/src/connection-pool.js | 2 +- handwritten/pubsub/test/connection-pool.js | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5f30fcc30e1..37939c021ae 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,14 +52,13 @@ ], "dependencies": { "@google-cloud/common": "^0.13.0", - "@google-cloud/common-grpc": "^0.4.0", + "@google-cloud/common-grpc": "^0.4.2", "arrify": "^1.0.0", "async-each": "^1.0.1", "extend": "^3.0.0", "google-auto-auth": "^0.7.1", - "google-gax": "^0.14.2", + "google-gax": "^0.13.0", "google-proto-files": "^0.13.1", - "grpc": "^1.6.0", "is": "^3.0.1", "lodash.snakecase": "^4.1.1", "uuid": "^3.0.1" diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 3846e45b47a..aafe4a639f4 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -24,7 +24,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); var each = require('async-each'); var events = require('events'); -var grpc = require('grpc'); +var grpc = require('@google-cloud/common-grpc').grpc; var is = require('is'); var util = require('util'); var uuid = require('uuid'); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index 8f1b7654f8c..a220fb5fe20 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -95,7 +95,9 @@ describe('ConnectionPool', function() { '@google-cloud/common': { util: fakeUtil }, - grpc: fakeGrpc, + '@google-cloud/common-grpc': { + grpc: fakeGrpc + }, uuid: fakeUuid, './v1': fakeV1 }); From 791a48eb3b24b7060cc99448e7990b40416d1d9a Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 2 Nov 2017 14:56:20 -0400 Subject: [PATCH 0103/1115] pubsub @ 0.14.7 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 37939c021ae..5ec0323d119 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.6", + "version": "0.14.7", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From d3cdd18df6241dfdc9462ee0a5ea9ea54acd8645 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 8 Nov 2017 09:25:17 -0500 Subject: [PATCH 0104/1115] pubsub: implement streaming pull receipt (#2732) --- handwritten/pubsub/src/subscription.js | 237 +++++---- handwritten/pubsub/system-test/pubsub.js | 4 +- handwritten/pubsub/test/subscription.js | 638 +++++++++++------------ 3 files changed, 429 insertions(+), 450 deletions(-) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 86196880dae..d5bbb5f8890 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -20,6 +20,7 @@ 'use strict'; +var arrify = require('arrify'); var common = require('@google-cloud/common'); var events = require('events'); var extend = require('extend'); @@ -288,21 +289,54 @@ Subscription.prototype.ack_ = function(message) { this.breakLease_(message); this.histogram.add(Date.now() - message.received); - if (!this.connectionPool || !this.connectionPool.isConnected()) { - this.inventory_.ack.push(message.ackId); - this.setFlushTimeout_(); + if (this.isConnected_()) { + this.acknowledge_(message.ackId, message.connectionId); return; } + this.inventory_.ack.push(message.ackId); + this.setFlushTimeout_(); +}; + +/** + * Sends an acknowledge request for the provided ack ids. + * + * @private + * + * @param {string|string[]} ackIds - The ack IDs to acknowledge. + * @param {string=} connId - Connection ID to send request on. + * @return {Promise} + */ +Subscription.prototype.acknowledge_ = function(ackIds, connId) { var self = this; + var promise; - this.connectionPool.acquire(message.connectionId, function(err, connection) { - if (err) { - self.emit('error', err); - return; - } + ackIds = arrify(ackIds); + + if (!this.isConnected_()) { + promise = common.util.promisify(this.request).call(this, { + client: 'subscriberClient', + method: 'acknowledge', + reqOpts: { + subscription: this.name, + ackIds + } + }); + } else { + promise = new Promise(function(resolve, reject) { + self.connectionPool.acquire(connId, function(err, connection) { + if (err) { + reject(err); + return; + } + + connection.write({ ackIds }, resolve); + }); + }); + } - connection.write({ ackIds: [message.ackId] }); + return promise.catch(function(err) { + self.emit('error', err); }); }; @@ -360,6 +394,8 @@ Subscription.prototype.breakLease_ = function(message) { * subscription.close().then(function() {}); */ Subscription.prototype.close = function(callback) { + var self = this; + this.userClosed_ = true; var inventory = this.inventory_; @@ -368,8 +404,9 @@ Subscription.prototype.close = function(callback) { clearTimeout(this.leaseTimeoutHandle_); this.leaseTimeoutHandle_ = null; - this.flushQueues_(); - this.closeConnection_(callback); + this.flushQueues_().then(function() { + self.closeConnection_(callback); + }); }; /** @@ -563,69 +600,28 @@ Subscription.prototype.flushQueues_ = function() { var nacks = this.inventory_.nack; if (!acks.length && !nacks.length) { - return; + return Promise.resolve(); } - if (this.connectionPool) { - this.connectionPool.acquire(function(err, connection) { - if (err) { - self.emit('error', err); - return; - } - - var reqOpts = {}; - - if (acks.length) { - reqOpts.ackIds = acks; - } - - if (nacks.length) { - reqOpts.modifyDeadlineAckIds = nacks; - reqOpts.modifyDeadlineSeconds = Array(nacks.length).fill(0); - } - - connection.write(reqOpts); - - self.inventory_.ack = []; - self.inventory_.nack = []; - }); - return; - } + var requests = []; if (acks.length) { - this.request({ - client: 'subscriberClient', - method: 'acknowledge', - reqOpts: { - subscription: this.name, - ackIds: acks - } - }, function(err) { - if (err) { - self.emit('error', err); - } else { + requests.push( + this.acknowledge_(acks).then(function() { self.inventory_.ack = []; - } - }); + }) + ); } if (nacks.length) { - this.request({ - client: 'subscriberClient', - method: 'modifyAckDeadline', - reqOpts: { - subscription: this.name, - ackIds: nacks, - ackDeadlineSeconds: 0 - } - }, function(err) { - if (err) { - self.emit('error', err); - } else { + requests.push( + this.modifyAckDeadline_(nacks, 0).then(function() { self.inventory_.nack = []; - } - }); + }) + ); } + + return Promise.all(requests); }; /** @@ -725,6 +721,17 @@ Subscription.prototype.getMetadata = function(gaxOpts, callback) { }); }; +/** + * Checks to see if we currently have a streaming connection. + * + * @private + * + * @return {boolean} + */ +Subscription.prototype.isConnected_ = function() { + return !!(this.connectionPool && this.connectionPool.isConnected()); +}; + /** * Checks to see if this Subscription has hit any of the flow control * thresholds. @@ -748,6 +755,9 @@ Subscription.prototype.hasMaxMessages_ = function() { * @param {object} message - The message object. */ Subscription.prototype.leaseMessage_ = function(message) { + this.modifyAckDeadline_( + message.ackId, this.ackDeadline / 1000, message.connectionId); + this.inventory_.lease.push(message.ackId); this.inventory_.bytes += message.length; this.setLeaseTimeout_(); @@ -789,6 +799,53 @@ Subscription.prototype.listenForEvents_ = function() { }); }; +/** + * Sends a modifyAckDeadline request for the provided ack ids. + * + * @private + * + * @param {string|string[]} ackIds - The ack IDs to acknowledge. + * @param {number} deadline - The dealine in seconds. + * @param {string=} connId - Connection ID to send request on. + * @return {Promise} + */ +Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { + var self = this; + var promise; + + ackIds = arrify(ackIds); + + if (!this.isConnected_()) { + promise = common.util.promisify(this.request).call(this, { + client: 'subscriberClient', + method: 'modifyAckDeadline', + reqOpts: { + subscription: self.name, + ackDeadlineSeconds: deadline, + ackIds + } + }); + } else { + promise = new Promise(function(resolve, reject) { + self.connectionPool.acquire(connId, function(err, connection) { + if (err) { + reject(err); + return; + } + + connection.write({ + modifyDeadlineAckIds: ackIds, + modifyDeadlineSeconds: Array(ackIds.length).fill(deadline) + }, resolve); + }); + }); + } + + return promise.catch(function(err) { + self.emit('error', err); + }); +}; + /** * Modify the push config for the subscription. * @@ -855,25 +912,13 @@ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { Subscription.prototype.nack_ = function(message) { this.breakLease_(message); - if (!this.connectionPool || !this.connectionPool.isConnected()) { - this.inventory_.nack.push(message.ackId); - this.setFlushTimeout_(); + if (this.isConnected_()) { + this.modifyAckDeadline_(message.ackId, 0, message.connectionId); return; } - var self = this; - - this.connectionPool.acquire(message.connectionId, function(err, connection) { - if (err) { - self.emit('error', err); - return; - } - - connection.write({ - modifyDeadlineAckIds: [message.ackId], - modifyDeadlineSeconds: [0] - }); - }); + this.inventory_.nack.push(message.ackId); + this.setFlushTimeout_(); }; /** @@ -930,35 +975,9 @@ Subscription.prototype.renewLeases_ = function() { var ackIds = this.inventory_.lease.slice(); var ackDeadlineSeconds = this.ackDeadline / 1000; - if (this.connectionPool) { - this.connectionPool.acquire(function(err, connection) { - if (err) { - self.emit('error', err); - return; - } - - connection.write({ - modifyDeadlineAckIds: ackIds, - modifyDeadlineSeconds: Array(ackIds.length).fill(ackDeadlineSeconds) - }); - }); - } else { - this.request({ - client: 'subscriberClient', - method: 'modifyAckDeadline', - reqOpts: { - subscription: self.name, - ackIds: ackIds, - ackDeadlineSeconds: ackDeadlineSeconds - } - }, function(err) { - if (err) { - self.emit('error', err); - } - }); - } - - this.setLeaseTimeout_(); + this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(function() { + self.setLeaseTimeout_(); + }); }; /** diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 6483a361a60..81eb3f8540a 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -629,8 +629,8 @@ describe('pubsub', function() { return subscription.create().then(function() { return publisher.publish(new Buffer('Hello, world!')); - }).then(function(messageIds) { - messageId = messageIds[0]; + }).then(function(_messageId) { + messageId = _messageId; }); }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 256b6c1a002..648e0abcc13 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -283,6 +283,7 @@ describe('Subscription', function() { subscription.setFlushTimeout_ = fakeUtil.noop; subscription.breakLease_ = fakeUtil.noop; subscription.histogram.add = fakeUtil.noop; + subscription.acknowledge_ = fakeUtil.noop; }); it('should break the lease on the message', function(done) { @@ -311,61 +312,115 @@ describe('Subscription', function() { subscription.ack_(MESSAGE); }); - describe('without connection pool', function() { - it('should store the ack id in the inventory object', function(done) { - subscription.setFlushTimeout_ = function() { - assert.deepEqual(subscription.inventory_.ack, [MESSAGE.ackId]); - done(); - }; + it('should acknowledge if there is a connection', function(done) { + subscription.isConnected_ = function() { + return true; + }; - subscription.ack_(MESSAGE); - }); + subscription.acknowledge_ = function(ackId, connectionId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(connectionId, MESSAGE.connectionId); + done(); + }; + + subscription.ack_(MESSAGE); }); - describe('with connection pool', function() { - var pool; + it('should queue the message to be acked if no connection', function(done) { + subscription.isConnected_ = function() { + return false; + }; + + subscription.setFlushTimeout_ = function() { + assert(subscription.inventory_.ack.indexOf(MESSAGE.ackId) > -1); + done(); + }; + subscription.ack_(MESSAGE); + }); + }); + + describe('acknowledge_', function() { + var fakeAckIds = ['a', 'b', 'c']; + + describe('without streaming connection', function() { beforeEach(function() { - subscription.setFlushTimeout_ = function() { - throw new Error('Should not be called.'); + subscription.isConnected_ = function() { + return false; }; + }); + + it('should make the correct request', function(done) { + var fakePromisified = { + call: function(context, config) { + assert.strictEqual(context, subscription); + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'acknowledge'); + assert.strictEqual(config.reqOpts.subscription, subscription.name); + assert.strictEqual(config.reqOpts.ackIds, fakeAckIds); - pool = { - isConnected: function() { - return true; + setImmediate(done); + + return Promise.resolve(); } }; - subscription.connectionPool = pool; + fakeUtil.promisify = function(fn) { + assert.strictEqual(fn, subscription.request); + return fakePromisified; + }; + + subscription.on('error', done); + subscription.acknowledge_(fakeAckIds); }); - it('should set a timeout if pool is not connected', function(done) { - subscription.setFlushTimeout_ = function() { - assert.deepEqual(subscription.inventory_.ack, [MESSAGE.ackId]); - done(); + it('should emit any request errors', function(done) { + var fakeError = new Error('err'); + var fakePromisified = { + call: function() { + return Promise.reject(fakeError); + } }; - pool.isConnected = function() { - return false; + fakeUtil.promisify = function() { + return fakePromisified; + }; + + subscription.on('error', function(err) { + assert.strictEqual(err, fakeError); + done(); + }); + + subscription.acknowledge_(fakeAckIds); + }); + }); + + describe('with streaming connection', function() { + var pool; + + beforeEach(function() { + subscription.isConnected_ = function() { + return true; }; - subscription.ack_(MESSAGE); + pool = subscription.connectionPool = {}; }); - it('should write to the connection it came in on', function(done) { + it('should send the correct request', function(done) { + var fakeConnectionId = 'abc'; var fakeConnection = { write: function(data) { - assert.deepEqual(data, { ackIds: [MESSAGE.ackId] }); + assert.deepEqual(data, { ackIds: fakeAckIds }); done(); } }; pool.acquire = function(connectionId, callback) { - assert.strictEqual(connectionId, MESSAGE.connectionId); + assert.strictEqual(connectionId, fakeConnectionId); callback(null, fakeConnection); }; - subscription.ack_(MESSAGE); + subscription.acknowledge_(fakeAckIds, fakeConnectionId); }); it('should emit an error when unable to get a conn', function(done) { @@ -380,7 +435,7 @@ describe('Subscription', function() { done(); }); - subscription.ack_(MESSAGE); + subscription.acknowledge_(fakeAckIds); }); }); }); @@ -484,7 +539,10 @@ describe('Subscription', function() { describe('close', function() { beforeEach(function() { - subscription.flushQueues_ = fakeUtil.noop; + subscription.flushQueues_ = function() { + return Promise.resolve(); + }; + subscription.closeConnection_ = fakeUtil.noop; }); @@ -517,7 +575,11 @@ describe('Subscription', function() { }); it('should flush immediately', function(done) { - subscription.flushQueues_ = done; + subscription.flushQueues_ = function() { + setImmediate(done); + return Promise.resolve(); + }; + subscription.close(); }); @@ -814,24 +876,6 @@ describe('Subscription', function() { }); describe('flushQueues_', function() { - beforeEach(function() { - subscription.inventory_.ack = ['abc', 'def']; - subscription.inventory_.nack = ['ghi', 'jkl']; - }); - - it('should do nothing if theres nothing to ack/nack', function() { - subscription.inventory_.ack = []; - subscription.inventory_.nack = []; - - subscription.connectionPool = { - acquire: function() { - throw new Error('Should not be called.'); - } - }; - - subscription.flushQueues_(); - }); - it('should cancel any pending flushes', function() { var fakeHandle = 'abc'; var cleared = false; @@ -852,159 +896,38 @@ describe('Subscription', function() { global.clearTimeout = _clearTimeout; }); - describe('with connection pool', function() { - var fakeConnection; - - beforeEach(function() { - fakeConnection = { - write: fakeUtil.noop - }; - - subscription.connectionPool = { - acquire: function(callback) { - callback(null, fakeConnection); - } - }; - }); - - it('should emit any connection acquiring errors', function(done) { - var error = new Error('err'); - - subscription.connectionPool.acquire = function(callback) { - callback(error); - }; - - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); - - subscription.flushQueues_(); - }); - - it('should write the acks to the connection', function(done) { - fakeConnection.write = function(reqOpts) { - assert.deepEqual(reqOpts, { - ackIds: ['abc', 'def'] - }); - done(); - }; - - subscription.inventory_.nack = []; - subscription.flushQueues_(); - }); + it('should do nothing if theres nothing to ack/nack', function() { + subscription.acknowledge_ = subscription.modifyAckDeadline_ = function() { + throw new Error('Should not be called.'); + }; - it('should write the nacks to the connection', function(done) { - fakeConnection.write = function(reqOpts) { - assert.deepEqual(reqOpts, { - modifyDeadlineAckIds: ['ghi', 'jkl'], - modifyDeadlineSeconds: [0, 0] - }); - done(); - }; + return subscription.flushQueues_(); + }); - subscription.inventory_.ack = []; - subscription.flushQueues_(); - }); + it('should send any pending acks', function() { + var fakeAckIds = subscription.inventory_.ack = ['abc', 'def']; - it('should clear the inventory after writing', function() { - subscription.flushQueues_(); + subscription.acknowledge_ = function(ackIds) { + assert.strictEqual(ackIds, fakeAckIds); + return Promise.resolve(); + }; + return subscription.flushQueues_().then(function() { assert.strictEqual(subscription.inventory_.ack.length, 0); - assert.strictEqual(subscription.inventory_.nack.length, 0); }); }); - describe('without connection pool', function() { - describe('acking', function() { - beforeEach(function() { - subscription.inventory_.nack = []; - }); - - it('should make the correct request', function(done) { - subscription.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); - assert.strictEqual(config.method, 'acknowledge'); - assert.deepEqual(config.reqOpts, { - subscription: subscription.name, - ackIds: ['abc', 'def'] - }); - done(); - }; - - subscription.flushQueues_(); - }); - - it('should emit any request errors', function(done) { - var error = new Error('err'); - - subscription.request = function(config, callback) { - callback(error); - }; - - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); - - subscription.flushQueues_(); - }); - - it('should clear the inventory on success', function(done) { - subscription.request = function(config, callback) { - callback(null); - assert.strictEqual(subscription.inventory_.ack.length, 0); - done(); - }; - - subscription.flushQueues_(); - }); - }); - - describe('nacking', function() { - beforeEach(function() { - subscription.inventory_.ack = []; - }); - - it('should make the correct request', function(done) { - subscription.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); - assert.strictEqual(config.method, 'modifyAckDeadline'); - assert.deepEqual(config.reqOpts, { - subscription: subscription.name, - ackIds: ['ghi', 'jkl'], - ackDeadlineSeconds: 0 - }); - done(); - }; - - subscription.flushQueues_(); - }); - - it('should emit any request errors', function(done) { - var error = new Error('err'); - - subscription.request = function(config, callback) { - callback(error); - }; + it('should send any pending nacks', function() { + var fakeAckIds = subscription.inventory_.nack = ['ghi', 'jkl']; - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); - - subscription.flushQueues_(); - }); - - it('should clear the inventory on success', function(done) { - subscription.request = function(config, callback) { - callback(null); - assert.strictEqual(subscription.inventory_.nack.length, 0); - done(); - }; + subscription.modifyAckDeadline_ = function(ackIds, deadline) { + assert.strictEqual(ackIds, fakeAckIds); + assert.strictEqual(deadline, 0); + return Promise.resolve(); + }; - subscription.flushQueues_(); - }); + return subscription.flushQueues_().then(function() { + assert.strictEqual(subscription.inventory_.nack.length, 0); }); }); }); @@ -1186,6 +1109,33 @@ describe('Subscription', function() { }); }); + describe('isConnected_', function() { + it('should return false if there is no pool', function() { + subscription.connectionPool = null; + assert.strictEqual(subscription.isConnected_(), false); + }); + + it('should return false if the pool says its connected', function() { + subscription.connectionPool = { + isConnected: function() { + return false; + } + }; + + assert.strictEqual(subscription.isConnected_(), false); + }); + + it('should return true if the pool says its connected', function() { + subscription.connectionPool = { + isConnected: function() { + return true; + } + }; + + assert.strictEqual(subscription.isConnected_(), true); + }); + }); + describe('hasMaxMessages_', function() { it('should return true if the number of leases >= maxMessages', function() { subscription.inventory_.lease = ['a', 'b', 'c']; @@ -1215,12 +1165,25 @@ describe('Subscription', function() { describe('leaseMessage_', function() { var MESSAGE = { ackId: 'abc', + connectionId: 'def', data: new Buffer('hello'), length: 5 }; beforeEach(function() { subscription.setLeaseTimeout_ = fakeUtil.noop; + subscription.modifyAckDeadline_ = fakeUtil.noop; + }); + + it('should immediately modAck the message', function(done) { + subscription.modifyAckDeadline_ = function(ackId, deadline, connId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(deadline, subscription.ackDeadline / 1000); + assert.strictEqual(connId, MESSAGE.connectionId); + done(); + }; + + subscription.leaseMessage_(MESSAGE); }); it('should add the ackId to the inventory', function() { @@ -1315,6 +1278,111 @@ describe('Subscription', function() { }); }); + describe('modifyAckDeadline_', function() { + var fakeAckIds = ['a', 'b', 'c']; + var fakeDeadline = 123; + + describe('without streaming connection', function() { + beforeEach(function() { + subscription.isConnected_ = function() { + return false; + }; + }); + + it('should make the correct request', function(done) { + var fakePromisified = { + call: function(context, config) { + assert.strictEqual(context, subscription); + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'modifyAckDeadline'); + assert.strictEqual(config.reqOpts.subscription, subscription.name); + assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); + assert.strictEqual(config.reqOpts.ackIds, fakeAckIds); + + setImmediate(done); + + return Promise.resolve(); + } + }; + + fakeUtil.promisify = function(fn) { + assert.strictEqual(fn, subscription.request); + return fakePromisified; + }; + + subscription.on('error', done); + subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline); + }); + + it('should emit any request errors', function(done) { + var fakeError = new Error('err'); + var fakePromisified = { + call: function() { + return Promise.reject(fakeError); + } + }; + + fakeUtil.promisify = function() { + return fakePromisified; + }; + + subscription.on('error', function(err) { + assert.strictEqual(err, fakeError); + done(); + }); + + subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline); + }); + }); + + describe('with streaming connection', function() { + var pool; + + beforeEach(function() { + subscription.isConnected_ = function() { + return true; + }; + + pool = subscription.connectionPool = {}; + }); + + it('should send the correct request', function(done) { + var expectedDeadlines = Array(fakeAckIds.length).fill(fakeDeadline); + var fakeConnId = 'abc'; + var fakeConnection = { + write: function(data) { + assert.strictEqual(data.modifyDeadlineAckIds, fakeAckIds); + assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); + done(); + } + }; + + pool.acquire = function(connectionId, callback) { + assert.strictEqual(connectionId, fakeConnId); + callback(null, fakeConnection); + }; + + subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); + }); + + it('should emit an error when unable to get a conn', function(done) { + var error = new Error('err'); + var fakeConnId = 'abc'; + + pool.acquire = function(connectionId, callback) { + callback(error); + }; + + subscription.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); + }); + }); + }); + describe('modifyPushConfig', function() { var fakeConfig = {}; @@ -1364,80 +1432,32 @@ describe('Subscription', function() { subscription.nack_(MESSAGE); }); - describe('without connection pool', function() { - it('should store the ack id in the inventory object', function(done) { - subscription.setFlushTimeout_ = function() { - assert.deepEqual(subscription.inventory_.nack, [MESSAGE.ackId]); - done(); - }; - - subscription.nack_(MESSAGE); - }); - }); - - describe('with connection pool', function() { - var pool; - - beforeEach(function() { - subscription.setFlushTimeout_ = function() { - throw new Error('Should not be called.'); - }; - - pool = { - isConnected: function() { - return true; - } - }; - - subscription.connectionPool = pool; - }); - - it('should not write to the pool if not connected', function(done) { - subscription.setFlushTimeout_ = function() { - assert.deepEqual(subscription.inventory_.nack, [MESSAGE.ackId]); - done(); - }; - - pool.isConnected = function() { - return false; - }; - - subscription.nack_(MESSAGE); - }); - - it('should write to the connection it came in on', function(done) { - var fakeConnection = { - write: function(data) { - assert.deepEqual(data, { - modifyDeadlineAckIds: [MESSAGE.ackId], - modifyDeadlineSeconds: [0] - }); - done(); - } - }; - - pool.acquire = function(connectionId, callback) { - assert.strictEqual(connectionId, MESSAGE.connectionId); - callback(null, fakeConnection); - }; + it('should nack if there is a connection', function(done) { + subscription.isConnected_ = function() { + return true; + }; - subscription.nack_(MESSAGE); - }); + subscription.modifyAckDeadline_ = function(ackId, deadline, connId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(deadline, 0); + assert.strictEqual(connId, MESSAGE.connectionId); + done(); + }; - it('should emit an error when unable to get a conn', function(done) { - var error = new Error('err'); + subscription.nack_(MESSAGE); + }); - pool.acquire = function(connectionId, callback) { - callback(error); - }; + it('should queue the message to be nacked if no conn', function(done) { + subscription.isConnected_ = function() { + return false; + }; - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); + subscription.setFlushTimeout_ = function() { + assert(subscription.inventory_.nack.indexOf(MESSAGE.ackId) > -1); + done(); + }; - subscription.nack_(MESSAGE); - }); + subscription.nack_(MESSAGE); }); }); @@ -1552,6 +1572,12 @@ describe('Subscription', function() { }); describe('renewLeases_', function() { + beforeEach(function() { + subscription.modifyAckDeadline_ = function() { + return Promise.resolve(); + }; + }); + var fakeDeadline = 9999; var fakeAckIds = ['abc', 'def']; @@ -1602,96 +1628,30 @@ describe('Subscription', function() { }); it('should not renew leases if inventory is empty', function() { - subscription.connectionPool = { - acquire: function() { - throw new Error('Should not have been called.'); - } + subscription.modifyAckDeadline_ = function() { + throw new Error('Should not have been called.'); }; subscription.inventory_.lease = []; subscription.renewLeases_(); }); - describe('with connection pool', function() { - var fakeConnection; - - beforeEach(function() { - fakeConnection = { - acquire: fakeUtil.noop - }; - - subscription.connectionPool = { - acquire: function(callback) { - callback(null, fakeConnection); - } - }; - }); - - it('should emit any pool acquiring errors', function(done) { - var error = new Error('err'); - - subscription.connectionPool.acquire = function(callback) { - callback(error); - }; - - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); + it('should modAck the leased messages', function(done) { + subscription.modifyAckDeadline_ = function(ackIds, deadline) { + assert.deepEqual(ackIds, fakeAckIds); + assert.strictEqual(deadline, subscription.ackDeadline / 1000); - subscription.renewLeases_(); - }); + setImmediate(done); - it('should write to the connection', function(done) { - fakeConnection.write = function(reqOpts) { - assert.notStrictEqual(reqOpts.modifyDeadlineAckIds, fakeAckIds); - assert.deepEqual(reqOpts, { - modifyDeadlineAckIds: fakeAckIds, - modifyDeadlineSeconds: Array(2).fill(fakeDeadline / 1000) - }); - done(); - }; + return Promise.resolve(); + }; - subscription.renewLeases_(); - }); + subscription.renewLeases_(); }); - describe('without connection pool', function() { - it('should make the correct request', function(done) { - subscription.request = function(config, callback) { - assert.strictEqual(config.client, 'subscriberClient'); - assert.strictEqual(config.method, 'modifyAckDeadline'); - assert.notStrictEqual(config.reqOpts.ackIds, fakeAckIds); - assert.deepEqual(config.reqOpts, { - subscription: subscription.name, - ackIds: fakeAckIds, - ackDeadlineSeconds: fakeDeadline / 1000 - }); - callback(); - done(); - }; - - subscription.on('error', function(err) { - done(err); - }); - - subscription.renewLeases_(); - }); - - it('should emit any request errors', function(done) { - var error = new Error('err'); - - subscription.request = function(config, callback) { - callback(error); - }; - - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); - - subscription.renewLeases_(); - }); + it('should re-set the lease timeout', function(done) { + subscription.setLeaseTimeout_ = done; + subscription.renewLeases_(); }); }); From 54975c418b4d5a67b3e26f978f4d8dbf269b0878 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 8 Nov 2017 09:44:20 -0500 Subject: [PATCH 0105/1115] pubsub @ 0.14.8 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5ec0323d119..0c7f0782aa7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.7", + "version": "0.14.8", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From f35eb2f437145d4bc1717822776768e0f4579df8 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 16 Nov 2017 14:50:07 -0500 Subject: [PATCH 0106/1115] pubsub: convert iam to use gax (#2744) * pubsub: convert iam to use gax * remove dependency on common-grpc * pin grpc to 1.7.1 --- handwritten/pubsub/package.json | 1 - handwritten/pubsub/src/connection-pool.js | 2 +- handwritten/pubsub/src/iam.js | 97 ++++++++------- handwritten/pubsub/system-test/pubsub.js | 1 - handwritten/pubsub/test/connection-pool.js | 10 +- handwritten/pubsub/test/iam.js | 131 +++++++++++---------- 6 files changed, 126 insertions(+), 116 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0c7f0782aa7..abc23c297a7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,6 @@ ], "dependencies": { "@google-cloud/common": "^0.13.0", - "@google-cloud/common-grpc": "^0.4.2", "arrify": "^1.0.0", "async-each": "^1.0.1", "extend": "^3.0.0", diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index aafe4a639f4..a4616c41760 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -24,7 +24,7 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); var each = require('async-each'); var events = require('events'); -var grpc = require('@google-cloud/common-grpc').grpc; +var grpc = require('google-gax').grpc().grpc; var is = require('is'); var util = require('util'); var uuid = require('uuid'); diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index a64a32fb8d8..c0b81953a90 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -22,17 +22,12 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); -var commonGrpc = require('@google-cloud/common-grpc'); var is = require('is'); -var path = require('path'); -var util = require('util'); /*! Developer Documentation * * @param {module:pubsub} pubsub - PubSub Object. - * @param {object} config - Configuration object. - * @param {string} config.baseUrl - The base URL to apply to API requests. - * @param {string} config.id - The name of the topic or subscription. + * @param {string} id - The name of the topic or subscription. */ /** * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) @@ -68,32 +63,16 @@ var util = require('util'); * // subscription.iam */ function IAM(pubsub, id) { - var config = { - baseUrl: 'pubsub.googleapis.com', - protosDir: path.resolve(__dirname, '../protos'), - protoServices: { - IAMPolicy: { - path: 'google/iam/v1/iam_policy.proto', - service: 'iam.v1' - } - }, - scopes: [ - 'https://www.googleapis.com/auth/pubsub', - 'https://www.googleapis.com/auth/cloud-platform' - ], - packageJson: require('../package.json') - }; - + this.pubsub = pubsub; + this.request = pubsub.request.bind(pubsub); this.id = id; - - commonGrpc.Service.call(this, config, pubsub.options); } -util.inherits(IAM, commonGrpc.Service); - /** * Get the IAM policy * + * @param {object=} gaxOptions - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {function} callback - The callback function. * @param {?error} callback.err - An error returned while making this request. * @param {object} callback.policy - The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). @@ -115,17 +94,22 @@ util.inherits(IAM, commonGrpc.Service); * var apiResponse = data[1]; * }); */ -IAM.prototype.getPolicy = function(callback) { - var protoOpts = { - service: 'IAMPolicy', - method: 'getIamPolicy' - }; +IAM.prototype.getPolicy = function(gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = null; + } var reqOpts = { resource: this.id }; - this.request(protoOpts, reqOpts, callback); + this.request({ + client: 'subscriberClient', + method: 'getIamPolicy', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, callback); }; /** @@ -137,6 +121,8 @@ IAM.prototype.getPolicy = function(callback) { * @param {array=} policy.bindings - Bindings associate members with roles. * @param {object[]=} policy.rules - Rules to be applied to the policy. * @param {string=} policy.etag - Etags are used to perform a read-modify-write. + * @param {object=} gaxOptions - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {function} callback - The callback function. * @param {?error} callback.err - An error returned while making this request. * @param {object} callback.policy - The updated policy. @@ -168,22 +154,27 @@ IAM.prototype.getPolicy = function(callback) { * var apiResponse = data[1]; * }); */ -IAM.prototype.setPolicy = function(policy, callback) { +IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { if (!is.object(policy)) { throw new Error('A policy object is required.'); } - var protoOpts = { - service: 'IAMPolicy', - method: 'setIamPolicy' - }; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = null; + } var reqOpts = { resource: this.id, - policy: policy + policy }; - this.request(protoOpts, reqOpts, callback); + this.request({ + client: 'subscriberClient', + method: 'setIamPolicy', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, callback); }; /** @@ -194,6 +185,8 @@ IAM.prototype.setPolicy = function(policy, callback) { * @throws {Error} If permissions are not provided. * * @param {string|string[]} permissions - The permission(s) to test for. + * @param {object=} gaxOptions - Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {function} callback - The callback function. * @param {?error} callback.err - An error returned while making this request. * @param {array} callback.permissions - A subset of permissions that the caller @@ -241,37 +234,39 @@ IAM.prototype.setPolicy = function(policy, callback) { * var apiResponse = data[1]; * }); */ -IAM.prototype.testPermissions = function(permissions, callback) { +IAM.prototype.testPermissions = function(permissions, gaxOpts, callback) { if (!is.array(permissions) && !is.string(permissions)) { throw new Error('Permissions are required.'); } - permissions = arrify(permissions); - - var protoOpts = { - service: 'IAMPolicy', - method: 'testIamPermissions' - }; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = null; + } var reqOpts = { resource: this.id, - permissions: permissions + permissions: arrify(permissions) }; - this.request(protoOpts, reqOpts, function(err, resp) { + this.request({ + client: 'subscriberClient', + method: 'testIamPermissions', + reqOpts: reqOpts, + gaxOpts: gaxOpts + }, function(err, resp) { if (err) { callback(err, null, resp); return; } var availablePermissions = arrify(resp.permissions); - - var permissionsHash = permissions.reduce(function(acc, permission) { + var permissionHash = permissions.reduce(function(acc, permission) { acc[permission] = availablePermissions.indexOf(permission) > -1; return acc; }, {}); - callback(null, permissionsHash, resp); + callback(null, permissionHash, resp); }); }; diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 81eb3f8540a..fcef40d6204 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -513,7 +513,6 @@ describe('pubsub', function() { assert.ifError(err); assert.deepEqual(policy.bindings, []); - assert.strictEqual(policy.etag, 'ACAB'); assert.strictEqual(policy.version, 0); done(); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index a220fb5fe20..c26708b623e 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -32,6 +32,12 @@ var fakeUtil = extend({}, common.util); var fakeUuid = extend({}, uuid); var fakeGrpc = extend({}, grpc); +function fakeGaxGrpc() { + return { + grpc: fakeGrpc + }; +} + var v1Override; function fakeV1(options) { return (v1Override || v1)(options); @@ -95,8 +101,8 @@ describe('ConnectionPool', function() { '@google-cloud/common': { util: fakeUtil }, - '@google-cloud/common-grpc': { - grpc: fakeGrpc + 'google-gax': { + grpc: fakeGaxGrpc }, uuid: fakeUuid, './v1': fakeV1 diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index 25dde7ed8fc..7b07a831227 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -18,9 +18,6 @@ var assert = require('assert'); var extend = require('extend'); -var GrpcService = require('@google-cloud/common-grpc').Service; -var nodeutil = require('util'); -var path = require('path'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; @@ -33,19 +30,13 @@ var fakeUtil = extend({}, util, { } }); -function FakeGrpcService() { - this.calledWith_ = arguments; - GrpcService.apply(this, arguments); -} - -nodeutil.inherits(FakeGrpcService, GrpcService); - describe('IAM', function() { var IAM; var iam; var PUBSUB = { - options: {} + options: {}, + request: util.noop }; var ID = 'id'; @@ -53,9 +44,6 @@ describe('IAM', function() { IAM = proxyquire('../src/iam.js', { '@google-cloud/common': { util: fakeUtil - }, - '@google-cloud/common-grpc': { - Service: FakeGrpcService } }); }); @@ -65,58 +53,62 @@ describe('IAM', function() { }); describe('initialization', function() { - it('should inherit from GrpcService', function() { - assert(iam instanceof GrpcService); - - var config = iam.calledWith_[0]; - var options = iam.calledWith_[1]; - - assert.strictEqual(config.baseUrl, 'pubsub.googleapis.com'); - - var protosDir = path.resolve(__dirname, '../protos'); - assert.strictEqual(config.protosDir, protosDir); + it('should localize pubsub', function() { + assert.strictEqual(iam.pubsub, PUBSUB); + }); - assert.deepStrictEqual(config.protoServices, { - IAMPolicy: { - path: 'google/iam/v1/iam_policy.proto', - service: 'iam.v1' + it('should localize pubsub#request', function() { + var fakeRequest = function() {}; + var fakePubsub = { + request: { + bind: function(context) { + assert.strictEqual(context, fakePubsub); + return fakeRequest; + } } - }); + }; + var iam = new IAM(fakePubsub, ID); - assert.deepEqual(config.scopes, [ - 'https://www.googleapis.com/auth/pubsub', - 'https://www.googleapis.com/auth/cloud-platform' - ]); - assert.deepEqual(config.packageJson, require('../package.json')); + assert.strictEqual(iam.request, fakeRequest); + }); - assert.strictEqual(options, PUBSUB.options); + it('should localize the ID', function() { + assert.strictEqual(iam.id, ID); }); it('should promisify all the things', function() { assert(promisified); }); - - it('should localize the ID', function() { - assert.strictEqual(iam.id, ID); - }); }); describe('getPolicy', function() { it('should make the correct API request', function(done) { - iam.request = function(protoOpts, reqOpts, callback) { - assert.strictEqual(protoOpts.service, 'IAMPolicy'); - assert.strictEqual(protoOpts.method, 'getIamPolicy'); - - assert.strictEqual(reqOpts.resource, iam.id); + iam.request = function(config, callback) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'getIamPolicy'); + assert.strictEqual(config.reqOpts.resource, iam.id); callback(); // done() }; iam.getPolicy(done); }); + + it('should accept gax options', function(done) { + var gaxOpts = {}; + + iam.request = function(config) { + assert.strictEqual(config.gaxOpts, gaxOpts); + done(); + }; + + iam.getPolicy(gaxOpts, assert.ifError); + }); }); describe('setPolicy', function() { + var policy = { etag: 'ACAB' }; + it('should throw an error if a policy is not supplied', function() { assert.throws(function() { iam.setPolicy(util.noop); @@ -124,20 +116,28 @@ describe('IAM', function() { }); it('should make the correct API request', function(done) { - var policy = { etag: 'ACAB' }; - - iam.request = function(protoOpts, reqOpts, callback) { - assert.strictEqual(protoOpts.service, 'IAMPolicy'); - assert.strictEqual(protoOpts.method, 'setIamPolicy'); - - assert.strictEqual(reqOpts.resource, iam.id); - assert.strictEqual(reqOpts.policy, policy); + iam.request = function(config, callback) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'setIamPolicy'); + assert.strictEqual(config.reqOpts.resource, iam.id); + assert.strictEqual(config.reqOpts.policy, policy); callback(); // done() }; iam.setPolicy(policy, done); }); + + it('should accept gax options', function(done) { + var gaxOpts = {}; + + iam.request = function(config) { + assert.strictEqual(config.gaxOpts, gaxOpts); + done(); + }; + + iam.setPolicy(policy, gaxOpts, assert.ifError); + }); }); describe('testPermissions', function() { @@ -150,12 +150,11 @@ describe('IAM', function() { it('should make the correct API request', function(done) { var permissions = 'storage.bucket.list'; - iam.request = function(protoOpts, reqOpts) { - assert.strictEqual(protoOpts.service, 'IAMPolicy'); - assert.strictEqual(protoOpts.method, 'testIamPermissions'); - - assert.strictEqual(reqOpts.resource, iam.id); - assert.deepEqual(reqOpts.permissions, [permissions]); + iam.request = function(config) { + assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.method, 'testIamPermissions'); + assert.strictEqual(config.reqOpts.resource, iam.id); + assert.deepEqual(config.reqOpts.permissions, [permissions]); done(); }; @@ -163,12 +162,24 @@ describe('IAM', function() { iam.testPermissions(permissions, assert.ifError); }); + it('should accept gax options', function(done) { + var permissions = 'storage.bucket.list'; + var gaxOpts = {}; + + iam.request = function(config) { + assert.strictEqual(config.gaxOpts, gaxOpts); + done(); + }; + + iam.testPermissions(permissions, gaxOpts, assert.ifError); + }); + it('should send an error back if the request fails', function(done) { var permissions = ['storage.bucket.list']; var error = new Error('Error.'); var apiResponse = {}; - iam.request = function(protoOpts, reqOpts, callback) { + iam.request = function(config, callback) { callback(error, apiResponse); }; @@ -189,7 +200,7 @@ describe('IAM', function() { permissions: ['storage.bucket.consume'] }; - iam.request = function(protoOpts, reqOpts, callback) { + iam.request = function(config, callback) { callback(null, apiResponse); }; From 8ccc0af3b7f2c8f9d21a19ffe03d1ba4692014fd Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Mon, 20 Nov 2017 11:08:58 -0500 Subject: [PATCH 0107/1115] pubsub @ 0.15.0 tagged. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index abc23c297a7..f47cb62722b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.14.8", + "version": "0.15.0", "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", "contributors": [ From 2b39bee10d7edaf5e5ae2cd2c420d2f398f137c1 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Mon, 11 Dec 2017 10:21:01 -0800 Subject: [PATCH 0108/1115] Repo migration (#4) * added cloud repo tools, generated files * added mailmap * added jsdoc * make jsdoc work * make lint work * install test tooling * add circleci config * add encrypted key * set up system tests * make system tests initialize properly * make samples tests work * touch file to enable circleci * make lint pass * configure appveyor * New generated code (#3) * new generated code * removing unneeded file * removing extra logging * making src/connection-pool.js work with the new generated code * updating connection pool to work with new generated code * making system test work * making tests work with the new generated code * prettier and lint * better test coverage * more test changes * added some tests for getClient_ and request * Test refactor. * Prettier. * fix test & prettier * newer prettier, more prettier fixes --- handwritten/pubsub/.appveyor.yml | 20 + handwritten/pubsub/.circleci/config.yml | 226 ++ handwritten/pubsub/.circleci/key.json.enc | Bin 0 -> 2368 bytes handwritten/pubsub/.cloud-repo-tools.json | 23 + handwritten/pubsub/.eslintignore | 3 + handwritten/pubsub/.eslintrc.yml | 13 + handwritten/pubsub/.github/CONTRIBUTING.md | 53 + handwritten/pubsub/.github/ISSUE_TEMPLATE.md | 28 + .../pubsub/.github/PULL_REQUEST_TEMPLATE.md | 5 + handwritten/pubsub/.gitignore | 10 + handwritten/pubsub/.jsdoc.js | 45 + handwritten/pubsub/.mailmap | 6 + handwritten/pubsub/.nycrc | 26 + handwritten/pubsub/.prettierignore | 3 + handwritten/pubsub/.prettierrc | 8 + handwritten/pubsub/CODE_OF_CONDUCT.md | 43 + handwritten/pubsub/CONTRIBUTORS | 21 + handwritten/pubsub/LICENSE | 202 ++ handwritten/pubsub/README.md | 171 +- handwritten/pubsub/package.json | 100 +- .../protos/google/pubsub/v1/pubsub.proto | 142 +- handwritten/pubsub/src/connection-pool.js | 124 +- handwritten/pubsub/src/histogram.js | 2 +- handwritten/pubsub/src/iam.js | 75 +- handwritten/pubsub/src/index.js | 317 +- handwritten/pubsub/src/publisher.js | 69 +- handwritten/pubsub/src/snapshot.js | 15 +- handwritten/pubsub/src/subscription.js | 199 +- handwritten/pubsub/src/topic.js | 115 +- handwritten/pubsub/src/v1/index.js | 52 +- handwritten/pubsub/src/v1/publisher_client.js | 1841 +++++----- .../pubsub/src/v1/subscriber_client.js | 2987 +++++++++-------- handwritten/pubsub/system-test/.eslintrc.yml | 6 + handwritten/pubsub/system-test/pubsub.js | 274 +- handwritten/pubsub/test/.eslintrc.yml | 5 + handwritten/pubsub/test/connection-pool.js | 357 +- handwritten/pubsub/test/iam.js | 29 +- handwritten/pubsub/test/index.js | 484 ++- handwritten/pubsub/test/publisher.js | 48 +- handwritten/pubsub/test/snapshot.js | 14 +- handwritten/pubsub/test/subscription.js | 145 +- handwritten/pubsub/test/topic.js | 75 +- 42 files changed, 4894 insertions(+), 3487 deletions(-) create mode 100644 handwritten/pubsub/.appveyor.yml create mode 100644 handwritten/pubsub/.circleci/config.yml create mode 100644 handwritten/pubsub/.circleci/key.json.enc create mode 100644 handwritten/pubsub/.cloud-repo-tools.json create mode 100644 handwritten/pubsub/.eslintignore create mode 100644 handwritten/pubsub/.eslintrc.yml create mode 100644 handwritten/pubsub/.github/CONTRIBUTING.md create mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE.md create mode 100644 handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md create mode 100644 handwritten/pubsub/.gitignore create mode 100644 handwritten/pubsub/.jsdoc.js create mode 100644 handwritten/pubsub/.mailmap create mode 100644 handwritten/pubsub/.nycrc create mode 100644 handwritten/pubsub/.prettierignore create mode 100644 handwritten/pubsub/.prettierrc create mode 100644 handwritten/pubsub/CODE_OF_CONDUCT.md create mode 100644 handwritten/pubsub/CONTRIBUTORS create mode 100644 handwritten/pubsub/LICENSE create mode 100644 handwritten/pubsub/system-test/.eslintrc.yml create mode 100644 handwritten/pubsub/test/.eslintrc.yml diff --git a/handwritten/pubsub/.appveyor.yml b/handwritten/pubsub/.appveyor.yml new file mode 100644 index 00000000000..24082152655 --- /dev/null +++ b/handwritten/pubsub/.appveyor.yml @@ -0,0 +1,20 @@ +environment: + matrix: + - nodejs_version: 8 + +install: + - ps: Install-Product node $env:nodejs_version + - npm install -g npm # Force using the latest npm to get dedupe during install + - set PATH=%APPDATA%\npm;%PATH% + - npm install --force --ignore-scripts + +test_script: + - node --version + - npm --version + - npm rebuild + - npm test + +build: off + +matrix: + fast_finish: true diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml new file mode 100644 index 00000000000..c6826af1f7a --- /dev/null +++ b/handwritten/pubsub/.circleci/config.yml @@ -0,0 +1,226 @@ +--- +# "Include" for unit tests definition. +unit_tests: &unit_tests + steps: + - checkout + - run: + name: Install modules and dependencies. + command: npm install + - run: + name: Run unit tests. + command: npm test + - run: + name: Submit coverage data to codecov. + command: node_modules/.bin/codecov + when: always + +version: 2.0 +workflows: + version: 2 + tests: + jobs: + - node4: + filters: + tags: + only: /.*/ + - node6: + filters: + tags: + only: /.*/ + - node7: + filters: + tags: + only: /.*/ + - node8: + filters: + tags: + only: /.*/ + - node9: + filters: + tags: + only: /.*/ + - lint: + requires: + - node4 + - node6 + - node7 + - node8 + - node9 + filters: + tags: + only: /.*/ + - docs: + requires: + - node4 + - node6 + - node7 + - node8 + - node9 + filters: + tags: + only: /.*/ + - system_tests: + requires: + - lint + - docs + filters: + branches: + only: master + tags: + only: /^v[\d.]+$/ + - sample_tests: + requires: + - lint + - docs + filters: + branches: + only: master + tags: + only: /^v[\d.]+$/ + - publish_npm: + requires: + - system_tests + - sample_tests + filters: + branches: + ignore: /.*/ + tags: + only: /^v[\d.]+$/ + +jobs: + node4: + docker: + - image: node:4 + steps: + - checkout + - run: + name: Install modules and dependencies. + command: npm install --unsafe-perm + - run: + name: Run unit tests. + command: npm test + - run: + name: Submit coverage data to codecov. + command: node_modules/.bin/codecov + when: always + node6: + docker: + - image: node:6 + <<: *unit_tests + node7: + docker: + - image: node:7 + <<: *unit_tests + node8: + docker: + - image: node:8 + <<: *unit_tests + node9: + docker: + - image: node:9 + <<: *unit_tests + + lint: + docker: + - image: node:8 + steps: + - checkout + - run: + name: Install modules and dependencies. + command: | + npm install + npm link + - run: + name: Link the module being tested to the samples. + command: | + cd samples/ + npm link @google-cloud/pubsub + npm install + cd .. + - run: + name: Run linting. + command: npm run lint + + docs: + docker: + - image: node:8 + steps: + - checkout + - run: + name: Install modules and dependencies. + command: npm install + - run: + name: Build documentation. + command: npm run docs + + sample_tests: + docker: + - image: node:8 + steps: + - checkout + - run: + name: Decrypt credentials. + command: | + openssl aes-256-cbc -d -in .circleci/key.json.enc \ + -out .circleci/key.json \ + -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" + - run: + name: Install and link the module. + command: | + npm install + npm link + - run: + name: Link the module being tested to the samples. + command: | + cd samples/ + npm link @google-cloud/pubsub + npm install + cd .. + - run: + name: Run sample tests. + command: npm run samples-test + environment: + GCLOUD_PROJECT: long-door-651 + GOOGLE_APPLICATION_CREDENTIALS: /var/pubsub/.circleci/key.json + - run: + name: Remove unencrypted key. + command: rm .circleci/key.json + when: always + working_directory: /var/pubsub/ + + system_tests: + docker: + - image: node:8 + steps: + - checkout + - run: + name: Decrypt credentials. + command: | + openssl aes-256-cbc -d -in .circleci/key.json.enc \ + -out .circleci/key.json \ + -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" + - run: + name: Install modules and dependencies. + command: npm install + - run: + name: Run system tests. + command: npm run system-test + environment: + GOOGLE_APPLICATION_CREDENTIALS: .circleci/key.json + - run: + name: Remove unencrypted key. + command: rm .circleci/key.json + when: always + + publish_npm: + docker: + - image: node:8 + steps: + - checkout + - run: + name: Set NPM authentication. + command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc + - run: + name: Publish the module to npm. + command: npm publish + diff --git a/handwritten/pubsub/.circleci/key.json.enc b/handwritten/pubsub/.circleci/key.json.enc new file mode 100644 index 0000000000000000000000000000000000000000..5240daa6025147e2edc0a6342bc3ca1a2800b61b GIT binary patch literal 2368 zcmV-G3BUGJVQh3|WM5ysM0`sL)C?x;=ATqr(AcpwT%xg^78w2=Rp5z;cNkX0Mgegm zo^F6N^BA8FY|`xH+c`2G!#Pf20rh67M8jYGf~lt@w%TTi)AB~_>alne4&R^kpLF@~?$V!aJuwg8G&p^I$rm*zOX0cwATnA_i1jg8eP5&m4McRyEe! zzoPgKui1!ttnm2O>H7fgNoXz7zHc8I^V#&dJKQNiV)Sa~B%d@LP(p7h^N{={`JvGv zzq;(!u3d&N^7V>?rk8lc@A9xBnabZUy!&d;X!K*@nMs-r5YSS82HB|}Y1$Fyf_@Y8 z!u)G9q9Q^1l;JM|>aZI}N-qSO=3^=0T(qkgxmGYsAx}qUG|#Y1S=%pkf`dQwIJoz$ z3JwY{VVHBnchCYxT@4fn;)10baX!JKe1$OtEsMS3H8YNnPwrNj|3n%PNg(j`#-Q=k z%~9wSVpkKA--*rqDZoMY5^0PxXjRQ@DEQtR%9bwK zBj-0*wjGVtxvWLW#&+kM{OvaCiksACGk!QPnO%Si(n$Vr5GfVfjdKK-h_5c=HMEJf z3iRhSK4BVo`mWN+qF;SZ-JVsn5jFKdjWnjWPJM?i@CT1MPR_PTzX!S-MoDx8-Fwz= zuT|XzMztqNFw|(+t+nvs0^iyPKi8#4ZSe3#41-x3eC@H8=K-|@kd|~jB7khOl~5Vp z0ok`i2b4do2}O+_Qk{qZy1{+KpudQ|F6A~k0rnBxHyX`g_!cwmEH40x?tc^88-6WA zXbO&$)EK?OVe=cYTJJUyYt8Cj2NN=^u9}35W*hbr2*I-2e|D!G8d4ClTkMycO=+PV zpUZGtwm)y%k5+@%o%M1g%J)vx)0`ql1uuS;E}gWwWJf!<8lh0q8$Ya+TL>XT3>dYy}8L!u-1`=v>$b%3P)_k#!Q5 z*9ep->kk1y=|5$4WJ)((<+@Muv|P#W1P2z;*X)+>0GV99Ag{{&Yd`6dql!HOPnKAK z>QjH?9hE;K1r3Zf{hkJIA6r;@oe$w!e*gQ(`Vp}z`)bh^y;4ydxXAIXi86c{ju%0+ z(m-;^E;HuL2Z-PIg7N?AqoaW0Aj8c8t&k(Hh!xXU%`l03IR1t!@oB|hY}HXrUUXr@ ztYbGMUJFnG(4qN}a>w_zGN76(zry+JF2^W-#^5+S6ulRPlRAV#&@whf7t8VEA8?@4 z=Se<(nTLm5+cgSit%%;EIZxUsoxfk7aU#&dPOxe!Kw?>MZqEZ9@-Na;4cvw^ zw1 zLnWo#3A8s?tC_UmxfC){E~7~RVXOZz0E3C`gT;SHUdvBxprmKTIDw?ZQMJ)+?ui12 z)MLeH>LAyWG`YnmOgL>kT4OH|+~m)uv z)M=4LV^Rp`YHCjHJ_Ff#*G0q%eQr3L)@k#%eW`Wv(rhgJO`>IcQy=-L9@4`Dk+B#c z76wREfwL_TN!@fvf@Mtw27gt;q%}=Cfh$+vXkgOqLttTi2egfeZO)ZPb8>DAWRE^w zxJ)p5M+gM?gizp)|3o^DbG?GCTva1()W>KWHs4$InW z(`}(Hlfhd+=%+SvGKlR3(MY+>C9m&5`<7X|VxSx_=<9SOImy{$PsF$iuuZ1WMID?Ub z{l)$xp^t+0FWX70Dve(~OH{ps$XE+5-+8l$ZJ%)q3+uny-Q-$w-Z4rhJLqbm_k+JD z?Z6oD;oRgEhjm9@ZTC|wRTt{zX3Yeey= z?`IF$>XMtg$H{$>rFuESmfHxFW`C_WjQAU~geMCYIU}7V#$uK7U2fg!f`2FpLcjSy z@_gy&952Oe7<4IRoHwB;=iU*1rF0EWGr=@+YcgTYDefLRQ`Ot`g(y28)?A_!I4W>H zA@SYOLE#b)loy7)@SNh*pa}?4979qkMt=f6r)wOPha`-Rw1!e)0s;+ayJGm_y$VNb1iEl4uqT}F}TFhI7+4dHJxWX)dvbkkdDQ@MHD mQaNBs*CGky(CN+Ro}7GRePII%Xu?I}kyUWIP} literal 0 HcmV?d00001 diff --git a/handwritten/pubsub/.cloud-repo-tools.json b/handwritten/pubsub/.cloud-repo-tools.json new file mode 100644 index 00000000000..23d5c1219ed --- /dev/null +++ b/handwritten/pubsub/.cloud-repo-tools.json @@ -0,0 +1,23 @@ +{ + "requiresKeyFile": true, + "requiresProjectId": true, + "product": "pubsub", + "client_reference_url": "https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub", + "release_quality": "beta", + "samples": [ + { + "id": "subscriptions", + "name": "Subscriptions", + "file": "subscriptions.js", + "docs_link": "https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub/subscription", + "usage": "node subscriptions.js --help" + }, + { + "id": "topics", + "name": "Topics", + "file": "topics.js", + "docs_link": "https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub/topic", + "usage": "node topics.js --help" + } + ] +} diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore new file mode 100644 index 00000000000..f6fac98b0a8 --- /dev/null +++ b/handwritten/pubsub/.eslintignore @@ -0,0 +1,3 @@ +node_modules/* +samples/node_modules/* +src/**/doc/* diff --git a/handwritten/pubsub/.eslintrc.yml b/handwritten/pubsub/.eslintrc.yml new file mode 100644 index 00000000000..bed57fbc42c --- /dev/null +++ b/handwritten/pubsub/.eslintrc.yml @@ -0,0 +1,13 @@ +--- +extends: + - 'eslint:recommended' + - 'plugin:node/recommended' + - prettier +plugins: + - node + - prettier +rules: + prettier/prettier: error + block-scoped-var: error + eqeqeq: error + no-warning-comments: warn diff --git a/handwritten/pubsub/.github/CONTRIBUTING.md b/handwritten/pubsub/.github/CONTRIBUTING.md new file mode 100644 index 00000000000..aaeac9f9483 --- /dev/null +++ b/handwritten/pubsub/.github/CONTRIBUTING.md @@ -0,0 +1,53 @@ +# How to become a contributor and submit your own code + +**Table of contents** + +* [Contributor License Agreements](#contributor-license-agreements) +* [Contributing a patch](#contributing-a-patch) +* [Running the tests](#running-the-tests) +* [Releasing the library](#releasing-the-library) + +## Contributor License Agreements + +We'd love to accept your sample apps and patches! Before we can take them, we +have to jump a couple of legal hurdles. + +Please fill out either the individual or corporate Contributor License Agreement +(CLA). + + * If you are an individual writing original source code and you're sure you + own the intellectual property, then you'll need to sign an [individual CLA] + (https://developers.google.com/open-source/cla/individual). + * If you work for a company that wants to allow you to contribute your work, + then you'll need to sign a [corporate CLA] + (https://developers.google.com/open-source/cla/corporate). + +Follow either of the two links above to access the appropriate CLA and +instructions for how to sign and return it. Once we receive it, we'll be able to +accept your pull requests. + +## Contributing A Patch + +1. Submit an issue describing your proposed change to the repo in question. +1. The repo owner will respond to your issue promptly. +1. If your proposed change is accepted, and you haven't already done so, sign a + Contributor License Agreement (see details above). +1. Fork the desired repo, develop and test your code changes. +1. Ensure that your code adheres to the existing style in the code to which + you are contributing. +1. Ensure that your code has an appropriate set of tests which all pass. +1. Submit a pull request. + +## Running the tests + +1. [Prepare your environment for Node.js setup][setup]. + +1. Install dependencies: + + npm install + +1. Run the tests: + + npm test + +[setup]: https://cloud.google.com/nodejs/docs/setup diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000000..303c0b041d9 --- /dev/null +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,28 @@ +Thanks for stopping by to let us know something could be better! + +Please run down the following list and make sure you've tried the usual "quick +fixes": + + - Search the issues already opened: https://github.com/googleapis/nodejs-pubsub/issues + - Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js + - Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting + - Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq + +If you are still having issues, please be sure to include as much information as +possible: + +#### Environment details + + - OS: + - Node.js version: + - npm version: + - @google-cloud/pubsub version: + +#### Steps to reproduce + + 1. ??? + 2. ??? + +Following these steps will guarantee the quickest resolution possible. + +Thanks! diff --git a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md b/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000000..809750308d7 --- /dev/null +++ b/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,5 @@ +Fixes # (it's a good idea to open an issue first for discussion) + +- [ ] Tests and linter pass +- [ ] Code coverage does not decrease (if any source code was changed) +- [ ] Appropriate docs were updated (if necessary) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore new file mode 100644 index 00000000000..6b80718f261 --- /dev/null +++ b/handwritten/pubsub/.gitignore @@ -0,0 +1,10 @@ +**/*.log +**/node_modules +.coverage +.nyc_output +docs/ +out/ +system-test/secrets.js +system-test/*key.json +*.lock +*-lock.js* diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js new file mode 100644 index 00000000000..eaf0f78e1f6 --- /dev/null +++ b/handwritten/pubsub/.jsdoc.js @@ -0,0 +1,45 @@ +/*! + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +module.exports = { + opts: { + readme: './README.md', + package: './package.json', + template: './node_modules/ink-docstrap/template', + recurse: true, + verbose: true, + destination: './docs/' + }, + plugins: [ + 'plugins/markdown' + ], + source: { + excludePattern: '(^|\\/|\\\\)[._]', + include: [ + 'src' + ], + includePattern: '\\.js$' + }, + templates: { + copyright: 'Copyright 2017 Google, Inc.', + includeDate: false, + sourceFiles: false, + systemName: '@google-cloud/pubsub', + theme: 'lumen' + } +}; diff --git a/handwritten/pubsub/.mailmap b/handwritten/pubsub/.mailmap new file mode 100644 index 00000000000..7ff7bca86d8 --- /dev/null +++ b/handwritten/pubsub/.mailmap @@ -0,0 +1,6 @@ +Jason Dobry Jason Dobry +Jason Dobry Jason Dobry +Luke Sneeringer Luke Sneeringer +Stephen Sawchuk Stephen Sawchuk +Stephen Sawchuk Stephen Sawchuk +Stephen Sawchuk Stephen diff --git a/handwritten/pubsub/.nycrc b/handwritten/pubsub/.nycrc new file mode 100644 index 00000000000..a1a8e6920ce --- /dev/null +++ b/handwritten/pubsub/.nycrc @@ -0,0 +1,26 @@ +{ + "report-dir": "./.coverage", + "exclude": [ + "src/*{/*,/**/*}.js", + "src/*/v*/*.js", + "test/**/*.js" + ], + "watermarks": { + "branches": [ + 95, + 100 + ], + "functions": [ + 95, + 100 + ], + "lines": [ + 95, + 100 + ], + "statements": [ + 95, + 100 + ] + } +} diff --git a/handwritten/pubsub/.prettierignore b/handwritten/pubsub/.prettierignore new file mode 100644 index 00000000000..f6fac98b0a8 --- /dev/null +++ b/handwritten/pubsub/.prettierignore @@ -0,0 +1,3 @@ +node_modules/* +samples/node_modules/* +src/**/doc/* diff --git a/handwritten/pubsub/.prettierrc b/handwritten/pubsub/.prettierrc new file mode 100644 index 00000000000..df6eac07446 --- /dev/null +++ b/handwritten/pubsub/.prettierrc @@ -0,0 +1,8 @@ +--- +bracketSpacing: false +printWidth: 80 +semi: true +singleQuote: true +tabWidth: 2 +trailingComma: es5 +useTabs: false diff --git a/handwritten/pubsub/CODE_OF_CONDUCT.md b/handwritten/pubsub/CODE_OF_CONDUCT.md new file mode 100644 index 00000000000..46b2a08ea6d --- /dev/null +++ b/handwritten/pubsub/CODE_OF_CONDUCT.md @@ -0,0 +1,43 @@ +# Contributor Code of Conduct + +As contributors and maintainers of this project, +and in the interest of fostering an open and welcoming community, +we pledge to respect all people who contribute through reporting issues, +posting feature requests, updating documentation, +submitting pull requests or patches, and other activities. + +We are committed to making participation in this project +a harassment-free experience for everyone, +regardless of level of experience, gender, gender identity and expression, +sexual orientation, disability, personal appearance, +body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, +such as physical or electronic +addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct. +By adopting this Code of Conduct, +project maintainers commit themselves to fairly and consistently +applying these principles to every aspect of managing this project. +Project maintainers who do not follow or enforce the Code of Conduct +may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior +may be reported by opening an issue +or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, +available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) diff --git a/handwritten/pubsub/CONTRIBUTORS b/handwritten/pubsub/CONTRIBUTORS new file mode 100644 index 00000000000..b4a6e4a615e --- /dev/null +++ b/handwritten/pubsub/CONTRIBUTORS @@ -0,0 +1,21 @@ +# The names of individuals who have contributed to this project. +# +# Names are formatted as: +# name +# +Ace Nassri +Alexander Fenster +Ali Ijaz Sheikh +Dave Gramlich +David Fox +Dennis +Eric Uldall +Jan Pretzel +Jason Dobry +Jun Mukai +Justin King +Matthew Arbesfeld +Song Wang +Stephen Sawchuk +Tim Swast +mkamioner diff --git a/handwritten/pubsub/LICENSE b/handwritten/pubsub/LICENSE new file mode 100644 index 00000000000..7a4a3ea2424 --- /dev/null +++ b/handwritten/pubsub/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index d225bdf5f92..aaf9aaf66fb 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -1,100 +1,129 @@ -# @google-cloud/pubsub ([Beta][versioning]) -> Cloud Pub/Sub Client Library for Node.js +Google Cloud Platform logo -*Looking for more Google APIs than just Pub/Sub? You might want to check out [`google-cloud`][google-cloud].* +# [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) -- [API Documentation][gcloud-pubsub-docs] -- [Official Documentation][cloud-pubsub-docs] +[![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages) +[![CircleCI](https://img.shields.io/circleci/project/github/googleapis/nodejs-pubsub.svg?style=flat)](https://circleci.com/gh/googleapis/nodejs-pubsub) +[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/googleapis/nodejs-pubsub?branch=master&svg=true)](https://ci.appveyor.com/project/googleapis/nodejs-pubsub) +[![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-pubsub/master.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-pubsub) +> Node.js idiomatic client for [Cloud Pub/Sub][product-docs]. -```sh -$ npm install --save @google-cloud/pubsub -``` -```js -var pubsub = require('@google-cloud/pubsub')({ - projectId: 'grape-spaceship-123', - keyFilename: '/path/to/keyfile.json' -}); +[Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. -// Reference a topic that has been previously created. -var topic = pubsub.topic('my-topic'); -// Publish a message to the topic. -var publisher = topic.publisher(); -var message = new Buffer('New message!'); +* [Cloud Pub/Sub Node.js Client API Reference][client-docs] +* [github.com/googleapis/nodejs-pubsub](https://github.com/googleapis/nodejs-pubsub) +* [Cloud Pub/Sub Documentation][product-docs] -publisher.publish(message, function(err, messageId) {}); +Read more about the client libraries for Cloud APIs, including the older +Google APIs Client Libraries, in [Client Libraries Explained][explained]. -// Subscribe to the topic. -topic.createSubscription('subscription-name', function(err, subscription) { - // Register listeners to start pulling for messages. - function onError(err) {} - function onMessage(message) {} - subscription.on('error', onError); - subscription.on('message', onMessage); +[explained]: https://cloud.google.com/apis/docs/client-libraries-explained - // Remove listeners to stop pulling for messages. - subscription.removeListener('message', onMessage); - subscription.removeListener('error', onError); -}); +**Table of contents:** -// Promises are also supported by omitting callbacks. -publisher.publish(message).then(function(data) { - var messageIds = data[0]; -}); +* [Quickstart](#quickstart) + * [Before you begin](#before-you-begin) + * [Installing the client library](#installing-the-client-library) + * [Using the client library](#using-the-client-library) +* [Samples](#samples) +* [Versioning](#versioning) +* [Contributing](#contributing) +* [License](#license) -// It's also possible to integrate with third-party Promise libraries. -var pubsub = require('@google-cloud/pubsub')({ - promise: require('bluebird') -}); -``` +## Quickstart +### Before you begin -## Authentication +1. Select or create a Cloud Platform project. -It's incredibly easy to get authenticated and start using Google's APIs. You can set your credentials on a global basis as well as on a per-API basis. See each individual API section below to see how you can auth on a per-API-basis. This is useful if you want to use different accounts for different Cloud services. + [Go to the projects page][projects] -### On Google Cloud Platform +1. Enable billing for your project. -If you are running this client on Google Cloud Platform, we handle authentication for you with no configuration. You just need to make sure that when you [set up the GCE instance][gce-how-to], you add the correct scopes for the APIs you want to access. + [Enable billing][billing] -``` js -var pubsub = require('@google-cloud/pubsub')(); -// ...you're good to go! -``` +1. Enable the Google Cloud Pub/Sub API. + + [Enable the API][enable_api] + +1. [Set up authentication with a service account][auth] so you can access the + API from your local workstation. -### Elsewhere +[projects]: https://console.cloud.google.com/project +[billing]: https://support.google.com/cloud/answer/6293499#enable-billing +[enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com +[auth]: https://cloud.google.com/docs/authentication/getting-started -If you are not running this client on Google Cloud Platform, you need a Google Developers service account. To create a service account: +### Installing the client library -1. Visit the [Google Developers Console][dev-console]. -2. Create a new project or click on an existing project. -3. Navigate to **APIs & auth** > **APIs section** and turn on the following APIs (you may need to enable billing in order to use these services): - * Google Cloud Pub/Sub API -4. Navigate to **APIs & auth** > **Credentials** and then: - * If you want to use a new service account key, click on **Create credentials** and select **Service account key**. After the account key is created, you will be prompted to download the JSON key file that the library uses to authenticate your requests. - * If you want to generate a new service account key for an existing service account, click on **Generate new JSON key** and download the JSON key file. + npm install --save @google-cloud/pubsub -``` js -var projectId = process.env.GCLOUD_PROJECT; // E.g. 'grape-spaceship-123' +### Using the client library -var pubsub = require('@google-cloud/pubsub')({ - projectId: projectId, +```javascript +// Imports the Google Cloud client library +const PubSub = require('@google-cloud/pubsub'); - // The path to your key file: - keyFilename: '/path/to/keyfile.json' +// Your Google Cloud Platform project ID +const projectId = 'YOUR_PROJECT_ID'; - // Or the contents of the key file: - credentials: require('./path/to/keyfile.json') +// Instantiates a client +const pubsubClient = PubSub({ + projectId: projectId }); -// ...you're good to go! +// The name for the new topic +const topicName = 'my-new-topic'; + +// Creates the new topic +pubsubClient.createTopic(topicName) + .then((results) => { + const topic = results[0]; + console.log(`Topic ${topic.name} created.`); + }) + .catch((err) => { + console.error('ERROR:', err); + }); ``` +## Samples + +Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree/master/samples) directory. The samples' `README.md` +has instructions for running the samples. + +| Sample | Source Code | Try it | +| --------------------------- | --------------------------------- | ------ | +| Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/subscriptions.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/subscriptions.js,samples/README.md) | +| Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/topics.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/topics.js,samples/README.md) | + +The [Cloud Pub/Sub Node.js Client API Reference][client-docs] documentation +also contains samples. + +## Versioning + +This library follows [Semantic Versioning](http://semver.org/). + +This library is considered to be in **beta**. This means it is expected to be +mostly stable while we work toward a general availability release; however, +complete stability is not guaranteed. We will address issues and requests +against beta libraries with a high priority. + +More Information: [Google Cloud Platform Launch Stages][launch_stages] + +[launch_stages]: https://cloud.google.com/terms/launch-stages + +## Contributing + +Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-pubsub/blob/master/.github/CONTRIBUTING.md). + +## License + +Apache Version 2.0 + +See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) -[versioning]: https://github.com/GoogleCloudPlatform/google-cloud-node#versioning -[google-cloud]: https://github.com/GoogleCloudPlatform/google-cloud-node/ -[gce-how-to]: https://cloud.google.com/compute/docs/authentication#using -[dev-console]: https://console.developers.google.com/project -[gcloud-pubsub-docs]: https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub -[cloud-pubsub-docs]: https://cloud.google.com/pubsub/docs +[client-docs]: https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub +[product-docs]: https://cloud.google.com/pubsub/docs +[shell_img]: http://gstatic.com/cloudssh/images/open-btn.png diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f47cb62722b..62342050c01 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,34 +1,13 @@ { "name": "@google-cloud/pubsub", - "version": "0.15.0", - "author": "Google Inc.", "description": "Cloud Pub/Sub Client Library for Node.js", - "contributors": [ - { - "name": "Burcu Dogan", - "email": "jbd@google.com" - }, - { - "name": "Johan Euphrosine", - "email": "proppy@google.com" - }, - { - "name": "Patrick Costello", - "email": "pcostell@google.com" - }, - { - "name": "Ryan Seys", - "email": "ryan@ryanseys.com" - }, - { - "name": "Silvano Luciani", - "email": "silvano@google.com" - }, - { - "name": "Stephen Sawchuk", - "email": "sawchuk@gmail.com" - } - ], + "version": "0.16.0", + "license": "Apache-2.0", + "author": "Google Inc.", + "engines": { + "node": ">=4.0.0" + }, + "repository": "googleapis/nodejs-pubsub", "main": "./src/index.js", "files": [ "protos", @@ -37,7 +16,6 @@ "CONTRIBUTORS", "LICENSE" ], - "repository": "googlecloudplatform/google-cloud-node", "keywords": [ "google apis client", "google api client", @@ -50,30 +28,66 @@ "google pubsub", "pubsub" ], + "contributors": [ + "Ace Nassri ", + "Alexander Fenster ", + "Ali Ijaz Sheikh ", + "Dave Gramlich ", + "David Fox ", + "Dennis ", + "Eric Uldall ", + "Jan Pretzel ", + "Jason Dobry ", + "Jun Mukai ", + "Justin King ", + "Matthew Arbesfeld ", + "Song Wang ", + "Stephen Sawchuk ", + "Tim Swast ", + "mkamioner " + ], + "scripts": { + "system-test": "repo-tools test run --cmd mocha -- system-test/*.js --no-timeouts", + "cover": "nyc --reporter=lcov mocha --require intelli-espower-loader test/*.js && nyc report", + "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", + "test-no-cover": "repo-tools test run --cmd mocha -- test/*.js --no-timeouts", + "test": "repo-tools test run --cmd npm -- run cover", + "lint": "repo-tools lint --cmd eslint -- src/ samples/ system-test/ test/", + "prettier": "repo-tools exec -- prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", + "docs": "repo-tools exec -- jsdoc -c .jsdoc.js", + "publish-module": "node ../../scripts/publish.js pubsub", + "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" + }, "dependencies": { "@google-cloud/common": "^0.13.0", "arrify": "^1.0.0", "async-each": "^1.0.1", - "extend": "^3.0.0", + "extend": "^3.0.1", "google-auto-auth": "^0.7.1", - "google-gax": "^0.13.0", + "google-gax": "^0.14.2", "google-proto-files": "^0.13.1", + "grpc": "^1.7.2", "is": "^3.0.1", + "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", - "uuid": "^3.0.1" + "protobufjs": "^6.8.1", + "uuid": "^3.1.0" }, "devDependencies": { - "async": "^2.1.4", - "mocha": "^3.0.1", + "@google-cloud/nodejs-repo-tools": "^2.1.3", + "async": "^2.6.0", + "codecov": "^3.0.0", + "eslint": "^4.11.0", + "eslint-config-prettier": "^2.8.0", + "eslint-plugin-node": "^5.2.1", + "eslint-plugin-prettier": "^2.3.1", + "ink-docstrap": "^1.3.2", + "intelli-espower-loader": "^1.0.1", + "jsdoc": "^3.5.5", + "mocha": "^3.5.3", + "nyc": "^11.3.0", + "power-assert": "^1.4.4", + "prettier": "^1.9.1", "proxyquire": "^1.7.10" - }, - "scripts": { - "publish-module": "node ../../scripts/publish.js pubsub", - "test": "mocha test/*.js", - "system-test": "mocha system-test/*.js --no-timeouts --bail" - }, - "license": "Apache-2.0", - "engines": { - "node": ">=4.0.0" } } diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index a5a57604022..058e0ee1776 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -28,6 +28,7 @@ option go_package = "google.golang.org/genproto/googleapis/pubsub/v1;pubsub"; option java_multiple_files = true; option java_outer_classname = "PubsubProto"; option java_package = "com.google.pubsub.v1"; +option php_namespace = "Google\\Cloud\\PubSub\\V1"; // The service that an application uses to manipulate subscriptions and to @@ -44,23 +45,36 @@ service Subscriber { // The generated name is populated in the returned Subscription object. // Note that for REST API requests, you must specify a name in the request. rpc CreateSubscription(Subscription) returns (Subscription) { - option (google.api.http) = { put: "/v1/{name=projects/*/subscriptions/*}" body: "*" }; + option (google.api.http) = { + put: "/v1/{name=projects/*/subscriptions/*}" + body: "*" }; } // Gets the configuration details of a subscription. rpc GetSubscription(GetSubscriptionRequest) returns (Subscription) { - option (google.api.http) = { get: "/v1/{subscription=projects/*/subscriptions/*}" }; + option (google.api.http) = { + get: "/v1/{subscription=projects/*/subscriptions/*}" + }; } // Updates an existing subscription. Note that certain properties of a // subscription, such as its topic, are not modifiable. + // NOTE: The style guide requires body: "subscription" instead of body: "*". + // Keeping the latter for internal consistency in V1, however it should be + // corrected in V2. See + // https://cloud.google.com/apis/design/standard_methods#update for details. rpc UpdateSubscription(UpdateSubscriptionRequest) returns (Subscription) { - option (google.api.http) = { patch: "/v1/{subscription.name=projects/*/subscriptions/*}" body: "*" }; + option (google.api.http) = { + patch: "/v1/{subscription.name=projects/*/subscriptions/*}" + body: "*" + }; } // Lists matching subscriptions. rpc ListSubscriptions(ListSubscriptionsRequest) returns (ListSubscriptionsResponse) { - option (google.api.http) = { get: "/v1/{project=projects/*}/subscriptions" }; + option (google.api.http) = { + get: "/v1/{project=projects/*}/subscriptions" + }; } // Deletes an existing subscription. All messages retained in the subscription @@ -69,7 +83,9 @@ service Subscriber { // the same name, but the new one has no association with the old // subscription or its topic unless the same topic is specified. rpc DeleteSubscription(DeleteSubscriptionRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { delete: "/v1/{subscription=projects/*/subscriptions/*}" }; + option (google.api.http) = { + delete: "/v1/{subscription=projects/*/subscriptions/*}" + }; } // Modifies the ack deadline for a specific message. This method is useful @@ -78,7 +94,10 @@ service Subscriber { // processing was interrupted. Note that this does not modify the // subscription-level `ackDeadlineSeconds` used for subsequent messages. rpc ModifyAckDeadline(ModifyAckDeadlineRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline" body: "*" }; + option (google.api.http) = { + post: "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline" + body: "*" + }; } // Acknowledges the messages associated with the `ack_ids` in the @@ -89,7 +108,10 @@ service Subscriber { // but such a message may be redelivered later. Acknowledging a message more // than once will not result in an error. rpc Acknowledge(AcknowledgeRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:acknowledge" body: "*" }; + option (google.api.http) = { + post: "/v1/{subscription=projects/*/subscriptions/*}:acknowledge" + body: "*" + }; } // Pulls messages from the server. Returns an empty list if there are no @@ -97,7 +119,10 @@ service Subscriber { // there are too many concurrent pull requests pending for the given // subscription. rpc Pull(PullRequest) returns (PullResponse) { - option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:pull" body: "*" }; + option (google.api.http) = { + post: "/v1/{subscription=projects/*/subscriptions/*}:pull" + body: "*" + }; } // (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will @@ -121,12 +146,16 @@ service Subscriber { // attributes of a push subscription. Messages will accumulate for delivery // continuously through the call regardless of changes to the `PushConfig`. rpc ModifyPushConfig(ModifyPushConfigRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig" body: "*" }; + option (google.api.http) = { + post: "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig" + body: "*" }; } // Lists the existing snapshots. rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) { - option (google.api.http) = { get: "/v1/{project=projects/*}/snapshots" }; + option (google.api.http) = { + get: "/v1/{project=projects/*}/snapshots" + }; } // Creates a snapshot from the requested subscription. @@ -140,7 +169,22 @@ service Subscriber { // The generated name is populated in the returned Snapshot object. // Note that for REST API requests, you must specify a name in the request. rpc CreateSnapshot(CreateSnapshotRequest) returns (Snapshot) { - option (google.api.http) = { put: "/v1/{name=projects/*/snapshots/*}" body: "*" }; + option (google.api.http) = { + put: "/v1/{name=projects/*/snapshots/*}" + body: "*" + }; + } + + // Updates an existing snapshot. Note that certain properties of a snapshot + // are not modifiable. + // NOTE: The style guide requires body: "snapshot" instead of body: "*". + // Keeping the latter for internal consistency in V1, however it should be + // corrected in V2. See + // https://cloud.google.com/apis/design/standard_methods#update for details. + rpc UpdateSnapshot(UpdateSnapshotRequest) returns (Snapshot) { + option (google.api.http) = { + patch: "/v1/{snapshot.name=projects/*/snapshots/*}" + body: "*" }; } // Removes an existing snapshot. All messages retained in the snapshot @@ -148,13 +192,18 @@ service Subscriber { // created with the same name, but the new one has no association with the old // snapshot or its subscription, unless the same subscription is specified. rpc DeleteSnapshot(DeleteSnapshotRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { delete: "/v1/{snapshot=projects/*/snapshots/*}" }; + option (google.api.http) = { + delete: "/v1/{snapshot=projects/*/snapshots/*}" + }; } // Seeks an existing subscription to a point in time or to a given snapshot, // whichever is provided in the request. rpc Seek(SeekRequest) returns (SeekResponse) { - option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:seek" body: "*" }; + option (google.api.http) = { + post: "/v1/{subscription=projects/*/subscriptions/*}:seek" + body: "*" + }; } } @@ -163,29 +212,53 @@ service Subscriber { service Publisher { // Creates the given topic with the given name. rpc CreateTopic(Topic) returns (Topic) { - option (google.api.http) = { put: "/v1/{name=projects/*/topics/*}" body: "*" }; + option (google.api.http) = { + put: "/v1/{name=projects/*/topics/*}" + body: "*" + }; + } + + // Updates an existing topic. Note that certain properties of a topic are not + // modifiable. Options settings follow the style guide: + // NOTE: The style guide requires body: "topic" instead of body: "*". + // Keeping the latter for internal consistency in V1, however it should be + // corrected in V2. See + // https://cloud.google.com/apis/design/standard_methods#update for details. + rpc UpdateTopic(UpdateTopicRequest) returns (Topic) { + option (google.api.http) = { + patch: "/v1/{topic.name=projects/*/topics/*}" + body: "*" }; } // Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic // does not exist. The message payload must not be empty; it must contain // either a non-empty data field, or at least one attribute. rpc Publish(PublishRequest) returns (PublishResponse) { - option (google.api.http) = { post: "/v1/{topic=projects/*/topics/*}:publish" body: "*" }; + option (google.api.http) = { + post: "/v1/{topic=projects/*/topics/*}:publish" + body: "*" + }; } // Gets the configuration of a topic. rpc GetTopic(GetTopicRequest) returns (Topic) { - option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}" }; + option (google.api.http) = { + get: "/v1/{topic=projects/*/topics/*}" + }; } // Lists matching topics. rpc ListTopics(ListTopicsRequest) returns (ListTopicsResponse) { - option (google.api.http) = { get: "/v1/{project=projects/*}/topics" }; + option (google.api.http) = { + get: "/v1/{project=projects/*}/topics" + }; } // Lists the name of the subscriptions for this topic. rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) returns (ListTopicSubscriptionsResponse) { - option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}/subscriptions" }; + option (google.api.http) = { + get: "/v1/{topic=projects/*/topics/*}/subscriptions" + }; } // Deletes the topic with the given name. Returns `NOT_FOUND` if the topic @@ -194,7 +267,9 @@ service Publisher { // configuration or subscriptions. Existing subscriptions to this topic are // not deleted, but their `topic` field is set to `_deleted-topic_`. rpc DeleteTopic(DeleteTopicRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { delete: "/v1/{topic=projects/*/topics/*}" }; + option (google.api.http) = { + delete: "/v1/{topic=projects/*/topics/*}" + }; } } @@ -207,6 +282,9 @@ message Topic { // signs (`%`). It must be between 3 and 255 characters in length, and it // must not start with `"goog"`. string name = 1; + + // User labels. + map labels = 2; } // A message data and its attributes. The message payload must not be empty; @@ -237,6 +315,16 @@ message GetTopicRequest { string topic = 1; } +// Request for the UpdateTopic method. +message UpdateTopicRequest { + // The topic to update. + Topic topic = 1; + + // Indicates which fields in the provided topic to update. + // Must be specified and non-empty. + google.protobuf.FieldMask update_mask = 2; +} + // Request for the Publish method. message PublishRequest { // The messages in the request will be published on this topic. @@ -368,6 +456,9 @@ message Subscription { // can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 // minutes. google.protobuf.Duration message_retention_duration = 8; + + // User labels. + map labels = 9; } // Configuration for a push delivery endpoint. @@ -604,6 +695,16 @@ message CreateSnapshotRequest { string subscription = 2; } +// Request for the UpdateSnapshot method. +message UpdateSnapshotRequest { + // The updated snpashot object. + Snapshot snapshot = 1; + + // Indicates which fields in the provided snapshot to update. + // Must be specified and non-empty. + google.protobuf.FieldMask update_mask = 2; +} + // A snapshot resource. message Snapshot { // The name of the snapshot. @@ -622,6 +723,9 @@ message Snapshot { // will always capture this 3-day-old backlog as long as the snapshot // exists -- will expire in 4 days. google.protobuf.Timestamp expire_time = 3; + + // User labels. + map labels = 4; } // Request for the `ListSnapshots` method. diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index a4616c41760..3257b5556b6 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -24,14 +24,10 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); var each = require('async-each'); var events = require('events'); -var grpc = require('google-gax').grpc().grpc; var is = require('is'); var util = require('util'); var uuid = require('uuid'); -var PKG = require('../package.json'); -var v1 = require('./v1'); - var CHANNEL_READY_EVENT = 'channel.ready'; var CHANNEL_ERROR_EVENT = 'channel.error'; @@ -49,7 +45,7 @@ var RETRY_CODES = [ 10, // aborted 13, // internal error 14, // unavailable - 15 // dataloss + 15, // dataloss ]; /** @@ -66,6 +62,7 @@ var RETRY_CODES = [ */ function ConnectionPool(subscription) { this.subscription = subscription; + this.pubsub = subscription.pubsub; this.projectId = subscription.projectId; this.connections = new Map(); @@ -79,20 +76,11 @@ function ConnectionPool(subscription) { this.settings = { maxConnections: subscription.maxConnections || 5, - ackDeadline: subscription.ackDeadline || 10000 + ackDeadline: subscription.ackDeadline || 10000, }; this.queue = []; - // grpc related fields we need since we're bypassing gax - this.metadata_ = new grpc.Metadata(); - - this.metadata_.add('x-goog-api-client', [ - 'gl-node/' + process.versions.node, - 'gccl/' + PKG.version, - 'grpc/' + require('grpc/package.json').version - ].join(' ')); - events.EventEmitter.call(this); this.open(); } @@ -175,9 +163,13 @@ ConnectionPool.prototype.close = function(callback) { this.failedConnectionAttempts = 0; this.noConnectionsTime = 0; - each(connections, function(connection, onEndCallback) { - connection.end(onEndCallback); - }, callback); + each( + connections, + function(connection, onEndCallback) { + connection.end(onEndCallback); + }, + callback + ); }; /** @@ -194,7 +186,7 @@ ConnectionPool.prototype.createConnection = function() { } var id = uuid.v4(); - var connection = client.streamingPull(self.metadata_); + var connection = client.streamingPull(); var errorImmediateHandle; if (self.isPaused) { @@ -211,8 +203,10 @@ ConnectionPool.prototype.createConnection = function() { .on('status', onConnectionStatus) .write({ subscription: common.util.replaceProjectIdToken( - self.subscription.name, self.projectId), - streamAckDeadlineSeconds: self.settings.ackDeadline / 1000 + self.subscription.name, + self.projectId + ), + streamAckDeadlineSeconds: self.settings.ackDeadline / 1000, }); self.connections.set(id, connection); @@ -307,7 +301,7 @@ ConnectionPool.prototype.createMessage = function(connectionId, resp) { }, nack: function() { self.subscription.nack_(this); - } + }, }; }; @@ -330,17 +324,6 @@ ConnectionPool.prototype.getAndEmitChannelState = function() { return; } - var READY_STATE = 2; - - var channel = client.getChannel(); - var connectivityState = channel.getConnectivityState(false); - - if (connectivityState === READY_STATE) { - self.isGettingChannelState = false; - self.emit(CHANNEL_READY_EVENT); - return; - } - var elapsedTimeWithoutConnection = 0; var now = Date.now(); var deadline; @@ -373,71 +356,7 @@ ConnectionPool.prototype.getAndEmitChannelState = function() { * @param {object} callback.client - The Subscriber client. */ ConnectionPool.prototype.getClient = function(callback) { - if (this.client) { - callback(null, this.client); - return; - } - - var self = this; - var pubsub = this.subscription.pubsub; - - this.getCredentials(function(err, credentials) { - if (err) { - callback(err); - return; - } - - var Subscriber = v1(pubsub.options).Subscriber; - var address = v1.SERVICE_ADDRESS; - - if (pubsub.isEmulator) { - address = pubsub.options.servicePath; - - if (pubsub.options.port) { - address += ':' + pubsub.options.port; - } - } - - self.client = new Subscriber(address, credentials, { - 'grpc.keepalive_time_ms': MAX_TIMEOUT, - 'grpc.max_receive_message_length': 20000001, - 'grpc.primary_user_agent': common.util.getUserAgentFromPackageJson(PKG) - }); - - callback(null, self.client); - }); -}; - -/** - * Get/create client credentials. - * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error occurred while getting the client. - * @param {object} callback.credentials - The client credentials. - */ -ConnectionPool.prototype.getCredentials = function(callback) { - var self = this; - var pubsub = this.subscription.pubsub; - - if (pubsub.isEmulator) { - setImmediate(callback, null, grpc.credentials.createInsecure()); - return; - } - - pubsub.auth.getAuthClient(function(err, authClient) { - if (err) { - callback(err); - return; - } - - var credentials = grpc.credentials.combineChannelCredentials( - grpc.credentials.createSsl(), - grpc.credentials.createFromGoogleCredential(authClient) - ); - - self.projectId = pubsub.auth.projectId; - callback(null, credentials); - }); + return this.pubsub.getClient_({client: 'SubscriberClient'}, callback); }; /** @@ -503,8 +422,9 @@ ConnectionPool.prototype.queueConnection = function() { var delay = 0; if (this.failedConnectionAttempts > 0) { - delay = (Math.pow(2, this.failedConnectionAttempts) * 1000) + - (Math.floor(Math.random() * 1000)); + delay = + Math.pow(2, this.failedConnectionAttempts) * 1000 + + Math.floor(Math.random() * 1000); } var timeoutHandle = setTimeout(createConnection, delay); @@ -545,8 +465,8 @@ ConnectionPool.prototype.shouldReconnect = function(status) { return false; } - var exceededRetryLimit = this.noConnectionsTime && - Date.now() - this.noConnectionsTime > MAX_TIMEOUT; + var exceededRetryLimit = + this.noConnectionsTime && Date.now() - this.noConnectionsTime > MAX_TIMEOUT; if (exceededRetryLimit) { return false; diff --git a/handwritten/pubsub/src/histogram.js b/handwritten/pubsub/src/histogram.js index e0674851721..f2ac985b825 100644 --- a/handwritten/pubsub/src/histogram.js +++ b/handwritten/pubsub/src/histogram.js @@ -61,7 +61,7 @@ Histogram.prototype.add = function(value) { Histogram.prototype.percentile = function(percent) { percent = Math.min(percent, 100); - var target = this.length - (this.length * (percent / 100)); + var target = this.length - this.length * (percent / 100); var keys = Array.from(this.data.keys()); var key; diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index c0b81953a90..fc6588ea148 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -101,15 +101,18 @@ IAM.prototype.getPolicy = function(gaxOpts, callback) { } var reqOpts = { - resource: this.id + resource: this.id, }; - this.request({ - client: 'subscriberClient', - method: 'getIamPolicy', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, callback); + this.request( + { + client: 'SubscriberClient', + method: 'getIamPolicy', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); }; /** @@ -119,7 +122,7 @@ IAM.prototype.getPolicy = function(gaxOpts, callback) { * * @param {object} policy - The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). * @param {array=} policy.bindings - Bindings associate members with roles. - * @param {object[]=} policy.rules - Rules to be applied to the policy. + * @param {Array=} policy.rules - Rules to be applied to the policy. * @param {string=} policy.etag - Etags are used to perform a read-modify-write. * @param {object=} gaxOptions - Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. @@ -166,15 +169,18 @@ IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { var reqOpts = { resource: this.id, - policy + policy, }; - this.request({ - client: 'subscriberClient', - method: 'setIamPolicy', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, callback); + this.request( + { + client: 'SubscriberClient', + method: 'setIamPolicy', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); }; /** @@ -246,28 +252,31 @@ IAM.prototype.testPermissions = function(permissions, gaxOpts, callback) { var reqOpts = { resource: this.id, - permissions: arrify(permissions) + permissions: arrify(permissions), }; - this.request({ - client: 'subscriberClient', - method: 'testIamPermissions', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function(err, resp) { - if (err) { - callback(err, null, resp); - return; - } + this.request( + { + client: 'SubscriberClient', + method: 'testIamPermissions', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } - var availablePermissions = arrify(resp.permissions); - var permissionHash = permissions.reduce(function(acc, permission) { - acc[permission] = availablePermissions.indexOf(permission) > -1; - return acc; - }, {}); + var availablePermissions = arrify(resp.permissions); + var permissionHash = permissions.reduce(function(acc, permission) { + acc[permission] = availablePermissions.indexOf(permission) > -1; + return acc; + }, {}); - callback(null, permissionHash, resp); - }); + callback(null, permissionHash, resp); + } + ); }; /*! Developer Documentation diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 93f18c030d8..ec84e038ce3 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -75,12 +75,27 @@ function PubSub(options) { return new PubSub(options); } - this.options = extend({ - scopes: v1.ALL_SCOPES, - 'grpc.max_receive_message_length': 20000001, - libName: 'gccl', - libVersion: PKG.version - }, options); + // Determine what scopes are needed. + // It is the union of the scopes on both clients. + const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; + const allScopes = {}; + + for (let clientClass of clientClasses) { + for (let scope of clientClass.scopes) { + allScopes[scope] = true; + } + } + + this.options = extend( + { + 'grpc.keepalive_time_ms': 300000, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version, + scopes: Object.keys(allScopes), + }, + options + ); this.isEmulator = false; this.determineBaseUrl_(); @@ -178,26 +193,29 @@ PubSub.prototype.createSubscription = function(topic, name, options, callback) { var reqOpts = extend(metadata, { topic: topic.name, - name: subscription.name + name: subscription.name, }); delete reqOpts.gaxOpts; delete reqOpts.flowControl; - this.request({ - client: 'subscriberClient', - method: 'createSubscription', - reqOpts: reqOpts, - gaxOpts: options.gaxOpts - }, function(err, resp) { - if (err && err.code !== 6) { - callback(err, null, resp); - return; - } + this.request( + { + client: 'SubscriberClient', + method: 'createSubscription', + reqOpts: reqOpts, + gaxOpts: options.gaxOpts, + }, + function(err, resp) { + if (err && err.code !== 6) { + callback(err, null, resp); + return; + } - subscription.metadata = resp; - callback(null, subscription, resp); - }); + subscription.metadata = resp; + callback(null, subscription, resp); + } + ); }; /** @@ -233,7 +251,7 @@ PubSub.prototype.createTopic = function(name, gaxOpts, callback) { var topic = this.topic(name); var reqOpts = { - name: topic.name + name: topic.name, }; if (is.fn(gaxOpts)) { @@ -241,20 +259,23 @@ PubSub.prototype.createTopic = function(name, gaxOpts, callback) { gaxOpts = {}; } - this.request({ - client: 'publisherClient', - method: 'createTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function(err, resp) { - if (err) { - callback(err, null, resp); - return; - } + this.request( + { + client: 'PublisherClient', + method: 'createTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } - topic.metadata = resp; - callback(null, topic, resp); - }); + topic.metadata = resp; + callback(null, topic, resp); + } + ); }; /** @@ -324,35 +345,44 @@ PubSub.prototype.getSnapshots = function(options, callback) { options = {}; } - var reqOpts = extend({ - project: 'projects/' + this.projectId - }, options); + var reqOpts = extend( + { + project: 'projects/' + this.projectId, + }, + options + ); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - var gaxOpts = extend({ - autoPaginate: options.autoPaginate - }, options.gaxOpts); - - this.request({ - client: 'subscriberClient', - method: 'listSnapshots', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function() { - var snapshots = arguments[1]; - - if (snapshots) { - arguments[1] = snapshots.map(function(snapshot) { - var snapshotInstance = self.snapshot(snapshot.name); - snapshotInstance.metadata = snapshot; - return snapshotInstance; - }); - } + var gaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + + this.request( + { + client: 'SubscriberClient', + method: 'listSnapshots', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function() { + var snapshots = arguments[1]; + + if (snapshots) { + arguments[1] = snapshots.map(function(snapshot) { + var snapshotInstance = self.snapshot(snapshot.name); + snapshotInstance.metadata = snapshot; + return snapshotInstance; + }); + } - callback.apply(null, arguments); - }); + callback.apply(null, arguments); + } + ); }; /** @@ -382,8 +412,9 @@ PubSub.prototype.getSnapshots = function(options, callback) { * this.end(); * }); */ -PubSub.prototype.getSnapshotsStream = - common.paginator.streamify('getSnapshots'); +PubSub.prototype.getSnapshotsStream = common.paginator.streamify( + 'getSnapshots' +); /** * Get a list of the subscriptions registered to all of your project's topics. @@ -445,35 +476,40 @@ PubSub.prototype.getSubscriptions = function(options, callback) { return topic.getSubscriptions(options, callback); } - var reqOpts = extend({}, options); reqOpts.project = 'projects/' + this.projectId; delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - var gaxOpts = extend({ - autoPaginate: options.autoPaginate - }, options.gaxOpts); - - this.request({ - client: 'subscriberClient', - method: 'listSubscriptions', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function() { - var subscriptions = arguments[1]; - - if (subscriptions) { - arguments[1] = subscriptions.map(function(sub) { - var subscriptionInstance = self.subscription(sub.name); - subscriptionInstance.metadata = sub; - return subscriptionInstance; - }); - } + var gaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + + this.request( + { + client: 'SubscriberClient', + method: 'listSubscriptions', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function() { + var subscriptions = arguments[1]; + + if (subscriptions) { + arguments[1] = subscriptions.map(function(sub) { + var subscriptionInstance = self.subscription(sub.name); + subscriptionInstance.metadata = sub; + return subscriptionInstance; + }); + } - callback.apply(null, arguments); - }); + callback.apply(null, arguments); + } + ); }; /** @@ -503,8 +539,9 @@ PubSub.prototype.getSubscriptions = function(options, callback) { * this.end(); * }); */ -PubSub.prototype.getSubscriptionsStream = - common.paginator.streamify('getSubscriptions'); +PubSub.prototype.getSubscriptionsStream = common.paginator.streamify( + 'getSubscriptions' +); /** * Get a list of the topics registered to your project. You may optionally @@ -554,35 +591,44 @@ PubSub.prototype.getTopics = function(options, callback) { options = {}; } - var reqOpts = extend({ - project: 'projects/' + this.projectId - }, options); + var reqOpts = extend( + { + project: 'projects/' + this.projectId, + }, + options + ); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - var gaxOpts = extend({ - autoPaginate: options.autoPaginate - }, options.gaxOpts); - - this.request({ - client: 'publisherClient', - method: 'listTopics', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function() { - var topics = arguments[1]; - - if (topics) { - arguments[1] = topics.map(function(topic) { - var topicInstance = self.topic(topic.name); - topicInstance.metadata = topic; - return topicInstance; - }); - } + var gaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + + this.request( + { + client: 'PublisherClient', + method: 'listTopics', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function() { + var topics = arguments[1]; + + if (topics) { + arguments[1] = topics.map(function(topic) { + var topicInstance = self.topic(topic.name); + topicInstance.metadata = topic; + return topicInstance; + }); + } - callback.apply(null, arguments); - }); + callback.apply(null, arguments); + } + ); }; /** @@ -615,7 +661,7 @@ PubSub.prototype.getTopics = function(options, callback) { PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); /** - * Funnel all API requests through this method, to be sure we have a project ID. + * Get the PubSub client object. * * @private * @@ -625,15 +671,11 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); * @param {object} config.reqOpts - Request options. * @param {function=} callback - The callback function. */ -PubSub.prototype.request = function(config, callback) { +PubSub.prototype.getClient_ = function(config, callback) { var self = this; - if (global.GCLOUD_SANDBOX_ENV) { - return; - } - - var hasProjectId = this.projectId && - this.projectId !== PROJECT_ID_PLACEHOLDER; + var hasProjectId = + this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; if (!hasProjectId && !this.isEmulator) { this.auth.getProjectId(function(err, projectId) { @@ -643,7 +685,7 @@ PubSub.prototype.request = function(config, callback) { } self.projectId = projectId; - self.request(config, callback); + self.getClient_(config, callback); }); return; } @@ -652,14 +694,38 @@ PubSub.prototype.request = function(config, callback) { if (!gaxClient) { // Lazily instantiate client. - gaxClient = v1(this.options)[config.client](this.options); + gaxClient = new v1[config.client](this.options); this.api[config.client] = gaxClient; } - var reqOpts = extend(true, {}, config.reqOpts); - reqOpts = common.util.replaceProjectIdToken(reqOpts, this.projectId); + callback(null, gaxClient); +}; + +/** + * Funnel all API requests through this method, to be sure we have a project ID. + * + * @private + * + * @param {object} config - Configuration object. + * @param {object} config.gaxOpts - GAX options. + * @param {function} config.method - The gax method to call. + * @param {object} config.reqOpts - Request options. + * @param {function=} callback - The callback function. + */ +PubSub.prototype.request = function(config, callback) { + var self = this; + + this.getClient_(config, function(err, client) { + if (err) { + callback(err); + return; + } + + var reqOpts = extend(true, {}, config.reqOpts); + reqOpts = common.util.replaceProjectIdToken(reqOpts, self.projectId); - gaxClient[config.method](reqOpts, config.gaxOpts, callback); + client[config.method](reqOpts, config.gaxOpts, callback); + }); }; /** @@ -751,7 +817,7 @@ PubSub.prototype.topic = function(name, options) { common.paginator.extend(PubSub, [ 'getSnapshots', 'getSubscriptions', - 'getTopics' + 'getTopics', ]); /*! Developer Documentation @@ -760,12 +826,7 @@ common.paginator.extend(PubSub, [ * that a callback is omitted. */ common.util.promisifyAll(PubSub, { - exclude: [ - 'request', - 'snapshot', - 'subscription', - 'topic' - ] + exclude: ['request', 'snapshot', 'subscription', 'topic'], }); module.exports = PubSub; diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index e7e9724230d..f1b9c5adf92 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -53,13 +53,17 @@ var is = require('is'); * var publisher = topic.publisher(); */ function Publisher(topic, options) { - options = extend(true, { - batching: { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 1000 - } - }, options); + options = extend( + true, + { + batching: { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 1000, + }, + }, + options + ); this.topic = topic; @@ -71,15 +75,15 @@ function Publisher(topic, options) { this.inventory_ = { callbacks: [], queued: [], - bytes: 0 + bytes: 0, }; this.settings = { batching: { maxBytes: Math.min(options.batching.maxBytes, Math.pow(1024, 2) * 9), maxMessages: Math.min(options.batching.maxMessages, 1000), - maxMilliseconds: options.batching.maxMilliseconds - } + maxMilliseconds: options.batching.maxMilliseconds, + }, }; this.timeoutHandle_ = null; @@ -99,7 +103,7 @@ function Publisher(topic, options) { * @param {string} callback.messageId - The id for the message. * * @example - * var data = new Buffer('Hello, world!'); + * var data = Buffer.from('Hello, world!'); * * var callback = function(err, messageId) { * if (err) { @@ -138,7 +142,7 @@ Publisher.prototype.publish = function(data, attrs, callback) { // if this message puts us over the maxBytes option, then let's ship // what we have and add it to the next batch - if ((this.inventory_.bytes + data.length) > opts.maxBytes) { + if (this.inventory_.bytes + data.length > opts.maxBytes) { this.publish_(); } @@ -157,7 +161,9 @@ Publisher.prototype.publish = function(data, attrs, callback) { // otherwise let's set a timeout to send the next batch if (!this.timeoutHandle_) { this.timeoutHandle_ = setTimeout( - this.publish_.bind(this), opts.maxMilliseconds); + this.publish_.bind(this), + opts.maxMilliseconds + ); } }; @@ -179,23 +185,26 @@ Publisher.prototype.publish_ = function() { var reqOpts = { topic: this.topic.name, - messages: messages + messages: messages, }; - this.topic.request({ - client: 'publisherClient', - method: 'publish', - reqOpts: reqOpts - }, function(err, resp) { - var messageIds = arrify(resp && resp.messageIds); - - each(callbacks, function(callback, next) { - var messageId = messageIds[callbacks.indexOf(callback)]; - - callback(err, messageId); - next(); - }); - }); + this.topic.request( + { + client: 'PublisherClient', + method: 'publish', + reqOpts: reqOpts, + }, + function(err, resp) { + var messageIds = arrify(resp && resp.messageIds); + + each(callbacks, function(callback, next) { + var messageId = messageIds[callbacks.indexOf(callback)]; + + callback(err, messageId); + next(); + }); + } + ); }; /** @@ -210,7 +219,7 @@ Publisher.prototype.publish_ = function() { Publisher.prototype.queue_ = function(data, attrs, callback) { this.inventory_.queued.push({ data: data, - attributes: attrs + attributes: attrs, }); this.inventory_.bytes += data.length; @@ -223,7 +232,7 @@ Publisher.prototype.queue_ = function(data, attrs, callback) { * that a callback is omitted. */ common.util.promisifyAll(Publisher, { - singular: true + singular: true, }); module.exports = Publisher; diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index ff25e0f1340..dbb587b1249 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -190,16 +190,19 @@ Snapshot.formatName_ = function(projectId, name) { */ Snapshot.prototype.delete = function(callback) { var reqOpts = { - snapshot: this.name + snapshot: this.name, }; callback = callback || common.util.noop; - this.parent.request({ - client: 'subscriberClient', - method: 'deleteSnapshot', - reqOpts: reqOpts - }, callback); + this.parent.request( + { + client: 'SubscriberClient', + method: 'deleteSnapshot', + reqOpts: reqOpts, + }, + callback + ); }; /*! Developer Documentation diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index d5bbb5f8890..3f1cd0f958c 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -172,13 +172,16 @@ function Subscription(pubsub, name, options) { lease: [], ack: [], nack: [], - bytes: 0 + bytes: 0, }; - this.flowControl = extend({ - maxBytes: os.freemem() * 0.2, - maxMessages: Infinity - }, options.flowControl); + this.flowControl = extend( + { + maxBytes: os.freemem() * 0.2, + maxMessages: Infinity, + }, + options.flowControl + ); this.flushTimeoutHandle_ = null; this.leaseTimeoutHandle_ = null; @@ -246,7 +249,7 @@ Subscription.formatMetadata_ = function(metadata) { formatted.messageRetentionDuration = { seconds: metadata.messageRetentionDuration, - nanos: 0 + nanos: 0, }; } @@ -254,7 +257,7 @@ Subscription.formatMetadata_ = function(metadata) { delete formatted.pushEndpoint; formatted.pushConfig = { - pushEndpoint: metadata.pushEndpoint + pushEndpoint: metadata.pushEndpoint, }; } @@ -315,12 +318,12 @@ Subscription.prototype.acknowledge_ = function(ackIds, connId) { if (!this.isConnected_()) { promise = common.util.promisify(this.request).call(this, { - client: 'subscriberClient', + client: 'SubscriberClient', method: 'acknowledge', reqOpts: { subscription: this.name, - ackIds - } + ackIds, + }, }); } else { promise = new Promise(function(resolve, reject) { @@ -330,7 +333,7 @@ Subscription.prototype.acknowledge_ = function(ackIds, connId) { return; } - connection.write({ ackIds }, resolve); + connection.write({ackIds}, resolve); }); }); } @@ -474,23 +477,26 @@ Subscription.prototype.createSnapshot = function(name, gaxOpts, callback) { var reqOpts = { name: snapshot.name, - subscription: this.name + subscription: this.name, }; - this.request({ - client: 'subscriberClient', - method: 'createSnapshot', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function(err, resp) { - if (err) { - callback(err, null, resp); - return; - } + this.request( + { + client: 'SubscriberClient', + method: 'createSnapshot', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } - snapshot.metadata = resp; - callback(null, snapshot, resp); - }); + snapshot.metadata = resp; + callback(null, snapshot, resp); + } + ); }; /** @@ -527,22 +533,25 @@ Subscription.prototype.delete = function(gaxOpts, callback) { callback = callback || common.util.noop; var reqOpts = { - subscription: this.name + subscription: this.name, }; - this.request({ - client: 'subscriberClient', - method: 'deleteSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function(err, resp) { - if (!err) { - self.removeAllListeners(); - self.close(); - } + this.request( + { + client: 'SubscriberClient', + method: 'deleteSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, resp) { + if (!err) { + self.removeAllListeners(); + self.close(); + } - callback(err, resp); - }); + callback(err, resp); + } + ); }; /** @@ -704,21 +713,24 @@ Subscription.prototype.getMetadata = function(gaxOpts, callback) { } var reqOpts = { - subscription: this.name + subscription: this.name, }; - this.request({ - client: 'subscriberClient', - method: 'getSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function(err, apiResponse) { - if (!err) { - self.metadata = apiResponse; - } + this.request( + { + client: 'SubscriberClient', + method: 'getSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, apiResponse) { + if (!err) { + self.metadata = apiResponse; + } - callback(err, apiResponse); - }); + callback(err, apiResponse); + } + ); }; /** @@ -741,8 +753,10 @@ Subscription.prototype.isConnected_ = function() { * @return {boolean} */ Subscription.prototype.hasMaxMessages_ = function() { - return this.inventory_.lease.length >= this.flowControl.maxMessages || - this.inventory_.bytes >= this.flowControl.maxBytes; + return ( + this.inventory_.lease.length >= this.flowControl.maxMessages || + this.inventory_.bytes >= this.flowControl.maxBytes + ); }; /** @@ -756,7 +770,10 @@ Subscription.prototype.hasMaxMessages_ = function() { */ Subscription.prototype.leaseMessage_ = function(message) { this.modifyAckDeadline_( - message.ackId, this.ackDeadline / 1000, message.connectionId); + message.ackId, + this.ackDeadline / 1000, + message.connectionId + ); this.inventory_.lease.push(message.ackId); this.inventory_.bytes += message.length; @@ -817,13 +834,13 @@ Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { if (!this.isConnected_()) { promise = common.util.promisify(this.request).call(this, { - client: 'subscriberClient', + client: 'SubscriberClient', method: 'modifyAckDeadline', reqOpts: { subscription: self.name, ackDeadlineSeconds: deadline, - ackIds - } + ackIds, + }, }); } else { promise = new Promise(function(resolve, reject) { @@ -833,10 +850,13 @@ Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { return; } - connection.write({ - modifyDeadlineAckIds: ackIds, - modifyDeadlineSeconds: Array(ackIds.length).fill(deadline) - }, resolve); + connection.write( + { + modifyDeadlineAckIds: ackIds, + modifyDeadlineSeconds: Array(ackIds.length).fill(deadline), + }, + resolve + ); }); }); } @@ -889,15 +909,18 @@ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { var reqOpts = { subscription: this.name, - pushConfig: config + pushConfig: config, }; - this.request({ - client: 'subscriberClient', - method: 'modifyPushConfig', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, callback); + this.request( + { + client: 'SubscriberClient', + method: 'modifyPushConfig', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); }; /** @@ -928,7 +951,7 @@ Subscription.prototype.nack_ = function(message) { */ Subscription.prototype.openConnection_ = function() { var self = this; - var pool = this.connectionPool = new ConnectionPool(this); + var pool = (this.connectionPool = new ConnectionPool(this)); this.isOpen = true; @@ -1016,7 +1039,7 @@ Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { } var reqOpts = { - subscription: this.name + subscription: this.name, }; if (is.string(snapshot)) { @@ -1027,12 +1050,15 @@ Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { throw new Error('Either a snapshot name or Date is needed to seek to.'); } - this.request({ - client: 'subscriberClient', - method: 'seek', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, callback); + this.request( + { + client: 'SubscriberClient', + method: 'seek', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); }; /** @@ -1056,7 +1082,7 @@ Subscription.prototype.setFlushTimeout_ = function() { * @private */ Subscription.prototype.setLeaseTimeout_ = function() { - if (this.leaseTimeoutHandle_ || !this.isOpen) { + if (this.leaseTimeoutHandle_ || !this.isOpen) { return; } @@ -1107,16 +1133,19 @@ Subscription.prototype.setMetadata = function(metadata, gaxOpts, callback) { var reqOpts = { subscription: subscription, updateMask: { - paths: fields - } + paths: fields, + }, }; - this.request({ - client: 'subscriberClient', - method: 'updateSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, callback); + this.request( + { + client: 'SubscriberClient', + method: 'updateSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); }; /** @@ -1141,7 +1170,7 @@ Subscription.prototype.snapshot = function(name) { * that a callback is omitted. */ common.util.promisifyAll(Subscription, { - exclude: ['snapshot'] + exclude: ['snapshot'], }); module.exports = Subscription; diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 2b71548b846..3a9f582b99d 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -221,15 +221,18 @@ Topic.prototype.delete = function(gaxOpts, callback) { callback = callback || common.util.noop; var reqOpts = { - topic: this.name + topic: this.name, }; - this.request({ - client: 'publisherClient', - method: 'deleteTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, callback); + this.request( + { + client: 'PublisherClient', + method: 'deleteTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); }; /** @@ -344,21 +347,24 @@ Topic.prototype.getMetadata = function(gaxOpts, callback) { } var reqOpts = { - topic: this.name + topic: this.name, }; - this.request({ - client: 'publisherClient', - method: 'getTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function(err, apiResponse) { - if (!err) { - self.metadata = apiResponse; + this.request( + { + client: 'PublisherClient', + method: 'getTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, apiResponse) { + if (!err) { + self.metadata = apiResponse; + } + + callback(err, apiResponse); } - - callback(err, apiResponse); - }); + ); }; /** @@ -408,34 +414,43 @@ Topic.prototype.getSubscriptions = function(options, callback) { options = {}; } - var reqOpts = extend({ - topic: this.name - }, options); + var reqOpts = extend( + { + topic: this.name, + }, + options + ); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - var gaxOpts = extend({ - autoPaginate: options.autoPaginate - }, options.gaxOpts); - - this.request({ - client: 'publisherClient', - method: 'listTopicSubscriptions', - reqOpts: reqOpts, - gaxOpts: gaxOpts - }, function() { - var subscriptions = arguments[1]; - - if (subscriptions) { - arguments[1] = subscriptions.map(function(sub) { - // ListTopicSubscriptions only returns sub names - return self.subscription(sub); - }); + var gaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + + this.request( + { + client: 'PublisherClient', + method: 'listTopicSubscriptions', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function() { + var subscriptions = arguments[1]; + + if (subscriptions) { + arguments[1] = subscriptions.map(function(sub) { + // ListTopicSubscriptions only returns sub names + return self.subscription(sub); + }); + } + + callback.apply(null, arguments); } - - callback.apply(null, arguments); - }); + ); }; /** @@ -465,8 +480,9 @@ Topic.prototype.getSubscriptions = function(options, callback) { * this.end(); * }); */ -Topic.prototype.getSubscriptionsStream = - common.paginator.streamify('getSubscriptions'); +Topic.prototype.getSubscriptionsStream = common.paginator.streamify( + 'getSubscriptions' +); /** * Creates a Publisher object that allows you to publish messages to this topic. @@ -483,7 +499,7 @@ Topic.prototype.getSubscriptionsStream = * @example * var publisher = topic.publisher(); * - * publisher.publish(new Buffer('Hello, world!'), function(err, messageId) { + * publisher.publish(Buffer.from('Hello, world!'), function(err, messageId) { * if (err) { * // Error handling omitted. * } @@ -539,9 +555,7 @@ Topic.prototype.subscription = function(name, options) { * * These methods can be agto-paginated. */ -common.paginator.extend(Topic, [ - 'getSubscriptions' -]); +common.paginator.extend(Topic, ['getSubscriptions']); /*! Developer Documentation * @@ -549,10 +563,7 @@ common.paginator.extend(Topic, [ * that a callback is omitted. */ common.util.promisifyAll(Topic, { - exclude: [ - 'publisher', - 'subscription' - ] + exclude: ['publisher', 'subscription'], }); module.exports = Topic; diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js index 984bda91adc..e6422f41930 100644 --- a/handwritten/pubsub/src/v1/index.js +++ b/handwritten/pubsub/src/v1/index.js @@ -1,37 +1,21 @@ -/* - * Copyright 2016 Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -'use strict'; - -var publisherClient = require('./publisher_client'); -var subscriberClient = require('./subscriber_client'); -var gax = require('google-gax'); -var extend = require('extend'); +// Copyright 2017, Google LLC All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. -function v1(options) { - options = extend({ - scopes: v1.ALL_SCOPES - }, options); - var gaxGrpc = gax.grpc(options); - var result = {}; - extend(result, publisherClient(gaxGrpc)); - extend(result, subscriberClient(gaxGrpc)); - return result; -} +'use strict'; -v1.SERVICE_ADDRESS = publisherClient.SERVICE_ADDRESS; -v1.ALL_SCOPES = publisherClient.ALL_SCOPES; +const PublisherClient = require('./publisher_client'); +const SubscriberClient = require('./subscriber_client'); -module.exports = v1; +module.exports.PublisherClient = PublisherClient; +module.exports.SubscriberClient = SubscriberClient; diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 1452ef81a8b..9b557f48087 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -1,885 +1,1088 @@ -/* - * Copyright 2016 Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * EDITING INSTRUCTIONS - * This file was generated from the file - * https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto, - * and updates to that file get reflected here through a refresh process. - * For the short term, the refresh process will only be runnable by Google - * engineers. - * - * The only allowed edits are to method and file documentation. A 3-way - * merge preserves those additions if the generated source changes. - */ -/* TODO: introduce line-wrapping so that it never exceeds the limit. */ -/* jscs: disable maximumLineLength */ -'use strict'; - -var configData = require('./publisher_client_config'); -var extend = require('extend'); -var gax = require('google-gax'); - -var SERVICE_ADDRESS = 'pubsub.googleapis.com'; +// Copyright 2017, Google LLC All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. -var DEFAULT_SERVICE_PORT = 443; +'use strict'; -var CODE_GEN_NAME_VERSION = 'gapic/0.1.0'; +const gapicConfig = require('./publisher_client_config'); +const gax = require('google-gax'); +const merge = require('lodash.merge'); +const path = require('path'); +const protobuf = require('protobufjs'); -var PAGE_DESCRIPTORS = { - listTopics: new gax.PageDescriptor( - 'pageToken', - 'nextPageToken', - 'topics'), - listTopicSubscriptions: new gax.PageDescriptor( - 'pageToken', - 'nextPageToken', - 'subscriptions') -}; - -/** - * The scopes needed to make gRPC calls to all of the methods defined in - * this service. - */ -var ALL_SCOPES = [ - 'https://www.googleapis.com/auth/cloud-platform', - 'https://www.googleapis.com/auth/pubsub' -]; +const VERSION = require('../../package.json').version; /** * The service that an application uses to manipulate topics, and to send * messages to a topic. * - * This will be created through a builder function which can be obtained by the module. - * See the following example of how to initialize the module and how to access to the builder. - * @see {@link publisherClient} - * - * @example - * var pubsubV1 = require('@google-cloud/pubsub').v1({ - * // optional auth parameters. - * }); - * var client = pubsubV1.publisherClient(); - * * @class + * @memberof v1 */ -function PublisherClient(gaxGrpc, grpcClients, opts) { - opts = extend({ - servicePath: SERVICE_ADDRESS, - port: DEFAULT_SERVICE_PORT, - clientConfig: {} - }, opts); - - var googleApiClient = [ - 'gl-node/' + process.versions.node - ]; - if (opts.libName && opts.libVersion) { - googleApiClient.push(opts.libName + '/' + opts.libVersion); - } - googleApiClient.push( - CODE_GEN_NAME_VERSION, - 'gax/' + gax.version, - 'grpc/' + gaxGrpc.grpcVersion - ); - - var bundleDescriptors = { - publish: new gax.BundleDescriptor( - 'messages', - [ - 'topic' - ], - 'messageIds', - gax.createByteLengthFunction(grpcClients.google.pubsub.v1.PubsubMessage)) - }; - - var defaults = gaxGrpc.constructSettings( - 'google.pubsub.v1.Publisher', - configData, - opts.clientConfig, - {'x-goog-api-client': googleApiClient.join(' ')}); - - var self = this; - - this.auth = gaxGrpc.auth; - var iamPolicyStub = gaxGrpc.createStub( - grpcClients.google.iam.v1.IAMPolicy, - opts); - var iamPolicyStubMethods = [ - 'setIamPolicy', - 'getIamPolicy', - 'testIamPermissions' - ]; - iamPolicyStubMethods.forEach(function(methodName) { - self['_' + methodName] = gax.createApiCall( - iamPolicyStub.then(function(iamPolicyStub) { - return function() { - var args = Array.prototype.slice.call(arguments, 0); - return iamPolicyStub[methodName].apply(iamPolicyStub, args); - }; - }), - defaults[methodName], - PAGE_DESCRIPTORS[methodName] || bundleDescriptors[methodName]); - }); - - var publisherStub = gaxGrpc.createStub( - grpcClients.google.pubsub.v1.Publisher, - opts); - var publisherStubMethods = [ - 'createTopic', - 'publish', - 'getTopic', - 'listTopics', - 'listTopicSubscriptions', - 'deleteTopic' - ]; - publisherStubMethods.forEach(function(methodName) { - self['_' + methodName] = gax.createApiCall( - publisherStub.then(function(publisherStub) { - return function() { - var args = Array.prototype.slice.call(arguments, 0); - return publisherStub[methodName].apply(publisherStub, args); - }; - }), - defaults[methodName], - PAGE_DESCRIPTORS[methodName] || bundleDescriptors[methodName]); - }); -} +class PublisherClient { + /** + * Construct an instance of PublisherClient. + * + * @param {object} [options] - The configuration object. See the subsequent + * parameters for more details. + * @param {object} [options.credentials] - Credentials object. + * @param {string} [options.credentials.client_email] + * @param {string} [options.credentials.private_key] + * @param {string} [options.email] - Account email address. Required when + * usaing a .pem or .p12 keyFilename. + * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or + * .p12 key downloaded from the Google Developers Console. If you provide + * a path to a JSON file, the projectId option above is not necessary. + * NOTE: .pem and .p12 require you to specify options.email as well. + * @param {number} [options.port] - The port on which to connect to + * the remote host. + * @param {string} [options.projectId] - The project ID from the Google + * Developer's Console, e.g. 'grape-spaceship-123'. We will also check + * the environment variable GCLOUD_PROJECT for your project ID. If your + * app is running in an environment which supports + * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, + * your project ID will be detected automatically. + * @param {function} [options.promise] - Custom promise module to use instead + * of native Promises. + * @param {string} [options.servicePath] - The domain name of the + * API remote host. + */ + constructor(opts) { + this._descriptors = {}; -// Path templates + // Ensure that options include the service address and port. + opts = Object.assign( + { + clientConfig: {}, + port: this.constructor.port, + servicePath: this.constructor.servicePath, + }, + opts + ); -var PROJECT_PATH_TEMPLATE = new gax.PathTemplate( - 'projects/{project}'); + // Create a `gaxGrpc` object, with any grpc-specific options + // sent to the client. + opts.scopes = this.constructor.scopes; + var gaxGrpc = gax.grpc(opts); -var TOPIC_PATH_TEMPLATE = new gax.PathTemplate( - 'projects/{project}/topics/{topic}'); + // Save the auth object to the client, for use by other methods. + this.auth = gaxGrpc.auth; -/** - * Returns a fully-qualified project resource name string. - * @param {String} project - * @returns {String} - */ -PublisherClient.prototype.projectPath = function(project) { - return PROJECT_PATH_TEMPLATE.render({ - project: project - }); -}; + // Determine the client header string. + var clientHeader = [ + `gl-node/${process.version.node}`, + `grpc/${gaxGrpc.grpcVersion}`, + `gax/${gax.version}`, + `gapic/${VERSION}`, + ]; + if (opts.libName && opts.libVersion) { + clientHeader.push(`${opts.libName}/${opts.libVersion}`); + } -/** - * Parses the projectName from a project resource. - * @param {String} projectName - * A fully-qualified path representing a project resources. - * @returns {String} - A string representing the project. - */ -PublisherClient.prototype.matchProjectFromProjectName = function(projectName) { - return PROJECT_PATH_TEMPLATE.match(projectName).project; -}; + // Load the applicable protos. + var protos = merge( + {}, + gaxGrpc.loadProto( + path.join(__dirname, '..', '..', 'protos'), + 'google/iam/v1/iam_policy.proto' + ), + gaxGrpc.loadProto( + path.join(__dirname, '..', '..', 'protos'), + 'google/pubsub/v1/pubsub.proto' + ) + ); -/** - * Returns a fully-qualified topic resource name string. - * @param {String} project - * @param {String} topic - * @returns {String} - */ -PublisherClient.prototype.topicPath = function(project, topic) { - return TOPIC_PATH_TEMPLATE.render({ - project: project, - topic: topic - }); -}; + // This API contains "path templates"; forward-slash-separated + // identifiers to uniquely identify resources within the API. + // Create useful helper objects for these. + this._pathTemplates = { + projectPathTemplate: new gax.PathTemplate('projects/{project}'), + topicPathTemplate: new gax.PathTemplate( + 'projects/{project}/topics/{topic}' + ), + }; -/** - * Parses the topicName from a topic resource. - * @param {String} topicName - * A fully-qualified path representing a topic resources. - * @returns {String} - A string representing the project. - */ -PublisherClient.prototype.matchProjectFromTopicName = function(topicName) { - return TOPIC_PATH_TEMPLATE.match(topicName).project; -}; + // Some of the methods on this service return "paged" results, + // (e.g. 50 results at a time, with tokens to get subsequent + // pages). Denote the keys used for pagination and results. + this._descriptors.page = { + listTopics: new gax.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'topics' + ), + listTopicSubscriptions: new gax.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'subscriptions' + ), + }; + var protoFilesRoot = new gax.grpc.GoogleProtoFilesRoot(); + protoFilesRoot = protobuf.loadSync( + path.join( + __dirname, + '..', + '..', + 'protos', + 'google/iam/v1/iam_policy.proto' + ), + protoFilesRoot + ); + protoFilesRoot = protobuf.loadSync( + path.join( + __dirname, + '..', + '..', + 'protos', + 'google/pubsub/v1/pubsub.proto' + ), + protoFilesRoot + ); -/** - * Parses the topicName from a topic resource. - * @param {String} topicName - * A fully-qualified path representing a topic resources. - * @returns {String} - A string representing the topic. - */ -PublisherClient.prototype.matchTopicFromTopicName = function(topicName) { - return TOPIC_PATH_TEMPLATE.match(topicName).topic; -}; + // Some methods on this API support automatically batching + // requests; denote this. + this._descriptors.batching = { + publish: new gax.BundleDescriptor( + 'messages', + ['topic'], + 'messageIds', + gax.createByteLengthFunction( + protoFilesRoot.lookup('google.pubsub.v1.PubsubMessage') + ) + ), + }; -/** - * Get the project ID used by this class. - * @aram {function(Error, string)} callback - the callback to be called with - * the current project Id. - */ -PublisherClient.prototype.getProjectId = function(callback) { - return this.auth.getProjectId(callback); -}; + // Put together the default options sent with requests. + var defaults = gaxGrpc.constructSettings( + 'google.pubsub.v1.Publisher', + gapicConfig, + opts.clientConfig, + {'x-goog-api-client': clientHeader.join(' ')} + ); -// Service calls + // Set up a dictionary of "inner API calls"; the core implementation + // of calling the API is handled in `google-gax`, with this code + // merely providing the destination and request information. + this._innerApiCalls = {}; -/** - * Creates the given topic with the given name. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.name - * The name of the topic. It must have the format - * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, - * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), - * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent - * signs (`%`). It must be between 3 and 255 characters in length, and it - * must not start with `"goog"`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Topic]{@link Topic}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedName = client.topicPath("[PROJECT]", "[TOPIC]"); - * client.createTopic({name: formattedName}).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.createTopic = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; - } + // Put together the "service stub" for + // google.iam.v1.IAMPolicy. + var iamPolicyStub = gaxGrpc.createStub( + protos.google.iam.v1.IAMPolicy, + opts + ); - return this._createTopic(request, options, callback); -}; + // Iterate over each of the methods that the service provides + // and create an API call method for each. + var iamPolicyStubMethods = [ + 'setIamPolicy', + 'getIamPolicy', + 'testIamPermissions', + ]; + for (let methodName of iamPolicyStubMethods) { + this._innerApiCalls[methodName] = gax.createApiCall( + iamPolicyStub.then( + stub => + function() { + var args = Array.prototype.slice.call(arguments, 0); + return stub[methodName].apply(stub, args); + } + ), + defaults[methodName], + this._descriptors.page[methodName] || + this._descriptors.batching[methodName] + ); + } -/** - * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic - * does not exist. The message payload must not be empty; it must contain - * either a non-empty data field, or at least one attribute. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * The messages in the request will be published on this topic. - * Format is `projects/{project}/topics/{topic}`. - * @param {Object[]} request.messages - * The messages to publish. - * - * This object should have the same structure as [PubsubMessage]{@link PubsubMessage} - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [PublishResponse]{@link PublishResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [PublishResponse]{@link PublishResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); - * var data = ''; - * var messagesElement = { - * data : data - * }; - * var messages = [messagesElement]; - * var request = { - * topic: formattedTopic, - * messages: messages - * }; - * client.publish(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.publish = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + // Put together the "service stub" for + // google.pubsub.v1.Publisher. + var publisherStub = gaxGrpc.createStub( + protos.google.pubsub.v1.Publisher, + opts + ); + + // Iterate over each of the methods that the service provides + // and create an API call method for each. + var publisherStubMethods = [ + 'createTopic', + 'updateTopic', + 'publish', + 'getTopic', + 'listTopics', + 'listTopicSubscriptions', + 'deleteTopic', + ]; + for (let methodName of publisherStubMethods) { + this._innerApiCalls[methodName] = gax.createApiCall( + publisherStub.then( + stub => + function() { + var args = Array.prototype.slice.call(arguments, 0); + return stub[methodName].apply(stub, args); + } + ), + defaults[methodName], + this._descriptors.page[methodName] || + this._descriptors.batching[methodName] + ); + } } - if (options === undefined) { - options = {}; + + /** + * The DNS address for this API service. + */ + static get servicePath() { + return 'pubsub.googleapis.com'; } - return this._publish(request, options, callback); -}; + /** + * The port for this API service. + */ + static get port() { + return 443; + } -/** - * Gets the configuration of a topic. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * The name of the topic to get. - * Format is `projects/{project}/topics/{topic}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Topic]{@link Topic}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); - * client.getTopic({topic: formattedTopic}).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.getTopic = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + /** + * The scopes needed to make gRPC calls for every method defined + * in this service. + */ + static get scopes() { + return [ + 'https://www.googleapis.com/auth/cloud-platform', + 'https://www.googleapis.com/auth/pubsub', + ]; } - if (options === undefined) { - options = {}; + + /** + * Return the project ID used by this class. + * @param {function(Error, string)} callback - the callback to + * be called with the current project Id. + */ + getProjectId(callback) { + return this.auth.getProjectId(callback); } - return this._getTopic(request, options, callback); -}; + // ------------------- + // -- Service calls -- + // ------------------- -/** - * Lists matching topics. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * The name of the cloud project that topics belong to. - * Format is `projects/{project}`. - * @param {number=} request.pageSize - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Array, ?Object, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is Array of [Topic]{@link Topic}. - * - * When autoPaginate: false is specified through options, it contains the result - * in a single response. If the response indicates the next page exists, the third - * parameter is set to be used for the next request object. The fourth parameter keeps - * the raw response object of an object representing [ListTopicsResponse]{@link ListTopicsResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Topic]{@link Topic}. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Topic]{@link Topic} in a single response. - * The second element is the next request object if the response - * indicates the next page exists, or null. The third element is - * an object representing [ListTopicsResponse]{@link ListTopicsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedProject = client.projectPath("[PROJECT]"); - * // Iterate over all elements. - * client.listTopics({project: formattedProject}).then(function(responses) { - * var resources = responses[0]; - * for (var i = 0; i < resources.length; ++i) { - * // doThingsWith(resources[i]) - * } - * }).catch(function(err) { - * console.error(err); - * }); - * - * // Or obtain the paged response. - * var options = {autoPaginate: false}; - * function callback(responses) { - * // The actual resources in a response. - * var resources = responses[0]; - * // The next request if the response shows there's more responses. - * var nextRequest = responses[1]; - * // The actual response object, if necessary. - * // var rawResponse = responses[2]; - * for (var i = 0; i < resources.length; ++i) { - * // doThingsWith(resources[i]); - * } - * if (nextRequest) { - * // Fetch the next page. - * return client.listTopics(nextRequest, options).then(callback); - * } - * } - * client.listTopics({project: formattedProject}, options) - * .then(callback) - * .catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.listTopics = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * Creates the given topic with the given name. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * The name of the topic. It must have the format + * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, + * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), + * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent + * signs (`%`). It must be between 3 and 255 characters in length, and it + * must not start with `"goog"`. + * @param {Object.} [request.labels] + * User labels. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + * client.createTopic({name: formattedName}) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + createTopic(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.createTopic(request, options, callback); } - return this._listTopics(request, options, callback); -}; + /** + * Updates an existing topic. Note that certain properties of a topic are not + * modifiable. Options settings follow the style guide: + * NOTE: The style guide requires body: "topic" instead of body: "*". + * Keeping the latter for internal consistency in V1, however it should be + * corrected in V2. See + * https://cloud.google.com/apis/design/standard_methods#update for details. + * + * @param {Object} request + * The request object that will be sent. + * @param {Object} request.topic + * The topic to update. + * + * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} + * @param {Object} request.updateMask + * Indicates which fields in the provided topic to update. + * Must be specified and non-empty. + * + * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var topic = {}; + * var updateMask = {}; + * var request = { + * topic: topic, + * updateMask: updateMask, + * }; + * client.updateTopic(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + updateTopic(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; -/** - * Equivalent to {@link listTopics}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopics} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * The name of the cloud project that topics belong to. - * Format is `projects/{project}`. - * @param {number=} request.pageSize - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @return {Stream} - * An object stream which emits an object representing [Topic]{@link Topic} on 'data' event. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedProject = client.projectPath("[PROJECT]"); - * client.listTopicsStream({project: formattedProject}).on('data', function(element) { - * // doThingsWith(element) - * }).on('error', function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.listTopicsStream = function(request, options) { - if (options === undefined) { - options = {}; + return this._innerApiCalls.updateTopic(request, options, callback); } - return PAGE_DESCRIPTORS.listTopics.createStream(this._listTopics, request, options); -}; + /** + * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic + * does not exist. The message payload must not be empty; it must contain + * either a non-empty data field, or at least one attribute. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * The messages in the request will be published on this topic. + * Format is `projects/{project}/topics/{topic}`. + * @param {Object[]} request.messages + * The messages to publish. + * + * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * var data = ''; + * var messagesElement = { + * data: data, + * }; + * var messages = [messagesElement]; + * var request = { + * topic: formattedTopic, + * messages: messages, + * }; + * client.publish(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + publish(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; -/** - * Lists the name of the subscriptions for this topic. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * The name of the topic that subscriptions are attached to. - * Format is `projects/{project}/topics/{topic}`. - * @param {number=} request.pageSize - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Array, ?Object, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is Array of string. - * - * When autoPaginate: false is specified through options, it contains the result - * in a single response. If the response indicates the next page exists, the third - * parameter is set to be used for the next request object. The fourth parameter keeps - * the raw response object of an object representing [ListTopicSubscriptionsResponse]{@link ListTopicSubscriptionsResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is Array of string. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of string in a single response. - * The second element is the next request object if the response - * indicates the next page exists, or null. The third element is - * an object representing [ListTopicSubscriptionsResponse]{@link ListTopicSubscriptionsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); - * // Iterate over all elements. - * client.listTopicSubscriptions({topic: formattedTopic}).then(function(responses) { - * var resources = responses[0]; - * for (var i = 0; i < resources.length; ++i) { - * // doThingsWith(resources[i]) - * } - * }).catch(function(err) { - * console.error(err); - * }); - * - * // Or obtain the paged response. - * var options = {autoPaginate: false}; - * function callback(responses) { - * // The actual resources in a response. - * var resources = responses[0]; - * // The next request if the response shows there's more responses. - * var nextRequest = responses[1]; - * // The actual response object, if necessary. - * // var rawResponse = responses[2]; - * for (var i = 0; i < resources.length; ++i) { - * // doThingsWith(resources[i]); - * } - * if (nextRequest) { - * // Fetch the next page. - * return client.listTopicSubscriptions(nextRequest, options).then(callback); - * } - * } - * client.listTopicSubscriptions({topic: formattedTopic}, options) - * .then(callback) - * .catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.listTopicSubscriptions = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + return this._innerApiCalls.publish(request, options, callback); } - if (options === undefined) { - options = {}; + + /** + * Gets the configuration of a topic. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * The name of the topic to get. + * Format is `projects/{project}/topics/{topic}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * client.getTopic({topic: formattedTopic}) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + getTopic(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.getTopic(request, options, callback); } - return this._listTopicSubscriptions(request, options, callback); -}; + /** + * Lists matching topics. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that topics belong to. + * Format is `projects/{project}`. + * @param {number} [request.pageSize] + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is Array of [Topic]{@link google.pubsub.v1.Topic}. + * + * When autoPaginate: false is specified through options, it contains the result + * in a single response. If the response indicates the next page exists, the third + * parameter is set to be used for the next request object. The fourth parameter keeps + * the raw response object of an object representing [ListTopicsResponse]{@link google.pubsub.v1.ListTopicsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Topic]{@link google.pubsub.v1.Topic}. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Topic]{@link google.pubsub.v1.Topic} in a single response. + * The second element is the next request object if the response + * indicates the next page exists, or null. The third element is + * an object representing [ListTopicsResponse]{@link google.pubsub.v1.ListTopicsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * // Iterate over all elements. + * var formattedProject = client.projectPath('[PROJECT]'); + * + * client.listTopics({project: formattedProject}) + * .then(responses => { + * var resources = responses[0]; + * for (let i = 0; i < resources.length; i += 1) { + * // doThingsWith(resources[i]) + * } + * }) + * .catch(err => { + * console.error(err); + * }); + * + * // Or obtain the paged response. + * var formattedProject = client.projectPath('[PROJECT]'); + * + * + * var options = {autoPaginate: false}; + * var callback = responses => { + * // The actual resources in a response. + * var resources = responses[0]; + * // The next request if the response shows that there are more responses. + * var nextRequest = responses[1]; + * // The actual response object, if necessary. + * // var rawResponse = responses[2]; + * for (let i = 0; i < resources.length; i += 1) { + * // doThingsWith(resources[i]); + * } + * if (nextRequest) { + * // Fetch the next page. + * return client.listTopics(nextRequest, options).then(callback); + * } + * } + * client.listTopics({project: formattedProject}, options) + * .then(callback) + * .catch(err => { + * console.error(err); + * }); + */ + listTopics(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; -/** - * Equivalent to {@link listTopicSubscriptions}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopicSubscriptions} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * The name of the topic that subscriptions are attached to. - * Format is `projects/{project}/topics/{topic}`. - * @param {number=} request.pageSize - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @return {Stream} - * An object stream which emits a string on 'data' event. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); - * client.listTopicSubscriptionsStream({topic: formattedTopic}).on('data', function(element) { - * // doThingsWith(element) - * }).on('error', function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.listTopicSubscriptionsStream = function(request, options) { - if (options === undefined) { - options = {}; + return this._innerApiCalls.listTopics(request, options, callback); } - return PAGE_DESCRIPTORS.listTopicSubscriptions.createStream(this._listTopicSubscriptions, request, options); -}; + /** + * Equivalent to {@link listTopics}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopics} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that topics belong to. + * Format is `projects/{project}`. + * @param {number} [request.pageSize] + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @returns {Stream} + * An object stream which emits an object representing [Topic]{@link google.pubsub.v1.Topic} on 'data' event. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedProject = client.projectPath('[PROJECT]'); + * client.listTopicsStream({project: formattedProject}) + * .on('data', element => { + * // doThingsWith(element) + * }).on('error', err => { + * console.log(err); + * }); + */ + listTopicsStream(request, options) { + options = options || {}; -/** - * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic - * does not exist. After a topic is deleted, a new topic may be created with - * the same name; this is an entirely new topic with none of the old - * configuration or subscriptions. Existing subscriptions to this topic are - * not deleted, but their `topic` field is set to `_deleted-topic_`. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Name of the topic to delete. - * Format is `projects/{project}/topics/{topic}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error)=} callback - * The function which will be called with the result of the API call. - * @return {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); - * client.deleteTopic({topic: formattedTopic}).catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.deleteTopic = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + return this._descriptors.page.listTopics.createStream( + this._innerApiCalls.listTopics, + request, + options + ); } - if (options === undefined) { - options = {}; + + /** + * Lists the name of the subscriptions for this topic. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} [request.pageSize] + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is Array of string. + * + * When autoPaginate: false is specified through options, it contains the result + * in a single response. If the response indicates the next page exists, the third + * parameter is set to be used for the next request object. The fourth parameter keeps + * the raw response object of an object representing [ListTopicSubscriptionsResponse]{@link google.pubsub.v1.ListTopicSubscriptionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of string. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of string in a single response. + * The second element is the next request object if the response + * indicates the next page exists, or null. The third element is + * an object representing [ListTopicSubscriptionsResponse]{@link google.pubsub.v1.ListTopicSubscriptionsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * // Iterate over all elements. + * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * + * client.listTopicSubscriptions({topic: formattedTopic}) + * .then(responses => { + * var resources = responses[0]; + * for (let i = 0; i < resources.length; i += 1) { + * // doThingsWith(resources[i]) + * } + * }) + * .catch(err => { + * console.error(err); + * }); + * + * // Or obtain the paged response. + * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * + * + * var options = {autoPaginate: false}; + * var callback = responses => { + * // The actual resources in a response. + * var resources = responses[0]; + * // The next request if the response shows that there are more responses. + * var nextRequest = responses[1]; + * // The actual response object, if necessary. + * // var rawResponse = responses[2]; + * for (let i = 0; i < resources.length; i += 1) { + * // doThingsWith(resources[i]); + * } + * if (nextRequest) { + * // Fetch the next page. + * return client.listTopicSubscriptions(nextRequest, options).then(callback); + * } + * } + * client.listTopicSubscriptions({topic: formattedTopic}, options) + * .then(callback) + * .catch(err => { + * console.error(err); + * }); + */ + listTopicSubscriptions(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.listTopicSubscriptions( + request, + options, + callback + ); } - return this._deleteTopic(request, options, callback); -}; + /** + * Equivalent to {@link listTopicSubscriptions}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopicSubscriptions} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} [request.pageSize] + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @returns {Stream} + * An object stream which emits a string on 'data' event. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * client.listTopicSubscriptionsStream({topic: formattedTopic}) + * .on('data', element => { + * // doThingsWith(element) + * }).on('error', err => { + * console.log(err); + * }); + */ + listTopicSubscriptionsStream(request, options) { + options = options || {}; -/** - * Sets the access control policy on the specified resource. Replaces any - * existing policy. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy is being specified. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * @param {Object} request.policy - * REQUIRED: The complete policy to be applied to the `resource`. The size of - * the policy is limited to a few 10s of KB. An empty policy is a - * valid policy but certain Cloud Platform services (such as Projects) - * might reject them. - * - * This object should have the same structure as [Policy]{@link Policy} - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Policy]{@link Policy}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link Policy}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedResource = client.topicPath("[PROJECT]", "[TOPIC]"); - * var policy = {}; - * var request = { - * resource: formattedResource, - * policy: policy - * }; - * client.setIamPolicy(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.setIamPolicy = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + return this._descriptors.page.listTopicSubscriptions.createStream( + this._innerApiCalls.listTopicSubscriptions, + request, + options + ); } - if (options === undefined) { - options = {}; + + /** + * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic + * does not exist. After a topic is deleted, a new topic may be created with + * the same name; this is an entirely new topic with none of the old + * configuration or subscriptions. Existing subscriptions to this topic are + * not deleted, but their `topic` field is set to `_deleted-topic_`. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Name of the topic to delete. + * Format is `projects/{project}/topics/{topic}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error)} [callback] + * The function which will be called with the result of the API call. + * @returns {Promise} - The promise which resolves when API call finishes. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * client.deleteTopic({topic: formattedTopic}).catch(err => { + * console.error(err); + * }); + */ + deleteTopic(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.deleteTopic(request, options, callback); } - return this._setIamPolicy(request, options, callback); -}; + /** + * Sets the access control policy on the specified resource. Replaces any + * existing policy. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being specified. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {Object} request.policy + * REQUIRED: The complete policy to be applied to the `resource`. The size of + * the policy is limited to a few 10s of KB. An empty policy is a + * valid policy but certain Cloud Platform services (such as Projects) + * might reject them. + * + * This object should have the same structure as [Policy]{@link google.iam.v1.Policy} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + * var policy = {}; + * var request = { + * resource: formattedResource, + * policy: policy, + * }; + * client.setIamPolicy(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + setIamPolicy(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; -/** - * Gets the access control policy for a resource. - * Returns an empty policy if the resource exists and does not have a policy - * set. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Policy]{@link Policy}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link Policy}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedResource = client.topicPath("[PROJECT]", "[TOPIC]"); - * client.getIamPolicy({resource: formattedResource}).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.getIamPolicy = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + return this._innerApiCalls.setIamPolicy(request, options, callback); } - if (options === undefined) { - options = {}; + + /** + * Gets the access control policy for a resource. + * Returns an empty policy if the resource exists and does not have a policy + * set. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + * client.getIamPolicy({resource: formattedResource}) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + getIamPolicy(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.getIamPolicy(request, options, callback); } - return this._getIamPolicy(request, options, callback); -}; + /** + * Returns permissions that a caller has on the specified resource. + * If the resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.PublisherClient({ + * // optional auth parameters. + * }); + * + * var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + * var permissions = []; + * var request = { + * resource: formattedResource, + * permissions: permissions, + * }; + * client.testIamPermissions(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + testIamPermissions(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; -/** - * Returns permissions that a caller has on the specified resource. - * If the resource does not exist, this will return an empty set of - * permissions, not a NOT_FOUND error. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy detail is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * @param {string[]} request.permissions - * The set of permissions to check for the `resource`. Permissions with - * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.publisherClient(); - * var formattedResource = client.topicPath("[PROJECT]", "[TOPIC]"); - * var permissions = []; - * var request = { - * resource: formattedResource, - * permissions: permissions - * }; - * client.testIamPermissions(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -PublisherClient.prototype.testIamPermissions = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + return this._innerApiCalls.testIamPermissions(request, options, callback); } - if (options === undefined) { - options = {}; + + // -------------------- + // -- Path templates -- + // -------------------- + + /** + * Return a fully-qualified project resource name string. + * + * @param {String} project + * @returns {String} + */ + projectPath(project) { + return this._pathTemplates.projectPathTemplate.render({ + project: project, + }); } - return this._testIamPermissions(request, options, callback); -}; + /** + * Return a fully-qualified topic resource name string. + * + * @param {String} project + * @param {String} topic + * @returns {String} + */ + topicPath(project, topic) { + return this._pathTemplates.topicPathTemplate.render({ + project: project, + topic: topic, + }); + } -function PublisherClientBuilder(gaxGrpc) { - if (!(this instanceof PublisherClientBuilder)) { - return new PublisherClientBuilder(gaxGrpc); + /** + * Parse the projectName from a project resource. + * + * @param {String} projectName + * A fully-qualified path representing a project resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromProjectName(projectName) { + return this._pathTemplates.projectPathTemplate.match(projectName).project; } - var iamPolicyClient = gaxGrpc.load([{ - root: require('google-proto-files')('..'), - file: 'google/iam/v1/iam_policy.proto' - }]); - extend(this, iamPolicyClient.google.iam.v1); - - var publisherClient = gaxGrpc.load([{ - root: require('google-proto-files')('..'), - file: 'google/pubsub/v1/pubsub.proto' - }]); - extend(this, publisherClient.google.pubsub.v1); - - var grpcClients = extend( - true, - {}, - iamPolicyClient, - publisherClient - ); + /** + * Parse the topicName from a topic resource. + * + * @param {String} topicName + * A fully-qualified path representing a topic resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromTopicName(topicName) { + return this._pathTemplates.topicPathTemplate.match(topicName).project; + } /** - * Build a new instance of {@link PublisherClient}. - * - * @param {Object=} opts - The optional parameters. - * @param {String=} opts.servicePath - * The domain name of the API remote host. - * @param {number=} opts.port - * The port on which to connect to the remote host. - * @param {grpc.ClientCredentials=} opts.sslCreds - * A ClientCredentials for use with an SSL-enabled channel. - * @param {Object=} opts.clientConfig - * The customized config to build the call settings. See - * {@link gax.constructSettings} for the format. + * Parse the topicName from a topic resource. + * + * @param {String} topicName + * A fully-qualified path representing a topic resources. + * @returns {String} - A string representing the topic. */ - this.publisherClient = function(opts) { - return new PublisherClient(gaxGrpc, grpcClients, opts); - }; - extend(this.publisherClient, PublisherClient); + matchTopicFromTopicName(topicName) { + return this._pathTemplates.topicPathTemplate.match(topicName).topic; + } } -module.exports = PublisherClientBuilder; -module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS; -module.exports.ALL_SCOPES = ALL_SCOPES; + +module.exports = PublisherClient; diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index e9c92bc73c7..cf2bf23734d 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -1,1453 +1,1680 @@ -/* - * Copyright 2016 Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * EDITING INSTRUCTIONS - * This file was generated from the file - * https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto, - * and updates to that file get reflected here through a refresh process. - * For the short term, the refresh process will only be runnable by Google - * engineers. - * - * The only allowed edits are to method and file documentation. A 3-way - * merge preserves those additions if the generated source changes. - */ -/* TODO: introduce line-wrapping so that it never exceeds the limit. */ -/* jscs: disable maximumLineLength */ -'use strict'; - -var configData = require('./subscriber_client_config'); -var extend = require('extend'); -var gax = require('google-gax'); +// Copyright 2017, Google LLC All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. -var SERVICE_ADDRESS = 'pubsub.googleapis.com'; - -var DEFAULT_SERVICE_PORT = 443; - -var CODE_GEN_NAME_VERSION = 'gapic/0.1.0'; +'use strict'; -var PAGE_DESCRIPTORS = { - listSubscriptions: new gax.PageDescriptor( - 'pageToken', - 'nextPageToken', - 'subscriptions'), - listSnapshots: new gax.PageDescriptor( - 'pageToken', - 'nextPageToken', - 'snapshots') -}; +const gapicConfig = require('./subscriber_client_config'); +const gax = require('google-gax'); +const merge = require('lodash.merge'); +const path = require('path'); -var STREAM_DESCRIPTORS = { - streamingPull: new gax.StreamDescriptor(gax.StreamType.BIDI_STREAMING) -}; - -/** - * The scopes needed to make gRPC calls to all of the methods defined in - * this service. - */ -var ALL_SCOPES = [ - 'https://www.googleapis.com/auth/cloud-platform', - 'https://www.googleapis.com/auth/pubsub' -]; +const VERSION = require('../../package.json').version; /** * The service that an application uses to manipulate subscriptions and to * consume messages from a subscription via the `Pull` method. * - * This will be created through a builder function which can be obtained by the module. - * See the following example of how to initialize the module and how to access to the builder. - * @see {@link subscriberClient} - * - * @example - * var pubsubV1 = require('@google-cloud/pubsub').v1({ - * // optional auth parameters. - * }); - * var client = pubsubV1.subscriberClient(); - * * @class + * @memberof v1 */ -function SubscriberClient(gaxGrpc, grpcClients, opts) { - opts = extend({ - servicePath: SERVICE_ADDRESS, - port: DEFAULT_SERVICE_PORT, - clientConfig: {} - }, opts); - - var googleApiClient = [ - 'gl-node/' + process.versions.node - ]; - if (opts.libName && opts.libVersion) { - googleApiClient.push(opts.libName + '/' + opts.libVersion); - } - googleApiClient.push( - CODE_GEN_NAME_VERSION, - 'gax/' + gax.version, - 'grpc/' + gaxGrpc.grpcVersion - ); - - var defaults = gaxGrpc.constructSettings( +class SubscriberClient { + /** + * Construct an instance of SubscriberClient. + * + * @param {object} [options] - The configuration object. See the subsequent + * parameters for more details. + * @param {object} [options.credentials] - Credentials object. + * @param {string} [options.credentials.client_email] + * @param {string} [options.credentials.private_key] + * @param {string} [options.email] - Account email address. Required when + * usaing a .pem or .p12 keyFilename. + * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or + * .p12 key downloaded from the Google Developers Console. If you provide + * a path to a JSON file, the projectId option above is not necessary. + * NOTE: .pem and .p12 require you to specify options.email as well. + * @param {number} [options.port] - The port on which to connect to + * the remote host. + * @param {string} [options.projectId] - The project ID from the Google + * Developer's Console, e.g. 'grape-spaceship-123'. We will also check + * the environment variable GCLOUD_PROJECT for your project ID. If your + * app is running in an environment which supports + * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, + * your project ID will be detected automatically. + * @param {function} [options.promise] - Custom promise module to use instead + * of native Promises. + * @param {string} [options.servicePath] - The domain name of the + * API remote host. + */ + constructor(opts) { + this._descriptors = {}; + + // Ensure that options include the service address and port. + opts = Object.assign( + { + clientConfig: {}, + port: this.constructor.port, + servicePath: this.constructor.servicePath, + }, + opts + ); + + // Create a `gaxGrpc` object, with any grpc-specific options + // sent to the client. + opts.scopes = this.constructor.scopes; + var gaxGrpc = gax.grpc(opts); + + // Save the auth object to the client, for use by other methods. + this.auth = gaxGrpc.auth; + + // Determine the client header string. + var clientHeader = [ + `gl-node/${process.version.node}`, + `grpc/${gaxGrpc.grpcVersion}`, + `gax/${gax.version}`, + `gapic/${VERSION}`, + ]; + if (opts.libName && opts.libVersion) { + clientHeader.push(`${opts.libName}/${opts.libVersion}`); + } + + // Load the applicable protos. + var protos = merge( + {}, + gaxGrpc.loadProto( + path.join(__dirname, '..', '..', 'protos'), + 'google/iam/v1/iam_policy.proto' + ), + gaxGrpc.loadProto( + path.join(__dirname, '..', '..', 'protos'), + 'google/pubsub/v1/pubsub.proto' + ) + ); + + // This API contains "path templates"; forward-slash-separated + // identifiers to uniquely identify resources within the API. + // Create useful helper objects for these. + this._pathTemplates = { + projectPathTemplate: new gax.PathTemplate('projects/{project}'), + snapshotPathTemplate: new gax.PathTemplate( + 'projects/{project}/snapshots/{snapshot}' + ), + subscriptionPathTemplate: new gax.PathTemplate( + 'projects/{project}/subscriptions/{subscription}' + ), + topicPathTemplate: new gax.PathTemplate( + 'projects/{project}/topics/{topic}' + ), + }; + + // Some of the methods on this service return "paged" results, + // (e.g. 50 results at a time, with tokens to get subsequent + // pages). Denote the keys used for pagination and results. + this._descriptors.page = { + listSubscriptions: new gax.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'subscriptions' + ), + listSnapshots: new gax.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'snapshots' + ), + }; + + // Some of the methods on this service provide streaming responses. + // Provide descriptors for these. + this._descriptors.stream = { + streamingPull: new gax.StreamDescriptor(gax.StreamType.BIDI_STREAMING), + }; + + // Put together the default options sent with requests. + var defaults = gaxGrpc.constructSettings( 'google.pubsub.v1.Subscriber', - configData, + gapicConfig, opts.clientConfig, - {'x-goog-api-client': googleApiClient.join(' ')}); - - var self = this; - - this.auth = gaxGrpc.auth; - var iamPolicyStub = gaxGrpc.createStub( - grpcClients.google.iam.v1.IAMPolicy, - opts); - var iamPolicyStubMethods = [ - 'setIamPolicy', - 'getIamPolicy', - 'testIamPermissions' - ]; - iamPolicyStubMethods.forEach(function(methodName) { - self['_' + methodName] = gax.createApiCall( - iamPolicyStub.then(function(iamPolicyStub) { - return function() { - var args = Array.prototype.slice.call(arguments, 0); - return iamPolicyStub[methodName].apply(iamPolicyStub, args); - }; - }), - defaults[methodName], - PAGE_DESCRIPTORS[methodName] || STREAM_DESCRIPTORS[methodName]); - }); - - var subscriberStub = gaxGrpc.createStub( - grpcClients.google.pubsub.v1.Subscriber, - opts); - var subscriberStubMethods = [ - 'createSubscription', - 'getSubscription', - 'updateSubscription', - 'listSubscriptions', - 'deleteSubscription', - 'modifyAckDeadline', - 'acknowledge', - 'pull', - 'streamingPull', - 'modifyPushConfig', - 'listSnapshots', - 'createSnapshot', - 'deleteSnapshot', - 'seek' - ]; - subscriberStubMethods.forEach(function(methodName) { - self['_' + methodName] = gax.createApiCall( - subscriberStub.then(function(subscriberStub) { - return function() { - var args = Array.prototype.slice.call(arguments, 0); - return subscriberStub[methodName].apply(subscriberStub, args); - }; - }), - defaults[methodName], - PAGE_DESCRIPTORS[methodName] || STREAM_DESCRIPTORS[methodName]); - }); -} - -// Path templates - -var PROJECT_PATH_TEMPLATE = new gax.PathTemplate( - 'projects/{project}'); - -var SNAPSHOT_PATH_TEMPLATE = new gax.PathTemplate( - 'projects/{project}/snapshots/{snapshot}'); - -var SUBSCRIPTION_PATH_TEMPLATE = new gax.PathTemplate( - 'projects/{project}/subscriptions/{subscription}'); - -var TOPIC_PATH_TEMPLATE = new gax.PathTemplate( - 'projects/{project}/topics/{topic}'); - -/** - * Returns a fully-qualified project resource name string. - * @param {String} project - * @returns {String} - */ -SubscriberClient.prototype.projectPath = function(project) { - return PROJECT_PATH_TEMPLATE.render({ - project: project - }); -}; - -/** - * Parses the projectName from a project resource. - * @param {String} projectName - * A fully-qualified path representing a project resources. - * @returns {String} - A string representing the project. - */ -SubscriberClient.prototype.matchProjectFromProjectName = function(projectName) { - return PROJECT_PATH_TEMPLATE.match(projectName).project; -}; - -/** - * Returns a fully-qualified snapshot resource name string. - * @param {String} project - * @param {String} snapshot - * @returns {String} - */ -SubscriberClient.prototype.snapshotPath = function(project, snapshot) { - return SNAPSHOT_PATH_TEMPLATE.render({ - project: project, - snapshot: snapshot - }); -}; - -/** - * Parses the snapshotName from a snapshot resource. - * @param {String} snapshotName - * A fully-qualified path representing a snapshot resources. - * @returns {String} - A string representing the project. - */ -SubscriberClient.prototype.matchProjectFromSnapshotName = function(snapshotName) { - return SNAPSHOT_PATH_TEMPLATE.match(snapshotName).project; -}; - -/** - * Parses the snapshotName from a snapshot resource. - * @param {String} snapshotName - * A fully-qualified path representing a snapshot resources. - * @returns {String} - A string representing the snapshot. - */ -SubscriberClient.prototype.matchSnapshotFromSnapshotName = function(snapshotName) { - return SNAPSHOT_PATH_TEMPLATE.match(snapshotName).snapshot; -}; - -/** - * Returns a fully-qualified subscription resource name string. - * @param {String} project - * @param {String} subscription - * @returns {String} - */ -SubscriberClient.prototype.subscriptionPath = function(project, subscription) { - return SUBSCRIPTION_PATH_TEMPLATE.render({ - project: project, - subscription: subscription - }); -}; - -/** - * Parses the subscriptionName from a subscription resource. - * @param {String} subscriptionName - * A fully-qualified path representing a subscription resources. - * @returns {String} - A string representing the project. - */ -SubscriberClient.prototype.matchProjectFromSubscriptionName = function(subscriptionName) { - return SUBSCRIPTION_PATH_TEMPLATE.match(subscriptionName).project; -}; - -/** - * Parses the subscriptionName from a subscription resource. - * @param {String} subscriptionName - * A fully-qualified path representing a subscription resources. - * @returns {String} - A string representing the subscription. - */ -SubscriberClient.prototype.matchSubscriptionFromSubscriptionName = function(subscriptionName) { - return SUBSCRIPTION_PATH_TEMPLATE.match(subscriptionName).subscription; -}; - -/** - * Returns a fully-qualified topic resource name string. - * @param {String} project - * @param {String} topic - * @returns {String} - */ -SubscriberClient.prototype.topicPath = function(project, topic) { - return TOPIC_PATH_TEMPLATE.render({ - project: project, - topic: topic - }); -}; - -/** - * Parses the topicName from a topic resource. - * @param {String} topicName - * A fully-qualified path representing a topic resources. - * @returns {String} - A string representing the project. - */ -SubscriberClient.prototype.matchProjectFromTopicName = function(topicName) { - return TOPIC_PATH_TEMPLATE.match(topicName).project; -}; - -/** - * Parses the topicName from a topic resource. - * @param {String} topicName - * A fully-qualified path representing a topic resources. - * @returns {String} - A string representing the topic. - */ -SubscriberClient.prototype.matchTopicFromTopicName = function(topicName) { - return TOPIC_PATH_TEMPLATE.match(topicName).topic; -}; - -/** - * Get the project ID used by this class. - * @aram {function(Error, string)} callback - the callback to be called with - * the current project Id. - */ -SubscriberClient.prototype.getProjectId = function(callback) { - return this.auth.getProjectId(callback); -}; - -// Service calls - -/** - * Creates a subscription to a given topic. - * If the subscription already exists, returns `ALREADY_EXISTS`. - * If the corresponding topic doesn't exist, returns `NOT_FOUND`. - * - * If the name is not provided in the request, the server will assign a random - * name for this subscription on the same project as the topic, conforming - * to the - * [resource name format](https://cloud.google.com/pubsub/docs/overview#names). - * The generated name is populated in the returned Subscription object. - * Note that for REST API requests, you must specify a name in the request. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.name - * The name of the subscription. It must have the format - * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must - * start with a letter, and contain only letters (`[A-Za-z]`), numbers - * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), - * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters - * in length, and it must not start with `"goog"`. - * @param {string} request.topic - * The name of the topic from which this subscription is receiving messages. - * Format is `projects/{project}/topics/{topic}`. - * The value of this field will be `_deleted-topic_` if the topic has been - * deleted. - * @param {Object=} request.pushConfig - * If push delivery is used with this subscription, this field is - * used to configure it. An empty `pushConfig` signifies that the subscriber - * will pull and ack messages using API methods. - * - * This object should have the same structure as [PushConfig]{@link PushConfig} - * @param {number=} request.ackDeadlineSeconds - * This value is the maximum time after a subscriber receives a message - * before the subscriber should acknowledge the message. After message - * delivery but before the ack deadline expires and before the message is - * acknowledged, it is an outstanding message and will not be delivered - * again during that time (on a best-effort basis). - * - * For pull subscriptions, this value is used as the initial value for the ack - * deadline. To override this value for a given message, call - * `ModifyAckDeadline` with the corresponding `ack_id` if using - * pull. - * The minimum custom deadline you can specify is 10 seconds. - * The maximum custom deadline you can specify is 600 seconds (10 minutes). - * If this parameter is 0, a default value of 10 seconds is used. - * - * For push delivery, this value is also used to set the request timeout for - * the call to the push endpoint. - * - * If the subscriber never acknowledges the message, the Pub/Sub - * system will eventually redeliver the message. - * @param {boolean=} request.retainAckedMessages - * Indicates whether to retain acknowledged messages. If true, then - * messages are not expunged from the subscription's backlog, even if they are - * acknowledged, until they fall out of the `message_retention_duration` - * window. - * @param {Object=} request.messageRetentionDuration - * How long to retain unacknowledged messages in the subscription's backlog, - * from the moment a message is published. - * If `retain_acked_messages` is true, then this also configures the retention - * of acknowledged messages, and thus configures how far back in time a `Seek` - * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - * minutes. - * - * This object should have the same structure as [google.protobuf.Duration]{@link external:"google.protobuf.Duration"} - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Subscription]{@link Subscription}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedName = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var formattedTopic = client.topicPath("[PROJECT]", "[TOPIC]"); - * var request = { - * name: formattedName, - * topic: formattedTopic - * }; - * client.createSubscription(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.createSubscription = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + {'x-goog-api-client': clientHeader.join(' ')} + ); + + // Set up a dictionary of "inner API calls"; the core implementation + // of calling the API is handled in `google-gax`, with this code + // merely providing the destination and request information. + this._innerApiCalls = {}; + + // Put together the "service stub" for + // google.iam.v1.IAMPolicy. + var iamPolicyStub = gaxGrpc.createStub( + protos.google.iam.v1.IAMPolicy, + opts + ); + + // Iterate over each of the methods that the service provides + // and create an API call method for each. + var iamPolicyStubMethods = [ + 'setIamPolicy', + 'getIamPolicy', + 'testIamPermissions', + ]; + for (let methodName of iamPolicyStubMethods) { + this._innerApiCalls[methodName] = gax.createApiCall( + iamPolicyStub.then( + stub => + function() { + var args = Array.prototype.slice.call(arguments, 0); + return stub[methodName].apply(stub, args); + } + ), + defaults[methodName], + this._descriptors.page[methodName] || + this._descriptors.stream[methodName] + ); + } + + // Put together the "service stub" for + // google.pubsub.v1.Subscriber. + var subscriberStub = gaxGrpc.createStub( + protos.google.pubsub.v1.Subscriber, + opts + ); + + // Iterate over each of the methods that the service provides + // and create an API call method for each. + var subscriberStubMethods = [ + 'createSubscription', + 'getSubscription', + 'updateSubscription', + 'listSubscriptions', + 'deleteSubscription', + 'modifyAckDeadline', + 'acknowledge', + 'pull', + 'streamingPull', + 'modifyPushConfig', + 'listSnapshots', + 'createSnapshot', + 'updateSnapshot', + 'deleteSnapshot', + 'seek', + ]; + for (let methodName of subscriberStubMethods) { + this._innerApiCalls[methodName] = gax.createApiCall( + subscriberStub.then( + stub => + function() { + var args = Array.prototype.slice.call(arguments, 0); + return stub[methodName].apply(stub, args); + } + ), + defaults[methodName], + this._descriptors.page[methodName] || + this._descriptors.stream[methodName] + ); + } + + // note: editing generated code + this.waitForReady = function(deadline, callback) { + return subscriberStub.then( + stub => stub.waitForReady(deadline, callback), + callback + ); + }; } - return this._createSubscription(request, options, callback); -}; - -/** - * Gets the configuration details of a subscription. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * The name of the subscription to get. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Subscription]{@link Subscription}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * client.getSubscription({subscription: formattedSubscription}).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.getSubscription = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * The DNS address for this API service. + */ + static get servicePath() { + return 'pubsub.googleapis.com'; } - return this._getSubscription(request, options, callback); -}; - -/** - * Updates an existing subscription. Note that certain properties of a - * subscription, such as its topic, are not modifiable. - * - * @param {Object} request - * The request object that will be sent. - * @param {Object} request.subscription - * The updated subscription object. - * - * This object should have the same structure as [Subscription]{@link Subscription} - * @param {Object} request.updateMask - * Indicates which fields in the provided subscription to update. - * Must be specified and non-empty. - * - * This object should have the same structure as [google.protobuf.FieldMask]{@link external:"google.protobuf.FieldMask"} - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Subscription]{@link Subscription}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var subscription = {}; - * var updateMask = {}; - * var request = { - * subscription: subscription, - * updateMask: updateMask - * }; - * client.updateSubscription(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.updateSubscription = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * The port for this API service. + */ + static get port() { + return 443; } - return this._updateSubscription(request, options, callback); -}; - -/** - * Lists matching subscriptions. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * The name of the cloud project that subscriptions belong to. - * Format is `projects/{project}`. - * @param {number=} request.pageSize - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Array, ?Object, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is Array of [Subscription]{@link Subscription}. - * - * When autoPaginate: false is specified through options, it contains the result - * in a single response. If the response indicates the next page exists, the third - * parameter is set to be used for the next request object. The fourth parameter keeps - * the raw response object of an object representing [ListSubscriptionsResponse]{@link ListSubscriptionsResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Subscription]{@link Subscription}. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Subscription]{@link Subscription} in a single response. - * The second element is the next request object if the response - * indicates the next page exists, or null. The third element is - * an object representing [ListSubscriptionsResponse]{@link ListSubscriptionsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedProject = client.projectPath("[PROJECT]"); - * // Iterate over all elements. - * client.listSubscriptions({project: formattedProject}).then(function(responses) { - * var resources = responses[0]; - * for (var i = 0; i < resources.length; ++i) { - * // doThingsWith(resources[i]) - * } - * }).catch(function(err) { - * console.error(err); - * }); - * - * // Or obtain the paged response. - * var options = {autoPaginate: false}; - * function callback(responses) { - * // The actual resources in a response. - * var resources = responses[0]; - * // The next request if the response shows there's more responses. - * var nextRequest = responses[1]; - * // The actual response object, if necessary. - * // var rawResponse = responses[2]; - * for (var i = 0; i < resources.length; ++i) { - * // doThingsWith(resources[i]); - * } - * if (nextRequest) { - * // Fetch the next page. - * return client.listSubscriptions(nextRequest, options).then(callback); - * } - * } - * client.listSubscriptions({project: formattedProject}, options) - * .then(callback) - * .catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.listSubscriptions = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * The scopes needed to make gRPC calls for every method defined + * in this service. + */ + static get scopes() { + return [ + 'https://www.googleapis.com/auth/cloud-platform', + 'https://www.googleapis.com/auth/pubsub', + ]; } - return this._listSubscriptions(request, options, callback); -}; - -/** - * Equivalent to {@link listSubscriptions}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listSubscriptions} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * The name of the cloud project that subscriptions belong to. - * Format is `projects/{project}`. - * @param {number=} request.pageSize - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @return {Stream} - * An object stream which emits an object representing [Subscription]{@link Subscription} on 'data' event. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedProject = client.projectPath("[PROJECT]"); - * client.listSubscriptionsStream({project: formattedProject}).on('data', function(element) { - * // doThingsWith(element) - * }).on('error', function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.listSubscriptionsStream = function(request, options) { - if (options === undefined) { - options = {}; + /** + * Return the project ID used by this class. + * @param {function(Error, string)} callback - the callback to + * be called with the current project Id. + */ + getProjectId(callback) { + return this.auth.getProjectId(callback); } - return PAGE_DESCRIPTORS.listSubscriptions.createStream(this._listSubscriptions, request, options); -}; + // ------------------- + // -- Service calls -- + // ------------------- -/** - * Deletes an existing subscription. All messages retained in the subscription - * are immediately dropped. Calls to `Pull` after deletion will return - * `NOT_FOUND`. After a subscription is deleted, a new one may be created with - * the same name, but the new one has no association with the old - * subscription or its topic unless the same topic is specified. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * The subscription to delete. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error)=} callback - * The function which will be called with the result of the API call. - * @return {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * client.deleteSubscription({subscription: formattedSubscription}).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.deleteSubscription = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * Creates a subscription to a given topic. + * If the subscription already exists, returns `ALREADY_EXISTS`. + * If the corresponding topic doesn't exist, returns `NOT_FOUND`. + * + * If the name is not provided in the request, the server will assign a random + * name for this subscription on the same project as the topic, conforming + * to the + * [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + * The generated name is populated in the returned Subscription object. + * Note that for REST API requests, you must specify a name in the request. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * The name of the subscription. It must have the format + * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must + * start with a letter, and contain only letters (`[A-Za-z]`), numbers + * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), + * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters + * in length, and it must not start with `"goog"`. + * @param {string} request.topic + * The name of the topic from which this subscription is receiving messages. + * Format is `projects/{project}/topics/{topic}`. + * The value of this field will be `_deleted-topic_` if the topic has been + * deleted. + * @param {Object} [request.pushConfig] + * If push delivery is used with this subscription, this field is + * used to configure it. An empty `pushConfig` signifies that the subscriber + * will pull and ack messages using API methods. + * + * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} + * @param {number} [request.ackDeadlineSeconds] + * This value is the maximum time after a subscriber receives a message + * before the subscriber should acknowledge the message. After message + * delivery but before the ack deadline expires and before the message is + * acknowledged, it is an outstanding message and will not be delivered + * again during that time (on a best-effort basis). + * + * For pull subscriptions, this value is used as the initial value for the ack + * deadline. To override this value for a given message, call + * `ModifyAckDeadline` with the corresponding `ack_id` if using + * pull. + * The minimum custom deadline you can specify is 10 seconds. + * The maximum custom deadline you can specify is 600 seconds (10 minutes). + * If this parameter is 0, a default value of 10 seconds is used. + * + * For push delivery, this value is also used to set the request timeout for + * the call to the push endpoint. + * + * If the subscriber never acknowledges the message, the Pub/Sub + * system will eventually redeliver the message. + * @param {boolean} [request.retainAckedMessages] + * Indicates whether to retain acknowledged messages. If true, then + * messages are not expunged from the subscription's backlog, even if they are + * acknowledged, until they fall out of the `message_retention_duration` + * window. + * @param {Object} [request.messageRetentionDuration] + * How long to retain unacknowledged messages in the subscription's backlog, + * from the moment a message is published. + * If `retain_acked_messages` is true, then this also configures the retention + * of acknowledged messages, and thus configures how far back in time a `Seek` + * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 + * minutes. + * + * This object should have the same structure as [Duration]{@link google.protobuf.Duration} + * @param {Object.} [request.labels] + * User labels. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedName = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * var request = { + * name: formattedName, + * topic: formattedTopic, + * }; + * client.createSubscription(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + createSubscription(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.createSubscription(request, options, callback); } - return this._deleteSubscription(request, options, callback); -}; - -/** - * Modifies the ack deadline for a specific message. This method is useful - * to indicate that more time is needed to process a message by the - * subscriber, or to make the message available for redelivery if the - * processing was interrupted. Note that this does not modify the - * subscription-level `ackDeadlineSeconds` used for subsequent messages. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * The name of the subscription. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {string[]} request.ackIds - * List of acknowledgment IDs. - * @param {number} request.ackDeadlineSeconds - * The new ack deadline with respect to the time this request was sent to - * the Pub/Sub system. For example, if the value is 10, the new - * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call - * was made. Specifying zero may immediately make the message available for - * another pull request. - * The minimum deadline you can specify is 0 seconds. - * The maximum deadline you can specify is 600 seconds (10 minutes). - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error)=} callback - * The function which will be called with the result of the API call. - * @return {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var ackIds = []; - * var ackDeadlineSeconds = 0; - * var request = { - * subscription: formattedSubscription, - * ackIds: ackIds, - * ackDeadlineSeconds: ackDeadlineSeconds - * }; - * client.modifyAckDeadline(request).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.modifyAckDeadline = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * Gets the configuration details of a subscription. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * The name of the subscription to get. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * client.getSubscription({subscription: formattedSubscription}) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + getSubscription(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.getSubscription(request, options, callback); } - return this._modifyAckDeadline(request, options, callback); -}; - -/** - * Acknowledges the messages associated with the `ack_ids` in the - * `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages - * from the subscription. - * - * Acknowledging a message whose ack deadline has expired may succeed, - * but such a message may be redelivered later. Acknowledging a message more - * than once will not result in an error. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * The subscription whose message is being acknowledged. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {string[]} request.ackIds - * The acknowledgment ID for the messages being acknowledged that was returned - * by the Pub/Sub system in the `Pull` response. Must not be empty. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error)=} callback - * The function which will be called with the result of the API call. - * @return {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var ackIds = []; - * var request = { - * subscription: formattedSubscription, - * ackIds: ackIds - * }; - * client.acknowledge(request).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.acknowledge = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * Updates an existing subscription. Note that certain properties of a + * subscription, such as its topic, are not modifiable. + * NOTE: The style guide requires body: "subscription" instead of body: "*". + * Keeping the latter for internal consistency in V1, however it should be + * corrected in V2. See + * https://cloud.google.com/apis/design/standard_methods#update for details. + * + * @param {Object} request + * The request object that will be sent. + * @param {Object} request.subscription + * The updated subscription object. + * + * This object should have the same structure as [Subscription]{@link google.pubsub.v1.Subscription} + * @param {Object} request.updateMask + * Indicates which fields in the provided subscription to update. + * Must be specified and non-empty. + * + * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var subscription = {}; + * var updateMask = {}; + * var request = { + * subscription: subscription, + * updateMask: updateMask, + * }; + * client.updateSubscription(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + updateSubscription(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.updateSubscription(request, options, callback); } - return this._acknowledge(request, options, callback); -}; - -/** - * Pulls messages from the server. Returns an empty list if there are no - * messages available in the backlog. The server may return `UNAVAILABLE` if - * there are too many concurrent pull requests pending for the given - * subscription. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * The subscription from which messages should be pulled. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {number} request.maxMessages - * The maximum number of messages returned for this request. The Pub/Sub - * system may return fewer than the number specified. - * @param {boolean=} request.returnImmediately - * If this field set to true, the system will respond immediately even if - * it there are no messages available to return in the `Pull` response. - * Otherwise, the system may wait (for a bounded amount of time) until at - * least one message is available, rather than returning no messages. The - * client may cancel the request if it does not wish to wait any longer for - * the response. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [PullResponse]{@link PullResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [PullResponse]{@link PullResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var maxMessages = 0; - * var request = { - * subscription: formattedSubscription, - * maxMessages: maxMessages - * }; - * client.pull(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.pull = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * Lists matching subscriptions. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that subscriptions belong to. + * Format is `projects/{project}`. + * @param {number} [request.pageSize] + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is Array of [Subscription]{@link google.pubsub.v1.Subscription}. + * + * When autoPaginate: false is specified through options, it contains the result + * in a single response. If the response indicates the next page exists, the third + * parameter is set to be used for the next request object. The fourth parameter keeps + * the raw response object of an object representing [ListSubscriptionsResponse]{@link google.pubsub.v1.ListSubscriptionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Subscription]{@link google.pubsub.v1.Subscription}. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Subscription]{@link google.pubsub.v1.Subscription} in a single response. + * The second element is the next request object if the response + * indicates the next page exists, or null. The third element is + * an object representing [ListSubscriptionsResponse]{@link google.pubsub.v1.ListSubscriptionsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * // Iterate over all elements. + * var formattedProject = client.projectPath('[PROJECT]'); + * + * client.listSubscriptions({project: formattedProject}) + * .then(responses => { + * var resources = responses[0]; + * for (let i = 0; i < resources.length; i += 1) { + * // doThingsWith(resources[i]) + * } + * }) + * .catch(err => { + * console.error(err); + * }); + * + * // Or obtain the paged response. + * var formattedProject = client.projectPath('[PROJECT]'); + * + * + * var options = {autoPaginate: false}; + * var callback = responses => { + * // The actual resources in a response. + * var resources = responses[0]; + * // The next request if the response shows that there are more responses. + * var nextRequest = responses[1]; + * // The actual response object, if necessary. + * // var rawResponse = responses[2]; + * for (let i = 0; i < resources.length; i += 1) { + * // doThingsWith(resources[i]); + * } + * if (nextRequest) { + * // Fetch the next page. + * return client.listSubscriptions(nextRequest, options).then(callback); + * } + * } + * client.listSubscriptions({project: formattedProject}, options) + * .then(callback) + * .catch(err => { + * console.error(err); + * }); + */ + listSubscriptions(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.listSubscriptions(request, options, callback); } - return this._pull(request, options, callback); -}; + /** + * Equivalent to {@link listSubscriptions}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listSubscriptions} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that subscriptions belong to. + * Format is `projects/{project}`. + * @param {number} [request.pageSize] + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @returns {Stream} + * An object stream which emits an object representing [Subscription]{@link google.pubsub.v1.Subscription} on 'data' event. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedProject = client.projectPath('[PROJECT]'); + * client.listSubscriptionsStream({project: formattedProject}) + * .on('data', element => { + * // doThingsWith(element) + * }).on('error', err => { + * console.log(err); + * }); + */ + listSubscriptionsStream(request, options) { + options = options || {}; + + return this._descriptors.page.listSubscriptions.createStream( + this._innerApiCalls.listSubscriptions, + request, + options + ); + } -/** - * (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will - * respond with UNIMPLEMENTED errors unless you have been invited to test - * this feature. Contact cloud-pubsub@google.com with any questions. - * - * Establishes a stream with the server, which sends messages down to the - * client. The client streams acknowledgements and ack deadline modifications - * back to the server. The server will close the stream and return the status - * on any error. The server may close the stream with status `OK` to reassign - * server-side resources, in which case, the client should re-establish the - * stream. `UNAVAILABLE` may also be returned in the case of a transient error - * (e.g., a server restart). These should also be retried by the client. Flow - * control can be achieved by configuring the underlying RPC channel. - * - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @returns {Stream} - * An object stream which is both readable and writable. It accepts objects - * representing [StreamingPullRequest]{@link StreamingPullRequest} for write() method, and - * will emit objects representing [StreamingPullResponse]{@link StreamingPullResponse} on 'data' event asynchronously. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var stream = client.streamingPull().on('data', function(response) { - * // doThingsWith(response); - * }); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var streamAckDeadlineSeconds = 0; - * var request = { - * subscription : formattedSubscription, - * streamAckDeadlineSeconds : streamAckDeadlineSeconds - * }; - * var request = { - * root: request - * }; - * // Write request objects. - * stream.write(request); - */ -SubscriberClient.prototype.streamingPull = function(options) { - if (options === undefined) { - options = {}; + /** + * Deletes an existing subscription. All messages retained in the subscription + * are immediately dropped. Calls to `Pull` after deletion will return + * `NOT_FOUND`. After a subscription is deleted, a new one may be created with + * the same name, but the new one has no association with the old + * subscription or its topic unless the same topic is specified. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * The subscription to delete. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error)} [callback] + * The function which will be called with the result of the API call. + * @returns {Promise} - The promise which resolves when API call finishes. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * client.deleteSubscription({subscription: formattedSubscription}).catch(err => { + * console.error(err); + * }); + */ + deleteSubscription(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.deleteSubscription(request, options, callback); } - return this._streamingPull(options); -}; + /** + * Modifies the ack deadline for a specific message. This method is useful + * to indicate that more time is needed to process a message by the + * subscriber, or to make the message available for redelivery if the + * processing was interrupted. Note that this does not modify the + * subscription-level `ackDeadlineSeconds` used for subsequent messages. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {string[]} request.ackIds + * List of acknowledgment IDs. + * @param {number} request.ackDeadlineSeconds + * The new ack deadline with respect to the time this request was sent to + * the Pub/Sub system. For example, if the value is 10, the new + * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call + * was made. Specifying zero may immediately make the message available for + * another pull request. + * The minimum deadline you can specify is 0 seconds. + * The maximum deadline you can specify is 600 seconds (10 minutes). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error)} [callback] + * The function which will be called with the result of the API call. + * @returns {Promise} - The promise which resolves when API call finishes. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var ackIds = []; + * var ackDeadlineSeconds = 0; + * var request = { + * subscription: formattedSubscription, + * ackIds: ackIds, + * ackDeadlineSeconds: ackDeadlineSeconds, + * }; + * client.modifyAckDeadline(request).catch(err => { + * console.error(err); + * }); + */ + modifyAckDeadline(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.modifyAckDeadline(request, options, callback); + } -/** - * Modifies the `PushConfig` for a specified subscription. - * - * This may be used to change a push subscription to a pull one (signified by - * an empty `PushConfig`) or vice versa, or change the endpoint URL and other - * attributes of a push subscription. Messages will accumulate for delivery - * continuously through the call regardless of changes to the `PushConfig`. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * The name of the subscription. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {Object} request.pushConfig - * The push configuration for future deliveries. - * - * An empty `pushConfig` indicates that the Pub/Sub system should - * stop pushing messages from the given subscription and allow - * messages to be pulled and acknowledged - effectively pausing - * the subscription if `Pull` is not called. - * - * This object should have the same structure as [PushConfig]{@link PushConfig} - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error)=} callback - * The function which will be called with the result of the API call. - * @return {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var pushConfig = {}; - * var request = { - * subscription: formattedSubscription, - * pushConfig: pushConfig - * }; - * client.modifyPushConfig(request).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.modifyPushConfig = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + /** + * Acknowledges the messages associated with the `ack_ids` in the + * `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages + * from the subscription. + * + * Acknowledging a message whose ack deadline has expired may succeed, + * but such a message may be redelivered later. Acknowledging a message more + * than once will not result in an error. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * The subscription whose message is being acknowledged. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {string[]} request.ackIds + * The acknowledgment ID for the messages being acknowledged that was returned + * by the Pub/Sub system in the `Pull` response. Must not be empty. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error)} [callback] + * The function which will be called with the result of the API call. + * @returns {Promise} - The promise which resolves when API call finishes. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var ackIds = []; + * var request = { + * subscription: formattedSubscription, + * ackIds: ackIds, + * }; + * client.acknowledge(request).catch(err => { + * console.error(err); + * }); + */ + acknowledge(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.acknowledge(request, options, callback); } - if (options === undefined) { - options = {}; + + /** + * Pulls messages from the server. Returns an empty list if there are no + * messages available in the backlog. The server may return `UNAVAILABLE` if + * there are too many concurrent pull requests pending for the given + * subscription. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * The subscription from which messages should be pulled. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {number} request.maxMessages + * The maximum number of messages returned for this request. The Pub/Sub + * system may return fewer than the number specified. + * @param {boolean} [request.returnImmediately] + * If this field set to true, the system will respond immediately even if + * it there are no messages available to return in the `Pull` response. + * Otherwise, the system may wait (for a bounded amount of time) until at + * least one message is available, rather than returning no messages. The + * client may cancel the request if it does not wish to wait any longer for + * the response. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var maxMessages = 0; + * var request = { + * subscription: formattedSubscription, + * maxMessages: maxMessages, + * }; + * client.pull(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + pull(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.pull(request, options, callback); } - return this._modifyPushConfig(request, options, callback); -}; + /** + * (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will + * respond with UNIMPLEMENTED errors unless you have been invited to test + * this feature. Contact cloud-pubsub@google.com with any questions. + * + * Establishes a stream with the server, which sends messages down to the + * client. The client streams acknowledgements and ack deadline modifications + * back to the server. The server will close the stream and return the status + * on any error. The server may close the stream with status `OK` to reassign + * server-side resources, in which case, the client should re-establish the + * stream. `UNAVAILABLE` may also be returned in the case of a transient error + * (e.g., a server restart). These should also be retried by the client. Flow + * control can be achieved by configuring the underlying RPC channel. + * + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @returns {Stream} + * An object stream which is both readable and writable. It accepts objects + * representing [StreamingPullRequest]{@link google.pubsub.v1.StreamingPullRequest} for write() method, and + * will emit objects representing [StreamingPullResponse]{@link google.pubsub.v1.StreamingPullResponse} on 'data' event asynchronously. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var stream = client.streamingPull().on('data', response => { + * // doThingsWith(response) + * }); + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var streamAckDeadlineSeconds = 0; + * var request = { + * subscription: formattedSubscription, + * streamAckDeadlineSeconds: streamAckDeadlineSeconds, + * }; + * var request = { + * root: request, + * }; + * // Write request objects. + * stream.write(request); + */ + streamingPull(options) { + options = options || {}; -/** - * Lists the existing snapshots. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * The name of the cloud project that snapshots belong to. - * Format is `projects/{project}`. - * @param {number=} request.pageSize - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Array, ?Object, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is Array of [Snapshot]{@link Snapshot}. - * - * When autoPaginate: false is specified through options, it contains the result - * in a single response. If the response indicates the next page exists, the third - * parameter is set to be used for the next request object. The fourth parameter keeps - * the raw response object of an object representing [ListSnapshotsResponse]{@link ListSnapshotsResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Snapshot]{@link Snapshot}. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Snapshot]{@link Snapshot} in a single response. - * The second element is the next request object if the response - * indicates the next page exists, or null. The third element is - * an object representing [ListSnapshotsResponse]{@link ListSnapshotsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedProject = client.projectPath("[PROJECT]"); - * // Iterate over all elements. - * client.listSnapshots({project: formattedProject}).then(function(responses) { - * var resources = responses[0]; - * for (var i = 0; i < resources.length; ++i) { - * // doThingsWith(resources[i]) - * } - * }).catch(function(err) { - * console.error(err); - * }); - * - * // Or obtain the paged response. - * var options = {autoPaginate: false}; - * function callback(responses) { - * // The actual resources in a response. - * var resources = responses[0]; - * // The next request if the response shows there's more responses. - * var nextRequest = responses[1]; - * // The actual response object, if necessary. - * // var rawResponse = responses[2]; - * for (var i = 0; i < resources.length; ++i) { - * // doThingsWith(resources[i]); - * } - * if (nextRequest) { - * // Fetch the next page. - * return client.listSnapshots(nextRequest, options).then(callback); - * } - * } - * client.listSnapshots({project: formattedProject}, options) - * .then(callback) - * .catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.listSnapshots = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + return this._innerApiCalls.streamingPull(options); } - return this._listSnapshots(request, options, callback); -}; - -/** - * Equivalent to {@link listSnapshots}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listSnapshots} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * The name of the cloud project that snapshots belong to. - * Format is `projects/{project}`. - * @param {number=} request.pageSize - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @return {Stream} - * An object stream which emits an object representing [Snapshot]{@link Snapshot} on 'data' event. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedProject = client.projectPath("[PROJECT]"); - * client.listSnapshotsStream({project: formattedProject}).on('data', function(element) { - * // doThingsWith(element) - * }).on('error', function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.listSnapshotsStream = function(request, options) { - if (options === undefined) { - options = {}; + /** + * Modifies the `PushConfig` for a specified subscription. + * + * This may be used to change a push subscription to a pull one (signified by + * an empty `PushConfig`) or vice versa, or change the endpoint URL and other + * attributes of a push subscription. Messages will accumulate for delivery + * continuously through the call regardless of changes to the `PushConfig`. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {Object} request.pushConfig + * The push configuration for future deliveries. + * + * An empty `pushConfig` indicates that the Pub/Sub system should + * stop pushing messages from the given subscription and allow + * messages to be pulled and acknowledged - effectively pausing + * the subscription if `Pull` is not called. + * + * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error)} [callback] + * The function which will be called with the result of the API call. + * @returns {Promise} - The promise which resolves when API call finishes. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var pushConfig = {}; + * var request = { + * subscription: formattedSubscription, + * pushConfig: pushConfig, + * }; + * client.modifyPushConfig(request).catch(err => { + * console.error(err); + * }); + */ + modifyPushConfig(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.modifyPushConfig(request, options, callback); } - return PAGE_DESCRIPTORS.listSnapshots.createStream(this._listSnapshots, request, options); -}; + /** + * Lists the existing snapshots. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that snapshots belong to. + * Format is `projects/{project}`. + * @param {number} [request.pageSize] + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. + * + * When autoPaginate: false is specified through options, it contains the result + * in a single response. If the response indicates the next page exists, the third + * parameter is set to be used for the next request object. The fourth parameter keeps + * the raw response object of an object representing [ListSnapshotsResponse]{@link google.pubsub.v1.ListSnapshotsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Snapshot]{@link google.pubsub.v1.Snapshot} in a single response. + * The second element is the next request object if the response + * indicates the next page exists, or null. The third element is + * an object representing [ListSnapshotsResponse]{@link google.pubsub.v1.ListSnapshotsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * // Iterate over all elements. + * var formattedProject = client.projectPath('[PROJECT]'); + * + * client.listSnapshots({project: formattedProject}) + * .then(responses => { + * var resources = responses[0]; + * for (let i = 0; i < resources.length; i += 1) { + * // doThingsWith(resources[i]) + * } + * }) + * .catch(err => { + * console.error(err); + * }); + * + * // Or obtain the paged response. + * var formattedProject = client.projectPath('[PROJECT]'); + * + * + * var options = {autoPaginate: false}; + * var callback = responses => { + * // The actual resources in a response. + * var resources = responses[0]; + * // The next request if the response shows that there are more responses. + * var nextRequest = responses[1]; + * // The actual response object, if necessary. + * // var rawResponse = responses[2]; + * for (let i = 0; i < resources.length; i += 1) { + * // doThingsWith(resources[i]); + * } + * if (nextRequest) { + * // Fetch the next page. + * return client.listSnapshots(nextRequest, options).then(callback); + * } + * } + * client.listSnapshots({project: formattedProject}, options) + * .then(callback) + * .catch(err => { + * console.error(err); + * }); + */ + listSnapshots(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.listSnapshots(request, options, callback); + } -/** - * Creates a snapshot from the requested subscription. - * If the snapshot already exists, returns `ALREADY_EXISTS`. - * If the requested subscription doesn't exist, returns `NOT_FOUND`. - * - * If the name is not provided in the request, the server will assign a random - * name for this snapshot on the same project as the subscription, conforming - * to the - * [resource name format](https://cloud.google.com/pubsub/docs/overview#names). - * The generated name is populated in the returned Snapshot object. - * Note that for REST API requests, you must specify a name in the request. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.name - * Optional user-provided name for this snapshot. - * If the name is not provided in the request, the server will assign a random - * name for this snapshot on the same project as the subscription. - * Note that for REST API requests, you must specify a name. - * Format is `projects/{project}/snapshots/{snap}`. - * @param {string} request.subscription - * The subscription whose backlog the snapshot retains. - * Specifically, the created snapshot is guaranteed to retain: - * (a) The existing backlog on the subscription. More precisely, this is - * defined as the messages in the subscription's backlog that are - * unacknowledged upon the successful completion of the - * `CreateSnapshot` request; as well as: - * (b) Any messages published to the subscription's topic following the - * successful completion of the CreateSnapshot request. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Snapshot]{@link Snapshot}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Snapshot]{@link Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedName = client.snapshotPath("[PROJECT]", "[SNAPSHOT]"); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var request = { - * name: formattedName, - * subscription: formattedSubscription - * }; - * client.createSnapshot(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.createSnapshot = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + /** + * Equivalent to {@link listSnapshots}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listSnapshots} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * The name of the cloud project that snapshots belong to. + * Format is `projects/{project}`. + * @param {number} [request.pageSize] + * The maximum number of resources contained in the underlying API + * response. If page streaming is performed per-resource, this + * parameter does not affect the return value. If page streaming is + * performed per-page, this determines the maximum number of + * resources in a page. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @returns {Stream} + * An object stream which emits an object representing [Snapshot]{@link google.pubsub.v1.Snapshot} on 'data' event. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedProject = client.projectPath('[PROJECT]'); + * client.listSnapshotsStream({project: formattedProject}) + * .on('data', element => { + * // doThingsWith(element) + * }).on('error', err => { + * console.log(err); + * }); + */ + listSnapshotsStream(request, options) { + options = options || {}; + + return this._descriptors.page.listSnapshots.createStream( + this._innerApiCalls.listSnapshots, + request, + options + ); } - if (options === undefined) { - options = {}; + + /** + * Creates a snapshot from the requested subscription. + * If the snapshot already exists, returns `ALREADY_EXISTS`. + * If the requested subscription doesn't exist, returns `NOT_FOUND`. + * + * If the name is not provided in the request, the server will assign a random + * name for this snapshot on the same project as the subscription, conforming + * to the + * [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + * The generated name is populated in the returned Snapshot object. + * Note that for REST API requests, you must specify a name in the request. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Optional user-provided name for this snapshot. + * If the name is not provided in the request, the server will assign a random + * name for this snapshot on the same project as the subscription. + * Note that for REST API requests, you must specify a name. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {string} request.subscription + * The subscription whose backlog the snapshot retains. + * Specifically, the created snapshot is guaranteed to retain: + * (a) The existing backlog on the subscription. More precisely, this is + * defined as the messages in the subscription's backlog that are + * unacknowledged upon the successful completion of the + * `CreateSnapshot` request; as well as: + * (b) Any messages published to the subscription's topic following the + * successful completion of the CreateSnapshot request. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var request = { + * name: formattedName, + * subscription: formattedSubscription, + * }; + * client.createSnapshot(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + createSnapshot(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.createSnapshot(request, options, callback); } - return this._createSnapshot(request, options, callback); -}; + /** + * Updates an existing snapshot. Note that certain properties of a snapshot + * are not modifiable. + * NOTE: The style guide requires body: "snapshot" instead of body: "*". + * Keeping the latter for internal consistency in V1, however it should be + * corrected in V2. See + * https://cloud.google.com/apis/design/standard_methods#update for details. + * + * @param {Object} request + * The request object that will be sent. + * @param {Object} request.snapshot + * The updated snpashot object. + * + * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} + * @param {Object} request.updateMask + * Indicates which fields in the provided snapshot to update. + * Must be specified and non-empty. + * + * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var snapshot = {}; + * var updateMask = {}; + * var request = { + * snapshot: snapshot, + * updateMask: updateMask, + * }; + * client.updateSnapshot(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + updateSnapshot(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.updateSnapshot(request, options, callback); + } -/** - * Removes an existing snapshot. All messages retained in the snapshot - * are immediately dropped. After a snapshot is deleted, a new one may be - * created with the same name, but the new one has no association with the old - * snapshot or its subscription, unless the same subscription is specified. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.snapshot - * The name of the snapshot to delete. - * Format is `projects/{project}/snapshots/{snap}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error)=} callback - * The function which will be called with the result of the API call. - * @return {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedSnapshot = client.snapshotPath("[PROJECT]", "[SNAPSHOT]"); - * client.deleteSnapshot({snapshot: formattedSnapshot}).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.deleteSnapshot = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + /** + * Removes an existing snapshot. All messages retained in the snapshot + * are immediately dropped. After a snapshot is deleted, a new one may be + * created with the same name, but the new one has no association with the old + * snapshot or its subscription, unless the same subscription is specified. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.snapshot + * The name of the snapshot to delete. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error)} [callback] + * The function which will be called with the result of the API call. + * @returns {Promise} - The promise which resolves when API call finishes. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + * client.deleteSnapshot({snapshot: formattedSnapshot}).catch(err => { + * console.error(err); + * }); + */ + deleteSnapshot(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.deleteSnapshot(request, options, callback); } - if (options === undefined) { - options = {}; + + /** + * Seeks an existing subscription to a point in time or to a given snapshot, + * whichever is provided in the request. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * The subscription to affect. + * @param {Object} [request.time] + * The time to seek to. + * Messages retained in the subscription that were published before this + * time are marked as acknowledged, and messages retained in the + * subscription that were published after this time are marked as + * unacknowledged. Note that this operation affects only those messages + * retained in the subscription (configured by the combination of + * `message_retention_duration` and `retain_acked_messages`). For example, + * if `time` corresponds to a point before the message retention + * window (or to a point before the system's notion of the subscription + * creation time), only retained messages will be marked as unacknowledged, + * and already-expunged messages will not be restored. + * + * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} + * @param {string} [request.snapshot] + * The snapshot to seek to. The snapshot's topic must be the same as that of + * the provided subscription. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * client.seek({subscription: formattedSubscription}) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + seek(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.seek(request, options, callback); } - return this._deleteSnapshot(request, options, callback); -}; + /** + * Sets the access control policy on the specified resource. Replaces any + * existing policy. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being specified. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {Object} request.policy + * REQUIRED: The complete policy to be applied to the `resource`. The size of + * the policy is limited to a few 10s of KB. An empty policy is a + * valid policy but certain Cloud Platform services (such as Projects) + * might reject them. + * + * This object should have the same structure as [Policy]{@link google.iam.v1.Policy} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var policy = {}; + * var request = { + * resource: formattedResource, + * policy: policy, + * }; + * client.setIamPolicy(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + setIamPolicy(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.setIamPolicy(request, options, callback); + } -/** - * Seeks an existing subscription to a point in time or to a given snapshot, - * whichever is provided in the request. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * The subscription to affect. - * @param {Object=} request.time - * The time to seek to. - * Messages retained in the subscription that were published before this - * time are marked as acknowledged, and messages retained in the - * subscription that were published after this time are marked as - * unacknowledged. Note that this operation affects only those messages - * retained in the subscription (configured by the combination of - * `message_retention_duration` and `retain_acked_messages`). For example, - * if `time` corresponds to a point before the message retention - * window (or to a point before the system's notion of the subscription - * creation time), only retained messages will be marked as unacknowledged, - * and already-expunged messages will not be restored. - * - * This object should have the same structure as [google.protobuf.Timestamp]{@link external:"google.protobuf.Timestamp"} - * @param {string=} request.snapshot - * The snapshot to seek to. The snapshot's topic must be the same as that of - * the provided subscription. - * Format is `projects/{project}/snapshots/{snap}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [SeekResponse]{@link SeekResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [SeekResponse]{@link SeekResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedSubscription = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * client.seek({subscription: formattedSubscription}).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.seek = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + /** + * Gets the access control policy for a resource. + * Returns an empty policy if the resource exists and does not have a policy + * set. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * client.getIamPolicy({resource: formattedResource}) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + getIamPolicy(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.getIamPolicy(request, options, callback); } - if (options === undefined) { - options = {}; + + /** + * Returns permissions that a caller has on the specified resource. + * If the resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + * @example + * + * const pubsub = require('@google-cloud/pubsub'); + * + * var client = new pubsub.v1.SubscriberClient({ + * // optional auth parameters. + * }); + * + * var formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * var permissions = []; + * var request = { + * resource: formattedResource, + * permissions: permissions, + * }; + * client.testIamPermissions(request) + * .then(responses => { + * var response = responses[0]; + * // doThingsWith(response) + * }) + * .catch(err => { + * console.error(err); + * }); + */ + testIamPermissions(request, options, callback) { + if (options instanceof Function && callback === undefined) { + callback = options; + options = {}; + } + options = options || {}; + + return this._innerApiCalls.testIamPermissions(request, options, callback); } - return this._seek(request, options, callback); -}; + // -------------------- + // -- Path templates -- + // -------------------- -/** - * Sets the access control policy on the specified resource. Replaces any - * existing policy. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy is being specified. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * @param {Object} request.policy - * REQUIRED: The complete policy to be applied to the `resource`. The size of - * the policy is limited to a few 10s of KB. An empty policy is a - * valid policy but certain Cloud Platform services (such as Projects) - * might reject them. - * - * This object should have the same structure as [Policy]{@link Policy} - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Policy]{@link Policy}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link Policy}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedResource = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var policy = {}; - * var request = { - * resource: formattedResource, - * policy: policy - * }; - * client.setIamPolicy(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.setIamPolicy = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - if (options === undefined) { - options = {}; + /** + * Return a fully-qualified project resource name string. + * + * @param {String} project + * @returns {String} + */ + projectPath(project) { + return this._pathTemplates.projectPathTemplate.render({ + project: project, + }); } - return this._setIamPolicy(request, options, callback); -}; + /** + * Return a fully-qualified snapshot resource name string. + * + * @param {String} project + * @param {String} snapshot + * @returns {String} + */ + snapshotPath(project, snapshot) { + return this._pathTemplates.snapshotPathTemplate.render({ + project: project, + snapshot: snapshot, + }); + } -/** - * Gets the access control policy for a resource. - * Returns an empty policy if the resource exists and does not have a policy - * set. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Policy]{@link Policy}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link Policy}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedResource = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * client.getIamPolicy({resource: formattedResource}).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.getIamPolicy = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + /** + * Return a fully-qualified subscription resource name string. + * + * @param {String} project + * @param {String} subscription + * @returns {String} + */ + subscriptionPath(project, subscription) { + return this._pathTemplates.subscriptionPathTemplate.render({ + project: project, + subscription: subscription, + }); } - if (options === undefined) { - options = {}; + + /** + * Return a fully-qualified topic resource name string. + * + * @param {String} project + * @param {String} topic + * @returns {String} + */ + topicPath(project, topic) { + return this._pathTemplates.topicPathTemplate.render({ + project: project, + topic: topic, + }); } - return this._getIamPolicy(request, options, callback); -}; + /** + * Parse the projectName from a project resource. + * + * @param {String} projectName + * A fully-qualified path representing a project resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromProjectName(projectName) { + return this._pathTemplates.projectPathTemplate.match(projectName).project; + } -/** - * Returns permissions that a caller has on the specified resource. - * If the resource does not exist, this will return an empty set of - * permissions, not a NOT_FOUND error. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy detail is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * @param {string[]} request.permissions - * The set of permissions to check for the `resource`. Permissions with - * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). - * @param {Object=} options - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. - * @param {function(?Error, ?Object)=} callback - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse}. - * @return {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link TestIamPermissionsResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * var client = pubsubV1.subscriberClient(); - * var formattedResource = client.subscriptionPath("[PROJECT]", "[SUBSCRIPTION]"); - * var permissions = []; - * var request = { - * resource: formattedResource, - * permissions: permissions - * }; - * client.testIamPermissions(request).then(function(responses) { - * var response = responses[0]; - * // doThingsWith(response) - * }).catch(function(err) { - * console.error(err); - * }); - */ -SubscriberClient.prototype.testIamPermissions = function(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; + /** + * Parse the snapshotName from a snapshot resource. + * + * @param {String} snapshotName + * A fully-qualified path representing a snapshot resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromSnapshotName(snapshotName) { + return this._pathTemplates.snapshotPathTemplate.match(snapshotName).project; } - if (options === undefined) { - options = {}; + + /** + * Parse the snapshotName from a snapshot resource. + * + * @param {String} snapshotName + * A fully-qualified path representing a snapshot resources. + * @returns {String} - A string representing the snapshot. + */ + matchSnapshotFromSnapshotName(snapshotName) { + return this._pathTemplates.snapshotPathTemplate.match(snapshotName) + .snapshot; } - return this._testIamPermissions(request, options, callback); -}; + /** + * Parse the subscriptionName from a subscription resource. + * + * @param {String} subscriptionName + * A fully-qualified path representing a subscription resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromSubscriptionName(subscriptionName) { + return this._pathTemplates.subscriptionPathTemplate.match(subscriptionName) + .project; + } -function SubscriberClientBuilder(gaxGrpc) { - if (!(this instanceof SubscriberClientBuilder)) { - return new SubscriberClientBuilder(gaxGrpc); + /** + * Parse the subscriptionName from a subscription resource. + * + * @param {String} subscriptionName + * A fully-qualified path representing a subscription resources. + * @returns {String} - A string representing the subscription. + */ + matchSubscriptionFromSubscriptionName(subscriptionName) { + return this._pathTemplates.subscriptionPathTemplate.match(subscriptionName) + .subscription; } - var iamPolicyClient = gaxGrpc.load([{ - root: require('google-proto-files')('..'), - file: 'google/iam/v1/iam_policy.proto' - }]); - extend(this, iamPolicyClient.google.iam.v1); - - var subscriberClient = gaxGrpc.load([{ - root: require('google-proto-files')('..'), - file: 'google/pubsub/v1/pubsub.proto' - }]); - extend(this, subscriberClient.google.pubsub.v1); - - var grpcClients = extend( - true, - {}, - iamPolicyClient, - subscriberClient - ); + /** + * Parse the topicName from a topic resource. + * + * @param {String} topicName + * A fully-qualified path representing a topic resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromTopicName(topicName) { + return this._pathTemplates.topicPathTemplate.match(topicName).project; + } /** - * Build a new instance of {@link SubscriberClient}. - * - * @param {Object=} opts - The optional parameters. - * @param {String=} opts.servicePath - * The domain name of the API remote host. - * @param {number=} opts.port - * The port on which to connect to the remote host. - * @param {grpc.ClientCredentials=} opts.sslCreds - * A ClientCredentials for use with an SSL-enabled channel. - * @param {Object=} opts.clientConfig - * The customized config to build the call settings. See - * {@link gax.constructSettings} for the format. + * Parse the topicName from a topic resource. + * + * @param {String} topicName + * A fully-qualified path representing a topic resources. + * @returns {String} - A string representing the topic. */ - this.subscriberClient = function(opts) { - return new SubscriberClient(gaxGrpc, grpcClients, opts); - }; - extend(this.subscriberClient, SubscriberClient); + matchTopicFromTopicName(topicName) { + return this._pathTemplates.topicPathTemplate.match(topicName).topic; + } } -module.exports = SubscriberClientBuilder; -module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS; -module.exports.ALL_SCOPES = ALL_SCOPES; + +module.exports = SubscriberClient; diff --git a/handwritten/pubsub/system-test/.eslintrc.yml b/handwritten/pubsub/system-test/.eslintrc.yml new file mode 100644 index 00000000000..2e6882e46d2 --- /dev/null +++ b/handwritten/pubsub/system-test/.eslintrc.yml @@ -0,0 +1,6 @@ +--- +env: + mocha: true +rules: + node/no-unpublished-require: off + no-console: off diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index fcef40d6204..0cd5eb6558d 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -21,27 +21,23 @@ var async = require('async'); var Subscription = require('../src/subscription.js'); var uuid = require('uuid'); -var env = require('../../../system-test/env.js'); -var pubsub = require('../')(env); +var PubSub = require('../'); +var pubsub = PubSub(); describe('pubsub', function() { var TOPIC_NAMES = [ generateTopicName(), generateTopicName(), - generateTopicName() + generateTopicName(), ]; var TOPICS = [ pubsub.topic(TOPIC_NAMES[0]), pubsub.topic(TOPIC_NAMES[1]), - pubsub.topic(TOPIC_NAMES[2]) + pubsub.topic(TOPIC_NAMES[2]), ]; - var TOPIC_FULL_NAMES = [ - TOPICS[0].name, - TOPICS[1].name, - TOPICS[2].name - ]; + var TOPIC_FULL_NAMES = [TOPICS[0].name, TOPICS[1].name, TOPICS[2].name]; function generateSnapshotName() { return 'test-snapshot-' + uuid.v4(); @@ -67,47 +63,62 @@ describe('pubsub', function() { var publisher = topic.publisher(); var subscription = topic.subscription(generateSubName()); - async.series([ - topic.create.bind(topic), - subscription.create.bind(subscription), - function(callback) { - async.times(6, function(_, callback) { - publisher.publish(new Buffer(message), options, callback); - }, callback); - } - ], function(err) { - if (err) { - callback(err); - return; - } + async.series( + [ + topic.create.bind(topic), + subscription.create.bind(subscription), + function(callback) { + async.times( + 6, + function(_, callback) { + publisher.publish(Buffer.from(message), options, callback); + }, + callback + ); + }, + ], + function(err) { + if (err) { + callback(err); + return; + } - subscription.on('error', callback); + subscription.on('error', callback); - subscription.once('message', function(message) { - callback(null, message); - }); - }); + subscription.once('message', function(message) { + callback(null, message); + }); + } + ); } before(function(done) { // create all needed topics - async.each(TOPICS, function(topic, cb) { - topic.create(cb); - }, function(err) { - if (err) { - done(err); - return; - } + async.each( + TOPICS, + function(topic, cb) { + topic.create(cb); + }, + function(err) { + if (err) { + done(err); + return; + } - setTimeout(done, 5000); - }); + setTimeout(done, 5000); + } + ); }); after(function(done) { // Delete topics - async.each(TOPICS, function(topic, callback) { - topic.delete(callback); - }, done); + async.each( + TOPICS, + function(topic, callback) { + topic.delete(callback); + }, + done + ); }); describe('Topic', function() { @@ -128,7 +139,8 @@ describe('pubsub', function() { it('should list topics in a stream', function(done) { var topicsEmitted = []; - pubsub.getTopicsStream() + pubsub + .getTopicsStream() .on('error', done) .on('data', function(topic) { topicsEmitted.push(topic); @@ -144,14 +156,17 @@ describe('pubsub', function() { }); it('should allow manual paging', function(done) { - pubsub.getTopics({ - pageSize: TOPIC_NAMES.length - 1, - gaxOpts: { autoPaginate: false } - }, function(err, topics) { - assert.ifError(err); - assert(topics.length, TOPIC_NAMES.length - 1); - done(); - }); + pubsub.getTopics( + { + pageSize: TOPIC_NAMES.length - 1, + gaxOpts: {autoPaginate: false}, + }, + function(err, topics) { + assert.ifError(err); + assert(topics.length, TOPIC_NAMES.length - 1); + done(); + } + ); }); it('should be created and deleted', function(done) { @@ -165,7 +180,7 @@ describe('pubsub', function() { it('should honor the autoCreate option', function(done) { var topic = pubsub.topic(generateTopicName()); - topic.get({ autoCreate: true }, done); + topic.get({autoCreate: true}, done); }); it('should confirm if a topic exists', function(done) { @@ -191,7 +206,7 @@ describe('pubsub', function() { it('should publish a message', function(done) { var topic = pubsub.topic(TOPIC_NAMES[0]); var publisher = topic.publisher(); - var message = new Buffer('message from me'); + var message = Buffer.from('message from me'); publisher.publish(message, function(err, messageId) { assert.ifError(err); @@ -201,9 +216,9 @@ describe('pubsub', function() { }); it('should publish a message with attributes', function(done) { - var data = new Buffer('raw message data'); + var data = Buffer.from('raw message data'); var attrs = { - customAttribute: 'value' + customAttribute: 'value', }; publishPop(data, attrs, function(err, message) { @@ -231,14 +246,11 @@ describe('pubsub', function() { var topic = pubsub.topic(TOPIC_NAME); var publisher = topic.publisher(); - var SUB_NAMES = [ - generateSubName(), - generateSubName() - ]; + var SUB_NAMES = [generateSubName(), generateSubName()]; var SUBSCRIPTIONS = [ - topic.subscription(SUB_NAMES[0], { ackDeadline: 30000 }), - topic.subscription(SUB_NAMES[1], { ackDeadline: 60000 }) + topic.subscription(SUB_NAMES[0], {ackDeadline: 30000}), + topic.subscription(SUB_NAMES[1], {ackDeadline: 60000}), ]; before(function(done) { @@ -255,30 +267,38 @@ describe('pubsub', function() { return; } - async.times(10, function(_, next) { - publisher.publish(new Buffer('hello'), next); - }, function(err) { - if (err) { - done(err); - return; + async.times( + 10, + function(_, next) { + publisher.publish(Buffer.from('hello'), next); + }, + function(err) { + if (err) { + done(err); + return; + } + + // Consistency delay for subscriptions to be returned via + // `topic.getSubscriptions`. + setTimeout(done, 2500); } - - // Consistency delay for subscriptions to be returned via - // `topic.getSubscriptions`. - setTimeout(done, 2500); - }); + ); }); }); }); after(function(done) { // Delete subscriptions - async.each(SUBSCRIPTIONS, function(sub, callback) { - sub.delete(callback); - }, function(err) { - assert.ifError(err); - topic.delete(done); - }); + async.each( + SUBSCRIPTIONS, + function(sub, callback) { + sub.delete(callback); + }, + function(err) { + assert.ifError(err); + topic.delete(done); + } + ); }); it('should list all subscriptions registered to the topic', function(done) { @@ -293,7 +313,8 @@ describe('pubsub', function() { it('should list all topic subscriptions as a stream', function(done) { var subscriptionsEmitted = []; - topic.getSubscriptionsStream() + topic + .getSubscriptionsStream() .on('error', done) .on('data', function(subscription) { subscriptionsEmitted.push(subscription); @@ -315,7 +336,8 @@ describe('pubsub', function() { it('should list all subscriptions as a stream', function(done) { var subscriptionEmitted = false; - pubsub.getSubscriptionsStream() + pubsub + .getSubscriptionsStream() .on('error', done) .on('data', function(subscription) { subscriptionEmitted = subscription instanceof Subscription; @@ -338,7 +360,7 @@ describe('pubsub', function() { it('should honor the autoCreate option', function(done) { var sub = topic.subscription(generateSubName()); - sub.get({ autoCreate: true }, done); + sub.get({autoCreate: true}, done); }); it('should confirm if a sub exists', function(done) { @@ -365,37 +387,42 @@ describe('pubsub', function() { var subName = generateSubName(); var threeDaysInSeconds = 3 * 24 * 60 * 60; - topic.createSubscription(subName, { - messageRetentionDuration: threeDaysInSeconds - }, function(err, sub) { - assert.ifError(err); - - sub.getMetadata(function(err, metadata) { + topic.createSubscription( + subName, + { + messageRetentionDuration: threeDaysInSeconds, + }, + function(err, sub) { assert.ifError(err); - assert.strictEqual(metadata.retainAckedMessages, true); - assert.strictEqual( - parseInt(metadata.messageRetentionDuration.seconds, 10), - threeDaysInSeconds - ); - assert.strictEqual( - parseInt(metadata.messageRetentionDuration.nanos, 10), - 0 - ); + sub.getMetadata(function(err, metadata) { + assert.ifError(err); - sub.delete(done); - }); - }); + assert.strictEqual(metadata.retainAckedMessages, true); + assert.strictEqual( + parseInt(metadata.messageRetentionDuration.seconds, 10), + threeDaysInSeconds + ); + assert.strictEqual( + parseInt(metadata.messageRetentionDuration.nanos, 10), + 0 + ); + + sub.delete(done); + }); + } + ); }); it('should set metadata for a subscription', function() { var subscription = topic.subscription(generateSubName()); var threeDaysInSeconds = 3 * 24 * 60 * 60; - return subscription.create() + return subscription + .create() .then(function() { return subscription.setMetadata({ - messageRetentionDuration: threeDaysInSeconds + messageRetentionDuration: threeDaysInSeconds, }); }) .then(function() { @@ -422,7 +449,7 @@ describe('pubsub', function() { it('should error when using a non-existent subscription', function(done) { var subscription = topic.subscription(generateSubName(), { - maxConnections: 1 + maxConnections: 1, }); subscription.once('error', function(err) { @@ -442,7 +469,7 @@ describe('pubsub', function() { subscription.on('error', done); subscription.on('message', function(message) { - assert.deepEqual(message.data, new Buffer('hello')); + assert.deepEqual(message.data, Buffer.from('hello')); if (++messageCount === 10) { subscription.close(done); @@ -486,8 +513,8 @@ describe('pubsub', function() { var subscription = topic.subscription(SUB_NAMES[0], { flowControl: { - maxMessages: maxMessages - } + maxMessages: maxMessages, + }, }); subscription.on('error', done); @@ -522,10 +549,14 @@ describe('pubsub', function() { it('should set a policy', function(done) { var topic = pubsub.topic(TOPIC_NAMES[0]); var policy = { - bindings: [{ - role: 'roles/pubsub.publisher', - members: ['serviceAccount:gmail-api-push@system.gserviceaccount.com'] - }] + bindings: [ + { + role: 'roles/pubsub.publisher', + members: [ + 'serviceAccount:gmail-api-push@system.gserviceaccount.com', + ], + }, + ], }; topic.iam.setPolicy(policy, function(err, newPolicy) { @@ -537,16 +568,13 @@ describe('pubsub', function() { it('should test the iam permissions', function(done) { var topic = pubsub.topic(TOPIC_NAMES[0]); - var testPermissions = [ - 'pubsub.topics.get', - 'pubsub.topics.update' - ]; + var testPermissions = ['pubsub.topics.get', 'pubsub.topics.update']; topic.iam.testPermissions(testPermissions, function(err, permissions) { assert.ifError(err); assert.deepEqual(permissions, { 'pubsub.topics.get': true, - 'pubsub.topics.update': true + 'pubsub.topics.update': true, }); done(); }); @@ -563,9 +591,11 @@ describe('pubsub', function() { function deleteAllSnapshots() { return pubsub.getSnapshots().then(function(data) { - return Promise.all(data[0].map(function(snapshot) { - return snapshot.delete(); - })); + return Promise.all( + data[0].map(function(snapshot) { + return snapshot.delete(); + }) + ); }); } @@ -607,7 +637,8 @@ describe('pubsub', function() { it('should get a list of snapshots as a stream', function(done) { var snapshots = []; - pubsub.getSnapshotsStream() + pubsub + .getSnapshotsStream() .on('error', done) .on('data', function(snapshot) { snapshots.push(snapshot); @@ -626,11 +657,14 @@ describe('pubsub', function() { beforeEach(function() { subscription = topic.subscription(generateSubName()); - return subscription.create().then(function() { - return publisher.publish(new Buffer('Hello, world!')); - }).then(function(_messageId) { - messageId = _messageId; - }); + return subscription + .create() + .then(function() { + return publisher.publish(Buffer.from('Hello, world!')); + }) + .then(function(_messageId) { + messageId = _messageId; + }); }); it('should seek to a snapshot', function(done) { diff --git a/handwritten/pubsub/test/.eslintrc.yml b/handwritten/pubsub/test/.eslintrc.yml new file mode 100644 index 00000000000..73f7bbc946f --- /dev/null +++ b/handwritten/pubsub/test/.eslintrc.yml @@ -0,0 +1,5 @@ +--- +env: + mocha: true +rules: + node/no-unpublished-require: off diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index c26708b623e..6f451ff914e 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -20,28 +20,12 @@ var assert = require('assert'); var common = require('@google-cloud/common'); var events = require('events'); var extend = require('extend'); -var grpc = require('grpc'); var proxyquire = require('proxyquire'); var uuid = require('uuid'); var util = require('util'); -var PKG = require('../package.json'); -var v1 = require('../src/v1'); - var fakeUtil = extend({}, common.util); var fakeUuid = extend({}, uuid); -var fakeGrpc = extend({}, grpc); - -function fakeGaxGrpc() { - return { - grpc: fakeGrpc - }; -} - -var v1Override; -function fakeV1(options) { - return (v1Override || v1)(options); -} function FakeConnection() { this.isConnected = false; @@ -75,6 +59,9 @@ FakeConnection.prototype.cancel = function() { describe('ConnectionPool', function() { var ConnectionPool; var pool; + var fakeConnection; + var fakeChannel; + var fakeClient; var FAKE_PUBSUB_OPTIONS = {}; var PROJECT_ID = 'grapce-spacheship-123'; @@ -83,9 +70,9 @@ describe('ConnectionPool', function() { projectId: PROJECT_ID, auth: { projectId: PROJECT_ID, - getAuthClient: fakeUtil.noop + getAuthClient: fakeUtil.noop, }, - options: FAKE_PUBSUB_OPTIONS + options: FAKE_PUBSUB_OPTIONS, }; var SUB_NAME = 'test-subscription'; @@ -93,25 +80,42 @@ describe('ConnectionPool', function() { projectId: PROJECT_ID, name: SUB_NAME, pubsub: PUBSUB, - request: fakeUtil.noop + request: fakeUtil.noop, }; before(function() { ConnectionPool = proxyquire('../src/connection-pool.js', { '@google-cloud/common': { - util: fakeUtil - }, - 'google-gax': { - grpc: fakeGaxGrpc + util: fakeUtil, }, uuid: fakeUuid, - './v1': fakeV1 }); }); beforeEach(function() { + fakeConnection = new FakeConnection(); + + fakeChannel = { + getConnectivityState: function() { + return 2; + }, + }; + + fakeClient = { + streamingPull: function() { + return fakeConnection; + }, + getChannel: function() { + return fakeChannel; + }, + waitForReady: function() {}, + }; + SUBSCRIPTION.request = fakeUtil.noop; PUBSUB.auth.getAuthClient = fakeUtil.noop; + PUBSUB.getClient_ = function(config, callback) { + callback(null, fakeClient); + }; pool = new ConnectionPool(SUBSCRIPTION); pool.queue.forEach(clearTimeout); @@ -145,22 +149,10 @@ describe('ConnectionPool', function() { ConnectionPool.prototype.open = open; }); - it('should create grpc metadata', function() { - assert(pool.metadata_ instanceof grpc.Metadata); - - assert.deepEqual(pool.metadata_.get('x-goog-api-client'), [ - [ - 'gl-node/' + process.versions.node, - 'gccl/' + PKG.version, - 'grpc/' + require('grpc/package.json').version - ].join(' ') - ]); - }); - it('should respect user specified settings', function() { var options = { maxConnections: 10, - ackDeadline: 100 + ackDeadline: 100, }; var subscription = extend({}, SUBSCRIPTION, options); @@ -251,9 +243,9 @@ describe('ConnectionPool', function() { }); }); - describe('close',function() { + describe('close', function() { it('should close the client', function(done) { - pool.client = { close: done }; + pool.client = {close: done}; pool.close(); }); @@ -348,9 +340,9 @@ describe('ConnectionPool', function() { }); describe('createConnection', function() { - var fakeClient; var fakeConnection; var fakeChannel; + var fakeClient; beforeEach(function() { fakeConnection = new FakeConnection(); @@ -358,7 +350,7 @@ describe('ConnectionPool', function() { fakeChannel = { getConnectivityState: function() { return 2; - } + }, }; fakeClient = { @@ -367,9 +359,11 @@ describe('ConnectionPool', function() { }, getChannel: function() { return fakeChannel; - } + }, }; + fakeClient.waitForReady = fakeUtil.noop; + pool.getClient = function(callback) { callback(null, fakeClient); }; @@ -484,7 +478,7 @@ describe('ConnectionPool', function() { fakeConnection.write = function(reqOpts) { assert.deepEqual(reqOpts, { subscription: TOKENIZED_SUB_NAME, - streamAckDeadlineSeconds: pool.settings.ackDeadline / 1000 + streamAckDeadlineSeconds: pool.settings.ackDeadline / 1000, }); }; @@ -523,7 +517,7 @@ describe('ConnectionPool', function() { }); it('should cancel any error events', function(done) { - var fakeError = { code: 4 }; + var fakeError = {code: 4}; pool.on('error', done); // should not fire pool.createConnection(); @@ -535,14 +529,8 @@ describe('ConnectionPool', function() { }); it('should close and delete the connection', function(done) { - var endCalled = false; - pool.createConnection(); - fakeConnection.end = function() { - endCalled = true; - }; - pool.connections.delete = function(id) { assert.strictEqual(id, fakeId); done(); @@ -632,7 +620,7 @@ describe('ConnectionPool', function() { it('should emit error if no pending conn. are found', function(done) { var error = { code: 4, - details: 'Deadline Exceeded' + details: 'Deadline Exceeded', }; pool.shouldReconnect = function() { @@ -670,7 +658,7 @@ describe('ConnectionPool', function() { }); pool.createConnection(); - fakeConnection.emit('data', { receivedMessages: [fakeResp] }); + fakeConnection.emit('data', {receivedMessages: [fakeResp]}); }); }); }); @@ -685,19 +673,19 @@ describe('ConnectionPool', function() { var PT = { seconds: 6838383, - nanos: 20323838 + nanos: 20323838, }; var RESP = { ackId: 'def', message: { messageId: 'ghi', - data: new Buffer('hello'), + data: Buffer.from('hello'), attributes: { - a: 'a' + a: 'a', }, - publishTime: PT - } + publishTime: PT, + }, }; before(function() { @@ -721,7 +709,8 @@ describe('ConnectionPool', function() { it('should capture the message data', function() { var expectedPublishTime = new Date( - parseInt(PT.seconds, 10) * 1000 + parseInt(PT.nanos, 10) / 1e6); + parseInt(PT.seconds, 10) * 1000 + parseInt(PT.nanos, 10) / 1e6 + ); assert.strictEqual(message.ackId, RESP.ackId); assert.strictEqual(message.id, RESP.message.messageId); @@ -770,7 +759,7 @@ describe('ConnectionPool', function() { var fakeClient = { getChannel: function() { return fakeChannel; - } + }, }; before(function() { @@ -789,6 +778,10 @@ describe('ConnectionPool', function() { callback(null, fakeClient); }; + PUBSUB.getClient_ = function(config, callback) { + callback(null, fakeClient); + }; + fakeTimestamp = dateNow.call(global.Date); pool.noConnectionsTime = 0; @@ -835,6 +828,9 @@ describe('ConnectionPool', function() { }); it('should emit the ready event if the channel is ready', function(done) { + fakeClient.waitForReady = function(deadline, callback) { + callback(); + }; fakeChannelState = channelReadyState; fakeChannel.getConnectivityState = function(shouldConnect) { @@ -848,6 +844,7 @@ describe('ConnectionPool', function() { }); pool.getAndEmitChannelState(); + fakeClient.waitForReady = fakeUtil.noop; }); it('should wait for the channel to be ready', function(done) { @@ -915,43 +912,35 @@ describe('ConnectionPool', function() { this.closed = false; } + FakeSubscriber.prototype.streamingPull = function() { + return fakeConnection; + }; + + FakeSubscriber.prototype.getChannel = function() { + return fakeChannel; + }; + FakeSubscriber.prototype.close = function() { this.closed = true; }; - beforeEach(function() { - pool.getCredentials = function(callback) { - callback(null, fakeCreds); - }; + var fakeClient = new FakeSubscriber('fake-address', fakeCreds, {}); - v1Override = function() { - return { - Subscriber: FakeSubscriber - }; + beforeEach(function() { + PUBSUB.getClient_ = function(config, callback) { + callback(null, fakeClient); }; }); it('should return the cached client when available', function(done) { - var fakeClient = pool.client = new FakeSubscriber(); - - pool.getClient(function(err, client) { - assert.ifError(err); - assert.strictEqual(client, fakeClient); - done(); - }); - }); + pool.getClient(function(err1, client1) { + assert.ifError(err1); - it('should return any auth errors', function(done) { - var error = new Error('err'); - - pool.getCredentials = function(callback) { - callback(error); - }; - - pool.getClient(function(err, client) { - assert.strictEqual(err, error); - assert.strictEqual(client, undefined); - done(); + pool.getClient(function(err2, client2) { + assert.ifError(err2); + assert.strictEqual(client1, client2); + done(); + }); }); }); @@ -963,165 +952,11 @@ describe('ConnectionPool', function() { done(); }); }); - - it('should pass the pubsub options into the gax fn', function(done) { - v1Override = function(options) { - assert.strictEqual(options, FAKE_PUBSUB_OPTIONS); - setImmediate(done); - - return { - Subscriber: FakeSubscriber - }; - }; - - pool.getClient(assert.ifError); - }); - - it('should pass in the correct the args to the Subscriber', function(done) { - var fakeAddress = 'a.b.c'; - fakeV1.SERVICE_ADDRESS = fakeAddress; - - var fakeUserAgent = 'a-b-c'; - fakeUtil.getUserAgentFromPackageJson = function(packageJson) { - assert.deepEqual(packageJson, PKG); - return fakeUserAgent; - }; - - pool.getClient(function(err, client) { - assert.ifError(err); - assert(client instanceof FakeSubscriber); - assert.strictEqual(client.address, fakeAddress); - assert.strictEqual(client.creds, fakeCreds); - - assert.deepEqual(client.options, { - 'grpc.keepalive_time_ms': 300000, - 'grpc.max_receive_message_length': 20000001, - 'grpc.primary_user_agent': fakeUserAgent - }); - - done(); - }); - }); - - it('should respect the emulator service address', function(done) { - fakeV1.SERVICE_ADDRESS = 'should.not.use'; - - PUBSUB.isEmulator = true; - PUBSUB.options.servicePath = 'should.use'; - - pool.getClient(function(err, client) { - assert.ifError(err); - assert.strictEqual(client.address, 'should.use'); - done(); - }); - }); - - it('should respect the emulator service port', function(done) { - fakeV1.SERVICE_ADDRESS = 'should.not.use'; - - PUBSUB.isEmulator = true; - PUBSUB.options.servicePath = 'should.use'; - PUBSUB.options.port = 9999; - - pool.getClient(function(err, client) { - assert.ifError(err); - assert.strictEqual(client.address, 'should.use:9999'); - done(); - }); - }); - }); - - describe('getCredentials', function() { - beforeEach(function() { - fakeGrpc.credentials = { - createInsecure: fakeUtil.noop, - createSsl: fakeUtil.noop, - createFromGoogleCredential: fakeUtil.noop, - combineChannelCredentials: fakeUtil.noop - }; - }); - - it('should return insecure creds for emulator usage', function(done) { - var fakeCreds = {}; - fakeGrpc.credentials.createInsecure = function() { - return fakeCreds; - }; - - PUBSUB.isEmulator = true; - - pool.getCredentials(function(err, creds) { - assert.ifError(err); - assert.strictEqual(creds, fakeCreds); - done(); - }); - }); - - it('should get grpc creds', function(done) { - var fakeAuthClient = {}; - var fakeSslCreds = {}; - var fakeGoogCreds = {}; - var fakeCombinedCreds = {}; - - PUBSUB.isEmulator = false; - PUBSUB.auth.getAuthClient = function(callback) { - callback(null, fakeAuthClient); - }; - - fakeGrpc.credentials = { - createSsl: function() { - return fakeSslCreds; - }, - createFromGoogleCredential: function(authClient) { - assert.strictEqual(authClient, fakeAuthClient); - return fakeGoogCreds; - }, - combineChannelCredentials: function(sslCreds, googCreds) { - assert.strictEqual(sslCreds, fakeSslCreds); - assert.strictEqual(googCreds, fakeGoogCreds); - return fakeCombinedCreds; - } - }; - - - pool.getCredentials(function(err, creds) { - assert.ifError(err); - assert.strictEqual(creds, fakeCombinedCreds); - done(); - }); - }); - - it('should return getAuthClient errors', function(done) { - var error = new Error('err'); - - PUBSUB.auth.getAuthClient = function(callback) { - callback(error); - }; - - pool.getCredentials(function(err) { - assert.strictEqual(err, error); - done(); - }); - }); - - it('should cache the project ID', function(done) { - PUBSUB.auth.getAuthClient = function(callback) { - PUBSUB.auth.projectId = PROJECT_ID; - callback(null, {}); - }; - - delete pool.projectId; - - pool.getCredentials(function(err) { - assert.ifError(err); - assert.strictEqual(pool.projectId, PROJECT_ID); - done(); - }); - }); }); describe('isConnected', function() { it('should return true when at least one stream is connected', function() { - var connections = pool.connections = new Map(); + var connections = (pool.connections = new Map()); connections.set('a', new FakeConnection()); connections.set('b', new FakeConnection()); @@ -1136,7 +971,7 @@ describe('ConnectionPool', function() { }); it('should return false when there is no connection', function() { - var connections = pool.connections = new Map(); + var connections = (pool.connections = new Map()); connections.set('a', new FakeConnection()); connections.set('b', new FakeConnection()); @@ -1347,31 +1182,31 @@ describe('ConnectionPool', function() { }); it('should return true for retryable errors', function() { - assert(pool.shouldReconnect({ code: 0 })); // OK - assert(pool.shouldReconnect({ code: 1 })); // Canceled - assert(pool.shouldReconnect({ code: 2 })); // Unknown - assert(pool.shouldReconnect({ code: 4 })); // DeadlineExceeded - assert(pool.shouldReconnect({ code: 8 })); // ResourceExhausted - assert(pool.shouldReconnect({ code: 10 })); // Aborted - assert(pool.shouldReconnect({ code: 13 })); // Internal - assert(pool.shouldReconnect({ code: 14 })); // Unavailable - assert(pool.shouldReconnect({ code: 15 })); // Dataloss + assert(pool.shouldReconnect({code: 0})); // OK + assert(pool.shouldReconnect({code: 1})); // Canceled + assert(pool.shouldReconnect({code: 2})); // Unknown + assert(pool.shouldReconnect({code: 4})); // DeadlineExceeded + assert(pool.shouldReconnect({code: 8})); // ResourceExhausted + assert(pool.shouldReconnect({code: 10})); // Aborted + assert(pool.shouldReconnect({code: 13})); // Internal + assert(pool.shouldReconnect({code: 14})); // Unavailable + assert(pool.shouldReconnect({code: 15})); // Dataloss }); it('should return false for non-retryable errors', function() { - assert(!pool.shouldReconnect({ code: 3 })); // InvalidArgument - assert(!pool.shouldReconnect({ code: 5 })); // NotFound - assert(!pool.shouldReconnect({ code: 6 })); // AlreadyExists - assert(!pool.shouldReconnect({ code: 7 })); // PermissionDenied - assert(!pool.shouldReconnect({ code: 9 })); // FailedPrecondition - assert(!pool.shouldReconnect({ code: 11 })); // OutOfRange - assert(!pool.shouldReconnect({ code: 12 })); // Unimplemented - assert(!pool.shouldReconnect({ code: 16 })); // Unauthenticated + assert(!pool.shouldReconnect({code: 3})); // InvalidArgument + assert(!pool.shouldReconnect({code: 5})); // NotFound + assert(!pool.shouldReconnect({code: 6})); // AlreadyExists + assert(!pool.shouldReconnect({code: 7})); // PermissionDenied + assert(!pool.shouldReconnect({code: 9})); // FailedPrecondition + assert(!pool.shouldReconnect({code: 11})); // OutOfRange + assert(!pool.shouldReconnect({code: 12})); // Unimplemented + assert(!pool.shouldReconnect({code: 16})); // Unauthenticated }); it('should not retry if no connection can be made', function() { var fakeStatus = { - code: 4 + code: 4, }; pool.noConnectionsTime = Date.now() - 300001; @@ -1381,7 +1216,7 @@ describe('ConnectionPool', function() { it('should return true if all conditions are met', function() { var fakeStatus = { - code: 4 + code: 4, }; pool.noConnectionsTime = 0; diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index 7b07a831227..5631e79bd0b 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -27,7 +27,7 @@ var fakeUtil = extend({}, util, { if (Class.name === 'IAM') { promisified = true; } - } + }, }); describe('IAM', function() { @@ -36,15 +36,15 @@ describe('IAM', function() { var PUBSUB = { options: {}, - request: util.noop + request: util.noop, }; var ID = 'id'; before(function() { IAM = proxyquire('../src/iam.js', { '@google-cloud/common': { - util: fakeUtil - } + util: fakeUtil, + }, }); }); @@ -64,8 +64,8 @@ describe('IAM', function() { bind: function(context) { assert.strictEqual(context, fakePubsub); return fakeRequest; - } - } + }, + }, }; var iam = new IAM(fakePubsub, ID); @@ -84,7 +84,7 @@ describe('IAM', function() { describe('getPolicy', function() { it('should make the correct API request', function(done) { iam.request = function(config, callback) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getIamPolicy'); assert.strictEqual(config.reqOpts.resource, iam.id); @@ -107,7 +107,7 @@ describe('IAM', function() { }); describe('setPolicy', function() { - var policy = { etag: 'ACAB' }; + var policy = {etag: 'ACAB'}; it('should throw an error if a policy is not supplied', function() { assert.throws(function() { @@ -117,7 +117,7 @@ describe('IAM', function() { it('should make the correct API request', function(done) { iam.request = function(config, callback) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'setIamPolicy'); assert.strictEqual(config.reqOpts.resource, iam.id); assert.strictEqual(config.reqOpts.policy, policy); @@ -151,7 +151,7 @@ describe('IAM', function() { var permissions = 'storage.bucket.list'; iam.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'testIamPermissions'); assert.strictEqual(config.reqOpts.resource, iam.id); assert.deepEqual(config.reqOpts.permissions, [permissions]); @@ -192,12 +192,9 @@ describe('IAM', function() { }); it('should pass back a hash of permissions the user has', function(done) { - var permissions = [ - 'storage.bucket.list', - 'storage.bucket.consume' - ]; + var permissions = ['storage.bucket.list', 'storage.bucket.consume']; var apiResponse = { - permissions: ['storage.bucket.consume'] + permissions: ['storage.bucket.consume'], }; iam.request = function(config, callback) { @@ -208,7 +205,7 @@ describe('IAM', function() { assert.ifError(err); assert.deepEqual(permissions, { 'storage.bucket.list': false, - 'storage.bucket.consume': true + 'storage.bucket.consume': true, }); assert.strictEqual(apiResp, apiResponse); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 595739b52c9..f2248744413 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -24,7 +24,6 @@ var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; var PKG = require('../package.json'); -var v1 = require('../src/v1/index.js'); var fakeGrpc = extend({}, grpc); @@ -48,9 +47,9 @@ var fakeUtil = extend({}, util, { 'request', 'snapshot', 'subscription', - 'topic' + 'topic', ]); - } + }, }); function FakeSnapshot() { @@ -73,14 +72,14 @@ var fakePaginator = { assert.deepEqual(methods, [ 'getSnapshots', 'getSubscriptions', - 'getTopics' + 'getTopics', ]); extended = true; }, streamify: function(methodName) { return methodName; - } + }, }; var googleAutoAuthOverride; @@ -88,32 +87,29 @@ function fakeGoogleAutoAuth() { return (googleAutoAuthOverride || util.noop).apply(null, arguments); } -var v1Override; -function fakeV1() { - return (v1Override || util.noop).apply(null, arguments); -} +var v1Override = {}; +var v1ClientOverrides = {}; -var GAX_CONFIG_PUBLISHER_OVERRIDE = {}; -var GAX_CONFIG_SUBSCRIBER_OVERRIDE = {}; +function defineOverridableClient(clientName) { + function DefaultClient() {} + DefaultClient.scopes = []; -var GAX_CONFIG = { - Publisher: { - interfaces: { - 'google.pubsub.v1.Publisher': GAX_CONFIG_PUBLISHER_OVERRIDE - } - }, - Subscriber: { - interfaces: { - 'google.pubsub.v1.Subscriber': GAX_CONFIG_SUBSCRIBER_OVERRIDE - } - } -}; + Object.defineProperty(v1Override, clientName, { + get: function() { + return v1ClientOverrides[clientName] || DefaultClient; + }, + }); +} + +defineOverridableClient('FakeClient'); +defineOverridableClient('PublisherClient'); +defineOverridableClient('SubscriberClient'); describe('PubSub', function() { var PubSub; var PROJECT_ID = 'test-project'; var pubsub; - var OPTIONS = { projectId: PROJECT_ID }; + var OPTIONS = {projectId: PROJECT_ID}; var PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; @@ -122,16 +118,14 @@ describe('PubSub', function() { PubSub = proxyquire('../', { '@google-cloud/common': { paginator: fakePaginator, - util: fakeUtil + util: fakeUtil, }, 'google-auto-auth': fakeGoogleAutoAuth, grpc: fakeGrpc, './snapshot.js': FakeSnapshot, './subscription.js': Subscription, './topic.js': FakeTopic, - './v1': fakeV1, - './v1/publisher_client_config.json': GAX_CONFIG.Publisher, - './v1/subscriber_client_config.json': GAX_CONFIG.Subscriber + './v1': v1Override, }); }); @@ -142,7 +136,7 @@ describe('PubSub', function() { }); beforeEach(function() { - v1Override = null; + v1ClientOverrides = {}; googleAutoAuthOverride = null; SubscriptionOverride = null; pubsub = new PubSub(OPTIONS); @@ -167,7 +161,7 @@ describe('PubSub', function() { it('should normalize the arguments', function() { var normalizeArguments = fakeUtil.normalizeArguments; var normalizeArgumentsCalled = false; - var fakeOptions = { projectId: PROJECT_ID }; + var fakeOptions = {projectId: PROJECT_ID}; var fakeContext = {}; fakeUtil.normalizeArguments = function(context, options) { @@ -183,6 +177,17 @@ describe('PubSub', function() { fakeUtil.normalizeArguments = normalizeArguments; }); + it('should combine all required scopes', function() { + v1ClientOverrides.SubscriberClient = {}; + v1ClientOverrides.SubscriberClient.scopes = ['a', 'b', 'c']; + + v1ClientOverrides.PublisherClient = {}; + v1ClientOverrides.PublisherClient.scopes = ['b', 'c', 'd', 'e']; + + var pubsub = new PubSub({}); + assert.deepEqual(pubsub.options.scopes, ['a', 'b', 'c', 'd', 'e']); + }); + it('should attempt to determine the service path and port', function() { var determineBaseUrl_ = PubSub.prototype.determineBaseUrl_; var called = false; @@ -204,16 +209,23 @@ describe('PubSub', function() { var fakeGoogleAutoAuthInstance = {}; var options = { a: 'b', - c: 'd' + c: 'd', }; googleAutoAuthOverride = function(options_) { - assert.deepEqual(options_, extend({ - scopes: v1.ALL_SCOPES, - 'grpc.max_receive_message_length': 20000001, - libName: 'gccl', - libVersion: PKG.version - }, options)); + assert.deepEqual( + options_, + extend( + { + 'grpc.max_receive_message_length': 20000001, + 'grpc.keepalive_time_ms': 300000, + libName: 'gccl', + libVersion: PKG.version, + scopes: [], + }, + options + ) + ); return fakeGoogleAutoAuthInstance; }; @@ -222,12 +234,19 @@ describe('PubSub', function() { }); it('should localize the options provided', function() { - assert.deepEqual(pubsub.options, extend({ - scopes: v1.ALL_SCOPES, - 'grpc.max_receive_message_length': 20000001, - libName: 'gccl', - libVersion: PKG.version - }, OPTIONS)); + assert.deepEqual( + pubsub.options, + extend( + { + 'grpc.max_receive_message_length': 20000001, + 'grpc.keepalive_time_ms': 300000, + libName: 'gccl', + libVersion: PKG.version, + scopes: [], + }, + OPTIONS + ) + ); }); it('should set the projectId', function() { @@ -244,20 +263,19 @@ describe('PubSub', function() { }); }); - describe('createSubscription', function() { var TOPIC_NAME = 'topic'; var TOPIC = extend(new FakeTopic(), { - name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME + name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, }); var SUB_NAME = 'subscription'; var SUBSCRIPTION = { - name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME + name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME, }; var apiResponse = { - name: 'subscription-name' + name: 'subscription-name', }; beforeEach(function() { @@ -295,7 +313,7 @@ describe('PubSub', function() { }); it('should create a Subscription', function(done) { - var opts = { a: 'b', c: 'd' }; + var opts = {a: 'b', c: 'd'}; pubsub.request = util.noop; @@ -323,23 +341,23 @@ describe('PubSub', function() { it('should send correct request', function(done) { var options = { - gaxOpts: {} + gaxOpts: {}, }; pubsub.topic = function(topicName) { return { - name: topicName + name: topicName, }; }; pubsub.subscription = function(subName) { return { - name: subName + name: subName, }; }; pubsub.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSubscription'); assert.strictEqual(config.reqOpts.topic, TOPIC.name); assert.strictEqual(config.reqOpts.name, SUB_NAME); @@ -356,20 +374,23 @@ describe('PubSub', function() { pushEndpoint: 'https://domain/push', }; - var expectedBody = extend({ - topic: TOPIC.name, - name: SUB_NAME - }, options); + var expectedBody = extend( + { + topic: TOPIC.name, + name: SUB_NAME, + }, + options + ); pubsub.topic = function() { return { - name: TOPIC_NAME + name: TOPIC_NAME, }; }; pubsub.subscription = function() { return { - name: SUB_NAME + name: SUB_NAME, }; }; @@ -384,23 +405,23 @@ describe('PubSub', function() { it('should discard flow control options', function(done) { var options = { - flowControl: {} + flowControl: {}, }; var expectedBody = { topic: TOPIC.name, - name: SUB_NAME + name: SUB_NAME, }; pubsub.topic = function() { return { - name: TOPIC_NAME + name: TOPIC_NAME, }; }; pubsub.subscription = function() { return { - name: SUB_NAME + name: SUB_NAME, }; }; @@ -416,7 +437,7 @@ describe('PubSub', function() { it('should format the metadata', function(done) { var fakeMetadata = {}; var formatted = { - a: 'a' + a: 'a', }; Subscription.formatMetadata_ = function(metadata) { @@ -434,7 +455,7 @@ describe('PubSub', function() { describe('error', function() { var error = new Error('Error.'); - var apiResponse = { name: SUB_NAME }; + var apiResponse = {name: SUB_NAME}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -443,14 +464,14 @@ describe('PubSub', function() { }); it('should re-use existing subscription', function(done) { - var apiResponse = { code: 6 }; + var apiResponse = {code: 6}; pubsub.subscription = function() { return SUBSCRIPTION; }; pubsub.request = function(config, callback) { - callback({ code: 6 }, apiResponse); + callback({code: 6}, apiResponse); }; pubsub.createSubscription(TOPIC_NAME, SUB_NAME, function(err, sub) { @@ -477,7 +498,7 @@ describe('PubSub', function() { }); describe('success', function() { - var apiResponse = { name: SUB_NAME }; + var apiResponse = {name: SUB_NAME}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -518,14 +539,14 @@ describe('PubSub', function() { assert.strictEqual(name, topicName); return { - name: formattedName + name: formattedName, }; }; pubsub.request = function(config) { - assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'createTopic'); - assert.deepEqual(config.reqOpts, { name: formattedName }); + assert.deepEqual(config.reqOpts, {name: formattedName}); assert.deepEqual(config.gaxOpts, gaxOpts); done(); }; @@ -664,7 +685,7 @@ describe('PubSub', function() { describe('getSnapshots', function() { var SNAPSHOT_NAME = 'fake-snapshot'; - var apiResponse = { snapshots: [{ name: SNAPSHOT_NAME }]}; + var apiResponse = {snapshots: [{name: SNAPSHOT_NAME}]}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -685,24 +706,27 @@ describe('PubSub', function() { a: 'b', c: 'd', gaxOpts: { - e: 'f' + e: 'f', }, - autoPaginate: false + autoPaginate: false, }; var expectedOptions = extend({}, options, { - project: 'projects/' + pubsub.projectId + project: 'projects/' + pubsub.projectId, }); - var expectedGaxOpts = extend({ - autoPaginate: options.autoPaginate - }, options.gaxOpts); + var expectedGaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; pubsub.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'listSnapshots'); assert.deepEqual(config.reqOpts, expectedOptions); assert.deepEqual(config.gaxOpts, expectedGaxOpts); @@ -749,7 +773,7 @@ describe('PubSub', function() { }); describe('getSubscriptions', function() { - var apiResponse = { subscriptions: [{ name: 'fake-subscription' }] }; + var apiResponse = {subscriptions: [{name: 'fake-subscription'}]}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -768,21 +792,24 @@ describe('PubSub', function() { it('should pass the correct arguments to the API', function(done) { var options = { gaxOpts: { - a: 'b' + a: 'b', }, - autoPaginate: false + autoPaginate: false, }; - var expectedGaxOpts = extend({ - autoPaginate: options.autoPaginate - }, options.gaxOpts); + var expectedGaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); var project = 'projects/' + pubsub.projectId; pubsub.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'listSubscriptions'); - assert.deepEqual(config.reqOpts, { project: project }); + assert.deepEqual(config.reqOpts, {project: project}); assert.deepEqual(config.gaxOpts, expectedGaxOpts); done(); }; @@ -791,7 +818,7 @@ describe('PubSub', function() { }); it('should pass options to API request', function(done) { - var opts = { pageSize: 10, pageToken: 'abc' }; + var opts = {pageSize: 10, pageToken: 'abc'}; pubsub.request = function(config) { var reqOpts = config.reqOpts; @@ -837,7 +864,7 @@ describe('PubSub', function() { var topic = new FakeTopic(); var opts = { - topic: topic + topic: topic, }; topic.getSubscriptions = function(options, callback) { @@ -850,14 +877,14 @@ describe('PubSub', function() { it('should create a topic instance from a name', function(done) { var opts = { - topic: TOPIC_NAME + topic: TOPIC_NAME, }; var fakeTopic = { getSubscriptions: function(options, callback) { assert.strictEqual(options, opts); callback(); // the done fn - } + }, }; pubsub.topic = function(name) { @@ -872,7 +899,7 @@ describe('PubSub', function() { describe('getTopics', function() { var topicName = 'fake-topic'; - var apiResponse = { topics: [{ name: topicName }]}; + var apiResponse = {topics: [{name: topicName}]}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -893,24 +920,27 @@ describe('PubSub', function() { a: 'b', c: 'd', gaxOpts: { - e: 'f' + e: 'f', }, - autoPaginate: false + autoPaginate: false, }; var expectedOptions = extend({}, options, { - project: 'projects/' + pubsub.projectId + project: 'projects/' + pubsub.projectId, }); - var expectedGaxOpts = extend({ - autoPaginate: options.autoPaginate - }, options.gaxOpts); + var expectedGaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; pubsub.request = function(config) { - assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'listTopics'); assert.deepEqual(config.reqOpts, expectedOptions); assert.deepEqual(config.gaxOpts, expectedGaxOpts); @@ -958,10 +988,10 @@ describe('PubSub', function() { describe('request', function() { var CONFIG = { - client: 'fakeClient', + client: 'PublisherClient', method: 'fakeMethod', - reqOpts: { a: 'a' }, - gaxOpts: {} + reqOpts: {a: 'a'}, + gaxOpts: {b: 'b'}, }; beforeEach(function() { @@ -970,44 +1000,50 @@ describe('PubSub', function() { pubsub.auth = { getProjectId: function(callback) { callback(null, PROJECT_ID); - } - }; - - pubsub.api = { - fakeClient: { - fakeMethod: function(reqOpts, gaxOpts, callback) { - callback(); // in most cases, the done fn - } - } + }, }; fakeUtil.replaceProjectIdToken = function(reqOpts) { return reqOpts; }; + + pubsub.config = CONFIG; }); - it('should get the project id', function(done) { - pubsub.auth.getProjectId = function(callback) { - assert.strictEqual(typeof callback, 'function'); + it('should call getClient_ with the correct config', function(done) { + pubsub.getClient_ = function(config) { + assert.strictEqual(config, CONFIG); done(); }; pubsub.request(CONFIG, assert.ifError); }); - it('should return auth errors to the callback', function(done) { - var error = new Error('err'); - - pubsub.auth.getProjectId = function(callback) { - callback(error); + it('should return error from getClient_', function(done) { + var expectedError = new Error('some error'); + pubsub.getClient_ = function(config, callback) { + callback(expectedError); }; pubsub.request(CONFIG, function(err) { - assert.strictEqual(err, error); + assert.strictEqual(expectedError, err); done(); }); }); + it('should call client method with correct options', function(done) { + var fakeClient = {}; + fakeClient.fakeMethod = function(reqOpts, gaxOpts) { + assert.deepEqual(CONFIG.reqOpts, reqOpts); + assert.deepEqual(CONFIG.gaxOpts, gaxOpts); + done(); + }; + pubsub.getClient_ = function(config, callback) { + callback(null, fakeClient); + }; + pubsub.request(CONFIG, assert.ifError); + }); + it('should replace the project id token on reqOpts', function(done) { fakeUtil.replaceProjectIdToken = function(reqOpts, projectId) { assert.deepEqual(reqOpts, CONFIG.reqOpts); @@ -1017,55 +1053,203 @@ describe('PubSub', function() { pubsub.request(CONFIG, assert.ifError); }); + }); - it('should instantiate the client lazily', function(done) { - var fakeClientInstance = { - fakeMethod: function(reqOpts, gaxOpts, callback) { - assert.strictEqual(pubsub.api.fakeClient, fakeClientInstance); - callback(); // the done function - } + describe('getClient_', function() { + var FAKE_CLIENT_INSTANCE = util.noop; + var CONFIG = { + client: 'FakeClient', + }; + + beforeEach(function() { + pubsub.auth = { + getProjectId: util.noop, }; - v1Override = function(options) { - assert.strictEqual(options, pubsub.options); + v1ClientOverrides.FakeClient = FAKE_CLIENT_INSTANCE; + }); - return { - fakeClient: function(options) { - assert.strictEqual(options, pubsub.options); - return fakeClientInstance; - } + describe('project ID', function() { + beforeEach(function() { + delete pubsub.projectId; + pubsub.isEmulator = false; + }); + + it('should get and cache the project ID', function(done) { + pubsub.auth.getProjectId = function(callback) { + assert.strictEqual(typeof callback, 'function'); + callback(null, PROJECT_ID); }; - }; - delete pubsub.api.fakeClient; - pubsub.request(CONFIG, done); - }); + pubsub.getClient_(CONFIG, function(err) { + assert.ifError(err); + assert.strictEqual(pubsub.projectId, PROJECT_ID); + done(); + }); + }); - it('should do nothing if sandbox env var is set', function(done) { - global.GCLOUD_SANDBOX_ENV = true; - pubsub.request(CONFIG, done); // should not fire done - global.GCLOUD_SANDBOX_ENV = false; - done(); - }); + it('should get the project ID if placeholder', function(done) { + pubsub.projectId = '{{projectId}}'; - describe('on emulator', function() { - beforeEach(function() { + pubsub.auth.getProjectId = function() { + done(); + }; + + pubsub.getClient_(CONFIG, assert.ifError); + }); + + it('should return errors to the callback', function(done) { + var error = new Error('err'); + + pubsub.auth.getProjectId = function(callback) { + callback(error); + }; + + pubsub.getClient_(CONFIG, function(err) { + assert.strictEqual(err, error); + done(); + }); + }); + + it('should not get the project ID if already known', function() { + pubsub.projectId = PROJECT_ID; + + pubsub.auth.getProjectId = function() { + throw new Error('getProjectId should not be called.'); + }; + + pubsub.getClient_(CONFIG, assert.ifError); + }); + + it('should not get the project ID if inside emulator', function() { pubsub.isEmulator = true; + pubsub.auth.getProjectId = function() { throw new Error('getProjectId should not be called.'); }; + + pubsub.getClient_(CONFIG, assert.ifError); }); + }); + + it('should cache the client', function(done) { + delete pubsub.api.fakeClient; + + var numTimesFakeClientInstantiated = 0; + + v1ClientOverrides.FakeClient = function() { + numTimesFakeClientInstantiated++; + return FAKE_CLIENT_INSTANCE; + }; + + pubsub.getClient_(CONFIG, function(err) { + assert.ifError(err); + assert.strictEqual(pubsub.api.FakeClient, FAKE_CLIENT_INSTANCE); - it('should not get the projectId if null', function(done) { - pubsub.projectId = null; - pubsub.request(CONFIG, done); + pubsub.getClient_(CONFIG, function(err) { + assert.ifError(err); + assert.strictEqual(numTimesFakeClientInstantiated, 1); + done(); + }); }); + }); - it('should not get the projectId if placeholder', function(done) { - pubsub.projectId = '{{projectId}}'; - pubsub.request(CONFIG, done); + it('should return the correct client', function(done) { + v1ClientOverrides.FakeClient = function(options) { + assert.strictEqual(options, pubsub.options); + return FAKE_CLIENT_INSTANCE; + }; + + pubsub.getClient_(CONFIG, function(err, client) { + assert.ifError(err); + assert.strictEqual(client, FAKE_CLIENT_INSTANCE); + done(); + }); + }); + }); + + describe('request', function() { + var CONFIG = { + client: 'SubscriberClient', + method: 'fakeMethod', + reqOpts: {a: 'a'}, + gaxOpts: {}, + }; + + var FAKE_CLIENT_INSTANCE = { + [CONFIG.method]: util.noop, + }; + + beforeEach(function() { + fakeUtil.replaceProjectIdToken = function(reqOpts) { + return reqOpts; + }; + + pubsub.getClient_ = function(config, callback) { + callback(null, FAKE_CLIENT_INSTANCE); + }; + }); + + it('should get the client', function(done) { + pubsub.getClient_ = function(config) { + assert.strictEqual(config, CONFIG); + done(); + }; + + pubsub.request(CONFIG, assert.ifError); + }); + + it('should return error from getting the client', function(done) { + var error = new Error('Error.'); + + pubsub.getClient_ = function(config, callback) { + callback(error); + }; + + pubsub.request(CONFIG, function(err) { + assert.strictEqual(err, error); + done(); }); }); + + it('should replace the project id token on reqOpts', function(done) { + fakeUtil.replaceProjectIdToken = function(reqOpts, projectId) { + assert.deepEqual(reqOpts, CONFIG.reqOpts); + assert.strictEqual(projectId, PROJECT_ID); + done(); + }; + + pubsub.request(CONFIG, assert.ifError); + }); + + it('should call the client method correctly', function(done) { + var CONFIG = { + client: 'FakeClient', + method: 'fakeMethod', + reqOpts: {a: 'a'}, + gaxOpts: {}, + }; + + var replacedReqOpts = {}; + + fakeUtil.replaceProjectIdToken = function() { + return replacedReqOpts; + }; + + var fakeClient = { + fakeMethod: function(reqOpts, gaxOpts, callback) { + assert.strictEqual(reqOpts, replacedReqOpts); + assert.strictEqual(gaxOpts, CONFIG.gaxOpts); + callback(); // done() + }, + }; + + pubsub.getClient_ = function(config, callback) { + callback(null, fakeClient); + }; + + pubsub.request(CONFIG, done); + }); }); describe('snapshot', function() { diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index 3589e87e5c9..e0c1305048a 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -25,10 +25,10 @@ var promisified = false; var fakeUtil = extend({}, common.util, { promisifyAll: function(Class, options) { if (Class.name === 'Publisher') { - assert.deepEqual(options, { singular: true }); + assert.deepEqual(options, {singular: true}); promisified = true; } - } + }, }); describe('Publisher', function() { @@ -39,14 +39,14 @@ describe('Publisher', function() { var TOPIC_NAME = 'test-topic'; var TOPIC = { name: TOPIC_NAME, - request: fakeUtil.noop + request: fakeUtil.noop, }; before(function() { Publisher = proxyquire('../src/publisher.js', { '@google-cloud/common': { - util: fakeUtil - } + util: fakeUtil, + }, }); }); @@ -69,7 +69,7 @@ describe('Publisher', function() { assert.deepEqual(publisher.inventory_, { callbacks: [], queued: [], - bytes: 0 + bytes: 0, }); }); @@ -78,7 +78,7 @@ describe('Publisher', function() { assert.deepEqual(publisher.settings.batching, { maxBytes: Math.pow(1024, 2) * 5, maxMessages: 1000, - maxMilliseconds: 1000 + maxMilliseconds: 1000, }); }); @@ -86,12 +86,12 @@ describe('Publisher', function() { var options = { maxBytes: 10, maxMessages: 11, - maxMilliseconds: 12 + maxMilliseconds: 12, }; var optionsCopy = extend({}, options); var publisher = new Publisher(TOPIC, { - batching: options + batching: options, }); assert.deepEqual(publisher.settings.batching, options); @@ -102,7 +102,7 @@ describe('Publisher', function() { var expected = Math.pow(1024, 2) * 9; var publisher = new Publisher(TOPIC, { - batching: { maxBytes: expected + 1024 } + batching: {maxBytes: expected + 1024}, }); assert.strictEqual(publisher.settings.batching.maxBytes, expected); @@ -110,7 +110,7 @@ describe('Publisher', function() { it('should cap maxMessages', function() { var publisher = new Publisher(TOPIC, { - batching: { maxMessages: 2000 } + batching: {maxMessages: 2000}, }); assert.strictEqual(publisher.settings.batching.maxMessages, 1000); @@ -119,8 +119,8 @@ describe('Publisher', function() { }); describe('publish', function() { - var DATA = new Buffer('hello'); - var ATTRS = { a: 'a' }; + var DATA = Buffer.from('hello'); + var ATTRS = {a: 'a'}; var globalSetTimeout; @@ -257,11 +257,11 @@ describe('Publisher', function() { var FAKE_MESSAGE = {}; TOPIC.request = function(config) { - assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'publish'); assert.deepEqual(config.reqOpts, { topic: TOPIC_NAME, - messages: [FAKE_MESSAGE] + messages: [FAKE_MESSAGE], }); done(); }; @@ -291,11 +291,11 @@ describe('Publisher', function() { assert.strictEqual(messageId, undefined); assert.strictEqual(callbackCalls, 2); done(); - } + }, ]; TOPIC.request = function(config, callback) { - callback(error, { messageIds: FAKE_IDS }); + callback(error, {messageIds: FAKE_IDS}); }; publisher.publish_(); @@ -303,16 +303,18 @@ describe('Publisher', function() { }); describe('queue_', function() { - var DATA = new Buffer('hello'); - var ATTRS = { a: 'a' }; + var DATA = Buffer.from('hello'); + var ATTRS = {a: 'a'}; it('should add the data and attrs to the inventory', function() { publisher.queue_(DATA, ATTRS, fakeUtil.noop); - assert.deepEqual(publisher.inventory_.queued, [{ - data: DATA, - attributes: ATTRS - }]); + assert.deepEqual(publisher.inventory_.queued, [ + { + data: DATA, + attributes: ATTRS, + }, + ]); }); it('should update the inventory size', function() { diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.js index 0e9f1d711eb..b09b5a07ed7 100644 --- a/handwritten/pubsub/test/snapshot.js +++ b/handwritten/pubsub/test/snapshot.js @@ -27,7 +27,7 @@ var fakeUtil = extend({}, common.util, { if (Class.name === 'Snapshot') { promisified = true; } - } + }, }); describe('Snapshot', function() { @@ -38,7 +38,7 @@ describe('Snapshot', function() { var PROJECT_ID = 'grape-spaceship-123'; var PUBSUB = { - projectId: PROJECT_ID + projectId: PROJECT_ID, }; var SUBSCRIPTION = { @@ -46,14 +46,14 @@ describe('Snapshot', function() { projectId: PROJECT_ID, api: {}, createSnapshot: function() {}, - seek: function() {} + seek: function() {}, }; before(function() { Snapshot = proxyquire('../src/snapshot.js', { '@google-cloud/common': { - util: fakeUtil - } + util: fakeUtil, + }, }); }); @@ -167,9 +167,9 @@ describe('Snapshot', function() { describe('delete', function() { it('should make the correct request', function(done) { snapshot.parent.request = function(config, callback) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSnapshot'); - assert.deepEqual(config.reqOpts, { snapshot: snapshot.name }); + assert.deepEqual(config.reqOpts, {snapshot: snapshot.name}); callback(); // the done fn }; diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 648e0abcc13..eed5773b90d 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -28,7 +28,7 @@ var FAKE_FREE_MEM = 168222720; var fakeOs = { freemem: function() { return FAKE_FREE_MEM; - } + }, }; var promisified = false; @@ -40,7 +40,7 @@ var fakeUtil = extend({}, common.util, { promisified = true; assert.deepEqual(options.exclude, ['snapshot']); - } + }, }); function FakeConnectionPool() { @@ -72,19 +72,19 @@ describe('Subscription', function() { var PUBSUB = { projectId: PROJECT_ID, - request: fakeUtil.noop + request: fakeUtil.noop, }; before(function() { Subscription = proxyquire('../src/subscription.js', { '@google-cloud/common': { - util: fakeUtil + util: fakeUtil, }, os: fakeOs, './connection-pool.js': FakeConnectionPool, './histogram.js': FakeHistogram, './iam.js': FakeIAM, - './snapshot.js': FakeSnapshot + './snapshot.js': FakeSnapshot, }); }); @@ -141,8 +141,8 @@ describe('Subscription', function() { maxConnections: 2, flowControl: { maxBytes: 5, - maxMessages: 10 - } + maxMessages: 10, + }, }; var subscription = new Subscription(PUBSUB, SUB_NAME, options); @@ -151,7 +151,7 @@ describe('Subscription', function() { assert.deepEqual(subscription.flowControl, { maxBytes: options.flowControl.maxBytes, - maxMessages: options.flowControl.maxMessages + maxMessages: options.flowControl.maxMessages, }); }); @@ -164,7 +164,7 @@ describe('Subscription', function() { assert.deepEqual(subscription.flowControl, { maxBytes: FAKE_FREE_MEM * 0.2, - maxMessages: Infinity + maxMessages: Infinity, }); }); @@ -190,7 +190,7 @@ describe('Subscription', function() { }; var subscription = new Subscription(PUBSUB, SUB_NAME, { - topic: TOPIC_NAME + topic: TOPIC_NAME, }); subscription.create(done); @@ -221,7 +221,7 @@ describe('Subscription', function() { describe('formatMetadata_', function() { it('should make a copy of the metadata', function() { - var metadata = { a: 'a' }; + var metadata = {a: 'a'}; var formatted = Subscription.formatMetadata_(metadata); assert.deepEqual(metadata, formatted); @@ -232,7 +232,7 @@ describe('Subscription', function() { var threeDaysInSeconds = 3 * 24 * 60 * 60; var metadata = { - messageRetentionDuration: threeDaysInSeconds + messageRetentionDuration: threeDaysInSeconds, }; var formatted = Subscription.formatMetadata_(metadata); @@ -250,7 +250,7 @@ describe('Subscription', function() { var pushEndpoint = 'http://noop.com/push'; var metadata = { - pushEndpoint: pushEndpoint + pushEndpoint: pushEndpoint, }; var formatted = Subscription.formatMetadata_(metadata); @@ -276,7 +276,7 @@ describe('Subscription', function() { var MESSAGE = { ackId: 'abc', received: 12345, - connectionId: 'def' + connectionId: 'def', }; beforeEach(function() { @@ -354,7 +354,7 @@ describe('Subscription', function() { var fakePromisified = { call: function(context, config) { assert.strictEqual(context, subscription); - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'acknowledge'); assert.strictEqual(config.reqOpts.subscription, subscription.name); assert.strictEqual(config.reqOpts.ackIds, fakeAckIds); @@ -362,7 +362,7 @@ describe('Subscription', function() { setImmediate(done); return Promise.resolve(); - } + }, }; fakeUtil.promisify = function(fn) { @@ -379,7 +379,7 @@ describe('Subscription', function() { var fakePromisified = { call: function() { return Promise.reject(fakeError); - } + }, }; fakeUtil.promisify = function() { @@ -410,9 +410,9 @@ describe('Subscription', function() { var fakeConnectionId = 'abc'; var fakeConnection = { write: function(data) { - assert.deepEqual(data, { ackIds: fakeAckIds }); + assert.deepEqual(data, {ackIds: fakeAckIds}); done(); - } + }, }; pool.acquire = function(connectionId, callback) { @@ -443,8 +443,8 @@ describe('Subscription', function() { describe('breakLease_', function() { var MESSAGE = { ackId: 'abc', - data: new Buffer('hello'), - length: 5 + data: Buffer.from('hello'), + length: 5, }; beforeEach(function() { @@ -465,8 +465,8 @@ describe('Subscription', function() { it('should noop for unknown messages', function() { var message = { ackId: 'def', - data: new Buffer('world'), - length: 5 + data: Buffer.from('world'), + length: 5, }; subscription.breakLease_(message); @@ -479,7 +479,7 @@ describe('Subscription', function() { it('should resume receiving messages if paused', function(done) { subscription.connectionPool = { isPaused: true, - resume: done + resume: done, }; subscription.hasMaxMessages_ = function() { @@ -494,7 +494,7 @@ describe('Subscription', function() { isPaused: false, resume: function() { throw new Error('Should not be called.'); - } + }, }; subscription.hasMaxMessages_ = function() { @@ -509,7 +509,7 @@ describe('Subscription', function() { isPaused: true, resume: function() { throw new Error('Should not be called.'); - } + }, }; subscription.hasMaxMessages_ = function() { @@ -555,14 +555,14 @@ describe('Subscription', function() { it('should dump the inventory', function() { subscription.inventory_ = { lease: [0, 1, 2], - bytes: 123 + bytes: 123, }; subscription.close(); assert.deepEqual(subscription.inventory_, { lease: [], - bytes: 0 + bytes: 0, }); }); @@ -607,7 +607,7 @@ describe('Subscription', function() { subscription.connectionPool = { close: function(callback) { setImmediate(callback); // the done fn - } + }, }; }); @@ -644,7 +644,7 @@ describe('Subscription', function() { beforeEach(function() { subscription.snapshot = function(name) { return { - name: name + name: name, }; }; }); @@ -657,11 +657,11 @@ describe('Subscription', function() { it('should make the correct request', function(done) { subscription.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSnapshot'); assert.deepEqual(config.reqOpts, { name: SNAPSHOT_NAME, - subscription: subscription.name + subscription: subscription.name, }); done(); }; @@ -721,9 +721,9 @@ describe('Subscription', function() { describe('delete', function() { it('should make the correct request', function(done) { subscription.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSubscription'); - assert.deepEqual(config.reqOpts, { subscription: subscription.name }); + assert.deepEqual(config.reqOpts, {subscription: subscription.name}); done(); }; @@ -850,7 +850,7 @@ describe('Subscription', function() { it('should return false if a not found error occurs', function(done) { subscription.getMetadata = function(callback) { - callback({ code: 5 }); + callback({code: 5}); }; subscription.exists(function(err, exists) { @@ -861,7 +861,7 @@ describe('Subscription', function() { }); it('should pass back any other type of error', function(done) { - var error = { code: 4 }; + var error = {code: 4}; subscription.getMetadata = function(callback) { callback(error); @@ -905,7 +905,7 @@ describe('Subscription', function() { }); it('should send any pending acks', function() { - var fakeAckIds = subscription.inventory_.ack = ['abc', 'def']; + var fakeAckIds = (subscription.inventory_.ack = ['abc', 'def']); subscription.acknowledge_ = function(ackIds) { assert.strictEqual(ackIds, fakeAckIds); @@ -918,7 +918,7 @@ describe('Subscription', function() { }); it('should send any pending nacks', function() { - var fakeAckIds = subscription.inventory_.nack = ['ghi', 'jkl']; + var fakeAckIds = (subscription.inventory_.nack = ['ghi', 'jkl']); subscription.modifyAckDeadline_ = function(ackIds, deadline) { assert.strictEqual(ackIds, fakeAckIds); @@ -940,7 +940,7 @@ describe('Subscription', function() { it('should delete the autoCreate option', function(done) { var options = { autoCreate: true, - a: 'a' + a: 'a', }; subscription.getMetadata = function(gaxOpts) { @@ -984,7 +984,7 @@ describe('Subscription', function() { describe('error', function() { it('should pass back errors when not auto-creating', function(done) { - var error = { code: 4 }; + var error = {code: 4}; var apiResponse = {}; subscription.getMetadata = function(gaxOpts, callback) { @@ -1000,7 +1000,7 @@ describe('Subscription', function() { }); it('should pass back 404 errors if autoCreate is false', function(done) { - var error = { code: 5 }; + var error = {code: 5}; var apiResponse = {}; subscription.getMetadata = function(gaxOpts, callback) { @@ -1016,7 +1016,7 @@ describe('Subscription', function() { }); it('should pass back 404 errors if create doesnt exist', function(done) { - var error = { code: 5 }; + var error = {code: 5}; var apiResponse = {}; subscription.getMetadata = function(gaxOpts, callback) { @@ -1034,11 +1034,11 @@ describe('Subscription', function() { }); it('should create the sub if 404 + autoCreate is true', function(done) { - var error = { code: 5 }; + var error = {code: 5}; var apiResponse = {}; var fakeOptions = { - autoCreate: true + autoCreate: true, }; subscription.getMetadata = function(gaxOpts, callback) { @@ -1058,9 +1058,9 @@ describe('Subscription', function() { describe('getMetadata', function() { it('should make the correct request', function(done) { subscription.request = function(config) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getSubscription'); - assert.deepEqual(config.reqOpts, { subscription: subscription.name }); + assert.deepEqual(config.reqOpts, {subscription: subscription.name}); done(); }; @@ -1119,7 +1119,7 @@ describe('Subscription', function() { subscription.connectionPool = { isConnected: function() { return false; - } + }, }; assert.strictEqual(subscription.isConnected_(), false); @@ -1129,7 +1129,7 @@ describe('Subscription', function() { subscription.connectionPool = { isConnected: function() { return true; - } + }, }; assert.strictEqual(subscription.isConnected_(), true); @@ -1166,8 +1166,8 @@ describe('Subscription', function() { var MESSAGE = { ackId: 'abc', connectionId: 'def', - data: new Buffer('hello'), - length: 5 + data: Buffer.from('hello'), + length: 5, }; beforeEach(function() { @@ -1293,7 +1293,7 @@ describe('Subscription', function() { var fakePromisified = { call: function(context, config) { assert.strictEqual(context, subscription); - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'modifyAckDeadline'); assert.strictEqual(config.reqOpts.subscription, subscription.name); assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); @@ -1302,7 +1302,7 @@ describe('Subscription', function() { setImmediate(done); return Promise.resolve(); - } + }, }; fakeUtil.promisify = function(fn) { @@ -1319,7 +1319,7 @@ describe('Subscription', function() { var fakePromisified = { call: function() { return Promise.reject(fakeError); - } + }, }; fakeUtil.promisify = function() { @@ -1354,7 +1354,7 @@ describe('Subscription', function() { assert.strictEqual(data.modifyDeadlineAckIds, fakeAckIds); assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); done(); - } + }, }; pool.acquire = function(connectionId, callback) { @@ -1388,11 +1388,11 @@ describe('Subscription', function() { it('should make the correct request', function(done) { subscription.request = function(config, callback) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'modifyPushConfig'); assert.deepEqual(config.reqOpts, { subscription: subscription.name, - pushConfig: fakeConfig + pushConfig: fakeConfig, }); callback(); // the done fn }; @@ -1415,7 +1415,7 @@ describe('Subscription', function() { describe('nack_', function() { var MESSAGE = { ackId: 'abc', - connectionId: 'def' + connectionId: 'def', }; beforeEach(function() { @@ -1506,7 +1506,7 @@ describe('Subscription', function() { }); it('should pause the pool if sub is at max messages', function(done) { - var message = { nack: fakeUtil.noop }; + var message = {nack: fakeUtil.noop}; var leasedMessage = {}; subscription.leaseMessage_ = function() { @@ -1524,7 +1524,7 @@ describe('Subscription', function() { }); it('should not re-pause the pool', function(done) { - var message = { nack: fakeUtil.noop }; + var message = {nack: fakeUtil.noop}; var leasedMessage = {}; subscription.leaseMessage_ = function() { @@ -1547,7 +1547,7 @@ describe('Subscription', function() { }); it('should nack messages if over limit', function(done) { - var message = { nack: done }; + var message = {nack: done}; var leasedMessage = {}; subscription.leaseMessage_ = function() { @@ -1679,11 +1679,11 @@ describe('Subscription', function() { }; subscription.request = function(config, callback) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'seek'); assert.deepEqual(config.reqOpts, { subscription: subscription.name, - snapshot: FAKE_FULL_SNAPSHOT_NAME + snapshot: FAKE_FULL_SNAPSHOT_NAME, }); callback(); // the done fn }; @@ -1775,7 +1775,7 @@ describe('Subscription', function() { }); it('should set a timeout to call renewLeases_', function(done) { - var ackDeadline = subscription.ackDeadline = 1000; + var ackDeadline = (subscription.ackDeadline = 1000); global.Math.random = function() { return fakeRandom; @@ -1829,7 +1829,7 @@ describe('Subscription', function() { describe('setMetadata', function() { var METADATA = { - pushEndpoint: 'http://noop.com/push' + pushEndpoint: 'http://noop.com/push', }; beforeEach(function() { @@ -1841,13 +1841,16 @@ describe('Subscription', function() { it('should make the correct request', function(done) { var formattedMetadata = { pushConfig: { - pushEndpoint: METADATA.pushEndpoint - } + pushEndpoint: METADATA.pushEndpoint, + }, }; - var expectedBody = extend({ - name: SUB_FULL_NAME - }, formattedMetadata); + var expectedBody = extend( + { + name: SUB_FULL_NAME, + }, + formattedMetadata + ); Subscription.formatMetadata_ = function(metadata) { assert.strictEqual(metadata, METADATA); @@ -1855,10 +1858,10 @@ describe('Subscription', function() { }; subscription.request = function(config, callback) { - assert.strictEqual(config.client, 'subscriberClient'); + assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'updateSubscription'); assert.deepEqual(config.reqOpts.subscription, expectedBody); - assert.deepEqual(config.reqOpts.updateMask, { paths: ['push_config'] }); + assert.deepEqual(config.reqOpts.updateMask, {paths: ['push_config']}); callback(); // the done fn }; diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 6b983b1798d..9487f156a7f 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -29,11 +29,8 @@ var fakeUtil = extend({}, util, { } promisified = true; - assert.deepEqual(options.exclude, [ - 'publisher', - 'subscription' - ]); - } + assert.deepEqual(options.exclude, ['publisher', 'subscription']); + }, }); function FakeIAM() { @@ -56,7 +53,7 @@ var fakePaginator = { }, streamify: function(methodName) { return methodName; - } + }, }; describe('Topic', function() { @@ -70,17 +67,17 @@ describe('Topic', function() { var PUBSUB = { projectId: PROJECT_ID, createTopic: util.noop, - request: util.noop + request: util.noop, }; before(function() { Topic = proxyquire('../src/topic.js', { '@google-cloud/common': { paginator: fakePaginator, - util: fakeUtil + util: fakeUtil, }, './iam.js': FakeIAM, - './publisher.js': FakePublisher + './publisher.js': FakePublisher, }); }); @@ -167,7 +164,7 @@ describe('Topic', function() { describe('createSubscription', function() { it('should call the parent createSubscription method', function(done) { var NAME = 'sub-name'; - var OPTIONS = { a: 'a' }; + var OPTIONS = {a: 'a'}; PUBSUB.createSubscription = function(topic_, name, options, callback) { assert.strictEqual(topic_, topic); @@ -183,9 +180,9 @@ describe('Topic', function() { describe('delete', function() { it('should make the proper request', function(done) { topic.request = function(config, callback) { - assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'deleteTopic'); - assert.deepEqual(config.reqOpts, { topic: topic.name }); + assert.deepEqual(config.reqOpts, {topic: topic.name}); callback(); // the done fn }; @@ -218,7 +215,7 @@ describe('Topic', function() { it('should delete the autoCreate option', function(done) { var options = { autoCreate: true, - a: 'a' + a: 'a', }; topic.getMetadata = function(gaxOpts) { @@ -262,7 +259,7 @@ describe('Topic', function() { describe('error', function() { it('should pass back errors when not auto-creating', function(done) { - var error = { code: 4 }; + var error = {code: 4}; var apiResponse = {}; topic.getMetadata = function(gaxOpts, callback) { @@ -278,7 +275,7 @@ describe('Topic', function() { }); it('should pass back 404 errors if autoCreate is false', function(done) { - var error = { code: 5 }; + var error = {code: 5}; var apiResponse = {}; topic.getMetadata = function(gaxOpts, callback) { @@ -294,11 +291,11 @@ describe('Topic', function() { }); it('should create the topic if 404 + autoCreate is true', function(done) { - var error = { code: 5 }; + var error = {code: 5}; var apiResponse = {}; var fakeOptions = { - autoCreate: true + autoCreate: true, }; topic.getMetadata = function(gaxOpts, callback) { @@ -330,7 +327,7 @@ describe('Topic', function() { it('should return false if a not found error occurs', function(done) { topic.getMetadata = function(callback) { - callback({ code: 5 }); + callback({code: 5}); }; topic.exists(function(err, exists) { @@ -341,7 +338,7 @@ describe('Topic', function() { }); it('should pass back any other type of error', function(done) { - var error = { code: 4 }; + var error = {code: 4}; topic.getMetadata = function(callback) { callback(error); @@ -358,9 +355,9 @@ describe('Topic', function() { describe('getMetadata', function() { it('should make the proper request', function(done) { topic.request = function(config) { - assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'getTopic'); - assert.deepEqual(config.reqOpts, { topic: topic.name }); + assert.deepEqual(config.reqOpts, {topic: topic.name}); done(); }; @@ -415,24 +412,30 @@ describe('Topic', function() { a: 'a', b: 'b', gaxOpts: { - e: 'f' + e: 'f', }, - autoPaginate: false + autoPaginate: false, }; - var expectedOptions = extend({ - topic: topic.name - }, options); + var expectedOptions = extend( + { + topic: topic.name, + }, + options + ); - var expectedGaxOpts = extend({ - autoPaginate: options.autoPaginate - }, options.gaxOpts); + var expectedGaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; topic.request = function(config) { - assert.strictEqual(config.client, 'publisherClient'); + assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'listTopicSubscriptions'); assert.deepEqual(config.reqOpts, expectedOptions); assert.deepEqual(config.gaxOpts, expectedGaxOpts); @@ -444,8 +447,8 @@ describe('Topic', function() { it('should accept only a callback', function(done) { topic.request = function(config) { - assert.deepEqual(config.reqOpts, { topic: topic.name }); - assert.deepEqual(config.gaxOpts, { autoPaginate: undefined }); + assert.deepEqual(config.reqOpts, {topic: topic.name}); + assert.deepEqual(config.gaxOpts, {autoPaginate: undefined}); done(); }; @@ -457,7 +460,7 @@ describe('Topic', function() { topic.subscription = function(name) { return { - name: name + name: name, }; }; @@ -468,9 +471,9 @@ describe('Topic', function() { topic.getSubscriptions(function(err, subscriptions) { assert.ifError(err); assert.deepEqual(subscriptions, [ - { name: 'a' }, - { name: 'b' }, - { name: 'c' } + {name: 'a'}, + {name: 'b'}, + {name: 'c'}, ]); done(); }); From 7d3d84854b7d76d853828fff566e6908f59ea891 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 12 Dec 2017 14:58:57 -0500 Subject: [PATCH 0109/1115] refactor before hook to wait for topics (#7) --- handwritten/pubsub/system-test/pubsub.js | 37 +++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 0cd5eb6558d..ec791db7115 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -51,6 +51,10 @@ describe('pubsub', function() { return 'test-topic-' + uuid.v4(); } + function getTopicName(topic) { + return topic.name.split('/').pop(); + } + function publishPop(message, options, callback) { if (!callback) { callback = options; @@ -92,6 +96,37 @@ describe('pubsub', function() { ); } + function waitForTopics(done) { + var expectedTopics = TOPICS.map(getTopicName); + + async.retry( + { + times: 6, + interval: 10000, + }, + function(callback) { + pubsub.getTopics(function(err, topics) { + if (err) { + callback(err); + return; + } + + var receivedTopics = topics.map(getTopicName); + + for (let topic of expectedTopics) { + if (receivedTopics.indexOf(topic) === -1) { + err = new Error(`Topic ${topic} not found.`); + break; + } + } + + callback(err, topics); + }); + }, + done + ); + } + before(function(done) { // create all needed topics async.each( @@ -105,7 +140,7 @@ describe('pubsub', function() { return; } - setTimeout(done, 5000); + waitForTopics(done); } ); }); From 67ee53e8f24efb91959f7697cf000a22603c01e1 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 13 Dec 2017 15:37:09 -0500 Subject: [PATCH 0110/1115] filter topics by short names (#16) --- handwritten/pubsub/system-test/pubsub.js | 48 +++--------------------- 1 file changed, 6 insertions(+), 42 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index ec791db7115..cb09ce301c3 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -37,7 +37,7 @@ describe('pubsub', function() { pubsub.topic(TOPIC_NAMES[2]), ]; - var TOPIC_FULL_NAMES = [TOPICS[0].name, TOPICS[1].name, TOPICS[2].name]; + var TOPIC_FULL_NAMES = TOPICS.map(getTopicName); function generateSnapshotName() { return 'test-snapshot-' + uuid.v4(); @@ -96,37 +96,6 @@ describe('pubsub', function() { ); } - function waitForTopics(done) { - var expectedTopics = TOPICS.map(getTopicName); - - async.retry( - { - times: 6, - interval: 10000, - }, - function(callback) { - pubsub.getTopics(function(err, topics) { - if (err) { - callback(err); - return; - } - - var receivedTopics = topics.map(getTopicName); - - for (let topic of expectedTopics) { - if (receivedTopics.indexOf(topic) === -1) { - err = new Error(`Topic ${topic} not found.`); - break; - } - } - - callback(err, topics); - }); - }, - done - ); - } - before(function(done) { // create all needed topics async.each( @@ -134,14 +103,7 @@ describe('pubsub', function() { function(topic, cb) { topic.create(cb); }, - function(err) { - if (err) { - done(err); - return; - } - - waitForTopics(done); - } + done ); }); @@ -162,7 +124,8 @@ describe('pubsub', function() { assert.ifError(err); var results = topics.filter(function(topic) { - return TOPIC_FULL_NAMES.indexOf(topic.name) !== -1; + var name = getTopicName(topic); + return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); // get all topics in list of known names @@ -182,7 +145,8 @@ describe('pubsub', function() { }) .on('end', function() { var results = topicsEmitted.filter(function(topic) { - return TOPIC_FULL_NAMES.indexOf(topic.name) !== -1; + var name = getTopicName(topic); + return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); assert.equal(results.length, TOPIC_NAMES.length); From a871d0bbf37018b4fbe9ee748cf3d274fab9fd59 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 15 Dec 2017 18:59:24 -0800 Subject: [PATCH 0111/1115] =?UTF-8?q?Update=20dependencies=20to=20enable?= =?UTF-8?q?=20Greenkeeper=20=F0=9F=8C=B4=20(#18)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(package): update dependencies * docs(readme): add Greenkeeper badge --- handwritten/pubsub/README.md | 2 ++ handwritten/pubsub/package.json | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index aaf9aaf66fb..b699d13e461 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -2,6 +2,8 @@ # [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) +[![Greenkeeper badge](https://badges.greenkeeper.io/googleapis/nodejs-pubsub.svg)](https://greenkeeper.io/) + [![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![CircleCI](https://img.shields.io/circleci/project/github/googleapis/nodejs-pubsub.svg?style=flat)](https://circleci.com/gh/googleapis/nodejs-pubsub) [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/googleapis/nodejs-pubsub?branch=master&svg=true)](https://ci.appveyor.com/project/googleapis/nodejs-pubsub) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 62342050c01..e324ba17d5b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -59,13 +59,13 @@ "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" }, "dependencies": { - "@google-cloud/common": "^0.13.0", + "@google-cloud/common": "^0.15.1", "arrify": "^1.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", - "google-auto-auth": "^0.7.1", + "google-auto-auth": "^0.8.1", "google-gax": "^0.14.2", - "google-proto-files": "^0.13.1", + "google-proto-files": "^0.14.1", "grpc": "^1.7.2", "is": "^3.0.1", "lodash.merge": "^4.6.0", @@ -84,7 +84,7 @@ "ink-docstrap": "^1.3.2", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", - "mocha": "^3.5.3", + "mocha": "^4.0.1", "nyc": "^11.3.0", "power-assert": "^1.4.4", "prettier": "^1.9.1", From 86bfc36892d8582fb373453724cd3e997db69006 Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 18 Dec 2017 14:18:41 -0500 Subject: [PATCH 0112/1115] Support Promise override. (#20) --- handwritten/pubsub/src/iam.js | 4 ++++ handwritten/pubsub/src/index.js | 4 ++++ handwritten/pubsub/src/publisher.js | 4 ++++ handwritten/pubsub/src/snapshot.js | 4 ++++ handwritten/pubsub/src/subscription.js | 4 ++++ handwritten/pubsub/src/topic.js | 4 ++++ handwritten/pubsub/test/iam.js | 5 +++++ handwritten/pubsub/test/index.js | 9 ++++++++- handwritten/pubsub/test/publisher.js | 5 +++++ handwritten/pubsub/test/snapshot.js | 7 ++++++- handwritten/pubsub/test/subscription.js | 5 +++++ handwritten/pubsub/test/topic.js | 5 +++++ 12 files changed, 58 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index fc6588ea148..829c4687d26 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -63,6 +63,10 @@ var is = require('is'); * // subscription.iam */ function IAM(pubsub, id) { + if (pubsub.Promise) { + this.Promise = pubsub.Promise; + } + this.pubsub = pubsub; this.request = pubsub.request.bind(pubsub); this.id = id; diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index ec84e038ce3..df3e6e5da08 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -103,6 +103,10 @@ function PubSub(options) { this.api = {}; this.auth = googleAuth(this.options); this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; + + if (this.options.promise) { + this.Promise = this.options.promise; + } } /** diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index f1b9c5adf92..d91f3add1a2 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -53,6 +53,10 @@ var is = require('is'); * var publisher = topic.publisher(); */ function Publisher(topic, options) { + if (topic.Promise) { + this.Promise = topic.Promise; + } + options = extend( true, { diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index dbb587b1249..ee12d50301e 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -89,6 +89,10 @@ var is = require('is'); * }); */ function Snapshot(parent, name) { + if (parent.Promise) { + this.Promise = parent.Promise; + } + this.parent = parent; this.name = Snapshot.formatName_(parent.projectId, name); diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 3f1cd0f958c..ab58fbf33a1 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -155,6 +155,10 @@ var Snapshot = require('./snapshot.js'); * subscription.removeListener('message', onMessage); */ function Subscription(pubsub, name, options) { + if (pubsub.Promise) { + this.Promise = pubsub.Promise; + } + options = options || {}; this.pubsub = pubsub; diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 3a9f582b99d..d16d7dc74b6 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -51,6 +51,10 @@ var Publisher = require('./publisher.js'); * var topic = pubsub.topic('my-topic'); */ function Topic(pubsub, name) { + if (pubsub.Promise) { + this.Promise = pubsub.Promise; + } + this.name = Topic.formatName_(pubsub.projectId, name); this.parent = this.pubsub = pubsub; this.request = pubsub.request.bind(pubsub); diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index 5631e79bd0b..6d93bbe8d7e 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -36,6 +36,7 @@ describe('IAM', function() { var PUBSUB = { options: {}, + Promise: {}, request: util.noop, }; var ID = 'id'; @@ -53,6 +54,10 @@ describe('IAM', function() { }); describe('initialization', function() { + it('should localize pubsub.Promise', function() { + assert.strictEqual(iam.Promise, PUBSUB.Promise); + }); + it('should localize pubsub', function() { assert.strictEqual(iam.pubsub, PUBSUB); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index f2248744413..add40194a20 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -109,7 +109,10 @@ describe('PubSub', function() { var PubSub; var PROJECT_ID = 'test-project'; var pubsub; - var OPTIONS = {projectId: PROJECT_ID}; + var OPTIONS = { + projectId: PROJECT_ID, + promise: {}, + }; var PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; @@ -261,6 +264,10 @@ describe('PubSub', function() { it('should set isEmulator to false by default', function() { assert.strictEqual(pubsub.isEmulator, false); }); + + it('should localize a Promise override', function() { + assert.strictEqual(pubsub.Promise, OPTIONS.promise); + }); }); describe('createSubscription', function() { diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index e0c1305048a..f4e1a9abd27 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -39,6 +39,7 @@ describe('Publisher', function() { var TOPIC_NAME = 'test-topic'; var TOPIC = { name: TOPIC_NAME, + Promise: {}, request: fakeUtil.noop, }; @@ -61,6 +62,10 @@ describe('Publisher', function() { assert(promisified); }); + it('should localize topic.Promise', function() { + assert.strictEqual(publisher.Promise, TOPIC.Promise); + }); + it('should localize the topic object', function() { assert.strictEqual(publisher.topic, TOPIC); }); diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.js index b09b5a07ed7..cd03482090f 100644 --- a/handwritten/pubsub/test/snapshot.js +++ b/handwritten/pubsub/test/snapshot.js @@ -42,8 +42,9 @@ describe('Snapshot', function() { }; var SUBSCRIPTION = { - pubsub: PUBSUB, + Promise: {}, projectId: PROJECT_ID, + pubsub: PUBSUB, api: {}, createSnapshot: function() {}, seek: function() {}, @@ -81,6 +82,10 @@ describe('Snapshot', function() { assert(promisified); }); + it('should localize parent.Promise', function() { + assert.strictEqual(snapshot.Promise, SUBSCRIPTION.Promise); + }); + it('should localize the parent', function() { assert.strictEqual(snapshot.parent, SUBSCRIPTION); }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index eed5773b90d..f45e0246cd2 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -72,6 +72,7 @@ describe('Subscription', function() { var PUBSUB = { projectId: PROJECT_ID, + Promise: {}, request: fakeUtil.noop, }; @@ -98,6 +99,10 @@ describe('Subscription', function() { assert(promisified); }); + it('should localize pubsub.Promise', function() { + assert.strictEqual(subscription.Promise, PUBSUB.Promise); + }); + it('should localize the pubsub object', function() { assert.strictEqual(subscription.pubsub, PUBSUB); }); diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 9487f156a7f..4d3b865d5bd 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -65,6 +65,7 @@ describe('Topic', function() { var TOPIC_UNFORMATTED_NAME = TOPIC_NAME.split('/').pop(); var PUBSUB = { + Promise: {}, projectId: PROJECT_ID, createTopic: util.noop, request: util.noop, @@ -99,6 +100,10 @@ describe('Topic', function() { assert(promisified); }); + it('should localize pubsub.Promise', function() { + assert.strictEqual(topic.Promise, PUBSUB.Promise); + }); + it('should format the name', function() { var formattedName = 'a/b/c/d'; From 9ca85d36254f9db50dfaee481b03c9970937e619 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 21 Dec 2017 11:34:15 -0500 Subject: [PATCH 0113/1115] 0.16.1 (#21) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e324ba17d5b..3d25b559893 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.16.0", + "version": "0.16.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 28691fa2d89260afa8992d0db4c808cb7d1fc757 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 21 Dec 2017 14:09:58 -0500 Subject: [PATCH 0114/1115] =?UTF-8?q?Update=20google-auto-auth=20to=20the?= =?UTF-8?q?=20latest=20version=20=F0=9F=9A=80=20(#25)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3d25b559893..80eb73994e5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -63,7 +63,7 @@ "arrify": "^1.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", - "google-auto-auth": "^0.8.1", + "google-auto-auth": "^0.9.0", "google-gax": "^0.14.2", "google-proto-files": "^0.14.1", "grpc": "^1.7.2", From 10bbf2150f7ca9c830b9536885e96b5693c4e3e5 Mon Sep 17 00:00:00 2001 From: mkamioner Date: Thu, 28 Dec 2017 17:59:11 +0200 Subject: [PATCH 0115/1115] Full name update (#26) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 80eb73994e5..41b3779c199 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -41,10 +41,10 @@ "Jun Mukai ", "Justin King ", "Matthew Arbesfeld ", + "Mo Kamioner ", "Song Wang ", "Stephen Sawchuk ", - "Tim Swast ", - "mkamioner " + "Tim Swast " ], "scripts": { "system-test": "repo-tools test run --cmd mocha -- system-test/*.js --no-timeouts", From 7ec11c902b3cdf44217e42d3a4dd4742764ae537 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 9 Jan 2018 13:27:55 -0500 Subject: [PATCH 0116/1115] Downgrade gRPC to ~1.7 (#34) GoogleCloudPlatform/google-cloud-node#2784 grpc/grpc-node#130 googleapis/nodejs-datastore#35 --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 41b3779c199..6a8b21bcbbd 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -66,7 +66,7 @@ "google-auto-auth": "^0.9.0", "google-gax": "^0.14.2", "google-proto-files": "^0.14.1", - "grpc": "^1.7.2", + "grpc": "~1.7.2", "is": "^3.0.1", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", From 9903c4f558b5909c2ceaa11c080ac1f0968eee78 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 9 Jan 2018 13:56:35 -0500 Subject: [PATCH 0117/1115] 0.16.2 (#36) * 0.16.2 * 0.16.2 --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6a8b21bcbbd..dc61b3dca53 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.16.1", + "version": "0.16.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From d8d13d211c46a0c9972493aaa1e0e8518f77b3ca Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 12 Jan 2018 14:30:12 -0500 Subject: [PATCH 0118/1115] Normalize options argument for all instantiations. (#40) --- handwritten/pubsub/src/index.js | 3 ++- handwritten/pubsub/test/index.js | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index df3e6e5da08..072fc8f62d8 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -71,10 +71,11 @@ var PROJECT_ID_PLACEHOLDER = '{{projectId}}'; */ function PubSub(options) { if (!(this instanceof PubSub)) { - options = common.util.normalizeArguments(this, options); return new PubSub(options); } + options = common.util.normalizeArguments(this, options); + // Determine what scopes are needed. // It is the union of the scopes on both clients. const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index add40194a20..02c47bf5374 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -139,6 +139,10 @@ describe('PubSub', function() { }); beforeEach(function() { + fakeUtil.normalizeArguments = function(context, options) { + return options; + }; + v1ClientOverrides = {}; googleAutoAuthOverride = null; SubscriptionOverride = null; @@ -161,23 +165,21 @@ describe('PubSub', function() { assert(promisified); }); + it('should return an instance', function() { + assert(PubSub() instanceof PubSub); + }); + it('should normalize the arguments', function() { - var normalizeArguments = fakeUtil.normalizeArguments; var normalizeArgumentsCalled = false; - var fakeOptions = {projectId: PROJECT_ID}; - var fakeContext = {}; fakeUtil.normalizeArguments = function(context, options) { normalizeArgumentsCalled = true; - assert.strictEqual(context, fakeContext); - assert.strictEqual(options, fakeOptions); + assert.strictEqual(options, OPTIONS); return options; }; - PubSub.call(fakeContext, fakeOptions); - assert(normalizeArgumentsCalled); - - fakeUtil.normalizeArguments = normalizeArguments; + new PubSub(OPTIONS); + assert.strictEqual(normalizeArgumentsCalled, true); }); it('should combine all required scopes', function() { From 5a5a44c060af931accd766ad43c1af891385885f Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Fri, 12 Jan 2018 11:59:54 -0800 Subject: [PATCH 0119/1115] Fix JSDoc and regenerate scaffolding. (#39) * Fix JSDoc and regenerate scaffolding. * updating GAPIC generated files * fix contributors, regenerate scaffolding * run CI as non-root user to speed up grpc module install * Remove temp fix for #38 --- handwritten/pubsub/.circleci/config.yml | 27 +- handwritten/pubsub/.mailmap | 1 + handwritten/pubsub/CONTRIBUTORS | 1 + handwritten/pubsub/README.md | 13 +- handwritten/pubsub/package.json | 5 +- handwritten/pubsub/src/connection-pool.js | 93 ++- handwritten/pubsub/src/histogram.js | 17 +- handwritten/pubsub/src/iam.js | 132 ++- handwritten/pubsub/src/index.js | 481 +++++++---- handwritten/pubsub/src/publisher.js | 75 +- handwritten/pubsub/src/snapshot.js | 53 +- handwritten/pubsub/src/subscription.js | 325 +++++--- handwritten/pubsub/src/topic.js | 289 ++++--- .../v1/doc/doc_google_protobuf_duration.js | 84 -- .../v1/doc/doc_google_protobuf_field_mask.js | 230 ------ .../v1/doc/doc_google_protobuf_timestamp.js | 88 -- handwritten/pubsub/src/v1/doc/doc_pubsub.js | 757 ------------------ handwritten/pubsub/src/v1/index.js | 4 +- handwritten/pubsub/src/v1/publisher_client.js | 4 +- .../src/v1/publisher_client_config.json | 15 +- .../pubsub/src/v1/subscriber_client.js | 29 +- .../src/v1/subscriber_client_config.json | 20 +- 22 files changed, 1008 insertions(+), 1735 deletions(-) delete mode 100644 handwritten/pubsub/src/v1/doc/doc_google_protobuf_duration.js delete mode 100644 handwritten/pubsub/src/v1/doc/doc_google_protobuf_field_mask.js delete mode 100644 handwritten/pubsub/src/v1/doc/doc_google_protobuf_timestamp.js delete mode 100644 handwritten/pubsub/src/v1/doc/doc_pubsub.js diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index c6826af1f7a..fec3d085d0a 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -91,6 +91,7 @@ jobs: node4: docker: - image: node:4 + user: node steps: - checkout - run: @@ -106,30 +107,38 @@ jobs: node6: docker: - image: node:6 + user: node <<: *unit_tests node7: docker: - image: node:7 + user: node <<: *unit_tests node8: docker: - image: node:8 + user: node <<: *unit_tests node9: docker: - image: node:9 + user: node <<: *unit_tests lint: docker: - image: node:8 + user: node steps: - checkout - run: name: Install modules and dependencies. command: | + mkdir /home/node/.npm-global npm install npm link + environment: + NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Link the module being tested to the samples. command: | @@ -137,13 +146,18 @@ jobs: npm link @google-cloud/pubsub npm install cd .. + environment: + NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Run linting. command: npm run lint + environment: + NPM_CONFIG_PREFIX: /home/node/.npm-global docs: docker: - image: node:8 + user: node steps: - checkout - run: @@ -156,6 +170,7 @@ jobs: sample_tests: docker: - image: node:8 + user: node steps: - checkout - run: @@ -167,8 +182,11 @@ jobs: - run: name: Install and link the module. command: | + mkdir /home/node/.npm-global npm install npm link + environment: + NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Link the module being tested to the samples. command: | @@ -176,21 +194,25 @@ jobs: npm link @google-cloud/pubsub npm install cd .. + environment: + NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Run sample tests. command: npm run samples-test environment: GCLOUD_PROJECT: long-door-651 - GOOGLE_APPLICATION_CREDENTIALS: /var/pubsub/.circleci/key.json + GOOGLE_APPLICATION_CREDENTIALS: /home/node/pubsub-samples/.circleci/key.json + NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Remove unencrypted key. command: rm .circleci/key.json when: always - working_directory: /var/pubsub/ + working_directory: /home/node/pubsub-samples system_tests: docker: - image: node:8 + user: node steps: - checkout - run: @@ -215,6 +237,7 @@ jobs: publish_npm: docker: - image: node:8 + user: node steps: - checkout - run: diff --git a/handwritten/pubsub/.mailmap b/handwritten/pubsub/.mailmap index 7ff7bca86d8..7777d4dca88 100644 --- a/handwritten/pubsub/.mailmap +++ b/handwritten/pubsub/.mailmap @@ -4,3 +4,4 @@ Luke Sneeringer Luke Sneeringer Stephen Sawchuk Stephen Sawchuk Stephen Sawchuk Stephen Sawchuk Stephen +Alexander Fenster Alexander Fenster diff --git a/handwritten/pubsub/CONTRIBUTORS b/handwritten/pubsub/CONTRIBUTORS index b4a6e4a615e..1fc9a87e157 100644 --- a/handwritten/pubsub/CONTRIBUTORS +++ b/handwritten/pubsub/CONTRIBUTORS @@ -18,4 +18,5 @@ Matthew Arbesfeld Song Wang Stephen Sawchuk Tim Swast +greenkeeper[bot] mkamioner diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index b699d13e461..77b30ba1f1d 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -2,8 +2,6 @@ # [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) -[![Greenkeeper badge](https://badges.greenkeeper.io/googleapis/nodejs-pubsub.svg)](https://greenkeeper.io/) - [![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![CircleCI](https://img.shields.io/circleci/project/github/googleapis/nodejs-pubsub.svg?style=flat)](https://circleci.com/gh/googleapis/nodejs-pubsub) [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/googleapis/nodejs-pubsub?branch=master&svg=true)](https://ci.appveyor.com/project/googleapis/nodejs-pubsub) @@ -72,20 +70,21 @@ const PubSub = require('@google-cloud/pubsub'); const projectId = 'YOUR_PROJECT_ID'; // Instantiates a client -const pubsubClient = PubSub({ - projectId: projectId +const pubsubClient = new PubSub({ + projectId: projectId, }); // The name for the new topic const topicName = 'my-new-topic'; // Creates the new topic -pubsubClient.createTopic(topicName) - .then((results) => { +pubsubClient + .createTopic(topicName) + .then(results => { const topic = results[0]; console.log(`Topic ${topic.name} created.`); }) - .catch((err) => { + .catch(err => { console.error('ERROR:', err); }); ``` diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index dc61b3dca53..98724b25dbf 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -41,10 +41,11 @@ "Jun Mukai ", "Justin King ", "Matthew Arbesfeld ", - "Mo Kamioner ", "Song Wang ", "Stephen Sawchuk ", - "Tim Swast " + "Tim Swast ", + "greenkeeper[bot] ", + "mkamioner " ], "scripts": { "system-test": "repo-tools test run --cmd mocha -- system-test/*.js --no-timeouts", diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 3257b5556b6..5abcddc8434 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -14,10 +14,6 @@ * limitations under the License. */ -/*! - * @module pubsub/connectionPool - */ - 'use strict'; var arrify = require('arrify'); @@ -31,11 +27,15 @@ var uuid = require('uuid'); var CHANNEL_READY_EVENT = 'channel.ready'; var CHANNEL_ERROR_EVENT = 'channel.error'; -// if we can't establish a connection within 5 minutes, we need to back off -// and emit an error to the user. +/*! + * if we can't establish a connection within 5 minutes, we need to back off + * and emit an error to the user. + */ var MAX_TIMEOUT = 300000; -// codes to retry streams +/*! + * codes to retry streams + */ var RETRY_CODES = [ 0, // ok 1, // canceled @@ -48,16 +48,16 @@ var RETRY_CODES = [ 15, // dataloss ]; -/** +/*! * ConnectionPool is used to manage the stream connections created via * StreamingPull rpc. * - * @param {module:pubsub/subscription} subscription - The subscription to create + * @private + * @param {Subscription} subscription The subscription to create * connections for. - * @param {object=} options - Pool options. - * @param {number} options.maxConnections - Number of connections to create. - * Default: 5. - * @param {number} options.ackDeadline - The ack deadline to send when + * @param {object} [options] Pool options. + * @param {number} [options.maxConnections=5] Number of connections to create. + * @param {number} [options.ackDeadline] The ack deadline to send when * creating a connection. */ function ConnectionPool(subscription) { @@ -87,16 +87,17 @@ function ConnectionPool(subscription) { util.inherits(ConnectionPool, events.EventEmitter); -/** +/*! * Acquires a connection from the pool. Optionally you can specify an id for a * specific connection, but if it is no longer available it will return the * first available connection. * - * @param {string=} id - The id of the connection to retrieve. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while acquiring a + * @private + * @param {string} [id] The id of the connection to retrieve. + * @param {function} callback The callback function. + * @param {?error} callback.err An error returned while acquiring a * connection. - * @param {stream} callback.connection - A duplex stream. + * @param {stream} callback.connection A duplex stream. */ ConnectionPool.prototype.acquire = function(id, callback) { var self = this; @@ -133,12 +134,13 @@ ConnectionPool.prototype.acquire = function(id, callback) { } }; -/** +/*! * Ends each connection in the pool and closes the pool, preventing new * connections from being created. * - * @param {function} callback - The callback function. - * @param {?error} callback.error - An error returned while closing the pool. + * @private + * @param {function} callback The callback function. + * @param {?error} callback.error An error returned while closing the pool. */ ConnectionPool.prototype.close = function(callback) { var connections = Array.from(this.connections.values()); @@ -172,9 +174,11 @@ ConnectionPool.prototype.close = function(callback) { ); }; -/** +/*! * Creates a connection. This is async but instead of providing a callback * a `connected` event will fire once the connection is ready. + * + * @private */ ConnectionPool.prototype.createConnection = function() { var self = this; @@ -272,10 +276,10 @@ ConnectionPool.prototype.createConnection = function() { /** * Creates a message object for the user. * - * @param {string} connectionId - The connection id that the message was + * @param {string} connectionId The connection id that the message was * received on. - * @param {object} resp - The message response data from StreamingPull. - * @return {object} message - The message object. + * @param {object} resp The message response data from StreamingPull. + * @return {object} message The message object. */ ConnectionPool.prototype.createMessage = function(connectionId, resp) { var self = this; @@ -305,9 +309,10 @@ ConnectionPool.prototype.createMessage = function(connectionId, resp) { }; }; -/** +/*! * Gets the channels connectivity state and emits channel events accordingly. * + * @private * @fires CHANNEL_ERROR_EVENT * @fires CHANNEL_READY_EVENT */ @@ -347,21 +352,24 @@ ConnectionPool.prototype.getAndEmitChannelState = function() { }); }; -/** +/*! * Gets the Subscriber client. We need to bypass GAX until they allow deadlines * to be optional. * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error occurred while getting the client. - * @param {object} callback.client - The Subscriber client. + * @private + * @param {function} callback The callback function. + * @param {?error} callback.err An error occurred while getting the client. + * @param {object} callback.client The Subscriber client. */ ConnectionPool.prototype.getClient = function(callback) { return this.pubsub.getClient_({client: 'SubscriberClient'}, callback); }; -/** +/*! * Check to see if at least one stream in the pool is connected. - * @return {boolean} + * + * @private + * @returns {boolean} */ ConnectionPool.prototype.isConnected = function() { var interator = this.connections.values(); @@ -378,8 +386,10 @@ ConnectionPool.prototype.isConnected = function() { return false; }; -/** +/*! * Creates specified number of connections and puts pool in open state. + * + * @private */ ConnectionPool.prototype.open = function() { var self = this; @@ -402,8 +412,10 @@ ConnectionPool.prototype.open = function() { }); }; -/** +/*! * Pauses each of the connections, causing `message` events to stop firing. + * + * @private */ ConnectionPool.prototype.pause = function() { this.isPaused = true; @@ -413,9 +425,11 @@ ConnectionPool.prototype.pause = function() { }); }; -/** +/*! * Queues a connection to be created. If any previous connections have failed, * it will apply a back off based on the number of failures. + * + * @private */ ConnectionPool.prototype.queueConnection = function() { var self = this; @@ -436,8 +450,10 @@ ConnectionPool.prototype.queueConnection = function() { } }; -/** +/*! * Calls resume on each connection, allowing `message` events to fire off again. + * + * @private */ ConnectionPool.prototype.resume = function() { this.isPaused = false; @@ -447,11 +463,12 @@ ConnectionPool.prototype.resume = function() { }); }; -/** +/*! * Inspects a status object to determine whether or not we should try and * reconnect. * - * @param {object} status - The gRPC status object. + * @private + * @param {object} status The gRPC status object. * @return {boolean} */ ConnectionPool.prototype.shouldReconnect = function(status) { diff --git a/handwritten/pubsub/src/histogram.js b/handwritten/pubsub/src/histogram.js index f2ac985b825..115069eb9c2 100644 --- a/handwritten/pubsub/src/histogram.js +++ b/handwritten/pubsub/src/histogram.js @@ -14,28 +14,28 @@ * limitations under the License. */ -/*! - * @module pubsub/histogram - */ - 'use strict'; var MIN_VALUE = 10000; var MAX_VALUE = 600000; -/** +/*! * The Histogram class is used to capture the lifespan of messages within the * the client. These durations are then used to calculate the 99th percentile * of ack deadlines for future messages. + * + * @private + * @class */ function Histogram() { this.data = new Map(); this.length = 0; } -/** +/*! * Adds a value to the histogram. * + * @private * @param {numnber} value - The value in milliseconds. */ Histogram.prototype.add = function(value) { @@ -52,10 +52,11 @@ Histogram.prototype.add = function(value) { this.length += 1; }; -/** +/*! * Retrieves the nth percentile of recorded values. * - * @param {number} percent - The requested percentage. + * @private + * @param {number} percent The requested percentage. * @return {number} */ Histogram.prototype.percentile = function(percent) { diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 829c4687d26..a43698a83ea 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -24,11 +24,6 @@ var arrify = require('arrify'); var common = require('@google-cloud/common'); var is = require('is'); -/*! Developer Documentation - * - * @param {module:pubsub} pubsub - PubSub Object. - * @param {string} id - The name of the topic or subscription. - */ /** * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) * allows you to set permissions on invidual resources and offers a wider range @@ -49,17 +44,22 @@ var is = require('is'); * SLA or deprecation policy, and may be subject to backward-incompatible * changes.* * - * @constructor - * @alias module:pubsub/iam + * @constructor Iam + * @mixin + * @param {PubSub} pubsub PubSub Object. + * @param {string} id The name of the topic or subscription. * - * @resource [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} - * @resource [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * @see [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} + * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example - * var topic = pubsub.topic('my-topic'); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); * // topic.iam * - * var subscription = pubsub.subscription('my-subscription'); + * const subscription = pubsub.subscription('my-subscription'); * // subscription.iam */ function IAM(pubsub, id) { @@ -72,20 +72,35 @@ function IAM(pubsub, id) { this.id = id; } +/** + * @typedef {array} GetPolicyResponse + * @property {object} 0 The policy. + * @property {object} 1 The full API response. + */ +/** + * @callback GetPolicyCallback + * @param {?Error} err Request error, if any. + * @param {object} acl The policy. + * @param {object} apiResponse The full API response. + */ /** * Get the IAM policy * - * @param {object=} gaxOptions - Request configuration options, outlined + * @param {object} [gaxOptions] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this request. - * @param {object} callback.policy - The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). - * @param {object} callback.apiResponse - The full API response. + * @param {GetPolicyCallback} [callback] Callback function. + * @returns {Promise} * - * @resource [Topics: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/getIamPolicy} - * @resource [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy} + * @see [Topics: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/getIamPolicy} + * @see [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * * topic.iam.getPolicy(function(err, policy, apiResponse) {}); * * subscription.iam.getPolicy(function(err, policy, apiResponse) {}); @@ -119,27 +134,42 @@ IAM.prototype.getPolicy = function(gaxOpts, callback) { ); }; +/** + * @typedef {array} SetPolicyResponse + * @property {object} 0 The policy. + * @property {object} 1 The full API response. + */ +/** + * @callback SetPolicyCallback + * @param {?Error} err Request error, if any. + * @param {object} acl The policy. + * @param {object} apiResponse The full API response. + */ /** * Set the IAM policy * * @throws {Error} If no policy is provided. * - * @param {object} policy - The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). - * @param {array=} policy.bindings - Bindings associate members with roles. - * @param {Array=} policy.rules - Rules to be applied to the policy. - * @param {string=} policy.etag - Etags are used to perform a read-modify-write. - * @param {object=} gaxOptions - Request configuration options, outlined + * @param {object} policy The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). + * @param {array} [policy.bindings] Bindings associate members with roles. + * @param {Array} [policy.rules] Rules to be applied to the policy. + * @param {string} [policy.etag] Etags are used to perform a read-modify-write. + * @param {object} [gaxOptions] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this request. - * @param {object} callback.policy - The updated policy. - * @param {object} callback.apiResponse - The full API response. + * @param {SetPolicyCallback} callback Callback function. + * @returns {Promise} * - * @resource [Topics: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/setIamPolicy} - * @resource [Subscriptions: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/setIamPolicy} - * @resource [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy} + * @see [Topics: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/setIamPolicy} + * @see [Subscriptions: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/setIamPolicy} + * @see [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * * var myPolicy = { * bindings: [ * { @@ -187,6 +217,17 @@ IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { ); }; +/** + * @typedef {array} TestIamPermissionsResponse + * @property {object[]} 0 A subset of permissions that the caller is allowed. + * @property {object} 1 The full API response. + */ +/** + * @callback TestIamPermissionsCallback + * @param {?Error} err Request error, if any. + * @param {object[]} permissions A subset of permissions that the caller is allowed. + * @param {object} apiResponse The full API response. + */ /** * Test a set of permissions for a resource. * @@ -194,24 +235,27 @@ IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { * * @throws {Error} If permissions are not provided. * - * @param {string|string[]} permissions - The permission(s) to test for. - * @param {object=} gaxOptions - Request configuration options, outlined + * @param {string|string[]} permissions The permission(s) to test for. + * @param {object} [gaxOptions] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this request. - * @param {array} callback.permissions - A subset of permissions that the caller - * is allowed - * @param {object} callback.apiResponse - The full API response. + * @param {TestIamPermissionsCallback} [callback] Callback function. + * @returns {Promise} * - * @resource [Topics: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/testIamPermissions} - * @resource [Subscriptions: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/testIamPermissions} - * @resource [Permissions Reference]{@link https://cloud.google.com/pubsub/access_control#permissions} + * @see [Topics: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/testIamPermissions} + * @see [Subscriptions: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/testIamPermissions} + * @see [Permissions Reference]{@link https://cloud.google.com/pubsub/access_control#permissions} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * * //- * // Test a single permission. * //- - * var test = 'pubsub.topics.update'; + * const test = 'pubsub.topics.update'; * * topic.iam.testPermissions(test, function(err, permissions, apiResponse) { * console.log(permissions); @@ -223,7 +267,7 @@ IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { * //- * // Test several permissions at once. * //- - * var tests = [ + * const tests = [ * 'pubsub.subscriptions.consume', * 'pubsub.subscriptions.update' * ]; @@ -240,8 +284,8 @@ IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { * // If the callback is omitted, we'll return a Promise. * //- * topic.iam.testPermissions(test).then(function(data) { - * var permissions = data[0]; - * var apiResponse = data[1]; + * const permissions = data[0]; + * const apiResponse = data[1]; * }); */ IAM.prototype.testPermissions = function(permissions, gaxOpts, callback) { diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 072fc8f62d8..98f33c099a2 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -14,10 +14,6 @@ * limitations under the License. */ -/*! - * @module pubsub - */ - 'use strict'; var common = require('@google-cloud/common'); @@ -29,22 +25,8 @@ var is = require('is'); var PKG = require('../package.json'); var v1 = require('./v1'); -/** - * @type {module:pubsub/snapshot} - * @private - */ var Snapshot = require('./snapshot.js'); - -/** - * @type {module:pubsub/subscription} - * @private - */ var Subscription = require('./subscription.js'); - -/** - * @type {module:pubsub/topic} - * @private - */ var Topic = require('./topic.js'); /** @@ -53,21 +35,61 @@ var Topic = require('./topic.js'); */ var PROJECT_ID_PLACEHOLDER = '{{projectId}}'; +/** + * @typedef {object} ClientConfig + * @property {string} [projectId] The project ID from the Google Developer's + * Console, e.g. 'grape-spaceship-123'. We will also check the environment + * variable `GCLOUD_PROJECT` for your project ID. If your app is running in + * an environment which supports {@link https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application Application Default Credentials}, + * your project ID will be detected automatically. + * @property {string} [keyFilename] Full path to the a .json, .pem, or .p12 key + * downloaded from the Google Developers Console. If you provide a path to a + * JSON file, the `projectId` option above is not necessary. NOTE: .pem and + * .p12 require you to specify the `email` option as well. + * @property {string} [apiEndpoint] The `apiEndpoint` from options will set the + * host. If not set, the `PUBSUB_EMULATOR_HOST` environment variable from + * the gcloud SDK is honored, otherwise the actual API endpoint will be + * used. + * @property {string} [email] Account email address. Required when using a .pem + * or .p12 keyFilename. + * @property {object} [credentials] Credentials object. + * @property {string} [credentials.client_email] + * @property {string} [credentials.private_key] + * @property {boolean} [autoRetry=true] Automatically retry requests if the + * response is related to rate limits or certain intermittent server errors. + * We will exponentially backoff subsequent requests by default. + * @property {number} [maxRetries=3] Maximum number of automatic retries + * attempted before returning the error. + * @property {Constructor} [promise] Custom promise module to use instead of + * native Promises. + */ + /** * [Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a * reliable, many-to-many, asynchronous messaging service from Cloud * Platform. * - * The `apiEndpoint` from options will set the host. If not set, the - * `PUBSUB_EMULATOR_HOST` environment variable from the gcloud SDK is - * honored, otherwise the actual API endpoint will be used. + * @class + * + * @see [Cloud Pub/Sub overview]{@link https://developers.google.com/pubsub/overview} + * + * @param {ClientConfig} [options] Configuration options. * - * @constructor - * @alias module:pubsub + * @example Import the client library + * const PubSub = require('@google-cloud/pubsub'); * - * @resource [Cloud Pub/Sub overview]{@link https://developers.google.com/pubsub/overview} + * @example Create a client that uses Application Default Credentials (ADC): + * const pubsub = new PubSub(); * - * @param {object} options - [Configuration object](#/docs). + * @example Create a client with explicit credentials: + * const pubsub = new PubSub({ + * projectId: 'your-project-id', + * keyFilename: '/path/to/keyfile.json' + * }); + * + * @example include:samples/quickstart.js + * region_tag:pubsub_quickstart + * Full quickstart example: */ function PubSub(options) { if (!(this instanceof PubSub)) { @@ -98,6 +120,10 @@ function PubSub(options) { options ); + /** + * @name PubSub#isEmulator + * @type {boolean} + */ this.isEmulator = false; this.determineBaseUrl_(); @@ -111,66 +137,85 @@ function PubSub(options) { } /** - * Create a subscription to a topic. + * Options for creating a subscription. * - * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * See a [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). * - * @throws {Error} If a Topic instance or topic name is not provided. - * @throws {Error} If a subscription name is not provided. - * - * @param {module:pubsub/topic|string} topic - The Topic to create a - * subscription to. - * @param {string=} name - The name of the subscription. - * @param {object=} options - See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) - * @param {object} options.flowControl - Flow control configurations for + * @typedef {object} CreateSubscriptionRequest + * @property {object} [flowControl] Flow control configurations for * receiving messages. Note that these options do not persist across * subscription instances. - * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * @property {number} [flowControl.maxBytes] The maximum number of bytes * in un-acked messages to allow before the subscription pauses incoming * messages. Defaults to 20% of free memory. - * @param {number} options.flowControl.maxMessages - The maximum number of - * un-acked messages to allow before the subscription pauses incoming - * messages. Default: Infinity. - * @param {object} options.gaxOpts - Request configuration options, outlined + * @property {number} [flowControl.maxMessages=Infinity] The maximum number + * of un-acked messages to allow before the subscription pauses incoming + * messages. + * @property {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {number|date} options.messageRetentionDuration - Set this to override + * @property {number|date} [messageRetentionDuration] Set this to override * the default duration of 7 days. This value is expected in seconds. * Acceptable values are in the range of 10 minutes and 7 days. - * @param {string} options.pushEndpoint - A URL to a custom endpoint that + * @property {string} [pushEndpoint] A URL to a custom endpoint that * messages should be pushed to. - * @param {boolean} options.retainAckedMessages - If set, acked messages are - * retained in the subscription's backlog for the length of time specified - * by `options.messageRetentionDuration`. Default: `false` - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this request - * @param {module:pubsub/subscription} callback.subscription - The subscription. - * @param {object} callback.apiResponse - The full API response. + * @property {boolean} [retainAckedMessages=false] If set, acked messages + * are retained in the subscription's backlog for the length of time + * specified by `options.messageRetentionDuration`. + */ +/** + * @typedef {array} CreateSubscriptionResponse + * @property {Subscription} 0 The new {@link Subscription}. + * @property {object} 1 The full API response. + */ +/** + * @callback CreateSubscriptionCallback + * @param {?Error} err Request error, if any. + * @param {Subscription} subscription The new {@link Subscription}. + * @param {object} apiResponse The full API response. + */ +/** + * Create a subscription to a topic. * - * @example - * //- - * // Subscribe to a topic. (Also see {module:pubsub/topic#createSubscription}). - * //- - * var topic = 'messageCenter'; - * var name = 'newMessages'; + * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * @see {@link Topic#createSubscription} * - * var callback = function(err, subscription, apiResponse) {}; + * @throws {Error} If a Topic instance or topic name is not provided. + * @throws {Error} If a subscription name is not provided. + * + * @param {Topic|string} topic The Topic to create a + * subscription to. + * @param {string} [name] The name of the subscription. + * @param {CreateSubscriptionRequest} [options] See a + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * @param {CreateSubscriptionCallback} [callback] Callback function. + * @returns {Promise} + * + * @example Subscribe to a topic. + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = 'messageCenter'; + * const name = 'newMessages'; + * + * const callback = function(err, subscription, apiResponse) {}; * * pubsub.createSubscription(topic, name, callback); * - * //- - * // Customize the subscription. - * //- + * @example Customize the subscription. + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = 'messageCenter'; + * const name = 'newMessages'; + * * pubsub.createSubscription(topic, name, { * ackDeadline: 90000 // 90 seconds * }, callback); * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- + * @example If the callback is omitted, we'll return a Promise. * pubsub.createSubscription(topic, name).then(function(data) { - * var subscription = data[0]; - * var apiResponse = data[1]; + * const subscription = data[0]; + * const apiResponse = data[1]; * }); */ PubSub.prototype.createSubscription = function(topic, name, options, callback) { @@ -223,21 +268,32 @@ PubSub.prototype.createSubscription = function(topic, name, options, callback) { ); }; +/** + * @typedef {array} CreateTopicResponse + * @property {Topic} 0 The new {@link Topic}. + * @property {object} 1 The full API response. + */ +/** + * @callback CreateTopicCallback + * @param {?Error} err Request error, if any. + * @param {Topic} topic The new {@link Topic}. + * @param {object} apiResponse The full API response. + */ /** * Create a topic with the given name. * - * @resource [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create} + * @see [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create} * - * @param {string} name - Name of the topic. - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {string} name Name of the topic. + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {module:pubsub/topic} callback.topic - The newly created topic. - * @param {object} callback.apiResponse - The full API response from the - * service. + * @param {CreateTopicCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * * pubsub.createTopic('my-new-topic', function(err, topic, apiResponse) { * if (!err) { * // The topic was created successfully. @@ -248,8 +304,8 @@ PubSub.prototype.createSubscription = function(topic, name, options, callback) { * // If the callback is omitted, we'll return a Promise. * //- * pubsub.createTopic('my-new-topic').then(function(data) { - * var topic = data[0]; - * var apiResponse = data[1]; + * const topic = data[0]; + * const apiResponse = data[1]; * }); */ PubSub.prototype.createTopic = function(name, gaxOpts, callback) { @@ -314,21 +370,38 @@ PubSub.prototype.determineBaseUrl_ = function() { }; /** - * Get a list of snapshots. + * Query object for listing snapshots. * - * @param {object=} options - Configuration object. - * @param {boolean} options.autoPaginate - Have pagination handled - * automatically. Default: true. - * @param {object} options.gaxOpts - Request configuration options, outlined + * @typedef {object} GetSnapshotsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {number} options.pageSize - Maximum number of results to return. - * @param {string} options.pageToken - Page token. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {module:pubsub/snapshot[]} callback.snapshots - The list of snapshots - * in your project. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + */ +/** + * @typedef {array} GetSnapshotsResponse + * @property {Snapshot[]} 0 Array of {@link Snapshot} instances. + * @property {object} 1 The full API response. + */ +/** + * @callback GetSnapshotsCallback + * @param {?Error} err Request error, if any. + * @param {Snapshot[]} snapshots Array of {@link Snapshot} instances. + * @param {object} apiResponse The full API response. + */ +/** + * Get a list of snapshots. + * + * @param {GetSnapshotsRequest} [query] Query object for listing snapshots. + * @param {GetSnapshotsCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * * pubsub.getSnapshots(function(err, snapshots) { * if (!err) { * // snapshots is an array of Snapshot objects. @@ -339,7 +412,7 @@ PubSub.prototype.determineBaseUrl_ = function() { * // If the callback is omitted, we'll return a Promise. * //- * pubsub.getSnapshots().then(function(data) { - * var snapshots = data[0]; + * const snapshots = data[0]; * }); */ PubSub.prototype.getSnapshots = function(options, callback) { @@ -391,14 +464,17 @@ PubSub.prototype.getSnapshots = function(options, callback) { }; /** - * Get a list of the {module:pubsub/snapshot} objects as a readable object - * stream. + * Get a list of the {@link Snapshot} objects as a readable object stream. * - * @param {object=} options - Configuration object. See - * {module:pubsub#getSnapshots} for a complete list of options. - * @return {stream} + * @method PubSub#getSnapshotsStream + * @param {GetSnapshotsRequest} [options] Configuration object. See + * {@link PubSub#getSnapshots} for a complete list of options. + * @returns {ReadableStream} A readable stream of {@link Snapshot} instances. * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * * pubsub.getSnapshotsStream() * .on('error', console.error) * .on('data', function(snapshot) { @@ -421,35 +497,50 @@ PubSub.prototype.getSnapshotsStream = common.paginator.streamify( 'getSnapshots' ); +/** + * Query object for listing subscriptions. + * + * @typedef {object} GetSubscriptionsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + * @param {string|Topic} options.topic - The name of the topic to + * list subscriptions from. + */ +/** + * @typedef {array} GetSubscriptionsResponse + * @property {Subscription[]} 0 Array of {@link Subscription} instances. + * @property {object} 1 The full API response. + */ +/** + * @callback GetSubscriptionsCallback + * @param {?Error} err Request error, if any. + * @param {Subscription[]} subscriptions Array of {@link Subscription} instances. + * @param {object} apiResponse The full API response. + */ /** * Get a list of the subscriptions registered to all of your project's topics. * You may optionally provide a query object as the first argument to customize * the response. * * Your provided callback will be invoked with an error object if an API error - * occurred or an array of {module:pubsub/subscription} objects. + * occurred or an array of {@link Subscription} objects. * - * To get subscriptions for a topic, see {module:pubsub/topic}. + * To get subscriptions for a topic, see {@link Topic}. * - * @resource [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list} + * @see [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list} * - * @param {object=} options - Configuration object. - * @param {boolean} options.autoPaginate - Have pagination handled - * automatically. Default: true. - * @param {object} options.gaxOpts - Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {number} options.pageSize - Maximum number of results to return. - * @param {string} options.pageToken - Page token. - * @param {string|module:pubsub/topic} options.topic - The name of the topic to - * list subscriptions from. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {module:pubsub/subscription[]} callback.subscriptions - The list of - * subscriptions in your project. - * @param {object} callback.apiResponse - The full API response from the - * service. + * @param {GetSubscriptionsRequest} [query] Query object for listing subscriptions. + * @param {GetSubscriptionsCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * * pubsub.getSubscriptions(function(err, subscriptions) { * if (!err) { * // subscriptions is an array of Subscription objects. @@ -460,7 +551,7 @@ PubSub.prototype.getSnapshotsStream = common.paginator.streamify( * // If the callback is omitted, we'll return a Promise. * //- * pubsub.getSubscriptions().then(function(data) { - * var subscriptions = data[0]; + * const subscriptions = data[0]; * }); */ PubSub.prototype.getSubscriptions = function(options, callback) { @@ -518,14 +609,18 @@ PubSub.prototype.getSubscriptions = function(options, callback) { }; /** - * Get a list of the {module:pubsub/subscription} objects registered to all of + * Get a list of the {@link Subscription} objects registered to all of * your project's topics as a readable object stream. * - * @param {object=} options - Configuration object. See - * {module:pubsub#getSubscriptions} for a complete list of options. - * @return {stream} + * @method PubSub#getSubscriptionsStream + * @param {GetSubscriptionsRequest} [options] Configuration object. See + * {@link PubSub#getSubscriptions} for a complete list of options. + * @returns {ReadableStream} A readable stream of {@link Subscription} instances. * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * * pubsub.getSubscriptionsStream() * .on('error', console.error) * .on('data', function(subscription) { @@ -548,26 +643,42 @@ PubSub.prototype.getSubscriptionsStream = common.paginator.streamify( 'getSubscriptions' ); +/** + * Query object for listing topics. + * + * @typedef {object} GetTopicsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + */ +/** + * @typedef {array} GetTopicsResponse + * @property {Topic[]} 0 Array of {@link Topic} instances. + * @property {object} 1 The full API response. + */ +/** + * @callback GetTopicsCallback + * @param {?Error} err Request error, if any. + * @param {Topic[]} topics Array of {@link Topic} instances. + * @param {object} apiResponse The full API response. + */ /** * Get a list of the topics registered to your project. You may optionally * provide a query object as the first argument to customize the response. * - * @resource [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list} + * @see [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list} * - * @param {object=} query - Query object. - * @param {boolean} query.autoPaginate - Have pagination handled - * automatically. Default: true. - * @param {object} query.gaxOpts - Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {number} query.pageSize - Max number of results to return. - * @param {string} query.pageToken - Page token. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {module:pubsub/topic[]} callback.topics - The list of topics returned. - * @param {object} callback.apiResponse - The full API response from the - * service. + * @param {GetTopicsRequest} [query] Query object for listing topics. + * @param {GetTopicsCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * * pubsub.getTopics(function(err, topics) { * if (!err) { * // topics is an array of Topic objects. @@ -585,7 +696,7 @@ PubSub.prototype.getSubscriptionsStream = common.paginator.streamify( * // If the callback is omitted, we'll return a Promise. * //- * pubsub.getTopics().then(function(data) { - * var topics = data[0]; + * const topics = data[0]; * }); */ PubSub.prototype.getTopics = function(options, callback) { @@ -640,11 +751,15 @@ PubSub.prototype.getTopics = function(options, callback) { * Get a list of the {module:pubsub/topic} objects registered to your project as * a readable object stream. * - * @param {object=} query - Configuration object. See - * {module:pubsub#getTopics} for a complete list of options. - * @return {stream} + * @method PubSub#getTopicsStream + * @param {GetTopicsRequest} [options] Configuration object. See + * {@link PubSub#getTopics} for a complete list of options. + * @returns {ReadableStream} A readable stream of {@link Topic} instances. * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * * pubsub.getTopicsStream() * .on('error', console.error) * .on('data', function(topic) { @@ -670,11 +785,11 @@ PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); * * @private * - * @param {object} config - Configuration object. - * @param {object} config.gaxOpts - GAX options. - * @param {function} config.method - The gax method to call. - * @param {object} config.reqOpts - Request options. - * @param {function=} callback - The callback function. + * @param {object} config Configuration object. + * @param {object} config.gaxOpts GAX options. + * @param {function} config.method The gax method to call. + * @param {object} config.reqOpts Request options. + * @param {function} [callback] The callback function. */ PubSub.prototype.getClient_ = function(config, callback) { var self = this; @@ -711,11 +826,11 @@ PubSub.prototype.getClient_ = function(config, callback) { * * @private * - * @param {object} config - Configuration object. - * @param {object} config.gaxOpts - GAX options. - * @param {function} config.method - The gax method to call. - * @param {object} config.reqOpts - Request options. - * @param {function=} callback - The callback function. + * @param {object} config Configuration object. + * @param {object} config.gaxOpts GAX options. + * @param {function} config.method The gax method to call. + * @param {object} config.reqOpts Request options. + * @param {function} [callback] The callback function. */ PubSub.prototype.request = function(config, callback) { var self = this; @@ -734,16 +849,19 @@ PubSub.prototype.request = function(config, callback) { }; /** - * Create a Snapshot object. See {module:pubsub/subscription#createSnapshot} to + * Create a Snapshot object. See {@link Subscription#createSnapshot} to * create a snapshot. * * @throws {Error} If a name is not provided. * - * @param {string} name - The name of the snapshot. - * @return {module:pubsub/snapshot} + * @param {string} name The name of the snapshot. + * @returns {Snapshot} A {@link Snapshot} instance. * * @example - * var snapshot = pubsub.snapshot('my-snapshot'); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const snapshot = pubsub.snapshot('my-snapshot'); */ PubSub.prototype.snapshot = function(name) { if (!is.string(name)) { @@ -755,7 +873,7 @@ PubSub.prototype.snapshot = function(name) { /** * Create a Subscription object. This command by itself will not run any API - * requests. You will receive a {module:pubsub/subscription} object, + * requests. You will receive a {@link Subscription} object, * which will allow you to interact with a subscription. * * @throws {Error} If subscription name is omitted. @@ -773,10 +891,13 @@ PubSub.prototype.snapshot = function(name) { * messages. Default: Infinity. * @param {number} options.maxConnections - Use this to limit the number of * connections to be used when sending and receiving messages. Default: 5. - * @return {module:pubsub/subscription} + * @returns {Subscription} A {@link Subscription} instance. * * @example - * var subscription = pubsub.subscription('my-subscription'); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const subscription = pubsub.subscription('my-subscription'); * * // Register a listener for `message` events. * subscription.on('message', function(message) { @@ -797,15 +918,18 @@ PubSub.prototype.subscription = function(name, options) { }; /** - * Create a Topic object. See {module:pubsub#createTopic} to create a topic. + * Create a Topic object. See {@link PubSub#createTopic} to create a topic. * * @throws {Error} If a name is not provided. * - * @param {string} name - The name of the topic. - * @return {module:pubsub/topic} + * @param {string} name The name of the topic. + * @returns {Topic} A {@link Topic} instance. * * @example - * var topic = pubsub.topic('my-topic'); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); */ PubSub.prototype.topic = function(name, options) { if (!name) { @@ -834,5 +958,56 @@ common.util.promisifyAll(PubSub, { exclude: ['request', 'snapshot', 'subscription', 'topic'], }); +/** + * The default export of the `@google-cloud/pubsub` package is the + * {@link PubSub} class. + * + * See {@link PubSub} and {@link ClientConfig} for client methods and + * configuration options. + * + * @module {PubSub} @google-cloud/pubsub + * @alias nodejs-pubsub + * + * @example Install the client library with npm: + * npm install --save @google-cloud/pubsub + * + * @example Import the client library + * const PubSub = require('@google-cloud/pubsub'); + * + * @example Create a client that uses Application Default Credentials (ADC): + * const pubsub = new PubSub(); + * + * @example Create a client with explicit credentials: + * const pubsub = new PubSub({ + * projectId: 'your-project-id', + * keyFilename: '/path/to/keyfile.json' + * }); + * + * @example include:samples/quickstart.js + * region_tag:pubsub_quickstart + * Full quickstart example: + */ module.exports = PubSub; + +/** + * @name PubSub.v1 + * @see v1.PublisherClient + * @see v1.SubscriberClient + * @type {object} + * @property {constructor} PublisherClient + * Reference to {@link v1.PublisherClient}. + * @property {constructor} SubscriberClient + * Reference to {@link v1.SubscriberClient}. + */ + +/** + * @name module:@google-cloud/pubsub.v1 + * @see v1.PublisherClient + * @see v1.SubscriberClient + * @type {object} + * @property {constructor} PublisherClient + * Reference to {@link v1.PublisherClient}. + * @property {constructor} SubscriberClient + * Reference to {@link v1.SubscriberClient}. + */ module.exports.v1 = v1; diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index d91f3add1a2..d1d8c22f3e2 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -14,10 +14,6 @@ * limitations under the License. */ -/*! - * @module pubsub/publisher - */ - 'use strict'; var arrify = require('arrify'); @@ -26,31 +22,29 @@ var each = require('async-each'); var extend = require('extend'); var is = require('is'); -/*! Developer Documentation. - * - * @param {module:pubsub/topic} topic - The topic associated with this - * publisher. - */ /** * A Publisher object allows you to publish messages to a specific topic. * - * @constructor - * @alias module:pubsub/publisher + * @class * - * @resource [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} + * @see [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} * - * @param {object=} options - Configuration object. - * @param {object} options.batching - Batching settings. - * @param {number} options.batching.maxBytes - The maximum number of bytes to + * @param {Topic} topic The topic associated with this publisher. + * @param {object} [options] Configuration object. + * @param {object} [options.batching] Batching settings. + * @param {number} [options.batching.maxBytes] The maximum number of bytes to * buffer before sending a payload. - * @param {number} options.batching.maxMessages - The maximum number of messages + * @param {number} [options.batching.maxMessages] The maximum number of messages * to buffer before sending a payload. - * @param {number} options.batching.maxMilliseconds - The maximum duration to + * @param {number} [options.batching.maxMilliseconds] The maximum duration to * wait before sending a payload. * * @example - * var topic = pubsub.topic('my-topic'); - * var publisher = topic.publisher(); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const publisher = topic.publisher(); */ function Publisher(topic, options) { if (topic.Promise) { @@ -69,6 +63,12 @@ function Publisher(topic, options) { options ); + /** + * The topic of this publisher. + * + * @name Publisher#topic + * @type {Topic} topic + */ this.topic = topic; // this object keeps track of all messages scheduled to be published @@ -93,23 +93,36 @@ function Publisher(topic, options) { this.timeoutHandle_ = null; } +/** + * @typedef {array} PublisherPublishResponse + * @property {string} 0 The id for the message. + */ +/** + * @callback PublisherPublishCallback + * @param {?Error} err Request error, if any. + * @param {string} messageId The id for the message. + */ /** * Publish the provided message. * * @throws {TypeError} If data is not a Buffer object. * - * @param {buffer} data - The message data. This must come in the form of a + * @param {buffer} data The message data. This must come in the form of a * Buffer object. - * @param {object=} attributes - Optional attributes for this message. - * @param {function=} callback - The callback function. If omitted a Promise - * will be returned. - * @param {?error} callback.error - An error returned while making this request. - * @param {string} callback.messageId - The id for the message. + * @param {object} [attributes] Optional attributes for this message. + * @param {PublisherPublishCallback} [callback] Callback function. + * @returns {Promise} * * @example - * var data = Buffer.from('Hello, world!'); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const publisher = topic.publisher(); + * + * const data = Buffer.from('Hello, world!'); * - * var callback = function(err, messageId) { + * const callback = function(err, messageId) { * if (err) { * // Error handling omitted. * } @@ -121,7 +134,7 @@ function Publisher(topic, options) { * // Optionally you can provide an object containing attributes for the * // message. * //- - * var attributes = { + * const attributes = { * key: 'value' * }; * @@ -216,9 +229,9 @@ Publisher.prototype.publish_ = function() { * * @private * - * @param {buffer} data - The message data. - * @param {object} attributes - The message attributes. - * @param {function} callback - The callback function. + * @param {buffer} data The message data. + * @param {object} attributes The message attributes. + * @param {function} callback The callback function. */ Publisher.prototype.queue_ = function(data, attrs, callback) { this.inventory_.queued.push({ diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index ee12d50301e..d65366b9b17 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -14,10 +14,6 @@ * limitations under the License. */ -/*! - * @module pubsub/snapshot - */ - 'use strict'; var common = require('@google-cloud/common'); @@ -28,31 +24,30 @@ var is = require('is'); * * Snapshots are sometimes retrieved when using various methods: * - * - {module:pubsub#getSnapshots} - * - {module:pubsub#getSnapshotsStream} - * - {module:pubsub#snapshot} + * - {@link PubSub#getSnapshots} + * - {@link PubSub#getSnapshotsStream} + * - {@link PubSub#snapshot} * * Snapshots may be created with: * - * - {module:pubsub/subscription#createSnapshot} + * - {@link Subscription#createSnapshot} * * You can use snapshots to seek a subscription to a specific point in time. * - * - {module:pubsub/subscription#seek} + * - {@link Subscription#seek} * - * @alias module:pubsub/snapshot - * @constructor + * @class * * @example * //- - * // From {module:pubsub#getSnapshots}: + * // From {@link PubSub#getSnapshots}: * //- * pubsub.getSnapshots(function(err, snapshots) { * // `snapshots` is an array of Snapshot objects. * }); * * //- - * // From {module:pubsub#getSnapshotsStream}: + * // From {@link PubSub#getSnapshotsStream}: * //- * pubsub.getSnapshotsStream() * .on('error', console.error) @@ -61,7 +56,7 @@ var is = require('is'); * }); * * //- - * // From {module:pubsub#snapshot}: + * // From {@link PubSub#snapshot}: * //- * var snapshot = pubsub.snapshot('my-snapshot'); * // snapshot is a Snapshot object. @@ -101,14 +96,15 @@ function Snapshot(parent, name) { * Create a snapshot with the given name. * * **This is only available if you accessed this object through - * {module:pubsub/subscription#snapshot}.** + * {@link Subscription#snapshot}.** * - * @param {string} name - Name of the snapshot. - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {module:pubsub/snapshot} callback.snapshot - The newly created + * @method Snapshot#create + * @param {string} name Name of the snapshot. + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error from the API call, may be null. + * @param {Snapshot} callback.snapshot The newly created * snapshot. - * @param {object} callback.apiResponse - The full API response from the + * @param {object} callback.apiResponse The full API response from the * service. * * @example @@ -139,11 +135,12 @@ function Snapshot(parent, name) { * Seeks an existing subscription to the snapshot. * * **This is only available if you accessed this object through - * {module:pubsub/subscription#snapshot}.** + * {@link Subscription#snapshot}.** * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {object} callback.apiResponse - The full API response from the + * @method Snapshot#seek + * @param {function} callback The callback function. + * @param {?error} callback.err An error from the API call, may be null. + * @param {object} callback.apiResponse The full API response from the * service. * * @example @@ -163,7 +160,7 @@ function Snapshot(parent, name) { } } -/** +/*@ * Format the name of a snapshot. A snapshot's full name is in the format of * projects/{projectId}/snapshots/{snapshotName} * @@ -176,10 +173,10 @@ Snapshot.formatName_ = function(projectId, name) { /** * Delete the snapshot. * - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error returned while making this + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while making this * request. - * @param {object} callback.apiResponse - The full API response from the + * @param {object} callback.apiResponse The full API response from the * service. * * @example diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index ab58fbf33a1..67faf05453d 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -14,10 +14,6 @@ * limitations under the License. */ -/*! - * @module pubsub/subscription - */ - 'use strict'; var arrify = require('arrify'); @@ -29,80 +25,61 @@ var os = require('os'); var snakeCase = require('lodash.snakecase'); var util = require('util'); -/** - * @type {module:pubsub/connectionPool} - * @private - */ var ConnectionPool = require('./connection-pool.js'); - -/** - * @type {module:pubsub/histogram} - * @private - */ var Histogram = require('./histogram.js'); - -/** - * @type {module:pubsub/iam} - * @private - */ var IAM = require('./iam.js'); - -/** - * @type {module:pubsub/snapshot} - * @private - */ var Snapshot = require('./snapshot.js'); -/*! Developer Documentation - * @param {module:pubsub} pubsub - PubSub object. - * @param {string=} name - The name of the subscription. - */ /** * A Subscription object will give you access to your Cloud Pub/Sub * subscription. * * Subscriptions are sometimes retrieved when using various methods: * - * - {module:pubsub#getSubscriptions} - * - {module:pubsub/topic#getSubscriptions} - * - {module:pubsub/topic#createSubscription} + * - {@link Pubsub#getSubscriptions} + * - {@link Topic#getSubscriptions} + * - {@link Topic#createSubscription} * * Subscription objects may be created directly with: * - * - {module:pubsub/topic#subscription} + * - {@link Topic#subscription} * * All Subscription objects are instances of an * [EventEmitter](http://nodejs.org/api/events.html). The subscription will pull * for messages automatically as long as there is at least one listener assigned * for the `message` event. * - * @alias module:pubsub/subscription - * @constructor + * @class * - * @param {object=} options - See a + * @param {PubSub} pubsub PubSub object. + * @param {string} [name] The name of the subscription. + * @param {object} [options] See a * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) - * @param {object} options.flowControl - Flow control configurations for + * @param {object} [options.flowControl] Flow control configurations for * receiving messages. Note that these options do not persist across * subscription instances. - * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * @param {number} [options.flowControl.maxBytes] The maximum number of bytes * in un-acked messages to allow before the subscription pauses incoming * messages. Defaults to 20% of free memory. - * @param {number} options.flowControl.maxMessages - The maximum number of + * @param {number} [options.flowControl.maxMessages] The maximum number of * un-acked messages to allow before the subscription pauses incoming * messages. Default: Infinity. - * @param {number} options.maxConnections - Use this to limit the number of + * @param {number} [options.maxConnections] Use this to limit the number of * connections to be used when sending and receiving messages. Default: 5. * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * * //- - * // From {module:pubsub#getSubscriptions}: + * // From {@link PubSub#getSubscriptions}: * //- * pubsub.getSubscriptions(function(err, subscriptions) { * // `subscriptions` is an array of Subscription objects. * }); * * //- - * // From {module:pubsub/topic#getSubscriptions}: + * // From {@link Topic#getSubscriptions}: * //- * var topic = pubsub.topic('my-topic'); * topic.getSubscriptions(function(err, subscriptions) { @@ -110,7 +87,7 @@ var Snapshot = require('./snapshot.js'); * }); * * //- - * // From {module:pubsub/topic#createSubscription}: + * // From {@link Topic#createSubscription}: * //- * var topic = pubsub.topic('my-topic'); * topic.createSubscription('new-subscription', function(err, subscription) { @@ -118,7 +95,7 @@ var Snapshot = require('./snapshot.js'); * }); * * //- - * // From {module:pubsub/topic#subscription}: + * // From {@link Topic#subscription}: * //- * var topic = pubsub.topic('my-topic'); * var subscription = topic.subscription('my-subscription'); @@ -212,10 +189,11 @@ function Subscription(pubsub, name, options) { * any SLA or deprecation policy, and may be subject to backward-incompatible * changes.* * - * @mixes module:pubsub/iam + * @name Subscription#iam + * @mixes IAM * - * @resource [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} - * @resource [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * @see [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} + * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example * //- @@ -240,7 +218,7 @@ function Subscription(pubsub, name, options) { util.inherits(Subscription, events.EventEmitter); -/** +/*! * Formats Subscription metadata. * * @private @@ -268,7 +246,7 @@ Subscription.formatMetadata_ = function(metadata) { return formatted; }; -/** +/*! * Format the name of a subscription. A subscription's full name is in the * format of projects/{projectId}/subscriptions/{subName}. * @@ -283,14 +261,14 @@ Subscription.formatName_ = function(projectId, name) { return 'projects/' + projectId + '/subscriptions/' + name; }; -/** +/*! * Acks the provided message. If the connection pool is absent, it will be * placed in an internal queue and sent out after 1 second or if the pool is * re-opened before the timeout hits. * * @private * - * @param {object} message - The message object. + * @param {object} message The message object. */ Subscription.prototype.ack_ = function(message) { this.breakLease_(message); @@ -305,13 +283,13 @@ Subscription.prototype.ack_ = function(message) { this.setFlushTimeout_(); }; -/** +/*! * Sends an acknowledge request for the provided ack ids. * * @private * - * @param {string|string[]} ackIds - The ack IDs to acknowledge. - * @param {string=} connId - Connection ID to send request on. + * @param {string|string[]} ackIds The ack IDs to acknowledge. + * @param {string} [connId] Connection ID to send request on. * @return {Promise} */ Subscription.prototype.acknowledge_ = function(ackIds, connId) { @@ -347,7 +325,7 @@ Subscription.prototype.acknowledge_ = function(ackIds, connId) { }); }; -/** +/*! * Breaks the lease on a message. Essentially this means we no longer treat the * message as being un-acked and count it towards the flow control limits. * @@ -356,7 +334,7 @@ Subscription.prototype.acknowledge_ = function(ackIds, connId) { * * @private * - * @param {object} message - The message object. + * @param {object} message The message object. */ Subscription.prototype.breakLease_ = function(message) { var messageIndex = this.inventory_.lease.indexOf(message.ackId); @@ -384,8 +362,8 @@ Subscription.prototype.breakLease_ = function(message) { * Closes the subscription, once this is called you will no longer receive * message events unless you add a new message listener. * - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error returned while closing the + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while closing the * Subscription. * * @example @@ -416,13 +394,13 @@ Subscription.prototype.close = function(callback) { }); }; -/** +/*! * Closes the connection pool. * * @private * - * @param {function=} callback - The callback function. - * @param {?error} err - An error returned from this request. + * @param {function} [callback] The callback function. + * @param {?error} err An error returned from this request. */ Subscription.prototype.closeConnection_ = function(callback) { this.isOpen = false; @@ -435,21 +413,34 @@ Subscription.prototype.closeConnection_ = function(callback) { } }; +/** + * @typedef {array} CreateSnapshotResponse + * @property {Snapshot} 0 The new {@link Snapshot}. + * @property {object} 1 The full API response. + */ +/** + * @callback CreateSnapshotCallback + * @param {?Error} err Request error, if any. + * @param {Snapshot} snapshot The new {@link Snapshot}. + * @param {object} apiResponse The full API response. + */ /** * Create a snapshot with the given name. * - * @param {string} name - Name of the snapshot. - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {string} name Name of the snapshot. + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {module:pubsub/snapshot} callback.snapshot - The newly created - * snapshot. - * @param {object} callback.apiResponse - The full API response from the - * service. + * @param {CreateSnapshotCallback} [callback] Callback function. + * @returns {Promise} * * @example - * var callback = function(err, snapshot, apiResponse) { + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * const callback = function(err, snapshot, apiResponse) { * if (!err) { * // The snapshot was created successfully. * } @@ -461,8 +452,8 @@ Subscription.prototype.closeConnection_ = function(callback) { * // If the callback is omitted, we'll return a Promise. * //- * subscription.createSnapshot('my-snapshot').then(function(data) { - * var snapshot = data[0]; - * var apiResponse = data[1]; + * const snapshot = data[0]; + * const apiResponse = data[1]; * }); */ Subscription.prototype.createSnapshot = function(name, gaxOpts, callback) { @@ -507,23 +498,29 @@ Subscription.prototype.createSnapshot = function(name, gaxOpts, callback) { * Delete the subscription. Pull requests from the current subscription will be * errored once unsubscription is complete. * - * @resource [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete} + * @see [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete} * - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error returned while making this + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while making this * request. - * @param {object} callback.apiResponse - Raw API response. + * @param {object} callback.apiResponse Raw API response. * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * * subscription.delete(function(err, apiResponse) {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- * subscription.delete().then(function(data) { - * var apiResponse = data[0]; + * const apiResponse = data[0]; * }); */ Subscription.prototype.delete = function(gaxOpts, callback) { @@ -558,15 +555,28 @@ Subscription.prototype.delete = function(gaxOpts, callback) { ); }; +/** + * @typedef {array} SubscriptionExistsResponse + * @property {boolean} 0 Whether the subscription exists + */ +/** + * @callback SubscriptionExistsCallback + * @param {?Error} err Request error, if any. + * @param {boolean} exists Whether the subscription exists. + */ /** * Check if a subscription exists. * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {boolean} callback.exists - Whether the subscription exists or not. + * @param {SubscriptionExistsCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * * subscription.exists(function(err, exists) {}); * * //- @@ -592,7 +602,7 @@ Subscription.prototype.exists = function(callback) { }); }; -/** +/*! * Flushes internal queues. These can build up if a user attempts to ack/nack * while there is no connection pool (e.g. after they called close). * @@ -637,15 +647,34 @@ Subscription.prototype.flushQueues_ = function() { return Promise.all(requests); }; +/** + * @typedef {array} GetSubscriptionResponse + * @property {Subscription} 0 The {@link Subscription}. + * @property {object} 1 The full API response. + */ +/** + * @callback GetSubscriptionCallback + * @param {?Error} err Request error, if any. + * @param {Subscription} subscription The {@link Subscription}. + * @param {object} apiResponse The full API response. + */ /** * Get a subscription if it exists. * - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {boolean} gaxOpts.autoCreate - Automatically create the subscription - * does not already exist. Default: false. + * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the + * subscription does not already exist. + * @param {GetSubscriptionCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * * subscription.get(function(err, subscription, apiResponse) { * // The `subscription` data has been populated. * }); @@ -654,8 +683,8 @@ Subscription.prototype.flushQueues_ = function() { * // If the callback is omitted, we'll return a Promise. * //- * subscription.get().then(function(data) { - * var subscription = data[0]; - * var apiResponse = data[1]; + * const subscription = data[0]; + * const apiResponse = data[1]; * }); */ Subscription.prototype.get = function(gaxOpts, callback) { @@ -684,17 +713,30 @@ Subscription.prototype.get = function(gaxOpts, callback) { }); }; +/** + * @typedef {array} GetSubscriptionMetadataResponse + * @property {object} 0 The full API response. + */ +/** + * @callback GetSubscriptionMetadataCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ /** * Fetches the subscriptions metadata. * - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {object} callback.apiResponse - Raw API response. + * @param {GetSubscriptionMetadataCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * * subscription.getMetadata(function(err, apiResponse) { * if (err) { * // Error handling omitted. @@ -737,7 +779,7 @@ Subscription.prototype.getMetadata = function(gaxOpts, callback) { ); }; -/** +/*! * Checks to see if we currently have a streaming connection. * * @private @@ -748,7 +790,7 @@ Subscription.prototype.isConnected_ = function() { return !!(this.connectionPool && this.connectionPool.isConnected()); }; -/** +/*! * Checks to see if this Subscription has hit any of the flow control * thresholds. * @@ -763,14 +805,14 @@ Subscription.prototype.hasMaxMessages_ = function() { ); }; -/** +/*! * Leases a message. This will add the message to our inventory list and then * modifiy the ack deadline for the user if they exceed the specified ack * deadline. * * @private * - * @param {object} message - The message object. + * @param {object} message The message object. */ Subscription.prototype.leaseMessage_ = function(message) { this.modifyAckDeadline_( @@ -786,7 +828,7 @@ Subscription.prototype.leaseMessage_ = function(message) { return message; }; -/** +/*! * Begin listening for events on the subscription. This method keeps track of * how many message listeners are assigned, and then removed, making sure * polling is handled automatically. @@ -820,14 +862,14 @@ Subscription.prototype.listenForEvents_ = function() { }); }; -/** +/*! * Sends a modifyAckDeadline request for the provided ack ids. * * @private * - * @param {string|string[]} ackIds - The ack IDs to acknowledge. - * @param {number} deadline - The dealine in seconds. - * @param {string=} connId - Connection ID to send request on. + * @param {string|string[]} ackIds The ack IDs to acknowledge. + * @param {number} deadline The dealine in seconds. + * @param {string=} connId Connection ID to send request on. * @return {Promise} */ Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { @@ -870,21 +912,34 @@ Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { }); }; +/** + * @typedef {array} ModifyPushConfigResponse + * @property {object} 0 The full API response. + */ +/** + * @callback ModifyPushConfigCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ /** * Modify the push config for the subscription. * - * @param {object} config - The push config. - * @param {string} config.pushEndpoint - A URL locating the endpoint to which + * @param {object} config The push config. + * @param {string} config.pushEndpoint A URL locating the endpoint to which * messages should be published. - * @param {object} config.attributes - [PushConfig attributes](https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#google.pubsub.v1.PushConfig). - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} config.attributes [PushConfig attributes](https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#google.pubsub.v1.PushConfig). + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error from the API call. - * @param {object} callback.apiResponse - The full API response from the - * service. + * @param {ModifyPushConfigCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * * var pushConfig = { * pushEndpoint: 'https://mydomain.com/push', * attributes: { @@ -927,7 +982,7 @@ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { ); }; -/** +/*! * Nacks the provided message. If the connection pool is absent, it will be * placed in an internal queue and sent out after 1 second or if the pool is * re-opened before the timeout hits. @@ -948,7 +1003,7 @@ Subscription.prototype.nack_ = function(message) { this.setFlushTimeout_(); }; -/** +/*! * Opens the ConnectionPool. * * @private @@ -981,7 +1036,7 @@ Subscription.prototype.openConnection_ = function() { }); }; -/** +/*! * Modifies the ack deadline on messages that have yet to be acked. We update * the ack deadline to the 99th percentile of known ack times. * @@ -1007,17 +1062,24 @@ Subscription.prototype.renewLeases_ = function() { }); }; +/** + * @typedef {array} SeekResponse + * @property {object} 0 The full API response. + */ +/** + * @callback SeekCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ /** * Seeks an existing subscription to a point in time or a given snapshot. * - * @param {string|date} snapshot - The point to seek to. This will accept the + * @param {string|date} snapshot The point to seek to. This will accept the * name of the snapshot or a Date object. - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error from the API call, may be null. - * @param {object} callback.apiResponse - The full API response from the - * service. + * @param {SeekCallback} [callback] Callback function. + * @returns {Promise} * * @example * var callback = function(err, resp) { @@ -1065,7 +1127,7 @@ Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { ); }; -/** +/*! * Sets a timeout to flush any acks/nacks that have been made since the pool has * closed. * @@ -1079,7 +1141,7 @@ Subscription.prototype.setFlushTimeout_ = function() { this.flushTimeoutHandle_ = setTimeout(this.flushQueues_.bind(this), 1000); }; -/** +/*! * Sets a timeout to modify the ack deadlines for any unacked/unnacked messages, * renewing their lease. * @@ -1094,16 +1156,23 @@ Subscription.prototype.setLeaseTimeout_ = function() { this.leaseTimeoutHandle_ = setTimeout(this.renewLeases_.bind(this), timeout); }; +/** + * @typedef {array} SetSubscriptionMetadataResponse + * @property {object} 0 The full API response. + */ +/** + * @callback SetSubscriptionMetadataCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ /** * Update the subscription object. * - * @param {object} metadata - The subscription metadata. - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} metadata The subscription metadata. + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error from the API call. - * @param {object} callback.apiResponse - The full API response from the - * service. + * @param {SetSubscriptionMetadataCallback} [callback] Callback function. + * @returns {Promise} * * @example * var metadata = { @@ -1153,13 +1222,13 @@ Subscription.prototype.setMetadata = function(metadata, gaxOpts, callback) { }; /** - * Create a Snapshot object. See {module:pubsub/subscription#createSnapshot} to + * Create a Snapshot object. See {@link Subscription#createSnapshot} to * create a snapshot. * * @throws {Error} If a name is not provided. * - * @param {string} name - The name of the snapshot. - * @return {module:pubsub/snapshot} + * @param {string} name The name of the snapshot. + * @returns {Snapshot} * * @example * var snapshot = subscription.snapshot('my-snapshot'); diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index d16d7dc74b6..5312018c0ac 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -14,48 +14,50 @@ * limitations under the License. */ -/*! - * @module pubsub/topic - */ - 'use strict'; var common = require('@google-cloud/common'); var extend = require('extend'); var is = require('is'); -/** - * @type {module:pubsub/iam} - * @private - */ var IAM = require('./iam.js'); - -/** - * @type {module:pubsub/publisher} - * @private - */ var Publisher = require('./publisher.js'); -/*! Developer Documentation - * - * @param {module:pubsub} pubsub - PubSub object. - * @param {string} name - Name of the topic. - */ /** * A Topic object allows you to interact with a Cloud Pub/Sub topic. * - * @constructor - * @alias module:pubsub/topic + * @class + * @param {PubSub} pubsub PubSub object. + * @param {string} name Name of the topic. * * @example - * var topic = pubsub.topic('my-topic'); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); */ function Topic(pubsub, name) { if (pubsub.Promise) { this.Promise = pubsub.Promise; } + /** + * The fully qualified name of this topic. + * @name Topic#name + * @type {string} + */ this.name = Topic.formatName_(pubsub.projectId, name); + + /** + * The parent {@link PubSub} instance of this topic instance. + * @name Topic#pubsub + * @type {PubSub} + */ + /** + * The parent {@link PubSub} instance of this topic instance. + * @name Topic#parent + * @type {PubSub} + */ this.parent = this.pubsub = pubsub; this.request = pubsub.request.bind(pubsub); @@ -72,12 +74,18 @@ function Topic(pubsub, name) { * any SLA or deprecation policy, and may be subject to backward-incompatible * changes.* * - * @mixes module:pubsub/iam + * @name Topic#iam + * @mixes IAM * - * @resource [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} - * @resource [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * @see [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} + * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * * //- * // Get the IAM policy for your topic. * //- @@ -89,8 +97,8 @@ function Topic(pubsub, name) { * // If the callback is omitted, we'll return a Promise. * //- * topic.iam.getPolicy().then(function(data) { - * var policy = data[0]; - * var apiResponse = data[1]; + * const policy = data[0]; + * const apiResponse = data[1]; * }); */ this.iam = new IAM(pubsub, this.name); @@ -115,14 +123,17 @@ Topic.formatName_ = function(projectId, name) { /** * Create a topic. * - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function=} callback - The callback function. - * @param {?error} callback.err - An error returned while making this request. - * @param {module:pubsub/topic} callback.topic - The topic. - * @param {object} callback.apiResponse - The full API response. + * @param {CreateTopicCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * * topic.create(function(err, topic, apiResponse) { * if (!err) { * // The topic was created successfully. @@ -133,8 +144,8 @@ Topic.formatName_ = function(projectId, name) { * // If the callback is omitted, we'll return a Promise. * //- * topic.create().then(function(data) { - * var topic = data[0]; - * var apiResponse = data[1]; + * const topic = data[0]; + * const apiResponse = data[1]; * }); */ Topic.prototype.create = function(gaxOpts, callback) { @@ -144,38 +155,22 @@ Topic.prototype.create = function(gaxOpts, callback) { /** * Create a subscription to this topic. * - * @resource [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} * * @throws {Error} If subscription name is omitted. * - * @param {string=} name - The name of the subscription. - * @param {object=} options - See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) - * @param {object} options.flowControl - Flow control configurations for - * receiving messages. - * @param {number} options.flowControl.maxBytes - The maximum number of bytes - * in un-acked messages to allow before the subscription pauses incoming - * messages. Defaults to 20% of free memory. - * @param {number} options.flowControl.maxMessages - The maximum number of - * un-acked messages to allow before the subscription pauses incoming - * messages. Default: Infinity. - * @param {object} options.gaxOpts - Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {number|date} options.messageRetentionDuration - Set this to override - * the default duration of 7 days. This value is expected in seconds. - * Acceptable values are in the range of 10 minutes and 7 days. - * @param {string} options.pushEndpoint - A URL to a custom endpoint that - * messages should be pushed to. - * @param {boolean} options.retainAckedMessages - If set, acked messages are - * retained in the subscription's backlog for 7 days (unless overriden by - * `options.messageRetentionDuration`). Default: `false` - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this request. - * @param {module:pubsub/subscription} callback.subscription - The subscription. - * @param {object} callback.apiResponse - The full API response. + * @param {string} [name] The name of the subscription. + * @param {CreateSubscriptionRequest} [options] See a + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * @param {CreateSubscriptionCallback} [callback] Callback function. + * @returns {Promise} * * @example - * var callback = function(err, subscription, apiResponse) {}; + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const callback = function(err, subscription, apiResponse) {}; * * // Without specifying any options. * topic.createSubscription('newMessages', callback); @@ -189,8 +184,8 @@ Topic.prototype.create = function(gaxOpts, callback) { * // If the callback is omitted, we'll return a Promise. * //- * topic.createSubscription('newMessages').then(function(data) { - * var subscription = data[0]; - * var apiResponse = data[1]; + * const subscription = data[0]; + * const apiResponse = data[1]; * }); */ Topic.prototype.createSubscription = function(name, options, callback) { @@ -200,20 +195,28 @@ Topic.prototype.createSubscription = function(name, options, callback) { /** * Delete the topic. This will not delete subscriptions to this topic. * - * @resource [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete} + * @see [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete} * - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function=} callback - The callback function. + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while making this + * request. + * @param {object} callback.apiResponse Raw API response. * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * * topic.delete(function(err, apiResponse) {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- * topic.delete().then(function(data) { - * var apiResponse = data[0]; + * const apiResponse = data[0]; * }); */ Topic.prototype.delete = function(gaxOpts, callback) { @@ -239,22 +242,34 @@ Topic.prototype.delete = function(gaxOpts, callback) { ); }; +/** + * @typedef {array} TopicExistsResponse + * @property {boolean} 0 Whether the topic exists + */ +/** + * @callback TopicExistsCallback + * @param {?Error} err Request error, if any. + * @param {boolean} exists Whether the topic exists. + */ /** * Check if a topic exists. * - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {boolean} callback.exists - Whether the topic exists or not. + * @param {TopicExistsCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * * topic.exists(function(err, exists) {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- * topic.exists().then(function(data) { - * var exists = data[0]; + * const exists = data[0]; * }); */ Topic.prototype.exists = function(callback) { @@ -273,15 +288,33 @@ Topic.prototype.exists = function(callback) { }); }; +/** + * @typedef {array} GetTopicResponse + * @property {Topic} 0 The {@link Topic}. + * @property {object} 1 The full API response. + */ +/** + * @callback GetTopicCallback + * @param {?Error} err Request error, if any. + * @param {Topic} topic The {@link Topic}. + * @param {object} apiResponse The full API response. + */ /** * Get a topic if it exists. * - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {boolean} gaxOpts.autoCreate - Automatically create the topic does not - * already exist. Default: false. + * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the topic + * does not already exist. + * @param {GetTopicCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * * topic.get(function(err, topic, apiResponse) { * // The `topic` data has been populated. * }); @@ -290,8 +323,8 @@ Topic.prototype.exists = function(callback) { * // If the callback is omitted, we'll return a Promise. * //- * topic.get().then(function(data) { - * var topic = data[0]; - * var apiResponse = data[1]; + * const topic = data[0]; + * const apiResponse = data[1]; * }); */ Topic.prototype.get = function(gaxOpts, callback) { @@ -320,26 +353,38 @@ Topic.prototype.get = function(gaxOpts, callback) { }); }; +/** + * @typedef {array} GetTopicMetadataResponse + * @property {object} 0 The full API response. + */ +/** + * @callback GetTopicMetadataCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ /** * Get the official representation of this topic from the API. * - * @resource [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get} + * @see [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get} * - * @param {object=} gaxOpts - Request configuration options, outlined + * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {object} callback.apiResponse - The full API response. + * @param {GetTopicMetadataCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * * topic.getMetadata(function(err, apiResponse) {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- * topic.getMetadata().then(function(data) { - * var apiResponse = data[0]; + * const apiResponse = data[0]; * }); */ Topic.prototype.getMetadata = function(gaxOpts, callback) { @@ -378,22 +423,18 @@ Topic.prototype.getMetadata = function(gaxOpts, callback) { * Your provided callback will be invoked with an error object if an API error * occurred or an array of {module:pubsub/subscription} objects. * - * @resource [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics.subscriptions/list} + * @see [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics.subscriptions/list} * - * @param {object=} options - Configuration object. - * @param {boolean} options.autoPaginate - Have pagination handled - * automatically. Default: true. - * @param {object} options.gaxOpts - Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {number} options.pageSize - Maximum number of results to return. - * @param {string} options.pageToken - Page token. - * @param {function} callback - The callback function. - * @param {?error} callback.err - An error returned while making this - * request. - * @param {module:pubsub/subscription[]} callback.subscriptions - List of - * subscriptions. + * @param {GetSubscriptionsRequest} [query] Query object for listing subscriptions. + * @param {GetSubscriptionsCallback} [callback] Callback function. + * @returns {Promise} * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * * topic.getSubscriptions(function(err, subscriptions) { * // subscriptions is an array of `Subscription` objects. * }); @@ -407,7 +448,7 @@ Topic.prototype.getMetadata = function(gaxOpts, callback) { * // If the callback is omitted, we'll return a Promise. * //- * topic.getSubscriptions().then(function(data) { - * var subscriptions = data[0]; + * const subscriptions = data[0]; * }); */ Topic.prototype.getSubscriptions = function(options, callback) { @@ -461,11 +502,17 @@ Topic.prototype.getSubscriptions = function(options, callback) { * Get a list of the {module:pubsub/subscription} objects registered to this * topic as a readable object stream. * - * @param {object=} query - Configuration object. See - * {module:pubsub/topic#getSubscriptions} for a complete list of options. - * @return {stream} + * @method PubSub#getSubscriptionsStream + * @param {GetSubscriptionsRequest} [options] Configuration object. See + * {@link PubSub#getSubscriptions} for a complete list of options. + * @returns {ReadableStream} A readable stream of {@link Subscription} instances. * * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * * topic.getSubscriptionsStream() * .on('error', console.error) * .on('data', function(subscription) { @@ -491,17 +538,21 @@ Topic.prototype.getSubscriptionsStream = common.paginator.streamify( /** * Creates a Publisher object that allows you to publish messages to this topic. * - * @param {object=} options - Configuration object. - * @param {object} options.batching - Batching settings. - * @param {number} options.batching.maxBytes - The maximum number of bytes to + * @param {object} [options] Configuration object. + * @param {object} [options.batching] Batching settings. + * @param {number} [options.batching.maxBytes] The maximum number of bytes to * buffer before sending a payload. - * @param {number} options.batching.maxMessages - The maximum number of messages + * @param {number} [options.batching.maxMessages] The maximum number of messages * to buffer before sending a payload. - * @param {number} options.batching.maxMilliseconds - The maximum duration to + * @param {number} [options.batching.maxMilliseconds] The maximum duration to * wait before sending a payload. * * @example - * var publisher = topic.publisher(); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const publisher = topic.publisher(); * * publisher.publish(Buffer.from('Hello, world!'), function(err, messageId) { * if (err) { @@ -520,23 +571,27 @@ Topic.prototype.publisher = function(options) { * * @throws {Error} If subscription name is omitted. * - * @param {string} name - Name of the subscription. - * @param {object=} options - Configuration object. - * @param {object} options.flowControl - Flow control configurations for + * @param {string} name Name of the subscription. + * @param {object} [options] Configuration object. + * @param {object} [options.flowControl] Flow control configurations for * receiving messages. Note that these options do not persist across * subscription instances. - * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * @param {number} [options.flowControl.maxBytes] The maximum number of bytes * in un-acked messages to allow before the subscription pauses incoming * messages. Defaults to 20% of free memory. - * @param {number} options.flowControl.maxMessages - The maximum number of - * un-acked messages to allow before the subscription pauses incoming - * messages. Default: Infinity. - * @param {number} options.maxConnections - Use this to limit the number of - * connections to be used when sending and receiving messages. Default: 5. - * @return {module:pubsub/subscription} + * @param {number} [options.flowControl.maxMessages=Infinity] The maximum number + * of un-acked messages to allow before the subscription pauses incoming + * messages. + * @param {number} [options.maxConnections=5] Use this to limit the number of + * connections to be used when sending and receiving messages. + * @return {Subscription} * * @example - * var subscription = topic.subscription('my-subscription'); + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); * * // Register a listener for `message` events. * subscription.on('message', function(message) { diff --git a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_duration.js b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_duration.js deleted file mode 100644 index b81fd71f130..00000000000 --- a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_duration.js +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2017, Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Note: this file is purely for documentation. Any contents are not expected - * to be loaded as the JS file. - */ - -/** - * A Duration represents a signed, fixed-length span of time represented - * as a count of seconds and fractions of seconds at nanosecond - * resolution. It is independent of any calendar and concepts like "day" - * or "month". It is related to Timestamp in that the difference between - * two Timestamp values is a Duration and it can be added or subtracted - * from a Timestamp. Range is approximately +-10,000 years. - * - * Example 1: Compute Duration from two Timestamps in pseudo code. - * - * Timestamp start = ...; - * Timestamp end = ...; - * Duration duration = ...; - * - * duration.seconds = end.seconds - start.seconds; - * duration.nanos = end.nanos - start.nanos; - * - * if (duration.seconds < 0 && duration.nanos > 0) { - * duration.seconds += 1; - * duration.nanos -= 1000000000; - * } else if (durations.seconds > 0 && duration.nanos < 0) { - * duration.seconds -= 1; - * duration.nanos += 1000000000; - * } - * - * Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. - * - * Timestamp start = ...; - * Duration duration = ...; - * Timestamp end = ...; - * - * end.seconds = start.seconds + duration.seconds; - * end.nanos = start.nanos + duration.nanos; - * - * if (end.nanos < 0) { - * end.seconds -= 1; - * end.nanos += 1000000000; - * } else if (end.nanos >= 1000000000) { - * end.seconds += 1; - * end.nanos -= 1000000000; - * } - * - * Example 3: Compute Duration from datetime.timedelta in Python. - * - * td = datetime.timedelta(days=3, minutes=10) - * duration = Duration() - * duration.FromTimedelta(td) - * - * @external "google.protobuf.Duration" - * @property {number} seconds - * Signed seconds of the span of time. Must be from -315,576,000,000 - * to +315,576,000,000 inclusive. - * - * @property {number} nanos - * Signed fractions of a second at nanosecond resolution of the span - * of time. Durations less than one second are represented with a 0 - * `seconds` field and a positive or negative `nanos` field. For durations - * of one second or more, a non-zero value for the `nanos` field must be - * of the same sign as the `seconds` field. Must be from -999,999,999 - * to +999,999,999 inclusive. - * - * @see [google.protobuf.Duration definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/duration.proto} - */ \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_field_mask.js b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_field_mask.js deleted file mode 100644 index db0cea463fe..00000000000 --- a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_field_mask.js +++ /dev/null @@ -1,230 +0,0 @@ -/* - * Copyright 2017, Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Note: this file is purely for documentation. Any contents are not expected - * to be loaded as the JS file. - */ - -/** - * `FieldMask` represents a set of symbolic field paths, for example: - * - * paths: "f.a" - * paths: "f.b.d" - * - * Here `f` represents a field in some root message, `a` and `b` - * fields in the message found in `f`, and `d` a field found in the - * message in `f.b`. - * - * Field masks are used to specify a subset of fields that should be - * returned by a get operation or modified by an update operation. - * Field masks also have a custom JSON encoding (see below). - * - * # Field Masks in Projections - * - * When used in the context of a projection, a response message or - * sub-message is filtered by the API to only contain those fields as - * specified in the mask. For example, if the mask in the previous - * example is applied to a response message as follows: - * - * f { - * a : 22 - * b { - * d : 1 - * x : 2 - * } - * y : 13 - * } - * z: 8 - * - * The result will not contain specific values for fields x,y and z - * (their value will be set to the default, and omitted in proto text - * output): - * - * - * f { - * a : 22 - * b { - * d : 1 - * } - * } - * - * A repeated field is not allowed except at the last position of a - * paths string. - * - * If a FieldMask object is not present in a get operation, the - * operation applies to all fields (as if a FieldMask of all fields - * had been specified). - * - * Note that a field mask does not necessarily apply to the - * top-level response message. In case of a REST get operation, the - * field mask applies directly to the response, but in case of a REST - * list operation, the mask instead applies to each individual message - * in the returned resource list. In case of a REST custom method, - * other definitions may be used. Where the mask applies will be - * clearly documented together with its declaration in the API. In - * any case, the effect on the returned resource/resources is required - * behavior for APIs. - * - * # Field Masks in Update Operations - * - * A field mask in update operations specifies which fields of the - * targeted resource are going to be updated. The API is required - * to only change the values of the fields as specified in the mask - * and leave the others untouched. If a resource is passed in to - * describe the updated values, the API ignores the values of all - * fields not covered by the mask. - * - * If a repeated field is specified for an update operation, the existing - * repeated values in the target resource will be overwritten by the new values. - * Note that a repeated field is only allowed in the last position of a `paths` - * string. - * - * If a sub-message is specified in the last position of the field mask for an - * update operation, then the existing sub-message in the target resource is - * overwritten. Given the target message: - * - * f { - * b { - * d : 1 - * x : 2 - * } - * c : 1 - * } - * - * And an update message: - * - * f { - * b { - * d : 10 - * } - * } - * - * then if the field mask is: - * - * paths: "f.b" - * - * then the result will be: - * - * f { - * b { - * d : 10 - * } - * c : 1 - * } - * - * However, if the update mask was: - * - * paths: "f.b.d" - * - * then the result would be: - * - * f { - * b { - * d : 10 - * x : 2 - * } - * c : 1 - * } - * - * In order to reset a field's value to the default, the field must - * be in the mask and set to the default value in the provided resource. - * Hence, in order to reset all fields of a resource, provide a default - * instance of the resource and set all fields in the mask, or do - * not provide a mask as described below. - * - * If a field mask is not present on update, the operation applies to - * all fields (as if a field mask of all fields has been specified). - * Note that in the presence of schema evolution, this may mean that - * fields the client does not know and has therefore not filled into - * the request will be reset to their default. If this is unwanted - * behavior, a specific service may require a client to always specify - * a field mask, producing an error if not. - * - * As with get operations, the location of the resource which - * describes the updated values in the request message depends on the - * operation kind. In any case, the effect of the field mask is - * required to be honored by the API. - * - * ## Considerations for HTTP REST - * - * The HTTP kind of an update operation which uses a field mask must - * be set to PATCH instead of PUT in order to satisfy HTTP semantics - * (PUT must only be used for full updates). - * - * # JSON Encoding of Field Masks - * - * In JSON, a field mask is encoded as a single string where paths are - * separated by a comma. Fields name in each path are converted - * to/from lower-camel naming conventions. - * - * As an example, consider the following message declarations: - * - * message Profile { - * User user = 1; - * Photo photo = 2; - * } - * message User { - * string display_name = 1; - * string address = 2; - * } - * - * In proto a field mask for `Profile` may look as such: - * - * mask { - * paths: "user.display_name" - * paths: "photo" - * } - * - * In JSON, the same mask is represented as below: - * - * { - * mask: "user.displayName,photo" - * } - * - * # Field Masks and Oneof Fields - * - * Field masks treat fields in oneofs just as regular fields. Consider the - * following message: - * - * message SampleMessage { - * oneof test_oneof { - * string name = 4; - * SubMessage sub_message = 9; - * } - * } - * - * The field mask can be: - * - * mask { - * paths: "name" - * } - * - * Or: - * - * mask { - * paths: "sub_message" - * } - * - * Note that oneof type names ("test_oneof" in this case) cannot be used in - * paths. - * - * @external "google.protobuf.FieldMask" - * @property {string[]} paths - * The set of field mask paths. - * - * @see [google.protobuf.FieldMask definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/field_mask.proto} - */ \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_timestamp.js b/handwritten/pubsub/src/v1/doc/doc_google_protobuf_timestamp.js deleted file mode 100644 index ed8fc627b92..00000000000 --- a/handwritten/pubsub/src/v1/doc/doc_google_protobuf_timestamp.js +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2017, Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Note: this file is purely for documentation. Any contents are not expected - * to be loaded as the JS file. - */ - -/** - * A Timestamp represents a point in time independent of any time zone - * or calendar, represented as seconds and fractions of seconds at - * nanosecond resolution in UTC Epoch time. It is encoded using the - * Proleptic Gregorian Calendar which extends the Gregorian calendar - * backwards to year one. It is encoded assuming all minutes are 60 - * seconds long, i.e. leap seconds are "smeared" so that no leap second - * table is needed for interpretation. Range is from - * 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. - * By restricting to that range, we ensure that we can convert to - * and from RFC 3339 date strings. - * See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt). - * - * Example 1: Compute Timestamp from POSIX `time()`. - * - * Timestamp timestamp; - * timestamp.set_seconds(time(NULL)); - * timestamp.set_nanos(0); - * - * Example 2: Compute Timestamp from POSIX `gettimeofday()`. - * - * struct timeval tv; - * gettimeofday(&tv, NULL); - * - * Timestamp timestamp; - * timestamp.set_seconds(tv.tv_sec); - * timestamp.set_nanos(tv.tv_usec * 1000); - * - * Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. - * - * FILETIME ft; - * GetSystemTimeAsFileTime(&ft); - * UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; - * - * // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z - * // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. - * Timestamp timestamp; - * timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); - * timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); - * - * Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. - * - * long millis = System.currentTimeMillis(); - * - * Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) - * .setNanos((int) ((millis % 1000) * 1000000)).build(); - * - * - * Example 5: Compute Timestamp from current time in Python. - * - * timestamp = Timestamp() - * timestamp.GetCurrentTime() - * - * @external "google.protobuf.Timestamp" - * @property {number} seconds - * Represents seconds of UTC time since Unix epoch - * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to - * 9999-12-31T23:59:59Z inclusive. - * - * @property {number} nanos - * Non-negative fractions of a second at nanosecond resolution. Negative - * second values with fractions must still have non-negative nanos values - * that count forward in time. Must be from 0 to 999,999,999 - * inclusive. - * - * @see [google.protobuf.Timestamp definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto} - */ \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/doc_pubsub.js deleted file mode 100644 index bd0c11239ec..00000000000 --- a/handwritten/pubsub/src/v1/doc/doc_pubsub.js +++ /dev/null @@ -1,757 +0,0 @@ -/* - * Copyright 2017, Google Inc. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Note: this file is purely for documentation. Any contents are not expected - * to be loaded as the JS file. - */ - -/** - * A topic resource. - * - * @property {string} name - * The name of the topic. It must have the format - * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, - * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), - * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent - * signs (`%`). It must be between 3 and 255 characters in length, and it - * must not start with `"goog"`. - * - * @class - * @see [google.pubsub.v1.Topic definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var Topic = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A message data and its attributes. The message payload must not be empty; - * it must contain either a non-empty data field, or at least one attribute. - * - * @property {string} data - * The message payload. - * - * @property {Object.} attributes - * Optional attributes for this message. - * - * @property {string} messageId - * ID of this message, assigned by the server when the message is published. - * Guaranteed to be unique within the topic. This value may be read by a - * subscriber that receives a `PubsubMessage` via a `Pull` call or a push - * delivery. It must not be populated by the publisher in a `Publish` call. - * - * @property {Object} publishTime - * The time at which the message was published, populated by the server when - * it receives the `Publish` call. It must not be populated by the - * publisher in a `Publish` call. - * - * This object should have the same structure as [google.protobuf.Timestamp]{@link external:"google.protobuf.Timestamp"} - * - * @class - * @see [google.pubsub.v1.PubsubMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var PubsubMessage = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the GetTopic method. - * - * @property {string} topic - * The name of the topic to get. - * Format is `projects/{project}/topics/{topic}`. - * - * @class - * @see [google.pubsub.v1.GetTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var GetTopicRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the Publish method. - * - * @property {string} topic - * The messages in the request will be published on this topic. - * Format is `projects/{project}/topics/{topic}`. - * - * @property {Object[]} messages - * The messages to publish. - * - * This object should have the same structure as [PubsubMessage]{@link PubsubMessage} - * - * @class - * @see [google.pubsub.v1.PublishRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var PublishRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `Publish` method. - * - * @property {string[]} messageIds - * The server-assigned ID of each published message, in the same order as - * the messages in the request. IDs are guaranteed to be unique within - * the topic. - * - * @class - * @see [google.pubsub.v1.PublishResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var PublishResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListTopics` method. - * - * @property {string} project - * The name of the cloud project that topics belong to. - * Format is `projects/{project}`. - * - * @property {number} pageSize - * Maximum number of topics to return. - * - * @property {string} pageToken - * The value returned by the last `ListTopicsResponse`; indicates that this is - * a continuation of a prior `ListTopics` call, and that the system should - * return the next page of data. - * - * @class - * @see [google.pubsub.v1.ListTopicsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ListTopicsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListTopics` method. - * - * @property {Object[]} topics - * The resulting topics. - * - * This object should have the same structure as [Topic]{@link Topic} - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more topics that match the - * request; this value should be passed in a new `ListTopicsRequest`. - * - * @class - * @see [google.pubsub.v1.ListTopicsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ListTopicsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListTopicSubscriptions` method. - * - * @property {string} topic - * The name of the topic that subscriptions are attached to. - * Format is `projects/{project}/topics/{topic}`. - * - * @property {number} pageSize - * Maximum number of subscription names to return. - * - * @property {string} pageToken - * The value returned by the last `ListTopicSubscriptionsResponse`; indicates - * that this is a continuation of a prior `ListTopicSubscriptions` call, and - * that the system should return the next page of data. - * - * @class - * @see [google.pubsub.v1.ListTopicSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ListTopicSubscriptionsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListTopicSubscriptions` method. - * - * @property {string[]} subscriptions - * The names of the subscriptions that match the request. - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more subscriptions that match - * the request; this value should be passed in a new - * `ListTopicSubscriptionsRequest` to get more subscriptions. - * - * @class - * @see [google.pubsub.v1.ListTopicSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ListTopicSubscriptionsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `DeleteTopic` method. - * - * @property {string} topic - * Name of the topic to delete. - * Format is `projects/{project}/topics/{topic}`. - * - * @class - * @see [google.pubsub.v1.DeleteTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var DeleteTopicRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A subscription resource. - * - * @property {string} name - * The name of the subscription. It must have the format - * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must - * start with a letter, and contain only letters (`[A-Za-z]`), numbers - * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), - * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters - * in length, and it must not start with `"goog"`. - * - * @property {string} topic - * The name of the topic from which this subscription is receiving messages. - * Format is `projects/{project}/topics/{topic}`. - * The value of this field will be `_deleted-topic_` if the topic has been - * deleted. - * - * @property {Object} pushConfig - * If push delivery is used with this subscription, this field is - * used to configure it. An empty `pushConfig` signifies that the subscriber - * will pull and ack messages using API methods. - * - * This object should have the same structure as [PushConfig]{@link PushConfig} - * - * @property {number} ackDeadlineSeconds - * This value is the maximum time after a subscriber receives a message - * before the subscriber should acknowledge the message. After message - * delivery but before the ack deadline expires and before the message is - * acknowledged, it is an outstanding message and will not be delivered - * again during that time (on a best-effort basis). - * - * For pull subscriptions, this value is used as the initial value for the ack - * deadline. To override this value for a given message, call - * `ModifyAckDeadline` with the corresponding `ack_id` if using - * pull. - * The minimum custom deadline you can specify is 10 seconds. - * The maximum custom deadline you can specify is 600 seconds (10 minutes). - * If this parameter is 0, a default value of 10 seconds is used. - * - * For push delivery, this value is also used to set the request timeout for - * the call to the push endpoint. - * - * If the subscriber never acknowledges the message, the Pub/Sub - * system will eventually redeliver the message. - * - * @property {boolean} retainAckedMessages - * Indicates whether to retain acknowledged messages. If true, then - * messages are not expunged from the subscription's backlog, even if they are - * acknowledged, until they fall out of the `message_retention_duration` - * window. - * - * @property {Object} messageRetentionDuration - * How long to retain unacknowledged messages in the subscription's backlog, - * from the moment a message is published. - * If `retain_acked_messages` is true, then this also configures the retention - * of acknowledged messages, and thus configures how far back in time a `Seek` - * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - * minutes. - * - * This object should have the same structure as [google.protobuf.Duration]{@link external:"google.protobuf.Duration"} - * - * @class - * @see [google.pubsub.v1.Subscription definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var Subscription = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Configuration for a push delivery endpoint. - * - * @property {string} pushEndpoint - * A URL locating the endpoint to which messages should be pushed. - * For example, a Webhook endpoint might use "https://example.com/push". - * - * @property {Object.} attributes - * Endpoint configuration attributes. - * - * Every endpoint has a set of API supported attributes that can be used to - * control different aspects of the message delivery. - * - * The currently supported attribute is `x-goog-version`, which you can - * use to change the format of the pushed message. This attribute - * indicates the version of the data expected by the endpoint. This - * controls the shape of the pushed message (i.e., its fields and metadata). - * The endpoint version is based on the version of the Pub/Sub API. - * - * If not present during the `CreateSubscription` call, it will default to - * the version of the API used to make such call. If not present during a - * `ModifyPushConfig` call, its value will not be changed. `GetSubscription` - * calls will always return a valid version, even if the subscription was - * created without this attribute. - * - * The possible values for this attribute are: - * - * * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. - * * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. - * - * @class - * @see [google.pubsub.v1.PushConfig definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var PushConfig = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A message and its corresponding acknowledgment ID. - * - * @property {string} ackId - * This ID can be used to acknowledge the received message. - * - * @property {Object} message - * The message. - * - * This object should have the same structure as [PubsubMessage]{@link PubsubMessage} - * - * @class - * @see [google.pubsub.v1.ReceivedMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ReceivedMessage = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the GetSubscription method. - * - * @property {string} subscription - * The name of the subscription to get. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @class - * @see [google.pubsub.v1.GetSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var GetSubscriptionRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the UpdateSubscription method. - * - * @property {Object} subscription - * The updated subscription object. - * - * This object should have the same structure as [Subscription]{@link Subscription} - * - * @property {Object} updateMask - * Indicates which fields in the provided subscription to update. - * Must be specified and non-empty. - * - * This object should have the same structure as [google.protobuf.FieldMask]{@link external:"google.protobuf.FieldMask"} - * - * @class - * @see [google.pubsub.v1.UpdateSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var UpdateSubscriptionRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListSubscriptions` method. - * - * @property {string} project - * The name of the cloud project that subscriptions belong to. - * Format is `projects/{project}`. - * - * @property {number} pageSize - * Maximum number of subscriptions to return. - * - * @property {string} pageToken - * The value returned by the last `ListSubscriptionsResponse`; indicates that - * this is a continuation of a prior `ListSubscriptions` call, and that the - * system should return the next page of data. - * - * @class - * @see [google.pubsub.v1.ListSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ListSubscriptionsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListSubscriptions` method. - * - * @property {Object[]} subscriptions - * The subscriptions that match the request. - * - * This object should have the same structure as [Subscription]{@link Subscription} - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more subscriptions that match - * the request; this value should be passed in a new - * `ListSubscriptionsRequest` to get more subscriptions. - * - * @class - * @see [google.pubsub.v1.ListSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ListSubscriptionsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the DeleteSubscription method. - * - * @property {string} subscription - * The subscription to delete. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @class - * @see [google.pubsub.v1.DeleteSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var DeleteSubscriptionRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the ModifyPushConfig method. - * - * @property {string} subscription - * The name of the subscription. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {Object} pushConfig - * The push configuration for future deliveries. - * - * An empty `pushConfig` indicates that the Pub/Sub system should - * stop pushing messages from the given subscription and allow - * messages to be pulled and acknowledged - effectively pausing - * the subscription if `Pull` is not called. - * - * This object should have the same structure as [PushConfig]{@link PushConfig} - * - * @class - * @see [google.pubsub.v1.ModifyPushConfigRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ModifyPushConfigRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `Pull` method. - * - * @property {string} subscription - * The subscription from which messages should be pulled. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {boolean} returnImmediately - * If this field set to true, the system will respond immediately even if - * it there are no messages available to return in the `Pull` response. - * Otherwise, the system may wait (for a bounded amount of time) until at - * least one message is available, rather than returning no messages. The - * client may cancel the request if it does not wish to wait any longer for - * the response. - * - * @property {number} maxMessages - * The maximum number of messages returned for this request. The Pub/Sub - * system may return fewer than the number specified. - * - * @class - * @see [google.pubsub.v1.PullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var PullRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `Pull` method. - * - * @property {Object[]} receivedMessages - * Received Pub/Sub messages. The Pub/Sub system will return zero messages if - * there are no more available in the backlog. The Pub/Sub system may return - * fewer than the `maxMessages` requested even if there are more messages - * available in the backlog. - * - * This object should have the same structure as [ReceivedMessage]{@link ReceivedMessage} - * - * @class - * @see [google.pubsub.v1.PullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var PullResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the ModifyAckDeadline method. - * - * @property {string} subscription - * The name of the subscription. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {string[]} ackIds - * List of acknowledgment IDs. - * - * @property {number} ackDeadlineSeconds - * The new ack deadline with respect to the time this request was sent to - * the Pub/Sub system. For example, if the value is 10, the new - * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call - * was made. Specifying zero may immediately make the message available for - * another pull request. - * The minimum deadline you can specify is 0 seconds. - * The maximum deadline you can specify is 600 seconds (10 minutes). - * - * @class - * @see [google.pubsub.v1.ModifyAckDeadlineRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ModifyAckDeadlineRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the Acknowledge method. - * - * @property {string} subscription - * The subscription whose message is being acknowledged. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {string[]} ackIds - * The acknowledgment ID for the messages being acknowledged that was returned - * by the Pub/Sub system in the `Pull` response. Must not be empty. - * - * @class - * @see [google.pubsub.v1.AcknowledgeRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var AcknowledgeRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `StreamingPull` streaming RPC method. This request is used to - * establish the initial stream as well as to stream acknowledgements and ack - * deadline modifications from the client to the server. - * - * @property {string} subscription - * The subscription for which to initialize the new stream. This must be - * provided in the first request on the stream, and must not be set in - * subsequent requests from client to server. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {string[]} ackIds - * List of acknowledgement IDs for acknowledging previously received messages - * (received on this stream or a different stream). If an ack ID has expired, - * the corresponding message may be redelivered later. Acknowledging a message - * more than once will not result in an error. If the acknowledgement ID is - * malformed, the stream will be aborted with status `INVALID_ARGUMENT`. - * - * @property {number[]} modifyDeadlineSeconds - * The list of new ack deadlines for the IDs listed in - * `modify_deadline_ack_ids`. The size of this list must be the same as the - * size of `modify_deadline_ack_ids`. If it differs the stream will be aborted - * with `INVALID_ARGUMENT`. Each element in this list is applied to the - * element in the same position in `modify_deadline_ack_ids`. The new ack - * deadline is with respect to the time this request was sent to the Pub/Sub - * system. Must be >= 0. For example, if the value is 10, the new ack deadline - * will expire 10 seconds after this request is received. If the value is 0, - * the message is immediately made available for another streaming or - * non-streaming pull request. If the value is < 0 (an error), the stream will - * be aborted with status `INVALID_ARGUMENT`. - * - * @property {string[]} modifyDeadlineAckIds - * List of acknowledgement IDs whose deadline will be modified based on the - * corresponding element in `modify_deadline_seconds`. This field can be used - * to indicate that more time is needed to process a message by the - * subscriber, or to make the message available for redelivery if the - * processing was interrupted. - * - * @property {number} streamAckDeadlineSeconds - * The ack deadline to use for the stream. This must be provided in the - * first request on the stream, but it can also be updated on subsequent - * requests from client to server. The minimum deadline you can specify is 10 - * seconds. The maximum deadline you can specify is 600 seconds (10 minutes). - * - * @class - * @see [google.pubsub.v1.StreamingPullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var StreamingPullRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `StreamingPull` method. This response is used to stream - * messages from the server to the client. - * - * @property {Object[]} receivedMessages - * Received Pub/Sub messages. This will not be empty. - * - * This object should have the same structure as [ReceivedMessage]{@link ReceivedMessage} - * - * @class - * @see [google.pubsub.v1.StreamingPullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var StreamingPullResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `CreateSnapshot` method. - * - * @property {string} name - * Optional user-provided name for this snapshot. - * If the name is not provided in the request, the server will assign a random - * name for this snapshot on the same project as the subscription. - * Note that for REST API requests, you must specify a name. - * Format is `projects/{project}/snapshots/{snap}`. - * - * @property {string} subscription - * The subscription whose backlog the snapshot retains. - * Specifically, the created snapshot is guaranteed to retain: - * (a) The existing backlog on the subscription. More precisely, this is - * defined as the messages in the subscription's backlog that are - * unacknowledged upon the successful completion of the - * `CreateSnapshot` request; as well as: - * (b) Any messages published to the subscription's topic following the - * successful completion of the CreateSnapshot request. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @class - * @see [google.pubsub.v1.CreateSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var CreateSnapshotRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A snapshot resource. - * - * @property {string} name - * The name of the snapshot. - * - * @property {string} topic - * The name of the topic from which this snapshot is retaining messages. - * - * @property {Object} expireTime - * The snapshot is guaranteed to exist up until this time. - * A newly-created snapshot expires no later than 7 days from the time of its - * creation. Its exact lifetime is determined at creation by the existing - * backlog in the source subscription. Specifically, the lifetime of the - * snapshot is `7 days - (age of oldest unacked message in the subscription)`. - * For example, consider a subscription whose oldest unacked message is 3 days - * old. If a snapshot is created from this subscription, the snapshot -- which - * will always capture this 3-day-old backlog as long as the snapshot - * exists -- will expire in 4 days. - * - * This object should have the same structure as [google.protobuf.Timestamp]{@link external:"google.protobuf.Timestamp"} - * - * @class - * @see [google.pubsub.v1.Snapshot definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var Snapshot = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListSnapshots` method. - * - * @property {string} project - * The name of the cloud project that snapshots belong to. - * Format is `projects/{project}`. - * - * @property {number} pageSize - * Maximum number of snapshots to return. - * - * @property {string} pageToken - * The value returned by the last `ListSnapshotsResponse`; indicates that this - * is a continuation of a prior `ListSnapshots` call, and that the system - * should return the next page of data. - * - * @class - * @see [google.pubsub.v1.ListSnapshotsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ListSnapshotsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListSnapshots` method. - * - * @property {Object[]} snapshots - * The resulting snapshots. - * - * This object should have the same structure as [Snapshot]{@link Snapshot} - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more snapshot that match the - * request; this value should be passed in a new `ListSnapshotsRequest`. - * - * @class - * @see [google.pubsub.v1.ListSnapshotsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var ListSnapshotsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `DeleteSnapshot` method. - * - * @property {string} snapshot - * The name of the snapshot to delete. - * Format is `projects/{project}/snapshots/{snap}`. - * - * @class - * @see [google.pubsub.v1.DeleteSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var DeleteSnapshotRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `Seek` method. - * - * @property {string} subscription - * The subscription to affect. - * - * @property {Object} time - * The time to seek to. - * Messages retained in the subscription that were published before this - * time are marked as acknowledged, and messages retained in the - * subscription that were published after this time are marked as - * unacknowledged. Note that this operation affects only those messages - * retained in the subscription (configured by the combination of - * `message_retention_duration` and `retain_acked_messages`). For example, - * if `time` corresponds to a point before the message retention - * window (or to a point before the system's notion of the subscription - * creation time), only retained messages will be marked as unacknowledged, - * and already-expunged messages will not be restored. - * - * This object should have the same structure as [google.protobuf.Timestamp]{@link external:"google.protobuf.Timestamp"} - * - * @property {string} snapshot - * The snapshot to seek to. The snapshot's topic must be the same as that of - * the provided subscription. - * Format is `projects/{project}/snapshots/{snap}`. - * - * @class - * @see [google.pubsub.v1.SeekRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var SeekRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * @class - * @see [google.pubsub.v1.SeekResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -var SeekResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js index e6422f41930..fa58b694eae 100644 --- a/handwritten/pubsub/src/v1/index.js +++ b/handwritten/pubsub/src/v1/index.js @@ -1,10 +1,10 @@ -// Copyright 2017, Google LLC All rights reserved. +// Copyright 2017 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 9b557f48087..4141014147b 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -1,10 +1,10 @@ -// Copyright 2017, Google LLC All rights reserved. +// Copyright 2017 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 905e790b218..72dec325a15 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -7,13 +7,13 @@ "UNAVAILABLE" ], "one_plus_delivery": [ + "ABORTED", "CANCELLED", - "UNKNOWN", "DEADLINE_EXCEEDED", - "RESOURCE_EXHAUSTED", - "ABORTED", "INTERNAL", - "UNAVAILABLE" + "RESOURCE_EXHAUSTED", + "UNAVAILABLE", + "UNKNOWN" ], "non_idempotent": [] }, @@ -33,7 +33,7 @@ "max_retry_delay_millis": 60000, "initial_rpc_timeout_millis": 12000, "rpc_timeout_multiplier": 1.0, - "max_rpc_timeout_millis": 12000, + "max_rpc_timeout_millis": 30000, "total_timeout_millis": 600000 } }, @@ -43,6 +43,11 @@ "retry_codes_name": "idempotent", "retry_params_name": "default" }, + "UpdateTopic": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, "Publish": { "timeout_millis": 60000, "retry_codes_name": "one_plus_delivery", diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index cf2bf23734d..6edc3014740 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -1,10 +1,10 @@ -// Copyright 2017, Google LLC All rights reserved. +// Copyright 2017 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -466,8 +466,15 @@ class SubscriberClient { * // optional auth parameters. * }); * - * var subscription = {}; - * var updateMask = {}; + * var ackDeadlineSeconds = 42; + * var subscription = { + * ackDeadlineSeconds: ackDeadlineSeconds, + * }; + * var pathsElement = 'ack_deadline_seconds'; + * var paths = [pathsElement]; + * var updateMask = { + * paths: paths, + * }; * var request = { * subscription: subscription, * updateMask: updateMask, @@ -1235,8 +1242,18 @@ class SubscriberClient { * // optional auth parameters. * }); * - * var snapshot = {}; - * var updateMask = {}; + * var seconds = 123456; + * var expireTime = { + * seconds: seconds, + * }; + * var snapshot = { + * expireTime: expireTime, + * }; + * var pathsElement = 'expire_time'; + * var paths = [pathsElement]; + * var updateMask = { + * paths: paths, + * }; * var request = { * snapshot: snapshot, * updateMask: updateMask, diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index a8e53152d79..fce4c33c2a1 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -10,8 +10,8 @@ "pull": [ "CANCELLED", "DEADLINE_EXCEEDED", - "RESOURCE_EXHAUSTED", "INTERNAL", + "RESOURCE_EXHAUSTED", "UNAVAILABLE" ] }, @@ -33,6 +33,15 @@ "rpc_timeout_multiplier": 1.0, "max_rpc_timeout_millis": 12000, "total_timeout_millis": 600000 + }, + "streaming_messaging": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 1.3, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 600000, + "rpc_timeout_multiplier": 1.0, + "max_rpc_timeout_millis": 600000, + "total_timeout_millis": 600000 } }, "methods": { @@ -77,9 +86,9 @@ "retry_params_name": "messaging" }, "StreamingPull": { - "timeout_millis": 900000, + "timeout_millis": 60000, "retry_codes_name": "pull", - "retry_params_name": "messaging" + "retry_params_name": "streaming_messaging" }, "ModifyPushConfig": { "timeout_millis": 60000, @@ -96,6 +105,11 @@ "retry_codes_name": "idempotent", "retry_params_name": "default" }, + "UpdateSnapshot": { + "timeout_millis": 60000, + "retry_codes_name": "idempotent", + "retry_params_name": "default" + }, "DeleteSnapshot": { "timeout_millis": 60000, "retry_codes_name": "idempotent", From f3cec31d76157760229697812e0768ebe72cfb3d Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 18 Jan 2018 08:17:23 -0500 Subject: [PATCH 0120/1115] =?UTF-8?q?Update=20mocha=20to=20the=20latest=20?= =?UTF-8?q?version=20=F0=9F=9A=80=20(#43)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 98724b25dbf..af5fec68736 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -85,7 +85,7 @@ "ink-docstrap": "^1.3.2", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", - "mocha": "^4.0.1", + "mocha": "^5.0.0", "nyc": "^11.3.0", "power-assert": "^1.4.4", "prettier": "^1.9.1", From 87110859761009a80c8ee1a361fd85b45222ad77 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 22 Jan 2018 13:13:38 -0500 Subject: [PATCH 0121/1115] docs: remove stale example (#47) --- handwritten/pubsub/src/index.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 98f33c099a2..ec006d81ea6 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -201,17 +201,6 @@ function PubSub(options) { * * pubsub.createSubscription(topic, name, callback); * - * @example Customize the subscription. - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = 'messageCenter'; - * const name = 'newMessages'; - * - * pubsub.createSubscription(topic, name, { - * ackDeadline: 90000 // 90 seconds - * }, callback); - * * @example If the callback is omitted, we'll return a Promise. * pubsub.createSubscription(topic, name).then(function(data) { * const subscription = data[0]; From 50d0932d1030341d0992b7482aa3478dff398736 Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 24 Jan 2018 16:29:24 -0500 Subject: [PATCH 0122/1115] Upgrade gRPC (#48) https://github.com/grpc/grpc-node/issues/130#issuecomment-358683747 --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index af5fec68736..73d88512169 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -67,7 +67,7 @@ "google-auto-auth": "^0.9.0", "google-gax": "^0.14.2", "google-proto-files": "^0.14.1", - "grpc": "~1.7.2", + "grpc": "^1.8.4", "is": "^3.0.1", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", From b4090d1911bf84babbe8fb076f8de251368d9f74 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 1 Feb 2018 21:29:50 -0500 Subject: [PATCH 0123/1115] =?UTF-8?q?Update=20google-proto-files=20to=20th?= =?UTF-8?q?e=20latest=20version=20=F0=9F=9A=80=20(#55)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 73d88512169..c0852817043 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -66,7 +66,7 @@ "extend": "^3.0.1", "google-auto-auth": "^0.9.0", "google-gax": "^0.14.2", - "google-proto-files": "^0.14.1", + "google-proto-files": "^0.15.0", "grpc": "^1.8.4", "is": "^3.0.1", "lodash.merge": "^4.6.0", From 26b7aa314c9b87898cb19f6f421ffe433971e17c Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 2 Feb 2018 14:41:51 -0500 Subject: [PATCH 0124/1115] Use autoCreate in flow control sample. (#56) --- handwritten/pubsub/src/subscription.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 67faf05453d..cd23beb4a1e 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -664,7 +664,7 @@ Subscription.prototype.flushQueues_ = function() { * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the - * subscription does not already exist. + * subscription if it does not already exist. * @param {GetSubscriptionCallback} [callback] Callback function. * @returns {Promise} * From 947f1651cf2f0d323cd8596791a12eb537018c74 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 5 Feb 2018 08:58:46 -0500 Subject: [PATCH 0125/1115] =?UTF-8?q?Update=20eslint-plugin-node=20to=20th?= =?UTF-8?q?e=20latest=20version=20=F0=9F=9A=80=20(#57)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c0852817043..6dab014258f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -80,7 +80,7 @@ "codecov": "^3.0.0", "eslint": "^4.11.0", "eslint-config-prettier": "^2.8.0", - "eslint-plugin-node": "^5.2.1", + "eslint-plugin-node": "^6.0.0", "eslint-plugin-prettier": "^2.3.1", "ink-docstrap": "^1.3.2", "intelli-espower-loader": "^1.0.1", From 65755b55027fae2c83f1a61ede5f7f9300fcd79a Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 7 Feb 2018 10:18:54 -0500 Subject: [PATCH 0126/1115] =?UTF-8?q?Update=20@google-cloud/common=20to=20?= =?UTF-8?q?the=20latest=20version=20=F0=9F=9A=80=20(#58)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6dab014258f..56681702024 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -60,7 +60,7 @@ "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" }, "dependencies": { - "@google-cloud/common": "^0.15.1", + "@google-cloud/common": "^0.16.0", "arrify": "^1.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", From 88c1f84f59abed3230a4accb5200982e40a2fc9b Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 9 Feb 2018 14:15:41 -0500 Subject: [PATCH 0127/1115] docs: Subscription names are required. (#61) --- handwritten/pubsub/src/index.js | 2 +- handwritten/pubsub/src/subscription.js | 2 +- handwritten/pubsub/src/topic.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index ec006d81ea6..22616ff36ca 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -184,7 +184,7 @@ function PubSub(options) { * * @param {Topic|string} topic The Topic to create a * subscription to. - * @param {string} [name] The name of the subscription. + * @param {string} name The name of the subscription. * @param {CreateSubscriptionRequest} [options] See a * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). * @param {CreateSubscriptionCallback} [callback] Callback function. diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index cd23beb4a1e..2de8e59e983 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -52,7 +52,7 @@ var Snapshot = require('./snapshot.js'); * @class * * @param {PubSub} pubsub PubSub object. - * @param {string} [name] The name of the subscription. + * @param {string} name The name of the subscription. * @param {object} [options] See a * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) * @param {object} [options.flowControl] Flow control configurations for diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 5312018c0ac..aaa6657afcb 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -159,7 +159,7 @@ Topic.prototype.create = function(gaxOpts, callback) { * * @throws {Error} If subscription name is omitted. * - * @param {string} [name] The name of the subscription. + * @param {string} name The name of the subscription. * @param {CreateSubscriptionRequest} [options] See a * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). * @param {CreateSubscriptionCallback} [callback] Callback function. From d1826f3a9639490350a20ad5468ac42e7d1eb2e3 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Fri, 9 Feb 2018 16:18:03 -0600 Subject: [PATCH 0128/1115] allow ack and nack to be destructured (#37) --- handwritten/pubsub/src/connection-pool.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 5abcddc8434..61bdb9beddc 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -288,7 +288,7 @@ ConnectionPool.prototype.createMessage = function(connectionId, resp) { var milliseconds = parseInt(pt.nanos, 10) / 1e6; var originalDataLength = resp.message.data.length; - return { + var message = { connectionId: connectionId, ackId: resp.ackId, id: resp.message.messageId, @@ -300,13 +300,14 @@ ConnectionPool.prototype.createMessage = function(connectionId, resp) { get length() { return originalDataLength; }, - ack: function() { - self.subscription.ack_(this); - }, - nack: function() { - self.subscription.nack_(this); - }, }; + message.ack = function() { + self.subscription.ack_(message); + }; + message.nack = function() { + self.subscription.nack_(message); + }; + return message; }; /*! From b395afeb2aa461dd7aeb4c9a4a26de10b84ce0e0 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 13 Feb 2018 18:24:19 -0500 Subject: [PATCH 0129/1115] 0.16.3 (#69) * 0.16.3 --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 56681702024..598ad9e7a59 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.16.2", + "version": "0.16.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { @@ -60,7 +60,7 @@ "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" }, "dependencies": { - "@google-cloud/common": "^0.16.0", + "@google-cloud/common": "^0.16.1", "arrify": "^1.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", From baa66b9ac836c4de4b9730a06cb5d05d186ab84d Mon Sep 17 00:00:00 2001 From: Christoph Tavan Date: Fri, 16 Feb 2018 18:03:23 +0100 Subject: [PATCH 0130/1115] Send acknowledge/modifyAckDeadline requests in chunks (#65) --- handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/subscription.js | 85 ++++++++------ handwritten/pubsub/test/subscription.js | 147 +++++++++++++++++++++++- 3 files changed, 198 insertions(+), 35 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 598ad9e7a59..835e6fedb57 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -69,6 +69,7 @@ "google-proto-files": "^0.15.0", "grpc": "^1.8.4", "is": "^3.0.1", + "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", "protobufjs": "^6.8.1", diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 2de8e59e983..360e359a413 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -17,6 +17,7 @@ 'use strict'; var arrify = require('arrify'); +var chunk = require('lodash.chunk'); var common = require('@google-cloud/common'); var events = require('events'); var extend = require('extend'); @@ -30,6 +31,15 @@ var Histogram = require('./histogram.js'); var IAM = require('./iam.js'); var Snapshot = require('./snapshot.js'); +/** + * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline + * requests. There is an API limit of 524288 bytes (512KiB) per acknowledge/modifyAckDeadline + * request. ackIds have a maximum size of 164 bytes, so 524288/164 ~= 3197. Accounting for some + * overhead, a maximum of 3000 ackIds per request should be safe. + * @private + */ +var MAX_ACK_IDS_PER_REQUEST = 3000; + /** * A Subscription object will give you access to your Cloud Pub/Sub * subscription. @@ -294,33 +304,41 @@ Subscription.prototype.ack_ = function(message) { */ Subscription.prototype.acknowledge_ = function(ackIds, connId) { var self = this; - var promise; ackIds = arrify(ackIds); - if (!this.isConnected_()) { - promise = common.util.promisify(this.request).call(this, { - client: 'SubscriberClient', - method: 'acknowledge', - reqOpts: { - subscription: this.name, - ackIds, - }, - }); - } else { - promise = new Promise(function(resolve, reject) { + var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( + ackIdChunk + ) { + if (!self.isConnected_()) { + return common.util.promisify(self.request).call(self, { + client: 'SubscriberClient', + method: 'acknowledge', + reqOpts: { + subscription: self.name, + ackIds: ackIdChunk, + }, + }); + } + + return new Promise(function(resolve, reject) { self.connectionPool.acquire(connId, function(err, connection) { if (err) { reject(err); return; } - connection.write({ackIds}, resolve); + connection.write( + { + ackIds: ackIdChunk, + }, + resolve + ); }); }); - } + }); - return promise.catch(function(err) { + return Promise.all(promises).catch(function(err) { self.emit('error', err); }); }; @@ -874,22 +892,25 @@ Subscription.prototype.listenForEvents_ = function() { */ Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { var self = this; - var promise; ackIds = arrify(ackIds); - if (!this.isConnected_()) { - promise = common.util.promisify(this.request).call(this, { - client: 'SubscriberClient', - method: 'modifyAckDeadline', - reqOpts: { - subscription: self.name, - ackDeadlineSeconds: deadline, - ackIds, - }, - }); - } else { - promise = new Promise(function(resolve, reject) { + var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( + ackIdChunk + ) { + if (!self.isConnected_()) { + return common.util.promisify(self.request).call(self, { + client: 'SubscriberClient', + method: 'modifyAckDeadline', + reqOpts: { + subscription: self.name, + ackDeadlineSeconds: deadline, + ackIds: ackIdChunk, + }, + }); + } + + return new Promise(function(resolve, reject) { self.connectionPool.acquire(connId, function(err, connection) { if (err) { reject(err); @@ -898,16 +919,16 @@ Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { connection.write( { - modifyDeadlineAckIds: ackIds, - modifyDeadlineSeconds: Array(ackIds.length).fill(deadline), + modifyDeadlineAckIds: ackIdChunk, + modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), }, resolve ); }); }); - } + }); - return promise.catch(function(err) { + return Promise.all(promises).catch(function(err) { self.emit('error', err); }); }; diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index f45e0246cd2..9c2e1e94fd3 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -348,6 +348,14 @@ describe('Subscription', function() { describe('acknowledge_', function() { var fakeAckIds = ['a', 'b', 'c']; + var batchSize = 3000; + var tooManyFakeAckIds = Array(batchSize * 2.5) + .fill('a') + .map(function(x, i) { + return x + i; + }); + var expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); + describe('without streaming connection', function() { beforeEach(function() { subscription.isConnected_ = function() { @@ -362,7 +370,7 @@ describe('Subscription', function() { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'acknowledge'); assert.strictEqual(config.reqOpts.subscription, subscription.name); - assert.strictEqual(config.reqOpts.ackIds, fakeAckIds); + assert.deepEqual(config.reqOpts.ackIds, fakeAckIds); setImmediate(done); @@ -379,6 +387,36 @@ describe('Subscription', function() { subscription.acknowledge_(fakeAckIds); }); + it('should batch requests if there are too many ackIds', function(done) { + var receivedCalls = 0; + + var fakePromisified = { + call: function(context, config) { + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + + assert.deepEqual(config.reqOpts.ackIds, expectedAckIds); + + receivedCalls += 1; + if (receivedCalls === expectedCalls) { + setImmediate(done); + } + + return Promise.resolve(); + }, + }; + + fakeUtil.promisify = function() { + return fakePromisified; + }; + + subscription.on('error', done); + subscription.acknowledge_(tooManyFakeAckIds); + }); + it('should emit any request errors', function(done) { var fakeError = new Error('err'); var fakePromisified = { @@ -428,6 +466,34 @@ describe('Subscription', function() { subscription.acknowledge_(fakeAckIds, fakeConnectionId); }); + it('should batch requests if there are too many ackIds', function(done) { + var receivedCalls = 0; + + var fakeConnectionId = 'abc'; + var fakeConnection = { + write: function(data) { + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + + assert.deepEqual(data, {ackIds: expectedAckIds}); + + receivedCalls += 1; + if (receivedCalls === expectedCalls) { + done(); + } + }, + }; + + pool.acquire = function(connectionId, callback) { + callback(null, fakeConnection); + }; + + subscription.acknowledge_(tooManyFakeAckIds, fakeConnectionId); + }); + it('should emit an error when unable to get a conn', function(done) { var error = new Error('err'); @@ -1287,6 +1353,14 @@ describe('Subscription', function() { var fakeAckIds = ['a', 'b', 'c']; var fakeDeadline = 123; + var batchSize = 3000; + var tooManyFakeAckIds = Array(batchSize * 2.5) + .fill('a') + .map(function(x, i) { + return x + i; + }); + var expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); + describe('without streaming connection', function() { beforeEach(function() { subscription.isConnected_ = function() { @@ -1302,7 +1376,7 @@ describe('Subscription', function() { assert.strictEqual(config.method, 'modifyAckDeadline'); assert.strictEqual(config.reqOpts.subscription, subscription.name); assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); - assert.strictEqual(config.reqOpts.ackIds, fakeAckIds); + assert.deepEqual(config.reqOpts.ackIds, fakeAckIds); setImmediate(done); @@ -1319,6 +1393,37 @@ describe('Subscription', function() { subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline); }); + it('should batch requests if there are too many ackIds', function(done) { + var receivedCalls = 0; + + var fakePromisified = { + call: function(context, config) { + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + + assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); + assert.deepEqual(config.reqOpts.ackIds, expectedAckIds); + + receivedCalls += 1; + if (receivedCalls === expectedCalls) { + setImmediate(done); + } + + return Promise.resolve(); + }, + }; + + fakeUtil.promisify = function() { + return fakePromisified; + }; + + subscription.on('error', done); + subscription.modifyAckDeadline_(tooManyFakeAckIds, fakeDeadline); + }); + it('should emit any request errors', function(done) { var fakeError = new Error('err'); var fakePromisified = { @@ -1356,7 +1461,7 @@ describe('Subscription', function() { var fakeConnId = 'abc'; var fakeConnection = { write: function(data) { - assert.strictEqual(data.modifyDeadlineAckIds, fakeAckIds); + assert.deepEqual(data.modifyDeadlineAckIds, fakeAckIds); assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); done(); }, @@ -1370,6 +1475,42 @@ describe('Subscription', function() { subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); }); + it('should batch requests if there are too many ackIds', function(done) { + var receivedCalls = 0; + + var fakeConnId = 'abc'; + var fakeConnection = { + write: function(data) { + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + var expectedDeadlines = Array(expectedAckIds.length).fill( + fakeDeadline + ); + + assert.deepEqual(data.modifyDeadlineAckIds, expectedAckIds); + assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); + + receivedCalls += 1; + if (receivedCalls === expectedCalls) { + done(); + } + }, + }; + + pool.acquire = function(connectionId, callback) { + callback(null, fakeConnection); + }; + + subscription.modifyAckDeadline_( + tooManyFakeAckIds, + fakeDeadline, + fakeConnId + ); + }); + it('should emit an error when unable to get a conn', function(done) { var error = new Error('err'); var fakeConnId = 'abc'; From 953d0d141fbddb182ea42c8721ab05aa633053a6 Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 16 Feb 2018 14:00:41 -0500 Subject: [PATCH 0131/1115] Pull gRPC from google-gax (#71) --- handwritten/pubsub/package.json | 1 - handwritten/pubsub/src/index.js | 2 +- handwritten/pubsub/test/index.js | 21 ++++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 835e6fedb57..6ee546c86dd 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -67,7 +67,6 @@ "google-auto-auth": "^0.9.0", "google-gax": "^0.14.2", "google-proto-files": "^0.15.0", - "grpc": "^1.8.4", "is": "^3.0.1", "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 22616ff36ca..cc00d3382b9 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -19,7 +19,7 @@ var common = require('@google-cloud/common'); var extend = require('extend'); var googleAuth = require('google-auto-auth'); -var grpc = require('grpc'); +var grpc = require('google-gax').grpc().grpc; var is = require('is'); var PKG = require('../package.json'); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 02c47bf5374..f5a09feeb0d 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -19,13 +19,19 @@ var arrify = require('arrify'); var assert = require('assert'); var extend = require('extend'); -var grpc = require('grpc'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; var PKG = require('../package.json'); -var fakeGrpc = extend({}, grpc); +var fakeGrpc = {}; +var fakeGoogleGax = { + grpc: function() { + return { + grpc: fakeGrpc, + }; + }, +}; var SubscriptionCached = require('../src/subscription.js'); var SubscriptionOverride; @@ -124,7 +130,7 @@ describe('PubSub', function() { util: fakeUtil, }, 'google-auto-auth': fakeGoogleAutoAuth, - grpc: fakeGrpc, + 'google-gax': fakeGoogleGax, './snapshot.js': FakeSnapshot, './subscription.js': Subscription, './topic.js': FakeTopic, @@ -143,6 +149,9 @@ describe('PubSub', function() { return options; }; + fakeGrpc.credentials = { + createInsecure: util.noop, + }; v1ClientOverrides = {}; googleAutoAuthOverride = null; SubscriptionOverride = null; @@ -639,8 +648,10 @@ describe('PubSub', function() { var testingUrl = 'localhost:8085'; var fakeCreds = {}; - fakeGrpc.credentials.createInsecure = function() { - return fakeCreds; + fakeGrpc.credentials = { + createInsecure: function() { + return fakeCreds; + }, }; setHost(defaultBaseUrl_); From cdefb9b69a562fb56d114f0b93aa05c4be83a2bb Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 16 Feb 2018 14:11:37 -0500 Subject: [PATCH 0132/1115] 0.16.4 (#72) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6ee546c86dd..f5386e390b1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.16.3", + "version": "0.16.4", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From a08a196812aac4d2dff3250aa6d2729ee189f2ee Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 20 Feb 2018 11:58:35 -0500 Subject: [PATCH 0133/1115] fix: ConnectionPool#createConnection: Use correct location of projectId. (#74) --- handwritten/pubsub/src/connection-pool.js | 3 +-- handwritten/pubsub/test/connection-pool.js | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 61bdb9beddc..d92de22ebe0 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -63,7 +63,6 @@ var RETRY_CODES = [ function ConnectionPool(subscription) { this.subscription = subscription; this.pubsub = subscription.pubsub; - this.projectId = subscription.projectId; this.connections = new Map(); @@ -208,7 +207,7 @@ ConnectionPool.prototype.createConnection = function() { .write({ subscription: common.util.replaceProjectIdToken( self.subscription.name, - self.projectId + self.pubsub.projectId ), streamAckDeadlineSeconds: self.settings.ackDeadline / 1000, }); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index 6f451ff914e..c95fd3f013a 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -67,9 +67,7 @@ describe('ConnectionPool', function() { var PROJECT_ID = 'grapce-spacheship-123'; var PUBSUB = { - projectId: PROJECT_ID, auth: { - projectId: PROJECT_ID, getAuthClient: fakeUtil.noop, }, options: FAKE_PUBSUB_OPTIONS, @@ -77,7 +75,6 @@ describe('ConnectionPool', function() { var SUB_NAME = 'test-subscription'; var SUBSCRIPTION = { - projectId: PROJECT_ID, name: SUB_NAME, pubsub: PUBSUB, request: fakeUtil.noop, @@ -136,6 +133,7 @@ describe('ConnectionPool', function() { var pool = new ConnectionPool(SUBSCRIPTION); assert.strictEqual(pool.subscription, SUBSCRIPTION); + assert.strictEqual(pool.pubsub, SUBSCRIPTION.pubsub); assert(pool.connections instanceof Map); assert.strictEqual(pool.isPaused, false); assert.strictEqual(pool.isOpen, false); @@ -365,6 +363,10 @@ describe('ConnectionPool', function() { fakeClient.waitForReady = fakeUtil.noop; pool.getClient = function(callback) { + pool.pubsub = { + projectId: PROJECT_ID, + }; + callback(null, fakeClient); }; }); From 2eb7f70568d01ec29ba190f554624aed71fd433e Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 20 Feb 2018 13:30:39 -0500 Subject: [PATCH 0134/1115] 0.16.5 (#75) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f5386e390b1..38849a75c56 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.16.4", + "version": "0.16.5", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 0752de75f74a03d38c4f0165c1620d69df462f5d Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 22 Feb 2018 16:10:26 -0800 Subject: [PATCH 0135/1115] chore: removing node7 job from CircleCI (#78) * chore: removing node7 job from CircleCI * chore: rename reference --- handwritten/pubsub/.circleci/config.yml | 63 +++++++++---------------- 1 file changed, 21 insertions(+), 42 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index fec3d085d0a..4500d7ff4b7 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -1,7 +1,5 @@ ---- -# "Include" for unit tests definition. -unit_tests: &unit_tests - steps: +unit_tests: + steps: &unit_tests - checkout - run: name: Install modules and dependencies. @@ -13,8 +11,7 @@ unit_tests: &unit_tests name: Submit coverage data to codecov. command: node_modules/.bin/codecov when: always - -version: 2.0 +version: 2 workflows: version: 2 tests: @@ -27,10 +24,6 @@ workflows: filters: tags: only: /.*/ - - node7: - filters: - tags: - only: /.*/ - node8: filters: tags: @@ -43,7 +36,6 @@ workflows: requires: - node4 - node6 - - node7 - node8 - node9 filters: @@ -53,7 +45,6 @@ workflows: requires: - node4 - node6 - - node7 - node8 - node9 filters: @@ -67,7 +58,7 @@ workflows: branches: only: master tags: - only: /^v[\d.]+$/ + only: '/^v[\d.]+$/' - sample_tests: requires: - lint @@ -76,7 +67,7 @@ workflows: branches: only: master tags: - only: /^v[\d.]+$/ + only: '/^v[\d.]+$/' - publish_npm: requires: - system_tests @@ -85,12 +76,11 @@ workflows: branches: ignore: /.*/ tags: - only: /^v[\d.]+$/ - + only: '/^v[\d.]+$/' jobs: node4: docker: - - image: node:4 + - image: 'node:4' user: node steps: - checkout @@ -106,28 +96,22 @@ jobs: when: always node6: docker: - - image: node:6 - user: node - <<: *unit_tests - node7: - docker: - - image: node:7 + - image: 'node:6' user: node - <<: *unit_tests + steps: *unit_tests node8: docker: - - image: node:8 + - image: 'node:8' user: node - <<: *unit_tests + steps: *unit_tests node9: docker: - - image: node:9 + - image: 'node:9' user: node - <<: *unit_tests - + steps: *unit_tests lint: docker: - - image: node:8 + - image: 'node:8' user: node steps: - checkout @@ -153,10 +137,9 @@ jobs: command: npm run lint environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - docs: docker: - - image: node:8 + - image: 'node:8' user: node steps: - checkout @@ -166,10 +149,9 @@ jobs: - run: name: Build documentation. command: npm run docs - sample_tests: docker: - - image: node:8 + - image: 'node:8' user: node steps: - checkout @@ -208,10 +190,9 @@ jobs: command: rm .circleci/key.json when: always working_directory: /home/node/pubsub-samples - system_tests: docker: - - image: node:8 + - image: 'node:8' user: node steps: - checkout @@ -233,17 +214,15 @@ jobs: name: Remove unencrypted key. command: rm .circleci/key.json when: always - publish_npm: docker: - - image: node:8 + - image: 'node:8' user: node steps: - checkout - run: name: Set NPM authentication. - command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc + command: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc' - run: - name: Publish the module to npm. - command: npm publish - + name: Publish the module to npm. + command: npm publish From 93f18971c15bb0319b11fc20daf6fe93677f87cc Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Wed, 28 Feb 2018 22:40:41 +0300 Subject: [PATCH 0136/1115] Fix ackDeadline configuration for subscription (#82) ackDeadline will not affect new subscription https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create --- handwritten/pubsub/src/topic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index aaa6657afcb..3ac49bc04c8 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -177,7 +177,7 @@ Topic.prototype.create = function(gaxOpts, callback) { * * // With options. * topic.createSubscription('newMessages', { - * ackDeadline: 90000 // 90 seconds + * ackDeadlineSeconds: 90 * }, callback); * * //- From 7d094ba667dc5f9981f6a0e53fd5ffc117004995 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 5 Mar 2018 16:35:47 -0500 Subject: [PATCH 0137/1115] =?UTF-8?q?Update=20google-gax=20to=20the=20late?= =?UTF-8?q?st=20version=20=F0=9F=9A=80=20(#87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 38849a75c56..8fe0b646e50 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -65,7 +65,7 @@ "async-each": "^1.0.1", "extend": "^3.0.1", "google-auto-auth": "^0.9.0", - "google-gax": "^0.14.2", + "google-gax": "^0.15.0", "google-proto-files": "^0.15.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", From 0256afffedd35132ff9db02880cccf6fca301b90 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 8 Mar 2018 11:18:50 -0500 Subject: [PATCH 0138/1115] Remove timeout from unit tests. (#91) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8fe0b646e50..955c3217807 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -49,7 +49,7 @@ ], "scripts": { "system-test": "repo-tools test run --cmd mocha -- system-test/*.js --no-timeouts", - "cover": "nyc --reporter=lcov mocha --require intelli-espower-loader test/*.js && nyc report", + "cover": "nyc --reporter=lcov mocha --require intelli-espower-loader test/*.js --timeout 0 && nyc report", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", "test-no-cover": "repo-tools test run --cmd mocha -- test/*.js --no-timeouts", "test": "repo-tools test run --cmd npm -- run cover", From 1676df12705975e4e447d78d07da2bf413fd1d50 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 8 Mar 2018 11:34:52 -0500 Subject: [PATCH 0139/1115] =?UTF-8?q?Update=20proxyquire=20to=20the=20late?= =?UTF-8?q?st=20version=20=F0=9F=9A=80=20(#84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 955c3217807..75567048cf9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -89,6 +89,6 @@ "nyc": "^11.3.0", "power-assert": "^1.4.4", "prettier": "^1.9.1", - "proxyquire": "^1.7.10" + "proxyquire": "^2.0.0" } } From 2a01c3b1a3bab94ca5a336dbbef3456a19758d95 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 14 Mar 2018 15:06:34 -0400 Subject: [PATCH 0140/1115] lower default publisher maxMillseconds value (#97) --- handwritten/pubsub/src/publisher.js | 4 ++-- handwritten/pubsub/test/publisher.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index d1d8c22f3e2..9fea64cde48 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -37,7 +37,7 @@ var is = require('is'); * @param {number} [options.batching.maxMessages] The maximum number of messages * to buffer before sending a payload. * @param {number} [options.batching.maxMilliseconds] The maximum duration to - * wait before sending a payload. + * wait before sending a payload. Defaults to 100 milliseconds. * * @example * const PubSub = require('@google-cloud/pubsub'); @@ -57,7 +57,7 @@ function Publisher(topic, options) { batching: { maxBytes: Math.pow(1024, 2) * 5, maxMessages: 1000, - maxMilliseconds: 1000, + maxMilliseconds: 100, }, }, options diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index f4e1a9abd27..1b55718bdf6 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -83,7 +83,7 @@ describe('Publisher', function() { assert.deepEqual(publisher.settings.batching, { maxBytes: Math.pow(1024, 2) * 5, maxMessages: 1000, - maxMilliseconds: 1000, + maxMilliseconds: 100, }); }); From 09293ed9462f34c51aaa29ca711610662510d6cb Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Fri, 16 Mar 2018 12:45:18 -0700 Subject: [PATCH 0141/1115] Upgrade repo-tools and regenerate scaffolding. (#98) --- handwritten/pubsub/.github/ISSUE_TEMPLATE.md | 5 +- handwritten/pubsub/.gitignore | 1 - handwritten/pubsub/CONTRIBUTORS | 3 + handwritten/pubsub/README.md | 2 +- handwritten/pubsub/package-lock.json | 11311 +++++++++++++++++ handwritten/pubsub/package.json | 5 +- 6 files changed, 11321 insertions(+), 6 deletions(-) create mode 100644 handwritten/pubsub/package-lock.json diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE.md index 303c0b041d9..34839032245 100644 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE.md +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE.md @@ -4,9 +4,8 @@ Please run down the following list and make sure you've tried the usual "quick fixes": - Search the issues already opened: https://github.com/googleapis/nodejs-pubsub/issues + - Search the issues on our "catch-all" repository: https://github.com/GoogleCloudPlatform/google-cloud-node - Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js - - Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting - - Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq If you are still having issues, please be sure to include as much information as possible: @@ -16,7 +15,7 @@ possible: - OS: - Node.js version: - npm version: - - @google-cloud/pubsub version: + - `@google-cloud/pubsub` version: #### Steps to reproduce diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 6b80718f261..b7d407606fb 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -7,4 +7,3 @@ out/ system-test/secrets.js system-test/*key.json *.lock -*-lock.js* diff --git a/handwritten/pubsub/CONTRIBUTORS b/handwritten/pubsub/CONTRIBUTORS index 1fc9a87e157..5e93dd89e6d 100644 --- a/handwritten/pubsub/CONTRIBUTORS +++ b/handwritten/pubsub/CONTRIBUTORS @@ -6,6 +6,9 @@ Ace Nassri Alexander Fenster Ali Ijaz Sheikh +Antono Vasiljev +Chet Husk +Christoph Tavan Dave Gramlich David Fox Dennis diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 77b30ba1f1d..efcde60bc96 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -127,4 +127,4 @@ See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) [client-docs]: https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub [product-docs]: https://cloud.google.com/pubsub/docs -[shell_img]: http://gstatic.com/cloudssh/images/open-btn.png +[shell_img]: //gstatic.com/cloudssh/images/open-btn.png diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json new file mode 100644 index 00000000000..bed2bb4da4c --- /dev/null +++ b/handwritten/pubsub/package-lock.json @@ -0,0 +1,11311 @@ +{ + "name": "@google-cloud/pubsub", + "version": "0.16.5", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@ava/babel-plugin-throws-helper": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz", + "integrity": "sha1-L8H+PCEacQcaTsp7j3r1hCzRrnw=", + "dev": true + }, + "@ava/babel-preset-stage-4": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.1.0.tgz", + "integrity": "sha512-oWqTnIGXW3k72UFidXzW0ONlO7hnO9x02S/QReJ7NBGeiBH9cUHY9+EfV6C8PXC6YJH++WrliEq03wMSJGNZFg==", + "dev": true, + "requires": { + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.0", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "package-hash": "1.2.0" + }, + "dependencies": { + "md5-hex": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", + "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "package-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-1.2.0.tgz", + "integrity": "sha1-AD5WzVe3NqbtYRTMK4FUJnJ3DkQ=", + "dev": true, + "requires": { + "md5-hex": "1.3.0" + } + } + } + }, + "@ava/babel-preset-transform-test-files": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@ava/babel-preset-transform-test-files/-/babel-preset-transform-test-files-3.0.0.tgz", + "integrity": "sha1-ze0RlqjY2TgaUJJAq5LpGl7Aafc=", + "dev": true, + "requires": { + "@ava/babel-plugin-throws-helper": "2.0.0", + "babel-plugin-espower": "2.3.2" + } + }, + "@ava/write-file-atomic": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ava/write-file-atomic/-/write-file-atomic-2.2.0.tgz", + "integrity": "sha512-BTNB3nGbEfJT+69wuqXFr/bQH7Vr7ihx2xGOMNqPgDGhwspoZhiWumDDZNjBy7AScmqS5CELIOGtPVXESyrnDA==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" + } + }, + "@concordance/react": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@concordance/react/-/react-1.0.0.tgz", + "integrity": "sha512-htrsRaQX8Iixlsek8zQU7tE8wcsTQJ5UhZkSPEA8slCDAisKpC/2VgU/ucPn32M5/LjGGXRaUEKvEw1Wiuu4zQ==", + "dev": true, + "requires": { + "arrify": "1.0.1" + } + }, + "@google-cloud/common": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.16.2.tgz", + "integrity": "sha512-GrkaFoj0/oO36pNs4yLmaYhTujuA3i21FdQik99Fd/APix1uhf01VlpJY4lAteTDFLRNkRx6ydEh7OVvmeUHng==", + "requires": { + "array-uniq": "1.0.3", + "arrify": "1.0.1", + "concat-stream": "1.6.0", + "create-error-class": "3.0.2", + "duplexify": "3.5.3", + "ent": "2.2.0", + "extend": "3.0.1", + "google-auto-auth": "0.9.0", + "is": "3.2.1", + "log-driver": "1.2.7", + "methmeth": "1.1.0", + "modelo": "4.2.3", + "request": "2.83.0", + "retry-request": "3.3.1", + "split-array-stream": "1.0.3", + "stream-events": "1.0.2", + "string-format-obj": "1.1.1", + "through2": "2.0.3" + }, + "dependencies": { + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" + } + } + }, + "@google-cloud/nodejs-repo-tools": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.2.3.tgz", + "integrity": "sha512-O6OVc8lKiLL8Qtoc1lVAynf5pJT550fHZcW33a7oQ7TMNkrTHPgeoYw4esi4KSbDRn8gV+cfefnkgqxXmr+KzA==", + "dev": true, + "requires": { + "ava": "0.25.0", + "colors": "1.1.2", + "fs-extra": "5.0.0", + "got": "8.2.0", + "handlebars": "4.0.11", + "lodash": "4.17.5", + "nyc": "11.4.1", + "proxyquire": "1.8.0", + "sinon": "4.3.0", + "string": "3.3.3", + "supertest": "3.0.0", + "yargs": "11.0.0", + "yargs-parser": "9.0.2" + }, + "dependencies": { + "ansi-escapes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", + "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "dev": true + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ava": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", + "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", + "dev": true, + "requires": { + "@ava/babel-preset-stage-4": "1.1.0", + "@ava/babel-preset-transform-test-files": "3.0.0", + "@ava/write-file-atomic": "2.2.0", + "@concordance/react": "1.0.0", + "@ladjs/time-require": "0.1.4", + "ansi-escapes": "3.0.0", + "ansi-styles": "3.2.0", + "arr-flatten": "1.1.0", + "array-union": "1.0.2", + "array-uniq": "1.0.3", + "arrify": "1.0.1", + "auto-bind": "1.1.0", + "ava-init": "0.2.1", + "babel-core": "6.26.0", + "babel-generator": "6.26.0", + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "bluebird": "3.5.1", + "caching-transform": "1.0.1", + "chalk": "2.3.0", + "chokidar": "1.7.0", + "clean-stack": "1.3.0", + "clean-yaml-object": "0.1.0", + "cli-cursor": "2.1.0", + "cli-spinners": "1.1.0", + "cli-truncate": "1.1.0", + "co-with-promise": "4.6.0", + "code-excerpt": "2.1.1", + "common-path-prefix": "1.0.0", + "concordance": "3.0.0", + "convert-source-map": "1.5.1", + "core-assert": "0.2.1", + "currently-unhandled": "0.4.1", + "debug": "3.1.0", + "dot-prop": "4.2.0", + "empower-core": "0.6.2", + "equal-length": "1.0.1", + "figures": "2.0.0", + "find-cache-dir": "1.0.0", + "fn-name": "2.0.1", + "get-port": "3.2.0", + "globby": "6.1.0", + "has-flag": "2.0.0", + "hullabaloo-config-manager": "1.1.1", + "ignore-by-default": "1.0.1", + "import-local": "0.1.1", + "indent-string": "3.2.0", + "is-ci": "1.1.0", + "is-generator-fn": "1.0.0", + "is-obj": "1.0.1", + "is-observable": "1.1.0", + "is-promise": "2.1.0", + "last-line-stream": "1.0.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.debounce": "4.0.8", + "lodash.difference": "4.5.0", + "lodash.flatten": "4.4.0", + "loud-rejection": "1.6.0", + "make-dir": "1.1.0", + "matcher": "1.0.0", + "md5-hex": "2.0.0", + "meow": "3.7.0", + "ms": "2.1.1", + "multimatch": "2.1.0", + "observable-to-promise": "0.5.0", + "option-chain": "1.0.0", + "package-hash": "2.0.0", + "pkg-conf": "2.1.0", + "plur": "2.1.2", + "pretty-ms": "3.1.0", + "require-precompiled": "0.1.0", + "resolve-cwd": "2.0.0", + "safe-buffer": "5.1.1", + "semver": "5.4.1", + "slash": "1.0.0", + "source-map-support": "0.5.4", + "stack-utils": "1.0.1", + "strip-ansi": "4.0.0", + "strip-bom-buf": "1.0.0", + "supertap": "1.0.0", + "supports-color": "5.3.0", + "trim-off-newlines": "1.0.1", + "unique-temp-dir": "1.0.0", + "update-notifier": "2.3.0" + } + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "cliui": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", + "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + } + }, + "code-excerpt": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", + "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", + "dev": true, + "requires": { + "convert-to-spaces": "1.0.2" + } + }, + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "got": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/got/-/got-8.2.0.tgz", + "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", + "dev": true, + "requires": { + "@sindresorhus/is": "0.7.0", + "cacheable-request": "2.1.4", + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "into-stream": "3.1.0", + "is-retry-allowed": "1.1.0", + "isurl": "1.0.0", + "lowercase-keys": "1.0.0", + "mimic-response": "1.0.0", + "p-cancelable": "0.3.0", + "p-timeout": "2.0.1", + "pify": "3.0.0", + "safe-buffer": "5.1.1", + "timed-out": "4.0.1", + "url-parse-lax": "3.0.0", + "url-to-options": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "is-observable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", + "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", + "dev": true, + "requires": { + "symbol-observable": "1.2.0" + } + }, + "lodash": { + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "p-timeout": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", + "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "dev": true, + "requires": { + "p-finally": "1.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + }, + "proxyquire": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz", + "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", + "dev": true, + "requires": { + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.1.7" + } + }, + "sinon": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.3.0.tgz", + "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", + "dev": true, + "requires": { + "@sinonjs/formatio": "2.0.0", + "diff": "3.4.0", + "lodash.get": "4.4.2", + "lolex": "2.3.1", + "nise": "1.2.0", + "supports-color": "5.3.0", + "type-detect": "4.0.5" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", + "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", + "dev": true, + "requires": { + "source-map": "0.6.1" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", + "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + } + } + }, + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "dev": true + }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "dev": true, + "requires": { + "prepend-http": "2.0.0" + } + }, + "yargs": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "dev": true, + "requires": { + "cliui": "4.0.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } + } + } + }, + "@ladjs/time-require": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", + "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", + "dev": true, + "requires": { + "chalk": "0.4.0", + "date-time": "0.1.1", + "pretty-ms": "0.2.2", + "text-table": "0.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", + "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", + "dev": true + }, + "chalk": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", + "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", + "dev": true, + "requires": { + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" + } + }, + "date-time": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", + "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", + "dev": true + }, + "parse-ms": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz", + "integrity": "sha1-3T+iXtbC78e93hKtm0bBY6opIk4=", + "dev": true + }, + "pretty-ms": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", + "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", + "dev": true, + "requires": { + "parse-ms": "0.1.2" + } + }, + "strip-ansi": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", + "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", + "dev": true + } + } + }, + "@mrmlnc/readdir-enhanced": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", + "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", + "requires": { + "call-me-maybe": "1.0.1", + "glob-to-regexp": "0.3.0" + } + }, + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" + }, + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" + }, + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "requires": { + "@protobufjs/aspromise": "1.1.2", + "@protobufjs/inquire": "1.1.0" + } + }, + "@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" + }, + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" + }, + "@sindresorhus/is": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", + "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", + "dev": true + }, + "@sinonjs/formatio": { + "version": "2.0.0", + "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", + "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", + "dev": true, + "requires": { + "samsam": "1.3.0" + } + }, + "@types/long": { + "version": "3.0.32", + "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", + "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" + }, + "@types/node": { + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.8.tgz", + "integrity": "sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg==" + }, + "acorn": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz", + "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==", + "dev": true + }, + "acorn-es7-plugin": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz", + "integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=" + }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "3.3.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ajv-keywords": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + }, + "ansi-align": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", + "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "dev": true, + "requires": { + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, + "requires": { + "micromatch": "2.3.11", + "normalize-path": "2.1.1" + } + }, + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "argv": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz", + "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=", + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-exclude": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/arr-exclude/-/arr-exclude-1.0.0.tgz", + "integrity": "sha1-38fC5VKicHI8zaBM8xKMjL/lxjE=", + "dev": true + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", + "dev": true + }, + "array-filter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", + "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" + }, + "array-find": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", + "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", + "dev": true + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "requires": { + "array-uniq": "1.0.3" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + }, + "ascli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", + "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", + "requires": { + "colour": "0.7.1", + "optjs": "3.2.2" + } + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" + }, + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "requires": { + "lodash": "4.17.4" + } + }, + "async-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "atob": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz", + "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=" + }, + "auto-bind": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz", + "integrity": "sha1-k7hk3H7gGjJigXddXHXKCnUeWWE=", + "dev": true + }, + "ava-init": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ava-init/-/ava-init-0.2.1.tgz", + "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", + "dev": true, + "requires": { + "arr-exclude": "1.0.0", + "execa": "0.7.0", + "has-yarn": "1.0.0", + "read-pkg-up": "2.0.0", + "write-pkg": "3.1.0" + } + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + }, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, + "babel-core": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", + "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.0", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.1", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.4", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "babel-generator": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", + "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" + }, + "dependencies": { + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + } + } + }, + "babel-helper-builder-binary-assignment-operator-visitor": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", + "dev": true, + "requires": { + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-call-delegate": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", + "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", + "dev": true, + "requires": { + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-explode-assignable-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", + "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", + "dev": true, + "requires": { + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-get-function-arity": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", + "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-hoist-variables": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", + "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-regex": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", + "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.4" + } + }, + "babel-helper-remap-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helpers": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", + "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" + } + }, + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-check-es2015-constants": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", + "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-espower": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.3.2.tgz", + "integrity": "sha1-VRa4/NsmyfDh2BYHSfbkxl5xJx4=", + "dev": true, + "requires": { + "babel-generator": "6.26.0", + "babylon": "6.18.0", + "call-matcher": "1.0.1", + "core-js": "2.5.3", + "espower-location-detector": "1.0.0", + "espurify": "1.7.0", + "estraverse": "4.2.0" + } + }, + "babel-plugin-syntax-async-functions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", + "dev": true + }, + "babel-plugin-syntax-exponentiation-operator": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", + "dev": true + }, + "babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", + "dev": true + }, + "babel-plugin-syntax-trailing-function-commas": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", + "dev": true + }, + "babel-plugin-transform-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", + "dev": true, + "requires": { + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-destructuring": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", + "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", + "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-modules-commonjs": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz", + "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=", + "dev": true, + "requires": { + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-parameters": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", + "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", + "dev": true, + "requires": { + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-spread": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", + "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-sticky-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", + "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", + "dev": true, + "requires": { + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-unicode-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", + "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", + "dev": true, + "requires": { + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" + } + }, + "babel-plugin-transform-exponentiation-operator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", + "dev": true, + "requires": { + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-strict-mode": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", + "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-register": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", + "dev": true, + "requires": { + "babel-core": "6.26.0", + "babel-runtime": "6.26.0", + "core-js": "2.5.3", + "home-or-tmp": "2.0.0", + "lodash": "4.17.4", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "requires": { + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "base64url": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", + "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "binary-extensions": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", + "dev": true + }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "dev": true + }, + "boom": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", + "requires": { + "hoek": "4.2.0" + } + }, + "boxen": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "dev": true, + "requires": { + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.3.0", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "buf-compare": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", + "integrity": "sha1-/vKNqLgROgoNtEMLC2Rntpcws0o=", + "dev": true + }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "bytebuffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", + "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", + "requires": { + "long": "3.2.0" + } + }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "requires": { + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "cacheable-request": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", + "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", + "dev": true, + "requires": { + "clone-response": "1.0.2", + "get-stream": "3.0.0", + "http-cache-semantics": "3.8.1", + "keyv": "3.0.0", + "lowercase-keys": "1.0.0", + "normalize-url": "2.0.1", + "responselike": "1.0.2" + } + }, + "caching-transform": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", + "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", + "dev": true, + "requires": { + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" + }, + "dependencies": { + "md5-hex": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", + "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "write-file-atomic": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", + "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" + } + } + } + }, + "call-matcher": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-matcher/-/call-matcher-1.0.1.tgz", + "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", + "dev": true, + "requires": { + "core-js": "2.5.3", + "deep-equal": "1.0.1", + "espurify": "1.7.0", + "estraverse": "4.2.0" + } + }, + "call-me-maybe": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", + "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=" + }, + "call-signature": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/call-signature/-/call-signature-0.0.2.tgz", + "integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY=" + }, + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "0.2.0" + } + }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "capture-stack-trace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", + "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "catharsis": { + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", + "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", + "dev": true, + "requires": { + "underscore-contrib": "0.3.0" + } + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "chardet": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", + "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", + "dev": true + }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, + "requires": { + "anymatch": "1.3.2", + "async-each": "1.0.1", + "fsevents": "1.1.3", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" + } + }, + "ci-info": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz", + "integrity": "sha512-uTGIPNx/nSpBdsF6xnseRXLLtfr9VLqkz8ZqHXr3Y7b6SftyRxBGjwMtJj1OhNbmlc1wZzLNAlAcvyIiE8a6ZA==", + "dev": true + }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "requires": { + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, + "clean-stack": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz", + "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE=", + "dev": true + }, + "clean-yaml-object": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", + "integrity": "sha1-Y/sRDcLOGoTcIfbZM0h20BCui2g=", + "dev": true + }, + "cli-boxes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", + "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "2.0.0" + } + }, + "cli-spinners": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz", + "integrity": "sha1-8YR7FohE2RemceudFH499JfJDQY=", + "dev": true + }, + "cli-truncate": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", + "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", + "dev": true, + "requires": { + "slice-ansi": "1.0.0", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "dev": true, + "requires": { + "mimic-response": "1.0.0" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "co-with-promise": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co-with-promise/-/co-with-promise-4.6.0.tgz", + "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", + "dev": true, + "requires": { + "pinkie-promise": "1.0.0" + }, + "dependencies": { + "pinkie": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", + "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=", + "dev": true + }, + "pinkie-promise": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", + "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", + "dev": true, + "requires": { + "pinkie": "1.0.0" + } + } + } + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "codecov": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.0.tgz", + "integrity": "sha1-wnO4xPEpRXI+jcnSWAPYk0Pl8o4=", + "dev": true, + "requires": { + "argv": "0.0.2", + "request": "2.81.0", + "urlgrey": "0.4.4" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "dev": true + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, + "requires": { + "boom": "2.10.1" + } + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "dev": true + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "dev": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "dev": true + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "dev": true + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "dev": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + } + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + } + } + }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "requires": { + "map-visit": "1.0.0", + "object-visit": "1.0.1" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "colour": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", + "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "common-path-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-1.0.0.tgz", + "integrity": "sha1-zVL28HEuC6q5fW+XModPIvR3UsA=", + "dev": true + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "typedarray": "0.0.6" + } + }, + "concordance": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/concordance/-/concordance-3.0.0.tgz", + "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", + "dev": true, + "requires": { + "date-time": "2.1.0", + "esutils": "2.0.2", + "fast-diff": "1.1.2", + "function-name-support": "0.2.0", + "js-string-escape": "1.0.1", + "lodash.clonedeep": "4.5.0", + "lodash.flattendeep": "4.4.0", + "lodash.merge": "4.6.0", + "md5-hex": "2.0.0", + "semver": "5.4.1", + "well-known-symbols": "1.0.0" + } + }, + "configstore": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz", + "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==", + "dev": true, + "requires": { + "dot-prop": "4.2.0", + "graceful-fs": "4.1.11", + "make-dir": "1.1.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.3.0", + "xdg-basedir": "3.0.0" + } + }, + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "dev": true + }, + "convert-to-spaces": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz", + "integrity": "sha1-fj5Iu+bZl7FBfdyihoIEtNPYVxU=", + "dev": true + }, + "cookiejar": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz", + "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=", + "dev": true + }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + }, + "core-assert": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/core-assert/-/core-assert-0.2.1.tgz", + "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", + "dev": true, + "requires": { + "buf-compare": "1.0.1", + "is-error": "2.2.1" + } + }, + "core-js": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "create-error-class": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", + "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "requires": { + "capture-stack-trace": "1.0.0" + } + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + }, + "cryptiles": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", + "requires": { + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", + "requires": { + "hoek": "4.2.0" + } + } + } + }, + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", + "dev": true + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { + "array-find-index": "1.0.2" + } + }, + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "dev": true, + "requires": { + "es5-ext": "0.10.37" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "1.0.0" + } + }, + "date-time": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", + "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", + "dev": true, + "requires": { + "time-zone": "1.0.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + }, + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, + "requires": { + "mimic-response": "1.0.0" + } + }, + "deep-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", + "dev": true + }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "dev": true + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "define-properties": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", + "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "requires": { + "foreach": "2.0.5", + "object-keys": "1.0.11" + } + }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "requires": { + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true, + "requires": { + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" + }, + "dependencies": { + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + } + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "diff": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", + "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", + "dev": true + }, + "diff-match-patch": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz", + "integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg=" + }, + "dir-glob": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", + "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", + "requires": { + "arrify": "1.0.1", + "path-type": "3.0.0" + }, + "dependencies": { + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "requires": { + "pify": "3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "requires": { + "esutils": "2.0.2" + } + }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + } + } + }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "domhandler": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", + "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "domutils": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz", + "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=", + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } + }, + "dot-prop": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "dev": true, + "requires": { + "is-obj": "1.0.1" + } + }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", + "dev": true + }, + "duplexify": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", + "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", + "requires": { + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + } + }, + "eastasianwidth": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.1.1.tgz", + "integrity": "sha1-RNZW3p2kFWlEZzNTZfsxR7hXK3w=" + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "ecdsa-sig-formatter": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz", + "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=", + "requires": { + "base64url": "2.0.0", + "safe-buffer": "5.1.1" + } + }, + "empower": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", + "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", + "requires": { + "core-js": "2.5.3", + "empower-core": "0.6.2" + } + }, + "empower-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/empower-assert/-/empower-assert-1.0.1.tgz", + "integrity": "sha1-MeMQq8BluqfDoEh+a+W7zGXzwd4=", + "dev": true, + "requires": { + "estraverse": "4.2.0" + } + }, + "empower-core": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", + "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", + "requires": { + "call-signature": "0.0.2", + "core-js": "2.5.3" + } + }, + "end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "requires": { + "once": "1.4.0" + } + }, + "ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=" + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true + }, + "equal-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/equal-length/-/equal-length-1.0.1.tgz", + "integrity": "sha1-IcoRLUirJLTh5//A5TOdMf38J0w=", + "dev": true + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "es5-ext": { + "version": "0.10.37", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz", + "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=", + "dev": true, + "requires": { + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" + } + }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.37", + "es6-symbol": "3.1.1" + } + }, + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.37" + } + }, + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" + } + }, + "escallmatch": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/escallmatch/-/escallmatch-1.5.0.tgz", + "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", + "dev": true, + "requires": { + "call-matcher": "1.0.1", + "esprima": "2.7.3" + }, + "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + } + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "escodegen": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", + "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", + "dev": true, + "requires": { + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.5.7" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "dev": true + } + } + }, + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", + "dev": true, + "requires": { + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.0", + "estraverse": "4.2.0" + } + }, + "eslint": { + "version": "4.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz", + "integrity": "sha512-zEO/Z1ZUxIQ+MhDVKkVTUYpIPDTEJLXGMrkID+5v1NeQHtCz6FZikWuFRgxE1Q/RV2V4zVl1u3xmpPADHhMZ6A==", + "dev": true, + "requires": { + "ajv": "5.5.2", + "babel-code-frame": "6.26.0", + "chalk": "2.3.0", + "concat-stream": "1.6.0", + "cross-spawn": "5.1.0", + "debug": "3.1.0", + "doctrine": "2.1.0", + "eslint-scope": "3.7.1", + "eslint-visitor-keys": "1.0.0", + "espree": "3.5.2", + "esquery": "1.0.0", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "functional-red-black-tree": "1.0.1", + "glob": "7.1.2", + "globals": "11.1.0", + "ignore": "3.3.7", + "imurmurhash": "0.1.4", + "inquirer": "3.3.0", + "is-resolvable": "1.0.1", + "js-yaml": "3.10.0", + "json-stable-stringify-without-jsonify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.4", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "7.0.0", + "progress": "2.0.0", + "require-uncached": "1.0.3", + "semver": "5.4.1", + "strip-ansi": "4.0.0", + "strip-json-comments": "2.0.1", + "table": "4.0.2", + "text-table": "0.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "globals": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz", + "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "eslint-config-prettier": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", + "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", + "dev": true, + "requires": { + "get-stdin": "5.0.1" + }, + "dependencies": { + "get-stdin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", + "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", + "dev": true + } + } + }, + "eslint-plugin-node": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz", + "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", + "dev": true, + "requires": { + "ignore": "3.3.7", + "minimatch": "3.0.4", + "resolve": "1.5.0", + "semver": "5.4.1" + }, + "dependencies": { + "resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + } + } + }, + "eslint-plugin-prettier": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.4.0.tgz", + "integrity": "sha512-P0EohHM1MwL36GX5l1TOEYyt/5d7hcxrX3CqCjibTN3dH7VCAy2kjsC/WB6dUHnpB4mFkZq1Ndfh2DYQ2QMEGQ==", + "dev": true, + "requires": { + "fast-diff": "1.1.2", + "jest-docblock": "21.2.0" + } + }, + "eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", + "dev": true, + "requires": { + "esrecurse": "4.2.0", + "estraverse": "4.2.0" + } + }, + "eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", + "dev": true + }, + "espower": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/espower/-/espower-2.1.0.tgz", + "integrity": "sha1-zh7bPZhwKEH99ZbRy46FvcSujkg=", + "dev": true, + "requires": { + "array-find": "1.0.0", + "escallmatch": "1.5.0", + "escodegen": "1.9.0", + "escope": "3.6.0", + "espower-location-detector": "1.0.0", + "espurify": "1.7.0", + "estraverse": "4.2.0", + "source-map": "0.5.7", + "type-name": "2.0.2", + "xtend": "4.0.1" + } + }, + "espower-loader": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/espower-loader/-/espower-loader-1.2.2.tgz", + "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", + "dev": true, + "requires": { + "convert-source-map": "1.5.1", + "espower-source": "2.2.0", + "minimatch": "3.0.4", + "source-map-support": "0.4.18", + "xtend": "4.0.1" + } + }, + "espower-location-detector": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/espower-location-detector/-/espower-location-detector-1.0.0.tgz", + "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", + "dev": true, + "requires": { + "is-url": "1.2.2", + "path-is-absolute": "1.0.1", + "source-map": "0.5.7", + "xtend": "4.0.1" + } + }, + "espower-source": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/espower-source/-/espower-source-2.2.0.tgz", + "integrity": "sha1-fgBSVa5HtcE2RIZEs/PYAtUD91I=", + "dev": true, + "requires": { + "acorn": "5.3.0", + "acorn-es7-plugin": "1.1.7", + "convert-source-map": "1.5.1", + "empower-assert": "1.0.1", + "escodegen": "1.9.0", + "espower": "2.1.0", + "estraverse": "4.2.0", + "merge-estraverse-visitors": "1.0.0", + "multi-stage-sourcemap": "0.2.1", + "path-is-absolute": "1.0.1", + "xtend": "4.0.1" + } + }, + "espree": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz", + "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==", + "dev": true, + "requires": { + "acorn": "5.3.0", + "acorn-jsx": "3.0.1" + } + }, + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "espurify": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", + "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", + "requires": { + "core-js": "2.5.3" + } + }, + "esquery": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz", + "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=", + "dev": true, + "requires": { + "estraverse": "4.2.0" + } + }, + "esrecurse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", + "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "dev": true, + "requires": { + "estraverse": "4.2.0", + "object-assign": "4.1.1" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.37" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, + "external-editor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz", + "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==", + "dev": true, + "requires": { + "chardet": "0.4.2", + "iconv-lite": "0.4.19", + "tmp": "0.0.33" + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" + }, + "fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", + "dev": true + }, + "fast-glob": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.0.tgz", + "integrity": "sha512-4F75PTznkNtSKs2pbhtBwRkw8sRwa7LfXx5XaQJOe4IQ6yTjceLDTwM5gj1s80R2t/5WeDC1gVfm3jLE+l39Tw==", + "requires": { + "@mrmlnc/readdir-enhanced": "2.2.1", + "glob-parent": "3.1.0", + "is-glob": "4.0.0", + "merge2": "1.2.1", + "micromatch": "3.1.9" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, + "braces": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", + "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "define-property": "1.0.0", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "kind-of": "6.0.2", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + }, + "micromatch": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz", + "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==", + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.1", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "file-entry-cache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", + "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "dev": true, + "requires": { + "flat-cache": "1.3.0", + "object-assign": "4.1.1" + } + }, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "dev": true + }, + "fill-keys": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", + "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", + "dev": true, + "requires": { + "is-object": "1.0.1", + "merge-descriptors": "1.0.1" + } + }, + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "find-cache-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "dev": true, + "requires": { + "commondir": "1.0.1", + "make-dir": "1.1.0", + "pkg-dir": "2.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "flat-cache": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", + "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", + "dev": true, + "requires": { + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" + } + }, + "fn-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", + "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", + "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "formatio": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", + "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", + "dev": true, + "requires": { + "samsam": "1.3.0" + } + }, + "formidable": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz", + "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=", + "dev": true + }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "requires": { + "map-cache": "0.2.2" + } + }, + "from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz", + "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", + "dev": true, + "optional": true, + "requires": { + "nan": "2.8.0", + "node-pre-gyp": "0.6.39" + }, + "dependencies": { + "abbrev": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "ajv": { + "version": "4.11.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "aproba": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.2.9" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true, + "dev": true, + "optional": true + }, + "assert-plus": { + "version": "0.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "balanced-match": { + "version": "0.4.2", + "bundled": true, + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "bundled": true, + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "0.4.2", + "concat-map": "0.0.1" + } + }, + "buffer-shims": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "caseless": { + "version": "0.12.0", + "bundled": true, + "dev": true, + "optional": true + }, + "co": { + "version": "4.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "combined-stream": { + "version": "1.0.5", + "bundled": true, + "dev": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "cryptiles": { + "version": "2.0.5", + "bundled": true, + "dev": true, + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "debug": { + "version": "2.6.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true, + "dev": true, + "optional": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "extsprintf": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true, + "dev": true, + "optional": true + }, + "form-data": { + "version": "2.1.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "1.1.1", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true, + "dev": true + }, + "har-schema": { + "version": "1.0.5", + "bundled": true, + "dev": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "hawk": { + "version": "3.1.3", + "bundled": true, + "dev": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "bundled": true, + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "ini": { + "version": "1.3.4", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "jodid25519": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true, + "dev": true, + "optional": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "jsonify": { + "version": "0.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "jsprim": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "mime-db": { + "version": "1.27.0", + "bundled": true, + "dev": true + }, + "mime-types": { + "version": "2.1.15", + "bundled": true, + "dev": true, + "requires": { + "mime-db": "1.27.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "node-pre-gyp": { + "version": "0.6.39", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "detect-libc": "1.0.2", + "hawk": "3.1.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.0", + "rc": "1.2.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "tar-pack": "3.4.0" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true, + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "performance-now": { + "version": "0.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "1.0.7", + "bundled": true, + "dev": true + }, + "punycode": { + "version": "1.4.1", + "bundled": true, + "dev": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.2.9", + "bundled": true, + "dev": true, + "requires": { + "buffer-shims": "1.0.0", + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "1.0.1", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.81.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.0.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.0.1" + } + }, + "rimraf": { + "version": "2.6.1", + "bundled": true, + "dev": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.0.1", + "bundled": true, + "dev": true + }, + "semver": { + "version": "5.3.0", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sntp": { + "version": "1.0.9", + "bundled": true, + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jodid25519": "1.0.2", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true, + "dev": true, + "optional": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "2.6.8", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.2.9", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "dev": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true, + "dev": true, + "optional": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "uuid": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "verror": { + "version": "1.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "extsprintf": "1.0.2" + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + } + } + }, + "function-name-support": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/function-name-support/-/function-name-support-0.2.0.tgz", + "integrity": "sha1-VdO/qm6v1QWlD5vIH99XVkoLsHE=", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "gcp-metadata": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz", + "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==", + "requires": { + "extend": "3.0.1", + "retry-request": "3.3.1" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "dev": true + }, + "get-port": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", + "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", + "dev": true + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "1.0.0" + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "glob-to-regexp": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", + "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" + }, + "global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", + "dev": true, + "requires": { + "ini": "1.3.5" + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "google-auth-library": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.12.0.tgz", + "integrity": "sha512-79qCXtJ1VweBmmLr4yLq9S4clZB2p5Y+iACvuKk9gu4JitEnPc+bQFmYvtCYehVR44MQzD1J8DVmYW2w677IEw==", + "requires": { + "gtoken": "1.2.3", + "jws": "3.1.4", + "lodash.isstring": "4.0.1", + "lodash.merge": "4.6.0", + "request": "2.83.0" + } + }, + "google-auto-auth": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.0.tgz", + "integrity": "sha512-iz/nqV/G09d6nOVomlfW8QBRI2TiL8Q6qU1E6nD3HJvuXF5L3/Od8dJI+MSLM8lknZ9Mm53JgZ5lP13XC2uiiw==", + "requires": { + "async": "2.6.0", + "gcp-metadata": "0.3.1", + "google-auth-library": "0.12.0", + "request": "2.83.0" + } + }, + "google-gax": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.15.0.tgz", + "integrity": "sha512-a+WBi3oiV3jQ0eLCIM0GAFe8vYQ10yYuXRnjhEEXFKSNd8nW6XSQ7YWqMLIod2Xnyu6JiSSymMBwCr5YSwQyRQ==", + "requires": { + "extend": "3.0.1", + "globby": "8.0.1", + "google-auto-auth": "0.9.0", + "google-proto-files": "0.15.1", + "grpc": "1.9.1", + "is-stream-ended": "0.1.3", + "lodash": "4.17.4", + "protobufjs": "6.8.4", + "readable-stream": "2.3.3", + "through2": "2.0.3" + }, + "dependencies": { + "globby": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", + "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", + "requires": { + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "fast-glob": "2.2.0", + "glob": "7.1.2", + "ignore": "3.3.7", + "pify": "3.0.0", + "slash": "1.0.0" + } + }, + "grpc": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.9.1.tgz", + "integrity": "sha512-WNW3MWMuAoo63AwIlzFE3T0KzzvNBSvOkg67Hm8WhvHNkXFBlIk1QyJRE3Ocm0O5eIwS7JU8Ssota53QR1zllg==", + "requires": { + "lodash": "4.17.4", + "nan": "2.8.0", + "node-pre-gyp": "0.6.39", + "protobufjs": "5.0.2" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "ajv": { + "version": "4.11.8", + "bundled": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.3" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true + }, + "assert-plus": { + "version": "0.2.0", + "bundled": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true + }, + "aws-sign2": { + "version": "0.6.0", + "bundled": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.8", + "bundled": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "caseless": { + "version": "0.12.0", + "bundled": true + }, + "co": { + "version": "4.6.0", + "bundled": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "combined-stream": { + "version": "1.0.5", + "bundled": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "cryptiles": { + "version": "2.0.5", + "bundled": true, + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true + } + } + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true + }, + "extsprintf": { + "version": "1.3.0", + "bundled": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true + }, + "form-data": { + "version": "2.1.4", + "bundled": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true + } + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true + }, + "har-schema": { + "version": "1.0.5", + "bundled": true + }, + "har-validator": { + "version": "4.2.1", + "bundled": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true + }, + "hawk": { + "version": "3.1.3", + "bundled": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "bundled": true + }, + "http-signature": { + "version": "1.1.1", + "bundled": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.5", + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "bundled": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true + }, + "jsonify": { + "version": "0.0.0", + "bundled": true + }, + "jsprim": { + "version": "1.4.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true + } + } + }, + "mime-db": { + "version": "1.30.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.17", + "bundled": true, + "requires": { + "mime-db": "1.30.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true + }, + "node-pre-gyp": { + "version": "0.6.39", + "bundled": true, + "requires": { + "detect-libc": "1.0.3", + "hawk": "3.1.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.2", + "rc": "1.2.4", + "request": "2.81.0", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "2.2.1", + "tar-pack": "3.4.1" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true + }, + "osenv": { + "version": "0.1.4", + "bundled": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "performance-now": { + "version": "0.2.0", + "bundled": true + }, + "process-nextick-args": { + "version": "1.0.7", + "bundled": true + }, + "protobufjs": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", + "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=", + "requires": { + "ascli": "1.0.1", + "bytebuffer": "5.0.1", + "glob": "7.1.2", + "yargs": "3.32.0" + } + }, + "punycode": { + "version": "1.4.1", + "bundled": true + }, + "qs": { + "version": "6.4.0", + "bundled": true + }, + "rc": { + "version": "1.2.4", + "bundled": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true + } + } + }, + "readable-stream": { + "version": "2.3.3", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.81.0", + "bundled": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "bundled": true + }, + "semver": { + "version": "5.5.0", + "bundled": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true + }, + "sntp": { + "version": "1.0.9", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.1", + "bundled": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true + } + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.0.3", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.1", + "bundled": true, + "requires": { + "debug": "2.6.9", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.3.3", + "rimraf": "2.6.2", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.3", + "bundled": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "uuid": { + "version": "3.2.1", + "bundled": true + }, + "verror": { + "version": "1.10.0", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true + } + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + } + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "google-p12-pem": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz", + "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=", + "requires": { + "node-forge": "0.7.1" + } + }, + "google-proto-files": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", + "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", + "requires": { + "globby": "7.1.1", + "power-assert": "1.4.4", + "protobufjs": "6.8.4" + }, + "dependencies": { + "globby": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", + "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", + "requires": { + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "glob": "7.1.2", + "ignore": "3.3.7", + "pify": "3.0.0", + "slash": "1.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "growl": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", + "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", + "dev": true + }, + "gtoken": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz", + "integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==", + "requires": { + "google-p12-pem": "0.1.2", + "jws": "3.1.4", + "mime": "1.6.0", + "request": "2.83.0" + } + }, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "requires": { + "ajv": "5.5.2", + "har-schema": "2.0.0" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-color": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", + "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "has-symbol-support-x": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz", + "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==", + "dev": true + }, + "has-to-string-tag-x": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", + "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "dev": true, + "requires": { + "has-symbol-support-x": "1.4.1" + } + }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "requires": { + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "has-yarn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-1.0.0.tgz", + "integrity": "sha1-ieJdtgS3Jcj1l2//Ct3JIbgopac=", + "dev": true + }, + "hawk": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "requires": { + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.0", + "sntp": "2.1.0" + } + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + }, + "home-or-tmp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", + "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", + "dev": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "dev": true + }, + "htmlparser2": { + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", + "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", + "dev": true, + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.4.1", + "domutils": "1.6.2", + "entities": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "http-cache-semantics": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", + "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", + "dev": true + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "hullabaloo-config-manager": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz", + "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", + "dev": true, + "requires": { + "dot-prop": "4.2.0", + "es6-error": "4.1.1", + "graceful-fs": "4.1.11", + "indent-string": "3.2.0", + "json5": "0.5.1", + "lodash.clonedeep": "4.5.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.isequal": "4.5.0", + "lodash.merge": "4.6.0", + "md5-hex": "2.0.0", + "package-hash": "2.0.0", + "pkg-dir": "2.0.0", + "resolve-from": "3.0.0", + "safe-buffer": "5.1.1" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "dev": true + }, + "ignore": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", + "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==" + }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", + "dev": true + }, + "import-lazy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", + "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", + "dev": true + }, + "import-local": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz", + "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", + "dev": true, + "requires": { + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, + "ink-docstrap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", + "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", + "dev": true, + "requires": { + "moment": "2.20.1", + "sanitize-html": "1.16.3" + } + }, + "inquirer": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", + "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "dev": true, + "requires": { + "ansi-escapes": "3.0.0", + "chalk": "2.3.0", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.1.0", + "figures": "2.0.0", + "lodash": "4.17.4", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rx-lite": "4.0.8", + "rx-lite-aggregates": "4.0.8", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" + }, + "dependencies": { + "ansi-escapes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", + "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "dev": true + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "intelli-espower-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/intelli-espower-loader/-/intelli-espower-loader-1.0.1.tgz", + "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", + "dev": true, + "requires": { + "espower-loader": "1.2.2" + } + }, + "into-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", + "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", + "dev": true, + "requires": { + "from2": "2.3.0", + "p-is-promise": "1.1.0" + } + }, + "invariant": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "dev": true, + "requires": { + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "irregular-plurals": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz", + "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=", + "dev": true + }, + "is": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", + "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=" + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "1.11.0" + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-ci": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", + "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "dev": true, + "requires": { + "ci-info": "1.1.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-error": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.1.tgz", + "integrity": "sha1-aEqW2EB2V3yY9M20DG0mpRI78Zw=", + "dev": true + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-generator-fn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz", + "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-installed-globally": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", + "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", + "dev": true, + "requires": { + "global-dirs": "0.1.1", + "is-path-inside": "1.0.1" + } + }, + "is-npm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", + "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", + "dev": true + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true + }, + "is-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "dev": true + }, + "is-observable": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-0.2.0.tgz", + "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", + "dev": true, + "requires": { + "symbol-observable": "0.2.4" + } + }, + "is-odd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", + "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", + "requires": { + "is-number": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" + } + } + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", + "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "dev": true, + "requires": { + "is-path-inside": "1.0.1" + } + }, + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "dev": true, + "requires": { + "path-is-inside": "1.0.2" + } + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "dev": true + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, + "is-redirect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", + "dev": true + }, + "is-resolvable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz", + "integrity": "sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==", + "dev": true + }, + "is-retry-allowed": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", + "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, + "is-stream-ended": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz", + "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-url": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz", + "integrity": "sha1-SYkFpZO/R8wtnn9zg3K792lsfyY=", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "isurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", + "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "dev": true, + "requires": { + "has-to-string-tag-x": "1.4.1", + "is-object": "1.0.1" + } + }, + "jest-docblock": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", + "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", + "dev": true + }, + "js-string-escape": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", + "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", + "dev": true + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + }, + "js2xmlparser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", + "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", + "dev": true, + "requires": { + "xmlcreate": "1.0.2" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true + }, + "jsdoc": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", + "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", + "dev": true, + "requires": { + "babylon": "7.0.0-beta.19", + "bluebird": "3.5.1", + "catharsis": "0.8.9", + "escape-string-regexp": "1.0.5", + "js2xmlparser": "3.0.0", + "klaw": "2.0.0", + "marked": "0.3.12", + "mkdirp": "0.5.1", + "requizzle": "0.2.1", + "strip-json-comments": "2.0.1", + "taffydb": "2.6.2", + "underscore": "1.8.3" + }, + "dependencies": { + "babylon": { + "version": "7.0.0-beta.19", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", + "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", + "dev": true + } + } + }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", + "dev": true + }, + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "dev": true + }, + "json-parse-better-errors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz", + "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==", + "dev": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "just-extend": { + "version": "1.1.27", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", + "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==", + "dev": true + }, + "jwa": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz", + "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=", + "requires": { + "base64url": "2.0.0", + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.9", + "safe-buffer": "5.1.1" + } + }, + "jws": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz", + "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=", + "requires": { + "base64url": "2.0.0", + "jwa": "1.1.5", + "safe-buffer": "5.1.1" + } + }, + "keyv": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", + "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", + "dev": true, + "requires": { + "json-buffer": "3.0.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + }, + "klaw": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", + "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "last-line-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz", + "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", + "dev": true, + "requires": { + "through2": "2.0.3" + } + }, + "latest-version": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", + "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "dev": true, + "requires": { + "package-json": "4.0.1" + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + } + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + }, + "lodash.chunk": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", + "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, + "lodash.clonedeepwith": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz", + "integrity": "sha1-buMFc6A6GmDWcKYu8zwQzxr9vdQ=", + "dev": true + }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", + "dev": true + }, + "lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", + "dev": true + }, + "lodash.escaperegexp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", + "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", + "dev": true + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "lodash.merge": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", + "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=" + }, + "lodash.mergewith": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", + "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", + "dev": true + }, + "lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" + }, + "lolex": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz", + "integrity": "sha512-mQuW55GhduF3ppo+ZRUTz1PRjEh1hS5BbqU7d8D0ez2OKxHDod7StPPeAVKisZR5aLkHZjdGWSL42LSONUJsZw==", + "dev": true + }, + "long": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", + "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "dev": true + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "make-dir": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", + "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", + "dev": true, + "requires": { + "pify": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true + }, + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "requires": { + "object-visit": "1.0.1" + } + }, + "marked": { + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz", + "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA==", + "dev": true + }, + "matcher": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.0.0.tgz", + "integrity": "sha1-qvDEgW62m5IJRnQXViXzRmsOPhk=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "md5-hex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", + "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "md5-o-matic": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", + "dev": true + }, + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + } + } + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "dev": true + }, + "merge-estraverse-visitors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/merge-estraverse-visitors/-/merge-estraverse-visitors-1.0.0.tgz", + "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", + "dev": true, + "requires": { + "estraverse": "4.2.0" + } + }, + "merge2": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", + "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==" + }, + "methmeth": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz", + "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" + }, + "mime-types": { + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", + "requires": { + "mime-db": "1.30.0" + } + }, + "mimic-fn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", + "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", + "dev": true + }, + "mimic-response": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz", + "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mixin-deep": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "requires": { + "for-in": "1.0.2", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "mocha": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz", + "integrity": "sha512-nMOpAPFosU1B4Ix1jdhx5e3q7XO55ic5a8cgYvW27CequcEY+BabS0kUVL1Cw1V5PuVHZWeNRWFLmEPexo79VA==", + "dev": true, + "requires": { + "browser-stdout": "1.3.1", + "commander": "2.11.0", + "debug": "3.1.0", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.3", + "he": "1.1.1", + "mkdirp": "0.5.1", + "supports-color": "4.4.0" + }, + "dependencies": { + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, + "supports-color": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", + "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "modelo": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz", + "integrity": "sha512-9DITV2YEMcw7XojdfvGl3gDD8J9QjZTJ7ZOUuSAkP+F3T6rDbzMJuPktxptsdHYEvZcmXrCD3LMOhdSAEq6zKA==" + }, + "module-not-found-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", + "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=", + "dev": true + }, + "moment": { + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz", + "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==", + "dev": true + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, + "multi-stage-sourcemap": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz", + "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", + "dev": true, + "requires": { + "source-map": "0.1.43" + }, + "dependencies": { + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "multimatch": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", + "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" + } + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "nan": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" + }, + "nanomatch": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "nise": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz", + "integrity": "sha512-q9jXh3UNsMV28KeqI43ILz5+c3l+RiNW8mhurEwCKckuHQbL+hTJIKKTiUlCPKlgQ/OukFvSnKB/Jk3+sFbkGA==", + "dev": true, + "requires": { + "formatio": "1.2.0", + "just-extend": "1.1.27", + "lolex": "1.6.0", + "path-to-regexp": "1.7.0", + "text-encoding": "0.6.4" + }, + "dependencies": { + "lolex": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz", + "integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=", + "dev": true + } + } + }, + "node-forge": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz", + "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=" + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } + }, + "normalize-url": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", + "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", + "dev": true, + "requires": { + "prepend-http": "2.0.0", + "query-string": "5.1.1", + "sort-keys": "2.0.0" + }, + "dependencies": { + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + } + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "2.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "nyc": { + "version": "11.4.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", + "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", + "dev": true, + "requires": { + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", + "md5-hex": "1.3.0", + "merge-source-map": "1.0.4", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.1.1", + "yargs": "10.0.3", + "yargs-parser": "8.0.0" + }, + "dependencies": { + "align-text": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "amdefine": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "bundled": true, + "dev": true + }, + "append-transform": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "archy": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "arrify": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "async": { + "version": "1.5.2", + "bundled": true, + "dev": true + }, + "babel-code-frame": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-generator": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" + } + }, + "babel-messages": { + "version": "6.23.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "bundled": true, + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.8", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "bundled": true, + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "builtin-modules": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "caching-transform": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" + } + }, + "camelcase": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true + }, + "center-align": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "cliui": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "commondir": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "convert-source-map": { + "version": "1.5.1", + "bundled": true, + "dev": true + }, + "core-js": { + "version": "2.5.3", + "bundled": true, + "dev": true + }, + "cross-spawn": { + "version": "4.0.2", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "debug-log": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "default-require-extensions": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "strip-bom": "2.0.0" + } + }, + "detect-indent": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "error-ex": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "esutils": { + "version": "2.0.2", + "bundled": true, + "dev": true + }, + "execa": { + "version": "0.7.0", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } + } + }, + "expand-brackets": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "bundled": true, + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "extglob": { + "version": "0.3.2", + "bundled": true, + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "filename-regex": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "bundled": true, + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "find-cache-dir": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "requires": { + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "for-in": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "for-own": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreground-child": { + "version": "1.5.6", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "get-stream": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "bundled": true, + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "globals": { + "version": "9.18.0", + "bundled": true, + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true, + "dev": true + }, + "handlebars": { + "version": "4.0.11", + "bundled": true, + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "has-ansi": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-flag": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "hosted-git-info": { + "version": "2.5.0", + "bundled": true, + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "bundled": true, + "dev": true + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "invariant": { + "version": "2.2.2", + "bundled": true, + "dev": true, + "requires": { + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "is-buffer": { + "version": "1.1.6", + "bundled": true, + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-dotfile": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-finite": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-glob": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-number": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-posix-bracket": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "isobject": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "isarray": "1.0.0" + } + }, + "istanbul-lib-coverage": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "append-transform": "0.4.0" + } + }, + "istanbul-lib-instrument": { + "version": "1.9.1", + "bundled": true, + "dev": true, + "requires": { + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" + } + }, + "istanbul-lib-report": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" + }, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "bundled": true, + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "1.2.2", + "bundled": true, + "dev": true, + "requires": { + "debug": "3.1.0", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "istanbul-reports": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "handlebars": "4.0.11" + } + }, + "js-tokens": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "jsesc": { + "version": "1.3.0", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + }, + "lazy-cache": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "invert-kv": "1.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + } + } + }, + "lodash": { + "version": "4.17.4", + "bundled": true, + "dev": true + }, + "longest": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "lru-cache": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "md5-hex": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "md5-o-matic": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "mem": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "merge-source-map": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "requires": { + "source-map": "0.5.7" + } + }, + "micromatch": { + "version": "2.3.11", + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + }, + "mimic-fn": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "normalize-package-data": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } + }, + "npm-run-path": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "path-key": "2.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "optimist": { + "version": "0.6.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8", + "wordwrap": "0.0.3" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "p-finally": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "p-limit": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "p-locate": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-limit": "1.1.0" + } + }, + "parse-glob": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "bundled": true, + "dev": true, + "requires": { + "error-ex": "1.3.1" + } + }, + "path-exists": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "path-key": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "path-type": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "bundled": true, + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "bundled": true, + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "pkg-dir": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "find-up": "1.1.2" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } + } + }, + "preserve": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "read-pkg": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "bundled": true, + "dev": true + }, + "regex-cache": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" + } + }, + "remove-trailing-separator": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "bundled": true, + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "bundled": true, + "dev": true + }, + "repeating": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "require-directory": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "resolve-from": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "right-align": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "dev": true, + "requires": { + "glob": "7.1.2" + } + }, + "semver": { + "version": "5.4.1", + "bundled": true, + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "slide": { + "version": "1.1.6", + "bundled": true, + "dev": true + }, + "source-map": { + "version": "0.5.7", + "bundled": true, + "dev": true + }, + "spawn-wrap": { + "version": "1.4.2", + "bundled": true, + "dev": true, + "requires": { + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" + } + }, + "spdx-correct": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "bundled": true, + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "bundled": true, + "dev": true + }, + "string-width": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "test-exclude": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "requires": { + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" + } + }, + "to-fast-properties": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "trim-right": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "yargs": { + "version": "3.10.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "which": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "window-size": { + "version": "0.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "wordwrap": { + "version": "0.0.3", + "bundled": true, + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "write-file-atomic": { + "version": "1.3.4", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" + } + }, + "y18n": { + "version": "3.2.1", + "bundled": true, + "dev": true + }, + "yallist": { + "version": "2.1.2", + "bundled": true, + "dev": true + }, + "yargs": { + "version": "10.0.3", + "bundled": true, + "dev": true, + "requires": { + "cliui": "3.2.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "8.0.0" + }, + "dependencies": { + "cliui": { + "version": "3.2.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + } + } + }, + "yargs-parser": { + "version": "8.0.0", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "4.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "bundled": true, + "dev": true + } + } + } + } + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "requires": { + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + } + } + }, + "object-keys": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=" + }, + "object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "observable-to-promise": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/observable-to-promise/-/observable-to-promise-0.5.0.tgz", + "integrity": "sha1-yCjw8NxH6fhq+KSXfF1VB2znqR8=", + "dev": true, + "requires": { + "is-observable": "0.2.0", + "symbol-observable": "1.1.0" + }, + "dependencies": { + "symbol-observable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz", + "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw==", + "dev": true + } + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1.0.2" + } + }, + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.8", + "wordwrap": "0.0.3" + } + }, + "option-chain": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/option-chain/-/option-chain-1.0.0.tgz", + "integrity": "sha1-k41zvU4Xg/lI00AjZEraI2aeMPI=", + "dev": true + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + }, + "dependencies": { + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "optjs": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz", + "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=" + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "1.0.0" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true + }, + "p-cancelable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==", + "dev": true + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true + }, + "p-is-promise": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", + "dev": true + }, + "p-limit": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "dev": true, + "requires": { + "p-try": "1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "1.2.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "package-hash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-2.0.0.tgz", + "integrity": "sha1-eK4ybIngWk2BO2hgGXevBcANKg0=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "lodash.flattendeep": "4.4.0", + "md5-hex": "2.0.0", + "release-zalgo": "1.0.0" + } + }, + "package-json": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", + "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", + "dev": true, + "requires": { + "got": "6.7.1", + "registry-auth-token": "3.3.1", + "registry-url": "3.1.0", + "semver": "5.4.1" + }, + "dependencies": { + "got": { + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", + "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", + "dev": true, + "requires": { + "create-error-class": "3.0.2", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.0", + "safe-buffer": "5.1.1", + "timed-out": "4.0.1", + "unzip-response": "2.0.1", + "url-parse-lax": "1.0.0" + } + } + } + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "1.3.1" + } + }, + "parse-ms": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz", + "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=", + "dev": true + }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + }, + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "dev": true, + "requires": { + "isarray": "0.0.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "pkg-conf": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz", + "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", + "dev": true, + "requires": { + "find-up": "2.1.0", + "load-json-file": "4.0.0" + }, + "dependencies": { + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "4.0.0", + "pify": "3.0.0", + "strip-bom": "3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "1.3.1", + "json-parse-better-errors": "1.0.1" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "2.1.0" + } + }, + "plur": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz", + "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", + "dev": true, + "requires": { + "irregular-plurals": "1.4.0" + } + }, + "pluralize": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", + "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "dev": true + }, + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" + }, + "postcss": { + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", + "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", + "dev": true, + "requires": { + "chalk": "2.3.0", + "source-map": "0.6.1", + "supports-color": "5.1.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "power-assert": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.4.4.tgz", + "integrity": "sha1-kpXqdDcZb1pgH95CDwQmMRhtdRc=", + "requires": { + "define-properties": "1.1.2", + "empower": "1.2.3", + "power-assert-formatter": "1.4.1", + "universal-deep-strict-equal": "1.2.2", + "xtend": "4.0.1" + } + }, + "power-assert-context-formatter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.1.1.tgz", + "integrity": "sha1-7bo1LT7YpgMRTWZyZazOYNaJzN8=", + "requires": { + "core-js": "2.5.3", + "power-assert-context-traversal": "1.1.1" + } + }, + "power-assert-context-reducer-ast": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/power-assert-context-reducer-ast/-/power-assert-context-reducer-ast-1.1.2.tgz", + "integrity": "sha1-SEqZ4m9Jc/+IMuXFzHVnAuYJQXQ=", + "requires": { + "acorn": "4.0.13", + "acorn-es7-plugin": "1.1.7", + "core-js": "2.5.3", + "espurify": "1.7.0", + "estraverse": "4.2.0" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" + } + } + }, + "power-assert-context-traversal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.1.1.tgz", + "integrity": "sha1-iMq8oNE7Y1nwfT0+ivppkmRXftk=", + "requires": { + "core-js": "2.5.3", + "estraverse": "4.2.0" + } + }, + "power-assert-formatter": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", + "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", + "requires": { + "core-js": "2.5.3", + "power-assert-context-formatter": "1.1.1", + "power-assert-context-reducer-ast": "1.1.2", + "power-assert-renderer-assertion": "1.1.1", + "power-assert-renderer-comparison": "1.1.1", + "power-assert-renderer-diagram": "1.1.2", + "power-assert-renderer-file": "1.1.1" + } + }, + "power-assert-renderer-assertion": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.1.1.tgz", + "integrity": "sha1-y/wOd+AIao+Wrz8djme57n4ozpg=", + "requires": { + "power-assert-renderer-base": "1.1.1", + "power-assert-util-string-width": "1.1.1" + } + }, + "power-assert-renderer-base": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/power-assert-renderer-base/-/power-assert-renderer-base-1.1.1.tgz", + "integrity": "sha1-lqZQxv0F7hvB9mtUrWFELIs/Y+s=" + }, + "power-assert-renderer-comparison": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.1.1.tgz", + "integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=", + "requires": { + "core-js": "2.5.3", + "diff-match-patch": "1.0.0", + "power-assert-renderer-base": "1.1.1", + "stringifier": "1.3.0", + "type-name": "2.0.2" + } + }, + "power-assert-renderer-diagram": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.1.2.tgz", + "integrity": "sha1-ZV+PcRk1qbbVQbhjJ2VHF8Y3qYY=", + "requires": { + "core-js": "2.5.3", + "power-assert-renderer-base": "1.1.1", + "power-assert-util-string-width": "1.1.1", + "stringifier": "1.3.0" + } + }, + "power-assert-renderer-file": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/power-assert-renderer-file/-/power-assert-renderer-file-1.1.1.tgz", + "integrity": "sha1-o34rvReMys0E5427eckv40kzxec=", + "requires": { + "power-assert-renderer-base": "1.1.1" + } + }, + "power-assert-util-string-width": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/power-assert-util-string-width/-/power-assert-util-string-width-1.1.1.tgz", + "integrity": "sha1-vmWet5N/3S5smncmjar2S9W3xZI=", + "requires": { + "eastasianwidth": "0.1.1" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "dev": true + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "dev": true + }, + "prettier": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.10.1.tgz", + "integrity": "sha512-lPTx4BsvN5v9w/JXBRNlvTXCJBKrr7VW4NOl1rdX00x+YuOLqNYAOGk2x7v+4PI4hx/SyW1Z3AEg9MeB87yYcQ==", + "dev": true + }, + "pretty-ms": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-3.1.0.tgz", + "integrity": "sha1-6crJx2v27lL+lC3ZxsQhMVOxKIE=", + "dev": true, + "requires": { + "parse-ms": "1.0.1", + "plur": "2.1.2" + } + }, + "private": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + }, + "progress": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", + "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", + "dev": true + }, + "protobufjs": { + "version": "6.8.4", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.4.tgz", + "integrity": "sha512-d+WZqUDXKM+oZhr8yprAtQW07q08p9/V35AJ2J1fds+r903S/aH9P8uO1gmTwozOKugt2XCjdrre3OxuPRGkGg==", + "requires": { + "@protobufjs/aspromise": "1.1.2", + "@protobufjs/base64": "1.1.2", + "@protobufjs/codegen": "2.0.4", + "@protobufjs/eventemitter": "1.1.0", + "@protobufjs/fetch": "1.1.0", + "@protobufjs/float": "1.0.2", + "@protobufjs/inquire": "1.1.0", + "@protobufjs/path": "1.1.2", + "@protobufjs/pool": "1.1.0", + "@protobufjs/utf8": "1.1.0", + "@types/long": "3.0.32", + "@types/node": "8.5.8", + "long": "3.2.0" + } + }, + "proxyquire": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.0.0.tgz", + "integrity": "sha512-TO9TAIz0mpa+SKddXsgCFatoe/KmHvoNVj2jDMC1kXE6kKn7/4CRpxvQ+0wAK9sbMT2FVO89qItlvnZMcFbJ2Q==", + "dev": true, + "requires": { + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.1.7" + } + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" + }, + "query-string": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", + "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", + "dev": true, + "requires": { + "decode-uri-component": "0.2.0", + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" + } + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "rc": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz", + "integrity": "sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s=", + "dev": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "readdirp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.3", + "set-immediate-shim": "1.0.1" + } + }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "dev": true, + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + }, + "dependencies": { + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + } + } + }, + "regenerate": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz", + "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + }, + "regex-cache": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" + } + }, + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "requires": { + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" + } + }, + "regexpu-core": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", + "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", + "dev": true, + "requires": { + "regenerate": "1.3.3", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" + } + }, + "registry-auth-token": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz", + "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=", + "dev": true, + "requires": { + "rc": "1.2.3", + "safe-buffer": "5.1.1" + } + }, + "registry-url": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", + "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", + "dev": true, + "requires": { + "rc": "1.2.3" + } + }, + "regjsgen": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", + "dev": true + }, + "regjsparser": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", + "dev": true, + "requires": { + "jsesc": "0.5.0" + } + }, + "release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", + "dev": true, + "requires": { + "es6-error": "4.1.1" + } + }, + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "request": { + "version": "2.83.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", + "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.1", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.1", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true + }, + "require-precompiled": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/require-precompiled/-/require-precompiled-0.1.0.tgz", + "integrity": "sha1-WhtS63Dr7UPrmC6XTIWrWVceVvo=", + "dev": true + }, + "require-uncached": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", + "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", + "dev": true, + "requires": { + "caller-path": "0.1.0", + "resolve-from": "1.0.1" + }, + "dependencies": { + "resolve-from": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", + "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "dev": true + } + } + }, + "requizzle": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz", + "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", + "dev": true, + "requires": { + "underscore": "1.6.0" + }, + "dependencies": { + "underscore": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", + "dev": true + } + } + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "resolve-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "dev": true, + "requires": { + "resolve-from": "3.0.0" + } + }, + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + }, + "responselike": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "dev": true, + "requires": { + "lowercase-keys": "1.0.0" + } + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "dev": true, + "requires": { + "onetime": "2.0.1", + "signal-exit": "3.0.2" + } + }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + }, + "retry-request": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz", + "integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw==", + "requires": { + "request": "2.83.0", + "through2": "2.0.3" + } + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4" + } + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "dev": true, + "requires": { + "glob": "7.1.2" + } + }, + "run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "requires": { + "is-promise": "2.1.0" + } + }, + "rx-lite": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", + "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", + "dev": true + }, + "rx-lite-aggregates": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", + "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", + "dev": true, + "requires": { + "rx-lite": "4.0.8" + } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "requires": { + "ret": "0.1.15" + } + }, + "samsam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", + "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==", + "dev": true + }, + "sanitize-html": { + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.16.3.tgz", + "integrity": "sha512-XpAJGnkMfNM7AzXLRw225blBB/pE4dM4jzRn98g4r88cfxwN6g+5IsRmCAh/gbhYGm6u6i97zsatMOM7Lr8wyw==", + "dev": true, + "requires": { + "htmlparser2": "3.9.2", + "lodash.clonedeep": "4.5.0", + "lodash.escaperegexp": "4.1.2", + "lodash.mergewith": "4.6.0", + "postcss": "6.0.16", + "srcset": "1.0.0", + "xtend": "4.0.1" + } + }, + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + }, + "semver-diff": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", + "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", + "dev": true, + "requires": { + "semver": "5.4.1" + } + }, + "serialize-error": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz", + "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=", + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "dev": true + }, + "set-value": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", + "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "requires": { + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true + }, + "slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" + }, + "slice-ansi": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", + "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + } + } + }, + "slide": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", + "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", + "dev": true + }, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "requires": { + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.1", + "use": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "requires": { + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "requires": { + "kind-of": "3.2.2" + } + }, + "sntp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", + "requires": { + "hoek": "4.2.0" + } + }, + "sort-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", + "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", + "dev": true, + "requires": { + "is-plain-obj": "1.1.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "source-map-resolve": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", + "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", + "requires": { + "atob": "2.0.3", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" + } + }, + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "0.5.7" + } + }, + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "dev": true + }, + "split-array-stream": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz", + "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=", + "requires": { + "async": "2.6.0", + "is-stream-ended": "0.1.3" + } + }, + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "requires": { + "extend-shallow": "3.0.2" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "srcset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz", + "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=", + "dev": true, + "requires": { + "array-uniq": "1.0.3", + "number-is-nan": "1.0.1" + } + }, + "sshpk": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", + "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + } + }, + "stack-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.1.tgz", + "integrity": "sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=", + "dev": true + }, + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "requires": { + "define-property": "0.2.5", + "object-copy": "0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, + "stream-events": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz", + "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=", + "requires": { + "stubs": "3.0.0" + } + }, + "stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" + }, + "strict-uri-encode": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "dev": true + }, + "string": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz", + "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=", + "dev": true + }, + "string-format-obj": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.1.tgz", + "integrity": "sha512-Mm+sROy+pHJmx0P/0Bs1uxIX6UhGJGj6xDGQZ5zh9v/SZRmLGevp+p0VJxV7lirrkAmQ2mvva/gHKpnF/pTb+Q==" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringifier": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", + "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", + "requires": { + "core-js": "2.5.3", + "traverse": "0.6.6", + "type-name": "2.0.2" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "strip-bom-buf": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz", + "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "dev": true, + "requires": { + "get-stdin": "4.0.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "stubs": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", + "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=" + }, + "superagent": { + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz", + "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "cookiejar": "2.1.1", + "debug": "3.1.0", + "extend": "3.0.1", + "form-data": "2.3.1", + "formidable": "1.1.1", + "methods": "1.1.2", + "mime": "1.6.0", + "qs": "6.5.1", + "readable-stream": "2.3.3" + } + }, + "supertap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supertap/-/supertap-1.0.0.tgz", + "integrity": "sha512-HZJ3geIMPgVwKk2VsmO5YHqnnJYl6bV5A9JW2uzqV43WmpgliNEYbuvukfor7URpaqpxuw3CfZ3ONdVbZjCgIA==", + "dev": true, + "requires": { + "arrify": "1.0.1", + "indent-string": "3.2.0", + "js-yaml": "3.10.0", + "serialize-error": "2.1.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "supertest": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.0.0.tgz", + "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=", + "dev": true, + "requires": { + "methods": "1.1.2", + "superagent": "3.8.2" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + }, + "symbol-observable": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz", + "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=", + "dev": true + }, + "table": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", + "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "dev": true, + "requires": { + "ajv": "5.5.2", + "ajv-keywords": "2.1.1", + "chalk": "2.3.0", + "lodash": "4.17.4", + "slice-ansi": "1.0.0", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "taffydb": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz", + "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=", + "dev": true + }, + "term-size": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", + "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", + "dev": true, + "requires": { + "execa": "0.7.0" + } + }, + "text-encoding": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", + "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", + "dev": true + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + }, + "time-zone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz", + "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=", + "dev": true + }, + "timed-out": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", + "dev": true + }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2" + } + }, + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true + }, + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "requires": { + "kind-of": "3.2.2" + } + }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "requires": { + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "requires": { + "is-number": "3.0.0", + "repeat-string": "1.6.1" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + } + } + } + }, + "tough-cookie": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "requires": { + "punycode": "1.4.1" + } + }, + "traverse": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", + "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=" + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "dev": true + }, + "trim-off-newlines": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", + "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", + "dev": true + }, + "trim-right": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "dev": true + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "5.1.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2" + } + }, + "type-detect": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.5.tgz", + "integrity": "sha512-N9IvkQslUGYGC24RkJk1ba99foK6TkwC2FHAEBlQFBP0RxQZS8ZpJuAZcwiY/w9ZJHFQb1aOXBI60OdxhTrwEQ==", + "dev": true + }, + "type-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/type-name/-/type-name-2.0.2.tgz", + "integrity": "sha1-7+fUEj2KxSr/9/QMfk3sUmYAj7Q=" + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, + "optional": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, + "optional": true + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true, + "optional": true + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true, + "optional": true + }, + "uid2": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz", + "integrity": "sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I=", + "dev": true + }, + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", + "dev": true + }, + "underscore-contrib": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", + "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=", + "dev": true, + "requires": { + "underscore": "1.6.0" + }, + "dependencies": { + "underscore": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", + "dev": true + } + } + }, + "union-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", + "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "requires": { + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "set-value": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", + "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", + "requires": { + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" + } + } + } + }, + "unique-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", + "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", + "dev": true, + "requires": { + "crypto-random-string": "1.0.0" + } + }, + "unique-temp-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz", + "integrity": "sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U=", + "dev": true, + "requires": { + "mkdirp": "0.5.1", + "os-tmpdir": "1.0.2", + "uid2": "0.0.3" + } + }, + "universal-deep-strict-equal": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/universal-deep-strict-equal/-/universal-deep-strict-equal-1.2.2.tgz", + "integrity": "sha1-DaSsL3PP95JMgfpN4BjKViyisKc=", + "requires": { + "array-filter": "1.0.0", + "indexof": "0.0.1", + "object-keys": "1.0.11" + } + }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "dev": true + }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "requires": { + "has-value": "0.3.1", + "isobject": "3.0.1" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "requires": { + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "unzip-response": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", + "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=", + "dev": true + }, + "update-notifier": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz", + "integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=", + "dev": true, + "requires": { + "boxen": "1.3.0", + "chalk": "2.3.0", + "configstore": "3.1.1", + "import-lazy": "2.1.0", + "is-installed-globally": "0.1.0", + "is-npm": "1.0.0", + "latest-version": "3.1.0", + "semver-diff": "2.1.0", + "xdg-basedir": "3.0.0" + } + }, + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "dev": true, + "requires": { + "prepend-http": "1.0.4" + } + }, + "url-to-options": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", + "dev": true + }, + "urlgrey": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/urlgrey/-/urlgrey-0.4.4.tgz", + "integrity": "sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8=", + "dev": true + }, + "use": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", + "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", + "requires": { + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "uuid": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + } + }, + "well-known-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-1.0.0.tgz", + "integrity": "sha1-c8eK6Bp3Jqj6WY4ogIAcixYiVRg=", + "dev": true + }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "dev": true, + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "widest-line": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz", + "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", + "dev": true, + "requires": { + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=" + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "write": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", + "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "dev": true, + "requires": { + "mkdirp": "0.5.1" + } + }, + "write-file-atomic": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", + "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" + } + }, + "write-json-file": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz", + "integrity": "sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=", + "dev": true, + "requires": { + "detect-indent": "5.0.0", + "graceful-fs": "4.1.11", + "make-dir": "1.1.0", + "pify": "3.0.0", + "sort-keys": "2.0.0", + "write-file-atomic": "2.3.0" + }, + "dependencies": { + "detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=", + "dev": true + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "write-pkg": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz", + "integrity": "sha1-AwqZlMyZk9JbTnWp8aGSNgcpHOk=", + "dev": true, + "requires": { + "sort-keys": "2.0.0", + "write-json-file": "2.3.0" + } + }, + "xdg-basedir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", + "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=", + "dev": true + }, + "xmlcreate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz", + "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8=", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + }, + "yargs": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", + "requires": { + "camelcase": "2.1.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "string-width": "1.0.2", + "window-size": "0.1.4", + "y18n": "3.2.1" + } + } + } +} diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 75567048cf9..f4d0cd2cc15 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -32,6 +32,9 @@ "Ace Nassri ", "Alexander Fenster ", "Ali Ijaz Sheikh ", + "Antono Vasiljev ", + "Chet Husk ", + "Christoph Tavan ", "Dave Gramlich ", "David Fox ", "Dennis ", @@ -75,7 +78,7 @@ "uuid": "^3.1.0" }, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "^2.1.3", + "@google-cloud/nodejs-repo-tools": "^2.2.3", "async": "^2.6.0", "codecov": "^3.0.0", "eslint": "^4.11.0", From 31ed54fe74ad1a6c209ca8dc0f63fed55127e87d Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 20 Mar 2018 02:51:10 +1300 Subject: [PATCH 0142/1115] refactor: flow control updates (#92) --- handwritten/pubsub/package-lock.json | 9886 +++++++++++------ handwritten/pubsub/package.json | 5 +- handwritten/pubsub/src/connection-pool.js | 56 +- handwritten/pubsub/src/subscription.js | 43 +- .../src/v1/subscriber_client_config.json | 2 +- handwritten/pubsub/system-test/pubsub.js | 2 +- handwritten/pubsub/test/connection-pool.js | 179 +- handwritten/pubsub/test/subscription.js | 260 +- 8 files changed, 6688 insertions(+), 3745 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index bed2bb4da4c..0c980541488 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -57,7 +57,7 @@ "dev": true, "requires": { "@ava/babel-plugin-throws-helper": "2.0.0", - "babel-plugin-espower": "2.3.2" + "babel-plugin-espower": "2.4.0" } }, "@ava/write-file-atomic": { @@ -87,35 +87,28 @@ "requires": { "array-uniq": "1.0.3", "arrify": "1.0.1", - "concat-stream": "1.6.0", + "concat-stream": "1.6.1", "create-error-class": "3.0.2", - "duplexify": "3.5.3", + "duplexify": "3.5.4", "ent": "2.2.0", "extend": "3.0.1", - "google-auto-auth": "0.9.0", + "google-auto-auth": "0.9.7", "is": "3.2.1", "log-driver": "1.2.7", "methmeth": "1.1.0", "modelo": "4.2.3", - "request": "2.83.0", + "request": "2.85.0", "retry-request": "3.3.1", "split-array-stream": "1.0.3", "stream-events": "1.0.2", "string-format-obj": "1.1.1", "through2": "2.0.3" - }, - "dependencies": { - "log-driver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", - "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" - } } }, "@google-cloud/nodejs-repo-tools": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.2.3.tgz", - "integrity": "sha512-O6OVc8lKiLL8Qtoc1lVAynf5pJT550fHZcW33a7oQ7TMNkrTHPgeoYw4esi4KSbDRn8gV+cfefnkgqxXmr+KzA==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.2.4.tgz", + "integrity": "sha512-yHxW7JvhnqgoIftv6dAn1r/9AEcPuumD0xXggdYHmDeyf38OMYyjTk92gP9vflTOee1JhM0vOarwGrlKYUbmnQ==", "dev": true, "requires": { "ava": "0.25.0", @@ -133,115 +126,12 @@ "yargs-parser": "9.0.2" }, "dependencies": { - "ansi-escapes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", - "dev": true - }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "ava": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", - "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", - "dev": true, - "requires": { - "@ava/babel-preset-stage-4": "1.1.0", - "@ava/babel-preset-transform-test-files": "3.0.0", - "@ava/write-file-atomic": "2.2.0", - "@concordance/react": "1.0.0", - "@ladjs/time-require": "0.1.4", - "ansi-escapes": "3.0.0", - "ansi-styles": "3.2.0", - "arr-flatten": "1.1.0", - "array-union": "1.0.2", - "array-uniq": "1.0.3", - "arrify": "1.0.1", - "auto-bind": "1.1.0", - "ava-init": "0.2.1", - "babel-core": "6.26.0", - "babel-generator": "6.26.0", - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "bluebird": "3.5.1", - "caching-transform": "1.0.1", - "chalk": "2.3.0", - "chokidar": "1.7.0", - "clean-stack": "1.3.0", - "clean-yaml-object": "0.1.0", - "cli-cursor": "2.1.0", - "cli-spinners": "1.1.0", - "cli-truncate": "1.1.0", - "co-with-promise": "4.6.0", - "code-excerpt": "2.1.1", - "common-path-prefix": "1.0.0", - "concordance": "3.0.0", - "convert-source-map": "1.5.1", - "core-assert": "0.2.1", - "currently-unhandled": "0.4.1", - "debug": "3.1.0", - "dot-prop": "4.2.0", - "empower-core": "0.6.2", - "equal-length": "1.0.1", - "figures": "2.0.0", - "find-cache-dir": "1.0.0", - "fn-name": "2.0.1", - "get-port": "3.2.0", - "globby": "6.1.0", - "has-flag": "2.0.0", - "hullabaloo-config-manager": "1.1.1", - "ignore-by-default": "1.0.1", - "import-local": "0.1.1", - "indent-string": "3.2.0", - "is-ci": "1.1.0", - "is-generator-fn": "1.0.0", - "is-obj": "1.0.1", - "is-observable": "1.1.0", - "is-promise": "2.1.0", - "last-line-stream": "1.0.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.debounce": "4.0.8", - "lodash.difference": "4.5.0", - "lodash.flatten": "4.4.0", - "loud-rejection": "1.6.0", - "make-dir": "1.1.0", - "matcher": "1.0.0", - "md5-hex": "2.0.0", - "meow": "3.7.0", - "ms": "2.1.1", - "multimatch": "2.1.0", - "observable-to-promise": "0.5.0", - "option-chain": "1.0.0", - "package-hash": "2.0.0", - "pkg-conf": "2.1.0", - "plur": "2.1.2", - "pretty-ms": "3.1.0", - "require-precompiled": "0.1.0", - "resolve-cwd": "2.0.0", - "safe-buffer": "5.1.1", - "semver": "5.4.1", - "slash": "1.0.0", - "source-map-support": "0.5.4", - "stack-utils": "1.0.1", - "strip-ansi": "4.0.0", - "strip-bom-buf": "1.0.0", - "supertap": "1.0.0", - "supports-color": "5.3.0", - "trim-off-newlines": "1.0.1", - "unique-temp-dir": "1.0.0", - "update-notifier": "2.3.0" - } - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, "cliui": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", @@ -253,291 +143,1721 @@ "wrap-ansi": "2.1.0" } }, - "code-excerpt": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", - "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", - "dev": true, - "requires": { - "convert-to-spaces": "1.0.2" - } - }, - "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.1" - } - }, - "got": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/got/-/got-8.2.0.tgz", - "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", - "dev": true, - "requires": { - "@sindresorhus/is": "0.7.0", - "cacheable-request": "2.1.4", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "into-stream": "3.1.0", - "is-retry-allowed": "1.1.0", - "isurl": "1.0.0", - "lowercase-keys": "1.0.0", - "mimic-response": "1.0.0", - "p-cancelable": "0.3.0", - "p-timeout": "2.0.1", - "pify": "3.0.0", - "safe-buffer": "5.1.1", - "timed-out": "4.0.1", - "url-parse-lax": "3.0.0", - "url-to-options": "1.0.1" - } - }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "is-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", - "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", - "dev": true, - "requires": { - "symbol-observable": "1.2.0" - } - }, - "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "p-timeout": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", - "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", - "dev": true, - "requires": { - "p-finally": "1.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - }, - "proxyquire": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz", - "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", - "dev": true, - "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.1.7" - } - }, - "sinon": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.3.0.tgz", - "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", - "dev": true, - "requires": { - "@sinonjs/formatio": "2.0.0", - "diff": "3.4.0", - "lodash.get": "4.4.2", - "lolex": "2.3.1", - "nise": "1.2.0", - "supports-color": "5.3.0", - "type-detect": "4.0.5" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", - "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", - "dev": true, - "requires": { - "source-map": "0.6.1" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - }, - "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "nyc": { + "version": "11.4.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", + "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", "dev": true, "requires": { - "has-flag": "3.0.0" + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", + "md5-hex": "1.3.0", + "merge-source-map": "1.0.4", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.1.1", + "yargs": "10.0.3", + "yargs-parser": "8.0.0" }, "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "align-text": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "amdefine": { + "version": "1.0.1", + "bundled": true, "dev": true - } - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", - "dev": true - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, - "requires": { - "prepend-http": "2.0.0" - } - }, - "yargs": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", - "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", - "dev": true, - "requires": { - "cliui": "4.0.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" - } - }, - "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", - "dev": true, - "requires": { - "camelcase": "4.1.0" - } - } - } - }, - "@ladjs/time-require": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", - "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", - "dev": true, - "requires": { - "chalk": "0.4.0", - "date-time": "0.1.1", - "pretty-ms": "0.2.2", - "text-table": "0.2.0" - }, - "dependencies": { - "ansi-styles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", - "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", - "dev": true - }, - "chalk": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", - "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", - "dev": true, - "requires": { - "ansi-styles": "1.0.0", - "has-color": "0.1.7", - "strip-ansi": "0.1.1" - } - }, - "date-time": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", - "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", - "dev": true - }, - "parse-ms": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz", - "integrity": "sha1-3T+iXtbC78e93hKtm0bBY6opIk4=", - "dev": true - }, - "pretty-ms": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", - "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", - "dev": true, - "requires": { - "parse-ms": "0.1.2" - } - }, - "strip-ansi": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", - "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", - "dev": true - } - } - }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "requires": { - "call-me-maybe": "1.0.1", + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "bundled": true, + "dev": true + }, + "append-transform": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "archy": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "arrify": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "async": { + "version": "1.5.2", + "bundled": true, + "dev": true + }, + "babel-code-frame": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-generator": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" + } + }, + "babel-messages": { + "version": "6.23.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "bundled": true, + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.8", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "bundled": true, + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "builtin-modules": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "caching-transform": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" + } + }, + "camelcase": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true + }, + "center-align": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "cliui": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "commondir": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "convert-source-map": { + "version": "1.5.1", + "bundled": true, + "dev": true + }, + "core-js": { + "version": "2.5.3", + "bundled": true, + "dev": true + }, + "cross-spawn": { + "version": "4.0.2", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "debug-log": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "default-require-extensions": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "strip-bom": "2.0.0" + } + }, + "detect-indent": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "error-ex": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "esutils": { + "version": "2.0.2", + "bundled": true, + "dev": true + }, + "execa": { + "version": "0.7.0", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } + } + }, + "expand-brackets": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "bundled": true, + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "extglob": { + "version": "0.3.2", + "bundled": true, + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "filename-regex": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "bundled": true, + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "find-cache-dir": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "requires": { + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "for-in": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "for-own": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreground-child": { + "version": "1.5.6", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "get-stream": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "bundled": true, + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "globals": { + "version": "9.18.0", + "bundled": true, + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true, + "dev": true + }, + "handlebars": { + "version": "4.0.11", + "bundled": true, + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "has-ansi": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-flag": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "hosted-git-info": { + "version": "2.5.0", + "bundled": true, + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "bundled": true, + "dev": true + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "invariant": { + "version": "2.2.2", + "bundled": true, + "dev": true, + "requires": { + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "is-buffer": { + "version": "1.1.6", + "bundled": true, + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-dotfile": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-finite": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-glob": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-number": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-posix-bracket": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "isobject": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "isarray": "1.0.0" + } + }, + "istanbul-lib-coverage": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "append-transform": "0.4.0" + } + }, + "istanbul-lib-instrument": { + "version": "1.9.1", + "bundled": true, + "dev": true, + "requires": { + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" + } + }, + "istanbul-lib-report": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" + }, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "bundled": true, + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "1.2.2", + "bundled": true, + "dev": true, + "requires": { + "debug": "3.1.0", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "istanbul-reports": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "handlebars": "4.0.11" + } + }, + "js-tokens": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "jsesc": { + "version": "1.3.0", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + }, + "lazy-cache": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "invert-kv": "1.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + } + } + }, + "lodash": { + "version": "4.17.4", + "bundled": true, + "dev": true + }, + "longest": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "lru-cache": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "md5-hex": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "md5-o-matic": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "mem": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "merge-source-map": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "requires": { + "source-map": "0.5.7" + } + }, + "micromatch": { + "version": "2.3.11", + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + }, + "mimic-fn": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "normalize-package-data": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } + }, + "npm-run-path": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "path-key": "2.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "optimist": { + "version": "0.6.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8", + "wordwrap": "0.0.3" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "p-finally": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "p-limit": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "p-locate": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-limit": "1.1.0" + } + }, + "parse-glob": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "bundled": true, + "dev": true, + "requires": { + "error-ex": "1.3.1" + } + }, + "path-exists": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "path-key": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "path-type": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "bundled": true, + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "bundled": true, + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "pkg-dir": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "find-up": "1.1.2" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } + } + }, + "preserve": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "read-pkg": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "bundled": true, + "dev": true + }, + "regex-cache": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" + } + }, + "remove-trailing-separator": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "bundled": true, + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "bundled": true, + "dev": true + }, + "repeating": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "require-directory": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "resolve-from": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "right-align": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "dev": true, + "requires": { + "glob": "7.1.2" + } + }, + "semver": { + "version": "5.4.1", + "bundled": true, + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "slide": { + "version": "1.1.6", + "bundled": true, + "dev": true + }, + "source-map": { + "version": "0.5.7", + "bundled": true, + "dev": true + }, + "spawn-wrap": { + "version": "1.4.2", + "bundled": true, + "dev": true, + "requires": { + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" + } + }, + "spdx-correct": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "bundled": true, + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "bundled": true, + "dev": true + }, + "string-width": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "test-exclude": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "requires": { + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" + } + }, + "to-fast-properties": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "trim-right": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "yargs": { + "version": "3.10.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "which": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "window-size": { + "version": "0.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "wordwrap": { + "version": "0.0.3", + "bundled": true, + "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "write-file-atomic": { + "version": "1.3.4", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" + } + }, + "y18n": { + "version": "3.2.1", + "bundled": true, + "dev": true + }, + "yallist": { + "version": "2.1.2", + "bundled": true, + "dev": true + }, + "yargs": { + "version": "10.0.3", + "bundled": true, + "dev": true, + "requires": { + "cliui": "3.2.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "8.0.0" + }, + "dependencies": { + "cliui": { + "version": "3.2.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + } + } + }, + "yargs-parser": { + "version": "8.0.0", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "4.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "bundled": true, + "dev": true + } + } + } + } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "proxyquire": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz", + "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", + "dev": true, + "requires": { + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.1.7" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "yargs": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "dev": true, + "requires": { + "cliui": "4.0.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + } + } + } + }, + "@ladjs/time-require": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", + "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", + "dev": true, + "requires": { + "chalk": "0.4.0", + "date-time": "0.1.1", + "pretty-ms": "0.2.2", + "text-table": "0.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", + "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", + "dev": true + }, + "chalk": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", + "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", + "dev": true, + "requires": { + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" + } + }, + "pretty-ms": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", + "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", + "dev": true, + "requires": { + "parse-ms": "0.1.2" + } + }, + "strip-ansi": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", + "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", + "dev": true + } + } + }, + "@mrmlnc/readdir-enhanced": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", + "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", + "requires": { + "call-me-maybe": "1.0.1", "glob-to-regexp": "0.3.0" } }, @@ -616,15 +1936,14 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "8.5.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.8.tgz", - "integrity": "sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg==" + "version": "8.9.5", + "resolved": "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", + "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==" }, "acorn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz", - "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==", - "dev": true + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" }, "acorn-es7-plugin": { "version": "1.1.7", @@ -654,7 +1973,7 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { "co": "4.6.0", - "fast-deep-equal": "1.0.0", + "fast-deep-equal": "1.1.0", "fast-json-stable-stringify": "2.0.0", "json-schema-traverse": "0.3.1" } @@ -674,6 +1993,17 @@ "kind-of": "3.2.2", "longest": "1.0.1", "repeat-string": "1.6.1" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } } }, "amdefine": { @@ -724,15 +2054,21 @@ } } }, + "ansi-escapes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", + "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "dev": true + }, "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { "color-convert": "1.9.1" @@ -746,12 +2082,103 @@ "requires": { "micromatch": "2.3.11", "normalize-path": "2.1.1" + }, + "dependencies": { + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + } } }, "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { "sprintf-js": "1.0.3" @@ -764,13 +2191,9 @@ "dev": true }, "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, "arr-exclude": { "version": "1.0.0", @@ -825,10 +2248,9 @@ "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" }, "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "arrify": { "version": "1.0.1", @@ -864,7 +2286,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "requires": { - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "async-each": { @@ -883,11 +2305,153 @@ "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=" }, "auto-bind": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz", - "integrity": "sha1-k7hk3H7gGjJigXddXHXKCnUeWWE=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz", + "integrity": "sha512-Zw7pZp7tztvKnWWtoII4AmqH5a2PV3ZN5F0BPRTGcc1kpRm4b6QXQnPU7Znbl6BfPfqOVOV29g4JeMqZQaqqOA==", "dev": true }, + "ava": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", + "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", + "dev": true, + "requires": { + "@ava/babel-preset-stage-4": "1.1.0", + "@ava/babel-preset-transform-test-files": "3.0.0", + "@ava/write-file-atomic": "2.2.0", + "@concordance/react": "1.0.0", + "@ladjs/time-require": "0.1.4", + "ansi-escapes": "3.0.0", + "ansi-styles": "3.2.1", + "arr-flatten": "1.1.0", + "array-union": "1.0.2", + "array-uniq": "1.0.3", + "arrify": "1.0.1", + "auto-bind": "1.2.0", + "ava-init": "0.2.1", + "babel-core": "6.26.0", + "babel-generator": "6.26.1", + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "bluebird": "3.5.1", + "caching-transform": "1.0.1", + "chalk": "2.3.2", + "chokidar": "1.7.0", + "clean-stack": "1.3.0", + "clean-yaml-object": "0.1.0", + "cli-cursor": "2.1.0", + "cli-spinners": "1.1.0", + "cli-truncate": "1.1.0", + "co-with-promise": "4.6.0", + "code-excerpt": "2.1.1", + "common-path-prefix": "1.0.0", + "concordance": "3.0.0", + "convert-source-map": "1.5.1", + "core-assert": "0.2.1", + "currently-unhandled": "0.4.1", + "debug": "3.1.0", + "dot-prop": "4.2.0", + "empower-core": "0.6.2", + "equal-length": "1.0.1", + "figures": "2.0.0", + "find-cache-dir": "1.0.0", + "fn-name": "2.0.1", + "get-port": "3.2.0", + "globby": "6.1.0", + "has-flag": "2.0.0", + "hullabaloo-config-manager": "1.1.1", + "ignore-by-default": "1.0.1", + "import-local": "0.1.1", + "indent-string": "3.2.0", + "is-ci": "1.1.0", + "is-generator-fn": "1.0.0", + "is-obj": "1.0.1", + "is-observable": "1.1.0", + "is-promise": "2.1.0", + "last-line-stream": "1.0.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.debounce": "4.0.8", + "lodash.difference": "4.5.0", + "lodash.flatten": "4.4.0", + "loud-rejection": "1.6.0", + "make-dir": "1.2.0", + "matcher": "1.1.0", + "md5-hex": "2.0.0", + "meow": "3.7.0", + "ms": "2.0.0", + "multimatch": "2.1.0", + "observable-to-promise": "0.5.0", + "option-chain": "1.0.0", + "package-hash": "2.0.0", + "pkg-conf": "2.1.0", + "plur": "2.1.2", + "pretty-ms": "3.1.0", + "require-precompiled": "0.1.0", + "resolve-cwd": "2.0.0", + "safe-buffer": "5.1.1", + "semver": "5.5.0", + "slash": "1.0.0", + "source-map-support": "0.5.4", + "stack-utils": "1.0.1", + "strip-ansi": "4.0.0", + "strip-bom-buf": "1.0.0", + "supertap": "1.0.0", + "supports-color": "5.3.0", + "trim-off-newlines": "1.0.1", + "unique-temp-dir": "1.0.0", + "update-notifier": "2.3.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, "ava-init": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/ava-init/-/ava-init-0.2.1.tgz", @@ -911,6 +2475,15 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" }, + "axios": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", + "requires": { + "follow-redirects": "1.4.1", + "is-buffer": "1.1.6" + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -956,7 +2529,7 @@ "dev": true, "requires": { "babel-code-frame": "6.26.0", - "babel-generator": "6.26.0", + "babel-generator": "6.26.1", "babel-helpers": "6.24.1", "babel-messages": "6.23.0", "babel-register": "6.26.0", @@ -968,7 +2541,7 @@ "convert-source-map": "1.5.1", "debug": "2.6.9", "json5": "0.5.1", - "lodash": "4.17.4", + "lodash": "4.17.5", "minimatch": "3.0.4", "path-is-absolute": "1.0.1", "private": "0.1.8", @@ -984,19 +2557,13 @@ "requires": { "ms": "2.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, "babel-generator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", - "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { "babel-messages": "6.23.0", @@ -1004,7 +2571,7 @@ "babel-types": "6.26.0", "detect-indent": "4.0.0", "jsesc": "1.3.0", - "lodash": "4.17.4", + "lodash": "4.17.5", "source-map": "0.5.7", "trim-right": "1.0.1" }, @@ -1092,7 +2659,7 @@ "requires": { "babel-runtime": "6.26.0", "babel-types": "6.26.0", - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "babel-helper-remap-async-to-generator": { @@ -1137,12 +2704,12 @@ } }, "babel-plugin-espower": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.3.2.tgz", - "integrity": "sha1-VRa4/NsmyfDh2BYHSfbkxl5xJx4=", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.4.0.tgz", + "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", "dev": true, "requires": { - "babel-generator": "6.26.0", + "babel-generator": "6.26.1", "babylon": "6.18.0", "call-matcher": "1.0.1", "core-js": "2.5.3", @@ -1294,9 +2861,20 @@ "babel-runtime": "6.26.0", "core-js": "2.5.3", "home-or-tmp": "2.0.0", - "lodash": "4.17.4", + "lodash": "4.17.5", "mkdirp": "0.5.1", "source-map-support": "0.4.18" + }, + "dependencies": { + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "0.5.7" + } + } } }, "babel-runtime": { @@ -1319,7 +2897,7 @@ "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", - "lodash": "4.17.4" + "lodash": "4.17.5" } }, "babel-traverse": { @@ -1335,8 +2913,8 @@ "babylon": "6.18.0", "debug": "2.6.9", "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "invariant": "2.2.4", + "lodash": "4.17.5" }, "dependencies": { "debug": { @@ -1347,12 +2925,6 @@ "requires": { "ms": "2.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, @@ -1364,7 +2936,7 @@ "requires": { "babel-runtime": "6.26.0", "esutils": "2.0.2", - "lodash": "4.17.4", + "lodash": "4.17.5", "to-fast-properties": "1.0.3" } }, @@ -1400,11 +2972,6 @@ "requires": { "is-descriptor": "1.0.2" } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -1439,7 +3006,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", "requires": { - "hoek": "4.2.0" + "hoek": "4.2.1" } }, "boxen": { @@ -1450,7 +3017,7 @@ "requires": { "ansi-align": "2.0.0", "camelcase": "4.1.0", - "chalk": "2.3.0", + "chalk": "2.3.2", "cli-boxes": "1.0.0", "string-width": "2.1.1", "term-size": "1.2.0", @@ -1497,25 +3064,57 @@ } }, "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", + "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "define-property": "1.0.0", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "kind-of": "6.0.2", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } } }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, "buf-compare": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", @@ -1539,6 +3138,13 @@ "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", "requires": { "long": "3.2.0" + }, + "dependencies": { + "long": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", + "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" + } } }, "cache-base": { @@ -1555,13 +3161,6 @@ "to-object-path": "0.3.0", "union-value": "1.0.0", "unset-value": "1.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "cacheable-request": { @@ -1695,14 +3294,14 @@ } }, "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", + "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", "dev": true, "requires": { - "ansi-styles": "3.2.0", + "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" + "supports-color": "5.3.0" } }, "chardet": { @@ -1726,12 +3325,38 @@ "is-glob": "2.0.1", "path-is-absolute": "1.0.1", "readdirp": "2.1.0" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } } }, "ci-info": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz", - "integrity": "sha512-uTGIPNx/nSpBdsF6xnseRXLLtfr9VLqkz8ZqHXr3Y7b6SftyRxBGjwMtJj1OhNbmlc1wZzLNAlAcvyIiE8a6ZA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", + "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", "dev": true }, "circular-json": { @@ -1805,11 +3430,6 @@ "kind-of": "5.1.0" } }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, "kind-of": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", @@ -1930,23 +3550,15 @@ "dev": true, "requires": { "pinkie-promise": "1.0.0" - }, - "dependencies": { - "pinkie": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", - "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=", - "dev": true - }, - "pinkie-promise": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", - "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", - "dev": true, - "requires": { - "pinkie": "1.0.0" - } - } + } + }, + "code-excerpt": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", + "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", + "dev": true, + "requires": { + "convert-to-spaces": "1.0.2" } }, "code-point-at": { @@ -2012,8 +3624,8 @@ "dev": true, "requires": { "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" + "combined-stream": "1.0.6", + "mime-types": "2.1.18" } }, "har-schema": { @@ -2058,7 +3670,7 @@ "requires": { "assert-plus": "0.2.0", "jsprim": "1.4.1", - "sshpk": "1.13.1" + "sshpk": "1.14.1" } }, "performance-now": { @@ -2082,7 +3694,7 @@ "aws-sign2": "0.6.0", "aws4": "1.6.0", "caseless": "0.12.0", - "combined-stream": "1.0.5", + "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", "form-data": "2.1.4", @@ -2092,15 +3704,15 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "oauth-sign": "0.8.2", "performance-now": "0.2.0", "qs": "6.4.0", "safe-buffer": "5.1.1", "stringstream": "0.0.5", - "tough-cookie": "2.3.3", + "tough-cookie": "2.3.4", "tunnel-agent": "0.6.0", - "uuid": "3.1.0" + "uuid": "3.2.1" } }, "sntp": { @@ -2150,9 +3762,9 @@ "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" }, "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { "delayed-stream": "1.0.0" } @@ -2186,12 +3798,12 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz", + "integrity": "sha512-gslSSJx03QKa59cIKqeJO9HQ/WZMotvYJCuaUULrLpjj8oG40kV2Z+gz82pVxlTkOADi4PJxQPPfhl1ELYrrXw==", "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.3", + "readable-stream": "2.3.5", "typedarray": "0.0.6" } }, @@ -2208,10 +3820,21 @@ "js-string-escape": "1.0.1", "lodash.clonedeep": "4.5.0", "lodash.flattendeep": "4.4.0", - "lodash.merge": "4.6.0", + "lodash.merge": "4.6.1", "md5-hex": "2.0.0", - "semver": "5.4.1", + "semver": "5.5.0", "well-known-symbols": "1.0.0" + }, + "dependencies": { + "date-time": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", + "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", + "dev": true, + "requires": { + "time-zone": "1.0.0" + } + } } }, "configstore": { @@ -2222,7 +3845,7 @@ "requires": { "dot-prop": "4.2.0", "graceful-fs": "4.1.11", - "make-dir": "1.1.0", + "make-dir": "1.2.0", "unique-string": "1.0.0", "write-file-atomic": "2.3.0", "xdg-basedir": "3.0.0" @@ -2285,7 +3908,7 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.1", + "lru-cache": "4.1.2", "shebang-command": "1.2.0", "which": "1.3.0" } @@ -2303,7 +3926,7 @@ "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", "requires": { - "hoek": "4.2.0" + "hoek": "4.2.1" } } } @@ -2329,7 +3952,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.37" + "es5-ext": "0.10.41" } }, "dashdash": { @@ -2341,29 +3964,17 @@ } }, "date-time": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", - "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", - "dev": true, - "requires": { - "time-zone": "1.0.0" - } + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", + "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", + "dev": true }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, "requires": { "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } } }, "decamelize": { @@ -2419,13 +4030,6 @@ "requires": { "is-descriptor": "1.0.2", "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "del": { @@ -2456,9 +4060,38 @@ "pify": "2.3.0", "pinkie-promise": "2.0.1" } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } } } }, + "delay": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", + "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", + "requires": { + "p-defer": "1.0.0" + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2474,9 +4107,9 @@ } }, "diff": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, "diff-match-patch": { @@ -2491,21 +4124,6 @@ "requires": { "arrify": "1.0.1", "path-type": "3.0.0" - }, - "dependencies": { - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "requires": { - "pify": "3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } } }, "doctrine": { @@ -2551,9 +4169,9 @@ } }, "domutils": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz", - "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { "dom-serializer": "0.1.0", @@ -2576,13 +4194,13 @@ "dev": true }, "duplexify": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", - "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", + "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", - "readable-stream": "2.3.3", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" } }, @@ -2671,13 +4289,14 @@ } }, "es5-ext": { - "version": "0.10.37", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz", - "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=", + "version": "0.10.41", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.41.tgz", + "integrity": "sha512-MYK02wXfwTMie5TEJWPolgOsXEmz7wKCQaGzgmRjZOoV6VLG8I5dSv2bn6AOClXhK64gnSQTQ9W9MKvx87J4gw==", "dev": true, "requires": { "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" } }, "es6-error": { @@ -2693,7 +4312,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.37", + "es5-ext": "0.10.41", "es6-symbol": "3.1.1" } }, @@ -2704,7 +4323,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.37", + "es5-ext": "0.10.41", "es6-iterator": "2.0.3", "es6-set": "0.1.5", "es6-symbol": "3.1.1", @@ -2718,7 +4337,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.37", + "es5-ext": "0.10.41", "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" @@ -2731,7 +4350,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.37" + "es5-ext": "0.10.41" } }, "es6-weak-map": { @@ -2741,7 +4360,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.37", + "es5-ext": "0.10.41", "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } @@ -2771,16 +4390,16 @@ "dev": true }, "escodegen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", - "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", + "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", "dev": true, "requires": { "esprima": "3.1.3", "estraverse": "4.2.0", "esutils": "2.0.2", "optionator": "0.8.2", - "source-map": "0.5.7" + "source-map": "0.6.1" }, "dependencies": { "esprima": { @@ -2788,6 +4407,13 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true } } }, @@ -2799,40 +4425,40 @@ "requires": { "es6-map": "0.1.5", "es6-weak-map": "2.0.2", - "esrecurse": "4.2.0", + "esrecurse": "4.2.1", "estraverse": "4.2.0" } }, "eslint": { - "version": "4.15.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz", - "integrity": "sha512-zEO/Z1ZUxIQ+MhDVKkVTUYpIPDTEJLXGMrkID+5v1NeQHtCz6FZikWuFRgxE1Q/RV2V4zVl1u3xmpPADHhMZ6A==", + "version": "4.19.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.0.tgz", + "integrity": "sha512-r83L5CuqaocDvfwdojbz68b6tCUk8KJkqfppO+gmSAQqYCzTr0bCSMu6A6yFCLKG65j5eKcKUw4Cw4Yl4gfWkg==", "dev": true, "requires": { "ajv": "5.5.2", "babel-code-frame": "6.26.0", - "chalk": "2.3.0", - "concat-stream": "1.6.0", + "chalk": "2.3.2", + "concat-stream": "1.6.1", "cross-spawn": "5.1.0", "debug": "3.1.0", "doctrine": "2.1.0", "eslint-scope": "3.7.1", "eslint-visitor-keys": "1.0.0", - "espree": "3.5.2", + "espree": "3.5.4", "esquery": "1.0.0", "esutils": "2.0.2", "file-entry-cache": "2.0.0", "functional-red-black-tree": "1.0.1", "glob": "7.1.2", - "globals": "11.1.0", + "globals": "11.3.0", "ignore": "3.3.7", "imurmurhash": "0.1.4", "inquirer": "3.3.0", - "is-resolvable": "1.0.1", - "js-yaml": "3.10.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.11.0", "json-stable-stringify-without-jsonify": "1.0.1", "levn": "0.3.0", - "lodash": "4.17.4", + "lodash": "4.17.5", "minimatch": "3.0.4", "mkdirp": "0.5.1", "natural-compare": "1.4.0", @@ -2840,8 +4466,9 @@ "path-is-inside": "1.0.2", "pluralize": "7.0.0", "progress": "2.0.0", + "regexpp": "1.0.1", "require-uncached": "1.0.3", - "semver": "5.4.1", + "semver": "5.5.0", "strip-ansi": "4.0.0", "strip-json-comments": "2.0.1", "table": "4.0.2", @@ -2855,9 +4482,9 @@ "dev": true }, "globals": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz", - "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz", + "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==", "dev": true }, "strip-ansi": { @@ -2897,7 +4524,7 @@ "ignore": "3.3.7", "minimatch": "3.0.4", "resolve": "1.5.0", - "semver": "5.4.1" + "semver": "5.5.0" }, "dependencies": { "resolve": { @@ -2912,9 +4539,9 @@ } }, "eslint-plugin-prettier": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.4.0.tgz", - "integrity": "sha512-P0EohHM1MwL36GX5l1TOEYyt/5d7hcxrX3CqCjibTN3dH7VCAy2kjsC/WB6dUHnpB4mFkZq1Ndfh2DYQ2QMEGQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz", + "integrity": "sha512-floiaI4F7hRkTrFe8V2ItOK97QYrX75DjmdzmVITZoAP6Cn06oEDPQRsO6MlHEP/u2SxI3xQ52Kpjw6j5WGfeQ==", "dev": true, "requires": { "fast-diff": "1.1.2", @@ -2927,7 +4554,7 @@ "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", "dev": true, "requires": { - "esrecurse": "4.2.0", + "esrecurse": "4.2.1", "estraverse": "4.2.0" } }, @@ -2945,7 +4572,7 @@ "requires": { "array-find": "1.0.0", "escallmatch": "1.5.0", - "escodegen": "1.9.0", + "escodegen": "1.9.1", "escope": "3.6.0", "espower-location-detector": "1.0.0", "espurify": "1.7.0", @@ -2966,6 +4593,17 @@ "minimatch": "3.0.4", "source-map-support": "0.4.18", "xtend": "4.0.1" + }, + "dependencies": { + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "0.5.7" + } + } } }, "espower-location-detector": { @@ -2986,27 +4624,43 @@ "integrity": "sha1-fgBSVa5HtcE2RIZEs/PYAtUD91I=", "dev": true, "requires": { - "acorn": "5.3.0", + "acorn": "5.5.3", "acorn-es7-plugin": "1.1.7", "convert-source-map": "1.5.1", "empower-assert": "1.0.1", - "escodegen": "1.9.0", + "escodegen": "1.9.1", "espower": "2.1.0", "estraverse": "4.2.0", "merge-estraverse-visitors": "1.0.0", "multi-stage-sourcemap": "0.2.1", "path-is-absolute": "1.0.1", "xtend": "4.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", + "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", + "dev": true + } } }, "espree": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz", - "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", "dev": true, "requires": { - "acorn": "5.3.0", + "acorn": "5.5.3", "acorn-jsx": "3.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", + "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", + "dev": true + } } }, "esprima": { @@ -3033,13 +4687,12 @@ } }, "esrecurse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", - "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "4.2.0", - "object-assign": "4.1.1" + "estraverse": "4.2.0" } }, "estraverse": { @@ -3060,161 +4713,38 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.37" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "2.2.3" - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "2.0.4" - } - } - } - }, - "external-editor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz", - "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==", - "dev": true, - "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.19", - "tmp": "0.0.33" + "es5-ext": "0.10.41" } }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" - }, - "fast-diff": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", - "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", - "dev": true - }, - "fast-glob": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.0.tgz", - "integrity": "sha512-4F75PTznkNtSKs2pbhtBwRkw8sRwa7LfXx5XaQJOe4IQ6yTjceLDTwM5gj1s80R2t/5WeDC1gVfm3jLE+l39Tw==", - "requires": { - "@mrmlnc/readdir-enhanced": "2.2.1", - "glob-parent": "3.1.0", - "is-glob": "4.0.0", - "merge2": "1.2.1", - "micromatch": "3.1.9" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "braces": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", - "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "define-property": "1.0.0", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "kind-of": "6.0.2", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -3223,124 +4753,20 @@ "ms": "2.0.0" } }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } + "is-descriptor": "0.1.6" } }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "2.1.1" - } - } + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -3379,74 +4805,170 @@ } } }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, + "requires": { + "fill-range": "2.2.3" + }, + "dependencies": { + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, "requires": { "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } } }, "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, + "external-editor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz", + "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==", + "dev": true, + "requires": { + "chardet": "0.4.2", + "iconv-lite": "0.4.19", + "tmp": "0.0.33" + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } }, - "micromatch": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz", - "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==", + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.1", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "is-extendable": "0.1.1" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", + "dev": true + }, + "fast-glob": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.0.tgz", + "integrity": "sha512-4F75PTznkNtSKs2pbhtBwRkw8sRwa7LfXx5XaQJOe4IQ6yTjceLDTwM5gj1s80R2t/5WeDC1gVfm3jLE+l39Tw==", + "requires": { + "@mrmlnc/readdir-enhanced": "2.2.1", + "glob-parent": "3.1.0", + "is-glob": "4.0.0", + "merge2": "1.2.1", + "micromatch": "3.1.9" + } + }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", @@ -3494,16 +5016,24 @@ } }, "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", - "dev": true, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } } }, "find-cache-dir": { @@ -3513,7 +5043,7 @@ "dev": true, "requires": { "commondir": "1.0.1", - "make-dir": "1.1.0", + "make-dir": "1.2.0", "pkg-dir": "2.0.0" } }, @@ -3544,6 +5074,14 @@ "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", "dev": true }, + "follow-redirects": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz", + "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", + "requires": { + "debug": "3.1.0" + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -3569,28 +5107,19 @@ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", - "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "formatio": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", - "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", - "dev": true, - "requires": { - "samsam": "1.3.0" + "combined-stream": "1.0.6", + "mime-types": "2.1.18" } }, "formidable": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz", - "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.0.tgz", + "integrity": "sha512-hr9aT30rAi7kf8Q2aaTpSP7xGMhlJ+MdrUDVZs3rxbD3L/K46A86s2VY7qC2D2kGYGBtiT/3j6wTx1eeUq5xAQ==", "dev": true }, "fragment-cache": { @@ -3608,7 +5137,18 @@ "dev": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.3" + "readable-stream": "2.3.5" + } + }, + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" } }, "fs.realpath": { @@ -3623,7 +5163,7 @@ "dev": true, "optional": true, "requires": { - "nan": "2.8.0", + "nan": "2.10.0", "node-pre-gyp": "0.6.39" }, "dependencies": { @@ -4533,12 +6073,13 @@ "dev": true }, "gcp-metadata": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.3.1.tgz", - "integrity": "sha512-5kJPX/RXuqoLmHiOOgkSDk/LI0QaXpEvZ3pvQP4ifjGGDKZKVSOjL/GcDjXA5kLxppFCOjmmsu0Uoop9d1upaQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", + "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", "requires": { + "axios": "0.18.0", "extend": "3.0.1", - "retry-request": "3.3.1" + "retry-axios": "0.3.2" } }, "get-caller-file": { @@ -4599,15 +6140,51 @@ "requires": { "glob-parent": "2.0.0", "is-glob": "2.0.1" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } } }, "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "2.0.1" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "2.1.1" + } + } } }, "glob-to-regexp": { @@ -4631,868 +6208,889 @@ "dev": true }, "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", + "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "requires": { "array-union": "1.0.2", + "dir-glob": "2.0.0", + "fast-glob": "2.2.0", "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "ignore": "3.3.7", + "pify": "3.0.0", + "slash": "1.0.0" } }, "google-auth-library": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.12.0.tgz", - "integrity": "sha512-79qCXtJ1VweBmmLr4yLq9S4clZB2p5Y+iACvuKk9gu4JitEnPc+bQFmYvtCYehVR44MQzD1J8DVmYW2w677IEw==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.3.2.tgz", + "integrity": "sha512-aRz0om4Bs85uyR2Ousk3Gb8Nffx2Sr2RoKts1smg1MhRwrehE1aD1HC4RmprNt1HVJ88IDnQ8biJQ/aXjiIxlQ==", "requires": { - "gtoken": "1.2.3", + "axios": "0.18.0", + "gcp-metadata": "0.6.3", + "gtoken": "2.2.0", "jws": "3.1.4", "lodash.isstring": "4.0.1", - "lodash.merge": "4.6.0", - "request": "2.83.0" + "lru-cache": "4.1.2", + "retry-axios": "0.3.2" } }, "google-auto-auth": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.0.tgz", - "integrity": "sha512-iz/nqV/G09d6nOVomlfW8QBRI2TiL8Q6qU1E6nD3HJvuXF5L3/Od8dJI+MSLM8lknZ9Mm53JgZ5lP13XC2uiiw==", + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.7.tgz", + "integrity": "sha512-Nro7aIFrL2NP0G7PoGrJqXGMZj8AjdBOcbZXRRm/8T3w08NUHIiNN3dxpuUYzDsZizslH+c8e+7HXL8vh3JXTQ==", "requires": { "async": "2.6.0", - "gcp-metadata": "0.3.1", - "google-auth-library": "0.12.0", - "request": "2.83.0" + "gcp-metadata": "0.6.3", + "google-auth-library": "1.3.2", + "request": "2.85.0" } }, "google-gax": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.15.0.tgz", - "integrity": "sha512-a+WBi3oiV3jQ0eLCIM0GAFe8vYQ10yYuXRnjhEEXFKSNd8nW6XSQ7YWqMLIod2Xnyu6JiSSymMBwCr5YSwQyRQ==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.0.tgz", + "integrity": "sha512-sslPB7USGD8SrVUGlWFIGYVZrgZ6oj+fWUEW3f8Bk43+nxqeLyrNoI3iFBRpjLfwMCEYaXVziWNmatwLRP8azg==", "requires": { + "duplexify": "3.5.4", "extend": "3.0.1", "globby": "8.0.1", - "google-auto-auth": "0.9.0", + "google-auto-auth": "0.9.7", "google-proto-files": "0.15.1", "grpc": "1.9.1", "is-stream-ended": "0.1.3", - "lodash": "4.17.4", - "protobufjs": "6.8.4", - "readable-stream": "2.3.3", + "lodash": "4.17.5", + "protobufjs": "6.8.6", "through2": "2.0.3" + } + }, + "google-p12-pem": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", + "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", + "requires": { + "node-forge": "0.7.4", + "pify": "3.0.0" + } + }, + "google-proto-files": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", + "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", + "requires": { + "globby": "7.1.1", + "power-assert": "1.4.4", + "protobufjs": "6.8.6" }, "dependencies": { "globby": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", - "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", + "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", + "requires": { + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "glob": "7.1.2", + "ignore": "3.3.7", + "pify": "3.0.0", + "slash": "1.0.0" + } + } + } + }, + "got": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/got/-/got-8.2.0.tgz", + "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", + "dev": true, + "requires": { + "@sindresorhus/is": "0.7.0", + "cacheable-request": "2.1.4", + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "into-stream": "3.1.0", + "is-retry-allowed": "1.1.0", + "isurl": "1.0.0", + "lowercase-keys": "1.0.0", + "mimic-response": "1.0.0", + "p-cancelable": "0.3.0", + "p-timeout": "2.0.1", + "pify": "3.0.0", + "safe-buffer": "5.1.1", + "timed-out": "4.0.1", + "url-parse-lax": "3.0.0", + "url-to-options": "1.0.1" + }, + "dependencies": { + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "dev": true, + "requires": { + "prepend-http": "2.0.0" + } + } + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "growl": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", + "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", + "dev": true + }, + "grpc": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.9.1.tgz", + "integrity": "sha512-WNW3MWMuAoo63AwIlzFE3T0KzzvNBSvOkg67Hm8WhvHNkXFBlIk1QyJRE3Ocm0O5eIwS7JU8Ssota53QR1zllg==", + "requires": { + "lodash": "4.17.5", + "nan": "2.10.0", + "node-pre-gyp": "0.6.39", + "protobufjs": "5.0.2" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "ajv": { + "version": "4.11.8", + "bundled": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.3" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true + }, + "assert-plus": { + "version": "0.2.0", + "bundled": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true + }, + "aws-sign2": { + "version": "0.6.0", + "bundled": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.8", + "bundled": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "caseless": { + "version": "0.12.0", + "bundled": true + }, + "co": { + "version": "4.6.0", + "bundled": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "combined-stream": { + "version": "1.0.5", + "bundled": true, "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "fast-glob": "2.2.0", - "glob": "7.1.2", - "ignore": "3.3.7", - "pify": "3.0.0", - "slash": "1.0.0" + "delayed-stream": "1.0.0" } }, - "grpc": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.9.1.tgz", - "integrity": "sha512-WNW3MWMuAoo63AwIlzFE3T0KzzvNBSvOkg67Hm8WhvHNkXFBlIk1QyJRE3Ocm0O5eIwS7JU8Ssota53QR1zllg==", + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "cryptiles": { + "version": "2.0.5", + "bundled": true, "requires": { - "lodash": "4.17.4", - "nan": "2.8.0", - "node-pre-gyp": "0.6.39", - "protobufjs": "5.0.2" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.3" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.8", - "bundled": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "caseless": { - "version": "0.12.0", - "bundled": true - }, - "co": { - "version": "4.6.0", - "bundled": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true - }, - "extsprintf": { - "version": "1.3.0", - "bundled": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "ini": { - "version": "1.3.5", - "bundled": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true - }, - "isarray": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { "version": "1.0.0", "bundled": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true - }, - "jsprim": { - "version": "1.4.1", - "bundled": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "mime-db": { - "version": "1.30.0", - "bundled": true - }, - "mime-types": { - "version": "2.1.17", - "bundled": true, - "requires": { - "mime-db": "1.30.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true - }, - "node-pre-gyp": { - "version": "0.6.39", - "bundled": true, - "requires": { - "detect-libc": "1.0.3", - "hawk": "3.1.3", - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.2", - "rc": "1.2.4", - "request": "2.81.0", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "2.2.1", - "tar-pack": "3.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true - }, - "protobufjs": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", - "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=", - "requires": { - "ascli": "1.0.1", - "bytebuffer": "5.0.1", - "glob": "7.1.2", - "yargs": "3.32.0" - } - }, - "punycode": { - "version": "1.4.1", - "bundled": true - }, - "qs": { - "version": "6.4.0", - "bundled": true - }, - "rc": { - "version": "1.2.4", - "bundled": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true - } - } - }, - "readable-stream": { - "version": "2.3.3", - "bundled": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true - }, - "semver": { - "version": "5.5.0", - "bundled": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.1", - "bundled": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.0.3", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.1", - "bundled": true, - "requires": { - "debug": "2.6.9", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.3.3", - "rimraf": "2.6.2", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.3", - "bundled": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", + } + } + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true + }, + "extsprintf": { + "version": "1.3.0", + "bundled": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true + }, + "form-data": { + "version": "2.1.4", + "bundled": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", "bundled": true - }, - "util-deprecate": { - "version": "1.0.2", + } + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true + }, + "har-schema": { + "version": "1.0.5", + "bundled": true + }, + "har-validator": { + "version": "4.2.1", + "bundled": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true + }, + "hawk": { + "version": "3.1.3", + "bundled": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "bundled": true + }, + "http-signature": { + "version": "1.1.1", + "bundled": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.5", + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "bundled": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true + }, + "jsonify": { + "version": "0.0.0", + "bundled": true + }, + "jsprim": { + "version": "1.4.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", "bundled": true - }, - "uuid": { - "version": "3.2.1", + } + } + }, + "mime-db": { + "version": "1.30.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.17", + "bundled": true, + "requires": { + "mime-db": "1.30.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true + }, + "node-pre-gyp": { + "version": "0.6.39", + "bundled": true, + "requires": { + "detect-libc": "1.0.3", + "hawk": "3.1.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.2", + "rc": "1.2.4", + "request": "2.81.0", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "2.2.1", + "tar-pack": "3.4.1" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true + }, + "osenv": { + "version": "0.1.4", + "bundled": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "performance-now": { + "version": "0.2.0", + "bundled": true + }, + "process-nextick-args": { + "version": "1.0.7", + "bundled": true + }, + "protobufjs": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", + "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=", + "requires": { + "ascli": "1.0.1", + "bytebuffer": "5.0.1", + "glob": "7.1.2", + "yargs": "3.32.0" + } + }, + "punycode": { + "version": "1.4.1", + "bundled": true + }, + "qs": { + "version": "6.4.0", + "bundled": true + }, + "rc": { + "version": "1.2.4", + "bundled": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", "bundled": true - }, - "verror": { - "version": "1.10.0", - "bundled": true, - "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", + } + } + }, + "readable-stream": { + "version": "2.3.3", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.81.0", + "bundled": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "bundled": true + }, + "semver": { + "version": "5.5.0", + "bundled": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true + }, + "sntp": { + "version": "1.0.9", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.1", + "bundled": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", "bundled": true } } }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } - } - }, - "google-p12-pem": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.2.tgz", - "integrity": "sha1-M8RqsCGqc0+gMys5YKmj/8svMXc=", - "requires": { - "node-forge": "0.7.1" - } - }, - "google-proto-files": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", - "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", - "requires": { - "globby": "7.1.1", - "power-assert": "1.4.4", - "protobufjs": "6.8.4" - }, - "dependencies": { - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", + "string-width": { + "version": "1.0.2", + "bundled": true, "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.2", - "ignore": "3.3.7", - "pify": "3.0.0", - "slash": "1.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "growl": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", - "dev": true + "string_decoder": { + "version": "1.0.3", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.1", + "bundled": true, + "requires": { + "debug": "2.6.9", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.3.3", + "rimraf": "2.6.2", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.3", + "bundled": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "uuid": { + "version": "3.2.1", + "bundled": true + }, + "verror": { + "version": "1.10.0", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true + } + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + } + } }, "gtoken": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-1.2.3.tgz", - "integrity": "sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.2.0.tgz", + "integrity": "sha512-tvQs8B1z5+I1FzMPZnq/OCuxTWFOkvy7cUJcpNdBOK2L7yEtPZTVCPtZU181sSDF+isUPebSqFTNTkIejFASAQ==", "requires": { - "google-p12-pem": "0.1.2", + "axios": "0.18.0", + "google-p12-pem": "1.0.2", "jws": "3.1.4", - "mime": "1.6.0", - "request": "2.83.0" + "mime": "2.2.0", + "pify": "3.0.0" } }, "handlebars": { @@ -5560,9 +7158,9 @@ "dev": true }, "has-symbol-support-x": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz", - "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", "dev": true }, "has-to-string-tag-x": { @@ -5571,7 +7169,7 @@ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "dev": true, "requires": { - "has-symbol-support-x": "1.4.1" + "has-symbol-support-x": "1.4.2" } }, "has-value": { @@ -5582,13 +7180,6 @@ "get-value": "2.0.6", "has-values": "1.0.0", "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "has-values": { @@ -5600,24 +7191,6 @@ "kind-of": "4.0.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", @@ -5641,7 +7214,7 @@ "requires": { "boom": "4.3.1", "cryptiles": "3.1.2", - "hoek": "4.2.0", + "hoek": "4.2.1", "sntp": "2.1.0" } }, @@ -5652,9 +7225,9 @@ "dev": true }, "hoek": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", - "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" }, "home-or-tmp": { "version": "2.0.0", @@ -5667,9 +7240,9 @@ } }, "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", + "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", "dev": true }, "htmlparser2": { @@ -5680,10 +7253,10 @@ "requires": { "domelementtype": "1.3.0", "domhandler": "2.4.1", - "domutils": "1.6.2", + "domutils": "1.7.0", "entities": "1.1.1", "inherits": "2.0.3", - "readable-stream": "2.3.3" + "readable-stream": "2.3.5" } }, "http-cache-semantics": { @@ -5699,7 +7272,7 @@ "requires": { "assert-plus": "1.0.0", "jsprim": "1.4.1", - "sshpk": "1.13.1" + "sshpk": "1.14.1" } }, "hullabaloo-config-manager": { @@ -5716,7 +7289,7 @@ "lodash.clonedeep": "4.5.0", "lodash.clonedeepwith": "4.5.0", "lodash.isequal": "4.5.0", - "lodash.merge": "4.6.0", + "lodash.merge": "4.6.1", "md5-hex": "2.0.0", "package-hash": "2.0.0", "pkg-dir": "2.0.0", @@ -5800,8 +7373,8 @@ "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", "dev": true, "requires": { - "moment": "2.20.1", - "sanitize-html": "1.16.3" + "moment": "2.21.0", + "sanitize-html": "1.18.2" } }, "inquirer": { @@ -5811,12 +7384,12 @@ "dev": true, "requires": { "ansi-escapes": "3.0.0", - "chalk": "2.3.0", + "chalk": "2.3.2", "cli-cursor": "2.1.0", "cli-width": "2.2.0", "external-editor": "2.1.0", "figures": "2.0.0", - "lodash": "4.17.4", + "lodash": "4.17.5", "mute-stream": "0.0.7", "run-async": "2.3.0", "rx-lite": "4.0.8", @@ -5826,12 +7399,6 @@ "through": "2.3.8" }, "dependencies": { - "ansi-escapes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", - "dev": true - }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", @@ -5885,9 +7452,9 @@ } }, "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { "loose-envify": "1.3.1" @@ -5915,13 +7482,6 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } } }, "is-arrayish": { @@ -5959,7 +7519,7 @@ "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", "dev": true, "requires": { - "ci-info": "1.1.2" + "ci-info": "1.1.3" } }, "is-data-descriptor": { @@ -5968,13 +7528,6 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } } }, "is-descriptor": { @@ -5985,13 +7538,6 @@ "is-accessor-descriptor": "1.0.0", "is-data-descriptor": "1.0.0", "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } } }, "is-dotfile": { @@ -6021,10 +7567,9 @@ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, "is-finite": { "version": "1.0.2", @@ -6050,12 +7595,11 @@ "dev": true }, "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "1.0.0" + "is-extglob": "2.1.1" } }, "is-installed-globally": { @@ -6075,12 +7619,21 @@ "dev": true }, "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } } }, "is-obj": { @@ -6096,12 +7649,12 @@ "dev": true }, "is-observable": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-0.2.0.tgz", - "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", + "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", "dev": true, "requires": { - "symbol-observable": "0.2.4" + "symbol-observable": "1.2.0" } }, "is-odd": { @@ -6155,13 +7708,6 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "is-posix-bracket": { @@ -6189,9 +7735,9 @@ "dev": true }, "is-resolvable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz", - "integrity": "sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, "is-retry-allowed": { @@ -6245,13 +7791,9 @@ "dev": true }, "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "isstream": { "version": "0.1.2", @@ -6287,12 +7829,12 @@ "dev": true }, "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz", + "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==", "dev": true, "requires": { - "argparse": "1.0.9", + "argparse": "1.0.10", "esprima": "4.0.0" } }, @@ -6323,7 +7865,7 @@ "escape-string-regexp": "1.0.5", "js2xmlparser": "3.0.0", "klaw": "2.0.0", - "marked": "0.3.12", + "marked": "0.3.17", "mkdirp": "0.5.1", "requizzle": "0.2.1", "strip-json-comments": "2.0.1", @@ -6455,1906 +7997,2838 @@ "json-buffer": "3.0.0" } }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + }, + "klaw": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", + "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "last-line-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz", + "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", + "dev": true, + "requires": { + "through2": "2.0.3" + } + }, + "latest-version": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", + "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "dev": true, + "requires": { + "package-json": "4.0.1" + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + } + }, + "lodash": { + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + }, + "lodash.chunk": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", + "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, + "lodash.clonedeepwith": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz", + "integrity": "sha1-buMFc6A6GmDWcKYu8zwQzxr9vdQ=", + "dev": true + }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", + "dev": true + }, + "lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", + "dev": true + }, + "lodash.escaperegexp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", + "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", + "dev": true + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", + "dev": true + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "lodash.merge": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", + "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==" + }, + "lodash.mergewith": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", + "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", + "dev": true + }, + "lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" + }, + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" + }, + "lolex": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", + "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==", + "dev": true + }, + "long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "dev": true, "requires": { - "is-buffer": "1.1.6" + "js-tokens": "3.0.2" } }, - "klaw": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", - "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } }, - "last-line-stream": { + "lowercase-keys": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz", - "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", - "dev": true, + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "dev": true + }, + "lru-cache": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", + "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", "requires": { - "through2": "2.0.3" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, - "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "make-dir": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz", + "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", "dev": true, "requires": { - "package-json": "4.0.1" + "pify": "3.0.0" } }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, - "lcid": { + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true + }, + "map-visit": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "invert-kv": "1.0.0" + "object-visit": "1.0.1" } }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" - } + "marked": { + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz", + "integrity": "sha512-+AKbNsjZl6jFfLPwHhWmGTqE009wTKn3RTmn9K8oUKHrX/abPJjtcRtXpYB/FFrwPJRUA86LX/de3T0knkPCmQ==", + "dev": true }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "matcher": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.0.tgz", + "integrity": "sha512-aZGv6JBTHqfqAd09jmAlbKnAICTfIvb5Z8gXVxPB5WZtFfHMaAMdACL7tQflD2V+6/8KNcY8s6DYtWLgpJP5lA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "escape-string-regexp": "1.0.5" } }, - "locate-path": { + "md5-hex": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", + "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "md5-o-matic": "0.1.1" } }, - "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" - }, - "lodash.chunk": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", - "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.clonedeepwith": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz", - "integrity": "sha1-buMFc6A6GmDWcKYu8zwQzxr9vdQ=", + "md5-o-matic": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", "dev": true }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "dev": true, + "requires": { + "mimic-fn": "1.2.0" + } }, - "lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", - "dev": true + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + } + } }, - "lodash.escaperegexp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", - "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=", + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "dev": true }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", - "dev": true + "merge-estraverse-visitors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/merge-estraverse-visitors/-/merge-estraverse-visitors-1.0.0.tgz", + "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", + "dev": true, + "requires": { + "estraverse": "4.2.0" + } }, - "lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", - "dev": true + "merge2": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", + "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==" }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true + "methmeth": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz", + "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", "dev": true }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + "micromatch": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz", + "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==", + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.1", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } }, - "lodash.merge": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", - "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=" + "mime": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.2.0.tgz", + "integrity": "sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA==" }, - "lodash.mergewith": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", - "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", - "dev": true + "mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" }, - "lodash.snakecase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", - "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" + "mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "requires": { + "mime-db": "1.33.0" + } }, - "lolex": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz", - "integrity": "sha512-mQuW55GhduF3ppo+ZRUTz1PRjEh1hS5BbqU7d8D0ez2OKxHDod7StPPeAVKisZR5aLkHZjdGWSL42LSONUJsZw==", + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" + "mimic-response": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz", + "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=", + "dev": true }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, - "loose-envify": { + "mixin-deep": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", - "dev": true, + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { - "js-tokens": "3.0.2" + "for-in": "1.0.2", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } } }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "minimist": "0.0.8" } }, - "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", - "dev": true - }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "mocha": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz", + "integrity": "sha512-nMOpAPFosU1B4Ix1jdhx5e3q7XO55ic5a8cgYvW27CequcEY+BabS0kUVL1Cw1V5PuVHZWeNRWFLmEPexo79VA==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "browser-stdout": "1.3.1", + "commander": "2.11.0", + "debug": "3.1.0", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.3", + "he": "1.1.1", + "mkdirp": "0.5.1", + "supports-color": "4.4.0" + }, + "dependencies": { + "supports-color": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", + "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, - "make-dir": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", - "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", + "modelo": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz", + "integrity": "sha512-9DITV2YEMcw7XojdfvGl3gDD8J9QjZTJ7ZOUuSAkP+F3T6rDbzMJuPktxptsdHYEvZcmXrCD3LMOhdSAEq6zKA==" + }, + "module-not-found-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", + "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=", + "dev": true + }, + "moment": { + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz", + "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "multi-stage-sourcemap": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz", + "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "pify": "3.0.0" + "source-map": "0.1.43" }, "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } } } }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "multimatch": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", + "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" + } }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, - "map-visit": { + "nan": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" + }, + "nanomatch": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "next-tick": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "dev": true + }, + "nise": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.2.tgz", + "integrity": "sha512-KPKb+wvETBiwb4eTwtR/OsA2+iijXP+VnlSFYJo3EHjm2yjek1NWxHOUQat3i7xNLm1Bm18UA5j5Wor0yO2GtA==", + "dev": true, "requires": { - "object-visit": "1.0.1" + "@sinonjs/formatio": "2.0.0", + "just-extend": "1.1.27", + "lolex": "2.3.2", + "path-to-regexp": "1.7.0", + "text-encoding": "0.6.4" } }, - "marked": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz", - "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA==", - "dev": true + "node-forge": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.4.tgz", + "integrity": "sha512-8Df0906+tq/omxuCZD6PqhPaQDYuyJ1d+VITgxoIA8zvQd1ru+nMJcDChHH324MWitIgbVkAkQoGEEVJNpn/PA==" }, - "matcher": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.0.0.tgz", - "integrity": "sha1-qvDEgW62m5IJRnQXViXzRmsOPhk=", + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, - "md5-hex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", - "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "remove-trailing-separator": "1.1.0" } }, - "md5-o-matic": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", - "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", - "dev": true + "normalize-url": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", + "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", + "dev": true, + "requires": { + "prepend-http": "2.0.0", + "query-string": "5.1.1", + "sort-keys": "2.0.0" + }, + "dependencies": { + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + } + } }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "mimic-fn": "1.1.0" + "path-key": "2.0.1" } }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "nyc": { + "version": "11.6.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.6.0.tgz", + "integrity": "sha512-ZaXCh0wmbk2aSBH2B5hZGGvK2s9aM8DIm2rVY+BG3Fx8tUS+bpJSswUVZqOD1YfCmnYRFSqgYJSr7UeeUcW0jg==", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.2.0", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.10.1", + "istanbul-lib-report": "1.1.3", + "istanbul-lib-source-maps": "1.2.3", + "istanbul-reports": "1.3.0", + "md5-hex": "1.3.0", + "merge-source-map": "1.1.0", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.2.1", + "yargs": "11.1.0", + "yargs-parser": "8.1.0" }, "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "align-text": { + "version": "0.1.4", + "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" } }, - "load-json-file": { + "amdefine": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "bundled": true, + "dev": true + }, + "append-transform": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "archy": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "bundled": true, + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "arrify": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "assign-symbols": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "async": { + "version": "1.5.2", + "bundled": true, + "dev": true + }, + "atob": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "babel-code-frame": { + "version": "6.26.0", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-generator": { + "version": "6.26.1", + "bundled": true, + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.5", + "source-map": "0.5.7", + "trim-right": "1.0.1" + } + }, + "babel-messages": { + "version": "6.23.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.5" + } + }, + "babel-traverse": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.3", + "lodash": "4.17.5" + } + }, + "babel-types": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.5", + "to-fast-properties": "1.0.3" } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "babylon": { + "version": "6.18.0", + "bundled": true, "dev": true }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "base": { + "version": "0.11.2", + "bundled": true, "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } } }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "brace-expansion": { + "version": "1.1.11", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "balanced-match": "1.0.0", + "concat-map": "0.0.1" } }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "braces": { + "version": "1.8.5", + "bundled": true, "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" } }, - "read-pkg-up": { + "builtin-modules": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "cache-base": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } } }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - } - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "merge-estraverse-visitors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/merge-estraverse-visitors/-/merge-estraverse-visitors-1.0.0.tgz", - "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "merge2": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", - "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==" - }, - "methmeth": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz", - "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" - }, - "mime-db": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" - }, - "mime-types": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", - "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", - "requires": { - "mime-db": "1.30.0" - } - }, - "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", - "dev": true - }, - "mimic-response": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz", - "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { + "caching-transform": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "mocha": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz", - "integrity": "sha512-nMOpAPFosU1B4Ix1jdhx5e3q7XO55ic5a8cgYvW27CequcEY+BabS0kUVL1Cw1V5PuVHZWeNRWFLmEPexo79VA==", - "dev": true, - "requires": { - "browser-stdout": "1.3.1", - "commander": "2.11.0", - "debug": "3.1.0", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.3", - "he": "1.1.1", - "mkdirp": "0.5.1", - "supports-color": "4.4.0" - }, - "dependencies": { - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "bundled": true, "dev": true, "requires": { - "has-flag": "2.0.0" - } - } - } - }, - "modelo": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz", - "integrity": "sha512-9DITV2YEMcw7XojdfvGl3gDD8J9QjZTJ7ZOUuSAkP+F3T6rDbzMJuPktxptsdHYEvZcmXrCD3LMOhdSAEq6zKA==" - }, - "module-not-found-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", - "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=", - "dev": true - }, - "moment": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz", - "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==", - "dev": true - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "multi-stage-sourcemap": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz", - "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", - "dev": true, - "requires": { - "source-map": "0.1.43" - }, - "dependencies": { - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" + } + }, + "camelcase": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true + }, + "center-align": { + "version": "0.1.3", + "bundled": true, "dev": true, + "optional": true, "requires": { - "amdefine": "1.0.1" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } - } - } - }, - "multimatch": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", - "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-union": "1.0.2", - "arrify": "1.0.1", - "minimatch": "3.0.4" - } - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "nan": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", - "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" - }, - "nanomatch": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", - "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + "chalk": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } - } - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "nise": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz", - "integrity": "sha512-q9jXh3UNsMV28KeqI43ILz5+c3l+RiNW8mhurEwCKckuHQbL+hTJIKKTiUlCPKlgQ/OukFvSnKB/Jk3+sFbkGA==", - "dev": true, - "requires": { - "formatio": "1.2.0", - "just-extend": "1.1.27", - "lolex": "1.6.0", - "path-to-regexp": "1.7.0", - "text-encoding": "0.6.4" - }, - "dependencies": { - "lolex": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz", - "integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=", - "dev": true - } - } - }, - "node-forge": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz", - "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=" - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, - "normalize-url": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", - "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", - "dev": true, - "requires": { - "prepend-http": "2.0.0", - "query-string": "5.1.1", - "sort-keys": "2.0.0" - }, - "dependencies": { - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - } - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "2.0.1" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "nyc": { - "version": "11.4.1", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", - "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", - "dev": true, - "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-report": "1.1.2", - "istanbul-lib-source-maps": "1.2.2", - "istanbul-reports": "1.1.3", - "md5-hex": "1.3.0", - "merge-source-map": "1.0.4", - "micromatch": "2.3.11", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.1.1", - "yargs": "10.0.3", - "yargs-parser": "8.0.0" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", + "class-utils": { + "version": "0.3.6", + "bundled": true, + "dev": true, + "requires": { + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "5.1.0", + "bundled": true, + "dev": true + } + } + }, + "cliui": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "collection-visit": { + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, - "amdefine": { + "commondir": { "version": "1.0.1", "bundled": true, "dev": true }, - "ansi-regex": { - "version": "2.1.1", + "component-emitter": { + "version": "1.2.1", "bundled": true, "dev": true }, - "ansi-styles": { - "version": "2.2.1", + "concat-map": { + "version": "0.0.1", "bundled": true, "dev": true }, - "append-transform": { - "version": "0.4.0", + "convert-source-map": { + "version": "1.5.1", + "bundled": true, + "dev": true + }, + "copy-descriptor": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "core-js": { + "version": "2.5.3", + "bundled": true, + "dev": true + }, + "cross-spawn": { + "version": "4.0.2", "bundled": true, "dev": true, "requires": { - "default-require-extensions": "1.0.0" + "lru-cache": "4.1.2", + "which": "1.3.0" } }, - "archy": { - "version": "1.0.0", + "debug": { + "version": "2.6.9", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "debug-log": { + "version": "1.0.1", "bundled": true, "dev": true }, - "arr-diff": { - "version": "2.0.0", + "decamelize": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "decode-uri-component": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, + "default-require-extensions": { + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "arr-flatten": "1.1.0" + "strip-bom": "2.0.0" } }, - "arr-flatten": { - "version": "1.1.0", + "define-property": { + "version": "2.0.2", "bundled": true, - "dev": true + "dev": true, + "requires": { + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } + } }, - "array-unique": { - "version": "0.2.1", + "detect-indent": { + "version": "4.0.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "repeating": "2.0.1" + } }, - "arrify": { - "version": "1.0.1", + "error-ex": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escape-string-regexp": { + "version": "1.0.5", "bundled": true, "dev": true }, - "async": { - "version": "1.5.2", + "esutils": { + "version": "2.0.2", "bundled": true, "dev": true }, - "babel-code-frame": { - "version": "6.26.0", + "execa": { + "version": "0.7.0", "bundled": true, "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.2", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } } }, - "babel-generator": { - "version": "6.26.0", + "expand-brackets": { + "version": "0.1.5", "bundled": true, "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "is-posix-bracket": "0.1.1" } }, - "babel-messages": { - "version": "6.23.0", + "expand-range": { + "version": "1.8.2", "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0" + "fill-range": "2.2.3" } }, - "babel-runtime": { - "version": "6.26.0", + "extend-shallow": { + "version": "3.0.2", "bundled": true, "dev": true, "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } } }, - "babel-template": { - "version": "6.26.0", + "extglob": { + "version": "0.3.2", "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" + "is-extglob": "1.0.0" } }, - "babel-traverse": { - "version": "6.26.0", + "filename-regex": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "fill-range": { + "version": "2.2.3", "bundled": true, "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, - "babel-types": { - "version": "6.26.0", + "find-cache-dir": { + "version": "0.1.1", "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "for-in": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "for-own": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreground-child": { + "version": "1.5.6", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" + } + }, + "fragment-cache": { + "version": "0.2.1", + "bundled": true, + "dev": true, + "requires": { + "map-cache": "0.2.2" } }, - "babylon": { - "version": "6.18.0", + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "get-stream": { + "version": "3.0.0", "bundled": true, "dev": true }, - "balanced-match": { - "version": "1.0.0", + "get-value": { + "version": "2.0.6", "bundled": true, "dev": true }, - "brace-expansion": { - "version": "1.1.8", + "glob": { + "version": "7.1.2", "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, - "braces": { - "version": "1.8.5", + "glob-base": { + "version": "0.3.0", "bundled": true, "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "glob-parent": "2.0.0", + "is-glob": "2.0.1" } }, - "builtin-modules": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "caching-transform": { - "version": "1.0.1", + "glob-parent": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "is-glob": "2.0.1" } }, - "camelcase": { - "version": "1.2.1", + "globals": { + "version": "9.18.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, - "center-align": { - "version": "0.1.3", + "graceful-fs": { + "version": "4.1.11", + "bundled": true, + "dev": true + }, + "handlebars": { + "version": "4.0.11", "bundled": true, "dev": true, - "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } } }, - "chalk": { - "version": "1.1.3", + "has-ansi": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-regex": "2.1.1" } }, - "cliui": { - "version": "2.1.0", + "has-flag": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "has-value": { + "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" }, "dependencies": { - "wordwrap": { - "version": "0.0.2", + "isobject": { + "version": "3.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, - "code-point-at": { - "version": "1.1.0", + "has-values": { + "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } }, - "commondir": { - "version": "1.0.1", + "hosted-git-info": { + "version": "2.6.0", "bundled": true, "dev": true }, - "concat-map": { - "version": "0.0.1", + "imurmurhash": { + "version": "0.1.4", "bundled": true, "dev": true }, - "convert-source-map": { - "version": "1.5.1", + "inflight": { + "version": "1.0.6", "bundled": true, - "dev": true + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } }, - "core-js": { - "version": "2.5.3", + "inherits": { + "version": "2.0.3", "bundled": true, "dev": true }, - "cross-spawn": { - "version": "4.0.2", + "invariant": { + "version": "2.2.3", "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" + "loose-envify": "1.3.1" } }, - "debug": { - "version": "2.6.9", + "invert-kv": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-accessor-descriptor": { + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "ms": "2.0.0" + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } } }, - "debug-log": { - "version": "1.0.1", + "is-arrayish": { + "version": "0.2.1", "bundled": true, "dev": true }, - "decamelize": { - "version": "1.2.0", + "is-buffer": { + "version": "1.1.6", "bundled": true, "dev": true }, - "default-require-extensions": { + "is-builtin-module": { "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "strip-bom": "2.0.0" - } - }, - "detect-indent": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "repeating": "2.0.1" + "builtin-modules": "1.1.1" } }, - "error-ex": { - "version": "1.3.1", + "is-data-descriptor": { + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "is-arrayish": "0.2.1" + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } } }, - "escape-string-regexp": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "esutils": { - "version": "2.0.2", - "bundled": true, - "dev": true - }, - "execa": { - "version": "0.7.0", + "is-descriptor": { + "version": "1.0.2", "bundled": true, "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" }, "dependencies": { - "cross-spawn": { - "version": "5.1.0", + "kind-of": { + "version": "6.0.2", "bundled": true, - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" - } + "dev": true } } }, - "expand-brackets": { - "version": "0.1.5", + "is-dotfile": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", "bundled": true, "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-primitive": "2.0.0" } }, - "expand-range": { - "version": "1.8.2", + "is-extendable": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-finite": { + "version": "1.0.2", "bundled": true, "dev": true, "requires": { - "fill-range": "2.2.3" + "number-is-nan": "1.0.1" } }, - "extglob": { - "version": "0.3.2", + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-glob": { + "version": "2.0.1", "bundled": true, "dev": true, "requires": { "is-extglob": "1.0.0" } }, - "filename-regex": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "fill-range": { - "version": "2.2.3", + "is-number": { + "version": "2.1.0", "bundled": true, "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "kind-of": "3.2.2" } }, - "find-cache-dir": { - "version": "0.1.1", + "is-odd": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "is-number": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "bundled": true, + "dev": true + } } }, - "find-up": { - "version": "2.1.0", + "is-plain-object": { + "version": "2.0.4", "bundled": true, "dev": true, "requires": { - "locate-path": "2.0.0" + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } } }, - "for-in": { - "version": "1.0.2", + "is-posix-bracket": { + "version": "0.1.1", "bundled": true, "dev": true }, - "for-own": { - "version": "0.1.5", + "is-primitive": { + "version": "2.0.0", "bundled": true, - "dev": true, - "requires": { - "for-in": "1.0.2" - } + "dev": true }, - "foreground-child": { - "version": "1.5.6", + "is-stream": { + "version": "1.1.0", "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" - } + "dev": true }, - "fs.realpath": { - "version": "1.0.0", + "is-utf8": { + "version": "0.2.1", "bundled": true, "dev": true }, - "get-caller-file": { + "is-windows": { "version": "1.0.2", "bundled": true, "dev": true }, - "get-stream": { - "version": "3.0.0", + "isarray": { + "version": "1.0.0", "bundled": true, "dev": true }, - "glob": { - "version": "7.1.2", + "isexe": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "isobject": { + "version": "2.1.0", "bundled": true, "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "isarray": "1.0.0" } }, - "glob-base": { - "version": "0.3.0", + "istanbul-lib-coverage": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "append-transform": "0.4.0" } }, - "glob-parent": { - "version": "2.0.0", + "istanbul-lib-instrument": { + "version": "1.10.1", "bundled": true, "dev": true, "requires": { - "is-glob": "2.0.1" + "babel-generator": "6.26.1", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.2.0", + "semver": "5.5.0" } }, - "globals": { - "version": "9.18.0", - "bundled": true, - "dev": true - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "handlebars": { - "version": "4.0.11", + "istanbul-lib-report": { + "version": "1.1.3", "bundled": true, "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" }, "dependencies": { - "source-map": { - "version": "0.4.4", + "supports-color": { + "version": "3.2.3", "bundled": true, "dev": true, "requires": { - "amdefine": "1.0.1" + "has-flag": "1.0.0" } } } }, - "has-ansi": { - "version": "2.0.0", + "istanbul-lib-source-maps": { + "version": "1.2.3", "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "debug": "3.1.0", + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + } } }, - "has-flag": { - "version": "1.0.0", + "istanbul-reports": { + "version": "1.3.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "handlebars": "4.0.11" + } }, - "hosted-git-info": { - "version": "2.5.0", + "js-tokens": { + "version": "3.0.2", "bundled": true, "dev": true }, - "imurmurhash": { - "version": "0.1.4", + "jsesc": { + "version": "1.3.0", "bundled": true, "dev": true }, - "inflight": { - "version": "1.0.6", + "kind-of": { + "version": "3.2.2", "bundled": true, "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "is-buffer": "1.1.6" } }, - "inherits": { - "version": "2.0.3", + "lazy-cache": { + "version": "1.0.4", "bundled": true, - "dev": true + "dev": true, + "optional": true }, - "invariant": { - "version": "2.2.2", + "lcid": { + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "loose-envify": "1.3.1" + "invert-kv": "1.0.0" } }, - "invert-kv": { - "version": "1.0.0", + "load-json-file": { + "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } }, - "is-arrayish": { - "version": "0.2.1", + "locate-path": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + } + } + }, + "lodash": { + "version": "4.17.5", "bundled": true, "dev": true }, - "is-buffer": { - "version": "1.1.6", + "longest": { + "version": "1.0.1", "bundled": true, "dev": true }, - "is-builtin-module": { - "version": "1.0.0", + "loose-envify": { + "version": "1.3.1", "bundled": true, "dev": true, "requires": { - "builtin-modules": "1.1.1" + "js-tokens": "3.0.2" } }, - "is-dotfile": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", + "lru-cache": { + "version": "4.1.2", "bundled": true, "dev": true, "requires": { - "is-primitive": "2.0.0" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, - "is-extendable": { - "version": "0.1.1", + "map-cache": { + "version": "0.2.2", "bundled": true, "dev": true }, - "is-extglob": { + "map-visit": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "object-visit": "1.0.1" + } }, - "is-finite": { - "version": "1.0.2", + "md5-hex": { + "version": "1.3.0", "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "md5-o-matic": "0.1.1" } }, - "is-fullwidth-code-point": { - "version": "1.0.0", + "md5-o-matic": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "mem": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "mimic-fn": "1.2.0" } }, - "is-glob": { - "version": "2.0.1", + "merge-source-map": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "is-extglob": "1.0.0" + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "bundled": true, + "dev": true + } } }, - "is-number": { - "version": "2.1.0", + "micromatch": { + "version": "2.3.11", "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" } }, - "is-posix-bracket": { - "version": "0.1.1", + "mimic-fn": { + "version": "1.2.0", "bundled": true, "dev": true }, - "is-primitive": { - "version": "2.0.0", + "minimatch": { + "version": "3.0.4", "bundled": true, - "dev": true + "dev": true, + "requires": { + "brace-expansion": "1.1.11" + } }, - "is-stream": { - "version": "1.1.0", + "minimist": { + "version": "0.0.8", "bundled": true, "dev": true }, - "is-utf8": { - "version": "0.2.1", + "mixin-deep": { + "version": "1.3.1", "bundled": true, - "dev": true + "dev": true, + "requires": { + "for-in": "1.0.2", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } }, - "isarray": { - "version": "1.0.0", + "mkdirp": { + "version": "0.5.1", "bundled": true, - "dev": true + "dev": true, + "requires": { + "minimist": "0.0.8" + } }, - "isexe": { + "ms": { "version": "2.0.0", "bundled": true, "dev": true }, - "isobject": { - "version": "2.1.0", + "nanomatch": { + "version": "1.2.9", "bundled": true, "dev": true, "requires": { - "isarray": "1.0.0" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } } }, - "istanbul-lib-coverage": { - "version": "1.1.1", + "normalize-package-data": { + "version": "2.4.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" + } }, - "istanbul-lib-hook": { - "version": "1.1.0", + "normalize-path": { + "version": "2.1.1", "bundled": true, "dev": true, "requires": { - "append-transform": "0.4.0" + "remove-trailing-separator": "1.1.0" } }, - "istanbul-lib-instrument": { - "version": "1.9.1", + "npm-run-path": { + "version": "2.0.2", "bundled": true, "dev": true, "requires": { - "babel-generator": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", - "semver": "5.4.1" + "path-key": "2.0.1" } }, - "istanbul-lib-report": { - "version": "1.1.2", + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true + }, + "object-copy": { + "version": "0.1.0", "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { - "supports-color": { - "version": "3.2.3", + "define-property": { + "version": "0.2.5", "bundled": true, "dev": true, "requires": { - "has-flag": "1.0.0" + "is-descriptor": "0.1.6" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "bundled": true, + "dev": true + } } } } }, - "istanbul-lib-source-maps": { - "version": "1.2.2", + "object-visit": { + "version": "1.0.1", "bundled": true, "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "isobject": "3.0.1" }, "dependencies": { - "debug": { - "version": "3.1.0", + "isobject": { + "version": "3.0.1", "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } + "dev": true + } + } + }, + "object.omit": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "object.pick": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true } } }, - "istanbul-reports": { - "version": "1.1.3", + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "optimist": { + "version": "0.6.1", "bundled": true, "dev": true, "requires": { - "handlebars": "4.0.11" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, - "js-tokens": { - "version": "3.0.2", + "os-homedir": { + "version": "1.0.2", "bundled": true, "dev": true }, - "jsesc": { - "version": "1.3.0", + "os-locale": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "p-finally": { + "version": "1.0.0", "bundled": true, "dev": true }, - "kind-of": { - "version": "3.2.2", + "p-limit": { + "version": "1.2.0", "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "p-try": "1.0.0" } }, - "lazy-cache": { - "version": "1.0.4", + "p-locate": { + "version": "2.0.0", "bundled": true, "dev": true, - "optional": true + "requires": { + "p-limit": "1.2.0" + } }, - "lcid": { + "p-try": { "version": "1.0.0", "bundled": true, + "dev": true + }, + "parse-glob": { + "version": "3.0.4", + "bundled": true, "dev": true, "requires": { - "invert-kv": "1.0.0" + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" } }, - "load-json-file": { - "version": "1.1.0", + "parse-json": { + "version": "2.2.0", "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "error-ex": "1.3.1" } }, - "locate-path": { - "version": "2.0.0", + "pascalcase": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "path-exists": { + "version": "2.1.0", "bundled": true, "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "bundled": true, - "dev": true - } + "pinkie-promise": "2.0.1" } }, - "lodash": { - "version": "4.17.4", + "path-is-absolute": { + "version": "1.0.1", "bundled": true, "dev": true }, - "longest": { - "version": "1.0.1", + "path-key": { + "version": "2.0.1", "bundled": true, "dev": true }, - "loose-envify": { - "version": "1.3.1", + "path-parse": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "path-type": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "js-tokens": "3.0.2" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, - "lru-cache": { - "version": "4.1.1", + "pify": { + "version": "2.3.0", + "bundled": true, + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "bundled": true, + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", "bundled": true, "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pinkie": "2.0.4" } }, - "md5-hex": { - "version": "1.3.0", + "pkg-dir": { + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "find-up": "1.1.2" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } } }, - "md5-o-matic": { + "posix-character-classes": { "version": "0.1.1", "bundled": true, "dev": true }, - "mem": { - "version": "1.1.0", + "preserve": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "randomatic": { + "version": "1.1.7", "bundled": true, "dev": true, "requires": { - "mimic-fn": "1.1.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } } }, - "merge-source-map": { - "version": "1.0.4", + "read-pkg": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "source-map": "0.5.7" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, - "micromatch": { - "version": "2.3.11", + "read-pkg-up": { + "version": "1.0.1", "bundled": true, "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } } }, - "mimic-fn": { - "version": "1.1.0", + "regenerator-runtime": { + "version": "0.11.1", "bundled": true, "dev": true }, - "minimatch": { - "version": "3.0.4", + "regex-cache": { + "version": "0.4.4", "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.8" + "is-equal-shallow": "0.1.3" } }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mkdirp": { - "version": "0.5.1", + "regex-not": { + "version": "1.0.2", "bundled": true, "dev": true, "requires": { - "minimist": "0.0.8" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, - "ms": { - "version": "2.0.0", + "remove-trailing-separator": { + "version": "1.1.0", "bundled": true, "dev": true }, - "normalize-package-data": { - "version": "2.4.0", + "repeat-element": { + "version": "1.1.2", "bundled": true, - "dev": true, - "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" - } + "dev": true }, - "normalize-path": { - "version": "2.1.1", + "repeat-string": { + "version": "1.6.1", + "bundled": true, + "dev": true + }, + "repeating": { + "version": "2.0.1", "bundled": true, "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "is-finite": "1.0.2" } }, - "npm-run-path": { - "version": "2.0.2", + "require-directory": { + "version": "2.1.1", "bundled": true, - "dev": true, - "requires": { - "path-key": "2.0.1" - } + "dev": true }, - "number-is-nan": { + "require-main-filename": { "version": "1.0.1", "bundled": true, "dev": true }, - "object-assign": { - "version": "4.1.1", + "resolve-from": { + "version": "2.0.0", "bundled": true, "dev": true }, - "object.omit": { - "version": "2.0.1", + "resolve-url": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "ret": { + "version": "0.1.15", + "bundled": true, + "dev": true + }, + "right-align": { + "version": "0.1.3", "bundled": true, "dev": true, + "optional": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "align-text": "0.1.4" } }, - "once": { - "version": "1.4.0", + "rimraf": { + "version": "2.6.2", "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "glob": "7.1.2" } }, - "optimist": { - "version": "0.6.1", + "safe-regex": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "ret": "0.1.15" } }, - "os-homedir": { - "version": "1.0.2", + "semver": { + "version": "5.5.0", "bundled": true, "dev": true }, - "os-locale": { - "version": "2.1.0", + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "set-value": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, - "p-finally": { + "shebang-command": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { "version": "1.0.0", "bundled": true, "dev": true }, - "p-limit": { - "version": "1.1.0", + "signal-exit": { + "version": "3.0.2", "bundled": true, "dev": true }, - "p-locate": { - "version": "2.0.0", + "slide": { + "version": "1.1.6", "bundled": true, - "dev": true, - "requires": { - "p-limit": "1.1.0" - } + "dev": true }, - "parse-glob": { - "version": "3.0.4", + "snapdragon": { + "version": "0.8.2", "bundled": true, "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.1", + "use": "3.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "bundled": true, + "dev": true + } } }, - "parse-json": { - "version": "2.2.0", + "snapdragon-node": { + "version": "2.1.1", "bundled": true, "dev": true, "requires": { - "error-ex": "1.3.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } } }, - "path-exists": { - "version": "2.1.0", + "snapdragon-util": { + "version": "3.0.1", "bundled": true, "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "kind-of": "3.2.2" } }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "path-key": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "path-parse": { - "version": "1.0.5", + "source-map": { + "version": "0.5.7", "bundled": true, "dev": true }, - "path-type": { - "version": "1.1.0", + "source-map-resolve": { + "version": "0.5.1", "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "atob": "2.0.3", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, - "pify": { - "version": "2.3.0", - "bundled": true, - "dev": true - }, - "pinkie": { - "version": "2.0.4", + "source-map-url": { + "version": "0.4.0", "bundled": true, "dev": true }, - "pinkie-promise": { - "version": "2.0.1", + "spawn-wrap": { + "version": "1.4.2", "bundled": true, "dev": true, "requires": { - "pinkie": "2.0.4" + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" } }, - "pkg-dir": { - "version": "1.0.0", + "spdx-correct": { + "version": "3.0.0", "bundled": true, "dev": true, - "requires": { - "find-up": "1.1.2" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - } + "requires": { + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, - "preserve": { - "version": "0.2.0", + "spdx-exceptions": { + "version": "2.1.0", "bundled": true, "dev": true }, - "pseudomap": { - "version": "1.0.2", + "spdx-expression-parse": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.0", "bundled": true, "dev": true }, - "randomatic": { - "version": "1.1.7", + "split-string": { + "version": "3.1.0", "bundled": true, "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "extend-shallow": "3.0.2" + } + }, + "static-extend": { + "version": "0.1.2", + "bundled": true, + "dev": true, + "requires": { + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", "bundled": true, "dev": true, "requires": { @@ -8371,255 +10845,380 @@ } } }, - "kind-of": { - "version": "4.0.0", + "is-data-descriptor": { + "version": "0.1.4", "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" } + }, + "kind-of": { + "version": "5.1.0", + "bundled": true, + "dev": true } } }, - "read-pkg": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", + "string-width": { + "version": "2.1.1", "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { - "find-up": { - "version": "1.1.2", + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "ansi-regex": "3.0.0" } } } }, - "regenerator-runtime": { - "version": "0.11.1", - "bundled": true, - "dev": true - }, - "regex-cache": { - "version": "0.4.4", + "strip-ansi": { + "version": "3.0.1", "bundled": true, "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "ansi-regex": "2.1.1" } }, - "remove-trailing-separator": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "bundled": true, - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "bundled": true, - "dev": true - }, - "repeating": { - "version": "2.0.1", + "strip-bom": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "is-finite": "1.0.2" + "is-utf8": "0.2.1" } }, - "require-directory": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", + "strip-eof": { + "version": "1.0.0", "bundled": true, "dev": true }, - "resolve-from": { + "supports-color": { "version": "2.0.0", "bundled": true, "dev": true }, - "right-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4" - } - }, - "rimraf": { - "version": "2.6.2", + "test-exclude": { + "version": "4.2.1", "bundled": true, "dev": true, "requires": { - "glob": "7.1.2" + "arrify": "1.0.1", + "micromatch": "3.1.9", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "bundled": true, + "dev": true + }, + "braces": { + "version": "2.3.1", + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "define-property": "1.0.0", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "kind-of": "6.0.2", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "expand-brackets": { + "version": "2.1.4", + "bundled": true, + "dev": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "bundled": true, + "dev": true + } + } + }, + "extglob": { + "version": "2.0.4", + "bundled": true, + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-number": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + }, + "micromatch": { + "version": "3.1.9", + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.1", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + } } }, - "semver": { - "version": "5.4.1", - "bundled": true, - "dev": true - }, - "set-blocking": { - "version": "2.0.0", + "to-fast-properties": { + "version": "1.0.3", "bundled": true, "dev": true }, - "shebang-command": { - "version": "1.2.0", + "to-object-path": { + "version": "0.3.0", "bundled": true, "dev": true, "requires": { - "shebang-regex": "1.0.0" + "kind-of": "3.2.2" } }, - "shebang-regex": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "signal-exit": { + "to-regex": { "version": "3.0.2", "bundled": true, - "dev": true - }, - "slide": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "source-map": { - "version": "0.5.7", - "bundled": true, - "dev": true - }, - "spawn-wrap": { - "version": "1.4.2", - "bundled": true, - "dev": true, - "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.0" - } - }, - "spdx-correct": { - "version": "1.0.2", - "bundled": true, "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, - "spdx-expression-parse": { - "version": "1.0.4", - "bundled": true, - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "bundled": true, - "dev": true - }, - "string-width": { + "to-regex-range": { "version": "2.1.1", "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-number": "3.0.0", + "repeat-string": "1.6.1" }, "dependencies": { - "ansi-regex": { + "is-number": { "version": "3.0.0", "bundled": true, - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, "dev": true, "requires": { - "ansi-regex": "3.0.0" + "kind-of": "3.2.2" } } } }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "test-exclude": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" - } - }, - "to-fast-properties": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, "trim-right": { "version": "1.0.1", "bundled": true, @@ -8656,13 +11255,106 @@ "dev": true, "optional": true }, + "union-value": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "set-value": { + "version": "0.4.3", + "bundled": true, + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" + } + } + } + }, + "unset-value": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "has-value": "0.3.1", + "isobject": "3.0.1" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "bundled": true, + "dev": true, + "requires": { + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "bundled": true, + "dev": true + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } + } + }, + "urix": { + "version": "0.1.0", + "bundled": true, + "dev": true + }, + "use": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, "validate-npm-package-license": { - "version": "3.0.1", + "version": "3.0.3", "bundled": true, "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "which": { @@ -8698,6 +11390,14 @@ "strip-ansi": "3.0.1" }, "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, "string-width": { "version": "1.0.2", "bundled": true, @@ -8736,11 +11436,11 @@ "dev": true }, "yargs": { - "version": "10.0.3", + "version": "11.1.0", "bundled": true, "dev": true, "requires": { - "cliui": "3.2.0", + "cliui": "4.0.0", "decamelize": "1.2.0", "find-up": "2.1.0", "get-caller-file": "1.0.2", @@ -8751,35 +11451,49 @@ "string-width": "2.1.1", "which-module": "2.0.0", "y18n": "3.2.1", - "yargs-parser": "8.0.0" + "yargs-parser": "9.0.2" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "camelcase": { + "version": "4.1.0", + "bundled": true, + "dev": true + }, "cliui": { - "version": "3.2.0", + "version": "4.0.0", "bundled": true, "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } + } + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "yargs-parser": { + "version": "9.0.2", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "4.1.0" } } } }, "yargs-parser": { - "version": "8.0.0", + "version": "8.1.0", "bundled": true, "dev": true, "requires": { @@ -8856,6 +11570,14 @@ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } } } }, @@ -8870,13 +11592,6 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "object.omit": { @@ -8895,13 +11610,6 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "observable-to-promise": { @@ -8911,14 +11619,25 @@ "dev": true, "requires": { "is-observable": "0.2.0", - "symbol-observable": "1.1.0" + "symbol-observable": "1.2.0" }, "dependencies": { - "symbol-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz", - "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw==", - "dev": true + "is-observable": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-0.2.0.tgz", + "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", + "dev": true, + "requires": { + "symbol-observable": "0.2.4" + }, + "dependencies": { + "symbol-observable": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz", + "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=", + "dev": true + } + } } } }, @@ -8936,7 +11655,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "1.2.0" } }, "optimist": { @@ -9008,6 +11727,11 @@ "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==", "dev": true }, + "p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -9038,6 +11762,15 @@ "p-limit": "1.2.0" } }, + "p-timeout": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", + "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "dev": true, + "requires": { + "p-finally": "1.0.0" + } + }, "p-try": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", @@ -9063,9 +11796,9 @@ "dev": true, "requires": { "got": "6.7.1", - "registry-auth-token": "3.3.1", + "registry-auth-token": "3.3.2", "registry-url": "3.1.0", - "semver": "5.4.1" + "semver": "5.5.0" }, "dependencies": { "got": { @@ -9099,6 +11832,23 @@ "is-dotfile": "1.0.3", "is-extglob": "1.0.0", "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } } }, "parse-json": { @@ -9111,9 +11861,9 @@ } }, "parse-ms": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz", - "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz", + "integrity": "sha1-3T+iXtbC78e93hKtm0bBY6opIk4=", "dev": true }, "pascalcase": { @@ -9173,12 +11923,11 @@ } }, "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { - "pify": "2.3.0" + "pify": "3.0.0" } }, "performance-now": { @@ -9187,24 +11936,23 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", + "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=", "dev": true }, "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", + "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "1.0.0" } }, "pkg-conf": { @@ -9238,12 +11986,6 @@ "error-ex": "1.3.1", "json-parse-better-errors": "1.0.1" } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true } } }, @@ -9277,14 +12019,14 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", - "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", + "version": "6.0.20", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz", + "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==", "dev": true, "requires": { - "chalk": "2.3.0", + "chalk": "2.3.2", "source-map": "0.6.1", - "supports-color": "5.1.0" + "supports-color": "5.3.0" }, "dependencies": { "source-map": { @@ -9292,15 +12034,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", - "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } } } }, @@ -9335,13 +12068,6 @@ "core-js": "2.5.3", "espurify": "1.7.0", "estraverse": "4.2.0" - }, - "dependencies": { - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" - } } }, "power-assert-context-traversal": { @@ -9439,9 +12165,9 @@ "dev": true }, "prettier": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.10.1.tgz", - "integrity": "sha512-lPTx4BsvN5v9w/JXBRNlvTXCJBKrr7VW4NOl1rdX00x+YuOLqNYAOGk2x7v+4PI4hx/SyW1Z3AEg9MeB87yYcQ==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz", + "integrity": "sha512-T/KD65Ot0PB97xTrG8afQ46x3oiVhnfGjGESSI9NWYcG92+OUPZKkwHqGWXH2t9jK1crnQjubECW0FuOth+hxw==", "dev": true }, "pretty-ms": { @@ -9452,6 +12178,14 @@ "requires": { "parse-ms": "1.0.1", "plur": "2.1.2" + }, + "dependencies": { + "parse-ms": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz", + "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=", + "dev": true + } } }, "private": { @@ -9461,9 +12195,9 @@ "dev": true }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "progress": { "version": "2.0.0", @@ -9472,9 +12206,9 @@ "dev": true }, "protobufjs": { - "version": "6.8.4", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.4.tgz", - "integrity": "sha512-d+WZqUDXKM+oZhr8yprAtQW07q08p9/V35AJ2J1fds+r903S/aH9P8uO1gmTwozOKugt2XCjdrre3OxuPRGkGg==", + "version": "6.8.6", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", + "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", "requires": { "@protobufjs/aspromise": "1.1.2", "@protobufjs/base64": "1.1.2", @@ -9487,8 +12221,8 @@ "@protobufjs/pool": "1.1.0", "@protobufjs/utf8": "1.1.0", "@types/long": "3.0.32", - "@types/node": "8.5.8", - "long": "3.2.0" + "@types/node": "8.9.5", + "long": "4.0.0" } }, "proxyquire": { @@ -9505,8 +12239,7 @@ "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "punycode": { "version": "1.4.1", @@ -9539,26 +12272,6 @@ "kind-of": "4.0.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", @@ -9571,9 +12284,9 @@ } }, "rc": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.3.tgz", - "integrity": "sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s=", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz", + "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=", "dev": true, "requires": { "deep-extend": "0.4.2", @@ -9599,6 +12312,23 @@ "load-json-file": "2.0.0", "normalize-package-data": "2.4.0", "path-type": "2.0.0" + }, + "dependencies": { + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } } }, "read-pkg-up": { @@ -9612,14 +12342,14 @@ } }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", + "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", - "process-nextick-args": "1.0.7", + "process-nextick-args": "2.0.0", "safe-buffer": "5.1.1", "string_decoder": "1.0.3", "util-deprecate": "1.0.2" @@ -9633,7 +12363,7 @@ "requires": { "graceful-fs": "4.1.11", "minimatch": "3.0.4", - "readable-stream": "2.3.3", + "readable-stream": "2.3.5", "set-immediate-shim": "1.0.1" } }, @@ -9688,6 +12418,12 @@ "safe-regex": "1.1.0" } }, + "regexpp": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.0.1.tgz", + "integrity": "sha512-8Ph721maXiOYSLtaDGKVmDn5wdsNaF6Px85qFNeMPQq0r8K5Y10tgP6YuR65Ws35n4DvzFcCxEnRNBIXQunzLw==", + "dev": true + }, "regexpu-core": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", @@ -9700,12 +12436,12 @@ } }, "registry-auth-token": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz", - "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", + "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { - "rc": "1.2.3", + "rc": "1.2.6", "safe-buffer": "5.1.1" } }, @@ -9715,7 +12451,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "1.2.3" + "rc": "1.2.6" } }, "regjsgen": { @@ -9768,32 +12504,32 @@ } }, "request": { - "version": "2.83.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", - "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", + "version": "2.85.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", + "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", "requires": { "aws-sign2": "0.7.0", "aws4": "1.6.0", "caseless": "0.12.0", - "combined-stream": "1.0.5", + "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", - "form-data": "2.3.1", + "form-data": "2.3.2", "har-validator": "5.0.3", "hawk": "6.0.2", "http-signature": "1.2.0", "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "oauth-sign": "0.8.2", "performance-now": "2.1.0", "qs": "6.5.1", "safe-buffer": "5.1.1", "stringstream": "0.0.5", - "tough-cookie": "2.3.3", + "tough-cookie": "2.3.4", "tunnel-agent": "0.6.0", - "uuid": "3.1.0" + "uuid": "3.2.1" } }, "require-directory": { @@ -9899,12 +12635,17 @@ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, + "retry-axios": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/retry-axios/-/retry-axios-0.3.2.tgz", + "integrity": "sha512-jp4YlI0qyDFfXiXGhkCOliBN1G7fRH03Nqy8YdShzGqbY5/9S2x/IR6C88ls2DFkbWuL3ASkP7QD3pVrNpPgwQ==" + }, "retry-request": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz", "integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw==", "requires": { - "request": "2.83.0", + "request": "2.85.0", "through2": "2.0.3" } }, @@ -9971,24 +12712,27 @@ "dev": true }, "sanitize-html": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.16.3.tgz", - "integrity": "sha512-XpAJGnkMfNM7AzXLRw225blBB/pE4dM4jzRn98g4r88cfxwN6g+5IsRmCAh/gbhYGm6u6i97zsatMOM7Lr8wyw==", + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz", + "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", "dev": true, "requires": { + "chalk": "2.3.2", "htmlparser2": "3.9.2", "lodash.clonedeep": "4.5.0", "lodash.escaperegexp": "4.1.2", - "lodash.mergewith": "4.6.0", - "postcss": "6.0.16", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", + "lodash.mergewith": "4.6.1", + "postcss": "6.0.20", "srcset": "1.0.0", "xtend": "4.0.1" } }, "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, "semver-diff": { @@ -9997,7 +12741,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "5.4.1" + "semver": "5.5.0" } }, "serialize-error": { @@ -10060,6 +12804,21 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "sinon": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.3.0.tgz", + "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", + "dev": true, + "requires": { + "@sinonjs/formatio": "2.0.0", + "diff": "3.5.0", + "lodash.get": "4.4.2", + "lolex": "2.3.2", + "nise": "1.3.2", + "supports-color": "5.3.0", + "type-detect": "4.0.8" + } + }, "slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", @@ -10177,11 +12936,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -10202,11 +12956,6 @@ "requires": { "is-descriptor": "1.0.2" } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -10216,6 +12965,16 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } } }, "sntp": { @@ -10223,7 +12982,7 @@ "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", "requires": { - "hoek": "4.2.0" + "hoek": "4.2.1" } }, "sort-keys": { @@ -10253,12 +13012,20 @@ } }, "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", + "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "source-map-url": { @@ -10267,24 +13034,35 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" }, "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", + "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "spdx-exceptions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", + "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", "dev": true }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" + } + }, "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", + "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", "dev": true }, "split-array-stream": { @@ -10321,9 +13099,9 @@ } }, "sshpk": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", - "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", @@ -10533,12 +13311,20 @@ "cookiejar": "2.1.1", "debug": "3.1.0", "extend": "3.0.1", - "form-data": "2.3.1", - "formidable": "1.1.1", + "form-data": "2.3.2", + "formidable": "1.2.0", "methods": "1.1.2", "mime": "1.6.0", "qs": "6.5.1", - "readable-stream": "2.3.3" + "readable-stream": "2.3.5" + }, + "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true + } } }, "supertap": { @@ -10549,7 +13335,7 @@ "requires": { "arrify": "1.0.1", "indent-string": "3.2.0", - "js-yaml": "3.10.0", + "js-yaml": "3.11.0", "serialize-error": "2.1.0", "strip-ansi": "4.0.0" }, @@ -10582,18 +13368,26 @@ } }, "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", + "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "3.0.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + } } }, "symbol-observable": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz", - "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", "dev": true }, "table": { @@ -10604,8 +13398,8 @@ "requires": { "ajv": "5.5.2", "ajv-keywords": "2.1.1", - "chalk": "2.3.0", - "lodash": "4.17.4", + "chalk": "2.3.2", + "lodash": "4.17.5", "slice-ansi": "1.0.0", "string-width": "2.1.1" }, @@ -10681,7 +13475,7 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "2.3.3", + "readable-stream": "2.3.5", "xtend": "4.0.1" } }, @@ -10718,6 +13512,16 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } } }, "to-regex": { @@ -10738,22 +13542,12 @@ "requires": { "is-number": "3.0.0", "repeat-string": "1.6.1" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - } - } } }, "tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { "punycode": "1.4.1" } @@ -10805,9 +13599,9 @@ } }, "type-detect": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.5.tgz", - "integrity": "sha512-N9IvkQslUGYGC24RkJk1ba99foK6TkwC2FHAEBlQFBP0RxQZS8ZpJuAZcwiY/w9ZJHFQb1aOXBI60OdxhTrwEQ==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true }, "type-name": { @@ -11017,11 +13811,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -11038,7 +13827,7 @@ "dev": true, "requires": { "boxen": "1.3.0", - "chalk": "2.3.0", + "chalk": "2.3.2", "configstore": "3.1.1", "import-lazy": "2.1.0", "is-installed-globally": "0.1.0", @@ -11080,13 +13869,6 @@ "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } } }, "util-deprecate": { @@ -11095,18 +13877,18 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" }, "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", + "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "verror": { @@ -11235,7 +14017,7 @@ "requires": { "detect-indent": "5.0.0", "graceful-fs": "4.1.11", - "make-dir": "1.1.0", + "make-dir": "1.2.0", "pify": "3.0.0", "sort-keys": "2.0.0", "write-file-atomic": "2.3.0" @@ -11246,12 +14028,6 @@ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=", "dev": true - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true } } }, @@ -11290,8 +14066,7 @@ "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, "yargs": { "version": "3.32.0", @@ -11306,6 +14081,23 @@ "window-size": "0.1.4", "y18n": "3.2.1" } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + } + } } } } diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f4d0cd2cc15..991dbc1c3ca 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -66,15 +66,18 @@ "@google-cloud/common": "^0.16.1", "arrify": "^1.0.0", "async-each": "^1.0.1", + "delay": "^2.0.0", + "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auto-auth": "^0.9.0", - "google-gax": "^0.15.0", + "google-gax": "^0.16.0", "google-proto-files": "^0.15.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", "protobufjs": "^6.8.1", + "through2": "^2.0.3", "uuid": "^3.1.0" }, "devDependencies": { diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index d92de22ebe0..a7b41263699 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -16,11 +16,12 @@ 'use strict'; -var arrify = require('arrify'); var common = require('@google-cloud/common'); +var duplexify = require('duplexify'); var each = require('async-each'); var events = require('events'); var is = require('is'); +var through = require('through2'); var util = require('util'); var uuid = require('uuid'); @@ -142,14 +143,11 @@ ConnectionPool.prototype.acquire = function(id, callback) { * @param {?error} callback.error An error returned while closing the pool. */ ConnectionPool.prototype.close = function(callback) { + var self = this; var connections = Array.from(this.connections.values()); callback = callback || common.util.noop; - if (this.client) { - this.client.close(); - } - this.connections.clear(); this.queue.forEach(clearTimeout); this.queue.length = 0; @@ -167,9 +165,19 @@ ConnectionPool.prototype.close = function(callback) { each( connections, function(connection, onEndCallback) { - connection.end(onEndCallback); + connection.end(function(err) { + connection.cancel(); + onEndCallback(err); + }); }, - callback + function(err) { + if (self.client) { + self.client.close(); + self.client = null; + } + + callback(err); + } ); }; @@ -188,9 +196,22 @@ ConnectionPool.prototype.createConnection = function() { return; } + var requestStream = client.streamingPull(); + + var readStream = requestStream.pipe( + through.obj(function(chunk, enc, next) { + chunk.receivedMessages.forEach(function(message) { + readStream.push(message); + }); + next(); + }) + ); + + var connection = duplexify(requestStream, readStream, {objectMode: true}); var id = uuid.v4(); - var connection = client.streamingPull(); - var errorImmediateHandle; + var lastStatus; + + connection.cancel = requestStream.cancel.bind(requestStream); if (self.isPaused) { connection.pause(); @@ -200,10 +221,11 @@ ConnectionPool.prototype.createConnection = function() { .once(CHANNEL_ERROR_EVENT, onChannelError) .once(CHANNEL_READY_EVENT, onChannelReady); + requestStream.on('status', onConnectionStatus); + connection .on('error', onConnectionError) .on('data', onConnectionData) - .on('status', onConnectionStatus) .write({ subscription: common.util.replaceProjectIdToken( self.subscription.name, @@ -217,7 +239,7 @@ ConnectionPool.prototype.createConnection = function() { function onChannelError() { self.removeListener(CHANNEL_READY_EVENT, onChannelReady); - connection.cancel(); + requestStream.cancel(); } function onChannelReady() { @@ -238,17 +260,17 @@ ConnectionPool.prototype.createConnection = function() { // to the `status` event where we can check if the connection should be // re-opened or if we should send the error to the user function onConnectionError(err) { - errorImmediateHandle = setImmediate(self.emit.bind(self), 'error', err); + if (!lastStatus || err.code !== lastStatus.code) { + self.emit('error', err); + } } - function onConnectionData(data) { - arrify(data.receivedMessages).forEach(function(message) { - self.emit('message', self.createMessage(id, message)); - }); + function onConnectionData(message) { + self.emit('message', self.createMessage(id, message)); } function onConnectionStatus(status) { - clearImmediate(errorImmediateHandle); + lastStatus = status; connection.end(); self.connections.delete(id); diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 360e359a413..5c0018d3549 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -19,6 +19,7 @@ var arrify = require('arrify'); var chunk = require('lodash.chunk'); var common = require('@google-cloud/common'); +var delay = require('delay'); var events = require('events'); var extend = require('extend'); var is = require('is'); @@ -281,16 +282,17 @@ Subscription.formatName_ = function(projectId, name) { * @param {object} message The message object. */ Subscription.prototype.ack_ = function(message) { - this.breakLease_(message); + var breakLease = this.breakLease_.bind(this, message); + this.histogram.add(Date.now() - message.received); if (this.isConnected_()) { - this.acknowledge_(message.ackId, message.connectionId); + this.acknowledge_(message.ackId, message.connectionId).then(breakLease); return; } this.inventory_.ack.push(message.ackId); - this.setFlushTimeout_(); + this.setFlushTimeout_().then(breakLease); }; /*! @@ -634,8 +636,10 @@ Subscription.prototype.exists = function(callback) { Subscription.prototype.flushQueues_ = function() { var self = this; - clearTimeout(this.flushTimeoutHandle_); - this.flushTimeoutHandle_ = null; + if (this.flushTimeoutHandle_) { + this.flushTimeoutHandle_.cancel(); + this.flushTimeoutHandle_ = null; + } var acks = this.inventory_.ack; var nacks = this.inventory_.nack; @@ -1013,15 +1017,17 @@ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { * @param {object} message - The message object. */ Subscription.prototype.nack_ = function(message) { - this.breakLease_(message); + var breakLease = this.breakLease_.bind(this, message); if (this.isConnected_()) { - this.modifyAckDeadline_(message.ackId, 0, message.connectionId); + this.modifyAckDeadline_(message.ackId, 0, message.connectionId).then( + breakLease + ); return; } this.inventory_.nack.push(message.ackId); - this.setFlushTimeout_(); + this.setFlushTimeout_().then(breakLease); }; /*! @@ -1040,16 +1046,11 @@ Subscription.prototype.openConnection_ = function() { }); pool.on('message', function(message) { - if (!self.hasMaxMessages_()) { - self.emit('message', self.leaseMessage_(message)); - return; - } + self.emit('message', self.leaseMessage_(message)); - if (!pool.isPaused) { + if (!pool.isPaused && self.hasMaxMessages_()) { pool.pause(); } - - message.nack(); }); pool.once('connected', function() { @@ -1155,11 +1156,17 @@ Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { * @private */ Subscription.prototype.setFlushTimeout_ = function() { - if (this.flushTimeoutHandle_) { - return; + if (!this.flushTimeoutHandle_) { + var timeout = delay(1000); + var promise = timeout + .then(this.flushQueues_.bind(this)) + .catch(common.util.noop); + + promise.cancel = timeout.cancel.bind(timeout); + this.flushTimeoutHandle_ = promise; } - this.flushTimeoutHandle_ = setTimeout(this.flushQueues_.bind(this), 1000); + return this.flushTimeoutHandle_; }; /*! diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index fce4c33c2a1..0d793ba4f6d 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -86,7 +86,7 @@ "retry_params_name": "messaging" }, "StreamingPull": { - "timeout_millis": 60000, + "timeout_millis": 900000, "retry_codes_name": "pull", "retry_params_name": "streaming_messaging" }, diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index cb09ce301c3..d278aaaab05 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -451,7 +451,7 @@ describe('pubsub', function() { maxConnections: 1, }); - subscription.once('error', function(err) { + subscription.on('error', function(err) { assert.strictEqual(err.code, 5); subscription.close(done); }); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index c95fd3f013a..52d248a094c 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -18,6 +18,7 @@ var assert = require('assert'); var common = require('@google-cloud/common'); +var duplexify = require('duplexify'); var events = require('events'); var extend = require('extend'); var proxyquire = require('proxyquire'); @@ -40,14 +41,22 @@ util.inherits(FakeConnection, events.EventEmitter); FakeConnection.prototype.write = function() {}; -FakeConnection.prototype.end = function() { +FakeConnection.prototype.end = function(callback) { this.ended = true; + + if (callback) { + callback(null); + } }; FakeConnection.prototype.pause = function() { this.isPaused = true; }; +FakeConnection.prototype.pipe = function(stream) { + return stream; +}; + FakeConnection.prototype.resume = function() { this.isPaused = false; }; @@ -56,6 +65,13 @@ FakeConnection.prototype.cancel = function() { this.canceled = true; }; +var duplexifyOverride = null; + +function fakeDuplexify() { + var args = [].slice.call(arguments); + return (duplexifyOverride || duplexify).apply(null, args); +} + describe('ConnectionPool', function() { var ConnectionPool; var pool; @@ -85,12 +101,14 @@ describe('ConnectionPool', function() { '@google-cloud/common': { util: fakeUtil, }, + duplexify: fakeDuplexify, uuid: fakeUuid, }); }); beforeEach(function() { fakeConnection = new FakeConnection(); + duplexifyOverride = null; fakeChannel = { getConnectivityState: function() { @@ -149,7 +167,7 @@ describe('ConnectionPool', function() { it('should respect user specified settings', function() { var options = { - maxConnections: 10, + maxConnections: 2, ackDeadline: 100, }; @@ -242,36 +260,6 @@ describe('ConnectionPool', function() { }); describe('close', function() { - it('should close the client', function(done) { - pool.client = {close: done}; - pool.close(); - }); - - it('should set isOpen to false', function() { - pool.close(); - assert.strictEqual(pool.isOpen, false); - }); - - it('should set isGettingChannelState to false', function() { - pool.isGettingChannelState = true; - pool.close(); - - assert.strictEqual(pool.isGettingChannelState, false); - }); - - it('should call end on all active connections', function() { - var a = new FakeConnection(); - var b = new FakeConnection(); - - pool.connections.set('a', a); - pool.connections.set('b', b); - - pool.close(); - - assert.strictEqual(a.ended, true); - assert.strictEqual(b.ended, true); - }); - it('should clear the connections map', function(done) { pool.connections.clear = done; pool.close(); @@ -296,6 +284,18 @@ describe('ConnectionPool', function() { global.clearTimeout = _clearTimeout; }); + it('should set isOpen to false', function() { + pool.close(); + assert.strictEqual(pool.isOpen, false); + }); + + it('should set isGettingChannelState to false', function() { + pool.isGettingChannelState = true; + pool.close(); + + assert.strictEqual(pool.isGettingChannelState, false); + }); + it('should reset internally used props', function() { pool.failedConnectionAttempts = 100; pool.noConnectionsTime = Date.now(); @@ -323,6 +323,39 @@ describe('ConnectionPool', function() { } }); + it('should call cancel on all active connections', function(done) { + var a = new FakeConnection(); + var b = new FakeConnection(); + + pool.connections.set('a', a); + pool.connections.set('b', b); + + pool.close(function(err) { + assert.ifError(err); + assert.strictEqual(a.canceled, true); + assert.strictEqual(b.canceled, true); + done(); + }); + }); + + it('should call end on all active connections', function() { + var a = new FakeConnection(); + var b = new FakeConnection(); + + pool.connections.set('a', a); + pool.connections.set('b', b); + + pool.close(); + + assert.strictEqual(a.ended, true); + assert.strictEqual(b.ended, true); + }); + + it('should close the client', function(done) { + pool.client = {close: done}; + pool.close(); + }); + it('should exec a callback when finished closing', function(done) { pool.close(done); }); @@ -341,6 +374,7 @@ describe('ConnectionPool', function() { var fakeConnection; var fakeChannel; var fakeClient; + var fakeDuplex; beforeEach(function() { fakeConnection = new FakeConnection(); @@ -369,16 +403,12 @@ describe('ConnectionPool', function() { callback(null, fakeClient); }; - }); - it('should make the correct request', function(done) { - fakeClient.streamingPull = function(metadata) { - assert.strictEqual(metadata, pool.metadata_); - setImmediate(done); - return fakeConnection; - }; + fakeDuplex = new FakeConnection(); - pool.createConnection(); + duplexifyOverride = function() { + return fakeDuplex; + }; }); it('should emit any errors that occur when getting client', function(done) { @@ -430,7 +460,7 @@ describe('ConnectionPool', function() { pool.createConnection(); pool.emit(channelReadyEvent); - assert.strictEqual(fakeConnection.isConnected, true); + assert.strictEqual(fakeDuplex.isConnected, true); }); it('should reset internally used properties', function() { @@ -446,7 +476,7 @@ describe('ConnectionPool', function() { it('should emit a connected event', function(done) { pool.on('connected', function(connection) { - assert.strictEqual(connection, fakeConnection); + assert.strictEqual(connection, fakeDuplex); done(); }); @@ -471,13 +501,21 @@ describe('ConnectionPool', function() { }); it('should create a connection', function(done) { + var fakeDuplex = new FakeConnection(); + + duplexifyOverride = function(writable, readable, options) { + assert.strictEqual(writable, fakeConnection); + assert.deepEqual(options, {objectMode: true}); + return fakeDuplex; + }; + fakeUtil.replaceProjectIdToken = function(subName, projectId) { assert.strictEqual(subName, SUB_NAME); assert.strictEqual(projectId, PROJECT_ID); return TOKENIZED_SUB_NAME; }; - fakeConnection.write = function(reqOpts) { + fakeDuplex.write = function(reqOpts) { assert.deepEqual(reqOpts, { subscription: TOKENIZED_SUB_NAME, streamAckDeadlineSeconds: pool.settings.ackDeadline / 1000, @@ -486,15 +524,56 @@ describe('ConnectionPool', function() { pool.connections.set = function(id, connection) { assert.strictEqual(id, fakeId); - assert.strictEqual(connection, fakeConnection); + assert.strictEqual(connection, fakeDuplex); done(); }; pool.createConnection(); }); + it('should unpack the recieved messages', function(done) { + var fakeDuplex = new FakeConnection(); + var pipedMessages = []; + var fakeResp = { + receivedMessages: [{}, {}, {}, {}, null], + }; + + duplexifyOverride = function(writable, readable) { + readable + .on('data', function(message) { + pipedMessages.push(message); + }) + .on('end', function() { + assert.strictEqual(pipedMessages.length, 4); + pipedMessages.forEach(function(message, i) { + assert.strictEqual(message, fakeResp.receivedMessages[i]); + }); + done(); + }) + .write(fakeResp); + + return fakeDuplex; + }; + + pool.createConnection(); + }); + + it('should proxy the cancel method', function() { + var fakeCancel = function() {}; + + fakeConnection.cancel = { + bind: function(context) { + assert.strictEqual(context, fakeConnection); + return fakeCancel; + }, + }; + + pool.createConnection(); + assert.strictEqual(fakeDuplex.cancel, fakeCancel); + }); + it('should pause the connection if the pool is paused', function(done) { - fakeConnection.pause = done; + fakeDuplex.pause = done; pool.isPaused = true; pool.createConnection(); }); @@ -509,7 +588,7 @@ describe('ConnectionPool', function() { }); pool.createConnection(); - fakeConnection.emit('error', error); + fakeDuplex.emit('error', error); }); }); @@ -524,8 +603,8 @@ describe('ConnectionPool', function() { pool.on('error', done); // should not fire pool.createConnection(); - fakeConnection.emit('error', fakeError); fakeConnection.emit('status', fakeError); + fakeDuplex.emit('error', fakeError); done(); }); @@ -543,7 +622,7 @@ describe('ConnectionPool', function() { it('should increment the failed connection counter', function() { pool.failedConnectionAttempts = 0; - fakeConnection.isConnected = false; + fakeDuplex.isConnected = false; pool.createConnection(); fakeConnection.emit('status', {}); @@ -553,7 +632,7 @@ describe('ConnectionPool', function() { it('should not incr. the failed connection counter', function() { pool.failedConnectionAttempts = 0; - fakeConnection.isConnected = true; + fakeDuplex.isConnected = true; pool.createConnection(); fakeConnection.emit('status', {}); @@ -660,7 +739,7 @@ describe('ConnectionPool', function() { }); pool.createConnection(); - fakeConnection.emit('data', {receivedMessages: [fakeResp]}); + fakeDuplex.emit('data', fakeResp); }); }); }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 9c2e1e94fd3..d540e468056 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -18,6 +18,7 @@ var assert = require('assert'); var common = require('@google-cloud/common'); +var delay = require('delay'); var events = require('events'); var extend = require('extend'); var is = require('is'); @@ -62,6 +63,12 @@ function FakeSnapshot() { this.calledWith_ = [].slice.call(arguments); } +var delayOverride = null; + +function fakeDelay(timeout) { + return (delayOverride || delay)(timeout); +} + describe('Subscription', function() { var Subscription; var subscription; @@ -81,6 +88,7 @@ describe('Subscription', function() { '@google-cloud/common': { util: fakeUtil, }, + delay: fakeDelay, os: fakeOs, './connection-pool.js': FakeConnectionPool, './histogram.js': FakeHistogram, @@ -285,19 +293,14 @@ describe('Subscription', function() { }; beforeEach(function() { - subscription.setFlushTimeout_ = fakeUtil.noop; subscription.breakLease_ = fakeUtil.noop; subscription.histogram.add = fakeUtil.noop; - subscription.acknowledge_ = fakeUtil.noop; - }); - - it('should break the lease on the message', function(done) { - subscription.breakLease_ = function(message) { - assert.strictEqual(message, MESSAGE); - done(); + subscription.acknowledge_ = function() { + return Promise.resolve(); + }; + subscription.setFlushTimeout_ = function() { + return Promise.resolve(); }; - - subscription.ack_(MESSAGE); }); it('should add the time it took to ack to the histogram', function(done) { @@ -317,31 +320,58 @@ describe('Subscription', function() { subscription.ack_(MESSAGE); }); - it('should acknowledge if there is a connection', function(done) { - subscription.isConnected_ = function() { - return true; - }; + describe('with connection', function() { + beforeEach(function() { + subscription.isConnected_ = function() { + return true; + }; + }); - subscription.acknowledge_ = function(ackId, connectionId) { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(connectionId, MESSAGE.connectionId); - done(); - }; + it('should acknowledge if there is a connection', function(done) { + subscription.acknowledge_ = function(ackId, connectionId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(connectionId, MESSAGE.connectionId); + setImmediate(done); + return Promise.resolve(); + }; - subscription.ack_(MESSAGE); + subscription.ack_(MESSAGE); + }); + + it('should break the lease on the message', function(done) { + subscription.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); + done(); + }; + + subscription.ack_(MESSAGE); + }); }); - it('should queue the message to be acked if no connection', function(done) { - subscription.isConnected_ = function() { - return false; - }; + describe('without connection', function() { + beforeEach(function() { + subscription.isConnected_ = function() { + return false; + }; + }); - subscription.setFlushTimeout_ = function() { - assert(subscription.inventory_.ack.indexOf(MESSAGE.ackId) > -1); - done(); - }; + it('should queue the message to be acked if no connection', function(done) { + subscription.setFlushTimeout_ = function() { + assert(subscription.inventory_.ack.indexOf(MESSAGE.ackId) > -1); + done(); + }; - subscription.ack_(MESSAGE); + subscription.ack_(MESSAGE); + }); + + it('should break the lease on the message', function(done) { + subscription.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); + done(); + }; + + subscription.ack_(MESSAGE); + }); }); }); @@ -948,23 +978,18 @@ describe('Subscription', function() { describe('flushQueues_', function() { it('should cancel any pending flushes', function() { - var fakeHandle = 'abc'; - var cleared = false; - - var _clearTimeout = global.clearTimeout; - - global.clearTimeout = function(handle) { - assert.strictEqual(handle, fakeHandle); - cleared = true; + var canceled = false; + var fakeHandle = { + cancel: function() { + canceled = true; + }, }; subscription.flushTimeoutHandle_ = fakeHandle; subscription.flushQueues_(); assert.strictEqual(subscription.flushTimeoutHandle_, null); - assert.strictEqual(cleared, true); - - global.clearTimeout = _clearTimeout; + assert.strictEqual(canceled, true); }); it('should do nothing if theres nothing to ack/nack', function() { @@ -1565,45 +1590,69 @@ describe('Subscription', function() { }; beforeEach(function() { - subscription.setFlushTimeout_ = fakeUtil.noop; subscription.breakLease_ = fakeUtil.noop; + subscription.modifyAckDeadline_ = function() { + return Promise.resolve(); + }; + subscription.setFlushTimeout_ = function() { + return Promise.resolve(); + }; }); - it('should break the lease on the message', function(done) { - subscription.breakLease_ = function(message) { - assert.strictEqual(message, MESSAGE); - done(); - }; + describe('with connection', function() { + beforeEach(function() { + subscription.isConnected_ = function() { + return true; + }; + }); - subscription.nack_(MESSAGE); - }); + it('should nack if there is a connection', function(done) { + subscription.modifyAckDeadline_ = function(ackId, deadline, connId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(deadline, 0); + assert.strictEqual(connId, MESSAGE.connectionId); + setImmediate(done); + return Promise.resolve(); + }; - it('should nack if there is a connection', function(done) { - subscription.isConnected_ = function() { - return true; - }; + subscription.nack_(MESSAGE); + }); - subscription.modifyAckDeadline_ = function(ackId, deadline, connId) { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(deadline, 0); - assert.strictEqual(connId, MESSAGE.connectionId); - done(); - }; + it('should break the lease on the message', function(done) { + subscription.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); + done(); + }; - subscription.nack_(MESSAGE); + subscription.nack_(MESSAGE); + }); }); - it('should queue the message to be nacked if no conn', function(done) { - subscription.isConnected_ = function() { - return false; - }; + describe('without connection', function() { + beforeEach(function() { + subscription.isConnected_ = function() { + return false; + }; + }); - subscription.setFlushTimeout_ = function() { - assert(subscription.inventory_.nack.indexOf(MESSAGE.ackId) > -1); - done(); - }; + it('should queue the message to be nacked if no conn', function(done) { + subscription.setFlushTimeout_ = function() { + assert(subscription.inventory_.nack.indexOf(MESSAGE.ackId) > -1); + setImmediate(done); + return Promise.resolve(); + }; + + subscription.nack_(MESSAGE); + }); + + it('should break the lease on the message', function(done) { + subscription.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); + done(); + }; - subscription.nack_(MESSAGE); + subscription.nack_(MESSAGE); + }); }); }); @@ -1692,23 +1741,6 @@ describe('Subscription', function() { done(); }); - it('should nack messages if over limit', function(done) { - var message = {nack: done}; - var leasedMessage = {}; - - subscription.leaseMessage_ = function() { - return leasedMessage; - }; - - subscription.hasMaxMessages_ = function() { - return true; - }; - - subscription.openConnection_(); - subscription.connectionPool.isPaused = true; - subscription.connectionPool.emit('message', message); - }); - it('should flush the queue when connected', function(done) { subscription.flushQueues_ = done; @@ -1861,41 +1893,49 @@ describe('Subscription', function() { }); describe('setFlushTimeout_', function() { - var fakeTimeoutHandle = 1234; - var globalSetTimeout; + it('should set a flush timeout', function(done) { + var flushed = false; - before(function() { - globalSetTimeout = global.setTimeout; - }); + subscription.flushQueues_ = function() { + flushed = true; + }; - after(function() { - global.setTimeout = globalSetTimeout; - }); + var delayPromise = delay(0); + var fakeBoundDelay = function() {}; - it('should set a timeout to call flushQueues', function(done) { - subscription.flushQueues_ = done; + delayPromise.cancel.bind = function(context) { + assert.strictEqual(context, delayPromise); + return fakeBoundDelay; + }; - global.setTimeout = function(callback, duration) { - assert.strictEqual(duration, 1000); - setImmediate(callback); // the done fn - return fakeTimeoutHandle; + delayOverride = function(timeout) { + assert.strictEqual(timeout, 1000); + return delayPromise; }; - subscription.setFlushTimeout_(); - assert.strictEqual(subscription.flushTimeoutHandle_, fakeTimeoutHandle); + var promise = subscription.setFlushTimeout_(); + + promise.then(function() { + assert.strictEqual(subscription.flushTimeoutHandle_, promise); + assert.strictEqual(promise.cancel, fakeBoundDelay); + assert.strictEqual(flushed, true); + done(); + }); }); - it('should not set a timeout if one already exists', function() { - subscription.flushQueues_ = function() { - throw new Error('Should not be called.'); - }; + it('should swallow cancel errors', function() { + var promise = subscription.setFlushTimeout_(); + promise.cancel(); + return promise; + }); - global.setTimeout = function() { - throw new Error('Should not be called.'); - }; + it('should return the cached timeout', function() { + var fakeHandle = {}; + + subscription.flushTimeoutHandle_ = fakeHandle; - subscription.flushTimeoutHandle_ = fakeTimeoutHandle; - subscription.setFlushTimeout_(); + var promise = subscription.setFlushTimeout_(); + assert.strictEqual(fakeHandle, promise); }); }); From dfc5b3ce65fe7f78f026819528fe1ab0e2179573 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 20 Mar 2018 09:03:39 +1300 Subject: [PATCH 0143/1115] capture write times to adjust lease timeout (#99) --- handwritten/pubsub/src/histogram.js | 19 +- handwritten/pubsub/src/subscription.js | 107 ++++++----- handwritten/pubsub/test/histogram.js | 12 ++ handwritten/pubsub/test/subscription.js | 226 ++++++++++++++++-------- 4 files changed, 241 insertions(+), 123 deletions(-) diff --git a/handwritten/pubsub/src/histogram.js b/handwritten/pubsub/src/histogram.js index 115069eb9c2..61dfbe8d0b3 100644 --- a/handwritten/pubsub/src/histogram.js +++ b/handwritten/pubsub/src/histogram.js @@ -16,8 +16,7 @@ 'use strict'; -var MIN_VALUE = 10000; -var MAX_VALUE = 600000; +var extend = require('extend'); /*! * The Histogram class is used to capture the lifespan of messages within the @@ -27,7 +26,15 @@ var MAX_VALUE = 600000; * @private * @class */ -function Histogram() { +function Histogram(options) { + this.options = extend( + { + min: 10000, + max: 600000, + }, + options + ); + this.data = new Map(); this.length = 0; } @@ -39,8 +46,8 @@ function Histogram() { * @param {numnber} value - The value in milliseconds. */ Histogram.prototype.add = function(value) { - value = Math.max(value, MIN_VALUE); - value = Math.min(value, MAX_VALUE); + value = Math.max(value, this.options.min); + value = Math.min(value, this.options.max); value = Math.ceil(value / 1000) * 1000; if (!this.data.has(value)) { @@ -75,7 +82,7 @@ Histogram.prototype.percentile = function(percent) { } } - return MIN_VALUE; + return this.options.min; }; module.exports = Histogram; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 5c0018d3549..d316f4c5c67 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -153,6 +153,7 @@ function Subscription(pubsub, name, options) { this.projectId = pubsub.projectId; this.request = pubsub.request.bind(pubsub); this.histogram = new Histogram(); + this.latency_ = new Histogram({min: 0}); this.name = Subscription.formatName_(pubsub.projectId, name); @@ -312,31 +313,17 @@ Subscription.prototype.acknowledge_ = function(ackIds, connId) { var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( ackIdChunk ) { - if (!self.isConnected_()) { - return common.util.promisify(self.request).call(self, { - client: 'SubscriberClient', - method: 'acknowledge', - reqOpts: { - subscription: self.name, - ackIds: ackIdChunk, - }, - }); + if (self.isConnected_()) { + return self.writeTo_(connId, {ackIds: ackIdChunk}); } - return new Promise(function(resolve, reject) { - self.connectionPool.acquire(connId, function(err, connection) { - if (err) { - reject(err); - return; - } - - connection.write( - { - ackIds: ackIdChunk, - }, - resolve - ); - }); + return common.util.promisify(self.request).call(self, { + client: 'SubscriberClient', + method: 'acknowledge', + reqOpts: { + subscription: self.name, + ackIds: ackIdChunk, + }, }); }); @@ -902,33 +889,21 @@ Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( ackIdChunk ) { - if (!self.isConnected_()) { - return common.util.promisify(self.request).call(self, { - client: 'SubscriberClient', - method: 'modifyAckDeadline', - reqOpts: { - subscription: self.name, - ackDeadlineSeconds: deadline, - ackIds: ackIdChunk, - }, + if (self.isConnected_()) { + return self.writeTo_(connId, { + modifyDeadlineAckIds: ackIdChunk, + modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), }); } - return new Promise(function(resolve, reject) { - self.connectionPool.acquire(connId, function(err, connection) { - if (err) { - reject(err); - return; - } - - connection.write( - { - modifyDeadlineAckIds: ackIdChunk, - modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), - }, - resolve - ); - }); + return common.util.promisify(self.request).call(self, { + client: 'SubscriberClient', + method: 'modifyAckDeadline', + reqOpts: { + subscription: self.name, + ackDeadlineSeconds: deadline, + ackIds: ackIdChunk, + }, }); }); @@ -1180,7 +1155,9 @@ Subscription.prototype.setLeaseTimeout_ = function() { return; } - var timeout = Math.random() * this.ackDeadline * 0.9; + var latency = this.latency_.percentile(99); + var timeout = Math.random() * this.ackDeadline * 0.9 - latency; + this.leaseTimeoutHandle_ = setTimeout(this.renewLeases_.bind(this), timeout); }; @@ -1265,6 +1242,40 @@ Subscription.prototype.snapshot = function(name) { return this.pubsub.snapshot.call(this, name); }; +/** + * Writes to specified duplex stream. This is useful for capturing write + * latencies that can later be used to adjust the auto lease timeout. + * + * @private + * + * @param {string} connId The ID of the connection to write to. + * @param {object} data The data to be written to the stream. + * @returns {Promise} + */ +Subscription.prototype.writeTo_ = function(connId, data) { + var self = this; + var startTime = Date.now(); + + return new Promise(function(resolve, reject) { + self.connectionPool.acquire(connId, function(err, connection) { + if (err) { + reject(err); + return; + } + + connection.write(data, function(err) { + if (err) { + reject(err); + return; + } + + self.latency_.add(Date.now() - startTime); + resolve(); + }); + }); + }); +}; + /*! Developer Documentation * * All async methods (except for streams) will return a Promise in the event diff --git a/handwritten/pubsub/test/histogram.js b/handwritten/pubsub/test/histogram.js index eee2693c194..607589540b7 100644 --- a/handwritten/pubsub/test/histogram.js +++ b/handwritten/pubsub/test/histogram.js @@ -31,6 +31,18 @@ describe('Histogram', function() { }); describe('initialization', function() { + it('should set default min/max values', function() { + assert.strictEqual(histogram.options.min, 10000); + assert.strictEqual(histogram.options.max, 600000); + }); + + it('should accept user defined min/max values', function() { + histogram = new Histogram({min: 5, max: 10}); + + assert.strictEqual(histogram.options.min, 5); + assert.strictEqual(histogram.options.max, 10); + }); + it('should create a data map', function() { assert(histogram.data instanceof Map); }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index d540e468056..4709f8e51ab 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -132,6 +132,10 @@ describe('Subscription', function() { assert(subscription.histogram instanceof FakeHistogram); }); + it('should create a latency histogram', function() { + assert(subscription.latency_ instanceof FakeHistogram); + }); + it('should format the sub name', function() { var formattedName = 'a/b/c/d'; var formatName = Subscription.formatName_; @@ -469,28 +473,19 @@ describe('Subscription', function() { }); describe('with streaming connection', function() { - var pool; - beforeEach(function() { subscription.isConnected_ = function() { return true; }; - - pool = subscription.connectionPool = {}; }); it('should send the correct request', function(done) { var fakeConnectionId = 'abc'; - var fakeConnection = { - write: function(data) { - assert.deepEqual(data, {ackIds: fakeAckIds}); - done(); - }, - }; - pool.acquire = function(connectionId, callback) { + subscription.writeTo_ = function(connectionId, data) { assert.strictEqual(connectionId, fakeConnectionId); - callback(null, fakeConnection); + assert.deepEqual(data, {ackIds: fakeAckIds}); + done(); }; subscription.acknowledge_(fakeAckIds, fakeConnectionId); @@ -498,27 +493,22 @@ describe('Subscription', function() { it('should batch requests if there are too many ackIds', function(done) { var receivedCalls = 0; - var fakeConnectionId = 'abc'; - var fakeConnection = { - write: function(data) { - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); - assert.deepEqual(data, {ackIds: expectedAckIds}); + subscription.writeTo_ = function(connectionId, data) { + assert.strictEqual(connectionId, fakeConnectionId); - receivedCalls += 1; - if (receivedCalls === expectedCalls) { - done(); - } - }, - }; + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + + assert.deepEqual(data, {ackIds: expectedAckIds}); - pool.acquire = function(connectionId, callback) { - callback(null, fakeConnection); + if (++receivedCalls === expectedCalls) { + done(); + } }; subscription.acknowledge_(tooManyFakeAckIds, fakeConnectionId); @@ -527,8 +517,8 @@ describe('Subscription', function() { it('should emit an error when unable to get a conn', function(done) { var error = new Error('err'); - pool.acquire = function(connectionId, callback) { - callback(error); + subscription.writeTo_ = function() { + return Promise.reject(error); }; subscription.on('error', function(err) { @@ -1471,30 +1461,21 @@ describe('Subscription', function() { }); describe('with streaming connection', function() { - var pool; - beforeEach(function() { subscription.isConnected_ = function() { return true; }; - - pool = subscription.connectionPool = {}; }); it('should send the correct request', function(done) { var expectedDeadlines = Array(fakeAckIds.length).fill(fakeDeadline); var fakeConnId = 'abc'; - var fakeConnection = { - write: function(data) { - assert.deepEqual(data.modifyDeadlineAckIds, fakeAckIds); - assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); - done(); - }, - }; - pool.acquire = function(connectionId, callback) { + subscription.writeTo_ = function(connectionId, data) { assert.strictEqual(connectionId, fakeConnId); - callback(null, fakeConnection); + assert.deepEqual(data.modifyDeadlineAckIds, fakeAckIds); + assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); + done(); }; subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); @@ -1502,31 +1483,26 @@ describe('Subscription', function() { it('should batch requests if there are too many ackIds', function(done) { var receivedCalls = 0; - var fakeConnId = 'abc'; - var fakeConnection = { - write: function(data) { - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); - var expectedDeadlines = Array(expectedAckIds.length).fill( - fakeDeadline - ); - assert.deepEqual(data.modifyDeadlineAckIds, expectedAckIds); - assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); + subscription.writeTo_ = function(connectionId, data) { + assert.strictEqual(connectionId, fakeConnId); - receivedCalls += 1; - if (receivedCalls === expectedCalls) { - done(); - } - }, - }; + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + var expectedDeadlines = Array(expectedAckIds.length).fill( + fakeDeadline + ); + + assert.deepEqual(data.modifyDeadlineAckIds, expectedAckIds); + assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); - pool.acquire = function(connectionId, callback) { - callback(null, fakeConnection); + if (++receivedCalls === expectedCalls) { + done(); + } }; subscription.modifyAckDeadline_( @@ -1538,10 +1514,9 @@ describe('Subscription', function() { it('should emit an error when unable to get a conn', function(done) { var error = new Error('err'); - var fakeConnId = 'abc'; - pool.acquire = function(connectionId, callback) { - callback(error); + subscription.writeTo_ = function() { + return Promise.reject(error); }; subscription.on('error', function(err) { @@ -1549,7 +1524,7 @@ describe('Subscription', function() { done(); }); - subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); + subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline); }); }); }); @@ -1953,6 +1928,11 @@ describe('Subscription', function() { beforeEach(function() { subscription.isOpen = true; + subscription.latency_ = { + percentile: function() { + return 0; + }, + }; }); after(function() { @@ -1978,6 +1958,28 @@ describe('Subscription', function() { assert.strictEqual(subscription.leaseTimeoutHandle_, fakeTimeoutHandle); }); + it('should subtract the estimated latency', function(done) { + var latency = 1; + + subscription.latency_.percentile = function(percentile) { + assert.strictEqual(percentile, 99); + return latency; + }; + + var ackDeadline = (subscription.ackDeadline = 1000); + + global.Math.random = function() { + return fakeRandom; + }; + + global.setTimeout = function(callback, duration) { + assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9 - latency); + done(); + }; + + subscription.setLeaseTimeout_(); + }); + it('should not set a timeout if one already exists', function() { subscription.renewLeases_ = function() { throw new Error('Should not be called.'); @@ -2079,4 +2081,90 @@ describe('Subscription', function() { subscription.snapshot(SNAPSHOT_NAME); }); }); + + describe('writeTo_', function() { + var CONNECTION_ID = 'abc'; + var CONNECTION = {}; + + beforeEach(function() { + subscription.connectionPool = { + acquire: function(connId, cb) { + cb(null, CONNECTION); + }, + }; + }); + + it('should return a promise', function() { + subscription.connectionPool.acquire = function() {}; + + var returnValue = subscription.writeTo_(); + assert(returnValue instanceof Promise); + }); + + it('should reject the promise if unable to acquire stream', function() { + var fakeError = new Error('err'); + + subscription.connectionPool.acquire = function(connId, cb) { + assert.strictEqual(connId, CONNECTION_ID); + cb(fakeError); + }; + + return subscription.writeTo_(CONNECTION_ID, {}).then( + function() { + throw new Error('Should not resolve.'); + }, + function(err) { + assert.strictEqual(err, fakeError); + } + ); + }); + + it('should write to the stream', function(done) { + var fakeData = {a: 'b'}; + + CONNECTION.write = function(data) { + assert.strictEqual(data, fakeData); + done(); + }; + + subscription.writeTo_(CONNECTION_ID, fakeData); + }); + + it('should reject the promise if unable to write the data', function() { + var fakeError = new Error('err'); + + CONNECTION.write = function(data, cb) { + cb(fakeError); + }; + + return subscription.writeTo_(CONNECTION_ID, {}).then( + function() { + throw new Error('Should not have resolved.'); + }, + function(err) { + assert.strictEqual(err, fakeError); + } + ); + }); + + it('should capture the write latency when successful', function() { + var fakeLatency = 500; + var capturedLatency; + + CONNECTION.write = function(data, cb) { + setTimeout(cb, 500, null); + }; + + subscription.latency_.add = function(value) { + capturedLatency = value; + }; + + return subscription.writeTo_(CONNECTION_ID, {}).then(function() { + var upper = fakeLatency + 50; + var lower = fakeLatency - 50; + + assert(capturedLatency > lower && capturedLatency < upper); + }); + }); + }); }); From 302489ee3f4ee639b42b028a8f62b79fc826403b Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Mon, 19 Mar 2018 18:32:13 -0700 Subject: [PATCH 0144/1115] chore: setup nighty build in CircleCI (#102) * chore: setup nighty build in CircleCI * chore: setup nighty build in CircleCI --- handwritten/pubsub/.circleci/config.yml | 48 +++++++------ .../pubsub/.circleci/get_workflow_name.py | 67 +++++++++++++++++++ 2 files changed, 96 insertions(+), 19 deletions(-) create mode 100644 handwritten/pubsub/.circleci/get_workflow_name.py diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 4500d7ff4b7..01f754945ea 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -1,21 +1,8 @@ -unit_tests: - steps: &unit_tests - - checkout - - run: - name: Install modules and dependencies. - command: npm install - - run: - name: Run unit tests. - command: npm test - - run: - name: Submit coverage data to codecov. - command: node_modules/.bin/codecov - when: always version: 2 workflows: version: 2 tests: - jobs: + jobs: &workflow_jobs - node4: filters: tags: @@ -77,16 +64,35 @@ workflows: ignore: /.*/ tags: only: '/^v[\d.]+$/' + nightly: + triggers: + - schedule: + cron: 0 7 * * * + filters: + branches: + only: master + jobs: *workflow_jobs jobs: node4: docker: - image: 'node:4' user: node - steps: + steps: &unit_tests_steps - checkout + - run: &remove_package_lock + name: Remove package-lock.json if needed. + command: | + WORKFLOW_NAME=`python .circleci/get_workflow_name.py` + echo "Workflow name: $WORKFLOW_NAME" + if [ "$WORKFLOW_NAME" = "nightly" ]; then + echo "Nightly build detected, removing package-lock.json." + rm -f package-lock.json samples/package-lock.json + else + echo "Not a nightly build, skipping this step." + fi - run: name: Install modules and dependencies. - command: npm install --unsafe-perm + command: npm install - run: name: Run unit tests. command: npm test @@ -98,23 +104,24 @@ jobs: docker: - image: 'node:6' user: node - steps: *unit_tests + steps: *unit_tests_steps node8: docker: - image: 'node:8' user: node - steps: *unit_tests + steps: *unit_tests_steps node9: docker: - image: 'node:9' user: node - steps: *unit_tests + steps: *unit_tests_steps lint: docker: - image: 'node:8' user: node steps: - checkout + - run: *remove_package_lock - run: name: Install modules and dependencies. command: | @@ -143,6 +150,7 @@ jobs: user: node steps: - checkout + - run: *remove_package_lock - run: name: Install modules and dependencies. command: npm install @@ -155,6 +163,7 @@ jobs: user: node steps: - checkout + - run: *remove_package_lock - run: name: Decrypt credentials. command: | @@ -196,6 +205,7 @@ jobs: user: node steps: - checkout + - run: *remove_package_lock - run: name: Decrypt credentials. command: | diff --git a/handwritten/pubsub/.circleci/get_workflow_name.py b/handwritten/pubsub/.circleci/get_workflow_name.py new file mode 100644 index 00000000000..ff6b58fd24f --- /dev/null +++ b/handwritten/pubsub/.circleci/get_workflow_name.py @@ -0,0 +1,67 @@ +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +Get workflow name for the current build using CircleCI API. +Would be great if this information is available in one of +CircleCI environment variables, but it's not there. +https://circleci.ideas.aha.io/ideas/CCI-I-295 +""" + +import json +import os +import sys +import urllib2 + + +def main(): + try: + username = os.environ['CIRCLE_PROJECT_USERNAME'] + reponame = os.environ['CIRCLE_PROJECT_REPONAME'] + build_num = os.environ['CIRCLE_BUILD_NUM'] + except: + sys.stderr.write( + 'Looks like we are not inside CircleCI container. Exiting...\n') + return 1 + + try: + request = urllib2.Request( + "https://circleci.com/api/v1.1/project/github/%s/%s/%s" % + (username, reponame, build_num), + headers={"Accept": "application/json"}) + contents = urllib2.urlopen(request).read() + except: + sys.stderr.write('Cannot query CircleCI API. Exiting...\n') + return 1 + + try: + build_info = json.loads(contents) + except: + sys.stderr.write( + 'Cannot parse JSON received from CircleCI API. Exiting...\n') + return 1 + + try: + workflow_name = build_info['workflows']['workflow_name'] + except: + sys.stderr.write( + 'Cannot get workflow name from CircleCI build info. Exiting...\n') + return 1 + + print workflow_name + return 0 + + +retval = main() +exit(retval) From e60e50df6f072aad79b5509e3462cba982271468 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 21 Mar 2018 09:28:43 +1300 Subject: [PATCH 0145/1115] v0.17.0 (#101) --- handwritten/pubsub/package-lock.json | 4 ++-- handwritten/pubsub/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 0c980541488..561bac8faf3 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.16.5", + "version": "0.17.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1937,7 +1937,7 @@ }, "@types/node": { "version": "8.9.5", - "resolved": "http://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==" }, "acorn": { diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 991dbc1c3ca..2ff42824e29 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.16.5", + "version": "0.17.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 4e26120212156c6295a0724085b7127e38371f15 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Tue, 27 Mar 2018 18:10:35 -0700 Subject: [PATCH 0146/1115] chore: workaround for repo-tools EPERM (#111) --- handwritten/pubsub/.circleci/config.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 01f754945ea..39eebd7b6b4 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -92,7 +92,12 @@ jobs: fi - run: name: Install modules and dependencies. - command: npm install + command: |- + npm install + repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" + if ! test -x "$repo_tools"; then + chmod +x "$repo_tools" + fi - run: name: Run unit tests. command: npm test @@ -127,6 +132,10 @@ jobs: command: | mkdir /home/node/.npm-global npm install + repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" + if ! test -x "$repo_tools"; then + chmod +x "$repo_tools" + fi npm link environment: NPM_CONFIG_PREFIX: /home/node/.npm-global @@ -153,7 +162,12 @@ jobs: - run: *remove_package_lock - run: name: Install modules and dependencies. - command: npm install + command: |- + npm install + repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" + if ! test -x "$repo_tools"; then + chmod +x "$repo_tools" + fi - run: name: Build documentation. command: npm run docs From 26964d9ab8b1df910f0a29dcb9c49495e2cb209a Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 28 Mar 2018 16:21:41 +1300 Subject: [PATCH 0147/1115] fix(subscription): change maxMessages default value to 100 (#107) --- handwritten/pubsub/src/subscription.js | 8 ++++++-- handwritten/pubsub/test/subscription.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index d316f4c5c67..18750c7d079 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -60,6 +60,10 @@ var MAX_ACK_IDS_PER_REQUEST = 3000; * for messages automatically as long as there is at least one listener assigned * for the `message` event. * + * By default Subscription objects allow you to process 100 messages at the same + * time. You can fine tune this value by adjusting the + * `options.flowControl.maxMessages` option. + * * @class * * @param {PubSub} pubsub PubSub object. @@ -74,7 +78,7 @@ var MAX_ACK_IDS_PER_REQUEST = 3000; * messages. Defaults to 20% of free memory. * @param {number} [options.flowControl.maxMessages] The maximum number of * un-acked messages to allow before the subscription pauses incoming - * messages. Default: Infinity. + * messages. Default: 100. * @param {number} [options.maxConnections] Use this to limit the number of * connections to be used when sending and receiving messages. Default: 5. * @@ -171,7 +175,7 @@ function Subscription(pubsub, name, options) { this.flowControl = extend( { maxBytes: os.freemem() * 0.2, - maxMessages: Infinity, + maxMessages: 100, }, options.flowControl ); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 4709f8e51ab..c72c8f633ee 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -181,7 +181,7 @@ describe('Subscription', function() { assert.deepEqual(subscription.flowControl, { maxBytes: FAKE_FREE_MEM * 0.2, - maxMessages: Infinity, + maxMessages: 100, }); }); From eb1c375f639ed9abc8fb8902d221fc17e4433be8 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 28 Mar 2018 16:27:25 +1300 Subject: [PATCH 0148/1115] feat(publisher): accept gax options (#110) --- handwritten/pubsub/src/publisher.js | 4 ++++ handwritten/pubsub/test/publisher.js | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index 9fea64cde48..c8ec440dab2 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -38,6 +38,8 @@ var is = require('is'); * to buffer before sending a payload. * @param {number} [options.batching.maxMilliseconds] The maximum duration to * wait before sending a payload. Defaults to 100 milliseconds. + * @param {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * * @example * const PubSub = require('@google-cloud/pubsub'); @@ -88,6 +90,7 @@ function Publisher(topic, options) { maxMessages: Math.min(options.batching.maxMessages, 1000), maxMilliseconds: options.batching.maxMilliseconds, }, + gaxOpts: options.gaxOpts, }; this.timeoutHandle_ = null; @@ -210,6 +213,7 @@ Publisher.prototype.publish_ = function() { client: 'PublisherClient', method: 'publish', reqOpts: reqOpts, + gaxOpts: this.settings.gaxOpts, }, function(err, resp) { var messageIds = arrify(resp && resp.messageIds); diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index 1b55718bdf6..37265cc8f66 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -120,6 +120,15 @@ describe('Publisher', function() { assert.strictEqual(publisher.settings.batching.maxMessages, 1000); }); + + it('should capture gaxOptions', function() { + var fakeGaxOpts = {a: 'a'}; + var publisher = new Publisher(TOPIC, { + gaxOpts: fakeGaxOpts, + }); + + assert.deepEqual(publisher.settings.gaxOpts, fakeGaxOpts); + }); }); }); @@ -260,6 +269,7 @@ describe('Publisher', function() { it('should make the correct request', function(done) { var FAKE_MESSAGE = {}; + var FAKE_GAX_OPTS = {a: 'b'}; TOPIC.request = function(config) { assert.strictEqual(config.client, 'PublisherClient'); @@ -268,10 +278,12 @@ describe('Publisher', function() { topic: TOPIC_NAME, messages: [FAKE_MESSAGE], }); + assert.strictEqual(config.gaxOpts, FAKE_GAX_OPTS); done(); }; publisher.inventory_.queued.push(FAKE_MESSAGE); + publisher.settings.gaxOpts = FAKE_GAX_OPTS; publisher.publish_(); }); From 657e85981239199ac192e1b39fd98351d86f40e9 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 28 Mar 2018 16:32:55 +1300 Subject: [PATCH 0149/1115] refactor(subscription): error handling (#109) --- handwritten/pubsub/src/connection-pool.js | 12 ++++++------ handwritten/pubsub/src/subscription.js | 8 ++++---- handwritten/pubsub/test/connection-pool.js | 16 +++++++++++----- handwritten/pubsub/test/subscription.js | 19 +------------------ 4 files changed, 22 insertions(+), 33 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index a7b41263699..34815596fee 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -209,7 +209,7 @@ ConnectionPool.prototype.createConnection = function() { var connection = duplexify(requestStream, readStream, {objectMode: true}); var id = uuid.v4(); - var lastStatus; + var errorImmediateHandle; connection.cancel = requestStream.cancel.bind(requestStream); @@ -221,7 +221,9 @@ ConnectionPool.prototype.createConnection = function() { .once(CHANNEL_ERROR_EVENT, onChannelError) .once(CHANNEL_READY_EVENT, onChannelReady); - requestStream.on('status', onConnectionStatus); + requestStream.on('status', status => + setImmediate(onConnectionStatus, status) + ); connection .on('error', onConnectionError) @@ -260,9 +262,7 @@ ConnectionPool.prototype.createConnection = function() { // to the `status` event where we can check if the connection should be // re-opened or if we should send the error to the user function onConnectionError(err) { - if (!lastStatus || err.code !== lastStatus.code) { - self.emit('error', err); - } + errorImmediateHandle = setImmediate(() => self.emit('error', err)); } function onConnectionData(message) { @@ -270,7 +270,7 @@ ConnectionPool.prototype.createConnection = function() { } function onConnectionStatus(status) { - lastStatus = status; + clearImmediate(errorImmediateHandle); connection.end(); self.connections.delete(id); diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 18750c7d079..004ad6a7cd2 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -1267,13 +1267,13 @@ Subscription.prototype.writeTo_ = function(connId, data) { return; } + // we can ignore any errors that come from this since they'll be + // re-emitted later connection.write(data, function(err) { - if (err) { - reject(err); - return; + if (!err) { + self.latency_.add(Date.now() - startTime); } - self.latency_.add(Date.now() - startTime); resolve(); }); }); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index 52d248a094c..7ef382f3e15 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -620,14 +620,17 @@ describe('ConnectionPool', function() { fakeConnection.emit('status', {}); }); - it('should increment the failed connection counter', function() { + it('should increment the failed connection counter', function(done) { pool.failedConnectionAttempts = 0; fakeDuplex.isConnected = false; pool.createConnection(); fakeConnection.emit('status', {}); - assert.strictEqual(pool.failedConnectionAttempts, 1); + setImmediate(function() { + assert.strictEqual(pool.failedConnectionAttempts, 1); + done(); + }); }); it('should not incr. the failed connection counter', function() { @@ -640,7 +643,7 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.failedConnectionAttempts, 0); }); - it('should capture the date when no connections are found', function() { + it('should capture the date when no conns are found', function(done) { var dateNow = global.Date.now; var fakeDate = Date.now(); @@ -656,8 +659,11 @@ describe('ConnectionPool', function() { pool.createConnection(); fakeConnection.emit('status', {}); - assert.strictEqual(pool.noConnectionsTime, fakeDate); - global.Date.now = dateNow; + setImmediate(function() { + assert.strictEqual(pool.noConnectionsTime, fakeDate); + global.Date.now = dateNow; + done(); + }); }); it('should not capture the date when already set', function() { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index c72c8f633ee..a8ac383d2d4 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -2130,29 +2130,12 @@ describe('Subscription', function() { subscription.writeTo_(CONNECTION_ID, fakeData); }); - it('should reject the promise if unable to write the data', function() { - var fakeError = new Error('err'); - - CONNECTION.write = function(data, cb) { - cb(fakeError); - }; - - return subscription.writeTo_(CONNECTION_ID, {}).then( - function() { - throw new Error('Should not have resolved.'); - }, - function(err) { - assert.strictEqual(err, fakeError); - } - ); - }); - it('should capture the write latency when successful', function() { var fakeLatency = 500; var capturedLatency; CONNECTION.write = function(data, cb) { - setTimeout(cb, 500, null); + setTimeout(cb, fakeLatency, null); }; subscription.latency_.add = function(value) { From 5a200a557a7cf781168602f7ac58621c9cc3feaa Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 28 Mar 2018 18:43:57 -0700 Subject: [PATCH 0150/1115] chore: one more workaround for repo-tools EPERM (#114) --- handwritten/pubsub/.circleci/config.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 39eebd7b6b4..95235c1643f 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -189,6 +189,10 @@ jobs: command: | mkdir /home/node/.npm-global npm install + repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" + if ! test -x "$repo_tools"; then + chmod +x "$repo_tools" + fi npm link environment: NPM_CONFIG_PREFIX: /home/node/.npm-global @@ -228,7 +232,12 @@ jobs: -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" - run: name: Install modules and dependencies. - command: npm install + command: |- + npm install + repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" + if ! test -x "$repo_tools"; then + chmod +x "$repo_tools" + fi - run: name: Run system tests. command: npm run system-test From 8bbfc70651eb1ea41dc5f032aca0ba29dbc666ba Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 29 Mar 2018 15:18:22 +1300 Subject: [PATCH 0151/1115] chore: prep release for 0.18.0 (#112) --- handwritten/pubsub/package-lock.json | 208 +++++++++++++++------------ handwritten/pubsub/package.json | 2 +- 2 files changed, 118 insertions(+), 92 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 561bac8faf3..5049bfe9951 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.17.0", + "version": "0.18.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -87,7 +87,7 @@ "requires": { "array-uniq": "1.0.3", "arrify": "1.0.1", - "concat-stream": "1.6.1", + "concat-stream": "1.6.2", "create-error-class": "3.0.2", "duplexify": "3.5.4", "ent": "2.2.0", @@ -106,9 +106,9 @@ } }, "@google-cloud/nodejs-repo-tools": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.2.4.tgz", - "integrity": "sha512-yHxW7JvhnqgoIftv6dAn1r/9AEcPuumD0xXggdYHmDeyf38OMYyjTk92gP9vflTOee1JhM0vOarwGrlKYUbmnQ==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.2.5.tgz", + "integrity": "sha512-Z/MZWDU0vG4F3bWqbBm7Bn+ceiTyhOEQNtjCPEBOx2IfUJAWhrVLLXXJRhWtquE5KRmmJ5XRbCdy/DA5mWPX6g==", "dev": true, "requires": { "ava": "0.25.0", @@ -1936,9 +1936,9 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "8.9.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", - "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==" + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.0.tgz", + "integrity": "sha512-7IGHZQfRfa0bCd7zUBVUGFKFn31SpaLDFfNoCAqkTGQO5JlHC9BwQA/CG9KZlABFxIUtXznyFgechjPQEGrUTg==" }, "acorn": { "version": "4.0.13", @@ -2055,9 +2055,9 @@ } }, "ansi-escapes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", "dev": true }, "ansi-regex": { @@ -2321,7 +2321,7 @@ "@ava/write-file-atomic": "2.2.0", "@concordance/react": "1.0.0", "@ladjs/time-require": "0.1.4", - "ansi-escapes": "3.0.0", + "ansi-escapes": "3.1.0", "ansi-styles": "3.2.1", "arr-flatten": "1.1.0", "array-union": "1.0.2", @@ -2398,7 +2398,7 @@ "supports-color": "5.3.0", "trim-off-newlines": "1.0.1", "unique-temp-dir": "1.0.0", - "update-notifier": "2.3.0" + "update-notifier": "2.4.0" }, "dependencies": { "ansi-regex": { @@ -2712,7 +2712,7 @@ "babel-generator": "6.26.1", "babylon": "6.18.0", "call-matcher": "1.0.1", - "core-js": "2.5.3", + "core-js": "2.5.4", "espower-location-detector": "1.0.0", "espurify": "1.7.0", "estraverse": "4.2.0" @@ -2859,7 +2859,7 @@ "requires": { "babel-core": "6.26.0", "babel-runtime": "6.26.0", - "core-js": "2.5.3", + "core-js": "2.5.4", "home-or-tmp": "2.0.0", "lodash": "4.17.5", "mkdirp": "0.5.1", @@ -2883,7 +2883,7 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "regenerator-runtime": "0.11.1" } }, @@ -3126,6 +3126,11 @@ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, + "buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==" + }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -3176,6 +3181,14 @@ "lowercase-keys": "1.0.0", "normalize-url": "2.0.1", "responselike": "1.0.2" + }, + "dependencies": { + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "dev": true + } } }, "caching-transform": { @@ -3217,7 +3230,7 @@ "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", "dev": true, "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "deep-equal": "1.0.1", "espurify": "1.7.0", "estraverse": "4.2.0" @@ -3798,10 +3811,11 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz", - "integrity": "sha512-gslSSJx03QKa59cIKqeJO9HQ/WZMotvYJCuaUULrLpjj8oG40kV2Z+gz82pVxlTkOADi4PJxQPPfhl1ELYrrXw==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { + "buffer-from": "1.0.0", "inherits": "2.0.3", "readable-stream": "2.3.5", "typedarray": "0.0.6" @@ -3838,9 +3852,9 @@ } }, "configstore": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz", - "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { "dot-prop": "4.2.0", @@ -3885,9 +3899,9 @@ } }, "core-js": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.4.tgz", + "integrity": "sha1-8si/GB8qgLkvNgEhQpzmOi8K6uA=" }, "core-util-is": { "version": "1.0.2", @@ -4040,7 +4054,7 @@ "requires": { "globby": "5.0.0", "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", "object-assign": "4.1.1", "pify": "2.3.0", "pinkie-promise": "2.0.1", @@ -4232,7 +4246,7 @@ "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "empower-core": "0.6.2" } }, @@ -4251,7 +4265,7 @@ "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", "requires": { "call-signature": "0.0.2", - "core-js": "2.5.3" + "core-js": "2.5.4" } }, "end-of-stream": { @@ -4430,15 +4444,15 @@ } }, "eslint": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.0.tgz", - "integrity": "sha512-r83L5CuqaocDvfwdojbz68b6tCUk8KJkqfppO+gmSAQqYCzTr0bCSMu6A6yFCLKG65j5eKcKUw4Cw4Yl4gfWkg==", + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", + "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", "dev": true, "requires": { "ajv": "5.5.2", "babel-code-frame": "6.26.0", "chalk": "2.3.2", - "concat-stream": "1.6.1", + "concat-stream": "1.6.2", "cross-spawn": "5.1.0", "debug": "3.1.0", "doctrine": "2.1.0", @@ -4450,7 +4464,7 @@ "file-entry-cache": "2.0.0", "functional-red-black-tree": "1.0.1", "glob": "7.1.2", - "globals": "11.3.0", + "globals": "11.4.0", "ignore": "3.3.7", "imurmurhash": "0.1.4", "inquirer": "3.3.0", @@ -4482,9 +4496,9 @@ "dev": true }, "globals": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz", - "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==", + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz", + "integrity": "sha512-Dyzmifil8n/TmSqYDEXbm+C8yitzJQqQIlJQLNRMwa+BOUJpRC19pyVeN12JAjt61xonvXjtff+hJruTRXn5HA==", "dev": true }, "strip-ansi": { @@ -4523,14 +4537,14 @@ "requires": { "ignore": "3.3.7", "minimatch": "3.0.4", - "resolve": "1.5.0", + "resolve": "1.6.0", "semver": "5.5.0" }, "dependencies": { "resolve": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", - "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz", + "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -4612,7 +4626,7 @@ "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", "dev": true, "requires": { - "is-url": "1.2.2", + "is-url": "1.2.4", "path-is-absolute": "1.0.1", "source-map": "0.5.7", "xtend": "4.0.1" @@ -4674,7 +4688,7 @@ "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", "requires": { - "core-js": "2.5.3" + "core-js": "2.5.4" } }, "esquery": { @@ -4966,7 +4980,7 @@ "glob-parent": "3.1.0", "is-glob": "4.0.0", "merge2": "1.2.1", - "micromatch": "3.1.9" + "micromatch": "3.1.10" } }, "fast-json-stable-stringify": { @@ -5117,9 +5131,9 @@ } }, "formidable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.0.tgz", - "integrity": "sha512-hr9aT30rAi7kf8Q2aaTpSP7xGMhlJ+MdrUDVZs3rxbD3L/K46A86s2VY7qC2D2kGYGBtiT/3j6wTx1eeUq5xAQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", + "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", "dev": true }, "fragment-cache": { @@ -6311,7 +6325,7 @@ "into-stream": "3.1.0", "is-retry-allowed": "1.1.0", "isurl": "1.0.0", - "lowercase-keys": "1.0.0", + "lowercase-keys": "1.0.1", "mimic-response": "1.0.0", "p-cancelable": "0.3.0", "p-timeout": "2.0.1", @@ -7383,7 +7397,7 @@ "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", "dev": true, "requires": { - "ansi-escapes": "3.0.0", + "ansi-escapes": "3.1.0", "chalk": "2.3.2", "cli-cursor": "2.1.0", "cli-width": "2.2.0", @@ -7679,9 +7693,9 @@ "dev": true }, "is-path-in-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", - "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", + "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { "is-path-inside": "1.0.1" @@ -7763,9 +7777,9 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "is-url": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz", - "integrity": "sha1-SYkFpZO/R8wtnn9zg3K792lsfyY=", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", "dev": true }, "is-utf8": { @@ -7865,7 +7879,7 @@ "escape-string-regexp": "1.0.5", "js2xmlparser": "3.0.0", "klaw": "2.0.0", - "marked": "0.3.17", + "marked": "0.3.19", "mkdirp": "0.5.1", "requizzle": "0.2.1", "strip-json-comments": "2.0.1", @@ -8217,9 +8231,9 @@ } }, "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", "dev": true }, "lru-cache": { @@ -8260,9 +8274,9 @@ } }, "marked": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz", - "integrity": "sha512-+AKbNsjZl6jFfLPwHhWmGTqE009wTKn3RTmn9K8oUKHrX/abPJjtcRtXpYB/FFrwPJRUA86LX/de3T0knkPCmQ==", + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz", + "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==", "dev": true }, "matcher": { @@ -8450,9 +8464,9 @@ "dev": true }, "micromatch": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz", - "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { "arr-diff": "4.0.0", "array-unique": "0.3.2", @@ -8542,9 +8556,9 @@ } }, "mocha": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz", - "integrity": "sha512-nMOpAPFosU1B4Ix1jdhx5e3q7XO55ic5a8cgYvW27CequcEY+BabS0kUVL1Cw1V5PuVHZWeNRWFLmEPexo79VA==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz", + "integrity": "sha512-3MM3UjZ5p8EJrYpG7s+29HAI9G7sTzKEe4+w37Dg0QP7qL4XGsV+Q2xet2cE37AqdgN1OtYQB6Vl98YiPV3PgA==", "dev": true, "requires": { "browser-stdout": "1.3.1", @@ -11813,7 +11827,7 @@ "is-redirect": "1.0.0", "is-retry-allowed": "1.1.0", "is-stream": "1.1.0", - "lowercase-keys": "1.0.0", + "lowercase-keys": "1.0.1", "safe-buffer": "5.1.1", "timed-out": "4.0.1", "unzip-response": "2.0.1", @@ -12019,9 +12033,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "6.0.20", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz", - "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==", + "version": "6.0.21", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz", + "integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==", "dev": true, "requires": { "chalk": "2.3.2", @@ -12054,7 +12068,7 @@ "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.1.1.tgz", "integrity": "sha1-7bo1LT7YpgMRTWZyZazOYNaJzN8=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "power-assert-context-traversal": "1.1.1" } }, @@ -12065,7 +12079,7 @@ "requires": { "acorn": "4.0.13", "acorn-es7-plugin": "1.1.7", - "core-js": "2.5.3", + "core-js": "2.5.4", "espurify": "1.7.0", "estraverse": "4.2.0" } @@ -12075,7 +12089,7 @@ "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.1.1.tgz", "integrity": "sha1-iMq8oNE7Y1nwfT0+ivppkmRXftk=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "estraverse": "4.2.0" } }, @@ -12084,7 +12098,7 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "power-assert-context-formatter": "1.1.1", "power-assert-context-reducer-ast": "1.1.2", "power-assert-renderer-assertion": "1.1.1", @@ -12112,7 +12126,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.1.1.tgz", "integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "diff-match-patch": "1.0.0", "power-assert-renderer-base": "1.1.1", "stringifier": "1.3.0", @@ -12124,7 +12138,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.1.2.tgz", "integrity": "sha1-ZV+PcRk1qbbVQbhjJ2VHF8Y3qYY=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "power-assert-renderer-base": "1.1.1", "power-assert-util-string-width": "1.1.1", "stringifier": "1.3.0" @@ -12221,19 +12235,30 @@ "@protobufjs/pool": "1.1.0", "@protobufjs/utf8": "1.1.0", "@types/long": "3.0.32", - "@types/node": "8.9.5", + "@types/node": "8.10.0", "long": "4.0.0" } }, "proxyquire": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.0.0.tgz", - "integrity": "sha512-TO9TAIz0mpa+SKddXsgCFatoe/KmHvoNVj2jDMC1kXE6kKn7/4CRpxvQ+0wAK9sbMT2FVO89qItlvnZMcFbJ2Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.0.1.tgz", + "integrity": "sha512-fQr3VQrbdzHrdaDn3XuisVoJlJNDJizHAvUXw9IuXRR8BpV2x0N7LsCxrpJkeKfPbNjiNU/V5vc008cI0TmzzQ==", "dev": true, "requires": { "fill-keys": "1.0.2", "module-not-found-error": "1.0.1", - "resolve": "1.1.7" + "resolve": "1.5.0" + }, + "dependencies": { + "resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + } } }, "pseudomap": { @@ -12617,7 +12642,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "1.0.0" + "lowercase-keys": "1.0.1" } }, "restore-cursor": { @@ -12724,7 +12749,7 @@ "lodash.isplainobject": "4.0.6", "lodash.isstring": "4.0.1", "lodash.mergewith": "4.6.1", - "postcss": "6.0.20", + "postcss": "6.0.21", "srcset": "1.0.0", "xtend": "4.0.1" } @@ -13242,7 +13267,7 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.4", "traverse": "0.6.6", "type-name": "2.0.2" } @@ -13312,7 +13337,7 @@ "debug": "3.1.0", "extend": "3.0.1", "form-data": "2.3.2", - "formidable": "1.2.0", + "formidable": "1.2.1", "methods": "1.1.2", "mime": "1.6.0", "qs": "6.5.1", @@ -13821,15 +13846,16 @@ "dev": true }, "update-notifier": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz", - "integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz", + "integrity": "sha1-+bTHAPv9TsEsgRWHJYd31WPYyGY=", "dev": true, "requires": { "boxen": "1.3.0", "chalk": "2.3.2", - "configstore": "3.1.1", + "configstore": "3.1.2", "import-lazy": "2.1.0", + "is-ci": "1.1.0", "is-installed-globally": "0.1.0", "is-npm": "1.0.0", "latest-version": "3.1.0", diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2ff42824e29..64c79f4bc0e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.17.0", + "version": "0.18.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 878267022d8c18337ed288f861974997c14b4a95 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 5 Apr 2018 00:16:42 +1200 Subject: [PATCH 0152/1115] docs(subscription): add mention of auto-leasing (#116) --- handwritten/pubsub/src/subscription.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 004ad6a7cd2..394339a186a 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -64,6 +64,11 @@ var MAX_ACK_IDS_PER_REQUEST = 3000; * time. You can fine tune this value by adjusting the * `options.flowControl.maxMessages` option. * + * Subscription objects handle ack management, by automatically extending the + * ack deadline while the message is being processed, to then issue the ack or + * nack of such message when the processing is done. **Note:** message + * redelivery is still possible. + * * @class * * @param {PubSub} pubsub PubSub object. From bea11699f539ec15b1c74413aa9ff9b7e14f3868 Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 25 Apr 2018 12:28:15 -0400 Subject: [PATCH 0153/1115] fix(package): update google-auto-auth to version 0.10.1 (#120) * fix(package): update google-auto-auth to version 0.10.1 Closes #100 * Update package locks --- handwritten/pubsub/package-lock.json | 18027 +++++++++++-------------- handwritten/pubsub/package.json | 2 +- 2 files changed, 7537 insertions(+), 10492 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 5049bfe9951..e1be5ea2853 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -81,34 +81,47 @@ } }, "@google-cloud/common": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.16.2.tgz", - "integrity": "sha512-GrkaFoj0/oO36pNs4yLmaYhTujuA3i21FdQik99Fd/APix1uhf01VlpJY4lAteTDFLRNkRx6ydEh7OVvmeUHng==", + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.16.1.tgz", + "integrity": "sha512-1sufDsSfgJ7fuBLq+ux8t3TlydMlyWl9kPZx2WdLINkGtf5RjvXX6EWYZiCMKe8flJ3oC0l95j5atN2uX5n3rg==", "requires": { "array-uniq": "1.0.3", "arrify": "1.0.1", - "concat-stream": "1.6.2", + "concat-stream": "1.6.0", "create-error-class": "3.0.2", "duplexify": "3.5.4", "ent": "2.2.0", "extend": "3.0.1", "google-auto-auth": "0.9.7", "is": "3.2.1", - "log-driver": "1.2.7", + "log-driver": "1.2.5", "methmeth": "1.1.0", "modelo": "4.2.3", - "request": "2.85.0", + "request": "2.83.0", "retry-request": "3.3.1", "split-array-stream": "1.0.3", "stream-events": "1.0.2", "string-format-obj": "1.1.1", "through2": "2.0.3" + }, + "dependencies": { + "google-auto-auth": { + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.7.tgz", + "integrity": "sha512-Nro7aIFrL2NP0G7PoGrJqXGMZj8AjdBOcbZXRRm/8T3w08NUHIiNN3dxpuUYzDsZizslH+c8e+7HXL8vh3JXTQ==", + "requires": { + "async": "2.6.0", + "gcp-metadata": "0.6.3", + "google-auth-library": "1.4.0", + "request": "2.83.0" + } + } } }, "@google-cloud/nodejs-repo-tools": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.2.5.tgz", - "integrity": "sha512-Z/MZWDU0vG4F3bWqbBm7Bn+ceiTyhOEQNtjCPEBOx2IfUJAWhrVLLXXJRhWtquE5KRmmJ5XRbCdy/DA5mWPX6g==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.3.0.tgz", + "integrity": "sha512-c8dIGESnNkmM88duFxGHvMQP5QKPgp/sfJq0QhC6+gOcJC7/PKjqd0PkmgPPeIgVl6SXy5Zf/KLbxnJUVgNT1Q==", "dev": true, "requires": { "ava": "0.25.0", @@ -119,6 +132,7 @@ "lodash": "4.17.5", "nyc": "11.4.1", "proxyquire": "1.8.0", + "semver": "5.5.0", "sinon": "4.3.0", "string": "3.3.3", "supertest": "3.0.0", @@ -133,9 +147,9 @@ "dev": true }, "cliui": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", - "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { "string-width": "2.1.1", @@ -149,10701 +163,7993 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "nyc": { - "version": "11.4.1", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", - "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", + "lodash": { + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "proxyquire": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz", + "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", "dev": true, "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.1.7" + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "yargs": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "dev": true, + "requires": { + "cliui": "4.1.0", + "decamelize": "1.2.0", "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-report": "1.1.2", - "istanbul-lib-source-maps": "1.2.2", - "istanbul-reports": "1.1.3", - "md5-hex": "1.3.0", - "merge-source-map": "1.0.4", - "micromatch": "2.3.11", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.1.1", - "yargs": "10.0.3", - "yargs-parser": "8.0.0" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - } - }, - "amdefine": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "bundled": true, - "dev": true - }, - "append-transform": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "requires": { - "default-require-extensions": "1.0.0" - } - }, - "archy": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "arr-diff": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } - }, - "arr-flatten": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "arrify": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "async": { - "version": "1.5.2", - "bundled": true, - "dev": true - }, - "babel-code-frame": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - } - }, - "babel-generator": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" - } - }, - "babel-template": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "bundled": true, - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.8", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "1.8.5", - "bundled": true, - "dev": true, - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "builtin-modules": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "caching-transform": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" - } - }, - "camelcase": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true - }, - "center-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - } - }, - "chalk": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "cliui": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "commondir": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "bundled": true, - "dev": true - }, - "core-js": { - "version": "2.5.3", - "bundled": true, - "dev": true - }, - "cross-spawn": { - "version": "4.0.2", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" - } - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "debug-log": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "decamelize": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "default-require-extensions": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "strip-bom": "2.0.0" - } - }, - "detect-indent": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "error-ex": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "is-arrayish": "0.2.1" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "esutils": { - "version": "2.0.2", - "bundled": true, - "dev": true - }, - "execa": { - "version": "0.7.0", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" - } - } - } - }, - "expand-brackets": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "bundled": true, - "dev": true, - "requires": { - "fill-range": "2.2.3" - } - }, - "extglob": { - "version": "0.3.2", - "bundled": true, - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "filename-regex": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "fill-range": { - "version": "2.2.3", - "bundled": true, - "dev": true, - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - } - }, - "find-cache-dir": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "locate-path": "2.0.0" - } - }, - "for-in": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "for-own": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "foreground-child": { - "version": "1.5.6", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "glob-base": { - "version": "0.3.0", - "bundled": true, - "dev": true, - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - } - }, - "glob-parent": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "globals": { - "version": "9.18.0", - "bundled": true, - "dev": true - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "handlebars": { - "version": "4.0.11", - "bundled": true, - "dev": true, - "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "bundled": true, - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } - } - }, - "has-ansi": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-flag": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "hosted-git-info": { - "version": "2.5.0", - "bundled": true, - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "bundled": true, - "dev": true - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "invariant": { - "version": "2.2.2", - "bundled": true, - "dev": true, - "requires": { - "loose-envify": "1.3.1" - } - }, - "invert-kv": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "is-buffer": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "builtin-modules": "1.1.1" - } - }, - "is-dotfile": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "requires": { - "is-primitive": "2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-glob": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "is-number": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isexe": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "isobject": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "isarray": "1.0.0" - } - }, - "istanbul-lib-coverage": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "istanbul-lib-hook": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "append-transform": "0.4.0" - } - }, - "istanbul-lib-instrument": { - "version": "1.9.1", - "bundled": true, - "dev": true, - "requires": { - "babel-generator": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", - "semver": "5.4.1" - } - }, - "istanbul-lib-report": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" - }, - "dependencies": { - "supports-color": { - "version": "3.2.3", - "bundled": true, - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "1.2.2", - "bundled": true, - "dev": true, - "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "istanbul-reports": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "handlebars": "4.0.11" - } - }, - "js-tokens": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "jsesc": { - "version": "1.3.0", - "bundled": true, - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - }, - "lazy-cache": { - "version": "1.0.4", - "bundled": true, - "dev": true, - "optional": true - }, - "lcid": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "invert-kv": "1.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "bundled": true, - "dev": true - } - } - }, - "lodash": { - "version": "4.17.4", - "bundled": true, - "dev": true - }, - "longest": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "loose-envify": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "js-tokens": "3.0.2" - } - }, - "lru-cache": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } - }, - "md5-hex": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "md5-o-matic": "0.1.1" - } - }, - "md5-o-matic": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "mem": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "mimic-fn": "1.1.0" - } - }, - "merge-source-map": { - "version": "1.0.4", - "bundled": true, - "dev": true, - "requires": { - "source-map": "0.5.7" - } - }, - "micromatch": { - "version": "2.3.11", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - } - }, - "mimic-fn": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "normalize-package-data": { - "version": "2.4.0", - "bundled": true, - "dev": true, - "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" - } - }, - "normalize-path": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, - "npm-run-path": { - "version": "2.0.2", - "bundled": true, - "dev": true, - "requires": { - "path-key": "2.0.1" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true - }, - "object.omit": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - } - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "optimist": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "p-finally": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "p-limit": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "p-locate": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-limit": "1.1.0" - } - }, - "parse-glob": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" - } - }, - "parse-json": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "requires": { - "error-ex": "1.3.1" - } - }, - "path-exists": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "pinkie-promise": "2.0.1" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "path-key": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "path-type": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "pify": { - "version": "2.3.0", - "bundled": true, - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "bundled": true, - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "pinkie": "2.0.4" - } - }, - "pkg-dir": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "find-up": "1.1.2" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - } - } - }, - "preserve": { - "version": "0.2.0", - "bundled": true, - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "randomatic": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "read-pkg": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - } - } - }, - "regenerator-runtime": { - "version": "0.11.1", - "bundled": true, - "dev": true - }, - "regex-cache": { - "version": "0.4.4", - "bundled": true, - "dev": true, - "requires": { - "is-equal-shallow": "0.1.3" - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "bundled": true, - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "bundled": true, - "dev": true - }, - "repeating": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-finite": "1.0.2" - } - }, - "require-directory": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "resolve-from": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "right-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "semver": { - "version": "5.4.1", - "bundled": true, - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "shebang-command": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "shebang-regex": "1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "slide": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "source-map": { - "version": "0.5.7", - "bundled": true, - "dev": true - }, - "spawn-wrap": { - "version": "1.4.2", - "bundled": true, - "dev": true, - "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.0" - } - }, - "spdx-correct": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "spdx-license-ids": "1.2.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "bundled": true, - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "bundled": true, - "dev": true - }, - "string-width": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "test-exclude": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" - } - }, - "to-fast-properties": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "trim-right": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "uglify-js": { - "version": "2.8.29", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "yargs": { - "version": "3.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "validate-npm-package-license": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" - } - }, - "which": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "isexe": "2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "window-size": { - "version": "0.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "wordwrap": { - "version": "0.0.3", - "bundled": true, - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "write-file-atomic": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" - } - }, - "y18n": { - "version": "3.2.1", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "2.1.2", - "bundled": true, - "dev": true - }, - "yargs": { - "version": "10.0.3", - "bundled": true, - "dev": true, - "requires": { - "cliui": "3.2.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "8.0.0" - }, - "dependencies": { - "cliui": { - "version": "3.2.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } - } - } - } - }, - "yargs-parser": { - "version": "8.0.0", - "bundled": true, - "dev": true, - "requires": { - "camelcase": "4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - } - } - } - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "proxyquire": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz", - "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", - "dev": true, - "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.1.7" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - }, - "yargs": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", - "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", - "dev": true, - "requires": { - "cliui": "4.0.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" - } - } - } - }, - "@ladjs/time-require": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", - "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", - "dev": true, - "requires": { - "chalk": "0.4.0", - "date-time": "0.1.1", - "pretty-ms": "0.2.2", - "text-table": "0.2.0" - }, - "dependencies": { - "ansi-styles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", - "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", - "dev": true - }, - "chalk": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", - "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", - "dev": true, - "requires": { - "ansi-styles": "1.0.0", - "has-color": "0.1.7", - "strip-ansi": "0.1.1" - } - }, - "pretty-ms": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", - "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", - "dev": true, - "requires": { - "parse-ms": "0.1.2" - } - }, - "strip-ansi": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", - "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", - "dev": true - } - } - }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "requires": { - "call-me-maybe": "1.0.1", - "glob-to-regexp": "0.3.0" - } - }, - "@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" - }, - "@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" - }, - "@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", - "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/inquire": "1.1.0" - } - }, - "@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" - }, - "@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" - }, - "@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" - }, - "@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" - }, - "@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" - }, - "@sindresorhus/is": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", - "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", - "dev": true - }, - "@sinonjs/formatio": { - "version": "2.0.0", - "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", - "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", - "dev": true, - "requires": { - "samsam": "1.3.0" - } - }, - "@types/long": { - "version": "3.0.32", - "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", - "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" - }, - "@types/node": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.0.tgz", - "integrity": "sha512-7IGHZQfRfa0bCd7zUBVUGFKFn31SpaLDFfNoCAqkTGQO5JlHC9BwQA/CG9KZlABFxIUtXznyFgechjPQEGrUTg==" - }, - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" - }, - "acorn-es7-plugin": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz", - "integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=" - }, - "acorn-jsx": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", - "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", - "dev": true, - "requires": { - "acorn": "3.3.0" - }, - "dependencies": { - "acorn": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true - } - } - }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - }, - "ajv-keywords": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", - "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", - "dev": true, - "requires": { - "string-width": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "1.9.1" - } - }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, - "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" - }, - "dependencies": { - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - } - } - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "1.0.3" - } - }, - "argv": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz", - "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=", - "dev": true - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "arr-exclude": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/arr-exclude/-/arr-exclude-1.0.0.tgz", - "integrity": "sha1-38fC5VKicHI8zaBM8xKMjL/lxjE=", - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-filter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", - "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" - }, - "array-find": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", - "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "requires": { - "array-uniq": "1.0.3" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" - }, - "ascli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", - "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", - "requires": { - "colour": "0.7.1", - "optjs": "3.2.2" - } - }, - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" - }, - "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "requires": { - "lodash": "4.17.5" - } - }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "atob": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz", - "integrity": "sha1-GcenYEc3dEaPILLS0DNyrX1Mv10=" - }, - "auto-bind": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz", - "integrity": "sha512-Zw7pZp7tztvKnWWtoII4AmqH5a2PV3ZN5F0BPRTGcc1kpRm4b6QXQnPU7Znbl6BfPfqOVOV29g4JeMqZQaqqOA==", - "dev": true - }, - "ava": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", - "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", - "dev": true, - "requires": { - "@ava/babel-preset-stage-4": "1.1.0", - "@ava/babel-preset-transform-test-files": "3.0.0", - "@ava/write-file-atomic": "2.2.0", - "@concordance/react": "1.0.0", - "@ladjs/time-require": "0.1.4", - "ansi-escapes": "3.1.0", - "ansi-styles": "3.2.1", - "arr-flatten": "1.1.0", - "array-union": "1.0.2", - "array-uniq": "1.0.3", - "arrify": "1.0.1", - "auto-bind": "1.2.0", - "ava-init": "0.2.1", - "babel-core": "6.26.0", - "babel-generator": "6.26.1", - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "bluebird": "3.5.1", - "caching-transform": "1.0.1", - "chalk": "2.3.2", - "chokidar": "1.7.0", - "clean-stack": "1.3.0", - "clean-yaml-object": "0.1.0", - "cli-cursor": "2.1.0", - "cli-spinners": "1.1.0", - "cli-truncate": "1.1.0", - "co-with-promise": "4.6.0", - "code-excerpt": "2.1.1", - "common-path-prefix": "1.0.0", - "concordance": "3.0.0", - "convert-source-map": "1.5.1", - "core-assert": "0.2.1", - "currently-unhandled": "0.4.1", - "debug": "3.1.0", - "dot-prop": "4.2.0", - "empower-core": "0.6.2", - "equal-length": "1.0.1", - "figures": "2.0.0", - "find-cache-dir": "1.0.0", - "fn-name": "2.0.1", - "get-port": "3.2.0", - "globby": "6.1.0", - "has-flag": "2.0.0", - "hullabaloo-config-manager": "1.1.1", - "ignore-by-default": "1.0.1", - "import-local": "0.1.1", - "indent-string": "3.2.0", - "is-ci": "1.1.0", - "is-generator-fn": "1.0.0", - "is-obj": "1.0.1", - "is-observable": "1.1.0", - "is-promise": "2.1.0", - "last-line-stream": "1.0.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.debounce": "4.0.8", - "lodash.difference": "4.5.0", - "lodash.flatten": "4.4.0", - "loud-rejection": "1.6.0", - "make-dir": "1.2.0", - "matcher": "1.1.0", - "md5-hex": "2.0.0", - "meow": "3.7.0", - "ms": "2.0.0", - "multimatch": "2.1.0", - "observable-to-promise": "0.5.0", - "option-chain": "1.0.0", - "package-hash": "2.0.0", - "pkg-conf": "2.1.0", - "plur": "2.1.2", - "pretty-ms": "3.1.0", - "require-precompiled": "0.1.0", - "resolve-cwd": "2.0.0", - "safe-buffer": "5.1.1", - "semver": "5.5.0", - "slash": "1.0.0", - "source-map-support": "0.5.4", - "stack-utils": "1.0.1", - "strip-ansi": "4.0.0", - "strip-bom-buf": "1.0.0", - "supertap": "1.0.0", - "supports-color": "5.3.0", - "trim-off-newlines": "1.0.1", - "unique-temp-dir": "1.0.0", - "update-notifier": "2.4.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "2.0.4" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "ava-init": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ava-init/-/ava-init-0.2.1.tgz", - "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", - "dev": true, - "requires": { - "arr-exclude": "1.0.0", - "execa": "0.7.0", - "has-yarn": "1.0.0", - "read-pkg-up": "2.0.0", - "write-pkg": "3.1.0" - } - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" - }, - "axios": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", - "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", - "requires": { - "follow-redirects": "1.4.1", - "is-buffer": "1.1.6" - } - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "babel-core": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", - "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.1", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.5", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.5", - "source-map": "0.5.7", - "trim-right": "1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - } - } - }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "dev": true, - "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "dev": true, - "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.5" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "dev": true, - "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-espower": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.4.0.tgz", - "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", - "dev": true, - "requires": { - "babel-generator": "6.26.1", - "babylon": "6.18.0", - "call-matcher": "1.0.1", - "core-js": "2.5.4", - "espower-location-detector": "1.0.0", - "espurify": "1.7.0", - "estraverse": "4.2.0" - } - }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", - "dev": true - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", - "dev": true - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", - "dev": true - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "dev": true, - "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz", - "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=", - "dev": true, - "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "dev": true, - "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "dev": true, - "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "dev": true, - "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "dev": true, - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "requires": { - "babel-core": "6.26.0", - "babel-runtime": "6.26.0", - "core-js": "2.5.4", - "home-or-tmp": "2.0.0", - "lodash": "4.17.5", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" - }, - "dependencies": { - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "0.5.7" - } - } - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "2.5.4", - "regenerator-runtime": "0.11.1" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.5" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.5" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.5", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - } - } - }, - "base64url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", - "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true - }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", - "dev": true - }, - "boom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", - "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", - "requires": { - "hoek": "4.2.1" - } - }, - "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", - "dev": true, - "requires": { - "ansi-align": "2.0.0", - "camelcase": "4.1.0", - "chalk": "2.3.2", - "cli-boxes": "1.0.0", - "string-width": "2.1.1", - "term-size": "1.2.0", - "widest-line": "2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz", - "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==", - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "define-property": "1.0.0", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "kind-of": "6.0.2", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "buf-compare": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", - "integrity": "sha1-/vKNqLgROgoNtEMLC2Rntpcws0o=", - "dev": true - }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" - }, - "buffer-from": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", - "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==" - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "bytebuffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", - "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", - "requires": { - "long": "3.2.0" - }, - "dependencies": { - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - } - } - }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" - } - }, - "cacheable-request": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", - "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", - "dev": true, - "requires": { - "clone-response": "1.0.2", - "get-stream": "3.0.0", - "http-cache-semantics": "3.8.1", - "keyv": "3.0.0", - "lowercase-keys": "1.0.0", - "normalize-url": "2.0.1", - "responselike": "1.0.2" - }, - "dependencies": { - "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", - "dev": true - } - } - }, - "caching-transform": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", - "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", - "dev": true, - "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" - }, - "dependencies": { - "md5-hex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", - "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", - "dev": true, - "requires": { - "md5-o-matic": "0.1.1" - } - }, - "write-file-atomic": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", - "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" - } - } - } - }, - "call-matcher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-matcher/-/call-matcher-1.0.1.tgz", - "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", - "dev": true, - "requires": { - "core-js": "2.5.4", - "deep-equal": "1.0.1", - "espurify": "1.7.0", - "estraverse": "4.2.0" - } - }, - "call-me-maybe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", - "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=" - }, - "call-signature": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/call-signature/-/call-signature-0.0.2.tgz", - "integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY=" - }, - "caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", - "dev": true, - "requires": { - "callsites": "0.2.0" - } - }, - "callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", - "dev": true - }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" - } - }, - "capture-stack-trace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", - "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, - "catharsis": { - "version": "0.8.9", - "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", - "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", - "dev": true, - "requires": { - "underscore-contrib": "0.3.0" - } - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - } - }, - "chalk": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz", - "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", - "dev": true, - "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" - } - }, - "chardet": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", - "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", - "dev": true - }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, - "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.1.3", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" - }, - "dependencies": { - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - }, - "ci-info": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", - "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", - "dev": true - }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", - "dev": true - }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "clean-stack": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz", - "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE=", - "dev": true - }, - "clean-yaml-object": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", - "integrity": "sha1-Y/sRDcLOGoTcIfbZM0h20BCui2g=", - "dev": true - }, - "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", - "dev": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "2.0.0" - } - }, - "cli-spinners": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz", - "integrity": "sha1-8YR7FohE2RemceudFH499JfJDQY=", - "dev": true - }, - "cli-truncate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", - "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", - "dev": true, - "requires": { - "slice-ansi": "1.0.0", - "string-width": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, - "requires": { - "mimic-response": "1.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, - "co-with-promise": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co-with-promise/-/co-with-promise-4.6.0.tgz", - "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", - "dev": true, - "requires": { - "pinkie-promise": "1.0.0" - } - }, - "code-excerpt": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", - "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", - "dev": true, - "requires": { - "convert-to-spaces": "1.0.2" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "codecov": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.0.tgz", - "integrity": "sha1-wnO4xPEpRXI+jcnSWAPYk0Pl8o4=", - "dev": true, - "requires": { - "argv": "0.0.2", - "request": "2.81.0", - "urlgrey": "0.4.4" - }, - "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "dev": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true - }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "requires": { - "boom": "2.10.1" - } - }, - "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "dev": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" - } - }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", - "dev": true - }, - "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", - "dev": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "dev": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" - } - }, - "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", - "dev": true - }, - "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", - "dev": true - }, - "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "dev": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" - } - }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - } - } - }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" - } - }, - "color-convert": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", - "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - }, - "colour": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", - "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" - }, - "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", - "requires": { - "delayed-stream": "1.0.0" - } - }, - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", - "dev": true - }, - "common-path-prefix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-1.0.0.tgz", - "integrity": "sha1-zVL28HEuC6q5fW+XModPIvR3UsA=", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "1.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.5", - "typedarray": "0.0.6" - } - }, - "concordance": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/concordance/-/concordance-3.0.0.tgz", - "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", - "dev": true, - "requires": { - "date-time": "2.1.0", - "esutils": "2.0.2", - "fast-diff": "1.1.2", - "function-name-support": "0.2.0", - "js-string-escape": "1.0.1", - "lodash.clonedeep": "4.5.0", - "lodash.flattendeep": "4.4.0", - "lodash.merge": "4.6.1", - "md5-hex": "2.0.0", - "semver": "5.5.0", - "well-known-symbols": "1.0.0" - }, - "dependencies": { - "date-time": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", - "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", - "dev": true, - "requires": { - "time-zone": "1.0.0" - } - } - } - }, - "configstore": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", - "dev": true, - "requires": { - "dot-prop": "4.2.0", - "graceful-fs": "4.1.11", - "make-dir": "1.2.0", - "unique-string": "1.0.0", - "write-file-atomic": "2.3.0", - "xdg-basedir": "3.0.0" - } - }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true - }, - "convert-to-spaces": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz", - "integrity": "sha1-fj5Iu+bZl7FBfdyihoIEtNPYVxU=", - "dev": true - }, - "cookiejar": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz", - "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=", - "dev": true - }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" - }, - "core-assert": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/core-assert/-/core-assert-0.2.1.tgz", - "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", - "dev": true, - "requires": { - "buf-compare": "1.0.1", - "is-error": "2.2.1" - } - }, - "core-js": { - "version": "2.5.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.4.tgz", - "integrity": "sha1-8si/GB8qgLkvNgEhQpzmOi8K6uA=" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", - "requires": { - "capture-stack-trace": "1.0.0" - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.2", - "shebang-command": "1.2.0", - "which": "1.3.0" - } - }, - "cryptiles": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", - "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", - "requires": { - "boom": "5.2.0" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", - "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", - "requires": { - "hoek": "4.2.1" - } - } - } - }, - "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", - "dev": true - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "1.0.2" - } - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "0.10.41" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "1.0.0" - } - }, - "date-time": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", - "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "requires": { - "mimic-response": "1.0.0" - } - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true - }, - "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.11" - } - }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" - } - }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" - }, - "dependencies": { - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "2.0.4" - } - } - } - }, - "delay": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", - "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", - "requires": { - "p-defer": "1.0.0" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "diff-match-patch": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz", - "integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg=" - }, - "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "2.0.2" - } - }, - "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", - "dev": true, - "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } - } - }, - "domelementtype": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", - "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", - "dev": true - }, - "domhandler": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", - "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", - "dev": true, - "requires": { - "domelementtype": "1.3.0" - } - }, - "domutils": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", - "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "dev": true, - "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" - } - }, - "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", - "dev": true, - "requires": { - "is-obj": "1.0.1" - } - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "duplexify": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", - "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", - "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.5", - "stream-shift": "1.0.0" - } - }, - "eastasianwidth": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.1.1.tgz", - "integrity": "sha1-RNZW3p2kFWlEZzNTZfsxR7hXK3w=" - }, - "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "ecdsa-sig-formatter": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz", - "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=", - "requires": { - "base64url": "2.0.0", - "safe-buffer": "5.1.1" - } - }, - "empower": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", - "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", - "requires": { - "core-js": "2.5.4", - "empower-core": "0.6.2" - } - }, - "empower-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/empower-assert/-/empower-assert-1.0.1.tgz", - "integrity": "sha1-MeMQq8BluqfDoEh+a+W7zGXzwd4=", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "empower-core": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", - "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", - "requires": { - "call-signature": "0.0.2", - "core-js": "2.5.4" - } - }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "requires": { - "once": "1.4.0" - } - }, - "ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=" - }, - "entities": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", - "dev": true - }, - "equal-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/equal-length/-/equal-length-1.0.1.tgz", - "integrity": "sha1-IcoRLUirJLTh5//A5TOdMf38J0w=", - "dev": true - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, - "requires": { - "is-arrayish": "0.2.1" - } - }, - "es5-ext": { - "version": "0.10.41", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.41.tgz", - "integrity": "sha512-MYK02wXfwTMie5TEJWPolgOsXEmz7wKCQaGzgmRjZOoV6VLG8I5dSv2bn6AOClXhK64gnSQTQ9W9MKvx87J4gw==", - "dev": true, - "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" - } - }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.41", - "es6-symbol": "3.1.1" - } - }, - "es6-map": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.41", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-set": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.41", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.41" - } - }, - "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.41", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" - } - }, - "escallmatch": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/escallmatch/-/escallmatch-1.5.0.tgz", - "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", - "dev": true, - "requires": { - "call-matcher": "1.0.1", - "esprima": "2.7.3" - }, - "dependencies": { - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - } - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "escodegen": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", - "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", - "dev": true, - "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.6.1" - }, - "dependencies": { - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } - } - }, - "escope": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", - "dev": true, - "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.1", - "estraverse": "4.2.0" - } - }, - "eslint": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", - "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", - "dev": true, - "requires": { - "ajv": "5.5.2", - "babel-code-frame": "6.26.0", - "chalk": "2.3.2", - "concat-stream": "1.6.2", - "cross-spawn": "5.1.0", - "debug": "3.1.0", - "doctrine": "2.1.0", - "eslint-scope": "3.7.1", - "eslint-visitor-keys": "1.0.0", - "espree": "3.5.4", - "esquery": "1.0.0", - "esutils": "2.0.2", - "file-entry-cache": "2.0.0", - "functional-red-black-tree": "1.0.1", - "glob": "7.1.2", - "globals": "11.4.0", - "ignore": "3.3.7", - "imurmurhash": "0.1.4", - "inquirer": "3.3.0", - "is-resolvable": "1.1.0", - "js-yaml": "3.11.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.5", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "optionator": "0.8.2", - "path-is-inside": "1.0.2", - "pluralize": "7.0.0", - "progress": "2.0.0", - "regexpp": "1.0.1", - "require-uncached": "1.0.3", - "semver": "5.5.0", - "strip-ansi": "4.0.0", - "strip-json-comments": "2.0.1", - "table": "4.0.2", - "text-table": "0.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "globals": { - "version": "11.4.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz", - "integrity": "sha512-Dyzmifil8n/TmSqYDEXbm+C8yitzJQqQIlJQLNRMwa+BOUJpRC19pyVeN12JAjt61xonvXjtff+hJruTRXn5HA==", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "eslint-config-prettier": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", - "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", - "dev": true, - "requires": { - "get-stdin": "5.0.1" - }, - "dependencies": { - "get-stdin": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", - "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", - "dev": true - } - } - }, - "eslint-plugin-node": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz", - "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", - "dev": true, - "requires": { - "ignore": "3.3.7", - "minimatch": "3.0.4", - "resolve": "1.6.0", - "semver": "5.5.0" - }, - "dependencies": { - "resolve": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz", - "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==", - "dev": true, - "requires": { - "path-parse": "1.0.5" - } - } - } - }, - "eslint-plugin-prettier": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz", - "integrity": "sha512-floiaI4F7hRkTrFe8V2ItOK97QYrX75DjmdzmVITZoAP6Cn06oEDPQRsO6MlHEP/u2SxI3xQ52Kpjw6j5WGfeQ==", - "dev": true, - "requires": { - "fast-diff": "1.1.2", - "jest-docblock": "21.2.0" - } - }, - "eslint-scope": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", - "dev": true, - "requires": { - "esrecurse": "4.2.1", - "estraverse": "4.2.0" - } - }, - "eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", - "dev": true - }, - "espower": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/espower/-/espower-2.1.0.tgz", - "integrity": "sha1-zh7bPZhwKEH99ZbRy46FvcSujkg=", - "dev": true, - "requires": { - "array-find": "1.0.0", - "escallmatch": "1.5.0", - "escodegen": "1.9.1", - "escope": "3.6.0", - "espower-location-detector": "1.0.0", - "espurify": "1.7.0", - "estraverse": "4.2.0", - "source-map": "0.5.7", - "type-name": "2.0.2", - "xtend": "4.0.1" - } - }, - "espower-loader": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/espower-loader/-/espower-loader-1.2.2.tgz", - "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", - "dev": true, - "requires": { - "convert-source-map": "1.5.1", - "espower-source": "2.2.0", - "minimatch": "3.0.4", - "source-map-support": "0.4.18", - "xtend": "4.0.1" - }, - "dependencies": { - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "0.5.7" - } - } - } - }, - "espower-location-detector": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/espower-location-detector/-/espower-location-detector-1.0.0.tgz", - "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", - "dev": true, - "requires": { - "is-url": "1.2.4", - "path-is-absolute": "1.0.1", - "source-map": "0.5.7", - "xtend": "4.0.1" - } - }, - "espower-source": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/espower-source/-/espower-source-2.2.0.tgz", - "integrity": "sha1-fgBSVa5HtcE2RIZEs/PYAtUD91I=", - "dev": true, - "requires": { - "acorn": "5.5.3", - "acorn-es7-plugin": "1.1.7", - "convert-source-map": "1.5.1", - "empower-assert": "1.0.1", - "escodegen": "1.9.1", - "espower": "2.1.0", - "estraverse": "4.2.0", - "merge-estraverse-visitors": "1.0.0", - "multi-stage-sourcemap": "0.2.1", - "path-is-absolute": "1.0.1", - "xtend": "4.0.1" - }, - "dependencies": { - "acorn": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", - "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", - "dev": true - } - } - }, - "espree": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", - "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", - "dev": true, - "requires": { - "acorn": "5.5.3", - "acorn-jsx": "3.0.1" - }, - "dependencies": { - "acorn": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", - "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", - "dev": true - } - } - }, - "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", - "dev": true - }, - "espurify": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", - "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", - "requires": { - "core-js": "2.5.4" - } - }, - "esquery": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz", - "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.41" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "2.2.3" - }, - "dependencies": { - "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", - "dev": true, - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "2.0.4" - } - } - } - }, - "external-editor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz", - "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==", - "dev": true, - "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.19", - "tmp": "0.0.33" - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" - }, - "fast-diff": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", - "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", - "dev": true - }, - "fast-glob": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.0.tgz", - "integrity": "sha512-4F75PTznkNtSKs2pbhtBwRkw8sRwa7LfXx5XaQJOe4IQ6yTjceLDTwM5gj1s80R2t/5WeDC1gVfm3jLE+l39Tw==", - "requires": { - "@mrmlnc/readdir-enhanced": "2.2.1", - "glob-parent": "3.1.0", - "is-glob": "4.0.0", - "merge2": "1.2.1", - "micromatch": "3.1.10" - } - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "1.0.5" - } - }, - "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", - "dev": true, - "requires": { - "flat-cache": "1.3.0", - "object-assign": "4.1.1" - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "fill-keys": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", - "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", - "dev": true, - "requires": { - "is-object": "1.0.1", - "merge-descriptors": "1.0.1" - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "1.0.1", - "make-dir": "1.2.0", - "pkg-dir": "2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "2.0.0" - } - }, - "flat-cache": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", - "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", - "dev": true, - "requires": { - "circular-json": "0.3.3", - "del": "2.2.2", - "graceful-fs": "4.1.11", - "write": "0.2.1" - } - }, - "fn-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", - "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", - "dev": true - }, - "follow-redirects": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz", - "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", - "requires": { - "debug": "3.1.0" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" - } - }, - "formidable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", - "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", - "dev": true - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "requires": { - "map-cache": "0.2.2" - } - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.5" - } - }, - "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz", - "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.6.39" - }, - "dependencies": { - "abbrev": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "balanced-match": { - "version": "0.4.2", - "bundled": true, - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "0.4.2", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true - }, - "co": { - "version": "4.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "dev": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "debug": { - "version": "2.6.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.1.1", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "dev": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true, - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true, - "dev": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "dev": true, - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "node-pre-gyp": { - "version": "0.6.39", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.2", - "hawk": "3.1.3", - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true, - "dev": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "bundled": true, - "dev": true, - "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" - } - }, - "rimraf": { - "version": "2.6.1", - "bundled": true, - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.0.1", - "bundled": true, - "dev": true - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "dev": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "dev": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "dev": true, - "optional": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "verror": { - "version": "1.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - } - } - }, - "function-name-support": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/function-name-support/-/function-name-support-0.2.0.tgz", - "integrity": "sha1-VdO/qm6v1QWlD5vIH99XVkoLsHE=", - "dev": true - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, - "gcp-metadata": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", - "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", - "requires": { - "axios": "0.18.0", - "extend": "3.0.1", - "retry-axios": "0.3.2" - } - }, - "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", - "dev": true - }, - "get-port": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", - "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", - "dev": true - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "1.0.0" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - }, - "dependencies": { - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" } } } }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "@ladjs/time-require": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", + "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", + "dev": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "chalk": "0.4.0", + "date-time": "0.1.1", + "pretty-ms": "0.2.2", + "text-table": "0.2.0" }, "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "ansi-styles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", + "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", + "dev": true + }, + "chalk": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", + "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", + "dev": true, "requires": { - "is-extglob": "2.1.1" + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" + } + }, + "pretty-ms": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", + "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", + "dev": true, + "requires": { + "parse-ms": "0.1.2" } + }, + "strip-ansi": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", + "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", + "dev": true } } }, - "glob-to-regexp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", - "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" - }, - "global-dirs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", - "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", - "dev": true, + "@mrmlnc/readdir-enhanced": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", + "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "requires": { - "ini": "1.3.5" + "call-me-maybe": "1.0.1", + "glob-to-regexp": "0.3.0" } }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" }, - "globby": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", - "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "fast-glob": "2.2.0", - "glob": "7.1.2", - "ignore": "3.3.7", - "pify": "3.0.0", - "slash": "1.0.0" - } + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" }, - "google-auth-library": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.3.2.tgz", - "integrity": "sha512-aRz0om4Bs85uyR2Ousk3Gb8Nffx2Sr2RoKts1smg1MhRwrehE1aD1HC4RmprNt1HVJ88IDnQ8biJQ/aXjiIxlQ==", - "requires": { - "axios": "0.18.0", - "gcp-metadata": "0.6.3", - "gtoken": "2.2.0", - "jws": "3.1.4", - "lodash.isstring": "4.0.1", - "lru-cache": "4.1.2", - "retry-axios": "0.3.2" - } + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" }, - "google-auto-auth": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.7.tgz", - "integrity": "sha512-Nro7aIFrL2NP0G7PoGrJqXGMZj8AjdBOcbZXRRm/8T3w08NUHIiNN3dxpuUYzDsZizslH+c8e+7HXL8vh3JXTQ==", - "requires": { - "async": "2.6.0", - "gcp-metadata": "0.6.3", - "google-auth-library": "1.3.2", - "request": "2.85.0" - } + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" }, - "google-gax": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.0.tgz", - "integrity": "sha512-sslPB7USGD8SrVUGlWFIGYVZrgZ6oj+fWUEW3f8Bk43+nxqeLyrNoI3iFBRpjLfwMCEYaXVziWNmatwLRP8azg==", + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", "requires": { - "duplexify": "3.5.4", - "extend": "3.0.1", - "globby": "8.0.1", - "google-auto-auth": "0.9.7", - "google-proto-files": "0.15.1", - "grpc": "1.9.1", - "is-stream-ended": "0.1.3", - "lodash": "4.17.5", - "protobufjs": "6.8.6", - "through2": "2.0.3" + "@protobufjs/aspromise": "1.1.2", + "@protobufjs/inquire": "1.1.0" } }, - "google-p12-pem": { + "@protobufjs/float": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", - "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", - "requires": { - "node-forge": "0.7.4", - "pify": "3.0.0" - } + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" }, - "google-proto-files": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", - "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" + }, + "@sindresorhus/is": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", + "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", + "dev": true + }, + "@sinonjs/formatio": { + "version": "2.0.0", + "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", + "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", + "dev": true, "requires": { - "globby": "7.1.1", - "power-assert": "1.4.4", - "protobufjs": "6.8.6" - }, - "dependencies": { - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.2", - "ignore": "3.3.7", - "pify": "3.0.0", - "slash": "1.0.0" - } - } + "samsam": "1.3.0" } }, - "got": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/got/-/got-8.2.0.tgz", - "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", + "@types/long": { + "version": "3.0.32", + "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", + "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" + }, + "@types/node": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.6.tgz", + "integrity": "sha512-R9N6rE3o0q7yBjEpJJPUP8UkJyh1z0Xf7Co0jyOkLFuzzqZ7M1MA/s2667/VbUdD1EhF8U8a+HpZT91tEbLXrg==" + }, + "acorn": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz", + "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==", + "dev": true + }, + "acorn-es7-plugin": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz", + "integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=" + }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { - "@sindresorhus/is": "0.7.0", - "cacheable-request": "2.1.4", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "into-stream": "3.1.0", - "is-retry-allowed": "1.1.0", - "isurl": "1.0.0", - "lowercase-keys": "1.0.1", - "mimic-response": "1.0.0", - "p-cancelable": "0.3.0", - "p-timeout": "2.0.1", - "pify": "3.0.0", - "safe-buffer": "5.1.1", - "timed-out": "4.0.1", - "url-parse-lax": "3.0.0", - "url-to-options": "1.0.1" + "acorn": "3.3.0" }, "dependencies": { - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", "dev": true - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, - "requires": { - "prepend-http": "2.0.0" - } } } }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ajv-keywords": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", "dev": true }, - "growl": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, - "grpc": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.9.1.tgz", - "integrity": "sha512-WNW3MWMuAoo63AwIlzFE3T0KzzvNBSvOkg67Hm8WhvHNkXFBlIk1QyJRE3Ocm0O5eIwS7JU8Ssota53QR1zllg==", + "ansi-align": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", + "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "dev": true, "requires": { - "lodash": "4.17.5", - "nan": "2.10.0", - "node-pre-gyp": "0.6.39", - "protobufjs": "5.0.2" + "string-width": "2.1.1" }, "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, "ansi-regex": { - "version": "2.1.1", - "bundled": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.3" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.8", - "bundled": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "caseless": { - "version": "0.12.0", - "bundled": true - }, - "co": { - "version": "4.6.0", - "bundled": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true - }, - "extsprintf": { - "version": "1.3.0", - "bundled": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true }, - "hawk": { - "version": "3.1.3", - "bundled": true, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, - "hoek": { - "version": "2.16.3", - "bundled": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" + "ansi-regex": "3.0.0" } + } + } + }, + "ansi-escapes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, + "requires": { + "micromatch": "2.3.11", + "normalize-path": "2.1.1" + } + }, + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "argv": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz", + "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=", + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-exclude": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/arr-exclude/-/arr-exclude-1.0.0.tgz", + "integrity": "sha1-38fC5VKicHI8zaBM8xKMjL/lxjE=", + "dev": true + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", + "dev": true + }, + "array-filter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", + "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" + }, + "array-find": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", + "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", + "dev": true + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "requires": { + "array-uniq": "1.0.3" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + }, + "ascli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", + "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", + "requires": { + "colour": "0.7.1", + "optjs": "3.2.2" + } + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" + }, + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "requires": { + "lodash": "4.17.4" + } + }, + "async-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "atob": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz", + "integrity": "sha512-SuiKH8vbsOyCALjA/+EINmt/Kdl+TQPrtFgW7XZZcwtryFu9e5kQoX3bjCW6mIvGH1fbeAZZuvwGR5IlBRznGw==" + }, + "auto-bind": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz", + "integrity": "sha512-Zw7pZp7tztvKnWWtoII4AmqH5a2PV3ZN5F0BPRTGcc1kpRm4b6QXQnPU7Znbl6BfPfqOVOV29g4JeMqZQaqqOA==", + "dev": true + }, + "ava": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", + "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", + "dev": true, + "requires": { + "@ava/babel-preset-stage-4": "1.1.0", + "@ava/babel-preset-transform-test-files": "3.0.0", + "@ava/write-file-atomic": "2.2.0", + "@concordance/react": "1.0.0", + "@ladjs/time-require": "0.1.4", + "ansi-escapes": "3.1.0", + "ansi-styles": "3.2.0", + "arr-flatten": "1.1.0", + "array-union": "1.0.2", + "array-uniq": "1.0.3", + "arrify": "1.0.1", + "auto-bind": "1.2.0", + "ava-init": "0.2.1", + "babel-core": "6.26.0", + "babel-generator": "6.26.1", + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "bluebird": "3.5.1", + "caching-transform": "1.0.1", + "chalk": "2.3.0", + "chokidar": "1.7.0", + "clean-stack": "1.3.0", + "clean-yaml-object": "0.1.0", + "cli-cursor": "2.1.0", + "cli-spinners": "1.3.1", + "cli-truncate": "1.1.0", + "co-with-promise": "4.6.0", + "code-excerpt": "2.1.1", + "common-path-prefix": "1.0.0", + "concordance": "3.0.0", + "convert-source-map": "1.5.1", + "core-assert": "0.2.1", + "currently-unhandled": "0.4.1", + "debug": "3.1.0", + "dot-prop": "4.2.0", + "empower-core": "0.6.2", + "equal-length": "1.0.1", + "figures": "2.0.0", + "find-cache-dir": "1.0.0", + "fn-name": "2.0.1", + "get-port": "3.2.0", + "globby": "6.1.0", + "has-flag": "2.0.0", + "hullabaloo-config-manager": "1.1.1", + "ignore-by-default": "1.0.1", + "import-local": "0.1.1", + "indent-string": "3.2.0", + "is-ci": "1.1.0", + "is-generator-fn": "1.0.0", + "is-obj": "1.0.1", + "is-observable": "1.1.0", + "is-promise": "2.1.0", + "last-line-stream": "1.0.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.debounce": "4.0.8", + "lodash.difference": "4.5.0", + "lodash.flatten": "4.4.0", + "loud-rejection": "1.6.0", + "make-dir": "1.2.0", + "matcher": "1.1.0", + "md5-hex": "2.0.0", + "meow": "3.7.0", + "ms": "2.1.1", + "multimatch": "2.1.0", + "observable-to-promise": "0.5.0", + "option-chain": "1.0.0", + "package-hash": "2.0.0", + "pkg-conf": "2.1.0", + "plur": "2.1.2", + "pretty-ms": "3.1.0", + "require-precompiled": "0.1.0", + "resolve-cwd": "2.0.0", + "safe-buffer": "5.1.1", + "semver": "5.4.1", + "slash": "1.0.0", + "source-map-support": "0.5.4", + "stack-utils": "1.0.1", + "strip-ansi": "4.0.0", + "strip-bom-buf": "1.0.0", + "supertap": "1.0.0", + "supports-color": "5.4.0", + "trim-off-newlines": "1.0.1", + "unique-temp-dir": "1.0.0", + "update-notifier": "2.5.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true }, - "inflight": { - "version": "1.0.6", - "bundled": true, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "ini": { - "version": "1.3.5", - "bundled": true + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, + "source-map-support": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", + "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", + "dev": true, "requires": { - "number-is-nan": "1.0.1" + "source-map": "0.6.1" } }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, "requires": { - "jsonify": "0.0.0" + "ansi-regex": "3.0.0" } }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true - }, - "jsprim": { - "version": "1.4.1", - "bundled": true, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" + "has-flag": "3.0.0" }, "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true } } + } + } + }, + "ava-init": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ava-init/-/ava-init-0.2.1.tgz", + "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", + "dev": true, + "requires": { + "arr-exclude": "1.0.0", + "execa": "0.7.0", + "has-yarn": "1.0.0", + "read-pkg-up": "2.0.0", + "write-pkg": "3.1.0" + } + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + }, + "axios": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", + "requires": { + "follow-redirects": "1.4.1", + "is-buffer": "1.1.6" + } + }, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true }, - "mime-db": { - "version": "1.30.0", - "bundled": true - }, - "mime-types": { - "version": "2.1.17", - "bundled": true, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, "requires": { - "mime-db": "1.30.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, - "minimatch": { - "version": "3.0.4", - "bundled": true, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, + "babel-core": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", + "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.1", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.4", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "requires": { - "brace-expansion": "1.1.8" + "ms": "2.0.0" } }, - "minimist": { - "version": "0.0.8", - "bundled": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "babel-generator": { + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" + }, + "dependencies": { + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + } + } + }, + "babel-helper-builder-binary-assignment-operator-visitor": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", + "dev": true, + "requires": { + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-call-delegate": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", + "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", + "dev": true, + "requires": { + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-explode-assignable-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", + "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", + "dev": true, + "requires": { + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-get-function-arity": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", + "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-hoist-variables": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", + "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-regex": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", + "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.4" + } + }, + "babel-helper-remap-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helpers": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", + "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" + } + }, + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-check-es2015-constants": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", + "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-espower": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.4.0.tgz", + "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", + "dev": true, + "requires": { + "babel-generator": "6.26.1", + "babylon": "6.18.0", + "call-matcher": "1.0.1", + "core-js": "2.5.3", + "espower-location-detector": "1.0.0", + "espurify": "1.7.0", + "estraverse": "4.2.0" + } + }, + "babel-plugin-syntax-async-functions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", + "dev": true + }, + "babel-plugin-syntax-exponentiation-operator": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", + "dev": true + }, + "babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", + "dev": true + }, + "babel-plugin-syntax-trailing-function-commas": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", + "dev": true + }, + "babel-plugin-transform-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", + "dev": true, + "requires": { + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-destructuring": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", + "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", + "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-modules-commonjs": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz", + "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=", + "dev": true, + "requires": { + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-parameters": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", + "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", + "dev": true, + "requires": { + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-spread": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", + "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-sticky-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", + "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", + "dev": true, + "requires": { + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-unicode-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", + "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", + "dev": true, + "requires": { + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" + } + }, + "babel-plugin-transform-exponentiation-operator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", + "dev": true, + "requires": { + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-strict-mode": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", + "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-register": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", + "dev": true, + "requires": { + "babel-core": "6.26.0", + "babel-runtime": "6.26.0", + "core-js": "2.5.3", + "home-or-tmp": "2.0.0", + "lodash": "4.17.4", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.4" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "requires": { - "minimist": "0.0.8" + "ms": "2.0.0" } }, "ms": { "version": "2.0.0", - "bundled": true - }, - "node-pre-gyp": { - "version": "0.6.39", - "bundled": true, - "requires": { - "detect-libc": "1.0.3", - "hawk": "3.1.3", - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.2", - "rc": "1.2.4", - "request": "2.81.0", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "2.2.1", - "tar-pack": "3.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "requires": { + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.4" + "is-descriptor": "1.0.2" } }, - "npmlog": { - "version": "4.1.2", - "bundled": true, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "kind-of": "6.0.2" } }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true - }, - "once": { - "version": "1.4.0", - "bundled": true, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "wrappy": "1.0.2" + "kind-of": "6.0.2" } }, - "os-homedir": { - "version": "1.0.2", - "bundled": true - }, - "os-tmpdir": { + "is-descriptor": { "version": "1.0.2", - "bundled": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, - "performance-now": { - "version": "0.2.0", - "bundled": true + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "base64url": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", + "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "binary-extensions": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", + "dev": true + }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "dev": true + }, + "boom": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", + "requires": { + "hoek": "4.2.1" + } + }, + "boxen": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "dev": true, + "requires": { + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.3.0", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true }, - "protobufjs": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", - "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=", + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, "requires": { - "ascli": "1.0.1", - "bytebuffer": "5.0.1", - "glob": "7.1.2", - "yargs": "3.32.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, - "punycode": { - "version": "1.4.1", - "bundled": true - }, - "qs": { - "version": "6.4.0", - "bundled": true - }, - "rc": { - "version": "1.2.4", - "bundled": true, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true - } + "ansi-regex": "3.0.0" } - }, - "readable-stream": { - "version": "2.3.3", - "bundled": true, + } + } + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "browser-stdout": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", + "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", + "dev": true + }, + "buf-compare": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", + "integrity": "sha1-/vKNqLgROgoNtEMLC2Rntpcws0o=", + "dev": true + }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "bytebuffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", + "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", + "requires": { + "long": "3.2.0" + } + }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "requires": { + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "cacheable-request": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", + "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", + "dev": true, + "requires": { + "clone-response": "1.0.2", + "get-stream": "3.0.0", + "http-cache-semantics": "3.8.1", + "keyv": "3.0.0", + "lowercase-keys": "1.0.0", + "normalize-url": "2.0.1", + "responselike": "1.0.2" + }, + "dependencies": { + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "dev": true + } + } + }, + "caching-transform": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", + "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", + "dev": true, + "requires": { + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" + }, + "dependencies": { + "md5-hex": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", + "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", + "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" + "md5-o-matic": "0.1.1" } }, - "request": { - "version": "2.81.0", - "bundled": true, + "write-file-atomic": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", + "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", + "dev": true, "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, + } + } + }, + "call-matcher": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-matcher/-/call-matcher-1.0.1.tgz", + "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", + "dev": true, + "requires": { + "core-js": "2.5.3", + "deep-equal": "1.0.1", + "espurify": "1.7.0", + "estraverse": "4.2.0" + } + }, + "call-me-maybe": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", + "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=" + }, + "call-signature": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/call-signature/-/call-signature-0.0.2.tgz", + "integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY=" + }, + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "0.2.0" + } + }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "capture-stack-trace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", + "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "catharsis": { + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", + "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", + "dev": true, + "requires": { + "underscore-contrib": "0.3.0" + } + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "chardet": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", + "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", + "dev": true + }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, + "requires": { + "anymatch": "1.3.2", + "async-each": "1.0.1", + "fsevents": "1.2.2", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" + } + }, + "ci-info": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", + "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", + "dev": true + }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "requires": { + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "glob": "7.1.2" + "is-descriptor": "0.1.6" } }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true - }, - "semver": { - "version": "5.5.0", - "bundled": true + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "clean-stack": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz", + "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE=", + "dev": true + }, + "clean-yaml-object": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", + "integrity": "sha1-Y/sRDcLOGoTcIfbZM0h20BCui2g=", + "dev": true + }, + "cli-boxes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", + "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "2.0.0" + } + }, + "cli-spinners": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", + "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==", + "dev": true + }, + "cli-truncate": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", + "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", + "dev": true, + "requires": { + "slice-ansi": "1.0.0", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true }, - "set-blocking": { + "is-fullwidth-code-point": { "version": "2.0.0", - "bundled": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true }, - "sntp": { - "version": "1.0.9", - "bundled": true, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, "requires": { - "hoek": "2.16.3" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, - "sshpk": { - "version": "1.13.1", - "bundled": true, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } + "ansi-regex": "3.0.0" } + } + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "dev": true, + "requires": { + "mimic-response": "1.0.0" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "co-with-promise": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co-with-promise/-/co-with-promise-4.6.0.tgz", + "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", + "dev": true, + "requires": { + "pinkie-promise": "1.0.0" + }, + "dependencies": { + "pinkie": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", + "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=", + "dev": true }, - "string-width": { - "version": "1.0.2", - "bundled": true, + "pinkie-promise": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", + "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", + "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "pinkie": "1.0.0" } - }, - "string_decoder": { - "version": "1.0.3", - "bundled": true, + } + } + }, + "code-excerpt": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", + "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", + "dev": true, + "requires": { + "convert-to-spaces": "1.0.2" + } + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "codecov": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.0.tgz", + "integrity": "sha1-wnO4xPEpRXI+jcnSWAPYk0Pl8o4=", + "dev": true, + "requires": { + "argv": "0.0.2", + "request": "2.81.0", + "urlgrey": "0.4.4" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, "requires": { - "safe-buffer": "5.1.1" + "co": "4.6.0", + "json-stable-stringify": "1.0.1" } }, - "stringstream": { - "version": "0.0.5", - "bundled": true + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "dev": true }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, "requires": { - "ansi-regex": "2.1.1" + "hoek": "2.16.3" } }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" + "boom": "2.10.1" } }, - "tar-pack": { - "version": "3.4.1", - "bundled": true, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, "requires": { - "debug": "2.6.9", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.3.3", - "rimraf": "2.6.2", - "tar": "2.2.1", - "uid-number": "0.0.6" + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" } }, - "tough-cookie": { - "version": "2.3.3", - "bundled": true, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "dev": true + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "dev": true, "requires": { - "punycode": "1.4.1" + "ajv": "4.11.8", + "har-schema": "1.0.5" } }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, "requires": { - "safe-buffer": "5.1.1" + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" } }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "optional": true + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "dev": true }, - "uid-number": { - "version": "0.0.6", - "bundled": true + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "dev": true }, - "uuid": { - "version": "3.2.1", - "bundled": true + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "dev": true }, - "verror": { - "version": "1.10.0", - "bundled": true, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "dev": true, "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true - } + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.1.0" } }, - "wide-align": { - "version": "1.1.2", - "bundled": true, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, "requires": { - "string-width": "1.0.2" + "hoek": "2.16.3" + } + } + } + }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "requires": { + "map-visit": "1.0.0", + "object-visit": "1.0.1" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "colour": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", + "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "common-path-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-1.0.0.tgz", + "integrity": "sha1-zVL28HEuC6q5fW+XModPIvR3UsA=", + "dev": true + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "typedarray": "0.0.6" + } + }, + "concordance": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/concordance/-/concordance-3.0.0.tgz", + "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", + "dev": true, + "requires": { + "date-time": "2.1.0", + "esutils": "2.0.2", + "fast-diff": "1.1.2", + "function-name-support": "0.2.0", + "js-string-escape": "1.0.1", + "lodash.clonedeep": "4.5.0", + "lodash.flattendeep": "4.4.0", + "lodash.merge": "4.6.0", + "md5-hex": "2.0.0", + "semver": "5.4.1", + "well-known-symbols": "1.0.0" + }, + "dependencies": { + "date-time": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", + "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", + "dev": true, + "requires": { + "time-zone": "1.0.0" } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true } } }, - "gtoken": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.2.0.tgz", - "integrity": "sha512-tvQs8B1z5+I1FzMPZnq/OCuxTWFOkvy7cUJcpNdBOK2L7yEtPZTVCPtZU181sSDF+isUPebSqFTNTkIejFASAQ==", + "configstore": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", + "dev": true, + "requires": { + "dot-prop": "4.2.0", + "graceful-fs": "4.1.11", + "make-dir": "1.2.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.3.0", + "xdg-basedir": "3.0.0" + } + }, + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "dev": true + }, + "convert-to-spaces": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz", + "integrity": "sha1-fj5Iu+bZl7FBfdyihoIEtNPYVxU=", + "dev": true + }, + "cookiejar": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz", + "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=", + "dev": true + }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + }, + "core-assert": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/core-assert/-/core-assert-0.2.1.tgz", + "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", + "dev": true, + "requires": { + "buf-compare": "1.0.1", + "is-error": "2.2.1" + } + }, + "core-js": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "create-error-class": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", + "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "requires": { + "capture-stack-trace": "1.0.0" + } + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, "requires": { - "axios": "0.18.0", - "google-p12-pem": "1.0.2", - "jws": "3.1.4", - "mime": "2.2.0", - "pify": "3.0.0" + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" } }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", - "dev": true, + "cryptiles": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "boom": "5.2.0" }, "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", "requires": { - "amdefine": "1.0.1" + "hoek": "4.2.1" } } } }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", + "dev": true }, - "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "array-find-index": "1.0.2" } }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "es5-ext": "0.10.37" } }, - "has-color": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", - "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=", + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "1.0.0" + } + }, + "date-time": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", + "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", "dev": true }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + }, + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, + "requires": { + "mimic-response": "1.0.0" + } + }, + "deep-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", "dev": true }, - "has-symbol-support-x": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", "dev": true }, - "has-to-string-tag-x": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", - "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", - "dev": true, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "define-properties": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", + "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "requires": { - "has-symbol-support-x": "1.4.2" + "foreach": "2.0.5", + "object-keys": "1.0.11" } }, - "has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", + "is-descriptor": "1.0.2", "isobject": "3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } } }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" }, "dependencies": { - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, "requires": { - "is-buffer": "1.1.6" + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } } } }, - "has-yarn": { + "delay": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", + "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", + "requires": { + "p-defer": "1.0.0" + } + }, + "delayed-stream": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-1.0.0.tgz", - "integrity": "sha1-ieJdtgS3Jcj1l2//Ct3JIbgopac=", - "dev": true + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, - "hawk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", - "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "dev": true, "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.1", - "sntp": "2.1.0" + "repeating": "2.0.1" } }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, - "hoek": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", - "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" + "diff-match-patch": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz", + "integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg=" }, - "home-or-tmp": { + "dir-glob": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", + "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "arrify": "1.0.1", + "path-type": "3.0.0" + }, + "dependencies": { + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "requires": { + "pify": "3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } } }, - "hosted-git-info": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", - "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", - "dev": true + "doctrine": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz", + "integrity": "sha512-y0tm5Pq6ywp3qSTZ1vPgVdAnbDEoeoc5wlOHXoY1c4Wug/a7JvqHIl7BTvwodaHmejWkK/9dSb3sCYfyo/om8A==", + "dev": true, + "requires": { + "esutils": "2.0.2" + } }, - "htmlparser2": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", - "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.1", - "domutils": "1.7.0", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.5" + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + } } }, - "http-cache-semantics": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", - "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", "dev": true }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "domhandler": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", + "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", + "dev": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "domelementtype": "1.3.0" } }, - "hullabaloo-config-manager": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz", - "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", + "domutils": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz", + "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=", "dev": true, "requires": { - "dot-prop": "4.2.0", - "es6-error": "4.1.1", - "graceful-fs": "4.1.11", - "indent-string": "3.2.0", - "json5": "0.5.1", - "lodash.clonedeep": "4.5.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.isequal": "4.5.0", - "lodash.merge": "4.6.1", - "md5-hex": "2.0.0", - "package-hash": "2.0.0", - "pkg-dir": "2.0.0", - "resolve-from": "3.0.0", - "safe-buffer": "5.1.1" + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" } }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true - }, - "ignore": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", - "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==" - }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", - "dev": true - }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true - }, - "import-local": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz", - "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", + "dot-prop": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" + "is-obj": "1.0.1" } }, - "imurmurhash": { + "duplexer3": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", "dev": true }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "duplexify": { + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", + "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" } }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, - "ink-docstrap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", - "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", - "dev": true, - "requires": { - "moment": "2.21.0", - "sanitize-html": "1.18.2" - } + "eastasianwidth": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.1.1.tgz", + "integrity": "sha1-RNZW3p2kFWlEZzNTZfsxR7hXK3w=" }, - "inquirer": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", - "dev": true, - "requires": { - "ansi-escapes": "3.1.0", - "chalk": "2.3.2", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.1.0", - "figures": "2.0.0", - "lodash": "4.17.5", - "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx-lite": "4.0.8", - "rx-lite-aggregates": "4.0.8", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "optional": true, + "requires": { + "jsbn": "0.1.1" } }, - "intelli-espower-loader": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/intelli-espower-loader/-/intelli-espower-loader-1.0.1.tgz", - "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", - "dev": true, + "ecdsa-sig-formatter": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz", + "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=", "requires": { - "espower-loader": "1.2.2" + "base64url": "2.0.0", + "safe-buffer": "5.1.1" } }, - "into-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", - "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", - "dev": true, + "empower": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", + "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", "requires": { - "from2": "2.3.0", - "p-is-promise": "1.1.0" + "core-js": "2.5.3", + "empower-core": "0.6.2" } }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "empower-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/empower-assert/-/empower-assert-1.0.1.tgz", + "integrity": "sha1-MeMQq8BluqfDoEh+a+W7zGXzwd4=", "dev": true, "requires": { - "loose-envify": "1.3.1" + "estraverse": "4.2.0" } }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" - }, - "irregular-plurals": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz", - "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=", - "dev": true - }, - "is": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", - "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=" + "empower-core": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", + "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", + "requires": { + "call-signature": "0.0.2", + "core-js": "2.5.3" + } }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { - "kind-of": "6.0.2" + "once": "1.4.0" } }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=" + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", "dev": true }, - "is-binary-path": { + "equal-length": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "1.11.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + "resolved": "https://registry.npmjs.org/equal-length/-/equal-length-1.0.1.tgz", + "integrity": "sha1-IcoRLUirJLTh5//A5TOdMf38J0w=", + "dev": true }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "is-arrayish": "0.2.1" } }, - "is-ci": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", - "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "es5-ext": { + "version": "0.10.37", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz", + "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=", "dev": true, "requires": { - "ci-info": "1.1.3" + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" } }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "d": "1.0.0", + "es5-ext": "0.10.37", + "es6-symbol": "3.1.1" } }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "d": "1.0.0", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" } }, - "is-error": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.1.tgz", - "integrity": "sha1-aEqW2EB2V3yY9M20DG0mpRI78Zw=", - "dev": true - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "d": "1.0.0", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" } }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dev": true, "requires": { - "number-is-nan": "1.0.1" + "d": "1.0.0", + "es5-ext": "0.10.37" } }, - "is-generator-fn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz", - "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=", - "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "dev": true, "requires": { - "is-extglob": "2.1.1" + "d": "1.0.0", + "es5-ext": "0.10.37", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" } }, - "is-installed-globally": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", - "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", + "escallmatch": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/escallmatch/-/escallmatch-1.5.0.tgz", + "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", "dev": true, "requires": { - "global-dirs": "0.1.1", - "is-path-inside": "1.0.1" + "call-matcher": "1.0.1", + "esprima": "2.7.3" + }, + "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + } } }, - "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "escodegen": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", + "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", + "dev": true, "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.5.7" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "dev": true } } }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true - }, - "is-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", - "dev": true - }, - "is-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", - "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "symbol-observable": "1.2.0" + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.0", + "estraverse": "4.2.0" } }, - "is-odd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", - "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", + "eslint": { + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz", + "integrity": "sha512-Ul6CSGRjKscEyg0X/EeNs7o2XdnbTEOD1OM8cTjmx85RPcBJQrEhZLevhuJZNAE/vS2iVl5Uhgiqf3h5uLMCJQ==", + "dev": true, "requires": { - "is-number": "4.0.0" + "ajv": "5.5.2", + "babel-code-frame": "6.26.0", + "chalk": "2.3.0", + "concat-stream": "1.6.0", + "cross-spawn": "5.1.0", + "debug": "3.1.0", + "doctrine": "2.0.2", + "eslint-scope": "3.7.1", + "eslint-visitor-keys": "1.0.0", + "espree": "3.5.2", + "esquery": "1.0.0", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "functional-red-black-tree": "1.0.1", + "glob": "7.1.2", + "globals": "11.1.0", + "ignore": "3.3.7", + "imurmurhash": "0.1.4", + "inquirer": "3.3.0", + "is-resolvable": "1.0.1", + "js-yaml": "3.10.0", + "json-stable-stringify-without-jsonify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.4", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "7.0.0", + "progress": "2.0.0", + "require-uncached": "1.0.3", + "semver": "5.4.1", + "strip-ansi": "4.0.0", + "strip-json-comments": "2.0.1", + "table": "4.0.2", + "text-table": "0.2.0" }, "dependencies": { - "is-number": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "globals": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz", + "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==", + "dev": true + }, + "strip-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } } } }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", + "eslint-config-prettier": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", + "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", "dev": true, "requires": { - "is-path-inside": "1.0.1" + "get-stdin": "5.0.1" + }, + "dependencies": { + "get-stdin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", + "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", + "dev": true + } } }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "eslint-plugin-node": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-6.0.0.tgz", + "integrity": "sha512-Qj4dMF1N/wRALO1IRvnchn8c1i0awgrztrGx7MjF9ewDwlW/heNB+WeZ09bhp8Yp0TD+BZcADP8BRya0wmropA==", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "ignore": "3.3.7", + "minimatch": "3.0.4", + "resolve": "1.5.0", + "semver": "5.4.1" + }, + "dependencies": { + "resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + } } }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "eslint-plugin-prettier": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.4.0.tgz", + "integrity": "sha512-P0EohHM1MwL36GX5l1TOEYyt/5d7hcxrX3CqCjibTN3dH7VCAy2kjsC/WB6dUHnpB4mFkZq1Ndfh2DYQ2QMEGQ==", + "dev": true, "requires": { - "isobject": "3.0.1" + "fast-diff": "1.1.2", + "jest-docblock": "21.2.0" } }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, - "is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", - "dev": true - }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, - "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "is-stream-ended": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz", - "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=" - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, - "is-url": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", - "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, - "isurl": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", - "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", "dev": true, "requires": { - "has-to-string-tag-x": "1.4.1", - "is-object": "1.0.1" + "esrecurse": "4.2.0", + "estraverse": "4.2.0" } }, - "jest-docblock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", - "dev": true - }, - "js-string-escape": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", - "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", "dev": true }, - "js-yaml": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz", - "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==", + "espower": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/espower/-/espower-2.1.0.tgz", + "integrity": "sha1-zh7bPZhwKEH99ZbRy46FvcSujkg=", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "4.0.0" + "array-find": "1.0.0", + "escallmatch": "1.5.0", + "escodegen": "1.9.0", + "escope": "3.6.0", + "espower-location-detector": "1.0.0", + "espurify": "1.7.0", + "estraverse": "4.2.0", + "source-map": "0.5.7", + "type-name": "2.0.2", + "xtend": "4.0.1" } }, - "js2xmlparser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", - "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", + "espower-loader": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/espower-loader/-/espower-loader-1.2.2.tgz", + "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", "dev": true, "requires": { - "xmlcreate": "1.0.2" + "convert-source-map": "1.5.1", + "espower-source": "2.2.0", + "minimatch": "3.0.4", + "source-map-support": "0.4.18", + "xtend": "4.0.1" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true - }, - "jsdoc": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", - "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", + "espower-location-detector": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/espower-location-detector/-/espower-location-detector-1.0.0.tgz", + "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", "dev": true, "requires": { - "babylon": "7.0.0-beta.19", - "bluebird": "3.5.1", - "catharsis": "0.8.9", - "escape-string-regexp": "1.0.5", - "js2xmlparser": "3.0.0", - "klaw": "2.0.0", - "marked": "0.3.19", - "mkdirp": "0.5.1", - "requizzle": "0.2.1", - "strip-json-comments": "2.0.1", - "taffydb": "2.6.2", - "underscore": "1.8.3" - }, - "dependencies": { - "babylon": { - "version": "7.0.0-beta.19", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", - "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", - "dev": true - } + "is-url": "1.2.2", + "path-is-absolute": "1.0.1", + "source-map": "0.5.7", + "xtend": "4.0.1" } }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true + "espower-source": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/espower-source/-/espower-source-2.2.0.tgz", + "integrity": "sha1-fgBSVa5HtcE2RIZEs/PYAtUD91I=", + "dev": true, + "requires": { + "acorn": "5.3.0", + "acorn-es7-plugin": "1.1.7", + "convert-source-map": "1.5.1", + "empower-assert": "1.0.1", + "escodegen": "1.9.0", + "espower": "2.1.0", + "estraverse": "4.2.0", + "merge-estraverse-visitors": "1.0.0", + "multi-stage-sourcemap": "0.2.1", + "path-is-absolute": "1.0.1", + "xtend": "4.0.1" + } }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true + "espree": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz", + "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==", + "dev": true, + "requires": { + "acorn": "5.3.0", + "acorn-jsx": "3.0.1" + } }, - "json-parse-better-errors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz", - "integrity": "sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw==", + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", "dev": true }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + "espurify": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", + "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", + "requires": { + "core-js": "2.5.3" + } }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "esquery": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz", + "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=", "dev": true, "requires": { - "jsonify": "0.0.0" + "estraverse": "4.2.0" } }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true + "esrecurse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", + "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "dev": true, + "requires": { + "estraverse": "4.2.0", + "object-assign": "4.1.1" + } }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "d": "1.0.0", + "es5-ext": "0.10.37" } }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" } }, - "just-extend": { - "version": "1.1.27", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", - "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==", - "dev": true + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } }, - "jwa": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz", - "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=", + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, "requires": { - "base64url": "2.0.0", - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.9", - "safe-buffer": "5.1.1" + "fill-range": "2.2.3" } }, - "jws": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz", - "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=", + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "base64url": "2.0.0", - "jwa": "1.1.5", - "safe-buffer": "5.1.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } } }, - "keyv": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", - "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", + "external-editor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz", + "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==", "dev": true, "requires": { - "json-buffer": "3.0.0" + "chardet": "0.4.2", + "iconv-lite": "0.4.19", + "tmp": "0.0.33" } }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "klaw": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", - "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "is-extglob": "1.0.0" } }, - "last-line-stream": { + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz", - "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", - "dev": true, + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" + }, + "fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", + "dev": true + }, + "fast-glob": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.1.tgz", + "integrity": "sha512-wSyW1TBK3ia5V+te0rGPXudeMHoUQW6O5Y9oATiaGhpENmEifPDlOdhpsnlj5HoG6ttIvGiY1DdCmI9X2xGMhg==", "requires": { - "through2": "2.0.3" + "@mrmlnc/readdir-enhanced": "2.2.1", + "glob-parent": "3.1.0", + "is-glob": "4.0.0", + "merge2": "1.2.1", + "micromatch": "3.1.10" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } } }, - "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "package-json": "4.0.1" + "escape-string-regexp": "1.0.5" } }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "file-entry-cache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", + "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, - "optional": true - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "invert-kv": "1.0.0" + "flat-cache": "1.3.0", + "object-assign": "4.1.1" } }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "dev": true + }, + "fill-keys": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", + "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "is-object": "1.0.1", + "merge-descriptors": "1.0.1" } }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "find-cache-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "commondir": "1.0.1", + "make-dir": "1.2.0", + "pkg-dir": "2.0.0" } }, - "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" - }, - "lodash.chunk": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", - "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.clonedeepwith": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz", - "integrity": "sha1-buMFc6A6GmDWcKYu8zwQzxr9vdQ=", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, - "lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", - "dev": true - }, - "lodash.escaperegexp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", - "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=", - "dev": true - }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", - "dev": true - }, - "lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", - "dev": true - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", - "dev": true - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" - }, - "lodash.merge": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", - "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==" - }, - "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true - }, - "lodash.snakecase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", - "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" - }, - "log-driver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", - "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" - }, - "lolex": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", - "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==", - "dev": true - }, - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "locate-path": "2.0.0" } }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "flat-cache": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", + "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" } }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "fn-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", + "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", "dev": true }, - "lru-cache": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", - "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", + "follow-redirects": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz", + "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "debug": "3.1.0" } }, - "make-dir": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz", - "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "pify": "3.0.0" + "for-in": "1.0.2" } }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, - "map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "form-data": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", + "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", "requires": { - "object-visit": "1.0.1" + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" } }, - "marked": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz", - "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==", + "formidable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", + "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", "dev": true }, - "matcher": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.0.tgz", - "integrity": "sha512-aZGv6JBTHqfqAd09jmAlbKnAICTfIvb5Z8gXVxPB5WZtFfHMaAMdACL7tQflD2V+6/8KNcY8s6DYtWLgpJP5lA==", - "dev": true, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "escape-string-regexp": "1.0.5" + "map-cache": "0.2.2" } }, - "md5-hex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", - "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", + "from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "inherits": "2.0.3", + "readable-stream": "2.3.3" } }, - "md5-o-matic": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", - "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", - "dev": true - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" } }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.2.tgz", + "integrity": "sha512-iownA+hC4uHFp+7gwP/y5SzaiUo7m2vpa0dhpzw8YuKtiZsz7cIXsFbXpLEeBM6WuCQyw1MH4RRe6XI8GFUctQ==", "dev": true, + "optional": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "nan": "2.10.0", + "node-pre-gyp": "0.9.1" }, "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, "dev": true, + "optional": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, - "load-json-file": { + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "debug": { + "version": "2.6.9", + "bundled": true, "dev": true, + "optional": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "ms": "2.0.0" } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "deep-extend": { + "version": "0.4.2", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "2.2.4" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.21", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, + "ignore-walk": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, "dev": true }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "number-is-nan": "1.0.1" } }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "brace-expansion": "1.1.11" } }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "minimist": { + "version": "0.0.8", + "bundled": true, "dev": true }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "minipass": { + "version": "2.2.4", + "bundled": true, "dev": true, "requires": { - "pinkie": "2.0.4" + "safe-buffer": "5.1.1", + "yallist": "3.0.2" } }, - "read-pkg": { + "minizlib": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "bundled": true, "dev": true, + "optional": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "minipass": "2.2.4" } }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "mkdirp": { + "version": "0.5.1", + "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "minimist": "0.0.8" } }, - "strip-bom": { + "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.2.0", + "bundled": true, "dev": true, + "optional": true, "requires": { - "is-utf8": "0.2.1" + "debug": "2.6.9", + "iconv-lite": "0.4.21", + "sax": "1.2.4" } - } - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "merge-estraverse-visitors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/merge-estraverse-visitors/-/merge-estraverse-visitors-1.0.0.tgz", - "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "merge2": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", - "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==" - }, - "methmeth": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz", - "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.1", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - }, - "mime": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.2.0.tgz", - "integrity": "sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA==" - }, - "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" - }, - "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", - "requires": { - "mime-db": "1.33.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, - "mimic-response": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz", - "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + }, + "node-pre-gyp": { + "version": "0.9.1", + "bundled": true, + "dev": true, + "optional": true, "requires": { - "is-plain-object": "2.0.4" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.0", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.6", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.1" } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "mocha": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz", - "integrity": "sha512-3MM3UjZ5p8EJrYpG7s+29HAI9G7sTzKEe4+w37Dg0QP7qL4XGsV+Q2xet2cE37AqdgN1OtYQB6Vl98YiPV3PgA==", - "dev": true, - "requires": { - "browser-stdout": "1.3.1", - "commander": "2.11.0", - "debug": "3.1.0", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.3", - "he": "1.1.1", - "mkdirp": "0.5.1", - "supports-color": "4.4.0" - }, - "dependencies": { - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + }, + "nopt": { + "version": "4.0.1", + "bundled": true, "dev": true, + "optional": true, "requires": { - "has-flag": "2.0.0" + "abbrev": "1.1.1", + "osenv": "0.1.5" } - } - } - }, - "modelo": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz", - "integrity": "sha512-9DITV2YEMcw7XojdfvGl3gDD8J9QjZTJ7ZOUuSAkP+F3T6rDbzMJuPktxptsdHYEvZcmXrCD3LMOhdSAEq6zKA==" - }, - "module-not-found-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", - "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=", - "dev": true - }, - "moment": { - "version": "2.21.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz", - "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "multi-stage-sourcemap": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz", - "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", - "dev": true, - "requires": { - "source-map": "0.1.43" - }, - "dependencies": { - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + }, + "npm-bundled": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.1.10", + "bundled": true, "dev": true, + "optional": true, "requires": { - "amdefine": "1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" } - } - } - }, - "multimatch": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", - "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-union": "1.0.2", - "arrify": "1.0.1", - "minimatch": "3.0.4" - } - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" - }, - "nanomatch": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", - "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", - "dev": true - }, - "nise": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.2.tgz", - "integrity": "sha512-KPKb+wvETBiwb4eTwtR/OsA2+iijXP+VnlSFYJo3EHjm2yjek1NWxHOUQat3i7xNLm1Bm18UA5j5Wor0yO2GtA==", - "dev": true, - "requires": { - "@sinonjs/formatio": "2.0.0", - "just-extend": "1.1.27", - "lolex": "2.3.2", - "path-to-regexp": "1.7.0", - "text-encoding": "0.6.4" - } - }, - "node-forge": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.4.tgz", - "integrity": "sha512-8Df0906+tq/omxuCZD6PqhPaQDYuyJ1d+VITgxoIA8zvQd1ru+nMJcDChHH324MWitIgbVkAkQoGEEVJNpn/PA==" - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, - "normalize-url": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", - "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", - "dev": true, - "requires": { - "prepend-http": "2.0.0", - "query-string": "5.1.1", - "sort-keys": "2.0.0" - }, - "dependencies": { - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - } - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "2.0.1" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "nyc": { - "version": "11.6.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.6.0.tgz", - "integrity": "sha512-ZaXCh0wmbk2aSBH2B5hZGGvK2s9aM8DIm2rVY+BG3Fx8tUS+bpJSswUVZqOD1YfCmnYRFSqgYJSr7UeeUcW0jg==", - "dev": true, - "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.2.0", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.10.1", - "istanbul-lib-report": "1.1.3", - "istanbul-lib-source-maps": "1.2.3", - "istanbul-reports": "1.3.0", - "md5-hex": "1.3.0", - "merge-source-map": "1.1.0", - "micromatch": "2.3.11", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.2.1", - "yargs": "11.1.0", - "yargs-parser": "8.1.0" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", + }, + "npmlog": { + "version": "4.1.2", "bundled": true, "dev": true, + "optional": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, - "amdefine": { + "number-is-nan": { "version": "1.0.1", "bundled": true, "dev": true }, - "ansi-regex": { - "version": "2.1.1", + "object-assign": { + "version": "4.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, - "ansi-styles": { - "version": "2.2.1", + "once": { + "version": "1.4.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "wrappy": "1.0.2" + } }, - "append-transform": { - "version": "0.4.0", + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", "bundled": true, "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "optional": true, "requires": { - "default-require-extensions": "1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, - "archy": { - "version": "1.0.0", + "path-is-absolute": { + "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, - "arr-diff": { + "process-nextick-args": { "version": "2.0.0", "bundled": true, "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.6", + "bundled": true, + "dev": true, + "optional": true, "requires": { - "arr-flatten": "1.1.0" + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } } }, - "arr-flatten": { - "version": "1.1.0", + "readable-stream": { + "version": "2.3.6", "bundled": true, - "dev": true + "dev": true, + "optional": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } }, - "arr-union": { - "version": "3.1.0", + "rimraf": { + "version": "2.6.2", "bundled": true, - "dev": true + "dev": true, + "optional": true, + "requires": { + "glob": "7.1.2" + } }, - "array-unique": { - "version": "0.2.1", + "safe-buffer": { + "version": "5.1.1", "bundled": true, "dev": true }, - "arrify": { - "version": "1.0.1", + "safer-buffer": { + "version": "2.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, - "assign-symbols": { - "version": "1.0.0", + "sax": { + "version": "1.2.4", "bundled": true, - "dev": true + "dev": true, + "optional": true }, - "async": { - "version": "1.5.2", + "semver": { + "version": "5.5.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, - "atob": { - "version": "2.0.3", + "set-blocking": { + "version": "2.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, - "babel-code-frame": { - "version": "6.26.0", + "signal-exit": { + "version": "3.0.2", "bundled": true, "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - } + "optional": true }, - "babel-generator": { - "version": "6.26.1", + "string-width": { + "version": "1.0.2", "bundled": true, "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.5", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, - "babel-messages": { - "version": "6.23.0", + "string_decoder": { + "version": "1.1.1", "bundled": true, "dev": true, + "optional": true, "requires": { - "babel-runtime": "6.26.0" + "safe-buffer": "5.1.1" } }, - "babel-runtime": { - "version": "6.26.0", + "strip-ansi": { + "version": "3.0.1", "bundled": true, "dev": true, "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" + "ansi-regex": "2.1.1" } }, - "babel-template": { - "version": "6.26.0", + "strip-json-comments": { + "version": "2.0.1", "bundled": true, "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.5" - } + "optional": true }, - "babel-traverse": { - "version": "6.26.0", + "tar": { + "version": "4.4.1", "bundled": true, "dev": true, + "optional": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.3", - "lodash": "4.17.5" + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" } }, - "babel-types": { - "version": "6.26.0", + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.2", "bundled": true, "dev": true, + "optional": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.5", - "to-fast-properties": "1.0.3" + "string-width": "1.0.2" } }, - "babylon": { - "version": "6.18.0", + "wrappy": { + "version": "1.0.2", "bundled": true, "dev": true }, - "balanced-match": { - "version": "1.0.0", + "yallist": { + "version": "3.0.2", "bundled": true, "dev": true - }, - "base": { - "version": "0.11.2", - "bundled": true, - "dev": true, + } + } + }, + "function-name-support": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/function-name-support/-/function-name-support-0.2.0.tgz", + "integrity": "sha1-VdO/qm6v1QWlD5vIH99XVkoLsHE=", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "gcp-metadata": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", + "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", + "requires": { + "axios": "0.18.0", + "extend": "3.0.1", + "retry-axios": "0.3.2" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "dev": true + }, + "get-port": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", + "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", + "dev": true + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "1.0.0" + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "glob-to-regexp": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", + "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" + }, + "global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", + "dev": true, + "requires": { + "ini": "1.3.5" + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, + "globby": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", + "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", + "requires": { + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "fast-glob": "2.2.1", + "glob": "7.1.2", + "ignore": "3.3.7", + "pify": "3.0.0", + "slash": "1.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "google-auth-library": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.4.0.tgz", + "integrity": "sha512-vWRx6pJulK7Y5V/Xyr7MPMlx2mWfmrUVbcffZ7hpq8ElFg5S8WY6PvjMovdcr6JfuAwwpAX4R0I1XOcyWuBcUw==", + "requires": { + "axios": "0.18.0", + "gcp-metadata": "0.6.3", + "gtoken": "2.3.0", + "jws": "3.1.4", + "lodash.isstring": "4.0.1", + "lru-cache": "4.1.2", + "retry-axios": "0.3.2" + }, + "dependencies": { + "lru-cache": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", + "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + } + } + }, + "google-auto-auth": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", + "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", + "requires": { + "async": "2.6.0", + "gcp-metadata": "0.6.3", + "google-auth-library": "1.4.0", + "request": "2.83.0" + } + }, + "google-gax": { + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.1.tgz", + "integrity": "sha512-eP7UUkKvaHmmvCrr+rxzkIOeEKOnXmoib7/AkENDAuqlC9T2+lWlzwpthDRnitQcV8SblDMzsk73YPMPCDwPyQ==", + "requires": { + "duplexify": "3.5.4", + "extend": "3.0.1", + "globby": "8.0.1", + "google-auto-auth": "0.10.1", + "google-proto-files": "0.15.1", + "grpc": "1.10.1", + "is-stream-ended": "0.1.3", + "lodash": "4.17.4", + "protobufjs": "6.8.4", + "through2": "2.0.3" + }, + "dependencies": { + "grpc": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.10.1.tgz", + "integrity": "sha512-xmhA11h2XhqpSVzDAmoQAYdNQ+swILXpKOiRpAEQ2kX55ioxVADc6v7SkS4zQBxm4klhQHgGqpGKvoL6LGx4VQ==", "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "lodash": "4.17.4", + "nan": "2.10.0", + "node-pre-gyp": "0.7.0", + "protobufjs": "5.0.2" }, "dependencies": { - "define-property": { + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "ajv": { + "version": "5.5.2", + "bundled": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.5" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true + }, + "assert-plus": { + "version": "1.0.0", + "bundled": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true + }, + "aws-sign2": { + "version": "0.7.0", + "bundled": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "4.3.1", + "bundled": true, + "requires": { + "hoek": "4.2.1" + } + }, + "brace-expansion": { + "version": "1.1.8", + "bundled": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "caseless": { + "version": "0.12.0", + "bundled": true + }, + "co": { + "version": "4.6.0", + "bundled": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "combined-stream": { + "version": "1.0.6", + "bundled": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "cryptiles": { + "version": "3.1.2", + "bundled": true, + "requires": { + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "bundled": true, + "requires": { + "hoek": "4.2.1" + } + } + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + } + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true + }, + "extsprintf": { + "version": "1.3.0", + "bundled": true + }, + "fast-deep-equal": { + "version": "1.1.0", + "bundled": true + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "bundled": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true + }, + "form-data": { + "version": "2.3.2", + "bundled": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.18" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true + }, + "har-schema": { + "version": "2.0.0", + "bundled": true + }, + "har-validator": { + "version": "5.0.3", + "bundled": true, + "requires": { + "ajv": "5.5.2", + "har-schema": "2.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true + }, + "hawk": { + "version": "6.0.2", + "bundled": true, + "requires": { + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.1", + "sntp": "2.1.0" + } + }, + "hoek": { + "version": "4.2.1", + "bundled": true + }, + "http-signature": { + "version": "1.2.0", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.1" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.5", + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true + }, + "isarray": { "version": "1.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "bundled": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true + }, + "jsprim": { + "version": "1.4.1", "bundled": true, - "dev": true, "requires": { - "is-descriptor": "1.0.2" + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" } }, - "isobject": { - "version": "3.0.1", + "mime-db": { + "version": "1.33.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.18", "bundled": true, - "dev": true - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "1.8.5", - "bundled": true, - "dev": true, - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "builtin-modules": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "cache-base": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" - }, - "dependencies": { - "isobject": { + "requires": { + "mime-db": "1.33.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "1.2.0", + "bundled": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "bundled": true + } + } + }, + "ms": { + "version": "2.0.0", + "bundled": true + }, + "node-pre-gyp": { + "version": "0.7.0", + "bundled": true, + "requires": { + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.2", + "rc": "1.2.6", + "request": "2.83.0", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "2.2.1", + "tar-pack": "3.4.1" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.5" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "performance-now": { + "version": "2.1.0", + "bundled": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true + }, + "protobufjs": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", + "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=", + "requires": { + "ascli": "1.0.1", + "bytebuffer": "5.0.1", + "glob": "7.1.2", + "yargs": "3.32.0" + } + }, + "punycode": { + "version": "1.4.1", + "bundled": true + }, + "qs": { + "version": "6.5.1", + "bundled": true + }, + "rc": { + "version": "1.2.6", + "bundled": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + } + }, + "readable-stream": { + "version": "2.3.5", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.83.0", + "bundled": true, + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.1", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "bundled": true + }, + "semver": { + "version": "5.5.0", + "bundled": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true + }, + "sntp": { + "version": "2.1.0", + "bundled": true, + "requires": { + "hoek": "4.2.1" + } + }, + "sshpk": { + "version": "1.14.1", + "bundled": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.0.3", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true + }, + "strip-ansi": { "version": "3.0.1", "bundled": true, - "dev": true - } - } - }, - "caching-transform": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" - } - }, - "camelcase": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true - }, - "center-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - } - }, - "chalk": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "class-utils": { - "version": "0.3.6", - "bundled": true, - "dev": true, - "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true + }, + "tar": { + "version": "2.2.1", "bundled": true, - "dev": true, "requires": { - "is-descriptor": "0.1.6" + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" } }, - "is-accessor-descriptor": { - "version": "0.1.6", + "tar-pack": { + "version": "3.4.1", "bundled": true, - "dev": true, "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } + "debug": "2.6.9", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.3.5", + "rimraf": "2.6.2", + "tar": "2.2.1", + "uid-number": "0.0.6" } }, - "is-data-descriptor": { - "version": "0.1.4", + "tough-cookie": { + "version": "2.3.4", "bundled": true, - "dev": true, "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } + "punycode": "1.4.1" } }, - "is-descriptor": { - "version": "0.1.6", + "tunnel-agent": { + "version": "0.6.0", "bundled": true, - "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "safe-buffer": "5.1.1" } }, - "isobject": { - "version": "3.0.1", + "tweetnacl": { + "version": "0.14.5", "bundled": true, - "dev": true + "optional": true }, - "kind-of": { - "version": "5.1.0", + "uid-number": { + "version": "0.0.6", + "bundled": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "uuid": { + "version": "3.2.1", + "bundled": true + }, + "verror": { + "version": "1.10.0", "bundled": true, - "dev": true + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true } } + } + } + }, + "google-p12-pem": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", + "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", + "requires": { + "node-forge": "0.7.5", + "pify": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "google-proto-files": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", + "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", + "requires": { + "globby": "7.1.1", + "power-assert": "1.4.4", + "protobufjs": "6.8.4" + }, + "dependencies": { + "globby": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", + "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", + "requires": { + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "glob": "7.1.2", + "ignore": "3.3.7", + "pify": "3.0.0", + "slash": "1.0.0" + } }, - "cliui": { - "version": "2.1.0", - "bundled": true, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "got": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/got/-/got-8.2.0.tgz", + "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", + "dev": true, + "requires": { + "@sindresorhus/is": "0.7.0", + "cacheable-request": "2.1.4", + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "into-stream": "3.1.0", + "is-retry-allowed": "1.1.0", + "isurl": "1.0.0", + "lowercase-keys": "1.0.1", + "mimic-response": "1.0.0", + "p-cancelable": "0.3.0", + "p-timeout": "2.0.1", + "pify": "3.0.0", + "safe-buffer": "5.1.1", + "timed-out": "4.0.1", + "url-parse-lax": "3.0.0", + "url-to-options": "1.0.1" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, - "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" + "prepend-http": "2.0.0" + } + } + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "growl": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", + "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", + "dev": true + }, + "gtoken": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", + "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", + "requires": { + "axios": "0.18.0", + "google-p12-pem": "1.0.2", + "jws": "3.1.4", + "mime": "2.3.1", + "pify": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "requires": { + "ajv": "5.5.2", + "har-schema": "2.0.0" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-color": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", + "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "has-symbol-support-x": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "dev": true + }, + "has-to-string-tag-x": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", + "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "dev": true, + "requires": { + "has-symbol-support-x": "1.4.2" + } + }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "requires": { + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" }, "dependencies": { - "wordwrap": { - "version": "0.0.2", - "bundled": true, - "dev": true, - "optional": true + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } } } }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "collection-visit": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" - } - }, - "commondir": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "bundled": true, - "dev": true - }, - "copy-descriptor": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "core-js": { - "version": "2.5.3", - "bundled": true, - "dev": true - }, - "cross-spawn": { - "version": "4.0.2", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "4.1.2", - "which": "1.3.0" - } - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "ms": "2.0.0" + "is-buffer": "1.1.6" } - }, - "debug-log": { - "version": "1.0.1", - "bundled": true, + } + } + }, + "has-yarn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-1.0.0.tgz", + "integrity": "sha1-ieJdtgS3Jcj1l2//Ct3JIbgopac=", + "dev": true + }, + "hawk": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "requires": { + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.1", + "sntp": "2.1.0" + } + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "hoek": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" + }, + "home-or-tmp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", + "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", + "dev": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "hosted-git-info": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", + "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", + "dev": true + }, + "htmlparser2": { + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", + "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", + "dev": true, + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.4.1", + "domutils": "1.6.2", + "entities": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "http-cache-semantics": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", + "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", + "dev": true + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "hullabaloo-config-manager": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz", + "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", + "dev": true, + "requires": { + "dot-prop": "4.2.0", + "es6-error": "4.1.1", + "graceful-fs": "4.1.11", + "indent-string": "3.2.0", + "json5": "0.5.1", + "lodash.clonedeep": "4.5.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.isequal": "4.5.0", + "lodash.merge": "4.6.0", + "md5-hex": "2.0.0", + "package-hash": "2.0.0", + "pkg-dir": "2.0.0", + "resolve-from": "3.0.0", + "safe-buffer": "5.1.1" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "dev": true + }, + "ignore": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", + "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==" + }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", + "dev": true + }, + "import-lazy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", + "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", + "dev": true + }, + "import-local": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz", + "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", + "dev": true, + "requires": { + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, + "ink-docstrap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", + "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", + "dev": true, + "requires": { + "moment": "2.20.1", + "sanitize-html": "1.16.3" + } + }, + "inquirer": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", + "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "dev": true, + "requires": { + "ansi-escapes": "3.0.0", + "chalk": "2.3.0", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.1.0", + "figures": "2.0.0", + "lodash": "4.17.4", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rx-lite": "4.0.8", + "rx-lite-aggregates": "4.0.8", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" + }, + "dependencies": { + "ansi-escapes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", + "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", "dev": true }, - "decamelize": { - "version": "1.2.0", - "bundled": true, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "decode-uri-component": { - "version": "0.2.0", - "bundled": true, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "default-require-extensions": { - "version": "1.0.0", - "bundled": true, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "strip-bom": "2.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, - "define-property": { - "version": "2.0.2", - "bundled": true, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "ansi-regex": "3.0.0" } - }, - "detect-indent": { + } + } + }, + "intelli-espower-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/intelli-espower-loader/-/intelli-espower-loader-1.0.1.tgz", + "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", + "dev": true, + "requires": { + "espower-loader": "1.2.2" + } + }, + "into-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", + "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", + "dev": true, + "requires": { + "from2": "2.3.0", + "p-is-promise": "1.1.0" + } + }, + "invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dev": true, + "requires": { + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "irregular-plurals": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz", + "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=", + "dev": true + }, + "is": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", + "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=" + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" + } + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "1.11.0" + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-ci": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", + "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "dev": true, + "requires": { + "ci-info": "1.1.3" + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "3.2.2" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-error": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.1.tgz", + "integrity": "sha1-aEqW2EB2V3yY9M20DG0mpRI78Zw=", + "dev": true + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-generator-fn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz", + "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-installed-globally": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", + "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", + "dev": true, + "requires": { + "global-dirs": "0.1.1", + "is-path-inside": "1.0.1" + } + }, + "is-npm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", + "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", + "dev": true + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true + }, + "is-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "dev": true + }, + "is-observable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", + "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", + "dev": true, + "requires": { + "symbol-observable": "1.2.0" + } + }, + "is-odd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", + "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", + "requires": { + "is-number": "4.0.0" + }, + "dependencies": { + "is-number": { "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "error-ex": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "is-arrayish": "0.2.1" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "esutils": { - "version": "2.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" + } + } + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", + "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "dev": true, + "requires": { + "is-path-inside": "1.0.1" + } + }, + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "dev": true, + "requires": { + "path-is-inside": "1.0.2" + } + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "dev": true + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, + "is-redirect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", + "dev": true + }, + "is-resolvable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz", + "integrity": "sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==", + "dev": true + }, + "is-retry-allowed": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", + "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, + "is-stream-ended": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz", + "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-url": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz", + "integrity": "sha1-SYkFpZO/R8wtnn9zg3K792lsfyY=", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "isurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", + "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "dev": true, + "requires": { + "has-to-string-tag-x": "1.4.1", + "is-object": "1.0.1" + } + }, + "jest-docblock": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", + "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", + "dev": true + }, + "js-string-escape": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", + "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", + "dev": true + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + }, + "js2xmlparser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", + "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", + "dev": true, + "requires": { + "xmlcreate": "1.0.2" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true + }, + "jsdoc": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", + "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", + "dev": true, + "requires": { + "babylon": "7.0.0-beta.19", + "bluebird": "3.5.1", + "catharsis": "0.8.9", + "escape-string-regexp": "1.0.5", + "js2xmlparser": "3.0.0", + "klaw": "2.0.0", + "marked": "0.3.9", + "mkdirp": "0.5.1", + "requizzle": "0.2.1", + "strip-json-comments": "2.0.1", + "taffydb": "2.6.2", + "underscore": "1.8.3" + }, + "dependencies": { + "babylon": { + "version": "7.0.0-beta.19", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", + "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", "dev": true - }, - "execa": { - "version": "0.7.0", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "4.1.2", - "shebang-command": "1.2.0", - "which": "1.3.0" - } - } - } - }, - "expand-brackets": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "bundled": true, - "dev": true, - "requires": { - "fill-range": "2.2.3" - } - }, - "extend-shallow": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-plain-object": "2.0.4" - } - } - } - }, - "extglob": { - "version": "0.3.2", - "bundled": true, - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "filename-regex": { - "version": "2.0.1", - "bundled": true, + } + } + }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", + "dev": true + }, + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "dev": true + }, + "json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "just-extend": { + "version": "1.1.27", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", + "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==", + "dev": true + }, + "jwa": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz", + "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=", + "requires": { + "base64url": "2.0.0", + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.9", + "safe-buffer": "5.1.1" + } + }, + "jws": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz", + "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=", + "requires": { + "base64url": "2.0.0", + "jwa": "1.1.5", + "safe-buffer": "5.1.1" + } + }, + "keyv": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", + "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", + "dev": true, + "requires": { + "json-buffer": "3.0.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + }, + "klaw": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", + "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "last-line-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz", + "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", + "dev": true, + "requires": { + "through2": "2.0.3" + } + }, + "latest-version": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", + "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", + "dev": true, + "requires": { + "package-json": "4.0.1" + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + } + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + }, + "lodash.chunk": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", + "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, + "lodash.clonedeepwith": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz", + "integrity": "sha1-buMFc6A6GmDWcKYu8zwQzxr9vdQ=", + "dev": true + }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", + "dev": true + }, + "lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", + "dev": true + }, + "lodash.escaperegexp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", + "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + }, + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", + "dev": true + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "lodash.merge": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", + "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=" + }, + "lodash.mergewith": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", + "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", + "dev": true + }, + "lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" + }, + "log-driver": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz", + "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=" + }, + "lolex": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", + "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==", + "dev": true + }, + "long": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", + "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "make-dir": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz", + "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", + "dev": true, + "requires": { + "pify": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true - }, - "fill-range": { - "version": "2.2.3", - "bundled": true, - "dev": true, - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - } - }, - "find-cache-dir": { - "version": "0.1.1", - "bundled": true, + } + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true + }, + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "requires": { + "object-visit": "1.0.1" + } + }, + "marked": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz", + "integrity": "sha512-nW5u0dxpXxHfkHzzrveY45gCbi+R4PaO4WRZYqZNl+vB0hVGeqlFn0aOg1c8AKL63TrNFn9Bm2UP4AdiZ9TPLw==", + "dev": true + }, + "matcher": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.0.tgz", + "integrity": "sha512-aZGv6JBTHqfqAd09jmAlbKnAICTfIvb5Z8gXVxPB5WZtFfHMaAMdACL7tQflD2V+6/8KNcY8s6DYtWLgpJP5lA==", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "md5-hex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", + "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "md5-o-matic": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", + "dev": true + }, + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, - "find-up": { - "version": "2.1.0", - "bundled": true, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "locate-path": "2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, - "for-in": { - "version": "1.0.2", - "bundled": true, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, - "for-own": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "foreground-child": { - "version": "1.5.6", - "bundled": true, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" + "pinkie-promise": "2.0.1" } }, - "fragment-cache": { - "version": "0.2.1", - "bundled": true, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "map-cache": "0.2.2" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "get-value": { - "version": "2.0.6", - "bundled": true, - "dev": true - }, - "glob": { - "version": "7.1.2", - "bundled": true, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, - "glob-base": { - "version": "0.3.0", - "bundled": true, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "find-up": "1.1.2", + "read-pkg": "1.1.0" } }, - "glob-parent": { + "strip-bom": { "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "globals": { - "version": "9.18.0", - "bundled": true, - "dev": true - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "handlebars": { - "version": "4.0.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "bundled": true, - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } + "is-utf8": "0.2.1" } - }, - "has-ansi": { - "version": "2.0.0", - "bundled": true, - "dev": true, + } + } + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "dev": true + }, + "merge-estraverse-visitors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/merge-estraverse-visitors/-/merge-estraverse-visitors-1.0.0.tgz", + "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", + "dev": true, + "requires": { + "estraverse": "4.2.0" + } + }, + "merge2": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", + "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==" + }, + "methmeth": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz", + "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + }, + "mime": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", + "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==" + }, + "mime-db": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" + }, + "mime-types": { + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", + "requires": { + "mime-db": "1.30.0" + } + }, + "mimic-fn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", + "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", + "dev": true + }, + "mimic-response": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz", + "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mixin-deep": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "requires": { + "for-in": "1.0.2", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "ansi-regex": "2.1.1" + "is-plain-object": "2.0.4" } - }, - "has-flag": { - "version": "1.0.0", - "bundled": true, + } + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "mocha": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz", + "integrity": "sha512-SpwyojlnE/WRBNGtvJSNfllfm5PqEDFxcWluSIgLeSBJtXG4DmoX2NNAeEA7rP5kK+79VgtVq8nG6HskaL1ykg==", + "dev": true, + "requires": { + "browser-stdout": "1.3.0", + "commander": "2.11.0", + "debug": "3.1.0", + "diff": "3.3.1", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.3", + "he": "1.1.1", + "mkdirp": "0.5.1", + "supports-color": "4.4.0" + }, + "dependencies": { + "diff": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", + "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", "dev": true }, - "has-value": { - "version": "1.0.0", - "bundled": true, + "supports-color": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", + "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "has-flag": "2.0.0" } - }, - "has-values": { - "version": "1.0.0", - "bundled": true, + } + } + }, + "modelo": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz", + "integrity": "sha512-9DITV2YEMcw7XojdfvGl3gDD8J9QjZTJ7ZOUuSAkP+F3T6rDbzMJuPktxptsdHYEvZcmXrCD3LMOhdSAEq6zKA==" + }, + "module-not-found-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", + "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=", + "dev": true + }, + "moment": { + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz", + "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==", + "dev": true + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + }, + "multi-stage-sourcemap": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz", + "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", + "dev": true, + "requires": { + "source-map": "0.1.43" + }, + "dependencies": { + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } + "amdefine": "1.0.1" } + } + } + }, + "multimatch": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", + "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" + } + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "nan": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" + }, + "nanomatch": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, - "hosted-git-info": { - "version": "2.6.0", - "bundled": true, - "dev": true + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, - "imurmurhash": { - "version": "0.1.4", - "bundled": true, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } + } + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "nise": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz", + "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==", + "dev": true, + "requires": { + "@sinonjs/formatio": "2.0.0", + "just-extend": "1.1.27", + "lolex": "2.3.2", + "path-to-regexp": "1.7.0", + "text-encoding": "0.6.4" + } + }, + "node-forge": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", + "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==" + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "dev": true, + "requires": { + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.3" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } + }, + "normalize-url": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", + "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", + "dev": true, + "requires": { + "prepend-http": "2.0.0", + "query-string": "5.1.1", + "sort-keys": "2.0.0" + }, + "dependencies": { + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "dev": true - }, - "inflight": { - "version": "1.0.6", - "bundled": true, + } + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "2.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "nyc": { + "version": "11.4.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", + "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", + "dev": true, + "requires": { + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", + "md5-hex": "1.3.0", + "merge-source-map": "1.0.4", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.1.1", + "yargs": "10.0.3", + "yargs-parser": "8.0.0" + }, + "dependencies": { + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" } }, - "inherits": { - "version": "2.0.3", - "bundled": true, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, - "invariant": { - "version": "2.2.3", - "bundled": true, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "append-transform": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", + "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", "dev": true, "requires": { - "loose-envify": "1.3.1" + "default-require-extensions": "1.0.0" } }, - "invert-kv": { + "archy": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } + "arr-flatten": "1.1.0" } }, - "is-arrayish": { - "version": "0.2.1", - "bundled": true, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", "dev": true }, - "is-buffer": { - "version": "1.1.6", - "bundled": true, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, - "is-builtin-module": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "builtin-modules": "1.1.1" - } + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" } }, - "is-dotfile": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "bundled": true, + "babel-generator": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", + "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" } }, - "is-extendable": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "bundled": true, + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "babel-runtime": "6.26.0" } }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "bundled": true, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" } }, - "is-number": { - "version": "2.1.0", - "bundled": true, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "kind-of": "3.2.2" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" } }, - "is-odd": { - "version": "2.0.0", - "bundled": true, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "is-number": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "bundled": true, - "dev": true - } + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" } }, - "is-plain-object": { - "version": "2.0.4", - "bundled": true, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" } }, - "is-posix-bracket": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "bundled": true, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", "dev": true }, - "isarray": { + "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, - "isexe": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "isobject": { - "version": "2.1.0", - "bundled": true, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "isarray": "1.0.0" + "balanced-match": "1.0.0", + "concat-map": "0.0.1" } }, - "istanbul-lib-coverage": { - "version": "1.2.0", - "bundled": true, - "dev": true + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } }, - "istanbul-lib-hook": { - "version": "1.1.0", - "bundled": true, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "caching-transform": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", + "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", "dev": true, "requires": { - "append-transform": "0.4.0" + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" } }, - "istanbul-lib-instrument": { - "version": "1.10.1", - "bundled": true, + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, + "optional": true + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, + "optional": true, "requires": { - "babel-generator": "6.26.1", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.2.0", - "semver": "5.5.0" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, - "istanbul-lib-report": { + "chalk": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" - }, - "dependencies": { - "supports-color": { - "version": "3.2.3", - "bundled": true, - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, - "istanbul-lib-source-maps": { - "version": "1.2.3", - "bundled": true, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, + "optional": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" }, "dependencies": { - "debug": { - "version": "3.1.0", - "bundled": true, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", "dev": true, - "requires": { - "ms": "2.0.0" - } + "optional": true } } }, - "istanbul-reports": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "handlebars": "4.0.11" - } + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true }, - "js-tokens": { - "version": "3.0.2", - "bundled": true, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, - "jsesc": { - "version": "1.3.0", - "bundled": true, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, - "kind-of": { - "version": "3.2.2", - "bundled": true, + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "dev": true + }, + "core-js": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", + "dev": true + }, + "cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "lru-cache": "4.1.1", + "which": "1.3.0" } }, - "lazy-cache": { - "version": "1.0.4", - "bundled": true, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "optional": true + "requires": { + "ms": "2.0.0" + } }, - "lcid": { + "debug-log": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", + "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "default-require-extensions": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", + "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "strip-bom": "2.0.0" } }, - "load-json-file": { - "version": "1.1.0", - "bundled": true, + "detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "repeating": "2.0.1" } }, - "locate-path": { - "version": "2.0.0", - "bundled": true, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "bundled": true, - "dev": true - } + "is-arrayish": "0.2.1" } }, - "lodash": { - "version": "4.17.5", - "bundled": true, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, - "longest": { - "version": "1.0.1", - "bundled": true, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, - "loose-envify": { - "version": "1.3.1", - "bundled": true, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } } }, - "lru-cache": { - "version": "4.1.2", - "bundled": true, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "is-posix-bracket": "0.1.1" } }, - "map-cache": { - "version": "0.2.2", - "bundled": true, - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "bundled": true, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "object-visit": "1.0.1" + "fill-range": "2.2.3" } }, - "md5-hex": { - "version": "1.3.0", - "bundled": true, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "is-extglob": "1.0.0" } }, - "md5-o-matic": { - "version": "0.1.1", - "bundled": true, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", "dev": true }, - "mem": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "mimic-fn": "1.2.0" - } - }, - "merge-source-map": { - "version": "1.1.0", - "bundled": true, + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "dev": true, "requires": { - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "bundled": true, - "dev": true - } + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, - "micromatch": { - "version": "2.3.11", - "bundled": true, + "find-cache-dir": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", + "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" } }, - "mimic-fn": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "locate-path": "2.0.0" } }, - "minimist": { - "version": "0.0.8", - "bundled": true, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "mixin-deep": { - "version": "1.3.1", - "bundled": true, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-plain-object": "2.0.4" - } - } + "for-in": "1.0.2" } }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, + "foreground-child": { + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", + "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", "dev": true, "requires": { - "minimist": "0.0.8" + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" } }, - "ms": { - "version": "2.0.0", - "bundled": true, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "nanomatch": { - "version": "1.2.9", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "bundled": true, - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "dev": true }, - "normalize-package-data": { - "version": "2.4.0", - "bundled": true, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, - "normalize-path": { - "version": "2.1.1", - "bundled": true, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "glob-parent": "2.0.0", + "is-glob": "2.0.1" } }, - "npm-run-path": { - "version": "2.0.2", - "bundled": true, + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "path-key": "2.0.1" + "is-glob": "2.0.1" } }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", "dev": true }, - "object-assign": { - "version": "4.1.1", - "bundled": true, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, - "object-copy": { - "version": "0.1.0", - "bundled": true, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true - } + "amdefine": "1.0.1" } } } }, - "object-visit": { - "version": "1.0.1", - "bundled": true, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "ansi-regex": "2.1.1" } }, - "object.omit": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - } + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true }, - "object.pick": { - "version": "1.3.0", - "bundled": true, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "once": "1.4.0", + "wrappy": "1.0.2" } }, - "once": { - "version": "1.4.0", - "bundled": true, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "invariant": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", "dev": true, "requires": { - "wrappy": "1.0.2" + "loose-envify": "1.3.1" } }, - "optimist": { - "version": "0.6.1", - "bundled": true, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, - "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "requires": { + "builtin-modules": "1.1.1" } }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", "dev": true }, - "os-locale": { - "version": "2.1.0", - "bundled": true, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "is-primitive": "2.0.0" } }, - "p-finally": { + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "dev": true + }, + "is-extglob": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", "dev": true }, - "p-limit": { - "version": "1.2.0", - "bundled": true, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "p-try": "1.0.0" + "number-is-nan": "1.0.1" } }, - "p-locate": { - "version": "2.0.0", - "bundled": true, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "p-limit": "1.2.0" + "number-is-nan": "1.0.1" } }, - "p-try": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "parse-glob": { - "version": "3.0.4", - "bundled": true, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "is-extglob": "1.0.0" } }, - "parse-json": { - "version": "2.2.0", - "bundled": true, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "error-ex": "1.3.1" + "kind-of": "3.2.2" } }, - "pascalcase": { + "is-posix-bracket": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", "dev": true }, - "path-exists": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "pinkie-promise": "2.0.1" - } + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, - "path-key": { - "version": "2.0.1", - "bundled": true, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, - "path-parse": { - "version": "1.0.5", - "bundled": true, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, - "path-type": { - "version": "1.1.0", - "bundled": true, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "isarray": "1.0.0" } }, - "pify": { - "version": "2.3.0", - "bundled": true, + "istanbul-lib-coverage": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", + "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", "dev": true }, - "pinkie": { - "version": "2.0.4", - "bundled": true, - "dev": true + "istanbul-lib-hook": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", + "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==", + "dev": true, + "requires": { + "append-transform": "0.4.0" + } }, - "pinkie-promise": { - "version": "2.0.1", - "bundled": true, + "istanbul-lib-instrument": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", + "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", "dev": true, "requires": { - "pinkie": "2.0.4" + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" } }, - "pkg-dir": { - "version": "1.0.0", - "bundled": true, + "istanbul-lib-report": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz", + "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==", "dev": true, "requires": { - "find-up": "1.1.2" + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" }, "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "has-flag": "1.0.0" } } } }, - "posix-character-classes": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "preserve": { - "version": "0.2.0", - "bundled": true, - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "randomatic": { - "version": "1.1.7", - "bundled": true, + "istanbul-lib-source-maps": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz", + "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "debug": "3.1.0", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "bundled": true, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "is-buffer": "1.1.6" + "ms": "2.0.0" } } } }, - "read-pkg": { - "version": "1.1.0", - "bundled": true, + "istanbul-reports": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz", + "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "handlebars": "4.0.11" } }, - "read-pkg-up": { - "version": "1.0.1", - "bundled": true, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + }, + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - } + "is-buffer": "1.1.6" } }, - "regenerator-runtime": { - "version": "0.11.1", - "bundled": true, - "dev": true + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true, + "optional": true }, - "regex-cache": { - "version": "0.4.4", - "bundled": true, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, + "requires": { + "invert-kv": "1.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, - "regex-not": { - "version": "1.0.2", - "bundled": true, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } } }, - "remove-trailing-separator": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "bundled": true, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", "dev": true }, - "repeat-string": { - "version": "1.6.1", - "bundled": true, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", "dev": true }, - "repeating": { - "version": "2.0.1", - "bundled": true, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "is-finite": "1.0.2" + "js-tokens": "3.0.2" } }, - "require-directory": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "bundled": true, - "dev": true + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } }, - "resolve-from": { - "version": "2.0.0", - "bundled": true, - "dev": true + "md5-hex": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", + "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } }, - "resolve-url": { - "version": "0.2.1", - "bundled": true, + "md5-o-matic": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", "dev": true }, - "ret": { - "version": "0.1.15", - "bundled": true, - "dev": true + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } }, - "right-align": { - "version": "0.1.3", - "bundled": true, + "merge-source-map": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", + "integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=", "dev": true, - "optional": true, "requires": { - "align-text": "0.1.4" + "source-map": "0.5.7" } }, - "rimraf": { - "version": "2.6.2", - "bundled": true, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "glob": "7.1.2" + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" } }, - "safe-regex": { + "mimic-fn": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", + "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "ret": "0.1.15" + "brace-expansion": "1.1.8" } }, - "semver": { - "version": "5.5.0", - "bundled": true, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, - "set-blocking": { + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "set-value": { - "version": "2.0.0", - "bundled": true, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" } }, - "shebang-command": { - "version": "1.2.0", - "bundled": true, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "remove-trailing-separator": "1.1.0" } }, - "shebang-regex": { - "version": "1.0.0", - "bundled": true, - "dev": true + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "2.0.1" + } }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, - "slide": { - "version": "1.1.6", - "bundled": true, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, - "snapdragon": { - "version": "0.8.2", - "bundled": true, + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.1", - "use": "3.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true - } + "for-own": "0.1.5", + "is-extendable": "0.1.1" } }, - "snapdragon-node": { - "version": "2.1.1", - "bundled": true, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "wrappy": "1.0.2" } }, - "snapdragon-util": { - "version": "3.0.1", - "bundled": true, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, - "source-map": { - "version": "0.5.7", - "bundled": true, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, - "source-map-resolve": { - "version": "0.5.1", - "bundled": true, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "atob": "2.0.3", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, - "source-map-url": { - "version": "0.4.0", - "bundled": true, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, - "spawn-wrap": { - "version": "1.4.2", - "bundled": true, + "p-limit": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", + "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", + "dev": true + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.0" + "p-limit": "1.1.0" } }, - "spdx-correct": { - "version": "3.0.0", - "bundled": true, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "error-ex": "1.3.1" } }, - "spdx-exceptions": { + "path-exists": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, - "spdx-expression-parse": { - "version": "3.0.0", - "bundled": true, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, - "spdx-license-ids": { - "version": "3.0.0", - "bundled": true, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, - "split-string": { - "version": "3.1.0", - "bundled": true, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "extend-shallow": "3.0.2" + "pinkie": "2.0.4" } }, - "static-extend": { - "version": "0.1.2", - "bundled": true, + "pkg-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", + "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "find-up": "1.1.2" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, + } + } + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { "kind-of": "3.2.2" @@ -10851,7 +8157,8 @@ "dependencies": { "kind-of": { "version": "3.2.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { "is-buffer": "1.1.6" @@ -10859,388 +8166,301 @@ } } }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } + "is-buffer": "1.1.6" } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, + } + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } - }, - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true } } }, - "string-width": { + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + }, + "regex-cache": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" + } + }, + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "require-directory": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true + }, + "resolve-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=", + "dev": true + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, + "optional": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } + "align-text": "0.1.4" } }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "glob": "7.1.2" } }, - "strip-bom": { + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true + }, + "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "shebang-regex": "1.0.0" } }, - "strip-eof": { + "shebang-regex": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, - "supports-color": { - "version": "2.0.0", - "bundled": true, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, - "test-exclude": { - "version": "4.2.1", - "bundled": true, + "slide": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", + "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "spawn-wrap": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", + "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==", "dev": true, "requires": { - "arrify": "1.0.1", - "micromatch": "3.1.9", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" + } + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { - "arr-diff": { - "version": "4.0.0", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "bundled": true, - "dev": true - }, - "braces": { - "version": "2.3.1", - "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "define-property": "1.0.0", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "kind-of": "6.0.2", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "expand-brackets": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true - } - } - }, - "extglob": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-number": { + "ansi-regex": { "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "kind-of": { - "version": "6.0.2", - "bundled": true, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "micromatch": { - "version": "3.1.9", - "bundled": true, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.1", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "ansi-regex": "3.0.0" } } } }, - "to-fast-properties": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "to-object-path": { - "version": "0.3.0", - "bundled": true, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "ansi-regex": "2.1.1" } }, - "to-regex": { - "version": "3.0.2", - "bundled": true, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "is-utf8": "0.2.1" } }, - "to-regex-range": { - "version": "2.1.1", - "bundled": true, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "test-exclude": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz", + "integrity": "sha512-35+Asrsk3XHJDBgf/VRFexPgh3UyETv8IAn/LRTiZjVy6rjPVqdEk8dJcJYBzl1w0XCJM48lvTy8SfEsCWS4nA==", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - } + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" } }, + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true + }, "trim-right": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, "uglify-js": { "version": "2.8.29", - "bundled": true, + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, "optional": true, "requires": { @@ -11251,7 +8471,8 @@ "dependencies": { "yargs": { "version": "3.10.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "optional": true, "requires": { @@ -11265,115 +8486,25 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", "dev": true, "optional": true }, - "union-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "set-value": { - "version": "0.4.3", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" - } - } - } - }, - "unset-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "bundled": true, - "dev": true, - "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "bundled": true, - "dev": true - }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } - } - }, - "urix": { - "version": "0.1.0", - "bundled": true, - "dev": true - }, - "use": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, "validate-npm-package-license": { - "version": "3.0.3", - "bundled": true, + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" } }, "which": { "version": "1.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", "dev": true, "requires": { "isexe": "2.0.0" @@ -11381,40 +8512,37 @@ }, "which-module": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, "window-size": { "version": "0.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", "dev": true, "optional": true }, "wordwrap": { "version": "0.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", "dev": true }, "wrap-ansi": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { "string-width": "1.0.2", "strip-ansi": "3.0.1" }, "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { "code-point-at": "1.1.0", @@ -11426,12 +8554,14 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "write-file-atomic": { "version": "1.3.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", + "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { "graceful-fs": "4.1.11", @@ -11441,20 +8571,23 @@ }, "y18n": { "version": "3.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", "dev": true }, "yallist": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, "yargs": { - "version": "11.1.0", - "bundled": true, + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz", + "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==", "dev": true, "requires": { - "cliui": "4.0.0", + "cliui": "3.2.0", "decamelize": "1.2.0", "find-up": "2.1.0", "get-caller-file": "1.0.2", @@ -11465,50 +8598,39 @@ "string-width": "2.1.1", "which-module": "2.0.0", "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "yargs-parser": "8.0.0" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - }, "cliui": { - "version": "4.0.0", - "bundled": true, + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", "wrap-ansi": "2.1.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - }, - "yargs-parser": { - "version": "9.0.2", - "bundled": true, - "dev": true, - "requires": { - "camelcase": "4.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } } } } }, "yargs-parser": { - "version": "8.1.0", - "bundled": true, + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz", + "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=", "dev": true, "requires": { "camelcase": "4.1.0" @@ -11516,7 +8638,8 @@ "dependencies": { "camelcase": { "version": "4.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", "dev": true } } @@ -11551,47 +8674,6 @@ "requires": { "is-descriptor": "0.1.6" } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } } } }, @@ -11606,6 +8688,13 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } } }, "object.omit": { @@ -11624,6 +8713,13 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } } }, "observable-to-promise": { @@ -11669,7 +8765,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "1.1.0" } }, "optimist": { @@ -11812,7 +8908,7 @@ "got": "6.7.1", "registry-auth-token": "3.3.2", "registry-url": "3.1.0", - "semver": "5.5.0" + "semver": "5.4.1" }, "dependencies": { "got": { @@ -11836,33 +8932,16 @@ } } }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" } }, "parse-json": { @@ -11937,11 +9016,12 @@ } }, "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, "requires": { - "pify": "3.0.0" + "pify": "2.3.0" } }, "performance-now": { @@ -11950,23 +9030,24 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true }, "pinkie": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", - "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", "dev": true }, "pinkie-promise": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", - "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "1.0.0" + "pinkie": "2.0.4" } }, "pkg-conf": { @@ -11998,8 +9079,14 @@ "dev": true, "requires": { "error-ex": "1.3.1", - "json-parse-better-errors": "1.0.1" + "json-parse-better-errors": "1.0.2" } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true } } }, @@ -12033,14 +9120,14 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "6.0.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz", - "integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==", + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", + "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", "dev": true, "requires": { - "chalk": "2.3.2", + "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "5.3.0" + "supports-color": "5.1.0" }, "dependencies": { "source-map": { @@ -12048,6 +9135,15 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "supports-color": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", + "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } } } }, @@ -12068,7 +9164,7 @@ "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.1.1.tgz", "integrity": "sha1-7bo1LT7YpgMRTWZyZazOYNaJzN8=", "requires": { - "core-js": "2.5.4", + "core-js": "2.5.3", "power-assert-context-traversal": "1.1.1" } }, @@ -12079,9 +9175,16 @@ "requires": { "acorn": "4.0.13", "acorn-es7-plugin": "1.1.7", - "core-js": "2.5.4", + "core-js": "2.5.3", "espurify": "1.7.0", "estraverse": "4.2.0" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" + } } }, "power-assert-context-traversal": { @@ -12089,7 +9192,7 @@ "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.1.1.tgz", "integrity": "sha1-iMq8oNE7Y1nwfT0+ivppkmRXftk=", "requires": { - "core-js": "2.5.4", + "core-js": "2.5.3", "estraverse": "4.2.0" } }, @@ -12098,7 +9201,7 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "2.5.4", + "core-js": "2.5.3", "power-assert-context-formatter": "1.1.1", "power-assert-context-reducer-ast": "1.1.2", "power-assert-renderer-assertion": "1.1.1", @@ -12126,7 +9229,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.1.1.tgz", "integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=", "requires": { - "core-js": "2.5.4", + "core-js": "2.5.3", "diff-match-patch": "1.0.0", "power-assert-renderer-base": "1.1.1", "stringifier": "1.3.0", @@ -12138,7 +9241,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.1.2.tgz", "integrity": "sha1-ZV+PcRk1qbbVQbhjJ2VHF8Y3qYY=", "requires": { - "core-js": "2.5.4", + "core-js": "2.5.3", "power-assert-renderer-base": "1.1.1", "power-assert-util-string-width": "1.1.1", "stringifier": "1.3.0" @@ -12179,9 +9282,9 @@ "dev": true }, "prettier": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz", - "integrity": "sha512-T/KD65Ot0PB97xTrG8afQ46x3oiVhnfGjGESSI9NWYcG92+OUPZKkwHqGWXH2t9jK1crnQjubECW0FuOth+hxw==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.9.2.tgz", + "integrity": "sha512-piXx9N2WT8hWb7PBbX1glAuJVIkEyUV9F5fMXFINpZ0x3otVOFKKeGmeuiclFJlP/UrgTckyV606VjH2rNK4bw==", "dev": true }, "pretty-ms": { @@ -12209,9 +9312,9 @@ "dev": true }, "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, "progress": { "version": "2.0.0", @@ -12220,9 +9323,9 @@ "dev": true }, "protobufjs": { - "version": "6.8.6", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", - "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", + "version": "6.8.4", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.4.tgz", + "integrity": "sha512-d+WZqUDXKM+oZhr8yprAtQW07q08p9/V35AJ2J1fds+r903S/aH9P8uO1gmTwozOKugt2XCjdrre3OxuPRGkGg==", "requires": { "@protobufjs/aspromise": "1.1.2", "@protobufjs/base64": "1.1.2", @@ -12235,8 +9338,8 @@ "@protobufjs/pool": "1.1.0", "@protobufjs/utf8": "1.1.0", "@types/long": "3.0.32", - "@types/node": "8.10.0", - "long": "4.0.0" + "@types/node": "8.5.6", + "long": "3.2.0" } }, "proxyquire": { @@ -12297,6 +9400,26 @@ "kind-of": "4.0.0" }, "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", @@ -12337,23 +9460,6 @@ "load-json-file": "2.0.0", "normalize-package-data": "2.4.0", "path-type": "2.0.0" - }, - "dependencies": { - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } } }, "read-pkg-up": { @@ -12367,14 +9473,14 @@ } }, "readable-stream": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", - "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", - "process-nextick-args": "2.0.0", + "process-nextick-args": "1.0.7", "safe-buffer": "5.1.1", "string_decoder": "1.0.3", "util-deprecate": "1.0.2" @@ -12388,7 +9494,7 @@ "requires": { "graceful-fs": "4.1.11", "minimatch": "3.0.4", - "readable-stream": "2.3.5", + "readable-stream": "2.3.3", "set-immediate-shim": "1.0.1" } }, @@ -12443,12 +9549,6 @@ "safe-regex": "1.1.0" } }, - "regexpp": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.0.1.tgz", - "integrity": "sha512-8Ph721maXiOYSLtaDGKVmDn5wdsNaF6Px85qFNeMPQq0r8K5Y10tgP6YuR65Ws35n4DvzFcCxEnRNBIXQunzLw==", - "dev": true - }, "regexpu-core": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", @@ -12529,32 +9629,32 @@ } }, "request": { - "version": "2.85.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", - "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", + "version": "2.83.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", + "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", "requires": { "aws-sign2": "0.7.0", "aws4": "1.6.0", "caseless": "0.12.0", - "combined-stream": "1.0.6", + "combined-stream": "1.0.5", "extend": "3.0.1", "forever-agent": "0.6.1", - "form-data": "2.3.2", + "form-data": "2.3.1", "har-validator": "5.0.3", "hawk": "6.0.2", "http-signature": "1.2.0", "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", + "mime-types": "2.1.17", "oauth-sign": "0.8.2", "performance-now": "2.1.0", "qs": "6.5.1", "safe-buffer": "5.1.1", "stringstream": "0.0.5", - "tough-cookie": "2.3.4", + "tough-cookie": "2.3.3", "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "uuid": "3.1.0" } }, "require-directory": { @@ -12670,7 +9770,7 @@ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz", "integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw==", "requires": { - "request": "2.85.0", + "request": "2.83.0", "through2": "2.0.3" } }, @@ -12737,27 +9837,24 @@ "dev": true }, "sanitize-html": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz", - "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.16.3.tgz", + "integrity": "sha512-XpAJGnkMfNM7AzXLRw225blBB/pE4dM4jzRn98g4r88cfxwN6g+5IsRmCAh/gbhYGm6u6i97zsatMOM7Lr8wyw==", "dev": true, "requires": { - "chalk": "2.3.2", "htmlparser2": "3.9.2", "lodash.clonedeep": "4.5.0", "lodash.escaperegexp": "4.1.2", - "lodash.isplainobject": "4.0.6", - "lodash.isstring": "4.0.1", - "lodash.mergewith": "4.6.1", - "postcss": "6.0.21", + "lodash.mergewith": "4.6.0", + "postcss": "6.0.15", "srcset": "1.0.0", "xtend": "4.0.1" } }, "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", "dev": true }, "semver-diff": { @@ -12766,7 +9863,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "5.5.0" + "semver": "5.4.1" } }, "serialize-error": { @@ -12839,9 +9936,26 @@ "diff": "3.5.0", "lodash.get": "4.4.2", "lolex": "2.3.2", - "nise": "1.3.2", - "supports-color": "5.3.0", + "nise": "1.3.3", + "supports-color": "5.4.0", "type-detect": "4.0.8" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } } }, "slash": { @@ -12911,56 +10025,10 @@ "is-extendable": "0.1.1" } }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -12981,6 +10049,42 @@ "requires": { "is-descriptor": "1.0.2" } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -12990,16 +10094,6 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } } }, "sntp": { @@ -13029,7 +10123,7 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", "requires": { - "atob": "2.0.3", + "atob": "2.1.0", "decode-uri-component": "0.2.0", "resolve-url": "0.2.1", "source-map-url": "0.4.0", @@ -13037,20 +10131,12 @@ } }, "source-map-support": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", - "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "source-map": "0.5.7" } }, "source-map-url": { @@ -13124,9 +10210,9 @@ } }, "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", + "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", @@ -13160,57 +10246,6 @@ "requires": { "is-descriptor": "0.1.6" } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, @@ -13267,7 +10302,7 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "2.5.4", + "core-js": "2.5.3", "traverse": "0.6.6", "type-name": "2.0.2" } @@ -13336,12 +10371,12 @@ "cookiejar": "2.1.1", "debug": "3.1.0", "extend": "3.0.1", - "form-data": "2.3.2", + "form-data": "2.3.1", "formidable": "1.2.1", "methods": "1.1.2", "mime": "1.6.0", "qs": "6.5.1", - "readable-stream": "2.3.5" + "readable-stream": "2.3.3" }, "dependencies": { "mime": { @@ -13360,7 +10395,7 @@ "requires": { "arrify": "1.0.1", "indent-string": "3.2.0", - "js-yaml": "3.11.0", + "js-yaml": "3.10.0", "serialize-error": "2.1.0", "strip-ansi": "4.0.0" }, @@ -13393,20 +10428,12 @@ } }, "supports-color": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz", - "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "3.0.0" - }, - "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - } + "has-flag": "2.0.0" } }, "symbol-observable": { @@ -13423,8 +10450,8 @@ "requires": { "ajv": "5.5.2", "ajv-keywords": "2.1.1", - "chalk": "2.3.2", - "lodash": "4.17.5", + "chalk": "2.3.0", + "lodash": "4.17.4", "slice-ansi": "1.0.0", "string-width": "2.1.1" }, @@ -13500,7 +10527,7 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "2.3.5", + "readable-stream": "2.3.3", "xtend": "4.0.1" } }, @@ -13537,16 +10564,6 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } } }, "to-regex": { @@ -13567,12 +10584,22 @@ "requires": { "is-number": "3.0.0", "repeat-string": "1.6.1" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + } + } } }, "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "requires": { "punycode": "1.4.1" } @@ -13836,6 +10863,11 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -13846,13 +10878,13 @@ "dev": true }, "update-notifier": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz", - "integrity": "sha1-+bTHAPv9TsEsgRWHJYd31WPYyGY=", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", + "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { "boxen": "1.3.0", - "chalk": "2.3.2", + "chalk": "2.3.0", "configstore": "3.1.2", "import-lazy": "2.1.0", "is-ci": "1.1.0", @@ -13895,6 +10927,13 @@ "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + } } }, "util-deprecate": { @@ -13903,9 +10942,9 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" }, "validate-npm-package-license": { "version": "3.0.3", @@ -14054,6 +11093,12 @@ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=", "dev": true + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true } } }, diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 64c79f4bc0e..254027ef850 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -69,7 +69,7 @@ "delay": "^2.0.0", "duplexify": "^3.5.4", "extend": "^3.0.1", - "google-auto-auth": "^0.9.0", + "google-auto-auth": "^0.10.1", "google-gax": "^0.16.0", "google-proto-files": "^0.15.0", "is": "^3.0.1", From 31976adb29f0fa0c4ae9d878dc19a4d17570238b Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 2 May 2018 08:31:30 -0700 Subject: [PATCH 0154/1115] chore: lock files maintenance (#123) * chore: lock files maintenance * chore: lock files maintenance --- handwritten/pubsub/package-lock.json | 17379 ++++++++++++++----------- 1 file changed, 9801 insertions(+), 7578 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index e1be5ea2853..5696581476e 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -21,7 +21,7 @@ "babel-plugin-transform-async-to-generator": "6.24.1", "babel-plugin-transform-es2015-destructuring": "6.23.0", "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.0", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", "babel-plugin-transform-es2015-parameters": "6.24.1", "babel-plugin-transform-es2015-spread": "6.22.0", "babel-plugin-transform-es2015-sticky-regex": "6.24.1", @@ -81,26 +81,26 @@ } }, "@google-cloud/common": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.16.1.tgz", - "integrity": "sha512-1sufDsSfgJ7fuBLq+ux8t3TlydMlyWl9kPZx2WdLINkGtf5RjvXX6EWYZiCMKe8flJ3oC0l95j5atN2uX5n3rg==", + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.16.2.tgz", + "integrity": "sha512-GrkaFoj0/oO36pNs4yLmaYhTujuA3i21FdQik99Fd/APix1uhf01VlpJY4lAteTDFLRNkRx6ydEh7OVvmeUHng==", "requires": { "array-uniq": "1.0.3", "arrify": "1.0.1", - "concat-stream": "1.6.0", + "concat-stream": "1.6.2", "create-error-class": "3.0.2", "duplexify": "3.5.4", "ent": "2.2.0", "extend": "3.0.1", "google-auto-auth": "0.9.7", "is": "3.2.1", - "log-driver": "1.2.5", + "log-driver": "1.2.7", "methmeth": "1.1.0", "modelo": "4.2.3", - "request": "2.83.0", + "request": "2.85.0", "retry-request": "3.3.1", "split-array-stream": "1.0.3", - "stream-events": "1.0.2", + "stream-events": "1.0.4", "string-format-obj": "1.1.1", "through2": "2.0.3" }, @@ -113,7 +113,7 @@ "async": "2.6.0", "gcp-metadata": "0.6.3", "google-auth-library": "1.4.0", - "request": "2.83.0" + "request": "2.85.0" } } } @@ -169,7987 +169,10350 @@ "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", "dev": true }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "proxyquire": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz", - "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", - "dev": true, - "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.1.7" - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - }, - "yargs": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", - "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "nyc": { + "version": "11.4.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", + "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" - } - } - } - }, - "@ladjs/time-require": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", - "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", - "dev": true, - "requires": { - "chalk": "0.4.0", - "date-time": "0.1.1", - "pretty-ms": "0.2.2", - "text-table": "0.2.0" - }, - "dependencies": { - "ansi-styles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", - "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", - "dev": true - }, - "chalk": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", - "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", - "dev": true, - "requires": { - "ansi-styles": "1.0.0", - "has-color": "0.1.7", - "strip-ansi": "0.1.1" - } - }, - "pretty-ms": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", - "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", - "dev": true, - "requires": { - "parse-ms": "0.1.2" - } - }, - "strip-ansi": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", - "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", - "dev": true - } - } - }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "requires": { - "call-me-maybe": "1.0.1", - "glob-to-regexp": "0.3.0" - } - }, - "@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" - }, - "@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" - }, - "@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", - "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/inquire": "1.1.0" - } - }, - "@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" - }, - "@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" - }, - "@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" - }, - "@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" - }, - "@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" - }, - "@sindresorhus/is": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", - "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", - "dev": true - }, - "@sinonjs/formatio": { - "version": "2.0.0", - "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", - "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", - "dev": true, - "requires": { - "samsam": "1.3.0" - } - }, - "@types/long": { - "version": "3.0.32", - "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", - "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" - }, - "@types/node": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.6.tgz", - "integrity": "sha512-R9N6rE3o0q7yBjEpJJPUP8UkJyh1z0Xf7Co0jyOkLFuzzqZ7M1MA/s2667/VbUdD1EhF8U8a+HpZT91tEbLXrg==" - }, - "acorn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz", - "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==", - "dev": true - }, - "acorn-es7-plugin": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz", - "integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=" - }, - "acorn-jsx": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", - "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", - "dev": true, - "requires": { - "acorn": "3.3.0" - }, - "dependencies": { - "acorn": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true - } - } - }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - }, - "ajv-keywords": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", - "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", - "dev": true, - "requires": { - "string-width": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", - "dev": true, - "requires": { - "color-convert": "1.9.1" - } - }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, - "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" - } - }, - "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", - "dev": true, - "requires": { - "sprintf-js": "1.0.3" - } - }, - "argv": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz", - "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=", - "dev": true - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } - }, - "arr-exclude": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/arr-exclude/-/arr-exclude-1.0.0.tgz", - "integrity": "sha1-38fC5VKicHI8zaBM8xKMjL/lxjE=", - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-filter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", - "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" - }, - "array-find": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", - "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "requires": { - "array-uniq": "1.0.3" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" - }, - "ascli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", - "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", - "requires": { - "colour": "0.7.1", - "optjs": "3.2.2" - } - }, - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" - }, - "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "requires": { - "lodash": "4.17.4" - } - }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "atob": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz", - "integrity": "sha512-SuiKH8vbsOyCALjA/+EINmt/Kdl+TQPrtFgW7XZZcwtryFu9e5kQoX3bjCW6mIvGH1fbeAZZuvwGR5IlBRznGw==" - }, - "auto-bind": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz", - "integrity": "sha512-Zw7pZp7tztvKnWWtoII4AmqH5a2PV3ZN5F0BPRTGcc1kpRm4b6QXQnPU7Znbl6BfPfqOVOV29g4JeMqZQaqqOA==", - "dev": true - }, - "ava": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", - "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", - "dev": true, - "requires": { - "@ava/babel-preset-stage-4": "1.1.0", - "@ava/babel-preset-transform-test-files": "3.0.0", - "@ava/write-file-atomic": "2.2.0", - "@concordance/react": "1.0.0", - "@ladjs/time-require": "0.1.4", - "ansi-escapes": "3.1.0", - "ansi-styles": "3.2.0", - "arr-flatten": "1.1.0", - "array-union": "1.0.2", - "array-uniq": "1.0.3", - "arrify": "1.0.1", - "auto-bind": "1.2.0", - "ava-init": "0.2.1", - "babel-core": "6.26.0", - "babel-generator": "6.26.1", - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "bluebird": "3.5.1", - "caching-transform": "1.0.1", - "chalk": "2.3.0", - "chokidar": "1.7.0", - "clean-stack": "1.3.0", - "clean-yaml-object": "0.1.0", - "cli-cursor": "2.1.0", - "cli-spinners": "1.3.1", - "cli-truncate": "1.1.0", - "co-with-promise": "4.6.0", - "code-excerpt": "2.1.1", - "common-path-prefix": "1.0.0", - "concordance": "3.0.0", - "convert-source-map": "1.5.1", - "core-assert": "0.2.1", - "currently-unhandled": "0.4.1", - "debug": "3.1.0", - "dot-prop": "4.2.0", - "empower-core": "0.6.2", - "equal-length": "1.0.1", - "figures": "2.0.0", - "find-cache-dir": "1.0.0", - "fn-name": "2.0.1", - "get-port": "3.2.0", - "globby": "6.1.0", - "has-flag": "2.0.0", - "hullabaloo-config-manager": "1.1.1", - "ignore-by-default": "1.0.1", - "import-local": "0.1.1", - "indent-string": "3.2.0", - "is-ci": "1.1.0", - "is-generator-fn": "1.0.0", - "is-obj": "1.0.1", - "is-observable": "1.1.0", - "is-promise": "2.1.0", - "last-line-stream": "1.0.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.debounce": "4.0.8", - "lodash.difference": "4.5.0", - "lodash.flatten": "4.4.0", - "loud-rejection": "1.6.0", - "make-dir": "1.2.0", - "matcher": "1.1.0", - "md5-hex": "2.0.0", - "meow": "3.7.0", - "ms": "2.1.1", - "multimatch": "2.1.0", - "observable-to-promise": "0.5.0", - "option-chain": "1.0.0", - "package-hash": "2.0.0", - "pkg-conf": "2.1.0", - "plur": "2.1.2", - "pretty-ms": "3.1.0", - "require-precompiled": "0.1.0", - "resolve-cwd": "2.0.0", - "safe-buffer": "5.1.1", - "semver": "5.4.1", - "slash": "1.0.0", - "source-map-support": "0.5.4", - "stack-utils": "1.0.1", - "strip-ansi": "4.0.0", - "strip-bom-buf": "1.0.0", - "supertap": "1.0.0", - "supports-color": "5.4.0", - "trim-off-newlines": "1.0.1", - "unique-temp-dir": "1.0.0", - "update-notifier": "2.5.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", - "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", - "dev": true, - "requires": { - "source-map": "0.6.1" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "3.0.0" - }, - "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - } - } - } - } - }, - "ava-init": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ava-init/-/ava-init-0.2.1.tgz", - "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", - "dev": true, - "requires": { - "arr-exclude": "1.0.0", - "execa": "0.7.0", - "has-yarn": "1.0.0", - "read-pkg-up": "2.0.0", - "write-pkg": "3.1.0" - } - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" - }, - "axios": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", - "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", - "requires": { - "follow-redirects": "1.4.1", - "is-buffer": "1.1.6" - } - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "babel-core": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", - "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.1", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - } - } - }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "dev": true, - "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "dev": true, - "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.4" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "dev": true, - "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-espower": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.4.0.tgz", - "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", - "dev": true, - "requires": { - "babel-generator": "6.26.1", - "babylon": "6.18.0", - "call-matcher": "1.0.1", - "core-js": "2.5.3", - "espower-location-detector": "1.0.0", - "espurify": "1.7.0", - "estraverse": "4.2.0" - } - }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", - "dev": true - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", - "dev": true - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", - "dev": true - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "dev": true, - "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz", - "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=", - "dev": true, - "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "dev": true, - "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "dev": true, - "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "dev": true, - "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "dev": true, - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "requires": { - "babel-core": "6.26.0", - "babel-runtime": "6.26.0", - "core-js": "2.5.3", - "home-or-tmp": "2.0.0", - "lodash": "4.17.4", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.4" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } - } - }, - "base64url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", - "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true - }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", - "dev": true - }, - "boom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", - "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", - "requires": { - "hoek": "4.2.1" - } - }, - "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", - "dev": true, - "requires": { - "ansi-align": "2.0.0", - "camelcase": "4.1.0", - "chalk": "2.3.0", - "cli-boxes": "1.0.0", - "string-width": "2.1.1", - "term-size": "1.2.0", - "widest-line": "2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "browser-stdout": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", - "dev": true - }, - "buf-compare": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", - "integrity": "sha1-/vKNqLgROgoNtEMLC2Rntpcws0o=", - "dev": true - }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "bytebuffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", - "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", - "requires": { - "long": "3.2.0" - } - }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } - } - }, - "cacheable-request": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", - "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", - "dev": true, - "requires": { - "clone-response": "1.0.2", - "get-stream": "3.0.0", - "http-cache-semantics": "3.8.1", - "keyv": "3.0.0", - "lowercase-keys": "1.0.0", - "normalize-url": "2.0.1", - "responselike": "1.0.2" - }, - "dependencies": { - "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", - "dev": true - } - } - }, - "caching-transform": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", - "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", - "dev": true, - "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" - }, - "dependencies": { - "md5-hex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", - "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", - "dev": true, - "requires": { - "md5-o-matic": "0.1.1" - } - }, - "write-file-atomic": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", - "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" - } - } - } - }, - "call-matcher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-matcher/-/call-matcher-1.0.1.tgz", - "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", - "dev": true, - "requires": { - "core-js": "2.5.3", - "deep-equal": "1.0.1", - "espurify": "1.7.0", - "estraverse": "4.2.0" - } - }, - "call-me-maybe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", - "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=" - }, - "call-signature": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/call-signature/-/call-signature-0.0.2.tgz", - "integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY=" - }, - "caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", - "dev": true, - "requires": { - "callsites": "0.2.0" - } - }, - "callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", - "dev": true - }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" - } - }, - "capture-stack-trace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", - "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, - "catharsis": { - "version": "0.8.9", - "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", - "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", - "dev": true, - "requires": { - "underscore-contrib": "0.3.0" - } - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - } - }, - "chalk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", - "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", - "dev": true, - "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" - } - }, - "chardet": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", - "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", - "dev": true - }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, - "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.2", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" - } - }, - "ci-info": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", - "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", - "dev": true - }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", - "dev": true - }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } - } - }, - "clean-stack": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz", - "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE=", - "dev": true - }, - "clean-yaml-object": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", - "integrity": "sha1-Y/sRDcLOGoTcIfbZM0h20BCui2g=", - "dev": true - }, - "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", - "dev": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "2.0.0" - } - }, - "cli-spinners": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", - "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==", - "dev": true - }, - "cli-truncate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", - "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", - "dev": true, - "requires": { - "slice-ansi": "1.0.0", - "string-width": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, - "requires": { - "mimic-response": "1.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, - "co-with-promise": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co-with-promise/-/co-with-promise-4.6.0.tgz", - "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", - "dev": true, - "requires": { - "pinkie-promise": "1.0.0" - }, - "dependencies": { - "pinkie": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", - "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=", - "dev": true - }, - "pinkie-promise": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", - "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", - "dev": true, - "requires": { - "pinkie": "1.0.0" - } - } - } - }, - "code-excerpt": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", - "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", - "dev": true, - "requires": { - "convert-to-spaces": "1.0.2" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "codecov": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.0.tgz", - "integrity": "sha1-wnO4xPEpRXI+jcnSWAPYk0Pl8o4=", - "dev": true, - "requires": { - "argv": "0.0.2", - "request": "2.81.0", - "urlgrey": "0.4.4" - }, - "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "dev": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true - }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "requires": { - "boom": "2.10.1" - } - }, - "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "dev": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", - "dev": true - }, - "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", - "dev": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "dev": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" - } - }, - "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", - "dev": true - }, - "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", - "dev": true - }, - "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", - "dev": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.6.0", - "uuid": "3.1.0" - } - }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - } - } - }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" - } - }, - "color-convert": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", - "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - }, - "colour": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", - "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" - }, - "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", - "requires": { - "delayed-stream": "1.0.0" - } - }, - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", - "dev": true - }, - "common-path-prefix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-1.0.0.tgz", - "integrity": "sha1-zVL28HEuC6q5fW+XModPIvR3UsA=", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "typedarray": "0.0.6" - } - }, - "concordance": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/concordance/-/concordance-3.0.0.tgz", - "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", - "dev": true, - "requires": { - "date-time": "2.1.0", - "esutils": "2.0.2", - "fast-diff": "1.1.2", - "function-name-support": "0.2.0", - "js-string-escape": "1.0.1", - "lodash.clonedeep": "4.5.0", - "lodash.flattendeep": "4.4.0", - "lodash.merge": "4.6.0", - "md5-hex": "2.0.0", - "semver": "5.4.1", - "well-known-symbols": "1.0.0" - }, - "dependencies": { - "date-time": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", - "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", - "dev": true, - "requires": { - "time-zone": "1.0.0" - } - } - } - }, - "configstore": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", - "dev": true, - "requires": { - "dot-prop": "4.2.0", - "graceful-fs": "4.1.11", - "make-dir": "1.2.0", - "unique-string": "1.0.0", - "write-file-atomic": "2.3.0", - "xdg-basedir": "3.0.0" - } - }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true - }, - "convert-to-spaces": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz", - "integrity": "sha1-fj5Iu+bZl7FBfdyihoIEtNPYVxU=", - "dev": true - }, - "cookiejar": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz", - "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=", - "dev": true - }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" - }, - "core-assert": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/core-assert/-/core-assert-0.2.1.tgz", - "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", - "dev": true, - "requires": { - "buf-compare": "1.0.1", - "is-error": "2.2.1" - } - }, - "core-js": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", - "requires": { - "capture-stack-trace": "1.0.0" - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" - } - }, - "cryptiles": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", - "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", - "requires": { - "boom": "5.2.0" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", - "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", - "requires": { - "hoek": "4.2.1" - } - } - } - }, - "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", - "dev": true - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "1.0.2" - } - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "0.10.37" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "1.0.0" - } - }, - "date-time": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", - "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "requires": { - "mimic-response": "1.0.0" - } - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true - }, - "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.11" - } - }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } - } - }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" - }, - "dependencies": { - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - } - } - }, - "delay": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", - "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", - "requires": { - "p-defer": "1.0.0" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "diff-match-patch": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz", - "integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg=" - }, - "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" - }, - "dependencies": { - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "requires": { - "pify": "3.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } - } - }, - "doctrine": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz", - "integrity": "sha512-y0tm5Pq6ywp3qSTZ1vPgVdAnbDEoeoc5wlOHXoY1c4Wug/a7JvqHIl7BTvwodaHmejWkK/9dSb3sCYfyo/om8A==", - "dev": true, - "requires": { - "esutils": "2.0.2" - } - }, - "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", - "dev": true, - "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } - } - }, - "domelementtype": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", - "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", - "dev": true - }, - "domhandler": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", - "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", - "dev": true, - "requires": { - "domelementtype": "1.3.0" - } - }, - "domutils": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz", - "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=", - "dev": true, - "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" - } - }, - "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", - "dev": true, - "requires": { - "is-obj": "1.0.1" - } - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "duplexify": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", - "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", - "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "stream-shift": "1.0.0" - } - }, - "eastasianwidth": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.1.1.tgz", - "integrity": "sha1-RNZW3p2kFWlEZzNTZfsxR7hXK3w=" - }, - "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "ecdsa-sig-formatter": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz", - "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=", - "requires": { - "base64url": "2.0.0", - "safe-buffer": "5.1.1" - } - }, - "empower": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", - "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", - "requires": { - "core-js": "2.5.3", - "empower-core": "0.6.2" - } - }, - "empower-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/empower-assert/-/empower-assert-1.0.1.tgz", - "integrity": "sha1-MeMQq8BluqfDoEh+a+W7zGXzwd4=", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "empower-core": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", - "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", - "requires": { - "call-signature": "0.0.2", - "core-js": "2.5.3" - } - }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "requires": { - "once": "1.4.0" - } - }, - "ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=" - }, - "entities": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", - "dev": true - }, - "equal-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/equal-length/-/equal-length-1.0.1.tgz", - "integrity": "sha1-IcoRLUirJLTh5//A5TOdMf38J0w=", - "dev": true - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, - "requires": { - "is-arrayish": "0.2.1" - } - }, - "es5-ext": { - "version": "0.10.37", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz", - "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=", - "dev": true, - "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" - } - }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37", - "es6-symbol": "3.1.1" - } - }, - "es6-map": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-set": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37" - } - }, - "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" - } - }, - "escallmatch": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/escallmatch/-/escallmatch-1.5.0.tgz", - "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", - "dev": true, - "requires": { - "call-matcher": "1.0.1", - "esprima": "2.7.3" - }, - "dependencies": { - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - } - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "escodegen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", - "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", - "dev": true, - "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.5.7" - }, - "dependencies": { - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", - "dev": true - } - } - }, - "escope": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", - "dev": true, - "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.0", - "estraverse": "4.2.0" - } - }, - "eslint": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz", - "integrity": "sha512-Ul6CSGRjKscEyg0X/EeNs7o2XdnbTEOD1OM8cTjmx85RPcBJQrEhZLevhuJZNAE/vS2iVl5Uhgiqf3h5uLMCJQ==", - "dev": true, - "requires": { - "ajv": "5.5.2", - "babel-code-frame": "6.26.0", - "chalk": "2.3.0", - "concat-stream": "1.6.0", - "cross-spawn": "5.1.0", - "debug": "3.1.0", - "doctrine": "2.0.2", - "eslint-scope": "3.7.1", - "eslint-visitor-keys": "1.0.0", - "espree": "3.5.2", - "esquery": "1.0.0", - "esutils": "2.0.2", - "file-entry-cache": "2.0.0", - "functional-red-black-tree": "1.0.1", - "glob": "7.1.2", - "globals": "11.1.0", - "ignore": "3.3.7", - "imurmurhash": "0.1.4", - "inquirer": "3.3.0", - "is-resolvable": "1.0.1", - "js-yaml": "3.10.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "optionator": "0.8.2", - "path-is-inside": "1.0.2", - "pluralize": "7.0.0", - "progress": "2.0.0", - "require-uncached": "1.0.3", - "semver": "5.4.1", - "strip-ansi": "4.0.0", - "strip-json-comments": "2.0.1", - "table": "4.0.2", - "text-table": "0.2.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "globals": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz", - "integrity": "sha512-uEuWt9mqTlPDwSqi+sHjD4nWU/1N+q0fiWI9T1mZpD2UENqX20CFD5T/ziLZvztPaBKl7ZylUi1q6Qfm7E2CiQ==", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "eslint-config-prettier": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", - "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", - "dev": true, - "requires": { - "get-stdin": "5.0.1" - }, - "dependencies": { - "get-stdin": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", - "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", - "dev": true - } - } - }, - "eslint-plugin-node": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-6.0.0.tgz", - "integrity": "sha512-Qj4dMF1N/wRALO1IRvnchn8c1i0awgrztrGx7MjF9ewDwlW/heNB+WeZ09bhp8Yp0TD+BZcADP8BRya0wmropA==", - "dev": true, - "requires": { - "ignore": "3.3.7", - "minimatch": "3.0.4", - "resolve": "1.5.0", - "semver": "5.4.1" - }, - "dependencies": { - "resolve": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", - "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", - "dev": true, - "requires": { - "path-parse": "1.0.5" - } - } - } - }, - "eslint-plugin-prettier": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.4.0.tgz", - "integrity": "sha512-P0EohHM1MwL36GX5l1TOEYyt/5d7hcxrX3CqCjibTN3dH7VCAy2kjsC/WB6dUHnpB4mFkZq1Ndfh2DYQ2QMEGQ==", - "dev": true, - "requires": { - "fast-diff": "1.1.2", - "jest-docblock": "21.2.0" - } - }, - "eslint-scope": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", - "dev": true, - "requires": { - "esrecurse": "4.2.0", - "estraverse": "4.2.0" - } - }, - "eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", - "dev": true - }, - "espower": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/espower/-/espower-2.1.0.tgz", - "integrity": "sha1-zh7bPZhwKEH99ZbRy46FvcSujkg=", - "dev": true, - "requires": { - "array-find": "1.0.0", - "escallmatch": "1.5.0", - "escodegen": "1.9.0", - "escope": "3.6.0", - "espower-location-detector": "1.0.0", - "espurify": "1.7.0", - "estraverse": "4.2.0", - "source-map": "0.5.7", - "type-name": "2.0.2", - "xtend": "4.0.1" - } - }, - "espower-loader": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/espower-loader/-/espower-loader-1.2.2.tgz", - "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", - "dev": true, - "requires": { - "convert-source-map": "1.5.1", - "espower-source": "2.2.0", - "minimatch": "3.0.4", - "source-map-support": "0.4.18", - "xtend": "4.0.1" - } - }, - "espower-location-detector": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/espower-location-detector/-/espower-location-detector-1.0.0.tgz", - "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", - "dev": true, - "requires": { - "is-url": "1.2.2", - "path-is-absolute": "1.0.1", - "source-map": "0.5.7", - "xtend": "4.0.1" - } - }, - "espower-source": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/espower-source/-/espower-source-2.2.0.tgz", - "integrity": "sha1-fgBSVa5HtcE2RIZEs/PYAtUD91I=", - "dev": true, - "requires": { - "acorn": "5.3.0", - "acorn-es7-plugin": "1.1.7", - "convert-source-map": "1.5.1", - "empower-assert": "1.0.1", - "escodegen": "1.9.0", - "espower": "2.1.0", - "estraverse": "4.2.0", - "merge-estraverse-visitors": "1.0.0", - "multi-stage-sourcemap": "0.2.1", - "path-is-absolute": "1.0.1", - "xtend": "4.0.1" - } - }, - "espree": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz", - "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==", - "dev": true, - "requires": { - "acorn": "5.3.0", - "acorn-jsx": "3.0.1" - } - }, - "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", - "dev": true - }, - "espurify": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", - "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", - "requires": { - "core-js": "2.5.3" - } - }, - "esquery": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz", - "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "esrecurse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", - "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", - "dev": true, - "requires": { - "estraverse": "4.2.0", - "object-assign": "4.1.1" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.37" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "2.2.3" - } - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "2.0.4" - } - } - } - }, - "external-editor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz", - "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==", - "dev": true, - "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.19", - "tmp": "0.0.33" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" - }, - "fast-diff": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", - "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", - "dev": true - }, - "fast-glob": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.1.tgz", - "integrity": "sha512-wSyW1TBK3ia5V+te0rGPXudeMHoUQW6O5Y9oATiaGhpENmEifPDlOdhpsnlj5HoG6ttIvGiY1DdCmI9X2xGMhg==", - "requires": { - "@mrmlnc/readdir-enhanced": "2.2.1", - "glob-parent": "3.1.0", - "is-glob": "4.0.0", - "merge2": "1.2.1", - "micromatch": "3.1.10" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "1.0.5" - } - }, - "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", - "dev": true, - "requires": { - "flat-cache": "1.3.0", - "object-assign": "4.1.1" - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "fill-keys": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", - "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", - "dev": true, - "requires": { - "is-object": "1.0.1", - "merge-descriptors": "1.0.1" - } - }, - "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", - "dev": true, - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - } - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "1.0.1", - "make-dir": "1.2.0", - "pkg-dir": "2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "2.0.0" - } - }, - "flat-cache": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", - "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", - "dev": true, - "requires": { - "circular-json": "0.3.3", - "del": "2.2.2", - "graceful-fs": "4.1.11", - "write": "0.2.1" - } - }, - "fn-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", - "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", - "dev": true - }, - "follow-redirects": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz", - "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", - "requires": { - "debug": "3.1.0" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", - "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "formidable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", - "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", - "dev": true - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "requires": { - "map-cache": "0.2.2" - } - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3" - } - }, - "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.2.tgz", - "integrity": "sha512-iownA+hC4uHFp+7gwP/y5SzaiUo7m2vpa0dhpzw8YuKtiZsz7cIXsFbXpLEeBM6WuCQyw1MH4RRe6XI8GFUctQ==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.9.1" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.9.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.6", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, - "function-name-support": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/function-name-support/-/function-name-support-0.2.0.tgz", - "integrity": "sha1-VdO/qm6v1QWlD5vIH99XVkoLsHE=", - "dev": true - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, - "gcp-metadata": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", - "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", - "requires": { - "axios": "0.18.0", - "extend": "3.0.1", - "retry-axios": "0.3.2" - } - }, - "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", - "dev": true - }, - "get-port": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", - "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", - "dev": true - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "1.0.0" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - } - }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "glob-to-regexp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", - "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" - }, - "global-dirs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", - "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", - "dev": true, - "requires": { - "ini": "1.3.5" - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - }, - "globby": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", - "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "fast-glob": "2.2.1", - "glob": "7.1.2", - "ignore": "3.3.7", - "pify": "3.0.0", - "slash": "1.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } - } - }, - "google-auth-library": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.4.0.tgz", - "integrity": "sha512-vWRx6pJulK7Y5V/Xyr7MPMlx2mWfmrUVbcffZ7hpq8ElFg5S8WY6PvjMovdcr6JfuAwwpAX4R0I1XOcyWuBcUw==", - "requires": { - "axios": "0.18.0", - "gcp-metadata": "0.6.3", - "gtoken": "2.3.0", - "jws": "3.1.4", - "lodash.isstring": "4.0.1", - "lru-cache": "4.1.2", - "retry-axios": "0.3.2" - }, - "dependencies": { - "lru-cache": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", - "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } - } - } - }, - "google-auto-auth": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", - "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", - "requires": { - "async": "2.6.0", - "gcp-metadata": "0.6.3", - "google-auth-library": "1.4.0", - "request": "2.83.0" - } - }, - "google-gax": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.1.tgz", - "integrity": "sha512-eP7UUkKvaHmmvCrr+rxzkIOeEKOnXmoib7/AkENDAuqlC9T2+lWlzwpthDRnitQcV8SblDMzsk73YPMPCDwPyQ==", - "requires": { - "duplexify": "3.5.4", - "extend": "3.0.1", - "globby": "8.0.1", - "google-auto-auth": "0.10.1", - "google-proto-files": "0.15.1", - "grpc": "1.10.1", - "is-stream-ended": "0.1.3", - "lodash": "4.17.4", - "protobufjs": "6.8.4", - "through2": "2.0.3" - }, - "dependencies": { - "grpc": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.10.1.tgz", - "integrity": "sha512-xmhA11h2XhqpSVzDAmoQAYdNQ+swILXpKOiRpAEQ2kX55ioxVADc6v7SkS4zQBxm4klhQHgGqpGKvoL6LGx4VQ==", - "requires": { - "lodash": "4.17.4", - "nan": "2.10.0", - "node-pre-gyp": "0.7.0", - "protobufjs": "5.0.2" + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", + "md5-hex": "1.3.0", + "merge-source-map": "1.0.4", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.1.1", + "yargs": "10.0.3", + "yargs-parser": "8.0.0" }, "dependencies": { - "abbrev": { + "align-text": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "amdefine": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "bundled": true, + "dev": true + }, + "append-transform": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "archy": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "arrify": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "async": { + "version": "1.5.2", + "bundled": true, + "dev": true + }, + "babel-code-frame": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-generator": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" + } + }, + "babel-messages": { + "version": "6.23.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "bundled": true, + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.8", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "bundled": true, + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "builtin-modules": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "caching-transform": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" + } + }, + "camelcase": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true + }, + "center-align": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "cliui": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "commondir": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "convert-source-map": { + "version": "1.5.1", + "bundled": true, + "dev": true + }, + "core-js": { + "version": "2.5.3", + "bundled": true, + "dev": true + }, + "cross-spawn": { + "version": "4.0.2", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "debug-log": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "default-require-extensions": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "strip-bom": "2.0.0" + } + }, + "detect-indent": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "error-ex": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "esutils": { + "version": "2.0.2", + "bundled": true, + "dev": true + }, + "execa": { + "version": "0.7.0", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } + } + }, + "expand-brackets": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "bundled": true, + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "extglob": { + "version": "0.3.2", + "bundled": true, + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "filename-regex": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "bundled": true, + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "find-cache-dir": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "requires": { + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "for-in": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "for-own": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreground-child": { + "version": "1.5.6", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "get-caller-file": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "get-stream": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "bundled": true, + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + } + }, + "glob-parent": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "globals": { + "version": "9.18.0", + "bundled": true, + "dev": true + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true, + "dev": true + }, + "handlebars": { + "version": "4.0.11", + "bundled": true, + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "has-ansi": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-flag": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "hosted-git-info": { + "version": "2.5.0", + "bundled": true, + "dev": true + }, + "imurmurhash": { + "version": "0.1.4", + "bundled": true, + "dev": true + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "invariant": { + "version": "2.2.2", + "bundled": true, + "dev": true, + "requires": { + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "is-buffer": { + "version": "1.1.6", + "bundled": true, + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-dotfile": { + "version": "1.0.3", + "bundled": true, + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-extglob": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-finite": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-glob": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-number": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "is-posix-bracket": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "isobject": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "isarray": "1.0.0" + } + }, + "istanbul-lib-coverage": { "version": "1.1.1", - "bundled": true + "bundled": true, + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "append-transform": "0.4.0" + } + }, + "istanbul-lib-instrument": { + "version": "1.9.1", + "bundled": true, + "dev": true, + "requires": { + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" + } + }, + "istanbul-lib-report": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" + }, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "bundled": true, + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "1.2.2", + "bundled": true, + "dev": true, + "requires": { + "debug": "3.1.0", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "istanbul-reports": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "handlebars": "4.0.11" + } + }, + "js-tokens": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "jsesc": { + "version": "1.3.0", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + }, + "lazy-cache": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "invert-kv": "1.0.0" + } + }, + "load-json-file": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + } + } + }, + "lodash": { + "version": "4.17.4", + "bundled": true, + "dev": true + }, + "longest": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "lru-cache": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "md5-hex": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "md5-o-matic": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "mem": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, + "merge-source-map": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "requires": { + "source-map": "0.5.7" + } + }, + "micromatch": { + "version": "2.3.11", + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + }, + "mimic-fn": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } }, - "ajv": { - "version": "5.5.2", + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "mkdirp": { + "version": "0.5.1", "bundled": true, + "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "minimist": "0.0.8" } }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true }, - "are-we-there-yet": { - "version": "1.1.4", + "normalize-package-data": { + "version": "2.4.0", "bundled": true, + "dev": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.5" + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" } }, - "asn1": { - "version": "0.2.3", - "bundled": true - }, - "assert-plus": { - "version": "1.0.0", - "bundled": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true + "normalize-path": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } }, - "aws-sign2": { - "version": "0.7.0", - "bundled": true + "npm-run-path": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "path-key": "2.0.1" + } }, - "aws4": { - "version": "1.6.0", - "bundled": true + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true }, - "balanced-match": { - "version": "1.0.0", - "bundled": true + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true }, - "bcrypt-pbkdf": { - "version": "1.0.1", + "object.omit": { + "version": "2.0.1", "bundled": true, - "optional": true, + "dev": true, "requires": { - "tweetnacl": "0.14.5" + "for-own": "0.1.5", + "is-extendable": "0.1.1" } }, - "block-stream": { - "version": "0.0.9", + "once": { + "version": "1.4.0", "bundled": true, + "dev": true, "requires": { - "inherits": "2.0.3" + "wrappy": "1.0.2" } }, - "boom": { - "version": "4.3.1", + "optimist": { + "version": "0.6.1", "bundled": true, + "dev": true, "requires": { - "hoek": "4.2.1" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, - "brace-expansion": { - "version": "1.1.8", + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "os-locale": { + "version": "2.1.0", "bundled": true, + "dev": true, "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, - "caseless": { - "version": "0.12.0", - "bundled": true - }, - "co": { - "version": "4.6.0", - "bundled": true + "p-finally": { + "version": "1.0.0", + "bundled": true, + "dev": true }, - "code-point-at": { + "p-limit": { "version": "1.1.0", - "bundled": true + "bundled": true, + "dev": true }, - "combined-stream": { - "version": "1.0.6", + "p-locate": { + "version": "2.0.0", "bundled": true, + "dev": true, "requires": { - "delayed-stream": "1.0.0" + "p-limit": "1.1.0" } }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true - }, - "cryptiles": { - "version": "3.1.2", + "parse-glob": { + "version": "3.0.4", "bundled": true, + "dev": true, "requires": { - "boom": "5.2.0" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "bundled": true, - "requires": { - "hoek": "4.2.1" - } - } + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" } }, - "dashdash": { - "version": "1.14.1", + "parse-json": { + "version": "2.2.0", "bundled": true, + "dev": true, "requires": { - "assert-plus": "1.0.0" + "error-ex": "1.3.1" } }, - "debug": { - "version": "2.6.9", + "path-exists": { + "version": "2.1.0", "bundled": true, + "dev": true, "requires": { - "ms": "2.0.0" + "pinkie-promise": "2.0.1" } }, - "deep-extend": { - "version": "0.4.2", - "bundled": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true }, - "delegates": { - "version": "1.0.0", - "bundled": true + "path-key": { + "version": "2.0.1", + "bundled": true, + "dev": true }, - "detect-libc": { - "version": "1.0.3", - "bundled": true + "path-parse": { + "version": "1.0.5", + "bundled": true, + "dev": true }, - "ecc-jsbn": { - "version": "0.1.1", + "path-type": { + "version": "1.1.0", "bundled": true, - "optional": true, + "dev": true, "requires": { - "jsbn": "0.1.1" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, - "extend": { - "version": "3.0.1", - "bundled": true - }, - "extsprintf": { - "version": "1.3.0", - "bundled": true - }, - "fast-deep-equal": { - "version": "1.1.0", - "bundled": true - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "bundled": true + "pify": { + "version": "2.3.0", + "bundled": true, + "dev": true }, - "forever-agent": { - "version": "0.6.1", - "bundled": true + "pinkie": { + "version": "2.0.4", + "bundled": true, + "dev": true }, - "form-data": { - "version": "2.3.2", + "pinkie-promise": { + "version": "2.0.1", "bundled": true, + "dev": true, "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "pinkie": "2.0.4" } }, - "fs.realpath": { + "pkg-dir": { "version": "1.0.0", - "bundled": true - }, - "fstream": { - "version": "1.0.11", "bundled": true, + "dev": true, "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" + "find-up": "1.1.2" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } } }, - "fstream-ignore": { - "version": "1.0.5", + "preserve": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "randomatic": { + "version": "1.1.7", "bundled": true, + "dev": true, "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } } }, - "gauge": { - "version": "2.7.4", + "read-pkg": { + "version": "1.1.0", "bundled": true, + "dev": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, - "getpass": { - "version": "0.1.7", + "read-pkg-up": { + "version": "1.0.1", "bundled": true, + "dev": true, "requires": { - "assert-plus": "1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } } }, - "glob": { - "version": "7.1.2", + "regenerator-runtime": { + "version": "0.11.1", + "bundled": true, + "dev": true + }, + "regex-cache": { + "version": "0.4.4", "bundled": true, + "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "is-equal-shallow": "0.1.3" } }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true + "remove-trailing-separator": { + "version": "1.1.0", + "bundled": true, + "dev": true }, - "har-schema": { - "version": "2.0.0", - "bundled": true + "repeat-element": { + "version": "1.1.2", + "bundled": true, + "dev": true }, - "har-validator": { - "version": "5.0.3", + "repeat-string": { + "version": "1.6.1", "bundled": true, - "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" - } + "dev": true }, - "has-unicode": { + "repeating": { "version": "2.0.1", - "bundled": true - }, - "hawk": { - "version": "6.0.2", "bundled": true, + "dev": true, "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.1", - "sntp": "2.1.0" + "is-finite": "1.0.2" } }, - "hoek": { - "version": "4.2.1", - "bundled": true + "require-directory": { + "version": "2.1.1", + "bundled": true, + "dev": true }, - "http-signature": { - "version": "1.2.0", + "require-main-filename": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "resolve-from": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "right-align": { + "version": "0.1.3", "bundled": true, + "dev": true, + "optional": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "align-text": "0.1.4" } }, - "inflight": { - "version": "1.0.6", + "rimraf": { + "version": "2.6.2", "bundled": true, + "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "glob": "7.1.2" } }, - "inherits": { - "version": "2.0.3", - "bundled": true + "semver": { + "version": "5.4.1", + "bundled": true, + "dev": true }, - "ini": { - "version": "1.3.5", - "bundled": true + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true }, - "is-fullwidth-code-point": { - "version": "1.0.0", + "shebang-command": { + "version": "1.2.0", "bundled": true, + "dev": true, "requires": { - "number-is-nan": "1.0.1" + "shebang-regex": "1.0.0" } }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true - }, - "isarray": { + "shebang-regex": { "version": "1.0.0", - "bundled": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true - }, - "jsbn": { - "version": "0.1.1", "bundled": true, - "optional": true + "dev": true }, - "json-schema": { - "version": "0.2.3", - "bundled": true + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true }, - "json-schema-traverse": { - "version": "0.3.1", - "bundled": true + "slide": { + "version": "1.1.6", + "bundled": true, + "dev": true }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true + "source-map": { + "version": "0.5.7", + "bundled": true, + "dev": true }, - "jsprim": { - "version": "1.4.1", + "spawn-wrap": { + "version": "1.4.2", "bundled": true, + "dev": true, "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" } }, - "mime-db": { - "version": "1.33.0", - "bundled": true - }, - "mime-types": { - "version": "2.1.18", + "spdx-correct": { + "version": "1.0.2", "bundled": true, + "dev": true, "requires": { - "mime-db": "1.33.0" + "spdx-license-ids": "1.2.2" } }, - "minimatch": { - "version": "3.0.4", + "spdx-expression-parse": { + "version": "1.0.4", "bundled": true, - "requires": { - "brace-expansion": "1.1.8" - } + "dev": true }, - "minimist": { - "version": "1.2.0", - "bundled": true + "spdx-license-ids": { + "version": "1.2.2", + "bundled": true, + "dev": true }, - "mkdirp": { - "version": "0.5.1", + "string-width": { + "version": "2.1.1", "bundled": true, + "dev": true, "requires": { - "minimist": "0.0.8" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { - "minimist": { - "version": "0.0.8", - "bundled": true + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } } } }, - "ms": { - "version": "2.0.0", - "bundled": true - }, - "node-pre-gyp": { - "version": "0.7.0", + "strip-ansi": { + "version": "3.0.1", "bundled": true, + "dev": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.2", - "rc": "1.2.6", - "request": "2.83.0", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "2.2.1", - "tar-pack": "3.4.1" + "ansi-regex": "2.1.1" } }, - "nopt": { - "version": "4.0.1", + "strip-bom": { + "version": "2.0.0", "bundled": true, + "dev": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "is-utf8": "0.2.1" } }, - "npmlog": { - "version": "4.1.2", + "strip-eof": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "supports-color": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "test-exclude": { + "version": "4.1.1", "bundled": true, + "dev": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" } }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true + "to-fast-properties": { + "version": "1.0.3", + "bundled": true, + "dev": true }, - "object-assign": { - "version": "4.1.1", - "bundled": true + "trim-right": { + "version": "1.0.1", + "bundled": true, + "dev": true }, - "once": { - "version": "1.4.0", + "uglify-js": { + "version": "2.8.29", "bundled": true, + "dev": true, + "optional": true, "requires": { - "wrappy": "1.0.2" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "yargs": { + "version": "3.10.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } } }, - "os-homedir": { + "uglify-to-browserify": { "version": "1.0.2", - "bundled": true + "bundled": true, + "dev": true, + "optional": true }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true + "validate-npm-package-license": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } }, - "osenv": { - "version": "0.1.5", + "which": { + "version": "1.3.0", "bundled": true, + "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "isexe": "2.0.0" } }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true + "which-module": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "window-size": { + "version": "0.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "wordwrap": { + "version": "0.0.3", + "bundled": true, + "dev": true }, - "performance-now": { + "wrap-ansi": { "version": "2.1.0", - "bundled": true + "bundled": true, + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true }, - "protobufjs": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", - "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=", + "write-file-atomic": { + "version": "1.3.4", + "bundled": true, + "dev": true, "requires": { - "ascli": "1.0.1", - "bytebuffer": "5.0.1", - "glob": "7.1.2", - "yargs": "3.32.0" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } }, - "punycode": { - "version": "1.4.1", - "bundled": true + "y18n": { + "version": "3.2.1", + "bundled": true, + "dev": true }, - "qs": { - "version": "6.5.1", - "bundled": true + "yallist": { + "version": "2.1.2", + "bundled": true, + "dev": true }, - "rc": { - "version": "1.2.6", + "yargs": { + "version": "10.0.3", "bundled": true, + "dev": true, "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "cliui": "3.2.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "8.0.0" + }, + "dependencies": { + "cliui": { + "version": "3.2.0", + "bundled": true, + "dev": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + } } }, - "readable-stream": { - "version": "2.3.5", + "yargs-parser": { + "version": "8.0.0", "bundled": true, + "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.83.0", - "bundled": true, - "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "hawk": "6.0.2", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.1", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "camelcase": "4.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "bundled": true, + "dev": true + } } - }, - "rimraf": { - "version": "2.6.2", + } + } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "proxyquire": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz", + "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", + "dev": true, + "requires": { + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.1.7" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "yargs": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "dev": true, + "requires": { + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + } + } + } + }, + "@ladjs/time-require": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", + "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", + "dev": true, + "requires": { + "chalk": "0.4.0", + "date-time": "0.1.1", + "pretty-ms": "0.2.2", + "text-table": "0.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", + "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", + "dev": true + }, + "chalk": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", + "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", + "dev": true, + "requires": { + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" + } + }, + "pretty-ms": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", + "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", + "dev": true, + "requires": { + "parse-ms": "0.1.2" + } + }, + "strip-ansi": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", + "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", + "dev": true + } + } + }, + "@mrmlnc/readdir-enhanced": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", + "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", + "requires": { + "call-me-maybe": "1.0.1", + "glob-to-regexp": "0.3.0" + } + }, + "@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" + }, + "@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" + }, + "@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", + "requires": { + "@protobufjs/aspromise": "1.1.2", + "@protobufjs/inquire": "1.1.0" + } + }, + "@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" + }, + "@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" + }, + "@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" + }, + "@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" + }, + "@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" + }, + "@sindresorhus/is": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", + "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", + "dev": true + }, + "@sinonjs/formatio": { + "version": "2.0.0", + "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", + "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", + "dev": true, + "requires": { + "samsam": "1.3.0" + } + }, + "@types/long": { + "version": "3.0.32", + "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", + "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" + }, + "@types/node": { + "version": "8.10.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.11.tgz", + "integrity": "sha512-FM7tvbjbn2BUzM/Qsdk9LUGq3zeh7li8NcHoS398dBzqLzfmSqSP1+yKbMRTCcZzLcu2JAR5lq3IKIEYkto7iQ==" + }, + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" + }, + "acorn-es7-plugin": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz", + "integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=" + }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "3.3.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ajv-keywords": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + }, + "ansi-align": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", + "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "dev": true, + "requires": { + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "ansi-escapes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, + "requires": { + "micromatch": "2.3.11", + "normalize-path": "2.1.1" + }, + "dependencies": { + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + } + } + } + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "argv": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz", + "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=", + "dev": true + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, + "arr-exclude": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/arr-exclude/-/arr-exclude-1.0.0.tgz", + "integrity": "sha1-38fC5VKicHI8zaBM8xKMjL/lxjE=", + "dev": true + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", + "dev": true + }, + "array-filter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", + "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" + }, + "array-find": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", + "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", + "dev": true + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "requires": { + "array-uniq": "1.0.3" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" + }, + "ascli": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", + "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", + "requires": { + "colour": "0.7.1", + "optjs": "3.2.2" + } + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + }, + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + }, + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" + }, + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "requires": { + "lodash": "4.17.10" + } + }, + "async-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "atob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", + "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=" + }, + "auto-bind": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz", + "integrity": "sha512-Zw7pZp7tztvKnWWtoII4AmqH5a2PV3ZN5F0BPRTGcc1kpRm4b6QXQnPU7Znbl6BfPfqOVOV29g4JeMqZQaqqOA==", + "dev": true + }, + "ava": { + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", + "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", + "dev": true, + "requires": { + "@ava/babel-preset-stage-4": "1.1.0", + "@ava/babel-preset-transform-test-files": "3.0.0", + "@ava/write-file-atomic": "2.2.0", + "@concordance/react": "1.0.0", + "@ladjs/time-require": "0.1.4", + "ansi-escapes": "3.1.0", + "ansi-styles": "3.2.1", + "arr-flatten": "1.1.0", + "array-union": "1.0.2", + "array-uniq": "1.0.3", + "arrify": "1.0.1", + "auto-bind": "1.2.0", + "ava-init": "0.2.1", + "babel-core": "6.26.3", + "babel-generator": "6.26.1", + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "bluebird": "3.5.1", + "caching-transform": "1.0.1", + "chalk": "2.4.1", + "chokidar": "1.7.0", + "clean-stack": "1.3.0", + "clean-yaml-object": "0.1.0", + "cli-cursor": "2.1.0", + "cli-spinners": "1.3.1", + "cli-truncate": "1.1.0", + "co-with-promise": "4.6.0", + "code-excerpt": "2.1.1", + "common-path-prefix": "1.0.0", + "concordance": "3.0.0", + "convert-source-map": "1.5.1", + "core-assert": "0.2.1", + "currently-unhandled": "0.4.1", + "debug": "3.1.0", + "dot-prop": "4.2.0", + "empower-core": "0.6.2", + "equal-length": "1.0.1", + "figures": "2.0.0", + "find-cache-dir": "1.0.0", + "fn-name": "2.0.1", + "get-port": "3.2.0", + "globby": "6.1.0", + "has-flag": "2.0.0", + "hullabaloo-config-manager": "1.1.1", + "ignore-by-default": "1.0.1", + "import-local": "0.1.1", + "indent-string": "3.2.0", + "is-ci": "1.1.0", + "is-generator-fn": "1.0.0", + "is-obj": "1.0.1", + "is-observable": "1.1.0", + "is-promise": "2.1.0", + "last-line-stream": "1.0.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.debounce": "4.0.8", + "lodash.difference": "4.5.0", + "lodash.flatten": "4.4.0", + "loud-rejection": "1.6.0", + "make-dir": "1.2.0", + "matcher": "1.1.0", + "md5-hex": "2.0.0", + "meow": "3.7.0", + "ms": "2.0.0", + "multimatch": "2.1.0", + "observable-to-promise": "0.5.0", + "option-chain": "1.0.0", + "package-hash": "2.0.0", + "pkg-conf": "2.1.0", + "plur": "2.1.2", + "pretty-ms": "3.1.0", + "require-precompiled": "0.1.0", + "resolve-cwd": "2.0.0", + "safe-buffer": "5.1.2", + "semver": "5.5.0", + "slash": "1.0.0", + "source-map-support": "0.5.5", + "stack-utils": "1.0.1", + "strip-ansi": "4.0.0", + "strip-bom-buf": "1.0.0", + "supertap": "1.0.0", + "supports-color": "5.4.0", + "trim-off-newlines": "1.0.1", + "unique-temp-dir": "1.0.0", + "update-notifier": "2.5.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "ava-init": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ava-init/-/ava-init-0.2.1.tgz", + "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", + "dev": true, + "requires": { + "arr-exclude": "1.0.0", + "execa": "0.7.0", + "has-yarn": "1.0.0", + "read-pkg-up": "2.0.0", + "write-pkg": "3.1.0" + } + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + }, + "aws4": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" + }, + "axios": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", + "requires": { + "follow-redirects": "1.4.1", + "is-buffer": "1.1.6" + } + }, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, + "babel-core": { + "version": "6.26.3", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", + "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.1", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.10", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "babel-generator": { + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.10", + "source-map": "0.5.7", + "trim-right": "1.0.1" + }, + "dependencies": { + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + } + } + }, + "babel-helper-builder-binary-assignment-operator-visitor": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", + "dev": true, + "requires": { + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-call-delegate": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", + "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", + "dev": true, + "requires": { + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-explode-assignable-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", + "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", + "dev": true, + "requires": { + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-get-function-arity": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", + "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-hoist-variables": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", + "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-regex": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", + "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.10" + } + }, + "babel-helper-remap-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helpers": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", + "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" + } + }, + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-check-es2015-constants": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", + "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-espower": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.4.0.tgz", + "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", + "dev": true, + "requires": { + "babel-generator": "6.26.1", + "babylon": "6.18.0", + "call-matcher": "1.0.1", + "core-js": "2.5.5", + "espower-location-detector": "1.0.0", + "espurify": "1.7.0", + "estraverse": "4.2.0" + } + }, + "babel-plugin-syntax-async-functions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", + "dev": true + }, + "babel-plugin-syntax-exponentiation-operator": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", + "dev": true + }, + "babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", + "dev": true + }, + "babel-plugin-syntax-trailing-function-commas": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", + "dev": true + }, + "babel-plugin-transform-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", + "dev": true, + "requires": { + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-destructuring": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", + "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", + "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-modules-commonjs": { + "version": "6.26.2", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", + "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", + "dev": true, + "requires": { + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-parameters": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", + "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", + "dev": true, + "requires": { + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-spread": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", + "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-es2015-sticky-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", + "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", + "dev": true, + "requires": { + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-es2015-unicode-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", + "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", + "dev": true, + "requires": { + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" + } + }, + "babel-plugin-transform-exponentiation-operator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", + "dev": true, + "requires": { + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-strict-mode": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", + "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-register": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", + "dev": true, + "requires": { + "babel-core": "6.26.3", + "babel-runtime": "6.26.0", + "core-js": "2.5.5", + "home-or-tmp": "2.0.0", + "lodash": "4.17.10", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" + }, + "dependencies": { + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "0.5.7" + } + } + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.5.5", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.10" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.10" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.10", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "requires": { + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + } + } + }, + "base64url": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", + "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "binary-extensions": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", + "dev": true + }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "dev": true + }, + "boom": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", + "requires": { + "hoek": "4.2.1" + } + }, + "boxen": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "dev": true, + "requires": { + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.4.1", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "buf-compare": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", + "integrity": "sha1-/vKNqLgROgoNtEMLC2Rntpcws0o=", + "dev": true + }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, + "buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==" + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "bytebuffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", + "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", + "requires": { + "long": "3.2.0" + }, + "dependencies": { + "long": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", + "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" + } + } + }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "requires": { + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" + } + }, + "cacheable-request": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", + "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", + "dev": true, + "requires": { + "clone-response": "1.0.2", + "get-stream": "3.0.0", + "http-cache-semantics": "3.8.1", + "keyv": "3.0.0", + "lowercase-keys": "1.0.0", + "normalize-url": "2.0.1", + "responselike": "1.0.2" + }, + "dependencies": { + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "dev": true + } + } + }, + "caching-transform": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", + "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", + "dev": true, + "requires": { + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" + }, + "dependencies": { + "md5-hex": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", + "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } + }, + "write-file-atomic": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", + "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" + } + } + } + }, + "call-matcher": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-matcher/-/call-matcher-1.0.1.tgz", + "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", + "dev": true, + "requires": { + "core-js": "2.5.5", + "deep-equal": "1.0.1", + "espurify": "1.7.0", + "estraverse": "4.2.0" + } + }, + "call-me-maybe": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", + "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=" + }, + "call-signature": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/call-signature/-/call-signature-0.0.2.tgz", + "integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY=" + }, + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "0.2.0" + } + }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "capture-stack-trace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", + "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "catharsis": { + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", + "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", + "dev": true, + "requires": { + "underscore-contrib": "0.3.0" + } + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "chardet": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", + "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", + "dev": true + }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, + "requires": { + "anymatch": "1.3.2", + "async-each": "1.0.1", + "fsevents": "1.2.3", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "ci-info": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", + "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", + "dev": true + }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "requires": { + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + } + } + }, + "clean-stack": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz", + "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE=", + "dev": true + }, + "clean-yaml-object": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", + "integrity": "sha1-Y/sRDcLOGoTcIfbZM0h20BCui2g=", + "dev": true + }, + "cli-boxes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", + "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "dev": true, + "requires": { + "restore-cursor": "2.0.0" + } + }, + "cli-spinners": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", + "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==", + "dev": true + }, + "cli-truncate": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", + "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", + "dev": true, + "requires": { + "slice-ansi": "1.0.0", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "cli-width": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "dev": true + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "dev": true, + "requires": { + "mimic-response": "1.0.0" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "co-with-promise": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co-with-promise/-/co-with-promise-4.6.0.tgz", + "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", + "dev": true, + "requires": { + "pinkie-promise": "1.0.0" + } + }, + "code-excerpt": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", + "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", + "dev": true, + "requires": { + "convert-to-spaces": "1.0.2" + } + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "codecov": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.1.tgz", + "integrity": "sha512-0TjnXrbvcPzAkRPv/Y5D8aZju/M5adkFxShRyMMgDReB8EV9nF4XMERXs6ajgLA1di9LUFW2tgePDQd2JPWy7g==", + "dev": true, + "requires": { + "argv": "0.0.2", + "request": "2.85.0", + "urlgrey": "0.4.4" + } + }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "requires": { + "map-visit": "1.0.0", + "object-visit": "1.0.1" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "colour": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", + "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" + }, + "combined-stream": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "common-path-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-1.0.0.tgz", + "integrity": "sha1-zVL28HEuC6q5fW+XModPIvR3UsA=", + "dev": true + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "requires": { + "buffer-from": "1.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" + } + }, + "concordance": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/concordance/-/concordance-3.0.0.tgz", + "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", + "dev": true, + "requires": { + "date-time": "2.1.0", + "esutils": "2.0.2", + "fast-diff": "1.1.2", + "function-name-support": "0.2.0", + "js-string-escape": "1.0.1", + "lodash.clonedeep": "4.5.0", + "lodash.flattendeep": "4.4.0", + "lodash.merge": "4.6.1", + "md5-hex": "2.0.0", + "semver": "5.5.0", + "well-known-symbols": "1.0.0" + }, + "dependencies": { + "date-time": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", + "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", + "dev": true, + "requires": { + "time-zone": "1.0.0" + } + } + } + }, + "configstore": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", + "dev": true, + "requires": { + "dot-prop": "4.2.0", + "graceful-fs": "4.1.11", + "make-dir": "1.2.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.3.0", + "xdg-basedir": "3.0.0" + } + }, + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "dev": true + }, + "convert-to-spaces": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz", + "integrity": "sha1-fj5Iu+bZl7FBfdyihoIEtNPYVxU=", + "dev": true + }, + "cookiejar": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz", + "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=", + "dev": true + }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + }, + "core-assert": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/core-assert/-/core-assert-0.2.1.tgz", + "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", + "dev": true, + "requires": { + "buf-compare": "1.0.1", + "is-error": "2.2.1" + } + }, + "core-js": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz", + "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "create-error-class": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", + "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "requires": { + "capture-stack-trace": "1.0.0" + } + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.2", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + }, + "cryptiles": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", + "requires": { + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", + "requires": { + "hoek": "4.2.1" + } + } + } + }, + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", + "dev": true + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { + "array-find-index": "1.0.2" + } + }, + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "dev": true, + "requires": { + "es5-ext": "0.10.42" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "1.0.0" + } + }, + "date-time": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", + "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", + "dev": true + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" + }, + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, + "requires": { + "mimic-response": "1.0.0" + } + }, + "deep-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", + "dev": true + }, + "deep-extend": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", + "dev": true + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "define-properties": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", + "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "requires": { + "foreach": "2.0.5", + "object-keys": "1.0.11" + } + }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "requires": { + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + } + } + }, + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true, + "requires": { + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" + }, + "dependencies": { + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + } + } + }, + "delay": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", + "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", + "requires": { + "p-defer": "1.0.0" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, + "diff-match-patch": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz", + "integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg=" + }, + "dir-glob": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", + "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", + "requires": { + "arrify": "1.0.1", + "path-type": "3.0.0" + } + }, + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "requires": { + "esutils": "2.0.2" + } + }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + } + } + }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "domhandler": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", + "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "domutils": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } + }, + "dot-prop": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "dev": true, + "requires": { + "is-obj": "1.0.1" + } + }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", + "dev": true + }, + "duplexify": { + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", + "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", + "requires": { + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" + } + }, + "eastasianwidth": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.1.1.tgz", + "integrity": "sha1-RNZW3p2kFWlEZzNTZfsxR7hXK3w=" + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "ecdsa-sig-formatter": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz", + "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=", + "requires": { + "base64url": "2.0.0", + "safe-buffer": "5.1.2" + } + }, + "empower": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", + "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", + "requires": { + "core-js": "2.5.5", + "empower-core": "0.6.2" + } + }, + "empower-assert": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/empower-assert/-/empower-assert-1.1.0.tgz", + "integrity": "sha512-Ylck0Q6p8y/LpNzYeBccaxAPm2ZyuqBgErgZpO9KT0HuQWF0sJckBKCLmgS1/DEXEiyBi9XtYh3clZm5cAdARw==", + "dev": true, + "requires": { + "estraverse": "4.2.0" + } + }, + "empower-core": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", + "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", + "requires": { + "call-signature": "0.0.2", + "core-js": "2.5.5" + } + }, + "end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "requires": { + "once": "1.4.0" + } + }, + "ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=" + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true + }, + "equal-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/equal-length/-/equal-length-1.0.1.tgz", + "integrity": "sha1-IcoRLUirJLTh5//A5TOdMf38J0w=", + "dev": true + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "es5-ext": { + "version": "0.10.42", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz", + "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==", + "dev": true, + "requires": { + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" + } + }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-symbol": "3.1.1" + } + }, + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42" + } + }, + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" + } + }, + "escallmatch": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/escallmatch/-/escallmatch-1.5.0.tgz", + "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", + "dev": true, + "requires": { + "call-matcher": "1.0.1", + "esprima": "2.7.3" + }, + "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + } + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "escodegen": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", + "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", + "dev": true, + "requires": { + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.6.1" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true + } + } + }, + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", + "dev": true, + "requires": { + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" + } + }, + "eslint": { + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", + "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", + "dev": true, + "requires": { + "ajv": "5.5.2", + "babel-code-frame": "6.26.0", + "chalk": "2.4.1", + "concat-stream": "1.6.2", + "cross-spawn": "5.1.0", + "debug": "3.1.0", + "doctrine": "2.1.0", + "eslint-scope": "3.7.1", + "eslint-visitor-keys": "1.0.0", + "espree": "3.5.4", + "esquery": "1.0.1", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "functional-red-black-tree": "1.0.1", + "glob": "7.1.2", + "globals": "11.5.0", + "ignore": "3.3.8", + "imurmurhash": "0.1.4", + "inquirer": "3.3.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.11.0", + "json-stable-stringify-without-jsonify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.10", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "7.0.0", + "progress": "2.0.0", + "regexpp": "1.1.0", + "require-uncached": "1.0.3", + "semver": "5.5.0", + "strip-ansi": "4.0.0", + "strip-json-comments": "2.0.1", + "table": "4.0.2", + "text-table": "0.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "globals": { + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", + "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "eslint-config-prettier": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", + "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", + "dev": true, + "requires": { + "get-stdin": "5.0.1" + }, + "dependencies": { + "get-stdin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", + "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", + "dev": true + } + } + }, + "eslint-plugin-node": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz", + "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", + "dev": true, + "requires": { + "ignore": "3.3.8", + "minimatch": "3.0.4", + "resolve": "1.7.1", + "semver": "5.5.0" + }, + "dependencies": { + "resolve": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", + "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + } + } + }, + "eslint-plugin-prettier": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz", + "integrity": "sha512-floiaI4F7hRkTrFe8V2ItOK97QYrX75DjmdzmVITZoAP6Cn06oEDPQRsO6MlHEP/u2SxI3xQ52Kpjw6j5WGfeQ==", + "dev": true, + "requires": { + "fast-diff": "1.1.2", + "jest-docblock": "21.2.0" + } + }, + "eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", + "dev": true, + "requires": { + "esrecurse": "4.2.1", + "estraverse": "4.2.0" + } + }, + "eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", + "dev": true + }, + "espower": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/espower/-/espower-2.1.0.tgz", + "integrity": "sha1-zh7bPZhwKEH99ZbRy46FvcSujkg=", + "dev": true, + "requires": { + "array-find": "1.0.0", + "escallmatch": "1.5.0", + "escodegen": "1.9.1", + "escope": "3.6.0", + "espower-location-detector": "1.0.0", + "espurify": "1.7.0", + "estraverse": "4.2.0", + "source-map": "0.5.7", + "type-name": "2.0.2", + "xtend": "4.0.1" + } + }, + "espower-loader": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/espower-loader/-/espower-loader-1.2.2.tgz", + "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", + "dev": true, + "requires": { + "convert-source-map": "1.5.1", + "espower-source": "2.2.0", + "minimatch": "3.0.4", + "source-map-support": "0.4.18", + "xtend": "4.0.1" + }, + "dependencies": { + "source-map-support": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", + "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "dev": true, + "requires": { + "source-map": "0.5.7" + } + } + } + }, + "espower-location-detector": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/espower-location-detector/-/espower-location-detector-1.0.0.tgz", + "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", + "dev": true, + "requires": { + "is-url": "1.2.4", + "path-is-absolute": "1.0.1", + "source-map": "0.5.7", + "xtend": "4.0.1" + } + }, + "espower-source": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/espower-source/-/espower-source-2.2.0.tgz", + "integrity": "sha1-fgBSVa5HtcE2RIZEs/PYAtUD91I=", + "dev": true, + "requires": { + "acorn": "5.5.3", + "acorn-es7-plugin": "1.1.7", + "convert-source-map": "1.5.1", + "empower-assert": "1.1.0", + "escodegen": "1.9.1", + "espower": "2.1.0", + "estraverse": "4.2.0", + "merge-estraverse-visitors": "1.0.0", + "multi-stage-sourcemap": "0.2.1", + "path-is-absolute": "1.0.1", + "xtend": "4.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", + "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", + "dev": true + } + } + }, + "espree": { + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", + "dev": true, + "requires": { + "acorn": "5.5.3", + "acorn-jsx": "3.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", + "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", + "dev": true + } + } + }, + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "espurify": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", + "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", + "requires": { + "core-js": "2.5.5" + } + }, + "esquery": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", + "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", + "dev": true, + "requires": { + "estraverse": "4.2.0" + } + }, + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "requires": { + "estraverse": "4.2.0" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.42" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, + "requires": { + "fill-range": "2.2.3" + }, + "dependencies": { + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + } + }, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, + "external-editor": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", + "dev": true, + "requires": { + "chardet": "0.4.2", + "iconv-lite": "0.4.21", + "tmp": "0.0.33" + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + } + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", + "dev": true + }, + "fast-glob": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.1.tgz", + "integrity": "sha512-wSyW1TBK3ia5V+te0rGPXudeMHoUQW6O5Y9oATiaGhpENmEifPDlOdhpsnlj5HoG6ttIvGiY1DdCmI9X2xGMhg==", + "requires": { + "@mrmlnc/readdir-enhanced": "2.2.1", + "glob-parent": "3.1.0", + "is-glob": "4.0.0", + "merge2": "1.2.1", + "micromatch": "3.1.10" + } + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "file-entry-cache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", + "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "dev": true, + "requires": { + "flat-cache": "1.3.0", + "object-assign": "4.1.1" + } + }, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "dev": true + }, + "fill-keys": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", + "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", + "dev": true, + "requires": { + "is-object": "1.0.1", + "merge-descriptors": "1.0.1" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "find-cache-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "dev": true, + "requires": { + "commondir": "1.0.1", + "make-dir": "1.2.0", + "pkg-dir": "2.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "flat-cache": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", + "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", + "dev": true, + "requires": { + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" + } + }, + "fn-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", + "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", + "dev": true + }, + "follow-redirects": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz", + "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", + "requires": { + "debug": "3.1.0" + } + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.18" + } + }, + "formidable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", + "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", + "dev": true + }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "requires": { + "map-cache": "0.2.2" + } + }, + "from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.6" + } + }, + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz", + "integrity": "sha512-X+57O5YkDTiEQGiw8i7wYc2nQgweIekqkepI8Q3y4wVlurgBt2SuwxTeYUYMZIGpLZH3r/TsMjczCMXE5ZOt7Q==", + "dev": true, + "optional": true, + "requires": { + "nan": "2.10.0", + "node-pre-gyp": "0.9.1" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.6" + } + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "2.2.4" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.21", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, + "ignore-walk": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "minipass": { + "version": "2.2.4", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + } + }, + "minizlib": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "2.2.4" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.2.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "2.6.9", + "iconv-lite": "0.4.21", + "sax": "1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.9.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.0", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.6", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.1" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.5" + } + }, + "npm-bundled": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.1.10", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", "bundled": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true - }, - "semver": { - "version": "5.5.0", - "bundled": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true - }, - "sntp": { - "version": "2.1.0", + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "bundled": true, + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, + "semver": { + "version": "5.5.0", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "4.4.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "yallist": { + "version": "3.0.2", + "bundled": true, + "dev": true + } + } + }, + "function-name-support": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/function-name-support/-/function-name-support-0.2.0.tgz", + "integrity": "sha1-VdO/qm6v1QWlD5vIH99XVkoLsHE=", + "dev": true + }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, + "gcp-metadata": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", + "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", + "requires": { + "axios": "0.18.0", + "extend": "3.0.1", + "retry-axios": "0.3.2" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "dev": true + }, + "get-port": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", + "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", + "dev": true + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "1.0.0" + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "2.1.1" + } + } + } + }, + "glob-to-regexp": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", + "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" + }, + "global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", + "dev": true, + "requires": { + "ini": "1.3.5" + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, + "globby": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", + "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", + "requires": { + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "fast-glob": "2.2.1", + "glob": "7.1.2", + "ignore": "3.3.8", + "pify": "3.0.0", + "slash": "1.0.0" + } + }, + "google-auth-library": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.4.0.tgz", + "integrity": "sha512-vWRx6pJulK7Y5V/Xyr7MPMlx2mWfmrUVbcffZ7hpq8ElFg5S8WY6PvjMovdcr6JfuAwwpAX4R0I1XOcyWuBcUw==", + "requires": { + "axios": "0.18.0", + "gcp-metadata": "0.6.3", + "gtoken": "2.3.0", + "jws": "3.1.4", + "lodash.isstring": "4.0.1", + "lru-cache": "4.1.2", + "retry-axios": "0.3.2" + } + }, + "google-auto-auth": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", + "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", + "requires": { + "async": "2.6.0", + "gcp-metadata": "0.6.3", + "google-auth-library": "1.4.0", + "request": "2.85.0" + } + }, + "google-gax": { + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.1.tgz", + "integrity": "sha512-eP7UUkKvaHmmvCrr+rxzkIOeEKOnXmoib7/AkENDAuqlC9T2+lWlzwpthDRnitQcV8SblDMzsk73YPMPCDwPyQ==", + "requires": { + "duplexify": "3.5.4", + "extend": "3.0.1", + "globby": "8.0.1", + "google-auto-auth": "0.10.1", + "google-proto-files": "0.15.1", + "grpc": "1.11.0", + "is-stream-ended": "0.1.4", + "lodash": "4.17.10", + "protobufjs": "6.8.6", + "through2": "2.0.3" + } + }, + "google-p12-pem": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", + "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", + "requires": { + "node-forge": "0.7.5", + "pify": "3.0.0" + } + }, + "google-proto-files": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", + "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", + "requires": { + "globby": "7.1.1", + "power-assert": "1.5.0", + "protobufjs": "6.8.6" + }, + "dependencies": { + "globby": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", + "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", + "requires": { + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "glob": "7.1.2", + "ignore": "3.3.8", + "pify": "3.0.0", + "slash": "1.0.0" + } + } + } + }, + "got": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/got/-/got-8.2.0.tgz", + "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", + "dev": true, + "requires": { + "@sindresorhus/is": "0.7.0", + "cacheable-request": "2.1.4", + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "into-stream": "3.1.0", + "is-retry-allowed": "1.1.0", + "isurl": "1.0.0", + "lowercase-keys": "1.0.1", + "mimic-response": "1.0.0", + "p-cancelable": "0.3.0", + "p-timeout": "2.0.1", + "pify": "3.0.0", + "safe-buffer": "5.1.2", + "timed-out": "4.0.1", + "url-parse-lax": "3.0.0", + "url-to-options": "1.0.1" + }, + "dependencies": { + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "dev": true, + "requires": { + "prepend-http": "2.0.0" + } + } + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "growl": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", + "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", + "dev": true + }, + "grpc": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.11.0.tgz", + "integrity": "sha512-pTJjV/eatBQ6Rhc/jWNmUW9jE8fPrhcMYSWDSyf4l7ah1U3sIe4eIjqI/a3sm0zKbM5CuovV0ESrc+b04kr4Ig==", + "requires": { + "lodash": "4.17.10", + "nan": "2.10.0", + "node-pre-gyp": "0.7.0", + "protobufjs": "5.0.2" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "ajv": { + "version": "5.5.2", + "bundled": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.6" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true + }, + "assert-plus": { + "version": "1.0.0", + "bundled": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true + }, + "aws-sign2": { + "version": "0.7.0", + "bundled": true + }, + "aws4": { + "version": "1.7.0", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "4.3.1", + "bundled": true, + "requires": { + "hoek": "4.2.1" + } + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "caseless": { + "version": "0.12.0", + "bundled": true + }, + "co": { + "version": "4.6.0", + "bundled": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "combined-stream": { + "version": "1.0.6", + "bundled": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "cryptiles": { + "version": "3.1.2", + "bundled": true, + "requires": { + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", "bundled": true, "requires": { "hoek": "4.2.1" } - }, - "sshpk": { - "version": "1.14.1", - "bundled": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.0.3", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.1", - "bundled": true, - "requires": { - "debug": "2.6.9", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.3.5", - "rimraf": "2.6.2", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.4", - "bundled": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true - }, - "uuid": { - "version": "3.2.1", - "bundled": true - }, - "verror": { - "version": "1.10.0", - "bundled": true, - "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", + } + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + } + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true + }, + "extsprintf": { + "version": "1.3.0", + "bundled": true + }, + "fast-deep-equal": { + "version": "1.1.0", + "bundled": true + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "bundled": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true + }, + "form-data": { + "version": "2.3.2", + "bundled": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.18" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true + }, + "har-schema": { + "version": "2.0.0", + "bundled": true + }, + "har-validator": { + "version": "5.0.3", + "bundled": true, + "requires": { + "ajv": "5.5.2", + "har-schema": "2.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true + }, + "hawk": { + "version": "6.0.2", + "bundled": true, + "requires": { + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.1", + "sntp": "2.1.0" + } + }, + "hoek": { + "version": "4.2.1", + "bundled": true + }, + "http-signature": { + "version": "1.2.0", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.1" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.5", + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "bundled": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true + }, + "jsprim": { + "version": "1.4.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "mime-db": { + "version": "1.33.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.18", + "bundled": true, + "requires": { + "mime-db": "1.33.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "1.2.0", + "bundled": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", "bundled": true } } + }, + "ms": { + "version": "2.0.0", + "bundled": true + }, + "node-pre-gyp": { + "version": "0.7.0", + "bundled": true, + "requires": { + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.2", + "rc": "1.2.6", + "request": "2.83.0", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "2.2.1", + "tar-pack": "3.4.1" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.5" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "performance-now": { + "version": "2.1.0", + "bundled": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true + }, + "protobufjs": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", + "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=", + "requires": { + "ascli": "1.0.1", + "bytebuffer": "5.0.1", + "glob": "7.1.2", + "yargs": "3.32.0" + } + }, + "punycode": { + "version": "1.4.1", + "bundled": true + }, + "qs": { + "version": "6.5.1", + "bundled": true + }, + "rc": { + "version": "1.2.6", + "bundled": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.83.0", + "bundled": true, + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.7.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.1", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "bundled": true + }, + "semver": { + "version": "5.5.0", + "bundled": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true + }, + "sntp": { + "version": "2.1.0", + "bundled": true, + "requires": { + "hoek": "4.2.1" + } + }, + "sshpk": { + "version": "1.14.1", + "bundled": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.1", + "bundled": true, + "requires": { + "debug": "2.6.9", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.3.6", + "rimraf": "2.6.2", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.4", + "bundled": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "uuid": { + "version": "3.2.1", + "bundled": true + }, + "verror": { + "version": "1.10.0", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + } + } + }, + "gtoken": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", + "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", + "requires": { + "axios": "0.18.0", + "google-p12-pem": "1.0.2", + "jws": "3.1.4", + "mime": "2.3.1", + "pify": "3.0.0" + } + }, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + }, + "har-validator": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "requires": { + "ajv": "5.5.2", + "har-schema": "2.0.0" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-color": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", + "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=", + "dev": true + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "has-symbol-support-x": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "dev": true + }, + "has-to-string-tag-x": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", + "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "dev": true, + "requires": { + "has-symbol-support-x": "1.4.2" + } + }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "requires": { + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "requires": { + "is-buffer": "1.1.6" + } } } }, - "google-p12-pem": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", - "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", + "has-yarn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-1.0.0.tgz", + "integrity": "sha1-ieJdtgS3Jcj1l2//Ct3JIbgopac=", + "dev": true + }, + "hawk": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "requires": { + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.1", + "sntp": "2.1.0" + } + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "hoek": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" + }, + "home-or-tmp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", + "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", + "dev": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "hosted-git-info": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", + "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", + "dev": true + }, + "htmlparser2": { + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", + "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", + "dev": true, + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.4.1", + "domutils": "1.7.0", + "entities": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6" + } + }, + "http-cache-semantics": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", + "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", + "dev": true + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.1" + } + }, + "hullabaloo-config-manager": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz", + "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", + "dev": true, + "requires": { + "dot-prop": "4.2.0", + "es6-error": "4.1.1", + "graceful-fs": "4.1.11", + "indent-string": "3.2.0", + "json5": "0.5.1", + "lodash.clonedeep": "4.5.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.isequal": "4.5.0", + "lodash.merge": "4.6.1", + "md5-hex": "2.0.0", + "package-hash": "2.0.0", + "pkg-dir": "2.0.0", + "resolve-from": "3.0.0", + "safe-buffer": "5.1.2" + } + }, + "iconv-lite": { + "version": "0.4.21", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz", + "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==", + "dev": true, "requires": { - "node-forge": "0.7.5", - "pify": "3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } + "safer-buffer": "2.1.2" } }, - "google-proto-files": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", - "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", + "ignore": { + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz", + "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==" + }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", + "dev": true + }, + "import-lazy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", + "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", + "dev": true + }, + "import-local": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz", + "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", + "dev": true, "requires": { - "globby": "7.1.1", - "power-assert": "1.4.4", - "protobufjs": "6.8.4" - }, - "dependencies": { - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.2", - "ignore": "3.3.7", - "pify": "3.0.0", - "slash": "1.0.0" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" } }, - "got": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/got/-/got-8.2.0.tgz", - "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "dev": true + }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, + "ink-docstrap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", + "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", "dev": true, "requires": { - "@sindresorhus/is": "0.7.0", - "cacheable-request": "2.1.4", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "into-stream": "3.1.0", - "is-retry-allowed": "1.1.0", - "isurl": "1.0.0", - "lowercase-keys": "1.0.1", - "mimic-response": "1.0.0", - "p-cancelable": "0.3.0", - "p-timeout": "2.0.1", - "pify": "3.0.0", - "safe-buffer": "5.1.1", - "timed-out": "4.0.1", - "url-parse-lax": "3.0.0", - "url-to-options": "1.0.1" + "moment": "2.22.1", + "sanitize-html": "1.18.2" + } + }, + "inquirer": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", + "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "dev": true, + "requires": { + "ansi-escapes": "3.1.0", + "chalk": "2.4.1", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.2.0", + "figures": "2.0.0", + "lodash": "4.17.10", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rx-lite": "4.0.8", + "rx-lite-aggregates": "4.0.8", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" }, "dependencies": { - "pify": { + "ansi-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "prepend-http": { + "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "prepend-http": "2.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" } } } }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "growl": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", - "dev": true + "intelli-espower-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/intelli-espower-loader/-/intelli-espower-loader-1.0.1.tgz", + "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", + "dev": true, + "requires": { + "espower-loader": "1.2.2" + } }, - "gtoken": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", - "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", + "into-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", + "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", + "dev": true, "requires": { - "axios": "0.18.0", - "google-p12-pem": "1.0.2", - "jws": "3.1.4", - "mime": "2.3.1", - "pify": "3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } + "from2": "2.3.0", + "p-is-promise": "1.1.0" } }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "irregular-plurals": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz", + "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=", + "dev": true + }, + "is": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", + "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=" + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "3.2.2" }, "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "amdefine": "1.0.1" + "is-buffer": "1.1.6" } } } }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" - }, - "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" - } + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "binary-extensions": "1.11.0" } }, - "has-color": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", - "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "has-symbol-support-x": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", - "dev": true + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, - "has-to-string-tag-x": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", - "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "has-symbol-support-x": "1.4.2" + "builtin-modules": "1.1.1" } }, - "has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "is-ci": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", + "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } + "ci-info": "1.1.3" } }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "kind-of": "3.2.2" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "1.1.6" } } } }, - "has-yarn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-1.0.0.tgz", - "integrity": "sha1-ieJdtgS3Jcj1l2//Ct3JIbgopac=", - "dev": true - }, - "hawk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", - "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.1", - "sntp": "2.1.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } } }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", "dev": true }, - "hoek": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", - "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "is-primitive": "2.0.0" } }, - "hosted-git-info": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", - "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", + "is-error": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.1.tgz", + "integrity": "sha1-aEqW2EB2V3yY9M20DG0mpRI78Zw=", "dev": true }, - "htmlparser2": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", - "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", - "dev": true, - "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.1", - "domutils": "1.6.2", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.3" - } + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, - "http-cache-semantics": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", - "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", - "dev": true + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" + "number-is-nan": "1.0.1" } }, - "hullabaloo-config-manager": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz", - "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", - "dev": true, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "dot-prop": "4.2.0", - "es6-error": "4.1.1", - "graceful-fs": "4.1.11", - "indent-string": "3.2.0", - "json5": "0.5.1", - "lodash.clonedeep": "4.5.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.isequal": "4.5.0", - "lodash.merge": "4.6.0", - "md5-hex": "2.0.0", - "package-hash": "2.0.0", - "pkg-dir": "2.0.0", - "resolve-from": "3.0.0", - "safe-buffer": "5.1.1" + "number-is-nan": "1.0.1" } }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true - }, - "ignore": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", - "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==" - }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", - "dev": true - }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", + "is-generator-fn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz", + "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=", "dev": true }, - "import-local": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz", - "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", - "dev": true, + "is-glob": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", + "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" + "is-extglob": "2.1.1" } }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true + "is-installed-globally": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", + "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", + "dev": true, + "requires": { + "global-dirs": "0.1.1", + "is-path-inside": "1.0.1" + } }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "is-npm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", + "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", "dev": true }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } } }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "is-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", "dev": true }, - "ink-docstrap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", - "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", + "is-observable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", + "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", "dev": true, "requires": { - "moment": "2.20.1", - "sanitize-html": "1.16.3" + "symbol-observable": "1.2.0" } }, - "inquirer": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", - "dev": true, + "is-odd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", + "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", "requires": { - "ansi-escapes": "3.0.0", - "chalk": "2.3.0", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.1.0", - "figures": "2.0.0", - "lodash": "4.17.4", - "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx-lite": "4.0.8", - "rx-lite-aggregates": "4.0.8", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" + "is-number": "4.0.0" }, "dependencies": { - "ansi-escapes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", - "dev": true - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { + "is-number": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" } } }, - "intelli-espower-loader": { + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/intelli-espower-loader/-/intelli-espower-loader-1.0.1.tgz", - "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", + "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "espower-loader": "1.2.2" + "is-path-inside": "1.0.1" } }, - "into-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", - "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "from2": "2.3.0", - "p-is-promise": "1.1.0" + "path-is-inside": "1.0.2" } }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "dev": true + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { - "loose-envify": "1.3.1" + "isobject": "3.0.1" } }, - "invert-kv": { + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "dev": true + }, + "is-redirect": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", + "dev": true }, - "irregular-plurals": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz", - "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=", + "is-resolvable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", + "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", + "dev": true + }, + "is-retry-allowed": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", + "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, + "is-stream-ended": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", + "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-url": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", + "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "is": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", - "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=" + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "isurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", + "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "dev": true, "requires": { - "kind-of": "3.2.2" + "has-to-string-tag-x": "1.4.1", + "is-object": "1.0.1" } }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "jest-docblock": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", + "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", "dev": true }, - "is-binary-path": { + "js-string-escape": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "1.11.0" - } + "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", + "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", + "dev": true }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "js-yaml": { + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz", + "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "argparse": "1.0.10", + "esprima": "4.0.0" } }, - "is-ci": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", - "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "js2xmlparser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", + "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", "dev": true, "requires": { - "ci-info": "1.1.3" + "xmlcreate": "1.0.2" } }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "3.2.2" - } + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "jsdoc": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", + "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", + "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "babylon": "7.0.0-beta.19", + "bluebird": "3.5.1", + "catharsis": "0.8.9", + "escape-string-regexp": "1.0.5", + "js2xmlparser": "3.0.0", + "klaw": "2.0.0", + "marked": "0.3.19", + "mkdirp": "0.5.1", + "requizzle": "0.2.1", + "strip-json-comments": "2.0.1", + "taffydb": "2.6.2", + "underscore": "1.8.3" }, "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + "babylon": { + "version": "7.0.0-beta.19", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", + "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", + "dev": true } } }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "2.0.0" - } + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "dev": true }, - "is-error": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.1.tgz", - "integrity": "sha1-aEqW2EB2V3yY9M20DG0mpRI78Zw=", + "json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "1.0.1" - } + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, - "is-generator-fn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz", - "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=", + "json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "graceful-fs": "4.1.11" } }, - "is-installed-globally": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", - "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", - "dev": true, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", "requires": { - "global-dirs": "0.1.1", - "is-path-inside": "1.0.1" + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" } }, - "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", + "just-extend": { + "version": "1.1.27", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", + "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==", "dev": true }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, + "jwa": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz", + "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=", "requires": { - "kind-of": "3.2.2" + "base64url": "2.0.0", + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.9", + "safe-buffer": "5.1.2" } }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true - }, - "is-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", - "dev": true + "jws": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz", + "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=", + "requires": { + "base64url": "2.0.0", + "jwa": "1.1.5", + "safe-buffer": "5.1.2" + } }, - "is-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", - "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", + "keyv": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", + "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", "dev": true, "requires": { - "symbol-observable": "1.2.0" + "json-buffer": "3.0.0" } }, - "is-odd": { + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + }, + "klaw": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", - "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", + "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", + "dev": true, "requires": { - "is-number": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" - } + "graceful-fs": "4.1.11" } }, - "is-path-cwd": { + "last-line-stream": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true + "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz", + "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", + "dev": true, + "requires": { + "through2": "2.0.3" + } }, - "is-path-in-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", - "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "latest-version": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", + "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "dev": true, "requires": { - "is-path-inside": "1.0.1" + "package-json": "4.0.1" } }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "path-is-inside": "1.0.2" + "invert-kv": "1.0.0" } }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, "requires": { - "isobject": "3.0.1" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" }, "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true } } }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { + "locate-path": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + } + }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" + }, + "lodash.chunk": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", + "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", + "lodash.clonedeepwith": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz", + "integrity": "sha1-buMFc6A6GmDWcKYu8zwQzxr9vdQ=", "dev": true }, - "is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, - "is-resolvable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz", - "integrity": "sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==", + "lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", "dev": true }, - "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", + "lodash.escaperegexp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", + "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=", "dev": true }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", "dev": true }, - "is-stream-ended": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.3.tgz", - "integrity": "sha1-oEc7Jnx1ZjVIa+7cfjNE5UnRUqw=" + "lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", + "dev": true }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true }, - "is-url": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz", - "integrity": "sha1-SYkFpZO/R8wtnn9zg3K792lsfyY=", + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", "dev": true }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", "dev": true }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "lodash.merge": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", + "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==" }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "lodash.mergewith": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", + "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", "dev": true }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" }, - "isurl": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", - "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", - "dev": true, - "requires": { - "has-to-string-tag-x": "1.4.1", - "is-object": "1.0.1" - } + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" }, - "jest-docblock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", + "lolex": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", + "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==", "dev": true }, - "js-string-escape": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", - "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", - "dev": true + "long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", "dev": true }, - "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "argparse": "1.0.9", - "esprima": "4.0.0" + "js-tokens": "3.0.2" } }, - "js2xmlparser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", - "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "xmlcreate": "1.0.2" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true }, - "jsdoc": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", - "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", - "dev": true, + "lru-cache": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", + "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", "requires": { - "babylon": "7.0.0-beta.19", - "bluebird": "3.5.1", - "catharsis": "0.8.9", - "escape-string-regexp": "1.0.5", - "js2xmlparser": "3.0.0", - "klaw": "2.0.0", - "marked": "0.3.9", - "mkdirp": "0.5.1", - "requizzle": "0.2.1", - "strip-json-comments": "2.0.1", - "taffydb": "2.6.2", - "underscore": "1.8.3" - }, - "dependencies": { - "babylon": { - "version": "7.0.0-beta.19", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", - "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", - "dev": true - } + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true + "make-dir": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz", + "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", + "dev": true, + "requires": { + "pify": "3.0.0" + } }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "requires": { + "object-visit": "1.0.1" + } }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + "marked": { + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz", + "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==", + "dev": true }, - "json-stable-stringify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", - "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "matcher": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.0.tgz", + "integrity": "sha512-aZGv6JBTHqfqAd09jmAlbKnAICTfIvb5Z8gXVxPB5WZtFfHMaAMdACL7tQflD2V+6/8KNcY8s6DYtWLgpJP5lA==", "dev": true, "requires": { - "jsonify": "0.0.0" + "escape-string-regexp": "1.0.5" } }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "md5-hex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", + "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", + "dev": true, + "requires": { + "md5-o-matic": "0.1.1" + } }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "md5-o-matic": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", "dev": true }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "mimic-fn": "1.2.0" } }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + } } }, - "just-extend": { - "version": "1.1.27", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", - "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==", + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "dev": true }, - "jwa": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz", - "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=", - "requires": { - "base64url": "2.0.0", - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.9", - "safe-buffer": "5.1.1" - } - }, - "jws": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz", - "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=", - "requires": { - "base64url": "2.0.0", - "jwa": "1.1.5", - "safe-buffer": "5.1.1" - } - }, - "keyv": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", - "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", - "dev": true, - "requires": { - "json-buffer": "3.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "1.1.6" - } - }, - "klaw": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", - "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11" - } - }, - "last-line-stream": { + "merge-estraverse-visitors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz", - "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", + "resolved": "https://registry.npmjs.org/merge-estraverse-visitors/-/merge-estraverse-visitors-1.0.0.tgz", + "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", "dev": true, "requires": { - "through2": "2.0.3" + "estraverse": "4.2.0" } }, - "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", - "dev": true, - "requires": { - "package-json": "4.0.1" - } + "merge2": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", + "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==" }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true + "methmeth": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz", + "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "requires": { - "invert-kv": "1.0.0" - } + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - } + "mime": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", + "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==" }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, + "mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + }, + "mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "mime-db": "1.33.0" } }, - "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" - }, - "lodash.chunk": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", - "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.clonedeepwith": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz", - "integrity": "sha1-buMFc6A6GmDWcKYu8zwQzxr9vdQ=", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, - "lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", - "dev": true - }, - "lodash.escaperegexp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", - "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=", - "dev": true - }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", - "dev": true - }, - "lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", - "dev": true - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" - }, - "lodash.merge": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", - "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=" - }, - "lodash.mergewith": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz", - "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=", + "mimic-response": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz", + "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=", "dev": true }, - "lodash.snakecase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", - "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" - }, - "log-driver": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz", - "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=" + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.11" + } }, - "lolex": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", - "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==", + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "mixin-deep": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "requires": { + "for-in": "1.0.2", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "2.0.4" + } + } + } }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "minimist": "0.0.8" } }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "mocha": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz", + "integrity": "sha512-kKKs/H1KrMMQIEsWNxGmb4/BGsmj0dkeyotEvbrAuQ01FcWRLssUNXCEUZk6SZtyJBi6EE7SL0zDDtItw1rGhw==", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "browser-stdout": "1.3.1", + "commander": "2.11.0", + "debug": "3.1.0", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.3", + "he": "1.1.1", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "supports-color": "4.4.0" + }, + "dependencies": { + "supports-color": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", + "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } } }, - "lowercase-keys": { + "modelo": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz", + "integrity": "sha512-9DITV2YEMcw7XojdfvGl3gDD8J9QjZTJ7ZOUuSAkP+F3T6rDbzMJuPktxptsdHYEvZcmXrCD3LMOhdSAEq6zKA==" + }, + "module-not-found-error": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", + "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=", "dev": true }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", - "dev": true, - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } + "moment": { + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", + "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==", + "dev": true }, - "make-dir": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz", - "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "multi-stage-sourcemap": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz", + "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "pify": "3.0.0" + "source-map": "0.1.43" }, "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } } } }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + "multimatch": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", + "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" + } }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, - "map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "nan": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" + }, + "nanomatch": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "requires": { - "object-visit": "1.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, - "marked": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz", - "integrity": "sha512-nW5u0dxpXxHfkHzzrveY45gCbi+R4PaO4WRZYqZNl+vB0hVGeqlFn0aOg1c8AKL63TrNFn9Bm2UP4AdiZ9TPLw==", + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, - "matcher": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.0.tgz", - "integrity": "sha512-aZGv6JBTHqfqAd09jmAlbKnAICTfIvb5Z8gXVxPB5WZtFfHMaAMdACL7tQflD2V+6/8KNcY8s6DYtWLgpJP5lA==", + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "dev": true + }, + "nise": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz", + "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "@sinonjs/formatio": "2.0.0", + "just-extend": "1.1.27", + "lolex": "2.3.2", + "path-to-regexp": "1.7.0", + "text-encoding": "0.6.4" } }, - "md5-hex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", - "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", + "node-forge": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", + "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==" + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, - "md5-o-matic": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", - "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", - "dev": true + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "normalize-url": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", + "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", "dev": true, "requires": { - "mimic-fn": "1.1.0" + "prepend-http": "2.0.0", + "query-string": "5.1.1", + "sort-keys": "2.0.0" + }, + "dependencies": { + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + } } }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "path-key": "2.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "nyc": { + "version": "11.7.1", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.7.1.tgz", + "integrity": "sha512-EGePURSKUEpS1jWnEKAMhY+GWZzi7JC+f8iBDOATaOsLZW5hM/9eYx2dHGaEXa1ITvMm44CJugMksvP3NwMQMw==", + "dev": true, + "requires": { + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.2.0", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.10.1", + "istanbul-lib-report": "1.1.3", + "istanbul-lib-source-maps": "1.2.3", + "istanbul-reports": "1.4.0", + "md5-hex": "1.3.0", + "merge-source-map": "1.1.0", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.2.1", + "yargs": "11.1.0", + "yargs-parser": "8.1.0" }, "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "align-text": { + "version": "0.1.4", + "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "amdefine": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "bundled": true, + "dev": true + }, + "append-transform": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "archy": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "arr-diff": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "arrify": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "assign-symbols": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "async": { + "version": "1.5.2", + "bundled": true, + "dev": true + }, + "atob": { + "version": "2.1.0", + "bundled": true, + "dev": true + }, + "babel-code-frame": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-generator": { + "version": "6.26.1", + "bundled": true, + "dev": true, + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.5", + "source-map": "0.5.7", + "trim-right": "1.0.1" + } + }, + "babel-messages": { + "version": "6.23.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "core-js": "2.5.5", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.5" + } + }, + "babel-traverse": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.5" + } + }, + "babel-types": { + "version": "6.26.0", + "bundled": true, + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.5", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "bundled": true, + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "base": { + "version": "0.11.2", + "bundled": true, + "dev": true, + "requires": { + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "bundled": true, + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "builtin-modules": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "cache-base": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } } }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "caching-transform": { + "version": "1.0.1", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "camelcase": { + "version": "1.2.1", + "bundled": true, + "dev": true, + "optional": true }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "center-align": { + "version": "0.1.3", + "bundled": true, "dev": true, + "optional": true, "requires": { - "pinkie-promise": "2.0.1" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "chalk": { + "version": "1.1.3", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "class-utils": { + "version": "0.3.6", + "bundled": true, "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } } }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "cliui": { + "version": "2.1.0", + "bundled": true, "dev": true, + "optional": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "bundled": true, + "dev": true, + "optional": true + } } }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "collection-visit": { + "version": "1.0.0", + "bundled": true, "dev": true, "requires": { - "is-utf8": "0.2.1" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } - } - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "merge-estraverse-visitors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/merge-estraverse-visitors/-/merge-estraverse-visitors-1.0.0.tgz", - "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "merge2": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", - "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==" - }, - "methmeth": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz", - "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - } - }, - "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==" - }, - "mime-db": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=" - }, - "mime-types": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", - "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", - "requires": { - "mime-db": "1.30.0" - } - }, - "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", - "dev": true - }, - "mimic-response": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz", - "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { + }, + "commondir": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "mocha": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.0.1.tgz", - "integrity": "sha512-SpwyojlnE/WRBNGtvJSNfllfm5PqEDFxcWluSIgLeSBJtXG4DmoX2NNAeEA7rP5kK+79VgtVq8nG6HskaL1ykg==", - "dev": true, - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.11.0", - "debug": "3.1.0", - "diff": "3.3.1", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.3", - "he": "1.1.1", - "mkdirp": "0.5.1", - "supports-color": "4.4.0" - }, - "dependencies": { - "diff": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", - "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", + "bundled": true, "dev": true }, - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "component-emitter": { + "version": "1.2.1", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "convert-source-map": { + "version": "1.5.1", + "bundled": true, + "dev": true + }, + "copy-descriptor": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "core-js": { + "version": "2.5.5", + "bundled": true, + "dev": true + }, + "cross-spawn": { + "version": "4.0.2", + "bundled": true, "dev": true, "requires": { - "has-flag": "2.0.0" + "lru-cache": "4.1.2", + "which": "1.3.0" } - } - } - }, - "modelo": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz", - "integrity": "sha512-9DITV2YEMcw7XojdfvGl3gDD8J9QjZTJ7ZOUuSAkP+F3T6rDbzMJuPktxptsdHYEvZcmXrCD3LMOhdSAEq6zKA==" - }, - "module-not-found-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", - "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=", - "dev": true - }, - "moment": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz", - "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==", - "dev": true - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "multi-stage-sourcemap": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz", - "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", - "dev": true, - "requires": { - "source-map": "0.1.43" - }, - "dependencies": { - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + }, + "debug": { + "version": "2.6.9", + "bundled": true, "dev": true, "requires": { - "amdefine": "1.0.1" + "ms": "2.0.0" } - } - } - }, - "multimatch": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", - "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-union": "1.0.2", - "arrify": "1.0.1", - "minimatch": "3.0.4" - } - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" - }, - "nanomatch": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", - "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + "debug-log": { + "version": "1.0.1", + "bundled": true, + "dev": true }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } - } - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "nise": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz", - "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==", - "dev": true, - "requires": { - "@sinonjs/formatio": "2.0.0", - "just-extend": "1.1.27", - "lolex": "2.3.2", - "path-to-regexp": "1.7.0", - "text-encoding": "0.6.4" - } - }, - "node-forge": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", - "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==" - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.3" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, - "normalize-url": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", - "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", - "dev": true, - "requires": { - "prepend-http": "2.0.0", - "query-string": "5.1.1", - "sort-keys": "2.0.0" - }, - "dependencies": { - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "decamelize": { + "version": "1.2.0", + "bundled": true, "dev": true - } - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "2.0.1" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "nyc": { - "version": "11.4.1", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", - "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", - "dev": true, - "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-report": "1.1.2", - "istanbul-lib-source-maps": "1.2.2", - "istanbul-reports": "1.1.3", - "md5-hex": "1.3.0", - "merge-source-map": "1.0.4", - "micromatch": "2.3.11", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.1.1", - "yargs": "10.0.3", - "yargs-parser": "8.0.0" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + }, + "decode-uri-component": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, + "default-require-extensions": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "strip-bom": "2.0.0" + } + }, + "define-property": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, + "detect-indent": { + "version": "4.0.0", + "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "repeating": "2.0.1" } }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true + "error-ex": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "escape-string-regexp": { + "version": "1.0.5", + "bundled": true, "dev": true }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "esutils": { + "version": "2.0.2", + "bundled": true, "dev": true }, - "append-transform": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", - "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", + "execa": { + "version": "0.7.0", + "bundled": true, "dev": true, "requires": { - "default-require-extensions": "1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "4.1.2", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } } }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", - "dev": true - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "expand-brackets": { + "version": "0.1.5", + "bundled": true, "dev": true, "requires": { - "arr-flatten": "1.1.0" + "is-posix-bracket": "0.1.1" } }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true + "expand-range": { + "version": "1.8.2", + "bundled": true, + "dev": true, + "requires": { + "fill-range": "2.2.3" + } }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true + "extend-shallow": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "extglob": { + "version": "0.3.2", + "bundled": true, "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "is-extglob": "1.0.0" } }, - "babel-generator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", - "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", + "filename-regex": { + "version": "2.0.1", + "bundled": true, + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "bundled": true, "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "find-cache-dir": { + "version": "0.1.1", + "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0" + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" } }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "find-up": { + "version": "2.1.0", + "bundled": true, "dev": true, "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" + "locate-path": "2.0.0" } }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "for-in": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "for-own": { + "version": "0.1.5", + "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" + "for-in": "1.0.2" } }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "foreground-child": { + "version": "1.5.6", + "bundled": true, "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" } }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "fragment-cache": { + "version": "0.2.1", + "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "map-cache": "0.2.2" } }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "fs.realpath": { + "version": "1.0.0", + "bundled": true, "dev": true }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "get-caller-file": { + "version": "1.0.2", + "bundled": true, "dev": true }, - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "get-stream": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "get-value": { + "version": "2.0.6", + "bundled": true, + "dev": true + }, + "glob": { + "version": "7.1.2", + "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "glob-base": { + "version": "0.3.0", + "bundled": true, "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "glob-parent": "2.0.0", + "is-glob": "2.0.1" } }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "glob-parent": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "globals": { + "version": "9.18.0", + "bundled": true, "dev": true }, - "caching-transform": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", - "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", + "graceful-fs": { + "version": "4.1.11", + "bundled": true, + "dev": true + }, + "handlebars": { + "version": "4.0.11", + "bundled": true, "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } } }, - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "has-ansi": { + "version": "2.0.0", + "bundled": true, "dev": true, - "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "ansi-regex": "2.1.1" } }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "has-flag": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "has-value": { + "version": "1.0.0", + "bundled": true, "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } } }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "has-values": { + "version": "1.0.0", + "bundled": true, "dev": true, - "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "is-number": { + "version": "3.0.0", + "bundled": true, "dev": true, - "optional": true + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } } } }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "hosted-git-info": { + "version": "2.6.0", + "bundled": true, "dev": true }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "imurmurhash": { + "version": "0.1.4", + "bundled": true, "dev": true }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } }, - "core-js": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", + "inherits": { + "version": "2.0.3", + "bundled": true, "dev": true }, - "cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "invariant": { + "version": "2.2.4", + "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" + "loose-envify": "1.3.1" } }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "invert-kv": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "bundled": true, "dev": true, "requires": { - "ms": "2.0.0" + "kind-of": "3.2.2" } }, - "debug-log": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", - "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", + "is-arrayish": { + "version": "0.2.1", + "bundled": true, "dev": true }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "is-buffer": { + "version": "1.1.6", + "bundled": true, "dev": true }, - "default-require-extensions": { + "is-builtin-module": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", - "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", - "dev": true, - "requires": { - "strip-bom": "2.0.0" - } - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "bundled": true, "dev": true, "requires": { - "repeating": "2.0.1" + "builtin-modules": "1.1.1" } }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "is-data-descriptor": { + "version": "0.1.4", + "bundled": true, "dev": true, "requires": { - "is-arrayish": "0.2.1" + "kind-of": "3.2.2" } }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "is-descriptor": { + "version": "0.1.6", + "bundled": true, "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { - "cross-spawn": { + "kind-of": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" - } + "bundled": true, + "dev": true } } }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } + "is-dotfile": { + "version": "1.0.3", + "bundled": true, + "dev": true }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "is-equal-shallow": { + "version": "0.1.3", + "bundled": true, "dev": true, "requires": { - "fill-range": "2.2.3" + "is-primitive": "2.0.0" } }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } + "is-extendable": { + "version": "0.1.1", + "bundled": true, + "dev": true }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "is-extglob": { + "version": "1.0.0", + "bundled": true, "dev": true }, - "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", - "dev": true, - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-finite": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" } }, - "find-cache-dir": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", - "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "bundled": true, "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "is-extglob": "1.0.0" } }, - "find-up": { + "is-number": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "bundled": true, "dev": true, "requires": { - "locate-path": "2.0.0" + "kind-of": "3.2.2" } }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "is-odd": { + "version": "2.0.0", + "bundled": true, "dev": true, "requires": { - "for-in": "1.0.2" + "is-number": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "bundled": true, + "dev": true + } } }, - "foreground-child": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", - "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", + "is-plain-object": { + "version": "2.0.4", + "bundled": true, "dev": true, "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } } }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "is-posix-bracket": { + "version": "0.1.1", + "bundled": true, "dev": true }, - "get-caller-file": { + "is-primitive": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "is-windows": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "bundled": true, "dev": true }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "isarray": { + "version": "1.0.0", + "bundled": true, "dev": true }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "isexe": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "isobject": { + "version": "2.1.0", + "bundled": true, "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "isarray": "1.0.0" } }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "istanbul-lib-coverage": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.1.0", + "bundled": true, "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "append-transform": "0.4.0" } }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "istanbul-lib-instrument": { + "version": "1.10.1", + "bundled": true, "dev": true, "requires": { - "is-glob": "2.0.1" + "babel-generator": "6.26.1", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.2.0", + "semver": "5.5.0" } }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true + "istanbul-lib-report": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" + }, + "dependencies": { + "supports-color": { + "version": "3.2.3", + "bundled": true, + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "istanbul-lib-source-maps": { + "version": "1.2.3", + "bundled": true, "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "debug": "3.1.0", + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" }, "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "debug": { + "version": "3.1.0", + "bundled": true, "dev": true, "requires": { - "amdefine": "1.0.1" + "ms": "2.0.0" } } } }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "istanbul-reports": { + "version": "1.4.0", + "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "handlebars": "4.0.11" } }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "js-tokens": { + "version": "3.0.2", + "bundled": true, "dev": true }, - "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "jsesc": { + "version": "1.3.0", + "bundled": true, "dev": true }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "lazy-cache": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "lcid": { + "version": "1.0.0", + "bundled": true, "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "invert-kv": "1.0.0" } }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "load-json-file": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } }, - "invariant": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "locate-path": { + "version": "2.0.0", + "bundled": true, "dev": true, "requires": { - "loose-envify": "1.3.1" + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + } } }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "lodash": { + "version": "4.17.5", + "bundled": true, "dev": true }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "longest": { + "version": "1.0.1", + "bundled": true, "dev": true }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "loose-envify": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "lru-cache": { + "version": "4.1.2", + "bundled": true, + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "map-cache": { + "version": "0.2.2", + "bundled": true, "dev": true }, - "is-builtin-module": { + "map-visit": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "bundled": true, "dev": true, "requires": { - "builtin-modules": "1.1.1" + "object-visit": "1.0.1" } }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "md5-hex": { + "version": "1.3.0", + "bundled": true, "dev": true, "requires": { - "is-primitive": "2.0.0" + "md5-o-matic": "0.1.1" } }, - "is-extendable": { + "md5-o-matic": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "bundled": true, "dev": true }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "mem": { + "version": "1.1.0", + "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "mimic-fn": "1.2.0" } }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "merge-source-map": { + "version": "1.1.0", + "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "bundled": true, + "dev": true + } } }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "micromatch": { + "version": "2.3.11", + "bundled": true, "dev": true, "requires": { - "is-extglob": "1.0.0" + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" } }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "mimic-fn": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "brace-expansion": "1.1.11" } }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "minimist": { + "version": "0.0.8", + "bundled": true, "dev": true }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true + "mixin-deep": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "for-in": "1.0.2", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } }, - "isexe": { + "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "bundled": true, "dev": true }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "nanomatch": { + "version": "1.2.9", + "bundled": true, "dev": true, "requires": { - "isarray": "1.0.0" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } } }, - "istanbul-lib-coverage": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", - "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", - "dev": true + "normalize-package-data": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "requires": { + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" + } }, - "istanbul-lib-hook": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", - "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==", + "normalize-path": { + "version": "2.1.1", + "bundled": true, "dev": true, "requires": { - "append-transform": "0.4.0" + "remove-trailing-separator": "1.1.0" } }, - "istanbul-lib-instrument": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", - "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", + "npm-run-path": { + "version": "2.0.2", + "bundled": true, "dev": true, "requires": { - "babel-generator": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", - "semver": "5.4.1" + "path-key": "2.0.1" } }, - "istanbul-lib-report": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz", - "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==", + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true + }, + "object-copy": { + "version": "0.1.0", + "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "define-property": { + "version": "0.2.5", + "bundled": true, "dev": true, "requires": { - "has-flag": "1.0.0" + "is-descriptor": "0.1.6" } } } }, - "istanbul-lib-source-maps": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz", - "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==", + "object-visit": { + "version": "1.0.1", + "bundled": true, "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "isobject": "3.0.1" }, "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } + } + }, + "object.omit": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "object.pick": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true } } }, - "istanbul-reports": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz", - "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==", + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "optimist": { + "version": "0.6.1", + "bundled": true, "dev": true, "requires": { - "handlebars": "4.0.11" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "os-homedir": { + "version": "1.0.2", + "bundled": true, "dev": true }, - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "os-locale": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "p-finally": { + "version": "1.0.0", + "bundled": true, "dev": true }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "p-limit": { + "version": "1.2.0", + "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "p-try": "1.0.0" } }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "p-locate": { + "version": "2.0.0", + "bundled": true, "dev": true, - "optional": true + "requires": { + "p-limit": "1.2.0" + } }, - "lcid": { + "p-try": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "bundled": true, + "dev": true + }, + "parse-glob": { + "version": "3.0.4", + "bundled": true, "dev": true, "requires": { - "invert-kv": "1.0.0" + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" } }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "parse-json": { + "version": "2.2.0", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "error-ex": "1.3.1" } }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "pascalcase": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, + "path-exists": { + "version": "2.1.0", + "bundled": true, "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - } + "pinkie-promise": "2.0.1" } }, - "lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, "dev": true }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "path-key": { + "version": "2.0.1", + "bundled": true, "dev": true }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "path-parse": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, + "path-type": { + "version": "1.1.0", + "bundled": true, "dev": true, "requires": { - "js-tokens": "3.0.2" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, - "lru-cache": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "pify": { + "version": "2.3.0", + "bundled": true, + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "bundled": true, + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "bundled": true, "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pinkie": "2.0.4" } }, - "md5-hex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", - "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", + "pkg-dir": { + "version": "1.0.0", + "bundled": true, "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "find-up": "1.1.2" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } } }, - "md5-o-matic": { + "posix-character-classes": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", - "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", + "bundled": true, "dev": true }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "preserve": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "randomatic": { + "version": "1.1.7", + "bundled": true, "dev": true, "requires": { - "mimic-fn": "1.1.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } } }, - "merge-source-map": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", - "integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=", + "read-pkg": { + "version": "1.1.0", + "bundled": true, "dev": true, "requires": { - "source-map": "0.5.7" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "read-pkg-up": { + "version": "1.0.1", + "bundled": true, "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + } + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "bundled": true, + "dev": true + }, + "regex-cache": { + "version": "0.4.4", + "bundled": true, + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" } }, - "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "regex-not": { + "version": "1.0.2", + "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.8" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "remove-trailing-separator": { + "version": "1.1.0", + "bundled": true, "dev": true }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "repeat-element": { + "version": "1.1.2", + "bundled": true, + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "bundled": true, + "dev": true + }, + "repeating": { + "version": "2.0.1", + "bundled": true, "dev": true, "requires": { - "minimist": "0.0.8" + "is-finite": "1.0.2" } }, - "ms": { + "require-directory": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "require-main-filename": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "resolve-from": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "bundled": true, "dev": true }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "resolve-url": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "ret": { + "version": "0.1.15", + "bundled": true, + "dev": true + }, + "right-align": { + "version": "0.1.3", + "bundled": true, "dev": true, + "optional": true, "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" + "align-text": "0.1.4" } }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "rimraf": { + "version": "2.6.2", + "bundled": true, "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "glob": "7.1.2" } }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "safe-regex": { + "version": "1.1.0", + "bundled": true, "dev": true, "requires": { - "path-key": "2.0.1" + "ret": "0.1.15" } }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "semver": { + "version": "5.5.0", + "bundled": true, "dev": true }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "set-blocking": { + "version": "2.0.0", + "bundled": true, "dev": true }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "set-value": { + "version": "2.0.0", + "bundled": true, "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "shebang-command": { + "version": "1.2.0", + "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "shebang-regex": "1.0.0" } }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" - } + "shebang-regex": { + "version": "1.0.0", + "bundled": true, + "dev": true }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "signal-exit": { + "version": "3.0.2", + "bundled": true, "dev": true }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "slide": { + "version": "1.1.6", + "bundled": true, + "dev": true + }, + "snapdragon": { + "version": "0.8.2", + "bundled": true, "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.1", + "use": "3.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-limit": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", - "dev": true + "snapdragon-node": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "snapdragon-util": { + "version": "3.0.1", + "bundled": true, "dev": true, "requires": { - "p-limit": "1.1.0" + "kind-of": "3.2.2" } }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "source-map": { + "version": "0.5.7", + "bundled": true, + "dev": true + }, + "source-map-resolve": { + "version": "0.5.1", + "bundled": true, "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "atob": "2.1.0", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "source-map-url": { + "version": "0.4.0", + "bundled": true, + "dev": true + }, + "spawn-wrap": { + "version": "1.4.2", + "bundled": true, "dev": true, "requires": { - "error-ex": "1.3.1" + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" } }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "spdx-correct": { + "version": "3.0.0", + "bundled": true, "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "spdx-exceptions": { + "version": "2.1.0", + "bundled": true, "dev": true }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "spdx-expression-parse": { + "version": "3.0.0", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" } }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "spdx-license-ids": { + "version": "3.0.0", + "bundled": true, "dev": true }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true + "split-string": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "extend-shallow": "3.0.2" + } }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "static-extend": { + "version": "0.1.2", + "bundled": true, "dev": true, "requires": { - "pinkie": "2.0.4" + "define-property": "0.2.5", + "object-copy": "0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + } } }, - "pkg-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", - "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", + "string-width": { + "version": "2.1.1", + "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "ansi-regex": "3.0.0" } } } }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "bundled": true, "dev": true }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "supports-color": { + "version": "2.0.0", + "bundled": true, "dev": true }, - "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "test-exclude": { + "version": "4.2.1", + "bundled": true, "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "arrify": "1.0.1", + "micromatch": "3.1.10", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" }, "dependencies": { + "arr-diff": { + "version": "4.0.0", + "bundled": true, + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "bundled": true, + "dev": true + }, + "braces": { + "version": "2.3.2", + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "expand-brackets": { + "version": "2.1.4", + "bundled": true, + "dev": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "bundled": true, + "dev": true + } + } + }, + "extglob": { + "version": "2.0.4", + "bundled": true, + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, "is-number": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "bundled": true, "dev": true, "requires": { "kind-of": "3.2.2" @@ -8157,8 +10520,7 @@ "dependencies": { "kind-of": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "bundled": true, "dev": true, "requires": { "is-buffer": "1.1.6" @@ -8166,301 +10528,89 @@ } } }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + }, "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "version": "6.0.2", + "bundled": true, + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } } } }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "0.1.3" - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "1.0.2" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "resolve-from": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=", - "dev": true - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "to-fast-properties": { + "version": "1.0.3", + "bundled": true, "dev": true }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "to-object-path": { + "version": "0.3.0", + "bundled": true, "dev": true, "requires": { - "shebang-regex": "1.0.0" + "kind-of": "3.2.2" } }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "signal-exit": { + "to-regex": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "slide": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "spawn-wrap": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", - "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==", - "dev": true, - "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.0" - } - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "bundled": true, "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", - "dev": true - }, - "string-width": { + "to-regex-range": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-number": "3.0.0", + "repeat-string": "1.6.1" }, "dependencies": { - "ansi-regex": { + "is-number": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "bundled": true, "dev": true, "requires": { - "ansi-regex": "3.0.0" + "kind-of": "3.2.2" } } } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "test-exclude": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz", - "integrity": "sha512-35+Asrsk3XHJDBgf/VRFexPgh3UyETv8IAn/LRTiZjVy6rjPVqdEk8dJcJYBzl1w0XCJM48lvTy8SfEsCWS4nA==", - "dev": true, - "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" - } - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, "trim-right": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "bundled": true, "dev": true }, "uglify-js": { "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -8471,8 +10621,7 @@ "dependencies": { "yargs": { "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "bundled": true, "dev": true, "optional": true, "requires": { @@ -8486,25 +10635,115 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "bundled": true, "dev": true, "optional": true }, + "union-value": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "set-value": { + "version": "0.4.3", + "bundled": true, + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" + } + } + } + }, + "unset-value": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "has-value": "0.3.1", + "isobject": "3.0.1" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "bundled": true, + "dev": true, + "requires": { + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "bundled": true, + "dev": true + }, + "isobject": { + "version": "3.0.1", + "bundled": true, + "dev": true + } + } + }, + "urix": { + "version": "0.1.0", + "bundled": true, + "dev": true + }, + "use": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "version": "3.0.3", + "bundled": true, "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "which": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "bundled": true, "dev": true, "requires": { "isexe": "2.0.0" @@ -8512,37 +10751,40 @@ }, "which-module": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "bundled": true, "dev": true }, "window-size": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "bundled": true, "dev": true, "optional": true }, "wordwrap": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "bundled": true, "dev": true }, "wrap-ansi": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "bundled": true, "dev": true, "requires": { "string-width": "1.0.2", "strip-ansi": "3.0.1" }, "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "dev": true, "requires": { "code-point-at": "1.1.0", @@ -8554,14 +10796,12 @@ }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "bundled": true, "dev": true }, "write-file-atomic": { "version": "1.3.4", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", - "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", + "bundled": true, "dev": true, "requires": { "graceful-fs": "4.1.11", @@ -8571,23 +10811,20 @@ }, "y18n": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "bundled": true, "dev": true }, "yallist": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "bundled": true, "dev": true }, "yargs": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz", - "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==", + "version": "11.1.0", + "bundled": true, "dev": true, "requires": { - "cliui": "3.2.0", + "cliui": "4.0.0", "decamelize": "1.2.0", "find-up": "2.1.0", "get-caller-file": "1.0.2", @@ -8598,39 +10835,50 @@ "string-width": "2.1.1", "which-module": "2.0.0", "y18n": "3.2.1", - "yargs-parser": "8.0.0" + "yargs-parser": "9.0.2" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "camelcase": { + "version": "4.1.0", + "bundled": true, + "dev": true + }, "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "version": "4.0.0", + "bundled": true, "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } + } + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "yargs-parser": { + "version": "9.0.2", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "4.1.0" } } } }, "yargs-parser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz", - "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=", + "version": "8.1.0", + "bundled": true, "dev": true, "requires": { "camelcase": "4.1.0" @@ -8638,8 +10886,7 @@ "dependencies": { "camelcase": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "bundled": true, "dev": true } } @@ -8674,6 +10921,14 @@ "requires": { "is-descriptor": "0.1.6" } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } } } }, @@ -8688,13 +10943,6 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "object.omit": { @@ -8713,13 +10961,6 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - } } }, "observable-to-promise": { @@ -8765,7 +11006,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "1.2.0" } }, "optimist": { @@ -8908,7 +11149,7 @@ "got": "6.7.1", "registry-auth-token": "3.3.2", "registry-url": "3.1.0", - "semver": "5.4.1" + "semver": "5.5.0" }, "dependencies": { "got": { @@ -8924,7 +11165,7 @@ "is-retry-allowed": "1.1.0", "is-stream": "1.1.0", "lowercase-keys": "1.0.1", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "timed-out": "4.0.1", "unzip-response": "2.0.1", "url-parse-lax": "1.0.0" @@ -8942,6 +11183,23 @@ "is-dotfile": "1.0.3", "is-extglob": "1.0.0", "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } } }, "parse-json": { @@ -9016,12 +11274,11 @@ } }, "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { - "pify": "2.3.0" + "pify": "3.0.0" } }, "performance-now": { @@ -9030,24 +11287,23 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", + "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=", "dev": true }, "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", + "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "1.0.0" } }, "pkg-conf": { @@ -9081,12 +11337,6 @@ "error-ex": "1.3.1", "json-parse-better-errors": "1.0.2" } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true } } }, @@ -9120,14 +11370,14 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz", - "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==", + "version": "6.0.22", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz", + "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", "dev": true, "requires": { - "chalk": "2.3.0", + "chalk": "2.4.1", "source-map": "0.6.1", - "supports-color": "5.1.0" + "supports-color": "5.4.0" }, "dependencies": { "source-map": { @@ -9135,22 +11385,13 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "supports-color": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", - "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } } } }, "power-assert": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.4.4.tgz", - "integrity": "sha1-kpXqdDcZb1pgH95CDwQmMRhtdRc=", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.5.0.tgz", + "integrity": "sha512-WaWSw+Ts283o6dzxW1BxIxoaHok7aSSGx4SaR6dW62Pk31ynv9DERDieuZpPYv5XaJ+H+zdcOaJQ+PvlasAOVw==", "requires": { "define-properties": "1.1.2", "empower": "1.2.3", @@ -9164,7 +11405,7 @@ "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.1.1.tgz", "integrity": "sha1-7bo1LT7YpgMRTWZyZazOYNaJzN8=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.5", "power-assert-context-traversal": "1.1.1" } }, @@ -9175,16 +11416,9 @@ "requires": { "acorn": "4.0.13", "acorn-es7-plugin": "1.1.7", - "core-js": "2.5.3", + "core-js": "2.5.5", "espurify": "1.7.0", "estraverse": "4.2.0" - }, - "dependencies": { - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" - } } }, "power-assert-context-traversal": { @@ -9192,7 +11426,7 @@ "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.1.1.tgz", "integrity": "sha1-iMq8oNE7Y1nwfT0+ivppkmRXftk=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.5", "estraverse": "4.2.0" } }, @@ -9201,7 +11435,7 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.5", "power-assert-context-formatter": "1.1.1", "power-assert-context-reducer-ast": "1.1.2", "power-assert-renderer-assertion": "1.1.1", @@ -9229,7 +11463,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.1.1.tgz", "integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.5", "diff-match-patch": "1.0.0", "power-assert-renderer-base": "1.1.1", "stringifier": "1.3.0", @@ -9241,7 +11475,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.1.2.tgz", "integrity": "sha1-ZV+PcRk1qbbVQbhjJ2VHF8Y3qYY=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.5", "power-assert-renderer-base": "1.1.1", "power-assert-util-string-width": "1.1.1", "stringifier": "1.3.0" @@ -9282,9 +11516,9 @@ "dev": true }, "prettier": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.9.2.tgz", - "integrity": "sha512-piXx9N2WT8hWb7PBbX1glAuJVIkEyUV9F5fMXFINpZ0x3otVOFKKeGmeuiclFJlP/UrgTckyV606VjH2rNK4bw==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz", + "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=", "dev": true }, "pretty-ms": { @@ -9312,9 +11546,9 @@ "dev": true }, "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "progress": { "version": "2.0.0", @@ -9323,9 +11557,9 @@ "dev": true }, "protobufjs": { - "version": "6.8.4", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.4.tgz", - "integrity": "sha512-d+WZqUDXKM+oZhr8yprAtQW07q08p9/V35AJ2J1fds+r903S/aH9P8uO1gmTwozOKugt2XCjdrre3OxuPRGkGg==", + "version": "6.8.6", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", + "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", "requires": { "@protobufjs/aspromise": "1.1.2", "@protobufjs/base64": "1.1.2", @@ -9338,8 +11572,8 @@ "@protobufjs/pool": "1.1.0", "@protobufjs/utf8": "1.1.0", "@types/long": "3.0.32", - "@types/node": "8.5.6", - "long": "3.2.0" + "@types/node": "8.10.11", + "long": "4.0.0" } }, "proxyquire": { @@ -9400,26 +11634,6 @@ "kind-of": "4.0.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", @@ -9432,12 +11646,12 @@ } }, "rc": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz", - "integrity": "sha1-6xiYnG1PTxYsOZ953dKfODVWgJI=", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", + "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", "dev": true, "requires": { - "deep-extend": "0.4.2", + "deep-extend": "0.5.1", "ini": "1.3.5", "minimist": "1.2.0", "strip-json-comments": "2.0.1" @@ -9460,6 +11674,23 @@ "load-json-file": "2.0.0", "normalize-package-data": "2.4.0", "path-type": "2.0.0" + }, + "dependencies": { + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } } }, "read-pkg-up": { @@ -9473,16 +11704,16 @@ } }, "readable-stream": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", - "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } }, @@ -9494,7 +11725,7 @@ "requires": { "graceful-fs": "4.1.11", "minimatch": "3.0.4", - "readable-stream": "2.3.3", + "readable-stream": "2.3.6", "set-immediate-shim": "1.0.1" } }, @@ -9549,6 +11780,12 @@ "safe-regex": "1.1.0" } }, + "regexpp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", + "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", + "dev": true + }, "regexpu-core": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", @@ -9566,8 +11803,8 @@ "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { - "rc": "1.2.6", - "safe-buffer": "5.1.1" + "rc": "1.2.7", + "safe-buffer": "5.1.2" } }, "registry-url": { @@ -9576,7 +11813,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "1.2.6" + "rc": "1.2.7" } }, "regjsgen": { @@ -9629,32 +11866,32 @@ } }, "request": { - "version": "2.83.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", - "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", + "version": "2.85.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", + "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", "requires": { "aws-sign2": "0.7.0", - "aws4": "1.6.0", + "aws4": "1.7.0", "caseless": "0.12.0", - "combined-stream": "1.0.5", + "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", - "form-data": "2.3.1", + "form-data": "2.3.2", "har-validator": "5.0.3", "hawk": "6.0.2", "http-signature": "1.2.0", "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "oauth-sign": "0.8.2", "performance-now": "2.1.0", "qs": "6.5.1", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "stringstream": "0.0.5", - "tough-cookie": "2.3.3", + "tough-cookie": "2.3.4", "tunnel-agent": "0.6.0", - "uuid": "3.1.0" + "uuid": "3.2.1" } }, "require-directory": { @@ -9770,7 +12007,7 @@ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz", "integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw==", "requires": { - "request": "2.83.0", + "request": "2.85.0", "through2": "2.0.3" } }, @@ -9818,9 +12055,9 @@ } }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -9830,6 +12067,12 @@ "ret": "0.1.15" } }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, "samsam": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", @@ -9837,24 +12080,27 @@ "dev": true }, "sanitize-html": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.16.3.tgz", - "integrity": "sha512-XpAJGnkMfNM7AzXLRw225blBB/pE4dM4jzRn98g4r88cfxwN6g+5IsRmCAh/gbhYGm6u6i97zsatMOM7Lr8wyw==", + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz", + "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", "dev": true, "requires": { + "chalk": "2.4.1", "htmlparser2": "3.9.2", "lodash.clonedeep": "4.5.0", "lodash.escaperegexp": "4.1.2", - "lodash.mergewith": "4.6.0", - "postcss": "6.0.15", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", + "lodash.mergewith": "4.6.1", + "postcss": "6.0.22", "srcset": "1.0.0", "xtend": "4.0.1" } }, "semver": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, "semver-diff": { @@ -9863,7 +12109,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "5.4.1" + "semver": "5.5.0" } }, "serialize-error": { @@ -9939,23 +12185,6 @@ "nise": "1.3.3", "supports-color": "5.4.0", "type-detect": "4.0.8" - }, - "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "3.0.0" - } - } } }, "slash": { @@ -10024,11 +12253,6 @@ "requires": { "is-extendable": "0.1.1" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -10075,16 +12299,6 @@ "is-data-descriptor": "1.0.0", "kind-of": "6.0.2" } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" } } }, @@ -10094,6 +12308,16 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } } }, "sntp": { @@ -10123,7 +12347,7 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", "requires": { - "atob": "2.1.0", + "atob": "2.1.1", "decode-uri-component": "0.2.0", "resolve-url": "0.2.1", "source-map-url": "0.4.0", @@ -10131,12 +12355,21 @@ } }, "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz", + "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==", "dev": true, "requires": { - "source-map": "0.5.7" + "buffer-from": "1.0.0", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "source-map-url": { @@ -10182,7 +12415,7 @@ "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=", "requires": { "async": "2.6.0", - "is-stream-ended": "0.1.3" + "is-stream-ended": "0.1.4" } }, "split-string": { @@ -10210,9 +12443,9 @@ } }, "sshpk": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", - "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", @@ -10250,9 +12483,9 @@ } }, "stream-events": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.2.tgz", - "integrity": "sha1-q/OfZsCJCk63lbyNXoWbJhW1kLI=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.4.tgz", + "integrity": "sha512-D243NJaYs/xBN2QnoiMDY7IesJFIK7gEhnvAYqJa5JvDdnh2dC4qDBwlCf0ohPpX2QRlA/4gnbnPd3rs3KxVcA==", "requires": { "stubs": "3.0.0" } @@ -10290,11 +12523,11 @@ } }, "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } }, "stringifier": { @@ -10302,7 +12535,7 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "2.5.3", + "core-js": "2.5.5", "traverse": "0.6.6", "type-name": "2.0.2" } @@ -10362,21 +12595,21 @@ "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=" }, "superagent": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz", - "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", + "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", "dev": true, "requires": { "component-emitter": "1.2.1", "cookiejar": "2.1.1", "debug": "3.1.0", "extend": "3.0.1", - "form-data": "2.3.1", + "form-data": "2.3.2", "formidable": "1.2.1", "methods": "1.1.2", "mime": "1.6.0", "qs": "6.5.1", - "readable-stream": "2.3.3" + "readable-stream": "2.3.6" }, "dependencies": { "mime": { @@ -10395,7 +12628,7 @@ "requires": { "arrify": "1.0.1", "indent-string": "3.2.0", - "js-yaml": "3.10.0", + "js-yaml": "3.11.0", "serialize-error": "2.1.0", "strip-ansi": "4.0.0" }, @@ -10424,16 +12657,24 @@ "dev": true, "requires": { "methods": "1.1.2", - "superagent": "3.8.2" + "superagent": "3.8.3" } }, "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "3.0.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + } } }, "symbol-observable": { @@ -10450,8 +12691,8 @@ "requires": { "ajv": "5.5.2", "ajv-keywords": "2.1.1", - "chalk": "2.3.0", - "lodash": "4.17.4", + "chalk": "2.4.1", + "lodash": "4.17.10", "slice-ansi": "1.0.0", "string-width": "2.1.1" }, @@ -10527,7 +12768,7 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "2.3.3", + "readable-stream": "2.3.6", "xtend": "4.0.1" } }, @@ -10564,6 +12805,16 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + } } }, "to-regex": { @@ -10584,22 +12835,12 @@ "requires": { "is-number": "3.0.0", "repeat-string": "1.6.1" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "3.2.2" - } - } } }, "tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { "punycode": "1.4.1" } @@ -10632,7 +12873,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -10863,11 +13104,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" } } }, @@ -10884,7 +13120,7 @@ "dev": true, "requires": { "boxen": "1.3.0", - "chalk": "2.3.0", + "chalk": "2.4.1", "configstore": "3.1.2", "import-lazy": "2.1.0", "is-ci": "1.1.0", @@ -10927,13 +13163,6 @@ "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - } } }, "util-deprecate": { @@ -10942,9 +13171,9 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" }, "validate-npm-package-license": { "version": "3.0.3", @@ -11093,12 +13322,6 @@ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=", "dev": true - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true } } }, From 1820c9f0d76603c2a951fa01a37cee3d034ac5f6 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 2 May 2018 15:10:30 -0700 Subject: [PATCH 0155/1115] chore: test on node10 (#125) --- handwritten/pubsub/.circleci/config.yml | 77 ++++++++----------------- 1 file changed, 24 insertions(+), 53 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 95235c1643f..29067e02695 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -19,12 +19,17 @@ workflows: filters: tags: only: /.*/ + - node10: + filters: + tags: + only: /.*/ - lint: requires: - node4 - node6 - node8 - node9 + - node10 filters: tags: only: /.*/ @@ -34,6 +39,7 @@ workflows: - node6 - node8 - node9 + - node10 filters: tags: only: /.*/ @@ -90,14 +96,18 @@ jobs: else echo "Not a nightly build, skipping this step." fi - - run: - name: Install modules and dependencies. - command: |- + - run: &npm_install_and_link + name: Install and link the module. + command: | + mkdir /home/node/.npm-global npm install repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" if ! test -x "$repo_tools"; then chmod +x "$repo_tools" fi + npm link + environment: + NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Run unit tests. command: npm test @@ -120,6 +130,11 @@ jobs: - image: 'node:9' user: node steps: *unit_tests_steps + node10: + docker: + - image: 'node:10' + user: node + steps: *unit_tests_steps lint: docker: - image: 'node:8' @@ -127,19 +142,8 @@ jobs: steps: - checkout - run: *remove_package_lock - - run: - name: Install modules and dependencies. - command: | - mkdir /home/node/.npm-global - npm install - repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" - if ! test -x "$repo_tools"; then - chmod +x "$repo_tools" - fi - npm link - environment: - NPM_CONFIG_PREFIX: /home/node/.npm-global - - run: + - run: *npm_install_and_link + - run: &samples_npm_install_and_link name: Link the module being tested to the samples. command: | cd samples/ @@ -160,14 +164,7 @@ jobs: steps: - checkout - run: *remove_package_lock - - run: - name: Install modules and dependencies. - command: |- - npm install - repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" - if ! test -x "$repo_tools"; then - chmod +x "$repo_tools" - fi + - run: *npm_install_and_link - run: name: Build documentation. command: npm run docs @@ -184,27 +181,8 @@ jobs: openssl aes-256-cbc -d -in .circleci/key.json.enc \ -out .circleci/key.json \ -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" - - run: - name: Install and link the module. - command: | - mkdir /home/node/.npm-global - npm install - repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" - if ! test -x "$repo_tools"; then - chmod +x "$repo_tools" - fi - npm link - environment: - NPM_CONFIG_PREFIX: /home/node/.npm-global - - run: - name: Link the module being tested to the samples. - command: | - cd samples/ - npm link @google-cloud/pubsub - npm install - cd .. - environment: - NPM_CONFIG_PREFIX: /home/node/.npm-global + - run: *npm_install_and_link + - run: *samples_npm_install_and_link - run: name: Run sample tests. command: npm run samples-test @@ -230,14 +208,7 @@ jobs: openssl aes-256-cbc -d -in .circleci/key.json.enc \ -out .circleci/key.json \ -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" - - run: - name: Install modules and dependencies. - command: |- - npm install - repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" - if ! test -x "$repo_tools"; then - chmod +x "$repo_tools" - fi + - run: *npm_install_and_link - run: name: Run system tests. command: npm run system-test From 32858945de05c7f2a3d782abce065161053dcc58 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Tue, 8 May 2018 14:27:31 -0700 Subject: [PATCH 0156/1115] chore: lock files maintenance (#126) * chore: lock files maintenance * chore: lock files maintenance --- handwritten/pubsub/package-lock.json | 519 ++++++--------------------- 1 file changed, 117 insertions(+), 402 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 5696581476e..24ee8946941 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -89,7 +89,7 @@ "arrify": "1.0.1", "concat-stream": "1.6.2", "create-error-class": "3.0.2", - "duplexify": "3.5.4", + "duplexify": "3.6.0", "ent": "2.2.0", "extend": "3.0.1", "google-auto-auth": "0.9.7", @@ -1956,9 +1956,9 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "8.10.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.11.tgz", - "integrity": "sha512-FM7tvbjbn2BUzM/Qsdk9LUGq3zeh7li8NcHoS398dBzqLzfmSqSP1+yKbMRTCcZzLcu2JAR5lq3IKIEYkto7iQ==" + "version": "8.10.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.12.tgz", + "integrity": "sha512-aRFUGj/f9JVA0qSQiCK9ebaa778mmqMIcy1eKnPktgfm9O6VsnIzzB5wJnjp9/jVrfm7fX1rr3OR1nndppGZUg==" }, "acorn": { "version": "4.0.13", @@ -2732,7 +2732,7 @@ "babel-generator": "6.26.1", "babylon": "6.18.0", "call-matcher": "1.0.1", - "core-js": "2.5.5", + "core-js": "2.5.6", "espower-location-detector": "1.0.0", "espurify": "1.7.0", "estraverse": "4.2.0" @@ -2879,7 +2879,7 @@ "requires": { "babel-core": "6.26.3", "babel-runtime": "6.26.0", - "core-js": "2.5.5", + "core-js": "2.5.6", "home-or-tmp": "2.0.0", "lodash": "4.17.10", "mkdirp": "0.5.1", @@ -2903,7 +2903,7 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "regenerator-runtime": "0.11.1" } }, @@ -3266,7 +3266,7 @@ "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", "dev": true, "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "deep-equal": "1.0.1", "espurify": "1.7.0", "estraverse": "4.2.0" @@ -3735,9 +3735,9 @@ } }, "core-js": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz", - "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs=" + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz", + "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ==" }, "core-util-is": { "version": "1.0.2", @@ -4072,9 +4072,9 @@ "dev": true }, "duplexify": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz", - "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", + "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", @@ -4110,7 +4110,7 @@ "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "empower-core": "0.6.2" } }, @@ -4129,7 +4129,7 @@ "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", "requires": { "call-signature": "0.0.2", - "core-js": "2.5.5" + "core-js": "2.5.6" } }, "end-of-stream": { @@ -4552,7 +4552,7 @@ "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", "requires": { - "core-js": "2.5.5" + "core-js": "2.5.6" } }, "esquery": { @@ -4731,7 +4731,7 @@ "dev": true, "requires": { "chardet": "0.4.2", - "iconv-lite": "0.4.21", + "iconv-lite": "0.4.22", "tmp": "0.0.33" } }, @@ -4818,7 +4818,7 @@ "@mrmlnc/readdir-enhanced": "2.2.1", "glob-parent": "3.1.0", "is-glob": "4.0.0", - "merge2": "1.2.1", + "merge2": "1.2.2", "micromatch": "3.1.10" } }, @@ -5729,12 +5729,12 @@ "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.1.tgz", "integrity": "sha512-eP7UUkKvaHmmvCrr+rxzkIOeEKOnXmoib7/AkENDAuqlC9T2+lWlzwpthDRnitQcV8SblDMzsk73YPMPCDwPyQ==", "requires": { - "duplexify": "3.5.4", + "duplexify": "3.6.0", "extend": "3.0.1", "globby": "8.0.1", "google-auto-auth": "0.10.1", "google-proto-files": "0.15.1", - "grpc": "1.11.0", + "grpc": "1.11.3", "is-stream-ended": "0.1.4", "lodash": "4.17.10", "protobufjs": "6.8.6", @@ -5830,13 +5830,13 @@ "dev": true }, "grpc": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.11.0.tgz", - "integrity": "sha512-pTJjV/eatBQ6Rhc/jWNmUW9jE8fPrhcMYSWDSyf4l7ah1U3sIe4eIjqI/a3sm0zKbM5CuovV0ESrc+b04kr4Ig==", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.11.3.tgz", + "integrity": "sha512-7fJ40USpnP7hxGK0uRoEhJz6unA5VUdwInfwAY2rK2+OVxdDJSdTZQ/8/M+1tW68pHZYgHvg2ohvJ+clhW3ANg==", "requires": { "lodash": "4.17.10", "nan": "2.10.0", - "node-pre-gyp": "0.7.0", + "node-pre-gyp": "0.10.0", "protobufjs": "5.0.2" }, "dependencies": { @@ -5844,16 +5844,6 @@ "version": "1.1.1", "bundled": true }, - "ajv": { - "version": "5.5.2", - "bundled": true, - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - }, "ansi-regex": { "version": "2.1.1", "bundled": true @@ -5870,52 +5860,10 @@ "readable-stream": "2.3.6" } }, - "asn1": { - "version": "0.2.3", - "bundled": true - }, - "assert-plus": { - "version": "1.0.0", - "bundled": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true - }, - "aws-sign2": { - "version": "0.7.0", - "bundled": true - }, - "aws4": { - "version": "1.7.0", - "bundled": true - }, "balanced-match": { "version": "1.0.0", "bundled": true }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "4.3.1", - "bundled": true, - "requires": { - "hoek": "4.2.1" - } - }, "brace-expansion": { "version": "1.1.11", "bundled": true, @@ -5924,25 +5872,14 @@ "concat-map": "0.0.1" } }, - "caseless": { - "version": "0.12.0", - "bundled": true - }, - "co": { - "version": "4.6.0", + "chownr": { + "version": "1.0.1", "bundled": true }, "code-point-at": { "version": "1.1.0", "bundled": true }, - "combined-stream": { - "version": "1.0.6", - "bundled": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, "concat-map": { "version": "0.0.1", "bundled": true @@ -5955,29 +5892,6 @@ "version": "1.0.2", "bundled": true }, - "cryptiles": { - "version": "3.1.2", - "bundled": true, - "requires": { - "boom": "5.2.0" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "bundled": true, - "requires": { - "hoek": "4.2.1" - } - } - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - } - }, "debug": { "version": "2.6.9", "bundled": true, @@ -5986,11 +5900,7 @@ } }, "deep-extend": { - "version": "0.4.2", - "bundled": true - }, - "delayed-stream": { - "version": "1.0.0", + "version": "0.5.1", "bundled": true }, "delegates": { @@ -6001,66 +5911,17 @@ "version": "1.0.3", "bundled": true }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true - }, - "extsprintf": { - "version": "1.3.0", - "bundled": true - }, - "fast-deep-equal": { - "version": "1.1.0", - "bundled": true - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "bundled": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true - }, - "form-data": { - "version": "2.3.2", + "fs-minipass": { + "version": "1.2.5", "bundled": true, "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "minipass": "2.2.4" } }, "fs.realpath": { "version": "1.0.0", "bundled": true }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, "gauge": { "version": "2.7.4", "bundled": true, @@ -6075,13 +5936,6 @@ "wide-align": "1.1.2" } }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "requires": { - "assert-plus": "1.0.0" - } - }, "glob": { "version": "7.1.2", "bundled": true, @@ -6094,47 +5948,19 @@ "path-is-absolute": "1.0.1" } }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true - }, - "har-schema": { - "version": "2.0.0", - "bundled": true - }, - "har-validator": { - "version": "5.0.3", - "bundled": true, - "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" - } - }, "has-unicode": { "version": "2.0.1", "bundled": true }, - "hawk": { - "version": "6.0.2", - "bundled": true, - "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.1", - "sntp": "2.1.0" - } - }, - "hoek": { - "version": "4.2.1", + "iconv-lite": { + "version": "0.4.19", "bundled": true }, - "http-signature": { - "version": "1.2.0", + "ignore-walk": { + "version": "3.0.1", "bundled": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "minimatch": "3.0.4" } }, "inflight": { @@ -6160,67 +5986,36 @@ "number-is-nan": "1.0.1" } }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true - }, "isarray": { "version": "1.0.0", "bundled": true }, - "isstream": { - "version": "0.1.2", - "bundled": true - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true - }, - "json-schema-traverse": { - "version": "0.3.1", - "bundled": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true - }, - "jsprim": { - "version": "1.4.1", + "minimatch": { + "version": "3.0.4", "bundled": true, "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" + "brace-expansion": "1.1.11" } }, - "mime-db": { - "version": "1.33.0", + "minimist": { + "version": "1.2.0", "bundled": true }, - "mime-types": { - "version": "2.1.18", + "minipass": { + "version": "2.2.4", "bundled": true, "requires": { - "mime-db": "1.33.0" + "safe-buffer": "5.1.1", + "yallist": "3.0.2" } }, - "minimatch": { - "version": "3.0.4", + "minizlib": { + "version": "1.1.0", "bundled": true, "requires": { - "brace-expansion": "1.1.11" + "minipass": "2.2.4" } }, - "minimist": { - "version": "1.2.0", - "bundled": true - }, "mkdirp": { "version": "0.5.1", "bundled": true, @@ -6238,20 +6033,29 @@ "version": "2.0.0", "bundled": true }, + "needle": { + "version": "2.2.1", + "bundled": true, + "requires": { + "debug": "2.6.9", + "iconv-lite": "0.4.19", + "sax": "1.2.4" + } + }, "node-pre-gyp": { - "version": "0.7.0", + "version": "0.10.0", "bundled": true, "requires": { "detect-libc": "1.0.3", "mkdirp": "0.5.1", + "needle": "2.2.1", "nopt": "4.0.1", + "npm-packlist": "1.1.10", "npmlog": "4.1.2", - "rc": "1.2.6", - "request": "2.83.0", + "rc": "1.2.7", "rimraf": "2.6.2", "semver": "5.5.0", - "tar": "2.2.1", - "tar-pack": "3.4.1" + "tar": "4.4.2" } }, "nopt": { @@ -6262,6 +6066,18 @@ "osenv": "0.1.5" } }, + "npm-bundled": { + "version": "1.0.3", + "bundled": true + }, + "npm-packlist": { + "version": "1.1.10", + "bundled": true, + "requires": { + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" + } + }, "npmlog": { "version": "4.1.2", "bundled": true, @@ -6276,10 +6092,6 @@ "version": "1.0.1", "bundled": true }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true - }, "object-assign": { "version": "4.1.1", "bundled": true @@ -6311,10 +6123,6 @@ "version": "1.0.1", "bundled": true }, - "performance-now": { - "version": "2.1.0", - "bundled": true - }, "process-nextick-args": { "version": "2.0.0", "bundled": true @@ -6330,19 +6138,11 @@ "yargs": "3.32.0" } }, - "punycode": { - "version": "1.4.1", - "bundled": true - }, - "qs": { - "version": "6.5.1", - "bundled": true - }, "rc": { - "version": "1.2.6", + "version": "1.2.7", "bundled": true, "requires": { - "deep-extend": "0.4.2", + "deep-extend": "0.5.1", "ini": "1.3.5", "minimist": "1.2.0", "strip-json-comments": "2.0.1" @@ -6361,34 +6161,6 @@ "util-deprecate": "1.0.2" } }, - "request": { - "version": "2.83.0", - "bundled": true, - "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "hawk": "6.0.2", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.1", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" - } - }, "rimraf": { "version": "2.6.2", "bundled": true, @@ -6400,6 +6172,10 @@ "version": "5.1.1", "bundled": true }, + "sax": { + "version": "1.2.4", + "bundled": true + }, "semver": { "version": "5.5.0", "bundled": true @@ -6412,27 +6188,6 @@ "version": "3.0.2", "bundled": true }, - "sntp": { - "version": "2.1.0", - "bundled": true, - "requires": { - "hoek": "4.2.1" - } - }, - "sshpk": { - "version": "1.14.1", - "bundled": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -6449,10 +6204,6 @@ "safe-buffer": "5.1.1" } }, - "stringstream": { - "version": "0.0.5", - "bundled": true - }, "strip-ansi": { "version": "3.0.1", "bundled": true, @@ -6465,68 +6216,28 @@ "bundled": true }, "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.1", - "bundled": true, - "requires": { - "debug": "2.6.9", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.3.6", - "rimraf": "2.6.2", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.4", - "bundled": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", + "version": "4.4.2", "bundled": true, "requires": { - "safe-buffer": "5.1.1" + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "bundled": true + } } }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true - }, "util-deprecate": { "version": "1.0.2", "bundled": true }, - "uuid": { - "version": "3.2.1", - "bundled": true - }, - "verror": { - "version": "1.10.0", - "bundled": true, - "requires": { - "assert-plus": "1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "1.3.0" - } - }, "wide-align": { "version": "1.1.2", "bundled": true, @@ -6537,6 +6248,10 @@ "wrappy": { "version": "1.0.2", "bundled": true + }, + "yallist": { + "version": "3.0.2", + "bundled": true } } }, @@ -6757,9 +6472,9 @@ } }, "iconv-lite": { - "version": "0.4.21", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz", - "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==", + "version": "0.4.22", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz", + "integrity": "sha512-1AinFBeDTnsvVEP+V1QBlHpM1UZZl7gWB6fcz7B1Ho+LI1dUh2sSrxoCfVt2PinRHzXAziSniEV3P7JbTDHcXA==", "dev": true, "requires": { "safer-buffer": "2.1.2" @@ -7908,9 +7623,9 @@ } }, "merge2": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", - "integrity": "sha512-wUqcG5pxrAcaFI1lkqkMnk3Q7nUxV/NWfpAFSeWUwG9TRODnBDCUHa75mi3o3vLWQ5N4CQERWCauSlP0I3ZqUg==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz", + "integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==" }, "methmeth": { "version": "1.1.0", @@ -11405,7 +11120,7 @@ "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.1.1.tgz", "integrity": "sha1-7bo1LT7YpgMRTWZyZazOYNaJzN8=", "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "power-assert-context-traversal": "1.1.1" } }, @@ -11416,7 +11131,7 @@ "requires": { "acorn": "4.0.13", "acorn-es7-plugin": "1.1.7", - "core-js": "2.5.5", + "core-js": "2.5.6", "espurify": "1.7.0", "estraverse": "4.2.0" } @@ -11426,7 +11141,7 @@ "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.1.1.tgz", "integrity": "sha1-iMq8oNE7Y1nwfT0+ivppkmRXftk=", "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "estraverse": "4.2.0" } }, @@ -11435,7 +11150,7 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "power-assert-context-formatter": "1.1.1", "power-assert-context-reducer-ast": "1.1.2", "power-assert-renderer-assertion": "1.1.1", @@ -11463,7 +11178,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.1.1.tgz", "integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=", "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "diff-match-patch": "1.0.0", "power-assert-renderer-base": "1.1.1", "stringifier": "1.3.0", @@ -11475,7 +11190,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.1.2.tgz", "integrity": "sha1-ZV+PcRk1qbbVQbhjJ2VHF8Y3qYY=", "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "power-assert-renderer-base": "1.1.1", "power-assert-util-string-width": "1.1.1", "stringifier": "1.3.0" @@ -11572,7 +11287,7 @@ "@protobufjs/pool": "1.1.0", "@protobufjs/utf8": "1.1.0", "@types/long": "3.0.32", - "@types/node": "8.10.11", + "@types/node": "8.10.12", "long": "4.0.0" } }, @@ -11609,9 +11324,9 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, "query-string": { "version": "5.1.1", @@ -11886,7 +11601,7 @@ "mime-types": "2.1.18", "oauth-sign": "0.8.2", "performance-now": "2.1.0", - "qs": "6.5.1", + "qs": "6.5.2", "safe-buffer": "5.1.2", "stringstream": "0.0.5", "tough-cookie": "2.3.4", @@ -12535,7 +12250,7 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "traverse": "0.6.6", "type-name": "2.0.2" } @@ -12608,7 +12323,7 @@ "formidable": "1.2.1", "methods": "1.1.2", "mime": "1.6.0", - "qs": "6.5.1", + "qs": "6.5.2", "readable-stream": "2.3.6" }, "dependencies": { From baceb2e9bb49ecb46e797e64f778b65b21052c71 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 16 May 2018 16:52:30 -0700 Subject: [PATCH 0157/1115] chore: timeout for system test (#127) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 254027ef850..7f1902aa1e1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ "mkamioner " ], "scripts": { - "system-test": "repo-tools test run --cmd mocha -- system-test/*.js --no-timeouts", + "system-test": "repo-tools test run --cmd mocha -- system-test/*.js --timeout 600000", "cover": "nyc --reporter=lcov mocha --require intelli-espower-loader test/*.js --timeout 0 && nyc report", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", "test-no-cover": "repo-tools test run --cmd mocha -- test/*.js --no-timeouts", From 1de82730ac9b12c230724abed3b78ad41c3ff416 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Tue, 22 May 2018 11:32:28 -0700 Subject: [PATCH 0158/1115] chore: lock files maintenance (#130) * chore: lock files maintenance * chore: lock files maintenance --- handwritten/pubsub/package-lock.json | 752 +++++++++++---------------- 1 file changed, 318 insertions(+), 434 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 24ee8946941..a476f636358 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -97,7 +97,7 @@ "log-driver": "1.2.7", "methmeth": "1.1.0", "modelo": "4.2.3", - "request": "2.85.0", + "request": "2.87.0", "retry-request": "3.3.1", "split-array-stream": "1.0.3", "stream-events": "1.0.4", @@ -110,10 +110,10 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.7.tgz", "integrity": "sha512-Nro7aIFrL2NP0G7PoGrJqXGMZj8AjdBOcbZXRRm/8T3w08NUHIiNN3dxpuUYzDsZizslH+c8e+7HXL8vh3JXTQ==", "requires": { - "async": "2.6.0", + "async": "2.6.1", "gcp-metadata": "0.6.3", - "google-auth-library": "1.4.0", - "request": "2.85.0" + "google-auth-library": "1.5.0", + "request": "2.87.0" } } } @@ -1881,6 +1881,11 @@ "glob-to-regexp": "0.3.0" } }, + "@nodelib/fs.stat": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz", + "integrity": "sha512-vCpf75JDcdomXvUd7Rn6DfYAVqPAFI66FVjxiWGwh85OLdvfo3paBoPJaam5keIYRyUolnS7SleS/ZPCidCvzw==" + }, "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -1943,7 +1948,7 @@ }, "@sinonjs/formatio": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", "dev": true, "requires": { @@ -1956,9 +1961,9 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "8.10.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.12.tgz", - "integrity": "sha512-aRFUGj/f9JVA0qSQiCK9ebaa778mmqMIcy1eKnPktgfm9O6VsnIzzB5wJnjp9/jVrfm7fX1rr3OR1nndppGZUg==" + "version": "8.10.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.17.tgz", + "integrity": "sha512-3N3FRd/rA1v5glXjb90YdYUa+sOB7WrkU2rAhKZnF4TKD86Cym9swtulGuH0p9nxo7fP5woRNa8b0oFTpCO1bg==" }, "acorn": { "version": "4.0.13", @@ -2302,9 +2307,9 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { "lodash": "4.17.10" } @@ -2393,7 +2398,7 @@ "lodash.difference": "4.5.0", "lodash.flatten": "4.4.0", "loud-rejection": "1.6.0", - "make-dir": "1.2.0", + "make-dir": "1.3.0", "matcher": "1.1.0", "md5-hex": "2.0.0", "meow": "3.7.0", @@ -2410,7 +2415,7 @@ "safe-buffer": "5.1.2", "semver": "5.5.0", "slash": "1.0.0", - "source-map-support": "0.5.5", + "source-map-support": "0.5.6", "stack-utils": "1.0.1", "strip-ansi": "4.0.0", "strip-bom-buf": "1.0.0", @@ -2500,7 +2505,7 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { - "follow-redirects": "1.4.1", + "follow-redirects": "1.5.0", "is-buffer": "1.1.6" } }, @@ -2734,7 +2739,7 @@ "call-matcher": "1.0.1", "core-js": "2.5.6", "espower-location-detector": "1.0.0", - "espurify": "1.7.0", + "espurify": "1.8.0", "estraverse": "4.2.0" } }, @@ -3021,11 +3026,6 @@ } } }, - "base64url": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", - "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" - }, "bcrypt-pbkdf": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", @@ -3047,14 +3047,6 @@ "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", "dev": true }, - "boom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", - "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", - "requires": { - "hoek": "4.2.1" - } - }, "boxen": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", @@ -3268,7 +3260,7 @@ "requires": { "core-js": "2.5.6", "deep-equal": "1.0.1", - "espurify": "1.7.0", + "espurify": "1.8.0", "estraverse": "4.2.0" } }, @@ -3367,7 +3359,7 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", - "fsevents": "1.2.3", + "fsevents": "1.2.4", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -3565,13 +3557,13 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "codecov": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.1.tgz", - "integrity": "sha512-0TjnXrbvcPzAkRPv/Y5D8aZju/M5adkFxShRyMMgDReB8EV9nF4XMERXs6ajgLA1di9LUFW2tgePDQd2JPWy7g==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.2.tgz", + "integrity": "sha512-9ljtIROIjPIUmMRqO+XuDITDoV8xRrZmA0jcEq6p2hg2+wY9wGmLfreAZGIL72IzUfdEDZaU8+Vjidg1fBQ8GQ==", "dev": true, "requires": { "argv": "0.0.2", - "request": "2.85.0", + "request": "2.87.0", "urlgrey": "0.4.4" } }, @@ -3619,9 +3611,9 @@ } }, "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, "common-path-prefix": { @@ -3695,7 +3687,7 @@ "requires": { "dot-prop": "4.2.0", "graceful-fs": "4.1.11", - "make-dir": "1.2.0", + "make-dir": "1.3.0", "unique-string": "1.0.0", "write-file-atomic": "2.3.0", "xdg-basedir": "3.0.0" @@ -3758,29 +3750,11 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.2", + "lru-cache": "4.1.3", "shebang-command": "1.2.0", "which": "1.3.0" } }, - "cryptiles": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", - "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", - "requires": { - "boom": "5.2.0" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", - "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", - "requires": { - "hoek": "4.2.1" - } - } - } - }, "crypto-random-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", @@ -3991,9 +3965,9 @@ "dev": true }, "diff-match-patch": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz", - "integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.1.tgz", + "integrity": "sha512-A0QEhr4PxGUMEtKxd6X+JLnOTFd3BfIPSDpsc4dMvj+CbSaErDwTpoTo/nFJDMSrjxLW4BiNq+FbNisAAHhWeQ==" }, "dir-glob": { "version": "2.0.0", @@ -4038,9 +4012,9 @@ "dev": true }, "domhandler": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", - "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { "domelementtype": "1.3.0" @@ -4097,11 +4071,10 @@ } }, "ecdsa-sig-formatter": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz", - "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz", + "integrity": "sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=", "requires": { - "base64url": "2.0.0", "safe-buffer": "5.1.2" } }, @@ -4443,9 +4416,9 @@ "dev": true }, "espower": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/espower/-/espower-2.1.0.tgz", - "integrity": "sha1-zh7bPZhwKEH99ZbRy46FvcSujkg=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/espower/-/espower-2.1.1.tgz", + "integrity": "sha512-F4TY1qYJB1aUyzB03NsZksZzUQmQoEBaTUjRJGR30GxbkbjKI41NhCyYjrF+bGgWN7x/ZsczYppRpz/0WdI0ug==", "dev": true, "requires": { "array-find": "1.0.0", @@ -4453,7 +4426,7 @@ "escodegen": "1.9.1", "escope": "3.6.0", "espower-location-detector": "1.0.0", - "espurify": "1.7.0", + "espurify": "1.8.0", "estraverse": "4.2.0", "source-map": "0.5.7", "type-name": "2.0.2", @@ -4507,7 +4480,7 @@ "convert-source-map": "1.5.1", "empower-assert": "1.1.0", "escodegen": "1.9.1", - "espower": "2.1.0", + "espower": "2.1.1", "estraverse": "4.2.0", "merge-estraverse-visitors": "1.0.0", "multi-stage-sourcemap": "0.2.1", @@ -4548,9 +4521,9 @@ "dev": true }, "espurify": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz", - "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY=", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.0.tgz", + "integrity": "sha512-jdkJG9jswjKCCDmEridNUuIQei9algr+o66ZZ19610ZoBsiWLRsQGNYS4HGez3Z/DsR0lhANGAqiwBUclPuNag==", "requires": { "core-js": "2.5.6" } @@ -4655,18 +4628,18 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.3" + "fill-range": "2.2.4" }, "dependencies": { "fill-range": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", + "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { "is-number": "2.1.0", "isobject": "2.1.0", - "randomatic": "1.1.7", + "randomatic": "3.0.0", "repeat-element": "1.1.2", "repeat-string": "1.6.1" } @@ -4731,7 +4704,7 @@ "dev": true, "requires": { "chardet": "0.4.2", - "iconv-lite": "0.4.22", + "iconv-lite": "0.4.23", "tmp": "0.0.33" } }, @@ -4811,11 +4784,12 @@ "dev": true }, "fast-glob": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.1.tgz", - "integrity": "sha512-wSyW1TBK3ia5V+te0rGPXudeMHoUQW6O5Y9oATiaGhpENmEifPDlOdhpsnlj5HoG6ttIvGiY1DdCmI9X2xGMhg==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz", + "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==", "requires": { "@mrmlnc/readdir-enhanced": "2.2.1", + "@nodelib/fs.stat": "1.0.2", "glob-parent": "3.1.0", "is-glob": "4.0.0", "merge2": "1.2.2", @@ -4896,7 +4870,7 @@ "dev": true, "requires": { "commondir": "1.0.1", - "make-dir": "1.2.0", + "make-dir": "1.3.0", "pkg-dir": "2.0.0" } }, @@ -4928,9 +4902,9 @@ "dev": true }, "follow-redirects": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz", - "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", + "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "requires": { "debug": "3.1.0" } @@ -5010,14 +4984,14 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz", - "integrity": "sha512-X+57O5YkDTiEQGiw8i7wYc2nQgweIekqkepI8Q3y4wVlurgBt2SuwxTeYUYMZIGpLZH3r/TsMjczCMXE5ZOt7Q==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", + "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", "dev": true, "optional": true, "requires": { "nan": "2.10.0", - "node-pre-gyp": "0.9.1" + "node-pre-gyp": "0.10.0" }, "dependencies": { "abbrev": { @@ -5098,7 +5072,7 @@ } }, "deep-extend": { - "version": "0.4.2", + "version": "0.5.1", "bundled": true, "dev": true, "optional": true @@ -5276,7 +5250,7 @@ } }, "node-pre-gyp": { - "version": "0.9.1", + "version": "0.10.0", "bundled": true, "dev": true, "optional": true, @@ -5287,7 +5261,7 @@ "nopt": "4.0.1", "npm-packlist": "1.1.10", "npmlog": "4.1.2", - "rc": "1.2.6", + "rc": "1.2.7", "rimraf": "2.6.2", "semver": "5.5.0", "tar": "4.4.1" @@ -5385,12 +5359,12 @@ "optional": true }, "rc": { - "version": "1.2.6", + "version": "1.2.7", "bundled": true, "dev": true, "optional": true, "requires": { - "deep-extend": "0.4.2", + "deep-extend": "0.5.1", "ini": "1.3.5", "minimist": "1.2.0", "strip-json-comments": "2.0.1" @@ -5692,7 +5666,7 @@ "requires": { "array-union": "1.0.2", "dir-glob": "2.0.0", - "fast-glob": "2.2.1", + "fast-glob": "2.2.2", "glob": "7.1.2", "ignore": "3.3.8", "pify": "3.0.0", @@ -5700,16 +5674,16 @@ } }, "google-auth-library": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.4.0.tgz", - "integrity": "sha512-vWRx6pJulK7Y5V/Xyr7MPMlx2mWfmrUVbcffZ7hpq8ElFg5S8WY6PvjMovdcr6JfuAwwpAX4R0I1XOcyWuBcUw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.5.0.tgz", + "integrity": "sha512-xpibA/hkq4waBcpIkSJg4GiDAqcBWjJee3c47zj7xP3RQ0A9mc8MP3Vc9sc8SGRoDYA0OszZxTjW7SbcC4pJIA==", "requires": { "axios": "0.18.0", "gcp-metadata": "0.6.3", "gtoken": "2.3.0", - "jws": "3.1.4", + "jws": "3.1.5", "lodash.isstring": "4.0.1", - "lru-cache": "4.1.2", + "lru-cache": "4.1.3", "retry-axios": "0.3.2" } }, @@ -5718,10 +5692,10 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", "requires": { - "async": "2.6.0", + "async": "2.6.1", "gcp-metadata": "0.6.3", - "google-auth-library": "1.4.0", - "request": "2.85.0" + "google-auth-library": "1.5.0", + "request": "2.87.0" } }, "google-gax": { @@ -5824,9 +5798,9 @@ "dev": true }, "growl": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", - "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, "grpc": { @@ -5837,7 +5811,7 @@ "lodash": "4.17.10", "nan": "2.10.0", "node-pre-gyp": "0.10.0", - "protobufjs": "5.0.2" + "protobufjs": "5.0.3" }, "dependencies": { "abbrev": { @@ -6128,9 +6102,9 @@ "bundled": true }, "protobufjs": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.2.tgz", - "integrity": "sha1-WXSNfc8D0tsiwT2p/rAk4Wq4DJE=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz", + "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==", "requires": { "ascli": "1.0.1", "bytebuffer": "5.0.1", @@ -6262,7 +6236,7 @@ "requires": { "axios": "0.18.0", "google-p12-pem": "1.0.2", - "jws": "3.1.4", + "jws": "3.1.5", "mime": "2.3.1", "pify": "3.0.0" } @@ -6381,28 +6355,12 @@ "integrity": "sha1-ieJdtgS3Jcj1l2//Ct3JIbgopac=", "dev": true }, - "hawk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", - "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", - "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.1", - "sntp": "2.1.0" - } - }, "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", "dev": true }, - "hoek": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", - "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" - }, "home-or-tmp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", @@ -6426,7 +6384,7 @@ "dev": true, "requires": { "domelementtype": "1.3.0", - "domhandler": "2.4.1", + "domhandler": "2.4.2", "domutils": "1.7.0", "entities": "1.1.1", "inherits": "2.0.3", @@ -6472,9 +6430,9 @@ } }, "iconv-lite": { - "version": "0.4.22", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz", - "integrity": "sha512-1AinFBeDTnsvVEP+V1QBlHpM1UZZl7gWB6fcz7B1Ho+LI1dUh2sSrxoCfVt2PinRHzXAziSniEV3P7JbTDHcXA==", + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { "safer-buffer": "2.1.2" @@ -7157,23 +7115,21 @@ "dev": true }, "jwa": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz", - "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz", + "integrity": "sha512-tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw==", "requires": { - "base64url": "2.0.0", "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.9", + "ecdsa-sig-formatter": "1.0.10", "safe-buffer": "5.1.2" } }, "jws": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz", - "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz", + "integrity": "sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==", "requires": { - "base64url": "2.0.0", - "jwa": "1.1.5", + "jwa": "1.1.6", "safe-buffer": "5.1.2" } }, @@ -7370,9 +7326,9 @@ "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" }, "lolex": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz", - "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz", + "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==", "dev": true }, "long": { @@ -7412,18 +7368,18 @@ "dev": true }, "lru-cache": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", - "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", + "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "requires": { "pseudomap": "1.0.2", "yallist": "2.1.2" } }, "make-dir": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz", - "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { "pify": "3.0.0" @@ -7463,6 +7419,12 @@ "escape-string-regexp": "1.0.5" } }, + "math-random": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", + "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", + "dev": true + }, "md5-hex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", @@ -7731,33 +7693,22 @@ } }, "mocha": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz", - "integrity": "sha512-kKKs/H1KrMMQIEsWNxGmb4/BGsmj0dkeyotEvbrAuQ01FcWRLssUNXCEUZk6SZtyJBi6EE7SL0zDDtItw1rGhw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", + "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", "dev": true, "requires": { "browser-stdout": "1.3.1", - "commander": "2.11.0", + "commander": "2.15.1", "debug": "3.1.0", "diff": "3.5.0", "escape-string-regexp": "1.0.5", "glob": "7.1.2", - "growl": "1.10.3", + "growl": "1.10.5", "he": "1.1.1", "minimatch": "3.0.4", "mkdirp": "0.5.1", - "supports-color": "4.4.0" - }, - "dependencies": { - "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - } + "supports-color": "5.4.0" } }, "modelo": { @@ -7864,7 +7815,7 @@ "requires": { "@sinonjs/formatio": "2.0.0", "just-extend": "1.1.27", - "lolex": "2.3.2", + "lolex": "2.6.0", "path-to-regexp": "1.7.0", "text-encoding": "0.6.4" } @@ -7929,9 +7880,9 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "nyc": { - "version": "11.7.1", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.7.1.tgz", - "integrity": "sha512-EGePURSKUEpS1jWnEKAMhY+GWZzi7JC+f8iBDOATaOsLZW5hM/9eYx2dHGaEXa1ITvMm44CJugMksvP3NwMQMw==", + "version": "11.8.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.8.0.tgz", + "integrity": "sha512-PUFq1PSsx5OinSk5g5aaZygcDdI3QQT5XUlbR9QRMihtMS6w0Gm8xj4BxmKeeAlpQXC5M2DIhH16Y+KejceivQ==", "dev": true, "requires": { "archy": "1.0.0", @@ -7952,7 +7903,7 @@ "istanbul-reports": "1.4.0", "md5-hex": "1.3.0", "merge-source-map": "1.1.0", - "micromatch": "2.3.11", + "micromatch": "3.1.10", "mkdirp": "0.5.1", "resolve-from": "2.0.0", "rimraf": "2.6.2", @@ -8002,12 +7953,9 @@ "dev": true }, "arr-diff": { - "version": "2.0.0", + "version": "4.0.0", "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } + "dev": true }, "arr-flatten": { "version": "1.1.0", @@ -8020,7 +7968,7 @@ "dev": true }, "array-unique": { - "version": "0.2.1", + "version": "0.3.2", "bundled": true, "dev": true }, @@ -8040,7 +7988,7 @@ "dev": true }, "atob": { - "version": "2.1.0", + "version": "2.1.1", "bundled": true, "dev": true }, @@ -8064,7 +8012,7 @@ "babel-types": "6.26.0", "detect-indent": "4.0.0", "jsesc": "1.3.0", - "lodash": "4.17.5", + "lodash": "4.17.10", "source-map": "0.5.7", "trim-right": "1.0.1" } @@ -8082,7 +8030,7 @@ "bundled": true, "dev": true, "requires": { - "core-js": "2.5.5", + "core-js": "2.5.6", "regenerator-runtime": "0.11.1" } }, @@ -8095,7 +8043,7 @@ "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", - "lodash": "4.17.5" + "lodash": "4.17.10" } }, "babel-traverse": { @@ -8111,7 +8059,7 @@ "debug": "2.6.9", "globals": "9.18.0", "invariant": "2.2.4", - "lodash": "4.17.5" + "lodash": "4.17.10" } }, "babel-types": { @@ -8121,7 +8069,7 @@ "requires": { "babel-runtime": "6.26.0", "esutils": "2.0.2", - "lodash": "4.17.5", + "lodash": "4.17.10", "to-fast-properties": "1.0.3" } }, @@ -8205,13 +8153,30 @@ } }, "braces": { - "version": "1.8.5", + "version": "2.3.2", "bundled": true, "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "builtin-modules": { @@ -8365,7 +8330,7 @@ "dev": true }, "core-js": { - "version": "2.5.5", + "version": "2.5.6", "bundled": true, "dev": true }, @@ -8374,7 +8339,7 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.2", + "lru-cache": "4.1.3", "which": "1.3.0" } }, @@ -8501,7 +8466,7 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.2", + "lru-cache": "4.1.3", "shebang-command": "1.2.0", "which": "1.3.0" } @@ -8509,19 +8474,35 @@ } }, "expand-brackets": { - "version": "0.1.5", + "version": "2.1.4", "bundled": true, "dev": true, "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "expand-range": { - "version": "1.8.2", - "bundled": true, - "dev": true, - "requires": { - "fill-range": "2.2.3" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "extend-shallow": { @@ -8544,28 +8525,88 @@ } }, "extglob": { - "version": "0.3.2", + "version": "2.0.4", "bundled": true, "dev": true, "requires": { - "is-extglob": "1.0.0" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "6.0.2" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" + } + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } } }, - "filename-regex": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, "fill-range": { - "version": "2.2.3", + "version": "4.0.0", "bundled": true, "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "find-cache-dir": { @@ -8591,14 +8632,6 @@ "bundled": true, "dev": true }, - "for-own": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, "foreground-child": { "version": "1.5.6", "bundled": true, @@ -8649,23 +8682,6 @@ "path-is-absolute": "1.0.1" } }, - "glob-base": { - "version": "0.3.0", - "bundled": true, - "dev": true, - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - } - }, - "glob-parent": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, "globals": { "version": "9.18.0", "bundled": true, @@ -8852,29 +8868,11 @@ } } }, - "is-dotfile": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "requires": { - "is-primitive": "2.0.0" - } - }, "is-extendable": { "version": "0.1.1", "bundled": true, "dev": true }, - "is-extglob": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, "is-finite": { "version": "1.0.2", "bundled": true, @@ -8888,16 +8886,8 @@ "bundled": true, "dev": true }, - "is-glob": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, "is-number": { - "version": "2.1.0", + "version": "3.0.0", "bundled": true, "dev": true, "requires": { @@ -8934,16 +8924,6 @@ } } }, - "is-posix-bracket": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, "is-stream": { "version": "1.1.0", "bundled": true, @@ -8970,12 +8950,9 @@ "dev": true }, "isobject": { - "version": "2.1.0", + "version": "3.0.1", "bundled": true, - "dev": true, - "requires": { - "isarray": "1.0.0" - } + "dev": true }, "istanbul-lib-coverage": { "version": "1.2.0", @@ -9116,7 +9093,7 @@ } }, "lodash": { - "version": "4.17.5", + "version": "4.17.10", "bundled": true, "dev": true }, @@ -9134,7 +9111,7 @@ } }, "lru-cache": { - "version": "4.1.2", + "version": "4.1.3", "bundled": true, "dev": true, "requires": { @@ -9192,23 +9169,30 @@ } }, "micromatch": { - "version": "2.3.11", + "version": "3.1.10", "bundled": true, "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } } }, "mimic-fn": { @@ -9308,14 +9292,6 @@ "validate-npm-package-license": "3.0.3" } }, - "normalize-path": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, "npm-run-path": { "version": "2.0.2", "bundled": true, @@ -9369,15 +9345,6 @@ } } }, - "object.omit": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - } - }, "object.pick": { "version": "1.3.0", "bundled": true, @@ -9451,17 +9418,6 @@ "bundled": true, "dev": true }, - "parse-glob": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" - } - }, "parse-json": { "version": "2.2.0", "bundled": true, @@ -9550,53 +9506,11 @@ "bundled": true, "dev": true }, - "preserve": { - "version": "0.2.0", - "bundled": true, - "dev": true - }, "pseudomap": { "version": "1.0.2", "bundled": true, "dev": true }, - "randomatic": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, "read-pkg": { "version": "1.1.0", "bundled": true, @@ -9632,14 +9546,6 @@ "bundled": true, "dev": true }, - "regex-cache": { - "version": "0.4.4", - "bundled": true, - "dev": true, - "requires": { - "is-equal-shallow": "0.1.3" - } - }, "regex-not": { "version": "1.0.2", "bundled": true, @@ -9649,11 +9555,6 @@ "safe-regex": "1.1.0" } }, - "remove-trailing-separator": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, "repeat-element": { "version": "1.1.2", "bundled": true, @@ -9883,7 +9784,7 @@ "bundled": true, "dev": true, "requires": { - "atob": "2.1.0", + "atob": "2.1.1", "decode-uri-component": "0.2.0", "resolve-url": "0.2.1", "source-map-url": "0.4.0", @@ -10539,7 +10440,7 @@ "bundled": true, "dev": true, "requires": { - "cliui": "4.0.0", + "cliui": "4.1.0", "decamelize": "1.2.0", "find-up": "2.1.0", "get-caller-file": "1.0.2", @@ -10564,7 +10465,7 @@ "dev": true }, "cliui": { - "version": "4.0.0", + "version": "4.1.0", "bundled": true, "dev": true, "requires": { @@ -11132,7 +11033,7 @@ "acorn": "4.0.13", "acorn-es7-plugin": "1.1.7", "core-js": "2.5.6", - "espurify": "1.7.0", + "espurify": "1.8.0", "estraverse": "4.2.0" } }, @@ -11179,7 +11080,7 @@ "integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=", "requires": { "core-js": "2.5.6", - "diff-match-patch": "1.0.0", + "diff-match-patch": "1.0.1", "power-assert-renderer-base": "1.1.1", "stringifier": "1.3.0", "type-name": "2.0.2" @@ -11287,7 +11188,7 @@ "@protobufjs/pool": "1.1.0", "@protobufjs/utf8": "1.1.0", "@types/long": "3.0.32", - "@types/node": "8.10.12", + "@types/node": "8.10.17", "long": "4.0.0" } }, @@ -11340,23 +11241,21 @@ } }, "randomatic": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz", + "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "4.0.0", + "kind-of": "6.0.2", + "math-random": "1.0.1" }, "dependencies": { - "kind-of": { + "is-number": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "dev": true } } }, @@ -11466,9 +11365,9 @@ } }, "regenerate": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz", - "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", + "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", "dev": true }, "regenerator-runtime": { @@ -11507,7 +11406,7 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "1.3.3", + "regenerate": "1.4.0", "regjsgen": "0.2.0", "regjsparser": "0.1.5" } @@ -11581,9 +11480,9 @@ } }, "request": { - "version": "2.85.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", - "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", + "version": "2.87.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", + "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "requires": { "aws-sign2": "0.7.0", "aws4": "1.7.0", @@ -11593,7 +11492,6 @@ "forever-agent": "0.6.1", "form-data": "2.3.2", "har-validator": "5.0.3", - "hawk": "6.0.2", "http-signature": "1.2.0", "is-typedarray": "1.0.0", "isstream": "0.1.2", @@ -11603,7 +11501,6 @@ "performance-now": "2.1.0", "qs": "6.5.2", "safe-buffer": "5.1.2", - "stringstream": "0.0.5", "tough-cookie": "2.3.4", "tunnel-agent": "0.6.0", "uuid": "3.2.1" @@ -11722,7 +11619,7 @@ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz", "integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw==", "requires": { - "request": "2.85.0", + "request": "2.87.0", "through2": "2.0.3" } }, @@ -11896,7 +11793,7 @@ "@sinonjs/formatio": "2.0.0", "diff": "3.5.0", "lodash.get": "4.4.2", - "lolex": "2.3.2", + "lolex": "2.6.0", "nise": "1.3.3", "supports-color": "5.4.0", "type-detect": "4.0.8" @@ -11941,7 +11838,7 @@ "extend-shallow": "2.0.1", "map-cache": "0.2.2", "source-map": "0.5.7", - "source-map-resolve": "0.5.1", + "source-map-resolve": "0.5.2", "use": "3.1.0" }, "dependencies": { @@ -12035,14 +11932,6 @@ } } }, - "sntp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", - "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", - "requires": { - "hoek": "4.2.1" - } - }, "sort-keys": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", @@ -12058,9 +11947,9 @@ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-resolve": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz", - "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", + "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { "atob": "2.1.1", "decode-uri-component": "0.2.0", @@ -12070,9 +11959,9 @@ } }, "source-map-support": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz", - "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", + "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "dev": true, "requires": { "buffer-from": "1.0.0", @@ -12129,7 +12018,7 @@ "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz", "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=", "requires": { - "async": "2.6.0", + "async": "2.6.1", "is-stream-ended": "0.1.4" } }, @@ -12255,11 +12144,6 @@ "type-name": "2.0.2" } }, - "stringstream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -13026,7 +12910,7 @@ "requires": { "detect-indent": "5.0.0", "graceful-fs": "4.1.11", - "make-dir": "1.2.0", + "make-dir": "1.3.0", "pify": "3.0.0", "sort-keys": "2.0.0", "write-file-atomic": "2.3.0" From cbdb5356b282d3d1df5db37d14150bbc3f0f8bbb Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 3 Jun 2018 17:50:00 -0700 Subject: [PATCH 0159/1115] chore(package): update nyc to version 12.0.2 (#137) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7f1902aa1e1..c7b5bf4aa8f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -92,7 +92,7 @@ "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", "mocha": "^5.0.0", - "nyc": "^11.3.0", + "nyc": "^12.0.2", "power-assert": "^1.4.4", "prettier": "^1.9.1", "proxyquire": "^2.0.0" From de1f7c5fb09e568cf1730f847fe5bd7ff94e5236 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 11 Jun 2018 17:05:40 -0400 Subject: [PATCH 0160/1115] =?UTF-8?q?Update=20google-proto-files=20to=20th?= =?UTF-8?q?e=20latest=20version=20=F0=9F=9A=80=20(#139)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Version **0.16.0** of [google-proto-files](https://github.com/googleapis/nodejs-proto-files) was just published.
Dependency google-proto-files
Current Version 0.15.1
Type dependency
The version **0.16.0** is **not covered** by your **current version range**. If you don’t accept this pull request, your project will work just like it did before. However, you might be missing out on a bunch of new features, fixes and/or performance improvements from the dependency update. It might be worth looking into these changes and trying to get this project onto the latest version of google-proto-files. If you have a solid test suite and good coverage, a passing build is a strong indicator that you can take advantage of these changes directly by merging the proposed change into your project. If the build fails or you don’t have such unconditional trust in your tests, this branch is a great starting point for you to work on the update. ---
Release Notes v0.16.0

Features

  • (#35): Allow passing load() options to protobuf.js. (Thanks, @nmccready!)
Commits

The new version differs by 19 commits.

  • b4d00bd 0.16.0 (#44)
  • 4748898 feat: allow load options (#35)
  • 91a34aa Merge pull request #42 from googleapis/greenkeeper/nyc-12.0.1
  • fca6f75 Update package.json
  • f0473ad chore(package): update nyc to version 12.0.1
  • 0575631 chore: lock files maintenance (#41)
  • 5f38e7f chore: lock files maintenance (#38)
  • d077e0b chore: test on node10 (#37)
  • 7855cca chore: lock files maintenance (#36)
  • e554818 Merge pull request #32 from googleapis/greenkeeper/sinon-5.0.0
  • 0ecbb5e Update package locks
  • 838e2d1 chore(package): update sinon to version 5.0.0
  • fb18058 chore: workaround for repo-tools EPERM (#33)
  • cf5968e chore: setup nighty build in CircleCI (#31)
  • c4c973a chore(package): update proxyquire to version 2.0.0 (#30)

There are 19 commits in total.

See the full diff

FAQ and help There is a collection of [frequently asked questions](https://greenkeeper.io/faq.html). If those don’t help, you can always [ask the humans behind Greenkeeper](https://github.com/greenkeeperio/greenkeeper/issues/new).
--- Your [Greenkeeper](https://greenkeeper.io) bot :palm_tree: --- handwritten/pubsub/package-lock.json | 7266 +++++++++++++------------- handwritten/pubsub/package.json | 2 +- 2 files changed, 3693 insertions(+), 3575 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index a476f636358..ce5610633cd 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -16,18 +16,18 @@ "integrity": "sha512-oWqTnIGXW3k72UFidXzW0ONlO7hnO9x02S/QReJ7NBGeiBH9cUHY9+EfV6C8PXC6YJH++WrliEq03wMSJGNZFg==", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "package-hash": "1.2.0" + "babel-plugin-check-es2015-constants": "^6.8.0", + "babel-plugin-syntax-trailing-function-commas": "^6.20.0", + "babel-plugin-transform-async-to-generator": "^6.16.0", + "babel-plugin-transform-es2015-destructuring": "^6.19.0", + "babel-plugin-transform-es2015-function-name": "^6.9.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0", + "babel-plugin-transform-es2015-parameters": "^6.21.0", + "babel-plugin-transform-es2015-spread": "^6.8.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.8.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.11.0", + "babel-plugin-transform-exponentiation-operator": "^6.8.0", + "package-hash": "^1.2.0" }, "dependencies": { "md5-hex": { @@ -36,7 +36,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "package-hash": { @@ -45,7 +45,7 @@ "integrity": "sha1-AD5WzVe3NqbtYRTMK4FUJnJ3DkQ=", "dev": true, "requires": { - "md5-hex": "1.3.0" + "md5-hex": "^1.3.0" } } } @@ -56,8 +56,8 @@ "integrity": "sha1-ze0RlqjY2TgaUJJAq5LpGl7Aafc=", "dev": true, "requires": { - "@ava/babel-plugin-throws-helper": "2.0.0", - "babel-plugin-espower": "2.4.0" + "@ava/babel-plugin-throws-helper": "^2.0.0", + "babel-plugin-espower": "^2.3.2" } }, "@ava/write-file-atomic": { @@ -66,9 +66,142 @@ "integrity": "sha512-BTNB3nGbEfJT+69wuqXFr/bQH7Vr7ihx2xGOMNqPgDGhwspoZhiWumDDZNjBy7AScmqS5CELIOGtPVXESyrnDA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" + } + }, + "@babel/code-frame": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz", + "integrity": "sha1-vs2AVIJzREDJ0TfkbXc0DmTX9Rs=", + "dev": true, + "requires": { + "@babel/highlight": "7.0.0-beta.49" + } + }, + "@babel/generator": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.49.tgz", + "integrity": "sha1-6c/9qROZaszseTu8JauRvBnQv3o=", + "dev": true, + "requires": { + "@babel/types": "7.0.0-beta.49", + "jsesc": "^2.5.1", + "lodash": "^4.17.5", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" + }, + "dependencies": { + "jsesc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", + "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", + "dev": true + } + } + }, + "@babel/helper-function-name": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.49.tgz", + "integrity": "sha1-olwRGbnwNSeGcBJuAiXAMEHI3jI=", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "7.0.0-beta.49", + "@babel/template": "7.0.0-beta.49", + "@babel/types": "7.0.0-beta.49" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.49.tgz", + "integrity": "sha1-z1Aj8y0q2S0Ic3STnOwJUby1FEE=", + "dev": true, + "requires": { + "@babel/types": "7.0.0-beta.49" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.49.tgz", + "integrity": "sha1-QNeO2glo0BGxxShm5XRs+yPldUg=", + "dev": true, + "requires": { + "@babel/types": "7.0.0-beta.49" + } + }, + "@babel/highlight": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.49.tgz", + "integrity": "sha1-lr3GtD4TSCASumaRsQGEktOWIsw=", + "dev": true, + "requires": { + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^3.0.0" + } + }, + "@babel/parser": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.49.tgz", + "integrity": "sha1-lE0MW6KBK7FZ7b0iZ0Ov0mUXm9w=", + "dev": true + }, + "@babel/template": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.49.tgz", + "integrity": "sha1-44q+ghfLl5P0YaUwbXrXRdg+HSc=", + "dev": true, + "requires": { + "@babel/code-frame": "7.0.0-beta.49", + "@babel/parser": "7.0.0-beta.49", + "@babel/types": "7.0.0-beta.49", + "lodash": "^4.17.5" + } + }, + "@babel/traverse": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.49.tgz", + "integrity": "sha1-TypzaCoYM07WYl0QCo0nMZ98LWg=", + "dev": true, + "requires": { + "@babel/code-frame": "7.0.0-beta.49", + "@babel/generator": "7.0.0-beta.49", + "@babel/helper-function-name": "7.0.0-beta.49", + "@babel/helper-split-export-declaration": "7.0.0-beta.49", + "@babel/parser": "7.0.0-beta.49", + "@babel/types": "7.0.0-beta.49", + "debug": "^3.1.0", + "globals": "^11.1.0", + "invariant": "^2.2.0", + "lodash": "^4.17.5" + }, + "dependencies": { + "globals": { + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", + "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", + "dev": true + } + } + }, + "@babel/types": { + "version": "7.0.0-beta.49", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.49.tgz", + "integrity": "sha1-t+Oxw/TUz+Eb34yJ8e/V4WF7h6Y=", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.5", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "dev": true + } } }, "@concordance/react": { @@ -77,7 +210,7 @@ "integrity": "sha512-htrsRaQX8Iixlsek8zQU7tE8wcsTQJ5UhZkSPEA8slCDAisKpC/2VgU/ucPn32M5/LjGGXRaUEKvEw1Wiuu4zQ==", "dev": true, "requires": { - "arrify": "1.0.1" + "arrify": "^1.0.1" } }, "@google-cloud/common": { @@ -85,24 +218,24 @@ "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.16.2.tgz", "integrity": "sha512-GrkaFoj0/oO36pNs4yLmaYhTujuA3i21FdQik99Fd/APix1uhf01VlpJY4lAteTDFLRNkRx6ydEh7OVvmeUHng==", "requires": { - "array-uniq": "1.0.3", - "arrify": "1.0.1", - "concat-stream": "1.6.2", - "create-error-class": "3.0.2", - "duplexify": "3.6.0", - "ent": "2.2.0", - "extend": "3.0.1", - "google-auto-auth": "0.9.7", - "is": "3.2.1", + "array-uniq": "^1.0.3", + "arrify": "^1.0.1", + "concat-stream": "^1.6.0", + "create-error-class": "^3.0.2", + "duplexify": "^3.5.0", + "ent": "^2.2.0", + "extend": "^3.0.1", + "google-auto-auth": "^0.9.0", + "is": "^3.2.0", "log-driver": "1.2.7", - "methmeth": "1.1.0", - "modelo": "4.2.3", - "request": "2.87.0", - "retry-request": "3.3.1", - "split-array-stream": "1.0.3", - "stream-events": "1.0.4", - "string-format-obj": "1.1.1", - "through2": "2.0.3" + "methmeth": "^1.1.0", + "modelo": "^4.2.0", + "request": "^2.79.0", + "retry-request": "^3.0.0", + "split-array-stream": "^1.0.0", + "stream-events": "^1.0.1", + "string-format-obj": "^1.1.0", + "through2": "^2.0.3" }, "dependencies": { "google-auto-auth": { @@ -110,10 +243,10 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.7.tgz", "integrity": "sha512-Nro7aIFrL2NP0G7PoGrJqXGMZj8AjdBOcbZXRRm/8T3w08NUHIiNN3dxpuUYzDsZizslH+c8e+7HXL8vh3JXTQ==", "requires": { - "async": "2.6.1", - "gcp-metadata": "0.6.3", - "google-auth-library": "1.5.0", - "request": "2.87.0" + "async": "^2.3.0", + "gcp-metadata": "^0.6.1", + "google-auth-library": "^1.3.1", + "request": "^2.79.0" } } } @@ -132,7 +265,7 @@ "lodash": "4.17.5", "nyc": "11.4.1", "proxyquire": "1.8.0", - "semver": "5.5.0", + "semver": "^5.5.0", "sinon": "4.3.0", "string": "3.3.3", "supertest": "3.0.0", @@ -152,9 +285,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "is-fullwidth-code-point": { @@ -175,268 +308,297 @@ "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", "dev": true, "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-report": "1.1.2", - "istanbul-lib-source-maps": "1.2.2", - "istanbul-reports": "1.1.3", - "md5-hex": "1.3.0", - "merge-source-map": "1.0.4", - "micromatch": "2.3.11", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.1.1", - "yargs": "10.0.3", - "yargs-parser": "8.0.0" + "archy": "^1.0.0", + "arrify": "^1.0.1", + "caching-transform": "^1.0.0", + "convert-source-map": "^1.3.0", + "debug-log": "^1.0.1", + "default-require-extensions": "^1.0.0", + "find-cache-dir": "^0.1.1", + "find-up": "^2.1.0", + "foreground-child": "^1.5.3", + "glob": "^7.0.6", + "istanbul-lib-coverage": "^1.1.1", + "istanbul-lib-hook": "^1.1.0", + "istanbul-lib-instrument": "^1.9.1", + "istanbul-lib-report": "^1.1.2", + "istanbul-lib-source-maps": "^1.2.2", + "istanbul-reports": "^1.1.3", + "md5-hex": "^1.2.0", + "merge-source-map": "^1.0.2", + "micromatch": "^2.3.11", + "mkdirp": "^0.5.0", + "resolve-from": "^2.0.0", + "rimraf": "^2.5.4", + "signal-exit": "^3.0.1", + "spawn-wrap": "^1.4.2", + "test-exclude": "^4.1.1", + "yargs": "^10.0.3", + "yargs-parser": "^8.0.0" }, "dependencies": { "align-text": { "version": "0.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "ansi-styles": { "version": "2.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, "append-transform": { "version": "0.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", + "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", "dev": true, "requires": { - "default-require-extensions": "1.0.0" + "default-require-extensions": "^1.0.0" } }, "archy": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, "arr-diff": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", "dev": true }, "array-unique": { "version": "0.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, "arrify": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, "async": { "version": "1.5.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "dev": true }, "babel-code-frame": { "version": "6.26.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" } }, "babel-generator": { "version": "6.26.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", + "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.6", + "trim-right": "^1.0.1" } }, "babel-messages": { "version": "6.23.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-runtime": { "version": "6.26.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { "version": "6.26.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { "version": "6.26.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { "version": "6.26.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { "version": "6.18.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", "dev": true }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, "brace-expansion": { "version": "1.1.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "braces": { "version": "1.8.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "builtin-modules": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, "caching-transform": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", + "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" } }, "camelcase": { "version": "1.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", "dev": true, "optional": true }, "center-align": { "version": "0.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "cliui": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { "wordwrap": { "version": "0.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", "dev": true, "optional": true } @@ -444,41 +606,48 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, "commondir": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "convert-source-map": { "version": "1.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", "dev": true }, "core-js": { "version": "2.5.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", "dev": true }, "cross-spawn": { "version": "4.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", "dev": true, "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "debug": { "version": "2.6.9", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { "ms": "2.0.0" @@ -486,387 +655,442 @@ }, "debug-log": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", + "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", "dev": true }, "decamelize": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, "default-require-extensions": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", + "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", "dev": true, "requires": { - "strip-bom": "2.0.0" + "strip-bom": "^2.0.0" } }, "detect-indent": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "error-ex": { "version": "1.3.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "escape-string-regexp": { "version": "1.0.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, "esutils": { "version": "2.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, "execa": { "version": "0.7.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { "version": "5.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } }, "expand-brackets": { "version": "0.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { "version": "1.8.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.3" + "fill-range": "^2.1.0" } }, "extglob": { "version": "0.3.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "filename-regex": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", "dev": true }, "fill-range": { "version": "2.2.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^1.1.3", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "find-cache-dir": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", + "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "for-in": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, "for-own": { "version": "0.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreground-child": { "version": "1.5.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", + "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", "dev": true, "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" + "cross-spawn": "^4", + "signal-exit": "^3.0.0" } }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, "get-caller-file": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", "dev": true }, "get-stream": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "dev": true }, "glob": { "version": "7.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { "version": "0.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" } }, "glob-parent": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "globals": { "version": "9.18.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", "dev": true }, "graceful-fs": { "version": "4.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, "handlebars": { "version": "4.0.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "source-map": { "version": "0.4.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } }, "has-ansi": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, "hosted-git-info": { "version": "2.5.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", "dev": true }, "imurmurhash": { "version": "0.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, "invariant": { "version": "2.2.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "invert-kv": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", "dev": true }, "is-arrayish": { "version": "0.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, "is-buffer": { "version": "1.1.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, "is-builtin-module": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-dotfile": { "version": "1.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", "dev": true }, "is-equal-shallow": { "version": "0.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true }, "is-extglob": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", "dev": true }, "is-finite": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-number": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-posix-bracket": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", "dev": true }, "is-primitive": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", "dev": true }, "is-stream": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, "is-utf8": { "version": "0.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "isexe": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, "isobject": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "dev": true, "requires": { "isarray": "1.0.0" @@ -874,67 +1098,74 @@ }, "istanbul-lib-coverage": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", + "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", "dev": true }, "istanbul-lib-hook": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", + "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==", "dev": true, "requires": { - "append-transform": "0.4.0" + "append-transform": "^0.4.0" } }, "istanbul-lib-instrument": { "version": "1.9.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", + "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", "dev": true, "requires": { - "babel-generator": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", - "semver": "5.4.1" + "babel-generator": "^6.18.0", + "babel-template": "^6.16.0", + "babel-traverse": "^6.18.0", + "babel-types": "^6.18.0", + "babylon": "^6.18.0", + "istanbul-lib-coverage": "^1.1.1", + "semver": "^5.3.0" } }, "istanbul-lib-report": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz", + "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==", "dev": true, "requires": { - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "istanbul-lib-coverage": "^1.1.1", + "mkdirp": "^0.5.1", + "path-parse": "^1.0.5", + "supports-color": "^3.1.2" }, "dependencies": { "supports-color": { "version": "3.2.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } }, "istanbul-lib-source-maps": { "version": "1.2.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz", + "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==", "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "debug": "^3.1.0", + "istanbul-lib-coverage": "^1.1.1", + "mkdirp": "^0.5.1", + "rimraf": "^2.6.1", + "source-map": "^0.5.3" }, "dependencies": { "debug": { "version": "3.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { "ms": "2.0.0" @@ -944,169 +1175,191 @@ }, "istanbul-reports": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz", + "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==", "dev": true, "requires": { - "handlebars": "4.0.11" + "handlebars": "^4.0.3" } }, "js-tokens": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", "dev": true }, "jsesc": { "version": "1.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, "kind-of": { "version": "3.2.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-cache": { "version": "1.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", "dev": true, "optional": true }, "lcid": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "load-json-file": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "locate-path": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" }, "dependencies": { "path-exists": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true } } }, "lodash": { "version": "4.17.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", "dev": true }, "longest": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", "dev": true }, "loose-envify": { "version": "1.3.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "lru-cache": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "md5-hex": { "version": "1.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", + "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", "dev": true }, "mem": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "^1.0.0" } }, "merge-source-map": { "version": "1.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", + "integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } }, "micromatch": { "version": "2.3.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, "mimic-fn": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", + "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", "dev": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" @@ -1114,505 +1367,575 @@ }, "ms": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, "normalize-package-data": { "version": "2.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "npm-run-path": { "version": "2.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, "object.omit": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "optimist": { "version": "0.6.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, "os-locale": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "p-finally": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, "p-limit": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", + "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", "dev": true }, "p-locate": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.1.0" + "p-limit": "^1.1.0" } }, "parse-glob": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" } }, "parse-json": { "version": "2.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "path-exists": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, "path-key": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "dev": true }, "path-parse": { "version": "1.0.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", "dev": true }, "path-type": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { "version": "2.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, "pinkie": { "version": "2.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", "dev": true }, "pinkie-promise": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", + "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" }, "dependencies": { "find-up": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } }, "preserve": { "version": "0.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", "dev": true }, "pseudomap": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, "randomatic": { "version": "1.1.7", - "bundled": true, + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-number": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { "version": "3.2.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } }, "kind-of": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } }, "read-pkg": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } }, "regenerator-runtime": { "version": "0.11.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true }, "regex-cache": { "version": "0.4.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "remove-trailing-separator": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, "repeat-element": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", "dev": true }, "repeat-string": { "version": "1.6.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, "repeating": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "require-directory": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, "require-main-filename": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, "resolve-from": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=", "dev": true }, "right-align": { "version": "0.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { "version": "2.6.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "semver": { "version": "5.4.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", "dev": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, "shebang-command": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, "slide": { "version": "1.1.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", + "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", "dev": true }, "source-map": { "version": "0.5.7", - "bundled": true, + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, "spawn-wrap": { "version": "1.4.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", + "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==", "dev": true, "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.0" + "foreground-child": "^1.5.6", + "mkdirp": "^0.5.0", + "os-homedir": "^1.0.1", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" } }, "spdx-correct": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "spdx-license-ids": "^1.0.2" } }, "spdx-expression-parse": { "version": "1.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", "dev": true }, "spdx-license-ids": { "version": "1.2.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", "dev": true }, "string-width": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, "strip-ansi": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, "supports-color": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true }, "test-exclude": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz", + "integrity": "sha512-35+Asrsk3XHJDBgf/VRFexPgh3UyETv8IAn/LRTiZjVy6rjPVqdEk8dJcJYBzl1w0XCJM48lvTy8SfEsCWS4nA==", "dev": true, "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" + "arrify": "^1.0.1", + "micromatch": "^2.3.11", + "object-assign": "^4.1.0", + "read-pkg-up": "^1.0.1", + "require-main-filename": "^1.0.1" } }, "to-fast-properties": { "version": "1.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", "dev": true }, "trim-right": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, "uglify-js": { "version": "2.8.29", - "bundled": true, + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "yargs": { "version": "3.10.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -1620,126 +1943,141 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", "dev": true, "optional": true }, "validate-npm-package-license": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "~1.0.0", + "spdx-expression-parse": "~1.0.0" } }, "which": { "version": "1.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, "window-size": { "version": "0.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", "dev": true, "optional": true }, "wordwrap": { "version": "0.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", "dev": true }, "wrap-ansi": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" }, "dependencies": { "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } } } }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "write-file-atomic": { "version": "1.3.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", + "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } }, "y18n": { "version": "3.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", "dev": true }, "yallist": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, "yargs": { "version": "10.0.3", - "bundled": true, - "dev": true, - "requires": { - "cliui": "3.2.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "8.0.0" + "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz", + "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==", + "dev": true, + "requires": { + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^8.0.0" }, "dependencies": { "cliui": { "version": "3.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" }, "dependencies": { "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } } } @@ -1748,15 +2086,17 @@ }, "yargs-parser": { "version": "8.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz", + "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { "version": "4.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", "dev": true } } @@ -1769,9 +2109,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "proxyquire": { @@ -1780,9 +2120,9 @@ "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", "dev": true, "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.1.7" + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.0", + "resolve": "~1.1.7" } }, "string-width": { @@ -1791,8 +2131,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -1801,7 +2141,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "yargs": { @@ -1810,18 +2150,18 @@ "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" } } } @@ -1832,10 +2172,10 @@ "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", "dev": true, "requires": { - "chalk": "0.4.0", - "date-time": "0.1.1", - "pretty-ms": "0.2.2", - "text-table": "0.2.0" + "chalk": "^0.4.0", + "date-time": "^0.1.1", + "pretty-ms": "^0.2.1", + "text-table": "^0.2.0" }, "dependencies": { "ansi-styles": { @@ -1850,9 +2190,9 @@ "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { - "ansi-styles": "1.0.0", - "has-color": "0.1.7", - "strip-ansi": "0.1.1" + "ansi-styles": "~1.0.0", + "has-color": "~0.1.0", + "strip-ansi": "~0.1.0" } }, "pretty-ms": { @@ -1861,7 +2201,7 @@ "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", "dev": true, "requires": { - "parse-ms": "0.1.2" + "parse-ms": "^0.1.0" } }, "strip-ansi": { @@ -1877,14 +2217,14 @@ "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "requires": { - "call-me-maybe": "1.0.1", - "glob-to-regexp": "0.3.0" + "call-me-maybe": "^1.0.1", + "glob-to-regexp": "^0.3.0" } }, "@nodelib/fs.stat": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz", - "integrity": "sha512-vCpf75JDcdomXvUd7Rn6DfYAVqPAFI66FVjxiWGwh85OLdvfo3paBoPJaam5keIYRyUolnS7SleS/ZPCidCvzw==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz", + "integrity": "sha512-LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==" }, "@protobufjs/aspromise": { "version": "1.1.2", @@ -1911,8 +2251,8 @@ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/inquire": "1.1.0" + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" } }, "@protobufjs/float": { @@ -1961,9 +2301,9 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "8.10.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.17.tgz", - "integrity": "sha512-3N3FRd/rA1v5glXjb90YdYUa+sOB7WrkU2rAhKZnF4TKD86Cym9swtulGuH0p9nxo7fP5woRNa8b0oFTpCO1bg==" + "version": "8.10.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.19.tgz", + "integrity": "sha512-+PU57o6DtOSx0/algmxgCwWrmCiomwC/K+LPfXonT0tQMbNTjHEqVzwL9dFEhFoPmLFIiSWjRorLH6Z0hJMT+Q==" }, "acorn": { "version": "4.0.13", @@ -1981,7 +2321,7 @@ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { - "acorn": "3.3.0" + "acorn": "^3.0.4" }, "dependencies": { "acorn": { @@ -1997,10 +2337,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "ajv-keywords": { @@ -2015,9 +2355,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" }, "dependencies": { "kind-of": { @@ -2026,7 +2366,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -2043,7 +2383,7 @@ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, "requires": { - "string-width": "2.1.1" + "string-width": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -2064,8 +2404,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -2074,7 +2414,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -2096,7 +2436,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "anymatch": { @@ -2105,8 +2445,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" }, "dependencies": { "arr-diff": { @@ -2115,7 +2455,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -2130,9 +2470,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "expand-brackets": { @@ -2141,7 +2481,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -2150,7 +2490,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-extglob": { @@ -2165,7 +2505,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "kind-of": { @@ -2174,7 +2514,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "micromatch": { @@ -2183,19 +2523,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } } } @@ -2206,7 +2546,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "argv": { @@ -2264,7 +2604,7 @@ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -2287,8 +2627,8 @@ "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", "requires": { - "colour": "0.7.1", - "optjs": "3.2.2" + "colour": "~0.7.1", + "optjs": "~3.2.2" } }, "asn1": { @@ -2311,7 +2651,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { - "lodash": "4.17.10" + "lodash": "^4.17.10" } }, "async-each": { @@ -2341,89 +2681,89 @@ "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", "dev": true, "requires": { - "@ava/babel-preset-stage-4": "1.1.0", - "@ava/babel-preset-transform-test-files": "3.0.0", - "@ava/write-file-atomic": "2.2.0", - "@concordance/react": "1.0.0", - "@ladjs/time-require": "0.1.4", - "ansi-escapes": "3.1.0", - "ansi-styles": "3.2.1", - "arr-flatten": "1.1.0", - "array-union": "1.0.2", - "array-uniq": "1.0.3", - "arrify": "1.0.1", - "auto-bind": "1.2.0", - "ava-init": "0.2.1", - "babel-core": "6.26.3", - "babel-generator": "6.26.1", - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "bluebird": "3.5.1", - "caching-transform": "1.0.1", - "chalk": "2.4.1", - "chokidar": "1.7.0", - "clean-stack": "1.3.0", - "clean-yaml-object": "0.1.0", - "cli-cursor": "2.1.0", - "cli-spinners": "1.3.1", - "cli-truncate": "1.1.0", - "co-with-promise": "4.6.0", - "code-excerpt": "2.1.1", - "common-path-prefix": "1.0.0", - "concordance": "3.0.0", - "convert-source-map": "1.5.1", - "core-assert": "0.2.1", - "currently-unhandled": "0.4.1", - "debug": "3.1.0", - "dot-prop": "4.2.0", - "empower-core": "0.6.2", - "equal-length": "1.0.1", - "figures": "2.0.0", - "find-cache-dir": "1.0.0", - "fn-name": "2.0.1", - "get-port": "3.2.0", - "globby": "6.1.0", - "has-flag": "2.0.0", - "hullabaloo-config-manager": "1.1.1", - "ignore-by-default": "1.0.1", - "import-local": "0.1.1", - "indent-string": "3.2.0", - "is-ci": "1.1.0", - "is-generator-fn": "1.0.0", - "is-obj": "1.0.1", - "is-observable": "1.1.0", - "is-promise": "2.1.0", - "last-line-stream": "1.0.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.debounce": "4.0.8", - "lodash.difference": "4.5.0", - "lodash.flatten": "4.4.0", - "loud-rejection": "1.6.0", - "make-dir": "1.3.0", - "matcher": "1.1.0", - "md5-hex": "2.0.0", - "meow": "3.7.0", - "ms": "2.0.0", - "multimatch": "2.1.0", - "observable-to-promise": "0.5.0", - "option-chain": "1.0.0", - "package-hash": "2.0.0", - "pkg-conf": "2.1.0", - "plur": "2.1.2", - "pretty-ms": "3.1.0", - "require-precompiled": "0.1.0", - "resolve-cwd": "2.0.0", - "safe-buffer": "5.1.2", - "semver": "5.5.0", - "slash": "1.0.0", - "source-map-support": "0.5.6", - "stack-utils": "1.0.1", - "strip-ansi": "4.0.0", - "strip-bom-buf": "1.0.0", - "supertap": "1.0.0", - "supports-color": "5.4.0", - "trim-off-newlines": "1.0.1", - "unique-temp-dir": "1.0.0", - "update-notifier": "2.5.0" + "@ava/babel-preset-stage-4": "^1.1.0", + "@ava/babel-preset-transform-test-files": "^3.0.0", + "@ava/write-file-atomic": "^2.2.0", + "@concordance/react": "^1.0.0", + "@ladjs/time-require": "^0.1.4", + "ansi-escapes": "^3.0.0", + "ansi-styles": "^3.1.0", + "arr-flatten": "^1.0.1", + "array-union": "^1.0.1", + "array-uniq": "^1.0.2", + "arrify": "^1.0.0", + "auto-bind": "^1.1.0", + "ava-init": "^0.2.0", + "babel-core": "^6.17.0", + "babel-generator": "^6.26.0", + "babel-plugin-syntax-object-rest-spread": "^6.13.0", + "bluebird": "^3.0.0", + "caching-transform": "^1.0.0", + "chalk": "^2.0.1", + "chokidar": "^1.4.2", + "clean-stack": "^1.1.1", + "clean-yaml-object": "^0.1.0", + "cli-cursor": "^2.1.0", + "cli-spinners": "^1.0.0", + "cli-truncate": "^1.0.0", + "co-with-promise": "^4.6.0", + "code-excerpt": "^2.1.1", + "common-path-prefix": "^1.0.0", + "concordance": "^3.0.0", + "convert-source-map": "^1.5.1", + "core-assert": "^0.2.0", + "currently-unhandled": "^0.4.1", + "debug": "^3.0.1", + "dot-prop": "^4.1.0", + "empower-core": "^0.6.1", + "equal-length": "^1.0.0", + "figures": "^2.0.0", + "find-cache-dir": "^1.0.0", + "fn-name": "^2.0.0", + "get-port": "^3.0.0", + "globby": "^6.0.0", + "has-flag": "^2.0.0", + "hullabaloo-config-manager": "^1.1.0", + "ignore-by-default": "^1.0.0", + "import-local": "^0.1.1", + "indent-string": "^3.0.0", + "is-ci": "^1.0.7", + "is-generator-fn": "^1.0.0", + "is-obj": "^1.0.0", + "is-observable": "^1.0.0", + "is-promise": "^2.1.0", + "last-line-stream": "^1.0.0", + "lodash.clonedeepwith": "^4.5.0", + "lodash.debounce": "^4.0.3", + "lodash.difference": "^4.3.0", + "lodash.flatten": "^4.2.0", + "loud-rejection": "^1.2.0", + "make-dir": "^1.0.0", + "matcher": "^1.0.0", + "md5-hex": "^2.0.0", + "meow": "^3.7.0", + "ms": "^2.0.0", + "multimatch": "^2.1.0", + "observable-to-promise": "^0.5.0", + "option-chain": "^1.0.0", + "package-hash": "^2.0.0", + "pkg-conf": "^2.0.0", + "plur": "^2.0.0", + "pretty-ms": "^3.0.0", + "require-precompiled": "^0.1.0", + "resolve-cwd": "^2.0.0", + "safe-buffer": "^5.1.1", + "semver": "^5.4.1", + "slash": "^1.0.0", + "source-map-support": "^0.5.0", + "stack-utils": "^1.0.1", + "strip-ansi": "^4.0.0", + "strip-bom-buf": "^1.0.0", + "supertap": "^1.0.0", + "supports-color": "^5.0.0", + "trim-off-newlines": "^1.0.1", + "unique-temp-dir": "^1.0.0", + "update-notifier": "^2.3.0" }, "dependencies": { "ansi-regex": { @@ -2438,11 +2778,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -2463,7 +2803,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "strip-ansi": { @@ -2472,7 +2812,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -2483,11 +2823,11 @@ "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", "dev": true, "requires": { - "arr-exclude": "1.0.0", - "execa": "0.7.0", - "has-yarn": "1.0.0", - "read-pkg-up": "2.0.0", - "write-pkg": "3.1.0" + "arr-exclude": "^1.0.0", + "execa": "^0.7.0", + "has-yarn": "^1.0.0", + "read-pkg-up": "^2.0.0", + "write-pkg": "^3.1.0" } }, "aws-sign2": { @@ -2505,8 +2845,8 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { - "follow-redirects": "1.5.0", - "is-buffer": "1.1.6" + "follow-redirects": "^1.3.0", + "is-buffer": "^1.1.5" } }, "babel-code-frame": { @@ -2515,9 +2855,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "ansi-styles": { @@ -2532,11 +2872,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "supports-color": { @@ -2553,25 +2893,25 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.1", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.10", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.1", + "debug": "^2.6.9", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.8", + "slash": "^1.0.0", + "source-map": "^0.5.7" }, "dependencies": { "debug": { @@ -2591,14 +2931,14 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.10", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" }, "dependencies": { "jsesc": { @@ -2615,9 +2955,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-call-delegate": { @@ -2626,10 +2966,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-explode-assignable-expression": { @@ -2638,9 +2978,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { @@ -2649,11 +2989,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { @@ -2662,8 +3002,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-hoist-variables": { @@ -2672,8 +3012,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-regex": { @@ -2682,9 +3022,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.10" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-remap-async-to-generator": { @@ -2693,11 +3033,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helpers": { @@ -2706,8 +3046,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-messages": { @@ -2716,7 +3056,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-check-es2015-constants": { @@ -2725,7 +3065,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-espower": { @@ -2734,13 +3074,13 @@ "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", "dev": true, "requires": { - "babel-generator": "6.26.1", - "babylon": "6.18.0", - "call-matcher": "1.0.1", - "core-js": "2.5.6", - "espower-location-detector": "1.0.0", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "babel-generator": "^6.1.0", + "babylon": "^6.1.0", + "call-matcher": "^1.0.0", + "core-js": "^2.0.0", + "espower-location-detector": "^1.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.1.1" } }, "babel-plugin-syntax-async-functions": { @@ -2773,9 +3113,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-destructuring": { @@ -2784,7 +3124,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -2793,9 +3133,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -2804,10 +3144,10 @@ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -2816,12 +3156,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-spread": { @@ -2830,7 +3170,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -2839,9 +3179,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -2850,9 +3190,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -2861,9 +3201,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-strict-mode": { @@ -2872,8 +3212,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-register": { @@ -2882,13 +3222,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "6.26.3", - "babel-runtime": "6.26.0", - "core-js": "2.5.6", - "home-or-tmp": "2.0.0", - "lodash": "4.17.10", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.17.4", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.15" }, "dependencies": { "source-map-support": { @@ -2897,7 +3237,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } } } @@ -2908,8 +3248,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.6", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -2918,11 +3258,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.10" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -2931,15 +3271,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.10" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" }, "dependencies": { "debug": { @@ -2959,10 +3299,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.10", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -2981,13 +3321,13 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -2995,7 +3335,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -3003,7 +3343,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -3011,7 +3351,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -3019,9 +3359,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -3032,7 +3372,7 @@ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "binary-extensions": { @@ -3053,13 +3393,13 @@ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", "dev": true, "requires": { - "ansi-align": "2.0.0", - "camelcase": "4.1.0", - "chalk": "2.4.1", - "cli-boxes": "1.0.0", - "string-width": "2.1.1", - "term-size": "1.2.0", - "widest-line": "2.0.0" + "ansi-align": "^2.0.0", + "camelcase": "^4.0.0", + "chalk": "^2.0.1", + "cli-boxes": "^1.0.0", + "string-width": "^2.0.0", + "term-size": "^1.2.0", + "widest-line": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -3086,8 +3426,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -3096,7 +3436,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -3106,7 +3446,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -3115,16 +3455,16 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -3132,7 +3472,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -3155,9 +3495,9 @@ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, "buffer-from": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", - "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", + "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==" }, "builtin-modules": { "version": "1.1.1", @@ -3170,7 +3510,7 @@ "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", "requires": { - "long": "3.2.0" + "long": "~3" }, "dependencies": { "long": { @@ -3185,15 +3525,15 @@ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "cacheable-request": { @@ -3225,9 +3565,9 @@ "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" }, "dependencies": { "md5-hex": { @@ -3236,7 +3576,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "write-file-atomic": { @@ -3245,9 +3585,9 @@ "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } } } @@ -3258,10 +3598,10 @@ "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", "dev": true, "requires": { - "core-js": "2.5.6", - "deep-equal": "1.0.1", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "core-js": "^2.0.0", + "deep-equal": "^1.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.0.0" } }, "call-me-maybe": { @@ -3280,7 +3620,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "0.2.0" + "callsites": "^0.2.0" } }, "callsites": { @@ -3300,8 +3640,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "capture-stack-trace": { @@ -3320,7 +3660,7 @@ "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", "dev": true, "requires": { - "underscore-contrib": "0.3.0" + "underscore-contrib": "~0.3.0" } }, "center-align": { @@ -3330,8 +3670,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -3340,9 +3680,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "chardet": { @@ -3357,15 +3697,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -3374,7 +3714,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -3389,7 +3729,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -3411,10 +3751,10 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -3422,7 +3762,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -3451,7 +3791,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "^2.0.0" } }, "cli-spinners": { @@ -3466,8 +3806,8 @@ "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", "dev": true, "requires": { - "slice-ansi": "1.0.0", - "string-width": "2.1.1" + "slice-ansi": "^1.0.0", + "string-width": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -3488,8 +3828,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -3498,7 +3838,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -3514,9 +3854,9 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone-response": { @@ -3525,7 +3865,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "1.0.0" + "mimic-response": "^1.0.0" } }, "co": { @@ -3539,7 +3879,7 @@ "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", "dev": true, "requires": { - "pinkie-promise": "1.0.0" + "pinkie-promise": "^1.0.0" } }, "code-excerpt": { @@ -3548,7 +3888,7 @@ "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", "dev": true, "requires": { - "convert-to-spaces": "1.0.2" + "convert-to-spaces": "^1.0.1" } }, "code-point-at": { @@ -3563,7 +3903,7 @@ "dev": true, "requires": { "argv": "0.0.2", - "request": "2.87.0", + "request": "^2.81.0", "urlgrey": "0.4.4" } }, @@ -3572,8 +3912,8 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color-convert": { @@ -3582,7 +3922,7 @@ "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "dev": true, "requires": { - "color-name": "1.1.3" + "color-name": "^1.1.1" } }, "color-name": { @@ -3607,7 +3947,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -3643,10 +3983,10 @@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { - "buffer-from": "1.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "concordance": { @@ -3655,17 +3995,17 @@ "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", "dev": true, "requires": { - "date-time": "2.1.0", - "esutils": "2.0.2", - "fast-diff": "1.1.2", - "function-name-support": "0.2.0", - "js-string-escape": "1.0.1", - "lodash.clonedeep": "4.5.0", - "lodash.flattendeep": "4.4.0", - "lodash.merge": "4.6.1", - "md5-hex": "2.0.0", - "semver": "5.5.0", - "well-known-symbols": "1.0.0" + "date-time": "^2.1.0", + "esutils": "^2.0.2", + "fast-diff": "^1.1.1", + "function-name-support": "^0.2.0", + "js-string-escape": "^1.0.1", + "lodash.clonedeep": "^4.5.0", + "lodash.flattendeep": "^4.4.0", + "lodash.merge": "^4.6.0", + "md5-hex": "^2.0.0", + "semver": "^5.3.0", + "well-known-symbols": "^1.0.0" }, "dependencies": { "date-time": { @@ -3674,7 +4014,7 @@ "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", "dev": true, "requires": { - "time-zone": "1.0.0" + "time-zone": "^1.0.0" } } } @@ -3685,12 +4025,12 @@ "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { - "dot-prop": "4.2.0", - "graceful-fs": "4.1.11", - "make-dir": "1.3.0", - "unique-string": "1.0.0", - "write-file-atomic": "2.3.0", - "xdg-basedir": "3.0.0" + "dot-prop": "^4.1.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "unique-string": "^1.0.0", + "write-file-atomic": "^2.0.0", + "xdg-basedir": "^3.0.0" } }, "convert-source-map": { @@ -3706,9 +4046,9 @@ "dev": true }, "cookiejar": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz", - "integrity": "sha1-Qa1XsbVVlR7BcUEqgZQrHoIA00o=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", + "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", "dev": true }, "copy-descriptor": { @@ -3722,14 +4062,14 @@ "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", "dev": true, "requires": { - "buf-compare": "1.0.1", - "is-error": "2.2.1" + "buf-compare": "^1.0.0", + "is-error": "^2.2.0" } }, "core-js": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz", - "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ==" + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==" }, "core-util-is": { "version": "1.0.2", @@ -3741,7 +4081,7 @@ "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "requires": { - "capture-stack-trace": "1.0.0" + "capture-stack-trace": "^1.0.0" } }, "cross-spawn": { @@ -3750,9 +4090,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "crypto-random-string": { @@ -3767,7 +4107,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "d": { @@ -3776,7 +4116,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.42" + "es5-ext": "^0.10.9" } }, "dashdash": { @@ -3784,7 +4124,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "date-time": { @@ -3817,7 +4157,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "1.0.0" + "mimic-response": "^1.0.0" } }, "deep-equal": { @@ -3827,9 +4167,9 @@ "dev": true }, "deep-extend": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true }, "deep-is": { @@ -3843,8 +4183,8 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.11" + "foreach": "^2.0.5", + "object-keys": "^1.0.8" } }, "define-property": { @@ -3852,8 +4192,8 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -3861,7 +4201,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -3869,7 +4209,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -3877,9 +4217,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -3890,13 +4230,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" }, "dependencies": { "globby": { @@ -3905,12 +4245,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -3931,7 +4271,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } } } @@ -3941,7 +4281,7 @@ "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", "requires": { - "p-defer": "1.0.0" + "p-defer": "^1.0.0" } }, "delayed-stream": { @@ -3955,7 +4295,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "diff": { @@ -3974,8 +4314,8 @@ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" + "arrify": "^1.0.1", + "path-type": "^3.0.0" } }, "doctrine": { @@ -3984,7 +4324,7 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "2.0.2" + "esutils": "^2.0.2" } }, "dom-serializer": { @@ -3993,8 +4333,8 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -4017,7 +4357,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -4026,8 +4366,8 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "dot-prop": { @@ -4036,7 +4376,7 @@ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { - "is-obj": "1.0.1" + "is-obj": "^1.0.0" } }, "duplexer3": { @@ -4050,10 +4390,10 @@ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "eastasianwidth": { @@ -4067,7 +4407,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "ecdsa-sig-formatter": { @@ -4075,7 +4415,7 @@ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz", "integrity": "sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "empower": { @@ -4083,8 +4423,8 @@ "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", "requires": { - "core-js": "2.5.6", - "empower-core": "0.6.2" + "core-js": "^2.0.0", + "empower-core": "^0.6.2" } }, "empower-assert": { @@ -4093,7 +4433,7 @@ "integrity": "sha512-Ylck0Q6p8y/LpNzYeBccaxAPm2ZyuqBgErgZpO9KT0HuQWF0sJckBKCLmgS1/DEXEiyBi9XtYh3clZm5cAdARw==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.2.0" } }, "empower-core": { @@ -4102,7 +4442,7 @@ "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", "requires": { "call-signature": "0.0.2", - "core-js": "2.5.6" + "core-js": "^2.0.0" } }, "end-of-stream": { @@ -4110,7 +4450,7 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "ent": { @@ -4136,18 +4476,18 @@ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es5-ext": { - "version": "0.10.42", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz", - "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==", + "version": "0.10.45", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz", + "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", "dev": true, "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.1", + "next-tick": "1" } }, "es6-error": { @@ -4162,9 +4502,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.42", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, "es6-map": { @@ -4173,12 +4513,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.42", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", + "es6-set": "~0.1.5", + "es6-symbol": "~3.1.1", + "event-emitter": "~0.3.5" } }, "es6-set": { @@ -4187,11 +4527,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.42", - "es6-iterator": "2.0.3", + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "event-emitter": "~0.3.5" } }, "es6-symbol": { @@ -4200,8 +4540,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.42" + "d": "1", + "es5-ext": "~0.10.14" } }, "es6-weak-map": { @@ -4210,10 +4550,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.42", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.14", + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" } }, "escallmatch": { @@ -4222,8 +4562,8 @@ "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", "dev": true, "requires": { - "call-matcher": "1.0.1", - "esprima": "2.7.3" + "call-matcher": "^1.0.0", + "esprima": "^2.0.0" }, "dependencies": { "esprima": { @@ -4241,16 +4581,16 @@ "dev": true }, "escodegen": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz", - "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz", + "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==", "dev": true, "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.6.1" + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "dependencies": { "esprima": { @@ -4274,10 +4614,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "es6-map": "^0.1.3", + "es6-weak-map": "^2.0.1", + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint": { @@ -4286,44 +4626,44 @@ "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", "dev": true, "requires": { - "ajv": "5.5.2", - "babel-code-frame": "6.26.0", - "chalk": "2.4.1", - "concat-stream": "1.6.2", - "cross-spawn": "5.1.0", - "debug": "3.1.0", - "doctrine": "2.1.0", - "eslint-scope": "3.7.1", - "eslint-visitor-keys": "1.0.0", - "espree": "3.5.4", - "esquery": "1.0.1", - "esutils": "2.0.2", - "file-entry-cache": "2.0.0", - "functional-red-black-tree": "1.0.1", - "glob": "7.1.2", - "globals": "11.5.0", - "ignore": "3.3.8", - "imurmurhash": "0.1.4", - "inquirer": "3.3.0", - "is-resolvable": "1.1.0", - "js-yaml": "3.11.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.10", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "optionator": "0.8.2", - "path-is-inside": "1.0.2", - "pluralize": "7.0.0", - "progress": "2.0.0", - "regexpp": "1.1.0", - "require-uncached": "1.0.3", - "semver": "5.5.0", - "strip-ansi": "4.0.0", - "strip-json-comments": "2.0.1", + "ajv": "^5.3.0", + "babel-code-frame": "^6.22.0", + "chalk": "^2.1.0", + "concat-stream": "^1.6.0", + "cross-spawn": "^5.1.0", + "debug": "^3.1.0", + "doctrine": "^2.1.0", + "eslint-scope": "^3.7.1", + "eslint-visitor-keys": "^1.0.0", + "espree": "^3.5.4", + "esquery": "^1.0.0", + "esutils": "^2.0.2", + "file-entry-cache": "^2.0.0", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.0.1", + "ignore": "^3.3.3", + "imurmurhash": "^0.1.4", + "inquirer": "^3.0.6", + "is-resolvable": "^1.0.0", + "js-yaml": "^3.9.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.4", + "minimatch": "^3.0.2", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "pluralize": "^7.0.0", + "progress": "^2.0.0", + "regexpp": "^1.0.1", + "require-uncached": "^1.0.3", + "semver": "^5.3.0", + "strip-ansi": "^4.0.0", + "strip-json-comments": "~2.0.1", "table": "4.0.2", - "text-table": "0.2.0" + "text-table": "~0.2.0" }, "dependencies": { "ansi-regex": { @@ -4344,7 +4684,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -4355,7 +4695,7 @@ "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", "dev": true, "requires": { - "get-stdin": "5.0.1" + "get-stdin": "^5.0.1" }, "dependencies": { "get-stdin": { @@ -4372,10 +4712,10 @@ "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", "dev": true, "requires": { - "ignore": "3.3.8", - "minimatch": "3.0.4", - "resolve": "1.7.1", - "semver": "5.5.0" + "ignore": "^3.3.6", + "minimatch": "^3.0.4", + "resolve": "^1.3.3", + "semver": "^5.4.1" }, "dependencies": { "resolve": { @@ -4384,7 +4724,7 @@ "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } } } @@ -4395,8 +4735,8 @@ "integrity": "sha512-floiaI4F7hRkTrFe8V2ItOK97QYrX75DjmdzmVITZoAP6Cn06oEDPQRsO6MlHEP/u2SxI3xQ52Kpjw6j5WGfeQ==", "dev": true, "requires": { - "fast-diff": "1.1.2", - "jest-docblock": "21.2.0" + "fast-diff": "^1.1.1", + "jest-docblock": "^21.0.0" } }, "eslint-scope": { @@ -4405,8 +4745,8 @@ "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", "dev": true, "requires": { - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint-visitor-keys": { @@ -4421,16 +4761,16 @@ "integrity": "sha512-F4TY1qYJB1aUyzB03NsZksZzUQmQoEBaTUjRJGR30GxbkbjKI41NhCyYjrF+bGgWN7x/ZsczYppRpz/0WdI0ug==", "dev": true, "requires": { - "array-find": "1.0.0", - "escallmatch": "1.5.0", - "escodegen": "1.9.1", - "escope": "3.6.0", - "espower-location-detector": "1.0.0", - "espurify": "1.8.0", - "estraverse": "4.2.0", - "source-map": "0.5.7", - "type-name": "2.0.2", - "xtend": "4.0.1" + "array-find": "^1.0.0", + "escallmatch": "^1.5.0", + "escodegen": "^1.7.0", + "escope": "^3.3.0", + "espower-location-detector": "^1.0.0", + "espurify": "^1.3.0", + "estraverse": "^4.1.0", + "source-map": "^0.5.0", + "type-name": "^2.0.0", + "xtend": "^4.0.0" } }, "espower-loader": { @@ -4439,11 +4779,11 @@ "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", "dev": true, "requires": { - "convert-source-map": "1.5.1", - "espower-source": "2.2.0", - "minimatch": "3.0.4", - "source-map-support": "0.4.18", - "xtend": "4.0.1" + "convert-source-map": "^1.1.0", + "espower-source": "^2.0.0", + "minimatch": "^3.0.0", + "source-map-support": "^0.4.0", + "xtend": "^4.0.0" }, "dependencies": { "source-map-support": { @@ -4452,7 +4792,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } } } @@ -4463,10 +4803,10 @@ "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", "dev": true, "requires": { - "is-url": "1.2.4", - "path-is-absolute": "1.0.1", - "source-map": "0.5.7", - "xtend": "4.0.1" + "is-url": "^1.2.1", + "path-is-absolute": "^1.0.0", + "source-map": "^0.5.0", + "xtend": "^4.0.0" } }, "espower-source": { @@ -4475,23 +4815,23 @@ "integrity": "sha1-fgBSVa5HtcE2RIZEs/PYAtUD91I=", "dev": true, "requires": { - "acorn": "5.5.3", - "acorn-es7-plugin": "1.1.7", - "convert-source-map": "1.5.1", - "empower-assert": "1.1.0", - "escodegen": "1.9.1", - "espower": "2.1.1", - "estraverse": "4.2.0", - "merge-estraverse-visitors": "1.0.0", - "multi-stage-sourcemap": "0.2.1", - "path-is-absolute": "1.0.1", - "xtend": "4.0.1" + "acorn": "^5.0.0", + "acorn-es7-plugin": "^1.0.10", + "convert-source-map": "^1.1.1", + "empower-assert": "^1.0.0", + "escodegen": "^1.6.1", + "espower": "^2.0.0", + "estraverse": "^4.0.0", + "merge-estraverse-visitors": "^1.0.0", + "multi-stage-sourcemap": "^0.2.1", + "path-is-absolute": "^1.0.0", + "xtend": "^4.0.0" }, "dependencies": { "acorn": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", - "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz", + "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==", "dev": true } } @@ -4502,14 +4842,14 @@ "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", "dev": true, "requires": { - "acorn": "5.5.3", - "acorn-jsx": "3.0.1" + "acorn": "^5.5.0", + "acorn-jsx": "^3.0.0" }, "dependencies": { "acorn": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", - "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz", + "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==", "dev": true } } @@ -4525,7 +4865,7 @@ "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.0.tgz", "integrity": "sha512-jdkJG9jswjKCCDmEridNUuIQei9algr+o66ZZ19610ZoBsiWLRsQGNYS4HGez3Z/DsR0lhANGAqiwBUclPuNag==", "requires": { - "core-js": "2.5.6" + "core-js": "^2.0.0" } }, "esquery": { @@ -4534,7 +4874,7 @@ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.0.0" } }, "esrecurse": { @@ -4543,7 +4883,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.1.0" } }, "estraverse": { @@ -4563,8 +4903,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.42" + "d": "1", + "es5-ext": "~0.10.14" } }, "execa": { @@ -4573,13 +4913,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "expand-brackets": { @@ -4587,13 +4927,13 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "debug": { @@ -4609,7 +4949,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -4617,7 +4957,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -4628,7 +4968,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.4" + "fill-range": "^2.1.0" }, "dependencies": { "fill-range": { @@ -4637,11 +4977,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.0.0", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^3.0.0", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "is-number": { @@ -4650,7 +4990,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "isobject": { @@ -4668,7 +5008,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -4683,8 +5023,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -4692,7 +5032,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -4703,9 +5043,9 @@ "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.23", - "tmp": "0.0.33" + "chardet": "^0.4.0", + "iconv-lite": "^0.4.17", + "tmp": "^0.0.33" } }, "extglob": { @@ -4713,14 +5053,14 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -4728,7 +5068,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -4736,7 +5076,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -4744,7 +5084,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4752,7 +5092,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4760,9 +5100,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4788,12 +5128,12 @@ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz", "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==", "requires": { - "@mrmlnc/readdir-enhanced": "2.2.1", - "@nodelib/fs.stat": "1.0.2", - "glob-parent": "3.1.0", - "is-glob": "4.0.0", - "merge2": "1.2.2", - "micromatch": "3.1.10" + "@mrmlnc/readdir-enhanced": "^2.2.1", + "@nodelib/fs.stat": "^1.0.1", + "glob-parent": "^3.1.0", + "is-glob": "^4.0.0", + "merge2": "^1.2.1", + "micromatch": "^3.1.10" } }, "fast-json-stable-stringify": { @@ -4813,7 +5153,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-entry-cache": { @@ -4822,8 +5162,8 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "1.3.0", - "object-assign": "4.1.1" + "flat-cache": "^1.2.1", + "object-assign": "^4.0.1" } }, "filename-regex": { @@ -4838,8 +5178,8 @@ "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", "dev": true, "requires": { - "is-object": "1.0.1", - "merge-descriptors": "1.0.1" + "is-object": "~1.0.1", + "merge-descriptors": "~1.0.0" } }, "fill-range": { @@ -4847,10 +5187,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -4858,7 +5198,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -4869,9 +5209,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "1.3.0", - "pkg-dir": "2.0.0" + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" } }, "find-up": { @@ -4880,7 +5220,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "flat-cache": { @@ -4889,10 +5229,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "0.3.3", - "del": "2.2.2", - "graceful-fs": "4.1.11", - "write": "0.2.1" + "circular-json": "^0.3.1", + "del": "^2.0.2", + "graceful-fs": "^4.1.2", + "write": "^0.2.1" } }, "fn-name": { @@ -4906,7 +5246,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "requires": { - "debug": "3.1.0" + "debug": "^3.1.0" } }, "for-in": { @@ -4920,7 +5260,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreach": { @@ -4938,9 +5278,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "0.4.0", + "asynckit": "^0.4.0", "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "mime-types": "^2.1.12" } }, "formidable": { @@ -4954,7 +5294,7 @@ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "from2": { @@ -4963,8 +5303,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" } }, "fs-extra": { @@ -4973,9 +5313,9 @@ "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.1" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs.realpath": { @@ -4990,8 +5330,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { @@ -5017,8 +5357,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -5031,7 +5371,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -5095,7 +5435,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -5110,14 +5450,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -5126,12 +5466,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -5146,7 +5486,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -5155,7 +5495,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -5164,8 +5504,8 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -5184,7 +5524,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -5198,7 +5538,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -5211,8 +5551,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -5221,7 +5561,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -5244,9 +5584,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -5255,16 +5595,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -5273,8 +5613,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -5289,8 +5629,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -5299,10 +5639,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -5321,7 +5661,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -5342,8 +5682,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -5364,10 +5704,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -5384,13 +5724,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -5399,7 +5739,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -5442,9 +5782,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -5453,7 +5793,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -5461,7 +5801,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -5476,13 +5816,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -5497,7 +5837,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -5529,8 +5869,8 @@ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", "requires": { - "axios": "0.18.0", - "extend": "3.0.1", + "axios": "^0.18.0", + "extend": "^3.0.1", "retry-axios": "0.3.2" } }, @@ -5568,7 +5908,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -5576,12 +5916,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -5590,8 +5930,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -5600,7 +5940,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -5615,7 +5955,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -5625,8 +5965,8 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -5634,7 +5974,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -5650,7 +5990,7 @@ "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", "dev": true, "requires": { - "ini": "1.3.5" + "ini": "^1.3.4" } }, "globals": { @@ -5664,27 +6004,27 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "fast-glob": "2.2.2", - "glob": "7.1.2", - "ignore": "3.3.8", - "pify": "3.0.0", - "slash": "1.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "fast-glob": "^2.0.2", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" } }, "google-auth-library": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.5.0.tgz", - "integrity": "sha512-xpibA/hkq4waBcpIkSJg4GiDAqcBWjJee3c47zj7xP3RQ0A9mc8MP3Vc9sc8SGRoDYA0OszZxTjW7SbcC4pJIA==", - "requires": { - "axios": "0.18.0", - "gcp-metadata": "0.6.3", - "gtoken": "2.3.0", - "jws": "3.1.5", - "lodash.isstring": "4.0.1", - "lru-cache": "4.1.3", - "retry-axios": "0.3.2" + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.6.1.tgz", + "integrity": "sha512-jYiWC8NA9n9OtQM7ANn0Tk464do9yhKEtaJ72pKcaBiEwn4LwcGYIYOfwtfsSm3aur/ed3tlSxbmg24IAT6gAg==", + "requires": { + "axios": "^0.18.0", + "gcp-metadata": "^0.6.3", + "gtoken": "^2.3.0", + "jws": "^3.1.5", + "lodash.isstring": "^4.0.1", + "lru-cache": "^4.1.3", + "retry-axios": "^0.3.2" } }, "google-auto-auth": { @@ -5692,10 +6032,10 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", "requires": { - "async": "2.6.1", - "gcp-metadata": "0.6.3", - "google-auth-library": "1.5.0", - "request": "2.87.0" + "async": "^2.3.0", + "gcp-metadata": "^0.6.1", + "google-auth-library": "^1.3.1", + "request": "^2.79.0" } }, "google-gax": { @@ -5703,16 +6043,43 @@ "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.1.tgz", "integrity": "sha512-eP7UUkKvaHmmvCrr+rxzkIOeEKOnXmoib7/AkENDAuqlC9T2+lWlzwpthDRnitQcV8SblDMzsk73YPMPCDwPyQ==", "requires": { - "duplexify": "3.6.0", - "extend": "3.0.1", - "globby": "8.0.1", - "google-auto-auth": "0.10.1", - "google-proto-files": "0.15.1", - "grpc": "1.11.3", - "is-stream-ended": "0.1.4", - "lodash": "4.17.10", - "protobufjs": "6.8.6", - "through2": "2.0.3" + "duplexify": "^3.5.4", + "extend": "^3.0.0", + "globby": "^8.0.0", + "google-auto-auth": "^0.10.0", + "google-proto-files": "^0.15.0", + "grpc": "^1.10.0", + "is-stream-ended": "^0.1.0", + "lodash": "^4.17.2", + "protobufjs": "^6.8.0", + "through2": "^2.0.3" + }, + "dependencies": { + "google-proto-files": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", + "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", + "requires": { + "globby": "^7.1.1", + "power-assert": "^1.4.4", + "protobufjs": "^6.8.0" + }, + "dependencies": { + "globby": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", + "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", + "requires": { + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" + } + } + } + } } }, "google-p12-pem": { @@ -5720,33 +6087,18 @@ "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", "requires": { - "node-forge": "0.7.5", - "pify": "3.0.0" + "node-forge": "^0.7.4", + "pify": "^3.0.0" } }, "google-proto-files": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", - "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.16.0.tgz", + "integrity": "sha512-ZVW1m38l6dJGTqOXuEQnr5VfWxkOsdkDetWGUchq8zXbo3PSVlZU7VQM/YS1pbc/6+mZy3R+xirctVaoLzIhXw==", "requires": { - "globby": "7.1.1", - "power-assert": "1.5.0", - "protobufjs": "6.8.6" - }, - "dependencies": { - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.2", - "ignore": "3.3.8", - "pify": "3.0.0", - "slash": "1.0.0" - } - } + "globby": "^8.0.0", + "power-assert": "^1.4.4", + "protobufjs": "^6.8.0" } }, "got": { @@ -5755,23 +6107,23 @@ "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", "dev": true, "requires": { - "@sindresorhus/is": "0.7.0", - "cacheable-request": "2.1.4", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "into-stream": "3.1.0", - "is-retry-allowed": "1.1.0", - "isurl": "1.0.0", - "lowercase-keys": "1.0.1", - "mimic-response": "1.0.0", - "p-cancelable": "0.3.0", - "p-timeout": "2.0.1", - "pify": "3.0.0", - "safe-buffer": "5.1.2", - "timed-out": "4.0.1", - "url-parse-lax": "3.0.0", - "url-to-options": "1.0.1" + "@sindresorhus/is": "^0.7.0", + "cacheable-request": "^2.1.1", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "into-stream": "^3.1.0", + "is-retry-allowed": "^1.1.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "mimic-response": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^2.0.1", + "pify": "^3.0.0", + "safe-buffer": "^5.1.1", + "timed-out": "^4.0.1", + "url-parse-lax": "^3.0.0", + "url-to-options": "^1.0.1" }, "dependencies": { "prepend-http": { @@ -5786,7 +6138,7 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "2.0.0" + "prepend-http": "^2.0.0" } } } @@ -5804,428 +6156,495 @@ "dev": true }, "grpc": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.11.3.tgz", - "integrity": "sha512-7fJ40USpnP7hxGK0uRoEhJz6unA5VUdwInfwAY2rK2+OVxdDJSdTZQ/8/M+1tW68pHZYgHvg2ohvJ+clhW3ANg==", - "requires": { - "lodash": "4.17.10", - "nan": "2.10.0", - "node-pre-gyp": "0.10.0", - "protobufjs": "5.0.3" + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.12.3.tgz", + "integrity": "sha512-QPwbAXRXd8IyXAhTdUVgjEqSdvXoTq5uFWSo+eGMTcra12PBJUkAceD+1AUVOx1GqBY74/7T7eB7BB+UOcOY8w==", + "requires": { + "lodash": "^4.17.5", + "nan": "^2.0.0", + "node-pre-gyp": "^0.10.0", + "protobufjs": "^5.0.3" }, "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "aproba": { "version": "1.2.0", - "bundled": true + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" }, "are-we-there-yet": { "version": "1.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "chownr": { "version": "1.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" }, "code-point-at": { "version": "1.1.0", - "bundled": true + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "concat-map": { "version": "0.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "core-util-is": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "debug": { "version": "2.6.9", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" } }, "deep-extend": { "version": "0.5.1", - "bundled": true + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==" }, "delegates": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "detect-libc": { "version": "1.0.3", - "bundled": true + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { "version": "7.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { "version": "2.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "iconv-lite": { - "version": "0.4.19", - "bundled": true + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { "version": "2.0.3", - "bundled": true + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { "version": "1.3.5", - "bundled": true + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { "version": "1.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { "version": "1.2.0", - "bundled": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "minipass": { - "version": "2.2.4", - "bundled": true, + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz", + "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==", "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz", + "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==", "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" }, "dependencies": { "minimist": { "version": "0.0.8", - "bundled": true + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" } } }, "ms": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "needle": { "version": "2.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz", + "integrity": "sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==", "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.19", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { "version": "0.10.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz", + "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==", "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.1", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.2" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { "version": "1.0.3", - "bundled": true + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", + "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==" }, "npm-packlist": { "version": "1.1.10", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", + "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "object-assign": { "version": "4.1.1", - "bundled": true + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-tmpdir": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { "version": "1.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "process-nextick-args": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "protobufjs": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz", "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==", "requires": { - "ascli": "1.0.1", - "bytebuffer": "5.0.1", - "glob": "7.1.2", - "yargs": "3.32.0" + "ascli": "~1", + "bytebuffer": "~5", + "glob": "^7.0.5", + "yargs": "^3.10.0" } }, "rc": { "version": "1.2.7", - "bundled": true, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", + "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" } }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { "version": "2.6.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { - "version": "5.1.1", - "bundled": true + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sax": { "version": "1.2.4", - "bundled": true + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "semver": { "version": "5.5.0", - "bundled": true + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" }, "set-blocking": { "version": "2.0.0", - "bundled": true + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "signal-exit": { "version": "3.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { "version": "2.0.1", - "bundled": true + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, "tar": { "version": "4.4.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz", + "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==", "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.2", - "yallist": "3.0.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "bundled": true - } + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" } }, "util-deprecate": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "wide-align": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { "version": "1.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "yallist": { "version": "3.0.2", - "bundled": true + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" } } }, @@ -6234,11 +6653,11 @@ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", "requires": { - "axios": "0.18.0", - "google-p12-pem": "1.0.2", - "jws": "3.1.5", - "mime": "2.3.1", - "pify": "3.0.0" + "axios": "^0.18.0", + "google-p12-pem": "^1.0.0", + "jws": "^3.1.4", + "mime": "^2.2.0", + "pify": "^3.0.0" } }, "handlebars": { @@ -6247,10 +6666,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "async": { @@ -6265,7 +6684,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -6280,8 +6699,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" } }, "has-ansi": { @@ -6290,7 +6709,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-color": { @@ -6317,7 +6736,7 @@ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "dev": true, "requires": { - "has-symbol-support-x": "1.4.2" + "has-symbol-support-x": "^1.4.1" } }, "has-value": { @@ -6325,9 +6744,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -6335,8 +6754,8 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -6344,7 +6763,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6367,8 +6786,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.1" } }, "hosted-git-info": { @@ -6383,12 +6802,12 @@ "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "dev": true, "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.2", - "domutils": "1.7.0", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "http-cache-semantics": { @@ -6402,9 +6821,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "hullabaloo-config-manager": { @@ -6413,20 +6832,20 @@ "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", "dev": true, "requires": { - "dot-prop": "4.2.0", - "es6-error": "4.1.1", - "graceful-fs": "4.1.11", - "indent-string": "3.2.0", - "json5": "0.5.1", - "lodash.clonedeep": "4.5.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.isequal": "4.5.0", - "lodash.merge": "4.6.1", - "md5-hex": "2.0.0", - "package-hash": "2.0.0", - "pkg-dir": "2.0.0", - "resolve-from": "3.0.0", - "safe-buffer": "5.1.2" + "dot-prop": "^4.1.0", + "es6-error": "^4.0.2", + "graceful-fs": "^4.1.11", + "indent-string": "^3.1.0", + "json5": "^0.5.1", + "lodash.clonedeep": "^4.5.0", + "lodash.clonedeepwith": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.merge": "^4.6.0", + "md5-hex": "^2.0.0", + "package-hash": "^2.0.0", + "pkg-dir": "^2.0.0", + "resolve-from": "^3.0.0", + "safe-buffer": "^5.0.1" } }, "iconv-lite": { @@ -6435,7 +6854,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore": { @@ -6461,8 +6880,8 @@ "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", "dev": true, "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^2.0.0", + "resolve-cwd": "^2.0.0" } }, "imurmurhash": { @@ -6487,8 +6906,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -6508,8 +6927,8 @@ "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", "dev": true, "requires": { - "moment": "2.22.1", - "sanitize-html": "1.18.2" + "moment": "^2.14.1", + "sanitize-html": "^1.13.0" } }, "inquirer": { @@ -6518,20 +6937,20 @@ "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", "dev": true, "requires": { - "ansi-escapes": "3.1.0", - "chalk": "2.4.1", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.2.0", - "figures": "2.0.0", - "lodash": "4.17.10", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^2.0.4", + "figures": "^2.0.0", + "lodash": "^4.3.0", "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx-lite": "4.0.8", - "rx-lite-aggregates": "4.0.8", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" + "run-async": "^2.2.0", + "rx-lite": "^4.0.8", + "rx-lite-aggregates": "^4.0.8", + "string-width": "^2.1.0", + "strip-ansi": "^4.0.0", + "through": "^2.3.6" }, "dependencies": { "ansi-regex": { @@ -6552,8 +6971,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -6562,7 +6981,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -6573,7 +6992,7 @@ "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", "dev": true, "requires": { - "espower-loader": "1.2.2" + "espower-loader": "^1.0.0" } }, "into-stream": { @@ -6582,8 +7001,8 @@ "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", "dev": true, "requires": { - "from2": "2.3.0", - "p-is-promise": "1.1.0" + "from2": "^2.1.1", + "p-is-promise": "^1.1.0" } }, "invariant": { @@ -6592,7 +7011,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -6616,7 +7035,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6624,7 +7043,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6641,7 +7060,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.11.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -6655,7 +7074,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-ci": { @@ -6664,7 +7083,7 @@ "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", "dev": true, "requires": { - "ci-info": "1.1.3" + "ci-info": "^1.0.0" } }, "is-data-descriptor": { @@ -6672,7 +7091,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6680,7 +7099,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6690,9 +7109,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -6714,7 +7133,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-error": { @@ -6739,7 +7158,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -6747,7 +7166,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-generator-fn": { @@ -6761,7 +7180,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-installed-globally": { @@ -6770,8 +7189,8 @@ "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", "dev": true, "requires": { - "global-dirs": "0.1.1", - "is-path-inside": "1.0.1" + "global-dirs": "^0.1.0", + "is-path-inside": "^1.0.0" } }, "is-npm": { @@ -6785,7 +7204,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6793,7 +7212,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6816,7 +7235,7 @@ "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", "dev": true, "requires": { - "symbol-observable": "1.2.0" + "symbol-observable": "^1.1.0" } }, "is-odd": { @@ -6824,7 +7243,7 @@ "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", "requires": { - "is-number": "4.0.0" + "is-number": "^4.0.0" }, "dependencies": { "is-number": { @@ -6846,7 +7265,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "is-path-inside": "1.0.1" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -6855,7 +7274,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-obj": { @@ -6869,7 +7288,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-posix-bracket": { @@ -6962,14 +7381,35 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "istanbul-lib-coverage": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz", + "integrity": "sha512-yMSw5xLIbdaxiVXHk3amfNM2WeBxLrwH/BCyZ9HvA/fylwziAIJOG2rKqWyLqEJqwKT725vxxqidv+SyynnGAA==", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.2.0.tgz", + "integrity": "sha512-ozQGtlIw+/a/F3n6QwWiuuyRAPp64+g2GVsKYsIez0sgIEzkU5ZpL2uZ5pmAzbEJ82anlRaPlOQZzkRXspgJyg==", + "dev": true, + "requires": { + "@babel/generator": "7.0.0-beta.49", + "@babel/parser": "7.0.0-beta.49", + "@babel/template": "7.0.0-beta.49", + "@babel/traverse": "7.0.0-beta.49", + "@babel/types": "7.0.0-beta.49", + "istanbul-lib-coverage": "^2.0.0", + "semver": "^5.5.0" + } + }, "isurl": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "dev": true, "requires": { - "has-to-string-tag-x": "1.4.1", - "is-object": "1.0.1" + "has-to-string-tag-x": "^1.2.0", + "is-object": "^1.0.1" } }, "jest-docblock": { @@ -6991,13 +7431,13 @@ "dev": true }, "js-yaml": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz", - "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==", + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", + "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "4.0.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "js2xmlparser": { @@ -7006,7 +7446,7 @@ "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", "dev": true, "requires": { - "xmlcreate": "1.0.2" + "xmlcreate": "^1.0.1" } }, "jsbn": { @@ -7022,17 +7462,17 @@ "dev": true, "requires": { "babylon": "7.0.0-beta.19", - "bluebird": "3.5.1", - "catharsis": "0.8.9", - "escape-string-regexp": "1.0.5", - "js2xmlparser": "3.0.0", - "klaw": "2.0.0", - "marked": "0.3.19", - "mkdirp": "0.5.1", - "requizzle": "0.2.1", - "strip-json-comments": "2.0.1", + "bluebird": "~3.5.0", + "catharsis": "~0.8.9", + "escape-string-regexp": "~1.0.5", + "js2xmlparser": "~3.0.0", + "klaw": "~2.0.0", + "marked": "~0.3.6", + "mkdirp": "~0.5.1", + "requizzle": "~0.2.1", + "strip-json-comments": "~2.0.1", "taffydb": "2.6.2", - "underscore": "1.8.3" + "underscore": "~1.8.3" }, "dependencies": { "babylon": { @@ -7094,7 +7534,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsprim": { @@ -7121,7 +7561,7 @@ "requires": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.10", - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "jws": { @@ -7129,8 +7569,8 @@ "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz", "integrity": "sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==", "requires": { - "jwa": "1.1.6", - "safe-buffer": "5.1.2" + "jwa": "^1.1.5", + "safe-buffer": "^5.0.1" } }, "keyv": { @@ -7153,7 +7593,7 @@ "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "last-line-stream": { @@ -7162,7 +7602,7 @@ "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", "dev": true, "requires": { - "through2": "2.0.3" + "through2": "^2.0.0" } }, "latest-version": { @@ -7171,7 +7611,7 @@ "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "dev": true, "requires": { - "package-json": "4.0.1" + "package-json": "^4.0.0" } }, "lazy-cache": { @@ -7186,7 +7626,7 @@ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "levn": { @@ -7195,8 +7635,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "load-json-file": { @@ -7205,10 +7645,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" }, "dependencies": { "pify": { @@ -7225,8 +7665,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -7326,9 +7766,9 @@ "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" }, "lolex": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz", - "integrity": "sha512-e1UtIo1pbrIqEXib/yMjHciyqkng5lc0rrIbytgjmRgDR9+2ceNIAcwOWSgylRjoEP9VdVguCSRwnNmlbnOUwA==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz", + "integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg==", "dev": true }, "long": { @@ -7348,7 +7788,7 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "loud-rejection": { @@ -7357,8 +7797,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lowercase-keys": { @@ -7372,8 +7812,8 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "make-dir": { @@ -7382,7 +7822,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "map-cache": { @@ -7401,7 +7841,7 @@ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "marked": { @@ -7411,12 +7851,12 @@ "dev": true }, "matcher": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.0.tgz", - "integrity": "sha512-aZGv6JBTHqfqAd09jmAlbKnAICTfIvb5Z8gXVxPB5WZtFfHMaAMdACL7tQflD2V+6/8KNcY8s6DYtWLgpJP5lA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz", + "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.4" } }, "math-random": { @@ -7431,7 +7871,7 @@ "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { @@ -7446,7 +7886,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "meow": { @@ -7455,16 +7895,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" }, "dependencies": { "find-up": { @@ -7473,8 +7913,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "load-json-file": { @@ -7483,11 +7923,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "minimist": { @@ -7502,7 +7942,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-type": { @@ -7511,9 +7951,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -7534,7 +7974,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "read-pkg": { @@ -7543,9 +7983,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -7554,8 +7994,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "strip-bom": { @@ -7564,7 +8004,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } } } @@ -7581,7 +8021,7 @@ "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.0.0" } }, "merge2": { @@ -7605,19 +8045,19 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "mime": { @@ -7635,7 +8075,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "1.33.0" + "mime-db": "~1.33.0" } }, "mimic-fn": { @@ -7655,7 +8095,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -7669,8 +8109,8 @@ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -7678,7 +8118,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -7723,9 +8163,9 @@ "dev": true }, "moment": { - "version": "2.22.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", - "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==", + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", + "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=", "dev": true }, "ms": { @@ -7739,7 +8179,7 @@ "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "source-map": "0.1.43" + "source-map": "^0.1.34" }, "dependencies": { "source-map": { @@ -7748,7 +8188,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -7759,10 +8199,10 @@ "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", "dev": true, "requires": { - "array-differ": "1.0.0", - "array-union": "1.0.2", - "arrify": "1.0.1", - "minimatch": "3.0.4" + "array-differ": "^1.0.0", + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "minimatch": "^3.0.0" } }, "mute-stream": { @@ -7781,18 +8221,18 @@ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-odd": "^2.0.0", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "natural-compare": { @@ -7808,16 +8248,16 @@ "dev": true }, "nise": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz", - "integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.1.tgz", + "integrity": "sha512-9JX3YwoIt3kS237scmSSOpEv7vCukVzLfwK0I0XhocDSHUANid8ZHnLEULbbSkfeMn98B2y5kphIWzZUylESRQ==", "dev": true, "requires": { - "@sinonjs/formatio": "2.0.0", - "just-extend": "1.1.27", - "lolex": "2.6.0", - "path-to-regexp": "1.7.0", - "text-encoding": "0.6.4" + "@sinonjs/formatio": "^2.0.0", + "just-extend": "^1.1.27", + "lolex": "^2.3.2", + "path-to-regexp": "^1.7.0", + "text-encoding": "^0.6.4" } }, "node-forge": { @@ -7831,10 +8271,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -7843,7 +8283,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "normalize-url": { @@ -7852,9 +8292,9 @@ "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", "dev": true, "requires": { - "prepend-http": "2.0.0", - "query-string": "5.1.1", - "sort-keys": "2.0.0" + "prepend-http": "^2.0.0", + "query-string": "^5.0.1", + "sort-keys": "^2.0.0" }, "dependencies": { "prepend-http": { @@ -7871,7 +8311,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { @@ -7880,411 +8320,323 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "nyc": { - "version": "11.8.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.8.0.tgz", - "integrity": "sha512-PUFq1PSsx5OinSk5g5aaZygcDdI3QQT5XUlbR9QRMihtMS6w0Gm8xj4BxmKeeAlpQXC5M2DIhH16Y+KejceivQ==", - "dev": true, - "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.2.0", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.10.1", - "istanbul-lib-report": "1.1.3", - "istanbul-lib-source-maps": "1.2.3", - "istanbul-reports": "1.4.0", - "md5-hex": "1.3.0", - "merge-source-map": "1.1.0", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.2.1", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-12.0.2.tgz", + "integrity": "sha1-ikpO1pCWbBHsWH/4fuoMEsl0upk=", + "dev": true, + "requires": { + "archy": "^1.0.0", + "arrify": "^1.0.1", + "caching-transform": "^1.0.0", + "convert-source-map": "^1.5.1", + "debug-log": "^1.0.1", + "default-require-extensions": "^1.0.0", + "find-cache-dir": "^0.1.1", + "find-up": "^2.1.0", + "foreground-child": "^1.5.3", + "glob": "^7.0.6", + "istanbul-lib-coverage": "^1.2.0", + "istanbul-lib-hook": "^1.1.0", + "istanbul-lib-instrument": "^2.1.0", + "istanbul-lib-report": "^1.1.3", + "istanbul-lib-source-maps": "^1.2.5", + "istanbul-reports": "^1.4.1", + "md5-hex": "^1.2.0", + "merge-source-map": "^1.1.0", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.0", + "resolve-from": "^2.0.0", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.1", + "spawn-wrap": "^1.4.2", + "test-exclude": "^4.2.0", "yargs": "11.1.0", - "yargs-parser": "8.1.0" + "yargs-parser": "^8.0.0" }, "dependencies": { "align-text": { "version": "0.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "bundled": true, + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, "append-transform": { "version": "0.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", + "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", "dev": true, "requires": { - "default-require-extensions": "1.0.0" + "default-require-extensions": "^1.0.0" } }, "archy": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, "arr-diff": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", "dev": true }, "arr-flatten": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "arr-union": { "version": "3.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, "array-unique": { "version": "0.3.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, "arrify": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, "assign-symbols": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, "async": { "version": "1.5.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "dev": true }, "atob": { "version": "2.1.1", - "bundled": true, - "dev": true - }, - "babel-code-frame": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - } - }, - "babel-generator": { - "version": "6.26.1", - "bundled": true, - "dev": true, - "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.10", - "source-map": "0.5.7", - "trim-right": "1.0.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "core-js": "2.5.6", - "regenerator-runtime": "0.11.1" - } - }, - "babel-template": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.10" - } - }, - "babel-traverse": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.10" - } - }, - "babel-types": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.10", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", + "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", "dev": true }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, "base": { "version": "0.11.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, "kind-of": { "version": "6.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", "dev": true } } }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "braces": { "version": "2.3.2", - "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } }, "builtin-modules": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, "cache-base": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "caching-transform": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", + "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" } }, "camelcase": { "version": "1.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", "dev": true, "optional": true }, "center-align": { "version": "0.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - } - }, - "chalk": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "class-utils": { "version": "0.3.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { "version": "0.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } - }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true } } }, "cliui": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { "wordwrap": { "version": "0.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", "dev": true, "optional": true } @@ -8292,60 +8644,64 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, "collection-visit": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "commondir": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, "component-emitter": { "version": "1.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "dev": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, "convert-source-map": { "version": "1.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", "dev": true }, "copy-descriptor": { "version": "0.1.1", - "bundled": true, - "dev": true - }, - "core-js": { - "version": "2.5.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "dev": true }, "cross-spawn": { "version": "4.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "debug": { - "version": "2.6.9", - "bundled": true, + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -8353,888 +8709,862 @@ }, "debug-log": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", + "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", "dev": true }, "decamelize": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, "decode-uri-component": { "version": "0.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, "default-require-extensions": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", + "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", "dev": true, "requires": { - "strip-bom": "2.0.0" + "strip-bom": "^2.0.0" } }, "define-property": { "version": "2.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=", "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, "kind-of": { "version": "6.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", "dev": true } } }, - "detect-indent": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, "error-ex": { "version": "1.3.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, - "escape-string-regexp": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "esutils": { - "version": "2.0.2", - "bundled": true, - "dev": true - }, "execa": { "version": "0.7.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { "version": "5.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } }, "expand-brackets": { "version": "2.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "define-property": { "version": "0.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } }, "extend-shallow": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } }, "extglob": { "version": "2.0.4", - "bundled": true, - "dev": true, - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=", + "dev": true, + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { "version": "6.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", "dev": true } } }, "fill-range": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } }, "find-cache-dir": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", + "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "for-in": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, "foreground-child": { "version": "1.5.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", + "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", "dev": true, "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" + "cross-spawn": "^4", + "signal-exit": "^3.0.0" } }, "fragment-cache": { "version": "0.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, "get-caller-file": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", "dev": true }, "get-stream": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", "dev": true }, "get-value": { "version": "2.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, "glob": { "version": "7.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, - "globals": { - "version": "9.18.0", - "bundled": true, - "dev": true - }, "graceful-fs": { "version": "4.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, "handlebars": { "version": "4.0.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "source-map": { "version": "0.4.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } }, - "has-ansi": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-flag": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, "has-value": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, "kind-of": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } }, "hosted-git-info": { "version": "2.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", + "integrity": "sha1-IyNbKasjDFdqqw1PE/wEawsDgiI=", "dev": true }, "imurmurhash": { "version": "0.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, - "invariant": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "loose-envify": "1.3.1" - } - }, "invert-kv": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", "dev": true }, "is-accessor-descriptor": { "version": "0.1.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-arrayish": { "version": "0.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, "is-buffer": { "version": "1.1.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", "dev": true }, "is-builtin-module": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-data-descriptor": { "version": "0.1.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-descriptor": { "version": "0.1.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { "version": "5.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", "dev": true } } }, "is-extendable": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true }, - "is-finite": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, "is-fullwidth-code-point": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, "is-number": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-odd": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", + "integrity": "sha1-dkZiRnH9fqVYzNmieVGC8pWPGyQ=", "dev": true, "requires": { - "is-number": "4.0.0" + "is-number": "^4.0.0" }, "dependencies": { "is-number": { "version": "4.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=", "dev": true } } }, "is-plain-object": { "version": "2.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "isobject": "^3.0.1" } }, "is-stream": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, "is-utf8": { "version": "0.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, "is-windows": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=", "dev": true }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, "isexe": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, "isobject": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, "istanbul-lib-coverage": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz", + "integrity": "sha1-99jy5CuX43/nlhFMsPnWi146Q0E=", "dev": true }, "istanbul-lib-hook": { "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "append-transform": "0.4.0" - } - }, - "istanbul-lib-instrument": { - "version": "1.10.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", + "integrity": "sha1-hTjZcDcss3FtU+VVI91UtVeo2Js=", "dev": true, "requires": { - "babel-generator": "6.26.1", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.2.0", - "semver": "5.5.0" + "append-transform": "^0.4.0" } }, "istanbul-lib-report": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz", + "integrity": "sha1-LfEhiMD6d5kMDSF20tC6M5QYglk=", "dev": true, "requires": { - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "istanbul-lib-coverage": "^1.1.2", + "mkdirp": "^0.5.1", + "path-parse": "^1.0.5", + "supports-color": "^3.1.2" }, "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, "supports-color": { "version": "3.2.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } }, "istanbul-lib-source-maps": { - "version": "1.2.3", - "bundled": true, + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz", + "integrity": "sha1-/+a+Tnq4bTYD5CkNVJkLFFBvybE=", "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "debug": "^3.1.0", + "istanbul-lib-coverage": "^1.2.0", + "mkdirp": "^0.5.1", + "rimraf": "^2.6.1", + "source-map": "^0.5.3" } }, "istanbul-reports": { - "version": "1.4.0", - "bundled": true, + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.4.1.tgz", + "integrity": "sha1-Ty6OkoqnoF0dpsQn1AmLJlXsczQ=", "dev": true, "requires": { - "handlebars": "4.0.11" + "handlebars": "^4.0.3" } }, - "js-tokens": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "jsesc": { - "version": "1.3.0", - "bundled": true, - "dev": true - }, "kind-of": { "version": "3.2.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-cache": { "version": "1.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", "dev": true, "optional": true }, "lcid": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "load-json-file": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "locate-path": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" }, "dependencies": { "path-exists": { "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true } } }, - "lodash": { - "version": "4.17.10", - "bundled": true, - "dev": true - }, "longest": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", "dev": true }, - "loose-envify": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "js-tokens": "3.0.2" - } - }, "lru-cache": { "version": "4.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", + "integrity": "sha1-oRdc80lt/IQ2wVbDNLSVWZK85pw=", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "map-cache": { "version": "0.2.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, "map-visit": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "md5-hex": { "version": "1.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", + "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", + "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", "dev": true }, "mem": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "merge-source-map": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", + "integrity": "sha1-L93n5gIJOfcJBqaPLXrmheTIxkY=", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { "version": "0.6.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "dev": true } } }, "micromatch": { "version": "3.1.10", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" }, "dependencies": { "kind-of": { "version": "6.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", "dev": true } } }, "mimic-fn": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=", "dev": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true }, "mixin-deep": { "version": "1.3.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=", "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" @@ -9242,1008 +9572,771 @@ }, "ms": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, "nanomatch": { "version": "1.2.9", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha1-h59xUMstq3pHElkGbBBO7m4Pp8I=", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-odd": "^2.0.0", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { - "arr-diff": { - "version": "4.0.0", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "bundled": true, - "dev": true - }, "kind-of": { "version": "6.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", "dev": true } } }, "normalize-package-data": { "version": "2.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "npm-run-path": { "version": "2.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, "object-copy": { "version": "0.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { "version": "0.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } }, "object-visit": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "isobject": "^3.0.0" } }, "object.pick": { "version": "1.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "3.0.1" - }, - "dependencies": { - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - } + "isobject": "^3.0.1" } }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "optimist": { "version": "0.6.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, "os-locale": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "p-finally": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, "p-limit": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", + "integrity": "sha1-DpK2vty1nwIsE9DxlJ3ILRWQnxw=", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.2.0" + "p-limit": "^1.1.0" } }, "p-try": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, "parse-json": { "version": "2.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "pascalcase": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, "path-exists": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, "path-key": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "dev": true }, "path-parse": { "version": "1.0.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", "dev": true }, "path-type": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { "version": "2.3.0", - "bundled": true, - "dev": true + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true }, "pinkie": { "version": "2.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", "dev": true }, "pinkie-promise": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", + "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" }, "dependencies": { "find-up": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } }, "posix-character-classes": { "version": "0.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", "dev": true }, "pseudomap": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", "dev": true }, "read-pkg": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } }, - "regenerator-runtime": { - "version": "0.11.1", - "bundled": true, - "dev": true - }, "regex-not": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=", "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "repeat-element": { "version": "1.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", "dev": true }, "repeat-string": { "version": "1.6.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, - "repeating": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-finite": "1.0.2" - } - }, "require-directory": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, "require-main-filename": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, "resolve-from": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=", "dev": true }, "resolve-url": { "version": "0.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, "ret": { "version": "0.1.15", - "bundled": true, + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=", "dev": true }, "right-align": { "version": "0.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { "version": "2.6.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-regex": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "semver": { "version": "5.5.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", "dev": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, "set-value": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", + "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } }, "shebang-command": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, "slide": { "version": "1.1.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", + "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", "dev": true }, "snapdragon": { "version": "0.8.2", - "bundled": true, - "dev": true, - "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.1", - "use": "3.1.0" + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=", + "dev": true, + "requires": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "ms": "2.0.0" } }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "source-map": { - "version": "0.5.7", - "bundled": true, - "dev": true - }, - "source-map-resolve": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" - } - }, - "source-map-url": { - "version": "0.4.0", - "bundled": true, - "dev": true - }, - "spawn-wrap": { - "version": "1.4.2", - "bundled": true, - "dev": true, - "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.0" - } - }, - "spdx-correct": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "bundled": true, - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "split-string": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "3.0.2" - } - }, - "static-extend": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" - }, - "dependencies": { "define-property": { "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - } - } - }, - "string-width": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "test-exclude": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "requires": { - "arrify": "1.0.1", - "micromatch": "3.1.10", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" - }, - "dependencies": { - "arr-diff": { - "version": "4.0.0", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "bundled": true, - "dev": true - }, - "braces": { - "version": "2.3.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "expand-brackets": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - } - }, - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true - } + "is-descriptor": "^0.1.0" } }, - "extglob": { - "version": "2.0.4", - "bundled": true, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } + "is-extendable": "^0.1.0" } - }, - "fill-range": { - "version": "4.0.0", - "bundled": true, + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", + "dev": true, + "requires": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "is-number": { - "version": "3.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", "dev": true, "requires": { - "kind-of": "3.2.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, "kind-of": { "version": "6.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", "dev": true - }, - "micromatch": { - "version": "3.1.10", - "bundled": true, + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", + "dev": true, + "requires": { + "kind-of": "^3.2.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "source-map-resolve": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", + "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=", + "dev": true, + "requires": { + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", + "dev": true + }, + "spawn-wrap": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", + "integrity": "sha1-z/WOc6giRhe2Vhq9wyWG6gyCJIw=", + "dev": true, + "requires": { + "foreground-child": "^1.5.6", + "mkdirp": "^0.5.0", + "os-homedir": "^1.0.1", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" + } + }, + "spdx-correct": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", + "integrity": "sha1-BaW01xU6GVvJLDxCW2nzsqlSTII=", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", + "integrity": "sha1-LHrmEFbHFKW5ubKyr30xHvXHj+k=", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", + "integrity": "sha1-enzShHDMbToc/m1miG9rxDDTrIc=", + "dev": true + }, + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", + "dev": true, + "requires": { + "extend-shallow": "^3.0.0" + } + }, + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dev": true, + "requires": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "is-descriptor": "^0.1.0" } } } }, - "to-fast-properties": { - "version": "1.0.3", - "bundled": true, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "^0.2.0" + } + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, + "test-exclude": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.1.tgz", + "integrity": "sha1-36Ii8DSAvKaSB8pyizfXS0X3JPo=", + "dev": true, + "requires": { + "arrify": "^1.0.1", + "micromatch": "^3.1.8", + "object-assign": "^4.1.0", + "read-pkg-up": "^1.0.1", + "require-main-filename": "^1.0.1" + } + }, "to-object-path": { "version": "0.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "to-regex": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=", "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - } + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, - "trim-right": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, "uglify-js": { "version": "2.8.29", - "bundled": true, + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "yargs": { "version": "3.10.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -10251,64 +10344,71 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", "dev": true, "optional": true }, "union-value": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", + "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { "version": "0.4.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", + "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } }, "unset-value": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { "version": "0.3.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "dev": true, "requires": { "isarray": "1.0.0" @@ -10318,191 +10418,210 @@ }, "has-values": { "version": "0.1.4", - "bundled": true, - "dev": true - }, - "isobject": { - "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", "dev": true } } }, "urix": { "version": "0.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "dev": true }, "use": { "version": "3.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", + "integrity": "sha1-FHFr8D/f79AwQK71jYtLhfOnxUQ=", "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" }, "dependencies": { "kind-of": { "version": "6.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", "dev": true } } }, "validate-npm-package-license": { "version": "3.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", + "integrity": "sha1-gWQ7y+8b3+zUYjeT3EZIlIupgzg=", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "which": { - "version": "1.3.0", - "bundled": true, + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, "window-size": { "version": "0.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", "dev": true, "optional": true }, "wordwrap": { "version": "0.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", "dev": true }, "wrap-ansi": { "version": "2.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" }, "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "ansi-regex": "^2.0.0" } } } }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "write-file-atomic": { "version": "1.3.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", + "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } }, "y18n": { "version": "3.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", "dev": true }, "yallist": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", "dev": true }, "yargs": { "version": "11.1.0", - "bundled": true, - "dev": true, - "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "integrity": "sha1-kLhpk07W6HERXqL/WLA/RyTtLXc=", + "dev": true, + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" }, "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, "camelcase": { "version": "4.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", "dev": true }, "cliui": { "version": "4.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "3.0.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "yargs-parser": { "version": "9.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } }, "yargs-parser": { "version": "8.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz", + "integrity": "sha1-8TdqM7Ziml0GN4KUTacyYx6WaVA=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { "version": "4.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", "dev": true } } @@ -10525,9 +10644,9 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -10535,7 +10654,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "kind-of": { @@ -10543,7 +10662,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -10558,7 +10677,7 @@ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.omit": { @@ -10567,8 +10686,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "object.pick": { @@ -10576,7 +10695,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "observable-to-promise": { @@ -10585,8 +10704,8 @@ "integrity": "sha1-yCjw8NxH6fhq+KSXfF1VB2znqR8=", "dev": true, "requires": { - "is-observable": "0.2.0", - "symbol-observable": "1.2.0" + "is-observable": "^0.2.0", + "symbol-observable": "^1.0.4" }, "dependencies": { "is-observable": { @@ -10595,7 +10714,7 @@ "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", "dev": true, "requires": { - "symbol-observable": "0.2.4" + "symbol-observable": "^0.2.2" }, "dependencies": { "symbol-observable": { @@ -10613,7 +10732,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -10622,7 +10741,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "optimist": { @@ -10631,8 +10750,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "option-chain": { @@ -10647,12 +10766,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" }, "dependencies": { "wordwrap": { @@ -10679,7 +10798,7 @@ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "os-tmpdir": { @@ -10712,12 +10831,12 @@ "dev": true }, "p-limit": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", - "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -10726,7 +10845,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.2.0" + "p-limit": "^1.1.0" } }, "p-timeout": { @@ -10735,7 +10854,7 @@ "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", "dev": true, "requires": { - "p-finally": "1.0.0" + "p-finally": "^1.0.0" } }, "p-try": { @@ -10750,10 +10869,10 @@ "integrity": "sha1-eK4ybIngWk2BO2hgGXevBcANKg0=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "lodash.flattendeep": "4.4.0", - "md5-hex": "2.0.0", - "release-zalgo": "1.0.0" + "graceful-fs": "^4.1.11", + "lodash.flattendeep": "^4.4.0", + "md5-hex": "^2.0.0", + "release-zalgo": "^1.0.0" } }, "package-json": { @@ -10762,10 +10881,10 @@ "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", "dev": true, "requires": { - "got": "6.7.1", - "registry-auth-token": "3.3.2", - "registry-url": "3.1.0", - "semver": "5.5.0" + "got": "^6.7.1", + "registry-auth-token": "^3.0.1", + "registry-url": "^3.0.3", + "semver": "^5.1.0" }, "dependencies": { "got": { @@ -10774,17 +10893,17 @@ "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { - "create-error-class": "3.0.2", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "is-redirect": "1.0.0", - "is-retry-allowed": "1.1.0", - "is-stream": "1.1.0", - "lowercase-keys": "1.0.1", - "safe-buffer": "5.1.2", - "timed-out": "4.0.1", - "unzip-response": "2.0.1", - "url-parse-lax": "1.0.0" + "create-error-class": "^3.0.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-redirect": "^1.0.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "lowercase-keys": "^1.0.0", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "unzip-response": "^2.0.1", + "url-parse-lax": "^1.0.0" } } } @@ -10795,10 +10914,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "is-extglob": { @@ -10813,7 +10932,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -10824,7 +10943,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "parse-ms": { @@ -10894,7 +11013,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "performance-now": { @@ -10919,7 +11038,7 @@ "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", "dev": true, "requires": { - "pinkie": "1.0.0" + "pinkie": "^1.0.0" } }, "pkg-conf": { @@ -10928,8 +11047,8 @@ "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", "dev": true, "requires": { - "find-up": "2.1.0", - "load-json-file": "4.0.0" + "find-up": "^2.0.0", + "load-json-file": "^4.0.0" }, "dependencies": { "load-json-file": { @@ -10938,10 +11057,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "4.0.0", - "pify": "3.0.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" } }, "parse-json": { @@ -10950,8 +11069,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.1", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } } } @@ -10962,7 +11081,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "2.1.0" + "find-up": "^2.1.0" } }, "plur": { @@ -10971,7 +11090,7 @@ "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", "dev": true, "requires": { - "irregular-plurals": "1.4.0" + "irregular-plurals": "^1.0.0" } }, "pluralize": { @@ -10991,9 +11110,9 @@ "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", "dev": true, "requires": { - "chalk": "2.4.1", - "source-map": "0.6.1", - "supports-color": "5.4.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" }, "dependencies": { "source-map": { @@ -11009,11 +11128,11 @@ "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.5.0.tgz", "integrity": "sha512-WaWSw+Ts283o6dzxW1BxIxoaHok7aSSGx4SaR6dW62Pk31ynv9DERDieuZpPYv5XaJ+H+zdcOaJQ+PvlasAOVw==", "requires": { - "define-properties": "1.1.2", - "empower": "1.2.3", - "power-assert-formatter": "1.4.1", - "universal-deep-strict-equal": "1.2.2", - "xtend": "4.0.1" + "define-properties": "^1.1.2", + "empower": "^1.2.3", + "power-assert-formatter": "^1.3.1", + "universal-deep-strict-equal": "^1.2.1", + "xtend": "^4.0.0" } }, "power-assert-context-formatter": { @@ -11021,8 +11140,8 @@ "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.1.1.tgz", "integrity": "sha1-7bo1LT7YpgMRTWZyZazOYNaJzN8=", "requires": { - "core-js": "2.5.6", - "power-assert-context-traversal": "1.1.1" + "core-js": "^2.0.0", + "power-assert-context-traversal": "^1.1.1" } }, "power-assert-context-reducer-ast": { @@ -11030,11 +11149,11 @@ "resolved": "https://registry.npmjs.org/power-assert-context-reducer-ast/-/power-assert-context-reducer-ast-1.1.2.tgz", "integrity": "sha1-SEqZ4m9Jc/+IMuXFzHVnAuYJQXQ=", "requires": { - "acorn": "4.0.13", - "acorn-es7-plugin": "1.1.7", - "core-js": "2.5.6", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "acorn": "^4.0.0", + "acorn-es7-plugin": "^1.0.12", + "core-js": "^2.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.2.0" } }, "power-assert-context-traversal": { @@ -11042,8 +11161,8 @@ "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.1.1.tgz", "integrity": "sha1-iMq8oNE7Y1nwfT0+ivppkmRXftk=", "requires": { - "core-js": "2.5.6", - "estraverse": "4.2.0" + "core-js": "^2.0.0", + "estraverse": "^4.1.0" } }, "power-assert-formatter": { @@ -11051,13 +11170,13 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "2.5.6", - "power-assert-context-formatter": "1.1.1", - "power-assert-context-reducer-ast": "1.1.2", - "power-assert-renderer-assertion": "1.1.1", - "power-assert-renderer-comparison": "1.1.1", - "power-assert-renderer-diagram": "1.1.2", - "power-assert-renderer-file": "1.1.1" + "core-js": "^2.0.0", + "power-assert-context-formatter": "^1.0.7", + "power-assert-context-reducer-ast": "^1.0.7", + "power-assert-renderer-assertion": "^1.0.7", + "power-assert-renderer-comparison": "^1.0.7", + "power-assert-renderer-diagram": "^1.0.7", + "power-assert-renderer-file": "^1.0.7" } }, "power-assert-renderer-assertion": { @@ -11065,8 +11184,8 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.1.1.tgz", "integrity": "sha1-y/wOd+AIao+Wrz8djme57n4ozpg=", "requires": { - "power-assert-renderer-base": "1.1.1", - "power-assert-util-string-width": "1.1.1" + "power-assert-renderer-base": "^1.1.1", + "power-assert-util-string-width": "^1.1.1" } }, "power-assert-renderer-base": { @@ -11079,11 +11198,11 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.1.1.tgz", "integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=", "requires": { - "core-js": "2.5.6", - "diff-match-patch": "1.0.1", - "power-assert-renderer-base": "1.1.1", - "stringifier": "1.3.0", - "type-name": "2.0.2" + "core-js": "^2.0.0", + "diff-match-patch": "^1.0.0", + "power-assert-renderer-base": "^1.1.1", + "stringifier": "^1.3.0", + "type-name": "^2.0.1" } }, "power-assert-renderer-diagram": { @@ -11091,10 +11210,10 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.1.2.tgz", "integrity": "sha1-ZV+PcRk1qbbVQbhjJ2VHF8Y3qYY=", "requires": { - "core-js": "2.5.6", - "power-assert-renderer-base": "1.1.1", - "power-assert-util-string-width": "1.1.1", - "stringifier": "1.3.0" + "core-js": "^2.0.0", + "power-assert-renderer-base": "^1.1.1", + "power-assert-util-string-width": "^1.1.1", + "stringifier": "^1.3.0" } }, "power-assert-renderer-file": { @@ -11102,7 +11221,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-file/-/power-assert-renderer-file-1.1.1.tgz", "integrity": "sha1-o34rvReMys0E5427eckv40kzxec=", "requires": { - "power-assert-renderer-base": "1.1.1" + "power-assert-renderer-base": "^1.1.1" } }, "power-assert-util-string-width": { @@ -11110,7 +11229,7 @@ "resolved": "https://registry.npmjs.org/power-assert-util-string-width/-/power-assert-util-string-width-1.1.1.tgz", "integrity": "sha1-vmWet5N/3S5smncmjar2S9W3xZI=", "requires": { - "eastasianwidth": "0.1.1" + "eastasianwidth": "^0.1.1" } }, "prelude-ls": { @@ -11132,19 +11251,18 @@ "dev": true }, "prettier": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz", - "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=", + "version": "1.13.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.5.tgz", + "integrity": "sha512-4M90mfvLz6yRf2Dhzd+xPIE6b4xkI8nHMJhsSm9IlfG17g6wujrrm7+H1X8x52tC4cSNm6HmuhCUSNe6Hd5wfw==", "dev": true }, "pretty-ms": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-3.1.0.tgz", - "integrity": "sha1-6crJx2v27lL+lC3ZxsQhMVOxKIE=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-3.2.0.tgz", + "integrity": "sha512-ZypexbfVUGTFxb0v+m1bUyy92DHe5SyYlnyY0msyms5zd3RwyvNgyxZZsXXgoyzlxjx5MiqtXUdhUfvQbe0A2Q==", "dev": true, "requires": { - "parse-ms": "1.0.1", - "plur": "2.1.2" + "parse-ms": "^1.0.0" }, "dependencies": { "parse-ms": { @@ -11177,19 +11295,19 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/base64": "1.1.2", - "@protobufjs/codegen": "2.0.4", - "@protobufjs/eventemitter": "1.1.0", - "@protobufjs/fetch": "1.1.0", - "@protobufjs/float": "1.0.2", - "@protobufjs/inquire": "1.1.0", - "@protobufjs/path": "1.1.2", - "@protobufjs/pool": "1.1.0", - "@protobufjs/utf8": "1.1.0", - "@types/long": "3.0.32", - "@types/node": "8.10.17", - "long": "4.0.0" + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^3.0.32", + "@types/node": "^8.9.4", + "long": "^4.0.0" } }, "proxyquire": { @@ -11198,9 +11316,9 @@ "integrity": "sha512-fQr3VQrbdzHrdaDn3XuisVoJlJNDJizHAvUXw9IuXRR8BpV2x0N7LsCxrpJkeKfPbNjiNU/V5vc008cI0TmzzQ==", "dev": true, "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.5.0" + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.0", + "resolve": "~1.5.0" }, "dependencies": { "resolve": { @@ -11209,7 +11327,7 @@ "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } } } @@ -11235,9 +11353,9 @@ "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", "dev": true, "requires": { - "decode-uri-component": "0.2.0", - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" + "decode-uri-component": "^0.2.0", + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" } }, "randomatic": { @@ -11246,9 +11364,9 @@ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { @@ -11260,15 +11378,15 @@ } }, "rc": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", - "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -11285,9 +11403,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" }, "dependencies": { "path-type": { @@ -11296,7 +11414,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.0.0" } }, "pify": { @@ -11313,8 +11431,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" } }, "readable-stream": { @@ -11322,13 +11440,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -11337,10 +11455,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2", + "set-immediate-shim": "^1.0.1" } }, "redent": { @@ -11349,8 +11467,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" }, "dependencies": { "indent-string": { @@ -11359,7 +11477,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } } } @@ -11382,7 +11500,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "regex-not": { @@ -11390,8 +11508,8 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "regexpp": { @@ -11406,9 +11524,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "registry-auth-token": { @@ -11417,8 +11535,8 @@ "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { - "rc": "1.2.7", - "safe-buffer": "5.1.2" + "rc": "^1.1.6", + "safe-buffer": "^5.0.1" } }, "registry-url": { @@ -11427,7 +11545,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "1.2.7" + "rc": "^1.0.1" } }, "regjsgen": { @@ -11442,7 +11560,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" } }, "release-zalgo": { @@ -11451,7 +11569,7 @@ "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", "dev": true, "requires": { - "es6-error": "4.1.1" + "es6-error": "^4.0.1" } }, "remove-trailing-separator": { @@ -11476,7 +11594,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { @@ -11484,26 +11602,26 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "require-directory": { @@ -11530,8 +11648,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "0.1.0", - "resolve-from": "1.0.1" + "caller-path": "^0.1.0", + "resolve-from": "^1.0.0" }, "dependencies": { "resolve-from": { @@ -11548,7 +11666,7 @@ "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", "dev": true, "requires": { - "underscore": "1.6.0" + "underscore": "~1.6.0" }, "dependencies": { "underscore": { @@ -11571,7 +11689,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-from": { @@ -11591,7 +11709,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "1.0.1" + "lowercase-keys": "^1.0.0" } }, "restore-cursor": { @@ -11600,8 +11718,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" } }, "ret": { @@ -11615,12 +11733,12 @@ "integrity": "sha512-jp4YlI0qyDFfXiXGhkCOliBN1G7fRH03Nqy8YdShzGqbY5/9S2x/IR6C88ls2DFkbWuL3ASkP7QD3pVrNpPgwQ==" }, "retry-request": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.1.tgz", - "integrity": "sha512-PjAmtWIxjNj4Co/6FRtBl8afRP3CxrrIAnUzb1dzydfROd+6xt7xAebFeskgQgkfFf8NmzrXIoaB3HxmswXyxw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.2.tgz", + "integrity": "sha512-WIiGp37XXDC6e7ku3LFoi7LCL/Gs9luGeeqvbPRb+Zl6OQMw4RCRfSaW+aLfE6lhz1R941UavE6Svl3Dm5xGIQ==", "requires": { - "request": "2.87.0", - "through2": "2.0.3" + "request": "^2.81.0", + "through2": "^2.0.0" } }, "right-align": { @@ -11630,7 +11748,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -11639,7 +11757,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "run-async": { @@ -11648,7 +11766,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "2.1.0" + "is-promise": "^2.1.0" } }, "rx-lite": { @@ -11663,7 +11781,7 @@ "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", "dev": true, "requires": { - "rx-lite": "4.0.8" + "rx-lite": "*" } }, "safe-buffer": { @@ -11676,14 +11794,13 @@ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "samsam": { "version": "1.3.0", @@ -11697,16 +11814,16 @@ "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", "dev": true, "requires": { - "chalk": "2.4.1", - "htmlparser2": "3.9.2", - "lodash.clonedeep": "4.5.0", - "lodash.escaperegexp": "4.1.2", - "lodash.isplainobject": "4.0.6", - "lodash.isstring": "4.0.1", - "lodash.mergewith": "4.6.1", - "postcss": "6.0.22", - "srcset": "1.0.0", - "xtend": "4.0.1" + "chalk": "^2.3.0", + "htmlparser2": "^3.9.0", + "lodash.clonedeep": "^4.5.0", + "lodash.escaperegexp": "^4.1.2", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.mergewith": "^4.6.0", + "postcss": "^6.0.14", + "srcset": "^1.0.0", + "xtend": "^4.0.0" } }, "semver": { @@ -11721,7 +11838,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "5.5.0" + "semver": "^5.0.3" } }, "serialize-error": { @@ -11747,10 +11864,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -11758,7 +11875,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11769,7 +11886,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -11790,13 +11907,13 @@ "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", "dev": true, "requires": { - "@sinonjs/formatio": "2.0.0", - "diff": "3.5.0", - "lodash.get": "4.4.2", - "lolex": "2.6.0", - "nise": "1.3.3", - "supports-color": "5.4.0", - "type-detect": "4.0.8" + "@sinonjs/formatio": "^2.0.0", + "diff": "^3.1.0", + "lodash.get": "^4.4.2", + "lolex": "^2.2.0", + "nise": "^1.2.0", + "supports-color": "^5.1.0", + "type-detect": "^4.0.5" } }, "slash": { @@ -11810,7 +11927,7 @@ "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0" + "is-fullwidth-code-point": "^2.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -11832,14 +11949,14 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.0" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "debug": { @@ -11855,7 +11972,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -11863,7 +11980,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11873,9 +11990,9 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -11883,7 +12000,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -11891,7 +12008,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -11899,7 +12016,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -11907,9 +12024,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -11919,7 +12036,7 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { @@ -11927,7 +12044,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11938,7 +12055,7 @@ "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", "dev": true, "requires": { - "is-plain-obj": "1.1.0" + "is-plain-obj": "^1.0.0" } }, "source-map": { @@ -11951,11 +12068,11 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -11964,8 +12081,8 @@ "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "dev": true, "requires": { - "buffer-from": "1.0.0", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -11987,8 +12104,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -12003,8 +12120,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -12018,8 +12135,8 @@ "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz", "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=", "requires": { - "async": "2.6.1", - "is-stream-ended": "0.1.4" + "async": "^2.4.0", + "is-stream-ended": "^0.1.0" } }, "split-string": { @@ -12027,7 +12144,7 @@ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { @@ -12042,23 +12159,24 @@ "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=", "dev": true, "requires": { - "array-uniq": "1.0.3", - "number-is-nan": "1.0.1" + "array-uniq": "^1.0.2", + "number-is-nan": "^1.0.0" } }, "sshpk": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", - "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", + "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "stack-utils": { @@ -12072,8 +12190,8 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -12081,7 +12199,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -12091,7 +12209,7 @@ "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.4.tgz", "integrity": "sha512-D243NJaYs/xBN2QnoiMDY7IesJFIK7gEhnvAYqJa5JvDdnh2dC4qDBwlCf0ohPpX2QRlA/4gnbnPd3rs3KxVcA==", "requires": { - "stubs": "3.0.0" + "stubs": "^3.0.0" } }, "stream-shift": { @@ -12121,9 +12239,9 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -12131,7 +12249,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "stringifier": { @@ -12139,9 +12257,9 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "2.5.6", - "traverse": "0.6.6", - "type-name": "2.0.2" + "core-js": "^2.0.0", + "traverse": "^0.6.6", + "type-name": "^2.0.1" } }, "strip-ansi": { @@ -12149,7 +12267,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -12164,7 +12282,7 @@ "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.1" } }, "strip-eof": { @@ -12179,7 +12297,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "strip-json-comments": { @@ -12199,16 +12317,16 @@ "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", "dev": true, "requires": { - "component-emitter": "1.2.1", - "cookiejar": "2.1.1", - "debug": "3.1.0", - "extend": "3.0.1", - "form-data": "2.3.2", - "formidable": "1.2.1", - "methods": "1.1.2", - "mime": "1.6.0", - "qs": "6.5.2", - "readable-stream": "2.3.6" + "component-emitter": "^1.2.0", + "cookiejar": "^2.1.0", + "debug": "^3.1.0", + "extend": "^3.0.0", + "form-data": "^2.3.1", + "formidable": "^1.2.0", + "methods": "^1.1.1", + "mime": "^1.4.1", + "qs": "^6.5.1", + "readable-stream": "^2.3.5" }, "dependencies": { "mime": { @@ -12225,11 +12343,11 @@ "integrity": "sha512-HZJ3geIMPgVwKk2VsmO5YHqnnJYl6bV5A9JW2uzqV43WmpgliNEYbuvukfor7URpaqpxuw3CfZ3ONdVbZjCgIA==", "dev": true, "requires": { - "arrify": "1.0.1", - "indent-string": "3.2.0", - "js-yaml": "3.11.0", - "serialize-error": "2.1.0", - "strip-ansi": "4.0.0" + "arrify": "^1.0.1", + "indent-string": "^3.2.0", + "js-yaml": "^3.10.0", + "serialize-error": "^2.1.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -12244,7 +12362,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12255,8 +12373,8 @@ "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=", "dev": true, "requires": { - "methods": "1.1.2", - "superagent": "3.8.3" + "methods": "~1.1.2", + "superagent": "^3.0.0" } }, "supports-color": { @@ -12265,7 +12383,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" }, "dependencies": { "has-flag": { @@ -12288,12 +12406,12 @@ "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", "dev": true, "requires": { - "ajv": "5.5.2", - "ajv-keywords": "2.1.1", - "chalk": "2.4.1", - "lodash": "4.17.10", + "ajv": "^5.2.3", + "ajv-keywords": "^2.1.0", + "chalk": "^2.1.0", + "lodash": "^4.17.4", "slice-ansi": "1.0.0", - "string-width": "2.1.1" + "string-width": "^2.1.1" }, "dependencies": { "ansi-regex": { @@ -12314,8 +12432,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -12324,7 +12442,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12341,7 +12459,7 @@ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", "dev": true, "requires": { - "execa": "0.7.0" + "execa": "^0.7.0" } }, "text-encoding": { @@ -12367,8 +12485,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } }, "time-zone": { @@ -12389,7 +12507,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-fast-properties": { @@ -12403,7 +12521,7 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -12411,7 +12529,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -12421,10 +12539,10 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -12432,8 +12550,8 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "tough-cookie": { @@ -12441,7 +12559,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "traverse": { @@ -12472,7 +12590,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -12487,7 +12605,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-detect": { @@ -12513,9 +12631,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "camelcase": { @@ -12532,8 +12650,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" } }, @@ -12558,9 +12676,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -12607,10 +12725,10 @@ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { @@ -12618,7 +12736,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { @@ -12626,10 +12744,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -12640,7 +12758,7 @@ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", "dev": true, "requires": { - "crypto-random-string": "1.0.0" + "crypto-random-string": "^1.0.0" } }, "unique-temp-dir": { @@ -12649,8 +12767,8 @@ "integrity": "sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U=", "dev": true, "requires": { - "mkdirp": "0.5.1", - "os-tmpdir": "1.0.2", + "mkdirp": "^0.5.1", + "os-tmpdir": "^1.0.1", "uid2": "0.0.3" } }, @@ -12659,9 +12777,9 @@ "resolved": "https://registry.npmjs.org/universal-deep-strict-equal/-/universal-deep-strict-equal-1.2.2.tgz", "integrity": "sha1-DaSsL3PP95JMgfpN4BjKViyisKc=", "requires": { - "array-filter": "1.0.0", + "array-filter": "^1.0.0", "indexof": "0.0.1", - "object-keys": "1.0.11" + "object-keys": "^1.0.0" } }, "universalify": { @@ -12675,8 +12793,8 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -12684,9 +12802,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -12718,16 +12836,16 @@ "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { - "boxen": "1.3.0", - "chalk": "2.4.1", - "configstore": "3.1.2", - "import-lazy": "2.1.0", - "is-ci": "1.1.0", - "is-installed-globally": "0.1.0", - "is-npm": "1.0.0", - "latest-version": "3.1.0", - "semver-diff": "2.1.0", - "xdg-basedir": "3.0.0" + "boxen": "^1.2.1", + "chalk": "^2.0.1", + "configstore": "^3.0.0", + "import-lazy": "^2.1.0", + "is-ci": "^1.0.10", + "is-installed-globally": "^0.1.0", + "is-npm": "^1.0.0", + "latest-version": "^3.0.0", + "semver-diff": "^2.0.0", + "xdg-basedir": "^3.0.0" } }, "urix": { @@ -12741,7 +12859,7 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "prepend-http": "1.0.4" + "prepend-http": "^1.0.1" } }, "url-to-options": { @@ -12761,7 +12879,7 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" } }, "util-deprecate": { @@ -12780,8 +12898,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "verror": { @@ -12789,9 +12907,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "well-known-symbols": { @@ -12801,12 +12919,12 @@ "dev": true }, "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -12821,7 +12939,7 @@ "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", "dev": true, "requires": { - "string-width": "2.1.1" + "string-width": "^2.1.1" }, "dependencies": { "ansi-regex": { @@ -12842,8 +12960,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -12852,7 +12970,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12873,8 +12991,8 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -12888,7 +13006,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "0.5.1" + "mkdirp": "^0.5.1" } }, "write-file-atomic": { @@ -12897,9 +13015,9 @@ "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "signal-exit": "3.0.2" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" } }, "write-json-file": { @@ -12908,12 +13026,12 @@ "integrity": "sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=", "dev": true, "requires": { - "detect-indent": "5.0.0", - "graceful-fs": "4.1.11", - "make-dir": "1.3.0", - "pify": "3.0.0", - "sort-keys": "2.0.0", - "write-file-atomic": "2.3.0" + "detect-indent": "^5.0.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "pify": "^3.0.0", + "sort-keys": "^2.0.0", + "write-file-atomic": "^2.0.0" }, "dependencies": { "detect-indent": { @@ -12925,13 +13043,13 @@ } }, "write-pkg": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz", - "integrity": "sha1-AwqZlMyZk9JbTnWp8aGSNgcpHOk=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz", + "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==", "dev": true, "requires": { - "sort-keys": "2.0.0", - "write-json-file": "2.3.0" + "sort-keys": "^2.0.0", + "write-json-file": "^2.2.0" } }, "xdg-basedir": { @@ -12966,13 +13084,13 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "requires": { - "camelcase": "2.1.1", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "os-locale": "1.4.0", - "string-width": "1.0.2", - "window-size": "0.1.4", - "y18n": "3.2.1" + "camelcase": "^2.0.1", + "cliui": "^3.0.3", + "decamelize": "^1.1.1", + "os-locale": "^1.4.0", + "string-width": "^1.0.1", + "window-size": "^0.1.4", + "y18n": "^3.2.0" } }, "yargs-parser": { @@ -12981,7 +13099,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c7b5bf4aa8f..ab003f3c0f0 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -71,7 +71,7 @@ "extend": "^3.0.1", "google-auto-auth": "^0.10.1", "google-gax": "^0.16.0", - "google-proto-files": "^0.15.0", + "google-proto-files": "^0.16.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", From 3b4d9e6fb597f355550927c46036537316b262eb Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 19 Jun 2018 14:34:46 -0400 Subject: [PATCH 0161/1115] refactor(subscription): move message related functionality to new class (#143) --- handwritten/pubsub/src/subscriber.js | 551 +++++++++ handwritten/pubsub/src/subscription.js | 516 +------- handwritten/pubsub/test/subscriber.js | 1436 +++++++++++++++++++++++ handwritten/pubsub/test/subscription.js | 1420 +--------------------- 4 files changed, 2014 insertions(+), 1909 deletions(-) create mode 100644 handwritten/pubsub/src/subscriber.js create mode 100644 handwritten/pubsub/test/subscriber.js diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js new file mode 100644 index 00000000000..0d1f9aef0f6 --- /dev/null +++ b/handwritten/pubsub/src/subscriber.js @@ -0,0 +1,551 @@ +/*! + * Copyright 2018 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var arrify = require('arrify'); +var chunk = require('lodash.chunk'); +var common = require('@google-cloud/common'); +var delay = require('delay'); +var events = require('events'); +var extend = require('extend'); +var is = require('is'); +var os = require('os'); +var util = require('util'); + +var ConnectionPool = require('./connection-pool.js'); +var Histogram = require('./histogram.js'); + +/** + * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline + * requests. There is an API limit of 524288 bytes (512KiB) per acknowledge/modifyAckDeadline + * request. ackIds have a maximum size of 164 bytes, so 524288/164 ~= 3197. Accounting for some + * overhead, a maximum of 3000 ackIds per request should be safe. + * @private + */ +var MAX_ACK_IDS_PER_REQUEST = 3000; + +/** + * Subscriber class is used to manage all message related functionality. + * @private + * + * @param {object} options Configuration object. + */ +function Subscriber(options) { + options = options || {}; + + this.histogram = new Histogram(); + this.latency_ = new Histogram({min: 0}); + + this.connectionPool = null; + this.ackDeadline = 10000; + this.maxConnections = options.maxConnections || 5; + + this.inventory_ = { + lease: [], + ack: [], + nack: [], + bytes: 0, + }; + + this.flowControl = extend( + { + maxBytes: os.freemem() * 0.2, + maxMessages: 100, + }, + options.flowControl + ); + + this.flushTimeoutHandle_ = null; + this.leaseTimeoutHandle_ = null; + this.userClosed_ = false; + this.isOpen = false; + this.messageListeners = 0; + + events.EventEmitter.call(this); + + this.listenForEvents_(); +} + +util.inherits(Subscriber, events.EventEmitter); + +/*! + * Acks the provided message. If the connection pool is absent, it will be + * placed in an internal queue and sent out after 1 second or if the pool is + * re-opened before the timeout hits. + * + * @private + * + * @param {object} message The message object. + */ +Subscriber.prototype.ack_ = function(message) { + var breakLease = this.breakLease_.bind(this, message); + + this.histogram.add(Date.now() - message.received); + + if (this.isConnected_()) { + this.acknowledge_(message.ackId, message.connectionId).then(breakLease); + return; + } + + this.inventory_.ack.push(message.ackId); + this.setFlushTimeout_().then(breakLease); +}; + +/*! + * Sends an acknowledge request for the provided ack ids. + * + * @private + * + * @param {string|string[]} ackIds The ack IDs to acknowledge. + * @param {string} [connId] Connection ID to send request on. + * @return {Promise} + */ +Subscriber.prototype.acknowledge_ = function(ackIds, connId) { + var self = this; + + ackIds = arrify(ackIds); + + var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( + ackIdChunk + ) { + if (self.isConnected_()) { + return self.writeTo_(connId, {ackIds: ackIdChunk}); + } + + return common.util.promisify(self.request).call(self, { + client: 'SubscriberClient', + method: 'acknowledge', + reqOpts: { + subscription: self.name, + ackIds: ackIdChunk, + }, + }); + }); + + return Promise.all(promises).catch(function(err) { + self.emit('error', err); + }); +}; + +/*! + * Breaks the lease on a message. Essentially this means we no longer treat the + * message as being un-acked and count it towards the flow control limits. + * + * If the pool was previously paused and we freed up space, we'll continue to + * recieve messages. + * + * @private + * + * @param {object} message The message object. + */ +Subscriber.prototype.breakLease_ = function(message) { + var messageIndex = this.inventory_.lease.indexOf(message.ackId); + + if (messageIndex === -1) { + return; + } + + this.inventory_.lease.splice(messageIndex, 1); + this.inventory_.bytes -= message.length; + + var pool = this.connectionPool; + + if (pool && pool.isPaused && !this.hasMaxMessages_()) { + pool.resume(); + } + + if (!this.inventory_.lease.length) { + clearTimeout(this.leaseTimeoutHandle_); + this.leaseTimeoutHandle_ = null; + } +}; + +/** + * Closes the Subscriber, once this is called you will no longer receive + * message events unless you add a new message listener. + * + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while closing the + * Subscriber. + * + * @example + * Subscriber.close(function(err) { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * Subscriber.close().then(function() {}); + */ +Subscriber.prototype.close = function(callback) { + var self = this; + + this.userClosed_ = true; + + var inventory = this.inventory_; + inventory.lease.length = inventory.bytes = 0; + + clearTimeout(this.leaseTimeoutHandle_); + this.leaseTimeoutHandle_ = null; + + this.flushQueues_().then(function() { + self.closeConnection_(callback); + }); +}; + +/*! + * Closes the connection pool. + * + * @private + * + * @param {function} [callback] The callback function. + * @param {?error} err An error returned from this request. + */ +Subscriber.prototype.closeConnection_ = function(callback) { + this.isOpen = false; + + if (this.connectionPool) { + this.connectionPool.close(callback || common.util.noop); + this.connectionPool = null; + } else if (is.fn(callback)) { + setImmediate(callback); + } +}; + +/*! + * Flushes internal queues. These can build up if a user attempts to ack/nack + * while there is no connection pool (e.g. after they called close). + * + * Typically this will only be called either after a timeout or when a + * connection is re-opened. + * + * Any errors that occur will be emitted via `error` events. + * + * @private + */ +Subscriber.prototype.flushQueues_ = function() { + var self = this; + + if (this.flushTimeoutHandle_) { + this.flushTimeoutHandle_.cancel(); + this.flushTimeoutHandle_ = null; + } + + var acks = this.inventory_.ack; + var nacks = this.inventory_.nack; + + if (!acks.length && !nacks.length) { + return Promise.resolve(); + } + + var requests = []; + + if (acks.length) { + requests.push( + this.acknowledge_(acks).then(function() { + self.inventory_.ack = []; + }) + ); + } + + if (nacks.length) { + requests.push( + this.modifyAckDeadline_(nacks, 0).then(function() { + self.inventory_.nack = []; + }) + ); + } + + return Promise.all(requests); +}; + +/*! + * Checks to see if we currently have a streaming connection. + * + * @private + * + * @return {boolean} + */ +Subscriber.prototype.isConnected_ = function() { + return !!(this.connectionPool && this.connectionPool.isConnected()); +}; + +/*! + * Checks to see if this Subscriber has hit any of the flow control + * thresholds. + * + * @private + * + * @return {boolean} + */ +Subscriber.prototype.hasMaxMessages_ = function() { + return ( + this.inventory_.lease.length >= this.flowControl.maxMessages || + this.inventory_.bytes >= this.flowControl.maxBytes + ); +}; + +/*! + * Leases a message. This will add the message to our inventory list and then + * modifiy the ack deadline for the user if they exceed the specified ack + * deadline. + * + * @private + * + * @param {object} message The message object. + */ +Subscriber.prototype.leaseMessage_ = function(message) { + this.modifyAckDeadline_( + message.ackId, + this.ackDeadline / 1000, + message.connectionId + ); + + this.inventory_.lease.push(message.ackId); + this.inventory_.bytes += message.length; + this.setLeaseTimeout_(); + + return message; +}; + +/*! + * Begin listening for events on the Subscriber. This method keeps track of + * how many message listeners are assigned, and then removed, making sure + * polling is handled automatically. + * + * As long as there is one active message listener, the connection is open. As + * soon as there are no more message listeners, the connection is closed. + * + * @private + * + * @example + * Subscriber.listenForEvents_(); + */ +Subscriber.prototype.listenForEvents_ = function() { + var self = this; + + this.on('newListener', function(event) { + if (event === 'message') { + self.messageListeners++; + + if (!self.connectionPool) { + self.userClosed_ = false; + self.openConnection_(); + } + } + }); + + this.on('removeListener', function(event) { + if (event === 'message' && --self.messageListeners === 0) { + self.closeConnection_(); + } + }); +}; + +/*! + * Sends a modifyAckDeadline request for the provided ack ids. + * + * @private + * + * @param {string|string[]} ackIds The ack IDs to acknowledge. + * @param {number} deadline The dealine in seconds. + * @param {string=} connId Connection ID to send request on. + * @return {Promise} + */ +Subscriber.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { + var self = this; + + ackIds = arrify(ackIds); + + var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( + ackIdChunk + ) { + if (self.isConnected_()) { + return self.writeTo_(connId, { + modifyDeadlineAckIds: ackIdChunk, + modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), + }); + } + + return common.util.promisify(self.request).call(self, { + client: 'SubscriberClient', + method: 'modifyAckDeadline', + reqOpts: { + subscription: self.name, + ackDeadlineSeconds: deadline, + ackIds: ackIdChunk, + }, + }); + }); + + return Promise.all(promises).catch(function(err) { + self.emit('error', err); + }); +}; + +/*! + * Nacks the provided message. If the connection pool is absent, it will be + * placed in an internal queue and sent out after 1 second or if the pool is + * re-opened before the timeout hits. + * + * @private + * + * @param {object} message - The message object. + */ +Subscriber.prototype.nack_ = function(message) { + var breakLease = this.breakLease_.bind(this, message); + + if (this.isConnected_()) { + this.modifyAckDeadline_(message.ackId, 0, message.connectionId).then( + breakLease + ); + return; + } + + this.inventory_.nack.push(message.ackId); + this.setFlushTimeout_().then(breakLease); +}; + +/*! + * Opens the ConnectionPool. + * + * @private + */ +Subscriber.prototype.openConnection_ = function() { + var self = this; + var pool = (this.connectionPool = new ConnectionPool(this)); + + this.isOpen = true; + + pool.on('error', function(err) { + self.emit('error', err); + }); + + pool.on('message', function(message) { + self.emit('message', self.leaseMessage_(message)); + + if (!pool.isPaused && self.hasMaxMessages_()) { + pool.pause(); + } + }); + + pool.once('connected', function() { + self.flushQueues_(); + }); +}; + +/*! + * Modifies the ack deadline on messages that have yet to be acked. We update + * the ack deadline to the 99th percentile of known ack times. + * + * @private + */ +Subscriber.prototype.renewLeases_ = function() { + var self = this; + + clearTimeout(this.leaseTimeoutHandle_); + this.leaseTimeoutHandle_ = null; + + if (!this.inventory_.lease.length) { + return; + } + + this.ackDeadline = this.histogram.percentile(99); + + var ackIds = this.inventory_.lease.slice(); + var ackDeadlineSeconds = this.ackDeadline / 1000; + + this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(function() { + self.setLeaseTimeout_(); + }); +}; + +/*! + * Sets a timeout to flush any acks/nacks that have been made since the pool has + * closed. + * + * @private + */ +Subscriber.prototype.setFlushTimeout_ = function() { + if (!this.flushTimeoutHandle_) { + var timeout = delay(1000); + var promise = timeout + .then(this.flushQueues_.bind(this)) + .catch(common.util.noop); + + promise.cancel = timeout.cancel.bind(timeout); + this.flushTimeoutHandle_ = promise; + } + + return this.flushTimeoutHandle_; +}; + +/*! + * Sets a timeout to modify the ack deadlines for any unacked/unnacked messages, + * renewing their lease. + * + * @private + */ +Subscriber.prototype.setLeaseTimeout_ = function() { + if (this.leaseTimeoutHandle_ || !this.isOpen) { + return; + } + + var latency = this.latency_.percentile(99); + var timeout = Math.random() * this.ackDeadline * 0.9 - latency; + + this.leaseTimeoutHandle_ = setTimeout(this.renewLeases_.bind(this), timeout); +}; + +/** + * Writes to specified duplex stream. This is useful for capturing write + * latencies that can later be used to adjust the auto lease timeout. + * + * @private + * + * @param {string} connId The ID of the connection to write to. + * @param {object} data The data to be written to the stream. + * @returns {Promise} + */ +Subscriber.prototype.writeTo_ = function(connId, data) { + var self = this; + var startTime = Date.now(); + + return new Promise(function(resolve, reject) { + self.connectionPool.acquire(connId, function(err, connection) { + if (err) { + reject(err); + return; + } + + // we can ignore any errors that come from this since they'll be + // re-emitted later + connection.write(data, function(err) { + if (!err) { + self.latency_.add(Date.now() - startTime); + } + + resolve(); + }); + }); + }); +}; + +module.exports = Subscriber; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 394339a186a..069bb01f2b7 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -16,30 +16,15 @@ 'use strict'; -var arrify = require('arrify'); -var chunk = require('lodash.chunk'); var common = require('@google-cloud/common'); -var delay = require('delay'); -var events = require('events'); var extend = require('extend'); var is = require('is'); -var os = require('os'); var snakeCase = require('lodash.snakecase'); var util = require('util'); -var ConnectionPool = require('./connection-pool.js'); -var Histogram = require('./histogram.js'); var IAM = require('./iam.js'); var Snapshot = require('./snapshot.js'); - -/** - * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline - * requests. There is an API limit of 524288 bytes (512KiB) per acknowledge/modifyAckDeadline - * request. ackIds have a maximum size of 164 bytes, so 524288/164 ~= 3197. Accounting for some - * overhead, a maximum of 3000 ackIds per request should be safe. - * @private - */ -var MAX_ACK_IDS_PER_REQUEST = 3000; +var Subscriber = require('./subscriber.js'); /** * A Subscription object will give you access to your Cloud Pub/Sub @@ -161,38 +146,9 @@ function Subscription(pubsub, name, options) { this.pubsub = pubsub; this.projectId = pubsub.projectId; this.request = pubsub.request.bind(pubsub); - this.histogram = new Histogram(); - this.latency_ = new Histogram({min: 0}); this.name = Subscription.formatName_(pubsub.projectId, name); - this.connectionPool = null; - this.ackDeadline = 10000; - this.maxConnections = options.maxConnections || 5; - - this.inventory_ = { - lease: [], - ack: [], - nack: [], - bytes: 0, - }; - - this.flowControl = extend( - { - maxBytes: os.freemem() * 0.2, - maxMessages: 100, - }, - options.flowControl - ); - - this.flushTimeoutHandle_ = null; - this.leaseTimeoutHandle_ = null; - this.userClosed_ = false; - this.isOpen = false; - - events.EventEmitter.call(this); - this.messageListeners = 0; - if (options.topic) { this.create = pubsub.createSubscription.bind(pubsub, options.topic, name); } @@ -234,10 +190,10 @@ function Subscription(pubsub, name, options) { */ this.iam = new IAM(pubsub, this.name); - this.listenForEvents_(); + Subscriber.call(this, options); } -util.inherits(Subscription, events.EventEmitter); +util.inherits(Subscription, Subscriber); /*! * Formats Subscription metadata. @@ -282,153 +238,6 @@ Subscription.formatName_ = function(projectId, name) { return 'projects/' + projectId + '/subscriptions/' + name; }; -/*! - * Acks the provided message. If the connection pool is absent, it will be - * placed in an internal queue and sent out after 1 second or if the pool is - * re-opened before the timeout hits. - * - * @private - * - * @param {object} message The message object. - */ -Subscription.prototype.ack_ = function(message) { - var breakLease = this.breakLease_.bind(this, message); - - this.histogram.add(Date.now() - message.received); - - if (this.isConnected_()) { - this.acknowledge_(message.ackId, message.connectionId).then(breakLease); - return; - } - - this.inventory_.ack.push(message.ackId); - this.setFlushTimeout_().then(breakLease); -}; - -/*! - * Sends an acknowledge request for the provided ack ids. - * - * @private - * - * @param {string|string[]} ackIds The ack IDs to acknowledge. - * @param {string} [connId] Connection ID to send request on. - * @return {Promise} - */ -Subscription.prototype.acknowledge_ = function(ackIds, connId) { - var self = this; - - ackIds = arrify(ackIds); - - var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( - ackIdChunk - ) { - if (self.isConnected_()) { - return self.writeTo_(connId, {ackIds: ackIdChunk}); - } - - return common.util.promisify(self.request).call(self, { - client: 'SubscriberClient', - method: 'acknowledge', - reqOpts: { - subscription: self.name, - ackIds: ackIdChunk, - }, - }); - }); - - return Promise.all(promises).catch(function(err) { - self.emit('error', err); - }); -}; - -/*! - * Breaks the lease on a message. Essentially this means we no longer treat the - * message as being un-acked and count it towards the flow control limits. - * - * If the pool was previously paused and we freed up space, we'll continue to - * recieve messages. - * - * @private - * - * @param {object} message The message object. - */ -Subscription.prototype.breakLease_ = function(message) { - var messageIndex = this.inventory_.lease.indexOf(message.ackId); - - if (messageIndex === -1) { - return; - } - - this.inventory_.lease.splice(messageIndex, 1); - this.inventory_.bytes -= message.length; - - var pool = this.connectionPool; - - if (pool && pool.isPaused && !this.hasMaxMessages_()) { - pool.resume(); - } - - if (!this.inventory_.lease.length) { - clearTimeout(this.leaseTimeoutHandle_); - this.leaseTimeoutHandle_ = null; - } -}; - -/** - * Closes the subscription, once this is called you will no longer receive - * message events unless you add a new message listener. - * - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error returned while closing the - * Subscription. - * - * @example - * subscription.close(function(err) { - * if (err) { - * // Error handling omitted. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.close().then(function() {}); - */ -Subscription.prototype.close = function(callback) { - var self = this; - - this.userClosed_ = true; - - var inventory = this.inventory_; - inventory.lease.length = inventory.bytes = 0; - - clearTimeout(this.leaseTimeoutHandle_); - this.leaseTimeoutHandle_ = null; - - this.flushQueues_().then(function() { - self.closeConnection_(callback); - }); -}; - -/*! - * Closes the connection pool. - * - * @private - * - * @param {function} [callback] The callback function. - * @param {?error} err An error returned from this request. - */ -Subscription.prototype.closeConnection_ = function(callback) { - this.isOpen = false; - - if (this.connectionPool) { - this.connectionPool.close(callback || common.util.noop); - this.connectionPool = null; - } else if (is.fn(callback)) { - setImmediate(callback); - } -}; - /** * @typedef {array} CreateSnapshotResponse * @property {Snapshot} 0 The new {@link Snapshot}. @@ -618,53 +427,6 @@ Subscription.prototype.exists = function(callback) { }); }; -/*! - * Flushes internal queues. These can build up if a user attempts to ack/nack - * while there is no connection pool (e.g. after they called close). - * - * Typically this will only be called either after a timeout or when a - * connection is re-opened. - * - * Any errors that occur will be emitted via `error` events. - * - * @private - */ -Subscription.prototype.flushQueues_ = function() { - var self = this; - - if (this.flushTimeoutHandle_) { - this.flushTimeoutHandle_.cancel(); - this.flushTimeoutHandle_ = null; - } - - var acks = this.inventory_.ack; - var nacks = this.inventory_.nack; - - if (!acks.length && !nacks.length) { - return Promise.resolve(); - } - - var requests = []; - - if (acks.length) { - requests.push( - this.acknowledge_(acks).then(function() { - self.inventory_.ack = []; - }) - ); - } - - if (nacks.length) { - requests.push( - this.modifyAckDeadline_(nacks, 0).then(function() { - self.inventory_.nack = []; - }) - ); - } - - return Promise.all(requests); -}; - /** * @typedef {array} GetSubscriptionResponse * @property {Subscription} 0 The {@link Subscription}. @@ -797,130 +559,6 @@ Subscription.prototype.getMetadata = function(gaxOpts, callback) { ); }; -/*! - * Checks to see if we currently have a streaming connection. - * - * @private - * - * @return {boolean} - */ -Subscription.prototype.isConnected_ = function() { - return !!(this.connectionPool && this.connectionPool.isConnected()); -}; - -/*! - * Checks to see if this Subscription has hit any of the flow control - * thresholds. - * - * @private - * - * @return {boolean} - */ -Subscription.prototype.hasMaxMessages_ = function() { - return ( - this.inventory_.lease.length >= this.flowControl.maxMessages || - this.inventory_.bytes >= this.flowControl.maxBytes - ); -}; - -/*! - * Leases a message. This will add the message to our inventory list and then - * modifiy the ack deadline for the user if they exceed the specified ack - * deadline. - * - * @private - * - * @param {object} message The message object. - */ -Subscription.prototype.leaseMessage_ = function(message) { - this.modifyAckDeadline_( - message.ackId, - this.ackDeadline / 1000, - message.connectionId - ); - - this.inventory_.lease.push(message.ackId); - this.inventory_.bytes += message.length; - this.setLeaseTimeout_(); - - return message; -}; - -/*! - * Begin listening for events on the subscription. This method keeps track of - * how many message listeners are assigned, and then removed, making sure - * polling is handled automatically. - * - * As long as there is one active message listener, the connection is open. As - * soon as there are no more message listeners, the connection is closed. - * - * @private - * - * @example - * subscription.listenForEvents_(); - */ -Subscription.prototype.listenForEvents_ = function() { - var self = this; - - this.on('newListener', function(event) { - if (event === 'message') { - self.messageListeners++; - - if (!self.connectionPool) { - self.userClosed_ = false; - self.openConnection_(); - } - } - }); - - this.on('removeListener', function(event) { - if (event === 'message' && --self.messageListeners === 0) { - self.closeConnection_(); - } - }); -}; - -/*! - * Sends a modifyAckDeadline request for the provided ack ids. - * - * @private - * - * @param {string|string[]} ackIds The ack IDs to acknowledge. - * @param {number} deadline The dealine in seconds. - * @param {string=} connId Connection ID to send request on. - * @return {Promise} - */ -Subscription.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { - var self = this; - - ackIds = arrify(ackIds); - - var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( - ackIdChunk - ) { - if (self.isConnected_()) { - return self.writeTo_(connId, { - modifyDeadlineAckIds: ackIdChunk, - modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), - }); - } - - return common.util.promisify(self.request).call(self, { - client: 'SubscriberClient', - method: 'modifyAckDeadline', - reqOpts: { - subscription: self.name, - ackDeadlineSeconds: deadline, - ackIds: ackIdChunk, - }, - }); - }); - - return Promise.all(promises).catch(function(err) { - self.emit('error', err); - }); -}; - /** * @typedef {array} ModifyPushConfigResponse * @property {object} 0 The full API response. @@ -991,83 +629,6 @@ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { ); }; -/*! - * Nacks the provided message. If the connection pool is absent, it will be - * placed in an internal queue and sent out after 1 second or if the pool is - * re-opened before the timeout hits. - * - * @private - * - * @param {object} message - The message object. - */ -Subscription.prototype.nack_ = function(message) { - var breakLease = this.breakLease_.bind(this, message); - - if (this.isConnected_()) { - this.modifyAckDeadline_(message.ackId, 0, message.connectionId).then( - breakLease - ); - return; - } - - this.inventory_.nack.push(message.ackId); - this.setFlushTimeout_().then(breakLease); -}; - -/*! - * Opens the ConnectionPool. - * - * @private - */ -Subscription.prototype.openConnection_ = function() { - var self = this; - var pool = (this.connectionPool = new ConnectionPool(this)); - - this.isOpen = true; - - pool.on('error', function(err) { - self.emit('error', err); - }); - - pool.on('message', function(message) { - self.emit('message', self.leaseMessage_(message)); - - if (!pool.isPaused && self.hasMaxMessages_()) { - pool.pause(); - } - }); - - pool.once('connected', function() { - self.flushQueues_(); - }); -}; - -/*! - * Modifies the ack deadline on messages that have yet to be acked. We update - * the ack deadline to the 99th percentile of known ack times. - * - * @private - */ -Subscription.prototype.renewLeases_ = function() { - var self = this; - - clearTimeout(this.leaseTimeoutHandle_); - this.leaseTimeoutHandle_ = null; - - if (!this.inventory_.lease.length) { - return; - } - - this.ackDeadline = this.histogram.percentile(99); - - var ackIds = this.inventory_.lease.slice(); - var ackDeadlineSeconds = this.ackDeadline / 1000; - - this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(function() { - self.setLeaseTimeout_(); - }); -}; - /** * @typedef {array} SeekResponse * @property {object} 0 The full API response. @@ -1133,43 +694,6 @@ Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { ); }; -/*! - * Sets a timeout to flush any acks/nacks that have been made since the pool has - * closed. - * - * @private - */ -Subscription.prototype.setFlushTimeout_ = function() { - if (!this.flushTimeoutHandle_) { - var timeout = delay(1000); - var promise = timeout - .then(this.flushQueues_.bind(this)) - .catch(common.util.noop); - - promise.cancel = timeout.cancel.bind(timeout); - this.flushTimeoutHandle_ = promise; - } - - return this.flushTimeoutHandle_; -}; - -/*! - * Sets a timeout to modify the ack deadlines for any unacked/unnacked messages, - * renewing their lease. - * - * @private - */ -Subscription.prototype.setLeaseTimeout_ = function() { - if (this.leaseTimeoutHandle_ || !this.isOpen) { - return; - } - - var latency = this.latency_.percentile(99); - var timeout = Math.random() * this.ackDeadline * 0.9 - latency; - - this.leaseTimeoutHandle_ = setTimeout(this.renewLeases_.bind(this), timeout); -}; - /** * @typedef {array} SetSubscriptionMetadataResponse * @property {object} 0 The full API response. @@ -1251,40 +775,6 @@ Subscription.prototype.snapshot = function(name) { return this.pubsub.snapshot.call(this, name); }; -/** - * Writes to specified duplex stream. This is useful for capturing write - * latencies that can later be used to adjust the auto lease timeout. - * - * @private - * - * @param {string} connId The ID of the connection to write to. - * @param {object} data The data to be written to the stream. - * @returns {Promise} - */ -Subscription.prototype.writeTo_ = function(connId, data) { - var self = this; - var startTime = Date.now(); - - return new Promise(function(resolve, reject) { - self.connectionPool.acquire(connId, function(err, connection) { - if (err) { - reject(err); - return; - } - - // we can ignore any errors that come from this since they'll be - // re-emitted later - connection.write(data, function(err) { - if (!err) { - self.latency_.add(Date.now() - startTime); - } - - resolve(); - }); - }); - }); -}; - /*! Developer Documentation * * All async methods (except for streams) will return a Promise in the event diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.js new file mode 100644 index 00000000000..a406bfe93af --- /dev/null +++ b/handwritten/pubsub/test/subscriber.js @@ -0,0 +1,1436 @@ +/** + * Copyright 2018 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +var assert = require('assert'); +var common = require('@google-cloud/common'); +var delay = require('delay'); +var events = require('events'); +var extend = require('extend'); +var is = require('is'); +var proxyquire = require('proxyquire'); +var util = require('util'); + +var fakeUtil = extend({}, common.util); + +var FAKE_FREE_MEM = 168222720; +var fakeOs = { + freemem: function() { + return FAKE_FREE_MEM; + }, +}; + +function FakeConnectionPool() { + this.calledWith_ = [].slice.call(arguments); + events.EventEmitter.call(this); +} + +util.inherits(FakeConnectionPool, events.EventEmitter); + +function FakeHistogram() { + this.calledWith_ = [].slice.call(arguments); +} + +var delayOverride = null; + +function fakeDelay(timeout) { + return (delayOverride || delay)(timeout); +} + +describe('Subscriber', function() { + var Subscriber; + var subscriber; + + var SUB_NAME = 'fake-sub'; + + before(function() { + Subscriber = proxyquire('../src/subscriber.js', { + '@google-cloud/common': { + util: fakeUtil, + }, + delay: fakeDelay, + os: fakeOs, + './connection-pool.js': FakeConnectionPool, + './histogram.js': FakeHistogram, + }); + }); + + beforeEach(function() { + subscriber = new Subscriber({}); + subscriber.name = SUB_NAME; + }); + + describe('initialization', function() { + it('should create a histogram instance', function() { + assert(subscriber.histogram instanceof FakeHistogram); + }); + + it('should create a latency histogram', function() { + assert(subscriber.latency_ instanceof FakeHistogram); + }); + + it('should honor configuration settings', function() { + var options = { + maxConnections: 2, + flowControl: { + maxBytes: 5, + maxMessages: 10, + }, + }; + + var subscriber = new Subscriber(options); + + assert.strictEqual(subscriber.maxConnections, options.maxConnections); + + assert.deepEqual(subscriber.flowControl, { + maxBytes: options.flowControl.maxBytes, + maxMessages: options.flowControl.maxMessages, + }); + }); + + it('should set sensible defaults', function() { + assert.strictEqual(subscriber.ackDeadline, 10000); + assert.strictEqual(subscriber.maxConnections, 5); + assert.strictEqual(subscriber.userClosed_, false); + assert.strictEqual(subscriber.messageListeners, 0); + assert.strictEqual(subscriber.isOpen, false); + + assert.deepEqual(subscriber.flowControl, { + maxBytes: FAKE_FREE_MEM * 0.2, + maxMessages: 100, + }); + }); + + it('should create an inventory object', function() { + assert(is.object(subscriber.inventory_)); + assert(is.array(subscriber.inventory_.lease)); + assert(is.array(subscriber.inventory_.ack)); + assert(is.array(subscriber.inventory_.nack)); + assert.strictEqual(subscriber.inventory_.bytes, 0); + }); + + it('should inherit from EventEmitter', function() { + assert(subscriber instanceof events.EventEmitter); + }); + + it('should listen for events', function() { + var called = false; + var listenForEvents = Subscriber.prototype.listenForEvents_; + + Subscriber.prototype.listenForEvents_ = function() { + Subscriber.prototype.listenForEvents_ = listenForEvents; + called = true; + }; + + new Subscriber({}); + assert(called); + }); + }); + + describe('ack_', function() { + var MESSAGE = { + ackId: 'abc', + received: 12345, + connectionId: 'def', + }; + + beforeEach(function() { + subscriber.breakLease_ = fakeUtil.noop; + subscriber.histogram.add = fakeUtil.noop; + subscriber.acknowledge_ = function() { + return Promise.resolve(); + }; + subscriber.setFlushTimeout_ = function() { + return Promise.resolve(); + }; + }); + + it('should add the time it took to ack to the histogram', function(done) { + var fakeNow = 12381832; + var now = global.Date.now; + + global.Date.now = function() { + global.Date.now = now; + return fakeNow; + }; + + subscriber.histogram.add = function(time) { + assert.strictEqual(time, fakeNow - MESSAGE.received); + done(); + }; + + subscriber.ack_(MESSAGE); + }); + + describe('with connection', function() { + beforeEach(function() { + subscriber.isConnected_ = function() { + return true; + }; + }); + + it('should acknowledge if there is a connection', function(done) { + subscriber.acknowledge_ = function(ackId, connectionId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(connectionId, MESSAGE.connectionId); + setImmediate(done); + return Promise.resolve(); + }; + + subscriber.ack_(MESSAGE); + }); + + it('should break the lease on the message', function(done) { + subscriber.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); + done(); + }; + + subscriber.ack_(MESSAGE); + }); + }); + + describe('without connection', function() { + beforeEach(function() { + subscriber.isConnected_ = function() { + return false; + }; + }); + + it('should queue the message to be acked if no connection', function(done) { + subscriber.setFlushTimeout_ = function() { + assert(subscriber.inventory_.ack.indexOf(MESSAGE.ackId) > -1); + done(); + }; + + subscriber.ack_(MESSAGE); + }); + + it('should break the lease on the message', function(done) { + subscriber.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); + done(); + }; + + subscriber.ack_(MESSAGE); + }); + }); + }); + + describe('acknowledge_', function() { + var fakeAckIds = ['a', 'b', 'c']; + + var batchSize = 3000; + var tooManyFakeAckIds = Array(batchSize * 2.5) + .fill('a') + .map(function(x, i) { + return x + i; + }); + var expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); + + describe('without streaming connection', function() { + beforeEach(function() { + subscriber.isConnected_ = function() { + return false; + }; + }); + + it('should make the correct request', function(done) { + var fakePromisified = { + call: function(context, config) { + assert.strictEqual(context, subscriber); + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'acknowledge'); + assert.strictEqual(config.reqOpts.subscription, subscriber.name); + assert.deepEqual(config.reqOpts.ackIds, fakeAckIds); + + setImmediate(done); + + return Promise.resolve(); + }, + }; + + fakeUtil.promisify = function(fn) { + assert.strictEqual(fn, subscriber.request); + return fakePromisified; + }; + + subscriber.on('error', done); + subscriber.acknowledge_(fakeAckIds); + }); + + it('should batch requests if there are too many ackIds', function(done) { + var receivedCalls = 0; + + var fakePromisified = { + call: function(context, config) { + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + + assert.deepEqual(config.reqOpts.ackIds, expectedAckIds); + + receivedCalls += 1; + if (receivedCalls === expectedCalls) { + setImmediate(done); + } + + return Promise.resolve(); + }, + }; + + fakeUtil.promisify = function() { + return fakePromisified; + }; + + subscriber.on('error', done); + subscriber.acknowledge_(tooManyFakeAckIds); + }); + + it('should emit any request errors', function(done) { + var fakeError = new Error('err'); + var fakePromisified = { + call: function() { + return Promise.reject(fakeError); + }, + }; + + fakeUtil.promisify = function() { + return fakePromisified; + }; + + subscriber.on('error', function(err) { + assert.strictEqual(err, fakeError); + done(); + }); + + subscriber.acknowledge_(fakeAckIds); + }); + }); + + describe('with streaming connection', function() { + beforeEach(function() { + subscriber.isConnected_ = function() { + return true; + }; + }); + + it('should send the correct request', function(done) { + var fakeConnectionId = 'abc'; + + subscriber.writeTo_ = function(connectionId, data) { + assert.strictEqual(connectionId, fakeConnectionId); + assert.deepEqual(data, {ackIds: fakeAckIds}); + done(); + }; + + subscriber.acknowledge_(fakeAckIds, fakeConnectionId); + }); + + it('should batch requests if there are too many ackIds', function(done) { + var receivedCalls = 0; + var fakeConnectionId = 'abc'; + + subscriber.writeTo_ = function(connectionId, data) { + assert.strictEqual(connectionId, fakeConnectionId); + + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + + assert.deepEqual(data, {ackIds: expectedAckIds}); + + if (++receivedCalls === expectedCalls) { + done(); + } + }; + + subscriber.acknowledge_(tooManyFakeAckIds, fakeConnectionId); + }); + + it('should emit an error when unable to get a conn', function(done) { + var error = new Error('err'); + + subscriber.writeTo_ = function() { + return Promise.reject(error); + }; + + subscriber.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + subscriber.acknowledge_(fakeAckIds); + }); + }); + }); + + describe('breakLease_', function() { + var MESSAGE = { + ackId: 'abc', + data: Buffer.from('hello'), + length: 5, + }; + + beforeEach(function() { + subscriber.inventory_.lease.push(MESSAGE.ackId); + subscriber.inventory_.bytes += MESSAGE.length; + }); + + it('should remove the message from the lease array', function() { + assert.strictEqual(subscriber.inventory_.lease.length, 1); + assert.strictEqual(subscriber.inventory_.bytes, MESSAGE.length); + + subscriber.breakLease_(MESSAGE); + + assert.strictEqual(subscriber.inventory_.lease.length, 0); + assert.strictEqual(subscriber.inventory_.bytes, 0); + }); + + it('should noop for unknown messages', function() { + var message = { + ackId: 'def', + data: Buffer.from('world'), + length: 5, + }; + + subscriber.breakLease_(message); + + assert.strictEqual(subscriber.inventory_.lease.length, 1); + assert.strictEqual(subscriber.inventory_.bytes, 5); + }); + + describe('with connection pool', function() { + it('should resume receiving messages if paused', function(done) { + subscriber.connectionPool = { + isPaused: true, + resume: done, + }; + + subscriber.hasMaxMessages_ = function() { + return false; + }; + + subscriber.breakLease_(MESSAGE); + }); + + it('should not resume if it is not paused', function() { + subscriber.connectionPool = { + isPaused: false, + resume: function() { + throw new Error('Should not be called.'); + }, + }; + + subscriber.hasMaxMessages_ = function() { + return false; + }; + + subscriber.breakLease_(MESSAGE); + }); + + it('should not resume if the max message limit is hit', function() { + subscriber.connectionPool = { + isPaused: true, + resume: function() { + throw new Error('Should not be called.'); + }, + }; + + subscriber.hasMaxMessages_ = function() { + return true; + }; + + subscriber.breakLease_(MESSAGE); + }); + }); + + it('should quit auto-leasing if all leases are gone', function(done) { + subscriber.leaseTimeoutHandle_ = setTimeout(done, 1); + subscriber.breakLease_(MESSAGE); + + assert.strictEqual(subscriber.leaseTimeoutHandle_, null); + setImmediate(done); + }); + + it('should continue to auto-lease if leases exist', function(done) { + subscriber.inventory_.lease.push(MESSAGE.ackId); + subscriber.inventory_.lease.push('abcd'); + + subscriber.leaseTimeoutHandle_ = setTimeout(done, 1); + subscriber.breakLease_(MESSAGE); + }); + }); + + describe('close', function() { + beforeEach(function() { + subscriber.flushQueues_ = function() { + return Promise.resolve(); + }; + + subscriber.closeConnection_ = fakeUtil.noop; + }); + + it('should set the userClosed_ flag', function() { + subscriber.close(); + + assert.strictEqual(subscriber.userClosed_, true); + }); + + it('should dump the inventory', function() { + subscriber.inventory_ = { + lease: [0, 1, 2], + bytes: 123, + }; + + subscriber.close(); + + assert.deepEqual(subscriber.inventory_, { + lease: [], + bytes: 0, + }); + }); + + it('should stop auto-leasing', function(done) { + subscriber.leaseTimeoutHandle_ = setTimeout(done, 1); + subscriber.close(); + + assert.strictEqual(subscriber.leaseTimeoutHandle_, null); + setImmediate(done); + }); + + it('should flush immediately', function(done) { + subscriber.flushQueues_ = function() { + setImmediate(done); + return Promise.resolve(); + }; + + subscriber.close(); + }); + + it('should call closeConnection_', function(done) { + subscriber.closeConnection_ = function(callback) { + callback(); // the done fn + }; + + subscriber.close(done); + }); + }); + + describe('closeConnection_', function() { + afterEach(function() { + fakeUtil.noop = function() {}; + }); + + it('should set isOpen to false', function() { + subscriber.closeConnection_(); + assert.strictEqual(subscriber.isOpen, false); + }); + + describe('with connection pool', function() { + beforeEach(function() { + subscriber.connectionPool = { + close: function(callback) { + setImmediate(callback); // the done fn + }, + }; + }); + + it('should call close on the connection pool', function(done) { + subscriber.closeConnection_(done); + assert.strictEqual(subscriber.connectionPool, null); + }); + + it('should use a noop when callback is absent', function(done) { + fakeUtil.noop = done; + subscriber.closeConnection_(); + assert.strictEqual(subscriber.connectionPool, null); + }); + }); + + describe('without connection pool', function() { + beforeEach(function() { + subscriber.connectionPool = null; + }); + + it('should exec the callback if one is passed in', function(done) { + subscriber.closeConnection_(done); + }); + + it('should optionally accept a callback', function() { + subscriber.closeConnection_(); + }); + }); + }); + + describe('flushQueues_', function() { + it('should cancel any pending flushes', function() { + var canceled = false; + var fakeHandle = { + cancel: function() { + canceled = true; + }, + }; + + subscriber.flushTimeoutHandle_ = fakeHandle; + subscriber.flushQueues_(); + + assert.strictEqual(subscriber.flushTimeoutHandle_, null); + assert.strictEqual(canceled, true); + }); + + it('should do nothing if theres nothing to ack/nack', function() { + subscriber.acknowledge_ = subscriber.modifyAckDeadline_ = function() { + throw new Error('Should not be called.'); + }; + + return subscriber.flushQueues_(); + }); + + it('should send any pending acks', function() { + var fakeAckIds = (subscriber.inventory_.ack = ['abc', 'def']); + + subscriber.acknowledge_ = function(ackIds) { + assert.strictEqual(ackIds, fakeAckIds); + return Promise.resolve(); + }; + + return subscriber.flushQueues_().then(function() { + assert.strictEqual(subscriber.inventory_.ack.length, 0); + }); + }); + + it('should send any pending nacks', function() { + var fakeAckIds = (subscriber.inventory_.nack = ['ghi', 'jkl']); + + subscriber.modifyAckDeadline_ = function(ackIds, deadline) { + assert.strictEqual(ackIds, fakeAckIds); + assert.strictEqual(deadline, 0); + return Promise.resolve(); + }; + + return subscriber.flushQueues_().then(function() { + assert.strictEqual(subscriber.inventory_.nack.length, 0); + }); + }); + }); + + describe('isConnected_', function() { + it('should return false if there is no pool', function() { + subscriber.connectionPool = null; + assert.strictEqual(subscriber.isConnected_(), false); + }); + + it('should return false if the pool says its connected', function() { + subscriber.connectionPool = { + isConnected: function() { + return false; + }, + }; + + assert.strictEqual(subscriber.isConnected_(), false); + }); + + it('should return true if the pool says its connected', function() { + subscriber.connectionPool = { + isConnected: function() { + return true; + }, + }; + + assert.strictEqual(subscriber.isConnected_(), true); + }); + }); + + describe('hasMaxMessages_', function() { + it('should return true if the number of leases >= maxMessages', function() { + subscriber.inventory_.lease = ['a', 'b', 'c']; + subscriber.flowControl.maxMessages = 3; + + assert(subscriber.hasMaxMessages_()); + }); + + it('should return true if bytes == maxBytes', function() { + subscriber.inventory_.bytes = 1000; + subscriber.flowControl.maxBytes = 1000; + + assert(subscriber.hasMaxMessages_()); + }); + + it('should return false if neither condition is met', function() { + subscriber.inventory_.lease = ['a', 'b']; + subscriber.flowControl.maxMessages = 3; + + subscriber.inventory_.bytes = 900; + subscriber.flowControl.maxBytes = 1000; + + assert.strictEqual(subscriber.hasMaxMessages_(), false); + }); + }); + + describe('leaseMessage_', function() { + var MESSAGE = { + ackId: 'abc', + connectionId: 'def', + data: Buffer.from('hello'), + length: 5, + }; + + beforeEach(function() { + subscriber.setLeaseTimeout_ = fakeUtil.noop; + subscriber.modifyAckDeadline_ = fakeUtil.noop; + }); + + it('should immediately modAck the message', function(done) { + subscriber.modifyAckDeadline_ = function(ackId, deadline, connId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(deadline, subscriber.ackDeadline / 1000); + assert.strictEqual(connId, MESSAGE.connectionId); + done(); + }; + + subscriber.leaseMessage_(MESSAGE); + }); + + it('should add the ackId to the inventory', function() { + subscriber.leaseMessage_(MESSAGE); + assert.deepEqual(subscriber.inventory_.lease, [MESSAGE.ackId]); + }); + + it('should update the byte count', function() { + assert.strictEqual(subscriber.inventory_.bytes, 0); + subscriber.leaseMessage_(MESSAGE); + assert.strictEqual(subscriber.inventory_.bytes, MESSAGE.length); + }); + + it('should begin auto-leasing', function(done) { + subscriber.setLeaseTimeout_ = done; + subscriber.leaseMessage_(MESSAGE); + }); + + it('should return the message', function() { + var message = subscriber.leaseMessage_(MESSAGE); + assert.strictEqual(message, MESSAGE); + }); + }); + + describe('listenForEvents_', function() { + beforeEach(function() { + subscriber.openConnection_ = fakeUtil.noop; + subscriber.closeConnection_ = fakeUtil.noop; + }); + + describe('on new listener', function() { + it('should increment messageListeners', function() { + assert.strictEqual(subscriber.messageListeners, 0); + subscriber.on('message', fakeUtil.noop); + assert.strictEqual(subscriber.messageListeners, 1); + }); + + it('should ignore non-message events', function() { + subscriber.on('data', fakeUtil.noop); + assert.strictEqual(subscriber.messageListeners, 0); + }); + + it('should open a connection', function(done) { + subscriber.openConnection_ = done; + subscriber.on('message', fakeUtil.noop); + }); + + it('should set the userClosed_ flag to false', function() { + subscriber.userClosed_ = true; + subscriber.on('message', fakeUtil.noop); + assert.strictEqual(subscriber.userClosed_, false); + }); + + it('should not open a connection when one exists', function() { + subscriber.connectionPool = {}; + + subscriber.openConnection_ = function() { + throw new Error('Should not be called.'); + }; + + subscriber.on('message', fakeUtil.noop); + }); + }); + + describe('on remove listener', function() { + var noop = function() {}; + + it('should decrement messageListeners', function() { + subscriber.on('message', fakeUtil.noop); + subscriber.on('message', noop); + assert.strictEqual(subscriber.messageListeners, 2); + + subscriber.removeListener('message', noop); + assert.strictEqual(subscriber.messageListeners, 1); + }); + + it('should ignore non-message events', function() { + subscriber.on('message', fakeUtil.noop); + subscriber.on('message', noop); + assert.strictEqual(subscriber.messageListeners, 2); + + subscriber.removeListener('data', noop); + assert.strictEqual(subscriber.messageListeners, 2); + }); + + it('should close the connection when no listeners', function(done) { + subscriber.closeConnection_ = done; + + subscriber.on('message', noop); + subscriber.removeListener('message', noop); + }); + }); + }); + + describe('modifyAckDeadline_', function() { + var fakeAckIds = ['a', 'b', 'c']; + var fakeDeadline = 123; + + var batchSize = 3000; + var tooManyFakeAckIds = Array(batchSize * 2.5) + .fill('a') + .map(function(x, i) { + return x + i; + }); + var expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); + + describe('without streaming connection', function() { + beforeEach(function() { + subscriber.isConnected_ = function() { + return false; + }; + }); + + it('should make the correct request', function(done) { + var fakePromisified = { + call: function(context, config) { + assert.strictEqual(context, subscriber); + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'modifyAckDeadline'); + assert.strictEqual(config.reqOpts.subscription, subscriber.name); + assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); + assert.deepEqual(config.reqOpts.ackIds, fakeAckIds); + + setImmediate(done); + + return Promise.resolve(); + }, + }; + + fakeUtil.promisify = function(fn) { + assert.strictEqual(fn, subscriber.request); + return fakePromisified; + }; + + subscriber.on('error', done); + subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline); + }); + + it('should batch requests if there are too many ackIds', function(done) { + var receivedCalls = 0; + + var fakePromisified = { + call: function(context, config) { + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + + assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); + assert.deepEqual(config.reqOpts.ackIds, expectedAckIds); + + receivedCalls += 1; + if (receivedCalls === expectedCalls) { + setImmediate(done); + } + + return Promise.resolve(); + }, + }; + + fakeUtil.promisify = function() { + return fakePromisified; + }; + + subscriber.on('error', done); + subscriber.modifyAckDeadline_(tooManyFakeAckIds, fakeDeadline); + }); + + it('should emit any request errors', function(done) { + var fakeError = new Error('err'); + var fakePromisified = { + call: function() { + return Promise.reject(fakeError); + }, + }; + + fakeUtil.promisify = function() { + return fakePromisified; + }; + + subscriber.on('error', function(err) { + assert.strictEqual(err, fakeError); + done(); + }); + + subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline); + }); + }); + + describe('with streaming connection', function() { + beforeEach(function() { + subscriber.isConnected_ = function() { + return true; + }; + }); + + it('should send the correct request', function(done) { + var expectedDeadlines = Array(fakeAckIds.length).fill(fakeDeadline); + var fakeConnId = 'abc'; + + subscriber.writeTo_ = function(connectionId, data) { + assert.strictEqual(connectionId, fakeConnId); + assert.deepEqual(data.modifyDeadlineAckIds, fakeAckIds); + assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); + done(); + }; + + subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); + }); + + it('should batch requests if there are too many ackIds', function(done) { + var receivedCalls = 0; + var fakeConnId = 'abc'; + + subscriber.writeTo_ = function(connectionId, data) { + assert.strictEqual(connectionId, fakeConnId); + + var offset = receivedCalls * batchSize; + var expectedAckIds = tooManyFakeAckIds.slice( + offset, + offset + batchSize + ); + var expectedDeadlines = Array(expectedAckIds.length).fill( + fakeDeadline + ); + + assert.deepEqual(data.modifyDeadlineAckIds, expectedAckIds); + assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); + + if (++receivedCalls === expectedCalls) { + done(); + } + }; + + subscriber.modifyAckDeadline_( + tooManyFakeAckIds, + fakeDeadline, + fakeConnId + ); + }); + + it('should emit an error when unable to get a conn', function(done) { + var error = new Error('err'); + + subscriber.writeTo_ = function() { + return Promise.reject(error); + }; + + subscriber.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline); + }); + }); + }); + + describe('nack_', function() { + var MESSAGE = { + ackId: 'abc', + connectionId: 'def', + }; + + beforeEach(function() { + subscriber.breakLease_ = fakeUtil.noop; + subscriber.modifyAckDeadline_ = function() { + return Promise.resolve(); + }; + subscriber.setFlushTimeout_ = function() { + return Promise.resolve(); + }; + }); + + describe('with connection', function() { + beforeEach(function() { + subscriber.isConnected_ = function() { + return true; + }; + }); + + it('should nack if there is a connection', function(done) { + subscriber.modifyAckDeadline_ = function(ackId, deadline, connId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(deadline, 0); + assert.strictEqual(connId, MESSAGE.connectionId); + setImmediate(done); + return Promise.resolve(); + }; + + subscriber.nack_(MESSAGE); + }); + + it('should break the lease on the message', function(done) { + subscriber.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); + done(); + }; + + subscriber.nack_(MESSAGE); + }); + }); + + describe('without connection', function() { + beforeEach(function() { + subscriber.isConnected_ = function() { + return false; + }; + }); + + it('should queue the message to be nacked if no conn', function(done) { + subscriber.setFlushTimeout_ = function() { + assert(subscriber.inventory_.nack.indexOf(MESSAGE.ackId) > -1); + setImmediate(done); + return Promise.resolve(); + }; + + subscriber.nack_(MESSAGE); + }); + + it('should break the lease on the message', function(done) { + subscriber.breakLease_ = function(message) { + assert.strictEqual(message, MESSAGE); + done(); + }; + + subscriber.nack_(MESSAGE); + }); + }); + }); + + describe('openConnection_', function() { + it('should create a ConnectionPool instance', function() { + subscriber.openConnection_(); + assert(subscriber.connectionPool instanceof FakeConnectionPool); + + var args = subscriber.connectionPool.calledWith_; + assert.strictEqual(args[0], subscriber); + }); + + it('should emit pool errors', function(done) { + var error = new Error('err'); + + subscriber.on('error', function(err) { + assert.strictEqual(err, error); + done(); + }); + + subscriber.openConnection_(); + subscriber.connectionPool.emit('error', error); + }); + + it('should set isOpen to true', function() { + subscriber.openConnection_(); + assert.strictEqual(subscriber.isOpen, true); + }); + + it('should lease & emit messages from pool', function(done) { + var message = {}; + var leasedMessage = {}; + + subscriber.leaseMessage_ = function(message_) { + assert.strictEqual(message_, message); + return leasedMessage; + }; + + subscriber.on('message', function(message) { + assert.strictEqual(message, leasedMessage); + done(); + }); + + subscriber.openConnection_(); + subscriber.connectionPool.emit('message', message); + }); + + it('should pause the pool if sub is at max messages', function(done) { + var message = {nack: fakeUtil.noop}; + var leasedMessage = {}; + + subscriber.leaseMessage_ = function() { + return leasedMessage; + }; + + subscriber.hasMaxMessages_ = function() { + return true; + }; + + subscriber.openConnection_(); + subscriber.connectionPool.isPaused = false; + subscriber.connectionPool.pause = done; + subscriber.connectionPool.emit('message', message); + }); + + it('should not re-pause the pool', function(done) { + var message = {nack: fakeUtil.noop}; + var leasedMessage = {}; + + subscriber.leaseMessage_ = function() { + return leasedMessage; + }; + + subscriber.hasMaxMessages_ = function() { + return true; + }; + + subscriber.openConnection_(); + subscriber.connectionPool.isPaused = true; + + subscriber.connectionPool.pause = function() { + done(new Error('Should not have been called.')); + }; + + subscriber.connectionPool.emit('message', message); + done(); + }); + + it('should flush the queue when connected', function(done) { + subscriber.flushQueues_ = done; + + subscriber.openConnection_(); + subscriber.connectionPool.emit('connected'); + }); + }); + + describe('renewLeases_', function() { + beforeEach(function() { + subscriber.modifyAckDeadline_ = function() { + return Promise.resolve(); + }; + }); + + var fakeDeadline = 9999; + var fakeAckIds = ['abc', 'def']; + + beforeEach(function() { + subscriber.inventory_.lease = fakeAckIds; + subscriber.setLeaseTimeout_ = fakeUtil.noop; + + subscriber.histogram.percentile = function() { + return fakeDeadline; + }; + }); + + it('should clean up the old timeout handle', function() { + var fakeHandle = 123; + var clearTimeoutCalled = false; + var _clearTimeout = global.clearTimeout; + + global.clearTimeout = function(handle) { + assert.strictEqual(handle, fakeHandle); + clearTimeoutCalled = true; + }; + + subscriber.leaseTimeoutHandle_ = fakeHandle; + subscriber.renewLeases_(); + + assert.strictEqual(subscriber.leaseTimeoutHandle_, null); + assert.strictEqual(clearTimeoutCalled, true); + + global.clearTimeout = _clearTimeout; + }); + + it('should update the ackDeadline', function() { + subscriber.request = subscriber.setLeaseTimeout_ = fakeUtil.noop; + + subscriber.histogram.percentile = function(percent) { + assert.strictEqual(percent, 99); + return fakeDeadline; + }; + + subscriber.renewLeases_(); + assert.strictEqual(subscriber.ackDeadline, fakeDeadline); + }); + + it('should set the auto-lease timeout', function(done) { + subscriber.request = fakeUtil.noop; + subscriber.setLeaseTimeout_ = done; + subscriber.renewLeases_(); + }); + + it('should not renew leases if inventory is empty', function() { + subscriber.modifyAckDeadline_ = function() { + throw new Error('Should not have been called.'); + }; + + subscriber.inventory_.lease = []; + subscriber.renewLeases_(); + }); + + it('should modAck the leased messages', function(done) { + subscriber.modifyAckDeadline_ = function(ackIds, deadline) { + assert.deepEqual(ackIds, fakeAckIds); + assert.strictEqual(deadline, subscriber.ackDeadline / 1000); + + setImmediate(done); + + return Promise.resolve(); + }; + + subscriber.renewLeases_(); + }); + + it('should re-set the lease timeout', function(done) { + subscriber.setLeaseTimeout_ = done; + subscriber.renewLeases_(); + }); + }); + + describe('setFlushTimeout_', function() { + it('should set a flush timeout', function(done) { + var flushed = false; + + subscriber.flushQueues_ = function() { + flushed = true; + }; + + var delayPromise = delay(0); + var fakeBoundDelay = function() {}; + + delayPromise.cancel.bind = function(context) { + assert.strictEqual(context, delayPromise); + return fakeBoundDelay; + }; + + delayOverride = function(timeout) { + assert.strictEqual(timeout, 1000); + return delayPromise; + }; + + var promise = subscriber.setFlushTimeout_(); + + promise.then(function() { + assert.strictEqual(subscriber.flushTimeoutHandle_, promise); + assert.strictEqual(promise.cancel, fakeBoundDelay); + assert.strictEqual(flushed, true); + done(); + }); + }); + + it('should swallow cancel errors', function() { + var promise = subscriber.setFlushTimeout_(); + promise.cancel(); + return promise; + }); + + it('should return the cached timeout', function() { + var fakeHandle = {}; + + subscriber.flushTimeoutHandle_ = fakeHandle; + + var promise = subscriber.setFlushTimeout_(); + assert.strictEqual(fakeHandle, promise); + }); + }); + + describe('setLeaseTimeout_', function() { + var fakeTimeoutHandle = 1234; + var fakeRandom = 2; + + var globalSetTimeout; + var globalMathRandom; + + before(function() { + globalSetTimeout = global.setTimeout; + globalMathRandom = global.Math.random; + }); + + beforeEach(function() { + subscriber.isOpen = true; + subscriber.latency_ = { + percentile: function() { + return 0; + }, + }; + }); + + after(function() { + global.setTimeout = globalSetTimeout; + global.Math.random = globalMathRandom; + }); + + it('should set a timeout to call renewLeases_', function(done) { + var ackDeadline = (subscriber.ackDeadline = 1000); + + global.Math.random = function() { + return fakeRandom; + }; + + global.setTimeout = function(callback, duration) { + assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9); + setImmediate(callback); // the done fn + return fakeTimeoutHandle; + }; + + subscriber.renewLeases_ = done; + subscriber.setLeaseTimeout_(); + assert.strictEqual(subscriber.leaseTimeoutHandle_, fakeTimeoutHandle); + }); + + it('should subtract the estimated latency', function(done) { + var latency = 1; + + subscriber.latency_.percentile = function(percentile) { + assert.strictEqual(percentile, 99); + return latency; + }; + + var ackDeadline = (subscriber.ackDeadline = 1000); + + global.Math.random = function() { + return fakeRandom; + }; + + global.setTimeout = function(callback, duration) { + assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9 - latency); + done(); + }; + + subscriber.setLeaseTimeout_(); + }); + + it('should not set a timeout if one already exists', function() { + subscriber.renewLeases_ = function() { + throw new Error('Should not be called.'); + }; + + global.Math.random = function() { + throw new Error('Should not be called.'); + }; + + global.setTimeout = function() { + throw new Error('Should not be called.'); + }; + + subscriber.leaseTimeoutHandle_ = fakeTimeoutHandle; + subscriber.setLeaseTimeout_(); + }); + + it('should not set a timeout if the sub is closed', function() { + subscriber.renewLeases_ = function() { + throw new Error('Should not be called.'); + }; + + global.Math.random = function() { + throw new Error('Should not be called.'); + }; + + global.setTimeout = function() { + throw new Error('Should not be called.'); + }; + + subscriber.isOpen = false; + subscriber.setLeaseTimeout_(); + }); + }); + + describe('writeTo_', function() { + var CONNECTION_ID = 'abc'; + var CONNECTION = {}; + + beforeEach(function() { + subscriber.connectionPool = { + acquire: function(connId, cb) { + cb(null, CONNECTION); + }, + }; + }); + + it('should return a promise', function() { + subscriber.connectionPool.acquire = function() {}; + + var returnValue = subscriber.writeTo_(); + assert(returnValue instanceof Promise); + }); + + it('should reject the promise if unable to acquire stream', function() { + var fakeError = new Error('err'); + + subscriber.connectionPool.acquire = function(connId, cb) { + assert.strictEqual(connId, CONNECTION_ID); + cb(fakeError); + }; + + return subscriber.writeTo_(CONNECTION_ID, {}).then( + function() { + throw new Error('Should not resolve.'); + }, + function(err) { + assert.strictEqual(err, fakeError); + } + ); + }); + + it('should write to the stream', function(done) { + var fakeData = {a: 'b'}; + + CONNECTION.write = function(data) { + assert.strictEqual(data, fakeData); + done(); + }; + + subscriber.writeTo_(CONNECTION_ID, fakeData); + }); + + it('should capture the write latency when successful', function() { + var fakeLatency = 500; + var capturedLatency; + + CONNECTION.write = function(data, cb) { + setTimeout(cb, fakeLatency, null); + }; + + subscriber.latency_.add = function(value) { + capturedLatency = value; + }; + + return subscriber.writeTo_(CONNECTION_ID, {}).then(function() { + var upper = fakeLatency + 50; + var lower = fakeLatency - 50; + + assert(capturedLatency > lower && capturedLatency < upper); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index a8ac383d2d4..acd8f1bb031 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -18,19 +18,8 @@ var assert = require('assert'); var common = require('@google-cloud/common'); -var delay = require('delay'); -var events = require('events'); var extend = require('extend'); -var is = require('is'); var proxyquire = require('proxyquire'); -var util = require('util'); - -var FAKE_FREE_MEM = 168222720; -var fakeOs = { - freemem: function() { - return FAKE_FREE_MEM; - }, -}; var promisified = false; var fakeUtil = extend({}, common.util, { @@ -44,17 +33,6 @@ var fakeUtil = extend({}, common.util, { }, }); -function FakeConnectionPool() { - this.calledWith_ = [].slice.call(arguments); - events.EventEmitter.call(this); -} - -util.inherits(FakeConnectionPool, events.EventEmitter); - -function FakeHistogram() { - this.calledWith_ = [].slice.call(arguments); -} - function FakeIAM() { this.calledWith_ = [].slice.call(arguments); } @@ -63,10 +41,8 @@ function FakeSnapshot() { this.calledWith_ = [].slice.call(arguments); } -var delayOverride = null; - -function fakeDelay(timeout) { - return (delayOverride || delay)(timeout); +function FakeSubscriber() { + this.calledWith_ = [].slice.call(arguments); } describe('Subscription', function() { @@ -88,12 +64,9 @@ describe('Subscription', function() { '@google-cloud/common': { util: fakeUtil, }, - delay: fakeDelay, - os: fakeOs, - './connection-pool.js': FakeConnectionPool, - './histogram.js': FakeHistogram, './iam.js': FakeIAM, './snapshot.js': FakeSnapshot, + './subscriber.js': FakeSubscriber, }); }); @@ -128,14 +101,6 @@ describe('Subscription', function() { subscription.request(done); }); - it('should create a histogram instance', function() { - assert(subscription.histogram instanceof FakeHistogram); - }); - - it('should create a latency histogram', function() { - assert(subscription.latency_ instanceof FakeHistogram); - }); - it('should format the sub name', function() { var formattedName = 'a/b/c/d'; var formatName = Subscription.formatName_; @@ -153,50 +118,6 @@ describe('Subscription', function() { assert.strictEqual(subscription.name, formattedName); }); - it('should honor configuration settings', function() { - var options = { - maxConnections: 2, - flowControl: { - maxBytes: 5, - maxMessages: 10, - }, - }; - - var subscription = new Subscription(PUBSUB, SUB_NAME, options); - - assert.strictEqual(subscription.maxConnections, options.maxConnections); - - assert.deepEqual(subscription.flowControl, { - maxBytes: options.flowControl.maxBytes, - maxMessages: options.flowControl.maxMessages, - }); - }); - - it('should set sensible defaults', function() { - assert.strictEqual(subscription.ackDeadline, 10000); - assert.strictEqual(subscription.maxConnections, 5); - assert.strictEqual(subscription.userClosed_, false); - assert.strictEqual(subscription.messageListeners, 0); - assert.strictEqual(subscription.isOpen, false); - - assert.deepEqual(subscription.flowControl, { - maxBytes: FAKE_FREE_MEM * 0.2, - maxMessages: 100, - }); - }); - - it('should create an inventory object', function() { - assert(is.object(subscription.inventory_)); - assert(is.array(subscription.inventory_.lease)); - assert(is.array(subscription.inventory_.ack)); - assert(is.array(subscription.inventory_.nack)); - assert.strictEqual(subscription.inventory_.bytes, 0); - }); - - it('should inherit from EventEmitter', function() { - assert(subscription instanceof events.EventEmitter); - }); - it('should make a create method if a topic is found', function(done) { var TOPIC_NAME = 'test-topic'; @@ -222,17 +143,12 @@ describe('Subscription', function() { assert.strictEqual(args[1], subscription.name); }); - it('should listen for events', function() { - var called = false; - var listenForEvents = Subscription.prototype.listenForEvents_; - - Subscription.prototype.listenForEvents_ = function() { - Subscription.prototype.listenForEvents_ = listenForEvents; - called = true; - }; + it('should inherit from Subscriber', function() { + var options = {}; + var subscription = new Subscription(PUBSUB, SUB_NAME, options); - new Subscription(PUBSUB, SUB_NAME); - assert(called); + assert(subscription instanceof FakeSubscriber); + assert(subscription.calledWith_[0], options); }); }); @@ -289,446 +205,6 @@ describe('Subscription', function() { }); }); - describe('ack_', function() { - var MESSAGE = { - ackId: 'abc', - received: 12345, - connectionId: 'def', - }; - - beforeEach(function() { - subscription.breakLease_ = fakeUtil.noop; - subscription.histogram.add = fakeUtil.noop; - subscription.acknowledge_ = function() { - return Promise.resolve(); - }; - subscription.setFlushTimeout_ = function() { - return Promise.resolve(); - }; - }); - - it('should add the time it took to ack to the histogram', function(done) { - var fakeNow = 12381832; - var now = global.Date.now; - - global.Date.now = function() { - global.Date.now = now; - return fakeNow; - }; - - subscription.histogram.add = function(time) { - assert.strictEqual(time, fakeNow - MESSAGE.received); - done(); - }; - - subscription.ack_(MESSAGE); - }); - - describe('with connection', function() { - beforeEach(function() { - subscription.isConnected_ = function() { - return true; - }; - }); - - it('should acknowledge if there is a connection', function(done) { - subscription.acknowledge_ = function(ackId, connectionId) { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(connectionId, MESSAGE.connectionId); - setImmediate(done); - return Promise.resolve(); - }; - - subscription.ack_(MESSAGE); - }); - - it('should break the lease on the message', function(done) { - subscription.breakLease_ = function(message) { - assert.strictEqual(message, MESSAGE); - done(); - }; - - subscription.ack_(MESSAGE); - }); - }); - - describe('without connection', function() { - beforeEach(function() { - subscription.isConnected_ = function() { - return false; - }; - }); - - it('should queue the message to be acked if no connection', function(done) { - subscription.setFlushTimeout_ = function() { - assert(subscription.inventory_.ack.indexOf(MESSAGE.ackId) > -1); - done(); - }; - - subscription.ack_(MESSAGE); - }); - - it('should break the lease on the message', function(done) { - subscription.breakLease_ = function(message) { - assert.strictEqual(message, MESSAGE); - done(); - }; - - subscription.ack_(MESSAGE); - }); - }); - }); - - describe('acknowledge_', function() { - var fakeAckIds = ['a', 'b', 'c']; - - var batchSize = 3000; - var tooManyFakeAckIds = Array(batchSize * 2.5) - .fill('a') - .map(function(x, i) { - return x + i; - }); - var expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); - - describe('without streaming connection', function() { - beforeEach(function() { - subscription.isConnected_ = function() { - return false; - }; - }); - - it('should make the correct request', function(done) { - var fakePromisified = { - call: function(context, config) { - assert.strictEqual(context, subscription); - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'acknowledge'); - assert.strictEqual(config.reqOpts.subscription, subscription.name); - assert.deepEqual(config.reqOpts.ackIds, fakeAckIds); - - setImmediate(done); - - return Promise.resolve(); - }, - }; - - fakeUtil.promisify = function(fn) { - assert.strictEqual(fn, subscription.request); - return fakePromisified; - }; - - subscription.on('error', done); - subscription.acknowledge_(fakeAckIds); - }); - - it('should batch requests if there are too many ackIds', function(done) { - var receivedCalls = 0; - - var fakePromisified = { - call: function(context, config) { - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); - - assert.deepEqual(config.reqOpts.ackIds, expectedAckIds); - - receivedCalls += 1; - if (receivedCalls === expectedCalls) { - setImmediate(done); - } - - return Promise.resolve(); - }, - }; - - fakeUtil.promisify = function() { - return fakePromisified; - }; - - subscription.on('error', done); - subscription.acknowledge_(tooManyFakeAckIds); - }); - - it('should emit any request errors', function(done) { - var fakeError = new Error('err'); - var fakePromisified = { - call: function() { - return Promise.reject(fakeError); - }, - }; - - fakeUtil.promisify = function() { - return fakePromisified; - }; - - subscription.on('error', function(err) { - assert.strictEqual(err, fakeError); - done(); - }); - - subscription.acknowledge_(fakeAckIds); - }); - }); - - describe('with streaming connection', function() { - beforeEach(function() { - subscription.isConnected_ = function() { - return true; - }; - }); - - it('should send the correct request', function(done) { - var fakeConnectionId = 'abc'; - - subscription.writeTo_ = function(connectionId, data) { - assert.strictEqual(connectionId, fakeConnectionId); - assert.deepEqual(data, {ackIds: fakeAckIds}); - done(); - }; - - subscription.acknowledge_(fakeAckIds, fakeConnectionId); - }); - - it('should batch requests if there are too many ackIds', function(done) { - var receivedCalls = 0; - var fakeConnectionId = 'abc'; - - subscription.writeTo_ = function(connectionId, data) { - assert.strictEqual(connectionId, fakeConnectionId); - - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); - - assert.deepEqual(data, {ackIds: expectedAckIds}); - - if (++receivedCalls === expectedCalls) { - done(); - } - }; - - subscription.acknowledge_(tooManyFakeAckIds, fakeConnectionId); - }); - - it('should emit an error when unable to get a conn', function(done) { - var error = new Error('err'); - - subscription.writeTo_ = function() { - return Promise.reject(error); - }; - - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); - - subscription.acknowledge_(fakeAckIds); - }); - }); - }); - - describe('breakLease_', function() { - var MESSAGE = { - ackId: 'abc', - data: Buffer.from('hello'), - length: 5, - }; - - beforeEach(function() { - subscription.inventory_.lease.push(MESSAGE.ackId); - subscription.inventory_.bytes += MESSAGE.length; - }); - - it('should remove the message from the lease array', function() { - assert.strictEqual(subscription.inventory_.lease.length, 1); - assert.strictEqual(subscription.inventory_.bytes, MESSAGE.length); - - subscription.breakLease_(MESSAGE); - - assert.strictEqual(subscription.inventory_.lease.length, 0); - assert.strictEqual(subscription.inventory_.bytes, 0); - }); - - it('should noop for unknown messages', function() { - var message = { - ackId: 'def', - data: Buffer.from('world'), - length: 5, - }; - - subscription.breakLease_(message); - - assert.strictEqual(subscription.inventory_.lease.length, 1); - assert.strictEqual(subscription.inventory_.bytes, 5); - }); - - describe('with connection pool', function() { - it('should resume receiving messages if paused', function(done) { - subscription.connectionPool = { - isPaused: true, - resume: done, - }; - - subscription.hasMaxMessages_ = function() { - return false; - }; - - subscription.breakLease_(MESSAGE); - }); - - it('should not resume if it is not paused', function() { - subscription.connectionPool = { - isPaused: false, - resume: function() { - throw new Error('Should not be called.'); - }, - }; - - subscription.hasMaxMessages_ = function() { - return false; - }; - - subscription.breakLease_(MESSAGE); - }); - - it('should not resume if the max message limit is hit', function() { - subscription.connectionPool = { - isPaused: true, - resume: function() { - throw new Error('Should not be called.'); - }, - }; - - subscription.hasMaxMessages_ = function() { - return true; - }; - - subscription.breakLease_(MESSAGE); - }); - }); - - it('should quit auto-leasing if all leases are gone', function(done) { - subscription.leaseTimeoutHandle_ = setTimeout(done, 1); - subscription.breakLease_(MESSAGE); - - assert.strictEqual(subscription.leaseTimeoutHandle_, null); - setImmediate(done); - }); - - it('should continue to auto-lease if leases exist', function(done) { - subscription.inventory_.lease.push(MESSAGE.ackId); - subscription.inventory_.lease.push('abcd'); - - subscription.leaseTimeoutHandle_ = setTimeout(done, 1); - subscription.breakLease_(MESSAGE); - }); - }); - - describe('close', function() { - beforeEach(function() { - subscription.flushQueues_ = function() { - return Promise.resolve(); - }; - - subscription.closeConnection_ = fakeUtil.noop; - }); - - it('should set the userClosed_ flag', function() { - subscription.close(); - - assert.strictEqual(subscription.userClosed_, true); - }); - - it('should dump the inventory', function() { - subscription.inventory_ = { - lease: [0, 1, 2], - bytes: 123, - }; - - subscription.close(); - - assert.deepEqual(subscription.inventory_, { - lease: [], - bytes: 0, - }); - }); - - it('should stop auto-leasing', function(done) { - subscription.leaseTimeoutHandle_ = setTimeout(done, 1); - subscription.close(); - - assert.strictEqual(subscription.leaseTimeoutHandle_, null); - setImmediate(done); - }); - - it('should flush immediately', function(done) { - subscription.flushQueues_ = function() { - setImmediate(done); - return Promise.resolve(); - }; - - subscription.close(); - }); - - it('should call closeConnection_', function(done) { - subscription.closeConnection_ = function(callback) { - callback(); // the done fn - }; - - subscription.close(done); - }); - }); - - describe('closeConnection_', function() { - afterEach(function() { - fakeUtil.noop = function() {}; - }); - - it('should set isOpen to false', function() { - subscription.closeConnection_(); - assert.strictEqual(subscription.isOpen, false); - }); - - describe('with connection pool', function() { - beforeEach(function() { - subscription.connectionPool = { - close: function(callback) { - setImmediate(callback); // the done fn - }, - }; - }); - - it('should call close on the connection pool', function(done) { - subscription.closeConnection_(done); - assert.strictEqual(subscription.connectionPool, null); - }); - - it('should use a noop when callback is absent', function(done) { - fakeUtil.noop = done; - subscription.closeConnection_(); - assert.strictEqual(subscription.connectionPool, null); - }); - }); - - describe('without connection pool', function() { - beforeEach(function() { - subscription.connectionPool = null; - }); - - it('should exec the callback if one is passed in', function(done) { - subscription.closeConnection_(done); - }); - - it('should optionally accept a callback', function() { - subscription.closeConnection_(); - }); - }); - }); - describe('createSnapshot', function() { var SNAPSHOT_NAME = 'test-snapshot'; @@ -810,6 +286,11 @@ describe('Subscription', function() { }); describe('delete', function() { + beforeEach(function() { + subscription.removeAllListeners = fakeUtil.noop; + subscription.close = fakeUtil.noop; + }); + it('should make the correct request', function(done) { subscription.request = function(config) { assert.strictEqual(config.client, 'SubscriberClient'); @@ -966,73 +447,21 @@ describe('Subscription', function() { }); }); - describe('flushQueues_', function() { - it('should cancel any pending flushes', function() { - var canceled = false; - var fakeHandle = { - cancel: function() { - canceled = true; - }, - }; - - subscription.flushTimeoutHandle_ = fakeHandle; - subscription.flushQueues_(); - - assert.strictEqual(subscription.flushTimeoutHandle_, null); - assert.strictEqual(canceled, true); + describe('get', function() { + beforeEach(function() { + subscription.create = fakeUtil.noop; }); - it('should do nothing if theres nothing to ack/nack', function() { - subscription.acknowledge_ = subscription.modifyAckDeadline_ = function() { - throw new Error('Should not be called.'); + it('should delete the autoCreate option', function(done) { + var options = { + autoCreate: true, + a: 'a', }; - return subscription.flushQueues_(); - }); - - it('should send any pending acks', function() { - var fakeAckIds = (subscription.inventory_.ack = ['abc', 'def']); - - subscription.acknowledge_ = function(ackIds) { - assert.strictEqual(ackIds, fakeAckIds); - return Promise.resolve(); - }; - - return subscription.flushQueues_().then(function() { - assert.strictEqual(subscription.inventory_.ack.length, 0); - }); - }); - - it('should send any pending nacks', function() { - var fakeAckIds = (subscription.inventory_.nack = ['ghi', 'jkl']); - - subscription.modifyAckDeadline_ = function(ackIds, deadline) { - assert.strictEqual(ackIds, fakeAckIds); - assert.strictEqual(deadline, 0); - return Promise.resolve(); - }; - - return subscription.flushQueues_().then(function() { - assert.strictEqual(subscription.inventory_.nack.length, 0); - }); - }); - }); - - describe('get', function() { - beforeEach(function() { - subscription.create = fakeUtil.noop; - }); - - it('should delete the autoCreate option', function(done) { - var options = { - autoCreate: true, - a: 'a', - }; - - subscription.getMetadata = function(gaxOpts) { - assert.strictEqual(gaxOpts, options); - assert.strictEqual(gaxOpts.autoCreate, undefined); - done(); + subscription.getMetadata = function(gaxOpts) { + assert.strictEqual(gaxOpts, options); + assert.strictEqual(gaxOpts.autoCreate, undefined); + done(); }; subscription.get(options, assert.ifError); @@ -1195,340 +624,6 @@ describe('Subscription', function() { }); }); - describe('isConnected_', function() { - it('should return false if there is no pool', function() { - subscription.connectionPool = null; - assert.strictEqual(subscription.isConnected_(), false); - }); - - it('should return false if the pool says its connected', function() { - subscription.connectionPool = { - isConnected: function() { - return false; - }, - }; - - assert.strictEqual(subscription.isConnected_(), false); - }); - - it('should return true if the pool says its connected', function() { - subscription.connectionPool = { - isConnected: function() { - return true; - }, - }; - - assert.strictEqual(subscription.isConnected_(), true); - }); - }); - - describe('hasMaxMessages_', function() { - it('should return true if the number of leases >= maxMessages', function() { - subscription.inventory_.lease = ['a', 'b', 'c']; - subscription.flowControl.maxMessages = 3; - - assert(subscription.hasMaxMessages_()); - }); - - it('should return true if bytes == maxBytes', function() { - subscription.inventory_.bytes = 1000; - subscription.flowControl.maxBytes = 1000; - - assert(subscription.hasMaxMessages_()); - }); - - it('should return false if neither condition is met', function() { - subscription.inventory_.lease = ['a', 'b']; - subscription.flowControl.maxMessages = 3; - - subscription.inventory_.bytes = 900; - subscription.flowControl.maxBytes = 1000; - - assert.strictEqual(subscription.hasMaxMessages_(), false); - }); - }); - - describe('leaseMessage_', function() { - var MESSAGE = { - ackId: 'abc', - connectionId: 'def', - data: Buffer.from('hello'), - length: 5, - }; - - beforeEach(function() { - subscription.setLeaseTimeout_ = fakeUtil.noop; - subscription.modifyAckDeadline_ = fakeUtil.noop; - }); - - it('should immediately modAck the message', function(done) { - subscription.modifyAckDeadline_ = function(ackId, deadline, connId) { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(deadline, subscription.ackDeadline / 1000); - assert.strictEqual(connId, MESSAGE.connectionId); - done(); - }; - - subscription.leaseMessage_(MESSAGE); - }); - - it('should add the ackId to the inventory', function() { - subscription.leaseMessage_(MESSAGE); - assert.deepEqual(subscription.inventory_.lease, [MESSAGE.ackId]); - }); - - it('should update the byte count', function() { - assert.strictEqual(subscription.inventory_.bytes, 0); - subscription.leaseMessage_(MESSAGE); - assert.strictEqual(subscription.inventory_.bytes, MESSAGE.length); - }); - - it('should begin auto-leasing', function(done) { - subscription.setLeaseTimeout_ = done; - subscription.leaseMessage_(MESSAGE); - }); - - it('should return the message', function() { - var message = subscription.leaseMessage_(MESSAGE); - assert.strictEqual(message, MESSAGE); - }); - }); - - describe('listenForEvents_', function() { - beforeEach(function() { - subscription.openConnection_ = fakeUtil.noop; - subscription.closeConnection_ = fakeUtil.noop; - }); - - describe('on new listener', function() { - it('should increment messageListeners', function() { - assert.strictEqual(subscription.messageListeners, 0); - subscription.on('message', fakeUtil.noop); - assert.strictEqual(subscription.messageListeners, 1); - }); - - it('should ignore non-message events', function() { - subscription.on('data', fakeUtil.noop); - assert.strictEqual(subscription.messageListeners, 0); - }); - - it('should open a connection', function(done) { - subscription.openConnection_ = done; - subscription.on('message', fakeUtil.noop); - }); - - it('should set the userClosed_ flag to false', function() { - subscription.userClosed_ = true; - subscription.on('message', fakeUtil.noop); - assert.strictEqual(subscription.userClosed_, false); - }); - - it('should not open a connection when one exists', function() { - subscription.connectionPool = {}; - - subscription.openConnection_ = function() { - throw new Error('Should not be called.'); - }; - - subscription.on('message', fakeUtil.noop); - }); - }); - - describe('on remove listener', function() { - var noop = function() {}; - - it('should decrement messageListeners', function() { - subscription.on('message', fakeUtil.noop); - subscription.on('message', noop); - assert.strictEqual(subscription.messageListeners, 2); - - subscription.removeListener('message', noop); - assert.strictEqual(subscription.messageListeners, 1); - }); - - it('should ignore non-message events', function() { - subscription.on('message', fakeUtil.noop); - subscription.on('message', noop); - assert.strictEqual(subscription.messageListeners, 2); - - subscription.removeListener('data', noop); - assert.strictEqual(subscription.messageListeners, 2); - }); - - it('should close the connection when no listeners', function(done) { - subscription.closeConnection_ = done; - - subscription.on('message', noop); - subscription.removeListener('message', noop); - }); - }); - }); - - describe('modifyAckDeadline_', function() { - var fakeAckIds = ['a', 'b', 'c']; - var fakeDeadline = 123; - - var batchSize = 3000; - var tooManyFakeAckIds = Array(batchSize * 2.5) - .fill('a') - .map(function(x, i) { - return x + i; - }); - var expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); - - describe('without streaming connection', function() { - beforeEach(function() { - subscription.isConnected_ = function() { - return false; - }; - }); - - it('should make the correct request', function(done) { - var fakePromisified = { - call: function(context, config) { - assert.strictEqual(context, subscription); - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'modifyAckDeadline'); - assert.strictEqual(config.reqOpts.subscription, subscription.name); - assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); - assert.deepEqual(config.reqOpts.ackIds, fakeAckIds); - - setImmediate(done); - - return Promise.resolve(); - }, - }; - - fakeUtil.promisify = function(fn) { - assert.strictEqual(fn, subscription.request); - return fakePromisified; - }; - - subscription.on('error', done); - subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline); - }); - - it('should batch requests if there are too many ackIds', function(done) { - var receivedCalls = 0; - - var fakePromisified = { - call: function(context, config) { - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); - - assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); - assert.deepEqual(config.reqOpts.ackIds, expectedAckIds); - - receivedCalls += 1; - if (receivedCalls === expectedCalls) { - setImmediate(done); - } - - return Promise.resolve(); - }, - }; - - fakeUtil.promisify = function() { - return fakePromisified; - }; - - subscription.on('error', done); - subscription.modifyAckDeadline_(tooManyFakeAckIds, fakeDeadline); - }); - - it('should emit any request errors', function(done) { - var fakeError = new Error('err'); - var fakePromisified = { - call: function() { - return Promise.reject(fakeError); - }, - }; - - fakeUtil.promisify = function() { - return fakePromisified; - }; - - subscription.on('error', function(err) { - assert.strictEqual(err, fakeError); - done(); - }); - - subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline); - }); - }); - - describe('with streaming connection', function() { - beforeEach(function() { - subscription.isConnected_ = function() { - return true; - }; - }); - - it('should send the correct request', function(done) { - var expectedDeadlines = Array(fakeAckIds.length).fill(fakeDeadline); - var fakeConnId = 'abc'; - - subscription.writeTo_ = function(connectionId, data) { - assert.strictEqual(connectionId, fakeConnId); - assert.deepEqual(data.modifyDeadlineAckIds, fakeAckIds); - assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); - done(); - }; - - subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); - }); - - it('should batch requests if there are too many ackIds', function(done) { - var receivedCalls = 0; - var fakeConnId = 'abc'; - - subscription.writeTo_ = function(connectionId, data) { - assert.strictEqual(connectionId, fakeConnId); - - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); - var expectedDeadlines = Array(expectedAckIds.length).fill( - fakeDeadline - ); - - assert.deepEqual(data.modifyDeadlineAckIds, expectedAckIds); - assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); - - if (++receivedCalls === expectedCalls) { - done(); - } - }; - - subscription.modifyAckDeadline_( - tooManyFakeAckIds, - fakeDeadline, - fakeConnId - ); - }); - - it('should emit an error when unable to get a conn', function(done) { - var error = new Error('err'); - - subscription.writeTo_ = function() { - return Promise.reject(error); - }; - - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); - - subscription.modifyAckDeadline_(fakeAckIds, fakeDeadline); - }); - }); - }); - describe('modifyPushConfig', function() { var fakeConfig = {}; @@ -1558,256 +653,6 @@ describe('Subscription', function() { }); }); - describe('nack_', function() { - var MESSAGE = { - ackId: 'abc', - connectionId: 'def', - }; - - beforeEach(function() { - subscription.breakLease_ = fakeUtil.noop; - subscription.modifyAckDeadline_ = function() { - return Promise.resolve(); - }; - subscription.setFlushTimeout_ = function() { - return Promise.resolve(); - }; - }); - - describe('with connection', function() { - beforeEach(function() { - subscription.isConnected_ = function() { - return true; - }; - }); - - it('should nack if there is a connection', function(done) { - subscription.modifyAckDeadline_ = function(ackId, deadline, connId) { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(deadline, 0); - assert.strictEqual(connId, MESSAGE.connectionId); - setImmediate(done); - return Promise.resolve(); - }; - - subscription.nack_(MESSAGE); - }); - - it('should break the lease on the message', function(done) { - subscription.breakLease_ = function(message) { - assert.strictEqual(message, MESSAGE); - done(); - }; - - subscription.nack_(MESSAGE); - }); - }); - - describe('without connection', function() { - beforeEach(function() { - subscription.isConnected_ = function() { - return false; - }; - }); - - it('should queue the message to be nacked if no conn', function(done) { - subscription.setFlushTimeout_ = function() { - assert(subscription.inventory_.nack.indexOf(MESSAGE.ackId) > -1); - setImmediate(done); - return Promise.resolve(); - }; - - subscription.nack_(MESSAGE); - }); - - it('should break the lease on the message', function(done) { - subscription.breakLease_ = function(message) { - assert.strictEqual(message, MESSAGE); - done(); - }; - - subscription.nack_(MESSAGE); - }); - }); - }); - - describe('openConnection_', function() { - it('should create a ConnectionPool instance', function() { - subscription.openConnection_(); - assert(subscription.connectionPool instanceof FakeConnectionPool); - - var args = subscription.connectionPool.calledWith_; - assert.strictEqual(args[0], subscription); - }); - - it('should emit pool errors', function(done) { - var error = new Error('err'); - - subscription.on('error', function(err) { - assert.strictEqual(err, error); - done(); - }); - - subscription.openConnection_(); - subscription.connectionPool.emit('error', error); - }); - - it('should set isOpen to true', function() { - subscription.openConnection_(); - assert.strictEqual(subscription.isOpen, true); - }); - - it('should lease & emit messages from pool', function(done) { - var message = {}; - var leasedMessage = {}; - - subscription.leaseMessage_ = function(message_) { - assert.strictEqual(message_, message); - return leasedMessage; - }; - - subscription.on('message', function(message) { - assert.strictEqual(message, leasedMessage); - done(); - }); - - subscription.openConnection_(); - subscription.connectionPool.emit('message', message); - }); - - it('should pause the pool if sub is at max messages', function(done) { - var message = {nack: fakeUtil.noop}; - var leasedMessage = {}; - - subscription.leaseMessage_ = function() { - return leasedMessage; - }; - - subscription.hasMaxMessages_ = function() { - return true; - }; - - subscription.openConnection_(); - subscription.connectionPool.isPaused = false; - subscription.connectionPool.pause = done; - subscription.connectionPool.emit('message', message); - }); - - it('should not re-pause the pool', function(done) { - var message = {nack: fakeUtil.noop}; - var leasedMessage = {}; - - subscription.leaseMessage_ = function() { - return leasedMessage; - }; - - subscription.hasMaxMessages_ = function() { - return true; - }; - - subscription.openConnection_(); - subscription.connectionPool.isPaused = true; - - subscription.connectionPool.pause = function() { - done(new Error('Should not have been called.')); - }; - - subscription.connectionPool.emit('message', message); - done(); - }); - - it('should flush the queue when connected', function(done) { - subscription.flushQueues_ = done; - - subscription.openConnection_(); - subscription.connectionPool.emit('connected'); - }); - }); - - describe('renewLeases_', function() { - beforeEach(function() { - subscription.modifyAckDeadline_ = function() { - return Promise.resolve(); - }; - }); - - var fakeDeadline = 9999; - var fakeAckIds = ['abc', 'def']; - - beforeEach(function() { - subscription.inventory_.lease = fakeAckIds; - subscription.setLeaseTimeout_ = fakeUtil.noop; - - subscription.histogram.percentile = function() { - return fakeDeadline; - }; - }); - - it('should clean up the old timeout handle', function() { - var fakeHandle = 123; - var clearTimeoutCalled = false; - var _clearTimeout = global.clearTimeout; - - global.clearTimeout = function(handle) { - assert.strictEqual(handle, fakeHandle); - clearTimeoutCalled = true; - }; - - subscription.leaseTimeoutHandle_ = fakeHandle; - subscription.renewLeases_(); - - assert.strictEqual(subscription.leaseTimeoutHandle_, null); - assert.strictEqual(clearTimeoutCalled, true); - - global.clearTimeout = _clearTimeout; - }); - - it('should update the ackDeadline', function() { - subscription.request = subscription.setLeaseTimeout_ = fakeUtil.noop; - - subscription.histogram.percentile = function(percent) { - assert.strictEqual(percent, 99); - return fakeDeadline; - }; - - subscription.renewLeases_(); - assert.strictEqual(subscription.ackDeadline, fakeDeadline); - }); - - it('should set the auto-lease timeout', function(done) { - subscription.request = fakeUtil.noop; - subscription.setLeaseTimeout_ = done; - subscription.renewLeases_(); - }); - - it('should not renew leases if inventory is empty', function() { - subscription.modifyAckDeadline_ = function() { - throw new Error('Should not have been called.'); - }; - - subscription.inventory_.lease = []; - subscription.renewLeases_(); - }); - - it('should modAck the leased messages', function(done) { - subscription.modifyAckDeadline_ = function(ackIds, deadline) { - assert.deepEqual(ackIds, fakeAckIds); - assert.strictEqual(deadline, subscription.ackDeadline / 1000); - - setImmediate(done); - - return Promise.resolve(); - }; - - subscription.renewLeases_(); - }); - - it('should re-set the lease timeout', function(done) { - subscription.setLeaseTimeout_ = done; - subscription.renewLeases_(); - }); - }); - describe('seek', function() { var FAKE_SNAPSHOT_NAME = 'a'; var FAKE_FULL_SNAPSHOT_NAME = 'a/b/c/d'; @@ -1867,154 +712,6 @@ describe('Subscription', function() { }); }); - describe('setFlushTimeout_', function() { - it('should set a flush timeout', function(done) { - var flushed = false; - - subscription.flushQueues_ = function() { - flushed = true; - }; - - var delayPromise = delay(0); - var fakeBoundDelay = function() {}; - - delayPromise.cancel.bind = function(context) { - assert.strictEqual(context, delayPromise); - return fakeBoundDelay; - }; - - delayOverride = function(timeout) { - assert.strictEqual(timeout, 1000); - return delayPromise; - }; - - var promise = subscription.setFlushTimeout_(); - - promise.then(function() { - assert.strictEqual(subscription.flushTimeoutHandle_, promise); - assert.strictEqual(promise.cancel, fakeBoundDelay); - assert.strictEqual(flushed, true); - done(); - }); - }); - - it('should swallow cancel errors', function() { - var promise = subscription.setFlushTimeout_(); - promise.cancel(); - return promise; - }); - - it('should return the cached timeout', function() { - var fakeHandle = {}; - - subscription.flushTimeoutHandle_ = fakeHandle; - - var promise = subscription.setFlushTimeout_(); - assert.strictEqual(fakeHandle, promise); - }); - }); - - describe('setLeaseTimeout_', function() { - var fakeTimeoutHandle = 1234; - var fakeRandom = 2; - - var globalSetTimeout; - var globalMathRandom; - - before(function() { - globalSetTimeout = global.setTimeout; - globalMathRandom = global.Math.random; - }); - - beforeEach(function() { - subscription.isOpen = true; - subscription.latency_ = { - percentile: function() { - return 0; - }, - }; - }); - - after(function() { - global.setTimeout = globalSetTimeout; - global.Math.random = globalMathRandom; - }); - - it('should set a timeout to call renewLeases_', function(done) { - var ackDeadline = (subscription.ackDeadline = 1000); - - global.Math.random = function() { - return fakeRandom; - }; - - global.setTimeout = function(callback, duration) { - assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9); - setImmediate(callback); // the done fn - return fakeTimeoutHandle; - }; - - subscription.renewLeases_ = done; - subscription.setLeaseTimeout_(); - assert.strictEqual(subscription.leaseTimeoutHandle_, fakeTimeoutHandle); - }); - - it('should subtract the estimated latency', function(done) { - var latency = 1; - - subscription.latency_.percentile = function(percentile) { - assert.strictEqual(percentile, 99); - return latency; - }; - - var ackDeadline = (subscription.ackDeadline = 1000); - - global.Math.random = function() { - return fakeRandom; - }; - - global.setTimeout = function(callback, duration) { - assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9 - latency); - done(); - }; - - subscription.setLeaseTimeout_(); - }); - - it('should not set a timeout if one already exists', function() { - subscription.renewLeases_ = function() { - throw new Error('Should not be called.'); - }; - - global.Math.random = function() { - throw new Error('Should not be called.'); - }; - - global.setTimeout = function() { - throw new Error('Should not be called.'); - }; - - subscription.leaseTimeoutHandle_ = fakeTimeoutHandle; - subscription.setLeaseTimeout_(); - }); - - it('should not set a timeout if the sub is closed', function() { - subscription.renewLeases_ = function() { - throw new Error('Should not be called.'); - }; - - global.Math.random = function() { - throw new Error('Should not be called.'); - }; - - global.setTimeout = function() { - throw new Error('Should not be called.'); - }; - - subscription.isOpen = false; - subscription.setLeaseTimeout_(); - }); - }); - describe('setMetadata', function() { var METADATA = { pushEndpoint: 'http://noop.com/push', @@ -2081,73 +778,4 @@ describe('Subscription', function() { subscription.snapshot(SNAPSHOT_NAME); }); }); - - describe('writeTo_', function() { - var CONNECTION_ID = 'abc'; - var CONNECTION = {}; - - beforeEach(function() { - subscription.connectionPool = { - acquire: function(connId, cb) { - cb(null, CONNECTION); - }, - }; - }); - - it('should return a promise', function() { - subscription.connectionPool.acquire = function() {}; - - var returnValue = subscription.writeTo_(); - assert(returnValue instanceof Promise); - }); - - it('should reject the promise if unable to acquire stream', function() { - var fakeError = new Error('err'); - - subscription.connectionPool.acquire = function(connId, cb) { - assert.strictEqual(connId, CONNECTION_ID); - cb(fakeError); - }; - - return subscription.writeTo_(CONNECTION_ID, {}).then( - function() { - throw new Error('Should not resolve.'); - }, - function(err) { - assert.strictEqual(err, fakeError); - } - ); - }); - - it('should write to the stream', function(done) { - var fakeData = {a: 'b'}; - - CONNECTION.write = function(data) { - assert.strictEqual(data, fakeData); - done(); - }; - - subscription.writeTo_(CONNECTION_ID, fakeData); - }); - - it('should capture the write latency when successful', function() { - var fakeLatency = 500; - var capturedLatency; - - CONNECTION.write = function(data, cb) { - setTimeout(cb, fakeLatency, null); - }; - - subscription.latency_.add = function(value) { - capturedLatency = value; - }; - - return subscription.writeTo_(CONNECTION_ID, {}).then(function() { - var upper = fakeLatency + 50; - var lower = fakeLatency - 50; - - assert(capturedLatency > lower && capturedLatency < upper); - }); - }); - }); }); From a28d156f2436596bf58063817cae04bcb3a1722b Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 25 Jun 2018 11:23:52 -0400 Subject: [PATCH 0162/1115] refactor(subscription): use unary rpcs for ack/modAck (#147) --- handwritten/pubsub/src/connection-pool.js | 23 +++++++ handwritten/pubsub/src/subscriber.js | 20 ++++-- handwritten/pubsub/src/subscription.js | 4 ++ handwritten/pubsub/test/connection-pool.js | 79 ++++++++++++++++++++-- handwritten/pubsub/test/subscriber.js | 24 ++++++- 5 files changed, 141 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 34815596fee..b6c1794ad40 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -28,6 +28,8 @@ var uuid = require('uuid'); var CHANNEL_READY_EVENT = 'channel.ready'; var CHANNEL_ERROR_EVENT = 'channel.error'; +var KEEP_ALIVE_INTERVAL = 30000; + /*! * if we can't establish a connection within 5 minutes, we need to back off * and emit an error to the user. @@ -148,6 +150,8 @@ ConnectionPool.prototype.close = function(callback) { callback = callback || common.util.noop; + clearInterval(this.keepAliveHandle); + this.connections.clear(); this.queue.forEach(clearTimeout); this.queue.length = 0; @@ -432,6 +436,14 @@ ConnectionPool.prototype.open = function() { self.getAndEmitChannelState(); } }); + + if (!this.subscription.writeToStreams_) { + this.keepAliveHandle = setInterval(function() { + self.sendKeepAlives(); + }, KEEP_ALIVE_INTERVAL); + + this.keepAliveHandle.unref(); + } }; /*! @@ -485,6 +497,17 @@ ConnectionPool.prototype.resume = function() { }); }; +/*! + * Sends empty message in an effort to keep the stream alive. + * + * @private + */ +ConnectionPool.prototype.sendKeepAlives = function() { + this.connections.forEach(function(connection) { + connection.write({}); + }); +}; + /*! * Inspects a status object to determine whether or not we should try and * reconnect. diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js index 0d1f9aef0f6..96bc0462549 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.js @@ -69,12 +69,24 @@ function Subscriber(options) { options.flowControl ); + this.batching = extend( + { + maxMilliseconds: 100, + }, + options.batching + ); + this.flushTimeoutHandle_ = null; this.leaseTimeoutHandle_ = null; this.userClosed_ = false; this.isOpen = false; this.messageListeners = 0; + // As of right now we do not write any acks/modacks to the pull streams. + // But with allowing users to opt out of using streaming pulls altogether on + // the horizon, we may need to support this feature again in the near future. + this.writeToStreams_ = false; + events.EventEmitter.call(this); this.listenForEvents_(); @@ -96,7 +108,7 @@ Subscriber.prototype.ack_ = function(message) { this.histogram.add(Date.now() - message.received); - if (this.isConnected_()) { + if (this.writeToStreams_ && this.isConnected_()) { this.acknowledge_(message.ackId, message.connectionId).then(breakLease); return; } @@ -122,7 +134,7 @@ Subscriber.prototype.acknowledge_ = function(ackIds, connId) { var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( ackIdChunk ) { - if (self.isConnected_()) { + if (self.writeToStreams_ && self.isConnected_()) { return self.writeTo_(connId, {ackIds: ackIdChunk}); } @@ -377,7 +389,7 @@ Subscriber.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( ackIdChunk ) { - if (self.isConnected_()) { + if (self.writeToStreams_ && self.isConnected_()) { return self.writeTo_(connId, { modifyDeadlineAckIds: ackIdChunk, modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), @@ -485,7 +497,7 @@ Subscriber.prototype.renewLeases_ = function() { */ Subscriber.prototype.setFlushTimeout_ = function() { if (!this.flushTimeoutHandle_) { - var timeout = delay(1000); + var timeout = delay(this.batching.maxMilliseconds); var promise = timeout .then(this.flushQueues_.bind(this)) .catch(common.util.noop); diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 069bb01f2b7..e436f50cf44 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -60,6 +60,10 @@ var Subscriber = require('./subscriber.js'); * @param {string} name The name of the subscription. * @param {object} [options] See a * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) + * @param {object} [options.batching] Batch configurations for sending out + * Acknowledge and ModifyAckDeadline requests. + * @param {number} [options.batching.maxMilliseconds] The maximum amount of time + * to buffer Acknowledge and ModifyAckDeadline requests. Default: 100. * @param {object} [options.flowControl] Flow control configurations for * receiving messages. Note that these options do not persist across * subscription instances. diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index 7ef382f3e15..32dd0ab93c8 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -33,13 +33,16 @@ function FakeConnection() { this.isPaused = false; this.ended = false; this.canceled = false; + this.written = []; events.EventEmitter.call(this); } util.inherits(FakeConnection, events.EventEmitter); -FakeConnection.prototype.write = function() {}; +FakeConnection.prototype.write = function(data) { + this.written.push(data); +}; FakeConnection.prototype.end = function(callback) { this.ended = true; @@ -260,13 +263,42 @@ describe('ConnectionPool', function() { }); describe('close', function() { + var _clearTimeout; + var _clearInterval; + + before(function() { + _clearTimeout = global.clearTimeout; + _clearInterval = global.clearInterval; + }); + + beforeEach(function() { + global.clearTimeout = global.clearInterval = fakeUtil.noop; + }); + + afterEach(function() { + global.clearTimeout = _clearTimeout; + global.clearInterval = _clearInterval; + }); + + it('should stop running the keepAlive task', function(done) { + var fakeHandle = 123; + + pool.keepAliveHandle = fakeHandle; + + global.clearInterval = function(handle) { + assert.strictEqual(handle, fakeHandle); + done(); + }; + + pool.close(); + }); + it('should clear the connections map', function(done) { pool.connections.clear = done; pool.close(); }); it('should clear any timeouts in the queue', function() { - var _clearTimeout = global.clearTimeout; var clearCalls = 0; var fakeHandles = ['a', 'b', 'c', 'd']; @@ -280,8 +312,6 @@ describe('ConnectionPool', function() { assert.strictEqual(clearCalls, fakeHandles.length); assert.strictEqual(pool.queue.length, 0); - - global.clearTimeout = _clearTimeout; }); it('should set isOpen to false', function() { @@ -1078,6 +1108,7 @@ describe('ConnectionPool', function() { describe('open', function() { beforeEach(function() { pool.queueConnection = fakeUtil.noop; + clearInterval(pool.keepAliveHandle); }); it('should make the specified number of connections', function() { @@ -1146,6 +1177,31 @@ describe('ConnectionPool', function() { pool.emit('newListener', 'channel.ready'); }); }); + + it('should start a keepAlive task', function(done) { + var _setInterval = global.setInterval; + var unreffed = false; + var fakeHandle = { + unref: () => (unreffed = true), + }; + + pool.subscription = {writeToStreams_: false}; + pool.sendKeepAlives = done; + + global.setInterval = function(fn, interval) { + global.setInterval = _setInterval; + + assert.strictEqual(interval, 30000); + fn(); // should call sendKeepAlives aka done + + return fakeHandle; + }; + + pool.open(); + + assert.strictEqual(pool.keepAliveHandle, fakeHandle); + assert.strictEqual(unreffed, true); + }); }); describe('pause', function() { @@ -1262,6 +1318,21 @@ describe('ConnectionPool', function() { }); }); + describe('sendKeepAlives', function() { + it('should write an empty message to all the streams', function() { + var a = new FakeConnection(); + var b = new FakeConnection(); + + pool.connections.set('a', a); + pool.connections.set('b', b); + + pool.sendKeepAlives(); + + assert.deepEqual(a.written, [{}]); + assert.deepEqual(b.written, [{}]); + }); + }); + describe('shouldReconnect', function() { it('should not reconnect if the pool is closed', function() { pool.isOpen = false; diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.js index a406bfe93af..092fbc9d1a3 100644 --- a/handwritten/pubsub/test/subscriber.js +++ b/handwritten/pubsub/test/subscriber.js @@ -90,6 +90,9 @@ describe('Subscriber', function() { maxBytes: 5, maxMessages: 10, }, + batching: { + maxMilliseconds: 10, + }, }; var subscriber = new Subscriber(options); @@ -100,6 +103,8 @@ describe('Subscriber', function() { maxBytes: options.flowControl.maxBytes, maxMessages: options.flowControl.maxMessages, }); + + assert.strictEqual(subscriber.batching.maxMilliseconds, 10); }); it('should set sensible defaults', function() { @@ -108,11 +113,14 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.userClosed_, false); assert.strictEqual(subscriber.messageListeners, 0); assert.strictEqual(subscriber.isOpen, false); + assert.strictEqual(subscriber.writeToStreams_, false); assert.deepEqual(subscriber.flowControl, { maxBytes: FAKE_FREE_MEM * 0.2, maxMessages: 100, }); + + assert.strictEqual(subscriber.batching.maxMilliseconds, 100); }); it('should create an inventory object', function() { @@ -181,6 +189,8 @@ describe('Subscriber', function() { subscriber.isConnected_ = function() { return true; }; + + subscriber.writeToStreams_ = true; }); it('should acknowledge if there is a connection', function(done) { @@ -329,6 +339,8 @@ describe('Subscriber', function() { subscriber.isConnected_ = function() { return true; }; + + subscriber.writeToStreams_ = true; }); it('should send the correct request', function(done) { @@ -903,6 +915,8 @@ describe('Subscriber', function() { subscriber.isConnected_ = function() { return true; }; + + subscriber.writeToStreams_ = true; }); it('should send the correct request', function(done) { @@ -988,6 +1002,8 @@ describe('Subscriber', function() { subscriber.isConnected_ = function() { return true; }; + + subscriber.writeToStreams_ = true; }); it('should nack if there is a connection', function(done) { @@ -1218,6 +1234,12 @@ describe('Subscriber', function() { }); describe('setFlushTimeout_', function() { + var FLUSH_TIMEOUT = 100; + + beforeEach(function() { + subscriber.batching.maxMilliseconds = FLUSH_TIMEOUT; + }); + it('should set a flush timeout', function(done) { var flushed = false; @@ -1234,7 +1256,7 @@ describe('Subscriber', function() { }; delayOverride = function(timeout) { - assert.strictEqual(timeout, 1000); + assert.strictEqual(timeout, FLUSH_TIMEOUT); return delayPromise; }; From 5bc762ef45d9b5556badd9b2f57c54ce7cd94bd4 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 25 Jun 2018 12:14:51 -0400 Subject: [PATCH 0163/1115] chore: bump version to 0.19.0 (#148) --- handwritten/pubsub/package-lock.json | 6325 ++++++++++++-------------- handwritten/pubsub/package.json | 2 +- 2 files changed, 2896 insertions(+), 3431 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index ce5610633cd..1980d331b32 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -1,6 +1,6 @@ { "name": "@google-cloud/pubsub", - "version": "0.18.0", + "version": "0.19.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -16,18 +16,18 @@ "integrity": "sha512-oWqTnIGXW3k72UFidXzW0ONlO7hnO9x02S/QReJ7NBGeiBH9cUHY9+EfV6C8PXC6YJH++WrliEq03wMSJGNZFg==", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "^6.8.0", - "babel-plugin-syntax-trailing-function-commas": "^6.20.0", - "babel-plugin-transform-async-to-generator": "^6.16.0", - "babel-plugin-transform-es2015-destructuring": "^6.19.0", - "babel-plugin-transform-es2015-function-name": "^6.9.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0", - "babel-plugin-transform-es2015-parameters": "^6.21.0", - "babel-plugin-transform-es2015-spread": "^6.8.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.8.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.11.0", - "babel-plugin-transform-exponentiation-operator": "^6.8.0", - "package-hash": "^1.2.0" + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "package-hash": "1.2.0" }, "dependencies": { "md5-hex": { @@ -36,7 +36,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "package-hash": { @@ -45,7 +45,7 @@ "integrity": "sha1-AD5WzVe3NqbtYRTMK4FUJnJ3DkQ=", "dev": true, "requires": { - "md5-hex": "^1.3.0" + "md5-hex": "1.3.0" } } } @@ -56,8 +56,8 @@ "integrity": "sha1-ze0RlqjY2TgaUJJAq5LpGl7Aafc=", "dev": true, "requires": { - "@ava/babel-plugin-throws-helper": "^2.0.0", - "babel-plugin-espower": "^2.3.2" + "@ava/babel-plugin-throws-helper": "2.0.0", + "babel-plugin-espower": "2.4.0" } }, "@ava/write-file-atomic": { @@ -66,9 +66,9 @@ "integrity": "sha512-BTNB3nGbEfJT+69wuqXFr/bQH7Vr7ihx2xGOMNqPgDGhwspoZhiWumDDZNjBy7AScmqS5CELIOGtPVXESyrnDA==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } }, "@babel/code-frame": { @@ -87,10 +87,10 @@ "dev": true, "requires": { "@babel/types": "7.0.0-beta.49", - "jsesc": "^2.5.1", - "lodash": "^4.17.5", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" + "jsesc": "2.5.1", + "lodash": "4.17.10", + "source-map": "0.5.7", + "trim-right": "1.0.1" }, "dependencies": { "jsesc": { @@ -136,9 +136,9 @@ "integrity": "sha1-lr3GtD4TSCASumaRsQGEktOWIsw=", "dev": true, "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^3.0.0" + "chalk": "2.4.1", + "esutils": "2.0.2", + "js-tokens": "3.0.2" } }, "@babel/parser": { @@ -156,7 +156,7 @@ "@babel/code-frame": "7.0.0-beta.49", "@babel/parser": "7.0.0-beta.49", "@babel/types": "7.0.0-beta.49", - "lodash": "^4.17.5" + "lodash": "4.17.10" } }, "@babel/traverse": { @@ -171,16 +171,16 @@ "@babel/helper-split-export-declaration": "7.0.0-beta.49", "@babel/parser": "7.0.0-beta.49", "@babel/types": "7.0.0-beta.49", - "debug": "^3.1.0", - "globals": "^11.1.0", - "invariant": "^2.2.0", - "lodash": "^4.17.5" + "debug": "3.1.0", + "globals": "11.7.0", + "invariant": "2.2.4", + "lodash": "4.17.10" }, "dependencies": { "globals": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", - "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", + "version": "11.7.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", + "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", "dev": true } } @@ -191,9 +191,9 @@ "integrity": "sha1-t+Oxw/TUz+Eb34yJ8e/V4WF7h6Y=", "dev": true, "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.5", - "to-fast-properties": "^2.0.0" + "esutils": "2.0.2", + "lodash": "4.17.10", + "to-fast-properties": "2.0.0" }, "dependencies": { "to-fast-properties": { @@ -210,7 +210,7 @@ "integrity": "sha512-htrsRaQX8Iixlsek8zQU7tE8wcsTQJ5UhZkSPEA8slCDAisKpC/2VgU/ucPn32M5/LjGGXRaUEKvEw1Wiuu4zQ==", "dev": true, "requires": { - "arrify": "^1.0.1" + "arrify": "1.0.1" } }, "@google-cloud/common": { @@ -218,24 +218,24 @@ "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.16.2.tgz", "integrity": "sha512-GrkaFoj0/oO36pNs4yLmaYhTujuA3i21FdQik99Fd/APix1uhf01VlpJY4lAteTDFLRNkRx6ydEh7OVvmeUHng==", "requires": { - "array-uniq": "^1.0.3", - "arrify": "^1.0.1", - "concat-stream": "^1.6.0", - "create-error-class": "^3.0.2", - "duplexify": "^3.5.0", - "ent": "^2.2.0", - "extend": "^3.0.1", - "google-auto-auth": "^0.9.0", - "is": "^3.2.0", + "array-uniq": "1.0.3", + "arrify": "1.0.1", + "concat-stream": "1.6.2", + "create-error-class": "3.0.2", + "duplexify": "3.6.0", + "ent": "2.2.0", + "extend": "3.0.1", + "google-auto-auth": "0.9.7", + "is": "3.2.1", "log-driver": "1.2.7", - "methmeth": "^1.1.0", - "modelo": "^4.2.0", - "request": "^2.79.0", - "retry-request": "^3.0.0", - "split-array-stream": "^1.0.0", - "stream-events": "^1.0.1", - "string-format-obj": "^1.1.0", - "through2": "^2.0.3" + "methmeth": "1.1.0", + "modelo": "4.2.3", + "request": "2.87.0", + "retry-request": "3.3.2", + "split-array-stream": "1.0.3", + "stream-events": "1.0.4", + "string-format-obj": "1.1.1", + "through2": "2.0.3" }, "dependencies": { "google-auto-auth": { @@ -243,10 +243,10 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.7.tgz", "integrity": "sha512-Nro7aIFrL2NP0G7PoGrJqXGMZj8AjdBOcbZXRRm/8T3w08NUHIiNN3dxpuUYzDsZizslH+c8e+7HXL8vh3JXTQ==", "requires": { - "async": "^2.3.0", - "gcp-metadata": "^0.6.1", - "google-auth-library": "^1.3.1", - "request": "^2.79.0" + "async": "2.6.1", + "gcp-metadata": "0.6.3", + "google-auth-library": "1.6.1", + "request": "2.87.0" } } } @@ -265,7 +265,7 @@ "lodash": "4.17.5", "nyc": "11.4.1", "proxyquire": "1.8.0", - "semver": "^5.5.0", + "semver": "5.5.0", "sinon": "4.3.0", "string": "3.3.3", "supertest": "3.0.0", @@ -285,9 +285,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" } }, "is-fullwidth-code-point": { @@ -308,297 +308,268 @@ "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", "dev": true, "requires": { - "archy": "^1.0.0", - "arrify": "^1.0.1", - "caching-transform": "^1.0.0", - "convert-source-map": "^1.3.0", - "debug-log": "^1.0.1", - "default-require-extensions": "^1.0.0", - "find-cache-dir": "^0.1.1", - "find-up": "^2.1.0", - "foreground-child": "^1.5.3", - "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.1.1", - "istanbul-lib-hook": "^1.1.0", - "istanbul-lib-instrument": "^1.9.1", - "istanbul-lib-report": "^1.1.2", - "istanbul-lib-source-maps": "^1.2.2", - "istanbul-reports": "^1.1.3", - "md5-hex": "^1.2.0", - "merge-source-map": "^1.0.2", - "micromatch": "^2.3.11", - "mkdirp": "^0.5.0", - "resolve-from": "^2.0.0", - "rimraf": "^2.5.4", - "signal-exit": "^3.0.1", - "spawn-wrap": "^1.4.2", - "test-exclude": "^4.1.1", - "yargs": "^10.0.3", - "yargs-parser": "^8.0.0" + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", + "md5-hex": "1.3.0", + "merge-source-map": "1.0.4", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.1.1", + "yargs": "10.0.3", + "yargs-parser": "8.0.0" }, "dependencies": { "align-text": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" } }, "amdefine": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "bundled": true, "dev": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "bundled": true, "dev": true }, "ansi-styles": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "bundled": true, "dev": true }, "append-transform": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", - "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", + "bundled": true, "dev": true, "requires": { - "default-require-extensions": "^1.0.0" + "default-require-extensions": "1.0.0" } }, "archy": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", + "bundled": true, "dev": true }, "arr-diff": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "bundled": true, "dev": true, "requires": { - "arr-flatten": "^1.0.1" + "arr-flatten": "1.1.0" } }, "arr-flatten": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "bundled": true, "dev": true }, "array-unique": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "bundled": true, "dev": true }, "arrify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "bundled": true, "dev": true }, "async": { "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "bundled": true, "dev": true }, "babel-code-frame": { "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "bundled": true, "dev": true, "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" } }, "babel-generator": { "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz", - "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=", + "bundled": true, "dev": true, "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.6", - "trim-right": "^1.0.1" + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" } }, "babel-messages": { "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "bundled": true, "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-runtime": { "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "bundled": true, "dev": true, "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" } }, "babel-template": { "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "bundled": true, "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" } }, "babel-traverse": { "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "bundled": true, "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" } }, "babel-types": { "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "bundled": true, "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" } }, "babylon": { "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "bundled": true, "dev": true }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "bundled": true, "dev": true }, "brace-expansion": { "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, "braces": { "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "bundled": true, "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" } }, "builtin-modules": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "bundled": true, "dev": true }, "caching-transform": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", - "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", + "bundled": true, "dev": true, "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" } }, "camelcase": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "bundled": true, "dev": true, "optional": true }, "center-align": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "bundled": true, "dev": true, "optional": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "chalk": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "bundled": true, "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "cliui": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "bundled": true, "dev": true, "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" }, "dependencies": { "wordwrap": { "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "bundled": true, "dev": true, "optional": true } @@ -606,48 +577,41 @@ }, "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "bundled": true, "dev": true }, "commondir": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "bundled": true, "dev": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "bundled": true, "dev": true }, "convert-source-map": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "bundled": true, "dev": true }, "core-js": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", + "bundled": true, "dev": true }, "cross-spawn": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "bundled": true, "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.1", + "which": "1.3.0" } }, "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "bundled": true, "dev": true, "requires": { "ms": "2.0.0" @@ -655,442 +619,387 @@ }, "debug-log": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", - "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", + "bundled": true, "dev": true }, "decamelize": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "bundled": true, "dev": true }, "default-require-extensions": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", - "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", + "bundled": true, "dev": true, "requires": { - "strip-bom": "^2.0.0" + "strip-bom": "2.0.0" } }, "detect-indent": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "bundled": true, "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "error-ex": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "bundled": true, "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "bundled": true, "dev": true }, "esutils": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "bundled": true, "dev": true }, "execa": { "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "bundled": true, "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" }, "dependencies": { "cross-spawn": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "bundled": true, "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" } } } }, "expand-brackets": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "bundled": true, "dev": true, "requires": { - "is-posix-bracket": "^0.1.0" + "is-posix-bracket": "0.1.1" } }, "expand-range": { "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "bundled": true, "dev": true, "requires": { - "fill-range": "^2.1.0" + "fill-range": "2.2.3" } }, "extglob": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "bundled": true, "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "filename-regex": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "bundled": true, "dev": true }, "fill-range": { "version": "2.2.3", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", - "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "bundled": true, "dev": true, "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^1.1.3", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, "find-cache-dir": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", - "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", + "bundled": true, "dev": true, "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" } }, "find-up": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "bundled": true, "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "for-in": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "bundled": true, "dev": true }, "for-own": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "bundled": true, "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } }, "foreground-child": { "version": "1.5.6", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", - "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", + "bundled": true, "dev": true, "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" } }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "bundled": true, "dev": true }, "get-caller-file": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "bundled": true, "dev": true }, "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "bundled": true, "dev": true }, "glob": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "bundled": true, "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-base": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "bundled": true, "dev": true, "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" + "glob-parent": "2.0.0", + "is-glob": "2.0.1" } }, "glob-parent": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "bundled": true, "dev": true, "requires": { - "is-glob": "^2.0.0" + "is-glob": "2.0.1" } }, "globals": { "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "bundled": true, "dev": true }, "graceful-fs": { "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "bundled": true, "dev": true }, "handlebars": { "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "bundled": true, "dev": true, "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" }, "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "bundled": true, "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } }, "has-ansi": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "bundled": true, "dev": true }, "hosted-git-info": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "bundled": true, "dev": true }, "imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "bundled": true, "dev": true }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "bundled": true, "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "bundled": true, "dev": true }, "invariant": { "version": "2.2.2", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", - "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "bundled": true, "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.3.1" } }, "invert-kv": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "bundled": true, "dev": true }, "is-arrayish": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "bundled": true, "dev": true }, "is-buffer": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "bundled": true, "dev": true }, "is-builtin-module": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "bundled": true, "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-dotfile": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "bundled": true, "dev": true }, "is-equal-shallow": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "bundled": true, "dev": true, "requires": { - "is-primitive": "^2.0.0" + "is-primitive": "2.0.0" } }, "is-extendable": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "bundled": true, "dev": true }, "is-extglob": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "bundled": true, "dev": true }, "is-finite": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-glob": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "bundled": true, "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "is-number": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "is-posix-bracket": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "bundled": true, "dev": true }, "is-primitive": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "bundled": true, "dev": true }, "is-stream": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "bundled": true, "dev": true }, "is-utf8": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "bundled": true, "dev": true }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "bundled": true, "dev": true }, "isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "bundled": true, "dev": true }, "isobject": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "bundled": true, "dev": true, "requires": { "isarray": "1.0.0" @@ -1098,74 +1007,67 @@ }, "istanbul-lib-coverage": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", - "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", + "bundled": true, "dev": true }, "istanbul-lib-hook": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", - "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==", + "bundled": true, "dev": true, "requires": { - "append-transform": "^0.4.0" + "append-transform": "0.4.0" } }, "istanbul-lib-instrument": { "version": "1.9.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", - "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", + "bundled": true, "dev": true, "requires": { - "babel-generator": "^6.18.0", - "babel-template": "^6.16.0", - "babel-traverse": "^6.18.0", - "babel-types": "^6.18.0", - "babylon": "^6.18.0", - "istanbul-lib-coverage": "^1.1.1", - "semver": "^5.3.0" + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" } }, "istanbul-lib-report": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz", - "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==", + "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "^1.1.1", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" }, "dependencies": { "supports-color": { "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "bundled": true, "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "1.0.0" } } } }, "istanbul-lib-source-maps": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz", - "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==", + "bundled": true, "dev": true, "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.1.1", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" + "debug": "3.1.0", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" }, "dependencies": { "debug": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "bundled": true, "dev": true, "requires": { "ms": "2.0.0" @@ -1175,191 +1077,169 @@ }, "istanbul-reports": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz", - "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==", + "bundled": true, "dev": true, "requires": { - "handlebars": "^4.0.3" + "handlebars": "4.0.11" } }, "js-tokens": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "bundled": true, "dev": true }, "jsesc": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "bundled": true, "dev": true }, "kind-of": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } }, "lazy-cache": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "bundled": true, "dev": true, "optional": true }, "lcid": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "bundled": true, "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, "locate-path": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "bundled": true, "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" }, "dependencies": { "path-exists": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "bundled": true, "dev": true } } }, "lodash": { "version": "4.17.4", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "bundled": true, "dev": true }, "longest": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "bundled": true, "dev": true }, "loose-envify": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "bundled": true, "dev": true, "requires": { - "js-tokens": "^3.0.0" + "js-tokens": "3.0.2" } }, "lru-cache": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "bundled": true, "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "md5-hex": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", - "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", + "bundled": true, "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "md5-o-matic": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", - "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", + "bundled": true, "dev": true }, "mem": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "bundled": true, "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.1.0" } }, "merge-source-map": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", - "integrity": "sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=", + "bundled": true, "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.7" } }, "micromatch": { "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "bundled": true, "dev": true, "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" } }, "mimic-fn": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", + "bundled": true, "dev": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.8" } }, "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "bundled": true, "dev": true }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "bundled": true, "dev": true, "requires": { "minimist": "0.0.8" @@ -1367,575 +1247,505 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "bundled": true, "dev": true }, "normalize-package-data": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "bundled": true, "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" } }, "normalize-path": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "bundled": true, "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } }, "npm-run-path": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "bundled": true, "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" } }, "number-is-nan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "bundled": true, "dev": true }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "bundled": true, "dev": true }, "object.omit": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "bundled": true, "dev": true, "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" + "for-own": "0.1.5", + "is-extendable": "0.1.1" } }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "optimist": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "bundled": true, "dev": true, "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "bundled": true, "dev": true }, "os-locale": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "bundled": true, "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "p-finally": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "bundled": true, "dev": true }, "p-limit": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", - "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", + "bundled": true, "dev": true }, "p-locate": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "bundled": true, "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.1.0" } }, "parse-glob": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "bundled": true, "dev": true, "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" } }, "parse-json": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "bundled": true, "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.1" } }, "path-exists": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "bundled": true, "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "bundled": true, "dev": true }, "path-key": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "bundled": true, "dev": true }, "path-parse": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "bundled": true, "dev": true }, "path-type": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "bundled": true, "dev": true }, "pinkie": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "bundled": true, "dev": true }, "pinkie-promise": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "bundled": true, "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", - "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", + "bundled": true, "dev": true, "requires": { - "find-up": "^1.0.0" + "find-up": "1.1.2" }, "dependencies": { "find-up": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "bundled": true, "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } } } }, "preserve": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "bundled": true, "dev": true }, "pseudomap": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "bundled": true, "dev": true }, "randomatic": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "bundled": true, "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "is-number": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } }, "kind-of": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } }, "read-pkg": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "bundled": true, "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, "read-pkg-up": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "bundled": true, "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" }, "dependencies": { "find-up": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "bundled": true, "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } } } }, "regenerator-runtime": { "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "bundled": true, "dev": true }, "regex-cache": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "bundled": true, "dev": true, "requires": { - "is-equal-shallow": "^0.1.3" + "is-equal-shallow": "0.1.3" } }, "remove-trailing-separator": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "bundled": true, "dev": true }, "repeat-element": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "bundled": true, "dev": true }, "repeat-string": { "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "bundled": true, "dev": true }, "repeating": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "bundled": true, "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.0.2" } }, "require-directory": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "bundled": true, "dev": true }, "require-main-filename": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "bundled": true, "dev": true }, "resolve-from": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=", + "bundled": true, "dev": true }, "right-align": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "bundled": true, "dev": true, "optional": true, "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "bundled": true, "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "semver": { "version": "5.4.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "bundled": true, "dev": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "bundled": true, "dev": true }, "shebang-command": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "bundled": true, "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "bundled": true, "dev": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "bundled": true, "dev": true }, "slide": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", + "bundled": true, "dev": true }, "source-map": { "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "bundled": true, "dev": true }, "spawn-wrap": { "version": "1.4.2", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", - "integrity": "sha512-vMwR3OmmDhnxCVxM8M+xO/FtIp6Ju/mNaDfCMMW7FDcLRTPFWUswec4LXJHTJE2hwTI9O0YBfygu4DalFl7Ylg==", + "bundled": true, "dev": true, "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" } }, "spdx-correct": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "bundled": true, "dev": true, "requires": { - "spdx-license-ids": "^1.0.2" + "spdx-license-ids": "1.2.2" } }, "spdx-expression-parse": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "bundled": true, "dev": true }, "spdx-license-ids": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "bundled": true, "dev": true }, "string-width": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "ansi-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "bundled": true, "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "bundled": true, "dev": true }, "strip-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "bundled": true, "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-bom": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "bundled": true, "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "bundled": true, "dev": true }, "supports-color": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "bundled": true, "dev": true }, "test-exclude": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz", - "integrity": "sha512-35+Asrsk3XHJDBgf/VRFexPgh3UyETv8IAn/LRTiZjVy6rjPVqdEk8dJcJYBzl1w0XCJM48lvTy8SfEsCWS4nA==", + "bundled": true, "dev": true, "requires": { - "arrify": "^1.0.1", - "micromatch": "^2.3.11", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", - "require-main-filename": "^1.0.1" + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" } }, "to-fast-properties": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "bundled": true, "dev": true }, "trim-right": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "bundled": true, "dev": true }, "uglify-js": { "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "bundled": true, "dev": true, "optional": true, "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "yargs": { "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "bundled": true, "dev": true, "optional": true, "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -1943,141 +1753,126 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "bundled": true, "dev": true, "optional": true }, "validate-npm-package-license": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "bundled": true, "dev": true, "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" } }, "which": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "bundled": true, "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "bundled": true, "dev": true }, "window-size": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "bundled": true, "dev": true, "optional": true }, "wordwrap": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "bundled": true, "dev": true }, "wrap-ansi": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "bundled": true, "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" }, "dependencies": { "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } } } }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "bundled": true, "dev": true }, "write-file-atomic": { "version": "1.3.4", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", - "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } }, "y18n": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "bundled": true, "dev": true }, "yallist": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "bundled": true, "dev": true }, "yargs": { "version": "10.0.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz", - "integrity": "sha512-DqBpQ8NAUX4GyPP/ijDGHsJya4tYqLQrjPr95HNsr1YwL3+daCfvBwg7+gIC6IdJhR2kATh3hb61vjzMWEtjdw==", - "dev": true, - "requires": { - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^8.0.0" + "bundled": true, + "dev": true, + "requires": { + "cliui": "3.2.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "8.0.0" }, "dependencies": { "cliui": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "bundled": true, "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" }, "dependencies": { "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } } } @@ -2086,17 +1881,15 @@ }, "yargs-parser": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.0.0.tgz", - "integrity": "sha1-IdR2Mw5agieaS4gTRb8GYQLiGcY=", + "bundled": true, "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" }, "dependencies": { "camelcase": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "bundled": true, "dev": true } } @@ -2109,9 +1902,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "proxyquire": { @@ -2120,9 +1913,9 @@ "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", "dev": true, "requires": { - "fill-keys": "^1.0.2", - "module-not-found-error": "^1.0.0", - "resolve": "~1.1.7" + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.1.7" } }, "string-width": { @@ -2131,8 +1924,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -2141,7 +1934,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "yargs": { @@ -2150,18 +1943,18 @@ "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" } } } @@ -2172,10 +1965,10 @@ "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", "dev": true, "requires": { - "chalk": "^0.4.0", - "date-time": "^0.1.1", - "pretty-ms": "^0.2.1", - "text-table": "^0.2.0" + "chalk": "0.4.0", + "date-time": "0.1.1", + "pretty-ms": "0.2.2", + "text-table": "0.2.0" }, "dependencies": { "ansi-styles": { @@ -2190,9 +1983,9 @@ "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { - "ansi-styles": "~1.0.0", - "has-color": "~0.1.0", - "strip-ansi": "~0.1.0" + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" } }, "pretty-ms": { @@ -2201,7 +1994,7 @@ "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", "dev": true, "requires": { - "parse-ms": "^0.1.0" + "parse-ms": "0.1.2" } }, "strip-ansi": { @@ -2217,8 +2010,8 @@ "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" + "call-me-maybe": "1.0.1", + "glob-to-regexp": "0.3.0" } }, "@nodelib/fs.stat": { @@ -2251,8 +2044,8 @@ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", "requires": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" + "@protobufjs/aspromise": "1.1.2", + "@protobufjs/inquire": "1.1.0" } }, "@protobufjs/float": { @@ -2301,14 +2094,14 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "8.10.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.19.tgz", - "integrity": "sha512-+PU57o6DtOSx0/algmxgCwWrmCiomwC/K+LPfXonT0tQMbNTjHEqVzwL9dFEhFoPmLFIiSWjRorLH6Z0hJMT+Q==" + "version": "8.10.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz", + "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==" }, "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=" + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", + "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==" }, "acorn-es7-plugin": { "version": "1.1.7", @@ -2321,7 +2114,7 @@ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { - "acorn": "^3.0.4" + "acorn": "3.3.0" }, "dependencies": { "acorn": { @@ -2337,10 +2130,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "ajv-keywords": { @@ -2355,9 +2148,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" }, "dependencies": { "kind-of": { @@ -2366,7 +2159,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -2383,7 +2176,7 @@ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, "requires": { - "string-width": "^2.0.0" + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -2404,8 +2197,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -2414,7 +2207,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -2436,7 +2229,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.2" } }, "anymatch": { @@ -2445,8 +2238,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" + "micromatch": "2.3.11", + "normalize-path": "2.1.1" }, "dependencies": { "arr-diff": { @@ -2455,7 +2248,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "^1.0.1" + "arr-flatten": "1.1.0" } }, "array-unique": { @@ -2470,9 +2263,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" } }, "expand-brackets": { @@ -2481,7 +2274,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "^0.1.0" + "is-posix-bracket": "0.1.1" } }, "extglob": { @@ -2490,7 +2283,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "is-extglob": { @@ -2505,7 +2298,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "kind-of": { @@ -2514,7 +2307,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } }, "micromatch": { @@ -2523,19 +2316,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" } } } @@ -2546,7 +2339,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "~1.0.2" + "sprintf-js": "1.0.3" } }, "argv": { @@ -2604,7 +2397,7 @@ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "requires": { - "array-uniq": "^1.0.1" + "array-uniq": "1.0.3" } }, "array-uniq": { @@ -2627,8 +2420,8 @@ "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", "requires": { - "colour": "~0.7.1", - "optjs": "~3.2.2" + "colour": "0.7.1", + "optjs": "3.2.2" } }, "asn1": { @@ -2651,7 +2444,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { - "lodash": "^4.17.10" + "lodash": "4.17.10" } }, "async-each": { @@ -2670,9 +2463,9 @@ "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=" }, "auto-bind": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz", - "integrity": "sha512-Zw7pZp7tztvKnWWtoII4AmqH5a2PV3ZN5F0BPRTGcc1kpRm4b6QXQnPU7Znbl6BfPfqOVOV29g4JeMqZQaqqOA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.1.tgz", + "integrity": "sha512-/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA==", "dev": true }, "ava": { @@ -2681,89 +2474,89 @@ "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", "dev": true, "requires": { - "@ava/babel-preset-stage-4": "^1.1.0", - "@ava/babel-preset-transform-test-files": "^3.0.0", - "@ava/write-file-atomic": "^2.2.0", - "@concordance/react": "^1.0.0", - "@ladjs/time-require": "^0.1.4", - "ansi-escapes": "^3.0.0", - "ansi-styles": "^3.1.0", - "arr-flatten": "^1.0.1", - "array-union": "^1.0.1", - "array-uniq": "^1.0.2", - "arrify": "^1.0.0", - "auto-bind": "^1.1.0", - "ava-init": "^0.2.0", - "babel-core": "^6.17.0", - "babel-generator": "^6.26.0", - "babel-plugin-syntax-object-rest-spread": "^6.13.0", - "bluebird": "^3.0.0", - "caching-transform": "^1.0.0", - "chalk": "^2.0.1", - "chokidar": "^1.4.2", - "clean-stack": "^1.1.1", - "clean-yaml-object": "^0.1.0", - "cli-cursor": "^2.1.0", - "cli-spinners": "^1.0.0", - "cli-truncate": "^1.0.0", - "co-with-promise": "^4.6.0", - "code-excerpt": "^2.1.1", - "common-path-prefix": "^1.0.0", - "concordance": "^3.0.0", - "convert-source-map": "^1.5.1", - "core-assert": "^0.2.0", - "currently-unhandled": "^0.4.1", - "debug": "^3.0.1", - "dot-prop": "^4.1.0", - "empower-core": "^0.6.1", - "equal-length": "^1.0.0", - "figures": "^2.0.0", - "find-cache-dir": "^1.0.0", - "fn-name": "^2.0.0", - "get-port": "^3.0.0", - "globby": "^6.0.0", - "has-flag": "^2.0.0", - "hullabaloo-config-manager": "^1.1.0", - "ignore-by-default": "^1.0.0", - "import-local": "^0.1.1", - "indent-string": "^3.0.0", - "is-ci": "^1.0.7", - "is-generator-fn": "^1.0.0", - "is-obj": "^1.0.0", - "is-observable": "^1.0.0", - "is-promise": "^2.1.0", - "last-line-stream": "^1.0.0", - "lodash.clonedeepwith": "^4.5.0", - "lodash.debounce": "^4.0.3", - "lodash.difference": "^4.3.0", - "lodash.flatten": "^4.2.0", - "loud-rejection": "^1.2.0", - "make-dir": "^1.0.0", - "matcher": "^1.0.0", - "md5-hex": "^2.0.0", - "meow": "^3.7.0", - "ms": "^2.0.0", - "multimatch": "^2.1.0", - "observable-to-promise": "^0.5.0", - "option-chain": "^1.0.0", - "package-hash": "^2.0.0", - "pkg-conf": "^2.0.0", - "plur": "^2.0.0", - "pretty-ms": "^3.0.0", - "require-precompiled": "^0.1.0", - "resolve-cwd": "^2.0.0", - "safe-buffer": "^5.1.1", - "semver": "^5.4.1", - "slash": "^1.0.0", - "source-map-support": "^0.5.0", - "stack-utils": "^1.0.1", - "strip-ansi": "^4.0.0", - "strip-bom-buf": "^1.0.0", - "supertap": "^1.0.0", - "supports-color": "^5.0.0", - "trim-off-newlines": "^1.0.1", - "unique-temp-dir": "^1.0.0", - "update-notifier": "^2.3.0" + "@ava/babel-preset-stage-4": "1.1.0", + "@ava/babel-preset-transform-test-files": "3.0.0", + "@ava/write-file-atomic": "2.2.0", + "@concordance/react": "1.0.0", + "@ladjs/time-require": "0.1.4", + "ansi-escapes": "3.1.0", + "ansi-styles": "3.2.1", + "arr-flatten": "1.1.0", + "array-union": "1.0.2", + "array-uniq": "1.0.3", + "arrify": "1.0.1", + "auto-bind": "1.2.1", + "ava-init": "0.2.1", + "babel-core": "6.26.3", + "babel-generator": "6.26.1", + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "bluebird": "3.5.1", + "caching-transform": "1.0.1", + "chalk": "2.4.1", + "chokidar": "1.7.0", + "clean-stack": "1.3.0", + "clean-yaml-object": "0.1.0", + "cli-cursor": "2.1.0", + "cli-spinners": "1.3.1", + "cli-truncate": "1.1.0", + "co-with-promise": "4.6.0", + "code-excerpt": "2.1.1", + "common-path-prefix": "1.0.0", + "concordance": "3.0.0", + "convert-source-map": "1.5.1", + "core-assert": "0.2.1", + "currently-unhandled": "0.4.1", + "debug": "3.1.0", + "dot-prop": "4.2.0", + "empower-core": "0.6.2", + "equal-length": "1.0.1", + "figures": "2.0.0", + "find-cache-dir": "1.0.0", + "fn-name": "2.0.1", + "get-port": "3.2.0", + "globby": "6.1.0", + "has-flag": "2.0.0", + "hullabaloo-config-manager": "1.1.1", + "ignore-by-default": "1.0.1", + "import-local": "0.1.1", + "indent-string": "3.2.0", + "is-ci": "1.1.0", + "is-generator-fn": "1.0.0", + "is-obj": "1.0.1", + "is-observable": "1.1.0", + "is-promise": "2.1.0", + "last-line-stream": "1.0.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.debounce": "4.0.8", + "lodash.difference": "4.5.0", + "lodash.flatten": "4.4.0", + "loud-rejection": "1.6.0", + "make-dir": "1.3.0", + "matcher": "1.1.1", + "md5-hex": "2.0.0", + "meow": "3.7.0", + "ms": "2.0.0", + "multimatch": "2.1.0", + "observable-to-promise": "0.5.0", + "option-chain": "1.0.0", + "package-hash": "2.0.0", + "pkg-conf": "2.1.0", + "plur": "2.1.2", + "pretty-ms": "3.2.0", + "require-precompiled": "0.1.0", + "resolve-cwd": "2.0.0", + "safe-buffer": "5.1.2", + "semver": "5.5.0", + "slash": "1.0.0", + "source-map-support": "0.5.6", + "stack-utils": "1.0.1", + "strip-ansi": "4.0.0", + "strip-bom-buf": "1.0.0", + "supertap": "1.0.0", + "supports-color": "5.4.0", + "trim-off-newlines": "1.0.1", + "unique-temp-dir": "1.0.0", + "update-notifier": "2.5.0" }, "dependencies": { "ansi-regex": { @@ -2772,17 +2565,27 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "empower-core": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", + "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", + "dev": true, + "requires": { + "call-signature": "0.0.2", + "core-js": "2.5.7" + } + }, "globby": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -2803,7 +2606,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "strip-ansi": { @@ -2812,7 +2615,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -2823,11 +2626,11 @@ "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", "dev": true, "requires": { - "arr-exclude": "^1.0.0", - "execa": "^0.7.0", - "has-yarn": "^1.0.0", - "read-pkg-up": "^2.0.0", - "write-pkg": "^3.1.0" + "arr-exclude": "1.0.0", + "execa": "0.7.0", + "has-yarn": "1.0.0", + "read-pkg-up": "2.0.0", + "write-pkg": "3.2.0" } }, "aws-sign2": { @@ -2845,8 +2648,8 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { - "follow-redirects": "^1.3.0", - "is-buffer": "^1.1.5" + "follow-redirects": "1.5.0", + "is-buffer": "1.1.6" } }, "babel-code-frame": { @@ -2855,9 +2658,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" }, "dependencies": { "ansi-styles": { @@ -2872,11 +2675,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "supports-color": { @@ -2893,25 +2696,25 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.1", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.10", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" }, "dependencies": { "debug": { @@ -2931,14 +2734,14 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.10", + "source-map": "0.5.7", + "trim-right": "1.0.1" }, "dependencies": { "jsesc": { @@ -2955,9 +2758,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-call-delegate": { @@ -2966,10 +2769,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-explode-assignable-expression": { @@ -2978,9 +2781,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-function-name": { @@ -2989,11 +2792,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-get-function-arity": { @@ -3002,8 +2805,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-hoist-variables": { @@ -3012,8 +2815,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-regex": { @@ -3022,9 +2825,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.10" } }, "babel-helper-remap-async-to-generator": { @@ -3033,11 +2836,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helpers": { @@ -3046,8 +2849,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-messages": { @@ -3056,7 +2859,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-check-es2015-constants": { @@ -3065,7 +2868,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-espower": { @@ -3074,13 +2877,13 @@ "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", "dev": true, "requires": { - "babel-generator": "^6.1.0", - "babylon": "^6.1.0", - "call-matcher": "^1.0.0", - "core-js": "^2.0.0", - "espower-location-detector": "^1.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.1.1" + "babel-generator": "6.26.1", + "babylon": "6.18.0", + "call-matcher": "1.0.1", + "core-js": "2.5.7", + "espower-location-detector": "1.0.0", + "espurify": "1.8.0", + "estraverse": "4.2.0" } }, "babel-plugin-syntax-async-functions": { @@ -3113,9 +2916,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-destructuring": { @@ -3124,7 +2927,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -3133,9 +2936,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -3144,10 +2947,10 @@ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -3156,12 +2959,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-spread": { @@ -3170,7 +2973,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -3179,9 +2982,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -3190,9 +2993,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -3201,9 +3004,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-strict-mode": { @@ -3212,8 +3015,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-register": { @@ -3222,13 +3025,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" + "babel-core": "6.26.3", + "babel-runtime": "6.26.0", + "core-js": "2.5.7", + "home-or-tmp": "2.0.0", + "lodash": "4.17.10", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" }, "dependencies": { "source-map-support": { @@ -3237,7 +3040,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.7" } } } @@ -3248,8 +3051,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" + "core-js": "2.5.7", + "regenerator-runtime": "0.11.1" } }, "babel-template": { @@ -3258,11 +3061,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.10" } }, "babel-traverse": { @@ -3271,15 +3074,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.10" }, "dependencies": { "debug": { @@ -3299,10 +3102,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.10", + "to-fast-properties": "1.0.3" } }, "babylon": { @@ -3321,13 +3124,13 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { @@ -3335,7 +3138,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -3343,7 +3146,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -3351,7 +3154,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -3359,9 +3162,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -3372,7 +3175,7 @@ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "optional": true, "requires": { - "tweetnacl": "^0.14.3" + "tweetnacl": "0.14.5" } }, "binary-extensions": { @@ -3393,13 +3196,13 @@ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", "dev": true, "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.4.1", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "2.0.0" }, "dependencies": { "ansi-regex": { @@ -3426,8 +3229,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -3436,7 +3239,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -3446,7 +3249,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -3455,16 +3258,16 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -3472,7 +3275,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -3510,7 +3313,7 @@ "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", "requires": { - "long": "~3" + "long": "3.2.0" }, "dependencies": { "long": { @@ -3525,15 +3328,15 @@ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" } }, "cacheable-request": { @@ -3565,9 +3368,9 @@ "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", "dev": true, "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" }, "dependencies": { "md5-hex": { @@ -3576,7 +3379,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "write-file-atomic": { @@ -3585,9 +3388,9 @@ "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } } } @@ -3598,10 +3401,10 @@ "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", "dev": true, "requires": { - "core-js": "^2.0.0", - "deep-equal": "^1.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.0.0" + "core-js": "2.5.7", + "deep-equal": "1.0.1", + "espurify": "1.8.0", + "estraverse": "4.2.0" } }, "call-me-maybe": { @@ -3620,7 +3423,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "^0.2.0" + "callsites": "0.2.0" } }, "callsites": { @@ -3640,8 +3443,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" + "camelcase": "2.1.1", + "map-obj": "1.0.1" } }, "capture-stack-trace": { @@ -3660,7 +3463,7 @@ "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", "dev": true, "requires": { - "underscore-contrib": "~0.3.0" + "underscore-contrib": "0.3.0" } }, "center-align": { @@ -3670,8 +3473,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "chalk": { @@ -3680,9 +3483,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "chardet": { @@ -3697,15 +3500,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" + "anymatch": "1.3.2", + "async-each": "1.0.1", + "fsevents": "1.2.4", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" }, "dependencies": { "glob-parent": { @@ -3714,7 +3517,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "^2.0.0" + "is-glob": "2.0.1" } }, "is-extglob": { @@ -3729,7 +3532,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } } } @@ -3751,10 +3554,10 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "define-property": { @@ -3762,7 +3565,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -3791,7 +3594,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "2.0.0" } }, "cli-spinners": { @@ -3806,8 +3609,8 @@ "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", "dev": true, "requires": { - "slice-ansi": "^1.0.0", - "string-width": "^2.0.0" + "slice-ansi": "1.0.0", + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -3828,8 +3631,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -3838,7 +3641,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -3854,9 +3657,9 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "clone-response": { @@ -3865,7 +3668,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "^1.0.0" + "mimic-response": "1.0.0" } }, "co": { @@ -3879,7 +3682,7 @@ "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", "dev": true, "requires": { - "pinkie-promise": "^1.0.0" + "pinkie-promise": "1.0.0" } }, "code-excerpt": { @@ -3888,7 +3691,7 @@ "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", "dev": true, "requires": { - "convert-to-spaces": "^1.0.1" + "convert-to-spaces": "1.0.2" } }, "code-point-at": { @@ -3903,7 +3706,7 @@ "dev": true, "requires": { "argv": "0.0.2", - "request": "^2.81.0", + "request": "2.87.0", "urlgrey": "0.4.4" } }, @@ -3912,23 +3715,23 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "color-convert": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", - "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz", + "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==", "dev": true, "requires": { - "color-name": "^1.1.1" + "color-name": "1.1.1" } }, "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=", "dev": true }, "colors": { @@ -3947,7 +3750,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "~1.0.0" + "delayed-stream": "1.0.0" } }, "commander": { @@ -3983,10 +3786,10 @@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" + "buffer-from": "1.1.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" } }, "concordance": { @@ -3995,17 +3798,17 @@ "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", "dev": true, "requires": { - "date-time": "^2.1.0", - "esutils": "^2.0.2", - "fast-diff": "^1.1.1", - "function-name-support": "^0.2.0", - "js-string-escape": "^1.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.flattendeep": "^4.4.0", - "lodash.merge": "^4.6.0", - "md5-hex": "^2.0.0", - "semver": "^5.3.0", - "well-known-symbols": "^1.0.0" + "date-time": "2.1.0", + "esutils": "2.0.2", + "fast-diff": "1.1.2", + "function-name-support": "0.2.0", + "js-string-escape": "1.0.1", + "lodash.clonedeep": "4.5.0", + "lodash.flattendeep": "4.4.0", + "lodash.merge": "4.6.1", + "md5-hex": "2.0.0", + "semver": "5.5.0", + "well-known-symbols": "1.0.0" }, "dependencies": { "date-time": { @@ -4014,7 +3817,7 @@ "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", "dev": true, "requires": { - "time-zone": "^1.0.0" + "time-zone": "1.0.0" } } } @@ -4025,12 +3828,12 @@ "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" + "dot-prop": "4.2.0", + "graceful-fs": "4.1.11", + "make-dir": "1.3.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.3.0", + "xdg-basedir": "3.0.0" } }, "convert-source-map": { @@ -4062,8 +3865,8 @@ "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", "dev": true, "requires": { - "buf-compare": "^1.0.0", - "is-error": "^2.2.0" + "buf-compare": "1.0.1", + "is-error": "2.2.1" } }, "core-js": { @@ -4081,7 +3884,7 @@ "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "requires": { - "capture-stack-trace": "^1.0.0" + "capture-stack-trace": "1.0.0" } }, "cross-spawn": { @@ -4090,9 +3893,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "shebang-command": "1.2.0", + "which": "1.3.1" } }, "crypto-random-string": { @@ -4107,7 +3910,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "^1.0.1" + "array-find-index": "1.0.2" } }, "d": { @@ -4116,7 +3919,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "^0.10.9" + "es5-ext": "0.10.45" } }, "dashdash": { @@ -4124,7 +3927,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "date-time": { @@ -4157,7 +3960,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "^1.0.0" + "mimic-response": "1.0.0" } }, "deep-equal": { @@ -4183,8 +3986,8 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "requires": { - "foreach": "^2.0.5", - "object-keys": "^1.0.8" + "foreach": "2.0.5", + "object-keys": "1.0.12" } }, "define-property": { @@ -4192,8 +3995,8 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4201,7 +4004,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -4209,7 +4012,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -4217,9 +4020,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -4230,13 +4033,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" }, "dependencies": { "globby": { @@ -4245,12 +4048,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -4271,7 +4074,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } } } @@ -4281,7 +4084,7 @@ "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", "requires": { - "p-defer": "^1.0.0" + "p-defer": "1.0.0" } }, "delayed-stream": { @@ -4295,7 +4098,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "diff": { @@ -4314,8 +4117,8 @@ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" + "arrify": "1.0.1", + "path-type": "3.0.0" } }, "doctrine": { @@ -4324,7 +4127,7 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "^2.0.2" + "esutils": "2.0.2" } }, "dom-serializer": { @@ -4333,8 +4136,8 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { - "domelementtype": "~1.1.1", - "entities": "~1.1.1" + "domelementtype": "1.1.3", + "entities": "1.1.1" }, "dependencies": { "domelementtype": { @@ -4357,7 +4160,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1" + "domelementtype": "1.3.0" } }, "domutils": { @@ -4366,8 +4169,8 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" } }, "dot-prop": { @@ -4376,7 +4179,7 @@ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { - "is-obj": "^1.0.0" + "is-obj": "1.0.1" } }, "duplexer3": { @@ -4390,16 +4193,16 @@ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" } }, "eastasianwidth": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.1.1.tgz", - "integrity": "sha1-RNZW3p2kFWlEZzNTZfsxR7hXK3w=" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "ecc-jsbn": { "version": "0.1.1", @@ -4407,7 +4210,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "~0.1.0" + "jsbn": "0.1.1" } }, "ecdsa-sig-formatter": { @@ -4415,16 +4218,16 @@ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz", "integrity": "sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=", "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "empower": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/empower/-/empower-1.2.3.tgz", - "integrity": "sha1-bw2nNEf07dg4/sXGAxOoi6XLhSs=", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/empower/-/empower-1.3.0.tgz", + "integrity": "sha512-tP2WqM7QzrPguCCQEQfFFDF+6Pw6YWLQal3+GHQaV+0uIr0S+jyREQPWljE02zFCYPFYLZ3LosiRV+OzTrxPpQ==", "requires": { - "core-js": "^2.0.0", - "empower-core": "^0.6.2" + "core-js": "2.5.7", + "empower-core": "1.2.0" } }, "empower-assert": { @@ -4433,16 +4236,16 @@ "integrity": "sha512-Ylck0Q6p8y/LpNzYeBccaxAPm2ZyuqBgErgZpO9KT0HuQWF0sJckBKCLmgS1/DEXEiyBi9XtYh3clZm5cAdARw==", "dev": true, "requires": { - "estraverse": "^4.2.0" + "estraverse": "4.2.0" } }, "empower-core": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", - "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-1.2.0.tgz", + "integrity": "sha512-g6+K6Geyc1o6FdXs9HwrXleCFan7d66G5xSCfSF7x1mJDCes6t0om9lFQG3zOrzh3Bkb/45N0cZ5Gqsf7YrzGQ==", "requires": { "call-signature": "0.0.2", - "core-js": "^2.0.0" + "core-js": "2.5.7" } }, "end-of-stream": { @@ -4450,7 +4253,7 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { - "once": "^1.4.0" + "once": "1.4.0" } }, "ent": { @@ -4471,12 +4274,12 @@ "dev": true }, "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "es5-ext": { @@ -4485,9 +4288,9 @@ "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", "dev": true, "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "1" + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" } }, "es6-error": { @@ -4502,9 +4305,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-symbol": "3.1.1" } }, "es6-map": { @@ -4513,12 +4316,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-set": "~0.1.5", - "es6-symbol": "~3.1.1", - "event-emitter": "~0.3.5" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" } }, "es6-set": { @@ -4527,11 +4330,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", - "event-emitter": "~0.3.5" + "event-emitter": "0.3.5" } }, "es6-symbol": { @@ -4540,8 +4343,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.45" } }, "es6-weak-map": { @@ -4550,10 +4353,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" } }, "escallmatch": { @@ -4562,8 +4365,8 @@ "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", "dev": true, "requires": { - "call-matcher": "^1.0.0", - "esprima": "^2.0.0" + "call-matcher": "1.0.1", + "esprima": "2.7.3" }, "dependencies": { "esprima": { @@ -4586,11 +4389,11 @@ "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==", "dev": true, "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.6.1" }, "dependencies": { "esprima": { @@ -4614,10 +4417,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "^0.1.3", - "es6-weak-map": "^2.0.1", - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" } }, "eslint": { @@ -4626,44 +4429,44 @@ "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", "dev": true, "requires": { - "ajv": "^5.3.0", - "babel-code-frame": "^6.22.0", - "chalk": "^2.1.0", - "concat-stream": "^1.6.0", - "cross-spawn": "^5.1.0", - "debug": "^3.1.0", - "doctrine": "^2.1.0", - "eslint-scope": "^3.7.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^3.5.4", - "esquery": "^1.0.0", - "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.0.1", - "ignore": "^3.3.3", - "imurmurhash": "^0.1.4", - "inquirer": "^3.0.6", - "is-resolvable": "^1.0.0", - "js-yaml": "^3.9.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.4", - "minimatch": "^3.0.2", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", - "progress": "^2.0.0", - "regexpp": "^1.0.1", - "require-uncached": "^1.0.3", - "semver": "^5.3.0", - "strip-ansi": "^4.0.0", - "strip-json-comments": "~2.0.1", + "ajv": "5.5.2", + "babel-code-frame": "6.26.0", + "chalk": "2.4.1", + "concat-stream": "1.6.2", + "cross-spawn": "5.1.0", + "debug": "3.1.0", + "doctrine": "2.1.0", + "eslint-scope": "3.7.1", + "eslint-visitor-keys": "1.0.0", + "espree": "3.5.4", + "esquery": "1.0.1", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "functional-red-black-tree": "1.0.1", + "glob": "7.1.2", + "globals": "11.7.0", + "ignore": "3.3.10", + "imurmurhash": "0.1.4", + "inquirer": "3.3.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.12.0", + "json-stable-stringify-without-jsonify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.10", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "7.0.0", + "progress": "2.0.0", + "regexpp": "1.1.0", + "require-uncached": "1.0.3", + "semver": "5.5.0", + "strip-ansi": "4.0.0", + "strip-json-comments": "2.0.1", "table": "4.0.2", - "text-table": "~0.2.0" + "text-table": "0.2.0" }, "dependencies": { "ansi-regex": { @@ -4673,9 +4476,9 @@ "dev": true }, "globals": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", - "integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", + "version": "11.7.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", + "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", "dev": true }, "strip-ansi": { @@ -4684,7 +4487,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -4695,7 +4498,7 @@ "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", "dev": true, "requires": { - "get-stdin": "^5.0.1" + "get-stdin": "5.0.1" }, "dependencies": { "get-stdin": { @@ -4712,31 +4515,31 @@ "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", "dev": true, "requires": { - "ignore": "^3.3.6", - "minimatch": "^3.0.4", - "resolve": "^1.3.3", - "semver": "^5.4.1" + "ignore": "3.3.10", + "minimatch": "3.0.4", + "resolve": "1.8.1", + "semver": "5.5.0" }, "dependencies": { "resolve": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", - "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", + "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "1.0.5" } } } }, "eslint-plugin-prettier": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz", - "integrity": "sha512-floiaI4F7hRkTrFe8V2ItOK97QYrX75DjmdzmVITZoAP6Cn06oEDPQRsO6MlHEP/u2SxI3xQ52Kpjw6j5WGfeQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.1.tgz", + "integrity": "sha512-wNZ2z0oVCWnf+3BSI7roS+z4gGu2AwcPKUek+SlLZMZg+X0KbZLsB2knul7fd0K3iuIp402HIYzm4f2+OyfXxA==", "dev": true, "requires": { - "fast-diff": "^1.1.1", - "jest-docblock": "^21.0.0" + "fast-diff": "1.1.2", + "jest-docblock": "21.2.0" } }, "eslint-scope": { @@ -4745,8 +4548,8 @@ "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", "dev": true, "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "esrecurse": "4.2.1", + "estraverse": "4.2.0" } }, "eslint-visitor-keys": { @@ -4761,16 +4564,16 @@ "integrity": "sha512-F4TY1qYJB1aUyzB03NsZksZzUQmQoEBaTUjRJGR30GxbkbjKI41NhCyYjrF+bGgWN7x/ZsczYppRpz/0WdI0ug==", "dev": true, "requires": { - "array-find": "^1.0.0", - "escallmatch": "^1.5.0", - "escodegen": "^1.7.0", - "escope": "^3.3.0", - "espower-location-detector": "^1.0.0", - "espurify": "^1.3.0", - "estraverse": "^4.1.0", - "source-map": "^0.5.0", - "type-name": "^2.0.0", - "xtend": "^4.0.0" + "array-find": "1.0.0", + "escallmatch": "1.5.0", + "escodegen": "1.10.0", + "escope": "3.6.0", + "espower-location-detector": "1.0.0", + "espurify": "1.8.0", + "estraverse": "4.2.0", + "source-map": "0.5.7", + "type-name": "2.0.2", + "xtend": "4.0.1" } }, "espower-loader": { @@ -4779,11 +4582,11 @@ "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", "dev": true, "requires": { - "convert-source-map": "^1.1.0", - "espower-source": "^2.0.0", - "minimatch": "^3.0.0", - "source-map-support": "^0.4.0", - "xtend": "^4.0.0" + "convert-source-map": "1.5.1", + "espower-source": "2.3.0", + "minimatch": "3.0.4", + "source-map-support": "0.4.18", + "xtend": "4.0.1" }, "dependencies": { "source-map-support": { @@ -4792,7 +4595,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.7" } } } @@ -4803,37 +4606,29 @@ "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", "dev": true, "requires": { - "is-url": "^1.2.1", - "path-is-absolute": "^1.0.0", - "source-map": "^0.5.0", - "xtend": "^4.0.0" + "is-url": "1.2.4", + "path-is-absolute": "1.0.1", + "source-map": "0.5.7", + "xtend": "4.0.1" } }, "espower-source": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/espower-source/-/espower-source-2.2.0.tgz", - "integrity": "sha1-fgBSVa5HtcE2RIZEs/PYAtUD91I=", - "dev": true, - "requires": { - "acorn": "^5.0.0", - "acorn-es7-plugin": "^1.0.10", - "convert-source-map": "^1.1.1", - "empower-assert": "^1.0.0", - "escodegen": "^1.6.1", - "espower": "^2.0.0", - "estraverse": "^4.0.0", - "merge-estraverse-visitors": "^1.0.0", - "multi-stage-sourcemap": "^0.2.1", - "path-is-absolute": "^1.0.0", - "xtend": "^4.0.0" - }, - "dependencies": { - "acorn": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz", - "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==", - "dev": true - } + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/espower-source/-/espower-source-2.3.0.tgz", + "integrity": "sha512-Wc4kC4zUAEV7Qt31JRPoBUc5jjowHRylml2L2VaDQ1XEbnqQofGWx+gPR03TZAPokAMl5dqyL36h3ITyMXy3iA==", + "dev": true, + "requires": { + "acorn": "5.7.1", + "acorn-es7-plugin": "1.1.7", + "convert-source-map": "1.5.1", + "empower-assert": "1.1.0", + "escodegen": "1.10.0", + "espower": "2.1.1", + "estraverse": "4.2.0", + "merge-estraverse-visitors": "1.0.0", + "multi-stage-sourcemap": "0.2.1", + "path-is-absolute": "1.0.1", + "xtend": "4.0.1" } }, "espree": { @@ -4842,16 +4637,8 @@ "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", "dev": true, "requires": { - "acorn": "^5.5.0", - "acorn-jsx": "^3.0.0" - }, - "dependencies": { - "acorn": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz", - "integrity": "sha512-zUzo1E5dI2Ey8+82egfnttyMlMZ2y0D8xOCO3PNPPlYXpl8NZvF6Qk9L9BEtJs+43FqEmfBViDqc5d1ckRDguw==", - "dev": true - } + "acorn": "5.7.1", + "acorn-jsx": "3.0.1" } }, "esprima": { @@ -4865,7 +4652,7 @@ "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.0.tgz", "integrity": "sha512-jdkJG9jswjKCCDmEridNUuIQei9algr+o66ZZ19610ZoBsiWLRsQGNYS4HGez3Z/DsR0lhANGAqiwBUclPuNag==", "requires": { - "core-js": "^2.0.0" + "core-js": "2.5.7" } }, "esquery": { @@ -4874,7 +4661,7 @@ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { - "estraverse": "^4.0.0" + "estraverse": "4.2.0" } }, "esrecurse": { @@ -4883,7 +4670,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "^4.1.0" + "estraverse": "4.2.0" } }, "estraverse": { @@ -4903,8 +4690,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.45" } }, "execa": { @@ -4913,13 +4700,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" } }, "expand-brackets": { @@ -4927,13 +4714,13 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "debug": { @@ -4949,7 +4736,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -4957,7 +4744,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -4968,7 +4755,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "^2.1.0" + "fill-range": "2.2.4" }, "dependencies": { "fill-range": { @@ -4977,11 +4764,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "3.0.0", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, "is-number": { @@ -4990,7 +4777,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "isobject": { @@ -5008,7 +4795,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -5023,8 +4810,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -5032,7 +4819,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -5043,9 +4830,9 @@ "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { - "chardet": "^0.4.0", - "iconv-lite": "^0.4.17", - "tmp": "^0.0.33" + "chardet": "0.4.2", + "iconv-lite": "0.4.23", + "tmp": "0.0.33" } }, "extglob": { @@ -5053,14 +4840,14 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -5068,7 +4855,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { @@ -5076,7 +4863,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -5084,7 +4871,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -5092,7 +4879,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -5100,9 +4887,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -5128,12 +4915,12 @@ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz", "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==", "requires": { - "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.0.1", - "glob-parent": "^3.1.0", - "is-glob": "^4.0.0", - "merge2": "^1.2.1", - "micromatch": "^3.1.10" + "@mrmlnc/readdir-enhanced": "2.2.1", + "@nodelib/fs.stat": "1.1.0", + "glob-parent": "3.1.0", + "is-glob": "4.0.0", + "merge2": "1.2.2", + "micromatch": "3.1.10" } }, "fast-json-stable-stringify": { @@ -5153,7 +4940,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5" + "escape-string-regexp": "1.0.5" } }, "file-entry-cache": { @@ -5162,8 +4949,8 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" + "flat-cache": "1.3.0", + "object-assign": "4.1.1" } }, "filename-regex": { @@ -5178,8 +4965,8 @@ "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", "dev": true, "requires": { - "is-object": "~1.0.1", - "merge-descriptors": "~1.0.0" + "is-object": "1.0.1", + "merge-descriptors": "1.0.1" } }, "fill-range": { @@ -5187,10 +4974,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -5198,7 +4985,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -5209,9 +4996,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "2.0.0" } }, "find-up": { @@ -5220,7 +5007,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "flat-cache": { @@ -5229,10 +5016,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "^0.3.1", - "del": "^2.0.2", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" } }, "fn-name": { @@ -5246,7 +5033,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "requires": { - "debug": "^3.1.0" + "debug": "3.1.0" } }, "for-in": { @@ -5260,7 +5047,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } }, "foreach": { @@ -5278,9 +5065,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "^0.4.0", + "asynckit": "0.4.0", "combined-stream": "1.0.6", - "mime-types": "^2.1.12" + "mime-types": "2.1.18" } }, "formidable": { @@ -5294,7 +5081,7 @@ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "from2": { @@ -5303,8 +5090,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "fs-extra": { @@ -5313,9 +5100,9 @@ "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.2" } }, "fs.realpath": { @@ -5330,8 +5117,8 @@ "dev": true, "optional": true, "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" + "nan": "2.10.0", + "node-pre-gyp": "0.10.0" }, "dependencies": { "abbrev": { @@ -5357,8 +5144,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "balanced-match": { @@ -5371,7 +5158,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -5435,7 +5222,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.2.4" } }, "fs.realpath": { @@ -5450,14 +5237,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" } }, "glob": { @@ -5466,12 +5253,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-unicode": { @@ -5486,7 +5273,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "^2.1.0" + "safer-buffer": "2.1.2" } }, "ignore-walk": { @@ -5495,7 +5282,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "inflight": { @@ -5504,8 +5291,8 @@ "dev": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -5524,7 +5311,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "isarray": { @@ -5538,7 +5325,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -5551,8 +5338,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "^5.1.1", - "yallist": "^3.0.0" + "safe-buffer": "5.1.1", + "yallist": "3.0.2" } }, "minizlib": { @@ -5561,7 +5348,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.2.4" } }, "mkdirp": { @@ -5584,9 +5371,9 @@ "dev": true, "optional": true, "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "debug": "2.6.9", + "iconv-lite": "0.4.21", + "sax": "1.2.4" } }, "node-pre-gyp": { @@ -5595,16 +5382,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.0", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.7", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.1" } }, "nopt": { @@ -5613,8 +5400,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npm-bundled": { @@ -5629,8 +5416,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" } }, "npmlog": { @@ -5639,10 +5426,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "number-is-nan": { @@ -5661,7 +5448,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "os-homedir": { @@ -5682,8 +5469,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "path-is-absolute": { @@ -5704,10 +5491,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "^0.5.1", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.5.1", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -5724,13 +5511,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { @@ -5739,7 +5526,7 @@ "dev": true, "optional": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "safe-buffer": { @@ -5782,9 +5569,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -5793,7 +5580,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.1" } }, "strip-ansi": { @@ -5801,7 +5588,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-json-comments": { @@ -5816,13 +5603,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", - "yallist": "^3.0.2" + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" } }, "util-deprecate": { @@ -5837,7 +5624,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "^1.0.2" + "string-width": "1.0.2" } }, "wrappy": { @@ -5869,8 +5656,8 @@ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", "requires": { - "axios": "^0.18.0", - "extend": "^3.0.1", + "axios": "0.18.0", + "extend": "3.0.1", "retry-axios": "0.3.2" } }, @@ -5908,7 +5695,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "glob": { @@ -5916,12 +5703,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-base": { @@ -5930,8 +5717,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" + "glob-parent": "2.0.0", + "is-glob": "2.0.1" }, "dependencies": { "glob-parent": { @@ -5940,7 +5727,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "^2.0.0" + "is-glob": "2.0.1" } }, "is-extglob": { @@ -5955,7 +5742,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } } } @@ -5965,8 +5752,8 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" }, "dependencies": { "is-glob": { @@ -5974,7 +5761,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -5990,7 +5777,7 @@ "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", "dev": true, "requires": { - "ini": "^1.3.4" + "ini": "1.3.5" } }, "globals": { @@ -6004,13 +5791,13 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "fast-glob": "^2.0.2", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "fast-glob": "2.2.2", + "glob": "7.1.2", + "ignore": "3.3.10", + "pify": "3.0.0", + "slash": "1.0.0" } }, "google-auth-library": { @@ -6018,13 +5805,13 @@ "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.6.1.tgz", "integrity": "sha512-jYiWC8NA9n9OtQM7ANn0Tk464do9yhKEtaJ72pKcaBiEwn4LwcGYIYOfwtfsSm3aur/ed3tlSxbmg24IAT6gAg==", "requires": { - "axios": "^0.18.0", - "gcp-metadata": "^0.6.3", - "gtoken": "^2.3.0", - "jws": "^3.1.5", - "lodash.isstring": "^4.0.1", - "lru-cache": "^4.1.3", - "retry-axios": "^0.3.2" + "axios": "0.18.0", + "gcp-metadata": "0.6.3", + "gtoken": "2.3.0", + "jws": "3.1.5", + "lodash.isstring": "4.0.1", + "lru-cache": "4.1.3", + "retry-axios": "0.3.2" } }, "google-auto-auth": { @@ -6032,10 +5819,10 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", "requires": { - "async": "^2.3.0", - "gcp-metadata": "^0.6.1", - "google-auth-library": "^1.3.1", - "request": "^2.79.0" + "async": "2.6.1", + "gcp-metadata": "0.6.3", + "google-auth-library": "1.6.1", + "request": "2.87.0" } }, "google-gax": { @@ -6043,16 +5830,16 @@ "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.1.tgz", "integrity": "sha512-eP7UUkKvaHmmvCrr+rxzkIOeEKOnXmoib7/AkENDAuqlC9T2+lWlzwpthDRnitQcV8SblDMzsk73YPMPCDwPyQ==", "requires": { - "duplexify": "^3.5.4", - "extend": "^3.0.0", - "globby": "^8.0.0", - "google-auto-auth": "^0.10.0", - "google-proto-files": "^0.15.0", - "grpc": "^1.10.0", - "is-stream-ended": "^0.1.0", - "lodash": "^4.17.2", - "protobufjs": "^6.8.0", - "through2": "^2.0.3" + "duplexify": "3.6.0", + "extend": "3.0.1", + "globby": "8.0.1", + "google-auto-auth": "0.10.1", + "google-proto-files": "0.15.1", + "grpc": "1.12.4", + "is-stream-ended": "0.1.4", + "lodash": "4.17.10", + "protobufjs": "6.8.6", + "through2": "2.0.3" }, "dependencies": { "google-proto-files": { @@ -6060,9 +5847,9 @@ "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", "requires": { - "globby": "^7.1.1", - "power-assert": "^1.4.4", - "protobufjs": "^6.8.0" + "globby": "7.1.1", + "power-assert": "1.6.0", + "protobufjs": "6.8.6" }, "dependencies": { "globby": { @@ -6070,12 +5857,12 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "glob": "7.1.2", + "ignore": "3.3.10", + "pify": "3.0.0", + "slash": "1.0.0" } } } @@ -6087,18 +5874,18 @@ "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", "requires": { - "node-forge": "^0.7.4", - "pify": "^3.0.0" + "node-forge": "0.7.5", + "pify": "3.0.0" } }, "google-proto-files": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.16.0.tgz", - "integrity": "sha512-ZVW1m38l6dJGTqOXuEQnr5VfWxkOsdkDetWGUchq8zXbo3PSVlZU7VQM/YS1pbc/6+mZy3R+xirctVaoLzIhXw==", + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.16.1.tgz", + "integrity": "sha512-ykdhaYDiU/jlyrkzZDPemraKwVIgLT31XMHVNSJW//R9VED56hqSDRMx1Jlxbf0O4iDZnBWQ0JQLHbM2r5+wuA==", "requires": { - "globby": "^8.0.0", - "power-assert": "^1.4.4", - "protobufjs": "^6.8.0" + "globby": "8.0.1", + "power-assert": "1.6.0", + "protobufjs": "6.8.6" } }, "got": { @@ -6107,23 +5894,23 @@ "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", "dev": true, "requires": { - "@sindresorhus/is": "^0.7.0", - "cacheable-request": "^2.1.1", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "into-stream": "^3.1.0", - "is-retry-allowed": "^1.1.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "mimic-response": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^2.0.1", - "pify": "^3.0.0", - "safe-buffer": "^5.1.1", - "timed-out": "^4.0.1", - "url-parse-lax": "^3.0.0", - "url-to-options": "^1.0.1" + "@sindresorhus/is": "0.7.0", + "cacheable-request": "2.1.4", + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "into-stream": "3.1.0", + "is-retry-allowed": "1.1.0", + "isurl": "1.0.0", + "lowercase-keys": "1.0.1", + "mimic-response": "1.0.0", + "p-cancelable": "0.3.0", + "p-timeout": "2.0.1", + "pify": "3.0.0", + "safe-buffer": "5.1.2", + "timed-out": "4.0.1", + "url-parse-lax": "3.0.0", + "url-to-options": "1.0.1" }, "dependencies": { "prepend-http": { @@ -6138,7 +5925,7 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "^2.0.0" + "prepend-http": "2.0.0" } } } @@ -6156,495 +5943,429 @@ "dev": true }, "grpc": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.12.3.tgz", - "integrity": "sha512-QPwbAXRXd8IyXAhTdUVgjEqSdvXoTq5uFWSo+eGMTcra12PBJUkAceD+1AUVOx1GqBY74/7T7eB7BB+UOcOY8w==", - "requires": { - "lodash": "^4.17.5", - "nan": "^2.0.0", - "node-pre-gyp": "^0.10.0", - "protobufjs": "^5.0.3" + "version": "1.12.4", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.12.4.tgz", + "integrity": "sha512-t0Hy4yoHHYLkK0b+ULTHw5ZuSFmWokCABY0C4bKQbE4jnm1hpjA23cQVD0xAqDcRHN5CkvFzlqb34ngV22dqoQ==", + "requires": { + "lodash": "4.17.10", + "nan": "2.10.0", + "node-pre-gyp": "0.10.0", + "protobufjs": "5.0.3" }, "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + "bundled": true }, "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "bundled": true }, "aproba": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + "bundled": true }, "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "version": "1.1.5", + "bundled": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "bundled": true }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "bundled": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, "chownr": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" + "bundled": true }, "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "bundled": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "bundled": true }, "core-util-is": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "bundled": true }, "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "bundled": true, "requires": { "ms": "2.0.0" } }, "deep-extend": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==" + "version": "0.6.0", + "bundled": true }, "delegates": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + "bundled": true }, "detect-libc": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + "bundled": true }, "fs-minipass": { "version": "1.2.5", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", - "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "bundled": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.3" } }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "bundled": true }, "gauge": { "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "bundled": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "glob": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "bundled": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + "bundled": true }, "iconv-lite": { "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "bundled": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ignore-walk": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "bundled": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "bundled": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "bundled": true }, "ini": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "bundled": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "bundled": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "bundled": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "bundled": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "bundled": true }, "minipass": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz", - "integrity": "sha512-jWC2Eg+Np4bxah7llu1IrUNSJQxtLz/J+pOjTM0nFpJXGAaV18XBWhUn031Q1tAA/TJtA1jgwnOe9S2PQa4Lbg==", + "version": "2.3.3", + "bundled": true, "requires": { - "safe-buffer": "^5.1.1", - "yallist": "^3.0.0" + "safe-buffer": "5.1.2", + "yallist": "3.0.2" } }, "minizlib": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz", - "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==", + "bundled": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.3" } }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "bundled": true, "requires": { "minimist": "0.0.8" }, "dependencies": { "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "bundled": true } } }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "bundled": true }, "needle": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz", - "integrity": "sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==", + "bundled": true, "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "debug": "2.6.9", + "iconv-lite": "0.4.23", + "sax": "1.2.4" } }, "node-pre-gyp": { "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz", - "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==", + "bundled": true, "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.1", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.8", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.4" } }, "nopt": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "bundled": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npm-bundled": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", - "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==" + "bundled": true }, "npm-packlist": { "version": "1.1.10", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", - "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", + "bundled": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" } }, "npmlog": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "bundled": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "number-is-nan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "bundled": true }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "bundled": true }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "bundled": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + "bundled": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + "bundled": true }, "osenv": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "bundled": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "bundled": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + "bundled": true }, "protobufjs": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz", "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==", "requires": { - "ascli": "~1", - "bytebuffer": "~5", - "glob": "^7.0.5", - "yargs": "^3.10.0" + "ascli": "1.0.1", + "bytebuffer": "5.0.1", + "glob": "7.1.2", + "yargs": "3.32.0" } }, "rc": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", - "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", + "version": "1.2.8", + "bundled": true, "requires": { - "deep-extend": "^0.5.1", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" } }, "readable-stream": { "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "bundled": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "bundled": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "bundled": true }, "safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "bundled": true }, "sax": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + "bundled": true }, "semver": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" + "bundled": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "bundled": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "bundled": true }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "bundled": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "bundled": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "bundled": true }, "tar": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz", - "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==", + "version": "4.4.4", + "bundled": true, "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.3", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.2" } }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "bundled": true }, "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "version": "1.1.3", + "bundled": true, "requires": { - "string-width": "^1.0.2" + "string-width": "1.0.2" } }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "bundled": true }, "yallist": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" + "bundled": true } } }, @@ -6653,11 +6374,11 @@ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", "requires": { - "axios": "^0.18.0", - "google-p12-pem": "^1.0.0", - "jws": "^3.1.4", - "mime": "^2.2.0", - "pify": "^3.0.0" + "axios": "0.18.0", + "google-p12-pem": "1.0.2", + "jws": "3.1.5", + "mime": "2.3.1", + "pify": "3.0.0" } }, "handlebars": { @@ -6666,10 +6387,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" }, "dependencies": { "async": { @@ -6684,7 +6405,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -6699,8 +6420,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" + "ajv": "5.5.2", + "har-schema": "2.0.0" } }, "has-ansi": { @@ -6709,7 +6430,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-color": { @@ -6736,7 +6457,7 @@ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "dev": true, "requires": { - "has-symbol-support-x": "^1.4.1" + "has-symbol-support-x": "1.4.2" } }, "has-value": { @@ -6744,9 +6465,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" } }, "has-values": { @@ -6754,8 +6475,8 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "kind-of": { @@ -6763,7 +6484,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6786,8 +6507,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "hosted-git-info": { @@ -6802,12 +6523,12 @@ "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "dev": true, "requires": { - "domelementtype": "^1.3.0", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^2.0.2" + "domelementtype": "1.3.0", + "domhandler": "2.4.2", + "domutils": "1.7.0", + "entities": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "http-cache-semantics": { @@ -6821,9 +6542,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.2" } }, "hullabaloo-config-manager": { @@ -6832,20 +6553,20 @@ "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", "dev": true, "requires": { - "dot-prop": "^4.1.0", - "es6-error": "^4.0.2", - "graceful-fs": "^4.1.11", - "indent-string": "^3.1.0", - "json5": "^0.5.1", - "lodash.clonedeep": "^4.5.0", - "lodash.clonedeepwith": "^4.5.0", - "lodash.isequal": "^4.5.0", - "lodash.merge": "^4.6.0", - "md5-hex": "^2.0.0", - "package-hash": "^2.0.0", - "pkg-dir": "^2.0.0", - "resolve-from": "^3.0.0", - "safe-buffer": "^5.0.1" + "dot-prop": "4.2.0", + "es6-error": "4.1.1", + "graceful-fs": "4.1.11", + "indent-string": "3.2.0", + "json5": "0.5.1", + "lodash.clonedeep": "4.5.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.isequal": "4.5.0", + "lodash.merge": "4.6.1", + "md5-hex": "2.0.0", + "package-hash": "2.0.0", + "pkg-dir": "2.0.0", + "resolve-from": "3.0.0", + "safe-buffer": "5.1.2" } }, "iconv-lite": { @@ -6854,13 +6575,13 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ignore": { - "version": "3.3.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz", - "integrity": "sha512-pUh+xUQQhQzevjRHHFqqcTy0/dP/kS9I8HSrUydhihjuD09W6ldVWFtIrwhXdUJHis3i2rZNqEHpZH/cbinFbg==" + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", + "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" }, "ignore-by-default": { "version": "1.0.1", @@ -6880,8 +6601,8 @@ "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", "dev": true, "requires": { - "pkg-dir": "^2.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" } }, "imurmurhash": { @@ -6906,8 +6627,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -6927,8 +6648,8 @@ "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", "dev": true, "requires": { - "moment": "^2.14.1", - "sanitize-html": "^1.13.0" + "moment": "2.22.2", + "sanitize-html": "1.18.2" } }, "inquirer": { @@ -6937,20 +6658,20 @@ "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^2.0.4", - "figures": "^2.0.0", - "lodash": "^4.3.0", + "ansi-escapes": "3.1.0", + "chalk": "2.4.1", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.2.0", + "figures": "2.0.0", + "lodash": "4.17.10", "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rx-lite": "^4.0.8", - "rx-lite-aggregates": "^4.0.8", - "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", - "through": "^2.3.6" + "run-async": "2.3.0", + "rx-lite": "4.0.8", + "rx-lite-aggregates": "4.0.8", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" }, "dependencies": { "ansi-regex": { @@ -6971,8 +6692,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -6981,7 +6702,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -6992,7 +6713,7 @@ "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", "dev": true, "requires": { - "espower-loader": "^1.0.0" + "espower-loader": "1.2.2" } }, "into-stream": { @@ -7001,8 +6722,8 @@ "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", "dev": true, "requires": { - "from2": "^2.1.1", - "p-is-promise": "^1.1.0" + "from2": "2.3.0", + "p-is-promise": "1.1.0" } }, "invariant": { @@ -7011,7 +6732,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.3.1" } }, "invert-kv": { @@ -7035,7 +6756,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -7043,7 +6764,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7060,7 +6781,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.11.0" } }, "is-buffer": { @@ -7074,7 +6795,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-ci": { @@ -7083,7 +6804,7 @@ "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", "dev": true, "requires": { - "ci-info": "^1.0.0" + "ci-info": "1.1.3" } }, "is-data-descriptor": { @@ -7091,7 +6812,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -7099,7 +6820,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7109,9 +6830,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -7133,7 +6854,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "^2.0.0" + "is-primitive": "2.0.0" } }, "is-error": { @@ -7158,7 +6879,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-fullwidth-code-point": { @@ -7166,7 +6887,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-generator-fn": { @@ -7180,7 +6901,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "^2.1.1" + "is-extglob": "2.1.1" } }, "is-installed-globally": { @@ -7189,8 +6910,8 @@ "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", "dev": true, "requires": { - "global-dirs": "^0.1.0", - "is-path-inside": "^1.0.0" + "global-dirs": "0.1.1", + "is-path-inside": "1.0.1" } }, "is-npm": { @@ -7204,7 +6925,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -7212,7 +6933,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7235,7 +6956,7 @@ "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", "dev": true, "requires": { - "symbol-observable": "^1.1.0" + "symbol-observable": "1.2.0" } }, "is-odd": { @@ -7243,7 +6964,7 @@ "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", "requires": { - "is-number": "^4.0.0" + "is-number": "4.0.0" }, "dependencies": { "is-number": { @@ -7265,7 +6986,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "is-path-inside": "^1.0.0" + "is-path-inside": "1.0.1" } }, "is-path-inside": { @@ -7274,7 +6995,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "^1.0.1" + "path-is-inside": "1.0.2" } }, "is-plain-obj": { @@ -7288,7 +7009,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "is-posix-bracket": { @@ -7398,8 +7119,8 @@ "@babel/template": "7.0.0-beta.49", "@babel/traverse": "7.0.0-beta.49", "@babel/types": "7.0.0-beta.49", - "istanbul-lib-coverage": "^2.0.0", - "semver": "^5.5.0" + "istanbul-lib-coverage": "2.0.0", + "semver": "5.5.0" } }, "isurl": { @@ -7408,8 +7129,8 @@ "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "dev": true, "requires": { - "has-to-string-tag-x": "^1.2.0", - "is-object": "^1.0.1" + "has-to-string-tag-x": "1.4.1", + "is-object": "1.0.1" } }, "jest-docblock": { @@ -7436,8 +7157,8 @@ "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "1.0.10", + "esprima": "4.0.0" } }, "js2xmlparser": { @@ -7446,7 +7167,7 @@ "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", "dev": true, "requires": { - "xmlcreate": "^1.0.1" + "xmlcreate": "1.0.2" } }, "jsbn": { @@ -7462,17 +7183,17 @@ "dev": true, "requires": { "babylon": "7.0.0-beta.19", - "bluebird": "~3.5.0", - "catharsis": "~0.8.9", - "escape-string-regexp": "~1.0.5", - "js2xmlparser": "~3.0.0", - "klaw": "~2.0.0", - "marked": "~0.3.6", - "mkdirp": "~0.5.1", - "requizzle": "~0.2.1", - "strip-json-comments": "~2.0.1", + "bluebird": "3.5.1", + "catharsis": "0.8.9", + "escape-string-regexp": "1.0.5", + "js2xmlparser": "3.0.0", + "klaw": "2.0.0", + "marked": "0.3.19", + "mkdirp": "0.5.1", + "requizzle": "0.2.1", + "strip-json-comments": "2.0.1", "taffydb": "2.6.2", - "underscore": "~1.8.3" + "underscore": "1.8.3" }, "dependencies": { "babylon": { @@ -7534,7 +7255,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.1.11" } }, "jsprim": { @@ -7561,7 +7282,7 @@ "requires": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.10", - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "jws": { @@ -7569,8 +7290,8 @@ "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz", "integrity": "sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==", "requires": { - "jwa": "^1.1.5", - "safe-buffer": "^5.0.1" + "jwa": "1.1.6", + "safe-buffer": "5.1.2" } }, "keyv": { @@ -7593,7 +7314,7 @@ "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", "dev": true, "requires": { - "graceful-fs": "^4.1.9" + "graceful-fs": "4.1.11" } }, "last-line-stream": { @@ -7602,7 +7323,7 @@ "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", "dev": true, "requires": { - "through2": "^2.0.0" + "through2": "2.0.3" } }, "latest-version": { @@ -7611,7 +7332,7 @@ "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "dev": true, "requires": { - "package-json": "^4.0.0" + "package-json": "4.0.1" } }, "lazy-cache": { @@ -7626,7 +7347,7 @@ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "levn": { @@ -7635,8 +7356,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "1.1.2", + "type-check": "0.3.2" } }, "load-json-file": { @@ -7645,10 +7366,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" }, "dependencies": { "pify": { @@ -7665,8 +7386,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" } }, "lodash": { @@ -7788,7 +7509,7 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "^3.0.0" + "js-tokens": "3.0.2" } }, "loud-rejection": { @@ -7797,8 +7518,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } }, "lowercase-keys": { @@ -7812,8 +7533,8 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "make-dir": { @@ -7822,7 +7543,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } }, "map-cache": { @@ -7841,7 +7562,7 @@ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, "marked": { @@ -7856,7 +7577,7 @@ "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", "dev": true, "requires": { - "escape-string-regexp": "^1.0.4" + "escape-string-regexp": "1.0.5" } }, "math-random": { @@ -7871,7 +7592,7 @@ "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "md5-o-matic": { @@ -7886,7 +7607,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "meow": { @@ -7895,16 +7616,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" }, "dependencies": { "find-up": { @@ -7913,8 +7634,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "load-json-file": { @@ -7923,11 +7644,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, "minimist": { @@ -7942,7 +7663,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "path-type": { @@ -7951,9 +7672,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -7974,7 +7695,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "read-pkg": { @@ -7983,9 +7704,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, "read-pkg-up": { @@ -7994,8 +7715,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" } }, "strip-bom": { @@ -8004,7 +7725,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } } } @@ -8021,7 +7742,7 @@ "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", "dev": true, "requires": { - "estraverse": "^4.0.0" + "estraverse": "4.2.0" } }, "merge2": { @@ -8045,19 +7766,19 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "mime": { @@ -8075,7 +7796,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "~1.33.0" + "mime-db": "1.33.0" } }, "mimic-fn": { @@ -8095,7 +7816,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -8109,8 +7830,8 @@ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -8118,7 +7839,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -8179,7 +7900,7 @@ "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "source-map": "^0.1.34" + "source-map": "0.1.43" }, "dependencies": { "source-map": { @@ -8188,7 +7909,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -8199,10 +7920,10 @@ "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", "dev": true, "requires": { - "array-differ": "^1.0.0", - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "minimatch": "^3.0.0" + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" } }, "mute-stream": { @@ -8221,18 +7942,18 @@ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-odd": "^2.0.0", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "natural-compare": { @@ -8248,16 +7969,16 @@ "dev": true }, "nise": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.1.tgz", - "integrity": "sha512-9JX3YwoIt3kS237scmSSOpEv7vCukVzLfwK0I0XhocDSHUANid8ZHnLEULbbSkfeMn98B2y5kphIWzZUylESRQ==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.2.tgz", + "integrity": "sha512-BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw==", "dev": true, "requires": { - "@sinonjs/formatio": "^2.0.0", - "just-extend": "^1.1.27", - "lolex": "^2.3.2", - "path-to-regexp": "^1.7.0", - "text-encoding": "^0.6.4" + "@sinonjs/formatio": "2.0.0", + "just-extend": "1.1.27", + "lolex": "2.7.0", + "path-to-regexp": "1.7.0", + "text-encoding": "0.6.4" } }, "node-forge": { @@ -8271,10 +7992,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, "normalize-path": { @@ -8283,7 +8004,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } }, "normalize-url": { @@ -8292,9 +8013,9 @@ "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", "dev": true, "requires": { - "prepend-http": "^2.0.0", - "query-string": "^5.0.1", - "sort-keys": "^2.0.0" + "prepend-http": "2.0.0", + "query-string": "5.1.1", + "sort-keys": "2.0.0" }, "dependencies": { "prepend-http": { @@ -8311,7 +8032,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" } }, "number-is-nan": { @@ -8325,318 +8046,286 @@ "integrity": "sha1-ikpO1pCWbBHsWH/4fuoMEsl0upk=", "dev": true, "requires": { - "archy": "^1.0.0", - "arrify": "^1.0.1", - "caching-transform": "^1.0.0", - "convert-source-map": "^1.5.1", - "debug-log": "^1.0.1", - "default-require-extensions": "^1.0.0", - "find-cache-dir": "^0.1.1", - "find-up": "^2.1.0", - "foreground-child": "^1.5.3", - "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.2.0", - "istanbul-lib-hook": "^1.1.0", - "istanbul-lib-instrument": "^2.1.0", - "istanbul-lib-report": "^1.1.3", - "istanbul-lib-source-maps": "^1.2.5", - "istanbul-reports": "^1.4.1", - "md5-hex": "^1.2.0", - "merge-source-map": "^1.1.0", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.0", - "resolve-from": "^2.0.0", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.1", - "spawn-wrap": "^1.4.2", - "test-exclude": "^4.2.0", + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.2.0", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "2.2.0", + "istanbul-lib-report": "1.1.3", + "istanbul-lib-source-maps": "1.2.5", + "istanbul-reports": "1.4.1", + "md5-hex": "1.3.0", + "merge-source-map": "1.1.0", + "micromatch": "3.1.10", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.2.1", "yargs": "11.1.0", - "yargs-parser": "^8.0.0" + "yargs-parser": "8.1.0" }, "dependencies": { "align-text": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" } }, "amdefine": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "bundled": true, "dev": true }, "ansi-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "bundled": true, "dev": true }, "append-transform": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", - "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", + "bundled": true, "dev": true, "requires": { - "default-require-extensions": "^1.0.0" + "default-require-extensions": "1.0.0" } }, "archy": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", + "bundled": true, "dev": true }, "arr-diff": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "bundled": true, "dev": true }, "arr-flatten": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", + "bundled": true, "dev": true }, "arr-union": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "bundled": true, "dev": true }, "array-unique": { "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "bundled": true, "dev": true }, "arrify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "bundled": true, "dev": true }, "assign-symbols": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "bundled": true, "dev": true }, "async": { "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "bundled": true, "dev": true }, "atob": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", - "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", + "bundled": true, "dev": true }, "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "bundled": true, "dev": true }, "base": { "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", + "bundled": true, "dev": true, "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", + "bundled": true, "dev": true } } }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, "braces": { "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "bundled": true, + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } }, "builtin-modules": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "bundled": true, "dev": true }, "cache-base": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", + "bundled": true, "dev": true, "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" } }, "caching-transform": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", - "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", + "bundled": true, "dev": true, "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" } }, "camelcase": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "bundled": true, "dev": true, "optional": true }, "center-align": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "bundled": true, "dev": true, "optional": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "class-utils": { "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", + "bundled": true, "dev": true, "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "define-property": { "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } }, "cliui": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "bundled": true, "dev": true, "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" }, "dependencies": { "wordwrap": { "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "bundled": true, "dev": true, "optional": true } @@ -8644,64 +8333,55 @@ }, "code-point-at": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "bundled": true, "dev": true }, "collection-visit": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "bundled": true, "dev": true, "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "commondir": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "bundled": true, "dev": true }, "component-emitter": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "bundled": true, "dev": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "bundled": true, "dev": true }, "convert-source-map": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "bundled": true, "dev": true }, "copy-descriptor": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "bundled": true, "dev": true }, "cross-spawn": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "bundled": true, "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "which": "1.3.1" } }, "debug": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "bundled": true, "dev": true, "requires": { "ms": "2.0.0" @@ -8709,134 +8389,120 @@ }, "debug-log": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", - "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=", + "bundled": true, "dev": true }, "decamelize": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "bundled": true, "dev": true }, "decode-uri-component": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "bundled": true, "dev": true }, "default-require-extensions": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", - "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", + "bundled": true, "dev": true, "requires": { - "strip-bom": "^2.0.0" + "strip-bom": "2.0.0" } }, "define-property": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", + "bundled": true, "dev": true } } }, "error-ex": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "bundled": true, "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "execa": { "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "bundled": true, "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" }, "dependencies": { "cross-spawn": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "bundled": true, "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "shebang-command": "1.2.0", + "which": "1.3.1" } } } }, "expand-brackets": { "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "bundled": true, "dev": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "bundled": true, "dev": true, "requires": { "ms": "2.0.0" @@ -8844,727 +8510,644 @@ }, "define-property": { "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } }, "extend-shallow": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "bundled": true, "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", + "bundled": true, "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } }, "extglob": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=", - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "bundled": true, + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", + "bundled": true, "dev": true } } }, "fill-range": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "bundled": true, "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } }, "find-cache-dir": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", - "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", + "bundled": true, "dev": true, "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" } }, "find-up": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "bundled": true, "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "for-in": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "bundled": true, "dev": true }, "foreground-child": { "version": "1.5.6", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", - "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", + "bundled": true, "dev": true, "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" } }, "fragment-cache": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "bundled": true, "dev": true, "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "bundled": true, "dev": true }, "get-caller-file": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "bundled": true, "dev": true }, "get-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "bundled": true, "dev": true }, "get-value": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "bundled": true, "dev": true }, "glob": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", + "bundled": true, "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "graceful-fs": { "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "bundled": true, "dev": true }, "handlebars": { "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "bundled": true, "dev": true, "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" }, "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "bundled": true, "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } }, "has-value": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "bundled": true, "dev": true, "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" } }, "has-values": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "bundled": true, "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "kind-of": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } }, "hosted-git-info": { "version": "2.6.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", - "integrity": "sha1-IyNbKasjDFdqqw1PE/wEawsDgiI=", + "bundled": true, "dev": true }, "imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "bundled": true, "dev": true }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "bundled": true, "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "bundled": true, "dev": true }, "invert-kv": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "bundled": true, "dev": true }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "is-arrayish": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "bundled": true, "dev": true }, "is-buffer": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", + "bundled": true, "dev": true }, "is-builtin-module": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "bundled": true, "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "is-descriptor": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=", + "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=", + "bundled": true, "dev": true } } }, "is-extendable": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "bundled": true, "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "bundled": true, "dev": true }, "is-number": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "is-odd": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", - "integrity": "sha1-dkZiRnH9fqVYzNmieVGC8pWPGyQ=", + "bundled": true, "dev": true, "requires": { - "is-number": "^4.0.0" + "is-number": "4.0.0" }, "dependencies": { "is-number": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=", + "bundled": true, "dev": true } } }, "is-plain-object": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", + "bundled": true, "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "is-stream": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "bundled": true, "dev": true }, "is-utf8": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "bundled": true, "dev": true }, "is-windows": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=", + "bundled": true, "dev": true }, "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "bundled": true, "dev": true }, "isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "bundled": true, "dev": true }, "isobject": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "bundled": true, "dev": true }, "istanbul-lib-coverage": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz", - "integrity": "sha1-99jy5CuX43/nlhFMsPnWi146Q0E=", + "bundled": true, "dev": true }, "istanbul-lib-hook": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", - "integrity": "sha1-hTjZcDcss3FtU+VVI91UtVeo2Js=", + "bundled": true, "dev": true, "requires": { - "append-transform": "^0.4.0" + "append-transform": "0.4.0" } }, "istanbul-lib-report": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz", - "integrity": "sha1-LfEhiMD6d5kMDSF20tC6M5QYglk=", + "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "^1.1.2", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" }, "dependencies": { "has-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "bundled": true, "dev": true }, "supports-color": { "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "bundled": true, "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "1.0.0" } } } }, "istanbul-lib-source-maps": { "version": "1.2.5", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz", - "integrity": "sha1-/+a+Tnq4bTYD5CkNVJkLFFBvybE=", + "bundled": true, "dev": true, "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.2.0", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" + "debug": "3.1.0", + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" } }, "istanbul-reports": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.4.1.tgz", - "integrity": "sha1-Ty6OkoqnoF0dpsQn1AmLJlXsczQ=", + "bundled": true, "dev": true, "requires": { - "handlebars": "^4.0.3" + "handlebars": "4.0.11" } }, "kind-of": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } }, "lazy-cache": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "bundled": true, "dev": true, "optional": true }, "lcid": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "bundled": true, "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "load-json-file": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, "locate-path": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "bundled": true, "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" }, "dependencies": { "path-exists": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "bundled": true, "dev": true } } }, "longest": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "bundled": true, "dev": true }, "lru-cache": { "version": "4.1.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", - "integrity": "sha1-oRdc80lt/IQ2wVbDNLSVWZK85pw=", + "bundled": true, "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "map-cache": { "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "bundled": true, "dev": true }, "map-visit": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "bundled": true, "dev": true, "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, "md5-hex": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", - "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", + "bundled": true, "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "md5-o-matic": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", - "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", + "bundled": true, "dev": true }, "mem": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "bundled": true, "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "merge-source-map": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha1-L93n5gIJOfcJBqaPLXrmheTIxkY=", + "bundled": true, "dev": true, "requires": { - "source-map": "^0.6.1" + "source-map": "0.6.1" }, "dependencies": { "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "bundled": true, "dev": true } } }, "micromatch": { "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", + "bundled": true, "dev": true } } }, "mimic-fn": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=", + "bundled": true, "dev": true }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "bundled": true, "dev": true }, "mixin-deep": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=", + "bundled": true, "dev": true, "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", + "bundled": true, "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "bundled": true, "dev": true, "requires": { "minimist": "0.0.8" @@ -9572,479 +9155,422 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "bundled": true, "dev": true }, "nanomatch": { "version": "1.2.9", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", - "integrity": "sha1-h59xUMstq3pHElkGbBBO7m4Pp8I=", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-odd": "^2.0.0", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", + "bundled": true, "dev": true } } }, "normalize-package-data": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", + "bundled": true, "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, "npm-run-path": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "bundled": true, "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" } }, "number-is-nan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "bundled": true, "dev": true }, "object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "bundled": true, "dev": true }, "object-copy": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "bundled": true, "dev": true, "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } }, "object-visit": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "bundled": true, "dev": true, "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" } }, "object.pick": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "bundled": true, "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "optimist": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "bundled": true, "dev": true, "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "bundled": true, "dev": true }, "os-locale": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=", + "bundled": true, "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "p-finally": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "bundled": true, "dev": true }, "p-limit": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", - "integrity": "sha1-DpK2vty1nwIsE9DxlJ3ILRWQnxw=", + "bundled": true, "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "1.0.0" } }, "p-locate": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "bundled": true, "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.2.0" } }, "p-try": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "bundled": true, "dev": true }, "parse-json": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "bundled": true, "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.1" } }, "pascalcase": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "bundled": true, "dev": true }, "path-exists": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "bundled": true, "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "bundled": true, "dev": true }, "path-key": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "bundled": true, "dev": true }, "path-parse": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "bundled": true, "dev": true }, "path-type": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "bundled": true, "dev": true }, "pinkie": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "bundled": true, "dev": true }, "pinkie-promise": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "bundled": true, "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", - "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", + "bundled": true, "dev": true, "requires": { - "find-up": "^1.0.0" + "find-up": "1.1.2" }, "dependencies": { "find-up": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "bundled": true, "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } } } }, "posix-character-classes": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", + "bundled": true, "dev": true }, "pseudomap": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "bundled": true, "dev": true }, "read-pkg": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "bundled": true, "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, "read-pkg-up": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "bundled": true, "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" }, "dependencies": { "find-up": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "bundled": true, "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } } } }, "regex-not": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=", + "bundled": true, "dev": true, "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "repeat-element": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "bundled": true, "dev": true }, "repeat-string": { "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "bundled": true, "dev": true }, "require-directory": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "bundled": true, "dev": true }, "require-main-filename": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "bundled": true, "dev": true }, "resolve-from": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=", + "bundled": true, "dev": true }, "resolve-url": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", + "bundled": true, "dev": true }, "ret": { "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=", + "bundled": true, "dev": true }, "right-align": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "bundled": true, "dev": true, "optional": true, "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", + "bundled": true, "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "safe-regex": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "bundled": true, "dev": true, "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "semver": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", + "bundled": true, "dev": true }, "set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "bundled": true, "dev": true }, "set-value": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=", + "bundled": true, "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } }, "shebang-command": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "bundled": true, "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "bundled": true, "dev": true }, "signal-exit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "bundled": true, "dev": true }, "slide": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", + "bundled": true, "dev": true }, "snapdragon": { "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=", - "dev": true, - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "bundled": true, + "dev": true, + "requires": { + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.0" }, "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "bundled": true, "dev": true, "requires": { "ms": "2.0.0" @@ -10052,291 +9578,261 @@ }, "define-property": { "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } }, "snapdragon-node": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", + "bundled": true, "dev": true, "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", + "bundled": true, "dev": true } } }, "snapdragon-util": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" } }, "source-map": { "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "bundled": true, "dev": true }, "source-map-resolve": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=", + "bundled": true, "dev": true, "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.1", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-url": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", + "bundled": true, "dev": true }, "spawn-wrap": { "version": "1.4.2", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.2.tgz", - "integrity": "sha1-z/WOc6giRhe2Vhq9wyWG6gyCJIw=", + "bundled": true, "dev": true, "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.1" } }, "spdx-correct": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", - "integrity": "sha1-BaW01xU6GVvJLDxCW2nzsqlSTII=", + "bundled": true, "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, "spdx-exceptions": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha1-LHrmEFbHFKW5ubKyr30xHvXHj+k=", + "bundled": true, "dev": true }, "spdx-expression-parse": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", + "bundled": true, "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" } }, "spdx-license-ids": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha1-enzShHDMbToc/m1miG9rxDDTrIc=", + "bundled": true, "dev": true }, "split-string": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", + "bundled": true, "dev": true, "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" } }, "static-extend": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "bundled": true, "dev": true, "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } }, "string-width": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "bundled": true, "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "strip-bom": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "bundled": true, "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-eof": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "bundled": true, "dev": true }, "test-exclude": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.1.tgz", - "integrity": "sha1-36Ii8DSAvKaSB8pyizfXS0X3JPo=", + "bundled": true, "dev": true, "requires": { - "arrify": "^1.0.1", - "micromatch": "^3.1.8", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", - "require-main-filename": "^1.0.1" + "arrify": "1.0.1", + "micromatch": "3.1.10", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" } }, "to-object-path": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "to-regex": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=", + "bundled": true, "dev": true, "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "bundled": true, "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "uglify-js": { "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "bundled": true, "dev": true, "optional": true, "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "yargs": { "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "bundled": true, "dev": true, "optional": true, "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -10344,71 +9840,64 @@ }, "uglify-to-browserify": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "bundled": true, "dev": true, "optional": true }, "union-value": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "bundled": true, "dev": true, "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" }, "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "set-value": { "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", + "bundled": true, "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" } } } }, "unset-value": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "bundled": true, "dev": true, "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "bundled": true, "dev": true, "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "bundled": true, "dev": true, "requires": { "isarray": "1.0.0" @@ -10418,210 +9907,186 @@ }, "has-values": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "bundled": true, "dev": true } } }, "urix": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "bundled": true, "dev": true }, "use": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", - "integrity": "sha1-FHFr8D/f79AwQK71jYtLhfOnxUQ=", + "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.2" }, "dependencies": { "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", + "bundled": true, "dev": true } } }, "validate-npm-package-license": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", - "integrity": "sha1-gWQ7y+8b3+zUYjeT3EZIlIupgzg=", + "bundled": true, "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "which": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", + "bundled": true, "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "bundled": true, "dev": true }, "window-size": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "bundled": true, "dev": true, "optional": true }, "wordwrap": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "bundled": true, "dev": true }, "wrap-ansi": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "bundled": true, "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" }, "dependencies": { "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "bundled": true, "dev": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "strip-ansi": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } } } }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "bundled": true, "dev": true }, "write-file-atomic": { "version": "1.3.4", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", - "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", + "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } }, "y18n": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "bundled": true, "dev": true }, "yallist": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "bundled": true, "dev": true }, "yargs": { "version": "11.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", - "integrity": "sha1-kLhpk07W6HERXqL/WLA/RyTtLXc=", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" + "bundled": true, + "dev": true, + "requires": { + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" }, "dependencies": { "camelcase": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "bundled": true, "dev": true }, "cliui": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha1-NIQi2+gtgAswIu709qwQvy5NG0k=", + "bundled": true, "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" } }, "yargs-parser": { "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "bundled": true, "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" } } } }, "yargs-parser": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz", - "integrity": "sha1-8TdqM7Ziml0GN4KUTacyYx6WaVA=", + "bundled": true, "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" }, "dependencies": { "camelcase": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "bundled": true, "dev": true } } @@ -10644,9 +10109,9 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { @@ -10654,7 +10119,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "kind-of": { @@ -10662,22 +10127,22 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } }, "object-keys": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", - "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=" + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", + "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==" }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" } }, "object.omit": { @@ -10686,8 +10151,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" + "for-own": "0.1.5", + "is-extendable": "0.1.1" } }, "object.pick": { @@ -10695,7 +10160,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "observable-to-promise": { @@ -10704,8 +10169,8 @@ "integrity": "sha1-yCjw8NxH6fhq+KSXfF1VB2znqR8=", "dev": true, "requires": { - "is-observable": "^0.2.0", - "symbol-observable": "^1.0.4" + "is-observable": "0.2.0", + "symbol-observable": "1.2.0" }, "dependencies": { "is-observable": { @@ -10714,7 +10179,7 @@ "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", "dev": true, "requires": { - "symbol-observable": "^0.2.2" + "symbol-observable": "0.2.4" }, "dependencies": { "symbol-observable": { @@ -10732,7 +10197,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "onetime": { @@ -10741,7 +10206,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "optimist": { @@ -10750,8 +10215,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, "option-chain": { @@ -10766,12 +10231,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" }, "dependencies": { "wordwrap": { @@ -10798,7 +10263,7 @@ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { - "lcid": "^1.0.0" + "lcid": "1.0.0" } }, "os-tmpdir": { @@ -10836,7 +10301,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "1.0.0" } }, "p-locate": { @@ -10845,7 +10310,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.3.0" } }, "p-timeout": { @@ -10854,7 +10319,7 @@ "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", "dev": true, "requires": { - "p-finally": "^1.0.0" + "p-finally": "1.0.0" } }, "p-try": { @@ -10869,10 +10334,10 @@ "integrity": "sha1-eK4ybIngWk2BO2hgGXevBcANKg0=", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "lodash.flattendeep": "^4.4.0", - "md5-hex": "^2.0.0", - "release-zalgo": "^1.0.0" + "graceful-fs": "4.1.11", + "lodash.flattendeep": "4.4.0", + "md5-hex": "2.0.0", + "release-zalgo": "1.0.0" } }, "package-json": { @@ -10881,10 +10346,10 @@ "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", "dev": true, "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" + "got": "6.7.1", + "registry-auth-token": "3.3.2", + "registry-url": "3.1.0", + "semver": "5.5.0" }, "dependencies": { "got": { @@ -10893,17 +10358,17 @@ "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { - "create-error-class": "^3.0.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" + "create-error-class": "3.0.2", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.1", + "safe-buffer": "5.1.2", + "timed-out": "4.0.1", + "unzip-response": "2.0.1", + "url-parse-lax": "1.0.0" } } } @@ -10914,10 +10379,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" }, "dependencies": { "is-extglob": { @@ -10932,7 +10397,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } } } @@ -10943,7 +10408,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.2" } }, "parse-ms": { @@ -11013,7 +10478,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } }, "performance-now": { @@ -11038,7 +10503,7 @@ "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", "dev": true, "requires": { - "pinkie": "^1.0.0" + "pinkie": "1.0.0" } }, "pkg-conf": { @@ -11047,8 +10512,8 @@ "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", "dev": true, "requires": { - "find-up": "^2.0.0", - "load-json-file": "^4.0.0" + "find-up": "2.1.0", + "load-json-file": "4.0.0" }, "dependencies": { "load-json-file": { @@ -11057,10 +10522,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" + "graceful-fs": "4.1.11", + "parse-json": "4.0.0", + "pify": "3.0.0", + "strip-bom": "3.0.0" } }, "parse-json": { @@ -11069,8 +10534,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "error-ex": "1.3.2", + "json-parse-better-errors": "1.0.2" } } } @@ -11081,7 +10546,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "2.1.0" } }, "plur": { @@ -11090,7 +10555,7 @@ "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", "dev": true, "requires": { - "irregular-plurals": "^1.0.0" + "irregular-plurals": "1.4.0" } }, "pluralize": { @@ -11105,14 +10570,14 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "6.0.22", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz", - "integrity": "sha512-Toc9lLoUASwGqxBSJGTVcOQiDqjK+Z2XlWBg+IgYwQMY9vA2f7iMpXVc1GpPcfTSyM5lkxNo0oDwDRO+wm7XHA==", + "version": "6.0.23", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", + "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.1", + "source-map": "0.6.1", + "supports-color": "5.4.0" }, "dependencies": { "source-map": { @@ -11124,45 +10589,45 @@ } }, "power-assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.5.0.tgz", - "integrity": "sha512-WaWSw+Ts283o6dzxW1BxIxoaHok7aSSGx4SaR6dW62Pk31ynv9DERDieuZpPYv5XaJ+H+zdcOaJQ+PvlasAOVw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.6.0.tgz", + "integrity": "sha512-nDb6a+p2C7Wj8Y2zmFtLpuv+xobXz4+bzT5s7dr0nn71tLozn7nRMQqzwbefzwZN5qOm0N7Cxhw4kXP75xboKA==", "requires": { - "define-properties": "^1.1.2", - "empower": "^1.2.3", - "power-assert-formatter": "^1.3.1", - "universal-deep-strict-equal": "^1.2.1", - "xtend": "^4.0.0" + "define-properties": "1.1.2", + "empower": "1.3.0", + "power-assert-formatter": "1.4.1", + "universal-deep-strict-equal": "1.2.2", + "xtend": "4.0.1" } }, "power-assert-context-formatter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.1.1.tgz", - "integrity": "sha1-7bo1LT7YpgMRTWZyZazOYNaJzN8=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.2.0.tgz", + "integrity": "sha512-HLNEW8Bin+BFCpk/zbyKwkEu9W8/zThIStxGo7weYcFkKgMuGCHUJhvJeBGXDZf0Qm2xis4pbnnciGZiX0EpSg==", "requires": { - "core-js": "^2.0.0", - "power-assert-context-traversal": "^1.1.1" + "core-js": "2.5.7", + "power-assert-context-traversal": "1.2.0" } }, "power-assert-context-reducer-ast": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/power-assert-context-reducer-ast/-/power-assert-context-reducer-ast-1.1.2.tgz", - "integrity": "sha1-SEqZ4m9Jc/+IMuXFzHVnAuYJQXQ=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/power-assert-context-reducer-ast/-/power-assert-context-reducer-ast-1.2.0.tgz", + "integrity": "sha512-EgOxmZ/Lb7tw4EwSKX7ZnfC0P/qRZFEG28dx/690qvhmOJ6hgThYFm5TUWANDLK5NiNKlPBi5WekVGd2+5wPrw==", "requires": { - "acorn": "^4.0.0", - "acorn-es7-plugin": "^1.0.12", - "core-js": "^2.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.2.0" + "acorn": "5.7.1", + "acorn-es7-plugin": "1.1.7", + "core-js": "2.5.7", + "espurify": "1.8.0", + "estraverse": "4.2.0" } }, "power-assert-context-traversal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.1.1.tgz", - "integrity": "sha1-iMq8oNE7Y1nwfT0+ivppkmRXftk=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.2.0.tgz", + "integrity": "sha512-NFoHU6g2umNajiP2l4qb0BRWD773Aw9uWdWYH9EQsVwIZnog5bd2YYLFCVvaxWpwNzWeEfZIon2xtyc63026pQ==", "requires": { - "core-js": "^2.0.0", - "estraverse": "^4.1.0" + "core-js": "2.5.7", + "estraverse": "4.2.0" } }, "power-assert-formatter": { @@ -11170,22 +10635,22 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "^2.0.0", - "power-assert-context-formatter": "^1.0.7", - "power-assert-context-reducer-ast": "^1.0.7", - "power-assert-renderer-assertion": "^1.0.7", - "power-assert-renderer-comparison": "^1.0.7", - "power-assert-renderer-diagram": "^1.0.7", - "power-assert-renderer-file": "^1.0.7" + "core-js": "2.5.7", + "power-assert-context-formatter": "1.2.0", + "power-assert-context-reducer-ast": "1.2.0", + "power-assert-renderer-assertion": "1.2.0", + "power-assert-renderer-comparison": "1.2.0", + "power-assert-renderer-diagram": "1.2.0", + "power-assert-renderer-file": "1.2.0" } }, "power-assert-renderer-assertion": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.1.1.tgz", - "integrity": "sha1-y/wOd+AIao+Wrz8djme57n4ozpg=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.2.0.tgz", + "integrity": "sha512-3F7Q1ZLmV2ZCQv7aV7NJLNK9G7QsostrhOU7U0RhEQS/0vhEqrRg2jEJl1jtUL4ZyL2dXUlaaqrmPv5r9kRvIg==", "requires": { - "power-assert-renderer-base": "^1.1.1", - "power-assert-util-string-width": "^1.1.1" + "power-assert-renderer-base": "1.1.1", + "power-assert-util-string-width": "1.2.0" } }, "power-assert-renderer-base": { @@ -11194,42 +10659,42 @@ "integrity": "sha1-lqZQxv0F7hvB9mtUrWFELIs/Y+s=" }, "power-assert-renderer-comparison": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.1.1.tgz", - "integrity": "sha1-10Odl9hRVr5OMKAPL7WnJRTOPAg=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.2.0.tgz", + "integrity": "sha512-7c3RKPDBKK4E3JqdPtYRE9cM8AyX4LC4yfTvvTYyx8zSqmT5kJnXwzR0yWQLOavACllZfwrAGQzFiXPc5sWa+g==", "requires": { - "core-js": "^2.0.0", - "diff-match-patch": "^1.0.0", - "power-assert-renderer-base": "^1.1.1", - "stringifier": "^1.3.0", - "type-name": "^2.0.1" + "core-js": "2.5.7", + "diff-match-patch": "1.0.1", + "power-assert-renderer-base": "1.1.1", + "stringifier": "1.3.0", + "type-name": "2.0.2" } }, "power-assert-renderer-diagram": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.1.2.tgz", - "integrity": "sha1-ZV+PcRk1qbbVQbhjJ2VHF8Y3qYY=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.2.0.tgz", + "integrity": "sha512-JZ6PC+DJPQqfU6dwSmpcoD7gNnb/5U77bU5KgNwPPa+i1Pxiz6UuDeM3EUBlhZ1HvH9tMjI60anqVyi5l2oNdg==", "requires": { - "core-js": "^2.0.0", - "power-assert-renderer-base": "^1.1.1", - "power-assert-util-string-width": "^1.1.1", - "stringifier": "^1.3.0" + "core-js": "2.5.7", + "power-assert-renderer-base": "1.1.1", + "power-assert-util-string-width": "1.2.0", + "stringifier": "1.3.0" } }, "power-assert-renderer-file": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/power-assert-renderer-file/-/power-assert-renderer-file-1.1.1.tgz", - "integrity": "sha1-o34rvReMys0E5427eckv40kzxec=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/power-assert-renderer-file/-/power-assert-renderer-file-1.2.0.tgz", + "integrity": "sha512-/oaVrRbeOtGoyyd7e4IdLP/jIIUFJdqJtsYzP9/88R39CMnfF/S/rUc8ZQalENfUfQ/wQHu+XZYRMaCEZmEesg==", "requires": { - "power-assert-renderer-base": "^1.1.1" + "power-assert-renderer-base": "1.1.1" } }, "power-assert-util-string-width": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/power-assert-util-string-width/-/power-assert-util-string-width-1.1.1.tgz", - "integrity": "sha1-vmWet5N/3S5smncmjar2S9W3xZI=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/power-assert-util-string-width/-/power-assert-util-string-width-1.2.0.tgz", + "integrity": "sha512-lX90G0igAW0iyORTILZ/QjZWsa1MZ6VVY3L0K86e2eKun3S4LKPH4xZIl8fdeMYLfOjkaszbNSzf1uugLeAm2A==", "requires": { - "eastasianwidth": "^0.1.1" + "eastasianwidth": "0.2.0" } }, "prelude-ls": { @@ -11251,9 +10716,9 @@ "dev": true }, "prettier": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.5.tgz", - "integrity": "sha512-4M90mfvLz6yRf2Dhzd+xPIE6b4xkI8nHMJhsSm9IlfG17g6wujrrm7+H1X8x52tC4cSNm6HmuhCUSNe6Hd5wfw==", + "version": "1.13.6", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.6.tgz", + "integrity": "sha512-p5eqCNiohWZN++7aJXUVj0JgLqHCPLf9GLIcLBHGNWs4Y9FJOPs6+KNO2WT0udJIQJTbeZFrJkjzjcb8fkAYYQ==", "dev": true }, "pretty-ms": { @@ -11262,7 +10727,7 @@ "integrity": "sha512-ZypexbfVUGTFxb0v+m1bUyy92DHe5SyYlnyY0msyms5zd3RwyvNgyxZZsXXgoyzlxjx5MiqtXUdhUfvQbe0A2Q==", "dev": true, "requires": { - "parse-ms": "^1.0.0" + "parse-ms": "1.0.1" }, "dependencies": { "parse-ms": { @@ -11295,19 +10760,19 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^3.0.32", - "@types/node": "^8.9.4", - "long": "^4.0.0" + "@protobufjs/aspromise": "1.1.2", + "@protobufjs/base64": "1.1.2", + "@protobufjs/codegen": "2.0.4", + "@protobufjs/eventemitter": "1.1.0", + "@protobufjs/fetch": "1.1.0", + "@protobufjs/float": "1.0.2", + "@protobufjs/inquire": "1.1.0", + "@protobufjs/path": "1.1.2", + "@protobufjs/pool": "1.1.0", + "@protobufjs/utf8": "1.1.0", + "@types/long": "3.0.32", + "@types/node": "8.10.20", + "long": "4.0.0" } }, "proxyquire": { @@ -11316,9 +10781,9 @@ "integrity": "sha512-fQr3VQrbdzHrdaDn3XuisVoJlJNDJizHAvUXw9IuXRR8BpV2x0N7LsCxrpJkeKfPbNjiNU/V5vc008cI0TmzzQ==", "dev": true, "requires": { - "fill-keys": "^1.0.2", - "module-not-found-error": "^1.0.0", - "resolve": "~1.5.0" + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.5.0" }, "dependencies": { "resolve": { @@ -11327,7 +10792,7 @@ "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "1.0.5" } } } @@ -11353,9 +10818,9 @@ "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", "dev": true, "requires": { - "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" + "decode-uri-component": "0.2.0", + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" } }, "randomatic": { @@ -11364,9 +10829,9 @@ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" + "is-number": "4.0.0", + "kind-of": "6.0.2", + "math-random": "1.0.1" }, "dependencies": { "is-number": { @@ -11383,10 +10848,10 @@ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -11403,9 +10868,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" }, "dependencies": { "path-type": { @@ -11414,7 +10879,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "^2.0.0" + "pify": "2.3.0" } }, "pify": { @@ -11431,8 +10896,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" + "find-up": "2.1.0", + "read-pkg": "2.0.0" } }, "readable-stream": { @@ -11440,13 +10905,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "readdirp": { @@ -11455,10 +10920,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.6", + "set-immediate-shim": "1.0.1" } }, "redent": { @@ -11467,8 +10932,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" }, "dependencies": { "indent-string": { @@ -11477,7 +10942,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } } } @@ -11500,7 +10965,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "^0.1.3" + "is-equal-shallow": "0.1.3" } }, "regex-not": { @@ -11508,8 +10973,8 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "regexpp": { @@ -11524,9 +10989,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" + "regenerate": "1.4.0", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" } }, "registry-auth-token": { @@ -11535,8 +11000,8 @@ "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { - "rc": "^1.1.6", - "safe-buffer": "^5.0.1" + "rc": "1.2.8", + "safe-buffer": "5.1.2" } }, "registry-url": { @@ -11545,7 +11010,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "^1.0.1" + "rc": "1.2.8" } }, "regjsgen": { @@ -11560,7 +11025,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "~0.5.0" + "jsesc": "0.5.0" } }, "release-zalgo": { @@ -11569,7 +11034,7 @@ "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", "dev": true, "requires": { - "es6-error": "^4.0.1" + "es6-error": "4.1.1" } }, "remove-trailing-separator": { @@ -11594,7 +11059,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.0.2" } }, "request": { @@ -11602,26 +11067,26 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" + "aws-sign2": "0.7.0", + "aws4": "1.7.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" } }, "require-directory": { @@ -11648,8 +11113,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" + "caller-path": "0.1.0", + "resolve-from": "1.0.1" }, "dependencies": { "resolve-from": { @@ -11666,7 +11131,7 @@ "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", "dev": true, "requires": { - "underscore": "~1.6.0" + "underscore": "1.6.0" }, "dependencies": { "underscore": { @@ -11689,7 +11154,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "resolve-from": { @@ -11709,7 +11174,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "^1.0.0" + "lowercase-keys": "1.0.1" } }, "restore-cursor": { @@ -11718,8 +11183,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "onetime": "2.0.1", + "signal-exit": "3.0.2" } }, "ret": { @@ -11737,8 +11202,8 @@ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.2.tgz", "integrity": "sha512-WIiGp37XXDC6e7ku3LFoi7LCL/Gs9luGeeqvbPRb+Zl6OQMw4RCRfSaW+aLfE6lhz1R941UavE6Svl3Dm5xGIQ==", "requires": { - "request": "^2.81.0", - "through2": "^2.0.0" + "request": "2.87.0", + "through2": "2.0.3" } }, "right-align": { @@ -11748,7 +11213,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { @@ -11757,7 +11222,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "run-async": { @@ -11766,7 +11231,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "^2.1.0" + "is-promise": "2.1.0" } }, "rx-lite": { @@ -11781,7 +11246,7 @@ "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", "dev": true, "requires": { - "rx-lite": "*" + "rx-lite": "4.0.8" } }, "safe-buffer": { @@ -11794,7 +11259,7 @@ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "safer-buffer": { @@ -11814,16 +11279,16 @@ "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", "dev": true, "requires": { - "chalk": "^2.3.0", - "htmlparser2": "^3.9.0", - "lodash.clonedeep": "^4.5.0", - "lodash.escaperegexp": "^4.1.2", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.mergewith": "^4.6.0", - "postcss": "^6.0.14", - "srcset": "^1.0.0", - "xtend": "^4.0.0" + "chalk": "2.4.1", + "htmlparser2": "3.9.2", + "lodash.clonedeep": "4.5.0", + "lodash.escaperegexp": "4.1.2", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", + "lodash.mergewith": "4.6.1", + "postcss": "6.0.23", + "srcset": "1.0.0", + "xtend": "4.0.1" } }, "semver": { @@ -11838,7 +11303,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "^5.0.3" + "semver": "5.5.0" } }, "serialize-error": { @@ -11864,10 +11329,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { @@ -11875,7 +11340,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -11886,7 +11351,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -11907,13 +11372,13 @@ "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", "dev": true, "requires": { - "@sinonjs/formatio": "^2.0.0", - "diff": "^3.1.0", - "lodash.get": "^4.4.2", - "lolex": "^2.2.0", - "nise": "^1.2.0", - "supports-color": "^5.1.0", - "type-detect": "^4.0.5" + "@sinonjs/formatio": "2.0.0", + "diff": "3.5.0", + "lodash.get": "4.4.2", + "lolex": "2.7.0", + "nise": "1.4.2", + "supports-color": "5.4.0", + "type-detect": "4.0.8" } }, "slash": { @@ -11927,7 +11392,7 @@ "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0" + "is-fullwidth-code-point": "2.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -11949,14 +11414,14 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.0" }, "dependencies": { "debug": { @@ -11972,7 +11437,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -11980,7 +11445,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -11990,9 +11455,9 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { @@ -12000,7 +11465,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -12008,7 +11473,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -12016,7 +11481,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -12024,9 +11489,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -12036,7 +11501,7 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -12044,7 +11509,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -12055,7 +11520,7 @@ "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", "dev": true, "requires": { - "is-plain-obj": "^1.0.0" + "is-plain-obj": "1.1.0" } }, "source-map": { @@ -12068,11 +11533,11 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.1", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-support": { @@ -12081,8 +11546,8 @@ "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "buffer-from": "1.1.0", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -12104,8 +11569,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, "spdx-exceptions": { @@ -12120,8 +11585,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" } }, "spdx-license-ids": { @@ -12135,8 +11600,8 @@ "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz", "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=", "requires": { - "async": "^2.4.0", - "is-stream-ended": "^0.1.0" + "async": "2.6.1", + "is-stream-ended": "0.1.4" } }, "split-string": { @@ -12144,7 +11609,7 @@ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" } }, "sprintf-js": { @@ -12159,8 +11624,8 @@ "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=", "dev": true, "requires": { - "array-uniq": "^1.0.2", - "number-is-nan": "^1.0.0" + "array-uniq": "1.0.3", + "number-is-nan": "1.0.1" } }, "sshpk": { @@ -12168,15 +11633,15 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" } }, "stack-utils": { @@ -12190,8 +11655,8 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { @@ -12199,7 +11664,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -12209,7 +11674,7 @@ "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.4.tgz", "integrity": "sha512-D243NJaYs/xBN2QnoiMDY7IesJFIK7gEhnvAYqJa5JvDdnh2dC4qDBwlCf0ohPpX2QRlA/4gnbnPd3rs3KxVcA==", "requires": { - "stubs": "^3.0.0" + "stubs": "3.0.0" } }, "stream-shift": { @@ -12239,9 +11704,9 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -12249,7 +11714,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "stringifier": { @@ -12257,9 +11722,9 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "^2.0.0", - "traverse": "^0.6.6", - "type-name": "^2.0.1" + "core-js": "2.5.7", + "traverse": "0.6.6", + "type-name": "2.0.2" } }, "strip-ansi": { @@ -12267,7 +11732,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-bom": { @@ -12282,7 +11747,7 @@ "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=", "dev": true, "requires": { - "is-utf8": "^0.2.1" + "is-utf8": "0.2.1" } }, "strip-eof": { @@ -12297,7 +11762,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "^4.0.1" + "get-stdin": "4.0.1" } }, "strip-json-comments": { @@ -12317,16 +11782,16 @@ "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", "dev": true, "requires": { - "component-emitter": "^1.2.0", - "cookiejar": "^2.1.0", - "debug": "^3.1.0", - "extend": "^3.0.0", - "form-data": "^2.3.1", - "formidable": "^1.2.0", - "methods": "^1.1.1", - "mime": "^1.4.1", - "qs": "^6.5.1", - "readable-stream": "^2.3.5" + "component-emitter": "1.2.1", + "cookiejar": "2.1.2", + "debug": "3.1.0", + "extend": "3.0.1", + "form-data": "2.3.2", + "formidable": "1.2.1", + "methods": "1.1.2", + "mime": "1.6.0", + "qs": "6.5.2", + "readable-stream": "2.3.6" }, "dependencies": { "mime": { @@ -12343,11 +11808,11 @@ "integrity": "sha512-HZJ3geIMPgVwKk2VsmO5YHqnnJYl6bV5A9JW2uzqV43WmpgliNEYbuvukfor7URpaqpxuw3CfZ3ONdVbZjCgIA==", "dev": true, "requires": { - "arrify": "^1.0.1", - "indent-string": "^3.2.0", - "js-yaml": "^3.10.0", - "serialize-error": "^2.1.0", - "strip-ansi": "^4.0.0" + "arrify": "1.0.1", + "indent-string": "3.2.0", + "js-yaml": "3.12.0", + "serialize-error": "2.1.0", + "strip-ansi": "4.0.0" }, "dependencies": { "ansi-regex": { @@ -12362,7 +11827,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -12373,8 +11838,8 @@ "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=", "dev": true, "requires": { - "methods": "~1.1.2", - "superagent": "^3.0.0" + "methods": "1.1.2", + "superagent": "3.8.3" } }, "supports-color": { @@ -12383,7 +11848,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" }, "dependencies": { "has-flag": { @@ -12406,12 +11871,12 @@ "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", "dev": true, "requires": { - "ajv": "^5.2.3", - "ajv-keywords": "^2.1.0", - "chalk": "^2.1.0", - "lodash": "^4.17.4", + "ajv": "5.5.2", + "ajv-keywords": "2.1.1", + "chalk": "2.4.1", + "lodash": "4.17.10", "slice-ansi": "1.0.0", - "string-width": "^2.1.1" + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -12432,8 +11897,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -12442,7 +11907,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -12459,7 +11924,7 @@ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", "dev": true, "requires": { - "execa": "^0.7.0" + "execa": "0.7.0" } }, "text-encoding": { @@ -12485,8 +11950,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } }, "time-zone": { @@ -12507,7 +11972,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "os-tmpdir": "1.0.2" } }, "to-fast-properties": { @@ -12521,7 +11986,7 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -12529,7 +11994,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -12539,10 +12004,10 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { @@ -12550,8 +12015,8 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "tough-cookie": { @@ -12559,7 +12024,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "^1.4.1" + "punycode": "1.4.1" } }, "traverse": { @@ -12590,7 +12055,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -12605,7 +12070,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "1.1.2" } }, "type-detect": { @@ -12631,9 +12096,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "camelcase": { @@ -12650,8 +12115,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" } }, @@ -12676,9 +12141,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -12725,10 +12190,10 @@ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" }, "dependencies": { "extend-shallow": { @@ -12736,7 +12201,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "set-value": { @@ -12744,10 +12209,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" } } } @@ -12758,7 +12223,7 @@ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", "dev": true, "requires": { - "crypto-random-string": "^1.0.0" + "crypto-random-string": "1.0.0" } }, "unique-temp-dir": { @@ -12767,8 +12232,8 @@ "integrity": "sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U=", "dev": true, "requires": { - "mkdirp": "^0.5.1", - "os-tmpdir": "^1.0.1", + "mkdirp": "0.5.1", + "os-tmpdir": "1.0.2", "uid2": "0.0.3" } }, @@ -12777,15 +12242,15 @@ "resolved": "https://registry.npmjs.org/universal-deep-strict-equal/-/universal-deep-strict-equal-1.2.2.tgz", "integrity": "sha1-DaSsL3PP95JMgfpN4BjKViyisKc=", "requires": { - "array-filter": "^1.0.0", + "array-filter": "1.0.0", "indexof": "0.0.1", - "object-keys": "^1.0.0" + "object-keys": "1.0.12" } }, "universalify": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, "unset-value": { @@ -12793,8 +12258,8 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { @@ -12802,9 +12267,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { @@ -12836,16 +12301,16 @@ "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" + "boxen": "1.3.0", + "chalk": "2.4.1", + "configstore": "3.1.2", + "import-lazy": "2.1.0", + "is-ci": "1.1.0", + "is-installed-globally": "0.1.0", + "is-npm": "1.0.0", + "latest-version": "3.1.0", + "semver-diff": "2.1.0", + "xdg-basedir": "3.0.0" } }, "urix": { @@ -12859,7 +12324,7 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "prepend-http": "^1.0.1" + "prepend-http": "1.0.4" } }, "url-to-options": { @@ -12879,7 +12344,7 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.2" } }, "util-deprecate": { @@ -12898,8 +12363,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "verror": { @@ -12907,9 +12372,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "^1.0.0", + "assert-plus": "1.0.0", "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "extsprintf": "1.3.0" } }, "well-known-symbols": { @@ -12924,7 +12389,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -12939,7 +12404,7 @@ "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", "dev": true, "requires": { - "string-width": "^2.1.1" + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -12960,8 +12425,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -12970,7 +12435,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -12991,8 +12456,8 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" } }, "wrappy": { @@ -13006,7 +12471,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "^0.5.1" + "mkdirp": "0.5.1" } }, "write-file-atomic": { @@ -13015,9 +12480,9 @@ "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" } }, "write-json-file": { @@ -13026,12 +12491,12 @@ "integrity": "sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=", "dev": true, "requires": { - "detect-indent": "^5.0.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "pify": "^3.0.0", - "sort-keys": "^2.0.0", - "write-file-atomic": "^2.0.0" + "detect-indent": "5.0.0", + "graceful-fs": "4.1.11", + "make-dir": "1.3.0", + "pify": "3.0.0", + "sort-keys": "2.0.0", + "write-file-atomic": "2.3.0" }, "dependencies": { "detect-indent": { @@ -13048,8 +12513,8 @@ "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==", "dev": true, "requires": { - "sort-keys": "^2.0.0", - "write-json-file": "^2.2.0" + "sort-keys": "2.0.0", + "write-json-file": "2.3.0" } }, "xdg-basedir": { @@ -13084,13 +12549,13 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "requires": { - "camelcase": "^2.0.1", - "cliui": "^3.0.3", - "decamelize": "^1.1.1", - "os-locale": "^1.4.0", - "string-width": "^1.0.1", - "window-size": "^0.1.4", - "y18n": "^3.2.0" + "camelcase": "2.1.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "string-width": "1.0.2", + "window-size": "0.1.4", + "y18n": "3.2.1" } }, "yargs-parser": { @@ -13099,7 +12564,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" }, "dependencies": { "camelcase": { diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ab003f3c0f0..ca7df5d67b6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.18.0", + "version": "0.19.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From b3cf8a6f856f1274edc9168863a28cfcd7453acb Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 25 Jun 2018 16:29:55 -0700 Subject: [PATCH 0164/1115] fix: update linking for samples (#146) --- handwritten/pubsub/.circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 29067e02695..ffd230d3b03 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -105,7 +105,6 @@ jobs: if ! test -x "$repo_tools"; then chmod +x "$repo_tools" fi - npm link environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: @@ -147,9 +146,8 @@ jobs: name: Link the module being tested to the samples. command: | cd samples/ - npm link @google-cloud/pubsub npm install - cd .. + npm link ../ environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: From 6669db61b559b069a4f008521b3dbb8dc47dd435 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 25 Jun 2018 22:50:31 -0700 Subject: [PATCH 0165/1115] refactor: drop repo-tool as an exec wrapper (#150) --- handwritten/pubsub/.circleci/config.yml | 4 ---- handwritten/pubsub/package.json | 12 ++++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index ffd230d3b03..4dd5e051e20 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -101,10 +101,6 @@ jobs: command: | mkdir /home/node/.npm-global npm install - repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" - if ! test -x "$repo_tools"; then - chmod +x "$repo_tools" - fi environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ca7df5d67b6..3b06ba9b65f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,14 +51,14 @@ "mkamioner " ], "scripts": { - "system-test": "repo-tools test run --cmd mocha -- system-test/*.js --timeout 600000", + "system-test": "mocha system-test/*.js --timeout 600000", "cover": "nyc --reporter=lcov mocha --require intelli-espower-loader test/*.js --timeout 0 && nyc report", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", - "test-no-cover": "repo-tools test run --cmd mocha -- test/*.js --no-timeouts", - "test": "repo-tools test run --cmd npm -- run cover", - "lint": "repo-tools lint --cmd eslint -- src/ samples/ system-test/ test/", - "prettier": "repo-tools exec -- prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", - "docs": "repo-tools exec -- jsdoc -c .jsdoc.js", + "test-no-cover": "mocha test/*.js --no-timeouts", + "test": "npm run cover", + "lint": "eslint src/ samples/ system-test/ test/", + "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", + "docs": "jsdoc -c .jsdoc.js", "publish-module": "node ../../scripts/publish.js pubsub", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" }, From 35b48372480b1144184efedb10f9b44b892c0465 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 26 Jun 2018 07:41:42 -0700 Subject: [PATCH 0166/1115] chore(package): update eslint to version 5.0.0 (#145) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3b06ba9b65f..d534d599542 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -84,7 +84,7 @@ "@google-cloud/nodejs-repo-tools": "^2.2.3", "async": "^2.6.0", "codecov": "^3.0.0", - "eslint": "^4.11.0", + "eslint": "^5.0.0", "eslint-config-prettier": "^2.8.0", "eslint-plugin-node": "^6.0.0", "eslint-plugin-prettier": "^2.3.1", From 407e2806fc6ba749c80ffa0be1338733eec04552 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 28 Jun 2018 10:22:13 -0700 Subject: [PATCH 0167/1115] fix(deps): update dependency @google-cloud/common to ^0.20.0 (#155) --- handwritten/pubsub/package-lock.json | 649 +++++++++++++++++---------- handwritten/pubsub/package.json | 2 +- 2 files changed, 415 insertions(+), 236 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 1980d331b32..42e793c3d49 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -214,41 +214,25 @@ } }, "@google-cloud/common": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.16.2.tgz", - "integrity": "sha512-GrkaFoj0/oO36pNs4yLmaYhTujuA3i21FdQik99Fd/APix1uhf01VlpJY4lAteTDFLRNkRx6ydEh7OVvmeUHng==", - "requires": { - "array-uniq": "1.0.3", - "arrify": "1.0.1", - "concat-stream": "1.6.2", - "create-error-class": "3.0.2", - "duplexify": "3.6.0", - "ent": "2.2.0", - "extend": "3.0.1", - "google-auto-auth": "0.9.7", - "is": "3.2.1", - "log-driver": "1.2.7", - "methmeth": "1.1.0", - "modelo": "4.2.3", - "request": "2.87.0", - "retry-request": "3.3.2", - "split-array-stream": "1.0.3", - "stream-events": "1.0.4", - "string-format-obj": "1.1.1", - "through2": "2.0.3" - }, - "dependencies": { - "google-auto-auth": { - "version": "0.9.7", - "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.9.7.tgz", - "integrity": "sha512-Nro7aIFrL2NP0G7PoGrJqXGMZj8AjdBOcbZXRRm/8T3w08NUHIiNN3dxpuUYzDsZizslH+c8e+7HXL8vh3JXTQ==", - "requires": { - "async": "2.6.1", - "gcp-metadata": "0.6.3", - "google-auth-library": "1.6.1", - "request": "2.87.0" - } - } + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.20.1.tgz", + "integrity": "sha512-LJB7CoNXEXY0mDWtF8E2cl3Y0kuMQ3wjH9Xr+Y7vH5gHgN82dDh1BMUOizRf9oXQFDWUgGERD5SdfBcjUhHmwA==", + "requires": { + "@types/duplexify": "^3.5.0", + "@types/request": "^2.47.0", + "arrify": "^1.0.1", + "axios": "^0.18.0", + "duplexify": "^3.6.0", + "ent": "^2.2.0", + "extend": "^3.0.1", + "google-auth-library": "^1.6.0", + "is": "^3.2.1", + "pify": "^3.0.0", + "request": "^2.87.0", + "retry-request": "^3.3.1", + "split-array-stream": "^2.0.0", + "stream-events": "^1.0.4", + "through2": "^2.0.3" } }, "@google-cloud/nodejs-repo-tools": { @@ -341,6 +325,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "3.2.2", "longest": "1.0.1", @@ -1151,7 +1136,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", @@ -2088,6 +2074,27 @@ "samsam": "1.3.0" } }, + "@types/caseless": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz", + "integrity": "sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==" + }, + "@types/duplexify": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.5.0.tgz", + "integrity": "sha512-+aZCCdxuR/Q6n58CBkXyqGqimIqpYUcFLfBXagXv7e9TdJUevqkKhzopBuRz3RB064sQxnJnhttHOkK/O93Ouw==", + "requires": { + "@types/node": "*" + } + }, + "@types/form-data": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz", + "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==", + "requires": { + "@types/node": "*" + } + }, "@types/long": { "version": "3.0.32", "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", @@ -2098,6 +2105,22 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz", "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==" }, + "@types/request": { + "version": "2.47.1", + "resolved": "https://registry.npmjs.org/@types/request/-/request-2.47.1.tgz", + "integrity": "sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==", + "requires": { + "@types/caseless": "*", + "@types/form-data": "*", + "@types/node": "*", + "@types/tough-cookie": "*" + } + }, + "@types/tough-cookie": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ==" + }, "acorn": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", @@ -2109,20 +2132,12 @@ "integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=" }, "acorn-jsx": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", - "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-4.1.1.tgz", + "integrity": "sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==", "dev": true, "requires": { - "acorn": "3.3.0" - }, - "dependencies": { - "acorn": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", - "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", - "dev": true - } + "acorn": "^5.0.3" } }, "ajv": { @@ -2137,9 +2152,9 @@ } }, "ajv-keywords": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", - "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", + "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", "dev": true }, "align-text": { @@ -2147,6 +2162,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "3.2.2", "longest": "1.0.1", @@ -2158,6 +2174,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "1.1.6" } @@ -3300,7 +3317,8 @@ "buffer-from": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", - "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==" + "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==", + "dev": true }, "builtin-modules": { "version": "1.1.1", @@ -3423,7 +3441,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "0.2.0" + "callsites": "^0.2.0" } }, "callsites": { @@ -3450,7 +3468,8 @@ "capture-stack-trace": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", - "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" + "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=", + "dev": true }, "caseless": { "version": "0.12.0", @@ -3781,17 +3800,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "1.1.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" - } - }, "concordance": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/concordance/-/concordance-3.0.0.tgz", @@ -3883,6 +3891,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "dev": true, "requires": { "capture-stack-trace": "1.0.0" } @@ -4033,13 +4042,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" }, "dependencies": { "globby": { @@ -4048,12 +4057,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -4074,7 +4083,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } } } @@ -4127,7 +4136,7 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "2.0.2" + "esutils": "^2.0.2" } }, "dom-serializer": { @@ -4282,6 +4291,30 @@ "is-arrayish": "0.2.1" } }, + "es-abstract": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", + "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.1.1", + "function-bind": "^1.1.1", + "has": "^1.0.1", + "is-callable": "^1.1.3", + "is-regex": "^1.0.4" + } + }, + "es-to-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", + "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", + "dev": true, + "requires": { + "is-callable": "^1.1.1", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.1" + } + }, "es5-ext": { "version": "0.10.45", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz", @@ -4424,70 +4457,107 @@ } }, "eslint": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", - "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", - "dev": true, - "requires": { - "ajv": "5.5.2", - "babel-code-frame": "6.26.0", - "chalk": "2.4.1", - "concat-stream": "1.6.2", - "cross-spawn": "5.1.0", - "debug": "3.1.0", - "doctrine": "2.1.0", - "eslint-scope": "3.7.1", - "eslint-visitor-keys": "1.0.0", - "espree": "3.5.4", - "esquery": "1.0.1", - "esutils": "2.0.2", - "file-entry-cache": "2.0.0", - "functional-red-black-tree": "1.0.1", - "glob": "7.1.2", - "globals": "11.7.0", - "ignore": "3.3.10", - "imurmurhash": "0.1.4", - "inquirer": "3.3.0", - "is-resolvable": "1.1.0", - "js-yaml": "3.12.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.10", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "optionator": "0.8.2", - "path-is-inside": "1.0.2", - "pluralize": "7.0.0", - "progress": "2.0.0", - "regexpp": "1.1.0", - "require-uncached": "1.0.3", - "semver": "5.5.0", - "strip-ansi": "4.0.0", - "strip-json-comments": "2.0.1", - "table": "4.0.2", - "text-table": "0.2.0" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz", + "integrity": "sha512-D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==", + "dev": true, + "requires": { + "ajv": "^6.5.0", + "babel-code-frame": "^6.26.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^3.1.0", + "doctrine": "^2.1.0", + "eslint-scope": "^4.0.0", + "eslint-visitor-keys": "^1.0.0", + "espree": "^4.0.0", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^2.0.0", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.5.0", + "ignore": "^3.3.3", + "imurmurhash": "^0.1.4", + "inquirer": "^5.2.0", + "is-resolvable": "^1.1.0", + "js-yaml": "^3.11.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.5", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "pluralize": "^7.0.0", + "progress": "^2.0.0", + "regexpp": "^1.1.0", + "require-uncached": "^1.0.3", + "semver": "^5.5.0", + "string.prototype.matchall": "^2.0.0", + "strip-ansi": "^4.0.0", + "strip-json-comments": "^2.0.1", + "table": "^4.0.3", + "text-table": "^0.2.0" }, "dependencies": { + "ajv": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz", + "integrity": "sha512-pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.1" + } + }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, "globals": { "version": "11.7.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", "dev": true }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -4543,13 +4613,13 @@ } }, "eslint-scope": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", + "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", "dev": true, "requires": { - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint-visitor-keys": { @@ -4632,13 +4702,13 @@ } }, "espree": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", - "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-4.0.0.tgz", + "integrity": "sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==", "dev": true, "requires": { - "acorn": "5.7.1", - "acorn-jsx": "3.0.1" + "acorn": "^5.6.0", + "acorn-jsx": "^4.1.1" } }, "esprima": { @@ -4661,7 +4731,7 @@ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.0.0" } }, "esrecurse": { @@ -4830,9 +4900,9 @@ "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.23", - "tmp": "0.0.33" + "chardet": "^0.4.0", + "iconv-lite": "^0.4.17", + "tmp": "^0.0.33" } }, "extglob": { @@ -4949,8 +5019,8 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "1.3.0", - "object-assign": "4.1.1" + "flat-cache": "^1.2.1", + "object-assign": "^4.0.1" } }, "filename-regex": { @@ -5016,10 +5086,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "0.3.3", - "del": "2.2.2", - "graceful-fs": "4.1.11", - "write": "0.2.1" + "circular-json": "^0.3.1", + "del": "^2.0.2", + "graceful-fs": "^4.1.2", + "write": "^0.2.1" } }, "fn-name": { @@ -5151,12 +5221,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -5171,17 +5243,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5298,7 +5373,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5310,6 +5386,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "1.0.1" } @@ -5324,6 +5401,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "1.1.11" } @@ -5331,12 +5409,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "5.1.1", "yallist": "3.0.2" @@ -5355,6 +5435,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5435,7 +5516,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5447,6 +5529,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1.0.2" } @@ -5568,6 +5651,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -5639,6 +5723,12 @@ } } }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, "function-name-support": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/function-name-support/-/function-name-support-0.2.0.tgz", @@ -6424,6 +6514,15 @@ "har-schema": "2.0.0" } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -6451,6 +6550,12 @@ "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", "dev": true }, + "has-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", + "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", + "dev": true + }, "has-to-string-tag-x": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", @@ -6575,7 +6680,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore": { @@ -6653,25 +6758,24 @@ } }, "inquirer": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz", + "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", "dev": true, "requires": { - "ansi-escapes": "3.1.0", - "chalk": "2.4.1", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.2.0", - "figures": "2.0.0", - "lodash": "4.17.10", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^2.1.0", + "figures": "^2.0.0", + "lodash": "^4.3.0", "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx-lite": "4.0.8", - "rx-lite-aggregates": "4.0.8", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" + "run-async": "^2.2.0", + "rxjs": "^5.5.2", + "string-width": "^2.1.0", + "strip-ansi": "^4.0.0", + "through": "^2.3.6" }, "dependencies": { "ansi-regex": { @@ -6692,8 +6796,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -6702,7 +6806,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -6798,6 +6902,12 @@ "builtin-modules": "1.1.1" } }, + "is-callable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", + "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", + "dev": true + }, "is-ci": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", @@ -6825,6 +6935,12 @@ } } }, + "is-date-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", + "dev": true + }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", @@ -6986,7 +7102,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "is-path-inside": "1.0.1" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -7036,6 +7152,15 @@ "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", "dev": true }, + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "dev": true, + "requires": { + "has": "^1.0.1" + } + }, "is-resolvable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", @@ -7059,6 +7184,12 @@ "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==" }, + "is-symbol": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", + "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", + "dev": true + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", @@ -7481,11 +7612,6 @@ "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" }, - "log-driver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", - "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" - }, "lolex": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz", @@ -7501,7 +7627,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", @@ -7750,11 +7877,6 @@ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz", "integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==" }, - "methmeth": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/methmeth/-/methmeth-1.1.0.tgz", - "integrity": "sha1-6AomYY5S9cQiKGG7dIUQvRDikIk=" - }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -7872,11 +7994,6 @@ "supports-color": "5.4.0" } }, - "modelo": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz", - "integrity": "sha512-9DITV2YEMcw7XojdfvGl3gDD8J9QjZTJ7ZOUuSAkP+F3T6rDbzMJuPktxptsdHYEvZcmXrCD3LMOhdSAEq6zKA==" - }, "module-not-found-error": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", @@ -7968,6 +8085,12 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "nice-try": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz", + "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==", + "dev": true + }, "nise": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.2.tgz", @@ -8079,6 +8202,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "3.2.2", "longest": "1.0.1", @@ -9021,7 +9145,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "lru-cache": { "version": "4.1.3", @@ -10977,6 +11102,15 @@ "safe-regex": "1.1.0" } }, + "regexp.prototype.flags": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz", + "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", + "dev": true, + "requires": { + "define-properties": "^1.1.2" + } + }, "regexpp": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", @@ -11113,8 +11247,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "0.1.0", - "resolve-from": "1.0.1" + "caller-path": "^0.1.0", + "resolve-from": "^1.0.0" }, "dependencies": { "resolve-from": { @@ -11202,8 +11336,8 @@ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.2.tgz", "integrity": "sha512-WIiGp37XXDC6e7ku3LFoi7LCL/Gs9luGeeqvbPRb+Zl6OQMw4RCRfSaW+aLfE6lhz1R941UavE6Svl3Dm5xGIQ==", "requires": { - "request": "2.87.0", - "through2": "2.0.3" + "request": "^2.81.0", + "through2": "^2.0.0" } }, "right-align": { @@ -11222,7 +11356,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "run-async": { @@ -11231,22 +11365,24 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "2.1.0" + "is-promise": "^2.1.0" } }, - "rx-lite": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", - "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true - }, - "rx-lite-aggregates": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", - "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", + "rxjs": { + "version": "5.5.11", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz", + "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==", "dev": true, "requires": { - "rx-lite": "4.0.8" + "symbol-observable": "1.0.1" + }, + "dependencies": { + "symbol-observable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", + "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=", + "dev": true + } } }, "safe-buffer": { @@ -11596,12 +11732,11 @@ "dev": true }, "split-array-stream": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz", - "integrity": "sha1-0rdajl4Ngk1S/eyLgiWDncLjXfo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz", + "integrity": "sha512-hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg==", "requires": { - "async": "2.6.1", - "is-stream-ended": "0.1.4" + "is-stream-ended": "^0.1.4" } }, "split-string": { @@ -11674,7 +11809,7 @@ "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.4.tgz", "integrity": "sha512-D243NJaYs/xBN2QnoiMDY7IesJFIK7gEhnvAYqJa5JvDdnh2dC4qDBwlCf0ohPpX2QRlA/4gnbnPd3rs3KxVcA==", "requires": { - "stubs": "3.0.0" + "stubs": "^3.0.0" } }, "stream-shift": { @@ -11694,11 +11829,6 @@ "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=", "dev": true }, - "string-format-obj": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string-format-obj/-/string-format-obj-1.1.1.tgz", - "integrity": "sha512-Mm+sROy+pHJmx0P/0Bs1uxIX6UhGJGj6xDGQZ5zh9v/SZRmLGevp+p0VJxV7lirrkAmQ2mvva/gHKpnF/pTb+Q==" - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -11709,6 +11839,19 @@ "strip-ansi": "3.0.1" } }, + "string.prototype.matchall": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz", + "integrity": "sha512-WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.10.0", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "regexp.prototype.flags": "^1.2.0" + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -11866,39 +12009,63 @@ "dev": true }, "table": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz", + "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==", "dev": true, "requires": { - "ajv": "5.5.2", - "ajv-keywords": "2.1.1", - "chalk": "2.4.1", - "lodash": "4.17.10", + "ajv": "^6.0.1", + "ajv-keywords": "^3.0.0", + "chalk": "^2.1.0", + "lodash": "^4.17.4", "slice-ansi": "1.0.0", - "string-width": "2.1.1" + "string-width": "^2.1.1" }, "dependencies": { + "ajv": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz", + "integrity": "sha512-pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.1" + } + }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true + }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -11907,7 +12074,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -11972,7 +12139,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-fast-properties": { @@ -12084,11 +12251,6 @@ "resolved": "https://registry.npmjs.org/type-name/-/type-name-2.0.2.tgz", "integrity": "sha1-7+fUEj2KxSr/9/QMfk3sUmYAj7Q=" }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" - }, "uglify-js": { "version": "2.8.29", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", @@ -12313,6 +12475,23 @@ "xdg-basedir": "3.0.0" } }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + } + } + }, "urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", @@ -12471,7 +12650,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "0.5.1" + "mkdirp": "^0.5.1" } }, "write-file-atomic": { diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d534d599542..2f2be054399 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -63,7 +63,7 @@ "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" }, "dependencies": { - "@google-cloud/common": "^0.16.1", + "@google-cloud/common": "^0.20.0", "arrify": "^1.0.0", "async-each": "^1.0.1", "delay": "^2.0.0", From 78d71a889011fe5e50ed11eda745c06a6c6bdbb9 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Thu, 28 Jun 2018 14:19:31 -0700 Subject: [PATCH 0168/1115] Update google-gax and add Synth.py (#158) * update google-gax and add synth.py * add back manually written code in generated files --- handwritten/pubsub/package-lock.json | 4434 ++++++++--------- handwritten/pubsub/package.json | 2 +- .../protos/google/pubsub/v1/pubsub.proto | 353 +- .../pubsub/smoke-test/publisher_smoke_test.js | 92 + handwritten/pubsub/src/index.js | 3 +- .../v1/doc/google/iam/v1/doc_iam_policy.js | 93 + .../src/v1/doc/google/iam/v1/doc_policy.js | 162 + .../v1/doc/google/protobuf/doc_duration.js | 97 + .../src/v1/doc/google/protobuf/doc_empty.js | 34 + .../v1/doc/google/protobuf/doc_field_mask.js | 230 + .../v1/doc/google/protobuf/doc_timestamp.js | 113 + .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 966 ++++ handwritten/pubsub/src/v1/index.js | 2 +- handwritten/pubsub/src/v1/publisher_client.js | 81 +- .../pubsub/src/v1/subscriber_client.js | 211 +- handwritten/pubsub/synth.py | 37 + handwritten/pubsub/test/gapic-v1.js | 1900 +++++++ handwritten/pubsub/test/index.js | 28 +- 18 files changed, 6330 insertions(+), 2508 deletions(-) create mode 100644 handwritten/pubsub/smoke-test/publisher_smoke_test.js create mode 100644 handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js create mode 100644 handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js create mode 100644 handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js create mode 100644 handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js create mode 100644 handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js create mode 100644 handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js create mode 100644 handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js create mode 100644 handwritten/pubsub/synth.py create mode 100644 handwritten/pubsub/test/gapic-v1.js diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 42e793c3d49..496805d902a 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -16,18 +16,18 @@ "integrity": "sha512-oWqTnIGXW3k72UFidXzW0ONlO7hnO9x02S/QReJ7NBGeiBH9cUHY9+EfV6C8PXC6YJH++WrliEq03wMSJGNZFg==", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "package-hash": "1.2.0" + "babel-plugin-check-es2015-constants": "^6.8.0", + "babel-plugin-syntax-trailing-function-commas": "^6.20.0", + "babel-plugin-transform-async-to-generator": "^6.16.0", + "babel-plugin-transform-es2015-destructuring": "^6.19.0", + "babel-plugin-transform-es2015-function-name": "^6.9.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0", + "babel-plugin-transform-es2015-parameters": "^6.21.0", + "babel-plugin-transform-es2015-spread": "^6.8.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.8.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.11.0", + "babel-plugin-transform-exponentiation-operator": "^6.8.0", + "package-hash": "^1.2.0" }, "dependencies": { "md5-hex": { @@ -36,7 +36,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "package-hash": { @@ -45,7 +45,7 @@ "integrity": "sha1-AD5WzVe3NqbtYRTMK4FUJnJ3DkQ=", "dev": true, "requires": { - "md5-hex": "1.3.0" + "md5-hex": "^1.3.0" } } } @@ -56,8 +56,8 @@ "integrity": "sha1-ze0RlqjY2TgaUJJAq5LpGl7Aafc=", "dev": true, "requires": { - "@ava/babel-plugin-throws-helper": "2.0.0", - "babel-plugin-espower": "2.4.0" + "@ava/babel-plugin-throws-helper": "^2.0.0", + "babel-plugin-espower": "^2.3.2" } }, "@ava/write-file-atomic": { @@ -66,31 +66,31 @@ "integrity": "sha512-BTNB3nGbEfJT+69wuqXFr/bQH7Vr7ihx2xGOMNqPgDGhwspoZhiWumDDZNjBy7AScmqS5CELIOGtPVXESyrnDA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } }, "@babel/code-frame": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz", - "integrity": "sha1-vs2AVIJzREDJ0TfkbXc0DmTX9Rs=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz", + "integrity": "sha1-vXHZsZKvl435FYKdOdQJRFZDmgw=", "dev": true, "requires": { - "@babel/highlight": "7.0.0-beta.49" + "@babel/highlight": "7.0.0-beta.51" } }, "@babel/generator": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.49.tgz", - "integrity": "sha1-6c/9qROZaszseTu8JauRvBnQv3o=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.51.tgz", + "integrity": "sha1-bHV1/952HQdIXgS67cA5LG2eMPY=", "dev": true, "requires": { - "@babel/types": "7.0.0-beta.49", - "jsesc": "2.5.1", - "lodash": "4.17.10", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "@babel/types": "7.0.0-beta.51", + "jsesc": "^2.5.1", + "lodash": "^4.17.5", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" }, "dependencies": { "jsesc": { @@ -102,79 +102,79 @@ } }, "@babel/helper-function-name": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.49.tgz", - "integrity": "sha1-olwRGbnwNSeGcBJuAiXAMEHI3jI=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.51.tgz", + "integrity": "sha1-IbSHSiJ8+Z7K/MMKkDAtpaJkBWE=", "dev": true, "requires": { - "@babel/helper-get-function-arity": "7.0.0-beta.49", - "@babel/template": "7.0.0-beta.49", - "@babel/types": "7.0.0-beta.49" + "@babel/helper-get-function-arity": "7.0.0-beta.51", + "@babel/template": "7.0.0-beta.51", + "@babel/types": "7.0.0-beta.51" } }, "@babel/helper-get-function-arity": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.49.tgz", - "integrity": "sha1-z1Aj8y0q2S0Ic3STnOwJUby1FEE=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.51.tgz", + "integrity": "sha1-MoGy0EWvlcFyzpGyCCXYXqRnZBE=", "dev": true, "requires": { - "@babel/types": "7.0.0-beta.49" + "@babel/types": "7.0.0-beta.51" } }, "@babel/helper-split-export-declaration": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.49.tgz", - "integrity": "sha1-QNeO2glo0BGxxShm5XRs+yPldUg=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.51.tgz", + "integrity": "sha1-imw/ZsTSZTUvwHdIT59ugKUauXg=", "dev": true, "requires": { - "@babel/types": "7.0.0-beta.49" + "@babel/types": "7.0.0-beta.51" } }, "@babel/highlight": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.49.tgz", - "integrity": "sha1-lr3GtD4TSCASumaRsQGEktOWIsw=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.51.tgz", + "integrity": "sha1-6IRK4loVlcz9QriWI7Q3bKBtIl0=", "dev": true, "requires": { - "chalk": "2.4.1", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^3.0.0" } }, "@babel/parser": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.49.tgz", - "integrity": "sha1-lE0MW6KBK7FZ7b0iZ0Ov0mUXm9w=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.51.tgz", + "integrity": "sha1-J87C30Cd9gr1gnDtj2qlVAnqhvY=", "dev": true }, "@babel/template": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.49.tgz", - "integrity": "sha1-44q+ghfLl5P0YaUwbXrXRdg+HSc=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.51.tgz", + "integrity": "sha1-lgKkCuvPNXrpZ34lMu9fyBD1+/8=", "dev": true, "requires": { - "@babel/code-frame": "7.0.0-beta.49", - "@babel/parser": "7.0.0-beta.49", - "@babel/types": "7.0.0-beta.49", - "lodash": "4.17.10" + "@babel/code-frame": "7.0.0-beta.51", + "@babel/parser": "7.0.0-beta.51", + "@babel/types": "7.0.0-beta.51", + "lodash": "^4.17.5" } }, "@babel/traverse": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.49.tgz", - "integrity": "sha1-TypzaCoYM07WYl0QCo0nMZ98LWg=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.51.tgz", + "integrity": "sha1-mB2vLOw0emIx06odnhgDsDqqpKg=", "dev": true, "requires": { - "@babel/code-frame": "7.0.0-beta.49", - "@babel/generator": "7.0.0-beta.49", - "@babel/helper-function-name": "7.0.0-beta.49", - "@babel/helper-split-export-declaration": "7.0.0-beta.49", - "@babel/parser": "7.0.0-beta.49", - "@babel/types": "7.0.0-beta.49", - "debug": "3.1.0", - "globals": "11.7.0", - "invariant": "2.2.4", - "lodash": "4.17.10" + "@babel/code-frame": "7.0.0-beta.51", + "@babel/generator": "7.0.0-beta.51", + "@babel/helper-function-name": "7.0.0-beta.51", + "@babel/helper-split-export-declaration": "7.0.0-beta.51", + "@babel/parser": "7.0.0-beta.51", + "@babel/types": "7.0.0-beta.51", + "debug": "^3.1.0", + "globals": "^11.1.0", + "invariant": "^2.2.0", + "lodash": "^4.17.5" }, "dependencies": { "globals": { @@ -186,14 +186,14 @@ } }, "@babel/types": { - "version": "7.0.0-beta.49", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.49.tgz", - "integrity": "sha1-t+Oxw/TUz+Eb34yJ8e/V4WF7h6Y=", + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.51.tgz", + "integrity": "sha1-2AK3tUO1g2x3iqaReXq/APPZfqk=", "dev": true, "requires": { - "esutils": "2.0.2", - "lodash": "4.17.10", - "to-fast-properties": "2.0.0" + "esutils": "^2.0.2", + "lodash": "^4.17.5", + "to-fast-properties": "^2.0.0" }, "dependencies": { "to-fast-properties": { @@ -210,7 +210,7 @@ "integrity": "sha512-htrsRaQX8Iixlsek8zQU7tE8wcsTQJ5UhZkSPEA8slCDAisKpC/2VgU/ucPn32M5/LjGGXRaUEKvEw1Wiuu4zQ==", "dev": true, "requires": { - "arrify": "1.0.1" + "arrify": "^1.0.1" } }, "@google-cloud/common": { @@ -249,7 +249,7 @@ "lodash": "4.17.5", "nyc": "11.4.1", "proxyquire": "1.8.0", - "semver": "5.5.0", + "semver": "^5.5.0", "sinon": "4.3.0", "string": "3.3.3", "supertest": "3.0.0", @@ -269,9 +269,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "is-fullwidth-code-point": { @@ -292,44 +292,43 @@ "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", "dev": true, "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-report": "1.1.2", - "istanbul-lib-source-maps": "1.2.2", - "istanbul-reports": "1.1.3", - "md5-hex": "1.3.0", - "merge-source-map": "1.0.4", - "micromatch": "2.3.11", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.1.1", - "yargs": "10.0.3", - "yargs-parser": "8.0.0" + "archy": "^1.0.0", + "arrify": "^1.0.1", + "caching-transform": "^1.0.0", + "convert-source-map": "^1.3.0", + "debug-log": "^1.0.1", + "default-require-extensions": "^1.0.0", + "find-cache-dir": "^0.1.1", + "find-up": "^2.1.0", + "foreground-child": "^1.5.3", + "glob": "^7.0.6", + "istanbul-lib-coverage": "^1.1.1", + "istanbul-lib-hook": "^1.1.0", + "istanbul-lib-instrument": "^1.9.1", + "istanbul-lib-report": "^1.1.2", + "istanbul-lib-source-maps": "^1.2.2", + "istanbul-reports": "^1.1.3", + "md5-hex": "^1.2.0", + "merge-source-map": "^1.0.2", + "micromatch": "^2.3.11", + "mkdirp": "^0.5.0", + "resolve-from": "^2.0.0", + "rimraf": "^2.5.4", + "signal-exit": "^3.0.1", + "spawn-wrap": "^1.4.2", + "test-exclude": "^4.1.1", + "yargs": "^10.0.3", + "yargs-parser": "^8.0.0" }, "dependencies": { "align-text": { "version": "0.1.4", "bundled": true, "dev": true, - "optional": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { @@ -352,7 +351,7 @@ "bundled": true, "dev": true, "requires": { - "default-require-extensions": "1.0.0" + "default-require-extensions": "^1.0.0" } }, "archy": { @@ -365,7 +364,7 @@ "bundled": true, "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { @@ -393,9 +392,9 @@ "bundled": true, "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" } }, "babel-generator": { @@ -403,14 +402,14 @@ "bundled": true, "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.6", + "trim-right": "^1.0.1" } }, "babel-messages": { @@ -418,7 +417,7 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-runtime": { @@ -426,8 +425,8 @@ "bundled": true, "dev": true, "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -435,11 +434,11 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -447,15 +446,15 @@ "bundled": true, "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { @@ -463,10 +462,10 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -484,7 +483,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -493,9 +492,9 @@ "bundled": true, "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "builtin-modules": { @@ -508,9 +507,9 @@ "bundled": true, "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" } }, "camelcase": { @@ -525,8 +524,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -534,11 +533,11 @@ "bundled": true, "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "cliui": { @@ -547,8 +546,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -590,8 +589,8 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "debug": { @@ -617,7 +616,7 @@ "bundled": true, "dev": true, "requires": { - "strip-bom": "2.0.0" + "strip-bom": "^2.0.0" } }, "detect-indent": { @@ -625,7 +624,7 @@ "bundled": true, "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "error-ex": { @@ -633,7 +632,7 @@ "bundled": true, "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "escape-string-regexp": { @@ -651,13 +650,13 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -665,9 +664,9 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } @@ -677,7 +676,7 @@ "bundled": true, "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { @@ -685,7 +684,7 @@ "bundled": true, "dev": true, "requires": { - "fill-range": "2.2.3" + "fill-range": "^2.1.0" } }, "extglob": { @@ -693,7 +692,7 @@ "bundled": true, "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "filename-regex": { @@ -706,11 +705,11 @@ "bundled": true, "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^1.1.3", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "find-cache-dir": { @@ -718,9 +717,9 @@ "bundled": true, "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { @@ -728,7 +727,7 @@ "bundled": true, "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "for-in": { @@ -741,7 +740,7 @@ "bundled": true, "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreground-child": { @@ -749,8 +748,8 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" + "cross-spawn": "^4", + "signal-exit": "^3.0.0" } }, "fs.realpath": { @@ -773,12 +772,12 @@ "bundled": true, "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -786,8 +785,8 @@ "bundled": true, "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" } }, "glob-parent": { @@ -795,7 +794,7 @@ "bundled": true, "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "globals": { @@ -813,10 +812,10 @@ "bundled": true, "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "source-map": { @@ -824,7 +823,7 @@ "bundled": true, "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -834,7 +833,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { @@ -857,8 +856,8 @@ "bundled": true, "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -871,7 +870,7 @@ "bundled": true, "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -894,7 +893,7 @@ "bundled": true, "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-dotfile": { @@ -907,7 +906,7 @@ "bundled": true, "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -925,7 +924,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -933,7 +932,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { @@ -941,7 +940,7 @@ "bundled": true, "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-number": { @@ -949,7 +948,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-posix-bracket": { @@ -1000,7 +999,7 @@ "bundled": true, "dev": true, "requires": { - "append-transform": "0.4.0" + "append-transform": "^0.4.0" } }, "istanbul-lib-instrument": { @@ -1008,13 +1007,13 @@ "bundled": true, "dev": true, "requires": { - "babel-generator": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", - "semver": "5.4.1" + "babel-generator": "^6.18.0", + "babel-template": "^6.16.0", + "babel-traverse": "^6.18.0", + "babel-types": "^6.18.0", + "babylon": "^6.18.0", + "istanbul-lib-coverage": "^1.1.1", + "semver": "^5.3.0" } }, "istanbul-lib-report": { @@ -1022,10 +1021,10 @@ "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "istanbul-lib-coverage": "^1.1.1", + "mkdirp": "^0.5.1", + "path-parse": "^1.0.5", + "supports-color": "^3.1.2" }, "dependencies": { "supports-color": { @@ -1033,7 +1032,7 @@ "bundled": true, "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -1043,11 +1042,11 @@ "bundled": true, "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "debug": "^3.1.0", + "istanbul-lib-coverage": "^1.1.1", + "mkdirp": "^0.5.1", + "rimraf": "^2.6.1", + "source-map": "^0.5.3" }, "dependencies": { "debug": { @@ -1065,7 +1064,7 @@ "bundled": true, "dev": true, "requires": { - "handlebars": "4.0.11" + "handlebars": "^4.0.3" } }, "js-tokens": { @@ -1083,7 +1082,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-cache": { @@ -1097,7 +1096,7 @@ "bundled": true, "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "load-json-file": { @@ -1105,11 +1104,11 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "locate-path": { @@ -1117,8 +1116,8 @@ "bundled": true, "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" }, "dependencies": { "path-exists": { @@ -1136,15 +1135,14 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "loose-envify": { "version": "1.3.1", "bundled": true, "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "lru-cache": { @@ -1152,8 +1150,8 @@ "bundled": true, "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "md5-hex": { @@ -1161,7 +1159,7 @@ "bundled": true, "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { @@ -1174,7 +1172,7 @@ "bundled": true, "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "^1.0.0" } }, "merge-source-map": { @@ -1182,7 +1180,7 @@ "bundled": true, "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } }, "micromatch": { @@ -1190,19 +1188,19 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, "mimic-fn": { @@ -1215,7 +1213,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -1241,10 +1239,10 @@ "bundled": true, "dev": true, "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -1252,7 +1250,7 @@ "bundled": true, "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "npm-run-path": { @@ -1260,7 +1258,7 @@ "bundled": true, "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { @@ -1278,8 +1276,8 @@ "bundled": true, "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "once": { @@ -1287,7 +1285,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "optimist": { @@ -1295,8 +1293,8 @@ "bundled": true, "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "os-homedir": { @@ -1309,9 +1307,9 @@ "bundled": true, "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "p-finally": { @@ -1329,7 +1327,7 @@ "bundled": true, "dev": true, "requires": { - "p-limit": "1.1.0" + "p-limit": "^1.1.0" } }, "parse-glob": { @@ -1337,10 +1335,10 @@ "bundled": true, "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" } }, "parse-json": { @@ -1348,7 +1346,7 @@ "bundled": true, "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "path-exists": { @@ -1356,7 +1354,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -1379,9 +1377,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -1399,7 +1397,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -1407,7 +1405,7 @@ "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" }, "dependencies": { "find-up": { @@ -1415,8 +1413,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } @@ -1436,8 +1434,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-number": { @@ -1445,7 +1443,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1453,7 +1451,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1463,7 +1461,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1473,9 +1471,9 @@ "bundled": true, "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -1483,8 +1481,8 @@ "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -1492,8 +1490,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } @@ -1508,7 +1506,7 @@ "bundled": true, "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "remove-trailing-separator": { @@ -1531,7 +1529,7 @@ "bundled": true, "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "require-directory": { @@ -1555,7 +1553,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -1563,7 +1561,7 @@ "bundled": true, "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "semver": { @@ -1581,7 +1579,7 @@ "bundled": true, "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -1609,12 +1607,12 @@ "bundled": true, "dev": true, "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.0" + "foreground-child": "^1.5.6", + "mkdirp": "^0.5.0", + "os-homedir": "^1.0.1", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" } }, "spdx-correct": { @@ -1622,7 +1620,7 @@ "bundled": true, "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "spdx-license-ids": "^1.0.2" } }, "spdx-expression-parse": { @@ -1640,8 +1638,8 @@ "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -1659,7 +1657,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -1669,7 +1667,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -1677,7 +1675,7 @@ "bundled": true, "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { @@ -1695,11 +1693,11 @@ "bundled": true, "dev": true, "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" + "arrify": "^1.0.1", + "micromatch": "^2.3.11", + "object-assign": "^4.1.0", + "read-pkg-up": "^1.0.1", + "require-main-filename": "^1.0.1" } }, "to-fast-properties": { @@ -1718,9 +1716,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "yargs": { @@ -1729,9 +1727,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -1748,8 +1746,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "~1.0.0", + "spdx-expression-parse": "~1.0.0" } }, "which": { @@ -1757,7 +1755,7 @@ "bundled": true, "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -1781,8 +1779,8 @@ "bundled": true, "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" }, "dependencies": { "string-width": { @@ -1790,9 +1788,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } } } @@ -1807,9 +1805,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } }, "y18n": { @@ -1827,18 +1825,18 @@ "bundled": true, "dev": true, "requires": { - "cliui": "3.2.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "8.0.0" + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^8.0.0" }, "dependencies": { "cliui": { @@ -1846,9 +1844,9 @@ "bundled": true, "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" }, "dependencies": { "string-width": { @@ -1856,9 +1854,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } } } @@ -1870,7 +1868,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { @@ -1888,9 +1886,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "proxyquire": { @@ -1899,9 +1897,9 @@ "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", "dev": true, "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.1.7" + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.0", + "resolve": "~1.1.7" } }, "string-width": { @@ -1910,8 +1908,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -1920,7 +1918,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "yargs": { @@ -1929,18 +1927,18 @@ "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" } } } @@ -1951,10 +1949,10 @@ "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", "dev": true, "requires": { - "chalk": "0.4.0", - "date-time": "0.1.1", - "pretty-ms": "0.2.2", - "text-table": "0.2.0" + "chalk": "^0.4.0", + "date-time": "^0.1.1", + "pretty-ms": "^0.2.1", + "text-table": "^0.2.0" }, "dependencies": { "ansi-styles": { @@ -1969,9 +1967,9 @@ "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { - "ansi-styles": "1.0.0", - "has-color": "0.1.7", - "strip-ansi": "0.1.1" + "ansi-styles": "~1.0.0", + "has-color": "~0.1.0", + "strip-ansi": "~0.1.0" } }, "pretty-ms": { @@ -1980,7 +1978,7 @@ "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", "dev": true, "requires": { - "parse-ms": "0.1.2" + "parse-ms": "^0.1.0" } }, "strip-ansi": { @@ -1996,8 +1994,8 @@ "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "requires": { - "call-me-maybe": "1.0.1", - "glob-to-regexp": "0.3.0" + "call-me-maybe": "^1.0.1", + "glob-to-regexp": "^0.3.0" } }, "@nodelib/fs.stat": { @@ -2030,8 +2028,8 @@ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/inquire": "1.1.0" + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" } }, "@protobufjs/float": { @@ -2101,9 +2099,9 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "8.10.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz", - "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==" + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz", + "integrity": "sha512-baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg==" }, "@types/request": { "version": "2.47.1", @@ -2145,10 +2143,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "ajv-keywords": { @@ -2162,11 +2160,10 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, - "optional": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" }, "dependencies": { "kind-of": { @@ -2174,9 +2171,8 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, - "optional": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -2193,7 +2189,7 @@ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, "requires": { - "string-width": "2.1.1" + "string-width": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -2214,8 +2210,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -2224,7 +2220,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -2246,7 +2242,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.2" + "color-convert": "^1.9.0" } }, "anymatch": { @@ -2255,8 +2251,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" }, "dependencies": { "arr-diff": { @@ -2265,7 +2261,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -2280,9 +2276,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "expand-brackets": { @@ -2291,7 +2287,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -2300,7 +2296,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-extglob": { @@ -2315,7 +2311,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "kind-of": { @@ -2324,7 +2320,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "micromatch": { @@ -2333,19 +2329,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } } } @@ -2356,7 +2352,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "argv": { @@ -2414,7 +2410,7 @@ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -2437,8 +2433,8 @@ "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", "requires": { - "colour": "0.7.1", - "optjs": "3.2.2" + "colour": "~0.7.1", + "optjs": "~3.2.2" } }, "asn1": { @@ -2461,7 +2457,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { - "lodash": "4.17.10" + "lodash": "^4.17.10" } }, "async-each": { @@ -2491,89 +2487,89 @@ "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", "dev": true, "requires": { - "@ava/babel-preset-stage-4": "1.1.0", - "@ava/babel-preset-transform-test-files": "3.0.0", - "@ava/write-file-atomic": "2.2.0", - "@concordance/react": "1.0.0", - "@ladjs/time-require": "0.1.4", - "ansi-escapes": "3.1.0", - "ansi-styles": "3.2.1", - "arr-flatten": "1.1.0", - "array-union": "1.0.2", - "array-uniq": "1.0.3", - "arrify": "1.0.1", - "auto-bind": "1.2.1", - "ava-init": "0.2.1", - "babel-core": "6.26.3", - "babel-generator": "6.26.1", - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "bluebird": "3.5.1", - "caching-transform": "1.0.1", - "chalk": "2.4.1", - "chokidar": "1.7.0", - "clean-stack": "1.3.0", - "clean-yaml-object": "0.1.0", - "cli-cursor": "2.1.0", - "cli-spinners": "1.3.1", - "cli-truncate": "1.1.0", - "co-with-promise": "4.6.0", - "code-excerpt": "2.1.1", - "common-path-prefix": "1.0.0", - "concordance": "3.0.0", - "convert-source-map": "1.5.1", - "core-assert": "0.2.1", - "currently-unhandled": "0.4.1", - "debug": "3.1.0", - "dot-prop": "4.2.0", - "empower-core": "0.6.2", - "equal-length": "1.0.1", - "figures": "2.0.0", - "find-cache-dir": "1.0.0", - "fn-name": "2.0.1", - "get-port": "3.2.0", - "globby": "6.1.0", - "has-flag": "2.0.0", - "hullabaloo-config-manager": "1.1.1", - "ignore-by-default": "1.0.1", - "import-local": "0.1.1", - "indent-string": "3.2.0", - "is-ci": "1.1.0", - "is-generator-fn": "1.0.0", - "is-obj": "1.0.1", - "is-observable": "1.1.0", - "is-promise": "2.1.0", - "last-line-stream": "1.0.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.debounce": "4.0.8", - "lodash.difference": "4.5.0", - "lodash.flatten": "4.4.0", - "loud-rejection": "1.6.0", - "make-dir": "1.3.0", - "matcher": "1.1.1", - "md5-hex": "2.0.0", - "meow": "3.7.0", - "ms": "2.0.0", - "multimatch": "2.1.0", - "observable-to-promise": "0.5.0", - "option-chain": "1.0.0", - "package-hash": "2.0.0", - "pkg-conf": "2.1.0", - "plur": "2.1.2", - "pretty-ms": "3.2.0", - "require-precompiled": "0.1.0", - "resolve-cwd": "2.0.0", - "safe-buffer": "5.1.2", - "semver": "5.5.0", - "slash": "1.0.0", - "source-map-support": "0.5.6", - "stack-utils": "1.0.1", - "strip-ansi": "4.0.0", - "strip-bom-buf": "1.0.0", - "supertap": "1.0.0", - "supports-color": "5.4.0", - "trim-off-newlines": "1.0.1", - "unique-temp-dir": "1.0.0", - "update-notifier": "2.5.0" + "@ava/babel-preset-stage-4": "^1.1.0", + "@ava/babel-preset-transform-test-files": "^3.0.0", + "@ava/write-file-atomic": "^2.2.0", + "@concordance/react": "^1.0.0", + "@ladjs/time-require": "^0.1.4", + "ansi-escapes": "^3.0.0", + "ansi-styles": "^3.1.0", + "arr-flatten": "^1.0.1", + "array-union": "^1.0.1", + "array-uniq": "^1.0.2", + "arrify": "^1.0.0", + "auto-bind": "^1.1.0", + "ava-init": "^0.2.0", + "babel-core": "^6.17.0", + "babel-generator": "^6.26.0", + "babel-plugin-syntax-object-rest-spread": "^6.13.0", + "bluebird": "^3.0.0", + "caching-transform": "^1.0.0", + "chalk": "^2.0.1", + "chokidar": "^1.4.2", + "clean-stack": "^1.1.1", + "clean-yaml-object": "^0.1.0", + "cli-cursor": "^2.1.0", + "cli-spinners": "^1.0.0", + "cli-truncate": "^1.0.0", + "co-with-promise": "^4.6.0", + "code-excerpt": "^2.1.1", + "common-path-prefix": "^1.0.0", + "concordance": "^3.0.0", + "convert-source-map": "^1.5.1", + "core-assert": "^0.2.0", + "currently-unhandled": "^0.4.1", + "debug": "^3.0.1", + "dot-prop": "^4.1.0", + "empower-core": "^0.6.1", + "equal-length": "^1.0.0", + "figures": "^2.0.0", + "find-cache-dir": "^1.0.0", + "fn-name": "^2.0.0", + "get-port": "^3.0.0", + "globby": "^6.0.0", + "has-flag": "^2.0.0", + "hullabaloo-config-manager": "^1.1.0", + "ignore-by-default": "^1.0.0", + "import-local": "^0.1.1", + "indent-string": "^3.0.0", + "is-ci": "^1.0.7", + "is-generator-fn": "^1.0.0", + "is-obj": "^1.0.0", + "is-observable": "^1.0.0", + "is-promise": "^2.1.0", + "last-line-stream": "^1.0.0", + "lodash.clonedeepwith": "^4.5.0", + "lodash.debounce": "^4.0.3", + "lodash.difference": "^4.3.0", + "lodash.flatten": "^4.2.0", + "loud-rejection": "^1.2.0", + "make-dir": "^1.0.0", + "matcher": "^1.0.0", + "md5-hex": "^2.0.0", + "meow": "^3.7.0", + "ms": "^2.0.0", + "multimatch": "^2.1.0", + "observable-to-promise": "^0.5.0", + "option-chain": "^1.0.0", + "package-hash": "^2.0.0", + "pkg-conf": "^2.0.0", + "plur": "^2.0.0", + "pretty-ms": "^3.0.0", + "require-precompiled": "^0.1.0", + "resolve-cwd": "^2.0.0", + "safe-buffer": "^5.1.1", + "semver": "^5.4.1", + "slash": "^1.0.0", + "source-map-support": "^0.5.0", + "stack-utils": "^1.0.1", + "strip-ansi": "^4.0.0", + "strip-bom-buf": "^1.0.0", + "supertap": "^1.0.0", + "supports-color": "^5.0.0", + "trim-off-newlines": "^1.0.1", + "unique-temp-dir": "^1.0.0", + "update-notifier": "^2.3.0" }, "dependencies": { "ansi-regex": { @@ -2589,7 +2585,7 @@ "dev": true, "requires": { "call-signature": "0.0.2", - "core-js": "2.5.7" + "core-js": "^2.0.0" } }, "globby": { @@ -2598,11 +2594,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -2623,7 +2619,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "strip-ansi": { @@ -2632,7 +2628,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -2643,11 +2639,11 @@ "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", "dev": true, "requires": { - "arr-exclude": "1.0.0", - "execa": "0.7.0", - "has-yarn": "1.0.0", - "read-pkg-up": "2.0.0", - "write-pkg": "3.2.0" + "arr-exclude": "^1.0.0", + "execa": "^0.7.0", + "has-yarn": "^1.0.0", + "read-pkg-up": "^2.0.0", + "write-pkg": "^3.1.0" } }, "aws-sign2": { @@ -2665,8 +2661,8 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { - "follow-redirects": "1.5.0", - "is-buffer": "1.1.6" + "follow-redirects": "^1.3.0", + "is-buffer": "^1.1.5" } }, "babel-code-frame": { @@ -2675,9 +2671,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "ansi-styles": { @@ -2692,11 +2688,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "supports-color": { @@ -2713,25 +2709,25 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.1", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.10", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.1", + "debug": "^2.6.9", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.8", + "slash": "^1.0.0", + "source-map": "^0.5.7" }, "dependencies": { "debug": { @@ -2751,14 +2747,14 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.10", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" }, "dependencies": { "jsesc": { @@ -2775,9 +2771,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-call-delegate": { @@ -2786,10 +2782,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-explode-assignable-expression": { @@ -2798,9 +2794,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { @@ -2809,11 +2805,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { @@ -2822,8 +2818,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-hoist-variables": { @@ -2832,8 +2828,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-regex": { @@ -2842,9 +2838,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.10" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-remap-async-to-generator": { @@ -2853,11 +2849,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helpers": { @@ -2866,8 +2862,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-messages": { @@ -2876,7 +2872,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-check-es2015-constants": { @@ -2885,7 +2881,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-espower": { @@ -2894,13 +2890,13 @@ "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", "dev": true, "requires": { - "babel-generator": "6.26.1", - "babylon": "6.18.0", - "call-matcher": "1.0.1", - "core-js": "2.5.7", - "espower-location-detector": "1.0.0", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "babel-generator": "^6.1.0", + "babylon": "^6.1.0", + "call-matcher": "^1.0.0", + "core-js": "^2.0.0", + "espower-location-detector": "^1.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.1.1" } }, "babel-plugin-syntax-async-functions": { @@ -2933,9 +2929,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-destructuring": { @@ -2944,7 +2940,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -2953,9 +2949,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -2964,10 +2960,10 @@ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -2976,12 +2972,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-spread": { @@ -2990,7 +2986,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -2999,9 +2995,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -3010,9 +3006,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -3021,9 +3017,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-strict-mode": { @@ -3032,8 +3028,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-register": { @@ -3042,13 +3038,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "6.26.3", - "babel-runtime": "6.26.0", - "core-js": "2.5.7", - "home-or-tmp": "2.0.0", - "lodash": "4.17.10", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.17.4", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.15" }, "dependencies": { "source-map-support": { @@ -3057,7 +3053,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } } } @@ -3068,8 +3064,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.7", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -3078,11 +3074,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.10" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -3091,15 +3087,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.10" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" }, "dependencies": { "debug": { @@ -3119,10 +3115,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.10", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -3141,13 +3137,13 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -3155,7 +3151,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -3163,7 +3159,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -3171,7 +3167,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -3179,9 +3175,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -3192,7 +3188,7 @@ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "binary-extensions": { @@ -3213,13 +3209,13 @@ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", "dev": true, "requires": { - "ansi-align": "2.0.0", - "camelcase": "4.1.0", - "chalk": "2.4.1", - "cli-boxes": "1.0.0", - "string-width": "2.1.1", - "term-size": "1.2.0", - "widest-line": "2.0.0" + "ansi-align": "^2.0.0", + "camelcase": "^4.0.0", + "chalk": "^2.0.1", + "cli-boxes": "^1.0.0", + "string-width": "^2.0.0", + "term-size": "^1.2.0", + "widest-line": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -3246,8 +3242,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -3256,7 +3252,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -3266,7 +3262,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -3275,16 +3271,16 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -3292,7 +3288,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -3331,7 +3327,7 @@ "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", "requires": { - "long": "3.2.0" + "long": "~3" }, "dependencies": { "long": { @@ -3346,15 +3342,15 @@ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "cacheable-request": { @@ -3386,9 +3382,9 @@ "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" }, "dependencies": { "md5-hex": { @@ -3397,7 +3393,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "write-file-atomic": { @@ -3406,9 +3402,9 @@ "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } } } @@ -3419,10 +3415,10 @@ "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", "dev": true, "requires": { - "core-js": "2.5.7", - "deep-equal": "1.0.1", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "core-js": "^2.0.0", + "deep-equal": "^1.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.0.0" } }, "call-me-maybe": { @@ -3461,8 +3457,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "capture-stack-trace": { @@ -3482,7 +3478,7 @@ "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", "dev": true, "requires": { - "underscore-contrib": "0.3.0" + "underscore-contrib": "~0.3.0" } }, "center-align": { @@ -3492,8 +3488,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -3502,9 +3498,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "chardet": { @@ -3519,15 +3515,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -3536,7 +3532,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -3551,7 +3547,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -3573,10 +3569,10 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -3584,7 +3580,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -3613,7 +3609,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "^2.0.0" } }, "cli-spinners": { @@ -3628,8 +3624,8 @@ "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", "dev": true, "requires": { - "slice-ansi": "1.0.0", - "string-width": "2.1.1" + "slice-ansi": "^1.0.0", + "string-width": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -3650,8 +3646,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -3660,7 +3656,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -3676,9 +3672,9 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone-response": { @@ -3687,7 +3683,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "1.0.0" + "mimic-response": "^1.0.0" } }, "co": { @@ -3701,7 +3697,7 @@ "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", "dev": true, "requires": { - "pinkie-promise": "1.0.0" + "pinkie-promise": "^1.0.0" } }, "code-excerpt": { @@ -3710,7 +3706,7 @@ "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", "dev": true, "requires": { - "convert-to-spaces": "1.0.2" + "convert-to-spaces": "^1.0.1" } }, "code-point-at": { @@ -3725,7 +3721,7 @@ "dev": true, "requires": { "argv": "0.0.2", - "request": "2.87.0", + "request": "^2.81.0", "urlgrey": "0.4.4" } }, @@ -3734,8 +3730,8 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color-convert": { @@ -3769,7 +3765,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -3806,17 +3802,17 @@ "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", "dev": true, "requires": { - "date-time": "2.1.0", - "esutils": "2.0.2", - "fast-diff": "1.1.2", - "function-name-support": "0.2.0", - "js-string-escape": "1.0.1", - "lodash.clonedeep": "4.5.0", - "lodash.flattendeep": "4.4.0", - "lodash.merge": "4.6.1", - "md5-hex": "2.0.0", - "semver": "5.5.0", - "well-known-symbols": "1.0.0" + "date-time": "^2.1.0", + "esutils": "^2.0.2", + "fast-diff": "^1.1.1", + "function-name-support": "^0.2.0", + "js-string-escape": "^1.0.1", + "lodash.clonedeep": "^4.5.0", + "lodash.flattendeep": "^4.4.0", + "lodash.merge": "^4.6.0", + "md5-hex": "^2.0.0", + "semver": "^5.3.0", + "well-known-symbols": "^1.0.0" }, "dependencies": { "date-time": { @@ -3825,7 +3821,7 @@ "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", "dev": true, "requires": { - "time-zone": "1.0.0" + "time-zone": "^1.0.0" } } } @@ -3836,12 +3832,12 @@ "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { - "dot-prop": "4.2.0", - "graceful-fs": "4.1.11", - "make-dir": "1.3.0", - "unique-string": "1.0.0", - "write-file-atomic": "2.3.0", - "xdg-basedir": "3.0.0" + "dot-prop": "^4.1.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "unique-string": "^1.0.0", + "write-file-atomic": "^2.0.0", + "xdg-basedir": "^3.0.0" } }, "convert-source-map": { @@ -3873,8 +3869,8 @@ "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", "dev": true, "requires": { - "buf-compare": "1.0.1", - "is-error": "2.2.1" + "buf-compare": "^1.0.0", + "is-error": "^2.2.0" } }, "core-js": { @@ -3893,7 +3889,7 @@ "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "dev": true, "requires": { - "capture-stack-trace": "1.0.0" + "capture-stack-trace": "^1.0.0" } }, "cross-spawn": { @@ -3902,9 +3898,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "crypto-random-string": { @@ -3919,7 +3915,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "d": { @@ -3928,7 +3924,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.45" + "es5-ext": "^0.10.9" } }, "dashdash": { @@ -3936,7 +3932,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "date-time": { @@ -3969,7 +3965,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "1.0.0" + "mimic-response": "^1.0.0" } }, "deep-equal": { @@ -3995,8 +3991,8 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.12" + "foreach": "^2.0.5", + "object-keys": "^1.0.8" } }, "define-property": { @@ -4004,8 +4000,8 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4013,7 +4009,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4021,7 +4017,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4029,9 +4025,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4093,7 +4089,7 @@ "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", "requires": { - "p-defer": "1.0.0" + "p-defer": "^1.0.0" } }, "delayed-stream": { @@ -4107,7 +4103,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "diff": { @@ -4126,8 +4122,8 @@ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" + "arrify": "^1.0.1", + "path-type": "^3.0.0" } }, "doctrine": { @@ -4145,8 +4141,8 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -4169,7 +4165,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -4178,8 +4174,8 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "dot-prop": { @@ -4188,7 +4184,7 @@ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { - "is-obj": "1.0.1" + "is-obj": "^1.0.0" } }, "duplexer3": { @@ -4202,10 +4198,10 @@ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "eastasianwidth": { @@ -4219,7 +4215,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "ecdsa-sig-formatter": { @@ -4227,7 +4223,7 @@ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz", "integrity": "sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "empower": { @@ -4235,8 +4231,8 @@ "resolved": "https://registry.npmjs.org/empower/-/empower-1.3.0.tgz", "integrity": "sha512-tP2WqM7QzrPguCCQEQfFFDF+6Pw6YWLQal3+GHQaV+0uIr0S+jyREQPWljE02zFCYPFYLZ3LosiRV+OzTrxPpQ==", "requires": { - "core-js": "2.5.7", - "empower-core": "1.2.0" + "core-js": "^2.0.0", + "empower-core": "^1.2.0" } }, "empower-assert": { @@ -4245,7 +4241,7 @@ "integrity": "sha512-Ylck0Q6p8y/LpNzYeBccaxAPm2ZyuqBgErgZpO9KT0HuQWF0sJckBKCLmgS1/DEXEiyBi9XtYh3clZm5cAdARw==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.2.0" } }, "empower-core": { @@ -4254,7 +4250,7 @@ "integrity": "sha512-g6+K6Geyc1o6FdXs9HwrXleCFan7d66G5xSCfSF7x1mJDCes6t0om9lFQG3zOrzh3Bkb/45N0cZ5Gqsf7YrzGQ==", "requires": { "call-signature": "0.0.2", - "core-js": "2.5.7" + "core-js": "^2.0.0" } }, "end-of-stream": { @@ -4262,7 +4258,7 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "ent": { @@ -4288,7 +4284,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es-abstract": { @@ -4321,9 +4317,9 @@ "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", "dev": true, "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.1", + "next-tick": "1" } }, "es6-error": { @@ -4338,9 +4334,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, "es6-map": { @@ -4349,12 +4345,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", + "es6-set": "~0.1.5", + "es6-symbol": "~3.1.1", + "event-emitter": "~0.3.5" } }, "es6-set": { @@ -4363,11 +4359,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "event-emitter": "~0.3.5" } }, "es6-symbol": { @@ -4376,8 +4372,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45" + "d": "1", + "es5-ext": "~0.10.14" } }, "es6-weak-map": { @@ -4386,10 +4382,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.14", + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" } }, "escallmatch": { @@ -4398,8 +4394,8 @@ "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", "dev": true, "requires": { - "call-matcher": "1.0.1", - "esprima": "2.7.3" + "call-matcher": "^1.0.0", + "esprima": "^2.0.0" }, "dependencies": { "esprima": { @@ -4422,11 +4418,11 @@ "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==", "dev": true, "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.6.1" + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "dependencies": { "esprima": { @@ -4450,10 +4446,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "es6-map": "^0.1.3", + "es6-weak-map": "^2.0.1", + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint": { @@ -4568,7 +4564,7 @@ "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", "dev": true, "requires": { - "get-stdin": "5.0.1" + "get-stdin": "^5.0.1" }, "dependencies": { "get-stdin": { @@ -4585,10 +4581,10 @@ "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", "dev": true, "requires": { - "ignore": "3.3.10", - "minimatch": "3.0.4", - "resolve": "1.8.1", - "semver": "5.5.0" + "ignore": "^3.3.6", + "minimatch": "^3.0.4", + "resolve": "^1.3.3", + "semver": "^5.4.1" }, "dependencies": { "resolve": { @@ -4597,7 +4593,7 @@ "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } } } @@ -4608,8 +4604,8 @@ "integrity": "sha512-wNZ2z0oVCWnf+3BSI7roS+z4gGu2AwcPKUek+SlLZMZg+X0KbZLsB2knul7fd0K3iuIp402HIYzm4f2+OyfXxA==", "dev": true, "requires": { - "fast-diff": "1.1.2", - "jest-docblock": "21.2.0" + "fast-diff": "^1.1.1", + "jest-docblock": "^21.0.0" } }, "eslint-scope": { @@ -4634,16 +4630,16 @@ "integrity": "sha512-F4TY1qYJB1aUyzB03NsZksZzUQmQoEBaTUjRJGR30GxbkbjKI41NhCyYjrF+bGgWN7x/ZsczYppRpz/0WdI0ug==", "dev": true, "requires": { - "array-find": "1.0.0", - "escallmatch": "1.5.0", - "escodegen": "1.10.0", - "escope": "3.6.0", - "espower-location-detector": "1.0.0", - "espurify": "1.8.0", - "estraverse": "4.2.0", - "source-map": "0.5.7", - "type-name": "2.0.2", - "xtend": "4.0.1" + "array-find": "^1.0.0", + "escallmatch": "^1.5.0", + "escodegen": "^1.7.0", + "escope": "^3.3.0", + "espower-location-detector": "^1.0.0", + "espurify": "^1.3.0", + "estraverse": "^4.1.0", + "source-map": "^0.5.0", + "type-name": "^2.0.0", + "xtend": "^4.0.0" } }, "espower-loader": { @@ -4652,11 +4648,11 @@ "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", "dev": true, "requires": { - "convert-source-map": "1.5.1", - "espower-source": "2.3.0", - "minimatch": "3.0.4", - "source-map-support": "0.4.18", - "xtend": "4.0.1" + "convert-source-map": "^1.1.0", + "espower-source": "^2.0.0", + "minimatch": "^3.0.0", + "source-map-support": "^0.4.0", + "xtend": "^4.0.0" }, "dependencies": { "source-map-support": { @@ -4665,7 +4661,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } } } @@ -4676,10 +4672,10 @@ "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", "dev": true, "requires": { - "is-url": "1.2.4", - "path-is-absolute": "1.0.1", - "source-map": "0.5.7", - "xtend": "4.0.1" + "is-url": "^1.2.1", + "path-is-absolute": "^1.0.0", + "source-map": "^0.5.0", + "xtend": "^4.0.0" } }, "espower-source": { @@ -4688,17 +4684,17 @@ "integrity": "sha512-Wc4kC4zUAEV7Qt31JRPoBUc5jjowHRylml2L2VaDQ1XEbnqQofGWx+gPR03TZAPokAMl5dqyL36h3ITyMXy3iA==", "dev": true, "requires": { - "acorn": "5.7.1", - "acorn-es7-plugin": "1.1.7", - "convert-source-map": "1.5.1", - "empower-assert": "1.1.0", - "escodegen": "1.10.0", - "espower": "2.1.1", - "estraverse": "4.2.0", - "merge-estraverse-visitors": "1.0.0", - "multi-stage-sourcemap": "0.2.1", - "path-is-absolute": "1.0.1", - "xtend": "4.0.1" + "acorn": "^5.0.0", + "acorn-es7-plugin": "^1.0.10", + "convert-source-map": "^1.1.1", + "empower-assert": "^1.0.0", + "escodegen": "^1.10.0", + "espower": "^2.1.1", + "estraverse": "^4.0.0", + "merge-estraverse-visitors": "^1.0.0", + "multi-stage-sourcemap": "^0.2.1", + "path-is-absolute": "^1.0.0", + "xtend": "^4.0.0" } }, "espree": { @@ -4722,7 +4718,7 @@ "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.0.tgz", "integrity": "sha512-jdkJG9jswjKCCDmEridNUuIQei9algr+o66ZZ19610ZoBsiWLRsQGNYS4HGez3Z/DsR0lhANGAqiwBUclPuNag==", "requires": { - "core-js": "2.5.7" + "core-js": "^2.0.0" } }, "esquery": { @@ -4740,7 +4736,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.1.0" } }, "estraverse": { @@ -4760,8 +4756,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45" + "d": "1", + "es5-ext": "~0.10.14" } }, "execa": { @@ -4770,13 +4766,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "expand-brackets": { @@ -4784,13 +4780,13 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "debug": { @@ -4806,7 +4802,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -4814,7 +4810,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -4825,7 +4821,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.4" + "fill-range": "^2.1.0" }, "dependencies": { "fill-range": { @@ -4834,11 +4830,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.0.0", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^3.0.0", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "is-number": { @@ -4847,7 +4843,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "isobject": { @@ -4865,7 +4861,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -4880,8 +4876,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -4889,7 +4885,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -4910,14 +4906,14 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -4925,7 +4921,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -4933,7 +4929,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -4941,7 +4937,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4949,7 +4945,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4957,9 +4953,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4985,12 +4981,12 @@ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz", "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==", "requires": { - "@mrmlnc/readdir-enhanced": "2.2.1", - "@nodelib/fs.stat": "1.1.0", - "glob-parent": "3.1.0", - "is-glob": "4.0.0", - "merge2": "1.2.2", - "micromatch": "3.1.10" + "@mrmlnc/readdir-enhanced": "^2.2.1", + "@nodelib/fs.stat": "^1.0.1", + "glob-parent": "^3.1.0", + "is-glob": "^4.0.0", + "merge2": "^1.2.1", + "micromatch": "^3.1.10" } }, "fast-json-stable-stringify": { @@ -5010,7 +5006,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-entry-cache": { @@ -5035,8 +5031,8 @@ "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", "dev": true, "requires": { - "is-object": "1.0.1", - "merge-descriptors": "1.0.1" + "is-object": "~1.0.1", + "merge-descriptors": "~1.0.0" } }, "fill-range": { @@ -5044,10 +5040,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -5055,7 +5051,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -5066,9 +5062,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "1.3.0", - "pkg-dir": "2.0.0" + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" } }, "find-up": { @@ -5077,7 +5073,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "flat-cache": { @@ -5103,7 +5099,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "requires": { - "debug": "3.1.0" + "debug": "^3.1.0" } }, "for-in": { @@ -5117,7 +5113,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreach": { @@ -5135,9 +5131,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "0.4.0", + "asynckit": "^0.4.0", "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "mime-types": "^2.1.12" } }, "formidable": { @@ -5151,7 +5147,7 @@ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "from2": { @@ -5160,8 +5156,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" } }, "fs-extra": { @@ -5170,9 +5166,9 @@ "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs.realpath": { @@ -5187,8 +5183,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { @@ -5214,23 +5210,21 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -5243,20 +5237,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5297,7 +5288,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -5312,14 +5303,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -5328,12 +5319,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -5348,7 +5339,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -5357,7 +5348,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -5366,15 +5357,14 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5386,9 +5376,8 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -5401,25 +5390,22 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -5428,14 +5414,13 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5452,9 +5437,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -5463,16 +5448,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -5481,8 +5466,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -5497,8 +5482,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -5507,17 +5492,16 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5529,9 +5513,8 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -5552,8 +5535,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -5574,10 +5557,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -5594,13 +5577,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -5609,7 +5592,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -5651,11 +5634,10 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -5664,7 +5646,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -5672,7 +5654,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -5687,13 +5669,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -5708,7 +5690,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -5746,8 +5728,8 @@ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", "requires": { - "axios": "0.18.0", - "extend": "3.0.1", + "axios": "^0.18.0", + "extend": "^3.0.1", "retry-axios": "0.3.2" } }, @@ -5785,7 +5767,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -5793,12 +5775,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -5807,8 +5789,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -5817,7 +5799,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -5832,7 +5814,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -5842,8 +5824,8 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -5851,7 +5833,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -5867,7 +5849,7 @@ "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", "dev": true, "requires": { - "ini": "1.3.5" + "ini": "^1.3.4" } }, "globals": { @@ -5881,13 +5863,13 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "fast-glob": "2.2.2", - "glob": "7.1.2", - "ignore": "3.3.10", - "pify": "3.0.0", - "slash": "1.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "fast-glob": "^2.0.2", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" } }, "google-auth-library": { @@ -5895,13 +5877,13 @@ "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.6.1.tgz", "integrity": "sha512-jYiWC8NA9n9OtQM7ANn0Tk464do9yhKEtaJ72pKcaBiEwn4LwcGYIYOfwtfsSm3aur/ed3tlSxbmg24IAT6gAg==", "requires": { - "axios": "0.18.0", - "gcp-metadata": "0.6.3", - "gtoken": "2.3.0", - "jws": "3.1.5", - "lodash.isstring": "4.0.1", - "lru-cache": "4.1.3", - "retry-axios": "0.3.2" + "axios": "^0.18.0", + "gcp-metadata": "^0.6.3", + "gtoken": "^2.3.0", + "jws": "^3.1.5", + "lodash.isstring": "^4.0.1", + "lru-cache": "^4.1.3", + "retry-axios": "^0.3.2" } }, "google-auto-auth": { @@ -5909,52 +5891,36 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", "requires": { - "async": "2.6.1", - "gcp-metadata": "0.6.3", - "google-auth-library": "1.6.1", - "request": "2.87.0" + "async": "^2.3.0", + "gcp-metadata": "^0.6.1", + "google-auth-library": "^1.3.1", + "request": "^2.79.0" } }, "google-gax": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.16.1.tgz", - "integrity": "sha512-eP7UUkKvaHmmvCrr+rxzkIOeEKOnXmoib7/AkENDAuqlC9T2+lWlzwpthDRnitQcV8SblDMzsk73YPMPCDwPyQ==", - "requires": { - "duplexify": "3.6.0", - "extend": "3.0.1", - "globby": "8.0.1", - "google-auto-auth": "0.10.1", - "google-proto-files": "0.15.1", - "grpc": "1.12.4", - "is-stream-ended": "0.1.4", - "lodash": "4.17.10", - "protobufjs": "6.8.6", - "through2": "2.0.3" + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.17.1.tgz", + "integrity": "sha512-fAKvFx++SRr6bGWamWuVOkJzJnQqMgpJkhaB2oEwfFJ91rbFgEmIPRmZZ/MeIVVFUOuHUVyZ8nwjm5peyTZJ6g==", + "requires": { + "duplexify": "^3.6.0", + "extend": "^3.0.1", + "globby": "^8.0.1", + "google-auth-library": "^1.6.1", + "google-proto-files": "^0.16.0", + "grpc": "^1.12.2", + "is-stream-ended": "^0.1.4", + "lodash": "^4.17.10", + "protobufjs": "^6.8.6", + "retry-request": "^4.0.0", + "through2": "^2.0.3" }, "dependencies": { - "google-proto-files": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.15.1.tgz", - "integrity": "sha512-ebtmWgi/ooR5Nl63qRVZZ6VLM6JOb5zTNxTT/ZAU8yfMOdcauoOZNNMOVg0pCmTjqWXeuuVbgPP0CwO5UHHzBQ==", - "requires": { - "globby": "7.1.1", - "power-assert": "1.6.0", - "protobufjs": "6.8.6" - }, - "dependencies": { - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.2", - "ignore": "3.3.10", - "pify": "3.0.0", - "slash": "1.0.0" - } - } + "retry-request": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.0.0.tgz", + "integrity": "sha512-S4HNLaWcMP6r8E4TMH52Y7/pM8uNayOcTDDQNBwsCccL1uI+Ol2TljxRDPzaNfbhOB30+XWP5NnZkB3LiJxi1w==", + "requires": { + "through2": "^2.0.0" } } } @@ -5964,8 +5930,8 @@ "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", "requires": { - "node-forge": "0.7.5", - "pify": "3.0.0" + "node-forge": "^0.7.4", + "pify": "^3.0.0" } }, "google-proto-files": { @@ -5973,9 +5939,9 @@ "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.16.1.tgz", "integrity": "sha512-ykdhaYDiU/jlyrkzZDPemraKwVIgLT31XMHVNSJW//R9VED56hqSDRMx1Jlxbf0O4iDZnBWQ0JQLHbM2r5+wuA==", "requires": { - "globby": "8.0.1", - "power-assert": "1.6.0", - "protobufjs": "6.8.6" + "globby": "^8.0.0", + "power-assert": "^1.4.4", + "protobufjs": "^6.8.0" } }, "got": { @@ -5984,23 +5950,23 @@ "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", "dev": true, "requires": { - "@sindresorhus/is": "0.7.0", - "cacheable-request": "2.1.4", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "into-stream": "3.1.0", - "is-retry-allowed": "1.1.0", - "isurl": "1.0.0", - "lowercase-keys": "1.0.1", - "mimic-response": "1.0.0", - "p-cancelable": "0.3.0", - "p-timeout": "2.0.1", - "pify": "3.0.0", - "safe-buffer": "5.1.2", - "timed-out": "4.0.1", - "url-parse-lax": "3.0.0", - "url-to-options": "1.0.1" + "@sindresorhus/is": "^0.7.0", + "cacheable-request": "^2.1.1", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "into-stream": "^3.1.0", + "is-retry-allowed": "^1.1.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "mimic-response": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^2.0.1", + "pify": "^3.0.0", + "safe-buffer": "^5.1.1", + "timed-out": "^4.0.1", + "url-parse-lax": "^3.0.0", + "url-to-options": "^1.0.1" }, "dependencies": { "prepend-http": { @@ -6015,7 +5981,7 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "2.0.0" + "prepend-http": "^2.0.0" } } } @@ -6037,10 +6003,10 @@ "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.12.4.tgz", "integrity": "sha512-t0Hy4yoHHYLkK0b+ULTHw5ZuSFmWokCABY0C4bKQbE4jnm1hpjA23cQVD0xAqDcRHN5CkvFzlqb34ngV22dqoQ==", "requires": { - "lodash": "4.17.10", - "nan": "2.10.0", - "node-pre-gyp": "0.10.0", - "protobufjs": "5.0.3" + "lodash": "^4.17.5", + "nan": "^2.0.0", + "node-pre-gyp": "^0.10.0", + "protobufjs": "^5.0.3" }, "dependencies": { "abbrev": { @@ -6059,8 +6025,8 @@ "version": "1.1.5", "bundled": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -6071,7 +6037,7 @@ "version": "1.1.11", "bundled": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -6118,7 +6084,7 @@ "version": "1.2.5", "bundled": true, "requires": { - "minipass": "2.3.3" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -6129,26 +6095,26 @@ "version": "2.7.4", "bundled": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { "version": "7.1.2", "bundled": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -6159,22 +6125,22 @@ "version": "0.4.23", "bundled": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore-walk": { "version": "3.0.1", "bundled": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { "version": "1.0.6", "bundled": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -6189,7 +6155,7 @@ "version": "1.0.0", "bundled": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -6200,7 +6166,7 @@ "version": "3.0.4", "bundled": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -6211,15 +6177,15 @@ "version": "2.3.3", "bundled": true, "requires": { - "safe-buffer": "5.1.2", - "yallist": "3.0.2" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, "minizlib": { "version": "1.1.0", "bundled": true, "requires": { - "minipass": "2.3.3" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -6243,33 +6209,33 @@ "version": "2.2.1", "bundled": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.23", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { "version": "0.10.0", "bundled": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.1", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.8", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.4" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { "version": "4.0.1", "bundled": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -6280,18 +6246,18 @@ "version": "1.1.10", "bundled": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { "version": "4.1.2", "bundled": true, "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -6306,7 +6272,7 @@ "version": "1.4.0", "bundled": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -6321,8 +6287,8 @@ "version": "0.1.5", "bundled": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -6338,40 +6304,40 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz", "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==", "requires": { - "ascli": "1.0.1", - "bytebuffer": "5.0.1", - "glob": "7.1.2", - "yargs": "3.32.0" + "ascli": "~1", + "bytebuffer": "~5", + "glob": "^7.0.5", + "yargs": "^3.10.0" } }, "rc": { "version": "1.2.8", "bundled": true, "requires": { - "deep-extend": "0.6.0", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" } }, "readable-stream": { "version": "2.3.6", "bundled": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { "version": "2.6.2", "bundled": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -6402,23 +6368,23 @@ "version": "1.0.2", "bundled": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { "version": "1.1.1", "bundled": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { "version": "3.0.1", "bundled": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -6429,13 +6395,13 @@ "version": "4.4.4", "bundled": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.3.3", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.2", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.3", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -6446,7 +6412,7 @@ "version": "1.1.3", "bundled": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2 || 2" } }, "wrappy": { @@ -6464,11 +6430,11 @@ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", "requires": { - "axios": "0.18.0", - "google-p12-pem": "1.0.2", - "jws": "3.1.5", - "mime": "2.3.1", - "pify": "3.0.0" + "axios": "^0.18.0", + "google-p12-pem": "^1.0.0", + "jws": "^3.1.4", + "mime": "^2.2.0", + "pify": "^3.0.0" } }, "handlebars": { @@ -6477,10 +6443,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "async": { @@ -6495,7 +6461,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -6510,8 +6476,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" } }, "has": { @@ -6529,7 +6495,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-color": { @@ -6562,7 +6528,7 @@ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "dev": true, "requires": { - "has-symbol-support-x": "1.4.2" + "has-symbol-support-x": "^1.4.1" } }, "has-value": { @@ -6570,9 +6536,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -6580,8 +6546,8 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -6589,7 +6555,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6612,14 +6578,14 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.1" } }, "hosted-git-info": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", - "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz", + "integrity": "sha512-Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==", "dev": true }, "htmlparser2": { @@ -6628,12 +6594,12 @@ "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "dev": true, "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.2", - "domutils": "1.7.0", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "http-cache-semantics": { @@ -6647,9 +6613,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.2" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "hullabaloo-config-manager": { @@ -6658,20 +6624,20 @@ "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", "dev": true, "requires": { - "dot-prop": "4.2.0", - "es6-error": "4.1.1", - "graceful-fs": "4.1.11", - "indent-string": "3.2.0", - "json5": "0.5.1", - "lodash.clonedeep": "4.5.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.isequal": "4.5.0", - "lodash.merge": "4.6.1", - "md5-hex": "2.0.0", - "package-hash": "2.0.0", - "pkg-dir": "2.0.0", - "resolve-from": "3.0.0", - "safe-buffer": "5.1.2" + "dot-prop": "^4.1.0", + "es6-error": "^4.0.2", + "graceful-fs": "^4.1.11", + "indent-string": "^3.1.0", + "json5": "^0.5.1", + "lodash.clonedeep": "^4.5.0", + "lodash.clonedeepwith": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.merge": "^4.6.0", + "md5-hex": "^2.0.0", + "package-hash": "^2.0.0", + "pkg-dir": "^2.0.0", + "resolve-from": "^3.0.0", + "safe-buffer": "^5.0.1" } }, "iconv-lite": { @@ -6706,8 +6672,8 @@ "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", "dev": true, "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^2.0.0", + "resolve-cwd": "^2.0.0" } }, "imurmurhash": { @@ -6732,8 +6698,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -6753,8 +6719,8 @@ "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", "dev": true, "requires": { - "moment": "2.22.2", - "sanitize-html": "1.18.2" + "moment": "^2.14.1", + "sanitize-html": "^1.13.0" } }, "inquirer": { @@ -6817,7 +6783,7 @@ "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", "dev": true, "requires": { - "espower-loader": "1.2.2" + "espower-loader": "^1.0.0" } }, "into-stream": { @@ -6826,8 +6792,8 @@ "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", "dev": true, "requires": { - "from2": "2.3.0", - "p-is-promise": "1.1.0" + "from2": "^2.1.1", + "p-is-promise": "^1.1.0" } }, "invariant": { @@ -6836,7 +6802,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -6860,7 +6826,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6868,7 +6834,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6885,7 +6851,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.11.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -6899,7 +6865,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-callable": { @@ -6914,7 +6880,7 @@ "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", "dev": true, "requires": { - "ci-info": "1.1.3" + "ci-info": "^1.0.0" } }, "is-data-descriptor": { @@ -6922,7 +6888,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6930,7 +6896,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6946,9 +6912,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -6970,7 +6936,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-error": { @@ -6995,7 +6961,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -7003,7 +6969,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-generator-fn": { @@ -7017,7 +6983,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-installed-globally": { @@ -7026,8 +6992,8 @@ "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", "dev": true, "requires": { - "global-dirs": "0.1.1", - "is-path-inside": "1.0.1" + "global-dirs": "^0.1.0", + "is-path-inside": "^1.0.0" } }, "is-npm": { @@ -7041,7 +7007,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7049,7 +7015,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7072,22 +7038,7 @@ "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", "dev": true, "requires": { - "symbol-observable": "1.2.0" - } - }, - "is-odd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", - "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", - "requires": { - "is-number": "4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==" - } + "symbol-observable": "^1.1.0" } }, "is-path-cwd": { @@ -7111,7 +7062,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-obj": { @@ -7125,7 +7076,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-posix-bracket": { @@ -7240,18 +7191,18 @@ "dev": true }, "istanbul-lib-instrument": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.2.0.tgz", - "integrity": "sha512-ozQGtlIw+/a/F3n6QwWiuuyRAPp64+g2GVsKYsIez0sgIEzkU5ZpL2uZ5pmAzbEJ82anlRaPlOQZzkRXspgJyg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.0.tgz", + "integrity": "sha512-Ie1LGWJVCFDDJKKH4g1ffpFcZTEXEd6ay5l9fE8539y4qPErJnzo4psnGzDH92tcKvdUDdbxrKySYIbt6zB9hw==", "dev": true, "requires": { - "@babel/generator": "7.0.0-beta.49", - "@babel/parser": "7.0.0-beta.49", - "@babel/template": "7.0.0-beta.49", - "@babel/traverse": "7.0.0-beta.49", - "@babel/types": "7.0.0-beta.49", - "istanbul-lib-coverage": "2.0.0", - "semver": "5.5.0" + "@babel/generator": "7.0.0-beta.51", + "@babel/parser": "7.0.0-beta.51", + "@babel/template": "7.0.0-beta.51", + "@babel/traverse": "7.0.0-beta.51", + "@babel/types": "7.0.0-beta.51", + "istanbul-lib-coverage": "^2.0.0", + "semver": "^5.5.0" } }, "isurl": { @@ -7260,8 +7211,8 @@ "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "dev": true, "requires": { - "has-to-string-tag-x": "1.4.1", - "is-object": "1.0.1" + "has-to-string-tag-x": "^1.2.0", + "is-object": "^1.0.1" } }, "jest-docblock": { @@ -7288,8 +7239,8 @@ "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "4.0.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "js2xmlparser": { @@ -7298,7 +7249,7 @@ "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", "dev": true, "requires": { - "xmlcreate": "1.0.2" + "xmlcreate": "^1.0.1" } }, "jsbn": { @@ -7314,17 +7265,17 @@ "dev": true, "requires": { "babylon": "7.0.0-beta.19", - "bluebird": "3.5.1", - "catharsis": "0.8.9", - "escape-string-regexp": "1.0.5", - "js2xmlparser": "3.0.0", - "klaw": "2.0.0", - "marked": "0.3.19", - "mkdirp": "0.5.1", - "requizzle": "0.2.1", - "strip-json-comments": "2.0.1", + "bluebird": "~3.5.0", + "catharsis": "~0.8.9", + "escape-string-regexp": "~1.0.5", + "js2xmlparser": "~3.0.0", + "klaw": "~2.0.0", + "marked": "~0.3.6", + "mkdirp": "~0.5.1", + "requizzle": "~0.2.1", + "strip-json-comments": "~2.0.1", "taffydb": "2.6.2", - "underscore": "1.8.3" + "underscore": "~1.8.3" }, "dependencies": { "babylon": { @@ -7386,7 +7337,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsprim": { @@ -7413,7 +7364,7 @@ "requires": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.10", - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "jws": { @@ -7421,8 +7372,8 @@ "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz", "integrity": "sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==", "requires": { - "jwa": "1.1.6", - "safe-buffer": "5.1.2" + "jwa": "^1.1.5", + "safe-buffer": "^5.0.1" } }, "keyv": { @@ -7445,7 +7396,7 @@ "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "last-line-stream": { @@ -7454,7 +7405,7 @@ "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", "dev": true, "requires": { - "through2": "2.0.3" + "through2": "^2.0.0" } }, "latest-version": { @@ -7463,7 +7414,7 @@ "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "dev": true, "requires": { - "package-json": "4.0.1" + "package-json": "^4.0.0" } }, "lazy-cache": { @@ -7478,7 +7429,7 @@ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "levn": { @@ -7487,8 +7438,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "load-json-file": { @@ -7497,10 +7448,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" }, "dependencies": { "pify": { @@ -7517,8 +7468,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -7627,8 +7578,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true + "dev": true }, "loose-envify": { "version": "1.3.1", @@ -7636,7 +7586,7 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "loud-rejection": { @@ -7645,8 +7595,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lowercase-keys": { @@ -7660,8 +7610,8 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "make-dir": { @@ -7670,7 +7620,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "map-cache": { @@ -7689,7 +7639,7 @@ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "marked": { @@ -7704,7 +7654,7 @@ "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.4" } }, "math-random": { @@ -7719,7 +7669,7 @@ "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { @@ -7734,7 +7684,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "meow": { @@ -7743,16 +7693,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" }, "dependencies": { "find-up": { @@ -7761,8 +7711,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "load-json-file": { @@ -7771,11 +7721,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "minimist": { @@ -7790,7 +7740,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-type": { @@ -7799,9 +7749,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -7822,7 +7772,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "read-pkg": { @@ -7831,9 +7781,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -7842,8 +7792,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "strip-bom": { @@ -7852,7 +7802,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } } } @@ -7869,7 +7819,7 @@ "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.0.0" } }, "merge2": { @@ -7888,19 +7838,19 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "mime": { @@ -7918,7 +7868,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "1.33.0" + "mime-db": "~1.33.0" } }, "mimic-fn": { @@ -7938,7 +7888,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -7952,8 +7902,8 @@ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -7961,7 +7911,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -8017,7 +7967,7 @@ "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "source-map": "0.1.43" + "source-map": "^0.1.34" }, "dependencies": { "source-map": { @@ -8026,7 +7976,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -8037,10 +7987,10 @@ "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", "dev": true, "requires": { - "array-differ": "1.0.0", - "array-union": "1.0.2", - "arrify": "1.0.1", - "minimatch": "3.0.4" + "array-differ": "^1.0.0", + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "minimatch": "^3.0.0" } }, "mute-stream": { @@ -8055,22 +8005,21 @@ "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" }, "nanomatch": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", - "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "natural-compare": { @@ -8097,11 +8046,11 @@ "integrity": "sha512-BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw==", "dev": true, "requires": { - "@sinonjs/formatio": "2.0.0", - "just-extend": "1.1.27", - "lolex": "2.7.0", - "path-to-regexp": "1.7.0", - "text-encoding": "0.6.4" + "@sinonjs/formatio": "^2.0.0", + "just-extend": "^1.1.27", + "lolex": "^2.3.2", + "path-to-regexp": "^1.7.0", + "text-encoding": "^0.6.4" } }, "node-forge": { @@ -8115,10 +8064,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -8127,7 +8076,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "normalize-url": { @@ -8136,9 +8085,9 @@ "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", "dev": true, "requires": { - "prepend-http": "2.0.0", - "query-string": "5.1.1", - "sort-keys": "2.0.0" + "prepend-http": "^2.0.0", + "query-string": "^5.0.1", + "sort-keys": "^2.0.0" }, "dependencies": { "prepend-http": { @@ -8155,7 +8104,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { @@ -8169,44 +8118,43 @@ "integrity": "sha1-ikpO1pCWbBHsWH/4fuoMEsl0upk=", "dev": true, "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.2.0", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "2.2.0", - "istanbul-lib-report": "1.1.3", - "istanbul-lib-source-maps": "1.2.5", - "istanbul-reports": "1.4.1", - "md5-hex": "1.3.0", - "merge-source-map": "1.1.0", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.2.1", + "archy": "^1.0.0", + "arrify": "^1.0.1", + "caching-transform": "^1.0.0", + "convert-source-map": "^1.5.1", + "debug-log": "^1.0.1", + "default-require-extensions": "^1.0.0", + "find-cache-dir": "^0.1.1", + "find-up": "^2.1.0", + "foreground-child": "^1.5.3", + "glob": "^7.0.6", + "istanbul-lib-coverage": "^1.2.0", + "istanbul-lib-hook": "^1.1.0", + "istanbul-lib-instrument": "^2.1.0", + "istanbul-lib-report": "^1.1.3", + "istanbul-lib-source-maps": "^1.2.5", + "istanbul-reports": "^1.4.1", + "md5-hex": "^1.2.0", + "merge-source-map": "^1.1.0", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.0", + "resolve-from": "^2.0.0", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.1", + "spawn-wrap": "^1.4.2", + "test-exclude": "^4.2.0", "yargs": "11.1.0", - "yargs-parser": "8.1.0" + "yargs-parser": "^8.0.0" }, "dependencies": { "align-text": { "version": "0.1.4", "bundled": true, "dev": true, - "optional": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { @@ -8224,7 +8172,7 @@ "bundled": true, "dev": true, "requires": { - "default-require-extensions": "1.0.0" + "default-require-extensions": "^1.0.0" } }, "archy": { @@ -8282,13 +8230,13 @@ "bundled": true, "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -8296,7 +8244,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -8304,7 +8252,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -8312,7 +8260,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -8320,9 +8268,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { @@ -8337,7 +8285,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -8346,16 +8294,16 @@ "bundled": true, "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -8363,7 +8311,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -8378,15 +8326,15 @@ "bundled": true, "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "caching-transform": { @@ -8394,9 +8342,9 @@ "bundled": true, "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" } }, "camelcase": { @@ -8411,8 +8359,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "class-utils": { @@ -8420,10 +8368,10 @@ "bundled": true, "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -8431,7 +8379,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -8442,8 +8390,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -8465,8 +8413,8 @@ "bundled": true, "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "commondir": { @@ -8499,8 +8447,8 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.3", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "debug": { @@ -8531,7 +8479,7 @@ "bundled": true, "dev": true, "requires": { - "strip-bom": "2.0.0" + "strip-bom": "^2.0.0" } }, "define-property": { @@ -8539,8 +8487,8 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -8548,7 +8496,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -8556,7 +8504,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -8564,9 +8512,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { @@ -8581,7 +8529,7 @@ "bundled": true, "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "execa": { @@ -8589,13 +8537,13 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -8603,9 +8551,9 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } @@ -8615,13 +8563,13 @@ "bundled": true, "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "debug": { @@ -8637,7 +8585,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -8645,7 +8593,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -8655,8 +8603,8 @@ "bundled": true, "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -8664,7 +8612,7 @@ "bundled": true, "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -8674,14 +8622,14 @@ "bundled": true, "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -8689,7 +8637,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -8697,7 +8645,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -8705,7 +8653,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -8713,7 +8661,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -8721,9 +8669,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { @@ -8738,10 +8686,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -8749,7 +8697,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -8759,9 +8707,9 @@ "bundled": true, "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { @@ -8769,7 +8717,7 @@ "bundled": true, "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "for-in": { @@ -8782,8 +8730,8 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" + "cross-spawn": "^4", + "signal-exit": "^3.0.0" } }, "fragment-cache": { @@ -8791,7 +8739,7 @@ "bundled": true, "dev": true, "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fs.realpath": { @@ -8819,12 +8767,12 @@ "bundled": true, "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -8837,10 +8785,10 @@ "bundled": true, "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "source-map": { @@ -8848,7 +8796,7 @@ "bundled": true, "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -8858,9 +8806,9 @@ "bundled": true, "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -8868,8 +8816,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -8877,7 +8825,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -8897,8 +8845,8 @@ "bundled": true, "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -8916,7 +8864,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-arrayish": { @@ -8934,7 +8882,7 @@ "bundled": true, "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-data-descriptor": { @@ -8942,7 +8890,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-descriptor": { @@ -8950,9 +8898,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -8977,7 +8925,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-odd": { @@ -8985,7 +8933,7 @@ "bundled": true, "dev": true, "requires": { - "is-number": "4.0.0" + "is-number": "^4.0.0" }, "dependencies": { "is-number": { @@ -9000,7 +8948,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-stream": { @@ -9043,7 +8991,7 @@ "bundled": true, "dev": true, "requires": { - "append-transform": "0.4.0" + "append-transform": "^0.4.0" } }, "istanbul-lib-report": { @@ -9051,10 +8999,10 @@ "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "istanbul-lib-coverage": "^1.1.2", + "mkdirp": "^0.5.1", + "path-parse": "^1.0.5", + "supports-color": "^3.1.2" }, "dependencies": { "has-flag": { @@ -9067,7 +9015,7 @@ "bundled": true, "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -9077,11 +9025,11 @@ "bundled": true, "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "debug": "^3.1.0", + "istanbul-lib-coverage": "^1.2.0", + "mkdirp": "^0.5.1", + "rimraf": "^2.6.1", + "source-map": "^0.5.3" } }, "istanbul-reports": { @@ -9089,7 +9037,7 @@ "bundled": true, "dev": true, "requires": { - "handlebars": "4.0.11" + "handlebars": "^4.0.3" } }, "kind-of": { @@ -9097,7 +9045,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-cache": { @@ -9111,7 +9059,7 @@ "bundled": true, "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "load-json-file": { @@ -9119,11 +9067,11 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "locate-path": { @@ -9131,8 +9079,8 @@ "bundled": true, "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" }, "dependencies": { "path-exists": { @@ -9145,16 +9093,15 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "lru-cache": { "version": "4.1.3", "bundled": true, "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "map-cache": { @@ -9167,7 +9114,7 @@ "bundled": true, "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "md5-hex": { @@ -9175,7 +9122,7 @@ "bundled": true, "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { @@ -9188,7 +9135,7 @@ "bundled": true, "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "merge-source-map": { @@ -9196,7 +9143,7 @@ "bundled": true, "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -9211,19 +9158,19 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" }, "dependencies": { "kind-of": { @@ -9243,7 +9190,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -9256,8 +9203,8 @@ "bundled": true, "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -9265,7 +9212,7 @@ "bundled": true, "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -9288,18 +9235,18 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-odd": "^2.0.0", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "kind-of": { @@ -9314,10 +9261,10 @@ "bundled": true, "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "npm-run-path": { @@ -9325,7 +9272,7 @@ "bundled": true, "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { @@ -9343,9 +9290,9 @@ "bundled": true, "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -9353,7 +9300,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -9363,7 +9310,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.pick": { @@ -9371,7 +9318,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "once": { @@ -9379,7 +9326,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "optimist": { @@ -9387,8 +9334,8 @@ "bundled": true, "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "os-homedir": { @@ -9401,9 +9348,9 @@ "bundled": true, "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "p-finally": { @@ -9416,7 +9363,7 @@ "bundled": true, "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -9424,7 +9371,7 @@ "bundled": true, "dev": true, "requires": { - "p-limit": "1.2.0" + "p-limit": "^1.1.0" } }, "p-try": { @@ -9437,7 +9384,7 @@ "bundled": true, "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "pascalcase": { @@ -9450,7 +9397,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -9473,9 +9420,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -9493,7 +9440,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -9501,7 +9448,7 @@ "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" }, "dependencies": { "find-up": { @@ -9509,8 +9456,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } @@ -9530,9 +9477,9 @@ "bundled": true, "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -9540,8 +9487,8 @@ "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -9549,8 +9496,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } @@ -9560,8 +9507,8 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "repeat-element": { @@ -9605,7 +9552,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -9613,7 +9560,7 @@ "bundled": true, "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-regex": { @@ -9621,7 +9568,7 @@ "bundled": true, "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "semver": { @@ -9639,10 +9586,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -9650,7 +9597,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -9660,7 +9607,7 @@ "bundled": true, "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -9683,14 +9630,14 @@ "bundled": true, "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.0" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "debug": { @@ -9706,7 +9653,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -9714,7 +9661,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -9724,9 +9671,9 @@ "bundled": true, "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -9734,7 +9681,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -9742,7 +9689,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -9750,7 +9697,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -9758,9 +9705,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { @@ -9775,7 +9722,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" } }, "source-map": { @@ -9788,11 +9735,11 @@ "bundled": true, "dev": true, "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-url": { @@ -9805,12 +9752,12 @@ "bundled": true, "dev": true, "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.1" + "foreground-child": "^1.5.6", + "mkdirp": "^0.5.0", + "os-homedir": "^1.0.1", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" } }, "spdx-correct": { @@ -9818,8 +9765,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -9832,8 +9779,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -9846,7 +9793,7 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "static-extend": { @@ -9854,8 +9801,8 @@ "bundled": true, "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -9863,7 +9810,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -9873,8 +9820,8 @@ "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -9882,7 +9829,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "strip-bom": { @@ -9890,7 +9837,7 @@ "bundled": true, "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { @@ -9903,11 +9850,11 @@ "bundled": true, "dev": true, "requires": { - "arrify": "1.0.1", - "micromatch": "3.1.10", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" + "arrify": "^1.0.1", + "micromatch": "^3.1.8", + "object-assign": "^4.1.0", + "read-pkg-up": "^1.0.1", + "require-main-filename": "^1.0.1" } }, "to-object-path": { @@ -9915,7 +9862,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "to-regex": { @@ -9923,10 +9870,10 @@ "bundled": true, "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -9934,8 +9881,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "uglify-js": { @@ -9944,9 +9891,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "yargs": { @@ -9955,9 +9902,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -9974,10 +9921,10 @@ "bundled": true, "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { @@ -9985,7 +9932,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { @@ -9993,10 +9940,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -10006,8 +9953,8 @@ "bundled": true, "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -10015,9 +9962,9 @@ "bundled": true, "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -10047,7 +9994,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" }, "dependencies": { "kind-of": { @@ -10062,8 +10009,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "which": { @@ -10071,7 +10018,7 @@ "bundled": true, "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -10095,8 +10042,8 @@ "bundled": true, "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" }, "dependencies": { "ansi-regex": { @@ -10109,7 +10056,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "string-width": { @@ -10117,9 +10064,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "strip-ansi": { @@ -10127,7 +10074,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } } } @@ -10142,9 +10089,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } }, "y18n": { @@ -10162,18 +10109,18 @@ "bundled": true, "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" }, "dependencies": { "camelcase": { @@ -10186,9 +10133,9 @@ "bundled": true, "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "yargs-parser": { @@ -10196,7 +10143,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -10206,7 +10153,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { @@ -10234,9 +10181,9 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -10244,7 +10191,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "kind-of": { @@ -10252,7 +10199,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -10267,7 +10214,7 @@ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.omit": { @@ -10276,8 +10223,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "object.pick": { @@ -10285,7 +10232,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "observable-to-promise": { @@ -10294,8 +10241,8 @@ "integrity": "sha1-yCjw8NxH6fhq+KSXfF1VB2znqR8=", "dev": true, "requires": { - "is-observable": "0.2.0", - "symbol-observable": "1.2.0" + "is-observable": "^0.2.0", + "symbol-observable": "^1.0.4" }, "dependencies": { "is-observable": { @@ -10304,7 +10251,7 @@ "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", "dev": true, "requires": { - "symbol-observable": "0.2.4" + "symbol-observable": "^0.2.2" }, "dependencies": { "symbol-observable": { @@ -10322,7 +10269,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -10331,7 +10278,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "optimist": { @@ -10340,8 +10287,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "option-chain": { @@ -10356,12 +10303,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" }, "dependencies": { "wordwrap": { @@ -10388,7 +10335,7 @@ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "os-tmpdir": { @@ -10426,7 +10373,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -10435,7 +10382,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.3.0" + "p-limit": "^1.1.0" } }, "p-timeout": { @@ -10444,7 +10391,7 @@ "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", "dev": true, "requires": { - "p-finally": "1.0.0" + "p-finally": "^1.0.0" } }, "p-try": { @@ -10459,10 +10406,10 @@ "integrity": "sha1-eK4ybIngWk2BO2hgGXevBcANKg0=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "lodash.flattendeep": "4.4.0", - "md5-hex": "2.0.0", - "release-zalgo": "1.0.0" + "graceful-fs": "^4.1.11", + "lodash.flattendeep": "^4.4.0", + "md5-hex": "^2.0.0", + "release-zalgo": "^1.0.0" } }, "package-json": { @@ -10471,10 +10418,10 @@ "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", "dev": true, "requires": { - "got": "6.7.1", - "registry-auth-token": "3.3.2", - "registry-url": "3.1.0", - "semver": "5.5.0" + "got": "^6.7.1", + "registry-auth-token": "^3.0.1", + "registry-url": "^3.0.3", + "semver": "^5.1.0" }, "dependencies": { "got": { @@ -10483,17 +10430,17 @@ "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { - "create-error-class": "3.0.2", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "is-redirect": "1.0.0", - "is-retry-allowed": "1.1.0", - "is-stream": "1.1.0", - "lowercase-keys": "1.0.1", - "safe-buffer": "5.1.2", - "timed-out": "4.0.1", - "unzip-response": "2.0.1", - "url-parse-lax": "1.0.0" + "create-error-class": "^3.0.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-redirect": "^1.0.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "lowercase-keys": "^1.0.0", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "unzip-response": "^2.0.1", + "url-parse-lax": "^1.0.0" } } } @@ -10504,10 +10451,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "is-extglob": { @@ -10522,7 +10469,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -10533,7 +10480,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "parse-ms": { @@ -10603,7 +10550,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "performance-now": { @@ -10628,7 +10575,7 @@ "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", "dev": true, "requires": { - "pinkie": "1.0.0" + "pinkie": "^1.0.0" } }, "pkg-conf": { @@ -10637,8 +10584,8 @@ "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", "dev": true, "requires": { - "find-up": "2.1.0", - "load-json-file": "4.0.0" + "find-up": "^2.0.0", + "load-json-file": "^4.0.0" }, "dependencies": { "load-json-file": { @@ -10647,10 +10594,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "4.0.0", - "pify": "3.0.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" } }, "parse-json": { @@ -10659,8 +10606,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } } } @@ -10671,7 +10618,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "2.1.0" + "find-up": "^2.1.0" } }, "plur": { @@ -10680,7 +10627,7 @@ "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", "dev": true, "requires": { - "irregular-plurals": "1.4.0" + "irregular-plurals": "^1.0.0" } }, "pluralize": { @@ -10700,9 +10647,9 @@ "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "2.4.1", - "source-map": "0.6.1", - "supports-color": "5.4.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" }, "dependencies": { "source-map": { @@ -10718,11 +10665,11 @@ "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.6.0.tgz", "integrity": "sha512-nDb6a+p2C7Wj8Y2zmFtLpuv+xobXz4+bzT5s7dr0nn71tLozn7nRMQqzwbefzwZN5qOm0N7Cxhw4kXP75xboKA==", "requires": { - "define-properties": "1.1.2", - "empower": "1.3.0", - "power-assert-formatter": "1.4.1", - "universal-deep-strict-equal": "1.2.2", - "xtend": "4.0.1" + "define-properties": "^1.1.2", + "empower": "^1.3.0", + "power-assert-formatter": "^1.4.1", + "universal-deep-strict-equal": "^1.2.1", + "xtend": "^4.0.0" } }, "power-assert-context-formatter": { @@ -10730,8 +10677,8 @@ "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.2.0.tgz", "integrity": "sha512-HLNEW8Bin+BFCpk/zbyKwkEu9W8/zThIStxGo7weYcFkKgMuGCHUJhvJeBGXDZf0Qm2xis4pbnnciGZiX0EpSg==", "requires": { - "core-js": "2.5.7", - "power-assert-context-traversal": "1.2.0" + "core-js": "^2.0.0", + "power-assert-context-traversal": "^1.2.0" } }, "power-assert-context-reducer-ast": { @@ -10739,11 +10686,11 @@ "resolved": "https://registry.npmjs.org/power-assert-context-reducer-ast/-/power-assert-context-reducer-ast-1.2.0.tgz", "integrity": "sha512-EgOxmZ/Lb7tw4EwSKX7ZnfC0P/qRZFEG28dx/690qvhmOJ6hgThYFm5TUWANDLK5NiNKlPBi5WekVGd2+5wPrw==", "requires": { - "acorn": "5.7.1", - "acorn-es7-plugin": "1.1.7", - "core-js": "2.5.7", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "acorn": "^5.0.0", + "acorn-es7-plugin": "^1.0.12", + "core-js": "^2.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.2.0" } }, "power-assert-context-traversal": { @@ -10751,8 +10698,8 @@ "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.2.0.tgz", "integrity": "sha512-NFoHU6g2umNajiP2l4qb0BRWD773Aw9uWdWYH9EQsVwIZnog5bd2YYLFCVvaxWpwNzWeEfZIon2xtyc63026pQ==", "requires": { - "core-js": "2.5.7", - "estraverse": "4.2.0" + "core-js": "^2.0.0", + "estraverse": "^4.1.0" } }, "power-assert-formatter": { @@ -10760,13 +10707,13 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "2.5.7", - "power-assert-context-formatter": "1.2.0", - "power-assert-context-reducer-ast": "1.2.0", - "power-assert-renderer-assertion": "1.2.0", - "power-assert-renderer-comparison": "1.2.0", - "power-assert-renderer-diagram": "1.2.0", - "power-assert-renderer-file": "1.2.0" + "core-js": "^2.0.0", + "power-assert-context-formatter": "^1.0.7", + "power-assert-context-reducer-ast": "^1.0.7", + "power-assert-renderer-assertion": "^1.0.7", + "power-assert-renderer-comparison": "^1.0.7", + "power-assert-renderer-diagram": "^1.0.7", + "power-assert-renderer-file": "^1.0.7" } }, "power-assert-renderer-assertion": { @@ -10774,8 +10721,8 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.2.0.tgz", "integrity": "sha512-3F7Q1ZLmV2ZCQv7aV7NJLNK9G7QsostrhOU7U0RhEQS/0vhEqrRg2jEJl1jtUL4ZyL2dXUlaaqrmPv5r9kRvIg==", "requires": { - "power-assert-renderer-base": "1.1.1", - "power-assert-util-string-width": "1.2.0" + "power-assert-renderer-base": "^1.1.1", + "power-assert-util-string-width": "^1.2.0" } }, "power-assert-renderer-base": { @@ -10788,11 +10735,11 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.2.0.tgz", "integrity": "sha512-7c3RKPDBKK4E3JqdPtYRE9cM8AyX4LC4yfTvvTYyx8zSqmT5kJnXwzR0yWQLOavACllZfwrAGQzFiXPc5sWa+g==", "requires": { - "core-js": "2.5.7", - "diff-match-patch": "1.0.1", - "power-assert-renderer-base": "1.1.1", - "stringifier": "1.3.0", - "type-name": "2.0.2" + "core-js": "^2.0.0", + "diff-match-patch": "^1.0.0", + "power-assert-renderer-base": "^1.1.1", + "stringifier": "^1.3.0", + "type-name": "^2.0.1" } }, "power-assert-renderer-diagram": { @@ -10800,10 +10747,10 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.2.0.tgz", "integrity": "sha512-JZ6PC+DJPQqfU6dwSmpcoD7gNnb/5U77bU5KgNwPPa+i1Pxiz6UuDeM3EUBlhZ1HvH9tMjI60anqVyi5l2oNdg==", "requires": { - "core-js": "2.5.7", - "power-assert-renderer-base": "1.1.1", - "power-assert-util-string-width": "1.2.0", - "stringifier": "1.3.0" + "core-js": "^2.0.0", + "power-assert-renderer-base": "^1.1.1", + "power-assert-util-string-width": "^1.2.0", + "stringifier": "^1.3.0" } }, "power-assert-renderer-file": { @@ -10811,7 +10758,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-file/-/power-assert-renderer-file-1.2.0.tgz", "integrity": "sha512-/oaVrRbeOtGoyyd7e4IdLP/jIIUFJdqJtsYzP9/88R39CMnfF/S/rUc8ZQalENfUfQ/wQHu+XZYRMaCEZmEesg==", "requires": { - "power-assert-renderer-base": "1.1.1" + "power-assert-renderer-base": "^1.1.1" } }, "power-assert-util-string-width": { @@ -10819,7 +10766,7 @@ "resolved": "https://registry.npmjs.org/power-assert-util-string-width/-/power-assert-util-string-width-1.2.0.tgz", "integrity": "sha512-lX90G0igAW0iyORTILZ/QjZWsa1MZ6VVY3L0K86e2eKun3S4LKPH4xZIl8fdeMYLfOjkaszbNSzf1uugLeAm2A==", "requires": { - "eastasianwidth": "0.2.0" + "eastasianwidth": "^0.2.0" } }, "prelude-ls": { @@ -10841,9 +10788,9 @@ "dev": true }, "prettier": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.6.tgz", - "integrity": "sha512-p5eqCNiohWZN++7aJXUVj0JgLqHCPLf9GLIcLBHGNWs4Y9FJOPs6+KNO2WT0udJIQJTbeZFrJkjzjcb8fkAYYQ==", + "version": "1.13.7", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz", + "integrity": "sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==", "dev": true }, "pretty-ms": { @@ -10852,7 +10799,7 @@ "integrity": "sha512-ZypexbfVUGTFxb0v+m1bUyy92DHe5SyYlnyY0msyms5zd3RwyvNgyxZZsXXgoyzlxjx5MiqtXUdhUfvQbe0A2Q==", "dev": true, "requires": { - "parse-ms": "1.0.1" + "parse-ms": "^1.0.0" }, "dependencies": { "parse-ms": { @@ -10885,19 +10832,26 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/base64": "1.1.2", - "@protobufjs/codegen": "2.0.4", - "@protobufjs/eventemitter": "1.1.0", - "@protobufjs/fetch": "1.1.0", - "@protobufjs/float": "1.0.2", - "@protobufjs/inquire": "1.1.0", - "@protobufjs/path": "1.1.2", - "@protobufjs/pool": "1.1.0", - "@protobufjs/utf8": "1.1.0", - "@types/long": "3.0.32", - "@types/node": "8.10.20", - "long": "4.0.0" + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^3.0.32", + "@types/node": "^8.9.4", + "long": "^4.0.0" + }, + "dependencies": { + "@types/node": { + "version": "8.10.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz", + "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==" + } } }, "proxyquire": { @@ -10906,9 +10860,9 @@ "integrity": "sha512-fQr3VQrbdzHrdaDn3XuisVoJlJNDJizHAvUXw9IuXRR8BpV2x0N7LsCxrpJkeKfPbNjiNU/V5vc008cI0TmzzQ==", "dev": true, "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.5.0" + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.0", + "resolve": "~1.5.0" }, "dependencies": { "resolve": { @@ -10917,7 +10871,7 @@ "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } } } @@ -10943,9 +10897,9 @@ "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", "dev": true, "requires": { - "decode-uri-component": "0.2.0", - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" + "decode-uri-component": "^0.2.0", + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" } }, "randomatic": { @@ -10954,9 +10908,9 @@ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { @@ -10973,10 +10927,10 @@ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "requires": { - "deep-extend": "0.6.0", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -10993,9 +10947,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" }, "dependencies": { "path-type": { @@ -11004,7 +10958,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.0.0" } }, "pify": { @@ -11021,8 +10975,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" } }, "readable-stream": { @@ -11030,13 +10984,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -11045,10 +10999,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2", + "set-immediate-shim": "^1.0.1" } }, "redent": { @@ -11057,8 +11011,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" }, "dependencies": { "indent-string": { @@ -11067,7 +11021,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } } } @@ -11090,7 +11044,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "regex-not": { @@ -11098,8 +11052,8 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "regexp.prototype.flags": { @@ -11123,9 +11077,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "registry-auth-token": { @@ -11134,8 +11088,8 @@ "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { - "rc": "1.2.8", - "safe-buffer": "5.1.2" + "rc": "^1.1.6", + "safe-buffer": "^5.0.1" } }, "registry-url": { @@ -11144,7 +11098,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "1.2.8" + "rc": "^1.0.1" } }, "regjsgen": { @@ -11159,7 +11113,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" } }, "release-zalgo": { @@ -11168,7 +11122,7 @@ "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", "dev": true, "requires": { - "es6-error": "4.1.1" + "es6-error": "^4.0.1" } }, "remove-trailing-separator": { @@ -11193,7 +11147,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { @@ -11201,26 +11155,26 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "require-directory": { @@ -11265,7 +11219,7 @@ "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", "dev": true, "requires": { - "underscore": "1.6.0" + "underscore": "~1.6.0" }, "dependencies": { "underscore": { @@ -11288,7 +11242,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-from": { @@ -11308,7 +11262,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "1.0.1" + "lowercase-keys": "^1.0.0" } }, "restore-cursor": { @@ -11317,8 +11271,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" } }, "ret": { @@ -11347,7 +11301,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -11395,7 +11349,7 @@ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -11415,16 +11369,16 @@ "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", "dev": true, "requires": { - "chalk": "2.4.1", - "htmlparser2": "3.9.2", - "lodash.clonedeep": "4.5.0", - "lodash.escaperegexp": "4.1.2", - "lodash.isplainobject": "4.0.6", - "lodash.isstring": "4.0.1", - "lodash.mergewith": "4.6.1", - "postcss": "6.0.23", - "srcset": "1.0.0", - "xtend": "4.0.1" + "chalk": "^2.3.0", + "htmlparser2": "^3.9.0", + "lodash.clonedeep": "^4.5.0", + "lodash.escaperegexp": "^4.1.2", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.mergewith": "^4.6.0", + "postcss": "^6.0.14", + "srcset": "^1.0.0", + "xtend": "^4.0.0" } }, "semver": { @@ -11439,7 +11393,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "5.5.0" + "semver": "^5.0.3" } }, "serialize-error": { @@ -11465,10 +11419,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -11476,7 +11430,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11487,7 +11441,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -11508,13 +11462,13 @@ "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", "dev": true, "requires": { - "@sinonjs/formatio": "2.0.0", - "diff": "3.5.0", - "lodash.get": "4.4.2", - "lolex": "2.7.0", - "nise": "1.4.2", - "supports-color": "5.4.0", - "type-detect": "4.0.8" + "@sinonjs/formatio": "^2.0.0", + "diff": "^3.1.0", + "lodash.get": "^4.4.2", + "lolex": "^2.2.0", + "nise": "^1.2.0", + "supports-color": "^5.1.0", + "type-detect": "^4.0.5" } }, "slash": { @@ -11528,7 +11482,7 @@ "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0" + "is-fullwidth-code-point": "^2.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -11550,14 +11504,14 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.0" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "debug": { @@ -11573,7 +11527,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -11581,7 +11535,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11591,9 +11545,9 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -11601,7 +11555,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -11609,7 +11563,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -11617,7 +11571,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -11625,9 +11579,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -11637,7 +11591,7 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { @@ -11645,7 +11599,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11656,7 +11610,7 @@ "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", "dev": true, "requires": { - "is-plain-obj": "1.1.0" + "is-plain-obj": "^1.0.0" } }, "source-map": { @@ -11669,11 +11623,11 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -11682,8 +11636,8 @@ "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "dev": true, "requires": { - "buffer-from": "1.1.0", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -11705,8 +11659,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -11721,8 +11675,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -11744,7 +11698,7 @@ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { @@ -11759,8 +11713,8 @@ "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=", "dev": true, "requires": { - "array-uniq": "1.0.3", - "number-is-nan": "1.0.1" + "array-uniq": "^1.0.2", + "number-is-nan": "^1.0.0" } }, "sshpk": { @@ -11768,15 +11722,15 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "stack-utils": { @@ -11790,8 +11744,8 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -11799,7 +11753,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -11834,9 +11788,9 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string.prototype.matchall": { @@ -11857,7 +11811,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "stringifier": { @@ -11865,9 +11819,9 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "2.5.7", - "traverse": "0.6.6", - "type-name": "2.0.2" + "core-js": "^2.0.0", + "traverse": "^0.6.6", + "type-name": "^2.0.1" } }, "strip-ansi": { @@ -11875,7 +11829,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -11890,7 +11844,7 @@ "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.1" } }, "strip-eof": { @@ -11905,7 +11859,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "strip-json-comments": { @@ -11925,16 +11879,16 @@ "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", "dev": true, "requires": { - "component-emitter": "1.2.1", - "cookiejar": "2.1.2", - "debug": "3.1.0", - "extend": "3.0.1", - "form-data": "2.3.2", - "formidable": "1.2.1", - "methods": "1.1.2", - "mime": "1.6.0", - "qs": "6.5.2", - "readable-stream": "2.3.6" + "component-emitter": "^1.2.0", + "cookiejar": "^2.1.0", + "debug": "^3.1.0", + "extend": "^3.0.0", + "form-data": "^2.3.1", + "formidable": "^1.2.0", + "methods": "^1.1.1", + "mime": "^1.4.1", + "qs": "^6.5.1", + "readable-stream": "^2.3.5" }, "dependencies": { "mime": { @@ -11951,11 +11905,11 @@ "integrity": "sha512-HZJ3geIMPgVwKk2VsmO5YHqnnJYl6bV5A9JW2uzqV43WmpgliNEYbuvukfor7URpaqpxuw3CfZ3ONdVbZjCgIA==", "dev": true, "requires": { - "arrify": "1.0.1", - "indent-string": "3.2.0", - "js-yaml": "3.12.0", - "serialize-error": "2.1.0", - "strip-ansi": "4.0.0" + "arrify": "^1.0.1", + "indent-string": "^3.2.0", + "js-yaml": "^3.10.0", + "serialize-error": "^2.1.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -11970,7 +11924,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -11981,8 +11935,8 @@ "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=", "dev": true, "requires": { - "methods": "1.1.2", - "superagent": "3.8.3" + "methods": "~1.1.2", + "superagent": "^3.0.0" } }, "supports-color": { @@ -11991,7 +11945,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" }, "dependencies": { "has-flag": { @@ -12091,7 +12045,7 @@ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", "dev": true, "requires": { - "execa": "0.7.0" + "execa": "^0.7.0" } }, "text-encoding": { @@ -12117,8 +12071,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } }, "time-zone": { @@ -12153,7 +12107,7 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -12161,7 +12115,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -12171,10 +12125,10 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -12182,8 +12136,8 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "tough-cookie": { @@ -12191,7 +12145,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "traverse": { @@ -12222,7 +12176,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -12237,7 +12191,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-detect": { @@ -12258,9 +12212,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "camelcase": { @@ -12277,8 +12231,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" } }, @@ -12303,9 +12257,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -12352,10 +12306,10 @@ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { @@ -12363,7 +12317,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { @@ -12371,10 +12325,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -12385,7 +12339,7 @@ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", "dev": true, "requires": { - "crypto-random-string": "1.0.0" + "crypto-random-string": "^1.0.0" } }, "unique-temp-dir": { @@ -12394,8 +12348,8 @@ "integrity": "sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U=", "dev": true, "requires": { - "mkdirp": "0.5.1", - "os-tmpdir": "1.0.2", + "mkdirp": "^0.5.1", + "os-tmpdir": "^1.0.1", "uid2": "0.0.3" } }, @@ -12404,9 +12358,9 @@ "resolved": "https://registry.npmjs.org/universal-deep-strict-equal/-/universal-deep-strict-equal-1.2.2.tgz", "integrity": "sha1-DaSsL3PP95JMgfpN4BjKViyisKc=", "requires": { - "array-filter": "1.0.0", + "array-filter": "^1.0.0", "indexof": "0.0.1", - "object-keys": "1.0.12" + "object-keys": "^1.0.0" } }, "universalify": { @@ -12420,8 +12374,8 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -12429,9 +12383,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -12463,16 +12417,16 @@ "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { - "boxen": "1.3.0", - "chalk": "2.4.1", - "configstore": "3.1.2", - "import-lazy": "2.1.0", - "is-ci": "1.1.0", - "is-installed-globally": "0.1.0", - "is-npm": "1.0.0", - "latest-version": "3.1.0", - "semver-diff": "2.1.0", - "xdg-basedir": "3.0.0" + "boxen": "^1.2.1", + "chalk": "^2.0.1", + "configstore": "^3.0.0", + "import-lazy": "^2.1.0", + "is-ci": "^1.0.10", + "is-installed-globally": "^0.1.0", + "is-npm": "^1.0.0", + "latest-version": "^3.0.0", + "semver-diff": "^2.0.0", + "xdg-basedir": "^3.0.0" } }, "uri-js": { @@ -12503,7 +12457,7 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "prepend-http": "1.0.4" + "prepend-http": "^1.0.1" } }, "url-to-options": { @@ -12523,7 +12477,7 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" } }, "util-deprecate": { @@ -12532,9 +12486,9 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz", + "integrity": "sha512-ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw==" }, "validate-npm-package-license": { "version": "3.0.3", @@ -12542,8 +12496,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "verror": { @@ -12551,9 +12505,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "well-known-symbols": { @@ -12568,7 +12522,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -12583,7 +12537,7 @@ "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", "dev": true, "requires": { - "string-width": "2.1.1" + "string-width": "^2.1.1" }, "dependencies": { "ansi-regex": { @@ -12604,8 +12558,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -12614,7 +12568,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12635,8 +12589,8 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -12659,9 +12613,9 @@ "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "signal-exit": "3.0.2" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" } }, "write-json-file": { @@ -12670,12 +12624,12 @@ "integrity": "sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=", "dev": true, "requires": { - "detect-indent": "5.0.0", - "graceful-fs": "4.1.11", - "make-dir": "1.3.0", - "pify": "3.0.0", - "sort-keys": "2.0.0", - "write-file-atomic": "2.3.0" + "detect-indent": "^5.0.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "pify": "^3.0.0", + "sort-keys": "^2.0.0", + "write-file-atomic": "^2.0.0" }, "dependencies": { "detect-indent": { @@ -12692,8 +12646,8 @@ "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==", "dev": true, "requires": { - "sort-keys": "2.0.0", - "write-json-file": "2.3.0" + "sort-keys": "^2.0.0", + "write-json-file": "^2.2.0" } }, "xdg-basedir": { @@ -12728,13 +12682,13 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "requires": { - "camelcase": "2.1.1", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "os-locale": "1.4.0", - "string-width": "1.0.2", - "window-size": "0.1.4", - "y18n": "3.2.1" + "camelcase": "^2.0.1", + "cliui": "^3.0.3", + "decamelize": "^1.1.1", + "os-locale": "^1.4.0", + "string-width": "^1.0.1", + "window-size": "^0.1.4", + "y18n": "^3.2.0" } }, "yargs-parser": { @@ -12743,7 +12697,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2f2be054399..6b5f1222ba5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -70,7 +70,7 @@ "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auto-auth": "^0.10.1", - "google-gax": "^0.16.0", + "google-gax": "^0.17.1", "google-proto-files": "^0.16.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 058e0ee1776..e70440314ae 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1,4 +1,4 @@ -// Copyright 2017 Google Inc. +// Copyright 2018 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -31,10 +31,86 @@ option java_package = "com.google.pubsub.v1"; option php_namespace = "Google\\Cloud\\PubSub\\V1"; +// The service that an application uses to manipulate topics, and to send +// messages to a topic. +service Publisher { + // Creates the given topic with the given name. See the + // resource name rules. + rpc CreateTopic(Topic) returns (Topic) { + option (google.api.http) = { + put: "/v1/{name=projects/*/topics/*}" + body: "*" + }; + } + + // Updates an existing topic. Note that certain properties of a + // topic are not modifiable. + rpc UpdateTopic(UpdateTopicRequest) returns (Topic) { + option (google.api.http) = { + patch: "/v1/{topic.name=projects/*/topics/*}" + body: "*" + }; + } + + // Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic + // does not exist. The message payload must not be empty; it must contain + // either a non-empty data field, or at least one attribute. + rpc Publish(PublishRequest) returns (PublishResponse) { + option (google.api.http) = { + post: "/v1/{topic=projects/*/topics/*}:publish" + body: "*" + }; + } + + // Gets the configuration of a topic. + rpc GetTopic(GetTopicRequest) returns (Topic) { + option (google.api.http) = { + get: "/v1/{topic=projects/*/topics/*}" + }; + } + + // Lists matching topics. + rpc ListTopics(ListTopicsRequest) returns (ListTopicsResponse) { + option (google.api.http) = { + get: "/v1/{project=projects/*}/topics" + }; + } + + // Lists the names of the subscriptions on this topic. + rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) returns (ListTopicSubscriptionsResponse) { + option (google.api.http) = { + get: "/v1/{topic=projects/*/topics/*}/subscriptions" + }; + } + + // Lists the names of the snapshots on this topic.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. + rpc ListTopicSnapshots(ListTopicSnapshotsRequest) returns (ListTopicSnapshotsResponse) { + option (google.api.http) = { + get: "/v1/{topic=projects/*/topics/*}/snapshots" + }; + } + + // Deletes the topic with the given name. Returns `NOT_FOUND` if the topic + // does not exist. After a topic is deleted, a new topic may be created with + // the same name; this is an entirely new topic with none of the old + // configuration or subscriptions. Existing subscriptions to this topic are + // not deleted, but their `topic` field is set to `_deleted-topic_`. + rpc DeleteTopic(DeleteTopicRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { + delete: "/v1/{topic=projects/*/topics/*}" + }; + } +} + // The service that an application uses to manipulate subscriptions and to -// consume messages from a subscription via the `Pull` method. +// consume messages from a subscription via the `Pull` method or by +// establishing a bi-directional stream using the `StreamingPull` method. service Subscriber { - // Creates a subscription to a given topic. + // Creates a subscription to a given topic. See the + // resource name rules. // If the subscription already exists, returns `ALREADY_EXISTS`. // If the corresponding topic doesn't exist, returns `NOT_FOUND`. // @@ -47,7 +123,8 @@ service Subscriber { rpc CreateSubscription(Subscription) returns (Subscription) { option (google.api.http) = { put: "/v1/{name=projects/*/subscriptions/*}" - body: "*" }; + body: "*" + }; } // Gets the configuration details of a subscription. @@ -59,10 +136,6 @@ service Subscriber { // Updates an existing subscription. Note that certain properties of a // subscription, such as its topic, are not modifiable. - // NOTE: The style guide requires body: "subscription" instead of body: "*". - // Keeping the latter for internal consistency in V1, however it should be - // corrected in V2. See - // https://cloud.google.com/apis/design/standard_methods#update for details. rpc UpdateSubscription(UpdateSubscriptionRequest) returns (Subscription) { option (google.api.http) = { patch: "/v1/{subscription.name=projects/*/subscriptions/*}" @@ -125,18 +198,13 @@ service Subscriber { }; } - // (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will - // respond with UNIMPLEMENTED errors unless you have been invited to test - // this feature. Contact cloud-pubsub@google.com with any questions. - // // Establishes a stream with the server, which sends messages down to the // client. The client streams acknowledgements and ack deadline modifications // back to the server. The server will close the stream and return the status - // on any error. The server may close the stream with status `OK` to reassign - // server-side resources, in which case, the client should re-establish the - // stream. `UNAVAILABLE` may also be returned in the case of a transient error - // (e.g., a server restart). These should also be retried by the client. Flow - // control can be achieved by configuring the underlying RPC channel. + // on any error. The server may close the stream with status `UNAVAILABLE` to + // reassign server-side resources, in which case, the client should + // re-establish the stream. Flow control can be achieved by configuring the + // underlying RPC channel. rpc StreamingPull(stream StreamingPullRequest) returns (stream StreamingPullResponse); // Modifies the `PushConfig` for a specified subscription. @@ -148,26 +216,45 @@ service Subscriber { rpc ModifyPushConfig(ModifyPushConfigRequest) returns (google.protobuf.Empty) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig" - body: "*" }; + body: "*" + }; } - // Lists the existing snapshots. + // Gets the configuration details of a snapshot.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. + rpc GetSnapshot(GetSnapshotRequest) returns (Snapshot) { + option (google.api.http) = { + get: "/v1/{snapshot=projects/*/snapshots/*}" + }; + } + + // Lists the existing snapshots.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) { option (google.api.http) = { get: "/v1/{project=projects/*}/snapshots" }; } - // Creates a snapshot from the requested subscription. + // Creates a snapshot from the requested subscription.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. // If the snapshot already exists, returns `ALREADY_EXISTS`. // If the requested subscription doesn't exist, returns `NOT_FOUND`. - // - // If the name is not provided in the request, the server will assign a random + // If the backlog in the subscription is too old -- and the resulting snapshot + // would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. + // See also the `Snapshot.expire_time` field. If the name is not provided in + // the request, the server will assign a random // name for this snapshot on the same project as the subscription, conforming - // to the - // [resource name format](https://cloud.google.com/pubsub/docs/overview#names). - // The generated name is populated in the returned Snapshot object. - // Note that for REST API requests, you must specify a name in the request. + // to the [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + // The generated + // name is populated in the returned Snapshot object. Note that for REST API + // requests, you must specify a name in the request. rpc CreateSnapshot(CreateSnapshotRequest) returns (Snapshot) { option (google.api.http) = { put: "/v1/{name=projects/*/snapshots/*}" @@ -175,19 +262,23 @@ service Subscriber { }; } - // Updates an existing snapshot. Note that certain properties of a snapshot - // are not modifiable. - // NOTE: The style guide requires body: "snapshot" instead of body: "*". - // Keeping the latter for internal consistency in V1, however it should be - // corrected in V2. See - // https://cloud.google.com/apis/design/standard_methods#update for details. + // Updates an existing snapshot.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. + // Note that certain properties of a snapshot are not modifiable. rpc UpdateSnapshot(UpdateSnapshotRequest) returns (Snapshot) { option (google.api.http) = { patch: "/v1/{snapshot.name=projects/*/snapshots/*}" - body: "*" }; + body: "*" + }; } - // Removes an existing snapshot. All messages retained in the snapshot + // Removes an existing snapshot.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. + // When the snapshot is deleted, all messages retained in the snapshot // are immediately dropped. After a snapshot is deleted, a new one may be // created with the same name, but the new one has no association with the old // snapshot or its subscription, unless the same subscription is specified. @@ -198,7 +289,10 @@ service Subscriber { } // Seeks an existing subscription to a point in time or to a given snapshot, - // whichever is provided in the request. + // whichever is provided in the request.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. rpc Seek(SeekRequest) returns (SeekResponse) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:seek" @@ -207,70 +301,14 @@ service Subscriber { } } -// The service that an application uses to manipulate topics, and to send -// messages to a topic. -service Publisher { - // Creates the given topic with the given name. - rpc CreateTopic(Topic) returns (Topic) { - option (google.api.http) = { - put: "/v1/{name=projects/*/topics/*}" - body: "*" - }; - } - - // Updates an existing topic. Note that certain properties of a topic are not - // modifiable. Options settings follow the style guide: - // NOTE: The style guide requires body: "topic" instead of body: "*". - // Keeping the latter for internal consistency in V1, however it should be - // corrected in V2. See - // https://cloud.google.com/apis/design/standard_methods#update for details. - rpc UpdateTopic(UpdateTopicRequest) returns (Topic) { - option (google.api.http) = { - patch: "/v1/{topic.name=projects/*/topics/*}" - body: "*" }; - } - - // Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic - // does not exist. The message payload must not be empty; it must contain - // either a non-empty data field, or at least one attribute. - rpc Publish(PublishRequest) returns (PublishResponse) { - option (google.api.http) = { - post: "/v1/{topic=projects/*/topics/*}:publish" - body: "*" - }; - } - - // Gets the configuration of a topic. - rpc GetTopic(GetTopicRequest) returns (Topic) { - option (google.api.http) = { - get: "/v1/{topic=projects/*/topics/*}" - }; - } - - // Lists matching topics. - rpc ListTopics(ListTopicsRequest) returns (ListTopicsResponse) { - option (google.api.http) = { - get: "/v1/{project=projects/*}/topics" - }; - } - - // Lists the name of the subscriptions for this topic. - rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) returns (ListTopicSubscriptionsResponse) { - option (google.api.http) = { - get: "/v1/{topic=projects/*/topics/*}/subscriptions" - }; - } - - // Deletes the topic with the given name. Returns `NOT_FOUND` if the topic - // does not exist. After a topic is deleted, a new topic may be created with - // the same name; this is an entirely new topic with none of the old - // configuration or subscriptions. Existing subscriptions to this topic are - // not deleted, but their `topic` field is set to `_deleted-topic_`. - rpc DeleteTopic(DeleteTopicRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { - delete: "/v1/{topic=projects/*/topics/*}" - }; - } +message MessageStoragePolicy { + // The list of GCP regions where messages that are published to the topic may + // be persisted in storage. Messages published by publishers running in + // non-allowed GCP regions (or running outside of GCP altogether) will be + // routed for storage in one of the allowed regions. An empty list indicates a + // misconfiguration at the project or organization level, which will result in + // all Publish operations failing. + repeated string allowed_persistence_regions = 1; } // A topic resource. @@ -285,6 +323,14 @@ message Topic { // User labels. map labels = 2; + + // Policy constraining how messages published to the topic may be stored. It + // is determined when the topic is created based on the policy configured at + // the project level. It must not be set by the caller in the request to + // CreateTopic or to UpdateTopic. This field will be populated in the + // responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the + // response, then no constraints are in effect. + MessageStoragePolicy message_storage_policy = 3; } // A message data and its attributes. The message payload must not be empty; @@ -317,11 +363,14 @@ message GetTopicRequest { // Request for the UpdateTopic method. message UpdateTopicRequest { - // The topic to update. + // The updated topic object. Topic topic = 1; - // Indicates which fields in the provided topic to update. - // Must be specified and non-empty. + // Indicates which fields in the provided topic to update. Must be specified + // and non-empty. Note that if `update_mask` contains + // "message_storage_policy" then the new value will be determined based on the + // policy configured at the project or organization level. The + // `message_storage_policy` must not be set in the `topic` provided above. google.protobuf.FieldMask update_mask = 2; } @@ -394,6 +443,38 @@ message ListTopicSubscriptionsResponse { string next_page_token = 2; } +// Request for the `ListTopicSnapshots` method.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. +message ListTopicSnapshotsRequest { + // The name of the topic that snapshots are attached to. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; + + // Maximum number of snapshot names to return. + int32 page_size = 2; + + // The value returned by the last `ListTopicSnapshotsResponse`; indicates + // that this is a continuation of a prior `ListTopicSnapshots` call, and + // that the system should return the next page of data. + string page_token = 3; +} + +// Response for the `ListTopicSnapshots` method.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. +message ListTopicSnapshotsResponse { + // The names of the snapshots that match the request. + repeated string snapshots = 1; + + // If not empty, indicates that there may be more snapshots that match + // the request; this value should be passed in a new + // `ListTopicSnapshotsRequest` to get more snapshots. + string next_page_token = 2; +} + // Request for the `DeleteTopic` method. message DeleteTopicRequest { // Name of the topic to delete. @@ -431,7 +512,8 @@ message Subscription { // For pull subscriptions, this value is used as the initial value for the ack // deadline. To override this value for a given message, call // `ModifyAckDeadline` with the corresponding `ack_id` if using - // pull. + // non-streaming pull or send the `ack_id` in a + // `StreamingModifyAckDeadlineRequest` if using streaming pull. // The minimum custom deadline you can specify is 10 seconds. // The maximum custom deadline you can specify is 600 seconds (10 minutes). // If this parameter is 0, a default value of 10 seconds is used. @@ -446,7 +528,10 @@ message Subscription { // Indicates whether to retain acknowledged messages. If true, then // messages are not expunged from the subscription's backlog, even if they are // acknowledged, until they fall out of the `message_retention_duration` - // window. + // window.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. bool retain_acked_messages = 7; // How long to retain unacknowledged messages in the subscription's backlog, @@ -454,7 +539,10 @@ message Subscription { // If `retain_acked_messages` is true, then this also configures the retention // of acknowledged messages, and thus configures how far back in time a `Seek` // can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - // minutes. + // minutes.

+ // ALPHA: This feature is part of an alpha release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. google.protobuf.Duration message_retention_duration = 8; // User labels. @@ -561,7 +649,7 @@ message ModifyPushConfigRequest { // An empty `pushConfig` indicates that the Pub/Sub system should // stop pushing messages from the given subscription and allow // messages to be pulled and acknowledged - effectively pausing - // the subscription if `Pull` is not called. + // the subscription if `Pull` or `StreamingPull` is not called. PushConfig push_config = 2; } @@ -674,7 +762,10 @@ message StreamingPullResponse { repeated ReceivedMessage received_messages = 1; } -// Request for the `CreateSnapshot` method. +// Request for the `CreateSnapshot` method.

+// ALPHA: This feature is part of an alpha release. This API might be changed in +// backward-incompatible ways and is not recommended for production use. +// It is not subject to any SLA or deprecation policy. message CreateSnapshotRequest { // Optional user-provided name for this snapshot. // If the name is not provided in the request, the server will assign a random @@ -693,11 +784,17 @@ message CreateSnapshotRequest { // successful completion of the CreateSnapshot request. // Format is `projects/{project}/subscriptions/{sub}`. string subscription = 2; + + // User labels. + map labels = 3; } -// Request for the UpdateSnapshot method. +// Request for the UpdateSnapshot method.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. message UpdateSnapshotRequest { - // The updated snpashot object. + // The updated snapshot object. Snapshot snapshot = 1; // Indicates which fields in the provided snapshot to update. @@ -705,7 +802,10 @@ message UpdateSnapshotRequest { google.protobuf.FieldMask update_mask = 2; } -// A snapshot resource. +// A snapshot resource.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. message Snapshot { // The name of the snapshot. string name = 1; @@ -721,14 +821,28 @@ message Snapshot { // For example, consider a subscription whose oldest unacked message is 3 days // old. If a snapshot is created from this subscription, the snapshot -- which // will always capture this 3-day-old backlog as long as the snapshot - // exists -- will expire in 4 days. + // exists -- will expire in 4 days. The service will refuse to create a + // snapshot that would expire in less than 1 hour after creation. google.protobuf.Timestamp expire_time = 3; // User labels. map labels = 4; } -// Request for the `ListSnapshots` method. +// Request for the GetSnapshot method.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. +message GetSnapshotRequest { + // The name of the snapshot to get. + // Format is `projects/{project}/snapshots/{snap}`. + string snapshot = 1; +} + +// Request for the `ListSnapshots` method.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. message ListSnapshotsRequest { // The name of the cloud project that snapshots belong to. // Format is `projects/{project}`. @@ -743,7 +857,10 @@ message ListSnapshotsRequest { string page_token = 3; } -// Response for the `ListSnapshots` method. +// Response for the `ListSnapshots` method.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. message ListSnapshotsResponse { // The resulting snapshots. repeated Snapshot snapshots = 1; @@ -753,14 +870,20 @@ message ListSnapshotsResponse { string next_page_token = 2; } -// Request for the `DeleteSnapshot` method. +// Request for the `DeleteSnapshot` method.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. message DeleteSnapshotRequest { // The name of the snapshot to delete. // Format is `projects/{project}/snapshots/{snap}`. string snapshot = 1; } -// Request for the `Seek` method. +// Request for the `Seek` method.

+// ALPHA: This feature is part of an alpha release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. message SeekRequest { // The subscription to affect. string subscription = 1; diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js new file mode 100644 index 00000000000..16e2d5dfe9e --- /dev/null +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -0,0 +1,92 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +'use strict'; + +describe('PublisherSmokeTest', () => { + if (!process.env.GCLOUD_PROJECT) { + throw new Error("Usage: GCLOUD_PROJECT= node #{$0}"); + } + var projectId = process.env.GCLOUD_PROJECT; + + it('successfully makes a call to the service using promises', done => { + const pubsub = require('../src'); + + var client = new pubsub.v1.PublisherClient({ + // optional auth parameters. + }); + + // Iterate over all elements. + var formattedProject = client.projectPath(projectId); + + client.listTopics({project: formattedProject}) + .then(responses => { + var resources = responses[0]; + for (let i = 0; i < resources.length; i += 1) { + console.log(resources[i]); + } + }) + .then(done) + .catch(done); + }); + + it('successfully makes a call to the service using callbacks', done => { + const pubsub = require('../src'); + + var client = new pubsub.v1.PublisherClient({ + // optional auth parameters. + }); + + // Or obtain the paged response. + var formattedProject = client.projectPath(projectId); + + + var options = {autoPaginate: false}; + var callback = responses => { + // The actual resources in a response. + var resources = responses[0]; + // The next request if the response shows that there are more responses. + var nextRequest = responses[1]; + // The actual response object, if necessary. + // var rawResponse = responses[2]; + for (let i = 0; i < resources.length; i += 1) { + console.log(resources[i]); + } + if (nextRequest) { + // Fetch the next page. + return client.listTopics(nextRequest, options).then(callback); + } + } + client.listTopics({project: formattedProject}, options) + .then(callback) + .then(done) + .catch(done); + }); + + it('successfully makes a call to the service using streaming', done => { + const pubsub = require('../src'); + + var client = new pubsub.v1.PublisherClient({ + // optional auth parameters. + }); + + var formattedProject = client.projectPath(projectId); + client.listTopicsStream({project: formattedProject}) + .on('data', element => { + console.log(element); + }) + .on('error', done) + .on('end', done); + }); +}); diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index cc00d3382b9..cd57b6f78a1 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -19,7 +19,8 @@ var common = require('@google-cloud/common'); var extend = require('extend'); var googleAuth = require('google-auto-auth'); -var grpc = require('google-gax').grpc().grpc; +var gax = require('google-gax'); +var grpc = new gax.GrpcClient().grpc; var is = require('is'); var PKG = require('../package.json'); diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js new file mode 100644 index 00000000000..52a719ae88d --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js @@ -0,0 +1,93 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. + +/** + * Request message for `SetIamPolicy` method. + * + * @property {string} resource + * REQUIRED: The resource for which the policy is being specified. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * + * @property {Object} policy + * REQUIRED: The complete policy to be applied to the `resource`. The size of + * the policy is limited to a few 10s of KB. An empty policy is a + * valid policy but certain Cloud Platform services (such as Projects) + * might reject them. + * + * This object should have the same structure as [Policy]{@link google.iam.v1.Policy} + * + * @typedef SetIamPolicyRequest + * @memberof google.iam.v1 + * @see [google.iam.v1.SetIamPolicyRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} + */ +var SetIamPolicyRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request message for `GetIamPolicy` method. + * + * @property {string} resource + * REQUIRED: The resource for which the policy is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * + * @typedef GetIamPolicyRequest + * @memberof google.iam.v1 + * @see [google.iam.v1.GetIamPolicyRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} + */ +var GetIamPolicyRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request message for `TestIamPermissions` method. + * + * @property {string} resource + * REQUIRED: The resource for which the policy detail is being requested. + * `resource` is usually specified as a path. For example, a Project + * resource is specified as `projects/{project}`. + * + * @property {string[]} permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * + * @typedef TestIamPermissionsRequest + * @memberof google.iam.v1 + * @see [google.iam.v1.TestIamPermissionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} + */ +var TestIamPermissionsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response message for `TestIamPermissions` method. + * + * @property {string[]} permissions + * A subset of `TestPermissionsRequest.permissions` that the caller is + * allowed. + * + * @typedef TestIamPermissionsResponse + * @memberof google.iam.v1 + * @see [google.iam.v1.TestIamPermissionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} + */ +var TestIamPermissionsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js new file mode 100644 index 00000000000..0163cf59f58 --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js @@ -0,0 +1,162 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. + +/** + * Defines an Identity and Access Management (IAM) policy. It is used to + * specify access control policies for Cloud Platform resources. + * + * + * A `Policy` consists of a list of `bindings`. A `Binding` binds a list of + * `members` to a `role`, where the members can be user accounts, Google groups, + * Google domains, and service accounts. A `role` is a named list of permissions + * defined by IAM. + * + * **Example** + * + * { + * "bindings": [ + * { + * "role": "roles/owner", + * "members": [ + * "user:mike@example.com", + * "group:admins@example.com", + * "domain:google.com", + * "serviceAccount:my-other-app@appspot.gserviceaccount.com", + * ] + * }, + * { + * "role": "roles/viewer", + * "members": ["user:sean@example.com"] + * } + * ] + * } + * + * For a description of IAM and its features, see the + * [IAM developer's guide](https://cloud.google.com/iam). + * + * @property {number} version + * Version of the `Policy`. The default version is 0. + * + * @property {Object[]} bindings + * Associates a list of `members` to a `role`. + * Multiple `bindings` must not be specified for the same `role`. + * `bindings` with no members will result in an error. + * + * This object should have the same structure as [Binding]{@link google.iam.v1.Binding} + * + * @property {string} etag + * `etag` is used for optimistic concurrency control as a way to help + * prevent simultaneous updates of a policy from overwriting each other. + * It is strongly suggested that systems make use of the `etag` in the + * read-modify-write cycle to perform policy updates in order to avoid race + * conditions: An `etag` is returned in the response to `getIamPolicy`, and + * systems are expected to put that etag in the request to `setIamPolicy` to + * ensure that their change will be applied to the same version of the policy. + * + * If no `etag` is provided in the call to `setIamPolicy`, then the existing + * policy is overwritten blindly. + * + * @typedef Policy + * @memberof google.iam.v1 + * @see [google.iam.v1.Policy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} + */ +var Policy = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Associates `members` with a `role`. + * + * @property {string} role + * Role that is assigned to `members`. + * For example, `roles/viewer`, `roles/editor`, or `roles/owner`. + * Required + * + * @property {string[]} members + * Specifies the identities requesting access for a Cloud Platform resource. + * `members` can have the following values: + * + * * `allUsers`: A special identifier that represents anyone who is + * on the internet; with or without a Google account. + * + * * `allAuthenticatedUsers`: A special identifier that represents anyone + * who is authenticated with a Google account or a service account. + * + * * `user:{emailid}`: An email address that represents a specific Google + * account. For example, `alice@gmail.com` or `joe@example.com`. + * + * + * * `serviceAccount:{emailid}`: An email address that represents a service + * account. For example, `my-other-app@appspot.gserviceaccount.com`. + * + * * `group:{emailid}`: An email address that represents a Google group. + * For example, `admins@example.com`. + * + * * `domain:{domain}`: A Google Apps domain name that represents all the + * users of that domain. For example, `google.com` or `example.com`. + * + * @typedef Binding + * @memberof google.iam.v1 + * @see [google.iam.v1.Binding definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} + */ +var Binding = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * The difference delta between two policies. + * + * @property {Object[]} bindingDeltas + * The delta for Bindings between two policies. + * + * This object should have the same structure as [BindingDelta]{@link google.iam.v1.BindingDelta} + * + * @typedef PolicyDelta + * @memberof google.iam.v1 + * @see [google.iam.v1.PolicyDelta definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} + */ +var PolicyDelta = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * One delta entry for Binding. Each individual change (only one member in each + * entry) to a binding will be a separate entry. + * + * @property {number} action + * The action that was performed on a Binding. + * Required + * + * The number should be among the values of [Action]{@link google.iam.v1.Action} + * + * @property {string} role + * Role that is assigned to `members`. + * For example, `roles/viewer`, `roles/editor`, or `roles/owner`. + * Required + * + * @property {string} member + * A single identity requesting access for a Cloud Platform resource. + * Follows the same format of Binding.members. + * Required + * + * @typedef BindingDelta + * @memberof google.iam.v1 + * @see [google.iam.v1.BindingDelta definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} + */ +var BindingDelta = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js new file mode 100644 index 00000000000..3ea5c376abb --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js @@ -0,0 +1,97 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. + +/** + * A Duration represents a signed, fixed-length span of time represented + * as a count of seconds and fractions of seconds at nanosecond + * resolution. It is independent of any calendar and concepts like "day" + * or "month". It is related to Timestamp in that the difference between + * two Timestamp values is a Duration and it can be added or subtracted + * from a Timestamp. Range is approximately +-10,000 years. + * + * # Examples + * + * Example 1: Compute Duration from two Timestamps in pseudo code. + * + * Timestamp start = ...; + * Timestamp end = ...; + * Duration duration = ...; + * + * duration.seconds = end.seconds - start.seconds; + * duration.nanos = end.nanos - start.nanos; + * + * if (duration.seconds < 0 && duration.nanos > 0) { + * duration.seconds += 1; + * duration.nanos -= 1000000000; + * } else if (durations.seconds > 0 && duration.nanos < 0) { + * duration.seconds -= 1; + * duration.nanos += 1000000000; + * } + * + * Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. + * + * Timestamp start = ...; + * Duration duration = ...; + * Timestamp end = ...; + * + * end.seconds = start.seconds + duration.seconds; + * end.nanos = start.nanos + duration.nanos; + * + * if (end.nanos < 0) { + * end.seconds -= 1; + * end.nanos += 1000000000; + * } else if (end.nanos >= 1000000000) { + * end.seconds += 1; + * end.nanos -= 1000000000; + * } + * + * Example 3: Compute Duration from datetime.timedelta in Python. + * + * td = datetime.timedelta(days=3, minutes=10) + * duration = Duration() + * duration.FromTimedelta(td) + * + * # JSON Mapping + * + * In JSON format, the Duration type is encoded as a string rather than an + * object, where the string ends in the suffix "s" (indicating seconds) and + * is preceded by the number of seconds, with nanoseconds expressed as + * fractional seconds. For example, 3 seconds with 0 nanoseconds should be + * encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should + * be expressed in JSON format as "3.000000001s", and 3 seconds and 1 + * microsecond should be expressed in JSON format as "3.000001s". + * + * @property {number} seconds + * Signed seconds of the span of time. Must be from -315,576,000,000 + * to +315,576,000,000 inclusive. Note: these bounds are computed from: + * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years + * + * @property {number} nanos + * Signed fractions of a second at nanosecond resolution of the span + * of time. Durations less than one second are represented with a 0 + * `seconds` field and a positive or negative `nanos` field. For durations + * of one second or more, a non-zero value for the `nanos` field must be + * of the same sign as the `seconds` field. Must be from -999,999,999 + * to +999,999,999 inclusive. + * + * @typedef Duration + * @memberof google.protobuf + * @see [google.protobuf.Duration definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/duration.proto} + */ +var Duration = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js new file mode 100644 index 00000000000..5e3640e90d8 --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js @@ -0,0 +1,34 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. + +/** + * A generic empty message that you can re-use to avoid defining duplicated + * empty messages in your APIs. A typical example is to use it as the request + * or the response type of an API method. For instance: + * + * service Foo { + * rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty); + * } + * + * The JSON representation for `Empty` is empty JSON object `{}`. + * @typedef Empty + * @memberof google.protobuf + * @see [google.protobuf.Empty definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/empty.proto} + */ +var Empty = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js new file mode 100644 index 00000000000..c82c2b33949 --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js @@ -0,0 +1,230 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. + +/** + * `FieldMask` represents a set of symbolic field paths, for example: + * + * paths: "f.a" + * paths: "f.b.d" + * + * Here `f` represents a field in some root message, `a` and `b` + * fields in the message found in `f`, and `d` a field found in the + * message in `f.b`. + * + * Field masks are used to specify a subset of fields that should be + * returned by a get operation or modified by an update operation. + * Field masks also have a custom JSON encoding (see below). + * + * # Field Masks in Projections + * + * When used in the context of a projection, a response message or + * sub-message is filtered by the API to only contain those fields as + * specified in the mask. For example, if the mask in the previous + * example is applied to a response message as follows: + * + * f { + * a : 22 + * b { + * d : 1 + * x : 2 + * } + * y : 13 + * } + * z: 8 + * + * The result will not contain specific values for fields x,y and z + * (their value will be set to the default, and omitted in proto text + * output): + * + * + * f { + * a : 22 + * b { + * d : 1 + * } + * } + * + * A repeated field is not allowed except at the last position of a + * paths string. + * + * If a FieldMask object is not present in a get operation, the + * operation applies to all fields (as if a FieldMask of all fields + * had been specified). + * + * Note that a field mask does not necessarily apply to the + * top-level response message. In case of a REST get operation, the + * field mask applies directly to the response, but in case of a REST + * list operation, the mask instead applies to each individual message + * in the returned resource list. In case of a REST custom method, + * other definitions may be used. Where the mask applies will be + * clearly documented together with its declaration in the API. In + * any case, the effect on the returned resource/resources is required + * behavior for APIs. + * + * # Field Masks in Update Operations + * + * A field mask in update operations specifies which fields of the + * targeted resource are going to be updated. The API is required + * to only change the values of the fields as specified in the mask + * and leave the others untouched. If a resource is passed in to + * describe the updated values, the API ignores the values of all + * fields not covered by the mask. + * + * If a repeated field is specified for an update operation, the existing + * repeated values in the target resource will be overwritten by the new values. + * Note that a repeated field is only allowed in the last position of a `paths` + * string. + * + * If a sub-message is specified in the last position of the field mask for an + * update operation, then the existing sub-message in the target resource is + * overwritten. Given the target message: + * + * f { + * b { + * d : 1 + * x : 2 + * } + * c : 1 + * } + * + * And an update message: + * + * f { + * b { + * d : 10 + * } + * } + * + * then if the field mask is: + * + * paths: "f.b" + * + * then the result will be: + * + * f { + * b { + * d : 10 + * } + * c : 1 + * } + * + * However, if the update mask was: + * + * paths: "f.b.d" + * + * then the result would be: + * + * f { + * b { + * d : 10 + * x : 2 + * } + * c : 1 + * } + * + * In order to reset a field's value to the default, the field must + * be in the mask and set to the default value in the provided resource. + * Hence, in order to reset all fields of a resource, provide a default + * instance of the resource and set all fields in the mask, or do + * not provide a mask as described below. + * + * If a field mask is not present on update, the operation applies to + * all fields (as if a field mask of all fields has been specified). + * Note that in the presence of schema evolution, this may mean that + * fields the client does not know and has therefore not filled into + * the request will be reset to their default. If this is unwanted + * behavior, a specific service may require a client to always specify + * a field mask, producing an error if not. + * + * As with get operations, the location of the resource which + * describes the updated values in the request message depends on the + * operation kind. In any case, the effect of the field mask is + * required to be honored by the API. + * + * ## Considerations for HTTP REST + * + * The HTTP kind of an update operation which uses a field mask must + * be set to PATCH instead of PUT in order to satisfy HTTP semantics + * (PUT must only be used for full updates). + * + * # JSON Encoding of Field Masks + * + * In JSON, a field mask is encoded as a single string where paths are + * separated by a comma. Fields name in each path are converted + * to/from lower-camel naming conventions. + * + * As an example, consider the following message declarations: + * + * message Profile { + * User user = 1; + * Photo photo = 2; + * } + * message User { + * string display_name = 1; + * string address = 2; + * } + * + * In proto a field mask for `Profile` may look as such: + * + * mask { + * paths: "user.display_name" + * paths: "photo" + * } + * + * In JSON, the same mask is represented as below: + * + * { + * mask: "user.displayName,photo" + * } + * + * # Field Masks and Oneof Fields + * + * Field masks treat fields in oneofs just as regular fields. Consider the + * following message: + * + * message SampleMessage { + * oneof test_oneof { + * string name = 4; + * SubMessage sub_message = 9; + * } + * } + * + * The field mask can be: + * + * mask { + * paths: "name" + * } + * + * Or: + * + * mask { + * paths: "sub_message" + * } + * + * Note that oneof type names ("test_oneof" in this case) cannot be used in + * paths. + * + * @property {string[]} paths + * The set of field mask paths. + * + * @typedef FieldMask + * @memberof google.protobuf + * @see [google.protobuf.FieldMask definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/field_mask.proto} + */ +var FieldMask = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js new file mode 100644 index 00000000000..a02db52bdeb --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js @@ -0,0 +1,113 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. + +/** + * A Timestamp represents a point in time independent of any time zone + * or calendar, represented as seconds and fractions of seconds at + * nanosecond resolution in UTC Epoch time. It is encoded using the + * Proleptic Gregorian Calendar which extends the Gregorian calendar + * backwards to year one. It is encoded assuming all minutes are 60 + * seconds long, i.e. leap seconds are "smeared" so that no leap second + * table is needed for interpretation. Range is from + * 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. + * By restricting to that range, we ensure that we can convert to + * and from RFC 3339 date strings. + * See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt). + * + * # Examples + * + * Example 1: Compute Timestamp from POSIX `time()`. + * + * Timestamp timestamp; + * timestamp.set_seconds(time(NULL)); + * timestamp.set_nanos(0); + * + * Example 2: Compute Timestamp from POSIX `gettimeofday()`. + * + * struct timeval tv; + * gettimeofday(&tv, NULL); + * + * Timestamp timestamp; + * timestamp.set_seconds(tv.tv_sec); + * timestamp.set_nanos(tv.tv_usec * 1000); + * + * Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. + * + * FILETIME ft; + * GetSystemTimeAsFileTime(&ft); + * UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; + * + * // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z + * // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. + * Timestamp timestamp; + * timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); + * timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); + * + * Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. + * + * long millis = System.currentTimeMillis(); + * + * Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) + * .setNanos((int) ((millis % 1000) * 1000000)).build(); + * + * + * Example 5: Compute Timestamp from current time in Python. + * + * timestamp = Timestamp() + * timestamp.GetCurrentTime() + * + * # JSON Mapping + * + * In JSON format, the Timestamp type is encoded as a string in the + * [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the + * format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z" + * where {year} is always expressed using four digits while {month}, {day}, + * {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional + * seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), + * are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone + * is required, though only UTC (as indicated by "Z") is presently supported. + * + * For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past + * 01:30 UTC on January 15, 2017. + * + * In JavaScript, one can convert a Date object to this format using the + * standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString] + * method. In Python, a standard `datetime.datetime` object can be converted + * to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) + * with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one + * can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://cloud.google.com + * http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()) + * to obtain a formatter capable of generating timestamps in this format. + * + * @property {number} seconds + * Represents seconds of UTC time since Unix epoch + * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to + * 9999-12-31T23:59:59Z inclusive. + * + * @property {number} nanos + * Non-negative fractions of a second at nanosecond resolution. Negative + * second values with fractions must still have non-negative nanos values + * that count forward in time. Must be from 0 to 999,999,999 + * inclusive. + * + * @typedef Timestamp + * @memberof google.protobuf + * @see [google.protobuf.Timestamp definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto} + */ +var Timestamp = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js new file mode 100644 index 00000000000..6a10b9b07eb --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -0,0 +1,966 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. + +/** + * @property {string[]} allowedPersistenceRegions + * The list of GCP regions where messages that are published to the topic may + * be persisted in storage. Messages published by publishers running in + * non-allowed GCP regions (or running outside of GCP altogether) will be + * routed for storage in one of the allowed regions. An empty list indicates a + * misconfiguration at the project or organization level, which will result in + * all Publish operations failing. + * + * @typedef MessageStoragePolicy + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.MessageStoragePolicy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var MessageStoragePolicy = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A topic resource. + * + * @property {string} name + * The name of the topic. It must have the format + * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, + * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), + * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent + * signs (`%`). It must be between 3 and 255 characters in length, and it + * must not start with `"goog"`. + * + * @property {Object.} labels + * User labels. + * + * @property {Object} messageStoragePolicy + * Policy constraining how messages published to the topic may be stored. It + * is determined when the topic is created based on the policy configured at + * the project level. It must not be set by the caller in the request to + * CreateTopic or to UpdateTopic. This field will be populated in the + * responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the + * response, then no constraints are in effect. + * + * This object should have the same structure as [MessageStoragePolicy]{@link google.pubsub.v1.MessageStoragePolicy} + * + * @typedef Topic + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.Topic definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var Topic = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A message data and its attributes. The message payload must not be empty; + * it must contain either a non-empty data field, or at least one attribute. + * + * @property {string} data + * The message payload. + * + * @property {Object.} attributes + * Optional attributes for this message. + * + * @property {string} messageId + * ID of this message, assigned by the server when the message is published. + * Guaranteed to be unique within the topic. This value may be read by a + * subscriber that receives a `PubsubMessage` via a `Pull` call or a push + * delivery. It must not be populated by the publisher in a `Publish` call. + * + * @property {Object} publishTime + * The time at which the message was published, populated by the server when + * it receives the `Publish` call. It must not be populated by the + * publisher in a `Publish` call. + * + * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} + * + * @typedef PubsubMessage + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.PubsubMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PubsubMessage = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the GetTopic method. + * + * @property {string} topic + * The name of the topic to get. + * Format is `projects/{project}/topics/{topic}`. + * + * @typedef GetTopicRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.GetTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var GetTopicRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the UpdateTopic method. + * + * @property {Object} topic + * The updated topic object. + * + * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} + * + * @property {Object} updateMask + * Indicates which fields in the provided topic to update. Must be specified + * and non-empty. Note that if `update_mask` contains + * "message_storage_policy" then the new value will be determined based on the + * policy configured at the project or organization level. The + * `message_storage_policy` must not be set in the `topic` provided above. + * + * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} + * + * @typedef UpdateTopicRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.UpdateTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var UpdateTopicRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the Publish method. + * + * @property {string} topic + * The messages in the request will be published on this topic. + * Format is `projects/{project}/topics/{topic}`. + * + * @property {Object[]} messages + * The messages to publish. + * + * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} + * + * @typedef PublishRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.PublishRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PublishRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `Publish` method. + * + * @property {string[]} messageIds + * The server-assigned ID of each published message, in the same order as + * the messages in the request. IDs are guaranteed to be unique within + * the topic. + * + * @typedef PublishResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.PublishResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PublishResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListTopics` method. + * + * @property {string} project + * The name of the cloud project that topics belong to. + * Format is `projects/{project}`. + * + * @property {number} pageSize + * Maximum number of topics to return. + * + * @property {string} pageToken + * The value returned by the last `ListTopicsResponse`; indicates that this is + * a continuation of a prior `ListTopics` call, and that the system should + * return the next page of data. + * + * @typedef ListTopicsRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListTopicsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListTopics` method. + * + * @property {Object[]} topics + * The resulting topics. + * + * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more topics that match the + * request; this value should be passed in a new `ListTopicsRequest`. + * + * @typedef ListTopicsResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListTopicsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListTopicSubscriptions` method. + * + * @property {string} topic + * The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. + * + * @property {number} pageSize + * Maximum number of subscription names to return. + * + * @property {string} pageToken + * The value returned by the last `ListTopicSubscriptionsResponse`; indicates + * that this is a continuation of a prior `ListTopicSubscriptions` call, and + * that the system should return the next page of data. + * + * @typedef ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListTopicSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicSubscriptionsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListTopicSubscriptions` method. + * + * @property {string[]} subscriptions + * The names of the subscriptions that match the request. + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more subscriptions that match + * the request; this value should be passed in a new + * `ListTopicSubscriptionsRequest` to get more subscriptions. + * + * @typedef ListTopicSubscriptionsResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListTopicSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicSubscriptionsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListTopicSnapshots` method.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {string} topic + * The name of the topic that snapshots are attached to. + * Format is `projects/{project}/topics/{topic}`. + * + * @property {number} pageSize + * Maximum number of snapshot names to return. + * + * @property {string} pageToken + * The value returned by the last `ListTopicSnapshotsResponse`; indicates + * that this is a continuation of a prior `ListTopicSnapshots` call, and + * that the system should return the next page of data. + * + * @typedef ListTopicSnapshotsRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListTopicSnapshotsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicSnapshotsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListTopicSnapshots` method.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {string[]} snapshots + * The names of the snapshots that match the request. + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more snapshots that match + * the request; this value should be passed in a new + * `ListTopicSnapshotsRequest` to get more snapshots. + * + * @typedef ListTopicSnapshotsResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListTopicSnapshotsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListTopicSnapshotsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `DeleteTopic` method. + * + * @property {string} topic + * Name of the topic to delete. + * Format is `projects/{project}/topics/{topic}`. + * + * @typedef DeleteTopicRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.DeleteTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var DeleteTopicRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A subscription resource. + * + * @property {string} name + * The name of the subscription. It must have the format + * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must + * start with a letter, and contain only letters (`[A-Za-z]`), numbers + * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), + * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters + * in length, and it must not start with `"goog"` + * + * @property {string} topic + * The name of the topic from which this subscription is receiving messages. + * Format is `projects/{project}/topics/{topic}`. + * The value of this field will be `_deleted-topic_` if the topic has been + * deleted. + * + * @property {Object} pushConfig + * If push delivery is used with this subscription, this field is + * used to configure it. An empty `pushConfig` signifies that the subscriber + * will pull and ack messages using API methods. + * + * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} + * + * @property {number} ackDeadlineSeconds + * This value is the maximum time after a subscriber receives a message + * before the subscriber should acknowledge the message. After message + * delivery but before the ack deadline expires and before the message is + * acknowledged, it is an outstanding message and will not be delivered + * again during that time (on a best-effort basis). + * + * For pull subscriptions, this value is used as the initial value for the ack + * deadline. To override this value for a given message, call + * `ModifyAckDeadline` with the corresponding `ack_id` if using + * non-streaming pull or send the `ack_id` in a + * `StreamingModifyAckDeadlineRequest` if using streaming pull. + * The minimum custom deadline you can specify is 10 seconds. + * The maximum custom deadline you can specify is 600 seconds (10 minutes). + * If this parameter is 0, a default value of 10 seconds is used. + * + * For push delivery, this value is also used to set the request timeout for + * the call to the push endpoint. + * + * If the subscriber never acknowledges the message, the Pub/Sub + * system will eventually redeliver the message. + * + * @property {boolean} retainAckedMessages + * Indicates whether to retain acknowledged messages. If true, then + * messages are not expunged from the subscription's backlog, even if they are + * acknowledged, until they fall out of the `message_retention_duration` + * window.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {Object} messageRetentionDuration + * How long to retain unacknowledged messages in the subscription's backlog, + * from the moment a message is published. + * If `retain_acked_messages` is true, then this also configures the retention + * of acknowledged messages, and thus configures how far back in time a `Seek` + * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 + * minutes.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * This object should have the same structure as [Duration]{@link google.protobuf.Duration} + * + * @property {Object.} labels + * User labels. + * + * @typedef Subscription + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.Subscription definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var Subscription = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Configuration for a push delivery endpoint. + * + * @property {string} pushEndpoint + * A URL locating the endpoint to which messages should be pushed. + * For example, a Webhook endpoint might use "https://example.com/push". + * + * @property {Object.} attributes + * Endpoint configuration attributes. + * + * Every endpoint has a set of API supported attributes that can be used to + * control different aspects of the message delivery. + * + * The currently supported attribute is `x-goog-version`, which you can + * use to change the format of the pushed message. This attribute + * indicates the version of the data expected by the endpoint. This + * controls the shape of the pushed message (i.e., its fields and metadata). + * The endpoint version is based on the version of the Pub/Sub API. + * + * If not present during the `CreateSubscription` call, it will default to + * the version of the API used to make such call. If not present during a + * `ModifyPushConfig` call, its value will not be changed. `GetSubscription` + * calls will always return a valid version, even if the subscription was + * created without this attribute. + * + * The possible values for this attribute are: + * + * * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. + * * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. + * + * @typedef PushConfig + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.PushConfig definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PushConfig = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A message and its corresponding acknowledgment ID. + * + * @property {string} ackId + * This ID can be used to acknowledge the received message. + * + * @property {Object} message + * The message. + * + * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} + * + * @typedef ReceivedMessage + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ReceivedMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ReceivedMessage = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the GetSubscription method. + * + * @property {string} subscription + * The name of the subscription to get. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @typedef GetSubscriptionRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.GetSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var GetSubscriptionRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the UpdateSubscription method. + * + * @property {Object} subscription + * The updated subscription object. + * + * This object should have the same structure as [Subscription]{@link google.pubsub.v1.Subscription} + * + * @property {Object} updateMask + * Indicates which fields in the provided subscription to update. + * Must be specified and non-empty. + * + * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} + * + * @typedef UpdateSubscriptionRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.UpdateSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var UpdateSubscriptionRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListSubscriptions` method. + * + * @property {string} project + * The name of the cloud project that subscriptions belong to. + * Format is `projects/{project}`. + * + * @property {number} pageSize + * Maximum number of subscriptions to return. + * + * @property {string} pageToken + * The value returned by the last `ListSubscriptionsResponse`; indicates that + * this is a continuation of a prior `ListSubscriptions` call, and that the + * system should return the next page of data. + * + * @typedef ListSubscriptionsRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListSubscriptionsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListSubscriptions` method. + * + * @property {Object[]} subscriptions + * The subscriptions that match the request. + * + * This object should have the same structure as [Subscription]{@link google.pubsub.v1.Subscription} + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more subscriptions that match + * the request; this value should be passed in a new + * `ListSubscriptionsRequest` to get more subscriptions. + * + * @typedef ListSubscriptionsResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListSubscriptionsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the DeleteSubscription method. + * + * @property {string} subscription + * The subscription to delete. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @typedef DeleteSubscriptionRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.DeleteSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var DeleteSubscriptionRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the ModifyPushConfig method. + * + * @property {string} subscription + * The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {Object} pushConfig + * The push configuration for future deliveries. + * + * An empty `pushConfig` indicates that the Pub/Sub system should + * stop pushing messages from the given subscription and allow + * messages to be pulled and acknowledged - effectively pausing + * the subscription if `Pull` or `StreamingPull` is not called. + * + * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} + * + * @typedef ModifyPushConfigRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ModifyPushConfigRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ModifyPushConfigRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `Pull` method. + * + * @property {string} subscription + * The subscription from which messages should be pulled. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {boolean} returnImmediately + * If this field set to true, the system will respond immediately even if + * it there are no messages available to return in the `Pull` response. + * Otherwise, the system may wait (for a bounded amount of time) until at + * least one message is available, rather than returning no messages. The + * client may cancel the request if it does not wish to wait any longer for + * the response. + * + * @property {number} maxMessages + * The maximum number of messages returned for this request. The Pub/Sub + * system may return fewer than the number specified. + * + * @typedef PullRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.PullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PullRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `Pull` method. + * + * @property {Object[]} receivedMessages + * Received Pub/Sub messages. The Pub/Sub system will return zero messages if + * there are no more available in the backlog. The Pub/Sub system may return + * fewer than the `maxMessages` requested even if there are more messages + * available in the backlog. + * + * This object should have the same structure as [ReceivedMessage]{@link google.pubsub.v1.ReceivedMessage} + * + * @typedef PullResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.PullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var PullResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the ModifyAckDeadline method. + * + * @property {string} subscription + * The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {string[]} ackIds + * List of acknowledgment IDs. + * + * @property {number} ackDeadlineSeconds + * The new ack deadline with respect to the time this request was sent to + * the Pub/Sub system. For example, if the value is 10, the new + * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call + * was made. Specifying zero may immediately make the message available for + * another pull request. + * The minimum deadline you can specify is 0 seconds. + * The maximum deadline you can specify is 600 seconds (10 minutes). + * + * @typedef ModifyAckDeadlineRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ModifyAckDeadlineRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ModifyAckDeadlineRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the Acknowledge method. + * + * @property {string} subscription + * The subscription whose message is being acknowledged. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {string[]} ackIds + * The acknowledgment ID for the messages being acknowledged that was returned + * by the Pub/Sub system in the `Pull` response. Must not be empty. + * + * @typedef AcknowledgeRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.AcknowledgeRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var AcknowledgeRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `StreamingPull` streaming RPC method. This request is used to + * establish the initial stream as well as to stream acknowledgements and ack + * deadline modifications from the client to the server. + * + * @property {string} subscription + * The subscription for which to initialize the new stream. This must be + * provided in the first request on the stream, and must not be set in + * subsequent requests from client to server. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {string[]} ackIds + * List of acknowledgement IDs for acknowledging previously received messages + * (received on this stream or a different stream). If an ack ID has expired, + * the corresponding message may be redelivered later. Acknowledging a message + * more than once will not result in an error. If the acknowledgement ID is + * malformed, the stream will be aborted with status `INVALID_ARGUMENT`. + * + * @property {number[]} modifyDeadlineSeconds + * The list of new ack deadlines for the IDs listed in + * `modify_deadline_ack_ids`. The size of this list must be the same as the + * size of `modify_deadline_ack_ids`. If it differs the stream will be aborted + * with `INVALID_ARGUMENT`. Each element in this list is applied to the + * element in the same position in `modify_deadline_ack_ids`. The new ack + * deadline is with respect to the time this request was sent to the Pub/Sub + * system. Must be >= 0. For example, if the value is 10, the new ack deadline + * will expire 10 seconds after this request is received. If the value is 0, + * the message is immediately made available for another streaming or + * non-streaming pull request. If the value is < 0 (an error), the stream will + * be aborted with status `INVALID_ARGUMENT`. + * + * @property {string[]} modifyDeadlineAckIds + * List of acknowledgement IDs whose deadline will be modified based on the + * corresponding element in `modify_deadline_seconds`. This field can be used + * to indicate that more time is needed to process a message by the + * subscriber, or to make the message available for redelivery if the + * processing was interrupted. + * + * @property {number} streamAckDeadlineSeconds + * The ack deadline to use for the stream. This must be provided in the + * first request on the stream, but it can also be updated on subsequent + * requests from client to server. The minimum deadline you can specify is 10 + * seconds. The maximum deadline you can specify is 600 seconds (10 minutes). + * + * @typedef StreamingPullRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.StreamingPullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var StreamingPullRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `StreamingPull` method. This response is used to stream + * messages from the server to the client. + * + * @property {Object[]} receivedMessages + * Received Pub/Sub messages. This will not be empty. + * + * This object should have the same structure as [ReceivedMessage]{@link google.pubsub.v1.ReceivedMessage} + * + * @typedef StreamingPullResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.StreamingPullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var StreamingPullResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `CreateSnapshot` method.

+ * ALPHA: This feature is part of an alpha release. This API might be changed in + * backward-incompatible ways and is not recommended for production use. + * It is not subject to any SLA or deprecation policy. + * + * @property {string} name + * Optional user-provided name for this snapshot. + * If the name is not provided in the request, the server will assign a random + * name for this snapshot on the same project as the subscription. + * Note that for REST API requests, you must specify a name. + * Format is `projects/{project}/snapshots/{snap}`. + * + * @property {string} subscription + * The subscription whose backlog the snapshot retains. + * Specifically, the created snapshot is guaranteed to retain: + * (a) The existing backlog on the subscription. More precisely, this is + * defined as the messages in the subscription's backlog that are + * unacknowledged upon the successful completion of the + * `CreateSnapshot` request; as well as: + * (b) Any messages published to the subscription's topic following the + * successful completion of the CreateSnapshot request. + * Format is `projects/{project}/subscriptions/{sub}`. + * + * @property {Object.} labels + * User labels. + * + * @typedef CreateSnapshotRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.CreateSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var CreateSnapshotRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the UpdateSnapshot method.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {Object} snapshot + * The updated snapshot object. + * + * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} + * + * @property {Object} updateMask + * Indicates which fields in the provided snapshot to update. + * Must be specified and non-empty. + * + * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} + * + * @typedef UpdateSnapshotRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.UpdateSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var UpdateSnapshotRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * A snapshot resource.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {string} name + * The name of the snapshot. + * + * @property {string} topic + * The name of the topic from which this snapshot is retaining messages. + * + * @property {Object} expireTime + * The snapshot is guaranteed to exist up until this time. + * A newly-created snapshot expires no later than 7 days from the time of its + * creation. Its exact lifetime is determined at creation by the existing + * backlog in the source subscription. Specifically, the lifetime of the + * snapshot is `7 days - (age of oldest unacked message in the subscription)`. + * For example, consider a subscription whose oldest unacked message is 3 days + * old. If a snapshot is created from this subscription, the snapshot -- which + * will always capture this 3-day-old backlog as long as the snapshot + * exists -- will expire in 4 days. The service will refuse to create a + * snapshot that would expire in less than 1 hour after creation. + * + * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} + * + * @property {Object.} labels + * User labels. + * + * @typedef Snapshot + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.Snapshot definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var Snapshot = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the GetSnapshot method.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {string} snapshot + * The name of the snapshot to get. + * Format is `projects/{project}/snapshots/{snap}`. + * + * @typedef GetSnapshotRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.GetSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var GetSnapshotRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `ListSnapshots` method.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {string} project + * The name of the cloud project that snapshots belong to. + * Format is `projects/{project}`. + * + * @property {number} pageSize + * Maximum number of snapshots to return. + * + * @property {string} pageToken + * The value returned by the last `ListSnapshotsResponse`; indicates that this + * is a continuation of a prior `ListSnapshots` call, and that the system + * should return the next page of data. + * + * @typedef ListSnapshotsRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListSnapshotsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListSnapshotsRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Response for the `ListSnapshots` method.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {Object[]} snapshots + * The resulting snapshots. + * + * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} + * + * @property {string} nextPageToken + * If not empty, indicates that there may be more snapshot that match the + * request; this value should be passed in a new `ListSnapshotsRequest`. + * + * @typedef ListSnapshotsResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ListSnapshotsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var ListSnapshotsResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `DeleteSnapshot` method.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {string} snapshot + * The name of the snapshot to delete. + * Format is `projects/{project}/snapshots/{snap}`. + * + * @typedef DeleteSnapshotRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.DeleteSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var DeleteSnapshotRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * Request for the `Seek` method.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * @property {string} subscription + * The subscription to affect. + * + * @property {Object} time + * The time to seek to. + * Messages retained in the subscription that were published before this + * time are marked as acknowledged, and messages retained in the + * subscription that were published after this time are marked as + * unacknowledged. Note that this operation affects only those messages + * retained in the subscription (configured by the combination of + * `message_retention_duration` and `retain_acked_messages`). For example, + * if `time` corresponds to a point before the message retention + * window (or to a point before the system's notion of the subscription + * creation time), only retained messages will be marked as unacknowledged, + * and already-expunged messages will not be restored. + * + * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} + * + * @property {string} snapshot + * The snapshot to seek to. The snapshot's topic must be the same as that of + * the provided subscription. + * Format is `projects/{project}/snapshots/{snap}`. + * + * @typedef SeekRequest + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.SeekRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var SeekRequest = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + +/** + * @typedef SeekResponse + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.SeekResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +var SeekResponse = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js index fa58b694eae..5ef2078e534 100644 --- a/handwritten/pubsub/src/v1/index.js +++ b/handwritten/pubsub/src/v1/index.js @@ -1,4 +1,4 @@ -// Copyright 2017 Google LLC +// Copyright 2018 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 4141014147b..52bcb46c3f6 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -1,4 +1,4 @@ -// Copyright 2017 Google LLC +// Copyright 2018 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -39,10 +39,10 @@ class PublisherClient { * @param {string} [options.credentials.client_email] * @param {string} [options.credentials.private_key] * @param {string} [options.email] - Account email address. Required when - * usaing a .pem or .p12 keyFilename. + * using a .pem or .p12 keyFilename. * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or * .p12 key downloaded from the Google Developers Console. If you provide - * a path to a JSON file, the projectId option above is not necessary. + * a path to a JSON file, the projectId option below is not necessary. * NOTE: .pem and .p12 require you to specify options.email as well. * @param {number} [options.port] - The port on which to connect to * the remote host. @@ -73,14 +73,14 @@ class PublisherClient { // Create a `gaxGrpc` object, with any grpc-specific options // sent to the client. opts.scopes = this.constructor.scopes; - var gaxGrpc = gax.grpc(opts); + var gaxGrpc = new gax.GrpcClient(opts); // Save the auth object to the client, for use by other methods. this.auth = gaxGrpc.auth; // Determine the client header string. var clientHeader = [ - `gl-node/${process.version.node}`, + `gl-node/${process.version}`, `grpc/${gaxGrpc.grpcVersion}`, `gax/${gax.version}`, `gapic/${VERSION}`, @@ -106,10 +106,10 @@ class PublisherClient { // identifiers to uniquely identify resources within the API. // Create useful helper objects for these. this._pathTemplates = { - projectPathTemplate: new gax.PathTemplate('projects/{project}'), topicPathTemplate: new gax.PathTemplate( 'projects/{project}/topics/{topic}' ), + projectPathTemplate: new gax.PathTemplate('projects/{project}'), }; // Some of the methods on this service return "paged" results, @@ -127,7 +127,7 @@ class PublisherClient { 'subscriptions' ), }; - var protoFilesRoot = new gax.grpc.GoogleProtoFilesRoot(); + var protoFilesRoot = new gax.GoogleProtoFilesRoot(); protoFilesRoot = protobuf.loadSync( path.join( __dirname, @@ -277,7 +277,8 @@ class PublisherClient { // ------------------- /** - * Creates the given topic with the given name. + * Creates the given topic with the given name. See the + * resource name rules. * * @param {Object} request * The request object that will be sent. @@ -290,6 +291,15 @@ class PublisherClient { * must not start with `"goog"`. * @param {Object.} [request.labels] * User labels. + * @param {Object} [request.messageStoragePolicy] + * Policy constraining how messages published to the topic may be stored. It + * is determined when the topic is created based on the policy configured at + * the project level. It must not be set by the caller in the request to + * CreateTopic or to UpdateTopic. This field will be populated in the + * responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the + * response, then no constraints are in effect. + * + * This object should have the same structure as [MessageStoragePolicy]{@link google.pubsub.v1.MessageStoragePolicy} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -330,22 +340,21 @@ class PublisherClient { } /** - * Updates an existing topic. Note that certain properties of a topic are not - * modifiable. Options settings follow the style guide: - * NOTE: The style guide requires body: "topic" instead of body: "*". - * Keeping the latter for internal consistency in V1, however it should be - * corrected in V2. See - * https://cloud.google.com/apis/design/standard_methods#update for details. + * Updates an existing topic. Note that certain properties of a + * topic are not modifiable. * * @param {Object} request * The request object that will be sent. * @param {Object} request.topic - * The topic to update. + * The updated topic object. * * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} * @param {Object} request.updateMask - * Indicates which fields in the provided topic to update. - * Must be specified and non-empty. + * Indicates which fields in the provided topic to update. Must be specified + * and non-empty. Note that if `update_mask` contains + * "message_storage_policy" then the new value will be determined based on the + * policy configured at the project or organization level. The + * `message_storage_policy` must not be set in the `topic` provided above. * * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} * @param {Object} [options] @@ -653,7 +662,7 @@ class PublisherClient { } /** - * Lists the name of the subscriptions for this topic. + * Lists the names of the subscriptions on this topic. * * @param {Object} request * The request object that will be sent. @@ -1025,18 +1034,6 @@ class PublisherClient { // -- Path templates -- // -------------------- - /** - * Return a fully-qualified project resource name string. - * - * @param {String} project - * @returns {String} - */ - projectPath(project) { - return this._pathTemplates.projectPathTemplate.render({ - project: project, - }); - } - /** * Return a fully-qualified topic resource name string. * @@ -1052,14 +1049,15 @@ class PublisherClient { } /** - * Parse the projectName from a project resource. + * Return a fully-qualified project resource name string. * - * @param {String} projectName - * A fully-qualified path representing a project resources. - * @returns {String} - A string representing the project. + * @param {String} project + * @returns {String} */ - matchProjectFromProjectName(projectName) { - return this._pathTemplates.projectPathTemplate.match(projectName).project; + projectPath(project) { + return this._pathTemplates.projectPathTemplate.render({ + project: project, + }); } /** @@ -1083,6 +1081,17 @@ class PublisherClient { matchTopicFromTopicName(topicName) { return this._pathTemplates.topicPathTemplate.match(topicName).topic; } + + /** + * Parse the projectName from a project resource. + * + * @param {String} projectName + * A fully-qualified path representing a project resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromProjectName(projectName) { + return this._pathTemplates.projectPathTemplate.match(projectName).project; + } } module.exports = PublisherClient; diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 6edc3014740..c68d4205512 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -1,4 +1,4 @@ -// Copyright 2017 Google LLC +// Copyright 2018 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,8 @@ const VERSION = require('../../package.json').version; /** * The service that an application uses to manipulate subscriptions and to - * consume messages from a subscription via the `Pull` method. + * consume messages from a subscription via the `Pull` method or by + * establishing a bi-directional stream using the `StreamingPull` method. * * @class * @memberof v1 @@ -38,10 +39,10 @@ class SubscriberClient { * @param {string} [options.credentials.client_email] * @param {string} [options.credentials.private_key] * @param {string} [options.email] - Account email address. Required when - * usaing a .pem or .p12 keyFilename. + * using a .pem or .p12 keyFilename. * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or * .p12 key downloaded from the Google Developers Console. If you provide - * a path to a JSON file, the projectId option above is not necessary. + * a path to a JSON file, the projectId option below is not necessary. * NOTE: .pem and .p12 require you to specify options.email as well. * @param {number} [options.port] - The port on which to connect to * the remote host. @@ -72,14 +73,14 @@ class SubscriberClient { // Create a `gaxGrpc` object, with any grpc-specific options // sent to the client. opts.scopes = this.constructor.scopes; - var gaxGrpc = gax.grpc(opts); + var gaxGrpc = new gax.GrpcClient(opts); // Save the auth object to the client, for use by other methods. this.auth = gaxGrpc.auth; // Determine the client header string. var clientHeader = [ - `gl-node/${process.version.node}`, + `gl-node/${process.version}`, `grpc/${gaxGrpc.grpcVersion}`, `gax/${gax.version}`, `gapic/${VERSION}`, @@ -105,16 +106,16 @@ class SubscriberClient { // identifiers to uniquely identify resources within the API. // Create useful helper objects for these. this._pathTemplates = { - projectPathTemplate: new gax.PathTemplate('projects/{project}'), - snapshotPathTemplate: new gax.PathTemplate( - 'projects/{project}/snapshots/{snapshot}' - ), subscriptionPathTemplate: new gax.PathTemplate( 'projects/{project}/subscriptions/{subscription}' ), topicPathTemplate: new gax.PathTemplate( 'projects/{project}/topics/{topic}' ), + projectPathTemplate: new gax.PathTemplate('projects/{project}'), + snapshotPathTemplate: new gax.PathTemplate( + 'projects/{project}/snapshots/{snapshot}' + ), }; // Some of the methods on this service return "paged" results, @@ -270,7 +271,8 @@ class SubscriberClient { // ------------------- /** - * Creates a subscription to a given topic. + * Creates a subscription to a given topic. See the + * resource name rules. * If the subscription already exists, returns `ALREADY_EXISTS`. * If the corresponding topic doesn't exist, returns `NOT_FOUND`. * @@ -289,7 +291,7 @@ class SubscriberClient { * start with a letter, and contain only letters (`[A-Za-z]`), numbers * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters - * in length, and it must not start with `"goog"`. + * in length, and it must not start with `"goog"` * @param {string} request.topic * The name of the topic from which this subscription is receiving messages. * Format is `projects/{project}/topics/{topic}`. @@ -311,7 +313,8 @@ class SubscriberClient { * For pull subscriptions, this value is used as the initial value for the ack * deadline. To override this value for a given message, call * `ModifyAckDeadline` with the corresponding `ack_id` if using - * pull. + * non-streaming pull or send the `ack_id` in a + * `StreamingModifyAckDeadlineRequest` if using streaming pull. * The minimum custom deadline you can specify is 10 seconds. * The maximum custom deadline you can specify is 600 seconds (10 minutes). * If this parameter is 0, a default value of 10 seconds is used. @@ -325,14 +328,20 @@ class SubscriberClient { * Indicates whether to retain acknowledged messages. If true, then * messages are not expunged from the subscription's backlog, even if they are * acknowledged, until they fall out of the `message_retention_duration` - * window. + * window.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. * @param {Object} [request.messageRetentionDuration] * How long to retain unacknowledged messages in the subscription's backlog, * from the moment a message is published. * If `retain_acked_messages` is true, then this also configures the retention * of acknowledged messages, and thus configures how far back in time a `Seek` * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - * minutes. + * minutes.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. * * This object should have the same structure as [Duration]{@link google.protobuf.Duration} * @param {Object.} [request.labels] @@ -431,10 +440,6 @@ class SubscriberClient { /** * Updates an existing subscription. Note that certain properties of a * subscription, such as its topic, are not modifiable. - * NOTE: The style guide requires body: "subscription" instead of body: "*". - * Keeping the latter for internal consistency in V1, however it should be - * corrected in V2. See - * https://cloud.google.com/apis/design/standard_methods#update for details. * * @param {Object} request * The request object that will be sent. @@ -871,18 +876,13 @@ class SubscriberClient { } /** - * (EXPERIMENTAL) StreamingPull is an experimental feature. This RPC will - * respond with UNIMPLEMENTED errors unless you have been invited to test - * this feature. Contact cloud-pubsub@google.com with any questions. - * * Establishes a stream with the server, which sends messages down to the * client. The client streams acknowledgements and ack deadline modifications * back to the server. The server will close the stream and return the status - * on any error. The server may close the stream with status `OK` to reassign - * server-side resources, in which case, the client should re-establish the - * stream. `UNAVAILABLE` may also be returned in the case of a transient error - * (e.g., a server restart). These should also be retried by the client. Flow - * control can be achieved by configuring the underlying RPC channel. + * on any error. The server may close the stream with status `UNAVAILABLE` to + * reassign server-side resources, in which case, the client should + * re-establish the stream. Flow control can be achieved by configuring the + * underlying RPC channel. * * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -909,9 +909,6 @@ class SubscriberClient { * subscription: formattedSubscription, * streamAckDeadlineSeconds: streamAckDeadlineSeconds, * }; - * var request = { - * root: request, - * }; * // Write request objects. * stream.write(request); */ @@ -940,7 +937,7 @@ class SubscriberClient { * An empty `pushConfig` indicates that the Pub/Sub system should * stop pushing messages from the given subscription and allow * messages to be pulled and acknowledged - effectively pausing - * the subscription if `Pull` is not called. + * the subscription if `Pull` or `StreamingPull` is not called. * * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} * @param {Object} [options] @@ -980,7 +977,10 @@ class SubscriberClient { } /** - * Lists the existing snapshots. + * Lists the existing snapshots.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. * * @param {Object} request * The request object that will be sent. @@ -1131,16 +1131,21 @@ class SubscriberClient { } /** - * Creates a snapshot from the requested subscription. + * Creates a snapshot from the requested subscription.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. * If the snapshot already exists, returns `ALREADY_EXISTS`. * If the requested subscription doesn't exist, returns `NOT_FOUND`. - * - * If the name is not provided in the request, the server will assign a random + * If the backlog in the subscription is too old -- and the resulting snapshot + * would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. + * See also the `Snapshot.expire_time` field. If the name is not provided in + * the request, the server will assign a random * name for this snapshot on the same project as the subscription, conforming - * to the - * [resource name format](https://cloud.google.com/pubsub/docs/overview#names). - * The generated name is populated in the returned Snapshot object. - * Note that for REST API requests, you must specify a name in the request. + * to the [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + * The generated + * name is populated in the returned Snapshot object. Note that for REST API + * requests, you must specify a name in the request. * * @param {Object} request * The request object that will be sent. @@ -1160,6 +1165,8 @@ class SubscriberClient { * (b) Any messages published to the subscription's topic following the * successful completion of the CreateSnapshot request. * Format is `projects/{project}/subscriptions/{sub}`. + * @param {Object.} [request.labels] + * User labels. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -1205,17 +1212,16 @@ class SubscriberClient { } /** - * Updates an existing snapshot. Note that certain properties of a snapshot - * are not modifiable. - * NOTE: The style guide requires body: "snapshot" instead of body: "*". - * Keeping the latter for internal consistency in V1, however it should be - * corrected in V2. See - * https://cloud.google.com/apis/design/standard_methods#update for details. + * Updates an existing snapshot.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * Note that certain properties of a snapshot are not modifiable. * * @param {Object} request * The request object that will be sent. * @param {Object} request.snapshot - * The updated snpashot object. + * The updated snapshot object. * * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} * @param {Object} request.updateMask @@ -1278,7 +1284,11 @@ class SubscriberClient { } /** - * Removes an existing snapshot. All messages retained in the snapshot + * Removes an existing snapshot.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * When the snapshot is deleted, all messages retained in the snapshot * are immediately dropped. After a snapshot is deleted, a new one may be * created with the same name, but the new one has no association with the old * snapshot or its subscription, unless the same subscription is specified. @@ -1321,7 +1331,10 @@ class SubscriberClient { /** * Seeks an existing subscription to a point in time or to a given snapshot, - * whichever is provided in the request. + * whichever is provided in the request.

+ * ALPHA: This feature is part of an alpha release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. * * @param {Object} request * The request object that will be sent. @@ -1559,32 +1572,6 @@ class SubscriberClient { // -- Path templates -- // -------------------- - /** - * Return a fully-qualified project resource name string. - * - * @param {String} project - * @returns {String} - */ - projectPath(project) { - return this._pathTemplates.projectPathTemplate.render({ - project: project, - }); - } - - /** - * Return a fully-qualified snapshot resource name string. - * - * @param {String} project - * @param {String} snapshot - * @returns {String} - */ - snapshotPath(project, snapshot) { - return this._pathTemplates.snapshotPathTemplate.render({ - project: project, - snapshot: snapshot, - }); - } - /** * Return a fully-qualified subscription resource name string. * @@ -1614,37 +1601,29 @@ class SubscriberClient { } /** - * Parse the projectName from a project resource. - * - * @param {String} projectName - * A fully-qualified path representing a project resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromProjectName(projectName) { - return this._pathTemplates.projectPathTemplate.match(projectName).project; - } - - /** - * Parse the snapshotName from a snapshot resource. + * Return a fully-qualified project resource name string. * - * @param {String} snapshotName - * A fully-qualified path representing a snapshot resources. - * @returns {String} - A string representing the project. + * @param {String} project + * @returns {String} */ - matchProjectFromSnapshotName(snapshotName) { - return this._pathTemplates.snapshotPathTemplate.match(snapshotName).project; + projectPath(project) { + return this._pathTemplates.projectPathTemplate.render({ + project: project, + }); } /** - * Parse the snapshotName from a snapshot resource. + * Return a fully-qualified snapshot resource name string. * - * @param {String} snapshotName - * A fully-qualified path representing a snapshot resources. - * @returns {String} - A string representing the snapshot. + * @param {String} project + * @param {String} snapshot + * @returns {String} */ - matchSnapshotFromSnapshotName(snapshotName) { - return this._pathTemplates.snapshotPathTemplate.match(snapshotName) - .snapshot; + snapshotPath(project, snapshot) { + return this._pathTemplates.snapshotPathTemplate.render({ + project: project, + snapshot: snapshot, + }); } /** @@ -1692,6 +1671,40 @@ class SubscriberClient { matchTopicFromTopicName(topicName) { return this._pathTemplates.topicPathTemplate.match(topicName).topic; } + + /** + * Parse the projectName from a project resource. + * + * @param {String} projectName + * A fully-qualified path representing a project resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromProjectName(projectName) { + return this._pathTemplates.projectPathTemplate.match(projectName).project; + } + + /** + * Parse the snapshotName from a snapshot resource. + * + * @param {String} snapshotName + * A fully-qualified path representing a snapshot resources. + * @returns {String} - A string representing the project. + */ + matchProjectFromSnapshotName(snapshotName) { + return this._pathTemplates.snapshotPathTemplate.match(snapshotName).project; + } + + /** + * Parse the snapshotName from a snapshot resource. + * + * @param {String} snapshotName + * A fully-qualified path representing a snapshot resources. + * @returns {String} - A string representing the snapshot. + */ + matchSnapshotFromSnapshotName(snapshotName) { + return this._pathTemplates.snapshotPathTemplate.match(snapshotName) + .snapshot; + } } module.exports = SubscriberClient; diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py new file mode 100644 index 00000000000..20b8659813b --- /dev/null +++ b/handwritten/pubsub/synth.py @@ -0,0 +1,37 @@ +import synthtool as s +import synthtool.gcp as gcp +import logging +import subprocess + +logging.basicConfig(level=logging.DEBUG) + +gapic = gcp.GAPICGenerator() + +# tasks has two product names, and a poorly named artman yaml +version = 'v1' +library = gapic.node_library( + 'pubsub', version, config_path="/google/pubsub/artman_pubsub.yaml") + +# skip index, protos, package.json, and README.md +s.copy( + library, + excludes=['package.json', 'README.md', 'src/index.js']) + +# https://github.com/googleapis/gapic-generator/issues/2127 +s.replace("src/v1/subscriber_client.js", + " }\n\s*/\*\*\n\s+\* The DNS address for this API service.", + "\n // note: editing generated code\n" + " this.waitForReady = function(deadline, callback) {\n" + " return subscriberStub.then(\n" + " stub => stub.waitForReady(deadline, callback),\n" + " callback\n" + " );\n" + " };\n" + "\g<0>") + +# +# Node.js specific cleanup +# +subprocess.run(['npm', 'install']) +subprocess.run(['npm', 'run', 'prettier']) +subprocess.run(['npm', 'run', 'lint']) diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js new file mode 100644 index 00000000000..06b2f85f9dd --- /dev/null +++ b/handwritten/pubsub/test/gapic-v1.js @@ -0,0 +1,1900 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +'use strict'; + +const assert = require('assert'); +const through2 = require('through2'); + +const pubsubModule = require('../src'); + +var FAKE_STATUS_CODE = 1; +var error = new Error(); +error.code = FAKE_STATUS_CODE; + +describe('PublisherClient', () => { + describe('createTopic', () => { + it('invokes createTopic without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + name: formattedName, + }; + + // Mock response + var name2 = 'name2-1052831874'; + var expectedResponse = { + name: name2, + }; + + // Mock Grpc layer + client._innerApiCalls.createTopic = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.createTopic(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes createTopic with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + name: formattedName, + }; + + // Mock Grpc layer + client._innerApiCalls.createTopic = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.createTopic(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('updateTopic', () => { + it('invokes updateTopic without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var topic = {}; + var updateMask = {}; + var request = { + topic: topic, + updateMask: updateMask, + }; + + // Mock response + var name = 'name3373707'; + var expectedResponse = { + name: name, + }; + + // Mock Grpc layer + client._innerApiCalls.updateTopic = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.updateTopic(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes updateTopic with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var topic = {}; + var updateMask = {}; + var request = { + topic: topic, + updateMask: updateMask, + }; + + // Mock Grpc layer + client._innerApiCalls.updateTopic = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.updateTopic(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('publish', () => { + it('invokes publish without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var data = '-86'; + var messagesElement = { + data: data, + }; + var messages = [messagesElement]; + var request = { + topic: formattedTopic, + messages: messages, + }; + + // Mock response + var messageIdsElement = 'messageIdsElement-744837059'; + var messageIds = [messageIdsElement]; + var expectedResponse = { + messageIds: messageIds, + }; + + // Mock Grpc layer + client._innerApiCalls.publish = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.publish(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes publish with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var data = '-86'; + var messagesElement = { + data: data, + }; + var messages = [messagesElement]; + var request = { + topic: formattedTopic, + messages: messages, + }; + + // Mock Grpc layer + client._innerApiCalls.publish = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.publish(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('getTopic', () => { + it('invokes getTopic without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + topic: formattedTopic, + }; + + // Mock response + var name = 'name3373707'; + var expectedResponse = { + name: name, + }; + + // Mock Grpc layer + client._innerApiCalls.getTopic = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.getTopic(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes getTopic with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + topic: formattedTopic, + }; + + // Mock Grpc layer + client._innerApiCalls.getTopic = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.getTopic(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('listTopics', () => { + it('invokes listTopics without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedProject = client.projectPath('[PROJECT]'); + var request = { + project: formattedProject, + }; + + // Mock response + var nextPageToken = ''; + var topicsElement = {}; + var topics = [topicsElement]; + var expectedResponse = { + nextPageToken: nextPageToken, + topics: topics, + }; + + // Mock Grpc layer + client._innerApiCalls.listTopics = (actualRequest, options, callback) => { + assert.deepStrictEqual(actualRequest, request); + callback(null, expectedResponse.topics); + }; + + client.listTopics(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse.topics); + done(); + }); + }); + + it('invokes listTopics with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedProject = client.projectPath('[PROJECT]'); + var request = { + project: formattedProject, + }; + + // Mock Grpc layer + client._innerApiCalls.listTopics = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.listTopics(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('listTopicSubscriptions', () => { + it('invokes listTopicSubscriptions without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + topic: formattedTopic, + }; + + // Mock response + var nextPageToken = ''; + var subscriptionsElement = 'subscriptionsElement1698708147'; + var subscriptions = [subscriptionsElement]; + var expectedResponse = { + nextPageToken: nextPageToken, + subscriptions: subscriptions, + }; + + // Mock Grpc layer + client._innerApiCalls.listTopicSubscriptions = ( + actualRequest, + options, + callback + ) => { + assert.deepStrictEqual(actualRequest, request); + callback(null, expectedResponse.subscriptions); + }; + + client.listTopicSubscriptions(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse.subscriptions); + done(); + }); + }); + + it('invokes listTopicSubscriptions with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + topic: formattedTopic, + }; + + // Mock Grpc layer + client._innerApiCalls.listTopicSubscriptions = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.listTopicSubscriptions(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('deleteTopic', () => { + it('invokes deleteTopic without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + topic: formattedTopic, + }; + + // Mock Grpc layer + client._innerApiCalls.deleteTopic = mockSimpleGrpcMethod(request); + + client.deleteTopic(request, err => { + assert.ifError(err); + done(); + }); + }); + + it('invokes deleteTopic with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + topic: formattedTopic, + }; + + // Mock Grpc layer + client._innerApiCalls.deleteTopic = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.deleteTopic(request, err => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + done(); + }); + }); + }); + + describe('setIamPolicy', () => { + it('invokes setIamPolicy without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var policy = {}; + var request = { + resource: formattedResource, + policy: policy, + }; + + // Mock response + var version = 351608024; + var etag = '21'; + var expectedResponse = { + version: version, + etag: etag, + }; + + // Mock Grpc layer + client._innerApiCalls.setIamPolicy = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.setIamPolicy(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes setIamPolicy with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var policy = {}; + var request = { + resource: formattedResource, + policy: policy, + }; + + // Mock Grpc layer + client._innerApiCalls.setIamPolicy = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.setIamPolicy(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('getIamPolicy', () => { + it('invokes getIamPolicy without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + resource: formattedResource, + }; + + // Mock response + var version = 351608024; + var etag = '21'; + var expectedResponse = { + version: version, + etag: etag, + }; + + // Mock Grpc layer + client._innerApiCalls.getIamPolicy = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.getIamPolicy(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes getIamPolicy with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + resource: formattedResource, + }; + + // Mock Grpc layer + client._innerApiCalls.getIamPolicy = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.getIamPolicy(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('testIamPermissions', () => { + it('invokes testIamPermissions without error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var permissions = []; + var request = { + resource: formattedResource, + permissions: permissions, + }; + + // Mock response + var expectedResponse = {}; + + // Mock Grpc layer + client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.testIamPermissions(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes testIamPermissions with error', done => { + var client = new pubsubModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var permissions = []; + var request = { + resource: formattedResource, + permissions: permissions, + }; + + // Mock Grpc layer + client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.testIamPermissions(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); +}); +describe('SubscriberClient', () => { + describe('createSubscription', () => { + it('invokes createSubscription without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedName = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + name: formattedName, + topic: formattedTopic, + }; + + // Mock response + var name2 = 'name2-1052831874'; + var topic2 = 'topic2-1139259102'; + var ackDeadlineSeconds = 2135351438; + var retainAckedMessages = false; + var expectedResponse = { + name: name2, + topic: topic2, + ackDeadlineSeconds: ackDeadlineSeconds, + retainAckedMessages: retainAckedMessages, + }; + + // Mock Grpc layer + client._innerApiCalls.createSubscription = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.createSubscription(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes createSubscription with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedName = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { + name: formattedName, + topic: formattedTopic, + }; + + // Mock Grpc layer + client._innerApiCalls.createSubscription = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.createSubscription(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('getSubscription', () => { + it('invokes getSubscription without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + subscription: formattedSubscription, + }; + + // Mock response + var name = 'name3373707'; + var topic = 'topic110546223'; + var ackDeadlineSeconds = 2135351438; + var retainAckedMessages = false; + var expectedResponse = { + name: name, + topic: topic, + ackDeadlineSeconds: ackDeadlineSeconds, + retainAckedMessages: retainAckedMessages, + }; + + // Mock Grpc layer + client._innerApiCalls.getSubscription = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.getSubscription(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes getSubscription with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + subscription: formattedSubscription, + }; + + // Mock Grpc layer + client._innerApiCalls.getSubscription = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.getSubscription(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('updateSubscription', () => { + it('invokes updateSubscription without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var ackDeadlineSeconds = 42; + var subscription = { + ackDeadlineSeconds: ackDeadlineSeconds, + }; + var pathsElement = 'ack_deadline_seconds'; + var paths = [pathsElement]; + var updateMask = { + paths: paths, + }; + var request = { + subscription: subscription, + updateMask: updateMask, + }; + + // Mock response + var name = 'name3373707'; + var topic = 'topic110546223'; + var ackDeadlineSeconds2 = 921632575; + var retainAckedMessages = false; + var expectedResponse = { + name: name, + topic: topic, + ackDeadlineSeconds: ackDeadlineSeconds2, + retainAckedMessages: retainAckedMessages, + }; + + // Mock Grpc layer + client._innerApiCalls.updateSubscription = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.updateSubscription(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes updateSubscription with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var ackDeadlineSeconds = 42; + var subscription = { + ackDeadlineSeconds: ackDeadlineSeconds, + }; + var pathsElement = 'ack_deadline_seconds'; + var paths = [pathsElement]; + var updateMask = { + paths: paths, + }; + var request = { + subscription: subscription, + updateMask: updateMask, + }; + + // Mock Grpc layer + client._innerApiCalls.updateSubscription = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.updateSubscription(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('listSubscriptions', () => { + it('invokes listSubscriptions without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedProject = client.projectPath('[PROJECT]'); + var request = { + project: formattedProject, + }; + + // Mock response + var nextPageToken = ''; + var subscriptionsElement = {}; + var subscriptions = [subscriptionsElement]; + var expectedResponse = { + nextPageToken: nextPageToken, + subscriptions: subscriptions, + }; + + // Mock Grpc layer + client._innerApiCalls.listSubscriptions = ( + actualRequest, + options, + callback + ) => { + assert.deepStrictEqual(actualRequest, request); + callback(null, expectedResponse.subscriptions); + }; + + client.listSubscriptions(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse.subscriptions); + done(); + }); + }); + + it('invokes listSubscriptions with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedProject = client.projectPath('[PROJECT]'); + var request = { + project: formattedProject, + }; + + // Mock Grpc layer + client._innerApiCalls.listSubscriptions = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.listSubscriptions(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('deleteSubscription', () => { + it('invokes deleteSubscription without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + subscription: formattedSubscription, + }; + + // Mock Grpc layer + client._innerApiCalls.deleteSubscription = mockSimpleGrpcMethod(request); + + client.deleteSubscription(request, err => { + assert.ifError(err); + done(); + }); + }); + + it('invokes deleteSubscription with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + subscription: formattedSubscription, + }; + + // Mock Grpc layer + client._innerApiCalls.deleteSubscription = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.deleteSubscription(request, err => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + done(); + }); + }); + }); + + describe('modifyAckDeadline', () => { + it('invokes modifyAckDeadline without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var ackIds = []; + var ackDeadlineSeconds = 2135351438; + var request = { + subscription: formattedSubscription, + ackIds: ackIds, + ackDeadlineSeconds: ackDeadlineSeconds, + }; + + // Mock Grpc layer + client._innerApiCalls.modifyAckDeadline = mockSimpleGrpcMethod(request); + + client.modifyAckDeadline(request, err => { + assert.ifError(err); + done(); + }); + }); + + it('invokes modifyAckDeadline with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var ackIds = []; + var ackDeadlineSeconds = 2135351438; + var request = { + subscription: formattedSubscription, + ackIds: ackIds, + ackDeadlineSeconds: ackDeadlineSeconds, + }; + + // Mock Grpc layer + client._innerApiCalls.modifyAckDeadline = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.modifyAckDeadline(request, err => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + done(); + }); + }); + }); + + describe('acknowledge', () => { + it('invokes acknowledge without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var ackIds = []; + var request = { + subscription: formattedSubscription, + ackIds: ackIds, + }; + + // Mock Grpc layer + client._innerApiCalls.acknowledge = mockSimpleGrpcMethod(request); + + client.acknowledge(request, err => { + assert.ifError(err); + done(); + }); + }); + + it('invokes acknowledge with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var ackIds = []; + var request = { + subscription: formattedSubscription, + ackIds: ackIds, + }; + + // Mock Grpc layer + client._innerApiCalls.acknowledge = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.acknowledge(request, err => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + done(); + }); + }); + }); + + describe('pull', () => { + it('invokes pull without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var maxMessages = 496131527; + var request = { + subscription: formattedSubscription, + maxMessages: maxMessages, + }; + + // Mock response + var expectedResponse = {}; + + // Mock Grpc layer + client._innerApiCalls.pull = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.pull(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes pull with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var maxMessages = 496131527; + var request = { + subscription: formattedSubscription, + maxMessages: maxMessages, + }; + + // Mock Grpc layer + client._innerApiCalls.pull = mockSimpleGrpcMethod(request, null, error); + + client.pull(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('streamingPull', () => { + it('invokes streamingPull without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var streamAckDeadlineSeconds = 1875467245; + var request = { + subscription: formattedSubscription, + streamAckDeadlineSeconds: streamAckDeadlineSeconds, + }; + + // Mock response + var receivedMessagesElement = {}; + var receivedMessages = [receivedMessagesElement]; + var expectedResponse = { + receivedMessages: receivedMessages, + }; + + // Mock Grpc layer + client._innerApiCalls.streamingPull = mockBidiStreamingGrpcMethod( + request, + expectedResponse + ); + + var stream = client + .streamingPull() + .on('data', response => { + assert.deepStrictEqual(response, expectedResponse); + done(); + }) + .on('error', err => { + done(err); + }); + + stream.write(request); + }); + + it('invokes streamingPull with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var streamAckDeadlineSeconds = 1875467245; + var request = { + subscription: formattedSubscription, + streamAckDeadlineSeconds: streamAckDeadlineSeconds, + }; + + // Mock Grpc layer + client._innerApiCalls.streamingPull = mockBidiStreamingGrpcMethod( + request, + null, + error + ); + + var stream = client + .streamingPull() + .on('data', () => { + assert.fail(); + }) + .on('error', err => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + done(); + }); + + stream.write(request); + }); + }); + + describe('modifyPushConfig', () => { + it('invokes modifyPushConfig without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var pushConfig = {}; + var request = { + subscription: formattedSubscription, + pushConfig: pushConfig, + }; + + // Mock Grpc layer + client._innerApiCalls.modifyPushConfig = mockSimpleGrpcMethod(request); + + client.modifyPushConfig(request, err => { + assert.ifError(err); + done(); + }); + }); + + it('invokes modifyPushConfig with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var pushConfig = {}; + var request = { + subscription: formattedSubscription, + pushConfig: pushConfig, + }; + + // Mock Grpc layer + client._innerApiCalls.modifyPushConfig = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.modifyPushConfig(request, err => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + done(); + }); + }); + }); + + describe('listSnapshots', () => { + it('invokes listSnapshots without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedProject = client.projectPath('[PROJECT]'); + var request = { + project: formattedProject, + }; + + // Mock response + var nextPageToken = ''; + var snapshotsElement = {}; + var snapshots = [snapshotsElement]; + var expectedResponse = { + nextPageToken: nextPageToken, + snapshots: snapshots, + }; + + // Mock Grpc layer + client._innerApiCalls.listSnapshots = ( + actualRequest, + options, + callback + ) => { + assert.deepStrictEqual(actualRequest, request); + callback(null, expectedResponse.snapshots); + }; + + client.listSnapshots(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse.snapshots); + done(); + }); + }); + + it('invokes listSnapshots with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedProject = client.projectPath('[PROJECT]'); + var request = { + project: formattedProject, + }; + + // Mock Grpc layer + client._innerApiCalls.listSnapshots = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.listSnapshots(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('createSnapshot', () => { + it('invokes createSnapshot without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + name: formattedName, + subscription: formattedSubscription, + }; + + // Mock response + var name2 = 'name2-1052831874'; + var topic = 'topic110546223'; + var expectedResponse = { + name: name2, + topic: topic, + }; + + // Mock Grpc layer + client._innerApiCalls.createSnapshot = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.createSnapshot(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes createSnapshot with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + name: formattedName, + subscription: formattedSubscription, + }; + + // Mock Grpc layer + client._innerApiCalls.createSnapshot = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.createSnapshot(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('updateSnapshot', () => { + it('invokes updateSnapshot without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var seconds = 123456; + var expireTime = { + seconds: seconds, + }; + var snapshot = { + expireTime: expireTime, + }; + var pathsElement = 'expire_time'; + var paths = [pathsElement]; + var updateMask = { + paths: paths, + }; + var request = { + snapshot: snapshot, + updateMask: updateMask, + }; + + // Mock response + var name = 'name3373707'; + var topic = 'topic110546223'; + var expectedResponse = { + name: name, + topic: topic, + }; + + // Mock Grpc layer + client._innerApiCalls.updateSnapshot = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.updateSnapshot(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes updateSnapshot with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var seconds = 123456; + var expireTime = { + seconds: seconds, + }; + var snapshot = { + expireTime: expireTime, + }; + var pathsElement = 'expire_time'; + var paths = [pathsElement]; + var updateMask = { + paths: paths, + }; + var request = { + snapshot: snapshot, + updateMask: updateMask, + }; + + // Mock Grpc layer + client._innerApiCalls.updateSnapshot = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.updateSnapshot(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('deleteSnapshot', () => { + it('invokes deleteSnapshot without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + var request = { + snapshot: formattedSnapshot, + }; + + // Mock Grpc layer + client._innerApiCalls.deleteSnapshot = mockSimpleGrpcMethod(request); + + client.deleteSnapshot(request, err => { + assert.ifError(err); + done(); + }); + }); + + it('invokes deleteSnapshot with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + var request = { + snapshot: formattedSnapshot, + }; + + // Mock Grpc layer + client._innerApiCalls.deleteSnapshot = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.deleteSnapshot(request, err => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + done(); + }); + }); + }); + + describe('seek', () => { + it('invokes seek without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + subscription: formattedSubscription, + }; + + // Mock response + var expectedResponse = {}; + + // Mock Grpc layer + client._innerApiCalls.seek = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.seek(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes seek with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedSubscription = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + subscription: formattedSubscription, + }; + + // Mock Grpc layer + client._innerApiCalls.seek = mockSimpleGrpcMethod(request, null, error); + + client.seek(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('setIamPolicy', () => { + it('invokes setIamPolicy without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var policy = {}; + var request = { + resource: formattedResource, + policy: policy, + }; + + // Mock response + var version = 351608024; + var etag = '21'; + var expectedResponse = { + version: version, + etag: etag, + }; + + // Mock Grpc layer + client._innerApiCalls.setIamPolicy = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.setIamPolicy(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes setIamPolicy with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var policy = {}; + var request = { + resource: formattedResource, + policy: policy, + }; + + // Mock Grpc layer + client._innerApiCalls.setIamPolicy = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.setIamPolicy(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('getIamPolicy', () => { + it('invokes getIamPolicy without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + resource: formattedResource, + }; + + // Mock response + var version = 351608024; + var etag = '21'; + var expectedResponse = { + version: version, + etag: etag, + }; + + // Mock Grpc layer + client._innerApiCalls.getIamPolicy = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.getIamPolicy(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes getIamPolicy with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var request = { + resource: formattedResource, + }; + + // Mock Grpc layer + client._innerApiCalls.getIamPolicy = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.getIamPolicy(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); + + describe('testIamPermissions', () => { + it('invokes testIamPermissions without error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var permissions = []; + var request = { + resource: formattedResource, + permissions: permissions, + }; + + // Mock response + var expectedResponse = {}; + + // Mock Grpc layer + client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( + request, + expectedResponse + ); + + client.testIamPermissions(request, (err, response) => { + assert.ifError(err); + assert.deepStrictEqual(response, expectedResponse); + done(); + }); + }); + + it('invokes testIamPermissions with error', done => { + var client = new pubsubModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + + // Mock request + var formattedResource = client.subscriptionPath( + '[PROJECT]', + '[SUBSCRIPTION]' + ); + var permissions = []; + var request = { + resource: formattedResource, + permissions: permissions, + }; + + // Mock Grpc layer + client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( + request, + null, + error + ); + + client.testIamPermissions(request, (err, response) => { + assert(err instanceof Error); + assert.equal(err.code, FAKE_STATUS_CODE); + assert(typeof response === 'undefined'); + done(); + }); + }); + }); +}); + +function mockSimpleGrpcMethod(expectedRequest, response, error) { + return function(actualRequest, options, callback) { + assert.deepStrictEqual(actualRequest, expectedRequest); + if (error) { + callback(error); + } else if (response) { + callback(null, response); + } else { + callback(null); + } + }; +} + +function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { + return () => { + var mockStream = through2.obj((chunk, enc, callback) => { + assert.deepStrictEqual(chunk, expectedRequest); + if (error) { + callback(error); + } else { + callback(null, response); + } + }); + return mockStream; + }; +} diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index f5a09feeb0d..1dcefaff6ab 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -19,17 +19,25 @@ var arrify = require('arrify'); var assert = require('assert'); var extend = require('extend'); +var gax = require('google-gax'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; var PKG = require('../package.json'); -var fakeGrpc = {}; +var fakeCreds = {}; var fakeGoogleGax = { - grpc: function() { - return { - grpc: fakeGrpc, - }; + GrpcClient: class extends gax.GrpcClient { + constructor(opts) { + super(opts); + this.grpc = { + credentials: { + createInsecure() { + return fakeCreds; + }, + }, + }; + } }, }; @@ -149,9 +157,6 @@ describe('PubSub', function() { return options; }; - fakeGrpc.credentials = { - createInsecure: util.noop, - }; v1ClientOverrides = {}; googleAutoAuthOverride = null; SubscriptionOverride = null; @@ -647,13 +652,6 @@ describe('PubSub', function() { var defaultBaseUrl_ = 'defaulturl'; var testingUrl = 'localhost:8085'; - var fakeCreds = {}; - fakeGrpc.credentials = { - createInsecure: function() { - return fakeCreds; - }, - }; - setHost(defaultBaseUrl_); pubsub.options.apiEndpoint = testingUrl; pubsub.determineBaseUrl_(); From 3a0e6f79c56aed35e4c4757df37e8440d4aaa618 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 2 Jul 2018 13:04:24 -0400 Subject: [PATCH 0169/1115] fix(deps): update dependency delay to v3 (#165) --- handwritten/pubsub/package-lock.json | 4520 ++++++++++++------------- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/subscriber.js | 4 +- handwritten/pubsub/test/subscriber.js | 8 +- 4 files changed, 2263 insertions(+), 2271 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 496805d902a..be31e738854 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -16,18 +16,18 @@ "integrity": "sha512-oWqTnIGXW3k72UFidXzW0ONlO7hnO9x02S/QReJ7NBGeiBH9cUHY9+EfV6C8PXC6YJH++WrliEq03wMSJGNZFg==", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "^6.8.0", - "babel-plugin-syntax-trailing-function-commas": "^6.20.0", - "babel-plugin-transform-async-to-generator": "^6.16.0", - "babel-plugin-transform-es2015-destructuring": "^6.19.0", - "babel-plugin-transform-es2015-function-name": "^6.9.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0", - "babel-plugin-transform-es2015-parameters": "^6.21.0", - "babel-plugin-transform-es2015-spread": "^6.8.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.8.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.11.0", - "babel-plugin-transform-exponentiation-operator": "^6.8.0", - "package-hash": "^1.2.0" + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "package-hash": "1.2.0" }, "dependencies": { "md5-hex": { @@ -36,7 +36,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "package-hash": { @@ -45,7 +45,7 @@ "integrity": "sha1-AD5WzVe3NqbtYRTMK4FUJnJ3DkQ=", "dev": true, "requires": { - "md5-hex": "^1.3.0" + "md5-hex": "1.3.0" } } } @@ -56,8 +56,8 @@ "integrity": "sha1-ze0RlqjY2TgaUJJAq5LpGl7Aafc=", "dev": true, "requires": { - "@ava/babel-plugin-throws-helper": "^2.0.0", - "babel-plugin-espower": "^2.3.2" + "@ava/babel-plugin-throws-helper": "2.0.0", + "babel-plugin-espower": "2.4.0" } }, "@ava/write-file-atomic": { @@ -66,9 +66,9 @@ "integrity": "sha512-BTNB3nGbEfJT+69wuqXFr/bQH7Vr7ihx2xGOMNqPgDGhwspoZhiWumDDZNjBy7AScmqS5CELIOGtPVXESyrnDA==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } }, "@babel/code-frame": { @@ -87,10 +87,10 @@ "dev": true, "requires": { "@babel/types": "7.0.0-beta.51", - "jsesc": "^2.5.1", - "lodash": "^4.17.5", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" + "jsesc": "2.5.1", + "lodash": "4.17.10", + "source-map": "0.5.7", + "trim-right": "1.0.1" }, "dependencies": { "jsesc": { @@ -136,9 +136,9 @@ "integrity": "sha1-6IRK4loVlcz9QriWI7Q3bKBtIl0=", "dev": true, "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^3.0.0" + "chalk": "2.4.1", + "esutils": "2.0.2", + "js-tokens": "3.0.2" } }, "@babel/parser": { @@ -156,7 +156,7 @@ "@babel/code-frame": "7.0.0-beta.51", "@babel/parser": "7.0.0-beta.51", "@babel/types": "7.0.0-beta.51", - "lodash": "^4.17.5" + "lodash": "4.17.10" } }, "@babel/traverse": { @@ -171,10 +171,10 @@ "@babel/helper-split-export-declaration": "7.0.0-beta.51", "@babel/parser": "7.0.0-beta.51", "@babel/types": "7.0.0-beta.51", - "debug": "^3.1.0", - "globals": "^11.1.0", - "invariant": "^2.2.0", - "lodash": "^4.17.5" + "debug": "3.1.0", + "globals": "11.7.0", + "invariant": "2.2.4", + "lodash": "4.17.10" }, "dependencies": { "globals": { @@ -191,9 +191,9 @@ "integrity": "sha1-2AK3tUO1g2x3iqaReXq/APPZfqk=", "dev": true, "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.5", - "to-fast-properties": "^2.0.0" + "esutils": "2.0.2", + "lodash": "4.17.10", + "to-fast-properties": "2.0.0" }, "dependencies": { "to-fast-properties": { @@ -210,7 +210,7 @@ "integrity": "sha512-htrsRaQX8Iixlsek8zQU7tE8wcsTQJ5UhZkSPEA8slCDAisKpC/2VgU/ucPn32M5/LjGGXRaUEKvEw1Wiuu4zQ==", "dev": true, "requires": { - "arrify": "^1.0.1" + "arrify": "1.0.1" } }, "@google-cloud/common": { @@ -218,21 +218,21 @@ "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.20.1.tgz", "integrity": "sha512-LJB7CoNXEXY0mDWtF8E2cl3Y0kuMQ3wjH9Xr+Y7vH5gHgN82dDh1BMUOizRf9oXQFDWUgGERD5SdfBcjUhHmwA==", "requires": { - "@types/duplexify": "^3.5.0", - "@types/request": "^2.47.0", - "arrify": "^1.0.1", - "axios": "^0.18.0", - "duplexify": "^3.6.0", - "ent": "^2.2.0", - "extend": "^3.0.1", - "google-auth-library": "^1.6.0", - "is": "^3.2.1", - "pify": "^3.0.0", - "request": "^2.87.0", - "retry-request": "^3.3.1", - "split-array-stream": "^2.0.0", - "stream-events": "^1.0.4", - "through2": "^2.0.3" + "@types/duplexify": "3.5.0", + "@types/request": "2.47.1", + "arrify": "1.0.1", + "axios": "0.18.0", + "duplexify": "3.6.0", + "ent": "2.2.0", + "extend": "3.0.1", + "google-auth-library": "1.6.1", + "is": "3.2.1", + "pify": "3.0.0", + "request": "2.87.0", + "retry-request": "3.3.2", + "split-array-stream": "2.0.0", + "stream-events": "1.0.4", + "through2": "2.0.3" } }, "@google-cloud/nodejs-repo-tools": { @@ -249,7 +249,7 @@ "lodash": "4.17.5", "nyc": "11.4.1", "proxyquire": "1.8.0", - "semver": "^5.5.0", + "semver": "5.5.0", "sinon": "4.3.0", "string": "3.3.3", "supertest": "3.0.0", @@ -269,9 +269,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" } }, "is-fullwidth-code-point": { @@ -292,33 +292,33 @@ "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", "dev": true, "requires": { - "archy": "^1.0.0", - "arrify": "^1.0.1", - "caching-transform": "^1.0.0", - "convert-source-map": "^1.3.0", - "debug-log": "^1.0.1", - "default-require-extensions": "^1.0.0", - "find-cache-dir": "^0.1.1", - "find-up": "^2.1.0", - "foreground-child": "^1.5.3", - "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.1.1", - "istanbul-lib-hook": "^1.1.0", - "istanbul-lib-instrument": "^1.9.1", - "istanbul-lib-report": "^1.1.2", - "istanbul-lib-source-maps": "^1.2.2", - "istanbul-reports": "^1.1.3", - "md5-hex": "^1.2.0", - "merge-source-map": "^1.0.2", - "micromatch": "^2.3.11", - "mkdirp": "^0.5.0", - "resolve-from": "^2.0.0", - "rimraf": "^2.5.4", - "signal-exit": "^3.0.1", - "spawn-wrap": "^1.4.2", - "test-exclude": "^4.1.1", - "yargs": "^10.0.3", - "yargs-parser": "^8.0.0" + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", + "md5-hex": "1.3.0", + "merge-source-map": "1.0.4", + "micromatch": "2.3.11", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.1.1", + "yargs": "10.0.3", + "yargs-parser": "8.0.0" }, "dependencies": { "align-text": { @@ -326,9 +326,9 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" } }, "amdefine": { @@ -351,7 +351,7 @@ "bundled": true, "dev": true, "requires": { - "default-require-extensions": "^1.0.0" + "default-require-extensions": "1.0.0" } }, "archy": { @@ -364,7 +364,7 @@ "bundled": true, "dev": true, "requires": { - "arr-flatten": "^1.0.1" + "arr-flatten": "1.1.0" } }, "arr-flatten": { @@ -392,9 +392,9 @@ "bundled": true, "dev": true, "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" } }, "babel-generator": { @@ -402,14 +402,14 @@ "bundled": true, "dev": true, "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.6", - "trim-right": "^1.0.1" + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" } }, "babel-messages": { @@ -417,7 +417,7 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-runtime": { @@ -425,8 +425,8 @@ "bundled": true, "dev": true, "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" + "core-js": "2.5.3", + "regenerator-runtime": "0.11.1" } }, "babel-template": { @@ -434,11 +434,11 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" } }, "babel-traverse": { @@ -446,15 +446,15 @@ "bundled": true, "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" } }, "babel-types": { @@ -462,10 +462,10 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" } }, "babylon": { @@ -483,7 +483,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -492,9 +492,9 @@ "bundled": true, "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" } }, "builtin-modules": { @@ -507,9 +507,9 @@ "bundled": true, "dev": true, "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" } }, "camelcase": { @@ -524,8 +524,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "chalk": { @@ -533,11 +533,11 @@ "bundled": true, "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "cliui": { @@ -546,8 +546,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" }, "dependencies": { @@ -589,8 +589,8 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.1", + "which": "1.3.0" } }, "debug": { @@ -616,7 +616,7 @@ "bundled": true, "dev": true, "requires": { - "strip-bom": "^2.0.0" + "strip-bom": "2.0.0" } }, "detect-indent": { @@ -624,7 +624,7 @@ "bundled": true, "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "error-ex": { @@ -632,7 +632,7 @@ "bundled": true, "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "escape-string-regexp": { @@ -650,13 +650,13 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" }, "dependencies": { "cross-spawn": { @@ -664,9 +664,9 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" } } } @@ -676,7 +676,7 @@ "bundled": true, "dev": true, "requires": { - "is-posix-bracket": "^0.1.0" + "is-posix-bracket": "0.1.1" } }, "expand-range": { @@ -684,7 +684,7 @@ "bundled": true, "dev": true, "requires": { - "fill-range": "^2.1.0" + "fill-range": "2.2.3" } }, "extglob": { @@ -692,7 +692,7 @@ "bundled": true, "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "filename-regex": { @@ -705,11 +705,11 @@ "bundled": true, "dev": true, "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^1.1.3", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, "find-cache-dir": { @@ -717,9 +717,9 @@ "bundled": true, "dev": true, "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" } }, "find-up": { @@ -727,7 +727,7 @@ "bundled": true, "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "for-in": { @@ -740,7 +740,7 @@ "bundled": true, "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } }, "foreground-child": { @@ -748,8 +748,8 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" } }, "fs.realpath": { @@ -772,12 +772,12 @@ "bundled": true, "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-base": { @@ -785,8 +785,8 @@ "bundled": true, "dev": true, "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" + "glob-parent": "2.0.0", + "is-glob": "2.0.1" } }, "glob-parent": { @@ -794,7 +794,7 @@ "bundled": true, "dev": true, "requires": { - "is-glob": "^2.0.0" + "is-glob": "2.0.1" } }, "globals": { @@ -812,10 +812,10 @@ "bundled": true, "dev": true, "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" }, "dependencies": { "source-map": { @@ -823,7 +823,7 @@ "bundled": true, "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -833,7 +833,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-flag": { @@ -856,8 +856,8 @@ "bundled": true, "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -870,7 +870,7 @@ "bundled": true, "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.3.1" } }, "invert-kv": { @@ -893,7 +893,7 @@ "bundled": true, "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-dotfile": { @@ -906,7 +906,7 @@ "bundled": true, "dev": true, "requires": { - "is-primitive": "^2.0.0" + "is-primitive": "2.0.0" } }, "is-extendable": { @@ -924,7 +924,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-fullwidth-code-point": { @@ -932,7 +932,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-glob": { @@ -940,7 +940,7 @@ "bundled": true, "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "is-number": { @@ -948,7 +948,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "is-posix-bracket": { @@ -999,7 +999,7 @@ "bundled": true, "dev": true, "requires": { - "append-transform": "^0.4.0" + "append-transform": "0.4.0" } }, "istanbul-lib-instrument": { @@ -1007,13 +1007,13 @@ "bundled": true, "dev": true, "requires": { - "babel-generator": "^6.18.0", - "babel-template": "^6.16.0", - "babel-traverse": "^6.18.0", - "babel-types": "^6.18.0", - "babylon": "^6.18.0", - "istanbul-lib-coverage": "^1.1.1", - "semver": "^5.3.0" + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" } }, "istanbul-lib-report": { @@ -1021,10 +1021,10 @@ "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "^1.1.1", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" }, "dependencies": { "supports-color": { @@ -1032,7 +1032,7 @@ "bundled": true, "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "1.0.0" } } } @@ -1042,11 +1042,11 @@ "bundled": true, "dev": true, "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.1.1", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" + "debug": "3.1.0", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" }, "dependencies": { "debug": { @@ -1064,7 +1064,7 @@ "bundled": true, "dev": true, "requires": { - "handlebars": "^4.0.3" + "handlebars": "4.0.11" } }, "js-tokens": { @@ -1082,7 +1082,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } }, "lazy-cache": { @@ -1096,7 +1096,7 @@ "bundled": true, "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "load-json-file": { @@ -1104,11 +1104,11 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, "locate-path": { @@ -1116,8 +1116,8 @@ "bundled": true, "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" }, "dependencies": { "path-exists": { @@ -1142,7 +1142,7 @@ "bundled": true, "dev": true, "requires": { - "js-tokens": "^3.0.0" + "js-tokens": "3.0.2" } }, "lru-cache": { @@ -1150,8 +1150,8 @@ "bundled": true, "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "md5-hex": { @@ -1159,7 +1159,7 @@ "bundled": true, "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "md5-o-matic": { @@ -1172,7 +1172,7 @@ "bundled": true, "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.1.0" } }, "merge-source-map": { @@ -1180,7 +1180,7 @@ "bundled": true, "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.7" } }, "micromatch": { @@ -1188,19 +1188,19 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" } }, "mimic-fn": { @@ -1213,7 +1213,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.8" } }, "minimist": { @@ -1239,10 +1239,10 @@ "bundled": true, "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" } }, "normalize-path": { @@ -1250,7 +1250,7 @@ "bundled": true, "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } }, "npm-run-path": { @@ -1258,7 +1258,7 @@ "bundled": true, "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" } }, "number-is-nan": { @@ -1276,8 +1276,8 @@ "bundled": true, "dev": true, "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" + "for-own": "0.1.5", + "is-extendable": "0.1.1" } }, "once": { @@ -1285,7 +1285,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "optimist": { @@ -1293,8 +1293,8 @@ "bundled": true, "dev": true, "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, "os-homedir": { @@ -1307,9 +1307,9 @@ "bundled": true, "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "p-finally": { @@ -1327,7 +1327,7 @@ "bundled": true, "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.1.0" } }, "parse-glob": { @@ -1335,10 +1335,10 @@ "bundled": true, "dev": true, "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" } }, "parse-json": { @@ -1346,7 +1346,7 @@ "bundled": true, "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.1" } }, "path-exists": { @@ -1354,7 +1354,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "path-is-absolute": { @@ -1377,9 +1377,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -1397,7 +1397,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { @@ -1405,7 +1405,7 @@ "bundled": true, "dev": true, "requires": { - "find-up": "^1.0.0" + "find-up": "1.1.2" }, "dependencies": { "find-up": { @@ -1413,8 +1413,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } } } @@ -1434,8 +1434,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "is-number": { @@ -1443,7 +1443,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -1451,7 +1451,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -1461,7 +1461,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -1471,9 +1471,9 @@ "bundled": true, "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, "read-pkg-up": { @@ -1481,8 +1481,8 @@ "bundled": true, "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" }, "dependencies": { "find-up": { @@ -1490,8 +1490,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } } } @@ -1506,7 +1506,7 @@ "bundled": true, "dev": true, "requires": { - "is-equal-shallow": "^0.1.3" + "is-equal-shallow": "0.1.3" } }, "remove-trailing-separator": { @@ -1529,7 +1529,7 @@ "bundled": true, "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.0.2" } }, "require-directory": { @@ -1553,7 +1553,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { @@ -1561,7 +1561,7 @@ "bundled": true, "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "semver": { @@ -1579,7 +1579,7 @@ "bundled": true, "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -1607,12 +1607,12 @@ "bundled": true, "dev": true, "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.0" } }, "spdx-correct": { @@ -1620,7 +1620,7 @@ "bundled": true, "dev": true, "requires": { - "spdx-license-ids": "^1.0.2" + "spdx-license-ids": "1.2.2" } }, "spdx-expression-parse": { @@ -1638,8 +1638,8 @@ "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "ansi-regex": { @@ -1657,7 +1657,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -1667,7 +1667,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-bom": { @@ -1675,7 +1675,7 @@ "bundled": true, "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-eof": { @@ -1693,11 +1693,11 @@ "bundled": true, "dev": true, "requires": { - "arrify": "^1.0.1", - "micromatch": "^2.3.11", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", - "require-main-filename": "^1.0.1" + "arrify": "1.0.1", + "micromatch": "2.3.11", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" } }, "to-fast-properties": { @@ -1716,9 +1716,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "yargs": { @@ -1727,9 +1727,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -1746,8 +1746,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" } }, "which": { @@ -1755,7 +1755,7 @@ "bundled": true, "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -1779,8 +1779,8 @@ "bundled": true, "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" }, "dependencies": { "string-width": { @@ -1788,9 +1788,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } } } @@ -1805,9 +1805,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } }, "y18n": { @@ -1825,18 +1825,18 @@ "bundled": true, "dev": true, "requires": { - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^8.0.0" + "cliui": "3.2.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "8.0.0" }, "dependencies": { "cliui": { @@ -1844,9 +1844,9 @@ "bundled": true, "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" }, "dependencies": { "string-width": { @@ -1854,9 +1854,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } } } @@ -1868,7 +1868,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" }, "dependencies": { "camelcase": { @@ -1886,9 +1886,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "proxyquire": { @@ -1897,9 +1897,9 @@ "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", "dev": true, "requires": { - "fill-keys": "^1.0.2", - "module-not-found-error": "^1.0.0", - "resolve": "~1.1.7" + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.1.7" } }, "string-width": { @@ -1908,8 +1908,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -1918,7 +1918,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "yargs": { @@ -1927,18 +1927,18 @@ "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" } } } @@ -1949,10 +1949,10 @@ "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", "dev": true, "requires": { - "chalk": "^0.4.0", - "date-time": "^0.1.1", - "pretty-ms": "^0.2.1", - "text-table": "^0.2.0" + "chalk": "0.4.0", + "date-time": "0.1.1", + "pretty-ms": "0.2.2", + "text-table": "0.2.0" }, "dependencies": { "ansi-styles": { @@ -1967,9 +1967,9 @@ "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { - "ansi-styles": "~1.0.0", - "has-color": "~0.1.0", - "strip-ansi": "~0.1.0" + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" } }, "pretty-ms": { @@ -1978,7 +1978,7 @@ "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", "dev": true, "requires": { - "parse-ms": "^0.1.0" + "parse-ms": "0.1.2" } }, "strip-ansi": { @@ -1994,8 +1994,8 @@ "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" + "call-me-maybe": "1.0.1", + "glob-to-regexp": "0.3.0" } }, "@nodelib/fs.stat": { @@ -2028,8 +2028,8 @@ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", "requires": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" + "@protobufjs/aspromise": "1.1.2", + "@protobufjs/inquire": "1.1.0" } }, "@protobufjs/float": { @@ -2082,7 +2082,7 @@ "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.5.0.tgz", "integrity": "sha512-+aZCCdxuR/Q6n58CBkXyqGqimIqpYUcFLfBXagXv7e9TdJUevqkKhzopBuRz3RB064sQxnJnhttHOkK/O93Ouw==", "requires": { - "@types/node": "*" + "@types/node": "10.5.0" } }, "@types/form-data": { @@ -2090,7 +2090,7 @@ "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz", "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==", "requires": { - "@types/node": "*" + "@types/node": "10.5.0" } }, "@types/long": { @@ -2108,10 +2108,10 @@ "resolved": "https://registry.npmjs.org/@types/request/-/request-2.47.1.tgz", "integrity": "sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==", "requires": { - "@types/caseless": "*", - "@types/form-data": "*", - "@types/node": "*", - "@types/tough-cookie": "*" + "@types/caseless": "0.12.1", + "@types/form-data": "2.2.1", + "@types/node": "10.5.0", + "@types/tough-cookie": "2.3.3" } }, "@types/tough-cookie": { @@ -2135,7 +2135,7 @@ "integrity": "sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==", "dev": true, "requires": { - "acorn": "^5.0.3" + "acorn": "5.7.1" } }, "ajv": { @@ -2143,10 +2143,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "ajv-keywords": { @@ -2161,9 +2161,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" }, "dependencies": { "kind-of": { @@ -2172,7 +2172,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -2189,7 +2189,7 @@ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, "requires": { - "string-width": "^2.0.0" + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -2210,8 +2210,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -2220,7 +2220,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -2242,7 +2242,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.2" } }, "anymatch": { @@ -2251,8 +2251,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" + "micromatch": "2.3.11", + "normalize-path": "2.1.1" }, "dependencies": { "arr-diff": { @@ -2261,7 +2261,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "^1.0.1" + "arr-flatten": "1.1.0" } }, "array-unique": { @@ -2276,9 +2276,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" } }, "expand-brackets": { @@ -2287,7 +2287,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "^0.1.0" + "is-posix-bracket": "0.1.1" } }, "extglob": { @@ -2296,7 +2296,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "is-extglob": { @@ -2311,7 +2311,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } }, "kind-of": { @@ -2320,7 +2320,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } }, "micromatch": { @@ -2329,19 +2329,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" } } } @@ -2352,7 +2352,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "~1.0.2" + "sprintf-js": "1.0.3" } }, "argv": { @@ -2410,7 +2410,7 @@ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "requires": { - "array-uniq": "^1.0.1" + "array-uniq": "1.0.3" } }, "array-uniq": { @@ -2433,8 +2433,8 @@ "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", "requires": { - "colour": "~0.7.1", - "optjs": "~3.2.2" + "colour": "0.7.1", + "optjs": "3.2.2" } }, "asn1": { @@ -2457,7 +2457,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { - "lodash": "^4.17.10" + "lodash": "4.17.10" } }, "async-each": { @@ -2487,89 +2487,89 @@ "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", "dev": true, "requires": { - "@ava/babel-preset-stage-4": "^1.1.0", - "@ava/babel-preset-transform-test-files": "^3.0.0", - "@ava/write-file-atomic": "^2.2.0", - "@concordance/react": "^1.0.0", - "@ladjs/time-require": "^0.1.4", - "ansi-escapes": "^3.0.0", - "ansi-styles": "^3.1.0", - "arr-flatten": "^1.0.1", - "array-union": "^1.0.1", - "array-uniq": "^1.0.2", - "arrify": "^1.0.0", - "auto-bind": "^1.1.0", - "ava-init": "^0.2.0", - "babel-core": "^6.17.0", - "babel-generator": "^6.26.0", - "babel-plugin-syntax-object-rest-spread": "^6.13.0", - "bluebird": "^3.0.0", - "caching-transform": "^1.0.0", - "chalk": "^2.0.1", - "chokidar": "^1.4.2", - "clean-stack": "^1.1.1", - "clean-yaml-object": "^0.1.0", - "cli-cursor": "^2.1.0", - "cli-spinners": "^1.0.0", - "cli-truncate": "^1.0.0", - "co-with-promise": "^4.6.0", - "code-excerpt": "^2.1.1", - "common-path-prefix": "^1.0.0", - "concordance": "^3.0.0", - "convert-source-map": "^1.5.1", - "core-assert": "^0.2.0", - "currently-unhandled": "^0.4.1", - "debug": "^3.0.1", - "dot-prop": "^4.1.0", - "empower-core": "^0.6.1", - "equal-length": "^1.0.0", - "figures": "^2.0.0", - "find-cache-dir": "^1.0.0", - "fn-name": "^2.0.0", - "get-port": "^3.0.0", - "globby": "^6.0.0", - "has-flag": "^2.0.0", - "hullabaloo-config-manager": "^1.1.0", - "ignore-by-default": "^1.0.0", - "import-local": "^0.1.1", - "indent-string": "^3.0.0", - "is-ci": "^1.0.7", - "is-generator-fn": "^1.0.0", - "is-obj": "^1.0.0", - "is-observable": "^1.0.0", - "is-promise": "^2.1.0", - "last-line-stream": "^1.0.0", - "lodash.clonedeepwith": "^4.5.0", - "lodash.debounce": "^4.0.3", - "lodash.difference": "^4.3.0", - "lodash.flatten": "^4.2.0", - "loud-rejection": "^1.2.0", - "make-dir": "^1.0.0", - "matcher": "^1.0.0", - "md5-hex": "^2.0.0", - "meow": "^3.7.0", - "ms": "^2.0.0", - "multimatch": "^2.1.0", - "observable-to-promise": "^0.5.0", - "option-chain": "^1.0.0", - "package-hash": "^2.0.0", - "pkg-conf": "^2.0.0", - "plur": "^2.0.0", - "pretty-ms": "^3.0.0", - "require-precompiled": "^0.1.0", - "resolve-cwd": "^2.0.0", - "safe-buffer": "^5.1.1", - "semver": "^5.4.1", - "slash": "^1.0.0", - "source-map-support": "^0.5.0", - "stack-utils": "^1.0.1", - "strip-ansi": "^4.0.0", - "strip-bom-buf": "^1.0.0", - "supertap": "^1.0.0", - "supports-color": "^5.0.0", - "trim-off-newlines": "^1.0.1", - "unique-temp-dir": "^1.0.0", - "update-notifier": "^2.3.0" + "@ava/babel-preset-stage-4": "1.1.0", + "@ava/babel-preset-transform-test-files": "3.0.0", + "@ava/write-file-atomic": "2.2.0", + "@concordance/react": "1.0.0", + "@ladjs/time-require": "0.1.4", + "ansi-escapes": "3.1.0", + "ansi-styles": "3.2.1", + "arr-flatten": "1.1.0", + "array-union": "1.0.2", + "array-uniq": "1.0.3", + "arrify": "1.0.1", + "auto-bind": "1.2.1", + "ava-init": "0.2.1", + "babel-core": "6.26.3", + "babel-generator": "6.26.1", + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "bluebird": "3.5.1", + "caching-transform": "1.0.1", + "chalk": "2.4.1", + "chokidar": "1.7.0", + "clean-stack": "1.3.0", + "clean-yaml-object": "0.1.0", + "cli-cursor": "2.1.0", + "cli-spinners": "1.3.1", + "cli-truncate": "1.1.0", + "co-with-promise": "4.6.0", + "code-excerpt": "2.1.1", + "common-path-prefix": "1.0.0", + "concordance": "3.0.0", + "convert-source-map": "1.5.1", + "core-assert": "0.2.1", + "currently-unhandled": "0.4.1", + "debug": "3.1.0", + "dot-prop": "4.2.0", + "empower-core": "0.6.2", + "equal-length": "1.0.1", + "figures": "2.0.0", + "find-cache-dir": "1.0.0", + "fn-name": "2.0.1", + "get-port": "3.2.0", + "globby": "6.1.0", + "has-flag": "2.0.0", + "hullabaloo-config-manager": "1.1.1", + "ignore-by-default": "1.0.1", + "import-local": "0.1.1", + "indent-string": "3.2.0", + "is-ci": "1.1.0", + "is-generator-fn": "1.0.0", + "is-obj": "1.0.1", + "is-observable": "1.1.0", + "is-promise": "2.1.0", + "last-line-stream": "1.0.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.debounce": "4.0.8", + "lodash.difference": "4.5.0", + "lodash.flatten": "4.4.0", + "loud-rejection": "1.6.0", + "make-dir": "1.3.0", + "matcher": "1.1.1", + "md5-hex": "2.0.0", + "meow": "3.7.0", + "ms": "2.0.0", + "multimatch": "2.1.0", + "observable-to-promise": "0.5.0", + "option-chain": "1.0.0", + "package-hash": "2.0.0", + "pkg-conf": "2.1.0", + "plur": "2.1.2", + "pretty-ms": "3.2.0", + "require-precompiled": "0.1.0", + "resolve-cwd": "2.0.0", + "safe-buffer": "5.1.2", + "semver": "5.5.0", + "slash": "1.0.0", + "source-map-support": "0.5.6", + "stack-utils": "1.0.1", + "strip-ansi": "4.0.0", + "strip-bom-buf": "1.0.0", + "supertap": "1.0.0", + "supports-color": "5.4.0", + "trim-off-newlines": "1.0.1", + "unique-temp-dir": "1.0.0", + "update-notifier": "2.5.0" }, "dependencies": { "ansi-regex": { @@ -2585,7 +2585,7 @@ "dev": true, "requires": { "call-signature": "0.0.2", - "core-js": "^2.0.0" + "core-js": "2.5.7" } }, "globby": { @@ -2594,11 +2594,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -2619,7 +2619,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "strip-ansi": { @@ -2628,7 +2628,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -2639,11 +2639,11 @@ "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", "dev": true, "requires": { - "arr-exclude": "^1.0.0", - "execa": "^0.7.0", - "has-yarn": "^1.0.0", - "read-pkg-up": "^2.0.0", - "write-pkg": "^3.1.0" + "arr-exclude": "1.0.0", + "execa": "0.7.0", + "has-yarn": "1.0.0", + "read-pkg-up": "2.0.0", + "write-pkg": "3.2.0" } }, "aws-sign2": { @@ -2661,8 +2661,8 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { - "follow-redirects": "^1.3.0", - "is-buffer": "^1.1.5" + "follow-redirects": "1.5.0", + "is-buffer": "1.1.6" } }, "babel-code-frame": { @@ -2671,9 +2671,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" }, "dependencies": { "ansi-styles": { @@ -2688,11 +2688,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "supports-color": { @@ -2709,25 +2709,25 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.1", + "debug": "2.6.9", + "json5": "0.5.1", + "lodash": "4.17.10", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.8", + "slash": "1.0.0", + "source-map": "0.5.7" }, "dependencies": { "debug": { @@ -2747,14 +2747,14 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.10", + "source-map": "0.5.7", + "trim-right": "1.0.1" }, "dependencies": { "jsesc": { @@ -2771,9 +2771,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-call-delegate": { @@ -2782,10 +2782,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-explode-assignable-expression": { @@ -2794,9 +2794,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-function-name": { @@ -2805,11 +2805,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-get-function-arity": { @@ -2818,8 +2818,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-hoist-variables": { @@ -2828,8 +2828,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helper-regex": { @@ -2838,9 +2838,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "lodash": "4.17.10" } }, "babel-helper-remap-async-to-generator": { @@ -2849,11 +2849,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-helpers": { @@ -2862,8 +2862,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" } }, "babel-messages": { @@ -2872,7 +2872,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-check-es2015-constants": { @@ -2881,7 +2881,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-espower": { @@ -2890,13 +2890,13 @@ "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", "dev": true, "requires": { - "babel-generator": "^6.1.0", - "babylon": "^6.1.0", - "call-matcher": "^1.0.0", - "core-js": "^2.0.0", - "espower-location-detector": "^1.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.1.1" + "babel-generator": "6.26.1", + "babylon": "6.18.0", + "call-matcher": "1.0.1", + "core-js": "2.5.7", + "espower-location-detector": "1.0.0", + "espurify": "1.8.0", + "estraverse": "4.2.0" } }, "babel-plugin-syntax-async-functions": { @@ -2929,9 +2929,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-destructuring": { @@ -2940,7 +2940,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -2949,9 +2949,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -2960,10 +2960,10 @@ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -2972,12 +2972,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-spread": { @@ -2986,7 +2986,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -2995,9 +2995,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -3006,9 +3006,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" + "babel-helper-regex": "6.26.0", + "babel-runtime": "6.26.0", + "regexpu-core": "2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -3017,9 +3017,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" } }, "babel-plugin-transform-strict-mode": { @@ -3028,8 +3028,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" } }, "babel-register": { @@ -3038,13 +3038,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" + "babel-core": "6.26.3", + "babel-runtime": "6.26.0", + "core-js": "2.5.7", + "home-or-tmp": "2.0.0", + "lodash": "4.17.10", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18" }, "dependencies": { "source-map-support": { @@ -3053,7 +3053,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.7" } } } @@ -3064,8 +3064,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" + "core-js": "2.5.7", + "regenerator-runtime": "0.11.1" } }, "babel-template": { @@ -3074,11 +3074,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.10" } }, "babel-traverse": { @@ -3087,15 +3087,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.4", + "lodash": "4.17.10" }, "dependencies": { "debug": { @@ -3115,10 +3115,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.10", + "to-fast-properties": "1.0.3" } }, "babylon": { @@ -3137,13 +3137,13 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { @@ -3151,7 +3151,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -3159,7 +3159,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -3167,7 +3167,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -3175,9 +3175,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -3188,7 +3188,7 @@ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "optional": true, "requires": { - "tweetnacl": "^0.14.3" + "tweetnacl": "0.14.5" } }, "binary-extensions": { @@ -3209,13 +3209,13 @@ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", "dev": true, "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.4.1", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "2.0.0" }, "dependencies": { "ansi-regex": { @@ -3242,8 +3242,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -3252,7 +3252,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -3262,7 +3262,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -3271,16 +3271,16 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -3288,7 +3288,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -3327,7 +3327,7 @@ "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", "requires": { - "long": "~3" + "long": "3.2.0" }, "dependencies": { "long": { @@ -3342,15 +3342,15 @@ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" } }, "cacheable-request": { @@ -3382,9 +3382,9 @@ "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", "dev": true, "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" }, "dependencies": { "md5-hex": { @@ -3393,7 +3393,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "write-file-atomic": { @@ -3402,9 +3402,9 @@ "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } } } @@ -3415,10 +3415,10 @@ "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", "dev": true, "requires": { - "core-js": "^2.0.0", - "deep-equal": "^1.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.0.0" + "core-js": "2.5.7", + "deep-equal": "1.0.1", + "espurify": "1.8.0", + "estraverse": "4.2.0" } }, "call-me-maybe": { @@ -3437,7 +3437,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "^0.2.0" + "callsites": "0.2.0" } }, "callsites": { @@ -3457,8 +3457,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" + "camelcase": "2.1.1", + "map-obj": "1.0.1" } }, "capture-stack-trace": { @@ -3478,7 +3478,7 @@ "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", "dev": true, "requires": { - "underscore-contrib": "~0.3.0" + "underscore-contrib": "0.3.0" } }, "center-align": { @@ -3488,8 +3488,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "chalk": { @@ -3498,9 +3498,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "chardet": { @@ -3515,15 +3515,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" + "anymatch": "1.3.2", + "async-each": "1.0.1", + "fsevents": "1.2.4", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" }, "dependencies": { "glob-parent": { @@ -3532,7 +3532,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "^2.0.0" + "is-glob": "2.0.1" } }, "is-extglob": { @@ -3547,7 +3547,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } } } @@ -3569,10 +3569,10 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "define-property": { @@ -3580,7 +3580,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -3609,7 +3609,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "2.0.0" } }, "cli-spinners": { @@ -3624,8 +3624,8 @@ "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", "dev": true, "requires": { - "slice-ansi": "^1.0.0", - "string-width": "^2.0.0" + "slice-ansi": "1.0.0", + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -3646,8 +3646,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -3656,7 +3656,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -3672,9 +3672,9 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "clone-response": { @@ -3683,7 +3683,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "^1.0.0" + "mimic-response": "1.0.0" } }, "co": { @@ -3697,7 +3697,7 @@ "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", "dev": true, "requires": { - "pinkie-promise": "^1.0.0" + "pinkie-promise": "1.0.0" } }, "code-excerpt": { @@ -3706,7 +3706,7 @@ "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", "dev": true, "requires": { - "convert-to-spaces": "^1.0.1" + "convert-to-spaces": "1.0.2" } }, "code-point-at": { @@ -3721,7 +3721,7 @@ "dev": true, "requires": { "argv": "0.0.2", - "request": "^2.81.0", + "request": "2.87.0", "urlgrey": "0.4.4" } }, @@ -3730,8 +3730,8 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "color-convert": { @@ -3765,7 +3765,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "~1.0.0" + "delayed-stream": "1.0.0" } }, "commander": { @@ -3802,17 +3802,17 @@ "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", "dev": true, "requires": { - "date-time": "^2.1.0", - "esutils": "^2.0.2", - "fast-diff": "^1.1.1", - "function-name-support": "^0.2.0", - "js-string-escape": "^1.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.flattendeep": "^4.4.0", - "lodash.merge": "^4.6.0", - "md5-hex": "^2.0.0", - "semver": "^5.3.0", - "well-known-symbols": "^1.0.0" + "date-time": "2.1.0", + "esutils": "2.0.2", + "fast-diff": "1.1.2", + "function-name-support": "0.2.0", + "js-string-escape": "1.0.1", + "lodash.clonedeep": "4.5.0", + "lodash.flattendeep": "4.4.0", + "lodash.merge": "4.6.1", + "md5-hex": "2.0.0", + "semver": "5.5.0", + "well-known-symbols": "1.0.0" }, "dependencies": { "date-time": { @@ -3821,7 +3821,7 @@ "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", "dev": true, "requires": { - "time-zone": "^1.0.0" + "time-zone": "1.0.0" } } } @@ -3832,12 +3832,12 @@ "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" + "dot-prop": "4.2.0", + "graceful-fs": "4.1.11", + "make-dir": "1.3.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.3.0", + "xdg-basedir": "3.0.0" } }, "convert-source-map": { @@ -3869,8 +3869,8 @@ "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", "dev": true, "requires": { - "buf-compare": "^1.0.0", - "is-error": "^2.2.0" + "buf-compare": "1.0.1", + "is-error": "2.2.1" } }, "core-js": { @@ -3889,7 +3889,7 @@ "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "dev": true, "requires": { - "capture-stack-trace": "^1.0.0" + "capture-stack-trace": "1.0.0" } }, "cross-spawn": { @@ -3898,9 +3898,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "shebang-command": "1.2.0", + "which": "1.3.1" } }, "crypto-random-string": { @@ -3915,7 +3915,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "^1.0.1" + "array-find-index": "1.0.2" } }, "d": { @@ -3924,7 +3924,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "^0.10.9" + "es5-ext": "0.10.45" } }, "dashdash": { @@ -3932,7 +3932,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "date-time": { @@ -3965,7 +3965,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "^1.0.0" + "mimic-response": "1.0.0" } }, "deep-equal": { @@ -3991,8 +3991,8 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "requires": { - "foreach": "^2.0.5", - "object-keys": "^1.0.8" + "foreach": "2.0.5", + "object-keys": "1.0.12" } }, "define-property": { @@ -4000,8 +4000,8 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4009,7 +4009,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -4017,7 +4017,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -4025,9 +4025,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -4038,13 +4038,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" }, "dependencies": { "globby": { @@ -4053,12 +4053,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -4079,18 +4079,15 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } } } }, "delay": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz", - "integrity": "sha1-kRLq3APk7H4AKXM3iW8nO72R+uU=", - "requires": { - "p-defer": "^1.0.0" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/delay/-/delay-3.0.0.tgz", + "integrity": "sha512-6d9nF+lHG/HOZTmX/8/FgWm5UZQUF5O2SnnUvBZail1ESK1QixrmFn7vaW9hycz0/uwcmkqLyHDER+/AgCxbsQ==" }, "delayed-stream": { "version": "1.0.0", @@ -4103,7 +4100,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "diff": { @@ -4122,8 +4119,8 @@ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" + "arrify": "1.0.1", + "path-type": "3.0.0" } }, "doctrine": { @@ -4132,7 +4129,7 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "^2.0.2" + "esutils": "2.0.2" } }, "dom-serializer": { @@ -4141,8 +4138,8 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { - "domelementtype": "~1.1.1", - "entities": "~1.1.1" + "domelementtype": "1.1.3", + "entities": "1.1.1" }, "dependencies": { "domelementtype": { @@ -4165,7 +4162,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1" + "domelementtype": "1.3.0" } }, "domutils": { @@ -4174,8 +4171,8 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" } }, "dot-prop": { @@ -4184,7 +4181,7 @@ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { - "is-obj": "^1.0.0" + "is-obj": "1.0.1" } }, "duplexer3": { @@ -4198,10 +4195,10 @@ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" } }, "eastasianwidth": { @@ -4215,7 +4212,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "~0.1.0" + "jsbn": "0.1.1" } }, "ecdsa-sig-formatter": { @@ -4223,7 +4220,7 @@ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz", "integrity": "sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=", "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "empower": { @@ -4231,8 +4228,8 @@ "resolved": "https://registry.npmjs.org/empower/-/empower-1.3.0.tgz", "integrity": "sha512-tP2WqM7QzrPguCCQEQfFFDF+6Pw6YWLQal3+GHQaV+0uIr0S+jyREQPWljE02zFCYPFYLZ3LosiRV+OzTrxPpQ==", "requires": { - "core-js": "^2.0.0", - "empower-core": "^1.2.0" + "core-js": "2.5.7", + "empower-core": "1.2.0" } }, "empower-assert": { @@ -4241,7 +4238,7 @@ "integrity": "sha512-Ylck0Q6p8y/LpNzYeBccaxAPm2ZyuqBgErgZpO9KT0HuQWF0sJckBKCLmgS1/DEXEiyBi9XtYh3clZm5cAdARw==", "dev": true, "requires": { - "estraverse": "^4.2.0" + "estraverse": "4.2.0" } }, "empower-core": { @@ -4250,7 +4247,7 @@ "integrity": "sha512-g6+K6Geyc1o6FdXs9HwrXleCFan7d66G5xSCfSF7x1mJDCes6t0om9lFQG3zOrzh3Bkb/45N0cZ5Gqsf7YrzGQ==", "requires": { "call-signature": "0.0.2", - "core-js": "^2.0.0" + "core-js": "2.5.7" } }, "end-of-stream": { @@ -4258,7 +4255,7 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { - "once": "^1.4.0" + "once": "1.4.0" } }, "ent": { @@ -4284,7 +4281,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "es-abstract": { @@ -4293,11 +4290,11 @@ "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", "dev": true, "requires": { - "es-to-primitive": "^1.1.1", - "function-bind": "^1.1.1", - "has": "^1.0.1", - "is-callable": "^1.1.3", - "is-regex": "^1.0.4" + "es-to-primitive": "1.1.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "is-callable": "1.1.3", + "is-regex": "1.0.4" } }, "es-to-primitive": { @@ -4306,9 +4303,9 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { - "is-callable": "^1.1.1", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.1" + "is-callable": "1.1.3", + "is-date-object": "1.0.1", + "is-symbol": "1.0.1" } }, "es5-ext": { @@ -4317,9 +4314,9 @@ "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", "dev": true, "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "1" + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" } }, "es6-error": { @@ -4334,9 +4331,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-symbol": "3.1.1" } }, "es6-map": { @@ -4345,12 +4342,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-set": "~0.1.5", - "es6-symbol": "~3.1.1", - "event-emitter": "~0.3.5" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" } }, "es6-set": { @@ -4359,11 +4356,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", - "event-emitter": "~0.3.5" + "event-emitter": "0.3.5" } }, "es6-symbol": { @@ -4372,8 +4369,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.45" } }, "es6-weak-map": { @@ -4382,10 +4379,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.45", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" } }, "escallmatch": { @@ -4394,8 +4391,8 @@ "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", "dev": true, "requires": { - "call-matcher": "^1.0.0", - "esprima": "^2.0.0" + "call-matcher": "1.0.1", + "esprima": "2.7.3" }, "dependencies": { "esprima": { @@ -4418,11 +4415,11 @@ "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==", "dev": true, "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.6.1" }, "dependencies": { "esprima": { @@ -4446,10 +4443,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "^0.1.3", - "es6-weak-map": "^2.0.1", - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" } }, "eslint": { @@ -4458,44 +4455,44 @@ "integrity": "sha512-D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==", "dev": true, "requires": { - "ajv": "^6.5.0", - "babel-code-frame": "^6.26.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^3.1.0", - "doctrine": "^2.1.0", - "eslint-scope": "^4.0.0", - "eslint-visitor-keys": "^1.0.0", - "espree": "^4.0.0", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.5.0", - "ignore": "^3.3.3", - "imurmurhash": "^0.1.4", - "inquirer": "^5.2.0", - "is-resolvable": "^1.1.0", - "js-yaml": "^3.11.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.5", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", - "progress": "^2.0.0", - "regexpp": "^1.1.0", - "require-uncached": "^1.0.3", - "semver": "^5.5.0", - "string.prototype.matchall": "^2.0.0", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^4.0.3", - "text-table": "^0.2.0" + "ajv": "6.5.1", + "babel-code-frame": "6.26.0", + "chalk": "2.4.1", + "cross-spawn": "6.0.5", + "debug": "3.1.0", + "doctrine": "2.1.0", + "eslint-scope": "4.0.0", + "eslint-visitor-keys": "1.0.0", + "espree": "4.0.0", + "esquery": "1.0.1", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "functional-red-black-tree": "1.0.1", + "glob": "7.1.2", + "globals": "11.7.0", + "ignore": "3.3.10", + "imurmurhash": "0.1.4", + "inquirer": "5.2.0", + "is-resolvable": "1.1.0", + "js-yaml": "3.12.0", + "json-stable-stringify-without-jsonify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.10", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "7.0.0", + "progress": "2.0.0", + "regexpp": "1.1.0", + "require-uncached": "1.0.3", + "semver": "5.5.0", + "string.prototype.matchall": "2.0.0", + "strip-ansi": "4.0.0", + "strip-json-comments": "2.0.1", + "table": "4.0.3", + "text-table": "0.2.0" }, "dependencies": { "ajv": { @@ -4504,10 +4501,10 @@ "integrity": "sha512-pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.1" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "ansi-regex": { @@ -4522,11 +4519,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "nice-try": "1.0.4", + "path-key": "2.0.1", + "semver": "5.5.0", + "shebang-command": "1.2.0", + "which": "1.3.1" } }, "fast-deep-equal": { @@ -4553,7 +4550,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -4564,7 +4561,7 @@ "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", "dev": true, "requires": { - "get-stdin": "^5.0.1" + "get-stdin": "5.0.1" }, "dependencies": { "get-stdin": { @@ -4581,10 +4578,10 @@ "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", "dev": true, "requires": { - "ignore": "^3.3.6", - "minimatch": "^3.0.4", - "resolve": "^1.3.3", - "semver": "^5.4.1" + "ignore": "3.3.10", + "minimatch": "3.0.4", + "resolve": "1.8.1", + "semver": "5.5.0" }, "dependencies": { "resolve": { @@ -4593,7 +4590,7 @@ "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "1.0.5" } } } @@ -4604,8 +4601,8 @@ "integrity": "sha512-wNZ2z0oVCWnf+3BSI7roS+z4gGu2AwcPKUek+SlLZMZg+X0KbZLsB2knul7fd0K3iuIp402HIYzm4f2+OyfXxA==", "dev": true, "requires": { - "fast-diff": "^1.1.1", - "jest-docblock": "^21.0.0" + "fast-diff": "1.1.2", + "jest-docblock": "21.2.0" } }, "eslint-scope": { @@ -4614,8 +4611,8 @@ "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", "dev": true, "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "esrecurse": "4.2.1", + "estraverse": "4.2.0" } }, "eslint-visitor-keys": { @@ -4630,16 +4627,16 @@ "integrity": "sha512-F4TY1qYJB1aUyzB03NsZksZzUQmQoEBaTUjRJGR30GxbkbjKI41NhCyYjrF+bGgWN7x/ZsczYppRpz/0WdI0ug==", "dev": true, "requires": { - "array-find": "^1.0.0", - "escallmatch": "^1.5.0", - "escodegen": "^1.7.0", - "escope": "^3.3.0", - "espower-location-detector": "^1.0.0", - "espurify": "^1.3.0", - "estraverse": "^4.1.0", - "source-map": "^0.5.0", - "type-name": "^2.0.0", - "xtend": "^4.0.0" + "array-find": "1.0.0", + "escallmatch": "1.5.0", + "escodegen": "1.10.0", + "escope": "3.6.0", + "espower-location-detector": "1.0.0", + "espurify": "1.8.0", + "estraverse": "4.2.0", + "source-map": "0.5.7", + "type-name": "2.0.2", + "xtend": "4.0.1" } }, "espower-loader": { @@ -4648,11 +4645,11 @@ "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", "dev": true, "requires": { - "convert-source-map": "^1.1.0", - "espower-source": "^2.0.0", - "minimatch": "^3.0.0", - "source-map-support": "^0.4.0", - "xtend": "^4.0.0" + "convert-source-map": "1.5.1", + "espower-source": "2.3.0", + "minimatch": "3.0.4", + "source-map-support": "0.4.18", + "xtend": "4.0.1" }, "dependencies": { "source-map-support": { @@ -4661,7 +4658,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.7" } } } @@ -4672,10 +4669,10 @@ "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", "dev": true, "requires": { - "is-url": "^1.2.1", - "path-is-absolute": "^1.0.0", - "source-map": "^0.5.0", - "xtend": "^4.0.0" + "is-url": "1.2.4", + "path-is-absolute": "1.0.1", + "source-map": "0.5.7", + "xtend": "4.0.1" } }, "espower-source": { @@ -4684,17 +4681,17 @@ "integrity": "sha512-Wc4kC4zUAEV7Qt31JRPoBUc5jjowHRylml2L2VaDQ1XEbnqQofGWx+gPR03TZAPokAMl5dqyL36h3ITyMXy3iA==", "dev": true, "requires": { - "acorn": "^5.0.0", - "acorn-es7-plugin": "^1.0.10", - "convert-source-map": "^1.1.1", - "empower-assert": "^1.0.0", - "escodegen": "^1.10.0", - "espower": "^2.1.1", - "estraverse": "^4.0.0", - "merge-estraverse-visitors": "^1.0.0", - "multi-stage-sourcemap": "^0.2.1", - "path-is-absolute": "^1.0.0", - "xtend": "^4.0.0" + "acorn": "5.7.1", + "acorn-es7-plugin": "1.1.7", + "convert-source-map": "1.5.1", + "empower-assert": "1.1.0", + "escodegen": "1.10.0", + "espower": "2.1.1", + "estraverse": "4.2.0", + "merge-estraverse-visitors": "1.0.0", + "multi-stage-sourcemap": "0.2.1", + "path-is-absolute": "1.0.1", + "xtend": "4.0.1" } }, "espree": { @@ -4703,8 +4700,8 @@ "integrity": "sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==", "dev": true, "requires": { - "acorn": "^5.6.0", - "acorn-jsx": "^4.1.1" + "acorn": "5.7.1", + "acorn-jsx": "4.1.1" } }, "esprima": { @@ -4718,7 +4715,7 @@ "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.0.tgz", "integrity": "sha512-jdkJG9jswjKCCDmEridNUuIQei9algr+o66ZZ19610ZoBsiWLRsQGNYS4HGez3Z/DsR0lhANGAqiwBUclPuNag==", "requires": { - "core-js": "^2.0.0" + "core-js": "2.5.7" } }, "esquery": { @@ -4727,7 +4724,7 @@ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { - "estraverse": "^4.0.0" + "estraverse": "4.2.0" } }, "esrecurse": { @@ -4736,7 +4733,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "^4.1.0" + "estraverse": "4.2.0" } }, "estraverse": { @@ -4756,8 +4753,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.45" } }, "execa": { @@ -4766,13 +4763,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" } }, "expand-brackets": { @@ -4780,13 +4777,13 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "debug": { @@ -4802,7 +4799,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -4810,7 +4807,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -4821,7 +4818,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "^2.1.0" + "fill-range": "2.2.4" }, "dependencies": { "fill-range": { @@ -4830,11 +4827,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "3.0.0", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" } }, "is-number": { @@ -4843,7 +4840,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "isobject": { @@ -4861,7 +4858,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -4876,8 +4873,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -4885,7 +4882,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -4896,9 +4893,9 @@ "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { - "chardet": "^0.4.0", - "iconv-lite": "^0.4.17", - "tmp": "^0.0.33" + "chardet": "0.4.2", + "iconv-lite": "0.4.23", + "tmp": "0.0.33" } }, "extglob": { @@ -4906,14 +4903,14 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -4921,7 +4918,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { @@ -4929,7 +4926,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -4937,7 +4934,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -4945,7 +4942,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -4953,9 +4950,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -4981,12 +4978,12 @@ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz", "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==", "requires": { - "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.0.1", - "glob-parent": "^3.1.0", - "is-glob": "^4.0.0", - "merge2": "^1.2.1", - "micromatch": "^3.1.10" + "@mrmlnc/readdir-enhanced": "2.2.1", + "@nodelib/fs.stat": "1.1.0", + "glob-parent": "3.1.0", + "is-glob": "4.0.0", + "merge2": "1.2.2", + "micromatch": "3.1.10" } }, "fast-json-stable-stringify": { @@ -5006,7 +5003,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5" + "escape-string-regexp": "1.0.5" } }, "file-entry-cache": { @@ -5015,8 +5012,8 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" + "flat-cache": "1.3.0", + "object-assign": "4.1.1" } }, "filename-regex": { @@ -5031,8 +5028,8 @@ "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", "dev": true, "requires": { - "is-object": "~1.0.1", - "merge-descriptors": "~1.0.0" + "is-object": "1.0.1", + "merge-descriptors": "1.0.1" } }, "fill-range": { @@ -5040,10 +5037,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -5051,7 +5048,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -5062,9 +5059,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "2.0.0" } }, "find-up": { @@ -5073,7 +5070,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "flat-cache": { @@ -5082,10 +5079,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "^0.3.1", - "del": "^2.0.2", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" } }, "fn-name": { @@ -5099,7 +5096,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "requires": { - "debug": "^3.1.0" + "debug": "3.1.0" } }, "for-in": { @@ -5113,7 +5110,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } }, "foreach": { @@ -5131,9 +5128,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "^0.4.0", + "asynckit": "0.4.0", "combined-stream": "1.0.6", - "mime-types": "^2.1.12" + "mime-types": "2.1.18" } }, "formidable": { @@ -5147,7 +5144,7 @@ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "from2": { @@ -5156,8 +5153,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "fs-extra": { @@ -5166,9 +5163,9 @@ "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.2" } }, "fs.realpath": { @@ -5183,8 +5180,8 @@ "dev": true, "optional": true, "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" + "nan": "2.10.0", + "node-pre-gyp": "0.10.0" }, "dependencies": { "abbrev": { @@ -5210,8 +5207,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "balanced-match": { @@ -5224,7 +5221,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -5288,7 +5285,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.2.4" } }, "fs.realpath": { @@ -5303,14 +5300,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" } }, "glob": { @@ -5319,12 +5316,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-unicode": { @@ -5339,7 +5336,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "^2.1.0" + "safer-buffer": "2.1.2" } }, "ignore-walk": { @@ -5348,7 +5345,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "inflight": { @@ -5357,8 +5354,8 @@ "dev": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -5377,7 +5374,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "isarray": { @@ -5391,7 +5388,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -5404,8 +5401,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "^5.1.1", - "yallist": "^3.0.0" + "safe-buffer": "5.1.1", + "yallist": "3.0.2" } }, "minizlib": { @@ -5414,7 +5411,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.2.4" } }, "mkdirp": { @@ -5437,9 +5434,9 @@ "dev": true, "optional": true, "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "debug": "2.6.9", + "iconv-lite": "0.4.21", + "sax": "1.2.4" } }, "node-pre-gyp": { @@ -5448,16 +5445,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.0", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.7", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.1" } }, "nopt": { @@ -5466,8 +5463,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npm-bundled": { @@ -5482,8 +5479,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" } }, "npmlog": { @@ -5492,10 +5489,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "number-is-nan": { @@ -5514,7 +5511,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "os-homedir": { @@ -5535,8 +5532,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "path-is-absolute": { @@ -5557,10 +5554,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "^0.5.1", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.5.1", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -5577,13 +5574,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { @@ -5592,7 +5589,7 @@ "dev": true, "optional": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "safe-buffer": { @@ -5635,9 +5632,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -5646,7 +5643,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.1" } }, "strip-ansi": { @@ -5654,7 +5651,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-json-comments": { @@ -5669,13 +5666,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", - "yallist": "^3.0.2" + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" } }, "util-deprecate": { @@ -5690,7 +5687,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "^1.0.2" + "string-width": "1.0.2" } }, "wrappy": { @@ -5728,8 +5725,8 @@ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", "requires": { - "axios": "^0.18.0", - "extend": "^3.0.1", + "axios": "0.18.0", + "extend": "3.0.1", "retry-axios": "0.3.2" } }, @@ -5767,7 +5764,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "glob": { @@ -5775,12 +5772,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-base": { @@ -5789,8 +5786,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" + "glob-parent": "2.0.0", + "is-glob": "2.0.1" }, "dependencies": { "glob-parent": { @@ -5799,7 +5796,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "^2.0.0" + "is-glob": "2.0.1" } }, "is-extglob": { @@ -5814,7 +5811,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } } } @@ -5824,8 +5821,8 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" }, "dependencies": { "is-glob": { @@ -5833,7 +5830,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -5849,7 +5846,7 @@ "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", "dev": true, "requires": { - "ini": "^1.3.4" + "ini": "1.3.5" } }, "globals": { @@ -5863,13 +5860,13 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "fast-glob": "^2.0.2", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "fast-glob": "2.2.2", + "glob": "7.1.2", + "ignore": "3.3.10", + "pify": "3.0.0", + "slash": "1.0.0" } }, "google-auth-library": { @@ -5877,13 +5874,13 @@ "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.6.1.tgz", "integrity": "sha512-jYiWC8NA9n9OtQM7ANn0Tk464do9yhKEtaJ72pKcaBiEwn4LwcGYIYOfwtfsSm3aur/ed3tlSxbmg24IAT6gAg==", "requires": { - "axios": "^0.18.0", - "gcp-metadata": "^0.6.3", - "gtoken": "^2.3.0", - "jws": "^3.1.5", - "lodash.isstring": "^4.0.1", - "lru-cache": "^4.1.3", - "retry-axios": "^0.3.2" + "axios": "0.18.0", + "gcp-metadata": "0.6.3", + "gtoken": "2.3.0", + "jws": "3.1.5", + "lodash.isstring": "4.0.1", + "lru-cache": "4.1.3", + "retry-axios": "0.3.2" } }, "google-auto-auth": { @@ -5891,10 +5888,10 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", "requires": { - "async": "^2.3.0", - "gcp-metadata": "^0.6.1", - "google-auth-library": "^1.3.1", - "request": "^2.79.0" + "async": "2.6.1", + "gcp-metadata": "0.6.3", + "google-auth-library": "1.6.1", + "request": "2.87.0" } }, "google-gax": { @@ -5902,17 +5899,17 @@ "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.17.1.tgz", "integrity": "sha512-fAKvFx++SRr6bGWamWuVOkJzJnQqMgpJkhaB2oEwfFJ91rbFgEmIPRmZZ/MeIVVFUOuHUVyZ8nwjm5peyTZJ6g==", "requires": { - "duplexify": "^3.6.0", - "extend": "^3.0.1", - "globby": "^8.0.1", - "google-auth-library": "^1.6.1", - "google-proto-files": "^0.16.0", - "grpc": "^1.12.2", - "is-stream-ended": "^0.1.4", - "lodash": "^4.17.10", - "protobufjs": "^6.8.6", - "retry-request": "^4.0.0", - "through2": "^2.0.3" + "duplexify": "3.6.0", + "extend": "3.0.1", + "globby": "8.0.1", + "google-auth-library": "1.6.1", + "google-proto-files": "0.16.1", + "grpc": "1.12.4", + "is-stream-ended": "0.1.4", + "lodash": "4.17.10", + "protobufjs": "6.8.6", + "retry-request": "4.0.0", + "through2": "2.0.3" }, "dependencies": { "retry-request": { @@ -5920,7 +5917,7 @@ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.0.0.tgz", "integrity": "sha512-S4HNLaWcMP6r8E4TMH52Y7/pM8uNayOcTDDQNBwsCccL1uI+Ol2TljxRDPzaNfbhOB30+XWP5NnZkB3LiJxi1w==", "requires": { - "through2": "^2.0.0" + "through2": "2.0.3" } } } @@ -5930,8 +5927,8 @@ "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", "requires": { - "node-forge": "^0.7.4", - "pify": "^3.0.0" + "node-forge": "0.7.5", + "pify": "3.0.0" } }, "google-proto-files": { @@ -5939,9 +5936,9 @@ "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.16.1.tgz", "integrity": "sha512-ykdhaYDiU/jlyrkzZDPemraKwVIgLT31XMHVNSJW//R9VED56hqSDRMx1Jlxbf0O4iDZnBWQ0JQLHbM2r5+wuA==", "requires": { - "globby": "^8.0.0", - "power-assert": "^1.4.4", - "protobufjs": "^6.8.0" + "globby": "8.0.1", + "power-assert": "1.6.0", + "protobufjs": "6.8.6" } }, "got": { @@ -5950,23 +5947,23 @@ "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", "dev": true, "requires": { - "@sindresorhus/is": "^0.7.0", - "cacheable-request": "^2.1.1", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "into-stream": "^3.1.0", - "is-retry-allowed": "^1.1.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "mimic-response": "^1.0.0", - "p-cancelable": "^0.3.0", - "p-timeout": "^2.0.1", - "pify": "^3.0.0", - "safe-buffer": "^5.1.1", - "timed-out": "^4.0.1", - "url-parse-lax": "^3.0.0", - "url-to-options": "^1.0.1" + "@sindresorhus/is": "0.7.0", + "cacheable-request": "2.1.4", + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "into-stream": "3.1.0", + "is-retry-allowed": "1.1.0", + "isurl": "1.0.0", + "lowercase-keys": "1.0.1", + "mimic-response": "1.0.0", + "p-cancelable": "0.3.0", + "p-timeout": "2.0.1", + "pify": "3.0.0", + "safe-buffer": "5.1.2", + "timed-out": "4.0.1", + "url-parse-lax": "3.0.0", + "url-to-options": "1.0.1" }, "dependencies": { "prepend-http": { @@ -5981,7 +5978,7 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "^2.0.0" + "prepend-http": "2.0.0" } } } @@ -6003,10 +6000,10 @@ "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.12.4.tgz", "integrity": "sha512-t0Hy4yoHHYLkK0b+ULTHw5ZuSFmWokCABY0C4bKQbE4jnm1hpjA23cQVD0xAqDcRHN5CkvFzlqb34ngV22dqoQ==", "requires": { - "lodash": "^4.17.5", - "nan": "^2.0.0", - "node-pre-gyp": "^0.10.0", - "protobufjs": "^5.0.3" + "lodash": "4.17.10", + "nan": "2.10.0", + "node-pre-gyp": "0.10.0", + "protobufjs": "5.0.3" }, "dependencies": { "abbrev": { @@ -6025,8 +6022,8 @@ "version": "1.1.5", "bundled": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "balanced-match": { @@ -6037,7 +6034,7 @@ "version": "1.1.11", "bundled": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -6084,7 +6081,7 @@ "version": "1.2.5", "bundled": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.3" } }, "fs.realpath": { @@ -6095,26 +6092,26 @@ "version": "2.7.4", "bundled": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "glob": { "version": "7.1.2", "bundled": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-unicode": { @@ -6125,22 +6122,22 @@ "version": "0.4.23", "bundled": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ignore-walk": { "version": "3.0.1", "bundled": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "inflight": { "version": "1.0.6", "bundled": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -6155,7 +6152,7 @@ "version": "1.0.0", "bundled": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "isarray": { @@ -6166,7 +6163,7 @@ "version": "3.0.4", "bundled": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -6177,15 +6174,15 @@ "version": "2.3.3", "bundled": true, "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "safe-buffer": "5.1.2", + "yallist": "3.0.2" } }, "minizlib": { "version": "1.1.0", "bundled": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.3" } }, "mkdirp": { @@ -6209,33 +6206,33 @@ "version": "2.2.1", "bundled": true, "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "debug": "2.6.9", + "iconv-lite": "0.4.23", + "sax": "1.2.4" } }, "node-pre-gyp": { "version": "0.10.0", "bundled": true, "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.1", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.8", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.4" } }, "nopt": { "version": "4.0.1", "bundled": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npm-bundled": { @@ -6246,18 +6243,18 @@ "version": "1.1.10", "bundled": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" } }, "npmlog": { "version": "4.1.2", "bundled": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "number-is-nan": { @@ -6272,7 +6269,7 @@ "version": "1.4.0", "bundled": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "os-homedir": { @@ -6287,8 +6284,8 @@ "version": "0.1.5", "bundled": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "path-is-absolute": { @@ -6304,40 +6301,40 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz", "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==", "requires": { - "ascli": "~1", - "bytebuffer": "~5", - "glob": "^7.0.5", - "yargs": "^3.10.0" + "ascli": "1.0.1", + "bytebuffer": "5.0.1", + "glob": "7.1.2", + "yargs": "3.32.0" } }, "rc": { "version": "1.2.8", "bundled": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" } }, "readable-stream": { "version": "2.3.6", "bundled": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { "version": "2.6.2", "bundled": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "safe-buffer": { @@ -6368,23 +6365,23 @@ "version": "1.0.2", "bundled": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { "version": "1.1.1", "bundled": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { "version": "3.0.1", "bundled": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-json-comments": { @@ -6395,13 +6392,13 @@ "version": "4.4.4", "bundled": true, "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.3", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.3", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.2" } }, "util-deprecate": { @@ -6412,7 +6409,7 @@ "version": "1.1.3", "bundled": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "wrappy": { @@ -6430,11 +6427,11 @@ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", "requires": { - "axios": "^0.18.0", - "google-p12-pem": "^1.0.0", - "jws": "^3.1.4", - "mime": "^2.2.0", - "pify": "^3.0.0" + "axios": "0.18.0", + "google-p12-pem": "1.0.2", + "jws": "3.1.5", + "mime": "2.3.1", + "pify": "3.0.0" } }, "handlebars": { @@ -6443,10 +6440,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" }, "dependencies": { "async": { @@ -6461,7 +6458,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -6476,8 +6473,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" + "ajv": "5.5.2", + "har-schema": "2.0.0" } }, "has": { @@ -6486,7 +6483,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "^1.1.1" + "function-bind": "1.1.1" } }, "has-ansi": { @@ -6495,7 +6492,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-color": { @@ -6528,7 +6525,7 @@ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "dev": true, "requires": { - "has-symbol-support-x": "^1.4.1" + "has-symbol-support-x": "1.4.2" } }, "has-value": { @@ -6536,9 +6533,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" } }, "has-values": { @@ -6546,8 +6543,8 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "kind-of": { @@ -6555,7 +6552,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6578,8 +6575,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "hosted-git-info": { @@ -6594,12 +6591,12 @@ "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "dev": true, "requires": { - "domelementtype": "^1.3.0", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^2.0.2" + "domelementtype": "1.3.0", + "domhandler": "2.4.2", + "domutils": "1.7.0", + "entities": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "http-cache-semantics": { @@ -6613,9 +6610,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.2" } }, "hullabaloo-config-manager": { @@ -6624,20 +6621,20 @@ "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", "dev": true, "requires": { - "dot-prop": "^4.1.0", - "es6-error": "^4.0.2", - "graceful-fs": "^4.1.11", - "indent-string": "^3.1.0", - "json5": "^0.5.1", - "lodash.clonedeep": "^4.5.0", - "lodash.clonedeepwith": "^4.5.0", - "lodash.isequal": "^4.5.0", - "lodash.merge": "^4.6.0", - "md5-hex": "^2.0.0", - "package-hash": "^2.0.0", - "pkg-dir": "^2.0.0", - "resolve-from": "^3.0.0", - "safe-buffer": "^5.0.1" + "dot-prop": "4.2.0", + "es6-error": "4.1.1", + "graceful-fs": "4.1.11", + "indent-string": "3.2.0", + "json5": "0.5.1", + "lodash.clonedeep": "4.5.0", + "lodash.clonedeepwith": "4.5.0", + "lodash.isequal": "4.5.0", + "lodash.merge": "4.6.1", + "md5-hex": "2.0.0", + "package-hash": "2.0.0", + "pkg-dir": "2.0.0", + "resolve-from": "3.0.0", + "safe-buffer": "5.1.2" } }, "iconv-lite": { @@ -6646,7 +6643,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ignore": { @@ -6672,8 +6669,8 @@ "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", "dev": true, "requires": { - "pkg-dir": "^2.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" } }, "imurmurhash": { @@ -6698,8 +6695,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -6719,8 +6716,8 @@ "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", "dev": true, "requires": { - "moment": "^2.14.1", - "sanitize-html": "^1.13.0" + "moment": "2.22.2", + "sanitize-html": "1.18.2" } }, "inquirer": { @@ -6729,19 +6726,19 @@ "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^2.1.0", - "figures": "^2.0.0", - "lodash": "^4.3.0", + "ansi-escapes": "3.1.0", + "chalk": "2.4.1", + "cli-cursor": "2.1.0", + "cli-width": "2.2.0", + "external-editor": "2.2.0", + "figures": "2.0.0", + "lodash": "4.17.10", "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^5.5.2", - "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", - "through": "^2.3.6" + "run-async": "2.3.0", + "rxjs": "5.5.11", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" }, "dependencies": { "ansi-regex": { @@ -6762,8 +6759,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -6772,7 +6769,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -6783,7 +6780,7 @@ "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", "dev": true, "requires": { - "espower-loader": "^1.0.0" + "espower-loader": "1.2.2" } }, "into-stream": { @@ -6792,8 +6789,8 @@ "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", "dev": true, "requires": { - "from2": "^2.1.1", - "p-is-promise": "^1.1.0" + "from2": "2.3.0", + "p-is-promise": "1.1.0" } }, "invariant": { @@ -6802,7 +6799,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.3.1" } }, "invert-kv": { @@ -6826,7 +6823,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6834,7 +6831,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6851,7 +6848,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.11.0" } }, "is-buffer": { @@ -6865,7 +6862,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-callable": { @@ -6880,7 +6877,7 @@ "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", "dev": true, "requires": { - "ci-info": "^1.0.0" + "ci-info": "1.1.3" } }, "is-data-descriptor": { @@ -6888,7 +6885,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6896,7 +6893,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6912,9 +6909,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -6936,7 +6933,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "^2.0.0" + "is-primitive": "2.0.0" } }, "is-error": { @@ -6961,7 +6958,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-fullwidth-code-point": { @@ -6969,7 +6966,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-generator-fn": { @@ -6983,7 +6980,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "^2.1.1" + "is-extglob": "2.1.1" } }, "is-installed-globally": { @@ -6992,8 +6989,8 @@ "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", "dev": true, "requires": { - "global-dirs": "^0.1.0", - "is-path-inside": "^1.0.0" + "global-dirs": "0.1.1", + "is-path-inside": "1.0.1" } }, "is-npm": { @@ -7007,7 +7004,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -7015,7 +7012,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7038,7 +7035,7 @@ "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", "dev": true, "requires": { - "symbol-observable": "^1.1.0" + "symbol-observable": "1.2.0" } }, "is-path-cwd": { @@ -7053,7 +7050,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "is-path-inside": "^1.0.0" + "is-path-inside": "1.0.1" } }, "is-path-inside": { @@ -7062,7 +7059,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "^1.0.1" + "path-is-inside": "1.0.2" } }, "is-plain-obj": { @@ -7076,7 +7073,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "is-posix-bracket": { @@ -7109,7 +7106,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "^1.0.1" + "has": "1.0.3" } }, "is-resolvable": { @@ -7201,8 +7198,8 @@ "@babel/template": "7.0.0-beta.51", "@babel/traverse": "7.0.0-beta.51", "@babel/types": "7.0.0-beta.51", - "istanbul-lib-coverage": "^2.0.0", - "semver": "^5.5.0" + "istanbul-lib-coverage": "2.0.0", + "semver": "5.5.0" } }, "isurl": { @@ -7211,8 +7208,8 @@ "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "dev": true, "requires": { - "has-to-string-tag-x": "^1.2.0", - "is-object": "^1.0.1" + "has-to-string-tag-x": "1.4.1", + "is-object": "1.0.1" } }, "jest-docblock": { @@ -7239,8 +7236,8 @@ "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "1.0.10", + "esprima": "4.0.0" } }, "js2xmlparser": { @@ -7249,7 +7246,7 @@ "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", "dev": true, "requires": { - "xmlcreate": "^1.0.1" + "xmlcreate": "1.0.2" } }, "jsbn": { @@ -7265,17 +7262,17 @@ "dev": true, "requires": { "babylon": "7.0.0-beta.19", - "bluebird": "~3.5.0", - "catharsis": "~0.8.9", - "escape-string-regexp": "~1.0.5", - "js2xmlparser": "~3.0.0", - "klaw": "~2.0.0", - "marked": "~0.3.6", - "mkdirp": "~0.5.1", - "requizzle": "~0.2.1", - "strip-json-comments": "~2.0.1", + "bluebird": "3.5.1", + "catharsis": "0.8.9", + "escape-string-regexp": "1.0.5", + "js2xmlparser": "3.0.0", + "klaw": "2.0.0", + "marked": "0.3.19", + "mkdirp": "0.5.1", + "requizzle": "0.2.1", + "strip-json-comments": "2.0.1", "taffydb": "2.6.2", - "underscore": "~1.8.3" + "underscore": "1.8.3" }, "dependencies": { "babylon": { @@ -7337,7 +7334,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.1.11" } }, "jsprim": { @@ -7364,7 +7361,7 @@ "requires": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.10", - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "jws": { @@ -7372,8 +7369,8 @@ "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz", "integrity": "sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==", "requires": { - "jwa": "^1.1.5", - "safe-buffer": "^5.0.1" + "jwa": "1.1.6", + "safe-buffer": "5.1.2" } }, "keyv": { @@ -7396,7 +7393,7 @@ "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", "dev": true, "requires": { - "graceful-fs": "^4.1.9" + "graceful-fs": "4.1.11" } }, "last-line-stream": { @@ -7405,7 +7402,7 @@ "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", "dev": true, "requires": { - "through2": "^2.0.0" + "through2": "2.0.3" } }, "latest-version": { @@ -7414,7 +7411,7 @@ "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "dev": true, "requires": { - "package-json": "^4.0.0" + "package-json": "4.0.1" } }, "lazy-cache": { @@ -7429,7 +7426,7 @@ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "levn": { @@ -7438,8 +7435,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "1.1.2", + "type-check": "0.3.2" } }, "load-json-file": { @@ -7448,10 +7445,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" }, "dependencies": { "pify": { @@ -7468,8 +7465,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" } }, "lodash": { @@ -7586,7 +7583,7 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "^3.0.0" + "js-tokens": "3.0.2" } }, "loud-rejection": { @@ -7595,8 +7592,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } }, "lowercase-keys": { @@ -7610,8 +7607,8 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "make-dir": { @@ -7620,7 +7617,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } }, "map-cache": { @@ -7639,7 +7636,7 @@ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, "marked": { @@ -7654,7 +7651,7 @@ "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", "dev": true, "requires": { - "escape-string-regexp": "^1.0.4" + "escape-string-regexp": "1.0.5" } }, "math-random": { @@ -7669,7 +7666,7 @@ "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "md5-o-matic": { @@ -7684,7 +7681,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "meow": { @@ -7693,16 +7690,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" }, "dependencies": { "find-up": { @@ -7711,8 +7708,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "load-json-file": { @@ -7721,11 +7718,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, "minimist": { @@ -7740,7 +7737,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "path-type": { @@ -7749,9 +7746,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -7772,7 +7769,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "read-pkg": { @@ -7781,9 +7778,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, "read-pkg-up": { @@ -7792,8 +7789,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" } }, "strip-bom": { @@ -7802,7 +7799,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } } } @@ -7819,7 +7816,7 @@ "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", "dev": true, "requires": { - "estraverse": "^4.0.0" + "estraverse": "4.2.0" } }, "merge2": { @@ -7838,19 +7835,19 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "mime": { @@ -7868,7 +7865,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "~1.33.0" + "mime-db": "1.33.0" } }, "mimic-fn": { @@ -7888,7 +7885,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -7902,8 +7899,8 @@ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -7911,7 +7908,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -7967,7 +7964,7 @@ "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "source-map": "^0.1.34" + "source-map": "0.1.43" }, "dependencies": { "source-map": { @@ -7976,7 +7973,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -7987,10 +7984,10 @@ "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", "dev": true, "requires": { - "array-differ": "^1.0.0", - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "minimatch": "^3.0.0" + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" } }, "mute-stream": { @@ -8009,17 +8006,17 @@ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "natural-compare": { @@ -8046,11 +8043,11 @@ "integrity": "sha512-BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw==", "dev": true, "requires": { - "@sinonjs/formatio": "^2.0.0", - "just-extend": "^1.1.27", - "lolex": "^2.3.2", - "path-to-regexp": "^1.7.0", - "text-encoding": "^0.6.4" + "@sinonjs/formatio": "2.0.0", + "just-extend": "1.1.27", + "lolex": "2.7.0", + "path-to-regexp": "1.7.0", + "text-encoding": "0.6.4" } }, "node-forge": { @@ -8064,10 +8061,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.6.1", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, "normalize-path": { @@ -8076,7 +8073,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } }, "normalize-url": { @@ -8085,9 +8082,9 @@ "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", "dev": true, "requires": { - "prepend-http": "^2.0.0", - "query-string": "^5.0.1", - "sort-keys": "^2.0.0" + "prepend-http": "2.0.0", + "query-string": "5.1.1", + "sort-keys": "2.0.0" }, "dependencies": { "prepend-http": { @@ -8104,7 +8101,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" } }, "number-is-nan": { @@ -8118,33 +8115,33 @@ "integrity": "sha1-ikpO1pCWbBHsWH/4fuoMEsl0upk=", "dev": true, "requires": { - "archy": "^1.0.0", - "arrify": "^1.0.1", - "caching-transform": "^1.0.0", - "convert-source-map": "^1.5.1", - "debug-log": "^1.0.1", - "default-require-extensions": "^1.0.0", - "find-cache-dir": "^0.1.1", - "find-up": "^2.1.0", - "foreground-child": "^1.5.3", - "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.2.0", - "istanbul-lib-hook": "^1.1.0", - "istanbul-lib-instrument": "^2.1.0", - "istanbul-lib-report": "^1.1.3", - "istanbul-lib-source-maps": "^1.2.5", - "istanbul-reports": "^1.4.1", - "md5-hex": "^1.2.0", - "merge-source-map": "^1.1.0", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.0", - "resolve-from": "^2.0.0", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.1", - "spawn-wrap": "^1.4.2", - "test-exclude": "^4.2.0", + "archy": "1.0.0", + "arrify": "1.0.1", + "caching-transform": "1.0.1", + "convert-source-map": "1.5.1", + "debug-log": "1.0.1", + "default-require-extensions": "1.0.0", + "find-cache-dir": "0.1.1", + "find-up": "2.1.0", + "foreground-child": "1.5.6", + "glob": "7.1.2", + "istanbul-lib-coverage": "1.2.0", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "2.3.0", + "istanbul-lib-report": "1.1.3", + "istanbul-lib-source-maps": "1.2.5", + "istanbul-reports": "1.4.1", + "md5-hex": "1.3.0", + "merge-source-map": "1.1.0", + "micromatch": "3.1.10", + "mkdirp": "0.5.1", + "resolve-from": "2.0.0", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "spawn-wrap": "1.4.2", + "test-exclude": "4.2.1", "yargs": "11.1.0", - "yargs-parser": "^8.0.0" + "yargs-parser": "8.1.0" }, "dependencies": { "align-text": { @@ -8152,9 +8149,9 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" } }, "amdefine": { @@ -8172,7 +8169,7 @@ "bundled": true, "dev": true, "requires": { - "default-require-extensions": "^1.0.0" + "default-require-extensions": "1.0.0" } }, "archy": { @@ -8230,13 +8227,13 @@ "bundled": true, "dev": true, "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { @@ -8244,7 +8241,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -8252,7 +8249,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -8260,7 +8257,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -8268,9 +8265,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "kind-of": { @@ -8285,7 +8282,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -8294,16 +8291,16 @@ "bundled": true, "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -8311,7 +8308,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -8326,15 +8323,15 @@ "bundled": true, "dev": true, "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" } }, "caching-transform": { @@ -8342,9 +8339,9 @@ "bundled": true, "dev": true, "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" + "md5-hex": "1.3.0", + "mkdirp": "0.5.1", + "write-file-atomic": "1.3.4" } }, "camelcase": { @@ -8359,8 +8356,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "class-utils": { @@ -8368,10 +8365,10 @@ "bundled": true, "dev": true, "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "define-property": { @@ -8379,7 +8376,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -8390,8 +8387,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" }, "dependencies": { @@ -8413,8 +8410,8 @@ "bundled": true, "dev": true, "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "commondir": { @@ -8447,8 +8444,8 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "which": "1.3.1" } }, "debug": { @@ -8479,7 +8476,7 @@ "bundled": true, "dev": true, "requires": { - "strip-bom": "^2.0.0" + "strip-bom": "2.0.0" } }, "define-property": { @@ -8487,8 +8484,8 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -8496,7 +8493,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -8504,7 +8501,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -8512,9 +8509,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "kind-of": { @@ -8529,7 +8526,7 @@ "bundled": true, "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "execa": { @@ -8537,13 +8534,13 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" }, "dependencies": { "cross-spawn": { @@ -8551,9 +8548,9 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "shebang-command": "1.2.0", + "which": "1.3.1" } } } @@ -8563,13 +8560,13 @@ "bundled": true, "dev": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "debug": { @@ -8585,7 +8582,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -8593,7 +8590,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -8603,8 +8600,8 @@ "bundled": true, "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -8612,7 +8609,7 @@ "bundled": true, "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -8622,14 +8619,14 @@ "bundled": true, "dev": true, "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -8637,7 +8634,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { @@ -8645,7 +8642,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -8653,7 +8650,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -8661,7 +8658,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -8669,9 +8666,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "kind-of": { @@ -8686,10 +8683,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -8697,7 +8694,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -8707,9 +8704,9 @@ "bundled": true, "dev": true, "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" } }, "find-up": { @@ -8717,7 +8714,7 @@ "bundled": true, "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "for-in": { @@ -8730,8 +8727,8 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" + "cross-spawn": "4.0.2", + "signal-exit": "3.0.2" } }, "fragment-cache": { @@ -8739,7 +8736,7 @@ "bundled": true, "dev": true, "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "fs.realpath": { @@ -8767,12 +8764,12 @@ "bundled": true, "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "graceful-fs": { @@ -8785,10 +8782,10 @@ "bundled": true, "dev": true, "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" }, "dependencies": { "source-map": { @@ -8796,7 +8793,7 @@ "bundled": true, "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -8806,9 +8803,9 @@ "bundled": true, "dev": true, "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" } }, "has-values": { @@ -8816,8 +8813,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "kind-of": { @@ -8825,7 +8822,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -8845,8 +8842,8 @@ "bundled": true, "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -8864,7 +8861,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "is-arrayish": { @@ -8882,7 +8879,7 @@ "bundled": true, "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-data-descriptor": { @@ -8890,7 +8887,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "is-descriptor": { @@ -8898,9 +8895,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -8925,7 +8922,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "is-odd": { @@ -8933,7 +8930,7 @@ "bundled": true, "dev": true, "requires": { - "is-number": "^4.0.0" + "is-number": "4.0.0" }, "dependencies": { "is-number": { @@ -8948,7 +8945,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "is-stream": { @@ -8991,7 +8988,7 @@ "bundled": true, "dev": true, "requires": { - "append-transform": "^0.4.0" + "append-transform": "0.4.0" } }, "istanbul-lib-report": { @@ -8999,10 +8996,10 @@ "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "^1.1.2", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" }, "dependencies": { "has-flag": { @@ -9015,7 +9012,7 @@ "bundled": true, "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "1.0.0" } } } @@ -9025,11 +9022,11 @@ "bundled": true, "dev": true, "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.2.0", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" + "debug": "3.1.0", + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" } }, "istanbul-reports": { @@ -9037,7 +9034,7 @@ "bundled": true, "dev": true, "requires": { - "handlebars": "^4.0.3" + "handlebars": "4.0.11" } }, "kind-of": { @@ -9045,7 +9042,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } }, "lazy-cache": { @@ -9059,7 +9056,7 @@ "bundled": true, "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "load-json-file": { @@ -9067,11 +9064,11 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, "locate-path": { @@ -9079,8 +9076,8 @@ "bundled": true, "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" }, "dependencies": { "path-exists": { @@ -9100,8 +9097,8 @@ "bundled": true, "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "map-cache": { @@ -9114,7 +9111,7 @@ "bundled": true, "dev": true, "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, "md5-hex": { @@ -9122,7 +9119,7 @@ "bundled": true, "dev": true, "requires": { - "md5-o-matic": "^0.1.1" + "md5-o-matic": "0.1.1" } }, "md5-o-matic": { @@ -9135,7 +9132,7 @@ "bundled": true, "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "merge-source-map": { @@ -9143,7 +9140,7 @@ "bundled": true, "dev": true, "requires": { - "source-map": "^0.6.1" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -9158,19 +9155,19 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "kind-of": { @@ -9190,7 +9187,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -9203,8 +9200,8 @@ "bundled": true, "dev": true, "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -9212,7 +9209,7 @@ "bundled": true, "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -9235,18 +9232,18 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-odd": "^2.0.0", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "kind-of": { @@ -9261,10 +9258,10 @@ "bundled": true, "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, "npm-run-path": { @@ -9272,7 +9269,7 @@ "bundled": true, "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" } }, "number-is-nan": { @@ -9290,9 +9287,9 @@ "bundled": true, "dev": true, "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { @@ -9300,7 +9297,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -9310,7 +9307,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" } }, "object.pick": { @@ -9318,7 +9315,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "once": { @@ -9326,7 +9323,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "optimist": { @@ -9334,8 +9331,8 @@ "bundled": true, "dev": true, "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, "os-homedir": { @@ -9348,9 +9345,9 @@ "bundled": true, "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "p-finally": { @@ -9363,7 +9360,7 @@ "bundled": true, "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "1.0.0" } }, "p-locate": { @@ -9371,7 +9368,7 @@ "bundled": true, "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.2.0" } }, "p-try": { @@ -9384,7 +9381,7 @@ "bundled": true, "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.1" } }, "pascalcase": { @@ -9397,7 +9394,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "path-is-absolute": { @@ -9420,9 +9417,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -9440,7 +9437,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { @@ -9448,7 +9445,7 @@ "bundled": true, "dev": true, "requires": { - "find-up": "^1.0.0" + "find-up": "1.1.2" }, "dependencies": { "find-up": { @@ -9456,8 +9453,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } } } @@ -9477,9 +9474,9 @@ "bundled": true, "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" } }, "read-pkg-up": { @@ -9487,8 +9484,8 @@ "bundled": true, "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" }, "dependencies": { "find-up": { @@ -9496,8 +9493,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } } } @@ -9507,8 +9504,8 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "repeat-element": { @@ -9552,7 +9549,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { @@ -9560,7 +9557,7 @@ "bundled": true, "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "safe-regex": { @@ -9568,7 +9565,7 @@ "bundled": true, "dev": true, "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "semver": { @@ -9586,10 +9583,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { @@ -9597,7 +9594,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -9607,7 +9604,7 @@ "bundled": true, "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -9630,14 +9627,14 @@ "bundled": true, "dev": true, "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.0" }, "dependencies": { "debug": { @@ -9653,7 +9650,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -9661,7 +9658,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -9671,9 +9668,9 @@ "bundled": true, "dev": true, "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { @@ -9681,7 +9678,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -9689,7 +9686,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -9697,7 +9694,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -9705,9 +9702,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } }, "kind-of": { @@ -9722,7 +9719,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" } }, "source-map": { @@ -9735,11 +9732,11 @@ "bundled": true, "dev": true, "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.1", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-url": { @@ -9752,12 +9749,12 @@ "bundled": true, "dev": true, "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" + "foreground-child": "1.5.6", + "mkdirp": "0.5.1", + "os-homedir": "1.0.2", + "rimraf": "2.6.2", + "signal-exit": "3.0.2", + "which": "1.3.1" } }, "spdx-correct": { @@ -9765,8 +9762,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, "spdx-exceptions": { @@ -9779,8 +9776,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" } }, "spdx-license-ids": { @@ -9793,7 +9790,7 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" } }, "static-extend": { @@ -9801,8 +9798,8 @@ "bundled": true, "dev": true, "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { @@ -9810,7 +9807,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -9820,8 +9817,8 @@ "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -9829,7 +9826,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "strip-bom": { @@ -9837,7 +9834,7 @@ "bundled": true, "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-eof": { @@ -9850,11 +9847,11 @@ "bundled": true, "dev": true, "requires": { - "arrify": "^1.0.1", - "micromatch": "^3.1.8", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", - "require-main-filename": "^1.0.1" + "arrify": "1.0.1", + "micromatch": "3.1.10", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" } }, "to-object-path": { @@ -9862,7 +9859,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" } }, "to-regex": { @@ -9870,10 +9867,10 @@ "bundled": true, "dev": true, "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { @@ -9881,8 +9878,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "uglify-js": { @@ -9891,9 +9888,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "yargs": { @@ -9902,9 +9899,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -9921,10 +9918,10 @@ "bundled": true, "dev": true, "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" }, "dependencies": { "extend-shallow": { @@ -9932,7 +9929,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "set-value": { @@ -9940,10 +9937,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" } } } @@ -9953,8 +9950,8 @@ "bundled": true, "dev": true, "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { @@ -9962,9 +9959,9 @@ "bundled": true, "dev": true, "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { @@ -9994,7 +9991,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.2" }, "dependencies": { "kind-of": { @@ -10009,8 +10006,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "which": { @@ -10018,7 +10015,7 @@ "bundled": true, "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -10042,8 +10039,8 @@ "bundled": true, "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" }, "dependencies": { "ansi-regex": { @@ -10056,7 +10053,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "string-width": { @@ -10064,9 +10061,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "strip-ansi": { @@ -10074,7 +10071,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } } } @@ -10089,9 +10086,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" } }, "y18n": { @@ -10109,18 +10106,18 @@ "bundled": true, "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" }, "dependencies": { "camelcase": { @@ -10133,9 +10130,9 @@ "bundled": true, "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" } }, "yargs-parser": { @@ -10143,7 +10140,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" } } } @@ -10153,7 +10150,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" }, "dependencies": { "camelcase": { @@ -10181,9 +10178,9 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { @@ -10191,7 +10188,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "kind-of": { @@ -10199,7 +10196,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -10214,7 +10211,7 @@ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" } }, "object.omit": { @@ -10223,8 +10220,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" + "for-own": "0.1.5", + "is-extendable": "0.1.1" } }, "object.pick": { @@ -10232,7 +10229,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "observable-to-promise": { @@ -10241,8 +10238,8 @@ "integrity": "sha1-yCjw8NxH6fhq+KSXfF1VB2znqR8=", "dev": true, "requires": { - "is-observable": "^0.2.0", - "symbol-observable": "^1.0.4" + "is-observable": "0.2.0", + "symbol-observable": "1.2.0" }, "dependencies": { "is-observable": { @@ -10251,7 +10248,7 @@ "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", "dev": true, "requires": { - "symbol-observable": "^0.2.2" + "symbol-observable": "0.2.4" }, "dependencies": { "symbol-observable": { @@ -10269,7 +10266,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "onetime": { @@ -10278,7 +10275,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "optimist": { @@ -10287,8 +10284,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" + "minimist": "0.0.8", + "wordwrap": "0.0.3" } }, "option-chain": { @@ -10303,12 +10300,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" }, "dependencies": { "wordwrap": { @@ -10335,7 +10332,7 @@ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { - "lcid": "^1.0.0" + "lcid": "1.0.0" } }, "os-tmpdir": { @@ -10350,11 +10347,6 @@ "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==", "dev": true }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=" - }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -10373,7 +10365,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "1.0.0" } }, "p-locate": { @@ -10382,7 +10374,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.3.0" } }, "p-timeout": { @@ -10391,7 +10383,7 @@ "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", "dev": true, "requires": { - "p-finally": "^1.0.0" + "p-finally": "1.0.0" } }, "p-try": { @@ -10406,10 +10398,10 @@ "integrity": "sha1-eK4ybIngWk2BO2hgGXevBcANKg0=", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "lodash.flattendeep": "^4.4.0", - "md5-hex": "^2.0.0", - "release-zalgo": "^1.0.0" + "graceful-fs": "4.1.11", + "lodash.flattendeep": "4.4.0", + "md5-hex": "2.0.0", + "release-zalgo": "1.0.0" } }, "package-json": { @@ -10418,10 +10410,10 @@ "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", "dev": true, "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" + "got": "6.7.1", + "registry-auth-token": "3.3.2", + "registry-url": "3.1.0", + "semver": "5.5.0" }, "dependencies": { "got": { @@ -10430,17 +10422,17 @@ "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { - "create-error-class": "^3.0.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" + "create-error-class": "3.0.2", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.1", + "safe-buffer": "5.1.2", + "timed-out": "4.0.1", + "unzip-response": "2.0.1", + "url-parse-lax": "1.0.0" } } } @@ -10451,10 +10443,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" }, "dependencies": { "is-extglob": { @@ -10469,7 +10461,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } } } @@ -10480,7 +10472,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.2" } }, "parse-ms": { @@ -10550,7 +10542,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } }, "performance-now": { @@ -10575,7 +10567,7 @@ "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", "dev": true, "requires": { - "pinkie": "^1.0.0" + "pinkie": "1.0.0" } }, "pkg-conf": { @@ -10584,8 +10576,8 @@ "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", "dev": true, "requires": { - "find-up": "^2.0.0", - "load-json-file": "^4.0.0" + "find-up": "2.1.0", + "load-json-file": "4.0.0" }, "dependencies": { "load-json-file": { @@ -10594,10 +10586,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" + "graceful-fs": "4.1.11", + "parse-json": "4.0.0", + "pify": "3.0.0", + "strip-bom": "3.0.0" } }, "parse-json": { @@ -10606,8 +10598,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "error-ex": "1.3.2", + "json-parse-better-errors": "1.0.2" } } } @@ -10618,7 +10610,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "2.1.0" } }, "plur": { @@ -10627,7 +10619,7 @@ "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", "dev": true, "requires": { - "irregular-plurals": "^1.0.0" + "irregular-plurals": "1.4.0" } }, "pluralize": { @@ -10647,9 +10639,9 @@ "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.1", + "source-map": "0.6.1", + "supports-color": "5.4.0" }, "dependencies": { "source-map": { @@ -10665,11 +10657,11 @@ "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.6.0.tgz", "integrity": "sha512-nDb6a+p2C7Wj8Y2zmFtLpuv+xobXz4+bzT5s7dr0nn71tLozn7nRMQqzwbefzwZN5qOm0N7Cxhw4kXP75xboKA==", "requires": { - "define-properties": "^1.1.2", - "empower": "^1.3.0", - "power-assert-formatter": "^1.4.1", - "universal-deep-strict-equal": "^1.2.1", - "xtend": "^4.0.0" + "define-properties": "1.1.2", + "empower": "1.3.0", + "power-assert-formatter": "1.4.1", + "universal-deep-strict-equal": "1.2.2", + "xtend": "4.0.1" } }, "power-assert-context-formatter": { @@ -10677,8 +10669,8 @@ "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.2.0.tgz", "integrity": "sha512-HLNEW8Bin+BFCpk/zbyKwkEu9W8/zThIStxGo7weYcFkKgMuGCHUJhvJeBGXDZf0Qm2xis4pbnnciGZiX0EpSg==", "requires": { - "core-js": "^2.0.0", - "power-assert-context-traversal": "^1.2.0" + "core-js": "2.5.7", + "power-assert-context-traversal": "1.2.0" } }, "power-assert-context-reducer-ast": { @@ -10686,11 +10678,11 @@ "resolved": "https://registry.npmjs.org/power-assert-context-reducer-ast/-/power-assert-context-reducer-ast-1.2.0.tgz", "integrity": "sha512-EgOxmZ/Lb7tw4EwSKX7ZnfC0P/qRZFEG28dx/690qvhmOJ6hgThYFm5TUWANDLK5NiNKlPBi5WekVGd2+5wPrw==", "requires": { - "acorn": "^5.0.0", - "acorn-es7-plugin": "^1.0.12", - "core-js": "^2.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.2.0" + "acorn": "5.7.1", + "acorn-es7-plugin": "1.1.7", + "core-js": "2.5.7", + "espurify": "1.8.0", + "estraverse": "4.2.0" } }, "power-assert-context-traversal": { @@ -10698,8 +10690,8 @@ "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.2.0.tgz", "integrity": "sha512-NFoHU6g2umNajiP2l4qb0BRWD773Aw9uWdWYH9EQsVwIZnog5bd2YYLFCVvaxWpwNzWeEfZIon2xtyc63026pQ==", "requires": { - "core-js": "^2.0.0", - "estraverse": "^4.1.0" + "core-js": "2.5.7", + "estraverse": "4.2.0" } }, "power-assert-formatter": { @@ -10707,13 +10699,13 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "^2.0.0", - "power-assert-context-formatter": "^1.0.7", - "power-assert-context-reducer-ast": "^1.0.7", - "power-assert-renderer-assertion": "^1.0.7", - "power-assert-renderer-comparison": "^1.0.7", - "power-assert-renderer-diagram": "^1.0.7", - "power-assert-renderer-file": "^1.0.7" + "core-js": "2.5.7", + "power-assert-context-formatter": "1.2.0", + "power-assert-context-reducer-ast": "1.2.0", + "power-assert-renderer-assertion": "1.2.0", + "power-assert-renderer-comparison": "1.2.0", + "power-assert-renderer-diagram": "1.2.0", + "power-assert-renderer-file": "1.2.0" } }, "power-assert-renderer-assertion": { @@ -10721,8 +10713,8 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.2.0.tgz", "integrity": "sha512-3F7Q1ZLmV2ZCQv7aV7NJLNK9G7QsostrhOU7U0RhEQS/0vhEqrRg2jEJl1jtUL4ZyL2dXUlaaqrmPv5r9kRvIg==", "requires": { - "power-assert-renderer-base": "^1.1.1", - "power-assert-util-string-width": "^1.2.0" + "power-assert-renderer-base": "1.1.1", + "power-assert-util-string-width": "1.2.0" } }, "power-assert-renderer-base": { @@ -10735,11 +10727,11 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.2.0.tgz", "integrity": "sha512-7c3RKPDBKK4E3JqdPtYRE9cM8AyX4LC4yfTvvTYyx8zSqmT5kJnXwzR0yWQLOavACllZfwrAGQzFiXPc5sWa+g==", "requires": { - "core-js": "^2.0.0", - "diff-match-patch": "^1.0.0", - "power-assert-renderer-base": "^1.1.1", - "stringifier": "^1.3.0", - "type-name": "^2.0.1" + "core-js": "2.5.7", + "diff-match-patch": "1.0.1", + "power-assert-renderer-base": "1.1.1", + "stringifier": "1.3.0", + "type-name": "2.0.2" } }, "power-assert-renderer-diagram": { @@ -10747,10 +10739,10 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.2.0.tgz", "integrity": "sha512-JZ6PC+DJPQqfU6dwSmpcoD7gNnb/5U77bU5KgNwPPa+i1Pxiz6UuDeM3EUBlhZ1HvH9tMjI60anqVyi5l2oNdg==", "requires": { - "core-js": "^2.0.0", - "power-assert-renderer-base": "^1.1.1", - "power-assert-util-string-width": "^1.2.0", - "stringifier": "^1.3.0" + "core-js": "2.5.7", + "power-assert-renderer-base": "1.1.1", + "power-assert-util-string-width": "1.2.0", + "stringifier": "1.3.0" } }, "power-assert-renderer-file": { @@ -10758,7 +10750,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-file/-/power-assert-renderer-file-1.2.0.tgz", "integrity": "sha512-/oaVrRbeOtGoyyd7e4IdLP/jIIUFJdqJtsYzP9/88R39CMnfF/S/rUc8ZQalENfUfQ/wQHu+XZYRMaCEZmEesg==", "requires": { - "power-assert-renderer-base": "^1.1.1" + "power-assert-renderer-base": "1.1.1" } }, "power-assert-util-string-width": { @@ -10766,7 +10758,7 @@ "resolved": "https://registry.npmjs.org/power-assert-util-string-width/-/power-assert-util-string-width-1.2.0.tgz", "integrity": "sha512-lX90G0igAW0iyORTILZ/QjZWsa1MZ6VVY3L0K86e2eKun3S4LKPH4xZIl8fdeMYLfOjkaszbNSzf1uugLeAm2A==", "requires": { - "eastasianwidth": "^0.2.0" + "eastasianwidth": "0.2.0" } }, "prelude-ls": { @@ -10799,7 +10791,7 @@ "integrity": "sha512-ZypexbfVUGTFxb0v+m1bUyy92DHe5SyYlnyY0msyms5zd3RwyvNgyxZZsXXgoyzlxjx5MiqtXUdhUfvQbe0A2Q==", "dev": true, "requires": { - "parse-ms": "^1.0.0" + "parse-ms": "1.0.1" }, "dependencies": { "parse-ms": { @@ -10832,19 +10824,19 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^3.0.32", - "@types/node": "^8.9.4", - "long": "^4.0.0" + "@protobufjs/aspromise": "1.1.2", + "@protobufjs/base64": "1.1.2", + "@protobufjs/codegen": "2.0.4", + "@protobufjs/eventemitter": "1.1.0", + "@protobufjs/fetch": "1.1.0", + "@protobufjs/float": "1.0.2", + "@protobufjs/inquire": "1.1.0", + "@protobufjs/path": "1.1.2", + "@protobufjs/pool": "1.1.0", + "@protobufjs/utf8": "1.1.0", + "@types/long": "3.0.32", + "@types/node": "8.10.20", + "long": "4.0.0" }, "dependencies": { "@types/node": { @@ -10860,9 +10852,9 @@ "integrity": "sha512-fQr3VQrbdzHrdaDn3XuisVoJlJNDJizHAvUXw9IuXRR8BpV2x0N7LsCxrpJkeKfPbNjiNU/V5vc008cI0TmzzQ==", "dev": true, "requires": { - "fill-keys": "^1.0.2", - "module-not-found-error": "^1.0.0", - "resolve": "~1.5.0" + "fill-keys": "1.0.2", + "module-not-found-error": "1.0.1", + "resolve": "1.5.0" }, "dependencies": { "resolve": { @@ -10871,7 +10863,7 @@ "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "1.0.5" } } } @@ -10897,9 +10889,9 @@ "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", "dev": true, "requires": { - "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" + "decode-uri-component": "0.2.0", + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" } }, "randomatic": { @@ -10908,9 +10900,9 @@ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" + "is-number": "4.0.0", + "kind-of": "6.0.2", + "math-random": "1.0.1" }, "dependencies": { "is-number": { @@ -10927,10 +10919,10 @@ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -10947,9 +10939,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" }, "dependencies": { "path-type": { @@ -10958,7 +10950,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "^2.0.0" + "pify": "2.3.0" } }, "pify": { @@ -10975,8 +10967,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" + "find-up": "2.1.0", + "read-pkg": "2.0.0" } }, "readable-stream": { @@ -10984,13 +10976,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "readdirp": { @@ -10999,10 +10991,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.6", + "set-immediate-shim": "1.0.1" } }, "redent": { @@ -11011,8 +11003,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" }, "dependencies": { "indent-string": { @@ -11021,7 +11013,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } } } @@ -11044,7 +11036,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "^0.1.3" + "is-equal-shallow": "0.1.3" } }, "regex-not": { @@ -11052,8 +11044,8 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "regexp.prototype.flags": { @@ -11062,7 +11054,7 @@ "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", "dev": true, "requires": { - "define-properties": "^1.1.2" + "define-properties": "1.1.2" } }, "regexpp": { @@ -11077,9 +11069,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" + "regenerate": "1.4.0", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" } }, "registry-auth-token": { @@ -11088,8 +11080,8 @@ "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { - "rc": "^1.1.6", - "safe-buffer": "^5.0.1" + "rc": "1.2.8", + "safe-buffer": "5.1.2" } }, "registry-url": { @@ -11098,7 +11090,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "^1.0.1" + "rc": "1.2.8" } }, "regjsgen": { @@ -11113,7 +11105,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "~0.5.0" + "jsesc": "0.5.0" } }, "release-zalgo": { @@ -11122,7 +11114,7 @@ "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", "dev": true, "requires": { - "es6-error": "^4.0.1" + "es6-error": "4.1.1" } }, "remove-trailing-separator": { @@ -11147,7 +11139,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.0.2" } }, "request": { @@ -11155,26 +11147,26 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" + "aws-sign2": "0.7.0", + "aws4": "1.7.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.3.0" } }, "require-directory": { @@ -11201,8 +11193,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" + "caller-path": "0.1.0", + "resolve-from": "1.0.1" }, "dependencies": { "resolve-from": { @@ -11219,7 +11211,7 @@ "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", "dev": true, "requires": { - "underscore": "~1.6.0" + "underscore": "1.6.0" }, "dependencies": { "underscore": { @@ -11242,7 +11234,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "resolve-from": { @@ -11262,7 +11254,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "^1.0.0" + "lowercase-keys": "1.0.1" } }, "restore-cursor": { @@ -11271,8 +11263,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "onetime": "2.0.1", + "signal-exit": "3.0.2" } }, "ret": { @@ -11290,8 +11282,8 @@ "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.2.tgz", "integrity": "sha512-WIiGp37XXDC6e7ku3LFoi7LCL/Gs9luGeeqvbPRb+Zl6OQMw4RCRfSaW+aLfE6lhz1R941UavE6Svl3Dm5xGIQ==", "requires": { - "request": "^2.81.0", - "through2": "^2.0.0" + "request": "2.87.0", + "through2": "2.0.3" } }, "right-align": { @@ -11301,7 +11293,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { @@ -11310,7 +11302,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "run-async": { @@ -11319,7 +11311,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "^2.1.0" + "is-promise": "2.1.0" } }, "rxjs": { @@ -11349,7 +11341,7 @@ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "safer-buffer": { @@ -11369,16 +11361,16 @@ "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", "dev": true, "requires": { - "chalk": "^2.3.0", - "htmlparser2": "^3.9.0", - "lodash.clonedeep": "^4.5.0", - "lodash.escaperegexp": "^4.1.2", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.mergewith": "^4.6.0", - "postcss": "^6.0.14", - "srcset": "^1.0.0", - "xtend": "^4.0.0" + "chalk": "2.4.1", + "htmlparser2": "3.9.2", + "lodash.clonedeep": "4.5.0", + "lodash.escaperegexp": "4.1.2", + "lodash.isplainobject": "4.0.6", + "lodash.isstring": "4.0.1", + "lodash.mergewith": "4.6.1", + "postcss": "6.0.23", + "srcset": "1.0.0", + "xtend": "4.0.1" } }, "semver": { @@ -11393,7 +11385,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "^5.0.3" + "semver": "5.5.0" } }, "serialize-error": { @@ -11419,10 +11411,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { @@ -11430,7 +11422,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -11441,7 +11433,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -11462,13 +11454,13 @@ "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", "dev": true, "requires": { - "@sinonjs/formatio": "^2.0.0", - "diff": "^3.1.0", - "lodash.get": "^4.4.2", - "lolex": "^2.2.0", - "nise": "^1.2.0", - "supports-color": "^5.1.0", - "type-detect": "^4.0.5" + "@sinonjs/formatio": "2.0.0", + "diff": "3.5.0", + "lodash.get": "4.4.2", + "lolex": "2.7.0", + "nise": "1.4.2", + "supports-color": "5.4.0", + "type-detect": "4.0.8" } }, "slash": { @@ -11482,7 +11474,7 @@ "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0" + "is-fullwidth-code-point": "2.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -11504,14 +11496,14 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.2", + "use": "3.1.0" }, "dependencies": { "debug": { @@ -11527,7 +11519,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -11535,7 +11527,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -11545,9 +11537,9 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { @@ -11555,7 +11547,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -11563,7 +11555,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -11571,7 +11563,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -11579,9 +11571,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -11591,7 +11583,7 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -11599,7 +11591,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -11610,7 +11602,7 @@ "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", "dev": true, "requires": { - "is-plain-obj": "^1.0.0" + "is-plain-obj": "1.1.0" } }, "source-map": { @@ -11623,11 +11615,11 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.1", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-support": { @@ -11636,8 +11628,8 @@ "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "buffer-from": "1.1.0", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -11659,8 +11651,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, "spdx-exceptions": { @@ -11675,8 +11667,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" } }, "spdx-license-ids": { @@ -11690,7 +11682,7 @@ "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz", "integrity": "sha512-hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg==", "requires": { - "is-stream-ended": "^0.1.4" + "is-stream-ended": "0.1.4" } }, "split-string": { @@ -11698,7 +11690,7 @@ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" } }, "sprintf-js": { @@ -11713,8 +11705,8 @@ "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=", "dev": true, "requires": { - "array-uniq": "^1.0.2", - "number-is-nan": "^1.0.0" + "array-uniq": "1.0.3", + "number-is-nan": "1.0.1" } }, "sshpk": { @@ -11722,15 +11714,15 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" } }, "stack-utils": { @@ -11744,8 +11736,8 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { @@ -11753,7 +11745,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -11763,7 +11755,7 @@ "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.4.tgz", "integrity": "sha512-D243NJaYs/xBN2QnoiMDY7IesJFIK7gEhnvAYqJa5JvDdnh2dC4qDBwlCf0ohPpX2QRlA/4gnbnPd3rs3KxVcA==", "requires": { - "stubs": "^3.0.0" + "stubs": "3.0.0" } }, "stream-shift": { @@ -11788,9 +11780,9 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string.prototype.matchall": { @@ -11799,11 +11791,11 @@ "integrity": "sha512-WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.10.0", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "regexp.prototype.flags": "^1.2.0" + "define-properties": "1.1.2", + "es-abstract": "1.12.0", + "function-bind": "1.1.1", + "has-symbols": "1.0.0", + "regexp.prototype.flags": "1.2.0" } }, "string_decoder": { @@ -11811,7 +11803,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "stringifier": { @@ -11819,9 +11811,9 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "^2.0.0", - "traverse": "^0.6.6", - "type-name": "^2.0.1" + "core-js": "2.5.7", + "traverse": "0.6.6", + "type-name": "2.0.2" } }, "strip-ansi": { @@ -11829,7 +11821,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-bom": { @@ -11844,7 +11836,7 @@ "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=", "dev": true, "requires": { - "is-utf8": "^0.2.1" + "is-utf8": "0.2.1" } }, "strip-eof": { @@ -11859,7 +11851,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "^4.0.1" + "get-stdin": "4.0.1" } }, "strip-json-comments": { @@ -11879,16 +11871,16 @@ "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", "dev": true, "requires": { - "component-emitter": "^1.2.0", - "cookiejar": "^2.1.0", - "debug": "^3.1.0", - "extend": "^3.0.0", - "form-data": "^2.3.1", - "formidable": "^1.2.0", - "methods": "^1.1.1", - "mime": "^1.4.1", - "qs": "^6.5.1", - "readable-stream": "^2.3.5" + "component-emitter": "1.2.1", + "cookiejar": "2.1.2", + "debug": "3.1.0", + "extend": "3.0.1", + "form-data": "2.3.2", + "formidable": "1.2.1", + "methods": "1.1.2", + "mime": "1.6.0", + "qs": "6.5.2", + "readable-stream": "2.3.6" }, "dependencies": { "mime": { @@ -11905,11 +11897,11 @@ "integrity": "sha512-HZJ3geIMPgVwKk2VsmO5YHqnnJYl6bV5A9JW2uzqV43WmpgliNEYbuvukfor7URpaqpxuw3CfZ3ONdVbZjCgIA==", "dev": true, "requires": { - "arrify": "^1.0.1", - "indent-string": "^3.2.0", - "js-yaml": "^3.10.0", - "serialize-error": "^2.1.0", - "strip-ansi": "^4.0.0" + "arrify": "1.0.1", + "indent-string": "3.2.0", + "js-yaml": "3.12.0", + "serialize-error": "2.1.0", + "strip-ansi": "4.0.0" }, "dependencies": { "ansi-regex": { @@ -11924,7 +11916,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -11935,8 +11927,8 @@ "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=", "dev": true, "requires": { - "methods": "~1.1.2", - "superagent": "^3.0.0" + "methods": "1.1.2", + "superagent": "3.8.3" } }, "supports-color": { @@ -11945,7 +11937,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" }, "dependencies": { "has-flag": { @@ -11968,12 +11960,12 @@ "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==", "dev": true, "requires": { - "ajv": "^6.0.1", - "ajv-keywords": "^3.0.0", - "chalk": "^2.1.0", - "lodash": "^4.17.4", + "ajv": "6.5.1", + "ajv-keywords": "3.2.0", + "chalk": "2.4.1", + "lodash": "4.17.10", "slice-ansi": "1.0.0", - "string-width": "^2.1.1" + "string-width": "2.1.1" }, "dependencies": { "ajv": { @@ -11982,10 +11974,10 @@ "integrity": "sha512-pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.1" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "ansi-regex": { @@ -12018,8 +12010,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -12028,7 +12020,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -12045,7 +12037,7 @@ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", "dev": true, "requires": { - "execa": "^0.7.0" + "execa": "0.7.0" } }, "text-encoding": { @@ -12071,8 +12063,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } }, "time-zone": { @@ -12093,7 +12085,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "os-tmpdir": "1.0.2" } }, "to-fast-properties": { @@ -12107,7 +12099,7 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -12115,7 +12107,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -12125,10 +12117,10 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { @@ -12136,8 +12128,8 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "tough-cookie": { @@ -12145,7 +12137,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "^1.4.1" + "punycode": "1.4.1" } }, "traverse": { @@ -12176,7 +12168,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -12191,7 +12183,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "1.1.2" } }, "type-detect": { @@ -12212,9 +12204,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" }, "dependencies": { "camelcase": { @@ -12231,8 +12223,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" } }, @@ -12257,9 +12249,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", "window-size": "0.1.0" } } @@ -12306,10 +12298,10 @@ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" }, "dependencies": { "extend-shallow": { @@ -12317,7 +12309,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "set-value": { @@ -12325,10 +12317,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" } } } @@ -12339,7 +12331,7 @@ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", "dev": true, "requires": { - "crypto-random-string": "^1.0.0" + "crypto-random-string": "1.0.0" } }, "unique-temp-dir": { @@ -12348,8 +12340,8 @@ "integrity": "sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U=", "dev": true, "requires": { - "mkdirp": "^0.5.1", - "os-tmpdir": "^1.0.1", + "mkdirp": "0.5.1", + "os-tmpdir": "1.0.2", "uid2": "0.0.3" } }, @@ -12358,9 +12350,9 @@ "resolved": "https://registry.npmjs.org/universal-deep-strict-equal/-/universal-deep-strict-equal-1.2.2.tgz", "integrity": "sha1-DaSsL3PP95JMgfpN4BjKViyisKc=", "requires": { - "array-filter": "^1.0.0", + "array-filter": "1.0.0", "indexof": "0.0.1", - "object-keys": "^1.0.0" + "object-keys": "1.0.12" } }, "universalify": { @@ -12374,8 +12366,8 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { @@ -12383,9 +12375,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { @@ -12417,16 +12409,16 @@ "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" + "boxen": "1.3.0", + "chalk": "2.4.1", + "configstore": "3.1.2", + "import-lazy": "2.1.0", + "is-ci": "1.1.0", + "is-installed-globally": "0.1.0", + "is-npm": "1.0.0", + "latest-version": "3.1.0", + "semver-diff": "2.1.0", + "xdg-basedir": "3.0.0" } }, "uri-js": { @@ -12435,7 +12427,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" }, "dependencies": { "punycode": { @@ -12457,7 +12449,7 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "prepend-http": "^1.0.1" + "prepend-http": "1.0.4" } }, "url-to-options": { @@ -12477,7 +12469,7 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.2" } }, "util-deprecate": { @@ -12496,8 +12488,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "verror": { @@ -12505,9 +12497,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "^1.0.0", + "assert-plus": "1.0.0", "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "extsprintf": "1.3.0" } }, "well-known-symbols": { @@ -12522,7 +12514,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -12537,7 +12529,7 @@ "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", "dev": true, "requires": { - "string-width": "^2.1.1" + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -12558,8 +12550,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -12568,7 +12560,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -12589,8 +12581,8 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" } }, "wrappy": { @@ -12604,7 +12596,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "^0.5.1" + "mkdirp": "0.5.1" } }, "write-file-atomic": { @@ -12613,9 +12605,9 @@ "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" } }, "write-json-file": { @@ -12624,12 +12616,12 @@ "integrity": "sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=", "dev": true, "requires": { - "detect-indent": "^5.0.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "pify": "^3.0.0", - "sort-keys": "^2.0.0", - "write-file-atomic": "^2.0.0" + "detect-indent": "5.0.0", + "graceful-fs": "4.1.11", + "make-dir": "1.3.0", + "pify": "3.0.0", + "sort-keys": "2.0.0", + "write-file-atomic": "2.3.0" }, "dependencies": { "detect-indent": { @@ -12646,8 +12638,8 @@ "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==", "dev": true, "requires": { - "sort-keys": "^2.0.0", - "write-json-file": "^2.2.0" + "sort-keys": "2.0.0", + "write-json-file": "2.3.0" } }, "xdg-basedir": { @@ -12682,13 +12674,13 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "requires": { - "camelcase": "^2.0.1", - "cliui": "^3.0.3", - "decamelize": "^1.1.1", - "os-locale": "^1.4.0", - "string-width": "^1.0.1", - "window-size": "^0.1.4", - "y18n": "^3.2.0" + "camelcase": "2.1.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "string-width": "1.0.2", + "window-size": "0.1.4", + "y18n": "3.2.1" } }, "yargs-parser": { @@ -12697,7 +12689,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" }, "dependencies": { "camelcase": { diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6b5f1222ba5..c334ffcb3c1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -66,7 +66,7 @@ "@google-cloud/common": "^0.20.0", "arrify": "^1.0.0", "async-each": "^1.0.1", - "delay": "^2.0.0", + "delay": "^3.0.0", "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auto-auth": "^0.10.1", diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js index 96bc0462549..7a5f0eddf51 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.js @@ -256,7 +256,7 @@ Subscriber.prototype.flushQueues_ = function() { var self = this; if (this.flushTimeoutHandle_) { - this.flushTimeoutHandle_.cancel(); + this.flushTimeoutHandle_.clear(); this.flushTimeoutHandle_ = null; } @@ -502,7 +502,7 @@ Subscriber.prototype.setFlushTimeout_ = function() { .then(this.flushQueues_.bind(this)) .catch(common.util.noop); - promise.cancel = timeout.cancel.bind(timeout); + promise.clear = timeout.clear.bind(timeout); this.flushTimeoutHandle_ = promise; } diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.js index 092fbc9d1a3..8c5b8965681 100644 --- a/handwritten/pubsub/test/subscriber.js +++ b/handwritten/pubsub/test/subscriber.js @@ -597,7 +597,7 @@ describe('Subscriber', function() { it('should cancel any pending flushes', function() { var canceled = false; var fakeHandle = { - cancel: function() { + clear: function() { canceled = true; }, }; @@ -1250,7 +1250,7 @@ describe('Subscriber', function() { var delayPromise = delay(0); var fakeBoundDelay = function() {}; - delayPromise.cancel.bind = function(context) { + delayPromise.clear.bind = function(context) { assert.strictEqual(context, delayPromise); return fakeBoundDelay; }; @@ -1264,7 +1264,7 @@ describe('Subscriber', function() { promise.then(function() { assert.strictEqual(subscriber.flushTimeoutHandle_, promise); - assert.strictEqual(promise.cancel, fakeBoundDelay); + assert.strictEqual(promise.clear, fakeBoundDelay); assert.strictEqual(flushed, true); done(); }); @@ -1272,7 +1272,7 @@ describe('Subscriber', function() { it('should swallow cancel errors', function() { var promise = subscriber.setFlushTimeout_(); - promise.cancel(); + promise.clear(); return promise; }); From 13d680f3759460fb8c79d83049c6f091aa8046a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 2 Jul 2018 20:51:42 -0700 Subject: [PATCH 0170/1115] chore(deps): lock file maintenance (#166) --- handwritten/pubsub/package-lock.json | 4557 +++++++++++++------------- 1 file changed, 2273 insertions(+), 2284 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index be31e738854..8942b332952 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -16,18 +16,18 @@ "integrity": "sha512-oWqTnIGXW3k72UFidXzW0ONlO7hnO9x02S/QReJ7NBGeiBH9cUHY9+EfV6C8PXC6YJH++WrliEq03wMSJGNZFg==", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "package-hash": "1.2.0" + "babel-plugin-check-es2015-constants": "^6.8.0", + "babel-plugin-syntax-trailing-function-commas": "^6.20.0", + "babel-plugin-transform-async-to-generator": "^6.16.0", + "babel-plugin-transform-es2015-destructuring": "^6.19.0", + "babel-plugin-transform-es2015-function-name": "^6.9.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0", + "babel-plugin-transform-es2015-parameters": "^6.21.0", + "babel-plugin-transform-es2015-spread": "^6.8.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.8.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.11.0", + "babel-plugin-transform-exponentiation-operator": "^6.8.0", + "package-hash": "^1.2.0" }, "dependencies": { "md5-hex": { @@ -36,7 +36,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "package-hash": { @@ -45,7 +45,7 @@ "integrity": "sha1-AD5WzVe3NqbtYRTMK4FUJnJ3DkQ=", "dev": true, "requires": { - "md5-hex": "1.3.0" + "md5-hex": "^1.3.0" } } } @@ -56,8 +56,8 @@ "integrity": "sha1-ze0RlqjY2TgaUJJAq5LpGl7Aafc=", "dev": true, "requires": { - "@ava/babel-plugin-throws-helper": "2.0.0", - "babel-plugin-espower": "2.4.0" + "@ava/babel-plugin-throws-helper": "^2.0.0", + "babel-plugin-espower": "^2.3.2" } }, "@ava/write-file-atomic": { @@ -66,9 +66,9 @@ "integrity": "sha512-BTNB3nGbEfJT+69wuqXFr/bQH7Vr7ihx2xGOMNqPgDGhwspoZhiWumDDZNjBy7AScmqS5CELIOGtPVXESyrnDA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } }, "@babel/code-frame": { @@ -87,10 +87,10 @@ "dev": true, "requires": { "@babel/types": "7.0.0-beta.51", - "jsesc": "2.5.1", - "lodash": "4.17.10", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "jsesc": "^2.5.1", + "lodash": "^4.17.5", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" }, "dependencies": { "jsesc": { @@ -136,9 +136,9 @@ "integrity": "sha1-6IRK4loVlcz9QriWI7Q3bKBtIl0=", "dev": true, "requires": { - "chalk": "2.4.1", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^3.0.0" } }, "@babel/parser": { @@ -156,7 +156,7 @@ "@babel/code-frame": "7.0.0-beta.51", "@babel/parser": "7.0.0-beta.51", "@babel/types": "7.0.0-beta.51", - "lodash": "4.17.10" + "lodash": "^4.17.5" } }, "@babel/traverse": { @@ -171,10 +171,10 @@ "@babel/helper-split-export-declaration": "7.0.0-beta.51", "@babel/parser": "7.0.0-beta.51", "@babel/types": "7.0.0-beta.51", - "debug": "3.1.0", - "globals": "11.7.0", - "invariant": "2.2.4", - "lodash": "4.17.10" + "debug": "^3.1.0", + "globals": "^11.1.0", + "invariant": "^2.2.0", + "lodash": "^4.17.5" }, "dependencies": { "globals": { @@ -191,9 +191,9 @@ "integrity": "sha1-2AK3tUO1g2x3iqaReXq/APPZfqk=", "dev": true, "requires": { - "esutils": "2.0.2", - "lodash": "4.17.10", - "to-fast-properties": "2.0.0" + "esutils": "^2.0.2", + "lodash": "^4.17.5", + "to-fast-properties": "^2.0.0" }, "dependencies": { "to-fast-properties": { @@ -210,29 +210,29 @@ "integrity": "sha512-htrsRaQX8Iixlsek8zQU7tE8wcsTQJ5UhZkSPEA8slCDAisKpC/2VgU/ucPn32M5/LjGGXRaUEKvEw1Wiuu4zQ==", "dev": true, "requires": { - "arrify": "1.0.1" + "arrify": "^1.0.1" } }, "@google-cloud/common": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.20.1.tgz", - "integrity": "sha512-LJB7CoNXEXY0mDWtF8E2cl3Y0kuMQ3wjH9Xr+Y7vH5gHgN82dDh1BMUOizRf9oXQFDWUgGERD5SdfBcjUhHmwA==", - "requires": { - "@types/duplexify": "3.5.0", - "@types/request": "2.47.1", - "arrify": "1.0.1", - "axios": "0.18.0", - "duplexify": "3.6.0", - "ent": "2.2.0", - "extend": "3.0.1", - "google-auth-library": "1.6.1", - "is": "3.2.1", - "pify": "3.0.0", - "request": "2.87.0", - "retry-request": "3.3.2", - "split-array-stream": "2.0.0", - "stream-events": "1.0.4", - "through2": "2.0.3" + "version": "0.20.3", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.20.3.tgz", + "integrity": "sha512-jt8/R4EqDTQccv5WA9AEaS65llM5+mlxsuWu57G5Os8HTIpgPbcsOVMUeIvmTrBuPUYSoRIMW8d/pvv/95n0+g==", + "requires": { + "@types/duplexify": "^3.5.0", + "@types/request": "^2.47.0", + "arrify": "^1.0.1", + "axios": "^0.18.0", + "duplexify": "^3.6.0", + "ent": "^2.2.0", + "extend": "^3.0.1", + "google-auth-library": "^1.6.0", + "is": "^3.2.1", + "pify": "^3.0.0", + "request": "^2.87.0", + "retry-request": "^4.0.0", + "split-array-stream": "^2.0.0", + "stream-events": "^1.0.4", + "through2": "^2.0.3" } }, "@google-cloud/nodejs-repo-tools": { @@ -249,7 +249,7 @@ "lodash": "4.17.5", "nyc": "11.4.1", "proxyquire": "1.8.0", - "semver": "5.5.0", + "semver": "^5.5.0", "sinon": "4.3.0", "string": "3.3.3", "supertest": "3.0.0", @@ -269,9 +269,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "is-fullwidth-code-point": { @@ -292,33 +292,33 @@ "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", "dev": true, "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "1.9.1", - "istanbul-lib-report": "1.1.2", - "istanbul-lib-source-maps": "1.2.2", - "istanbul-reports": "1.1.3", - "md5-hex": "1.3.0", - "merge-source-map": "1.0.4", - "micromatch": "2.3.11", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.1.1", - "yargs": "10.0.3", - "yargs-parser": "8.0.0" + "archy": "^1.0.0", + "arrify": "^1.0.1", + "caching-transform": "^1.0.0", + "convert-source-map": "^1.3.0", + "debug-log": "^1.0.1", + "default-require-extensions": "^1.0.0", + "find-cache-dir": "^0.1.1", + "find-up": "^2.1.0", + "foreground-child": "^1.5.3", + "glob": "^7.0.6", + "istanbul-lib-coverage": "^1.1.1", + "istanbul-lib-hook": "^1.1.0", + "istanbul-lib-instrument": "^1.9.1", + "istanbul-lib-report": "^1.1.2", + "istanbul-lib-source-maps": "^1.2.2", + "istanbul-reports": "^1.1.3", + "md5-hex": "^1.2.0", + "merge-source-map": "^1.0.2", + "micromatch": "^2.3.11", + "mkdirp": "^0.5.0", + "resolve-from": "^2.0.0", + "rimraf": "^2.5.4", + "signal-exit": "^3.0.1", + "spawn-wrap": "^1.4.2", + "test-exclude": "^4.1.1", + "yargs": "^10.0.3", + "yargs-parser": "^8.0.0" }, "dependencies": { "align-text": { @@ -326,9 +326,9 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { @@ -351,7 +351,7 @@ "bundled": true, "dev": true, "requires": { - "default-require-extensions": "1.0.0" + "default-require-extensions": "^1.0.0" } }, "archy": { @@ -364,7 +364,7 @@ "bundled": true, "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { @@ -392,9 +392,9 @@ "bundled": true, "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" } }, "babel-generator": { @@ -402,14 +402,14 @@ "bundled": true, "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.6", + "trim-right": "^1.0.1" } }, "babel-messages": { @@ -417,7 +417,7 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-runtime": { @@ -425,8 +425,8 @@ "bundled": true, "dev": true, "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -434,11 +434,11 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -446,15 +446,15 @@ "bundled": true, "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { @@ -462,10 +462,10 @@ "bundled": true, "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -483,7 +483,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -492,9 +492,9 @@ "bundled": true, "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "builtin-modules": { @@ -507,9 +507,9 @@ "bundled": true, "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" } }, "camelcase": { @@ -524,8 +524,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -533,11 +533,11 @@ "bundled": true, "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "cliui": { @@ -546,8 +546,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -589,8 +589,8 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "debug": { @@ -616,7 +616,7 @@ "bundled": true, "dev": true, "requires": { - "strip-bom": "2.0.0" + "strip-bom": "^2.0.0" } }, "detect-indent": { @@ -624,7 +624,7 @@ "bundled": true, "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "error-ex": { @@ -632,7 +632,7 @@ "bundled": true, "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "escape-string-regexp": { @@ -650,13 +650,13 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -664,9 +664,9 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } @@ -676,7 +676,7 @@ "bundled": true, "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { @@ -684,7 +684,7 @@ "bundled": true, "dev": true, "requires": { - "fill-range": "2.2.3" + "fill-range": "^2.1.0" } }, "extglob": { @@ -692,7 +692,7 @@ "bundled": true, "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "filename-regex": { @@ -705,11 +705,11 @@ "bundled": true, "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^1.1.3", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "find-cache-dir": { @@ -717,9 +717,9 @@ "bundled": true, "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { @@ -727,7 +727,7 @@ "bundled": true, "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "for-in": { @@ -740,7 +740,7 @@ "bundled": true, "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreground-child": { @@ -748,8 +748,8 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" + "cross-spawn": "^4", + "signal-exit": "^3.0.0" } }, "fs.realpath": { @@ -772,12 +772,12 @@ "bundled": true, "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -785,8 +785,8 @@ "bundled": true, "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" } }, "glob-parent": { @@ -794,7 +794,7 @@ "bundled": true, "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "globals": { @@ -812,10 +812,10 @@ "bundled": true, "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "source-map": { @@ -823,7 +823,7 @@ "bundled": true, "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -833,7 +833,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { @@ -856,8 +856,8 @@ "bundled": true, "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -870,7 +870,7 @@ "bundled": true, "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -893,7 +893,7 @@ "bundled": true, "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-dotfile": { @@ -906,7 +906,7 @@ "bundled": true, "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -924,7 +924,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -932,7 +932,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-glob": { @@ -940,7 +940,7 @@ "bundled": true, "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-number": { @@ -948,7 +948,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-posix-bracket": { @@ -999,7 +999,7 @@ "bundled": true, "dev": true, "requires": { - "append-transform": "0.4.0" + "append-transform": "^0.4.0" } }, "istanbul-lib-instrument": { @@ -1007,13 +1007,13 @@ "bundled": true, "dev": true, "requires": { - "babel-generator": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "istanbul-lib-coverage": "1.1.1", - "semver": "5.4.1" + "babel-generator": "^6.18.0", + "babel-template": "^6.16.0", + "babel-traverse": "^6.18.0", + "babel-types": "^6.18.0", + "babylon": "^6.18.0", + "istanbul-lib-coverage": "^1.1.1", + "semver": "^5.3.0" } }, "istanbul-lib-report": { @@ -1021,10 +1021,10 @@ "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "istanbul-lib-coverage": "^1.1.1", + "mkdirp": "^0.5.1", + "path-parse": "^1.0.5", + "supports-color": "^3.1.2" }, "dependencies": { "supports-color": { @@ -1032,7 +1032,7 @@ "bundled": true, "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -1042,11 +1042,11 @@ "bundled": true, "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.1.1", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "debug": "^3.1.0", + "istanbul-lib-coverage": "^1.1.1", + "mkdirp": "^0.5.1", + "rimraf": "^2.6.1", + "source-map": "^0.5.3" }, "dependencies": { "debug": { @@ -1064,7 +1064,7 @@ "bundled": true, "dev": true, "requires": { - "handlebars": "4.0.11" + "handlebars": "^4.0.3" } }, "js-tokens": { @@ -1082,7 +1082,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-cache": { @@ -1096,7 +1096,7 @@ "bundled": true, "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "load-json-file": { @@ -1104,11 +1104,11 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "locate-path": { @@ -1116,8 +1116,8 @@ "bundled": true, "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" }, "dependencies": { "path-exists": { @@ -1142,7 +1142,7 @@ "bundled": true, "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "lru-cache": { @@ -1150,8 +1150,8 @@ "bundled": true, "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "md5-hex": { @@ -1159,7 +1159,7 @@ "bundled": true, "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { @@ -1172,7 +1172,7 @@ "bundled": true, "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "^1.0.0" } }, "merge-source-map": { @@ -1180,7 +1180,7 @@ "bundled": true, "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } }, "micromatch": { @@ -1188,19 +1188,19 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, "mimic-fn": { @@ -1213,7 +1213,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -1239,10 +1239,10 @@ "bundled": true, "dev": true, "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -1250,7 +1250,7 @@ "bundled": true, "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "npm-run-path": { @@ -1258,7 +1258,7 @@ "bundled": true, "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { @@ -1276,8 +1276,8 @@ "bundled": true, "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "once": { @@ -1285,7 +1285,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "optimist": { @@ -1293,8 +1293,8 @@ "bundled": true, "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "os-homedir": { @@ -1307,9 +1307,9 @@ "bundled": true, "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "p-finally": { @@ -1327,7 +1327,7 @@ "bundled": true, "dev": true, "requires": { - "p-limit": "1.1.0" + "p-limit": "^1.1.0" } }, "parse-glob": { @@ -1335,10 +1335,10 @@ "bundled": true, "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" } }, "parse-json": { @@ -1346,7 +1346,7 @@ "bundled": true, "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "path-exists": { @@ -1354,7 +1354,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -1377,9 +1377,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -1397,7 +1397,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -1405,7 +1405,7 @@ "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" }, "dependencies": { "find-up": { @@ -1413,8 +1413,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } @@ -1434,8 +1434,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-number": { @@ -1443,7 +1443,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -1451,7 +1451,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1461,7 +1461,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -1471,9 +1471,9 @@ "bundled": true, "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -1481,8 +1481,8 @@ "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -1490,8 +1490,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } @@ -1506,7 +1506,7 @@ "bundled": true, "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "remove-trailing-separator": { @@ -1529,7 +1529,7 @@ "bundled": true, "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "require-directory": { @@ -1553,7 +1553,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -1561,7 +1561,7 @@ "bundled": true, "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "semver": { @@ -1579,7 +1579,7 @@ "bundled": true, "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -1607,12 +1607,12 @@ "bundled": true, "dev": true, "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.0" + "foreground-child": "^1.5.6", + "mkdirp": "^0.5.0", + "os-homedir": "^1.0.1", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" } }, "spdx-correct": { @@ -1620,7 +1620,7 @@ "bundled": true, "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "spdx-license-ids": "^1.0.2" } }, "spdx-expression-parse": { @@ -1638,8 +1638,8 @@ "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -1657,7 +1657,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -1667,7 +1667,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -1675,7 +1675,7 @@ "bundled": true, "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { @@ -1693,11 +1693,11 @@ "bundled": true, "dev": true, "requires": { - "arrify": "1.0.1", - "micromatch": "2.3.11", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" + "arrify": "^1.0.1", + "micromatch": "^2.3.11", + "object-assign": "^4.1.0", + "read-pkg-up": "^1.0.1", + "require-main-filename": "^1.0.1" } }, "to-fast-properties": { @@ -1716,9 +1716,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "yargs": { @@ -1727,9 +1727,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -1746,8 +1746,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "~1.0.0", + "spdx-expression-parse": "~1.0.0" } }, "which": { @@ -1755,7 +1755,7 @@ "bundled": true, "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -1779,8 +1779,8 @@ "bundled": true, "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" }, "dependencies": { "string-width": { @@ -1788,9 +1788,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } } } @@ -1805,9 +1805,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } }, "y18n": { @@ -1825,18 +1825,18 @@ "bundled": true, "dev": true, "requires": { - "cliui": "3.2.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "8.0.0" + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^8.0.0" }, "dependencies": { "cliui": { @@ -1844,9 +1844,9 @@ "bundled": true, "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" }, "dependencies": { "string-width": { @@ -1854,9 +1854,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } } } @@ -1868,7 +1868,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { @@ -1886,9 +1886,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "proxyquire": { @@ -1897,9 +1897,9 @@ "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", "dev": true, "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.1.7" + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.0", + "resolve": "~1.1.7" } }, "string-width": { @@ -1908,8 +1908,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -1918,7 +1918,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "yargs": { @@ -1927,18 +1927,18 @@ "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" } } } @@ -1949,10 +1949,10 @@ "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", "dev": true, "requires": { - "chalk": "0.4.0", - "date-time": "0.1.1", - "pretty-ms": "0.2.2", - "text-table": "0.2.0" + "chalk": "^0.4.0", + "date-time": "^0.1.1", + "pretty-ms": "^0.2.1", + "text-table": "^0.2.0" }, "dependencies": { "ansi-styles": { @@ -1967,9 +1967,9 @@ "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { - "ansi-styles": "1.0.0", - "has-color": "0.1.7", - "strip-ansi": "0.1.1" + "ansi-styles": "~1.0.0", + "has-color": "~0.1.0", + "strip-ansi": "~0.1.0" } }, "pretty-ms": { @@ -1978,7 +1978,7 @@ "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", "dev": true, "requires": { - "parse-ms": "0.1.2" + "parse-ms": "^0.1.0" } }, "strip-ansi": { @@ -1994,8 +1994,8 @@ "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "requires": { - "call-me-maybe": "1.0.1", - "glob-to-regexp": "0.3.0" + "call-me-maybe": "^1.0.1", + "glob-to-regexp": "^0.3.0" } }, "@nodelib/fs.stat": { @@ -2028,8 +2028,8 @@ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/inquire": "1.1.0" + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" } }, "@protobufjs/float": { @@ -2082,7 +2082,7 @@ "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.5.0.tgz", "integrity": "sha512-+aZCCdxuR/Q6n58CBkXyqGqimIqpYUcFLfBXagXv7e9TdJUevqkKhzopBuRz3RB064sQxnJnhttHOkK/O93Ouw==", "requires": { - "@types/node": "10.5.0" + "@types/node": "*" } }, "@types/form-data": { @@ -2090,7 +2090,7 @@ "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz", "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==", "requires": { - "@types/node": "10.5.0" + "@types/node": "*" } }, "@types/long": { @@ -2099,19 +2099,19 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.0.tgz", - "integrity": "sha512-baXPuqA7EVcBUpA5so2K26DTzk7NCWBc9xrPMu9PbUMwgusJRm9zJBPhiDmJVEcnTQ3aOxUZeuFHpd9qMYDNRg==" + "version": "10.5.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz", + "integrity": "sha512-AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ==" }, "@types/request": { "version": "2.47.1", "resolved": "https://registry.npmjs.org/@types/request/-/request-2.47.1.tgz", "integrity": "sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==", "requires": { - "@types/caseless": "0.12.1", - "@types/form-data": "2.2.1", - "@types/node": "10.5.0", - "@types/tough-cookie": "2.3.3" + "@types/caseless": "*", + "@types/form-data": "*", + "@types/node": "*", + "@types/tough-cookie": "*" } }, "@types/tough-cookie": { @@ -2135,7 +2135,7 @@ "integrity": "sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==", "dev": true, "requires": { - "acorn": "5.7.1" + "acorn": "^5.0.3" } }, "ajv": { @@ -2143,10 +2143,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "ajv-keywords": { @@ -2161,9 +2161,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" }, "dependencies": { "kind-of": { @@ -2172,7 +2172,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -2189,7 +2189,7 @@ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, "requires": { - "string-width": "2.1.1" + "string-width": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -2210,8 +2210,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -2220,7 +2220,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -2242,7 +2242,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.2" + "color-convert": "^1.9.0" } }, "anymatch": { @@ -2251,8 +2251,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" }, "dependencies": { "arr-diff": { @@ -2261,7 +2261,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "array-unique": { @@ -2276,9 +2276,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "expand-brackets": { @@ -2287,7 +2287,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "extglob": { @@ -2296,7 +2296,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-extglob": { @@ -2311,7 +2311,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "kind-of": { @@ -2320,7 +2320,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "micromatch": { @@ -2329,19 +2329,19 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } } } @@ -2352,7 +2352,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "argv": { @@ -2410,7 +2410,7 @@ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -2433,8 +2433,8 @@ "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", "requires": { - "colour": "0.7.1", - "optjs": "3.2.2" + "colour": "~0.7.1", + "optjs": "~3.2.2" } }, "asn1": { @@ -2457,7 +2457,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "requires": { - "lodash": "4.17.10" + "lodash": "^4.17.10" } }, "async-each": { @@ -2487,89 +2487,89 @@ "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", "dev": true, "requires": { - "@ava/babel-preset-stage-4": "1.1.0", - "@ava/babel-preset-transform-test-files": "3.0.0", - "@ava/write-file-atomic": "2.2.0", - "@concordance/react": "1.0.0", - "@ladjs/time-require": "0.1.4", - "ansi-escapes": "3.1.0", - "ansi-styles": "3.2.1", - "arr-flatten": "1.1.0", - "array-union": "1.0.2", - "array-uniq": "1.0.3", - "arrify": "1.0.1", - "auto-bind": "1.2.1", - "ava-init": "0.2.1", - "babel-core": "6.26.3", - "babel-generator": "6.26.1", - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "bluebird": "3.5.1", - "caching-transform": "1.0.1", - "chalk": "2.4.1", - "chokidar": "1.7.0", - "clean-stack": "1.3.0", - "clean-yaml-object": "0.1.0", - "cli-cursor": "2.1.0", - "cli-spinners": "1.3.1", - "cli-truncate": "1.1.0", - "co-with-promise": "4.6.0", - "code-excerpt": "2.1.1", - "common-path-prefix": "1.0.0", - "concordance": "3.0.0", - "convert-source-map": "1.5.1", - "core-assert": "0.2.1", - "currently-unhandled": "0.4.1", - "debug": "3.1.0", - "dot-prop": "4.2.0", - "empower-core": "0.6.2", - "equal-length": "1.0.1", - "figures": "2.0.0", - "find-cache-dir": "1.0.0", - "fn-name": "2.0.1", - "get-port": "3.2.0", - "globby": "6.1.0", - "has-flag": "2.0.0", - "hullabaloo-config-manager": "1.1.1", - "ignore-by-default": "1.0.1", - "import-local": "0.1.1", - "indent-string": "3.2.0", - "is-ci": "1.1.0", - "is-generator-fn": "1.0.0", - "is-obj": "1.0.1", - "is-observable": "1.1.0", - "is-promise": "2.1.0", - "last-line-stream": "1.0.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.debounce": "4.0.8", - "lodash.difference": "4.5.0", - "lodash.flatten": "4.4.0", - "loud-rejection": "1.6.0", - "make-dir": "1.3.0", - "matcher": "1.1.1", - "md5-hex": "2.0.0", - "meow": "3.7.0", - "ms": "2.0.0", - "multimatch": "2.1.0", - "observable-to-promise": "0.5.0", - "option-chain": "1.0.0", - "package-hash": "2.0.0", - "pkg-conf": "2.1.0", - "plur": "2.1.2", - "pretty-ms": "3.2.0", - "require-precompiled": "0.1.0", - "resolve-cwd": "2.0.0", - "safe-buffer": "5.1.2", - "semver": "5.5.0", - "slash": "1.0.0", - "source-map-support": "0.5.6", - "stack-utils": "1.0.1", - "strip-ansi": "4.0.0", - "strip-bom-buf": "1.0.0", - "supertap": "1.0.0", - "supports-color": "5.4.0", - "trim-off-newlines": "1.0.1", - "unique-temp-dir": "1.0.0", - "update-notifier": "2.5.0" + "@ava/babel-preset-stage-4": "^1.1.0", + "@ava/babel-preset-transform-test-files": "^3.0.0", + "@ava/write-file-atomic": "^2.2.0", + "@concordance/react": "^1.0.0", + "@ladjs/time-require": "^0.1.4", + "ansi-escapes": "^3.0.0", + "ansi-styles": "^3.1.0", + "arr-flatten": "^1.0.1", + "array-union": "^1.0.1", + "array-uniq": "^1.0.2", + "arrify": "^1.0.0", + "auto-bind": "^1.1.0", + "ava-init": "^0.2.0", + "babel-core": "^6.17.0", + "babel-generator": "^6.26.0", + "babel-plugin-syntax-object-rest-spread": "^6.13.0", + "bluebird": "^3.0.0", + "caching-transform": "^1.0.0", + "chalk": "^2.0.1", + "chokidar": "^1.4.2", + "clean-stack": "^1.1.1", + "clean-yaml-object": "^0.1.0", + "cli-cursor": "^2.1.0", + "cli-spinners": "^1.0.0", + "cli-truncate": "^1.0.0", + "co-with-promise": "^4.6.0", + "code-excerpt": "^2.1.1", + "common-path-prefix": "^1.0.0", + "concordance": "^3.0.0", + "convert-source-map": "^1.5.1", + "core-assert": "^0.2.0", + "currently-unhandled": "^0.4.1", + "debug": "^3.0.1", + "dot-prop": "^4.1.0", + "empower-core": "^0.6.1", + "equal-length": "^1.0.0", + "figures": "^2.0.0", + "find-cache-dir": "^1.0.0", + "fn-name": "^2.0.0", + "get-port": "^3.0.0", + "globby": "^6.0.0", + "has-flag": "^2.0.0", + "hullabaloo-config-manager": "^1.1.0", + "ignore-by-default": "^1.0.0", + "import-local": "^0.1.1", + "indent-string": "^3.0.0", + "is-ci": "^1.0.7", + "is-generator-fn": "^1.0.0", + "is-obj": "^1.0.0", + "is-observable": "^1.0.0", + "is-promise": "^2.1.0", + "last-line-stream": "^1.0.0", + "lodash.clonedeepwith": "^4.5.0", + "lodash.debounce": "^4.0.3", + "lodash.difference": "^4.3.0", + "lodash.flatten": "^4.2.0", + "loud-rejection": "^1.2.0", + "make-dir": "^1.0.0", + "matcher": "^1.0.0", + "md5-hex": "^2.0.0", + "meow": "^3.7.0", + "ms": "^2.0.0", + "multimatch": "^2.1.0", + "observable-to-promise": "^0.5.0", + "option-chain": "^1.0.0", + "package-hash": "^2.0.0", + "pkg-conf": "^2.0.0", + "plur": "^2.0.0", + "pretty-ms": "^3.0.0", + "require-precompiled": "^0.1.0", + "resolve-cwd": "^2.0.0", + "safe-buffer": "^5.1.1", + "semver": "^5.4.1", + "slash": "^1.0.0", + "source-map-support": "^0.5.0", + "stack-utils": "^1.0.1", + "strip-ansi": "^4.0.0", + "strip-bom-buf": "^1.0.0", + "supertap": "^1.0.0", + "supports-color": "^5.0.0", + "trim-off-newlines": "^1.0.1", + "unique-temp-dir": "^1.0.0", + "update-notifier": "^2.3.0" }, "dependencies": { "ansi-regex": { @@ -2585,7 +2585,7 @@ "dev": true, "requires": { "call-signature": "0.0.2", - "core-js": "2.5.7" + "core-js": "^2.0.0" } }, "globby": { @@ -2594,11 +2594,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -2619,7 +2619,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "strip-ansi": { @@ -2628,7 +2628,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -2639,11 +2639,11 @@ "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", "dev": true, "requires": { - "arr-exclude": "1.0.0", - "execa": "0.7.0", - "has-yarn": "1.0.0", - "read-pkg-up": "2.0.0", - "write-pkg": "3.2.0" + "arr-exclude": "^1.0.0", + "execa": "^0.7.0", + "has-yarn": "^1.0.0", + "read-pkg-up": "^2.0.0", + "write-pkg": "^3.1.0" } }, "aws-sign2": { @@ -2661,8 +2661,8 @@ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { - "follow-redirects": "1.5.0", - "is-buffer": "1.1.6" + "follow-redirects": "^1.3.0", + "is-buffer": "^1.1.5" } }, "babel-code-frame": { @@ -2671,9 +2671,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "ansi-styles": { @@ -2688,11 +2688,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "supports-color": { @@ -2709,25 +2709,25 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.1", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.10", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.1", + "debug": "^2.6.9", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.8", + "slash": "^1.0.0", + "source-map": "^0.5.7" }, "dependencies": { "debug": { @@ -2747,14 +2747,14 @@ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.10", - "source-map": "0.5.7", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" }, "dependencies": { "jsesc": { @@ -2771,9 +2771,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-call-delegate": { @@ -2782,10 +2782,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-explode-assignable-expression": { @@ -2794,9 +2794,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { @@ -2805,11 +2805,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { @@ -2818,8 +2818,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-hoist-variables": { @@ -2828,8 +2828,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-regex": { @@ -2838,9 +2838,9 @@ "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.10" + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "lodash": "^4.17.4" } }, "babel-helper-remap-async-to-generator": { @@ -2849,11 +2849,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helpers": { @@ -2862,8 +2862,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-messages": { @@ -2872,7 +2872,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-check-es2015-constants": { @@ -2881,7 +2881,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-espower": { @@ -2890,13 +2890,13 @@ "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", "dev": true, "requires": { - "babel-generator": "6.26.1", - "babylon": "6.18.0", - "call-matcher": "1.0.1", - "core-js": "2.5.7", - "espower-location-detector": "1.0.0", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "babel-generator": "^6.1.0", + "babylon": "^6.1.0", + "call-matcher": "^1.0.0", + "core-js": "^2.0.0", + "espower-location-detector": "^1.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.1.1" } }, "babel-plugin-syntax-async-functions": { @@ -2929,9 +2929,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-destructuring": { @@ -2940,7 +2940,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -2949,9 +2949,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -2960,10 +2960,10 @@ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-types": "^6.26.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -2972,12 +2972,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-spread": { @@ -2986,7 +2986,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -2995,9 +2995,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -3006,9 +3006,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -3017,9 +3017,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-strict-mode": { @@ -3028,8 +3028,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-register": { @@ -3038,13 +3038,13 @@ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "dev": true, "requires": { - "babel-core": "6.26.3", - "babel-runtime": "6.26.0", - "core-js": "2.5.7", - "home-or-tmp": "2.0.0", - "lodash": "4.17.10", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.17.4", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.15" }, "dependencies": { "source-map-support": { @@ -3053,7 +3053,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } } } @@ -3064,8 +3064,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.7", - "regenerator-runtime": "0.11.1" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -3074,11 +3074,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.10" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -3087,15 +3087,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.10" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" }, "dependencies": { "debug": { @@ -3115,10 +3115,10 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.10", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { @@ -3137,13 +3137,13 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -3151,7 +3151,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -3159,7 +3159,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -3167,7 +3167,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -3175,20 +3175,20 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } }, "bcrypt-pbkdf": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", - "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "binary-extensions": { @@ -3209,13 +3209,13 @@ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", "dev": true, "requires": { - "ansi-align": "2.0.0", - "camelcase": "4.1.0", - "chalk": "2.4.1", - "cli-boxes": "1.0.0", - "string-width": "2.1.1", - "term-size": "1.2.0", - "widest-line": "2.0.0" + "ansi-align": "^2.0.0", + "camelcase": "^4.0.0", + "chalk": "^2.0.1", + "cli-boxes": "^1.0.0", + "string-width": "^2.0.0", + "term-size": "^1.2.0", + "widest-line": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -3242,8 +3242,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -3252,7 +3252,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -3262,7 +3262,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -3271,16 +3271,16 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -3288,7 +3288,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -3327,7 +3327,7 @@ "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", "requires": { - "long": "3.2.0" + "long": "~3" }, "dependencies": { "long": { @@ -3342,15 +3342,15 @@ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "cacheable-request": { @@ -3382,9 +3382,9 @@ "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" }, "dependencies": { "md5-hex": { @@ -3393,7 +3393,7 @@ "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "write-file-atomic": { @@ -3402,9 +3402,9 @@ "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } } } @@ -3415,10 +3415,10 @@ "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", "dev": true, "requires": { - "core-js": "2.5.7", - "deep-equal": "1.0.1", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "core-js": "^2.0.0", + "deep-equal": "^1.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.0.0" } }, "call-me-maybe": { @@ -3437,7 +3437,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "0.2.0" + "callsites": "^0.2.0" } }, "callsites": { @@ -3457,8 +3457,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "capture-stack-trace": { @@ -3478,7 +3478,7 @@ "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", "dev": true, "requires": { - "underscore-contrib": "0.3.0" + "underscore-contrib": "~0.3.0" } }, "center-align": { @@ -3488,8 +3488,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chalk": { @@ -3498,9 +3498,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "chardet": { @@ -3515,15 +3515,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -3532,7 +3532,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -3547,7 +3547,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -3569,10 +3569,10 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -3580,7 +3580,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -3609,7 +3609,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "^2.0.0" } }, "cli-spinners": { @@ -3624,8 +3624,8 @@ "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", "dev": true, "requires": { - "slice-ansi": "1.0.0", - "string-width": "2.1.1" + "slice-ansi": "^1.0.0", + "string-width": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -3646,8 +3646,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -3656,7 +3656,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -3672,9 +3672,9 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone-response": { @@ -3683,7 +3683,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "1.0.0" + "mimic-response": "^1.0.0" } }, "co": { @@ -3697,7 +3697,7 @@ "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", "dev": true, "requires": { - "pinkie-promise": "1.0.0" + "pinkie-promise": "^1.0.0" } }, "code-excerpt": { @@ -3706,7 +3706,7 @@ "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", "dev": true, "requires": { - "convert-to-spaces": "1.0.2" + "convert-to-spaces": "^1.0.1" } }, "code-point-at": { @@ -3721,7 +3721,7 @@ "dev": true, "requires": { "argv": "0.0.2", - "request": "2.87.0", + "request": "^2.81.0", "urlgrey": "0.4.4" } }, @@ -3730,8 +3730,8 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color-convert": { @@ -3765,7 +3765,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -3802,17 +3802,17 @@ "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", "dev": true, "requires": { - "date-time": "2.1.0", - "esutils": "2.0.2", - "fast-diff": "1.1.2", - "function-name-support": "0.2.0", - "js-string-escape": "1.0.1", - "lodash.clonedeep": "4.5.0", - "lodash.flattendeep": "4.4.0", - "lodash.merge": "4.6.1", - "md5-hex": "2.0.0", - "semver": "5.5.0", - "well-known-symbols": "1.0.0" + "date-time": "^2.1.0", + "esutils": "^2.0.2", + "fast-diff": "^1.1.1", + "function-name-support": "^0.2.0", + "js-string-escape": "^1.0.1", + "lodash.clonedeep": "^4.5.0", + "lodash.flattendeep": "^4.4.0", + "lodash.merge": "^4.6.0", + "md5-hex": "^2.0.0", + "semver": "^5.3.0", + "well-known-symbols": "^1.0.0" }, "dependencies": { "date-time": { @@ -3821,7 +3821,7 @@ "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", "dev": true, "requires": { - "time-zone": "1.0.0" + "time-zone": "^1.0.0" } } } @@ -3832,12 +3832,12 @@ "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { - "dot-prop": "4.2.0", - "graceful-fs": "4.1.11", - "make-dir": "1.3.0", - "unique-string": "1.0.0", - "write-file-atomic": "2.3.0", - "xdg-basedir": "3.0.0" + "dot-prop": "^4.1.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "unique-string": "^1.0.0", + "write-file-atomic": "^2.0.0", + "xdg-basedir": "^3.0.0" } }, "convert-source-map": { @@ -3869,8 +3869,8 @@ "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", "dev": true, "requires": { - "buf-compare": "1.0.1", - "is-error": "2.2.1" + "buf-compare": "^1.0.0", + "is-error": "^2.2.0" } }, "core-js": { @@ -3889,7 +3889,7 @@ "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "dev": true, "requires": { - "capture-stack-trace": "1.0.0" + "capture-stack-trace": "^1.0.0" } }, "cross-spawn": { @@ -3898,9 +3898,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "crypto-random-string": { @@ -3915,7 +3915,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "d": { @@ -3924,7 +3924,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.45" + "es5-ext": "^0.10.9" } }, "dashdash": { @@ -3932,7 +3932,7 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "date-time": { @@ -3965,7 +3965,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "1.0.0" + "mimic-response": "^1.0.0" } }, "deep-equal": { @@ -3991,8 +3991,8 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.12" + "foreach": "^2.0.5", + "object-keys": "^1.0.8" } }, "define-property": { @@ -4000,8 +4000,8 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4009,7 +4009,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4017,7 +4017,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4025,9 +4025,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4038,13 +4038,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.2" + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" }, "dependencies": { "globby": { @@ -4053,12 +4053,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -4079,7 +4079,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } } } @@ -4100,7 +4100,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "diff": { @@ -4119,8 +4119,8 @@ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" + "arrify": "^1.0.1", + "path-type": "^3.0.0" } }, "doctrine": { @@ -4129,7 +4129,7 @@ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { - "esutils": "2.0.2" + "esutils": "^2.0.2" } }, "dom-serializer": { @@ -4138,8 +4138,8 @@ "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", "dev": true, "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { "domelementtype": { @@ -4162,7 +4162,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1.3.0" + "domelementtype": "1" } }, "domutils": { @@ -4171,8 +4171,8 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" + "dom-serializer": "0", + "domelementtype": "1" } }, "dot-prop": { @@ -4181,7 +4181,7 @@ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { - "is-obj": "1.0.1" + "is-obj": "^1.0.0" } }, "duplexer3": { @@ -4195,10 +4195,10 @@ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "eastasianwidth": { @@ -4212,7 +4212,7 @@ "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "ecdsa-sig-formatter": { @@ -4220,7 +4220,7 @@ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz", "integrity": "sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "empower": { @@ -4228,8 +4228,8 @@ "resolved": "https://registry.npmjs.org/empower/-/empower-1.3.0.tgz", "integrity": "sha512-tP2WqM7QzrPguCCQEQfFFDF+6Pw6YWLQal3+GHQaV+0uIr0S+jyREQPWljE02zFCYPFYLZ3LosiRV+OzTrxPpQ==", "requires": { - "core-js": "2.5.7", - "empower-core": "1.2.0" + "core-js": "^2.0.0", + "empower-core": "^1.2.0" } }, "empower-assert": { @@ -4238,7 +4238,7 @@ "integrity": "sha512-Ylck0Q6p8y/LpNzYeBccaxAPm2ZyuqBgErgZpO9KT0HuQWF0sJckBKCLmgS1/DEXEiyBi9XtYh3clZm5cAdARw==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.2.0" } }, "empower-core": { @@ -4247,7 +4247,7 @@ "integrity": "sha512-g6+K6Geyc1o6FdXs9HwrXleCFan7d66G5xSCfSF7x1mJDCes6t0om9lFQG3zOrzh3Bkb/45N0cZ5Gqsf7YrzGQ==", "requires": { "call-signature": "0.0.2", - "core-js": "2.5.7" + "core-js": "^2.0.0" } }, "end-of-stream": { @@ -4255,7 +4255,7 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "ent": { @@ -4281,7 +4281,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es-abstract": { @@ -4290,11 +4290,11 @@ "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", "dev": true, "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "is-callable": "1.1.3", - "is-regex": "1.0.4" + "es-to-primitive": "^1.1.1", + "function-bind": "^1.1.1", + "has": "^1.0.1", + "is-callable": "^1.1.3", + "is-regex": "^1.0.4" } }, "es-to-primitive": { @@ -4303,9 +4303,9 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { - "is-callable": "1.1.3", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" + "is-callable": "^1.1.1", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.1" } }, "es5-ext": { @@ -4314,9 +4314,9 @@ "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", "dev": true, "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.1", + "next-tick": "1" } }, "es6-error": { @@ -4331,9 +4331,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, "es6-map": { @@ -4342,12 +4342,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", + "es6-set": "~0.1.5", + "es6-symbol": "~3.1.1", + "event-emitter": "~0.3.5" } }, "es6-set": { @@ -4356,11 +4356,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" + "event-emitter": "~0.3.5" } }, "es6-symbol": { @@ -4369,8 +4369,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45" + "d": "1", + "es5-ext": "~0.10.14" } }, "es6-weak-map": { @@ -4379,10 +4379,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" + "d": "1", + "es5-ext": "^0.10.14", + "es6-iterator": "^2.0.1", + "es6-symbol": "^3.1.1" } }, "escallmatch": { @@ -4391,8 +4391,8 @@ "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", "dev": true, "requires": { - "call-matcher": "1.0.1", - "esprima": "2.7.3" + "call-matcher": "^1.0.0", + "esprima": "^2.0.0" }, "dependencies": { "esprima": { @@ -4415,11 +4415,11 @@ "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==", "dev": true, "requires": { - "esprima": "3.1.3", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.6.1" + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "dependencies": { "esprima": { @@ -4443,10 +4443,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "es6-map": "^0.1.3", + "es6-weak-map": "^2.0.1", + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint": { @@ -4455,56 +4455,56 @@ "integrity": "sha512-D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==", "dev": true, "requires": { - "ajv": "6.5.1", - "babel-code-frame": "6.26.0", - "chalk": "2.4.1", - "cross-spawn": "6.0.5", - "debug": "3.1.0", - "doctrine": "2.1.0", - "eslint-scope": "4.0.0", - "eslint-visitor-keys": "1.0.0", - "espree": "4.0.0", - "esquery": "1.0.1", - "esutils": "2.0.2", - "file-entry-cache": "2.0.0", - "functional-red-black-tree": "1.0.1", - "glob": "7.1.2", - "globals": "11.7.0", - "ignore": "3.3.10", - "imurmurhash": "0.1.4", - "inquirer": "5.2.0", - "is-resolvable": "1.1.0", - "js-yaml": "3.12.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.10", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "optionator": "0.8.2", - "path-is-inside": "1.0.2", - "pluralize": "7.0.0", - "progress": "2.0.0", - "regexpp": "1.1.0", - "require-uncached": "1.0.3", - "semver": "5.5.0", - "string.prototype.matchall": "2.0.0", - "strip-ansi": "4.0.0", - "strip-json-comments": "2.0.1", - "table": "4.0.3", - "text-table": "0.2.0" + "ajv": "^6.5.0", + "babel-code-frame": "^6.26.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^3.1.0", + "doctrine": "^2.1.0", + "eslint-scope": "^4.0.0", + "eslint-visitor-keys": "^1.0.0", + "espree": "^4.0.0", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^2.0.0", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.5.0", + "ignore": "^3.3.3", + "imurmurhash": "^0.1.4", + "inquirer": "^5.2.0", + "is-resolvable": "^1.1.0", + "js-yaml": "^3.11.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.5", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "pluralize": "^7.0.0", + "progress": "^2.0.0", + "regexpp": "^1.1.0", + "require-uncached": "^1.0.3", + "semver": "^5.5.0", + "string.prototype.matchall": "^2.0.0", + "strip-ansi": "^4.0.0", + "strip-json-comments": "^2.0.1", + "table": "^4.0.3", + "text-table": "^0.2.0" }, "dependencies": { "ajv": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz", - "integrity": "sha512-pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", + "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.1" } }, "ansi-regex": { @@ -4519,11 +4519,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.4", - "path-key": "2.0.1", - "semver": "5.5.0", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "fast-deep-equal": { @@ -4550,7 +4550,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -4561,7 +4561,7 @@ "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", "dev": true, "requires": { - "get-stdin": "5.0.1" + "get-stdin": "^5.0.1" }, "dependencies": { "get-stdin": { @@ -4578,10 +4578,10 @@ "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", "dev": true, "requires": { - "ignore": "3.3.10", - "minimatch": "3.0.4", - "resolve": "1.8.1", - "semver": "5.5.0" + "ignore": "^3.3.6", + "minimatch": "^3.0.4", + "resolve": "^1.3.3", + "semver": "^5.4.1" }, "dependencies": { "resolve": { @@ -4590,7 +4590,7 @@ "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } } } @@ -4601,8 +4601,8 @@ "integrity": "sha512-wNZ2z0oVCWnf+3BSI7roS+z4gGu2AwcPKUek+SlLZMZg+X0KbZLsB2knul7fd0K3iuIp402HIYzm4f2+OyfXxA==", "dev": true, "requires": { - "fast-diff": "1.1.2", - "jest-docblock": "21.2.0" + "fast-diff": "^1.1.1", + "jest-docblock": "^21.0.0" } }, "eslint-scope": { @@ -4611,8 +4611,8 @@ "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", "dev": true, "requires": { - "esrecurse": "4.2.1", - "estraverse": "4.2.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint-visitor-keys": { @@ -4627,16 +4627,16 @@ "integrity": "sha512-F4TY1qYJB1aUyzB03NsZksZzUQmQoEBaTUjRJGR30GxbkbjKI41NhCyYjrF+bGgWN7x/ZsczYppRpz/0WdI0ug==", "dev": true, "requires": { - "array-find": "1.0.0", - "escallmatch": "1.5.0", - "escodegen": "1.10.0", - "escope": "3.6.0", - "espower-location-detector": "1.0.0", - "espurify": "1.8.0", - "estraverse": "4.2.0", - "source-map": "0.5.7", - "type-name": "2.0.2", - "xtend": "4.0.1" + "array-find": "^1.0.0", + "escallmatch": "^1.5.0", + "escodegen": "^1.7.0", + "escope": "^3.3.0", + "espower-location-detector": "^1.0.0", + "espurify": "^1.3.0", + "estraverse": "^4.1.0", + "source-map": "^0.5.0", + "type-name": "^2.0.0", + "xtend": "^4.0.0" } }, "espower-loader": { @@ -4645,11 +4645,11 @@ "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", "dev": true, "requires": { - "convert-source-map": "1.5.1", - "espower-source": "2.3.0", - "minimatch": "3.0.4", - "source-map-support": "0.4.18", - "xtend": "4.0.1" + "convert-source-map": "^1.1.0", + "espower-source": "^2.0.0", + "minimatch": "^3.0.0", + "source-map-support": "^0.4.0", + "xtend": "^4.0.0" }, "dependencies": { "source-map-support": { @@ -4658,7 +4658,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "0.5.7" + "source-map": "^0.5.6" } } } @@ -4669,10 +4669,10 @@ "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", "dev": true, "requires": { - "is-url": "1.2.4", - "path-is-absolute": "1.0.1", - "source-map": "0.5.7", - "xtend": "4.0.1" + "is-url": "^1.2.1", + "path-is-absolute": "^1.0.0", + "source-map": "^0.5.0", + "xtend": "^4.0.0" } }, "espower-source": { @@ -4681,17 +4681,17 @@ "integrity": "sha512-Wc4kC4zUAEV7Qt31JRPoBUc5jjowHRylml2L2VaDQ1XEbnqQofGWx+gPR03TZAPokAMl5dqyL36h3ITyMXy3iA==", "dev": true, "requires": { - "acorn": "5.7.1", - "acorn-es7-plugin": "1.1.7", - "convert-source-map": "1.5.1", - "empower-assert": "1.1.0", - "escodegen": "1.10.0", - "espower": "2.1.1", - "estraverse": "4.2.0", - "merge-estraverse-visitors": "1.0.0", - "multi-stage-sourcemap": "0.2.1", - "path-is-absolute": "1.0.1", - "xtend": "4.0.1" + "acorn": "^5.0.0", + "acorn-es7-plugin": "^1.0.10", + "convert-source-map": "^1.1.1", + "empower-assert": "^1.0.0", + "escodegen": "^1.10.0", + "espower": "^2.1.1", + "estraverse": "^4.0.0", + "merge-estraverse-visitors": "^1.0.0", + "multi-stage-sourcemap": "^0.2.1", + "path-is-absolute": "^1.0.0", + "xtend": "^4.0.0" } }, "espree": { @@ -4700,8 +4700,8 @@ "integrity": "sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==", "dev": true, "requires": { - "acorn": "5.7.1", - "acorn-jsx": "4.1.1" + "acorn": "^5.6.0", + "acorn-jsx": "^4.1.1" } }, "esprima": { @@ -4715,7 +4715,7 @@ "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.0.tgz", "integrity": "sha512-jdkJG9jswjKCCDmEridNUuIQei9algr+o66ZZ19610ZoBsiWLRsQGNYS4HGez3Z/DsR0lhANGAqiwBUclPuNag==", "requires": { - "core-js": "2.5.7" + "core-js": "^2.0.0" } }, "esquery": { @@ -4724,7 +4724,7 @@ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.0.0" } }, "esrecurse": { @@ -4733,7 +4733,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.1.0" } }, "estraverse": { @@ -4753,8 +4753,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45" + "d": "1", + "es5-ext": "~0.10.14" } }, "execa": { @@ -4763,13 +4763,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "expand-brackets": { @@ -4777,13 +4777,13 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "debug": { @@ -4799,7 +4799,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -4807,7 +4807,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -4818,7 +4818,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.4" + "fill-range": "^2.1.0" }, "dependencies": { "fill-range": { @@ -4827,11 +4827,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.0.0", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^3.0.0", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "is-number": { @@ -4840,7 +4840,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "isobject": { @@ -4858,7 +4858,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -4873,8 +4873,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -4882,7 +4882,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -4893,9 +4893,9 @@ "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.23", - "tmp": "0.0.33" + "chardet": "^0.4.0", + "iconv-lite": "^0.4.17", + "tmp": "^0.0.33" } }, "extglob": { @@ -4903,14 +4903,14 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -4918,7 +4918,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -4926,7 +4926,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -4934,7 +4934,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4942,7 +4942,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4950,9 +4950,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4978,12 +4978,12 @@ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz", "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==", "requires": { - "@mrmlnc/readdir-enhanced": "2.2.1", - "@nodelib/fs.stat": "1.1.0", - "glob-parent": "3.1.0", - "is-glob": "4.0.0", - "merge2": "1.2.2", - "micromatch": "3.1.10" + "@mrmlnc/readdir-enhanced": "^2.2.1", + "@nodelib/fs.stat": "^1.0.1", + "glob-parent": "^3.1.0", + "is-glob": "^4.0.0", + "merge2": "^1.2.1", + "micromatch": "^3.1.10" } }, "fast-json-stable-stringify": { @@ -5003,7 +5003,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-entry-cache": { @@ -5012,8 +5012,8 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "1.3.0", - "object-assign": "4.1.1" + "flat-cache": "^1.2.1", + "object-assign": "^4.0.1" } }, "filename-regex": { @@ -5028,8 +5028,8 @@ "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", "dev": true, "requires": { - "is-object": "1.0.1", - "merge-descriptors": "1.0.1" + "is-object": "~1.0.1", + "merge-descriptors": "~1.0.0" } }, "fill-range": { @@ -5037,10 +5037,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -5048,7 +5048,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -5059,9 +5059,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "1.3.0", - "pkg-dir": "2.0.0" + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" } }, "find-up": { @@ -5070,7 +5070,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "flat-cache": { @@ -5079,10 +5079,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "0.3.3", - "del": "2.2.2", - "graceful-fs": "4.1.11", - "write": "0.2.1" + "circular-json": "^0.3.1", + "del": "^2.0.2", + "graceful-fs": "^4.1.2", + "write": "^0.2.1" } }, "fn-name": { @@ -5096,7 +5096,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "requires": { - "debug": "3.1.0" + "debug": "^3.1.0" } }, "for-in": { @@ -5110,7 +5110,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreach": { @@ -5128,9 +5128,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "asynckit": "0.4.0", + "asynckit": "^0.4.0", "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "mime-types": "^2.1.12" } }, "formidable": { @@ -5144,7 +5144,7 @@ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "from2": { @@ -5153,8 +5153,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" } }, "fs-extra": { @@ -5163,9 +5163,9 @@ "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "fs.realpath": { @@ -5180,8 +5180,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { @@ -5207,8 +5207,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -5221,7 +5221,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -5285,7 +5285,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -5300,14 +5300,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -5316,12 +5316,12 @@ "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -5336,7 +5336,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -5345,7 +5345,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -5354,8 +5354,8 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -5374,7 +5374,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -5388,7 +5388,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -5401,8 +5401,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -5411,7 +5411,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -5434,9 +5434,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -5445,16 +5445,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -5463,8 +5463,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -5479,8 +5479,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -5489,10 +5489,10 @@ "dev": true, "optional": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -5511,7 +5511,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -5532,8 +5532,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -5554,10 +5554,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -5574,13 +5574,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -5589,7 +5589,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -5632,9 +5632,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -5643,7 +5643,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -5651,7 +5651,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -5666,13 +5666,13 @@ "dev": true, "optional": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -5687,7 +5687,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -5725,8 +5725,8 @@ "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", "requires": { - "axios": "0.18.0", - "extend": "3.0.1", + "axios": "^0.18.0", + "extend": "^3.0.1", "retry-axios": "0.3.2" } }, @@ -5764,7 +5764,7 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -5772,12 +5772,12 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -5786,8 +5786,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "glob-parent": { @@ -5796,7 +5796,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "is-extglob": { @@ -5811,7 +5811,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -5821,8 +5821,8 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -5830,7 +5830,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -5846,7 +5846,7 @@ "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", "dev": true, "requires": { - "ini": "1.3.5" + "ini": "^1.3.4" } }, "globals": { @@ -5860,13 +5860,13 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "fast-glob": "2.2.2", - "glob": "7.1.2", - "ignore": "3.3.10", - "pify": "3.0.0", - "slash": "1.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "fast-glob": "^2.0.2", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" } }, "google-auth-library": { @@ -5874,13 +5874,13 @@ "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.6.1.tgz", "integrity": "sha512-jYiWC8NA9n9OtQM7ANn0Tk464do9yhKEtaJ72pKcaBiEwn4LwcGYIYOfwtfsSm3aur/ed3tlSxbmg24IAT6gAg==", "requires": { - "axios": "0.18.0", - "gcp-metadata": "0.6.3", - "gtoken": "2.3.0", - "jws": "3.1.5", - "lodash.isstring": "4.0.1", - "lru-cache": "4.1.3", - "retry-axios": "0.3.2" + "axios": "^0.18.0", + "gcp-metadata": "^0.6.3", + "gtoken": "^2.3.0", + "jws": "^3.1.5", + "lodash.isstring": "^4.0.1", + "lru-cache": "^4.1.3", + "retry-axios": "^0.3.2" } }, "google-auto-auth": { @@ -5888,10 +5888,10 @@ "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", "requires": { - "async": "2.6.1", - "gcp-metadata": "0.6.3", - "google-auth-library": "1.6.1", - "request": "2.87.0" + "async": "^2.3.0", + "gcp-metadata": "^0.6.1", + "google-auth-library": "^1.3.1", + "request": "^2.79.0" } }, "google-gax": { @@ -5899,27 +5899,17 @@ "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.17.1.tgz", "integrity": "sha512-fAKvFx++SRr6bGWamWuVOkJzJnQqMgpJkhaB2oEwfFJ91rbFgEmIPRmZZ/MeIVVFUOuHUVyZ8nwjm5peyTZJ6g==", "requires": { - "duplexify": "3.6.0", - "extend": "3.0.1", - "globby": "8.0.1", - "google-auth-library": "1.6.1", - "google-proto-files": "0.16.1", - "grpc": "1.12.4", - "is-stream-ended": "0.1.4", - "lodash": "4.17.10", - "protobufjs": "6.8.6", - "retry-request": "4.0.0", - "through2": "2.0.3" - }, - "dependencies": { - "retry-request": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.0.0.tgz", - "integrity": "sha512-S4HNLaWcMP6r8E4TMH52Y7/pM8uNayOcTDDQNBwsCccL1uI+Ol2TljxRDPzaNfbhOB30+XWP5NnZkB3LiJxi1w==", - "requires": { - "through2": "2.0.3" - } - } + "duplexify": "^3.6.0", + "extend": "^3.0.1", + "globby": "^8.0.1", + "google-auth-library": "^1.6.1", + "google-proto-files": "^0.16.0", + "grpc": "^1.12.2", + "is-stream-ended": "^0.1.4", + "lodash": "^4.17.10", + "protobufjs": "^6.8.6", + "retry-request": "^4.0.0", + "through2": "^2.0.3" } }, "google-p12-pem": { @@ -5927,8 +5917,8 @@ "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", "requires": { - "node-forge": "0.7.5", - "pify": "3.0.0" + "node-forge": "^0.7.4", + "pify": "^3.0.0" } }, "google-proto-files": { @@ -5936,9 +5926,9 @@ "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.16.1.tgz", "integrity": "sha512-ykdhaYDiU/jlyrkzZDPemraKwVIgLT31XMHVNSJW//R9VED56hqSDRMx1Jlxbf0O4iDZnBWQ0JQLHbM2r5+wuA==", "requires": { - "globby": "8.0.1", - "power-assert": "1.6.0", - "protobufjs": "6.8.6" + "globby": "^8.0.0", + "power-assert": "^1.4.4", + "protobufjs": "^6.8.0" } }, "got": { @@ -5947,23 +5937,23 @@ "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", "dev": true, "requires": { - "@sindresorhus/is": "0.7.0", - "cacheable-request": "2.1.4", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "into-stream": "3.1.0", - "is-retry-allowed": "1.1.0", - "isurl": "1.0.0", - "lowercase-keys": "1.0.1", - "mimic-response": "1.0.0", - "p-cancelable": "0.3.0", - "p-timeout": "2.0.1", - "pify": "3.0.0", - "safe-buffer": "5.1.2", - "timed-out": "4.0.1", - "url-parse-lax": "3.0.0", - "url-to-options": "1.0.1" + "@sindresorhus/is": "^0.7.0", + "cacheable-request": "^2.1.1", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "into-stream": "^3.1.0", + "is-retry-allowed": "^1.1.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "mimic-response": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^2.0.1", + "pify": "^3.0.0", + "safe-buffer": "^5.1.1", + "timed-out": "^4.0.1", + "url-parse-lax": "^3.0.0", + "url-to-options": "^1.0.1" }, "dependencies": { "prepend-http": { @@ -5978,7 +5968,7 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "2.0.0" + "prepend-http": "^2.0.0" } } } @@ -6000,10 +5990,10 @@ "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.12.4.tgz", "integrity": "sha512-t0Hy4yoHHYLkK0b+ULTHw5ZuSFmWokCABY0C4bKQbE4jnm1hpjA23cQVD0xAqDcRHN5CkvFzlqb34ngV22dqoQ==", "requires": { - "lodash": "4.17.10", - "nan": "2.10.0", - "node-pre-gyp": "0.10.0", - "protobufjs": "5.0.3" + "lodash": "^4.17.5", + "nan": "^2.0.0", + "node-pre-gyp": "^0.10.0", + "protobufjs": "^5.0.3" }, "dependencies": { "abbrev": { @@ -6022,8 +6012,8 @@ "version": "1.1.5", "bundled": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -6034,7 +6024,7 @@ "version": "1.1.11", "bundled": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -6081,7 +6071,7 @@ "version": "1.2.5", "bundled": true, "requires": { - "minipass": "2.3.3" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -6092,26 +6082,26 @@ "version": "2.7.4", "bundled": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { "version": "7.1.2", "bundled": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -6122,22 +6112,22 @@ "version": "0.4.23", "bundled": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore-walk": { "version": "3.0.1", "bundled": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { "version": "1.0.6", "bundled": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -6152,7 +6142,7 @@ "version": "1.0.0", "bundled": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -6163,7 +6153,7 @@ "version": "3.0.4", "bundled": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -6174,15 +6164,15 @@ "version": "2.3.3", "bundled": true, "requires": { - "safe-buffer": "5.1.2", - "yallist": "3.0.2" + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" } }, "minizlib": { "version": "1.1.0", "bundled": true, "requires": { - "minipass": "2.3.3" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -6206,33 +6196,33 @@ "version": "2.2.1", "bundled": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.23", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { "version": "0.10.0", "bundled": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.1", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.8", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.4" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { "version": "4.0.1", "bundled": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -6243,18 +6233,18 @@ "version": "1.1.10", "bundled": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { "version": "4.1.2", "bundled": true, "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -6269,7 +6259,7 @@ "version": "1.4.0", "bundled": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -6284,8 +6274,8 @@ "version": "0.1.5", "bundled": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -6301,40 +6291,40 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz", "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==", "requires": { - "ascli": "1.0.1", - "bytebuffer": "5.0.1", - "glob": "7.1.2", - "yargs": "3.32.0" + "ascli": "~1", + "bytebuffer": "~5", + "glob": "^7.0.5", + "yargs": "^3.10.0" } }, "rc": { "version": "1.2.8", "bundled": true, "requires": { - "deep-extend": "0.6.0", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" } }, "readable-stream": { "version": "2.3.6", "bundled": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { "version": "2.6.2", "bundled": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -6365,23 +6355,23 @@ "version": "1.0.2", "bundled": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { "version": "1.1.1", "bundled": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { "version": "3.0.1", "bundled": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -6392,13 +6382,13 @@ "version": "4.4.4", "bundled": true, "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.3.3", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.2", - "yallist": "3.0.2" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.3", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -6409,7 +6399,7 @@ "version": "1.1.3", "bundled": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2 || 2" } }, "wrappy": { @@ -6427,11 +6417,11 @@ "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", "requires": { - "axios": "0.18.0", - "google-p12-pem": "1.0.2", - "jws": "3.1.5", - "mime": "2.3.1", - "pify": "3.0.0" + "axios": "^0.18.0", + "google-p12-pem": "^1.0.0", + "jws": "^3.1.4", + "mime": "^2.2.0", + "pify": "^3.0.0" } }, "handlebars": { @@ -6440,10 +6430,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "async": { @@ -6458,7 +6448,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -6473,8 +6463,8 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" } }, "has": { @@ -6483,7 +6473,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.1.1" } }, "has-ansi": { @@ -6492,7 +6482,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-color": { @@ -6525,7 +6515,7 @@ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "dev": true, "requires": { - "has-symbol-support-x": "1.4.2" + "has-symbol-support-x": "^1.4.1" } }, "has-value": { @@ -6533,9 +6523,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -6543,8 +6533,8 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -6552,7 +6542,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6575,8 +6565,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.1" } }, "hosted-git-info": { @@ -6591,12 +6581,12 @@ "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", "dev": true, "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.4.2", - "domutils": "1.7.0", - "entities": "1.1.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6" + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" } }, "http-cache-semantics": { @@ -6610,9 +6600,9 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.2" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "hullabaloo-config-manager": { @@ -6621,20 +6611,20 @@ "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", "dev": true, "requires": { - "dot-prop": "4.2.0", - "es6-error": "4.1.1", - "graceful-fs": "4.1.11", - "indent-string": "3.2.0", - "json5": "0.5.1", - "lodash.clonedeep": "4.5.0", - "lodash.clonedeepwith": "4.5.0", - "lodash.isequal": "4.5.0", - "lodash.merge": "4.6.1", - "md5-hex": "2.0.0", - "package-hash": "2.0.0", - "pkg-dir": "2.0.0", - "resolve-from": "3.0.0", - "safe-buffer": "5.1.2" + "dot-prop": "^4.1.0", + "es6-error": "^4.0.2", + "graceful-fs": "^4.1.11", + "indent-string": "^3.1.0", + "json5": "^0.5.1", + "lodash.clonedeep": "^4.5.0", + "lodash.clonedeepwith": "^4.5.0", + "lodash.isequal": "^4.5.0", + "lodash.merge": "^4.6.0", + "md5-hex": "^2.0.0", + "package-hash": "^2.0.0", + "pkg-dir": "^2.0.0", + "resolve-from": "^3.0.0", + "safe-buffer": "^5.0.1" } }, "iconv-lite": { @@ -6643,7 +6633,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore": { @@ -6669,8 +6659,8 @@ "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", "dev": true, "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^2.0.0", + "resolve-cwd": "^2.0.0" } }, "imurmurhash": { @@ -6695,8 +6685,8 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -6716,8 +6706,8 @@ "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", "dev": true, "requires": { - "moment": "2.22.2", - "sanitize-html": "1.18.2" + "moment": "^2.14.1", + "sanitize-html": "^1.13.0" } }, "inquirer": { @@ -6726,19 +6716,19 @@ "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", "dev": true, "requires": { - "ansi-escapes": "3.1.0", - "chalk": "2.4.1", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.2.0", - "figures": "2.0.0", - "lodash": "4.17.10", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^2.1.0", + "figures": "^2.0.0", + "lodash": "^4.3.0", "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rxjs": "5.5.11", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" + "run-async": "^2.2.0", + "rxjs": "^5.5.2", + "string-width": "^2.1.0", + "strip-ansi": "^4.0.0", + "through": "^2.3.6" }, "dependencies": { "ansi-regex": { @@ -6759,8 +6749,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -6769,7 +6759,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -6780,7 +6770,7 @@ "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", "dev": true, "requires": { - "espower-loader": "1.2.2" + "espower-loader": "^1.0.0" } }, "into-stream": { @@ -6789,8 +6779,8 @@ "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", "dev": true, "requires": { - "from2": "2.3.0", - "p-is-promise": "1.1.0" + "from2": "^2.1.1", + "p-is-promise": "^1.1.0" } }, "invariant": { @@ -6799,7 +6789,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -6823,7 +6813,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6831,7 +6821,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6848,7 +6838,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.11.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -6862,7 +6852,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-callable": { @@ -6877,7 +6867,7 @@ "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", "dev": true, "requires": { - "ci-info": "1.1.3" + "ci-info": "^1.0.0" } }, "is-data-descriptor": { @@ -6885,7 +6875,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6893,7 +6883,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6909,9 +6899,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -6933,7 +6923,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-error": { @@ -6958,7 +6948,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -6966,7 +6956,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-generator-fn": { @@ -6980,7 +6970,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-installed-globally": { @@ -6989,8 +6979,8 @@ "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", "dev": true, "requires": { - "global-dirs": "0.1.1", - "is-path-inside": "1.0.1" + "global-dirs": "^0.1.0", + "is-path-inside": "^1.0.0" } }, "is-npm": { @@ -7004,7 +6994,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7012,7 +7002,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7035,7 +7025,7 @@ "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", "dev": true, "requires": { - "symbol-observable": "1.2.0" + "symbol-observable": "^1.1.0" } }, "is-path-cwd": { @@ -7050,7 +7040,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "is-path-inside": "1.0.1" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -7059,7 +7049,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-obj": { @@ -7073,7 +7063,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-posix-bracket": { @@ -7106,7 +7096,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "1.0.3" + "has": "^1.0.1" } }, "is-resolvable": { @@ -7198,8 +7188,8 @@ "@babel/template": "7.0.0-beta.51", "@babel/traverse": "7.0.0-beta.51", "@babel/types": "7.0.0-beta.51", - "istanbul-lib-coverage": "2.0.0", - "semver": "5.5.0" + "istanbul-lib-coverage": "^2.0.0", + "semver": "^5.5.0" } }, "isurl": { @@ -7208,8 +7198,8 @@ "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "dev": true, "requires": { - "has-to-string-tag-x": "1.4.1", - "is-object": "1.0.1" + "has-to-string-tag-x": "^1.2.0", + "is-object": "^1.0.1" } }, "jest-docblock": { @@ -7236,8 +7226,8 @@ "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "4.0.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "js2xmlparser": { @@ -7246,7 +7236,7 @@ "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", "dev": true, "requires": { - "xmlcreate": "1.0.2" + "xmlcreate": "^1.0.1" } }, "jsbn": { @@ -7262,17 +7252,17 @@ "dev": true, "requires": { "babylon": "7.0.0-beta.19", - "bluebird": "3.5.1", - "catharsis": "0.8.9", - "escape-string-regexp": "1.0.5", - "js2xmlparser": "3.0.0", - "klaw": "2.0.0", - "marked": "0.3.19", - "mkdirp": "0.5.1", - "requizzle": "0.2.1", - "strip-json-comments": "2.0.1", + "bluebird": "~3.5.0", + "catharsis": "~0.8.9", + "escape-string-regexp": "~1.0.5", + "js2xmlparser": "~3.0.0", + "klaw": "~2.0.0", + "marked": "~0.3.6", + "mkdirp": "~0.5.1", + "requizzle": "~0.2.1", + "strip-json-comments": "~2.0.1", "taffydb": "2.6.2", - "underscore": "1.8.3" + "underscore": "~1.8.3" }, "dependencies": { "babylon": { @@ -7334,7 +7324,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsprim": { @@ -7361,7 +7351,7 @@ "requires": { "buffer-equal-constant-time": "1.0.1", "ecdsa-sig-formatter": "1.0.10", - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "jws": { @@ -7369,8 +7359,8 @@ "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz", "integrity": "sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==", "requires": { - "jwa": "1.1.6", - "safe-buffer": "5.1.2" + "jwa": "^1.1.5", + "safe-buffer": "^5.0.1" } }, "keyv": { @@ -7393,7 +7383,7 @@ "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "last-line-stream": { @@ -7402,7 +7392,7 @@ "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", "dev": true, "requires": { - "through2": "2.0.3" + "through2": "^2.0.0" } }, "latest-version": { @@ -7411,7 +7401,7 @@ "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "dev": true, "requires": { - "package-json": "4.0.1" + "package-json": "^4.0.0" } }, "lazy-cache": { @@ -7426,7 +7416,7 @@ "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "levn": { @@ -7435,8 +7425,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "load-json-file": { @@ -7445,10 +7435,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" }, "dependencies": { "pify": { @@ -7465,8 +7455,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -7583,7 +7573,7 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "loud-rejection": { @@ -7592,8 +7582,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lowercase-keys": { @@ -7607,8 +7597,8 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "make-dir": { @@ -7617,7 +7607,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "map-cache": { @@ -7636,7 +7626,7 @@ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "marked": { @@ -7651,7 +7641,7 @@ "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.4" } }, "math-random": { @@ -7666,7 +7656,7 @@ "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { @@ -7681,7 +7671,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "meow": { @@ -7690,16 +7680,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" }, "dependencies": { "find-up": { @@ -7708,8 +7698,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "load-json-file": { @@ -7718,11 +7708,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "minimist": { @@ -7737,7 +7727,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-type": { @@ -7746,9 +7736,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -7769,7 +7759,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "read-pkg": { @@ -7778,9 +7768,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -7789,8 +7779,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "strip-bom": { @@ -7799,7 +7789,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } } } @@ -7816,7 +7806,7 @@ "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.0.0" } }, "merge2": { @@ -7835,19 +7825,19 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "mime": { @@ -7865,7 +7855,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "requires": { - "mime-db": "1.33.0" + "mime-db": "~1.33.0" } }, "mimic-fn": { @@ -7885,7 +7875,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -7899,8 +7889,8 @@ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -7908,7 +7898,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -7964,7 +7954,7 @@ "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", "dev": true, "requires": { - "source-map": "0.1.43" + "source-map": "^0.1.34" }, "dependencies": { "source-map": { @@ -7973,7 +7963,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -7984,10 +7974,10 @@ "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", "dev": true, "requires": { - "array-differ": "1.0.0", - "array-union": "1.0.2", - "arrify": "1.0.1", - "minimatch": "3.0.4" + "array-differ": "^1.0.0", + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "minimatch": "^3.0.0" } }, "mute-stream": { @@ -8006,17 +7996,17 @@ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "natural-compare": { @@ -8043,11 +8033,11 @@ "integrity": "sha512-BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw==", "dev": true, "requires": { - "@sinonjs/formatio": "2.0.0", - "just-extend": "1.1.27", - "lolex": "2.7.0", - "path-to-regexp": "1.7.0", - "text-encoding": "0.6.4" + "@sinonjs/formatio": "^2.0.0", + "just-extend": "^1.1.27", + "lolex": "^2.3.2", + "path-to-regexp": "^1.7.0", + "text-encoding": "^0.6.4" } }, "node-forge": { @@ -8061,10 +8051,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.6.1", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -8073,7 +8063,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "normalize-url": { @@ -8082,9 +8072,9 @@ "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", "dev": true, "requires": { - "prepend-http": "2.0.0", - "query-string": "5.1.1", - "sort-keys": "2.0.0" + "prepend-http": "^2.0.0", + "query-string": "^5.0.1", + "sort-keys": "^2.0.0" }, "dependencies": { "prepend-http": { @@ -8101,7 +8091,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { @@ -8115,33 +8105,33 @@ "integrity": "sha1-ikpO1pCWbBHsWH/4fuoMEsl0upk=", "dev": true, "requires": { - "archy": "1.0.0", - "arrify": "1.0.1", - "caching-transform": "1.0.1", - "convert-source-map": "1.5.1", - "debug-log": "1.0.1", - "default-require-extensions": "1.0.0", - "find-cache-dir": "0.1.1", - "find-up": "2.1.0", - "foreground-child": "1.5.6", - "glob": "7.1.2", - "istanbul-lib-coverage": "1.2.0", - "istanbul-lib-hook": "1.1.0", - "istanbul-lib-instrument": "2.3.0", - "istanbul-lib-report": "1.1.3", - "istanbul-lib-source-maps": "1.2.5", - "istanbul-reports": "1.4.1", - "md5-hex": "1.3.0", - "merge-source-map": "1.1.0", - "micromatch": "3.1.10", - "mkdirp": "0.5.1", - "resolve-from": "2.0.0", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "spawn-wrap": "1.4.2", - "test-exclude": "4.2.1", + "archy": "^1.0.0", + "arrify": "^1.0.1", + "caching-transform": "^1.0.0", + "convert-source-map": "^1.5.1", + "debug-log": "^1.0.1", + "default-require-extensions": "^1.0.0", + "find-cache-dir": "^0.1.1", + "find-up": "^2.1.0", + "foreground-child": "^1.5.3", + "glob": "^7.0.6", + "istanbul-lib-coverage": "^1.2.0", + "istanbul-lib-hook": "^1.1.0", + "istanbul-lib-instrument": "^2.1.0", + "istanbul-lib-report": "^1.1.3", + "istanbul-lib-source-maps": "^1.2.5", + "istanbul-reports": "^1.4.1", + "md5-hex": "^1.2.0", + "merge-source-map": "^1.1.0", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.0", + "resolve-from": "^2.0.0", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.1", + "spawn-wrap": "^1.4.2", + "test-exclude": "^4.2.0", "yargs": "11.1.0", - "yargs-parser": "8.1.0" + "yargs-parser": "^8.0.0" }, "dependencies": { "align-text": { @@ -8149,9 +8139,9 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { @@ -8169,7 +8159,7 @@ "bundled": true, "dev": true, "requires": { - "default-require-extensions": "1.0.0" + "default-require-extensions": "^1.0.0" } }, "archy": { @@ -8227,13 +8217,13 @@ "bundled": true, "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -8241,7 +8231,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -8249,7 +8239,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -8257,7 +8247,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -8265,9 +8255,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { @@ -8282,7 +8272,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -8291,16 +8281,16 @@ "bundled": true, "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -8308,7 +8298,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -8323,15 +8313,15 @@ "bundled": true, "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "caching-transform": { @@ -8339,9 +8329,9 @@ "bundled": true, "dev": true, "requires": { - "md5-hex": "1.3.0", - "mkdirp": "0.5.1", - "write-file-atomic": "1.3.4" + "md5-hex": "^1.2.0", + "mkdirp": "^0.5.1", + "write-file-atomic": "^1.1.4" } }, "camelcase": { @@ -8356,8 +8346,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "class-utils": { @@ -8365,10 +8355,10 @@ "bundled": true, "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -8376,7 +8366,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -8387,8 +8377,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -8410,8 +8400,8 @@ "bundled": true, "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "commondir": { @@ -8444,8 +8434,8 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.3", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "debug": { @@ -8476,7 +8466,7 @@ "bundled": true, "dev": true, "requires": { - "strip-bom": "2.0.0" + "strip-bom": "^2.0.0" } }, "define-property": { @@ -8484,8 +8474,8 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -8493,7 +8483,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -8501,7 +8491,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -8509,9 +8499,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { @@ -8526,7 +8516,7 @@ "bundled": true, "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "execa": { @@ -8534,13 +8524,13 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -8548,9 +8538,9 @@ "bundled": true, "dev": true, "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } @@ -8560,13 +8550,13 @@ "bundled": true, "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "debug": { @@ -8582,7 +8572,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -8590,7 +8580,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -8600,8 +8590,8 @@ "bundled": true, "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -8609,7 +8599,7 @@ "bundled": true, "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -8619,14 +8609,14 @@ "bundled": true, "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -8634,7 +8624,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -8642,7 +8632,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -8650,7 +8640,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -8658,7 +8648,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -8666,9 +8656,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { @@ -8683,10 +8673,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -8694,7 +8684,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -8704,9 +8694,9 @@ "bundled": true, "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { @@ -8714,7 +8704,7 @@ "bundled": true, "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "for-in": { @@ -8727,8 +8717,8 @@ "bundled": true, "dev": true, "requires": { - "cross-spawn": "4.0.2", - "signal-exit": "3.0.2" + "cross-spawn": "^4", + "signal-exit": "^3.0.0" } }, "fragment-cache": { @@ -8736,7 +8726,7 @@ "bundled": true, "dev": true, "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fs.realpath": { @@ -8764,12 +8754,12 @@ "bundled": true, "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "graceful-fs": { @@ -8782,10 +8772,10 @@ "bundled": true, "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "source-map": { @@ -8793,7 +8783,7 @@ "bundled": true, "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -8803,9 +8793,9 @@ "bundled": true, "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -8813,8 +8803,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "kind-of": { @@ -8822,7 +8812,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -8842,8 +8832,8 @@ "bundled": true, "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -8861,7 +8851,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-arrayish": { @@ -8879,7 +8869,7 @@ "bundled": true, "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-data-descriptor": { @@ -8887,7 +8877,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-descriptor": { @@ -8895,9 +8885,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -8922,7 +8912,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-odd": { @@ -8930,7 +8920,7 @@ "bundled": true, "dev": true, "requires": { - "is-number": "4.0.0" + "is-number": "^4.0.0" }, "dependencies": { "is-number": { @@ -8945,7 +8935,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-stream": { @@ -8988,7 +8978,7 @@ "bundled": true, "dev": true, "requires": { - "append-transform": "0.4.0" + "append-transform": "^0.4.0" } }, "istanbul-lib-report": { @@ -8996,10 +8986,10 @@ "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "path-parse": "1.0.5", - "supports-color": "3.2.3" + "istanbul-lib-coverage": "^1.1.2", + "mkdirp": "^0.5.1", + "path-parse": "^1.0.5", + "supports-color": "^3.1.2" }, "dependencies": { "has-flag": { @@ -9012,7 +9002,7 @@ "bundled": true, "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -9022,11 +9012,11 @@ "bundled": true, "dev": true, "requires": { - "debug": "3.1.0", - "istanbul-lib-coverage": "1.2.0", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "source-map": "0.5.7" + "debug": "^3.1.0", + "istanbul-lib-coverage": "^1.2.0", + "mkdirp": "^0.5.1", + "rimraf": "^2.6.1", + "source-map": "^0.5.3" } }, "istanbul-reports": { @@ -9034,7 +9024,7 @@ "bundled": true, "dev": true, "requires": { - "handlebars": "4.0.11" + "handlebars": "^4.0.3" } }, "kind-of": { @@ -9042,7 +9032,7 @@ "bundled": true, "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-cache": { @@ -9056,7 +9046,7 @@ "bundled": true, "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "load-json-file": { @@ -9064,11 +9054,11 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "locate-path": { @@ -9076,8 +9066,8 @@ "bundled": true, "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" }, "dependencies": { "path-exists": { @@ -9097,8 +9087,8 @@ "bundled": true, "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "map-cache": { @@ -9111,7 +9101,7 @@ "bundled": true, "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "md5-hex": { @@ -9119,7 +9109,7 @@ "bundled": true, "dev": true, "requires": { - "md5-o-matic": "0.1.1" + "md5-o-matic": "^0.1.1" } }, "md5-o-matic": { @@ -9132,7 +9122,7 @@ "bundled": true, "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "merge-source-map": { @@ -9140,7 +9130,7 @@ "bundled": true, "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -9155,19 +9145,19 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.9", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" }, "dependencies": { "kind-of": { @@ -9187,7 +9177,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -9200,8 +9190,8 @@ "bundled": true, "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -9209,7 +9199,7 @@ "bundled": true, "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -9232,18 +9222,18 @@ "bundled": true, "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-odd": "2.0.0", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-odd": "^2.0.0", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "kind-of": { @@ -9258,10 +9248,10 @@ "bundled": true, "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "npm-run-path": { @@ -9269,7 +9259,7 @@ "bundled": true, "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { @@ -9287,9 +9277,9 @@ "bundled": true, "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -9297,7 +9287,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -9307,7 +9297,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.pick": { @@ -9315,7 +9305,7 @@ "bundled": true, "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "once": { @@ -9323,7 +9313,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "optimist": { @@ -9331,8 +9321,8 @@ "bundled": true, "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "os-homedir": { @@ -9345,9 +9335,9 @@ "bundled": true, "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "p-finally": { @@ -9360,7 +9350,7 @@ "bundled": true, "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -9368,7 +9358,7 @@ "bundled": true, "dev": true, "requires": { - "p-limit": "1.2.0" + "p-limit": "^1.1.0" } }, "p-try": { @@ -9381,7 +9371,7 @@ "bundled": true, "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "pascalcase": { @@ -9394,7 +9384,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -9417,9 +9407,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -9437,7 +9427,7 @@ "bundled": true, "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -9445,7 +9435,7 @@ "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" }, "dependencies": { "find-up": { @@ -9453,8 +9443,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } @@ -9474,9 +9464,9 @@ "bundled": true, "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -9484,8 +9474,8 @@ "bundled": true, "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -9493,8 +9483,8 @@ "bundled": true, "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } } } @@ -9504,8 +9494,8 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "repeat-element": { @@ -9549,7 +9539,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -9557,7 +9547,7 @@ "bundled": true, "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-regex": { @@ -9565,7 +9555,7 @@ "bundled": true, "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "semver": { @@ -9583,10 +9573,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -9594,7 +9584,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -9604,7 +9594,7 @@ "bundled": true, "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -9627,14 +9617,14 @@ "bundled": true, "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.0" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "debug": { @@ -9650,7 +9640,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -9658,7 +9648,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -9668,9 +9658,9 @@ "bundled": true, "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -9678,7 +9668,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -9686,7 +9676,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -9694,7 +9684,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -9702,9 +9692,9 @@ "bundled": true, "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, "kind-of": { @@ -9719,7 +9709,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" } }, "source-map": { @@ -9732,11 +9722,11 @@ "bundled": true, "dev": true, "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-url": { @@ -9749,12 +9739,12 @@ "bundled": true, "dev": true, "requires": { - "foreground-child": "1.5.6", - "mkdirp": "0.5.1", - "os-homedir": "1.0.2", - "rimraf": "2.6.2", - "signal-exit": "3.0.2", - "which": "1.3.1" + "foreground-child": "^1.5.6", + "mkdirp": "^0.5.0", + "os-homedir": "^1.0.1", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" } }, "spdx-correct": { @@ -9762,8 +9752,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -9776,8 +9766,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -9790,7 +9780,7 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "static-extend": { @@ -9798,8 +9788,8 @@ "bundled": true, "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -9807,7 +9797,7 @@ "bundled": true, "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -9817,8 +9807,8 @@ "bundled": true, "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -9826,7 +9816,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "strip-bom": { @@ -9834,7 +9824,7 @@ "bundled": true, "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { @@ -9847,11 +9837,11 @@ "bundled": true, "dev": true, "requires": { - "arrify": "1.0.1", - "micromatch": "3.1.10", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "require-main-filename": "1.0.1" + "arrify": "^1.0.1", + "micromatch": "^3.1.8", + "object-assign": "^4.1.0", + "read-pkg-up": "^1.0.1", + "require-main-filename": "^1.0.1" } }, "to-object-path": { @@ -9859,7 +9849,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "to-regex": { @@ -9867,10 +9857,10 @@ "bundled": true, "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -9878,8 +9868,8 @@ "bundled": true, "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "uglify-js": { @@ -9888,9 +9878,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "yargs": { @@ -9899,9 +9889,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -9918,10 +9908,10 @@ "bundled": true, "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { @@ -9929,7 +9919,7 @@ "bundled": true, "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { @@ -9937,10 +9927,10 @@ "bundled": true, "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -9950,8 +9940,8 @@ "bundled": true, "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -9959,9 +9949,9 @@ "bundled": true, "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -9991,7 +9981,7 @@ "bundled": true, "dev": true, "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" }, "dependencies": { "kind-of": { @@ -10006,8 +9996,8 @@ "bundled": true, "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "which": { @@ -10015,7 +10005,7 @@ "bundled": true, "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -10039,8 +10029,8 @@ "bundled": true, "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" }, "dependencies": { "ansi-regex": { @@ -10053,7 +10043,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "string-width": { @@ -10061,9 +10051,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "strip-ansi": { @@ -10071,7 +10061,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } } } @@ -10086,9 +10076,9 @@ "bundled": true, "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" } }, "y18n": { @@ -10106,18 +10096,18 @@ "bundled": true, "dev": true, "requires": { - "cliui": "4.1.0", - "decamelize": "1.2.0", - "find-up": "2.1.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "9.0.2" + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" }, "dependencies": { "camelcase": { @@ -10130,9 +10120,9 @@ "bundled": true, "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "yargs-parser": { @@ -10140,7 +10130,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -10150,7 +10140,7 @@ "bundled": true, "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { @@ -10178,9 +10168,9 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -10188,7 +10178,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "kind-of": { @@ -10196,7 +10186,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -10211,7 +10201,7 @@ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.omit": { @@ -10220,8 +10210,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "object.pick": { @@ -10229,7 +10219,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "observable-to-promise": { @@ -10238,8 +10228,8 @@ "integrity": "sha1-yCjw8NxH6fhq+KSXfF1VB2znqR8=", "dev": true, "requires": { - "is-observable": "0.2.0", - "symbol-observable": "1.2.0" + "is-observable": "^0.2.0", + "symbol-observable": "^1.0.4" }, "dependencies": { "is-observable": { @@ -10248,7 +10238,7 @@ "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", "dev": true, "requires": { - "symbol-observable": "0.2.4" + "symbol-observable": "^0.2.2" }, "dependencies": { "symbol-observable": { @@ -10266,7 +10256,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -10275,7 +10265,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.2.0" + "mimic-fn": "^1.0.0" } }, "optimist": { @@ -10284,8 +10274,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, "option-chain": { @@ -10300,12 +10290,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" }, "dependencies": { "wordwrap": { @@ -10332,7 +10322,7 @@ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "os-tmpdir": { @@ -10365,7 +10355,7 @@ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "p-try": "1.0.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -10374,7 +10364,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.3.0" + "p-limit": "^1.1.0" } }, "p-timeout": { @@ -10383,7 +10373,7 @@ "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", "dev": true, "requires": { - "p-finally": "1.0.0" + "p-finally": "^1.0.0" } }, "p-try": { @@ -10398,10 +10388,10 @@ "integrity": "sha1-eK4ybIngWk2BO2hgGXevBcANKg0=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "lodash.flattendeep": "4.4.0", - "md5-hex": "2.0.0", - "release-zalgo": "1.0.0" + "graceful-fs": "^4.1.11", + "lodash.flattendeep": "^4.4.0", + "md5-hex": "^2.0.0", + "release-zalgo": "^1.0.0" } }, "package-json": { @@ -10410,10 +10400,10 @@ "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", "dev": true, "requires": { - "got": "6.7.1", - "registry-auth-token": "3.3.2", - "registry-url": "3.1.0", - "semver": "5.5.0" + "got": "^6.7.1", + "registry-auth-token": "^3.0.1", + "registry-url": "^3.0.3", + "semver": "^5.1.0" }, "dependencies": { "got": { @@ -10422,17 +10412,17 @@ "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { - "create-error-class": "3.0.2", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "is-redirect": "1.0.0", - "is-retry-allowed": "1.1.0", - "is-stream": "1.1.0", - "lowercase-keys": "1.0.1", - "safe-buffer": "5.1.2", - "timed-out": "4.0.1", - "unzip-response": "2.0.1", - "url-parse-lax": "1.0.0" + "create-error-class": "^3.0.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-redirect": "^1.0.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "lowercase-keys": "^1.0.0", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "unzip-response": "^2.0.1", + "url-parse-lax": "^1.0.0" } } } @@ -10443,10 +10433,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" }, "dependencies": { "is-extglob": { @@ -10461,7 +10451,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } } } @@ -10472,7 +10462,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "parse-ms": { @@ -10542,7 +10532,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "performance-now": { @@ -10567,7 +10557,7 @@ "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", "dev": true, "requires": { - "pinkie": "1.0.0" + "pinkie": "^1.0.0" } }, "pkg-conf": { @@ -10576,8 +10566,8 @@ "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", "dev": true, "requires": { - "find-up": "2.1.0", - "load-json-file": "4.0.0" + "find-up": "^2.0.0", + "load-json-file": "^4.0.0" }, "dependencies": { "load-json-file": { @@ -10586,10 +10576,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "4.0.0", - "pify": "3.0.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" } }, "parse-json": { @@ -10598,8 +10588,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } } } @@ -10610,7 +10600,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "2.1.0" + "find-up": "^2.1.0" } }, "plur": { @@ -10619,7 +10609,7 @@ "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", "dev": true, "requires": { - "irregular-plurals": "1.4.0" + "irregular-plurals": "^1.0.0" } }, "pluralize": { @@ -10639,9 +10629,9 @@ "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "2.4.1", - "source-map": "0.6.1", - "supports-color": "5.4.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" }, "dependencies": { "source-map": { @@ -10657,11 +10647,11 @@ "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.6.0.tgz", "integrity": "sha512-nDb6a+p2C7Wj8Y2zmFtLpuv+xobXz4+bzT5s7dr0nn71tLozn7nRMQqzwbefzwZN5qOm0N7Cxhw4kXP75xboKA==", "requires": { - "define-properties": "1.1.2", - "empower": "1.3.0", - "power-assert-formatter": "1.4.1", - "universal-deep-strict-equal": "1.2.2", - "xtend": "4.0.1" + "define-properties": "^1.1.2", + "empower": "^1.3.0", + "power-assert-formatter": "^1.4.1", + "universal-deep-strict-equal": "^1.2.1", + "xtend": "^4.0.0" } }, "power-assert-context-formatter": { @@ -10669,8 +10659,8 @@ "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.2.0.tgz", "integrity": "sha512-HLNEW8Bin+BFCpk/zbyKwkEu9W8/zThIStxGo7weYcFkKgMuGCHUJhvJeBGXDZf0Qm2xis4pbnnciGZiX0EpSg==", "requires": { - "core-js": "2.5.7", - "power-assert-context-traversal": "1.2.0" + "core-js": "^2.0.0", + "power-assert-context-traversal": "^1.2.0" } }, "power-assert-context-reducer-ast": { @@ -10678,11 +10668,11 @@ "resolved": "https://registry.npmjs.org/power-assert-context-reducer-ast/-/power-assert-context-reducer-ast-1.2.0.tgz", "integrity": "sha512-EgOxmZ/Lb7tw4EwSKX7ZnfC0P/qRZFEG28dx/690qvhmOJ6hgThYFm5TUWANDLK5NiNKlPBi5WekVGd2+5wPrw==", "requires": { - "acorn": "5.7.1", - "acorn-es7-plugin": "1.1.7", - "core-js": "2.5.7", - "espurify": "1.8.0", - "estraverse": "4.2.0" + "acorn": "^5.0.0", + "acorn-es7-plugin": "^1.0.12", + "core-js": "^2.0.0", + "espurify": "^1.6.0", + "estraverse": "^4.2.0" } }, "power-assert-context-traversal": { @@ -10690,8 +10680,8 @@ "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.2.0.tgz", "integrity": "sha512-NFoHU6g2umNajiP2l4qb0BRWD773Aw9uWdWYH9EQsVwIZnog5bd2YYLFCVvaxWpwNzWeEfZIon2xtyc63026pQ==", "requires": { - "core-js": "2.5.7", - "estraverse": "4.2.0" + "core-js": "^2.0.0", + "estraverse": "^4.1.0" } }, "power-assert-formatter": { @@ -10699,13 +10689,13 @@ "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", "requires": { - "core-js": "2.5.7", - "power-assert-context-formatter": "1.2.0", - "power-assert-context-reducer-ast": "1.2.0", - "power-assert-renderer-assertion": "1.2.0", - "power-assert-renderer-comparison": "1.2.0", - "power-assert-renderer-diagram": "1.2.0", - "power-assert-renderer-file": "1.2.0" + "core-js": "^2.0.0", + "power-assert-context-formatter": "^1.0.7", + "power-assert-context-reducer-ast": "^1.0.7", + "power-assert-renderer-assertion": "^1.0.7", + "power-assert-renderer-comparison": "^1.0.7", + "power-assert-renderer-diagram": "^1.0.7", + "power-assert-renderer-file": "^1.0.7" } }, "power-assert-renderer-assertion": { @@ -10713,8 +10703,8 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.2.0.tgz", "integrity": "sha512-3F7Q1ZLmV2ZCQv7aV7NJLNK9G7QsostrhOU7U0RhEQS/0vhEqrRg2jEJl1jtUL4ZyL2dXUlaaqrmPv5r9kRvIg==", "requires": { - "power-assert-renderer-base": "1.1.1", - "power-assert-util-string-width": "1.2.0" + "power-assert-renderer-base": "^1.1.1", + "power-assert-util-string-width": "^1.2.0" } }, "power-assert-renderer-base": { @@ -10727,11 +10717,11 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.2.0.tgz", "integrity": "sha512-7c3RKPDBKK4E3JqdPtYRE9cM8AyX4LC4yfTvvTYyx8zSqmT5kJnXwzR0yWQLOavACllZfwrAGQzFiXPc5sWa+g==", "requires": { - "core-js": "2.5.7", - "diff-match-patch": "1.0.1", - "power-assert-renderer-base": "1.1.1", - "stringifier": "1.3.0", - "type-name": "2.0.2" + "core-js": "^2.0.0", + "diff-match-patch": "^1.0.0", + "power-assert-renderer-base": "^1.1.1", + "stringifier": "^1.3.0", + "type-name": "^2.0.1" } }, "power-assert-renderer-diagram": { @@ -10739,10 +10729,10 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.2.0.tgz", "integrity": "sha512-JZ6PC+DJPQqfU6dwSmpcoD7gNnb/5U77bU5KgNwPPa+i1Pxiz6UuDeM3EUBlhZ1HvH9tMjI60anqVyi5l2oNdg==", "requires": { - "core-js": "2.5.7", - "power-assert-renderer-base": "1.1.1", - "power-assert-util-string-width": "1.2.0", - "stringifier": "1.3.0" + "core-js": "^2.0.0", + "power-assert-renderer-base": "^1.1.1", + "power-assert-util-string-width": "^1.2.0", + "stringifier": "^1.3.0" } }, "power-assert-renderer-file": { @@ -10750,7 +10740,7 @@ "resolved": "https://registry.npmjs.org/power-assert-renderer-file/-/power-assert-renderer-file-1.2.0.tgz", "integrity": "sha512-/oaVrRbeOtGoyyd7e4IdLP/jIIUFJdqJtsYzP9/88R39CMnfF/S/rUc8ZQalENfUfQ/wQHu+XZYRMaCEZmEesg==", "requires": { - "power-assert-renderer-base": "1.1.1" + "power-assert-renderer-base": "^1.1.1" } }, "power-assert-util-string-width": { @@ -10758,7 +10748,7 @@ "resolved": "https://registry.npmjs.org/power-assert-util-string-width/-/power-assert-util-string-width-1.2.0.tgz", "integrity": "sha512-lX90G0igAW0iyORTILZ/QjZWsa1MZ6VVY3L0K86e2eKun3S4LKPH4xZIl8fdeMYLfOjkaszbNSzf1uugLeAm2A==", "requires": { - "eastasianwidth": "0.2.0" + "eastasianwidth": "^0.2.0" } }, "prelude-ls": { @@ -10791,7 +10781,7 @@ "integrity": "sha512-ZypexbfVUGTFxb0v+m1bUyy92DHe5SyYlnyY0msyms5zd3RwyvNgyxZZsXXgoyzlxjx5MiqtXUdhUfvQbe0A2Q==", "dev": true, "requires": { - "parse-ms": "1.0.1" + "parse-ms": "^1.0.0" }, "dependencies": { "parse-ms": { @@ -10824,19 +10814,19 @@ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", "requires": { - "@protobufjs/aspromise": "1.1.2", - "@protobufjs/base64": "1.1.2", - "@protobufjs/codegen": "2.0.4", - "@protobufjs/eventemitter": "1.1.0", - "@protobufjs/fetch": "1.1.0", - "@protobufjs/float": "1.0.2", - "@protobufjs/inquire": "1.1.0", - "@protobufjs/path": "1.1.2", - "@protobufjs/pool": "1.1.0", - "@protobufjs/utf8": "1.1.0", - "@types/long": "3.0.32", - "@types/node": "8.10.20", - "long": "4.0.0" + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^3.0.32", + "@types/node": "^8.9.4", + "long": "^4.0.0" }, "dependencies": { "@types/node": { @@ -10852,9 +10842,9 @@ "integrity": "sha512-fQr3VQrbdzHrdaDn3XuisVoJlJNDJizHAvUXw9IuXRR8BpV2x0N7LsCxrpJkeKfPbNjiNU/V5vc008cI0TmzzQ==", "dev": true, "requires": { - "fill-keys": "1.0.2", - "module-not-found-error": "1.0.1", - "resolve": "1.5.0" + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.0", + "resolve": "~1.5.0" }, "dependencies": { "resolve": { @@ -10863,7 +10853,7 @@ "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } } } @@ -10889,9 +10879,9 @@ "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", "dev": true, "requires": { - "decode-uri-component": "0.2.0", - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" + "decode-uri-component": "^0.2.0", + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" } }, "randomatic": { @@ -10900,9 +10890,9 @@ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { @@ -10919,10 +10909,10 @@ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "requires": { - "deep-extend": "0.6.0", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -10939,9 +10929,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" }, "dependencies": { "path-type": { @@ -10950,7 +10940,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.0.0" } }, "pify": { @@ -10967,8 +10957,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" } }, "readable-stream": { @@ -10976,13 +10966,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -10991,10 +10981,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2", + "set-immediate-shim": "^1.0.1" } }, "redent": { @@ -11003,8 +10993,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" }, "dependencies": { "indent-string": { @@ -11013,7 +11003,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } } } @@ -11036,7 +11026,7 @@ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "regex-not": { @@ -11044,8 +11034,8 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "regexp.prototype.flags": { @@ -11054,7 +11044,7 @@ "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", "dev": true, "requires": { - "define-properties": "1.1.2" + "define-properties": "^1.1.2" } }, "regexpp": { @@ -11069,9 +11059,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "registry-auth-token": { @@ -11080,8 +11070,8 @@ "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { - "rc": "1.2.8", - "safe-buffer": "5.1.2" + "rc": "^1.1.6", + "safe-buffer": "^5.0.1" } }, "registry-url": { @@ -11090,7 +11080,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "1.2.8" + "rc": "^1.0.1" } }, "regjsgen": { @@ -11105,7 +11095,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" } }, "release-zalgo": { @@ -11114,7 +11104,7 @@ "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", "dev": true, "requires": { - "es6-error": "4.1.1" + "es6-error": "^4.0.1" } }, "remove-trailing-separator": { @@ -11139,7 +11129,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "request": { @@ -11147,26 +11137,26 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.3.0" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "require-directory": { @@ -11193,8 +11183,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "0.1.0", - "resolve-from": "1.0.1" + "caller-path": "^0.1.0", + "resolve-from": "^1.0.0" }, "dependencies": { "resolve-from": { @@ -11211,7 +11201,7 @@ "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", "dev": true, "requires": { - "underscore": "1.6.0" + "underscore": "~1.6.0" }, "dependencies": { "underscore": { @@ -11234,7 +11224,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-from": { @@ -11254,7 +11244,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "1.0.1" + "lowercase-keys": "^1.0.0" } }, "restore-cursor": { @@ -11263,8 +11253,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" } }, "ret": { @@ -11278,12 +11268,11 @@ "integrity": "sha512-jp4YlI0qyDFfXiXGhkCOliBN1G7fRH03Nqy8YdShzGqbY5/9S2x/IR6C88ls2DFkbWuL3ASkP7QD3pVrNpPgwQ==" }, "retry-request": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-3.3.2.tgz", - "integrity": "sha512-WIiGp37XXDC6e7ku3LFoi7LCL/Gs9luGeeqvbPRb+Zl6OQMw4RCRfSaW+aLfE6lhz1R941UavE6Svl3Dm5xGIQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.0.0.tgz", + "integrity": "sha512-S4HNLaWcMP6r8E4TMH52Y7/pM8uNayOcTDDQNBwsCccL1uI+Ol2TljxRDPzaNfbhOB30+XWP5NnZkB3LiJxi1w==", "requires": { - "request": "2.87.0", - "through2": "2.0.3" + "through2": "^2.0.0" } }, "right-align": { @@ -11293,7 +11282,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -11302,7 +11291,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "run-async": { @@ -11311,7 +11300,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "2.1.0" + "is-promise": "^2.1.0" } }, "rxjs": { @@ -11341,7 +11330,7 @@ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -11361,16 +11350,16 @@ "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", "dev": true, "requires": { - "chalk": "2.4.1", - "htmlparser2": "3.9.2", - "lodash.clonedeep": "4.5.0", - "lodash.escaperegexp": "4.1.2", - "lodash.isplainobject": "4.0.6", - "lodash.isstring": "4.0.1", - "lodash.mergewith": "4.6.1", - "postcss": "6.0.23", - "srcset": "1.0.0", - "xtend": "4.0.1" + "chalk": "^2.3.0", + "htmlparser2": "^3.9.0", + "lodash.clonedeep": "^4.5.0", + "lodash.escaperegexp": "^4.1.2", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.mergewith": "^4.6.0", + "postcss": "^6.0.14", + "srcset": "^1.0.0", + "xtend": "^4.0.0" } }, "semver": { @@ -11385,7 +11374,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "5.5.0" + "semver": "^5.0.3" } }, "serialize-error": { @@ -11411,10 +11400,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -11422,7 +11411,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11433,7 +11422,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -11454,13 +11443,13 @@ "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", "dev": true, "requires": { - "@sinonjs/formatio": "2.0.0", - "diff": "3.5.0", - "lodash.get": "4.4.2", - "lolex": "2.7.0", - "nise": "1.4.2", - "supports-color": "5.4.0", - "type-detect": "4.0.8" + "@sinonjs/formatio": "^2.0.0", + "diff": "^3.1.0", + "lodash.get": "^4.4.2", + "lolex": "^2.2.0", + "nise": "^1.2.0", + "supports-color": "^5.1.0", + "type-detect": "^4.0.5" } }, "slash": { @@ -11474,7 +11463,7 @@ "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0" + "is-fullwidth-code-point": "^2.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -11496,14 +11485,14 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.0" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "debug": { @@ -11519,7 +11508,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -11527,7 +11516,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11537,9 +11526,9 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -11547,7 +11536,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -11555,7 +11544,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -11563,7 +11552,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -11571,9 +11560,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -11583,7 +11572,7 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { @@ -11591,7 +11580,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11602,7 +11591,7 @@ "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", "dev": true, "requires": { - "is-plain-obj": "1.1.0" + "is-plain-obj": "^1.0.0" } }, "source-map": { @@ -11615,11 +11604,11 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -11628,8 +11617,8 @@ "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "dev": true, "requires": { - "buffer-from": "1.1.0", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -11651,8 +11640,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -11667,8 +11656,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -11682,7 +11671,7 @@ "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz", "integrity": "sha512-hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg==", "requires": { - "is-stream-ended": "0.1.4" + "is-stream-ended": "^0.1.4" } }, "split-string": { @@ -11690,7 +11679,7 @@ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { @@ -11705,8 +11694,8 @@ "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=", "dev": true, "requires": { - "array-uniq": "1.0.3", - "number-is-nan": "1.0.1" + "array-uniq": "^1.0.2", + "number-is-nan": "^1.0.0" } }, "sshpk": { @@ -11714,15 +11703,15 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "stack-utils": { @@ -11736,8 +11725,8 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -11745,7 +11734,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -11755,7 +11744,7 @@ "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.4.tgz", "integrity": "sha512-D243NJaYs/xBN2QnoiMDY7IesJFIK7gEhnvAYqJa5JvDdnh2dC4qDBwlCf0ohPpX2QRlA/4gnbnPd3rs3KxVcA==", "requires": { - "stubs": "3.0.0" + "stubs": "^3.0.0" } }, "stream-shift": { @@ -11780,9 +11769,9 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string.prototype.matchall": { @@ -11791,11 +11780,11 @@ "integrity": "sha512-WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q==", "dev": true, "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.12.0", - "function-bind": "1.1.1", - "has-symbols": "1.0.0", - "regexp.prototype.flags": "1.2.0" + "define-properties": "^1.1.2", + "es-abstract": "^1.10.0", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "regexp.prototype.flags": "^1.2.0" } }, "string_decoder": { @@ -11803,7 +11792,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "stringifier": { @@ -11811,9 +11800,9 @@ "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", "requires": { - "core-js": "2.5.7", - "traverse": "0.6.6", - "type-name": "2.0.2" + "core-js": "^2.0.0", + "traverse": "^0.6.6", + "type-name": "^2.0.1" } }, "strip-ansi": { @@ -11821,7 +11810,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -11836,7 +11825,7 @@ "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.1" } }, "strip-eof": { @@ -11851,7 +11840,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "strip-json-comments": { @@ -11871,16 +11860,16 @@ "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", "dev": true, "requires": { - "component-emitter": "1.2.1", - "cookiejar": "2.1.2", - "debug": "3.1.0", - "extend": "3.0.1", - "form-data": "2.3.2", - "formidable": "1.2.1", - "methods": "1.1.2", - "mime": "1.6.0", - "qs": "6.5.2", - "readable-stream": "2.3.6" + "component-emitter": "^1.2.0", + "cookiejar": "^2.1.0", + "debug": "^3.1.0", + "extend": "^3.0.0", + "form-data": "^2.3.1", + "formidable": "^1.2.0", + "methods": "^1.1.1", + "mime": "^1.4.1", + "qs": "^6.5.1", + "readable-stream": "^2.3.5" }, "dependencies": { "mime": { @@ -11897,11 +11886,11 @@ "integrity": "sha512-HZJ3geIMPgVwKk2VsmO5YHqnnJYl6bV5A9JW2uzqV43WmpgliNEYbuvukfor7URpaqpxuw3CfZ3ONdVbZjCgIA==", "dev": true, "requires": { - "arrify": "1.0.1", - "indent-string": "3.2.0", - "js-yaml": "3.12.0", - "serialize-error": "2.1.0", - "strip-ansi": "4.0.0" + "arrify": "^1.0.1", + "indent-string": "^3.2.0", + "js-yaml": "^3.10.0", + "serialize-error": "^2.1.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -11916,7 +11905,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -11927,8 +11916,8 @@ "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=", "dev": true, "requires": { - "methods": "1.1.2", - "superagent": "3.8.3" + "methods": "~1.1.2", + "superagent": "^3.0.0" } }, "supports-color": { @@ -11937,7 +11926,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" }, "dependencies": { "has-flag": { @@ -11960,24 +11949,24 @@ "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==", "dev": true, "requires": { - "ajv": "6.5.1", - "ajv-keywords": "3.2.0", - "chalk": "2.4.1", - "lodash": "4.17.10", + "ajv": "^6.0.1", + "ajv-keywords": "^3.0.0", + "chalk": "^2.1.0", + "lodash": "^4.17.4", "slice-ansi": "1.0.0", - "string-width": "2.1.1" + "string-width": "^2.1.1" }, "dependencies": { "ajv": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.1.tgz", - "integrity": "sha512-pgZos1vgOHDiC7gKNbZW8eKvCnNXARv2oqrGQT7Hzbq5Azp7aZG6DJzADnkuSq7RH6qkXp4J/m68yPX/2uBHyQ==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", + "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", "dev": true, "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.1" } }, "ansi-regex": { @@ -12010,8 +11999,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -12020,7 +12009,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12037,7 +12026,7 @@ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", "dev": true, "requires": { - "execa": "0.7.0" + "execa": "^0.7.0" } }, "text-encoding": { @@ -12063,8 +12052,8 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } }, "time-zone": { @@ -12085,7 +12074,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-fast-properties": { @@ -12099,7 +12088,7 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -12107,7 +12096,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -12117,10 +12106,10 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -12128,8 +12117,8 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "tough-cookie": { @@ -12137,7 +12126,7 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "traverse": { @@ -12168,7 +12157,7 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -12183,7 +12172,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-detect": { @@ -12204,9 +12193,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "camelcase": { @@ -12223,8 +12212,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" } }, @@ -12249,9 +12238,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" } } @@ -12298,10 +12287,10 @@ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" }, "dependencies": { "extend-shallow": { @@ -12309,7 +12298,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "set-value": { @@ -12317,10 +12306,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" } } } @@ -12331,7 +12320,7 @@ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", "dev": true, "requires": { - "crypto-random-string": "1.0.0" + "crypto-random-string": "^1.0.0" } }, "unique-temp-dir": { @@ -12340,8 +12329,8 @@ "integrity": "sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U=", "dev": true, "requires": { - "mkdirp": "0.5.1", - "os-tmpdir": "1.0.2", + "mkdirp": "^0.5.1", + "os-tmpdir": "^1.0.1", "uid2": "0.0.3" } }, @@ -12350,9 +12339,9 @@ "resolved": "https://registry.npmjs.org/universal-deep-strict-equal/-/universal-deep-strict-equal-1.2.2.tgz", "integrity": "sha1-DaSsL3PP95JMgfpN4BjKViyisKc=", "requires": { - "array-filter": "1.0.0", + "array-filter": "^1.0.0", "indexof": "0.0.1", - "object-keys": "1.0.12" + "object-keys": "^1.0.0" } }, "universalify": { @@ -12366,8 +12355,8 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -12375,9 +12364,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -12409,16 +12398,16 @@ "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { - "boxen": "1.3.0", - "chalk": "2.4.1", - "configstore": "3.1.2", - "import-lazy": "2.1.0", - "is-ci": "1.1.0", - "is-installed-globally": "0.1.0", - "is-npm": "1.0.0", - "latest-version": "3.1.0", - "semver-diff": "2.1.0", - "xdg-basedir": "3.0.0" + "boxen": "^1.2.1", + "chalk": "^2.0.1", + "configstore": "^3.0.0", + "import-lazy": "^2.1.0", + "is-ci": "^1.0.10", + "is-installed-globally": "^0.1.0", + "is-npm": "^1.0.0", + "latest-version": "^3.0.0", + "semver-diff": "^2.0.0", + "xdg-basedir": "^3.0.0" } }, "uri-js": { @@ -12427,7 +12416,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" }, "dependencies": { "punycode": { @@ -12449,7 +12438,7 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "prepend-http": "1.0.4" + "prepend-http": "^1.0.1" } }, "url-to-options": { @@ -12469,7 +12458,7 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { - "kind-of": "6.0.2" + "kind-of": "^6.0.2" } }, "util-deprecate": { @@ -12478,9 +12467,9 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz", - "integrity": "sha512-ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw==" + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, "validate-npm-package-license": { "version": "3.0.3", @@ -12488,8 +12477,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "verror": { @@ -12497,9 +12486,9 @@ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "well-known-symbols": { @@ -12514,7 +12503,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -12529,7 +12518,7 @@ "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", "dev": true, "requires": { - "string-width": "2.1.1" + "string-width": "^2.1.1" }, "dependencies": { "ansi-regex": { @@ -12550,8 +12539,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -12560,7 +12549,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12581,8 +12570,8 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -12596,7 +12585,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "0.5.1" + "mkdirp": "^0.5.1" } }, "write-file-atomic": { @@ -12605,9 +12594,9 @@ "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "signal-exit": "3.0.2" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" } }, "write-json-file": { @@ -12616,12 +12605,12 @@ "integrity": "sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=", "dev": true, "requires": { - "detect-indent": "5.0.0", - "graceful-fs": "4.1.11", - "make-dir": "1.3.0", - "pify": "3.0.0", - "sort-keys": "2.0.0", - "write-file-atomic": "2.3.0" + "detect-indent": "^5.0.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "pify": "^3.0.0", + "sort-keys": "^2.0.0", + "write-file-atomic": "^2.0.0" }, "dependencies": { "detect-indent": { @@ -12638,8 +12627,8 @@ "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==", "dev": true, "requires": { - "sort-keys": "2.0.0", - "write-json-file": "2.3.0" + "sort-keys": "^2.0.0", + "write-json-file": "^2.2.0" } }, "xdg-basedir": { @@ -12674,13 +12663,13 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "requires": { - "camelcase": "2.1.1", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "os-locale": "1.4.0", - "string-width": "1.0.2", - "window-size": "0.1.4", - "y18n": "3.2.1" + "camelcase": "^2.0.1", + "cliui": "^3.0.3", + "decamelize": "^1.1.1", + "os-locale": "^1.4.0", + "string-width": "^1.0.1", + "window-size": "^0.1.4", + "y18n": "^3.2.0" } }, "yargs-parser": { @@ -12689,7 +12678,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { From c2ec390b1350d89fe58d3c514cd00ce7ed511a35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 2 Jul 2018 22:25:12 -0700 Subject: [PATCH 0171/1115] chore(deps): lock file maintenance (#167) --- handwritten/pubsub/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 8942b332952..2d15709dd91 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -6856,9 +6856,9 @@ } }, "is-callable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", - "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", "dev": true }, "is-ci": { From dab452531e8497a1efd2445477b992d8c167f29b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 9 Jul 2018 19:41:02 -0700 Subject: [PATCH 0172/1115] chore(deps): lock file maintenance (#172) --- handwritten/pubsub/package-lock.json | 97 ++++++++++++++++------------ 1 file changed, 57 insertions(+), 40 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 2d15709dd91..f418303aba4 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -2099,9 +2099,9 @@ "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" }, "@types/node": { - "version": "10.5.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz", - "integrity": "sha512-AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ==" + "version": "10.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz", + "integrity": "sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q==" }, "@types/request": { "version": "2.47.1", @@ -3715,14 +3715,15 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "codecov": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.2.tgz", - "integrity": "sha512-9ljtIROIjPIUmMRqO+XuDITDoV8xRrZmA0jcEq6p2hg2+wY9wGmLfreAZGIL72IzUfdEDZaU8+Vjidg1fBQ8GQ==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.4.tgz", + "integrity": "sha512-KJyzHdg9B8U9LxXa7hS6jnEW5b1cNckLYc2YpnJ1nEFiOW+/iSzDHp+5MYEIQd9fN3/tC6WmGZmYiwxzkuGp/A==", "dev": true, "requires": { - "argv": "0.0.2", - "request": "^2.81.0", - "urlgrey": "0.4.4" + "argv": "^0.0.2", + "ignore-walk": "^3.0.1", + "request": "^2.87.0", + "urlgrey": "^0.4.4" } }, "collection-visit": { @@ -4450,9 +4451,9 @@ } }, "eslint": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz", - "integrity": "sha512-D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz", + "integrity": "sha512-DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw==", "dev": true, "requires": { "ajv": "^6.5.0", @@ -4462,6 +4463,7 @@ "debug": "^3.1.0", "doctrine": "^2.1.0", "eslint-scope": "^4.0.0", + "eslint-utils": "^1.3.1", "eslint-visitor-keys": "^1.0.0", "espree": "^4.0.0", "esquery": "^1.0.1", @@ -4469,7 +4471,7 @@ "file-entry-cache": "^2.0.0", "functional-red-black-tree": "^1.0.1", "glob": "^7.1.2", - "globals": "^11.5.0", + "globals": "^11.7.0", "ignore": "^3.3.3", "imurmurhash": "^0.1.4", "inquirer": "^5.2.0", @@ -4596,9 +4598,9 @@ } }, "eslint-plugin-prettier": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.1.tgz", - "integrity": "sha512-wNZ2z0oVCWnf+3BSI7roS+z4gGu2AwcPKUek+SlLZMZg+X0KbZLsB2knul7fd0K3iuIp402HIYzm4f2+OyfXxA==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.2.tgz", + "integrity": "sha512-tGek5clmW5swrAx1mdPYM8oThrBE83ePh7LeseZHBWfHVGrHPhKn7Y5zgRMbU/9D5Td9K4CEmUPjGxA7iw98Og==", "dev": true, "requires": { "fast-diff": "^1.1.1", @@ -4615,6 +4617,12 @@ "estraverse": "^4.1.1" } }, + "eslint-utils": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", + "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", + "dev": true + }, "eslint-visitor-keys": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", @@ -5092,9 +5100,9 @@ "dev": true }, "follow-redirects": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", - "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.1.tgz", + "integrity": "sha512-v9GI1hpaqq1ZZR6pBD1+kI7O24PhDvNGNodjS3MdcEqyrahCp8zbtpv+2B/krUnSmUH80lbAS7MrdeK5IylgKg==", "requires": { "debug": "^3.1.0" } @@ -5986,9 +5994,9 @@ "dev": true }, "grpc": { - "version": "1.12.4", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.12.4.tgz", - "integrity": "sha512-t0Hy4yoHHYLkK0b+ULTHw5ZuSFmWokCABY0C4bKQbE4jnm1hpjA23cQVD0xAqDcRHN5CkvFzlqb34ngV22dqoQ==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.13.0.tgz", + "integrity": "sha512-jGxWFYzttSz9pi8mu283jZvo2zIluWonQ918GMHKx8grT57GIVlvx7/82fo7AGS75lbkPoO1T6PZLvCRD9Pbtw==", "requires": { "lodash": "^4.17.5", "nan": "^2.0.0", @@ -6202,7 +6210,7 @@ } }, "node-pre-gyp": { - "version": "0.10.0", + "version": "0.10.2", "bundled": true, "requires": { "detect-libc": "^1.0.2", @@ -6211,7 +6219,7 @@ "nopt": "^4.0.1", "npm-packlist": "^1.1.6", "npmlog": "^4.0.2", - "rc": "^1.1.7", + "rc": "^1.2.7", "rimraf": "^2.6.1", "semver": "^5.3.0", "tar": "^4" @@ -6570,9 +6578,9 @@ } }, "hosted-git-info": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz", - "integrity": "sha512-Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", + "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", "dev": true }, "htmlparser2": { @@ -6647,6 +6655,15 @@ "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", "dev": true }, + "ignore-walk": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "dev": true, + "requires": { + "minimatch": "^3.0.4" + } + }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -7172,15 +7189,15 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "istanbul-lib-coverage": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz", - "integrity": "sha512-yMSw5xLIbdaxiVXHk3amfNM2WeBxLrwH/BCyZ9HvA/fylwziAIJOG2rKqWyLqEJqwKT725vxxqidv+SyynnGAA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", + "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", "dev": true }, "istanbul-lib-instrument": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.0.tgz", - "integrity": "sha512-Ie1LGWJVCFDDJKKH4g1ffpFcZTEXEd6ay5l9fE8539y4qPErJnzo4psnGzDH92tcKvdUDdbxrKySYIbt6zB9hw==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.1.tgz", + "integrity": "sha512-h9Vg3nfbxrF0PK0kZiNiMAyL8zXaLiBP/BXniaKSwVvAi1TaumYV2b0wPdmy1CRX3irYbYD1p4Wjbv4uyECiiQ==", "dev": true, "requires": { "@babel/generator": "7.0.0-beta.51", @@ -7188,7 +7205,7 @@ "@babel/template": "7.0.0-beta.51", "@babel/traverse": "7.0.0-beta.51", "@babel/types": "7.0.0-beta.51", - "istanbul-lib-coverage": "^2.0.0", + "istanbul-lib-coverage": "^2.0.1", "semver": "^5.5.0" } }, @@ -7551,9 +7568,9 @@ "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" }, "lolex": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz", - "integrity": "sha512-uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.1.tgz", + "integrity": "sha512-Oo2Si3RMKV3+lV5MsSWplDQFoTClz/24S0MMHYcgGWWmFXr6TMlqcqk/l1GtH+d5wLBwNRiqGnwDRMirtFalJw==", "dev": true }, "long": { @@ -10830,9 +10847,9 @@ }, "dependencies": { "@types/node": { - "version": "8.10.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz", - "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==" + "version": "8.10.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.21.tgz", + "integrity": "sha512-87XkD9qDXm8fIax+5y7drx84cXsu34ZZqfB7Cial3Q/2lxSoJ/+DRaWckkCbxP41wFSIrrb939VhzaNxj4eY1w==" } } }, From 72f659ba3da33b3cc21314e78bb0af9df00fd72c Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 9 Jul 2018 22:12:30 -0700 Subject: [PATCH 0173/1115] fix: drop support for node.js 4.x and 9.x (#171) --- handwritten/pubsub/.circleci/config.yml | 43 ++++--------------------- handwritten/pubsub/package.json | 2 +- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 4dd5e051e20..3d3dc46400c 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -3,10 +3,6 @@ workflows: version: 2 tests: jobs: &workflow_jobs - - node4: - filters: - tags: - only: /.*/ - node6: filters: tags: @@ -15,30 +11,22 @@ workflows: filters: tags: only: /.*/ - - node9: - filters: - tags: - only: /.*/ - node10: filters: tags: only: /.*/ - lint: requires: - - node4 - node6 - node8 - - node9 - node10 filters: tags: only: /.*/ - docs: requires: - - node4 - node6 - node8 - - node9 - node10 filters: tags: @@ -79,9 +67,9 @@ workflows: only: master jobs: *workflow_jobs jobs: - node4: + node6: docker: - - image: 'node:4' + - image: 'node:6' user: node steps: &unit_tests_steps - checkout @@ -103,28 +91,13 @@ jobs: npm install environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - - run: - name: Run unit tests. - command: npm test - - run: - name: Submit coverage data to codecov. - command: node_modules/.bin/codecov - when: always - node6: - docker: - - image: 'node:6' - user: node - steps: *unit_tests_steps + - run: npm test + - run: node_modules/.bin/codecov node8: docker: - image: 'node:8' user: node steps: *unit_tests_steps - node9: - docker: - - image: 'node:9' - user: node - steps: *unit_tests_steps node10: docker: - image: 'node:10' @@ -218,9 +191,5 @@ jobs: user: node steps: - checkout - - run: - name: Set NPM authentication. - command: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc' - - run: - name: Publish the module to npm. - command: npm publish + - run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc' + - run: npm publish diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c334ffcb3c1..3052c3c014f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "author": "Google Inc.", "engines": { - "node": ">=4.0.0" + "node": ">=6.0.0" }, "repository": "googleapis/nodejs-pubsub", "main": "./src/index.js", From e40ec4196fc36f0b6a54b02beb77a8fe4b7676c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 10 Jul 2018 08:07:02 -0700 Subject: [PATCH 0174/1115] chore(deps): lock file maintenance (#173) --- handwritten/pubsub/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index f418303aba4..b83eefd8845 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -4719,9 +4719,9 @@ "dev": true }, "espurify": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.0.tgz", - "integrity": "sha512-jdkJG9jswjKCCDmEridNUuIQei9algr+o66ZZ19610ZoBsiWLRsQGNYS4HGez3Z/DsR0lhANGAqiwBUclPuNag==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.1.tgz", + "integrity": "sha512-ZDko6eY/o+D/gHCWyHTU85mKDgYcS4FJj7S+YD6WIInm7GQ6AnOjmcL4+buFV/JOztVLELi/7MmuGU5NHta0Mg==", "requires": { "core-js": "^2.0.0" } From 7d21f11beea1f49f8e595e0dc86774ccd7ed4110 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 10 Jul 2018 09:41:00 -0700 Subject: [PATCH 0175/1115] chore(deps): lock file maintenance (#174) --- handwritten/pubsub/package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index b83eefd8845..a0f20832057 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -7585,12 +7585,12 @@ "dev": true }, "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dev": true, "requires": { - "js-tokens": "^3.0.0" + "js-tokens": "^3.0.0 || ^4.0.0" } }, "loud-rejection": { From 2dc0b763602fab23d65aff928508a20466905124 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 10 Jul 2018 13:00:06 -0700 Subject: [PATCH 0176/1115] chore(build): use `npm ci` instead of `npm install` (#175) --- handwritten/pubsub/synth.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 20b8659813b..86ea8623c78 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -29,9 +29,7 @@ " };\n" "\g<0>") -# # Node.js specific cleanup -# -subprocess.run(['npm', 'install']) +subprocess.run(['npm', 'ci']) subprocess.run(['npm', 'run', 'prettier']) subprocess.run(['npm', 'run', 'lint']) From 8fe42a0539d83b21949bb17c53137d18909b0098 Mon Sep 17 00:00:00 2001 From: "Tejasvi (Teju) Nareddy" Date: Fri, 13 Jul 2018 09:18:05 -0700 Subject: [PATCH 0177/1115] Fixes 179: Adds missing return statement in docs (#180) Fixes #179 Added a missing return statement. This change should propagate to the auto-generated docs page. --- handwritten/pubsub/src/topic.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 3ac49bc04c8..259ce6f2dab 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -547,6 +547,8 @@ Topic.prototype.getSubscriptionsStream = common.paginator.streamify( * @param {number} [options.batching.maxMilliseconds] The maximum duration to * wait before sending a payload. * + * @return {Publisher} + * * @example * const PubSub = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); From df382b496721a4400bf4ca1255e1ce79e4c8e607 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 16 Jul 2018 19:09:54 -0700 Subject: [PATCH 0178/1115] chore(deps): lock file maintenance (#182) --- handwritten/pubsub/package-lock.json | 1308 ++++++++++++++++++++------ 1 file changed, 1005 insertions(+), 303 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index a0f20832057..293236c0d77 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -236,25 +236,25 @@ } }, "@google-cloud/nodejs-repo-tools": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.3.0.tgz", - "integrity": "sha512-c8dIGESnNkmM88duFxGHvMQP5QKPgp/sfJq0QhC6+gOcJC7/PKjqd0PkmgPPeIgVl6SXy5Zf/KLbxnJUVgNT1Q==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.3.1.tgz", + "integrity": "sha512-yIOn92sjHwpF/eORQWjv7QzQPcESSRCsZshdmeX40RGRlB0+HPODRDghZq0GiCqe6zpIYZvKmiKiYd3u52P/7Q==", "dev": true, "requires": { "ava": "0.25.0", "colors": "1.1.2", "fs-extra": "5.0.0", - "got": "8.2.0", + "got": "8.3.0", "handlebars": "4.0.11", "lodash": "4.17.5", - "nyc": "11.4.1", + "nyc": "11.7.2", "proxyquire": "1.8.0", "semver": "^5.5.0", - "sinon": "4.3.0", + "sinon": "6.0.1", "string": "3.3.3", - "supertest": "3.0.0", + "supertest": "3.1.0", "yargs": "11.0.0", - "yargs-parser": "9.0.2" + "yargs-parser": "10.1.0" }, "dependencies": { "ansi-regex": { @@ -263,6 +263,12 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, "cliui": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", @@ -287,37 +293,37 @@ "dev": true }, "nyc": { - "version": "11.4.1", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", - "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", + "version": "11.7.2", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.7.2.tgz", + "integrity": "sha512-gBt7qwsR1vryYfglVjQRx1D+AtMZW5NbUKxb+lZe8SN8KsheGCPGWEsSC9AGQG+r2+te1+10uPHUCahuqm1nGQ==", "dev": true, "requires": { "archy": "^1.0.0", "arrify": "^1.0.1", "caching-transform": "^1.0.0", - "convert-source-map": "^1.3.0", + "convert-source-map": "^1.5.1", "debug-log": "^1.0.1", "default-require-extensions": "^1.0.0", "find-cache-dir": "^0.1.1", "find-up": "^2.1.0", "foreground-child": "^1.5.3", "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.1.1", + "istanbul-lib-coverage": "^1.1.2", "istanbul-lib-hook": "^1.1.0", - "istanbul-lib-instrument": "^1.9.1", - "istanbul-lib-report": "^1.1.2", - "istanbul-lib-source-maps": "^1.2.2", - "istanbul-reports": "^1.1.3", + "istanbul-lib-instrument": "^1.10.0", + "istanbul-lib-report": "^1.1.3", + "istanbul-lib-source-maps": "^1.2.3", + "istanbul-reports": "^1.4.0", "md5-hex": "^1.2.0", - "merge-source-map": "^1.0.2", - "micromatch": "^2.3.11", + "merge-source-map": "^1.1.0", + "micromatch": "^3.1.10", "mkdirp": "^0.5.0", "resolve-from": "^2.0.0", - "rimraf": "^2.5.4", + "rimraf": "^2.6.2", "signal-exit": "^3.0.1", "spawn-wrap": "^1.4.2", - "test-exclude": "^4.1.1", - "yargs": "^10.0.3", + "test-exclude": "^4.2.0", + "yargs": "11.1.0", "yargs-parser": "^8.0.0" }, "dependencies": { @@ -360,20 +366,22 @@ "dev": true }, "arr-diff": { - "version": "2.0.0", + "version": "4.0.0", "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } + "dev": true }, "arr-flatten": { "version": "1.1.0", "bundled": true, "dev": true }, + "arr-union": { + "version": "3.1.0", + "bundled": true, + "dev": true + }, "array-unique": { - "version": "0.2.1", + "version": "0.3.2", "bundled": true, "dev": true }, @@ -382,11 +390,21 @@ "bundled": true, "dev": true }, + "assign-symbols": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, "async": { "version": "1.5.2", "bundled": true, "dev": true }, + "atob": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, "babel-code-frame": { "version": "6.26.0", "bundled": true, @@ -398,7 +416,7 @@ } }, "babel-generator": { - "version": "6.26.0", + "version": "6.26.1", "bundled": true, "dev": true, "requires": { @@ -408,7 +426,7 @@ "detect-indent": "^4.0.0", "jsesc": "^1.3.0", "lodash": "^4.17.4", - "source-map": "^0.5.6", + "source-map": "^0.5.7", "trim-right": "^1.0.1" } }, @@ -478,8 +496,63 @@ "bundled": true, "dev": true }, + "base": { + "version": "0.11.2", + "bundled": true, + "dev": true, + "requires": { + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, "brace-expansion": { - "version": "1.1.8", + "version": "1.1.11", "bundled": true, "dev": true, "requires": { @@ -488,13 +561,30 @@ } }, "braces": { - "version": "1.8.5", + "version": "2.3.2", "bundled": true, "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } } }, "builtin-modules": { @@ -502,6 +592,22 @@ "bundled": true, "dev": true }, + "cache-base": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + } + }, "caching-transform": { "version": "1.0.1", "bundled": true, @@ -540,6 +646,27 @@ "supports-color": "^2.0.0" } }, + "class-utils": { + "version": "0.3.6", + "bundled": true, + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, "cliui": { "version": "2.1.0", "bundled": true, @@ -564,11 +691,25 @@ "bundled": true, "dev": true }, + "collection-visit": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" + } + }, "commondir": { "version": "1.0.1", "bundled": true, "dev": true }, + "component-emitter": { + "version": "1.2.1", + "bundled": true, + "dev": true + }, "concat-map": { "version": "0.0.1", "bundled": true, @@ -579,8 +720,13 @@ "bundled": true, "dev": true }, + "copy-descriptor": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, "core-js": { - "version": "2.5.3", + "version": "2.5.6", "bundled": true, "dev": true }, @@ -611,6 +757,11 @@ "bundled": true, "dev": true }, + "decode-uri-component": { + "version": "0.2.0", + "bundled": true, + "dev": true + }, "default-require-extensions": { "version": "1.0.0", "bundled": true, @@ -619,6 +770,48 @@ "strip-bom": "^2.0.0" } }, + "define-property": { + "version": "2.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, "detect-indent": { "version": "4.0.0", "bundled": true, @@ -672,44 +865,139 @@ } }, "expand-brackets": { - "version": "0.1.5", + "version": "2.1.4", "bundled": true, "dev": true, "requires": { - "is-posix-bracket": "^0.1.0" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } } }, - "expand-range": { - "version": "1.8.2", + "extend-shallow": { + "version": "3.0.2", "bundled": true, "dev": true, "requires": { - "fill-range": "^2.1.0" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, "extglob": { - "version": "0.3.2", + "version": "2.0.4", "bundled": true, "dev": true, "requires": { - "is-extglob": "^1.0.0" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } } }, - "filename-regex": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, "fill-range": { - "version": "2.2.3", + "version": "4.0.0", "bundled": true, "dev": true, "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^1.1.3", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } } }, "find-cache-dir": { @@ -735,21 +1023,21 @@ "bundled": true, "dev": true }, - "for-own": { - "version": "0.1.5", + "foreground-child": { + "version": "1.5.6", "bundled": true, "dev": true, "requires": { - "for-in": "^1.0.1" + "cross-spawn": "^4", + "signal-exit": "^3.0.0" } }, - "foreground-child": { - "version": "1.5.6", + "fragment-cache": { + "version": "0.2.1", "bundled": true, "dev": true, "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" + "map-cache": "^0.2.2" } }, "fs.realpath": { @@ -767,6 +1055,11 @@ "bundled": true, "dev": true }, + "get-value": { + "version": "2.0.6", + "bundled": true, + "dev": true + }, "glob": { "version": "7.1.2", "bundled": true, @@ -780,23 +1073,6 @@ "path-is-absolute": "^1.0.0" } }, - "glob-base": { - "version": "0.3.0", - "bundled": true, - "dev": true, - "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" - } - }, - "glob-parent": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-glob": "^2.0.0" - } - }, "globals": { "version": "9.18.0", "bundled": true, @@ -841,8 +1117,37 @@ "bundled": true, "dev": true }, + "has-value": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + } + }, + "has-values": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "dependencies": { + "kind-of": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "hosted-git-info": { - "version": "2.5.0", + "version": "2.6.0", "bundled": true, "dev": true }, @@ -866,7 +1171,7 @@ "dev": true }, "invariant": { - "version": "2.2.2", + "version": "2.2.4", "bundled": true, "dev": true, "requires": { @@ -878,6 +1183,14 @@ "bundled": true, "dev": true }, + "is-accessor-descriptor": { + "version": "0.1.6", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } + }, "is-arrayish": { "version": "0.2.1", "bundled": true, @@ -896,17 +1209,29 @@ "builtin-modules": "^1.0.0" } }, - "is-dotfile": { - "version": "1.0.3", + "is-data-descriptor": { + "version": "0.1.4", "bundled": true, - "dev": true + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } }, - "is-equal-shallow": { - "version": "0.1.3", + "is-descriptor": { + "version": "0.1.6", "bundled": true, "dev": true, "requires": { - "is-primitive": "^2.0.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "bundled": true, + "dev": true + } } }, "is-extendable": { @@ -914,11 +1239,6 @@ "bundled": true, "dev": true }, - "is-extglob": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, "is-finite": { "version": "1.0.2", "bundled": true, @@ -928,39 +1248,41 @@ } }, "is-fullwidth-code-point": { - "version": "1.0.0", + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "is-number": { + "version": "3.0.0", "bundled": true, "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "kind-of": "^3.0.2" } }, - "is-glob": { - "version": "2.0.1", + "is-odd": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-number": "^4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "bundled": true, + "dev": true + } } }, - "is-number": { - "version": "2.1.0", + "is-plain-object": { + "version": "2.0.4", "bundled": true, "dev": true, "requires": { - "kind-of": "^3.0.2" + "isobject": "^3.0.1" } }, - "is-posix-bracket": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, "is-stream": { "version": "1.1.0", "bundled": true, @@ -971,6 +1293,11 @@ "bundled": true, "dev": true }, + "is-windows": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, "isarray": { "version": "1.0.0", "bundled": true, @@ -982,15 +1309,12 @@ "dev": true }, "isobject": { - "version": "2.1.0", + "version": "3.0.1", "bundled": true, - "dev": true, - "requires": { - "isarray": "1.0.0" - } + "dev": true }, "istanbul-lib-coverage": { - "version": "1.1.1", + "version": "1.2.0", "bundled": true, "dev": true }, @@ -1003,7 +1327,7 @@ } }, "istanbul-lib-instrument": { - "version": "1.9.1", + "version": "1.10.1", "bundled": true, "dev": true, "requires": { @@ -1012,16 +1336,16 @@ "babel-traverse": "^6.18.0", "babel-types": "^6.18.0", "babylon": "^6.18.0", - "istanbul-lib-coverage": "^1.1.1", + "istanbul-lib-coverage": "^1.2.0", "semver": "^5.3.0" } }, "istanbul-lib-report": { - "version": "1.1.2", + "version": "1.1.3", "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "^1.1.1", + "istanbul-lib-coverage": "^1.1.2", "mkdirp": "^0.5.1", "path-parse": "^1.0.5", "supports-color": "^3.1.2" @@ -1038,12 +1362,12 @@ } }, "istanbul-lib-source-maps": { - "version": "1.2.2", + "version": "1.2.3", "bundled": true, "dev": true, "requires": { "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.1.1", + "istanbul-lib-coverage": "^1.1.2", "mkdirp": "^0.5.1", "rimraf": "^2.6.1", "source-map": "^0.5.3" @@ -1060,7 +1384,7 @@ } }, "istanbul-reports": { - "version": "1.1.3", + "version": "1.4.0", "bundled": true, "dev": true, "requires": { @@ -1128,7 +1452,7 @@ } }, "lodash": { - "version": "4.17.4", + "version": "4.17.10", "bundled": true, "dev": true }, @@ -1146,7 +1470,7 @@ } }, "lru-cache": { - "version": "4.1.1", + "version": "4.1.3", "bundled": true, "dev": true, "requires": { @@ -1154,6 +1478,19 @@ "yallist": "^2.1.2" } }, + "map-cache": { + "version": "0.2.2", + "bundled": true, + "dev": true + }, + "map-visit": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "object-visit": "^1.0.0" + } + }, "md5-hex": { "version": "1.3.0", "bundled": true, @@ -1176,35 +1513,49 @@ } }, "merge-source-map": { - "version": "1.0.4", + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "bundled": true, + "dev": true + } } }, "micromatch": { - "version": "2.3.11", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "version": "3.1.10", + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } } }, "mimic-fn": { - "version": "1.1.0", + "version": "1.2.0", "bundled": true, "dev": true }, @@ -1221,6 +1572,25 @@ "bundled": true, "dev": true }, + "mixin-deep": { + "version": "1.3.1", + "bundled": true, + "dev": true, + "requires": { + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } + } + }, "mkdirp": { "version": "0.5.1", "bundled": true, @@ -1234,6 +1604,32 @@ "bundled": true, "dev": true }, + "nanomatch": { + "version": "1.2.9", + "bundled": true, + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-odd": "^2.0.0", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, "normalize-package-data": { "version": "2.4.0", "bundled": true, @@ -1245,14 +1641,6 @@ "validate-npm-package-license": "^3.0.1" } }, - "normalize-path": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, "npm-run-path": { "version": "2.0.2", "bundled": true, @@ -1271,13 +1659,40 @@ "bundled": true, "dev": true }, - "object.omit": { - "version": "2.0.1", + "object-copy": { + "version": "0.1.0", "bundled": true, "dev": true, "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, + "object-visit": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "isobject": "^3.0.0" + } + }, + "object.pick": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "isobject": "^3.0.1" } }, "once": { @@ -1318,9 +1733,12 @@ "dev": true }, "p-limit": { - "version": "1.1.0", + "version": "1.2.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "p-try": "^1.0.0" + } }, "p-locate": { "version": "2.0.0", @@ -1330,16 +1748,10 @@ "p-limit": "^1.1.0" } }, - "parse-glob": { - "version": "3.0.4", + "p-try": { + "version": "1.0.0", "bundled": true, - "dev": true, - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - } + "dev": true }, "parse-json": { "version": "2.2.0", @@ -1349,6 +1761,11 @@ "error-ex": "^1.2.0" } }, + "pascalcase": { + "version": "0.1.1", + "bundled": true, + "dev": true + }, "path-exists": { "version": "2.1.0", "bundled": true, @@ -1419,8 +1836,8 @@ } } }, - "preserve": { - "version": "0.2.0", + "posix-character-classes": { + "version": "0.1.1", "bundled": true, "dev": true }, @@ -1429,43 +1846,6 @@ "bundled": true, "dev": true }, - "randomatic": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, "read-pkg": { "version": "1.1.0", "bundled": true, @@ -1501,19 +1881,15 @@ "bundled": true, "dev": true }, - "regex-cache": { - "version": "0.4.4", + "regex-not": { + "version": "1.0.2", "bundled": true, "dev": true, "requires": { - "is-equal-shallow": "^0.1.3" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, - "remove-trailing-separator": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, "repeat-element": { "version": "1.1.2", "bundled": true, @@ -1547,6 +1923,16 @@ "bundled": true, "dev": true }, + "resolve-url": { + "version": "0.2.1", + "bundled": true, + "dev": true + }, + "ret": { + "version": "0.1.15", + "bundled": true, + "dev": true + }, "right-align": { "version": "0.1.3", "bundled": true, @@ -1564,16 +1950,45 @@ "glob": "^7.0.5" } }, - "semver": { - "version": "5.4.1", - "bundled": true, - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, + "safe-regex": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "requires": { + "ret": "~0.1.10" + } + }, + "semver": { + "version": "5.5.0", + "bundled": true, + "dev": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true + }, + "set-value": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, "shebang-command": { "version": "1.2.0", "bundled": true, @@ -1597,11 +2012,120 @@ "bundled": true, "dev": true }, + "snapdragon": { + "version": "0.8.2", + "bundled": true, + "dev": true, + "requires": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + }, + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^3.2.0" + } + }, "source-map": { "version": "0.5.7", "bundled": true, "dev": true }, + "source-map-resolve": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "atob": "^2.0.0", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "source-map-url": { + "version": "0.4.0", + "bundled": true, + "dev": true + }, "spawn-wrap": { "version": "1.4.2", "bundled": true, @@ -1616,23 +2140,60 @@ } }, "spdx-correct": { - "version": "1.0.2", + "version": "3.0.0", "bundled": true, "dev": true, "requires": { - "spdx-license-ids": "^1.0.2" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, - "spdx-expression-parse": { - "version": "1.0.4", + "spdx-exceptions": { + "version": "2.1.0", "bundled": true, "dev": true }, + "spdx-expression-parse": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, "spdx-license-ids": { - "version": "1.2.2", + "version": "3.0.0", "bundled": true, "dev": true }, + "split-string": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "extend-shallow": "^3.0.0" + } + }, + "static-extend": { + "version": "0.1.2", + "bundled": true, + "dev": true, + "requires": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "bundled": true, + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, "string-width": { "version": "2.1.1", "bundled": true, @@ -1647,11 +2208,6 @@ "bundled": true, "dev": true }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, "strip-ansi": { "version": "4.0.0", "bundled": true, @@ -1689,12 +2245,12 @@ "dev": true }, "test-exclude": { - "version": "4.1.1", + "version": "4.2.1", "bundled": true, "dev": true, "requires": { "arrify": "^1.0.1", - "micromatch": "^2.3.11", + "micromatch": "^3.1.8", "object-assign": "^4.1.0", "read-pkg-up": "^1.0.1", "require-main-filename": "^1.0.1" @@ -1705,6 +2261,34 @@ "bundled": true, "dev": true }, + "to-object-path": { + "version": "0.3.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } + }, + "to-regex": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "requires": { + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" + } + }, + "to-regex-range": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + }, "trim-right": { "version": "1.0.1", "bundled": true, @@ -1741,13 +2325,101 @@ "dev": true, "optional": true }, + "union-value": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "set-value": { + "version": "0.4.3", + "bundled": true, + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" + } + } + } + }, + "unset-value": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "has-value": "^0.3.1", + "isobject": "^3.0.0" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "bundled": true, + "dev": true, + "requires": { + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "bundled": true, + "dev": true + } + } + }, + "urix": { + "version": "0.1.0", + "bundled": true, + "dev": true + }, + "use": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "kind-of": "^6.0.2" + }, + "dependencies": { + "kind-of": { + "version": "6.0.2", + "bundled": true, + "dev": true + } + } + }, "validate-npm-package-license": { - "version": "3.0.1", + "version": "3.0.3", "bundled": true, "dev": true, "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "which": { @@ -1783,6 +2455,14 @@ "strip-ansi": "^3.0.1" }, "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, "string-width": { "version": "1.0.2", "bundled": true, @@ -1821,11 +2501,11 @@ "dev": true }, "yargs": { - "version": "10.0.3", + "version": "11.1.0", "bundled": true, "dev": true, "requires": { - "cliui": "^3.2.0", + "cliui": "^4.0.0", "decamelize": "^1.1.1", "find-up": "^2.1.0", "get-caller-file": "^1.0.1", @@ -1836,35 +2516,49 @@ "string-width": "^2.0.0", "which-module": "^2.0.0", "y18n": "^3.2.1", - "yargs-parser": "^8.0.0" + "yargs-parser": "^9.0.2" }, "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "camelcase": { + "version": "4.1.0", + "bundled": true, + "dev": true + }, "cliui": { - "version": "3.2.0", + "version": "4.1.0", "bundled": true, "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", "wrap-ansi": "^2.0.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - } + } + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "yargs-parser": { + "version": "9.0.2", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "^4.1.0" } } } }, "yargs-parser": { - "version": "8.0.0", + "version": "8.1.0", "bundled": true, "dev": true, "requires": { @@ -1939,6 +2633,17 @@ "which-module": "^2.0.0", "y18n": "^3.2.1", "yargs-parser": "^9.0.2" + }, + "dependencies": { + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "^4.1.0" + } + } } } } @@ -4411,9 +5116,9 @@ "dev": true }, "escodegen": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz", - "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz", + "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==", "dev": true, "requires": { "esprima": "^3.1.3", @@ -4713,9 +5418,9 @@ } }, "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, "espurify": { @@ -5739,9 +6444,9 @@ } }, "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, "get-port": { @@ -5940,9 +6645,9 @@ } }, "got": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/got/-/got-8.2.0.tgz", - "integrity": "sha512-giadqJpXIwjY+ZsuWys8p2yjZGhOHiU4hiJHjS/oeCxw1u8vANQz3zPlrxW2Zw/siCXsSMI3hvzWGcnFyujyAg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/got/-/got-8.3.0.tgz", + "integrity": "sha512-kBNy/S2CGwrYgDSec5KTWGKUvupwkkTVAjIsVFF2shXO13xpZdFP4d4kxa//CLX2tN/rV0aYwK8vY6UKWGn2vQ==", "dev": true, "requires": { "@sindresorhus/is": "^0.7.0", @@ -5955,7 +6660,7 @@ "isurl": "^1.0.0-alpha5", "lowercase-keys": "^1.0.0", "mimic-response": "^1.0.0", - "p-cancelable": "^0.3.0", + "p-cancelable": "^0.4.0", "p-timeout": "^2.0.1", "pify": "^3.0.0", "safe-buffer": "^5.1.1", @@ -7882,9 +8587,9 @@ "dev": true }, "mimic-response": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz", - "integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", "dev": true }, "minimatch": { @@ -10349,9 +11054,9 @@ "dev": true }, "p-cancelable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", + "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==", "dev": true }, "p-finally": { @@ -11455,18 +12160,18 @@ "dev": true }, "sinon": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.3.0.tgz", - "integrity": "sha512-pmf05hFgEZUS52AGJcsVjOjqAyJW2yo14cOwVYvzCyw7+inv06YXkLyW75WG6X6p951lzkoKh51L2sNbR9CDvw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-6.0.1.tgz", + "integrity": "sha512-rfszhNcfamK2+ofIPi9XqeH89pH7KGDcAtM+F9CsjHXOK3jzWG99vyhyD2V+r7s4IipmWcWUFYq4ftZ9/Eu2Wg==", "dev": true, "requires": { "@sinonjs/formatio": "^2.0.0", - "diff": "^3.1.0", + "diff": "^3.5.0", "lodash.get": "^4.4.2", - "lolex": "^2.2.0", - "nise": "^1.2.0", - "supports-color": "^5.1.0", - "type-detect": "^4.0.5" + "lolex": "^2.4.2", + "nise": "^1.3.3", + "supports-color": "^5.4.0", + "type-detect": "^4.0.8" } }, "slash": { @@ -11872,9 +12577,9 @@ "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=" }, "superagent": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", - "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz", + "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==", "dev": true, "requires": { "component-emitter": "^1.2.0", @@ -11882,11 +12587,11 @@ "debug": "^3.1.0", "extend": "^3.0.0", "form-data": "^2.3.1", - "formidable": "^1.2.0", + "formidable": "^1.1.1", "methods": "^1.1.1", "mime": "^1.4.1", "qs": "^6.5.1", - "readable-stream": "^2.3.5" + "readable-stream": "^2.0.5" }, "dependencies": { "mime": { @@ -11928,13 +12633,13 @@ } }, "supertest": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.0.0.tgz", - "integrity": "sha1-jUu2j9GDDuBwM7HFpamkAhyWUpY=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.1.0.tgz", + "integrity": "sha512-O44AMnmJqx294uJQjfUmEyYOg7d9mylNFsMw/Wkz4evKd1njyPrtCN+U6ZIC7sKtfEVQhfTqFFijlXx8KP/Czw==", "dev": true, "requires": { "methods": "~1.1.2", - "superagent": "^3.0.0" + "superagent": "3.8.2" } }, "supports-color": { @@ -12471,12 +13176,9 @@ "dev": true }, "use": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", - "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", - "requires": { - "kind-of": "^6.0.2" - } + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, "util-deprecate": { "version": "1.0.2", @@ -12690,9 +13392,9 @@ } }, "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", + "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", "dev": true, "requires": { "camelcase": "^4.1.0" From 3a51de387bafc5982c568ee15700f2e4cdac7445 Mon Sep 17 00:00:00 2001 From: Jason Dobry Date: Tue, 17 Jul 2018 14:16:12 -0700 Subject: [PATCH 0179/1115] fix: Fix sample region tag in JSDoc (#184) --- handwritten/pubsub/src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index cd57b6f78a1..f2016f02b96 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -89,7 +89,7 @@ var PROJECT_ID_PLACEHOLDER = '{{projectId}}'; * }); * * @example include:samples/quickstart.js - * region_tag:pubsub_quickstart + * region_tag:pubsub_quickstart_create_topic * Full quickstart example: */ function PubSub(options) { @@ -974,7 +974,7 @@ common.util.promisifyAll(PubSub, { * }); * * @example include:samples/quickstart.js - * region_tag:pubsub_quickstart + * region_tag:pubsub_quickstart_create_topic * Full quickstart example: */ module.exports = PubSub; From 3c995a14ff905861a65d458d1ec45e86421bd629 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 18 Jul 2018 00:58:33 -0700 Subject: [PATCH 0180/1115] test: use strictEqual in tests (#186) --- handwritten/pubsub/system-test/pubsub.js | 8 ++-- handwritten/pubsub/test/gapic-v1.js | 56 ++++++++++++------------ handwritten/pubsub/test/index.js | 4 +- handwritten/pubsub/test/subscription.js | 4 +- handwritten/pubsub/test/topic.js | 6 +-- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index d278aaaab05..5238dbe51a1 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -129,7 +129,7 @@ describe('pubsub', function() { }); // get all topics in list of known names - assert.equal(results.length, TOPIC_NAMES.length); + assert.strictEqual(results.length, TOPIC_NAMES.length); done(); }); }); @@ -149,7 +149,7 @@ describe('pubsub', function() { return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); - assert.equal(results.length, TOPIC_NAMES.length); + assert.strictEqual(results.length, TOPIC_NAMES.length); done(); }); }); @@ -303,7 +303,7 @@ describe('pubsub', function() { it('should list all subscriptions registered to the topic', function(done) { topic.getSubscriptions(function(err, subs) { assert.ifError(err); - assert.equal(subs.length, SUBSCRIPTIONS.length); + assert.strictEqual(subs.length, SUBSCRIPTIONS.length); assert(subs[0] instanceof Subscription); done(); }); @@ -319,7 +319,7 @@ describe('pubsub', function() { subscriptionsEmitted.push(subscription); }) .on('end', function() { - assert.equal(subscriptionsEmitted.length, SUBSCRIPTIONS.length); + assert.strictEqual(subscriptionsEmitted.length, SUBSCRIPTIONS.length); done(); }); }); diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index 06b2f85f9dd..732c3306d45 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -77,7 +77,7 @@ describe('PublisherClient', () => { client.createTopic(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -141,7 +141,7 @@ describe('PublisherClient', () => { client.updateTopic(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -214,7 +214,7 @@ describe('PublisherClient', () => { client.publish(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -274,7 +274,7 @@ describe('PublisherClient', () => { client.getTopic(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -337,7 +337,7 @@ describe('PublisherClient', () => { client.listTopics(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -404,7 +404,7 @@ describe('PublisherClient', () => { client.listTopicSubscriptions(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -454,7 +454,7 @@ describe('PublisherClient', () => { client.deleteTopic(request, err => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); done(); }); }); @@ -519,7 +519,7 @@ describe('PublisherClient', () => { client.setIamPolicy(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -581,7 +581,7 @@ describe('PublisherClient', () => { client.getIamPolicy(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -642,7 +642,7 @@ describe('PublisherClient', () => { client.testIamPermissions(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -719,7 +719,7 @@ describe('SubscriberClient', () => { client.createSubscription(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -791,7 +791,7 @@ describe('SubscriberClient', () => { client.getSubscription(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -875,7 +875,7 @@ describe('SubscriberClient', () => { client.updateSubscription(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -942,7 +942,7 @@ describe('SubscriberClient', () => { client.listSubscriptions(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -998,7 +998,7 @@ describe('SubscriberClient', () => { client.deleteSubscription(request, err => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); done(); }); }); @@ -1061,7 +1061,7 @@ describe('SubscriberClient', () => { client.modifyAckDeadline(request, err => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); done(); }); }); @@ -1120,7 +1120,7 @@ describe('SubscriberClient', () => { client.acknowledge(request, err => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); done(); }); }); @@ -1182,7 +1182,7 @@ describe('SubscriberClient', () => { client.pull(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -1264,7 +1264,7 @@ describe('SubscriberClient', () => { }) .on('error', err => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); done(); }); @@ -1325,7 +1325,7 @@ describe('SubscriberClient', () => { client.modifyPushConfig(request, err => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); done(); }); }); @@ -1391,7 +1391,7 @@ describe('SubscriberClient', () => { client.listSnapshots(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -1463,7 +1463,7 @@ describe('SubscriberClient', () => { client.createSnapshot(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -1549,7 +1549,7 @@ describe('SubscriberClient', () => { client.updateSnapshot(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -1599,7 +1599,7 @@ describe('SubscriberClient', () => { client.deleteSnapshot(request, err => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); done(); }); }); @@ -1657,7 +1657,7 @@ describe('SubscriberClient', () => { client.seek(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -1729,7 +1729,7 @@ describe('SubscriberClient', () => { client.setIamPolicy(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -1797,7 +1797,7 @@ describe('SubscriberClient', () => { client.getIamPolicy(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); @@ -1864,7 +1864,7 @@ describe('SubscriberClient', () => { client.testIamPermissions(request, (err, response) => { assert(err instanceof Error); - assert.equal(err.code, FAKE_STATUS_CODE); + assert.strictEqual(err.code, FAKE_STATUS_CODE); assert(typeof response === 'undefined'); done(); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 1dcefaff6ab..5fdea9150c9 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -82,7 +82,7 @@ var fakePaginator = { } methods = arrify(methods); - assert.equal(Class.name, 'PubSub'); + assert.strictEqual(Class.name, 'PubSub'); assert.deepEqual(methods, [ 'getSnapshots', 'getSubscriptions', @@ -1300,7 +1300,7 @@ describe('PubSub', function() { it('should pass specified name to the Subscription', function(done) { SubscriptionOverride = function(pubsub, name) { - assert.equal(name, SUB_NAME); + assert.strictEqual(name, SUB_NAME); done(); }; pubsub.subscription(SUB_NAME); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index acd8f1bb031..8443f2e04c2 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -196,12 +196,12 @@ describe('Subscription', function() { describe('formatName_', function() { it('should format name', function() { var formattedName = Subscription.formatName_(PROJECT_ID, SUB_NAME); - assert.equal(formattedName, SUB_FULL_NAME); + assert.strictEqual(formattedName, SUB_FULL_NAME); }); it('should format name when given a complete name', function() { var formattedName = Subscription.formatName_(PROJECT_ID, SUB_FULL_NAME); - assert.equal(formattedName, SUB_FULL_NAME); + assert.strictEqual(formattedName, SUB_FULL_NAME); }); }); diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 4d3b865d5bd..6cf0ea5fa5e 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -143,12 +143,12 @@ describe('Topic', function() { describe('formatName_', function() { it('should format name', function() { var formattedName = Topic.formatName_(PROJECT_ID, TOPIC_UNFORMATTED_NAME); - assert.equal(formattedName, TOPIC_NAME); + assert.strictEqual(formattedName, TOPIC_NAME); }); it('should format name when given a complete name', function() { var formattedName = Topic.formatName_(PROJECT_ID, TOPIC_NAME); - assert.equal(formattedName, TOPIC_NAME); + assert.strictEqual(formattedName, TOPIC_NAME); }); }); @@ -523,7 +523,7 @@ describe('Topic', function() { var opts = {}; topic.parent.subscription = function(name, options) { - assert.equal(name, subscriptionName); + assert.strictEqual(name, subscriptionName); assert.deepEqual(options, opts); done(); }; From 19eb2b5569650c20e9cce283f1e074f28944566d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Wed, 18 Jul 2018 11:20:09 -0700 Subject: [PATCH 0181/1115] chore(deps): update dependency eslint-plugin-node to v7 (#185) --- handwritten/pubsub/package-lock.json | 79 ++++++++++++++++++++++------ handwritten/pubsub/package.json | 2 +- 2 files changed, 64 insertions(+), 17 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 293236c0d77..9cd3ea079d7 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -331,6 +331,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -1459,7 +1460,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", @@ -2865,6 +2867,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -2876,6 +2879,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -5279,18 +5283,44 @@ } } }, + "eslint-plugin-es": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.3.1.tgz", + "integrity": "sha512-9XcVyZiQRVeFjqHw8qHNDAZcQLqaHlOGGpeYqzYh8S4JYCWTCO3yzyen8yVmA5PratfzTRWDwCOFphtDEG+w/w==", + "dev": true, + "requires": { + "eslint-utils": "^1.3.0", + "regexpp": "^2.0.0" + }, + "dependencies": { + "regexpp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz", + "integrity": "sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==", + "dev": true + } + } + }, "eslint-plugin-node": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz", - "integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz", + "integrity": "sha512-lfVw3TEqThwq0j2Ba/Ckn2ABdwmL5dkOgAux1rvOk6CO7A6yGyPI2+zIxN6FyNkp1X1X/BSvKOceD6mBWSj4Yw==", "dev": true, "requires": { - "ignore": "^3.3.6", + "eslint-plugin-es": "^1.3.1", + "eslint-utils": "^1.3.1", + "ignore": "^4.0.2", "minimatch": "^3.0.4", - "resolve": "^1.3.3", - "semver": "^5.4.1" + "resolve": "^1.8.1", + "semver": "^5.5.0" }, "dependencies": { + "ignore": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.2.tgz", + "integrity": "sha512-uoxnT7PYpyEnsja+yX+7v49B7LXxmzDJ2JALqHH3oEGzpM2U1IGcbfnOr8Dt57z3B/UWs7/iAgPFbmye8m4I0g==", + "dev": true + }, "resolve": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", @@ -5927,12 +5957,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5947,17 +5979,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6074,7 +6109,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6086,6 +6122,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6100,6 +6137,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6107,12 +6145,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6131,6 +6171,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6211,7 +6252,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6223,6 +6265,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6344,6 +6387,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8287,7 +8331,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.4.0", @@ -8860,6 +8905,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -9802,7 +9848,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "lru-cache": { "version": "4.1.3", diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3052c3c014f..b5f7829238e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -86,7 +86,7 @@ "codecov": "^3.0.0", "eslint": "^5.0.0", "eslint-config-prettier": "^2.8.0", - "eslint-plugin-node": "^6.0.0", + "eslint-plugin-node": "^7.0.0", "eslint-plugin-prettier": "^2.3.1", "ink-docstrap": "^1.3.2", "intelli-espower-loader": "^1.0.1", From e3bdc5230391fb2dd179e4f285bc4fcebcf47f00 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 24 Jul 2018 10:04:48 -0700 Subject: [PATCH 0182/1115] chore(deps): lock file maintenance (#188) --- handwritten/pubsub/package-lock.json | 104 +++++++++++---------------- 1 file changed, 41 insertions(+), 63 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 9cd3ea079d7..7a4bb5abbe7 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -236,9 +236,9 @@ } }, "@google-cloud/nodejs-repo-tools": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.3.1.tgz", - "integrity": "sha512-yIOn92sjHwpF/eORQWjv7QzQPcESSRCsZshdmeX40RGRlB0+HPODRDghZq0GiCqe6zpIYZvKmiKiYd3u52P/7Q==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.3.2.tgz", + "integrity": "sha512-Zah0wZcVifSpKIy5ulTFyGpHYAA8h/biYy8X7J2UvaXga5XlyruKrXo2K1VmBxB9MDPXa0Duz8M003pe2Ras3w==", "dev": true, "requires": { "ava": "0.25.0", @@ -331,7 +331,6 @@ "version": "0.1.4", "bundled": true, "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -1460,8 +1459,7 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "loose-envify": { "version": "1.3.1", @@ -2801,9 +2799,9 @@ } }, "@types/long": { - "version": "3.0.32", - "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", - "integrity": "sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz", + "integrity": "sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==" }, "@types/node": { "version": "10.5.2", @@ -2867,7 +2865,6 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -2879,7 +2876,6 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, - "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -5160,9 +5156,9 @@ } }, "eslint": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz", - "integrity": "sha512-DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.2.0.tgz", + "integrity": "sha512-zlggW1qp7/TBjwLfouRoY7eWXrXwJZFqCdIxxh0/LVB/QuuKuIMkzyUZEcDo6LBadsry5JcEMxIqd3H/66CXVg==", "dev": true, "requires": { "ajv": "^6.5.0", @@ -5181,7 +5177,7 @@ "functional-red-black-tree": "^1.0.1", "glob": "^7.1.2", "globals": "^11.7.0", - "ignore": "^3.3.3", + "ignore": "^4.0.2", "imurmurhash": "^0.1.4", "inquirer": "^5.2.0", "is-resolvable": "^1.1.0", @@ -5249,6 +5245,12 @@ "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", "dev": true }, + "ignore": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.2.tgz", + "integrity": "sha512-uoxnT7PYpyEnsja+yX+7v49B7LXxmzDJ2JALqHH3oEGzpM2U1IGcbfnOr8Dt57z3B/UWs7/iAgPFbmye8m4I0g==", + "dev": true + }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -5607,9 +5609,9 @@ } }, "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extend-shallow": { "version": "3.0.2", @@ -5957,14 +5959,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5979,20 +5979,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -6109,8 +6106,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -6122,7 +6118,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6137,7 +6132,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6145,14 +6139,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6171,7 +6163,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -6252,8 +6243,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -6265,7 +6255,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6387,7 +6376,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8331,8 +8319,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true + "dev": true }, "loose-envify": { "version": "1.4.0", @@ -8613,16 +8600,16 @@ "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==" }, "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + "version": "1.35.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz", + "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==" }, "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "version": "2.1.19", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz", + "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", "requires": { - "mime-db": "~1.33.0" + "mime-db": "~1.35.0" } }, "mimic-fn": { @@ -8905,7 +8892,6 @@ "version": "0.1.4", "bundled": true, "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -9848,8 +9834,7 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "lru-cache": { "version": "4.1.3", @@ -11579,9 +11564,9 @@ "dev": true }, "protobufjs": { - "version": "6.8.6", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.6.tgz", - "integrity": "sha512-eH2OTP9s55vojr3b7NBaF9i4WhWPkv/nq55nznWNp/FomKrLViprUcqnBjHph2tFQ+7KciGPTPsVWGz0SOhL0Q==", + "version": "6.8.8", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz", + "integrity": "sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw==", "requires": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", @@ -11593,16 +11578,9 @@ "@protobufjs/path": "^1.1.2", "@protobufjs/pool": "^1.1.0", "@protobufjs/utf8": "^1.1.0", - "@types/long": "^3.0.32", - "@types/node": "^8.9.4", + "@types/long": "^4.0.0", + "@types/node": "^10.1.0", "long": "^4.0.0" - }, - "dependencies": { - "@types/node": { - "version": "8.10.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.21.tgz", - "integrity": "sha512-87XkD9qDXm8fIax+5y7drx84cXsu34ZZqfB7Cial3Q/2lxSoJ/+DRaWckkCbxP41wFSIrrb939VhzaNxj4eY1w==" - } } }, "proxyquire": { From 249f5e6ad5edb9f12e6276ba1058fa2f61c4fae6 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 24 Jul 2018 17:06:33 -0700 Subject: [PATCH 0183/1115] chore: fix the eslint errors (#190) --- handwritten/pubsub/system-test/pubsub.js | 12 +++--- handwritten/pubsub/test/connection-pool.js | 18 ++++---- handwritten/pubsub/test/iam.js | 4 +- handwritten/pubsub/test/index.js | 48 +++++++++++----------- handwritten/pubsub/test/publisher.js | 24 +++++------ handwritten/pubsub/test/snapshot.js | 2 +- handwritten/pubsub/test/subscriber.js | 30 +++++++------- handwritten/pubsub/test/subscription.js | 24 +++++++---- handwritten/pubsub/test/topic.js | 24 +++++------ 9 files changed, 96 insertions(+), 90 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 5238dbe51a1..89c67299488 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -223,8 +223,8 @@ describe('pubsub', function() { publishPop(data, attrs, function(err, message) { assert.ifError(err); - assert.deepEqual(message.data, data); - assert.deepEqual(message.attributes, attrs); + assert.deepStrictEqual(message.data, data); + assert.deepStrictEqual(message.attributes, attrs); done(); }); @@ -468,7 +468,7 @@ describe('pubsub', function() { subscription.on('error', done); subscription.on('message', function(message) { - assert.deepEqual(message.data, Buffer.from('hello')); + assert.deepStrictEqual(message.data, Buffer.from('hello')); if (++messageCount === 10) { subscription.close(done); @@ -538,7 +538,7 @@ describe('pubsub', function() { topic.iam.getPolicy(function(err, policy) { assert.ifError(err); - assert.deepEqual(policy.bindings, []); + assert.deepStrictEqual(policy.bindings, []); assert.strictEqual(policy.version, 0); done(); @@ -560,7 +560,7 @@ describe('pubsub', function() { topic.iam.setPolicy(policy, function(err, newPolicy) { assert.ifError(err); - assert.deepEqual(newPolicy.bindings, policy.bindings); + assert.deepStrictEqual(newPolicy.bindings, policy.bindings); done(); }); }); @@ -571,7 +571,7 @@ describe('pubsub', function() { topic.iam.testPermissions(testPermissions, function(err, permissions) { assert.ifError(err); - assert.deepEqual(permissions, { + assert.deepStrictEqual(permissions, { 'pubsub.topics.get': true, 'pubsub.topics.update': true, }); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index 32dd0ab93c8..ca4d1134e85 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -163,7 +163,7 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.noConnectionsTime, 0); assert.strictEqual(pool.settings.maxConnections, 5); assert.strictEqual(pool.settings.ackDeadline, 10000); - assert.deepEqual(pool.queue, []); + assert.deepStrictEqual(pool.queue, []); ConnectionPool.prototype.open = open; }); @@ -178,8 +178,8 @@ describe('ConnectionPool', function() { var subscriptionCopy = extend({}, subscription); var pool = new ConnectionPool(subscription); - assert.deepEqual(pool.settings, options); - assert.deepEqual(subscription, subscriptionCopy); + assert.deepStrictEqual(pool.settings, options); + assert.deepStrictEqual(subscription, subscriptionCopy); }); it('should inherit from EventEmitter', function() { @@ -535,7 +535,7 @@ describe('ConnectionPool', function() { duplexifyOverride = function(writable, readable, options) { assert.strictEqual(writable, fakeConnection); - assert.deepEqual(options, {objectMode: true}); + assert.deepStrictEqual(options, {objectMode: true}); return fakeDuplex; }; @@ -546,7 +546,7 @@ describe('ConnectionPool', function() { }; fakeDuplex.write = function(reqOpts) { - assert.deepEqual(reqOpts, { + assert.deepStrictEqual(reqOpts, { subscription: TOKENIZED_SUB_NAME, streamAckDeadlineSeconds: pool.settings.ackDeadline / 1000, }); @@ -833,7 +833,7 @@ describe('ConnectionPool', function() { assert.strictEqual(message.id, RESP.message.messageId); assert.strictEqual(message.data, RESP.message.data); assert.strictEqual(message.attributes, RESP.message.attributes); - assert.deepEqual(message.publishTime, expectedPublishTime); + assert.deepStrictEqual(message.publishTime, expectedPublishTime); assert.strictEqual(message.received, FAKE_DATE_NOW); }); @@ -1285,7 +1285,7 @@ describe('ConnectionPool', function() { it('should capture the timeout handle', function() { pool.queueConnection(); - assert.deepEqual(pool.queue, [fakeTimeoutHandle]); + assert.deepStrictEqual(pool.queue, [fakeTimeoutHandle]); }); it('should remove the timeout handle once it fires', function(done) { @@ -1328,8 +1328,8 @@ describe('ConnectionPool', function() { pool.sendKeepAlives(); - assert.deepEqual(a.written, [{}]); - assert.deepEqual(b.written, [{}]); + assert.deepStrictEqual(a.written, [{}]); + assert.deepStrictEqual(b.written, [{}]); }); }); diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index 6d93bbe8d7e..f9d01614bb0 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -159,7 +159,7 @@ describe('IAM', function() { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'testIamPermissions'); assert.strictEqual(config.reqOpts.resource, iam.id); - assert.deepEqual(config.reqOpts.permissions, [permissions]); + assert.deepStrictEqual(config.reqOpts.permissions, [permissions]); done(); }; @@ -208,7 +208,7 @@ describe('IAM', function() { iam.testPermissions(permissions, function(err, permissions, apiResp) { assert.ifError(err); - assert.deepEqual(permissions, { + assert.deepStrictEqual(permissions, { 'storage.bucket.list': false, 'storage.bucket.consume': true, }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 5fdea9150c9..2b53be1127c 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -57,7 +57,7 @@ var fakeUtil = extend({}, util, { } promisified = true; - assert.deepEqual(options.exclude, [ + assert.deepStrictEqual(options.exclude, [ 'request', 'snapshot', 'subscription', @@ -83,7 +83,7 @@ var fakePaginator = { methods = arrify(methods); assert.strictEqual(Class.name, 'PubSub'); - assert.deepEqual(methods, [ + assert.deepStrictEqual(methods, [ 'getSnapshots', 'getSubscriptions', 'getTopics', @@ -204,7 +204,7 @@ describe('PubSub', function() { v1ClientOverrides.PublisherClient.scopes = ['b', 'c', 'd', 'e']; var pubsub = new PubSub({}); - assert.deepEqual(pubsub.options.scopes, ['a', 'b', 'c', 'd', 'e']); + assert.deepStrictEqual(pubsub.options.scopes, ['a', 'b', 'c', 'd', 'e']); }); it('should attempt to determine the service path and port', function() { @@ -221,7 +221,7 @@ describe('PubSub', function() { }); it('should initialize the API object', function() { - assert.deepEqual(pubsub.api, {}); + assert.deepStrictEqual(pubsub.api, {}); }); it('should cache a local google-auto-auth instance', function() { @@ -232,7 +232,7 @@ describe('PubSub', function() { }; googleAutoAuthOverride = function(options_) { - assert.deepEqual( + assert.deepStrictEqual( options_, extend( { @@ -253,7 +253,7 @@ describe('PubSub', function() { }); it('should localize the options provided', function() { - assert.deepEqual( + assert.deepStrictEqual( pubsub.options, extend( { @@ -342,7 +342,7 @@ describe('PubSub', function() { pubsub.subscription = function(subName, options) { assert.strictEqual(subName, SUB_NAME); - assert.deepEqual(options, opts); + assert.deepStrictEqual(options, opts); setImmediate(done); return SUBSCRIPTION; }; @@ -419,7 +419,7 @@ describe('PubSub', function() { pubsub.request = function(config) { assert.notStrictEqual(config.reqOpts, options); - assert.deepEqual(config.reqOpts, expectedBody); + assert.deepStrictEqual(config.reqOpts, expectedBody); done(); }; @@ -450,7 +450,7 @@ describe('PubSub', function() { pubsub.request = function(config) { assert.notStrictEqual(config.reqOpts, options); - assert.deepEqual(config.reqOpts, expectedBody); + assert.deepStrictEqual(config.reqOpts, expectedBody); done(); }; @@ -569,8 +569,8 @@ describe('PubSub', function() { pubsub.request = function(config) { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'createTopic'); - assert.deepEqual(config.reqOpts, {name: formattedName}); - assert.deepEqual(config.gaxOpts, gaxOpts); + assert.deepStrictEqual(config.reqOpts, {name: formattedName}); + assert.deepStrictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -746,8 +746,8 @@ describe('PubSub', function() { pubsub.request = function(config) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'listSnapshots'); - assert.deepEqual(config.reqOpts, expectedOptions); - assert.deepEqual(config.gaxOpts, expectedGaxOpts); + assert.deepStrictEqual(config.reqOpts, expectedOptions); + assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); done(); }; @@ -782,7 +782,7 @@ describe('PubSub', function() { pubsub.getSnapshots(function(err, snapshots, nextQuery, apiResponse) { assert.strictEqual(err, err_); - assert.deepEqual(snapshots, snapshots_); + assert.deepStrictEqual(snapshots, snapshots_); assert.strictEqual(nextQuery, nextQuery_); assert.strictEqual(apiResponse, apiResponse_); done(); @@ -827,8 +827,8 @@ describe('PubSub', function() { pubsub.request = function(config) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'listSubscriptions'); - assert.deepEqual(config.reqOpts, {project: project}); - assert.deepEqual(config.gaxOpts, expectedGaxOpts); + assert.deepStrictEqual(config.reqOpts, {project: project}); + assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); done(); }; @@ -868,7 +868,7 @@ describe('PubSub', function() { pubsub.getSubscriptions(function(err, subs, nextQuery, apiResponse) { assert.strictEqual(err, err_); - assert.deepEqual(subs, subs_); + assert.deepStrictEqual(subs, subs_); assert.strictEqual(nextQuery, nextQuery_); assert.strictEqual(apiResponse, apiResponse_); done(); @@ -960,8 +960,8 @@ describe('PubSub', function() { pubsub.request = function(config) { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'listTopics'); - assert.deepEqual(config.reqOpts, expectedOptions); - assert.deepEqual(config.gaxOpts, expectedGaxOpts); + assert.deepStrictEqual(config.reqOpts, expectedOptions); + assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); done(); }; @@ -996,7 +996,7 @@ describe('PubSub', function() { pubsub.getTopics(function(err, topics, nextQuery, apiResponse) { assert.strictEqual(err, err_); - assert.deepEqual(topics, topics_); + assert.deepStrictEqual(topics, topics_); assert.strictEqual(nextQuery, nextQuery_); assert.strictEqual(apiResponse, apiResponse_); done(); @@ -1052,8 +1052,8 @@ describe('PubSub', function() { it('should call client method with correct options', function(done) { var fakeClient = {}; fakeClient.fakeMethod = function(reqOpts, gaxOpts) { - assert.deepEqual(CONFIG.reqOpts, reqOpts); - assert.deepEqual(CONFIG.gaxOpts, gaxOpts); + assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); + assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); done(); }; pubsub.getClient_ = function(config, callback) { @@ -1064,7 +1064,7 @@ describe('PubSub', function() { it('should replace the project id token on reqOpts', function(done) { fakeUtil.replaceProjectIdToken = function(reqOpts, projectId) { - assert.deepEqual(reqOpts, CONFIG.reqOpts); + assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); done(); }; @@ -1232,7 +1232,7 @@ describe('PubSub', function() { it('should replace the project id token on reqOpts', function(done) { fakeUtil.replaceProjectIdToken = function(reqOpts, projectId) { - assert.deepEqual(reqOpts, CONFIG.reqOpts); + assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); done(); }; diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index 37265cc8f66..9b558a99b79 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -25,7 +25,7 @@ var promisified = false; var fakeUtil = extend({}, common.util, { promisifyAll: function(Class, options) { if (Class.name === 'Publisher') { - assert.deepEqual(options, {singular: true}); + assert.deepStrictEqual(options, {singular: true}); promisified = true; } }, @@ -71,7 +71,7 @@ describe('Publisher', function() { }); it('should create an inventory object', function() { - assert.deepEqual(publisher.inventory_, { + assert.deepStrictEqual(publisher.inventory_, { callbacks: [], queued: [], bytes: 0, @@ -80,7 +80,7 @@ describe('Publisher', function() { describe('options', function() { it('should provide default values for batching', function() { - assert.deepEqual(publisher.settings.batching, { + assert.deepStrictEqual(publisher.settings.batching, { maxBytes: Math.pow(1024, 2) * 5, maxMessages: 1000, maxMilliseconds: 100, @@ -99,8 +99,8 @@ describe('Publisher', function() { batching: options, }); - assert.deepEqual(publisher.settings.batching, options); - assert.deepEqual(options, optionsCopy); + assert.deepStrictEqual(publisher.settings.batching, options); + assert.deepStrictEqual(options, optionsCopy); }); it('should cap maxBytes', function() { @@ -127,7 +127,7 @@ describe('Publisher', function() { gaxOpts: fakeGaxOpts, }); - assert.deepEqual(publisher.settings.gaxOpts, fakeGaxOpts); + assert.deepStrictEqual(publisher.settings.gaxOpts, fakeGaxOpts); }); }); }); @@ -170,7 +170,7 @@ describe('Publisher', function() { it('should optionally accept attributes', function(done) { publisher.queue_ = function(data, attrs, callback) { assert.strictEqual(data, DATA); - assert.deepEqual(attrs, {}); + assert.deepStrictEqual(attrs, {}); callback(); // the done fn }; @@ -262,8 +262,8 @@ describe('Publisher', function() { publisher.publish_(); - assert.deepEqual(publisher.inventory_.callbacks, []); - assert.deepEqual(publisher.inventory_.queued, []); + assert.deepStrictEqual(publisher.inventory_.callbacks, []); + assert.deepStrictEqual(publisher.inventory_.queued, []); assert.strictEqual(publisher.inventory_.bytes, 0); }); @@ -274,7 +274,7 @@ describe('Publisher', function() { TOPIC.request = function(config) { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'publish'); - assert.deepEqual(config.reqOpts, { + assert.deepStrictEqual(config.reqOpts, { topic: TOPIC_NAME, messages: [FAKE_MESSAGE], }); @@ -326,7 +326,7 @@ describe('Publisher', function() { it('should add the data and attrs to the inventory', function() { publisher.queue_(DATA, ATTRS, fakeUtil.noop); - assert.deepEqual(publisher.inventory_.queued, [ + assert.deepStrictEqual(publisher.inventory_.queued, [ { data: DATA, attributes: ATTRS, @@ -343,7 +343,7 @@ describe('Publisher', function() { it('should capture the callback', function() { publisher.queue_(DATA, ATTRS, fakeUtil.noop); - assert.deepEqual(publisher.inventory_.callbacks, [fakeUtil.noop]); + assert.deepStrictEqual(publisher.inventory_.callbacks, [fakeUtil.noop]); }); }); }); diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.js index cd03482090f..e46fb5b4e7e 100644 --- a/handwritten/pubsub/test/snapshot.js +++ b/handwritten/pubsub/test/snapshot.js @@ -174,7 +174,7 @@ describe('Snapshot', function() { snapshot.parent.request = function(config, callback) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSnapshot'); - assert.deepEqual(config.reqOpts, {snapshot: snapshot.name}); + assert.deepStrictEqual(config.reqOpts, {snapshot: snapshot.name}); callback(); // the done fn }; diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.js index 8c5b8965681..782ebbd0efe 100644 --- a/handwritten/pubsub/test/subscriber.js +++ b/handwritten/pubsub/test/subscriber.js @@ -99,7 +99,7 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.maxConnections, options.maxConnections); - assert.deepEqual(subscriber.flowControl, { + assert.deepStrictEqual(subscriber.flowControl, { maxBytes: options.flowControl.maxBytes, maxMessages: options.flowControl.maxMessages, }); @@ -115,7 +115,7 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.isOpen, false); assert.strictEqual(subscriber.writeToStreams_, false); - assert.deepEqual(subscriber.flowControl, { + assert.deepStrictEqual(subscriber.flowControl, { maxBytes: FAKE_FREE_MEM * 0.2, maxMessages: 100, }); @@ -266,7 +266,7 @@ describe('Subscriber', function() { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'acknowledge'); assert.strictEqual(config.reqOpts.subscription, subscriber.name); - assert.deepEqual(config.reqOpts.ackIds, fakeAckIds); + assert.deepStrictEqual(config.reqOpts.ackIds, fakeAckIds); setImmediate(done); @@ -294,7 +294,7 @@ describe('Subscriber', function() { offset + batchSize ); - assert.deepEqual(config.reqOpts.ackIds, expectedAckIds); + assert.deepStrictEqual(config.reqOpts.ackIds, expectedAckIds); receivedCalls += 1; if (receivedCalls === expectedCalls) { @@ -348,7 +348,7 @@ describe('Subscriber', function() { subscriber.writeTo_ = function(connectionId, data) { assert.strictEqual(connectionId, fakeConnectionId); - assert.deepEqual(data, {ackIds: fakeAckIds}); + assert.deepStrictEqual(data, {ackIds: fakeAckIds}); done(); }; @@ -368,7 +368,7 @@ describe('Subscriber', function() { offset + batchSize ); - assert.deepEqual(data, {ackIds: expectedAckIds}); + assert.deepStrictEqual(data, {ackIds: expectedAckIds}); if (++receivedCalls === expectedCalls) { done(); @@ -515,7 +515,7 @@ describe('Subscriber', function() { subscriber.close(); - assert.deepEqual(subscriber.inventory_, { + assert.deepStrictEqual(subscriber.inventory_, { lease: [], bytes: 0, }); @@ -724,7 +724,7 @@ describe('Subscriber', function() { it('should add the ackId to the inventory', function() { subscriber.leaseMessage_(MESSAGE); - assert.deepEqual(subscriber.inventory_.lease, [MESSAGE.ackId]); + assert.deepStrictEqual(subscriber.inventory_.lease, [MESSAGE.ackId]); }); it('should update the byte count', function() { @@ -841,7 +841,7 @@ describe('Subscriber', function() { assert.strictEqual(config.method, 'modifyAckDeadline'); assert.strictEqual(config.reqOpts.subscription, subscriber.name); assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); - assert.deepEqual(config.reqOpts.ackIds, fakeAckIds); + assert.deepStrictEqual(config.reqOpts.ackIds, fakeAckIds); setImmediate(done); @@ -870,7 +870,7 @@ describe('Subscriber', function() { ); assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); - assert.deepEqual(config.reqOpts.ackIds, expectedAckIds); + assert.deepStrictEqual(config.reqOpts.ackIds, expectedAckIds); receivedCalls += 1; if (receivedCalls === expectedCalls) { @@ -925,8 +925,8 @@ describe('Subscriber', function() { subscriber.writeTo_ = function(connectionId, data) { assert.strictEqual(connectionId, fakeConnId); - assert.deepEqual(data.modifyDeadlineAckIds, fakeAckIds); - assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); + assert.deepStrictEqual(data.modifyDeadlineAckIds, fakeAckIds); + assert.deepStrictEqual(data.modifyDeadlineSeconds, expectedDeadlines); done(); }; @@ -949,8 +949,8 @@ describe('Subscriber', function() { fakeDeadline ); - assert.deepEqual(data.modifyDeadlineAckIds, expectedAckIds); - assert.deepEqual(data.modifyDeadlineSeconds, expectedDeadlines); + assert.deepStrictEqual(data.modifyDeadlineAckIds, expectedAckIds); + assert.deepStrictEqual(data.modifyDeadlineSeconds, expectedDeadlines); if (++receivedCalls === expectedCalls) { done(); @@ -1216,7 +1216,7 @@ describe('Subscriber', function() { it('should modAck the leased messages', function(done) { subscriber.modifyAckDeadline_ = function(ackIds, deadline) { - assert.deepEqual(ackIds, fakeAckIds); + assert.deepStrictEqual(ackIds, fakeAckIds); assert.strictEqual(deadline, subscriber.ackDeadline / 1000); setImmediate(done); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 8443f2e04c2..7d99c75060b 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -29,7 +29,7 @@ var fakeUtil = extend({}, common.util, { } promisified = true; - assert.deepEqual(options.exclude, ['snapshot']); + assert.deepStrictEqual(options.exclude, ['snapshot']); }, }); @@ -157,7 +157,7 @@ describe('Subscription', function() { var metadata = {a: 'a'}; var formatted = Subscription.formatMetadata_(metadata); - assert.deepEqual(metadata, formatted); + assert.deepStrictEqual(metadata, formatted); assert.notStrictEqual(metadata, formatted); }); @@ -226,7 +226,7 @@ describe('Subscription', function() { subscription.request = function(config) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSnapshot'); - assert.deepEqual(config.reqOpts, { + assert.deepStrictEqual(config.reqOpts, { name: SNAPSHOT_NAME, subscription: subscription.name, }); @@ -295,7 +295,9 @@ describe('Subscription', function() { subscription.request = function(config) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSubscription'); - assert.deepEqual(config.reqOpts, {subscription: subscription.name}); + assert.deepStrictEqual(config.reqOpts, { + subscription: subscription.name, + }); done(); }; @@ -575,7 +577,9 @@ describe('Subscription', function() { subscription.request = function(config) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getSubscription'); - assert.deepEqual(config.reqOpts, {subscription: subscription.name}); + assert.deepStrictEqual(config.reqOpts, { + subscription: subscription.name, + }); done(); }; @@ -631,7 +635,7 @@ describe('Subscription', function() { subscription.request = function(config, callback) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'modifyPushConfig'); - assert.deepEqual(config.reqOpts, { + assert.deepStrictEqual(config.reqOpts, { subscription: subscription.name, pushConfig: fakeConfig, }); @@ -679,7 +683,7 @@ describe('Subscription', function() { subscription.request = function(config, callback) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'seek'); - assert.deepEqual(config.reqOpts, { + assert.deepStrictEqual(config.reqOpts, { subscription: subscription.name, snapshot: FAKE_FULL_SNAPSHOT_NAME, }); @@ -745,8 +749,10 @@ describe('Subscription', function() { subscription.request = function(config, callback) { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'updateSubscription'); - assert.deepEqual(config.reqOpts.subscription, expectedBody); - assert.deepEqual(config.reqOpts.updateMask, {paths: ['push_config']}); + assert.deepStrictEqual(config.reqOpts.subscription, expectedBody); + assert.deepStrictEqual(config.reqOpts.updateMask, { + paths: ['push_config'], + }); callback(); // the done fn }; diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 6cf0ea5fa5e..bcd677d8554 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -29,7 +29,7 @@ var fakeUtil = extend({}, util, { } promisified = true; - assert.deepEqual(options.exclude, ['publisher', 'subscription']); + assert.deepStrictEqual(options.exclude, ['publisher', 'subscription']); }, }); @@ -48,7 +48,7 @@ var fakePaginator = { return; } - assert.deepEqual(methods, ['getSubscriptions']); + assert.deepStrictEqual(methods, ['getSubscriptions']); extended = true; }, streamify: function(methodName) { @@ -136,7 +136,7 @@ describe('Topic', function() { }); it('should create an iam object', function() { - assert.deepEqual(topic.iam.calledWith_, [PUBSUB, TOPIC_NAME]); + assert.deepStrictEqual(topic.iam.calledWith_, [PUBSUB, TOPIC_NAME]); }); }); @@ -187,7 +187,7 @@ describe('Topic', function() { topic.request = function(config, callback) { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'deleteTopic'); - assert.deepEqual(config.reqOpts, {topic: topic.name}); + assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); callback(); // the done fn }; @@ -362,7 +362,7 @@ describe('Topic', function() { topic.request = function(config) { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'getTopic'); - assert.deepEqual(config.reqOpts, {topic: topic.name}); + assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); done(); }; @@ -442,8 +442,8 @@ describe('Topic', function() { topic.request = function(config) { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'listTopicSubscriptions'); - assert.deepEqual(config.reqOpts, expectedOptions); - assert.deepEqual(config.gaxOpts, expectedGaxOpts); + assert.deepStrictEqual(config.reqOpts, expectedOptions); + assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); done(); }; @@ -452,8 +452,8 @@ describe('Topic', function() { it('should accept only a callback', function(done) { topic.request = function(config) { - assert.deepEqual(config.reqOpts, {topic: topic.name}); - assert.deepEqual(config.gaxOpts, {autoPaginate: undefined}); + assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); + assert.deepStrictEqual(config.gaxOpts, {autoPaginate: undefined}); done(); }; @@ -475,7 +475,7 @@ describe('Topic', function() { topic.getSubscriptions(function(err, subscriptions) { assert.ifError(err); - assert.deepEqual(subscriptions, [ + assert.deepStrictEqual(subscriptions, [ {name: 'a'}, {name: 'b'}, {name: 'c'}, @@ -496,7 +496,7 @@ describe('Topic', function() { topic.getSubscriptions(function(err, subs, nextQuery, apiResponse) { assert.strictEqual(err, err_); - assert.deepEqual(subs, subs_); + assert.deepStrictEqual(subs, subs_); assert.strictEqual(nextQuery, nextQuery_); assert.strictEqual(apiResponse, apiResponse_); done(); @@ -524,7 +524,7 @@ describe('Topic', function() { topic.parent.subscription = function(name, options) { assert.strictEqual(name, subscriptionName); - assert.deepEqual(options, opts); + assert.deepStrictEqual(options, opts); done(); }; From 59cb14503c83af2fd370ef3467edbb90efdca895 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 24 Jul 2018 17:12:47 -0700 Subject: [PATCH 0184/1115] refactor: use google-auth-library (#189) --- handwritten/pubsub/package-lock.json | 12 +----------- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/index.js | 4 ++-- handwritten/pubsub/test/index.js | 22 ++++++++++++---------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 7a4bb5abbe7..c5e8a8f66c8 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -3161,6 +3161,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "dev": true, "requires": { "lodash": "^4.17.10" } @@ -6628,17 +6629,6 @@ "retry-axios": "^0.3.2" } }, - "google-auto-auth": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/google-auto-auth/-/google-auto-auth-0.10.1.tgz", - "integrity": "sha512-iIqSbY7Ypd32mnHGbYctp80vZzXoDlvI9gEfvtl3kmyy5HzOcrZCIGCBdSlIzRsg7nHpQiHE3Zl6Ycur6TSodQ==", - "requires": { - "async": "^2.3.0", - "gcp-metadata": "^0.6.1", - "google-auth-library": "^1.3.1", - "request": "^2.79.0" - } - }, "google-gax": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.17.1.tgz", diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b5f7829238e..07849aa5c5c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -69,7 +69,7 @@ "delay": "^3.0.0", "duplexify": "^3.5.4", "extend": "^3.0.1", - "google-auto-auth": "^0.10.1", + "google-auth-library": "^1.6.0", "google-gax": "^0.17.1", "google-proto-files": "^0.16.0", "is": "^3.0.1", diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index f2016f02b96..bfac2947f9f 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -18,7 +18,7 @@ var common = require('@google-cloud/common'); var extend = require('extend'); -var googleAuth = require('google-auto-auth'); +var {GoogleAuth} = require('google-auth-library'); var gax = require('google-gax'); var grpc = new gax.GrpcClient().grpc; var is = require('is'); @@ -129,7 +129,7 @@ function PubSub(options) { this.determineBaseUrl_(); this.api = {}; - this.auth = googleAuth(this.options); + this.auth = new GoogleAuth(this.options); this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; if (this.options.promise) { diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 2b53be1127c..06d3bb156c6 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -96,9 +96,9 @@ var fakePaginator = { }, }; -var googleAutoAuthOverride; -function fakeGoogleAutoAuth() { - return (googleAutoAuthOverride || util.noop).apply(null, arguments); +var googleAuthOverride; +function fakeGoogleAuth() { + return (googleAuthOverride || util.noop).apply(null, arguments); } var v1Override = {}; @@ -137,7 +137,9 @@ describe('PubSub', function() { paginator: fakePaginator, util: fakeUtil, }, - 'google-auto-auth': fakeGoogleAutoAuth, + 'google-auth-library': { + GoogleAuth: fakeGoogleAuth, + }, 'google-gax': fakeGoogleGax, './snapshot.js': FakeSnapshot, './subscription.js': Subscription, @@ -158,7 +160,7 @@ describe('PubSub', function() { }; v1ClientOverrides = {}; - googleAutoAuthOverride = null; + googleAuthOverride = null; SubscriptionOverride = null; pubsub = new PubSub(OPTIONS); pubsub.projectId = PROJECT_ID; @@ -224,14 +226,14 @@ describe('PubSub', function() { assert.deepStrictEqual(pubsub.api, {}); }); - it('should cache a local google-auto-auth instance', function() { - var fakeGoogleAutoAuthInstance = {}; + it('should cache a local google-auth-library instance', function() { + var fakeGoogleAuthInstance = {}; var options = { a: 'b', c: 'd', }; - googleAutoAuthOverride = function(options_) { + googleAuthOverride = function(options_) { assert.deepStrictEqual( options_, extend( @@ -245,11 +247,11 @@ describe('PubSub', function() { options ) ); - return fakeGoogleAutoAuthInstance; + return fakeGoogleAuthInstance; }; var pubsub = new PubSub(options); - assert.strictEqual(pubsub.auth, fakeGoogleAutoAuthInstance); + assert.strictEqual(pubsub.auth, fakeGoogleAuthInstance); }); it('should localize the options provided', function() { From a6b35d7595ac604020db3619cb9bd4330ce34029 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 26 Jul 2018 08:18:38 -0700 Subject: [PATCH 0185/1115] chore: add node templates to synth.py (#191) --- handwritten/pubsub/synth.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 86ea8623c78..215675ce2e5 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -6,6 +6,7 @@ logging.basicConfig(level=logging.DEBUG) gapic = gcp.GAPICGenerator() +common_templates = gcp.CommonTemplates() # tasks has two product names, and a poorly named artman yaml version = 'v1' @@ -17,6 +18,10 @@ library, excludes=['package.json', 'README.md', 'src/index.js']) +templates = common_templates.node_library(package_name="@google-cloud/pubsub") +s.copy(templates) + + # https://github.com/googleapis/gapic-generator/issues/2127 s.replace("src/v1/subscriber_client.js", " }\n\s*/\*\*\n\s+\* The DNS address for this API service.", From a4096485de71dcfd7561fade248f7a41e443d6a5 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Fri, 27 Jul 2018 05:33:39 -0700 Subject: [PATCH 0186/1115] Re-generate library using /synth.py (#193) --- handwritten/pubsub/.circleci/config.yml | 46 +++++++++---------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 3d3dc46400c..cf867c5f06d 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -4,51 +4,39 @@ workflows: tests: jobs: &workflow_jobs - node6: - filters: + filters: &all_commits tags: only: /.*/ - node8: - filters: - tags: - only: /.*/ + filters: *all_commits - node10: - filters: - tags: - only: /.*/ + filters: *all_commits - lint: requires: - node6 - node8 - node10 - filters: - tags: - only: /.*/ + filters: *all_commits - docs: requires: - node6 - node8 - node10 - filters: - tags: - only: /.*/ + filters: *all_commits - system_tests: requires: - lint - docs - filters: + filters: &master_and_releases branches: only: master - tags: + tags: &releases only: '/^v[\d.]+$/' - sample_tests: requires: - lint - docs - filters: - branches: - only: master - tags: - only: '/^v[\d.]+$/' + filters: *master_and_releases - publish_npm: requires: - system_tests @@ -56,8 +44,7 @@ workflows: filters: branches: ignore: /.*/ - tags: - only: '/^v[\d.]+$/' + tags: *releases nightly: triggers: - schedule: @@ -85,14 +72,15 @@ jobs: echo "Not a nightly build, skipping this step." fi - run: &npm_install_and_link - name: Install and link the module. - command: | - mkdir /home/node/.npm-global + name: Install and link the module + command: |- + mkdir -p /home/node/.npm-global npm install environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: npm test - run: node_modules/.bin/codecov + node8: docker: - image: 'node:8' @@ -115,8 +103,8 @@ jobs: name: Link the module being tested to the samples. command: | cd samples/ - npm install npm link ../ + npm install environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: @@ -155,13 +143,13 @@ jobs: command: npm run samples-test environment: GCLOUD_PROJECT: long-door-651 - GOOGLE_APPLICATION_CREDENTIALS: /home/node/pubsub-samples/.circleci/key.json + GOOGLE_APPLICATION_CREDENTIALS: /home/node/samples/.circleci/key.json NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Remove unencrypted key. command: rm .circleci/key.json when: always - working_directory: /home/node/pubsub-samples + working_directory: /home/node/samples/ system_tests: docker: - image: 'node:8' @@ -192,4 +180,4 @@ jobs: steps: - checkout - run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc' - - run: npm publish + - run: npm publish --access=public \ No newline at end of file From ea2811ba675c14d049589199eac645f704e691e4 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 30 Jul 2018 10:51:23 -0700 Subject: [PATCH 0187/1115] chore: move mocha options to mocha.opts (#194) --- handwritten/pubsub/package.json | 4 ++-- handwritten/pubsub/test/mocha.opts | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 handwritten/pubsub/test/mocha.opts diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 07849aa5c5c..6b89b3b7123 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,9 +52,9 @@ ], "scripts": { "system-test": "mocha system-test/*.js --timeout 600000", - "cover": "nyc --reporter=lcov mocha --require intelli-espower-loader test/*.js --timeout 0 && nyc report", + "cover": "nyc --reporter=lcov mocha test/*.js --timeout 0 && nyc report", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", - "test-no-cover": "mocha test/*.js --no-timeouts", + "test-no-cover": "mocha test/*.js", "test": "npm run cover", "lint": "eslint src/ samples/ system-test/ test/", "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", diff --git a/handwritten/pubsub/test/mocha.opts b/handwritten/pubsub/test/mocha.opts new file mode 100644 index 00000000000..3e740ac6e4c --- /dev/null +++ b/handwritten/pubsub/test/mocha.opts @@ -0,0 +1,2 @@ +--require intelli-espower-loader +--timeout 10000 From 79c00ef9454b554587d78eafb12a57044116c0dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 30 Jul 2018 18:44:58 -0700 Subject: [PATCH 0188/1115] chore(deps): lock file maintenance (#196) --- handwritten/pubsub/package-lock.json | 45 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index c5e8a8f66c8..36a26d05a01 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -236,9 +236,9 @@ } }, "@google-cloud/nodejs-repo-tools": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.3.2.tgz", - "integrity": "sha512-Zah0wZcVifSpKIy5ulTFyGpHYAA8h/biYy8X7J2UvaXga5XlyruKrXo2K1VmBxB9MDPXa0Duz8M003pe2Ras3w==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.3.3.tgz", + "integrity": "sha512-aow6Os43uhdgshSe/fr43ESHNl/kHhikim9AOqIMUzEb6mip6H4d8GFKgpO/yoqUUTIhCN3sbpkKktMI5mOQHw==", "dev": true, "requires": { "ava": "0.25.0", @@ -2804,9 +2804,9 @@ "integrity": "sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==" }, "@types/node": { - "version": "10.5.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz", - "integrity": "sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q==" + "version": "10.5.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.4.tgz", + "integrity": "sha512-8TqvB0ReZWwtcd3LXq3YSrBoLyXFgBX/sBZfGye9+YS8zH7/g+i6QRIuiDmwBoTzcQ/pk89nZYTYU4c5akKkzw==" }, "@types/request": { "version": "2.47.1", @@ -4914,12 +4914,13 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "ecc-jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", - "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "optional": true, "requires": { - "jsbn": "~0.1.0" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ecdsa-sig-formatter": { @@ -6721,9 +6722,9 @@ "dev": true }, "grpc": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.13.0.tgz", - "integrity": "sha512-jGxWFYzttSz9pi8mu283jZvo2zIluWonQ918GMHKx8grT57GIVlvx7/82fo7AGS75lbkPoO1T6PZLvCRD9Pbtw==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.13.1.tgz", + "integrity": "sha512-yl0xChnlUISTefOPU2NQ1cYPh5m/DTatEUV6jdRyQPE9NCrtPq7Gn6J2alMTglN7ufYbJapOd00dvhGurHH6HQ==", "requires": { "lodash": "^4.17.5", "nan": "^2.0.0", @@ -6937,12 +6938,12 @@ } }, "node-pre-gyp": { - "version": "0.10.2", + "version": "0.10.3", "bundled": true, "requires": { "detect-libc": "^1.0.2", "mkdirp": "^0.5.1", - "needle": "^2.2.0", + "needle": "^2.2.1", "nopt": "^4.0.1", "npm-packlist": "^1.1.6", "npmlog": "^4.0.2", @@ -6965,7 +6966,7 @@ "bundled": true }, "npm-packlist": { - "version": "1.1.10", + "version": "1.1.11", "bundled": true, "requires": { "ignore-walk": "^3.0.1", @@ -7922,9 +7923,9 @@ "dev": true }, "istanbul-lib-instrument": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.1.tgz", - "integrity": "sha512-h9Vg3nfbxrF0PK0kZiNiMAyL8zXaLiBP/BXniaKSwVvAi1TaumYV2b0wPdmy1CRX3irYbYD1p4Wjbv4uyECiiQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.2.tgz", + "integrity": "sha512-l7TD/VnBsIB2OJvSyxaLW/ab1+92dxZNH9wLH7uHPPioy3JZ8tnx2UXUdKmdkgmP2EFPzg64CToUP6dAS3U32Q==", "dev": true, "requires": { "@babel/generator": "7.0.0-beta.51", @@ -11514,9 +11515,9 @@ "dev": true }, "prettier": { - "version": "1.13.7", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz", - "integrity": "sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.14.0.tgz", + "integrity": "sha512-KtQ2EGaUwf2EyDfp1fxyEb0PqGKakVm0WyXwDt6u+cAoxbO2Z2CwKvOe3+b4+F2IlO9lYHi1kqFuRM70ddBnow==", "dev": true }, "pretty-ms": { From 9b9f351148e234bc75759a10a7d7daf9e3458750 Mon Sep 17 00:00:00 2001 From: "Tejasvi (Teju) Nareddy" Date: Tue, 31 Jul 2018 06:30:48 -0700 Subject: [PATCH 0189/1115] Fixes 177: Prevents publishing attributes that have non-string values (#183) Fixes #177 If the attributes object has non-string values, publishing fails. This change adds extra checks to ensure all values are string typed. Additionally, this precondition is documented. Testing Done: - [x] Added a new unit test and ran the test suite - [x] Ensured the docs contain the new information - [x] Checked code coverage - [x] Ran eslint - [x] Manual testing --- handwritten/pubsub/CONTRIBUTORS | 1 + handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/publisher.js | 25 ++++++++++++++++++------- handwritten/pubsub/test/publisher.js | 18 +++++++++++++++++- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/CONTRIBUTORS b/handwritten/pubsub/CONTRIBUTORS index 5e93dd89e6d..a35eb2a19c5 100644 --- a/handwritten/pubsub/CONTRIBUTORS +++ b/handwritten/pubsub/CONTRIBUTORS @@ -20,6 +20,7 @@ Justin King Matthew Arbesfeld Song Wang Stephen Sawchuk +Tejasvi Nareddy Tim Swast greenkeeper[bot] mkamioner diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6b89b3b7123..cd14576a91c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -46,6 +46,7 @@ "Matthew Arbesfeld ", "Song Wang ", "Stephen Sawchuk ", + "Tejasvi Nareddy ", "Tim Swast ", "greenkeeper[bot] ", "mkamioner " diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index c8ec440dab2..3abb2f0bb3d 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -109,10 +109,11 @@ function Publisher(topic, options) { * Publish the provided message. * * @throws {TypeError} If data is not a Buffer object. + * @throws {TypeError} If any value in `attributes` object is not a string. * * @param {buffer} data The message data. This must come in the form of a * Buffer object. - * @param {object} [attributes] Optional attributes for this message. + * @param {object.} [attributes] Attributes for this message. * @param {PublisherPublishCallback} [callback] Callback function. * @returns {Promise} * @@ -135,7 +136,7 @@ function Publisher(topic, options) { * * //- * // Optionally you can provide an object containing attributes for the - * // message. + * // message. Note that all values in the object must be strings. * //- * const attributes = { * key: 'value' @@ -148,14 +149,24 @@ function Publisher(topic, options) { * //- * publisher.publish(data).then(function(messageId) {}); */ -Publisher.prototype.publish = function(data, attrs, callback) { +Publisher.prototype.publish = function(data, attributes, callback) { if (!(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); } - if (is.fn(attrs)) { - callback = attrs; - attrs = {}; + if (is.fn(attributes)) { + callback = attributes; + attributes = {}; + } + + // Ensure the `attributes` object only has string values + for (var key in attributes) { + var value = attributes[key]; + + if (!is.string(value)) { + throw new TypeError(`All attributes must be in the form of a string. +\nInvalid value of type "${typeof value}" provided for "${key}".`); + } } var opts = this.settings.batching; @@ -167,7 +178,7 @@ Publisher.prototype.publish = function(data, attrs, callback) { } // add it to the queue! - this.queue_(data, attrs, callback); + this.queue_(data, attributes, callback); // next lets check if this message brings us to the message cap or if we // magically hit the max byte limit diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index 9b558a99b79..9a834c6dafe 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -153,10 +153,26 @@ describe('Publisher', function() { it('should throw an error when data is not a buffer', function() { assert.throws(function() { - publisher.publish('hello', {}, fakeUtil.noop); + publisher.publish('hello', {}, assert.ifError); }, /Data must be in the form of a Buffer\./); }); + it('should throw when an attribute value is not a string', function() { + var brokenAttrs = { + key1: 'value', + key2: true, + }; + + var expectedErrorMessage = ` +All attributes must be in the form of a string. +\nInvalid value of type "${typeof true}" provided for "key2". + `.trim(); + + assert.throws(function() { + publisher.publish(DATA, brokenAttrs, assert.ifError); + }, new RegExp(expectedErrorMessage)); + }); + it('should queue the data', function(done) { publisher.queue_ = function(data, attrs, callback) { assert.strictEqual(data, DATA); From 37c11ea6454dc917f470e7daa118b79471914b64 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Wed, 1 Aug 2018 19:09:54 -0700 Subject: [PATCH 0190/1115] fix(deps): update dependency google-gax to ^0.18.0 (#197) --- handwritten/pubsub/package-lock.json | 73 ++++++++++++++++++++++------ handwritten/pubsub/package.json | 2 +- 2 files changed, 60 insertions(+), 15 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 36a26d05a01..6c37b006678 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -331,6 +331,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -1459,7 +1460,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", @@ -2648,6 +2650,24 @@ } } }, + "@grpc/proto-loader": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.3.0.tgz", + "integrity": "sha512-9b8S/V+3W4Gv7G/JKSZ48zApgyYbfIR7mAC9XNnaSWme3zj57MIESu0ELzm9j5oxNIpFG8DgO00iJMIUZ5luqw==", + "requires": { + "@types/lodash": "^4.14.104", + "@types/node": "^9.4.6", + "lodash": "^4.17.5", + "protobufjs": "^6.8.6" + }, + "dependencies": { + "@types/node": { + "version": "9.6.25", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.25.tgz", + "integrity": "sha512-uZpzO9MKSHy7zBiTtziA3JgZP3upcAvLTASkKgheLj6/rNZmRX4UyvsFYaY2kbYcmmh8bNZ2T0eocBRCfZdGvQ==" + } + } + }, "@ladjs/time-require": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", @@ -2798,6 +2818,11 @@ "@types/node": "*" } }, + "@types/lodash": { + "version": "4.14.115", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.115.tgz", + "integrity": "sha512-9K/P4XMQxk61omAzQh3bbbFiqnG17eLcFysjlAYz0aPcYrVo8T+ujaCeIeY0Gpzux7x1YbxtEtLKB7ZWf79qdg==" + }, "@types/long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz", @@ -2865,6 +2890,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -2876,6 +2902,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -5961,12 +5988,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5981,17 +6010,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6108,7 +6140,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6120,6 +6153,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6134,6 +6168,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6141,12 +6176,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6165,6 +6202,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6245,7 +6283,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6257,6 +6296,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6378,6 +6418,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6631,10 +6672,11 @@ } }, "google-gax": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.17.1.tgz", - "integrity": "sha512-fAKvFx++SRr6bGWamWuVOkJzJnQqMgpJkhaB2oEwfFJ91rbFgEmIPRmZZ/MeIVVFUOuHUVyZ8nwjm5peyTZJ6g==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.18.0.tgz", + "integrity": "sha512-cF2s3aTw1cWDHsjaYfIizJZT0KJF0FSM3laiCX4O/K0ZcdmeE9PitG2bxRH+dY+Sz094//m+JoH1hBtSyOf67A==", "requires": { + "@grpc/proto-loader": "^0.3.0", "duplexify": "^3.6.0", "extend": "^3.0.1", "globby": "^8.0.1", @@ -6643,7 +6685,7 @@ "grpc": "^1.12.2", "is-stream-ended": "^0.1.4", "lodash": "^4.17.10", - "protobufjs": "^6.8.6", + "protobufjs": "^6.8.8", "retry-request": "^4.0.0", "through2": "^2.0.3" } @@ -8310,7 +8352,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.4.0", @@ -8883,6 +8926,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -9825,7 +9869,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "lru-cache": { "version": "4.1.3", diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cd14576a91c..978bd16b2f4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -71,7 +71,7 @@ "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auth-library": "^1.6.0", - "google-gax": "^0.17.1", + "google-gax": "^0.18.0", "google-proto-files": "^0.16.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", From bd21911864da7c09918e2f8d6d44115b5db59f41 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 2 Aug 2018 05:11:46 -0700 Subject: [PATCH 0191/1115] remove that whitespace (#198) --- handwritten/pubsub/test/mocha.opts | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/test/mocha.opts b/handwritten/pubsub/test/mocha.opts index 3e740ac6e4c..8751e7bae37 100644 --- a/handwritten/pubsub/test/mocha.opts +++ b/handwritten/pubsub/test/mocha.opts @@ -1,2 +1,3 @@ --require intelli-espower-loader --timeout 10000 +--throw-deprecation From c42f8c0d4884a15730a705c628ba9a78daf844fd Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 6 Aug 2018 13:53:09 -0700 Subject: [PATCH 0192/1115] chore: use split common modules (#200) --- handwritten/pubsub/.gitignore | 1 + handwritten/pubsub/package-lock.json | 63 +++++++++++----------- handwritten/pubsub/package.json | 3 ++ handwritten/pubsub/src/connection-pool.js | 3 +- handwritten/pubsub/src/iam.js | 4 +- handwritten/pubsub/src/index.js | 26 ++++----- handwritten/pubsub/src/publisher.js | 4 +- handwritten/pubsub/src/snapshot.js | 3 +- handwritten/pubsub/src/subscriber.js | 5 +- handwritten/pubsub/src/subscription.js | 3 +- handwritten/pubsub/src/topic.js | 8 +-- handwritten/pubsub/test/connection-pool.js | 13 ++++- handwritten/pubsub/test/iam.js | 8 ++- handwritten/pubsub/test/index.js | 43 ++++++--------- handwritten/pubsub/test/publisher.js | 35 ++++++------ handwritten/pubsub/test/snapshot.js | 13 +++-- handwritten/pubsub/test/subscriber.js | 21 +++++--- handwritten/pubsub/test/subscription.js | 21 ++++---- handwritten/pubsub/test/topic.js | 12 ++--- 19 files changed, 150 insertions(+), 139 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index b7d407606fb..afbfe1ba9c6 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -7,3 +7,4 @@ out/ system-test/secrets.js system-test/*key.json *.lock +.vscode diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 6c37b006678..9f50b07bdf8 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -331,7 +331,6 @@ "version": "0.1.4", "bundled": true, "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -1460,8 +1459,7 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "loose-envify": { "version": "1.3.1", @@ -2650,6 +2648,28 @@ } } }, + "@google-cloud/paginator": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-0.1.0.tgz", + "integrity": "sha512-YXGajlrh7gPftJJMpGBqAercCFFEYYmw78gV6KZCxfB/XivOBVXOT+QfonwSxP9VRTat/qCTn8ETLuKc10p4fQ==", + "requires": { + "arrify": "^1.0.1", + "extend": "^3.0.1", + "is": "^3.2.1", + "split-array-stream": "^2.0.0", + "stream-events": "^1.0.4" + } + }, + "@google-cloud/projectify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.0.tgz", + "integrity": "sha512-ic3vU+rBLlQ9rU6vyMcQ/GoYQX9hP0P56jdbnSkGvXrVnO1DtYrkPV3Qg/NUrpAfKnmNC4hb0O/v2hCj8uGnbQ==" + }, + "@google-cloud/promisify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.0.tgz", + "integrity": "sha512-5xfpwK9iIAwZrKtG+SnEKZkgnce9Hsew1dkeYNyP/slAxTIdS9wjSUJ5Waq/dfsYphkHSGyH6F9lwqJlD5Zsyw==" + }, "@grpc/proto-loader": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.3.0.tgz", @@ -2890,7 +2910,6 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -2902,7 +2921,6 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, - "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -5988,14 +6006,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6010,20 +6026,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -6140,8 +6153,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -6153,7 +6165,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6168,7 +6179,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6176,14 +6186,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6202,7 +6210,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -6283,8 +6290,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -6296,7 +6302,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6418,7 +6423,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8352,8 +8356,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true + "dev": true }, "loose-envify": { "version": "1.4.0", @@ -8926,7 +8929,6 @@ "version": "0.1.4", "bundled": true, "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -9869,8 +9871,7 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "lru-cache": { "version": "4.1.3", diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 978bd16b2f4..934afd0a2cb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -65,6 +65,9 @@ }, "dependencies": { "@google-cloud/common": "^0.20.0", + "@google-cloud/paginator": "^0.1.0", + "@google-cloud/projectify": "^0.3.0", + "@google-cloud/promisify": "^0.3.0", "arrify": "^1.0.0", "async-each": "^1.0.1", "delay": "^3.0.0", diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index b6c1794ad40..d51d0718ae5 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -17,6 +17,7 @@ 'use strict'; var common = require('@google-cloud/common'); +const {replaceProjectIdToken} = require('@google-cloud/projectify'); var duplexify = require('duplexify'); var each = require('async-each'); var events = require('events'); @@ -233,7 +234,7 @@ ConnectionPool.prototype.createConnection = function() { .on('error', onConnectionError) .on('data', onConnectionData) .write({ - subscription: common.util.replaceProjectIdToken( + subscription: replaceProjectIdToken( self.subscription.name, self.pubsub.projectId ), diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index a43698a83ea..d940206bfc1 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -21,7 +21,7 @@ 'use strict'; var arrify = require('arrify'); -var common = require('@google-cloud/common'); +const {promisifyAll} = require('@google-cloud/promisify'); var is = require('is'); /** @@ -332,6 +332,6 @@ IAM.prototype.testPermissions = function(permissions, gaxOpts, callback) { * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -common.util.promisifyAll(IAM); +promisifyAll(IAM); module.exports = IAM; diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index bfac2947f9f..e6d5ec76a82 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -16,11 +16,13 @@ 'use strict'; -var common = require('@google-cloud/common'); +const {replaceProjectIdToken} = require('@google-cloud/projectify'); +const {paginator} = require('@google-cloud/paginator'); +const {promisifyAll} = require('@google-cloud/promisify'); var extend = require('extend'); var {GoogleAuth} = require('google-auth-library'); var gax = require('google-gax'); -var grpc = new gax.GrpcClient().grpc; +var {grpc} = new gax.GrpcClient(); var is = require('is'); var PKG = require('../package.json'); @@ -97,7 +99,7 @@ function PubSub(options) { return new PubSub(options); } - options = common.util.normalizeArguments(this, options); + options = options || {}; // Determine what scopes are needed. // It is the union of the scopes on both clients. @@ -483,9 +485,7 @@ PubSub.prototype.getSnapshots = function(options, callback) { * this.end(); * }); */ -PubSub.prototype.getSnapshotsStream = common.paginator.streamify( - 'getSnapshots' -); +PubSub.prototype.getSnapshotsStream = paginator.streamify('getSnapshots'); /** * Query object for listing subscriptions. @@ -629,7 +629,7 @@ PubSub.prototype.getSubscriptions = function(options, callback) { * this.end(); * }); */ -PubSub.prototype.getSubscriptionsStream = common.paginator.streamify( +PubSub.prototype.getSubscriptionsStream = paginator.streamify( 'getSubscriptions' ); @@ -768,7 +768,7 @@ PubSub.prototype.getTopics = function(options, callback) { * this.end(); * }); */ -PubSub.prototype.getTopicsStream = common.paginator.streamify('getTopics'); +PubSub.prototype.getTopicsStream = paginator.streamify('getTopics'); /** * Get the PubSub client object. @@ -832,7 +832,7 @@ PubSub.prototype.request = function(config, callback) { } var reqOpts = extend(true, {}, config.reqOpts); - reqOpts = common.util.replaceProjectIdToken(reqOpts, self.projectId); + reqOpts = replaceProjectIdToken(reqOpts, self.projectId); client[config.method](reqOpts, config.gaxOpts, callback); }); @@ -933,18 +933,14 @@ PubSub.prototype.topic = function(name, options) { * * These methods can be agto-paginated. */ -common.paginator.extend(PubSub, [ - 'getSnapshots', - 'getSubscriptions', - 'getTopics', -]); +paginator.extend(PubSub, ['getSnapshots', 'getSubscriptions', 'getTopics']); /*! Developer Documentation * * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -common.util.promisifyAll(PubSub, { +promisifyAll(PubSub, { exclude: ['request', 'snapshot', 'subscription', 'topic'], }); diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index 3abb2f0bb3d..2c0f66ee013 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -17,7 +17,7 @@ 'use strict'; var arrify = require('arrify'); -var common = require('@google-cloud/common'); +const {promisifyAll} = require('@google-cloud/promisify'); var each = require('async-each'); var extend = require('extend'); var is = require('is'); @@ -263,7 +263,7 @@ Publisher.prototype.queue_ = function(data, attrs, callback) { * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -common.util.promisifyAll(Publisher, { +promisifyAll(Publisher, { singular: true, }); diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index d65366b9b17..e332b8f3400 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -17,6 +17,7 @@ 'use strict'; var common = require('@google-cloud/common'); +const {promisifyAll} = require('@google-cloud/promisify'); var is = require('is'); /** @@ -211,6 +212,6 @@ Snapshot.prototype.delete = function(callback) { * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -common.util.promisifyAll(Snapshot); +promisifyAll(Snapshot); module.exports = Snapshot; diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js index 7a5f0eddf51..faa009643cb 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.js @@ -19,6 +19,7 @@ var arrify = require('arrify'); var chunk = require('lodash.chunk'); var common = require('@google-cloud/common'); +const {promisify} = require('@google-cloud/promisify'); var delay = require('delay'); var events = require('events'); var extend = require('extend'); @@ -138,7 +139,7 @@ Subscriber.prototype.acknowledge_ = function(ackIds, connId) { return self.writeTo_(connId, {ackIds: ackIdChunk}); } - return common.util.promisify(self.request).call(self, { + return promisify(self.request).call(self, { client: 'SubscriberClient', method: 'acknowledge', reqOpts: { @@ -396,7 +397,7 @@ Subscriber.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { }); } - return common.util.promisify(self.request).call(self, { + return promisify(self.request).call(self, { client: 'SubscriberClient', method: 'modifyAckDeadline', reqOpts: { diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index e436f50cf44..9d2a1a759e2 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -17,6 +17,7 @@ 'use strict'; var common = require('@google-cloud/common'); +const {promisifyAll} = require('@google-cloud/promisify'); var extend = require('extend'); var is = require('is'); var snakeCase = require('lodash.snakecase'); @@ -784,7 +785,7 @@ Subscription.prototype.snapshot = function(name) { * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -common.util.promisifyAll(Subscription, { +promisifyAll(Subscription, { exclude: ['snapshot'], }); diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 259ce6f2dab..03cdca5f0ed 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -17,6 +17,8 @@ 'use strict'; var common = require('@google-cloud/common'); +const {promisifyAll} = require('@google-cloud/promisify'); +const {paginator} = require('@google-cloud/paginator'); var extend = require('extend'); var is = require('is'); @@ -531,7 +533,7 @@ Topic.prototype.getSubscriptions = function(options, callback) { * this.end(); * }); */ -Topic.prototype.getSubscriptionsStream = common.paginator.streamify( +Topic.prototype.getSubscriptionsStream = paginator.streamify( 'getSubscriptions' ); @@ -616,14 +618,14 @@ Topic.prototype.subscription = function(name, options) { * * These methods can be agto-paginated. */ -common.paginator.extend(Topic, ['getSubscriptions']); +paginator.extend(Topic, ['getSubscriptions']); /*! Developer Documentation * * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -common.util.promisifyAll(Topic, { +promisifyAll(Topic, { exclude: ['publisher', 'subscription'], }); diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index ca4d1134e85..ece74985920 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -24,6 +24,7 @@ var extend = require('extend'); var proxyquire = require('proxyquire'); var uuid = require('uuid'); var util = require('util'); +const pjy = require('@google-cloud/projectify'); var fakeUtil = extend({}, common.util); var fakeUuid = extend({}, uuid); @@ -99,11 +100,19 @@ describe('ConnectionPool', function() { request: fakeUtil.noop, }; + let pjyOverride; + function fakePjy() { + return (pjyOverride || pjy.replaceProjectIdToken).apply(null, arguments); + } + before(function() { ConnectionPool = proxyquire('../src/connection-pool.js', { '@google-cloud/common': { util: fakeUtil, }, + '@google-cloud/projectify': { + replaceProjectIdToken: fakePjy, + }, duplexify: fakeDuplexify, uuid: fakeUuid, }); @@ -527,7 +536,7 @@ describe('ConnectionPool', function() { return fakeId; }; - fakeUtil.replaceProjectIdToken = common.util.replaceProjectIdToken; + pjyOverride = null; }); it('should create a connection', function(done) { @@ -539,7 +548,7 @@ describe('ConnectionPool', function() { return fakeDuplex; }; - fakeUtil.replaceProjectIdToken = function(subName, projectId) { + pjyOverride = function(subName, projectId) { assert.strictEqual(subName, SUB_NAME); assert.strictEqual(projectId, PROJECT_ID); return TOKENIZED_SUB_NAME; diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index f9d01614bb0..f284a804751 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -19,10 +19,10 @@ var assert = require('assert'); var extend = require('extend'); var proxyquire = require('proxyquire'); -var util = require('@google-cloud/common').util; +var {util} = require('@google-cloud/common'); var promisified = false; -var fakeUtil = extend({}, util, { +var fakePromisify = extend({}, util, { promisifyAll: function(Class) { if (Class.name === 'IAM') { promisified = true; @@ -43,9 +43,7 @@ describe('IAM', function() { before(function() { IAM = proxyquire('../src/iam.js', { - '@google-cloud/common': { - util: fakeUtil, - }, + '@google-cloud/promisify': fakePromisify, }); }); diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 06d3bb156c6..1c7fa3d1e74 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -22,6 +22,7 @@ var extend = require('extend'); var gax = require('google-gax'); var proxyquire = require('proxyquire'); var util = require('@google-cloud/common').util; +const pjy = require('@google-cloud/projectify'); var PKG = require('../package.json'); @@ -50,7 +51,7 @@ function Subscription(a, b, c) { } var promisified = false; -var fakeUtil = extend({}, util, { +var fakePromisify = extend({}, util, { promisifyAll: function(Class, options) { if (Class.name !== 'PubSub') { return; @@ -66,6 +67,11 @@ var fakeUtil = extend({}, util, { }, }); +let pjyOverride; +function fakePjy() { + return (pjyOverride || pjy.replaceProjectIdToken).apply(this, arguments); +} + function FakeSnapshot() { this.calledWith_ = arguments; } @@ -133,9 +139,12 @@ describe('PubSub', function() { before(function() { delete process.env.PUBSUB_EMULATOR_HOST; PubSub = proxyquire('../', { - '@google-cloud/common': { + '@google-cloud/paginator': { paginator: fakePaginator, - util: fakeUtil, + }, + '@google-cloud/promisify': fakePromisify, + '@google-cloud/projectify': { + replaceProjectIdToken: fakePjy, }, 'google-auth-library': { GoogleAuth: fakeGoogleAuth, @@ -155,10 +164,6 @@ describe('PubSub', function() { }); beforeEach(function() { - fakeUtil.normalizeArguments = function(context, options) { - return options; - }; - v1ClientOverrides = {}; googleAuthOverride = null; SubscriptionOverride = null; @@ -185,19 +190,6 @@ describe('PubSub', function() { assert(PubSub() instanceof PubSub); }); - it('should normalize the arguments', function() { - var normalizeArgumentsCalled = false; - - fakeUtil.normalizeArguments = function(context, options) { - normalizeArgumentsCalled = true; - assert.strictEqual(options, OPTIONS); - return options; - }; - - new PubSub(OPTIONS); - assert.strictEqual(normalizeArgumentsCalled, true); - }); - it('should combine all required scopes', function() { v1ClientOverrides.SubscriberClient = {}; v1ClientOverrides.SubscriberClient.scopes = ['a', 'b', 'c']; @@ -1023,7 +1015,7 @@ describe('PubSub', function() { }, }; - fakeUtil.replaceProjectIdToken = function(reqOpts) { + pjyOverride = function(reqOpts) { return reqOpts; }; @@ -1065,12 +1057,11 @@ describe('PubSub', function() { }); it('should replace the project id token on reqOpts', function(done) { - fakeUtil.replaceProjectIdToken = function(reqOpts, projectId) { + pjyOverride = function(reqOpts, projectId) { assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); done(); }; - pubsub.request(CONFIG, assert.ifError); }); }); @@ -1201,7 +1192,7 @@ describe('PubSub', function() { }; beforeEach(function() { - fakeUtil.replaceProjectIdToken = function(reqOpts) { + pjyOverride = function(reqOpts) { return reqOpts; }; @@ -1233,7 +1224,7 @@ describe('PubSub', function() { }); it('should replace the project id token on reqOpts', function(done) { - fakeUtil.replaceProjectIdToken = function(reqOpts, projectId) { + pjyOverride = function(reqOpts, projectId) { assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); done(); @@ -1252,7 +1243,7 @@ describe('PubSub', function() { var replacedReqOpts = {}; - fakeUtil.replaceProjectIdToken = function() { + pjyOverride = function() { return replacedReqOpts; }; diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index 9a834c6dafe..a2d5c2d1e4c 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -17,12 +17,13 @@ 'use strict'; var assert = require('assert'); -var common = require('@google-cloud/common'); +var {util} = require('@google-cloud/common'); +const pfy = require('@google-cloud/promisify'); var extend = require('extend'); var proxyquire = require('proxyquire'); var promisified = false; -var fakeUtil = extend({}, common.util, { +var fakePromisify = extend({}, pfy, { promisifyAll: function(Class, options) { if (Class.name === 'Publisher') { assert.deepStrictEqual(options, {singular: true}); @@ -40,19 +41,17 @@ describe('Publisher', function() { var TOPIC = { name: TOPIC_NAME, Promise: {}, - request: fakeUtil.noop, + request: util.noop, }; before(function() { Publisher = proxyquire('../src/publisher.js', { - '@google-cloud/common': { - util: fakeUtil, - }, + '@google-cloud/promisify': fakePromisify, }); }); beforeEach(function() { - TOPIC.request = fakeUtil.noop; + TOPIC.request = util.noop; publisher = new Publisher(TOPIC); batchOpts = publisher.settings.batching; }); @@ -143,8 +142,8 @@ describe('Publisher', function() { }); beforeEach(function() { - publisher.publish_ = fakeUtil.noop; - global.setTimeout = fakeUtil.noop; + publisher.publish_ = util.noop; + global.setTimeout = util.noop; }); after(function() { @@ -218,7 +217,7 @@ All attributes must be in the form of a string. publisher.publish_ = done; publisher.inventory_.bytes = batchOpts.maxBytes - DATA.length; - publisher.publish(DATA, fakeUtil.noop); + publisher.publish(DATA, util.noop); }); it('should publish if data puts payload at message cap', function(done) { @@ -234,7 +233,7 @@ All attributes must be in the form of a string. }; publisher.inventory_.queued = Array(batchOpts.maxMessages).fill({}); - publisher.publish(DATA, fakeUtil.noop); + publisher.publish(DATA, util.noop); }); it('should set a timeout if a publish did not occur', function(done) { @@ -249,7 +248,7 @@ All attributes must be in the form of a string. }; publisher.publish_ = done; - publisher.publish(DATA, fakeUtil.noop); + publisher.publish(DATA, util.noop); assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); }); @@ -258,7 +257,7 @@ All attributes must be in the form of a string. var fakeTimeoutHandle = 'not-a-real-handle'; publisher.timeoutHandle_ = 'not-a-real-handle'; - publisher.publish(DATA, fakeUtil.noop); + publisher.publish(DATA, util.noop); assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); }); }); @@ -272,7 +271,7 @@ All attributes must be in the form of a string. }); it('should reset the inventory object', function() { - publisher.inventory_.callbacks.push(fakeUtil.noop); + publisher.inventory_.callbacks.push(util.noop); publisher.inventory_.queued.push({}); publisher.inventory_.bytes = 5; @@ -340,7 +339,7 @@ All attributes must be in the form of a string. var ATTRS = {a: 'a'}; it('should add the data and attrs to the inventory', function() { - publisher.queue_(DATA, ATTRS, fakeUtil.noop); + publisher.queue_(DATA, ATTRS, util.noop); assert.deepStrictEqual(publisher.inventory_.queued, [ { @@ -351,15 +350,15 @@ All attributes must be in the form of a string. }); it('should update the inventory size', function() { - publisher.queue_(DATA, ATTRS, fakeUtil.noop); + publisher.queue_(DATA, ATTRS, util.noop); assert.strictEqual(publisher.inventory_.bytes, DATA.length); }); it('should capture the callback', function() { - publisher.queue_(DATA, ATTRS, fakeUtil.noop); + publisher.queue_(DATA, ATTRS, util.noop); - assert.deepStrictEqual(publisher.inventory_.callbacks, [fakeUtil.noop]); + assert.deepStrictEqual(publisher.inventory_.callbacks, [util.noop]); }); }); }); diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.js index e46fb5b4e7e..73edf72c0ec 100644 --- a/handwritten/pubsub/test/snapshot.js +++ b/handwritten/pubsub/test/snapshot.js @@ -17,12 +17,13 @@ 'use strict'; var assert = require('assert'); -var common = require('@google-cloud/common'); +var {util} = require('@google-cloud/common'); var extend = require('extend'); var proxyquire = require('proxyquire'); +const pfy = require('@google-cloud/promisify'); var promisified = false; -var fakeUtil = extend({}, common.util, { +var fakePromisify = extend({}, pfy, { promisifyAll: function(Class) { if (Class.name === 'Snapshot') { promisified = true; @@ -52,14 +53,12 @@ describe('Snapshot', function() { before(function() { Snapshot = proxyquire('../src/snapshot.js', { - '@google-cloud/common': { - util: fakeUtil, - }, + '@google-cloud/promisify': fakePromisify, }); }); beforeEach(function() { - fakeUtil.noop = function() {}; + util.noop = function() {}; snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); }); @@ -182,7 +181,7 @@ describe('Snapshot', function() { }); it('should optionally accept a callback', function(done) { - fakeUtil.noop = done; + util.noop = done; snapshot.parent.request = function(config, callback) { callback(); // the done fn diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.js index 782ebbd0efe..5df616ca905 100644 --- a/handwritten/pubsub/test/subscriber.js +++ b/handwritten/pubsub/test/subscriber.js @@ -24,9 +24,15 @@ var extend = require('extend'); var is = require('is'); var proxyquire = require('proxyquire'); var util = require('util'); +const pfy = require('@google-cloud/promisify'); var fakeUtil = extend({}, common.util); +let promisifyOverride; +function fakePromisify() { + return (promisifyOverride || pfy.promisify).apply(null, arguments); +} + var FAKE_FREE_MEM = 168222720; var fakeOs = { freemem: function() { @@ -62,6 +68,9 @@ describe('Subscriber', function() { '@google-cloud/common': { util: fakeUtil, }, + '@google-cloud/promisify': { + promisify: fakePromisify, + }, delay: fakeDelay, os: fakeOs, './connection-pool.js': FakeConnectionPool, @@ -274,7 +283,7 @@ describe('Subscriber', function() { }, }; - fakeUtil.promisify = function(fn) { + promisifyOverride = function(fn) { assert.strictEqual(fn, subscriber.request); return fakePromisified; }; @@ -305,7 +314,7 @@ describe('Subscriber', function() { }, }; - fakeUtil.promisify = function() { + promisifyOverride = function() { return fakePromisified; }; @@ -321,7 +330,7 @@ describe('Subscriber', function() { }, }; - fakeUtil.promisify = function() { + promisifyOverride = function() { return fakePromisified; }; @@ -849,7 +858,7 @@ describe('Subscriber', function() { }, }; - fakeUtil.promisify = function(fn) { + promisifyOverride = function(fn) { assert.strictEqual(fn, subscriber.request); return fakePromisified; }; @@ -881,7 +890,7 @@ describe('Subscriber', function() { }, }; - fakeUtil.promisify = function() { + promisifyOverride = function() { return fakePromisified; }; @@ -897,7 +906,7 @@ describe('Subscriber', function() { }, }; - fakeUtil.promisify = function() { + promisifyOverride = function() { return fakePromisified; }; diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 7d99c75060b..fbae0be6bb6 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -17,12 +17,13 @@ 'use strict'; var assert = require('assert'); -var common = require('@google-cloud/common'); +var {util} = require('@google-cloud/common'); var extend = require('extend'); var proxyquire = require('proxyquire'); +const pfy = require('@google-cloud/promisify'); var promisified = false; -var fakeUtil = extend({}, common.util, { +var fakePromisify = extend({}, pfy, { promisifyAll: function(Class, options) { if (Class.name !== 'Subscription') { return; @@ -56,14 +57,12 @@ describe('Subscription', function() { var PUBSUB = { projectId: PROJECT_ID, Promise: {}, - request: fakeUtil.noop, + request: util.noop, }; before(function() { Subscription = proxyquire('../src/subscription.js', { - '@google-cloud/common': { - util: fakeUtil, - }, + '@google-cloud/promisify': fakePromisify, './iam.js': FakeIAM, './snapshot.js': FakeSnapshot, './subscriber.js': FakeSubscriber, @@ -71,7 +70,7 @@ describe('Subscription', function() { }); beforeEach(function() { - PUBSUB.request = fakeUtil.noop = function() {}; + PUBSUB.request = util.noop = function() {}; subscription = new Subscription(PUBSUB, SUB_NAME); }); @@ -287,8 +286,8 @@ describe('Subscription', function() { describe('delete', function() { beforeEach(function() { - subscription.removeAllListeners = fakeUtil.noop; - subscription.close = fakeUtil.noop; + subscription.removeAllListeners = util.noop; + subscription.close = util.noop; }); it('should make the correct request', function(done) { @@ -325,7 +324,7 @@ describe('Subscription', function() { }); it('should optionally accept a callback', function(done) { - fakeUtil.noop = function(err, resp) { + util.noop = function(err, resp) { assert.ifError(err); assert.strictEqual(resp, apiResponse); done(); @@ -451,7 +450,7 @@ describe('Subscription', function() { describe('get', function() { beforeEach(function() { - subscription.create = fakeUtil.noop; + subscription.create = util.noop; }); it('should delete the autoCreate option', function(done) { diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index bcd677d8554..e82484df203 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -19,15 +19,15 @@ var assert = require('assert'); var extend = require('extend'); var proxyquire = require('proxyquire'); -var util = require('@google-cloud/common').util; +var {util} = require('@google-cloud/common'); +const pfy = require('@google-cloud/promisify'); var promisified = false; -var fakeUtil = extend({}, util, { +var fakePromisify = extend({}, pfy, { promisifyAll: function(Class, options) { if (Class.name !== 'Topic') { return; } - promisified = true; assert.deepStrictEqual(options.exclude, ['publisher', 'subscription']); }, @@ -73,9 +73,9 @@ describe('Topic', function() { before(function() { Topic = proxyquire('../src/topic.js', { - '@google-cloud/common': { + '@google-cloud/promisify': fakePromisify, + '@google-cloud/paginator': { paginator: fakePaginator, - util: fakeUtil, }, './iam.js': FakeIAM, './publisher.js': FakePublisher, @@ -206,7 +206,7 @@ describe('Topic', function() { }); it('should optionally accept a callback', function(done) { - fakeUtil.noop = done; + util.noop = done; topic.request = function(config, callback) { callback(); // the done fn From f79d9679098775a516eef53b7a27750863bec788 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 6 Aug 2018 19:07:35 -0700 Subject: [PATCH 0193/1115] chore(deps): lock file maintenance (#203) --- handwritten/pubsub/package-lock.json | 91 +++++++++++++--------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 9f50b07bdf8..5a863554d5f 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -2839,9 +2839,9 @@ } }, "@types/lodash": { - "version": "4.14.115", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.115.tgz", - "integrity": "sha512-9K/P4XMQxk61omAzQh3bbbFiqnG17eLcFysjlAYz0aPcYrVo8T+ujaCeIeY0Gpzux7x1YbxtEtLKB7ZWf79qdg==" + "version": "4.14.116", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.116.tgz", + "integrity": "sha512-lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg==" }, "@types/long": { "version": "4.0.0", @@ -2849,9 +2849,9 @@ "integrity": "sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==" }, "@types/node": { - "version": "10.5.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.4.tgz", - "integrity": "sha512-8TqvB0ReZWwtcd3LXq3YSrBoLyXFgBX/sBZfGye9+YS8zH7/g+i6QRIuiDmwBoTzcQ/pk89nZYTYU4c5akKkzw==" + "version": "10.5.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.7.tgz", + "integrity": "sha512-VkKcfuitP+Nc/TaTFH0B8qNmn+6NbI6crLkQonbedViVz7O2w8QV/GERPlkJ4bg42VGHiEWa31CoTOPs1q6z1w==" }, "@types/request": { "version": "2.47.1", @@ -3188,9 +3188,12 @@ } }, "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } }, "assert-plus": { "version": "1.0.0", @@ -3403,9 +3406,9 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", - "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" }, "axios": { "version": "0.18.0", @@ -4062,9 +4065,9 @@ "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, "buffer-from": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", - "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, "builtin-modules": { @@ -5203,9 +5206,9 @@ } }, "eslint": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.2.0.tgz", - "integrity": "sha512-zlggW1qp7/TBjwLfouRoY7eWXrXwJZFqCdIxxh0/LVB/QuuKuIMkzyUZEcDo6LBadsry5JcEMxIqd3H/66CXVg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.3.0.tgz", + "integrity": "sha512-N/tCqlMKkyNvAvLu+zI9AqDasnSLt00K+Hu8kdsERliC9jYEc8ck12XtjvOXrBKu8fK6RrBcN9bat6Xk++9jAg==", "dev": true, "requires": { "ajv": "^6.5.0", @@ -5239,7 +5242,7 @@ "path-is-inside": "^1.0.2", "pluralize": "^7.0.0", "progress": "^2.0.0", - "regexpp": "^1.1.0", + "regexpp": "^2.0.0", "require-uncached": "^1.0.3", "semver": "^5.5.0", "string.prototype.matchall": "^2.0.0", @@ -5293,9 +5296,9 @@ "dev": true }, "ignore": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.2.tgz", - "integrity": "sha512-uoxnT7PYpyEnsja+yX+7v49B7LXxmzDJ2JALqHH3oEGzpM2U1IGcbfnOr8Dt57z3B/UWs7/iAgPFbmye8m4I0g==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.3.tgz", + "integrity": "sha512-Z/vAH2GGIEATQnBVXMclE2IGV6i0GyVngKThcGZ5kHgHMxLo9Ow2+XHRq1aEKEej5vOF1TPJNbvX6J/anT0M7A==", "dev": true }, "json-schema-traverse": { @@ -5340,14 +5343,6 @@ "requires": { "eslint-utils": "^1.3.0", "regexpp": "^2.0.0" - }, - "dependencies": { - "regexpp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz", - "integrity": "sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==", - "dev": true - } } }, "eslint-plugin-node": { @@ -5365,9 +5360,9 @@ }, "dependencies": { "ignore": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.2.tgz", - "integrity": "sha512-uoxnT7PYpyEnsja+yX+7v49B7LXxmzDJ2JALqHH3oEGzpM2U1IGcbfnOr8Dt57z3B/UWs7/iAgPFbmye8m4I0g==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.3.tgz", + "integrity": "sha512-Z/vAH2GGIEATQnBVXMclE2IGV6i0GyVngKThcGZ5kHgHMxLo9Ow2+XHRq1aEKEej5vOF1TPJNbvX6J/anT0M7A==", "dev": true }, "resolve": { @@ -5884,9 +5879,9 @@ "dev": true }, "follow-redirects": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.1.tgz", - "integrity": "sha512-v9GI1hpaqq1ZZR6pBD1+kI7O24PhDvNGNodjS3MdcEqyrahCp8zbtpv+2B/krUnSmUH80lbAS7MrdeK5IylgKg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.2.tgz", + "integrity": "sha512-kssLorP/9acIdpQ2udQVTiCS5LQmdEz9mvdIfDcl1gYX2tPKFADHSyFdvJS040XdFsPzemWtgI3q8mFVCxtX8A==", "requires": { "debug": "^3.1.0" } @@ -11296,9 +11291,9 @@ "dev": true }, "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "dev": true }, "path-to-regexp": { @@ -11832,9 +11827,9 @@ } }, "regexpp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", - "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz", + "integrity": "sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==", "dev": true }, "regexpu-core": { @@ -12129,9 +12124,9 @@ "dev": true }, "sanitize-html": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.2.tgz", - "integrity": "sha512-52ThA+Z7h6BnvpSVbURwChl10XZrps5q7ytjTwWcIe9bmJwnVP6cpEVK2NvDOUhGupoqAvNbUz3cpnJDp4+/pg==", + "version": "1.18.4", + "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.4.tgz", + "integrity": "sha512-hjyDYCYrQuhnEjq+5lenLlIfdPBtnZ7z0DkQOC8YGxvkuOInH+1SrkNTj30t4f2/SSv9c5kLniB+uCIpBvYuew==", "dev": true, "requires": { "chalk": "^2.3.0", @@ -13253,9 +13248,9 @@ "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, "validate-npm-package-license": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", - "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { "spdx-correct": "^3.0.0", From 8d961c6840d2d8c166140411470aa13b46a6b4e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 7 Aug 2018 07:45:48 -0700 Subject: [PATCH 0194/1115] fix(deps): update dependency @google-cloud/common to ^0.21.0 (#206) --- handwritten/pubsub/package-lock.json | 49 ++++++++++++++++++++-------- handwritten/pubsub/package.json | 2 +- 2 files changed, 36 insertions(+), 15 deletions(-) diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json index 5a863554d5f..3fcc523e810 100644 --- a/handwritten/pubsub/package-lock.json +++ b/handwritten/pubsub/package-lock.json @@ -214,10 +214,11 @@ } }, "@google-cloud/common": { - "version": "0.20.3", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.20.3.tgz", - "integrity": "sha512-jt8/R4EqDTQccv5WA9AEaS65llM5+mlxsuWu57G5Os8HTIpgPbcsOVMUeIvmTrBuPUYSoRIMW8d/pvv/95n0+g==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.21.0.tgz", + "integrity": "sha512-oJxKimj3Rf9U4R/LOPAirBPnbHUBykY6NUpf2vPKNAW9yLrNgYwOk5ZZiiXWQ6Zy2WodGEDo2b75JZLk8kyheg==", "requires": { + "@google-cloud/promisify": "^0.3.0", "@types/duplexify": "^3.5.0", "@types/request": "^2.47.0", "arrify": "^1.0.1", @@ -230,7 +231,6 @@ "pify": "^3.0.0", "request": "^2.87.0", "retry-request": "^4.0.0", - "split-array-stream": "^2.0.0", "stream-events": "^1.0.4", "through2": "^2.0.3" } @@ -331,6 +331,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -1459,7 +1460,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", @@ -2910,6 +2912,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -2921,6 +2924,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -6001,12 +6005,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6021,17 +6027,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6148,7 +6157,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6160,6 +6170,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6174,6 +6185,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6181,12 +6193,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6205,6 +6219,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6285,7 +6300,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6297,6 +6313,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6418,6 +6435,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8351,7 +8369,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.4.0", @@ -8924,6 +8943,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -9866,7 +9886,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "lru-cache": { "version": "4.1.3", diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 934afd0a2cb..987d3894272 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -64,7 +64,7 @@ "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" }, "dependencies": { - "@google-cloud/common": "^0.20.0", + "@google-cloud/common": "^0.21.0", "@google-cloud/paginator": "^0.1.0", "@google-cloud/projectify": "^0.3.0", "@google-cloud/promisify": "^0.3.0", From 82f4d1c34d33f961823796b6e193ce0f65290a81 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 7 Aug 2018 14:00:30 -0700 Subject: [PATCH 0195/1115] chore: ignore package-lock.json (#207) * chore: ignore package-log.json * remove locky * renovateeee --- handwritten/pubsub/.circleci/config.yml | 17 +- .../pubsub/.circleci/get_workflow_name.py | 67 - handwritten/pubsub/.gitignore | 1 + handwritten/pubsub/package-lock.json | 13490 ---------------- 4 files changed, 2 insertions(+), 13573 deletions(-) delete mode 100644 handwritten/pubsub/.circleci/get_workflow_name.py delete mode 100644 handwritten/pubsub/package-lock.json diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index cf867c5f06d..dd4c80cc6e9 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -59,18 +59,7 @@ jobs: - image: 'node:6' user: node steps: &unit_tests_steps - - checkout - - run: &remove_package_lock - name: Remove package-lock.json if needed. - command: | - WORKFLOW_NAME=`python .circleci/get_workflow_name.py` - echo "Workflow name: $WORKFLOW_NAME" - if [ "$WORKFLOW_NAME" = "nightly" ]; then - echo "Nightly build detected, removing package-lock.json." - rm -f package-lock.json samples/package-lock.json - else - echo "Not a nightly build, skipping this step." - fi + - checkout - run: &npm_install_and_link name: Install and link the module command: |- @@ -97,7 +86,6 @@ jobs: user: node steps: - checkout - - run: *remove_package_lock - run: *npm_install_and_link - run: &samples_npm_install_and_link name: Link the module being tested to the samples. @@ -118,7 +106,6 @@ jobs: user: node steps: - checkout - - run: *remove_package_lock - run: *npm_install_and_link - run: name: Build documentation. @@ -129,7 +116,6 @@ jobs: user: node steps: - checkout - - run: *remove_package_lock - run: name: Decrypt credentials. command: | @@ -156,7 +142,6 @@ jobs: user: node steps: - checkout - - run: *remove_package_lock - run: name: Decrypt credentials. command: | diff --git a/handwritten/pubsub/.circleci/get_workflow_name.py b/handwritten/pubsub/.circleci/get_workflow_name.py deleted file mode 100644 index ff6b58fd24f..00000000000 --- a/handwritten/pubsub/.circleci/get_workflow_name.py +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2018 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -""" -Get workflow name for the current build using CircleCI API. -Would be great if this information is available in one of -CircleCI environment variables, but it's not there. -https://circleci.ideas.aha.io/ideas/CCI-I-295 -""" - -import json -import os -import sys -import urllib2 - - -def main(): - try: - username = os.environ['CIRCLE_PROJECT_USERNAME'] - reponame = os.environ['CIRCLE_PROJECT_REPONAME'] - build_num = os.environ['CIRCLE_BUILD_NUM'] - except: - sys.stderr.write( - 'Looks like we are not inside CircleCI container. Exiting...\n') - return 1 - - try: - request = urllib2.Request( - "https://circleci.com/api/v1.1/project/github/%s/%s/%s" % - (username, reponame, build_num), - headers={"Accept": "application/json"}) - contents = urllib2.urlopen(request).read() - except: - sys.stderr.write('Cannot query CircleCI API. Exiting...\n') - return 1 - - try: - build_info = json.loads(contents) - except: - sys.stderr.write( - 'Cannot parse JSON received from CircleCI API. Exiting...\n') - return 1 - - try: - workflow_name = build_info['workflows']['workflow_name'] - except: - sys.stderr.write( - 'Cannot get workflow name from CircleCI build info. Exiting...\n') - return 1 - - print workflow_name - return 0 - - -retval = main() -exit(retval) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index afbfe1ba9c6..a03dee0d922 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -8,3 +8,4 @@ system-test/secrets.js system-test/*key.json *.lock .vscode +package-lock.json diff --git a/handwritten/pubsub/package-lock.json b/handwritten/pubsub/package-lock.json deleted file mode 100644 index 3fcc523e810..00000000000 --- a/handwritten/pubsub/package-lock.json +++ /dev/null @@ -1,13490 +0,0 @@ -{ - "name": "@google-cloud/pubsub", - "version": "0.19.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ava/babel-plugin-throws-helper": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@ava/babel-plugin-throws-helper/-/babel-plugin-throws-helper-2.0.0.tgz", - "integrity": "sha1-L8H+PCEacQcaTsp7j3r1hCzRrnw=", - "dev": true - }, - "@ava/babel-preset-stage-4": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@ava/babel-preset-stage-4/-/babel-preset-stage-4-1.1.0.tgz", - "integrity": "sha512-oWqTnIGXW3k72UFidXzW0ONlO7hnO9x02S/QReJ7NBGeiBH9cUHY9+EfV6C8PXC6YJH++WrliEq03wMSJGNZFg==", - "dev": true, - "requires": { - "babel-plugin-check-es2015-constants": "^6.8.0", - "babel-plugin-syntax-trailing-function-commas": "^6.20.0", - "babel-plugin-transform-async-to-generator": "^6.16.0", - "babel-plugin-transform-es2015-destructuring": "^6.19.0", - "babel-plugin-transform-es2015-function-name": "^6.9.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0", - "babel-plugin-transform-es2015-parameters": "^6.21.0", - "babel-plugin-transform-es2015-spread": "^6.8.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.8.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.11.0", - "babel-plugin-transform-exponentiation-operator": "^6.8.0", - "package-hash": "^1.2.0" - }, - "dependencies": { - "md5-hex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", - "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", - "dev": true, - "requires": { - "md5-o-matic": "^0.1.1" - } - }, - "package-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-1.2.0.tgz", - "integrity": "sha1-AD5WzVe3NqbtYRTMK4FUJnJ3DkQ=", - "dev": true, - "requires": { - "md5-hex": "^1.3.0" - } - } - } - }, - "@ava/babel-preset-transform-test-files": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@ava/babel-preset-transform-test-files/-/babel-preset-transform-test-files-3.0.0.tgz", - "integrity": "sha1-ze0RlqjY2TgaUJJAq5LpGl7Aafc=", - "dev": true, - "requires": { - "@ava/babel-plugin-throws-helper": "^2.0.0", - "babel-plugin-espower": "^2.3.2" - } - }, - "@ava/write-file-atomic": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ava/write-file-atomic/-/write-file-atomic-2.2.0.tgz", - "integrity": "sha512-BTNB3nGbEfJT+69wuqXFr/bQH7Vr7ihx2xGOMNqPgDGhwspoZhiWumDDZNjBy7AScmqS5CELIOGtPVXESyrnDA==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" - } - }, - "@babel/code-frame": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz", - "integrity": "sha1-vXHZsZKvl435FYKdOdQJRFZDmgw=", - "dev": true, - "requires": { - "@babel/highlight": "7.0.0-beta.51" - } - }, - "@babel/generator": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.51.tgz", - "integrity": "sha1-bHV1/952HQdIXgS67cA5LG2eMPY=", - "dev": true, - "requires": { - "@babel/types": "7.0.0-beta.51", - "jsesc": "^2.5.1", - "lodash": "^4.17.5", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", - "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", - "dev": true - } - } - }, - "@babel/helper-function-name": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.51.tgz", - "integrity": "sha1-IbSHSiJ8+Z7K/MMKkDAtpaJkBWE=", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "7.0.0-beta.51", - "@babel/template": "7.0.0-beta.51", - "@babel/types": "7.0.0-beta.51" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.51.tgz", - "integrity": "sha1-MoGy0EWvlcFyzpGyCCXYXqRnZBE=", - "dev": true, - "requires": { - "@babel/types": "7.0.0-beta.51" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.51.tgz", - "integrity": "sha1-imw/ZsTSZTUvwHdIT59ugKUauXg=", - "dev": true, - "requires": { - "@babel/types": "7.0.0-beta.51" - } - }, - "@babel/highlight": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.51.tgz", - "integrity": "sha1-6IRK4loVlcz9QriWI7Q3bKBtIl0=", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^3.0.0" - } - }, - "@babel/parser": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.51.tgz", - "integrity": "sha1-J87C30Cd9gr1gnDtj2qlVAnqhvY=", - "dev": true - }, - "@babel/template": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.51.tgz", - "integrity": "sha1-lgKkCuvPNXrpZ34lMu9fyBD1+/8=", - "dev": true, - "requires": { - "@babel/code-frame": "7.0.0-beta.51", - "@babel/parser": "7.0.0-beta.51", - "@babel/types": "7.0.0-beta.51", - "lodash": "^4.17.5" - } - }, - "@babel/traverse": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.51.tgz", - "integrity": "sha1-mB2vLOw0emIx06odnhgDsDqqpKg=", - "dev": true, - "requires": { - "@babel/code-frame": "7.0.0-beta.51", - "@babel/generator": "7.0.0-beta.51", - "@babel/helper-function-name": "7.0.0-beta.51", - "@babel/helper-split-export-declaration": "7.0.0-beta.51", - "@babel/parser": "7.0.0-beta.51", - "@babel/types": "7.0.0-beta.51", - "debug": "^3.1.0", - "globals": "^11.1.0", - "invariant": "^2.2.0", - "lodash": "^4.17.5" - }, - "dependencies": { - "globals": { - "version": "11.7.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", - "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", - "dev": true - } - } - }, - "@babel/types": { - "version": "7.0.0-beta.51", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.51.tgz", - "integrity": "sha1-2AK3tUO1g2x3iqaReXq/APPZfqk=", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.5", - "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true - } - } - }, - "@concordance/react": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@concordance/react/-/react-1.0.0.tgz", - "integrity": "sha512-htrsRaQX8Iixlsek8zQU7tE8wcsTQJ5UhZkSPEA8slCDAisKpC/2VgU/ucPn32M5/LjGGXRaUEKvEw1Wiuu4zQ==", - "dev": true, - "requires": { - "arrify": "^1.0.1" - } - }, - "@google-cloud/common": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.21.0.tgz", - "integrity": "sha512-oJxKimj3Rf9U4R/LOPAirBPnbHUBykY6NUpf2vPKNAW9yLrNgYwOk5ZZiiXWQ6Zy2WodGEDo2b75JZLk8kyheg==", - "requires": { - "@google-cloud/promisify": "^0.3.0", - "@types/duplexify": "^3.5.0", - "@types/request": "^2.47.0", - "arrify": "^1.0.1", - "axios": "^0.18.0", - "duplexify": "^3.6.0", - "ent": "^2.2.0", - "extend": "^3.0.1", - "google-auth-library": "^1.6.0", - "is": "^3.2.1", - "pify": "^3.0.0", - "request": "^2.87.0", - "retry-request": "^4.0.0", - "stream-events": "^1.0.4", - "through2": "^2.0.3" - } - }, - "@google-cloud/nodejs-repo-tools": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@google-cloud/nodejs-repo-tools/-/nodejs-repo-tools-2.3.3.tgz", - "integrity": "sha512-aow6Os43uhdgshSe/fr43ESHNl/kHhikim9AOqIMUzEb6mip6H4d8GFKgpO/yoqUUTIhCN3sbpkKktMI5mOQHw==", - "dev": true, - "requires": { - "ava": "0.25.0", - "colors": "1.1.2", - "fs-extra": "5.0.0", - "got": "8.3.0", - "handlebars": "4.0.11", - "lodash": "4.17.5", - "nyc": "11.7.2", - "proxyquire": "1.8.0", - "semver": "^5.5.0", - "sinon": "6.0.1", - "string": "3.3.3", - "supertest": "3.1.0", - "yargs": "11.0.0", - "yargs-parser": "10.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", - "dev": true - }, - "nyc": { - "version": "11.7.2", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.7.2.tgz", - "integrity": "sha512-gBt7qwsR1vryYfglVjQRx1D+AtMZW5NbUKxb+lZe8SN8KsheGCPGWEsSC9AGQG+r2+te1+10uPHUCahuqm1nGQ==", - "dev": true, - "requires": { - "archy": "^1.0.0", - "arrify": "^1.0.1", - "caching-transform": "^1.0.0", - "convert-source-map": "^1.5.1", - "debug-log": "^1.0.1", - "default-require-extensions": "^1.0.0", - "find-cache-dir": "^0.1.1", - "find-up": "^2.1.0", - "foreground-child": "^1.5.3", - "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.1.2", - "istanbul-lib-hook": "^1.1.0", - "istanbul-lib-instrument": "^1.10.0", - "istanbul-lib-report": "^1.1.3", - "istanbul-lib-source-maps": "^1.2.3", - "istanbul-reports": "^1.4.0", - "md5-hex": "^1.2.0", - "merge-source-map": "^1.1.0", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.0", - "resolve-from": "^2.0.0", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.1", - "spawn-wrap": "^1.4.2", - "test-exclude": "^4.2.0", - "yargs": "11.1.0", - "yargs-parser": "^8.0.0" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - } - }, - "amdefine": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "bundled": true, - "dev": true - }, - "append-transform": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "requires": { - "default-require-extensions": "^1.0.0" - } - }, - "archy": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "arr-diff": { - "version": "4.0.0", - "bundled": true, - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "bundled": true, - "dev": true - }, - "arrify": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "async": { - "version": "1.5.2", - "bundled": true, - "dev": true - }, - "atob": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "babel-code-frame": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - } - }, - "babel-generator": { - "version": "6.26.1", - "bundled": true, - "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "bundled": true, - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "base": { - "version": "0.11.2", - "bundled": true, - "dev": true, - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "builtin-modules": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "cache-base": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } - }, - "caching-transform": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" - } - }, - "camelcase": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true - }, - "center-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } - }, - "chalk": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "class-utils": { - "version": "0.3.6", - "bundled": true, - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "cliui": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "collection-visit": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, - "commondir": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "bundled": true, - "dev": true - }, - "copy-descriptor": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "core-js": { - "version": "2.5.6", - "bundled": true, - "dev": true - }, - "cross-spawn": { - "version": "4.0.2", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "debug-log": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "decamelize": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "bundled": true, - "dev": true - }, - "default-require-extensions": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "strip-bom": "^2.0.0" - } - }, - "define-property": { - "version": "2.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "detect-indent": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "error-ex": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "esutils": { - "version": "2.0.2", - "bundled": true, - "dev": true - }, - "execa": { - "version": "0.7.0", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - } - } - }, - "expand-brackets": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "extend-shallow": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "extglob": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "fill-range": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "find-cache-dir": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "for-in": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "foreground-child": { - "version": "1.5.6", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" - } - }, - "fragment-cache": { - "version": "0.2.1", - "bundled": true, - "dev": true, - "requires": { - "map-cache": "^0.2.2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "get-value": { - "version": "2.0.6", - "bundled": true, - "dev": true - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "globals": { - "version": "9.18.0", - "bundled": true, - "dev": true - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "handlebars": { - "version": "4.0.11", - "bundled": true, - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "bundled": true, - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "has-ansi": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-flag": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "has-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "kind-of": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "hosted-git-info": { - "version": "2.6.0", - "bundled": true, - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "bundled": true, - "dev": true - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "invariant": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, - "invert-kv": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-arrayish": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "is-buffer": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true - } - } - }, - "is-extendable": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-odd": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "bundled": true, - "dev": true - } - } - }, - "is-plain-object": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "is-stream": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isexe": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, - "istanbul-lib-coverage": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "istanbul-lib-hook": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "append-transform": "^0.4.0" - } - }, - "istanbul-lib-instrument": { - "version": "1.10.1", - "bundled": true, - "dev": true, - "requires": { - "babel-generator": "^6.18.0", - "babel-template": "^6.16.0", - "babel-traverse": "^6.18.0", - "babel-types": "^6.18.0", - "babylon": "^6.18.0", - "istanbul-lib-coverage": "^1.2.0", - "semver": "^5.3.0" - } - }, - "istanbul-lib-report": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "istanbul-lib-coverage": "^1.1.2", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" - }, - "dependencies": { - "supports-color": { - "version": "3.2.3", - "bundled": true, - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "1.2.3", - "bundled": true, - "dev": true, - "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.1.2", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "istanbul-reports": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "handlebars": "^4.0.3" - } - }, - "js-tokens": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "jsesc": { - "version": "1.3.0", - "bundled": true, - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "lazy-cache": { - "version": "1.0.4", - "bundled": true, - "dev": true, - "optional": true - }, - "lcid": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "bundled": true, - "dev": true - } - } - }, - "lodash": { - "version": "4.17.10", - "bundled": true, - "dev": true - }, - "longest": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "loose-envify": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "js-tokens": "^3.0.0" - } - }, - "lru-cache": { - "version": "4.1.3", - "bundled": true, - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "map-cache": { - "version": "0.2.2", - "bundled": true, - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "object-visit": "^1.0.0" - } - }, - "md5-hex": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "md5-o-matic": "^0.1.1" - } - }, - "md5-o-matic": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "mem": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "merge-source-map": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "bundled": true, - "dev": true - } - } - }, - "micromatch": { - "version": "3.1.10", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "mimic-fn": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mixin-deep": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "nanomatch": { - "version": "1.2.9", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-odd": "^2.0.0", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "normalize-package-data": { - "version": "2.4.0", - "bundled": true, - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "npm-run-path": { - "version": "2.0.2", - "bundled": true, - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true - }, - "object-copy": { - "version": "0.1.0", - "bundled": true, - "dev": true, - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "object-visit": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "optimist": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "p-finally": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "p-limit": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "parse-json": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "pascalcase": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "path-exists": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "path-key": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "path-type": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "bundled": true, - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "bundled": true, - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "pkg-dir": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "find-up": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - } - } - }, - "posix-character-classes": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - } - } - }, - "regenerator-runtime": { - "version": "0.11.1", - "bundled": true, - "dev": true - }, - "regex-not": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - } - }, - "repeat-element": { - "version": "1.1.2", - "bundled": true, - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "bundled": true, - "dev": true - }, - "repeating": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "require-directory": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "resolve-from": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "resolve-url": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "ret": { - "version": "0.1.15", - "bundled": true, - "dev": true - }, - "right-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-regex": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "ret": "~0.1.10" - } - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "set-value": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "shebang-command": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "slide": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "snapdragon": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.2.0" - } - }, - "source-map": { - "version": "0.5.7", - "bundled": true, - "dev": true - }, - "source-map-resolve": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "atob": "^2.0.0", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "source-map-url": { - "version": "0.4.0", - "bundled": true, - "dev": true - }, - "spawn-wrap": { - "version": "1.4.2", - "bundled": true, - "dev": true, - "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" - } - }, - "spdx-correct": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "bundled": true, - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "split-string": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^3.0.0" - } - }, - "static-extend": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "string-width": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-eof": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "test-exclude": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "requires": { - "arrify": "^1.0.1", - "micromatch": "^3.1.8", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", - "require-main-filename": "^1.0.1" - } - }, - "to-fast-properties": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "to-object-path": { - "version": "0.3.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "to-regex": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - } - }, - "to-regex-range": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "trim-right": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "uglify-js": { - "version": "2.8.29", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "yargs": { - "version": "3.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "union-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } - } - }, - "unset-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "bundled": true, - "dev": true, - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "bundled": true, - "dev": true - } - } - }, - "urix": { - "version": "0.1.0", - "bundled": true, - "dev": true - }, - "use": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "validate-npm-package-license": { - "version": "3.0.3", - "bundled": true, - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "which": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "window-size": { - "version": "0.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "wordwrap": { - "version": "0.0.3", - "bundled": true, - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "write-file-atomic": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" - } - }, - "y18n": { - "version": "3.2.1", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "2.1.2", - "bundled": true, - "dev": true - }, - "yargs": { - "version": "11.1.0", - "bundled": true, - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - }, - "cliui": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "yargs-parser": { - "version": "9.0.2", - "bundled": true, - "dev": true, - "requires": { - "camelcase": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "8.1.0", - "bundled": true, - "dev": true, - "requires": { - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - } - } - } - } - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "proxyquire": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz", - "integrity": "sha1-AtUUpb7ZhvBMuyCTrxZ0FTX3ntw=", - "dev": true, - "requires": { - "fill-keys": "^1.0.2", - "module-not-found-error": "^1.0.0", - "resolve": "~1.1.7" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "yargs": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", - "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - }, - "dependencies": { - "yargs-parser": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", - "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - } - } - } - } - } - }, - "@google-cloud/paginator": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-0.1.0.tgz", - "integrity": "sha512-YXGajlrh7gPftJJMpGBqAercCFFEYYmw78gV6KZCxfB/XivOBVXOT+QfonwSxP9VRTat/qCTn8ETLuKc10p4fQ==", - "requires": { - "arrify": "^1.0.1", - "extend": "^3.0.1", - "is": "^3.2.1", - "split-array-stream": "^2.0.0", - "stream-events": "^1.0.4" - } - }, - "@google-cloud/projectify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-0.3.0.tgz", - "integrity": "sha512-ic3vU+rBLlQ9rU6vyMcQ/GoYQX9hP0P56jdbnSkGvXrVnO1DtYrkPV3Qg/NUrpAfKnmNC4hb0O/v2hCj8uGnbQ==" - }, - "@google-cloud/promisify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.0.tgz", - "integrity": "sha512-5xfpwK9iIAwZrKtG+SnEKZkgnce9Hsew1dkeYNyP/slAxTIdS9wjSUJ5Waq/dfsYphkHSGyH6F9lwqJlD5Zsyw==" - }, - "@grpc/proto-loader": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.3.0.tgz", - "integrity": "sha512-9b8S/V+3W4Gv7G/JKSZ48zApgyYbfIR7mAC9XNnaSWme3zj57MIESu0ELzm9j5oxNIpFG8DgO00iJMIUZ5luqw==", - "requires": { - "@types/lodash": "^4.14.104", - "@types/node": "^9.4.6", - "lodash": "^4.17.5", - "protobufjs": "^6.8.6" - }, - "dependencies": { - "@types/node": { - "version": "9.6.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.25.tgz", - "integrity": "sha512-uZpzO9MKSHy7zBiTtziA3JgZP3upcAvLTASkKgheLj6/rNZmRX4UyvsFYaY2kbYcmmh8bNZ2T0eocBRCfZdGvQ==" - } - } - }, - "@ladjs/time-require": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@ladjs/time-require/-/time-require-0.1.4.tgz", - "integrity": "sha512-weIbJqTMfQ4r1YX85u54DKfjLZs2jwn1XZ6tIOP/pFgMwhIN5BAtaCp/1wn9DzyLsDR9tW0R2NIePcVJ45ivQQ==", - "dev": true, - "requires": { - "chalk": "^0.4.0", - "date-time": "^0.1.1", - "pretty-ms": "^0.2.1", - "text-table": "^0.2.0" - }, - "dependencies": { - "ansi-styles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz", - "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=", - "dev": true - }, - "chalk": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz", - "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", - "dev": true, - "requires": { - "ansi-styles": "~1.0.0", - "has-color": "~0.1.0", - "strip-ansi": "~0.1.0" - } - }, - "pretty-ms": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz", - "integrity": "sha1-2oeaaC/zOjcBEEbxPWJ/Z8c7hPY=", - "dev": true, - "requires": { - "parse-ms": "^0.1.0" - } - }, - "strip-ansi": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz", - "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=", - "dev": true - } - } - }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" - } - }, - "@nodelib/fs.stat": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz", - "integrity": "sha512-LAQ1d4OPfSJ/BMbI2DuizmYrrkD9JMaTdi2hQTlI53lQ4kRQPyZQRS4CYQ7O66bnBBnP/oYdRxbk++X0xuFU6A==" - }, - "@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78=" - }, - "@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A=" - }, - "@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=", - "requires": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=" - }, - "@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=" - }, - "@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=" - }, - "@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=" - }, - "@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" - }, - "@sindresorhus/is": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", - "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", - "dev": true - }, - "@sinonjs/formatio": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz", - "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==", - "dev": true, - "requires": { - "samsam": "1.3.0" - } - }, - "@types/caseless": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz", - "integrity": "sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==" - }, - "@types/duplexify": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.5.0.tgz", - "integrity": "sha512-+aZCCdxuR/Q6n58CBkXyqGqimIqpYUcFLfBXagXv7e9TdJUevqkKhzopBuRz3RB064sQxnJnhttHOkK/O93Ouw==", - "requires": { - "@types/node": "*" - } - }, - "@types/form-data": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz", - "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==", - "requires": { - "@types/node": "*" - } - }, - "@types/lodash": { - "version": "4.14.116", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.116.tgz", - "integrity": "sha512-lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg==" - }, - "@types/long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz", - "integrity": "sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==" - }, - "@types/node": { - "version": "10.5.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.7.tgz", - "integrity": "sha512-VkKcfuitP+Nc/TaTFH0B8qNmn+6NbI6crLkQonbedViVz7O2w8QV/GERPlkJ4bg42VGHiEWa31CoTOPs1q6z1w==" - }, - "@types/request": { - "version": "2.47.1", - "resolved": "https://registry.npmjs.org/@types/request/-/request-2.47.1.tgz", - "integrity": "sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==", - "requires": { - "@types/caseless": "*", - "@types/form-data": "*", - "@types/node": "*", - "@types/tough-cookie": "*" - } - }, - "@types/tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ==" - }, - "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==" - }, - "acorn-es7-plugin": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz", - "integrity": "sha1-8u4fMiipDurRJF+asZIusucdM2s=" - }, - "acorn-jsx": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-4.1.1.tgz", - "integrity": "sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==", - "dev": true, - "requires": { - "acorn": "^5.0.3" - } - }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, - "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "optional": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "optional": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", - "dev": true, - "requires": { - "string-width": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, - "requires": { - "micromatch": "^2.1.5", - "normalize-path": "^2.0.0" - }, - "dependencies": { - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" - } - } - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "argv": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/argv/-/argv-0.0.2.tgz", - "integrity": "sha1-7L0W+JSbFXGDcRsb2jNPN4QBhas=", - "dev": true - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "arr-exclude": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/arr-exclude/-/arr-exclude-1.0.0.tgz", - "integrity": "sha1-38fC5VKicHI8zaBM8xKMjL/lxjE=", - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-filter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz", - "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=" - }, - "array-find": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz", - "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" - }, - "ascli": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz", - "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", - "requires": { - "colour": "~0.7.1", - "optjs": "~3.2.2" - } - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" - }, - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "dev": true, - "requires": { - "lodash": "^4.17.10" - } - }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "atob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", - "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=" - }, - "auto-bind": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.1.tgz", - "integrity": "sha512-/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA==", - "dev": true - }, - "ava": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/ava/-/ava-0.25.0.tgz", - "integrity": "sha512-4lGNJCf6xL8SvsKVEKxEE46se7JAUIAZoKHw9itTQuwcsydhpAMkBs5gOOiWiwt0JKNIuXWc2/r4r8ZdcNrBEw==", - "dev": true, - "requires": { - "@ava/babel-preset-stage-4": "^1.1.0", - "@ava/babel-preset-transform-test-files": "^3.0.0", - "@ava/write-file-atomic": "^2.2.0", - "@concordance/react": "^1.0.0", - "@ladjs/time-require": "^0.1.4", - "ansi-escapes": "^3.0.0", - "ansi-styles": "^3.1.0", - "arr-flatten": "^1.0.1", - "array-union": "^1.0.1", - "array-uniq": "^1.0.2", - "arrify": "^1.0.0", - "auto-bind": "^1.1.0", - "ava-init": "^0.2.0", - "babel-core": "^6.17.0", - "babel-generator": "^6.26.0", - "babel-plugin-syntax-object-rest-spread": "^6.13.0", - "bluebird": "^3.0.0", - "caching-transform": "^1.0.0", - "chalk": "^2.0.1", - "chokidar": "^1.4.2", - "clean-stack": "^1.1.1", - "clean-yaml-object": "^0.1.0", - "cli-cursor": "^2.1.0", - "cli-spinners": "^1.0.0", - "cli-truncate": "^1.0.0", - "co-with-promise": "^4.6.0", - "code-excerpt": "^2.1.1", - "common-path-prefix": "^1.0.0", - "concordance": "^3.0.0", - "convert-source-map": "^1.5.1", - "core-assert": "^0.2.0", - "currently-unhandled": "^0.4.1", - "debug": "^3.0.1", - "dot-prop": "^4.1.0", - "empower-core": "^0.6.1", - "equal-length": "^1.0.0", - "figures": "^2.0.0", - "find-cache-dir": "^1.0.0", - "fn-name": "^2.0.0", - "get-port": "^3.0.0", - "globby": "^6.0.0", - "has-flag": "^2.0.0", - "hullabaloo-config-manager": "^1.1.0", - "ignore-by-default": "^1.0.0", - "import-local": "^0.1.1", - "indent-string": "^3.0.0", - "is-ci": "^1.0.7", - "is-generator-fn": "^1.0.0", - "is-obj": "^1.0.0", - "is-observable": "^1.0.0", - "is-promise": "^2.1.0", - "last-line-stream": "^1.0.0", - "lodash.clonedeepwith": "^4.5.0", - "lodash.debounce": "^4.0.3", - "lodash.difference": "^4.3.0", - "lodash.flatten": "^4.2.0", - "loud-rejection": "^1.2.0", - "make-dir": "^1.0.0", - "matcher": "^1.0.0", - "md5-hex": "^2.0.0", - "meow": "^3.7.0", - "ms": "^2.0.0", - "multimatch": "^2.1.0", - "observable-to-promise": "^0.5.0", - "option-chain": "^1.0.0", - "package-hash": "^2.0.0", - "pkg-conf": "^2.0.0", - "plur": "^2.0.0", - "pretty-ms": "^3.0.0", - "require-precompiled": "^0.1.0", - "resolve-cwd": "^2.0.0", - "safe-buffer": "^5.1.1", - "semver": "^5.4.1", - "slash": "^1.0.0", - "source-map-support": "^0.5.0", - "stack-utils": "^1.0.1", - "strip-ansi": "^4.0.0", - "strip-bom-buf": "^1.0.0", - "supertap": "^1.0.0", - "supports-color": "^5.0.0", - "trim-off-newlines": "^1.0.1", - "unique-temp-dir": "^1.0.0", - "update-notifier": "^2.3.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "empower-core": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-0.6.2.tgz", - "integrity": "sha1-Wt71ZgiOMfuoC6CjbfR9cJQWkUQ=", - "dev": true, - "requires": { - "call-signature": "0.0.2", - "core-js": "^2.0.0" - } - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "ava-init": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ava-init/-/ava-init-0.2.1.tgz", - "integrity": "sha512-lXwK5LM+2g1euDRqW1mcSX/tqzY1QU7EjKpqayFPPtNRmbSYZ8RzPO5tqluTToijmtjp2M+pNpVdbcHssC4glg==", - "dev": true, - "requires": { - "arr-exclude": "^1.0.0", - "execa": "^0.7.0", - "has-yarn": "^1.0.0", - "read-pkg-up": "^2.0.0", - "write-pkg": "^3.1.0" - } - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" - }, - "axios": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", - "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", - "requires": { - "follow-redirects": "^1.3.0", - "is-buffer": "^1.1.5" - } - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - } - } - }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "dev": true, - "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "dev": true, - "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-espower": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/babel-plugin-espower/-/babel-plugin-espower-2.4.0.tgz", - "integrity": "sha512-/+SRpy7pKgTI28oEHfn1wkuM5QFAdRq8WNsOOih1dVrdV6A/WbNbRZyl0eX5eyDgtb0lOE27PeDFuCX2j8OxVg==", - "dev": true, - "requires": { - "babel-generator": "^6.1.0", - "babylon": "^6.1.0", - "call-matcher": "^1.0.0", - "core-js": "^2.0.0", - "espower-location-detector": "^1.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.1.1" - } - }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", - "dev": true - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", - "dev": true - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", - "dev": true - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.2", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", - "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", - "dev": true, - "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "dev": true, - "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "dev": true, - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "dev": true, - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "dev": true, - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - }, - "dependencies": { - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "^0.5.6" - } - } - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "optional": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true - }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", - "dev": true - }, - "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", - "dev": true, - "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "buf-compare": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buf-compare/-/buf-compare-1.0.1.tgz", - "integrity": "sha1-/vKNqLgROgoNtEMLC2Rntpcws0o=", - "dev": true - }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "bytebuffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz", - "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=", - "requires": { - "long": "~3" - }, - "dependencies": { - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - } - } - }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } - }, - "cacheable-request": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", - "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", - "dev": true, - "requires": { - "clone-response": "1.0.2", - "get-stream": "3.0.0", - "http-cache-semantics": "3.8.1", - "keyv": "3.0.0", - "lowercase-keys": "1.0.0", - "normalize-url": "2.0.1", - "responselike": "1.0.2" - }, - "dependencies": { - "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", - "dev": true - } - } - }, - "caching-transform": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-1.0.1.tgz", - "integrity": "sha1-bb2y8g+Nj7znnz6U6dF0Lc31wKE=", - "dev": true, - "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" - }, - "dependencies": { - "md5-hex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-1.3.0.tgz", - "integrity": "sha1-0sSv6YPENwZiF5uMrRRSGRNQRsQ=", - "dev": true, - "requires": { - "md5-o-matic": "^0.1.1" - } - }, - "write-file-atomic": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", - "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" - } - } - } - }, - "call-matcher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-matcher/-/call-matcher-1.0.1.tgz", - "integrity": "sha1-UTTQd5hPcSpU2tPL9i3ijc5BbKg=", - "dev": true, - "requires": { - "core-js": "^2.0.0", - "deep-equal": "^1.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.0.0" - } - }, - "call-me-maybe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", - "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=" - }, - "call-signature": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/call-signature/-/call-signature-0.0.2.tgz", - "integrity": "sha1-qEq8glpV70yysCi9dOIFpluaSZY=" - }, - "caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", - "dev": true, - "requires": { - "callsites": "^0.2.0" - } - }, - "callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", - "dev": true - }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - } - }, - "capture-stack-trace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", - "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=", - "dev": true - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" - }, - "catharsis": { - "version": "0.8.9", - "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz", - "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=", - "dev": true, - "requires": { - "underscore-contrib": "~0.3.0" - } - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "chardet": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", - "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", - "dev": true - }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, - "requires": { - "anymatch": "^1.3.0", - "async-each": "^1.0.0", - "fsevents": "^1.0.0", - "glob-parent": "^2.0.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^2.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0" - }, - "dependencies": { - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "^2.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, - "ci-info": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", - "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", - "dev": true - }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", - "dev": true - }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "clean-stack": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz", - "integrity": "sha1-noIVAa6XmYbEax1m0tQy2y/UrjE=", - "dev": true - }, - "clean-yaml-object": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", - "integrity": "sha1-Y/sRDcLOGoTcIfbZM0h20BCui2g=", - "dev": true - }, - "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", - "dev": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "cli-spinners": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", - "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==", - "dev": true - }, - "cli-truncate": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz", - "integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==", - "dev": true, - "requires": { - "slice-ansi": "^1.0.0", - "string-width": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, - "co-with-promise": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co-with-promise/-/co-with-promise-4.6.0.tgz", - "integrity": "sha1-QT59tvWJOmC5Qs9JLEvsk9tBWrc=", - "dev": true, - "requires": { - "pinkie-promise": "^1.0.0" - } - }, - "code-excerpt": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-2.1.1.tgz", - "integrity": "sha512-tJLhH3EpFm/1x7heIW0hemXJTUU5EWl2V0EIX558jp05Mt1U6DVryCgkp3l37cxqs+DNbNgxG43SkwJXpQ14Jw==", - "dev": true, - "requires": { - "convert-to-spaces": "^1.0.1" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" - }, - "codecov": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.0.4.tgz", - "integrity": "sha512-KJyzHdg9B8U9LxXa7hS6jnEW5b1cNckLYc2YpnJ1nEFiOW+/iSzDHp+5MYEIQd9fN3/tC6WmGZmYiwxzkuGp/A==", - "dev": true, - "requires": { - "argv": "^0.0.2", - "ignore-walk": "^3.0.1", - "request": "^2.87.0", - "urlgrey": "^0.4.4" - } - }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, - "color-convert": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz", - "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==", - "dev": true, - "requires": { - "color-name": "1.1.1" - } - }, - "color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=", - "dev": true - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - }, - "colour": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz", - "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" - }, - "combined-stream": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", - "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", - "dev": true - }, - "common-path-prefix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-1.0.0.tgz", - "integrity": "sha1-zVL28HEuC6q5fW+XModPIvR3UsA=", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "concordance": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/concordance/-/concordance-3.0.0.tgz", - "integrity": "sha512-CZBzJ3/l5QJjlZM20WY7+5GP5pMTw+1UEbThcpMw8/rojsi5sBCiD8ZbBLtD+jYpRGAkwuKuqk108c154V9eyQ==", - "dev": true, - "requires": { - "date-time": "^2.1.0", - "esutils": "^2.0.2", - "fast-diff": "^1.1.1", - "function-name-support": "^0.2.0", - "js-string-escape": "^1.0.1", - "lodash.clonedeep": "^4.5.0", - "lodash.flattendeep": "^4.4.0", - "lodash.merge": "^4.6.0", - "md5-hex": "^2.0.0", - "semver": "^5.3.0", - "well-known-symbols": "^1.0.0" - }, - "dependencies": { - "date-time": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz", - "integrity": "sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==", - "dev": true, - "requires": { - "time-zone": "^1.0.0" - } - } - } - }, - "configstore": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", - "dev": true, - "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" - } - }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true - }, - "convert-to-spaces": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz", - "integrity": "sha1-fj5Iu+bZl7FBfdyihoIEtNPYVxU=", - "dev": true - }, - "cookiejar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", - "dev": true - }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" - }, - "core-assert": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/core-assert/-/core-assert-0.2.1.tgz", - "integrity": "sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8=", - "dev": true, - "requires": { - "buf-compare": "^1.0.0", - "is-error": "^2.2.0" - } - }, - "core-js": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", - "dev": true, - "requires": { - "capture-stack-trace": "^1.0.0" - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", - "dev": true - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "^1.0.1" - } - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "^0.10.9" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "date-time": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz", - "integrity": "sha1-7S9tk9l5DOL9ZtW1/z7dW7y/Owc=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "requires": { - "foreach": "^2.0.5", - "object-keys": "^1.0.8" - } - }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" - }, - "dependencies": { - "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - } - } - }, - "delay": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/delay/-/delay-3.0.0.tgz", - "integrity": "sha512-6d9nF+lHG/HOZTmX/8/FgWm5UZQUF5O2SnnUvBZail1ESK1QixrmFn7vaW9hycz0/uwcmkqLyHDER+/AgCxbsQ==" - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "diff-match-patch": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.1.tgz", - "integrity": "sha512-A0QEhr4PxGUMEtKxd6X+JLnOTFd3BfIPSDpsc4dMvj+CbSaErDwTpoTo/nFJDMSrjxLW4BiNq+FbNisAAHhWeQ==" - }, - "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", - "dev": true, - "requires": { - "domelementtype": "~1.1.1", - "entities": "~1.1.1" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } - } - }, - "domelementtype": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", - "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", - "dev": true - }, - "domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", - "dev": true, - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", - "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "dev": true, - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", - "dev": true, - "requires": { - "is-obj": "^1.0.0" - } - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "duplexify": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", - "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "optional": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "ecdsa-sig-formatter": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz", - "integrity": "sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "empower": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/empower/-/empower-1.3.0.tgz", - "integrity": "sha512-tP2WqM7QzrPguCCQEQfFFDF+6Pw6YWLQal3+GHQaV+0uIr0S+jyREQPWljE02zFCYPFYLZ3LosiRV+OzTrxPpQ==", - "requires": { - "core-js": "^2.0.0", - "empower-core": "^1.2.0" - } - }, - "empower-assert": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/empower-assert/-/empower-assert-1.1.0.tgz", - "integrity": "sha512-Ylck0Q6p8y/LpNzYeBccaxAPm2ZyuqBgErgZpO9KT0HuQWF0sJckBKCLmgS1/DEXEiyBi9XtYh3clZm5cAdARw==", - "dev": true, - "requires": { - "estraverse": "^4.2.0" - } - }, - "empower-core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/empower-core/-/empower-core-1.2.0.tgz", - "integrity": "sha512-g6+K6Geyc1o6FdXs9HwrXleCFan7d66G5xSCfSF7x1mJDCes6t0om9lFQG3zOrzh3Bkb/45N0cZ5Gqsf7YrzGQ==", - "requires": { - "call-signature": "0.0.2", - "core-js": "^2.0.0" - } - }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "requires": { - "once": "^1.4.0" - } - }, - "ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=" - }, - "entities": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", - "dev": true - }, - "equal-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/equal-length/-/equal-length-1.0.1.tgz", - "integrity": "sha1-IcoRLUirJLTh5//A5TOdMf38J0w=", - "dev": true - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-abstract": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", - "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", - "dev": true, - "requires": { - "es-to-primitive": "^1.1.1", - "function-bind": "^1.1.1", - "has": "^1.0.1", - "is-callable": "^1.1.3", - "is-regex": "^1.0.4" - } - }, - "es-to-primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", - "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "dev": true, - "requires": { - "is-callable": "^1.1.1", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.1" - } - }, - "es5-ext": { - "version": "0.10.45", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz", - "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", - "dev": true, - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "1" - } - }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-map": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-set": "~0.1.5", - "es6-symbol": "~3.1.1", - "event-emitter": "~0.3.5" - } - }, - "es6-set": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-symbol": "3.1.1", - "event-emitter": "~0.3.5" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" - } - }, - "escallmatch": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/escallmatch/-/escallmatch-1.5.0.tgz", - "integrity": "sha1-UAmdhugJGwkt+N37w/mm+wWgJNA=", - "dev": true, - "requires": { - "call-matcher": "^1.0.0", - "esprima": "^2.0.0" - }, - "dependencies": { - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - } - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "escodegen": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz", - "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==", - "dev": true, - "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - }, - "dependencies": { - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } - } - }, - "escope": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", - "dev": true, - "requires": { - "es6-map": "^0.1.3", - "es6-weak-map": "^2.0.1", - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.3.0.tgz", - "integrity": "sha512-N/tCqlMKkyNvAvLu+zI9AqDasnSLt00K+Hu8kdsERliC9jYEc8ck12XtjvOXrBKu8fK6RrBcN9bat6Xk++9jAg==", - "dev": true, - "requires": { - "ajv": "^6.5.0", - "babel-code-frame": "^6.26.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^3.1.0", - "doctrine": "^2.1.0", - "eslint-scope": "^4.0.0", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^4.0.0", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", - "ignore": "^4.0.2", - "imurmurhash": "^0.1.4", - "inquirer": "^5.2.0", - "is-resolvable": "^1.1.0", - "js-yaml": "^3.11.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.5", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", - "progress": "^2.0.0", - "regexpp": "^2.0.0", - "require-uncached": "^1.0.3", - "semver": "^5.5.0", - "string.prototype.matchall": "^2.0.0", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^4.0.3", - "text-table": "^0.2.0" - }, - "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.1" - } - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "globals": { - "version": "11.7.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", - "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==", - "dev": true - }, - "ignore": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.3.tgz", - "integrity": "sha512-Z/vAH2GGIEATQnBVXMclE2IGV6i0GyVngKThcGZ5kHgHMxLo9Ow2+XHRq1aEKEej5vOF1TPJNbvX6J/anT0M7A==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "eslint-config-prettier": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", - "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", - "dev": true, - "requires": { - "get-stdin": "^5.0.1" - }, - "dependencies": { - "get-stdin": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", - "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", - "dev": true - } - } - }, - "eslint-plugin-es": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.3.1.tgz", - "integrity": "sha512-9XcVyZiQRVeFjqHw8qHNDAZcQLqaHlOGGpeYqzYh8S4JYCWTCO3yzyen8yVmA5PratfzTRWDwCOFphtDEG+w/w==", - "dev": true, - "requires": { - "eslint-utils": "^1.3.0", - "regexpp": "^2.0.0" - } - }, - "eslint-plugin-node": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz", - "integrity": "sha512-lfVw3TEqThwq0j2Ba/Ckn2ABdwmL5dkOgAux1rvOk6CO7A6yGyPI2+zIxN6FyNkp1X1X/BSvKOceD6mBWSj4Yw==", - "dev": true, - "requires": { - "eslint-plugin-es": "^1.3.1", - "eslint-utils": "^1.3.1", - "ignore": "^4.0.2", - "minimatch": "^3.0.4", - "resolve": "^1.8.1", - "semver": "^5.5.0" - }, - "dependencies": { - "ignore": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.3.tgz", - "integrity": "sha512-Z/vAH2GGIEATQnBVXMclE2IGV6i0GyVngKThcGZ5kHgHMxLo9Ow2+XHRq1aEKEej5vOF1TPJNbvX6J/anT0M7A==", - "dev": true - }, - "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", - "dev": true, - "requires": { - "path-parse": "^1.0.5" - } - } - } - }, - "eslint-plugin-prettier": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.2.tgz", - "integrity": "sha512-tGek5clmW5swrAx1mdPYM8oThrBE83ePh7LeseZHBWfHVGrHPhKn7Y5zgRMbU/9D5Td9K4CEmUPjGxA7iw98Og==", - "dev": true, - "requires": { - "fast-diff": "^1.1.1", - "jest-docblock": "^21.0.0" - } - }, - "eslint-scope": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", - "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true - }, - "eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", - "dev": true - }, - "espower": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/espower/-/espower-2.1.1.tgz", - "integrity": "sha512-F4TY1qYJB1aUyzB03NsZksZzUQmQoEBaTUjRJGR30GxbkbjKI41NhCyYjrF+bGgWN7x/ZsczYppRpz/0WdI0ug==", - "dev": true, - "requires": { - "array-find": "^1.0.0", - "escallmatch": "^1.5.0", - "escodegen": "^1.7.0", - "escope": "^3.3.0", - "espower-location-detector": "^1.0.0", - "espurify": "^1.3.0", - "estraverse": "^4.1.0", - "source-map": "^0.5.0", - "type-name": "^2.0.0", - "xtend": "^4.0.0" - } - }, - "espower-loader": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/espower-loader/-/espower-loader-1.2.2.tgz", - "integrity": "sha1-7bRsPFmga6yOpzppXIblxaC8gto=", - "dev": true, - "requires": { - "convert-source-map": "^1.1.0", - "espower-source": "^2.0.0", - "minimatch": "^3.0.0", - "source-map-support": "^0.4.0", - "xtend": "^4.0.0" - }, - "dependencies": { - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "^0.5.6" - } - } - } - }, - "espower-location-detector": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/espower-location-detector/-/espower-location-detector-1.0.0.tgz", - "integrity": "sha1-oXt+zFnTDheeK+9z+0E3cEyzMbU=", - "dev": true, - "requires": { - "is-url": "^1.2.1", - "path-is-absolute": "^1.0.0", - "source-map": "^0.5.0", - "xtend": "^4.0.0" - } - }, - "espower-source": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/espower-source/-/espower-source-2.3.0.tgz", - "integrity": "sha512-Wc4kC4zUAEV7Qt31JRPoBUc5jjowHRylml2L2VaDQ1XEbnqQofGWx+gPR03TZAPokAMl5dqyL36h3ITyMXy3iA==", - "dev": true, - "requires": { - "acorn": "^5.0.0", - "acorn-es7-plugin": "^1.0.10", - "convert-source-map": "^1.1.1", - "empower-assert": "^1.0.0", - "escodegen": "^1.10.0", - "espower": "^2.1.1", - "estraverse": "^4.0.0", - "merge-estraverse-visitors": "^1.0.0", - "multi-stage-sourcemap": "^0.2.1", - "path-is-absolute": "^1.0.0", - "xtend": "^4.0.0" - } - }, - "espree": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-4.0.0.tgz", - "integrity": "sha512-kapdTCt1bjmspxStVKX6huolXVV5ZfyZguY1lcfhVVZstce3bqxH9mcLzNn3/mlgW6wQ732+0fuG9v7h0ZQoKg==", - "dev": true, - "requires": { - "acorn": "^5.6.0", - "acorn-jsx": "^4.1.1" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "espurify": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.8.1.tgz", - "integrity": "sha512-ZDko6eY/o+D/gHCWyHTU85mKDgYcS4FJj7S+YD6WIInm7GQ6AnOjmcL4+buFV/JOztVLELi/7MmuGU5NHta0Mg==", - "requires": { - "core-js": "^2.0.0" - } - }, - "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", - "dev": true, - "requires": { - "estraverse": "^4.0.0" - } - }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "dev": true, - "requires": { - "estraverse": "^4.1.0" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "^2.1.0" - }, - "dependencies": { - "fill-range": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", - "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", - "dev": true, - "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "external-editor": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", - "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", - "dev": true, - "requires": { - "chardet": "^0.4.0", - "iconv-lite": "^0.4.17", - "tmp": "^0.0.33" - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" - }, - "fast-diff": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", - "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", - "dev": true - }, - "fast-glob": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz", - "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==", - "requires": { - "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.0.1", - "glob-parent": "^3.1.0", - "is-glob": "^4.0.0", - "merge2": "^1.2.1", - "micromatch": "^3.1.10" - } - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", - "dev": true, - "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "fill-keys": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", - "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=", - "dev": true, - "requires": { - "is-object": "~1.0.1", - "merge-descriptors": "~1.0.0" - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "flat-cache": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", - "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", - "dev": true, - "requires": { - "circular-json": "^0.3.1", - "del": "^2.0.2", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" - } - }, - "fn-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", - "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", - "dev": true - }, - "follow-redirects": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.2.tgz", - "integrity": "sha512-kssLorP/9acIdpQ2udQVTiCS5LQmdEz9mvdIfDcl1gYX2tPKFADHSyFdvJS040XdFsPzemWtgI3q8mFVCxtX8A==", - "requires": { - "debug": "^3.1.0" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "1.0.6", - "mime-types": "^2.1.12" - } - }, - "formidable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", - "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", - "dev": true - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "requires": { - "map-cache": "^0.2.2" - } - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, - "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "^2.1.0" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true, - "optional": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "^5.1.1", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.0", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.1.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.5.1", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.2.4", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.1", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "function-name-support": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/function-name-support/-/function-name-support-0.2.0.tgz", - "integrity": "sha1-VdO/qm6v1QWlD5vIH99XVkoLsHE=", - "dev": true - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, - "gcp-metadata": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz", - "integrity": "sha512-MSmczZctbz91AxCvqp9GHBoZOSbJKAICV7Ow/AIWSJZRrRchUd5NL1b2P4OfP+4m490BEUPhhARfpHdqCxuCvg==", - "requires": { - "axios": "^0.18.0", - "extend": "^3.0.1", - "retry-axios": "0.3.2" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "get-port": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", - "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=", - "dev": true - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "^1.0.0" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" - }, - "dependencies": { - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "^2.0.0" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "glob-to-regexp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", - "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" - }, - "global-dirs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", - "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", - "dev": true, - "requires": { - "ini": "^1.3.4" - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - }, - "globby": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", - "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", - "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "fast-glob": "^2.0.2", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" - } - }, - "google-auth-library": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.6.1.tgz", - "integrity": "sha512-jYiWC8NA9n9OtQM7ANn0Tk464do9yhKEtaJ72pKcaBiEwn4LwcGYIYOfwtfsSm3aur/ed3tlSxbmg24IAT6gAg==", - "requires": { - "axios": "^0.18.0", - "gcp-metadata": "^0.6.3", - "gtoken": "^2.3.0", - "jws": "^3.1.5", - "lodash.isstring": "^4.0.1", - "lru-cache": "^4.1.3", - "retry-axios": "^0.3.2" - } - }, - "google-gax": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-0.18.0.tgz", - "integrity": "sha512-cF2s3aTw1cWDHsjaYfIizJZT0KJF0FSM3laiCX4O/K0ZcdmeE9PitG2bxRH+dY+Sz094//m+JoH1hBtSyOf67A==", - "requires": { - "@grpc/proto-loader": "^0.3.0", - "duplexify": "^3.6.0", - "extend": "^3.0.1", - "globby": "^8.0.1", - "google-auth-library": "^1.6.1", - "google-proto-files": "^0.16.0", - "grpc": "^1.12.2", - "is-stream-ended": "^0.1.4", - "lodash": "^4.17.10", - "protobufjs": "^6.8.8", - "retry-request": "^4.0.0", - "through2": "^2.0.3" - } - }, - "google-p12-pem": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz", - "integrity": "sha512-+EuKr4CLlGsnXx4XIJIVkcKYrsa2xkAmCvxRhX2HsazJzUBAJ35wARGeApHUn4nNfPD03Vl057FskNr20VaCyg==", - "requires": { - "node-forge": "^0.7.4", - "pify": "^3.0.0" - } - }, - "google-proto-files": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/google-proto-files/-/google-proto-files-0.16.1.tgz", - "integrity": "sha512-ykdhaYDiU/jlyrkzZDPemraKwVIgLT31XMHVNSJW//R9VED56hqSDRMx1Jlxbf0O4iDZnBWQ0JQLHbM2r5+wuA==", - "requires": { - "globby": "^8.0.0", - "power-assert": "^1.4.4", - "protobufjs": "^6.8.0" - } - }, - "got": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/got/-/got-8.3.0.tgz", - "integrity": "sha512-kBNy/S2CGwrYgDSec5KTWGKUvupwkkTVAjIsVFF2shXO13xpZdFP4d4kxa//CLX2tN/rV0aYwK8vY6UKWGn2vQ==", - "dev": true, - "requires": { - "@sindresorhus/is": "^0.7.0", - "cacheable-request": "^2.1.1", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "into-stream": "^3.1.0", - "is-retry-allowed": "^1.1.0", - "isurl": "^1.0.0-alpha5", - "lowercase-keys": "^1.0.0", - "mimic-response": "^1.0.0", - "p-cancelable": "^0.4.0", - "p-timeout": "^2.0.1", - "pify": "^3.0.0", - "safe-buffer": "^5.1.1", - "timed-out": "^4.0.1", - "url-parse-lax": "^3.0.0", - "url-to-options": "^1.0.1" - }, - "dependencies": { - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, - "requires": { - "prepend-http": "^2.0.0" - } - } - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, - "grpc": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.13.1.tgz", - "integrity": "sha512-yl0xChnlUISTefOPU2NQ1cYPh5m/DTatEUV6jdRyQPE9NCrtPq7Gn6J2alMTglN7ufYbJapOd00dvhGurHH6HQ==", - "requires": { - "lodash": "^4.17.5", - "nan": "^2.0.0", - "node-pre-gyp": "^0.10.0", - "protobufjs": "^5.0.3" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true - }, - "iconv-lite": { - "version": "0.4.23", - "bundled": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "ini": { - "version": "1.3.5", - "bundled": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.0", - "bundled": true - }, - "minipass": { - "version": "2.3.3", - "bundled": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "bundled": true - } - } - }, - "ms": { - "version": "2.0.0", - "bundled": true - }, - "needle": { - "version": "2.2.1", - "bundled": true, - "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.3", - "bundled": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true - }, - "npm-packlist": { - "version": "1.1.11", - "bundled": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true - }, - "protobufjs": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz", - "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==", - "requires": { - "ascli": "~1", - "bytebuffer": "~5", - "glob": "^7.0.5", - "yargs": "^3.10.0" - } - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true - }, - "sax": { - "version": "1.2.4", - "bundled": true - }, - "semver": { - "version": "5.5.0", - "bundled": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true - }, - "tar": { - "version": "4.4.4", - "bundled": true, - "requires": { - "chownr": "^1.0.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.3", - "minizlib": "^1.1.0", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true - } - } - }, - "gtoken": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-2.3.0.tgz", - "integrity": "sha512-Jc9/8mV630cZE9FC5tIlJCZNdUjwunvlwOtCz6IDlaiB4Sz68ki29a1+q97sWTnTYroiuF9B135rod9zrQdHLw==", - "requires": { - "axios": "^0.18.0", - "google-p12-pem": "^1.0.0", - "jws": "^3.1.4", - "mime": "^2.2.0", - "pify": "^3.0.0" - } - }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" - }, - "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "requires": { - "ajv": "^5.1.0", - "har-schema": "^2.0.0" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-color": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", - "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "has-symbol-support-x": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", - "dev": true - }, - "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", - "dev": true - }, - "has-to-string-tag-x": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", - "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", - "dev": true, - "requires": { - "has-symbol-support-x": "^1.4.1" - } - }, - "has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "has-yarn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-1.0.0.tgz", - "integrity": "sha1-ieJdtgS3Jcj1l2//Ct3JIbgopac=", - "dev": true - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - } - }, - "hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", - "dev": true - }, - "htmlparser2": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", - "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", - "dev": true, - "requires": { - "domelementtype": "^1.3.0", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^2.0.2" - } - }, - "http-cache-semantics": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", - "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", - "dev": true - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "hullabaloo-config-manager": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/hullabaloo-config-manager/-/hullabaloo-config-manager-1.1.1.tgz", - "integrity": "sha512-ztKnkZV0TmxnumCDHHgLGNiDnotu4EHCp9YMkznWuo4uTtCyJ+cu+RNcxUeXYKTllpvLFWnbfWry09yzszgg+A==", - "dev": true, - "requires": { - "dot-prop": "^4.1.0", - "es6-error": "^4.0.2", - "graceful-fs": "^4.1.11", - "indent-string": "^3.1.0", - "json5": "^0.5.1", - "lodash.clonedeep": "^4.5.0", - "lodash.clonedeepwith": "^4.5.0", - "lodash.isequal": "^4.5.0", - "lodash.merge": "^4.6.0", - "md5-hex": "^2.0.0", - "package-hash": "^2.0.0", - "pkg-dir": "^2.0.0", - "resolve-from": "^3.0.0", - "safe-buffer": "^5.0.1" - } - }, - "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" - }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", - "dev": true - }, - "ignore-walk": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", - "dev": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true - }, - "import-local": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz", - "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=", - "dev": true, - "requires": { - "pkg-dir": "^2.0.0", - "resolve-cwd": "^2.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, - "ink-docstrap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz", - "integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==", - "dev": true, - "requires": { - "moment": "^2.14.1", - "sanitize-html": "^1.13.0" - } - }, - "inquirer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz", - "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", - "dev": true, - "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^2.1.0", - "figures": "^2.0.0", - "lodash": "^4.3.0", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^5.5.2", - "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "intelli-espower-loader": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/intelli-espower-loader/-/intelli-espower-loader-1.0.1.tgz", - "integrity": "sha1-LHsDFGvB1GvyENCgOXxckatMorA=", - "dev": true, - "requires": { - "espower-loader": "^1.0.0" - } - }, - "into-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", - "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", - "dev": true, - "requires": { - "from2": "^2.1.1", - "p-is-promise": "^1.1.0" - } - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" - }, - "irregular-plurals": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz", - "integrity": "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=", - "dev": true - }, - "is": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", - "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=" - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", - "dev": true - }, - "is-ci": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", - "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", - "dev": true, - "requires": { - "ci-info": "^1.0.0" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "^2.0.0" - } - }, - "is-error": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.1.tgz", - "integrity": "sha1-aEqW2EB2V3yY9M20DG0mpRI78Zw=", - "dev": true - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-generator-fn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz", - "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=", - "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-installed-globally": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", - "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", - "dev": true, - "requires": { - "global-dirs": "^0.1.0", - "is-path-inside": "^1.0.0" - } - }, - "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=", - "dev": true - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true - }, - "is-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", - "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", - "dev": true - }, - "is-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", - "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", - "dev": true, - "requires": { - "symbol-observable": "^1.1.0" - } - }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "^1.0.0" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "requires": { - "isobject": "^3.0.1" - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, - "is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=", - "dev": true - }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, - "requires": { - "has": "^1.0.1" - } - }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, - "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "is-stream-ended": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz", - "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==" - }, - "is-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", - "dev": true - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, - "is-url": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", - "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, - "istanbul-lib-coverage": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", - "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.2.tgz", - "integrity": "sha512-l7TD/VnBsIB2OJvSyxaLW/ab1+92dxZNH9wLH7uHPPioy3JZ8tnx2UXUdKmdkgmP2EFPzg64CToUP6dAS3U32Q==", - "dev": true, - "requires": { - "@babel/generator": "7.0.0-beta.51", - "@babel/parser": "7.0.0-beta.51", - "@babel/template": "7.0.0-beta.51", - "@babel/traverse": "7.0.0-beta.51", - "@babel/types": "7.0.0-beta.51", - "istanbul-lib-coverage": "^2.0.1", - "semver": "^5.5.0" - } - }, - "isurl": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", - "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", - "dev": true, - "requires": { - "has-to-string-tag-x": "^1.2.0", - "is-object": "^1.0.1" - } - }, - "jest-docblock": { - "version": "21.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", - "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", - "dev": true - }, - "js-string-escape": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", - "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "js2xmlparser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz", - "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=", - "dev": true, - "requires": { - "xmlcreate": "^1.0.1" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "optional": true - }, - "jsdoc": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz", - "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==", - "dev": true, - "requires": { - "babylon": "7.0.0-beta.19", - "bluebird": "~3.5.0", - "catharsis": "~0.8.9", - "escape-string-regexp": "~1.0.5", - "js2xmlparser": "~3.0.0", - "klaw": "~2.0.0", - "marked": "~0.3.6", - "mkdirp": "~0.5.1", - "requizzle": "~0.2.1", - "strip-json-comments": "~2.0.1", - "taffydb": "2.6.2", - "underscore": "~1.8.3" - }, - "dependencies": { - "babylon": { - "version": "7.0.0-beta.19", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz", - "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==", - "dev": true - } - } - }, - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true - }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "just-extend": { - "version": "1.1.27", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", - "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==", - "dev": true - }, - "jwa": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz", - "integrity": "sha512-tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw==", - "requires": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.10", - "safe-buffer": "^5.0.1" - } - }, - "jws": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz", - "integrity": "sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==", - "requires": { - "jwa": "^1.1.5", - "safe-buffer": "^5.0.1" - } - }, - "keyv": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", - "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", - "dev": true, - "requires": { - "json-buffer": "3.0.0" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "klaw": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz", - "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.9" - } - }, - "last-line-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/last-line-stream/-/last-line-stream-1.0.0.tgz", - "integrity": "sha1-0bZNafhv8kry0EiDos7uFFIKVgA=", - "dev": true, - "requires": { - "through2": "^2.0.0" - } - }, - "latest-version": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", - "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", - "dev": true, - "requires": { - "package-json": "^4.0.0" - } - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "requires": { - "invert-kv": "^1.0.0" - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==" - }, - "lodash.chunk": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", - "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.clonedeepwith": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz", - "integrity": "sha1-buMFc6A6GmDWcKYu8zwQzxr9vdQ=", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, - "lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", - "dev": true - }, - "lodash.escaperegexp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz", - "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=", - "dev": true - }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", - "dev": true - }, - "lodash.flattendeep": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=", - "dev": true - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", - "dev": true - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" - }, - "lodash.merge": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", - "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==" - }, - "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true - }, - "lodash.snakecase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", - "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=" - }, - "lolex": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.1.tgz", - "integrity": "sha512-Oo2Si3RMKV3+lV5MsSWplDQFoTClz/24S0MMHYcgGWWmFXr6TMlqcqk/l1GtH+d5wLBwNRiqGnwDRMirtFalJw==", - "dev": true - }, - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true - }, - "lru-cache": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", - "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "dev": true, - "requires": { - "pify": "^3.0.0" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" - }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "requires": { - "object-visit": "^1.0.0" - } - }, - "marked": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz", - "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==", - "dev": true - }, - "matcher": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz", - "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.4" - } - }, - "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", - "dev": true - }, - "md5-hex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz", - "integrity": "sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=", - "dev": true, - "requires": { - "md5-o-matic": "^0.1.1" - } - }, - "md5-o-matic": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz", - "integrity": "sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=", - "dev": true - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - } - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "merge-estraverse-visitors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/merge-estraverse-visitors/-/merge-estraverse-visitors-1.0.0.tgz", - "integrity": "sha1-65aDOLXe1c7tgs7AMH3sui2OqZQ=", - "dev": true, - "requires": { - "estraverse": "^4.0.0" - } - }, - "merge2": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz", - "integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==" - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - } - }, - "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==" - }, - "mime-db": { - "version": "1.35.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz", - "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==" - }, - "mime-types": { - "version": "2.1.19", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz", - "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", - "requires": { - "mime-db": "~1.35.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "mocha": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", - "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", - "dev": true, - "requires": { - "browser-stdout": "1.3.1", - "commander": "2.15.1", - "debug": "3.1.0", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.2", - "growl": "1.10.5", - "he": "1.1.1", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "supports-color": "5.4.0" - } - }, - "module-not-found-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", - "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=", - "dev": true - }, - "moment": { - "version": "2.22.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", - "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "multi-stage-sourcemap": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/multi-stage-sourcemap/-/multi-stage-sourcemap-0.2.1.tgz", - "integrity": "sha1-sJ/IWG6qF/gdV1xK0C4Pej9rEQU=", - "dev": true, - "requires": { - "source-map": "^0.1.34" - }, - "dependencies": { - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "multimatch": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", - "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", - "dev": true, - "requires": { - "array-differ": "^1.0.0", - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "minimatch": "^3.0.0" - } - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" - }, - "nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - } - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", - "dev": true - }, - "nice-try": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz", - "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==", - "dev": true - }, - "nise": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.2.tgz", - "integrity": "sha512-BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw==", - "dev": true, - "requires": { - "@sinonjs/formatio": "^2.0.0", - "just-extend": "^1.1.27", - "lolex": "^2.3.2", - "path-to-regexp": "^1.7.0", - "text-encoding": "^0.6.4" - } - }, - "node-forge": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", - "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==" - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "normalize-url": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", - "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", - "dev": true, - "requires": { - "prepend-http": "^2.0.0", - "query-string": "^5.0.1", - "sort-keys": "^2.0.0" - }, - "dependencies": { - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - } - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" - }, - "nyc": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-12.0.2.tgz", - "integrity": "sha1-ikpO1pCWbBHsWH/4fuoMEsl0upk=", - "dev": true, - "requires": { - "archy": "^1.0.0", - "arrify": "^1.0.1", - "caching-transform": "^1.0.0", - "convert-source-map": "^1.5.1", - "debug-log": "^1.0.1", - "default-require-extensions": "^1.0.0", - "find-cache-dir": "^0.1.1", - "find-up": "^2.1.0", - "foreground-child": "^1.5.3", - "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.2.0", - "istanbul-lib-hook": "^1.1.0", - "istanbul-lib-instrument": "^2.1.0", - "istanbul-lib-report": "^1.1.3", - "istanbul-lib-source-maps": "^1.2.5", - "istanbul-reports": "^1.4.1", - "md5-hex": "^1.2.0", - "merge-source-map": "^1.1.0", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.0", - "resolve-from": "^2.0.0", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.1", - "spawn-wrap": "^1.4.2", - "test-exclude": "^4.2.0", - "yargs": "11.1.0", - "yargs-parser": "^8.0.0" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - } - }, - "amdefine": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "ansi-regex": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "append-transform": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "requires": { - "default-require-extensions": "^1.0.0" - } - }, - "archy": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "arr-diff": { - "version": "4.0.0", - "bundled": true, - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "bundled": true, - "dev": true - }, - "arrify": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "async": { - "version": "1.5.2", - "bundled": true, - "dev": true - }, - "atob": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "base": { - "version": "0.11.2", - "bundled": true, - "dev": true, - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "builtin-modules": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "cache-base": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } - }, - "caching-transform": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "md5-hex": "^1.2.0", - "mkdirp": "^0.5.1", - "write-file-atomic": "^1.1.4" - } - }, - "camelcase": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true - }, - "center-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } - }, - "class-utils": { - "version": "0.3.6", - "bundled": true, - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "cliui": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "collection-visit": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, - "commondir": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "bundled": true, - "dev": true - }, - "copy-descriptor": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "cross-spawn": { - "version": "4.0.2", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "debug": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "debug-log": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "decamelize": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "bundled": true, - "dev": true - }, - "default-require-extensions": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "strip-bom": "^2.0.0" - } - }, - "define-property": { - "version": "2.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "error-ex": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "execa": { - "version": "0.7.0", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "bundled": true, - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - } - } - }, - "expand-brackets": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "extend-shallow": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "extglob": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "fill-range": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "find-cache-dir": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "for-in": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "foreground-child": { - "version": "1.5.6", - "bundled": true, - "dev": true, - "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" - } - }, - "fragment-cache": { - "version": "0.2.1", - "bundled": true, - "dev": true, - "requires": { - "map-cache": "^0.2.2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "get-value": { - "version": "2.0.6", - "bundled": true, - "dev": true - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "handlebars": { - "version": "4.0.11", - "bundled": true, - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "bundled": true, - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "has-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "kind-of": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "hosted-git-info": { - "version": "2.6.0", - "bundled": true, - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "bundled": true, - "dev": true - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "invert-kv": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-arrayish": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "is-buffer": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-descriptor": { - "version": "0.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "bundled": true, - "dev": true - } - } - }, - "is-extendable": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "is-number": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-odd": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "bundled": true, - "dev": true - } - } - }, - "is-plain-object": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "is-stream": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isexe": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "isobject": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, - "istanbul-lib-coverage": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "istanbul-lib-hook": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "append-transform": "^0.4.0" - } - }, - "istanbul-lib-report": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "istanbul-lib-coverage": "^1.1.2", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "bundled": true, - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } - } - } - }, - "istanbul-lib-source-maps": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "requires": { - "debug": "^3.1.0", - "istanbul-lib-coverage": "^1.2.0", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" - } - }, - "istanbul-reports": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "requires": { - "handlebars": "^4.0.3" - } - }, - "kind-of": { - "version": "3.2.2", - "bundled": true, - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "lazy-cache": { - "version": "1.0.4", - "bundled": true, - "dev": true, - "optional": true - }, - "lcid": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - }, - "dependencies": { - "path-exists": { - "version": "3.0.0", - "bundled": true, - "dev": true - } - } - }, - "longest": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "lru-cache": { - "version": "4.1.3", - "bundled": true, - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "map-cache": { - "version": "0.2.2", - "bundled": true, - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "object-visit": "^1.0.0" - } - }, - "md5-hex": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "md5-o-matic": "^0.1.1" - } - }, - "md5-o-matic": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "mem": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "merge-source-map": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "bundled": true, - "dev": true - } - } - }, - "micromatch": { - "version": "3.1.10", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "mimic-fn": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mixin-deep": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "nanomatch": { - "version": "1.2.9", - "bundled": true, - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-odd": "^2.0.0", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "normalize-package-data": { - "version": "2.4.0", - "bundled": true, - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "npm-run-path": { - "version": "2.0.2", - "bundled": true, - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true - }, - "object-copy": { - "version": "0.1.0", - "bundled": true, - "dev": true, - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "object-visit": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "bundled": true, - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "optimist": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" - } - }, - "p-finally": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "p-limit": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "parse-json": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "pascalcase": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "path-exists": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "path-key": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "path-type": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "bundled": true, - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "bundled": true, - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "pkg-dir": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "find-up": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - } - } - }, - "posix-character-classes": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - } - } - }, - "regex-not": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - } - }, - "repeat-element": { - "version": "1.1.2", - "bundled": true, - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "bundled": true, - "dev": true - }, - "require-directory": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "resolve-from": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "resolve-url": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "ret": { - "version": "0.1.15", - "bundled": true, - "dev": true - }, - "right-align": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.1" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "requires": { - "glob": "^7.0.5" - } - }, - "safe-regex": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "ret": "~0.1.10" - } - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "set-value": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "shebang-command": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "slide": { - "version": "1.1.6", - "bundled": true, - "dev": true - }, - "snapdragon": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.2.0" - } - }, - "source-map": { - "version": "0.5.7", - "bundled": true, - "dev": true - }, - "source-map-resolve": { - "version": "0.5.2", - "bundled": true, - "dev": true, - "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "source-map-url": { - "version": "0.4.0", - "bundled": true, - "dev": true - }, - "spawn-wrap": { - "version": "1.4.2", - "bundled": true, - "dev": true, - "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" - } - }, - "spdx-correct": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "bundled": true, - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "bundled": true, - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.0", - "bundled": true, - "dev": true - }, - "split-string": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^3.0.0" - } - }, - "static-extend": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "bundled": true, - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "string-width": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-eof": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "test-exclude": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "requires": { - "arrify": "^1.0.1", - "micromatch": "^3.1.8", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", - "require-main-filename": "^1.0.1" - } - }, - "to-object-path": { - "version": "0.3.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "to-regex": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - } - }, - "to-regex-range": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "uglify-js": { - "version": "2.8.29", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "yargs": { - "version": "3.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "union-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "bundled": true, - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } - } - }, - "unset-value": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "bundled": true, - "dev": true, - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "bundled": true, - "dev": true - } - } - }, - "urix": { - "version": "0.1.0", - "bundled": true, - "dev": true - }, - "use": { - "version": "3.1.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "bundled": true, - "dev": true - } - } - }, - "validate-npm-package-license": { - "version": "3.0.3", - "bundled": true, - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "which": { - "version": "1.3.1", - "bundled": true, - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "window-size": { - "version": "0.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "wordwrap": { - "version": "0.0.3", - "bundled": true, - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "write-file-atomic": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "slide": "^1.1.5" - } - }, - "y18n": { - "version": "3.2.1", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "2.1.2", - "bundled": true, - "dev": true - }, - "yargs": { - "version": "11.1.0", - "bundled": true, - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - }, - "cliui": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "yargs-parser": { - "version": "9.0.2", - "bundled": true, - "dev": true, - "requires": { - "camelcase": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "8.1.0", - "bundled": true, - "dev": true, - "requires": { - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "bundled": true, - "dev": true - } - } - } - } - }, - "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "object-keys": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", - "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==" - }, - "object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "requires": { - "isobject": "^3.0.0" - } - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "requires": { - "isobject": "^3.0.1" - } - }, - "observable-to-promise": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/observable-to-promise/-/observable-to-promise-0.5.0.tgz", - "integrity": "sha1-yCjw8NxH6fhq+KSXfF1VB2znqR8=", - "dev": true, - "requires": { - "is-observable": "^0.2.0", - "symbol-observable": "^1.0.4" - }, - "dependencies": { - "is-observable": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-0.2.0.tgz", - "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", - "dev": true, - "requires": { - "symbol-observable": "^0.2.2" - }, - "dependencies": { - "symbol-observable": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz", - "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=", - "dev": true - } - } - } - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - } - }, - "option-chain": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/option-chain/-/option-chain-1.0.0.tgz", - "integrity": "sha1-k41zvU4Xg/lI00AjZEraI2aeMPI=", - "dev": true - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - }, - "dependencies": { - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "optjs": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz", - "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=" - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "requires": { - "lcid": "^1.0.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "p-cancelable": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", - "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-is-promise": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", - "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", - "dev": true - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-timeout": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", - "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", - "dev": true, - "requires": { - "p-finally": "^1.0.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "package-hash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-2.0.0.tgz", - "integrity": "sha1-eK4ybIngWk2BO2hgGXevBcANKg0=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "lodash.flattendeep": "^4.4.0", - "md5-hex": "^2.0.0", - "release-zalgo": "^1.0.0" - } - }, - "package-json": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", - "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", - "dev": true, - "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" - }, - "dependencies": { - "got": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", - "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", - "dev": true, - "requires": { - "create-error-class": "^3.0.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" - } - } - } - }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - } - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "parse-ms": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz", - "integrity": "sha1-3T+iXtbC78e93hKtm0bBY6opIk4=", - "dev": true - }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" - }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true - }, - "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", - "dev": true, - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } - } - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "requires": { - "pify": "^3.0.0" - } - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "pinkie": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-1.0.0.tgz", - "integrity": "sha1-Wkfyi6EBXQIBvae/DzWOR77Ix+Q=", - "dev": true - }, - "pinkie-promise": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-1.0.0.tgz", - "integrity": "sha1-0dpn9UglY7t89X8oauKCLs+/NnA=", - "dev": true, - "requires": { - "pinkie": "^1.0.0" - } - }, - "pkg-conf": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz", - "integrity": "sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "load-json-file": "^4.0.0" - }, - "dependencies": { - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - } - } - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - }, - "plur": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz", - "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", - "dev": true, - "requires": { - "irregular-plurals": "^1.0.0" - } - }, - "pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", - "dev": true - }, - "posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "power-assert": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/power-assert/-/power-assert-1.6.0.tgz", - "integrity": "sha512-nDb6a+p2C7Wj8Y2zmFtLpuv+xobXz4+bzT5s7dr0nn71tLozn7nRMQqzwbefzwZN5qOm0N7Cxhw4kXP75xboKA==", - "requires": { - "define-properties": "^1.1.2", - "empower": "^1.3.0", - "power-assert-formatter": "^1.4.1", - "universal-deep-strict-equal": "^1.2.1", - "xtend": "^4.0.0" - } - }, - "power-assert-context-formatter": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/power-assert-context-formatter/-/power-assert-context-formatter-1.2.0.tgz", - "integrity": "sha512-HLNEW8Bin+BFCpk/zbyKwkEu9W8/zThIStxGo7weYcFkKgMuGCHUJhvJeBGXDZf0Qm2xis4pbnnciGZiX0EpSg==", - "requires": { - "core-js": "^2.0.0", - "power-assert-context-traversal": "^1.2.0" - } - }, - "power-assert-context-reducer-ast": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/power-assert-context-reducer-ast/-/power-assert-context-reducer-ast-1.2.0.tgz", - "integrity": "sha512-EgOxmZ/Lb7tw4EwSKX7ZnfC0P/qRZFEG28dx/690qvhmOJ6hgThYFm5TUWANDLK5NiNKlPBi5WekVGd2+5wPrw==", - "requires": { - "acorn": "^5.0.0", - "acorn-es7-plugin": "^1.0.12", - "core-js": "^2.0.0", - "espurify": "^1.6.0", - "estraverse": "^4.2.0" - } - }, - "power-assert-context-traversal": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/power-assert-context-traversal/-/power-assert-context-traversal-1.2.0.tgz", - "integrity": "sha512-NFoHU6g2umNajiP2l4qb0BRWD773Aw9uWdWYH9EQsVwIZnog5bd2YYLFCVvaxWpwNzWeEfZIon2xtyc63026pQ==", - "requires": { - "core-js": "^2.0.0", - "estraverse": "^4.1.0" - } - }, - "power-assert-formatter": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/power-assert-formatter/-/power-assert-formatter-1.4.1.tgz", - "integrity": "sha1-XcEl7VCj37HdomwZNH879Y7CiEo=", - "requires": { - "core-js": "^2.0.0", - "power-assert-context-formatter": "^1.0.7", - "power-assert-context-reducer-ast": "^1.0.7", - "power-assert-renderer-assertion": "^1.0.7", - "power-assert-renderer-comparison": "^1.0.7", - "power-assert-renderer-diagram": "^1.0.7", - "power-assert-renderer-file": "^1.0.7" - } - }, - "power-assert-renderer-assertion": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/power-assert-renderer-assertion/-/power-assert-renderer-assertion-1.2.0.tgz", - "integrity": "sha512-3F7Q1ZLmV2ZCQv7aV7NJLNK9G7QsostrhOU7U0RhEQS/0vhEqrRg2jEJl1jtUL4ZyL2dXUlaaqrmPv5r9kRvIg==", - "requires": { - "power-assert-renderer-base": "^1.1.1", - "power-assert-util-string-width": "^1.2.0" - } - }, - "power-assert-renderer-base": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/power-assert-renderer-base/-/power-assert-renderer-base-1.1.1.tgz", - "integrity": "sha1-lqZQxv0F7hvB9mtUrWFELIs/Y+s=" - }, - "power-assert-renderer-comparison": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/power-assert-renderer-comparison/-/power-assert-renderer-comparison-1.2.0.tgz", - "integrity": "sha512-7c3RKPDBKK4E3JqdPtYRE9cM8AyX4LC4yfTvvTYyx8zSqmT5kJnXwzR0yWQLOavACllZfwrAGQzFiXPc5sWa+g==", - "requires": { - "core-js": "^2.0.0", - "diff-match-patch": "^1.0.0", - "power-assert-renderer-base": "^1.1.1", - "stringifier": "^1.3.0", - "type-name": "^2.0.1" - } - }, - "power-assert-renderer-diagram": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/power-assert-renderer-diagram/-/power-assert-renderer-diagram-1.2.0.tgz", - "integrity": "sha512-JZ6PC+DJPQqfU6dwSmpcoD7gNnb/5U77bU5KgNwPPa+i1Pxiz6UuDeM3EUBlhZ1HvH9tMjI60anqVyi5l2oNdg==", - "requires": { - "core-js": "^2.0.0", - "power-assert-renderer-base": "^1.1.1", - "power-assert-util-string-width": "^1.2.0", - "stringifier": "^1.3.0" - } - }, - "power-assert-renderer-file": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/power-assert-renderer-file/-/power-assert-renderer-file-1.2.0.tgz", - "integrity": "sha512-/oaVrRbeOtGoyyd7e4IdLP/jIIUFJdqJtsYzP9/88R39CMnfF/S/rUc8ZQalENfUfQ/wQHu+XZYRMaCEZmEesg==", - "requires": { - "power-assert-renderer-base": "^1.1.1" - } - }, - "power-assert-util-string-width": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/power-assert-util-string-width/-/power-assert-util-string-width-1.2.0.tgz", - "integrity": "sha512-lX90G0igAW0iyORTILZ/QjZWsa1MZ6VVY3L0K86e2eKun3S4LKPH4xZIl8fdeMYLfOjkaszbNSzf1uugLeAm2A==", - "requires": { - "eastasianwidth": "^0.2.0" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, - "prettier": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.14.0.tgz", - "integrity": "sha512-KtQ2EGaUwf2EyDfp1fxyEb0PqGKakVm0WyXwDt6u+cAoxbO2Z2CwKvOe3+b4+F2IlO9lYHi1kqFuRM70ddBnow==", - "dev": true - }, - "pretty-ms": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-3.2.0.tgz", - "integrity": "sha512-ZypexbfVUGTFxb0v+m1bUyy92DHe5SyYlnyY0msyms5zd3RwyvNgyxZZsXXgoyzlxjx5MiqtXUdhUfvQbe0A2Q==", - "dev": true, - "requires": { - "parse-ms": "^1.0.0" - }, - "dependencies": { - "parse-ms": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz", - "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=", - "dev": true - } - } - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" - }, - "progress": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", - "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", - "dev": true - }, - "protobufjs": { - "version": "6.8.8", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz", - "integrity": "sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.0", - "@types/node": "^10.1.0", - "long": "^4.0.0" - } - }, - "proxyquire": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.0.1.tgz", - "integrity": "sha512-fQr3VQrbdzHrdaDn3XuisVoJlJNDJizHAvUXw9IuXRR8BpV2x0N7LsCxrpJkeKfPbNjiNU/V5vc008cI0TmzzQ==", - "dev": true, - "requires": { - "fill-keys": "^1.0.2", - "module-not-found-error": "^1.0.0", - "resolve": "~1.5.0" - }, - "dependencies": { - "resolve": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", - "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", - "dev": true, - "requires": { - "path-parse": "^1.0.5" - } - } - } - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" - }, - "query-string": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", - "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", - "dev": true, - "requires": { - "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" - } - }, - "randomatic": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz", - "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", - "dev": true, - "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true - } - } - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - }, - "dependencies": { - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - } - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" - } - }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - }, - "dependencies": { - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - } - } - }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "^0.1.3" - } - }, - "regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - } - }, - "regexp.prototype.flags": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz", - "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", - "dev": true, - "requires": { - "define-properties": "^1.1.2" - } - }, - "regexpp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz", - "integrity": "sha512-g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==", - "dev": true - }, - "regexpu-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", - "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", - "dev": true, - "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" - } - }, - "registry-auth-token": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", - "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", - "dev": true, - "requires": { - "rc": "^1.1.6", - "safe-buffer": "^5.0.1" - } - }, - "registry-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", - "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", - "dev": true, - "requires": { - "rc": "^1.0.1" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - } - }, - "release-zalgo": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", - "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=", - "dev": true, - "requires": { - "es6-error": "^4.0.1" - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "request": { - "version": "2.87.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", - "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", - "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", - "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "require-precompiled": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/require-precompiled/-/require-precompiled-0.1.0.tgz", - "integrity": "sha1-WhtS63Dr7UPrmC6XTIWrWVceVvo=", - "dev": true - }, - "require-uncached": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", - "dev": true, - "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", - "dev": true - } - } - }, - "requizzle": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz", - "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=", - "dev": true, - "requires": { - "underscore": "~1.6.0" - }, - "dependencies": { - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", - "dev": true - } - } - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true - }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" - }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "dev": true, - "requires": { - "lowercase-keys": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" - }, - "retry-axios": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/retry-axios/-/retry-axios-0.3.2.tgz", - "integrity": "sha512-jp4YlI0qyDFfXiXGhkCOliBN1G7fRH03Nqy8YdShzGqbY5/9S2x/IR6C88ls2DFkbWuL3ASkP7QD3pVrNpPgwQ==" - }, - "retry-request": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-4.0.0.tgz", - "integrity": "sha512-S4HNLaWcMP6r8E4TMH52Y7/pM8uNayOcTDDQNBwsCccL1uI+Ol2TljxRDPzaNfbhOB30+XWP5NnZkB3LiJxi1w==", - "requires": { - "through2": "^2.0.0" - } - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.1" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, - "requires": { - "glob": "^7.0.5" - } - }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } - }, - "rxjs": { - "version": "5.5.11", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz", - "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==", - "dev": true, - "requires": { - "symbol-observable": "1.0.1" - }, - "dependencies": { - "symbol-observable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz", - "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=", - "dev": true - } - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "requires": { - "ret": "~0.1.10" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "samsam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", - "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==", - "dev": true - }, - "sanitize-html": { - "version": "1.18.4", - "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.4.tgz", - "integrity": "sha512-hjyDYCYrQuhnEjq+5lenLlIfdPBtnZ7z0DkQOC8YGxvkuOInH+1SrkNTj30t4f2/SSv9c5kLniB+uCIpBvYuew==", - "dev": true, - "requires": { - "chalk": "^2.3.0", - "htmlparser2": "^3.9.0", - "lodash.clonedeep": "^4.5.0", - "lodash.escaperegexp": "^4.1.2", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.mergewith": "^4.6.0", - "postcss": "^6.0.14", - "srcset": "^1.0.0", - "xtend": "^4.0.0" - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true - }, - "semver-diff": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", - "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", - "dev": true, - "requires": { - "semver": "^5.0.3" - } - }, - "serialize-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz", - "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, - "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "sinon": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-6.0.1.tgz", - "integrity": "sha512-rfszhNcfamK2+ofIPi9XqeH89pH7KGDcAtM+F9CsjHXOK3jzWG99vyhyD2V+r7s4IipmWcWUFYq4ftZ9/Eu2Wg==", - "dev": true, - "requires": { - "@sinonjs/formatio": "^2.0.0", - "diff": "^3.5.0", - "lodash.get": "^4.4.2", - "lolex": "^2.4.2", - "nise": "^1.3.3", - "supports-color": "^5.4.0", - "type-detect": "^4.0.8" - } - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" - }, - "slice-ansi": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - } - } - }, - "slide": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", - "dev": true - }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "requires": { - "kind-of": "^3.2.0" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "sort-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", - "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", - "dev": true, - "requires": { - "is-plain-obj": "^1.0.0" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "source-map-support": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", - "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" - }, - "spdx-correct": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", - "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", - "dev": true - }, - "split-array-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz", - "integrity": "sha512-hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg==", - "requires": { - "is-stream-ended": "^0.1.4" - } - }, - "split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "requires": { - "extend-shallow": "^3.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "srcset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz", - "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=", - "dev": true, - "requires": { - "array-uniq": "^1.0.2", - "number-is-nan": "^1.0.0" - } - }, - "sshpk": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", - "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, - "stack-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.1.tgz", - "integrity": "sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=", - "dev": true - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "stream-events": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.4.tgz", - "integrity": "sha512-D243NJaYs/xBN2QnoiMDY7IesJFIK7gEhnvAYqJa5JvDdnh2dC4qDBwlCf0ohPpX2QRlA/4gnbnPd3rs3KxVcA==", - "requires": { - "stubs": "^3.0.0" - } - }, - "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", - "dev": true - }, - "string": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/string/-/string-3.3.3.tgz", - "integrity": "sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=", - "dev": true - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string.prototype.matchall": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz", - "integrity": "sha512-WoZ+B2ypng1dp4iFLF2kmZlwwlE19gmjgKuhL1FJfDgCREWb3ye3SDVHSzLH6bxfnvYmkCxbzkmWcQZHA4P//Q==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.10.0", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "regexp.prototype.flags": "^1.2.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "stringifier": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/stringifier/-/stringifier-1.3.0.tgz", - "integrity": "sha1-3vGDQvaTPbDy2/yaoCF1tEjBeVk=", - "requires": { - "core-js": "^2.0.0", - "traverse": "^0.6.6", - "type-name": "^2.0.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "strip-bom-buf": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz", - "integrity": "sha1-HLRar1dTD0yvhsf3UXnSyaUd1XI=", - "dev": true, - "requires": { - "is-utf8": "^0.2.1" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "stubs": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", - "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=" - }, - "superagent": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz", - "integrity": "sha512-gVH4QfYHcY3P0f/BZzavLreHW3T1v7hG9B+hpMQotGQqurOvhv87GcMCd6LWySmBuf+BDR44TQd0aISjVHLeNQ==", - "dev": true, - "requires": { - "component-emitter": "^1.2.0", - "cookiejar": "^2.1.0", - "debug": "^3.1.0", - "extend": "^3.0.0", - "form-data": "^2.3.1", - "formidable": "^1.1.1", - "methods": "^1.1.1", - "mime": "^1.4.1", - "qs": "^6.5.1", - "readable-stream": "^2.0.5" - }, - "dependencies": { - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - } - } - }, - "supertap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supertap/-/supertap-1.0.0.tgz", - "integrity": "sha512-HZJ3geIMPgVwKk2VsmO5YHqnnJYl6bV5A9JW2uzqV43WmpgliNEYbuvukfor7URpaqpxuw3CfZ3ONdVbZjCgIA==", - "dev": true, - "requires": { - "arrify": "^1.0.1", - "indent-string": "^3.2.0", - "js-yaml": "^3.10.0", - "serialize-error": "^2.1.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "supertest": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-3.1.0.tgz", - "integrity": "sha512-O44AMnmJqx294uJQjfUmEyYOg7d9mylNFsMw/Wkz4evKd1njyPrtCN+U6ZIC7sKtfEVQhfTqFFijlXx8KP/Czw==", - "dev": true, - "requires": { - "methods": "~1.1.2", - "superagent": "3.8.2" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - }, - "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - } - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", - "dev": true - }, - "table": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz", - "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==", - "dev": true, - "requires": { - "ajv": "^6.0.1", - "ajv-keywords": "^3.0.0", - "chalk": "^2.1.0", - "lodash": "^4.17.4", - "slice-ansi": "1.0.0", - "string-width": "^2.1.1" - }, - "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.1" - } - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "taffydb": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz", - "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=", - "dev": true - }, - "term-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", - "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", - "dev": true, - "requires": { - "execa": "^0.7.0" - } - }, - "text-encoding": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", - "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", - "dev": true - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" - } - }, - "time-zone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz", - "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=", - "dev": true - }, - "timed-out": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", - "dev": true - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, - "to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", - "requires": { - "punycode": "^1.4.1" - } - }, - "traverse": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=" - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, - "trim-off-newlines": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", - "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", - "dev": true - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "optional": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "type-name": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/type-name/-/type-name-2.0.2.tgz", - "integrity": "sha1-7+fUEj2KxSr/9/QMfk3sUmYAj7Q=" - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "optional": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - } - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, - "optional": true - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, - "optional": true - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "uid2": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz", - "integrity": "sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I=", - "dev": true - }, - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", - "dev": true - }, - "underscore-contrib": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz", - "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=", - "dev": true, - "requires": { - "underscore": "1.6.0" - }, - "dependencies": { - "underscore": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", - "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", - "dev": true - } - } - }, - "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } - } - }, - "unique-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", - "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", - "dev": true, - "requires": { - "crypto-random-string": "^1.0.0" - } - }, - "unique-temp-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz", - "integrity": "sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U=", - "dev": true, - "requires": { - "mkdirp": "^0.5.1", - "os-tmpdir": "^1.0.1", - "uid2": "0.0.3" - } - }, - "universal-deep-strict-equal": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/universal-deep-strict-equal/-/universal-deep-strict-equal-1.2.2.tgz", - "integrity": "sha1-DaSsL3PP95JMgfpN4BjKViyisKc=", - "requires": { - "array-filter": "^1.0.0", - "indexof": "0.0.1", - "object-keys": "^1.0.0" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" - } - } - }, - "unzip-response": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", - "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=", - "dev": true - }, - "update-notifier": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", - "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", - "dev": true, - "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" - } - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - } - } - }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "dev": true, - "requires": { - "prepend-http": "^1.0.1" - } - }, - "url-to-options": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", - "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", - "dev": true - }, - "urlgrey": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/urlgrey/-/urlgrey-0.4.4.tgz", - "integrity": "sha1-iS/pWWCAXoVRnxzUOJ8stMu3ZS8=", - "dev": true - }, - "use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "well-known-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-1.0.0.tgz", - "integrity": "sha1-c8eK6Bp3Jqj6WY4ogIAcixYiVRg=", - "dev": true - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "widest-line": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz", - "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", - "dev": true, - "requires": { - "string-width": "^2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "window-size": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", - "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=" - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "write": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - } - }, - "write-file-atomic": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", - "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" - } - }, - "write-json-file": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz", - "integrity": "sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8=", - "dev": true, - "requires": { - "detect-indent": "^5.0.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "pify": "^3.0.0", - "sort-keys": "^2.0.0", - "write-file-atomic": "^2.0.0" - }, - "dependencies": { - "detect-indent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", - "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=", - "dev": true - } - } - }, - "write-pkg": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/write-pkg/-/write-pkg-3.2.0.tgz", - "integrity": "sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw==", - "dev": true, - "requires": { - "sort-keys": "^2.0.0", - "write-json-file": "^2.2.0" - } - }, - "xdg-basedir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", - "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=", - "dev": true - }, - "xmlcreate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz", - "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" - }, - "yargs": { - "version": "3.32.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", - "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", - "requires": { - "camelcase": "^2.0.1", - "cliui": "^3.0.3", - "decamelize": "^1.1.1", - "os-locale": "^1.4.0", - "string-width": "^1.0.1", - "window-size": "^0.1.4", - "y18n": "^3.2.0" - } - }, - "yargs-parser": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", - "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", - "dev": true, - "requires": { - "camelcase": "^4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } - } - } - } -} From f283177fd438ca4dda6c2faa862f487ba3ee57a7 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 9 Aug 2018 11:39:38 -0700 Subject: [PATCH 0196/1115] chore: use let and const (#204) --- handwritten/pubsub/package.json | 4 +- .../pubsub/smoke-test/publisher_smoke_test.js | 26 +- handwritten/pubsub/src/connection-pool.js | 93 ++- handwritten/pubsub/src/histogram.js | 12 +- handwritten/pubsub/src/iam.js | 24 +- handwritten/pubsub/src/index.js | 84 +-- handwritten/pubsub/src/publisher.js | 26 +- handwritten/pubsub/src/snapshot.js | 30 +- handwritten/pubsub/src/subscriber.js | 76 +-- handwritten/pubsub/src/subscription.js | 76 +-- handwritten/pubsub/src/topic.js | 28 +- handwritten/pubsub/system-test/pubsub.js | 134 ++-- handwritten/pubsub/test/connection-pool.js | 232 +++---- handwritten/pubsub/test/gapic-v1.js | 576 +++++++++--------- handwritten/pubsub/test/histogram.js | 20 +- handwritten/pubsub/test/iam.js | 48 +- handwritten/pubsub/test/index.js | 228 +++---- handwritten/pubsub/test/publisher.js | 72 +-- handwritten/pubsub/test/snapshot.js | 44 +- handwritten/pubsub/test/subscriber.js | 212 +++---- handwritten/pubsub/test/subscription.js | 140 ++--- handwritten/pubsub/test/topic.js | 109 ++-- 22 files changed, 1149 insertions(+), 1145 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 987d3894272..f17390feb48 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,8 +52,8 @@ "mkamioner " ], "scripts": { - "system-test": "mocha system-test/*.js --timeout 600000", - "cover": "nyc --reporter=lcov mocha test/*.js --timeout 0 && nyc report", + "system-test": "mocha system-test/ --timeout 600000", + "cover": "nyc --reporter=lcov mocha test/ && nyc report", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", "test-no-cover": "mocha test/*.js", "test": "npm run cover", diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index 16e2d5dfe9e..f2cc1a2d782 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -18,21 +18,21 @@ describe('PublisherSmokeTest', () => { if (!process.env.GCLOUD_PROJECT) { throw new Error("Usage: GCLOUD_PROJECT= node #{$0}"); } - var projectId = process.env.GCLOUD_PROJECT; + const projectId = process.env.GCLOUD_PROJECT; it('successfully makes a call to the service using promises', done => { const pubsub = require('../src'); - var client = new pubsub.v1.PublisherClient({ + const client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); // Iterate over all elements. - var formattedProject = client.projectPath(projectId); + const formattedProject = client.projectPath(projectId); client.listTopics({project: formattedProject}) .then(responses => { - var resources = responses[0]; + const resources = responses[0]; for (let i = 0; i < resources.length; i += 1) { console.log(resources[i]); } @@ -44,22 +44,22 @@ describe('PublisherSmokeTest', () => { it('successfully makes a call to the service using callbacks', done => { const pubsub = require('../src'); - var client = new pubsub.v1.PublisherClient({ + const client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); // Or obtain the paged response. - var formattedProject = client.projectPath(projectId); + const formattedProject = client.projectPath(projectId); - var options = {autoPaginate: false}; - var callback = responses => { + const options = {autoPaginate: false}; + const callback = responses => { // The actual resources in a response. - var resources = responses[0]; + const resources = responses[0]; // The next request if the response shows that there are more responses. - var nextRequest = responses[1]; + const nextRequest = responses[1]; // The actual response object, if necessary. - // var rawResponse = responses[2]; + // const rawResponse = responses[2]; for (let i = 0; i < resources.length; i += 1) { console.log(resources[i]); } @@ -77,11 +77,11 @@ describe('PublisherSmokeTest', () => { it('successfully makes a call to the service using streaming', done => { const pubsub = require('../src'); - var client = new pubsub.v1.PublisherClient({ + const client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); - var formattedProject = client.projectPath(projectId); + const formattedProject = client.projectPath(projectId); client.listTopicsStream({project: formattedProject}) .on('data', element => { console.log(element); diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index d51d0718ae5..ce15f8e7c4f 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -16,31 +16,31 @@ 'use strict'; -var common = require('@google-cloud/common'); +const common = require('@google-cloud/common'); const {replaceProjectIdToken} = require('@google-cloud/projectify'); -var duplexify = require('duplexify'); -var each = require('async-each'); -var events = require('events'); -var is = require('is'); -var through = require('through2'); -var util = require('util'); -var uuid = require('uuid'); +const duplexify = require('duplexify'); +const each = require('async-each'); +const events = require('events'); +const is = require('is'); +const through = require('through2'); +const util = require('util'); +const uuid = require('uuid'); -var CHANNEL_READY_EVENT = 'channel.ready'; -var CHANNEL_ERROR_EVENT = 'channel.error'; +const CHANNEL_READY_EVENT = 'channel.ready'; +const CHANNEL_ERROR_EVENT = 'channel.error'; -var KEEP_ALIVE_INTERVAL = 30000; +const KEEP_ALIVE_INTERVAL = 30000; /*! * if we can't establish a connection within 5 minutes, we need to back off * and emit an error to the user. */ -var MAX_TIMEOUT = 300000; +const MAX_TIMEOUT = 300000; /*! * codes to retry streams */ -var RETRY_CODES = [ +const RETRY_CODES = [ 0, // ok 1, // canceled 2, // unknown @@ -103,7 +103,7 @@ util.inherits(ConnectionPool, events.EventEmitter); * @param {stream} callback.connection A duplex stream. */ ConnectionPool.prototype.acquire = function(id, callback) { - var self = this; + const self = this; if (is.fn(id)) { callback = id; @@ -121,7 +121,7 @@ ConnectionPool.prototype.acquire = function(id, callback) { id = getFirstConnectionId(); } - var connection = this.connections.get(id); + const connection = this.connections.get(id); if (connection) { callback(null, connection); @@ -146,8 +146,8 @@ ConnectionPool.prototype.acquire = function(id, callback) { * @param {?error} callback.error An error returned while closing the pool. */ ConnectionPool.prototype.close = function(callback) { - var self = this; - var connections = Array.from(this.connections.values()); + const self = this; + const connections = Array.from(this.connections.values()); callback = callback || common.util.noop; @@ -193,7 +193,7 @@ ConnectionPool.prototype.close = function(callback) { * @private */ ConnectionPool.prototype.createConnection = function() { - var self = this; + const self = this; this.getClient(function(err, client) { if (err) { @@ -201,9 +201,9 @@ ConnectionPool.prototype.createConnection = function() { return; } - var requestStream = client.streamingPull(); + const requestStream = client.streamingPull(); - var readStream = requestStream.pipe( + const readStream = requestStream.pipe( through.obj(function(chunk, enc, next) { chunk.receivedMessages.forEach(function(message) { readStream.push(message); @@ -212,9 +212,9 @@ ConnectionPool.prototype.createConnection = function() { }) ); - var connection = duplexify(requestStream, readStream, {objectMode: true}); - var id = uuid.v4(); - var errorImmediateHandle; + const connection = duplexify(requestStream, readStream, {objectMode: true}); + const id = uuid.v4(); + let errorImmediateHandle; connection.cancel = requestStream.cancel.bind(requestStream); @@ -291,7 +291,7 @@ ConnectionPool.prototype.createConnection = function() { if (self.shouldReconnect(status)) { self.queueConnection(); } else if (self.isOpen && !self.connections.size) { - var error = new Error(status.details); + const error = new Error(status.details); error.code = status.code; self.emit('error', error); } @@ -308,13 +308,13 @@ ConnectionPool.prototype.createConnection = function() { * @return {object} message The message object. */ ConnectionPool.prototype.createMessage = function(connectionId, resp) { - var self = this; + const self = this; - var pt = resp.message.publishTime; - var milliseconds = parseInt(pt.nanos, 10) / 1e6; - var originalDataLength = resp.message.data.length; + const pt = resp.message.publishTime; + const milliseconds = parseInt(pt.nanos, 10) / 1e6; + const originalDataLength = resp.message.data.length; - var message = { + const message = { connectionId: connectionId, ackId: resp.ackId, id: resp.message.messageId, @@ -344,7 +344,7 @@ ConnectionPool.prototype.createMessage = function(connectionId, resp) { * @fires CHANNEL_READY_EVENT */ ConnectionPool.prototype.getAndEmitChannelState = function() { - var self = this; + const self = this; this.isGettingChannelState = true; @@ -356,9 +356,9 @@ ConnectionPool.prototype.getAndEmitChannelState = function() { return; } - var elapsedTimeWithoutConnection = 0; - var now = Date.now(); - var deadline; + let elapsedTimeWithoutConnection = 0; + const now = Date.now(); + let deadline; if (self.noConnectionsTime) { elapsedTimeWithoutConnection = now - self.noConnectionsTime; @@ -399,8 +399,8 @@ ConnectionPool.prototype.getClient = function(callback) { * @returns {boolean} */ ConnectionPool.prototype.isConnected = function() { - var interator = this.connections.values(); - var connection = interator.next().value; + const interator = this.connections.values(); + let connection = interator.next().value; while (connection) { if (connection.isConnected) { @@ -419,10 +419,10 @@ ConnectionPool.prototype.isConnected = function() { * @private */ ConnectionPool.prototype.open = function() { - var self = this; + const self = this; - var existing = this.connections.size; - var max = this.settings.maxConnections; + let existing = this.connections.size; + const max = this.settings.maxConnections; for (; existing < max; existing++) { this.queueConnection(); @@ -467,21 +467,20 @@ ConnectionPool.prototype.pause = function() { * @private */ ConnectionPool.prototype.queueConnection = function() { - var self = this; - var delay = 0; - + const self = this; + let delay = 0; if (this.failedConnectionAttempts > 0) { delay = Math.pow(2, this.failedConnectionAttempts) * 1000 + Math.floor(Math.random() * 1000); } - - var timeoutHandle = setTimeout(createConnection, delay); + const timeoutHandle = setTimeout(createConnection, delay); this.queue.push(timeoutHandle); - function createConnection() { - self.createConnection(); - self.queue.splice(self.queue.indexOf(timeoutHandle), 1); + setImmediate(() => { + self.createConnection(); + self.queue.splice(self.queue.indexOf(timeoutHandle), 1); + }); } }; @@ -528,7 +527,7 @@ ConnectionPool.prototype.shouldReconnect = function(status) { return false; } - var exceededRetryLimit = + const exceededRetryLimit = this.noConnectionsTime && Date.now() - this.noConnectionsTime > MAX_TIMEOUT; if (exceededRetryLimit) { diff --git a/handwritten/pubsub/src/histogram.js b/handwritten/pubsub/src/histogram.js index 61dfbe8d0b3..6cdd78d76ac 100644 --- a/handwritten/pubsub/src/histogram.js +++ b/handwritten/pubsub/src/histogram.js @@ -16,7 +16,7 @@ 'use strict'; -var extend = require('extend'); +const extend = require('extend'); /*! * The Histogram class is used to capture the lifespan of messages within the @@ -54,7 +54,7 @@ Histogram.prototype.add = function(value) { this.data.set(value, 0); } - var count = this.data.get(value); + const count = this.data.get(value); this.data.set(value, count + 1); this.length += 1; }; @@ -69,11 +69,11 @@ Histogram.prototype.add = function(value) { Histogram.prototype.percentile = function(percent) { percent = Math.min(percent, 100); - var target = this.length - this.length * (percent / 100); - var keys = Array.from(this.data.keys()); - var key; + let target = this.length - this.length * (percent / 100); + const keys = Array.from(this.data.keys()); + let key; - for (var i = keys.length - 1; i > -1; i--) { + for (let i = keys.length - 1; i > -1; i--) { key = keys[i]; target -= this.data.get(key); diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index d940206bfc1..79b86dc68a6 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -20,9 +20,9 @@ 'use strict'; -var arrify = require('arrify'); +const arrify = require('arrify'); const {promisifyAll} = require('@google-cloud/promisify'); -var is = require('is'); +const is = require('is'); /** * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) @@ -109,8 +109,8 @@ function IAM(pubsub, id) { * // If the callback is omitted, we'll return a Promise. * //- * topic.iam.getPolicy().then(function(data) { - * var policy = data[0]; - * var apiResponse = data[1]; + * const policy = data[0]; + * const apiResponse = data[1]; * }); */ IAM.prototype.getPolicy = function(gaxOpts, callback) { @@ -119,7 +119,7 @@ IAM.prototype.getPolicy = function(gaxOpts, callback) { gaxOpts = null; } - var reqOpts = { + const reqOpts = { resource: this.id, }; @@ -170,7 +170,7 @@ IAM.prototype.getPolicy = function(gaxOpts, callback) { * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * - * var myPolicy = { + * const myPolicy = { * bindings: [ * { * role: 'roles/pubsub.subscriber', @@ -187,8 +187,8 @@ IAM.prototype.getPolicy = function(gaxOpts, callback) { * // If the callback is omitted, we'll return a Promise. * //- * topic.iam.setPolicy(myPolicy).then(function(data) { - * var policy = data[0]; - * var apiResponse = data[1]; + * const policy = data[0]; + * const apiResponse = data[1]; * }); */ IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { @@ -201,7 +201,7 @@ IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { gaxOpts = null; } - var reqOpts = { + const reqOpts = { resource: this.id, policy, }; @@ -298,7 +298,7 @@ IAM.prototype.testPermissions = function(permissions, gaxOpts, callback) { gaxOpts = null; } - var reqOpts = { + const reqOpts = { resource: this.id, permissions: arrify(permissions), }; @@ -316,8 +316,8 @@ IAM.prototype.testPermissions = function(permissions, gaxOpts, callback) { return; } - var availablePermissions = arrify(resp.permissions); - var permissionHash = permissions.reduce(function(acc, permission) { + const availablePermissions = arrify(resp.permissions); + const permissionHash = permissions.reduce(function(acc, permission) { acc[permission] = availablePermissions.indexOf(permission) > -1; return acc; }, {}); diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index e6d5ec76a82..6caf8f3d822 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -19,24 +19,24 @@ const {replaceProjectIdToken} = require('@google-cloud/projectify'); const {paginator} = require('@google-cloud/paginator'); const {promisifyAll} = require('@google-cloud/promisify'); -var extend = require('extend'); -var {GoogleAuth} = require('google-auth-library'); -var gax = require('google-gax'); -var {grpc} = new gax.GrpcClient(); -var is = require('is'); +const extend = require('extend'); +const {GoogleAuth} = require('google-auth-library'); +const gax = require('google-gax'); +const {grpc} = new gax.GrpcClient(); +const is = require('is'); -var PKG = require('../package.json'); -var v1 = require('./v1'); +const PKG = require('../package.json'); +const v1 = require('./v1'); -var Snapshot = require('./snapshot.js'); -var Subscription = require('./subscription.js'); -var Topic = require('./topic.js'); +const Snapshot = require('./snapshot.js'); +const Subscription = require('./subscription.js'); +const Topic = require('./topic.js'); /** * @type {string} - Project ID placeholder. * @private */ -var PROJECT_ID_PLACEHOLDER = '{{projectId}}'; +const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; /** * @typedef {object} ClientConfig @@ -230,10 +230,10 @@ PubSub.prototype.createSubscription = function(topic, name, options, callback) { options = options || {}; - var metadata = Subscription.formatMetadata_(options); - var subscription = this.subscription(name, metadata); + const metadata = Subscription.formatMetadata_(options); + const subscription = this.subscription(name, metadata); - var reqOpts = extend(metadata, { + const reqOpts = extend(metadata, { topic: topic.name, name: subscription.name, }); @@ -301,9 +301,9 @@ PubSub.prototype.createSubscription = function(topic, name, options, callback) { * }); */ PubSub.prototype.createTopic = function(name, gaxOpts, callback) { - var topic = this.topic(name); + const topic = this.topic(name); - var reqOpts = { + const reqOpts = { name: topic.name, }; @@ -340,17 +340,17 @@ PubSub.prototype.createTopic = function(name, gaxOpts, callback) { * @private */ PubSub.prototype.determineBaseUrl_ = function() { - var apiEndpoint = this.options.apiEndpoint; + const apiEndpoint = this.options.apiEndpoint; if (!apiEndpoint && !process.env.PUBSUB_EMULATOR_HOST) { return; } - var baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; - var leadingProtocol = new RegExp('^https*://'); - var trailingSlashes = new RegExp('/*$'); + const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; + const leadingProtocol = new RegExp('^https*://'); + const trailingSlashes = new RegExp('/*$'); - var baseUrlParts = baseUrl + const baseUrlParts = baseUrl .replace(leadingProtocol, '') .replace(trailingSlashes, '') .split(':'); @@ -408,14 +408,14 @@ PubSub.prototype.determineBaseUrl_ = function() { * }); */ PubSub.prototype.getSnapshots = function(options, callback) { - var self = this; + const self = this; if (is.fn(options)) { callback = options; options = {}; } - var reqOpts = extend( + const reqOpts = extend( { project: 'projects/' + this.projectId, }, @@ -425,7 +425,7 @@ PubSub.prototype.getSnapshots = function(options, callback) { delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - var gaxOpts = extend( + const gaxOpts = extend( { autoPaginate: options.autoPaginate, }, @@ -440,11 +440,11 @@ PubSub.prototype.getSnapshots = function(options, callback) { gaxOpts: gaxOpts, }, function() { - var snapshots = arguments[1]; + const snapshots = arguments[1]; if (snapshots) { arguments[1] = snapshots.map(function(snapshot) { - var snapshotInstance = self.snapshot(snapshot.name); + const snapshotInstance = self.snapshot(snapshot.name); snapshotInstance.metadata = snapshot; return snapshotInstance; }); @@ -545,14 +545,14 @@ PubSub.prototype.getSnapshotsStream = paginator.streamify('getSnapshots'); * }); */ PubSub.prototype.getSubscriptions = function(options, callback) { - var self = this; + const self = this; if (is.fn(options)) { callback = options; options = {}; } - var topic = options.topic; + let topic = options.topic; if (topic) { if (!(topic instanceof Topic)) { @@ -562,13 +562,13 @@ PubSub.prototype.getSubscriptions = function(options, callback) { return topic.getSubscriptions(options, callback); } - var reqOpts = extend({}, options); + const reqOpts = extend({}, options); reqOpts.project = 'projects/' + this.projectId; delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - var gaxOpts = extend( + const gaxOpts = extend( { autoPaginate: options.autoPaginate, }, @@ -583,11 +583,11 @@ PubSub.prototype.getSubscriptions = function(options, callback) { gaxOpts: gaxOpts, }, function() { - var subscriptions = arguments[1]; + const subscriptions = arguments[1]; if (subscriptions) { arguments[1] = subscriptions.map(function(sub) { - var subscriptionInstance = self.subscription(sub.name); + const subscriptionInstance = self.subscription(sub.name); subscriptionInstance.metadata = sub; return subscriptionInstance; }); @@ -690,14 +690,14 @@ PubSub.prototype.getSubscriptionsStream = paginator.streamify( * }); */ PubSub.prototype.getTopics = function(options, callback) { - var self = this; + const self = this; if (is.fn(options)) { callback = options; options = {}; } - var reqOpts = extend( + const reqOpts = extend( { project: 'projects/' + this.projectId, }, @@ -707,7 +707,7 @@ PubSub.prototype.getTopics = function(options, callback) { delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - var gaxOpts = extend( + const gaxOpts = extend( { autoPaginate: options.autoPaginate, }, @@ -722,11 +722,11 @@ PubSub.prototype.getTopics = function(options, callback) { gaxOpts: gaxOpts, }, function() { - var topics = arguments[1]; + const topics = arguments[1]; if (topics) { arguments[1] = topics.map(function(topic) { - var topicInstance = self.topic(topic.name); + const topicInstance = self.topic(topic.name); topicInstance.metadata = topic; return topicInstance; }); @@ -782,9 +782,9 @@ PubSub.prototype.getTopicsStream = paginator.streamify('getTopics'); * @param {function} [callback] The callback function. */ PubSub.prototype.getClient_ = function(config, callback) { - var self = this; + const self = this; - var hasProjectId = + const hasProjectId = this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; if (!hasProjectId && !this.isEmulator) { @@ -800,7 +800,7 @@ PubSub.prototype.getClient_ = function(config, callback) { return; } - var gaxClient = this.api[config.client]; + let gaxClient = this.api[config.client]; if (!gaxClient) { // Lazily instantiate client. @@ -823,7 +823,7 @@ PubSub.prototype.getClient_ = function(config, callback) { * @param {function} [callback] The callback function. */ PubSub.prototype.request = function(config, callback) { - var self = this; + const self = this; this.getClient_(config, function(err, client) { if (err) { @@ -831,7 +831,7 @@ PubSub.prototype.request = function(config, callback) { return; } - var reqOpts = extend(true, {}, config.reqOpts); + let reqOpts = extend(true, {}, config.reqOpts); reqOpts = replaceProjectIdToken(reqOpts, self.projectId); client[config.method](reqOpts, config.gaxOpts, callback); diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index 2c0f66ee013..4bb557c631d 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -16,11 +16,11 @@ 'use strict'; -var arrify = require('arrify'); +const arrify = require('arrify'); const {promisifyAll} = require('@google-cloud/promisify'); -var each = require('async-each'); -var extend = require('extend'); -var is = require('is'); +const each = require('async-each'); +const extend = require('extend'); +const is = require('is'); /** * A Publisher object allows you to publish messages to a specific topic. @@ -160,8 +160,8 @@ Publisher.prototype.publish = function(data, attributes, callback) { } // Ensure the `attributes` object only has string values - for (var key in attributes) { - var value = attributes[key]; + for (const key in attributes) { + const value = attributes[key]; if (!is.string(value)) { throw new TypeError(`All attributes must be in the form of a string. @@ -169,7 +169,7 @@ Publisher.prototype.publish = function(data, attributes, callback) { } } - var opts = this.settings.batching; + const opts = this.settings.batching; // if this message puts us over the maxBytes option, then let's ship // what we have and add it to the next batch @@ -182,7 +182,7 @@ Publisher.prototype.publish = function(data, attributes, callback) { // next lets check if this message brings us to the message cap or if we // magically hit the max byte limit - var hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; + const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; if (this.inventory_.bytes === opts.maxBytes || hasMaxMessages) { this.publish_(); @@ -204,8 +204,8 @@ Publisher.prototype.publish = function(data, attributes, callback) { * @private */ Publisher.prototype.publish_ = function() { - var callbacks = this.inventory_.callbacks; - var messages = this.inventory_.queued; + const callbacks = this.inventory_.callbacks; + const messages = this.inventory_.queued; this.inventory_.callbacks = []; this.inventory_.queued = []; @@ -214,7 +214,7 @@ Publisher.prototype.publish_ = function() { clearTimeout(this.timeoutHandle_); this.timeoutHandle_ = null; - var reqOpts = { + const reqOpts = { topic: this.topic.name, messages: messages, }; @@ -227,10 +227,10 @@ Publisher.prototype.publish_ = function() { gaxOpts: this.settings.gaxOpts, }, function(err, resp) { - var messageIds = arrify(resp && resp.messageIds); + const messageIds = arrify(resp && resp.messageIds); each(callbacks, function(callback, next) { - var messageId = messageIds[callbacks.indexOf(callback)]; + const messageId = messageIds[callbacks.indexOf(callback)]; callback(err, messageId); next(); diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index e332b8f3400..58a79ac20de 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -16,9 +16,9 @@ 'use strict'; -var common = require('@google-cloud/common'); +const common = require('@google-cloud/common'); const {promisifyAll} = require('@google-cloud/promisify'); -var is = require('is'); +const is = require('is'); /** * A Snapshot object will give you access to your Cloud Pub/Sub snapshot. @@ -59,13 +59,13 @@ var is = require('is'); * //- * // From {@link PubSub#snapshot}: * //- - * var snapshot = pubsub.snapshot('my-snapshot'); + * const snapshot = pubsub.snapshot('my-snapshot'); * // snapshot is a Snapshot object. * * //- * // Create a snapshot with {module:pubsub/subscription#createSnapshot}: * //- - * var subscription = pubsub.subscription('my-subscription'); + * const subscription = pubsub.subscription('my-subscription'); * * subscription.createSnapshot('my-snapshot', function(err, snapshot) { * if (!err) { @@ -76,7 +76,7 @@ var is = require('is'); * //- * // Seek to your snapshot: * //- - * var subscription = pubsub.subscription('my-subscription'); + * const subscription = pubsub.subscription('my-subscription'); * * subscription.seek('my-snapshot', function(err) { * if (err) { @@ -109,10 +109,10 @@ function Snapshot(parent, name) { * service. * * @example - * var subscription = pubsub.subscription('my-subscription'); - * var snapshot = subscription.snapshot('my-snapshot'); + * const subscription = pubsub.subscription('my-subscription'); + * const snapshot = subscription.snapshot('my-snapshot'); * - * var callback = function(err, snapshot, apiResponse) { + * const callback = function(err, snapshot, apiResponse) { * if (!err) { * // The snapshot was created successfully. * } @@ -124,8 +124,8 @@ function Snapshot(parent, name) { * // If the callback is omitted, we'll return a Promise. * //- * snapshot.create('my-snapshot').then(function(data) { - * var snapshot = data[0]; - * var apiResponse = data[1]; + * const snapshot = data[0]; + * const apiResponse = data[1]; * }); */ this.create = parent.createSnapshot.bind(parent, name); @@ -145,8 +145,8 @@ function Snapshot(parent, name) { * service. * * @example - * var subscription = pubsub.subscription('my-subscription'); - * var snapshot = subscription.snapshot('my-snapshot'); + * const subscription = pubsub.subscription('my-subscription'); + * const snapshot = subscription.snapshot('my-snapshot'); * * snapshot.seek(function(err, apiResponse) {}); * @@ -154,7 +154,7 @@ function Snapshot(parent, name) { * // If the callback is omitted, we'll return a Promise. * //- * snapshot.seek().then(function(data) { - * var apiResponse = data[0]; + * const apiResponse = data[0]; * }); */ this.seek = parent.seek.bind(parent, name); @@ -187,11 +187,11 @@ Snapshot.formatName_ = function(projectId, name) { * // If the callback is omitted, we'll return a Promise. * //- * snapshot.delete().then(function(data) { - * var apiResponse = data[0]; + * const apiResponse = data[0]; * }); */ Snapshot.prototype.delete = function(callback) { - var reqOpts = { + const reqOpts = { snapshot: this.name, }; diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js index faa009643cb..5c12f83d450 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.js @@ -16,19 +16,19 @@ 'use strict'; -var arrify = require('arrify'); -var chunk = require('lodash.chunk'); -var common = require('@google-cloud/common'); +const arrify = require('arrify'); +const chunk = require('lodash.chunk'); +const common = require('@google-cloud/common'); const {promisify} = require('@google-cloud/promisify'); -var delay = require('delay'); -var events = require('events'); -var extend = require('extend'); -var is = require('is'); -var os = require('os'); -var util = require('util'); +const delay = require('delay'); +const events = require('events'); +const extend = require('extend'); +const is = require('is'); +const os = require('os'); +const util = require('util'); -var ConnectionPool = require('./connection-pool.js'); -var Histogram = require('./histogram.js'); +const ConnectionPool = require('./connection-pool.js'); +const Histogram = require('./histogram.js'); /** * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline @@ -37,7 +37,7 @@ var Histogram = require('./histogram.js'); * overhead, a maximum of 3000 ackIds per request should be safe. * @private */ -var MAX_ACK_IDS_PER_REQUEST = 3000; +const MAX_ACK_IDS_PER_REQUEST = 3000; /** * Subscriber class is used to manage all message related functionality. @@ -105,7 +105,7 @@ util.inherits(Subscriber, events.EventEmitter); * @param {object} message The message object. */ Subscriber.prototype.ack_ = function(message) { - var breakLease = this.breakLease_.bind(this, message); + const breakLease = this.breakLease_.bind(this, message); this.histogram.add(Date.now() - message.received); @@ -128,11 +128,11 @@ Subscriber.prototype.ack_ = function(message) { * @return {Promise} */ Subscriber.prototype.acknowledge_ = function(ackIds, connId) { - var self = this; + const self = this; ackIds = arrify(ackIds); - var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( + const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( ackIdChunk ) { if (self.writeToStreams_ && self.isConnected_()) { @@ -166,7 +166,7 @@ Subscriber.prototype.acknowledge_ = function(ackIds, connId) { * @param {object} message The message object. */ Subscriber.prototype.breakLease_ = function(message) { - var messageIndex = this.inventory_.lease.indexOf(message.ackId); + const messageIndex = this.inventory_.lease.indexOf(message.ackId); if (messageIndex === -1) { return; @@ -175,7 +175,7 @@ Subscriber.prototype.breakLease_ = function(message) { this.inventory_.lease.splice(messageIndex, 1); this.inventory_.bytes -= message.length; - var pool = this.connectionPool; + const pool = this.connectionPool; if (pool && pool.isPaused && !this.hasMaxMessages_()) { pool.resume(); @@ -208,11 +208,11 @@ Subscriber.prototype.breakLease_ = function(message) { * Subscriber.close().then(function() {}); */ Subscriber.prototype.close = function(callback) { - var self = this; + const self = this; this.userClosed_ = true; - var inventory = this.inventory_; + const inventory = this.inventory_; inventory.lease.length = inventory.bytes = 0; clearTimeout(this.leaseTimeoutHandle_); @@ -254,21 +254,21 @@ Subscriber.prototype.closeConnection_ = function(callback) { * @private */ Subscriber.prototype.flushQueues_ = function() { - var self = this; + const self = this; if (this.flushTimeoutHandle_) { this.flushTimeoutHandle_.clear(); this.flushTimeoutHandle_ = null; } - var acks = this.inventory_.ack; - var nacks = this.inventory_.nack; + const acks = this.inventory_.ack; + const nacks = this.inventory_.nack; if (!acks.length && !nacks.length) { return Promise.resolve(); } - var requests = []; + const requests = []; if (acks.length) { requests.push( @@ -352,7 +352,7 @@ Subscriber.prototype.leaseMessage_ = function(message) { * Subscriber.listenForEvents_(); */ Subscriber.prototype.listenForEvents_ = function() { - var self = this; + const self = this; this.on('newListener', function(event) { if (event === 'message') { @@ -383,11 +383,11 @@ Subscriber.prototype.listenForEvents_ = function() { * @return {Promise} */ Subscriber.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { - var self = this; + const self = this; ackIds = arrify(ackIds); - var promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( + const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( ackIdChunk ) { if (self.writeToStreams_ && self.isConnected_()) { @@ -423,7 +423,7 @@ Subscriber.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { * @param {object} message - The message object. */ Subscriber.prototype.nack_ = function(message) { - var breakLease = this.breakLease_.bind(this, message); + const breakLease = this.breakLease_.bind(this, message); if (this.isConnected_()) { this.modifyAckDeadline_(message.ackId, 0, message.connectionId).then( @@ -442,8 +442,8 @@ Subscriber.prototype.nack_ = function(message) { * @private */ Subscriber.prototype.openConnection_ = function() { - var self = this; - var pool = (this.connectionPool = new ConnectionPool(this)); + const self = this; + const pool = (this.connectionPool = new ConnectionPool(this)); this.isOpen = true; @@ -471,7 +471,7 @@ Subscriber.prototype.openConnection_ = function() { * @private */ Subscriber.prototype.renewLeases_ = function() { - var self = this; + const self = this; clearTimeout(this.leaseTimeoutHandle_); this.leaseTimeoutHandle_ = null; @@ -482,8 +482,8 @@ Subscriber.prototype.renewLeases_ = function() { this.ackDeadline = this.histogram.percentile(99); - var ackIds = this.inventory_.lease.slice(); - var ackDeadlineSeconds = this.ackDeadline / 1000; + const ackIds = this.inventory_.lease.slice(); + const ackDeadlineSeconds = this.ackDeadline / 1000; this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(function() { self.setLeaseTimeout_(); @@ -498,8 +498,8 @@ Subscriber.prototype.renewLeases_ = function() { */ Subscriber.prototype.setFlushTimeout_ = function() { if (!this.flushTimeoutHandle_) { - var timeout = delay(this.batching.maxMilliseconds); - var promise = timeout + const timeout = delay(this.batching.maxMilliseconds); + const promise = timeout .then(this.flushQueues_.bind(this)) .catch(common.util.noop); @@ -521,8 +521,8 @@ Subscriber.prototype.setLeaseTimeout_ = function() { return; } - var latency = this.latency_.percentile(99); - var timeout = Math.random() * this.ackDeadline * 0.9 - latency; + const latency = this.latency_.percentile(99); + const timeout = Math.random() * this.ackDeadline * 0.9 - latency; this.leaseTimeoutHandle_ = setTimeout(this.renewLeases_.bind(this), timeout); }; @@ -538,8 +538,8 @@ Subscriber.prototype.setLeaseTimeout_ = function() { * @returns {Promise} */ Subscriber.prototype.writeTo_ = function(connId, data) { - var self = this; - var startTime = Date.now(); + const self = this; + const startTime = Date.now(); return new Promise(function(resolve, reject) { self.connectionPool.acquire(connId, function(err, connection) { diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 9d2a1a759e2..f5c98f39b23 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -16,16 +16,16 @@ 'use strict'; -var common = require('@google-cloud/common'); +const common = require('@google-cloud/common'); const {promisifyAll} = require('@google-cloud/promisify'); -var extend = require('extend'); -var is = require('is'); -var snakeCase = require('lodash.snakecase'); -var util = require('util'); +const extend = require('extend'); +const is = require('is'); +const snakeCase = require('lodash.snakecase'); +const util = require('util'); -var IAM = require('./iam.js'); -var Snapshot = require('./snapshot.js'); -var Subscriber = require('./subscriber.js'); +const IAM = require('./iam.js'); +const Snapshot = require('./snapshot.js'); +const Subscriber = require('./subscriber.js'); /** * A Subscription object will give you access to your Cloud Pub/Sub @@ -91,7 +91,7 @@ var Subscriber = require('./subscriber.js'); * //- * // From {@link Topic#getSubscriptions}: * //- - * var topic = pubsub.topic('my-topic'); + * const topic = pubsub.topic('my-topic'); * topic.getSubscriptions(function(err, subscriptions) { * // `subscriptions` is an array of Subscription objects. * }); @@ -99,7 +99,7 @@ var Subscriber = require('./subscriber.js'); * //- * // From {@link Topic#createSubscription}: * //- - * var topic = pubsub.topic('my-topic'); + * const topic = pubsub.topic('my-topic'); * topic.createSubscription('new-subscription', function(err, subscription) { * // `subscription` is a Subscription object. * }); @@ -107,8 +107,8 @@ var Subscriber = require('./subscriber.js'); * //- * // From {@link Topic#subscription}: * //- - * var topic = pubsub.topic('my-topic'); - * var subscription = topic.subscription('my-subscription'); + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); * // `subscription` is a Subscription object. * * //- @@ -189,8 +189,8 @@ function Subscription(pubsub, name, options) { * // If the callback is omitted, we'll return a Promise. * //- * subscription.iam.getPolicy().then(function(data) { - * var policy = data[0]; - * var apiResponse = data[1]; + * const policy = data[0]; + * const apiResponse = data[1]; * }); */ this.iam = new IAM(pubsub, this.name); @@ -206,7 +206,7 @@ util.inherits(Subscription, Subscriber); * @private */ Subscription.formatMetadata_ = function(metadata) { - var formatted = extend({}, metadata); + const formatted = extend({}, metadata); if (metadata.messageRetentionDuration) { formatted.retainAckedMessages = true; @@ -287,7 +287,7 @@ Subscription.formatName_ = function(projectId, name) { * }); */ Subscription.prototype.createSnapshot = function(name, gaxOpts, callback) { - var self = this; + const self = this; if (!is.string(name)) { throw new Error('A name is required to create a snapshot.'); @@ -298,9 +298,9 @@ Subscription.prototype.createSnapshot = function(name, gaxOpts, callback) { gaxOpts = {}; } - var snapshot = self.snapshot(name); + const snapshot = self.snapshot(name); - var reqOpts = { + const reqOpts = { name: snapshot.name, subscription: this.name, }; @@ -354,7 +354,7 @@ Subscription.prototype.createSnapshot = function(name, gaxOpts, callback) { * }); */ Subscription.prototype.delete = function(gaxOpts, callback) { - var self = this; + const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; @@ -363,7 +363,7 @@ Subscription.prototype.delete = function(gaxOpts, callback) { callback = callback || common.util.noop; - var reqOpts = { + const reqOpts = { subscription: this.name, }; @@ -413,7 +413,7 @@ Subscription.prototype.delete = function(gaxOpts, callback) { * // If the callback is omitted, we'll return a Promise. * //- * subscription.exists().then(function(data) { - * var exists = data[0]; + * const exists = data[0]; * }); */ Subscription.prototype.exists = function(callback) { @@ -473,14 +473,14 @@ Subscription.prototype.exists = function(callback) { * }); */ Subscription.prototype.get = function(gaxOpts, callback) { - var self = this; + const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; } - var autoCreate = !!gaxOpts.autoCreate && is.fn(this.create); + const autoCreate = !!gaxOpts.autoCreate && is.fn(this.create); delete gaxOpts.autoCreate; this.getMetadata(gaxOpts, function(err, apiResponse) { @@ -532,18 +532,18 @@ Subscription.prototype.get = function(gaxOpts, callback) { * // If the callback is omitted, we'll return a Promise. * //- * subscription.getMetadata().then(function(data) { - * var apiResponse = data[0]; + * const apiResponse = data[0]; * }); */ Subscription.prototype.getMetadata = function(gaxOpts, callback) { - var self = this; + const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; } - var reqOpts = { + const reqOpts = { subscription: this.name, }; @@ -592,7 +592,7 @@ Subscription.prototype.getMetadata = function(gaxOpts, callback) { * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * - * var pushConfig = { + * const pushConfig = { * pushEndpoint: 'https://mydomain.com/push', * attributes: { * key: 'value' @@ -609,7 +609,7 @@ Subscription.prototype.getMetadata = function(gaxOpts, callback) { * // If the callback is omitted, we'll return a Promise. * //- * subscription.modifyPushConfig(pushConfig).then(function(data) { - * var apiResponse = data[0]; + * const apiResponse = data[0]; * }); */ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { @@ -618,7 +618,7 @@ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { gaxOpts = {}; } - var reqOpts = { + const reqOpts = { subscription: this.name, pushConfig: config, }; @@ -654,7 +654,7 @@ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { * @returns {Promise} * * @example - * var callback = function(err, resp) { + * const callback = function(err, resp) { * if (!err) { * // Seek was successful. * } @@ -666,7 +666,7 @@ Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { * // Alternatively, to specify a certain point in time, you can provide a Date * // object. * //- - * var date = new Date('October 21 2015'); + * const date = new Date('October 21 2015'); * * subscription.seek(date, callback); */ @@ -676,7 +676,7 @@ Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { gaxOpts = {}; } - var reqOpts = { + const reqOpts = { subscription: this.name, }; @@ -718,7 +718,7 @@ Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { * @returns {Promise} * * @example - * var metadata = { + * const metadata = { * key: 'value' * }; * @@ -732,7 +732,7 @@ Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { * // If the callback is omitted, we'll return a Promise. * //- * subscription.setMetadata(metadata).then(function(data) { - * var apiResponse = data[0]; + * const apiResponse = data[0]; * }); */ Subscription.prototype.setMetadata = function(metadata, gaxOpts, callback) { @@ -741,12 +741,12 @@ Subscription.prototype.setMetadata = function(metadata, gaxOpts, callback) { gaxOpts = {}; } - var subscription = Subscription.formatMetadata_(metadata); - var fields = Object.keys(subscription).map(snakeCase); + const subscription = Subscription.formatMetadata_(metadata); + const fields = Object.keys(subscription).map(snakeCase); subscription.name = this.name; - var reqOpts = { + const reqOpts = { subscription: subscription, updateMask: { paths: fields, @@ -774,7 +774,7 @@ Subscription.prototype.setMetadata = function(metadata, gaxOpts, callback) { * @returns {Snapshot} * * @example - * var snapshot = subscription.snapshot('my-snapshot'); + * const snapshot = subscription.snapshot('my-snapshot'); */ Subscription.prototype.snapshot = function(name) { return this.pubsub.snapshot.call(this, name); diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 03cdca5f0ed..04d96c650c2 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -16,14 +16,14 @@ 'use strict'; -var common = require('@google-cloud/common'); +const common = require('@google-cloud/common'); const {promisifyAll} = require('@google-cloud/promisify'); const {paginator} = require('@google-cloud/paginator'); -var extend = require('extend'); -var is = require('is'); +const extend = require('extend'); +const is = require('is'); -var IAM = require('./iam.js'); -var Publisher = require('./publisher.js'); +const IAM = require('./iam.js'); +const Publisher = require('./publisher.js'); /** * A Topic object allows you to interact with a Cloud Pub/Sub topic. @@ -229,7 +229,7 @@ Topic.prototype.delete = function(gaxOpts, callback) { callback = callback || common.util.noop; - var reqOpts = { + const reqOpts = { topic: this.name, }; @@ -330,14 +330,14 @@ Topic.prototype.exists = function(callback) { * }); */ Topic.prototype.get = function(gaxOpts, callback) { - var self = this; + const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; } - var autoCreate = !!gaxOpts.autoCreate; + const autoCreate = !!gaxOpts.autoCreate; delete gaxOpts.autoCreate; this.getMetadata(gaxOpts, function(err, apiResponse) { @@ -390,14 +390,14 @@ Topic.prototype.get = function(gaxOpts, callback) { * }); */ Topic.prototype.getMetadata = function(gaxOpts, callback) { - var self = this; + const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; } - var reqOpts = { + const reqOpts = { topic: this.name, }; @@ -454,14 +454,14 @@ Topic.prototype.getMetadata = function(gaxOpts, callback) { * }); */ Topic.prototype.getSubscriptions = function(options, callback) { - var self = this; + const self = this; if (is.fn(options)) { callback = options; options = {}; } - var reqOpts = extend( + const reqOpts = extend( { topic: this.name, }, @@ -471,7 +471,7 @@ Topic.prototype.getSubscriptions = function(options, callback) { delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - var gaxOpts = extend( + const gaxOpts = extend( { autoPaginate: options.autoPaginate, }, @@ -486,7 +486,7 @@ Topic.prototype.getSubscriptions = function(options, callback) { gaxOpts: gaxOpts, }, function() { - var subscriptions = arguments[1]; + const subscriptions = arguments[1]; if (subscriptions) { arguments[1] = subscriptions.map(function(sub) { diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 89c67299488..6b73f284652 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -16,28 +16,28 @@ 'use strict'; -var assert = require('assert'); -var async = require('async'); -var Subscription = require('../src/subscription.js'); -var uuid = require('uuid'); +const assert = require('assert'); +const async = require('async'); +const Subscription = require('../src/subscription.js'); +const uuid = require('uuid'); -var PubSub = require('../'); -var pubsub = PubSub(); +const PubSub = require('../'); +const pubsub = PubSub(); describe('pubsub', function() { - var TOPIC_NAMES = [ + const TOPIC_NAMES = [ generateTopicName(), generateTopicName(), generateTopicName(), ]; - var TOPICS = [ + const TOPICS = [ pubsub.topic(TOPIC_NAMES[0]), pubsub.topic(TOPIC_NAMES[1]), pubsub.topic(TOPIC_NAMES[2]), ]; - var TOPIC_FULL_NAMES = TOPICS.map(getTopicName); + const TOPIC_FULL_NAMES = TOPICS.map(getTopicName); function generateSnapshotName() { return 'test-snapshot-' + uuid.v4(); @@ -63,9 +63,9 @@ describe('pubsub', function() { options = options || {}; - var topic = pubsub.topic(generateTopicName()); - var publisher = topic.publisher(); - var subscription = topic.subscription(generateSubName()); + const topic = pubsub.topic(generateTopicName()); + const publisher = topic.publisher(); + const subscription = topic.subscription(generateSubName()); async.series( [ @@ -123,8 +123,8 @@ describe('pubsub', function() { pubsub.getTopics(function(err, topics) { assert.ifError(err); - var results = topics.filter(function(topic) { - var name = getTopicName(topic); + const results = topics.filter(function(topic) { + const name = getTopicName(topic); return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); @@ -135,7 +135,7 @@ describe('pubsub', function() { }); it('should list topics in a stream', function(done) { - var topicsEmitted = []; + const topicsEmitted = []; pubsub .getTopicsStream() @@ -144,8 +144,8 @@ describe('pubsub', function() { topicsEmitted.push(topic); }) .on('end', function() { - var results = topicsEmitted.filter(function(topic) { - var name = getTopicName(topic); + const results = topicsEmitted.filter(function(topic) { + const name = getTopicName(topic); return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); @@ -169,7 +169,7 @@ describe('pubsub', function() { }); it('should be created and deleted', function(done) { - var TOPIC_NAME = generateTopicName(); + const TOPIC_NAME = generateTopicName(); pubsub.createTopic(TOPIC_NAME, function(err) { assert.ifError(err); pubsub.topic(TOPIC_NAME).delete(done); @@ -177,13 +177,13 @@ describe('pubsub', function() { }); it('should honor the autoCreate option', function(done) { - var topic = pubsub.topic(generateTopicName()); + const topic = pubsub.topic(generateTopicName()); topic.get({autoCreate: true}, done); }); it('should confirm if a topic exists', function(done) { - var topic = pubsub.topic(TOPIC_NAMES[0]); + const topic = pubsub.topic(TOPIC_NAMES[0]); topic.exists(function(err, exists) { assert.ifError(err); @@ -193,7 +193,7 @@ describe('pubsub', function() { }); it('should confirm if a topic does not exist', function(done) { - var topic = pubsub.topic('should-not-exist'); + const topic = pubsub.topic('should-not-exist'); topic.exists(function(err, exists) { assert.ifError(err); @@ -203,9 +203,9 @@ describe('pubsub', function() { }); it('should publish a message', function(done) { - var topic = pubsub.topic(TOPIC_NAMES[0]); - var publisher = topic.publisher(); - var message = Buffer.from('message from me'); + const topic = pubsub.topic(TOPIC_NAMES[0]); + const publisher = topic.publisher(); + const message = Buffer.from('message from me'); publisher.publish(message, function(err, messageId) { assert.ifError(err); @@ -215,8 +215,8 @@ describe('pubsub', function() { }); it('should publish a message with attributes', function(done) { - var data = Buffer.from('raw message data'); - var attrs = { + const data = Buffer.from('raw message data'); + const attrs = { customAttribute: 'value', }; @@ -231,7 +231,7 @@ describe('pubsub', function() { }); it('should get the metadata of a topic', function(done) { - var topic = pubsub.topic(TOPIC_NAMES[0]); + const topic = pubsub.topic(TOPIC_NAMES[0]); topic.getMetadata(function(err, metadata) { assert.ifError(err); assert.strictEqual(metadata.name, topic.name); @@ -241,13 +241,13 @@ describe('pubsub', function() { }); describe('Subscription', function() { - var TOPIC_NAME = generateTopicName(); - var topic = pubsub.topic(TOPIC_NAME); - var publisher = topic.publisher(); + const TOPIC_NAME = generateTopicName(); + const topic = pubsub.topic(TOPIC_NAME); + const publisher = topic.publisher(); - var SUB_NAMES = [generateSubName(), generateSubName()]; + const SUB_NAMES = [generateSubName(), generateSubName()]; - var SUBSCRIPTIONS = [ + const SUBSCRIPTIONS = [ topic.subscription(SUB_NAMES[0], {ackDeadline: 30000}), topic.subscription(SUB_NAMES[1], {ackDeadline: 60000}), ]; @@ -310,7 +310,7 @@ describe('pubsub', function() { }); it('should list all topic subscriptions as a stream', function(done) { - var subscriptionsEmitted = []; + const subscriptionsEmitted = []; topic .getSubscriptionsStream() @@ -333,7 +333,7 @@ describe('pubsub', function() { }); it('should list all subscriptions as a stream', function(done) { - var subscriptionEmitted = false; + let subscriptionEmitted = false; pubsub .getSubscriptionsStream() @@ -348,7 +348,7 @@ describe('pubsub', function() { }); it('should allow creation and deletion of a subscription', function(done) { - var subName = generateSubName(); + const subName = generateSubName(); topic.createSubscription(subName, function(err, sub) { assert.ifError(err); assert(sub instanceof Subscription); @@ -357,13 +357,13 @@ describe('pubsub', function() { }); it('should honor the autoCreate option', function(done) { - var sub = topic.subscription(generateSubName()); + const sub = topic.subscription(generateSubName()); sub.get({autoCreate: true}, done); }); it('should confirm if a sub exists', function(done) { - var sub = topic.subscription(SUB_NAMES[0]); + const sub = topic.subscription(SUB_NAMES[0]); sub.exists(function(err, exists) { assert.ifError(err); @@ -373,7 +373,7 @@ describe('pubsub', function() { }); it('should confirm if a sub does not exist', function(done) { - var sub = topic.subscription('should-not-exist'); + const sub = topic.subscription('should-not-exist'); sub.exists(function(err, exists) { assert.ifError(err); @@ -383,8 +383,8 @@ describe('pubsub', function() { }); it('should create a subscription with message retention', function(done) { - var subName = generateSubName(); - var threeDaysInSeconds = 3 * 24 * 60 * 60; + const subName = generateSubName(); + const threeDaysInSeconds = 3 * 24 * 60 * 60; topic.createSubscription( subName, @@ -414,8 +414,8 @@ describe('pubsub', function() { }); it('should set metadata for a subscription', function() { - var subscription = topic.subscription(generateSubName()); - var threeDaysInSeconds = 3 * 24 * 60 * 60; + const subscription = topic.subscription(generateSubName()); + const threeDaysInSeconds = 3 * 24 * 60 * 60; return subscription .create() @@ -428,7 +428,7 @@ describe('pubsub', function() { return subscription.getMetadata(); }) .then(function(data) { - var metadata = data[0]; + const metadata = data[0]; assert.strictEqual(metadata.retainAckedMessages, true); assert.strictEqual( @@ -447,7 +447,7 @@ describe('pubsub', function() { }); it('should error when using a non-existent subscription', function(done) { - var subscription = topic.subscription(generateSubName(), { + const subscription = topic.subscription(generateSubName(), { maxConnections: 1, }); @@ -462,8 +462,8 @@ describe('pubsub', function() { }); it('should receive the published messages', function(done) { - var messageCount = 0; - var subscription = topic.subscription(SUB_NAMES[1]); + let messageCount = 0; + const subscription = topic.subscription(SUB_NAMES[1]); subscription.on('error', done); @@ -477,7 +477,7 @@ describe('pubsub', function() { }); it('should ack the message', function(done) { - var subscription = topic.subscription(SUB_NAMES[1]); + const subscription = topic.subscription(SUB_NAMES[1]); subscription.on('error', done); subscription.on('message', ack); @@ -492,7 +492,7 @@ describe('pubsub', function() { }); it('should nack the message', function(done) { - var subscription = topic.subscription(SUB_NAMES[1]); + const subscription = topic.subscription(SUB_NAMES[1]); subscription.on('error', done); subscription.on('message', nack); @@ -507,10 +507,10 @@ describe('pubsub', function() { }); it('should respect flow control limits', function(done) { - var maxMessages = 3; - var messageCount = 0; + const maxMessages = 3; + let messageCount = 0; - var subscription = topic.subscription(SUB_NAMES[0], { + const subscription = topic.subscription(SUB_NAMES[0], { flowControl: { maxMessages: maxMessages, }, @@ -533,7 +533,7 @@ describe('pubsub', function() { describe('IAM', function() { it('should get a policy', function(done) { - var topic = pubsub.topic(TOPIC_NAMES[0]); + const topic = pubsub.topic(TOPIC_NAMES[0]); topic.iam.getPolicy(function(err, policy) { assert.ifError(err); @@ -546,8 +546,8 @@ describe('pubsub', function() { }); it('should set a policy', function(done) { - var topic = pubsub.topic(TOPIC_NAMES[0]); - var policy = { + const topic = pubsub.topic(TOPIC_NAMES[0]); + const policy = { bindings: [ { role: 'roles/pubsub.publisher', @@ -566,8 +566,8 @@ describe('pubsub', function() { }); it('should test the iam permissions', function(done) { - var topic = pubsub.topic(TOPIC_NAMES[0]); - var testPermissions = ['pubsub.topics.get', 'pubsub.topics.update']; + const topic = pubsub.topic(TOPIC_NAMES[0]); + const testPermissions = ['pubsub.topics.get', 'pubsub.topics.update']; topic.iam.testPermissions(testPermissions, function(err, permissions) { assert.ifError(err); @@ -581,12 +581,12 @@ describe('pubsub', function() { }); describe('Snapshot', function() { - var SNAPSHOT_NAME = generateSnapshotName(); + const SNAPSHOT_NAME = generateSnapshotName(); - var topic; - var publisher; - var subscription; - var snapshot; + let topic; + let publisher; + let subscription; + let snapshot; function deleteAllSnapshots() { return pubsub.getSnapshots().then(function(data) { @@ -634,7 +634,7 @@ describe('pubsub', function() { }); it('should get a list of snapshots as a stream', function(done) { - var snapshots = []; + const snapshots = []; pubsub .getSnapshotsStream() @@ -650,8 +650,8 @@ describe('pubsub', function() { }); describe('seeking', function() { - var subscription; - var messageId; + let subscription; + let messageId; beforeEach(function() { subscription = topic.subscription(generateSubName()); @@ -667,12 +667,12 @@ describe('pubsub', function() { }); it('should seek to a snapshot', function(done) { - var snapshotName = generateSnapshotName(); + const snapshotName = generateSnapshotName(); subscription.createSnapshot(snapshotName, function(err, snapshot) { assert.ifError(err); - var messageCount = 0; + let messageCount = 0; subscription.on('error', done); subscription.on('message', function(message) { @@ -696,7 +696,7 @@ describe('pubsub', function() { }); it('should seek to a date', function(done) { - var messageCount = 0; + let messageCount = 0; subscription.on('error', done); subscription.on('message', function(message) { diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index ece74985920..762cd74fe13 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -16,18 +16,18 @@ 'use strict'; -var assert = require('assert'); -var common = require('@google-cloud/common'); -var duplexify = require('duplexify'); -var events = require('events'); -var extend = require('extend'); -var proxyquire = require('proxyquire'); -var uuid = require('uuid'); -var util = require('util'); +const assert = require('assert'); +const common = require('@google-cloud/common'); +const duplexify = require('duplexify'); +const events = require('events'); +const extend = require('extend'); +const proxyquire = require('proxyquire'); +const uuid = require('uuid'); +const util = require('util'); const pjy = require('@google-cloud/projectify'); -var fakeUtil = extend({}, common.util); -var fakeUuid = extend({}, uuid); +const fakeUtil = extend({}, common.util); +const fakeUuid = extend({}, uuid); function FakeConnection() { this.isConnected = false; @@ -69,32 +69,32 @@ FakeConnection.prototype.cancel = function() { this.canceled = true; }; -var duplexifyOverride = null; +let duplexifyOverride = null; function fakeDuplexify() { - var args = [].slice.call(arguments); + const args = [].slice.call(arguments); return (duplexifyOverride || duplexify).apply(null, args); } describe('ConnectionPool', function() { - var ConnectionPool; - var pool; - var fakeConnection; - var fakeChannel; - var fakeClient; + let ConnectionPool; + let pool; + let fakeConnection; + let fakeChannel; + let fakeClient; - var FAKE_PUBSUB_OPTIONS = {}; - var PROJECT_ID = 'grapce-spacheship-123'; + const FAKE_PUBSUB_OPTIONS = {}; + const PROJECT_ID = 'grapce-spacheship-123'; - var PUBSUB = { + const PUBSUB = { auth: { getAuthClient: fakeUtil.noop, }, options: FAKE_PUBSUB_OPTIONS, }; - var SUB_NAME = 'test-subscription'; - var SUBSCRIPTION = { + const SUB_NAME = 'test-subscription'; + const SUBSCRIPTION = { name: SUB_NAME, pubsub: PUBSUB, request: fakeUtil.noop, @@ -157,10 +157,10 @@ describe('ConnectionPool', function() { describe('initialization', function() { it('should initialize internally used properties', function() { - var open = ConnectionPool.prototype.open; + const open = ConnectionPool.prototype.open; ConnectionPool.prototype.open = fakeUtil.noop; - var pool = new ConnectionPool(SUBSCRIPTION); + const pool = new ConnectionPool(SUBSCRIPTION); assert.strictEqual(pool.subscription, SUBSCRIPTION); assert.strictEqual(pool.pubsub, SUBSCRIPTION.pubsub); @@ -178,14 +178,14 @@ describe('ConnectionPool', function() { }); it('should respect user specified settings', function() { - var options = { + const options = { maxConnections: 2, ackDeadline: 100, }; - var subscription = extend({}, SUBSCRIPTION, options); - var subscriptionCopy = extend({}, subscription); - var pool = new ConnectionPool(subscription); + const subscription = extend({}, SUBSCRIPTION, options); + const subscriptionCopy = extend({}, subscription); + const pool = new ConnectionPool(subscription); assert.deepStrictEqual(pool.settings, options); assert.deepStrictEqual(subscription, subscriptionCopy); @@ -196,7 +196,7 @@ describe('ConnectionPool', function() { }); it('should call open', function(done) { - var open = ConnectionPool.prototype.open; + const open = ConnectionPool.prototype.open; ConnectionPool.prototype.open = function() { ConnectionPool.prototype.open = open; @@ -209,7 +209,7 @@ describe('ConnectionPool', function() { describe('acquire', function() { it('should return an error if the pool is closed', function(done) { - var expectedErr = 'No connections available to make request.'; + const expectedErr = 'No connections available to make request.'; pool.isOpen = false; @@ -221,8 +221,8 @@ describe('ConnectionPool', function() { }); it('should return a specified connection', function(done) { - var id = 'a'; - var fakeConnection = new FakeConnection(); + let id = 'a'; + const fakeConnection = new FakeConnection(); pool.connections.set(id, fakeConnection); pool.connections.set('b', new FakeConnection()); @@ -235,7 +235,7 @@ describe('ConnectionPool', function() { }); it('should return any conn when the specified is missing', function(done) { - var fakeConnection = new FakeConnection(); + const fakeConnection = new FakeConnection(); pool.connections.set('a', fakeConnection); @@ -247,7 +247,7 @@ describe('ConnectionPool', function() { }); it('should return any connection when id is missing', function(done) { - var fakeConnection = new FakeConnection(); + const fakeConnection = new FakeConnection(); pool.connections.set('a', fakeConnection); @@ -259,7 +259,7 @@ describe('ConnectionPool', function() { }); it('should listen for connected event if no conn is ready', function(done) { - var fakeConnection = new FakeConnection(); + const fakeConnection = new FakeConnection(); pool.acquire(function(err, connection) { assert.ifError(err); @@ -272,8 +272,8 @@ describe('ConnectionPool', function() { }); describe('close', function() { - var _clearTimeout; - var _clearInterval; + let _clearTimeout; + let _clearInterval; before(function() { _clearTimeout = global.clearTimeout; @@ -290,7 +290,7 @@ describe('ConnectionPool', function() { }); it('should stop running the keepAlive task', function(done) { - var fakeHandle = 123; + const fakeHandle = 123; pool.keepAliveHandle = fakeHandle; @@ -308,9 +308,9 @@ describe('ConnectionPool', function() { }); it('should clear any timeouts in the queue', function() { - var clearCalls = 0; + let clearCalls = 0; - var fakeHandles = ['a', 'b', 'c', 'd']; + const fakeHandles = ['a', 'b', 'c', 'd']; global.clearTimeout = function(handle) { assert.strictEqual(handle, fakeHandles[clearCalls++]); @@ -363,8 +363,8 @@ describe('ConnectionPool', function() { }); it('should call cancel on all active connections', function(done) { - var a = new FakeConnection(); - var b = new FakeConnection(); + const a = new FakeConnection(); + const b = new FakeConnection(); pool.connections.set('a', a); pool.connections.set('b', b); @@ -378,8 +378,8 @@ describe('ConnectionPool', function() { }); it('should call end on all active connections', function() { - var a = new FakeConnection(); - var b = new FakeConnection(); + const a = new FakeConnection(); + const b = new FakeConnection(); pool.connections.set('a', a); pool.connections.set('b', b); @@ -410,10 +410,10 @@ describe('ConnectionPool', function() { }); describe('createConnection', function() { - var fakeConnection; - var fakeChannel; - var fakeClient; - var fakeDuplex; + let fakeConnection; + let fakeChannel; + let fakeClient; + let fakeDuplex; beforeEach(function() { fakeConnection = new FakeConnection(); @@ -451,7 +451,7 @@ describe('ConnectionPool', function() { }); it('should emit any errors that occur when getting client', function(done) { - var error = new Error('err'); + const error = new Error('err'); pool.getClient = function(callback) { callback(error); @@ -466,8 +466,8 @@ describe('ConnectionPool', function() { }); describe('channel', function() { - var channelReadyEvent = 'channel.ready'; - var channelErrorEvent = 'channel.error'; + const channelReadyEvent = 'channel.ready'; + const channelErrorEvent = 'channel.error'; describe('error', function() { it('should remove the channel ready event listener', function() { @@ -526,8 +526,8 @@ describe('ConnectionPool', function() { }); describe('connection', function() { - var TOKENIZED_SUB_NAME = 'project/p/subscriptions/' + SUB_NAME; - var fakeId; + const TOKENIZED_SUB_NAME = 'project/p/subscriptions/' + SUB_NAME; + let fakeId; beforeEach(function() { fakeId = uuid.v4(); @@ -540,7 +540,7 @@ describe('ConnectionPool', function() { }); it('should create a connection', function(done) { - var fakeDuplex = new FakeConnection(); + const fakeDuplex = new FakeConnection(); duplexifyOverride = function(writable, readable, options) { assert.strictEqual(writable, fakeConnection); @@ -571,9 +571,9 @@ describe('ConnectionPool', function() { }); it('should unpack the recieved messages', function(done) { - var fakeDuplex = new FakeConnection(); - var pipedMessages = []; - var fakeResp = { + const fakeDuplex = new FakeConnection(); + const pipedMessages = []; + const fakeResp = { receivedMessages: [{}, {}, {}, {}, null], }; @@ -598,7 +598,7 @@ describe('ConnectionPool', function() { }); it('should proxy the cancel method', function() { - var fakeCancel = function() {}; + const fakeCancel = function() {}; fakeConnection.cancel = { bind: function(context) { @@ -619,7 +619,7 @@ describe('ConnectionPool', function() { describe('error events', function() { it('should emit errors to the pool', function(done) { - var error = new Error('err'); + const error = new Error('err'); pool.on('error', function(err) { assert.strictEqual(err, error); @@ -637,7 +637,7 @@ describe('ConnectionPool', function() { }); it('should cancel any error events', function(done) { - var fakeError = {code: 4}; + const fakeError = {code: 4}; pool.on('error', done); // should not fire pool.createConnection(); @@ -683,9 +683,9 @@ describe('ConnectionPool', function() { }); it('should capture the date when no conns are found', function(done) { - var dateNow = global.Date.now; + const dateNow = global.Date.now; - var fakeDate = Date.now(); + const fakeDate = Date.now(); global.Date.now = function() { return fakeDate; }; @@ -730,7 +730,7 @@ describe('ConnectionPool', function() { }); it('should queue a connection if status is retryable', function(done) { - var fakeStatus = {}; + const fakeStatus = {}; pool.shouldReconnect = function(status) { assert.strictEqual(status, fakeStatus); @@ -744,7 +744,7 @@ describe('ConnectionPool', function() { }); it('should emit error if no pending conn. are found', function(done) { - var error = { + const error = { code: 4, details: 'Deadline Exceeded', }; @@ -769,8 +769,8 @@ describe('ConnectionPool', function() { describe('data events', function() { it('should emit messages', function(done) { - var fakeResp = {}; - var fakeMessage = {}; + const fakeResp = {}; + const fakeMessage = {}; pool.createMessage = function(id, resp) { assert.strictEqual(id, fakeId); @@ -791,18 +791,18 @@ describe('ConnectionPool', function() { }); describe('createMessage', function() { - var message; - var globalDateNow; + let message; + let globalDateNow; - var CONNECTION_ID = 'abc'; - var FAKE_DATE_NOW = Date.now(); + const CONNECTION_ID = 'abc'; + const FAKE_DATE_NOW = Date.now(); - var PT = { + const PT = { seconds: 6838383, nanos: 20323838, }; - var RESP = { + const RESP = { ackId: 'def', message: { messageId: 'ghi', @@ -834,7 +834,7 @@ describe('ConnectionPool', function() { }); it('should capture the message data', function() { - var expectedPublishTime = new Date( + const expectedPublishTime = new Date( parseInt(PT.seconds, 10) * 1000 + parseInt(PT.nanos, 10) / 1e6 ); @@ -874,15 +874,15 @@ describe('ConnectionPool', function() { }); describe('getAndEmitChannelState', function() { - var channelErrorEvent = 'channel.error'; - var channelReadyEvent = 'channel.ready'; - var channelReadyState = 2; - var fakeChannelState; - var dateNow; - var fakeTimestamp; - var fakeChannel = {}; - - var fakeClient = { + const channelErrorEvent = 'channel.error'; + const channelReadyEvent = 'channel.ready'; + const channelReadyState = 2; + let fakeChannelState; + let dateNow; + let fakeTimestamp; + const fakeChannel = {}; + + const fakeClient = { getChannel: function() { return fakeChannel; }, @@ -926,14 +926,14 @@ describe('ConnectionPool', function() { }); it('should emit any client errors', function(done) { - var channelErrorEmitted = false; + let channelErrorEmitted = false; pool.on(channelErrorEvent, function() { channelErrorEmitted = true; }); - var fakeError = new Error('nope'); - var errorEmitted = false; + const fakeError = new Error('nope'); + let errorEmitted = false; pool.on('error', function(err) { assert.strictEqual(err, fakeError); @@ -974,7 +974,7 @@ describe('ConnectionPool', function() { }); it('should wait for the channel to be ready', function(done) { - var expectedDeadline = fakeTimestamp + 300000; + const expectedDeadline = fakeTimestamp + 300000; fakeClient.waitForReady = function(deadline) { assert.strictEqual(deadline, expectedDeadline); @@ -987,8 +987,8 @@ describe('ConnectionPool', function() { it('should factor in the noConnectionsTime property', function(done) { pool.noConnectionsTime = 10; - var fakeElapsedTime = fakeTimestamp - pool.noConnectionsTime; - var expectedDeadline = fakeTimestamp + (300000 - fakeElapsedTime); + const fakeElapsedTime = fakeTimestamp - pool.noConnectionsTime; + const expectedDeadline = fakeTimestamp + (300000 - fakeElapsedTime); fakeClient.waitForReady = function(deadline) { assert.strictEqual(deadline, expectedDeadline); @@ -999,7 +999,7 @@ describe('ConnectionPool', function() { }); it('should emit any waitForReady errors', function(done) { - var fakeError = new Error('err'); + const fakeError = new Error('err'); pool.on(channelErrorEvent, function(err) { assert.strictEqual(err, fakeError); @@ -1029,7 +1029,7 @@ describe('ConnectionPool', function() { }); describe('getClient', function() { - var fakeCreds = {}; + const fakeCreds = {}; function FakeSubscriber(address, creds, options) { this.address = address; @@ -1050,7 +1050,7 @@ describe('ConnectionPool', function() { this.closed = true; }; - var fakeClient = new FakeSubscriber('fake-address', fakeCreds, {}); + const fakeClient = new FakeSubscriber('fake-address', fakeCreds, {}); beforeEach(function() { PUBSUB.getClient_ = function(config, callback) { @@ -1082,14 +1082,14 @@ describe('ConnectionPool', function() { describe('isConnected', function() { it('should return true when at least one stream is connected', function() { - var connections = (pool.connections = new Map()); + const connections = (pool.connections = new Map()); connections.set('a', new FakeConnection()); connections.set('b', new FakeConnection()); connections.set('c', new FakeConnection()); connections.set('d', new FakeConnection()); - var conn = new FakeConnection(); + const conn = new FakeConnection(); conn.isConnected = true; connections.set('e', conn); @@ -1097,7 +1097,7 @@ describe('ConnectionPool', function() { }); it('should return false when there is no connection', function() { - var connections = (pool.connections = new Map()); + const connections = (pool.connections = new Map()); connections.set('a', new FakeConnection()); connections.set('b', new FakeConnection()); @@ -1121,8 +1121,8 @@ describe('ConnectionPool', function() { }); it('should make the specified number of connections', function() { - var expectedCount = 5; - var connectionCount = 0; + const expectedCount = 5; + let connectionCount = 0; pool.queueConnection = function() { connectionCount += 1; @@ -1140,8 +1140,8 @@ describe('ConnectionPool', function() { }); it('should reset internal used props', function() { - var fakeDate = Date.now(); - var dateNow = Date.now; + const fakeDate = Date.now(); + const dateNow = Date.now; global.Date.now = function() { return fakeDate; @@ -1188,9 +1188,9 @@ describe('ConnectionPool', function() { }); it('should start a keepAlive task', function(done) { - var _setInterval = global.setInterval; - var unreffed = false; - var fakeHandle = { + const _setInterval = global.setInterval; + let unreffed = false; + const fakeHandle = { unref: () => (unreffed = true), }; @@ -1220,8 +1220,8 @@ describe('ConnectionPool', function() { }); it('should pause all the connections', function() { - var a = new FakeConnection(); - var b = new FakeConnection(); + const a = new FakeConnection(); + const b = new FakeConnection(); pool.connections.set('a', a); pool.connections.set('b', b); @@ -1234,11 +1234,11 @@ describe('ConnectionPool', function() { }); describe('queueConnection', function() { - var fakeTimeoutHandle = 123; + const fakeTimeoutHandle = 123; - var _setTimeout; - var _random; - var _open; + let _setTimeout; + let _random; + let _open; before(function() { _setTimeout = global.setTimeout; @@ -1299,8 +1299,10 @@ describe('ConnectionPool', function() { it('should remove the timeout handle once it fires', function(done) { pool.createConnection = function() { - assert.strictEqual(pool.queue.length, 0); - done(); + setImmediate(() => { + assert.strictEqual(pool.queue.length, 0); + done(); + }); }; pool.queueConnection(); @@ -1314,8 +1316,8 @@ describe('ConnectionPool', function() { }); it('should resume all the connections', function() { - var a = new FakeConnection(); - var b = new FakeConnection(); + const a = new FakeConnection(); + const b = new FakeConnection(); pool.connections.set('a', a); pool.connections.set('b', b); @@ -1329,8 +1331,8 @@ describe('ConnectionPool', function() { describe('sendKeepAlives', function() { it('should write an empty message to all the streams', function() { - var a = new FakeConnection(); - var b = new FakeConnection(); + const a = new FakeConnection(); + const b = new FakeConnection(); pool.connections.set('a', a); pool.connections.set('b', b); @@ -1372,7 +1374,7 @@ describe('ConnectionPool', function() { }); it('should not retry if no connection can be made', function() { - var fakeStatus = { + const fakeStatus = { code: 4, }; @@ -1382,7 +1384,7 @@ describe('ConnectionPool', function() { }); it('should return true if all conditions are met', function() { - var fakeStatus = { + const fakeStatus = { code: 4, }; diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index 732c3306d45..e5a2b357ece 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -19,27 +19,27 @@ const through2 = require('through2'); const pubsubModule = require('../src'); -var FAKE_STATUS_CODE = 1; -var error = new Error(); +const FAKE_STATUS_CODE = 1; +const error = new Error(); error.code = FAKE_STATUS_CODE; describe('PublisherClient', () => { describe('createTopic', () => { it('invokes createTopic without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { name: formattedName, }; // Mock response - var name2 = 'name2-1052831874'; - var expectedResponse = { + const name2 = 'name2-1052831874'; + const expectedResponse = { name: name2, }; @@ -57,14 +57,14 @@ describe('PublisherClient', () => { }); it('invokes createTopic with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { name: formattedName, }; @@ -86,22 +86,22 @@ describe('PublisherClient', () => { describe('updateTopic', () => { it('invokes updateTopic without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var topic = {}; - var updateMask = {}; - var request = { + const topic = {}; + const updateMask = {}; + const request = { topic: topic, updateMask: updateMask, }; // Mock response - var name = 'name3373707'; - var expectedResponse = { + const name = 'name3373707'; + const expectedResponse = { name: name, }; @@ -119,15 +119,15 @@ describe('PublisherClient', () => { }); it('invokes updateTopic with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var topic = {}; - var updateMask = {}; - var request = { + const topic = {}; + const updateMask = {}; + const request = { topic: topic, updateMask: updateMask, }; @@ -150,27 +150,27 @@ describe('PublisherClient', () => { describe('publish', () => { it('invokes publish without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var data = '-86'; - var messagesElement = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const data = '-86'; + const messagesElement = { data: data, }; - var messages = [messagesElement]; - var request = { + const messages = [messagesElement]; + const request = { topic: formattedTopic, messages: messages, }; // Mock response - var messageIdsElement = 'messageIdsElement-744837059'; - var messageIds = [messageIdsElement]; - var expectedResponse = { + const messageIdsElement = 'messageIdsElement-744837059'; + const messageIds = [messageIdsElement]; + const expectedResponse = { messageIds: messageIds, }; @@ -188,19 +188,19 @@ describe('PublisherClient', () => { }); it('invokes publish with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var data = '-86'; - var messagesElement = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const data = '-86'; + const messagesElement = { data: data, }; - var messages = [messagesElement]; - var request = { + const messages = [messagesElement]; + const request = { topic: formattedTopic, messages: messages, }; @@ -223,20 +223,20 @@ describe('PublisherClient', () => { describe('getTopic', () => { it('invokes getTopic without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; // Mock response - var name = 'name3373707'; - var expectedResponse = { + const name = 'name3373707'; + const expectedResponse = { name: name, }; @@ -254,14 +254,14 @@ describe('PublisherClient', () => { }); it('invokes getTopic with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; @@ -283,22 +283,22 @@ describe('PublisherClient', () => { describe('listTopics', () => { it('invokes listTopics without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; // Mock response - var nextPageToken = ''; - var topicsElement = {}; - var topics = [topicsElement]; - var expectedResponse = { + const nextPageToken = ''; + const topicsElement = {}; + const topics = [topicsElement]; + const expectedResponse = { nextPageToken: nextPageToken, topics: topics, }; @@ -317,14 +317,14 @@ describe('PublisherClient', () => { }); it('invokes listTopics with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; @@ -346,22 +346,22 @@ describe('PublisherClient', () => { describe('listTopicSubscriptions', () => { it('invokes listTopicSubscriptions without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; // Mock response - var nextPageToken = ''; - var subscriptionsElement = 'subscriptionsElement1698708147'; - var subscriptions = [subscriptionsElement]; - var expectedResponse = { + const nextPageToken = ''; + const subscriptionsElement = 'subscriptionsElement1698708147'; + const subscriptions = [subscriptionsElement]; + const expectedResponse = { nextPageToken: nextPageToken, subscriptions: subscriptions, }; @@ -384,14 +384,14 @@ describe('PublisherClient', () => { }); it('invokes listTopicSubscriptions with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; @@ -413,14 +413,14 @@ describe('PublisherClient', () => { describe('deleteTopic', () => { it('invokes deleteTopic without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; @@ -434,14 +434,14 @@ describe('PublisherClient', () => { }); it('invokes deleteTopic with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; @@ -462,23 +462,23 @@ describe('PublisherClient', () => { describe('setIamPolicy', () => { it('invokes setIamPolicy without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var policy = {}; - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const policy = {}; + const request = { resource: formattedResource, policy: policy, }; // Mock response - var version = 351608024; - var etag = '21'; - var expectedResponse = { + const version = 351608024; + const etag = '21'; + const expectedResponse = { version: version, etag: etag, }; @@ -497,15 +497,15 @@ describe('PublisherClient', () => { }); it('invokes setIamPolicy with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var policy = {}; - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const policy = {}; + const request = { resource: formattedResource, policy: policy, }; @@ -528,21 +528,21 @@ describe('PublisherClient', () => { describe('getIamPolicy', () => { it('invokes getIamPolicy without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { resource: formattedResource, }; // Mock response - var version = 351608024; - var etag = '21'; - var expectedResponse = { + const version = 351608024; + const etag = '21'; + const expectedResponse = { version: version, etag: etag, }; @@ -561,14 +561,14 @@ describe('PublisherClient', () => { }); it('invokes getIamPolicy with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { resource: formattedResource, }; @@ -590,21 +590,21 @@ describe('PublisherClient', () => { describe('testIamPermissions', () => { it('invokes testIamPermissions without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var permissions = []; - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const permissions = []; + const request = { resource: formattedResource, permissions: permissions, }; // Mock response - var expectedResponse = {}; + const expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( @@ -620,15 +620,15 @@ describe('PublisherClient', () => { }); it('invokes testIamPermissions with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var permissions = []; - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const permissions = []; + const request = { resource: formattedResource, permissions: permissions, }; @@ -652,28 +652,28 @@ describe('PublisherClient', () => { describe('SubscriberClient', () => { describe('createSubscription', () => { it('invokes createSubscription without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.subscriptionPath( + const formattedName = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { name: formattedName, topic: formattedTopic, }; // Mock response - var name2 = 'name2-1052831874'; - var topic2 = 'topic2-1139259102'; - var ackDeadlineSeconds = 2135351438; - var retainAckedMessages = false; - var expectedResponse = { + const name2 = 'name2-1052831874'; + const topic2 = 'topic2-1139259102'; + const ackDeadlineSeconds = 2135351438; + const retainAckedMessages = false; + const expectedResponse = { name: name2, topic: topic2, ackDeadlineSeconds: ackDeadlineSeconds, @@ -694,18 +694,18 @@ describe('SubscriberClient', () => { }); it('invokes createSubscription with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.subscriptionPath( + const formattedName = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { name: formattedName, topic: formattedTopic, }; @@ -728,26 +728,26 @@ describe('SubscriberClient', () => { describe('getSubscription', () => { it('invokes getSubscription without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; // Mock response - var name = 'name3373707'; - var topic = 'topic110546223'; - var ackDeadlineSeconds = 2135351438; - var retainAckedMessages = false; - var expectedResponse = { + const name = 'name3373707'; + const topic = 'topic110546223'; + const ackDeadlineSeconds = 2135351438; + const retainAckedMessages = false; + const expectedResponse = { name: name, topic: topic, ackDeadlineSeconds: ackDeadlineSeconds, @@ -768,17 +768,17 @@ describe('SubscriberClient', () => { }); it('invokes getSubscription with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; @@ -800,32 +800,32 @@ describe('SubscriberClient', () => { describe('updateSubscription', () => { it('invokes updateSubscription without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var ackDeadlineSeconds = 42; - var subscription = { + const ackDeadlineSeconds = 42; + const subscription = { ackDeadlineSeconds: ackDeadlineSeconds, }; - var pathsElement = 'ack_deadline_seconds'; - var paths = [pathsElement]; - var updateMask = { + const pathsElement = 'ack_deadline_seconds'; + const paths = [pathsElement]; + const updateMask = { paths: paths, }; - var request = { + const request = { subscription: subscription, updateMask: updateMask, }; // Mock response - var name = 'name3373707'; - var topic = 'topic110546223'; - var ackDeadlineSeconds2 = 921632575; - var retainAckedMessages = false; - var expectedResponse = { + const name = 'name3373707'; + const topic = 'topic110546223'; + const ackDeadlineSeconds2 = 921632575; + const retainAckedMessages = false; + const expectedResponse = { name: name, topic: topic, ackDeadlineSeconds: ackDeadlineSeconds2, @@ -846,22 +846,22 @@ describe('SubscriberClient', () => { }); it('invokes updateSubscription with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var ackDeadlineSeconds = 42; - var subscription = { + const ackDeadlineSeconds = 42; + const subscription = { ackDeadlineSeconds: ackDeadlineSeconds, }; - var pathsElement = 'ack_deadline_seconds'; - var paths = [pathsElement]; - var updateMask = { + const pathsElement = 'ack_deadline_seconds'; + const paths = [pathsElement]; + const updateMask = { paths: paths, }; - var request = { + const request = { subscription: subscription, updateMask: updateMask, }; @@ -884,22 +884,22 @@ describe('SubscriberClient', () => { describe('listSubscriptions', () => { it('invokes listSubscriptions without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; // Mock response - var nextPageToken = ''; - var subscriptionsElement = {}; - var subscriptions = [subscriptionsElement]; - var expectedResponse = { + const nextPageToken = ''; + const subscriptionsElement = {}; + const subscriptions = [subscriptionsElement]; + const expectedResponse = { nextPageToken: nextPageToken, subscriptions: subscriptions, }; @@ -922,14 +922,14 @@ describe('SubscriberClient', () => { }); it('invokes listSubscriptions with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; @@ -951,17 +951,17 @@ describe('SubscriberClient', () => { describe('deleteSubscription', () => { it('invokes deleteSubscription without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; @@ -975,17 +975,17 @@ describe('SubscriberClient', () => { }); it('invokes deleteSubscription with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; @@ -1006,19 +1006,19 @@ describe('SubscriberClient', () => { describe('modifyAckDeadline', () => { it('invokes modifyAckDeadline without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var ackIds = []; - var ackDeadlineSeconds = 2135351438; - var request = { + const ackIds = []; + const ackDeadlineSeconds = 2135351438; + const request = { subscription: formattedSubscription, ackIds: ackIds, ackDeadlineSeconds: ackDeadlineSeconds, @@ -1034,19 +1034,19 @@ describe('SubscriberClient', () => { }); it('invokes modifyAckDeadline with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var ackIds = []; - var ackDeadlineSeconds = 2135351438; - var request = { + const ackIds = []; + const ackDeadlineSeconds = 2135351438; + const request = { subscription: formattedSubscription, ackIds: ackIds, ackDeadlineSeconds: ackDeadlineSeconds, @@ -1069,18 +1069,18 @@ describe('SubscriberClient', () => { describe('acknowledge', () => { it('invokes acknowledge without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var ackIds = []; - var request = { + const ackIds = []; + const request = { subscription: formattedSubscription, ackIds: ackIds, }; @@ -1095,18 +1095,18 @@ describe('SubscriberClient', () => { }); it('invokes acknowledge with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var ackIds = []; - var request = { + const ackIds = []; + const request = { subscription: formattedSubscription, ackIds: ackIds, }; @@ -1128,24 +1128,24 @@ describe('SubscriberClient', () => { describe('pull', () => { it('invokes pull without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var maxMessages = 496131527; - var request = { + const maxMessages = 496131527; + const request = { subscription: formattedSubscription, maxMessages: maxMessages, }; // Mock response - var expectedResponse = {}; + const expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.pull = mockSimpleGrpcMethod( @@ -1161,18 +1161,18 @@ describe('SubscriberClient', () => { }); it('invokes pull with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var maxMessages = 496131527; - var request = { + const maxMessages = 496131527; + const request = { subscription: formattedSubscription, maxMessages: maxMessages, }; @@ -1191,26 +1191,26 @@ describe('SubscriberClient', () => { describe('streamingPull', () => { it('invokes streamingPull without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var streamAckDeadlineSeconds = 1875467245; - var request = { + const streamAckDeadlineSeconds = 1875467245; + const request = { subscription: formattedSubscription, streamAckDeadlineSeconds: streamAckDeadlineSeconds, }; // Mock response - var receivedMessagesElement = {}; - var receivedMessages = [receivedMessagesElement]; - var expectedResponse = { + const receivedMessagesElement = {}; + const receivedMessages = [receivedMessagesElement]; + const expectedResponse = { receivedMessages: receivedMessages, }; @@ -1220,7 +1220,7 @@ describe('SubscriberClient', () => { expectedResponse ); - var stream = client + const stream = client .streamingPull() .on('data', response => { assert.deepStrictEqual(response, expectedResponse); @@ -1234,18 +1234,18 @@ describe('SubscriberClient', () => { }); it('invokes streamingPull with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var streamAckDeadlineSeconds = 1875467245; - var request = { + const streamAckDeadlineSeconds = 1875467245; + const request = { subscription: formattedSubscription, streamAckDeadlineSeconds: streamAckDeadlineSeconds, }; @@ -1257,7 +1257,7 @@ describe('SubscriberClient', () => { error ); - var stream = client + const stream = client .streamingPull() .on('data', () => { assert.fail(); @@ -1274,18 +1274,18 @@ describe('SubscriberClient', () => { describe('modifyPushConfig', () => { it('invokes modifyPushConfig without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var pushConfig = {}; - var request = { + const pushConfig = {}; + const request = { subscription: formattedSubscription, pushConfig: pushConfig, }; @@ -1300,18 +1300,18 @@ describe('SubscriberClient', () => { }); it('invokes modifyPushConfig with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var pushConfig = {}; - var request = { + const pushConfig = {}; + const request = { subscription: formattedSubscription, pushConfig: pushConfig, }; @@ -1333,22 +1333,22 @@ describe('SubscriberClient', () => { describe('listSnapshots', () => { it('invokes listSnapshots without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; // Mock response - var nextPageToken = ''; - var snapshotsElement = {}; - var snapshots = [snapshotsElement]; - var expectedResponse = { + const nextPageToken = ''; + const snapshotsElement = {}; + const snapshots = [snapshotsElement]; + const expectedResponse = { nextPageToken: nextPageToken, snapshots: snapshots, }; @@ -1371,14 +1371,14 @@ describe('SubscriberClient', () => { }); it('invokes listSnapshots with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; @@ -1400,26 +1400,26 @@ describe('SubscriberClient', () => { describe('createSnapshot', () => { it('invokes createSnapshot without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - var formattedSubscription = client.subscriptionPath( + const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { name: formattedName, subscription: formattedSubscription, }; // Mock response - var name2 = 'name2-1052831874'; - var topic = 'topic110546223'; - var expectedResponse = { + const name2 = 'name2-1052831874'; + const topic = 'topic110546223'; + const expectedResponse = { name: name2, topic: topic, }; @@ -1438,18 +1438,18 @@ describe('SubscriberClient', () => { }); it('invokes createSnapshot with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - var formattedSubscription = client.subscriptionPath( + const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { name: formattedName, subscription: formattedSubscription, }; @@ -1472,33 +1472,33 @@ describe('SubscriberClient', () => { describe('updateSnapshot', () => { it('invokes updateSnapshot without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var seconds = 123456; - var expireTime = { + const seconds = 123456; + const expireTime = { seconds: seconds, }; - var snapshot = { + const snapshot = { expireTime: expireTime, }; - var pathsElement = 'expire_time'; - var paths = [pathsElement]; - var updateMask = { + const pathsElement = 'expire_time'; + const paths = [pathsElement]; + const updateMask = { paths: paths, }; - var request = { + const request = { snapshot: snapshot, updateMask: updateMask, }; // Mock response - var name = 'name3373707'; - var topic = 'topic110546223'; - var expectedResponse = { + const name = 'name3373707'; + const topic = 'topic110546223'; + const expectedResponse = { name: name, topic: topic, }; @@ -1517,25 +1517,25 @@ describe('SubscriberClient', () => { }); it('invokes updateSnapshot with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var seconds = 123456; - var expireTime = { + const seconds = 123456; + const expireTime = { seconds: seconds, }; - var snapshot = { + const snapshot = { expireTime: expireTime, }; - var pathsElement = 'expire_time'; - var paths = [pathsElement]; - var updateMask = { + const pathsElement = 'expire_time'; + const paths = [pathsElement]; + const updateMask = { paths: paths, }; - var request = { + const request = { snapshot: snapshot, updateMask: updateMask, }; @@ -1558,14 +1558,14 @@ describe('SubscriberClient', () => { describe('deleteSnapshot', () => { it('invokes deleteSnapshot without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - var request = { + const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + const request = { snapshot: formattedSnapshot, }; @@ -1579,14 +1579,14 @@ describe('SubscriberClient', () => { }); it('invokes deleteSnapshot with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - var request = { + const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + const request = { snapshot: formattedSnapshot, }; @@ -1607,22 +1607,22 @@ describe('SubscriberClient', () => { describe('seek', () => { it('invokes seek without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; // Mock response - var expectedResponse = {}; + const expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.seek = mockSimpleGrpcMethod( @@ -1638,17 +1638,17 @@ describe('SubscriberClient', () => { }); it('invokes seek with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; @@ -1666,26 +1666,26 @@ describe('SubscriberClient', () => { describe('setIamPolicy', () => { it('invokes setIamPolicy without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var policy = {}; - var request = { + const policy = {}; + const request = { resource: formattedResource, policy: policy, }; // Mock response - var version = 351608024; - var etag = '21'; - var expectedResponse = { + const version = 351608024; + const etag = '21'; + const expectedResponse = { version: version, etag: etag, }; @@ -1704,18 +1704,18 @@ describe('SubscriberClient', () => { }); it('invokes setIamPolicy with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var policy = {}; - var request = { + const policy = {}; + const request = { resource: formattedResource, policy: policy, }; @@ -1738,24 +1738,24 @@ describe('SubscriberClient', () => { describe('getIamPolicy', () => { it('invokes getIamPolicy without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { resource: formattedResource, }; // Mock response - var version = 351608024; - var etag = '21'; - var expectedResponse = { + const version = 351608024; + const etag = '21'; + const expectedResponse = { version: version, etag: etag, }; @@ -1774,17 +1774,17 @@ describe('SubscriberClient', () => { }); it('invokes getIamPolicy with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { resource: formattedResource, }; @@ -1806,24 +1806,24 @@ describe('SubscriberClient', () => { describe('testIamPermissions', () => { it('invokes testIamPermissions without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var permissions = []; - var request = { + const permissions = []; + const request = { resource: formattedResource, permissions: permissions, }; // Mock response - var expectedResponse = {}; + const expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( @@ -1839,18 +1839,18 @@ describe('SubscriberClient', () => { }); it('invokes testIamPermissions with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var permissions = []; - var request = { + const permissions = []; + const request = { resource: formattedResource, permissions: permissions, }; @@ -1887,7 +1887,7 @@ function mockSimpleGrpcMethod(expectedRequest, response, error) { function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { return () => { - var mockStream = through2.obj((chunk, enc, callback) => { + const mockStream = through2.obj((chunk, enc, callback) => { assert.deepStrictEqual(chunk, expectedRequest); if (error) { callback(error); diff --git a/handwritten/pubsub/test/histogram.js b/handwritten/pubsub/test/histogram.js index 607589540b7..ccac664c799 100644 --- a/handwritten/pubsub/test/histogram.js +++ b/handwritten/pubsub/test/histogram.js @@ -16,15 +16,15 @@ 'use strict'; -var assert = require('assert'); +const assert = require('assert'); -var Histogram = require('../src/histogram.js'); +const Histogram = require('../src/histogram.js'); describe('Histogram', function() { - var histogram; + let histogram; - var MIN_VALUE = 10000; - var MAX_VALUE = 600000; + const MIN_VALUE = 10000; + const MAX_VALUE = 600000; beforeEach(function() { histogram = new Histogram(); @@ -75,7 +75,7 @@ describe('Histogram', function() { }); it('should cap the value', function() { - var outOfBounds = MAX_VALUE + MIN_VALUE; + const outOfBounds = MAX_VALUE + MIN_VALUE; histogram.add(outOfBounds); @@ -84,7 +84,7 @@ describe('Histogram', function() { }); it('should apply a minimum', function() { - var outOfBounds = MIN_VALUE - 1000; + const outOfBounds = MIN_VALUE - 1000; histogram.add(outOfBounds); @@ -93,8 +93,8 @@ describe('Histogram', function() { }); it('should use seconds level precision', function() { - var ms = 303823; - var expected = 304000; + const ms = 303823; + const expected = 304000; histogram.add(ms); @@ -105,7 +105,7 @@ describe('Histogram', function() { describe('percentile', function() { function range(a, b) { - var result = []; + const result = []; for (; a < b; a++) { result.push(a); diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index f284a804751..53044b8ff28 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -16,13 +16,13 @@ 'use strict'; -var assert = require('assert'); -var extend = require('extend'); -var proxyquire = require('proxyquire'); -var {util} = require('@google-cloud/common'); +const assert = require('assert'); +const extend = require('extend'); +const proxyquire = require('proxyquire'); +const {util} = require('@google-cloud/common'); -var promisified = false; -var fakePromisify = extend({}, util, { +let promisified = false; +const fakePromisify = extend({}, util, { promisifyAll: function(Class) { if (Class.name === 'IAM') { promisified = true; @@ -31,15 +31,15 @@ var fakePromisify = extend({}, util, { }); describe('IAM', function() { - var IAM; - var iam; + let IAM; + let iam; - var PUBSUB = { + const PUBSUB = { options: {}, Promise: {}, request: util.noop, }; - var ID = 'id'; + const ID = 'id'; before(function() { IAM = proxyquire('../src/iam.js', { @@ -61,8 +61,8 @@ describe('IAM', function() { }); it('should localize pubsub#request', function() { - var fakeRequest = function() {}; - var fakePubsub = { + const fakeRequest = function() {}; + const fakePubsub = { request: { bind: function(context) { assert.strictEqual(context, fakePubsub); @@ -70,7 +70,7 @@ describe('IAM', function() { }, }, }; - var iam = new IAM(fakePubsub, ID); + const iam = new IAM(fakePubsub, ID); assert.strictEqual(iam.request, fakeRequest); }); @@ -98,7 +98,7 @@ describe('IAM', function() { }); it('should accept gax options', function(done) { - var gaxOpts = {}; + const gaxOpts = {}; iam.request = function(config) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -110,7 +110,7 @@ describe('IAM', function() { }); describe('setPolicy', function() { - var policy = {etag: 'ACAB'}; + const policy = {etag: 'ACAB'}; it('should throw an error if a policy is not supplied', function() { assert.throws(function() { @@ -132,7 +132,7 @@ describe('IAM', function() { }); it('should accept gax options', function(done) { - var gaxOpts = {}; + const gaxOpts = {}; iam.request = function(config) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -151,7 +151,7 @@ describe('IAM', function() { }); it('should make the correct API request', function(done) { - var permissions = 'storage.bucket.list'; + const permissions = 'storage.bucket.list'; iam.request = function(config) { assert.strictEqual(config.client, 'SubscriberClient'); @@ -166,8 +166,8 @@ describe('IAM', function() { }); it('should accept gax options', function(done) { - var permissions = 'storage.bucket.list'; - var gaxOpts = {}; + const permissions = 'storage.bucket.list'; + const gaxOpts = {}; iam.request = function(config) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -178,9 +178,9 @@ describe('IAM', function() { }); it('should send an error back if the request fails', function(done) { - var permissions = ['storage.bucket.list']; - var error = new Error('Error.'); - var apiResponse = {}; + const permissions = ['storage.bucket.list']; + const error = new Error('Error.'); + const apiResponse = {}; iam.request = function(config, callback) { callback(error, apiResponse); @@ -195,8 +195,8 @@ describe('IAM', function() { }); it('should pass back a hash of permissions the user has', function(done) { - var permissions = ['storage.bucket.list', 'storage.bucket.consume']; - var apiResponse = { + const permissions = ['storage.bucket.list', 'storage.bucket.consume']; + const apiResponse = { permissions: ['storage.bucket.consume'], }; diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 1c7fa3d1e74..4b993e957e2 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -16,18 +16,18 @@ 'use strict'; -var arrify = require('arrify'); -var assert = require('assert'); -var extend = require('extend'); -var gax = require('google-gax'); -var proxyquire = require('proxyquire'); -var util = require('@google-cloud/common').util; +const arrify = require('arrify'); +const assert = require('assert'); +const extend = require('extend'); +const gax = require('google-gax'); +const proxyquire = require('proxyquire'); +const util = require('@google-cloud/common').util; const pjy = require('@google-cloud/projectify'); -var PKG = require('../package.json'); +const PKG = require('../package.json'); -var fakeCreds = {}; -var fakeGoogleGax = { +const fakeCreds = {}; +const fakeGoogleGax = { GrpcClient: class extends gax.GrpcClient { constructor(opts) { super(opts); @@ -42,16 +42,16 @@ var fakeGoogleGax = { }, }; -var SubscriptionCached = require('../src/subscription.js'); -var SubscriptionOverride; +const SubscriptionCached = require('../src/subscription.js'); +let SubscriptionOverride; function Subscription(a, b, c) { - var OverrideFn = SubscriptionOverride || SubscriptionCached; + const OverrideFn = SubscriptionOverride || SubscriptionCached; return new OverrideFn(a, b, c); } -var promisified = false; -var fakePromisify = extend({}, util, { +let promisified = false; +const fakePromisify = extend({}, util, { promisifyAll: function(Class, options) { if (Class.name !== 'PubSub') { return; @@ -80,8 +80,8 @@ function FakeTopic() { this.calledWith_ = arguments; } -var extended = false; -var fakePaginator = { +let extended = false; +const fakePaginator = { extend: function(Class, methods) { if (Class.name !== 'PubSub') { return; @@ -102,13 +102,13 @@ var fakePaginator = { }, }; -var googleAuthOverride; +let googleAuthOverride; function fakeGoogleAuth() { return (googleAuthOverride || util.noop).apply(null, arguments); } -var v1Override = {}; -var v1ClientOverrides = {}; +const v1Override = {}; +let v1ClientOverrides = {}; function defineOverridableClient(clientName) { function DefaultClient() {} @@ -126,15 +126,15 @@ defineOverridableClient('PublisherClient'); defineOverridableClient('SubscriberClient'); describe('PubSub', function() { - var PubSub; - var PROJECT_ID = 'test-project'; - var pubsub; - var OPTIONS = { + let PubSub; + const PROJECT_ID = 'test-project'; + let pubsub; + const OPTIONS = { projectId: PROJECT_ID, promise: {}, }; - var PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; + const PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; before(function() { delete process.env.PUBSUB_EMULATOR_HOST; @@ -197,13 +197,13 @@ describe('PubSub', function() { v1ClientOverrides.PublisherClient = {}; v1ClientOverrides.PublisherClient.scopes = ['b', 'c', 'd', 'e']; - var pubsub = new PubSub({}); + const pubsub = new PubSub({}); assert.deepStrictEqual(pubsub.options.scopes, ['a', 'b', 'c', 'd', 'e']); }); it('should attempt to determine the service path and port', function() { - var determineBaseUrl_ = PubSub.prototype.determineBaseUrl_; - var called = false; + const determineBaseUrl_ = PubSub.prototype.determineBaseUrl_; + let called = false; PubSub.prototype.determineBaseUrl_ = function() { PubSub.prototype.determineBaseUrl_ = determineBaseUrl_; @@ -219,8 +219,8 @@ describe('PubSub', function() { }); it('should cache a local google-auth-library instance', function() { - var fakeGoogleAuthInstance = {}; - var options = { + const fakeGoogleAuthInstance = {}; + const options = { a: 'b', c: 'd', }; @@ -242,7 +242,7 @@ describe('PubSub', function() { return fakeGoogleAuthInstance; }; - var pubsub = new PubSub(options); + const pubsub = new PubSub(options); assert.strictEqual(pubsub.auth, fakeGoogleAuthInstance); }); @@ -267,7 +267,7 @@ describe('PubSub', function() { }); it('should default the projectId to the token', function() { - var pubsub = new PubSub({}); + const pubsub = new PubSub({}); assert.strictEqual(pubsub.projectId, '{{projectId}}'); }); @@ -281,17 +281,17 @@ describe('PubSub', function() { }); describe('createSubscription', function() { - var TOPIC_NAME = 'topic'; - var TOPIC = extend(new FakeTopic(), { + const TOPIC_NAME = 'topic'; + const TOPIC = extend(new FakeTopic(), { name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, }); - var SUB_NAME = 'subscription'; - var SUBSCRIPTION = { + const SUB_NAME = 'subscription'; + const SUBSCRIPTION = { name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME, }; - var apiResponse = { + const apiResponse = { name: 'subscription-name', }; @@ -330,7 +330,7 @@ describe('PubSub', function() { }); it('should create a Subscription', function(done) { - var opts = {a: 'b', c: 'd'}; + const opts = {a: 'b', c: 'd'}; pubsub.request = util.noop; @@ -357,7 +357,7 @@ describe('PubSub', function() { }); it('should send correct request', function(done) { - var options = { + const options = { gaxOpts: {}, }; @@ -386,12 +386,12 @@ describe('PubSub', function() { }); it('should pass options to the api request', function(done) { - var options = { + const options = { retainAckedMessages: true, pushEndpoint: 'https://domain/push', }; - var expectedBody = extend( + const expectedBody = extend( { topic: TOPIC.name, name: SUB_NAME, @@ -421,11 +421,11 @@ describe('PubSub', function() { }); it('should discard flow control options', function(done) { - var options = { + const options = { flowControl: {}, }; - var expectedBody = { + const expectedBody = { topic: TOPIC.name, name: SUB_NAME, }; @@ -452,8 +452,8 @@ describe('PubSub', function() { }); it('should format the metadata', function(done) { - var fakeMetadata = {}; - var formatted = { + const fakeMetadata = {}; + const formatted = { a: 'a', }; @@ -471,8 +471,8 @@ describe('PubSub', function() { }); describe('error', function() { - var error = new Error('Error.'); - var apiResponse = {name: SUB_NAME}; + const error = new Error('Error.'); + const apiResponse = {name: SUB_NAME}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -481,7 +481,7 @@ describe('PubSub', function() { }); it('should re-use existing subscription', function(done) { - var apiResponse = {code: 6}; + const apiResponse = {code: 6}; pubsub.subscription = function() { return SUBSCRIPTION; @@ -515,7 +515,7 @@ describe('PubSub', function() { }); describe('success', function() { - var apiResponse = {name: SUB_NAME}; + const apiResponse = {name: SUB_NAME}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -524,7 +524,7 @@ describe('PubSub', function() { }); it('should return Subscription & resp to the callback', function(done) { - var subscription = {}; + const subscription = {}; pubsub.subscription = function() { return subscription; @@ -548,9 +548,9 @@ describe('PubSub', function() { describe('createTopic', function() { it('should make the correct API request', function(done) { - var topicName = 'new-topic-name'; - var formattedName = 'formatted-name'; - var gaxOpts = {}; + const topicName = 'new-topic-name'; + const formattedName = 'formatted-name'; + const gaxOpts = {}; pubsub.topic = function(name) { assert.strictEqual(name, topicName); @@ -572,8 +572,8 @@ describe('PubSub', function() { }); describe('error', function() { - var error = new Error('Error.'); - var apiResponse = {}; + const error = new Error('Error.'); + const apiResponse = {}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -592,7 +592,7 @@ describe('PubSub', function() { }); describe('success', function() { - var apiResponse = {}; + const apiResponse = {}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -601,8 +601,8 @@ describe('PubSub', function() { }); it('should return a Topic object', function(done) { - var topicName = 'new-topic'; - var topicInstance = {}; + const topicName = 'new-topic'; + const topicInstance = {}; pubsub.topic = function(name) { assert.strictEqual(name, topicName); @@ -643,8 +643,8 @@ describe('PubSub', function() { }); it('should use the apiEndpoint option', function() { - var defaultBaseUrl_ = 'defaulturl'; - var testingUrl = 'localhost:8085'; + const defaultBaseUrl_ = 'defaulturl'; + const testingUrl = 'localhost:8085'; setHost(defaultBaseUrl_); pubsub.options.apiEndpoint = testingUrl; @@ -676,7 +676,7 @@ describe('PubSub', function() { }); describe('with PUBSUB_EMULATOR_HOST environment variable', function() { - var PUBSUB_EMULATOR_HOST = 'localhost:9090'; + const PUBSUB_EMULATOR_HOST = 'localhost:9090'; beforeEach(function() { setHost(PUBSUB_EMULATOR_HOST); @@ -696,8 +696,8 @@ describe('PubSub', function() { }); describe('getSnapshots', function() { - var SNAPSHOT_NAME = 'fake-snapshot'; - var apiResponse = {snapshots: [{name: SNAPSHOT_NAME}]}; + const SNAPSHOT_NAME = 'fake-snapshot'; + const apiResponse = {snapshots: [{name: SNAPSHOT_NAME}]}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -714,7 +714,7 @@ describe('PubSub', function() { }); it('should build the right request', function(done) { - var options = { + const options = { a: 'b', c: 'd', gaxOpts: { @@ -723,11 +723,11 @@ describe('PubSub', function() { autoPaginate: false, }; - var expectedOptions = extend({}, options, { + const expectedOptions = extend({}, options, { project: 'projects/' + pubsub.projectId, }); - var expectedGaxOpts = extend( + const expectedGaxOpts = extend( { autoPaginate: options.autoPaginate, }, @@ -749,7 +749,7 @@ describe('PubSub', function() { }); it('should return Snapshot instances with metadata', function(done) { - var snapshot = {}; + const snapshot = {}; pubsub.snapshot = function(name) { assert.strictEqual(name, SNAPSHOT_NAME); @@ -765,10 +765,10 @@ describe('PubSub', function() { }); it('should pass back all parameters', function(done) { - var err_ = new Error('abc'); - var snapshots_ = null; - var nextQuery_ = {}; - var apiResponse_ = {}; + const err_ = new Error('abc'); + const snapshots_ = null; + const nextQuery_ = {}; + const apiResponse_ = {}; pubsub.request = function(config, callback) { callback(err_, snapshots_, nextQuery_, apiResponse_); @@ -785,7 +785,7 @@ describe('PubSub', function() { }); describe('getSubscriptions', function() { - var apiResponse = {subscriptions: [{name: 'fake-subscription'}]}; + const apiResponse = {subscriptions: [{name: 'fake-subscription'}]}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -802,21 +802,21 @@ describe('PubSub', function() { }); it('should pass the correct arguments to the API', function(done) { - var options = { + const options = { gaxOpts: { a: 'b', }, autoPaginate: false, }; - var expectedGaxOpts = extend( + const expectedGaxOpts = extend( { autoPaginate: options.autoPaginate, }, options.gaxOpts ); - var project = 'projects/' + pubsub.projectId; + const project = 'projects/' + pubsub.projectId; pubsub.request = function(config) { assert.strictEqual(config.client, 'SubscriberClient'); @@ -830,10 +830,10 @@ describe('PubSub', function() { }); it('should pass options to API request', function(done) { - var opts = {pageSize: 10, pageToken: 'abc'}; + const opts = {pageSize: 10, pageToken: 'abc'}; pubsub.request = function(config) { - var reqOpts = config.reqOpts; + const reqOpts = config.reqOpts; assert.strictEqual(reqOpts.pageSize, opts.pageSize); assert.strictEqual(reqOpts.pageToken, opts.pageToken); done(); @@ -851,10 +851,10 @@ describe('PubSub', function() { }); it('should pass back all params', function(done) { - var err_ = new Error('err'); - var subs_ = false; - var nextQuery_ = {}; - var apiResponse_ = {}; + const err_ = new Error('err'); + const subs_ = false; + const nextQuery_ = {}; + const apiResponse_ = {}; pubsub.request = function(config, callback) { callback(err_, subs_, nextQuery_, apiResponse_); @@ -870,12 +870,12 @@ describe('PubSub', function() { }); describe('with topic', function() { - var TOPIC_NAME = 'topic-name'; + const TOPIC_NAME = 'topic-name'; it('should call topic.getSubscriptions', function(done) { - var topic = new FakeTopic(); + const topic = new FakeTopic(); - var opts = { + const opts = { topic: topic, }; @@ -888,11 +888,11 @@ describe('PubSub', function() { }); it('should create a topic instance from a name', function(done) { - var opts = { + const opts = { topic: TOPIC_NAME, }; - var fakeTopic = { + const fakeTopic = { getSubscriptions: function(options, callback) { assert.strictEqual(options, opts); callback(); // the done fn @@ -910,8 +910,8 @@ describe('PubSub', function() { }); describe('getTopics', function() { - var topicName = 'fake-topic'; - var apiResponse = {topics: [{name: topicName}]}; + const topicName = 'fake-topic'; + const apiResponse = {topics: [{name: topicName}]}; beforeEach(function() { pubsub.request = function(config, callback) { @@ -928,7 +928,7 @@ describe('PubSub', function() { }); it('should build the right request', function(done) { - var options = { + const options = { a: 'b', c: 'd', gaxOpts: { @@ -937,11 +937,11 @@ describe('PubSub', function() { autoPaginate: false, }; - var expectedOptions = extend({}, options, { + const expectedOptions = extend({}, options, { project: 'projects/' + pubsub.projectId, }); - var expectedGaxOpts = extend( + const expectedGaxOpts = extend( { autoPaginate: options.autoPaginate, }, @@ -963,7 +963,7 @@ describe('PubSub', function() { }); it('should return Topic instances with metadata', function(done) { - var topic = {}; + const topic = {}; pubsub.topic = function(name) { assert.strictEqual(name, topicName); @@ -979,10 +979,10 @@ describe('PubSub', function() { }); it('should pass back all params', function(done) { - var err_ = new Error('err'); - var topics_ = false; - var nextQuery_ = {}; - var apiResponse_ = {}; + const err_ = new Error('err'); + const topics_ = false; + const nextQuery_ = {}; + const apiResponse_ = {}; pubsub.request = function(config, callback) { callback(err_, topics_, nextQuery_, apiResponse_); @@ -999,7 +999,7 @@ describe('PubSub', function() { }); describe('request', function() { - var CONFIG = { + const CONFIG = { client: 'PublisherClient', method: 'fakeMethod', reqOpts: {a: 'a'}, @@ -1032,7 +1032,7 @@ describe('PubSub', function() { }); it('should return error from getClient_', function(done) { - var expectedError = new Error('some error'); + const expectedError = new Error('some error'); pubsub.getClient_ = function(config, callback) { callback(expectedError); }; @@ -1044,7 +1044,7 @@ describe('PubSub', function() { }); it('should call client method with correct options', function(done) { - var fakeClient = {}; + const fakeClient = {}; fakeClient.fakeMethod = function(reqOpts, gaxOpts) { assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); @@ -1067,8 +1067,8 @@ describe('PubSub', function() { }); describe('getClient_', function() { - var FAKE_CLIENT_INSTANCE = util.noop; - var CONFIG = { + const FAKE_CLIENT_INSTANCE = util.noop; + const CONFIG = { client: 'FakeClient', }; @@ -1110,7 +1110,7 @@ describe('PubSub', function() { }); it('should return errors to the callback', function(done) { - var error = new Error('err'); + const error = new Error('err'); pubsub.auth.getProjectId = function(callback) { callback(error); @@ -1146,7 +1146,7 @@ describe('PubSub', function() { it('should cache the client', function(done) { delete pubsub.api.fakeClient; - var numTimesFakeClientInstantiated = 0; + let numTimesFakeClientInstantiated = 0; v1ClientOverrides.FakeClient = function() { numTimesFakeClientInstantiated++; @@ -1180,14 +1180,14 @@ describe('PubSub', function() { }); describe('request', function() { - var CONFIG = { + const CONFIG = { client: 'SubscriberClient', method: 'fakeMethod', reqOpts: {a: 'a'}, gaxOpts: {}, }; - var FAKE_CLIENT_INSTANCE = { + const FAKE_CLIENT_INSTANCE = { [CONFIG.method]: util.noop, }; @@ -1211,7 +1211,7 @@ describe('PubSub', function() { }); it('should return error from getting the client', function(done) { - var error = new Error('Error.'); + const error = new Error('Error.'); pubsub.getClient_ = function(config, callback) { callback(error); @@ -1234,20 +1234,20 @@ describe('PubSub', function() { }); it('should call the client method correctly', function(done) { - var CONFIG = { + const CONFIG = { client: 'FakeClient', method: 'fakeMethod', reqOpts: {a: 'a'}, gaxOpts: {}, }; - var replacedReqOpts = {}; + const replacedReqOpts = {}; pjyOverride = function() { return replacedReqOpts; }; - var fakeClient = { + const fakeClient = { fakeMethod: function(reqOpts, gaxOpts, callback) { assert.strictEqual(reqOpts, replacedReqOpts); assert.strictEqual(gaxOpts, CONFIG.gaxOpts); @@ -1271,9 +1271,9 @@ describe('PubSub', function() { }); it('should return a Snapshot object', function() { - var SNAPSHOT_NAME = 'new-snapshot'; - var snapshot = pubsub.snapshot(SNAPSHOT_NAME); - var args = snapshot.calledWith_; + const SNAPSHOT_NAME = 'new-snapshot'; + const snapshot = pubsub.snapshot(SNAPSHOT_NAME); + const args = snapshot.calledWith_; assert(snapshot instanceof FakeSnapshot); assert.strictEqual(args[0], pubsub); @@ -1282,12 +1282,12 @@ describe('PubSub', function() { }); describe('subscription', function() { - var SUB_NAME = 'new-sub-name'; - var CONFIG = {}; + const SUB_NAME = 'new-sub-name'; + const CONFIG = {}; it('should return a Subscription object', function() { SubscriptionOverride = function() {}; - var subscription = pubsub.subscription(SUB_NAME, {}); + const subscription = pubsub.subscription(SUB_NAME, {}); assert(subscription instanceof SubscriptionOverride); }); diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index a2d5c2d1e4c..b32fcb1e630 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -16,14 +16,14 @@ 'use strict'; -var assert = require('assert'); -var {util} = require('@google-cloud/common'); +const assert = require('assert'); +const {util} = require('@google-cloud/common'); const pfy = require('@google-cloud/promisify'); -var extend = require('extend'); -var proxyquire = require('proxyquire'); +const extend = require('extend'); +const proxyquire = require('proxyquire'); -var promisified = false; -var fakePromisify = extend({}, pfy, { +let promisified = false; +const fakePromisify = extend({}, pfy, { promisifyAll: function(Class, options) { if (Class.name === 'Publisher') { assert.deepStrictEqual(options, {singular: true}); @@ -33,12 +33,12 @@ var fakePromisify = extend({}, pfy, { }); describe('Publisher', function() { - var Publisher; - var publisher; - var batchOpts; + let Publisher; + let publisher; + let batchOpts; - var TOPIC_NAME = 'test-topic'; - var TOPIC = { + const TOPIC_NAME = 'test-topic'; + const TOPIC = { name: TOPIC_NAME, Promise: {}, request: util.noop, @@ -87,14 +87,14 @@ describe('Publisher', function() { }); it('should capture user specified options', function() { - var options = { + const options = { maxBytes: 10, maxMessages: 11, maxMilliseconds: 12, }; - var optionsCopy = extend({}, options); + const optionsCopy = extend({}, options); - var publisher = new Publisher(TOPIC, { + const publisher = new Publisher(TOPIC, { batching: options, }); @@ -103,9 +103,9 @@ describe('Publisher', function() { }); it('should cap maxBytes', function() { - var expected = Math.pow(1024, 2) * 9; + const expected = Math.pow(1024, 2) * 9; - var publisher = new Publisher(TOPIC, { + const publisher = new Publisher(TOPIC, { batching: {maxBytes: expected + 1024}, }); @@ -113,7 +113,7 @@ describe('Publisher', function() { }); it('should cap maxMessages', function() { - var publisher = new Publisher(TOPIC, { + const publisher = new Publisher(TOPIC, { batching: {maxMessages: 2000}, }); @@ -121,8 +121,8 @@ describe('Publisher', function() { }); it('should capture gaxOptions', function() { - var fakeGaxOpts = {a: 'a'}; - var publisher = new Publisher(TOPIC, { + const fakeGaxOpts = {a: 'a'}; + const publisher = new Publisher(TOPIC, { gaxOpts: fakeGaxOpts, }); @@ -132,10 +132,10 @@ describe('Publisher', function() { }); describe('publish', function() { - var DATA = Buffer.from('hello'); - var ATTRS = {a: 'a'}; + const DATA = Buffer.from('hello'); + const ATTRS = {a: 'a'}; - var globalSetTimeout; + let globalSetTimeout; before(function() { globalSetTimeout = global.setTimeout; @@ -157,12 +157,12 @@ describe('Publisher', function() { }); it('should throw when an attribute value is not a string', function() { - var brokenAttrs = { + const brokenAttrs = { key1: 'value', key2: true, }; - var expectedErrorMessage = ` + const expectedErrorMessage = ` All attributes must be in the form of a string. \nInvalid value of type "${typeof true}" provided for "key2". `.trim(); @@ -193,7 +193,7 @@ All attributes must be in the form of a string. }); it('should publish if data puts payload size over cap', function(done) { - var queueCalled = false; + let queueCalled = false; publisher.publish_ = function() { assert.strictEqual(queueCalled, false); @@ -221,7 +221,7 @@ All attributes must be in the form of a string. }); it('should publish if data puts payload at message cap', function(done) { - var queueCalled = false; + let queueCalled = false; publisher.queue_ = function() { queueCalled = true; @@ -237,8 +237,8 @@ All attributes must be in the form of a string. }); it('should set a timeout if a publish did not occur', function(done) { - var globalSetTimeout = global.setTimeout; - var fakeTimeoutHandle = 12345; + const globalSetTimeout = global.setTimeout; + const fakeTimeoutHandle = 12345; global.setTimeout = function(callback, duration) { assert.strictEqual(duration, batchOpts.maxMilliseconds); @@ -254,7 +254,7 @@ All attributes must be in the form of a string. }); it('should not set a timeout if one exists', function() { - var fakeTimeoutHandle = 'not-a-real-handle'; + const fakeTimeoutHandle = 'not-a-real-handle'; publisher.timeoutHandle_ = 'not-a-real-handle'; publisher.publish(DATA, util.noop); @@ -283,8 +283,8 @@ All attributes must be in the form of a string. }); it('should make the correct request', function(done) { - var FAKE_MESSAGE = {}; - var FAKE_GAX_OPTS = {a: 'b'}; + const FAKE_MESSAGE = {}; + const FAKE_GAX_OPTS = {a: 'b'}; TOPIC.request = function(config) { assert.strictEqual(config.client, 'PublisherClient'); @@ -303,9 +303,9 @@ All attributes must be in the form of a string. }); it('should pass back the err/msg id to correct callback', function(done) { - var error = new Error('err'); - var FAKE_IDS = ['abc', 'def']; - var callbackCalls = 0; + const error = new Error('err'); + const FAKE_IDS = ['abc', 'def']; + let callbackCalls = 0; publisher.inventory_.callbacks = [ function(err, messageId) { @@ -335,8 +335,8 @@ All attributes must be in the form of a string. }); describe('queue_', function() { - var DATA = Buffer.from('hello'); - var ATTRS = {a: 'a'}; + const DATA = Buffer.from('hello'); + const ATTRS = {a: 'a'}; it('should add the data and attrs to the inventory', function() { publisher.queue_(DATA, ATTRS, util.noop); diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.js index 73edf72c0ec..ccea5586ec8 100644 --- a/handwritten/pubsub/test/snapshot.js +++ b/handwritten/pubsub/test/snapshot.js @@ -16,14 +16,14 @@ 'use strict'; -var assert = require('assert'); -var {util} = require('@google-cloud/common'); -var extend = require('extend'); -var proxyquire = require('proxyquire'); +const assert = require('assert'); +const {util} = require('@google-cloud/common'); +const extend = require('extend'); +const proxyquire = require('proxyquire'); const pfy = require('@google-cloud/promisify'); -var promisified = false; -var fakePromisify = extend({}, pfy, { +let promisified = false; +const fakePromisify = extend({}, pfy, { promisifyAll: function(Class) { if (Class.name === 'Snapshot') { promisified = true; @@ -32,17 +32,17 @@ var fakePromisify = extend({}, pfy, { }); describe('Snapshot', function() { - var Snapshot; - var snapshot; + let Snapshot; + let snapshot; - var SNAPSHOT_NAME = 'a'; - var PROJECT_ID = 'grape-spaceship-123'; + const SNAPSHOT_NAME = 'a'; + const PROJECT_ID = 'grape-spaceship-123'; - var PUBSUB = { + const PUBSUB = { projectId: PROJECT_ID, }; - var SUBSCRIPTION = { + const SUBSCRIPTION = { Promise: {}, projectId: PROJECT_ID, pubsub: PUBSUB, @@ -63,8 +63,8 @@ describe('Snapshot', function() { }); describe('initialization', function() { - var FULL_SNAPSHOT_NAME = 'a/b/c/d'; - var formatName_; + const FULL_SNAPSHOT_NAME = 'a/b/c/d'; + let formatName_; before(function() { formatName_ = Snapshot.formatName_; @@ -97,7 +97,7 @@ describe('Snapshot', function() { return FULL_SNAPSHOT_NAME; }; - var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + const snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); assert.strictEqual(snapshot.name, FULL_SNAPSHOT_NAME); }); @@ -108,7 +108,7 @@ describe('Snapshot', function() { return FULL_SNAPSHOT_NAME; }; - var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + const snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); assert.strictEqual(snapshot.name, FULL_SNAPSHOT_NAME); }); }); @@ -120,7 +120,7 @@ describe('Snapshot', function() { callback(); // The done function }; - var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + const snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); snapshot.create(done); }); @@ -130,13 +130,13 @@ describe('Snapshot', function() { callback(); // The done function }; - var snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + const snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); snapshot.seek(done); }); }); describe('with PubSub parent', function() { - var snapshot; + let snapshot; beforeEach(function() { snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); @@ -153,16 +153,16 @@ describe('Snapshot', function() { }); describe('formatName_', function() { - var EXPECTED = 'projects/' + PROJECT_ID + '/snapshots/' + SNAPSHOT_NAME; + const EXPECTED = 'projects/' + PROJECT_ID + '/snapshots/' + SNAPSHOT_NAME; it('should format the name', function() { - var name = Snapshot.formatName_(PROJECT_ID, SNAPSHOT_NAME); + const name = Snapshot.formatName_(PROJECT_ID, SNAPSHOT_NAME); assert.strictEqual(name, EXPECTED); }); it('should not re-format the name', function() { - var name = Snapshot.formatName_(PROJECT_ID, EXPECTED); + const name = Snapshot.formatName_(PROJECT_ID, EXPECTED); assert.strictEqual(name, EXPECTED); }); diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.js index 5df616ca905..833bac790a1 100644 --- a/handwritten/pubsub/test/subscriber.js +++ b/handwritten/pubsub/test/subscriber.js @@ -16,25 +16,25 @@ 'use strict'; -var assert = require('assert'); -var common = require('@google-cloud/common'); -var delay = require('delay'); -var events = require('events'); -var extend = require('extend'); -var is = require('is'); -var proxyquire = require('proxyquire'); -var util = require('util'); +const assert = require('assert'); +const common = require('@google-cloud/common'); +const delay = require('delay'); +const events = require('events'); +const extend = require('extend'); +const is = require('is'); +const proxyquire = require('proxyquire'); +const util = require('util'); const pfy = require('@google-cloud/promisify'); -var fakeUtil = extend({}, common.util); +const fakeUtil = extend({}, common.util); let promisifyOverride; function fakePromisify() { return (promisifyOverride || pfy.promisify).apply(null, arguments); } -var FAKE_FREE_MEM = 168222720; -var fakeOs = { +const FAKE_FREE_MEM = 168222720; +const fakeOs = { freemem: function() { return FAKE_FREE_MEM; }, @@ -51,17 +51,17 @@ function FakeHistogram() { this.calledWith_ = [].slice.call(arguments); } -var delayOverride = null; +let delayOverride = null; function fakeDelay(timeout) { return (delayOverride || delay)(timeout); } describe('Subscriber', function() { - var Subscriber; - var subscriber; + let Subscriber; + let subscriber; - var SUB_NAME = 'fake-sub'; + const SUB_NAME = 'fake-sub'; before(function() { Subscriber = proxyquire('../src/subscriber.js', { @@ -93,7 +93,7 @@ describe('Subscriber', function() { }); it('should honor configuration settings', function() { - var options = { + const options = { maxConnections: 2, flowControl: { maxBytes: 5, @@ -104,7 +104,7 @@ describe('Subscriber', function() { }, }; - var subscriber = new Subscriber(options); + const subscriber = new Subscriber(options); assert.strictEqual(subscriber.maxConnections, options.maxConnections); @@ -145,8 +145,8 @@ describe('Subscriber', function() { }); it('should listen for events', function() { - var called = false; - var listenForEvents = Subscriber.prototype.listenForEvents_; + let called = false; + const listenForEvents = Subscriber.prototype.listenForEvents_; Subscriber.prototype.listenForEvents_ = function() { Subscriber.prototype.listenForEvents_ = listenForEvents; @@ -159,7 +159,7 @@ describe('Subscriber', function() { }); describe('ack_', function() { - var MESSAGE = { + const MESSAGE = { ackId: 'abc', received: 12345, connectionId: 'def', @@ -177,8 +177,8 @@ describe('Subscriber', function() { }); it('should add the time it took to ack to the histogram', function(done) { - var fakeNow = 12381832; - var now = global.Date.now; + const fakeNow = 12381832; + const now = global.Date.now; global.Date.now = function() { global.Date.now = now; @@ -251,15 +251,15 @@ describe('Subscriber', function() { }); describe('acknowledge_', function() { - var fakeAckIds = ['a', 'b', 'c']; + const fakeAckIds = ['a', 'b', 'c']; - var batchSize = 3000; - var tooManyFakeAckIds = Array(batchSize * 2.5) + const batchSize = 3000; + const tooManyFakeAckIds = Array(batchSize * 2.5) .fill('a') .map(function(x, i) { return x + i; }); - var expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); + const expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); describe('without streaming connection', function() { beforeEach(function() { @@ -269,7 +269,7 @@ describe('Subscriber', function() { }); it('should make the correct request', function(done) { - var fakePromisified = { + const fakePromisified = { call: function(context, config) { assert.strictEqual(context, subscriber); assert.strictEqual(config.client, 'SubscriberClient'); @@ -293,12 +293,12 @@ describe('Subscriber', function() { }); it('should batch requests if there are too many ackIds', function(done) { - var receivedCalls = 0; + let receivedCalls = 0; - var fakePromisified = { + const fakePromisified = { call: function(context, config) { - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( + const offset = receivedCalls * batchSize; + const expectedAckIds = tooManyFakeAckIds.slice( offset, offset + batchSize ); @@ -323,8 +323,8 @@ describe('Subscriber', function() { }); it('should emit any request errors', function(done) { - var fakeError = new Error('err'); - var fakePromisified = { + const fakeError = new Error('err'); + const fakePromisified = { call: function() { return Promise.reject(fakeError); }, @@ -353,7 +353,7 @@ describe('Subscriber', function() { }); it('should send the correct request', function(done) { - var fakeConnectionId = 'abc'; + const fakeConnectionId = 'abc'; subscriber.writeTo_ = function(connectionId, data) { assert.strictEqual(connectionId, fakeConnectionId); @@ -365,14 +365,14 @@ describe('Subscriber', function() { }); it('should batch requests if there are too many ackIds', function(done) { - var receivedCalls = 0; - var fakeConnectionId = 'abc'; + let receivedCalls = 0; + const fakeConnectionId = 'abc'; subscriber.writeTo_ = function(connectionId, data) { assert.strictEqual(connectionId, fakeConnectionId); - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( + const offset = receivedCalls * batchSize; + const expectedAckIds = tooManyFakeAckIds.slice( offset, offset + batchSize ); @@ -388,7 +388,7 @@ describe('Subscriber', function() { }); it('should emit an error when unable to get a conn', function(done) { - var error = new Error('err'); + const error = new Error('err'); subscriber.writeTo_ = function() { return Promise.reject(error); @@ -405,7 +405,7 @@ describe('Subscriber', function() { }); describe('breakLease_', function() { - var MESSAGE = { + const MESSAGE = { ackId: 'abc', data: Buffer.from('hello'), length: 5, @@ -427,7 +427,7 @@ describe('Subscriber', function() { }); it('should noop for unknown messages', function() { - var message = { + const message = { ackId: 'def', data: Buffer.from('world'), length: 5, @@ -604,8 +604,8 @@ describe('Subscriber', function() { describe('flushQueues_', function() { it('should cancel any pending flushes', function() { - var canceled = false; - var fakeHandle = { + let canceled = false; + const fakeHandle = { clear: function() { canceled = true; }, @@ -627,7 +627,7 @@ describe('Subscriber', function() { }); it('should send any pending acks', function() { - var fakeAckIds = (subscriber.inventory_.ack = ['abc', 'def']); + const fakeAckIds = (subscriber.inventory_.ack = ['abc', 'def']); subscriber.acknowledge_ = function(ackIds) { assert.strictEqual(ackIds, fakeAckIds); @@ -640,7 +640,7 @@ describe('Subscriber', function() { }); it('should send any pending nacks', function() { - var fakeAckIds = (subscriber.inventory_.nack = ['ghi', 'jkl']); + const fakeAckIds = (subscriber.inventory_.nack = ['ghi', 'jkl']); subscriber.modifyAckDeadline_ = function(ackIds, deadline) { assert.strictEqual(ackIds, fakeAckIds); @@ -708,7 +708,7 @@ describe('Subscriber', function() { }); describe('leaseMessage_', function() { - var MESSAGE = { + const MESSAGE = { ackId: 'abc', connectionId: 'def', data: Buffer.from('hello'), @@ -748,7 +748,7 @@ describe('Subscriber', function() { }); it('should return the message', function() { - var message = subscriber.leaseMessage_(MESSAGE); + const message = subscriber.leaseMessage_(MESSAGE); assert.strictEqual(message, MESSAGE); }); }); @@ -794,7 +794,7 @@ describe('Subscriber', function() { }); describe('on remove listener', function() { - var noop = function() {}; + const noop = function() {}; it('should decrement messageListeners', function() { subscriber.on('message', fakeUtil.noop); @@ -824,16 +824,16 @@ describe('Subscriber', function() { }); describe('modifyAckDeadline_', function() { - var fakeAckIds = ['a', 'b', 'c']; - var fakeDeadline = 123; + const fakeAckIds = ['a', 'b', 'c']; + const fakeDeadline = 123; - var batchSize = 3000; - var tooManyFakeAckIds = Array(batchSize * 2.5) + const batchSize = 3000; + const tooManyFakeAckIds = Array(batchSize * 2.5) .fill('a') .map(function(x, i) { return x + i; }); - var expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); + const expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); describe('without streaming connection', function() { beforeEach(function() { @@ -843,7 +843,7 @@ describe('Subscriber', function() { }); it('should make the correct request', function(done) { - var fakePromisified = { + const fakePromisified = { call: function(context, config) { assert.strictEqual(context, subscriber); assert.strictEqual(config.client, 'SubscriberClient'); @@ -868,12 +868,12 @@ describe('Subscriber', function() { }); it('should batch requests if there are too many ackIds', function(done) { - var receivedCalls = 0; + let receivedCalls = 0; - var fakePromisified = { + const fakePromisified = { call: function(context, config) { - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( + const offset = receivedCalls * batchSize; + const expectedAckIds = tooManyFakeAckIds.slice( offset, offset + batchSize ); @@ -899,8 +899,8 @@ describe('Subscriber', function() { }); it('should emit any request errors', function(done) { - var fakeError = new Error('err'); - var fakePromisified = { + const fakeError = new Error('err'); + const fakePromisified = { call: function() { return Promise.reject(fakeError); }, @@ -929,8 +929,8 @@ describe('Subscriber', function() { }); it('should send the correct request', function(done) { - var expectedDeadlines = Array(fakeAckIds.length).fill(fakeDeadline); - var fakeConnId = 'abc'; + const expectedDeadlines = Array(fakeAckIds.length).fill(fakeDeadline); + const fakeConnId = 'abc'; subscriber.writeTo_ = function(connectionId, data) { assert.strictEqual(connectionId, fakeConnId); @@ -943,18 +943,18 @@ describe('Subscriber', function() { }); it('should batch requests if there are too many ackIds', function(done) { - var receivedCalls = 0; - var fakeConnId = 'abc'; + let receivedCalls = 0; + const fakeConnId = 'abc'; subscriber.writeTo_ = function(connectionId, data) { assert.strictEqual(connectionId, fakeConnId); - var offset = receivedCalls * batchSize; - var expectedAckIds = tooManyFakeAckIds.slice( + const offset = receivedCalls * batchSize; + const expectedAckIds = tooManyFakeAckIds.slice( offset, offset + batchSize ); - var expectedDeadlines = Array(expectedAckIds.length).fill( + const expectedDeadlines = Array(expectedAckIds.length).fill( fakeDeadline ); @@ -974,7 +974,7 @@ describe('Subscriber', function() { }); it('should emit an error when unable to get a conn', function(done) { - var error = new Error('err'); + const error = new Error('err'); subscriber.writeTo_ = function() { return Promise.reject(error); @@ -991,7 +991,7 @@ describe('Subscriber', function() { }); describe('nack_', function() { - var MESSAGE = { + const MESSAGE = { ackId: 'abc', connectionId: 'def', }; @@ -1070,12 +1070,12 @@ describe('Subscriber', function() { subscriber.openConnection_(); assert(subscriber.connectionPool instanceof FakeConnectionPool); - var args = subscriber.connectionPool.calledWith_; + const args = subscriber.connectionPool.calledWith_; assert.strictEqual(args[0], subscriber); }); it('should emit pool errors', function(done) { - var error = new Error('err'); + const error = new Error('err'); subscriber.on('error', function(err) { assert.strictEqual(err, error); @@ -1092,8 +1092,8 @@ describe('Subscriber', function() { }); it('should lease & emit messages from pool', function(done) { - var message = {}; - var leasedMessage = {}; + const message = {}; + const leasedMessage = {}; subscriber.leaseMessage_ = function(message_) { assert.strictEqual(message_, message); @@ -1110,8 +1110,8 @@ describe('Subscriber', function() { }); it('should pause the pool if sub is at max messages', function(done) { - var message = {nack: fakeUtil.noop}; - var leasedMessage = {}; + const message = {nack: fakeUtil.noop}; + const leasedMessage = {}; subscriber.leaseMessage_ = function() { return leasedMessage; @@ -1128,8 +1128,8 @@ describe('Subscriber', function() { }); it('should not re-pause the pool', function(done) { - var message = {nack: fakeUtil.noop}; - var leasedMessage = {}; + const message = {nack: fakeUtil.noop}; + const leasedMessage = {}; subscriber.leaseMessage_ = function() { return leasedMessage; @@ -1165,8 +1165,8 @@ describe('Subscriber', function() { }; }); - var fakeDeadline = 9999; - var fakeAckIds = ['abc', 'def']; + const fakeDeadline = 9999; + const fakeAckIds = ['abc', 'def']; beforeEach(function() { subscriber.inventory_.lease = fakeAckIds; @@ -1178,9 +1178,9 @@ describe('Subscriber', function() { }); it('should clean up the old timeout handle', function() { - var fakeHandle = 123; - var clearTimeoutCalled = false; - var _clearTimeout = global.clearTimeout; + const fakeHandle = 123; + let clearTimeoutCalled = false; + const _clearTimeout = global.clearTimeout; global.clearTimeout = function(handle) { assert.strictEqual(handle, fakeHandle); @@ -1243,21 +1243,21 @@ describe('Subscriber', function() { }); describe('setFlushTimeout_', function() { - var FLUSH_TIMEOUT = 100; + const FLUSH_TIMEOUT = 100; beforeEach(function() { subscriber.batching.maxMilliseconds = FLUSH_TIMEOUT; }); it('should set a flush timeout', function(done) { - var flushed = false; + let flushed = false; subscriber.flushQueues_ = function() { flushed = true; }; - var delayPromise = delay(0); - var fakeBoundDelay = function() {}; + const delayPromise = delay(0); + const fakeBoundDelay = function() {}; delayPromise.clear.bind = function(context) { assert.strictEqual(context, delayPromise); @@ -1269,7 +1269,7 @@ describe('Subscriber', function() { return delayPromise; }; - var promise = subscriber.setFlushTimeout_(); + const promise = subscriber.setFlushTimeout_(); promise.then(function() { assert.strictEqual(subscriber.flushTimeoutHandle_, promise); @@ -1280,27 +1280,27 @@ describe('Subscriber', function() { }); it('should swallow cancel errors', function() { - var promise = subscriber.setFlushTimeout_(); + const promise = subscriber.setFlushTimeout_(); promise.clear(); return promise; }); it('should return the cached timeout', function() { - var fakeHandle = {}; + const fakeHandle = {}; subscriber.flushTimeoutHandle_ = fakeHandle; - var promise = subscriber.setFlushTimeout_(); + const promise = subscriber.setFlushTimeout_(); assert.strictEqual(fakeHandle, promise); }); }); describe('setLeaseTimeout_', function() { - var fakeTimeoutHandle = 1234; - var fakeRandom = 2; + const fakeTimeoutHandle = 1234; + const fakeRandom = 2; - var globalSetTimeout; - var globalMathRandom; + let globalSetTimeout; + let globalMathRandom; before(function() { globalSetTimeout = global.setTimeout; @@ -1322,7 +1322,7 @@ describe('Subscriber', function() { }); it('should set a timeout to call renewLeases_', function(done) { - var ackDeadline = (subscriber.ackDeadline = 1000); + const ackDeadline = (subscriber.ackDeadline = 1000); global.Math.random = function() { return fakeRandom; @@ -1340,14 +1340,14 @@ describe('Subscriber', function() { }); it('should subtract the estimated latency', function(done) { - var latency = 1; + const latency = 1; subscriber.latency_.percentile = function(percentile) { assert.strictEqual(percentile, 99); return latency; }; - var ackDeadline = (subscriber.ackDeadline = 1000); + const ackDeadline = (subscriber.ackDeadline = 1000); global.Math.random = function() { return fakeRandom; @@ -1397,8 +1397,8 @@ describe('Subscriber', function() { }); describe('writeTo_', function() { - var CONNECTION_ID = 'abc'; - var CONNECTION = {}; + const CONNECTION_ID = 'abc'; + const CONNECTION = {}; beforeEach(function() { subscriber.connectionPool = { @@ -1411,12 +1411,12 @@ describe('Subscriber', function() { it('should return a promise', function() { subscriber.connectionPool.acquire = function() {}; - var returnValue = subscriber.writeTo_(); + const returnValue = subscriber.writeTo_(); assert(returnValue instanceof Promise); }); it('should reject the promise if unable to acquire stream', function() { - var fakeError = new Error('err'); + const fakeError = new Error('err'); subscriber.connectionPool.acquire = function(connId, cb) { assert.strictEqual(connId, CONNECTION_ID); @@ -1434,7 +1434,7 @@ describe('Subscriber', function() { }); it('should write to the stream', function(done) { - var fakeData = {a: 'b'}; + const fakeData = {a: 'b'}; CONNECTION.write = function(data) { assert.strictEqual(data, fakeData); @@ -1445,8 +1445,8 @@ describe('Subscriber', function() { }); it('should capture the write latency when successful', function() { - var fakeLatency = 500; - var capturedLatency; + const fakeLatency = 500; + let capturedLatency; CONNECTION.write = function(data, cb) { setTimeout(cb, fakeLatency, null); @@ -1457,8 +1457,8 @@ describe('Subscriber', function() { }; return subscriber.writeTo_(CONNECTION_ID, {}).then(function() { - var upper = fakeLatency + 50; - var lower = fakeLatency - 50; + const upper = fakeLatency + 50; + const lower = fakeLatency - 50; assert(capturedLatency > lower && capturedLatency < upper); }); diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index fbae0be6bb6..9570d3a8e9a 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -16,14 +16,14 @@ 'use strict'; -var assert = require('assert'); -var {util} = require('@google-cloud/common'); -var extend = require('extend'); -var proxyquire = require('proxyquire'); +const assert = require('assert'); +const {util} = require('@google-cloud/common'); +const extend = require('extend'); +const proxyquire = require('proxyquire'); const pfy = require('@google-cloud/promisify'); -var promisified = false; -var fakePromisify = extend({}, pfy, { +let promisified = false; +const fakePromisify = extend({}, pfy, { promisifyAll: function(Class, options) { if (Class.name !== 'Subscription') { return; @@ -47,14 +47,14 @@ function FakeSubscriber() { } describe('Subscription', function() { - var Subscription; - var subscription; + let Subscription; + let subscription; - var PROJECT_ID = 'test-project'; - var SUB_NAME = 'test-subscription'; - var SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; + const PROJECT_ID = 'test-project'; + const SUB_NAME = 'test-subscription'; + const SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; - var PUBSUB = { + const PUBSUB = { projectId: PROJECT_ID, Promise: {}, request: util.noop, @@ -96,13 +96,13 @@ describe('Subscription', function() { callback(); // the done fn }; - var subscription = new Subscription(PUBSUB, SUB_NAME); + const subscription = new Subscription(PUBSUB, SUB_NAME); subscription.request(done); }); it('should format the sub name', function() { - var formattedName = 'a/b/c/d'; - var formatName = Subscription.formatName_; + const formattedName = 'a/b/c/d'; + const formatName = Subscription.formatName_; Subscription.formatName_ = function(projectId, name) { assert.strictEqual(projectId, PROJECT_ID); @@ -113,12 +113,12 @@ describe('Subscription', function() { return formattedName; }; - var subscription = new Subscription(PUBSUB, SUB_NAME); + const subscription = new Subscription(PUBSUB, SUB_NAME); assert.strictEqual(subscription.name, formattedName); }); it('should make a create method if a topic is found', function(done) { - var TOPIC_NAME = 'test-topic'; + const TOPIC_NAME = 'test-topic'; PUBSUB.createSubscription = function(topic, subName, callback) { assert.strictEqual(topic, TOPIC_NAME); @@ -126,7 +126,7 @@ describe('Subscription', function() { callback(); // the done function }; - var subscription = new Subscription(PUBSUB, SUB_NAME, { + const subscription = new Subscription(PUBSUB, SUB_NAME, { topic: TOPIC_NAME, }); @@ -136,15 +136,15 @@ describe('Subscription', function() { it('should create an IAM object', function() { assert(subscription.iam instanceof FakeIAM); - var args = subscription.iam.calledWith_; + const args = subscription.iam.calledWith_; assert.strictEqual(args[0], PUBSUB); assert.strictEqual(args[1], subscription.name); }); it('should inherit from Subscriber', function() { - var options = {}; - var subscription = new Subscription(PUBSUB, SUB_NAME, options); + const options = {}; + const subscription = new Subscription(PUBSUB, SUB_NAME, options); assert(subscription instanceof FakeSubscriber); assert(subscription.calledWith_[0], options); @@ -153,21 +153,21 @@ describe('Subscription', function() { describe('formatMetadata_', function() { it('should make a copy of the metadata', function() { - var metadata = {a: 'a'}; - var formatted = Subscription.formatMetadata_(metadata); + const metadata = {a: 'a'}; + const formatted = Subscription.formatMetadata_(metadata); assert.deepStrictEqual(metadata, formatted); assert.notStrictEqual(metadata, formatted); }); it('should format messageRetentionDuration', function() { - var threeDaysInSeconds = 3 * 24 * 60 * 60; + const threeDaysInSeconds = 3 * 24 * 60 * 60; - var metadata = { + const metadata = { messageRetentionDuration: threeDaysInSeconds, }; - var formatted = Subscription.formatMetadata_(metadata); + const formatted = Subscription.formatMetadata_(metadata); assert.strictEqual(formatted.retainAckedMessages, true); assert.strictEqual(formatted.messageRetentionDuration.nanos, 0); @@ -179,13 +179,13 @@ describe('Subscription', function() { }); it('should format pushEndpoint', function() { - var pushEndpoint = 'http://noop.com/push'; + const pushEndpoint = 'http://noop.com/push'; - var metadata = { + const metadata = { pushEndpoint: pushEndpoint, }; - var formatted = Subscription.formatMetadata_(metadata); + const formatted = Subscription.formatMetadata_(metadata); assert.strictEqual(formatted.pushConfig.pushEndpoint, pushEndpoint); assert.strictEqual(formatted.pushEndpoint, undefined); @@ -194,18 +194,18 @@ describe('Subscription', function() { describe('formatName_', function() { it('should format name', function() { - var formattedName = Subscription.formatName_(PROJECT_ID, SUB_NAME); + const formattedName = Subscription.formatName_(PROJECT_ID, SUB_NAME); assert.strictEqual(formattedName, SUB_FULL_NAME); }); it('should format name when given a complete name', function() { - var formattedName = Subscription.formatName_(PROJECT_ID, SUB_FULL_NAME); + const formattedName = Subscription.formatName_(PROJECT_ID, SUB_FULL_NAME); assert.strictEqual(formattedName, SUB_FULL_NAME); }); }); describe('createSnapshot', function() { - var SNAPSHOT_NAME = 'test-snapshot'; + const SNAPSHOT_NAME = 'test-snapshot'; beforeEach(function() { subscription.snapshot = function(name) { @@ -236,7 +236,7 @@ describe('Subscription', function() { }); it('should optionally accept gax options', function(done) { - var gaxOpts = {}; + const gaxOpts = {}; subscription.request = function(config) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -247,8 +247,8 @@ describe('Subscription', function() { }); it('should pass back any errors to the callback', function(done) { - var error = new Error('err'); - var apiResponse = {}; + const error = new Error('err'); + const apiResponse = {}; subscription.request = function(config, callback) { callback(error, apiResponse); @@ -263,8 +263,8 @@ describe('Subscription', function() { }); it('should return a snapshot object with metadata', function(done) { - var apiResponse = {}; - var fakeSnapshot = {}; + const apiResponse = {}; + const fakeSnapshot = {}; subscription.snapshot = function() { return fakeSnapshot; @@ -304,7 +304,7 @@ describe('Subscription', function() { }); it('should optionally accept gax options', function(done) { - var gaxOpts = {}; + const gaxOpts = {}; subscription.request = function(config) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -315,7 +315,7 @@ describe('Subscription', function() { }); describe('success', function() { - var apiResponse = {}; + const apiResponse = {}; beforeEach(function() { subscription.request = function(config, callback) { @@ -342,7 +342,7 @@ describe('Subscription', function() { }); it('should remove all message listeners', function(done) { - var called = false; + let called = false; subscription.removeAllListeners = function() { called = true; @@ -356,7 +356,7 @@ describe('Subscription', function() { }); it('should close the subscription', function(done) { - var called = false; + let called = false; subscription.close = function() { called = true; @@ -371,7 +371,7 @@ describe('Subscription', function() { }); describe('error', function() { - var error = new Error('err'); + const error = new Error('err'); beforeEach(function() { subscription.request = function(config, callback) { @@ -434,7 +434,7 @@ describe('Subscription', function() { }); it('should pass back any other type of error', function(done) { - var error = {code: 4}; + const error = {code: 4}; subscription.getMetadata = function(callback) { callback(error); @@ -454,7 +454,7 @@ describe('Subscription', function() { }); it('should delete the autoCreate option', function(done) { - var options = { + const options = { autoCreate: true, a: 'a', }; @@ -469,7 +469,7 @@ describe('Subscription', function() { }); describe('success', function() { - var fakeMetadata = {}; + const fakeMetadata = {}; beforeEach(function() { subscription.getMetadata = function(gaxOpts, callback) { @@ -487,7 +487,7 @@ describe('Subscription', function() { }); it('should optionally accept options', function(done) { - var options = {}; + const options = {}; subscription.getMetadata = function(gaxOpts, callback) { assert.strictEqual(gaxOpts, options); @@ -500,8 +500,8 @@ describe('Subscription', function() { describe('error', function() { it('should pass back errors when not auto-creating', function(done) { - var error = {code: 4}; - var apiResponse = {}; + const error = {code: 4}; + const apiResponse = {}; subscription.getMetadata = function(gaxOpts, callback) { callback(error, apiResponse); @@ -516,8 +516,8 @@ describe('Subscription', function() { }); it('should pass back 404 errors if autoCreate is false', function(done) { - var error = {code: 5}; - var apiResponse = {}; + const error = {code: 5}; + const apiResponse = {}; subscription.getMetadata = function(gaxOpts, callback) { callback(error, apiResponse); @@ -532,8 +532,8 @@ describe('Subscription', function() { }); it('should pass back 404 errors if create doesnt exist', function(done) { - var error = {code: 5}; - var apiResponse = {}; + const error = {code: 5}; + const apiResponse = {}; subscription.getMetadata = function(gaxOpts, callback) { callback(error, apiResponse); @@ -550,10 +550,10 @@ describe('Subscription', function() { }); it('should create the sub if 404 + autoCreate is true', function(done) { - var error = {code: 5}; - var apiResponse = {}; + const error = {code: 5}; + const apiResponse = {}; - var fakeOptions = { + const fakeOptions = { autoCreate: true, }; @@ -586,7 +586,7 @@ describe('Subscription', function() { }); it('should optionally accept gax options', function(done) { - var gaxOpts = {}; + const gaxOpts = {}; subscription.request = function(config) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -597,8 +597,8 @@ describe('Subscription', function() { }); it('should pass back any errors that occur', function(done) { - var error = new Error('err'); - var apiResponse = {}; + const error = new Error('err'); + const apiResponse = {}; subscription.request = function(config, callback) { callback(error, apiResponse); @@ -612,7 +612,7 @@ describe('Subscription', function() { }); it('should set the metadata if no error occurs', function(done) { - var apiResponse = {}; + const apiResponse = {}; subscription.request = function(config, callback) { callback(null, apiResponse); @@ -628,7 +628,7 @@ describe('Subscription', function() { }); describe('modifyPushConfig', function() { - var fakeConfig = {}; + const fakeConfig = {}; it('should make the correct request', function(done) { subscription.request = function(config, callback) { @@ -645,7 +645,7 @@ describe('Subscription', function() { }); it('should optionally accept gaxOpts', function(done) { - var gaxOpts = {}; + const gaxOpts = {}; subscription.request = function(config, callback) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -657,8 +657,8 @@ describe('Subscription', function() { }); describe('seek', function() { - var FAKE_SNAPSHOT_NAME = 'a'; - var FAKE_FULL_SNAPSHOT_NAME = 'a/b/c/d'; + const FAKE_SNAPSHOT_NAME = 'a'; + const FAKE_FULL_SNAPSHOT_NAME = 'a/b/c/d'; beforeEach(function() { FakeSnapshot.formatName_ = function() { @@ -693,7 +693,7 @@ describe('Subscription', function() { }); it('should optionally accept a Date object', function(done) { - var date = new Date(); + const date = new Date(); subscription.request = function(config, callback) { assert.strictEqual(config.reqOpts.time, date); @@ -704,7 +704,7 @@ describe('Subscription', function() { }); it('should optionally accept gax options', function(done) { - var gaxOpts = {}; + const gaxOpts = {}; subscription.request = function(config, callback) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -716,7 +716,7 @@ describe('Subscription', function() { }); describe('setMetadata', function() { - var METADATA = { + const METADATA = { pushEndpoint: 'http://noop.com/push', }; @@ -727,13 +727,13 @@ describe('Subscription', function() { }); it('should make the correct request', function(done) { - var formattedMetadata = { + const formattedMetadata = { pushConfig: { pushEndpoint: METADATA.pushEndpoint, }, }; - var expectedBody = extend( + const expectedBody = extend( { name: SUB_FULL_NAME, }, @@ -759,7 +759,7 @@ describe('Subscription', function() { }); it('should optionally accept gax options', function(done) { - var gaxOpts = {}; + const gaxOpts = {}; subscription.request = function(config, callback) { assert.strictEqual(config.gaxOpts, gaxOpts); @@ -771,7 +771,7 @@ describe('Subscription', function() { }); describe('snapshot', function() { - var SNAPSHOT_NAME = 'a'; + const SNAPSHOT_NAME = 'a'; it('should call through to pubsub.snapshot', function(done) { PUBSUB.snapshot = function(name) { diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index e82484df203..759e6c5c6d6 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -16,14 +16,14 @@ 'use strict'; -var assert = require('assert'); -var extend = require('extend'); -var proxyquire = require('proxyquire'); -var {util} = require('@google-cloud/common'); +const assert = require('assert'); +const extend = require('extend'); +const proxyquire = require('proxyquire'); +const {util} = require('@google-cloud/common'); const pfy = require('@google-cloud/promisify'); -var promisified = false; -var fakePromisify = extend({}, pfy, { +let promisified = false; +const fakePromisify = extend({}, pfy, { promisifyAll: function(Class, options) { if (Class.name !== 'Topic') { return; @@ -41,8 +41,8 @@ function FakePublisher() { this.calledWith_ = [].slice.call(arguments); } -var extended = false; -var fakePaginator = { +let extended = false; +const fakePaginator = { extend: function(Class, methods) { if (Class.name !== 'Topic') { return; @@ -57,14 +57,14 @@ var fakePaginator = { }; describe('Topic', function() { - var Topic; - var topic; + let Topic; + let topic; - var PROJECT_ID = 'test-project'; - var TOPIC_NAME = 'projects/' + PROJECT_ID + '/topics/test-topic'; - var TOPIC_UNFORMATTED_NAME = TOPIC_NAME.split('/').pop(); + const PROJECT_ID = 'test-project'; + const TOPIC_NAME = 'projects/' + PROJECT_ID + '/topics/test-topic'; + const TOPIC_UNFORMATTED_NAME = TOPIC_NAME.split('/').pop(); - var PUBSUB = { + const PUBSUB = { Promise: {}, projectId: PROJECT_ID, createTopic: util.noop, @@ -105,9 +105,9 @@ describe('Topic', function() { }); it('should format the name', function() { - var formattedName = 'a/b/c/d'; + const formattedName = 'a/b/c/d'; - var formatName_ = Topic.formatName_; + const formatName_ = Topic.formatName_; Topic.formatName_ = function(projectId, name) { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, TOPIC_NAME); @@ -117,7 +117,7 @@ describe('Topic', function() { return formattedName; }; - var topic = new Topic(PUBSUB, TOPIC_NAME); + const topic = new Topic(PUBSUB, TOPIC_NAME); assert.strictEqual(topic.name, formattedName); }); @@ -131,7 +131,7 @@ describe('Topic', function() { callback(); // the done fn }; - var topic = new Topic(PUBSUB, TOPIC_NAME); + const topic = new Topic(PUBSUB, TOPIC_NAME); topic.request(done); }); @@ -142,19 +142,22 @@ describe('Topic', function() { describe('formatName_', function() { it('should format name', function() { - var formattedName = Topic.formatName_(PROJECT_ID, TOPIC_UNFORMATTED_NAME); + const formattedName = Topic.formatName_( + PROJECT_ID, + TOPIC_UNFORMATTED_NAME + ); assert.strictEqual(formattedName, TOPIC_NAME); }); it('should format name when given a complete name', function() { - var formattedName = Topic.formatName_(PROJECT_ID, TOPIC_NAME); + const formattedName = Topic.formatName_(PROJECT_ID, TOPIC_NAME); assert.strictEqual(formattedName, TOPIC_NAME); }); }); describe('create', function() { it('should call the parent createTopic method', function(done) { - var options_ = {}; + const options_ = {}; PUBSUB.createTopic = function(name, options, callback) { assert.strictEqual(name, topic.name); @@ -168,8 +171,8 @@ describe('Topic', function() { describe('createSubscription', function() { it('should call the parent createSubscription method', function(done) { - var NAME = 'sub-name'; - var OPTIONS = {a: 'a'}; + const NAME = 'sub-name'; + const OPTIONS = {a: 'a'}; PUBSUB.createSubscription = function(topic_, name, options, callback) { assert.strictEqual(topic_, topic); @@ -195,7 +198,7 @@ describe('Topic', function() { }); it('should optionally accept gax options', function(done) { - var options = {}; + const options = {}; topic.request = function(config, callback) { assert.strictEqual(config.gaxOpts, options); @@ -218,7 +221,7 @@ describe('Topic', function() { describe('get', function() { it('should delete the autoCreate option', function(done) { - var options = { + const options = { autoCreate: true, a: 'a', }; @@ -233,7 +236,7 @@ describe('Topic', function() { }); describe('success', function() { - var fakeMetadata = {}; + const fakeMetadata = {}; beforeEach(function() { topic.getMetadata = function(gaxOpts, callback) { @@ -251,7 +254,7 @@ describe('Topic', function() { }); it('should optionally accept options', function(done) { - var options = {}; + const options = {}; topic.getMetadata = function(gaxOpts, callback) { assert.strictEqual(gaxOpts, options); @@ -264,8 +267,8 @@ describe('Topic', function() { describe('error', function() { it('should pass back errors when not auto-creating', function(done) { - var error = {code: 4}; - var apiResponse = {}; + const error = {code: 4}; + const apiResponse = {}; topic.getMetadata = function(gaxOpts, callback) { callback(error, apiResponse); @@ -280,8 +283,8 @@ describe('Topic', function() { }); it('should pass back 404 errors if autoCreate is false', function(done) { - var error = {code: 5}; - var apiResponse = {}; + const error = {code: 5}; + const apiResponse = {}; topic.getMetadata = function(gaxOpts, callback) { callback(error, apiResponse); @@ -296,10 +299,10 @@ describe('Topic', function() { }); it('should create the topic if 404 + autoCreate is true', function(done) { - var error = {code: 5}; - var apiResponse = {}; + const error = {code: 5}; + const apiResponse = {}; - var fakeOptions = { + const fakeOptions = { autoCreate: true, }; @@ -343,7 +346,7 @@ describe('Topic', function() { }); it('should pass back any other type of error', function(done) { - var error = {code: 4}; + const error = {code: 4}; topic.getMetadata = function(callback) { callback(error); @@ -370,7 +373,7 @@ describe('Topic', function() { }); it('should optionally accept gax options', function(done) { - var options = {}; + const options = {}; topic.request = function(config) { assert.strictEqual(config.gaxOpts, options); @@ -381,8 +384,8 @@ describe('Topic', function() { }); it('should pass back any errors that occur', function(done) { - var error = new Error('err'); - var apiResponse = {}; + const error = new Error('err'); + const apiResponse = {}; topic.request = function(config, callback) { callback(error, apiResponse); @@ -396,7 +399,7 @@ describe('Topic', function() { }); it('should set the metadata if no error occurs', function(done) { - var apiResponse = {}; + const apiResponse = {}; topic.request = function(config, callback) { callback(null, apiResponse); @@ -413,7 +416,7 @@ describe('Topic', function() { describe('getSubscriptions', function() { it('should make the correct request', function(done) { - var options = { + const options = { a: 'a', b: 'b', gaxOpts: { @@ -422,14 +425,14 @@ describe('Topic', function() { autoPaginate: false, }; - var expectedOptions = extend( + const expectedOptions = extend( { topic: topic.name, }, options ); - var expectedGaxOpts = extend( + const expectedGaxOpts = extend( { autoPaginate: options.autoPaginate, }, @@ -461,7 +464,7 @@ describe('Topic', function() { }); it('should create subscription objects', function(done) { - var fakeSubs = ['a', 'b', 'c']; + const fakeSubs = ['a', 'b', 'c']; topic.subscription = function(name) { return { @@ -485,10 +488,10 @@ describe('Topic', function() { }); it('should pass all params to the callback', function(done) { - var err_ = new Error('err'); - var subs_ = false; - var nextQuery_ = {}; - var apiResponse_ = {}; + const err_ = new Error('err'); + const subs_ = false; + const nextQuery_ = {}; + const apiResponse_ = {}; topic.request = function(config, callback) { callback(err_, subs_, nextQuery_, apiResponse_); @@ -506,10 +509,10 @@ describe('Topic', function() { describe('publisher', function() { it('should return a Publisher instance', function() { - var options = {}; + const options = {}; - var publisher = topic.publisher(options); - var args = publisher.calledWith_; + const publisher = topic.publisher(options); + const args = publisher.calledWith_; assert(publisher instanceof FakePublisher); assert.strictEqual(args[0], topic); @@ -519,8 +522,8 @@ describe('Topic', function() { describe('subscription', function() { it('should pass correct arguments to pubsub#subscription', function(done) { - var subscriptionName = 'subName'; - var opts = {}; + const subscriptionName = 'subName'; + const opts = {}; topic.parent.subscription = function(name, options) { assert.strictEqual(name, subscriptionName); @@ -545,7 +548,7 @@ describe('Topic', function() { return done; }; - var doneFn = topic.subscription(); + const doneFn = topic.subscription(); doneFn(); }); }); From 99ad48f0a84b5df4cf4351e6be38c430a735402c Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 9 Aug 2018 14:42:55 -0700 Subject: [PATCH 0197/1115] chore: do not use npm ci (#209) --- handwritten/pubsub/synth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 215675ce2e5..18341144830 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -35,6 +35,6 @@ "\g<0>") # Node.js specific cleanup -subprocess.run(['npm', 'ci']) +subprocess.run(['npm', 'install']) subprocess.run(['npm', 'run', 'prettier']) subprocess.run(['npm', 'run', 'lint']) From bba85f827c241f76a6134ccffb5c226c191689bf Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 10 Aug 2018 08:14:42 -0700 Subject: [PATCH 0198/1115] chore: drop dependency on @google-cloud/common (#210) --- handwritten/pubsub/package.json | 1 - handwritten/pubsub/src/connection-pool.js | 8 +-- handwritten/pubsub/src/index.js | 6 +- handwritten/pubsub/src/snapshot.js | 4 +- handwritten/pubsub/src/subscriber.js | 12 ++-- handwritten/pubsub/src/subscription.js | 8 +-- handwritten/pubsub/src/topic.js | 4 +- handwritten/pubsub/src/util.js | 23 ++++++ handwritten/pubsub/test/connection-pool.js | 81 ++++++++++------------ handwritten/pubsub/test/iam.js | 5 +- handwritten/pubsub/test/index.js | 11 +-- handwritten/pubsub/test/publisher.js | 2 +- handwritten/pubsub/test/snapshot.js | 6 +- handwritten/pubsub/test/subscriber.js | 23 +++--- handwritten/pubsub/test/subscription.js | 2 +- handwritten/pubsub/test/topic.js | 6 +- 16 files changed, 105 insertions(+), 97 deletions(-) create mode 100644 handwritten/pubsub/src/util.js diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f17390feb48..bfe6c298f65 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -64,7 +64,6 @@ "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" }, "dependencies": { - "@google-cloud/common": "^0.21.0", "@google-cloud/paginator": "^0.1.0", "@google-cloud/projectify": "^0.3.0", "@google-cloud/promisify": "^0.3.0", diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index ce15f8e7c4f..368aea0b1fd 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -16,15 +16,15 @@ 'use strict'; -const common = require('@google-cloud/common'); const {replaceProjectIdToken} = require('@google-cloud/projectify'); const duplexify = require('duplexify'); const each = require('async-each'); const events = require('events'); const is = require('is'); const through = require('through2'); -const util = require('util'); +const nodeUtil = require('util'); const uuid = require('uuid'); +const util = require('./util'); const CHANNEL_READY_EVENT = 'channel.ready'; const CHANNEL_ERROR_EVENT = 'channel.error'; @@ -88,7 +88,7 @@ function ConnectionPool(subscription) { this.open(); } -util.inherits(ConnectionPool, events.EventEmitter); +nodeUtil.inherits(ConnectionPool, events.EventEmitter); /*! * Acquires a connection from the pool. Optionally you can specify an id for a @@ -149,7 +149,7 @@ ConnectionPool.prototype.close = function(callback) { const self = this; const connections = Array.from(this.connections.values()); - callback = callback || common.util.noop; + callback = callback || util.noop; clearInterval(this.keepAliveHandle); diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index 6caf8f3d822..efe8c8bf4f3 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -28,9 +28,9 @@ const is = require('is'); const PKG = require('../package.json'); const v1 = require('./v1'); -const Snapshot = require('./snapshot.js'); -const Subscription = require('./subscription.js'); -const Topic = require('./topic.js'); +const Snapshot = require('./snapshot'); +const Subscription = require('./subscription'); +const Topic = require('./topic'); /** * @type {string} - Project ID placeholder. diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index 58a79ac20de..e82af4b22d3 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -16,7 +16,7 @@ 'use strict'; -const common = require('@google-cloud/common'); +const util = require('./util'); const {promisifyAll} = require('@google-cloud/promisify'); const is = require('is'); @@ -195,7 +195,7 @@ Snapshot.prototype.delete = function(callback) { snapshot: this.name, }; - callback = callback || common.util.noop; + callback = callback || util.noop; this.parent.request( { diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js index 5c12f83d450..a66d65f23f8 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.js @@ -18,14 +18,14 @@ const arrify = require('arrify'); const chunk = require('lodash.chunk'); -const common = require('@google-cloud/common'); +const util = require('./util'); const {promisify} = require('@google-cloud/promisify'); const delay = require('delay'); const events = require('events'); const extend = require('extend'); const is = require('is'); const os = require('os'); -const util = require('util'); +const nodeUtil = require('util'); const ConnectionPool = require('./connection-pool.js'); const Histogram = require('./histogram.js'); @@ -93,7 +93,7 @@ function Subscriber(options) { this.listenForEvents_(); } -util.inherits(Subscriber, events.EventEmitter); +nodeUtil.inherits(Subscriber, events.EventEmitter); /*! * Acks the provided message. If the connection pool is absent, it will be @@ -235,7 +235,7 @@ Subscriber.prototype.closeConnection_ = function(callback) { this.isOpen = false; if (this.connectionPool) { - this.connectionPool.close(callback || common.util.noop); + this.connectionPool.close(callback || util.noop); this.connectionPool = null; } else if (is.fn(callback)) { setImmediate(callback); @@ -499,9 +499,7 @@ Subscriber.prototype.renewLeases_ = function() { Subscriber.prototype.setFlushTimeout_ = function() { if (!this.flushTimeoutHandle_) { const timeout = delay(this.batching.maxMilliseconds); - const promise = timeout - .then(this.flushQueues_.bind(this)) - .catch(common.util.noop); + const promise = timeout.then(this.flushQueues_.bind(this)).catch(util.noop); promise.clear = timeout.clear.bind(timeout); this.flushTimeoutHandle_ = promise; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index f5c98f39b23..60ffc18666b 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -16,12 +16,12 @@ 'use strict'; -const common = require('@google-cloud/common'); +const util = require('./util'); const {promisifyAll} = require('@google-cloud/promisify'); const extend = require('extend'); const is = require('is'); const snakeCase = require('lodash.snakecase'); -const util = require('util'); +const nodeUtil = require('util'); const IAM = require('./iam.js'); const Snapshot = require('./snapshot.js'); @@ -198,7 +198,7 @@ function Subscription(pubsub, name, options) { Subscriber.call(this, options); } -util.inherits(Subscription, Subscriber); +nodeUtil.inherits(Subscription, Subscriber); /*! * Formats Subscription metadata. @@ -361,7 +361,7 @@ Subscription.prototype.delete = function(gaxOpts, callback) { gaxOpts = {}; } - callback = callback || common.util.noop; + callback = callback || util.noop; const reqOpts = { subscription: this.name, diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 04d96c650c2..05fc23c4305 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -16,7 +16,7 @@ 'use strict'; -const common = require('@google-cloud/common'); +const util = require('./util'); const {promisifyAll} = require('@google-cloud/promisify'); const {paginator} = require('@google-cloud/paginator'); const extend = require('extend'); @@ -227,7 +227,7 @@ Topic.prototype.delete = function(gaxOpts, callback) { gaxOpts = {}; } - callback = callback || common.util.noop; + callback = callback || util.noop; const reqOpts = { topic: this.name, diff --git a/handwritten/pubsub/src/util.js b/handwritten/pubsub/src/util.js new file mode 100644 index 00000000000..8607c40fb58 --- /dev/null +++ b/handwritten/pubsub/src/util.js @@ -0,0 +1,23 @@ +/*! + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +const util = { + noop: function() {}, +}; + +module.exports = util; diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index 762cd74fe13..e27dc058fb2 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -17,60 +17,56 @@ 'use strict'; const assert = require('assert'); -const common = require('@google-cloud/common'); +const util = require('../src/util'); const duplexify = require('duplexify'); -const events = require('events'); +const {EventEmitter} = require('events'); const extend = require('extend'); const proxyquire = require('proxyquire'); const uuid = require('uuid'); -const util = require('util'); const pjy = require('@google-cloud/projectify'); -const fakeUtil = extend({}, common.util); +const fakeUtil = extend({}, util); const fakeUuid = extend({}, uuid); -function FakeConnection() { - this.isConnected = false; - this.isPaused = false; - this.ended = false; - this.canceled = false; - this.written = []; - - events.EventEmitter.call(this); -} - -util.inherits(FakeConnection, events.EventEmitter); - -FakeConnection.prototype.write = function(data) { - this.written.push(data); -}; +class FakeConnection extends EventEmitter { + constructor() { + super(); + this.isConnected = false; + this.isPaused = false; + this.ended = false; + this.canceled = false; + this.written = []; + } -FakeConnection.prototype.end = function(callback) { - this.ended = true; + write(data) { + this.written.push(data); + } - if (callback) { - callback(null); + end(callback) { + this.ended = true; + if (callback) { + callback(null); + } } -}; -FakeConnection.prototype.pause = function() { - this.isPaused = true; -}; + pause() { + this.isPaused = true; + } -FakeConnection.prototype.pipe = function(stream) { - return stream; -}; + pipe(stream) { + return stream; + } -FakeConnection.prototype.resume = function() { - this.isPaused = false; -}; + resume() { + this.isPaused = false; + } -FakeConnection.prototype.cancel = function() { - this.canceled = true; -}; + cancel() { + this.canceled = true; + } +} let duplexifyOverride = null; - function fakeDuplexify() { const args = [].slice.call(arguments); return (duplexifyOverride || duplexify).apply(null, args); @@ -106,10 +102,8 @@ describe('ConnectionPool', function() { } before(function() { - ConnectionPool = proxyquire('../src/connection-pool.js', { - '@google-cloud/common': { - util: fakeUtil, - }, + ConnectionPool = proxyquire('../src/connection-pool', { + '../src/util': fakeUtil, '@google-cloud/projectify': { replaceProjectIdToken: fakePjy, }, @@ -192,7 +186,7 @@ describe('ConnectionPool', function() { }); it('should inherit from EventEmitter', function() { - assert(pool instanceof events.EventEmitter); + assert(pool instanceof EventEmitter); }); it('should call open', function(done) { @@ -404,7 +398,6 @@ describe('ConnectionPool', function() { fakeUtil.noop = function() {}; done(); }; - pool.close(); }); }); @@ -599,14 +592,12 @@ describe('ConnectionPool', function() { it('should proxy the cancel method', function() { const fakeCancel = function() {}; - fakeConnection.cancel = { bind: function(context) { assert.strictEqual(context, fakeConnection); return fakeCancel; }, }; - pool.createConnection(); assert.strictEqual(fakeDuplex.cancel, fakeCancel); }); diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.js index 53044b8ff28..3589e1b9e84 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.js @@ -19,10 +19,11 @@ const assert = require('assert'); const extend = require('extend'); const proxyquire = require('proxyquire'); -const {util} = require('@google-cloud/common'); +const util = require('../src/util'); +const promisify = require('@google-cloud/promisify'); let promisified = false; -const fakePromisify = extend({}, util, { +const fakePromisify = extend({}, promisify, { promisifyAll: function(Class) { if (Class.name === 'IAM') { promisified = true; diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 4b993e957e2..864f06ca875 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -21,8 +21,9 @@ const assert = require('assert'); const extend = require('extend'); const gax = require('google-gax'); const proxyquire = require('proxyquire'); -const util = require('@google-cloud/common').util; +const util = require('../src/util'); const pjy = require('@google-cloud/projectify'); +const promisify = require('@google-cloud/promisify'); const PKG = require('../package.json'); @@ -51,7 +52,7 @@ function Subscription(a, b, c) { } let promisified = false; -const fakePromisify = extend({}, util, { +const fakePromisify = extend({}, promisify, { promisifyAll: function(Class, options) { if (Class.name !== 'PubSub') { return; @@ -150,9 +151,9 @@ describe('PubSub', function() { GoogleAuth: fakeGoogleAuth, }, 'google-gax': fakeGoogleGax, - './snapshot.js': FakeSnapshot, - './subscription.js': Subscription, - './topic.js': FakeTopic, + './snapshot': FakeSnapshot, + './subscription': Subscription, + './topic': FakeTopic, './v1': v1Override, }); }); diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index b32fcb1e630..4cf2cc7d853 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -17,7 +17,7 @@ 'use strict'; const assert = require('assert'); -const {util} = require('@google-cloud/common'); +const util = require('../src/util'); const pfy = require('@google-cloud/promisify'); const extend = require('extend'); const proxyquire = require('proxyquire'); diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.js index ccea5586ec8..ecdd45c67a9 100644 --- a/handwritten/pubsub/test/snapshot.js +++ b/handwritten/pubsub/test/snapshot.js @@ -17,7 +17,7 @@ 'use strict'; const assert = require('assert'); -const {util} = require('@google-cloud/common'); +const util = require('../src/util'); const extend = require('extend'); const proxyquire = require('proxyquire'); const pfy = require('@google-cloud/promisify'); @@ -52,7 +52,7 @@ describe('Snapshot', function() { }; before(function() { - Snapshot = proxyquire('../src/snapshot.js', { + Snapshot = proxyquire('../src/snapshot', { '@google-cloud/promisify': fakePromisify, }); }); @@ -157,13 +157,11 @@ describe('Snapshot', function() { it('should format the name', function() { const name = Snapshot.formatName_(PROJECT_ID, SNAPSHOT_NAME); - assert.strictEqual(name, EXPECTED); }); it('should not re-format the name', function() { const name = Snapshot.formatName_(PROJECT_ID, EXPECTED); - assert.strictEqual(name, EXPECTED); }); }); diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.js index 833bac790a1..bf4f35b33a3 100644 --- a/handwritten/pubsub/test/subscriber.js +++ b/handwritten/pubsub/test/subscriber.js @@ -17,16 +17,15 @@ 'use strict'; const assert = require('assert'); -const common = require('@google-cloud/common'); const delay = require('delay'); -const events = require('events'); +const {EventEmitter} = require('events'); const extend = require('extend'); const is = require('is'); const proxyquire = require('proxyquire'); -const util = require('util'); +const util = require('../src/util'); const pfy = require('@google-cloud/promisify'); -const fakeUtil = extend({}, common.util); +const fakeUtil = extend({}, util); let promisifyOverride; function fakePromisify() { @@ -40,13 +39,13 @@ const fakeOs = { }, }; -function FakeConnectionPool() { - this.calledWith_ = [].slice.call(arguments); - events.EventEmitter.call(this); +class FakeConnectionPool extends EventEmitter { + constructor() { + super(); + this.calledWith_ = [].slice.call(arguments); + } } -util.inherits(FakeConnectionPool, events.EventEmitter); - function FakeHistogram() { this.calledWith_ = [].slice.call(arguments); } @@ -65,9 +64,7 @@ describe('Subscriber', function() { before(function() { Subscriber = proxyquire('../src/subscriber.js', { - '@google-cloud/common': { - util: fakeUtil, - }, + '../src/util': fakeUtil, '@google-cloud/promisify': { promisify: fakePromisify, }, @@ -141,7 +138,7 @@ describe('Subscriber', function() { }); it('should inherit from EventEmitter', function() { - assert(subscriber instanceof events.EventEmitter); + assert(subscriber instanceof EventEmitter); }); it('should listen for events', function() { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.js index 9570d3a8e9a..a1b7e66ee86 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.js @@ -17,7 +17,7 @@ 'use strict'; const assert = require('assert'); -const {util} = require('@google-cloud/common'); +const util = require('../src/util'); const extend = require('extend'); const proxyquire = require('proxyquire'); const pfy = require('@google-cloud/promisify'); diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.js index 759e6c5c6d6..f523e8214fd 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.js @@ -19,7 +19,7 @@ const assert = require('assert'); const extend = require('extend'); const proxyquire = require('proxyquire'); -const {util} = require('@google-cloud/common'); +const util = require('../src/util'); const pfy = require('@google-cloud/promisify'); let promisified = false; @@ -77,8 +77,8 @@ describe('Topic', function() { '@google-cloud/paginator': { paginator: fakePaginator, }, - './iam.js': FakeIAM, - './publisher.js': FakePublisher, + './iam': FakeIAM, + './publisher': FakePublisher, }); }); From ddf11880dc1c9ad7bca39e9e873214adc43e0d02 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 10 Aug 2018 18:01:53 -0700 Subject: [PATCH 0199/1115] chore: convert to es classes (#211) --- handwritten/pubsub/src/connection-pool.js | 820 ++++++------- handwritten/pubsub/src/histogram.js | 103 +- handwritten/pubsub/src/iam.js | 508 ++++---- handwritten/pubsub/src/index.js | 1359 ++++++++++----------- handwritten/pubsub/src/publisher.js | 376 +++--- handwritten/pubsub/src/snapshot.js | 231 ++-- handwritten/pubsub/src/subscriber.js | 906 +++++++------- handwritten/pubsub/src/subscription.js | 1157 +++++++++--------- handwritten/pubsub/src/topic.js | 981 +++++++-------- handwritten/pubsub/system-test/pubsub.js | 2 +- handwritten/pubsub/test/index.js | 2 +- 11 files changed, 3042 insertions(+), 3403 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 368aea0b1fd..6149fa0b5d4 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -19,10 +19,9 @@ const {replaceProjectIdToken} = require('@google-cloud/projectify'); const duplexify = require('duplexify'); const each = require('async-each'); -const events = require('events'); +const {EventEmitter} = require('events'); const is = require('is'); const through = require('through2'); -const nodeUtil = require('util'); const uuid = require('uuid'); const util = require('./util'); @@ -64,477 +63,398 @@ const RETRY_CODES = [ * @param {number} [options.ackDeadline] The ack deadline to send when * creating a connection. */ -function ConnectionPool(subscription) { - this.subscription = subscription; - this.pubsub = subscription.pubsub; - - this.connections = new Map(); - - this.isPaused = false; - this.isOpen = false; - this.isGettingChannelState = false; - - this.failedConnectionAttempts = 0; - this.noConnectionsTime = 0; - - this.settings = { - maxConnections: subscription.maxConnections || 5, - ackDeadline: subscription.ackDeadline || 10000, - }; - - this.queue = []; - - events.EventEmitter.call(this); - this.open(); -} - -nodeUtil.inherits(ConnectionPool, events.EventEmitter); - -/*! - * Acquires a connection from the pool. Optionally you can specify an id for a - * specific connection, but if it is no longer available it will return the - * first available connection. - * - * @private - * @param {string} [id] The id of the connection to retrieve. - * @param {function} callback The callback function. - * @param {?error} callback.err An error returned while acquiring a - * connection. - * @param {stream} callback.connection A duplex stream. - */ -ConnectionPool.prototype.acquire = function(id, callback) { - const self = this; - - if (is.fn(id)) { - callback = id; - id = null; - } - - if (!this.isOpen) { - callback(new Error('No connections available to make request.')); - return; - } - - // it's possible that by the time a user acks the connection could have - // closed, so in that case we'll just return any connection - if (!this.connections.has(id)) { - id = getFirstConnectionId(); - } - - const connection = this.connections.get(id); - - if (connection) { - callback(null, connection); - return; - } - - this.once('connected', function(connection) { - callback(null, connection); - }); - - function getFirstConnectionId() { - return self.connections.keys().next().value; +class ConnectionPool extends EventEmitter { + constructor(subscription) { + super(); + this.subscription = subscription; + this.pubsub = subscription.pubsub; + this.connections = new Map(); + this.isPaused = false; + this.isOpen = false; + this.isGettingChannelState = false; + this.failedConnectionAttempts = 0; + this.noConnectionsTime = 0; + this.settings = { + maxConnections: subscription.maxConnections || 5, + ackDeadline: subscription.ackDeadline || 10000, + }; + this.queue = []; + this.open(); } -}; - -/*! - * Ends each connection in the pool and closes the pool, preventing new - * connections from being created. - * - * @private - * @param {function} callback The callback function. - * @param {?error} callback.error An error returned while closing the pool. - */ -ConnectionPool.prototype.close = function(callback) { - const self = this; - const connections = Array.from(this.connections.values()); - - callback = callback || util.noop; - - clearInterval(this.keepAliveHandle); - - this.connections.clear(); - this.queue.forEach(clearTimeout); - this.queue.length = 0; - - this.isOpen = false; - this.isGettingChannelState = false; - - this.removeAllListeners('newListener') - .removeAllListeners(CHANNEL_READY_EVENT) - .removeAllListeners(CHANNEL_ERROR_EVENT); - - this.failedConnectionAttempts = 0; - this.noConnectionsTime = 0; - - each( - connections, - function(connection, onEndCallback) { - connection.end(function(err) { - connection.cancel(); - onEndCallback(err); - }); - }, - function(err) { - if (self.client) { - self.client.close(); - self.client = null; - } - - callback(err); + /*! + * Acquires a connection from the pool. Optionally you can specify an id for a + * specific connection, but if it is no longer available it will return the + * first available connection. + * + * @private + * @param {string} [id] The id of the connection to retrieve. + * @param {function} callback The callback function. + * @param {?error} callback.err An error returned while acquiring a + * connection. + * @param {stream} callback.connection A duplex stream. + */ + acquire(id, callback) { + const self = this; + if (is.fn(id)) { + callback = id; + id = null; } - ); -}; - -/*! - * Creates a connection. This is async but instead of providing a callback - * a `connected` event will fire once the connection is ready. - * - * @private - */ -ConnectionPool.prototype.createConnection = function() { - const self = this; - - this.getClient(function(err, client) { - if (err) { - self.emit('error', err); + if (!this.isOpen) { + callback(new Error('No connections available to make request.')); return; } - - const requestStream = client.streamingPull(); - - const readStream = requestStream.pipe( - through.obj(function(chunk, enc, next) { - chunk.receivedMessages.forEach(function(message) { - readStream.push(message); - }); - next(); - }) - ); - - const connection = duplexify(requestStream, readStream, {objectMode: true}); - const id = uuid.v4(); - let errorImmediateHandle; - - connection.cancel = requestStream.cancel.bind(requestStream); - - if (self.isPaused) { - connection.pause(); - } - - self - .once(CHANNEL_ERROR_EVENT, onChannelError) - .once(CHANNEL_READY_EVENT, onChannelReady); - - requestStream.on('status', status => - setImmediate(onConnectionStatus, status) - ); - - connection - .on('error', onConnectionError) - .on('data', onConnectionData) - .write({ - subscription: replaceProjectIdToken( - self.subscription.name, - self.pubsub.projectId - ), - streamAckDeadlineSeconds: self.settings.ackDeadline / 1000, - }); - - self.connections.set(id, connection); - - function onChannelError() { - self.removeListener(CHANNEL_READY_EVENT, onChannelReady); - - requestStream.cancel(); - } - - function onChannelReady() { - self.removeListener(CHANNEL_ERROR_EVENT, onChannelError); - - connection.isConnected = true; - - self.noConnectionsTime = 0; - self.failedConnectionAttempts = 0; - - self.emit('connected', connection); + // it's possible that by the time a user acks the connection could have + // closed, so in that case we'll just return any connection + if (!this.connections.has(id)) { + id = getFirstConnectionId(); } - - // since this is a bidi stream it's possible that we recieve errors from - // reads or writes. We also want to try and cut down on the number of - // errors that we emit if other connections are still open. So by using - // setImmediate we're able to cancel the error message if it gets passed - // to the `status` event where we can check if the connection should be - // re-opened or if we should send the error to the user - function onConnectionError(err) { - errorImmediateHandle = setImmediate(() => self.emit('error', err)); + const connection = this.connections.get(id); + if (connection) { + callback(null, connection); + return; } - - function onConnectionData(message) { - self.emit('message', self.createMessage(id, message)); + this.once('connected', function(connection) { + callback(null, connection); + }); + function getFirstConnectionId() { + return self.connections.keys().next().value; } - - function onConnectionStatus(status) { - clearImmediate(errorImmediateHandle); - - connection.end(); - self.connections.delete(id); - - if (!connection.isConnected) { - self.failedConnectionAttempts += 1; + } + /*! + * Ends each connection in the pool and closes the pool, preventing new + * connections from being created. + * + * @private + * @param {function} callback The callback function. + * @param {?error} callback.error An error returned while closing the pool. + */ + close(callback) { + const self = this; + const connections = Array.from(this.connections.values()); + callback = callback || util.noop; + clearInterval(this.keepAliveHandle); + this.connections.clear(); + this.queue.forEach(clearTimeout); + this.queue.length = 0; + this.isOpen = false; + this.isGettingChannelState = false; + this.removeAllListeners('newListener') + .removeAllListeners(CHANNEL_READY_EVENT) + .removeAllListeners(CHANNEL_ERROR_EVENT); + this.failedConnectionAttempts = 0; + this.noConnectionsTime = 0; + each( + connections, + function(connection, onEndCallback) { + connection.end(function(err) { + connection.cancel(); + onEndCallback(err); + }); + }, + function(err) { + if (self.client) { + self.client.close(); + self.client = null; + } + callback(err); } - - if (!self.isConnected() && !self.noConnectionsTime) { - self.noConnectionsTime = Date.now(); + ); + } + /*! + * Creates a connection. This is async but instead of providing a callback + * a `connected` event will fire once the connection is ready. + * + * @private + */ + createConnection() { + const self = this; + this.getClient(function(err, client) { + if (err) { + self.emit('error', err); + return; } - - if (self.shouldReconnect(status)) { - self.queueConnection(); - } else if (self.isOpen && !self.connections.size) { - const error = new Error(status.details); - error.code = status.code; - self.emit('error', error); + const requestStream = client.streamingPull(); + const readStream = requestStream.pipe( + through.obj(function(chunk, enc, next) { + chunk.receivedMessages.forEach(function(message) { + readStream.push(message); + }); + next(); + }) + ); + const connection = duplexify(requestStream, readStream, { + objectMode: true, + }); + const id = uuid.v4(); + let errorImmediateHandle; + connection.cancel = requestStream.cancel.bind(requestStream); + if (self.isPaused) { + connection.pause(); } - } - }); -}; - -/** - * Creates a message object for the user. - * - * @param {string} connectionId The connection id that the message was - * received on. - * @param {object} resp The message response data from StreamingPull. - * @return {object} message The message object. - */ -ConnectionPool.prototype.createMessage = function(connectionId, resp) { - const self = this; - - const pt = resp.message.publishTime; - const milliseconds = parseInt(pt.nanos, 10) / 1e6; - const originalDataLength = resp.message.data.length; - - const message = { - connectionId: connectionId, - ackId: resp.ackId, - id: resp.message.messageId, - attributes: resp.message.attributes, - publishTime: new Date(parseInt(pt.seconds, 10) * 1000 + milliseconds), - received: Date.now(), - data: resp.message.data, - // using get here to prevent user from overwriting data - get length() { - return originalDataLength; - }, - }; - message.ack = function() { - self.subscription.ack_(message); - }; - message.nack = function() { - self.subscription.nack_(message); - }; - return message; -}; - -/*! - * Gets the channels connectivity state and emits channel events accordingly. - * - * @private - * @fires CHANNEL_ERROR_EVENT - * @fires CHANNEL_READY_EVENT - */ -ConnectionPool.prototype.getAndEmitChannelState = function() { - const self = this; - - this.isGettingChannelState = true; - - this.getClient(function(err, client) { - if (err) { - self.isGettingChannelState = false; - self.emit(CHANNEL_ERROR_EVENT); - self.emit('error', err); - return; - } - - let elapsedTimeWithoutConnection = 0; - const now = Date.now(); - let deadline; - - if (self.noConnectionsTime) { - elapsedTimeWithoutConnection = now - self.noConnectionsTime; - } - - deadline = now + (MAX_TIMEOUT - elapsedTimeWithoutConnection); - - client.waitForReady(deadline, function(err) { - self.isGettingChannelState = false; - + self + .once(CHANNEL_ERROR_EVENT, onChannelError) + .once(CHANNEL_READY_EVENT, onChannelReady); + requestStream.on('status', status => + setImmediate(onConnectionStatus, status) + ); + connection + .on('error', onConnectionError) + .on('data', onConnectionData) + .write({ + subscription: replaceProjectIdToken( + self.subscription.name, + self.pubsub.projectId + ), + streamAckDeadlineSeconds: self.settings.ackDeadline / 1000, + }); + self.connections.set(id, connection); + function onChannelError() { + self.removeListener(CHANNEL_READY_EVENT, onChannelReady); + requestStream.cancel(); + } + function onChannelReady() { + self.removeListener(CHANNEL_ERROR_EVENT, onChannelError); + connection.isConnected = true; + self.noConnectionsTime = 0; + self.failedConnectionAttempts = 0; + self.emit('connected', connection); + } + // since this is a bidi stream it's possible that we recieve errors from + // reads or writes. We also want to try and cut down on the number of + // errors that we emit if other connections are still open. So by using + // setImmediate we're able to cancel the error message if it gets passed + // to the `status` event where we can check if the connection should be + // re-opened or if we should send the error to the user + function onConnectionError(err) { + errorImmediateHandle = setImmediate(() => self.emit('error', err)); + } + function onConnectionData(message) { + self.emit('message', self.createMessage(id, message)); + } + function onConnectionStatus(status) { + clearImmediate(errorImmediateHandle); + connection.end(); + self.connections.delete(id); + if (!connection.isConnected) { + self.failedConnectionAttempts += 1; + } + if (!self.isConnected() && !self.noConnectionsTime) { + self.noConnectionsTime = Date.now(); + } + if (self.shouldReconnect(status)) { + self.queueConnection(); + } else if (self.isOpen && !self.connections.size) { + const error = new Error(status.details); + error.code = status.code; + self.emit('error', error); + } + } + }); + } + /** + * Creates a message object for the user. + * + * @param {string} connectionId The connection id that the message was + * received on. + * @param {object} resp The message response data from StreamingPull. + * @return {object} message The message object. + */ + createMessage(connectionId, resp) { + const self = this; + const pt = resp.message.publishTime; + const milliseconds = parseInt(pt.nanos, 10) / 1e6; + const originalDataLength = resp.message.data.length; + const message = { + connectionId: connectionId, + ackId: resp.ackId, + id: resp.message.messageId, + attributes: resp.message.attributes, + publishTime: new Date(parseInt(pt.seconds, 10) * 1000 + milliseconds), + received: Date.now(), + data: resp.message.data, + // using get here to prevent user from overwriting data + get length() { + return originalDataLength; + }, + }; + message.ack = function() { + self.subscription.ack_(message); + }; + message.nack = function() { + self.subscription.nack_(message); + }; + return message; + } + /*! + * Gets the channels connectivity state and emits channel events accordingly. + * + * @private + * @fires CHANNEL_ERROR_EVENT + * @fires CHANNEL_READY_EVENT + */ + getAndEmitChannelState() { + const self = this; + this.isGettingChannelState = true; + this.getClient(function(err, client) { if (err) { - self.emit(CHANNEL_ERROR_EVENT, err); + self.isGettingChannelState = false; + self.emit(CHANNEL_ERROR_EVENT); + self.emit('error', err); return; } - - self.emit(CHANNEL_READY_EVENT); + let elapsedTimeWithoutConnection = 0; + const now = Date.now(); + let deadline; + if (self.noConnectionsTime) { + elapsedTimeWithoutConnection = now - self.noConnectionsTime; + } + deadline = now + (MAX_TIMEOUT - elapsedTimeWithoutConnection); + client.waitForReady(deadline, function(err) { + self.isGettingChannelState = false; + if (err) { + self.emit(CHANNEL_ERROR_EVENT, err); + return; + } + self.emit(CHANNEL_READY_EVENT); + }); }); - }); -}; - -/*! - * Gets the Subscriber client. We need to bypass GAX until they allow deadlines - * to be optional. - * - * @private - * @param {function} callback The callback function. - * @param {?error} callback.err An error occurred while getting the client. - * @param {object} callback.client The Subscriber client. - */ -ConnectionPool.prototype.getClient = function(callback) { - return this.pubsub.getClient_({client: 'SubscriberClient'}, callback); -}; - -/*! - * Check to see if at least one stream in the pool is connected. - * - * @private - * @returns {boolean} - */ -ConnectionPool.prototype.isConnected = function() { - const interator = this.connections.values(); - let connection = interator.next().value; - - while (connection) { - if (connection.isConnected) { - return true; - } - - connection = interator.next().value; } - - return false; -}; - -/*! - * Creates specified number of connections and puts pool in open state. - * - * @private - */ -ConnectionPool.prototype.open = function() { - const self = this; - - let existing = this.connections.size; - const max = this.settings.maxConnections; - - for (; existing < max; existing++) { - this.queueConnection(); + /*! + * Gets the Subscriber client. We need to bypass GAX until they allow deadlines + * to be optional. + * + * @private + * @param {function} callback The callback function. + * @param {?error} callback.err An error occurred while getting the client. + * @param {object} callback.client The Subscriber client. + */ + getClient(callback) { + return this.pubsub.getClient_({client: 'SubscriberClient'}, callback); } - - this.isOpen = true; - this.failedConnectionAttempts = 0; - this.noConnectionsTime = Date.now(); - - this.on('newListener', function(eventName) { - if (eventName === CHANNEL_READY_EVENT && !self.isGettingChannelState) { - self.getAndEmitChannelState(); + /*! + * Check to see if at least one stream in the pool is connected. + * + * @private + * @returns {boolean} + */ + isConnected() { + const interator = this.connections.values(); + let connection = interator.next().value; + while (connection) { + if (connection.isConnected) { + return true; + } + connection = interator.next().value; } - }); - - if (!this.subscription.writeToStreams_) { - this.keepAliveHandle = setInterval(function() { - self.sendKeepAlives(); - }, KEEP_ALIVE_INTERVAL); - - this.keepAliveHandle.unref(); + return false; } -}; - -/*! - * Pauses each of the connections, causing `message` events to stop firing. - * - * @private - */ -ConnectionPool.prototype.pause = function() { - this.isPaused = true; - - this.connections.forEach(function(connection) { - connection.pause(); - }); -}; - -/*! - * Queues a connection to be created. If any previous connections have failed, - * it will apply a back off based on the number of failures. - * - * @private - */ -ConnectionPool.prototype.queueConnection = function() { - const self = this; - let delay = 0; - if (this.failedConnectionAttempts > 0) { - delay = - Math.pow(2, this.failedConnectionAttempts) * 1000 + - Math.floor(Math.random() * 1000); + /*! + * Creates specified number of connections and puts pool in open state. + * + * @private + */ + open() { + const self = this; + let existing = this.connections.size; + const max = this.settings.maxConnections; + for (; existing < max; existing++) { + this.queueConnection(); + } + this.isOpen = true; + this.failedConnectionAttempts = 0; + this.noConnectionsTime = Date.now(); + this.on('newListener', function(eventName) { + if (eventName === CHANNEL_READY_EVENT && !self.isGettingChannelState) { + self.getAndEmitChannelState(); + } + }); + if (!this.subscription.writeToStreams_) { + this.keepAliveHandle = setInterval(function() { + self.sendKeepAlives(); + }, KEEP_ALIVE_INTERVAL); + this.keepAliveHandle.unref(); + } } - const timeoutHandle = setTimeout(createConnection, delay); - this.queue.push(timeoutHandle); - function createConnection() { - setImmediate(() => { - self.createConnection(); - self.queue.splice(self.queue.indexOf(timeoutHandle), 1); + /*! + * Pauses each of the connections, causing `message` events to stop firing. + * + * @private + */ + pause() { + this.isPaused = true; + this.connections.forEach(function(connection) { + connection.pause(); }); } -}; - -/*! - * Calls resume on each connection, allowing `message` events to fire off again. - * - * @private - */ -ConnectionPool.prototype.resume = function() { - this.isPaused = false; - - this.connections.forEach(function(connection) { - connection.resume(); - }); -}; - -/*! - * Sends empty message in an effort to keep the stream alive. - * - * @private - */ -ConnectionPool.prototype.sendKeepAlives = function() { - this.connections.forEach(function(connection) { - connection.write({}); - }); -}; - -/*! - * Inspects a status object to determine whether or not we should try and - * reconnect. - * - * @private - * @param {object} status The gRPC status object. - * @return {boolean} - */ -ConnectionPool.prototype.shouldReconnect = function(status) { - // If the pool was closed, we should definitely not reconnect - if (!this.isOpen) { - return false; + /*! + * Queues a connection to be created. If any previous connections have failed, + * it will apply a back off based on the number of failures. + * + * @private + */ + queueConnection() { + const self = this; + let delay = 0; + if (this.failedConnectionAttempts > 0) { + delay = + Math.pow(2, this.failedConnectionAttempts) * 1000 + + Math.floor(Math.random() * 1000); + } + const timeoutHandle = setTimeout(createConnection, delay); + this.queue.push(timeoutHandle); + function createConnection() { + setImmediate(() => { + self.createConnection(); + self.queue.splice(self.queue.indexOf(timeoutHandle), 1); + }); + } } - - // We should check to see if the status code is a non-recoverable error - if (RETRY_CODES.indexOf(status.code) === -1) { - return false; + /*! + * Calls resume on each connection, allowing `message` events to fire off again. + * + * @private + */ + resume() { + this.isPaused = false; + this.connections.forEach(function(connection) { + connection.resume(); + }); } - - const exceededRetryLimit = - this.noConnectionsTime && Date.now() - this.noConnectionsTime > MAX_TIMEOUT; - - if (exceededRetryLimit) { - return false; + /*! + * Sends empty message in an effort to keep the stream alive. + * + * @private + */ + sendKeepAlives() { + this.connections.forEach(function(connection) { + connection.write({}); + }); } - - return true; -}; + /*! + * Inspects a status object to determine whether or not we should try and + * reconnect. + * + * @private + * @param {object} status The gRPC status object. + * @return {boolean} + */ + shouldReconnect(status) { + // If the pool was closed, we should definitely not reconnect + if (!this.isOpen) { + return false; + } + // We should check to see if the status code is a non-recoverable error + if (RETRY_CODES.indexOf(status.code) === -1) { + return false; + } + const exceededRetryLimit = + this.noConnectionsTime && + Date.now() - this.noConnectionsTime > MAX_TIMEOUT; + if (exceededRetryLimit) { + return false; + } + return true; + } +} module.exports = ConnectionPool; diff --git a/handwritten/pubsub/src/histogram.js b/handwritten/pubsub/src/histogram.js index 6cdd78d76ac..d386fc35e97 100644 --- a/handwritten/pubsub/src/histogram.js +++ b/handwritten/pubsub/src/histogram.js @@ -26,63 +26,56 @@ const extend = require('extend'); * @private * @class */ -function Histogram(options) { - this.options = extend( - { - min: 10000, - max: 600000, - }, - options - ); - - this.data = new Map(); - this.length = 0; -} - -/*! - * Adds a value to the histogram. - * - * @private - * @param {numnber} value - The value in milliseconds. - */ -Histogram.prototype.add = function(value) { - value = Math.max(value, this.options.min); - value = Math.min(value, this.options.max); - value = Math.ceil(value / 1000) * 1000; - - if (!this.data.has(value)) { - this.data.set(value, 0); +class Histogram { + constructor(options) { + this.options = extend( + { + min: 10000, + max: 600000, + }, + options + ); + this.data = new Map(); + this.length = 0; } - - const count = this.data.get(value); - this.data.set(value, count + 1); - this.length += 1; -}; - -/*! - * Retrieves the nth percentile of recorded values. - * - * @private - * @param {number} percent The requested percentage. - * @return {number} - */ -Histogram.prototype.percentile = function(percent) { - percent = Math.min(percent, 100); - - let target = this.length - this.length * (percent / 100); - const keys = Array.from(this.data.keys()); - let key; - - for (let i = keys.length - 1; i > -1; i--) { - key = keys[i]; - target -= this.data.get(key); - - if (target <= 0) { - return key; + /*! + * Adds a value to the histogram. + * + * @private + * @param {numnber} value - The value in milliseconds. + */ + add(value) { + value = Math.max(value, this.options.min); + value = Math.min(value, this.options.max); + value = Math.ceil(value / 1000) * 1000; + if (!this.data.has(value)) { + this.data.set(value, 0); } + const count = this.data.get(value); + this.data.set(value, count + 1); + this.length += 1; } - - return this.options.min; -}; + /*! + * Retrieves the nth percentile of recorded values. + * + * @private + * @param {number} percent The requested percentage. + * @return {number} + */ + percentile(percent) { + percent = Math.min(percent, 100); + let target = this.length - this.length * (percent / 100); + const keys = Array.from(this.data.keys()); + let key; + for (let i = keys.length - 1; i > -1; i--) { + key = keys[i]; + target -= this.data.get(key); + if (target <= 0) { + return key; + } + } + return this.options.min; + } +} module.exports = Histogram; diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.js index 79b86dc68a6..502c04dff8d 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.js @@ -62,270 +62,258 @@ const is = require('is'); * const subscription = pubsub.subscription('my-subscription'); * // subscription.iam */ -function IAM(pubsub, id) { - if (pubsub.Promise) { - this.Promise = pubsub.Promise; - } - - this.pubsub = pubsub; - this.request = pubsub.request.bind(pubsub); - this.id = id; -} - -/** - * @typedef {array} GetPolicyResponse - * @property {object} 0 The policy. - * @property {object} 1 The full API response. - */ -/** - * @callback GetPolicyCallback - * @param {?Error} err Request error, if any. - * @param {object} acl The policy. - * @param {object} apiResponse The full API response. - */ -/** - * Get the IAM policy - * - * @param {object} [gaxOptions] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {GetPolicyCallback} [callback] Callback function. - * @returns {Promise} - * - * @see [Topics: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/getIamPolicy} - * @see [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * topic.iam.getPolicy(function(err, policy, apiResponse) {}); - * - * subscription.iam.getPolicy(function(err, policy, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.iam.getPolicy().then(function(data) { - * const policy = data[0]; - * const apiResponse = data[1]; - * }); - */ -IAM.prototype.getPolicy = function(gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = null; - } - - const reqOpts = { - resource: this.id, - }; - - this.request( - { - client: 'SubscriberClient', - method: 'getIamPolicy', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); -}; - -/** - * @typedef {array} SetPolicyResponse - * @property {object} 0 The policy. - * @property {object} 1 The full API response. - */ -/** - * @callback SetPolicyCallback - * @param {?Error} err Request error, if any. - * @param {object} acl The policy. - * @param {object} apiResponse The full API response. - */ -/** - * Set the IAM policy - * - * @throws {Error} If no policy is provided. - * - * @param {object} policy The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). - * @param {array} [policy.bindings] Bindings associate members with roles. - * @param {Array} [policy.rules] Rules to be applied to the policy. - * @param {string} [policy.etag] Etags are used to perform a read-modify-write. - * @param {object} [gaxOptions] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {SetPolicyCallback} callback Callback function. - * @returns {Promise} - * - * @see [Topics: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/setIamPolicy} - * @see [Subscriptions: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/setIamPolicy} - * @see [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * const myPolicy = { - * bindings: [ - * { - * role: 'roles/pubsub.subscriber', - * members: ['serviceAccount:myotherproject@appspot.gserviceaccount.com'] - * } - * ] - * }; - * - * topic.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); - * - * subscription.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.iam.setPolicy(myPolicy).then(function(data) { - * const policy = data[0]; - * const apiResponse = data[1]; - * }); - */ -IAM.prototype.setPolicy = function(policy, gaxOpts, callback) { - if (!is.object(policy)) { - throw new Error('A policy object is required.'); - } - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = null; +class IAM { + constructor(pubsub, id) { + if (pubsub.Promise) { + this.Promise = pubsub.Promise; + } + this.pubsub = pubsub; + this.request = pubsub.request.bind(pubsub); + this.id = id; } - - const reqOpts = { - resource: this.id, - policy, - }; - - this.request( - { - client: 'SubscriberClient', - method: 'setIamPolicy', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); -}; - -/** - * @typedef {array} TestIamPermissionsResponse - * @property {object[]} 0 A subset of permissions that the caller is allowed. - * @property {object} 1 The full API response. - */ -/** - * @callback TestIamPermissionsCallback - * @param {?Error} err Request error, if any. - * @param {object[]} permissions A subset of permissions that the caller is allowed. - * @param {object} apiResponse The full API response. - */ -/** - * Test a set of permissions for a resource. - * - * Permissions with wildcards such as `*` or `storage.*` are not allowed. - * - * @throws {Error} If permissions are not provided. - * - * @param {string|string[]} permissions The permission(s) to test for. - * @param {object} [gaxOptions] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {TestIamPermissionsCallback} [callback] Callback function. - * @returns {Promise} - * - * @see [Topics: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/testIamPermissions} - * @see [Subscriptions: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/testIamPermissions} - * @see [Permissions Reference]{@link https://cloud.google.com/pubsub/access_control#permissions} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * //- - * // Test a single permission. - * //- - * const test = 'pubsub.topics.update'; - * - * topic.iam.testPermissions(test, function(err, permissions, apiResponse) { - * console.log(permissions); - * // { - * // "pubsub.topics.update": true - * // } - * }); - * - * //- - * // Test several permissions at once. - * //- - * const tests = [ - * 'pubsub.subscriptions.consume', - * 'pubsub.subscriptions.update' - * ]; - * - * subscription.iam.testPermissions(tests, function(err, permissions) { - * console.log(permissions); - * // { - * // "pubsub.subscriptions.consume": true, - * // "pubsub.subscriptions.update": false - * // } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.iam.testPermissions(test).then(function(data) { - * const permissions = data[0]; - * const apiResponse = data[1]; - * }); - */ -IAM.prototype.testPermissions = function(permissions, gaxOpts, callback) { - if (!is.array(permissions) && !is.string(permissions)) { - throw new Error('Permissions are required.'); + /** + * @typedef {array} GetPolicyResponse + * @property {object} 0 The policy. + * @property {object} 1 The full API response. + */ + /** + * @callback GetPolicyCallback + * @param {?Error} err Request error, if any. + * @param {object} acl The policy. + * @param {object} apiResponse The full API response. + */ + /** + * Get the IAM policy + * + * @param {object} [gaxOptions] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {GetPolicyCallback} [callback] Callback function. + * @returns {Promise} + * + * @see [Topics: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/getIamPolicy} + * @see [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * topic.iam.getPolicy(function(err, policy, apiResponse) {}); + * + * subscription.iam.getPolicy(function(err, policy, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.iam.getPolicy().then(function(data) { + * const policy = data[0]; + * const apiResponse = data[1]; + * }); + */ + getPolicy(gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = null; + } + const reqOpts = { + resource: this.id, + }; + this.request( + { + client: 'SubscriberClient', + method: 'getIamPolicy', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); } - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = null; + /** + * @typedef {array} SetPolicyResponse + * @property {object} 0 The policy. + * @property {object} 1 The full API response. + */ + /** + * @callback SetPolicyCallback + * @param {?Error} err Request error, if any. + * @param {object} acl The policy. + * @param {object} apiResponse The full API response. + */ + /** + * Set the IAM policy + * + * @throws {Error} If no policy is provided. + * + * @param {object} policy The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). + * @param {array} [policy.bindings] Bindings associate members with roles. + * @param {Array} [policy.rules] Rules to be applied to the policy. + * @param {string} [policy.etag] Etags are used to perform a read-modify-write. + * @param {object} [gaxOptions] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {SetPolicyCallback} callback Callback function. + * @returns {Promise} + * + * @see [Topics: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/setIamPolicy} + * @see [Subscriptions: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/setIamPolicy} + * @see [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * const myPolicy = { + * bindings: [ + * { + * role: 'roles/pubsub.subscriber', + * members: ['serviceAccount:myotherproject@appspot.gserviceaccount.com'] + * } + * ] + * }; + * + * topic.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); + * + * subscription.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.iam.setPolicy(myPolicy).then(function(data) { + * const policy = data[0]; + * const apiResponse = data[1]; + * }); + */ + setPolicy(policy, gaxOpts, callback) { + if (!is.object(policy)) { + throw new Error('A policy object is required.'); + } + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = null; + } + const reqOpts = { + resource: this.id, + policy, + }; + this.request( + { + client: 'SubscriberClient', + method: 'setIamPolicy', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); } - - const reqOpts = { - resource: this.id, - permissions: arrify(permissions), - }; - - this.request( - { - client: 'SubscriberClient', - method: 'testIamPermissions', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function(err, resp) { - if (err) { - callback(err, null, resp); - return; - } - - const availablePermissions = arrify(resp.permissions); - const permissionHash = permissions.reduce(function(acc, permission) { - acc[permission] = availablePermissions.indexOf(permission) > -1; - return acc; - }, {}); - - callback(null, permissionHash, resp); + /** + * @typedef {array} TestIamPermissionsResponse + * @property {object[]} 0 A subset of permissions that the caller is allowed. + * @property {object} 1 The full API response. + */ + /** + * @callback TestIamPermissionsCallback + * @param {?Error} err Request error, if any. + * @param {object[]} permissions A subset of permissions that the caller is allowed. + * @param {object} apiResponse The full API response. + */ + /** + * Test a set of permissions for a resource. + * + * Permissions with wildcards such as `*` or `storage.*` are not allowed. + * + * @throws {Error} If permissions are not provided. + * + * @param {string|string[]} permissions The permission(s) to test for. + * @param {object} [gaxOptions] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {TestIamPermissionsCallback} [callback] Callback function. + * @returns {Promise} + * + * @see [Topics: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/testIamPermissions} + * @see [Subscriptions: testIamPermissions API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/testIamPermissions} + * @see [Permissions Reference]{@link https://cloud.google.com/pubsub/access_control#permissions} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * //- + * // Test a single permission. + * //- + * const test = 'pubsub.topics.update'; + * + * topic.iam.testPermissions(test, function(err, permissions, apiResponse) { + * console.log(permissions); + * // { + * // "pubsub.topics.update": true + * // } + * }); + * + * //- + * // Test several permissions at once. + * //- + * const tests = [ + * 'pubsub.subscriptions.consume', + * 'pubsub.subscriptions.update' + * ]; + * + * subscription.iam.testPermissions(tests, function(err, permissions) { + * console.log(permissions); + * // { + * // "pubsub.subscriptions.consume": true, + * // "pubsub.subscriptions.update": false + * // } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.iam.testPermissions(test).then(function(data) { + * const permissions = data[0]; + * const apiResponse = data[1]; + * }); + */ + testPermissions(permissions, gaxOpts, callback) { + if (!is.array(permissions) && !is.string(permissions)) { + throw new Error('Permissions are required.'); + } + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = null; } - ); -}; + const reqOpts = { + resource: this.id, + permissions: arrify(permissions), + }; + this.request( + { + client: 'SubscriberClient', + method: 'testIamPermissions', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } + const availablePermissions = arrify(resp.permissions); + const permissionHash = permissions.reduce(function(acc, permission) { + acc[permission] = availablePermissions.indexOf(permission) > -1; + return acc; + }, {}); + callback(null, permissionHash, resp); + } + ); + } +} /*! Developer Documentation * diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index efe8c8bf4f3..b11845c64d5 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -66,7 +66,6 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; * @property {Constructor} [promise] Custom promise module to use instead of * native Promises. */ - /** * [Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a * reliable, many-to-many, asynchronous messaging service from Cloud @@ -94,366 +93,668 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; * region_tag:pubsub_quickstart_create_topic * Full quickstart example: */ -function PubSub(options) { - if (!(this instanceof PubSub)) { - return new PubSub(options); - } - - options = options || {}; - - // Determine what scopes are needed. - // It is the union of the scopes on both clients. - const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; - const allScopes = {}; - - for (let clientClass of clientClasses) { - for (let scope of clientClass.scopes) { - allScopes[scope] = true; +class PubSub { + constructor(options) { + options = options || {}; + // Determine what scopes are needed. + // It is the union of the scopes on both clients. + const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; + const allScopes = {}; + for (let clientClass of clientClasses) { + for (let scope of clientClass.scopes) { + allScopes[scope] = true; + } + } + this.options = extend( + { + 'grpc.keepalive_time_ms': 300000, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version, + scopes: Object.keys(allScopes), + }, + options + ); + /** + * @name PubSub#isEmulator + * @type {boolean} + */ + this.isEmulator = false; + this.determineBaseUrl_(); + this.api = {}; + this.auth = new GoogleAuth(this.options); + this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; + if (this.options.promise) { + this.Promise = this.options.promise; } } - - this.options = extend( - { - 'grpc.keepalive_time_ms': 300000, - 'grpc.max_receive_message_length': 20000001, - libName: 'gccl', - libVersion: PKG.version, - scopes: Object.keys(allScopes), - }, - options - ); - /** - * @name PubSub#isEmulator - * @type {boolean} + * Options for creating a subscription. + * + * See a [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * + * @typedef {object} CreateSubscriptionRequest + * @property {object} [flowControl] Flow control configurations for + * receiving messages. Note that these options do not persist across + * subscription instances. + * @property {number} [flowControl.maxBytes] The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @property {number} [flowControl.maxMessages=Infinity] The maximum number + * of un-acked messages to allow before the subscription pauses incoming + * messages. + * @property {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number|date} [messageRetentionDuration] Set this to override + * the default duration of 7 days. This value is expected in seconds. + * Acceptable values are in the range of 10 minutes and 7 days. + * @property {string} [pushEndpoint] A URL to a custom endpoint that + * messages should be pushed to. + * @property {boolean} [retainAckedMessages=false] If set, acked messages + * are retained in the subscription's backlog for the length of time + * specified by `options.messageRetentionDuration`. */ - this.isEmulator = false; - this.determineBaseUrl_(); - - this.api = {}; - this.auth = new GoogleAuth(this.options); - this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; - - if (this.options.promise) { - this.Promise = this.options.promise; + /** + * @typedef {array} CreateSubscriptionResponse + * @property {Subscription} 0 The new {@link Subscription}. + * @property {object} 1 The full API response. + */ + /** + * @callback CreateSubscriptionCallback + * @param {?Error} err Request error, if any. + * @param {Subscription} subscription The new {@link Subscription}. + * @param {object} apiResponse The full API response. + */ + /** + * Create a subscription to a topic. + * + * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * @see {@link Topic#createSubscription} + * + * @throws {Error} If a Topic instance or topic name is not provided. + * @throws {Error} If a subscription name is not provided. + * + * @param {Topic|string} topic The Topic to create a + * subscription to. + * @param {string} name The name of the subscription. + * @param {CreateSubscriptionRequest} [options] See a + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * @param {CreateSubscriptionCallback} [callback] Callback function. + * @returns {Promise} + * + * @example Subscribe to a topic. + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = 'messageCenter'; + * const name = 'newMessages'; + * + * const callback = function(err, subscription, apiResponse) {}; + * + * pubsub.createSubscription(topic, name, callback); + * + * @example If the callback is omitted, we'll return a Promise. + * pubsub.createSubscription(topic, name).then(function(data) { + * const subscription = data[0]; + * const apiResponse = data[1]; + * }); + */ + createSubscription(topic, name, options, callback) { + if (!is.string(topic) && !(topic instanceof Topic)) { + throw new Error('A Topic is required for a new subscription.'); + } + if (!is.string(name)) { + throw new Error('A subscription name is required.'); + } + if (is.string(topic)) { + topic = this.topic(topic); + } + if (is.fn(options)) { + callback = options; + options = {}; + } + options = options || {}; + const metadata = Subscription.formatMetadata_(options); + const subscription = this.subscription(name, metadata); + const reqOpts = extend(metadata, { + topic: topic.name, + name: subscription.name, + }); + delete reqOpts.gaxOpts; + delete reqOpts.flowControl; + this.request( + { + client: 'SubscriberClient', + method: 'createSubscription', + reqOpts: reqOpts, + gaxOpts: options.gaxOpts, + }, + function(err, resp) { + if (err && err.code !== 6) { + callback(err, null, resp); + return; + } + subscription.metadata = resp; + callback(null, subscription, resp); + } + ); } -} - -/** - * Options for creating a subscription. - * - * See a [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). - * - * @typedef {object} CreateSubscriptionRequest - * @property {object} [flowControl] Flow control configurations for - * receiving messages. Note that these options do not persist across - * subscription instances. - * @property {number} [flowControl.maxBytes] The maximum number of bytes - * in un-acked messages to allow before the subscription pauses incoming - * messages. Defaults to 20% of free memory. - * @property {number} [flowControl.maxMessages=Infinity] The maximum number - * of un-acked messages to allow before the subscription pauses incoming - * messages. - * @property {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number|date} [messageRetentionDuration] Set this to override - * the default duration of 7 days. This value is expected in seconds. - * Acceptable values are in the range of 10 minutes and 7 days. - * @property {string} [pushEndpoint] A URL to a custom endpoint that - * messages should be pushed to. - * @property {boolean} [retainAckedMessages=false] If set, acked messages - * are retained in the subscription's backlog for the length of time - * specified by `options.messageRetentionDuration`. - */ -/** - * @typedef {array} CreateSubscriptionResponse - * @property {Subscription} 0 The new {@link Subscription}. - * @property {object} 1 The full API response. - */ -/** - * @callback CreateSubscriptionCallback - * @param {?Error} err Request error, if any. - * @param {Subscription} subscription The new {@link Subscription}. - * @param {object} apiResponse The full API response. - */ -/** - * Create a subscription to a topic. - * - * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} - * @see {@link Topic#createSubscription} - * - * @throws {Error} If a Topic instance or topic name is not provided. - * @throws {Error} If a subscription name is not provided. - * - * @param {Topic|string} topic The Topic to create a - * subscription to. - * @param {string} name The name of the subscription. - * @param {CreateSubscriptionRequest} [options] See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). - * @param {CreateSubscriptionCallback} [callback] Callback function. - * @returns {Promise} - * - * @example Subscribe to a topic. - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = 'messageCenter'; - * const name = 'newMessages'; - * - * const callback = function(err, subscription, apiResponse) {}; - * - * pubsub.createSubscription(topic, name, callback); - * - * @example If the callback is omitted, we'll return a Promise. - * pubsub.createSubscription(topic, name).then(function(data) { - * const subscription = data[0]; - * const apiResponse = data[1]; - * }); - */ -PubSub.prototype.createSubscription = function(topic, name, options, callback) { - if (!is.string(topic) && !(topic instanceof Topic)) { - throw new Error('A Topic is required for a new subscription.'); + /** + * @typedef {array} CreateTopicResponse + * @property {Topic} 0 The new {@link Topic}. + * @property {object} 1 The full API response. + */ + /** + * @callback CreateTopicCallback + * @param {?Error} err Request error, if any. + * @param {Topic} topic The new {@link Topic}. + * @param {object} apiResponse The full API response. + */ + /** + * Create a topic with the given name. + * + * @see [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create} + * + * @param {string} name Name of the topic. + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {CreateTopicCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.createTopic('my-new-topic', function(err, topic, apiResponse) { + * if (!err) { + * // The topic was created successfully. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.createTopic('my-new-topic').then(function(data) { + * const topic = data[0]; + * const apiResponse = data[1]; + * }); + */ + createTopic(name, gaxOpts, callback) { + const topic = this.topic(name); + const reqOpts = { + name: topic.name, + }; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + this.request( + { + client: 'PublisherClient', + method: 'createTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } + topic.metadata = resp; + callback(null, topic, resp); + } + ); } - - if (!is.string(name)) { - throw new Error('A subscription name is required.'); + /** + * Determine the appropriate endpoint to use for API requests, first trying the + * local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null we try + * Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise the + * default JSON API. + * + * @private + */ + determineBaseUrl_() { + const apiEndpoint = this.options.apiEndpoint; + if (!apiEndpoint && !process.env.PUBSUB_EMULATOR_HOST) { + return; + } + const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; + const leadingProtocol = new RegExp('^https*://'); + const trailingSlashes = new RegExp('/*$'); + const baseUrlParts = baseUrl + .replace(leadingProtocol, '') + .replace(trailingSlashes, '') + .split(':'); + this.options.servicePath = baseUrlParts[0]; + this.options.port = baseUrlParts[1]; + this.options.sslCreds = grpc.credentials.createInsecure(); + this.isEmulator = true; } - - if (is.string(topic)) { - topic = this.topic(topic); + /** + * Query object for listing snapshots. + * + * @typedef {object} GetSnapshotsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + */ + /** + * @typedef {array} GetSnapshotsResponse + * @property {Snapshot[]} 0 Array of {@link Snapshot} instances. + * @property {object} 1 The full API response. + */ + /** + * @callback GetSnapshotsCallback + * @param {?Error} err Request error, if any. + * @param {Snapshot[]} snapshots Array of {@link Snapshot} instances. + * @param {object} apiResponse The full API response. + */ + /** + * Get a list of snapshots. + * + * @param {GetSnapshotsRequest} [query] Query object for listing snapshots. + * @param {GetSnapshotsCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getSnapshots(function(err, snapshots) { + * if (!err) { + * // snapshots is an array of Snapshot objects. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.getSnapshots().then(function(data) { + * const snapshots = data[0]; + * }); + */ + getSnapshots(options, callback) { + const self = this; + if (is.fn(options)) { + callback = options; + options = {}; + } + const reqOpts = extend( + { + project: 'projects/' + this.projectId, + }, + options + ); + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + const gaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + this.request( + { + client: 'SubscriberClient', + method: 'listSnapshots', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function() { + const snapshots = arguments[1]; + if (snapshots) { + arguments[1] = snapshots.map(function(snapshot) { + const snapshotInstance = self.snapshot(snapshot.name); + snapshotInstance.metadata = snapshot; + return snapshotInstance; + }); + } + callback.apply(null, arguments); + } + ); } - - if (is.fn(options)) { - callback = options; - options = {}; + /** + * Query object for listing subscriptions. + * + * @typedef {object} GetSubscriptionsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + * @param {string|Topic} options.topic - The name of the topic to + * list subscriptions from. + */ + /** + * @typedef {array} GetSubscriptionsResponse + * @property {Subscription[]} 0 Array of {@link Subscription} instances. + * @property {object} 1 The full API response. + */ + /** + * @callback GetSubscriptionsCallback + * @param {?Error} err Request error, if any. + * @param {Subscription[]} subscriptions Array of {@link Subscription} instances. + * @param {object} apiResponse The full API response. + */ + /** + * Get a list of the subscriptions registered to all of your project's topics. + * You may optionally provide a query object as the first argument to customize + * the response. + * + * Your provided callback will be invoked with an error object if an API error + * occurred or an array of {@link Subscription} objects. + * + * To get subscriptions for a topic, see {@link Topic}. + * + * @see [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list} + * + * @param {GetSubscriptionsRequest} [query] Query object for listing subscriptions. + * @param {GetSubscriptionsCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getSubscriptions(function(err, subscriptions) { + * if (!err) { + * // subscriptions is an array of Subscription objects. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.getSubscriptions().then(function(data) { + * const subscriptions = data[0]; + * }); + */ + getSubscriptions(options, callback) { + const self = this; + if (is.fn(options)) { + callback = options; + options = {}; + } + let topic = options.topic; + if (topic) { + if (!(topic instanceof Topic)) { + topic = this.topic(topic); + } + return topic.getSubscriptions(options, callback); + } + const reqOpts = extend({}, options); + reqOpts.project = 'projects/' + this.projectId; + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + const gaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + this.request( + { + client: 'SubscriberClient', + method: 'listSubscriptions', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function() { + const subscriptions = arguments[1]; + if (subscriptions) { + arguments[1] = subscriptions.map(function(sub) { + const subscriptionInstance = self.subscription(sub.name); + subscriptionInstance.metadata = sub; + return subscriptionInstance; + }); + } + callback.apply(null, arguments); + } + ); } - - options = options || {}; - - const metadata = Subscription.formatMetadata_(options); - const subscription = this.subscription(name, metadata); - - const reqOpts = extend(metadata, { - topic: topic.name, - name: subscription.name, - }); - - delete reqOpts.gaxOpts; - delete reqOpts.flowControl; - - this.request( - { - client: 'SubscriberClient', - method: 'createSubscription', - reqOpts: reqOpts, - gaxOpts: options.gaxOpts, - }, - function(err, resp) { - if (err && err.code !== 6) { - callback(err, null, resp); - return; + /** + * Query object for listing topics. + * + * @typedef {object} GetTopicsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + */ + /** + * @typedef {array} GetTopicsResponse + * @property {Topic[]} 0 Array of {@link Topic} instances. + * @property {object} 1 The full API response. + */ + /** + * @callback GetTopicsCallback + * @param {?Error} err Request error, if any. + * @param {Topic[]} topics Array of {@link Topic} instances. + * @param {object} apiResponse The full API response. + */ + /** + * Get a list of the topics registered to your project. You may optionally + * provide a query object as the first argument to customize the response. + * + * @see [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list} + * + * @param {GetTopicsRequest} [query] Query object for listing topics. + * @param {GetTopicsCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getTopics(function(err, topics) { + * if (!err) { + * // topics is an array of Topic objects. + * } + * }); + * + * //- + * // Customize the query. + * //- + * pubsub.getTopics({ + * pageSize: 3 + * }, function(err, topics) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.getTopics().then(function(data) { + * const topics = data[0]; + * }); + */ + getTopics(options, callback) { + const self = this; + if (is.fn(options)) { + callback = options; + options = {}; + } + const reqOpts = extend( + { + project: 'projects/' + this.projectId, + }, + options + ); + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + const gaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + this.request( + { + client: 'PublisherClient', + method: 'listTopics', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function() { + const topics = arguments[1]; + if (topics) { + arguments[1] = topics.map(function(topic) { + const topicInstance = self.topic(topic.name); + topicInstance.metadata = topic; + return topicInstance; + }); + } + callback.apply(null, arguments); } - - subscription.metadata = resp; - callback(null, subscription, resp); + ); + } + /** + * Get the PubSub client object. + * + * @private + * + * @param {object} config Configuration object. + * @param {object} config.gaxOpts GAX options. + * @param {function} config.method The gax method to call. + * @param {object} config.reqOpts Request options. + * @param {function} [callback] The callback function. + */ + getClient_(config, callback) { + const self = this; + const hasProjectId = + this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; + if (!hasProjectId && !this.isEmulator) { + this.auth.getProjectId(function(err, projectId) { + if (err) { + callback(err); + return; + } + self.projectId = projectId; + self.getClient_(config, callback); + }); + return; } - ); -}; - -/** - * @typedef {array} CreateTopicResponse - * @property {Topic} 0 The new {@link Topic}. - * @property {object} 1 The full API response. - */ -/** - * @callback CreateTopicCallback - * @param {?Error} err Request error, if any. - * @param {Topic} topic The new {@link Topic}. - * @param {object} apiResponse The full API response. - */ -/** - * Create a topic with the given name. - * - * @see [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create} - * - * @param {string} name Name of the topic. - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {CreateTopicCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.createTopic('my-new-topic', function(err, topic, apiResponse) { - * if (!err) { - * // The topic was created successfully. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.createTopic('my-new-topic').then(function(data) { - * const topic = data[0]; - * const apiResponse = data[1]; - * }); - */ -PubSub.prototype.createTopic = function(name, gaxOpts, callback) { - const topic = this.topic(name); - - const reqOpts = { - name: topic.name, - }; - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; + let gaxClient = this.api[config.client]; + if (!gaxClient) { + // Lazily instantiate client. + gaxClient = new v1[config.client](this.options); + this.api[config.client] = gaxClient; + } + callback(null, gaxClient); } - - this.request( - { - client: 'PublisherClient', - method: 'createTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function(err, resp) { + /** + * Funnel all API requests through this method, to be sure we have a project ID. + * + * @private + * + * @param {object} config Configuration object. + * @param {object} config.gaxOpts GAX options. + * @param {function} config.method The gax method to call. + * @param {object} config.reqOpts Request options. + * @param {function} [callback] The callback function. + */ + request(config, callback) { + const self = this; + this.getClient_(config, function(err, client) { if (err) { - callback(err, null, resp); + callback(err); return; } - - topic.metadata = resp; - callback(null, topic, resp); + let reqOpts = extend(true, {}, config.reqOpts); + reqOpts = replaceProjectIdToken(reqOpts, self.projectId); + client[config.method](reqOpts, config.gaxOpts, callback); + }); + } + /** + * Create a Snapshot object. See {@link Subscription#createSnapshot} to + * create a snapshot. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name The name of the snapshot. + * @returns {Snapshot} A {@link Snapshot} instance. + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const snapshot = pubsub.snapshot('my-snapshot'); + */ + snapshot(name) { + if (!is.string(name)) { + throw new Error('You must supply a valid name for the snapshot.'); } - ); -}; - -/** - * Determine the appropriate endpoint to use for API requests, first trying the - * local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null we try - * Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise the - * default JSON API. - * - * @private - */ -PubSub.prototype.determineBaseUrl_ = function() { - const apiEndpoint = this.options.apiEndpoint; - - if (!apiEndpoint && !process.env.PUBSUB_EMULATOR_HOST) { - return; + return new Snapshot(this, name); } - - const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; - const leadingProtocol = new RegExp('^https*://'); - const trailingSlashes = new RegExp('/*$'); - - const baseUrlParts = baseUrl - .replace(leadingProtocol, '') - .replace(trailingSlashes, '') - .split(':'); - - this.options.servicePath = baseUrlParts[0]; - this.options.port = baseUrlParts[1]; - this.options.sslCreds = grpc.credentials.createInsecure(); - this.isEmulator = true; -}; - -/** - * Query object for listing snapshots. - * - * @typedef {object} GetSnapshotsRequest - * @property {boolean} [autoPaginate=true] Have pagination handled - * automatically. - * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number} [options.pageSize] Maximum number of results to return. - * @property {string} [options.pageToken] Page token. - */ -/** - * @typedef {array} GetSnapshotsResponse - * @property {Snapshot[]} 0 Array of {@link Snapshot} instances. - * @property {object} 1 The full API response. - */ -/** - * @callback GetSnapshotsCallback - * @param {?Error} err Request error, if any. - * @param {Snapshot[]} snapshots Array of {@link Snapshot} instances. - * @param {object} apiResponse The full API response. - */ -/** - * Get a list of snapshots. - * - * @param {GetSnapshotsRequest} [query] Query object for listing snapshots. - * @param {GetSnapshotsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getSnapshots(function(err, snapshots) { - * if (!err) { - * // snapshots is an array of Snapshot objects. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.getSnapshots().then(function(data) { - * const snapshots = data[0]; - * }); - */ -PubSub.prototype.getSnapshots = function(options, callback) { - const self = this; - - if (is.fn(options)) { - callback = options; - options = {}; + /** + * Create a Subscription object. This command by itself will not run any API + * requests. You will receive a {@link Subscription} object, + * which will allow you to interact with a subscription. + * + * @throws {Error} If subscription name is omitted. + * + * @param {string} name - Name of the subscription. + * @param {object=} options - Configuration object. + * @param {object} options.flowControl - Flow control configurations for + * receiving messages. Note that these options do not persist across + * subscription instances. + * @param {number} options.flowControl.maxBytes - The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @param {number} options.flowControl.maxMessages - The maximum number of + * un-acked messages to allow before the subscription pauses incoming + * messages. Default: Infinity. + * @param {number} options.maxConnections - Use this to limit the number of + * connections to be used when sending and receiving messages. Default: 5. + * @returns {Subscription} A {@link Subscription} instance. + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const subscription = pubsub.subscription('my-subscription'); + * + * // Register a listener for `message` events. + * subscription.on('message', function(message) { + * // Called every time a message is received. + * // message.id = ID of the message. + * // message.ackId = ID used to acknowledge the message receival. + * // message.data = Contents of the message. + * // message.attributes = Attributes of the message. + * // message.publishTime = Timestamp when Pub/Sub received the message. + * }); + */ + subscription(name, options) { + if (!name) { + throw new Error('A name must be specified for a subscription.'); + } + return new Subscription(this, name, options); } - - const reqOpts = extend( - { - project: 'projects/' + this.projectId, - }, - options - ); - - delete reqOpts.gaxOpts; - delete reqOpts.autoPaginate; - - const gaxOpts = extend( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); - - this.request( - { - client: 'SubscriberClient', - method: 'listSnapshots', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function() { - const snapshots = arguments[1]; - - if (snapshots) { - arguments[1] = snapshots.map(function(snapshot) { - const snapshotInstance = self.snapshot(snapshot.name); - snapshotInstance.metadata = snapshot; - return snapshotInstance; - }); - } - - callback.apply(null, arguments); + /** + * Create a Topic object. See {@link PubSub#createTopic} to create a topic. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name The name of the topic. + * @returns {Topic} A {@link Topic} instance. + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + */ + topic(name, options) { + if (!name) { + throw new Error('A name must be specified for a topic.'); } - ); -}; + return new Topic(this, name, options); + } +} /** * Get a list of the {@link Snapshot} objects as a readable object stream. @@ -487,117 +788,6 @@ PubSub.prototype.getSnapshots = function(options, callback) { */ PubSub.prototype.getSnapshotsStream = paginator.streamify('getSnapshots'); -/** - * Query object for listing subscriptions. - * - * @typedef {object} GetSubscriptionsRequest - * @property {boolean} [autoPaginate=true] Have pagination handled - * automatically. - * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number} [options.pageSize] Maximum number of results to return. - * @property {string} [options.pageToken] Page token. - * @param {string|Topic} options.topic - The name of the topic to - * list subscriptions from. - */ -/** - * @typedef {array} GetSubscriptionsResponse - * @property {Subscription[]} 0 Array of {@link Subscription} instances. - * @property {object} 1 The full API response. - */ -/** - * @callback GetSubscriptionsCallback - * @param {?Error} err Request error, if any. - * @param {Subscription[]} subscriptions Array of {@link Subscription} instances. - * @param {object} apiResponse The full API response. - */ -/** - * Get a list of the subscriptions registered to all of your project's topics. - * You may optionally provide a query object as the first argument to customize - * the response. - * - * Your provided callback will be invoked with an error object if an API error - * occurred or an array of {@link Subscription} objects. - * - * To get subscriptions for a topic, see {@link Topic}. - * - * @see [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list} - * - * @param {GetSubscriptionsRequest} [query] Query object for listing subscriptions. - * @param {GetSubscriptionsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getSubscriptions(function(err, subscriptions) { - * if (!err) { - * // subscriptions is an array of Subscription objects. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.getSubscriptions().then(function(data) { - * const subscriptions = data[0]; - * }); - */ -PubSub.prototype.getSubscriptions = function(options, callback) { - const self = this; - - if (is.fn(options)) { - callback = options; - options = {}; - } - - let topic = options.topic; - - if (topic) { - if (!(topic instanceof Topic)) { - topic = this.topic(topic); - } - - return topic.getSubscriptions(options, callback); - } - - const reqOpts = extend({}, options); - - reqOpts.project = 'projects/' + this.projectId; - delete reqOpts.gaxOpts; - delete reqOpts.autoPaginate; - - const gaxOpts = extend( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); - - this.request( - { - client: 'SubscriberClient', - method: 'listSubscriptions', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function() { - const subscriptions = arguments[1]; - - if (subscriptions) { - arguments[1] = subscriptions.map(function(sub) { - const subscriptionInstance = self.subscription(sub.name); - subscriptionInstance.metadata = sub; - return subscriptionInstance; - }); - } - - callback.apply(null, arguments); - } - ); -}; - /** * Get a list of the {@link Subscription} objects registered to all of * your project's topics as a readable object stream. @@ -633,110 +823,6 @@ PubSub.prototype.getSubscriptionsStream = paginator.streamify( 'getSubscriptions' ); -/** - * Query object for listing topics. - * - * @typedef {object} GetTopicsRequest - * @property {boolean} [autoPaginate=true] Have pagination handled - * automatically. - * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number} [options.pageSize] Maximum number of results to return. - * @property {string} [options.pageToken] Page token. - */ -/** - * @typedef {array} GetTopicsResponse - * @property {Topic[]} 0 Array of {@link Topic} instances. - * @property {object} 1 The full API response. - */ -/** - * @callback GetTopicsCallback - * @param {?Error} err Request error, if any. - * @param {Topic[]} topics Array of {@link Topic} instances. - * @param {object} apiResponse The full API response. - */ -/** - * Get a list of the topics registered to your project. You may optionally - * provide a query object as the first argument to customize the response. - * - * @see [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list} - * - * @param {GetTopicsRequest} [query] Query object for listing topics. - * @param {GetTopicsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getTopics(function(err, topics) { - * if (!err) { - * // topics is an array of Topic objects. - * } - * }); - * - * //- - * // Customize the query. - * //- - * pubsub.getTopics({ - * pageSize: 3 - * }, function(err, topics) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.getTopics().then(function(data) { - * const topics = data[0]; - * }); - */ -PubSub.prototype.getTopics = function(options, callback) { - const self = this; - - if (is.fn(options)) { - callback = options; - options = {}; - } - - const reqOpts = extend( - { - project: 'projects/' + this.projectId, - }, - options - ); - - delete reqOpts.gaxOpts; - delete reqOpts.autoPaginate; - - const gaxOpts = extend( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); - - this.request( - { - client: 'PublisherClient', - method: 'listTopics', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function() { - const topics = arguments[1]; - - if (topics) { - arguments[1] = topics.map(function(topic) { - const topicInstance = self.topic(topic.name); - topicInstance.metadata = topic; - return topicInstance; - }); - } - - callback.apply(null, arguments); - } - ); -}; - /** * Get a list of the {module:pubsub/topic} objects registered to your project as * a readable object stream. @@ -770,165 +856,6 @@ PubSub.prototype.getTopics = function(options, callback) { */ PubSub.prototype.getTopicsStream = paginator.streamify('getTopics'); -/** - * Get the PubSub client object. - * - * @private - * - * @param {object} config Configuration object. - * @param {object} config.gaxOpts GAX options. - * @param {function} config.method The gax method to call. - * @param {object} config.reqOpts Request options. - * @param {function} [callback] The callback function. - */ -PubSub.prototype.getClient_ = function(config, callback) { - const self = this; - - const hasProjectId = - this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; - - if (!hasProjectId && !this.isEmulator) { - this.auth.getProjectId(function(err, projectId) { - if (err) { - callback(err); - return; - } - - self.projectId = projectId; - self.getClient_(config, callback); - }); - return; - } - - let gaxClient = this.api[config.client]; - - if (!gaxClient) { - // Lazily instantiate client. - gaxClient = new v1[config.client](this.options); - this.api[config.client] = gaxClient; - } - - callback(null, gaxClient); -}; - -/** - * Funnel all API requests through this method, to be sure we have a project ID. - * - * @private - * - * @param {object} config Configuration object. - * @param {object} config.gaxOpts GAX options. - * @param {function} config.method The gax method to call. - * @param {object} config.reqOpts Request options. - * @param {function} [callback] The callback function. - */ -PubSub.prototype.request = function(config, callback) { - const self = this; - - this.getClient_(config, function(err, client) { - if (err) { - callback(err); - return; - } - - let reqOpts = extend(true, {}, config.reqOpts); - reqOpts = replaceProjectIdToken(reqOpts, self.projectId); - - client[config.method](reqOpts, config.gaxOpts, callback); - }); -}; - -/** - * Create a Snapshot object. See {@link Subscription#createSnapshot} to - * create a snapshot. - * - * @throws {Error} If a name is not provided. - * - * @param {string} name The name of the snapshot. - * @returns {Snapshot} A {@link Snapshot} instance. - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const snapshot = pubsub.snapshot('my-snapshot'); - */ -PubSub.prototype.snapshot = function(name) { - if (!is.string(name)) { - throw new Error('You must supply a valid name for the snapshot.'); - } - - return new Snapshot(this, name); -}; - -/** - * Create a Subscription object. This command by itself will not run any API - * requests. You will receive a {@link Subscription} object, - * which will allow you to interact with a subscription. - * - * @throws {Error} If subscription name is omitted. - * - * @param {string} name - Name of the subscription. - * @param {object=} options - Configuration object. - * @param {object} options.flowControl - Flow control configurations for - * receiving messages. Note that these options do not persist across - * subscription instances. - * @param {number} options.flowControl.maxBytes - The maximum number of bytes - * in un-acked messages to allow before the subscription pauses incoming - * messages. Defaults to 20% of free memory. - * @param {number} options.flowControl.maxMessages - The maximum number of - * un-acked messages to allow before the subscription pauses incoming - * messages. Default: Infinity. - * @param {number} options.maxConnections - Use this to limit the number of - * connections to be used when sending and receiving messages. Default: 5. - * @returns {Subscription} A {@link Subscription} instance. - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const subscription = pubsub.subscription('my-subscription'); - * - * // Register a listener for `message` events. - * subscription.on('message', function(message) { - * // Called every time a message is received. - * // message.id = ID of the message. - * // message.ackId = ID used to acknowledge the message receival. - * // message.data = Contents of the message. - * // message.attributes = Attributes of the message. - * // message.publishTime = Timestamp when Pub/Sub received the message. - * }); - */ -PubSub.prototype.subscription = function(name, options) { - if (!name) { - throw new Error('A name must be specified for a subscription.'); - } - - return new Subscription(this, name, options); -}; - -/** - * Create a Topic object. See {@link PubSub#createTopic} to create a topic. - * - * @throws {Error} If a name is not provided. - * - * @param {string} name The name of the topic. - * @returns {Topic} A {@link Topic} instance. - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - */ -PubSub.prototype.topic = function(name, options) { - if (!name) { - throw new Error('A name must be specified for a topic.'); - } - - return new Topic(this, name, options); -}; - /*! Developer Documentation * * These methods can be agto-paginated. diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index 4bb557c631d..4c8ee52f9c9 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -48,215 +48,193 @@ const is = require('is'); * const topic = pubsub.topic('my-topic'); * const publisher = topic.publisher(); */ -function Publisher(topic, options) { - if (topic.Promise) { - this.Promise = topic.Promise; - } - - options = extend( - true, - { +class Publisher { + constructor(topic, options) { + if (topic.Promise) { + this.Promise = topic.Promise; + } + options = extend( + true, + { + batching: { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 100, + }, + }, + options + ); + /** + * The topic of this publisher. + * + * @name Publisher#topic + * @type {Topic} topic + */ + this.topic = topic; + // this object keeps track of all messages scheduled to be published + // queued is essentially the `messages` field for the publish rpc req opts + // bytes is used to track the size of the combined payload + // callbacks is an array of callbacks - each callback is associated with a + // specific message. + this.inventory_ = { + callbacks: [], + queued: [], + bytes: 0, + }; + this.settings = { batching: { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 100, + maxBytes: Math.min(options.batching.maxBytes, Math.pow(1024, 2) * 9), + maxMessages: Math.min(options.batching.maxMessages, 1000), + maxMilliseconds: options.batching.maxMilliseconds, }, - }, - options - ); - + gaxOpts: options.gaxOpts, + }; + this.timeoutHandle_ = null; + } + /** + * @typedef {array} PublisherPublishResponse + * @property {string} 0 The id for the message. + */ /** - * The topic of this publisher. + * @callback PublisherPublishCallback + * @param {?Error} err Request error, if any. + * @param {string} messageId The id for the message. + */ + /** + * Publish the provided message. + * + * @throws {TypeError} If data is not a Buffer object. + * @throws {TypeError} If any value in `attributes` object is not a string. * - * @name Publisher#topic - * @type {Topic} topic + * @param {buffer} data The message data. This must come in the form of a + * Buffer object. + * @param {object.} [attributes] Attributes for this message. + * @param {PublisherPublishCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const publisher = topic.publisher(); + * + * const data = Buffer.from('Hello, world!'); + * + * const callback = function(err, messageId) { + * if (err) { + * // Error handling omitted. + * } + * }; + * + * publisher.publish(data, callback); + * + * //- + * // Optionally you can provide an object containing attributes for the + * // message. Note that all values in the object must be strings. + * //- + * const attributes = { + * key: 'value' + * }; + * + * publisher.publish(data, attributes, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * publisher.publish(data).then(function(messageId) {}); */ - this.topic = topic; - - // this object keeps track of all messages scheduled to be published - // queued is essentially the `messages` field for the publish rpc req opts - // bytes is used to track the size of the combined payload - // callbacks is an array of callbacks - each callback is associated with a - // specific message. - this.inventory_ = { - callbacks: [], - queued: [], - bytes: 0, - }; - - this.settings = { - batching: { - maxBytes: Math.min(options.batching.maxBytes, Math.pow(1024, 2) * 9), - maxMessages: Math.min(options.batching.maxMessages, 1000), - maxMilliseconds: options.batching.maxMilliseconds, - }, - gaxOpts: options.gaxOpts, - }; - - this.timeoutHandle_ = null; -} - -/** - * @typedef {array} PublisherPublishResponse - * @property {string} 0 The id for the message. - */ -/** - * @callback PublisherPublishCallback - * @param {?Error} err Request error, if any. - * @param {string} messageId The id for the message. - */ -/** - * Publish the provided message. - * - * @throws {TypeError} If data is not a Buffer object. - * @throws {TypeError} If any value in `attributes` object is not a string. - * - * @param {buffer} data The message data. This must come in the form of a - * Buffer object. - * @param {object.} [attributes] Attributes for this message. - * @param {PublisherPublishCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const publisher = topic.publisher(); - * - * const data = Buffer.from('Hello, world!'); - * - * const callback = function(err, messageId) { - * if (err) { - * // Error handling omitted. - * } - * }; - * - * publisher.publish(data, callback); - * - * //- - * // Optionally you can provide an object containing attributes for the - * // message. Note that all values in the object must be strings. - * //- - * const attributes = { - * key: 'value' - * }; - * - * publisher.publish(data, attributes, callback); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * publisher.publish(data).then(function(messageId) {}); - */ -Publisher.prototype.publish = function(data, attributes, callback) { - if (!(data instanceof Buffer)) { - throw new TypeError('Data must be in the form of a Buffer.'); - } - - if (is.fn(attributes)) { - callback = attributes; - attributes = {}; - } - - // Ensure the `attributes` object only has string values - for (const key in attributes) { - const value = attributes[key]; - - if (!is.string(value)) { - throw new TypeError(`All attributes must be in the form of a string. + publish(data, attributes, callback) { + if (!(data instanceof Buffer)) { + throw new TypeError('Data must be in the form of a Buffer.'); + } + if (is.fn(attributes)) { + callback = attributes; + attributes = {}; + } + // Ensure the `attributes` object only has string values + for (const key in attributes) { + const value = attributes[key]; + if (!is.string(value)) { + throw new TypeError(`All attributes must be in the form of a string. \nInvalid value of type "${typeof value}" provided for "${key}".`); + } + } + const opts = this.settings.batching; + // if this message puts us over the maxBytes option, then let's ship + // what we have and add it to the next batch + if (this.inventory_.bytes + data.length > opts.maxBytes) { + this.publish_(); + } + // add it to the queue! + this.queue_(data, attributes, callback); + // next lets check if this message brings us to the message cap or if we + // magically hit the max byte limit + const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; + if (this.inventory_.bytes === opts.maxBytes || hasMaxMessages) { + this.publish_(); + return; + } + // otherwise let's set a timeout to send the next batch + if (!this.timeoutHandle_) { + this.timeoutHandle_ = setTimeout( + this.publish_.bind(this), + opts.maxMilliseconds + ); } } - - const opts = this.settings.batching; - - // if this message puts us over the maxBytes option, then let's ship - // what we have and add it to the next batch - if (this.inventory_.bytes + data.length > opts.maxBytes) { - this.publish_(); - } - - // add it to the queue! - this.queue_(data, attributes, callback); - - // next lets check if this message brings us to the message cap or if we - // magically hit the max byte limit - const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; - - if (this.inventory_.bytes === opts.maxBytes || hasMaxMessages) { - this.publish_(); - return; - } - - // otherwise let's set a timeout to send the next batch - if (!this.timeoutHandle_) { - this.timeoutHandle_ = setTimeout( - this.publish_.bind(this), - opts.maxMilliseconds + /** + * This publishes a batch of messages and should never be called directly. + * + * @private + */ + publish_() { + const callbacks = this.inventory_.callbacks; + const messages = this.inventory_.queued; + this.inventory_.callbacks = []; + this.inventory_.queued = []; + this.inventory_.bytes = 0; + clearTimeout(this.timeoutHandle_); + this.timeoutHandle_ = null; + const reqOpts = { + topic: this.topic.name, + messages: messages, + }; + this.topic.request( + { + client: 'PublisherClient', + method: 'publish', + reqOpts: reqOpts, + gaxOpts: this.settings.gaxOpts, + }, + function(err, resp) { + const messageIds = arrify(resp && resp.messageIds); + each(callbacks, function(callback, next) { + const messageId = messageIds[callbacks.indexOf(callback)]; + callback(err, messageId); + next(); + }); + } ); } -}; - -/** - * This publishes a batch of messages and should never be called directly. - * - * @private - */ -Publisher.prototype.publish_ = function() { - const callbacks = this.inventory_.callbacks; - const messages = this.inventory_.queued; - - this.inventory_.callbacks = []; - this.inventory_.queued = []; - this.inventory_.bytes = 0; - - clearTimeout(this.timeoutHandle_); - this.timeoutHandle_ = null; - - const reqOpts = { - topic: this.topic.name, - messages: messages, - }; - - this.topic.request( - { - client: 'PublisherClient', - method: 'publish', - reqOpts: reqOpts, - gaxOpts: this.settings.gaxOpts, - }, - function(err, resp) { - const messageIds = arrify(resp && resp.messageIds); - - each(callbacks, function(callback, next) { - const messageId = messageIds[callbacks.indexOf(callback)]; - - callback(err, messageId); - next(); - }); - } - ); -}; - -/** - * Queues message to be sent to the server. - * - * @private - * - * @param {buffer} data The message data. - * @param {object} attributes The message attributes. - * @param {function} callback The callback function. - */ -Publisher.prototype.queue_ = function(data, attrs, callback) { - this.inventory_.queued.push({ - data: data, - attributes: attrs, - }); - - this.inventory_.bytes += data.length; - this.inventory_.callbacks.push(callback); -}; + /** + * Queues message to be sent to the server. + * + * @private + * + * @param {buffer} data The message data. + * @param {object} attributes The message attributes. + * @param {function} callback The callback function. + */ + queue_(data, attrs, callback) { + this.inventory_.queued.push({ + data: data, + attributes: attrs, + }); + this.inventory_.bytes += data.length; + this.inventory_.callbacks.push(callback); + } +} /*! Developer Documentation * diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index e82af4b22d3..1f22a04318c 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -84,129 +84,124 @@ const is = require('is'); * } * }); */ -function Snapshot(parent, name) { - if (parent.Promise) { - this.Promise = parent.Promise; +class Snapshot { + constructor(parent, name) { + if (parent.Promise) { + this.Promise = parent.Promise; + } + this.parent = parent; + this.name = Snapshot.formatName_(parent.projectId, name); + if (is.fn(parent.createSnapshot)) { + /** + * Create a snapshot with the given name. + * + * **This is only available if you accessed this object through + * {@link Subscription#snapshot}.** + * + * @method Snapshot#create + * @param {string} name Name of the snapshot. + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error from the API call, may be null. + * @param {Snapshot} callback.snapshot The newly created + * snapshot. + * @param {object} callback.apiResponse The full API response from the + * service. + * + * @example + * const subscription = pubsub.subscription('my-subscription'); + * const snapshot = subscription.snapshot('my-snapshot'); + * + * const callback = function(err, snapshot, apiResponse) { + * if (!err) { + * // The snapshot was created successfully. + * } + * }; + * + * snapshot.create('my-snapshot', callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.create('my-snapshot').then(function(data) { + * const snapshot = data[0]; + * const apiResponse = data[1]; + * }); + */ + this.create = parent.createSnapshot.bind(parent, name); + } + if (is.fn(parent.seek)) { + /** + * Seeks an existing subscription to the snapshot. + * + * **This is only available if you accessed this object through + * {@link Subscription#snapshot}.** + * + * @method Snapshot#seek + * @param {function} callback The callback function. + * @param {?error} callback.err An error from the API call, may be null. + * @param {object} callback.apiResponse The full API response from the + * service. + * + * @example + * const subscription = pubsub.subscription('my-subscription'); + * const snapshot = subscription.snapshot('my-snapshot'); + * + * snapshot.seek(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.seek().then(function(data) { + * const apiResponse = data[0]; + * }); + */ + this.seek = parent.seek.bind(parent, name); + } } - - this.parent = parent; - this.name = Snapshot.formatName_(parent.projectId, name); - - if (is.fn(parent.createSnapshot)) { - /** - * Create a snapshot with the given name. - * - * **This is only available if you accessed this object through - * {@link Subscription#snapshot}.** - * - * @method Snapshot#create - * @param {string} name Name of the snapshot. - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error from the API call, may be null. - * @param {Snapshot} callback.snapshot The newly created - * snapshot. - * @param {object} callback.apiResponse The full API response from the - * service. - * - * @example - * const subscription = pubsub.subscription('my-subscription'); - * const snapshot = subscription.snapshot('my-snapshot'); - * - * const callback = function(err, snapshot, apiResponse) { - * if (!err) { - * // The snapshot was created successfully. - * } - * }; - * - * snapshot.create('my-snapshot', callback); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * snapshot.create('my-snapshot').then(function(data) { - * const snapshot = data[0]; - * const apiResponse = data[1]; - * }); - */ - this.create = parent.createSnapshot.bind(parent, name); + /** + * Delete the snapshot. + * + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while making this + * request. + * @param {object} callback.apiResponse The full API response from the + * service. + * + * @example + * snapshot.delete(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.delete().then(function(data) { + * const apiResponse = data[0]; + * }); + */ + delete(callback) { + const reqOpts = { + snapshot: this.name, + }; + callback = callback || util.noop; + this.parent.request( + { + client: 'SubscriberClient', + method: 'deleteSnapshot', + reqOpts: reqOpts, + }, + callback + ); } - - if (is.fn(parent.seek)) { - /** - * Seeks an existing subscription to the snapshot. - * - * **This is only available if you accessed this object through - * {@link Subscription#snapshot}.** - * - * @method Snapshot#seek - * @param {function} callback The callback function. - * @param {?error} callback.err An error from the API call, may be null. - * @param {object} callback.apiResponse The full API response from the - * service. - * - * @example - * const subscription = pubsub.subscription('my-subscription'); - * const snapshot = subscription.snapshot('my-snapshot'); - * - * snapshot.seek(function(err, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * snapshot.seek().then(function(data) { - * const apiResponse = data[0]; - * }); - */ - this.seek = parent.seek.bind(parent, name); + /*@ + * Format the name of a snapshot. A snapshot's full name is in the format of + * projects/{projectId}/snapshots/{snapshotName} + * + * @private + */ + static formatName_(projectId, name) { + return 'projects/' + projectId + '/snapshots/' + name.split('/').pop(); } } -/*@ - * Format the name of a snapshot. A snapshot's full name is in the format of - * projects/{projectId}/snapshots/{snapshotName} - * - * @private - */ -Snapshot.formatName_ = function(projectId, name) { - return 'projects/' + projectId + '/snapshots/' + name.split('/').pop(); -}; - -/** - * Delete the snapshot. - * - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error returned while making this - * request. - * @param {object} callback.apiResponse The full API response from the - * service. - * - * @example - * snapshot.delete(function(err, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * snapshot.delete().then(function(data) { - * const apiResponse = data[0]; - * }); - */ -Snapshot.prototype.delete = function(callback) { - const reqOpts = { - snapshot: this.name, - }; - - callback = callback || util.noop; - - this.parent.request( - { - client: 'SubscriberClient', - method: 'deleteSnapshot', - reqOpts: reqOpts, - }, - callback - ); -}; - /*! Developer Documentation * * All async methods (except for streams) will return a Promise in the event diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js index a66d65f23f8..16940a069c8 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.js @@ -21,14 +21,13 @@ const chunk = require('lodash.chunk'); const util = require('./util'); const {promisify} = require('@google-cloud/promisify'); const delay = require('delay'); -const events = require('events'); +const {EventEmitter} = require('events'); const extend = require('extend'); const is = require('is'); const os = require('os'); -const nodeUtil = require('util'); -const ConnectionPool = require('./connection-pool.js'); -const Histogram = require('./histogram.js'); +const ConnectionPool = require('./connection-pool'); +const Histogram = require('./histogram'); /** * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline @@ -45,518 +44,445 @@ const MAX_ACK_IDS_PER_REQUEST = 3000; * * @param {object} options Configuration object. */ -function Subscriber(options) { - options = options || {}; - - this.histogram = new Histogram(); - this.latency_ = new Histogram({min: 0}); - - this.connectionPool = null; - this.ackDeadline = 10000; - this.maxConnections = options.maxConnections || 5; - - this.inventory_ = { - lease: [], - ack: [], - nack: [], - bytes: 0, - }; - - this.flowControl = extend( - { - maxBytes: os.freemem() * 0.2, - maxMessages: 100, - }, - options.flowControl - ); - - this.batching = extend( - { - maxMilliseconds: 100, - }, - options.batching - ); - - this.flushTimeoutHandle_ = null; - this.leaseTimeoutHandle_ = null; - this.userClosed_ = false; - this.isOpen = false; - this.messageListeners = 0; - - // As of right now we do not write any acks/modacks to the pull streams. - // But with allowing users to opt out of using streaming pulls altogether on - // the horizon, we may need to support this feature again in the near future. - this.writeToStreams_ = false; - - events.EventEmitter.call(this); - - this.listenForEvents_(); -} - -nodeUtil.inherits(Subscriber, events.EventEmitter); - -/*! - * Acks the provided message. If the connection pool is absent, it will be - * placed in an internal queue and sent out after 1 second or if the pool is - * re-opened before the timeout hits. - * - * @private - * - * @param {object} message The message object. - */ -Subscriber.prototype.ack_ = function(message) { - const breakLease = this.breakLease_.bind(this, message); - - this.histogram.add(Date.now() - message.received); - - if (this.writeToStreams_ && this.isConnected_()) { - this.acknowledge_(message.ackId, message.connectionId).then(breakLease); - return; +class Subscriber extends EventEmitter { + constructor(options) { + super(); + options = options || {}; + this.histogram = new Histogram(); + this.latency_ = new Histogram({min: 0}); + this.connectionPool = null; + this.ackDeadline = 10000; + this.maxConnections = options.maxConnections || 5; + this.inventory_ = { + lease: [], + ack: [], + nack: [], + bytes: 0, + }; + this.flowControl = extend( + { + maxBytes: os.freemem() * 0.2, + maxMessages: 100, + }, + options.flowControl + ); + this.batching = extend( + { + maxMilliseconds: 100, + }, + options.batching + ); + this.flushTimeoutHandle_ = null; + this.leaseTimeoutHandle_ = null; + this.userClosed_ = false; + this.isOpen = false; + this.messageListeners = 0; + // As of right now we do not write any acks/modacks to the pull streams. + // But with allowing users to opt out of using streaming pulls altogether on + // the horizon, we may need to support this feature again in the near future. + this.writeToStreams_ = false; + this.listenForEvents_(); } - - this.inventory_.ack.push(message.ackId); - this.setFlushTimeout_().then(breakLease); -}; - -/*! - * Sends an acknowledge request for the provided ack ids. - * - * @private - * - * @param {string|string[]} ackIds The ack IDs to acknowledge. - * @param {string} [connId] Connection ID to send request on. - * @return {Promise} - */ -Subscriber.prototype.acknowledge_ = function(ackIds, connId) { - const self = this; - - ackIds = arrify(ackIds); - - const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( - ackIdChunk - ) { - if (self.writeToStreams_ && self.isConnected_()) { - return self.writeTo_(connId, {ackIds: ackIdChunk}); + /*! + * Acks the provided message. If the connection pool is absent, it will be + * placed in an internal queue and sent out after 1 second or if the pool is + * re-opened before the timeout hits. + * + * @private + * + * @param {object} message The message object. + */ + ack_(message) { + const breakLease = this.breakLease_.bind(this, message); + this.histogram.add(Date.now() - message.received); + if (this.writeToStreams_ && this.isConnected_()) { + this.acknowledge_(message.ackId, message.connectionId).then(breakLease); + return; } - - return promisify(self.request).call(self, { - client: 'SubscriberClient', - method: 'acknowledge', - reqOpts: { - subscription: self.name, - ackIds: ackIdChunk, - }, + this.inventory_.ack.push(message.ackId); + this.setFlushTimeout_().then(breakLease); + } + /*! + * Sends an acknowledge request for the provided ack ids. + * + * @private + * + * @param {string|string[]} ackIds The ack IDs to acknowledge. + * @param {string} [connId] Connection ID to send request on. + * @return {Promise} + */ + acknowledge_(ackIds, connId) { + const self = this; + ackIds = arrify(ackIds); + const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( + ackIdChunk + ) { + if (self.writeToStreams_ && self.isConnected_()) { + return self.writeTo_(connId, {ackIds: ackIdChunk}); + } + return promisify(self.request).call(self, { + client: 'SubscriberClient', + method: 'acknowledge', + reqOpts: { + subscription: self.name, + ackIds: ackIdChunk, + }, + }); + }); + return Promise.all(promises).catch(function(err) { + self.emit('error', err); }); - }); - - return Promise.all(promises).catch(function(err) { - self.emit('error', err); - }); -}; - -/*! - * Breaks the lease on a message. Essentially this means we no longer treat the - * message as being un-acked and count it towards the flow control limits. - * - * If the pool was previously paused and we freed up space, we'll continue to - * recieve messages. - * - * @private - * - * @param {object} message The message object. - */ -Subscriber.prototype.breakLease_ = function(message) { - const messageIndex = this.inventory_.lease.indexOf(message.ackId); - - if (messageIndex === -1) { - return; } - - this.inventory_.lease.splice(messageIndex, 1); - this.inventory_.bytes -= message.length; - - const pool = this.connectionPool; - - if (pool && pool.isPaused && !this.hasMaxMessages_()) { - pool.resume(); + /*! + * Breaks the lease on a message. Essentially this means we no longer treat the + * message as being un-acked and count it towards the flow control limits. + * + * If the pool was previously paused and we freed up space, we'll continue to + * recieve messages. + * + * @private + * + * @param {object} message The message object. + */ + breakLease_(message) { + const messageIndex = this.inventory_.lease.indexOf(message.ackId); + if (messageIndex === -1) { + return; + } + this.inventory_.lease.splice(messageIndex, 1); + this.inventory_.bytes -= message.length; + const pool = this.connectionPool; + if (pool && pool.isPaused && !this.hasMaxMessages_()) { + pool.resume(); + } + if (!this.inventory_.lease.length) { + clearTimeout(this.leaseTimeoutHandle_); + this.leaseTimeoutHandle_ = null; + } } - - if (!this.inventory_.lease.length) { + /** + * Closes the Subscriber, once this is called you will no longer receive + * message events unless you add a new message listener. + * + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while closing the + * Subscriber. + * + * @example + * Subscriber.close(function(err) { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * Subscriber.close().then(function() {}); + */ + close(callback) { + const self = this; + this.userClosed_ = true; + const inventory = this.inventory_; + inventory.lease.length = inventory.bytes = 0; clearTimeout(this.leaseTimeoutHandle_); this.leaseTimeoutHandle_ = null; + this.flushQueues_().then(function() { + self.closeConnection_(callback); + }); } -}; - -/** - * Closes the Subscriber, once this is called you will no longer receive - * message events unless you add a new message listener. - * - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error returned while closing the - * Subscriber. - * - * @example - * Subscriber.close(function(err) { - * if (err) { - * // Error handling omitted. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * Subscriber.close().then(function() {}); - */ -Subscriber.prototype.close = function(callback) { - const self = this; - - this.userClosed_ = true; - - const inventory = this.inventory_; - inventory.lease.length = inventory.bytes = 0; - - clearTimeout(this.leaseTimeoutHandle_); - this.leaseTimeoutHandle_ = null; - - this.flushQueues_().then(function() { - self.closeConnection_(callback); - }); -}; - -/*! - * Closes the connection pool. - * - * @private - * - * @param {function} [callback] The callback function. - * @param {?error} err An error returned from this request. - */ -Subscriber.prototype.closeConnection_ = function(callback) { - this.isOpen = false; - - if (this.connectionPool) { - this.connectionPool.close(callback || util.noop); - this.connectionPool = null; - } else if (is.fn(callback)) { - setImmediate(callback); + /*! + * Closes the connection pool. + * + * @private + * + * @param {function} [callback] The callback function. + * @param {?error} err An error returned from this request. + */ + closeConnection_(callback) { + this.isOpen = false; + if (this.connectionPool) { + this.connectionPool.close(callback || util.noop); + this.connectionPool = null; + } else if (is.fn(callback)) { + setImmediate(callback); + } } -}; - -/*! - * Flushes internal queues. These can build up if a user attempts to ack/nack - * while there is no connection pool (e.g. after they called close). - * - * Typically this will only be called either after a timeout or when a - * connection is re-opened. - * - * Any errors that occur will be emitted via `error` events. - * - * @private - */ -Subscriber.prototype.flushQueues_ = function() { - const self = this; - - if (this.flushTimeoutHandle_) { - this.flushTimeoutHandle_.clear(); - this.flushTimeoutHandle_ = null; + /*! + * Flushes internal queues. These can build up if a user attempts to ack/nack + * while there is no connection pool (e.g. after they called close). + * + * Typically this will only be called either after a timeout or when a + * connection is re-opened. + * + * Any errors that occur will be emitted via `error` events. + * + * @private + */ + flushQueues_() { + const self = this; + if (this.flushTimeoutHandle_) { + this.flushTimeoutHandle_.clear(); + this.flushTimeoutHandle_ = null; + } + const acks = this.inventory_.ack; + const nacks = this.inventory_.nack; + if (!acks.length && !nacks.length) { + return Promise.resolve(); + } + const requests = []; + if (acks.length) { + requests.push( + this.acknowledge_(acks).then(function() { + self.inventory_.ack = []; + }) + ); + } + if (nacks.length) { + requests.push( + this.modifyAckDeadline_(nacks, 0).then(function() { + self.inventory_.nack = []; + }) + ); + } + return Promise.all(requests); } - - const acks = this.inventory_.ack; - const nacks = this.inventory_.nack; - - if (!acks.length && !nacks.length) { - return Promise.resolve(); + /*! + * Checks to see if we currently have a streaming connection. + * + * @private + * + * @return {boolean} + */ + isConnected_() { + return !!(this.connectionPool && this.connectionPool.isConnected()); } - - const requests = []; - - if (acks.length) { - requests.push( - this.acknowledge_(acks).then(function() { - self.inventory_.ack = []; - }) + /*! + * Checks to see if this Subscriber has hit any of the flow control + * thresholds. + * + * @private + * + * @return {boolean} + */ + hasMaxMessages_() { + return ( + this.inventory_.lease.length >= this.flowControl.maxMessages || + this.inventory_.bytes >= this.flowControl.maxBytes ); } - - if (nacks.length) { - requests.push( - this.modifyAckDeadline_(nacks, 0).then(function() { - self.inventory_.nack = []; - }) + /*! + * Leases a message. This will add the message to our inventory list and then + * modifiy the ack deadline for the user if they exceed the specified ack + * deadline. + * + * @private + * + * @param {object} message The message object. + */ + leaseMessage_(message) { + this.modifyAckDeadline_( + message.ackId, + this.ackDeadline / 1000, + message.connectionId ); + this.inventory_.lease.push(message.ackId); + this.inventory_.bytes += message.length; + this.setLeaseTimeout_(); + return message; } - - return Promise.all(requests); -}; - -/*! - * Checks to see if we currently have a streaming connection. - * - * @private - * - * @return {boolean} - */ -Subscriber.prototype.isConnected_ = function() { - return !!(this.connectionPool && this.connectionPool.isConnected()); -}; - -/*! - * Checks to see if this Subscriber has hit any of the flow control - * thresholds. - * - * @private - * - * @return {boolean} - */ -Subscriber.prototype.hasMaxMessages_ = function() { - return ( - this.inventory_.lease.length >= this.flowControl.maxMessages || - this.inventory_.bytes >= this.flowControl.maxBytes - ); -}; - -/*! - * Leases a message. This will add the message to our inventory list and then - * modifiy the ack deadline for the user if they exceed the specified ack - * deadline. - * - * @private - * - * @param {object} message The message object. - */ -Subscriber.prototype.leaseMessage_ = function(message) { - this.modifyAckDeadline_( - message.ackId, - this.ackDeadline / 1000, - message.connectionId - ); - - this.inventory_.lease.push(message.ackId); - this.inventory_.bytes += message.length; - this.setLeaseTimeout_(); - - return message; -}; - -/*! - * Begin listening for events on the Subscriber. This method keeps track of - * how many message listeners are assigned, and then removed, making sure - * polling is handled automatically. - * - * As long as there is one active message listener, the connection is open. As - * soon as there are no more message listeners, the connection is closed. - * - * @private - * - * @example - * Subscriber.listenForEvents_(); - */ -Subscriber.prototype.listenForEvents_ = function() { - const self = this; - - this.on('newListener', function(event) { - if (event === 'message') { - self.messageListeners++; - - if (!self.connectionPool) { - self.userClosed_ = false; - self.openConnection_(); + /*! + * Begin listening for events on the Subscriber. This method keeps track of + * how many message listeners are assigned, and then removed, making sure + * polling is handled automatically. + * + * As long as there is one active message listener, the connection is open. As + * soon as there are no more message listeners, the connection is closed. + * + * @private + * + * @example + * Subscriber.listenForEvents_(); + */ + listenForEvents_() { + const self = this; + this.on('newListener', function(event) { + if (event === 'message') { + self.messageListeners++; + if (!self.connectionPool) { + self.userClosed_ = false; + self.openConnection_(); + } } - } - }); - - this.on('removeListener', function(event) { - if (event === 'message' && --self.messageListeners === 0) { - self.closeConnection_(); - } - }); -}; - -/*! - * Sends a modifyAckDeadline request for the provided ack ids. - * - * @private - * - * @param {string|string[]} ackIds The ack IDs to acknowledge. - * @param {number} deadline The dealine in seconds. - * @param {string=} connId Connection ID to send request on. - * @return {Promise} - */ -Subscriber.prototype.modifyAckDeadline_ = function(ackIds, deadline, connId) { - const self = this; - - ackIds = arrify(ackIds); - - const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( - ackIdChunk - ) { - if (self.writeToStreams_ && self.isConnected_()) { - return self.writeTo_(connId, { - modifyDeadlineAckIds: ackIdChunk, - modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), + }); + this.on('removeListener', function(event) { + if (event === 'message' && --self.messageListeners === 0) { + self.closeConnection_(); + } + }); + } + /*! + * Sends a modifyAckDeadline request for the provided ack ids. + * + * @private + * + * @param {string|string[]} ackIds The ack IDs to acknowledge. + * @param {number} deadline The dealine in seconds. + * @param {string=} connId Connection ID to send request on. + * @return {Promise} + */ + modifyAckDeadline_(ackIds, deadline, connId) { + const self = this; + ackIds = arrify(ackIds); + const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( + ackIdChunk + ) { + if (self.writeToStreams_ && self.isConnected_()) { + return self.writeTo_(connId, { + modifyDeadlineAckIds: ackIdChunk, + modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), + }); + } + return promisify(self.request).call(self, { + client: 'SubscriberClient', + method: 'modifyAckDeadline', + reqOpts: { + subscription: self.name, + ackDeadlineSeconds: deadline, + ackIds: ackIdChunk, + }, }); + }); + return Promise.all(promises).catch(function(err) { + self.emit('error', err); + }); + } + /*! + * Nacks the provided message. If the connection pool is absent, it will be + * placed in an internal queue and sent out after 1 second or if the pool is + * re-opened before the timeout hits. + * + * @private + * + * @param {object} message - The message object. + */ + nack_(message) { + const breakLease = this.breakLease_.bind(this, message); + if (this.isConnected_()) { + this.modifyAckDeadline_(message.ackId, 0, message.connectionId).then( + breakLease + ); + return; } - - return promisify(self.request).call(self, { - client: 'SubscriberClient', - method: 'modifyAckDeadline', - reqOpts: { - subscription: self.name, - ackDeadlineSeconds: deadline, - ackIds: ackIdChunk, - }, + this.inventory_.nack.push(message.ackId); + this.setFlushTimeout_().then(breakLease); + } + /*! + * Opens the ConnectionPool. + * + * @private + */ + openConnection_() { + const self = this; + const pool = (this.connectionPool = new ConnectionPool(this)); + this.isOpen = true; + pool.on('error', function(err) { + self.emit('error', err); + }); + pool.on('message', function(message) { + self.emit('message', self.leaseMessage_(message)); + if (!pool.isPaused && self.hasMaxMessages_()) { + pool.pause(); + } + }); + pool.once('connected', function() { + self.flushQueues_(); }); - }); - - return Promise.all(promises).catch(function(err) { - self.emit('error', err); - }); -}; - -/*! - * Nacks the provided message. If the connection pool is absent, it will be - * placed in an internal queue and sent out after 1 second or if the pool is - * re-opened before the timeout hits. - * - * @private - * - * @param {object} message - The message object. - */ -Subscriber.prototype.nack_ = function(message) { - const breakLease = this.breakLease_.bind(this, message); - - if (this.isConnected_()) { - this.modifyAckDeadline_(message.ackId, 0, message.connectionId).then( - breakLease - ); - return; } - - this.inventory_.nack.push(message.ackId); - this.setFlushTimeout_().then(breakLease); -}; - -/*! - * Opens the ConnectionPool. - * - * @private - */ -Subscriber.prototype.openConnection_ = function() { - const self = this; - const pool = (this.connectionPool = new ConnectionPool(this)); - - this.isOpen = true; - - pool.on('error', function(err) { - self.emit('error', err); - }); - - pool.on('message', function(message) { - self.emit('message', self.leaseMessage_(message)); - - if (!pool.isPaused && self.hasMaxMessages_()) { - pool.pause(); + /*! + * Modifies the ack deadline on messages that have yet to be acked. We update + * the ack deadline to the 99th percentile of known ack times. + * + * @private + */ + renewLeases_() { + const self = this; + clearTimeout(this.leaseTimeoutHandle_); + this.leaseTimeoutHandle_ = null; + if (!this.inventory_.lease.length) { + return; } - }); - - pool.once('connected', function() { - self.flushQueues_(); - }); -}; - -/*! - * Modifies the ack deadline on messages that have yet to be acked. We update - * the ack deadline to the 99th percentile of known ack times. - * - * @private - */ -Subscriber.prototype.renewLeases_ = function() { - const self = this; - - clearTimeout(this.leaseTimeoutHandle_); - this.leaseTimeoutHandle_ = null; - - if (!this.inventory_.lease.length) { - return; + this.ackDeadline = this.histogram.percentile(99); + const ackIds = this.inventory_.lease.slice(); + const ackDeadlineSeconds = this.ackDeadline / 1000; + this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(function() { + self.setLeaseTimeout_(); + }); } - - this.ackDeadline = this.histogram.percentile(99); - - const ackIds = this.inventory_.lease.slice(); - const ackDeadlineSeconds = this.ackDeadline / 1000; - - this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(function() { - self.setLeaseTimeout_(); - }); -}; - -/*! - * Sets a timeout to flush any acks/nacks that have been made since the pool has - * closed. - * - * @private - */ -Subscriber.prototype.setFlushTimeout_ = function() { - if (!this.flushTimeoutHandle_) { - const timeout = delay(this.batching.maxMilliseconds); - const promise = timeout.then(this.flushQueues_.bind(this)).catch(util.noop); - - promise.clear = timeout.clear.bind(timeout); - this.flushTimeoutHandle_ = promise; + /*! + * Sets a timeout to flush any acks/nacks that have been made since the pool has + * closed. + * + * @private + */ + setFlushTimeout_() { + if (!this.flushTimeoutHandle_) { + const timeout = delay(this.batching.maxMilliseconds); + const promise = timeout + .then(this.flushQueues_.bind(this)) + .catch(util.noop); + promise.clear = timeout.clear.bind(timeout); + this.flushTimeoutHandle_ = promise; + } + return this.flushTimeoutHandle_; } - - return this.flushTimeoutHandle_; -}; - -/*! - * Sets a timeout to modify the ack deadlines for any unacked/unnacked messages, - * renewing their lease. - * - * @private - */ -Subscriber.prototype.setLeaseTimeout_ = function() { - if (this.leaseTimeoutHandle_ || !this.isOpen) { - return; + /*! + * Sets a timeout to modify the ack deadlines for any unacked/unnacked messages, + * renewing their lease. + * + * @private + */ + setLeaseTimeout_() { + if (this.leaseTimeoutHandle_ || !this.isOpen) { + return; + } + const latency = this.latency_.percentile(99); + const timeout = Math.random() * this.ackDeadline * 0.9 - latency; + this.leaseTimeoutHandle_ = setTimeout( + this.renewLeases_.bind(this), + timeout + ); } - - const latency = this.latency_.percentile(99); - const timeout = Math.random() * this.ackDeadline * 0.9 - latency; - - this.leaseTimeoutHandle_ = setTimeout(this.renewLeases_.bind(this), timeout); -}; - -/** - * Writes to specified duplex stream. This is useful for capturing write - * latencies that can later be used to adjust the auto lease timeout. - * - * @private - * - * @param {string} connId The ID of the connection to write to. - * @param {object} data The data to be written to the stream. - * @returns {Promise} - */ -Subscriber.prototype.writeTo_ = function(connId, data) { - const self = this; - const startTime = Date.now(); - - return new Promise(function(resolve, reject) { - self.connectionPool.acquire(connId, function(err, connection) { - if (err) { - reject(err); - return; - } - - // we can ignore any errors that come from this since they'll be - // re-emitted later - connection.write(data, function(err) { - if (!err) { - self.latency_.add(Date.now() - startTime); + /** + * Writes to specified duplex stream. This is useful for capturing write + * latencies that can later be used to adjust the auto lease timeout. + * + * @private + * + * @param {string} connId The ID of the connection to write to. + * @param {object} data The data to be written to the stream. + * @returns {Promise} + */ + writeTo_(connId, data) { + const self = this; + const startTime = Date.now(); + return new Promise(function(resolve, reject) { + self.connectionPool.acquire(connId, function(err, connection) { + if (err) { + reject(err); + return; } - - resolve(); + // we can ignore any errors that come from this since they'll be + // re-emitted later + connection.write(data, function(err) { + if (!err) { + self.latency_.add(Date.now() - startTime); + } + resolve(); + }); }); }); - }); -}; + } +} module.exports = Subscriber; diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 60ffc18666b..7347746c64d 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -21,7 +21,6 @@ const {promisifyAll} = require('@google-cloud/promisify'); const extend = require('extend'); const is = require('is'); const snakeCase = require('lodash.snakecase'); -const nodeUtil = require('util'); const IAM = require('./iam.js'); const Snapshot = require('./snapshot.js'); @@ -141,644 +140,590 @@ const Subscriber = require('./subscriber.js'); * // Remove the listener from receiving `message` events. * subscription.removeListener('message', onMessage); */ -function Subscription(pubsub, name, options) { - if (pubsub.Promise) { - this.Promise = pubsub.Promise; - } - - options = options || {}; - - this.pubsub = pubsub; - this.projectId = pubsub.projectId; - this.request = pubsub.request.bind(pubsub); - - this.name = Subscription.formatName_(pubsub.projectId, name); - - if (options.topic) { - this.create = pubsub.createSubscription.bind(pubsub, options.topic, name); +class Subscription extends Subscriber { + constructor(pubsub, name, options) { + options = options || {}; + super(options); + if (pubsub.Promise) { + this.Promise = pubsub.Promise; + } + this.pubsub = pubsub; + this.projectId = pubsub.projectId; + this.request = pubsub.request.bind(pubsub); + this.name = Subscription.formatName_(pubsub.projectId, name); + if (options.topic) { + this.create = pubsub.createSubscription.bind(pubsub, options.topic, name); + } + /** + * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) + * allows you to set permissions on individual resources and offers a wider + * range of roles: editor, owner, publisher, subscriber, and viewer. This + * gives you greater flexibility and allows you to set more fine-grained + * access control. + * + * *The IAM access control features described in this document are Beta, + * including the API methods to get and set IAM policies, and to test IAM + * permissions. Cloud Pub/Sub's use of IAM features is not covered by + * any SLA or deprecation policy, and may be subject to backward-incompatible + * changes.* + * + * @name Subscription#iam + * @mixes IAM + * + * @see [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} + * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * + * @example + * //- + * // Get the IAM policy for your subscription. + * //- + * subscription.iam.getPolicy(function(err, policy) { + * console.log(policy); + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.iam.getPolicy().then(function(data) { + * const policy = data[0]; + * const apiResponse = data[1]; + * }); + */ + this.iam = new IAM(pubsub, this.name); } - /** - * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) - * allows you to set permissions on individual resources and offers a wider - * range of roles: editor, owner, publisher, subscriber, and viewer. This - * gives you greater flexibility and allows you to set more fine-grained - * access control. + * @typedef {array} CreateSnapshotResponse + * @property {Snapshot} 0 The new {@link Snapshot}. + * @property {object} 1 The full API response. + */ + /** + * @callback CreateSnapshotCallback + * @param {?Error} err Request error, if any. + * @param {Snapshot} snapshot The new {@link Snapshot}. + * @param {object} apiResponse The full API response. + */ + /** + * Create a snapshot with the given name. * - * *The IAM access control features described in this document are Beta, - * including the API methods to get and set IAM policies, and to test IAM - * permissions. Cloud Pub/Sub's use of IAM features is not covered by - * any SLA or deprecation policy, and may be subject to backward-incompatible - * changes.* + * @param {string} name Name of the snapshot. + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {CreateSnapshotCallback} [callback] Callback function. + * @returns {Promise} * - * @name Subscription#iam - * @mixes IAM + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); * - * @see [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} - * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); * - * @example - * //- - * // Get the IAM policy for your subscription. - * //- - * subscription.iam.getPolicy(function(err, policy) { - * console.log(policy); - * }); + * const callback = function(err, snapshot, apiResponse) { + * if (!err) { + * // The snapshot was created successfully. + * } + * }; + * + * subscription.createSnapshot('my-snapshot', callback); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.iam.getPolicy().then(function(data) { - * const policy = data[0]; + * subscription.createSnapshot('my-snapshot').then(function(data) { + * const snapshot = data[0]; * const apiResponse = data[1]; * }); */ - this.iam = new IAM(pubsub, this.name); - - Subscriber.call(this, options); -} - -nodeUtil.inherits(Subscription, Subscriber); - -/*! - * Formats Subscription metadata. - * - * @private - */ -Subscription.formatMetadata_ = function(metadata) { - const formatted = extend({}, metadata); - - if (metadata.messageRetentionDuration) { - formatted.retainAckedMessages = true; - - formatted.messageRetentionDuration = { - seconds: metadata.messageRetentionDuration, - nanos: 0, + createSnapshot(name, gaxOpts, callback) { + const self = this; + if (!is.string(name)) { + throw new Error('A name is required to create a snapshot.'); + } + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + const snapshot = self.snapshot(name); + const reqOpts = { + name: snapshot.name, + subscription: this.name, }; + this.request( + { + client: 'SubscriberClient', + method: 'createSnapshot', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, resp) { + if (err) { + callback(err, null, resp); + return; + } + snapshot.metadata = resp; + callback(null, snapshot, resp); + } + ); } - - if (metadata.pushEndpoint) { - delete formatted.pushEndpoint; - - formatted.pushConfig = { - pushEndpoint: metadata.pushEndpoint, + /** + * Delete the subscription. Pull requests from the current subscription will be + * errored once unsubscription is complete. + * + * @see [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete} + * + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while making this + * request. + * @param {object} callback.apiResponse Raw API response. + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * subscription.delete(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.delete().then(function(data) { + * const apiResponse = data[0]; + * }); + */ + delete(gaxOpts, callback) { + const self = this; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + callback = callback || util.noop; + const reqOpts = { + subscription: this.name, }; + this.request( + { + client: 'SubscriberClient', + method: 'deleteSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, resp) { + if (!err) { + self.removeAllListeners(); + self.close(); + } + callback(err, resp); + } + ); } - - return formatted; -}; - -/*! - * Format the name of a subscription. A subscription's full name is in the - * format of projects/{projectId}/subscriptions/{subName}. - * - * @private - */ -Subscription.formatName_ = function(projectId, name) { - // Simple check if the name is already formatted. - if (name.indexOf('/') > -1) { - return name; - } - - return 'projects/' + projectId + '/subscriptions/' + name; -}; - -/** - * @typedef {array} CreateSnapshotResponse - * @property {Snapshot} 0 The new {@link Snapshot}. - * @property {object} 1 The full API response. - */ -/** - * @callback CreateSnapshotCallback - * @param {?Error} err Request error, if any. - * @param {Snapshot} snapshot The new {@link Snapshot}. - * @param {object} apiResponse The full API response. - */ -/** - * Create a snapshot with the given name. - * - * @param {string} name Name of the snapshot. - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {CreateSnapshotCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * const callback = function(err, snapshot, apiResponse) { - * if (!err) { - * // The snapshot was created successfully. - * } - * }; - * - * subscription.createSnapshot('my-snapshot', callback); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.createSnapshot('my-snapshot').then(function(data) { - * const snapshot = data[0]; - * const apiResponse = data[1]; - * }); - */ -Subscription.prototype.createSnapshot = function(name, gaxOpts, callback) { - const self = this; - - if (!is.string(name)) { - throw new Error('A name is required to create a snapshot.'); - } - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } - - const snapshot = self.snapshot(name); - - const reqOpts = { - name: snapshot.name, - subscription: this.name, - }; - - this.request( - { - client: 'SubscriberClient', - method: 'createSnapshot', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function(err, resp) { - if (err) { - callback(err, null, resp); + /** + * @typedef {array} SubscriptionExistsResponse + * @property {boolean} 0 Whether the subscription exists + */ + /** + * @callback SubscriptionExistsCallback + * @param {?Error} err Request error, if any. + * @param {boolean} exists Whether the subscription exists. + */ + /** + * Check if a subscription exists. + * + * @param {SubscriptionExistsCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * subscription.exists(function(err, exists) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.exists().then(function(data) { + * const exists = data[0]; + * }); + */ + exists(callback) { + this.getMetadata(function(err) { + if (!err) { + callback(null, true); return; } - - snapshot.metadata = resp; - callback(null, snapshot, resp); - } - ); -}; - -/** - * Delete the subscription. Pull requests from the current subscription will be - * errored once unsubscription is complete. - * - * @see [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete} - * - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error returned while making this - * request. - * @param {object} callback.apiResponse Raw API response. - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * subscription.delete(function(err, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.delete().then(function(data) { - * const apiResponse = data[0]; - * }); - */ -Subscription.prototype.delete = function(gaxOpts, callback) { - const self = this; - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; + if (err.code === 5) { + callback(null, false); + return; + } + callback(err); + }); } - - callback = callback || util.noop; - - const reqOpts = { - subscription: this.name, - }; - - this.request( - { - client: 'SubscriberClient', - method: 'deleteSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function(err, resp) { + /** + * @typedef {array} GetSubscriptionResponse + * @property {Subscription} 0 The {@link Subscription}. + * @property {object} 1 The full API response. + */ + /** + * @callback GetSubscriptionCallback + * @param {?Error} err Request error, if any. + * @param {Subscription} subscription The {@link Subscription}. + * @param {object} apiResponse The full API response. + */ + /** + * Get a subscription if it exists. + * + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the + * subscription if it does not already exist. + * @param {GetSubscriptionCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * subscription.get(function(err, subscription, apiResponse) { + * // The `subscription` data has been populated. + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.get().then(function(data) { + * const subscription = data[0]; + * const apiResponse = data[1]; + * }); + */ + get(gaxOpts, callback) { + const self = this; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + const autoCreate = !!gaxOpts.autoCreate && is.fn(this.create); + delete gaxOpts.autoCreate; + this.getMetadata(gaxOpts, function(err, apiResponse) { if (!err) { - self.removeAllListeners(); - self.close(); + callback(null, self, apiResponse); + return; } - - callback(err, resp); - } - ); -}; - -/** - * @typedef {array} SubscriptionExistsResponse - * @property {boolean} 0 Whether the subscription exists - */ -/** - * @callback SubscriptionExistsCallback - * @param {?Error} err Request error, if any. - * @param {boolean} exists Whether the subscription exists. - */ -/** - * Check if a subscription exists. - * - * @param {SubscriptionExistsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * subscription.exists(function(err, exists) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.exists().then(function(data) { - * const exists = data[0]; - * }); - */ -Subscription.prototype.exists = function(callback) { - this.getMetadata(function(err) { - if (!err) { - callback(null, true); - return; + if (err.code !== 5 || !autoCreate) { + callback(err, null, apiResponse); + return; + } + self.create(gaxOpts, callback); + }); + } + /** + * @typedef {array} GetSubscriptionMetadataResponse + * @property {object} 0 The full API response. + */ + /** + * @callback GetSubscriptionMetadataCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ + /** + * Fetches the subscriptions metadata. + * + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {GetSubscriptionMetadataCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * subscription.getMetadata(function(err, apiResponse) { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.getMetadata().then(function(data) { + * const apiResponse = data[0]; + * }); + */ + getMetadata(gaxOpts, callback) { + const self = this; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; } - - if (err.code === 5) { - callback(null, false); - return; + const reqOpts = { + subscription: this.name, + }; + this.request( + { + client: 'SubscriberClient', + method: 'getSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, apiResponse) { + if (!err) { + self.metadata = apiResponse; + } + callback(err, apiResponse); + } + ); + } + /** + * @typedef {array} ModifyPushConfigResponse + * @property {object} 0 The full API response. + */ + /** + * @callback ModifyPushConfigCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ + /** + * Modify the push config for the subscription. + * + * @param {object} config The push config. + * @param {string} config.pushEndpoint A URL locating the endpoint to which + * messages should be published. + * @param {object} config.attributes [PushConfig attributes](https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#google.pubsub.v1.PushConfig). + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {ModifyPushConfigCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * const pushConfig = { + * pushEndpoint: 'https://mydomain.com/push', + * attributes: { + * key: 'value' + * } + * }; + * + * subscription.modifyPushConfig(pushConfig, function(err, apiResponse) { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.modifyPushConfig(pushConfig).then(function(data) { + * const apiResponse = data[0]; + * }); + */ + modifyPushConfig(config, gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; } - - callback(err); - }); -}; - -/** - * @typedef {array} GetSubscriptionResponse - * @property {Subscription} 0 The {@link Subscription}. - * @property {object} 1 The full API response. - */ -/** - * @callback GetSubscriptionCallback - * @param {?Error} err Request error, if any. - * @param {Subscription} subscription The {@link Subscription}. - * @param {object} apiResponse The full API response. - */ -/** - * Get a subscription if it exists. - * - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the - * subscription if it does not already exist. - * @param {GetSubscriptionCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * subscription.get(function(err, subscription, apiResponse) { - * // The `subscription` data has been populated. - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.get().then(function(data) { - * const subscription = data[0]; - * const apiResponse = data[1]; - * }); - */ -Subscription.prototype.get = function(gaxOpts, callback) { - const self = this; - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; + const reqOpts = { + subscription: this.name, + pushConfig: config, + }; + this.request( + { + client: 'SubscriberClient', + method: 'modifyPushConfig', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); } - - const autoCreate = !!gaxOpts.autoCreate && is.fn(this.create); - delete gaxOpts.autoCreate; - - this.getMetadata(gaxOpts, function(err, apiResponse) { - if (!err) { - callback(null, self, apiResponse); - return; + /** + * @typedef {array} SeekResponse + * @property {object} 0 The full API response. + */ + /** + * @callback SeekCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ + /** + * Seeks an existing subscription to a point in time or a given snapshot. + * + * @param {string|date} snapshot The point to seek to. This will accept the + * name of the snapshot or a Date object. + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {SeekCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const callback = function(err, resp) { + * if (!err) { + * // Seek was successful. + * } + * }; + * + * subscription.seek('my-snapshot', callback); + * + * //- + * // Alternatively, to specify a certain point in time, you can provide a Date + * // object. + * //- + * const date = new Date('October 21 2015'); + * + * subscription.seek(date, callback); + */ + seek(snapshot, gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; } - - if (err.code !== 5 || !autoCreate) { - callback(err, null, apiResponse); - return; + const reqOpts = { + subscription: this.name, + }; + if (is.string(snapshot)) { + reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); + } else if (is.date(snapshot)) { + reqOpts.time = snapshot; + } else { + throw new Error('Either a snapshot name or Date is needed to seek to.'); } - - self.create(gaxOpts, callback); - }); -}; - -/** - * @typedef {array} GetSubscriptionMetadataResponse - * @property {object} 0 The full API response. - */ -/** - * @callback GetSubscriptionMetadataCallback - * @param {?Error} err Request error, if any. - * @param {object} apiResponse The full API response. - */ -/** - * Fetches the subscriptions metadata. - * - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {GetSubscriptionMetadataCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * subscription.getMetadata(function(err, apiResponse) { - * if (err) { - * // Error handling omitted. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.getMetadata().then(function(data) { - * const apiResponse = data[0]; - * }); - */ -Subscription.prototype.getMetadata = function(gaxOpts, callback) { - const self = this; - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; + this.request( + { + client: 'SubscriberClient', + method: 'seek', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); } - - const reqOpts = { - subscription: this.name, - }; - - this.request( - { - client: 'SubscriberClient', - method: 'getSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function(err, apiResponse) { - if (!err) { - self.metadata = apiResponse; - } - - callback(err, apiResponse); + /** + * @typedef {array} SetSubscriptionMetadataResponse + * @property {object} 0 The full API response. + */ + /** + * @callback SetSubscriptionMetadataCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ + /** + * Update the subscription object. + * + * @param {object} metadata The subscription metadata. + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {SetSubscriptionMetadataCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const metadata = { + * key: 'value' + * }; + * + * subscription.setMetadata(metadata, function(err, apiResponse) { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.setMetadata(metadata).then(function(data) { + * const apiResponse = data[0]; + * }); + */ + setMetadata(metadata, gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; } - ); -}; - -/** - * @typedef {array} ModifyPushConfigResponse - * @property {object} 0 The full API response. - */ -/** - * @callback ModifyPushConfigCallback - * @param {?Error} err Request error, if any. - * @param {object} apiResponse The full API response. - */ -/** - * Modify the push config for the subscription. - * - * @param {object} config The push config. - * @param {string} config.pushEndpoint A URL locating the endpoint to which - * messages should be published. - * @param {object} config.attributes [PushConfig attributes](https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#google.pubsub.v1.PushConfig). - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {ModifyPushConfigCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * const pushConfig = { - * pushEndpoint: 'https://mydomain.com/push', - * attributes: { - * key: 'value' - * } - * }; - * - * subscription.modifyPushConfig(pushConfig, function(err, apiResponse) { - * if (err) { - * // Error handling omitted. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.modifyPushConfig(pushConfig).then(function(data) { - * const apiResponse = data[0]; - * }); - */ -Subscription.prototype.modifyPushConfig = function(config, gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; + const subscription = Subscription.formatMetadata_(metadata); + const fields = Object.keys(subscription).map(snakeCase); + subscription.name = this.name; + const reqOpts = { + subscription: subscription, + updateMask: { + paths: fields, + }, + }; + this.request( + { + client: 'SubscriberClient', + method: 'updateSubscription', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); } - - const reqOpts = { - subscription: this.name, - pushConfig: config, - }; - - this.request( - { - client: 'SubscriberClient', - method: 'modifyPushConfig', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); -}; - -/** - * @typedef {array} SeekResponse - * @property {object} 0 The full API response. - */ -/** - * @callback SeekCallback - * @param {?Error} err Request error, if any. - * @param {object} apiResponse The full API response. - */ -/** - * Seeks an existing subscription to a point in time or a given snapshot. - * - * @param {string|date} snapshot The point to seek to. This will accept the - * name of the snapshot or a Date object. - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {SeekCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const callback = function(err, resp) { - * if (!err) { - * // Seek was successful. - * } - * }; - * - * subscription.seek('my-snapshot', callback); - * - * //- - * // Alternatively, to specify a certain point in time, you can provide a Date - * // object. - * //- - * const date = new Date('October 21 2015'); - * - * subscription.seek(date, callback); - */ -Subscription.prototype.seek = function(snapshot, gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; + /** + * Create a Snapshot object. See {@link Subscription#createSnapshot} to + * create a snapshot. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name The name of the snapshot. + * @returns {Snapshot} + * + * @example + * const snapshot = subscription.snapshot('my-snapshot'); + */ + snapshot(name) { + return this.pubsub.snapshot.call(this, name); } - - const reqOpts = { - subscription: this.name, - }; - - if (is.string(snapshot)) { - reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); - } else if (is.date(snapshot)) { - reqOpts.time = snapshot; - } else { - throw new Error('Either a snapshot name or Date is needed to seek to.'); + /*! + * Formats Subscription metadata. + * + * @private + */ + static formatMetadata_(metadata) { + const formatted = extend({}, metadata); + if (metadata.messageRetentionDuration) { + formatted.retainAckedMessages = true; + formatted.messageRetentionDuration = { + seconds: metadata.messageRetentionDuration, + nanos: 0, + }; + } + if (metadata.pushEndpoint) { + delete formatted.pushEndpoint; + formatted.pushConfig = { + pushEndpoint: metadata.pushEndpoint, + }; + } + return formatted; } - - this.request( - { - client: 'SubscriberClient', - method: 'seek', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); -}; - -/** - * @typedef {array} SetSubscriptionMetadataResponse - * @property {object} 0 The full API response. - */ -/** - * @callback SetSubscriptionMetadataCallback - * @param {?Error} err Request error, if any. - * @param {object} apiResponse The full API response. - */ -/** - * Update the subscription object. - * - * @param {object} metadata The subscription metadata. - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {SetSubscriptionMetadataCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const metadata = { - * key: 'value' - * }; - * - * subscription.setMetadata(metadata, function(err, apiResponse) { - * if (err) { - * // Error handling omitted. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * subscription.setMetadata(metadata).then(function(data) { - * const apiResponse = data[0]; - * }); - */ -Subscription.prototype.setMetadata = function(metadata, gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; + /*! + * Format the name of a subscription. A subscription's full name is in the + * format of projects/{projectId}/subscriptions/{subName}. + * + * @private + */ + static formatName_(projectId, name) { + // Simple check if the name is already formatted. + if (name.indexOf('/') > -1) { + return name; + } + return 'projects/' + projectId + '/subscriptions/' + name; } - - const subscription = Subscription.formatMetadata_(metadata); - const fields = Object.keys(subscription).map(snakeCase); - - subscription.name = this.name; - - const reqOpts = { - subscription: subscription, - updateMask: { - paths: fields, - }, - }; - - this.request( - { - client: 'SubscriberClient', - method: 'updateSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); -}; - -/** - * Create a Snapshot object. See {@link Subscription#createSnapshot} to - * create a snapshot. - * - * @throws {Error} If a name is not provided. - * - * @param {string} name The name of the snapshot. - * @returns {Snapshot} - * - * @example - * const snapshot = subscription.snapshot('my-snapshot'); - */ -Subscription.prototype.snapshot = function(name) { - return this.pubsub.snapshot.call(this, name); -}; +} /*! Developer Documentation * diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 05fc23c4305..7954068c123 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -22,8 +22,8 @@ const {paginator} = require('@google-cloud/paginator'); const extend = require('extend'); const is = require('is'); -const IAM = require('./iam.js'); -const Publisher = require('./publisher.js'); +const IAM = require('./iam'); +const Publisher = require('./publisher'); /** * A Topic object allows you to interact with a Cloud Pub/Sub topic. @@ -38,49 +38,201 @@ const Publisher = require('./publisher.js'); * * const topic = pubsub.topic('my-topic'); */ -function Topic(pubsub, name) { - if (pubsub.Promise) { - this.Promise = pubsub.Promise; +class Topic { + constructor(pubsub, name) { + if (pubsub.Promise) { + this.Promise = pubsub.Promise; + } + /** + * The fully qualified name of this topic. + * @name Topic#name + * @type {string} + */ + this.name = Topic.formatName_(pubsub.projectId, name); + /** + * The parent {@link PubSub} instance of this topic instance. + * @name Topic#pubsub + * @type {PubSub} + */ + /** + * The parent {@link PubSub} instance of this topic instance. + * @name Topic#parent + * @type {PubSub} + */ + this.parent = this.pubsub = pubsub; + this.request = pubsub.request.bind(pubsub); + /** + * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) + * allows you to set permissions on individual resources and offers a wider + * range of roles: editor, owner, publisher, subscriber, and viewer. This + * gives you greater flexibility and allows you to set more fine-grained + * access control. + * + * *The IAM access control features described in this document are Beta, + * including the API methods to get and set IAM policies, and to test IAM + * permissions. Cloud Pub/Sub's use of IAM features is not covered by + * any SLA or deprecation policy, and may be subject to backward-incompatible + * changes.* + * + * @name Topic#iam + * @mixes IAM + * + * @see [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} + * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * + * //- + * // Get the IAM policy for your topic. + * //- + * topic.iam.getPolicy(function(err, policy) { + * console.log(policy); + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.iam.getPolicy().then(function(data) { + * const policy = data[0]; + * const apiResponse = data[1]; + * }); + */ + this.iam = new IAM(pubsub, this.name); } - - /** - * The fully qualified name of this topic. - * @name Topic#name - * @type {string} - */ - this.name = Topic.formatName_(pubsub.projectId, name); - /** - * The parent {@link PubSub} instance of this topic instance. - * @name Topic#pubsub - * @type {PubSub} + * Create a topic. + * + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {CreateTopicCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * + * topic.create(function(err, topic, apiResponse) { + * if (!err) { + * // The topic was created successfully. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.create().then(function(data) { + * const topic = data[0]; + * const apiResponse = data[1]; + * }); */ + create(gaxOpts, callback) { + this.pubsub.createTopic(this.name, gaxOpts, callback); + } /** - * The parent {@link PubSub} instance of this topic instance. - * @name Topic#parent - * @type {PubSub} + * Create a subscription to this topic. + * + * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * + * @throws {Error} If subscription name is omitted. + * + * @param {string} name The name of the subscription. + * @param {CreateSubscriptionRequest} [options] See a + * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * @param {CreateSubscriptionCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const callback = function(err, subscription, apiResponse) {}; + * + * // Without specifying any options. + * topic.createSubscription('newMessages', callback); + * + * // With options. + * topic.createSubscription('newMessages', { + * ackDeadlineSeconds: 90 + * }, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.createSubscription('newMessages').then(function(data) { + * const subscription = data[0]; + * const apiResponse = data[1]; + * }); */ - this.parent = this.pubsub = pubsub; - this.request = pubsub.request.bind(pubsub); - + createSubscription(name, options, callback) { + this.pubsub.createSubscription(this, name, options, callback); + } /** - * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) - * allows you to set permissions on individual resources and offers a wider - * range of roles: editor, owner, publisher, subscriber, and viewer. This - * gives you greater flexibility and allows you to set more fine-grained - * access control. + * Delete the topic. This will not delete subscriptions to this topic. * - * *The IAM access control features described in this document are Beta, - * including the API methods to get and set IAM policies, and to test IAM - * permissions. Cloud Pub/Sub's use of IAM features is not covered by - * any SLA or deprecation policy, and may be subject to backward-incompatible - * changes.* + * @see [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete} * - * @name Topic#iam - * @mixes IAM + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while making this + * request. + * @param {object} callback.apiResponse Raw API response. * - * @see [Access Control Overview]{@link https://cloud.google.com/pubsub/access_control} - * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * + * topic.delete(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.delete().then(function(data) { + * const apiResponse = data[0]; + * }); + */ + delete(gaxOpts, callback) { + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + callback = callback || util.noop; + const reqOpts = { + topic: this.name, + }; + this.request( + { + client: 'PublisherClient', + method: 'deleteTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + callback + ); + } + /** + * @typedef {array} TopicExistsResponse + * @property {boolean} 0 Whether the topic exists + */ + /** + * @callback TopicExistsCallback + * @param {?Error} err Request error, if any. + * @param {boolean} exists Whether the topic exists. + */ + /** + * Check if a topic exists. + * + * @param {TopicExistsCallback} [callback] Callback function. + * @returns {Promise} * * @example * const PubSub = require('@google-cloud/pubsub'); @@ -88,417 +240,309 @@ function Topic(pubsub, name) { * * const topic = pubsub.topic('my-topic'); * + * topic.exists(function(err, exists) {}); + * * //- - * // Get the IAM policy for your topic. + * // If the callback is omitted, we'll return a Promise. * //- - * topic.iam.getPolicy(function(err, policy) { - * console.log(policy); + * topic.exists().then(function(data) { + * const exists = data[0]; + * }); + */ + exists(callback) { + this.getMetadata(function(err) { + if (!err) { + callback(null, true); + return; + } + if (err.code === 5) { + callback(null, false); + return; + } + callback(err); + }); + } + /** + * @typedef {array} GetTopicResponse + * @property {Topic} 0 The {@link Topic}. + * @property {object} 1 The full API response. + */ + /** + * @callback GetTopicCallback + * @param {?Error} err Request error, if any. + * @param {Topic} topic The {@link Topic}. + * @param {object} apiResponse The full API response. + */ + /** + * Get a topic if it exists. + * + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the topic + * does not already exist. + * @param {GetTopicCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * + * topic.get(function(err, topic, apiResponse) { + * // The `topic` data has been populated. * }); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.iam.getPolicy().then(function(data) { - * const policy = data[0]; + * topic.get().then(function(data) { + * const topic = data[0]; * const apiResponse = data[1]; * }); */ - this.iam = new IAM(pubsub, this.name); -} - -/** - * Format the name of a topic. A Topic's full name is in the format of - * 'projects/{projectId}/topics/{topicName}'. - * - * @private - * - * @return {string} - */ -Topic.formatName_ = function(projectId, name) { - // Simple check if the name is already formatted. - if (name.indexOf('/') > -1) { - return name; - } - return 'projects/' + projectId + '/topics/' + name; -}; - -/** - * Create a topic. - * - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {CreateTopicCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * - * topic.create(function(err, topic, apiResponse) { - * if (!err) { - * // The topic was created successfully. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.create().then(function(data) { - * const topic = data[0]; - * const apiResponse = data[1]; - * }); - */ -Topic.prototype.create = function(gaxOpts, callback) { - this.pubsub.createTopic(this.name, gaxOpts, callback); -}; - -/** - * Create a subscription to this topic. - * - * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} - * - * @throws {Error} If subscription name is omitted. - * - * @param {string} name The name of the subscription. - * @param {CreateSubscriptionRequest} [options] See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). - * @param {CreateSubscriptionCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const callback = function(err, subscription, apiResponse) {}; - * - * // Without specifying any options. - * topic.createSubscription('newMessages', callback); - * - * // With options. - * topic.createSubscription('newMessages', { - * ackDeadlineSeconds: 90 - * }, callback); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.createSubscription('newMessages').then(function(data) { - * const subscription = data[0]; - * const apiResponse = data[1]; - * }); - */ -Topic.prototype.createSubscription = function(name, options, callback) { - this.pubsub.createSubscription(this, name, options, callback); -}; - -/** - * Delete the topic. This will not delete subscriptions to this topic. - * - * @see [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete} - * - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error returned while making this - * request. - * @param {object} callback.apiResponse Raw API response. - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * - * topic.delete(function(err, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.delete().then(function(data) { - * const apiResponse = data[0]; - * }); - */ -Topic.prototype.delete = function(gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } - - callback = callback || util.noop; - - const reqOpts = { - topic: this.name, - }; - - this.request( - { - client: 'PublisherClient', - method: 'deleteTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); -}; - -/** - * @typedef {array} TopicExistsResponse - * @property {boolean} 0 Whether the topic exists - */ -/** - * @callback TopicExistsCallback - * @param {?Error} err Request error, if any. - * @param {boolean} exists Whether the topic exists. - */ -/** - * Check if a topic exists. - * - * @param {TopicExistsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * - * topic.exists(function(err, exists) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.exists().then(function(data) { - * const exists = data[0]; - * }); - */ -Topic.prototype.exists = function(callback) { - this.getMetadata(function(err) { - if (!err) { - callback(null, true); - return; - } - - if (err.code === 5) { - callback(null, false); - return; + get(gaxOpts, callback) { + const self = this; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; } - - callback(err); - }); -}; - -/** - * @typedef {array} GetTopicResponse - * @property {Topic} 0 The {@link Topic}. - * @property {object} 1 The full API response. - */ -/** - * @callback GetTopicCallback - * @param {?Error} err Request error, if any. - * @param {Topic} topic The {@link Topic}. - * @param {object} apiResponse The full API response. - */ -/** - * Get a topic if it exists. - * - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the topic - * does not already exist. - * @param {GetTopicCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * - * topic.get(function(err, topic, apiResponse) { - * // The `topic` data has been populated. - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.get().then(function(data) { - * const topic = data[0]; - * const apiResponse = data[1]; - * }); - */ -Topic.prototype.get = function(gaxOpts, callback) { - const self = this; - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } - - const autoCreate = !!gaxOpts.autoCreate; - delete gaxOpts.autoCreate; - - this.getMetadata(gaxOpts, function(err, apiResponse) { - if (!err) { - callback(null, self, apiResponse); - return; - } - - if (err.code !== 5 || !autoCreate) { - callback(err, null, apiResponse); - return; - } - - self.create(gaxOpts, callback); - }); -}; - -/** - * @typedef {array} GetTopicMetadataResponse - * @property {object} 0 The full API response. - */ -/** - * @callback GetTopicMetadataCallback - * @param {?Error} err Request error, if any. - * @param {object} apiResponse The full API response. - */ -/** - * Get the official representation of this topic from the API. - * - * @see [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get} - * - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {GetTopicMetadataCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * - * topic.getMetadata(function(err, apiResponse) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.getMetadata().then(function(data) { - * const apiResponse = data[0]; - * }); - */ -Topic.prototype.getMetadata = function(gaxOpts, callback) { - const self = this; - - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } - - const reqOpts = { - topic: this.name, - }; - - this.request( - { - client: 'PublisherClient', - method: 'getTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function(err, apiResponse) { + const autoCreate = !!gaxOpts.autoCreate; + delete gaxOpts.autoCreate; + this.getMetadata(gaxOpts, function(err, apiResponse) { if (!err) { - self.metadata = apiResponse; + callback(null, self, apiResponse); + return; } - - callback(err, apiResponse); - } - ); -}; - -/** - * Get a list of the subscriptions registered to this topic. You may optionally - * provide a query object as the first argument to customize the response. - * - * Your provided callback will be invoked with an error object if an API error - * occurred or an array of {module:pubsub/subscription} objects. - * - * @see [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics.subscriptions/list} - * - * @param {GetSubscriptionsRequest} [query] Query object for listing subscriptions. - * @param {GetSubscriptionsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * - * topic.getSubscriptions(function(err, subscriptions) { - * // subscriptions is an array of `Subscription` objects. - * }); - * - * // Customize the query. - * topic.getSubscriptions({ - * pageSize: 3 - * }, callback); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * topic.getSubscriptions().then(function(data) { - * const subscriptions = data[0]; - * }); - */ -Topic.prototype.getSubscriptions = function(options, callback) { - const self = this; - - if (is.fn(options)) { - callback = options; - options = {}; + if (err.code !== 5 || !autoCreate) { + callback(err, null, apiResponse); + return; + } + self.create(gaxOpts, callback); + }); } - - const reqOpts = extend( - { + /** + * @typedef {array} GetTopicMetadataResponse + * @property {object} 0 The full API response. + */ + /** + * @callback GetTopicMetadataCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ + /** + * Get the official representation of this topic from the API. + * + * @see [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get} + * + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {GetTopicMetadataCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * + * topic.getMetadata(function(err, apiResponse) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.getMetadata().then(function(data) { + * const apiResponse = data[0]; + * }); + */ + getMetadata(gaxOpts, callback) { + const self = this; + if (is.fn(gaxOpts)) { + callback = gaxOpts; + gaxOpts = {}; + } + const reqOpts = { topic: this.name, - }, - options - ); - - delete reqOpts.gaxOpts; - delete reqOpts.autoPaginate; - - const gaxOpts = extend( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); - - this.request( - { - client: 'PublisherClient', - method: 'listTopicSubscriptions', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function() { - const subscriptions = arguments[1]; - - if (subscriptions) { - arguments[1] = subscriptions.map(function(sub) { - // ListTopicSubscriptions only returns sub names - return self.subscription(sub); - }); + }; + this.request( + { + client: 'PublisherClient', + method: 'getTopic', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function(err, apiResponse) { + if (!err) { + self.metadata = apiResponse; + } + callback(err, apiResponse); } - - callback.apply(null, arguments); + ); + } + /** + * Get a list of the subscriptions registered to this topic. You may optionally + * provide a query object as the first argument to customize the response. + * + * Your provided callback will be invoked with an error object if an API error + * occurred or an array of {module:pubsub/subscription} objects. + * + * @see [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics.subscriptions/list} + * + * @param {GetSubscriptionsRequest} [query] Query object for listing subscriptions. + * @param {GetSubscriptionsCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * + * topic.getSubscriptions(function(err, subscriptions) { + * // subscriptions is an array of `Subscription` objects. + * }); + * + * // Customize the query. + * topic.getSubscriptions({ + * pageSize: 3 + * }, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.getSubscriptions().then(function(data) { + * const subscriptions = data[0]; + * }); + */ + getSubscriptions(options, callback) { + const self = this; + if (is.fn(options)) { + callback = options; + options = {}; + } + const reqOpts = extend( + { + topic: this.name, + }, + options + ); + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + const gaxOpts = extend( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + this.request( + { + client: 'PublisherClient', + method: 'listTopicSubscriptions', + reqOpts: reqOpts, + gaxOpts: gaxOpts, + }, + function() { + const subscriptions = arguments[1]; + if (subscriptions) { + arguments[1] = subscriptions.map(function(sub) { + // ListTopicSubscriptions only returns sub names + return self.subscription(sub); + }); + } + callback.apply(null, arguments); + } + ); + } + /** + * Creates a Publisher object that allows you to publish messages to this topic. + * + * @param {object} [options] Configuration object. + * @param {object} [options.batching] Batching settings. + * @param {number} [options.batching.maxBytes] The maximum number of bytes to + * buffer before sending a payload. + * @param {number} [options.batching.maxMessages] The maximum number of messages + * to buffer before sending a payload. + * @param {number} [options.batching.maxMilliseconds] The maximum duration to + * wait before sending a payload. + * + * @return {Publisher} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const publisher = topic.publisher(); + * + * publisher.publish(Buffer.from('Hello, world!'), function(err, messageId) { + * if (err) { + * // Error handling omitted. + * } + * }); + */ + publisher(options) { + return new Publisher(this, options); + } + /** + * Create a Subscription object. This command by itself will not run any API + * requests. You will receive a {module:pubsub/subscription} object, + * which will allow you to interact with a subscription. + * + * @throws {Error} If subscription name is omitted. + * + * @param {string} name Name of the subscription. + * @param {object} [options] Configuration object. + * @param {object} [options.flowControl] Flow control configurations for + * receiving messages. Note that these options do not persist across + * subscription instances. + * @param {number} [options.flowControl.maxBytes] The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @param {number} [options.flowControl.maxMessages=Infinity] The maximum number + * of un-acked messages to allow before the subscription pauses incoming + * messages. + * @param {number} [options.maxConnections=5] Use this to limit the number of + * connections to be used when sending and receiving messages. + * @return {Subscription} + * + * @example + * const PubSub = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * // Register a listener for `message` events. + * subscription.on('message', function(message) { + * // Called every time a message is received. + * // message.id = ID of the message. + * // message.ackId = ID used to acknowledge the message receival. + * // message.data = Contents of the message. + * // message.attributes = Attributes of the message. + * // message.publishTime = Timestamp when Pub/Sub received the message. + * }); + */ + subscription(name, options) { + options = options || {}; + options.topic = this; + return this.pubsub.subscription(name, options); + } + /** + * Format the name of a topic. A Topic's full name is in the format of + * 'projects/{projectId}/topics/{topicName}'. + * + * @private + * + * @return {string} + */ + static formatName_(projectId, name) { + // Simple check if the name is already formatted. + if (name.indexOf('/') > -1) { + return name; } - ); -}; + return 'projects/' + projectId + '/topics/' + name; + } +} /** * Get a list of the {module:pubsub/subscription} objects registered to this @@ -537,83 +581,6 @@ Topic.prototype.getSubscriptionsStream = paginator.streamify( 'getSubscriptions' ); -/** - * Creates a Publisher object that allows you to publish messages to this topic. - * - * @param {object} [options] Configuration object. - * @param {object} [options.batching] Batching settings. - * @param {number} [options.batching.maxBytes] The maximum number of bytes to - * buffer before sending a payload. - * @param {number} [options.batching.maxMessages] The maximum number of messages - * to buffer before sending a payload. - * @param {number} [options.batching.maxMilliseconds] The maximum duration to - * wait before sending a payload. - * - * @return {Publisher} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const publisher = topic.publisher(); - * - * publisher.publish(Buffer.from('Hello, world!'), function(err, messageId) { - * if (err) { - * // Error handling omitted. - * } - * }); - */ -Topic.prototype.publisher = function(options) { - return new Publisher(this, options); -}; - -/** - * Create a Subscription object. This command by itself will not run any API - * requests. You will receive a {module:pubsub/subscription} object, - * which will allow you to interact with a subscription. - * - * @throws {Error} If subscription name is omitted. - * - * @param {string} name Name of the subscription. - * @param {object} [options] Configuration object. - * @param {object} [options.flowControl] Flow control configurations for - * receiving messages. Note that these options do not persist across - * subscription instances. - * @param {number} [options.flowControl.maxBytes] The maximum number of bytes - * in un-acked messages to allow before the subscription pauses incoming - * messages. Defaults to 20% of free memory. - * @param {number} [options.flowControl.maxMessages=Infinity] The maximum number - * of un-acked messages to allow before the subscription pauses incoming - * messages. - * @param {number} [options.maxConnections=5] Use this to limit the number of - * connections to be used when sending and receiving messages. - * @return {Subscription} - * - * @example - * const PubSub = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const subscription = topic.subscription('my-subscription'); - * - * // Register a listener for `message` events. - * subscription.on('message', function(message) { - * // Called every time a message is received. - * // message.id = ID of the message. - * // message.ackId = ID used to acknowledge the message receival. - * // message.data = Contents of the message. - * // message.attributes = Attributes of the message. - * // message.publishTime = Timestamp when Pub/Sub received the message. - * }); - */ -Topic.prototype.subscription = function(name, options) { - options = options || {}; - options.topic = this; - - return this.pubsub.subscription(name, options); -}; - /*! Developer Documentation * * These methods can be agto-paginated. diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 6b73f284652..1802e0c8519 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -22,7 +22,7 @@ const Subscription = require('../src/subscription.js'); const uuid = require('uuid'); const PubSub = require('../'); -const pubsub = PubSub(); +const pubsub = new PubSub(); describe('pubsub', function() { const TOPIC_NAMES = [ diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 864f06ca875..6139b500d67 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -188,7 +188,7 @@ describe('PubSub', function() { }); it('should return an instance', function() { - assert(PubSub() instanceof PubSub); + assert(new PubSub() instanceof PubSub); }); it('should combine all required scopes', function() { From 1384c7593dff5922360bcb1497149b6e565da2e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 16 Aug 2018 17:14:53 -0700 Subject: [PATCH 0200/1115] chore(deps): update dependency eslint-config-prettier to v3 (#213) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index bfe6c298f65..3fd2da5862c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -88,7 +88,7 @@ "async": "^2.6.0", "codecov": "^3.0.0", "eslint": "^5.0.0", - "eslint-config-prettier": "^2.8.0", + "eslint-config-prettier": "^3.0.0", "eslint-plugin-node": "^7.0.0", "eslint-plugin-prettier": "^2.3.1", "ink-docstrap": "^1.3.2", From 2e31fa3a3eced46e9de27346ecac158aaa7b1d9a Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 21 Aug 2018 09:53:29 -0700 Subject: [PATCH 0201/1115] chore: use arrow functions (#215) --- handwritten/pubsub/src/connection-pool.js | 179 +++++++++++----------- handwritten/pubsub/src/publisher.js | 8 +- handwritten/pubsub/src/snapshot.js | 20 +-- handwritten/pubsub/src/subscriber.js | 98 ++++++------ handwritten/pubsub/src/subscription.js | 74 +++++---- handwritten/pubsub/src/topic.js | 50 +++--- 6 files changed, 202 insertions(+), 227 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index 6149fa0b5d4..a642f4a81be 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -94,7 +94,6 @@ class ConnectionPool extends EventEmitter { * @param {stream} callback.connection A duplex stream. */ acquire(id, callback) { - const self = this; if (is.fn(id)) { callback = id; id = null; @@ -106,19 +105,16 @@ class ConnectionPool extends EventEmitter { // it's possible that by the time a user acks the connection could have // closed, so in that case we'll just return any connection if (!this.connections.has(id)) { - id = getFirstConnectionId(); + id = this.connections.keys().next().value; } const connection = this.connections.get(id); if (connection) { callback(null, connection); return; } - this.once('connected', function(connection) { + this.once('connected', connection => { callback(null, connection); }); - function getFirstConnectionId() { - return self.connections.keys().next().value; - } } /*! * Ends each connection in the pool and closes the pool, preventing new @@ -129,7 +125,6 @@ class ConnectionPool extends EventEmitter { * @param {?error} callback.error An error returned while closing the pool. */ close(callback) { - const self = this; const connections = Array.from(this.connections.values()); callback = callback || util.noop; clearInterval(this.keepAliveHandle); @@ -145,16 +140,16 @@ class ConnectionPool extends EventEmitter { this.noConnectionsTime = 0; each( connections, - function(connection, onEndCallback) { - connection.end(function(err) { + (connection, onEndCallback) => { + connection.end(err => { connection.cancel(); onEndCallback(err); }); }, - function(err) { - if (self.client) { - self.client.close(); - self.client = null; + err => { + if (this.client) { + this.client.close(); + this.client = null; } callback(err); } @@ -167,16 +162,15 @@ class ConnectionPool extends EventEmitter { * @private */ createConnection() { - const self = this; - this.getClient(function(err, client) { + this.getClient((err, client) => { if (err) { - self.emit('error', err); + this.emit('error', err); return; } const requestStream = client.streamingPull(); const readStream = requestStream.pipe( - through.obj(function(chunk, enc, next) { - chunk.receivedMessages.forEach(function(message) { + through.obj((chunk, enc, next) => { + chunk.receivedMessages.forEach(message => { readStream.push(message); }); next(); @@ -188,67 +182,70 @@ class ConnectionPool extends EventEmitter { const id = uuid.v4(); let errorImmediateHandle; connection.cancel = requestStream.cancel.bind(requestStream); - if (self.isPaused) { + if (this.isPaused) { connection.pause(); } - self - .once(CHANNEL_ERROR_EVENT, onChannelError) - .once(CHANNEL_READY_EVENT, onChannelReady); - requestStream.on('status', status => - setImmediate(onConnectionStatus, status) - ); - connection - .on('error', onConnectionError) - .on('data', onConnectionData) - .write({ - subscription: replaceProjectIdToken( - self.subscription.name, - self.pubsub.projectId - ), - streamAckDeadlineSeconds: self.settings.ackDeadline / 1000, - }); - self.connections.set(id, connection); - function onChannelError() { - self.removeListener(CHANNEL_READY_EVENT, onChannelReady); + + const onChannelError = () => { + this.removeListener(CHANNEL_READY_EVENT, onChannelReady); requestStream.cancel(); - } - function onChannelReady() { - self.removeListener(CHANNEL_ERROR_EVENT, onChannelError); + }; + const onChannelReady = () => { + this.removeListener(CHANNEL_ERROR_EVENT, onChannelError); connection.isConnected = true; - self.noConnectionsTime = 0; - self.failedConnectionAttempts = 0; - self.emit('connected', connection); - } + this.noConnectionsTime = 0; + this.failedConnectionAttempts = 0; + this.emit('connected', connection); + }; // since this is a bidi stream it's possible that we recieve errors from // reads or writes. We also want to try and cut down on the number of // errors that we emit if other connections are still open. So by using // setImmediate we're able to cancel the error message if it gets passed // to the `status` event where we can check if the connection should be // re-opened or if we should send the error to the user - function onConnectionError(err) { - errorImmediateHandle = setImmediate(() => self.emit('error', err)); - } - function onConnectionData(message) { - self.emit('message', self.createMessage(id, message)); - } - function onConnectionStatus(status) { + const onConnectionError = err => { + errorImmediateHandle = setImmediate(() => this.emit('error', err)); + }; + const onConnectionData = message => { + this.emit('message', this.createMessage(id, message)); + }; + const onConnectionStatus = status => { clearImmediate(errorImmediateHandle); connection.end(); - self.connections.delete(id); + this.connections.delete(id); if (!connection.isConnected) { - self.failedConnectionAttempts += 1; + this.failedConnectionAttempts += 1; } - if (!self.isConnected() && !self.noConnectionsTime) { - self.noConnectionsTime = Date.now(); + if (!this.isConnected() && !this.noConnectionsTime) { + this.noConnectionsTime = Date.now(); } - if (self.shouldReconnect(status)) { - self.queueConnection(); - } else if (self.isOpen && !self.connections.size) { + if (this.shouldReconnect(status)) { + this.queueConnection(); + } else if (this.isOpen && !this.connections.size) { const error = new Error(status.details); error.code = status.code; - self.emit('error', error); + this.emit('error', error); } - } + }; + + this.once(CHANNEL_ERROR_EVENT, onChannelError).once( + CHANNEL_READY_EVENT, + onChannelReady + ); + requestStream.on('status', status => + setImmediate(onConnectionStatus, status) + ); + connection + .on('error', onConnectionError) + .on('data', onConnectionData) + .write({ + subscription: replaceProjectIdToken( + this.subscription.name, + this.pubsub.projectId + ), + streamAckDeadlineSeconds: this.settings.ackDeadline / 1000, + }); + this.connections.set(id, connection); }); } /** @@ -260,7 +257,6 @@ class ConnectionPool extends EventEmitter { * @return {object} message The message object. */ createMessage(connectionId, resp) { - const self = this; const pt = resp.message.publishTime; const milliseconds = parseInt(pt.nanos, 10) / 1e6; const originalDataLength = resp.message.data.length; @@ -277,11 +273,11 @@ class ConnectionPool extends EventEmitter { return originalDataLength; }, }; - message.ack = function() { - self.subscription.ack_(message); + message.ack = () => { + this.subscription.ack_(message); }; - message.nack = function() { - self.subscription.nack_(message); + message.nack = () => { + this.subscription.nack_(message); }; return message; } @@ -293,29 +289,28 @@ class ConnectionPool extends EventEmitter { * @fires CHANNEL_READY_EVENT */ getAndEmitChannelState() { - const self = this; this.isGettingChannelState = true; - this.getClient(function(err, client) { + this.getClient((err, client) => { if (err) { - self.isGettingChannelState = false; - self.emit(CHANNEL_ERROR_EVENT); - self.emit('error', err); + this.isGettingChannelState = false; + this.emit(CHANNEL_ERROR_EVENT); + this.emit('error', err); return; } let elapsedTimeWithoutConnection = 0; const now = Date.now(); let deadline; - if (self.noConnectionsTime) { - elapsedTimeWithoutConnection = now - self.noConnectionsTime; + if (this.noConnectionsTime) { + elapsedTimeWithoutConnection = now - this.noConnectionsTime; } deadline = now + (MAX_TIMEOUT - elapsedTimeWithoutConnection); - client.waitForReady(deadline, function(err) { - self.isGettingChannelState = false; + client.waitForReady(deadline, err => { + this.isGettingChannelState = false; if (err) { - self.emit(CHANNEL_ERROR_EVENT, err); + this.emit(CHANNEL_ERROR_EVENT, err); return; } - self.emit(CHANNEL_READY_EVENT); + this.emit(CHANNEL_READY_EVENT); }); }); } @@ -354,7 +349,6 @@ class ConnectionPool extends EventEmitter { * @private */ open() { - const self = this; let existing = this.connections.size; const max = this.settings.maxConnections; for (; existing < max; existing++) { @@ -363,14 +357,14 @@ class ConnectionPool extends EventEmitter { this.isOpen = true; this.failedConnectionAttempts = 0; this.noConnectionsTime = Date.now(); - this.on('newListener', function(eventName) { - if (eventName === CHANNEL_READY_EVENT && !self.isGettingChannelState) { - self.getAndEmitChannelState(); + this.on('newListener', eventName => { + if (eventName === CHANNEL_READY_EVENT && !this.isGettingChannelState) { + this.getAndEmitChannelState(); } }); if (!this.subscription.writeToStreams_) { - this.keepAliveHandle = setInterval(function() { - self.sendKeepAlives(); + this.keepAliveHandle = setInterval(() => { + this.sendKeepAlives(); }, KEEP_ALIVE_INTERVAL); this.keepAliveHandle.unref(); } @@ -382,7 +376,7 @@ class ConnectionPool extends EventEmitter { */ pause() { this.isPaused = true; - this.connections.forEach(function(connection) { + this.connections.forEach(connection => { connection.pause(); }); } @@ -393,21 +387,20 @@ class ConnectionPool extends EventEmitter { * @private */ queueConnection() { - const self = this; let delay = 0; if (this.failedConnectionAttempts > 0) { delay = Math.pow(2, this.failedConnectionAttempts) * 1000 + Math.floor(Math.random() * 1000); } - const timeoutHandle = setTimeout(createConnection, delay); - this.queue.push(timeoutHandle); - function createConnection() { + const createConnection = () => { setImmediate(() => { - self.createConnection(); - self.queue.splice(self.queue.indexOf(timeoutHandle), 1); + this.createConnection(); + this.queue.splice(this.queue.indexOf(timeoutHandle), 1); }); - } + }; + const timeoutHandle = setTimeout(createConnection, delay); + this.queue.push(timeoutHandle); } /*! * Calls resume on each connection, allowing `message` events to fire off again. @@ -416,7 +409,7 @@ class ConnectionPool extends EventEmitter { */ resume() { this.isPaused = false; - this.connections.forEach(function(connection) { + this.connections.forEach(connection => { connection.resume(); }); } @@ -426,7 +419,7 @@ class ConnectionPool extends EventEmitter { * @private */ sendKeepAlives() { - this.connections.forEach(function(connection) { + this.connections.forEach(connection => { connection.write({}); }); } diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index 4c8ee52f9c9..baeecfe02f0 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -121,7 +121,7 @@ class Publisher { * * const data = Buffer.from('Hello, world!'); * - * const callback = function(err, messageId) { + * const callback = (err, messageId) => { * if (err) { * // Error handling omitted. * } @@ -142,7 +142,7 @@ class Publisher { * //- * // If the callback is omitted, we'll return a Promise. * //- - * publisher.publish(data).then(function(messageId) {}); + * publisher.publish(data).then((messageId) => {}); */ publish(data, attributes, callback) { if (!(data instanceof Buffer)) { @@ -207,9 +207,9 @@ class Publisher { reqOpts: reqOpts, gaxOpts: this.settings.gaxOpts, }, - function(err, resp) { + (err, resp) => { const messageIds = arrify(resp && resp.messageIds); - each(callbacks, function(callback, next) { + each(callbacks, (callback, next) => { const messageId = messageIds[callbacks.indexOf(callback)]; callback(err, messageId); next(); diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.js index 1f22a04318c..64bc4710c39 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.js @@ -43,7 +43,7 @@ const is = require('is'); * //- * // From {@link PubSub#getSnapshots}: * //- - * pubsub.getSnapshots(function(err, snapshots) { + * pubsub.getSnapshots((err, snapshots) => { * // `snapshots` is an array of Snapshot objects. * }); * @@ -52,7 +52,7 @@ const is = require('is'); * //- * pubsub.getSnapshotsStream() * .on('error', console.error) - * .on('data', function(snapshot) { + * .on('data', (snapshot) => { * // `snapshot` is a Snapshot object. * }); * @@ -67,7 +67,7 @@ const is = require('is'); * //- * const subscription = pubsub.subscription('my-subscription'); * - * subscription.createSnapshot('my-snapshot', function(err, snapshot) { + * subscription.createSnapshot('my-snapshot', (err, snapshot) => { * if (!err) { * // `snapshot` is a Snapshot object. * } @@ -78,7 +78,7 @@ const is = require('is'); * //- * const subscription = pubsub.subscription('my-subscription'); * - * subscription.seek('my-snapshot', function(err) { + * subscription.seek('my-snapshot', (err) => { * if (err) { * // Error handling omitted. * } @@ -111,7 +111,7 @@ class Snapshot { * const subscription = pubsub.subscription('my-subscription'); * const snapshot = subscription.snapshot('my-snapshot'); * - * const callback = function(err, snapshot, apiResponse) { + * const callback = (err, snapshot, apiResponse) => { * if (!err) { * // The snapshot was created successfully. * } @@ -122,7 +122,7 @@ class Snapshot { * //- * // If the callback is omitted, we'll return a Promise. * //- - * snapshot.create('my-snapshot').then(function(data) { + * snapshot.create('my-snapshot').then((data) => { * const snapshot = data[0]; * const apiResponse = data[1]; * }); @@ -146,12 +146,12 @@ class Snapshot { * const subscription = pubsub.subscription('my-subscription'); * const snapshot = subscription.snapshot('my-snapshot'); * - * snapshot.seek(function(err, apiResponse) {}); + * snapshot.seek((err, apiResponse) => {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * snapshot.seek().then(function(data) { + * snapshot.seek().then((data) => { * const apiResponse = data[0]; * }); */ @@ -168,12 +168,12 @@ class Snapshot { * service. * * @example - * snapshot.delete(function(err, apiResponse) {}); + * snapshot.delete((err, apiResponse) => {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * snapshot.delete().then(function(data) { + * snapshot.delete().then((data) => { * const apiResponse = data[0]; * }); */ diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js index 16940a069c8..63712e8763b 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.js @@ -112,25 +112,22 @@ class Subscriber extends EventEmitter { * @return {Promise} */ acknowledge_(ackIds, connId) { - const self = this; ackIds = arrify(ackIds); - const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( - ackIdChunk - ) { - if (self.writeToStreams_ && self.isConnected_()) { - return self.writeTo_(connId, {ackIds: ackIdChunk}); + const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(ackIdChunk => { + if (this.writeToStreams_ && this.isConnected_()) { + return this.writeTo_(connId, {ackIds: ackIdChunk}); } - return promisify(self.request).call(self, { + return promisify(this.request).call(this, { client: 'SubscriberClient', method: 'acknowledge', reqOpts: { - subscription: self.name, + subscription: this.name, ackIds: ackIdChunk, }, }); }); - return Promise.all(promises).catch(function(err) { - self.emit('error', err); + return Promise.all(promises).catch(err => { + this.emit('error', err); }); } /*! @@ -169,7 +166,7 @@ class Subscriber extends EventEmitter { * Subscriber. * * @example - * Subscriber.close(function(err) { + * Subscriber.close((err) => { * if (err) { * // Error handling omitted. * } @@ -178,17 +175,16 @@ class Subscriber extends EventEmitter { * //- * // If the callback is omitted, we'll return a Promise. * //- - * Subscriber.close().then(function() {}); + * Subscriber.close().then(() => {}); */ close(callback) { - const self = this; this.userClosed_ = true; const inventory = this.inventory_; inventory.lease.length = inventory.bytes = 0; clearTimeout(this.leaseTimeoutHandle_); this.leaseTimeoutHandle_ = null; - this.flushQueues_().then(function() { - self.closeConnection_(callback); + this.flushQueues_().then(() => { + this.closeConnection_(callback); }); } /*! @@ -220,7 +216,6 @@ class Subscriber extends EventEmitter { * @private */ flushQueues_() { - const self = this; if (this.flushTimeoutHandle_) { this.flushTimeoutHandle_.clear(); this.flushTimeoutHandle_ = null; @@ -233,15 +228,15 @@ class Subscriber extends EventEmitter { const requests = []; if (acks.length) { requests.push( - this.acknowledge_(acks).then(function() { - self.inventory_.ack = []; + this.acknowledge_(acks).then(() => { + this.inventory_.ack = []; }) ); } if (nacks.length) { requests.push( - this.modifyAckDeadline_(nacks, 0).then(function() { - self.inventory_.nack = []; + this.modifyAckDeadline_(nacks, 0).then(() => { + this.inventory_.nack = []; }) ); } @@ -305,19 +300,18 @@ class Subscriber extends EventEmitter { * Subscriber.listenForEvents_(); */ listenForEvents_() { - const self = this; - this.on('newListener', function(event) { + this.on('newListener', event => { if (event === 'message') { - self.messageListeners++; - if (!self.connectionPool) { - self.userClosed_ = false; - self.openConnection_(); + this.messageListeners++; + if (!this.connectionPool) { + this.userClosed_ = false; + this.openConnection_(); } } }); - this.on('removeListener', function(event) { - if (event === 'message' && --self.messageListeners === 0) { - self.closeConnection_(); + this.on('removeListener', event => { + if (event === 'message' && --this.messageListeners === 0) { + this.closeConnection_(); } }); } @@ -332,29 +326,26 @@ class Subscriber extends EventEmitter { * @return {Promise} */ modifyAckDeadline_(ackIds, deadline, connId) { - const self = this; ackIds = arrify(ackIds); - const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(function( - ackIdChunk - ) { - if (self.writeToStreams_ && self.isConnected_()) { - return self.writeTo_(connId, { + const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(ackIdChunk => { + if (this.writeToStreams_ && this.isConnected_()) { + return this.writeTo_(connId, { modifyDeadlineAckIds: ackIdChunk, modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), }); } - return promisify(self.request).call(self, { + return promisify(this.request).call(this, { client: 'SubscriberClient', method: 'modifyAckDeadline', reqOpts: { - subscription: self.name, + subscription: this.name, ackDeadlineSeconds: deadline, ackIds: ackIdChunk, }, }); }); - return Promise.all(promises).catch(function(err) { - self.emit('error', err); + return Promise.all(promises).catch(err => { + this.emit('error', err); }); } /*! @@ -383,20 +374,19 @@ class Subscriber extends EventEmitter { * @private */ openConnection_() { - const self = this; const pool = (this.connectionPool = new ConnectionPool(this)); this.isOpen = true; - pool.on('error', function(err) { - self.emit('error', err); + pool.on('error', err => { + this.emit('error', err); }); - pool.on('message', function(message) { - self.emit('message', self.leaseMessage_(message)); - if (!pool.isPaused && self.hasMaxMessages_()) { + pool.on('message', message => { + this.emit('message', this.leaseMessage_(message)); + if (!pool.isPaused && this.hasMaxMessages_()) { pool.pause(); } }); - pool.once('connected', function() { - self.flushQueues_(); + pool.once('connected', () => { + this.flushQueues_(); }); } /*! @@ -406,7 +396,6 @@ class Subscriber extends EventEmitter { * @private */ renewLeases_() { - const self = this; clearTimeout(this.leaseTimeoutHandle_); this.leaseTimeoutHandle_ = null; if (!this.inventory_.lease.length) { @@ -415,8 +404,8 @@ class Subscriber extends EventEmitter { this.ackDeadline = this.histogram.percentile(99); const ackIds = this.inventory_.lease.slice(); const ackDeadlineSeconds = this.ackDeadline / 1000; - this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(function() { - self.setLeaseTimeout_(); + this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(() => { + this.setLeaseTimeout_(); }); } /*! @@ -464,19 +453,18 @@ class Subscriber extends EventEmitter { * @returns {Promise} */ writeTo_(connId, data) { - const self = this; const startTime = Date.now(); - return new Promise(function(resolve, reject) { - self.connectionPool.acquire(connId, function(err, connection) { + return new Promise((resolve, reject) => { + this.connectionPool.acquire(connId, (err, connection) => { if (err) { reject(err); return; } // we can ignore any errors that come from this since they'll be // re-emitted later - connection.write(data, function(err) { + connection.write(data, err => { if (!err) { - self.latency_.add(Date.now() - startTime); + this.latency_.add(Date.now() - startTime); } resolve(); }); diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.js index 7347746c64d..823933a9743 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.js @@ -22,9 +22,9 @@ const extend = require('extend'); const is = require('is'); const snakeCase = require('lodash.snakecase'); -const IAM = require('./iam.js'); -const Snapshot = require('./snapshot.js'); -const Subscriber = require('./subscriber.js'); +const IAM = require('./iam'); +const Snapshot = require('./snapshot'); +const Subscriber = require('./subscriber'); /** * A Subscription object will give you access to your Cloud Pub/Sub @@ -83,7 +83,7 @@ const Subscriber = require('./subscriber.js'); * //- * // From {@link PubSub#getSubscriptions}: * //- - * pubsub.getSubscriptions(function(err, subscriptions) { + * pubsub.getSubscriptions((err, subscriptions) => { * // `subscriptions` is an array of Subscription objects. * }); * @@ -91,7 +91,7 @@ const Subscriber = require('./subscriber.js'); * // From {@link Topic#getSubscriptions}: * //- * const topic = pubsub.topic('my-topic'); - * topic.getSubscriptions(function(err, subscriptions) { + * topic.getSubscriptions((err, subscriptions) => { * // `subscriptions` is an array of Subscription objects. * }); * @@ -99,7 +99,7 @@ const Subscriber = require('./subscriber.js'); * // From {@link Topic#createSubscription}: * //- * const topic = pubsub.topic('my-topic'); - * topic.createSubscription('new-subscription', function(err, subscription) { + * topic.createSubscription('new-subscription', (err, subscription) => { * // `subscription` is a Subscription object. * }); * @@ -116,7 +116,7 @@ const Subscriber = require('./subscriber.js'); * //- * * // Register an error handler. - * subscription.on('error', function(err) {}); + * subscription.on('error', (err) => {}); * * // Register a listener for `message` events. * function onMessage(message) { @@ -177,14 +177,14 @@ class Subscription extends Subscriber { * //- * // Get the IAM policy for your subscription. * //- - * subscription.iam.getPolicy(function(err, policy) { + * subscription.iam.getPolicy((err, policy) => { * console.log(policy); * }); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.iam.getPolicy().then(function(data) { + * subscription.iam.getPolicy().then((data) => { * const policy = data[0]; * const apiResponse = data[1]; * }); @@ -218,7 +218,7 @@ class Subscription extends Subscriber { * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * - * const callback = function(err, snapshot, apiResponse) { + * const callback = (err, snapshot, apiResponse) => { * if (!err) { * // The snapshot was created successfully. * } @@ -229,13 +229,12 @@ class Subscription extends Subscriber { * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.createSnapshot('my-snapshot').then(function(data) { + * subscription.createSnapshot('my-snapshot').then((data) => { * const snapshot = data[0]; * const apiResponse = data[1]; * }); */ createSnapshot(name, gaxOpts, callback) { - const self = this; if (!is.string(name)) { throw new Error('A name is required to create a snapshot.'); } @@ -243,7 +242,7 @@ class Subscription extends Subscriber { callback = gaxOpts; gaxOpts = {}; } - const snapshot = self.snapshot(name); + const snapshot = this.snapshot(name); const reqOpts = { name: snapshot.name, subscription: this.name, @@ -255,7 +254,7 @@ class Subscription extends Subscriber { reqOpts: reqOpts, gaxOpts: gaxOpts, }, - function(err, resp) { + (err, resp) => { if (err) { callback(err, null, resp); return; @@ -285,17 +284,16 @@ class Subscription extends Subscriber { * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * - * subscription.delete(function(err, apiResponse) {}); + * subscription.delete((err, apiResponse) => {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.delete().then(function(data) { + * subscription.delete().then((data) => { * const apiResponse = data[0]; * }); */ delete(gaxOpts, callback) { - const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -311,10 +309,10 @@ class Subscription extends Subscriber { reqOpts: reqOpts, gaxOpts: gaxOpts, }, - function(err, resp) { + (err, resp) => { if (!err) { - self.removeAllListeners(); - self.close(); + this.removeAllListeners(); + this.close(); } callback(err, resp); } @@ -342,17 +340,17 @@ class Subscription extends Subscriber { * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * - * subscription.exists(function(err, exists) {}); + * subscription.exists((err, exists) => {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.exists().then(function(data) { + * subscription.exists().then((data) => { * const exists = data[0]; * }); */ exists(callback) { - this.getMetadata(function(err) { + this.getMetadata(err => { if (!err) { callback(null, true); return; @@ -392,36 +390,35 @@ class Subscription extends Subscriber { * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * - * subscription.get(function(err, subscription, apiResponse) { + * subscription.get((err, subscription, apiResponse) => { * // The `subscription` data has been populated. * }); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.get().then(function(data) { + * subscription.get().then((data) => { * const subscription = data[0]; * const apiResponse = data[1]; * }); */ get(gaxOpts, callback) { - const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; } const autoCreate = !!gaxOpts.autoCreate && is.fn(this.create); delete gaxOpts.autoCreate; - this.getMetadata(gaxOpts, function(err, apiResponse) { + this.getMetadata(gaxOpts, (err, apiResponse) => { if (!err) { - callback(null, self, apiResponse); + callback(null, this, apiResponse); return; } if (err.code !== 5 || !autoCreate) { callback(err, null, apiResponse); return; } - self.create(gaxOpts, callback); + this.create(gaxOpts, callback); }); } /** @@ -448,7 +445,7 @@ class Subscription extends Subscriber { * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * - * subscription.getMetadata(function(err, apiResponse) { + * subscription.getMetadata((err, apiResponse) => { * if (err) { * // Error handling omitted. * } @@ -457,12 +454,11 @@ class Subscription extends Subscriber { * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.getMetadata().then(function(data) { + * subscription.getMetadata().then((data) => { * const apiResponse = data[0]; * }); */ getMetadata(gaxOpts, callback) { - const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -477,9 +473,9 @@ class Subscription extends Subscriber { reqOpts: reqOpts, gaxOpts: gaxOpts, }, - function(err, apiResponse) { + (err, apiResponse) => { if (!err) { - self.metadata = apiResponse; + this.metadata = apiResponse; } callback(err, apiResponse); } @@ -520,7 +516,7 @@ class Subscription extends Subscriber { * } * }; * - * subscription.modifyPushConfig(pushConfig, function(err, apiResponse) { + * subscription.modifyPushConfig(pushConfig, (err, apiResponse) => { * if (err) { * // Error handling omitted. * } @@ -529,7 +525,7 @@ class Subscription extends Subscriber { * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.modifyPushConfig(pushConfig).then(function(data) { + * subscription.modifyPushConfig(pushConfig).then((data) => { * const apiResponse = data[0]; * }); */ @@ -572,7 +568,7 @@ class Subscription extends Subscriber { * @returns {Promise} * * @example - * const callback = function(err, resp) { + * const callback = (err, resp) => { * if (!err) { * // Seek was successful. * } @@ -636,7 +632,7 @@ class Subscription extends Subscriber { * key: 'value' * }; * - * subscription.setMetadata(metadata, function(err, apiResponse) { + * subscription.setMetadata(metadata, (err, apiResponse) => { * if (err) { * // Error handling omitted. * } @@ -645,7 +641,7 @@ class Subscription extends Subscriber { * //- * // If the callback is omitted, we'll return a Promise. * //- - * subscription.setMetadata(metadata).then(function(data) { + * subscription.setMetadata(metadata).then((data) => { * const apiResponse = data[0]; * }); */ diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.js index 7954068c123..99c7e0803af 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.js @@ -89,14 +89,14 @@ class Topic { * //- * // Get the IAM policy for your topic. * //- - * topic.iam.getPolicy(function(err, policy) { + * topic.iam.getPolicy((err, policy) => { * console.log(policy); * }); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.iam.getPolicy().then(function(data) { + * topic.iam.getPolicy().then((data) => { * const policy = data[0]; * const apiResponse = data[1]; * }); @@ -117,7 +117,7 @@ class Topic { * * const topic = pubsub.topic('my-topic'); * - * topic.create(function(err, topic, apiResponse) { + * topic.create((err, topic, apiResponse) => { * if (!err) { * // The topic was created successfully. * } @@ -126,7 +126,7 @@ class Topic { * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.create().then(function(data) { + * topic.create().then((data) => { * const topic = data[0]; * const apiResponse = data[1]; * }); @@ -165,7 +165,7 @@ class Topic { * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.createSubscription('newMessages').then(function(data) { + * topic.createSubscription('newMessages').then((data) => { * const subscription = data[0]; * const apiResponse = data[1]; * }); @@ -191,12 +191,12 @@ class Topic { * * const topic = pubsub.topic('my-topic'); * - * topic.delete(function(err, apiResponse) {}); + * topic.delete((err, apiResponse) => {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.delete().then(function(data) { + * topic.delete().then((data) => { * const apiResponse = data[0]; * }); */ @@ -240,12 +240,12 @@ class Topic { * * const topic = pubsub.topic('my-topic'); * - * topic.exists(function(err, exists) {}); + * topic.exists((err, exists) => {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.exists().then(function(data) { + * topic.exists().then((data) => { * const exists = data[0]; * }); */ @@ -289,36 +289,35 @@ class Topic { * * const topic = pubsub.topic('my-topic'); * - * topic.get(function(err, topic, apiResponse) { + * topic.get((err, topic, apiResponse) => { * // The `topic` data has been populated. * }); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.get().then(function(data) { + * topic.get().then((data) => { * const topic = data[0]; * const apiResponse = data[1]; * }); */ get(gaxOpts, callback) { - const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; } const autoCreate = !!gaxOpts.autoCreate; delete gaxOpts.autoCreate; - this.getMetadata(gaxOpts, function(err, apiResponse) { + this.getMetadata(gaxOpts, (err, apiResponse) => { if (!err) { - callback(null, self, apiResponse); + callback(null, this, apiResponse); return; } if (err.code !== 5 || !autoCreate) { callback(err, null, apiResponse); return; } - self.create(gaxOpts, callback); + this.create(gaxOpts, callback); }); } /** @@ -346,17 +345,16 @@ class Topic { * * const topic = pubsub.topic('my-topic'); * - * topic.getMetadata(function(err, apiResponse) {}); + * topic.getMetadata((err, apiResponse) => {}); * * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.getMetadata().then(function(data) { + * topic.getMetadata().then((data) => { * const apiResponse = data[0]; * }); */ getMetadata(gaxOpts, callback) { - const self = this; if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -371,9 +369,9 @@ class Topic { reqOpts: reqOpts, gaxOpts: gaxOpts, }, - function(err, apiResponse) { + (err, apiResponse) => { if (!err) { - self.metadata = apiResponse; + this.metadata = apiResponse; } callback(err, apiResponse); } @@ -398,7 +396,7 @@ class Topic { * * const topic = pubsub.topic('my-topic'); * - * topic.getSubscriptions(function(err, subscriptions) { + * topic.getSubscriptions((err, subscriptions) => { * // subscriptions is an array of `Subscription` objects. * }); * @@ -410,7 +408,7 @@ class Topic { * //- * // If the callback is omitted, we'll return a Promise. * //- - * topic.getSubscriptions().then(function(data) { + * topic.getSubscriptions().then((data) => { * const subscriptions = data[0]; * }); */ @@ -474,7 +472,7 @@ class Topic { * const topic = pubsub.topic('my-topic'); * const publisher = topic.publisher(); * - * publisher.publish(Buffer.from('Hello, world!'), function(err, messageId) { + * publisher.publish(Buffer.from('Hello, world!'), (err, messageId) => { * if (err) { * // Error handling omitted. * } @@ -513,7 +511,7 @@ class Topic { * const subscription = topic.subscription('my-subscription'); * * // Register a listener for `message` events. - * subscription.on('message', function(message) { + * subscription.on('message', (message) => { * // Called every time a message is received. * // message.id = ID of the message. * // message.ackId = ID used to acknowledge the message receival. @@ -561,10 +559,10 @@ class Topic { * * topic.getSubscriptionsStream() * .on('error', console.error) - * .on('data', function(subscription) { + * .on('data', (subscription) => { * // subscription is a Subscription object. * }) - * .on('end', function() { + * .on('end', () => { * // All subscriptions retrieved. * }); * From 4ea01e6edb1e9500d477332835db4e6c540a91f3 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Wed, 22 Aug 2018 07:23:43 -0700 Subject: [PATCH 0202/1115] chore: make the CircleCI config consistent --- handwritten/pubsub/.circleci/config.yml | 6 +- .../pubsub/smoke-test/publisher_smoke_test.js | 26 +- handwritten/pubsub/test/gapic-v1.js | 576 +++++++++--------- 3 files changed, 304 insertions(+), 304 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index dd4c80cc6e9..41c82336dbb 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -59,7 +59,7 @@ jobs: - image: 'node:6' user: node steps: &unit_tests_steps - - checkout + - checkout - run: &npm_install_and_link name: Install and link the module command: |- @@ -69,7 +69,7 @@ jobs: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: npm test - run: node_modules/.bin/codecov - + node8: docker: - image: 'node:8' @@ -165,4 +165,4 @@ jobs: steps: - checkout - run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc' - - run: npm publish --access=public \ No newline at end of file + - run: npm publish --access=public diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index f2cc1a2d782..16e2d5dfe9e 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -18,21 +18,21 @@ describe('PublisherSmokeTest', () => { if (!process.env.GCLOUD_PROJECT) { throw new Error("Usage: GCLOUD_PROJECT= node #{$0}"); } - const projectId = process.env.GCLOUD_PROJECT; + var projectId = process.env.GCLOUD_PROJECT; it('successfully makes a call to the service using promises', done => { const pubsub = require('../src'); - const client = new pubsub.v1.PublisherClient({ + var client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); // Iterate over all elements. - const formattedProject = client.projectPath(projectId); + var formattedProject = client.projectPath(projectId); client.listTopics({project: formattedProject}) .then(responses => { - const resources = responses[0]; + var resources = responses[0]; for (let i = 0; i < resources.length; i += 1) { console.log(resources[i]); } @@ -44,22 +44,22 @@ describe('PublisherSmokeTest', () => { it('successfully makes a call to the service using callbacks', done => { const pubsub = require('../src'); - const client = new pubsub.v1.PublisherClient({ + var client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); // Or obtain the paged response. - const formattedProject = client.projectPath(projectId); + var formattedProject = client.projectPath(projectId); - const options = {autoPaginate: false}; - const callback = responses => { + var options = {autoPaginate: false}; + var callback = responses => { // The actual resources in a response. - const resources = responses[0]; + var resources = responses[0]; // The next request if the response shows that there are more responses. - const nextRequest = responses[1]; + var nextRequest = responses[1]; // The actual response object, if necessary. - // const rawResponse = responses[2]; + // var rawResponse = responses[2]; for (let i = 0; i < resources.length; i += 1) { console.log(resources[i]); } @@ -77,11 +77,11 @@ describe('PublisherSmokeTest', () => { it('successfully makes a call to the service using streaming', done => { const pubsub = require('../src'); - const client = new pubsub.v1.PublisherClient({ + var client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); - const formattedProject = client.projectPath(projectId); + var formattedProject = client.projectPath(projectId); client.listTopicsStream({project: formattedProject}) .on('data', element => { console.log(element); diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index e5a2b357ece..732c3306d45 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -19,27 +19,27 @@ const through2 = require('through2'); const pubsubModule = require('../src'); -const FAKE_STATUS_CODE = 1; -const error = new Error(); +var FAKE_STATUS_CODE = 1; +var error = new Error(); error.code = FAKE_STATUS_CODE; describe('PublisherClient', () => { describe('createTopic', () => { it('invokes createTopic without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { name: formattedName, }; // Mock response - const name2 = 'name2-1052831874'; - const expectedResponse = { + var name2 = 'name2-1052831874'; + var expectedResponse = { name: name2, }; @@ -57,14 +57,14 @@ describe('PublisherClient', () => { }); it('invokes createTopic with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { name: formattedName, }; @@ -86,22 +86,22 @@ describe('PublisherClient', () => { describe('updateTopic', () => { it('invokes updateTopic without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const topic = {}; - const updateMask = {}; - const request = { + var topic = {}; + var updateMask = {}; + var request = { topic: topic, updateMask: updateMask, }; // Mock response - const name = 'name3373707'; - const expectedResponse = { + var name = 'name3373707'; + var expectedResponse = { name: name, }; @@ -119,15 +119,15 @@ describe('PublisherClient', () => { }); it('invokes updateTopic with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const topic = {}; - const updateMask = {}; - const request = { + var topic = {}; + var updateMask = {}; + var request = { topic: topic, updateMask: updateMask, }; @@ -150,27 +150,27 @@ describe('PublisherClient', () => { describe('publish', () => { it('invokes publish without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const data = '-86'; - const messagesElement = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var data = '-86'; + var messagesElement = { data: data, }; - const messages = [messagesElement]; - const request = { + var messages = [messagesElement]; + var request = { topic: formattedTopic, messages: messages, }; // Mock response - const messageIdsElement = 'messageIdsElement-744837059'; - const messageIds = [messageIdsElement]; - const expectedResponse = { + var messageIdsElement = 'messageIdsElement-744837059'; + var messageIds = [messageIdsElement]; + var expectedResponse = { messageIds: messageIds, }; @@ -188,19 +188,19 @@ describe('PublisherClient', () => { }); it('invokes publish with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const data = '-86'; - const messagesElement = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var data = '-86'; + var messagesElement = { data: data, }; - const messages = [messagesElement]; - const request = { + var messages = [messagesElement]; + var request = { topic: formattedTopic, messages: messages, }; @@ -223,20 +223,20 @@ describe('PublisherClient', () => { describe('getTopic', () => { it('invokes getTopic without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { topic: formattedTopic, }; // Mock response - const name = 'name3373707'; - const expectedResponse = { + var name = 'name3373707'; + var expectedResponse = { name: name, }; @@ -254,14 +254,14 @@ describe('PublisherClient', () => { }); it('invokes getTopic with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { topic: formattedTopic, }; @@ -283,22 +283,22 @@ describe('PublisherClient', () => { describe('listTopics', () => { it('invokes listTopics without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { + var formattedProject = client.projectPath('[PROJECT]'); + var request = { project: formattedProject, }; // Mock response - const nextPageToken = ''; - const topicsElement = {}; - const topics = [topicsElement]; - const expectedResponse = { + var nextPageToken = ''; + var topicsElement = {}; + var topics = [topicsElement]; + var expectedResponse = { nextPageToken: nextPageToken, topics: topics, }; @@ -317,14 +317,14 @@ describe('PublisherClient', () => { }); it('invokes listTopics with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { + var formattedProject = client.projectPath('[PROJECT]'); + var request = { project: formattedProject, }; @@ -346,22 +346,22 @@ describe('PublisherClient', () => { describe('listTopicSubscriptions', () => { it('invokes listTopicSubscriptions without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { topic: formattedTopic, }; // Mock response - const nextPageToken = ''; - const subscriptionsElement = 'subscriptionsElement1698708147'; - const subscriptions = [subscriptionsElement]; - const expectedResponse = { + var nextPageToken = ''; + var subscriptionsElement = 'subscriptionsElement1698708147'; + var subscriptions = [subscriptionsElement]; + var expectedResponse = { nextPageToken: nextPageToken, subscriptions: subscriptions, }; @@ -384,14 +384,14 @@ describe('PublisherClient', () => { }); it('invokes listTopicSubscriptions with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { topic: formattedTopic, }; @@ -413,14 +413,14 @@ describe('PublisherClient', () => { describe('deleteTopic', () => { it('invokes deleteTopic without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { topic: formattedTopic, }; @@ -434,14 +434,14 @@ describe('PublisherClient', () => { }); it('invokes deleteTopic with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { topic: formattedTopic, }; @@ -462,23 +462,23 @@ describe('PublisherClient', () => { describe('setIamPolicy', () => { it('invokes setIamPolicy without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const policy = {}; - const request = { + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var policy = {}; + var request = { resource: formattedResource, policy: policy, }; // Mock response - const version = 351608024; - const etag = '21'; - const expectedResponse = { + var version = 351608024; + var etag = '21'; + var expectedResponse = { version: version, etag: etag, }; @@ -497,15 +497,15 @@ describe('PublisherClient', () => { }); it('invokes setIamPolicy with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const policy = {}; - const request = { + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var policy = {}; + var request = { resource: formattedResource, policy: policy, }; @@ -528,21 +528,21 @@ describe('PublisherClient', () => { describe('getIamPolicy', () => { it('invokes getIamPolicy without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { resource: formattedResource, }; // Mock response - const version = 351608024; - const etag = '21'; - const expectedResponse = { + var version = 351608024; + var etag = '21'; + var expectedResponse = { version: version, etag: etag, }; @@ -561,14 +561,14 @@ describe('PublisherClient', () => { }); it('invokes getIamPolicy with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { resource: formattedResource, }; @@ -590,21 +590,21 @@ describe('PublisherClient', () => { describe('testIamPermissions', () => { it('invokes testIamPermissions without error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const permissions = []; - const request = { + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var permissions = []; + var request = { resource: formattedResource, permissions: permissions, }; // Mock response - const expectedResponse = {}; + var expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( @@ -620,15 +620,15 @@ describe('PublisherClient', () => { }); it('invokes testIamPermissions with error', done => { - const client = new pubsubModule.v1.PublisherClient({ + var client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const permissions = []; - const request = { + var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + var permissions = []; + var request = { resource: formattedResource, permissions: permissions, }; @@ -652,28 +652,28 @@ describe('PublisherClient', () => { describe('SubscriberClient', () => { describe('createSubscription', () => { it('invokes createSubscription without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedName = client.subscriptionPath( + var formattedName = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { name: formattedName, topic: formattedTopic, }; // Mock response - const name2 = 'name2-1052831874'; - const topic2 = 'topic2-1139259102'; - const ackDeadlineSeconds = 2135351438; - const retainAckedMessages = false; - const expectedResponse = { + var name2 = 'name2-1052831874'; + var topic2 = 'topic2-1139259102'; + var ackDeadlineSeconds = 2135351438; + var retainAckedMessages = false; + var expectedResponse = { name: name2, topic: topic2, ackDeadlineSeconds: ackDeadlineSeconds, @@ -694,18 +694,18 @@ describe('SubscriberClient', () => { }); it('invokes createSubscription with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedName = client.subscriptionPath( + var formattedName = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { + var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + var request = { name: formattedName, topic: formattedTopic, }; @@ -728,26 +728,26 @@ describe('SubscriberClient', () => { describe('getSubscription', () => { it('invokes getSubscription without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { subscription: formattedSubscription, }; // Mock response - const name = 'name3373707'; - const topic = 'topic110546223'; - const ackDeadlineSeconds = 2135351438; - const retainAckedMessages = false; - const expectedResponse = { + var name = 'name3373707'; + var topic = 'topic110546223'; + var ackDeadlineSeconds = 2135351438; + var retainAckedMessages = false; + var expectedResponse = { name: name, topic: topic, ackDeadlineSeconds: ackDeadlineSeconds, @@ -768,17 +768,17 @@ describe('SubscriberClient', () => { }); it('invokes getSubscription with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { subscription: formattedSubscription, }; @@ -800,32 +800,32 @@ describe('SubscriberClient', () => { describe('updateSubscription', () => { it('invokes updateSubscription without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const ackDeadlineSeconds = 42; - const subscription = { + var ackDeadlineSeconds = 42; + var subscription = { ackDeadlineSeconds: ackDeadlineSeconds, }; - const pathsElement = 'ack_deadline_seconds'; - const paths = [pathsElement]; - const updateMask = { + var pathsElement = 'ack_deadline_seconds'; + var paths = [pathsElement]; + var updateMask = { paths: paths, }; - const request = { + var request = { subscription: subscription, updateMask: updateMask, }; // Mock response - const name = 'name3373707'; - const topic = 'topic110546223'; - const ackDeadlineSeconds2 = 921632575; - const retainAckedMessages = false; - const expectedResponse = { + var name = 'name3373707'; + var topic = 'topic110546223'; + var ackDeadlineSeconds2 = 921632575; + var retainAckedMessages = false; + var expectedResponse = { name: name, topic: topic, ackDeadlineSeconds: ackDeadlineSeconds2, @@ -846,22 +846,22 @@ describe('SubscriberClient', () => { }); it('invokes updateSubscription with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const ackDeadlineSeconds = 42; - const subscription = { + var ackDeadlineSeconds = 42; + var subscription = { ackDeadlineSeconds: ackDeadlineSeconds, }; - const pathsElement = 'ack_deadline_seconds'; - const paths = [pathsElement]; - const updateMask = { + var pathsElement = 'ack_deadline_seconds'; + var paths = [pathsElement]; + var updateMask = { paths: paths, }; - const request = { + var request = { subscription: subscription, updateMask: updateMask, }; @@ -884,22 +884,22 @@ describe('SubscriberClient', () => { describe('listSubscriptions', () => { it('invokes listSubscriptions without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { + var formattedProject = client.projectPath('[PROJECT]'); + var request = { project: formattedProject, }; // Mock response - const nextPageToken = ''; - const subscriptionsElement = {}; - const subscriptions = [subscriptionsElement]; - const expectedResponse = { + var nextPageToken = ''; + var subscriptionsElement = {}; + var subscriptions = [subscriptionsElement]; + var expectedResponse = { nextPageToken: nextPageToken, subscriptions: subscriptions, }; @@ -922,14 +922,14 @@ describe('SubscriberClient', () => { }); it('invokes listSubscriptions with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { + var formattedProject = client.projectPath('[PROJECT]'); + var request = { project: formattedProject, }; @@ -951,17 +951,17 @@ describe('SubscriberClient', () => { describe('deleteSubscription', () => { it('invokes deleteSubscription without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { subscription: formattedSubscription, }; @@ -975,17 +975,17 @@ describe('SubscriberClient', () => { }); it('invokes deleteSubscription with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { subscription: formattedSubscription, }; @@ -1006,19 +1006,19 @@ describe('SubscriberClient', () => { describe('modifyAckDeadline', () => { it('invokes modifyAckDeadline without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const ackIds = []; - const ackDeadlineSeconds = 2135351438; - const request = { + var ackIds = []; + var ackDeadlineSeconds = 2135351438; + var request = { subscription: formattedSubscription, ackIds: ackIds, ackDeadlineSeconds: ackDeadlineSeconds, @@ -1034,19 +1034,19 @@ describe('SubscriberClient', () => { }); it('invokes modifyAckDeadline with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const ackIds = []; - const ackDeadlineSeconds = 2135351438; - const request = { + var ackIds = []; + var ackDeadlineSeconds = 2135351438; + var request = { subscription: formattedSubscription, ackIds: ackIds, ackDeadlineSeconds: ackDeadlineSeconds, @@ -1069,18 +1069,18 @@ describe('SubscriberClient', () => { describe('acknowledge', () => { it('invokes acknowledge without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const ackIds = []; - const request = { + var ackIds = []; + var request = { subscription: formattedSubscription, ackIds: ackIds, }; @@ -1095,18 +1095,18 @@ describe('SubscriberClient', () => { }); it('invokes acknowledge with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const ackIds = []; - const request = { + var ackIds = []; + var request = { subscription: formattedSubscription, ackIds: ackIds, }; @@ -1128,24 +1128,24 @@ describe('SubscriberClient', () => { describe('pull', () => { it('invokes pull without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const maxMessages = 496131527; - const request = { + var maxMessages = 496131527; + var request = { subscription: formattedSubscription, maxMessages: maxMessages, }; // Mock response - const expectedResponse = {}; + var expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.pull = mockSimpleGrpcMethod( @@ -1161,18 +1161,18 @@ describe('SubscriberClient', () => { }); it('invokes pull with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const maxMessages = 496131527; - const request = { + var maxMessages = 496131527; + var request = { subscription: formattedSubscription, maxMessages: maxMessages, }; @@ -1191,26 +1191,26 @@ describe('SubscriberClient', () => { describe('streamingPull', () => { it('invokes streamingPull without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const streamAckDeadlineSeconds = 1875467245; - const request = { + var streamAckDeadlineSeconds = 1875467245; + var request = { subscription: formattedSubscription, streamAckDeadlineSeconds: streamAckDeadlineSeconds, }; // Mock response - const receivedMessagesElement = {}; - const receivedMessages = [receivedMessagesElement]; - const expectedResponse = { + var receivedMessagesElement = {}; + var receivedMessages = [receivedMessagesElement]; + var expectedResponse = { receivedMessages: receivedMessages, }; @@ -1220,7 +1220,7 @@ describe('SubscriberClient', () => { expectedResponse ); - const stream = client + var stream = client .streamingPull() .on('data', response => { assert.deepStrictEqual(response, expectedResponse); @@ -1234,18 +1234,18 @@ describe('SubscriberClient', () => { }); it('invokes streamingPull with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const streamAckDeadlineSeconds = 1875467245; - const request = { + var streamAckDeadlineSeconds = 1875467245; + var request = { subscription: formattedSubscription, streamAckDeadlineSeconds: streamAckDeadlineSeconds, }; @@ -1257,7 +1257,7 @@ describe('SubscriberClient', () => { error ); - const stream = client + var stream = client .streamingPull() .on('data', () => { assert.fail(); @@ -1274,18 +1274,18 @@ describe('SubscriberClient', () => { describe('modifyPushConfig', () => { it('invokes modifyPushConfig without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const pushConfig = {}; - const request = { + var pushConfig = {}; + var request = { subscription: formattedSubscription, pushConfig: pushConfig, }; @@ -1300,18 +1300,18 @@ describe('SubscriberClient', () => { }); it('invokes modifyPushConfig with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const pushConfig = {}; - const request = { + var pushConfig = {}; + var request = { subscription: formattedSubscription, pushConfig: pushConfig, }; @@ -1333,22 +1333,22 @@ describe('SubscriberClient', () => { describe('listSnapshots', () => { it('invokes listSnapshots without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { + var formattedProject = client.projectPath('[PROJECT]'); + var request = { project: formattedProject, }; // Mock response - const nextPageToken = ''; - const snapshotsElement = {}; - const snapshots = [snapshotsElement]; - const expectedResponse = { + var nextPageToken = ''; + var snapshotsElement = {}; + var snapshots = [snapshotsElement]; + var expectedResponse = { nextPageToken: nextPageToken, snapshots: snapshots, }; @@ -1371,14 +1371,14 @@ describe('SubscriberClient', () => { }); it('invokes listSnapshots with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { + var formattedProject = client.projectPath('[PROJECT]'); + var request = { project: formattedProject, }; @@ -1400,26 +1400,26 @@ describe('SubscriberClient', () => { describe('createSnapshot', () => { it('invokes createSnapshot without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - const formattedSubscription = client.subscriptionPath( + var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { name: formattedName, subscription: formattedSubscription, }; // Mock response - const name2 = 'name2-1052831874'; - const topic = 'topic110546223'; - const expectedResponse = { + var name2 = 'name2-1052831874'; + var topic = 'topic110546223'; + var expectedResponse = { name: name2, topic: topic, }; @@ -1438,18 +1438,18 @@ describe('SubscriberClient', () => { }); it('invokes createSnapshot with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - const formattedSubscription = client.subscriptionPath( + var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { name: formattedName, subscription: formattedSubscription, }; @@ -1472,33 +1472,33 @@ describe('SubscriberClient', () => { describe('updateSnapshot', () => { it('invokes updateSnapshot without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const seconds = 123456; - const expireTime = { + var seconds = 123456; + var expireTime = { seconds: seconds, }; - const snapshot = { + var snapshot = { expireTime: expireTime, }; - const pathsElement = 'expire_time'; - const paths = [pathsElement]; - const updateMask = { + var pathsElement = 'expire_time'; + var paths = [pathsElement]; + var updateMask = { paths: paths, }; - const request = { + var request = { snapshot: snapshot, updateMask: updateMask, }; // Mock response - const name = 'name3373707'; - const topic = 'topic110546223'; - const expectedResponse = { + var name = 'name3373707'; + var topic = 'topic110546223'; + var expectedResponse = { name: name, topic: topic, }; @@ -1517,25 +1517,25 @@ describe('SubscriberClient', () => { }); it('invokes updateSnapshot with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const seconds = 123456; - const expireTime = { + var seconds = 123456; + var expireTime = { seconds: seconds, }; - const snapshot = { + var snapshot = { expireTime: expireTime, }; - const pathsElement = 'expire_time'; - const paths = [pathsElement]; - const updateMask = { + var pathsElement = 'expire_time'; + var paths = [pathsElement]; + var updateMask = { paths: paths, }; - const request = { + var request = { snapshot: snapshot, updateMask: updateMask, }; @@ -1558,14 +1558,14 @@ describe('SubscriberClient', () => { describe('deleteSnapshot', () => { it('invokes deleteSnapshot without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - const request = { + var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + var request = { snapshot: formattedSnapshot, }; @@ -1579,14 +1579,14 @@ describe('SubscriberClient', () => { }); it('invokes deleteSnapshot with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - const request = { + var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + var request = { snapshot: formattedSnapshot, }; @@ -1607,22 +1607,22 @@ describe('SubscriberClient', () => { describe('seek', () => { it('invokes seek without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { subscription: formattedSubscription, }; // Mock response - const expectedResponse = {}; + var expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.seek = mockSimpleGrpcMethod( @@ -1638,17 +1638,17 @@ describe('SubscriberClient', () => { }); it('invokes seek with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedSubscription = client.subscriptionPath( + var formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { subscription: formattedSubscription, }; @@ -1666,26 +1666,26 @@ describe('SubscriberClient', () => { describe('setIamPolicy', () => { it('invokes setIamPolicy without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.subscriptionPath( + var formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const policy = {}; - const request = { + var policy = {}; + var request = { resource: formattedResource, policy: policy, }; // Mock response - const version = 351608024; - const etag = '21'; - const expectedResponse = { + var version = 351608024; + var etag = '21'; + var expectedResponse = { version: version, etag: etag, }; @@ -1704,18 +1704,18 @@ describe('SubscriberClient', () => { }); it('invokes setIamPolicy with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.subscriptionPath( + var formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const policy = {}; - const request = { + var policy = {}; + var request = { resource: formattedResource, policy: policy, }; @@ -1738,24 +1738,24 @@ describe('SubscriberClient', () => { describe('getIamPolicy', () => { it('invokes getIamPolicy without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.subscriptionPath( + var formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { resource: formattedResource, }; // Mock response - const version = 351608024; - const etag = '21'; - const expectedResponse = { + var version = 351608024; + var etag = '21'; + var expectedResponse = { version: version, etag: etag, }; @@ -1774,17 +1774,17 @@ describe('SubscriberClient', () => { }); it('invokes getIamPolicy with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.subscriptionPath( + var formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const request = { + var request = { resource: formattedResource, }; @@ -1806,24 +1806,24 @@ describe('SubscriberClient', () => { describe('testIamPermissions', () => { it('invokes testIamPermissions without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.subscriptionPath( + var formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const permissions = []; - const request = { + var permissions = []; + var request = { resource: formattedResource, permissions: permissions, }; // Mock response - const expectedResponse = {}; + var expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( @@ -1839,18 +1839,18 @@ describe('SubscriberClient', () => { }); it('invokes testIamPermissions with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ + var client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - const formattedResource = client.subscriptionPath( + var formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - const permissions = []; - const request = { + var permissions = []; + var request = { resource: formattedResource, permissions: permissions, }; @@ -1887,7 +1887,7 @@ function mockSimpleGrpcMethod(expectedRequest, response, error) { function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { return () => { - const mockStream = through2.obj((chunk, enc, callback) => { + var mockStream = through2.obj((chunk, enc, callback) => { assert.deepStrictEqual(chunk, expectedRequest); if (error) { callback(error); From c1b5047a7dc5937c33a19311f137ac2bd4c6d698 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Wed, 22 Aug 2018 17:53:42 -0700 Subject: [PATCH 0203/1115] fix(deps): update dependency google-gax to ^0.19.0 (#216) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3fd2da5862c..9e3d4be10d5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -73,7 +73,7 @@ "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auth-library": "^1.6.0", - "google-gax": "^0.18.0", + "google-gax": "^0.19.0", "google-proto-files": "^0.16.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", From 5e55a710869cf966f8e9bc8a630da4f5d9d2ffbe Mon Sep 17 00:00:00 2001 From: DPE bot Date: Mon, 27 Aug 2018 11:16:36 -0700 Subject: [PATCH 0204/1115] Update the CI config (#220) --- handwritten/pubsub/.circleci/config.yml | 7 ++--- handwritten/pubsub/.kokoro/common.cfg | 24 ++++++++++++++++ handwritten/pubsub/.kokoro/docs.sh | 23 +++++++++++++++ handwritten/pubsub/.kokoro/lint.sh | 29 +++++++++++++++++++ handwritten/pubsub/.kokoro/samples-test.sh | 33 ++++++++++++++++++++++ handwritten/pubsub/.kokoro/system-test.sh | 26 +++++++++++++++++ handwritten/pubsub/.kokoro/test.bat | 26 +++++++++++++++++ handwritten/pubsub/.kokoro/test.sh | 23 +++++++++++++++ handwritten/pubsub/.kokoro/trampoline.sh | 27 ++++++++++++++++++ 9 files changed, 214 insertions(+), 4 deletions(-) create mode 100644 handwritten/pubsub/.kokoro/common.cfg create mode 100644 handwritten/pubsub/.kokoro/docs.sh create mode 100644 handwritten/pubsub/.kokoro/lint.sh create mode 100644 handwritten/pubsub/.kokoro/samples-test.sh create mode 100644 handwritten/pubsub/.kokoro/system-test.sh create mode 100644 handwritten/pubsub/.kokoro/test.bat create mode 100644 handwritten/pubsub/.kokoro/test.sh create mode 100644 handwritten/pubsub/.kokoro/trampoline.sh diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 41c82336dbb..eab76c4a6ba 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -107,9 +107,7 @@ jobs: steps: - checkout - run: *npm_install_and_link - - run: - name: Build documentation. - command: npm run docs + - run: npm run docs sample_tests: docker: - image: 'node:8' @@ -164,5 +162,6 @@ jobs: user: node steps: - checkout - - run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc' + - npm install + - run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc - run: npm publish --access=public diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg new file mode 100644 index 00000000000..e62c5337feb --- /dev/null +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/docs.sh b/handwritten/pubsub/.kokoro/docs.sh new file mode 100644 index 00000000000..1d288f3d475 --- /dev/null +++ b/handwritten/pubsub/.kokoro/docs.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -xeo pipefail + +cd $(dirname $0)/.. + +npm install + +npm run docs diff --git a/handwritten/pubsub/.kokoro/lint.sh b/handwritten/pubsub/.kokoro/lint.sh new file mode 100644 index 00000000000..9d29203edc2 --- /dev/null +++ b/handwritten/pubsub/.kokoro/lint.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -xeo pipefail + +cd $(dirname $0)/.. + +npm install + +# Install and link samples +cd samples/ +npm link ../ +npm install +cd .. + +npm run lint diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh new file mode 100644 index 00000000000..93af79aa3b3 --- /dev/null +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -xeo pipefail + +# Setup service account credentials. +export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json +export GCLOUD_PROJECT=long-door-651 + +cd $(dirname $0)/.. + +npm install + +# Install and link samples +cd samples/ +npm link ../ +npm install +cd .. + +npm run samples-test diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh new file mode 100644 index 00000000000..299032dc3a2 --- /dev/null +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -xeo pipefail + +# Setup service account credentials. +export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json + +cd $(dirname $0)/.. + +npm install + +npm run system-test diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat new file mode 100644 index 00000000000..a8534ba801c --- /dev/null +++ b/handwritten/pubsub/.kokoro/test.bat @@ -0,0 +1,26 @@ +@rem Copyright 2018 gRPC authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. + +@echo "Starting Windows build" + +cd /d %~dp0 +cd .. + +call npm install || goto :error +call npm run test || goto :error + +goto :EOF + +:error +exit /b 1 diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh new file mode 100644 index 00000000000..7f49f6d32ee --- /dev/null +++ b/handwritten/pubsub/.kokoro/test.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -xeo pipefail + +cd $(dirname $0)/.. + +npm install +npm test +node_modules/.bin/codecov diff --git a/handwritten/pubsub/.kokoro/trampoline.sh b/handwritten/pubsub/.kokoro/trampoline.sh new file mode 100644 index 00000000000..87ffd2ca960 --- /dev/null +++ b/handwritten/pubsub/.kokoro/trampoline.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# Copyright 2017 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -xeo pipefail + +# Always run the cleanup script, regardless of the success of bouncing into +# the container. +function cleanup() { + chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh + ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh + echo "cleanup"; +} +trap cleanup EXIT + +python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" From 7ff7e059dbc26baa20385ea88835ff19293dbd5f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 28 Aug 2018 07:59:29 -0700 Subject: [PATCH 0205/1115] chore(deps): update dependency nyc to v13 (#225) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9e3d4be10d5..967f02ff9d4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -95,7 +95,7 @@ "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", "mocha": "^5.0.0", - "nyc": "^12.0.2", + "nyc": "^13.0.0", "power-assert": "^1.4.4", "prettier": "^1.9.1", "proxyquire": "^2.0.0" From 8b9e13a6728031f9b8182023e17520ddaaf3a61e Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 28 Aug 2018 13:18:59 -0700 Subject: [PATCH 0206/1115] Re-generate library using /synth.py (#227) --- handwritten/pubsub/.jsdoc.js | 4 ++-- .../.kokoro/continuous/node10/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/continuous/node10/test.cfg | 0 .../.kokoro/continuous/node6/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/continuous/node6/test.cfg | 0 .../.kokoro/continuous/node8/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/continuous/node8/docs.cfg | 4 ++++ .../pubsub/.kokoro/continuous/node8/lint.cfg | 4 ++++ .../.kokoro/continuous/node8/samples-test.cfg | 7 ++++++ .../.kokoro/continuous/node8/system-test.cfg | 7 ++++++ .../pubsub/.kokoro/continuous/node8/test.cfg | 0 .../.kokoro/presubmit/node10/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/presubmit/node10/test.cfg | 0 .../pubsub/.kokoro/presubmit/node6/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/presubmit/node6/test.cfg | 0 .../pubsub/.kokoro/presubmit/node8/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/presubmit/node8/docs.cfg | 4 ++++ .../pubsub/.kokoro/presubmit/node8/lint.cfg | 4 ++++ .../pubsub/.kokoro/presubmit/node8/test.cfg | 0 .../.kokoro/presubmit/windows/common.cfg | 9 +++++++ .../pubsub/.kokoro/presubmit/windows/test.cfg | 2 ++ .../v1/doc/google/protobuf/doc_field_mask.js | 6 +++++ .../v1/doc/google/protobuf/doc_timestamp.js | 8 ++++--- 23 files changed, 198 insertions(+), 5 deletions(-) create mode 100644 handwritten/pubsub/.kokoro/continuous/node10/common.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node10/test.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node6/common.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node6/test.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node8/common.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node8/docs.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node8/lint.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node8/samples-test.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node8/system-test.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node8/test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node10/common.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node10/test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node6/common.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node6/test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/common.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/docs.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/lint.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/windows/common.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/windows/test.cfg diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index eaf0f78e1f6..5f2af4d089b 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -1,5 +1,5 @@ /*! - * Copyright 2017 Google Inc. All Rights Reserved. + * Copyright 2018 Google LLC. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ module.exports = { includePattern: '\\.js$' }, templates: { - copyright: 'Copyright 2017 Google, Inc.', + copyright: 'Copyright 2018 Google, LLC.', includeDate: false, sourceFiles: false, systemName: '@google-cloud/pubsub', diff --git a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg new file mode 100644 index 00000000000..e62c5337feb --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/continuous/node6/common.cfg b/handwritten/pubsub/.kokoro/continuous/node6/common.cfg new file mode 100644 index 00000000000..bb61d855e80 --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node6/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:6" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node6/test.cfg b/handwritten/pubsub/.kokoro/continuous/node6/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/continuous/node8/common.cfg b/handwritten/pubsub/.kokoro/continuous/node8/common.cfg new file mode 100644 index 00000000000..580e2b62e6a --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node8/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:8" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node8/docs.cfg b/handwritten/pubsub/.kokoro/continuous/node8/docs.cfg new file mode 100644 index 00000000000..c8c5ddbe34b --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node8/docs.cfg @@ -0,0 +1,4 @@ +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/docs.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node8/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node8/lint.cfg new file mode 100644 index 00000000000..219d3808dea --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node8/lint.cfg @@ -0,0 +1,4 @@ +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/lint.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node8/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node8/samples-test.cfg new file mode 100644 index 00000000000..b0b5906e674 --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node8/samples-test.cfg @@ -0,0 +1,7 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/samples-test.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node8/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node8/system-test.cfg new file mode 100644 index 00000000000..7d6fa1ba740 --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node8/system-test.cfg @@ -0,0 +1,7 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/system-test.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node8/test.cfg b/handwritten/pubsub/.kokoro/continuous/node8/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg new file mode 100644 index 00000000000..e62c5337feb --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg new file mode 100644 index 00000000000..bb61d855e80 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:6" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node6/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node6/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg new file mode 100644 index 00000000000..580e2b62e6a --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:8" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/docs.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/docs.cfg new file mode 100644 index 00000000000..c8c5ddbe34b --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node8/docs.cfg @@ -0,0 +1,4 @@ +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/docs.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/lint.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/lint.cfg new file mode 100644 index 00000000000..219d3808dea --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node8/lint.cfg @@ -0,0 +1,4 @@ +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/lint.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/presubmit/windows/common.cfg b/handwritten/pubsub/.kokoro/presubmit/windows/common.cfg new file mode 100644 index 00000000000..7320db792a4 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/windows/common.cfg @@ -0,0 +1,9 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + diff --git a/handwritten/pubsub/.kokoro/presubmit/windows/test.cfg b/handwritten/pubsub/.kokoro/presubmit/windows/test.cfg new file mode 100644 index 00000000000..5ecab9ebede --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/windows/test.cfg @@ -0,0 +1,2 @@ +# Use the test file directly +build_file: "nodejs-pubsub/.kokoro/test.bat" diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js index c82c2b33949..d700752b7c6 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js @@ -218,6 +218,12 @@ * Note that oneof type names ("test_oneof" in this case) cannot be used in * paths. * + * ## Field Mask Verification + * + * The implementation of any API method which has a FieldMask type field in the + * request should verify the included field paths, and return an + * `INVALID_ARGUMENT` error if any path is duplicated or unmappable. + * * @property {string[]} paths * The set of field mask paths. * diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js index a02db52bdeb..51d8f40f54d 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js @@ -79,7 +79,9 @@ * {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional * seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), * are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone - * is required, though only UTC (as indicated by "Z") is presently supported. + * is required. A proto3 JSON serializer should always use UTC (as indicated by + * "Z") when printing the Timestamp type and a proto3 JSON parser should be + * able to accept both UTC and other timezones (as indicated by an offset). * * For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past * 01:30 UTC on January 15, 2017. @@ -90,8 +92,8 @@ * to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) * with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one * can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://cloud.google.com - * http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()) - * to obtain a formatter capable of generating timestamps in this format. + * http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- + * ) to obtain a formatter capable of generating timestamps in this format. * * @property {number} seconds * Represents seconds of UTC time since Unix epoch From 2b937a70441c359ed181da01295ac1c32454a31e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 30 Aug 2018 06:59:47 -0700 Subject: [PATCH 0207/1115] fix(deps): update dependency google-auth-library to v2 (#228) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 967f02ff9d4..88ad73f4d77 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -72,7 +72,7 @@ "delay": "^3.0.0", "duplexify": "^3.5.4", "extend": "^3.0.1", - "google-auth-library": "^1.6.0", + "google-auth-library": "^2.0.0", "google-gax": "^0.19.0", "google-proto-files": "^0.16.0", "is": "^3.0.1", From e8c4371da702dab903941c8a426d638805351725 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 30 Aug 2018 13:10:59 -0700 Subject: [PATCH 0208/1115] fix docs (#229) * fix pubsub_quickstart tag in samples/quickstart.js * regenerate scaffolding to fix docs * ignore & remove package-lock.json`s and ignore .vscode --- handwritten/pubsub/.gitignore | 6 +++- handwritten/pubsub/CONTRIBUTORS | 12 ++++++- handwritten/pubsub/README.md | 64 ++++++++++++++------------------- handwritten/pubsub/package.json | 16 +++++++-- 4 files changed, 55 insertions(+), 43 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index a03dee0d922..43ba03dde0c 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -4,8 +4,12 @@ .nyc_output docs/ out/ +build/ system-test/secrets.js system-test/*key.json *.lock .vscode -package-lock.json +**/package-lock.json +.DS_Store +google-cloud-logging-winston-*.tgz +google-cloud-logging-bunyan-*.tgz diff --git a/handwritten/pubsub/CONTRIBUTORS b/handwritten/pubsub/CONTRIBUTORS index a35eb2a19c5..8f89a49273b 100644 --- a/handwritten/pubsub/CONTRIBUTORS +++ b/handwritten/pubsub/CONTRIBUTORS @@ -6,21 +6,31 @@ Ace Nassri Alexander Fenster Ali Ijaz Sheikh +Alix Hamilton +Anish Karandikar Antono Vasiljev Chet Husk Christoph Tavan +Christopher Wilcox +DPE bot Dave Gramlich David Fox Dennis Eric Uldall Jan Pretzel Jason Dobry +Jonathan Lui Jun Mukai +Justin Beckwith Justin King +Kamal Aboul-Hosn Matthew Arbesfeld Song Wang Stephen Sawchuk -Tejasvi Nareddy +Tejasvi (Teju) Nareddy Tim Swast +chenyumic greenkeeper[bot] +lashae mkamioner +renovate[bot] diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index efcde60bc96..676d57f5935 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -1,3 +1,5 @@ +[//]: # "This README.md file is auto-generated, all changes to this file will be lost." +[//]: # "To regenerate it, use `npm run generate-scaffolding`." Google Cloud Platform logo # [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) @@ -7,60 +9,31 @@ [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/googleapis/nodejs-pubsub?branch=master&svg=true)](https://ci.appveyor.com/project/googleapis/nodejs-pubsub) [![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-pubsub/master.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-pubsub) -> Node.js idiomatic client for [Cloud Pub/Sub][product-docs]. - [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. -* [Cloud Pub/Sub Node.js Client API Reference][client-docs] -* [github.com/googleapis/nodejs-pubsub](https://github.com/googleapis/nodejs-pubsub) -* [Cloud Pub/Sub Documentation][product-docs] - -Read more about the client libraries for Cloud APIs, including the older -Google APIs Client Libraries, in [Client Libraries Explained][explained]. - -[explained]: https://cloud.google.com/apis/docs/client-libraries-explained - -**Table of contents:** - -* [Quickstart](#quickstart) - * [Before you begin](#before-you-begin) - * [Installing the client library](#installing-the-client-library) - * [Using the client library](#using-the-client-library) +* [Using the client library](#using-the-client-library) * [Samples](#samples) * [Versioning](#versioning) * [Contributing](#contributing) * [License](#license) -## Quickstart - -### Before you begin - -1. Select or create a Cloud Platform project. +## Using the client library - [Go to the projects page][projects] +1. [Select or create a Cloud Platform project][projects]. -1. Enable billing for your project. +1. [Enable billing for your project][billing]. - [Enable billing][billing] - -1. Enable the Google Cloud Pub/Sub API. - - [Enable the API][enable_api] +1. [Enable the Google Cloud Pub/Sub API][enable_api]. 1. [Set up authentication with a service account][auth] so you can access the API from your local workstation. -[projects]: https://console.cloud.google.com/project -[billing]: https://support.google.com/cloud/answer/6293499#enable-billing -[enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com -[auth]: https://cloud.google.com/docs/authentication/getting-started - -### Installing the client library +1. Install the client library: - npm install --save @google-cloud/pubsub + npm install --save @google-cloud/pubsub -### Using the client library +1. Try an example: ```javascript // Imports the Google Cloud client library @@ -125,6 +98,21 @@ Apache Version 2.0 See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) +## What's Next + +* [Cloud Pub/Sub Documentation][product-docs] +* [Cloud Pub/Sub Node.js Client API Reference][client-docs] +* [github.com/googleapis/nodejs-pubsub](https://github.com/googleapis/nodejs-pubsub) + +Read more about the client libraries for Cloud APIs, including the older +Google APIs Client Libraries, in [Client Libraries Explained][explained]. + +[explained]: https://cloud.google.com/apis/docs/client-libraries-explained + [client-docs]: https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub [product-docs]: https://cloud.google.com/pubsub/docs -[shell_img]: //gstatic.com/cloudssh/images/open-btn.png +[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png +[projects]: https://console.cloud.google.com/project +[billing]: https://support.google.com/cloud/answer/6293499#enable-billing +[enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com +[auth]: https://cloud.google.com/docs/authentication/getting-started diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 88ad73f4d77..f18d734c0f2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -32,24 +32,34 @@ "Ace Nassri ", "Alexander Fenster ", "Ali Ijaz Sheikh ", + "Alix Hamilton ", + "Anish Karandikar ", "Antono Vasiljev ", "Chet Husk ", "Christoph Tavan ", + "Christopher Wilcox ", + "DPE bot ", "Dave Gramlich ", "David Fox ", "Dennis ", "Eric Uldall ", "Jan Pretzel ", "Jason Dobry ", + "Jonathan Lui ", "Jun Mukai ", + "Justin Beckwith ", "Justin King ", + "Kamal Aboul-Hosn ", "Matthew Arbesfeld ", "Song Wang ", "Stephen Sawchuk ", - "Tejasvi Nareddy ", + "Tejasvi (Teju) Nareddy ", "Tim Swast ", + "chenyumic ", "greenkeeper[bot] ", - "mkamioner " + "lashae ", + "mkamioner ", + "renovate[bot] " ], "scripts": { "system-test": "mocha system-test/ --timeout 600000", @@ -84,7 +94,7 @@ "uuid": "^3.1.0" }, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "^2.2.3", + "@google-cloud/nodejs-repo-tools": "^2.3.3", "async": "^2.6.0", "codecov": "^3.0.0", "eslint": "^5.0.0", From fafcadd81d253f6e3c2a9c56b884ef3d1261110f Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 30 Aug 2018 14:14:36 -0700 Subject: [PATCH 0209/1115] Release nodejs-pubsub v0.20.0 (#230) * Release v0.20.0 * update pubsub dep in samples/ * newline --- handwritten/pubsub/CHANGELOG.md | 82 +++++++++++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 handwritten/pubsub/CHANGELOG.md diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md new file mode 100644 index 00000000000..05c3ea16e3a --- /dev/null +++ b/handwritten/pubsub/CHANGELOG.md @@ -0,0 +1,82 @@ +# Changelog + +[npm history][1] + +[1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions + +## v0.20.0 + +### Implementation Changes + +*BREAKING CHANGE*: - fix: drop support for node.js 4.x and 9.x (#171) + +### New Features + +- Re-generate library using /synth.py (#227) + - some minor proto documentation changes + +### Dependencies + +- fix(deps): update dependency google-auth-library to v2 (#228) +- chore(deps): update dependency nyc to v13 (#225) +- fix(deps): update dependency google-gax to ^0.19.0 (#216) +- chore(deps): update dependency eslint-config-prettier to v3 (#213) +- chore: drop dependency on @google-cloud/common (#210) +- fix(deps): update dependency @google-cloud/common to ^0.21.0 (#206) +- chore(deps): lock file maintenance (#203) +- fix(deps): update dependency google-gax to ^0.18.0 (#197) +- chore(deps): lock file maintenance (#196) +- chore(deps): lock file maintenance (#188) +- chore(deps): update dependency eslint-plugin-node to v7 (#185) +- chore(deps): lock file maintenance (#182) +- chore(deps): lock file maintenance (#174) +- chore(deps): lock file maintenance (#173) +- chore(deps): lock file maintenance (#172) +- chore(deps): lock file maintenance (#168) +- chore(deps): lock file maintenance (#167) +- chore(deps): lock file maintenance (#166) +- fix(deps): update dependency delay to v3 (#165) +- fix(deps): update dependency @google-cloud/common to ^0.20.0 (#155) +- chore(deps): update dependency proxyquire to v2 (#160) +- chore(deps): update dependency nyc to v12 (#159) +- Update google-gax and add Synth.py (#158) +- chore(deps): update dependency sinon to v6 (#161) +- fix(deps): update dependency yargs to v12 (#164) +- fix(deps): update dependency yargs to v11 (#163) +- fix(deps): update dependency yargs to v10.1.2 (#157) +- chore(deps): update dependency ava to ^0.25.0 (#153) +- chore(deps): update dependency sinon to v4.5.0 (#154) + +### Documentation + +- fix docs (#229) +- test: fix import sample failures (#218) +- fix: correct the documentation (#117) +- fix: Fix sample region tag in JSDoc (#184) +- Fixes 179: Adds missing return statement in docs (#180) + +### Internal / Testing Changes + +- Update the CI config (#220) +- chore: make the CircleCI config consistent +- chore: use arrow functions (#215) +- chore: convert to es classes (#211) +- chore: do not use npm ci (#209) +- chore: use let and const (#204) +- chore: ignore package-lock.json (#207) +- chore: use split common modules (#200) +- chore: update renovate config (#199) +- chore: move mocha options to mocha.opts (#194) +- chore: require node 8 for samples (#195) +- chore: add node templates to synth.py (#191) +- chore: fix the eslint errors (#190) +- refactor: use google-auth-library (#189) +- Fixes 177: Prevents publishing attributes that have non-string values (#183) +- chore(build): use `npm ci` instead of `npm install` (#175) +- chore(package): update eslint to version 5.0.0 (#145) +- chore: update sample lockfiles (#149) +- test: use strictEqual in tests (#186) +- Configure Renovate (#144) +- refactor: drop repo-tool as an exec wrapper (#150) +- fix: update linking for samples (#146) + diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f18d734c0f2..c3578618847 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.19.0", + "version": "0.20.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 7a2043919b33b03ab6ecf8ba49660442750394d7 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 30 Aug 2018 20:07:20 -0400 Subject: [PATCH 0210/1115] fix: Return error if subscription name already exists. (#226) * fix: Return error if subscription name already exists. * Remove old system test. --- handwritten/pubsub/src/index.js | 2 +- handwritten/pubsub/system-test/pubsub.js | 24 ++++++++++++++++++++---- handwritten/pubsub/test/index.js | 18 ------------------ 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index b11845c64d5..ca79f32dcba 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -230,7 +230,7 @@ class PubSub { gaxOpts: options.gaxOpts, }, function(err, resp) { - if (err && err.code !== 6) { + if (err) { callback(err, null, resp); return; } diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.js index 1802e0c8519..cacc2e3f2c0 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.js @@ -300,6 +300,26 @@ describe('pubsub', function() { ); }); + it('should return error if creating an existing subscription', function(done) { + // Use a new topic name... + const topic = pubsub.topic(generateTopicName()); + + // ...but with the same subscription name that we already created... + const subscription = topic.subscription(SUB_NAMES[0]); + + subscription.create(function(err) { + if (!err) { + assert.fail('Should not have created subscription successfully.'); + return; + } + + // ...and it should fail, because the subscription name is unique to the + // project, and not the topic. + assert.strictEqual(err.code, 6); + done(); + }); + }); + it('should list all subscriptions registered to the topic', function(done) { topic.getSubscriptions(function(err, subs) { assert.ifError(err); @@ -442,10 +462,6 @@ describe('pubsub', function() { }); }); - it('should re-use an existing subscription', function(done) { - pubsub.createSubscription(topic, SUB_NAMES[0], done); - }); - it('should error when using a non-existent subscription', function(done) { const subscription = topic.subscription(generateSubName(), { maxConnections: 1, diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.js index 6139b500d67..ba1d00f7be8 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.js @@ -481,24 +481,6 @@ describe('PubSub', function() { }; }); - it('should re-use existing subscription', function(done) { - const apiResponse = {code: 6}; - - pubsub.subscription = function() { - return SUBSCRIPTION; - }; - - pubsub.request = function(config, callback) { - callback({code: 6}, apiResponse); - }; - - pubsub.createSubscription(TOPIC_NAME, SUB_NAME, function(err, sub) { - assert.ifError(err); - assert.strictEqual(sub, SUBSCRIPTION); - done(); - }); - }); - it('should return error & API response to the callback', function(done) { pubsub.request = function(config, callback) { callback(error, apiResponse); From c19cadccaa58d1824c11d3bbdc4a52acf4b6a93b Mon Sep 17 00:00:00 2001 From: DPE bot Date: Fri, 31 Aug 2018 12:11:41 -0700 Subject: [PATCH 0211/1115] Re-generate library using /synth.py (#236) --- handwritten/pubsub/.circleci/config.yml | 20 +++++++++++++++----- handwritten/pubsub/.kokoro/docs.sh | 0 handwritten/pubsub/.kokoro/lint.sh | 0 handwritten/pubsub/.kokoro/samples-test.sh | 0 handwritten/pubsub/.kokoro/system-test.sh | 0 handwritten/pubsub/.kokoro/test.sh | 0 handwritten/pubsub/.kokoro/trampoline.sh | 0 7 files changed, 15 insertions(+), 5 deletions(-) mode change 100644 => 100755 handwritten/pubsub/.kokoro/docs.sh mode change 100644 => 100755 handwritten/pubsub/.kokoro/lint.sh mode change 100644 => 100755 handwritten/pubsub/.kokoro/samples-test.sh mode change 100644 => 100755 handwritten/pubsub/.kokoro/system-test.sh mode change 100644 => 100755 handwritten/pubsub/.kokoro/test.sh mode change 100644 => 100755 handwritten/pubsub/.kokoro/trampoline.sh diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index eab76c4a6ba..9a65e928a47 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -117,9 +117,11 @@ jobs: - run: name: Decrypt credentials. command: | - openssl aes-256-cbc -d -in .circleci/key.json.enc \ + if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then + openssl aes-256-cbc -d -in .circleci/key.json.enc \ -out .circleci/key.json \ -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" + fi - run: *npm_install_and_link - run: *samples_npm_install_and_link - run: @@ -131,7 +133,10 @@ jobs: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Remove unencrypted key. - command: rm .circleci/key.json + command: | + if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then + rm .circleci/key.json + fi when: always working_directory: /home/node/samples/ system_tests: @@ -143,9 +148,11 @@ jobs: - run: name: Decrypt credentials. command: | - openssl aes-256-cbc -d -in .circleci/key.json.enc \ + if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then + openssl aes-256-cbc -d -in .circleci/key.json.enc \ -out .circleci/key.json \ -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" + fi - run: *npm_install_and_link - run: name: Run system tests. @@ -154,7 +161,10 @@ jobs: GOOGLE_APPLICATION_CREDENTIALS: .circleci/key.json - run: name: Remove unencrypted key. - command: rm .circleci/key.json + command: | + if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then + rm .circleci/key.json + fi when: always publish_npm: docker: @@ -162,6 +172,6 @@ jobs: user: node steps: - checkout - - npm install + - run: npm install - run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc - run: npm publish --access=public diff --git a/handwritten/pubsub/.kokoro/docs.sh b/handwritten/pubsub/.kokoro/docs.sh old mode 100644 new mode 100755 diff --git a/handwritten/pubsub/.kokoro/lint.sh b/handwritten/pubsub/.kokoro/lint.sh old mode 100644 new mode 100755 diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh old mode 100644 new mode 100755 diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh old mode 100644 new mode 100755 diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh old mode 100644 new mode 100755 diff --git a/handwritten/pubsub/.kokoro/trampoline.sh b/handwritten/pubsub/.kokoro/trampoline.sh old mode 100644 new mode 100755 From 2f991bb50b2b8854ab517f0705daecbdcc9484b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 3 Sep 2018 10:28:38 -0700 Subject: [PATCH 0212/1115] fix(deps): update dependency delay to v4 (#239) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c3578618847..26a8766b3ef 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -79,7 +79,7 @@ "@google-cloud/promisify": "^0.3.0", "arrify": "^1.0.0", "async-each": "^1.0.1", - "delay": "^3.0.0", + "delay": "^4.0.0", "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auth-library": "^2.0.0", From 873e4a2377fb39af302ae134cea65857d9decd76 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 4 Sep 2018 10:55:53 -0700 Subject: [PATCH 0213/1115] Retry npm install in CI (#241) --- handwritten/pubsub/.circleci/config.yml | 6 +- .../pubsub/.circleci/npm-install-retry.js | 60 +++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) create mode 100755 handwritten/pubsub/.circleci/npm-install-retry.js diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 9a65e928a47..80dcf7e67d9 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -64,7 +64,7 @@ jobs: name: Install and link the module command: |- mkdir -p /home/node/.npm-global - npm install + ./.circleci/npm-install-retry.js environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: npm test @@ -92,7 +92,7 @@ jobs: command: | cd samples/ npm link ../ - npm install + ./../.circleci/npm-install-retry.js environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: @@ -172,6 +172,6 @@ jobs: user: node steps: - checkout - - run: npm install + - run: ./.circleci/npm-install-retry.js - run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc - run: npm publish --access=public diff --git a/handwritten/pubsub/.circleci/npm-install-retry.js b/handwritten/pubsub/.circleci/npm-install-retry.js new file mode 100755 index 00000000000..ae3220d7348 --- /dev/null +++ b/handwritten/pubsub/.circleci/npm-install-retry.js @@ -0,0 +1,60 @@ +#!/usr/bin/env node + +let spawn = require('child_process').spawn; + +// +//USE: ./index.js [... NPM ARGS] +// + +let timeout = process.argv[2] || 60000; +let attempts = process.argv[3] || 3; +let args = process.argv.slice(4); +if (args.length === 0) { + args = ['install']; +} + +(function npm() { + let timer; + args.push('--verbose'); + let proc = spawn('npm', args); + proc.stdout.pipe(process.stdout); + proc.stderr.pipe(process.stderr); + proc.stdin.end(); + proc.stdout.on('data', () => { + setTimer(); + }); + proc.stderr.on('data', () => { + setTimer(); + }); + + // side effect: this also restarts when npm exits with a bad code even if it + // didnt timeout + proc.on('close', (code, signal) => { + clearTimeout(timer); + if (code || signal) { + console.log('[npm-are-you-sleeping] npm exited with code ' + code + ''); + + if (--attempts) { + console.log('[npm-are-you-sleeping] restarting'); + npm(); + } else { + console.log('[npm-are-you-sleeping] i tried lots of times. giving up.'); + throw new Error("npm install fails"); + } + } + }); + + function setTimer() { + clearTimeout(timer); + timer = setTimeout(() => { + console.log('[npm-are-you-sleeping] killing npm with SIGTERM'); + proc.kill('SIGTERM'); + // wait a couple seconds + timer = setTimeout(() => { + // its it's still not closed sigkill + console.log('[npm-are-you-sleeping] killing npm with SIGKILL'); + proc.kill('SIGKILL'); + }, 2000); + }, timeout); + } +})(); From 6d8915f9598b243682291827b8f626023e07cc4d Mon Sep 17 00:00:00 2001 From: DPE bot Date: Mon, 10 Sep 2018 08:06:27 -0700 Subject: [PATCH 0214/1115] Update CI config (#249) --- handwritten/pubsub/.circleci/config.yml | 11 +++++++---- handwritten/pubsub/.kokoro/common.cfg | 2 +- .../pubsub/.kokoro/continuous/node10/common.cfg | 2 +- .../pubsub/.kokoro/continuous/node6/common.cfg | 2 +- .../pubsub/.kokoro/continuous/node8/common.cfg | 2 +- handwritten/pubsub/.kokoro/docs.sh | 2 ++ handwritten/pubsub/.kokoro/lint.sh | 2 ++ .../pubsub/.kokoro/presubmit/node10/common.cfg | 2 +- handwritten/pubsub/.kokoro/presubmit/node6/common.cfg | 2 +- handwritten/pubsub/.kokoro/presubmit/node8/common.cfg | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 ++ handwritten/pubsub/.kokoro/system-test.sh | 8 ++++++++ handwritten/pubsub/.kokoro/test.sh | 2 ++ 13 files changed, 30 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 80dcf7e67d9..8af6a4d0489 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -149,21 +149,24 @@ jobs: name: Decrypt credentials. command: | if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - openssl aes-256-cbc -d -in .circleci/key.json.enc \ - -out .circleci/key.json \ - -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" + for encrypted_key in .circleci/*.json.enc; do + openssl aes-256-cbc -d -in $encrypted_key \ + -out $(echo $encrypted_key | sed 's/\.enc//') \ + -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" + done fi - run: *npm_install_and_link - run: name: Run system tests. command: npm run system-test environment: + GCLOUD_PROJECT: long-door-651 GOOGLE_APPLICATION_CREDENTIALS: .circleci/key.json - run: name: Remove unencrypted key. command: | if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - rm .circleci/key.json + rm .circleci/*.json fi when: always publish_npm: diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index e62c5337feb..abfbbfb207d 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg index e62c5337feb..abfbbfb207d 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node6/common.cfg b/handwritten/pubsub/.kokoro/continuous/node6/common.cfg index bb61d855e80..0ba415564ca 100644 --- a/handwritten/pubsub/.kokoro/continuous/node6/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node6/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:6" + value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node8/common.cfg b/handwritten/pubsub/.kokoro/continuous/node8/common.cfg index 580e2b62e6a..623fa5f5190 100644 --- a/handwritten/pubsub/.kokoro/continuous/node8/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node8/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:8" + value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/docs.sh b/handwritten/pubsub/.kokoro/docs.sh index 1d288f3d475..3af3193411a 100755 --- a/handwritten/pubsub/.kokoro/docs.sh +++ b/handwritten/pubsub/.kokoro/docs.sh @@ -16,6 +16,8 @@ set -xeo pipefail +export NPM_CONFIG_PREFIX=/home/node/.npm-global + cd $(dirname $0)/.. npm install diff --git a/handwritten/pubsub/.kokoro/lint.sh b/handwritten/pubsub/.kokoro/lint.sh index 9d29203edc2..7c2ea2a28f9 100755 --- a/handwritten/pubsub/.kokoro/lint.sh +++ b/handwritten/pubsub/.kokoro/lint.sh @@ -16,6 +16,8 @@ set -xeo pipefail +export NPM_CONFIG_PREFIX=/home/node/.npm-global + cd $(dirname $0)/.. npm install diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg index e62c5337feb..abfbbfb207d 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg index bb61d855e80..0ba415564ca 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:6" + value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg index 580e2b62e6a..623fa5f5190 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:8" + value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 93af79aa3b3..76edbbbb247 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -16,6 +16,8 @@ set -xeo pipefail +export NPM_CONFIG_PREFIX=/home/node/.npm-global + # Setup service account credentials. export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json export GCLOUD_PROJECT=long-door-651 diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 299032dc3a2..a954b79429d 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -16,11 +16,19 @@ set -xeo pipefail +export NPM_CONFIG_PREFIX=/home/node/.npm-global + # Setup service account credentials. export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json +export GCLOUD_PROJECT=long-door-651 cd $(dirname $0)/.. +# Run a pre-test hook, if a pre-system-test.sh is in the project +if [ -f .kokoro/pre-system-test.sh ]; then + . .kokoro/pre-system-test.sh +fi + npm install npm run system-test diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 7f49f6d32ee..51f29589b19 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -16,6 +16,8 @@ set -xeo pipefail +export NPM_CONFIG_PREFIX=/home/node/.npm-global + cd $(dirname $0)/.. npm install From 45dc647f7b4e73ea2973bd5207574e1d264a3507 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 13 Sep 2018 07:02:44 -0700 Subject: [PATCH 0215/1115] fix(deps): update dependency google-gax to ^0.20.0 (#252) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 26a8766b3ef..567b70c4bca 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -83,7 +83,7 @@ "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auth-library": "^2.0.0", - "google-gax": "^0.19.0", + "google-gax": "^0.20.0", "google-proto-files": "^0.16.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", From 583c581b06c18e278eade443a7d3a3a0bce047d6 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Fri, 14 Sep 2018 08:40:33 -0700 Subject: [PATCH 0216/1115] Switch to let/const (#254) --- .../pubsub/smoke-test/publisher_smoke_test.js | 26 +- .../v1/doc/google/iam/v1/doc_iam_policy.js | 8 +- .../src/v1/doc/google/iam/v1/doc_policy.js | 8 +- .../v1/doc/google/protobuf/doc_duration.js | 2 +- .../src/v1/doc/google/protobuf/doc_empty.js | 2 +- .../v1/doc/google/protobuf/doc_field_mask.js | 2 +- .../v1/doc/google/protobuf/doc_timestamp.js | 2 +- .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 76 +-- handwritten/pubsub/src/v1/publisher_client.js | 132 ++-- .../pubsub/src/v1/subscriber_client.js | 210 +++---- handwritten/pubsub/test/gapic-v1.js | 576 +++++++++--------- 11 files changed, 522 insertions(+), 522 deletions(-) diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index 16e2d5dfe9e..f2cc1a2d782 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -18,21 +18,21 @@ describe('PublisherSmokeTest', () => { if (!process.env.GCLOUD_PROJECT) { throw new Error("Usage: GCLOUD_PROJECT= node #{$0}"); } - var projectId = process.env.GCLOUD_PROJECT; + const projectId = process.env.GCLOUD_PROJECT; it('successfully makes a call to the service using promises', done => { const pubsub = require('../src'); - var client = new pubsub.v1.PublisherClient({ + const client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); // Iterate over all elements. - var formattedProject = client.projectPath(projectId); + const formattedProject = client.projectPath(projectId); client.listTopics({project: formattedProject}) .then(responses => { - var resources = responses[0]; + const resources = responses[0]; for (let i = 0; i < resources.length; i += 1) { console.log(resources[i]); } @@ -44,22 +44,22 @@ describe('PublisherSmokeTest', () => { it('successfully makes a call to the service using callbacks', done => { const pubsub = require('../src'); - var client = new pubsub.v1.PublisherClient({ + const client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); // Or obtain the paged response. - var formattedProject = client.projectPath(projectId); + const formattedProject = client.projectPath(projectId); - var options = {autoPaginate: false}; - var callback = responses => { + const options = {autoPaginate: false}; + const callback = responses => { // The actual resources in a response. - var resources = responses[0]; + const resources = responses[0]; // The next request if the response shows that there are more responses. - var nextRequest = responses[1]; + const nextRequest = responses[1]; // The actual response object, if necessary. - // var rawResponse = responses[2]; + // const rawResponse = responses[2]; for (let i = 0; i < resources.length; i += 1) { console.log(resources[i]); } @@ -77,11 +77,11 @@ describe('PublisherSmokeTest', () => { it('successfully makes a call to the service using streaming', done => { const pubsub = require('../src'); - var client = new pubsub.v1.PublisherClient({ + const client = new pubsub.v1.PublisherClient({ // optional auth parameters. }); - var formattedProject = client.projectPath(projectId); + const formattedProject = client.projectPath(projectId); client.listTopicsStream({project: formattedProject}) .on('data', element => { console.log(element); diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js index 52a719ae88d..e952d5d1f02 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js @@ -35,7 +35,7 @@ * @memberof google.iam.v1 * @see [google.iam.v1.SetIamPolicyRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} */ -var SetIamPolicyRequest = { +const SetIamPolicyRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -51,7 +51,7 @@ var SetIamPolicyRequest = { * @memberof google.iam.v1 * @see [google.iam.v1.GetIamPolicyRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} */ -var GetIamPolicyRequest = { +const GetIamPolicyRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -73,7 +73,7 @@ var GetIamPolicyRequest = { * @memberof google.iam.v1 * @see [google.iam.v1.TestIamPermissionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} */ -var TestIamPermissionsRequest = { +const TestIamPermissionsRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -88,6 +88,6 @@ var TestIamPermissionsRequest = { * @memberof google.iam.v1 * @see [google.iam.v1.TestIamPermissionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} */ -var TestIamPermissionsResponse = { +const TestIamPermissionsResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js index 0163cf59f58..59fca18810c 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js @@ -74,7 +74,7 @@ * @memberof google.iam.v1 * @see [google.iam.v1.Policy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} */ -var Policy = { +const Policy = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -113,7 +113,7 @@ var Policy = { * @memberof google.iam.v1 * @see [google.iam.v1.Binding definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} */ -var Binding = { +const Binding = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -129,7 +129,7 @@ var Binding = { * @memberof google.iam.v1 * @see [google.iam.v1.PolicyDelta definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} */ -var PolicyDelta = { +const PolicyDelta = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -157,6 +157,6 @@ var PolicyDelta = { * @memberof google.iam.v1 * @see [google.iam.v1.BindingDelta definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} */ -var BindingDelta = { +const BindingDelta = { // This is for documentation. Actual contents will be loaded by gRPC. }; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js index 3ea5c376abb..c03ce2fb3df 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js @@ -92,6 +92,6 @@ * @memberof google.protobuf * @see [google.protobuf.Duration definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/duration.proto} */ -var Duration = { +const Duration = { // This is for documentation. Actual contents will be loaded by gRPC. }; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js index 5e3640e90d8..b1d6b5e32a9 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js @@ -29,6 +29,6 @@ * @memberof google.protobuf * @see [google.protobuf.Empty definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/empty.proto} */ -var Empty = { +const Empty = { // This is for documentation. Actual contents will be loaded by gRPC. }; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js index d700752b7c6..0cb35328962 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js @@ -231,6 +231,6 @@ * @memberof google.protobuf * @see [google.protobuf.FieldMask definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/field_mask.proto} */ -var FieldMask = { +const FieldMask = { // This is for documentation. Actual contents will be loaded by gRPC. }; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js index 51d8f40f54d..1ebe2e6e1a5 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js @@ -110,6 +110,6 @@ * @memberof google.protobuf * @see [google.protobuf.Timestamp definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto} */ -var Timestamp = { +const Timestamp = { // This is for documentation. Actual contents will be loaded by gRPC. }; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index 6a10b9b07eb..ea7ab60fb1a 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -28,7 +28,7 @@ * @memberof google.pubsub.v1 * @see [google.pubsub.v1.MessageStoragePolicy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var MessageStoragePolicy = { +const MessageStoragePolicy = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -60,7 +60,7 @@ var MessageStoragePolicy = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.Topic definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var Topic = { +const Topic = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -91,7 +91,7 @@ var Topic = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.PubsubMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var PubsubMessage = { +const PubsubMessage = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -106,7 +106,7 @@ var PubsubMessage = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.GetTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var GetTopicRequest = { +const GetTopicRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -131,7 +131,7 @@ var GetTopicRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.UpdateTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var UpdateTopicRequest = { +const UpdateTopicRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -151,7 +151,7 @@ var UpdateTopicRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.PublishRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var PublishRequest = { +const PublishRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -167,7 +167,7 @@ var PublishRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.PublishResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var PublishResponse = { +const PublishResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -190,7 +190,7 @@ var PublishResponse = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListTopicsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListTopicsRequest = { +const ListTopicsRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -210,7 +210,7 @@ var ListTopicsRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListTopicsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListTopicsResponse = { +const ListTopicsResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -233,7 +233,7 @@ var ListTopicsResponse = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListTopicSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListTopicSubscriptionsRequest = { +const ListTopicSubscriptionsRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -252,7 +252,7 @@ var ListTopicSubscriptionsRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListTopicSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListTopicSubscriptionsResponse = { +const ListTopicSubscriptionsResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -278,7 +278,7 @@ var ListTopicSubscriptionsResponse = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListTopicSnapshotsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListTopicSnapshotsRequest = { +const ListTopicSnapshotsRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -300,7 +300,7 @@ var ListTopicSnapshotsRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListTopicSnapshotsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListTopicSnapshotsResponse = { +const ListTopicSnapshotsResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -315,7 +315,7 @@ var ListTopicSnapshotsResponse = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.DeleteTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var DeleteTopicRequest = { +const DeleteTopicRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -394,7 +394,7 @@ var DeleteTopicRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.Subscription definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var Subscription = { +const Subscription = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -432,7 +432,7 @@ var Subscription = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.PushConfig definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var PushConfig = { +const PushConfig = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -451,7 +451,7 @@ var PushConfig = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ReceivedMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ReceivedMessage = { +const ReceivedMessage = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -466,7 +466,7 @@ var ReceivedMessage = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.GetSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var GetSubscriptionRequest = { +const GetSubscriptionRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -488,7 +488,7 @@ var GetSubscriptionRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.UpdateSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var UpdateSubscriptionRequest = { +const UpdateSubscriptionRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -511,7 +511,7 @@ var UpdateSubscriptionRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListSubscriptionsRequest = { +const ListSubscriptionsRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -532,7 +532,7 @@ var ListSubscriptionsRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListSubscriptionsResponse = { +const ListSubscriptionsResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -547,7 +547,7 @@ var ListSubscriptionsResponse = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.DeleteSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var DeleteSubscriptionRequest = { +const DeleteSubscriptionRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -572,7 +572,7 @@ var DeleteSubscriptionRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ModifyPushConfigRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ModifyPushConfigRequest = { +const ModifyPushConfigRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -599,7 +599,7 @@ var ModifyPushConfigRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.PullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var PullRequest = { +const PullRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -618,7 +618,7 @@ var PullRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.PullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var PullResponse = { +const PullResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -645,7 +645,7 @@ var PullResponse = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ModifyAckDeadlineRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ModifyAckDeadlineRequest = { +const ModifyAckDeadlineRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -664,7 +664,7 @@ var ModifyAckDeadlineRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.AcknowledgeRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var AcknowledgeRequest = { +const AcknowledgeRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -716,7 +716,7 @@ var AcknowledgeRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.StreamingPullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var StreamingPullRequest = { +const StreamingPullRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -733,7 +733,7 @@ var StreamingPullRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.StreamingPullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var StreamingPullResponse = { +const StreamingPullResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -768,7 +768,7 @@ var StreamingPullResponse = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.CreateSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var CreateSnapshotRequest = { +const CreateSnapshotRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -793,7 +793,7 @@ var CreateSnapshotRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.UpdateSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var UpdateSnapshotRequest = { +const UpdateSnapshotRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -830,7 +830,7 @@ var UpdateSnapshotRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.Snapshot definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var Snapshot = { +const Snapshot = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -848,7 +848,7 @@ var Snapshot = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.GetSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var GetSnapshotRequest = { +const GetSnapshotRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -874,7 +874,7 @@ var GetSnapshotRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListSnapshotsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListSnapshotsRequest = { +const ListSnapshotsRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -897,7 +897,7 @@ var ListSnapshotsRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ListSnapshotsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var ListSnapshotsResponse = { +const ListSnapshotsResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -915,7 +915,7 @@ var ListSnapshotsResponse = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.DeleteSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var DeleteSnapshotRequest = { +const DeleteSnapshotRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -952,7 +952,7 @@ var DeleteSnapshotRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.SeekRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var SeekRequest = { +const SeekRequest = { // This is for documentation. Actual contents will be loaded by gRPC. }; @@ -961,6 +961,6 @@ var SeekRequest = { * @memberof google.pubsub.v1 * @see [google.pubsub.v1.SeekResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ -var SeekResponse = { +const SeekResponse = { // This is for documentation. Actual contents will be loaded by gRPC. }; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 52bcb46c3f6..458c39fb6b9 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -73,13 +73,13 @@ class PublisherClient { // Create a `gaxGrpc` object, with any grpc-specific options // sent to the client. opts.scopes = this.constructor.scopes; - var gaxGrpc = new gax.GrpcClient(opts); + const gaxGrpc = new gax.GrpcClient(opts); // Save the auth object to the client, for use by other methods. this.auth = gaxGrpc.auth; // Determine the client header string. - var clientHeader = [ + const clientHeader = [ `gl-node/${process.version}`, `grpc/${gaxGrpc.grpcVersion}`, `gax/${gax.version}`, @@ -90,7 +90,7 @@ class PublisherClient { } // Load the applicable protos. - var protos = merge( + const protos = merge( {}, gaxGrpc.loadProto( path.join(__dirname, '..', '..', 'protos'), @@ -127,7 +127,7 @@ class PublisherClient { 'subscriptions' ), }; - var protoFilesRoot = new gax.GoogleProtoFilesRoot(); + let protoFilesRoot = new gax.GoogleProtoFilesRoot(); protoFilesRoot = protobuf.loadSync( path.join( __dirname, @@ -163,7 +163,7 @@ class PublisherClient { }; // Put together the default options sent with requests. - var defaults = gaxGrpc.constructSettings( + const defaults = gaxGrpc.constructSettings( 'google.pubsub.v1.Publisher', gapicConfig, opts.clientConfig, @@ -177,14 +177,14 @@ class PublisherClient { // Put together the "service stub" for // google.iam.v1.IAMPolicy. - var iamPolicyStub = gaxGrpc.createStub( + const iamPolicyStub = gaxGrpc.createStub( protos.google.iam.v1.IAMPolicy, opts ); // Iterate over each of the methods that the service provides // and create an API call method for each. - var iamPolicyStubMethods = [ + const iamPolicyStubMethods = [ 'setIamPolicy', 'getIamPolicy', 'testIamPermissions', @@ -194,7 +194,7 @@ class PublisherClient { iamPolicyStub.then( stub => function() { - var args = Array.prototype.slice.call(arguments, 0); + const args = Array.prototype.slice.call(arguments, 0); return stub[methodName].apply(stub, args); } ), @@ -206,14 +206,14 @@ class PublisherClient { // Put together the "service stub" for // google.pubsub.v1.Publisher. - var publisherStub = gaxGrpc.createStub( + const publisherStub = gaxGrpc.createStub( protos.google.pubsub.v1.Publisher, opts ); // Iterate over each of the methods that the service provides // and create an API call method for each. - var publisherStubMethods = [ + const publisherStubMethods = [ 'createTopic', 'updateTopic', 'publish', @@ -227,7 +227,7 @@ class PublisherClient { publisherStub.then( stub => function() { - var args = Array.prototype.slice.call(arguments, 0); + const args = Array.prototype.slice.call(arguments, 0); return stub[methodName].apply(stub, args); } ), @@ -315,14 +315,14 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + * const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); * client.createTopic({name: formattedName}) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -372,19 +372,19 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var topic = {}; - * var updateMask = {}; - * var request = { + * const topic = {}; + * const updateMask = {}; + * const request = { * topic: topic, * updateMask: updateMask, * }; * client.updateTopic(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -430,23 +430,23 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * var data = ''; - * var messagesElement = { + * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * const data = ''; + * const messagesElement = { * data: data, * }; - * var messages = [messagesElement]; - * var request = { + * const messages = [messagesElement]; + * const request = { * topic: formattedTopic, * messages: messages, * }; * client.publish(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -486,14 +486,14 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); * client.getTopic({topic: formattedTopic}) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -551,16 +551,16 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * * // Iterate over all elements. - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * * client.listTopics({project: formattedProject}) * .then(responses => { - * var resources = responses[0]; + * const resources = responses[0]; * for (let i = 0; i < resources.length; i += 1) { * // doThingsWith(resources[i]) * } @@ -570,17 +570,17 @@ class PublisherClient { * }); * * // Or obtain the paged response. - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * * - * var options = {autoPaginate: false}; - * var callback = responses => { + * const options = {autoPaginate: false}; + * const callback = responses => { * // The actual resources in a response. - * var resources = responses[0]; + * const resources = responses[0]; * // The next request if the response shows that there are more responses. - * var nextRequest = responses[1]; + * const nextRequest = responses[1]; * // The actual response object, if necessary. - * // var rawResponse = responses[2]; + * // const rawResponse = responses[2]; * for (let i = 0; i < resources.length; i += 1) { * // doThingsWith(resources[i]); * } @@ -639,11 +639,11 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * client.listTopicsStream({project: formattedProject}) * .on('data', element => { * // doThingsWith(element) @@ -702,16 +702,16 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * * // Iterate over all elements. - * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); * * client.listTopicSubscriptions({topic: formattedTopic}) * .then(responses => { - * var resources = responses[0]; + * const resources = responses[0]; * for (let i = 0; i < resources.length; i += 1) { * // doThingsWith(resources[i]) * } @@ -721,17 +721,17 @@ class PublisherClient { * }); * * // Or obtain the paged response. - * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); * * - * var options = {autoPaginate: false}; - * var callback = responses => { + * const options = {autoPaginate: false}; + * const callback = responses => { * // The actual resources in a response. - * var resources = responses[0]; + * const resources = responses[0]; * // The next request if the response shows that there are more responses. - * var nextRequest = responses[1]; + * const nextRequest = responses[1]; * // The actual response object, if necessary. - * // var rawResponse = responses[2]; + * // const rawResponse = responses[2]; * for (let i = 0; i < resources.length; i += 1) { * // doThingsWith(resources[i]); * } @@ -794,11 +794,11 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); * client.listTopicSubscriptionsStream({topic: formattedTopic}) * .on('data', element => { * // doThingsWith(element) @@ -840,11 +840,11 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); * client.deleteTopic({topic: formattedTopic}).catch(err => { * console.error(err); * }); @@ -891,19 +891,19 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - * var policy = {}; - * var request = { + * const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + * const policy = {}; + * const request = { * resource: formattedResource, * policy: policy, * }; * client.setIamPolicy(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -946,14 +946,14 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + * const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); * client.getIamPolicy({resource: formattedResource}) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -1001,19 +1001,19 @@ class PublisherClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.PublisherClient({ + * const client = new pubsub.v1.PublisherClient({ * // optional auth parameters. * }); * - * var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - * var permissions = []; - * var request = { + * const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + * const permissions = []; + * const request = { * resource: formattedResource, * permissions: permissions, * }; * client.testIamPermissions(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index c68d4205512..6b1596b0d4b 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -73,13 +73,13 @@ class SubscriberClient { // Create a `gaxGrpc` object, with any grpc-specific options // sent to the client. opts.scopes = this.constructor.scopes; - var gaxGrpc = new gax.GrpcClient(opts); + const gaxGrpc = new gax.GrpcClient(opts); // Save the auth object to the client, for use by other methods. this.auth = gaxGrpc.auth; // Determine the client header string. - var clientHeader = [ + const clientHeader = [ `gl-node/${process.version}`, `grpc/${gaxGrpc.grpcVersion}`, `gax/${gax.version}`, @@ -90,7 +90,7 @@ class SubscriberClient { } // Load the applicable protos. - var protos = merge( + const protos = merge( {}, gaxGrpc.loadProto( path.join(__dirname, '..', '..', 'protos'), @@ -141,7 +141,7 @@ class SubscriberClient { }; // Put together the default options sent with requests. - var defaults = gaxGrpc.constructSettings( + const defaults = gaxGrpc.constructSettings( 'google.pubsub.v1.Subscriber', gapicConfig, opts.clientConfig, @@ -155,14 +155,14 @@ class SubscriberClient { // Put together the "service stub" for // google.iam.v1.IAMPolicy. - var iamPolicyStub = gaxGrpc.createStub( + const iamPolicyStub = gaxGrpc.createStub( protos.google.iam.v1.IAMPolicy, opts ); // Iterate over each of the methods that the service provides // and create an API call method for each. - var iamPolicyStubMethods = [ + const iamPolicyStubMethods = [ 'setIamPolicy', 'getIamPolicy', 'testIamPermissions', @@ -172,7 +172,7 @@ class SubscriberClient { iamPolicyStub.then( stub => function() { - var args = Array.prototype.slice.call(arguments, 0); + const args = Array.prototype.slice.call(arguments, 0); return stub[methodName].apply(stub, args); } ), @@ -184,14 +184,14 @@ class SubscriberClient { // Put together the "service stub" for // google.pubsub.v1.Subscriber. - var subscriberStub = gaxGrpc.createStub( + const subscriberStub = gaxGrpc.createStub( protos.google.pubsub.v1.Subscriber, opts ); // Iterate over each of the methods that the service provides // and create an API call method for each. - var subscriberStubMethods = [ + const subscriberStubMethods = [ 'createSubscription', 'getSubscription', 'updateSubscription', @@ -213,7 +213,7 @@ class SubscriberClient { subscriberStub.then( stub => function() { - var args = Array.prototype.slice.call(arguments, 0); + const args = Array.prototype.slice.call(arguments, 0); return stub[methodName].apply(stub, args); } ), @@ -361,19 +361,19 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedName = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * var request = { + * const formattedName = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + * const request = { * name: formattedName, * topic: formattedTopic, * }; * client.createSubscription(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -413,14 +413,14 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); * client.getSubscription({subscription: formattedSubscription}) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -467,26 +467,26 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var ackDeadlineSeconds = 42; - * var subscription = { + * const ackDeadlineSeconds = 42; + * const subscription = { * ackDeadlineSeconds: ackDeadlineSeconds, * }; - * var pathsElement = 'ack_deadline_seconds'; - * var paths = [pathsElement]; - * var updateMask = { + * const pathsElement = 'ack_deadline_seconds'; + * const paths = [pathsElement]; + * const updateMask = { * paths: paths, * }; - * var request = { + * const request = { * subscription: subscription, * updateMask: updateMask, * }; * client.updateSubscription(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -544,16 +544,16 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * * // Iterate over all elements. - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * * client.listSubscriptions({project: formattedProject}) * .then(responses => { - * var resources = responses[0]; + * const resources = responses[0]; * for (let i = 0; i < resources.length; i += 1) { * // doThingsWith(resources[i]) * } @@ -563,17 +563,17 @@ class SubscriberClient { * }); * * // Or obtain the paged response. - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * * - * var options = {autoPaginate: false}; - * var callback = responses => { + * const options = {autoPaginate: false}; + * const callback = responses => { * // The actual resources in a response. - * var resources = responses[0]; + * const resources = responses[0]; * // The next request if the response shows that there are more responses. - * var nextRequest = responses[1]; + * const nextRequest = responses[1]; * // The actual response object, if necessary. - * // var rawResponse = responses[2]; + * // const rawResponse = responses[2]; * for (let i = 0; i < resources.length; i += 1) { * // doThingsWith(resources[i]); * } @@ -632,11 +632,11 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * client.listSubscriptionsStream({project: formattedProject}) * .on('data', element => { * // doThingsWith(element) @@ -678,11 +678,11 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); * client.deleteSubscription({subscription: formattedSubscription}).catch(err => { * console.error(err); * }); @@ -731,14 +731,14 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var ackIds = []; - * var ackDeadlineSeconds = 0; - * var request = { + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const ackIds = []; + * const ackDeadlineSeconds = 0; + * const request = { * subscription: formattedSubscription, * ackIds: ackIds, * ackDeadlineSeconds: ackDeadlineSeconds, @@ -786,13 +786,13 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var ackIds = []; - * var request = { + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const ackIds = []; + * const request = { * subscription: formattedSubscription, * ackIds: ackIds, * }; @@ -846,19 +846,19 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var maxMessages = 0; - * var request = { + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const maxMessages = 0; + * const request = { * subscription: formattedSubscription, * maxMessages: maxMessages, * }; * client.pull(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -896,16 +896,16 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var stream = client.streamingPull().on('data', response => { + * const stream = client.streamingPull().on('data', response => { * // doThingsWith(response) * }); - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var streamAckDeadlineSeconds = 0; - * var request = { + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const streamAckDeadlineSeconds = 0; + * const request = { * subscription: formattedSubscription, * streamAckDeadlineSeconds: streamAckDeadlineSeconds, * }; @@ -952,13 +952,13 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var pushConfig = {}; - * var request = { + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const pushConfig = {}; + * const request = { * subscription: formattedSubscription, * pushConfig: pushConfig, * }; @@ -1020,16 +1020,16 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * * // Iterate over all elements. - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * * client.listSnapshots({project: formattedProject}) * .then(responses => { - * var resources = responses[0]; + * const resources = responses[0]; * for (let i = 0; i < resources.length; i += 1) { * // doThingsWith(resources[i]) * } @@ -1039,17 +1039,17 @@ class SubscriberClient { * }); * * // Or obtain the paged response. - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * * - * var options = {autoPaginate: false}; - * var callback = responses => { + * const options = {autoPaginate: false}; + * const callback = responses => { * // The actual resources in a response. - * var resources = responses[0]; + * const resources = responses[0]; * // The next request if the response shows that there are more responses. - * var nextRequest = responses[1]; + * const nextRequest = responses[1]; * // The actual response object, if necessary. - * // var rawResponse = responses[2]; + * // const rawResponse = responses[2]; * for (let i = 0; i < resources.length; i += 1) { * // doThingsWith(resources[i]); * } @@ -1108,11 +1108,11 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedProject = client.projectPath('[PROJECT]'); + * const formattedProject = client.projectPath('[PROJECT]'); * client.listSnapshotsStream({project: formattedProject}) * .on('data', element => { * // doThingsWith(element) @@ -1182,19 +1182,19 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var request = { + * const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const request = { * name: formattedName, * subscription: formattedSubscription, * }; * client.createSnapshot(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -1244,29 +1244,29 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var seconds = 123456; - * var expireTime = { + * const seconds = 123456; + * const expireTime = { * seconds: seconds, * }; - * var snapshot = { + * const snapshot = { * expireTime: expireTime, * }; - * var pathsElement = 'expire_time'; - * var paths = [pathsElement]; - * var updateMask = { + * const pathsElement = 'expire_time'; + * const paths = [pathsElement]; + * const updateMask = { * paths: paths, * }; - * var request = { + * const request = { * snapshot: snapshot, * updateMask: updateMask, * }; * client.updateSnapshot(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -1310,11 +1310,11 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + * const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); * client.deleteSnapshot({snapshot: formattedSnapshot}).catch(err => { * console.error(err); * }); @@ -1373,14 +1373,14 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); * client.seek({subscription: formattedSubscription}) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -1429,19 +1429,19 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var policy = {}; - * var request = { + * const formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const policy = {}; + * const request = { * resource: formattedResource, * policy: policy, * }; * client.setIamPolicy(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -1484,14 +1484,14 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); * client.getIamPolicy({resource: formattedResource}) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { @@ -1539,19 +1539,19 @@ class SubscriberClient { * * const pubsub = require('@google-cloud/pubsub'); * - * var client = new pubsub.v1.SubscriberClient({ + * const client = new pubsub.v1.SubscriberClient({ * // optional auth parameters. * }); * - * var formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * var permissions = []; - * var request = { + * const formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); + * const permissions = []; + * const request = { * resource: formattedResource, * permissions: permissions, * }; * client.testIamPermissions(request) * .then(responses => { - * var response = responses[0]; + * const response = responses[0]; * // doThingsWith(response) * }) * .catch(err => { diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index 732c3306d45..e5a2b357ece 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -19,27 +19,27 @@ const through2 = require('through2'); const pubsubModule = require('../src'); -var FAKE_STATUS_CODE = 1; -var error = new Error(); +const FAKE_STATUS_CODE = 1; +const error = new Error(); error.code = FAKE_STATUS_CODE; describe('PublisherClient', () => { describe('createTopic', () => { it('invokes createTopic without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { name: formattedName, }; // Mock response - var name2 = 'name2-1052831874'; - var expectedResponse = { + const name2 = 'name2-1052831874'; + const expectedResponse = { name: name2, }; @@ -57,14 +57,14 @@ describe('PublisherClient', () => { }); it('invokes createTopic with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { name: formattedName, }; @@ -86,22 +86,22 @@ describe('PublisherClient', () => { describe('updateTopic', () => { it('invokes updateTopic without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var topic = {}; - var updateMask = {}; - var request = { + const topic = {}; + const updateMask = {}; + const request = { topic: topic, updateMask: updateMask, }; // Mock response - var name = 'name3373707'; - var expectedResponse = { + const name = 'name3373707'; + const expectedResponse = { name: name, }; @@ -119,15 +119,15 @@ describe('PublisherClient', () => { }); it('invokes updateTopic with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var topic = {}; - var updateMask = {}; - var request = { + const topic = {}; + const updateMask = {}; + const request = { topic: topic, updateMask: updateMask, }; @@ -150,27 +150,27 @@ describe('PublisherClient', () => { describe('publish', () => { it('invokes publish without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var data = '-86'; - var messagesElement = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const data = '-86'; + const messagesElement = { data: data, }; - var messages = [messagesElement]; - var request = { + const messages = [messagesElement]; + const request = { topic: formattedTopic, messages: messages, }; // Mock response - var messageIdsElement = 'messageIdsElement-744837059'; - var messageIds = [messageIdsElement]; - var expectedResponse = { + const messageIdsElement = 'messageIdsElement-744837059'; + const messageIds = [messageIdsElement]; + const expectedResponse = { messageIds: messageIds, }; @@ -188,19 +188,19 @@ describe('PublisherClient', () => { }); it('invokes publish with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var data = '-86'; - var messagesElement = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const data = '-86'; + const messagesElement = { data: data, }; - var messages = [messagesElement]; - var request = { + const messages = [messagesElement]; + const request = { topic: formattedTopic, messages: messages, }; @@ -223,20 +223,20 @@ describe('PublisherClient', () => { describe('getTopic', () => { it('invokes getTopic without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; // Mock response - var name = 'name3373707'; - var expectedResponse = { + const name = 'name3373707'; + const expectedResponse = { name: name, }; @@ -254,14 +254,14 @@ describe('PublisherClient', () => { }); it('invokes getTopic with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; @@ -283,22 +283,22 @@ describe('PublisherClient', () => { describe('listTopics', () => { it('invokes listTopics without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; // Mock response - var nextPageToken = ''; - var topicsElement = {}; - var topics = [topicsElement]; - var expectedResponse = { + const nextPageToken = ''; + const topicsElement = {}; + const topics = [topicsElement]; + const expectedResponse = { nextPageToken: nextPageToken, topics: topics, }; @@ -317,14 +317,14 @@ describe('PublisherClient', () => { }); it('invokes listTopics with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; @@ -346,22 +346,22 @@ describe('PublisherClient', () => { describe('listTopicSubscriptions', () => { it('invokes listTopicSubscriptions without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; // Mock response - var nextPageToken = ''; - var subscriptionsElement = 'subscriptionsElement1698708147'; - var subscriptions = [subscriptionsElement]; - var expectedResponse = { + const nextPageToken = ''; + const subscriptionsElement = 'subscriptionsElement1698708147'; + const subscriptions = [subscriptionsElement]; + const expectedResponse = { nextPageToken: nextPageToken, subscriptions: subscriptions, }; @@ -384,14 +384,14 @@ describe('PublisherClient', () => { }); it('invokes listTopicSubscriptions with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; @@ -413,14 +413,14 @@ describe('PublisherClient', () => { describe('deleteTopic', () => { it('invokes deleteTopic without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; @@ -434,14 +434,14 @@ describe('PublisherClient', () => { }); it('invokes deleteTopic with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { topic: formattedTopic, }; @@ -462,23 +462,23 @@ describe('PublisherClient', () => { describe('setIamPolicy', () => { it('invokes setIamPolicy without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var policy = {}; - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const policy = {}; + const request = { resource: formattedResource, policy: policy, }; // Mock response - var version = 351608024; - var etag = '21'; - var expectedResponse = { + const version = 351608024; + const etag = '21'; + const expectedResponse = { version: version, etag: etag, }; @@ -497,15 +497,15 @@ describe('PublisherClient', () => { }); it('invokes setIamPolicy with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var policy = {}; - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const policy = {}; + const request = { resource: formattedResource, policy: policy, }; @@ -528,21 +528,21 @@ describe('PublisherClient', () => { describe('getIamPolicy', () => { it('invokes getIamPolicy without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { resource: formattedResource, }; // Mock response - var version = 351608024; - var etag = '21'; - var expectedResponse = { + const version = 351608024; + const etag = '21'; + const expectedResponse = { version: version, etag: etag, }; @@ -561,14 +561,14 @@ describe('PublisherClient', () => { }); it('invokes getIamPolicy with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { resource: formattedResource, }; @@ -590,21 +590,21 @@ describe('PublisherClient', () => { describe('testIamPermissions', () => { it('invokes testIamPermissions without error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var permissions = []; - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const permissions = []; + const request = { resource: formattedResource, permissions: permissions, }; // Mock response - var expectedResponse = {}; + const expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( @@ -620,15 +620,15 @@ describe('PublisherClient', () => { }); it('invokes testIamPermissions with error', done => { - var client = new pubsubModule.v1.PublisherClient({ + const client = new pubsubModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - var permissions = []; - var request = { + const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); + const permissions = []; + const request = { resource: formattedResource, permissions: permissions, }; @@ -652,28 +652,28 @@ describe('PublisherClient', () => { describe('SubscriberClient', () => { describe('createSubscription', () => { it('invokes createSubscription without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.subscriptionPath( + const formattedName = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { name: formattedName, topic: formattedTopic, }; // Mock response - var name2 = 'name2-1052831874'; - var topic2 = 'topic2-1139259102'; - var ackDeadlineSeconds = 2135351438; - var retainAckedMessages = false; - var expectedResponse = { + const name2 = 'name2-1052831874'; + const topic2 = 'topic2-1139259102'; + const ackDeadlineSeconds = 2135351438; + const retainAckedMessages = false; + const expectedResponse = { name: name2, topic: topic2, ackDeadlineSeconds: ackDeadlineSeconds, @@ -694,18 +694,18 @@ describe('SubscriberClient', () => { }); it('invokes createSubscription with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.subscriptionPath( + const formattedName = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - var request = { + const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); + const request = { name: formattedName, topic: formattedTopic, }; @@ -728,26 +728,26 @@ describe('SubscriberClient', () => { describe('getSubscription', () => { it('invokes getSubscription without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; // Mock response - var name = 'name3373707'; - var topic = 'topic110546223'; - var ackDeadlineSeconds = 2135351438; - var retainAckedMessages = false; - var expectedResponse = { + const name = 'name3373707'; + const topic = 'topic110546223'; + const ackDeadlineSeconds = 2135351438; + const retainAckedMessages = false; + const expectedResponse = { name: name, topic: topic, ackDeadlineSeconds: ackDeadlineSeconds, @@ -768,17 +768,17 @@ describe('SubscriberClient', () => { }); it('invokes getSubscription with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; @@ -800,32 +800,32 @@ describe('SubscriberClient', () => { describe('updateSubscription', () => { it('invokes updateSubscription without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var ackDeadlineSeconds = 42; - var subscription = { + const ackDeadlineSeconds = 42; + const subscription = { ackDeadlineSeconds: ackDeadlineSeconds, }; - var pathsElement = 'ack_deadline_seconds'; - var paths = [pathsElement]; - var updateMask = { + const pathsElement = 'ack_deadline_seconds'; + const paths = [pathsElement]; + const updateMask = { paths: paths, }; - var request = { + const request = { subscription: subscription, updateMask: updateMask, }; // Mock response - var name = 'name3373707'; - var topic = 'topic110546223'; - var ackDeadlineSeconds2 = 921632575; - var retainAckedMessages = false; - var expectedResponse = { + const name = 'name3373707'; + const topic = 'topic110546223'; + const ackDeadlineSeconds2 = 921632575; + const retainAckedMessages = false; + const expectedResponse = { name: name, topic: topic, ackDeadlineSeconds: ackDeadlineSeconds2, @@ -846,22 +846,22 @@ describe('SubscriberClient', () => { }); it('invokes updateSubscription with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var ackDeadlineSeconds = 42; - var subscription = { + const ackDeadlineSeconds = 42; + const subscription = { ackDeadlineSeconds: ackDeadlineSeconds, }; - var pathsElement = 'ack_deadline_seconds'; - var paths = [pathsElement]; - var updateMask = { + const pathsElement = 'ack_deadline_seconds'; + const paths = [pathsElement]; + const updateMask = { paths: paths, }; - var request = { + const request = { subscription: subscription, updateMask: updateMask, }; @@ -884,22 +884,22 @@ describe('SubscriberClient', () => { describe('listSubscriptions', () => { it('invokes listSubscriptions without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; // Mock response - var nextPageToken = ''; - var subscriptionsElement = {}; - var subscriptions = [subscriptionsElement]; - var expectedResponse = { + const nextPageToken = ''; + const subscriptionsElement = {}; + const subscriptions = [subscriptionsElement]; + const expectedResponse = { nextPageToken: nextPageToken, subscriptions: subscriptions, }; @@ -922,14 +922,14 @@ describe('SubscriberClient', () => { }); it('invokes listSubscriptions with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; @@ -951,17 +951,17 @@ describe('SubscriberClient', () => { describe('deleteSubscription', () => { it('invokes deleteSubscription without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; @@ -975,17 +975,17 @@ describe('SubscriberClient', () => { }); it('invokes deleteSubscription with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; @@ -1006,19 +1006,19 @@ describe('SubscriberClient', () => { describe('modifyAckDeadline', () => { it('invokes modifyAckDeadline without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var ackIds = []; - var ackDeadlineSeconds = 2135351438; - var request = { + const ackIds = []; + const ackDeadlineSeconds = 2135351438; + const request = { subscription: formattedSubscription, ackIds: ackIds, ackDeadlineSeconds: ackDeadlineSeconds, @@ -1034,19 +1034,19 @@ describe('SubscriberClient', () => { }); it('invokes modifyAckDeadline with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var ackIds = []; - var ackDeadlineSeconds = 2135351438; - var request = { + const ackIds = []; + const ackDeadlineSeconds = 2135351438; + const request = { subscription: formattedSubscription, ackIds: ackIds, ackDeadlineSeconds: ackDeadlineSeconds, @@ -1069,18 +1069,18 @@ describe('SubscriberClient', () => { describe('acknowledge', () => { it('invokes acknowledge without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var ackIds = []; - var request = { + const ackIds = []; + const request = { subscription: formattedSubscription, ackIds: ackIds, }; @@ -1095,18 +1095,18 @@ describe('SubscriberClient', () => { }); it('invokes acknowledge with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var ackIds = []; - var request = { + const ackIds = []; + const request = { subscription: formattedSubscription, ackIds: ackIds, }; @@ -1128,24 +1128,24 @@ describe('SubscriberClient', () => { describe('pull', () => { it('invokes pull without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var maxMessages = 496131527; - var request = { + const maxMessages = 496131527; + const request = { subscription: formattedSubscription, maxMessages: maxMessages, }; // Mock response - var expectedResponse = {}; + const expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.pull = mockSimpleGrpcMethod( @@ -1161,18 +1161,18 @@ describe('SubscriberClient', () => { }); it('invokes pull with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var maxMessages = 496131527; - var request = { + const maxMessages = 496131527; + const request = { subscription: formattedSubscription, maxMessages: maxMessages, }; @@ -1191,26 +1191,26 @@ describe('SubscriberClient', () => { describe('streamingPull', () => { it('invokes streamingPull without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var streamAckDeadlineSeconds = 1875467245; - var request = { + const streamAckDeadlineSeconds = 1875467245; + const request = { subscription: formattedSubscription, streamAckDeadlineSeconds: streamAckDeadlineSeconds, }; // Mock response - var receivedMessagesElement = {}; - var receivedMessages = [receivedMessagesElement]; - var expectedResponse = { + const receivedMessagesElement = {}; + const receivedMessages = [receivedMessagesElement]; + const expectedResponse = { receivedMessages: receivedMessages, }; @@ -1220,7 +1220,7 @@ describe('SubscriberClient', () => { expectedResponse ); - var stream = client + const stream = client .streamingPull() .on('data', response => { assert.deepStrictEqual(response, expectedResponse); @@ -1234,18 +1234,18 @@ describe('SubscriberClient', () => { }); it('invokes streamingPull with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var streamAckDeadlineSeconds = 1875467245; - var request = { + const streamAckDeadlineSeconds = 1875467245; + const request = { subscription: formattedSubscription, streamAckDeadlineSeconds: streamAckDeadlineSeconds, }; @@ -1257,7 +1257,7 @@ describe('SubscriberClient', () => { error ); - var stream = client + const stream = client .streamingPull() .on('data', () => { assert.fail(); @@ -1274,18 +1274,18 @@ describe('SubscriberClient', () => { describe('modifyPushConfig', () => { it('invokes modifyPushConfig without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var pushConfig = {}; - var request = { + const pushConfig = {}; + const request = { subscription: formattedSubscription, pushConfig: pushConfig, }; @@ -1300,18 +1300,18 @@ describe('SubscriberClient', () => { }); it('invokes modifyPushConfig with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var pushConfig = {}; - var request = { + const pushConfig = {}; + const request = { subscription: formattedSubscription, pushConfig: pushConfig, }; @@ -1333,22 +1333,22 @@ describe('SubscriberClient', () => { describe('listSnapshots', () => { it('invokes listSnapshots without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; // Mock response - var nextPageToken = ''; - var snapshotsElement = {}; - var snapshots = [snapshotsElement]; - var expectedResponse = { + const nextPageToken = ''; + const snapshotsElement = {}; + const snapshots = [snapshotsElement]; + const expectedResponse = { nextPageToken: nextPageToken, snapshots: snapshots, }; @@ -1371,14 +1371,14 @@ describe('SubscriberClient', () => { }); it('invokes listSnapshots with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedProject = client.projectPath('[PROJECT]'); - var request = { + const formattedProject = client.projectPath('[PROJECT]'); + const request = { project: formattedProject, }; @@ -1400,26 +1400,26 @@ describe('SubscriberClient', () => { describe('createSnapshot', () => { it('invokes createSnapshot without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - var formattedSubscription = client.subscriptionPath( + const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { name: formattedName, subscription: formattedSubscription, }; // Mock response - var name2 = 'name2-1052831874'; - var topic = 'topic110546223'; - var expectedResponse = { + const name2 = 'name2-1052831874'; + const topic = 'topic110546223'; + const expectedResponse = { name: name2, topic: topic, }; @@ -1438,18 +1438,18 @@ describe('SubscriberClient', () => { }); it('invokes createSnapshot with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - var formattedSubscription = client.subscriptionPath( + const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { name: formattedName, subscription: formattedSubscription, }; @@ -1472,33 +1472,33 @@ describe('SubscriberClient', () => { describe('updateSnapshot', () => { it('invokes updateSnapshot without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var seconds = 123456; - var expireTime = { + const seconds = 123456; + const expireTime = { seconds: seconds, }; - var snapshot = { + const snapshot = { expireTime: expireTime, }; - var pathsElement = 'expire_time'; - var paths = [pathsElement]; - var updateMask = { + const pathsElement = 'expire_time'; + const paths = [pathsElement]; + const updateMask = { paths: paths, }; - var request = { + const request = { snapshot: snapshot, updateMask: updateMask, }; // Mock response - var name = 'name3373707'; - var topic = 'topic110546223'; - var expectedResponse = { + const name = 'name3373707'; + const topic = 'topic110546223'; + const expectedResponse = { name: name, topic: topic, }; @@ -1517,25 +1517,25 @@ describe('SubscriberClient', () => { }); it('invokes updateSnapshot with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var seconds = 123456; - var expireTime = { + const seconds = 123456; + const expireTime = { seconds: seconds, }; - var snapshot = { + const snapshot = { expireTime: expireTime, }; - var pathsElement = 'expire_time'; - var paths = [pathsElement]; - var updateMask = { + const pathsElement = 'expire_time'; + const paths = [pathsElement]; + const updateMask = { paths: paths, }; - var request = { + const request = { snapshot: snapshot, updateMask: updateMask, }; @@ -1558,14 +1558,14 @@ describe('SubscriberClient', () => { describe('deleteSnapshot', () => { it('invokes deleteSnapshot without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - var request = { + const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + const request = { snapshot: formattedSnapshot, }; @@ -1579,14 +1579,14 @@ describe('SubscriberClient', () => { }); it('invokes deleteSnapshot with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - var request = { + const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); + const request = { snapshot: formattedSnapshot, }; @@ -1607,22 +1607,22 @@ describe('SubscriberClient', () => { describe('seek', () => { it('invokes seek without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; // Mock response - var expectedResponse = {}; + const expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.seek = mockSimpleGrpcMethod( @@ -1638,17 +1638,17 @@ describe('SubscriberClient', () => { }); it('invokes seek with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedSubscription = client.subscriptionPath( + const formattedSubscription = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { subscription: formattedSubscription, }; @@ -1666,26 +1666,26 @@ describe('SubscriberClient', () => { describe('setIamPolicy', () => { it('invokes setIamPolicy without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var policy = {}; - var request = { + const policy = {}; + const request = { resource: formattedResource, policy: policy, }; // Mock response - var version = 351608024; - var etag = '21'; - var expectedResponse = { + const version = 351608024; + const etag = '21'; + const expectedResponse = { version: version, etag: etag, }; @@ -1704,18 +1704,18 @@ describe('SubscriberClient', () => { }); it('invokes setIamPolicy with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var policy = {}; - var request = { + const policy = {}; + const request = { resource: formattedResource, policy: policy, }; @@ -1738,24 +1738,24 @@ describe('SubscriberClient', () => { describe('getIamPolicy', () => { it('invokes getIamPolicy without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { resource: formattedResource, }; // Mock response - var version = 351608024; - var etag = '21'; - var expectedResponse = { + const version = 351608024; + const etag = '21'; + const expectedResponse = { version: version, etag: etag, }; @@ -1774,17 +1774,17 @@ describe('SubscriberClient', () => { }); it('invokes getIamPolicy with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var request = { + const request = { resource: formattedResource, }; @@ -1806,24 +1806,24 @@ describe('SubscriberClient', () => { describe('testIamPermissions', () => { it('invokes testIamPermissions without error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var permissions = []; - var request = { + const permissions = []; + const request = { resource: formattedResource, permissions: permissions, }; // Mock response - var expectedResponse = {}; + const expectedResponse = {}; // Mock Grpc layer client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( @@ -1839,18 +1839,18 @@ describe('SubscriberClient', () => { }); it('invokes testIamPermissions with error', done => { - var client = new pubsubModule.v1.SubscriberClient({ + const client = new pubsubModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); // Mock request - var formattedResource = client.subscriptionPath( + const formattedResource = client.subscriptionPath( '[PROJECT]', '[SUBSCRIPTION]' ); - var permissions = []; - var request = { + const permissions = []; + const request = { resource: formattedResource, permissions: permissions, }; @@ -1887,7 +1887,7 @@ function mockSimpleGrpcMethod(expectedRequest, response, error) { function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { return () => { - var mockStream = through2.obj((chunk, enc, callback) => { + const mockStream = through2.obj((chunk, enc, callback) => { assert.deepStrictEqual(chunk, expectedRequest); if (error) { callback(error); From 84c75ef22420698e8de43c9cd0ef9b662ad4c891 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 18 Sep 2018 10:51:30 -0700 Subject: [PATCH 0217/1115] Enable no-var in eslint (#257) --- handwritten/pubsub/.eslintrc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/.eslintrc.yml b/handwritten/pubsub/.eslintrc.yml index bed57fbc42c..65f1dce6c0c 100644 --- a/handwritten/pubsub/.eslintrc.yml +++ b/handwritten/pubsub/.eslintrc.yml @@ -11,3 +11,4 @@ rules: block-scoped-var: error eqeqeq: error no-warning-comments: warn + no-var: error From 5e7bf02c770a2b2c040108604e1d57d58dea013f Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 20 Sep 2018 12:29:51 -0700 Subject: [PATCH 0218/1115] Enable prefer-const in the eslint config (#260) --- handwritten/pubsub/.eslintrc.yml | 1 + .../pubsub/smoke-test/publisher_smoke_test.js | 14 ++++++++------ handwritten/pubsub/src/index.js | 4 ++-- handwritten/pubsub/src/v1/publisher_client.js | 4 ++-- handwritten/pubsub/src/v1/subscriber_client.js | 4 ++-- handwritten/pubsub/test/connection-pool.js | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/handwritten/pubsub/.eslintrc.yml b/handwritten/pubsub/.eslintrc.yml index 65f1dce6c0c..73eeec27612 100644 --- a/handwritten/pubsub/.eslintrc.yml +++ b/handwritten/pubsub/.eslintrc.yml @@ -12,3 +12,4 @@ rules: eqeqeq: error no-warning-comments: warn no-var: error + prefer-const: error diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index f2cc1a2d782..cae73093ef4 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -16,7 +16,7 @@ describe('PublisherSmokeTest', () => { if (!process.env.GCLOUD_PROJECT) { - throw new Error("Usage: GCLOUD_PROJECT= node #{$0}"); + throw new Error('Usage: GCLOUD_PROJECT= node #{$0}'); } const projectId = process.env.GCLOUD_PROJECT; @@ -30,7 +30,8 @@ describe('PublisherSmokeTest', () => { // Iterate over all elements. const formattedProject = client.projectPath(projectId); - client.listTopics({project: formattedProject}) + client + .listTopics({project: formattedProject}) .then(responses => { const resources = responses[0]; for (let i = 0; i < resources.length; i += 1) { @@ -51,7 +52,6 @@ describe('PublisherSmokeTest', () => { // Or obtain the paged response. const formattedProject = client.projectPath(projectId); - const options = {autoPaginate: false}; const callback = responses => { // The actual resources in a response. @@ -67,8 +67,9 @@ describe('PublisherSmokeTest', () => { // Fetch the next page. return client.listTopics(nextRequest, options).then(callback); } - } - client.listTopics({project: formattedProject}, options) + }; + client + .listTopics({project: formattedProject}, options) .then(callback) .then(done) .catch(done); @@ -82,7 +83,8 @@ describe('PublisherSmokeTest', () => { }); const formattedProject = client.projectPath(projectId); - client.listTopicsStream({project: formattedProject}) + client + .listTopicsStream({project: formattedProject}) .on('data', element => { console.log(element); }) diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.js index ca79f32dcba..ac360f9cb1a 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.js @@ -100,8 +100,8 @@ class PubSub { // It is the union of the scopes on both clients. const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; const allScopes = {}; - for (let clientClass of clientClasses) { - for (let scope of clientClass.scopes) { + for (const clientClass of clientClasses) { + for (const scope of clientClass.scopes) { allScopes[scope] = true; } } diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 458c39fb6b9..0bc17400fe3 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -189,7 +189,7 @@ class PublisherClient { 'getIamPolicy', 'testIamPermissions', ]; - for (let methodName of iamPolicyStubMethods) { + for (const methodName of iamPolicyStubMethods) { this._innerApiCalls[methodName] = gax.createApiCall( iamPolicyStub.then( stub => @@ -222,7 +222,7 @@ class PublisherClient { 'listTopicSubscriptions', 'deleteTopic', ]; - for (let methodName of publisherStubMethods) { + for (const methodName of publisherStubMethods) { this._innerApiCalls[methodName] = gax.createApiCall( publisherStub.then( stub => diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 6b1596b0d4b..285a56ee550 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -167,7 +167,7 @@ class SubscriberClient { 'getIamPolicy', 'testIamPermissions', ]; - for (let methodName of iamPolicyStubMethods) { + for (const methodName of iamPolicyStubMethods) { this._innerApiCalls[methodName] = gax.createApiCall( iamPolicyStub.then( stub => @@ -208,7 +208,7 @@ class SubscriberClient { 'deleteSnapshot', 'seek', ]; - for (let methodName of subscriberStubMethods) { + for (const methodName of subscriberStubMethods) { this._innerApiCalls[methodName] = gax.createApiCall( subscriberStub.then( stub => diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.js index e27dc058fb2..4556397f4f6 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.js @@ -215,7 +215,7 @@ describe('ConnectionPool', function() { }); it('should return a specified connection', function(done) { - let id = 'a'; + const id = 'a'; const fakeConnection = new FakeConnection(); pool.connections.set(id, fakeConnection); From b50cee963a1bcdfc6ba5fed26d55be6ffa625f39 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 20 Sep 2018 17:48:33 -0700 Subject: [PATCH 0219/1115] Fix the linter (#261) --- handwritten/pubsub/package.json | 4 ++-- handwritten/pubsub/smoke-test/.eslintrc.yml | 6 ++++++ handwritten/pubsub/src/connection-pool.js | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 handwritten/pubsub/smoke-test/.eslintrc.yml diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 567b70c4bca..f99359c87bf 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -67,10 +67,10 @@ "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", "test-no-cover": "mocha test/*.js", "test": "npm run cover", - "lint": "eslint src/ samples/ system-test/ test/", + "lint": "eslint '**/*.js'", "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", "docs": "jsdoc -c .jsdoc.js", - "publish-module": "node ../../scripts/publish.js pubsub", + "fix": "eslint --fix '**/*.js' && npm run prettier", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" }, "dependencies": { diff --git a/handwritten/pubsub/smoke-test/.eslintrc.yml b/handwritten/pubsub/smoke-test/.eslintrc.yml new file mode 100644 index 00000000000..2e6882e46d2 --- /dev/null +++ b/handwritten/pubsub/smoke-test/.eslintrc.yml @@ -0,0 +1,6 @@ +--- +env: + mocha: true +rules: + node/no-unpublished-require: off + no-console: off diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.js index a642f4a81be..1ffb85a8fe4 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.js @@ -299,11 +299,10 @@ class ConnectionPool extends EventEmitter { } let elapsedTimeWithoutConnection = 0; const now = Date.now(); - let deadline; if (this.noConnectionsTime) { elapsedTimeWithoutConnection = now - this.noConnectionsTime; } - deadline = now + (MAX_TIMEOUT - elapsedTimeWithoutConnection); + const deadline = now + (MAX_TIMEOUT - elapsedTimeWithoutConnection); client.waitForReady(deadline, err => { this.isGettingChannelState = false; if (err) { From 90175fc6fc926d46b78226453515b3e48881ca19 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 21 Sep 2018 18:04:20 -0700 Subject: [PATCH 0220/1115] Run prettier on smoke tests (#265) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f99359c87bf..2338e27b718 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -68,7 +68,7 @@ "test-no-cover": "mocha test/*.js", "test": "npm run cover", "lint": "eslint '**/*.js'", - "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", + "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js smoke-test/*.js", "docs": "jsdoc -c .jsdoc.js", "fix": "eslint --fix '**/*.js' && npm run prettier", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" From 544740064adf1dc37dd044e8c7d4d148bc516ef0 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Fri, 21 Sep 2018 18:38:00 -0700 Subject: [PATCH 0221/1115] Update CI config (#266) --- handwritten/pubsub/.circleci/npm-install-retry.js | 2 +- .../pubsub/.kokoro/presubmit/node8/samples-test.cfg | 7 +++++++ .../pubsub/.kokoro/presubmit/node8/system-test.cfg | 7 +++++++ handwritten/pubsub/src/v1/publisher_client_config.json | 8 ++++++-- handwritten/pubsub/src/v1/subscriber_client_config.json | 8 ++++++-- 5 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/samples-test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/system-test.cfg diff --git a/handwritten/pubsub/.circleci/npm-install-retry.js b/handwritten/pubsub/.circleci/npm-install-retry.js index ae3220d7348..3240aa2cbf2 100755 --- a/handwritten/pubsub/.circleci/npm-install-retry.js +++ b/handwritten/pubsub/.circleci/npm-install-retry.js @@ -6,7 +6,7 @@ let spawn = require('child_process').spawn; //USE: ./index.js [... NPM ARGS] // -let timeout = process.argv[2] || 60000; +let timeout = process.argv[2] || process.env.NPM_INSTALL_TIMEOUT || 60000; let attempts = process.argv[3] || 3; let args = process.argv.slice(4); if (args.length === 0) { diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/samples-test.cfg new file mode 100644 index 00000000000..b0b5906e674 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node8/samples-test.cfg @@ -0,0 +1,7 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/samples-test.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/system-test.cfg new file mode 100644 index 00000000000..7d6fa1ba740 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node8/system-test.cfg @@ -0,0 +1,7 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/system-test.sh" +} diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 72dec325a15..57083756564 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -6,6 +6,11 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], + "http_get": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "non_idempotent": [], "one_plus_delivery": [ "ABORTED", "CANCELLED", @@ -14,8 +19,7 @@ "RESOURCE_EXHAUSTED", "UNAVAILABLE", "UNKNOWN" - ], - "non_idempotent": [] + ] }, "retry_params": { "default": { diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 0d793ba4f6d..ce74feb0eee 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -6,14 +6,18 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "non_idempotent": [], "pull": [ "CANCELLED", "DEADLINE_EXCEEDED", "INTERNAL", "RESOURCE_EXHAUSTED", "UNAVAILABLE" - ] + ], + "http_get": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "non_idempotent": [] }, "retry_params": { "default": { From 36d56eb6b395aed24ddf6f45bfb8ee554fe84881 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 24 Sep 2018 17:00:48 -0700 Subject: [PATCH 0222/1115] test: remove appveyor config (#268) --- handwritten/pubsub/.appveyor.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 handwritten/pubsub/.appveyor.yml diff --git a/handwritten/pubsub/.appveyor.yml b/handwritten/pubsub/.appveyor.yml deleted file mode 100644 index 24082152655..00000000000 --- a/handwritten/pubsub/.appveyor.yml +++ /dev/null @@ -1,20 +0,0 @@ -environment: - matrix: - - nodejs_version: 8 - -install: - - ps: Install-Product node $env:nodejs_version - - npm install -g npm # Force using the latest npm to get dedupe during install - - set PATH=%APPDATA%\npm;%PATH% - - npm install --force --ignore-scripts - -test_script: - - node --version - - npm --version - - npm rebuild - - npm test - -build: off - -matrix: - fast_finish: true From 28aef9cea925baec77e2ebf587c0fd9a225e7c10 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 25 Sep 2018 07:37:46 -0700 Subject: [PATCH 0223/1115] Update kokoro config (#269) --- handwritten/pubsub/.kokoro/samples-test.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 76edbbbb247..a91cbf5a67b 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -24,6 +24,11 @@ export GCLOUD_PROJECT=long-door-651 cd $(dirname $0)/.. +# Run a pre-test hook, if a pre-samples-test.sh is in the project +if [ -f .kokoro/pre-samples-test.sh ]; then + . .kokoro/pre-samples-test.sh +fi + npm install # Install and link samples From d66c49494c36bbfc8b3ce5451c409300f26b199a Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Wed, 26 Sep 2018 11:01:00 -0700 Subject: [PATCH 0224/1115] fix quickstart tag in v0.20 docs (#271) * fix quickstart tag in v0.20 docs * update versions --- handwritten/pubsub/CHANGELOG.md | 5 +++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 05c3ea16e3a..a10fb17eb22 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,11 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.20.1 + +### Documentation + - fix(docs): correct region tag for sample documentation (#272) + ## v0.20.0 ### Implementation Changes diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2338e27b718..36ca71d4c48 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.20.0", + "version": "0.20.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 6042ef96d9b788024c2cca91dd8ef11433cc1254 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Wed, 26 Sep 2018 17:09:48 -0700 Subject: [PATCH 0225/1115] Re-generate library using /synth.py (#270) --- handwritten/pubsub/.kokoro/samples-test.sh | 2 ++ handwritten/pubsub/.kokoro/system-test.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index a91cbf5a67b..5a81ec01fcc 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -26,7 +26,9 @@ cd $(dirname $0)/.. # Run a pre-test hook, if a pre-samples-test.sh is in the project if [ -f .kokoro/pre-samples-test.sh ]; then + set +x . .kokoro/pre-samples-test.sh + set -x fi npm install diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index a954b79429d..fd8f0b638d0 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -26,7 +26,9 @@ cd $(dirname $0)/.. # Run a pre-test hook, if a pre-system-test.sh is in the project if [ -f .kokoro/pre-system-test.sh ]; then + set +x . .kokoro/pre-system-test.sh + set -x fi npm install From a0c73818b2e325214b7b95df2090c1960a6159b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 1 Oct 2018 05:02:45 -0700 Subject: [PATCH 0226/1115] chore(deps): update dependency eslint-plugin-prettier to v3 (#274) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 36ca71d4c48..348226b7e39 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -100,7 +100,7 @@ "eslint": "^5.0.0", "eslint-config-prettier": "^3.0.0", "eslint-plugin-node": "^7.0.0", - "eslint-plugin-prettier": "^2.3.1", + "eslint-plugin-prettier": "^3.0.0", "ink-docstrap": "^1.3.2", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", From de7dc85925176d5000a5630b1ae0746c1c8ea85d Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 2 Oct 2018 08:17:30 -0700 Subject: [PATCH 0227/1115] Update kokoro config (#275) --- handwritten/pubsub/.circleci/config.yml | 2 -- handwritten/pubsub/.kokoro/common.cfg | 11 +++++++++++ handwritten/pubsub/.kokoro/test.bat | 2 ++ handwritten/pubsub/.kokoro/test.sh | 3 ++- handwritten/pubsub/codecov.yaml | 4 ++++ .../pubsub/src/v1/subscriber_client_config.json | 1 - 6 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 handwritten/pubsub/codecov.yaml diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 8af6a4d0489..da54155fc57 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -68,8 +68,6 @@ jobs: environment: NPM_CONFIG_PREFIX: /home/node/.npm-global - run: npm test - - run: node_modules/.bin/codecov - node8: docker: - image: 'node:8' diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index abfbbfb207d..775de233044 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -13,6 +13,17 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + backend_type: FASTCONFIGPUSH + } + } +} + # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat index a8534ba801c..d60473666b0 100644 --- a/handwritten/pubsub/.kokoro/test.bat +++ b/handwritten/pubsub/.kokoro/test.bat @@ -17,6 +17,8 @@ cd /d %~dp0 cd .. +call npm install -g npm@5 || goto :error + call npm install || goto :error call npm run test || goto :error diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 51f29589b19..eb25b89b95e 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -22,4 +22,5 @@ cd $(dirname $0)/.. npm install npm test -node_modules/.bin/codecov + +bash $KOKORO_GFILE_DIR/codecov.sh diff --git a/handwritten/pubsub/codecov.yaml b/handwritten/pubsub/codecov.yaml new file mode 100644 index 00000000000..5724ea9478d --- /dev/null +++ b/handwritten/pubsub/codecov.yaml @@ -0,0 +1,4 @@ +--- +codecov: + ci: + - source.cloud.google.com diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index ce74feb0eee..18dd2f000ab 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -7,7 +7,6 @@ "UNAVAILABLE" ], "pull": [ - "CANCELLED", "DEADLINE_EXCEEDED", "INTERNAL", "RESOURCE_EXHAUSTED", From 684e3c1b39f56c7aad018cf53f50a7b34ea55ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Edstr=C3=B6m?= Date: Wed, 10 Oct 2018 17:48:31 +0200 Subject: [PATCH 0228/1115] fix: maxBytes batching sending empty messages (#281) --- handwritten/pubsub/src/publisher.js | 9 ++++++--- handwritten/pubsub/test/publisher.js | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.js index baeecfe02f0..1ba9e9fde0e 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.js @@ -163,15 +163,18 @@ class Publisher { const opts = this.settings.batching; // if this message puts us over the maxBytes option, then let's ship // what we have and add it to the next batch - if (this.inventory_.bytes + data.length > opts.maxBytes) { + if ( + this.inventory_.bytes > 0 && + this.inventory_.bytes + data.length > opts.maxBytes + ) { this.publish_(); } // add it to the queue! this.queue_(data, attributes, callback); // next lets check if this message brings us to the message cap or if we - // magically hit the max byte limit + // hit the max byte limit const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; - if (this.inventory_.bytes === opts.maxBytes || hasMaxMessages) { + if (this.inventory_.bytes >= opts.maxBytes || hasMaxMessages) { this.publish_(); return; } diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.js index 4cf2cc7d853..a63e4e50c76 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.js @@ -210,6 +210,32 @@ All attributes must be in the form of a string. publisher.publish(DATA, done); }); + it('should not attempt to publish empty payload if data puts payload above size cap', function(done) { + const pushRequests = []; + publisher.settings.batching.maxBytes = 2; + publisher.inventory_.bytes = 0; + + publisher.publish_ = function() { + assert.notStrictEqual(publisher.inventory_.queued.length, 0); + pushRequests.push(publisher.inventory_.queued); + publisher.inventory_.callbacks.forEach(function(callback) { + callback(); + }); + }; + + publisher.publish(DATA, function() { + assert.deepStrictEqual(pushRequests, [ + [ + { + data: DATA, + attributes: {}, + }, + ], + ]); + done(); + }); + }); + it('should publish if data puts payload at size cap', function(done) { publisher.queue_ = function() { publisher.inventory_.bytes += DATA.length; From 7426d6aa8f8128d1fed5a4c3ba710c68e1cebe2a Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 10 Oct 2018 19:03:21 -0400 Subject: [PATCH 0229/1115] fix(subscription): promisify Subscription#close (#282) --- handwritten/pubsub/src/subscriber.js | 9 ++++++++- handwritten/pubsub/test/subscriber.js | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.js index 63712e8763b..7f018fc4203 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.js @@ -19,7 +19,7 @@ const arrify = require('arrify'); const chunk = require('lodash.chunk'); const util = require('./util'); -const {promisify} = require('@google-cloud/promisify'); +const {promisify, promisifyAll} = require('@google-cloud/promisify'); const delay = require('delay'); const {EventEmitter} = require('events'); const extend = require('extend'); @@ -473,4 +473,11 @@ class Subscriber extends EventEmitter { } } +/*! Developer Documentation + * + * All async methods (except for streams) will return a Promise in the event + * that a callback is omitted. + */ +promisifyAll(Subscriber); + module.exports = Subscriber; diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.js index bf4f35b33a3..edb8def8ec2 100644 --- a/handwritten/pubsub/test/subscriber.js +++ b/handwritten/pubsub/test/subscriber.js @@ -32,6 +32,13 @@ function fakePromisify() { return (promisifyOverride || pfy.promisify).apply(null, arguments); } +let promisified = false; +function fakePromisifyAll(Class) { + if (Class.name === 'Subscriber') { + promisified = true; + } +} + const FAKE_FREE_MEM = 168222720; const fakeOs = { freemem: function() { @@ -67,6 +74,7 @@ describe('Subscriber', function() { '../src/util': fakeUtil, '@google-cloud/promisify': { promisify: fakePromisify, + promisifyAll: fakePromisifyAll, }, delay: fakeDelay, os: fakeOs, @@ -81,6 +89,10 @@ describe('Subscriber', function() { }); describe('initialization', function() { + it('should promisify all the things', function() { + assert(promisified); + }); + it('should create a histogram instance', function() { assert(subscriber.histogram instanceof FakeHistogram); }); From fdde6ee9399564e86321c70d439ee5164bad528f Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 15 Oct 2018 14:43:28 -0700 Subject: [PATCH 0230/1115] build: fix codecov uploading on Kokoro (#286) * build: fix codecov uploading on Kokoro * build: fix codecov uploading on Kokoro --- handwritten/pubsub/.kokoro/common.cfg | 11 ----------- handwritten/pubsub/.kokoro/presubmit/node8/test.cfg | 9 +++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index 775de233044..abfbbfb207d 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -13,17 +13,6 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. build_file: "nodejs-pubsub/.kokoro/trampoline.sh" -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - backend_type: FASTCONFIGPUSH - } - } -} - # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg index e69de29bb2d..468b8c7197a 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg @@ -0,0 +1,9 @@ +# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} From 904a3571f512364397f642db46c4e396f0b6e484 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 15 Oct 2018 14:52:32 -0700 Subject: [PATCH 0231/1115] fix(deps): update dependency google-proto-files to ^0.17.0 (#284) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 348226b7e39..6af553a66b5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -84,7 +84,7 @@ "extend": "^3.0.1", "google-auth-library": "^2.0.0", "google-gax": "^0.20.0", - "google-proto-files": "^0.16.0", + "google-proto-files": "^0.17.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", From 6f7480797e790f1d6e92022554c82114bc728b77 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 16 Oct 2018 09:44:35 -0700 Subject: [PATCH 0232/1115] feat: add expiration policy (#287) --- .../protos/google/pubsub/v1/pubsub.proto | 82 ++++++++++++------- .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 80 +++++++++++++----- handwritten/pubsub/src/v1/publisher_client.js | 13 ++- .../pubsub/src/v1/subscriber_client.js | 44 ++++++---- .../src/v1/subscriber_client_config.json | 2 +- 5 files changed, 147 insertions(+), 74 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index e70440314ae..b13c73473aa 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google Inc. +// Copyright 2018 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; @@ -53,8 +54,7 @@ service Publisher { } // Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic - // does not exist. The message payload must not be empty; it must contain - // either a non-empty data field, or at least one attribute. + // does not exist. rpc Publish(PublishRequest) returns (PublishResponse) { option (google.api.http) = { post: "/v1/{topic=projects/*/topics/*}:publish" @@ -187,8 +187,7 @@ service Subscriber { }; } - // Pulls messages from the server. Returns an empty list if there are no - // messages available in the backlog. The server may return `UNAVAILABLE` if + // Pulls messages from the server. The server may return `UNAVAILABLE` if // there are too many concurrent pull requests pending for the given // subscription. rpc Pull(PullRequest) returns (PullResponse) { @@ -205,7 +204,8 @@ service Subscriber { // reassign server-side resources, in which case, the client should // re-establish the stream. Flow control can be achieved by configuring the // underlying RPC channel. - rpc StreamingPull(stream StreamingPullRequest) returns (stream StreamingPullResponse); + rpc StreamingPull(stream StreamingPullRequest) returns (stream StreamingPullResponse) { + } // Modifies the `PushConfig` for a specified subscription. // @@ -243,7 +243,7 @@ service Subscriber { // Creates a snapshot from the requested subscription.

// ALPHA: This feature is part of an alpha release. This API might be // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. + // use. It is not subject to any SLA or deprecation policy.

// If the snapshot already exists, returns `ALREADY_EXISTS`. // If the requested subscription doesn't exist, returns `NOT_FOUND`. // If the backlog in the subscription is too old -- and the resulting snapshot @@ -321,7 +321,7 @@ message Topic { // must not start with `"goog"`. string name = 1; - // User labels. + // See Creating and managing labels. map labels = 2; // Policy constraining how messages published to the topic may be stored. It @@ -333,10 +333,13 @@ message Topic { MessageStoragePolicy message_storage_policy = 3; } -// A message data and its attributes. The message payload must not be empty; -// it must contain either a non-empty data field, or at least one attribute. +// A message that is published by publishers and consumed by subscribers. The +// message must contain either a non-empty data field or at least one attribute. +// See Quotas and limits for more information about +// message limits. message PubsubMessage { - // The message payload. + // The message data field. If this field is empty, the message must contain + // at least one attribute. bytes data = 1; // Optional attributes for this message. @@ -394,8 +397,8 @@ message PublishResponse { // Request for the `ListTopics` method. message ListTopicsRequest { - // The name of the cloud project that topics belong to. - // Format is `projects/{project}`. + // The name of the project in which to list topics. + // Format is `projects/{project-id}`. string project = 1; // Maximum number of topics to return. @@ -545,8 +548,31 @@ message Subscription { // use. It is not subject to any SLA or deprecation policy. google.protobuf.Duration message_retention_duration = 8; - // User labels. + // See Creating and managing labels. map labels = 9; + + // A policy that specifies the conditions for this subscription's expiration. + // A subscription is considered active as long as any connected subscriber is + // successfully consuming messages from the subscription or is issuing + // operations on the subscription. If `expiration_policy` is not set, a + // *default policy* with `ttl` of 31 days will be used. The minimum allowed + // value for `expiration_policy.ttl` is 1 day. + // BETA: This feature is part of a beta release. This API might be + // changed in backward-incompatible ways and is not recommended for production + // use. It is not subject to any SLA or deprecation policy. + ExpirationPolicy expiration_policy = 11; +} + +// A policy that specifies the conditions for resource expiration (i.e., +// automatic resource deletion). +message ExpirationPolicy { + // Specifies the "time-to-live" duration for an associated resource. The + // resource expires if it is not active for a period of `ttl`. The definition + // of "activity" depends on the type of the associated resource. The minimum + // and maximum allowed values for `ttl` depend on the type of the associated + // resource, as well. If `ttl` is not set, the associated resource never + // expires. + google.protobuf.Duration ttl = 1; } // Configuration for a push delivery endpoint. @@ -607,8 +633,8 @@ message UpdateSubscriptionRequest { // Request for the `ListSubscriptions` method. message ListSubscriptionsRequest { - // The name of the cloud project that subscriptions belong to. - // Format is `projects/{project}`. + // The name of the project in which to list subscriptions. + // Format is `projects/{project-id}`. string project = 1; // Maximum number of subscriptions to return. @@ -662,9 +688,7 @@ message PullRequest { // If this field set to true, the system will respond immediately even if // it there are no messages available to return in the `Pull` response. // Otherwise, the system may wait (for a bounded amount of time) until at - // least one message is available, rather than returning no messages. The - // client may cancel the request if it does not wish to wait any longer for - // the response. + // least one message is available, rather than returning no messages. bool return_immediately = 2; // The maximum number of messages returned for this request. The Pub/Sub @@ -674,10 +698,10 @@ message PullRequest { // Response for the `Pull` method. message PullResponse { - // Received Pub/Sub messages. The Pub/Sub system will return zero messages if - // there are no more available in the backlog. The Pub/Sub system may return - // fewer than the `maxMessages` requested even if there are more messages - // available in the backlog. + // Received Pub/Sub messages. The list will be empty if there are no more + // messages available in the backlog. For JSON, the response can be entirely + // empty. The Pub/Sub system may return fewer than the `maxMessages` requested + // even if there are more messages available in the backlog. repeated ReceivedMessage received_messages = 1; } @@ -770,7 +794,8 @@ message CreateSnapshotRequest { // Optional user-provided name for this snapshot. // If the name is not provided in the request, the server will assign a random // name for this snapshot on the same project as the subscription. - // Note that for REST API requests, you must specify a name. + // Note that for REST API requests, you must specify a name. See the + // resource name rules. // Format is `projects/{project}/snapshots/{snap}`. string name = 1; @@ -785,7 +810,7 @@ message CreateSnapshotRequest { // Format is `projects/{project}/subscriptions/{sub}`. string subscription = 2; - // User labels. + // See Creating and managing labels. map labels = 3; } @@ -825,7 +850,7 @@ message Snapshot { // snapshot that would expire in less than 1 hour after creation. google.protobuf.Timestamp expire_time = 3; - // User labels. + // See Creating and managing labels. map labels = 4; } @@ -844,8 +869,8 @@ message GetSnapshotRequest { // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message ListSnapshotsRequest { - // The name of the cloud project that snapshots belong to. - // Format is `projects/{project}`. + // The name of the project in which to list snapshots. + // Format is `projects/{project-id}`. string project = 1; // Maximum number of snapshots to return. @@ -909,6 +934,7 @@ message SeekRequest { } } +// Response for the `Seek` method (this response is empty). message SeekResponse { } diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index ea7ab60fb1a..5ca50f34d4a 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -44,7 +44,7 @@ const MessageStoragePolicy = { * must not start with `"goog"`. * * @property {Object.} labels - * User labels. + * See Creating and managing labels. * * @property {Object} messageStoragePolicy * Policy constraining how messages published to the topic may be stored. It @@ -65,11 +65,14 @@ const Topic = { }; /** - * A message data and its attributes. The message payload must not be empty; - * it must contain either a non-empty data field, or at least one attribute. + * A message that is published by publishers and consumed by subscribers. The + * message must contain either a non-empty data field or at least one attribute. + * See Quotas and limits for more information about + * message limits. * * @property {string} data - * The message payload. + * The message data field. If this field is empty, the message must contain + * at least one attribute. * * @property {Object.} attributes * Optional attributes for this message. @@ -175,8 +178,8 @@ const PublishResponse = { * Request for the `ListTopics` method. * * @property {string} project - * The name of the cloud project that topics belong to. - * Format is `projects/{project}`. + * The name of the project in which to list topics. + * Format is `projects/{project-id}`. * * @property {number} pageSize * Maximum number of topics to return. @@ -388,7 +391,20 @@ const DeleteTopicRequest = { * This object should have the same structure as [Duration]{@link google.protobuf.Duration} * * @property {Object.} labels - * User labels. + * See Creating and managing labels. + * + * @property {Object} expirationPolicy + * A policy that specifies the conditions for this subscription's expiration. + * A subscription is considered active as long as any connected subscriber is + * successfully consuming messages from the subscription or is issuing + * operations on the subscription. If `expiration_policy` is not set, a + * *default policy* with `ttl` of 31 days will be used. The minimum allowed + * value for `expiration_policy.ttl` is 1 day. + * BETA: This feature is part of a beta release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} * * @typedef Subscription * @memberof google.pubsub.v1 @@ -398,6 +414,28 @@ const Subscription = { // This is for documentation. Actual contents will be loaded by gRPC. }; +/** + * A policy that specifies the conditions for resource expiration (i.e., + * automatic resource deletion). + * + * @property {Object} ttl + * Specifies the "time-to-live" duration for an associated resource. The + * resource expires if it is not active for a period of `ttl`. The definition + * of "activity" depends on the type of the associated resource. The minimum + * and maximum allowed values for `ttl` depend on the type of the associated + * resource, as well. If `ttl` is not set, the associated resource never + * expires. + * + * This object should have the same structure as [Duration]{@link google.protobuf.Duration} + * + * @typedef ExpirationPolicy + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.ExpirationPolicy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +const ExpirationPolicy = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + /** * Configuration for a push delivery endpoint. * @@ -496,8 +534,8 @@ const UpdateSubscriptionRequest = { * Request for the `ListSubscriptions` method. * * @property {string} project - * The name of the cloud project that subscriptions belong to. - * Format is `projects/{project}`. + * The name of the project in which to list subscriptions. + * Format is `projects/{project-id}`. * * @property {number} pageSize * Maximum number of subscriptions to return. @@ -587,9 +625,7 @@ const ModifyPushConfigRequest = { * If this field set to true, the system will respond immediately even if * it there are no messages available to return in the `Pull` response. * Otherwise, the system may wait (for a bounded amount of time) until at - * least one message is available, rather than returning no messages. The - * client may cancel the request if it does not wish to wait any longer for - * the response. + * least one message is available, rather than returning no messages. * * @property {number} maxMessages * The maximum number of messages returned for this request. The Pub/Sub @@ -607,10 +643,10 @@ const PullRequest = { * Response for the `Pull` method. * * @property {Object[]} receivedMessages - * Received Pub/Sub messages. The Pub/Sub system will return zero messages if - * there are no more available in the backlog. The Pub/Sub system may return - * fewer than the `maxMessages` requested even if there are more messages - * available in the backlog. + * Received Pub/Sub messages. The list will be empty if there are no more + * messages available in the backlog. For JSON, the response can be entirely + * empty. The Pub/Sub system may return fewer than the `maxMessages` requested + * even if there are more messages available in the backlog. * * This object should have the same structure as [ReceivedMessage]{@link google.pubsub.v1.ReceivedMessage} * @@ -747,7 +783,8 @@ const StreamingPullResponse = { * Optional user-provided name for this snapshot. * If the name is not provided in the request, the server will assign a random * name for this snapshot on the same project as the subscription. - * Note that for REST API requests, you must specify a name. + * Note that for REST API requests, you must specify a name. See the + * resource name rules. * Format is `projects/{project}/snapshots/{snap}`. * * @property {string} subscription @@ -762,7 +799,7 @@ const StreamingPullResponse = { * Format is `projects/{project}/subscriptions/{sub}`. * * @property {Object.} labels - * User labels. + * See Creating and managing labels. * * @typedef CreateSnapshotRequest * @memberof google.pubsub.v1 @@ -824,7 +861,7 @@ const UpdateSnapshotRequest = { * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} * * @property {Object.} labels - * User labels. + * See Creating and managing labels. * * @typedef Snapshot * @memberof google.pubsub.v1 @@ -859,8 +896,8 @@ const GetSnapshotRequest = { * use. It is not subject to any SLA or deprecation policy. * * @property {string} project - * The name of the cloud project that snapshots belong to. - * Format is `projects/{project}`. + * The name of the project in which to list snapshots. + * Format is `projects/{project-id}`. * * @property {number} pageSize * Maximum number of snapshots to return. @@ -957,6 +994,7 @@ const SeekRequest = { }; /** + * Response for the `Seek` method (this response is empty). * @typedef SeekResponse * @memberof google.pubsub.v1 * @see [google.pubsub.v1.SeekResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 0bc17400fe3..345d08cdae8 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -290,7 +290,7 @@ class PublisherClient { * signs (`%`). It must be between 3 and 255 characters in length, and it * must not start with `"goog"`. * @param {Object.} [request.labels] - * User labels. + * See Creating and managing labels. * @param {Object} [request.messageStoragePolicy] * Policy constraining how messages published to the topic may be stored. It * is determined when the topic is created based on the policy configured at @@ -403,8 +403,7 @@ class PublisherClient { /** * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic - * does not exist. The message payload must not be empty; it must contain - * either a non-empty data field, or at least one attribute. + * does not exist. * * @param {Object} request * The request object that will be sent. @@ -516,8 +515,8 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the cloud project that topics belong to. - * Format is `projects/{project}`. + * The name of the project in which to list topics. + * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -621,8 +620,8 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the cloud project that topics belong to. - * Format is `projects/{project}`. + * The name of the project in which to list topics. + * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 285a56ee550..8cf34a1fb1d 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -345,7 +345,19 @@ class SubscriberClient { * * This object should have the same structure as [Duration]{@link google.protobuf.Duration} * @param {Object.} [request.labels] - * User labels. + * See Creating and managing labels. + * @param {Object} [request.expirationPolicy] + * A policy that specifies the conditions for this subscription's expiration. + * A subscription is considered active as long as any connected subscriber is + * successfully consuming messages from the subscription or is issuing + * operations on the subscription. If `expiration_policy` is not set, a + * *default policy* with `ttl` of 31 days will be used. The minimum allowed + * value for `expiration_policy.ttl` is 1 day. + * BETA: This feature is part of a beta release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. + * + * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -509,8 +521,8 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the cloud project that subscriptions belong to. - * Format is `projects/{project}`. + * The name of the project in which to list subscriptions. + * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -614,8 +626,8 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the cloud project that subscriptions belong to. - * Format is `projects/{project}`. + * The name of the project in which to list subscriptions. + * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -811,8 +823,7 @@ class SubscriberClient { } /** - * Pulls messages from the server. Returns an empty list if there are no - * messages available in the backlog. The server may return `UNAVAILABLE` if + * Pulls messages from the server. The server may return `UNAVAILABLE` if * there are too many concurrent pull requests pending for the given * subscription. * @@ -828,9 +839,7 @@ class SubscriberClient { * If this field set to true, the system will respond immediately even if * it there are no messages available to return in the `Pull` response. * Otherwise, the system may wait (for a bounded amount of time) until at - * least one message is available, rather than returning no messages. The - * client may cancel the request if it does not wish to wait any longer for - * the response. + * least one message is available, rather than returning no messages. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -985,8 +994,8 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the cloud project that snapshots belong to. - * Format is `projects/{project}`. + * The name of the project in which to list snapshots. + * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -1090,8 +1099,8 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the cloud project that snapshots belong to. - * Format is `projects/{project}`. + * The name of the project in which to list snapshots. + * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API * response. If page streaming is performed per-resource, this @@ -1134,7 +1143,7 @@ class SubscriberClient { * Creates a snapshot from the requested subscription.

* ALPHA: This feature is part of an alpha release. This API might be * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * use. It is not subject to any SLA or deprecation policy.

* If the snapshot already exists, returns `ALREADY_EXISTS`. * If the requested subscription doesn't exist, returns `NOT_FOUND`. * If the backlog in the subscription is too old -- and the resulting snapshot @@ -1153,7 +1162,8 @@ class SubscriberClient { * Optional user-provided name for this snapshot. * If the name is not provided in the request, the server will assign a random * name for this snapshot on the same project as the subscription. - * Note that for REST API requests, you must specify a name. + * Note that for REST API requests, you must specify a name. See the + * resource name rules. * Format is `projects/{project}/snapshots/{snap}`. * @param {string} request.subscription * The subscription whose backlog the snapshot retains. @@ -1166,7 +1176,7 @@ class SubscriberClient { * successful completion of the CreateSnapshot request. * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object.} [request.labels] - * User labels. + * See Creating and managing labels. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 18dd2f000ab..1cac31d4750 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -80,7 +80,7 @@ }, "Acknowledge": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "idempotent", "retry_params_name": "messaging" }, "Pull": { From fe600e947614b25dfca2f2022d2659da1d859917 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Sat, 20 Oct 2018 12:49:20 -0700 Subject: [PATCH 0233/1115] chore: update new issue template (#293) --- handwritten/pubsub/.github/bug_report.md | 33 +++++++++++++++++++ handwritten/pubsub/.github/feature_request.md | 18 ++++++++++ handwritten/pubsub/.github/support_request.md | 7 ++++ 3 files changed, 58 insertions(+) create mode 100644 handwritten/pubsub/.github/bug_report.md create mode 100644 handwritten/pubsub/.github/feature_request.md create mode 100644 handwritten/pubsub/.github/support_request.md diff --git a/handwritten/pubsub/.github/bug_report.md b/handwritten/pubsub/.github/bug_report.md new file mode 100644 index 00000000000..ae9631e1c1a --- /dev/null +++ b/handwritten/pubsub/.github/bug_report.md @@ -0,0 +1,33 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +Thanks for stopping by to let us know something could be better! + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. + +Please run down the following list and make sure you've tried the usual "quick fixes": + + - Search the issues already opened: https://github.com/googleapis/nodejs-pubsub/issues + - Search the issues on our "catch-all" repository: https://github.com/googleapis/google-cloud-node + - Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js + +If you are still having issues, please be sure to include as much information as possible: + +#### Environment details + + - OS: + - Node.js version: + - npm version: + - `@google-cloud/pubsub` version: + +#### Steps to reproduce + + 1. ? + 2. ? + +Making sure to follow these steps will guarantee the quickest resolution possible. + +Thanks! diff --git a/handwritten/pubsub/.github/feature_request.md b/handwritten/pubsub/.github/feature_request.md new file mode 100644 index 00000000000..6365857f33c --- /dev/null +++ b/handwritten/pubsub/.github/feature_request.md @@ -0,0 +1,18 @@ +--- +name: Feature request +about: Suggest an idea for this library + +--- + +Thanks for stopping by to let us know something could be better! + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. + + **Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + **Describe the solution you'd like** +A clear and concise description of what you want to happen. + **Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + **Additional context** +Add any other context or screenshots about the feature request here. diff --git a/handwritten/pubsub/.github/support_request.md b/handwritten/pubsub/.github/support_request.md new file mode 100644 index 00000000000..99586903212 --- /dev/null +++ b/handwritten/pubsub/.github/support_request.md @@ -0,0 +1,7 @@ +--- +name: Support request +about: If you have a support contract with Google, please create an issue in the Google Cloud Support console. + +--- + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. From 7bff9e5e54ad41784af287f035de708527064407 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 22 Oct 2018 11:27:27 -0700 Subject: [PATCH 0234/1115] chores(build): run codecov on continuous builds (#294) --- handwritten/pubsub/.kokoro/continuous/node8/test.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/handwritten/pubsub/.kokoro/continuous/node8/test.cfg b/handwritten/pubsub/.kokoro/continuous/node8/test.cfg index e69de29bb2d..468b8c7197a 100644 --- a/handwritten/pubsub/.kokoro/continuous/node8/test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node8/test.cfg @@ -0,0 +1,9 @@ +# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} From b720f29a738f13308dbeea597eaae21c67dbf7e7 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 22 Oct 2018 16:43:50 -0700 Subject: [PATCH 0235/1115] chores(build): do not collect sponge.xml from windows builds (#295) --- handwritten/pubsub/.kokoro/presubmit/windows/common.cfg | 7 ------- 1 file changed, 7 deletions(-) diff --git a/handwritten/pubsub/.kokoro/presubmit/windows/common.cfg b/handwritten/pubsub/.kokoro/presubmit/windows/common.cfg index 7320db792a4..d6e25e0b1b8 100644 --- a/handwritten/pubsub/.kokoro/presubmit/windows/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/windows/common.cfg @@ -1,9 +1,2 @@ # Format: //devtools/kokoro/config/proto/build.proto -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - From 0b7616cf43ca0730ef11c9fc03d51c3346f6c7a6 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Tue, 23 Oct 2018 20:05:10 -0700 Subject: [PATCH 0236/1115] build: run tests on node11 (#296) * build: run tests on node11 * build: run tests on node11 * build: run tests on node11 * build: run tests on node11 --- .../.kokoro/continuous/node11/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/continuous/node11/test.cfg | 0 .../.kokoro/presubmit/node11/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/presubmit/node11/test.cfg | 0 4 files changed, 48 insertions(+) create mode 100644 handwritten/pubsub/.kokoro/continuous/node11/common.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node11/test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node11/common.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node11/test.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node11/common.cfg b/handwritten/pubsub/.kokoro/continuous/node11/common.cfg new file mode 100644 index 00000000000..2f471029988 --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node11/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:11-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node11/test.cfg b/handwritten/pubsub/.kokoro/continuous/node11/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/presubmit/node11/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node11/common.cfg new file mode 100644 index 00000000000..2f471029988 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node11/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:11-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node11/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node11/test.cfg new file mode 100644 index 00000000000..e69de29bb2d From a5a7f79e22857c3837af8009da0aecf983695807 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 24 Oct 2018 13:32:18 -0700 Subject: [PATCH 0237/1115] chore: remove old issue template (#297) --- handwritten/pubsub/.github/ISSUE_TEMPLATE.md | 27 -------------------- 1 file changed, 27 deletions(-) delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE.md diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 34839032245..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,27 +0,0 @@ -Thanks for stopping by to let us know something could be better! - -Please run down the following list and make sure you've tried the usual "quick -fixes": - - - Search the issues already opened: https://github.com/googleapis/nodejs-pubsub/issues - - Search the issues on our "catch-all" repository: https://github.com/GoogleCloudPlatform/google-cloud-node - - Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js - -If you are still having issues, please be sure to include as much information as -possible: - -#### Environment details - - - OS: - - Node.js version: - - npm version: - - `@google-cloud/pubsub` version: - -#### Steps to reproduce - - 1. ??? - 2. ??? - -Following these steps will guarantee the quickest resolution possible. - -Thanks! From 8f9e17f43080233790033fedce0b23a49eade241 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 25 Oct 2018 11:34:30 -0700 Subject: [PATCH 0238/1115] chore: update issue templates (#299) --- handwritten/pubsub/.github/{ => ISSUE_TEMPLATE}/bug_report.md | 0 .../pubsub/.github/{ => ISSUE_TEMPLATE}/feature_request.md | 0 .../pubsub/.github/{ => ISSUE_TEMPLATE}/support_request.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename handwritten/pubsub/.github/{ => ISSUE_TEMPLATE}/bug_report.md (100%) rename handwritten/pubsub/.github/{ => ISSUE_TEMPLATE}/feature_request.md (100%) rename handwritten/pubsub/.github/{ => ISSUE_TEMPLATE}/support_request.md (100%) diff --git a/handwritten/pubsub/.github/bug_report.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from handwritten/pubsub/.github/bug_report.md rename to handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/handwritten/pubsub/.github/feature_request.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from handwritten/pubsub/.github/feature_request.md rename to handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/handwritten/pubsub/.github/support_request.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/support_request.md similarity index 100% rename from handwritten/pubsub/.github/support_request.md rename to handwritten/pubsub/.github/ISSUE_TEMPLATE/support_request.md From e7319ed7a1a08d1ebadafe052425503ec308adf1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sun, 28 Oct 2018 08:34:34 -0700 Subject: [PATCH 0239/1115] chore(deps): update dependency eslint-plugin-node to v8 (#300) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6af553a66b5..830e04d5f8e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -99,7 +99,7 @@ "codecov": "^3.0.0", "eslint": "^5.0.0", "eslint-config-prettier": "^3.0.0", - "eslint-plugin-node": "^7.0.0", + "eslint-plugin-node": "^8.0.0", "eslint-plugin-prettier": "^3.0.0", "ink-docstrap": "^1.3.2", "intelli-espower-loader": "^1.0.1", From 95da12ac3a7031dab77344b3abf91f8b5d2128c0 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 30 Oct 2018 10:01:02 -0700 Subject: [PATCH 0240/1115] chore: include build in eslintignore (#304) --- handwritten/pubsub/.eslintignore | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index f6fac98b0a8..f08b0fd1c65 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -1,3 +1,4 @@ node_modules/* samples/node_modules/* src/**/doc/* +build/ From bf66ac38077c66cfe7c901b5ee350ba6163b1621 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 1 Nov 2018 12:03:42 -0700 Subject: [PATCH 0241/1115] chore: update CircleCI config (#309) --- handwritten/pubsub/.circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index da54155fc57..6735ebdaaa1 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -159,7 +159,8 @@ jobs: command: npm run system-test environment: GCLOUD_PROJECT: long-door-651 - GOOGLE_APPLICATION_CREDENTIALS: .circleci/key.json + GOOGLE_APPLICATION_CREDENTIALS: /home/node/project/.circleci/key.json + NPM_CONFIG_PREFIX: /home/node/.npm-global - run: name: Remove unencrypted key. command: | From 1afb1904b8dcfacfc10e904590658bcd88c88e40 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 2 Nov 2018 14:18:43 -0700 Subject: [PATCH 0242/1115] refactor(ts): convert to typescript (#310) --- handwritten/pubsub/.clang-format | 3 + handwritten/pubsub/.jsdoc.js | 2 +- handwritten/pubsub/package.json | 41 ++++++--- ..._smoke_test.js => publisher_smoke_test.ts} | 0 ...{connection-pool.js => connection-pool.ts} | 42 +++++---- .../pubsub/src/{histogram.js => histogram.ts} | 7 +- handwritten/pubsub/src/{iam.js => iam.ts} | 10 ++- handwritten/pubsub/src/{index.js => index.ts} | 30 ++++--- .../pubsub/src/{publisher.js => publisher.ts} | 13 ++- .../pubsub/src/{snapshot.js => snapshot.ts} | 11 ++- .../src/{subscriber.js => subscriber.ts} | 41 ++++++--- .../src/{subscription.js => subscription.ts} | 12 +-- handwritten/pubsub/src/{topic.js => topic.ts} | 23 +++-- handwritten/pubsub/src/{util.js => util.ts} | 8 +- handwritten/pubsub/src/v1/publisher_client.js | 2 +- .../pubsub/src/v1/subscriber_client.js | 2 +- handwritten/pubsub/synth.py | 10 ++- .../system-test/{pubsub.js => pubsub.ts} | 14 +-- ...{connection-pool.js => connection-pool.ts} | 90 ++++++++++--------- .../pubsub/test/{gapic-v1.js => gapic-v1.ts} | 8 +- .../test/{histogram.js => histogram.ts} | 4 +- handwritten/pubsub/test/{iam.js => iam.ts} | 6 +- .../pubsub/test/{index.js => index.ts} | 34 +++---- handwritten/pubsub/test/mocha.opts | 1 + .../test/{publisher.js => publisher.ts} | 14 +-- .../pubsub/test/{snapshot.js => snapshot.ts} | 20 ++--- .../test/{subscriber.js => subscriber.ts} | 23 ++--- .../test/{subscription.js => subscription.ts} | 45 ++++++---- .../pubsub/test/{topic.js => topic.ts} | 30 ++++--- handwritten/pubsub/tsconfig.json | 15 ++++ handwritten/pubsub/tslint.json | 3 + 31 files changed, 339 insertions(+), 225 deletions(-) create mode 100644 handwritten/pubsub/.clang-format rename handwritten/pubsub/smoke-test/{publisher_smoke_test.js => publisher_smoke_test.ts} (100%) rename handwritten/pubsub/src/{connection-pool.js => connection-pool.ts} (95%) rename handwritten/pubsub/src/{histogram.js => histogram.ts} (97%) rename handwritten/pubsub/src/{iam.js => iam.ts} (98%) rename handwritten/pubsub/src/{index.js => index.ts} (97%) rename handwritten/pubsub/src/{publisher.js => publisher.ts} (97%) rename handwritten/pubsub/src/{snapshot.js => snapshot.ts} (97%) rename handwritten/pubsub/src/{subscriber.js => subscriber.ts} (94%) rename handwritten/pubsub/src/{subscription.js => subscription.ts} (99%) rename handwritten/pubsub/src/{topic.js => topic.ts} (97%) rename handwritten/pubsub/src/{util.js => util.ts} (88%) rename handwritten/pubsub/system-test/{pubsub.js => pubsub.ts} (98%) rename handwritten/pubsub/test/{connection-pool.js => connection-pool.ts} (95%) rename handwritten/pubsub/test/{gapic-v1.js => gapic-v1.ts} (99%) rename handwritten/pubsub/test/{histogram.js => histogram.ts} (98%) rename handwritten/pubsub/test/{iam.js => iam.ts} (98%) rename handwritten/pubsub/test/{index.js => index.ts} (97%) rename handwritten/pubsub/test/{publisher.js => publisher.ts} (97%) rename handwritten/pubsub/test/{snapshot.js => snapshot.ts} (93%) rename handwritten/pubsub/test/{subscriber.js => subscriber.ts} (98%) rename handwritten/pubsub/test/{subscription.js => subscription.ts} (95%) rename handwritten/pubsub/test/{topic.js => topic.ts} (95%) create mode 100644 handwritten/pubsub/tsconfig.json create mode 100644 handwritten/pubsub/tslint.json diff --git a/handwritten/pubsub/.clang-format b/handwritten/pubsub/.clang-format new file mode 100644 index 00000000000..7d6cf97e108 --- /dev/null +++ b/handwritten/pubsub/.clang-format @@ -0,0 +1,3 @@ +Language: JavaScript +BasedOnStyle: Google +ColumnLimit: 80 \ No newline at end of file diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index 5f2af4d089b..e09418fc3ed 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -31,7 +31,7 @@ module.exports = { source: { excludePattern: '(^|\\/|\\\\)[._]', include: [ - 'src' + 'build/src' ], includePattern: '\\.js$' }, diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 830e04d5f8e..5ff40ccc147 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -8,10 +8,10 @@ "node": ">=6.0.0" }, "repository": "googleapis/nodejs-pubsub", - "main": "./src/index.js", + "main": "./build/src/index.js", "files": [ "protos", - "src", + "build/src", "AUTHORS", "CONTRIBUTORS", "LICENSE" @@ -62,16 +62,20 @@ "renovate[bot] " ], "scripts": { - "system-test": "mocha system-test/ --timeout 600000", - "cover": "nyc --reporter=lcov mocha test/ && nyc report", + "presystem-test": "npm run compile", + "system-test": "mocha build/system-test --timeout 600000", + "cover": "nyc --reporter=lcov mocha build/test && nyc report", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", - "test-no-cover": "mocha test/*.js", + "test-no-cover": "mocha build/test", "test": "npm run cover", - "lint": "eslint '**/*.js'", - "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js smoke-test/*.js", + "lint": "eslint 'samples/*.js' 'samples/**/*.js'", "docs": "jsdoc -c .jsdoc.js", - "fix": "eslint --fix '**/*.js' && npm run prettier", - "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json" + "fix": "eslint --fix 'samples/*.js' 'samples/**/*.js'", + "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", + "clean": "gts clean", + "compile": "tsc -p . && cp -r src/v1/ build/src/v1/ && cp -r protos build/", + "prepare": "npm run compile", + "pretest": "npm run compile" }, "dependencies": { "@google-cloud/paginator": "^0.1.0", @@ -95,12 +99,21 @@ }, "devDependencies": { "@google-cloud/nodejs-repo-tools": "^2.3.3", + "@types/arrify": "^1.0.4", + "@types/extend": "^3.0.0", + "@types/is": "0.0.20", + "@types/mocha": "^5.2.5", + "@types/proxyquire": "^1.3.28", + "@types/sinon": "^5.0.5", + "@types/through2": "^2.0.34", + "@types/uuid": "^3.4.4", "async": "^2.6.0", "codecov": "^3.0.0", "eslint": "^5.0.0", "eslint-config-prettier": "^3.0.0", "eslint-plugin-node": "^8.0.0", "eslint-plugin-prettier": "^3.0.0", + "gts": "^0.8.0", "ink-docstrap": "^1.3.2", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", @@ -108,6 +121,14 @@ "nyc": "^13.0.0", "power-assert": "^1.4.4", "prettier": "^1.9.1", - "proxyquire": "^2.0.0" + "proxyquire": "^2.0.0", + "sinon": "^7.1.1", + "source-map-support": "^0.5.9", + "typescript": "~3.1.5" + }, + "nyc": { + "exclude": [ + "build/test" + ] } } diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.ts similarity index 100% rename from handwritten/pubsub/smoke-test/publisher_smoke_test.js rename to handwritten/pubsub/smoke-test/publisher_smoke_test.ts diff --git a/handwritten/pubsub/src/connection-pool.js b/handwritten/pubsub/src/connection-pool.ts similarity index 95% rename from handwritten/pubsub/src/connection-pool.js rename to handwritten/pubsub/src/connection-pool.ts index 1ffb85a8fe4..b840ea26dc6 100644 --- a/handwritten/pubsub/src/connection-pool.js +++ b/handwritten/pubsub/src/connection-pool.ts @@ -14,16 +14,14 @@ * limitations under the License. */ -'use strict'; - -const {replaceProjectIdToken} = require('@google-cloud/projectify'); +import {replaceProjectIdToken} from '@google-cloud/projectify'; const duplexify = require('duplexify'); const each = require('async-each'); -const {EventEmitter} = require('events'); -const is = require('is'); -const through = require('through2'); -const uuid = require('uuid'); -const util = require('./util'); +import {EventEmitter} from 'events'; +import * as is from 'is'; +import * as through from 'through2'; +import * as uuid from 'uuid'; +import * as util from './util'; const CHANNEL_READY_EVENT = 'channel.ready'; const CHANNEL_ERROR_EVENT = 'channel.error'; @@ -64,6 +62,18 @@ const RETRY_CODES = [ * creating a connection. */ class ConnectionPool extends EventEmitter { + subscription; + pubsub; + connections; + isPaused; + isOpen; + isGettingChannelState; + failedConnectionAttempts; + noConnectionsTime; + settings; + queue; + keepAliveHandle; + client; constructor(subscription) { super(); this.subscription = subscription; @@ -223,7 +233,7 @@ class ConnectionPool extends EventEmitter { this.queueConnection(); } else if (this.isOpen && !this.connections.size) { const error = new Error(status.details); - error.code = status.code; + (error as any).code = status.code; this.emit('error', error); } }; @@ -272,13 +282,13 @@ class ConnectionPool extends EventEmitter { get length() { return originalDataLength; }, - }; - message.ack = () => { - this.subscription.ack_(message); - }; - message.nack = () => { - this.subscription.nack_(message); - }; + ack: () => { + this.subscription.ack_(message); + }, + nack: () => { + this.subscription.nack_(message); + } + } return message; } /*! diff --git a/handwritten/pubsub/src/histogram.js b/handwritten/pubsub/src/histogram.ts similarity index 97% rename from handwritten/pubsub/src/histogram.js rename to handwritten/pubsub/src/histogram.ts index d386fc35e97..c1c1cfa9503 100644 --- a/handwritten/pubsub/src/histogram.js +++ b/handwritten/pubsub/src/histogram.ts @@ -14,9 +14,7 @@ * limitations under the License. */ -'use strict'; - -const extend = require('extend'); +import * as extend from 'extend'; /*! * The Histogram class is used to capture the lifespan of messages within the @@ -27,6 +25,9 @@ const extend = require('extend'); * @class */ class Histogram { + options; + data; + length; constructor(options) { this.options = extend( { diff --git a/handwritten/pubsub/src/iam.js b/handwritten/pubsub/src/iam.ts similarity index 98% rename from handwritten/pubsub/src/iam.js rename to handwritten/pubsub/src/iam.ts index 502c04dff8d..a8ef8342bc8 100644 --- a/handwritten/pubsub/src/iam.js +++ b/handwritten/pubsub/src/iam.ts @@ -20,9 +20,9 @@ 'use strict'; -const arrify = require('arrify'); -const {promisifyAll} = require('@google-cloud/promisify'); -const is = require('is'); +import * as arrify from 'arrify'; +import {promisifyAll} from '@google-cloud/promisify'; +import * as is from 'is'; /** * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) @@ -63,6 +63,10 @@ const is = require('is'); * // subscription.iam */ class IAM { + Promise; + pubsub; + request; + id; constructor(pubsub, id) { if (pubsub.Promise) { this.Promise = pubsub.Promise; diff --git a/handwritten/pubsub/src/index.js b/handwritten/pubsub/src/index.ts similarity index 97% rename from handwritten/pubsub/src/index.js rename to handwritten/pubsub/src/index.ts index ac360f9cb1a..925c859be51 100644 --- a/handwritten/pubsub/src/index.js +++ b/handwritten/pubsub/src/index.ts @@ -16,16 +16,16 @@ 'use strict'; -const {replaceProjectIdToken} = require('@google-cloud/projectify'); -const {paginator} = require('@google-cloud/paginator'); -const {promisifyAll} = require('@google-cloud/promisify'); -const extend = require('extend'); -const {GoogleAuth} = require('google-auth-library'); +import {replaceProjectIdToken} from '@google-cloud/projectify'; +import {paginator} from '@google-cloud/paginator'; +import {promisifyAll} from '@google-cloud/promisify'; +import * as extend from 'extend'; +import {GoogleAuth} from 'google-auth-library'; const gax = require('google-gax'); const {grpc} = new gax.GrpcClient(); -const is = require('is'); +import * as is from 'is'; -const PKG = require('../package.json'); +const PKG = require('../../package.json'); const v1 = require('./v1'); const Snapshot = require('./snapshot'); @@ -94,6 +94,12 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; * Full quickstart example: */ class PubSub { + options; + isEmulator; + api; + auth; + projectId; + Promise; constructor(options) { options = options || {}; // Determine what scopes are needed. @@ -728,7 +734,7 @@ class PubSub { * // message.publishTime = Timestamp when Pub/Sub received the message. * }); */ - subscription(name, options) { + subscription(name, options?) { if (!name) { throw new Error('A name must be specified for a subscription.'); } @@ -748,7 +754,7 @@ class PubSub { * * const topic = pubsub.topic('my-topic'); */ - topic(name, options) { + topic(name, options?) { if (!name) { throw new Error('A name must be specified for a topic.'); } @@ -786,7 +792,7 @@ class PubSub { * this.end(); * }); */ -PubSub.prototype.getSnapshotsStream = paginator.streamify('getSnapshots'); +(PubSub.prototype as any).getSnapshotsStream = paginator.streamify('getSnapshots'); /** * Get a list of the {@link Subscription} objects registered to all of @@ -819,7 +825,7 @@ PubSub.prototype.getSnapshotsStream = paginator.streamify('getSnapshots'); * this.end(); * }); */ -PubSub.prototype.getSubscriptionsStream = paginator.streamify( +(PubSub.prototype as any).getSubscriptionsStream = paginator.streamify( 'getSubscriptions' ); @@ -854,7 +860,7 @@ PubSub.prototype.getSubscriptionsStream = paginator.streamify( * this.end(); * }); */ -PubSub.prototype.getTopicsStream = paginator.streamify('getTopics'); +(PubSub.prototype as any).getTopicsStream = paginator.streamify('getTopics'); /*! Developer Documentation * diff --git a/handwritten/pubsub/src/publisher.js b/handwritten/pubsub/src/publisher.ts similarity index 97% rename from handwritten/pubsub/src/publisher.js rename to handwritten/pubsub/src/publisher.ts index 1ba9e9fde0e..39c66e40e7e 100644 --- a/handwritten/pubsub/src/publisher.js +++ b/handwritten/pubsub/src/publisher.ts @@ -16,11 +16,11 @@ 'use strict'; -const arrify = require('arrify'); -const {promisifyAll} = require('@google-cloud/promisify'); +import * as arrify from 'arrify'; +import {promisifyAll} from '@google-cloud/promisify'; const each = require('async-each'); -const extend = require('extend'); -const is = require('is'); +import * as extend from 'extend'; +import * as is from 'is'; /** * A Publisher object allows you to publish messages to a specific topic. @@ -49,6 +49,11 @@ const is = require('is'); * const publisher = topic.publisher(); */ class Publisher { + Promise; + topic; + inventory_; + settings; + timeoutHandle_; constructor(topic, options) { if (topic.Promise) { this.Promise = topic.Promise; diff --git a/handwritten/pubsub/src/snapshot.js b/handwritten/pubsub/src/snapshot.ts similarity index 97% rename from handwritten/pubsub/src/snapshot.js rename to handwritten/pubsub/src/snapshot.ts index 64bc4710c39..6b7fc88ff02 100644 --- a/handwritten/pubsub/src/snapshot.js +++ b/handwritten/pubsub/src/snapshot.ts @@ -16,9 +16,9 @@ 'use strict'; -const util = require('./util'); -const {promisifyAll} = require('@google-cloud/promisify'); -const is = require('is'); +import * as util from './util'; +import {promisifyAll} from '@google-cloud/promisify'; +import * as is from 'is'; /** * A Snapshot object will give you access to your Cloud Pub/Sub snapshot. @@ -85,6 +85,11 @@ const is = require('is'); * }); */ class Snapshot { + parent; + name; + Promise; + create; + seek; constructor(parent, name) { if (parent.Promise) { this.Promise = parent.Promise; diff --git a/handwritten/pubsub/src/subscriber.js b/handwritten/pubsub/src/subscriber.ts similarity index 94% rename from handwritten/pubsub/src/subscriber.js rename to handwritten/pubsub/src/subscriber.ts index 7f018fc4203..4ab422d1ab9 100644 --- a/handwritten/pubsub/src/subscriber.js +++ b/handwritten/pubsub/src/subscriber.ts @@ -16,15 +16,15 @@ 'use strict'; -const arrify = require('arrify'); +import * as arrify from 'arrify'; const chunk = require('lodash.chunk'); -const util = require('./util'); -const {promisify, promisifyAll} = require('@google-cloud/promisify'); +import * as util from './util'; +import {promisify, promisifyAll} from '@google-cloud/promisify'; const delay = require('delay'); -const {EventEmitter} = require('events'); -const extend = require('extend'); -const is = require('is'); -const os = require('os'); +import {EventEmitter} from 'events'; +import * as extend from 'extend'; +import * as is from 'is'; +import * as os from 'os'; const ConnectionPool = require('./connection-pool'); const Histogram = require('./histogram'); @@ -45,6 +45,23 @@ const MAX_ACK_IDS_PER_REQUEST = 3000; * @param {object} options Configuration object. */ class Subscriber extends EventEmitter { + histogram; + latency_; + connectionPool; + ackDeadline; + maxConnections; + inventory_; + flowControl; + batching; + flushTimeoutHandle_; + leaseTimeoutHandle_; + userClosed_; + isOpen; + messageListeners; + writeToStreams_; + request; + name; + constructor(options) { super(); options = options || {}; @@ -111,7 +128,7 @@ class Subscriber extends EventEmitter { * @param {string} [connId] Connection ID to send request on. * @return {Promise} */ - acknowledge_(ackIds, connId) { + acknowledge_(ackIds: string|string[], connId?: string): Promise { ackIds = arrify(ackIds); const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(ackIdChunk => { if (this.writeToStreams_ && this.isConnected_()) { @@ -195,7 +212,7 @@ class Subscriber extends EventEmitter { * @param {function} [callback] The callback function. * @param {?error} err An error returned from this request. */ - closeConnection_(callback) { + closeConnection_(callback?) { this.isOpen = false; if (this.connectionPool) { this.connectionPool.close(callback || util.noop); @@ -215,7 +232,7 @@ class Subscriber extends EventEmitter { * * @private */ - flushQueues_() { + flushQueues_(): Promise { if (this.flushTimeoutHandle_) { this.flushTimeoutHandle_.clear(); this.flushTimeoutHandle_ = null; @@ -225,7 +242,7 @@ class Subscriber extends EventEmitter { if (!acks.length && !nacks.length) { return Promise.resolve(); } - const requests = []; + const requests: Promise[] = []; if (acks.length) { requests.push( this.acknowledge_(acks).then(() => { @@ -325,7 +342,7 @@ class Subscriber extends EventEmitter { * @param {string=} connId Connection ID to send request on. * @return {Promise} */ - modifyAckDeadline_(ackIds, deadline, connId) { + modifyAckDeadline_(ackIds: string|string[], deadline: number, connId?: string) { ackIds = arrify(ackIds); const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(ackIdChunk => { if (this.writeToStreams_ && this.isConnected_()) { diff --git a/handwritten/pubsub/src/subscription.js b/handwritten/pubsub/src/subscription.ts similarity index 99% rename from handwritten/pubsub/src/subscription.js rename to handwritten/pubsub/src/subscription.ts index 823933a9743..e2778ae16c8 100644 --- a/handwritten/pubsub/src/subscription.js +++ b/handwritten/pubsub/src/subscription.ts @@ -16,10 +16,10 @@ 'use strict'; -const util = require('./util'); -const {promisifyAll} = require('@google-cloud/promisify'); -const extend = require('extend'); -const is = require('is'); +import * as util from './util'; +import {promisifyAll} from '@google-cloud/promisify'; +import * as extend from 'extend'; +import * as is from 'is'; const snakeCase = require('lodash.snakecase'); const IAM = require('./iam'); @@ -458,7 +458,7 @@ class Subscription extends Subscriber { * const apiResponse = data[0]; * }); */ - getMetadata(gaxOpts, callback) { + getMetadata(gaxOpts, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -589,7 +589,7 @@ class Subscription extends Subscriber { callback = gaxOpts; gaxOpts = {}; } - const reqOpts = { + const reqOpts: any = { subscription: this.name, }; if (is.string(snapshot)) { diff --git a/handwritten/pubsub/src/topic.js b/handwritten/pubsub/src/topic.ts similarity index 97% rename from handwritten/pubsub/src/topic.js rename to handwritten/pubsub/src/topic.ts index 99c7e0803af..81fca0c6182 100644 --- a/handwritten/pubsub/src/topic.js +++ b/handwritten/pubsub/src/topic.ts @@ -16,11 +16,11 @@ 'use strict'; -const util = require('./util'); -const {promisifyAll} = require('@google-cloud/promisify'); -const {paginator} = require('@google-cloud/paginator'); -const extend = require('extend'); -const is = require('is'); +import * as util from './util'; +import {promisifyAll} from '@google-cloud/promisify'; +import {paginator} from '@google-cloud/paginator'; +import * as extend from 'extend'; +import * as is from 'is'; const IAM = require('./iam'); const Publisher = require('./publisher'); @@ -39,6 +39,13 @@ const Publisher = require('./publisher'); * const topic = pubsub.topic('my-topic'); */ class Topic { + Promise; + name; + parent; + pubsub; + request; + iam; + metadata; constructor(pubsub, name) { if (pubsub.Promise) { this.Promise = pubsub.Promise; @@ -354,7 +361,7 @@ class Topic { * const apiResponse = data[0]; * }); */ - getMetadata(gaxOpts, callback) { + getMetadata(gaxOpts, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -520,7 +527,7 @@ class Topic { * // message.publishTime = Timestamp when Pub/Sub received the message. * }); */ - subscription(name, options) { + subscription(name, options?) { options = options || {}; options.topic = this; return this.pubsub.subscription(name, options); @@ -575,7 +582,7 @@ class Topic { * this.end(); * }); */ -Topic.prototype.getSubscriptionsStream = paginator.streamify( +(Topic.prototype as any).getSubscriptionsStream = paginator.streamify( 'getSubscriptions' ); diff --git a/handwritten/pubsub/src/util.js b/handwritten/pubsub/src/util.ts similarity index 88% rename from handwritten/pubsub/src/util.js rename to handwritten/pubsub/src/util.ts index 8607c40fb58..189d0a7a135 100644 --- a/handwritten/pubsub/src/util.js +++ b/handwritten/pubsub/src/util.ts @@ -14,10 +14,4 @@ * limitations under the License. */ -'use strict'; - -const util = { - noop: function() {}, -}; - -module.exports = util; +export function noop() {}; diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 345d08cdae8..174146ae3d7 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -20,7 +20,7 @@ const merge = require('lodash.merge'); const path = require('path'); const protobuf = require('protobufjs'); -const VERSION = require('../../package.json').version; +const VERSION = require('../../../package.json').version; /** * The service that an application uses to manipulate topics, and to send diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 8cf34a1fb1d..010017acd36 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -19,7 +19,7 @@ const gax = require('google-gax'); const merge = require('lodash.merge'); const path = require('path'); -const VERSION = require('../../package.json').version; +const VERSION = require('../../../package.json').version; /** * The service that an application uses to manipulate subscriptions and to diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 18341144830..4a00aefa455 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -18,10 +18,9 @@ library, excludes=['package.json', 'README.md', 'src/index.js']) -templates = common_templates.node_library(package_name="@google-cloud/pubsub") +templates = common_templates.node_library(source_location='build/src') s.copy(templates) - # https://github.com/googleapis/gapic-generator/issues/2127 s.replace("src/v1/subscriber_client.js", " }\n\s*/\*\*\n\s+\* The DNS address for this API service.", @@ -34,7 +33,10 @@ " };\n" "\g<0>") +# Update path discovery due to build/ dir and TypeScript conversion. +s.replace("src/v1/publisher_client.js", "../../package.json", "../../../package.json") +s.replace("src/v1/subscriber_client.js", "../../package.json", "../../../package.json") + # Node.js specific cleanup subprocess.run(['npm', 'install']) -subprocess.run(['npm', 'run', 'prettier']) -subprocess.run(['npm', 'run', 'lint']) +subprocess.run(['npm', 'run', 'fix']) diff --git a/handwritten/pubsub/system-test/pubsub.js b/handwritten/pubsub/system-test/pubsub.ts similarity index 98% rename from handwritten/pubsub/system-test/pubsub.js rename to handwritten/pubsub/system-test/pubsub.ts index cacc2e3f2c0..89439fd9ad6 100644 --- a/handwritten/pubsub/system-test/pubsub.js +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -16,12 +16,12 @@ 'use strict'; -const assert = require('assert'); +import * as assert from 'assert'; const async = require('async'); const Subscription = require('../src/subscription.js'); -const uuid = require('uuid'); +import * as uuid from 'uuid'; -const PubSub = require('../'); +const PubSub = require('../src'); const pubsub = new PubSub(); describe('pubsub', function() { @@ -135,7 +135,7 @@ describe('pubsub', function() { }); it('should list topics in a stream', function(done) { - const topicsEmitted = []; + const topicsEmitted: any[] = []; pubsub .getTopicsStream() @@ -162,7 +162,7 @@ describe('pubsub', function() { }, function(err, topics) { assert.ifError(err); - assert(topics.length, TOPIC_NAMES.length - 1); + assert.strictEqual(topics.length, TOPIC_NAMES.length - 1); done(); } ); @@ -330,7 +330,7 @@ describe('pubsub', function() { }); it('should list all topic subscriptions as a stream', function(done) { - const subscriptionsEmitted = []; + const subscriptionsEmitted: {}[] = []; topic .getSubscriptionsStream() @@ -650,7 +650,7 @@ describe('pubsub', function() { }); it('should get a list of snapshots as a stream', function(done) { - const snapshots = []; + const snapshots: any[] = []; pubsub .getSnapshotsStream() diff --git a/handwritten/pubsub/test/connection-pool.js b/handwritten/pubsub/test/connection-pool.ts similarity index 95% rename from handwritten/pubsub/test/connection-pool.js rename to handwritten/pubsub/test/connection-pool.ts index 4556397f4f6..6d450e8cd2f 100644 --- a/handwritten/pubsub/test/connection-pool.js +++ b/handwritten/pubsub/test/connection-pool.ts @@ -14,21 +14,31 @@ * limitations under the License. */ -'use strict'; - -const assert = require('assert'); -const util = require('../src/util'); +import * as assert from 'assert'; +import * as util from '../src/util'; const duplexify = require('duplexify'); -const {EventEmitter} = require('events'); -const extend = require('extend'); -const proxyquire = require('proxyquire'); -const uuid = require('uuid'); -const pjy = require('@google-cloud/projectify'); +import {EventEmitter} from 'events'; +import * as extend from 'extend'; +import * as proxyquire from 'proxyquire'; +import * as uuid from 'uuid'; +import * as pjy from '@google-cloud/projectify'; +import * as sinon from 'sinon'; + +let noopOverride: Function|null = null; +const fakeUtil = { + noop: (...args) => { + (noopOverride || util.noop).apply(null, args); + } +}; -const fakeUtil = extend({}, util); const fakeUuid = extend({}, uuid); class FakeConnection extends EventEmitter { + isConnected; + isPaused; + ended; + canceled; + written; constructor() { super(); this.isConnected = false; @@ -66,7 +76,7 @@ class FakeConnection extends EventEmitter { } } -let duplexifyOverride = null; +let duplexifyOverride: Function|null = null; function fakeDuplexify() { const args = [].slice.call(arguments); return (duplexifyOverride || duplexify).apply(null, args); @@ -78,22 +88,23 @@ describe('ConnectionPool', function() { let fakeConnection; let fakeChannel; let fakeClient; + let sandbox: sinon.SinonSandbox; const FAKE_PUBSUB_OPTIONS = {}; const PROJECT_ID = 'grapce-spacheship-123'; - const PUBSUB = { + const PUBSUB: any = { auth: { - getAuthClient: fakeUtil.noop, + getAuthClient: util.noop, }, options: FAKE_PUBSUB_OPTIONS, }; const SUB_NAME = 'test-subscription'; - const SUBSCRIPTION = { + const SUBSCRIPTION: any = { name: SUB_NAME, pubsub: PUBSUB, - request: fakeUtil.noop, + request: util.noop, }; let pjyOverride; @@ -113,6 +124,7 @@ describe('ConnectionPool', function() { }); beforeEach(function() { + sandbox = sinon.createSandbox(); fakeConnection = new FakeConnection(); duplexifyOverride = null; @@ -132,8 +144,8 @@ describe('ConnectionPool', function() { waitForReady: function() {}, }; - SUBSCRIPTION.request = fakeUtil.noop; - PUBSUB.auth.getAuthClient = fakeUtil.noop; + SUBSCRIPTION.request = util.noop; + PUBSUB.auth.getAuthClient = util.noop; PUBSUB.getClient_ = function(config, callback) { callback(null, fakeClient); }; @@ -147,15 +159,14 @@ describe('ConnectionPool', function() { if (pool.isOpen) { pool.close(); } + noopOverride = null; + sandbox.restore(); }); describe('initialization', function() { it('should initialize internally used properties', function() { - const open = ConnectionPool.prototype.open; - ConnectionPool.prototype.open = fakeUtil.noop; - + sandbox.stub(ConnectionPool.prototype, 'open').returns(undefined); const pool = new ConnectionPool(SUBSCRIPTION); - assert.strictEqual(pool.subscription, SUBSCRIPTION); assert.strictEqual(pool.pubsub, SUBSCRIPTION.pubsub); assert(pool.connections instanceof Map); @@ -167,8 +178,6 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.settings.maxConnections, 5); assert.strictEqual(pool.settings.ackDeadline, 10000); assert.deepStrictEqual(pool.queue, []); - - ConnectionPool.prototype.open = open; }); it('should respect user specified settings', function() { @@ -275,7 +284,7 @@ describe('ConnectionPool', function() { }); beforeEach(function() { - global.clearTimeout = global.clearInterval = fakeUtil.noop; + global.clearTimeout = global.clearInterval = util.noop; }); afterEach(function() { @@ -394,10 +403,7 @@ describe('ConnectionPool', function() { }); it('should use noop when callback is omitted', function(done) { - fakeUtil.noop = function() { - fakeUtil.noop = function() {}; - done(); - }; + noopOverride = done; pool.close(); }); }); @@ -426,7 +432,7 @@ describe('ConnectionPool', function() { }, }; - fakeClient.waitForReady = fakeUtil.noop; + fakeClient.waitForReady = util.noop; pool.getClient = function(callback) { pool.pubsub = { @@ -565,7 +571,7 @@ describe('ConnectionPool', function() { it('should unpack the recieved messages', function(done) { const fakeDuplex = new FakeConnection(); - const pipedMessages = []; + const pipedMessages: {}[] = []; const fakeResp = { receivedMessages: [{}, {}, {}, {}, null], }; @@ -826,7 +832,7 @@ describe('ConnectionPool', function() { it('should capture the message data', function() { const expectedPublishTime = new Date( - parseInt(PT.seconds, 10) * 1000 + parseInt(PT.nanos, 10) / 1e6 + Math.floor(PT.seconds) * 1000 + Math.floor(PT.nanos) / 1e6 ); assert.strictEqual(message.ackId, RESP.ackId); @@ -871,9 +877,9 @@ describe('ConnectionPool', function() { let fakeChannelState; let dateNow; let fakeTimestamp; - const fakeChannel = {}; + const fakeChannel: any = {}; - const fakeClient = { + const fakeClient: any = { getChannel: function() { return fakeChannel; }, @@ -889,7 +895,7 @@ describe('ConnectionPool', function() { }; fakeChannelState = 0; - fakeClient.waitForReady = fakeUtil.noop; + fakeClient.waitForReady = util.noop; pool.getClient = function(callback) { callback(null, fakeClient); @@ -961,7 +967,7 @@ describe('ConnectionPool', function() { }); pool.getAndEmitChannelState(); - fakeClient.waitForReady = fakeUtil.noop; + fakeClient.waitForReady = util.noop; }); it('should wait for the channel to be ready', function(done) { @@ -1107,7 +1113,7 @@ describe('ConnectionPool', function() { describe('open', function() { beforeEach(function() { - pool.queueConnection = fakeUtil.noop; + pool.queueConnection = util.noop; clearInterval(pool.keepAliveHandle); }); @@ -1188,7 +1194,7 @@ describe('ConnectionPool', function() { pool.subscription = {writeToStreams_: false}; pool.sendKeepAlives = done; - global.setInterval = function(fn, interval) { + (global as any).setInterval = function(fn, interval) { global.setInterval = _setInterval; assert.strictEqual(interval, 30000); @@ -1237,7 +1243,7 @@ describe('ConnectionPool', function() { _open = ConnectionPool.prototype.open; // prevent open from calling queueConnection - ConnectionPool.prototype.open = fakeUtil.noop; + ConnectionPool.prototype.open = util.noop; }); beforeEach(function() { @@ -1245,13 +1251,13 @@ describe('ConnectionPool', function() { return 1; }; - global.setTimeout = function(cb) { + (global as any).setTimeout = function(cb) { cb(); return fakeTimeoutHandle; }; pool.failedConnectionAttempts = 0; - pool.createConnection = fakeUtil.noop; + pool.createConnection = util.noop; }); after(function() { @@ -1263,7 +1269,7 @@ describe('ConnectionPool', function() { it('should set a timeout to create the connection', function(done) { pool.createConnection = done; - global.setTimeout = function(cb, delay) { + (global as any).setTimeout = function(cb, delay) { assert.strictEqual(delay, 0); cb(); // should call the done fn }; @@ -1275,7 +1281,7 @@ describe('ConnectionPool', function() { pool.createConnection = done; pool.failedConnectionAttempts = 3; - global.setTimeout = function(cb, delay) { + (global as any).setTimeout = function(cb, delay) { assert.strictEqual(delay, 9000); cb(); // should call the done fn }; diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.ts similarity index 99% rename from handwritten/pubsub/test/gapic-v1.js rename to handwritten/pubsub/test/gapic-v1.ts index e5a2b357ece..513fd15c412 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.ts @@ -14,14 +14,14 @@ 'use strict'; -const assert = require('assert'); +import * as assert from 'assert'; const through2 = require('through2'); const pubsubModule = require('../src'); const FAKE_STATUS_CODE = 1; const error = new Error(); -error.code = FAKE_STATUS_CODE; +(error as any).code = FAKE_STATUS_CODE; describe('PublisherClient', () => { describe('createTopic', () => { @@ -1872,7 +1872,7 @@ describe('SubscriberClient', () => { }); }); -function mockSimpleGrpcMethod(expectedRequest, response, error) { +function mockSimpleGrpcMethod(expectedRequest, response?, error?) { return function(actualRequest, options, callback) { assert.deepStrictEqual(actualRequest, expectedRequest); if (error) { @@ -1885,7 +1885,7 @@ function mockSimpleGrpcMethod(expectedRequest, response, error) { }; } -function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { +function mockBidiStreamingGrpcMethod(expectedRequest, response, error?) { return () => { const mockStream = through2.obj((chunk, enc, callback) => { assert.deepStrictEqual(chunk, expectedRequest); diff --git a/handwritten/pubsub/test/histogram.js b/handwritten/pubsub/test/histogram.ts similarity index 98% rename from handwritten/pubsub/test/histogram.js rename to handwritten/pubsub/test/histogram.ts index ccac664c799..11e48ba2992 100644 --- a/handwritten/pubsub/test/histogram.js +++ b/handwritten/pubsub/test/histogram.ts @@ -16,7 +16,7 @@ 'use strict'; -const assert = require('assert'); +import * as assert from 'assert'; const Histogram = require('../src/histogram.js'); @@ -105,7 +105,7 @@ describe('Histogram', function() { describe('percentile', function() { function range(a, b) { - const result = []; + const result: number[] = []; for (; a < b; a++) { result.push(a); diff --git a/handwritten/pubsub/test/iam.js b/handwritten/pubsub/test/iam.ts similarity index 98% rename from handwritten/pubsub/test/iam.js rename to handwritten/pubsub/test/iam.ts index 3589e1b9e84..8d69a9aba20 100644 --- a/handwritten/pubsub/test/iam.js +++ b/handwritten/pubsub/test/iam.ts @@ -16,10 +16,10 @@ 'use strict'; -const assert = require('assert'); -const extend = require('extend'); +import * as assert from 'assert'; +import * as extend from 'extend'; const proxyquire = require('proxyquire'); -const util = require('../src/util'); +import * as util from '../src/util'; const promisify = require('@google-cloud/promisify'); let promisified = false; diff --git a/handwritten/pubsub/test/index.js b/handwritten/pubsub/test/index.ts similarity index 97% rename from handwritten/pubsub/test/index.js rename to handwritten/pubsub/test/index.ts index ba1d00f7be8..10da3385f9c 100644 --- a/handwritten/pubsub/test/index.js +++ b/handwritten/pubsub/test/index.ts @@ -16,16 +16,16 @@ 'use strict'; -const arrify = require('arrify'); -const assert = require('assert'); -const extend = require('extend'); -const gax = require('google-gax'); -const proxyquire = require('proxyquire'); -const util = require('../src/util'); -const pjy = require('@google-cloud/projectify'); -const promisify = require('@google-cloud/promisify'); +import * as arrify from 'arrify'; +import * as assert from 'assert'; +import * as extend from 'extend'; +import * as gax from 'google-gax'; +import * as proxyquire from 'proxyquire'; +import * as util from '../src/util'; +import * as pjy from '@google-cloud/projectify'; +import * as promisify from '@google-cloud/promisify'; -const PKG = require('../package.json'); +const PKG = require('../../package.json'); const fakeCreds = {}; const fakeGoogleGax = { @@ -38,12 +38,12 @@ const fakeGoogleGax = { return fakeCreds; }, }, - }; + } as gax.GrpcModule; } }, }; -const SubscriptionCached = require('../src/subscription.js'); +const SubscriptionCached = require('../src/subscription'); let SubscriptionOverride; function Subscription(a, b, c) { @@ -109,7 +109,7 @@ function fakeGoogleAuth() { } const v1Override = {}; -let v1ClientOverrides = {}; +let v1ClientOverrides: any = {}; function defineOverridableClient(clientName) { function DefaultClient() {} @@ -139,7 +139,7 @@ describe('PubSub', function() { before(function() { delete process.env.PUBSUB_EMULATOR_HOST; - PubSub = proxyquire('../', { + PubSub = proxyquire('../src', { '@google-cloud/paginator': { paginator: fakePaginator, }, @@ -297,7 +297,7 @@ describe('PubSub', function() { }; beforeEach(function() { - Subscription.formatMetadata_ = function(metadata) { + (Subscription as any).formatMetadata_ = function(metadata) { return extend({}, metadata); }; }); @@ -458,7 +458,7 @@ describe('PubSub', function() { a: 'a', }; - Subscription.formatMetadata_ = function(metadata) { + (Subscription as any).formatMetadata_ = function(metadata) { assert.strictEqual(metadata, fakeMetadata); return formatted; }; @@ -1028,7 +1028,7 @@ describe('PubSub', function() { it('should call client method with correct options', function(done) { const fakeClient = {}; - fakeClient.fakeMethod = function(reqOpts, gaxOpts) { + (fakeClient as any).fakeMethod = function(reqOpts, gaxOpts) { assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); done(); @@ -1050,7 +1050,7 @@ describe('PubSub', function() { }); describe('getClient_', function() { - const FAKE_CLIENT_INSTANCE = util.noop; + const FAKE_CLIENT_INSTANCE = class {}; const CONFIG = { client: 'FakeClient', }; diff --git a/handwritten/pubsub/test/mocha.opts b/handwritten/pubsub/test/mocha.opts index 8751e7bae37..48bf1c3df18 100644 --- a/handwritten/pubsub/test/mocha.opts +++ b/handwritten/pubsub/test/mocha.opts @@ -1,3 +1,4 @@ +--require source-map-support/register --require intelli-espower-loader --timeout 10000 --throw-deprecation diff --git a/handwritten/pubsub/test/publisher.js b/handwritten/pubsub/test/publisher.ts similarity index 97% rename from handwritten/pubsub/test/publisher.js rename to handwritten/pubsub/test/publisher.ts index a63e4e50c76..16d0e8b60eb 100644 --- a/handwritten/pubsub/test/publisher.js +++ b/handwritten/pubsub/test/publisher.ts @@ -16,10 +16,10 @@ 'use strict'; -const assert = require('assert'); -const util = require('../src/util'); +import * as assert from 'assert'; +import * as util from '../src/util'; const pfy = require('@google-cloud/promisify'); -const extend = require('extend'); +import * as extend from 'extend'; const proxyquire = require('proxyquire'); let promisified = false; @@ -38,7 +38,7 @@ describe('Publisher', function() { let batchOpts; const TOPIC_NAME = 'test-topic'; - const TOPIC = { + const TOPIC: any = { name: TOPIC_NAME, Promise: {}, request: util.noop, @@ -143,7 +143,7 @@ describe('Publisher', function() { beforeEach(function() { publisher.publish_ = util.noop; - global.setTimeout = util.noop; + (global as any).setTimeout = util.noop; }); after(function() { @@ -211,7 +211,7 @@ All attributes must be in the form of a string. }); it('should not attempt to publish empty payload if data puts payload above size cap', function(done) { - const pushRequests = []; + const pushRequests: {}[] = []; publisher.settings.batching.maxBytes = 2; publisher.inventory_.bytes = 0; @@ -266,7 +266,7 @@ All attributes must be in the form of a string. const globalSetTimeout = global.setTimeout; const fakeTimeoutHandle = 12345; - global.setTimeout = function(callback, duration) { + (global as any).setTimeout = function(callback, duration) { assert.strictEqual(duration, batchOpts.maxMilliseconds); global.setTimeout = globalSetTimeout; setImmediate(callback); diff --git a/handwritten/pubsub/test/snapshot.js b/handwritten/pubsub/test/snapshot.ts similarity index 93% rename from handwritten/pubsub/test/snapshot.js rename to handwritten/pubsub/test/snapshot.ts index ecdd45c67a9..50ad5064dde 100644 --- a/handwritten/pubsub/test/snapshot.js +++ b/handwritten/pubsub/test/snapshot.ts @@ -16,11 +16,12 @@ 'use strict'; -const assert = require('assert'); -const util = require('../src/util'); -const extend = require('extend'); -const proxyquire = require('proxyquire'); -const pfy = require('@google-cloud/promisify'); +import * as assert from 'assert'; +import * as util from '../src/util'; +import * as extend from 'extend'; +import * as proxyquire from 'proxyquire'; +import * as pfy from '@google-cloud/promisify'; +import * as sinon from 'sinon'; let promisified = false; const fakePromisify = extend({}, pfy, { @@ -42,7 +43,7 @@ describe('Snapshot', function() { projectId: PROJECT_ID, }; - const SUBSCRIPTION = { + const SUBSCRIPTION: any = { Promise: {}, projectId: PROJECT_ID, pubsub: PUBSUB, @@ -57,10 +58,11 @@ describe('Snapshot', function() { }); }); + const sandbox = sinon.createSandbox(); beforeEach(function() { - util.noop = function() {}; snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); }); + afterEach(() => sandbox.restore()); describe('initialization', function() { const FULL_SNAPSHOT_NAME = 'a/b/c/d'; @@ -179,12 +181,10 @@ describe('Snapshot', function() { }); it('should optionally accept a callback', function(done) { - util.noop = done; - + sandbox.stub(util, 'noop').callsFake(done); snapshot.parent.request = function(config, callback) { callback(); // the done fn }; - snapshot.delete(); }); }); diff --git a/handwritten/pubsub/test/subscriber.js b/handwritten/pubsub/test/subscriber.ts similarity index 98% rename from handwritten/pubsub/test/subscriber.js rename to handwritten/pubsub/test/subscriber.ts index edb8def8ec2..03be3fdde09 100644 --- a/handwritten/pubsub/test/subscriber.js +++ b/handwritten/pubsub/test/subscriber.ts @@ -16,13 +16,13 @@ 'use strict'; -const assert = require('assert'); +import * as assert from 'assert'; const delay = require('delay'); -const {EventEmitter} = require('events'); -const extend = require('extend'); -const is = require('is'); +import {EventEmitter} from 'events'; +import * as extend from 'extend'; +import * as is from 'is'; const proxyquire = require('proxyquire'); -const util = require('../src/util'); +import * as util from '../src/util'; const pfy = require('@google-cloud/promisify'); const fakeUtil = extend({}, util); @@ -33,8 +33,8 @@ function fakePromisify() { } let promisified = false; -function fakePromisifyAll(Class) { - if (Class.name === 'Subscriber') { +function fakePromisifyAll(klass) { + if (klass.name === 'Subscriber') { promisified = true; } } @@ -47,6 +47,7 @@ const fakeOs = { }; class FakeConnectionPool extends EventEmitter { + calledWith_: IArguments; constructor() { super(); this.calledWith_ = [].slice.call(arguments); @@ -57,7 +58,7 @@ function FakeHistogram() { this.calledWith_ = [].slice.call(arguments); } -let delayOverride = null; +let delayOverride: any = null; function fakeDelay(timeout) { return (delayOverride || delay)(timeout); @@ -1337,7 +1338,7 @@ describe('Subscriber', function() { return fakeRandom; }; - global.setTimeout = function(callback, duration) { + (global as any).setTimeout = function(callback, duration) { assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9); setImmediate(callback); // the done fn return fakeTimeoutHandle; @@ -1362,7 +1363,7 @@ describe('Subscriber', function() { return fakeRandom; }; - global.setTimeout = function(callback, duration) { + (global as any).setTimeout = function(callback, duration) { assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9 - latency); done(); }; @@ -1407,7 +1408,7 @@ describe('Subscriber', function() { describe('writeTo_', function() { const CONNECTION_ID = 'abc'; - const CONNECTION = {}; + const CONNECTION: any = {}; beforeEach(function() { subscriber.connectionPool = { diff --git a/handwritten/pubsub/test/subscription.js b/handwritten/pubsub/test/subscription.ts similarity index 95% rename from handwritten/pubsub/test/subscription.js rename to handwritten/pubsub/test/subscription.ts index a1b7e66ee86..37b5d082cb0 100644 --- a/handwritten/pubsub/test/subscription.js +++ b/handwritten/pubsub/test/subscription.ts @@ -16,19 +16,19 @@ 'use strict'; -const assert = require('assert'); -const util = require('../src/util'); -const extend = require('extend'); -const proxyquire = require('proxyquire'); -const pfy = require('@google-cloud/promisify'); +import * as assert from 'assert'; +import * as util from '../src/util'; +import * as extend from 'extend'; +import * as proxyquire from 'proxyquire'; +import * as pfy from '@google-cloud/promisify'; +import * as sinon from 'sinon'; let promisified = false; const fakePromisify = extend({}, pfy, { - promisifyAll: function(Class, options) { - if (Class.name !== 'Subscription') { + promisifyAll: (klass, options) => { + if (klass.name !== 'Subscription') { return; } - promisified = true; assert.deepStrictEqual(options.exclude, ['snapshot']); }, @@ -38,8 +38,12 @@ function FakeIAM() { this.calledWith_ = [].slice.call(arguments); } -function FakeSnapshot() { - this.calledWith_ = [].slice.call(arguments); +class FakeSnapshot { + calledWith_: IArguments; + static formatName_?: Function; + constructor() { + this.calledWith_ = [].slice.call(arguments); + } } function FakeSubscriber() { @@ -47,14 +51,17 @@ function FakeSubscriber() { } describe('Subscription', function() { - let Subscription; - let subscription; + // tslint:disable-next-line no-any variable-name + let Subscription: any; + // tslint:disable-next-line no-any + let subscription: any; const PROJECT_ID = 'test-project'; const SUB_NAME = 'test-subscription'; const SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; - const PUBSUB = { + // tslint:disable-next-line no-any + const PUBSUB: any = { projectId: PROJECT_ID, Promise: {}, request: util.noop, @@ -69,11 +76,14 @@ describe('Subscription', function() { }); }); + const sandbox = sinon.createSandbox(); beforeEach(function() { - PUBSUB.request = util.noop = function() {}; + PUBSUB.request = util.noop; subscription = new Subscription(PUBSUB, SUB_NAME); }); + afterEach(() => sandbox.restore()); + describe('initialization', function() { it('should promisify all the things', function() { assert(promisified); @@ -147,7 +157,7 @@ describe('Subscription', function() { const subscription = new Subscription(PUBSUB, SUB_NAME, options); assert(subscription instanceof FakeSubscriber); - assert(subscription.calledWith_[0], options); + assert.strictEqual(subscription.calledWith_[0], options); }); }); @@ -324,12 +334,11 @@ describe('Subscription', function() { }); it('should optionally accept a callback', function(done) { - util.noop = function(err, resp) { + sandbox.stub(util, 'noop').callsFake((err, resp) => { assert.ifError(err); assert.strictEqual(resp, apiResponse); done(); - }; - + }); subscription.delete(); }); diff --git a/handwritten/pubsub/test/topic.js b/handwritten/pubsub/test/topic.ts similarity index 95% rename from handwritten/pubsub/test/topic.js rename to handwritten/pubsub/test/topic.ts index f523e8214fd..652d0622456 100644 --- a/handwritten/pubsub/test/topic.js +++ b/handwritten/pubsub/test/topic.ts @@ -16,16 +16,17 @@ 'use strict'; -const assert = require('assert'); -const extend = require('extend'); -const proxyquire = require('proxyquire'); -const util = require('../src/util'); -const pfy = require('@google-cloud/promisify'); +import * as assert from 'assert'; +import * as extend from 'extend'; +import * as proxyquire from 'proxyquire'; +import * as util from '../src/util'; +import * as pfy from '@google-cloud/promisify'; +import * as sinon from 'sinon'; let promisified = false; const fakePromisify = extend({}, pfy, { - promisifyAll: function(Class, options) { - if (Class.name !== 'Topic') { + promisifyAll: (klass, options) => { + if (klass.name !== 'Topic') { return; } promisified = true; @@ -57,14 +58,17 @@ const fakePaginator = { }; describe('Topic', function() { - let Topic; - let topic; + // tslint:disable-next-line no-any variable-name + let Topic: any; + // tslint:disable-next-line no-any + let topic: any; const PROJECT_ID = 'test-project'; const TOPIC_NAME = 'projects/' + PROJECT_ID + '/topics/test-topic'; const TOPIC_UNFORMATTED_NAME = TOPIC_NAME.split('/').pop(); - const PUBSUB = { + // tslint:disable-next-line no-any + const PUBSUB: any = { Promise: {}, projectId: PROJECT_ID, createTopic: util.noop, @@ -82,10 +86,12 @@ describe('Topic', function() { }); }); + const sandbox = sinon.createSandbox(); beforeEach(function() { topic = new Topic(PUBSUB, TOPIC_NAME); topic.parent = PUBSUB; }); + afterEach(() => sandbox.restore()); describe('initialization', function() { it('should extend the correct methods', function() { @@ -209,12 +215,10 @@ describe('Topic', function() { }); it('should optionally accept a callback', function(done) { - util.noop = done; - + sandbox.stub(util, 'noop').callsFake(done); topic.request = function(config, callback) { callback(); // the done fn }; - topic.delete(); }); }); diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json new file mode 100644 index 00000000000..2f66e4d8624 --- /dev/null +++ b/handwritten/pubsub/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "./node_modules/gts/tsconfig-google.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "noImplicitAny": false, + "noImplicitThis": false + }, + "include": [ + "src/*.ts", + "test/*.ts", + "system-test/*.ts", + "smoke-test/*.ts" + ] +} diff --git a/handwritten/pubsub/tslint.json b/handwritten/pubsub/tslint.json new file mode 100644 index 00000000000..617dc975bae --- /dev/null +++ b/handwritten/pubsub/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "gts/tslint.json" +} From 90e6be40e91642b36ad20a38b67120b1017870d5 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 5 Nov 2018 14:12:30 -0800 Subject: [PATCH 0243/1115] refactor(ts): enable noImplicitThis (#316) --- handwritten/pubsub/README.md | 2 +- handwritten/pubsub/package.json | 1 + .../pubsub/smoke-test/publisher_smoke_test.ts | 2 - handwritten/pubsub/src/connection-pool.ts | 4 +- handwritten/pubsub/src/histogram.ts | 6 +- handwritten/pubsub/src/iam.ts | 20 +++--- handwritten/pubsub/src/index.ts | 72 +++++++++---------- handwritten/pubsub/src/publisher.ts | 15 ++-- handwritten/pubsub/src/snapshot.ts | 7 +- handwritten/pubsub/src/subscriber.ts | 30 ++++---- handwritten/pubsub/src/subscription.ts | 39 +++++----- handwritten/pubsub/src/topic.ts | 62 ++++++++-------- handwritten/pubsub/system-test/pubsub.ts | 15 ++-- handwritten/pubsub/test/connection-pool.ts | 39 +++++----- handwritten/pubsub/test/gapic-v1.ts | 4 +- handwritten/pubsub/test/histogram.ts | 5 +- handwritten/pubsub/test/iam.ts | 8 +-- handwritten/pubsub/test/index.ts | 30 ++++---- handwritten/pubsub/test/publisher.ts | 8 +-- handwritten/pubsub/test/snapshot.ts | 4 +- handwritten/pubsub/test/subscriber.ts | 19 ++--- handwritten/pubsub/test/subscription.ts | 24 ++++--- handwritten/pubsub/test/topic.ts | 24 ++++--- handwritten/pubsub/tsconfig.json | 3 +- 24 files changed, 214 insertions(+), 229 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 676d57f5935..1435b3bd712 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -37,7 +37,7 @@ ```javascript // Imports the Google Cloud client library -const PubSub = require('@google-cloud/pubsub'); +const {PubSub} = require('@google-cloud/pubsub'); // Your Google Cloud Platform project ID const projectId = 'YOUR_PROJECT_ID'; diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5ff40ccc147..cc975e58c0c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -100,6 +100,7 @@ "devDependencies": { "@google-cloud/nodejs-repo-tools": "^2.3.3", "@types/arrify": "^1.0.4", + "@types/async": "^2.0.50", "@types/extend": "^3.0.0", "@types/is": "0.0.20", "@types/mocha": "^5.2.5", diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.ts b/handwritten/pubsub/smoke-test/publisher_smoke_test.ts index cae73093ef4..be3df5a3c6a 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.ts +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.ts @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -'use strict'; - describe('PublisherSmokeTest', () => { if (!process.env.GCLOUD_PROJECT) { throw new Error('Usage: GCLOUD_PROJECT= node #{$0}'); diff --git a/handwritten/pubsub/src/connection-pool.ts b/handwritten/pubsub/src/connection-pool.ts index b840ea26dc6..471d96d726d 100644 --- a/handwritten/pubsub/src/connection-pool.ts +++ b/handwritten/pubsub/src/connection-pool.ts @@ -61,7 +61,7 @@ const RETRY_CODES = [ * @param {number} [options.ackDeadline] The ack deadline to send when * creating a connection. */ -class ConnectionPool extends EventEmitter { +export class ConnectionPool extends EventEmitter { subscription; pubsub; connections; @@ -458,5 +458,3 @@ class ConnectionPool extends EventEmitter { return true; } } - -module.exports = ConnectionPool; diff --git a/handwritten/pubsub/src/histogram.ts b/handwritten/pubsub/src/histogram.ts index c1c1cfa9503..6a058a25a76 100644 --- a/handwritten/pubsub/src/histogram.ts +++ b/handwritten/pubsub/src/histogram.ts @@ -24,11 +24,11 @@ import * as extend from 'extend'; * @private * @class */ -class Histogram { +export class Histogram { options; data; length; - constructor(options) { + constructor(options?) { this.options = extend( { min: 10000, @@ -78,5 +78,3 @@ class Histogram { return this.options.min; } } - -module.exports = Histogram; diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index a8ef8342bc8..2c74842b063 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -18,8 +18,6 @@ * @module pubsub/iam */ -'use strict'; - import * as arrify from 'arrify'; import {promisifyAll} from '@google-cloud/promisify'; import * as is from 'is'; @@ -53,7 +51,7 @@ import * as is from 'is'; * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -62,7 +60,7 @@ import * as is from 'is'; * const subscription = pubsub.subscription('my-subscription'); * // subscription.iam */ -class IAM { +export class IAM { Promise; pubsub; request; @@ -98,7 +96,7 @@ class IAM { * @see [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -116,7 +114,7 @@ class IAM { * const apiResponse = data[1]; * }); */ - getPolicy(gaxOpts, callback) { + getPolicy(gaxOpts, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = null; @@ -164,7 +162,7 @@ class IAM { * @see [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -191,7 +189,7 @@ class IAM { * const apiResponse = data[1]; * }); */ - setPolicy(policy, gaxOpts, callback) { + setPolicy(policy, gaxOpts, callback?) { if (!is.object(policy)) { throw new Error('A policy object is required.'); } @@ -242,7 +240,7 @@ class IAM { * @see [Permissions Reference]{@link https://cloud.google.com/pubsub/access_control#permissions} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -284,7 +282,7 @@ class IAM { * const apiResponse = data[1]; * }); */ - testPermissions(permissions, gaxOpts, callback) { + testPermissions(permissions, gaxOpts, callback?) { if (!is.array(permissions) && !is.string(permissions)) { throw new Error('Permissions are required.'); } @@ -325,5 +323,3 @@ class IAM { * that a callback is omitted. */ promisifyAll(IAM); - -module.exports = IAM; diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 925c859be51..579f3f6ce38 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -'use strict'; - import {replaceProjectIdToken} from '@google-cloud/projectify'; import {paginator} from '@google-cloud/paginator'; import {promisifyAll} from '@google-cloud/promisify'; @@ -28,9 +26,10 @@ import * as is from 'is'; const PKG = require('../../package.json'); const v1 = require('./v1'); -const Snapshot = require('./snapshot'); -const Subscription = require('./subscription'); -const Topic = require('./topic'); +import {Snapshot} from './snapshot'; +import {Subscription} from './subscription'; +import {Topic} from './topic'; +import { Readable } from 'stream'; /** * @type {string} - Project ID placeholder. @@ -78,7 +77,7 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; * @param {ClientConfig} [options] Configuration options. * * @example Import the client library - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * * @example Create a client that uses Application Default Credentials (ADC): * const pubsub = new PubSub(); @@ -93,14 +92,16 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; * region_tag:pubsub_quickstart_create_topic * Full quickstart example: */ -class PubSub { +export class PubSub { options; - isEmulator; + isEmulator: boolean; api; - auth; - projectId; - Promise; - constructor(options) { + auth: GoogleAuth; + projectId: string; + Promise?: PromiseConstructor; + getSubscriptionsStream = paginator.streamify('getSubscriptions') as () => Readable; + getSnapshotsStream = paginator.streamify('getSnapshots') as () => Readable; + constructor(options?) { options = options || {}; // Determine what scopes are needed. // It is the union of the scopes on both clients. @@ -189,7 +190,7 @@ class PubSub { * @returns {Promise} * * @example Subscribe to a topic. - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = 'messageCenter'; @@ -268,7 +269,7 @@ class PubSub { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * pubsub.createTopic('my-new-topic', function(err, topic, apiResponse) { @@ -285,7 +286,7 @@ class PubSub { * const apiResponse = data[1]; * }); */ - createTopic(name, gaxOpts, callback) { + createTopic(name, gaxOpts, callback?) { const topic = this.topic(name); const reqOpts = { name: topic.name, @@ -366,7 +367,7 @@ class PubSub { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * pubsub.getSnapshots(function(err, snapshots) { @@ -382,7 +383,7 @@ class PubSub { * const snapshots = data[0]; * }); */ - getSnapshots(options, callback) { + getSnapshots(options?, callback?) { const self = this; if (is.fn(options)) { callback = options; @@ -463,7 +464,7 @@ class PubSub { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * pubsub.getSubscriptions(function(err, subscriptions) { @@ -479,7 +480,7 @@ class PubSub { * const subscriptions = data[0]; * }); */ - getSubscriptions(options, callback) { + getSubscriptions(options, callback?) { const self = this; if (is.fn(options)) { callback = options; @@ -555,7 +556,7 @@ class PubSub { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * pubsub.getTopics(function(err, topics) { @@ -578,7 +579,7 @@ class PubSub { * const topics = data[0]; * }); */ - getTopics(options, callback) { + getTopics(options, callback?) { const self = this; if (is.fn(options)) { callback = options; @@ -639,7 +640,7 @@ class PubSub { callback(err); return; } - self.projectId = projectId; + self.projectId = projectId!; self.getClient_(config, callback); }); return; @@ -685,7 +686,7 @@ class PubSub { * @returns {Snapshot} A {@link Snapshot} instance. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const snapshot = pubsub.snapshot('my-snapshot'); @@ -719,7 +720,7 @@ class PubSub { * @returns {Subscription} A {@link Subscription} instance. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const subscription = pubsub.subscription('my-subscription'); @@ -734,7 +735,7 @@ class PubSub { * // message.publishTime = Timestamp when Pub/Sub received the message. * }); */ - subscription(name, options?) { + subscription(name: string, options?) { if (!name) { throw new Error('A name must be specified for a subscription.'); } @@ -749,16 +750,16 @@ class PubSub { * @returns {Topic} A {@link Topic} instance. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); */ - topic(name, options?) { + topic(name: string) { if (!name) { throw new Error('A name must be specified for a topic.'); } - return new Topic(this, name, options); + return new Topic(this, name); } } @@ -771,7 +772,7 @@ class PubSub { * @returns {ReadableStream} A readable stream of {@link Snapshot} instances. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * pubsub.getSnapshotsStream() @@ -792,7 +793,6 @@ class PubSub { * this.end(); * }); */ -(PubSub.prototype as any).getSnapshotsStream = paginator.streamify('getSnapshots'); /** * Get a list of the {@link Subscription} objects registered to all of @@ -804,7 +804,7 @@ class PubSub { * @returns {ReadableStream} A readable stream of {@link Subscription} instances. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * pubsub.getSubscriptionsStream() @@ -825,9 +825,6 @@ class PubSub { * this.end(); * }); */ -(PubSub.prototype as any).getSubscriptionsStream = paginator.streamify( - 'getSubscriptions' -); /** * Get a list of the {module:pubsub/topic} objects registered to your project as @@ -839,7 +836,7 @@ class PubSub { * @returns {ReadableStream} A readable stream of {@link Topic} instances. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * pubsub.getTopicsStream() @@ -877,6 +874,8 @@ promisifyAll(PubSub, { exclude: ['request', 'snapshot', 'subscription', 'topic'], }); +export {Subscription, Topic}; + /** * The default export of the `@google-cloud/pubsub` package is the * {@link PubSub} class. @@ -891,7 +890,7 @@ promisifyAll(PubSub, { * npm install --save @google-cloud/pubsub * * @example Import the client library - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * * @example Create a client that uses Application Default Credentials (ADC): * const pubsub = new PubSub(); @@ -906,7 +905,6 @@ promisifyAll(PubSub, { * region_tag:pubsub_quickstart_create_topic * Full quickstart example: */ -module.exports = PubSub; /** * @name PubSub.v1 diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 39c66e40e7e..abc62ca2ba2 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -14,13 +14,12 @@ * limitations under the License. */ -'use strict'; - import * as arrify from 'arrify'; import {promisifyAll} from '@google-cloud/promisify'; const each = require('async-each'); import * as extend from 'extend'; import * as is from 'is'; +import { Topic } from './topic'; /** * A Publisher object allows you to publish messages to a specific topic. @@ -42,19 +41,19 @@ import * as is from 'is'; * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); * const publisher = topic.publisher(); */ -class Publisher { +export class Publisher { Promise; topic; inventory_; settings; timeoutHandle_; - constructor(topic, options) { + constructor(topic: Topic, options) { if (topic.Promise) { this.Promise = topic.Promise; } @@ -118,7 +117,7 @@ class Publisher { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -149,7 +148,7 @@ class Publisher { * //- * publisher.publish(data).then((messageId) => {}); */ - publish(data, attributes, callback) { + publish(data, attributes, callback?) { if (!(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); } @@ -252,5 +251,3 @@ class Publisher { promisifyAll(Publisher, { singular: true, }); - -module.exports = Publisher; diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 6b7fc88ff02..5e46116c2f7 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -'use strict'; - import * as util from './util'; import {promisifyAll} from '@google-cloud/promisify'; import * as is from 'is'; @@ -84,12 +82,13 @@ import * as is from 'is'; * } * }); */ -class Snapshot { +export class Snapshot { parent; name; Promise; create; seek; + metadata; constructor(parent, name) { if (parent.Promise) { this.Promise = parent.Promise; @@ -213,5 +212,3 @@ class Snapshot { * that a callback is omitted. */ promisifyAll(Snapshot); - -module.exports = Snapshot; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 4ab422d1ab9..43d9862983f 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -'use strict'; - import * as arrify from 'arrify'; const chunk = require('lodash.chunk'); import * as util from './util'; @@ -26,8 +24,8 @@ import * as extend from 'extend'; import * as is from 'is'; import * as os from 'os'; -const ConnectionPool = require('./connection-pool'); -const Histogram = require('./histogram'); +import {ConnectionPool} from './connection-pool'; +import {Histogram} from './histogram'; /** * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline @@ -44,23 +42,23 @@ const MAX_ACK_IDS_PER_REQUEST = 3000; * * @param {object} options Configuration object. */ -class Subscriber extends EventEmitter { - histogram; - latency_; - connectionPool; - ackDeadline; - maxConnections; +export class Subscriber extends EventEmitter { + histogram: Histogram; + latency_: Histogram; + connectionPool: ConnectionPool|null; + ackDeadline: number; + maxConnections: number; inventory_; flowControl; batching; flushTimeoutHandle_; leaseTimeoutHandle_; - userClosed_; - isOpen; + userClosed_: boolean; + isOpen: boolean; messageListeners; writeToStreams_; request; - name; + name?: string; constructor(options) { super(); @@ -194,7 +192,7 @@ class Subscriber extends EventEmitter { * //- * Subscriber.close().then(() => {}); */ - close(callback) { + close(callback?) { this.userClosed_ = true; const inventory = this.inventory_; inventory.lease.length = inventory.bytes = 0; @@ -472,7 +470,7 @@ class Subscriber extends EventEmitter { writeTo_(connId, data) { const startTime = Date.now(); return new Promise((resolve, reject) => { - this.connectionPool.acquire(connId, (err, connection) => { + this.connectionPool!.acquire(connId, (err, connection) => { if (err) { reject(err); return; @@ -496,5 +494,3 @@ class Subscriber extends EventEmitter { * that a callback is omitted. */ promisifyAll(Subscriber); - -module.exports = Subscriber; diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index e2778ae16c8..8fb23eace11 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -14,17 +14,16 @@ * limitations under the License. */ -'use strict'; - import * as util from './util'; import {promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import * as is from 'is'; const snakeCase = require('lodash.snakecase'); -const IAM = require('./iam'); -const Snapshot = require('./snapshot'); -const Subscriber = require('./subscriber'); +import {IAM} from './iam'; +import {Snapshot} from './snapshot'; +import {Subscriber} from './subscriber'; +import { PubSub } from '.'; /** * A Subscription object will give you access to your Cloud Pub/Sub @@ -77,7 +76,7 @@ const Subscriber = require('./subscriber'); * connections to be used when sending and receiving messages. Default: 5. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * //- @@ -140,7 +139,13 @@ const Subscriber = require('./subscriber'); * // Remove the listener from receiving `message` events. * subscription.removeListener('message', onMessage); */ -class Subscription extends Subscriber { +export class Subscription extends Subscriber { + Promise?: PromiseConstructor; + pubsub: PubSub; + projectId: string; + create!: Function; + iam: IAM; + metadata; constructor(pubsub, name, options) { options = options || {}; super(options); @@ -212,7 +217,7 @@ class Subscription extends Subscriber { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -278,7 +283,7 @@ class Subscription extends Subscriber { * @param {object} callback.apiResponse Raw API response. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -293,7 +298,7 @@ class Subscription extends Subscriber { * const apiResponse = data[0]; * }); */ - delete(gaxOpts, callback) { + delete(gaxOpts, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -334,7 +339,7 @@ class Subscription extends Subscriber { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -384,7 +389,7 @@ class Subscription extends Subscriber { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -439,7 +444,7 @@ class Subscription extends Subscriber { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -458,7 +463,7 @@ class Subscription extends Subscriber { * const apiResponse = data[0]; * }); */ - getMetadata(gaxOpts, callback?) { + getMetadata(gaxOpts?, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -503,7 +508,7 @@ class Subscription extends Subscriber { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -645,7 +650,7 @@ class Subscription extends Subscriber { * const apiResponse = data[0]; * }); */ - setMetadata(metadata, gaxOpts, callback) { + setMetadata(metadata, gaxOpts?, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -729,5 +734,3 @@ class Subscription extends Subscriber { promisifyAll(Subscription, { exclude: ['snapshot'], }); - -module.exports = Subscription; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 81fca0c6182..973022190b8 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -14,16 +14,16 @@ * limitations under the License. */ -'use strict'; - import * as util from './util'; import {promisifyAll} from '@google-cloud/promisify'; import {paginator} from '@google-cloud/paginator'; import * as extend from 'extend'; import * as is from 'is'; -const IAM = require('./iam'); -const Publisher = require('./publisher'); +import {IAM} from './iam'; +import {Publisher} from './publisher'; +import { PubSub } from '.'; +import { Readable } from 'stream'; /** * A Topic object allows you to interact with a Cloud Pub/Sub topic. @@ -33,20 +33,21 @@ const Publisher = require('./publisher'); * @param {string} name Name of the topic. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); */ -class Topic { - Promise; - name; +export class Topic { + Promise?: PromiseConstructor; + name: string; parent; - pubsub; + pubsub: PubSub; request; - iam; + iam: IAM; metadata; - constructor(pubsub, name) { + getSubscriptionsStream = paginator.streamify('getSubscriptions') as () => Readable; + constructor(pubsub: PubSub, name: string) { if (pubsub.Promise) { this.Promise = pubsub.Promise; } @@ -88,7 +89,7 @@ class Topic { * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -119,7 +120,7 @@ class Topic { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -138,7 +139,7 @@ class Topic { * const apiResponse = data[1]; * }); */ - create(gaxOpts, callback) { + create(gaxOpts, callback?) { this.pubsub.createTopic(this.name, gaxOpts, callback); } /** @@ -155,7 +156,7 @@ class Topic { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -177,7 +178,7 @@ class Topic { * const apiResponse = data[1]; * }); */ - createSubscription(name, options, callback) { + createSubscription(name, options, callback?) { this.pubsub.createSubscription(this, name, options, callback); } /** @@ -193,7 +194,7 @@ class Topic { * @param {object} callback.apiResponse Raw API response. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -207,7 +208,7 @@ class Topic { * const apiResponse = data[0]; * }); */ - delete(gaxOpts, callback) { + delete(gaxOpts, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; @@ -242,7 +243,7 @@ class Topic { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -291,7 +292,7 @@ class Topic { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -347,7 +348,7 @@ class Topic { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -398,7 +399,7 @@ class Topic { * @returns {Promise} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -419,7 +420,7 @@ class Topic { * const subscriptions = data[0]; * }); */ - getSubscriptions(options, callback) { + getSubscriptions(options, callback?) { const self = this; if (is.fn(options)) { callback = options; @@ -473,7 +474,7 @@ class Topic { * @return {Publisher} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -485,7 +486,7 @@ class Topic { * } * }); */ - publisher(options) { + publisher(options?) { return new Publisher(this, options); } /** @@ -511,7 +512,7 @@ class Topic { * @return {Subscription} * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -540,7 +541,7 @@ class Topic { * * @return {string} */ - static formatName_(projectId, name) { + static formatName_(projectId: string, name: string) { // Simple check if the name is already formatted. if (name.indexOf('/') > -1) { return name; @@ -559,7 +560,7 @@ class Topic { * @returns {ReadableStream} A readable stream of {@link Subscription} instances. * * @example - * const PubSub = require('@google-cloud/pubsub'); + * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); @@ -582,9 +583,6 @@ class Topic { * this.end(); * }); */ -(Topic.prototype as any).getSubscriptionsStream = paginator.streamify( - 'getSubscriptions' -); /*! Developer Documentation * @@ -600,5 +598,3 @@ paginator.extend(Topic, ['getSubscriptions']); promisifyAll(Topic, { exclude: ['publisher', 'subscription'], }); - -module.exports = Topic; diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 89439fd9ad6..b28d458c361 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -14,14 +14,11 @@ * limitations under the License. */ -'use strict'; - import * as assert from 'assert'; -const async = require('async'); -const Subscription = require('../src/subscription.js'); +import * as async from 'async'; import * as uuid from 'uuid'; +import {PubSub, Subscription} from '../src'; -const PubSub = require('../src'); const pubsub = new PubSub(); describe('pubsub', function() { @@ -135,9 +132,11 @@ describe('pubsub', function() { }); it('should list topics in a stream', function(done) { + // tslint:disable-next-line no-any const topicsEmitted: any[] = []; - pubsub + // tslint:disable-next-line no-any + (pubsub as any) .getTopicsStream() .on('error', done) .on('data', function(topic) { @@ -332,6 +331,7 @@ describe('pubsub', function() { it('should list all topic subscriptions as a stream', function(done) { const subscriptionsEmitted: {}[] = []; + // tslint:disable-next-line no-any topic .getSubscriptionsStream() .on('error', done) @@ -605,7 +605,8 @@ describe('pubsub', function() { let snapshot; function deleteAllSnapshots() { - return pubsub.getSnapshots().then(function(data) { + // tslint:disable-next-line no-any + return (pubsub.getSnapshots() as any).then(function(data) { return Promise.all( data[0].map(function(snapshot) { return snapshot.delete(); diff --git a/handwritten/pubsub/test/connection-pool.ts b/handwritten/pubsub/test/connection-pool.ts index 6d450e8cd2f..67c1cf48253 100644 --- a/handwritten/pubsub/test/connection-pool.ts +++ b/handwritten/pubsub/test/connection-pool.ts @@ -120,7 +120,7 @@ describe('ConnectionPool', function() { }, duplexify: fakeDuplexify, uuid: fakeUuid, - }); + }).ConnectionPool; }); beforeEach(function() { @@ -1028,25 +1028,28 @@ describe('ConnectionPool', function() { describe('getClient', function() { const fakeCreds = {}; - function FakeSubscriber(address, creds, options) { - this.address = address; - this.creds = creds; - this.options = options; - this.closed = false; + class FakeSubscriber { + address; + creds; + options; + closed; + constructor(address, creds, options) { + this.address = address; + this.creds = creds; + this.options = options; + this.closed = false; + } + streamingPull() { + return fakeConnection; + } + getChannel() { + return fakeChannel; + } + close() { + this.closed = true; + } } - FakeSubscriber.prototype.streamingPull = function() { - return fakeConnection; - }; - - FakeSubscriber.prototype.getChannel = function() { - return fakeChannel; - }; - - FakeSubscriber.prototype.close = function() { - this.closed = true; - }; - const fakeClient = new FakeSubscriber('fake-address', fakeCreds, {}); beforeEach(function() { diff --git a/handwritten/pubsub/test/gapic-v1.ts b/handwritten/pubsub/test/gapic-v1.ts index 513fd15c412..b5db8726821 100644 --- a/handwritten/pubsub/test/gapic-v1.ts +++ b/handwritten/pubsub/test/gapic-v1.ts @@ -12,10 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -'use strict'; - import * as assert from 'assert'; -const through2 = require('through2'); +import * as through2 from 'through2'; const pubsubModule = require('../src'); diff --git a/handwritten/pubsub/test/histogram.ts b/handwritten/pubsub/test/histogram.ts index 11e48ba2992..e72ad2f85e0 100644 --- a/handwritten/pubsub/test/histogram.ts +++ b/handwritten/pubsub/test/histogram.ts @@ -14,11 +14,8 @@ * limitations under the License. */ -'use strict'; - import * as assert from 'assert'; - -const Histogram = require('../src/histogram.js'); +import {Histogram} from '../src/histogram.js'; describe('Histogram', function() { let histogram; diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index 8d69a9aba20..b1c4c61291b 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -14,13 +14,11 @@ * limitations under the License. */ -'use strict'; - import * as assert from 'assert'; import * as extend from 'extend'; -const proxyquire = require('proxyquire'); +import * as proxyquire from 'proxyquire'; import * as util from '../src/util'; -const promisify = require('@google-cloud/promisify'); +import * as promisify from '@google-cloud/promisify'; let promisified = false; const fakePromisify = extend({}, promisify, { @@ -45,7 +43,7 @@ describe('IAM', function() { before(function() { IAM = proxyquire('../src/iam.js', { '@google-cloud/promisify': fakePromisify, - }); + }).IAM; }); beforeEach(function() { diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 10da3385f9c..476cc3c2a9b 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -'use strict'; - import * as arrify from 'arrify'; import * as assert from 'assert'; import * as extend from 'extend'; @@ -24,6 +22,7 @@ import * as proxyquire from 'proxyquire'; import * as util from '../src/util'; import * as pjy from '@google-cloud/projectify'; import * as promisify from '@google-cloud/promisify'; +import * as subby from '../src/subscription'; const PKG = require('../../package.json'); @@ -43,7 +42,7 @@ const fakeGoogleGax = { }, }; -const SubscriptionCached = require('../src/subscription'); +const SubscriptionCached = subby.Subscription; let SubscriptionOverride; function Subscription(a, b, c) { @@ -70,15 +69,22 @@ const fakePromisify = extend({}, promisify, { let pjyOverride; function fakePjy() { - return (pjyOverride || pjy.replaceProjectIdToken).apply(this, arguments); + return (pjyOverride || pjy.replaceProjectIdToken).apply(null, arguments); } -function FakeSnapshot() { - this.calledWith_ = arguments; +class FakeSnapshot { + calledWith_: IArguments; + constructor() { + this.calledWith_ = arguments; + } } -function FakeTopic() { - this.calledWith_ = arguments; +class FakeTopic { + calledWith_: IArguments; + getSubscriptions?: Function; + constructor() { + this.calledWith_ = arguments; + } } let extended = false; @@ -151,11 +157,11 @@ describe('PubSub', function() { GoogleAuth: fakeGoogleAuth, }, 'google-gax': fakeGoogleGax, - './snapshot': FakeSnapshot, - './subscription': Subscription, - './topic': FakeTopic, + './snapshot': {Snapshot: FakeSnapshot}, + './subscription': {Subscription: Subscription}, + './topic': {Topic: FakeTopic}, './v1': v1Override, - }); + }).PubSub; }); after(function() { diff --git a/handwritten/pubsub/test/publisher.ts b/handwritten/pubsub/test/publisher.ts index 16d0e8b60eb..173b1164e6a 100644 --- a/handwritten/pubsub/test/publisher.ts +++ b/handwritten/pubsub/test/publisher.ts @@ -14,13 +14,11 @@ * limitations under the License. */ -'use strict'; - import * as assert from 'assert'; import * as util from '../src/util'; -const pfy = require('@google-cloud/promisify'); +import * as pfy from '@google-cloud/promisify'; import * as extend from 'extend'; -const proxyquire = require('proxyquire'); +import * as proxyquire from 'proxyquire'; let promisified = false; const fakePromisify = extend({}, pfy, { @@ -47,7 +45,7 @@ describe('Publisher', function() { before(function() { Publisher = proxyquire('../src/publisher.js', { '@google-cloud/promisify': fakePromisify, - }); + }).Publisher; }); beforeEach(function() { diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 50ad5064dde..d15a44d6472 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -'use strict'; - import * as assert from 'assert'; import * as util from '../src/util'; import * as extend from 'extend'; @@ -55,7 +53,7 @@ describe('Snapshot', function() { before(function() { Snapshot = proxyquire('../src/snapshot', { '@google-cloud/promisify': fakePromisify, - }); + }).Snapshot; }); const sandbox = sinon.createSandbox(); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 03be3fdde09..25e28075ff5 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -14,16 +14,14 @@ * limitations under the License. */ -'use strict'; - import * as assert from 'assert'; const delay = require('delay'); import {EventEmitter} from 'events'; import * as extend from 'extend'; import * as is from 'is'; -const proxyquire = require('proxyquire'); +import * as proxyquire from 'proxyquire'; import * as util from '../src/util'; -const pfy = require('@google-cloud/promisify'); +import * as pfy from '@google-cloud/promisify'; const fakeUtil = extend({}, util); @@ -54,8 +52,11 @@ class FakeConnectionPool extends EventEmitter { } } -function FakeHistogram() { - this.calledWith_ = [].slice.call(arguments); +class FakeHistogram { + calledWith_: IArguments; + constructor() { + this.calledWith_ = [].slice.call(arguments); + } } let delayOverride: any = null; @@ -79,9 +80,9 @@ describe('Subscriber', function() { }, delay: fakeDelay, os: fakeOs, - './connection-pool.js': FakeConnectionPool, - './histogram.js': FakeHistogram, - }); + './connection-pool.js': {ConnectionPool: FakeConnectionPool}, + './histogram.js': {Histogram: FakeHistogram}, + }).Subscriber; }); beforeEach(function() { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 37b5d082cb0..e74742b5f61 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -'use strict'; - import * as assert from 'assert'; import * as util from '../src/util'; import * as extend from 'extend'; @@ -34,8 +32,11 @@ const fakePromisify = extend({}, pfy, { }, }); -function FakeIAM() { - this.calledWith_ = [].slice.call(arguments); +class FakeIAM { + calledWith_: IArguments; + constructor() { + this.calledWith_ = [].slice.call(arguments); + } } class FakeSnapshot { @@ -46,8 +47,11 @@ class FakeSnapshot { } } -function FakeSubscriber() { - this.calledWith_ = [].slice.call(arguments); +class FakeSubscriber { + calledWith_: IArguments; + constructor() { + this.calledWith_ = [].slice.call(arguments); + } } describe('Subscription', function() { @@ -70,10 +74,10 @@ describe('Subscription', function() { before(function() { Subscription = proxyquire('../src/subscription.js', { '@google-cloud/promisify': fakePromisify, - './iam.js': FakeIAM, - './snapshot.js': FakeSnapshot, - './subscriber.js': FakeSubscriber, - }); + './iam.js': {IAM: FakeIAM}, + './snapshot.js': {Snapshot: FakeSnapshot}, + './subscriber.js': {Subscriber: FakeSubscriber}, + }).Subscription; }); const sandbox = sinon.createSandbox(); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 652d0622456..1d5cecff159 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -14,9 +14,7 @@ * limitations under the License. */ -'use strict'; - -import * as assert from 'assert'; + import * as assert from 'assert'; import * as extend from 'extend'; import * as proxyquire from 'proxyquire'; import * as util from '../src/util'; @@ -34,12 +32,18 @@ const fakePromisify = extend({}, pfy, { }, }); -function FakeIAM() { - this.calledWith_ = [].slice.call(arguments); +class FakeIAM { + calledWith_: IArguments; + constructor() { + this.calledWith_ = [].slice.call(arguments); + } } -function FakePublisher() { - this.calledWith_ = [].slice.call(arguments); +class FakePublisher { + calledWith_: IArguments; + constructor() { + this.calledWith_ = [].slice.call(arguments); + } } let extended = false; @@ -81,9 +85,9 @@ describe('Topic', function() { '@google-cloud/paginator': { paginator: fakePaginator, }, - './iam': FakeIAM, - './publisher': FakePublisher, - }); + './iam': {IAM: FakeIAM}, + './publisher': {Publisher: FakePublisher}, + }).Topic; }); const sandbox = sinon.createSandbox(); diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index 2f66e4d8624..628b6455f15 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -3,8 +3,7 @@ "compilerOptions": { "rootDir": ".", "outDir": "build", - "noImplicitAny": false, - "noImplicitThis": false + "noImplicitAny": false }, "include": [ "src/*.ts", From fcc38bc7dd0754517b6d117a6b34137ca59b5ffb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Wed, 7 Nov 2018 08:41:14 -0800 Subject: [PATCH 0244/1115] fix(deps): update dependency through2 to v3 (#320) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cc975e58c0c..ecdc5042aaa 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -94,7 +94,7 @@ "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", "protobufjs": "^6.8.1", - "through2": "^2.0.3", + "through2": "^3.0.0", "uuid": "^3.1.0" }, "devDependencies": { From da828171b975db4bc8b86cf74434f7fd5925e47d Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Wed, 7 Nov 2018 13:53:13 -0800 Subject: [PATCH 0245/1115] chore: use latest npm on Windows (#322) --- handwritten/pubsub/.kokoro/test.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat index d60473666b0..767320757e0 100644 --- a/handwritten/pubsub/.kokoro/test.bat +++ b/handwritten/pubsub/.kokoro/test.bat @@ -1,4 +1,4 @@ -@rem Copyright 2018 gRPC authors. +@rem Copyright 2018 Google LLC. All rights reserved. @rem @rem Licensed under the Apache License, Version 2.0 (the "License"); @rem you may not use this file except in compliance with the License. @@ -17,8 +17,7 @@ cd /d %~dp0 cd .. -call npm install -g npm@5 || goto :error - +call npm install -g npm@latest || goto :error call npm install || goto :error call npm run test || goto :error From 9e9ecfab5f4d7ef1c2c0b4202b72696c4e589b0b Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 7 Nov 2018 13:56:44 -0800 Subject: [PATCH 0246/1115] refactor(ts): introduce a round of types (#319) --- handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/connection-pool.ts | 69 ++++++++++++++--------- handwritten/pubsub/src/histogram.ts | 27 +++++---- handwritten/pubsub/src/iam.ts | 15 ++--- handwritten/pubsub/src/index.ts | 14 +++-- handwritten/pubsub/src/publisher.ts | 6 +- handwritten/pubsub/src/snapshot.ts | 9 +-- handwritten/pubsub/src/subscriber.ts | 6 +- handwritten/pubsub/src/subscription.ts | 6 +- handwritten/pubsub/src/topic.ts | 6 +- handwritten/pubsub/system-test/pubsub.ts | 4 +- 11 files changed, 96 insertions(+), 67 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ecdc5042aaa..8e84bd7bc07 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -101,6 +101,7 @@ "@google-cloud/nodejs-repo-tools": "^2.3.3", "@types/arrify": "^1.0.4", "@types/async": "^2.0.50", + "@types/duplexify": "^3.6.0", "@types/extend": "^3.0.0", "@types/is": "0.0.20", "@types/mocha": "^5.2.5", diff --git a/handwritten/pubsub/src/connection-pool.ts b/handwritten/pubsub/src/connection-pool.ts index 471d96d726d..a8bfa986a19 100644 --- a/handwritten/pubsub/src/connection-pool.ts +++ b/handwritten/pubsub/src/connection-pool.ts @@ -18,10 +18,14 @@ import {replaceProjectIdToken} from '@google-cloud/projectify'; const duplexify = require('duplexify'); const each = require('async-each'); import {EventEmitter} from 'events'; -import * as is from 'is'; import * as through from 'through2'; import * as uuid from 'uuid'; import * as util from './util'; +import { Subscription } from './subscription'; +import { PubSub } from '.'; +import { Duplex } from 'stream'; +import { StatusObject } from 'grpc'; +import { Subscriber } from './subscriber'; const CHANNEL_READY_EVENT = 'channel.ready'; const CHANNEL_ERROR_EVENT = 'channel.error'; @@ -49,6 +53,16 @@ const RETRY_CODES = [ 15, // dataloss ]; +export interface ConnectionPoolSettings { + maxConnections: number; + ackDeadline: number; +} + +export type ConnectionResponse = [Duplex]; +export interface ConnectionCallback { + (err: Error|null, connection?: Duplex): void; +} + /*! * ConnectionPool is used to manage the stream connections created via * StreamingPull rpc. @@ -62,19 +76,19 @@ const RETRY_CODES = [ * creating a connection. */ export class ConnectionPool extends EventEmitter { - subscription; - pubsub; - connections; - isPaused; - isOpen; - isGettingChannelState; - failedConnectionAttempts; - noConnectionsTime; - settings; - queue; - keepAliveHandle; - client; - constructor(subscription) { + subscription: Subscription; + pubsub: PubSub; + connections: Map; + isPaused: boolean; + isOpen: boolean; + isGettingChannelState: boolean; + failedConnectionAttempts: number; + noConnectionsTime: number; + settings: ConnectionPoolSettings; + queue: NodeJS.Timer[]; + keepAliveHandle?: NodeJS.Timer; + client?: Subscriber|null; + constructor(subscription: Subscription) { super(); this.subscription = subscription; this.pubsub = subscription.pubsub; @@ -103,21 +117,23 @@ export class ConnectionPool extends EventEmitter { * connection. * @param {stream} callback.connection A duplex stream. */ - acquire(id, callback) { - if (is.fn(id)) { - callback = id; - id = null; - } + acquire(id?: string): Promise; + acquire(id: string, callback: ConnectionCallback): void; + acquire(callback: ConnectionCallback): void; + acquire(idOrCallback?: string|ConnectionCallback, cb?: ConnectionCallback): void|Promise { + let id = typeof idOrCallback === 'string' ? idOrCallback : null; + const callback = typeof idOrCallback === 'function' ? idOrCallback : cb!; + if (!this.isOpen) { callback(new Error('No connections available to make request.')); return; } // it's possible that by the time a user acks the connection could have // closed, so in that case we'll just return any connection - if (!this.connections.has(id)) { + if (!this.connections.has(id!)) { id = this.connections.keys().next().value; } - const connection = this.connections.get(id); + const connection = this.connections.get(id!); if (connection) { callback(null, connection); return; @@ -137,7 +153,7 @@ export class ConnectionPool extends EventEmitter { close(callback) { const connections = Array.from(this.connections.values()); callback = callback || util.noop; - clearInterval(this.keepAliveHandle); + clearInterval(this.keepAliveHandle!); this.connections.clear(); this.queue.forEach(clearTimeout); this.queue.length = 0; @@ -345,7 +361,8 @@ export class ConnectionPool extends EventEmitter { const interator = this.connections.values(); let connection = interator.next().value; while (connection) { - if (connection.isConnected) { + // tslint:disable-next-line no-any + if ((connection as any).isConnected) { return true; } connection = interator.next().value; @@ -416,7 +433,7 @@ export class ConnectionPool extends EventEmitter { * * @private */ - resume() { + resume(): void { this.isPaused = false; this.connections.forEach(connection => { connection.resume(); @@ -427,7 +444,7 @@ export class ConnectionPool extends EventEmitter { * * @private */ - sendKeepAlives() { + sendKeepAlives(): void { this.connections.forEach(connection => { connection.write({}); }); @@ -440,7 +457,7 @@ export class ConnectionPool extends EventEmitter { * @param {object} status The gRPC status object. * @return {boolean} */ - shouldReconnect(status) { + shouldReconnect(status: StatusObject): boolean { // If the pool was closed, we should definitely not reconnect if (!this.isOpen) { return false; diff --git a/handwritten/pubsub/src/histogram.ts b/handwritten/pubsub/src/histogram.ts index 6a058a25a76..8c25285a93f 100644 --- a/handwritten/pubsub/src/histogram.ts +++ b/handwritten/pubsub/src/histogram.ts @@ -16,6 +16,11 @@ import * as extend from 'extend'; +export interface HistogramOptions { + min?: number; + max?: number; +} + /*! * The Histogram class is used to capture the lifespan of messages within the * the client. These durations are then used to calculate the 99th percentile @@ -25,10 +30,10 @@ import * as extend from 'extend'; * @class */ export class Histogram { - options; - data; - length; - constructor(options?) { + options: HistogramOptions; + data: Map; + length: number; + constructor(options?: HistogramOptions) { this.options = extend( { min: 10000, @@ -45,14 +50,14 @@ export class Histogram { * @private * @param {numnber} value - The value in milliseconds. */ - add(value) { - value = Math.max(value, this.options.min); - value = Math.min(value, this.options.max); + add(value: number): void { + value = Math.max(value, this.options.min!); + value = Math.min(value, this.options.max!); value = Math.ceil(value / 1000) * 1000; if (!this.data.has(value)) { this.data.set(value, 0); } - const count = this.data.get(value); + const count = this.data.get(value)!; this.data.set(value, count + 1); this.length += 1; } @@ -63,18 +68,18 @@ export class Histogram { * @param {number} percent The requested percentage. * @return {number} */ - percentile(percent) { + percentile(percent: number): number { percent = Math.min(percent, 100); let target = this.length - this.length * (percent / 100); const keys = Array.from(this.data.keys()); let key; for (let i = keys.length - 1; i > -1; i--) { key = keys[i]; - target -= this.data.get(key); + target -= this.data.get(key)!; if (target <= 0) { return key; } } - return this.options.min; + return this.options.min!; } } diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 2c74842b063..0047acdc881 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -21,6 +21,7 @@ import * as arrify from 'arrify'; import {promisifyAll} from '@google-cloud/promisify'; import * as is from 'is'; +import { PubSub } from '.'; /** * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) @@ -61,11 +62,11 @@ import * as is from 'is'; * // subscription.iam */ export class IAM { - Promise; - pubsub; - request; - id; - constructor(pubsub, id) { + Promise?: PromiseConstructor; + pubsub: PubSub; + request: typeof PubSub.prototype.request; + id: string; + constructor(pubsub: PubSub, id: string) { if (pubsub.Promise) { this.Promise = pubsub.Promise; } @@ -282,7 +283,7 @@ export class IAM { * const apiResponse = data[1]; * }); */ - testPermissions(permissions, gaxOpts, callback?) { + testPermissions(permissions: string|string[], gaxOpts, callback?) { if (!is.array(permissions) && !is.string(permissions)) { throw new Error('Permissions are required.'); } @@ -307,7 +308,7 @@ export class IAM { return; } const availablePermissions = arrify(resp.permissions); - const permissionHash = permissions.reduce(function(acc, permission) { + const permissionHash = (permissions as string[]).reduce(function(acc, permission) { acc[permission] = availablePermissions.indexOf(permission) > -1; return acc; }, {}); diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 579f3f6ce38..2eb95164770 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -19,8 +19,7 @@ import {paginator} from '@google-cloud/paginator'; import {promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; -const gax = require('google-gax'); -const {grpc} = new gax.GrpcClient(); +import * as gax from 'google-gax'; import * as is from 'is'; const PKG = require('../../package.json'); @@ -31,6 +30,9 @@ import {Subscription} from './subscription'; import {Topic} from './topic'; import { Readable } from 'stream'; +const opts = {} as gax.GrpcClientOptions; +const {grpc} = new gax.GrpcClient(opts); + /** * @type {string} - Project ID placeholder. * @private @@ -206,14 +208,14 @@ export class PubSub { * const apiResponse = data[1]; * }); */ - createSubscription(topic, name, options, callback) { + createSubscription(topic: Topic|string, name: string, options, callback) { if (!is.string(topic) && !(topic instanceof Topic)) { throw new Error('A Topic is required for a new subscription.'); } if (!is.string(name)) { throw new Error('A subscription name is required.'); } - if (is.string(topic)) { + if (typeof topic === 'string') { topic = this.topic(topic); } if (is.fn(options)) { @@ -286,7 +288,7 @@ export class PubSub { * const apiResponse = data[1]; * }); */ - createTopic(name, gaxOpts, callback?) { + createTopic(name: string, gaxOpts, callback?) { const topic = this.topic(name); const reqOpts = { name: topic.name, @@ -691,7 +693,7 @@ export class PubSub { * * const snapshot = pubsub.snapshot('my-snapshot'); */ - snapshot(name) { + snapshot(name: string) { if (!is.string(name)) { throw new Error('You must supply a valid name for the snapshot.'); } diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index abc62ca2ba2..5a9e5db119b 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -48,8 +48,8 @@ import { Topic } from './topic'; * const publisher = topic.publisher(); */ export class Publisher { - Promise; - topic; + Promise?: PromiseConstructor; + topic: Topic; inventory_; settings; timeoutHandle_; @@ -148,7 +148,7 @@ export class Publisher { * //- * publisher.publish(data).then((messageId) => {}); */ - publish(data, attributes, callback?) { + publish(data: Buffer, attributes, callback?) { if (!(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); } diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 5e46116c2f7..0434da106b6 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -17,6 +17,7 @@ import * as util from './util'; import {promisifyAll} from '@google-cloud/promisify'; import * as is from 'is'; +import { PubSub } from '.'; /** * A Snapshot object will give you access to your Cloud Pub/Sub snapshot. @@ -84,12 +85,12 @@ import * as is from 'is'; */ export class Snapshot { parent; - name; - Promise; + name: string; + Promise?: PromiseConstructor; create; seek; metadata; - constructor(parent, name) { + constructor(parent, name: string) { if (parent.Promise) { this.Promise = parent.Promise; } @@ -201,7 +202,7 @@ export class Snapshot { * * @private */ - static formatName_(projectId, name) { + static formatName_(projectId: string, name: string) { return 'projects/' + projectId + '/snapshots/' + name.split('/').pop(); } } diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 43d9862983f..5ea30577675 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -26,6 +26,7 @@ import * as os from 'os'; import {ConnectionPool} from './connection-pool'; import {Histogram} from './histogram'; +import { Subscription } from '.'; /** * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline @@ -389,7 +390,8 @@ export class Subscriber extends EventEmitter { * @private */ openConnection_() { - const pool = (this.connectionPool = new ConnectionPool(this)); + // TODO: fixup this cast + const pool = (this.connectionPool = new ConnectionPool(this as {} as Subscription)); this.isOpen = true; pool.on('error', err => { this.emit('error', err); @@ -477,7 +479,7 @@ export class Subscriber extends EventEmitter { } // we can ignore any errors that come from this since they'll be // re-emitted later - connection.write(data, err => { + connection!.write(data, err => { if (!err) { this.latency_.add(Date.now() - startTime); } diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 8fb23eace11..563f1668847 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -146,7 +146,7 @@ export class Subscription extends Subscriber { create!: Function; iam: IAM; metadata; - constructor(pubsub, name, options) { + constructor(pubsub: PubSub, name: string, options) { options = options || {}; super(options); if (pubsub.Promise) { @@ -686,7 +686,7 @@ export class Subscription extends Subscriber { * @example * const snapshot = subscription.snapshot('my-snapshot'); */ - snapshot(name) { + snapshot(name: string) { return this.pubsub.snapshot.call(this, name); } /*! @@ -717,7 +717,7 @@ export class Subscription extends Subscriber { * * @private */ - static formatName_(projectId, name) { + static formatName_(projectId: string, name: string) { // Simple check if the name is already formatted. if (name.indexOf('/') > -1) { return name; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 973022190b8..f2e060a3ba4 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -41,9 +41,9 @@ import { Readable } from 'stream'; export class Topic { Promise?: PromiseConstructor; name: string; - parent; + parent: PubSub; pubsub: PubSub; - request; + request: typeof PubSub.prototype.request; iam: IAM; metadata; getSubscriptionsStream = paginator.streamify('getSubscriptions') as () => Readable; @@ -178,7 +178,7 @@ export class Topic { * const apiResponse = data[1]; * }); */ - createSubscription(name, options, callback?) { + createSubscription(name: string, options, callback?) { this.pubsub.createSubscription(this, name, options, callback); } /** diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index b28d458c361..83b1000fa99 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import * as async from 'async'; import * as uuid from 'uuid'; -import {PubSub, Subscription} from '../src'; +import {PubSub, Subscription, Topic} from '../src'; const pubsub = new PubSub(); @@ -48,7 +48,7 @@ describe('pubsub', function() { return 'test-topic-' + uuid.v4(); } - function getTopicName(topic) { + function getTopicName(topic: Topic) { return topic.name.split('/').pop(); } From a37611b19c9b29f44aeb232a524d5feb1b815fcf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 8 Nov 2018 08:46:07 -0800 Subject: [PATCH 0247/1115] chore(deps): update dependency @types/is to v0.0.21 (#323) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8e84bd7bc07..fe038de5e84 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -103,7 +103,7 @@ "@types/async": "^2.0.50", "@types/duplexify": "^3.6.0", "@types/extend": "^3.0.0", - "@types/is": "0.0.20", + "@types/is": "0.0.21", "@types/mocha": "^5.2.5", "@types/proxyquire": "^1.3.28", "@types/sinon": "^5.0.5", From 4ac5bfd88ee3c16b89303a8f7c46c313a9d6ac8f Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 9 Nov 2018 10:01:08 -0800 Subject: [PATCH 0248/1115] chore: drop contributors from multiple places (#325) --- handwritten/pubsub/.mailmap | 7 ------- handwritten/pubsub/CONTRIBUTORS | 36 --------------------------------- handwritten/pubsub/package.json | 33 ------------------------------ 3 files changed, 76 deletions(-) delete mode 100644 handwritten/pubsub/.mailmap delete mode 100644 handwritten/pubsub/CONTRIBUTORS diff --git a/handwritten/pubsub/.mailmap b/handwritten/pubsub/.mailmap deleted file mode 100644 index 7777d4dca88..00000000000 --- a/handwritten/pubsub/.mailmap +++ /dev/null @@ -1,7 +0,0 @@ -Jason Dobry Jason Dobry -Jason Dobry Jason Dobry -Luke Sneeringer Luke Sneeringer -Stephen Sawchuk Stephen Sawchuk -Stephen Sawchuk Stephen Sawchuk -Stephen Sawchuk Stephen -Alexander Fenster Alexander Fenster diff --git a/handwritten/pubsub/CONTRIBUTORS b/handwritten/pubsub/CONTRIBUTORS deleted file mode 100644 index 8f89a49273b..00000000000 --- a/handwritten/pubsub/CONTRIBUTORS +++ /dev/null @@ -1,36 +0,0 @@ -# The names of individuals who have contributed to this project. -# -# Names are formatted as: -# name -# -Ace Nassri -Alexander Fenster -Ali Ijaz Sheikh -Alix Hamilton -Anish Karandikar -Antono Vasiljev -Chet Husk -Christoph Tavan -Christopher Wilcox -DPE bot -Dave Gramlich -David Fox -Dennis -Eric Uldall -Jan Pretzel -Jason Dobry -Jonathan Lui -Jun Mukai -Justin Beckwith -Justin King -Kamal Aboul-Hosn -Matthew Arbesfeld -Song Wang -Stephen Sawchuk -Tejasvi (Teju) Nareddy -Tim Swast -chenyumic -greenkeeper[bot] -lashae -mkamioner -renovate[bot] diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index fe038de5e84..628ab995c34 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -28,39 +28,6 @@ "google pubsub", "pubsub" ], - "contributors": [ - "Ace Nassri ", - "Alexander Fenster ", - "Ali Ijaz Sheikh ", - "Alix Hamilton ", - "Anish Karandikar ", - "Antono Vasiljev ", - "Chet Husk ", - "Christoph Tavan ", - "Christopher Wilcox ", - "DPE bot ", - "Dave Gramlich ", - "David Fox ", - "Dennis ", - "Eric Uldall ", - "Jan Pretzel ", - "Jason Dobry ", - "Jonathan Lui ", - "Jun Mukai ", - "Justin Beckwith ", - "Justin King ", - "Kamal Aboul-Hosn ", - "Matthew Arbesfeld ", - "Song Wang ", - "Stephen Sawchuk ", - "Tejasvi (Teju) Nareddy ", - "Tim Swast ", - "chenyumic ", - "greenkeeper[bot] ", - "lashae ", - "mkamioner ", - "renovate[bot] " - ], "scripts": { "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", From c28f31f56044e2f0f81bd0fae280cb638c88965a Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 9 Nov 2018 15:03:20 -0800 Subject: [PATCH 0249/1115] refactor: use Object.assign where possible (#324) --- handwritten/pubsub/src/histogram.ts | 4 +--- handwritten/pubsub/src/index.ts | 16 +++++++-------- handwritten/pubsub/src/subscriber.ts | 5 ++--- handwritten/pubsub/src/subscription.ts | 3 +-- handwritten/pubsub/src/topic.ts | 5 ++--- handwritten/pubsub/test/connection-pool.ts | 7 +++---- handwritten/pubsub/test/iam.ts | 3 +-- handwritten/pubsub/test/index.ts | 23 +++++++++++----------- handwritten/pubsub/test/publisher.ts | 5 ++--- handwritten/pubsub/test/snapshot.ts | 3 +-- handwritten/pubsub/test/subscriber.ts | 3 +-- handwritten/pubsub/test/subscription.ts | 7 +++---- handwritten/pubsub/test/topic.ts | 7 +++---- 13 files changed, 39 insertions(+), 52 deletions(-) diff --git a/handwritten/pubsub/src/histogram.ts b/handwritten/pubsub/src/histogram.ts index 8c25285a93f..6e406005ed5 100644 --- a/handwritten/pubsub/src/histogram.ts +++ b/handwritten/pubsub/src/histogram.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -import * as extend from 'extend'; - export interface HistogramOptions { min?: number; max?: number; @@ -34,7 +32,7 @@ export class Histogram { data: Map; length: number; constructor(options?: HistogramOptions) { - this.options = extend( + this.options = Object.assign( { min: 10000, max: 600000, diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 2eb95164770..a10cd26b351 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -114,7 +114,7 @@ export class PubSub { allScopes[scope] = true; } } - this.options = extend( + this.options = Object.assign( { 'grpc.keepalive_time_ms': 300000, 'grpc.max_receive_message_length': 20000001, @@ -225,7 +225,7 @@ export class PubSub { options = options || {}; const metadata = Subscription.formatMetadata_(options); const subscription = this.subscription(name, metadata); - const reqOpts = extend(metadata, { + const reqOpts = Object.assign(metadata, { topic: topic.name, name: subscription.name, }); @@ -391,7 +391,7 @@ export class PubSub { callback = options; options = {}; } - const reqOpts = extend( + const reqOpts = Object.assign( { project: 'projects/' + this.projectId, }, @@ -399,7 +399,7 @@ export class PubSub { ); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - const gaxOpts = extend( + const gaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, @@ -495,11 +495,11 @@ export class PubSub { } return topic.getSubscriptions(options, callback); } - const reqOpts = extend({}, options); + const reqOpts = Object.assign({}, options); reqOpts.project = 'projects/' + this.projectId; delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - const gaxOpts = extend( + const gaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, @@ -587,7 +587,7 @@ export class PubSub { callback = options; options = {}; } - const reqOpts = extend( + const reqOpts = Object.assign( { project: 'projects/' + this.projectId, }, @@ -595,7 +595,7 @@ export class PubSub { ); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - const gaxOpts = extend( + const gaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 5ea30577675..a195fd86a61 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -20,7 +20,6 @@ import * as util from './util'; import {promisify, promisifyAll} from '@google-cloud/promisify'; const delay = require('delay'); import {EventEmitter} from 'events'; -import * as extend from 'extend'; import * as is from 'is'; import * as os from 'os'; @@ -75,14 +74,14 @@ export class Subscriber extends EventEmitter { nack: [], bytes: 0, }; - this.flowControl = extend( + this.flowControl = Object.assign( { maxBytes: os.freemem() * 0.2, maxMessages: 100, }, options.flowControl ); - this.batching = extend( + this.batching = Object.assign( { maxMilliseconds: 100, }, diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 563f1668847..0cf39063ea9 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -16,7 +16,6 @@ import * as util from './util'; import {promisifyAll} from '@google-cloud/promisify'; -import * as extend from 'extend'; import * as is from 'is'; const snakeCase = require('lodash.snakecase'); @@ -695,7 +694,7 @@ export class Subscription extends Subscriber { * @private */ static formatMetadata_(metadata) { - const formatted = extend({}, metadata); + const formatted = Object.assign({}, metadata); if (metadata.messageRetentionDuration) { formatted.retainAckedMessages = true; formatted.messageRetentionDuration = { diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index f2e060a3ba4..31eff01b538 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -17,7 +17,6 @@ import * as util from './util'; import {promisifyAll} from '@google-cloud/promisify'; import {paginator} from '@google-cloud/paginator'; -import * as extend from 'extend'; import * as is from 'is'; import {IAM} from './iam'; @@ -426,7 +425,7 @@ export class Topic { callback = options; options = {}; } - const reqOpts = extend( + const reqOpts = Object.assign( { topic: this.name, }, @@ -434,7 +433,7 @@ export class Topic { ); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; - const gaxOpts = extend( + const gaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, diff --git a/handwritten/pubsub/test/connection-pool.ts b/handwritten/pubsub/test/connection-pool.ts index 67c1cf48253..a6df93fa69c 100644 --- a/handwritten/pubsub/test/connection-pool.ts +++ b/handwritten/pubsub/test/connection-pool.ts @@ -18,7 +18,6 @@ import * as assert from 'assert'; import * as util from '../src/util'; const duplexify = require('duplexify'); import {EventEmitter} from 'events'; -import * as extend from 'extend'; import * as proxyquire from 'proxyquire'; import * as uuid from 'uuid'; import * as pjy from '@google-cloud/projectify'; @@ -31,7 +30,7 @@ const fakeUtil = { } }; -const fakeUuid = extend({}, uuid); +const fakeUuid = Object.assign({}, uuid); class FakeConnection extends EventEmitter { isConnected; @@ -186,8 +185,8 @@ describe('ConnectionPool', function() { ackDeadline: 100, }; - const subscription = extend({}, SUBSCRIPTION, options); - const subscriptionCopy = extend({}, subscription); + const subscription = Object.assign({}, SUBSCRIPTION, options); + const subscriptionCopy = Object.assign({}, subscription); const pool = new ConnectionPool(subscription); assert.deepStrictEqual(pool.settings, options); diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index b1c4c61291b..9ec69164962 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -15,13 +15,12 @@ */ import * as assert from 'assert'; -import * as extend from 'extend'; import * as proxyquire from 'proxyquire'; import * as util from '../src/util'; import * as promisify from '@google-cloud/promisify'; let promisified = false; -const fakePromisify = extend({}, promisify, { +const fakePromisify = Object.assign({}, promisify, { promisifyAll: function(Class) { if (Class.name === 'IAM') { promisified = true; diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 476cc3c2a9b..287dda82436 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -16,7 +16,6 @@ import * as arrify from 'arrify'; import * as assert from 'assert'; -import * as extend from 'extend'; import * as gax from 'google-gax'; import * as proxyquire from 'proxyquire'; import * as util from '../src/util'; @@ -51,7 +50,7 @@ function Subscription(a, b, c) { } let promisified = false; -const fakePromisify = extend({}, promisify, { +const fakePromisify = Object.assign({}, promisify, { promisifyAll: function(Class, options) { if (Class.name !== 'PubSub') { return; @@ -235,7 +234,7 @@ describe('PubSub', function() { googleAuthOverride = function(options_) { assert.deepStrictEqual( options_, - extend( + Object.assign( { 'grpc.max_receive_message_length': 20000001, 'grpc.keepalive_time_ms': 300000, @@ -256,7 +255,7 @@ describe('PubSub', function() { it('should localize the options provided', function() { assert.deepStrictEqual( pubsub.options, - extend( + Object.assign( { 'grpc.max_receive_message_length': 20000001, 'grpc.keepalive_time_ms': 300000, @@ -289,7 +288,7 @@ describe('PubSub', function() { describe('createSubscription', function() { const TOPIC_NAME = 'topic'; - const TOPIC = extend(new FakeTopic(), { + const TOPIC = Object.assign(new FakeTopic(), { name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, }); @@ -304,7 +303,7 @@ describe('PubSub', function() { beforeEach(function() { (Subscription as any).formatMetadata_ = function(metadata) { - return extend({}, metadata); + return Object.assign({}, metadata); }; }); @@ -398,7 +397,7 @@ describe('PubSub', function() { pushEndpoint: 'https://domain/push', }; - const expectedBody = extend( + const expectedBody = Object.assign( { topic: TOPIC.name, name: SUB_NAME, @@ -712,11 +711,11 @@ describe('PubSub', function() { autoPaginate: false, }; - const expectedOptions = extend({}, options, { + const expectedOptions = Object.assign({}, options, { project: 'projects/' + pubsub.projectId, }); - const expectedGaxOpts = extend( + const expectedGaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, @@ -798,7 +797,7 @@ describe('PubSub', function() { autoPaginate: false, }; - const expectedGaxOpts = extend( + const expectedGaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, @@ -926,11 +925,11 @@ describe('PubSub', function() { autoPaginate: false, }; - const expectedOptions = extend({}, options, { + const expectedOptions = Object.assign({}, options, { project: 'projects/' + pubsub.projectId, }); - const expectedGaxOpts = extend( + const expectedGaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, diff --git a/handwritten/pubsub/test/publisher.ts b/handwritten/pubsub/test/publisher.ts index 173b1164e6a..fe60bfff660 100644 --- a/handwritten/pubsub/test/publisher.ts +++ b/handwritten/pubsub/test/publisher.ts @@ -17,11 +17,10 @@ import * as assert from 'assert'; import * as util from '../src/util'; import * as pfy from '@google-cloud/promisify'; -import * as extend from 'extend'; import * as proxyquire from 'proxyquire'; let promisified = false; -const fakePromisify = extend({}, pfy, { +const fakePromisify = Object.assign({}, pfy, { promisifyAll: function(Class, options) { if (Class.name === 'Publisher') { assert.deepStrictEqual(options, {singular: true}); @@ -90,7 +89,7 @@ describe('Publisher', function() { maxMessages: 11, maxMilliseconds: 12, }; - const optionsCopy = extend({}, options); + const optionsCopy = Object.assign({}, options); const publisher = new Publisher(TOPIC, { batching: options, diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index d15a44d6472..d902453bb4c 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -16,13 +16,12 @@ import * as assert from 'assert'; import * as util from '../src/util'; -import * as extend from 'extend'; import * as proxyquire from 'proxyquire'; import * as pfy from '@google-cloud/promisify'; import * as sinon from 'sinon'; let promisified = false; -const fakePromisify = extend({}, pfy, { +const fakePromisify = Object.assign({}, pfy, { promisifyAll: function(Class) { if (Class.name === 'Snapshot') { promisified = true; diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 25e28075ff5..c0441bc50f5 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -17,13 +17,12 @@ import * as assert from 'assert'; const delay = require('delay'); import {EventEmitter} from 'events'; -import * as extend from 'extend'; import * as is from 'is'; import * as proxyquire from 'proxyquire'; import * as util from '../src/util'; import * as pfy from '@google-cloud/promisify'; -const fakeUtil = extend({}, util); +const fakeUtil = Object.assign({}, util); let promisifyOverride; function fakePromisify() { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index e74742b5f61..529665ea453 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -16,13 +16,12 @@ import * as assert from 'assert'; import * as util from '../src/util'; -import * as extend from 'extend'; import * as proxyquire from 'proxyquire'; import * as pfy from '@google-cloud/promisify'; import * as sinon from 'sinon'; let promisified = false; -const fakePromisify = extend({}, pfy, { +const fakePromisify = Object.assign({}, pfy, { promisifyAll: (klass, options) => { if (klass.name !== 'Subscription') { return; @@ -735,7 +734,7 @@ describe('Subscription', function() { beforeEach(function() { Subscription.formatMetadata_ = function(metadata) { - return extend({}, metadata); + return Object.assign({}, metadata); }; }); @@ -746,7 +745,7 @@ describe('Subscription', function() { }, }; - const expectedBody = extend( + const expectedBody = Object.assign( { name: SUB_FULL_NAME, }, diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 1d5cecff159..a7f9c51bc95 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -15,14 +15,13 @@ */ import * as assert from 'assert'; -import * as extend from 'extend'; import * as proxyquire from 'proxyquire'; import * as util from '../src/util'; import * as pfy from '@google-cloud/promisify'; import * as sinon from 'sinon'; let promisified = false; -const fakePromisify = extend({}, pfy, { +const fakePromisify = Object.assign({}, pfy, { promisifyAll: (klass, options) => { if (klass.name !== 'Topic') { return; @@ -433,14 +432,14 @@ describe('Topic', function() { autoPaginate: false, }; - const expectedOptions = extend( + const expectedOptions = Object.assign( { topic: topic.name, }, options ); - const expectedGaxOpts = extend( + const expectedGaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, From 84737f2bc4191c562ecb9ca6988bc3b6e2bba252 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sat, 10 Nov 2018 10:50:13 -0800 Subject: [PATCH 0250/1115] chore(deps): update dependency @google-cloud/nodejs-repo-tools to v3 (#328) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 628ab995c34..ce5e47ca2de 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -65,7 +65,7 @@ "uuid": "^3.1.0" }, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "^2.3.3", + "@google-cloud/nodejs-repo-tools": "^3.0.0", "@types/arrify": "^1.0.4", "@types/async": "^2.0.50", "@types/duplexify": "^3.6.0", From 6c140ceff5fc8f2d845ec090f59d7951549838ae Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 12 Nov 2018 14:38:33 -0800 Subject: [PATCH 0251/1115] refactor: drop dependencies on google-proto-files and async (#329) --- handwritten/pubsub/package.json | 3 - handwritten/pubsub/src/publisher.ts | 2 +- handwritten/pubsub/src/subscription.ts | 2 +- handwritten/pubsub/src/topic.ts | 4 +- handwritten/pubsub/system-test/pubsub.ts | 140 ++++++----------------- 5 files changed, 37 insertions(+), 114 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ce5e47ca2de..76db666ec88 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -55,7 +55,6 @@ "extend": "^3.0.1", "google-auth-library": "^2.0.0", "google-gax": "^0.20.0", - "google-proto-files": "^0.17.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", @@ -67,7 +66,6 @@ "devDependencies": { "@google-cloud/nodejs-repo-tools": "^3.0.0", "@types/arrify": "^1.0.4", - "@types/async": "^2.0.50", "@types/duplexify": "^3.6.0", "@types/extend": "^3.0.0", "@types/is": "0.0.21", @@ -76,7 +74,6 @@ "@types/sinon": "^5.0.5", "@types/through2": "^2.0.34", "@types/uuid": "^3.4.4", - "async": "^2.6.0", "codecov": "^3.0.0", "eslint": "^5.0.0", "eslint-config-prettier": "^3.0.0", diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 5a9e5db119b..c33ca5a9e00 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -148,7 +148,7 @@ export class Publisher { * //- * publisher.publish(data).then((messageId) => {}); */ - publish(data: Buffer, attributes, callback?) { + publish(data: Buffer, attributes?, callback?) { if (!(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); } diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 0cf39063ea9..b01e30e1a45 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -297,7 +297,7 @@ export class Subscription extends Subscriber { * const apiResponse = data[0]; * }); */ - delete(gaxOpts, callback?) { + delete(gaxOpts?, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 31eff01b538..5eea170dc1e 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -138,7 +138,7 @@ export class Topic { * const apiResponse = data[1]; * }); */ - create(gaxOpts, callback?) { + create(gaxOpts?, callback?) { this.pubsub.createTopic(this.name, gaxOpts, callback); } /** @@ -207,7 +207,7 @@ export class Topic { * const apiResponse = data[0]; * }); */ - delete(gaxOpts, callback?) { + delete(gaxOpts?, callback?) { if (is.fn(gaxOpts)) { callback = gaxOpts; gaxOpts = {}; diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 83b1000fa99..29869bd4869 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -15,7 +15,6 @@ */ import * as assert from 'assert'; -import * as async from 'async'; import * as uuid from 'uuid'; import {PubSub, Subscription, Topic} from '../src'; @@ -52,67 +51,29 @@ describe('pubsub', function() { return topic.name.split('/').pop(); } - function publishPop(message, options, callback) { - if (!callback) { - callback = options; - options = {}; - } - - options = options || {}; - + async function publishPop(message, options = {}) { const topic = pubsub.topic(generateTopicName()); const publisher = topic.publisher(); const subscription = topic.subscription(generateSubName()); - - async.series( - [ - topic.create.bind(topic), - subscription.create.bind(subscription), - function(callback) { - async.times( - 6, - function(_, callback) { - publisher.publish(Buffer.from(message), options, callback); - }, - callback - ); - }, - ], - function(err) { - if (err) { - callback(err); - return; - } - - subscription.on('error', callback); - - subscription.once('message', function(message) { - callback(null, message); - }); - } - ); + await topic.create(); + await subscription.create(); + for (let i=0; i<6; i++) { + await publisher.publish(Buffer.from(message), options); + } + return new Promise((resolve, reject) => { + subscription.on('error', reject); + subscription.once('message', resolve); + }); } - before(function(done) { + before(() => { // create all needed topics - async.each( - TOPICS, - function(topic, cb) { - topic.create(cb); - }, - done - ); + return Promise.all(TOPICS.map(t => t.create())); }); - after(function(done) { + after(() => { // Delete topics - async.each( - TOPICS, - function(topic, callback) { - topic.delete(callback); - }, - done - ); + return Promise.all(TOPICS.map(t => t.delete())); }); describe('Topic', function() { @@ -213,20 +174,15 @@ describe('pubsub', function() { }); }); - it('should publish a message with attributes', function(done) { + it('should publish a message with attributes', async () => { const data = Buffer.from('raw message data'); const attrs = { customAttribute: 'value', }; - - publishPop(data, attrs, function(err, message) { - assert.ifError(err); - - assert.deepStrictEqual(message.data, data); - assert.deepStrictEqual(message.attributes, attrs); - - done(); - }); + // tslint:disable-next-line no-any + const message: any = await publishPop(data, attrs); + assert.deepStrictEqual(message.data, data); + assert.deepStrictEqual(message.attributes, attrs); }); it('should get the metadata of a topic', function(done) { @@ -251,52 +207,24 @@ describe('pubsub', function() { topic.subscription(SUB_NAMES[1], {ackDeadline: 60000}), ]; - before(function(done) { - topic.create(function(err) { - assert.ifError(err); - - function createSubscription(subscription, callback) { - subscription.create(callback); - } - - async.each(SUBSCRIPTIONS, createSubscription, function(err) { - if (err) { - done(err); - return; - } - - async.times( - 10, - function(_, next) { - publisher.publish(Buffer.from('hello'), next); - }, - function(err) { - if (err) { - done(err); - return; - } - - // Consistency delay for subscriptions to be returned via - // `topic.getSubscriptions`. - setTimeout(done, 2500); - } - ); - }); - }); + before(async () => { + await topic.create(); + await Promise.all(SUBSCRIPTIONS.map(s => s.create())); + for (let i=0; i<10; i++) { + await publisher.publish(Buffer.from('hello')); + } + await new Promise(r => setTimeout(r, 2500)); }); - after(function(done) { + after(() => { // Delete subscriptions - async.each( - SUBSCRIPTIONS, - function(sub, callback) { - sub.delete(callback); - }, - function(err) { - assert.ifError(err); - topic.delete(done); + return Promise.all(SUBSCRIPTIONS.map(async s => { + try { + await s.delete(); + } catch (e) { + await topic.delete(); } - ); + })); }); it('should return error if creating an existing subscription', function(done) { @@ -330,8 +258,6 @@ describe('pubsub', function() { it('should list all topic subscriptions as a stream', function(done) { const subscriptionsEmitted: {}[] = []; - - // tslint:disable-next-line no-any topic .getSubscriptionsStream() .on('error', done) From bb4cffade5dcb4636cceffeda4768e029698c201 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Mon, 12 Nov 2018 15:33:04 -0800 Subject: [PATCH 0252/1115] chore(build): eslint all js files, and use js for all generated files (#331) --- handwritten/pubsub/package.json | 6 +++--- handwritten/pubsub/smoke-test/.eslintrc.yml | 2 +- ...blisher_smoke_test.ts => publisher_smoke_test.js} | 2 ++ handwritten/pubsub/src/.eslintrc.yml | 3 +++ .../pubsub/src/v1/publisher_client_config.json | 4 ---- .../pubsub/src/v1/subscriber_client_config.json | 4 ---- handwritten/pubsub/system-test/.eslintrc.yml | 6 ------ handwritten/pubsub/test/.eslintrc.yml | 2 +- handwritten/pubsub/test/{gapic-v1.ts => gapic-v1.js} | 12 +++++++----- handwritten/pubsub/tsconfig.json | 3 +-- 10 files changed, 18 insertions(+), 26 deletions(-) rename handwritten/pubsub/smoke-test/{publisher_smoke_test.ts => publisher_smoke_test.js} (99%) create mode 100644 handwritten/pubsub/src/.eslintrc.yml delete mode 100644 handwritten/pubsub/system-test/.eslintrc.yml rename handwritten/pubsub/test/{gapic-v1.ts => gapic-v1.js} (99%) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 76db666ec88..00bff49850f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -35,12 +35,12 @@ "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", "test-no-cover": "mocha build/test", "test": "npm run cover", - "lint": "eslint 'samples/*.js' 'samples/**/*.js'", + "lint": "eslint '**/*.js'", "docs": "jsdoc -c .jsdoc.js", - "fix": "eslint --fix 'samples/*.js' 'samples/**/*.js'", + "fix": "eslint --fix '**/*.js'", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", "clean": "gts clean", - "compile": "tsc -p . && cp -r src/v1/ build/src/v1/ && cp -r protos build/", + "compile": "tsc -p . && cp -r src/v1/ build/src/v1/ && cp -r protos build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", "prepare": "npm run compile", "pretest": "npm run compile" }, diff --git a/handwritten/pubsub/smoke-test/.eslintrc.yml b/handwritten/pubsub/smoke-test/.eslintrc.yml index 2e6882e46d2..77ad41e79e9 100644 --- a/handwritten/pubsub/smoke-test/.eslintrc.yml +++ b/handwritten/pubsub/smoke-test/.eslintrc.yml @@ -2,5 +2,5 @@ env: mocha: true rules: - node/no-unpublished-require: off + node/no-missing-require: off no-console: off diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.ts b/handwritten/pubsub/smoke-test/publisher_smoke_test.js similarity index 99% rename from handwritten/pubsub/smoke-test/publisher_smoke_test.ts rename to handwritten/pubsub/smoke-test/publisher_smoke_test.js index be3df5a3c6a..cae73093ef4 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.ts +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +'use strict'; + describe('PublisherSmokeTest', () => { if (!process.env.GCLOUD_PROJECT) { throw new Error('Usage: GCLOUD_PROJECT= node #{$0}'); diff --git a/handwritten/pubsub/src/.eslintrc.yml b/handwritten/pubsub/src/.eslintrc.yml new file mode 100644 index 00000000000..46afd952546 --- /dev/null +++ b/handwritten/pubsub/src/.eslintrc.yml @@ -0,0 +1,3 @@ +--- +rules: + node/no-missing-require: off diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 57083756564..a1e423d073a 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -6,10 +6,6 @@ "DEADLINE_EXCEEDED", "UNAVAILABLE" ], - "http_get": [ - "DEADLINE_EXCEEDED", - "UNAVAILABLE" - ], "non_idempotent": [], "one_plus_delivery": [ "ABORTED", diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 1cac31d4750..83a4be3af8d 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -12,10 +12,6 @@ "RESOURCE_EXHAUSTED", "UNAVAILABLE" ], - "http_get": [ - "DEADLINE_EXCEEDED", - "UNAVAILABLE" - ], "non_idempotent": [] }, "retry_params": { diff --git a/handwritten/pubsub/system-test/.eslintrc.yml b/handwritten/pubsub/system-test/.eslintrc.yml deleted file mode 100644 index 2e6882e46d2..00000000000 --- a/handwritten/pubsub/system-test/.eslintrc.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -env: - mocha: true -rules: - node/no-unpublished-require: off - no-console: off diff --git a/handwritten/pubsub/test/.eslintrc.yml b/handwritten/pubsub/test/.eslintrc.yml index 73f7bbc946f..fb2657e4cc9 100644 --- a/handwritten/pubsub/test/.eslintrc.yml +++ b/handwritten/pubsub/test/.eslintrc.yml @@ -2,4 +2,4 @@ env: mocha: true rules: - node/no-unpublished-require: off + node/no-missing-require: off diff --git a/handwritten/pubsub/test/gapic-v1.ts b/handwritten/pubsub/test/gapic-v1.js similarity index 99% rename from handwritten/pubsub/test/gapic-v1.ts rename to handwritten/pubsub/test/gapic-v1.js index b5db8726821..e5a2b357ece 100644 --- a/handwritten/pubsub/test/gapic-v1.ts +++ b/handwritten/pubsub/test/gapic-v1.js @@ -12,14 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as assert from 'assert'; -import * as through2 from 'through2'; +'use strict'; + +const assert = require('assert'); +const through2 = require('through2'); const pubsubModule = require('../src'); const FAKE_STATUS_CODE = 1; const error = new Error(); -(error as any).code = FAKE_STATUS_CODE; +error.code = FAKE_STATUS_CODE; describe('PublisherClient', () => { describe('createTopic', () => { @@ -1870,7 +1872,7 @@ describe('SubscriberClient', () => { }); }); -function mockSimpleGrpcMethod(expectedRequest, response?, error?) { +function mockSimpleGrpcMethod(expectedRequest, response, error) { return function(actualRequest, options, callback) { assert.deepStrictEqual(actualRequest, expectedRequest); if (error) { @@ -1883,7 +1885,7 @@ function mockSimpleGrpcMethod(expectedRequest, response?, error?) { }; } -function mockBidiStreamingGrpcMethod(expectedRequest, response, error?) { +function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { return () => { const mockStream = through2.obj((chunk, enc, callback) => { assert.deepStrictEqual(chunk, expectedRequest); diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index 628b6455f15..5dc9ad65f2c 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -8,7 +8,6 @@ "include": [ "src/*.ts", "test/*.ts", - "system-test/*.ts", - "smoke-test/*.ts" + "system-test/*.ts" ] } From bde5dd177c69bc8acacae76c2ddee1b8452901bf Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 12 Nov 2018 15:54:45 -0800 Subject: [PATCH 0253/1115] chore: update eslintignore config (#332) --- handwritten/pubsub/.eslintignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index f08b0fd1c65..2f642cb6044 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -1,4 +1,3 @@ -node_modules/* -samples/node_modules/* +**/node_modules src/**/doc/* build/ From 1f7a72e451e852e78a4e69c8d5102d531111fe1f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 13 Nov 2018 08:12:38 -0800 Subject: [PATCH 0254/1115] chore(deps): update dependency gts to ^0.9.0 (#334) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 00bff49850f..7ae6f2e6ee0 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -79,7 +79,7 @@ "eslint-config-prettier": "^3.0.0", "eslint-plugin-node": "^8.0.0", "eslint-plugin-prettier": "^3.0.0", - "gts": "^0.8.0", + "gts": "^0.9.0", "ink-docstrap": "^1.3.2", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", From 75988b202a2a79d490c4f25d73ded02d17c4a2a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 13 Nov 2018 08:31:22 -0800 Subject: [PATCH 0255/1115] fix(deps): update dependency google-gax to ^0.22.0 (#335) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7ae6f2e6ee0..fb5178fbaf4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auth-library": "^2.0.0", - "google-gax": "^0.20.0", + "google-gax": "^0.22.0", "is": "^3.0.1", "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", From 7970c730f2f26fa5f96c64407d0ce4c66a6fbfcb Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Wed, 14 Nov 2018 09:43:01 -0800 Subject: [PATCH 0256/1115] feat: release @google-cloud/pubsub v0.21.0 (#333) * Release v0.21.0 * Update CHANGELOG.md --- handwritten/pubsub/CHANGELOG.md | 82 +++++++++++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index a10fb17eb22..a861e47de6c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,88 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.21.0 + +11-12-2018 17:25 PST + +### Implementation Changes + +**BREAKING CHANGE** +`@google-cloud/pubsub` now uses ES6 import/export syntax since v0.21.0. + +Before: +```javascript +const pubsub = require('@google-cloud/pubsub')(); +// OR +const PubSub = require('@google-cloud/pubsub'); +const pubsub = new PubSub(); +``` +Now: +```javascript +const {PubSub} = require('@google-cloud/pubsub'); +const pubsub = new PubSub(); +``` + +- refactor: use Object.assign where possible ([#324](https://github.com/googleapis/nodejs-pubsub/pull/324)) +- fix(subscription): promisify Subscription#close ([#282](https://github.com/googleapis/nodejs-pubsub/pull/282)) +- fix: maxBytes batching sending empty messages ([#281](https://github.com/googleapis/nodejs-pubsub/pull/281)) +- (New) Synchronous Pull with Lease Management ([#272](https://github.com/googleapis/nodejs-pubsub/pull/272)) +- Switch to let/const ([#254](https://github.com/googleapis/nodejs-pubsub/pull/254)) + +#### Road to TypeScript +- refactor(ts): introduce a round of types ([#319](https://github.com/googleapis/nodejs-pubsub/pull/319)) +- refactor(ts): enable noImplicitThis ([#316](https://github.com/googleapis/nodejs-pubsub/pull/316)) +- refactor(ts): convert to typescript ([#310](https://github.com/googleapis/nodejs-pubsub/pull/310)) + +### New Features +- feat: add expiration policy ([#287](https://github.com/googleapis/nodejs-pubsub/pull/287)) + +### Dependencies +- chore(deps): update dependency eslint-plugin-prettier to v3 ([#274](https://github.com/googleapis/nodejs-pubsub/pull/274)) +- fix(deps): update dependency google-proto-files to ^0.17.0 ([#284](https://github.com/googleapis/nodejs-pubsub/pull/284)) +- chore(deps): update dependency sinon to v7 ([#285](https://github.com/googleapis/nodejs-pubsub/pull/285)) +- chore(deps): update dependency eslint-plugin-node to v8 ([#300](https://github.com/googleapis/nodejs-pubsub/pull/300)) +- fix(deps): update dependency through2 to v3 ([#320](https://github.com/googleapis/nodejs-pubsub/pull/320)) +- refactor: drop dependencies on google-proto-files and async ([#329](https://github.com/googleapis/nodejs-pubsub/pull/329)) +- chore(deps): update dependency @google-cloud/nodejs-repo-tools to v3 ([#328](https://github.com/googleapis/nodejs-pubsub/pull/328)) +- chore(deps): update dependency @types/is to v0.0.21 ([#323](https://github.com/googleapis/nodejs-pubsub/pull/323)) +- fix(deps): update dependency google-gax to ^0.20.0 ([#252](https://github.com/googleapis/nodejs-pubsub/pull/252)) + +### Documentation +- fix quickstart tag in v0.20 docs ([#271](https://github.com/googleapis/nodejs-pubsub/pull/271)) + +### Samples +- Pub/Sub Synchronous Pull Example ([#259](https://github.com/googleapis/nodejs-pubsub/pull/259)) +- Update sample topic and subscription names +- Add Pub/Sub ack deadline example ([#315](https://github.com/googleapis/nodejs-pubsub/pull/315)) +- docs(samples): update samples to use async/await ([#305](https://github.com/googleapis/nodejs-pubsub/pull/305)) +- chore: adjust samples timeout ([#283](https://github.com/googleapis/nodejs-pubsub/pull/283)) +- Fix the topic name in the samples ([#262](https://github.com/googleapis/nodejs-pubsub/pull/262)) + +### Internal / Testing Changes +- chore: update eslintignore config ([#332](https://github.com/googleapis/nodejs-pubsub/pull/332)) +- chore(build): eslint all js files, and use js for all generated files ([#331](https://github.com/googleapis/nodejs-pubsub/pull/331)) +- chore: drop contributors from multiple places ([#325](https://github.com/googleapis/nodejs-pubsub/pull/325)) +- chore: use latest npm on Windows ([#322](https://github.com/googleapis/nodejs-pubsub/pull/322)) +- chore: update CircleCI config ([#309](https://github.com/googleapis/nodejs-pubsub/pull/309)) +- chore: include build in eslintignore ([#304](https://github.com/googleapis/nodejs-pubsub/pull/304)) +- chore: update issue templates ([#299](https://github.com/googleapis/nodejs-pubsub/pull/299)) +- chore: remove old issue template ([#297](https://github.com/googleapis/nodejs-pubsub/pull/297)) +- build: run tests on node11 ([#296](https://github.com/googleapis/nodejs-pubsub/pull/296)) +- chores(build): do not collect sponge.xml from windows builds ([#295](https://github.com/googleapis/nodejs-pubsub/pull/295)) +- chores(build): run codecov on continuous builds ([#294](https://github.com/googleapis/nodejs-pubsub/pull/294)) +- chore: update new issue template ([#293](https://github.com/googleapis/nodejs-pubsub/pull/293)) +- build: fix codecov uploading on Kokoro ([#286](https://github.com/googleapis/nodejs-pubsub/pull/286)) +- Update kokoro config ([#275](https://github.com/googleapis/nodejs-pubsub/pull/275)) +- Update Kokoro configs ([#270](https://github.com/googleapis/nodejs-pubsub/pull/270)) +- Update kokoro config ([#269](https://github.com/googleapis/nodejs-pubsub/pull/269)) +- test: remove appveyor config ([#268](https://github.com/googleapis/nodejs-pubsub/pull/268)) +- Update CI config ([#266](https://github.com/googleapis/nodejs-pubsub/pull/266)) +- Run prettier on smoke tests ([#265](https://github.com/googleapis/nodejs-pubsub/pull/265)) +- Fix the linter ([#261](https://github.com/googleapis/nodejs-pubsub/pull/261)) +- Enable prefer-const in the eslint config ([#260](https://github.com/googleapis/nodejs-pubsub/pull/260)) +- Enable no-var in eslint ([#257](https://github.com/googleapis/nodejs-pubsub/pull/257)) + ## v0.20.1 ### Documentation diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index fb5178fbaf4..03ac93818d3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.20.1", + "version": "0.21.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 84d649c8eaf9fe35bad88f59f15369a2247a9645 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 14 Nov 2018 21:20:45 -0800 Subject: [PATCH 0257/1115] fix: include protos in the package (#336) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 03ac93818d3..69f4f50cf24 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -10,7 +10,7 @@ "repository": "googleapis/nodejs-pubsub", "main": "./build/src/index.js", "files": [ - "protos", + "build/protos", "build/src", "AUTHORS", "CONTRIBUTORS", From e47af42fe9feee0a44431042732dce1d1c8b5386 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 14 Nov 2018 21:28:57 -0800 Subject: [PATCH 0258/1115] Release v0.21.1 (#337) --- handwritten/pubsub/CHANGELOG.md | 5 +++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index a861e47de6c..7243970d469 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,11 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.21.1 + +### Bug fixes +- fix: include protos in the package ([#336](https://github.com/googleapis/nodejs-pubsub/pull/336)) + ## v0.21.0 11-12-2018 17:25 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 69f4f50cf24..731242aea22 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.21.0", + "version": "0.21.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From ff52f3c63661cba834032a519b3f000e0f7c39ce Mon Sep 17 00:00:00 2001 From: Matthew Gabeler-Lee Date: Mon, 19 Nov 2018 11:27:06 -0500 Subject: [PATCH 0259/1115] feat: Add optional delay when calling nack() (#255) (#256) --- handwritten/pubsub/src/connection-pool.ts | 4 +- handwritten/pubsub/src/subscriber.ts | 36 +++++++++++---- handwritten/pubsub/test/connection-pool.ts | 12 +++++ handwritten/pubsub/test/subscriber.ts | 53 ++++++++++++++++++++-- 4 files changed, 92 insertions(+), 13 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.ts b/handwritten/pubsub/src/connection-pool.ts index a8bfa986a19..0c52321f689 100644 --- a/handwritten/pubsub/src/connection-pool.ts +++ b/handwritten/pubsub/src/connection-pool.ts @@ -301,8 +301,8 @@ export class ConnectionPool extends EventEmitter { ack: () => { this.subscription.ack_(message); }, - nack: () => { - this.subscription.nack_(message); + nack: (delay?: number) => { + this.subscription.nack_(message, delay); } } return message; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index a195fd86a61..ec1e7b7edd8 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -237,10 +237,13 @@ export class Subscriber extends EventEmitter { } const acks = this.inventory_.ack; const nacks = this.inventory_.nack; + if (!acks.length && !nacks.length) { return Promise.resolve(); } + const requests: Promise[] = []; + if (acks.length) { requests.push( this.acknowledge_(acks).then(() => { @@ -248,13 +251,27 @@ export class Subscriber extends EventEmitter { }) ); } + if (nacks.length) { - requests.push( - this.modifyAckDeadline_(nacks, 0).then(() => { - this.inventory_.nack = []; - }) - ); + const modAcks = nacks.reduce((table, [ackId, deadline]) => { + if (!table[deadline]) { + table[deadline] = []; + } + + table[deadline].push(ackId); + return table; + }, {}); + + const modAckRequests = Object.keys(modAcks).map(deadline => + this.modifyAckDeadline_(modAcks[deadline], Number(deadline))); + + requests.push.apply(requests, modAckRequests); + + Promise.all(modAckRequests).then(() => { + this.inventory_.nack = []; + }); } + return Promise.all(requests); } /*! @@ -371,16 +388,19 @@ export class Subscriber extends EventEmitter { * @private * * @param {object} message - The message object. + * @param {number} [delay=0] - Number of seconds before the message may be redelivered */ - nack_(message) { + nack_(message, delay = 0) { const breakLease = this.breakLease_.bind(this, message); + if (this.isConnected_()) { - this.modifyAckDeadline_(message.ackId, 0, message.connectionId).then( + this.modifyAckDeadline_(message.ackId, delay, message.connectionId).then( breakLease ); return; } - this.inventory_.nack.push(message.ackId); + + this.inventory_.nack.push([message.ackId, delay]); this.setFlushTimeout_().then(breakLease); } /*! diff --git a/handwritten/pubsub/test/connection-pool.ts b/handwritten/pubsub/test/connection-pool.ts index a6df93fa69c..3b25ac76238 100644 --- a/handwritten/pubsub/test/connection-pool.ts +++ b/handwritten/pubsub/test/connection-pool.ts @@ -867,6 +867,18 @@ describe('ConnectionPool', function() { message.nack(); }); + + it('should create a nack method accepting a delay argument', function(done) { + const delay = Math.random(); + + SUBSCRIPTION.nack_ = function(message_, delay_) { + assert.strictEqual(message_, message); + assert.strictEqual(delay_, delay); + done(); + }; + + message.nack(delay); + }); }); describe('getAndEmitChannelState', function() { diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index c0441bc50f5..35b6cc96c70 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -650,10 +650,12 @@ describe('Subscriber', function() { }); it('should send any pending nacks', function() { - const fakeAckIds = (subscriber.inventory_.nack = ['ghi', 'jkl']); + const fakeAckIds = ['ghi', 'jkl']; + + subscriber.inventory_.nack = fakeAckIds.map(ackId => [ackId, 0]); subscriber.modifyAckDeadline_ = function(ackIds, deadline) { - assert.strictEqual(ackIds, fakeAckIds); + assert.deepStrictEqual(ackIds, fakeAckIds); assert.strictEqual(deadline, 0); return Promise.resolve(); }; @@ -662,6 +664,22 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.inventory_.nack.length, 0); }); }); + + it('should send any pending delayed nacks', function() { + const fakeAckIds = ['ghi', 'jkl']; + + subscriber.inventory_.nack = fakeAckIds.map(ackId => [ackId, 1]); + + subscriber.modifyAckDeadline_ = function(ackIds, deadline) { + assert.deepStrictEqual(ackIds, fakeAckIds); + assert.strictEqual(deadline, 1); + return Promise.resolve(); + }; + + return subscriber.flushQueues_().then(function() { + assert.strictEqual(subscriber.inventory_.nack.length, 0); + }); + }); }); describe('isConnected_', function() { @@ -1045,6 +1063,18 @@ describe('Subscriber', function() { subscriber.nack_(MESSAGE); }); + + it('should use the delay if passed', function(done) { + subscriber.modifyAckDeadline_ = function(ackId, deadline, connId) { + assert.strictEqual(ackId, MESSAGE.ackId); + assert.strictEqual(deadline, 1); + assert.strictEqual(connId, MESSAGE.connectionId); + setImmediate(done); + return Promise.resolve(); + }; + + subscriber.nack_(MESSAGE, 1); + }); }); describe('without connection', function() { @@ -1056,7 +1086,10 @@ describe('Subscriber', function() { it('should queue the message to be nacked if no conn', function(done) { subscriber.setFlushTimeout_ = function() { - assert(subscriber.inventory_.nack.indexOf(MESSAGE.ackId) > -1); + assert.deepStrictEqual( + subscriber.inventory_.nack, + [[MESSAGE.ackId, 0]] + ); setImmediate(done); return Promise.resolve(); }; @@ -1072,6 +1105,20 @@ describe('Subscriber', function() { subscriber.nack_(MESSAGE); }); + + it('should use the delay if passed when queueing', function(done) { + subscriber.setFlushTimeout_ = function() { + assert( + subscriber.inventory_.nack.findIndex(element => { + return element[0] === MESSAGE.ackId && element[1] === 1; + }) > -1 + ); + setImmediate(done); + return Promise.resolve(); + }; + + subscriber.nack_(MESSAGE, 1); + }); }); }); From bc688d496def2309f6a3ed035175826eaa2c0d53 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Mon, 19 Nov 2018 09:20:32 -0800 Subject: [PATCH 0260/1115] chore: add a synth.metadata --- handwritten/pubsub/synth.metadata | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 handwritten/pubsub/synth.metadata diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata new file mode 100644 index 00000000000..f26e69af884 --- /dev/null +++ b/handwritten/pubsub/synth.metadata @@ -0,0 +1,27 @@ +{ + "sources": [ + { + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "5a57f0c13a358b2b15452bf2d67453774a5f6d4f", + "internalRef": "221837528" + } + }, + { + "git": { + "name": "googleapis-private", + "remote": "https://github.com/googleapis/googleapis-private.git", + "sha": "6aa8e1a447bb8d0367150356a28cb4d3f2332641", + "internalRef": "221340946" + } + }, + { + "generator": { + "name": "artman", + "version": "0.16.0", + "dockerImage": "googleapis/artman@sha256:90f9d15e9bad675aeecd586725bce48f5667ffe7d5fc4d1e96d51ff34304815b" + } + } + ] +} \ No newline at end of file From 01d904e4dc5146971c17466f808c5ac19bf4f4ff Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Mon, 19 Nov 2018 15:17:33 -0800 Subject: [PATCH 0261/1115] chore: ts-ignoring some stuff in tests (#343) * chore: ts-ignoring some stuff in tests * use optional parameters to noop stub * use any instead of ts-ignore --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/test/connection-pool.ts | 7 ++++++- handwritten/pubsub/test/subscription.ts | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 731242aea22..3662f1d6690 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -71,7 +71,7 @@ "@types/is": "0.0.21", "@types/mocha": "^5.2.5", "@types/proxyquire": "^1.3.28", - "@types/sinon": "^5.0.5", + "@types/sinon": "^5.0.6", "@types/through2": "^2.0.34", "@types/uuid": "^3.4.4", "codecov": "^3.0.0", diff --git a/handwritten/pubsub/test/connection-pool.ts b/handwritten/pubsub/test/connection-pool.ts index 3b25ac76238..e68cd936b21 100644 --- a/handwritten/pubsub/test/connection-pool.ts +++ b/handwritten/pubsub/test/connection-pool.ts @@ -22,6 +22,7 @@ import * as proxyquire from 'proxyquire'; import * as uuid from 'uuid'; import * as pjy from '@google-cloud/projectify'; import * as sinon from 'sinon'; +import { SinonStub } from 'sinon'; let noopOverride: Function|null = null; const fakeUtil = { @@ -164,7 +165,11 @@ describe('ConnectionPool', function() { describe('initialization', function() { it('should initialize internally used properties', function() { - sandbox.stub(ConnectionPool.prototype, 'open').returns(undefined); + // tslint:disable-next-line:no-any + (sandbox as any) + .stub(ConnectionPool.prototype, 'open') + .returns(undefined); + const pool = new ConnectionPool(SUBSCRIPTION); assert.strictEqual(pool.subscription, SUBSCRIPTION); assert.strictEqual(pool.pubsub, SUBSCRIPTION.pubsub); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 529665ea453..80764469ea4 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -337,7 +337,7 @@ describe('Subscription', function() { }); it('should optionally accept a callback', function(done) { - sandbox.stub(util, 'noop').callsFake((err, resp) => { + sandbox.stub(util, 'noop').callsFake((err?, resp?) => { assert.ifError(err); assert.strictEqual(resp, apiResponse); done(); From b35b42ebb4d986df8310181c857222ff89fb4a02 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 20 Nov 2018 11:21:14 -0500 Subject: [PATCH 0262/1115] fix: Pin @types/sinon to last compatible version (#345) * fix: Pin @types/sinon to last compatible version * chore: Add trailing whitespace --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3662f1d6690..5d786117b13 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -71,7 +71,7 @@ "@types/is": "0.0.21", "@types/mocha": "^5.2.5", "@types/proxyquire": "^1.3.28", - "@types/sinon": "^5.0.6", + "@types/sinon": "5.0.5", "@types/through2": "^2.0.34", "@types/uuid": "^3.4.4", "codecov": "^3.0.0", From 89d11ebefe0fd57c95b11e974ea4470e4ca5a314 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Wed, 21 Nov 2018 11:26:04 -0800 Subject: [PATCH 0263/1115] refactor(ts): enable noImplicitAny on src/iam.ts (#348) refactor(ts): enable noImplicitAny on src/iam.ts --- handwritten/pubsub/src/iam.ts | 178 ++++++++++++++++------- handwritten/pubsub/system-test/pubsub.ts | 4 +- 2 files changed, 124 insertions(+), 58 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 0047acdc881..6d440b26066 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -20,8 +20,92 @@ import * as arrify from 'arrify'; import {promisifyAll} from '@google-cloud/promisify'; +import * as r from 'request'; import * as is from 'is'; import { PubSub } from '.'; +import { CallOptions } from 'google-gax'; + +/** + * @callback GetPolicyCallback + * @param {?Error} err Request error, if any. + * @param {object} acl The policy. + * @param {object} apiResponse The full API response. + */ +export interface GetPolicyCallback { + (err?: Error|null, acl?: Policy, apiResponse?: r.Response): void; +} + +/** + * @callback SetPolicyCallback + * @param {?Error} err Request error, if any. + * @param {object} acl The policy. + * @param {object} apiResponse The full API response. + */ +export interface SetPolicyCallback { + (err?: Error|null, acl?: Policy, apiResponse?: r.Response): void; +} + +/** + * @typedef {array} SetPolicyResponse + * @property {object} 0 The policy. + * @property {object} 1 The full API response. + */ +export type SetPolicyResponse = [Policy, r.Response]; + +/** + * @typedef {array} GetPolicyResponse + * @property {object} 0 The policy. + * @property {object} 1 The full API response. + */ +export type GetPolicyResponse = [Policy, r.Response]; + +/** + * @typedef {array} TestIamPermissionsResponse + * @property {object[]} 0 A subset of permissions that the caller is allowed. + * @property {object} 1 The full API response. + */ +export type TestIamPermissionsResponse = [object[], r.Response]; + +/** + * @callback TestIamPermissionsCallback + * @param {?Error} err Request error, if any. + * @param {object[]} permissions A subset of permissions that the caller is allowed. + * @param {object} apiResponse The full API response. + */ +export interface TestIamPermissionsCallback { + (err?: Error|null, permissions?: object|null, apiResponse?: r.Response): void; +} + +/** + * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy#Expr + */ +export interface Expr { + expression: string; + title: string; + description: string; + location: string; +} + +/** + * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy#Binding + */ +export interface Binding { + role: string; + members: string[]; + condition?: Expr; +} + +/** + * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy + */ +export interface Policy { + /** + * @deprecated + */ + version?: number; + etag?: string; + bindings: Binding[]; +} /** * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) @@ -66,6 +150,7 @@ export class IAM { pubsub: PubSub; request: typeof PubSub.prototype.request; id: string; + constructor(pubsub: PubSub, id: string) { if (pubsub.Promise) { this.Promise = pubsub.Promise; @@ -74,17 +159,7 @@ export class IAM { this.request = pubsub.request.bind(pubsub); this.id = id; } - /** - * @typedef {array} GetPolicyResponse - * @property {object} 0 The policy. - * @property {object} 1 The full API response. - */ - /** - * @callback GetPolicyCallback - * @param {?Error} err Request error, if any. - * @param {object} acl The policy. - * @param {object} apiResponse The full API response. - */ + /** * Get the IAM policy * @@ -115,14 +190,17 @@ export class IAM { * const apiResponse = data[1]; * }); */ - getPolicy(gaxOpts, callback?) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = null; - } + getPolicy(gaxOpts?: CallOptions): Promise; + getPolicy(callback: GetPolicyCallback): void; + getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; + getPolicy(gaxOptsOrCallback?: CallOptions|GetPolicyCallback, callback?: GetPolicyCallback): Promise|void { + let gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const reqOpts = { resource: this.id, }; + this.request( { client: 'SubscriberClient', @@ -130,20 +208,10 @@ export class IAM { reqOpts: reqOpts, gaxOpts: gaxOpts, }, - callback + callback! ); } - /** - * @typedef {array} SetPolicyResponse - * @property {object} 0 The policy. - * @property {object} 1 The full API response. - */ - /** - * @callback SetPolicyCallback - * @param {?Error} err Request error, if any. - * @param {object} acl The policy. - * @param {object} apiResponse The full API response. - */ + /** * Set the IAM policy * @@ -160,7 +228,7 @@ export class IAM { * * @see [Topics: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/setIamPolicy} * @see [Subscriptions: setIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/setIamPolicy} - * @see [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy} + * @see [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy} * * @example * const {PubSub} = require('@google-cloud/pubsub'); @@ -190,18 +258,22 @@ export class IAM { * const apiResponse = data[1]; * }); */ - setPolicy(policy, gaxOpts, callback?) { - if (!is.object(policy)) { + setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise; + setPolicy(policy: Policy, gaxOpts: CallOptions, callback: SetPolicyCallback): void; + setPolicy(policy: Policy, callback: SetPolicyCallback): void; + setPolicy(policy: Policy, gaxOptsOrCallback?: CallOptions|SetPolicyCallback, callback?: SetPolicyCallback): Promise|void { + if (!(typeof policy === 'object')) { throw new Error('A policy object is required.'); } - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = null; - } + + let gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const reqOpts = { resource: this.id, policy, }; + this.request( { client: 'SubscriberClient', @@ -209,20 +281,10 @@ export class IAM { reqOpts: reqOpts, gaxOpts: gaxOpts, }, - callback + callback! ); } - /** - * @typedef {array} TestIamPermissionsResponse - * @property {object[]} 0 A subset of permissions that the caller is allowed. - * @property {object} 1 The full API response. - */ - /** - * @callback TestIamPermissionsCallback - * @param {?Error} err Request error, if any. - * @param {object[]} permissions A subset of permissions that the caller is allowed. - * @param {object} apiResponse The full API response. - */ + /** * Test a set of permissions for a resource. * @@ -283,18 +345,22 @@ export class IAM { * const apiResponse = data[1]; * }); */ - testPermissions(permissions: string|string[], gaxOpts, callback?) { - if (!is.array(permissions) && !is.string(permissions)) { + testPermissions(permissions: string|string[], gaxOpts?: CallOptions): Promise; + testPermissions(permissions: string|string[], gaxOpts: CallOptions, callback: TestIamPermissionsCallback): void; + testPermissions(permissions: string|string[], callback: TestIamPermissionsCallback): void; + testPermissions(permissions: string|string[], gaxOptsOrCallback?: CallOptions|TestIamPermissionsCallback, callback?: TestIamPermissionsCallback): Promise|void { + if (!Array.isArray(permissions) && !(typeof permissions === 'string')) { throw new Error('Permissions are required.'); } - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = null; - } + + let gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const reqOpts = { resource: this.id, permissions: arrify(permissions), }; + this.request( { client: 'SubscriberClient', @@ -304,15 +370,15 @@ export class IAM { }, function(err, resp) { if (err) { - callback(err, null, resp); + callback!(err, null, resp); return; } const availablePermissions = arrify(resp.permissions); const permissionHash = (permissions as string[]).reduce(function(acc, permission) { acc[permission] = availablePermissions.indexOf(permission) > -1; return acc; - }, {}); - callback(null, permissionHash, resp); + }, {} as {[key: string]: boolean}); + callback!(null, permissionHash, resp); } ); } diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 29869bd4869..0859b9c136a 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -480,8 +480,8 @@ describe('pubsub', function() { topic.iam.getPolicy(function(err, policy) { assert.ifError(err); - assert.deepStrictEqual(policy.bindings, []); - assert.strictEqual(policy.version, 0); + assert.deepStrictEqual(policy!.bindings, []); + assert.strictEqual(policy!.version, 0); done(); }); From 98a8126245cf54bfb03cafa79cb641475fee25df Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 00:58:57 +0530 Subject: [PATCH 0264/1115] refactor(ts): added ts style fix for src/histogram.ts (#354) refactor(ts): added ts style fix for src/histogram.ts --- handwritten/pubsub/src/histogram.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/src/histogram.ts b/handwritten/pubsub/src/histogram.ts index 6e406005ed5..8aaaef6ff10 100644 --- a/handwritten/pubsub/src/histogram.ts +++ b/handwritten/pubsub/src/histogram.ts @@ -33,12 +33,11 @@ export class Histogram { length: number; constructor(options?: HistogramOptions) { this.options = Object.assign( - { - min: 10000, - max: 600000, - }, - options - ); + { + min: 10000, + max: 600000, + }, + options); this.data = new Map(); this.length = 0; } From da8265ce3b3837676752009e50b4934acfb1205f Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 01:29:18 +0530 Subject: [PATCH 0265/1115] refactor(ts): added ts style fix for src/connection-pool.ts (#353) --- handwritten/pubsub/src/connection-pool.ts | 137 +++++++++++----------- 1 file changed, 66 insertions(+), 71 deletions(-) diff --git a/handwritten/pubsub/src/connection-pool.ts b/handwritten/pubsub/src/connection-pool.ts index 0c52321f689..012a908b8ad 100644 --- a/handwritten/pubsub/src/connection-pool.ts +++ b/handwritten/pubsub/src/connection-pool.ts @@ -21,11 +21,11 @@ import {EventEmitter} from 'events'; import * as through from 'through2'; import * as uuid from 'uuid'; import * as util from './util'; -import { Subscription } from './subscription'; -import { PubSub } from '.'; -import { Duplex } from 'stream'; -import { StatusObject } from 'grpc'; -import { Subscriber } from './subscriber'; +import {Subscription} from './subscription'; +import {PubSub} from '.'; +import {Duplex} from 'stream'; +import {StatusObject} from 'grpc'; +import {Subscriber} from './subscriber'; const CHANNEL_READY_EVENT = 'channel.ready'; const CHANNEL_ERROR_EVENT = 'channel.error'; @@ -42,17 +42,21 @@ const MAX_TIMEOUT = 300000; * codes to retry streams */ const RETRY_CODES = [ - 0, // ok - 1, // canceled - 2, // unknown - 4, // deadline exceeded - 8, // resource exhausted - 10, // aborted - 13, // internal error - 14, // unavailable - 15, // dataloss + 0, // ok + 1, // canceled + 2, // unknown + 4, // deadline exceeded + 8, // resource exhausted + 10, // aborted + 13, // internal error + 14, // unavailable + 15, // dataloss ]; +class ConnectionError extends Error { + code?: string; +} + export interface ConnectionPoolSettings { maxConnections: number; ackDeadline: number; @@ -120,7 +124,8 @@ export class ConnectionPool extends EventEmitter { acquire(id?: string): Promise; acquire(id: string, callback: ConnectionCallback): void; acquire(callback: ConnectionCallback): void; - acquire(idOrCallback?: string|ConnectionCallback, cb?: ConnectionCallback): void|Promise { + acquire(idOrCallback?: string|ConnectionCallback, cb?: ConnectionCallback): + void|Promise { let id = typeof idOrCallback === 'string' ? idOrCallback : null; const callback = typeof idOrCallback === 'function' ? idOrCallback : cb!; @@ -160,26 +165,25 @@ export class ConnectionPool extends EventEmitter { this.isOpen = false; this.isGettingChannelState = false; this.removeAllListeners('newListener') - .removeAllListeners(CHANNEL_READY_EVENT) - .removeAllListeners(CHANNEL_ERROR_EVENT); + .removeAllListeners(CHANNEL_READY_EVENT) + .removeAllListeners(CHANNEL_ERROR_EVENT); this.failedConnectionAttempts = 0; this.noConnectionsTime = 0; each( - connections, - (connection, onEndCallback) => { - connection.end(err => { - connection.cancel(); - onEndCallback(err); + connections, + (connection, onEndCallback) => { + connection.end(err => { + connection.cancel(); + onEndCallback(err); + }); + }, + err => { + if (this.client) { + this.client.close(); + this.client = null; + } + callback(err); }); - }, - err => { - if (this.client) { - this.client.close(); - this.client = null; - } - callback(err); - } - ); } /*! * Creates a connection. This is async but instead of providing a callback @@ -194,14 +198,12 @@ export class ConnectionPool extends EventEmitter { return; } const requestStream = client.streamingPull(); - const readStream = requestStream.pipe( - through.obj((chunk, enc, next) => { - chunk.receivedMessages.forEach(message => { - readStream.push(message); - }); - next(); - }) - ); + const readStream = requestStream.pipe(through.obj((chunk, enc, next) => { + chunk.receivedMessages.forEach(message => { + readStream.push(message); + }); + next(); + })); const connection = duplexify(requestStream, readStream, { objectMode: true, }); @@ -248,29 +250,23 @@ export class ConnectionPool extends EventEmitter { if (this.shouldReconnect(status)) { this.queueConnection(); } else if (this.isOpen && !this.connections.size) { - const error = new Error(status.details); - (error as any).code = status.code; + const error = new ConnectionError(status.details); + error.code = status.code; this.emit('error', error); } }; - this.once(CHANNEL_ERROR_EVENT, onChannelError).once( - CHANNEL_READY_EVENT, - onChannelReady - ); - requestStream.on('status', status => - setImmediate(onConnectionStatus, status) - ); - connection - .on('error', onConnectionError) - .on('data', onConnectionData) - .write({ - subscription: replaceProjectIdToken( - this.subscription.name, - this.pubsub.projectId - ), - streamAckDeadlineSeconds: this.settings.ackDeadline / 1000, - }); + this.once(CHANNEL_ERROR_EVENT, onChannelError) + .once(CHANNEL_READY_EVENT, onChannelReady); + requestStream.on( + 'status', status => setImmediate(onConnectionStatus, status)); + connection.on('error', onConnectionError) + .on('data', onConnectionData) + .write({ + subscription: replaceProjectIdToken( + this.subscription.name, this.pubsub.projectId), + streamAckDeadlineSeconds: this.settings.ackDeadline / 1000, + }); this.connections.set(id, connection); }); } @@ -284,14 +280,14 @@ export class ConnectionPool extends EventEmitter { */ createMessage(connectionId, resp) { const pt = resp.message.publishTime; - const milliseconds = parseInt(pt.nanos, 10) / 1e6; + const milliseconds = Number(pt.nanos) / 1e6; const originalDataLength = resp.message.data.length; const message = { - connectionId: connectionId, + connectionId, ackId: resp.ackId, id: resp.message.messageId, attributes: resp.message.attributes, - publishTime: new Date(parseInt(pt.seconds, 10) * 1000 + milliseconds), + publishTime: new Date(Number(pt.seconds) * 1000 + milliseconds), received: Date.now(), data: resp.message.data, // using get here to prevent user from overwriting data @@ -304,7 +300,7 @@ export class ConnectionPool extends EventEmitter { nack: (delay?: number) => { this.subscription.nack_(message, delay); } - } + }; return message; } /*! @@ -340,8 +336,8 @@ export class ConnectionPool extends EventEmitter { }); } /*! - * Gets the Subscriber client. We need to bypass GAX until they allow deadlines - * to be optional. + * Gets the Subscriber client. We need to bypass GAX until they allow + * deadlines to be optional. * * @private * @param {function} callback The callback function. @@ -415,9 +411,8 @@ export class ConnectionPool extends EventEmitter { queueConnection() { let delay = 0; if (this.failedConnectionAttempts > 0) { - delay = - Math.pow(2, this.failedConnectionAttempts) * 1000 + - Math.floor(Math.random() * 1000); + delay = Math.pow(2, this.failedConnectionAttempts) * 1000 + + Math.floor(Math.random() * 1000); } const createConnection = () => { setImmediate(() => { @@ -429,7 +424,8 @@ export class ConnectionPool extends EventEmitter { this.queue.push(timeoutHandle); } /*! - * Calls resume on each connection, allowing `message` events to fire off again. + * Calls resume on each connection, allowing `message` events to fire off + * again. * * @private */ @@ -466,9 +462,8 @@ export class ConnectionPool extends EventEmitter { if (RETRY_CODES.indexOf(status.code) === -1) { return false; } - const exceededRetryLimit = - this.noConnectionsTime && - Date.now() - this.noConnectionsTime > MAX_TIMEOUT; + const exceededRetryLimit = this.noConnectionsTime && + Date.now() - this.noConnectionsTime > MAX_TIMEOUT; if (exceededRetryLimit) { return false; } From 61f930a28bc3029482ec98a2279dacfe528cbd30 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:26:37 +0530 Subject: [PATCH 0266/1115] refactor(ts): added ts style fix for test/index.ts (#368) --- handwritten/pubsub/test/index.ts | 574 ++++++++++++++++--------------- 1 file changed, 290 insertions(+), 284 deletions(-) diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 287dda82436..af7db144e41 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -14,20 +14,21 @@ * limitations under the License. */ +import * as pjy from '@google-cloud/projectify'; +import * as promisify from '@google-cloud/promisify'; import * as arrify from 'arrify'; import * as assert from 'assert'; import * as gax from 'google-gax'; import * as proxyquire from 'proxyquire'; -import * as util from '../src/util'; -import * as pjy from '@google-cloud/projectify'; -import * as promisify from '@google-cloud/promisify'; + import * as subby from '../src/subscription'; +import * as util from '../src/util'; const PKG = require('../../package.json'); const fakeCreds = {}; const fakeGoogleGax = { - GrpcClient: class extends gax.GrpcClient { + GrpcClient: class extends gax.GrpcClient{ constructor(opts) { super(opts); this.grpc = { @@ -41,17 +42,18 @@ const fakeGoogleGax = { }, }; -const SubscriptionCached = subby.Subscription; -let SubscriptionOverride; +const subscriptionCached = subby.Subscription; +let subscriptionOverride; function Subscription(a, b, c) { - const OverrideFn = SubscriptionOverride || SubscriptionCached; - return new OverrideFn(a, b, c); + const overrideFn = subscriptionOverride || subscriptionCached; + return new overrideFn(a, b, c); } let promisified = false; const fakePromisify = Object.assign({}, promisify, { - promisifyAll: function(Class, options) { + // tslint:disable-next-line variable-name + promisifyAll(Class, options) { if (Class.name !== 'PubSub') { return; } @@ -88,7 +90,8 @@ class FakeTopic { let extended = false; const fakePaginator = { - extend: function(Class, methods) { + // tslint:disable-next-line variable-name + extend(Class, methods) { if (Class.name !== 'PubSub') { return; } @@ -103,7 +106,7 @@ const fakePaginator = { extended = true; }, - streamify: function(methodName) { + streamify(methodName) { return methodName; }, }; @@ -114,6 +117,7 @@ function fakeGoogleAuth() { } const v1Override = {}; +// tslint:disable-next-line no-any let v1ClientOverrides: any = {}; function defineOverridableClient(clientName) { @@ -121,7 +125,7 @@ function defineOverridableClient(clientName) { DefaultClient.scopes = []; Object.defineProperty(v1Override, clientName, { - get: function() { + get() { return v1ClientOverrides[clientName] || DefaultClient; }, }); @@ -131,7 +135,8 @@ defineOverridableClient('FakeClient'); defineOverridableClient('PublisherClient'); defineOverridableClient('SubscriberClient'); -describe('PubSub', function() { +describe('PubSub', () => { + // tslint:disable-next-line variable-name let PubSub; const PROJECT_ID = 'test-project'; let pubsub; @@ -142,61 +147,61 @@ describe('PubSub', function() { const PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; - before(function() { + before(() => { delete process.env.PUBSUB_EMULATOR_HOST; PubSub = proxyquire('../src', { - '@google-cloud/paginator': { - paginator: fakePaginator, - }, - '@google-cloud/promisify': fakePromisify, - '@google-cloud/projectify': { - replaceProjectIdToken: fakePjy, - }, - 'google-auth-library': { - GoogleAuth: fakeGoogleAuth, - }, - 'google-gax': fakeGoogleGax, - './snapshot': {Snapshot: FakeSnapshot}, - './subscription': {Subscription: Subscription}, - './topic': {Topic: FakeTopic}, - './v1': v1Override, - }).PubSub; + '@google-cloud/paginator': { + paginator: fakePaginator, + }, + '@google-cloud/promisify': fakePromisify, + '@google-cloud/projectify': { + replaceProjectIdToken: fakePjy, + }, + 'google-auth-library': { + GoogleAuth: fakeGoogleAuth, + }, + 'google-gax': fakeGoogleGax, + './snapshot': {Snapshot: FakeSnapshot}, + './subscription': {Subscription}, + './topic': {Topic: FakeTopic}, + './v1': v1Override, + }).PubSub; }); - after(function() { + after(() => { if (PUBSUB_EMULATOR_HOST) { process.env.PUBSUB_EMULATOR_HOST = PUBSUB_EMULATOR_HOST; } }); - beforeEach(function() { + beforeEach(() => { v1ClientOverrides = {}; googleAuthOverride = null; - SubscriptionOverride = null; + subscriptionOverride = null; pubsub = new PubSub(OPTIONS); pubsub.projectId = PROJECT_ID; }); - describe('instantiation', function() { - it('should extend the correct methods', function() { - assert(extended); // See `fakePaginator.extend` + describe('instantiation', () => { + it('should extend the correct methods', () => { + assert(extended); // See `fakePaginator.extend` }); - it('should streamify the correct methods', function() { + it('should streamify the correct methods', () => { assert.strictEqual(pubsub.getSnapshotsStream, 'getSnapshots'); assert.strictEqual(pubsub.getSubscriptionsStream, 'getSubscriptions'); assert.strictEqual(pubsub.getTopicsStream, 'getTopics'); }); - it('should promisify all the things', function() { + it('should promisify all the things', () => { assert(promisified); }); - it('should return an instance', function() { + it('should return an instance', () => { assert(new PubSub() instanceof PubSub); }); - it('should combine all required scopes', function() { + it('should combine all required scopes', () => { v1ClientOverrides.SubscriberClient = {}; v1ClientOverrides.SubscriberClient.scopes = ['a', 'b', 'c']; @@ -207,44 +212,43 @@ describe('PubSub', function() { assert.deepStrictEqual(pubsub.options.scopes, ['a', 'b', 'c', 'd', 'e']); }); - it('should attempt to determine the service path and port', function() { + it('should attempt to determine the service path and port', () => { const determineBaseUrl_ = PubSub.prototype.determineBaseUrl_; let called = false; - PubSub.prototype.determineBaseUrl_ = function() { + PubSub.prototype.determineBaseUrl_ = () => { PubSub.prototype.determineBaseUrl_ = determineBaseUrl_; called = true; }; + // tslint:disable-next-line no-unused-expression new PubSub({}); assert(called); }); - it('should initialize the API object', function() { + it('should initialize the API object', () => { assert.deepStrictEqual(pubsub.api, {}); }); - it('should cache a local google-auth-library instance', function() { + it('should cache a local google-auth-library instance', () => { const fakeGoogleAuthInstance = {}; const options = { a: 'b', c: 'd', }; - googleAuthOverride = function(options_) { + googleAuthOverride = options_ => { assert.deepStrictEqual( - options_, - Object.assign( - { - 'grpc.max_receive_message_length': 20000001, - 'grpc.keepalive_time_ms': 300000, - libName: 'gccl', - libVersion: PKG.version, - scopes: [], - }, - options - ) - ); + options_, + Object.assign( + { + 'grpc.max_receive_message_length': 20000001, + 'grpc.keepalive_time_ms': 300000, + libName: 'gccl', + libVersion: PKG.version, + scopes: [], + }, + options)); return fakeGoogleAuthInstance; }; @@ -252,41 +256,39 @@ describe('PubSub', function() { assert.strictEqual(pubsub.auth, fakeGoogleAuthInstance); }); - it('should localize the options provided', function() { + it('should localize the options provided', () => { assert.deepStrictEqual( - pubsub.options, - Object.assign( - { - 'grpc.max_receive_message_length': 20000001, - 'grpc.keepalive_time_ms': 300000, - libName: 'gccl', - libVersion: PKG.version, - scopes: [], - }, - OPTIONS - ) - ); + pubsub.options, + Object.assign( + { + 'grpc.max_receive_message_length': 20000001, + 'grpc.keepalive_time_ms': 300000, + libName: 'gccl', + libVersion: PKG.version, + scopes: [], + }, + OPTIONS)); }); - it('should set the projectId', function() { + it('should set the projectId', () => { assert.strictEqual(pubsub.projectId, PROJECT_ID); }); - it('should default the projectId to the token', function() { + it('should default the projectId to the token', () => { const pubsub = new PubSub({}); assert.strictEqual(pubsub.projectId, '{{projectId}}'); }); - it('should set isEmulator to false by default', function() { + it('should set isEmulator to false by default', () => { assert.strictEqual(pubsub.isEmulator, false); }); - it('should localize a Promise override', function() { + it('should localize a Promise override', () => { assert.strictEqual(pubsub.Promise, OPTIONS.promise); }); }); - describe('createSubscription', function() { + describe('createSubscription', () => { const TOPIC_NAME = 'topic'; const TOPIC = Object.assign(new FakeTopic(), { name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, @@ -301,46 +303,47 @@ describe('PubSub', function() { name: 'subscription-name', }; - beforeEach(function() { - (Subscription as any).formatMetadata_ = function(metadata) { + beforeEach(() => { + // tslint:disable-next-line no-any + (Subscription as any).formatMetadata_ = metadata => { return Object.assign({}, metadata); }; }); - it('should throw if no Topic is provided', function() { - assert.throws(function() { + it('should throw if no Topic is provided', () => { + assert.throws(() => { pubsub.createSubscription(); }, /A Topic is required for a new subscription\./); }); - it('should throw if no subscription name is provided', function() { - assert.throws(function() { + it('should throw if no subscription name is provided', () => { + assert.throws(() => { pubsub.createSubscription(TOPIC_NAME); }, /A subscription name is required./); }); - it('should not require configuration options', function(done) { - pubsub.request = function(config, callback) { + it('should not require configuration options', done => { + pubsub.request = (config, callback) => { callback(null, apiResponse); }; pubsub.createSubscription(TOPIC, SUB_NAME, done); }); - it('should allow undefined/optional configuration options', function(done) { - pubsub.request = function(config, callback) { + it('should allow undefined/optional configuration options', done => { + pubsub.request = (config, callback) => { callback(null, apiResponse); }; pubsub.createSubscription(TOPIC, SUB_NAME, undefined, done); }); - it('should create a Subscription', function(done) { + it('should create a Subscription', done => { const opts = {a: 'b', c: 'd'}; pubsub.request = util.noop; - pubsub.subscription = function(subName, options) { + pubsub.subscription = (subName, options) => { assert.strictEqual(subName, SUB_NAME); assert.deepStrictEqual(options, opts); setImmediate(done); @@ -350,10 +353,10 @@ describe('PubSub', function() { pubsub.createSubscription(TOPIC, SUB_NAME, opts, assert.ifError); }); - it('should create a Topic object from a string', function(done) { + it('should create a Topic object from a string', done => { pubsub.request = util.noop; - pubsub.topic = function(topicName) { + pubsub.topic = topicName => { assert.strictEqual(topicName, TOPIC_NAME); setImmediate(done); return TOPIC; @@ -362,24 +365,24 @@ describe('PubSub', function() { pubsub.createSubscription(TOPIC_NAME, SUB_NAME, assert.ifError); }); - it('should send correct request', function(done) { + it('should send correct request', done => { const options = { gaxOpts: {}, }; - pubsub.topic = function(topicName) { + pubsub.topic = topicName => { return { name: topicName, }; }; - pubsub.subscription = function(subName) { + pubsub.subscription = subName => { return { name: subName, }; }; - pubsub.request = function(config) { + pubsub.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSubscription'); assert.strictEqual(config.reqOpts.topic, TOPIC.name); @@ -391,33 +394,32 @@ describe('PubSub', function() { pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); }); - it('should pass options to the api request', function(done) { + it('should pass options to the api request', done => { const options = { retainAckedMessages: true, pushEndpoint: 'https://domain/push', }; const expectedBody = Object.assign( - { - topic: TOPIC.name, - name: SUB_NAME, - }, - options - ); + { + topic: TOPIC.name, + name: SUB_NAME, + }, + options); - pubsub.topic = function() { + pubsub.topic = () => { return { name: TOPIC_NAME, }; }; - pubsub.subscription = function() { + pubsub.subscription = () => { return { name: SUB_NAME, }; }; - pubsub.request = function(config) { + pubsub.request = config => { assert.notStrictEqual(config.reqOpts, options); assert.deepStrictEqual(config.reqOpts, expectedBody); done(); @@ -426,7 +428,7 @@ describe('PubSub', function() { pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); }); - it('should discard flow control options', function(done) { + it('should discard flow control options', done => { const options = { flowControl: {}, }; @@ -436,19 +438,19 @@ describe('PubSub', function() { name: SUB_NAME, }; - pubsub.topic = function() { + pubsub.topic = () => { return { name: TOPIC_NAME, }; }; - pubsub.subscription = function() { + pubsub.subscription = () => { return { name: SUB_NAME, }; }; - pubsub.request = function(config) { + pubsub.request = config => { assert.notStrictEqual(config.reqOpts, options); assert.deepStrictEqual(config.reqOpts, expectedBody); done(); @@ -457,18 +459,19 @@ describe('PubSub', function() { pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); }); - it('should format the metadata', function(done) { + it('should format the metadata', done => { const fakeMetadata = {}; const formatted = { a: 'a', }; - (Subscription as any).formatMetadata_ = function(metadata) { + // tslint:disable-next-line no-any + (Subscription as any).formatMetadata_ = metadata => { assert.strictEqual(metadata, fakeMetadata); return formatted; }; - pubsub.request = function(config) { + pubsub.request = config => { assert.strictEqual(config.reqOpts, formatted); done(); }; @@ -476,18 +479,18 @@ describe('PubSub', function() { pubsub.createSubscription(TOPIC, SUB_NAME, fakeMetadata, assert.ifError); }); - describe('error', function() { + describe('error', () => { const error = new Error('Error.'); const apiResponse = {name: SUB_NAME}; - beforeEach(function() { - pubsub.request = function(config, callback) { + beforeEach(() => { + pubsub.request = (config, callback) => { callback(error, apiResponse); }; }); - it('should return error & API response to the callback', function(done) { - pubsub.request = function(config, callback) { + it('should return error & API response to the callback', done => { + pubsub.request = (config, callback) => { callback(error, apiResponse); }; @@ -502,23 +505,23 @@ describe('PubSub', function() { }); }); - describe('success', function() { + describe('success', () => { const apiResponse = {name: SUB_NAME}; - beforeEach(function() { - pubsub.request = function(config, callback) { + beforeEach(() => { + pubsub.request = (config, callback) => { callback(null, apiResponse); }; }); - it('should return Subscription & resp to the callback', function(done) { + it('should return Subscription & resp to the callback', done => { const subscription = {}; - pubsub.subscription = function() { + pubsub.subscription = () => { return subscription; }; - pubsub.request = function(config, callback) { + pubsub.request = (config, callback) => { callback(null, apiResponse); }; @@ -534,13 +537,13 @@ describe('PubSub', function() { }); }); - describe('createTopic', function() { - it('should make the correct API request', function(done) { + describe('createTopic', () => { + it('should make the correct API request', done => { const topicName = 'new-topic-name'; const formattedName = 'formatted-name'; const gaxOpts = {}; - pubsub.topic = function(name) { + pubsub.topic = name => { assert.strictEqual(name, topicName); return { @@ -548,7 +551,7 @@ describe('PubSub', function() { }; }; - pubsub.request = function(config) { + pubsub.request = config => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'createTopic'); assert.deepStrictEqual(config.reqOpts, {name: formattedName}); @@ -556,21 +559,21 @@ describe('PubSub', function() { done(); }; - pubsub.createTopic(topicName, gaxOpts, function() {}); + pubsub.createTopic(topicName, gaxOpts, () => {}); }); - describe('error', function() { + describe('error', () => { const error = new Error('Error.'); const apiResponse = {}; - beforeEach(function() { - pubsub.request = function(config, callback) { + beforeEach(() => { + pubsub.request = (config, callback) => { callback(error, apiResponse); }; }); - it('should return an error & API response', function(done) { - pubsub.createTopic('new-topic', function(err, topic, apiResponse_) { + it('should return an error & API response', done => { + pubsub.createTopic('new-topic', (err, topic, apiResponse_) => { assert.strictEqual(err, error); assert.strictEqual(topic, null); assert.strictEqual(apiResponse_, apiResponse); @@ -579,33 +582,33 @@ describe('PubSub', function() { }); }); - describe('success', function() { + describe('success', () => { const apiResponse = {}; - beforeEach(function() { - pubsub.request = function(config, callback) { + beforeEach(() => { + pubsub.request = (config, callback) => { callback(null, apiResponse); }; }); - it('should return a Topic object', function(done) { + it('should return a Topic object', done => { const topicName = 'new-topic'; const topicInstance = {}; - pubsub.topic = function(name) { + pubsub.topic = name => { assert.strictEqual(name, topicName); return topicInstance; }; - pubsub.createTopic(topicName, function(err, topic) { + pubsub.createTopic(topicName, (err, topic) => { assert.ifError(err); assert.strictEqual(topic, topicInstance); done(); }); }); - it('should pass apiResponse to callback', function(done) { - pubsub.createTopic('new-topic', function(err, topic, apiResponse_) { + it('should pass apiResponse to callback', done => { + pubsub.createTopic('new-topic', (err, topic, apiResponse_) => { assert.ifError(err); assert.strictEqual(apiResponse_, apiResponse); done(); @@ -614,23 +617,23 @@ describe('PubSub', function() { }); }); - describe('determineBaseUrl_', function() { + describe('determineBaseUrl_', () => { function setHost(host) { process.env.PUBSUB_EMULATOR_HOST = host; } - beforeEach(function() { + beforeEach(() => { delete process.env.PUBSUB_EMULATOR_HOST; }); - it('should do nothing if correct options are not set', function() { + it('should do nothing if correct options are not set', () => { pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, undefined); assert.strictEqual(pubsub.options.port, undefined); }); - it('should use the apiEndpoint option', function() { + it('should use the apiEndpoint option', () => { const defaultBaseUrl_ = 'defaulturl'; const testingUrl = 'localhost:8085'; @@ -644,7 +647,7 @@ describe('PubSub', function() { assert.strictEqual(pubsub.isEmulator, true); }); - it('should remove slashes from the baseUrl', function() { + it('should remove slashes from the baseUrl', () => { setHost('localhost:8080/'); pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); @@ -656,25 +659,25 @@ describe('PubSub', function() { assert.strictEqual(pubsub.options.port, '8081'); }); - it('should set the port to undefined if not set', function() { + it('should set the port to undefined if not set', () => { setHost('localhost'); pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, undefined); }); - describe('with PUBSUB_EMULATOR_HOST environment variable', function() { + describe('with PUBSUB_EMULATOR_HOST environment variable', () => { const PUBSUB_EMULATOR_HOST = 'localhost:9090'; - beforeEach(function() { + beforeEach(() => { setHost(PUBSUB_EMULATOR_HOST); }); - after(function() { + after(() => { delete process.env.PUBSUB_EMULATOR_HOST; }); - it('should use the PUBSUB_EMULATOR_HOST env var', function() { + it('should use the PUBSUB_EMULATOR_HOST env var', () => { pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, '9090'); @@ -683,25 +686,25 @@ describe('PubSub', function() { }); }); - describe('getSnapshots', function() { + describe('getSnapshots', () => { const SNAPSHOT_NAME = 'fake-snapshot'; const apiResponse = {snapshots: [{name: SNAPSHOT_NAME}]}; - beforeEach(function() { - pubsub.request = function(config, callback) { + beforeEach(() => { + pubsub.request = (config, callback) => { callback(null, apiResponse.snapshots, {}, apiResponse); }; }); - it('should accept a query and a callback', function(done) { + it('should accept a query and a callback', done => { pubsub.getSnapshots({}, done); }); - it('should accept just a callback', function(done) { + it('should accept just a callback', done => { pubsub.getSnapshots(done); }); - it('should build the right request', function(done) { + it('should build the right request', done => { const options = { a: 'b', c: 'd', @@ -716,16 +719,15 @@ describe('PubSub', function() { }); const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; - pubsub.request = function(config) { + pubsub.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'listSnapshots'); assert.deepStrictEqual(config.reqOpts, expectedOptions); @@ -736,15 +738,15 @@ describe('PubSub', function() { pubsub.getSnapshots(options, assert.ifError); }); - it('should return Snapshot instances with metadata', function(done) { + it('should return Snapshot instances with metadata', done => { const snapshot = {}; - pubsub.snapshot = function(name) { + pubsub.snapshot = name => { assert.strictEqual(name, SNAPSHOT_NAME); return snapshot; }; - pubsub.getSnapshots(function(err, snapshots) { + pubsub.getSnapshots((err, snapshots) => { assert.ifError(err); assert.strictEqual(snapshots[0], snapshot); assert.strictEqual(snapshots[0].metadata, apiResponse.snapshots[0]); @@ -752,17 +754,17 @@ describe('PubSub', function() { }); }); - it('should pass back all parameters', function(done) { + it('should pass back all parameters', done => { const err_ = new Error('abc'); const snapshots_ = null; const nextQuery_ = {}; const apiResponse_ = {}; - pubsub.request = function(config, callback) { + pubsub.request = (config, callback) => { callback(err_, snapshots_, nextQuery_, apiResponse_); }; - pubsub.getSnapshots(function(err, snapshots, nextQuery, apiResponse) { + pubsub.getSnapshots((err, snapshots, nextQuery, apiResponse) => { assert.strictEqual(err, err_); assert.deepStrictEqual(snapshots, snapshots_); assert.strictEqual(nextQuery, nextQuery_); @@ -772,24 +774,24 @@ describe('PubSub', function() { }); }); - describe('getSubscriptions', function() { + describe('getSubscriptions', () => { const apiResponse = {subscriptions: [{name: 'fake-subscription'}]}; - beforeEach(function() { - pubsub.request = function(config, callback) { + beforeEach(() => { + pubsub.request = (config, callback) => { callback(null, apiResponse.subscriptions, {}, apiResponse); }; }); - it('should accept a query and a callback', function(done) { + it('should accept a query and a callback', done => { pubsub.getSubscriptions({}, done); }); - it('should accept just a callback', function(done) { + it('should accept just a callback', done => { pubsub.getSubscriptions(done); }); - it('should pass the correct arguments to the API', function(done) { + it('should pass the correct arguments to the API', done => { const options = { gaxOpts: { a: 'b', @@ -798,18 +800,17 @@ describe('PubSub', function() { }; const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); const project = 'projects/' + pubsub.projectId; - pubsub.request = function(config) { + pubsub.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'listSubscriptions'); - assert.deepStrictEqual(config.reqOpts, {project: project}); + assert.deepStrictEqual(config.reqOpts, {project}); assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); done(); }; @@ -817,10 +818,10 @@ describe('PubSub', function() { pubsub.getSubscriptions(options, assert.ifError); }); - it('should pass options to API request', function(done) { + it('should pass options to API request', done => { const opts = {pageSize: 10, pageToken: 'abc'}; - pubsub.request = function(config) { + pubsub.request = config => { const reqOpts = config.reqOpts; assert.strictEqual(reqOpts.pageSize, opts.pageSize); assert.strictEqual(reqOpts.pageToken, opts.pageToken); @@ -830,25 +831,25 @@ describe('PubSub', function() { pubsub.getSubscriptions(opts, assert.ifError); }); - it('should return Subscription instances', function(done) { - pubsub.getSubscriptions(function(err, subscriptions) { + it('should return Subscription instances', done => { + pubsub.getSubscriptions((err, subscriptions) => { assert.ifError(err); - assert(subscriptions[0] instanceof SubscriptionCached); + assert(subscriptions[0] instanceof subscriptionCached); done(); }); }); - it('should pass back all params', function(done) { + it('should pass back all params', done => { const err_ = new Error('err'); const subs_ = false; const nextQuery_ = {}; const apiResponse_ = {}; - pubsub.request = function(config, callback) { + pubsub.request = (config, callback) => { callback(err_, subs_, nextQuery_, apiResponse_); }; - pubsub.getSubscriptions(function(err, subs, nextQuery, apiResponse) { + pubsub.getSubscriptions((err, subs, nextQuery, apiResponse) => { assert.strictEqual(err, err_); assert.deepStrictEqual(subs, subs_); assert.strictEqual(nextQuery, nextQuery_); @@ -857,37 +858,37 @@ describe('PubSub', function() { }); }); - describe('with topic', function() { + describe('with topic', () => { const TOPIC_NAME = 'topic-name'; - it('should call topic.getSubscriptions', function(done) { + it('should call topic.getSubscriptions', done => { const topic = new FakeTopic(); const opts = { - topic: topic, + topic, }; - topic.getSubscriptions = function(options, callback) { + topic.getSubscriptions = (options, callback) => { assert.strictEqual(options, opts); - callback(); // the done fn + callback(); // the done fn }; pubsub.getSubscriptions(opts, done); }); - it('should create a topic instance from a name', function(done) { + it('should create a topic instance from a name', done => { const opts = { topic: TOPIC_NAME, }; const fakeTopic = { - getSubscriptions: function(options, callback) { + getSubscriptions(options, callback) { assert.strictEqual(options, opts); - callback(); // the done fn + callback(); // the done fn }, }; - pubsub.topic = function(name) { + pubsub.topic = name => { assert.strictEqual(name, TOPIC_NAME); return fakeTopic; }; @@ -897,25 +898,25 @@ describe('PubSub', function() { }); }); - describe('getTopics', function() { + describe('getTopics', () => { const topicName = 'fake-topic'; const apiResponse = {topics: [{name: topicName}]}; - beforeEach(function() { - pubsub.request = function(config, callback) { + beforeEach(() => { + pubsub.request = (config, callback) => { callback(null, apiResponse.topics, {}, apiResponse); }; }); - it('should accept a query and a callback', function(done) { + it('should accept a query and a callback', done => { pubsub.getTopics({}, done); }); - it('should accept just a callback', function(done) { + it('should accept just a callback', done => { pubsub.getTopics(done); }); - it('should build the right request', function(done) { + it('should build the right request', done => { const options = { a: 'b', c: 'd', @@ -930,16 +931,15 @@ describe('PubSub', function() { }); const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; - pubsub.request = function(config) { + pubsub.request = config => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'listTopics'); assert.deepStrictEqual(config.reqOpts, expectedOptions); @@ -950,15 +950,15 @@ describe('PubSub', function() { pubsub.getTopics(options, assert.ifError); }); - it('should return Topic instances with metadata', function(done) { + it('should return Topic instances with metadata', done => { const topic = {}; - pubsub.topic = function(name) { + pubsub.topic = name => { assert.strictEqual(name, topicName); return topic; }; - pubsub.getTopics(function(err, topics) { + pubsub.getTopics((err, topics) => { assert.ifError(err); assert.strictEqual(topics[0], topic); assert.strictEqual(topics[0].metadata, apiResponse.topics[0]); @@ -966,17 +966,17 @@ describe('PubSub', function() { }); }); - it('should pass back all params', function(done) { + it('should pass back all params', done => { const err_ = new Error('err'); const topics_ = false; const nextQuery_ = {}; const apiResponse_ = {}; - pubsub.request = function(config, callback) { + pubsub.request = (config, callback) => { callback(err_, topics_, nextQuery_, apiResponse_); }; - pubsub.getTopics(function(err, topics, nextQuery, apiResponse) { + pubsub.getTopics((err, topics, nextQuery, apiResponse) => { assert.strictEqual(err, err_); assert.deepStrictEqual(topics, topics_); assert.strictEqual(nextQuery, nextQuery_); @@ -986,7 +986,7 @@ describe('PubSub', function() { }); }); - describe('request', function() { + describe('request', () => { const CONFIG = { client: 'PublisherClient', method: 'fakeMethod', @@ -994,24 +994,24 @@ describe('PubSub', function() { gaxOpts: {b: 'b'}, }; - beforeEach(function() { + beforeEach(() => { delete pubsub.projectId; pubsub.auth = { - getProjectId: function(callback) { + getProjectId(callback) { callback(null, PROJECT_ID); }, }; - pjyOverride = function(reqOpts) { + pjyOverride = reqOpts => { return reqOpts; }; pubsub.config = CONFIG; }); - it('should call getClient_ with the correct config', function(done) { - pubsub.getClient_ = function(config) { + it('should call getClient_ with the correct config', done => { + pubsub.getClient_ = config => { assert.strictEqual(config, CONFIG); done(); }; @@ -1019,33 +1019,34 @@ describe('PubSub', function() { pubsub.request(CONFIG, assert.ifError); }); - it('should return error from getClient_', function(done) { + it('should return error from getClient_', done => { const expectedError = new Error('some error'); - pubsub.getClient_ = function(config, callback) { + pubsub.getClient_ = (config, callback) => { callback(expectedError); }; - pubsub.request(CONFIG, function(err) { + pubsub.request(CONFIG, err => { assert.strictEqual(expectedError, err); done(); }); }); - it('should call client method with correct options', function(done) { + it('should call client method with correct options', done => { const fakeClient = {}; - (fakeClient as any).fakeMethod = function(reqOpts, gaxOpts) { + // tslint:disable-next-line no-any + (fakeClient as any).fakeMethod = (reqOpts, gaxOpts) => { assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); done(); }; - pubsub.getClient_ = function(config, callback) { + pubsub.getClient_ = (config, callback) => { callback(null, fakeClient); }; pubsub.request(CONFIG, assert.ifError); }); - it('should replace the project id token on reqOpts', function(done) { - pjyOverride = function(reqOpts, projectId) { + it('should replace the project id token on reqOpts', done => { + pjyOverride = (reqOpts, projectId) => { assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); done(); @@ -1054,13 +1055,13 @@ describe('PubSub', function() { }); }); - describe('getClient_', function() { + describe('getClient_', () => { const FAKE_CLIENT_INSTANCE = class {}; const CONFIG = { client: 'FakeClient', }; - beforeEach(function() { + beforeEach(() => { pubsub.auth = { getProjectId: util.noop, }; @@ -1068,62 +1069,62 @@ describe('PubSub', function() { v1ClientOverrides.FakeClient = FAKE_CLIENT_INSTANCE; }); - describe('project ID', function() { - beforeEach(function() { + describe('project ID', () => { + beforeEach(() => { delete pubsub.projectId; pubsub.isEmulator = false; }); - it('should get and cache the project ID', function(done) { - pubsub.auth.getProjectId = function(callback) { + it('should get and cache the project ID', done => { + pubsub.auth.getProjectId = callback => { assert.strictEqual(typeof callback, 'function'); callback(null, PROJECT_ID); }; - pubsub.getClient_(CONFIG, function(err) { + pubsub.getClient_(CONFIG, err => { assert.ifError(err); assert.strictEqual(pubsub.projectId, PROJECT_ID); done(); }); }); - it('should get the project ID if placeholder', function(done) { + it('should get the project ID if placeholder', done => { pubsub.projectId = '{{projectId}}'; - pubsub.auth.getProjectId = function() { + pubsub.auth.getProjectId = () => { done(); }; pubsub.getClient_(CONFIG, assert.ifError); }); - it('should return errors to the callback', function(done) { + it('should return errors to the callback', done => { const error = new Error('err'); - pubsub.auth.getProjectId = function(callback) { + pubsub.auth.getProjectId = callback => { callback(error); }; - pubsub.getClient_(CONFIG, function(err) { + pubsub.getClient_(CONFIG, err => { assert.strictEqual(err, error); done(); }); }); - it('should not get the project ID if already known', function() { + it('should not get the project ID if already known', () => { pubsub.projectId = PROJECT_ID; - pubsub.auth.getProjectId = function() { + pubsub.auth.getProjectId = () => { throw new Error('getProjectId should not be called.'); }; pubsub.getClient_(CONFIG, assert.ifError); }); - it('should not get the project ID if inside emulator', function() { + it('should not get the project ID if inside emulator', () => { pubsub.isEmulator = true; - pubsub.auth.getProjectId = function() { + pubsub.auth.getProjectId = () => { throw new Error('getProjectId should not be called.'); }; @@ -1131,21 +1132,22 @@ describe('PubSub', function() { }); }); - it('should cache the client', function(done) { + it('should cache the client', done => { delete pubsub.api.fakeClient; let numTimesFakeClientInstantiated = 0; + // tslint:disable-next-line only-arrow-functions v1ClientOverrides.FakeClient = function() { numTimesFakeClientInstantiated++; return FAKE_CLIENT_INSTANCE; }; - pubsub.getClient_(CONFIG, function(err) { + pubsub.getClient_(CONFIG, err => { assert.ifError(err); assert.strictEqual(pubsub.api.FakeClient, FAKE_CLIENT_INSTANCE); - pubsub.getClient_(CONFIG, function(err) { + pubsub.getClient_(CONFIG, err => { assert.ifError(err); assert.strictEqual(numTimesFakeClientInstantiated, 1); done(); @@ -1153,13 +1155,14 @@ describe('PubSub', function() { }); }); - it('should return the correct client', function(done) { + it('should return the correct client', done => { + // tslint:disable-next-line only-arrow-functions v1ClientOverrides.FakeClient = function(options) { assert.strictEqual(options, pubsub.options); return FAKE_CLIENT_INSTANCE; }; - pubsub.getClient_(CONFIG, function(err, client) { + pubsub.getClient_(CONFIG, (err, client) => { assert.ifError(err); assert.strictEqual(client, FAKE_CLIENT_INSTANCE); done(); @@ -1167,7 +1170,7 @@ describe('PubSub', function() { }); }); - describe('request', function() { + describe('request', () => { const CONFIG = { client: 'SubscriberClient', method: 'fakeMethod', @@ -1179,18 +1182,18 @@ describe('PubSub', function() { [CONFIG.method]: util.noop, }; - beforeEach(function() { - pjyOverride = function(reqOpts) { + beforeEach(() => { + pjyOverride = reqOpts => { return reqOpts; }; - pubsub.getClient_ = function(config, callback) { + pubsub.getClient_ = (config, callback) => { callback(null, FAKE_CLIENT_INSTANCE); }; }); - it('should get the client', function(done) { - pubsub.getClient_ = function(config) { + it('should get the client', done => { + pubsub.getClient_ = config => { assert.strictEqual(config, CONFIG); done(); }; @@ -1198,21 +1201,21 @@ describe('PubSub', function() { pubsub.request(CONFIG, assert.ifError); }); - it('should return error from getting the client', function(done) { + it('should return error from getting the client', done => { const error = new Error('Error.'); - pubsub.getClient_ = function(config, callback) { + pubsub.getClient_ = (config, callback) => { callback(error); }; - pubsub.request(CONFIG, function(err) { + pubsub.request(CONFIG, err => { assert.strictEqual(err, error); done(); }); }); - it('should replace the project id token on reqOpts', function(done) { - pjyOverride = function(reqOpts, projectId) { + it('should replace the project id token on reqOpts', done => { + pjyOverride = (reqOpts, projectId) => { assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); done(); @@ -1221,7 +1224,7 @@ describe('PubSub', function() { pubsub.request(CONFIG, assert.ifError); }); - it('should call the client method correctly', function(done) { + it('should call the client method correctly', done => { const CONFIG = { client: 'FakeClient', method: 'fakeMethod', @@ -1231,19 +1234,19 @@ describe('PubSub', function() { const replacedReqOpts = {}; - pjyOverride = function() { + pjyOverride = () => { return replacedReqOpts; }; const fakeClient = { - fakeMethod: function(reqOpts, gaxOpts, callback) { + fakeMethod(reqOpts, gaxOpts, callback) { assert.strictEqual(reqOpts, replacedReqOpts); assert.strictEqual(gaxOpts, CONFIG.gaxOpts); - callback(); // done() + callback(); // done() }, }; - pubsub.getClient_ = function(config, callback) { + pubsub.getClient_ = (config, callback) => { callback(null, fakeClient); }; @@ -1251,14 +1254,14 @@ describe('PubSub', function() { }); }); - describe('snapshot', function() { - it('should throw if a name is not provided', function() { - assert.throws(function() { + describe('snapshot', () => { + it('should throw if a name is not provided', () => { + assert.throws(() => { pubsub.snapshot(); }, /You must supply a valid name for the snapshot\./); }); - it('should return a Snapshot object', function() { + it('should return a Snapshot object', () => { const SNAPSHOT_NAME = 'new-snapshot'; const snapshot = pubsub.snapshot(SNAPSHOT_NAME); const args = snapshot.calledWith_; @@ -1269,47 +1272,50 @@ describe('PubSub', function() { }); }); - describe('subscription', function() { + describe('subscription', () => { const SUB_NAME = 'new-sub-name'; const CONFIG = {}; - it('should return a Subscription object', function() { - SubscriptionOverride = function() {}; + it('should return a Subscription object', () => { + // tslint:disable-next-line only-arrow-functions + subscriptionOverride = function() {}; const subscription = pubsub.subscription(SUB_NAME, {}); - assert(subscription instanceof SubscriptionOverride); + assert(subscription instanceof subscriptionOverride); }); - it('should pass specified name to the Subscription', function(done) { - SubscriptionOverride = function(pubsub, name) { + it('should pass specified name to the Subscription', done => { + // tslint:disable-next-line only-arrow-functions + subscriptionOverride = function(pubsub, name) { assert.strictEqual(name, SUB_NAME); done(); }; pubsub.subscription(SUB_NAME); }); - it('should honor settings', function(done) { - SubscriptionOverride = function(pubsub, name, options) { + it('should honor settings', done => { + // tslint:disable-next-line only-arrow-functions + subscriptionOverride = function(pubsub, name, options) { assert.strictEqual(options, CONFIG); done(); }; pubsub.subscription(SUB_NAME, CONFIG); }); - it('should throw if a name is not provided', function() { - assert.throws(function() { + it('should throw if a name is not provided', () => { + assert.throws(() => { return pubsub.subscription(); }, /A name must be specified for a subscription\./); }); }); - describe('topic', function() { - it('should throw if a name is not provided', function() { - assert.throws(function() { + describe('topic', () => { + it('should throw if a name is not provided', () => { + assert.throws(() => { pubsub.topic(); }, /A name must be specified for a topic\./); }); - it('should return a Topic object', function() { + it('should return a Topic object', () => { assert(pubsub.topic('new-topic') instanceof FakeTopic); }); }); From be5cbfe4171656f9f2d18bafb13ff4242d8e463a Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:29:47 +0530 Subject: [PATCH 0267/1115] refactor(ts): added ts style fix for test/iam.ts (#366) --- handwritten/pubsub/test/iam.ts | 86 +++++++++++++++++----------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index 9ec69164962..a163848cffd 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -14,21 +14,23 @@ * limitations under the License. */ +import * as promisify from '@google-cloud/promisify'; import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; + import * as util from '../src/util'; -import * as promisify from '@google-cloud/promisify'; let promisified = false; const fakePromisify = Object.assign({}, promisify, { - promisifyAll: function(Class) { + // tslint:disable-next-line variable-name + promisifyAll(Class) { if (Class.name === 'IAM') { promisified = true; } }, }); -describe('IAM', function() { +describe('IAM', () => { let IAM; let iam; @@ -39,30 +41,30 @@ describe('IAM', function() { }; const ID = 'id'; - before(function() { + before(() => { IAM = proxyquire('../src/iam.js', { - '@google-cloud/promisify': fakePromisify, - }).IAM; + '@google-cloud/promisify': fakePromisify, + }).IAM; }); - beforeEach(function() { + beforeEach(() => { iam = new IAM(PUBSUB, ID); }); - describe('initialization', function() { - it('should localize pubsub.Promise', function() { + describe('initialization', () => { + it('should localize pubsub.Promise', () => { assert.strictEqual(iam.Promise, PUBSUB.Promise); }); - it('should localize pubsub', function() { + it('should localize pubsub', () => { assert.strictEqual(iam.pubsub, PUBSUB); }); - it('should localize pubsub#request', function() { - const fakeRequest = function() {}; + it('should localize pubsub#request', () => { + const fakeRequest = () => {}; const fakePubsub = { request: { - bind: function(context) { + bind(context) { assert.strictEqual(context, fakePubsub); return fakeRequest; }, @@ -73,32 +75,32 @@ describe('IAM', function() { assert.strictEqual(iam.request, fakeRequest); }); - it('should localize the ID', function() { + it('should localize the ID', () => { assert.strictEqual(iam.id, ID); }); - it('should promisify all the things', function() { + it('should promisify all the things', () => { assert(promisified); }); }); - describe('getPolicy', function() { - it('should make the correct API request', function(done) { - iam.request = function(config, callback) { + describe('getPolicy', () => { + it('should make the correct API request', done => { + iam.request = (config, callback) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getIamPolicy'); assert.strictEqual(config.reqOpts.resource, iam.id); - callback(); // done() + callback(); // done() }; iam.getPolicy(done); }); - it('should accept gax options', function(done) { + it('should accept gax options', done => { const gaxOpts = {}; - iam.request = function(config) { + iam.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -107,32 +109,32 @@ describe('IAM', function() { }); }); - describe('setPolicy', function() { + describe('setPolicy', () => { const policy = {etag: 'ACAB'}; - it('should throw an error if a policy is not supplied', function() { - assert.throws(function() { + it('should throw an error if a policy is not supplied', () => { + assert.throws(() => { iam.setPolicy(util.noop); }, /A policy object is required\./); }); - it('should make the correct API request', function(done) { - iam.request = function(config, callback) { + it('should make the correct API request', done => { + iam.request = (config, callback) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'setIamPolicy'); assert.strictEqual(config.reqOpts.resource, iam.id); assert.strictEqual(config.reqOpts.policy, policy); - callback(); // done() + callback(); // done() }; iam.setPolicy(policy, done); }); - it('should accept gax options', function(done) { + it('should accept gax options', done => { const gaxOpts = {}; - iam.request = function(config) { + iam.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -141,17 +143,17 @@ describe('IAM', function() { }); }); - describe('testPermissions', function() { - it('should throw an error if permissions are missing', function() { - assert.throws(function() { + describe('testPermissions', () => { + it('should throw an error if permissions are missing', () => { + assert.throws(() => { iam.testPermissions(util.noop); }, /Permissions are required\./); }); - it('should make the correct API request', function(done) { + it('should make the correct API request', done => { const permissions = 'storage.bucket.list'; - iam.request = function(config) { + iam.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'testIamPermissions'); assert.strictEqual(config.reqOpts.resource, iam.id); @@ -163,11 +165,11 @@ describe('IAM', function() { iam.testPermissions(permissions, assert.ifError); }); - it('should accept gax options', function(done) { + it('should accept gax options', done => { const permissions = 'storage.bucket.list'; const gaxOpts = {}; - iam.request = function(config) { + iam.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -175,16 +177,16 @@ describe('IAM', function() { iam.testPermissions(permissions, gaxOpts, assert.ifError); }); - it('should send an error back if the request fails', function(done) { + it('should send an error back if the request fails', done => { const permissions = ['storage.bucket.list']; const error = new Error('Error.'); const apiResponse = {}; - iam.request = function(config, callback) { + iam.request = (config, callback) => { callback(error, apiResponse); }; - iam.testPermissions(permissions, function(err, permissions, apiResp) { + iam.testPermissions(permissions, (err, permissions, apiResp) => { assert.strictEqual(err, error); assert.strictEqual(permissions, null); assert.strictEqual(apiResp, apiResponse); @@ -192,17 +194,17 @@ describe('IAM', function() { }); }); - it('should pass back a hash of permissions the user has', function(done) { + it('should pass back a hash of permissions the user has', done => { const permissions = ['storage.bucket.list', 'storage.bucket.consume']; const apiResponse = { permissions: ['storage.bucket.consume'], }; - iam.request = function(config, callback) { + iam.request = (config, callback) => { callback(null, apiResponse); }; - iam.testPermissions(permissions, function(err, permissions, apiResp) { + iam.testPermissions(permissions, (err, permissions, apiResp) => { assert.ifError(err); assert.deepStrictEqual(permissions, { 'storage.bucket.list': false, From 8ce298ad9621032e61b86eea524e81ba939b19b5 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:49:05 +0530 Subject: [PATCH 0268/1115] refactor(ts): added ts style fix for test/histogram.ts (#365) --- handwritten/pubsub/test/histogram.ts | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/handwritten/pubsub/test/histogram.ts b/handwritten/pubsub/test/histogram.ts index e72ad2f85e0..6ed4571b0fb 100644 --- a/handwritten/pubsub/test/histogram.ts +++ b/handwritten/pubsub/test/histogram.ts @@ -17,53 +17,53 @@ import * as assert from 'assert'; import {Histogram} from '../src/histogram.js'; -describe('Histogram', function() { +describe('Histogram', () => { let histogram; const MIN_VALUE = 10000; const MAX_VALUE = 600000; - beforeEach(function() { + beforeEach(() => { histogram = new Histogram(); }); - describe('initialization', function() { - it('should set default min/max values', function() { + describe('initialization', () => { + it('should set default min/max values', () => { assert.strictEqual(histogram.options.min, 10000); assert.strictEqual(histogram.options.max, 600000); }); - it('should accept user defined min/max values', function() { + it('should accept user defined min/max values', () => { histogram = new Histogram({min: 5, max: 10}); assert.strictEqual(histogram.options.min, 5); assert.strictEqual(histogram.options.max, 10); }); - it('should create a data map', function() { + it('should create a data map', () => { assert(histogram.data instanceof Map); }); - it('should set the initial length to 0', function() { + it('should set the initial length to 0', () => { assert.strictEqual(histogram.length, 0); }); }); - describe('add', function() { - it('should increment a value', function() { + describe('add', () => { + it('should increment a value', () => { histogram.data.set(MIN_VALUE, 1); histogram.add(MIN_VALUE); assert.strictEqual(histogram.data.get(MIN_VALUE), 2); }); - it('should initialize a value if absent', function() { + it('should initialize a value if absent', () => { histogram.add(MIN_VALUE); assert.strictEqual(histogram.data.get(MIN_VALUE), 1); }); - it('should adjust the length for each item added', function() { + it('should adjust the length for each item added', () => { histogram.add(MIN_VALUE); histogram.add(MIN_VALUE); histogram.add(MIN_VALUE * 2); @@ -71,7 +71,7 @@ describe('Histogram', function() { assert.strictEqual(histogram.length, 3); }); - it('should cap the value', function() { + it('should cap the value', () => { const outOfBounds = MAX_VALUE + MIN_VALUE; histogram.add(outOfBounds); @@ -80,7 +80,7 @@ describe('Histogram', function() { assert.strictEqual(histogram.data.get(MAX_VALUE), 1); }); - it('should apply a minimum', function() { + it('should apply a minimum', () => { const outOfBounds = MIN_VALUE - 1000; histogram.add(outOfBounds); @@ -89,7 +89,7 @@ describe('Histogram', function() { assert.strictEqual(histogram.data.get(MIN_VALUE), 1); }); - it('should use seconds level precision', function() { + it('should use seconds level precision', () => { const ms = 303823; const expected = 304000; @@ -100,7 +100,7 @@ describe('Histogram', function() { }); }); - describe('percentile', function() { + describe('percentile', () => { function range(a, b) { const result: number[] = []; @@ -111,8 +111,8 @@ describe('Histogram', function() { return result; } - it('should return the nth percentile', function() { - range(100, 201).forEach(function(value) { + it('should return the nth percentile', () => { + range(100, 201).forEach(value => { histogram.add(value * 1000); }); @@ -122,7 +122,7 @@ describe('Histogram', function() { assert.strictEqual(histogram.percentile(1), 101000); }); - it('should return the min value if unable to determine', function() { + it('should return the min value if unable to determine', () => { assert.strictEqual(histogram.percentile(99), MIN_VALUE); }); }); From b14816ecde719d17882e7941901fe70deb1e6cde Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:49:31 +0530 Subject: [PATCH 0269/1115] refactor(ts): added ts style fix for test/connection-pool.ts (#364) --- handwritten/pubsub/test/connection-pool.ts | 520 +++++++++++---------- 1 file changed, 265 insertions(+), 255 deletions(-) diff --git a/handwritten/pubsub/test/connection-pool.ts b/handwritten/pubsub/test/connection-pool.ts index e68cd936b21..c6a515fa2d4 100644 --- a/handwritten/pubsub/test/connection-pool.ts +++ b/handwritten/pubsub/test/connection-pool.ts @@ -22,7 +22,7 @@ import * as proxyquire from 'proxyquire'; import * as uuid from 'uuid'; import * as pjy from '@google-cloud/projectify'; import * as sinon from 'sinon'; -import { SinonStub } from 'sinon'; +import {SinonStub} from 'sinon'; let noopOverride: Function|null = null; const fakeUtil = { @@ -82,7 +82,8 @@ function fakeDuplexify() { return (duplexifyOverride || duplexify).apply(null, args); } -describe('ConnectionPool', function() { +describe('ConnectionPool', () => { + // tslint:disable-next-line variable-name let ConnectionPool; let pool; let fakeConnection; @@ -93,6 +94,7 @@ describe('ConnectionPool', function() { const FAKE_PUBSUB_OPTIONS = {}; const PROJECT_ID = 'grapce-spacheship-123'; + // tslint:disable-next-line no-any const PUBSUB: any = { auth: { getAuthClient: util.noop, @@ -101,6 +103,7 @@ describe('ConnectionPool', function() { }; const SUB_NAME = 'test-subscription'; + // tslint:disable-next-line no-any const SUBSCRIPTION: any = { name: SUB_NAME, pubsub: PUBSUB, @@ -112,41 +115,41 @@ describe('ConnectionPool', function() { return (pjyOverride || pjy.replaceProjectIdToken).apply(null, arguments); } - before(function() { + before(() => { ConnectionPool = proxyquire('../src/connection-pool', { - '../src/util': fakeUtil, - '@google-cloud/projectify': { - replaceProjectIdToken: fakePjy, - }, - duplexify: fakeDuplexify, - uuid: fakeUuid, - }).ConnectionPool; + '../src/util': fakeUtil, + '@google-cloud/projectify': { + replaceProjectIdToken: fakePjy, + }, + duplexify: fakeDuplexify, + uuid: fakeUuid, + }).ConnectionPool; }); - beforeEach(function() { + beforeEach(() => { sandbox = sinon.createSandbox(); fakeConnection = new FakeConnection(); duplexifyOverride = null; fakeChannel = { - getConnectivityState: function() { + getConnectivityState() { return 2; }, }; fakeClient = { - streamingPull: function() { + streamingPull() { return fakeConnection; }, - getChannel: function() { + getChannel() { return fakeChannel; }, - waitForReady: function() {}, + waitForReady() {}, }; SUBSCRIPTION.request = util.noop; PUBSUB.auth.getAuthClient = util.noop; - PUBSUB.getClient_ = function(config, callback) { + PUBSUB.getClient_ = (config, callback) => { callback(null, fakeClient); }; @@ -155,7 +158,7 @@ describe('ConnectionPool', function() { pool.queue.length = 0; }); - afterEach(function() { + afterEach(() => { if (pool.isOpen) { pool.close(); } @@ -163,12 +166,12 @@ describe('ConnectionPool', function() { sandbox.restore(); }); - describe('initialization', function() { - it('should initialize internally used properties', function() { + describe('initialization', () => { + it('should initialize internally used properties', () => { // tslint:disable-next-line:no-any (sandbox as any) - .stub(ConnectionPool.prototype, 'open') - .returns(undefined); + .stub(ConnectionPool.prototype, 'open') + .returns(undefined); const pool = new ConnectionPool(SUBSCRIPTION); assert.strictEqual(pool.subscription, SUBSCRIPTION); @@ -184,7 +187,7 @@ describe('ConnectionPool', function() { assert.deepStrictEqual(pool.queue, []); }); - it('should respect user specified settings', function() { + it('should respect user specified settings', () => { const options = { maxConnections: 2, ackDeadline: 100, @@ -198,77 +201,78 @@ describe('ConnectionPool', function() { assert.deepStrictEqual(subscription, subscriptionCopy); }); - it('should inherit from EventEmitter', function() { + it('should inherit from EventEmitter', () => { assert(pool instanceof EventEmitter); }); - it('should call open', function(done) { + it('should call open', done => { const open = ConnectionPool.prototype.open; - ConnectionPool.prototype.open = function() { + ConnectionPool.prototype.open = () => { ConnectionPool.prototype.open = open; done(); }; + // tslint:disable-next-line no-unused-expression new ConnectionPool(SUBSCRIPTION); }); }); - describe('acquire', function() { - it('should return an error if the pool is closed', function(done) { + describe('acquire', () => { + it('should return an error if the pool is closed', done => { const expectedErr = 'No connections available to make request.'; pool.isOpen = false; - pool.acquire(function(err) { + pool.acquire(err => { assert(err instanceof Error); assert.strictEqual(err.message, expectedErr); done(); }); }); - it('should return a specified connection', function(done) { + it('should return a specified connection', done => { const id = 'a'; const fakeConnection = new FakeConnection(); pool.connections.set(id, fakeConnection); pool.connections.set('b', new FakeConnection()); - pool.acquire(id, function(err, connection) { + pool.acquire(id, (err, connection) => { assert.ifError(err); assert.strictEqual(connection, fakeConnection); done(); }); }); - it('should return any conn when the specified is missing', function(done) { + it('should return any conn when the specified is missing', done => { const fakeConnection = new FakeConnection(); pool.connections.set('a', fakeConnection); - pool.acquire('b', function(err, connection) { + pool.acquire('b', (err, connection) => { assert.ifError(err); assert.strictEqual(connection, fakeConnection); done(); }); }); - it('should return any connection when id is missing', function(done) { + it('should return any connection when id is missing', done => { const fakeConnection = new FakeConnection(); pool.connections.set('a', fakeConnection); - pool.acquire(function(err, connection) { + pool.acquire((err, connection) => { assert.ifError(err); assert.strictEqual(connection, fakeConnection); done(); }); }); - it('should listen for connected event if no conn is ready', function(done) { + it('should listen for connected event if no conn is ready', done => { const fakeConnection = new FakeConnection(); - pool.acquire(function(err, connection) { + pool.acquire((err, connection) => { assert.ifError(err); assert.strictEqual(connection, fakeConnection); done(); @@ -278,30 +282,30 @@ describe('ConnectionPool', function() { }); }); - describe('close', function() { + describe('close', () => { let _clearTimeout; let _clearInterval; - before(function() { + before(() => { _clearTimeout = global.clearTimeout; _clearInterval = global.clearInterval; }); - beforeEach(function() { + beforeEach(() => { global.clearTimeout = global.clearInterval = util.noop; }); - afterEach(function() { + afterEach(() => { global.clearTimeout = _clearTimeout; global.clearInterval = _clearInterval; }); - it('should stop running the keepAlive task', function(done) { + it('should stop running the keepAlive task', done => { const fakeHandle = 123; pool.keepAliveHandle = fakeHandle; - global.clearInterval = function(handle) { + global.clearInterval = handle => { assert.strictEqual(handle, fakeHandle); done(); }; @@ -309,17 +313,17 @@ describe('ConnectionPool', function() { pool.close(); }); - it('should clear the connections map', function(done) { + it('should clear the connections map', done => { pool.connections.clear = done; pool.close(); }); - it('should clear any timeouts in the queue', function() { + it('should clear any timeouts in the queue', () => { let clearCalls = 0; const fakeHandles = ['a', 'b', 'c', 'd']; - global.clearTimeout = function(handle) { + global.clearTimeout = handle => { assert.strictEqual(handle, fakeHandles[clearCalls++]); }; @@ -330,19 +334,19 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.queue.length, 0); }); - it('should set isOpen to false', function() { + it('should set isOpen to false', () => { pool.close(); assert.strictEqual(pool.isOpen, false); }); - it('should set isGettingChannelState to false', function() { + it('should set isGettingChannelState to false', () => { pool.isGettingChannelState = true; pool.close(); assert.strictEqual(pool.isGettingChannelState, false); }); - it('should reset internally used props', function() { + it('should reset internally used props', () => { pool.failedConnectionAttempts = 100; pool.noConnectionsTime = Date.now(); @@ -352,11 +356,10 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.noConnectionsTime, 0); }); - it('should remove event listeners', function() { - pool - .on('channel.ready', nope) - .on('channel.error', nope) - .on('newListener', nope); + it('should remove event listeners', () => { + pool.on('channel.ready', nope) + .on('channel.error', nope) + .on('newListener', nope); pool.close(); @@ -369,14 +372,14 @@ describe('ConnectionPool', function() { } }); - it('should call cancel on all active connections', function(done) { + it('should call cancel on all active connections', done => { const a = new FakeConnection(); const b = new FakeConnection(); pool.connections.set('a', a); pool.connections.set('b', b); - pool.close(function(err) { + pool.close(err => { assert.ifError(err); assert.strictEqual(a.canceled, true); assert.strictEqual(b.canceled, true); @@ -384,7 +387,7 @@ describe('ConnectionPool', function() { }); }); - it('should call end on all active connections', function() { + it('should call end on all active connections', () => { const a = new FakeConnection(); const b = new FakeConnection(); @@ -397,48 +400,48 @@ describe('ConnectionPool', function() { assert.strictEqual(b.ended, true); }); - it('should close the client', function(done) { + it('should close the client', done => { pool.client = {close: done}; pool.close(); }); - it('should exec a callback when finished closing', function(done) { + it('should exec a callback when finished closing', done => { pool.close(done); }); - it('should use noop when callback is omitted', function(done) { + it('should use noop when callback is omitted', done => { noopOverride = done; pool.close(); }); }); - describe('createConnection', function() { + describe('createConnection', () => { let fakeConnection; let fakeChannel; let fakeClient; let fakeDuplex; - beforeEach(function() { + beforeEach(() => { fakeConnection = new FakeConnection(); fakeChannel = { - getConnectivityState: function() { + getConnectivityState() { return 2; }, }; fakeClient = { - streamingPull: function() { + streamingPull() { return fakeConnection; }, - getChannel: function() { + getChannel() { return fakeChannel; }, }; fakeClient.waitForReady = util.noop; - pool.getClient = function(callback) { + pool.getClient = callback => { pool.pubsub = { projectId: PROJECT_ID, }; @@ -448,19 +451,19 @@ describe('ConnectionPool', function() { fakeDuplex = new FakeConnection(); - duplexifyOverride = function() { + duplexifyOverride = () => { return fakeDuplex; }; }); - it('should emit any errors that occur when getting client', function(done) { + it('should emit any errors that occur when getting client', done => { const error = new Error('err'); - pool.getClient = function(callback) { + pool.getClient = callback => { callback(error); }; - pool.on('error', function(err) { + pool.on('error', err => { assert.strictEqual(err, error); done(); }); @@ -468,12 +471,12 @@ describe('ConnectionPool', function() { pool.createConnection(); }); - describe('channel', function() { + describe('channel', () => { const channelReadyEvent = 'channel.ready'; const channelErrorEvent = 'channel.error'; - describe('error', function() { - it('should remove the channel ready event listener', function() { + describe('error', () => { + it('should remove the channel ready event listener', () => { pool.createConnection(); assert.strictEqual(pool.listenerCount(channelReadyEvent), 1); @@ -481,7 +484,7 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.listenerCount(channelReadyEvent), 0); }); - it('should cancel the connection', function() { + it('should cancel the connection', () => { pool.createConnection(); pool.emit(channelErrorEvent); @@ -489,8 +492,8 @@ describe('ConnectionPool', function() { }); }); - describe('success', function() { - it('should remove the channel error event', function() { + describe('success', () => { + it('should remove the channel error event', () => { pool.createConnection(); assert.strictEqual(pool.listenerCount(channelErrorEvent), 1); @@ -498,14 +501,14 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.listenerCount(channelErrorEvent), 0); }); - it('should set the isConnected flag to true', function() { + it('should set the isConnected flag to true', () => { pool.createConnection(); pool.emit(channelReadyEvent); assert.strictEqual(fakeDuplex.isConnected, true); }); - it('should reset internally used properties', function() { + it('should reset internally used properties', () => { pool.noConnectionsTime = Date.now(); pool.failedConnectionAttempts = 10; @@ -516,8 +519,8 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.failedConnectionAttempts, 0); }); - it('should emit a connected event', function(done) { - pool.on('connected', function(connection) { + it('should emit a connected event', done => { + pool.on('connected', connection => { assert.strictEqual(connection, fakeDuplex); done(); }); @@ -528,43 +531,43 @@ describe('ConnectionPool', function() { }); }); - describe('connection', function() { + describe('connection', () => { const TOKENIZED_SUB_NAME = 'project/p/subscriptions/' + SUB_NAME; let fakeId; - beforeEach(function() { + beforeEach(() => { fakeId = uuid.v4(); - fakeUuid.v4 = function() { + fakeUuid.v4 = () => { return fakeId; }; pjyOverride = null; }); - it('should create a connection', function(done) { + it('should create a connection', done => { const fakeDuplex = new FakeConnection(); - duplexifyOverride = function(writable, readable, options) { + duplexifyOverride = (writable, readable, options) => { assert.strictEqual(writable, fakeConnection); assert.deepStrictEqual(options, {objectMode: true}); return fakeDuplex; }; - pjyOverride = function(subName, projectId) { + pjyOverride = (subName, projectId) => { assert.strictEqual(subName, SUB_NAME); assert.strictEqual(projectId, PROJECT_ID); return TOKENIZED_SUB_NAME; }; - fakeDuplex.write = function(reqOpts) { + fakeDuplex.write = reqOpts => { assert.deepStrictEqual(reqOpts, { subscription: TOKENIZED_SUB_NAME, streamAckDeadlineSeconds: pool.settings.ackDeadline / 1000, }); }; - pool.connections.set = function(id, connection) { + pool.connections.set = (id, connection) => { assert.strictEqual(id, fakeId); assert.strictEqual(connection, fakeDuplex); done(); @@ -573,26 +576,28 @@ describe('ConnectionPool', function() { pool.createConnection(); }); - it('should unpack the recieved messages', function(done) { + it('should unpack the recieved messages', done => { const fakeDuplex = new FakeConnection(); - const pipedMessages: {}[] = []; + const pipedMessages: Array<{}> = []; const fakeResp = { receivedMessages: [{}, {}, {}, {}, null], }; - duplexifyOverride = function(writable, readable) { + duplexifyOverride = (writable, readable) => { readable - .on('data', function(message) { - pipedMessages.push(message); - }) - .on('end', function() { - assert.strictEqual(pipedMessages.length, 4); - pipedMessages.forEach(function(message, i) { - assert.strictEqual(message, fakeResp.receivedMessages[i]); - }); - done(); - }) - .write(fakeResp); + .on('data', + message => { + pipedMessages.push(message); + }) + .on('end', + () => { + assert.strictEqual(pipedMessages.length, 4); + pipedMessages.forEach((message, i) => { + assert.strictEqual(message, fakeResp.receivedMessages[i]); + }); + done(); + }) + .write(fakeResp); return fakeDuplex; }; @@ -600,10 +605,10 @@ describe('ConnectionPool', function() { pool.createConnection(); }); - it('should proxy the cancel method', function() { - const fakeCancel = function() {}; + it('should proxy the cancel method', () => { + const fakeCancel = () => {}; fakeConnection.cancel = { - bind: function(context) { + bind(context) { assert.strictEqual(context, fakeConnection); return fakeCancel; }, @@ -612,17 +617,17 @@ describe('ConnectionPool', function() { assert.strictEqual(fakeDuplex.cancel, fakeCancel); }); - it('should pause the connection if the pool is paused', function(done) { + it('should pause the connection if the pool is paused', done => { fakeDuplex.pause = done; pool.isPaused = true; pool.createConnection(); }); - describe('error events', function() { - it('should emit errors to the pool', function(done) { + describe('error events', () => { + it('should emit errors to the pool', done => { const error = new Error('err'); - pool.on('error', function(err) { + pool.on('error', err => { assert.strictEqual(err, error); done(); }); @@ -632,15 +637,15 @@ describe('ConnectionPool', function() { }); }); - describe('status events', function() { - beforeEach(function() { + describe('status events', () => { + beforeEach(() => { pool.connections.set('a', new FakeConnection()); }); - it('should cancel any error events', function(done) { + it('should cancel any error events', done => { const fakeError = {code: 4}; - pool.on('error', done); // should not fire + pool.on('error', done); // should not fire pool.createConnection(); fakeConnection.emit('status', fakeError); @@ -649,10 +654,10 @@ describe('ConnectionPool', function() { done(); }); - it('should close and delete the connection', function(done) { + it('should close and delete the connection', done => { pool.createConnection(); - pool.connections.delete = function(id) { + pool.connections.delete = id => { assert.strictEqual(id, fakeId); done(); }; @@ -660,20 +665,20 @@ describe('ConnectionPool', function() { fakeConnection.emit('status', {}); }); - it('should increment the failed connection counter', function(done) { + it('should increment the failed connection counter', done => { pool.failedConnectionAttempts = 0; fakeDuplex.isConnected = false; pool.createConnection(); fakeConnection.emit('status', {}); - setImmediate(function() { + setImmediate(() => { assert.strictEqual(pool.failedConnectionAttempts, 1); done(); }); }); - it('should not incr. the failed connection counter', function() { + it('should not incr. the failed connection counter', () => { pool.failedConnectionAttempts = 0; fakeDuplex.isConnected = true; @@ -683,32 +688,32 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.failedConnectionAttempts, 0); }); - it('should capture the date when no conns are found', function(done) { + it('should capture the date when no conns are found', done => { const dateNow = global.Date.now; const fakeDate = Date.now(); - global.Date.now = function() { + global.Date.now = () => { return fakeDate; }; pool.noConnectionsTime = 0; - pool.isConnected = function() { + pool.isConnected = () => { return false; }; pool.createConnection(); fakeConnection.emit('status', {}); - setImmediate(function() { + setImmediate(() => { assert.strictEqual(pool.noConnectionsTime, fakeDate); global.Date.now = dateNow; done(); }); }); - it('should not capture the date when already set', function() { + it('should not capture the date when already set', () => { pool.noConnectionsTime = 123; - pool.isConnected = function() { + pool.isConnected = () => { return false; }; @@ -718,9 +723,9 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.noConnectionsTime, 123); }); - it('should not capture the date if a conn. is found', function() { + it('should not capture the date if a conn. is found', () => { pool.noConnectionsTime = 0; - pool.isConnected = function() { + pool.isConnected = () => { return true; }; @@ -730,10 +735,10 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.noConnectionsTime, 0); }); - it('should queue a connection if status is retryable', function(done) { + it('should queue a connection if status is retryable', done => { const fakeStatus = {}; - pool.shouldReconnect = function(status) { + pool.shouldReconnect = status => { assert.strictEqual(status, fakeStatus); return true; }; @@ -744,20 +749,20 @@ describe('ConnectionPool', function() { fakeConnection.emit('status', fakeStatus); }); - it('should emit error if no pending conn. are found', function(done) { + it('should emit error if no pending conn. are found', done => { const error = { code: 4, details: 'Deadline Exceeded', }; - pool.shouldReconnect = function() { + pool.shouldReconnect = () => { return false; }; // will only emit status errors if pool is empty pool.connections = new Map(); - pool.on('error', function(err) { + pool.on('error', err => { assert.strictEqual(err.code, error.code); assert.strictEqual(err.message, error.details); done(); @@ -768,18 +773,18 @@ describe('ConnectionPool', function() { }); }); - describe('data events', function() { - it('should emit messages', function(done) { + describe('data events', () => { + it('should emit messages', done => { const fakeResp = {}; const fakeMessage = {}; - pool.createMessage = function(id, resp) { + pool.createMessage = (id, resp) => { assert.strictEqual(id, fakeId); assert.strictEqual(resp, fakeResp); return fakeMessage; }; - pool.on('message', function(message) { + pool.on('message', message => { assert.strictEqual(message, fakeMessage); done(); }); @@ -791,7 +796,7 @@ describe('ConnectionPool', function() { }); }); - describe('createMessage', function() { + describe('createMessage', () => { let message; let globalDateNow; @@ -815,29 +820,28 @@ describe('ConnectionPool', function() { }, }; - before(function() { + before(() => { globalDateNow = global.Date.now; - global.Date.now = function() { + global.Date.now = () => { return FAKE_DATE_NOW; }; }); - beforeEach(function() { + beforeEach(() => { message = pool.createMessage(CONNECTION_ID, RESP); }); - after(function() { + after(() => { global.Date.now = globalDateNow; }); - it('should capture the connection id', function() { + it('should capture the connection id', () => { assert.strictEqual(message.connectionId, CONNECTION_ID); }); - it('should capture the message data', function() { - const expectedPublishTime = new Date( - Math.floor(PT.seconds) * 1000 + Math.floor(PT.nanos) / 1e6 - ); + it('should capture the message data', () => { + const expectedPublishTime = + new Date(Math.floor(PT.seconds) * 1000 + Math.floor(PT.nanos) / 1e6); assert.strictEqual(message.ackId, RESP.ackId); assert.strictEqual(message.id, RESP.message.messageId); @@ -847,16 +851,16 @@ describe('ConnectionPool', function() { assert.strictEqual(message.received, FAKE_DATE_NOW); }); - it('should create a read-only message length property', function() { + it('should create a read-only message length property', () => { assert.strictEqual(message.length, RESP.message.data.length); - assert.throws(function() { + assert.throws(() => { message.length = 3; }); }); - it('should create an ack method', function(done) { - SUBSCRIPTION.ack_ = function(message_) { + it('should create an ack method', done => { + SUBSCRIPTION.ack_ = message_ => { assert.strictEqual(message_, message); done(); }; @@ -864,8 +868,8 @@ describe('ConnectionPool', function() { message.ack(); }); - it('should create a nack method', function(done) { - SUBSCRIPTION.nack_ = function(message_) { + it('should create a nack method', done => { + SUBSCRIPTION.nack_ = message_ => { assert.strictEqual(message_, message); done(); }; @@ -873,10 +877,10 @@ describe('ConnectionPool', function() { message.nack(); }); - it('should create a nack method accepting a delay argument', function(done) { + it('should create a nack method accepting a delay argument', done => { const delay = Math.random(); - SUBSCRIPTION.nack_ = function(message_, delay_) { + SUBSCRIPTION.nack_ = (message_, delay_) => { assert.strictEqual(message_, message); assert.strictEqual(delay_, delay); done(); @@ -886,74 +890,76 @@ describe('ConnectionPool', function() { }); }); - describe('getAndEmitChannelState', function() { + describe('getAndEmitChannelState', () => { const channelErrorEvent = 'channel.error'; const channelReadyEvent = 'channel.ready'; const channelReadyState = 2; let fakeChannelState; let dateNow; let fakeTimestamp; + // tslint:disable-next-line no-any const fakeChannel: any = {}; + // tslint:disable-next-line no-any const fakeClient: any = { - getChannel: function() { + getChannel() { return fakeChannel; }, }; - before(function() { + before(() => { dateNow = global.Date.now; }); - beforeEach(function() { - fakeChannel.getConnectivityState = function() { + beforeEach(() => { + fakeChannel.getConnectivityState = () => { return fakeChannelState; }; fakeChannelState = 0; fakeClient.waitForReady = util.noop; - pool.getClient = function(callback) { + pool.getClient = callback => { callback(null, fakeClient); }; - PUBSUB.getClient_ = function(config, callback) { + PUBSUB.getClient_ = (config, callback) => { callback(null, fakeClient); }; fakeTimestamp = dateNow.call(global.Date); pool.noConnectionsTime = 0; - global.Date.now = function() { + global.Date.now = () => { return fakeTimestamp; }; }); - after(function() { + after(() => { global.Date.now = dateNow; }); - it('should set the isGettingChannelState flag to true', function() { + it('should set the isGettingChannelState flag to true', () => { pool.getAndEmitChannelState(); assert.strictEqual(pool.isGettingChannelState, true); }); - it('should emit any client errors', function(done) { + it('should emit any client errors', done => { let channelErrorEmitted = false; - pool.on(channelErrorEvent, function() { + pool.on(channelErrorEvent, () => { channelErrorEmitted = true; }); const fakeError = new Error('nope'); let errorEmitted = false; - pool.on('error', function(err) { + pool.on('error', err => { assert.strictEqual(err, fakeError); errorEmitted = true; }); - pool.getClient = function(callback) { + pool.getClient = callback => { callback(fakeError); assert.strictEqual(pool.isGettingChannelState, false); @@ -966,18 +972,18 @@ describe('ConnectionPool', function() { pool.getAndEmitChannelState(); }); - it('should emit the ready event if the channel is ready', function(done) { - fakeClient.waitForReady = function(deadline, callback) { + it('should emit the ready event if the channel is ready', done => { + fakeClient.waitForReady = (deadline, callback) => { callback(); }; fakeChannelState = channelReadyState; - fakeChannel.getConnectivityState = function(shouldConnect) { + fakeChannel.getConnectivityState = shouldConnect => { assert.strictEqual(shouldConnect, false); return fakeChannelState; }; - pool.on(channelReadyEvent, function() { + pool.on(channelReadyEvent, () => { assert.strictEqual(pool.isGettingChannelState, false); done(); }); @@ -986,10 +992,10 @@ describe('ConnectionPool', function() { fakeClient.waitForReady = util.noop; }); - it('should wait for the channel to be ready', function(done) { + it('should wait for the channel to be ready', done => { const expectedDeadline = fakeTimestamp + 300000; - fakeClient.waitForReady = function(deadline) { + fakeClient.waitForReady = deadline => { assert.strictEqual(deadline, expectedDeadline); done(); }; @@ -997,13 +1003,13 @@ describe('ConnectionPool', function() { pool.getAndEmitChannelState(); }); - it('should factor in the noConnectionsTime property', function(done) { + it('should factor in the noConnectionsTime property', done => { pool.noConnectionsTime = 10; const fakeElapsedTime = fakeTimestamp - pool.noConnectionsTime; const expectedDeadline = fakeTimestamp + (300000 - fakeElapsedTime); - fakeClient.waitForReady = function(deadline) { + fakeClient.waitForReady = deadline => { assert.strictEqual(deadline, expectedDeadline); done(); }; @@ -1011,29 +1017,29 @@ describe('ConnectionPool', function() { pool.getAndEmitChannelState(); }); - it('should emit any waitForReady errors', function(done) { + it('should emit any waitForReady errors', done => { const fakeError = new Error('err'); - pool.on(channelErrorEvent, function(err) { + pool.on(channelErrorEvent, err => { assert.strictEqual(err, fakeError); assert.strictEqual(pool.isGettingChannelState, false); done(); }); - fakeClient.waitForReady = function(deadline, callback) { + fakeClient.waitForReady = (deadline, callback) => { callback(fakeError); }; pool.getAndEmitChannelState(); }); - it('should emit the ready event when ready', function(done) { - pool.on(channelReadyEvent, function() { + it('should emit the ready event when ready', done => { + pool.on(channelReadyEvent, () => { assert.strictEqual(pool.isGettingChannelState, false); done(); }); - fakeClient.waitForReady = function(deadline, callback) { + fakeClient.waitForReady = (deadline, callback) => { callback(null); }; @@ -1041,7 +1047,7 @@ describe('ConnectionPool', function() { }); }); - describe('getClient', function() { + describe('getClient', () => { const fakeCreds = {}; class FakeSubscriber { @@ -1068,17 +1074,17 @@ describe('ConnectionPool', function() { const fakeClient = new FakeSubscriber('fake-address', fakeCreds, {}); - beforeEach(function() { - PUBSUB.getClient_ = function(config, callback) { + beforeEach(() => { + PUBSUB.getClient_ = (config, callback) => { callback(null, fakeClient); }; }); - it('should return the cached client when available', function(done) { - pool.getClient(function(err1, client1) { + it('should return the cached client when available', done => { + pool.getClient((err1, client1) => { assert.ifError(err1); - pool.getClient(function(err2, client2) { + pool.getClient((err2, client2) => { assert.ifError(err2); assert.strictEqual(client1, client2); done(); @@ -1086,8 +1092,8 @@ describe('ConnectionPool', function() { }); }); - it('should create/use grpc credentials', function(done) { - pool.getClient(function(err, client) { + it('should create/use grpc credentials', done => { + pool.getClient((err, client) => { assert.ifError(err); assert(client instanceof FakeSubscriber); assert.strictEqual(client.creds, fakeCreds); @@ -1096,8 +1102,8 @@ describe('ConnectionPool', function() { }); }); - describe('isConnected', function() { - it('should return true when at least one stream is connected', function() { + describe('isConnected', () => { + it('should return true when at least one stream is connected', () => { const connections = (pool.connections = new Map()); connections.set('a', new FakeConnection()); @@ -1112,7 +1118,7 @@ describe('ConnectionPool', function() { assert(pool.isConnected()); }); - it('should return false when there is no connection', function() { + it('should return false when there is no connection', () => { const connections = (pool.connections = new Map()); connections.set('a', new FakeConnection()); @@ -1124,23 +1130,23 @@ describe('ConnectionPool', function() { assert(!pool.isConnected()); }); - it('should return false when the map is empty', function() { + it('should return false when the map is empty', () => { pool.connections = new Map(); assert(!pool.isConnected()); }); }); - describe('open', function() { - beforeEach(function() { + describe('open', () => { + beforeEach(() => { pool.queueConnection = util.noop; clearInterval(pool.keepAliveHandle); }); - it('should make the specified number of connections', function() { + it('should make the specified number of connections', () => { const expectedCount = 5; let connectionCount = 0; - pool.queueConnection = function() { + pool.queueConnection = () => { connectionCount += 1; }; @@ -1150,16 +1156,16 @@ describe('ConnectionPool', function() { assert.strictEqual(expectedCount, connectionCount); }); - it('should set the isOpen flag to true', function() { + it('should set the isOpen flag to true', () => { pool.open(); assert(pool.isOpen); }); - it('should reset internal used props', function() { + it('should reset internal used props', () => { const fakeDate = Date.now(); const dateNow = Date.now; - global.Date.now = function() { + global.Date.now = () => { return fakeDate; }; @@ -1174,36 +1180,36 @@ describe('ConnectionPool', function() { global.Date.now = dateNow; }); - it('should listen for newListener events', function() { + it('should listen for newListener events', () => { pool.removeAllListeners('newListener'); pool.open(); assert.strictEqual(pool.listenerCount('newListener'), 1); }); - describe('newListener callback', function() { - beforeEach(function() { - pool.getAndEmitChannelState = function() { + describe('newListener callback', () => { + beforeEach(() => { + pool.getAndEmitChannelState = () => { throw new Error('Should not be called!'); }; }); - it('should call getAndEmitChannelState', function(done) { + it('should call getAndEmitChannelState', done => { pool.getAndEmitChannelState = done; pool.emit('newListener', 'channel.ready'); }); - it('should do nothing for unknown events', function() { + it('should do nothing for unknown events', () => { pool.emit('newListener', 'channel.error'); }); - it('should do nothing when already getting state', function() { + it('should do nothing when already getting state', () => { pool.isGettingChannelState = true; pool.emit('newListener', 'channel.ready'); }); }); - it('should start a keepAlive task', function(done) { + it('should start a keepAlive task', done => { const _setInterval = global.setInterval; let unreffed = false; const fakeHandle = { @@ -1213,11 +1219,12 @@ describe('ConnectionPool', function() { pool.subscription = {writeToStreams_: false}; pool.sendKeepAlives = done; - (global as any).setInterval = function(fn, interval) { + // tslint:disable-next-line no-any + (global as any).setInterval = (fn, interval) => { global.setInterval = _setInterval; assert.strictEqual(interval, 30000); - fn(); // should call sendKeepAlives aka done + fn(); // should call sendKeepAlives aka done return fakeHandle; }; @@ -1229,13 +1236,13 @@ describe('ConnectionPool', function() { }); }); - describe('pause', function() { - it('should set the isPaused flag to true', function() { + describe('pause', () => { + it('should set the isPaused flag to true', () => { pool.pause(); assert(pool.isPaused); }); - it('should pause all the connections', function() { + it('should pause all the connections', () => { const a = new FakeConnection(); const b = new FakeConnection(); @@ -1249,14 +1256,14 @@ describe('ConnectionPool', function() { }); }); - describe('queueConnection', function() { + describe('queueConnection', () => { const fakeTimeoutHandle = 123; let _setTimeout; let _random; let _open; - before(function() { + before(() => { _setTimeout = global.setTimeout; _random = global.Math.random; @@ -1265,12 +1272,13 @@ describe('ConnectionPool', function() { ConnectionPool.prototype.open = util.noop; }); - beforeEach(function() { - Math.random = function() { + beforeEach(() => { + Math.random = () => { return 1; }; - (global as any).setTimeout = function(cb) { + // tslint:disable-next-line no-any + (global as any).setTimeout = cb => { cb(); return fakeTimeoutHandle; }; @@ -1279,42 +1287,44 @@ describe('ConnectionPool', function() { pool.createConnection = util.noop; }); - after(function() { + after(() => { global.setTimeout = _setTimeout; global.Math.random = _random; ConnectionPool.prototype.open = _open; }); - it('should set a timeout to create the connection', function(done) { + it('should set a timeout to create the connection', done => { pool.createConnection = done; - (global as any).setTimeout = function(cb, delay) { + // tslint:disable-next-line no-any + (global as any).setTimeout = (cb, delay) => { assert.strictEqual(delay, 0); - cb(); // should call the done fn + cb(); // should call the done fn }; pool.queueConnection(); }); - it('should factor in the number of failed requests', function(done) { + it('should factor in the number of failed requests', done => { pool.createConnection = done; pool.failedConnectionAttempts = 3; - (global as any).setTimeout = function(cb, delay) { + // tslint:disable-next-line no-any + (global as any).setTimeout = (cb, delay) => { assert.strictEqual(delay, 9000); - cb(); // should call the done fn + cb(); // should call the done fn }; pool.queueConnection(); }); - it('should capture the timeout handle', function() { + it('should capture the timeout handle', () => { pool.queueConnection(); assert.deepStrictEqual(pool.queue, [fakeTimeoutHandle]); }); - it('should remove the timeout handle once it fires', function(done) { - pool.createConnection = function() { + it('should remove the timeout handle once it fires', done => { + pool.createConnection = () => { setImmediate(() => { assert.strictEqual(pool.queue.length, 0); done(); @@ -1325,13 +1335,13 @@ describe('ConnectionPool', function() { }); }); - describe('resume', function() { - it('should set the isPaused flag to false', function() { + describe('resume', () => { + it('should set the isPaused flag to false', () => { pool.resume(); assert.strictEqual(pool.isPaused, false); }); - it('should resume all the connections', function() { + it('should resume all the connections', () => { const a = new FakeConnection(); const b = new FakeConnection(); @@ -1345,8 +1355,8 @@ describe('ConnectionPool', function() { }); }); - describe('sendKeepAlives', function() { - it('should write an empty message to all the streams', function() { + describe('sendKeepAlives', () => { + it('should write an empty message to all the streams', () => { const a = new FakeConnection(); const b = new FakeConnection(); @@ -1360,36 +1370,36 @@ describe('ConnectionPool', function() { }); }); - describe('shouldReconnect', function() { - it('should not reconnect if the pool is closed', function() { + describe('shouldReconnect', () => { + it('should not reconnect if the pool is closed', () => { pool.isOpen = false; assert.strictEqual(pool.shouldReconnect({}), false); }); - it('should return true for retryable errors', function() { - assert(pool.shouldReconnect({code: 0})); // OK - assert(pool.shouldReconnect({code: 1})); // Canceled - assert(pool.shouldReconnect({code: 2})); // Unknown - assert(pool.shouldReconnect({code: 4})); // DeadlineExceeded - assert(pool.shouldReconnect({code: 8})); // ResourceExhausted - assert(pool.shouldReconnect({code: 10})); // Aborted - assert(pool.shouldReconnect({code: 13})); // Internal - assert(pool.shouldReconnect({code: 14})); // Unavailable - assert(pool.shouldReconnect({code: 15})); // Dataloss + it('should return true for retryable errors', () => { + assert(pool.shouldReconnect({code: 0})); // OK + assert(pool.shouldReconnect({code: 1})); // Canceled + assert(pool.shouldReconnect({code: 2})); // Unknown + assert(pool.shouldReconnect({code: 4})); // DeadlineExceeded + assert(pool.shouldReconnect({code: 8})); // ResourceExhausted + assert(pool.shouldReconnect({code: 10})); // Aborted + assert(pool.shouldReconnect({code: 13})); // Internal + assert(pool.shouldReconnect({code: 14})); // Unavailable + assert(pool.shouldReconnect({code: 15})); // Dataloss }); - it('should return false for non-retryable errors', function() { - assert(!pool.shouldReconnect({code: 3})); // InvalidArgument - assert(!pool.shouldReconnect({code: 5})); // NotFound - assert(!pool.shouldReconnect({code: 6})); // AlreadyExists - assert(!pool.shouldReconnect({code: 7})); // PermissionDenied - assert(!pool.shouldReconnect({code: 9})); // FailedPrecondition - assert(!pool.shouldReconnect({code: 11})); // OutOfRange - assert(!pool.shouldReconnect({code: 12})); // Unimplemented - assert(!pool.shouldReconnect({code: 16})); // Unauthenticated + it('should return false for non-retryable errors', () => { + assert(!pool.shouldReconnect({code: 3})); // InvalidArgument + assert(!pool.shouldReconnect({code: 5})); // NotFound + assert(!pool.shouldReconnect({code: 6})); // AlreadyExists + assert(!pool.shouldReconnect({code: 7})); // PermissionDenied + assert(!pool.shouldReconnect({code: 9})); // FailedPrecondition + assert(!pool.shouldReconnect({code: 11})); // OutOfRange + assert(!pool.shouldReconnect({code: 12})); // Unimplemented + assert(!pool.shouldReconnect({code: 16})); // Unauthenticated }); - it('should not retry if no connection can be made', function() { + it('should not retry if no connection can be made', () => { const fakeStatus = { code: 4, }; @@ -1399,7 +1409,7 @@ describe('ConnectionPool', function() { assert.strictEqual(pool.shouldReconnect(fakeStatus), false); }); - it('should return true if all conditions are met', function() { + it('should return true if all conditions are met', () => { const fakeStatus = { code: 4, }; From 2402b0e8e1c6aac6b5f52061552a0eab1f7ee7cc Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:49:58 +0530 Subject: [PATCH 0270/1115] refactor(ts): added ts style fix for src/util.ts (#362) --- handwritten/pubsub/src/util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/util.ts b/handwritten/pubsub/src/util.ts index 189d0a7a135..dc0e81abe88 100644 --- a/handwritten/pubsub/src/util.ts +++ b/handwritten/pubsub/src/util.ts @@ -14,4 +14,4 @@ * limitations under the License. */ -export function noop() {}; +export function noop() {} From f9da786f654ce2573be93fdef80453392f5a0915 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:50:35 +0530 Subject: [PATCH 0271/1115] refactor(ts): added ts style fix for src/topic.ts (#361) --- handwritten/pubsub/src/topic.ts | 132 ++++++++++++++++---------------- 1 file changed, 67 insertions(+), 65 deletions(-) diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 5eea170dc1e..b4b24de45cb 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -14,15 +14,15 @@ * limitations under the License. */ -import * as util from './util'; -import {promisifyAll} from '@google-cloud/promisify'; import {paginator} from '@google-cloud/paginator'; +import {promisifyAll} from '@google-cloud/promisify'; import * as is from 'is'; +import {Readable} from 'stream'; +import {PubSub} from '.'; import {IAM} from './iam'; import {Publisher} from './publisher'; -import { PubSub } from '.'; -import { Readable } from 'stream'; +import * as util from './util'; /** * A Topic object allows you to interact with a Cloud Pub/Sub topic. @@ -38,6 +38,7 @@ import { Readable } from 'stream'; * const topic = pubsub.topic('my-topic'); */ export class Topic { + // tslint:disable-next-line variable-name Promise?: PromiseConstructor; name: string; parent: PubSub; @@ -45,7 +46,8 @@ export class Topic { request: typeof PubSub.prototype.request; iam: IAM; metadata; - getSubscriptionsStream = paginator.streamify('getSubscriptions') as () => Readable; + getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => + Readable; constructor(pubsub: PubSub, name: string) { if (pubsub.Promise) { this.Promise = pubsub.Promise; @@ -69,17 +71,18 @@ export class Topic { this.parent = this.pubsub = pubsub; this.request = pubsub.request.bind(pubsub); /** - * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) - * allows you to set permissions on individual resources and offers a wider - * range of roles: editor, owner, publisher, subscriber, and viewer. This - * gives you greater flexibility and allows you to set more fine-grained - * access control. + * [IAM (Identity and Access + * Management)](https://cloud.google.com/pubsub/access_control) allows you + * to set permissions on individual resources and offers a wider range of + * roles: editor, owner, publisher, subscriber, and viewer. This gives you + * greater flexibility and allows you to set more fine-grained access + * control. * * *The IAM access control features described in this document are Beta, * including the API methods to get and set IAM policies, and to test IAM * permissions. Cloud Pub/Sub's use of IAM features is not covered by - * any SLA or deprecation policy, and may be subject to backward-incompatible - * changes.* + * any SLA or deprecation policy, and may be subject to + * backward-incompatible changes.* * * @name Topic#iam * @mixes IAM @@ -150,7 +153,8 @@ export class Topic { * * @param {string} name The name of the subscription. * @param {CreateSubscriptionRequest} [options] See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * [Subscription + * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). * @param {CreateSubscriptionCallback} [callback] Callback function. * @returns {Promise} * @@ -217,14 +221,13 @@ export class Topic { topic: this.name, }; this.request( - { - client: 'PublisherClient', - method: 'deleteTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); + { + client: 'PublisherClient', + method: 'deleteTopic', + reqOpts, + gaxOpts, + }, + callback); } /** * @typedef {array} TopicExistsResponse @@ -257,7 +260,7 @@ export class Topic { * }); */ exists(callback) { - this.getMetadata(function(err) { + this.getMetadata(err => { if (!err) { callback(null, true); return; @@ -370,23 +373,23 @@ export class Topic { topic: this.name, }; this.request( - { - client: 'PublisherClient', - method: 'getTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - (err, apiResponse) => { - if (!err) { - this.metadata = apiResponse; - } - callback(err, apiResponse); - } - ); + { + client: 'PublisherClient', + method: 'getTopic', + reqOpts, + gaxOpts, + }, + (err, apiResponse) => { + if (!err) { + this.metadata = apiResponse; + } + callback(err, apiResponse); + }); } /** - * Get a list of the subscriptions registered to this topic. You may optionally - * provide a query object as the first argument to customize the response. + * Get a list of the subscriptions registered to this topic. You may + * optionally provide a query object as the first argument to customize the + * response. * * Your provided callback will be invoked with an error object if an API error * occurred or an array of {module:pubsub/subscription} objects. @@ -426,40 +429,39 @@ export class Topic { options = {}; } const reqOpts = Object.assign( - { - topic: this.name, - }, - options - ); + { + topic: this.name, + }, + options); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); this.request( - { - client: 'PublisherClient', - method: 'listTopicSubscriptions', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function() { - const subscriptions = arguments[1]; - if (subscriptions) { - arguments[1] = subscriptions.map(function(sub) { - // ListTopicSubscriptions only returns sub names - return self.subscription(sub); - }); - } - callback.apply(null, arguments); - } - ); + { + client: 'PublisherClient', + method: 'listTopicSubscriptions', + reqOpts, + gaxOpts, + }, + // tslint:disable-next-line only-arrow-functions + function() { + const subscriptions = arguments[1]; + if (subscriptions) { + arguments[1] = subscriptions.map(sub => { + // ListTopicSubscriptions only returns sub names + return self.subscription(sub); + }); + } + callback.apply(null, arguments); + }); } /** - * Creates a Publisher object that allows you to publish messages to this topic. + * Creates a Publisher object that allows you to publish messages to this + * topic. * * @param {object} [options] Configuration object. * @param {object} [options.batching] Batching settings. From 30ed44cd69d21871c944a888bb4155d5ee2e5cb8 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:51:25 +0530 Subject: [PATCH 0272/1115] refactor(ts): added ts style fix for src/subscription.ts (#360) --- handwritten/pubsub/src/subscription.ts | 169 +++++++++++++------------ 1 file changed, 88 insertions(+), 81 deletions(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index b01e30e1a45..5292a9c58d2 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -14,15 +14,17 @@ * limitations under the License. */ -import * as util from './util'; import {promisifyAll} from '@google-cloud/promisify'; import * as is from 'is'; + +import * as util from './util'; + const snakeCase = require('lodash.snakecase'); import {IAM} from './iam'; import {Snapshot} from './snapshot'; import {Subscriber} from './subscriber'; -import { PubSub } from '.'; +import {PubSub} from '.'; /** * A Subscription object will give you access to your Cloud Pub/Sub @@ -57,7 +59,8 @@ import { PubSub } from '.'; * @param {PubSub} pubsub PubSub object. * @param {string} name The name of the subscription. * @param {object} [options] See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) + * [Subscription + * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) * @param {object} [options.batching] Batch configurations for sending out * Acknowledge and ModifyAckDeadline requests. * @param {number} [options.batching.maxMilliseconds] The maximum amount of time @@ -139,6 +142,7 @@ import { PubSub } from '.'; * subscription.removeListener('message', onMessage); */ export class Subscription extends Subscriber { + // tslint:disable-next-line variable-name Promise?: PromiseConstructor; pubsub: PubSub; projectId: string; @@ -159,17 +163,18 @@ export class Subscription extends Subscriber { this.create = pubsub.createSubscription.bind(pubsub, options.topic, name); } /** - * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) - * allows you to set permissions on individual resources and offers a wider - * range of roles: editor, owner, publisher, subscriber, and viewer. This - * gives you greater flexibility and allows you to set more fine-grained - * access control. + * [IAM (Identity and Access + * Management)](https://cloud.google.com/pubsub/access_control) allows you + * to set permissions on individual resources and offers a wider range of + * roles: editor, owner, publisher, subscriber, and viewer. This gives you + * greater flexibility and allows you to set more fine-grained access + * control. * * *The IAM access control features described in this document are Beta, * including the API methods to get and set IAM policies, and to test IAM * permissions. Cloud Pub/Sub's use of IAM features is not covered by - * any SLA or deprecation policy, and may be subject to backward-incompatible - * changes.* + * any SLA or deprecation policy, and may be subject to + * backward-incompatible changes.* * * @name Subscription#iam * @mixes IAM @@ -252,25 +257,24 @@ export class Subscription extends Subscriber { subscription: this.name, }; this.request( - { - client: 'SubscriberClient', - method: 'createSnapshot', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - (err, resp) => { - if (err) { - callback(err, null, resp); - return; - } - snapshot.metadata = resp; - callback(null, snapshot, resp); - } - ); + { + client: 'SubscriberClient', + method: 'createSnapshot', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback(err, null, resp); + return; + } + snapshot.metadata = resp; + callback(null, snapshot, resp); + }); } /** - * Delete the subscription. Pull requests from the current subscription will be - * errored once unsubscription is complete. + * Delete the subscription. Pull requests from the current subscription will + * be errored once unsubscription is complete. * * @see [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete} * @@ -307,20 +311,19 @@ export class Subscription extends Subscriber { subscription: this.name, }; this.request( - { - client: 'SubscriberClient', - method: 'deleteSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - (err, resp) => { - if (!err) { - this.removeAllListeners(); - this.close(); - } - callback(err, resp); - } - ); + { + client: 'SubscriberClient', + method: 'deleteSubscription', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (!err) { + this.removeAllListeners(); + this.close(); + } + callback(err, resp); + }); } /** * @typedef {array} SubscriptionExistsResponse @@ -471,19 +474,18 @@ export class Subscription extends Subscriber { subscription: this.name, }; this.request( - { - client: 'SubscriberClient', - method: 'getSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - (err, apiResponse) => { - if (!err) { - this.metadata = apiResponse; - } - callback(err, apiResponse); - } - ); + { + client: 'SubscriberClient', + method: 'getSubscription', + reqOpts, + gaxOpts, + }, + (err, apiResponse) => { + if (!err) { + this.metadata = apiResponse; + } + callback(err, apiResponse); + }); } /** * @typedef {array} ModifyPushConfigResponse @@ -543,14 +545,13 @@ export class Subscription extends Subscriber { pushConfig: config, }; this.request( - { - client: 'SubscriberClient', - method: 'modifyPushConfig', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); + { + client: 'SubscriberClient', + method: 'modifyPushConfig', + reqOpts, + gaxOpts, + }, + callback); } /** * @typedef {array} SeekResponse @@ -581,7 +582,8 @@ export class Subscription extends Subscriber { * subscription.seek('my-snapshot', callback); * * //- - * // Alternatively, to specify a certain point in time, you can provide a Date + * // Alternatively, to specify a certain point in time, you can provide a + * Date * // object. * //- * const date = new Date('October 21 2015'); @@ -593,9 +595,16 @@ export class Subscription extends Subscriber { callback = gaxOpts; gaxOpts = {}; } - const reqOpts: any = { + + interface ReqOpts { + subscription?: string; + snapshot?: string; + time?: Date; + } + const reqOpts: ReqOpts = { subscription: this.name, }; + if (is.string(snapshot)) { reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); } else if (is.date(snapshot)) { @@ -604,14 +613,13 @@ export class Subscription extends Subscriber { throw new Error('Either a snapshot name or Date is needed to seek to.'); } this.request( - { - client: 'SubscriberClient', - method: 'seek', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); + { + client: 'SubscriberClient', + method: 'seek', + reqOpts, + gaxOpts, + }, + callback); } /** * @typedef {array} SetSubscriptionMetadataResponse @@ -658,20 +666,19 @@ export class Subscription extends Subscriber { const fields = Object.keys(subscription).map(snakeCase); subscription.name = this.name; const reqOpts = { - subscription: subscription, + subscription, updateMask: { paths: fields, }, }; this.request( - { - client: 'SubscriberClient', - method: 'updateSubscription', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback - ); + { + client: 'SubscriberClient', + method: 'updateSubscription', + reqOpts, + gaxOpts, + }, + callback); } /** * Create a Snapshot object. See {@link Subscription#createSnapshot} to From c7f8f1bfacc4b22877bff1381f33b2c9162004e5 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:52:05 +0530 Subject: [PATCH 0273/1115] refactor(ts): added ts style fix for src/subscriber.ts (#359) --- handwritten/pubsub/src/subscriber.ts | 97 +++++++++++++--------------- 1 file changed, 45 insertions(+), 52 deletions(-) diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index ec1e7b7edd8..56a845b3176 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -25,13 +25,14 @@ import * as os from 'os'; import {ConnectionPool} from './connection-pool'; import {Histogram} from './histogram'; -import { Subscription } from '.'; +import {Subscription} from '.'; /** * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline - * requests. There is an API limit of 524288 bytes (512KiB) per acknowledge/modifyAckDeadline - * request. ackIds have a maximum size of 164 bytes, so 524288/164 ~= 3197. Accounting for some - * overhead, a maximum of 3000 ackIds per request should be safe. + * requests. There is an API limit of 524288 bytes (512KiB) per + * acknowledge/modifyAckDeadline request. ackIds have a maximum size of 164 + * bytes, so 524288/164 ~= 3197. Accounting for some overhead, a maximum of 3000 + * ackIds per request should be safe. * @private */ const MAX_ACK_IDS_PER_REQUEST = 3000; @@ -75,18 +76,16 @@ export class Subscriber extends EventEmitter { bytes: 0, }; this.flowControl = Object.assign( - { - maxBytes: os.freemem() * 0.2, - maxMessages: 100, - }, - options.flowControl - ); + { + maxBytes: os.freemem() * 0.2, + maxMessages: 100, + }, + options.flowControl); this.batching = Object.assign( - { - maxMilliseconds: 100, - }, - options.batching - ); + { + maxMilliseconds: 100, + }, + options.batching); this.flushTimeoutHandle_ = null; this.leaseTimeoutHandle_ = null; this.userClosed_ = false; @@ -94,7 +93,8 @@ export class Subscriber extends EventEmitter { this.messageListeners = 0; // As of right now we do not write any acks/modacks to the pull streams. // But with allowing users to opt out of using streaming pulls altogether on - // the horizon, we may need to support this feature again in the near future. + // the horizon, we may need to support this feature again in the near + // future. this.writeToStreams_ = false; this.listenForEvents_(); } @@ -126,7 +126,7 @@ export class Subscriber extends EventEmitter { * @param {string} [connId] Connection ID to send request on. * @return {Promise} */ - acknowledge_(ackIds: string|string[], connId?: string): Promise { + acknowledge_(ackIds: string|string[], connId?: string) { ackIds = arrify(ackIds); const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(ackIdChunk => { if (this.writeToStreams_ && this.isConnected_()) { @@ -146,8 +146,8 @@ export class Subscriber extends EventEmitter { }); } /*! - * Breaks the lease on a message. Essentially this means we no longer treat the - * message as being un-acked and count it towards the flow control limits. + * Breaks the lease on a message. Essentially this means we no longer treat + * the message as being un-acked and count it towards the flow control limits. * * If the pool was previously paused and we freed up space, we'll continue to * recieve messages. @@ -230,7 +230,7 @@ export class Subscriber extends EventEmitter { * * @private */ - flushQueues_(): Promise { + flushQueues_(): Promise { if (this.flushTimeoutHandle_) { this.flushTimeoutHandle_.clear(); this.flushTimeoutHandle_ = null; @@ -242,14 +242,12 @@ export class Subscriber extends EventEmitter { return Promise.resolve(); } - const requests: Promise[] = []; + const requests: Array> = []; if (acks.length) { - requests.push( - this.acknowledge_(acks).then(() => { - this.inventory_.ack = []; - }) - ); + requests.push(this.acknowledge_(acks).then(() => { + this.inventory_.ack = []; + })); } if (nacks.length) { @@ -262,8 +260,9 @@ export class Subscriber extends EventEmitter { return table; }, {}); - const modAckRequests = Object.keys(modAcks).map(deadline => - this.modifyAckDeadline_(modAcks[deadline], Number(deadline))); + const modAckRequests = Object.keys(modAcks).map( + deadline => + this.modifyAckDeadline_(modAcks[deadline], Number(deadline))); requests.push.apply(requests, modAckRequests); @@ -294,9 +293,8 @@ export class Subscriber extends EventEmitter { */ hasMaxMessages_() { return ( - this.inventory_.lease.length >= this.flowControl.maxMessages || - this.inventory_.bytes >= this.flowControl.maxBytes - ); + this.inventory_.lease.length >= this.flowControl.maxMessages || + this.inventory_.bytes >= this.flowControl.maxBytes); } /*! * Leases a message. This will add the message to our inventory list and then @@ -309,10 +307,7 @@ export class Subscriber extends EventEmitter { */ leaseMessage_(message) { this.modifyAckDeadline_( - message.ackId, - this.ackDeadline / 1000, - message.connectionId - ); + message.ackId, this.ackDeadline / 1000, message.connectionId); this.inventory_.lease.push(message.ackId); this.inventory_.bytes += message.length; this.setLeaseTimeout_(); @@ -357,13 +352,14 @@ export class Subscriber extends EventEmitter { * @param {string=} connId Connection ID to send request on. * @return {Promise} */ - modifyAckDeadline_(ackIds: string|string[], deadline: number, connId?: string) { + modifyAckDeadline_( + ackIds: string|string[], deadline: number, connId?: string) { ackIds = arrify(ackIds); const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(ackIdChunk => { if (this.writeToStreams_ && this.isConnected_()) { return this.writeTo_(connId, { modifyDeadlineAckIds: ackIdChunk, - modifyDeadlineSeconds: Array(ackIdChunk.length).fill(deadline), + modifyDeadlineSeconds: new Array(ackIdChunk.length).fill(deadline), }); } return promisify(this.request).call(this, { @@ -394,9 +390,8 @@ export class Subscriber extends EventEmitter { const breakLease = this.breakLease_.bind(this, message); if (this.isConnected_()) { - this.modifyAckDeadline_(message.ackId, delay, message.connectionId).then( - breakLease - ); + this.modifyAckDeadline_(message.ackId, delay, message.connectionId) + .then(breakLease); return; } @@ -410,7 +405,8 @@ export class Subscriber extends EventEmitter { */ openConnection_() { // TODO: fixup this cast - const pool = (this.connectionPool = new ConnectionPool(this as {} as Subscription)); + const pool = + (this.connectionPool = new ConnectionPool(this as {} as Subscription)); this.isOpen = true; pool.on('error', err => { this.emit('error', err); @@ -445,25 +441,24 @@ export class Subscriber extends EventEmitter { }); } /*! - * Sets a timeout to flush any acks/nacks that have been made since the pool has - * closed. + * Sets a timeout to flush any acks/nacks that have been made since the pool + * has closed. * * @private */ setFlushTimeout_() { if (!this.flushTimeoutHandle_) { const timeout = delay(this.batching.maxMilliseconds); - const promise = timeout - .then(this.flushQueues_.bind(this)) - .catch(util.noop); + const promise = + timeout.then(this.flushQueues_.bind(this)).catch(util.noop); promise.clear = timeout.clear.bind(timeout); this.flushTimeoutHandle_ = promise; } return this.flushTimeoutHandle_; } /*! - * Sets a timeout to modify the ack deadlines for any unacked/unnacked messages, - * renewing their lease. + * Sets a timeout to modify the ack deadlines for any unacked/unnacked + * messages, renewing their lease. * * @private */ @@ -473,10 +468,8 @@ export class Subscriber extends EventEmitter { } const latency = this.latency_.percentile(99); const timeout = Math.random() * this.ackDeadline * 0.9 - latency; - this.leaseTimeoutHandle_ = setTimeout( - this.renewLeases_.bind(this), - timeout - ); + this.leaseTimeoutHandle_ = + setTimeout(this.renewLeases_.bind(this), timeout); } /** * Writes to specified duplex stream. This is useful for capturing write From b1a8e6e90787e95f520cfa53e46139ca4adcfe50 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:52:40 +0530 Subject: [PATCH 0274/1115] refactor(ts): added ts style fix for src/snapshot.ts (#358) --- handwritten/pubsub/src/snapshot.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 0434da106b6..e14acae913d 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -14,10 +14,11 @@ * limitations under the License. */ -import * as util from './util'; import {promisifyAll} from '@google-cloud/promisify'; import * as is from 'is'; -import { PubSub } from '.'; + +import {PubSub} from '.'; +import * as util from './util'; /** * A Snapshot object will give you access to your Cloud Pub/Sub snapshot. @@ -86,6 +87,7 @@ import { PubSub } from '.'; export class Snapshot { parent; name: string; + // tslint:disable-next-line variable-name Promise?: PromiseConstructor; create; seek; @@ -188,13 +190,12 @@ export class Snapshot { }; callback = callback || util.noop; this.parent.request( - { - client: 'SubscriberClient', - method: 'deleteSnapshot', - reqOpts: reqOpts, - }, - callback - ); + { + client: 'SubscriberClient', + method: 'deleteSnapshot', + reqOpts, + }, + callback); } /*@ * Format the name of a snapshot. A snapshot's full name is in the format of From 5020360e6788a6baa4d67952fb1b9d3ab5b56f09 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Thu, 22 Nov 2018 23:53:02 +0530 Subject: [PATCH 0275/1115] refactor(ts): added ts style fix for src/publisher.ts (#357) --- handwritten/pubsub/src/publisher.ts | 68 ++++++++++++++--------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index c33ca5a9e00..b6b27355095 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -14,12 +14,13 @@ * limitations under the License. */ -import * as arrify from 'arrify'; import {promisifyAll} from '@google-cloud/promisify'; +import * as arrify from 'arrify'; + const each = require('async-each'); import * as extend from 'extend'; import * as is from 'is'; -import { Topic } from './topic'; +import {Topic} from './topic'; /** * A Publisher object allows you to publish messages to a specific topic. @@ -48,6 +49,7 @@ import { Topic } from './topic'; * const publisher = topic.publisher(); */ export class Publisher { + // tslint:disable-next-line variable-name Promise?: PromiseConstructor; topic: Topic; inventory_; @@ -58,16 +60,14 @@ export class Publisher { this.Promise = topic.Promise; } options = extend( - true, - { - batching: { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 100, + true, { + batching: { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 100, + }, }, - }, - options - ); + options); /** * The topic of this publisher. * @@ -157,20 +157,19 @@ export class Publisher { attributes = {}; } // Ensure the `attributes` object only has string values - for (const key in attributes) { + for (const key of Object.keys(attributes)) { const value = attributes[key]; if (!is.string(value)) { throw new TypeError(`All attributes must be in the form of a string. \nInvalid value of type "${typeof value}" provided for "${key}".`); } } + const opts = this.settings.batching; // if this message puts us over the maxBytes option, then let's ship // what we have and add it to the next batch - if ( - this.inventory_.bytes > 0 && - this.inventory_.bytes + data.length > opts.maxBytes - ) { + if (this.inventory_.bytes > 0 && + this.inventory_.bytes + data.length > opts.maxBytes) { this.publish_(); } // add it to the queue! @@ -184,10 +183,8 @@ export class Publisher { } // otherwise let's set a timeout to send the next batch if (!this.timeoutHandle_) { - this.timeoutHandle_ = setTimeout( - this.publish_.bind(this), - opts.maxMilliseconds - ); + this.timeoutHandle_ = + setTimeout(this.publish_.bind(this), opts.maxMilliseconds); } } /** @@ -205,24 +202,23 @@ export class Publisher { this.timeoutHandle_ = null; const reqOpts = { topic: this.topic.name, - messages: messages, + messages, }; this.topic.request( - { - client: 'PublisherClient', - method: 'publish', - reqOpts: reqOpts, - gaxOpts: this.settings.gaxOpts, - }, - (err, resp) => { - const messageIds = arrify(resp && resp.messageIds); - each(callbacks, (callback, next) => { - const messageId = messageIds[callbacks.indexOf(callback)]; - callback(err, messageId); - next(); + { + client: 'PublisherClient', + method: 'publish', + reqOpts, + gaxOpts: this.settings.gaxOpts, + }, + (err, resp) => { + const messageIds = arrify(resp && resp.messageIds); + each(callbacks, (callback, next) => { + const messageId = messageIds[callbacks.indexOf(callback)]; + callback(err, messageId); + next(); + }); }); - } - ); } /** * Queues message to be sent to the server. @@ -235,7 +231,7 @@ export class Publisher { */ queue_(data, attrs, callback) { this.inventory_.queued.push({ - data: data, + data, attributes: attrs, }); this.inventory_.bytes += data.length; From 805fbf4700025611b4e3df1cb4acab85ce06e043 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Fri, 23 Nov 2018 00:18:33 +0530 Subject: [PATCH 0276/1115] refactor(ts): added ts style fix for src/index.ts (#351) --- handwritten/pubsub/src/index.ts | 320 ++++++++++++++++---------------- 1 file changed, 161 insertions(+), 159 deletions(-) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index a10cd26b351..cf7597fb1b0 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {replaceProjectIdToken} from '@google-cloud/projectify'; import {paginator} from '@google-cloud/paginator'; +import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; @@ -28,7 +28,7 @@ const v1 = require('./v1'); import {Snapshot} from './snapshot'; import {Subscription} from './subscription'; import {Topic} from './topic'; -import { Readable } from 'stream'; +import {Readable} from 'stream'; const opts = {} as gax.GrpcClientOptions; const {grpc} = new gax.GrpcClient(opts); @@ -44,8 +44,10 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; * @property {string} [projectId] The project ID from the Google Developer's * Console, e.g. 'grape-spaceship-123'. We will also check the environment * variable `GCLOUD_PROJECT` for your project ID. If your app is running in - * an environment which supports {@link https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application Application Default Credentials}, - * your project ID will be detected automatically. + * an environment which supports {@link + * https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application + * Application Default Credentials}, your project ID will be detected + * automatically. * @property {string} [keyFilename] Full path to the a .json, .pem, or .p12 key * downloaded from the Google Developers Console. If you provide a path to a * JSON file, the `projectId` option above is not necessary. NOTE: .pem and @@ -81,13 +83,14 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; * @example Import the client library * const {PubSub} = require('@google-cloud/pubsub'); * - * @example Create a client that uses Application Default Credentials (ADC): - * const pubsub = new PubSub(); + * @example Create a client that uses Application + * Default Credentials (ADC): const pubsub = new PubSub(); * - * @example Create a client with explicit credentials: - * const pubsub = new PubSub({ - * projectId: 'your-project-id', - * keyFilename: '/path/to/keyfile.json' + * @example Create a client with explicit + * credentials: const pubsub = new PubSub({ projectId: + * 'your-project-id', keyFilename: '/path/to/keyfile.json' * }); * * @example include:samples/quickstart.js @@ -100,9 +103,13 @@ export class PubSub { api; auth: GoogleAuth; projectId: string; + // tslint:disable-next-line variable-name Promise?: PromiseConstructor; - getSubscriptionsStream = paginator.streamify('getSubscriptions') as () => Readable; - getSnapshotsStream = paginator.streamify('getSnapshots') as () => Readable; + getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => + Readable; + getSnapshotsStream = paginator.streamify('getSnapshots') as() => Readable; + getTopicsStream = paginator.streamify('getTopics') as() => Readable; + constructor(options?) { options = options || {}; // Determine what scopes are needed. @@ -115,15 +122,14 @@ export class PubSub { } } this.options = Object.assign( - { - 'grpc.keepalive_time_ms': 300000, - 'grpc.max_receive_message_length': 20000001, - libName: 'gccl', - libVersion: PKG.version, - scopes: Object.keys(allScopes), - }, - options - ); + { + 'grpc.keepalive_time_ms': 300000, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version, + scopes: Object.keys(allScopes), + }, + options); /** * @name PubSub#isEmulator * @type {boolean} @@ -140,7 +146,8 @@ export class PubSub { /** * Options for creating a subscription. * - * See a [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * See a [Subscription + * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). * * @typedef {object} CreateSubscriptionRequest * @property {object} [flowControl] Flow control configurations for @@ -187,7 +194,8 @@ export class PubSub { * subscription to. * @param {string} name The name of the subscription. * @param {CreateSubscriptionRequest} [options] See a - * [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * [Subscription + * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). * @param {CreateSubscriptionCallback} [callback] Callback function. * @returns {Promise} * @@ -202,10 +210,10 @@ export class PubSub { * * pubsub.createSubscription(topic, name, callback); * - * @example If the callback is omitted, we'll return a Promise. - * pubsub.createSubscription(topic, name).then(function(data) { - * const subscription = data[0]; - * const apiResponse = data[1]; + * @example If the callback is omitted, we'll return a + * Promise. pubsub.createSubscription(topic, + * name).then(function(data) { const subscription = data[0]; const apiResponse + * = data[1]; * }); */ createSubscription(topic: Topic|string, name: string, options, callback) { @@ -232,21 +240,20 @@ export class PubSub { delete reqOpts.gaxOpts; delete reqOpts.flowControl; this.request( - { - client: 'SubscriberClient', - method: 'createSubscription', - reqOpts: reqOpts, - gaxOpts: options.gaxOpts, - }, - function(err, resp) { - if (err) { - callback(err, null, resp); - return; - } - subscription.metadata = resp; - callback(null, subscription, resp); - } - ); + { + client: 'SubscriberClient', + method: 'createSubscription', + reqOpts, + gaxOpts: options.gaxOpts, + }, + (err, resp) => { + if (err) { + callback(err, null, resp); + return; + } + subscription.metadata = resp; + callback(null, subscription, resp); + }); } /** * @typedef {array} CreateTopicResponse @@ -298,27 +305,26 @@ export class PubSub { gaxOpts = {}; } this.request( - { - client: 'PublisherClient', - method: 'createTopic', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function(err, resp) { - if (err) { - callback(err, null, resp); - return; - } - topic.metadata = resp; - callback(null, topic, resp); - } - ); + { + client: 'PublisherClient', + method: 'createTopic', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback(err, null, resp); + return; + } + topic.metadata = resp; + callback(null, topic, resp); + }); } /** - * Determine the appropriate endpoint to use for API requests, first trying the - * local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null we try - * Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), otherwise the - * default JSON API. + * Determine the appropriate endpoint to use for API requests, first trying + * the local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null + * we try Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), + * otherwise the default JSON API. * * @private */ @@ -330,10 +336,9 @@ export class PubSub { const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; const leadingProtocol = new RegExp('^https*://'); const trailingSlashes = new RegExp('/*$'); - const baseUrlParts = baseUrl - .replace(leadingProtocol, '') - .replace(trailingSlashes, '') - .split(':'); + const baseUrlParts = baseUrl.replace(leadingProtocol, '') + .replace(trailingSlashes, '') + .split(':'); this.options.servicePath = baseUrlParts[0]; this.options.port = baseUrlParts[1]; this.options.sslCreds = grpc.credentials.createInsecure(); @@ -392,38 +397,36 @@ export class PubSub { options = {}; } const reqOpts = Object.assign( - { - project: 'projects/' + this.projectId, - }, - options - ); + { + project: 'projects/' + this.projectId, + }, + options); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); this.request( - { - client: 'SubscriberClient', - method: 'listSnapshots', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function() { - const snapshots = arguments[1]; - if (snapshots) { - arguments[1] = snapshots.map(function(snapshot) { - const snapshotInstance = self.snapshot(snapshot.name); - snapshotInstance.metadata = snapshot; - return snapshotInstance; - }); - } - callback.apply(null, arguments); - } - ); + { + client: 'SubscriberClient', + method: 'listSnapshots', + reqOpts, + gaxOpts, + }, + // tslint:disable-next-line only-arrow-functions + function() { + const snapshots = arguments[1]; + if (snapshots) { + arguments[1] = snapshots.map(snapshot => { + const snapshotInstance = self.snapshot(snapshot.name); + snapshotInstance.metadata = snapshot; + return snapshotInstance; + }); + } + callback.apply(null, arguments); + }); } /** * Query object for listing subscriptions. @@ -451,8 +454,8 @@ export class PubSub { */ /** * Get a list of the subscriptions registered to all of your project's topics. - * You may optionally provide a query object as the first argument to customize - * the response. + * You may optionally provide a query object as the first argument to + * customize the response. * * Your provided callback will be invoked with an error object if an API error * occurred or an array of {@link Subscription} objects. @@ -500,30 +503,29 @@ export class PubSub { delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); this.request( - { - client: 'SubscriberClient', - method: 'listSubscriptions', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function() { - const subscriptions = arguments[1]; - if (subscriptions) { - arguments[1] = subscriptions.map(function(sub) { - const subscriptionInstance = self.subscription(sub.name); - subscriptionInstance.metadata = sub; - return subscriptionInstance; - }); - } - callback.apply(null, arguments); - } - ); + { + client: 'SubscriberClient', + method: 'listSubscriptions', + reqOpts, + gaxOpts, + }, + // tslint:disable-next-line only-arrow-functions + function() { + const subscriptions = arguments[1]; + if (subscriptions) { + arguments[1] = subscriptions.map(sub => { + const subscriptionInstance = self.subscription(sub.name); + subscriptionInstance.metadata = sub; + return subscriptionInstance; + }); + } + callback.apply(null, arguments); + }); } /** * Query object for listing topics. @@ -588,38 +590,36 @@ export class PubSub { options = {}; } const reqOpts = Object.assign( - { - project: 'projects/' + this.projectId, - }, - options - ); + { + project: 'projects/' + this.projectId, + }, + options); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); this.request( - { - client: 'PublisherClient', - method: 'listTopics', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function() { - const topics = arguments[1]; - if (topics) { - arguments[1] = topics.map(function(topic) { - const topicInstance = self.topic(topic.name); - topicInstance.metadata = topic; - return topicInstance; - }); - } - callback.apply(null, arguments); - } - ); + { + client: 'PublisherClient', + method: 'listTopics', + reqOpts, + gaxOpts, + }, + // tslint:disable-next-line only-arrow-functions + function() { + const topics = arguments[1]; + if (topics) { + arguments[1] = topics.map(topic => { + const topicInstance = self.topic(topic.name); + topicInstance.metadata = topic; + return topicInstance; + }); + } + callback.apply(null, arguments); + }); } /** * Get the PubSub client object. @@ -635,9 +635,9 @@ export class PubSub { getClient_(config, callback) { const self = this; const hasProjectId = - this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; + this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; if (!hasProjectId && !this.isEmulator) { - this.auth.getProjectId(function(err, projectId) { + this.auth.getProjectId((err, projectId) => { if (err) { callback(err); return; @@ -656,7 +656,8 @@ export class PubSub { callback(null, gaxClient); } /** - * Funnel all API requests through this method, to be sure we have a project ID. + * Funnel all API requests through this method, to be sure we have a project + * ID. * * @private * @@ -668,7 +669,7 @@ export class PubSub { */ request(config, callback) { const self = this; - this.getClient_(config, function(err, client) { + this.getClient_(config, (err, client) => { if (err) { callback(err); return; @@ -859,7 +860,6 @@ export class PubSub { * this.end(); * }); */ -(PubSub.prototype as any).getTopicsStream = paginator.streamify('getTopics'); /*! Developer Documentation * @@ -888,19 +888,21 @@ export {Subscription, Topic}; * @module {PubSub} @google-cloud/pubsub * @alias nodejs-pubsub * - * @example Install the client library with npm: - * npm install --save @google-cloud/pubsub + * @example Install the client library with npm: npm install --save + * @google-cloud/pubsub * * @example Import the client library * const {PubSub} = require('@google-cloud/pubsub'); * - * @example Create a client that uses Application Default Credentials (ADC): - * const pubsub = new PubSub(); + * @example Create a client that uses Application + * Default Credentials (ADC): const pubsub = new PubSub(); * - * @example Create a client with explicit credentials: - * const pubsub = new PubSub({ - * projectId: 'your-project-id', - * keyFilename: '/path/to/keyfile.json' + * @example Create a client with explicit + * credentials: const pubsub = new PubSub({ projectId: + * 'your-project-id', keyFilename: '/path/to/keyfile.json' * }); * * @example include:samples/quickstart.js From d57c33f3537e3d17d357e09bd174728acedee1c9 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Fri, 23 Nov 2018 11:56:30 +0530 Subject: [PATCH 0277/1115] refactor(ts): Added ts style fix for test/publisher.ts (#369) --- handwritten/pubsub/test/publisher.ts | 179 ++++++++++++++------------- 1 file changed, 93 insertions(+), 86 deletions(-) diff --git a/handwritten/pubsub/test/publisher.ts b/handwritten/pubsub/test/publisher.ts index fe60bfff660..025def0488e 100644 --- a/handwritten/pubsub/test/publisher.ts +++ b/handwritten/pubsub/test/publisher.ts @@ -14,14 +14,16 @@ * limitations under the License. */ -import * as assert from 'assert'; -import * as util from '../src/util'; import * as pfy from '@google-cloud/promisify'; +import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; +import * as util from '../src/util'; + let promisified = false; const fakePromisify = Object.assign({}, pfy, { - promisifyAll: function(Class, options) { + // tslint:disable-next-line variable-name + promisifyAll(Class, options) { if (Class.name === 'Publisher') { assert.deepStrictEqual(options, {singular: true}); promisified = true; @@ -29,44 +31,46 @@ const fakePromisify = Object.assign({}, pfy, { }, }); -describe('Publisher', function() { +describe('Publisher', () => { + // tslint:disable-next-line variable-name let Publisher; let publisher; let batchOpts; const TOPIC_NAME = 'test-topic'; + // tslint:disable-next-line no-any const TOPIC: any = { name: TOPIC_NAME, Promise: {}, request: util.noop, }; - before(function() { + before(() => { Publisher = proxyquire('../src/publisher.js', { - '@google-cloud/promisify': fakePromisify, - }).Publisher; + '@google-cloud/promisify': fakePromisify, + }).Publisher; }); - beforeEach(function() { + beforeEach(() => { TOPIC.request = util.noop; publisher = new Publisher(TOPIC); batchOpts = publisher.settings.batching; }); - describe('initialization', function() { - it('should promisify all the things', function() { + describe('initialization', () => { + it('should promisify all the things', () => { assert(promisified); }); - it('should localize topic.Promise', function() { + it('should localize topic.Promise', () => { assert.strictEqual(publisher.Promise, TOPIC.Promise); }); - it('should localize the topic object', function() { + it('should localize the topic object', () => { assert.strictEqual(publisher.topic, TOPIC); }); - it('should create an inventory object', function() { + it('should create an inventory object', () => { assert.deepStrictEqual(publisher.inventory_, { callbacks: [], queued: [], @@ -74,8 +78,8 @@ describe('Publisher', function() { }); }); - describe('options', function() { - it('should provide default values for batching', function() { + describe('options', () => { + it('should provide default values for batching', () => { assert.deepStrictEqual(publisher.settings.batching, { maxBytes: Math.pow(1024, 2) * 5, maxMessages: 1000, @@ -83,7 +87,7 @@ describe('Publisher', function() { }); }); - it('should capture user specified options', function() { + it('should capture user specified options', () => { const options = { maxBytes: 10, maxMessages: 11, @@ -99,7 +103,7 @@ describe('Publisher', function() { assert.deepStrictEqual(options, optionsCopy); }); - it('should cap maxBytes', function() { + it('should cap maxBytes', () => { const expected = Math.pow(1024, 2) * 9; const publisher = new Publisher(TOPIC, { @@ -109,7 +113,7 @@ describe('Publisher', function() { assert.strictEqual(publisher.settings.batching.maxBytes, expected); }); - it('should cap maxMessages', function() { + it('should cap maxMessages', () => { const publisher = new Publisher(TOPIC, { batching: {maxMessages: 2000}, }); @@ -117,7 +121,7 @@ describe('Publisher', function() { assert.strictEqual(publisher.settings.batching.maxMessages, 1000); }); - it('should capture gaxOptions', function() { + it('should capture gaxOptions', () => { const fakeGaxOpts = {a: 'a'}; const publisher = new Publisher(TOPIC, { gaxOpts: fakeGaxOpts, @@ -128,32 +132,33 @@ describe('Publisher', function() { }); }); - describe('publish', function() { + describe('publish', () => { const DATA = Buffer.from('hello'); const ATTRS = {a: 'a'}; let globalSetTimeout; - before(function() { + before(() => { globalSetTimeout = global.setTimeout; }); - beforeEach(function() { + beforeEach(() => { publisher.publish_ = util.noop; + // tslint:disable-next-line no-any (global as any).setTimeout = util.noop; }); - after(function() { + after(() => { global.setTimeout = globalSetTimeout; }); - it('should throw an error when data is not a buffer', function() { - assert.throws(function() { + it('should throw an error when data is not a buffer', () => { + assert.throws(() => { publisher.publish('hello', {}, assert.ifError); }, /Data must be in the form of a Buffer\./); }); - it('should throw when an attribute value is not a string', function() { + it('should throw when an attribute value is not a string', () => { const brokenAttrs = { key1: 'value', key2: true, @@ -164,77 +169,78 @@ All attributes must be in the form of a string. \nInvalid value of type "${typeof true}" provided for "key2". `.trim(); - assert.throws(function() { + assert.throws(() => { publisher.publish(DATA, brokenAttrs, assert.ifError); }, new RegExp(expectedErrorMessage)); }); - it('should queue the data', function(done) { - publisher.queue_ = function(data, attrs, callback) { + it('should queue the data', done => { + publisher.queue_ = (data, attrs, callback) => { assert.strictEqual(data, DATA); assert.strictEqual(attrs, ATTRS); - callback(); // the done fn + callback(); // the done fn }; publisher.publish(DATA, ATTRS, done); }); - it('should optionally accept attributes', function(done) { - publisher.queue_ = function(data, attrs, callback) { + it('should optionally accept attributes', done => { + publisher.queue_ = (data, attrs, callback) => { assert.strictEqual(data, DATA); assert.deepStrictEqual(attrs, {}); - callback(); // the done fn + callback(); // the done fn }; publisher.publish(DATA, done); }); - it('should publish if data puts payload size over cap', function(done) { + it('should publish if data puts payload size over cap', done => { let queueCalled = false; - publisher.publish_ = function() { + publisher.publish_ = () => { assert.strictEqual(queueCalled, false); publisher.inventory_.bytes = 0; }; - publisher.queue_ = function(data, attrs, callback) { + publisher.queue_ = (data, attrs, callback) => { assert.strictEqual(publisher.inventory_.bytes, 0); queueCalled = true; - callback(); // the done fn + callback(); // the done fn }; publisher.inventory_.bytes = batchOpts.maxBytes - 1; publisher.publish(DATA, done); }); - it('should not attempt to publish empty payload if data puts payload above size cap', function(done) { - const pushRequests: {}[] = []; - publisher.settings.batching.maxBytes = 2; - publisher.inventory_.bytes = 0; - - publisher.publish_ = function() { - assert.notStrictEqual(publisher.inventory_.queued.length, 0); - pushRequests.push(publisher.inventory_.queued); - publisher.inventory_.callbacks.forEach(function(callback) { - callback(); - }); - }; - - publisher.publish(DATA, function() { - assert.deepStrictEqual(pushRequests, [ - [ - { - data: DATA, - attributes: {}, - }, - ], - ]); - done(); - }); - }); - - it('should publish if data puts payload at size cap', function(done) { - publisher.queue_ = function() { + it('should not attempt to publish empty payload if data puts payload above size cap', + done => { + const pushRequests: Array<{}> = []; + publisher.settings.batching.maxBytes = 2; + publisher.inventory_.bytes = 0; + + publisher.publish_ = () => { + assert.notStrictEqual(publisher.inventory_.queued.length, 0); + pushRequests.push(publisher.inventory_.queued); + publisher.inventory_.callbacks.forEach(callback => { + callback(); + }); + }; + + publisher.publish(DATA, () => { + assert.deepStrictEqual(pushRequests, [ + [ + { + data: DATA, + attributes: {}, + }, + ], + ]); + done(); + }); + }); + + it('should publish if data puts payload at size cap', done => { + publisher.queue_ = () => { publisher.inventory_.bytes += DATA.length; }; @@ -243,27 +249,28 @@ All attributes must be in the form of a string. publisher.publish(DATA, util.noop); }); - it('should publish if data puts payload at message cap', function(done) { + it('should publish if data puts payload at message cap', done => { let queueCalled = false; - publisher.queue_ = function() { + publisher.queue_ = () => { queueCalled = true; }; - publisher.publish_ = function() { + publisher.publish_ = () => { assert(queueCalled); done(); }; - publisher.inventory_.queued = Array(batchOpts.maxMessages).fill({}); + publisher.inventory_.queued = new Array(batchOpts.maxMessages).fill({}); publisher.publish(DATA, util.noop); }); - it('should set a timeout if a publish did not occur', function(done) { + it('should set a timeout if a publish did not occur', done => { const globalSetTimeout = global.setTimeout; const fakeTimeoutHandle = 12345; - (global as any).setTimeout = function(callback, duration) { + // tslint:disable-next-line no-any + (global as any).setTimeout = (callback, duration) => { assert.strictEqual(duration, batchOpts.maxMilliseconds); global.setTimeout = globalSetTimeout; setImmediate(callback); @@ -276,7 +283,7 @@ All attributes must be in the form of a string. assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); }); - it('should not set a timeout if one exists', function() { + it('should not set a timeout if one exists', () => { const fakeTimeoutHandle = 'not-a-real-handle'; publisher.timeoutHandle_ = 'not-a-real-handle'; @@ -285,15 +292,15 @@ All attributes must be in the form of a string. }); }); - describe('publish_', function() { - it('should cancel any publish timeouts', function(done) { + describe('publish_', () => { + it('should cancel any publish timeouts', done => { publisher.timeoutHandle_ = setTimeout(done, 1); publisher.publish_(); assert.strictEqual(publisher.timeoutHandle_, null); done(); }); - it('should reset the inventory object', function() { + it('should reset the inventory object', () => { publisher.inventory_.callbacks.push(util.noop); publisher.inventory_.queued.push({}); publisher.inventory_.bytes = 5; @@ -305,11 +312,11 @@ All attributes must be in the form of a string. assert.strictEqual(publisher.inventory_.bytes, 0); }); - it('should make the correct request', function(done) { + it('should make the correct request', done => { const FAKE_MESSAGE = {}; const FAKE_GAX_OPTS = {a: 'b'}; - TOPIC.request = function(config) { + TOPIC.request = config => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'publish'); assert.deepStrictEqual(config.reqOpts, { @@ -325,23 +332,23 @@ All attributes must be in the form of a string. publisher.publish_(); }); - it('should pass back the err/msg id to correct callback', function(done) { + it('should pass back the err/msg id to correct callback', done => { const error = new Error('err'); const FAKE_IDS = ['abc', 'def']; let callbackCalls = 0; publisher.inventory_.callbacks = [ - function(err, messageId) { + (err, messageId) => { assert.strictEqual(err, error); assert.strictEqual(messageId, FAKE_IDS[0]); callbackCalls += 1; }, - function(err, messageId) { + (err, messageId) => { assert.strictEqual(err, error); assert.strictEqual(messageId, FAKE_IDS[1]); callbackCalls += 1; }, - function(err, messageId) { + (err, messageId) => { assert.strictEqual(err, error); assert.strictEqual(messageId, undefined); assert.strictEqual(callbackCalls, 2); @@ -349,7 +356,7 @@ All attributes must be in the form of a string. }, ]; - TOPIC.request = function(config, callback) { + TOPIC.request = (config, callback) => { callback(error, {messageIds: FAKE_IDS}); }; @@ -357,11 +364,11 @@ All attributes must be in the form of a string. }); }); - describe('queue_', function() { + describe('queue_', () => { const DATA = Buffer.from('hello'); const ATTRS = {a: 'a'}; - it('should add the data and attrs to the inventory', function() { + it('should add the data and attrs to the inventory', () => { publisher.queue_(DATA, ATTRS, util.noop); assert.deepStrictEqual(publisher.inventory_.queued, [ @@ -372,13 +379,13 @@ All attributes must be in the form of a string. ]); }); - it('should update the inventory size', function() { + it('should update the inventory size', () => { publisher.queue_(DATA, ATTRS, util.noop); assert.strictEqual(publisher.inventory_.bytes, DATA.length); }); - it('should capture the callback', function() { + it('should capture the callback', () => { publisher.queue_(DATA, ATTRS, util.noop); assert.deepStrictEqual(publisher.inventory_.callbacks, [util.noop]); From c2ab65481e745c428891fa2b0a3cdb62cf9d631c Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Fri, 23 Nov 2018 12:00:20 +0530 Subject: [PATCH 0278/1115] refactor(ts): Added ts style fix for test/snapshot.ts (#370) --- handwritten/pubsub/test/snapshot.ts | 90 +++++++++++++++-------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index d902453bb4c..619fe783108 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -14,22 +14,25 @@ * limitations under the License. */ +import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; -import * as util from '../src/util'; import * as proxyquire from 'proxyquire'; -import * as pfy from '@google-cloud/promisify'; import * as sinon from 'sinon'; +import * as util from '../src/util'; + let promisified = false; const fakePromisify = Object.assign({}, pfy, { - promisifyAll: function(Class) { + // tslint:disable-next-line variable-name + promisifyAll(Class) { if (Class.name === 'Snapshot') { promisified = true; } }, }); -describe('Snapshot', function() { +describe('Snapshot', () => { + // tslint:disable-next-line variable-name let Snapshot; let snapshot; @@ -40,57 +43,58 @@ describe('Snapshot', function() { projectId: PROJECT_ID, }; + // tslint:disable-next-line no-any const SUBSCRIPTION: any = { Promise: {}, projectId: PROJECT_ID, pubsub: PUBSUB, api: {}, - createSnapshot: function() {}, - seek: function() {}, + createSnapshot() {}, + seek() {}, }; - before(function() { + before(() => { Snapshot = proxyquire('../src/snapshot', { - '@google-cloud/promisify': fakePromisify, - }).Snapshot; + '@google-cloud/promisify': fakePromisify, + }).Snapshot; }); const sandbox = sinon.createSandbox(); - beforeEach(function() { + beforeEach(() => { snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); }); afterEach(() => sandbox.restore()); - describe('initialization', function() { + describe('initialization', () => { const FULL_SNAPSHOT_NAME = 'a/b/c/d'; let formatName_; - before(function() { + before(() => { formatName_ = Snapshot.formatName_; - Snapshot.formatName_ = function() { + Snapshot.formatName_ = () => { return FULL_SNAPSHOT_NAME; }; }); - after(function() { + after(() => { Snapshot.formatName_ = formatName_; }); - it('should promisify all the things', function() { + it('should promisify all the things', () => { assert(promisified); }); - it('should localize parent.Promise', function() { + it('should localize parent.Promise', () => { assert.strictEqual(snapshot.Promise, SUBSCRIPTION.Promise); }); - it('should localize the parent', function() { + it('should localize the parent', () => { assert.strictEqual(snapshot.parent, SUBSCRIPTION); }); - describe('name', function() { - it('should create and cache the full name', function() { - Snapshot.formatName_ = function(projectId, name) { + describe('name', () => { + it('should create and cache the full name', () => { + Snapshot.formatName_ = (projectId, name) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, SNAPSHOT_NAME); return FULL_SNAPSHOT_NAME; @@ -100,8 +104,8 @@ describe('Snapshot', function() { assert.strictEqual(snapshot.name, FULL_SNAPSHOT_NAME); }); - it('should pull the projectId from parent object', function() { - Snapshot.formatName_ = function(projectId, name) { + it('should pull the projectId from parent object', () => { + Snapshot.formatName_ = (projectId, name) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, SNAPSHOT_NAME); return FULL_SNAPSHOT_NAME; @@ -112,21 +116,21 @@ describe('Snapshot', function() { }); }); - describe('with Subscription parent', function() { - it('should include the create method', function(done) { - SUBSCRIPTION.createSnapshot = function(name, callback) { + describe('with Subscription parent', () => { + it('should include the create method', done => { + SUBSCRIPTION.createSnapshot = (name, callback) => { assert.strictEqual(name, SNAPSHOT_NAME); - callback(); // The done function + callback(); // The done function }; const snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); snapshot.create(done); }); - it('should create a seek method', function(done) { - SUBSCRIPTION.seek = function(name, callback) { + it('should create a seek method', done => { + SUBSCRIPTION.seek = (name, callback) => { assert.strictEqual(name, SNAPSHOT_NAME); - callback(); // The done function + callback(); // The done function }; const snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); @@ -134,53 +138,53 @@ describe('Snapshot', function() { }); }); - describe('with PubSub parent', function() { + describe('with PubSub parent', () => { let snapshot; - beforeEach(function() { + beforeEach(() => { snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); }); - it('should not include the create method', function() { + it('should not include the create method', () => { assert.strictEqual(snapshot.create, undefined); }); - it('should not include a seek method', function() { + it('should not include a seek method', () => { assert.strictEqual(snapshot.seek, undefined); }); }); }); - describe('formatName_', function() { + describe('formatName_', () => { const EXPECTED = 'projects/' + PROJECT_ID + '/snapshots/' + SNAPSHOT_NAME; - it('should format the name', function() { + it('should format the name', () => { const name = Snapshot.formatName_(PROJECT_ID, SNAPSHOT_NAME); assert.strictEqual(name, EXPECTED); }); - it('should not re-format the name', function() { + it('should not re-format the name', () => { const name = Snapshot.formatName_(PROJECT_ID, EXPECTED); assert.strictEqual(name, EXPECTED); }); }); - describe('delete', function() { - it('should make the correct request', function(done) { - snapshot.parent.request = function(config, callback) { + describe('delete', () => { + it('should make the correct request', done => { + snapshot.parent.request = (config, callback) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSnapshot'); assert.deepStrictEqual(config.reqOpts, {snapshot: snapshot.name}); - callback(); // the done fn + callback(); // the done fn }; snapshot.delete(done); }); - it('should optionally accept a callback', function(done) { + it('should optionally accept a callback', done => { sandbox.stub(util, 'noop').callsFake(done); - snapshot.parent.request = function(config, callback) { - callback(); // the done fn + snapshot.parent.request = (config, callback) => { + callback(); // the done fn }; snapshot.delete(); }); From c5fa05d8f9ccbb4bcf0b2217c73d596fd0cbd149 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Fri, 23 Nov 2018 12:03:04 +0530 Subject: [PATCH 0279/1115] refactor(ts): Added ts style fix for test/subscriber.ts (#371) --- handwritten/pubsub/test/subscriber.ts | 642 +++++++++++++------------- 1 file changed, 315 insertions(+), 327 deletions(-) diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 35b6cc96c70..b597f05572a 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -38,7 +38,7 @@ function fakePromisifyAll(klass) { const FAKE_FREE_MEM = 168222720; const fakeOs = { - freemem: function() { + freemem() { return FAKE_FREE_MEM; }, }; @@ -57,52 +57,53 @@ class FakeHistogram { this.calledWith_ = [].slice.call(arguments); } } - +// tslint:disable-next-line no-any let delayOverride: any = null; function fakeDelay(timeout) { return (delayOverride || delay)(timeout); } -describe('Subscriber', function() { +describe('Subscriber', () => { + // tslint:disable-next-line variable-name let Subscriber; let subscriber; const SUB_NAME = 'fake-sub'; - before(function() { + before(() => { Subscriber = proxyquire('../src/subscriber.js', { - '../src/util': fakeUtil, - '@google-cloud/promisify': { - promisify: fakePromisify, - promisifyAll: fakePromisifyAll, - }, - delay: fakeDelay, - os: fakeOs, - './connection-pool.js': {ConnectionPool: FakeConnectionPool}, - './histogram.js': {Histogram: FakeHistogram}, - }).Subscriber; + '../src/util': fakeUtil, + '@google-cloud/promisify': { + promisify: fakePromisify, + promisifyAll: fakePromisifyAll, + }, + delay: fakeDelay, + os: fakeOs, + './connection-pool.js': {ConnectionPool: FakeConnectionPool}, + './histogram.js': {Histogram: FakeHistogram}, + }).Subscriber; }); - beforeEach(function() { + beforeEach(() => { subscriber = new Subscriber({}); subscriber.name = SUB_NAME; }); - describe('initialization', function() { - it('should promisify all the things', function() { + describe('initialization', () => { + it('should promisify all the things', () => { assert(promisified); }); - it('should create a histogram instance', function() { + it('should create a histogram instance', () => { assert(subscriber.histogram instanceof FakeHistogram); }); - it('should create a latency histogram', function() { + it('should create a latency histogram', () => { assert(subscriber.latency_ instanceof FakeHistogram); }); - it('should honor configuration settings', function() { + it('should honor configuration settings', () => { const options = { maxConnections: 2, flowControl: { @@ -126,7 +127,7 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.batching.maxMilliseconds, 10); }); - it('should set sensible defaults', function() { + it('should set sensible defaults', () => { assert.strictEqual(subscriber.ackDeadline, 10000); assert.strictEqual(subscriber.maxConnections, 5); assert.strictEqual(subscriber.userClosed_, false); @@ -142,7 +143,7 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.batching.maxMilliseconds, 100); }); - it('should create an inventory object', function() { + it('should create an inventory object', () => { assert(is.object(subscriber.inventory_)); assert(is.array(subscriber.inventory_.lease)); assert(is.array(subscriber.inventory_.ack)); @@ -150,52 +151,53 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.inventory_.bytes, 0); }); - it('should inherit from EventEmitter', function() { + it('should inherit from EventEmitter', () => { assert(subscriber instanceof EventEmitter); }); - it('should listen for events', function() { + it('should listen for events', () => { let called = false; const listenForEvents = Subscriber.prototype.listenForEvents_; - Subscriber.prototype.listenForEvents_ = function() { + Subscriber.prototype.listenForEvents_ = () => { Subscriber.prototype.listenForEvents_ = listenForEvents; called = true; }; + // tslint:disable-next-line no-unused-expression new Subscriber({}); assert(called); }); }); - describe('ack_', function() { + describe('ack_', () => { const MESSAGE = { ackId: 'abc', received: 12345, connectionId: 'def', }; - beforeEach(function() { + beforeEach(() => { subscriber.breakLease_ = fakeUtil.noop; subscriber.histogram.add = fakeUtil.noop; - subscriber.acknowledge_ = function() { + subscriber.acknowledge_ = () => { return Promise.resolve(); }; - subscriber.setFlushTimeout_ = function() { + subscriber.setFlushTimeout_ = () => { return Promise.resolve(); }; }); - it('should add the time it took to ack to the histogram', function(done) { + it('should add the time it took to ack to the histogram', done => { const fakeNow = 12381832; const now = global.Date.now; - global.Date.now = function() { + global.Date.now = () => { global.Date.now = now; return fakeNow; }; - subscriber.histogram.add = function(time) { + subscriber.histogram.add = time => { assert.strictEqual(time, fakeNow - MESSAGE.received); done(); }; @@ -203,17 +205,17 @@ describe('Subscriber', function() { subscriber.ack_(MESSAGE); }); - describe('with connection', function() { - beforeEach(function() { - subscriber.isConnected_ = function() { + describe('with connection', () => { + beforeEach(() => { + subscriber.isConnected_ = () => { return true; }; subscriber.writeToStreams_ = true; }); - it('should acknowledge if there is a connection', function(done) { - subscriber.acknowledge_ = function(ackId, connectionId) { + it('should acknowledge if there is a connection', done => { + subscriber.acknowledge_ = (ackId, connectionId) => { assert.strictEqual(ackId, MESSAGE.ackId); assert.strictEqual(connectionId, MESSAGE.connectionId); setImmediate(done); @@ -223,8 +225,8 @@ describe('Subscriber', function() { subscriber.ack_(MESSAGE); }); - it('should break the lease on the message', function(done) { - subscriber.breakLease_ = function(message) { + it('should break the lease on the message', done => { + subscriber.breakLease_ = message => { assert.strictEqual(message, MESSAGE); done(); }; @@ -233,15 +235,15 @@ describe('Subscriber', function() { }); }); - describe('without connection', function() { - beforeEach(function() { - subscriber.isConnected_ = function() { + describe('without connection', () => { + beforeEach(() => { + subscriber.isConnected_ = () => { return false; }; }); - it('should queue the message to be acked if no connection', function(done) { - subscriber.setFlushTimeout_ = function() { + it('should queue the message to be acked if no connection', done => { + subscriber.setFlushTimeout_ = () => { assert(subscriber.inventory_.ack.indexOf(MESSAGE.ackId) > -1); done(); }; @@ -249,8 +251,8 @@ describe('Subscriber', function() { subscriber.ack_(MESSAGE); }); - it('should break the lease on the message', function(done) { - subscriber.breakLease_ = function(message) { + it('should break the lease on the message', done => { + subscriber.breakLease_ = message => { assert.strictEqual(message, MESSAGE); done(); }; @@ -260,27 +262,26 @@ describe('Subscriber', function() { }); }); - describe('acknowledge_', function() { + describe('acknowledge_', () => { const fakeAckIds = ['a', 'b', 'c']; const batchSize = 3000; - const tooManyFakeAckIds = Array(batchSize * 2.5) - .fill('a') - .map(function(x, i) { - return x + i; - }); + const tooManyFakeAckIds = + new Array(batchSize * 2.5).fill('a').map((x, i) => { + return x + i; + }); const expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); - describe('without streaming connection', function() { - beforeEach(function() { - subscriber.isConnected_ = function() { + describe('without streaming connection', () => { + beforeEach(() => { + subscriber.isConnected_ = () => { return false; }; }); - it('should make the correct request', function(done) { + it('should make the correct request', done => { const fakePromisified = { - call: function(context, config) { + call(context, config) { assert.strictEqual(context, subscriber); assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'acknowledge'); @@ -293,7 +294,7 @@ describe('Subscriber', function() { }, }; - promisifyOverride = function(fn) { + promisifyOverride = fn => { assert.strictEqual(fn, subscriber.request); return fakePromisified; }; @@ -302,16 +303,14 @@ describe('Subscriber', function() { subscriber.acknowledge_(fakeAckIds); }); - it('should batch requests if there are too many ackIds', function(done) { + it('should batch requests if there are too many ackIds', done => { let receivedCalls = 0; const fakePromisified = { - call: function(context, config) { + call(context, config) { const offset = receivedCalls * batchSize; - const expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); + const expectedAckIds = + tooManyFakeAckIds.slice(offset, offset + batchSize); assert.deepStrictEqual(config.reqOpts.ackIds, expectedAckIds); @@ -324,7 +323,7 @@ describe('Subscriber', function() { }, }; - promisifyOverride = function() { + promisifyOverride = () => { return fakePromisified; }; @@ -332,19 +331,19 @@ describe('Subscriber', function() { subscriber.acknowledge_(tooManyFakeAckIds); }); - it('should emit any request errors', function(done) { + it('should emit any request errors', done => { const fakeError = new Error('err'); const fakePromisified = { - call: function() { + call() { return Promise.reject(fakeError); }, }; - promisifyOverride = function() { + promisifyOverride = () => { return fakePromisified; }; - subscriber.on('error', function(err) { + subscriber.on('error', err => { assert.strictEqual(err, fakeError); done(); }); @@ -353,19 +352,19 @@ describe('Subscriber', function() { }); }); - describe('with streaming connection', function() { - beforeEach(function() { - subscriber.isConnected_ = function() { + describe('with streaming connection', () => { + beforeEach(() => { + subscriber.isConnected_ = () => { return true; }; subscriber.writeToStreams_ = true; }); - it('should send the correct request', function(done) { + it('should send the correct request', done => { const fakeConnectionId = 'abc'; - subscriber.writeTo_ = function(connectionId, data) { + subscriber.writeTo_ = (connectionId, data) => { assert.strictEqual(connectionId, fakeConnectionId); assert.deepStrictEqual(data, {ackIds: fakeAckIds}); done(); @@ -374,18 +373,16 @@ describe('Subscriber', function() { subscriber.acknowledge_(fakeAckIds, fakeConnectionId); }); - it('should batch requests if there are too many ackIds', function(done) { + it('should batch requests if there are too many ackIds', done => { let receivedCalls = 0; const fakeConnectionId = 'abc'; - subscriber.writeTo_ = function(connectionId, data) { + subscriber.writeTo_ = (connectionId, data) => { assert.strictEqual(connectionId, fakeConnectionId); const offset = receivedCalls * batchSize; - const expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); + const expectedAckIds = + tooManyFakeAckIds.slice(offset, offset + batchSize); assert.deepStrictEqual(data, {ackIds: expectedAckIds}); @@ -397,14 +394,14 @@ describe('Subscriber', function() { subscriber.acknowledge_(tooManyFakeAckIds, fakeConnectionId); }); - it('should emit an error when unable to get a conn', function(done) { + it('should emit an error when unable to get a conn', done => { const error = new Error('err'); - subscriber.writeTo_ = function() { + subscriber.writeTo_ = () => { return Promise.reject(error); }; - subscriber.on('error', function(err) { + subscriber.on('error', err => { assert.strictEqual(err, error); done(); }); @@ -414,19 +411,19 @@ describe('Subscriber', function() { }); }); - describe('breakLease_', function() { + describe('breakLease_', () => { const MESSAGE = { ackId: 'abc', data: Buffer.from('hello'), length: 5, }; - beforeEach(function() { + beforeEach(() => { subscriber.inventory_.lease.push(MESSAGE.ackId); subscriber.inventory_.bytes += MESSAGE.length; }); - it('should remove the message from the lease array', function() { + it('should remove the message from the lease array', () => { assert.strictEqual(subscriber.inventory_.lease.length, 1); assert.strictEqual(subscriber.inventory_.bytes, MESSAGE.length); @@ -436,7 +433,7 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.inventory_.bytes, 0); }); - it('should noop for unknown messages', function() { + it('should noop for unknown messages', () => { const message = { ackId: 'def', data: Buffer.from('world'), @@ -449,44 +446,44 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.inventory_.bytes, 5); }); - describe('with connection pool', function() { - it('should resume receiving messages if paused', function(done) { + describe('with connection pool', () => { + it('should resume receiving messages if paused', done => { subscriber.connectionPool = { isPaused: true, resume: done, }; - subscriber.hasMaxMessages_ = function() { + subscriber.hasMaxMessages_ = () => { return false; }; subscriber.breakLease_(MESSAGE); }); - it('should not resume if it is not paused', function() { + it('should not resume if it is not paused', () => { subscriber.connectionPool = { isPaused: false, - resume: function() { + resume() { throw new Error('Should not be called.'); }, }; - subscriber.hasMaxMessages_ = function() { + subscriber.hasMaxMessages_ = () => { return false; }; subscriber.breakLease_(MESSAGE); }); - it('should not resume if the max message limit is hit', function() { + it('should not resume if the max message limit is hit', () => { subscriber.connectionPool = { isPaused: true, - resume: function() { + resume() { throw new Error('Should not be called.'); }, }; - subscriber.hasMaxMessages_ = function() { + subscriber.hasMaxMessages_ = () => { return true; }; @@ -494,7 +491,7 @@ describe('Subscriber', function() { }); }); - it('should quit auto-leasing if all leases are gone', function(done) { + it('should quit auto-leasing if all leases are gone', done => { subscriber.leaseTimeoutHandle_ = setTimeout(done, 1); subscriber.breakLease_(MESSAGE); @@ -502,7 +499,7 @@ describe('Subscriber', function() { setImmediate(done); }); - it('should continue to auto-lease if leases exist', function(done) { + it('should continue to auto-lease if leases exist', done => { subscriber.inventory_.lease.push(MESSAGE.ackId); subscriber.inventory_.lease.push('abcd'); @@ -511,22 +508,22 @@ describe('Subscriber', function() { }); }); - describe('close', function() { - beforeEach(function() { - subscriber.flushQueues_ = function() { + describe('close', () => { + beforeEach(() => { + subscriber.flushQueues_ = () => { return Promise.resolve(); }; subscriber.closeConnection_ = fakeUtil.noop; }); - it('should set the userClosed_ flag', function() { + it('should set the userClosed_ flag', () => { subscriber.close(); assert.strictEqual(subscriber.userClosed_, true); }); - it('should dump the inventory', function() { + it('should dump the inventory', () => { subscriber.inventory_ = { lease: [0, 1, 2], bytes: 123, @@ -540,7 +537,7 @@ describe('Subscriber', function() { }); }); - it('should stop auto-leasing', function(done) { + it('should stop auto-leasing', done => { subscriber.leaseTimeoutHandle_ = setTimeout(done, 1); subscriber.close(); @@ -548,8 +545,8 @@ describe('Subscriber', function() { setImmediate(done); }); - it('should flush immediately', function(done) { - subscriber.flushQueues_ = function() { + it('should flush immediately', done => { + subscriber.flushQueues_ = () => { setImmediate(done); return Promise.resolve(); }; @@ -557,66 +554,66 @@ describe('Subscriber', function() { subscriber.close(); }); - it('should call closeConnection_', function(done) { - subscriber.closeConnection_ = function(callback) { - callback(); // the done fn + it('should call closeConnection_', done => { + subscriber.closeConnection_ = callback => { + callback(); // the done fn }; subscriber.close(done); }); }); - describe('closeConnection_', function() { - afterEach(function() { - fakeUtil.noop = function() {}; + describe('closeConnection_', () => { + afterEach(() => { + fakeUtil.noop = () => {}; }); - it('should set isOpen to false', function() { + it('should set isOpen to false', () => { subscriber.closeConnection_(); assert.strictEqual(subscriber.isOpen, false); }); - describe('with connection pool', function() { - beforeEach(function() { + describe('with connection pool', () => { + beforeEach(() => { subscriber.connectionPool = { - close: function(callback) { - setImmediate(callback); // the done fn + close(callback) { + setImmediate(callback); // the done fn }, }; }); - it('should call close on the connection pool', function(done) { + it('should call close on the connection pool', done => { subscriber.closeConnection_(done); assert.strictEqual(subscriber.connectionPool, null); }); - it('should use a noop when callback is absent', function(done) { + it('should use a noop when callback is absent', done => { fakeUtil.noop = done; subscriber.closeConnection_(); assert.strictEqual(subscriber.connectionPool, null); }); }); - describe('without connection pool', function() { - beforeEach(function() { + describe('without connection pool', () => { + beforeEach(() => { subscriber.connectionPool = null; }); - it('should exec the callback if one is passed in', function(done) { + it('should exec the callback if one is passed in', done => { subscriber.closeConnection_(done); }); - it('should optionally accept a callback', function() { + it('should optionally accept a callback', () => { subscriber.closeConnection_(); }); }); }); - describe('flushQueues_', function() { - it('should cancel any pending flushes', function() { + describe('flushQueues_', () => { + it('should cancel any pending flushes', () => { let canceled = false; const fakeHandle = { - clear: function() { + clear() { canceled = true; }, }; @@ -628,69 +625,69 @@ describe('Subscriber', function() { assert.strictEqual(canceled, true); }); - it('should do nothing if theres nothing to ack/nack', function() { - subscriber.acknowledge_ = subscriber.modifyAckDeadline_ = function() { + it('should do nothing if theres nothing to ack/nack', () => { + subscriber.acknowledge_ = subscriber.modifyAckDeadline_ = () => { throw new Error('Should not be called.'); }; return subscriber.flushQueues_(); }); - it('should send any pending acks', function() { + it('should send any pending acks', () => { const fakeAckIds = (subscriber.inventory_.ack = ['abc', 'def']); - subscriber.acknowledge_ = function(ackIds) { + subscriber.acknowledge_ = ackIds => { assert.strictEqual(ackIds, fakeAckIds); return Promise.resolve(); }; - return subscriber.flushQueues_().then(function() { + return subscriber.flushQueues_().then(() => { assert.strictEqual(subscriber.inventory_.ack.length, 0); }); }); - it('should send any pending nacks', function() { + it('should send any pending nacks', () => { const fakeAckIds = ['ghi', 'jkl']; subscriber.inventory_.nack = fakeAckIds.map(ackId => [ackId, 0]); - subscriber.modifyAckDeadline_ = function(ackIds, deadline) { + subscriber.modifyAckDeadline_ = (ackIds, deadline) => { assert.deepStrictEqual(ackIds, fakeAckIds); assert.strictEqual(deadline, 0); return Promise.resolve(); }; - return subscriber.flushQueues_().then(function() { + return subscriber.flushQueues_().then(() => { assert.strictEqual(subscriber.inventory_.nack.length, 0); }); }); - it('should send any pending delayed nacks', function() { + it('should send any pending delayed nacks', () => { const fakeAckIds = ['ghi', 'jkl']; subscriber.inventory_.nack = fakeAckIds.map(ackId => [ackId, 1]); - subscriber.modifyAckDeadline_ = function(ackIds, deadline) { + subscriber.modifyAckDeadline_ = (ackIds, deadline) => { assert.deepStrictEqual(ackIds, fakeAckIds); assert.strictEqual(deadline, 1); return Promise.resolve(); }; - return subscriber.flushQueues_().then(function() { + return subscriber.flushQueues_().then(() => { assert.strictEqual(subscriber.inventory_.nack.length, 0); }); }); }); - describe('isConnected_', function() { - it('should return false if there is no pool', function() { + describe('isConnected_', () => { + it('should return false if there is no pool', () => { subscriber.connectionPool = null; assert.strictEqual(subscriber.isConnected_(), false); }); - it('should return false if the pool says its connected', function() { + it('should return false if the pool says its connected', () => { subscriber.connectionPool = { - isConnected: function() { + isConnected() { return false; }, }; @@ -698,9 +695,9 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.isConnected_(), false); }); - it('should return true if the pool says its connected', function() { + it('should return true if the pool says its connected', () => { subscriber.connectionPool = { - isConnected: function() { + isConnected() { return true; }, }; @@ -709,22 +706,22 @@ describe('Subscriber', function() { }); }); - describe('hasMaxMessages_', function() { - it('should return true if the number of leases >= maxMessages', function() { + describe('hasMaxMessages_', () => { + it('should return true if the number of leases >= maxMessages', () => { subscriber.inventory_.lease = ['a', 'b', 'c']; subscriber.flowControl.maxMessages = 3; assert(subscriber.hasMaxMessages_()); }); - it('should return true if bytes == maxBytes', function() { + it('should return true if bytes == maxBytes', () => { subscriber.inventory_.bytes = 1000; subscriber.flowControl.maxBytes = 1000; assert(subscriber.hasMaxMessages_()); }); - it('should return false if neither condition is met', function() { + it('should return false if neither condition is met', () => { subscriber.inventory_.lease = ['a', 'b']; subscriber.flowControl.maxMessages = 3; @@ -735,7 +732,7 @@ describe('Subscriber', function() { }); }); - describe('leaseMessage_', function() { + describe('leaseMessage_', () => { const MESSAGE = { ackId: 'abc', connectionId: 'def', @@ -743,13 +740,13 @@ describe('Subscriber', function() { length: 5, }; - beforeEach(function() { + beforeEach(() => { subscriber.setLeaseTimeout_ = fakeUtil.noop; subscriber.modifyAckDeadline_ = fakeUtil.noop; }); - it('should immediately modAck the message', function(done) { - subscriber.modifyAckDeadline_ = function(ackId, deadline, connId) { + it('should immediately modAck the message', done => { + subscriber.modifyAckDeadline_ = (ackId, deadline, connId) => { assert.strictEqual(ackId, MESSAGE.ackId); assert.strictEqual(deadline, subscriber.ackDeadline / 1000); assert.strictEqual(connId, MESSAGE.connectionId); @@ -759,61 +756,61 @@ describe('Subscriber', function() { subscriber.leaseMessage_(MESSAGE); }); - it('should add the ackId to the inventory', function() { + it('should add the ackId to the inventory', () => { subscriber.leaseMessage_(MESSAGE); assert.deepStrictEqual(subscriber.inventory_.lease, [MESSAGE.ackId]); }); - it('should update the byte count', function() { + it('should update the byte count', () => { assert.strictEqual(subscriber.inventory_.bytes, 0); subscriber.leaseMessage_(MESSAGE); assert.strictEqual(subscriber.inventory_.bytes, MESSAGE.length); }); - it('should begin auto-leasing', function(done) { + it('should begin auto-leasing', done => { subscriber.setLeaseTimeout_ = done; subscriber.leaseMessage_(MESSAGE); }); - it('should return the message', function() { + it('should return the message', () => { const message = subscriber.leaseMessage_(MESSAGE); assert.strictEqual(message, MESSAGE); }); }); - describe('listenForEvents_', function() { - beforeEach(function() { + describe('listenForEvents_', () => { + beforeEach(() => { subscriber.openConnection_ = fakeUtil.noop; subscriber.closeConnection_ = fakeUtil.noop; }); - describe('on new listener', function() { - it('should increment messageListeners', function() { + describe('on new listener', () => { + it('should increment messageListeners', () => { assert.strictEqual(subscriber.messageListeners, 0); subscriber.on('message', fakeUtil.noop); assert.strictEqual(subscriber.messageListeners, 1); }); - it('should ignore non-message events', function() { + it('should ignore non-message events', () => { subscriber.on('data', fakeUtil.noop); assert.strictEqual(subscriber.messageListeners, 0); }); - it('should open a connection', function(done) { + it('should open a connection', done => { subscriber.openConnection_ = done; subscriber.on('message', fakeUtil.noop); }); - it('should set the userClosed_ flag to false', function() { + it('should set the userClosed_ flag to false', () => { subscriber.userClosed_ = true; subscriber.on('message', fakeUtil.noop); assert.strictEqual(subscriber.userClosed_, false); }); - it('should not open a connection when one exists', function() { + it('should not open a connection when one exists', () => { subscriber.connectionPool = {}; - subscriber.openConnection_ = function() { + subscriber.openConnection_ = () => { throw new Error('Should not be called.'); }; @@ -821,10 +818,10 @@ describe('Subscriber', function() { }); }); - describe('on remove listener', function() { - const noop = function() {}; + describe('on remove listener', () => { + const noop = () => {}; - it('should decrement messageListeners', function() { + it('should decrement messageListeners', () => { subscriber.on('message', fakeUtil.noop); subscriber.on('message', noop); assert.strictEqual(subscriber.messageListeners, 2); @@ -833,7 +830,7 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.messageListeners, 1); }); - it('should ignore non-message events', function() { + it('should ignore non-message events', () => { subscriber.on('message', fakeUtil.noop); subscriber.on('message', noop); assert.strictEqual(subscriber.messageListeners, 2); @@ -842,7 +839,7 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.messageListeners, 2); }); - it('should close the connection when no listeners', function(done) { + it('should close the connection when no listeners', done => { subscriber.closeConnection_ = done; subscriber.on('message', noop); @@ -851,28 +848,27 @@ describe('Subscriber', function() { }); }); - describe('modifyAckDeadline_', function() { + describe('modifyAckDeadline_', () => { const fakeAckIds = ['a', 'b', 'c']; const fakeDeadline = 123; const batchSize = 3000; - const tooManyFakeAckIds = Array(batchSize * 2.5) - .fill('a') - .map(function(x, i) { - return x + i; - }); + const tooManyFakeAckIds = + new Array(batchSize * 2.5).fill('a').map((x, i) => { + return x + i; + }); const expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); - describe('without streaming connection', function() { - beforeEach(function() { - subscriber.isConnected_ = function() { + describe('without streaming connection', () => { + beforeEach(() => { + subscriber.isConnected_ = () => { return false; }; }); - it('should make the correct request', function(done) { + it('should make the correct request', done => { const fakePromisified = { - call: function(context, config) { + call(context, config) { assert.strictEqual(context, subscriber); assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'modifyAckDeadline'); @@ -886,7 +882,7 @@ describe('Subscriber', function() { }, }; - promisifyOverride = function(fn) { + promisifyOverride = fn => { assert.strictEqual(fn, subscriber.request); return fakePromisified; }; @@ -895,16 +891,14 @@ describe('Subscriber', function() { subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline); }); - it('should batch requests if there are too many ackIds', function(done) { + it('should batch requests if there are too many ackIds', done => { let receivedCalls = 0; const fakePromisified = { - call: function(context, config) { + call(context, config) { const offset = receivedCalls * batchSize; - const expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); + const expectedAckIds = + tooManyFakeAckIds.slice(offset, offset + batchSize); assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); assert.deepStrictEqual(config.reqOpts.ackIds, expectedAckIds); @@ -918,7 +912,7 @@ describe('Subscriber', function() { }, }; - promisifyOverride = function() { + promisifyOverride = () => { return fakePromisified; }; @@ -926,19 +920,19 @@ describe('Subscriber', function() { subscriber.modifyAckDeadline_(tooManyFakeAckIds, fakeDeadline); }); - it('should emit any request errors', function(done) { + it('should emit any request errors', done => { const fakeError = new Error('err'); const fakePromisified = { - call: function() { + call() { return Promise.reject(fakeError); }, }; - promisifyOverride = function() { + promisifyOverride = () => { return fakePromisified; }; - subscriber.on('error', function(err) { + subscriber.on('error', err => { assert.strictEqual(err, fakeError); done(); }); @@ -947,20 +941,21 @@ describe('Subscriber', function() { }); }); - describe('with streaming connection', function() { - beforeEach(function() { - subscriber.isConnected_ = function() { + describe('with streaming connection', () => { + beforeEach(() => { + subscriber.isConnected_ = () => { return true; }; subscriber.writeToStreams_ = true; }); - it('should send the correct request', function(done) { - const expectedDeadlines = Array(fakeAckIds.length).fill(fakeDeadline); + it('should send the correct request', done => { + const expectedDeadlines = + new Array(fakeAckIds.length).fill(fakeDeadline); const fakeConnId = 'abc'; - subscriber.writeTo_ = function(connectionId, data) { + subscriber.writeTo_ = (connectionId, data) => { assert.strictEqual(connectionId, fakeConnId); assert.deepStrictEqual(data.modifyDeadlineAckIds, fakeAckIds); assert.deepStrictEqual(data.modifyDeadlineSeconds, expectedDeadlines); @@ -970,21 +965,18 @@ describe('Subscriber', function() { subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); }); - it('should batch requests if there are too many ackIds', function(done) { + it('should batch requests if there are too many ackIds', done => { let receivedCalls = 0; const fakeConnId = 'abc'; - subscriber.writeTo_ = function(connectionId, data) { + subscriber.writeTo_ = (connectionId, data) => { assert.strictEqual(connectionId, fakeConnId); const offset = receivedCalls * batchSize; - const expectedAckIds = tooManyFakeAckIds.slice( - offset, - offset + batchSize - ); - const expectedDeadlines = Array(expectedAckIds.length).fill( - fakeDeadline - ); + const expectedAckIds = + tooManyFakeAckIds.slice(offset, offset + batchSize); + const expectedDeadlines = + new Array(expectedAckIds.length).fill(fakeDeadline); assert.deepStrictEqual(data.modifyDeadlineAckIds, expectedAckIds); assert.deepStrictEqual(data.modifyDeadlineSeconds, expectedDeadlines); @@ -995,20 +987,17 @@ describe('Subscriber', function() { }; subscriber.modifyAckDeadline_( - tooManyFakeAckIds, - fakeDeadline, - fakeConnId - ); + tooManyFakeAckIds, fakeDeadline, fakeConnId); }); - it('should emit an error when unable to get a conn', function(done) { + it('should emit an error when unable to get a conn', done => { const error = new Error('err'); - subscriber.writeTo_ = function() { + subscriber.writeTo_ = () => { return Promise.reject(error); }; - subscriber.on('error', function(err) { + subscriber.on('error', err => { assert.strictEqual(err, error); done(); }); @@ -1018,33 +1007,33 @@ describe('Subscriber', function() { }); }); - describe('nack_', function() { + describe('nack_', () => { const MESSAGE = { ackId: 'abc', connectionId: 'def', }; - beforeEach(function() { + beforeEach(() => { subscriber.breakLease_ = fakeUtil.noop; - subscriber.modifyAckDeadline_ = function() { + subscriber.modifyAckDeadline_ = () => { return Promise.resolve(); }; - subscriber.setFlushTimeout_ = function() { + subscriber.setFlushTimeout_ = () => { return Promise.resolve(); }; }); - describe('with connection', function() { - beforeEach(function() { - subscriber.isConnected_ = function() { + describe('with connection', () => { + beforeEach(() => { + subscriber.isConnected_ = () => { return true; }; subscriber.writeToStreams_ = true; }); - it('should nack if there is a connection', function(done) { - subscriber.modifyAckDeadline_ = function(ackId, deadline, connId) { + it('should nack if there is a connection', done => { + subscriber.modifyAckDeadline_ = (ackId, deadline, connId) => { assert.strictEqual(ackId, MESSAGE.ackId); assert.strictEqual(deadline, 0); assert.strictEqual(connId, MESSAGE.connectionId); @@ -1055,8 +1044,8 @@ describe('Subscriber', function() { subscriber.nack_(MESSAGE); }); - it('should break the lease on the message', function(done) { - subscriber.breakLease_ = function(message) { + it('should break the lease on the message', done => { + subscriber.breakLease_ = message => { assert.strictEqual(message, MESSAGE); done(); }; @@ -1064,8 +1053,8 @@ describe('Subscriber', function() { subscriber.nack_(MESSAGE); }); - it('should use the delay if passed', function(done) { - subscriber.modifyAckDeadline_ = function(ackId, deadline, connId) { + it('should use the delay if passed', done => { + subscriber.modifyAckDeadline_ = (ackId, deadline, connId) => { assert.strictEqual(ackId, MESSAGE.ackId); assert.strictEqual(deadline, 1); assert.strictEqual(connId, MESSAGE.connectionId); @@ -1077,19 +1066,17 @@ describe('Subscriber', function() { }); }); - describe('without connection', function() { - beforeEach(function() { - subscriber.isConnected_ = function() { + describe('without connection', () => { + beforeEach(() => { + subscriber.isConnected_ = () => { return false; }; }); - it('should queue the message to be nacked if no conn', function(done) { - subscriber.setFlushTimeout_ = function() { + it('should queue the message to be nacked if no conn', done => { + subscriber.setFlushTimeout_ = () => { assert.deepStrictEqual( - subscriber.inventory_.nack, - [[MESSAGE.ackId, 0]] - ); + subscriber.inventory_.nack, [[MESSAGE.ackId, 0]]); setImmediate(done); return Promise.resolve(); }; @@ -1097,8 +1084,8 @@ describe('Subscriber', function() { subscriber.nack_(MESSAGE); }); - it('should break the lease on the message', function(done) { - subscriber.breakLease_ = function(message) { + it('should break the lease on the message', done => { + subscriber.breakLease_ = message => { assert.strictEqual(message, MESSAGE); done(); }; @@ -1106,13 +1093,11 @@ describe('Subscriber', function() { subscriber.nack_(MESSAGE); }); - it('should use the delay if passed when queueing', function(done) { - subscriber.setFlushTimeout_ = function() { - assert( - subscriber.inventory_.nack.findIndex(element => { - return element[0] === MESSAGE.ackId && element[1] === 1; - }) > -1 - ); + it('should use the delay if passed when queueing', done => { + subscriber.setFlushTimeout_ = () => { + assert(subscriber.inventory_.nack.findIndex(element => { + return element[0] === MESSAGE.ackId && element[1] === 1; + }) > -1); setImmediate(done); return Promise.resolve(); }; @@ -1122,8 +1107,8 @@ describe('Subscriber', function() { }); }); - describe('openConnection_', function() { - it('should create a ConnectionPool instance', function() { + describe('openConnection_', () => { + it('should create a ConnectionPool instance', () => { subscriber.openConnection_(); assert(subscriber.connectionPool instanceof FakeConnectionPool); @@ -1131,10 +1116,10 @@ describe('Subscriber', function() { assert.strictEqual(args[0], subscriber); }); - it('should emit pool errors', function(done) { + it('should emit pool errors', done => { const error = new Error('err'); - subscriber.on('error', function(err) { + subscriber.on('error', err => { assert.strictEqual(err, error); done(); }); @@ -1143,21 +1128,21 @@ describe('Subscriber', function() { subscriber.connectionPool.emit('error', error); }); - it('should set isOpen to true', function() { + it('should set isOpen to true', () => { subscriber.openConnection_(); assert.strictEqual(subscriber.isOpen, true); }); - it('should lease & emit messages from pool', function(done) { + it('should lease & emit messages from pool', done => { const message = {}; const leasedMessage = {}; - subscriber.leaseMessage_ = function(message_) { + subscriber.leaseMessage_ = message_ => { assert.strictEqual(message_, message); return leasedMessage; }; - subscriber.on('message', function(message) { + subscriber.on('message', message => { assert.strictEqual(message, leasedMessage); done(); }); @@ -1166,15 +1151,15 @@ describe('Subscriber', function() { subscriber.connectionPool.emit('message', message); }); - it('should pause the pool if sub is at max messages', function(done) { + it('should pause the pool if sub is at max messages', done => { const message = {nack: fakeUtil.noop}; const leasedMessage = {}; - subscriber.leaseMessage_ = function() { + subscriber.leaseMessage_ = () => { return leasedMessage; }; - subscriber.hasMaxMessages_ = function() { + subscriber.hasMaxMessages_ = () => { return true; }; @@ -1184,22 +1169,22 @@ describe('Subscriber', function() { subscriber.connectionPool.emit('message', message); }); - it('should not re-pause the pool', function(done) { + it('should not re-pause the pool', done => { const message = {nack: fakeUtil.noop}; const leasedMessage = {}; - subscriber.leaseMessage_ = function() { + subscriber.leaseMessage_ = () => { return leasedMessage; }; - subscriber.hasMaxMessages_ = function() { + subscriber.hasMaxMessages_ = () => { return true; }; subscriber.openConnection_(); subscriber.connectionPool.isPaused = true; - subscriber.connectionPool.pause = function() { + subscriber.connectionPool.pause = () => { done(new Error('Should not have been called.')); }; @@ -1207,7 +1192,7 @@ describe('Subscriber', function() { done(); }); - it('should flush the queue when connected', function(done) { + it('should flush the queue when connected', done => { subscriber.flushQueues_ = done; subscriber.openConnection_(); @@ -1215,9 +1200,9 @@ describe('Subscriber', function() { }); }); - describe('renewLeases_', function() { - beforeEach(function() { - subscriber.modifyAckDeadline_ = function() { + describe('renewLeases_', () => { + beforeEach(() => { + subscriber.modifyAckDeadline_ = () => { return Promise.resolve(); }; }); @@ -1225,21 +1210,21 @@ describe('Subscriber', function() { const fakeDeadline = 9999; const fakeAckIds = ['abc', 'def']; - beforeEach(function() { + beforeEach(() => { subscriber.inventory_.lease = fakeAckIds; subscriber.setLeaseTimeout_ = fakeUtil.noop; - subscriber.histogram.percentile = function() { + subscriber.histogram.percentile = () => { return fakeDeadline; }; }); - it('should clean up the old timeout handle', function() { + it('should clean up the old timeout handle', () => { const fakeHandle = 123; let clearTimeoutCalled = false; const _clearTimeout = global.clearTimeout; - global.clearTimeout = function(handle) { + global.clearTimeout = handle => { assert.strictEqual(handle, fakeHandle); clearTimeoutCalled = true; }; @@ -1253,10 +1238,10 @@ describe('Subscriber', function() { global.clearTimeout = _clearTimeout; }); - it('should update the ackDeadline', function() { + it('should update the ackDeadline', () => { subscriber.request = subscriber.setLeaseTimeout_ = fakeUtil.noop; - subscriber.histogram.percentile = function(percent) { + subscriber.histogram.percentile = percent => { assert.strictEqual(percent, 99); return fakeDeadline; }; @@ -1265,14 +1250,14 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.ackDeadline, fakeDeadline); }); - it('should set the auto-lease timeout', function(done) { + it('should set the auto-lease timeout', done => { subscriber.request = fakeUtil.noop; subscriber.setLeaseTimeout_ = done; subscriber.renewLeases_(); }); - it('should not renew leases if inventory is empty', function() { - subscriber.modifyAckDeadline_ = function() { + it('should not renew leases if inventory is empty', () => { + subscriber.modifyAckDeadline_ = () => { throw new Error('Should not have been called.'); }; @@ -1280,8 +1265,8 @@ describe('Subscriber', function() { subscriber.renewLeases_(); }); - it('should modAck the leased messages', function(done) { - subscriber.modifyAckDeadline_ = function(ackIds, deadline) { + it('should modAck the leased messages', done => { + subscriber.modifyAckDeadline_ = (ackIds, deadline) => { assert.deepStrictEqual(ackIds, fakeAckIds); assert.strictEqual(deadline, subscriber.ackDeadline / 1000); @@ -1293,42 +1278,42 @@ describe('Subscriber', function() { subscriber.renewLeases_(); }); - it('should re-set the lease timeout', function(done) { + it('should re-set the lease timeout', done => { subscriber.setLeaseTimeout_ = done; subscriber.renewLeases_(); }); }); - describe('setFlushTimeout_', function() { + describe('setFlushTimeout_', () => { const FLUSH_TIMEOUT = 100; - beforeEach(function() { + beforeEach(() => { subscriber.batching.maxMilliseconds = FLUSH_TIMEOUT; }); - it('should set a flush timeout', function(done) { + it('should set a flush timeout', done => { let flushed = false; - subscriber.flushQueues_ = function() { + subscriber.flushQueues_ = () => { flushed = true; }; const delayPromise = delay(0); - const fakeBoundDelay = function() {}; + const fakeBoundDelay = () => {}; - delayPromise.clear.bind = function(context) { + delayPromise.clear.bind = context => { assert.strictEqual(context, delayPromise); return fakeBoundDelay; }; - delayOverride = function(timeout) { + delayOverride = timeout => { assert.strictEqual(timeout, FLUSH_TIMEOUT); return delayPromise; }; const promise = subscriber.setFlushTimeout_(); - promise.then(function() { + promise.then(() => { assert.strictEqual(subscriber.flushTimeoutHandle_, promise); assert.strictEqual(promise.clear, fakeBoundDelay); assert.strictEqual(flushed, true); @@ -1336,13 +1321,13 @@ describe('Subscriber', function() { }); }); - it('should swallow cancel errors', function() { + it('should swallow cancel errors', () => { const promise = subscriber.setFlushTimeout_(); promise.clear(); return promise; }); - it('should return the cached timeout', function() { + it('should return the cached timeout', () => { const fakeHandle = {}; subscriber.flushTimeoutHandle_ = fakeHandle; @@ -1352,42 +1337,43 @@ describe('Subscriber', function() { }); }); - describe('setLeaseTimeout_', function() { + describe('setLeaseTimeout_', () => { const fakeTimeoutHandle = 1234; const fakeRandom = 2; let globalSetTimeout; let globalMathRandom; - before(function() { + before(() => { globalSetTimeout = global.setTimeout; globalMathRandom = global.Math.random; }); - beforeEach(function() { + beforeEach(() => { subscriber.isOpen = true; subscriber.latency_ = { - percentile: function() { + percentile() { return 0; }, }; }); - after(function() { + after(() => { global.setTimeout = globalSetTimeout; global.Math.random = globalMathRandom; }); - it('should set a timeout to call renewLeases_', function(done) { + it('should set a timeout to call renewLeases_', done => { const ackDeadline = (subscriber.ackDeadline = 1000); - global.Math.random = function() { + global.Math.random = () => { return fakeRandom; }; - (global as any).setTimeout = function(callback, duration) { + // tslint:disable-next-line no-any + (global as any).setTimeout = (callback, duration) => { assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9); - setImmediate(callback); // the done fn + setImmediate(callback); // the done fn return fakeTimeoutHandle; }; @@ -1396,21 +1382,22 @@ describe('Subscriber', function() { assert.strictEqual(subscriber.leaseTimeoutHandle_, fakeTimeoutHandle); }); - it('should subtract the estimated latency', function(done) { + it('should subtract the estimated latency', done => { const latency = 1; - subscriber.latency_.percentile = function(percentile) { + subscriber.latency_.percentile = percentile => { assert.strictEqual(percentile, 99); return latency; }; const ackDeadline = (subscriber.ackDeadline = 1000); - global.Math.random = function() { + global.Math.random = () => { return fakeRandom; }; - (global as any).setTimeout = function(callback, duration) { + // tslint:disable-next-line no-any + (global as any).setTimeout = (callback, duration) => { assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9 - latency); done(); }; @@ -1418,16 +1405,16 @@ describe('Subscriber', function() { subscriber.setLeaseTimeout_(); }); - it('should not set a timeout if one already exists', function() { - subscriber.renewLeases_ = function() { + it('should not set a timeout if one already exists', () => { + subscriber.renewLeases_ = () => { throw new Error('Should not be called.'); }; - global.Math.random = function() { + global.Math.random = () => { throw new Error('Should not be called.'); }; - global.setTimeout = function() { + global.setTimeout = () => { throw new Error('Should not be called.'); }; @@ -1435,16 +1422,16 @@ describe('Subscriber', function() { subscriber.setLeaseTimeout_(); }); - it('should not set a timeout if the sub is closed', function() { - subscriber.renewLeases_ = function() { + it('should not set a timeout if the sub is closed', () => { + subscriber.renewLeases_ = () => { throw new Error('Should not be called.'); }; - global.Math.random = function() { + global.Math.random = () => { throw new Error('Should not be called.'); }; - global.setTimeout = function() { + global.setTimeout = () => { throw new Error('Should not be called.'); }; @@ -1453,47 +1440,48 @@ describe('Subscriber', function() { }); }); - describe('writeTo_', function() { + describe('writeTo_', () => { const CONNECTION_ID = 'abc'; + // tslint:disable-next-line no-any const CONNECTION: any = {}; - beforeEach(function() { + beforeEach(() => { subscriber.connectionPool = { - acquire: function(connId, cb) { + acquire(connId, cb) { cb(null, CONNECTION); }, }; }); - it('should return a promise', function() { - subscriber.connectionPool.acquire = function() {}; + it('should return a promise', () => { + subscriber.connectionPool.acquire = () => {}; const returnValue = subscriber.writeTo_(); assert(returnValue instanceof Promise); }); - it('should reject the promise if unable to acquire stream', function() { + it('should reject the promise if unable to acquire stream', () => { const fakeError = new Error('err'); - subscriber.connectionPool.acquire = function(connId, cb) { + subscriber.connectionPool.acquire = (connId, cb) => { assert.strictEqual(connId, CONNECTION_ID); cb(fakeError); }; - return subscriber.writeTo_(CONNECTION_ID, {}).then( - function() { - throw new Error('Should not resolve.'); - }, - function(err) { - assert.strictEqual(err, fakeError); - } - ); + return subscriber.writeTo_(CONNECTION_ID, {}) + .then( + () => { + throw new Error('Should not resolve.'); + }, + err => { + assert.strictEqual(err, fakeError); + }); }); - it('should write to the stream', function(done) { + it('should write to the stream', done => { const fakeData = {a: 'b'}; - CONNECTION.write = function(data) { + CONNECTION.write = data => { assert.strictEqual(data, fakeData); done(); }; @@ -1501,19 +1489,19 @@ describe('Subscriber', function() { subscriber.writeTo_(CONNECTION_ID, fakeData); }); - it('should capture the write latency when successful', function() { + it('should capture the write latency when successful', () => { const fakeLatency = 500; let capturedLatency; - CONNECTION.write = function(data, cb) { + CONNECTION.write = (data, cb) => { setTimeout(cb, fakeLatency, null); }; - subscriber.latency_.add = function(value) { + subscriber.latency_.add = value => { capturedLatency = value; }; - return subscriber.writeTo_(CONNECTION_ID, {}).then(function() { + return subscriber.writeTo_(CONNECTION_ID, {}).then(() => { const upper = fakeLatency + 50; const lower = fakeLatency - 50; From 996a7b74bad5d8c4c2497a1ab50ef30bde0c1831 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Fri, 23 Nov 2018 12:08:22 +0530 Subject: [PATCH 0280/1115] refactor(ts): Added ts style fix for test/subscription.ts (#372) --- handwritten/pubsub/test/subscription.ts | 334 ++++++++++++------------ 1 file changed, 166 insertions(+), 168 deletions(-) diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 80764469ea4..868aa734bf8 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -14,12 +14,13 @@ * limitations under the License. */ +import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; -import * as util from '../src/util'; import * as proxyquire from 'proxyquire'; -import * as pfy from '@google-cloud/promisify'; import * as sinon from 'sinon'; +import * as util from '../src/util'; + let promisified = false; const fakePromisify = Object.assign({}, pfy, { promisifyAll: (klass, options) => { @@ -53,7 +54,7 @@ class FakeSubscriber { } } -describe('Subscription', function() { +describe('Subscription', () => { // tslint:disable-next-line no-any variable-name let Subscription: any; // tslint:disable-next-line no-any @@ -70,54 +71,54 @@ describe('Subscription', function() { request: util.noop, }; - before(function() { + before(() => { Subscription = proxyquire('../src/subscription.js', { - '@google-cloud/promisify': fakePromisify, - './iam.js': {IAM: FakeIAM}, - './snapshot.js': {Snapshot: FakeSnapshot}, - './subscriber.js': {Subscriber: FakeSubscriber}, - }).Subscription; + '@google-cloud/promisify': fakePromisify, + './iam.js': {IAM: FakeIAM}, + './snapshot.js': {Snapshot: FakeSnapshot}, + './subscriber.js': {Subscriber: FakeSubscriber}, + }).Subscription; }); const sandbox = sinon.createSandbox(); - beforeEach(function() { + beforeEach(() => { PUBSUB.request = util.noop; subscription = new Subscription(PUBSUB, SUB_NAME); }); afterEach(() => sandbox.restore()); - describe('initialization', function() { - it('should promisify all the things', function() { + describe('initialization', () => { + it('should promisify all the things', () => { assert(promisified); }); - it('should localize pubsub.Promise', function() { + it('should localize pubsub.Promise', () => { assert.strictEqual(subscription.Promise, PUBSUB.Promise); }); - it('should localize the pubsub object', function() { + it('should localize the pubsub object', () => { assert.strictEqual(subscription.pubsub, PUBSUB); }); - it('should localize the project id', function() { + it('should localize the project id', () => { assert.strictEqual(subscription.projectId, PROJECT_ID); }); - it('should localize pubsub request method', function(done) { - PUBSUB.request = function(callback) { - callback(); // the done fn + it('should localize pubsub request method', done => { + PUBSUB.request = callback => { + callback(); // the done fn }; const subscription = new Subscription(PUBSUB, SUB_NAME); subscription.request(done); }); - it('should format the sub name', function() { + it('should format the sub name', () => { const formattedName = 'a/b/c/d'; const formatName = Subscription.formatName_; - Subscription.formatName_ = function(projectId, name) { + Subscription.formatName_ = (projectId, name) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, SUB_NAME); @@ -130,13 +131,13 @@ describe('Subscription', function() { assert.strictEqual(subscription.name, formattedName); }); - it('should make a create method if a topic is found', function(done) { + it('should make a create method if a topic is found', done => { const TOPIC_NAME = 'test-topic'; - PUBSUB.createSubscription = function(topic, subName, callback) { + PUBSUB.createSubscription = (topic, subName, callback) => { assert.strictEqual(topic, TOPIC_NAME); assert.strictEqual(subName, SUB_NAME); - callback(); // the done function + callback(); // the done function }; const subscription = new Subscription(PUBSUB, SUB_NAME, { @@ -146,7 +147,7 @@ describe('Subscription', function() { subscription.create(done); }); - it('should create an IAM object', function() { + it('should create an IAM object', () => { assert(subscription.iam instanceof FakeIAM); const args = subscription.iam.calledWith_; @@ -155,7 +156,7 @@ describe('Subscription', function() { assert.strictEqual(args[1], subscription.name); }); - it('should inherit from Subscriber', function() { + it('should inherit from Subscriber', () => { const options = {}; const subscription = new Subscription(PUBSUB, SUB_NAME, options); @@ -164,8 +165,8 @@ describe('Subscription', function() { }); }); - describe('formatMetadata_', function() { - it('should make a copy of the metadata', function() { + describe('formatMetadata_', () => { + it('should make a copy of the metadata', () => { const metadata = {a: 'a'}; const formatted = Subscription.formatMetadata_(metadata); @@ -173,7 +174,7 @@ describe('Subscription', function() { assert.notStrictEqual(metadata, formatted); }); - it('should format messageRetentionDuration', function() { + it('should format messageRetentionDuration', () => { const threeDaysInSeconds = 3 * 24 * 60 * 60; const metadata = { @@ -186,16 +187,14 @@ describe('Subscription', function() { assert.strictEqual(formatted.messageRetentionDuration.nanos, 0); assert.strictEqual( - formatted.messageRetentionDuration.seconds, - threeDaysInSeconds - ); + formatted.messageRetentionDuration.seconds, threeDaysInSeconds); }); - it('should format pushEndpoint', function() { + it('should format pushEndpoint', () => { const pushEndpoint = 'http://noop.com/push'; const metadata = { - pushEndpoint: pushEndpoint, + pushEndpoint, }; const formatted = Subscription.formatMetadata_(metadata); @@ -205,37 +204,37 @@ describe('Subscription', function() { }); }); - describe('formatName_', function() { - it('should format name', function() { + describe('formatName_', () => { + it('should format name', () => { const formattedName = Subscription.formatName_(PROJECT_ID, SUB_NAME); assert.strictEqual(formattedName, SUB_FULL_NAME); }); - it('should format name when given a complete name', function() { + it('should format name when given a complete name', () => { const formattedName = Subscription.formatName_(PROJECT_ID, SUB_FULL_NAME); assert.strictEqual(formattedName, SUB_FULL_NAME); }); }); - describe('createSnapshot', function() { + describe('createSnapshot', () => { const SNAPSHOT_NAME = 'test-snapshot'; - beforeEach(function() { - subscription.snapshot = function(name) { + beforeEach(() => { + subscription.snapshot = (name) => { return { - name: name, + name, }; }; }); - it('should throw an error if a snapshot name is not found', function() { - assert.throws(function() { + it('should throw an error if a snapshot name is not found', () => { + assert.throws(() => { subscription.createSnapshot(); }, /A name is required to create a snapshot\./); }); - it('should make the correct request', function(done) { - subscription.request = function(config) { + it('should make the correct request', done => { + subscription.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSnapshot'); assert.deepStrictEqual(config.reqOpts, { @@ -248,10 +247,10 @@ describe('Subscription', function() { subscription.createSnapshot(SNAPSHOT_NAME, assert.ifError); }); - it('should optionally accept gax options', function(done) { + it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = function(config) { + subscription.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -259,15 +258,15 @@ describe('Subscription', function() { subscription.createSnapshot(SNAPSHOT_NAME, gaxOpts, assert.ifError); }); - it('should pass back any errors to the callback', function(done) { + it('should pass back any errors to the callback', done => { const error = new Error('err'); const apiResponse = {}; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { callback(error, apiResponse); }; - subscription.createSnapshot(SNAPSHOT_NAME, function(err, snapshot, resp) { + subscription.createSnapshot(SNAPSHOT_NAME, (err, snapshot, resp) => { assert.strictEqual(err, error); assert.strictEqual(snapshot, null); assert.strictEqual(resp, apiResponse); @@ -275,19 +274,19 @@ describe('Subscription', function() { }); }); - it('should return a snapshot object with metadata', function(done) { + it('should return a snapshot object with metadata', done => { const apiResponse = {}; const fakeSnapshot = {}; - subscription.snapshot = function() { + subscription.snapshot = () => { return fakeSnapshot; }; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { callback(null, apiResponse); }; - subscription.createSnapshot(SNAPSHOT_NAME, function(err, snapshot, resp) { + subscription.createSnapshot(SNAPSHOT_NAME, (err, snapshot, resp) => { assert.ifError(err); assert.strictEqual(snapshot, fakeSnapshot); assert.strictEqual(snapshot.metadata, apiResponse); @@ -297,14 +296,14 @@ describe('Subscription', function() { }); }); - describe('delete', function() { - beforeEach(function() { + describe('delete', () => { + beforeEach(() => { subscription.removeAllListeners = util.noop; subscription.close = util.noop; }); - it('should make the correct request', function(done) { - subscription.request = function(config) { + it('should make the correct request', done => { + subscription.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSubscription'); assert.deepStrictEqual(config.reqOpts, { @@ -316,10 +315,10 @@ describe('Subscription', function() { subscription.delete(assert.ifError); }); - it('should optionally accept gax options', function(done) { + it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = function(config) { + subscription.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -327,16 +326,16 @@ describe('Subscription', function() { subscription.delete(gaxOpts, assert.ifError); }); - describe('success', function() { + describe('success', () => { const apiResponse = {}; - beforeEach(function() { - subscription.request = function(config, callback) { + beforeEach(() => { + subscription.request = (config, callback) => { callback(null, apiResponse); }; }); - it('should optionally accept a callback', function(done) { + it('should optionally accept a callback', done => { sandbox.stub(util, 'noop').callsFake((err?, resp?) => { assert.ifError(err); assert.strictEqual(resp, apiResponse); @@ -345,36 +344,36 @@ describe('Subscription', function() { subscription.delete(); }); - it('should return the api response', function(done) { - subscription.delete(function(err, resp) { + it('should return the api response', done => { + subscription.delete((err, resp) => { assert.ifError(err); assert.strictEqual(resp, apiResponse); done(); }); }); - it('should remove all message listeners', function(done) { + it('should remove all message listeners', done => { let called = false; - subscription.removeAllListeners = function() { + subscription.removeAllListeners = () => { called = true; }; - subscription.delete(function(err) { + subscription.delete(err => { assert.ifError(err); assert(called); done(); }); }); - it('should close the subscription', function(done) { + it('should close the subscription', done => { let called = false; - subscription.close = function() { + subscription.close = () => { called = true; }; - subscription.delete(function(err) { + subscription.delete(err => { assert.ifError(err); assert(called); done(); @@ -382,77 +381,77 @@ describe('Subscription', function() { }); }); - describe('error', function() { + describe('error', () => { const error = new Error('err'); - beforeEach(function() { - subscription.request = function(config, callback) { + beforeEach(() => { + subscription.request = (config, callback) => { callback(error); }; }); - it('should return the error to the callback', function(done) { - subscription.delete(function(err) { + it('should return the error to the callback', done => { + subscription.delete(err => { assert.strictEqual(err, error); done(); }); }); - it('should not remove all the listeners', function(done) { - subscription.removeAllListeners = function() { + it('should not remove all the listeners', done => { + subscription.removeAllListeners = () => { done(new Error('Should not be called.')); }; - subscription.delete(function() { + subscription.delete(() => { done(); }); }); - it('should not close the subscription', function(done) { - subscription.close = function() { + it('should not close the subscription', done => { + subscription.close = () => { done(new Error('Should not be called.')); }; - subscription.delete(function() { + subscription.delete(() => { done(); }); }); }); }); - describe('exists', function() { - it('should return true if it finds metadata', function(done) { - subscription.getMetadata = function(callback) { + describe('exists', () => { + it('should return true if it finds metadata', done => { + subscription.getMetadata = callback => { callback(null, {}); }; - subscription.exists(function(err, exists) { + subscription.exists((err, exists) => { assert.ifError(err); assert(exists); done(); }); }); - it('should return false if a not found error occurs', function(done) { - subscription.getMetadata = function(callback) { + it('should return false if a not found error occurs', done => { + subscription.getMetadata = callback => { callback({code: 5}); }; - subscription.exists(function(err, exists) { + subscription.exists((err, exists) => { assert.ifError(err); assert.strictEqual(exists, false); done(); }); }); - it('should pass back any other type of error', function(done) { + it('should pass back any other type of error', done => { const error = {code: 4}; - subscription.getMetadata = function(callback) { + subscription.getMetadata = callback => { callback(error); }; - subscription.exists(function(err, exists) { + subscription.exists((err, exists) => { assert.strictEqual(err, error); assert.strictEqual(exists, undefined); done(); @@ -460,18 +459,18 @@ describe('Subscription', function() { }); }); - describe('get', function() { - beforeEach(function() { + describe('get', () => { + beforeEach(() => { subscription.create = util.noop; }); - it('should delete the autoCreate option', function(done) { + it('should delete the autoCreate option', done => { const options = { autoCreate: true, a: 'a', }; - subscription.getMetadata = function(gaxOpts) { + subscription.getMetadata = gaxOpts => { assert.strictEqual(gaxOpts, options); assert.strictEqual(gaxOpts.autoCreate, undefined); done(); @@ -480,17 +479,17 @@ describe('Subscription', function() { subscription.get(options, assert.ifError); }); - describe('success', function() { + describe('success', () => { const fakeMetadata = {}; - beforeEach(function() { - subscription.getMetadata = function(gaxOpts, callback) { + beforeEach(() => { + subscription.getMetadata = (gaxOpts, callback) => { callback(null, fakeMetadata); }; }); - it('should call through to getMetadata', function(done) { - subscription.get(function(err, sub, resp) { + it('should call through to getMetadata', done => { + subscription.get((err, sub, resp) => { assert.ifError(err); assert.strictEqual(sub, subscription); assert.strictEqual(resp, fakeMetadata); @@ -498,28 +497,28 @@ describe('Subscription', function() { }); }); - it('should optionally accept options', function(done) { + it('should optionally accept options', done => { const options = {}; - subscription.getMetadata = function(gaxOpts, callback) { + subscription.getMetadata = (gaxOpts, callback) => { assert.strictEqual(gaxOpts, options); - callback(); // the done fn + callback(); // the done fn }; subscription.get(options, done); }); }); - describe('error', function() { - it('should pass back errors when not auto-creating', function(done) { + describe('error', () => { + it('should pass back errors when not auto-creating', done => { const error = {code: 4}; const apiResponse = {}; - subscription.getMetadata = function(gaxOpts, callback) { + subscription.getMetadata = (gaxOpts, callback) => { callback(error, apiResponse); }; - subscription.get(function(err, sub, resp) { + subscription.get((err, sub, resp) => { assert.strictEqual(err, error); assert.strictEqual(sub, null); assert.strictEqual(resp, apiResponse); @@ -527,15 +526,15 @@ describe('Subscription', function() { }); }); - it('should pass back 404 errors if autoCreate is false', function(done) { + it('should pass back 404 errors if autoCreate is false', done => { const error = {code: 5}; const apiResponse = {}; - subscription.getMetadata = function(gaxOpts, callback) { + subscription.getMetadata = (gaxOpts, callback) => { callback(error, apiResponse); }; - subscription.get(function(err, sub, resp) { + subscription.get((err, sub, resp) => { assert.strictEqual(err, error); assert.strictEqual(sub, null); assert.strictEqual(resp, apiResponse); @@ -543,17 +542,17 @@ describe('Subscription', function() { }); }); - it('should pass back 404 errors if create doesnt exist', function(done) { + it('should pass back 404 errors if create doesnt exist', done => { const error = {code: 5}; const apiResponse = {}; - subscription.getMetadata = function(gaxOpts, callback) { + subscription.getMetadata = (gaxOpts, callback) => { callback(error, apiResponse); }; delete subscription.create; - subscription.get(function(err, sub, resp) { + subscription.get((err, sub, resp) => { assert.strictEqual(err, error); assert.strictEqual(sub, null); assert.strictEqual(resp, apiResponse); @@ -561,7 +560,7 @@ describe('Subscription', function() { }); }); - it('should create the sub if 404 + autoCreate is true', function(done) { + it('should create the sub if 404 + autoCreate is true', done => { const error = {code: 5}; const apiResponse = {}; @@ -569,13 +568,13 @@ describe('Subscription', function() { autoCreate: true, }; - subscription.getMetadata = function(gaxOpts, callback) { + subscription.getMetadata = (gaxOpts, callback) => { callback(error, apiResponse); }; - subscription.create = function(options, callback) { + subscription.create = (options, callback) => { assert.strictEqual(options, fakeOptions); - callback(); // the done fn + callback(); // the done fn }; subscription.get(fakeOptions, done); @@ -583,9 +582,9 @@ describe('Subscription', function() { }); }); - describe('getMetadata', function() { - it('should make the correct request', function(done) { - subscription.request = function(config) { + describe('getMetadata', () => { + it('should make the correct request', done => { + subscription.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getSubscription'); assert.deepStrictEqual(config.reqOpts, { @@ -597,10 +596,10 @@ describe('Subscription', function() { subscription.getMetadata(assert.ifError); }); - it('should optionally accept gax options', function(done) { + it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = function(config) { + subscription.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -608,29 +607,29 @@ describe('Subscription', function() { subscription.getMetadata(gaxOpts, assert.ifError); }); - it('should pass back any errors that occur', function(done) { + it('should pass back any errors that occur', done => { const error = new Error('err'); const apiResponse = {}; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { callback(error, apiResponse); }; - subscription.getMetadata(function(err, metadata) { + subscription.getMetadata((err, metadata) => { assert.strictEqual(err, error); assert.strictEqual(metadata, apiResponse); done(); }); }); - it('should set the metadata if no error occurs', function(done) { + it('should set the metadata if no error occurs', done => { const apiResponse = {}; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { callback(null, apiResponse); }; - subscription.getMetadata(function(err, metadata) { + subscription.getMetadata((err, metadata) => { assert.ifError(err); assert.strictEqual(metadata, apiResponse); assert.strictEqual(subscription.metadata, apiResponse); @@ -639,106 +638,106 @@ describe('Subscription', function() { }); }); - describe('modifyPushConfig', function() { + describe('modifyPushConfig', () => { const fakeConfig = {}; - it('should make the correct request', function(done) { - subscription.request = function(config, callback) { + it('should make the correct request', done => { + subscription.request = (config, callback) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'modifyPushConfig'); assert.deepStrictEqual(config.reqOpts, { subscription: subscription.name, pushConfig: fakeConfig, }); - callback(); // the done fn + callback(); // the done fn }; subscription.modifyPushConfig(fakeConfig, done); }); - it('should optionally accept gaxOpts', function(done) { + it('should optionally accept gaxOpts', done => { const gaxOpts = {}; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn + callback(); // the done fn }; subscription.modifyPushConfig(fakeConfig, gaxOpts, done); }); }); - describe('seek', function() { + describe('seek', () => { const FAKE_SNAPSHOT_NAME = 'a'; const FAKE_FULL_SNAPSHOT_NAME = 'a/b/c/d'; - beforeEach(function() { - FakeSnapshot.formatName_ = function() { + beforeEach(() => { + FakeSnapshot.formatName_ = () => { return FAKE_FULL_SNAPSHOT_NAME; }; }); - it('should throw if a name or date is not provided', function() { - assert.throws(function() { + it('should throw if a name or date is not provided', () => { + assert.throws(() => { subscription.seek(); }, /Either a snapshot name or Date is needed to seek to\./); }); - it('should make the correct api request', function(done) { - FakeSnapshot.formatName_ = function(projectId, name) { + it('should make the correct api request', done => { + FakeSnapshot.formatName_ = (projectId, name) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, FAKE_SNAPSHOT_NAME); return FAKE_FULL_SNAPSHOT_NAME; }; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'seek'); assert.deepStrictEqual(config.reqOpts, { subscription: subscription.name, snapshot: FAKE_FULL_SNAPSHOT_NAME, }); - callback(); // the done fn + callback(); // the done fn }; subscription.seek(FAKE_SNAPSHOT_NAME, done); }); - it('should optionally accept a Date object', function(done) { + it('should optionally accept a Date object', done => { const date = new Date(); - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { assert.strictEqual(config.reqOpts.time, date); - callback(); // the done fn + callback(); // the done fn }; subscription.seek(date, done); }); - it('should optionally accept gax options', function(done) { + it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn + callback(); // the done fn }; subscription.seek(FAKE_SNAPSHOT_NAME, gaxOpts, done); }); }); - describe('setMetadata', function() { + describe('setMetadata', () => { const METADATA = { pushEndpoint: 'http://noop.com/push', }; - beforeEach(function() { - Subscription.formatMetadata_ = function(metadata) { + beforeEach(() => { + Subscription.formatMetadata_ = metadata => { return Object.assign({}, metadata); }; }); - it('should make the correct request', function(done) { + it('should make the correct request', done => { const formattedMetadata = { pushConfig: { pushEndpoint: METADATA.pushEndpoint, @@ -746,46 +745,45 @@ describe('Subscription', function() { }; const expectedBody = Object.assign( - { - name: SUB_FULL_NAME, - }, - formattedMetadata - ); + { + name: SUB_FULL_NAME, + }, + formattedMetadata); - Subscription.formatMetadata_ = function(metadata) { + Subscription.formatMetadata_ = metadata => { assert.strictEqual(metadata, METADATA); return formattedMetadata; }; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'updateSubscription'); assert.deepStrictEqual(config.reqOpts.subscription, expectedBody); assert.deepStrictEqual(config.reqOpts.updateMask, { paths: ['push_config'], }); - callback(); // the done fn + callback(); // the done fn }; subscription.setMetadata(METADATA, done); }); - it('should optionally accept gax options', function(done) { + it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = function(config, callback) { + subscription.request = (config, callback) => { assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn + callback(); // the done fn }; subscription.setMetadata(METADATA, gaxOpts, done); }); }); - describe('snapshot', function() { + describe('snapshot', () => { const SNAPSHOT_NAME = 'a'; - it('should call through to pubsub.snapshot', function(done) { + it('should call through to pubsub.snapshot', done => { PUBSUB.snapshot = function(name) { assert.strictEqual(this, subscription); assert.strictEqual(name, SNAPSHOT_NAME); From 04d8baf71e02e3f77491137614cad9cb274c218b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 22 Nov 2018 22:41:24 -0800 Subject: [PATCH 0281/1115] chore(deps): update dependency @types/sinon to v5.0.7 (#349) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5d786117b13..208be9418b3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -71,7 +71,7 @@ "@types/is": "0.0.21", "@types/mocha": "^5.2.5", "@types/proxyquire": "^1.3.28", - "@types/sinon": "5.0.5", + "@types/sinon": "^5.0.7", "@types/through2": "^2.0.34", "@types/uuid": "^3.4.4", "codecov": "^3.0.0", From b57dfe4a386fba0e024b0586efc473941c321c46 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Fri, 23 Nov 2018 23:44:35 +0530 Subject: [PATCH 0282/1115] refactor(ts): Added ts style fix for test/topic.ts (#373) --- handwritten/pubsub/test/topic.ts | 254 +++++++++++++++---------------- 1 file changed, 126 insertions(+), 128 deletions(-) diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index a7f9c51bc95..34d62123c11 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -14,12 +14,13 @@ * limitations under the License. */ - import * as assert from 'assert'; -import * as proxyquire from 'proxyquire'; -import * as util from '../src/util'; import * as pfy from '@google-cloud/promisify'; +import * as assert from 'assert'; +import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; +import * as util from '../src/util'; + let promisified = false; const fakePromisify = Object.assign({}, pfy, { promisifyAll: (klass, options) => { @@ -47,7 +48,8 @@ class FakePublisher { let extended = false; const fakePaginator = { - extend: function(Class, methods) { + // tslint:disable-next-line variable-name + extend(Class, methods) { if (Class.name !== 'Topic') { return; } @@ -55,12 +57,12 @@ const fakePaginator = { assert.deepStrictEqual(methods, ['getSubscriptions']); extended = true; }, - streamify: function(methodName) { + streamify(methodName) { return methodName; }, }; -describe('Topic', function() { +describe('Topic', () => { // tslint:disable-next-line no-any variable-name let Topic: any; // tslint:disable-next-line no-any @@ -78,46 +80,46 @@ describe('Topic', function() { request: util.noop, }; - before(function() { + before(() => { Topic = proxyquire('../src/topic.js', { - '@google-cloud/promisify': fakePromisify, - '@google-cloud/paginator': { - paginator: fakePaginator, - }, - './iam': {IAM: FakeIAM}, - './publisher': {Publisher: FakePublisher}, - }).Topic; + '@google-cloud/promisify': fakePromisify, + '@google-cloud/paginator': { + paginator: fakePaginator, + }, + './iam': {IAM: FakeIAM}, + './publisher': {Publisher: FakePublisher}, + }).Topic; }); const sandbox = sinon.createSandbox(); - beforeEach(function() { + beforeEach(() => { topic = new Topic(PUBSUB, TOPIC_NAME); topic.parent = PUBSUB; }); afterEach(() => sandbox.restore()); - describe('initialization', function() { - it('should extend the correct methods', function() { - assert(extended); // See `fakePaginator.extend` + describe('initialization', () => { + it('should extend the correct methods', () => { + assert(extended); // See `fakePaginator.extend` }); - it('should streamify the correct methods', function() { + it('should streamify the correct methods', () => { assert.strictEqual(topic.getSubscriptionsStream, 'getSubscriptions'); }); - it('should promisify all the things', function() { + it('should promisify all the things', () => { assert(promisified); }); - it('should localize pubsub.Promise', function() { + it('should localize pubsub.Promise', () => { assert.strictEqual(topic.Promise, PUBSUB.Promise); }); - it('should format the name', function() { + it('should format the name', () => { const formattedName = 'a/b/c/d'; const formatName_ = Topic.formatName_; - Topic.formatName_ = function(projectId, name) { + Topic.formatName_ = (projectId, name) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, TOPIC_NAME); @@ -130,110 +132,108 @@ describe('Topic', function() { assert.strictEqual(topic.name, formattedName); }); - it('should localize the parent object', function() { + it('should localize the parent object', () => { assert.strictEqual(topic.parent, PUBSUB); assert.strictEqual(topic.pubsub, PUBSUB); }); - it('should localize the request function', function(done) { - PUBSUB.request = function(callback) { - callback(); // the done fn + it('should localize the request function', done => { + PUBSUB.request = callback => { + callback(); // the done fn }; const topic = new Topic(PUBSUB, TOPIC_NAME); topic.request(done); }); - it('should create an iam object', function() { + it('should create an iam object', () => { assert.deepStrictEqual(topic.iam.calledWith_, [PUBSUB, TOPIC_NAME]); }); }); - describe('formatName_', function() { - it('should format name', function() { - const formattedName = Topic.formatName_( - PROJECT_ID, - TOPIC_UNFORMATTED_NAME - ); + describe('formatName_', () => { + it('should format name', () => { + const formattedName = + Topic.formatName_(PROJECT_ID, TOPIC_UNFORMATTED_NAME); assert.strictEqual(formattedName, TOPIC_NAME); }); - it('should format name when given a complete name', function() { + it('should format name when given a complete name', () => { const formattedName = Topic.formatName_(PROJECT_ID, TOPIC_NAME); assert.strictEqual(formattedName, TOPIC_NAME); }); }); - describe('create', function() { - it('should call the parent createTopic method', function(done) { + describe('create', () => { + it('should call the parent createTopic method', done => { const options_ = {}; - PUBSUB.createTopic = function(name, options, callback) { + PUBSUB.createTopic = (name, options, callback) => { assert.strictEqual(name, topic.name); assert.strictEqual(options, options_); - callback(); // the done fn + callback(); // the done fn }; topic.create(options_, done); }); }); - describe('createSubscription', function() { - it('should call the parent createSubscription method', function(done) { + describe('createSubscription', () => { + it('should call the parent createSubscription method', done => { const NAME = 'sub-name'; const OPTIONS = {a: 'a'}; - PUBSUB.createSubscription = function(topic_, name, options, callback) { + PUBSUB.createSubscription = (topic_, name, options, callback) => { assert.strictEqual(topic_, topic); assert.strictEqual(name, NAME); assert.strictEqual(options, OPTIONS); - callback(); // the done fn + callback(); // the done fn }; topic.createSubscription(NAME, OPTIONS, done); }); }); - describe('delete', function() { - it('should make the proper request', function(done) { - topic.request = function(config, callback) { + describe('delete', () => { + it('should make the proper request', done => { + topic.request = (config, callback) => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'deleteTopic'); assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); - callback(); // the done fn + callback(); // the done fn }; topic.delete(done); }); - it('should optionally accept gax options', function(done) { + it('should optionally accept gax options', done => { const options = {}; - topic.request = function(config, callback) { + topic.request = (config, callback) => { assert.strictEqual(config.gaxOpts, options); - callback(); // the done fn + callback(); // the done fn }; topic.delete(options, done); }); - it('should optionally accept a callback', function(done) { + it('should optionally accept a callback', done => { sandbox.stub(util, 'noop').callsFake(done); - topic.request = function(config, callback) { - callback(); // the done fn + topic.request = (config, callback) => { + callback(); // the done fn }; topic.delete(); }); }); - describe('get', function() { - it('should delete the autoCreate option', function(done) { + describe('get', () => { + it('should delete the autoCreate option', done => { const options = { autoCreate: true, a: 'a', }; - topic.getMetadata = function(gaxOpts) { + topic.getMetadata = gaxOpts => { assert.strictEqual(gaxOpts, options); assert.strictEqual(gaxOpts.autoCreate, undefined); done(); @@ -242,17 +242,17 @@ describe('Topic', function() { topic.get(options, assert.ifError); }); - describe('success', function() { + describe('success', () => { const fakeMetadata = {}; - beforeEach(function() { - topic.getMetadata = function(gaxOpts, callback) { + beforeEach(() => { + topic.getMetadata = (gaxOpts, callback) => { callback(null, fakeMetadata); }; }); - it('should call through to getMetadata', function(done) { - topic.get(function(err, _topic, resp) { + it('should call through to getMetadata', done => { + topic.get((err, _topic, resp) => { assert.ifError(err); assert.strictEqual(_topic, topic); assert.strictEqual(resp, fakeMetadata); @@ -260,28 +260,28 @@ describe('Topic', function() { }); }); - it('should optionally accept options', function(done) { + it('should optionally accept options', done => { const options = {}; - topic.getMetadata = function(gaxOpts, callback) { + topic.getMetadata = (gaxOpts, callback) => { assert.strictEqual(gaxOpts, options); - callback(); // the done fn + callback(); // the done fn }; topic.get(options, done); }); }); - describe('error', function() { - it('should pass back errors when not auto-creating', function(done) { + describe('error', () => { + it('should pass back errors when not auto-creating', done => { const error = {code: 4}; const apiResponse = {}; - topic.getMetadata = function(gaxOpts, callback) { + topic.getMetadata = (gaxOpts, callback) => { callback(error, apiResponse); }; - topic.get(function(err, _topic, resp) { + topic.get((err, _topic, resp) => { assert.strictEqual(err, error); assert.strictEqual(_topic, null); assert.strictEqual(resp, apiResponse); @@ -289,15 +289,15 @@ describe('Topic', function() { }); }); - it('should pass back 404 errors if autoCreate is false', function(done) { + it('should pass back 404 errors if autoCreate is false', done => { const error = {code: 5}; const apiResponse = {}; - topic.getMetadata = function(gaxOpts, callback) { + topic.getMetadata = (gaxOpts, callback) => { callback(error, apiResponse); }; - topic.get(function(err, _topic, resp) { + topic.get((err, _topic, resp) => { assert.strictEqual(err, error); assert.strictEqual(_topic, null); assert.strictEqual(resp, apiResponse); @@ -305,7 +305,7 @@ describe('Topic', function() { }); }); - it('should create the topic if 404 + autoCreate is true', function(done) { + it('should create the topic if 404 + autoCreate is true', done => { const error = {code: 5}; const apiResponse = {}; @@ -313,13 +313,13 @@ describe('Topic', function() { autoCreate: true, }; - topic.getMetadata = function(gaxOpts, callback) { + topic.getMetadata = (gaxOpts, callback) => { callback(error, apiResponse); }; - topic.create = function(options, callback) { + topic.create = (options, callback) => { assert.strictEqual(options, fakeOptions); - callback(); // the done fn + callback(); // the done fn }; topic.get(fakeOptions, done); @@ -327,39 +327,39 @@ describe('Topic', function() { }); }); - describe('exists', function() { - it('should return true if it finds metadata', function(done) { - topic.getMetadata = function(callback) { + describe('exists', () => { + it('should return true if it finds metadata', done => { + topic.getMetadata = callback => { callback(null, {}); }; - topic.exists(function(err, exists) { + topic.exists((err, exists) => { assert.ifError(err); assert(exists); done(); }); }); - it('should return false if a not found error occurs', function(done) { - topic.getMetadata = function(callback) { + it('should return false if a not found error occurs', done => { + topic.getMetadata = callback => { callback({code: 5}); }; - topic.exists(function(err, exists) { + topic.exists((err, exists) => { assert.ifError(err); assert.strictEqual(exists, false); done(); }); }); - it('should pass back any other type of error', function(done) { + it('should pass back any other type of error', done => { const error = {code: 4}; - topic.getMetadata = function(callback) { + topic.getMetadata = callback => { callback(error); }; - topic.exists(function(err, exists) { + topic.exists((err, exists) => { assert.strictEqual(err, error); assert.strictEqual(exists, undefined); done(); @@ -367,9 +367,9 @@ describe('Topic', function() { }); }); - describe('getMetadata', function() { - it('should make the proper request', function(done) { - topic.request = function(config) { + describe('getMetadata', () => { + it('should make the proper request', done => { + topic.request = config => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'getTopic'); assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); @@ -379,10 +379,10 @@ describe('Topic', function() { topic.getMetadata(assert.ifError); }); - it('should optionally accept gax options', function(done) { + it('should optionally accept gax options', done => { const options = {}; - topic.request = function(config) { + topic.request = config => { assert.strictEqual(config.gaxOpts, options); done(); }; @@ -390,29 +390,29 @@ describe('Topic', function() { topic.getMetadata(options, assert.ifError); }); - it('should pass back any errors that occur', function(done) { + it('should pass back any errors that occur', done => { const error = new Error('err'); const apiResponse = {}; - topic.request = function(config, callback) { + topic.request = (config, callback) => { callback(error, apiResponse); }; - topic.getMetadata(function(err, metadata) { + topic.getMetadata((err, metadata) => { assert.strictEqual(err, error); assert.strictEqual(metadata, apiResponse); done(); }); }); - it('should set the metadata if no error occurs', function(done) { + it('should set the metadata if no error occurs', done => { const apiResponse = {}; - topic.request = function(config, callback) { + topic.request = (config, callback) => { callback(null, apiResponse); }; - topic.getMetadata(function(err, metadata) { + topic.getMetadata((err, metadata) => { assert.ifError(err); assert.strictEqual(metadata, apiResponse); assert.strictEqual(topic.metadata, apiResponse); @@ -421,8 +421,8 @@ describe('Topic', function() { }); }); - describe('getSubscriptions', function() { - it('should make the correct request', function(done) { + describe('getSubscriptions', () => { + it('should make the correct request', done => { const options = { a: 'a', b: 'b', @@ -433,23 +433,21 @@ describe('Topic', function() { }; const expectedOptions = Object.assign( - { - topic: topic.name, - }, - options - ); + { + topic: topic.name, + }, + options); const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; - topic.request = function(config) { + topic.request = config => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'listTopicSubscriptions'); assert.deepStrictEqual(config.reqOpts, expectedOptions); @@ -460,8 +458,8 @@ describe('Topic', function() { topic.getSubscriptions(options, assert.ifError); }); - it('should accept only a callback', function(done) { - topic.request = function(config) { + it('should accept only a callback', done => { + topic.request = config => { assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); assert.deepStrictEqual(config.gaxOpts, {autoPaginate: undefined}); done(); @@ -470,20 +468,20 @@ describe('Topic', function() { topic.getSubscriptions(assert.ifError); }); - it('should create subscription objects', function(done) { + it('should create subscription objects', done => { const fakeSubs = ['a', 'b', 'c']; - topic.subscription = function(name) { + topic.subscription = name => { return { - name: name, + name, }; }; - topic.request = function(config, callback) { + topic.request = (config, callback) => { callback(null, fakeSubs); }; - topic.getSubscriptions(function(err, subscriptions) { + topic.getSubscriptions((err, subscriptions) => { assert.ifError(err); assert.deepStrictEqual(subscriptions, [ {name: 'a'}, @@ -494,17 +492,17 @@ describe('Topic', function() { }); }); - it('should pass all params to the callback', function(done) { + it('should pass all params to the callback', done => { const err_ = new Error('err'); const subs_ = false; const nextQuery_ = {}; const apiResponse_ = {}; - topic.request = function(config, callback) { + topic.request = (config, callback) => { callback(err_, subs_, nextQuery_, apiResponse_); }; - topic.getSubscriptions(function(err, subs, nextQuery, apiResponse) { + topic.getSubscriptions((err, subs, nextQuery, apiResponse) => { assert.strictEqual(err, err_); assert.deepStrictEqual(subs, subs_); assert.strictEqual(nextQuery, nextQuery_); @@ -514,8 +512,8 @@ describe('Topic', function() { }); }); - describe('publisher', function() { - it('should return a Publisher instance', function() { + describe('publisher', () => { + it('should return a Publisher instance', () => { const options = {}; const publisher = topic.publisher(options); @@ -527,12 +525,12 @@ describe('Topic', function() { }); }); - describe('subscription', function() { - it('should pass correct arguments to pubsub#subscription', function(done) { + describe('subscription', () => { + it('should pass correct arguments to pubsub#subscription', done => { const subscriptionName = 'subName'; const opts = {}; - topic.parent.subscription = function(name, options) { + topic.parent.subscription = (name, options) => { assert.strictEqual(name, subscriptionName); assert.deepStrictEqual(options, opts); done(); @@ -541,8 +539,8 @@ describe('Topic', function() { topic.subscription(subscriptionName, opts); }); - it('should attach the topic instance to the options', function(done) { - topic.parent.subscription = function(name, options) { + it('should attach the topic instance to the options', done => { + topic.parent.subscription = (name, options) => { assert.strictEqual(options.topic, topic); done(); }; @@ -550,8 +548,8 @@ describe('Topic', function() { topic.subscription(); }); - it('should return the result', function(done) { - topic.parent.subscription = function() { + it('should return the result', done => { + topic.parent.subscription = () => { return done; }; From 638d3f5fba11201a89d55238ba79bd05e385c273 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Mon, 26 Nov 2018 20:39:01 +0530 Subject: [PATCH 0283/1115] added ts style fix for system-test/pubsub.ts (#374) --- handwritten/pubsub/system-test/pubsub.ts | 367 +++++++++++------------ 1 file changed, 179 insertions(+), 188 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 0859b9c136a..6e6ca5bcbdc 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -20,7 +20,7 @@ import {PubSub, Subscription, Topic} from '../src'; const pubsub = new PubSub(); -describe('pubsub', function() { +describe('pubsub', () => { const TOPIC_NAMES = [ generateTopicName(), generateTopicName(), @@ -57,7 +57,7 @@ describe('pubsub', function() { const subscription = topic.subscription(generateSubName()); await topic.create(); await subscription.create(); - for (let i=0; i<6; i++) { + for (let i = 0; i < 6; i++) { await publisher.publish(Buffer.from(message), options); } return new Promise((resolve, reject) => { @@ -76,12 +76,12 @@ describe('pubsub', function() { return Promise.all(TOPICS.map(t => t.delete())); }); - describe('Topic', function() { - it('should be listed', function(done) { - pubsub.getTopics(function(err, topics) { + describe('Topic', () => { + it('should be listed', done => { + pubsub.getTopics((err, topics) => { assert.ifError(err); - const results = topics.filter(function(topic) { + const results = topics.filter(topic => { const name = getTopicName(topic); return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); @@ -92,82 +92,82 @@ describe('pubsub', function() { }); }); - it('should list topics in a stream', function(done) { + it('should list topics in a stream', done => { // tslint:disable-next-line no-any const topicsEmitted: any[] = []; // tslint:disable-next-line no-any (pubsub as any) - .getTopicsStream() - .on('error', done) - .on('data', function(topic) { - topicsEmitted.push(topic); - }) - .on('end', function() { - const results = topicsEmitted.filter(function(topic) { - const name = getTopicName(topic); - return TOPIC_FULL_NAMES.indexOf(name) !== -1; - }); + .getTopicsStream() + .on('error', done) + .on('data', + topic => { + topicsEmitted.push(topic); + }) + .on('end', () => { + const results = topicsEmitted.filter(topic => { + const name = getTopicName(topic); + return TOPIC_FULL_NAMES.indexOf(name) !== -1; + }); - assert.strictEqual(results.length, TOPIC_NAMES.length); - done(); - }); + assert.strictEqual(results.length, TOPIC_NAMES.length); + done(); + }); }); - it('should allow manual paging', function(done) { + it('should allow manual paging', done => { pubsub.getTopics( - { - pageSize: TOPIC_NAMES.length - 1, - gaxOpts: {autoPaginate: false}, - }, - function(err, topics) { - assert.ifError(err); - assert.strictEqual(topics.length, TOPIC_NAMES.length - 1); - done(); - } - ); + { + pageSize: TOPIC_NAMES.length - 1, + gaxOpts: {autoPaginate: false}, + }, + (err, topics) => { + assert.ifError(err); + assert.strictEqual(topics.length, TOPIC_NAMES.length - 1); + done(); + }); }); - it('should be created and deleted', function(done) { + it('should be created and deleted', done => { const TOPIC_NAME = generateTopicName(); - pubsub.createTopic(TOPIC_NAME, function(err) { + pubsub.createTopic(TOPIC_NAME, err => { assert.ifError(err); pubsub.topic(TOPIC_NAME).delete(done); }); }); - it('should honor the autoCreate option', function(done) { + it('should honor the autoCreate option', done => { const topic = pubsub.topic(generateTopicName()); topic.get({autoCreate: true}, done); }); - it('should confirm if a topic exists', function(done) { + it('should confirm if a topic exists', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); - topic.exists(function(err, exists) { + topic.exists((err, exists) => { assert.ifError(err); assert.strictEqual(exists, true); done(); }); }); - it('should confirm if a topic does not exist', function(done) { + it('should confirm if a topic does not exist', done => { const topic = pubsub.topic('should-not-exist'); - topic.exists(function(err, exists) { + topic.exists((err, exists) => { assert.ifError(err); assert.strictEqual(exists, false); done(); }); }); - it('should publish a message', function(done) { + it('should publish a message', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); const publisher = topic.publisher(); const message = Buffer.from('message from me'); - publisher.publish(message, function(err, messageId) { + publisher.publish(message, (err, messageId) => { assert.ifError(err); assert.strictEqual(typeof messageId, 'string'); done(); @@ -185,9 +185,9 @@ describe('pubsub', function() { assert.deepStrictEqual(message.attributes, attrs); }); - it('should get the metadata of a topic', function(done) { + it('should get the metadata of a topic', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); - topic.getMetadata(function(err, metadata) { + topic.getMetadata((err, metadata) => { assert.ifError(err); assert.strictEqual(metadata.name, topic.name); done(); @@ -195,7 +195,7 @@ describe('pubsub', function() { }); }); - describe('Subscription', function() { + describe('Subscription', () => { const TOPIC_NAME = generateTopicName(); const topic = pubsub.topic(TOPIC_NAME); const publisher = topic.publisher(); @@ -210,7 +210,7 @@ describe('pubsub', function() { before(async () => { await topic.create(); await Promise.all(SUBSCRIPTIONS.map(s => s.create())); - for (let i=0; i<10; i++) { + for (let i = 0; i < 10; i++) { await publisher.publish(Buffer.from('hello')); } await new Promise(r => setTimeout(r, 2500)); @@ -227,14 +227,14 @@ describe('pubsub', function() { })); }); - it('should return error if creating an existing subscription', function(done) { + it('should return error if creating an existing subscription', done => { // Use a new topic name... const topic = pubsub.topic(generateTopicName()); // ...but with the same subscription name that we already created... const subscription = topic.subscription(SUB_NAMES[0]); - subscription.create(function(err) { + subscription.create(err => { if (!err) { assert.fail('Should not have created subscription successfully.'); return; @@ -247,8 +247,8 @@ describe('pubsub', function() { }); }); - it('should list all subscriptions registered to the topic', function(done) { - topic.getSubscriptions(function(err, subs) { + it('should list all subscriptions registered to the topic', done => { + topic.getSubscriptions((err, subs) => { assert.ifError(err); assert.strictEqual(subs.length, SUBSCRIPTIONS.length); assert(subs[0] instanceof Subscription); @@ -256,160 +256,152 @@ describe('pubsub', function() { }); }); - it('should list all topic subscriptions as a stream', function(done) { - const subscriptionsEmitted: {}[] = []; - topic - .getSubscriptionsStream() - .on('error', done) - .on('data', function(subscription) { - subscriptionsEmitted.push(subscription); - }) - .on('end', function() { - assert.strictEqual(subscriptionsEmitted.length, SUBSCRIPTIONS.length); - done(); - }); + it('should list all topic subscriptions as a stream', done => { + const subscriptionsEmitted: Array<{}> = []; + topic.getSubscriptionsStream() + .on('error', done) + .on('data', + subscription => { + subscriptionsEmitted.push(subscription); + }) + .on('end', () => { + assert.strictEqual( + subscriptionsEmitted.length, SUBSCRIPTIONS.length); + done(); + }); }); - it('should list all subscriptions regardless of topic', function(done) { - pubsub.getSubscriptions(function(err, subscriptions) { + it('should list all subscriptions regardless of topic', done => { + pubsub.getSubscriptions((err, subscriptions) => { assert.ifError(err); assert(subscriptions instanceof Array); done(); }); }); - it('should list all subscriptions as a stream', function(done) { + it('should list all subscriptions as a stream', done => { let subscriptionEmitted = false; - pubsub - .getSubscriptionsStream() - .on('error', done) - .on('data', function(subscription) { - subscriptionEmitted = subscription instanceof Subscription; - }) - .on('end', function() { - assert.strictEqual(subscriptionEmitted, true); - done(); - }); + pubsub.getSubscriptionsStream() + .on('error', done) + .on('data', + subscription => { + subscriptionEmitted = subscription instanceof Subscription; + }) + .on('end', () => { + assert.strictEqual(subscriptionEmitted, true); + done(); + }); }); - it('should allow creation and deletion of a subscription', function(done) { + it('should allow creation and deletion of a subscription', done => { const subName = generateSubName(); - topic.createSubscription(subName, function(err, sub) { + topic.createSubscription(subName, (err, sub) => { assert.ifError(err); assert(sub instanceof Subscription); sub.delete(done); }); }); - it('should honor the autoCreate option', function(done) { + it('should honor the autoCreate option', done => { const sub = topic.subscription(generateSubName()); sub.get({autoCreate: true}, done); }); - it('should confirm if a sub exists', function(done) { + it('should confirm if a sub exists', done => { const sub = topic.subscription(SUB_NAMES[0]); - sub.exists(function(err, exists) { + sub.exists((err, exists) => { assert.ifError(err); assert.strictEqual(exists, true); done(); }); }); - it('should confirm if a sub does not exist', function(done) { + it('should confirm if a sub does not exist', done => { const sub = topic.subscription('should-not-exist'); - sub.exists(function(err, exists) { + sub.exists((err, exists) => { assert.ifError(err); assert.strictEqual(exists, false); done(); }); }); - it('should create a subscription with message retention', function(done) { + it('should create a subscription with message retention', done => { const subName = generateSubName(); const threeDaysInSeconds = 3 * 24 * 60 * 60; topic.createSubscription( - subName, - { - messageRetentionDuration: threeDaysInSeconds, - }, - function(err, sub) { - assert.ifError(err); - - sub.getMetadata(function(err, metadata) { + subName, { + messageRetentionDuration: threeDaysInSeconds, + }, + (err, sub) => { assert.ifError(err); - assert.strictEqual(metadata.retainAckedMessages, true); - assert.strictEqual( - parseInt(metadata.messageRetentionDuration.seconds, 10), - threeDaysInSeconds - ); - assert.strictEqual( - parseInt(metadata.messageRetentionDuration.nanos, 10), - 0 - ); + sub.getMetadata((err, metadata) => { + assert.ifError(err); + + assert.strictEqual(metadata.retainAckedMessages, true); + assert.strictEqual( + Number(metadata.messageRetentionDuration.seconds), + threeDaysInSeconds); + assert.strictEqual( + Number(metadata.messageRetentionDuration.nanos), 0); - sub.delete(done); + sub.delete(done); + }); }); - } - ); }); - it('should set metadata for a subscription', function() { + it('should set metadata for a subscription', () => { const subscription = topic.subscription(generateSubName()); const threeDaysInSeconds = 3 * 24 * 60 * 60; - return subscription - .create() - .then(function() { - return subscription.setMetadata({ - messageRetentionDuration: threeDaysInSeconds, + return subscription.create() + .then(() => { + return subscription.setMetadata({ + messageRetentionDuration: threeDaysInSeconds, + }); + }) + .then(() => { + return subscription.getMetadata(); + }) + .then(data => { + const metadata = data[0]; + + assert.strictEqual(metadata.retainAckedMessages, true); + assert.strictEqual( + Number(metadata.messageRetentionDuration.seconds), + threeDaysInSeconds); + assert.strictEqual( + Number(metadata.messageRetentionDuration.nanos), 0); }); - }) - .then(function() { - return subscription.getMetadata(); - }) - .then(function(data) { - const metadata = data[0]; - - assert.strictEqual(metadata.retainAckedMessages, true); - assert.strictEqual( - parseInt(metadata.messageRetentionDuration.seconds, 10), - threeDaysInSeconds - ); - assert.strictEqual( - parseInt(metadata.messageRetentionDuration.nanos, 10), - 0 - ); - }); }); - it('should error when using a non-existent subscription', function(done) { + it('should error when using a non-existent subscription', done => { const subscription = topic.subscription(generateSubName(), { maxConnections: 1, }); - subscription.on('error', function(err) { + subscription.on('error', err => { assert.strictEqual(err.code, 5); subscription.close(done); }); - subscription.on('message', function() { + subscription.on('message', () => { done(new Error('Should not have been called.')); }); }); - it('should receive the published messages', function(done) { + it('should receive the published messages', done => { let messageCount = 0; const subscription = topic.subscription(SUB_NAMES[1]); subscription.on('error', done); - subscription.on('message', function(message) { + subscription.on('message', message => { assert.deepStrictEqual(message.data, Buffer.from('hello')); if (++messageCount === 10) { @@ -418,7 +410,7 @@ describe('pubsub', function() { }); }); - it('should ack the message', function(done) { + it('should ack the message', done => { const subscription = topic.subscription(SUB_NAMES[1]); subscription.on('error', done); @@ -433,7 +425,7 @@ describe('pubsub', function() { } }); - it('should nack the message', function(done) { + it('should nack the message', done => { const subscription = topic.subscription(SUB_NAMES[1]); subscription.on('error', done); @@ -448,13 +440,13 @@ describe('pubsub', function() { } }); - it('should respect flow control limits', function(done) { + it('should respect flow control limits', done => { const maxMessages = 3; let messageCount = 0; const subscription = topic.subscription(SUB_NAMES[0], { flowControl: { - maxMessages: maxMessages, + maxMessages, }, }); @@ -466,18 +458,18 @@ describe('pubsub', function() { return; } - setImmediate(function() { + setImmediate(() => { subscription.close(done); }); } }); }); - describe('IAM', function() { - it('should get a policy', function(done) { + describe('IAM', () => { + it('should get a policy', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); - topic.iam.getPolicy(function(err, policy) { + topic.iam.getPolicy((err, policy) => { assert.ifError(err); assert.deepStrictEqual(policy!.bindings, []); @@ -487,7 +479,7 @@ describe('pubsub', function() { }); }); - it('should set a policy', function(done) { + it('should set a policy', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); const policy = { bindings: [ @@ -500,18 +492,18 @@ describe('pubsub', function() { ], }; - topic.iam.setPolicy(policy, function(err, newPolicy) { + topic.iam.setPolicy(policy, (err, newPolicy) => { assert.ifError(err); assert.deepStrictEqual(newPolicy.bindings, policy.bindings); done(); }); }); - it('should test the iam permissions', function(done) { + it('should test the iam permissions', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); const testPermissions = ['pubsub.topics.get', 'pubsub.topics.update']; - topic.iam.testPermissions(testPermissions, function(err, permissions) { + topic.iam.testPermissions(testPermissions, (err, permissions) => { assert.ifError(err); assert.deepStrictEqual(permissions, { 'pubsub.topics.get': true, @@ -522,7 +514,7 @@ describe('pubsub', function() { }); }); - describe('Snapshot', function() { + describe('Snapshot', () => { const SNAPSHOT_NAME = generateSnapshotName(); let topic; @@ -532,43 +524,41 @@ describe('pubsub', function() { function deleteAllSnapshots() { // tslint:disable-next-line no-any - return (pubsub.getSnapshots() as any).then(function(data) { - return Promise.all( - data[0].map(function(snapshot) { - return snapshot.delete(); - }) - ); + return (pubsub.getSnapshots() as any).then(data => { + return Promise.all(data[0].map(snapshot => { + return snapshot.delete(); + })); }); } function wait(milliseconds) { - return function() { - return new Promise(function(resolve) { + return () => { + return new Promise(resolve => { setTimeout(resolve, milliseconds); }); }; } - before(function() { + before(() => { topic = pubsub.topic(TOPIC_NAMES[0]); publisher = topic.publisher(); subscription = topic.subscription(generateSubName()); snapshot = subscription.snapshot(SNAPSHOT_NAME); return deleteAllSnapshots() - .then(wait(2500)) - .then(subscription.create.bind(subscription)) - .then(wait(2500)) - .then(snapshot.create.bind(snapshot)) - .then(wait(2500)); + .then(wait(2500)) + .then(subscription.create.bind(subscription)) + .then(wait(2500)) + .then(snapshot.create.bind(snapshot)) + .then(wait(2500)); }); - after(function() { + after(() => { return deleteAllSnapshots(); }); - it('should get a list of snapshots', function(done) { - pubsub.getSnapshots(function(err, snapshots) { + it('should get a list of snapshots', done => { + pubsub.getSnapshots((err, snapshots) => { assert.ifError(err); assert.strictEqual(snapshots.length, 1); assert.strictEqual(snapshots[0].name.split('/').pop(), SNAPSHOT_NAME); @@ -576,49 +566,50 @@ describe('pubsub', function() { }); }); - it('should get a list of snapshots as a stream', function(done) { + it('should get a list of snapshots as a stream', done => { + // tslint:disable-next-line no-any const snapshots: any[] = []; - pubsub - .getSnapshotsStream() - .on('error', done) - .on('data', function(snapshot) { - snapshots.push(snapshot); - }) - .on('end', function() { - assert.strictEqual(snapshots.length, 1); - assert.strictEqual(snapshots[0].name.split('/').pop(), SNAPSHOT_NAME); - done(); - }); + pubsub.getSnapshotsStream() + .on('error', done) + .on('data', + snapshot => { + snapshots.push(snapshot); + }) + .on('end', () => { + assert.strictEqual(snapshots.length, 1); + assert.strictEqual( + snapshots[0].name.split('/').pop(), SNAPSHOT_NAME); + done(); + }); }); - describe('seeking', function() { + describe('seeking', () => { let subscription; let messageId; - beforeEach(function() { + beforeEach(() => { subscription = topic.subscription(generateSubName()); - return subscription - .create() - .then(function() { - return publisher.publish(Buffer.from('Hello, world!')); - }) - .then(function(_messageId) { - messageId = _messageId; - }); + return subscription.create() + .then(() => { + return publisher.publish(Buffer.from('Hello, world!')); + }) + .then(_messageId => { + messageId = _messageId; + }); }); - it('should seek to a snapshot', function(done) { + it('should seek to a snapshot', done => { const snapshotName = generateSnapshotName(); - subscription.createSnapshot(snapshotName, function(err, snapshot) { + subscription.createSnapshot(snapshotName, (err, snapshot) => { assert.ifError(err); let messageCount = 0; subscription.on('error', done); - subscription.on('message', function(message) { + subscription.on('message', message => { if (message.id !== messageId) { return; } @@ -626,7 +617,7 @@ describe('pubsub', function() { message.ack(); if (++messageCount === 1) { - snapshot.seek(function(err) { + snapshot.seek(err => { assert.ifError(err); }); return; @@ -638,11 +629,11 @@ describe('pubsub', function() { }); }); - it('should seek to a date', function(done) { + it('should seek to a date', done => { let messageCount = 0; subscription.on('error', done); - subscription.on('message', function(message) { + subscription.on('message', message => { if (message.id !== messageId) { return; } @@ -650,7 +641,7 @@ describe('pubsub', function() { message.ack(); if (++messageCount === 1) { - subscription.seek(message.publishTime, function(err) { + subscription.seek(message.publishTime, err => { assert.ifError(err); }); return; From 48464360f4c43884b7239db8b92f1cad1282824b Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Mon, 26 Nov 2018 22:04:35 +0530 Subject: [PATCH 0284/1115] refactor(ts): added ts style fix for src/iam.ts (#352) --- handwritten/pubsub/src/iam.ts | 138 ++++++++++++++++++++-------------- 1 file changed, 80 insertions(+), 58 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 6d440b26066..a605434aab7 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -18,12 +18,13 @@ * @module pubsub/iam */ -import * as arrify from 'arrify'; import {promisifyAll} from '@google-cloud/promisify'; -import * as r from 'request'; +import * as arrify from 'arrify'; +import {CallOptions} from 'google-gax'; import * as is from 'is'; -import { PubSub } from '.'; -import { CallOptions } from 'google-gax'; +import * as r from 'request'; + +import {PubSub} from '.'; /** * @callback GetPolicyCallback @@ -108,10 +109,11 @@ export interface Policy { } /** - * [IAM (Identity and Access Management)](https://cloud.google.com/pubsub/access_control) - * allows you to set permissions on invidual resources and offers a wider range - * of roles: editor, owner, publisher, subscriber, and viewer. This gives you - * greater flexibility and allows you to set more fine-grained access control. + * [IAM (Identity and Access + * Management)](https://cloud.google.com/pubsub/access_control) allows you to + * set permissions on invidual resources and offers a wider range of roles: + * editor, owner, publisher, subscriber, and viewer. This gives you greater + * flexibility and allows you to set more fine-grained access control. * * For example: * * Grant access on a per-topic or per-subscription basis, rather than for @@ -146,6 +148,7 @@ export interface Policy { * // subscription.iam */ export class IAM { + // tslint:disable-next-line variable-name Promise?: PromiseConstructor; pubsub: PubSub; request: typeof PubSub.prototype.request; @@ -193,23 +196,26 @@ export class IAM { getPolicy(gaxOpts?: CallOptions): Promise; getPolicy(callback: GetPolicyCallback): void; getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; - getPolicy(gaxOptsOrCallback?: CallOptions|GetPolicyCallback, callback?: GetPolicyCallback): Promise|void { - let gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + getPolicy( + gaxOptsOrCallback?: CallOptions|GetPolicyCallback, + callback?: GetPolicyCallback): Promise|void { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; const reqOpts = { resource: this.id, }; this.request( - { - client: 'SubscriberClient', - method: 'getIamPolicy', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback! - ); + { + client: 'SubscriberClient', + method: 'getIamPolicy', + reqOpts, + gaxOpts, + }, + callback!); } /** @@ -241,14 +247,16 @@ export class IAM { * bindings: [ * { * role: 'roles/pubsub.subscriber', - * members: ['serviceAccount:myotherproject@appspot.gserviceaccount.com'] + * members: + * ['serviceAccount:myotherproject@appspot.gserviceaccount.com'] * } * ] * }; * * topic.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); * - * subscription.iam.setPolicy(myPolicy, function(err, policy, apiResponse) {}); + * subscription.iam.setPolicy(myPolicy, function(err, policy, apiResponse) + * {}); * * //- * // If the callback is omitted, we'll return a Promise. @@ -259,15 +267,20 @@ export class IAM { * }); */ setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise; - setPolicy(policy: Policy, gaxOpts: CallOptions, callback: SetPolicyCallback): void; + setPolicy(policy: Policy, gaxOpts: CallOptions, callback: SetPolicyCallback): + void; setPolicy(policy: Policy, callback: SetPolicyCallback): void; - setPolicy(policy: Policy, gaxOptsOrCallback?: CallOptions|SetPolicyCallback, callback?: SetPolicyCallback): Promise|void { + setPolicy( + policy: Policy, gaxOptsOrCallback?: CallOptions|SetPolicyCallback, + callback?: SetPolicyCallback): Promise|void { if (!(typeof policy === 'object')) { throw new Error('A policy object is required.'); } - let gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; const reqOpts = { resource: this.id, @@ -275,14 +288,13 @@ export class IAM { }; this.request( - { - client: 'SubscriberClient', - method: 'setIamPolicy', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - callback! - ); + { + client: 'SubscriberClient', + method: 'setIamPolicy', + reqOpts, + gaxOpts, + }, + callback!); } /** @@ -345,16 +357,26 @@ export class IAM { * const apiResponse = data[1]; * }); */ - testPermissions(permissions: string|string[], gaxOpts?: CallOptions): Promise; - testPermissions(permissions: string|string[], gaxOpts: CallOptions, callback: TestIamPermissionsCallback): void; - testPermissions(permissions: string|string[], callback: TestIamPermissionsCallback): void; - testPermissions(permissions: string|string[], gaxOptsOrCallback?: CallOptions|TestIamPermissionsCallback, callback?: TestIamPermissionsCallback): Promise|void { + testPermissions(permissions: string|string[], gaxOpts?: CallOptions): + Promise; + testPermissions( + permissions: string|string[], gaxOpts: CallOptions, + callback: TestIamPermissionsCallback): void; + testPermissions( + permissions: string|string[], callback: TestIamPermissionsCallback): void; + testPermissions( + permissions: string|string[], + gaxOptsOrCallback?: CallOptions|TestIamPermissionsCallback, + callback?: TestIamPermissionsCallback): + Promise|void { if (!Array.isArray(permissions) && !(typeof permissions === 'string')) { throw new Error('Permissions are required.'); } - let gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; const reqOpts = { resource: this.id, @@ -362,25 +384,25 @@ export class IAM { }; this.request( - { - client: 'SubscriberClient', - method: 'testIamPermissions', - reqOpts: reqOpts, - gaxOpts: gaxOpts, - }, - function(err, resp) { - if (err) { - callback!(err, null, resp); - return; - } - const availablePermissions = arrify(resp.permissions); - const permissionHash = (permissions as string[]).reduce(function(acc, permission) { - acc[permission] = availablePermissions.indexOf(permission) > -1; - return acc; - }, {} as {[key: string]: boolean}); - callback!(null, permissionHash, resp); - } - ); + { + client: 'SubscriberClient', + method: 'testIamPermissions', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + const availablePermissions = arrify(resp.permissions); + const permissionHash = + (permissions as string[]).reduce((acc, permission) => { + acc[permission] = availablePermissions.indexOf(permission) > -1; + return acc; + }, {} as {[key: string]: boolean}); + callback!(null, permissionHash, resp); + }); } } From 05cba231453bda2b914e6c8a50b9dfc01a3658d1 Mon Sep 17 00:00:00 2001 From: vijay-qlogic <36055624+vijay-qlogic@users.noreply.github.com> Date: Tue, 27 Nov 2018 00:43:05 +0530 Subject: [PATCH 0285/1115] refactor(ts): updated lint and fix command to cover gts (#375) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 208be9418b3..57512360d67 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -35,9 +35,9 @@ "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", "test-no-cover": "mocha build/test", "test": "npm run cover", - "lint": "eslint '**/*.js'", + "lint": "eslint '**/*.js' && gts check", "docs": "jsdoc -c .jsdoc.js", - "fix": "eslint --fix '**/*.js'", + "fix": "eslint --fix '**/*.js' && gts fix", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", "clean": "gts clean", "compile": "tsc -p . && cp -r src/v1/ build/src/v1/ && cp -r protos build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", From e95da324b8531ba32e6ea99bb3e0caf49c1c610e Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Tue, 27 Nov 2018 15:24:25 -0800 Subject: [PATCH 0286/1115] fix(ts): do not ship types (#377) --- handwritten/pubsub/package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 57512360d67..3a7c3549389 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -12,6 +12,8 @@ "files": [ "build/protos", "build/src", + "!**/*.d.ts", + "!**/*.js.map", "AUTHORS", "CONTRIBUTORS", "LICENSE" From be9dbf6d9478e4cd7b5741771da2ecccc74d3e4d Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Tue, 27 Nov 2018 17:29:32 -0800 Subject: [PATCH 0287/1115] refactor(ts): improve types (2) (#356) * improve types * fix tests * fix: no apiResponse argument in callback * patch types * npm run fix --- handwritten/pubsub/src/iam.ts | 55 ++++--- handwritten/pubsub/src/index.ts | 194 ++++++++++++++++++------- handwritten/pubsub/src/publisher.ts | 4 + handwritten/pubsub/src/subscription.ts | 59 +++++++- handwritten/pubsub/src/topic.ts | 18 ++- handwritten/pubsub/test/index.ts | 4 +- 6 files changed, 254 insertions(+), 80 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index a605434aab7..0069762263c 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -23,58 +23,74 @@ import * as arrify from 'arrify'; import {CallOptions} from 'google-gax'; import * as is from 'is'; import * as r from 'request'; - import {PubSub} from '.'; + /** * @callback GetPolicyCallback * @param {?Error} err Request error, if any. * @param {object} acl The policy. - * @param {object} apiResponse The full API response. */ export interface GetPolicyCallback { - (err?: Error|null, acl?: Policy, apiResponse?: r.Response): void; + (err?: Error|null, acl?: Policy|null): void; } /** * @callback SetPolicyCallback * @param {?Error} err Request error, if any. * @param {object} acl The policy. - * @param {object} apiResponse The full API response. */ export interface SetPolicyCallback { - (err?: Error|null, acl?: Policy, apiResponse?: r.Response): void; + (err?: Error|null, acl?: Policy|null): void; } /** * @typedef {array} SetPolicyResponse * @property {object} 0 The policy. - * @property {object} 1 The full API response. */ -export type SetPolicyResponse = [Policy, r.Response]; +export type SetPolicyResponse = [Policy]; /** * @typedef {array} GetPolicyResponse * @property {object} 0 The policy. - * @property {object} 1 The full API response. */ -export type GetPolicyResponse = [Policy, r.Response]; +export type GetPolicyResponse = [Policy]; + +/** + * @typedef {string[]} PermissionsResponse + * A subset of TestPermissionsRequest.permissions that the caller is allowed. + * @see https://cloud.google.com/pubsub/docs/reference/rpc/google.iam.v1#google.iam.v1.TestIamPermissionsRequest + */ +export interface PermissionsResponse { + permissions: string|string[]; +} + + +/** + * Shows which IAM permissions is allowed. + * The key to this object are the IAM permissions (string) and the values are + * booleans, true if permissions are granted to the corresponding key. + */ +export type IamPermissionsMap = { + [key: string]: boolean +}; /** * @typedef {array} TestIamPermissionsResponse * @property {object[]} 0 A subset of permissions that the caller is allowed. - * @property {object} 1 The full API response. + * @property {PermissionsResponse} 1 The full API response. */ -export type TestIamPermissionsResponse = [object[], r.Response]; +export type TestIamPermissionsResponse = [PermissionsResponse]; /** * @callback TestIamPermissionsCallback * @param {?Error} err Request error, if any. - * @param {object[]} permissions A subset of permissions that the caller is allowed. - * @param {object} apiResponse The full API response. + * @param {TestIamPermissionsAPIResponse} permissions A subset of permissions that the caller is allowed. + * @param {PermissionsResponse} apiResponse The full API response. */ export interface TestIamPermissionsCallback { - (err?: Error|null, permissions?: object|null, apiResponse?: r.Response): void; + (err?: Error|null, permissions?: IamPermissionsMap|null, + apiResponse?: PermissionsResponse): void; } /** @@ -208,7 +224,7 @@ export class IAM { resource: this.id, }; - this.request( + this.request( { client: 'SubscriberClient', method: 'getIamPolicy', @@ -383,7 +399,7 @@ export class IAM { permissions: arrify(permissions), }; - this.request( + this.request( { client: 'SubscriberClient', method: 'testIamPermissions', @@ -392,16 +408,17 @@ export class IAM { }, (err, resp) => { if (err) { - callback!(err, null, resp); + callback!(err, null, resp!); return; } - const availablePermissions = arrify(resp.permissions); + + const availablePermissions = arrify(resp!.permissions); const permissionHash = (permissions as string[]).reduce((acc, permission) => { acc[permission] = availablePermissions.indexOf(permission) > -1; return acc; }, {} as {[key: string]: boolean}); - callback!(null, permissionHash, resp); + callback!(null, permissionHash, resp!); }); } } diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index cf7597fb1b0..47aee1c70e0 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -26,8 +26,9 @@ const PKG = require('../../package.json'); const v1 = require('./v1'); import {Snapshot} from './snapshot'; -import {Subscription} from './subscription'; +import {Subscription, SubscriptionMetadata, SubscriptionMetadataRaw} from './subscription'; import {Topic} from './topic'; +import {CallOptions} from 'google-gax'; import {Readable} from 'stream'; const opts = {} as gax.GrpcClientOptions; @@ -39,6 +40,81 @@ const {grpc} = new gax.GrpcClient(opts); */ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; +// tslint:disable-next-line:no-any +export type Metadata = any; + +/** + * @typedef {array} CreateTopicResponse + * @property {Topic} 0 The new {@link Topic}. + * @property {object} 1 The full API response. + */ +export type CreateTopicResponse = [Topic, object]; + +/** + * @callback CreateTopicCallback + * @param {?Error} err Request error, if any. + * @param {Topic} topic The new {@link Topic}. + * @param {object} apiResponse The full API response. + */ +export interface CreateTopicCallback { + (err?: Error|null, topic?: Topic|null, apiResponse?: object): void; +} + +export type Client = 'PublisherClient'|'SubscriberClient'; + +export interface RequestConfig { + client: Client; + method: string; + reqOpts?: object; + gaxOpts?: CallOptions; +} + +export interface GetClientConfig { + client: Client; + method?: string; +} + +export interface RequestCallback { + (err?: Error|null, res?: TResponse|null): void; +} + +/** + * @typedef {array} CreateSubscriptionResponse + * @property {Subscription} 0 The new {@link Subscription}. + * @property {object} 1 The full API response. + */ +export type CreateSubscriptionResponse = [Subscription, object]; + +/** + * @callback CreateSubscriptionCallback + * @param {?Error} err Request error, if any. + * @param {Subscription} subscription The new {@link Subscription}. + * @param {object} apiResponse The full API response. + */ +export interface CreateSubscriptionCallback { + (err?: Error|null, subscription?: Subscription|null, + apiResponse?: object): void; +} + +export interface CreateSubscriptionOptions extends SubscriptionMetadata { + flowControl?: {maxBytes?: number; maxMessages?: number;}; + gaxOpts?: CallOptions; +} + +/** + * Callback function to PubSub.getClient_(). + * @internal + */ +interface GetClientCallback { + /** + * @param err - Error, if any. + * @param gaxClient - The gax client specified in RequestConfig.client. + * Typed any since it's importing Javascript source. + */ + // tslint:disable-next-line:no-any + (err: Error|null, gaxClient?: gax.ClientStub): void; +} + /** * @typedef {object} ClientConfig * @property {string} [projectId] The project ID from the Google Developer's @@ -100,7 +176,7 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; export class PubSub { options; isEmulator: boolean; - api; + api: {[key: string]: gax.ClientStub}; auth: GoogleAuth; projectId: string; // tslint:disable-next-line variable-name @@ -170,17 +246,6 @@ export class PubSub { * are retained in the subscription's backlog for the length of time * specified by `options.messageRetentionDuration`. */ - /** - * @typedef {array} CreateSubscriptionResponse - * @property {Subscription} 0 The new {@link Subscription}. - * @property {object} 1 The full API response. - */ - /** - * @callback CreateSubscriptionCallback - * @param {?Error} err Request error, if any. - * @param {Subscription} subscription The new {@link Subscription}. - * @param {object} apiResponse The full API response. - */ /** * Create a subscription to a topic. * @@ -216,7 +281,20 @@ export class PubSub { * = data[1]; * }); */ - createSubscription(topic: Topic|string, name: string, options, callback) { + createSubscription( + topic: Topic|string, name: string, + options?: CreateSubscriptionOptions): Promise; + createSubscription( + topic: Topic|string, name: string, options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback): void; + createSubscription( + topic: Topic|string, name: string, + callback: CreateSubscriptionCallback): void; + createSubscription( + topic: Topic|string, name: string, + optionsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, + callback?: CreateSubscriptionCallback): + Promise|void { if (!is.string(topic) && !(topic instanceof Topic)) { throw new Error('A Topic is required for a new subscription.'); } @@ -226,46 +304,49 @@ export class PubSub { if (typeof topic === 'string') { topic = this.topic(topic); } - if (is.fn(options)) { - callback = options; - options = {}; - } - options = options || {}; - const metadata = Subscription.formatMetadata_(options); - const subscription = this.subscription(name, metadata); + let options = typeof optionsOrCallback === 'object' ? + optionsOrCallback : + {} as CreateSubscriptionOptions; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + + // Make a deep copy of options to not pollute caller object. + options = extend(true, {}, options); + + const gaxOpts = options.gaxOpts; + const flowControl = options.flowControl; + delete options.gaxOpts; + delete options.flowControl; + + const metadata = + Subscription.formatMetadata_(options as SubscriptionMetadataRaw); + + let subscriptionCtorOptions = flowControl ? {flowControl} : {}; + subscriptionCtorOptions = Object.assign(subscriptionCtorOptions, metadata); + const subscription = this.subscription(name, subscriptionCtorOptions); + const reqOpts = Object.assign(metadata, { topic: topic.name, name: subscription.name, }); - delete reqOpts.gaxOpts; - delete reqOpts.flowControl; + this.request( { client: 'SubscriberClient', method: 'createSubscription', reqOpts, - gaxOpts: options.gaxOpts, + gaxOpts, }, (err, resp) => { if (err) { - callback(err, null, resp); + callback!(err, null, resp!); return; } subscription.metadata = resp; - callback(null, subscription, resp); + callback!(null, subscription, resp!); }); } - /** - * @typedef {array} CreateTopicResponse - * @property {Topic} 0 The new {@link Topic}. - * @property {object} 1 The full API response. - */ - /** - * @callback CreateTopicCallback - * @param {?Error} err Request error, if any. - * @param {Topic} topic The new {@link Topic}. - * @param {object} apiResponse The full API response. - */ + /** * Create a topic with the given name. * @@ -295,16 +376,24 @@ export class PubSub { * const apiResponse = data[1]; * }); */ - createTopic(name: string, gaxOpts, callback?) { + createTopic(name: string, gaxOpts: CallOptions): Promise; + createTopic( + name: string, gaxOpts: CallOptions, callback?: CreateTopicCallback): void; + createTopic(name: string, callback: CreateTopicCallback): void; + createTopic( + name: string, gaxOptsOrCallback?: CallOptions|CreateTopicCallback, + callback?: CreateTopicCallback): Promise|void { const topic = this.topic(name); const reqOpts = { name: topic.name, }; - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } - this.request( + + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + + this.request( { client: 'PublisherClient', method: 'createTopic', @@ -313,11 +402,11 @@ export class PubSub { }, (err, resp) => { if (err) { - callback(err, null, resp); + callback!(err, null, resp); return; } topic.metadata = resp; - callback(null, topic, resp); + callback!(null, topic, resp); }); } /** @@ -632,8 +721,7 @@ export class PubSub { * @param {object} config.reqOpts Request options. * @param {function} [callback] The callback function. */ - getClient_(config, callback) { - const self = this; + getClient_(config: GetClientConfig, callback: GetClientCallback) { const hasProjectId = this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; if (!hasProjectId && !this.isEmulator) { @@ -642,15 +730,15 @@ export class PubSub { callback(err); return; } - self.projectId = projectId!; - self.getClient_(config, callback); + this.projectId = projectId!; + this.getClient_(config, callback); }); return; } let gaxClient = this.api[config.client]; if (!gaxClient) { // Lazily instantiate client. - gaxClient = new v1[config.client](this.options); + gaxClient = new v1[config.client](this.options) as gax.ClientStub; this.api[config.client] = gaxClient; } callback(null, gaxClient); @@ -667,7 +755,9 @@ export class PubSub { * @param {object} config.reqOpts Request options. * @param {function} [callback] The callback function. */ - request(config, callback) { + // tslint:disable-next-line:no-any + request( + config: RequestConfig, callback: RequestCallback) { const self = this; this.getClient_(config, (err, client) => { if (err) { @@ -676,7 +766,7 @@ export class PubSub { } let reqOpts = extend(true, {}, config.reqOpts); reqOpts = replaceProjectIdToken(reqOpts, self.projectId); - client[config.method](reqOpts, config.gaxOpts, callback); + client![config.method](reqOpts, config.gaxOpts, callback); }); } /** diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index b6b27355095..f80669c765f 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -22,6 +22,10 @@ import * as extend from 'extend'; import * as is from 'is'; import {Topic} from './topic'; +interface PublishApiResponse { + messageIds: string[]; +} + /** * A Publisher object allows you to publish messages to a specific topic. * diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 5292a9c58d2..3e3a2bfed0a 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -24,7 +24,49 @@ const snakeCase = require('lodash.snakecase'); import {IAM} from './iam'; import {Snapshot} from './snapshot'; import {Subscriber} from './subscriber'; -import {PubSub} from '.'; +import {PubSub, Metadata} from '.'; +import extend = require('extend'); + +/** + * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions#PushConfig + */ +export interface PushConfig { + pushEndpoint: string; + attributes?: {[key: string]: string;}; +} + +/** + * @see https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Duration + */ +export interface Duration { + seconds: number; + nanos: number; +} + +/** + * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions + */ +export interface TSubscriptionMetadata { + name: string; + topic: string; + pushConfig?: PushConfig; + ackDeadlineSeconds?: number; + retainAckedMessages?: boolean; + labels?: {[key: string]: string;}; + expirationPolicy?: {ttl: string;}; +} + +export interface SubscriptionMetadataRaw extends TSubscriptionMetadata { + /** + * Duration in seconds. + */ + messageRetentionDuration?: number; + pushEndpoint?: string; +} + +export interface SubscriptionMetadata extends TSubscriptionMetadata { + messageRetentionDuration?: Duration; +} /** * A Subscription object will give you access to your Cloud Pub/Sub @@ -148,6 +190,7 @@ export class Subscription extends Subscriber { projectId: string; create!: Function; iam: IAM; + name: string; metadata; constructor(pubsub: PubSub, name: string, options) { options = options || {}; @@ -700,21 +743,29 @@ export class Subscription extends Subscriber { * * @private */ - static formatMetadata_(metadata) { - const formatted = Object.assign({}, metadata); + static formatMetadata_(metadata: SubscriptionMetadataRaw) { + let formatted = {} as SubscriptionMetadata; + if (metadata.messageRetentionDuration) { formatted.retainAckedMessages = true; formatted.messageRetentionDuration = { seconds: metadata.messageRetentionDuration, nanos: 0, }; + delete metadata.messageRetentionDuration; + delete metadata.retainAckedMessages; } + if (metadata.pushEndpoint) { - delete formatted.pushEndpoint; formatted.pushConfig = { pushEndpoint: metadata.pushEndpoint, }; + delete metadata.pushEndpoint; } + + formatted = extend(true, formatted, metadata); + + return formatted; } /*! diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index b4b24de45cb..33f48c910d4 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -16,10 +16,11 @@ import {paginator} from '@google-cloud/paginator'; import {promisifyAll} from '@google-cloud/promisify'; +import {CallOptions} from 'google-gax'; import * as is from 'is'; import {Readable} from 'stream'; -import {PubSub} from '.'; +import {CreateTopicCallback, CreateTopicResponse, Metadata, PubSub} from '.'; import {IAM} from './iam'; import {Publisher} from './publisher'; import * as util from './util'; @@ -45,9 +46,10 @@ export class Topic { pubsub: PubSub; request: typeof PubSub.prototype.request; iam: IAM; - metadata; + metadata: Metadata; getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => Readable; + constructor(pubsub: PubSub, name: string) { if (pubsub.Promise) { this.Promise = pubsub.Promise; @@ -141,7 +143,17 @@ export class Topic { * const apiResponse = data[1]; * }); */ - create(gaxOpts?, callback?) { + create(gaxOpts?: CallOptions): Promise; + create(callback: CreateTopicCallback): void; + create(gaxOpts: CallOptions, callback: CreateTopicCallback): void; + create( + gaxOptsOrCallback?: CallOptions|CreateTopicCallback, + callback?: CreateTopicCallback): Promise|void { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + this.pubsub.createTopic(this.name, gaxOpts, callback); } /** diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index af7db144e41..b37c67c259e 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -387,7 +387,7 @@ describe('PubSub', () => { assert.strictEqual(config.method, 'createSubscription'); assert.strictEqual(config.reqOpts.topic, TOPIC.name); assert.strictEqual(config.reqOpts.name, SUB_NAME); - assert.strictEqual(config.gaxOpts, options.gaxOpts); + assert.deepStrictEqual(config.gaxOpts, options.gaxOpts); done(); }; @@ -467,7 +467,7 @@ describe('PubSub', () => { // tslint:disable-next-line no-any (Subscription as any).formatMetadata_ = metadata => { - assert.strictEqual(metadata, fakeMetadata); + assert.deepStrictEqual(metadata, fakeMetadata); return formatted; }; From 7f0ab61967e932089c72dba4d96a90e29db44939 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 29 Nov 2018 09:49:10 -0800 Subject: [PATCH 0288/1115] feat: release v0.22.0 (#378) --- handwritten/pubsub/CHANGELOG.md | 43 +++++++++++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 7243970d469..ac666a0bfe9 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,49 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.22.0 + +### Implementation Changes +- fix(ts): do not ship types ([#377](https://github.com/googleapis/nodejs-pubsub/pull/377)) + +#### Road to TypeScript +- refactor(ts): improve types (2) ([#356](https://github.com/googleapis/nodejs-pubsub/pull/356)) +- refactor(ts): updated lint and fix command to cover gts ([#375](https://github.com/googleapis/nodejs-pubsub/pull/375)) +- refactor(ts): added ts style fix for src/iam.ts ([#352](https://github.com/googleapis/nodejs-pubsub/pull/352)) +- refactor(ts): Added ts style fix for test/topic.ts ([#373](https://github.com/googleapis/nodejs-pubsub/pull/373)) +- refactor(ts): Added ts style fix for test/subscription.ts ([#372](https://github.com/googleapis/nodejs-pubsub/pull/372)) +- refactor(ts): Added ts style fix for test/subscriber.ts ([#371](https://github.com/googleapis/nodejs-pubsub/pull/371)) +- refactor(ts): Added ts style fix for test/snapshot.ts ([#370](https://github.com/googleapis/nodejs-pubsub/pull/370)) +- refactor(ts): Added ts style fix for test/publisher.ts ([#369](https://github.com/googleapis/nodejs-pubsub/pull/369)) +- refactor(ts): added ts style fix for src/index.ts ([#351](https://github.com/googleapis/nodejs-pubsub/pull/351)) +- refactor(ts): added ts style fix for src/publisher.ts ([#357](https://github.com/googleapis/nodejs-pubsub/pull/357)) +- refactor(ts): added ts style fix for src/snapshot.ts ([#358](https://github.com/googleapis/nodejs-pubsub/pull/358)) +- refactor(ts): added ts style fix for src/subscriber.ts ([#359](https://github.com/googleapis/nodejs-pubsub/pull/359)) +- refactor(ts): added ts style fix for src/subscription.ts ([#360](https://github.com/googleapis/nodejs-pubsub/pull/360)) +- refactor(ts): added ts style fix for src/topic.ts ([#361](https://github.com/googleapis/nodejs-pubsub/pull/361)) +- refactor(ts): added ts style fix for src/util.ts ([#362](https://github.com/googleapis/nodejs-pubsub/pull/362)) +- refactor(ts): added ts style fix for test/connection-pool.ts ([#364](https://github.com/googleapis/nodejs-pubsub/pull/364)) +- refactor(ts): added ts style fix for test/histogram.ts ([#365](https://github.com/googleapis/nodejs-pubsub/pull/365)) +- refactor(ts): added ts style fix for test/iam.ts ([#366](https://github.com/googleapis/nodejs-pubsub/pull/366)) +- refactor(ts): added ts style fix for test/index.ts ([#368](https://github.com/googleapis/nodejs-pubsub/pull/368)) +- refactor(ts): added ts style fix for src/connection-pool.ts ([#353](https://github.com/googleapis/nodejs-pubsub/pull/353)) +- refactor(ts): added ts style fix for src/histogram.ts ([#354](https://github.com/googleapis/nodejs-pubsub/pull/354)) +- refactor(ts): enable noImplicitAny on src/iam.ts ([#348](https://github.com/googleapis/nodejs-pubsub/pull/348)) +- added ts style fix for system-test/pubsub.ts ([#374](https://github.com/googleapis/nodejs-pubsub/pull/374)) +- chore: ts-ignoring some stuff in tests ([#343](https://github.com/googleapis/nodejs-pubsub/pull/343)) + +### Dependencies +- fix: Pin @types/sinon to last compatible version ([#345](https://github.com/googleapis/nodejs-pubsub/pull/345)) +- chore(deps): update dependency @types/sinon to v5.0.7 ([#349](https://github.com/googleapis/nodejs-pubsub/pull/349)) + +### Documentation +- docs(samples): Publish with Retry Setting Example ([#355](https://github.com/googleapis/nodejs-pubsub/pull/355)) +- docs: remove outdated comments ([#342](https://github.com/googleapis/nodejs-pubsub/pull/342)) + +### Internal / Testing Changes +- chore: add a synth.metadata +- feat: Add optional delay when calling nack() ([#255](https://github.com/googleapis/nodejs-pubsub/pull/255)) ([#256](https://github.com/googleapis/nodejs-pubsub/pull/256)) + ## v0.21.1 ### Bug fixes diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3a7c3549389..710a307ad14 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.21.1", + "version": "0.22.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From dac327dd658a13d2b4febd4038dc407f2d40047f Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Fri, 30 Nov 2018 16:18:48 -0800 Subject: [PATCH 0289/1115] fix(build): fix system key decryption (#381) --- handwritten/pubsub/.circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml index 6735ebdaaa1..86c63432242 100644 --- a/handwritten/pubsub/.circleci/config.yml +++ b/handwritten/pubsub/.circleci/config.yml @@ -116,7 +116,7 @@ jobs: name: Decrypt credentials. command: | if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - openssl aes-256-cbc -d -in .circleci/key.json.enc \ + openssl aes-256-cbc -d -md md5 -in .circleci/key.json.enc \ -out .circleci/key.json \ -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" fi @@ -148,7 +148,7 @@ jobs: command: | if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then for encrypted_key in .circleci/*.json.enc; do - openssl aes-256-cbc -d -in $encrypted_key \ + openssl aes-256-cbc -d -md md5 -in $encrypted_key \ -out $(echo $encrypted_key | sed 's/\.enc//') \ -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" done From b854dbe21f98e68b16343221ab1bd168cf6415f2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sat, 1 Dec 2018 22:42:02 -0800 Subject: [PATCH 0290/1115] chore(deps): update dependency typescript to ~3.2.0 (#380) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/iam.ts | 6 ++---- handwritten/pubsub/src/subscriber.ts | 3 ++- handwritten/pubsub/src/topic.ts | 3 ++- handwritten/pubsub/test/subscriber.ts | 4 ++-- handwritten/pubsub/test/subscription.ts | 9 +++------ handwritten/pubsub/test/topic.ts | 16 ++++++++++------ 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 710a307ad14..32d7869ec1a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -92,7 +92,7 @@ "proxyquire": "^2.0.0", "sinon": "^7.1.1", "source-map-support": "^0.5.9", - "typescript": "~3.1.5" + "typescript": "~3.2.0" }, "nyc": { "exclude": [ diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 0069762263c..e55e882d751 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -21,11 +21,8 @@ import {promisifyAll} from '@google-cloud/promisify'; import * as arrify from 'arrify'; import {CallOptions} from 'google-gax'; -import * as is from 'is'; -import * as r from 'request'; import {PubSub} from '.'; - /** * @callback GetPolicyCallback * @param {?Error} err Request error, if any. @@ -175,7 +172,8 @@ export class IAM { this.Promise = pubsub.Promise; } this.pubsub = pubsub; - this.request = pubsub.request.bind(pubsub); + // tslint:disable-next-line no-any + this.request = pubsub.request.bind(pubsub) as any; this.id = id; } diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 56a845b3176..a193261c75f 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -264,7 +264,8 @@ export class Subscriber extends EventEmitter { deadline => this.modifyAckDeadline_(modAcks[deadline], Number(deadline))); - requests.push.apply(requests, modAckRequests); + // tslint:disable-next-line no-any + requests.push.apply(requests, modAckRequests as any); Promise.all(modAckRequests).then(() => { this.inventory_.nack = []; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 33f48c910d4..862bc70ed7f 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -71,7 +71,8 @@ export class Topic { * @type {PubSub} */ this.parent = this.pubsub = pubsub; - this.request = pubsub.request.bind(pubsub); + // tslint:disable-next-line no-any + this.request = pubsub.request.bind(pubsub) as any; /** * [IAM (Identity and Access * Management)](https://cloud.google.com/pubsub/access_control) allows you diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index b597f05572a..93a250d2b0a 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -47,14 +47,14 @@ class FakeConnectionPool extends EventEmitter { calledWith_: IArguments; constructor() { super(); - this.calledWith_ = [].slice.call(arguments); + this.calledWith_ = arguments; } } class FakeHistogram { calledWith_: IArguments; constructor() { - this.calledWith_ = [].slice.call(arguments); + this.calledWith_ = arguments; } } // tslint:disable-next-line no-any diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 868aa734bf8..113ff4ed98e 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -35,7 +35,7 @@ const fakePromisify = Object.assign({}, pfy, { class FakeIAM { calledWith_: IArguments; constructor() { - this.calledWith_ = [].slice.call(arguments); + this.calledWith_ = arguments; } } @@ -43,14 +43,14 @@ class FakeSnapshot { calledWith_: IArguments; static formatName_?: Function; constructor() { - this.calledWith_ = [].slice.call(arguments); + this.calledWith_ = arguments; } } class FakeSubscriber { calledWith_: IArguments; constructor() { - this.calledWith_ = [].slice.call(arguments); + this.calledWith_ = arguments; } } @@ -149,9 +149,7 @@ describe('Subscription', () => { it('should create an IAM object', () => { assert(subscription.iam instanceof FakeIAM); - const args = subscription.iam.calledWith_; - assert.strictEqual(args[0], PUBSUB); assert.strictEqual(args[1], subscription.name); }); @@ -159,7 +157,6 @@ describe('Subscription', () => { it('should inherit from Subscriber', () => { const options = {}; const subscription = new Subscription(PUBSUB, SUB_NAME, options); - assert(subscription instanceof FakeSubscriber); assert.strictEqual(subscription.calledWith_[0], options); }); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 34d62123c11..b335ce6f925 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -33,16 +33,20 @@ const fakePromisify = Object.assign({}, pfy, { }); class FakeIAM { - calledWith_: IArguments; - constructor() { - this.calledWith_ = [].slice.call(arguments); + // tslint:disable-next-line no-any + calledWith_: any[]; + // tslint:disable-next-line no-any + constructor(...args: any[]) { + this.calledWith_ = args; } } class FakePublisher { - calledWith_: IArguments; - constructor() { - this.calledWith_ = [].slice.call(arguments); + // tslint:disable-next-line no-any + calledWith_: any[]; + // tslint:disable-next-line no-any + constructor(...args: any[]) { + this.calledWith_ = args; } } From 8b263aef5bf11d3eb8c27afa2d907fd4837697ea Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 3 Dec 2018 15:40:31 -0800 Subject: [PATCH 0291/1115] docs: update readme badges (#383) --- handwritten/pubsub/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 1435b3bd712..96b75d0a57a 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -5,8 +5,7 @@ # [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) [![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages) -[![CircleCI](https://img.shields.io/circleci/project/github/googleapis/nodejs-pubsub.svg?style=flat)](https://circleci.com/gh/googleapis/nodejs-pubsub) -[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/googleapis/nodejs-pubsub?branch=master&svg=true)](https://ci.appveyor.com/project/googleapis/nodejs-pubsub) +[![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.org/package/@google-cloud/pubsub) [![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-pubsub/master.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-pubsub) [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. @@ -116,3 +115,4 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained]. [billing]: https://support.google.com/cloud/answer/6293499#enable-billing [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com [auth]: https://cloud.google.com/docs/authentication/getting-started + From 79bb0cebf7406e1031cbfedf1fd04289931cc65d Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Mon, 3 Dec 2018 18:06:49 -0800 Subject: [PATCH 0292/1115] docs: Add documentation about defaults for publisher (#384) --- handwritten/pubsub/src/publisher.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index f80669c765f..5d6f29ef225 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -37,9 +37,9 @@ interface PublishApiResponse { * @param {object} [options] Configuration object. * @param {object} [options.batching] Batching settings. * @param {number} [options.batching.maxBytes] The maximum number of bytes to - * buffer before sending a payload. + * buffer before sending a payload. Defaults to 1024^2 * 5. * @param {number} [options.batching.maxMessages] The maximum number of messages - * to buffer before sending a payload. + * to buffer before sending a payload. Defaults to 1000. * @param {number} [options.batching.maxMilliseconds] The maximum duration to * wait before sending a payload. Defaults to 100 milliseconds. * @param {object} [options.gaxOpts] Request configuration options, outlined From 44cf0b74f95d4e400530189e4eb7144cf0a2f14a Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 4 Dec 2018 08:53:27 -0800 Subject: [PATCH 0293/1115] chore: update license file (#386) --- handwritten/pubsub/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/LICENSE b/handwritten/pubsub/LICENSE index 7a4a3ea2424..d6456956733 100644 --- a/handwritten/pubsub/LICENSE +++ b/handwritten/pubsub/LICENSE @@ -199,4 +199,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file + limitations under the License. From a58cb712cdb0a713b314077a5e610c72d6dbf417 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Tue, 4 Dec 2018 12:30:37 -0800 Subject: [PATCH 0294/1115] docs: Update documentation for Subscription (#387) --- handwritten/pubsub/src/subscription.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 3e3a2bfed0a..173f42478bc 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -169,7 +169,7 @@ export interface SubscriptionMetadata extends TSubscriptionMetadata { * // message.ackId = ID used to acknowledge the message receival. * // message.data = Contents of the message. * // message.attributes = Attributes of the message. - * // message.timestamp = Timestamp when Pub/Sub received the message. + * // message.publishTime = Timestamp when Pub/Sub received the message. * * // Ack the message: * // message.ack(); From 9cc7b9b21abe32aeea63ab9a96433567ab3240b8 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 5 Dec 2018 15:55:16 -0800 Subject: [PATCH 0295/1115] chore: nyc ignore build/test by default (#391) --- handwritten/pubsub/.nycrc | 3 ++- handwritten/pubsub/package.json | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/.nycrc b/handwritten/pubsub/.nycrc index a1a8e6920ce..feb032400d4 100644 --- a/handwritten/pubsub/.nycrc +++ b/handwritten/pubsub/.nycrc @@ -3,7 +3,8 @@ "exclude": [ "src/*{/*,/**/*}.js", "src/*/v*/*.js", - "test/**/*.js" + "test/**/*.js", + "build/test" ], "watermarks": { "branches": [ diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 32d7869ec1a..74f5feb4392 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -93,10 +93,5 @@ "sinon": "^7.1.1", "source-map-support": "^0.5.9", "typescript": "~3.2.0" - }, - "nyc": { - "exclude": [ - "build/test" - ] } } From f8cf23ee59aff0f43516940e7500ae5eefc5c42d Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 5 Dec 2018 17:54:28 -0800 Subject: [PATCH 0296/1115] chore: always nyc report before calling codecov (#392) --- handwritten/pubsub/.kokoro/test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index eb25b89b95e..4d6c3f83188 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -22,5 +22,6 @@ cd $(dirname $0)/.. npm install npm test +./node_modules/nyc/bin/nyc.js report bash $KOKORO_GFILE_DIR/codecov.sh From ebc306c74f78b292c3934d4f60547a9475c7b665 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 6 Dec 2018 16:44:21 -0800 Subject: [PATCH 0297/1115] fix(docs): place doc comment above the last overload (#393) --- handwritten/pubsub/src/iam.ts | 28 ++++++++++++++-------------- handwritten/pubsub/src/index.ts | 27 ++++++++++++++------------- handwritten/pubsub/src/publisher.ts | 1 + handwritten/pubsub/src/snapshot.ts | 1 + 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index e55e882d751..8f01e4f6fb5 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -177,6 +177,9 @@ export class IAM { this.id = id; } + getPolicy(gaxOpts?: CallOptions): Promise; + getPolicy(callback: GetPolicyCallback): void; + getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; /** * Get the IAM policy * @@ -207,9 +210,6 @@ export class IAM { * const apiResponse = data[1]; * }); */ - getPolicy(gaxOpts?: CallOptions): Promise; - getPolicy(callback: GetPolicyCallback): void; - getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; getPolicy( gaxOptsOrCallback?: CallOptions|GetPolicyCallback, callback?: GetPolicyCallback): Promise|void { @@ -232,6 +232,10 @@ export class IAM { callback!); } + setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise; + setPolicy(policy: Policy, gaxOpts: CallOptions, callback: SetPolicyCallback): + void; + setPolicy(policy: Policy, callback: SetPolicyCallback): void; /** * Set the IAM policy * @@ -280,10 +284,6 @@ export class IAM { * const apiResponse = data[1]; * }); */ - setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise; - setPolicy(policy: Policy, gaxOpts: CallOptions, callback: SetPolicyCallback): - void; - setPolicy(policy: Policy, callback: SetPolicyCallback): void; setPolicy( policy: Policy, gaxOptsOrCallback?: CallOptions|SetPolicyCallback, callback?: SetPolicyCallback): Promise|void { @@ -311,6 +311,13 @@ export class IAM { callback!); } + testPermissions(permissions: string|string[], gaxOpts?: CallOptions): + Promise; + testPermissions( + permissions: string|string[], gaxOpts: CallOptions, + callback: TestIamPermissionsCallback): void; + testPermissions( + permissions: string|string[], callback: TestIamPermissionsCallback): void; /** * Test a set of permissions for a resource. * @@ -371,13 +378,6 @@ export class IAM { * const apiResponse = data[1]; * }); */ - testPermissions(permissions: string|string[], gaxOpts?: CallOptions): - Promise; - testPermissions( - permissions: string|string[], gaxOpts: CallOptions, - callback: TestIamPermissionsCallback): void; - testPermissions( - permissions: string|string[], callback: TestIamPermissionsCallback): void; testPermissions( permissions: string|string[], gaxOptsOrCallback?: CallOptions|TestIamPermissionsCallback, diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 47aee1c70e0..ebf8a3097bb 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -219,6 +219,16 @@ export class PubSub { this.Promise = this.options.promise; } } + + createSubscription( + topic: Topic|string, name: string, + options?: CreateSubscriptionOptions): Promise; + createSubscription( + topic: Topic|string, name: string, options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback): void; + createSubscription( + topic: Topic|string, name: string, + callback: CreateSubscriptionCallback): void; /** * Options for creating a subscription. * @@ -281,15 +291,6 @@ export class PubSub { * = data[1]; * }); */ - createSubscription( - topic: Topic|string, name: string, - options?: CreateSubscriptionOptions): Promise; - createSubscription( - topic: Topic|string, name: string, options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback): void; - createSubscription( - topic: Topic|string, name: string, - callback: CreateSubscriptionCallback): void; createSubscription( topic: Topic|string, name: string, optionsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, @@ -347,6 +348,10 @@ export class PubSub { }); } + createTopic(name: string, gaxOpts: CallOptions): Promise; + createTopic( + name: string, gaxOpts: CallOptions, callback?: CreateTopicCallback): void; + createTopic(name: string, callback: CreateTopicCallback): void; /** * Create a topic with the given name. * @@ -376,10 +381,6 @@ export class PubSub { * const apiResponse = data[1]; * }); */ - createTopic(name: string, gaxOpts: CallOptions): Promise; - createTopic( - name: string, gaxOpts: CallOptions, callback?: CreateTopicCallback): void; - createTopic(name: string, callback: CreateTopicCallback): void; createTopic( name: string, gaxOptsOrCallback?: CallOptions|CreateTopicCallback, callback?: CreateTopicCallback): Promise|void { diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 5d6f29ef225..2957c2f5acf 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -99,6 +99,7 @@ export class Publisher { }; this.timeoutHandle_ = null; } + /** * @typedef {array} PublisherPublishResponse * @property {string} 0 The id for the message. diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index e14acae913d..58150c9cab9 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -165,6 +165,7 @@ export class Snapshot { this.seek = parent.seek.bind(parent, name); } } + /** * Delete the snapshot. * From dfd2c8b6ac816626510afb5c2d5924e2ca0b3023 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 6 Dec 2018 17:59:04 -0800 Subject: [PATCH 0298/1115] Release v0.22.1 (#394) --- handwritten/pubsub/CHANGELOG.md | 18 ++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index ac666a0bfe9..ec3ed093d14 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,24 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.22.1 + +12-06-2018 17:11 PST + +### Dependencies +- chore(deps): update dependency typescript to ~3.2.0 ([#380](https://github.com/googleapis/nodejs-pubsub/pull/380)) + +### Documentation +- fix(docs): place doc comment above the last overload ([#393](https://github.com/googleapis/nodejs-pubsub/pull/393)) +- docs: Update documentation for Subscription ([#387](https://github.com/googleapis/nodejs-pubsub/pull/387)) +- docs: Add documentation about defaults for publisher ([#384](https://github.com/googleapis/nodejs-pubsub/pull/384)) +- docs: update readme badges ([#383](https://github.com/googleapis/nodejs-pubsub/pull/383)) + +### Internal / Testing Changes +- chore: always nyc report before calling codecov ([#392](https://github.com/googleapis/nodejs-pubsub/pull/392)) +- chore: nyc ignore build/test by default ([#391](https://github.com/googleapis/nodejs-pubsub/pull/391)) +- chore: update license file ([#386](https://github.com/googleapis/nodejs-pubsub/pull/386)) + ## v0.22.0 ### Implementation Changes diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 74f5feb4392..60b0719faa8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.22.0", + "version": "0.22.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 5061d8c9a3a5503541255adc404523bf06b1914e Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Fri, 7 Dec 2018 14:54:58 -0800 Subject: [PATCH 0299/1115] Add migration for v0.20.0 from v0.19.0 (#398) It was reported that when upgrading from v0.19 to v0.20 an error about requiring new was exposed. Adding a note about this change to the changelog --- handwritten/pubsub/CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index ec3ed093d14..beac975898e 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -163,6 +163,21 @@ const pubsub = new PubSub(); *BREAKING CHANGE*: - fix: drop support for node.js 4.x and 9.x (#171) + +**BREAKING CHANGE** +`@google-cloud/pubsub` now requires `new`. + +Before: +```javascript +const PubSub = require('@google-cloud/pubsub'); +const pubsub = PubSub(); +``` +Now: +```javascript +const PubSub = require('@google-cloud/pubsub'); +const pubsub = new PubSub(); +``` + ### New Features - Re-generate library using /synth.py (#227) From 42bd5113a59c605c270537dd68a0592b8d1d4d92 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Fri, 7 Dec 2018 16:07:57 -0800 Subject: [PATCH 0300/1115] fix(ts): copy gapic code properly (#399) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 60b0719faa8..0b02fbdde3f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -42,7 +42,7 @@ "fix": "eslint --fix '**/*.js' && gts fix", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", "clean": "gts clean", - "compile": "tsc -p . && cp -r src/v1/ build/src/v1/ && cp -r protos build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", + "compile": "tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", "prepare": "npm run compile", "pretest": "npm run compile" }, From da398190fcb2dd1b666561e5237e70f334883f00 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 10 Dec 2018 09:30:49 -0800 Subject: [PATCH 0301/1115] fix(docs): add subscription expiration policy docs (#400) * fix(docs): add subscription expiration policy docs * npm run fix --- handwritten/pubsub/src/index.ts | 2 ++ handwritten/pubsub/src/subscription.ts | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index ebf8a3097bb..b35b842e619 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -255,6 +255,8 @@ export class PubSub { * @property {boolean} [retainAckedMessages=false] If set, acked messages * are retained in the subscription's backlog for the length of time * specified by `options.messageRetentionDuration`. + * @property {ExpirationPolicy} [expirationPolicy] A policy that specifies + * the conditions for this subscription's expiration. */ /** * Create a subscription to a topic. diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 173f42478bc..fdecd97aee7 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -27,6 +27,26 @@ import {Subscriber} from './subscriber'; import {PubSub, Metadata} from '.'; import extend = require('extend'); +/** + * @typedef {object} ExpirationPolicy + * A policy that specifies the conditions for this subscription's expiration. A + * subscription is considered active as long as any connected subscriber is + * successfully consuming messages from the subscription or is issuing + * operations on the subscription. If expirationPolicy is not set, a default + * policy with ttl of 31 days will be used. The minimum allowed value for + * expirationPolicy.ttl is 1 day. BETA: This feature is part of a beta release. + * This API might be changed in backward-incompatible ways and is not + * recommended for production use. It is not subject to any SLA or deprecation + * policy. + * @property {string} ttl Specifies the "time-to-live" duration for an associated + * resource. The resource expires if it is not active for a period of ttl. The + * eeedefinition of "activity" depends on the type of the associated resource. + * The minimum and maximum allowed values for ttl depend on the type of the + * associated resource, as well. If ttl is not set, the associated resource + * never expires. A duration in seconds with up to nine fractional digits, + * terminated by 's'. Example: "3.5s". + */ + /** * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions#PushConfig */ From 111d13c079b2ec34091165e9bac399f31bee8633 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 10 Dec 2018 13:34:49 -0800 Subject: [PATCH 0302/1115] build: add Kokoro configs for autorelease (#403) * build: add Kokoro configs for autorelease * build: add Kokoro configs for autorelease * chore: remove CircleCI config --- handwritten/pubsub/.circleci/config.yml | 179 ------------------ handwritten/pubsub/.circleci/key.json.enc | Bin 2368 -> 0 bytes .../pubsub/.circleci/npm-install-retry.js | 60 ------ handwritten/pubsub/.kokoro/publish.sh | 31 +++ .../pubsub/.kokoro/release/publish.cfg | 28 +++ 5 files changed, 59 insertions(+), 239 deletions(-) delete mode 100644 handwritten/pubsub/.circleci/config.yml delete mode 100644 handwritten/pubsub/.circleci/key.json.enc delete mode 100755 handwritten/pubsub/.circleci/npm-install-retry.js create mode 100644 handwritten/pubsub/.kokoro/publish.sh create mode 100644 handwritten/pubsub/.kokoro/release/publish.cfg diff --git a/handwritten/pubsub/.circleci/config.yml b/handwritten/pubsub/.circleci/config.yml deleted file mode 100644 index 86c63432242..00000000000 --- a/handwritten/pubsub/.circleci/config.yml +++ /dev/null @@ -1,179 +0,0 @@ -version: 2 -workflows: - version: 2 - tests: - jobs: &workflow_jobs - - node6: - filters: &all_commits - tags: - only: /.*/ - - node8: - filters: *all_commits - - node10: - filters: *all_commits - - lint: - requires: - - node6 - - node8 - - node10 - filters: *all_commits - - docs: - requires: - - node6 - - node8 - - node10 - filters: *all_commits - - system_tests: - requires: - - lint - - docs - filters: &master_and_releases - branches: - only: master - tags: &releases - only: '/^v[\d.]+$/' - - sample_tests: - requires: - - lint - - docs - filters: *master_and_releases - - publish_npm: - requires: - - system_tests - - sample_tests - filters: - branches: - ignore: /.*/ - tags: *releases - nightly: - triggers: - - schedule: - cron: 0 7 * * * - filters: - branches: - only: master - jobs: *workflow_jobs -jobs: - node6: - docker: - - image: 'node:6' - user: node - steps: &unit_tests_steps - - checkout - - run: &npm_install_and_link - name: Install and link the module - command: |- - mkdir -p /home/node/.npm-global - ./.circleci/npm-install-retry.js - environment: - NPM_CONFIG_PREFIX: /home/node/.npm-global - - run: npm test - node8: - docker: - - image: 'node:8' - user: node - steps: *unit_tests_steps - node10: - docker: - - image: 'node:10' - user: node - steps: *unit_tests_steps - lint: - docker: - - image: 'node:8' - user: node - steps: - - checkout - - run: *npm_install_and_link - - run: &samples_npm_install_and_link - name: Link the module being tested to the samples. - command: | - cd samples/ - npm link ../ - ./../.circleci/npm-install-retry.js - environment: - NPM_CONFIG_PREFIX: /home/node/.npm-global - - run: - name: Run linting. - command: npm run lint - environment: - NPM_CONFIG_PREFIX: /home/node/.npm-global - docs: - docker: - - image: 'node:8' - user: node - steps: - - checkout - - run: *npm_install_and_link - - run: npm run docs - sample_tests: - docker: - - image: 'node:8' - user: node - steps: - - checkout - - run: - name: Decrypt credentials. - command: | - if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - openssl aes-256-cbc -d -md md5 -in .circleci/key.json.enc \ - -out .circleci/key.json \ - -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" - fi - - run: *npm_install_and_link - - run: *samples_npm_install_and_link - - run: - name: Run sample tests. - command: npm run samples-test - environment: - GCLOUD_PROJECT: long-door-651 - GOOGLE_APPLICATION_CREDENTIALS: /home/node/samples/.circleci/key.json - NPM_CONFIG_PREFIX: /home/node/.npm-global - - run: - name: Remove unencrypted key. - command: | - if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - rm .circleci/key.json - fi - when: always - working_directory: /home/node/samples/ - system_tests: - docker: - - image: 'node:8' - user: node - steps: - - checkout - - run: - name: Decrypt credentials. - command: | - if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - for encrypted_key in .circleci/*.json.enc; do - openssl aes-256-cbc -d -md md5 -in $encrypted_key \ - -out $(echo $encrypted_key | sed 's/\.enc//') \ - -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" - done - fi - - run: *npm_install_and_link - - run: - name: Run system tests. - command: npm run system-test - environment: - GCLOUD_PROJECT: long-door-651 - GOOGLE_APPLICATION_CREDENTIALS: /home/node/project/.circleci/key.json - NPM_CONFIG_PREFIX: /home/node/.npm-global - - run: - name: Remove unencrypted key. - command: | - if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - rm .circleci/*.json - fi - when: always - publish_npm: - docker: - - image: 'node:8' - user: node - steps: - - checkout - - run: ./.circleci/npm-install-retry.js - - run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc - - run: npm publish --access=public diff --git a/handwritten/pubsub/.circleci/key.json.enc b/handwritten/pubsub/.circleci/key.json.enc deleted file mode 100644 index 5240daa6025147e2edc0a6342bc3ca1a2800b61b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2368 zcmV-G3BUGJVQh3|WM5ysM0`sL)C?x;=ATqr(AcpwT%xg^78w2=Rp5z;cNkX0Mgegm zo^F6N^BA8FY|`xH+c`2G!#Pf20rh67M8jYGf~lt@w%TTi)AB~_>alne4&R^kpLF@~?$V!aJuwg8G&p^I$rm*zOX0cwATnA_i1jg8eP5&m4McRyEe! zzoPgKui1!ttnm2O>H7fgNoXz7zHc8I^V#&dJKQNiV)Sa~B%d@LP(p7h^N{={`JvGv zzq;(!u3d&N^7V>?rk8lc@A9xBnabZUy!&d;X!K*@nMs-r5YSS82HB|}Y1$Fyf_@Y8 z!u)G9q9Q^1l;JM|>aZI}N-qSO=3^=0T(qkgxmGYsAx}qUG|#Y1S=%pkf`dQwIJoz$ z3JwY{VVHBnchCYxT@4fn;)10baX!JKe1$OtEsMS3H8YNnPwrNj|3n%PNg(j`#-Q=k z%~9wSVpkKA--*rqDZoMY5^0PxXjRQ@DEQtR%9bwK zBj-0*wjGVtxvWLW#&+kM{OvaCiksACGk!QPnO%Si(n$Vr5GfVfjdKK-h_5c=HMEJf z3iRhSK4BVo`mWN+qF;SZ-JVsn5jFKdjWnjWPJM?i@CT1MPR_PTzX!S-MoDx8-Fwz= zuT|XzMztqNFw|(+t+nvs0^iyPKi8#4ZSe3#41-x3eC@H8=K-|@kd|~jB7khOl~5Vp z0ok`i2b4do2}O+_Qk{qZy1{+KpudQ|F6A~k0rnBxHyX`g_!cwmEH40x?tc^88-6WA zXbO&$)EK?OVe=cYTJJUyYt8Cj2NN=^u9}35W*hbr2*I-2e|D!G8d4ClTkMycO=+PV zpUZGtwm)y%k5+@%o%M1g%J)vx)0`ql1uuS;E}gWwWJf!<8lh0q8$Ya+TL>XT3>dYy}8L!u-1`=v>$b%3P)_k#!Q5 z*9ep->kk1y=|5$4WJ)((<+@Muv|P#W1P2z;*X)+>0GV99Ag{{&Yd`6dql!HOPnKAK z>QjH?9hE;K1r3Zf{hkJIA6r;@oe$w!e*gQ(`Vp}z`)bh^y;4ydxXAIXi86c{ju%0+ z(m-;^E;HuL2Z-PIg7N?AqoaW0Aj8c8t&k(Hh!xXU%`l03IR1t!@oB|hY}HXrUUXr@ ztYbGMUJFnG(4qN}a>w_zGN76(zry+JF2^W-#^5+S6ulRPlRAV#&@whf7t8VEA8?@4 z=Se<(nTLm5+cgSit%%;EIZxUsoxfk7aU#&dPOxe!Kw?>MZqEZ9@-Na;4cvw^ zw1 zLnWo#3A8s?tC_UmxfC){E~7~RVXOZz0E3C`gT;SHUdvBxprmKTIDw?ZQMJ)+?ui12 z)MLeH>LAyWG`YnmOgL>kT4OH|+~m)uv z)M=4LV^Rp`YHCjHJ_Ff#*G0q%eQr3L)@k#%eW`Wv(rhgJO`>IcQy=-L9@4`Dk+B#c z76wREfwL_TN!@fvf@Mtw27gt;q%}=Cfh$+vXkgOqLttTi2egfeZO)ZPb8>DAWRE^w zxJ)p5M+gM?gizp)|3o^DbG?GCTva1()W>KWHs4$InW z(`}(Hlfhd+=%+SvGKlR3(MY+>C9m&5`<7X|VxSx_=<9SOImy{$PsF$iuuZ1WMID?Ub z{l)$xp^t+0FWX70Dve(~OH{ps$XE+5-+8l$ZJ%)q3+uny-Q-$w-Z4rhJLqbm_k+JD z?Z6oD;oRgEhjm9@ZTC|wRTt{zX3Yeey= z?`IF$>XMtg$H{$>rFuESmfHxFW`C_WjQAU~geMCYIU}7V#$uK7U2fg!f`2FpLcjSy z@_gy&952Oe7<4IRoHwB;=iU*1rF0EWGr=@+YcgTYDefLRQ`Ot`g(y28)?A_!I4W>H zA@SYOLE#b)loy7)@SNh*pa}?4979qkMt=f6r)wOPha`-Rw1!e)0s;+ayJGm_y$VNb1iEl4uqT}F}TFhI7+4dHJxWX)dvbkkdDQ@MHD mQaNBs*CGky(CN+Ro}7GRePII%Xu?I}kyUWIP} diff --git a/handwritten/pubsub/.circleci/npm-install-retry.js b/handwritten/pubsub/.circleci/npm-install-retry.js deleted file mode 100755 index 3240aa2cbf2..00000000000 --- a/handwritten/pubsub/.circleci/npm-install-retry.js +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env node - -let spawn = require('child_process').spawn; - -// -//USE: ./index.js [... NPM ARGS] -// - -let timeout = process.argv[2] || process.env.NPM_INSTALL_TIMEOUT || 60000; -let attempts = process.argv[3] || 3; -let args = process.argv.slice(4); -if (args.length === 0) { - args = ['install']; -} - -(function npm() { - let timer; - args.push('--verbose'); - let proc = spawn('npm', args); - proc.stdout.pipe(process.stdout); - proc.stderr.pipe(process.stderr); - proc.stdin.end(); - proc.stdout.on('data', () => { - setTimer(); - }); - proc.stderr.on('data', () => { - setTimer(); - }); - - // side effect: this also restarts when npm exits with a bad code even if it - // didnt timeout - proc.on('close', (code, signal) => { - clearTimeout(timer); - if (code || signal) { - console.log('[npm-are-you-sleeping] npm exited with code ' + code + ''); - - if (--attempts) { - console.log('[npm-are-you-sleeping] restarting'); - npm(); - } else { - console.log('[npm-are-you-sleeping] i tried lots of times. giving up.'); - throw new Error("npm install fails"); - } - } - }); - - function setTimer() { - clearTimeout(timer); - timer = setTimeout(() => { - console.log('[npm-are-you-sleeping] killing npm with SIGTERM'); - proc.kill('SIGTERM'); - // wait a couple seconds - timer = setTimeout(() => { - // its it's still not closed sigkill - console.log('[npm-are-you-sleeping] killing npm with SIGKILL'); - proc.kill('SIGKILL'); - }, 2000); - }, timeout); - } -})(); diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh new file mode 100644 index 00000000000..f2a8adc0b43 --- /dev/null +++ b/handwritten/pubsub/.kokoro/publish.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# Copyright 2018 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +export NPM_CONFIG_PREFIX=/home/node/.npm-global + +# Start the releasetool reporter +python3 -m pip install gcp-releasetool +python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script + +cd $(dirname $0)/.. + +NPM_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_google_cloud_npm_token) +echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc + +npm install +npm publish --access=public diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg new file mode 100644 index 00000000000..5c969abdb0c --- /dev/null +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -0,0 +1,28 @@ +# Get npm token from Keystore +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "google_cloud_npm_token" + backend_type: FASTCONFIGPUSH + } + } +} + + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-scheduler/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-scheduler/.kokoro/publish.sh" +} From 4230e64a87025b9f82b079da5918cde753235a14 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 10 Dec 2018 14:44:22 -0800 Subject: [PATCH 0303/1115] Release v0.22.2 (#401) --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index beac975898e..0acea87d32e 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.22.2 + +12-10-2018 09:37 PST + +### Implementation Changes +*TypeScript related changes:* +- fix(ts): copy gapic code properly ([#399](https://github.com/googleapis/nodejs-pubsub/pull/399)) + +### Documentation +- fix(docs): add subscription expiration policy docs ([#400](https://github.com/googleapis/nodejs-pubsub/pull/400)) +- Add migration for v0.20.0 from v0.19.0 ([#398](https://github.com/googleapis/nodejs-pubsub/pull/398)) + ## v0.22.1 12-06-2018 17:11 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0b02fbdde3f..8e1910aab50 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.22.1", + "version": "0.22.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From a23f197fea0900450d5fdf93b62788b471af2ce4 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 10 Dec 2018 16:11:11 -0800 Subject: [PATCH 0304/1115] fix(build): fix Kokoro release script (#404) --- handwritten/pubsub/.kokoro/release/publish.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 5c969abdb0c..00c3bfaa8bd 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -14,7 +14,7 @@ before_action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-scheduler/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { @@ -24,5 +24,5 @@ env_vars: { env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-scheduler/.kokoro/publish.sh" + value: "github/nodejs-pubsub/.kokoro/publish.sh" } From f76f350c55e10eaf6fda00b848cfa86364621718 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 10 Dec 2018 19:36:10 -0800 Subject: [PATCH 0305/1115] chore: fix publish.sh permission +x (#406) --- handwritten/pubsub/.kokoro/publish.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 handwritten/pubsub/.kokoro/publish.sh diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh old mode 100644 new mode 100755 From 3c31b125ac8d235252cb0f40f3bd7c823b841f19 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 11 Dec 2018 10:34:18 -0800 Subject: [PATCH 0306/1115] chore: update nyc and eslint configs (#409) --- handwritten/pubsub/.eslintignore | 1 + handwritten/pubsub/.nycrc | 1 + 2 files changed, 2 insertions(+) diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index 2f642cb6044..f0c7aead4bf 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -1,3 +1,4 @@ **/node_modules src/**/doc/* build/ +docs/ diff --git a/handwritten/pubsub/.nycrc b/handwritten/pubsub/.nycrc index feb032400d4..88b001cb587 100644 --- a/handwritten/pubsub/.nycrc +++ b/handwritten/pubsub/.nycrc @@ -1,5 +1,6 @@ { "report-dir": "./.coverage", + "reporter": "lcov", "exclude": [ "src/*{/*,/**/*}.js", "src/*/v*/*.js", From 9d0a3836476f1763a0050c759690d01148dd3c94 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Tue, 11 Dec 2018 18:37:54 -0800 Subject: [PATCH 0307/1115] chore(build): inject yoshi automation key (#410) --- handwritten/pubsub/.kokoro/release/publish.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 00c3bfaa8bd..da86c3da3f1 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -9,6 +9,14 @@ before_action { } } +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + } + } +} # Download trampoline resources. gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" From ee1baa0c7e04be6c4e50a617b552f7df65bbdc62 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 13 Dec 2018 08:29:15 -0800 Subject: [PATCH 0308/1115] chore(deps): update dependency @types/sinon to v7 (#411) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8e1910aab50..9e003f0f888 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -73,7 +73,7 @@ "@types/is": "0.0.21", "@types/mocha": "^5.2.5", "@types/proxyquire": "^1.3.28", - "@types/sinon": "^5.0.7", + "@types/sinon": "^7.0.0", "@types/through2": "^2.0.34", "@types/uuid": "^3.4.4", "codecov": "^3.0.0", From 75d7f9f96116994b14390f66208a2b79fb77ccae Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 20 Dec 2018 20:56:51 -0800 Subject: [PATCH 0309/1115] fix: modernize the sample tests (#414) --- handwritten/pubsub/package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9e003f0f888..6f60332949a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -33,10 +33,8 @@ "scripts": { "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", - "cover": "nyc --reporter=lcov mocha build/test && nyc report", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", - "test-no-cover": "mocha build/test", - "test": "npm run cover", + "test": "nyc mocha build/test", "lint": "eslint '**/*.js' && gts check", "docs": "jsdoc -c .jsdoc.js", "fix": "eslint --fix '**/*.js' && gts fix", From 00a45eac438ef6c32c6906ed5b29ae09f34759f1 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Fri, 4 Jan 2019 14:58:43 -0800 Subject: [PATCH 0310/1115] fix(docs): remove unused long running operations and IAM types --- .../v1/doc/google/iam/v1/doc_iam_policy.js | 77 --------- .../src/v1/doc/google/iam/v1/doc_policy.js | 146 ------------------ handwritten/pubsub/synth.metadata | 36 +++-- 3 files changed, 24 insertions(+), 235 deletions(-) diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js index e952d5d1f02..412a380e10c 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js @@ -14,80 +14,3 @@ // Note: this file is purely for documentation. Any contents are not expected // to be loaded as the JS file. - -/** - * Request message for `SetIamPolicy` method. - * - * @property {string} resource - * REQUIRED: The resource for which the policy is being specified. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * - * @property {Object} policy - * REQUIRED: The complete policy to be applied to the `resource`. The size of - * the policy is limited to a few 10s of KB. An empty policy is a - * valid policy but certain Cloud Platform services (such as Projects) - * might reject them. - * - * This object should have the same structure as [Policy]{@link google.iam.v1.Policy} - * - * @typedef SetIamPolicyRequest - * @memberof google.iam.v1 - * @see [google.iam.v1.SetIamPolicyRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} - */ -const SetIamPolicyRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request message for `GetIamPolicy` method. - * - * @property {string} resource - * REQUIRED: The resource for which the policy is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * - * @typedef GetIamPolicyRequest - * @memberof google.iam.v1 - * @see [google.iam.v1.GetIamPolicyRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} - */ -const GetIamPolicyRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request message for `TestIamPermissions` method. - * - * @property {string} resource - * REQUIRED: The resource for which the policy detail is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. - * - * @property {string[]} permissions - * The set of permissions to check for the `resource`. Permissions with - * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). - * - * @typedef TestIamPermissionsRequest - * @memberof google.iam.v1 - * @see [google.iam.v1.TestIamPermissionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} - */ -const TestIamPermissionsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response message for `TestIamPermissions` method. - * - * @property {string[]} permissions - * A subset of `TestPermissionsRequest.permissions` that the caller is - * allowed. - * - * @typedef TestIamPermissionsResponse - * @memberof google.iam.v1 - * @see [google.iam.v1.TestIamPermissionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/iam_policy.proto} - */ -const TestIamPermissionsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js index 59fca18810c..412a380e10c 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js @@ -14,149 +14,3 @@ // Note: this file is purely for documentation. Any contents are not expected // to be loaded as the JS file. - -/** - * Defines an Identity and Access Management (IAM) policy. It is used to - * specify access control policies for Cloud Platform resources. - * - * - * A `Policy` consists of a list of `bindings`. A `Binding` binds a list of - * `members` to a `role`, where the members can be user accounts, Google groups, - * Google domains, and service accounts. A `role` is a named list of permissions - * defined by IAM. - * - * **Example** - * - * { - * "bindings": [ - * { - * "role": "roles/owner", - * "members": [ - * "user:mike@example.com", - * "group:admins@example.com", - * "domain:google.com", - * "serviceAccount:my-other-app@appspot.gserviceaccount.com", - * ] - * }, - * { - * "role": "roles/viewer", - * "members": ["user:sean@example.com"] - * } - * ] - * } - * - * For a description of IAM and its features, see the - * [IAM developer's guide](https://cloud.google.com/iam). - * - * @property {number} version - * Version of the `Policy`. The default version is 0. - * - * @property {Object[]} bindings - * Associates a list of `members` to a `role`. - * Multiple `bindings` must not be specified for the same `role`. - * `bindings` with no members will result in an error. - * - * This object should have the same structure as [Binding]{@link google.iam.v1.Binding} - * - * @property {string} etag - * `etag` is used for optimistic concurrency control as a way to help - * prevent simultaneous updates of a policy from overwriting each other. - * It is strongly suggested that systems make use of the `etag` in the - * read-modify-write cycle to perform policy updates in order to avoid race - * conditions: An `etag` is returned in the response to `getIamPolicy`, and - * systems are expected to put that etag in the request to `setIamPolicy` to - * ensure that their change will be applied to the same version of the policy. - * - * If no `etag` is provided in the call to `setIamPolicy`, then the existing - * policy is overwritten blindly. - * - * @typedef Policy - * @memberof google.iam.v1 - * @see [google.iam.v1.Policy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} - */ -const Policy = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Associates `members` with a `role`. - * - * @property {string} role - * Role that is assigned to `members`. - * For example, `roles/viewer`, `roles/editor`, or `roles/owner`. - * Required - * - * @property {string[]} members - * Specifies the identities requesting access for a Cloud Platform resource. - * `members` can have the following values: - * - * * `allUsers`: A special identifier that represents anyone who is - * on the internet; with or without a Google account. - * - * * `allAuthenticatedUsers`: A special identifier that represents anyone - * who is authenticated with a Google account or a service account. - * - * * `user:{emailid}`: An email address that represents a specific Google - * account. For example, `alice@gmail.com` or `joe@example.com`. - * - * - * * `serviceAccount:{emailid}`: An email address that represents a service - * account. For example, `my-other-app@appspot.gserviceaccount.com`. - * - * * `group:{emailid}`: An email address that represents a Google group. - * For example, `admins@example.com`. - * - * * `domain:{domain}`: A Google Apps domain name that represents all the - * users of that domain. For example, `google.com` or `example.com`. - * - * @typedef Binding - * @memberof google.iam.v1 - * @see [google.iam.v1.Binding definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} - */ -const Binding = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * The difference delta between two policies. - * - * @property {Object[]} bindingDeltas - * The delta for Bindings between two policies. - * - * This object should have the same structure as [BindingDelta]{@link google.iam.v1.BindingDelta} - * - * @typedef PolicyDelta - * @memberof google.iam.v1 - * @see [google.iam.v1.PolicyDelta definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} - */ -const PolicyDelta = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * One delta entry for Binding. Each individual change (only one member in each - * entry) to a binding will be a separate entry. - * - * @property {number} action - * The action that was performed on a Binding. - * Required - * - * The number should be among the values of [Action]{@link google.iam.v1.Action} - * - * @property {string} role - * Role that is assigned to `members`. - * For example, `roles/viewer`, `roles/editor`, or `roles/owner`. - * Required - * - * @property {string} member - * A single identity requesting access for a Cloud Platform resource. - * Follows the same format of Binding.members. - * Required - * - * @typedef BindingDelta - * @memberof google.iam.v1 - * @see [google.iam.v1.BindingDelta definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/iam/v1/policy.proto} - */ -const BindingDelta = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; \ No newline at end of file diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index f26e69af884..5ce626e8b20 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,26 +1,38 @@ { + "updateTime": "2019-01-03T17:48:54.865712Z", "sources": [ + { + "generator": { + "name": "artman", + "version": "0.16.4", + "dockerImage": "googleapis/artman@sha256:8b45fae963557c3299921037ecbb86f0689f41b1b4aea73408ebc50562cb2857" + } + }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "5a57f0c13a358b2b15452bf2d67453774a5f6d4f", - "internalRef": "221837528" + "sha": "2a5caab4315cb5ab3d5c97c90c6d4e9441052b16", + "internalRef": "227195651" } }, { - "git": { - "name": "googleapis-private", - "remote": "https://github.com/googleapis/googleapis-private.git", - "sha": "6aa8e1a447bb8d0367150356a28cb4d3f2332641", - "internalRef": "221340946" + "template": { + "name": "node_library", + "origin": "synthtool.gcp", + "version": "2018.12.6" } - }, + } + ], + "destinations": [ { - "generator": { - "name": "artman", - "version": "0.16.0", - "dockerImage": "googleapis/artman@sha256:90f9d15e9bad675aeecd586725bce48f5667ffe7d5fc4d1e96d51ff34304815b" + "client": { + "source": "googleapis", + "apiName": "pubsub", + "apiVersion": "v1", + "language": "nodejs", + "generator": "gapic", + "config": "google/pubsub/artman_pubsub.yaml" } } ] From b70b1110689b96e01f16eca5185cf99d9116ee5e Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Mon, 7 Jan 2019 11:00:25 -0800 Subject: [PATCH 0311/1115] docs: sync generated grpc message type docs docs: sync generated grpc message type docs --- .../protos/google/pubsub/v1/pubsub.proto | 163 ++++++++++++------ .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 82 +++++---- handwritten/pubsub/src/v1/publisher_client.js | 6 +- .../pubsub/src/v1/subscriber_client.js | 93 ++++++---- handwritten/pubsub/synth.metadata | 6 +- 5 files changed, 231 insertions(+), 119 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index b13c73473aa..02d0bf34b3e 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -30,13 +30,15 @@ option java_multiple_files = true; option java_outer_classname = "PubsubProto"; option java_package = "com.google.pubsub.v1"; option php_namespace = "Google\\Cloud\\PubSub\\V1"; +option ruby_package = "Google::Cloud::PubSub::V1"; // The service that an application uses to manipulate topics, and to send // messages to a topic. service Publisher { // Creates the given topic with the given name. See the - // resource name rules. + // + // resource name rules. rpc CreateTopic(Topic) returns (Topic) { option (google.api.http) = { put: "/v1/{name=projects/*/topics/*}" @@ -83,8 +85,13 @@ service Publisher { }; } - // Lists the names of the snapshots on this topic.

- // ALPHA: This feature is part of an alpha release. This API might be + // Lists the names of the snapshots on this topic. Snapshots are used in + // Seek + // operations, which allow + // you to manage message acknowledgments in bulk. That is, you can set the + // acknowledgment state of messages in an existing subscription to the state + // captured by a snapshot.

+ // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. rpc ListTopicSnapshots(ListTopicSnapshotsRequest) returns (ListTopicSnapshotsResponse) { @@ -110,14 +117,15 @@ service Publisher { // establishing a bi-directional stream using the `StreamingPull` method. service Subscriber { // Creates a subscription to a given topic. See the - // resource name rules. + // + // resource name rules. // If the subscription already exists, returns `ALREADY_EXISTS`. // If the corresponding topic doesn't exist, returns `NOT_FOUND`. // // If the name is not provided in the request, the server will assign a random // name for this subscription on the same project as the topic, conforming // to the - // [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + // [resource name format](https://cloud.google.com/pubsub/docs/admin#resource_names). // The generated name is populated in the returned Subscription object. // Note that for REST API requests, you must specify a name in the request. rpc CreateSubscription(Subscription) returns (Subscription) { @@ -220,8 +228,12 @@ service Subscriber { }; } - // Gets the configuration details of a snapshot.

- // ALPHA: This feature is part of an alpha release. This API might be + // Gets the configuration details of a snapshot. Snapshots are used in + // Seek + // operations, which allow you to manage message acknowledgments in bulk. That + // is, you can set the acknowledgment state of messages in an existing + // subscription to the state captured by a snapshot.

+ // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. rpc GetSnapshot(GetSnapshotRequest) returns (Snapshot) { @@ -230,8 +242,13 @@ service Subscriber { }; } - // Lists the existing snapshots.

- // ALPHA: This feature is part of an alpha release. This API might be + // Lists the existing snapshots. Snapshots are used in + // Seek + // operations, which allow + // you to manage message acknowledgments in bulk. That is, you can set the + // acknowledgment state of messages in an existing subscription to the state + // captured by a snapshot.

+ // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) { @@ -240,8 +257,14 @@ service Subscriber { }; } - // Creates a snapshot from the requested subscription.

- // ALPHA: This feature is part of an alpha release. This API might be + // Creates a snapshot from the requested subscription. Snapshots are used in + // Seek + // operations, which allow + // you to manage message acknowledgments in bulk. That is, you can set the + // acknowledgment state of messages in an existing subscription to the state + // captured by a snapshot. + //

+ // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy.

// If the snapshot already exists, returns `ALREADY_EXISTS`. @@ -251,10 +274,10 @@ service Subscriber { // See also the `Snapshot.expire_time` field. If the name is not provided in // the request, the server will assign a random // name for this snapshot on the same project as the subscription, conforming - // to the [resource name format](https://cloud.google.com/pubsub/docs/overview#names). - // The generated - // name is populated in the returned Snapshot object. Note that for REST API - // requests, you must specify a name in the request. + // to the + // [resource name format](https://cloud.google.com/pubsub/docs/admin#resource_names). + // The generated name is populated in the returned Snapshot object. Note that + // for REST API requests, you must specify a name in the request. rpc CreateSnapshot(CreateSnapshotRequest) returns (Snapshot) { option (google.api.http) = { put: "/v1/{name=projects/*/snapshots/*}" @@ -262,8 +285,13 @@ service Subscriber { }; } - // Updates an existing snapshot.

- // ALPHA: This feature is part of an alpha release. This API might be + // Updates an existing snapshot. Snapshots are used in + // Seek + // operations, which allow + // you to manage message acknowledgments in bulk. That is, you can set the + // acknowledgment state of messages in an existing subscription to the state + // captured by a snapshot.

+ // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. // Note that certain properties of a snapshot are not modifiable. @@ -274,8 +302,13 @@ service Subscriber { }; } - // Removes an existing snapshot.

- // ALPHA: This feature is part of an alpha release. This API might be + // Removes an existing snapshot. Snapshots are used in + // Seek + // operations, which allow + // you to manage message acknowledgments in bulk. That is, you can set the + // acknowledgment state of messages in an existing subscription to the state + // captured by a snapshot.

+ // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. // When the snapshot is deleted, all messages retained in the snapshot @@ -289,8 +322,14 @@ service Subscriber { } // Seeks an existing subscription to a point in time or to a given snapshot, - // whichever is provided in the request.

- // ALPHA: This feature is part of an alpha release. This API might be + // whichever is provided in the request. Snapshots are used in + // Seek + // operations, which allow + // you to manage message acknowledgments in bulk. That is, you can set the + // acknowledgment state of messages in an existing subscription to the state + // captured by a snapshot. Note that both the subscription and the snapshot + // must be on the same topic.

+ // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. rpc Seek(SeekRequest) returns (SeekResponse) { @@ -302,8 +341,8 @@ service Subscriber { } message MessageStoragePolicy { - // The list of GCP regions where messages that are published to the topic may - // be persisted in storage. Messages published by publishers running in + // The list of GCP region IDs where messages that are published to the topic + // may be persisted in storage. Messages published by publishers running in // non-allowed GCP regions (or running outside of GCP altogether) will be // routed for storage in one of the allowed regions. An empty list indicates a // misconfiguration at the project or organization level, which will result in @@ -321,7 +360,8 @@ message Topic { // must not start with `"goog"`. string name = 1; - // See Creating and managing labels. + // See Creating and + // managing labels. map labels = 2; // Policy constraining how messages published to the topic may be stored. It @@ -335,8 +375,12 @@ message Topic { // A message that is published by publishers and consumed by subscribers. The // message must contain either a non-empty data field or at least one attribute. -// See Quotas and limits for more information about -// message limits. +// Note that client libraries represent this object differently +// depending on the language. See the corresponding +// client +// library documentation for more information. See +// Quotas and limits +// for more information about message limits. message PubsubMessage { // The message data field. If this field is empty, the message must contain // at least one attribute. @@ -446,8 +490,8 @@ message ListTopicSubscriptionsResponse { string next_page_token = 2; } -// Request for the `ListTopicSnapshots` method.

-// ALPHA: This feature is part of an alpha release. This API might be +// Request for the `ListTopicSnapshots` method.

+// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message ListTopicSnapshotsRequest { @@ -465,7 +509,7 @@ message ListTopicSnapshotsRequest { } // Response for the `ListTopicSnapshots` method.

-// ALPHA: This feature is part of an alpha release. This API might be +// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message ListTopicSnapshotsResponse { @@ -506,11 +550,11 @@ message Subscription { // will pull and ack messages using API methods. PushConfig push_config = 4; - // This value is the maximum time after a subscriber receives a message - // before the subscriber should acknowledge the message. After message - // delivery but before the ack deadline expires and before the message is - // acknowledged, it is an outstanding message and will not be delivered - // again during that time (on a best-effort basis). + // The approximate amount of time (on a best-effort basis) Pub/Sub waits for + // the subscriber to acknowledge receipt before resending the message. In the + // interval after the message is delivered and before it is acknowledged, it + // is considered to be outstanding. During that time period, the + // message will not be redelivered (on a best-effort basis). // // For pull subscriptions, this value is used as the initial value for the ack // deadline. To override this value for a given message, call @@ -531,8 +575,11 @@ message Subscription { // Indicates whether to retain acknowledged messages. If true, then // messages are not expunged from the subscription's backlog, even if they are // acknowledged, until they fall out of the `message_retention_duration` - // window.

- // ALPHA: This feature is part of an alpha release. This API might be + // window. This must be true if you would like to + // + // Seek to a timestamp. + //

+ // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. bool retain_acked_messages = 7; @@ -543,12 +590,13 @@ message Subscription { // of acknowledged messages, and thus configures how far back in time a `Seek` // can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 // minutes.

- // ALPHA: This feature is part of an alpha release. This API might be + // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. google.protobuf.Duration message_retention_duration = 8; - // See Creating and managing labels. + // See Creating and + // managing labels. map labels = 9; // A policy that specifies the conditions for this subscription's expiration. @@ -717,8 +765,9 @@ message ModifyAckDeadlineRequest { // The new ack deadline with respect to the time this request was sent to // the Pub/Sub system. For example, if the value is 10, the new // ack deadline will expire 10 seconds after the `ModifyAckDeadline` call - // was made. Specifying zero may immediately make the message available for - // another pull request. + // was made. Specifying zero might immediately make the message available for + // delivery to another subscriber client. This typically results in an + // increase in the rate of message redeliveries (that is, duplicates). // The minimum deadline you can specify is 0 seconds. // The maximum deadline you can specify is 600 seconds (10 minutes). int32 ack_deadline_seconds = 3; @@ -787,7 +836,7 @@ message StreamingPullResponse { } // Request for the `CreateSnapshot` method.

-// ALPHA: This feature is part of an alpha release. This API might be changed in +// BETA: This feature is part of a beta release. This API might be changed in // backward-incompatible ways and is not recommended for production use. // It is not subject to any SLA or deprecation policy. message CreateSnapshotRequest { @@ -795,7 +844,8 @@ message CreateSnapshotRequest { // If the name is not provided in the request, the server will assign a random // name for this snapshot on the same project as the subscription. // Note that for REST API requests, you must specify a name. See the - // resource name rules. + // + // resource name rules. // Format is `projects/{project}/snapshots/{snap}`. string name = 1; @@ -810,12 +860,13 @@ message CreateSnapshotRequest { // Format is `projects/{project}/subscriptions/{sub}`. string subscription = 2; - // See Creating and managing labels. + // See Creating and + // managing labels. map labels = 3; } // Request for the UpdateSnapshot method.

-// ALPHA: This feature is part of an alpha release. This API might be +// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message UpdateSnapshotRequest { @@ -827,8 +878,13 @@ message UpdateSnapshotRequest { google.protobuf.FieldMask update_mask = 2; } -// A snapshot resource.

-// ALPHA: This feature is part of an alpha release. This API might be +// A snapshot resource. Snapshots are used in +// Seek +// operations, which allow +// you to manage message acknowledgments in bulk. That is, you can set the +// acknowledgment state of messages in an existing subscription to the state +// captured by a snapshot.

+// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message Snapshot { @@ -850,12 +906,13 @@ message Snapshot { // snapshot that would expire in less than 1 hour after creation. google.protobuf.Timestamp expire_time = 3; - // See Creating and managing labels. + // See Creating and + // managing labels. map labels = 4; } // Request for the GetSnapshot method.

-// ALPHA: This feature is part of an alpha release. This API might be +// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message GetSnapshotRequest { @@ -865,7 +922,7 @@ message GetSnapshotRequest { } // Request for the `ListSnapshots` method.

-// ALPHA: This feature is part of an alpha release. This API might be +// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message ListSnapshotsRequest { @@ -883,7 +940,7 @@ message ListSnapshotsRequest { } // Response for the `ListSnapshots` method.

-// ALPHA: This feature is part of an alpha release. This API might be +// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message ListSnapshotsResponse { @@ -896,7 +953,7 @@ message ListSnapshotsResponse { } // Request for the `DeleteSnapshot` method.

-// ALPHA: This feature is part of an alpha release. This API might be +// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message DeleteSnapshotRequest { @@ -905,8 +962,8 @@ message DeleteSnapshotRequest { string snapshot = 1; } -// Request for the `Seek` method.

-// ALPHA: This feature is part of an alpha release. This API might be +// Request for the `Seek` method.

+// BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. message SeekRequest { diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index 5ca50f34d4a..cdba395ed50 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -17,8 +17,8 @@ /** * @property {string[]} allowedPersistenceRegions - * The list of GCP regions where messages that are published to the topic may - * be persisted in storage. Messages published by publishers running in + * The list of GCP region IDs where messages that are published to the topic + * may be persisted in storage. Messages published by publishers running in * non-allowed GCP regions (or running outside of GCP altogether) will be * routed for storage in one of the allowed regions. An empty list indicates a * misconfiguration at the project or organization level, which will result in @@ -44,7 +44,8 @@ const MessageStoragePolicy = { * must not start with `"goog"`. * * @property {Object.} labels - * See Creating and managing labels. + * See Creating and + * managing labels. * * @property {Object} messageStoragePolicy * Policy constraining how messages published to the topic may be stored. It @@ -67,8 +68,12 @@ const Topic = { /** * A message that is published by publishers and consumed by subscribers. The * message must contain either a non-empty data field or at least one attribute. - * See Quotas and limits for more information about - * message limits. + * Note that client libraries represent this object differently + * depending on the language. See the corresponding + * client + * library documentation for more information. See + * Quotas and limits + * for more information about message limits. * * @property {string} data * The message data field. If this field is empty, the message must contain @@ -260,8 +265,8 @@ const ListTopicSubscriptionsResponse = { }; /** - * Request for the `ListTopicSnapshots` method.

- * ALPHA: This feature is part of an alpha release. This API might be + * Request for the `ListTopicSnapshots` method.

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -287,7 +292,7 @@ const ListTopicSnapshotsRequest = { /** * Response for the `ListTopicSnapshots` method.

- * ALPHA: This feature is part of an alpha release. This API might be + * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -347,11 +352,11 @@ const DeleteTopicRequest = { * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} * * @property {number} ackDeadlineSeconds - * This value is the maximum time after a subscriber receives a message - * before the subscriber should acknowledge the message. After message - * delivery but before the ack deadline expires and before the message is - * acknowledged, it is an outstanding message and will not be delivered - * again during that time (on a best-effort basis). + * The approximate amount of time (on a best-effort basis) Pub/Sub waits for + * the subscriber to acknowledge receipt before resending the message. In the + * interval after the message is delivered and before it is acknowledged, it + * is considered to be outstanding. During that time period, the + * message will not be redelivered (on a best-effort basis). * * For pull subscriptions, this value is used as the initial value for the ack * deadline. To override this value for a given message, call @@ -372,8 +377,11 @@ const DeleteTopicRequest = { * Indicates whether to retain acknowledged messages. If true, then * messages are not expunged from the subscription's backlog, even if they are * acknowledged, until they fall out of the `message_retention_duration` - * window.

- * ALPHA: This feature is part of an alpha release. This API might be + * window. This must be true if you would like to + * + * Seek to a timestamp. + *

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -384,14 +392,15 @@ const DeleteTopicRequest = { * of acknowledged messages, and thus configures how far back in time a `Seek` * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 * minutes.

- * ALPHA: This feature is part of an alpha release. This API might be + * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * * This object should have the same structure as [Duration]{@link google.protobuf.Duration} * * @property {Object.} labels - * See Creating and managing labels. + * See Creating and + * managing labels. * * @property {Object} expirationPolicy * A policy that specifies the conditions for this subscription's expiration. @@ -672,8 +681,9 @@ const PullResponse = { * The new ack deadline with respect to the time this request was sent to * the Pub/Sub system. For example, if the value is 10, the new * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call - * was made. Specifying zero may immediately make the message available for - * another pull request. + * was made. Specifying zero might immediately make the message available for + * delivery to another subscriber client. This typically results in an + * increase in the rate of message redeliveries (that is, duplicates). * The minimum deadline you can specify is 0 seconds. * The maximum deadline you can specify is 600 seconds (10 minutes). * @@ -775,7 +785,7 @@ const StreamingPullResponse = { /** * Request for the `CreateSnapshot` method.

- * ALPHA: This feature is part of an alpha release. This API might be changed in + * BETA: This feature is part of a beta release. This API might be changed in * backward-incompatible ways and is not recommended for production use. * It is not subject to any SLA or deprecation policy. * @@ -784,7 +794,8 @@ const StreamingPullResponse = { * If the name is not provided in the request, the server will assign a random * name for this snapshot on the same project as the subscription. * Note that for REST API requests, you must specify a name. See the - * resource name rules. + * + * resource name rules. * Format is `projects/{project}/snapshots/{snap}`. * * @property {string} subscription @@ -799,7 +810,8 @@ const StreamingPullResponse = { * Format is `projects/{project}/subscriptions/{sub}`. * * @property {Object.} labels - * See Creating and managing labels. + * See Creating and + * managing labels. * * @typedef CreateSnapshotRequest * @memberof google.pubsub.v1 @@ -811,7 +823,7 @@ const CreateSnapshotRequest = { /** * Request for the UpdateSnapshot method.

- * ALPHA: This feature is part of an alpha release. This API might be + * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -835,8 +847,13 @@ const UpdateSnapshotRequest = { }; /** - * A snapshot resource.

- * ALPHA: This feature is part of an alpha release. This API might be + * A snapshot resource. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot.

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -861,7 +878,8 @@ const UpdateSnapshotRequest = { * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} * * @property {Object.} labels - * See Creating and managing labels. + * See Creating and + * managing labels. * * @typedef Snapshot * @memberof google.pubsub.v1 @@ -873,7 +891,7 @@ const Snapshot = { /** * Request for the GetSnapshot method.

- * ALPHA: This feature is part of an alpha release. This API might be + * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -891,7 +909,7 @@ const GetSnapshotRequest = { /** * Request for the `ListSnapshots` method.

- * ALPHA: This feature is part of an alpha release. This API might be + * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -917,7 +935,7 @@ const ListSnapshotsRequest = { /** * Response for the `ListSnapshots` method.

- * ALPHA: This feature is part of an alpha release. This API might be + * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -940,7 +958,7 @@ const ListSnapshotsResponse = { /** * Request for the `DeleteSnapshot` method.

- * ALPHA: This feature is part of an alpha release. This API might be + * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -957,8 +975,8 @@ const DeleteSnapshotRequest = { }; /** - * Request for the `Seek` method.

- * ALPHA: This feature is part of an alpha release. This API might be + * Request for the `Seek` method.

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 174146ae3d7..ff7f6d48445 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -278,7 +278,8 @@ class PublisherClient { /** * Creates the given topic with the given name. See the - * resource name rules. + * + * resource name rules. * * @param {Object} request * The request object that will be sent. @@ -290,7 +291,8 @@ class PublisherClient { * signs (`%`). It must be between 3 and 255 characters in length, and it * must not start with `"goog"`. * @param {Object.} [request.labels] - * See Creating and managing labels. + * See Creating and + * managing labels. * @param {Object} [request.messageStoragePolicy] * Policy constraining how messages published to the topic may be stored. It * is determined when the topic is created based on the policy configured at diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 010017acd36..10c9ad8e2ed 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -272,14 +272,15 @@ class SubscriberClient { /** * Creates a subscription to a given topic. See the - * resource name rules. + * + * resource name rules. * If the subscription already exists, returns `ALREADY_EXISTS`. * If the corresponding topic doesn't exist, returns `NOT_FOUND`. * * If the name is not provided in the request, the server will assign a random * name for this subscription on the same project as the topic, conforming * to the - * [resource name format](https://cloud.google.com/pubsub/docs/overview#names). + * [resource name format](https://cloud.google.com/pubsub/docs/admin#resource_names). * The generated name is populated in the returned Subscription object. * Note that for REST API requests, you must specify a name in the request. * @@ -304,11 +305,11 @@ class SubscriberClient { * * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} * @param {number} [request.ackDeadlineSeconds] - * This value is the maximum time after a subscriber receives a message - * before the subscriber should acknowledge the message. After message - * delivery but before the ack deadline expires and before the message is - * acknowledged, it is an outstanding message and will not be delivered - * again during that time (on a best-effort basis). + * The approximate amount of time (on a best-effort basis) Pub/Sub waits for + * the subscriber to acknowledge receipt before resending the message. In the + * interval after the message is delivered and before it is acknowledged, it + * is considered to be outstanding. During that time period, the + * message will not be redelivered (on a best-effort basis). * * For pull subscriptions, this value is used as the initial value for the ack * deadline. To override this value for a given message, call @@ -328,8 +329,11 @@ class SubscriberClient { * Indicates whether to retain acknowledged messages. If true, then * messages are not expunged from the subscription's backlog, even if they are * acknowledged, until they fall out of the `message_retention_duration` - * window.

- * ALPHA: This feature is part of an alpha release. This API might be + * window. This must be true if you would like to + * + * Seek to a timestamp. + *

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @param {Object} [request.messageRetentionDuration] @@ -339,13 +343,14 @@ class SubscriberClient { * of acknowledged messages, and thus configures how far back in time a `Seek` * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 * minutes.

- * ALPHA: This feature is part of an alpha release. This API might be + * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * * This object should have the same structure as [Duration]{@link google.protobuf.Duration} * @param {Object.} [request.labels] - * See Creating and managing labels. + * See Creating and + * managing labels. * @param {Object} [request.expirationPolicy] * A policy that specifies the conditions for this subscription's expiration. * A subscription is considered active as long as any connected subscriber is @@ -727,8 +732,9 @@ class SubscriberClient { * The new ack deadline with respect to the time this request was sent to * the Pub/Sub system. For example, if the value is 10, the new * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call - * was made. Specifying zero may immediately make the message available for - * another pull request. + * was made. Specifying zero might immediately make the message available for + * delivery to another subscriber client. This typically results in an + * increase in the rate of message redeliveries (that is, duplicates). * The minimum deadline you can specify is 0 seconds. * The maximum deadline you can specify is 600 seconds (10 minutes). * @param {Object} [options] @@ -986,8 +992,13 @@ class SubscriberClient { } /** - * Lists the existing snapshots.

- * ALPHA: This feature is part of an alpha release. This API might be + * Lists the existing snapshots. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot.

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * @@ -1140,8 +1151,14 @@ class SubscriberClient { } /** - * Creates a snapshot from the requested subscription.

- * ALPHA: This feature is part of an alpha release. This API might be + * Creates a snapshot from the requested subscription. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot. + *

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy.

* If the snapshot already exists, returns `ALREADY_EXISTS`. @@ -1151,10 +1168,10 @@ class SubscriberClient { * See also the `Snapshot.expire_time` field. If the name is not provided in * the request, the server will assign a random * name for this snapshot on the same project as the subscription, conforming - * to the [resource name format](https://cloud.google.com/pubsub/docs/overview#names). - * The generated - * name is populated in the returned Snapshot object. Note that for REST API - * requests, you must specify a name in the request. + * to the + * [resource name format](https://cloud.google.com/pubsub/docs/admin#resource_names). + * The generated name is populated in the returned Snapshot object. Note that + * for REST API requests, you must specify a name in the request. * * @param {Object} request * The request object that will be sent. @@ -1163,7 +1180,8 @@ class SubscriberClient { * If the name is not provided in the request, the server will assign a random * name for this snapshot on the same project as the subscription. * Note that for REST API requests, you must specify a name. See the - * resource name rules. + * + * resource name rules. * Format is `projects/{project}/snapshots/{snap}`. * @param {string} request.subscription * The subscription whose backlog the snapshot retains. @@ -1176,7 +1194,8 @@ class SubscriberClient { * successful completion of the CreateSnapshot request. * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object.} [request.labels] - * See Creating and managing labels. + * See Creating and + * managing labels. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -1222,8 +1241,13 @@ class SubscriberClient { } /** - * Updates an existing snapshot.

- * ALPHA: This feature is part of an alpha release. This API might be + * Updates an existing snapshot. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot.

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * Note that certain properties of a snapshot are not modifiable. @@ -1294,8 +1318,13 @@ class SubscriberClient { } /** - * Removes an existing snapshot.

- * ALPHA: This feature is part of an alpha release. This API might be + * Removes an existing snapshot. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot.

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * When the snapshot is deleted, all messages retained in the snapshot @@ -1341,8 +1370,14 @@ class SubscriberClient { /** * Seeks an existing subscription to a point in time or to a given snapshot, - * whichever is provided in the request.

- * ALPHA: This feature is part of an alpha release. This API might be + * whichever is provided in the request. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot. Note that both the subscription and the snapshot + * must be on the same topic.

+ * BETA: This feature is part of a beta release. This API might be * changed in backward-incompatible ways and is not recommended for production * use. It is not subject to any SLA or deprecation policy. * diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 5ce626e8b20..38bda9b020d 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-01-03T17:48:54.865712Z", + "updateTime": "2019-01-05T12:13:56.472318Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "2a5caab4315cb5ab3d5c97c90c6d4e9441052b16", - "internalRef": "227195651" + "sha": "a111a53c0c6722afcd793b64724ceef7862db5b9", + "internalRef": "227896184" } }, { From 864178768bd4f5df09d097494fd1fd38cba8dfd9 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 14 Jan 2019 12:12:06 -0800 Subject: [PATCH 0312/1115] BREAKING CHANGE: refactor(subscriber): remove unneeded code & utilize typescript (#388) BREAKING CHANGE: refactor(subscriber): remove unneeded code & utilize typescript --- handwritten/pubsub/package.json | 9 +- handwritten/pubsub/src/connection-pool.ts | 472 ----- handwritten/pubsub/src/histogram.ts | 10 +- handwritten/pubsub/src/index.ts | 17 +- handwritten/pubsub/src/lease-manager.ts | 261 +++ handwritten/pubsub/src/message-queues.ts | 202 ++ handwritten/pubsub/src/message-stream.ts | 355 ++++ handwritten/pubsub/src/publisher.ts | 5 +- handwritten/pubsub/src/subscriber.ts | 706 +++---- handwritten/pubsub/src/subscription.ts | 174 +- .../pubsub/src/v1/subscriber_client.js | 4 + handwritten/pubsub/system-test/pubsub.ts | 92 +- handwritten/pubsub/test/connection-pool.ts | 1422 -------------- handwritten/pubsub/test/histogram.ts | 17 +- handwritten/pubsub/test/lease-manager.ts | 428 +++++ handwritten/pubsub/test/message-queues.ts | 380 ++++ handwritten/pubsub/test/message-stream.ts | 512 +++++ handwritten/pubsub/test/subscriber.ts | 1700 +++++------------ handwritten/pubsub/test/subscription.ts | 141 +- 19 files changed, 3209 insertions(+), 3698 deletions(-) delete mode 100644 handwritten/pubsub/src/connection-pool.ts create mode 100644 handwritten/pubsub/src/lease-manager.ts create mode 100644 handwritten/pubsub/src/message-queues.ts create mode 100644 handwritten/pubsub/src/message-stream.ts delete mode 100644 handwritten/pubsub/test/connection-pool.ts create mode 100644 handwritten/pubsub/test/lease-manager.ts create mode 100644 handwritten/pubsub/test/message-queues.ts create mode 100644 handwritten/pubsub/test/message-stream.ts diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6f60332949a..13aaad7348c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -56,12 +56,13 @@ "google-auth-library": "^2.0.0", "google-gax": "^0.22.0", "is": "^3.0.1", + "is-stream-ended": "^0.1.4", "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", + "p-defer": "^1.0.0", "protobufjs": "^6.8.1", - "through2": "^3.0.0", - "uuid": "^3.1.0" + "through2": "^3.0.0" }, "devDependencies": { "@google-cloud/nodejs-repo-tools": "^3.0.0", @@ -70,6 +71,7 @@ "@types/extend": "^3.0.0", "@types/is": "0.0.21", "@types/mocha": "^5.2.5", + "@types/p-defer": "^1.0.3", "@types/proxyquire": "^1.3.28", "@types/sinon": "^7.0.0", "@types/through2": "^2.0.34", @@ -90,6 +92,7 @@ "proxyquire": "^2.0.0", "sinon": "^7.1.1", "source-map-support": "^0.5.9", - "typescript": "~3.2.0" + "typescript": "~3.2.0", + "uuid": "^3.1.0" } } diff --git a/handwritten/pubsub/src/connection-pool.ts b/handwritten/pubsub/src/connection-pool.ts deleted file mode 100644 index 012a908b8ad..00000000000 --- a/handwritten/pubsub/src/connection-pool.ts +++ /dev/null @@ -1,472 +0,0 @@ -/*! - * Copyright 2017 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import {replaceProjectIdToken} from '@google-cloud/projectify'; -const duplexify = require('duplexify'); -const each = require('async-each'); -import {EventEmitter} from 'events'; -import * as through from 'through2'; -import * as uuid from 'uuid'; -import * as util from './util'; -import {Subscription} from './subscription'; -import {PubSub} from '.'; -import {Duplex} from 'stream'; -import {StatusObject} from 'grpc'; -import {Subscriber} from './subscriber'; - -const CHANNEL_READY_EVENT = 'channel.ready'; -const CHANNEL_ERROR_EVENT = 'channel.error'; - -const KEEP_ALIVE_INTERVAL = 30000; - -/*! - * if we can't establish a connection within 5 minutes, we need to back off - * and emit an error to the user. - */ -const MAX_TIMEOUT = 300000; - -/*! - * codes to retry streams - */ -const RETRY_CODES = [ - 0, // ok - 1, // canceled - 2, // unknown - 4, // deadline exceeded - 8, // resource exhausted - 10, // aborted - 13, // internal error - 14, // unavailable - 15, // dataloss -]; - -class ConnectionError extends Error { - code?: string; -} - -export interface ConnectionPoolSettings { - maxConnections: number; - ackDeadline: number; -} - -export type ConnectionResponse = [Duplex]; -export interface ConnectionCallback { - (err: Error|null, connection?: Duplex): void; -} - -/*! - * ConnectionPool is used to manage the stream connections created via - * StreamingPull rpc. - * - * @private - * @param {Subscription} subscription The subscription to create - * connections for. - * @param {object} [options] Pool options. - * @param {number} [options.maxConnections=5] Number of connections to create. - * @param {number} [options.ackDeadline] The ack deadline to send when - * creating a connection. - */ -export class ConnectionPool extends EventEmitter { - subscription: Subscription; - pubsub: PubSub; - connections: Map; - isPaused: boolean; - isOpen: boolean; - isGettingChannelState: boolean; - failedConnectionAttempts: number; - noConnectionsTime: number; - settings: ConnectionPoolSettings; - queue: NodeJS.Timer[]; - keepAliveHandle?: NodeJS.Timer; - client?: Subscriber|null; - constructor(subscription: Subscription) { - super(); - this.subscription = subscription; - this.pubsub = subscription.pubsub; - this.connections = new Map(); - this.isPaused = false; - this.isOpen = false; - this.isGettingChannelState = false; - this.failedConnectionAttempts = 0; - this.noConnectionsTime = 0; - this.settings = { - maxConnections: subscription.maxConnections || 5, - ackDeadline: subscription.ackDeadline || 10000, - }; - this.queue = []; - this.open(); - } - /*! - * Acquires a connection from the pool. Optionally you can specify an id for a - * specific connection, but if it is no longer available it will return the - * first available connection. - * - * @private - * @param {string} [id] The id of the connection to retrieve. - * @param {function} callback The callback function. - * @param {?error} callback.err An error returned while acquiring a - * connection. - * @param {stream} callback.connection A duplex stream. - */ - acquire(id?: string): Promise; - acquire(id: string, callback: ConnectionCallback): void; - acquire(callback: ConnectionCallback): void; - acquire(idOrCallback?: string|ConnectionCallback, cb?: ConnectionCallback): - void|Promise { - let id = typeof idOrCallback === 'string' ? idOrCallback : null; - const callback = typeof idOrCallback === 'function' ? idOrCallback : cb!; - - if (!this.isOpen) { - callback(new Error('No connections available to make request.')); - return; - } - // it's possible that by the time a user acks the connection could have - // closed, so in that case we'll just return any connection - if (!this.connections.has(id!)) { - id = this.connections.keys().next().value; - } - const connection = this.connections.get(id!); - if (connection) { - callback(null, connection); - return; - } - this.once('connected', connection => { - callback(null, connection); - }); - } - /*! - * Ends each connection in the pool and closes the pool, preventing new - * connections from being created. - * - * @private - * @param {function} callback The callback function. - * @param {?error} callback.error An error returned while closing the pool. - */ - close(callback) { - const connections = Array.from(this.connections.values()); - callback = callback || util.noop; - clearInterval(this.keepAliveHandle!); - this.connections.clear(); - this.queue.forEach(clearTimeout); - this.queue.length = 0; - this.isOpen = false; - this.isGettingChannelState = false; - this.removeAllListeners('newListener') - .removeAllListeners(CHANNEL_READY_EVENT) - .removeAllListeners(CHANNEL_ERROR_EVENT); - this.failedConnectionAttempts = 0; - this.noConnectionsTime = 0; - each( - connections, - (connection, onEndCallback) => { - connection.end(err => { - connection.cancel(); - onEndCallback(err); - }); - }, - err => { - if (this.client) { - this.client.close(); - this.client = null; - } - callback(err); - }); - } - /*! - * Creates a connection. This is async but instead of providing a callback - * a `connected` event will fire once the connection is ready. - * - * @private - */ - createConnection() { - this.getClient((err, client) => { - if (err) { - this.emit('error', err); - return; - } - const requestStream = client.streamingPull(); - const readStream = requestStream.pipe(through.obj((chunk, enc, next) => { - chunk.receivedMessages.forEach(message => { - readStream.push(message); - }); - next(); - })); - const connection = duplexify(requestStream, readStream, { - objectMode: true, - }); - const id = uuid.v4(); - let errorImmediateHandle; - connection.cancel = requestStream.cancel.bind(requestStream); - if (this.isPaused) { - connection.pause(); - } - - const onChannelError = () => { - this.removeListener(CHANNEL_READY_EVENT, onChannelReady); - requestStream.cancel(); - }; - const onChannelReady = () => { - this.removeListener(CHANNEL_ERROR_EVENT, onChannelError); - connection.isConnected = true; - this.noConnectionsTime = 0; - this.failedConnectionAttempts = 0; - this.emit('connected', connection); - }; - // since this is a bidi stream it's possible that we recieve errors from - // reads or writes. We also want to try and cut down on the number of - // errors that we emit if other connections are still open. So by using - // setImmediate we're able to cancel the error message if it gets passed - // to the `status` event where we can check if the connection should be - // re-opened or if we should send the error to the user - const onConnectionError = err => { - errorImmediateHandle = setImmediate(() => this.emit('error', err)); - }; - const onConnectionData = message => { - this.emit('message', this.createMessage(id, message)); - }; - const onConnectionStatus = status => { - clearImmediate(errorImmediateHandle); - connection.end(); - this.connections.delete(id); - if (!connection.isConnected) { - this.failedConnectionAttempts += 1; - } - if (!this.isConnected() && !this.noConnectionsTime) { - this.noConnectionsTime = Date.now(); - } - if (this.shouldReconnect(status)) { - this.queueConnection(); - } else if (this.isOpen && !this.connections.size) { - const error = new ConnectionError(status.details); - error.code = status.code; - this.emit('error', error); - } - }; - - this.once(CHANNEL_ERROR_EVENT, onChannelError) - .once(CHANNEL_READY_EVENT, onChannelReady); - requestStream.on( - 'status', status => setImmediate(onConnectionStatus, status)); - connection.on('error', onConnectionError) - .on('data', onConnectionData) - .write({ - subscription: replaceProjectIdToken( - this.subscription.name, this.pubsub.projectId), - streamAckDeadlineSeconds: this.settings.ackDeadline / 1000, - }); - this.connections.set(id, connection); - }); - } - /** - * Creates a message object for the user. - * - * @param {string} connectionId The connection id that the message was - * received on. - * @param {object} resp The message response data from StreamingPull. - * @return {object} message The message object. - */ - createMessage(connectionId, resp) { - const pt = resp.message.publishTime; - const milliseconds = Number(pt.nanos) / 1e6; - const originalDataLength = resp.message.data.length; - const message = { - connectionId, - ackId: resp.ackId, - id: resp.message.messageId, - attributes: resp.message.attributes, - publishTime: new Date(Number(pt.seconds) * 1000 + milliseconds), - received: Date.now(), - data: resp.message.data, - // using get here to prevent user from overwriting data - get length() { - return originalDataLength; - }, - ack: () => { - this.subscription.ack_(message); - }, - nack: (delay?: number) => { - this.subscription.nack_(message, delay); - } - }; - return message; - } - /*! - * Gets the channels connectivity state and emits channel events accordingly. - * - * @private - * @fires CHANNEL_ERROR_EVENT - * @fires CHANNEL_READY_EVENT - */ - getAndEmitChannelState() { - this.isGettingChannelState = true; - this.getClient((err, client) => { - if (err) { - this.isGettingChannelState = false; - this.emit(CHANNEL_ERROR_EVENT); - this.emit('error', err); - return; - } - let elapsedTimeWithoutConnection = 0; - const now = Date.now(); - if (this.noConnectionsTime) { - elapsedTimeWithoutConnection = now - this.noConnectionsTime; - } - const deadline = now + (MAX_TIMEOUT - elapsedTimeWithoutConnection); - client.waitForReady(deadline, err => { - this.isGettingChannelState = false; - if (err) { - this.emit(CHANNEL_ERROR_EVENT, err); - return; - } - this.emit(CHANNEL_READY_EVENT); - }); - }); - } - /*! - * Gets the Subscriber client. We need to bypass GAX until they allow - * deadlines to be optional. - * - * @private - * @param {function} callback The callback function. - * @param {?error} callback.err An error occurred while getting the client. - * @param {object} callback.client The Subscriber client. - */ - getClient(callback) { - return this.pubsub.getClient_({client: 'SubscriberClient'}, callback); - } - /*! - * Check to see if at least one stream in the pool is connected. - * - * @private - * @returns {boolean} - */ - isConnected() { - const interator = this.connections.values(); - let connection = interator.next().value; - while (connection) { - // tslint:disable-next-line no-any - if ((connection as any).isConnected) { - return true; - } - connection = interator.next().value; - } - return false; - } - /*! - * Creates specified number of connections and puts pool in open state. - * - * @private - */ - open() { - let existing = this.connections.size; - const max = this.settings.maxConnections; - for (; existing < max; existing++) { - this.queueConnection(); - } - this.isOpen = true; - this.failedConnectionAttempts = 0; - this.noConnectionsTime = Date.now(); - this.on('newListener', eventName => { - if (eventName === CHANNEL_READY_EVENT && !this.isGettingChannelState) { - this.getAndEmitChannelState(); - } - }); - if (!this.subscription.writeToStreams_) { - this.keepAliveHandle = setInterval(() => { - this.sendKeepAlives(); - }, KEEP_ALIVE_INTERVAL); - this.keepAliveHandle.unref(); - } - } - /*! - * Pauses each of the connections, causing `message` events to stop firing. - * - * @private - */ - pause() { - this.isPaused = true; - this.connections.forEach(connection => { - connection.pause(); - }); - } - /*! - * Queues a connection to be created. If any previous connections have failed, - * it will apply a back off based on the number of failures. - * - * @private - */ - queueConnection() { - let delay = 0; - if (this.failedConnectionAttempts > 0) { - delay = Math.pow(2, this.failedConnectionAttempts) * 1000 + - Math.floor(Math.random() * 1000); - } - const createConnection = () => { - setImmediate(() => { - this.createConnection(); - this.queue.splice(this.queue.indexOf(timeoutHandle), 1); - }); - }; - const timeoutHandle = setTimeout(createConnection, delay); - this.queue.push(timeoutHandle); - } - /*! - * Calls resume on each connection, allowing `message` events to fire off - * again. - * - * @private - */ - resume(): void { - this.isPaused = false; - this.connections.forEach(connection => { - connection.resume(); - }); - } - /*! - * Sends empty message in an effort to keep the stream alive. - * - * @private - */ - sendKeepAlives(): void { - this.connections.forEach(connection => { - connection.write({}); - }); - } - /*! - * Inspects a status object to determine whether or not we should try and - * reconnect. - * - * @private - * @param {object} status The gRPC status object. - * @return {boolean} - */ - shouldReconnect(status: StatusObject): boolean { - // If the pool was closed, we should definitely not reconnect - if (!this.isOpen) { - return false; - } - // We should check to see if the status code is a non-recoverable error - if (RETRY_CODES.indexOf(status.code) === -1) { - return false; - } - const exceededRetryLimit = this.noConnectionsTime && - Date.now() - this.noConnectionsTime > MAX_TIMEOUT; - if (exceededRetryLimit) { - return false; - } - return true; - } -} diff --git a/handwritten/pubsub/src/histogram.ts b/handwritten/pubsub/src/histogram.ts index 8aaaef6ff10..cc733620080 100644 --- a/handwritten/pubsub/src/histogram.ts +++ b/handwritten/pubsub/src/histogram.ts @@ -32,12 +32,8 @@ export class Histogram { data: Map; length: number; constructor(options?: HistogramOptions) { - this.options = Object.assign( - { - min: 10000, - max: 600000, - }, - options); + this.options = + Object.assign({min: 0, max: Number.MAX_SAFE_INTEGER}, options); this.data = new Map(); this.length = 0; } @@ -48,9 +44,9 @@ export class Histogram { * @param {numnber} value - The value in milliseconds. */ add(value: number): void { + value = Math.ceil(value); value = Math.max(value, this.options.min!); value = Math.min(value, this.options.max!); - value = Math.ceil(value / 1000) * 1000; if (!this.data.has(value)) { this.data.set(value, 0); } diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index b35b842e619..50c47b21327 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -800,19 +800,8 @@ export class PubSub { * * @throws {Error} If subscription name is omitted. * - * @param {string} name - Name of the subscription. - * @param {object=} options - Configuration object. - * @param {object} options.flowControl - Flow control configurations for - * receiving messages. Note that these options do not persist across - * subscription instances. - * @param {number} options.flowControl.maxBytes - The maximum number of bytes - * in un-acked messages to allow before the subscription pauses incoming - * messages. Defaults to 20% of free memory. - * @param {number} options.flowControl.maxMessages - The maximum number of - * un-acked messages to allow before the subscription pauses incoming - * messages. Default: Infinity. - * @param {number} options.maxConnections - Use this to limit the number of - * connections to be used when sending and receiving messages. Default: 5. + * @param {string} name Name of the subscription. + * @param {SubscriberOptions} [options] Subscription options. * @returns {Subscription} A {@link Subscription} instance. * * @example @@ -828,7 +817,7 @@ export class PubSub { * // message.ackId = ID used to acknowledge the message receival. * // message.data = Contents of the message. * // message.attributes = Attributes of the message. - * // message.publishTime = Timestamp when Pub/Sub received the message. + * // message.publishTime = Date when Pub/Sub received the message. * }); */ subscription(name: string, options?) { diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts new file mode 100644 index 00000000000..572af36c64b --- /dev/null +++ b/handwritten/pubsub/src/lease-manager.ts @@ -0,0 +1,261 @@ +/*! + * Copyright 2018 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {EventEmitter} from 'events'; +import {freemem} from 'os'; + +import {Message, Subscriber} from './subscriber'; + +/** + * @typedef {object} FlowControlOptions + * @property {boolean} [allowExcessMessages=true] PubSub delivers messages in + * batches with no way to configure the batch size. Sometimes this can be + * overwhelming if you only want to process a few messages at a time. + * Setting this option to false will make the client manage any excess + * messages until you're ready for them. This will prevent them from being + * redelivered and make the maxMessages option behave more predictably. + * @property {number} [maxBytes] The desired amount of memory to allow message + * data to consume, defaults to 20% of available memory. Its possible that + * this value will be exceeded since messages are received in batches. + * @property {number} [maxExtension=Infinity] The maximum duration (in seconds) + * to extend the message deadline before redelivering. + * @property {number} [maxMessages=100] The desired number of messages to allow + * in memory before pausing the message stream. Unless allowExcessMessages + * is set to false, it is very likely that this value will be exceeded since + * any given message batch could contain a greater number of messages than + * the desired amount of messages. + */ +export interface FlowControlOptions { + allowExcessMessages?: boolean; + maxBytes?: number; + maxExtension?: number; + maxMessages?: number; +} + +/** + * Manages a Subscribers inventory while auto-magically extending the message + * deadlines. + * + * @private + * @class + * + * @param {Subscriber} sub The subscriber to manage leases for. + * @param {FlowControlOptions} options Flow control options. + */ +export class LeaseManager extends EventEmitter { + bytes: number; + private _isLeasing: boolean; + private _messages: Set; + private _options!: FlowControlOptions; + private _pending: Message[]; + private _subscriber: Subscriber; + private _timer?: NodeJS.Timer; + constructor(sub: Subscriber, options = {}) { + super(); + + this.bytes = 0; + this._isLeasing = false; + this._messages = new Set(); + this._pending = []; + this._subscriber = sub; + + this.setOptions(options); + } + /** + * @type {number} + */ + get pending(): number { + return this._pending.length; + } + /** + * @type {number} + */ + get size(): number { + return this._messages.size; + } + /** + * Adds a message to the inventory, kicking off the deadline extender if it + * isn't already running. + * + * @param {Message} message The message. + */ + add(message: Message): void { + const {allowExcessMessages} = this._options; + const wasFull = this.isFull(); + + this._messages.add(message); + this.bytes += message.length; + + if (allowExcessMessages! || !wasFull) { + this._dispense(message); + } else { + this._pending.push(message); + } + + if (!this._isLeasing) { + this._isLeasing = true; + this._scheduleExtension(); + } + + if (!wasFull && this.isFull()) { + this.emit('full'); + } + } + /** + * Removes ALL messages from inventory. + */ + clear(): void { + const wasFull = this.isFull(); + + this._pending = []; + this._messages.clear(); + this.bytes = 0; + + if (wasFull) { + process.nextTick(() => this.emit('free')); + } + + this._cancelExtension(); + } + /** + * Indicates if we're at or over capacity. + * + * @returns {boolean} + */ + isFull(): boolean { + const {maxBytes, maxMessages} = this._options; + return this.size >= maxMessages! || this.bytes >= maxBytes!; + } + /** + * Removes a message from the inventory. Stopping the deadline extender if no + * messages are left over. + * + * @fires LeaseManager#free + * + * @param {Message} message The message to remove. + */ + remove(message: Message): void { + if (!this._messages.has(message)) { + return; + } + + const wasFull = this.isFull(); + + this._messages.delete(message); + this.bytes -= message.length; + + if (wasFull && !this.isFull()) { + process.nextTick(() => this.emit('free')); + } else if (this._pending.includes(message)) { + const index = this._pending.indexOf(message); + this._pending.splice(index, 1); + } else if (this.pending > 0) { + this._dispense(this._pending.shift()!); + } + + if (this.size === 0 && this._isLeasing) { + this._cancelExtension(); + } + } + /** + * Sets options for the LeaseManager. + * + * @param {FlowControlOptions} [options] The options. + */ + setOptions(options: FlowControlOptions): void { + const defaults: FlowControlOptions = { + allowExcessMessages: true, + maxBytes: freemem() * 0.2, + maxExtension: Infinity, + maxMessages: 100 + }; + + this._options = Object.assign(defaults, options); + } + /** + * Stops extending message deadlines. + * + * @private + */ + private _cancelExtension(): void { + this._isLeasing = false; + + if (this._timer) { + clearTimeout(this._timer); + delete this._timer; + } + } + /** + * Emits the message. Emitting messages is very slow, so to avoid it acting + * as a bottleneck, we're wrapping it in nextTick. + * + * @private + * + * @fires Subscriber#message + * + * @param {Message} message The message to emit. + */ + private _dispense(message: Message): void { + process.nextTick(() => this._subscriber.emit('message', message)); + } + /** + * Loops through inventory and extends the deadlines for any messages that + * have not hit the max extension option. + * + * @private + */ + private _extendDeadlines(): void { + const deadline = this._subscriber.ackDeadline; + + for (const message of this._messages) { + const lifespan = (Date.now() - message.received) / 1000; + + if (lifespan < this._options.maxExtension!) { + message.modAck(deadline); + } else { + this.remove(message); + } + } + + if (this._isLeasing) { + this._scheduleExtension(); + } + } + /** + * Creates a timeout(ms) that should allow us to extend any message deadlines + * before they would be redelivered. + * + * @private + * + * @returns {number} + */ + private _getNextExtensionTimeoutMs(): number { + const jitter = Math.random(); + const deadline = this._subscriber.ackDeadline * 1000; + const latency = this._subscriber.modAckLatency; + + return (deadline * 0.9 - latency) * jitter; + } + /** + * Schedules an deadline extension for all messages. + * + * @private + */ + private _scheduleExtension(): void { + const timeout = this._getNextExtensionTimeoutMs(); + this._timer = setTimeout(() => this._extendDeadlines(), timeout); + } +} diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts new file mode 100644 index 00000000000..91e39068dfc --- /dev/null +++ b/handwritten/pubsub/src/message-queues.ts @@ -0,0 +1,202 @@ +/*! + * Copyright 2018 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {CallOptions} from 'google-gax'; +import * as defer from 'p-defer'; + +import {Message, Subscriber} from './subscriber'; + +type QueuedMessages = Array<[string, number?]>; + +/** + * @typedef {object} BatchOptions + * @property {object} [callOptions] Request configuration option, outlined + * here: {@link https://googleapis.github.io/gax-nodejs/CallSettings.html}. + * @property {number} [maxMessages=3000] Maximum number of messages allowed in + * each batch sent. + * @property {number} [maxMilliseconds=100] Maximum duration to wait before + * sending a batch. Batches can be sent earlier if the maxMessages option + * is met before the configured duration has passed. + */ +export interface BatchOptions { + callOptions?: CallOptions; + maxMessages?: number; + maxMilliseconds?: number; +} + +/** + * Class for buffering ack/modAck requests. + * + * @private + * @class + * + * @param {Subscriber} sub The subscriber we're queueing requests for. + * @param {BatchOptions} options Batching options. + */ +export abstract class MessageQueue { + numPendingRequests: number; + protected _onFlush?: defer.DeferredPromise; + protected _options!: BatchOptions; + protected _requests: QueuedMessages; + protected _subscriber: Subscriber; + protected _timer?: NodeJS.Timer; + protected abstract _sendBatch(batch: QueuedMessages): Promise; + constructor(sub: Subscriber, options = {} as BatchOptions) { + this.numPendingRequests = 0; + this._requests = []; + this._subscriber = sub; + + this.setOptions(options); + } + /** + * Gets the default buffer time in ms. + * + * @returns {number} + */ + get maxMilliseconds(): number { + return this._options!.maxMilliseconds!; + } + /** + * Adds a message to the queue. + * + * @param {Message} message The message to add. + * @param {number} [deadline] The deadline. + */ + add({ackId}: Message, deadline?: number): void { + const {maxMessages, maxMilliseconds} = this._options; + + this._requests.push([ackId, deadline]); + this.numPendingRequests += 1; + + if (this._requests.length >= maxMessages!) { + this.flush(); + } else if (!this._timer) { + this._timer = setTimeout(() => this.flush(), maxMilliseconds!); + } + } + /** + * Sends a batch of messages. + */ + async flush(): Promise { + if (this._timer) { + clearTimeout(this._timer); + delete this._timer; + } + + const batch = this._requests; + const batchSize = batch.length; + const deferred = this._onFlush; + + this._requests = []; + this.numPendingRequests -= batchSize; + delete this._onFlush; + + try { + await this._sendBatch(batch); + } catch (e) { + this._subscriber.emit('error', e); + } + + if (deferred) { + deferred.resolve(); + } + } + /** + * Returns a promise that resolves after the next flush occurs. + * + * @returns {Promise} + */ + onFlush(): Promise { + if (!this._onFlush) { + this._onFlush = defer(); + } + return this._onFlush.promise; + } + /** + * Set the batching options. + * + * @param {BatchOptions} options Batching options. + */ + setOptions(options): void { + const defaults: BatchOptions = {maxMessages: 3000, maxMilliseconds: 100}; + + this._options = Object.assign(defaults, options); + } +} + +/** + * Queues up Acknowledge (ack) requests. + * + * @private + * @class + */ +export class AckQueue extends MessageQueue { + /** + * Sends a batch of ack requests. + * + * @private + * + * @param {Array.>} batch Array of ackIds and deadlines. + * @return {Promise} + */ + protected async _sendBatch(batch: QueuedMessages): Promise { + const client = await this._subscriber.getClient(); + const ackIds = batch.map(([ackId]) => ackId); + const reqOpts = {subscription: this._subscriber.name, ackIds}; + + await client.acknowledge(reqOpts, this._options.callOptions!); + } +} + +/** + * Queues up ModifyAckDeadline requests and sends them out in batches. + * + * @private + * @class + */ +export class ModAckQueue extends MessageQueue { + /** + * Sends a batch of modAck requests. Each deadline requires its own request, + * so we have to group all the ackIds by deadline and send multiple requests. + * + * @private + * + * @param {Array.>} batch Array of ackIds and deadlines. + * @return {Promise} + */ + protected async _sendBatch(batch: QueuedMessages): Promise { + const client = await this._subscriber.getClient(); + const subscription = this._subscriber.name; + const modAckTable = batch.reduce((table, [ackId, deadline]) => { + if (!table[deadline!]) { + table[deadline!] = []; + } + + table[deadline!].push(ackId); + return table; + }, {}); + + const modAckRequests = Object.keys(modAckTable).map(deadline => { + const ackIds = modAckTable[deadline]; + const ackDeadlineSeconds = Number(deadline); + const reqOpts = {subscription, ackIds, ackDeadlineSeconds}; + + return client.modifyAckDeadline(reqOpts, this._options.callOptions!); + }); + + await Promise.all(modAckRequests); + } +} diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts new file mode 100644 index 00000000000..bb843d296a0 --- /dev/null +++ b/handwritten/pubsub/src/message-stream.ts @@ -0,0 +1,355 @@ +/*! + * Copyright 2018 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {promisify} from '@google-cloud/promisify'; +import {ClientStub} from 'google-gax'; +import {ClientDuplexStream, Metadata, StatusObject} from 'grpc'; +import * as isStreamEnded from 'is-stream-ended'; +import {Duplex, PassThrough} from 'stream'; + +import {PullResponse, Subscriber} from './subscriber'; + +/*! + * Frequency to ping streams. + */ +const KEEP_ALIVE_INTERVAL = 30000; + +/*! + * codes to retry streams + */ +const RETRY_CODES: number[] = [ + 0, // ok + 1, // canceled + 2, // unknown + 4, // deadline exceeded + 8, // resource exhausted + 10, // aborted + 13, // internal error + 14, // unavailable + 15, // dataloss +]; + +/*! + * default stream options + */ +const DEFAULT_OPTIONS = { + highWaterMark: 0, + maxStreams: 5, + timeout: 300000, +}; + +interface StreamState { + highWaterMark: number; +} + +interface StreamingPullRequest { + subscription?: string; + ackIds?: string[]; + modifyDeadlineSeconds?: number[]; + modifyDeadlineAckIds?: string[]; + streamAckDeadlineSeconds?: number; +} + +type PullStream = ClientDuplexStream& + {_readableState: StreamState}; + +/** + * Error wrapper for gRPC status objects. + * + * @class + * + * @param {object} status The gRPC status object. + */ +export class StatusError extends Error { + code: number; + metadata: Metadata; + constructor(status: StatusObject) { + super(status.details); + this.code = status.code; + this.metadata = status.metadata; + } +} + +/** + * Ponyfill for destroying streams. + * + * @private + * + * @param {stream} stream The stream to destroy. + * @param {error?} err Error to emit. + */ +export function destroy(stream: Duplex, err?: Error): void { + const nativeDestroy = Duplex.prototype.destroy; + + if (typeof nativeDestroy === 'function') { + return nativeDestroy.call(stream, err); + } + + process.nextTick(() => { + if (err) { + stream.emit('error', err); + } + stream.emit('close'); + }); +} + +/** + * @typedef {object} MessageStreamOptions + * @property {number} [highWaterMark=0] Configures the Buffer level for all + * underlying streams. See + * {@link https://nodejs.org/en/docs/guides/backpressuring-in-streams/} for + * more details. + * @property {number} [maxStreams=5] Number of streaming connections to make. + * @property {number} [timeout=300000] Timeout for establishing a connection. + */ +export interface MessageStreamOptions { + highWaterMark?: number; + maxStreams?: number; + timeout?: number; +} + +/** + * Streaming class used to manage multiple StreamingPull requests. + * + * @private + * @class + * + * @param {Subscriber} sub The parent subscriber. + * @param {MessageStreamOptions} [options] The message stream options. + */ +export class MessageStream extends PassThrough { + destroyed: boolean; + private _keepAliveHandle: NodeJS.Timer; + private _options: MessageStreamOptions; + private _streams: Map; + private _subscriber: Subscriber; + constructor(sub: Subscriber, options = {} as MessageStreamOptions) { + options = Object.assign({}, DEFAULT_OPTIONS, options); + + super({objectMode: true, highWaterMark: options.highWaterMark}); + + this.destroyed = false; + this._options = options; + this._streams = new Map(); + this._subscriber = sub; + + this._fillStreamPool(); + + this._keepAliveHandle = + setInterval(() => this._keepAlive(), KEEP_ALIVE_INTERVAL); + this._keepAliveHandle.unref(); + } + /** + * Destroys the stream and any underlying streams. + * + * @param {error?} err An error to emit, if any. + */ + destroy(err?: Error): void { + if (this.destroyed) { + return; + } + + this.destroyed = true; + clearInterval(this._keepAliveHandle); + + for (const stream of this._streams.keys()) { + this._removeStream(stream); + stream.cancel(); + } + + return destroy(this, err); + } + /** + * Adds a StreamingPull stream to the combined stream. + * + * @private + * + * @param {stream} stream The StreamingPull stream. + */ + private _addStream(stream: PullStream): void { + this._setHighWaterMark(stream); + this._streams.set(stream, false); + + stream.on('error', err => this._onError(stream, err)) + .once('status', status => this._onStatus(stream, status)) + .pipe(this, {end: false}); + } + /** + * Attempts to create and cache the desired number of StreamingPull requests. + * gRPC does not supply a way to confirm that a stream is connected, so our + * best bet is to open the streams and use the client.waitForReady() method to + * confirm everything is ok. + * + * @private + * + * @returns {Promise} + */ + private async _fillStreamPool(): Promise { + let client; + + try { + client = await this._getClient(); + } catch (e) { + this.destroy(e); + } + + if (this.destroyed) { + return; + } + + const request: StreamingPullRequest = { + subscription: this._subscriber.name, + streamAckDeadlineSeconds: this._subscriber.ackDeadline, + }; + + for (let i = this._streams.size; i < this._options.maxStreams!; i++) { + const stream: PullStream = client.streamingPull(); + this._addStream(stream); + stream.write(request); + } + + try { + await this._waitForClientReady(client); + } catch (e) { + this.destroy(e); + } + } + /** + * It is critical that we keep as few `PullResponse` objects in memory as + * possible to reduce the number of potential redeliveries. Because of this we + * want to bypass gax for StreamingPull requests to avoid creating a Duplexify + * stream, doing so essentially doubles the size of our readable buffer. + * + * @private + * + * @returns {Promise.} + */ + private async _getClient(): Promise { + const client = await this._subscriber.getClient(); + return client.getSubscriberStub(); + } + /** + * Since we do not use the streams to ack/modAck messages, they will close + * by themselves unless we periodically send empty messages. + * + * @private + */ + private _keepAlive(): void { + for (const stream of this._streams.keys()) { + stream.write({}); + } + } + /** + * Once the stream has nothing left to read, we'll remove it and attempt to + * refill our stream pool if needed. + * + * @private + * + * @param {Duplex} stream The ended stream. + * @param {object} status The stream status. + */ + private _onEnd(stream: PullStream, status: StatusObject): void { + this._removeStream(stream); + + if (RETRY_CODES.includes(status.code)) { + this._fillStreamPool(); + } else if (!this._streams.size) { + this.destroy(new StatusError(status)); + } + } + /** + * Sometimes a gRPC status will be emitted as both a status event and an + * error event. In order to cut back on emitted errors, we'll ignore any + * error events that come in AFTER the status has been received. + * + * @private + * + * @param {stream} stream The stream that errored. + * @param {Error} err The error. + */ + private _onError(stream: PullStream, err: Error): void { + const code = (err as StatusError).code; + const receivedStatus = this._streams.get(stream) !== false; + + if (typeof code !== 'number' || !receivedStatus) { + this.emit('error', err); + } + } + /** + * gRPC streams will emit a status event once the connection has been + * terminated. This is preferable to end/close events because we'll receive + * information as to why the stream closed and if it is safe to open another. + * + * @private + * + * @param {stream} stream The stream that was closed. + * @param {object} status The status message stating why it was closed. + */ + private _onStatus(stream: PullStream, status: StatusObject): void { + if (this.destroyed) { + destroy(stream); + return; + } + + this._streams.set(stream, true); + + if (isStreamEnded(stream)) { + this._onEnd(stream, status); + } else { + stream.once('end', () => this._onEnd(stream, status)); + stream.push(null); + } + } + /** + * Removes a stream from the combined stream. + * + * @private + * + * @param {stream} stream The stream to remove. + */ + private _removeStream(stream: PullStream): void { + stream.unpipe(this); + this._streams.delete(stream); + } + /** + * Neither gRPC or gax allow for the highWaterMark option to be specified. + * However using the default value (16) it is possible to end up with a lot of + * PullResponse objects stored in internal buffers. If this were to happen + * and the client were slow to process messages, we could potentially see a + * very large number of redeliveries happen before the messages even made it + * to the client. + * + * @private + * + * @param {Duplex} stream The duplex stream to adjust the + * highWaterMarks for. + */ + private _setHighWaterMark(stream: PullStream): void { + stream._readableState.highWaterMark = this._options.highWaterMark!; + } + /** + * Promisified version of gRPCs Client#waitForReady function. + * + * @private + * + * @param {object} client The gRPC client to wait for. + * @returns {Promise} + */ + private _waitForClientReady(client: ClientStub): Promise { + const deadline = Date.now() + this._options.timeout!; + return promisify(client.waitForReady).call(client, deadline); + } +} diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 2957c2f5acf..5d79c252ff4 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -153,7 +153,10 @@ export class Publisher { * //- * publisher.publish(data).then((messageId) => {}); */ - publish(data: Buffer, attributes?, callback?) { + publish(data: Buffer, attributes?: object): Promise; + publish(data: Buffer, callback: Function): void; + publish(data: Buffer, attributes: object, callback: Function): void; + publish(data: Buffer, attributes?, callback?): Promise|void { if (!(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); } diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index a193261c75f..4cc80a0e76a 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -14,498 +14,370 @@ * limitations under the License. */ -import * as arrify from 'arrify'; -const chunk = require('lodash.chunk'); -import * as util from './util'; -import {promisify, promisifyAll} from '@google-cloud/promisify'; -const delay = require('delay'); +import {replaceProjectIdToken} from '@google-cloud/projectify'; +import {promisify} from '@google-cloud/promisify'; import {EventEmitter} from 'events'; -import * as is from 'is'; -import * as os from 'os'; +import {ClientStub} from 'google-gax'; +import {common as protobuf} from 'protobufjs'; -import {ConnectionPool} from './connection-pool'; import {Histogram} from './histogram'; -import {Subscription} from '.'; +import {FlowControlOptions, LeaseManager} from './lease-manager'; +import {AckQueue, BatchOptions, ModAckQueue} from './message-queues'; +import {MessageStream, MessageStreamOptions} from './message-stream'; +import {Subscription} from './subscription'; /** - * @type {number} - The maximum number of ackIds to be sent in acknowledge/modifyAckDeadline - * requests. There is an API limit of 524288 bytes (512KiB) per - * acknowledge/modifyAckDeadline request. ackIds have a maximum size of 164 - * bytes, so 524288/164 ~= 3197. Accounting for some overhead, a maximum of 3000 - * ackIds per request should be safe. - * @private + * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/pull#ReceivedMessage */ -const MAX_ACK_IDS_PER_REQUEST = 3000; +interface ReceivedMessage { + ackId: string; + message: { + attributes: {}, + data: Buffer, + messageId: string, + publishTime: protobuf.ITimestamp + }; +} /** - * Subscriber class is used to manage all message related functionality. + * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/pull#body.PullResponse + */ +export interface PullResponse { + receivedMessages: ReceivedMessage[]; +} + +/** + * Message objects provide a simple interface for users to get message data and + * acknowledge the message. + * * @private + * @class * - * @param {object} options Configuration object. + * @param {Subscriber} sub The parent subscriber. + * @param {object} message The raw message response. */ -export class Subscriber extends EventEmitter { - histogram: Histogram; - latency_: Histogram; - connectionPool: ConnectionPool|null; - ackDeadline: number; - maxConnections: number; - inventory_; - flowControl; - batching; - flushTimeoutHandle_; - leaseTimeoutHandle_; - userClosed_: boolean; - isOpen: boolean; - messageListeners; - writeToStreams_; - request; - name?: string; - - constructor(options) { - super(); - options = options || {}; - this.histogram = new Histogram(); - this.latency_ = new Histogram({min: 0}); - this.connectionPool = null; - this.ackDeadline = 10000; - this.maxConnections = options.maxConnections || 5; - this.inventory_ = { - lease: [], - ack: [], - nack: [], - bytes: 0, - }; - this.flowControl = Object.assign( - { - maxBytes: os.freemem() * 0.2, - maxMessages: 100, - }, - options.flowControl); - this.batching = Object.assign( - { - maxMilliseconds: 100, - }, - options.batching); - this.flushTimeoutHandle_ = null; - this.leaseTimeoutHandle_ = null; - this.userClosed_ = false; - this.isOpen = false; - this.messageListeners = 0; - // As of right now we do not write any acks/modacks to the pull streams. - // But with allowing users to opt out of using streaming pulls altogether on - // the horizon, we may need to support this feature again in the near - // future. - this.writeToStreams_ = false; - this.listenForEvents_(); +export class Message { + ackId: string; + attributes: {}; + data: Buffer; + id: string; + publishTime: Date; + received: number; + private _handled: boolean; + private _length: number; + private _subscriber: Subscriber; + constructor(sub: Subscriber, {ackId, message}: ReceivedMessage) { + this.ackId = ackId; + this.attributes = message.attributes || {}; + this.data = message.data; + this.id = message.messageId; + this.publishTime = Message.formatTimestamp(message.publishTime); + this.received = Date.now(); + this._handled = false; + this._length = this.data.length; + this._subscriber = sub; } - /*! - * Acks the provided message. If the connection pool is absent, it will be - * placed in an internal queue and sent out after 1 second or if the pool is - * re-opened before the timeout hits. - * - * @private + /** + * The length of the message data. * - * @param {object} message The message object. + * @type {number} */ - ack_(message) { - const breakLease = this.breakLease_.bind(this, message); - this.histogram.add(Date.now() - message.received); - if (this.writeToStreams_ && this.isConnected_()) { - this.acknowledge_(message.ackId, message.connectionId).then(breakLease); - return; - } - this.inventory_.ack.push(message.ackId); - this.setFlushTimeout_().then(breakLease); + get length() { + return this._length; } - /*! - * Sends an acknowledge request for the provided ack ids. - * - * @private - * - * @param {string|string[]} ackIds The ack IDs to acknowledge. - * @param {string} [connId] Connection ID to send request on. - * @return {Promise} + /** + * Acknowledges the message. */ - acknowledge_(ackIds: string|string[], connId?: string) { - ackIds = arrify(ackIds); - const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(ackIdChunk => { - if (this.writeToStreams_ && this.isConnected_()) { - return this.writeTo_(connId, {ackIds: ackIdChunk}); - } - return promisify(this.request).call(this, { - client: 'SubscriberClient', - method: 'acknowledge', - reqOpts: { - subscription: this.name, - ackIds: ackIdChunk, - }, - }); - }); - return Promise.all(promises).catch(err => { - this.emit('error', err); - }); + ack(): void { + if (!this._handled) { + this._handled = true; + this._subscriber.ack(this); + } } - /*! - * Breaks the lease on a message. Essentially this means we no longer treat - * the message as being un-acked and count it towards the flow control limits. - * - * If the pool was previously paused and we freed up space, we'll continue to - * recieve messages. - * - * @private + /** + * Modifies the ack deadline. * - * @param {object} message The message object. + * @param {number} deadline The number of seconds to extend the deadline. */ - breakLease_(message) { - const messageIndex = this.inventory_.lease.indexOf(message.ackId); - if (messageIndex === -1) { - return; - } - this.inventory_.lease.splice(messageIndex, 1); - this.inventory_.bytes -= message.length; - const pool = this.connectionPool; - if (pool && pool.isPaused && !this.hasMaxMessages_()) { - pool.resume(); - } - if (!this.inventory_.lease.length) { - clearTimeout(this.leaseTimeoutHandle_); - this.leaseTimeoutHandle_ = null; + modAck(deadline: number): void { + if (!this._handled) { + this._subscriber.modAck(this, deadline); } } /** - * Closes the Subscriber, once this is called you will no longer receive - * message events unless you add a new message listener. + * Removes the message from our inventory and schedules it to be redelivered. + * If the delay parameter is unset, it will be redelivered immediately. * - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error returned while closing the - * Subscriber. - * - * @example - * Subscriber.close((err) => { - * if (err) { - * // Error handling omitted. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * Subscriber.close().then(() => {}); + * @param {number} [delay=0] The desired time to wait before the + * redelivery occurs. */ - close(callback?) { - this.userClosed_ = true; - const inventory = this.inventory_; - inventory.lease.length = inventory.bytes = 0; - clearTimeout(this.leaseTimeoutHandle_); - this.leaseTimeoutHandle_ = null; - this.flushQueues_().then(() => { - this.closeConnection_(callback); - }); + nack(delay?: number): void { + if (!this._handled) { + this._handled = true; + this._subscriber.nack(this, delay); + } } - /*! - * Closes the connection pool. + /** + * Formats the protobuf timestamp into a JavaScript date. * * @private * - * @param {function} [callback] The callback function. - * @param {?error} err An error returned from this request. + * @param {object} timestamp The protobuf timestamp. + * @return {date} */ - closeConnection_(callback?) { - this.isOpen = false; - if (this.connectionPool) { - this.connectionPool.close(callback || util.noop); - this.connectionPool = null; - } else if (is.fn(callback)) { - setImmediate(callback); - } + static formatTimestamp({nanos = 0, seconds = 0}: protobuf.ITimestamp): Date { + const ms: number = Number(nanos) / 1e6; + const s: number = Number(seconds) * 1000; + return new Date(ms + s); } - /*! - * Flushes internal queues. These can build up if a user attempts to ack/nack - * while there is no connection pool (e.g. after they called close). - * - * Typically this will only be called either after a timeout or when a - * connection is re-opened. - * - * Any errors that occur will be emitted via `error` events. - * - * @private - */ - flushQueues_(): Promise { - if (this.flushTimeoutHandle_) { - this.flushTimeoutHandle_.clear(); - this.flushTimeoutHandle_ = null; - } - const acks = this.inventory_.ack; - const nacks = this.inventory_.nack; - - if (!acks.length && !nacks.length) { - return Promise.resolve(); - } - - const requests: Array> = []; - - if (acks.length) { - requests.push(this.acknowledge_(acks).then(() => { - this.inventory_.ack = []; - })); - } +} - if (nacks.length) { - const modAcks = nacks.reduce((table, [ackId, deadline]) => { - if (!table[deadline]) { - table[deadline] = []; - } +/** + * @typedef {object} SubscriberOptions + * @property {number} [ackDeadline=10] Acknowledge deadline in seconds. If left + * unset the initial value will be 10 seconds, but it will evolve into the + * 99th percentile time it takes to acknowledge a message. + * @property {BatchingOptions} [batching] Request batching options. + * @property {FlowControlOptions} [flowControl] Flow control options. + * @property {MessageStreamOptions} [streamingOptions] Streaming options. + */ +export interface SubscriberOptions { + ackDeadline?: number; + batching?: BatchOptions; + flowControl?: FlowControlOptions; + streamingOptions?: MessageStreamOptions; +} - table[deadline].push(ackId); - return table; - }, {}); +/** + * Subscriber class is used to manage all message related functionality. + * + * @private + * @class + * + * @param {Subscription} subscription The corresponding subscription. + * @param {SubscriberOptions} options The subscriber options. + */ +export class Subscriber extends EventEmitter { + ackDeadline: number; + isOpen: boolean; + private _acks!: AckQueue; + private _histogram: Histogram; + private _inventory!: LeaseManager; + private _isUserSetDeadline: boolean; + private _latencies: Histogram; + private _modAcks!: ModAckQueue; + private _name!: string; + private _options!: SubscriberOptions; + private _stream!: MessageStream; + private _subscription: Subscription; + constructor(subscription: Subscription, options = {}) { + super(); - const modAckRequests = Object.keys(modAcks).map( - deadline => - this.modifyAckDeadline_(modAcks[deadline], Number(deadline))); + this.ackDeadline = 10; + this.isOpen = false; + this._isUserSetDeadline = false; + this._histogram = new Histogram({min: 10, max: 600}); + this._latencies = new Histogram(); + this._subscription = subscription; - // tslint:disable-next-line no-any - requests.push.apply(requests, modAckRequests as any); + this.setOptions(options); + } + /** + * The 99th percentile of request latencies. + * + * @type {number} + */ + get modAckLatency() { + const latency = this._latencies.percentile(99); + let bufferTime = 0; - Promise.all(modAckRequests).then(() => { - this.inventory_.nack = []; - }); + if (this._modAcks) { + bufferTime = this._modAcks.maxMilliseconds; } - return Promise.all(requests); + return latency * 1000 + bufferTime; } - /*! - * Checks to see if we currently have a streaming connection. - * - * @private + /** + * The full name of the Subscription. * - * @return {boolean} + * @type {string} */ - isConnected_() { - return !!(this.connectionPool && this.connectionPool.isConnected()); + get name(): string { + if (!this._name) { + const {name, projectId} = this._subscription; + this._name = replaceProjectIdToken(name, projectId); + } + + return this._name; } - /*! - * Checks to see if this Subscriber has hit any of the flow control - * thresholds. - * - * @private + /** + * Acknowledges the supplied message. * - * @return {boolean} + * @param {Message} message The message to acknowledge. + * @returns {Promise} */ - hasMaxMessages_() { - return ( - this.inventory_.lease.length >= this.flowControl.maxMessages || - this.inventory_.bytes >= this.flowControl.maxBytes); + async ack(message: Message): Promise { + if (!this._isUserSetDeadline) { + const ackTimeSeconds = (Date.now() - message.received) / 1000; + this._histogram.add(ackTimeSeconds); + this.ackDeadline = this._histogram.percentile(99); + } + + this._acks.add(message); + await this._acks.onFlush(); + this._inventory.remove(message); } - /*! - * Leases a message. This will add the message to our inventory list and then - * modifiy the ack deadline for the user if they exceed the specified ack - * deadline. - * - * @private + /** + * Closes the subscriber. The returned promise will resolve once any pending + * acks/modAcks are finished. * - * @param {object} message The message object. + * @returns {Promise} */ - leaseMessage_(message) { - this.modifyAckDeadline_( - message.ackId, this.ackDeadline / 1000, message.connectionId); - this.inventory_.lease.push(message.ackId); - this.inventory_.bytes += message.length; - this.setLeaseTimeout_(); - return message; + async close(): Promise { + if (!this.isOpen) { + return; + } + + this.isOpen = false; + this._stream.destroy(); + this._inventory.clear(); + + await this._waitForFlush(); } - /*! - * Begin listening for events on the Subscriber. This method keeps track of - * how many message listeners are assigned, and then removed, making sure - * polling is handled automatically. - * - * As long as there is one active message listener, the connection is open. As - * soon as there are no more message listeners, the connection is closed. - * - * @private + /** + * Gets the subscriber client instance. * - * @example - * Subscriber.listenForEvents_(); + * @returns {Promise} */ - listenForEvents_() { - this.on('newListener', event => { - if (event === 'message') { - this.messageListeners++; - if (!this.connectionPool) { - this.userClosed_ = false; - this.openConnection_(); - } - } - }); - this.on('removeListener', event => { - if (event === 'message' && --this.messageListeners === 0) { - this.closeConnection_(); - } + async getClient(): Promise { + const pubsub = this._subscription.pubsub; + const [client] = await promisify(pubsub.getClient_).call(pubsub, { + client: 'SubscriberClient' }); + + return client; } - /*! - * Sends a modifyAckDeadline request for the provided ack ids. + /** + * Modifies the acknowledge deadline for the provided message. * - * @private + * @param {Message} message The message to modify. + * @param {number} deadline The deadline. + * @returns {Promise} + */ + async modAck(message: Message, deadline: number): Promise { + const startTime = Date.now(); + + this._modAcks.add(message, deadline); + await this._modAcks.onFlush(); + + const latency = (Date.now() - startTime) / 1000; + this._latencies.add(latency); + } + /** + * Modfies the acknowledge deadline for the provided message and then removes + * it from our inventory. * - * @param {string|string[]} ackIds The ack IDs to acknowledge. - * @param {number} deadline The dealine in seconds. - * @param {string=} connId Connection ID to send request on. + * @param {Message} message The message. + * @param {number} [delay=0] Delay to wait before redelivery. * @return {Promise} */ - modifyAckDeadline_( - ackIds: string|string[], deadline: number, connId?: string) { - ackIds = arrify(ackIds); - const promises = chunk(ackIds, MAX_ACK_IDS_PER_REQUEST).map(ackIdChunk => { - if (this.writeToStreams_ && this.isConnected_()) { - return this.writeTo_(connId, { - modifyDeadlineAckIds: ackIdChunk, - modifyDeadlineSeconds: new Array(ackIdChunk.length).fill(deadline), - }); - } - return promisify(this.request).call(this, { - client: 'SubscriberClient', - method: 'modifyAckDeadline', - reqOpts: { - subscription: this.name, - ackDeadlineSeconds: deadline, - ackIds: ackIdChunk, - }, - }); - }); - return Promise.all(promises).catch(err => { - this.emit('error', err); - }); + async nack(message: Message, delay = 0): Promise { + await this.modAck(message, delay); + this._inventory.remove(message); } - /*! - * Nacks the provided message. If the connection pool is absent, it will be - * placed in an internal queue and sent out after 1 second or if the pool is - * re-opened before the timeout hits. - * - * @private - * - * @param {object} message - The message object. - * @param {number} [delay=0] - Number of seconds before the message may be redelivered + /** + * Starts pulling messages. */ - nack_(message, delay = 0) { - const breakLease = this.breakLease_.bind(this, message); + open(): void { + const {batching, flowControl, streamingOptions} = this._options; - if (this.isConnected_()) { - this.modifyAckDeadline_(message.ackId, delay, message.connectionId) - .then(breakLease); - return; - } + this._acks = new AckQueue(this, batching); + this._modAcks = new ModAckQueue(this, batching); + this._inventory = new LeaseManager(this, flowControl); + this._stream = new MessageStream(this, streamingOptions); + + this._stream.on('error', err => this.emit('error', err)) + .on('data', (data: PullResponse) => this._onData(data)); + + this._inventory.on('full', () => this._stream.pause()) + .on('free', () => this._stream.resume()); - this.inventory_.nack.push([message.ackId, delay]); - this.setFlushTimeout_().then(breakLease); - } - /*! - * Opens the ConnectionPool. - * - * @private - */ - openConnection_() { - // TODO: fixup this cast - const pool = - (this.connectionPool = new ConnectionPool(this as {} as Subscription)); this.isOpen = true; - pool.on('error', err => { - this.emit('error', err); - }); - pool.on('message', message => { - this.emit('message', this.leaseMessage_(message)); - if (!pool.isPaused && this.hasMaxMessages_()) { - pool.pause(); - } - }); - pool.once('connected', () => { - this.flushQueues_(); - }); } - /*! - * Modifies the ack deadline on messages that have yet to be acked. We update - * the ack deadline to the 99th percentile of known ack times. + /** + * Sets subscriber options. * - * @private + * @param {SubscriberOptions} options The options. */ - renewLeases_() { - clearTimeout(this.leaseTimeoutHandle_); - this.leaseTimeoutHandle_ = null; - if (!this.inventory_.lease.length) { - return; + setOptions(options: SubscriberOptions): void { + this._options = options; + + if (options.ackDeadline) { + this.ackDeadline = options.ackDeadline; + this._isUserSetDeadline = true; } - this.ackDeadline = this.histogram.percentile(99); - const ackIds = this.inventory_.lease.slice(); - const ackDeadlineSeconds = this.ackDeadline / 1000; - this.modifyAckDeadline_(ackIds, ackDeadlineSeconds).then(() => { - this.setLeaseTimeout_(); - }); - } - /*! - * Sets a timeout to flush any acks/nacks that have been made since the pool - * has closed. - * - * @private - */ - setFlushTimeout_() { - if (!this.flushTimeoutHandle_) { - const timeout = delay(this.batching.maxMilliseconds); - const promise = - timeout.then(this.flushQueues_.bind(this)).catch(util.noop); - promise.clear = timeout.clear.bind(timeout); - this.flushTimeoutHandle_ = promise; + + // in the event that the user has specified the maxMessages option, we want + // to make sure that the maxStreams option isn't higher + // it doesn't really make sense to open 5 streams if the user only wants + // 1 message at a time. + if (options.flowControl) { + const {maxMessages = 100} = options.flowControl; + + if (!options.streamingOptions) { + options.streamingOptions = {} as MessageStreamOptions; + } + + const {maxStreams = 5} = options.streamingOptions; + options.streamingOptions.maxStreams = Math.min(maxStreams, maxMessages); } - return this.flushTimeoutHandle_; } - /*! - * Sets a timeout to modify the ack deadlines for any unacked/unnacked - * messages, renewing their lease. + /** + * Callback to be invoked when a new message is available. + * + * New messages will be added to the subscribers inventory, which in turn will + * automatically extend the messages ack deadline until either: + * a. the user acks/nacks it + * b. the maxExtension option is hit + * + * If the message puts us at/over capacity, then we'll pause our message + * stream until we've freed up some inventory space. + * + * New messages must immediately issue a ModifyAckDeadline request + * (aka receipt) to confirm with the backend that we did infact receive the + * message and its ok to start ticking down on the deadline. * * @private */ - setLeaseTimeout_() { - if (this.leaseTimeoutHandle_ || !this.isOpen) { - return; - } - const latency = this.latency_.percentile(99); - const timeout = Math.random() * this.ackDeadline * 0.9 - latency; - this.leaseTimeoutHandle_ = - setTimeout(this.renewLeases_.bind(this), timeout); + private _onData(response: PullResponse): void { + response.receivedMessages.forEach((data: ReceivedMessage) => { + const message = new Message(this, data); + + message.modAck(this.ackDeadline); + this._inventory.add(message); + }); } + /** - * Writes to specified duplex stream. This is useful for capturing write - * latencies that can later be used to adjust the auto lease timeout. + * Returns a promise that will resolve once all pending requests have settled. * * @private * - * @param {string} connId The ID of the connection to write to. - * @param {object} data The data to be written to the stream. * @returns {Promise} */ - writeTo_(connId, data) { - const startTime = Date.now(); - return new Promise((resolve, reject) => { - this.connectionPool!.acquire(connId, (err, connection) => { - if (err) { - reject(err); - return; - } - // we can ignore any errors that come from this since they'll be - // re-emitted later - connection!.write(data, err => { - if (!err) { - this.latency_.add(Date.now() - startTime); - } - resolve(); - }); - }); - }); + private async _waitForFlush(): Promise { + const promises: Array> = []; + + if (this._acks.numPendingRequests) { + promises.push(this._acks.onFlush()); + this._acks.flush(); + } + + if (this._modAcks.numPendingRequests) { + promises.push(this._modAcks.onFlush()); + this._modAcks.flush(); + } + + await Promise.all(promises); } } - -/*! Developer Documentation - * - * All async methods (except for streams) will return a Promise in the event - * that a callback is omitted. - */ -promisifyAll(Subscriber); diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index fdecd97aee7..49065b724f4 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -15,17 +15,17 @@ */ import {promisifyAll} from '@google-cloud/promisify'; +import {EventEmitter} from 'events'; +import * as extend from 'extend'; import * as is from 'is'; +import * as snakeCase from 'lodash.snakecase'; -import * as util from './util'; - -const snakeCase = require('lodash.snakecase'); - +import {Metadata, PubSub} from '.'; import {IAM} from './iam'; import {Snapshot} from './snapshot'; -import {Subscriber} from './subscriber'; -import {PubSub, Metadata} from '.'; -import extend = require('extend'); +import {Subscriber, SubscriberOptions} from './subscriber'; +import {Topic} from './topic'; +import {noop} from './util'; /** * @typedef {object} ExpirationPolicy @@ -111,6 +111,10 @@ export interface SubscriptionMetadata extends TSubscriptionMetadata { * time. You can fine tune this value by adjusting the * `options.flowControl.maxMessages` option. * + * If your subscription is seeing more re-deliveries than preferable, you might + * try increasing your `options.ackDeadline` value or decreasing the + * `options.streamingOptions.maxStreams` value. + * * Subscription objects handle ack management, by automatically extending the * ack deadline while the message is being processed, to then issue the ack or * nack of such message when the processing is done. **Note:** message @@ -120,24 +124,7 @@ export interface SubscriptionMetadata extends TSubscriptionMetadata { * * @param {PubSub} pubsub PubSub object. * @param {string} name The name of the subscription. - * @param {object} [options] See a - * [Subscription - * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions) - * @param {object} [options.batching] Batch configurations for sending out - * Acknowledge and ModifyAckDeadline requests. - * @param {number} [options.batching.maxMilliseconds] The maximum amount of time - * to buffer Acknowledge and ModifyAckDeadline requests. Default: 100. - * @param {object} [options.flowControl] Flow control configurations for - * receiving messages. Note that these options do not persist across - * subscription instances. - * @param {number} [options.flowControl.maxBytes] The maximum number of bytes - * in un-acked messages to allow before the subscription pauses incoming - * messages. Defaults to 20% of free memory. - * @param {number} [options.flowControl.maxMessages] The maximum number of - * un-acked messages to allow before the subscription pauses incoming - * messages. Default: 100. - * @param {number} [options.maxConnections] Use this to limit the number of - * connections to be used when sending and receiving messages. Default: 5. + * @param {SubscriberOptions} [options] Options for handling messages. * * @example * const {PubSub} = require('@google-cloud/pubsub'); @@ -189,7 +176,7 @@ export interface SubscriptionMetadata extends TSubscriptionMetadata { * // message.ackId = ID used to acknowledge the message receival. * // message.data = Contents of the message. * // message.attributes = Attributes of the message. - * // message.publishTime = Timestamp when Pub/Sub received the message. + * // message.publishTime = Date when Pub/Sub received the message. * * // Ack the message: * // message.ack(); @@ -203,28 +190,27 @@ export interface SubscriptionMetadata extends TSubscriptionMetadata { * // Remove the listener from receiving `message` events. * subscription.removeListener('message', onMessage); */ -export class Subscription extends Subscriber { - // tslint:disable-next-line variable-name - Promise?: PromiseConstructor; +export class Subscription extends EventEmitter { pubsub: PubSub; - projectId: string; create!: Function; iam: IAM; name: string; metadata; - constructor(pubsub: PubSub, name: string, options) { + request: Function; + private _subscriber: Subscriber; + constructor(pubsub: PubSub, name: string, options?) { + super(); + options = options || {}; - super(options); - if (pubsub.Promise) { - this.Promise = pubsub.Promise; - } + this.pubsub = pubsub; - this.projectId = pubsub.projectId; this.request = pubsub.request.bind(pubsub); - this.name = Subscription.formatName_(pubsub.projectId, name); + this.name = Subscription.formatName_(this.projectId, name); + if (options.topic) { this.create = pubsub.createSubscription.bind(pubsub, options.topic, name); } + /** * [IAM (Identity and Access * Management)](https://cloud.google.com/pubsub/access_control) allows you @@ -262,6 +248,48 @@ export class Subscription extends Subscriber { * }); */ this.iam = new IAM(pubsub, this.name); + + this._subscriber = new Subscriber(this, options as SubscriberOptions); + this._subscriber.on('error', err => this.emit('error', err)) + .on('message', message => this.emit('message', message)); + + this._listen(); + } + /** + * Indicates if the Subscription is open and receiving messages. + * + * @type {boolean} + */ + get isOpen(): boolean { + return !!(this._subscriber && this._subscriber.isOpen); + } + /** + * @type {string} + */ + get projectId(): string { + return this.pubsub && this.pubsub.projectId || '{{projectId}}'; + } + /** + * Closes the Subscription, once this is called you will no longer receive + * message events unless you call {Subscription#open} or add new message + * listeners. + * + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error returned while closing the + * Subscription. + * + * @example + * subscription.close(err => { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * // If the callback is omitted a Promise will be returned. + * subscription.close().then(() => {}); + */ + close(callback?: (err?: Error) => void) { + this._subscriber.close().then(() => callback!(), callback); } /** * @typedef {array} CreateSnapshotResponse @@ -369,10 +397,15 @@ export class Subscription extends Subscriber { callback = gaxOpts; gaxOpts = {}; } - callback = callback || util.noop; + callback = callback || noop; const reqOpts = { subscription: this.name, }; + + if (this.isOpen) { + this._subscriber.close(); + } + this.request( { client: 'SubscriberClient', @@ -380,13 +413,7 @@ export class Subscription extends Subscriber { reqOpts, gaxOpts, }, - (err, resp) => { - if (!err) { - this.removeAllListeners(); - this.close(); - } - callback(err, resp); - }); + callback); } /** * @typedef {array} SubscriptionExistsResponse @@ -616,6 +643,32 @@ export class Subscription extends Subscriber { }, callback); } + /** + * Opens the Subscription to receive messages. In general this method + * shouldn't need to be called, unless you wish to receive messages after + * calling {@link Subscription#close}. Alternatively one could just assign a + * new `message` event listener which will also re-open the Subscription. + * + * @example + * subscription.on('message', message => message.ack()); + * + * // Close the subscription. + * subscription.close(err => { + * if (err) { + * // Error handling omitted. + * } + * + * The subscription has been closed and messages will no longer be received. + * }); + * + * // Resume receiving messages. + * subscription.open(); + */ + open() { + if (!this._subscriber.isOpen) { + this._subscriber.open(); + } + } /** * @typedef {array} SeekResponse * @property {object} 0 The full API response. @@ -669,7 +722,7 @@ export class Subscription extends Subscriber { }; if (is.string(snapshot)) { - reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); + reqOpts.snapshot = Snapshot.formatName_(this.projectId, snapshot); } else if (is.date(snapshot)) { reqOpts.time = snapshot; } else { @@ -743,6 +796,14 @@ export class Subscription extends Subscriber { }, callback); } + /** + * Sets the Subscription options. + * + * @param {SubscriberOptions} options The options. + */ + setOptions(options: SubscriberOptions): void { + this._subscriber.setOptions(options); + } /** * Create a Snapshot object. See {@link Subscription#createSnapshot} to * create a snapshot. @@ -758,6 +819,25 @@ export class Subscription extends Subscriber { snapshot(name: string) { return this.pubsub.snapshot.call(this, name); } + /** + * Watches for incoming message event handlers and open/closes the + * subscriber as needed. + * + * @private + */ + private _listen(): void { + this.on('newListener', event => { + if (!this.isOpen && event === 'message') { + this._subscriber.open(); + } + }); + + this.on('removeListener', event => { + if (this.isOpen && this.listenerCount('message') === 0) { + this._subscriber.close(); + } + }); + } /*! * Formats Subscription metadata. * @@ -809,5 +889,5 @@ export class Subscription extends Subscriber { * that a callback is omitted. */ promisifyAll(Subscription, { - exclude: ['snapshot'], + exclude: ['open', 'snapshot'], }); diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 10c9ad8e2ed..464a4b92d57 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -230,6 +230,10 @@ class SubscriberClient { callback ); }; + + this.getSubscriberStub = function() { + return subscriberStub; + }; } /** diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 6e6ca5bcbdc..25ddf613154 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -15,6 +15,7 @@ */ import * as assert from 'assert'; +import * as defer from 'p-defer'; import * as uuid from 'uuid'; import {PubSub, Subscription, Topic} from '../src'; @@ -203,8 +204,8 @@ describe('pubsub', () => { const SUB_NAMES = [generateSubName(), generateSubName()]; const SUBSCRIPTIONS = [ - topic.subscription(SUB_NAMES[0], {ackDeadline: 30000}), - topic.subscription(SUB_NAMES[1], {ackDeadline: 60000}), + topic.subscription(SUB_NAMES[0], {ackDeadline: 30}), + topic.subscription(SUB_NAMES[1], {ackDeadline: 60}), ]; before(async () => { @@ -381,9 +382,7 @@ describe('pubsub', () => { }); it('should error when using a non-existent subscription', done => { - const subscription = topic.subscription(generateSubName(), { - maxConnections: 1, - }); + const subscription = topic.subscription(generateSubName()); subscription.on('error', err => { assert.strictEqual(err.code, 5); @@ -444,11 +443,9 @@ describe('pubsub', () => { const maxMessages = 3; let messageCount = 0; - const subscription = topic.subscription(SUB_NAMES[0], { - flowControl: { - maxMessages, - }, - }); + const subscription = topic.subscription( + SUB_NAMES[0], + {flowControl: {maxMessages, allowExcessMessages: false}}); subscription.on('error', done); subscription.on('message', onMessage); @@ -458,10 +455,81 @@ describe('pubsub', () => { return; } - setImmediate(() => { - subscription.close(done); + subscription.close(done); + } + }); + + // can be ran manually to test options/memory usage/etc. + it.skip('should handle a large volume of messages', async function() { + const MESSAGES = 200000; + + const deferred = defer(); + const messages = new Set(); + + let duplicates = 0; + + this.timeout(0); + + const publisher = topic.publisher({batching: {maxMessages: 999}}); + const subscription = topic.subscription(SUB_NAMES[0]); + + await publish(MESSAGES); + + const startTime = Date.now(); + subscription.on('error', deferred.reject).on('message', onmessage); + + return deferred.promise; + + function onmessage(message) { + const testid = message.attributes.testid; + + if (!testid) { + return; + } + + message.ack(); + + if (messages.has(testid)) { + messages.delete(testid); + } else { + duplicates += 1; + } + + if (messages.size > 0) { + return; + } + + const total = MESSAGES + duplicates; + const duration = (Date.now() - startTime) / 1000 / 60; + const acksPerMin = Math.floor(total / duration); + + console.log(`${total} messages processed.`); + console.log(`${duplicates} messages redelivered.`); + console.log(`${acksPerMin} acks/m on average.`); + + subscription.close(err => { + if (err) { + deferred.reject(err); + } else { + deferred.resolve(); + } }); } + + function publish(messageCount) { + const data = Buffer.from('Hello, world!'); + const promises: Array> = []; + + let id = 0; + + for (let i = 0; i < messageCount; i++) { + const testid = String(++id); + messages.add(testid); + promises.push(publisher.publish(data, {testid})); + } + + return Promise.all(promises); + } }); }); diff --git a/handwritten/pubsub/test/connection-pool.ts b/handwritten/pubsub/test/connection-pool.ts deleted file mode 100644 index c6a515fa2d4..00000000000 --- a/handwritten/pubsub/test/connection-pool.ts +++ /dev/null @@ -1,1422 +0,0 @@ -/** - * Copyright 2017 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as assert from 'assert'; -import * as util from '../src/util'; -const duplexify = require('duplexify'); -import {EventEmitter} from 'events'; -import * as proxyquire from 'proxyquire'; -import * as uuid from 'uuid'; -import * as pjy from '@google-cloud/projectify'; -import * as sinon from 'sinon'; -import {SinonStub} from 'sinon'; - -let noopOverride: Function|null = null; -const fakeUtil = { - noop: (...args) => { - (noopOverride || util.noop).apply(null, args); - } -}; - -const fakeUuid = Object.assign({}, uuid); - -class FakeConnection extends EventEmitter { - isConnected; - isPaused; - ended; - canceled; - written; - constructor() { - super(); - this.isConnected = false; - this.isPaused = false; - this.ended = false; - this.canceled = false; - this.written = []; - } - - write(data) { - this.written.push(data); - } - - end(callback) { - this.ended = true; - if (callback) { - callback(null); - } - } - - pause() { - this.isPaused = true; - } - - pipe(stream) { - return stream; - } - - resume() { - this.isPaused = false; - } - - cancel() { - this.canceled = true; - } -} - -let duplexifyOverride: Function|null = null; -function fakeDuplexify() { - const args = [].slice.call(arguments); - return (duplexifyOverride || duplexify).apply(null, args); -} - -describe('ConnectionPool', () => { - // tslint:disable-next-line variable-name - let ConnectionPool; - let pool; - let fakeConnection; - let fakeChannel; - let fakeClient; - let sandbox: sinon.SinonSandbox; - - const FAKE_PUBSUB_OPTIONS = {}; - const PROJECT_ID = 'grapce-spacheship-123'; - - // tslint:disable-next-line no-any - const PUBSUB: any = { - auth: { - getAuthClient: util.noop, - }, - options: FAKE_PUBSUB_OPTIONS, - }; - - const SUB_NAME = 'test-subscription'; - // tslint:disable-next-line no-any - const SUBSCRIPTION: any = { - name: SUB_NAME, - pubsub: PUBSUB, - request: util.noop, - }; - - let pjyOverride; - function fakePjy() { - return (pjyOverride || pjy.replaceProjectIdToken).apply(null, arguments); - } - - before(() => { - ConnectionPool = proxyquire('../src/connection-pool', { - '../src/util': fakeUtil, - '@google-cloud/projectify': { - replaceProjectIdToken: fakePjy, - }, - duplexify: fakeDuplexify, - uuid: fakeUuid, - }).ConnectionPool; - }); - - beforeEach(() => { - sandbox = sinon.createSandbox(); - fakeConnection = new FakeConnection(); - duplexifyOverride = null; - - fakeChannel = { - getConnectivityState() { - return 2; - }, - }; - - fakeClient = { - streamingPull() { - return fakeConnection; - }, - getChannel() { - return fakeChannel; - }, - waitForReady() {}, - }; - - SUBSCRIPTION.request = util.noop; - PUBSUB.auth.getAuthClient = util.noop; - PUBSUB.getClient_ = (config, callback) => { - callback(null, fakeClient); - }; - - pool = new ConnectionPool(SUBSCRIPTION); - pool.queue.forEach(clearTimeout); - pool.queue.length = 0; - }); - - afterEach(() => { - if (pool.isOpen) { - pool.close(); - } - noopOverride = null; - sandbox.restore(); - }); - - describe('initialization', () => { - it('should initialize internally used properties', () => { - // tslint:disable-next-line:no-any - (sandbox as any) - .stub(ConnectionPool.prototype, 'open') - .returns(undefined); - - const pool = new ConnectionPool(SUBSCRIPTION); - assert.strictEqual(pool.subscription, SUBSCRIPTION); - assert.strictEqual(pool.pubsub, SUBSCRIPTION.pubsub); - assert(pool.connections instanceof Map); - assert.strictEqual(pool.isPaused, false); - assert.strictEqual(pool.isOpen, false); - assert.strictEqual(pool.isGettingChannelState, false); - assert.strictEqual(pool.failedConnectionAttempts, 0); - assert.strictEqual(pool.noConnectionsTime, 0); - assert.strictEqual(pool.settings.maxConnections, 5); - assert.strictEqual(pool.settings.ackDeadline, 10000); - assert.deepStrictEqual(pool.queue, []); - }); - - it('should respect user specified settings', () => { - const options = { - maxConnections: 2, - ackDeadline: 100, - }; - - const subscription = Object.assign({}, SUBSCRIPTION, options); - const subscriptionCopy = Object.assign({}, subscription); - const pool = new ConnectionPool(subscription); - - assert.deepStrictEqual(pool.settings, options); - assert.deepStrictEqual(subscription, subscriptionCopy); - }); - - it('should inherit from EventEmitter', () => { - assert(pool instanceof EventEmitter); - }); - - it('should call open', done => { - const open = ConnectionPool.prototype.open; - - ConnectionPool.prototype.open = () => { - ConnectionPool.prototype.open = open; - done(); - }; - - // tslint:disable-next-line no-unused-expression - new ConnectionPool(SUBSCRIPTION); - }); - }); - - describe('acquire', () => { - it('should return an error if the pool is closed', done => { - const expectedErr = 'No connections available to make request.'; - - pool.isOpen = false; - - pool.acquire(err => { - assert(err instanceof Error); - assert.strictEqual(err.message, expectedErr); - done(); - }); - }); - - it('should return a specified connection', done => { - const id = 'a'; - const fakeConnection = new FakeConnection(); - - pool.connections.set(id, fakeConnection); - pool.connections.set('b', new FakeConnection()); - - pool.acquire(id, (err, connection) => { - assert.ifError(err); - assert.strictEqual(connection, fakeConnection); - done(); - }); - }); - - it('should return any conn when the specified is missing', done => { - const fakeConnection = new FakeConnection(); - - pool.connections.set('a', fakeConnection); - - pool.acquire('b', (err, connection) => { - assert.ifError(err); - assert.strictEqual(connection, fakeConnection); - done(); - }); - }); - - it('should return any connection when id is missing', done => { - const fakeConnection = new FakeConnection(); - - pool.connections.set('a', fakeConnection); - - pool.acquire((err, connection) => { - assert.ifError(err); - assert.strictEqual(connection, fakeConnection); - done(); - }); - }); - - it('should listen for connected event if no conn is ready', done => { - const fakeConnection = new FakeConnection(); - - pool.acquire((err, connection) => { - assert.ifError(err); - assert.strictEqual(connection, fakeConnection); - done(); - }); - - pool.emit('connected', fakeConnection); - }); - }); - - describe('close', () => { - let _clearTimeout; - let _clearInterval; - - before(() => { - _clearTimeout = global.clearTimeout; - _clearInterval = global.clearInterval; - }); - - beforeEach(() => { - global.clearTimeout = global.clearInterval = util.noop; - }); - - afterEach(() => { - global.clearTimeout = _clearTimeout; - global.clearInterval = _clearInterval; - }); - - it('should stop running the keepAlive task', done => { - const fakeHandle = 123; - - pool.keepAliveHandle = fakeHandle; - - global.clearInterval = handle => { - assert.strictEqual(handle, fakeHandle); - done(); - }; - - pool.close(); - }); - - it('should clear the connections map', done => { - pool.connections.clear = done; - pool.close(); - }); - - it('should clear any timeouts in the queue', () => { - let clearCalls = 0; - - const fakeHandles = ['a', 'b', 'c', 'd']; - - global.clearTimeout = handle => { - assert.strictEqual(handle, fakeHandles[clearCalls++]); - }; - - pool.queue = Array.from(fakeHandles); - pool.close(); - - assert.strictEqual(clearCalls, fakeHandles.length); - assert.strictEqual(pool.queue.length, 0); - }); - - it('should set isOpen to false', () => { - pool.close(); - assert.strictEqual(pool.isOpen, false); - }); - - it('should set isGettingChannelState to false', () => { - pool.isGettingChannelState = true; - pool.close(); - - assert.strictEqual(pool.isGettingChannelState, false); - }); - - it('should reset internally used props', () => { - pool.failedConnectionAttempts = 100; - pool.noConnectionsTime = Date.now(); - - pool.close(); - - assert.strictEqual(pool.failedConnectionAttempts, 0); - assert.strictEqual(pool.noConnectionsTime, 0); - }); - - it('should remove event listeners', () => { - pool.on('channel.ready', nope) - .on('channel.error', nope) - .on('newListener', nope); - - pool.close(); - - assert.strictEqual(pool.listenerCount('channel.ready'), 0); - assert.strictEqual(pool.listenerCount('channel.error'), 0); - assert.strictEqual(pool.listenerCount('newListener'), 0); - - function nope() { - throw new Error('Should not be called!'); - } - }); - - it('should call cancel on all active connections', done => { - const a = new FakeConnection(); - const b = new FakeConnection(); - - pool.connections.set('a', a); - pool.connections.set('b', b); - - pool.close(err => { - assert.ifError(err); - assert.strictEqual(a.canceled, true); - assert.strictEqual(b.canceled, true); - done(); - }); - }); - - it('should call end on all active connections', () => { - const a = new FakeConnection(); - const b = new FakeConnection(); - - pool.connections.set('a', a); - pool.connections.set('b', b); - - pool.close(); - - assert.strictEqual(a.ended, true); - assert.strictEqual(b.ended, true); - }); - - it('should close the client', done => { - pool.client = {close: done}; - pool.close(); - }); - - it('should exec a callback when finished closing', done => { - pool.close(done); - }); - - it('should use noop when callback is omitted', done => { - noopOverride = done; - pool.close(); - }); - }); - - describe('createConnection', () => { - let fakeConnection; - let fakeChannel; - let fakeClient; - let fakeDuplex; - - beforeEach(() => { - fakeConnection = new FakeConnection(); - - fakeChannel = { - getConnectivityState() { - return 2; - }, - }; - - fakeClient = { - streamingPull() { - return fakeConnection; - }, - getChannel() { - return fakeChannel; - }, - }; - - fakeClient.waitForReady = util.noop; - - pool.getClient = callback => { - pool.pubsub = { - projectId: PROJECT_ID, - }; - - callback(null, fakeClient); - }; - - fakeDuplex = new FakeConnection(); - - duplexifyOverride = () => { - return fakeDuplex; - }; - }); - - it('should emit any errors that occur when getting client', done => { - const error = new Error('err'); - - pool.getClient = callback => { - callback(error); - }; - - pool.on('error', err => { - assert.strictEqual(err, error); - done(); - }); - - pool.createConnection(); - }); - - describe('channel', () => { - const channelReadyEvent = 'channel.ready'; - const channelErrorEvent = 'channel.error'; - - describe('error', () => { - it('should remove the channel ready event listener', () => { - pool.createConnection(); - assert.strictEqual(pool.listenerCount(channelReadyEvent), 1); - - pool.emit(channelErrorEvent); - assert.strictEqual(pool.listenerCount(channelReadyEvent), 0); - }); - - it('should cancel the connection', () => { - pool.createConnection(); - pool.emit(channelErrorEvent); - - assert.strictEqual(fakeConnection.canceled, true); - }); - }); - - describe('success', () => { - it('should remove the channel error event', () => { - pool.createConnection(); - assert.strictEqual(pool.listenerCount(channelErrorEvent), 1); - - pool.emit(channelReadyEvent); - assert.strictEqual(pool.listenerCount(channelErrorEvent), 0); - }); - - it('should set the isConnected flag to true', () => { - pool.createConnection(); - pool.emit(channelReadyEvent); - - assert.strictEqual(fakeDuplex.isConnected, true); - }); - - it('should reset internally used properties', () => { - pool.noConnectionsTime = Date.now(); - pool.failedConnectionAttempts = 10; - - pool.createConnection(); - pool.emit(channelReadyEvent); - - assert.strictEqual(pool.noConnectionsTime, 0); - assert.strictEqual(pool.failedConnectionAttempts, 0); - }); - - it('should emit a connected event', done => { - pool.on('connected', connection => { - assert.strictEqual(connection, fakeDuplex); - done(); - }); - - pool.createConnection(); - pool.emit(channelReadyEvent); - }); - }); - }); - - describe('connection', () => { - const TOKENIZED_SUB_NAME = 'project/p/subscriptions/' + SUB_NAME; - let fakeId; - - beforeEach(() => { - fakeId = uuid.v4(); - - fakeUuid.v4 = () => { - return fakeId; - }; - - pjyOverride = null; - }); - - it('should create a connection', done => { - const fakeDuplex = new FakeConnection(); - - duplexifyOverride = (writable, readable, options) => { - assert.strictEqual(writable, fakeConnection); - assert.deepStrictEqual(options, {objectMode: true}); - return fakeDuplex; - }; - - pjyOverride = (subName, projectId) => { - assert.strictEqual(subName, SUB_NAME); - assert.strictEqual(projectId, PROJECT_ID); - return TOKENIZED_SUB_NAME; - }; - - fakeDuplex.write = reqOpts => { - assert.deepStrictEqual(reqOpts, { - subscription: TOKENIZED_SUB_NAME, - streamAckDeadlineSeconds: pool.settings.ackDeadline / 1000, - }); - }; - - pool.connections.set = (id, connection) => { - assert.strictEqual(id, fakeId); - assert.strictEqual(connection, fakeDuplex); - done(); - }; - - pool.createConnection(); - }); - - it('should unpack the recieved messages', done => { - const fakeDuplex = new FakeConnection(); - const pipedMessages: Array<{}> = []; - const fakeResp = { - receivedMessages: [{}, {}, {}, {}, null], - }; - - duplexifyOverride = (writable, readable) => { - readable - .on('data', - message => { - pipedMessages.push(message); - }) - .on('end', - () => { - assert.strictEqual(pipedMessages.length, 4); - pipedMessages.forEach((message, i) => { - assert.strictEqual(message, fakeResp.receivedMessages[i]); - }); - done(); - }) - .write(fakeResp); - - return fakeDuplex; - }; - - pool.createConnection(); - }); - - it('should proxy the cancel method', () => { - const fakeCancel = () => {}; - fakeConnection.cancel = { - bind(context) { - assert.strictEqual(context, fakeConnection); - return fakeCancel; - }, - }; - pool.createConnection(); - assert.strictEqual(fakeDuplex.cancel, fakeCancel); - }); - - it('should pause the connection if the pool is paused', done => { - fakeDuplex.pause = done; - pool.isPaused = true; - pool.createConnection(); - }); - - describe('error events', () => { - it('should emit errors to the pool', done => { - const error = new Error('err'); - - pool.on('error', err => { - assert.strictEqual(err, error); - done(); - }); - - pool.createConnection(); - fakeDuplex.emit('error', error); - }); - }); - - describe('status events', () => { - beforeEach(() => { - pool.connections.set('a', new FakeConnection()); - }); - - it('should cancel any error events', done => { - const fakeError = {code: 4}; - - pool.on('error', done); // should not fire - pool.createConnection(); - - fakeConnection.emit('status', fakeError); - fakeDuplex.emit('error', fakeError); - - done(); - }); - - it('should close and delete the connection', done => { - pool.createConnection(); - - pool.connections.delete = id => { - assert.strictEqual(id, fakeId); - done(); - }; - - fakeConnection.emit('status', {}); - }); - - it('should increment the failed connection counter', done => { - pool.failedConnectionAttempts = 0; - fakeDuplex.isConnected = false; - - pool.createConnection(); - fakeConnection.emit('status', {}); - - setImmediate(() => { - assert.strictEqual(pool.failedConnectionAttempts, 1); - done(); - }); - }); - - it('should not incr. the failed connection counter', () => { - pool.failedConnectionAttempts = 0; - fakeDuplex.isConnected = true; - - pool.createConnection(); - fakeConnection.emit('status', {}); - - assert.strictEqual(pool.failedConnectionAttempts, 0); - }); - - it('should capture the date when no conns are found', done => { - const dateNow = global.Date.now; - - const fakeDate = Date.now(); - global.Date.now = () => { - return fakeDate; - }; - - pool.noConnectionsTime = 0; - pool.isConnected = () => { - return false; - }; - - pool.createConnection(); - fakeConnection.emit('status', {}); - - setImmediate(() => { - assert.strictEqual(pool.noConnectionsTime, fakeDate); - global.Date.now = dateNow; - done(); - }); - }); - - it('should not capture the date when already set', () => { - pool.noConnectionsTime = 123; - pool.isConnected = () => { - return false; - }; - - pool.createConnection(); - fakeConnection.emit('status', {}); - - assert.strictEqual(pool.noConnectionsTime, 123); - }); - - it('should not capture the date if a conn. is found', () => { - pool.noConnectionsTime = 0; - pool.isConnected = () => { - return true; - }; - - pool.createConnection(); - fakeConnection.emit('status', {}); - - assert.strictEqual(pool.noConnectionsTime, 0); - }); - - it('should queue a connection if status is retryable', done => { - const fakeStatus = {}; - - pool.shouldReconnect = status => { - assert.strictEqual(status, fakeStatus); - return true; - }; - - pool.queueConnection = done; - - pool.createConnection(); - fakeConnection.emit('status', fakeStatus); - }); - - it('should emit error if no pending conn. are found', done => { - const error = { - code: 4, - details: 'Deadline Exceeded', - }; - - pool.shouldReconnect = () => { - return false; - }; - - // will only emit status errors if pool is empty - pool.connections = new Map(); - - pool.on('error', err => { - assert.strictEqual(err.code, error.code); - assert.strictEqual(err.message, error.details); - done(); - }); - - pool.createConnection(); - fakeConnection.emit('status', error); - }); - }); - - describe('data events', () => { - it('should emit messages', done => { - const fakeResp = {}; - const fakeMessage = {}; - - pool.createMessage = (id, resp) => { - assert.strictEqual(id, fakeId); - assert.strictEqual(resp, fakeResp); - return fakeMessage; - }; - - pool.on('message', message => { - assert.strictEqual(message, fakeMessage); - done(); - }); - - pool.createConnection(); - fakeDuplex.emit('data', fakeResp); - }); - }); - }); - }); - - describe('createMessage', () => { - let message; - let globalDateNow; - - const CONNECTION_ID = 'abc'; - const FAKE_DATE_NOW = Date.now(); - - const PT = { - seconds: 6838383, - nanos: 20323838, - }; - - const RESP = { - ackId: 'def', - message: { - messageId: 'ghi', - data: Buffer.from('hello'), - attributes: { - a: 'a', - }, - publishTime: PT, - }, - }; - - before(() => { - globalDateNow = global.Date.now; - global.Date.now = () => { - return FAKE_DATE_NOW; - }; - }); - - beforeEach(() => { - message = pool.createMessage(CONNECTION_ID, RESP); - }); - - after(() => { - global.Date.now = globalDateNow; - }); - - it('should capture the connection id', () => { - assert.strictEqual(message.connectionId, CONNECTION_ID); - }); - - it('should capture the message data', () => { - const expectedPublishTime = - new Date(Math.floor(PT.seconds) * 1000 + Math.floor(PT.nanos) / 1e6); - - assert.strictEqual(message.ackId, RESP.ackId); - assert.strictEqual(message.id, RESP.message.messageId); - assert.strictEqual(message.data, RESP.message.data); - assert.strictEqual(message.attributes, RESP.message.attributes); - assert.deepStrictEqual(message.publishTime, expectedPublishTime); - assert.strictEqual(message.received, FAKE_DATE_NOW); - }); - - it('should create a read-only message length property', () => { - assert.strictEqual(message.length, RESP.message.data.length); - - assert.throws(() => { - message.length = 3; - }); - }); - - it('should create an ack method', done => { - SUBSCRIPTION.ack_ = message_ => { - assert.strictEqual(message_, message); - done(); - }; - - message.ack(); - }); - - it('should create a nack method', done => { - SUBSCRIPTION.nack_ = message_ => { - assert.strictEqual(message_, message); - done(); - }; - - message.nack(); - }); - - it('should create a nack method accepting a delay argument', done => { - const delay = Math.random(); - - SUBSCRIPTION.nack_ = (message_, delay_) => { - assert.strictEqual(message_, message); - assert.strictEqual(delay_, delay); - done(); - }; - - message.nack(delay); - }); - }); - - describe('getAndEmitChannelState', () => { - const channelErrorEvent = 'channel.error'; - const channelReadyEvent = 'channel.ready'; - const channelReadyState = 2; - let fakeChannelState; - let dateNow; - let fakeTimestamp; - // tslint:disable-next-line no-any - const fakeChannel: any = {}; - - // tslint:disable-next-line no-any - const fakeClient: any = { - getChannel() { - return fakeChannel; - }, - }; - - before(() => { - dateNow = global.Date.now; - }); - - beforeEach(() => { - fakeChannel.getConnectivityState = () => { - return fakeChannelState; - }; - - fakeChannelState = 0; - fakeClient.waitForReady = util.noop; - - pool.getClient = callback => { - callback(null, fakeClient); - }; - - PUBSUB.getClient_ = (config, callback) => { - callback(null, fakeClient); - }; - - fakeTimestamp = dateNow.call(global.Date); - pool.noConnectionsTime = 0; - - global.Date.now = () => { - return fakeTimestamp; - }; - }); - - after(() => { - global.Date.now = dateNow; - }); - - it('should set the isGettingChannelState flag to true', () => { - pool.getAndEmitChannelState(); - assert.strictEqual(pool.isGettingChannelState, true); - }); - - it('should emit any client errors', done => { - let channelErrorEmitted = false; - - pool.on(channelErrorEvent, () => { - channelErrorEmitted = true; - }); - - const fakeError = new Error('nope'); - let errorEmitted = false; - - pool.on('error', err => { - assert.strictEqual(err, fakeError); - errorEmitted = true; - }); - - pool.getClient = callback => { - callback(fakeError); - - assert.strictEqual(pool.isGettingChannelState, false); - assert.strictEqual(channelErrorEmitted, true); - assert.strictEqual(errorEmitted, true); - - done(); - }; - - pool.getAndEmitChannelState(); - }); - - it('should emit the ready event if the channel is ready', done => { - fakeClient.waitForReady = (deadline, callback) => { - callback(); - }; - fakeChannelState = channelReadyState; - - fakeChannel.getConnectivityState = shouldConnect => { - assert.strictEqual(shouldConnect, false); - return fakeChannelState; - }; - - pool.on(channelReadyEvent, () => { - assert.strictEqual(pool.isGettingChannelState, false); - done(); - }); - - pool.getAndEmitChannelState(); - fakeClient.waitForReady = util.noop; - }); - - it('should wait for the channel to be ready', done => { - const expectedDeadline = fakeTimestamp + 300000; - - fakeClient.waitForReady = deadline => { - assert.strictEqual(deadline, expectedDeadline); - done(); - }; - - pool.getAndEmitChannelState(); - }); - - it('should factor in the noConnectionsTime property', done => { - pool.noConnectionsTime = 10; - - const fakeElapsedTime = fakeTimestamp - pool.noConnectionsTime; - const expectedDeadline = fakeTimestamp + (300000 - fakeElapsedTime); - - fakeClient.waitForReady = deadline => { - assert.strictEqual(deadline, expectedDeadline); - done(); - }; - - pool.getAndEmitChannelState(); - }); - - it('should emit any waitForReady errors', done => { - const fakeError = new Error('err'); - - pool.on(channelErrorEvent, err => { - assert.strictEqual(err, fakeError); - assert.strictEqual(pool.isGettingChannelState, false); - done(); - }); - - fakeClient.waitForReady = (deadline, callback) => { - callback(fakeError); - }; - - pool.getAndEmitChannelState(); - }); - - it('should emit the ready event when ready', done => { - pool.on(channelReadyEvent, () => { - assert.strictEqual(pool.isGettingChannelState, false); - done(); - }); - - fakeClient.waitForReady = (deadline, callback) => { - callback(null); - }; - - pool.getAndEmitChannelState(); - }); - }); - - describe('getClient', () => { - const fakeCreds = {}; - - class FakeSubscriber { - address; - creds; - options; - closed; - constructor(address, creds, options) { - this.address = address; - this.creds = creds; - this.options = options; - this.closed = false; - } - streamingPull() { - return fakeConnection; - } - getChannel() { - return fakeChannel; - } - close() { - this.closed = true; - } - } - - const fakeClient = new FakeSubscriber('fake-address', fakeCreds, {}); - - beforeEach(() => { - PUBSUB.getClient_ = (config, callback) => { - callback(null, fakeClient); - }; - }); - - it('should return the cached client when available', done => { - pool.getClient((err1, client1) => { - assert.ifError(err1); - - pool.getClient((err2, client2) => { - assert.ifError(err2); - assert.strictEqual(client1, client2); - done(); - }); - }); - }); - - it('should create/use grpc credentials', done => { - pool.getClient((err, client) => { - assert.ifError(err); - assert(client instanceof FakeSubscriber); - assert.strictEqual(client.creds, fakeCreds); - done(); - }); - }); - }); - - describe('isConnected', () => { - it('should return true when at least one stream is connected', () => { - const connections = (pool.connections = new Map()); - - connections.set('a', new FakeConnection()); - connections.set('b', new FakeConnection()); - connections.set('c', new FakeConnection()); - connections.set('d', new FakeConnection()); - - const conn = new FakeConnection(); - conn.isConnected = true; - connections.set('e', conn); - - assert(pool.isConnected()); - }); - - it('should return false when there is no connection', () => { - const connections = (pool.connections = new Map()); - - connections.set('a', new FakeConnection()); - connections.set('b', new FakeConnection()); - connections.set('c', new FakeConnection()); - connections.set('d', new FakeConnection()); - connections.set('e', new FakeConnection()); - - assert(!pool.isConnected()); - }); - - it('should return false when the map is empty', () => { - pool.connections = new Map(); - assert(!pool.isConnected()); - }); - }); - - describe('open', () => { - beforeEach(() => { - pool.queueConnection = util.noop; - clearInterval(pool.keepAliveHandle); - }); - - it('should make the specified number of connections', () => { - const expectedCount = 5; - let connectionCount = 0; - - pool.queueConnection = () => { - connectionCount += 1; - }; - - pool.settings.maxConnections = expectedCount; - pool.open(); - - assert.strictEqual(expectedCount, connectionCount); - }); - - it('should set the isOpen flag to true', () => { - pool.open(); - assert(pool.isOpen); - }); - - it('should reset internal used props', () => { - const fakeDate = Date.now(); - const dateNow = Date.now; - - global.Date.now = () => { - return fakeDate; - }; - - pool.failedConnectionAttempts = 100; - pool.noConnectionsTime = 0; - - pool.open(); - - assert.strictEqual(pool.failedConnectionAttempts, 0); - assert.strictEqual(pool.noConnectionsTime, fakeDate); - - global.Date.now = dateNow; - }); - - it('should listen for newListener events', () => { - pool.removeAllListeners('newListener'); - pool.open(); - - assert.strictEqual(pool.listenerCount('newListener'), 1); - }); - - describe('newListener callback', () => { - beforeEach(() => { - pool.getAndEmitChannelState = () => { - throw new Error('Should not be called!'); - }; - }); - - it('should call getAndEmitChannelState', done => { - pool.getAndEmitChannelState = done; - pool.emit('newListener', 'channel.ready'); - }); - - it('should do nothing for unknown events', () => { - pool.emit('newListener', 'channel.error'); - }); - - it('should do nothing when already getting state', () => { - pool.isGettingChannelState = true; - pool.emit('newListener', 'channel.ready'); - }); - }); - - it('should start a keepAlive task', done => { - const _setInterval = global.setInterval; - let unreffed = false; - const fakeHandle = { - unref: () => (unreffed = true), - }; - - pool.subscription = {writeToStreams_: false}; - pool.sendKeepAlives = done; - - // tslint:disable-next-line no-any - (global as any).setInterval = (fn, interval) => { - global.setInterval = _setInterval; - - assert.strictEqual(interval, 30000); - fn(); // should call sendKeepAlives aka done - - return fakeHandle; - }; - - pool.open(); - - assert.strictEqual(pool.keepAliveHandle, fakeHandle); - assert.strictEqual(unreffed, true); - }); - }); - - describe('pause', () => { - it('should set the isPaused flag to true', () => { - pool.pause(); - assert(pool.isPaused); - }); - - it('should pause all the connections', () => { - const a = new FakeConnection(); - const b = new FakeConnection(); - - pool.connections.set('a', a); - pool.connections.set('b', b); - - pool.pause(); - - assert(a.isPaused); - assert(b.isPaused); - }); - }); - - describe('queueConnection', () => { - const fakeTimeoutHandle = 123; - - let _setTimeout; - let _random; - let _open; - - before(() => { - _setTimeout = global.setTimeout; - _random = global.Math.random; - - _open = ConnectionPool.prototype.open; - // prevent open from calling queueConnection - ConnectionPool.prototype.open = util.noop; - }); - - beforeEach(() => { - Math.random = () => { - return 1; - }; - - // tslint:disable-next-line no-any - (global as any).setTimeout = cb => { - cb(); - return fakeTimeoutHandle; - }; - - pool.failedConnectionAttempts = 0; - pool.createConnection = util.noop; - }); - - after(() => { - global.setTimeout = _setTimeout; - global.Math.random = _random; - ConnectionPool.prototype.open = _open; - }); - - it('should set a timeout to create the connection', done => { - pool.createConnection = done; - - // tslint:disable-next-line no-any - (global as any).setTimeout = (cb, delay) => { - assert.strictEqual(delay, 0); - cb(); // should call the done fn - }; - - pool.queueConnection(); - }); - - it('should factor in the number of failed requests', done => { - pool.createConnection = done; - pool.failedConnectionAttempts = 3; - - // tslint:disable-next-line no-any - (global as any).setTimeout = (cb, delay) => { - assert.strictEqual(delay, 9000); - cb(); // should call the done fn - }; - - pool.queueConnection(); - }); - - it('should capture the timeout handle', () => { - pool.queueConnection(); - assert.deepStrictEqual(pool.queue, [fakeTimeoutHandle]); - }); - - it('should remove the timeout handle once it fires', done => { - pool.createConnection = () => { - setImmediate(() => { - assert.strictEqual(pool.queue.length, 0); - done(); - }); - }; - - pool.queueConnection(); - }); - }); - - describe('resume', () => { - it('should set the isPaused flag to false', () => { - pool.resume(); - assert.strictEqual(pool.isPaused, false); - }); - - it('should resume all the connections', () => { - const a = new FakeConnection(); - const b = new FakeConnection(); - - pool.connections.set('a', a); - pool.connections.set('b', b); - - pool.resume(); - - assert.strictEqual(a.isPaused, false); - assert.strictEqual(b.isPaused, false); - }); - }); - - describe('sendKeepAlives', () => { - it('should write an empty message to all the streams', () => { - const a = new FakeConnection(); - const b = new FakeConnection(); - - pool.connections.set('a', a); - pool.connections.set('b', b); - - pool.sendKeepAlives(); - - assert.deepStrictEqual(a.written, [{}]); - assert.deepStrictEqual(b.written, [{}]); - }); - }); - - describe('shouldReconnect', () => { - it('should not reconnect if the pool is closed', () => { - pool.isOpen = false; - assert.strictEqual(pool.shouldReconnect({}), false); - }); - - it('should return true for retryable errors', () => { - assert(pool.shouldReconnect({code: 0})); // OK - assert(pool.shouldReconnect({code: 1})); // Canceled - assert(pool.shouldReconnect({code: 2})); // Unknown - assert(pool.shouldReconnect({code: 4})); // DeadlineExceeded - assert(pool.shouldReconnect({code: 8})); // ResourceExhausted - assert(pool.shouldReconnect({code: 10})); // Aborted - assert(pool.shouldReconnect({code: 13})); // Internal - assert(pool.shouldReconnect({code: 14})); // Unavailable - assert(pool.shouldReconnect({code: 15})); // Dataloss - }); - - it('should return false for non-retryable errors', () => { - assert(!pool.shouldReconnect({code: 3})); // InvalidArgument - assert(!pool.shouldReconnect({code: 5})); // NotFound - assert(!pool.shouldReconnect({code: 6})); // AlreadyExists - assert(!pool.shouldReconnect({code: 7})); // PermissionDenied - assert(!pool.shouldReconnect({code: 9})); // FailedPrecondition - assert(!pool.shouldReconnect({code: 11})); // OutOfRange - assert(!pool.shouldReconnect({code: 12})); // Unimplemented - assert(!pool.shouldReconnect({code: 16})); // Unauthenticated - }); - - it('should not retry if no connection can be made', () => { - const fakeStatus = { - code: 4, - }; - - pool.noConnectionsTime = Date.now() - 300001; - - assert.strictEqual(pool.shouldReconnect(fakeStatus), false); - }); - - it('should return true if all conditions are met', () => { - const fakeStatus = { - code: 4, - }; - - pool.noConnectionsTime = 0; - - assert.strictEqual(pool.shouldReconnect(fakeStatus), true); - }); - }); -}); diff --git a/handwritten/pubsub/test/histogram.ts b/handwritten/pubsub/test/histogram.ts index 6ed4571b0fb..65a6115ba14 100644 --- a/handwritten/pubsub/test/histogram.ts +++ b/handwritten/pubsub/test/histogram.ts @@ -24,13 +24,14 @@ describe('Histogram', () => { const MAX_VALUE = 600000; beforeEach(() => { - histogram = new Histogram(); + histogram = new Histogram({min: MIN_VALUE, max: MAX_VALUE}); }); describe('initialization', () => { it('should set default min/max values', () => { - assert.strictEqual(histogram.options.min, 10000); - assert.strictEqual(histogram.options.max, 600000); + histogram = new Histogram(); + assert.strictEqual(histogram.options.min, 0); + assert.strictEqual(histogram.options.max, Number.MAX_SAFE_INTEGER); }); it('should accept user defined min/max values', () => { @@ -88,16 +89,6 @@ describe('Histogram', () => { assert.strictEqual(histogram.data.get(outOfBounds), undefined); assert.strictEqual(histogram.data.get(MIN_VALUE), 1); }); - - it('should use seconds level precision', () => { - const ms = 303823; - const expected = 304000; - - histogram.add(ms); - - assert.strictEqual(histogram.data.get(ms), undefined); - assert.strictEqual(histogram.data.get(expected), 1); - }); }); describe('percentile', () => { diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts new file mode 100644 index 00000000000..5baec4d4078 --- /dev/null +++ b/handwritten/pubsub/test/lease-manager.ts @@ -0,0 +1,428 @@ +/*! + * Copyright 2018 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {EventEmitter} from 'events'; +import * as proxyquire from 'proxyquire'; +import * as sinon from 'sinon'; + +const FREE_MEM = 9376387072; +const fakeos = { + freemem: () => FREE_MEM +}; + +class FakeSubscriber extends EventEmitter { + ackDeadline = 10; + modAckLatency = 2000; + async modAck(message: FakeMessage, deadline: number): Promise {} +} + +class FakeMessage { + length = 20; + received: number; + constructor() { + this.received = Date.now(); + } + modAck(deadline: number): void {} +} + +describe('LeaseManager', () => { + const sandbox = sinon.createSandbox(); + + let subscriber: FakeSubscriber; + + // tslint:disable-next-line variable-name + let LeaseManager; + let leaseManager; + + before(() => { + LeaseManager = proxyquire('../src/lease-manager.js', { + 'os': fakeos, + '../src/subscriber': + {Subscriber: FakeSubscriber, Message: FakeMessage} + }).LeaseManager; + }); + + beforeEach(() => { + subscriber = new FakeSubscriber(); + leaseManager = new LeaseManager(subscriber); + }); + + afterEach(() => { + leaseManager.clear(); + sandbox.restore(); + }); + + describe('instantiation', () => { + it('should default the bytes value to 0', () => { + assert.strictEqual(leaseManager.size, 0); + }); + + it('should capture any options passed in', () => { + const fakeOptions = {}; + const stub = sandbox.stub(LeaseManager.prototype, 'setOptions'); + const manager = new LeaseManager(subscriber, fakeOptions); + + const [options] = stub.lastCall.args; + assert.strictEqual(options, fakeOptions); + }); + }); + + describe('pending', () => { + it('should return the number of pending messages', () => { + leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); + + leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage()); + + assert.strictEqual(leaseManager.pending, 1); + }); + }); + + describe('size', () => { + it('should return the number of messages', () => { + leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage()); + + assert.strictEqual(leaseManager.size, 2); + }); + }); + + describe('add', () => { + it('should update the bytes/size values', () => { + const message = new FakeMessage(); + + leaseManager.add(message); + + assert.strictEqual(leaseManager.size, 1); + assert.strictEqual(leaseManager.bytes, message.length); + }); + + it('should dispatch the message if allowExcessMessages is true', done => { + const fakeMessage = new FakeMessage(); + + leaseManager.isFull = () => true; + leaseManager.setOptions({allowExcessMessages: true}); + + subscriber.on('message', message => { + assert.strictEqual(message, fakeMessage); + done(); + }); + + leaseManager.add(fakeMessage); + }); + + it('should dispatch the message if the inventory is not full', done => { + const fakeMessage = new FakeMessage(); + + leaseManager.isFull = () => false; + leaseManager.setOptions({allowExcessMessages: false}); + + subscriber.on('message', message => { + assert.strictEqual(message, fakeMessage); + done(); + }); + + leaseManager.add(fakeMessage); + }); + + it('should not dispatch the message if the inventory is full', done => { + const message = new FakeMessage(); + + leaseManager.isFull = () => true; + leaseManager.setOptions({allowExcessMessages: false}); + + subscriber.on('message', () => { + done(new Error('Test should not have dispatched message.')); + }); + + setImmediate(done); + }); + + it('should emit the full event if it becomes full', done => { + leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); + + leaseManager.on('full', done); + leaseManager.add(new FakeMessage()); + }); + + describe('extending deadlines', () => { + let clock: sinon.SinonFakeTimers; + let random: number; + let expectedTimeout: number; + let halfway: number; + + beforeEach(() => { + random = Math.random(); + sandbox.stub(global.Math, 'random').returns(random); + clock = sandbox.useFakeTimers(); + expectedTimeout = + ((subscriber.ackDeadline * 1000) * 0.9 - subscriber.modAckLatency) * + random; + halfway = expectedTimeout / 2; + }); + + it('should schedule a lease extension', () => { + const message = new FakeMessage(); + const stub = + sandbox.stub(message, 'modAck').withArgs(subscriber.ackDeadline); + + leaseManager.add(message); + clock.tick(expectedTimeout); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should not schedule a lease extension if already in progress', () => { + const messages = [new FakeMessage(), new FakeMessage()]; + const stubs = messages.map(message => sandbox.stub(message, 'modAck')); + + // since only 1 timeout should be set, even if add messages at different + // times, they should all get extended at the same time + messages.forEach(message => { + leaseManager.add(message); + clock.tick(halfway); + }); + + messages.forEach((fakeMessage, i) => { + const [deadline] = stubs[i].lastCall.args; + + assert.strictEqual(deadline, subscriber.ackDeadline); + }); + }); + + it('should remove any messages that pass the maxExtension value', () => { + const maxExtension = (expectedTimeout - 1) / 1000; + const badMessages = [new FakeMessage(), new FakeMessage()]; + + leaseManager.setOptions({maxExtension}); + badMessages.forEach(message => leaseManager.add(message)); + clock.tick(halfway); + + // only message that shouldn't be forgotten + const goodMessage = new FakeMessage(); + const removeStub = sandbox.stub(leaseManager, 'remove'); + const modAckStub = sandbox.stub(goodMessage, 'modAck'); + + leaseManager.add(goodMessage); + clock.tick(halfway); + + // make sure the expired messages were forgotten + assert.strictEqual(removeStub.callCount, badMessages.length); + + badMessages.forEach((fakeMessage, i) => { + const [message] = removeStub.getCall(i).args; + assert.strictEqual(message, fakeMessage); + }); + + const [deadline] = modAckStub.lastCall.args; + assert.strictEqual(deadline, subscriber.ackDeadline); + }); + + it('should continuously extend the deadlines', () => { + const message = new FakeMessage(); + const stub = + sandbox.stub(message, 'modAck').withArgs(subscriber.ackDeadline); + + leaseManager.add(message); + clock.tick(expectedTimeout); + + assert.strictEqual(stub.callCount, 1); + clock.tick(expectedTimeout); + assert.strictEqual(stub.callCount, 2); + }); + }); + }); + + describe('clear', () => { + it('should completely clear out the inventory', () => { + leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage()); + leaseManager.clear(); + + assert.strictEqual(leaseManager.bytes, 0); + assert.strictEqual(leaseManager.size, 0); + }); + + it('should emit the free event if it was full', done => { + leaseManager.setOptions({maxMessages: 1}); + leaseManager.add(new FakeMessage()); + leaseManager.on('free', done); + + setImmediate(() => leaseManager.clear()); + }); + + it('should cancel any lease extensions', () => { + const clock = sandbox.useFakeTimers(); + const stub = sandbox.stub(subscriber, 'modAck').resolves(); + + leaseManager.add(new FakeMessage()); + leaseManager.clear(); + + // this would otherwise trigger a minimum of 2 modAcks + clock.tick(subscriber.ackDeadline * 1000 * 2); + + assert.strictEqual(stub.callCount, 0); + }); + }); + + describe('isFull', () => { + it('should return true if the maxMessages threshold is hit', () => { + const maxMessages = 1; + + leaseManager.setOptions({maxMessages}); + leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage()); + + assert.strictEqual(leaseManager.isFull(), true); + }); + + it('should return true if the maxBytes threshold is hit', () => { + const message = new FakeMessage(); + const maxBytes = message.length - 1; + + leaseManager.setOptions({maxBytes}); + leaseManager.add(message); + + assert.strictEqual(leaseManager.isFull(), true); + }); + + it('should return false if no thresholds are hit', () => { + const message = new FakeMessage(); + const maxMessages = 2; + const maxBytes = message.length + 1; + + leaseManager.setOptions({maxMessages, maxBytes}); + leaseManager.add(message); + + assert.strictEqual(leaseManager.isFull(), false); + }); + }); + + describe('remove', () => { + it('should noop for unknown messages', () => { + const message = new FakeMessage(); + + leaseManager.add(message); + leaseManager.remove(new FakeMessage()); + + assert.strictEqual(leaseManager.size, 1); + assert.strictEqual(leaseManager.bytes, message.length); + }); + + it('should update the bytes/size values', () => { + const message = new FakeMessage(); + + leaseManager.add(message); + leaseManager.remove(message); + + assert.strictEqual(leaseManager.size, 0); + assert.strictEqual(leaseManager.bytes, 0); + }); + + it('should emit the free event if there is free space', done => { + const message = new FakeMessage(); + + leaseManager.setOptions({maxMessages: 1}); + leaseManager.add(message); + setImmediate(() => leaseManager.remove(message)); + + leaseManager.on('free', () => { + assert.strictEqual(leaseManager.size, 0); + done(); + }); + }); + + it('should remove a message from the pending state', done => { + const pending = new FakeMessage(); + + leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); + + subscriber.on('message', message => { + if (message === pending) { + done(new Error('Pending messages should not be emitted.')); + } + }); + + leaseManager.add(new FakeMessage()); + leaseManager.add(pending); + leaseManager.remove(pending); + + assert.strictEqual(leaseManager.pending, 0); + setImmediate(done); + }); + + it('should dispense a pending messages', done => { + const temp = new FakeMessage(); + const pending = new FakeMessage(); + + leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); + + subscriber.on('message', message => { + if (message === temp) { + return; + } + + assert.strictEqual(leaseManager.size, 1); + assert.strictEqual(message, pending); + done(); + }); + + leaseManager.add(temp); + leaseManager.add(pending); + leaseManager.remove(temp); + }); + + it('should cancel any extensions if no messages are left', () => { + const clock = sandbox.useFakeTimers(); + const message = new FakeMessage(); + const stub = sandbox.stub(subscriber, 'modAck').resolves(); + + leaseManager.add(message); + leaseManager.remove(message); + + clock.tick(subscriber.ackDeadline * 1000 * 2); + + assert.strictEqual(stub.callCount, 0); + }); + }); + + describe('setOptions', () => { + it('should allow excess messages by default', () => {}); + + it('should default maxBytes to 20% of free memory', () => { + const littleMessage = new FakeMessage(); + const bigMessage = new FakeMessage(); + + leaseManager.add(littleMessage); + assert.strictEqual(leaseManager.isFull(), false); + + leaseManager.remove(littleMessage); + bigMessage.length = FREE_MEM * 0.21; + leaseManager.add(bigMessage); + assert.strictEqual(leaseManager.isFull(), true); + }); + + it('should cap maxMessages at 100', () => { + for (let i = 0; i < 100; i++) { + assert.strictEqual(leaseManager.isFull(), false); + leaseManager.add(new FakeMessage()); + } + + assert.strictEqual(leaseManager.isFull(), true); + }); + }); +}); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts new file mode 100644 index 00000000000..fa7af00d630 --- /dev/null +++ b/handwritten/pubsub/test/message-queues.ts @@ -0,0 +1,380 @@ +/*! + * Copyright 2018 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {EventEmitter} from 'events'; +import * as proxyquire from 'proxyquire'; +import * as sinon from 'sinon'; +import * as uuid from 'uuid'; + +class FakeClient { + async acknowledge(reqOpts, callOptions): Promise {} + async modifyAckDeadline(reqOpts, callOptions): Promise {} +} + +class FakeSubscriber extends EventEmitter { + name: string; + client: FakeClient; + constructor() { + super(); + + this.name = uuid.v4(); + this.client = new FakeClient(); + } + async getClient(): Promise { + return this.client; + } +} + +class FakeMessage { + ackId: string; + constructor() { + this.ackId = uuid.v4(); + } +} + +describe('MessageQueues', () => { + const sandbox = sinon.createSandbox(); + + let subscriber; + + // tslint:disable-next-line variable-name + let MessageQueue; + // tslint:disable-next-line variable-name + let AckQueue; + // tslint:disable-next-line variable-name + let ModAckQueue; + + before(() => { + const queues = proxyquire('../src/message-queues.js', {}); + + AckQueue = queues.AckQueue; + ModAckQueue = queues.ModAckQueue; + + type QueuedMessages = Array<[string, number?]>; + + MessageQueue = class MessageQueue extends queues.MessageQueue { + batches = ([] as QueuedMessages[]); + protected async _sendBatch(batch: QueuedMessages): Promise { + this.batches.push(batch); + } + }; + }); + + beforeEach(() => { + subscriber = new FakeSubscriber(); + }); + + afterEach(() => sandbox.restore()); + + describe('MessageQueue', () => { + let messageQueue; + + beforeEach(() => { + messageQueue = new MessageQueue(subscriber); + }); + + describe('initialization', () => { + it('should default numPendingRequests', () => { + assert.strictEqual(messageQueue.numPendingRequests, 0); + }); + + it('should set any provided options', () => { + const fakeOptions = {}; + const stub = sandbox.stub(MessageQueue.prototype, 'setOptions'); + const mq = new MessageQueue(subscriber, fakeOptions); + + const [options] = stub.lastCall.args; + assert.strictEqual(options, fakeOptions); + }); + }); + + describe('maxMilliseconds', () => { + it('should return the maxMilliseconds option', () => { + const maxMilliseconds = 101; + + messageQueue.setOptions({maxMilliseconds}); + assert.strictEqual(messageQueue.maxMilliseconds, maxMilliseconds); + }); + }); + + describe('add', () => { + it('should increase the number of pending requests', () => { + messageQueue.add(new FakeMessage()); + assert.strictEqual(messageQueue.numPendingRequests, 1); + }); + + it('should flush the queue if at capacity', () => { + const stub = sandbox.stub(messageQueue, 'flush'); + + messageQueue.setOptions({maxMessages: 1}); + messageQueue.add(new FakeMessage()); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should schedule a flush if needed', () => { + const clock = sandbox.useFakeTimers(); + const stub = sandbox.stub(messageQueue, 'flush'); + const delay = 1000; + + messageQueue.setOptions({maxMilliseconds: delay}); + messageQueue.add(new FakeMessage()); + + assert.strictEqual(stub.callCount, 0); + clock.tick(delay); + assert.strictEqual(stub.callCount, 1); + }); + }); + + describe('flush', () => { + it('should cancel scheduled flushes', () => { + const clock = sandbox.useFakeTimers(); + const spy = sandbox.spy(messageQueue, 'flush'); + const delay = 1000; + + messageQueue.setOptions({maxMilliseconds: delay}); + messageQueue.add(new FakeMessage()); + messageQueue.flush(); + clock.tick(delay); + + assert.strictEqual(spy.callCount, 1); + }); + + it('should remove the messages from the queue', () => { + messageQueue.add(new FakeMessage()); + messageQueue.flush(); + + assert.strictEqual(messageQueue.numPendingRequests, 0); + }); + + it('should send the batch', () => { + const message = new FakeMessage(); + const deadline = 10; + + messageQueue.add(message, deadline); + messageQueue.flush(); + + const expectedBatch = [[message.ackId, deadline]]; + const [batch] = messageQueue.batches; + + assert.deepStrictEqual(batch, expectedBatch); + }); + + it('should emit any errors', done => { + const fakeError = new Error('err'); + + sandbox.stub(messageQueue.batches, 'push').throws(fakeError); + + subscriber.on('error', err => { + assert.strictEqual(err, fakeError); + done(); + }); + + messageQueue.flush(); + }); + + it('should resolve any pending promises', () => { + const promise = messageQueue.onFlush(); + setImmediate(() => messageQueue.flush()); + return promise; + }); + }); + + describe('onFlush', () => { + it('should create a promise', () => { + const promise = messageQueue.onFlush(); + + assert(promise instanceof Promise); + }); + + it('should re-use existing promises', () => { + const promise1 = messageQueue.onFlush(); + const promise2 = messageQueue.onFlush(); + + assert.strictEqual(promise1, promise2); + }); + }); + + describe('setOptions', () => { + it('should default maxMessages to 3000', () => { + const stub = sandbox.stub(messageQueue, 'flush'); + + for (let i = 0; i < 3000; i++) { + assert.strictEqual(stub.callCount, 0); + messageQueue.add(new FakeMessage()); + } + + assert.strictEqual(stub.callCount, 1); + }); + + it('should respect user supplied maxMessages', () => { + const stub = sandbox.stub(messageQueue, 'flush'); + const maxMessages = 100; + + messageQueue.setOptions({maxMessages}); + + for (let i = 0; i < maxMessages; i++) { + assert.strictEqual(stub.callCount, 0); + messageQueue.add(new FakeMessage()); + } + + assert.strictEqual(stub.callCount, 1); + }); + + it('should default maxMilliseconds to 100', () => { + const clock = sandbox.useFakeTimers(); + const stub = sandbox.stub(messageQueue, 'flush'); + + messageQueue.add(new FakeMessage()); + clock.tick(100); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should respect user supplied maxMilliseconds', () => { + const clock = sandbox.useFakeTimers(); + const stub = sandbox.stub(messageQueue, 'flush'); + const maxMilliseconds = 10000; + + messageQueue.setOptions({maxMilliseconds}); + messageQueue.add(new FakeMessage()); + clock.tick(maxMilliseconds); + + assert.strictEqual(stub.callCount, 1); + }); + }); + }); + + describe('AckQueue', () => { + let ackQueue; + + beforeEach(() => { + ackQueue = new AckQueue(subscriber); + }); + + it('should send batches via Client#acknowledge', async () => { + const messages = [ + new FakeMessage(), + new FakeMessage(), + new FakeMessage(), + ]; + + const stub = sandbox.stub(subscriber.client, 'acknowledge').resolves(); + const expectedReqOpts = { + subscription: subscriber.name, + ackIds: messages.map(({ackId}) => ackId), + }; + + messages.forEach(message => ackQueue.add(message)); + await ackQueue.flush(); + + const [reqOpts] = stub.lastCall.args; + assert.deepStrictEqual(reqOpts, expectedReqOpts); + }); + + it('should send call options', async () => { + const fakeCallOptions = {timeout: 10000}; + const stub = sandbox.stub(subscriber.client, 'acknowledge').resolves(); + + ackQueue.setOptions({callOptions: fakeCallOptions}); + await ackQueue.flush(); + + const [, callOptions] = stub.lastCall.args; + assert.strictEqual(callOptions, fakeCallOptions); + }); + }); + + describe('ModAckQueue', () => { + let modAckQueue; + + beforeEach(() => { + modAckQueue = new ModAckQueue(subscriber); + }); + + it('should send batches via Client#modifyAckDeadline', async () => { + const deadline = 600; + const messages = [ + new FakeMessage(), + new FakeMessage(), + new FakeMessage(), + ]; + + const stub = + sandbox.stub(subscriber.client, 'modifyAckDeadline').resolves(); + + const expectedReqOpts = { + subscription: subscriber.name, + ackDeadlineSeconds: deadline, + ackIds: messages.map(({ackId}) => ackId), + }; + + messages.forEach(message => modAckQueue.add(message, deadline)); + await modAckQueue.flush(); + + const [reqOpts] = stub.lastCall.args; + assert.deepStrictEqual(reqOpts, expectedReqOpts); + }); + + it('should group ackIds by deadline', async () => { + const deadline1 = 600; + const deadline2 = 1000; + + const messages1 = + [new FakeMessage(), new FakeMessage(), new FakeMessage()]; + const messages2 = + [new FakeMessage(), new FakeMessage(), new FakeMessage()]; + + const stub = + sandbox.stub(subscriber.client, 'modifyAckDeadline').resolves(); + + const expectedReqOpts1 = { + subscription: subscriber.name, + ackDeadlineSeconds: deadline1, + ackIds: messages1.map(({ackId}) => ackId), + }; + + const expectedReqOpts2 = { + subscription: subscriber.name, + ackDeadlineSeconds: deadline2, + ackIds: messages2.map(({ackId}) => ackId), + }; + + messages1.forEach(message => modAckQueue.add(message, deadline1)); + messages2.forEach(message => modAckQueue.add(message, deadline2)); + await modAckQueue.flush(); + + const [reqOpts1] = stub.getCall(0).args; + assert.deepStrictEqual(reqOpts1, expectedReqOpts1); + + const [reqOpts2] = stub.getCall(1).args; + assert.deepStrictEqual(reqOpts2, expectedReqOpts2); + }); + + it('should send call options', async () => { + const fakeCallOptions = {timeout: 10000}; + const stub = + sandbox.stub(subscriber.client, 'modifyAckDeadline').resolves(); + + modAckQueue.setOptions({callOptions: fakeCallOptions}); + modAckQueue.add(new FakeMessage(), 10); + await modAckQueue.flush(); + + const [, callOptions] = stub.lastCall.args; + assert.strictEqual(callOptions, fakeCallOptions); + }); + }); +}); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts new file mode 100644 index 00000000000..e8dfeb7cfc5 --- /dev/null +++ b/handwritten/pubsub/test/message-stream.ts @@ -0,0 +1,512 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {Metadata} from 'grpc'; +import * as proxyquire from 'proxyquire'; +import * as sinon from 'sinon'; +import {Duplex, PassThrough} from 'stream'; +import * as uuid from 'uuid'; + +// just need this for unit tests.. we have a ponyfill for destroy on +// MessageStream and gax streams use Duplexify +function destroy(stream: Duplex, err?: Error): void { + process.nextTick(() => { + if (err) { + stream.emit('error', err); + } + stream.emit('close'); + }); +} + +interface StreamState { + highWaterMark: number; +} + +interface StreamOptions { + objectMode?: boolean; + highWaterMark?: number; +} + +class FakeDuplex extends Duplex { + destroy(err?: Error): void { + if (super.destroy) { + return super.destroy(err); + } + destroy(this, err); + } +} + +class FakePassThrough extends PassThrough { + options: StreamOptions; + constructor(options: StreamOptions) { + super(options); + this.options = options; + } +} + +class FakeGrpcStream extends Duplex { + _readableState!: StreamState; + constructor() { + super({objectMode: true}); + } + cancel(): void { + const status = { + code: 1, + details: 'Canceled.', + metadata: new Metadata(), + }; + + process.nextTick(() => { + this.emit('status', status); + this.end(); + }); + } + destroy(err?: Error): void { + if (super.destroy) { + return super.destroy(err); + } + destroy(this, err); + } + _write(chunk: object, encoding: string, callback: Function): void { + callback(); + } + _read(size: number): void {} +} + +class FakeGaxClient { + client: FakeGrpcClient; + constructor() { + this.client = new FakeGrpcClient(); + } + async getSubscriberStub(): Promise { + return this.client; + } +} + +class FakeGrpcClient { + deadline?: number; + streams = ([] as FakeGrpcStream[]); + streamingPull(): FakeGrpcStream { + const stream = new FakeGrpcStream(); + this.streams.push(stream); + return stream; + } + waitForReady(deadline: number, callback: (err?: Error) => void): void { + this.deadline = deadline; + callback(); + } +} + +class FakeSubscriber { + name: string; + ackDeadline: number; + client: FakeGaxClient; + constructor(client) { + this.name = uuid.v4(); + this.ackDeadline = Math.floor(Math.random() * 600); + this.client = client; + } + async getClient(): Promise { + return this.client; + } +} + +describe('MessageStream', () => { + const sandbox = sinon.createSandbox(); + + let client: FakeGrpcClient; + let subscriber: FakeSubscriber; + + // tslint:disable-next-line variable-name + let MessageStream; + let messageStream; + + before(() => { + MessageStream = + proxyquire('../src/message-stream.js', { + 'stream': {Duplex: FakeDuplex, PassThrough: FakePassThrough} + }).MessageStream; + }); + + beforeEach(() => { + const gaxClient = new FakeGaxClient(); + client = gaxClient.client; // we hit the grpc client directly + subscriber = new FakeSubscriber(gaxClient); + messageStream = new MessageStream(subscriber); + }); + + afterEach(() => { + messageStream.destroy(); + sandbox.restore(); + }); + + describe('initialization', () => { + it('should create an object mode stream', () => { + const expectedOptions = { + objectMode: true, + highWaterMark: 0, + }; + + assert.deepStrictEqual(messageStream.options, expectedOptions); + }); + + it('should respect the highWaterMark option', () => { + const highWaterMark = 3; + const ms = new MessageStream(subscriber, {highWaterMark}); + + const expectedOptions = { + objectMode: true, + highWaterMark, + }; + + assert.deepStrictEqual(ms.options, expectedOptions); + }); + + it('should set destroyed to false', () => { + assert.strictEqual(messageStream.destroyed, false); + }); + + describe('options', () => { + describe('defaults', () => { + it('should default highWaterMark to 0', () => { + client.streams.forEach(stream => { + assert.strictEqual(stream._readableState.highWaterMark, 0); + }); + }); + + it('should default maxStreams to 5', () => { + assert.strictEqual(client.streams.length, 5); + }); + + it('should default timeout to 5 minutes', done => { + const timeout = 60000 * 5; + const now = Date.now(); + + sandbox.stub(global.Date, 'now').returns(now); + messageStream = new MessageStream(subscriber); + + setImmediate(() => { + assert.strictEqual(client.deadline, now + timeout); + done(); + }); + }); + }); + + describe('user options', () => { + beforeEach(() => { + messageStream.destroy(); + client.streams.length = 0; + delete client.deadline; + }); + + it('should respect the highWaterMark option', done => { + const highWaterMark = 3; + + messageStream = new MessageStream(subscriber, {highWaterMark}); + + setImmediate(() => { + assert.strictEqual(client.streams.length, 5); + client.streams.forEach(stream => { + assert.strictEqual( + stream._readableState.highWaterMark, highWaterMark); + }); + done(); + }); + }); + + it('should respect the maxStreams option', done => { + const maxStreams = 3; + + messageStream = new MessageStream(subscriber, {maxStreams}); + + setImmediate(() => { + assert.strictEqual(client.streams.length, maxStreams); + done(); + }); + }); + + it('should respect the timeout option', done => { + const timeout = 12345; + const now = Date.now(); + + sandbox.stub(global.Date, 'now').returns(now); + messageStream = new MessageStream(subscriber, {timeout}); + + setImmediate(() => { + assert.strictEqual(client.deadline, now + timeout); + done(); + }); + }); + }); + }); + }); + + describe('destroy', () => { + it('should noop if already destroyed', done => { + const stub = sandbox.stub(FakeDuplex.prototype, 'destroy') + .callsFake(function(this: Duplex) { + if (this === messageStream) { + done(); + } + }); + + messageStream.destroy(); + messageStream.destroy(); + }); + + it('should set destroyed to true', () => { + messageStream.destroy(); + assert.strictEqual(messageStream.destroyed, true); + }); + + it('should stop keeping the streams alive', () => { + const clock = sandbox.useFakeTimers(); + const frequency = 30000; + const stubs = client.streams.map(stream => { + return sandbox.stub(stream, 'write').throws(); + }); + + messageStream.destroy(); + clock.tick(frequency * 2); // for good measure + + stubs.forEach(stub => { + assert.strictEqual(stub.callCount, 0); + }); + }); + + it('should unpipe and cancel all underlying streams', () => { + const stubs = [ + ...client.streams.map(stream => { + return sandbox.stub(stream, 'unpipe').withArgs(messageStream); + }), + ...client.streams.map(stream => { + return sandbox.stub(stream, 'cancel'); + }), + ]; + + messageStream.destroy(); + + stubs.forEach(stub => { + assert.strictEqual(stub.callCount, 1); + }); + }); + + describe('without native destroy', () => { + let destroy; + + before(() => { + destroy = FakeDuplex.prototype.destroy; + // tslint:disable-next-line no-any + FakeDuplex.prototype.destroy = (false as any); + }); + + after(() => { + FakeDuplex.prototype.destroy = destroy; + }); + + it('should emit close', done => { + messageStream.on('close', done); + messageStream.destroy(); + }); + + it('should emit an error if present', done => { + const fakeError = new Error('err'); + + messageStream.on('error', err => { + assert.strictEqual(err, fakeError); + done(); + }); + + messageStream.destroy(fakeError); + }); + }); + }); + + describe('pull stream lifecycle', () => { + describe('initialization', () => { + it('should pipe to the message stream', done => { + const fakeResponses = [{}, {}, {}, {}, {}]; + const recieved: object[] = []; + + messageStream.on('data', chunk => recieved.push(chunk)) + .on('end', () => { + assert.deepStrictEqual(recieved, fakeResponses); + done(); + }); + + client.streams.forEach((stream, i) => stream.push(fakeResponses[i])); + setImmediate(() => messageStream.end()); + }); + + it('should not end the message stream', done => { + messageStream.on('data', () => {}).on('end', () => { + done(new Error('Should not be called.')); + }); + + client.streams.forEach(stream => stream.push(null)); + setImmediate(done); + }); + }); + + describe('on error', () => { + it('should destroy the stream if unable to get client', done => { + const fakeError = new Error('err'); + + sandbox.stub(subscriber, 'getClient').rejects(fakeError); + + const ms = new MessageStream(subscriber); + + ms.on('error', err => { + assert.strictEqual(err, fakeError); + assert.strictEqual(ms.destroyed, true); + done(); + }); + }); + + it('should destroy the stream if unable to verify channel', done => { + const stub = sandbox.stub(client, 'waitForReady'); + const ms = new MessageStream(subscriber); + const fakeError = new Error('err'); + + ms.on('error', err => { + assert.strictEqual(err, fakeError); + assert.strictEqual(ms.destroyed, true); + done(); + }); + + setImmediate(() => { + const [, callback] = stub.lastCall.args; + callback(fakeError); + }); + }); + + it('should emit non-status errors', done => { + const fakeError = new Error('err'); + + messageStream.on('error', err => { + assert.strictEqual(err, fakeError); + done(); + }); + + client.streams[0].emit('error', fakeError); + }); + + it('should ignore errors that come in after the status', done => { + const [stream] = client.streams; + + messageStream.on('error', done); + stream.emit('status', {code: 0}); + stream.emit('error', {code: 2}); + + setImmediate(done); + }); + }); + + describe('on status', () => { + it('should destroy the stream if the message stream is destroyed', + done => { + const [stream] = client.streams; + const stub = sandbox.stub(FakeDuplex.prototype, 'destroy') + .callsFake(function(this: Duplex) { + if (this === stream) { + done(); + } + }); + + messageStream.destroy(); + stream.emit('status', {}); + }); + + it('should wait for end to fire before creating a new stream', done => { + const [stream] = client.streams; + const expectedCount = stream.listenerCount('end') + 1; + + messageStream.on('error', done); + + stream.emit('status', {code: 2}); + assert.strictEqual(stream.listenerCount('end'), expectedCount); + + stream.push(null); + setImmediate(() => { + assert.strictEqual(client.streams.length, 6); + done(); + }); + }); + + it('should create a new stream if stream already ended', done => { + const [stream] = client.streams; + + messageStream.on('error', done); + stream.push(null); + + setImmediate(() => { + const count = stream.listenerCount('end'); + + stream.emit('status', {code: 2}); + assert.strictEqual(stream.listenerCount('end'), count); + + setImmediate(() => { + assert.strictEqual(client.streams.length, 6); + done(); + }); + }); + }); + + it('should destroy the msg stream if status is not retryable', done => { + const fakeStatus = { + code: 5, + details: 'Err', + }; + + messageStream.on('error', err => { + assert(err instanceof Error); + assert.strictEqual(err.code, fakeStatus.code); + assert.strictEqual(err.message, fakeStatus.details); + assert.strictEqual(messageStream.destroyed, true); + done(); + }); + + client.streams.forEach(stream => { + stream.emit('status', fakeStatus); + stream.push(null); + }); + }); + }); + + describe('keeping streams alive', () => { + let clock: sinon.SinonFakeTimers; + + before(() => { + clock = sandbox.useFakeTimers(); + }); + + it('should keep the streams alive', () => { + const frequency = 30000; + const stubs = client.streams.map(stream => { + return sandbox.stub(stream, 'write'); + }); + + clock.tick(frequency * 1.5); + + stubs.forEach(stub => { + const [data] = stub.lastCall.args; + assert.deepStrictEqual(data, {}); + }); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 93a250d2b0a..f25dc3a8c22 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -1,5 +1,5 @@ -/** - * Copyright 2018 Google Inc. All Rights Reserved. +/*! + * Copyright 2019 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,1497 +15,675 @@ */ import * as assert from 'assert'; -const delay = require('delay'); import {EventEmitter} from 'events'; -import * as is from 'is'; import * as proxyquire from 'proxyquire'; -import * as util from '../src/util'; -import * as pfy from '@google-cloud/promisify'; +import * as sinon from 'sinon'; +import {PassThrough} from 'stream'; +import * as uuid from 'uuid'; -const fakeUtil = Object.assign({}, util); +import {HistogramOptions} from '../src/histogram'; +import {FlowControlOptions} from '../src/lease-manager'; +import {BatchOptions} from '../src/message-queues'; +import {MessageStreamOptions} from '../src/message-stream'; +import * as s from '../src/subscriber'; -let promisifyOverride; -function fakePromisify() { - return (promisifyOverride || pfy.promisify).apply(null, arguments); +const stubs = new Map(); + +class FakeClient {} + +interface ClientOptions { + client: string; } -let promisified = false; -function fakePromisifyAll(klass) { - if (klass.name === 'Subscriber') { - promisified = true; +interface ClientCallback { + (error: null|Error, client: FakeClient): void; +} + +class FakePubSub { + client = new FakeClient(); + getClient_(options: ClientOptions, callback: ClientCallback): void { + callback(null, this.client); } } -const FAKE_FREE_MEM = 168222720; -const fakeOs = { - freemem() { - return FAKE_FREE_MEM; - }, -}; +class FakeSubscription { + name = uuid.v4(); + projectId = uuid.v4(); + pubsub = new FakePubSub(); +} -class FakeConnectionPool extends EventEmitter { - calledWith_: IArguments; - constructor() { - super(); - this.calledWith_ = arguments; +class FakeHistogram { + options?: HistogramOptions; + constructor(options?: HistogramOptions) { + this.options = options; + + const key = options ? 'histogram' : 'latencies'; + stubs.set(key, this); + } + add(seconds: number): void {} + percentile(percentile: number): number { + return 10; } } -class FakeHistogram { - calledWith_: IArguments; - constructor() { - this.calledWith_ = arguments; +class FakeLeaseManager extends EventEmitter { + options: FlowControlOptions; + constructor(sub: s.Subscriber, options: FlowControlOptions) { + super(); + this.options = options; + stubs.set('inventory', this); } + add(message: s.Message): void {} + clear(): void {} + remove(message: s.Message): void {} } -// tslint:disable-next-line no-any -let delayOverride: any = null; -function fakeDelay(timeout) { - return (delayOverride || delay)(timeout); +class FakeQueue { + options: BatchOptions; + numPendingRequests = 0; + maxMilliseconds = 100; + constructor(sub: s.Subscriber, options: BatchOptions) { + this.options = options; + } + add(message: s.Message, deadline?: number): void {} + async flush(): Promise {} + async onFlush(): Promise {} } -describe('Subscriber', () => { - // tslint:disable-next-line variable-name - let Subscriber; - let subscriber; +class FakeAckQueue extends FakeQueue { + constructor(sub: s.Subscriber, options: BatchOptions) { + super(sub, options); + stubs.set('ackQueue', this); + } +} - const SUB_NAME = 'fake-sub'; +class FakeModAckQueue extends FakeQueue { + constructor(sub: s.Subscriber, options: BatchOptions) { + super(sub, options); + stubs.set('modAckQueue', this); + } +} - before(() => { - Subscriber = proxyquire('../src/subscriber.js', { - '../src/util': fakeUtil, - '@google-cloud/promisify': { - promisify: fakePromisify, - promisifyAll: fakePromisifyAll, - }, - delay: fakeDelay, - os: fakeOs, - './connection-pool.js': {ConnectionPool: FakeConnectionPool}, - './histogram.js': {Histogram: FakeHistogram}, - }).Subscriber; - }); +class FakeMessageStream extends PassThrough { + options: MessageStreamOptions; + constructor(sub: s.Subscriber, options: MessageStreamOptions) { + super({objectMode: true}); + this.options = options; + stubs.set('messageStream', this); + } + destroy(error?: Error): void {} +} - beforeEach(() => { - subscriber = new Subscriber({}); - subscriber.name = SUB_NAME; - }); +const RECEIVED_MESSAGE = { + ackId: uuid.v4(), + message: { + attributes: {}, + data: Buffer.from('Hello, world!'), + messageId: uuid.v4(), + publishTime: {seconds: 12, nanos: 32} + } +}; - describe('initialization', () => { - it('should promisify all the things', () => { - assert(promisified); - }); +describe('Subscriber', () => { + const sandbox = sinon.createSandbox(); - it('should create a histogram instance', () => { - assert(subscriber.histogram instanceof FakeHistogram); - }); + const fakeProjectify = {replaceProjectIdToken: sandbox.stub()}; - it('should create a latency histogram', () => { - assert(subscriber.latency_ instanceof FakeHistogram); - }); + let subscription; - it('should honor configuration settings', () => { - const options = { - maxConnections: 2, - flowControl: { - maxBytes: 5, - maxMessages: 10, - }, - batching: { - maxMilliseconds: 10, - }, - }; - - const subscriber = new Subscriber(options); - - assert.strictEqual(subscriber.maxConnections, options.maxConnections); - - assert.deepStrictEqual(subscriber.flowControl, { - maxBytes: options.flowControl.maxBytes, - maxMessages: options.flowControl.maxMessages, - }); + // tslint:disable-next-line variable-name + let Message: typeof s.Message; + let message: s.Message; + // tslint:disable-next-line variable-name + let Subscriber: typeof s.Subscriber; + let subscriber: s.Subscriber; - assert.strictEqual(subscriber.batching.maxMilliseconds, 10); + before(() => { + const s = proxyquire('../src/subscriber.js', { + '@google-cloud/projectify': fakeProjectify, + './histogram': {Histogram: FakeHistogram}, + './lease-manager': {LeaseManager: FakeLeaseManager}, + './message-queues': + {AckQueue: FakeAckQueue, ModAckQueue: FakeModAckQueue}, + './message-stream': {MessageStream: FakeMessageStream}, }); - it('should set sensible defaults', () => { - assert.strictEqual(subscriber.ackDeadline, 10000); - assert.strictEqual(subscriber.maxConnections, 5); - assert.strictEqual(subscriber.userClosed_, false); - assert.strictEqual(subscriber.messageListeners, 0); - assert.strictEqual(subscriber.isOpen, false); - assert.strictEqual(subscriber.writeToStreams_, false); + Message = s.Message; + Subscriber = s.Subscriber; + }); - assert.deepStrictEqual(subscriber.flowControl, { - maxBytes: FAKE_FREE_MEM * 0.2, - maxMessages: 100, - }); + beforeEach(() => { + subscription = new FakeSubscription(); + subscriber = new Subscriber(subscription); + message = new Message(subscriber, RECEIVED_MESSAGE); + subscriber.open(); + }); - assert.strictEqual(subscriber.batching.maxMilliseconds, 100); - }); + afterEach(() => { + sandbox.restore(); + subscriber.close(); + }); - it('should create an inventory object', () => { - assert(is.object(subscriber.inventory_)); - assert(is.array(subscriber.inventory_.lease)); - assert(is.array(subscriber.inventory_.ack)); - assert(is.array(subscriber.inventory_.nack)); - assert.strictEqual(subscriber.inventory_.bytes, 0); + describe('initialization', () => { + it('should default ackDeadline to 10', () => { + assert.strictEqual(subscriber.ackDeadline, 10); }); - it('should inherit from EventEmitter', () => { - assert(subscriber instanceof EventEmitter); + it('should set isOpen to false', () => { + const s = new Subscriber(subscription); + assert.strictEqual(s.isOpen, false); }); - it('should listen for events', () => { - let called = false; - const listenForEvents = Subscriber.prototype.listenForEvents_; + it('should set any options passed in', () => { + const stub = sandbox.stub(Subscriber.prototype, 'setOptions'); + const fakeOptions = {}; + const sub = new Subscriber(subscription, fakeOptions); - Subscriber.prototype.listenForEvents_ = () => { - Subscriber.prototype.listenForEvents_ = listenForEvents; - called = true; - }; - - // tslint:disable-next-line no-unused-expression - new Subscriber({}); - assert(called); + const [options] = stub.lastCall.args; + assert.strictEqual(options, fakeOptions); }); }); - describe('ack_', () => { - const MESSAGE = { - ackId: 'abc', - received: 12345, - connectionId: 'def', - }; - - beforeEach(() => { - subscriber.breakLease_ = fakeUtil.noop; - subscriber.histogram.add = fakeUtil.noop; - subscriber.acknowledge_ = () => { - return Promise.resolve(); - }; - subscriber.setFlushTimeout_ = () => { - return Promise.resolve(); - }; - }); + describe('modAckLatency', () => { + it('should get the 99th percentile latency', () => { + const latencies: FakeHistogram = stubs.get('latencies'); + const fakeLatency = 234; - it('should add the time it took to ack to the histogram', done => { - const fakeNow = 12381832; - const now = global.Date.now; + sandbox.stub(latencies, 'percentile').withArgs(99).returns(fakeLatency); - global.Date.now = () => { - global.Date.now = now; - return fakeNow; - }; + const maxMilliseconds = stubs.get('modAckQueue').maxMilliseconds; + const expectedLatency = fakeLatency * 1000 + maxMilliseconds; - subscriber.histogram.add = time => { - assert.strictEqual(time, fakeNow - MESSAGE.received); - done(); - }; - - subscriber.ack_(MESSAGE); + assert.strictEqual(subscriber.modAckLatency, expectedLatency); }); + }); - describe('with connection', () => { - beforeEach(() => { - subscriber.isConnected_ = () => { - return true; - }; - - subscriber.writeToStreams_ = true; - }); - - it('should acknowledge if there is a connection', done => { - subscriber.acknowledge_ = (ackId, connectionId) => { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(connectionId, MESSAGE.connectionId); - setImmediate(done); - return Promise.resolve(); - }; - - subscriber.ack_(MESSAGE); - }); + describe('name', () => { + it('should replace the project id token', () => { + const fakeName = 'abcd'; - it('should break the lease on the message', done => { - subscriber.breakLease_ = message => { - assert.strictEqual(message, MESSAGE); - done(); - }; + fakeProjectify.replaceProjectIdToken + .withArgs(subscription.name, subscription.projectId) + .returns(fakeName); - subscriber.ack_(MESSAGE); - }); + const name = subscriber.name; + assert.strictEqual(name, fakeName); }); - describe('without connection', () => { - beforeEach(() => { - subscriber.isConnected_ = () => { - return false; - }; - }); - - it('should queue the message to be acked if no connection', done => { - subscriber.setFlushTimeout_ = () => { - assert(subscriber.inventory_.ack.indexOf(MESSAGE.ackId) > -1); - done(); - }; - - subscriber.ack_(MESSAGE); - }); + it('should cache the name', () => { + const fakeName = 'abcd'; + const stub = fakeProjectify.replaceProjectIdToken + .withArgs(subscription.name, subscription.projectId) + .returns(fakeName); - it('should break the lease on the message', done => { - subscriber.breakLease_ = message => { - assert.strictEqual(message, MESSAGE); - done(); - }; + const name = subscriber.name; + assert.strictEqual(name, fakeName); - subscriber.ack_(MESSAGE); - }); + const name2 = subscriber.name; + assert.strictEqual(name, name2); + assert.strictEqual(stub.callCount, 1); }); }); - describe('acknowledge_', () => { - const fakeAckIds = ['a', 'b', 'c']; - - const batchSize = 3000; - const tooManyFakeAckIds = - new Array(batchSize * 2.5).fill('a').map((x, i) => { - return x + i; - }); - const expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); - - describe('without streaming connection', () => { - beforeEach(() => { - subscriber.isConnected_ = () => { - return false; - }; - }); - - it('should make the correct request', done => { - const fakePromisified = { - call(context, config) { - assert.strictEqual(context, subscriber); - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'acknowledge'); - assert.strictEqual(config.reqOpts.subscription, subscriber.name); - assert.deepStrictEqual(config.reqOpts.ackIds, fakeAckIds); - - setImmediate(done); - - return Promise.resolve(); - }, - }; - - promisifyOverride = fn => { - assert.strictEqual(fn, subscriber.request); - return fakePromisified; - }; - - subscriber.on('error', done); - subscriber.acknowledge_(fakeAckIds); - }); - - it('should batch requests if there are too many ackIds', done => { - let receivedCalls = 0; - - const fakePromisified = { - call(context, config) { - const offset = receivedCalls * batchSize; - const expectedAckIds = - tooManyFakeAckIds.slice(offset, offset + batchSize); - - assert.deepStrictEqual(config.reqOpts.ackIds, expectedAckIds); - - receivedCalls += 1; - if (receivedCalls === expectedCalls) { - setImmediate(done); - } - - return Promise.resolve(); - }, - }; - - promisifyOverride = () => { - return fakePromisified; - }; - - subscriber.on('error', done); - subscriber.acknowledge_(tooManyFakeAckIds); - }); - - it('should emit any request errors', done => { - const fakeError = new Error('err'); - const fakePromisified = { - call() { - return Promise.reject(fakeError); - }, - }; - - promisifyOverride = () => { - return fakePromisified; - }; - - subscriber.on('error', err => { - assert.strictEqual(err, fakeError); - done(); - }); + describe('ack', () => { + it('should update the ack histogram/deadline', () => { + const histogram: FakeHistogram = stubs.get('histogram'); + const now = Date.now(); - subscriber.acknowledge_(fakeAckIds); - }); - }); - - describe('with streaming connection', () => { - beforeEach(() => { - subscriber.isConnected_ = () => { - return true; - }; - - subscriber.writeToStreams_ = true; - }); - - it('should send the correct request', done => { - const fakeConnectionId = 'abc'; - - subscriber.writeTo_ = (connectionId, data) => { - assert.strictEqual(connectionId, fakeConnectionId); - assert.deepStrictEqual(data, {ackIds: fakeAckIds}); - done(); - }; - - subscriber.acknowledge_(fakeAckIds, fakeConnectionId); - }); - - it('should batch requests if there are too many ackIds', done => { - let receivedCalls = 0; - const fakeConnectionId = 'abc'; + message.received = 23842328; + sandbox.stub(global.Date, 'now').returns(now); - subscriber.writeTo_ = (connectionId, data) => { - assert.strictEqual(connectionId, fakeConnectionId); + const expectedSeconds = (now - message.received) / 1000; + const addStub = sandbox.stub(histogram, 'add').withArgs(expectedSeconds); - const offset = receivedCalls * batchSize; - const expectedAckIds = - tooManyFakeAckIds.slice(offset, offset + batchSize); + const fakeDeadline = 312123; - assert.deepStrictEqual(data, {ackIds: expectedAckIds}); + sandbox.stub(histogram, 'percentile').withArgs(99).returns(fakeDeadline); - if (++receivedCalls === expectedCalls) { - done(); - } - }; + subscriber.ack(message); - subscriber.acknowledge_(tooManyFakeAckIds, fakeConnectionId); - }); - - it('should emit an error when unable to get a conn', done => { - const error = new Error('err'); - - subscriber.writeTo_ = () => { - return Promise.reject(error); - }; - - subscriber.on('error', err => { - assert.strictEqual(err, error); - done(); - }); - - subscriber.acknowledge_(fakeAckIds); - }); + assert.strictEqual(addStub.callCount, 1); + assert.strictEqual(subscriber.ackDeadline, fakeDeadline); }); - }); - describe('breakLease_', () => { - const MESSAGE = { - ackId: 'abc', - data: Buffer.from('hello'), - length: 5, - }; - - beforeEach(() => { - subscriber.inventory_.lease.push(MESSAGE.ackId); - subscriber.inventory_.bytes += MESSAGE.length; - }); + it('should not update the deadline if user specified', () => { + const histogram: FakeHistogram = stubs.get('histogram'); + const ackDeadline = 543; - it('should remove the message from the lease array', () => { - assert.strictEqual(subscriber.inventory_.lease.length, 1); - assert.strictEqual(subscriber.inventory_.bytes, MESSAGE.length); + sandbox.stub(histogram, 'add').throws(); + sandbox.stub(histogram, 'percentile').throws(); - subscriber.breakLease_(MESSAGE); + subscriber.setOptions({ackDeadline}); + subscriber.ack(message); - assert.strictEqual(subscriber.inventory_.lease.length, 0); - assert.strictEqual(subscriber.inventory_.bytes, 0); + assert.strictEqual(subscriber.ackDeadline, ackDeadline); }); - it('should noop for unknown messages', () => { - const message = { - ackId: 'def', - data: Buffer.from('world'), - length: 5, - }; + it('should add the message to the ack queue', () => { + const ackQueue: FakeAckQueue = stubs.get('ackQueue'); + const stub = sandbox.stub(ackQueue, 'add').withArgs(message); - subscriber.breakLease_(message); + subscriber.ack(message); - assert.strictEqual(subscriber.inventory_.lease.length, 1); - assert.strictEqual(subscriber.inventory_.bytes, 5); + assert.strictEqual(stub.callCount, 1); }); - describe('with connection pool', () => { - it('should resume receiving messages if paused', done => { - subscriber.connectionPool = { - isPaused: true, - resume: done, - }; + it('should remove the message from inv. after queue flushes', done => { + const ackQueue: FakeAckQueue = stubs.get('ackQueue'); + const inventory: FakeLeaseManager = stubs.get('inventory'); - subscriber.hasMaxMessages_ = () => { - return false; - }; + const onFlushStub = sandbox.stub(ackQueue, 'onFlush').resolves(); - subscriber.breakLease_(MESSAGE); - }); - - it('should not resume if it is not paused', () => { - subscriber.connectionPool = { - isPaused: false, - resume() { - throw new Error('Should not be called.'); - }, - }; - - subscriber.hasMaxMessages_ = () => { - return false; - }; - - subscriber.breakLease_(MESSAGE); - }); - - it('should not resume if the max message limit is hit', () => { - subscriber.connectionPool = { - isPaused: true, - resume() { - throw new Error('Should not be called.'); - }, - }; - - subscriber.hasMaxMessages_ = () => { - return true; - }; - - subscriber.breakLease_(MESSAGE); + sandbox.stub(inventory, 'remove').withArgs(message).callsFake(() => { + assert.strictEqual(onFlushStub.callCount, 1); + done(); }); - }); - it('should quit auto-leasing if all leases are gone', done => { - subscriber.leaseTimeoutHandle_ = setTimeout(done, 1); - subscriber.breakLease_(MESSAGE); - - assert.strictEqual(subscriber.leaseTimeoutHandle_, null); - setImmediate(done); - }); - - it('should continue to auto-lease if leases exist', done => { - subscriber.inventory_.lease.push(MESSAGE.ackId); - subscriber.inventory_.lease.push('abcd'); - - subscriber.leaseTimeoutHandle_ = setTimeout(done, 1); - subscriber.breakLease_(MESSAGE); + subscriber.ack(message); }); }); describe('close', () => { - beforeEach(() => { - subscriber.flushQueues_ = () => { - return Promise.resolve(); - }; - - subscriber.closeConnection_ = fakeUtil.noop; - }); + it('should noop if not open', () => { + const s = new Subscriber(subscription); + const stream: FakeMessageStream = stubs.get('messageStream'); - it('should set the userClosed_ flag', () => { - subscriber.close(); + sandbox.stub(stream, 'destroy') + .rejects(new Error('should not be called.')); - assert.strictEqual(subscriber.userClosed_, true); + return s.close(); }); - it('should dump the inventory', () => { - subscriber.inventory_ = { - lease: [0, 1, 2], - bytes: 123, - }; - - subscriber.close(); - - assert.deepStrictEqual(subscriber.inventory_, { - lease: [], - bytes: 0, - }); - }); - - it('should stop auto-leasing', done => { - subscriber.leaseTimeoutHandle_ = setTimeout(done, 1); + it('should set isOpen to false', () => { subscriber.close(); - - assert.strictEqual(subscriber.leaseTimeoutHandle_, null); - setImmediate(done); + assert.strictEqual(subscriber.isOpen, false); }); - it('should flush immediately', done => { - subscriber.flushQueues_ = () => { - setImmediate(done); - return Promise.resolve(); - }; + it('should destroy the message stream', () => { + const stream: FakeMessageStream = stubs.get('messageStream'); + const stub = sandbox.stub(stream, 'destroy'); subscriber.close(); + assert.strictEqual(stub.callCount, 1); }); - it('should call closeConnection_', done => { - subscriber.closeConnection_ = callback => { - callback(); // the done fn - }; - - subscriber.close(done); - }); - }); - - describe('closeConnection_', () => { - afterEach(() => { - fakeUtil.noop = () => {}; - }); - - it('should set isOpen to false', () => { - subscriber.closeConnection_(); - assert.strictEqual(subscriber.isOpen, false); - }); - - describe('with connection pool', () => { - beforeEach(() => { - subscriber.connectionPool = { - close(callback) { - setImmediate(callback); // the done fn - }, - }; - }); + it('should clear the inventory', () => { + const inventory: FakeLeaseManager = stubs.get('inventory'); + const stub = sandbox.stub(inventory, 'clear'); - it('should call close on the connection pool', done => { - subscriber.closeConnection_(done); - assert.strictEqual(subscriber.connectionPool, null); - }); - - it('should use a noop when callback is absent', done => { - fakeUtil.noop = done; - subscriber.closeConnection_(); - assert.strictEqual(subscriber.connectionPool, null); - }); + subscriber.close(); + assert.strictEqual(stub.callCount, 1); }); - describe('without connection pool', () => { - beforeEach(() => { - subscriber.connectionPool = null; - }); + describe('flushing the queues', () => { + it('should wait for any pending acks', async () => { + const ackQueue: FakeAckQueue = stubs.get('ackQueue'); + const ackOnFlush = sandbox.stub(ackQueue, 'onFlush').resolves(); + const acksFlush = sandbox.stub(ackQueue, 'flush').resolves(); - it('should exec the callback if one is passed in', done => { - subscriber.closeConnection_(done); - }); + ackQueue.numPendingRequests = 1; + await subscriber.close(); - it('should optionally accept a callback', () => { - subscriber.closeConnection_(); + assert.strictEqual(ackOnFlush.callCount, 1); + assert.strictEqual(acksFlush.callCount, 1); }); - }); - }); - describe('flushQueues_', () => { - it('should cancel any pending flushes', () => { - let canceled = false; - const fakeHandle = { - clear() { - canceled = true; - }, - }; + it('should wait for any pending modAcks', async () => { + const modAckQueue: FakeModAckQueue = stubs.get('modAckQueue'); + const modAckOnFlush = sandbox.stub(modAckQueue, 'onFlush').resolves(); + const modAckFlush = sandbox.stub(modAckQueue, 'flush').resolves(); - subscriber.flushTimeoutHandle_ = fakeHandle; - subscriber.flushQueues_(); - - assert.strictEqual(subscriber.flushTimeoutHandle_, null); - assert.strictEqual(canceled, true); - }); - - it('should do nothing if theres nothing to ack/nack', () => { - subscriber.acknowledge_ = subscriber.modifyAckDeadline_ = () => { - throw new Error('Should not be called.'); - }; - - return subscriber.flushQueues_(); - }); + modAckQueue.numPendingRequests = 1; + await subscriber.close(); - it('should send any pending acks', () => { - const fakeAckIds = (subscriber.inventory_.ack = ['abc', 'def']); - - subscriber.acknowledge_ = ackIds => { - assert.strictEqual(ackIds, fakeAckIds); - return Promise.resolve(); - }; - - return subscriber.flushQueues_().then(() => { - assert.strictEqual(subscriber.inventory_.ack.length, 0); + assert.strictEqual(modAckOnFlush.callCount, 1); + assert.strictEqual(modAckFlush.callCount, 1); }); - }); - it('should send any pending nacks', () => { - const fakeAckIds = ['ghi', 'jkl']; + it('should resolve if no messages are pending', () => { + const ackQueue: FakeAckQueue = stubs.get('ackQueue'); - subscriber.inventory_.nack = fakeAckIds.map(ackId => [ackId, 0]); + sandbox.stub(ackQueue, 'flush').rejects(); + sandbox.stub(ackQueue, 'onFlush').rejects(); - subscriber.modifyAckDeadline_ = (ackIds, deadline) => { - assert.deepStrictEqual(ackIds, fakeAckIds); - assert.strictEqual(deadline, 0); - return Promise.resolve(); - }; + const modAckQueue: FakeModAckQueue = stubs.get('modAckQueue'); - return subscriber.flushQueues_().then(() => { - assert.strictEqual(subscriber.inventory_.nack.length, 0); - }); - }); + sandbox.stub(modAckQueue, 'flush').rejects(); + sandbox.stub(modAckQueue, 'onFlush').rejects(); - it('should send any pending delayed nacks', () => { - const fakeAckIds = ['ghi', 'jkl']; - - subscriber.inventory_.nack = fakeAckIds.map(ackId => [ackId, 1]); - - subscriber.modifyAckDeadline_ = (ackIds, deadline) => { - assert.deepStrictEqual(ackIds, fakeAckIds); - assert.strictEqual(deadline, 1); - return Promise.resolve(); - }; - - return subscriber.flushQueues_().then(() => { - assert.strictEqual(subscriber.inventory_.nack.length, 0); + return subscriber.close(); }); }); }); - describe('isConnected_', () => { - it('should return false if there is no pool', () => { - subscriber.connectionPool = null; - assert.strictEqual(subscriber.isConnected_(), false); - }); - - it('should return false if the pool says its connected', () => { - subscriber.connectionPool = { - isConnected() { - return false; - }, - }; + describe('getClient', () => { + it('should get a subscriber client', async () => { + const pubsub = subscription.pubsub; + const spy = sandbox.spy(pubsub, 'getClient_'); + const client = await subscriber.getClient(); - assert.strictEqual(subscriber.isConnected_(), false); - }); - - it('should return true if the pool says its connected', () => { - subscriber.connectionPool = { - isConnected() { - return true; - }, - }; - - assert.strictEqual(subscriber.isConnected_(), true); + const [options] = spy.lastCall.args; + assert.deepStrictEqual(options, {client: 'SubscriberClient'}); + assert.strictEqual(client, pubsub.client); }); }); - describe('hasMaxMessages_', () => { - it('should return true if the number of leases >= maxMessages', () => { - subscriber.inventory_.lease = ['a', 'b', 'c']; - subscriber.flowControl.maxMessages = 3; - - assert(subscriber.hasMaxMessages_()); - }); - - it('should return true if bytes == maxBytes', () => { - subscriber.inventory_.bytes = 1000; - subscriber.flowControl.maxBytes = 1000; + describe('modAck', () => { + const deadline = 600; - assert(subscriber.hasMaxMessages_()); - }); + it('should add the message/deadline to the modAck queue', () => { + const modAckQueue: FakeModAckQueue = stubs.get('modAckQueue'); + const stub = sandbox.stub(modAckQueue, 'add').withArgs(message, deadline); - it('should return false if neither condition is met', () => { - subscriber.inventory_.lease = ['a', 'b']; - subscriber.flowControl.maxMessages = 3; + subscriber.modAck(message, deadline); - subscriber.inventory_.bytes = 900; - subscriber.flowControl.maxBytes = 1000; - - assert.strictEqual(subscriber.hasMaxMessages_(), false); + assert.strictEqual(stub.callCount, 1); }); - }); - describe('leaseMessage_', () => { - const MESSAGE = { - ackId: 'abc', - connectionId: 'def', - data: Buffer.from('hello'), - length: 5, - }; - - beforeEach(() => { - subscriber.setLeaseTimeout_ = fakeUtil.noop; - subscriber.modifyAckDeadline_ = fakeUtil.noop; - }); + it('should capture latency after queue flush', async () => { + const modAckQueue: FakeModAckQueue = stubs.get('modAckQueue'); + const latencies: FakeHistogram = stubs.get('latencies'); - it('should immediately modAck the message', done => { - subscriber.modifyAckDeadline_ = (ackId, deadline, connId) => { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(deadline, subscriber.ackDeadline / 1000); - assert.strictEqual(connId, MESSAGE.connectionId); - done(); - }; + const start = 1232123; + const end = 34838243; + const expectedSeconds = (end - start) / 1000; - subscriber.leaseMessage_(MESSAGE); - }); + const dateStub = sandbox.stub(global.Date, 'now'); - it('should add the ackId to the inventory', () => { - subscriber.leaseMessage_(MESSAGE); - assert.deepStrictEqual(subscriber.inventory_.lease, [MESSAGE.ackId]); - }); + dateStub.onCall(0).returns(start); + dateStub.onCall(1).returns(end); - it('should update the byte count', () => { - assert.strictEqual(subscriber.inventory_.bytes, 0); - subscriber.leaseMessage_(MESSAGE); - assert.strictEqual(subscriber.inventory_.bytes, MESSAGE.length); - }); + sandbox.stub(modAckQueue, 'onFlush').resolves(); + const addStub = sandbox.stub(latencies, 'add').withArgs(expectedSeconds); - it('should begin auto-leasing', done => { - subscriber.setLeaseTimeout_ = done; - subscriber.leaseMessage_(MESSAGE); - }); + await subscriber.modAck(message, deadline); - it('should return the message', () => { - const message = subscriber.leaseMessage_(MESSAGE); - assert.strictEqual(message, MESSAGE); + assert.strictEqual(addStub.callCount, 1); }); }); - describe('listenForEvents_', () => { - beforeEach(() => { - subscriber.openConnection_ = fakeUtil.noop; - subscriber.closeConnection_ = fakeUtil.noop; - }); - - describe('on new listener', () => { - it('should increment messageListeners', () => { - assert.strictEqual(subscriber.messageListeners, 0); - subscriber.on('message', fakeUtil.noop); - assert.strictEqual(subscriber.messageListeners, 1); - }); - - it('should ignore non-message events', () => { - subscriber.on('data', fakeUtil.noop); - assert.strictEqual(subscriber.messageListeners, 0); - }); - - it('should open a connection', done => { - subscriber.openConnection_ = done; - subscriber.on('message', fakeUtil.noop); - }); - - it('should set the userClosed_ flag to false', () => { - subscriber.userClosed_ = true; - subscriber.on('message', fakeUtil.noop); - assert.strictEqual(subscriber.userClosed_, false); - }); + describe('nack', () => { + it('should modAck the message with a 0 deadline', async () => { + const stub = sandbox.stub(subscriber, 'modAck'); - it('should not open a connection when one exists', () => { - subscriber.connectionPool = {}; + await subscriber.nack(message); - subscriber.openConnection_ = () => { - throw new Error('Should not be called.'); - }; + const [msg, deadline] = stub.lastCall.args; - subscriber.on('message', fakeUtil.noop); - }); + assert.strictEqual(msg, message); + assert.strictEqual(deadline, 0); }); - describe('on remove listener', () => { - const noop = () => {}; - - it('should decrement messageListeners', () => { - subscriber.on('message', fakeUtil.noop); - subscriber.on('message', noop); - assert.strictEqual(subscriber.messageListeners, 2); - - subscriber.removeListener('message', noop); - assert.strictEqual(subscriber.messageListeners, 1); - }); - - it('should ignore non-message events', () => { - subscriber.on('message', fakeUtil.noop); - subscriber.on('message', noop); - assert.strictEqual(subscriber.messageListeners, 2); + it('should remove the message from the inventory', async () => { + const inventory: FakeLeaseManager = stubs.get('inventory'); + const stub = sandbox.stub(inventory, 'remove').withArgs(message); - subscriber.removeListener('data', noop); - assert.strictEqual(subscriber.messageListeners, 2); - }); - - it('should close the connection when no listeners', done => { - subscriber.closeConnection_ = done; + await subscriber.nack(message); - subscriber.on('message', noop); - subscriber.removeListener('message', noop); - }); + assert.strictEqual(stub.callCount, 1); }); }); - describe('modifyAckDeadline_', () => { - const fakeAckIds = ['a', 'b', 'c']; - const fakeDeadline = 123; - - const batchSize = 3000; - const tooManyFakeAckIds = - new Array(batchSize * 2.5).fill('a').map((x, i) => { - return x + i; - }); - const expectedCalls = Math.ceil(tooManyFakeAckIds.length / batchSize); - - describe('without streaming connection', () => { - beforeEach(() => { - subscriber.isConnected_ = () => { - return false; - }; - }); - - it('should make the correct request', done => { - const fakePromisified = { - call(context, config) { - assert.strictEqual(context, subscriber); - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'modifyAckDeadline'); - assert.strictEqual(config.reqOpts.subscription, subscriber.name); - assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); - assert.deepStrictEqual(config.reqOpts.ackIds, fakeAckIds); - - setImmediate(done); - - return Promise.resolve(); - }, - }; - - promisifyOverride = fn => { - assert.strictEqual(fn, subscriber.request); - return fakePromisified; - }; - - subscriber.on('error', done); - subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline); - }); - - it('should batch requests if there are too many ackIds', done => { - let receivedCalls = 0; - - const fakePromisified = { - call(context, config) { - const offset = receivedCalls * batchSize; - const expectedAckIds = - tooManyFakeAckIds.slice(offset, offset + batchSize); + describe('open', () => { + beforeEach(() => subscriber.close()); - assert.strictEqual(config.reqOpts.ackDeadlineSeconds, fakeDeadline); - assert.deepStrictEqual(config.reqOpts.ackIds, expectedAckIds); + it('should pass in batching options', () => { + const batching = {maxMessages: 100}; - receivedCalls += 1; - if (receivedCalls === expectedCalls) { - setImmediate(done); - } + subscriber.setOptions({batching}); + subscriber.open(); - return Promise.resolve(); - }, - }; + const ackQueue: FakeAckQueue = stubs.get('ackQueue'); + const modAckQueue: FakeAckQueue = stubs.get('modAckQueue'); - promisifyOverride = () => { - return fakePromisified; - }; - - subscriber.on('error', done); - subscriber.modifyAckDeadline_(tooManyFakeAckIds, fakeDeadline); - }); - - it('should emit any request errors', done => { - const fakeError = new Error('err'); - const fakePromisified = { - call() { - return Promise.reject(fakeError); - }, - }; - - promisifyOverride = () => { - return fakePromisified; - }; - - subscriber.on('error', err => { - assert.strictEqual(err, fakeError); - done(); - }); - - subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline); - }); + assert.strictEqual(ackQueue.options, batching); + assert.strictEqual(modAckQueue.options, batching); }); - describe('with streaming connection', () => { - beforeEach(() => { - subscriber.isConnected_ = () => { - return true; - }; - - subscriber.writeToStreams_ = true; - }); - - it('should send the correct request', done => { - const expectedDeadlines = - new Array(fakeAckIds.length).fill(fakeDeadline); - const fakeConnId = 'abc'; - - subscriber.writeTo_ = (connectionId, data) => { - assert.strictEqual(connectionId, fakeConnId); - assert.deepStrictEqual(data.modifyDeadlineAckIds, fakeAckIds); - assert.deepStrictEqual(data.modifyDeadlineSeconds, expectedDeadlines); - done(); - }; - - subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline, fakeConnId); - }); - - it('should batch requests if there are too many ackIds', done => { - let receivedCalls = 0; - const fakeConnId = 'abc'; - - subscriber.writeTo_ = (connectionId, data) => { - assert.strictEqual(connectionId, fakeConnId); - - const offset = receivedCalls * batchSize; - const expectedAckIds = - tooManyFakeAckIds.slice(offset, offset + batchSize); - const expectedDeadlines = - new Array(expectedAckIds.length).fill(fakeDeadline); - - assert.deepStrictEqual(data.modifyDeadlineAckIds, expectedAckIds); - assert.deepStrictEqual(data.modifyDeadlineSeconds, expectedDeadlines); + it('should pass in flow control options', () => { + const flowControl = {maxMessages: 100}; - if (++receivedCalls === expectedCalls) { - done(); - } - }; + subscriber.setOptions({flowControl}); + subscriber.open(); - subscriber.modifyAckDeadline_( - tooManyFakeAckIds, fakeDeadline, fakeConnId); - }); - - it('should emit an error when unable to get a conn', done => { - const error = new Error('err'); - - subscriber.writeTo_ = () => { - return Promise.reject(error); - }; + const inventory: FakeLeaseManager = stubs.get('inventory'); - subscriber.on('error', err => { - assert.strictEqual(err, error); - done(); - }); - - subscriber.modifyAckDeadline_(fakeAckIds, fakeDeadline); - }); + assert.strictEqual(inventory.options, flowControl); }); - }); - - describe('nack_', () => { - const MESSAGE = { - ackId: 'abc', - connectionId: 'def', - }; - - beforeEach(() => { - subscriber.breakLease_ = fakeUtil.noop; - subscriber.modifyAckDeadline_ = () => { - return Promise.resolve(); - }; - subscriber.setFlushTimeout_ = () => { - return Promise.resolve(); - }; - }); - - describe('with connection', () => { - beforeEach(() => { - subscriber.isConnected_ = () => { - return true; - }; - - subscriber.writeToStreams_ = true; - }); - - it('should nack if there is a connection', done => { - subscriber.modifyAckDeadline_ = (ackId, deadline, connId) => { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(deadline, 0); - assert.strictEqual(connId, MESSAGE.connectionId); - setImmediate(done); - return Promise.resolve(); - }; - - subscriber.nack_(MESSAGE); - }); - - it('should break the lease on the message', done => { - subscriber.breakLease_ = message => { - assert.strictEqual(message, MESSAGE); - done(); - }; - - subscriber.nack_(MESSAGE); - }); - - it('should use the delay if passed', done => { - subscriber.modifyAckDeadline_ = (ackId, deadline, connId) => { - assert.strictEqual(ackId, MESSAGE.ackId); - assert.strictEqual(deadline, 1); - assert.strictEqual(connId, MESSAGE.connectionId); - setImmediate(done); - return Promise.resolve(); - }; - - subscriber.nack_(MESSAGE, 1); - }); - }); - - describe('without connection', () => { - beforeEach(() => { - subscriber.isConnected_ = () => { - return false; - }; - }); - - it('should queue the message to be nacked if no conn', done => { - subscriber.setFlushTimeout_ = () => { - assert.deepStrictEqual( - subscriber.inventory_.nack, [[MESSAGE.ackId, 0]]); - setImmediate(done); - return Promise.resolve(); - }; - subscriber.nack_(MESSAGE); - }); - - it('should break the lease on the message', done => { - subscriber.breakLease_ = message => { - assert.strictEqual(message, MESSAGE); - done(); - }; + it('should pass in streaming options', () => { + const streamingOptions = {maxStreams: 3}; - subscriber.nack_(MESSAGE); - }); + subscriber.setOptions({streamingOptions}); + subscriber.open(); - it('should use the delay if passed when queueing', done => { - subscriber.setFlushTimeout_ = () => { - assert(subscriber.inventory_.nack.findIndex(element => { - return element[0] === MESSAGE.ackId && element[1] === 1; - }) > -1); - setImmediate(done); - return Promise.resolve(); - }; + const stream: FakeMessageStream = stubs.get('messageStream'); - subscriber.nack_(MESSAGE, 1); - }); + assert.strictEqual(stream.options, streamingOptions); }); - }); - describe('openConnection_', () => { - it('should create a ConnectionPool instance', () => { - subscriber.openConnection_(); - assert(subscriber.connectionPool instanceof FakeConnectionPool); + it('should emit stream errors', done => { + subscriber.open(); - const args = subscriber.connectionPool.calledWith_; - assert.strictEqual(args[0], subscriber); - }); - - it('should emit pool errors', done => { - const error = new Error('err'); + const stream: FakeMessageStream = stubs.get('messageStream'); + const fakeError = new Error('err'); subscriber.on('error', err => { - assert.strictEqual(err, error); + assert.strictEqual(err, fakeError); done(); }); - subscriber.openConnection_(); - subscriber.connectionPool.emit('error', error); + stream.emit('error', fakeError); }); - it('should set isOpen to true', () => { - subscriber.openConnection_(); - assert.strictEqual(subscriber.isOpen, true); - }); + it('should add messages to the inventory', done => { + subscriber.open(); - it('should lease & emit messages from pool', done => { - const message = {}; - const leasedMessage = {}; + const modAckStub = sandbox.stub(subscriber, 'modAck'); - subscriber.leaseMessage_ = message_ => { - assert.strictEqual(message_, message); - return leasedMessage; - }; + const stream: FakeMessageStream = stubs.get('messageStream'); + const pullResponse = {receivedMessages: [RECEIVED_MESSAGE]}; + + const inventory: FakeLeaseManager = stubs.get('inventory'); + const addStub = sandbox.stub(inventory, 'add').callsFake(() => { + const [addMsg] = addStub.lastCall.args; + assert.deepStrictEqual(addMsg, message); + + // test for receipt + const [modAckMsg, deadline] = modAckStub.lastCall.args; + assert.strictEqual(addMsg, modAckMsg); + assert.strictEqual(deadline, subscriber.ackDeadline); - subscriber.on('message', message => { - assert.strictEqual(message, leasedMessage); done(); }); - subscriber.openConnection_(); - subscriber.connectionPool.emit('message', message); + sandbox.stub(global.Date, 'now').returns(message.received); + stream.emit('data', pullResponse); }); - it('should pause the pool if sub is at max messages', done => { - const message = {nack: fakeUtil.noop}; - const leasedMessage = {}; + it('should pause the stream when full', () => { + const inventory: FakeLeaseManager = stubs.get('inventory'); + const stream: FakeMessageStream = stubs.get('messageStream'); - subscriber.leaseMessage_ = () => { - return leasedMessage; - }; + const pauseStub = sandbox.stub(stream, 'pause'); - subscriber.hasMaxMessages_ = () => { - return true; - }; + inventory.emit('full'); - subscriber.openConnection_(); - subscriber.connectionPool.isPaused = false; - subscriber.connectionPool.pause = done; - subscriber.connectionPool.emit('message', message); + assert.strictEqual(pauseStub.callCount, 1); }); - it('should not re-pause the pool', done => { - const message = {nack: fakeUtil.noop}; - const leasedMessage = {}; - - subscriber.leaseMessage_ = () => { - return leasedMessage; - }; + it('should resume the stream when not full', () => { + const inventory: FakeLeaseManager = stubs.get('inventory'); + const stream: FakeMessageStream = stubs.get('messageStream'); - subscriber.hasMaxMessages_ = () => { - return true; - }; + const resumeStub = sandbox.stub(stream, 'resume'); - subscriber.openConnection_(); - subscriber.connectionPool.isPaused = true; + inventory.emit('free'); - subscriber.connectionPool.pause = () => { - done(new Error('Should not have been called.')); - }; - - subscriber.connectionPool.emit('message', message); - done(); + assert.strictEqual(resumeStub.callCount, 1); }); - it('should flush the queue when connected', done => { - subscriber.flushQueues_ = done; - - subscriber.openConnection_(); - subscriber.connectionPool.emit('connected'); + it('should set isOpen to false', () => { + subscriber.open(); + assert.strictEqual(subscriber.isOpen, true); }); }); - describe('renewLeases_', () => { - beforeEach(() => { - subscriber.modifyAckDeadline_ = () => { - return Promise.resolve(); - }; - }); - - const fakeDeadline = 9999; - const fakeAckIds = ['abc', 'def']; - - beforeEach(() => { - subscriber.inventory_.lease = fakeAckIds; - subscriber.setLeaseTimeout_ = fakeUtil.noop; + describe('setOptions', () => { + beforeEach(() => subscriber.close()); - subscriber.histogram.percentile = () => { - return fakeDeadline; - }; - }); - - it('should clean up the old timeout handle', () => { - const fakeHandle = 123; - let clearTimeoutCalled = false; - const _clearTimeout = global.clearTimeout; - - global.clearTimeout = handle => { - assert.strictEqual(handle, fakeHandle); - clearTimeoutCalled = true; - }; - - subscriber.leaseTimeoutHandle_ = fakeHandle; - subscriber.renewLeases_(); - - assert.strictEqual(subscriber.leaseTimeoutHandle_, null); - assert.strictEqual(clearTimeoutCalled, true); - - global.clearTimeout = _clearTimeout; - }); - - it('should update the ackDeadline', () => { - subscriber.request = subscriber.setLeaseTimeout_ = fakeUtil.noop; - - subscriber.histogram.percentile = percent => { - assert.strictEqual(percent, 99); - return fakeDeadline; - }; - - subscriber.renewLeases_(); - assert.strictEqual(subscriber.ackDeadline, fakeDeadline); - }); - - it('should set the auto-lease timeout', done => { - subscriber.request = fakeUtil.noop; - subscriber.setLeaseTimeout_ = done; - subscriber.renewLeases_(); - }); - - it('should not renew leases if inventory is empty', () => { - subscriber.modifyAckDeadline_ = () => { - throw new Error('Should not have been called.'); - }; + it('should capture the ackDeadline', () => { + const ackDeadline = 1232; - subscriber.inventory_.lease = []; - subscriber.renewLeases_(); + subscriber.setOptions({ackDeadline}); + assert.strictEqual(subscriber.ackDeadline, ackDeadline); }); - it('should modAck the leased messages', done => { - subscriber.modifyAckDeadline_ = (ackIds, deadline) => { - assert.deepStrictEqual(ackIds, fakeAckIds); - assert.strictEqual(deadline, subscriber.ackDeadline / 1000); + it('should not set maxStreams higher than maxMessages', () => { + const maxMessages = 3; + const flowControl = {maxMessages}; - setImmediate(done); + subscriber.setOptions({flowControl}); + subscriber.open(); - return Promise.resolve(); - }; + const stream: FakeMessageStream = stubs.get('messageStream'); - subscriber.renewLeases_(); - }); - - it('should re-set the lease timeout', done => { - subscriber.setLeaseTimeout_ = done; - subscriber.renewLeases_(); + assert.strictEqual(stream.options.maxStreams, maxMessages); }); }); - describe('setFlushTimeout_', () => { - const FLUSH_TIMEOUT = 100; - - beforeEach(() => { - subscriber.batching.maxMilliseconds = FLUSH_TIMEOUT; - }); - - it('should set a flush timeout', done => { - let flushed = false; - - subscriber.flushQueues_ = () => { - flushed = true; - }; - - const delayPromise = delay(0); - const fakeBoundDelay = () => {}; - - delayPromise.clear.bind = context => { - assert.strictEqual(context, delayPromise); - return fakeBoundDelay; - }; - - delayOverride = timeout => { - assert.strictEqual(timeout, FLUSH_TIMEOUT); - return delayPromise; - }; + describe('Message', () => { + describe('initialization', () => { + it('should localize ackId', () => { + assert.strictEqual(message.ackId, RECEIVED_MESSAGE.ackId); + }); - const promise = subscriber.setFlushTimeout_(); + it('should localize attributes', () => { + assert.strictEqual( + message.attributes, RECEIVED_MESSAGE.message.attributes); + }); - promise.then(() => { - assert.strictEqual(subscriber.flushTimeoutHandle_, promise); - assert.strictEqual(promise.clear, fakeBoundDelay); - assert.strictEqual(flushed, true); - done(); + it('should localize data', () => { + assert.strictEqual(message.data, RECEIVED_MESSAGE.message.data); }); - }); - it('should swallow cancel errors', () => { - const promise = subscriber.setFlushTimeout_(); - promise.clear(); - return promise; - }); + it('should localize id', () => { + assert.strictEqual(message.id, RECEIVED_MESSAGE.message.messageId); + }); - it('should return the cached timeout', () => { - const fakeHandle = {}; + it('should localize publishTime', () => { + const fakeDate = new Date(); - subscriber.flushTimeoutHandle_ = fakeHandle; + sandbox.stub(Message, 'formatTimestamp') + .withArgs(RECEIVED_MESSAGE.message.publishTime) + .returns(fakeDate); - const promise = subscriber.setFlushTimeout_(); - assert.strictEqual(fakeHandle, promise); - }); - }); + const m = new Message(subscriber, RECEIVED_MESSAGE); - describe('setLeaseTimeout_', () => { - const fakeTimeoutHandle = 1234; - const fakeRandom = 2; + assert.strictEqual(m.publishTime, fakeDate); + }); - let globalSetTimeout; - let globalMathRandom; + it('should localize recieved time', () => { + const now = Date.now(); - before(() => { - globalSetTimeout = global.setTimeout; - globalMathRandom = global.Math.random; - }); + sandbox.stub(global.Date, 'now').returns(now); - beforeEach(() => { - subscriber.isOpen = true; - subscriber.latency_ = { - percentile() { - return 0; - }, - }; - }); + const m = new Message(subscriber, RECEIVED_MESSAGE); - after(() => { - global.setTimeout = globalSetTimeout; - global.Math.random = globalMathRandom; + assert.strictEqual(m.received, now); + }); }); - it('should set a timeout to call renewLeases_', done => { - const ackDeadline = (subscriber.ackDeadline = 1000); - - global.Math.random = () => { - return fakeRandom; - }; + describe('length', () => { + it('should return the data length', () => { + assert.strictEqual(message.length, message.data.length); + }); - // tslint:disable-next-line no-any - (global as any).setTimeout = (callback, duration) => { - assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9); - setImmediate(callback); // the done fn - return fakeTimeoutHandle; - }; + it('should preserve the original data lenght', () => { + const originalLength = message.data.length; - subscriber.renewLeases_ = done; - subscriber.setLeaseTimeout_(); - assert.strictEqual(subscriber.leaseTimeoutHandle_, fakeTimeoutHandle); + message.data = Buffer.from('ohno'); + assert.notStrictEqual(message.length, message.data.length); + assert.strictEqual(message.length, originalLength); + }); }); - it('should subtract the estimated latency', done => { - const latency = 1; + describe('ack', () => { + it('should ack the message', () => { + const stub = sandbox.stub(subscriber, 'ack'); - subscriber.latency_.percentile = percentile => { - assert.strictEqual(percentile, 99); - return latency; - }; + message.ack(); - const ackDeadline = (subscriber.ackDeadline = 1000); + const [msg] = stub.lastCall.args; + assert.strictEqual(msg, message); + }); - global.Math.random = () => { - return fakeRandom; - }; + it('should not ack the message if its been handled', () => { + const stub = sandbox.stub(subscriber, 'ack'); - // tslint:disable-next-line no-any - (global as any).setTimeout = (callback, duration) => { - assert.strictEqual(duration, fakeRandom * ackDeadline * 0.9 - latency); - done(); - }; + message.nack(); + message.ack(); - subscriber.setLeaseTimeout_(); + assert.strictEqual(stub.callCount, 0); + }); }); - it('should not set a timeout if one already exists', () => { - subscriber.renewLeases_ = () => { - throw new Error('Should not be called.'); - }; - - global.Math.random = () => { - throw new Error('Should not be called.'); - }; + describe('modAck', () => { + it('should modAck the message', () => { + const fakeDeadline = 10; + const stub = sandbox.stub(subscriber, 'modAck'); - global.setTimeout = () => { - throw new Error('Should not be called.'); - }; - - subscriber.leaseTimeoutHandle_ = fakeTimeoutHandle; - subscriber.setLeaseTimeout_(); - }); + message.modAck(fakeDeadline); - it('should not set a timeout if the sub is closed', () => { - subscriber.renewLeases_ = () => { - throw new Error('Should not be called.'); - }; + const [msg, deadline] = stub.lastCall.args; + assert.strictEqual(msg, message); + assert.strictEqual(deadline, fakeDeadline); + }); - global.Math.random = () => { - throw new Error('Should not be called.'); - }; + it('should not modAck the message if its been handled', () => { + const deadline = 10; + const stub = sandbox.stub(subscriber, 'modAck'); - global.setTimeout = () => { - throw new Error('Should not be called.'); - }; + message.ack(); + message.modAck(deadline); - subscriber.isOpen = false; - subscriber.setLeaseTimeout_(); + assert.strictEqual(stub.callCount, 0); + }); }); - }); - describe('writeTo_', () => { - const CONNECTION_ID = 'abc'; - // tslint:disable-next-line no-any - const CONNECTION: any = {}; - - beforeEach(() => { - subscriber.connectionPool = { - acquire(connId, cb) { - cb(null, CONNECTION); - }, - }; - }); + describe('nack', () => { + it('should nack the message', () => { + const fakeDelay = 10; + const stub = sandbox.stub(subscriber, 'modAck'); - it('should return a promise', () => { - subscriber.connectionPool.acquire = () => {}; + message.nack(fakeDelay); - const returnValue = subscriber.writeTo_(); - assert(returnValue instanceof Promise); - }); + const [msg, delay] = stub.lastCall.args; + assert.strictEqual(msg, message); + assert.strictEqual(delay, fakeDelay); + }); - it('should reject the promise if unable to acquire stream', () => { - const fakeError = new Error('err'); + it('should not nack the message if its been handled', () => { + const delay = 10; + const stub = sandbox.stub(subscriber, 'modAck'); - subscriber.connectionPool.acquire = (connId, cb) => { - assert.strictEqual(connId, CONNECTION_ID); - cb(fakeError); - }; - - return subscriber.writeTo_(CONNECTION_ID, {}) - .then( - () => { - throw new Error('Should not resolve.'); - }, - err => { - assert.strictEqual(err, fakeError); - }); - }); + message.ack(); + message.nack(delay); - it('should write to the stream', done => { - const fakeData = {a: 'b'}; - - CONNECTION.write = data => { - assert.strictEqual(data, fakeData); - done(); - }; - - subscriber.writeTo_(CONNECTION_ID, fakeData); + assert.strictEqual(stub.callCount, 0); + }); }); - it('should capture the write latency when successful', () => { - const fakeLatency = 500; - let capturedLatency; - - CONNECTION.write = (data, cb) => { - setTimeout(cb, fakeLatency, null); - }; - - subscriber.latency_.add = value => { - capturedLatency = value; - }; + describe('formatTimestamp', () => { + it('should format the timestamp object', () => { + const publishTime = RECEIVED_MESSAGE.message.publishTime; + const actual = Message.formatTimestamp(publishTime); - return subscriber.writeTo_(CONNECTION_ID, {}).then(() => { - const upper = fakeLatency + 50; - const lower = fakeLatency - 50; + const ms = publishTime.nanos / 1e6; + const s = publishTime.seconds * 1000; + const expectedDate = new Date(ms + s); - assert(capturedLatency > lower && capturedLatency < upper); + assert.deepStrictEqual(actual, expectedDate); }); }); }); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 113ff4ed98e..a4fbdfb3d79 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -16,9 +16,11 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; +import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; +import {SubscriberOptions} from '../src/subscriber'; import * as util from '../src/util'; let promisified = false; @@ -28,7 +30,7 @@ const fakePromisify = Object.assign({}, pfy, { return; } promisified = true; - assert.deepStrictEqual(options.exclude, ['snapshot']); + assert.deepStrictEqual(options.exclude, ['open', 'snapshot']); }, }); @@ -47,11 +49,23 @@ class FakeSnapshot { } } -class FakeSubscriber { +let subscriber: FakeSubscriber; + +class FakeSubscriber extends EventEmitter { calledWith_: IArguments; + isOpen = false; constructor() { + super(); this.calledWith_ = arguments; + subscriber = this; + } + open(): void { + this.isOpen = true; } + async close(): Promise { + this.isOpen = false; + } + setOptions(options: SubscriberOptions): void {} } describe('Subscription', () => { @@ -93,10 +107,6 @@ describe('Subscription', () => { assert(promisified); }); - it('should localize pubsub.Promise', () => { - assert.strictEqual(subscription.Promise, PUBSUB.Promise); - }); - it('should localize the pubsub object', () => { assert.strictEqual(subscription.pubsub, PUBSUB); }); @@ -154,11 +164,52 @@ describe('Subscription', () => { assert.strictEqual(args[1], subscription.name); }); - it('should inherit from Subscriber', () => { + it('should create a Subscriber', () => { const options = {}; const subscription = new Subscription(PUBSUB, SUB_NAME, options); - assert(subscription instanceof FakeSubscriber); - assert.strictEqual(subscription.calledWith_[0], options); + + const [sub, opts] = subscriber.calledWith_; + assert.strictEqual(sub, subscription); + assert.strictEqual(opts, options); + }); + + it('should open the subscriber when a listener is attached', () => { + const stub = sandbox.stub(subscriber, 'open'); + + subscription.on('message', () => {}); + assert.strictEqual(stub.callCount, 1); + }); + + it('should close the subscriber when no listeners are attached', () => { + const stub = sandbox.stub(subscriber, 'close'); + const cb = () => {}; + + subscription.on('message', cb); + subscription.removeListener('message', cb); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should emit messages', done => { + const message = {}; + + subscription.on('message', msg => { + assert.strictEqual(msg, message); + done(); + }); + + subscriber.emit('message', message); + }); + + it('should emit errors', done => { + const error = new Error('err'); + + subscription.on('error', err => { + assert.strictEqual(err, error); + done(); + }); + + subscriber.emit('error', error); }); }); @@ -213,6 +264,24 @@ describe('Subscription', () => { }); }); + describe('close', () => { + it('should call the success callback', done => { + sandbox.stub(subscriber, 'close').resolves(); + subscription.close(done); + }); + + it('should pass back any errors that occurs', done => { + const fakeErr = new Error('err'); + + sandbox.stub(subscriber, 'close').rejects(fakeErr); + + subscription.close(err => { + assert.strictEqual(err, fakeErr); + done(); + }); + }); + }); + describe('createSnapshot', () => { const SNAPSHOT_NAME = 'test-snapshot'; @@ -349,30 +418,14 @@ describe('Subscription', () => { }); }); - it('should remove all message listeners', done => { - let called = false; - - subscription.removeAllListeners = () => { - called = true; - }; - - subscription.delete(err => { - assert.ifError(err); - assert(called); - done(); - }); - }); - - it('should close the subscription', done => { - let called = false; + it('should close the subscriber if open', done => { + const stub = sandbox.stub(subscriber, 'close'); - subscription.close = () => { - called = true; - }; + subscription.open(); subscription.delete(err => { assert.ifError(err); - assert(called); + assert.strictEqual(stub.callCount, 1); done(); }); }); @@ -664,6 +717,25 @@ describe('Subscription', () => { }); }); + describe('open', () => { + it('should open the subscriber', () => { + const stub = sandbox.stub(subscriber, 'open'); + + subscription.open(); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should noop if already open', () => { + const spy = sandbox.spy(subscriber, 'open'); + + subscription.open(); + subscription.open(); + + assert.strictEqual(spy.callCount, 1); + }); + }); + describe('seek', () => { const FAKE_SNAPSHOT_NAME = 'a'; const FAKE_FULL_SNAPSHOT_NAME = 'a/b/c/d'; @@ -777,6 +849,17 @@ describe('Subscription', () => { }); }); + describe('setOptions', () => { + it('should pass the options to the subscriber', () => { + const options = {}; + const stub = sandbox.stub(subscriber, 'setOptions').withArgs(options); + + subscription.setOptions(options); + + assert.strictEqual(stub.callCount, 1); + }); + }); + describe('snapshot', () => { const SNAPSHOT_NAME = 'a'; From 9e8663d947de7ee0b81eb43f3d8f9980ed271695 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 14 Jan 2019 12:22:09 -0800 Subject: [PATCH 0313/1115] fix(deps): update dependency google-gax to ^0.23.0 (#423) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 13aaad7348c..d5690b326a7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auth-library": "^2.0.0", - "google-gax": "^0.22.0", + "google-gax": "^0.23.0", "is": "^3.0.1", "is-stream-ended": "^0.1.4", "lodash.chunk": "^4.2.0", From 4366cef17e4d03eebe68c3fb6a3cf7b52fa0175e Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Mon, 14 Jan 2019 18:05:23 -0800 Subject: [PATCH 0314/1115] build: check broken links in generated docs (#416) * build: check dead links on Kokoro * recursive crawl local links * add missing namespaces * fix @type * fix doc links * fix dead links[ --- handwritten/pubsub/.cloud-repo-tools.json | 6 ++-- handwritten/pubsub/.jsdoc.js | 2 +- handwritten/pubsub/.kokoro/docs.sh | 8 +++++ handwritten/pubsub/README.md | 35 +++++++------------ handwritten/pubsub/package.json | 3 +- handwritten/pubsub/src/iam.ts | 5 ++- handwritten/pubsub/src/index.ts | 10 +++++- handwritten/pubsub/src/lease-manager.ts | 7 ++++ handwritten/pubsub/src/message-queues.ts | 5 +++ handwritten/pubsub/src/message-stream.ts | 1 + handwritten/pubsub/src/publisher.ts | 2 +- handwritten/pubsub/src/subscriber.ts | 13 +++++++ .../v1/doc/google/protobuf/doc_timestamp.js | 6 ++-- handwritten/pubsub/synth.py | 11 ++++++ 14 files changed, 77 insertions(+), 37 deletions(-) diff --git a/handwritten/pubsub/.cloud-repo-tools.json b/handwritten/pubsub/.cloud-repo-tools.json index 23d5c1219ed..feabed1e164 100644 --- a/handwritten/pubsub/.cloud-repo-tools.json +++ b/handwritten/pubsub/.cloud-repo-tools.json @@ -2,21 +2,21 @@ "requiresKeyFile": true, "requiresProjectId": true, "product": "pubsub", - "client_reference_url": "https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub", + "client_reference_url": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest", "release_quality": "beta", "samples": [ { "id": "subscriptions", "name": "Subscriptions", "file": "subscriptions.js", - "docs_link": "https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub/subscription", + "docs_link": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest/Subscription", "usage": "node subscriptions.js --help" }, { "id": "topics", "name": "Topics", "file": "topics.js", - "docs_link": "https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub/topic", + "docs_link": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest/Topic", "usage": "node topics.js --help" } ] diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index e09418fc3ed..d48e7e73534 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -20,7 +20,7 @@ module.exports = { opts: { readme: './README.md', package: './package.json', - template: './node_modules/ink-docstrap/template', + template: './node_modules/jsdoc-baseline', recurse: true, verbose: true, destination: './docs/' diff --git a/handwritten/pubsub/.kokoro/docs.sh b/handwritten/pubsub/.kokoro/docs.sh index 3af3193411a..8ca19ce2885 100755 --- a/handwritten/pubsub/.kokoro/docs.sh +++ b/handwritten/pubsub/.kokoro/docs.sh @@ -23,3 +23,11 @@ cd $(dirname $0)/.. npm install npm run docs + +# Check broken links +BIN=./node_modules/.bin + +npm install broken-link-checker +npm install http-server +$BIN/http-server -p 8080 docs/ & +$BIN/blc -r http://localhost:8080 diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 96b75d0a57a..67ae9d75995 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -38,27 +38,17 @@ // Imports the Google Cloud client library const {PubSub} = require('@google-cloud/pubsub'); -// Your Google Cloud Platform project ID -const projectId = 'YOUR_PROJECT_ID'; - -// Instantiates a client -const pubsubClient = new PubSub({ - projectId: projectId, -}); - -// The name for the new topic -const topicName = 'my-new-topic'; - -// Creates the new topic -pubsubClient - .createTopic(topicName) - .then(results => { - const topic = results[0]; - console.log(`Topic ${topic.name} created.`); - }) - .catch(err => { - console.error('ERROR:', err); - }); +async function quickstart( + projectId = 'your-project-id', // Your Google Cloud Platform project ID + topicName = 'my-topic' // Name for the new topic to create +) { + // Instantiates a client + const pubsub = new PubSub({projectId}); + + // Creates the new topic + const [topic] = await pubsub.createTopic(topicName); + console.log(`Topic ${topic.name} created.`); +} ``` ## Samples @@ -108,11 +98,10 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained]. [explained]: https://cloud.google.com/apis/docs/client-libraries-explained -[client-docs]: https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/latest/pubsub +[client-docs]: https://cloud.google.com/nodejs/docs/reference/pubsub/latest [product-docs]: https://cloud.google.com/pubsub/docs [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png [projects]: https://console.cloud.google.com/project [billing]: https://support.google.com/cloud/answer/6293499#enable-billing [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com [auth]: https://cloud.google.com/docs/authentication/getting-started - diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d5690b326a7..33752c5300c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -36,6 +36,7 @@ "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", "test": "nyc mocha build/test", "lint": "eslint '**/*.js' && gts check", + "predocs": "npm run compile", "docs": "jsdoc -c .jsdoc.js", "fix": "eslint --fix '**/*.js' && gts fix", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", @@ -82,7 +83,7 @@ "eslint-plugin-node": "^8.0.0", "eslint-plugin-prettier": "^3.0.0", "gts": "^0.9.0", - "ink-docstrap": "^1.3.2", + "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", "mocha": "^5.0.0", diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 8f01e4f6fb5..5dc0365e0db 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -142,8 +142,7 @@ export interface Policy { * SLA or deprecation policy, and may be subject to backward-incompatible * changes.* * - * @constructor Iam - * @mixin + * @class * @param {PubSub} pubsub PubSub Object. * @param {string} id The name of the topic or subscription. * @@ -241,7 +240,7 @@ export class IAM { * * @throws {Error} If no policy is provided. * - * @param {object} policy The [policy](https://cloud.google.com/pubsub/docs/reference/rest/Shared.Types/Policy). + * @param {object} policy The [policy](https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy). * @param {array} [policy.bindings] Bindings associate members with roles. * @param {Array} [policy.rules] Rules to be applied to the policy. * @param {string} [policy.etag] Etags are used to perform a read-modify-write. diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 50c47b21327..a8773a6b1ef 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -14,6 +14,13 @@ * limitations under the License. */ +/** + * @namespace google.pubsub.v1 + */ +/** + * @namespace google.protobuf + */ + import {paginator} from '@google-cloud/paginator'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisifyAll} from '@google-cloud/promisify'; @@ -35,7 +42,8 @@ const opts = {} as gax.GrpcClientOptions; const {grpc} = new gax.GrpcClient(opts); /** - * @type {string} - Project ID placeholder. + * Project ID placeholder. + * @type {string} * @private */ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index 572af36c64b..d612eeb9a8a 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -76,12 +76,14 @@ export class LeaseManager extends EventEmitter { } /** * @type {number} + * @private */ get pending(): number { return this._pending.length; } /** * @type {number} + * @private */ get size(): number { return this._messages.size; @@ -91,6 +93,7 @@ export class LeaseManager extends EventEmitter { * isn't already running. * * @param {Message} message The message. + * @private */ add(message: Message): void { const {allowExcessMessages} = this._options; @@ -116,6 +119,7 @@ export class LeaseManager extends EventEmitter { } /** * Removes ALL messages from inventory. + * @private */ clear(): void { const wasFull = this.isFull(); @@ -134,6 +138,7 @@ export class LeaseManager extends EventEmitter { * Indicates if we're at or over capacity. * * @returns {boolean} + * @private */ isFull(): boolean { const {maxBytes, maxMessages} = this._options; @@ -146,6 +151,7 @@ export class LeaseManager extends EventEmitter { * @fires LeaseManager#free * * @param {Message} message The message to remove. + * @private */ remove(message: Message): void { if (!this._messages.has(message)) { @@ -174,6 +180,7 @@ export class LeaseManager extends EventEmitter { * Sets options for the LeaseManager. * * @param {FlowControlOptions} [options] The options. + * @private */ setOptions(options: FlowControlOptions): void { const defaults: FlowControlOptions = { diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 91e39068dfc..587d3a93e1e 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -65,6 +65,7 @@ export abstract class MessageQueue { * Gets the default buffer time in ms. * * @returns {number} + * @private */ get maxMilliseconds(): number { return this._options!.maxMilliseconds!; @@ -74,6 +75,7 @@ export abstract class MessageQueue { * * @param {Message} message The message to add. * @param {number} [deadline] The deadline. + * @private */ add({ackId}: Message, deadline?: number): void { const {maxMessages, maxMilliseconds} = this._options; @@ -89,6 +91,7 @@ export abstract class MessageQueue { } /** * Sends a batch of messages. + * @private */ async flush(): Promise { if (this._timer) { @@ -118,6 +121,7 @@ export abstract class MessageQueue { * Returns a promise that resolves after the next flush occurs. * * @returns {Promise} + * @private */ onFlush(): Promise { if (!this._onFlush) { @@ -129,6 +133,7 @@ export abstract class MessageQueue { * Set the batching options. * * @param {BatchOptions} options Batching options. + * @private */ setOptions(options): void { const defaults: BatchOptions = {maxMessages: 3000, maxMilliseconds: 100}; diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index bb843d296a0..940e2bb8c36 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -156,6 +156,7 @@ export class MessageStream extends PassThrough { * Destroys the stream and any underlying streams. * * @param {error?} err An error to emit, if any. + * @private */ destroy(err?: Error): void { if (this.destroyed) { diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 5d79c252ff4..067c623825f 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -76,7 +76,7 @@ export class Publisher { * The topic of this publisher. * * @name Publisher#topic - * @type {Topic} topic + * @type {Topic} */ this.topic = topic; // this object keeps track of all messages scheduled to be published diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 4cc80a0e76a..970fad64e83 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -81,12 +81,14 @@ export class Message { * The length of the message data. * * @type {number} + * @private */ get length() { return this._length; } /** * Acknowledges the message. + * @private */ ack(): void { if (!this._handled) { @@ -98,6 +100,7 @@ export class Message { * Modifies the ack deadline. * * @param {number} deadline The number of seconds to extend the deadline. + * @private */ modAck(deadline: number): void { if (!this._handled) { @@ -110,6 +113,7 @@ export class Message { * * @param {number} [delay=0] The desired time to wait before the * redelivery occurs. + * @private */ nack(delay?: number): void { if (!this._handled) { @@ -186,6 +190,7 @@ export class Subscriber extends EventEmitter { * The 99th percentile of request latencies. * * @type {number} + * @private */ get modAckLatency() { const latency = this._latencies.percentile(99); @@ -201,6 +206,7 @@ export class Subscriber extends EventEmitter { * The full name of the Subscription. * * @type {string} + * @private */ get name(): string { if (!this._name) { @@ -215,6 +221,7 @@ export class Subscriber extends EventEmitter { * * @param {Message} message The message to acknowledge. * @returns {Promise} + * @private */ async ack(message: Message): Promise { if (!this._isUserSetDeadline) { @@ -232,6 +239,7 @@ export class Subscriber extends EventEmitter { * acks/modAcks are finished. * * @returns {Promise} + * @private */ async close(): Promise { if (!this.isOpen) { @@ -248,6 +256,7 @@ export class Subscriber extends EventEmitter { * Gets the subscriber client instance. * * @returns {Promise} + * @private */ async getClient(): Promise { const pubsub = this._subscription.pubsub; @@ -263,6 +272,7 @@ export class Subscriber extends EventEmitter { * @param {Message} message The message to modify. * @param {number} deadline The deadline. * @returns {Promise} + * @private */ async modAck(message: Message, deadline: number): Promise { const startTime = Date.now(); @@ -280,6 +290,7 @@ export class Subscriber extends EventEmitter { * @param {Message} message The message. * @param {number} [delay=0] Delay to wait before redelivery. * @return {Promise} + * @private */ async nack(message: Message, delay = 0): Promise { await this.modAck(message, delay); @@ -287,6 +298,7 @@ export class Subscriber extends EventEmitter { } /** * Starts pulling messages. + * @private */ open(): void { const {batching, flowControl, streamingOptions} = this._options; @@ -308,6 +320,7 @@ export class Subscriber extends EventEmitter { * Sets subscriber options. * * @param {SubscriberOptions} options The options. + * @private */ setOptions(options: SubscriberOptions): void { this._options = options; diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js index 1ebe2e6e1a5..1cc64cbed80 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js @@ -87,13 +87,11 @@ * 01:30 UTC on January 15, 2017. * * In JavaScript, one can convert a Date object to this format using the - * standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString] + * standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) * method. In Python, a standard `datetime.datetime` object can be converted * to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) * with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one - * can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://cloud.google.com - * http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- - * ) to obtain a formatter capable of generating timestamps in this format. + * can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) to obtain a formatter capable of generating timestamps in this format. * * @property {number} seconds * Represents seconds of UTC time since Unix epoch diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 4a00aefa455..ef79235c56f 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -37,6 +37,17 @@ s.replace("src/v1/publisher_client.js", "../../package.json", "../../../package.json") s.replace("src/v1/subscriber_client.js", "../../package.json", "../../../package.json") +# [START fix-dead-link] +s.replace('src/**/doc/google/protobuf/doc_timestamp.js', + 'https:\/\/cloud\.google\.com[\s\*]*http:\/\/(.*)[\s\*]*\)', + r"https://\1)") + +s.replace('src/**/doc/google/protobuf/doc_timestamp.js', + 'toISOString\]', + 'toISOString)') +# [END fix-dead-link] + + # Node.js specific cleanup subprocess.run(['npm', 'install']) subprocess.run(['npm', 'run', 'fix']) From 4d3e1eacd04df2e65a37a7c4f24f7232e58fccfd Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 15 Jan 2019 07:59:57 -0800 Subject: [PATCH 0315/1115] fix: add getSubscriberStub to synth file (#425) --- handwritten/pubsub/synth.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index ef79235c56f..7fd9232a3ff 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -31,6 +31,9 @@ " callback\n" " );\n" " };\n" + " this.getSubscriberStub = function() {\n" + " return subscriberStub;\n" + " };\n" "\g<0>") # Update path discovery due to build/ dir and TypeScript conversion. From 6283b9cf9616a50e3f39a4a29aba9353c84477ea Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Wed, 16 Jan 2019 05:08:41 -0800 Subject: [PATCH 0316/1115] chore: update subscriber gapic --- handwritten/pubsub/src/v1/subscriber_client.js | 1 - handwritten/pubsub/synth.metadata | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 464a4b92d57..17a57c20065 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -230,7 +230,6 @@ class SubscriberClient { callback ); }; - this.getSubscriberStub = function() { return subscriberStub; }; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 38bda9b020d..2136b203fcc 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-01-05T12:13:56.472318Z", + "updateTime": "2019-01-16T12:16:54.123649Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.4", - "dockerImage": "googleapis/artman@sha256:8b45fae963557c3299921037ecbb86f0689f41b1b4aea73408ebc50562cb2857" + "version": "0.16.5", + "dockerImage": "googleapis/artman@sha256:5a96c2c5c6f9570cc9556b63dc9ce1838777fd9166b5b64e43ad8e0ecee2fe2c" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a111a53c0c6722afcd793b64724ceef7862db5b9", - "internalRef": "227896184" + "sha": "7a81902f287a4ac2ac130994889c80f87f91d035", + "internalRef": "229452079" } }, { From f3bc4d6432285fb503e6bf24a7f7ed0b58727278 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 16 Jan 2019 10:10:37 -0800 Subject: [PATCH 0317/1115] refactor(topic): localize publisher to topic instance (#426) --- handwritten/pubsub/src/index.ts | 8 +- handwritten/pubsub/src/publisher.ts | 140 ++++++++++++++--------- handwritten/pubsub/src/topic.ts | 77 ++++++++++--- handwritten/pubsub/system-test/pubsub.ts | 17 +-- handwritten/pubsub/test/index.ts | 12 ++ handwritten/pubsub/test/publisher.ts | 134 +++++++++++++--------- handwritten/pubsub/test/topic.ts | 54 +++++++-- 7 files changed, 293 insertions(+), 149 deletions(-) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index a8773a6b1ef..f01707d0a89 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -34,7 +34,7 @@ const v1 = require('./v1'); import {Snapshot} from './snapshot'; import {Subscription, SubscriptionMetadata, SubscriptionMetadataRaw} from './subscription'; -import {Topic} from './topic'; +import {Topic, PublishOptions} from './topic'; import {CallOptions} from 'google-gax'; import {Readable} from 'stream'; @@ -848,11 +848,11 @@ export class PubSub { * * const topic = pubsub.topic('my-topic'); */ - topic(name: string) { + topic(name: string, options?: PublishOptions): Topic { if (!name) { throw new Error('A name must be specified for a topic.'); } - return new Topic(this, name); + return new Topic(this, name, options); } } @@ -966,7 +966,7 @@ promisifyAll(PubSub, { exclude: ['request', 'snapshot', 'subscription', 'topic'], }); -export {Subscription, Topic}; +export {Subscription, Topic, PublishOptions}; /** * The default export of the `@google-cloud/pubsub` package is the diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 067c623825f..ba62612fd63 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -16,34 +16,58 @@ import {promisifyAll} from '@google-cloud/promisify'; import * as arrify from 'arrify'; +import {CallOptions} from 'google-gax'; +import {ServiceError} from 'grpc'; const each = require('async-each'); import * as extend from 'extend'; import * as is from 'is'; import {Topic} from './topic'; +export interface PublishCallback { + (err: null|ServiceError, messageId: string): void; +} + interface PublishApiResponse { messageIds: string[]; } +/** + * @typedef BatchPublishOptions + * @property {number} [maxBytes=1024^2 * 5] The maximum number of bytes to + * buffer before sending a payload. + * @property {number} [maxMessages=1000] The maximum number of messages to + * buffer before sending a payload. + * @property {number} [maxMilliseconds=100] The maximum duration to wait before + * sending a payload. + */ +interface BatchPublishOptions { + maxBytes?: number; + maxMessages?: number; + maxMilliseconds?: number; +} + +/** + * @typedef PublishOptions + * @property {BatchPublishOptions} [batching] Batching settings. + * @property {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + */ +export interface PublishOptions { + batching?: BatchPublishOptions; + gaxOpts?: CallOptions; +} + /** * A Publisher object allows you to publish messages to a specific topic. * + * @private * @class * * @see [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} * * @param {Topic} topic The topic associated with this publisher. - * @param {object} [options] Configuration object. - * @param {object} [options.batching] Batching settings. - * @param {number} [options.batching.maxBytes] The maximum number of bytes to - * buffer before sending a payload. Defaults to 1024^2 * 5. - * @param {number} [options.batching.maxMessages] The maximum number of messages - * to buffer before sending a payload. Defaults to 1000. - * @param {number} [options.batching.maxMilliseconds] The maximum duration to - * wait before sending a payload. Defaults to 100 milliseconds. - * @param {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {PublishOptions} [options] Configuration object. * * @example * const {PubSub} = require('@google-cloud/pubsub'); @@ -57,27 +81,15 @@ export class Publisher { Promise?: PromiseConstructor; topic: Topic; inventory_; - settings; - timeoutHandle_; - constructor(topic: Topic, options) { + settings!: PublishOptions; + timeoutHandle_?: NodeJS.Timer; + constructor(topic: Topic, options?: PublishOptions) { if (topic.Promise) { this.Promise = topic.Promise; } - options = extend( - true, { - batching: { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 100, - }, - }, - options); - /** - * The topic of this publisher. - * - * @name Publisher#topic - * @type {Topic} - */ + + this.setOptions(options); + this.topic = topic; // this object keeps track of all messages scheduled to be published // queued is essentially the `messages` field for the publish rpc req opts @@ -89,37 +101,29 @@ export class Publisher { queued: [], bytes: 0, }; - this.settings = { - batching: { - maxBytes: Math.min(options.batching.maxBytes, Math.pow(1024, 2) * 9), - maxMessages: Math.min(options.batching.maxMessages, 1000), - maxMilliseconds: options.batching.maxMilliseconds, - }, - gaxOpts: options.gaxOpts, - }; - this.timeoutHandle_ = null; } - /** - * @typedef {array} PublisherPublishResponse + * @typedef {array} PublishResponse * @property {string} 0 The id for the message. */ /** - * @callback PublisherPublishCallback + * @callback PublishCallback * @param {?Error} err Request error, if any. * @param {string} messageId The id for the message. */ /** * Publish the provided message. * + * @private + * * @throws {TypeError} If data is not a Buffer object. * @throws {TypeError} If any value in `attributes` object is not a string. * * @param {buffer} data The message data. This must come in the form of a * Buffer object. * @param {object.} [attributes] Attributes for this message. - * @param {PublisherPublishCallback} [callback] Callback function. - * @returns {Promise} + * @param {PublishCallback} [callback] Callback function. + * @returns {Promise} * * @example * const {PubSub} = require('@google-cloud/pubsub'); @@ -154,8 +158,8 @@ export class Publisher { * publisher.publish(data).then((messageId) => {}); */ publish(data: Buffer, attributes?: object): Promise; - publish(data: Buffer, callback: Function): void; - publish(data: Buffer, attributes: object, callback: Function): void; + publish(data: Buffer, callback: PublishCallback): void; + publish(data: Buffer, attributes: object, callback: PublishCallback): void; publish(data: Buffer, attributes?, callback?): Promise|void { if (!(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); @@ -173,28 +177,55 @@ export class Publisher { } } - const opts = this.settings.batching; + const opts = this.settings!.batching!; // if this message puts us over the maxBytes option, then let's ship // what we have and add it to the next batch if (this.inventory_.bytes > 0 && - this.inventory_.bytes + data.length > opts.maxBytes) { + this.inventory_.bytes + data.length > opts.maxBytes!) { this.publish_(); } // add it to the queue! this.queue_(data, attributes, callback); // next lets check if this message brings us to the message cap or if we // hit the max byte limit - const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; - if (this.inventory_.bytes >= opts.maxBytes || hasMaxMessages) { + const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages!; + if (this.inventory_.bytes >= opts.maxBytes! || hasMaxMessages) { this.publish_(); return; } // otherwise let's set a timeout to send the next batch if (!this.timeoutHandle_) { this.timeoutHandle_ = - setTimeout(this.publish_.bind(this), opts.maxMilliseconds); + setTimeout(this.publish_.bind(this), opts.maxMilliseconds!); } } + /** + * Sets the Publisher options. + * + * @private + * + * @param {PublishOptions} options The publisher options. + */ + setOptions(options = {} as PublishOptions): void { + const defaults = { + batching: { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 100, + }, + }; + + const {batching, gaxOpts} = extend(true, defaults, options); + + this.settings = { + batching: { + maxBytes: Math.min(batching.maxBytes, Math.pow(1024, 2) * 9), + maxMessages: Math.min(batching.maxMessages, 1000), + maxMilliseconds: batching.maxMilliseconds, + }, + gaxOpts, + }; + } /** * This publishes a batch of messages and should never be called directly. * @@ -206,8 +237,12 @@ export class Publisher { this.inventory_.callbacks = []; this.inventory_.queued = []; this.inventory_.bytes = 0; - clearTimeout(this.timeoutHandle_); - this.timeoutHandle_ = null; + + if (this.timeoutHandle_) { + clearTimeout(this.timeoutHandle_); + delete this.timeoutHandle_; + } + const reqOpts = { topic: this.topic.name, messages, @@ -217,7 +252,7 @@ export class Publisher { client: 'PublisherClient', method: 'publish', reqOpts, - gaxOpts: this.settings.gaxOpts, + gaxOpts: this.settings!.gaxOpts!, }, (err, resp) => { const messageIds = arrify(resp && resp.messageIds); @@ -254,4 +289,5 @@ export class Publisher { */ promisifyAll(Publisher, { singular: true, + exclude: ['setOptions'], }); diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 862bc70ed7f..425db55d15e 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -22,7 +22,7 @@ import {Readable} from 'stream'; import {CreateTopicCallback, CreateTopicResponse, Metadata, PubSub} from '.'; import {IAM} from './iam'; -import {Publisher} from './publisher'; +import {PublishCallback, Publisher, PublishOptions} from './publisher'; import * as util from './util'; /** @@ -47,10 +47,11 @@ export class Topic { request: typeof PubSub.prototype.request; iam: IAM; metadata: Metadata; + publisher: Publisher; getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => Readable; - constructor(pubsub: PubSub, name: string) { + constructor(pubsub: PubSub, name: string, options?: PublishOptions) { if (pubsub.Promise) { this.Promise = pubsub.Promise; } @@ -60,6 +61,7 @@ export class Topic { * @type {string} */ this.name = Topic.formatName_(pubsub.projectId, name); + this.publisher = new Publisher(this, options); /** * The parent {@link PubSub} instance of this topic instance. * @name Topic#pubsub @@ -473,35 +475,72 @@ export class Topic { }); } /** - * Creates a Publisher object that allows you to publish messages to this - * topic. + * Publish the provided message. * - * @param {object} [options] Configuration object. - * @param {object} [options.batching] Batching settings. - * @param {number} [options.batching.maxBytes] The maximum number of bytes to - * buffer before sending a payload. - * @param {number} [options.batching.maxMessages] The maximum number of messages - * to buffer before sending a payload. - * @param {number} [options.batching.maxMilliseconds] The maximum duration to - * wait before sending a payload. + * @throws {TypeError} If data is not a Buffer object. + * @throws {TypeError} If any value in `attributes` object is not a string. * - * @return {Publisher} + * @param {buffer} data The message data. This must come in the form of a + * Buffer object. + * @param {object.} [attributes] Attributes for this message. + * @param {PublishCallback} [callback] Callback function. + * @returns {Promise} * * @example * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); - * const publisher = topic.publisher(); + * const data = Buffer.from('Hello, world!'); * - * publisher.publish(Buffer.from('Hello, world!'), (err, messageId) => { + * const callback = (err, messageId) => { * if (err) { * // Error handling omitted. * } + * }; + * + * topic.publish(data, callback); + * + * //- + * // Optionally you can provide an object containing attributes for the + * // message. Note that all values in the object must be strings. + * //- + * const attributes = { + * key: 'value' + * }; + * + * topic.publish(data, attributes, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.publish(data).then((messageId) => {}); + */ + publish(data: Buffer, attributes?: object): Promise; + publish(data: Buffer, callback: PublishCallback): void; + publish(data: Buffer, attributes: object, callback: PublishCallback): void; + publish(data: Buffer, attributes?, callback?): Promise|void { + return this.publisher.publish(data, attributes, callback); + } + /** + * Set the publisher options. + * + * @param {PublishOptions} options The publisher options. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * + * topic.setPublishOptions({ + * batching: { + * maxMilliseconds: 10 + * } * }); */ - publisher(options?) { - return new Publisher(this, options); + setPublishOptions(options: PublishOptions): void { + this.publisher.setOptions(options); } /** * Create a Subscription object. This command by itself will not run any API @@ -610,5 +649,7 @@ paginator.extend(Topic, ['getSubscriptions']); * that a callback is omitted. */ promisifyAll(Topic, { - exclude: ['publisher', 'subscription'], + exclude: ['publish', 'setPublishOptions', 'subscription'], }); + +export {PublishOptions}; diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 25ddf613154..43705c1565e 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -54,12 +54,11 @@ describe('pubsub', () => { async function publishPop(message, options = {}) { const topic = pubsub.topic(generateTopicName()); - const publisher = topic.publisher(); const subscription = topic.subscription(generateSubName()); await topic.create(); await subscription.create(); for (let i = 0; i < 6; i++) { - await publisher.publish(Buffer.from(message), options); + await topic.publish(Buffer.from(message), options); } return new Promise((resolve, reject) => { subscription.on('error', reject); @@ -165,10 +164,9 @@ describe('pubsub', () => { it('should publish a message', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); - const publisher = topic.publisher(); const message = Buffer.from('message from me'); - publisher.publish(message, (err, messageId) => { + topic.publish(message, (err, messageId) => { assert.ifError(err); assert.strictEqual(typeof messageId, 'string'); done(); @@ -199,7 +197,6 @@ describe('pubsub', () => { describe('Subscription', () => { const TOPIC_NAME = generateTopicName(); const topic = pubsub.topic(TOPIC_NAME); - const publisher = topic.publisher(); const SUB_NAMES = [generateSubName(), generateSubName()]; @@ -212,7 +209,7 @@ describe('pubsub', () => { await topic.create(); await Promise.all(SUBSCRIPTIONS.map(s => s.create())); for (let i = 0; i < 10; i++) { - await publisher.publish(Buffer.from('hello')); + await topic.publish(Buffer.from('hello')); } await new Promise(r => setTimeout(r, 2500)); }); @@ -470,9 +467,9 @@ describe('pubsub', () => { this.timeout(0); - const publisher = topic.publisher({batching: {maxMessages: 999}}); const subscription = topic.subscription(SUB_NAMES[0]); + topic.setPublishOptions({batching: {maxMessages: 999}}); await publish(MESSAGES); const startTime = Date.now(); @@ -525,7 +522,7 @@ describe('pubsub', () => { for (let i = 0; i < messageCount; i++) { const testid = String(++id); messages.add(testid); - promises.push(publisher.publish(data, {testid})); + promises.push(topic.publish(data, {testid})); } return Promise.all(promises); @@ -586,7 +583,6 @@ describe('pubsub', () => { const SNAPSHOT_NAME = generateSnapshotName(); let topic; - let publisher; let subscription; let snapshot; @@ -609,7 +605,6 @@ describe('pubsub', () => { before(() => { topic = pubsub.topic(TOPIC_NAMES[0]); - publisher = topic.publisher(); subscription = topic.subscription(generateSubName()); snapshot = subscription.snapshot(SNAPSHOT_NAME); @@ -661,7 +656,7 @@ describe('pubsub', () => { return subscription.create() .then(() => { - return publisher.publish(Buffer.from('Hello, world!')); + return topic.publish(Buffer.from('Hello, world!')); }) .then(_messageId => { messageId = _messageId; diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index b37c67c259e..30c6efd29bc 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -1318,5 +1318,17 @@ describe('PubSub', () => { it('should return a Topic object', () => { assert(pubsub.topic('new-topic') instanceof FakeTopic); }); + + it('should pass the correct args', () => { + const fakeName = 'with-options'; + const fakeOptions = {}; + const topic = pubsub.topic(fakeName, fakeOptions); + + const [ps, name, options] = topic.calledWith_; + + assert.strictEqual(ps, pubsub); + assert.strictEqual(name, fakeName); + assert.strictEqual(options, fakeOptions); + }); }); }); diff --git a/handwritten/pubsub/test/publisher.ts b/handwritten/pubsub/test/publisher.ts index 025def0488e..45c1a391278 100644 --- a/handwritten/pubsub/test/publisher.ts +++ b/handwritten/pubsub/test/publisher.ts @@ -17,6 +17,7 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; +import * as sinon from 'sinon'; import * as util from '../src/util'; @@ -25,13 +26,16 @@ const fakePromisify = Object.assign({}, pfy, { // tslint:disable-next-line variable-name promisifyAll(Class, options) { if (Class.name === 'Publisher') { - assert.deepStrictEqual(options, {singular: true}); + assert.deepStrictEqual( + options, {singular: true, exclude: ['setOptions']}); promisified = true; } }, }); describe('Publisher', () => { + const sandbox = sinon.createSandbox(); + // tslint:disable-next-line variable-name let Publisher; let publisher; @@ -57,11 +61,23 @@ describe('Publisher', () => { batchOpts = publisher.settings.batching; }); + afterEach(() => sandbox.restore()); + describe('initialization', () => { it('should promisify all the things', () => { assert(promisified); }); + it('should pass any options to setOptions', () => { + const stub = sandbox.stub(Publisher.prototype, 'setOptions'); + + const fakeOptions = {}; + const p = new Publisher(TOPIC, fakeOptions); + + const [options] = stub.lastCall.args; + assert.strictEqual(options, fakeOptions); + }); + it('should localize topic.Promise', () => { assert.strictEqual(publisher.Promise, TOPIC.Promise); }); @@ -77,59 +93,6 @@ describe('Publisher', () => { bytes: 0, }); }); - - describe('options', () => { - it('should provide default values for batching', () => { - assert.deepStrictEqual(publisher.settings.batching, { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 100, - }); - }); - - it('should capture user specified options', () => { - const options = { - maxBytes: 10, - maxMessages: 11, - maxMilliseconds: 12, - }; - const optionsCopy = Object.assign({}, options); - - const publisher = new Publisher(TOPIC, { - batching: options, - }); - - assert.deepStrictEqual(publisher.settings.batching, options); - assert.deepStrictEqual(options, optionsCopy); - }); - - it('should cap maxBytes', () => { - const expected = Math.pow(1024, 2) * 9; - - const publisher = new Publisher(TOPIC, { - batching: {maxBytes: expected + 1024}, - }); - - assert.strictEqual(publisher.settings.batching.maxBytes, expected); - }); - - it('should cap maxMessages', () => { - const publisher = new Publisher(TOPIC, { - batching: {maxMessages: 2000}, - }); - - assert.strictEqual(publisher.settings.batching.maxMessages, 1000); - }); - - it('should capture gaxOptions', () => { - const fakeGaxOpts = {a: 'a'}; - const publisher = new Publisher(TOPIC, { - gaxOpts: fakeGaxOpts, - }); - - assert.deepStrictEqual(publisher.settings.gaxOpts, fakeGaxOpts); - }); - }); }); describe('publish', () => { @@ -292,11 +255,72 @@ All attributes must be in the form of a string. }); }); + describe('setOptions', () => { + beforeEach(() => { + delete publisher.settings; + }); + + it('should provide default values for batching', () => { + publisher.setOptions({}); + + assert.deepStrictEqual(publisher.settings.batching, { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 100, + }); + }); + + it('should capture user specified options', () => { + const options = { + batching: { + maxBytes: 10, + maxMessages: 11, + maxMilliseconds: 12, + }, + gaxOpts: {}, + }; + const optionsCopy = Object.assign({}, options); + + publisher.setOptions(options); + + assert.deepStrictEqual(publisher.settings, options); + assert.deepStrictEqual(options, optionsCopy); + }); + + it('should cap maxBytes', () => { + const expected = Math.pow(1024, 2) * 9; + + publisher.setOptions({ + batching: {maxBytes: expected + 1024}, + }); + + assert.strictEqual(publisher.settings.batching.maxBytes, expected); + }); + + it('should cap maxMessages', () => { + publisher.setOptions({ + batching: {maxMessages: 2000}, + }); + + assert.strictEqual(publisher.settings.batching.maxMessages, 1000); + }); + + it('should capture gaxOptions', () => { + const fakeGaxOpts = {a: 'a'}; + + publisher.setOptions({ + gaxOpts: fakeGaxOpts, + }); + + assert.deepStrictEqual(publisher.settings.gaxOpts, fakeGaxOpts); + }); + }); + describe('publish_', () => { it('should cancel any publish timeouts', done => { publisher.timeoutHandle_ = setTimeout(done, 1); publisher.publish_(); - assert.strictEqual(publisher.timeoutHandle_, null); + assert.strictEqual(publisher.timeoutHandle_, undefined); done(); }); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index b335ce6f925..da005b1d7fa 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -28,7 +28,8 @@ const fakePromisify = Object.assign({}, pfy, { return; } promisified = true; - assert.deepStrictEqual(options.exclude, ['publisher', 'subscription']); + assert.deepStrictEqual( + options.exclude, ['publish', 'setPublishOptions', 'subscription']); }, }); @@ -45,9 +46,19 @@ class FakePublisher { // tslint:disable-next-line no-any calledWith_: any[]; // tslint:disable-next-line no-any + published_!: any[]; + options_!: object; + // tslint:disable-next-line no-any constructor(...args: any[]) { this.calledWith_ = args; } + // tslint:disable-next-line no-any + publish(...args: any[]) { + this.published_ = args; + } + setOptions(options: object) { + this.options_ = options; + } } let extended = false; @@ -136,6 +147,16 @@ describe('Topic', () => { assert.strictEqual(topic.name, formattedName); }); + it('should create a publisher', () => { + const fakeOptions = {}; + const topic = new Topic(PUBSUB, TOPIC_NAME, fakeOptions); + + const [t, options] = topic.publisher.calledWith_; + + assert.strictEqual(t, topic); + assert.strictEqual(options, fakeOptions); + }); + it('should localize the parent object', () => { assert.strictEqual(topic.parent, PUBSUB); assert.strictEqual(topic.pubsub, PUBSUB); @@ -516,16 +537,31 @@ describe('Topic', () => { }); }); - describe('publisher', () => { - it('should return a Publisher instance', () => { - const options = {}; + describe('publish', () => { + it('should call through to Publisher#publish', () => { + const data = Buffer.from('Hello, world!'); + const attributes = {}; + const callback = () => {}; + + const fakePromise = Promise.resolve(); + const stub = sandbox.stub(topic.publisher, 'publish') + .withArgs(data, attributes, callback) + .returns(fakePromise); + + const promise = topic.publish(data, attributes, callback); + assert.strictEqual(promise, fakePromise); + }); + }); + + describe('setPublishOptions', () => { + it('should call through to Publisher#setOptions', () => { + const fakeOptions = {}; + const stub = + sandbox.stub(topic.publisher, 'setOptions').withArgs(fakeOptions); - const publisher = topic.publisher(options); - const args = publisher.calledWith_; + topic.setPublishOptions(fakeOptions); - assert(publisher instanceof FakePublisher); - assert.strictEqual(args[0], topic); - assert.strictEqual(args[1], options); + assert.strictEqual(stub.callCount, 1); }); }); From eeb5c637f9c5255876a666c424b201a174a55235 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 16 Jan 2019 12:58:47 -0800 Subject: [PATCH 0318/1115] feat(topic): create method for publishing json (#430) --- handwritten/pubsub/src/topic.ts | 62 +++++++++++++++++++++++++++++++- handwritten/pubsub/test/topic.ts | 34 +++++++++++++++++- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 425db55d15e..62549e890f7 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -522,6 +522,66 @@ export class Topic { publish(data: Buffer, attributes?, callback?): Promise|void { return this.publisher.publish(data, attributes, callback); } + /** + * Publish the provided JSON. It should be noted that all messages published + * are done so in the form of a Buffer. This is simply a convenience method + * that will transform JSON into a Buffer before publishing. + * {@link Subscription} objects will always return message data in the form of + * a Buffer, so any JSON published will require manual deserialization. + * + * @see Topic#publish + * + * @throws {Error} If non-object data is provided. + * + * @param {object} json The JSON data to publish. + * @param {object} [attributes] Attributes for this message. + * @param {PublishCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * const topic = pubsub.topic('my-topic'); + * + * const data = { + * foo: 'bar' + * }; + * + * const callback = (err, messageId) => { + * if (err) { + * // Error handling omitted. + * } + * }; + * + * topic.publishJSON(data, callback); + * + * //- + * // Optionally you can provide an object containing attributes for the + * // message. Note that all values in the object must be strings. + * //- + * const attributes = { + * key: 'value' + * }; + * + * topic.publishJSON(data, attributes, callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * topic.publishJSON(data).then((messageId) => {}); + */ + publishJSON(json: object, attributes?: object): Promise; + publishJSON(json: object, callback: PublishCallback): void; + publishJSON(json: object, attributes: object, callback: PublishCallback): + void; + publishJSON(json: object, attributes?, callback?): Promise|void { + if (!is.object(json)) { + throw new Error('First parameter should be an object.'); + } + + const data = Buffer.from(JSON.stringify(json)); + return this.publish(data, attributes, callback); + } /** * Set the publisher options. * @@ -649,7 +709,7 @@ paginator.extend(Topic, ['getSubscriptions']); * that a callback is omitted. */ promisifyAll(Topic, { - exclude: ['publish', 'setPublishOptions', 'subscription'], + exclude: ['publish', 'publishJSON', 'setPublishOptions', 'subscription'], }); export {PublishOptions}; diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index da005b1d7fa..9cfba19491a 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -29,7 +29,8 @@ const fakePromisify = Object.assign({}, pfy, { } promisified = true; assert.deepStrictEqual( - options.exclude, ['publish', 'setPublishOptions', 'subscription']); + options.exclude, + ['publish', 'publishJSON', 'setPublishOptions', 'subscription']); }, }); @@ -553,6 +554,37 @@ describe('Topic', () => { }); }); + describe('publishJSON', () => { + it('should throw an error for non-object types', () => { + const expectedError = /First parameter should be an object\./; + + assert.throws(() => topic.publishJSON('hi'), expectedError); + }); + + it('should transform JSON into a Buffer', () => { + const stub = sandbox.stub(topic, 'publish'); + const json = {foo: 'bar'}; + const expectedBuffer = Buffer.from(JSON.stringify(json)); + + topic.publishJSON(json); + + const [buffer] = stub.lastCall.args; + assert.deepStrictEqual(buffer, expectedBuffer); + }); + + it('should pass along the attributes and callback', () => { + const stub = sandbox.stub(topic, 'publish'); + const fakeAttributes = {}; + const fakeCallback = () => {}; + + topic.publishJSON({}, fakeAttributes, fakeCallback); + + const [, attributes, callback] = stub.lastCall.args; + assert.strictEqual(attributes, fakeAttributes); + assert.strictEqual(callback, fakeCallback); + }); + }); + describe('setPublishOptions', () => { it('should call through to Publisher#setOptions', () => { const fakeOptions = {}; From 7ac4f21c01c523d2979146571b0dc64eb16822d7 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 17 Jan 2019 06:46:53 -0800 Subject: [PATCH 0319/1115] Release @google-cloud/pubsub v0.23.0 (#432) --- handwritten/pubsub/CHANGELOG.md | 81 +++++++++++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 0acea87d32e..c334ececa08 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,87 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.23.0 + +01-16-2019 13:09 PST + +**This release has breaking changes.** + +#### BREAKING: `Topic#publisher()` has been removed in favor of `Topic#publish()` ([#426](https://github.com/googleapis/nodejs-pubsub/pull/426)) + +Before +```js +const publisher = topic.publisher(publishOptions); +await publisher.publish(Buffer.from('Hello, world!')); +``` + +After +```js +topic.setPublishOptions(publishOptions); +await topic.publish(Buffer.from('Hello, world!')); +``` + +#### BREAKING: `Subscription` options have changed. ([#388](https://github.com/googleapis/nodejs-pubsub/pull/388)) + +Before +```js +const subscription = topic.subscription('my-sub', { + batching: { + maxMilliseconds: 100, + }, + flowControl: { + maxBytes: os.freem() * 0.2, + maxMessages: 100, + }, + maxConnections: 5, +}); +``` + +After +```js +const subscription = topic.subscription('my-sub', { + ackDeadline: 10, + batching: { + callOptions: {}, // gax call options + maxMessages: 3000, + maxMilliseconds: 100, + }, + flowControl: { + allowExcessMessages: true, + maxBytes: os.freem() * 0.2, + maxExtension: Infinity, + maxMessages: 100 + }, + streamingOptions: { + highWaterMark: 0, + maxStreams: 5, // formerly known as maxConnections + timeout: 60000 * 5, // 5 minutes + } +}); +``` + +### New Features +- feat(topic): create method for publishing json ([#430](https://github.com/googleapis/nodejs-pubsub/pull/430)) + +### Dependencies +- fix(deps): update dependency google-gax to ^0.23.0 ([#423](https://github.com/googleapis/nodejs-pubsub/pull/423)) +- chore(deps): update dependency @types/sinon to v7 ([#411](https://github.com/googleapis/nodejs-pubsub/pull/411)) +- chore: update nyc and eslint configs ([#409](https://github.com/googleapis/nodejs-pubsub/pull/409)) + +### Documentation +- docs(samples): correct publish retry settings ([#419](https://github.com/googleapis/nodejs-pubsub/pull/419)) +- docs: sync generated grpc message type docs +- fix(docs): remove unused long running operations and IAM types +- fix: modernize the sample tests ([#414](https://github.com/googleapis/nodejs-pubsub/pull/414)) + +### Internal / Testing Changes +- chore: update subscriber gapic +- fix: add getSubscriberStub to synth file ([#425](https://github.com/googleapis/nodejs-pubsub/pull/425)) +- build: check broken links in generated docs ([#416](https://github.com/googleapis/nodejs-pubsub/pull/416)) +- chore(build): inject yoshi automation key ([#410](https://github.com/googleapis/nodejs-pubsub/pull/410)) +- chore: fix publish.sh permission +x ([#406](https://github.com/googleapis/nodejs-pubsub/pull/406)) +- fix(build): fix Kokoro release script ([#404](https://github.com/googleapis/nodejs-pubsub/pull/404)) + ## v0.22.2 12-10-2018 09:37 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 33752c5300c..5e1f19d126a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.22.2", + "version": "0.23.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 0721016455ae59bd050022eb55700d4b531844ba Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Thu, 17 Jan 2019 08:48:30 -0800 Subject: [PATCH 0320/1115] chore: update year in the license headers. (#434) --- .../pubsub/smoke-test/publisher_smoke_test.js | 2 +- .../src/v1/doc/google/iam/v1/doc_iam_policy.js | 2 +- .../pubsub/src/v1/doc/google/iam/v1/doc_policy.js | 2 +- .../src/v1/doc/google/protobuf/doc_duration.js | 2 +- .../pubsub/src/v1/doc/google/protobuf/doc_empty.js | 2 +- .../src/v1/doc/google/protobuf/doc_field_mask.js | 2 +- .../src/v1/doc/google/protobuf/doc_timestamp.js | 2 +- .../pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js | 2 +- handwritten/pubsub/src/v1/index.js | 2 +- handwritten/pubsub/src/v1/publisher_client.js | 2 +- handwritten/pubsub/src/v1/subscriber_client.js | 2 +- handwritten/pubsub/synth.metadata | 12 ++++++------ handwritten/pubsub/test/gapic-v1.js | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index cae73093ef4..b68c4ba1701 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js index 412a380e10c..f26716efea0 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js index 412a380e10c..f26716efea0 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js index c03ce2fb3df..1275f8f4d13 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js index b1d6b5e32a9..0b446dd9ce4 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js index 0cb35328962..d55d97e6e38 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js index 1cc64cbed80..b47f41c2b30 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index cdba395ed50..d3863e4e7f2 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js index 5ef2078e534..cdcdc5c67ad 100644 --- a/handwritten/pubsub/src/v1/index.js +++ b/handwritten/pubsub/src/v1/index.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index ff7f6d48445..c76c1fbf0e4 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 17a57c20065..a108eb30bae 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 2136b203fcc..a59a16bd0da 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,26 +1,26 @@ { - "updateTime": "2019-01-16T12:16:54.123649Z", + "updateTime": "2019-01-17T12:50:57.746664Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.5", - "dockerImage": "googleapis/artman@sha256:5a96c2c5c6f9570cc9556b63dc9ce1838777fd9166b5b64e43ad8e0ecee2fe2c" + "version": "0.16.6", + "dockerImage": "googleapis/artman@sha256:12722f2ca3fbc3b53cc6aa5f0e569d7d221b46bd876a2136497089dec5e3634e" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "7a81902f287a4ac2ac130994889c80f87f91d035", - "internalRef": "229452079" + "sha": "0ac60e21a1aa86c07c1836865b35308ba8178b05", + "internalRef": "229626798" } }, { "template": { "name": "node_library", "origin": "synthtool.gcp", - "version": "2018.12.6" + "version": "2019.1.16" } } ], diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index e5a2b357ece..0a98fb1b1f9 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC +// Copyright 2019 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From e4f7690731d61b498c82ac265c1361c05da2e8dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 17 Jan 2019 08:58:25 -0800 Subject: [PATCH 0321/1115] fix(deps): update dependency google-auth-library to v3 (#433) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5e1f19d126a..8b9b684f0fe 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "delay": "^4.0.0", "duplexify": "^3.5.4", "extend": "^3.0.1", - "google-auth-library": "^2.0.0", + "google-auth-library": "^3.0.0", "google-gax": "^0.23.0", "is": "^3.0.1", "is-stream-ended": "^0.1.4", From 7142af0feeb4ac28546c7c2ecc44668f9bccdb78 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 23 Jan 2019 16:41:08 -0800 Subject: [PATCH 0322/1115] feat(subscription): auto close sub on non-recoverable errors (#441) --- handwritten/pubsub/src/subscriber.ts | 5 ++++- handwritten/pubsub/src/subscription.ts | 6 +++++- handwritten/pubsub/test/subscriber.ts | 14 ++++++++++++++ handwritten/pubsub/test/subscription.ts | 5 +++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 970fad64e83..dea67dae6c1 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -251,6 +251,8 @@ export class Subscriber extends EventEmitter { this._inventory.clear(); await this._waitForFlush(); + + this.emit('close'); } /** * Gets the subscriber client instance. @@ -309,7 +311,8 @@ export class Subscriber extends EventEmitter { this._stream = new MessageStream(this, streamingOptions); this._stream.on('error', err => this.emit('error', err)) - .on('data', (data: PullResponse) => this._onData(data)); + .on('data', (data: PullResponse) => this._onData(data)) + .once('close', () => this.close()); this._inventory.on('full', () => this._stream.pause()) .on('free', () => this._stream.resume()); diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 49065b724f4..c594ce6ac37 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -168,6 +168,9 @@ export interface SubscriptionMetadata extends TSubscriptionMetadata { * // Register an error handler. * subscription.on('error', (err) => {}); * + * // Register a close handler in case the subscriber closes unexpectedly + * subscription.on('close', () => {}); + * * // Register a listener for `message` events. * function onMessage(message) { * // Called every time a message is received. @@ -251,7 +254,8 @@ export class Subscription extends EventEmitter { this._subscriber = new Subscriber(this, options as SubscriberOptions); this._subscriber.on('error', err => this.emit('error', err)) - .on('message', message => this.emit('message', message)); + .on('message', message => this.emit('message', message)) + .on('close', () => this.emit('close')); this._listen(); } diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index f25dc3a8c22..d0286f31357 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -315,6 +315,11 @@ describe('Subscriber', () => { assert.strictEqual(stub.callCount, 1); }); + it('should emit a close event', done => { + subscriber.on('close', done); + subscriber.close(); + }); + describe('flushing the queues', () => { it('should wait for any pending acks', async () => { const ackQueue: FakeAckQueue = stubs.get('ackQueue'); @@ -476,6 +481,15 @@ describe('Subscriber', () => { stream.emit('error', fakeError); }); + it('should close the subscriber if stream closes unexpectedly', () => { + const stub = sandbox.stub(subscriber, 'close'); + const stream: FakeMessageStream = stubs.get('messageStream'); + + stream.emit('close'); + + assert.strictEqual(stub.callCount, 1); + }); + it('should add messages to the inventory', done => { subscriber.open(); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index a4fbdfb3d79..0f613f8b001 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -211,6 +211,11 @@ describe('Subscription', () => { subscriber.emit('error', error); }); + + it('should emit close events', done => { + subscription.on('close', done); + subscriber.emit('close'); + }); }); describe('formatMetadata_', () => { From 596fdd5167d26d3cedd21bb2cb3847d04d7daf7a Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 23 Jan 2019 16:58:54 -0800 Subject: [PATCH 0323/1115] refactor: improve subscriber error handling (#440) --- handwritten/pubsub/src/message-queues.ts | 37 +++++++++++-- handwritten/pubsub/src/message-stream.ts | 56 +++++++++++++++----- handwritten/pubsub/test/message-queues.ts | 63 +++++++++++++++++++++++ handwritten/pubsub/test/message-stream.ts | 33 +++++++++++- 4 files changed, 172 insertions(+), 17 deletions(-) diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 587d3a93e1e..da0f9a0d638 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -15,6 +15,7 @@ */ import {CallOptions} from 'google-gax'; +import {Metadata, ServiceError, status} from 'grpc'; import * as defer from 'p-defer'; import {Message, Subscriber} from './subscriber'; @@ -37,6 +38,28 @@ export interface BatchOptions { maxMilliseconds?: number; } +/** + * Error class used to signal a batch failure. + * + * @class + * + * @param {string} message The error message. + * @param {ServiceError} err The grpc service error. + */ +export class BatchError extends Error implements ServiceError { + ackIds: string[]; + code?: status; + metadata?: Metadata; + constructor(err: ServiceError, ackIds: string[], rpc: string) { + super(`Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ + err.message}`); + + this.ackIds = ackIds; + this.code = err.code; + this.metadata = err.metadata; + } +} + /** * Class for buffering ack/modAck requests. * @@ -162,7 +185,11 @@ export class AckQueue extends MessageQueue { const ackIds = batch.map(([ackId]) => ackId); const reqOpts = {subscription: this._subscriber.name, ackIds}; - await client.acknowledge(reqOpts, this._options.callOptions!); + try { + await client.acknowledge(reqOpts, this._options.callOptions!); + } catch (e) { + throw new BatchError(e, ackIds, 'acknowledge'); + } } } @@ -194,12 +221,16 @@ export class ModAckQueue extends MessageQueue { return table; }, {}); - const modAckRequests = Object.keys(modAckTable).map(deadline => { + const modAckRequests = Object.keys(modAckTable).map(async (deadline) => { const ackIds = modAckTable[deadline]; const ackDeadlineSeconds = Number(deadline); const reqOpts = {subscription, ackIds, ackDeadlineSeconds}; - return client.modifyAckDeadline(reqOpts, this._options.callOptions!); + try { + await client.modifyAckDeadline(reqOpts, this._options.callOptions!); + } catch (e) { + throw new BatchError(e, ackIds, 'modifyAckDeadline'); + } }); await Promise.all(modAckRequests); diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 940e2bb8c36..58ec3c54272 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -16,7 +16,7 @@ import {promisify} from '@google-cloud/promisify'; import {ClientStub} from 'google-gax'; -import {ClientDuplexStream, Metadata, StatusObject} from 'grpc'; +import {ClientDuplexStream, Metadata, ServiceError, status, StatusObject} from 'grpc'; import * as isStreamEnded from 'is-stream-ended'; import {Duplex, PassThrough} from 'stream'; @@ -27,10 +27,20 @@ import {PullResponse, Subscriber} from './subscriber'; */ const KEEP_ALIVE_INTERVAL = 30000; +/*! + * Deadline Exceeded status code + */ +const DEADLINE: status = 4; + +/*! + * Unknown status code + */ +const UNKNOWN: status = 2; + /*! * codes to retry streams */ -const RETRY_CODES: number[] = [ +const RETRY_CODES: status[] = [ 0, // ok 1, // canceled 2, // unknown @@ -45,7 +55,7 @@ const RETRY_CODES: number[] = [ /*! * default stream options */ -const DEFAULT_OPTIONS = { +const DEFAULT_OPTIONS: MessageStreamOptions = { highWaterMark: 0, maxStreams: 5, timeout: 300000, @@ -73,9 +83,9 @@ type PullStream = ClientDuplexStream& * * @param {object} status The gRPC status object. */ -export class StatusError extends Error { - code: number; - metadata: Metadata; +export class StatusError extends Error implements ServiceError { + code?: status; + metadata?: Metadata; constructor(status: StatusObject) { super(status.details); this.code = status.code; @@ -83,6 +93,21 @@ export class StatusError extends Error { } } +/** + * Error thrown when we fail to open a channel for the message stream. + * + * @class + * + * @param {Error} err The original error. + */ +export class ChannelError extends Error implements ServiceError { + code: status; + constructor(err: Error) { + super(`Failed to connect to channel. Reason: ${err.message}`); + this.code = err.message.includes('deadline') ? DEADLINE : UNKNOWN; + } +} + /** * Ponyfill for destroying streams. * @@ -272,16 +297,18 @@ export class MessageStream extends PassThrough { } } /** - * Sometimes a gRPC status will be emitted as both a status event and an - * error event. In order to cut back on emitted errors, we'll ignore any - * error events that come in AFTER the status has been received. + * gRPC will usually emit a status as a ServiceError via `error` event before + * it emits the status itself. In order to cut back on emitted errors, we'll + * wait a tick on error and ignore it if the status has been received. * * @private * * @param {stream} stream The stream that errored. * @param {Error} err The error. */ - private _onError(stream: PullStream, err: Error): void { + private async _onError(stream: PullStream, err: Error): Promise { + await promisify(setImmediate)(); + const code = (err as StatusError).code; const receivedStatus = this._streams.get(stream) !== false; @@ -349,8 +376,13 @@ export class MessageStream extends PassThrough { * @param {object} client The gRPC client to wait for. * @returns {Promise} */ - private _waitForClientReady(client: ClientStub): Promise { + private async _waitForClientReady(client: ClientStub): Promise { const deadline = Date.now() + this._options.timeout!; - return promisify(client.waitForReady).call(client, deadline); + + try { + await promisify(client.waitForReady).call(client, deadline); + } catch (e) { + throw new ChannelError(e); + } } } diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index fa7af00d630..1ecdc31e738 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -16,10 +16,13 @@ import * as assert from 'assert'; import {EventEmitter} from 'events'; +import {Metadata, ServiceError} from 'grpc'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import * as uuid from 'uuid'; +import {BatchError} from '../src/message-queues'; + class FakeClient { async acknowledge(reqOpts, callOptions): Promise {} async modifyAckDeadline(reqOpts, callOptions): Promise {} @@ -296,6 +299,36 @@ describe('MessageQueues', () => { const [, callOptions] = stub.lastCall.args; assert.strictEqual(callOptions, fakeCallOptions); }); + + it('should throw a BatchError if unable to ack', done => { + const messages = [ + new FakeMessage(), + new FakeMessage(), + new FakeMessage(), + ]; + + const ackIds = messages.map(message => message.ackId); + + const fakeError: ServiceError = new Error('Err.'); + fakeError.code = 2; + fakeError.metadata = new Metadata(); + + const expectedMessage = + `Failed to "acknowledge" for 3 message(s). Reason: Err.`; + + sandbox.stub(subscriber.client, 'acknowledge').rejects(fakeError); + + subscriber.on('error', (err: BatchError) => { + assert.strictEqual(err.message, expectedMessage); + assert.deepStrictEqual(err.ackIds, ackIds); + assert.strictEqual(err.code, fakeError.code); + assert.strictEqual(err.metadata, fakeError.metadata); + done(); + }); + + messages.forEach(message => ackQueue.add(message)); + ackQueue.flush(); + }); }); describe('ModAckQueue', () => { @@ -376,5 +409,35 @@ describe('MessageQueues', () => { const [, callOptions] = stub.lastCall.args; assert.strictEqual(callOptions, fakeCallOptions); }); + + it('should throw a BatchError if unable to modAck', done => { + const messages = [ + new FakeMessage(), + new FakeMessage(), + new FakeMessage(), + ]; + + const ackIds = messages.map(message => message.ackId); + + const fakeError: ServiceError = new Error('Err.'); + fakeError.code = 2; + fakeError.metadata = new Metadata(); + + const expectedMessage = + `Failed to "modifyAckDeadline" for 3 message(s). Reason: Err.`; + + sandbox.stub(subscriber.client, 'modifyAckDeadline').rejects(fakeError); + + subscriber.on('error', (err: BatchError) => { + assert.strictEqual(err.message, expectedMessage); + assert.deepStrictEqual(err.ackIds, ackIds); + assert.strictEqual(err.code, fakeError.code); + assert.strictEqual(err.metadata, fakeError.metadata); + done(); + }); + + messages.forEach(message => modAckQueue.add(message)); + modAckQueue.flush(); + }); }); }); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index e8dfeb7cfc5..66d6c632f4a 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -377,13 +377,15 @@ describe('MessageStream', () => { }); }); - it('should destroy the stream if unable to verify channel', done => { + it('should destroy the stream if unable to connect to channel', done => { const stub = sandbox.stub(client, 'waitForReady'); const ms = new MessageStream(subscriber); const fakeError = new Error('err'); + const expectedMessage = `Failed to connect to channel. Reason: err`; ms.on('error', err => { - assert.strictEqual(err, fakeError); + assert.strictEqual(err.code, 2); + assert.strictEqual(err.message, expectedMessage); assert.strictEqual(ms.destroyed, true); done(); }); @@ -394,6 +396,22 @@ describe('MessageStream', () => { }); }); + it('should give a deadline error if waitForReady times out', done => { + const stub = sandbox.stub(client, 'waitForReady'); + const ms = new MessageStream(subscriber); + const fakeError = new Error('Failed to connect before the deadline'); + + ms.on('error', err => { + assert.strictEqual(err.code, 4); + done(); + }); + + setImmediate(() => { + const [, callback] = stub.lastCall.args; + callback(fakeError); + }); + }); + it('should emit non-status errors', done => { const fakeError = new Error('err'); @@ -405,6 +423,17 @@ describe('MessageStream', () => { client.streams[0].emit('error', fakeError); }); + it('should ignore status errors', done => { + const [stream] = client.streams; + const status = {code: 0}; + + messageStream.on('error', done); + stream.emit('error', status); + stream.emit('status', status); + + setImmediate(done); + }); + it('should ignore errors that come in after the status', done => { const [stream] = client.streams; From e9f542ab670f637a43e1099bd651e17e246bbeae Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Wed, 23 Jan 2019 17:59:18 -0700 Subject: [PATCH 0324/1115] build: ignore googleapis.com in doc link check (#439) --- handwritten/pubsub/.kokoro/docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.kokoro/docs.sh b/handwritten/pubsub/.kokoro/docs.sh index 8ca19ce2885..ea6e514f45d 100755 --- a/handwritten/pubsub/.kokoro/docs.sh +++ b/handwritten/pubsub/.kokoro/docs.sh @@ -30,4 +30,4 @@ BIN=./node_modules/.bin npm install broken-link-checker npm install http-server $BIN/http-server -p 8080 docs/ & -$BIN/blc -r http://localhost:8080 +$BIN/blc http://localhost:8080 -r --exclude www.googleapis.com From 1b3f3018779329beedb4c34d229c545cba79f514 Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Fri, 25 Jan 2019 12:44:20 +0530 Subject: [PATCH 0325/1115] refactor(typescript): noImplicityAny for topic.ts and subscription.ts (#420) --- handwritten/pubsub/package.json | 6 +- handwritten/pubsub/proto/pubsub.d.ts | 8183 ++++++++++++++++++++++ handwritten/pubsub/src/index.ts | 92 +- handwritten/pubsub/src/subscription.ts | 194 +- handwritten/pubsub/src/topic.ts | 146 +- handwritten/pubsub/system-test/pubsub.ts | 44 +- 6 files changed, 8532 insertions(+), 133 deletions(-) create mode 100644 handwritten/pubsub/proto/pubsub.d.ts diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8b9b684f0fe..1b37c525fa1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -30,7 +30,7 @@ "google pubsub", "pubsub" ], - "scripts": { + "scripts": { "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", @@ -43,7 +43,9 @@ "clean": "gts clean", "compile": "tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", "prepare": "npm run compile", - "pretest": "npm run compile" + "pretest": "npm run compile", + "proto": "npm run proto:pubsub", + "proto:pubsub": "mkdir -p proto && pbjs -t static-module -w commonjs -p node_modules/google-proto-files google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -" }, "dependencies": { "@google-cloud/paginator": "^0.1.0", diff --git a/handwritten/pubsub/proto/pubsub.d.ts b/handwritten/pubsub/proto/pubsub.d.ts new file mode 100644 index 00000000000..935b63002c2 --- /dev/null +++ b/handwritten/pubsub/proto/pubsub.d.ts @@ -0,0 +1,8183 @@ +import * as $protobuf from "protobufjs"; +/** Namespace google. */ +export namespace google { + + /** Namespace pubsub. */ + namespace pubsub { + + /** Namespace v1. */ + namespace v1 { + + /** Represents a Publisher */ + class Publisher extends $protobuf.rpc.Service { + + /** + * Constructs a new Publisher service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new Publisher service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Publisher; + + /** + * Calls CreateTopic. + * @param request Topic message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public createTopic(request: google.pubsub.v1.ITopic, callback: google.pubsub.v1.Publisher.CreateTopicCallback): void; + + /** + * Calls CreateTopic. + * @param request Topic message or plain object + * @returns Promise + */ + public createTopic(request: google.pubsub.v1.ITopic): Promise; + + /** + * Calls UpdateTopic. + * @param request UpdateTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest, callback: google.pubsub.v1.Publisher.UpdateTopicCallback): void; + + /** + * Calls UpdateTopic. + * @param request UpdateTopicRequest message or plain object + * @returns Promise + */ + public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest): Promise; + + /** + * Calls Publish. + * @param request PublishRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PublishResponse + */ + public publish(request: google.pubsub.v1.IPublishRequest, callback: google.pubsub.v1.Publisher.PublishCallback): void; + + /** + * Calls Publish. + * @param request PublishRequest message or plain object + * @returns Promise + */ + public publish(request: google.pubsub.v1.IPublishRequest): Promise; + + /** + * Calls GetTopic. + * @param request GetTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public getTopic(request: google.pubsub.v1.IGetTopicRequest, callback: google.pubsub.v1.Publisher.GetTopicCallback): void; + + /** + * Calls GetTopic. + * @param request GetTopicRequest message or plain object + * @returns Promise + */ + public getTopic(request: google.pubsub.v1.IGetTopicRequest): Promise; + + /** + * Calls ListTopics. + * @param request ListTopicsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicsResponse + */ + public listTopics(request: google.pubsub.v1.IListTopicsRequest, callback: google.pubsub.v1.Publisher.ListTopicsCallback): void; + + /** + * Calls ListTopics. + * @param request ListTopicsRequest message or plain object + * @returns Promise + */ + public listTopics(request: google.pubsub.v1.IListTopicsRequest): Promise; + + /** + * Calls ListTopicSubscriptions. + * @param request ListTopicSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse + */ + public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest, callback: google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback): void; + + /** + * Calls ListTopicSubscriptions. + * @param request ListTopicSubscriptionsRequest message or plain object + * @returns Promise + */ + public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest): Promise; + + /** + * Calls ListTopicSnapshots. + * @param request ListTopicSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse + */ + public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest, callback: google.pubsub.v1.Publisher.ListTopicSnapshotsCallback): void; + + /** + * Calls ListTopicSnapshots. + * @param request ListTopicSnapshotsRequest message or plain object + * @returns Promise + */ + public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest): Promise; + + /** + * Calls DeleteTopic. + * @param request DeleteTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest, callback: google.pubsub.v1.Publisher.DeleteTopicCallback): void; + + /** + * Calls DeleteTopic. + * @param request DeleteTopicRequest message or plain object + * @returns Promise + */ + public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest): Promise; + } + + namespace Publisher { + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type CreateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type UpdateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * @param error Error, if any + * @param [response] PublishResponse + */ + type PublishCallback = (error: (Error|null), response?: google.pubsub.v1.PublishResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type GetTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * @param error Error, if any + * @param [response] ListTopicsResponse + */ + type ListTopicsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * @param error Error, if any + * @param [response] ListTopicSubscriptionsResponse + */ + type ListTopicSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSubscriptionsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * @param error Error, if any + * @param [response] ListTopicSnapshotsResponse + */ + type ListTopicSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSnapshotsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + } + + /** Represents a Subscriber */ + class Subscriber extends $protobuf.rpc.Service { + + /** + * Constructs a new Subscriber service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new Subscriber service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; + + /** + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; + + /** + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @returns Promise + */ + public createSubscription(request: google.pubsub.v1.ISubscription): Promise; + + /** + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; + + /** + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @returns Promise + */ + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; + + /** + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; + + /** + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @returns Promise + */ + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; + + /** + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse + */ + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; + + /** + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @returns Promise + */ + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; + + /** + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; + + /** + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @returns Promise + */ + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; + + /** + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; + + /** + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @returns Promise + */ + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; + + /** + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; + + /** + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @returns Promise + */ + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; + + /** + * Calls Pull. + * @param request PullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PullResponse + */ + public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; + + /** + * Calls Pull. + * @param request PullRequest message or plain object + * @returns Promise + */ + public pull(request: google.pubsub.v1.IPullRequest): Promise; + + /** + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and StreamingPullResponse + */ + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; + + /** + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @returns Promise + */ + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; + + /** + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; + + /** + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @returns Promise + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; + + /** + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; + + /** + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @returns Promise + */ + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; + + /** + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse + */ + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; + + /** + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @returns Promise + */ + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; + + /** + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; + + /** + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @returns Promise + */ + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; + + /** + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; + + /** + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @returns Promise + */ + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; + + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; + + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @returns Promise + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; + + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @param callback Node-style callback called with the error, if any, and SeekResponse + */ + public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; + + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @returns Promise + */ + public seek(request: google.pubsub.v1.ISeekRequest): Promise; + } + + namespace Subscriber { + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * @param error Error, if any + * @param [response] ListSubscriptionsResponse + */ + type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * @param error Error, if any + * @param [response] Empty + */ + type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * @param error Error, if any + * @param [response] PullResponse + */ + type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * @param error Error, if any + * @param [response] StreamingPullResponse + */ + type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * @param error Error, if any + * @param [response] ListSnapshotsResponse + */ + type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * @param error Error, if any + * @param [response] SeekResponse + */ + type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; + } + + /** Properties of a MessageStoragePolicy. */ + interface IMessageStoragePolicy { + + /** MessageStoragePolicy allowedPersistenceRegions */ + allowedPersistenceRegions?: (string[]|null); + } + + /** Represents a MessageStoragePolicy. */ + class MessageStoragePolicy implements IMessageStoragePolicy { + + /** + * Constructs a new MessageStoragePolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); + + /** MessageStoragePolicy allowedPersistenceRegions. */ + public allowedPersistenceRegions: string[]; + + /** + * Creates a new MessageStoragePolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageStoragePolicy instance + */ + public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; + + /** + * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; + + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; + + /** + * Verifies a MessageStoragePolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageStoragePolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; + + /** + * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * @param message MessageStoragePolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MessageStoragePolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Topic. */ + interface ITopic { + + /** Topic name */ + name?: (string|null); + + /** Topic labels */ + labels?: ({ [k: string]: string }|null); + + /** Topic messageStoragePolicy */ + messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + } + + /** Represents a Topic. */ + class Topic implements ITopic { + + /** + * Constructs a new Topic. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ITopic); + + /** Topic name. */ + public name: string; + + /** Topic labels. */ + public labels: { [k: string]: string }; + + /** Topic messageStoragePolicy. */ + public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + + /** + * Creates a new Topic instance using the specified properties. + * @param [properties] Properties to set + * @returns Topic instance + */ + public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; + + /** + * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Topic message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; + + /** + * Decodes a Topic message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; + + /** + * Verifies a Topic message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Topic + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; + + /** + * Creates a plain object from a Topic message. Also converts values to other types if specified. + * @param message Topic + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Topic to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PubsubMessage. */ + interface IPubsubMessage { + + /** PubsubMessage data */ + data?: (Uint8Array|null); + + /** PubsubMessage attributes */ + attributes?: ({ [k: string]: string }|null); + + /** PubsubMessage messageId */ + messageId?: (string|null); + + /** PubsubMessage publishTime */ + publishTime?: (google.protobuf.ITimestamp|null); + } + + /** Represents a PubsubMessage. */ + class PubsubMessage implements IPubsubMessage { + + /** + * Constructs a new PubsubMessage. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPubsubMessage); + + /** PubsubMessage data. */ + public data: Uint8Array; + + /** PubsubMessage attributes. */ + public attributes: { [k: string]: string }; + + /** PubsubMessage messageId. */ + public messageId: string; + + /** PubsubMessage publishTime. */ + public publishTime?: (google.protobuf.ITimestamp|null); + + /** + * Creates a new PubsubMessage instance using the specified properties. + * @param [properties] Properties to set + * @returns PubsubMessage instance + */ + public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; + + /** + * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PubsubMessage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; + + /** + * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; + + /** + * Verifies a PubsubMessage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PubsubMessage + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; + + /** + * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * @param message PubsubMessage + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PubsubMessage to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetTopicRequest. */ + interface IGetTopicRequest { + + /** GetTopicRequest topic */ + topic?: (string|null); + } + + /** Represents a GetTopicRequest. */ + class GetTopicRequest implements IGetTopicRequest { + + /** + * Constructs a new GetTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetTopicRequest); + + /** GetTopicRequest topic. */ + public topic: string; + + /** + * Creates a new GetTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; + + /** + * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; + + /** + * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; + + /** + * Verifies a GetTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; + + /** + * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * @param message GetTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an UpdateTopicRequest. */ + interface IUpdateTopicRequest { + + /** UpdateTopicRequest topic */ + topic?: (google.pubsub.v1.ITopic|null); + + /** UpdateTopicRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } + + /** Represents an UpdateTopicRequest. */ + class UpdateTopicRequest implements IUpdateTopicRequest { + + /** + * Constructs a new UpdateTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); + + /** UpdateTopicRequest topic. */ + public topic?: (google.pubsub.v1.ITopic|null); + + /** UpdateTopicRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); + + /** + * Creates a new UpdateTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; + + /** + * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; + + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; + + /** + * Verifies an UpdateTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; + + /** + * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * @param message UpdateTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UpdateTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PublishRequest. */ + interface IPublishRequest { + + /** PublishRequest topic */ + topic?: (string|null); + + /** PublishRequest messages */ + messages?: (google.pubsub.v1.IPubsubMessage[]|null); + } + + /** Represents a PublishRequest. */ + class PublishRequest implements IPublishRequest { + + /** + * Constructs a new PublishRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPublishRequest); + + /** PublishRequest topic. */ + public topic: string; + + /** PublishRequest messages. */ + public messages: google.pubsub.v1.IPubsubMessage[]; + + /** + * Creates a new PublishRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns PublishRequest instance + */ + public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; + + /** + * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PublishRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PublishRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; + + /** + * Decodes a PublishRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PublishRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; + + /** + * Verifies a PublishRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PublishRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; + + /** + * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. + * @param message PublishRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PublishRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PublishResponse. */ + interface IPublishResponse { + + /** PublishResponse messageIds */ + messageIds?: (string[]|null); + } + + /** Represents a PublishResponse. */ + class PublishResponse implements IPublishResponse { + + /** + * Constructs a new PublishResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPublishResponse); + + /** PublishResponse messageIds. */ + public messageIds: string[]; + + /** + * Creates a new PublishResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns PublishResponse instance + */ + public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; + + /** + * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PublishResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; + + /** + * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; + + /** + * Verifies a PublishResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PublishResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; + + /** + * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * @param message PublishResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PublishResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicsRequest. */ + interface IListTopicsRequest { + + /** ListTopicsRequest project */ + project?: (string|null); + + /** ListTopicsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListTopicsRequest. */ + class ListTopicsRequest implements IListTopicsRequest { + + /** + * Constructs a new ListTopicsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicsRequest); + + /** ListTopicsRequest project. */ + public project: string; + + /** ListTopicsRequest pageSize. */ + public pageSize: number; + + /** ListTopicsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListTopicsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; + + /** + * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; + + /** + * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; + + /** + * Verifies a ListTopicsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; + + /** + * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * @param message ListTopicsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicsResponse. */ + interface IListTopicsResponse { + + /** ListTopicsResponse topics */ + topics?: (google.pubsub.v1.ITopic[]|null); + + /** ListTopicsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListTopicsResponse. */ + class ListTopicsResponse implements IListTopicsResponse { + + /** + * Constructs a new ListTopicsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicsResponse); + + /** ListTopicsResponse topics. */ + public topics: google.pubsub.v1.ITopic[]; + + /** ListTopicsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListTopicsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; + + /** + * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; + + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; + + /** + * Verifies a ListTopicsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; + + /** + * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * @param message ListTopicsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicSubscriptionsRequest. */ + interface IListTopicSubscriptionsRequest { + + /** ListTopicSubscriptionsRequest topic */ + topic?: (string|null); + + /** ListTopicSubscriptionsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicSubscriptionsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListTopicSubscriptionsRequest. */ + class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { + + /** + * Constructs a new ListTopicSubscriptionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); + + /** ListTopicSubscriptionsRequest topic. */ + public topic: string; + + /** ListTopicSubscriptionsRequest pageSize. */ + public pageSize: number; + + /** ListTopicSubscriptionsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSubscriptionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; + + /** + * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; + + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; + + /** + * Verifies a ListTopicSubscriptionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSubscriptionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; + + /** + * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicSubscriptionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicSubscriptionsResponse. */ + interface IListTopicSubscriptionsResponse { + + /** ListTopicSubscriptionsResponse subscriptions */ + subscriptions?: (string[]|null); + + /** ListTopicSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListTopicSubscriptionsResponse. */ + class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { + + /** + * Constructs a new ListTopicSubscriptionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); + + /** ListTopicSubscriptionsResponse subscriptions. */ + public subscriptions: string[]; + + /** ListTopicSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSubscriptionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; + + /** + * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; + + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; + + /** + * Verifies a ListTopicSubscriptionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSubscriptionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; + + /** + * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicSubscriptionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicSnapshotsRequest. */ + interface IListTopicSnapshotsRequest { + + /** ListTopicSnapshotsRequest topic */ + topic?: (string|null); + + /** ListTopicSnapshotsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicSnapshotsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListTopicSnapshotsRequest. */ + class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { + + /** + * Constructs a new ListTopicSnapshotsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); + + /** ListTopicSnapshotsRequest topic. */ + public topic: string; + + /** ListTopicSnapshotsRequest pageSize. */ + public pageSize: number; + + /** ListTopicSnapshotsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListTopicSnapshotsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSnapshotsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; + + /** + * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; + + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; + + /** + * Verifies a ListTopicSnapshotsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSnapshotsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; + + /** + * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicSnapshotsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicSnapshotsResponse. */ + interface IListTopicSnapshotsResponse { + + /** ListTopicSnapshotsResponse snapshots */ + snapshots?: (string[]|null); + + /** ListTopicSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListTopicSnapshotsResponse. */ + class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { + + /** + * Constructs a new ListTopicSnapshotsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); + + /** ListTopicSnapshotsResponse snapshots. */ + public snapshots: string[]; + + /** ListTopicSnapshotsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListTopicSnapshotsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSnapshotsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; + + /** + * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; + + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; + + /** + * Verifies a ListTopicSnapshotsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSnapshotsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; + + /** + * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicSnapshotsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DeleteTopicRequest. */ + interface IDeleteTopicRequest { + + /** DeleteTopicRequest topic */ + topic?: (string|null); + } + + /** Represents a DeleteTopicRequest. */ + class DeleteTopicRequest implements IDeleteTopicRequest { + + /** + * Constructs a new DeleteTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); + + /** DeleteTopicRequest topic. */ + public topic: string; + + /** + * Creates a new DeleteTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; + + /** + * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; + + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; + + /** + * Verifies a DeleteTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; + + /** + * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. + * @param message DeleteTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeleteTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Subscription. */ + interface ISubscription { + + /** Subscription name */ + name?: (string|null); + + /** Subscription topic */ + topic?: (string|null); + + /** Subscription pushConfig */ + pushConfig?: (google.pubsub.v1.IPushConfig|null); + + /** Subscription ackDeadlineSeconds */ + ackDeadlineSeconds?: (number|null); + + /** Subscription retainAckedMessages */ + retainAckedMessages?: (boolean|null); + + /** Subscription messageRetentionDuration */ + messageRetentionDuration?: (google.protobuf.IDuration|null); + + /** Subscription labels */ + labels?: ({ [k: string]: string }|null); + + /** Subscription expirationPolicy */ + expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + } + + /** Represents a Subscription. */ + class Subscription implements ISubscription { + + /** + * Constructs a new Subscription. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISubscription); + + /** Subscription name. */ + public name: string; + + /** Subscription topic. */ + public topic: string; + + /** Subscription pushConfig. */ + public pushConfig?: (google.pubsub.v1.IPushConfig|null); + + /** Subscription ackDeadlineSeconds. */ + public ackDeadlineSeconds: number; + + /** Subscription retainAckedMessages. */ + public retainAckedMessages: boolean; + + /** Subscription messageRetentionDuration. */ + public messageRetentionDuration?: (google.protobuf.IDuration|null); + + /** Subscription labels. */ + public labels: { [k: string]: string }; + + /** Subscription expirationPolicy. */ + public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + + /** + * Creates a new Subscription instance using the specified properties. + * @param [properties] Properties to set + * @returns Subscription instance + */ + public static create(properties?: google.pubsub.v1.ISubscription): google.pubsub.v1.Subscription; + + /** + * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @param message Subscription message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @param message Subscription message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Subscription message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Subscription; + + /** + * Decodes a Subscription message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Subscription; + + /** + * Verifies a Subscription message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Subscription message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Subscription + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Subscription; + + /** + * Creates a plain object from a Subscription message. Also converts values to other types if specified. + * @param message Subscription + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Subscription, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Subscription to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an ExpirationPolicy. */ + interface IExpirationPolicy { + + /** ExpirationPolicy ttl */ + ttl?: (google.protobuf.IDuration|null); + } + + /** Represents an ExpirationPolicy. */ + class ExpirationPolicy implements IExpirationPolicy { + + /** + * Constructs a new ExpirationPolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IExpirationPolicy); + + /** ExpirationPolicy ttl. */ + public ttl?: (google.protobuf.IDuration|null); + + /** + * Creates a new ExpirationPolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns ExpirationPolicy instance + */ + public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; + + /** + * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; + + /** + * Verifies an ExpirationPolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExpirationPolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; + + /** + * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. + * @param message ExpirationPolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExpirationPolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PushConfig. */ + interface IPushConfig { + + /** PushConfig pushEndpoint */ + pushEndpoint?: (string|null); + + /** PushConfig attributes */ + attributes?: ({ [k: string]: string }|null); + } + + /** Represents a PushConfig. */ + class PushConfig implements IPushConfig { + + /** + * Constructs a new PushConfig. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPushConfig); + + /** PushConfig pushEndpoint. */ + public pushEndpoint: string; + + /** PushConfig attributes. */ + public attributes: { [k: string]: string }; + + /** + * Creates a new PushConfig instance using the specified properties. + * @param [properties] Properties to set + * @returns PushConfig instance + */ + public static create(properties?: google.pubsub.v1.IPushConfig): google.pubsub.v1.PushConfig; + + /** + * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @param message PushConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @param message PushConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PushConfig message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig; + + /** + * Decodes a PushConfig message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig; + + /** + * Verifies a PushConfig message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PushConfig + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig; + + /** + * Creates a plain object from a PushConfig message. Also converts values to other types if specified. + * @param message PushConfig + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PushConfig to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ReceivedMessage. */ + interface IReceivedMessage { + + /** ReceivedMessage ackId */ + ackId?: (string|null); + + /** ReceivedMessage message */ + message?: (google.pubsub.v1.IPubsubMessage|null); + } + + /** Represents a ReceivedMessage. */ + class ReceivedMessage implements IReceivedMessage { + + /** + * Constructs a new ReceivedMessage. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IReceivedMessage); + + /** ReceivedMessage ackId. */ + public ackId: string; + + /** ReceivedMessage message. */ + public message?: (google.pubsub.v1.IPubsubMessage|null); + + /** + * Creates a new ReceivedMessage instance using the specified properties. + * @param [properties] Properties to set + * @returns ReceivedMessage instance + */ + public static create(properties?: google.pubsub.v1.IReceivedMessage): google.pubsub.v1.ReceivedMessage; + + /** + * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @param message ReceivedMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @param message ReceivedMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ReceivedMessage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ReceivedMessage; + + /** + * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ReceivedMessage; + + /** + * Verifies a ReceivedMessage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ReceivedMessage + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ReceivedMessage; + + /** + * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. + * @param message ReceivedMessage + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ReceivedMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ReceivedMessage to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetSubscriptionRequest. */ + interface IGetSubscriptionRequest { + + /** GetSubscriptionRequest subscription */ + subscription?: (string|null); + } + + /** Represents a GetSubscriptionRequest. */ + class GetSubscriptionRequest implements IGetSubscriptionRequest { + + /** + * Constructs a new GetSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetSubscriptionRequest); + + /** GetSubscriptionRequest subscription. */ + public subscription: string; + + /** + * Creates a new GetSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetSubscriptionRequest): google.pubsub.v1.GetSubscriptionRequest; + + /** + * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @param message GetSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @param message GetSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSubscriptionRequest; + + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSubscriptionRequest; + + /** + * Verifies a GetSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSubscriptionRequest; + + /** + * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. + * @param message GetSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an UpdateSubscriptionRequest. */ + interface IUpdateSubscriptionRequest { + + /** UpdateSubscriptionRequest subscription */ + subscription?: (google.pubsub.v1.ISubscription|null); + + /** UpdateSubscriptionRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } + + /** Represents an UpdateSubscriptionRequest. */ + class UpdateSubscriptionRequest implements IUpdateSubscriptionRequest { + + /** + * Constructs a new UpdateSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateSubscriptionRequest); + + /** UpdateSubscriptionRequest subscription. */ + public subscription?: (google.pubsub.v1.ISubscription|null); + + /** UpdateSubscriptionRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); + + /** + * Creates a new UpdateSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateSubscriptionRequest): google.pubsub.v1.UpdateSubscriptionRequest; + + /** + * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @param message UpdateSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @param message UpdateSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSubscriptionRequest; + + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSubscriptionRequest; + + /** + * Verifies an UpdateSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSubscriptionRequest; + + /** + * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. + * @param message UpdateSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UpdateSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSubscriptionsRequest. */ + interface IListSubscriptionsRequest { + + /** ListSubscriptionsRequest project */ + project?: (string|null); + + /** ListSubscriptionsRequest pageSize */ + pageSize?: (number|null); + + /** ListSubscriptionsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListSubscriptionsRequest. */ + class ListSubscriptionsRequest implements IListSubscriptionsRequest { + + /** + * Constructs a new ListSubscriptionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSubscriptionsRequest); + + /** ListSubscriptionsRequest project. */ + public project: string; + + /** ListSubscriptionsRequest pageSize. */ + public pageSize: number; + + /** ListSubscriptionsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListSubscriptionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSubscriptionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSubscriptionsRequest): google.pubsub.v1.ListSubscriptionsRequest; + + /** + * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @param message ListSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @param message ListSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsRequest; + + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsRequest; + + /** + * Verifies a ListSubscriptionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSubscriptionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsRequest; + + /** + * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListSubscriptionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSubscriptionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSubscriptionsResponse. */ + interface IListSubscriptionsResponse { + + /** ListSubscriptionsResponse subscriptions */ + subscriptions?: (google.pubsub.v1.ISubscription[]|null); + + /** ListSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListSubscriptionsResponse. */ + class ListSubscriptionsResponse implements IListSubscriptionsResponse { + + /** + * Constructs a new ListSubscriptionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSubscriptionsResponse); + + /** ListSubscriptionsResponse subscriptions. */ + public subscriptions: google.pubsub.v1.ISubscription[]; + + /** ListSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListSubscriptionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSubscriptionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListSubscriptionsResponse): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @param message ListSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @param message ListSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Verifies a ListSubscriptionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSubscriptionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListSubscriptionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSubscriptionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DeleteSubscriptionRequest. */ + interface IDeleteSubscriptionRequest { + + /** DeleteSubscriptionRequest subscription */ + subscription?: (string|null); + } + + /** Represents a DeleteSubscriptionRequest. */ + class DeleteSubscriptionRequest implements IDeleteSubscriptionRequest { + + /** + * Constructs a new DeleteSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteSubscriptionRequest); + + /** DeleteSubscriptionRequest subscription. */ + public subscription: string; + + /** + * Creates a new DeleteSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteSubscriptionRequest): google.pubsub.v1.DeleteSubscriptionRequest; + + /** + * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @param message DeleteSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @param message DeleteSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSubscriptionRequest; + + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSubscriptionRequest; + + /** + * Verifies a DeleteSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSubscriptionRequest; + + /** + * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. + * @param message DeleteSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeleteSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ModifyPushConfigRequest. */ + interface IModifyPushConfigRequest { + + /** ModifyPushConfigRequest subscription */ + subscription?: (string|null); + + /** ModifyPushConfigRequest pushConfig */ + pushConfig?: (google.pubsub.v1.IPushConfig|null); + } + + /** Represents a ModifyPushConfigRequest. */ + class ModifyPushConfigRequest implements IModifyPushConfigRequest { + + /** + * Constructs a new ModifyPushConfigRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IModifyPushConfigRequest); + + /** ModifyPushConfigRequest subscription. */ + public subscription: string; + + /** ModifyPushConfigRequest pushConfig. */ + public pushConfig?: (google.pubsub.v1.IPushConfig|null); + + /** + * Creates a new ModifyPushConfigRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ModifyPushConfigRequest instance + */ + public static create(properties?: google.pubsub.v1.IModifyPushConfigRequest): google.pubsub.v1.ModifyPushConfigRequest; + + /** + * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @param message ModifyPushConfigRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @param message ModifyPushConfigRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyPushConfigRequest; + + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyPushConfigRequest; + + /** + * Verifies a ModifyPushConfigRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ModifyPushConfigRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyPushConfigRequest; + + /** + * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. + * @param message ModifyPushConfigRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ModifyPushConfigRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ModifyPushConfigRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PullRequest. */ + interface IPullRequest { + + /** PullRequest subscription */ + subscription?: (string|null); + + /** PullRequest returnImmediately */ + returnImmediately?: (boolean|null); + + /** PullRequest maxMessages */ + maxMessages?: (number|null); + } + + /** Represents a PullRequest. */ + class PullRequest implements IPullRequest { + + /** + * Constructs a new PullRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPullRequest); + + /** PullRequest subscription. */ + public subscription: string; + + /** PullRequest returnImmediately. */ + public returnImmediately: boolean; + + /** PullRequest maxMessages. */ + public maxMessages: number; + + /** + * Creates a new PullRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns PullRequest instance + */ + public static create(properties?: google.pubsub.v1.IPullRequest): google.pubsub.v1.PullRequest; + + /** + * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @param message PullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @param message PullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PullRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullRequest; + + /** + * Decodes a PullRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullRequest; + + /** + * Verifies a PullRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PullRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullRequest; + + /** + * Creates a plain object from a PullRequest message. Also converts values to other types if specified. + * @param message PullRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PullRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PullResponse. */ + interface IPullResponse { + + /** PullResponse receivedMessages */ + receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + } + + /** Represents a PullResponse. */ + class PullResponse implements IPullResponse { + + /** + * Constructs a new PullResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPullResponse); + + /** PullResponse receivedMessages. */ + public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + + /** + * Creates a new PullResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns PullResponse instance + */ + public static create(properties?: google.pubsub.v1.IPullResponse): google.pubsub.v1.PullResponse; + + /** + * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @param message PullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @param message PullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PullResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullResponse; + + /** + * Decodes a PullResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullResponse; + + /** + * Verifies a PullResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PullResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullResponse; + + /** + * Creates a plain object from a PullResponse message. Also converts values to other types if specified. + * @param message PullResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PullResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ModifyAckDeadlineRequest. */ + interface IModifyAckDeadlineRequest { + + /** ModifyAckDeadlineRequest subscription */ + subscription?: (string|null); + + /** ModifyAckDeadlineRequest ackIds */ + ackIds?: (string[]|null); + + /** ModifyAckDeadlineRequest ackDeadlineSeconds */ + ackDeadlineSeconds?: (number|null); + } + + /** Represents a ModifyAckDeadlineRequest. */ + class ModifyAckDeadlineRequest implements IModifyAckDeadlineRequest { + + /** + * Constructs a new ModifyAckDeadlineRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IModifyAckDeadlineRequest); + + /** ModifyAckDeadlineRequest subscription. */ + public subscription: string; + + /** ModifyAckDeadlineRequest ackIds. */ + public ackIds: string[]; + + /** ModifyAckDeadlineRequest ackDeadlineSeconds. */ + public ackDeadlineSeconds: number; + + /** + * Creates a new ModifyAckDeadlineRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ModifyAckDeadlineRequest instance + */ + public static create(properties?: google.pubsub.v1.IModifyAckDeadlineRequest): google.pubsub.v1.ModifyAckDeadlineRequest; + + /** + * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @param message ModifyAckDeadlineRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @param message ModifyAckDeadlineRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyAckDeadlineRequest; + + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyAckDeadlineRequest; + + /** + * Verifies a ModifyAckDeadlineRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ModifyAckDeadlineRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyAckDeadlineRequest; + + /** + * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. + * @param message ModifyAckDeadlineRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ModifyAckDeadlineRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ModifyAckDeadlineRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an AcknowledgeRequest. */ + interface IAcknowledgeRequest { + + /** AcknowledgeRequest subscription */ + subscription?: (string|null); + + /** AcknowledgeRequest ackIds */ + ackIds?: (string[]|null); + } + + /** Represents an AcknowledgeRequest. */ + class AcknowledgeRequest implements IAcknowledgeRequest { + + /** + * Constructs a new AcknowledgeRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IAcknowledgeRequest); + + /** AcknowledgeRequest subscription. */ + public subscription: string; + + /** AcknowledgeRequest ackIds. */ + public ackIds: string[]; + + /** + * Creates a new AcknowledgeRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns AcknowledgeRequest instance + */ + public static create(properties?: google.pubsub.v1.IAcknowledgeRequest): google.pubsub.v1.AcknowledgeRequest; + + /** + * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @param message AcknowledgeRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @param message AcknowledgeRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.AcknowledgeRequest; + + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.AcknowledgeRequest; + + /** + * Verifies an AcknowledgeRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AcknowledgeRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.AcknowledgeRequest; + + /** + * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. + * @param message AcknowledgeRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.AcknowledgeRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AcknowledgeRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a StreamingPullRequest. */ + interface IStreamingPullRequest { + + /** StreamingPullRequest subscription */ + subscription?: (string|null); + + /** StreamingPullRequest ackIds */ + ackIds?: (string[]|null); + + /** StreamingPullRequest modifyDeadlineSeconds */ + modifyDeadlineSeconds?: (number[]|null); + + /** StreamingPullRequest modifyDeadlineAckIds */ + modifyDeadlineAckIds?: (string[]|null); + + /** StreamingPullRequest streamAckDeadlineSeconds */ + streamAckDeadlineSeconds?: (number|null); + } + + /** Represents a StreamingPullRequest. */ + class StreamingPullRequest implements IStreamingPullRequest { + + /** + * Constructs a new StreamingPullRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IStreamingPullRequest); + + /** StreamingPullRequest subscription. */ + public subscription: string; + + /** StreamingPullRequest ackIds. */ + public ackIds: string[]; + + /** StreamingPullRequest modifyDeadlineSeconds. */ + public modifyDeadlineSeconds: number[]; + + /** StreamingPullRequest modifyDeadlineAckIds. */ + public modifyDeadlineAckIds: string[]; + + /** StreamingPullRequest streamAckDeadlineSeconds. */ + public streamAckDeadlineSeconds: number; + + /** + * Creates a new StreamingPullRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns StreamingPullRequest instance + */ + public static create(properties?: google.pubsub.v1.IStreamingPullRequest): google.pubsub.v1.StreamingPullRequest; + + /** + * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @param message StreamingPullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @param message StreamingPullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullRequest; + + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullRequest; + + /** + * Verifies a StreamingPullRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns StreamingPullRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullRequest; + + /** + * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. + * @param message StreamingPullRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this StreamingPullRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a StreamingPullResponse. */ + interface IStreamingPullResponse { + + /** StreamingPullResponse receivedMessages */ + receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + } + + /** Represents a StreamingPullResponse. */ + class StreamingPullResponse implements IStreamingPullResponse { + + /** + * Constructs a new StreamingPullResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IStreamingPullResponse); + + /** StreamingPullResponse receivedMessages. */ + public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + + /** + * Creates a new StreamingPullResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns StreamingPullResponse instance + */ + public static create(properties?: google.pubsub.v1.IStreamingPullResponse): google.pubsub.v1.StreamingPullResponse; + + /** + * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @param message StreamingPullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @param message StreamingPullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a StreamingPullResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns StreamingPullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse; + + /** + * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns StreamingPullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse; + + /** + * Verifies a StreamingPullResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns StreamingPullResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse; + + /** + * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. + * @param message StreamingPullResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this StreamingPullResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a CreateSnapshotRequest. */ + interface ICreateSnapshotRequest { + + /** CreateSnapshotRequest name */ + name?: (string|null); + + /** CreateSnapshotRequest subscription */ + subscription?: (string|null); + + /** CreateSnapshotRequest labels */ + labels?: ({ [k: string]: string }|null); + } + + /** Represents a CreateSnapshotRequest. */ + class CreateSnapshotRequest implements ICreateSnapshotRequest { + + /** + * Constructs a new CreateSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ICreateSnapshotRequest); + + /** CreateSnapshotRequest name. */ + public name: string; + + /** CreateSnapshotRequest subscription. */ + public subscription: string; + + /** CreateSnapshotRequest labels. */ + public labels: { [k: string]: string }; + + /** + * Creates a new CreateSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns CreateSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.ICreateSnapshotRequest): google.pubsub.v1.CreateSnapshotRequest; + + /** + * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @param message CreateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @param message CreateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CreateSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CreateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CreateSnapshotRequest; + + /** + * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CreateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CreateSnapshotRequest; + + /** + * Verifies a CreateSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CreateSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CreateSnapshotRequest; + + /** + * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. + * @param message CreateSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.CreateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CreateSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an UpdateSnapshotRequest. */ + interface IUpdateSnapshotRequest { + + /** UpdateSnapshotRequest snapshot */ + snapshot?: (google.pubsub.v1.ISnapshot|null); + + /** UpdateSnapshotRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } + + /** Represents an UpdateSnapshotRequest. */ + class UpdateSnapshotRequest implements IUpdateSnapshotRequest { + + /** + * Constructs a new UpdateSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateSnapshotRequest); + + /** UpdateSnapshotRequest snapshot. */ + public snapshot?: (google.pubsub.v1.ISnapshot|null); + + /** UpdateSnapshotRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); + + /** + * Creates a new UpdateSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateSnapshotRequest): google.pubsub.v1.UpdateSnapshotRequest; + + /** + * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @param message UpdateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @param message UpdateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSnapshotRequest; + + /** + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSnapshotRequest; + + /** + * Verifies an UpdateSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSnapshotRequest; + + /** + * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. + * @param message UpdateSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UpdateSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Snapshot. */ + interface ISnapshot { + + /** Snapshot name */ + name?: (string|null); + + /** Snapshot topic */ + topic?: (string|null); + + /** Snapshot expireTime */ + expireTime?: (google.protobuf.ITimestamp|null); + + /** Snapshot labels */ + labels?: ({ [k: string]: string }|null); + } + + /** Represents a Snapshot. */ + class Snapshot implements ISnapshot { + + /** + * Constructs a new Snapshot. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISnapshot); + + /** Snapshot name. */ + public name: string; + + /** Snapshot topic. */ + public topic: string; + + /** Snapshot expireTime. */ + public expireTime?: (google.protobuf.ITimestamp|null); + + /** Snapshot labels. */ + public labels: { [k: string]: string }; + + /** + * Creates a new Snapshot instance using the specified properties. + * @param [properties] Properties to set + * @returns Snapshot instance + */ + public static create(properties?: google.pubsub.v1.ISnapshot): google.pubsub.v1.Snapshot; + + /** + * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @param message Snapshot message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @param message Snapshot message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Snapshot message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Snapshot + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Snapshot; + + /** + * Decodes a Snapshot message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Snapshot + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Snapshot; + + /** + * Verifies a Snapshot message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Snapshot + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Snapshot; + + /** + * Creates a plain object from a Snapshot message. Also converts values to other types if specified. + * @param message Snapshot + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Snapshot, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Snapshot to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetSnapshotRequest. */ + interface IGetSnapshotRequest { + + /** GetSnapshotRequest snapshot */ + snapshot?: (string|null); + } + + /** Represents a GetSnapshotRequest. */ + class GetSnapshotRequest implements IGetSnapshotRequest { + + /** + * Constructs a new GetSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetSnapshotRequest); + + /** GetSnapshotRequest snapshot. */ + public snapshot: string; + + /** + * Creates a new GetSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetSnapshotRequest): google.pubsub.v1.GetSnapshotRequest; + + /** + * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @param message GetSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @param message GetSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSnapshotRequest; + + /** + * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSnapshotRequest; + + /** + * Verifies a GetSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSnapshotRequest; + + /** + * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. + * @param message GetSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSnapshotsRequest. */ + interface IListSnapshotsRequest { + + /** ListSnapshotsRequest project */ + project?: (string|null); + + /** ListSnapshotsRequest pageSize */ + pageSize?: (number|null); + + /** ListSnapshotsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListSnapshotsRequest. */ + class ListSnapshotsRequest implements IListSnapshotsRequest { + + /** + * Constructs a new ListSnapshotsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSnapshotsRequest); + + /** ListSnapshotsRequest project. */ + public project: string; + + /** ListSnapshotsRequest pageSize. */ + public pageSize: number; + + /** ListSnapshotsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListSnapshotsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSnapshotsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSnapshotsRequest): google.pubsub.v1.ListSnapshotsRequest; + + /** + * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @param message ListSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @param message ListSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSnapshotsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsRequest; + + /** + * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsRequest; + + /** + * Verifies a ListSnapshotsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSnapshotsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsRequest; + + /** + * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListSnapshotsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSnapshotsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSnapshotsResponse. */ + interface IListSnapshotsResponse { + + /** ListSnapshotsResponse snapshots */ + snapshots?: (google.pubsub.v1.ISnapshot[]|null); + + /** ListSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListSnapshotsResponse. */ + class ListSnapshotsResponse implements IListSnapshotsResponse { + + /** + * Constructs a new ListSnapshotsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSnapshotsResponse); + + /** ListSnapshotsResponse snapshots. */ + public snapshots: google.pubsub.v1.ISnapshot[]; + + /** ListSnapshotsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListSnapshotsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSnapshotsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListSnapshotsResponse): google.pubsub.v1.ListSnapshotsResponse; + + /** + * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @param message ListSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @param message ListSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSnapshotsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsResponse; + + /** + * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsResponse; + + /** + * Verifies a ListSnapshotsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSnapshotsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsResponse; + + /** + * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListSnapshotsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSnapshotsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DeleteSnapshotRequest. */ + interface IDeleteSnapshotRequest { + + /** DeleteSnapshotRequest snapshot */ + snapshot?: (string|null); + } + + /** Represents a DeleteSnapshotRequest. */ + class DeleteSnapshotRequest implements IDeleteSnapshotRequest { + + /** + * Constructs a new DeleteSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteSnapshotRequest); + + /** DeleteSnapshotRequest snapshot. */ + public snapshot: string; + + /** + * Creates a new DeleteSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteSnapshotRequest): google.pubsub.v1.DeleteSnapshotRequest; + + /** + * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @param message DeleteSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @param message DeleteSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSnapshotRequest; + + /** + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSnapshotRequest; + + /** + * Verifies a DeleteSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSnapshotRequest; + + /** + * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. + * @param message DeleteSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeleteSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a SeekRequest. */ + interface ISeekRequest { + + /** SeekRequest subscription */ + subscription?: (string|null); + + /** SeekRequest time */ + time?: (google.protobuf.ITimestamp|null); + + /** SeekRequest snapshot */ + snapshot?: (string|null); + } + + /** Represents a SeekRequest. */ + class SeekRequest implements ISeekRequest { + + /** + * Constructs a new SeekRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISeekRequest); + + /** SeekRequest subscription. */ + public subscription: string; + + /** SeekRequest time. */ + public time?: (google.protobuf.ITimestamp|null); + + /** SeekRequest snapshot. */ + public snapshot: string; + + /** SeekRequest target. */ + public target?: ("time"|"snapshot"); + + /** + * Creates a new SeekRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns SeekRequest instance + */ + public static create(properties?: google.pubsub.v1.ISeekRequest): google.pubsub.v1.SeekRequest; + + /** + * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @param message SeekRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @param message SeekRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SeekRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SeekRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekRequest; + + /** + * Decodes a SeekRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SeekRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekRequest; + + /** + * Verifies a SeekRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SeekRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekRequest; + + /** + * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. + * @param message SeekRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.SeekRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SeekRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a SeekResponse. */ + interface ISeekResponse { + } + + /** Represents a SeekResponse. */ + class SeekResponse implements ISeekResponse { + + /** + * Constructs a new SeekResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISeekResponse); + + /** + * Creates a new SeekResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns SeekResponse instance + */ + public static create(properties?: google.pubsub.v1.ISeekResponse): google.pubsub.v1.SeekResponse; + + /** + * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @param message SeekResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @param message SeekResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SeekResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SeekResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekResponse; + + /** + * Decodes a SeekResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SeekResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekResponse; + + /** + * Verifies a SeekResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SeekResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekResponse; + + /** + * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. + * @param message SeekResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.SeekResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SeekResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + } + + /** Namespace api. */ + namespace api { + + /** Properties of a Http. */ + interface IHttp { + + /** Http rules */ + rules?: (google.api.IHttpRule[]|null); + + /** Http fullyDecodeReservedExpansion */ + fullyDecodeReservedExpansion?: (boolean|null); + } + + /** Represents a Http. */ + class Http implements IHttp { + + /** + * Constructs a new Http. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IHttp); + + /** Http rules. */ + public rules: google.api.IHttpRule[]; + + /** Http fullyDecodeReservedExpansion. */ + public fullyDecodeReservedExpansion: boolean; + + /** + * Creates a new Http instance using the specified properties. + * @param [properties] Properties to set + * @returns Http instance + */ + public static create(properties?: google.api.IHttp): google.api.Http; + + /** + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Http message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; + + /** + * Decodes a Http message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; + + /** + * Verifies a Http message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Http message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Http + */ + public static fromObject(object: { [k: string]: any }): google.api.Http; + + /** + * Creates a plain object from a Http message. Also converts values to other types if specified. + * @param message Http + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Http to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a HttpRule. */ + interface IHttpRule { + + /** HttpRule selector */ + selector?: (string|null); + + /** HttpRule get */ + get?: (string|null); + + /** HttpRule put */ + put?: (string|null); + + /** HttpRule post */ + post?: (string|null); + + /** HttpRule delete */ + "delete"?: (string|null); + + /** HttpRule patch */ + patch?: (string|null); + + /** HttpRule custom */ + custom?: (google.api.ICustomHttpPattern|null); + + /** HttpRule body */ + body?: (string|null); + + /** HttpRule responseBody */ + responseBody?: (string|null); + + /** HttpRule additionalBindings */ + additionalBindings?: (google.api.IHttpRule[]|null); + } + + /** Represents a HttpRule. */ + class HttpRule implements IHttpRule { + + /** + * Constructs a new HttpRule. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IHttpRule); + + /** HttpRule selector. */ + public selector: string; + + /** HttpRule get. */ + public get: string; + + /** HttpRule put. */ + public put: string; + + /** HttpRule post. */ + public post: string; + + /** HttpRule delete. */ + public delete: string; + + /** HttpRule patch. */ + public patch: string; + + /** HttpRule custom. */ + public custom?: (google.api.ICustomHttpPattern|null); + + /** HttpRule body. */ + public body: string; + + /** HttpRule responseBody. */ + public responseBody: string; + + /** HttpRule additionalBindings. */ + public additionalBindings: google.api.IHttpRule[]; + + /** HttpRule pattern. */ + public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); + + /** + * Creates a new HttpRule instance using the specified properties. + * @param [properties] Properties to set + * @returns HttpRule instance + */ + public static create(properties?: google.api.IHttpRule): google.api.HttpRule; + + /** + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a HttpRule message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; + + /** + * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; + + /** + * Verifies a HttpRule message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns HttpRule + */ + public static fromObject(object: { [k: string]: any }): google.api.HttpRule; + + /** + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * @param message HttpRule + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this HttpRule to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a CustomHttpPattern. */ + interface ICustomHttpPattern { + + /** CustomHttpPattern kind */ + kind?: (string|null); + + /** CustomHttpPattern path */ + path?: (string|null); + } + + /** Represents a CustomHttpPattern. */ + class CustomHttpPattern implements ICustomHttpPattern { + + /** + * Constructs a new CustomHttpPattern. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ICustomHttpPattern); + + /** CustomHttpPattern kind. */ + public kind: string; + + /** CustomHttpPattern path. */ + public path: string; + + /** + * Creates a new CustomHttpPattern instance using the specified properties. + * @param [properties] Properties to set + * @returns CustomHttpPattern instance + */ + public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; + + /** + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; + + /** + * Verifies a CustomHttpPattern message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CustomHttpPattern + */ + public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; + + /** + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * @param message CustomHttpPattern + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CustomHttpPattern to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Namespace protobuf. */ + namespace protobuf { + + /** Properties of a FileDescriptorSet. */ + interface IFileDescriptorSet { + + /** FileDescriptorSet file */ + file?: (google.protobuf.IFileDescriptorProto[]|null); + } + + /** Represents a FileDescriptorSet. */ + class FileDescriptorSet implements IFileDescriptorSet { + + /** + * Constructs a new FileDescriptorSet. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorSet); + + /** FileDescriptorSet file. */ + public file: google.protobuf.IFileDescriptorProto[]; + + /** + * Creates a new FileDescriptorSet instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorSet instance + */ + public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; + + /** + * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; + + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; + + /** + * Verifies a FileDescriptorSet message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorSet + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; + + /** + * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. + * @param message FileDescriptorSet + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileDescriptorSet to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FileDescriptorProto. */ + interface IFileDescriptorProto { + + /** FileDescriptorProto name */ + name?: (string|null); + + /** FileDescriptorProto package */ + "package"?: (string|null); + + /** FileDescriptorProto dependency */ + dependency?: (string[]|null); + + /** FileDescriptorProto publicDependency */ + publicDependency?: (number[]|null); + + /** FileDescriptorProto weakDependency */ + weakDependency?: (number[]|null); + + /** FileDescriptorProto messageType */ + messageType?: (google.protobuf.IDescriptorProto[]|null); + + /** FileDescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + + /** FileDescriptorProto service */ + service?: (google.protobuf.IServiceDescriptorProto[]|null); + + /** FileDescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** FileDescriptorProto options */ + options?: (google.protobuf.IFileOptions|null); + + /** FileDescriptorProto sourceCodeInfo */ + sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + + /** FileDescriptorProto syntax */ + syntax?: (string|null); + } + + /** Represents a FileDescriptorProto. */ + class FileDescriptorProto implements IFileDescriptorProto { + + /** + * Constructs a new FileDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorProto); + + /** FileDescriptorProto name. */ + public name: string; + + /** FileDescriptorProto package. */ + public package: string; + + /** FileDescriptorProto dependency. */ + public dependency: string[]; + + /** FileDescriptorProto publicDependency. */ + public publicDependency: number[]; + + /** FileDescriptorProto weakDependency. */ + public weakDependency: number[]; + + /** FileDescriptorProto messageType. */ + public messageType: google.protobuf.IDescriptorProto[]; + + /** FileDescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; + + /** FileDescriptorProto service. */ + public service: google.protobuf.IServiceDescriptorProto[]; + + /** FileDescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; + + /** FileDescriptorProto options. */ + public options?: (google.protobuf.IFileOptions|null); + + /** FileDescriptorProto sourceCodeInfo. */ + public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + + /** FileDescriptorProto syntax. */ + public syntax: string; + + /** + * Creates a new FileDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; + + /** + * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; + + /** + * Verifies a FileDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; + + /** + * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. + * @param message FileDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DescriptorProto. */ + interface IDescriptorProto { + + /** DescriptorProto name */ + name?: (string|null); + + /** DescriptorProto field */ + field?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** DescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** DescriptorProto nestedType */ + nestedType?: (google.protobuf.IDescriptorProto[]|null); + + /** DescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + + /** DescriptorProto extensionRange */ + extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); + + /** DescriptorProto oneofDecl */ + oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); + + /** DescriptorProto options */ + options?: (google.protobuf.IMessageOptions|null); + + /** DescriptorProto reservedRange */ + reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); + + /** DescriptorProto reservedName */ + reservedName?: (string[]|null); + } + + /** Represents a DescriptorProto. */ + class DescriptorProto implements IDescriptorProto { + + /** + * Constructs a new DescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDescriptorProto); + + /** DescriptorProto name. */ + public name: string; + + /** DescriptorProto field. */ + public field: google.protobuf.IFieldDescriptorProto[]; + + /** DescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; + + /** DescriptorProto nestedType. */ + public nestedType: google.protobuf.IDescriptorProto[]; + + /** DescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; + + /** DescriptorProto extensionRange. */ + public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; + + /** DescriptorProto oneofDecl. */ + public oneofDecl: google.protobuf.IOneofDescriptorProto[]; + + /** DescriptorProto options. */ + public options?: (google.protobuf.IMessageOptions|null); + + /** DescriptorProto reservedRange. */ + public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; + + /** DescriptorProto reservedName. */ + public reservedName: string[]; + + /** + * Creates a new DescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns DescriptorProto instance + */ + public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; + + /** + * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; + + /** + * Verifies a DescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; + + /** + * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * @param message DescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace DescriptorProto { + + /** Properties of an ExtensionRange. */ + interface IExtensionRange { + + /** ExtensionRange start */ + start?: (number|null); + + /** ExtensionRange end */ + end?: (number|null); + + /** ExtensionRange options */ + options?: (google.protobuf.IExtensionRangeOptions|null); + } + + /** Represents an ExtensionRange. */ + class ExtensionRange implements IExtensionRange { + + /** + * Constructs a new ExtensionRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); + + /** ExtensionRange start. */ + public start: number; + + /** ExtensionRange end. */ + public end: number; + + /** ExtensionRange options. */ + public options?: (google.protobuf.IExtensionRangeOptions|null); + + /** + * Creates a new ExtensionRange instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRange instance + */ + public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExtensionRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Verifies an ExtensionRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. + * @param message ExtensionRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExtensionRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ReservedRange. */ + interface IReservedRange { + + /** ReservedRange start */ + start?: (number|null); + + /** ReservedRange end */ + end?: (number|null); + } + + /** Represents a ReservedRange. */ + class ReservedRange implements IReservedRange { + + /** + * Constructs a new ReservedRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); + + /** ReservedRange start. */ + public start: number; + + /** ReservedRange end. */ + public end: number; + + /** + * Creates a new ReservedRange instance using the specified properties. + * @param [properties] Properties to set + * @returns ReservedRange instance + */ + public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ReservedRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Decodes a ReservedRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Verifies a ReservedRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ReservedRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. + * @param message ReservedRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ReservedRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of an ExtensionRangeOptions. */ + interface IExtensionRangeOptions { + + /** ExtensionRangeOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an ExtensionRangeOptions. */ + class ExtensionRangeOptions implements IExtensionRangeOptions { + + /** + * Constructs a new ExtensionRangeOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IExtensionRangeOptions); + + /** ExtensionRangeOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRangeOptions instance + */ + public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; + + /** + * Verifies an ExtensionRangeOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRangeOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; + + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @param message ExtensionRangeOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExtensionRangeOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldDescriptorProto. */ + interface IFieldDescriptorProto { + + /** FieldDescriptorProto name */ + name?: (string|null); + + /** FieldDescriptorProto number */ + number?: (number|null); + + /** FieldDescriptorProto label */ + label?: (google.protobuf.FieldDescriptorProto.Label|null); + + /** FieldDescriptorProto type */ + type?: (google.protobuf.FieldDescriptorProto.Type|null); + + /** FieldDescriptorProto typeName */ + typeName?: (string|null); + + /** FieldDescriptorProto extendee */ + extendee?: (string|null); + + /** FieldDescriptorProto defaultValue */ + defaultValue?: (string|null); + + /** FieldDescriptorProto oneofIndex */ + oneofIndex?: (number|null); + + /** FieldDescriptorProto jsonName */ + jsonName?: (string|null); + + /** FieldDescriptorProto options */ + options?: (google.protobuf.IFieldOptions|null); + } + + /** Represents a FieldDescriptorProto. */ + class FieldDescriptorProto implements IFieldDescriptorProto { + + /** + * Constructs a new FieldDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldDescriptorProto); + + /** FieldDescriptorProto name. */ + public name: string; + + /** FieldDescriptorProto number. */ + public number: number; + + /** FieldDescriptorProto label. */ + public label: google.protobuf.FieldDescriptorProto.Label; + + /** FieldDescriptorProto type. */ + public type: google.protobuf.FieldDescriptorProto.Type; + + /** FieldDescriptorProto typeName. */ + public typeName: string; + + /** FieldDescriptorProto extendee. */ + public extendee: string; + + /** FieldDescriptorProto defaultValue. */ + public defaultValue: string; + + /** FieldDescriptorProto oneofIndex. */ + public oneofIndex: number; + + /** FieldDescriptorProto jsonName. */ + public jsonName: string; + + /** FieldDescriptorProto options. */ + public options?: (google.protobuf.IFieldOptions|null); + + /** + * Creates a new FieldDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; + + /** + * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; + + /** + * Verifies a FieldDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; + + /** + * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. + * @param message FieldDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FieldDescriptorProto { + + /** Type enum. */ + enum Type { + TYPE_DOUBLE = 1, + TYPE_FLOAT = 2, + TYPE_INT64 = 3, + TYPE_UINT64 = 4, + TYPE_INT32 = 5, + TYPE_FIXED64 = 6, + TYPE_FIXED32 = 7, + TYPE_BOOL = 8, + TYPE_STRING = 9, + TYPE_GROUP = 10, + TYPE_MESSAGE = 11, + TYPE_BYTES = 12, + TYPE_UINT32 = 13, + TYPE_ENUM = 14, + TYPE_SFIXED32 = 15, + TYPE_SFIXED64 = 16, + TYPE_SINT32 = 17, + TYPE_SINT64 = 18 + } + + /** Label enum. */ + enum Label { + LABEL_OPTIONAL = 1, + LABEL_REQUIRED = 2, + LABEL_REPEATED = 3 + } + } + + /** Properties of an OneofDescriptorProto. */ + interface IOneofDescriptorProto { + + /** OneofDescriptorProto name */ + name?: (string|null); + + /** OneofDescriptorProto options */ + options?: (google.protobuf.IOneofOptions|null); + } + + /** Represents an OneofDescriptorProto. */ + class OneofDescriptorProto implements IOneofDescriptorProto { + + /** + * Constructs a new OneofDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofDescriptorProto); + + /** OneofDescriptorProto name. */ + public name: string; + + /** OneofDescriptorProto options. */ + public options?: (google.protobuf.IOneofOptions|null); + + /** + * Creates a new OneofDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofDescriptorProto instance + */ + public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; + + /** + * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; + + /** + * Verifies an OneofDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; + + /** + * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. + * @param message OneofDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this OneofDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumDescriptorProto. */ + interface IEnumDescriptorProto { + + /** EnumDescriptorProto name */ + name?: (string|null); + + /** EnumDescriptorProto value */ + value?: (google.protobuf.IEnumValueDescriptorProto[]|null); + + /** EnumDescriptorProto options */ + options?: (google.protobuf.IEnumOptions|null); + + /** EnumDescriptorProto reservedRange */ + reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); + + /** EnumDescriptorProto reservedName */ + reservedName?: (string[]|null); + } + + /** Represents an EnumDescriptorProto. */ + class EnumDescriptorProto implements IEnumDescriptorProto { + + /** + * Constructs a new EnumDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumDescriptorProto); + + /** EnumDescriptorProto name. */ + public name: string; + + /** EnumDescriptorProto value. */ + public value: google.protobuf.IEnumValueDescriptorProto[]; + + /** EnumDescriptorProto options. */ + public options?: (google.protobuf.IEnumOptions|null); + + /** EnumDescriptorProto reservedRange. */ + public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; + + /** EnumDescriptorProto reservedName. */ + public reservedName: string[]; + + /** + * Creates a new EnumDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; + + /** + * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; + + /** + * Verifies an EnumDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; + + /** + * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. + * @param message EnumDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace EnumDescriptorProto { + + /** Properties of an EnumReservedRange. */ + interface IEnumReservedRange { + + /** EnumReservedRange start */ + start?: (number|null); + + /** EnumReservedRange end */ + end?: (number|null); + } + + /** Represents an EnumReservedRange. */ + class EnumReservedRange implements IEnumReservedRange { + + /** + * Constructs a new EnumReservedRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); + + /** EnumReservedRange start. */ + public start: number; + + /** EnumReservedRange end. */ + public end: number; + + /** + * Creates a new EnumReservedRange instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumReservedRange instance + */ + public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Verifies an EnumReservedRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumReservedRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * @param message EnumReservedRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumReservedRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of an EnumValueDescriptorProto. */ + interface IEnumValueDescriptorProto { + + /** EnumValueDescriptorProto name */ + name?: (string|null); + + /** EnumValueDescriptorProto number */ + number?: (number|null); + + /** EnumValueDescriptorProto options */ + options?: (google.protobuf.IEnumValueOptions|null); + } + + /** Represents an EnumValueDescriptorProto. */ + class EnumValueDescriptorProto implements IEnumValueDescriptorProto { + + /** + * Constructs a new EnumValueDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueDescriptorProto); + + /** EnumValueDescriptorProto name. */ + public name: string; + + /** EnumValueDescriptorProto number. */ + public number: number; + + /** EnumValueDescriptorProto options. */ + public options?: (google.protobuf.IEnumValueOptions|null); + + /** + * Creates a new EnumValueDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; + + /** + * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; + + /** + * Verifies an EnumValueDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; + + /** + * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. + * @param message EnumValueDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumValueDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ServiceDescriptorProto. */ + interface IServiceDescriptorProto { + + /** ServiceDescriptorProto name */ + name?: (string|null); + + /** ServiceDescriptorProto method */ + method?: (google.protobuf.IMethodDescriptorProto[]|null); + + /** ServiceDescriptorProto options */ + options?: (google.protobuf.IServiceOptions|null); + } + + /** Represents a ServiceDescriptorProto. */ + class ServiceDescriptorProto implements IServiceDescriptorProto { + + /** + * Constructs a new ServiceDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceDescriptorProto); + + /** ServiceDescriptorProto name. */ + public name: string; + + /** ServiceDescriptorProto method. */ + public method: google.protobuf.IMethodDescriptorProto[]; + + /** ServiceDescriptorProto options. */ + public options?: (google.protobuf.IServiceOptions|null); + + /** + * Creates a new ServiceDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceDescriptorProto instance + */ + public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; + + /** + * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; + + /** + * Verifies a ServiceDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; + + /** + * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. + * @param message ServiceDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ServiceDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a MethodDescriptorProto. */ + interface IMethodDescriptorProto { + + /** MethodDescriptorProto name */ + name?: (string|null); + + /** MethodDescriptorProto inputType */ + inputType?: (string|null); + + /** MethodDescriptorProto outputType */ + outputType?: (string|null); + + /** MethodDescriptorProto options */ + options?: (google.protobuf.IMethodOptions|null); + + /** MethodDescriptorProto clientStreaming */ + clientStreaming?: (boolean|null); + + /** MethodDescriptorProto serverStreaming */ + serverStreaming?: (boolean|null); + } + + /** Represents a MethodDescriptorProto. */ + class MethodDescriptorProto implements IMethodDescriptorProto { + + /** + * Constructs a new MethodDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodDescriptorProto); + + /** MethodDescriptorProto name. */ + public name: string; + + /** MethodDescriptorProto inputType. */ + public inputType: string; + + /** MethodDescriptorProto outputType. */ + public outputType: string; + + /** MethodDescriptorProto options. */ + public options?: (google.protobuf.IMethodOptions|null); + + /** MethodDescriptorProto clientStreaming. */ + public clientStreaming: boolean; + + /** MethodDescriptorProto serverStreaming. */ + public serverStreaming: boolean; + + /** + * Creates a new MethodDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodDescriptorProto instance + */ + public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; + + /** + * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; + + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; + + /** + * Verifies a MethodDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; + + /** + * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. + * @param message MethodDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MethodDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FileOptions. */ + interface IFileOptions { + + /** FileOptions javaPackage */ + javaPackage?: (string|null); + + /** FileOptions javaOuterClassname */ + javaOuterClassname?: (string|null); + + /** FileOptions javaMultipleFiles */ + javaMultipleFiles?: (boolean|null); + + /** FileOptions javaGenerateEqualsAndHash */ + javaGenerateEqualsAndHash?: (boolean|null); + + /** FileOptions javaStringCheckUtf8 */ + javaStringCheckUtf8?: (boolean|null); + + /** FileOptions optimizeFor */ + optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|null); + + /** FileOptions goPackage */ + goPackage?: (string|null); + + /** FileOptions ccGenericServices */ + ccGenericServices?: (boolean|null); + + /** FileOptions javaGenericServices */ + javaGenericServices?: (boolean|null); + + /** FileOptions pyGenericServices */ + pyGenericServices?: (boolean|null); + + /** FileOptions phpGenericServices */ + phpGenericServices?: (boolean|null); + + /** FileOptions deprecated */ + deprecated?: (boolean|null); + + /** FileOptions ccEnableArenas */ + ccEnableArenas?: (boolean|null); + + /** FileOptions objcClassPrefix */ + objcClassPrefix?: (string|null); + + /** FileOptions csharpNamespace */ + csharpNamespace?: (string|null); + + /** FileOptions swiftPrefix */ + swiftPrefix?: (string|null); + + /** FileOptions phpClassPrefix */ + phpClassPrefix?: (string|null); + + /** FileOptions phpNamespace */ + phpNamespace?: (string|null); + + /** FileOptions phpMetadataNamespace */ + phpMetadataNamespace?: (string|null); + + /** FileOptions rubyPackage */ + rubyPackage?: (string|null); + + /** FileOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a FileOptions. */ + class FileOptions implements IFileOptions { + + /** + * Constructs a new FileOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileOptions); + + /** FileOptions javaPackage. */ + public javaPackage: string; + + /** FileOptions javaOuterClassname. */ + public javaOuterClassname: string; + + /** FileOptions javaMultipleFiles. */ + public javaMultipleFiles: boolean; + + /** FileOptions javaGenerateEqualsAndHash. */ + public javaGenerateEqualsAndHash: boolean; + + /** FileOptions javaStringCheckUtf8. */ + public javaStringCheckUtf8: boolean; + + /** FileOptions optimizeFor. */ + public optimizeFor: google.protobuf.FileOptions.OptimizeMode; + + /** FileOptions goPackage. */ + public goPackage: string; + + /** FileOptions ccGenericServices. */ + public ccGenericServices: boolean; + + /** FileOptions javaGenericServices. */ + public javaGenericServices: boolean; + + /** FileOptions pyGenericServices. */ + public pyGenericServices: boolean; + + /** FileOptions phpGenericServices. */ + public phpGenericServices: boolean; + + /** FileOptions deprecated. */ + public deprecated: boolean; + + /** FileOptions ccEnableArenas. */ + public ccEnableArenas: boolean; + + /** FileOptions objcClassPrefix. */ + public objcClassPrefix: string; + + /** FileOptions csharpNamespace. */ + public csharpNamespace: string; + + /** FileOptions swiftPrefix. */ + public swiftPrefix: string; + + /** FileOptions phpClassPrefix. */ + public phpClassPrefix: string; + + /** FileOptions phpNamespace. */ + public phpNamespace: string; + + /** FileOptions phpMetadataNamespace. */ + public phpMetadataNamespace: string; + + /** FileOptions rubyPackage. */ + public rubyPackage: string; + + /** FileOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new FileOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FileOptions instance + */ + public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; + + /** + * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; + + /** + * Decodes a FileOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; + + /** + * Verifies a FileOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; + + /** + * Creates a plain object from a FileOptions message. Also converts values to other types if specified. + * @param message FileOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FileOptions { + + /** OptimizeMode enum. */ + enum OptimizeMode { + SPEED = 1, + CODE_SIZE = 2, + LITE_RUNTIME = 3 + } + } + + /** Properties of a MessageOptions. */ + interface IMessageOptions { + + /** MessageOptions messageSetWireFormat */ + messageSetWireFormat?: (boolean|null); + + /** MessageOptions noStandardDescriptorAccessor */ + noStandardDescriptorAccessor?: (boolean|null); + + /** MessageOptions deprecated */ + deprecated?: (boolean|null); + + /** MessageOptions mapEntry */ + mapEntry?: (boolean|null); + + /** MessageOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a MessageOptions. */ + class MessageOptions implements IMessageOptions { + + /** + * Constructs a new MessageOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMessageOptions); + + /** MessageOptions messageSetWireFormat. */ + public messageSetWireFormat: boolean; + + /** MessageOptions noStandardDescriptorAccessor. */ + public noStandardDescriptorAccessor: boolean; + + /** MessageOptions deprecated. */ + public deprecated: boolean; + + /** MessageOptions mapEntry. */ + public mapEntry: boolean; + + /** MessageOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new MessageOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageOptions instance + */ + public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; + + /** + * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MessageOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; + + /** + * Decodes a MessageOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; + + /** + * Verifies a MessageOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; + + /** + * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. + * @param message MessageOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MessageOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldOptions. */ + interface IFieldOptions { + + /** FieldOptions ctype */ + ctype?: (google.protobuf.FieldOptions.CType|null); + + /** FieldOptions packed */ + packed?: (boolean|null); + + /** FieldOptions jstype */ + jstype?: (google.protobuf.FieldOptions.JSType|null); + + /** FieldOptions lazy */ + lazy?: (boolean|null); + + /** FieldOptions deprecated */ + deprecated?: (boolean|null); + + /** FieldOptions weak */ + weak?: (boolean|null); + + /** FieldOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a FieldOptions. */ + class FieldOptions implements IFieldOptions { + + /** + * Constructs a new FieldOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldOptions); + + /** FieldOptions ctype. */ + public ctype: google.protobuf.FieldOptions.CType; + + /** FieldOptions packed. */ + public packed: boolean; + + /** FieldOptions jstype. */ + public jstype: google.protobuf.FieldOptions.JSType; + + /** FieldOptions lazy. */ + public lazy: boolean; + + /** FieldOptions deprecated. */ + public deprecated: boolean; + + /** FieldOptions weak. */ + public weak: boolean; + + /** FieldOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new FieldOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldOptions instance + */ + public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; + + /** + * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; + + /** + * Decodes a FieldOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; + + /** + * Verifies a FieldOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; + + /** + * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. + * @param message FieldOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FieldOptions { + + /** CType enum. */ + enum CType { + STRING = 0, + CORD = 1, + STRING_PIECE = 2 + } + + /** JSType enum. */ + enum JSType { + JS_NORMAL = 0, + JS_STRING = 1, + JS_NUMBER = 2 + } + } + + /** Properties of an OneofOptions. */ + interface IOneofOptions { + + /** OneofOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an OneofOptions. */ + class OneofOptions implements IOneofOptions { + + /** + * Constructs a new OneofOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofOptions); + + /** OneofOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new OneofOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofOptions instance + */ + public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; + + /** + * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an OneofOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; + + /** + * Decodes an OneofOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; + + /** + * Verifies an OneofOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; + + /** + * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. + * @param message OneofOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this OneofOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumOptions. */ + interface IEnumOptions { + + /** EnumOptions allowAlias */ + allowAlias?: (boolean|null); + + /** EnumOptions deprecated */ + deprecated?: (boolean|null); + + /** EnumOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an EnumOptions. */ + class EnumOptions implements IEnumOptions { + + /** + * Constructs a new EnumOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumOptions); + + /** EnumOptions allowAlias. */ + public allowAlias: boolean; + + /** EnumOptions deprecated. */ + public deprecated: boolean; + + /** EnumOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new EnumOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumOptions instance + */ + public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; + + /** + * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; + + /** + * Decodes an EnumOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; + + /** + * Verifies an EnumOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; + + /** + * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. + * @param message EnumOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumValueOptions. */ + interface IEnumValueOptions { + + /** EnumValueOptions deprecated */ + deprecated?: (boolean|null); + + /** EnumValueOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an EnumValueOptions. */ + class EnumValueOptions implements IEnumValueOptions { + + /** + * Constructs a new EnumValueOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueOptions); + + /** EnumValueOptions deprecated. */ + public deprecated: boolean; + + /** EnumValueOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new EnumValueOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueOptions instance + */ + public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; + + /** + * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; + + /** + * Verifies an EnumValueOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; + + /** + * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. + * @param message EnumValueOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumValueOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ServiceOptions. */ + interface IServiceOptions { + + /** ServiceOptions deprecated */ + deprecated?: (boolean|null); + + /** ServiceOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a ServiceOptions. */ + class ServiceOptions implements IServiceOptions { + + /** + * Constructs a new ServiceOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceOptions); + + /** ServiceOptions deprecated. */ + public deprecated: boolean; + + /** ServiceOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new ServiceOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceOptions instance + */ + public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; + + /** + * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; + + /** + * Verifies a ServiceOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; + + /** + * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. + * @param message ServiceOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ServiceOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a MethodOptions. */ + interface IMethodOptions { + + /** MethodOptions deprecated */ + deprecated?: (boolean|null); + + /** MethodOptions idempotencyLevel */ + idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|null); + + /** MethodOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** MethodOptions .google.api.http */ + ".google.api.http"?: (google.api.IHttpRule|null); + } + + /** Represents a MethodOptions. */ + class MethodOptions implements IMethodOptions { + + /** + * Constructs a new MethodOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodOptions); + + /** MethodOptions deprecated. */ + public deprecated: boolean; + + /** MethodOptions idempotencyLevel. */ + public idempotencyLevel: google.protobuf.MethodOptions.IdempotencyLevel; + + /** MethodOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new MethodOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodOptions instance + */ + public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; + + /** + * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; + + /** + * Decodes a MethodOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; + + /** + * Verifies a MethodOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; + + /** + * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. + * @param message MethodOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MethodOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace MethodOptions { + + /** IdempotencyLevel enum. */ + enum IdempotencyLevel { + IDEMPOTENCY_UNKNOWN = 0, + NO_SIDE_EFFECTS = 1, + IDEMPOTENT = 2 + } + } + + /** Properties of an UninterpretedOption. */ + interface IUninterpretedOption { + + /** UninterpretedOption name */ + name?: (google.protobuf.UninterpretedOption.INamePart[]|null); + + /** UninterpretedOption identifierValue */ + identifierValue?: (string|null); + + /** UninterpretedOption positiveIntValue */ + positiveIntValue?: (number|Long|null); + + /** UninterpretedOption negativeIntValue */ + negativeIntValue?: (number|Long|null); + + /** UninterpretedOption doubleValue */ + doubleValue?: (number|null); + + /** UninterpretedOption stringValue */ + stringValue?: (Uint8Array|null); + + /** UninterpretedOption aggregateValue */ + aggregateValue?: (string|null); + } + + /** Represents an UninterpretedOption. */ + class UninterpretedOption implements IUninterpretedOption { + + /** + * Constructs a new UninterpretedOption. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IUninterpretedOption); + + /** UninterpretedOption name. */ + public name: google.protobuf.UninterpretedOption.INamePart[]; + + /** UninterpretedOption identifierValue. */ + public identifierValue: string; + + /** UninterpretedOption positiveIntValue. */ + public positiveIntValue: (number|Long); + + /** UninterpretedOption negativeIntValue. */ + public negativeIntValue: (number|Long); + + /** UninterpretedOption doubleValue. */ + public doubleValue: number; + + /** UninterpretedOption stringValue. */ + public stringValue: Uint8Array; + + /** UninterpretedOption aggregateValue. */ + public aggregateValue: string; + + /** + * Creates a new UninterpretedOption instance using the specified properties. + * @param [properties] Properties to set + * @returns UninterpretedOption instance + */ + public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; + + /** + * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; + + /** + * Verifies an UninterpretedOption message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UninterpretedOption + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; + + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @param message UninterpretedOption + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UninterpretedOption to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace UninterpretedOption { + + /** Properties of a NamePart. */ + interface INamePart { + + /** NamePart namePart */ + namePart: string; + + /** NamePart isExtension */ + isExtension: boolean; + } + + /** Represents a NamePart. */ + class NamePart implements INamePart { + + /** + * Constructs a new NamePart. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.UninterpretedOption.INamePart); + + /** NamePart namePart. */ + public namePart: string; + + /** NamePart isExtension. */ + public isExtension: boolean; + + /** + * Creates a new NamePart instance using the specified properties. + * @param [properties] Properties to set + * @returns NamePart instance + */ + public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; + + /** + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a NamePart message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; + + /** + * Decodes a NamePart message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; + + /** + * Verifies a NamePart message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns NamePart + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; + + /** + * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * @param message NamePart + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this NamePart to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a SourceCodeInfo. */ + interface ISourceCodeInfo { + + /** SourceCodeInfo location */ + location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); + } + + /** Represents a SourceCodeInfo. */ + class SourceCodeInfo implements ISourceCodeInfo { + + /** + * Constructs a new SourceCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ISourceCodeInfo); + + /** SourceCodeInfo location. */ + public location: google.protobuf.SourceCodeInfo.ILocation[]; + + /** + * Creates a new SourceCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns SourceCodeInfo instance + */ + public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; + + /** + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; + + /** + * Verifies a SourceCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SourceCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; + + /** + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. + * @param message SourceCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SourceCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace SourceCodeInfo { + + /** Properties of a Location. */ + interface ILocation { + + /** Location path */ + path?: (number[]|null); + + /** Location span */ + span?: (number[]|null); + + /** Location leadingComments */ + leadingComments?: (string|null); + + /** Location trailingComments */ + trailingComments?: (string|null); + + /** Location leadingDetachedComments */ + leadingDetachedComments?: (string[]|null); + } + + /** Represents a Location. */ + class Location implements ILocation { + + /** + * Constructs a new Location. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); + + /** Location path. */ + public path: number[]; + + /** Location span. */ + public span: number[]; + + /** Location leadingComments. */ + public leadingComments: string; + + /** Location trailingComments. */ + public trailingComments: string; + + /** Location leadingDetachedComments. */ + public leadingDetachedComments: string[]; + + /** + * Creates a new Location instance using the specified properties. + * @param [properties] Properties to set + * @returns Location instance + */ + public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; + + /** + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Location message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; + + /** + * Decodes a Location message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; + + /** + * Verifies a Location message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Location message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Location + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; + + /** + * Creates a plain object from a Location message. Also converts values to other types if specified. + * @param message Location + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Location to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a GeneratedCodeInfo. */ + interface IGeneratedCodeInfo { + + /** GeneratedCodeInfo annotation */ + annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); + } + + /** Represents a GeneratedCodeInfo. */ + class GeneratedCodeInfo implements IGeneratedCodeInfo { + + /** + * Constructs a new GeneratedCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IGeneratedCodeInfo); + + /** GeneratedCodeInfo annotation. */ + public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; + + /** + * Creates a new GeneratedCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns GeneratedCodeInfo instance + */ + public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; + + /** + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; + + /** + * Verifies a GeneratedCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GeneratedCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; + + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @param message GeneratedCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GeneratedCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace GeneratedCodeInfo { + + /** Properties of an Annotation. */ + interface IAnnotation { + + /** Annotation path */ + path?: (number[]|null); + + /** Annotation sourceFile */ + sourceFile?: (string|null); + + /** Annotation begin */ + begin?: (number|null); + + /** Annotation end */ + end?: (number|null); + } + + /** Represents an Annotation. */ + class Annotation implements IAnnotation { + + /** + * Constructs a new Annotation. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); + + /** Annotation path. */ + public path: number[]; + + /** Annotation sourceFile. */ + public sourceFile: string; + + /** Annotation begin. */ + public begin: number; + + /** Annotation end. */ + public end: number; + + /** + * Creates a new Annotation instance using the specified properties. + * @param [properties] Properties to set + * @returns Annotation instance + */ + public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Annotation message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Decodes an Annotation message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Verifies an Annotation message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Annotation + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Creates a plain object from an Annotation message. Also converts values to other types if specified. + * @param message Annotation + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Annotation to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a Duration. */ + interface IDuration { + + /** Duration seconds */ + seconds?: (number|Long|null); + + /** Duration nanos */ + nanos?: (number|null); + } + + /** Represents a Duration. */ + class Duration implements IDuration { + + /** + * Constructs a new Duration. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDuration); + + /** Duration seconds. */ + public seconds: (number|Long); + + /** Duration nanos. */ + public nanos: number; + + /** + * Creates a new Duration instance using the specified properties. + * @param [properties] Properties to set + * @returns Duration instance + */ + public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; + + /** + * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Duration message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; + + /** + * Decodes a Duration message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; + + /** + * Verifies a Duration message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Duration + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; + + /** + * Creates a plain object from a Duration message. Also converts values to other types if specified. + * @param message Duration + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Duration to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an Empty. */ + interface IEmpty { + } + + /** Represents an Empty. */ + class Empty implements IEmpty { + + /** + * Constructs a new Empty. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEmpty); + + /** + * Creates a new Empty instance using the specified properties. + * @param [properties] Properties to set + * @returns Empty instance + */ + public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; + + /** + * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Empty message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; + + /** + * Decodes an Empty message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; + + /** + * Verifies an Empty message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Empty message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Empty + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; + + /** + * Creates a plain object from an Empty message. Also converts values to other types if specified. + * @param message Empty + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Empty to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldMask. */ + interface IFieldMask { + + /** FieldMask paths */ + paths?: (string[]|null); + } + + /** Represents a FieldMask. */ + class FieldMask implements IFieldMask { + + /** + * Constructs a new FieldMask. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldMask); + + /** FieldMask paths. */ + public paths: string[]; + + /** + * Creates a new FieldMask instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldMask instance + */ + public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; + + /** + * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldMask message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; + + /** + * Decodes a FieldMask message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; + + /** + * Verifies a FieldMask message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldMask + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; + + /** + * Creates a plain object from a FieldMask message. Also converts values to other types if specified. + * @param message FieldMask + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldMask to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Timestamp. */ + interface ITimestamp { + + /** Timestamp seconds */ + seconds?: (number|Long|null); + + /** Timestamp nanos */ + nanos?: (number|null); + } + + /** Represents a Timestamp. */ + class Timestamp implements ITimestamp { + + /** + * Constructs a new Timestamp. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ITimestamp); + + /** Timestamp seconds. */ + public seconds: (number|Long); + + /** Timestamp nanos. */ + public nanos: number; + + /** + * Creates a new Timestamp instance using the specified properties. + * @param [properties] Properties to set + * @returns Timestamp instance + */ + public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; + + /** + * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Timestamp message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; + + /** + * Decodes a Timestamp message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; + + /** + * Verifies a Timestamp message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Timestamp + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; + + /** + * Creates a plain object from a Timestamp message. Also converts values to other types if specified. + * @param message Timestamp + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Timestamp to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } +} diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index f01707d0a89..48285441be9 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -37,10 +37,66 @@ import {Subscription, SubscriptionMetadata, SubscriptionMetadataRaw} from './sub import {Topic, PublishOptions} from './topic'; import {CallOptions} from 'google-gax'; import {Readable} from 'stream'; +import {google} from '../proto/pubsub'; +import {ServiceError} from 'grpc'; const opts = {} as gax.GrpcClientOptions; const {grpc} = new gax.GrpcClient(opts); + +export interface GetSubscriptionMetadataCallback { + (err: ServiceError|null, res?: google.pubsub.v1.Subscription|null): void; +} + +export interface ExistsCallback { + (err: Error|null, res?: boolean): void; +} + +export interface GetCallOptions extends CallOptions { + autoCreate?: boolean; +} + +export interface PushConfig { + pushEndpoint: string; + attibutes?: Map; +} + + +export interface SubscriptionCallOptions { + flowControl?: + {maxBytes?: number, maxMessages?: number, allowExcessMessages: boolean;}; + maxConnections?: number; + topic?: Topic; + ackDeadline?: number; + autoPaginate?: boolean; + gaxOpts?: CallOptions; + batching?: + {maxBytes?: number, maxMessages?: number, maxMilliseconds?: number}; +} + +export interface PublisherCallOptions { + batching?: + {maxBytes?: number, maxMessages?: number, maxMilliseconds?: number}; +} + +/** + * @callback CreateTopicCallback + * @param {?Error} err Request error, if any. + * @param {Snapshot} snapshot + * @param {object} apiResponse The full API response. + */ +export interface CreateSnapshotCallback { + (err: Error|null, snapshot?: Snapshot|null, + apiResponse?: google.pubsub.v1.Snapshot): void; +} + +/** + * @typedef {array} CreateSnapshotResponse + * @property {Snapshot}. + * @property {object} 1 The full API response. + */ +export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.Snapshot]; + /** * Project ID placeholder. * @type {string} @@ -56,7 +112,7 @@ export type Metadata = any; * @property {Topic} 0 The new {@link Topic}. * @property {object} 1 The full API response. */ -export type CreateTopicResponse = [Topic, object]; +export type CreateTopicResponse = [Topic, google.pubsub.v1.Topic]; /** * @callback CreateTopicCallback @@ -65,7 +121,19 @@ export type CreateTopicResponse = [Topic, object]; * @param {object} apiResponse The full API response. */ export interface CreateTopicCallback { - (err?: Error|null, topic?: Topic|null, apiResponse?: object): void; + (err?: Error|null, topic?: Topic|null, + apiResponse?: google.pubsub.v1.Topic): void; +} + +/** + * @callback CreateSubscriptionCallback + * @param {?Error} err Request error, if any. + * @param {Subscription} Subscription + * @param {object} apiResponse The full API response. + */ +export interface CreateSubscriptionCallback { + (err?: Error|null, subscription?: Subscription|null, + apiResponse?: google.pubsub.v1.Subscription): void; } export type Client = 'PublisherClient'|'SubscriberClient'; @@ -91,22 +159,18 @@ export interface RequestCallback { * @property {Subscription} 0 The new {@link Subscription}. * @property {object} 1 The full API response. */ -export type CreateSubscriptionResponse = [Subscription, object]; +export type CreateSubscriptionResponse = + [Subscription, google.pubsub.v1.Subscription]; -/** - * @callback CreateSubscriptionCallback - * @param {?Error} err Request error, if any. - * @param {Subscription} subscription The new {@link Subscription}. - * @param {object} apiResponse The full API response. - */ -export interface CreateSubscriptionCallback { - (err?: Error|null, subscription?: Subscription|null, - apiResponse?: object): void; -} -export interface CreateSubscriptionOptions extends SubscriptionMetadata { +export interface CreateSubscriptionOptions { flowControl?: {maxBytes?: number; maxMessages?: number;}; gaxOpts?: CallOptions; + /** + * Duration in seconds. + */ + messageRetentionDuration?: number; + pushEndpoint?: string; } /** diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index c594ce6ac37..75333c42bf2 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -17,16 +17,19 @@ import {promisifyAll} from '@google-cloud/promisify'; import {EventEmitter} from 'events'; import * as extend from 'extend'; +import {CallOptions} from 'google-gax'; import * as is from 'is'; import * as snakeCase from 'lodash.snakecase'; -import {Metadata, PubSub} from '.'; +import {google} from '../proto/pubsub'; + +import {CreateSnapshotCallback, CreateSnapshotResponse, CreateSubscriptionCallback, CreateSubscriptionResponse, ExistsCallback, GetCallOptions, GetSubscriptionMetadataCallback, Metadata, PubSub, PushConfig, RequestCallback, SubscriptionCallOptions} from '.'; import {IAM} from './iam'; import {Snapshot} from './snapshot'; import {Subscriber, SubscriberOptions} from './subscriber'; -import {Topic} from './topic'; import {noop} from './util'; + /** * @typedef {object} ExpirationPolicy * A policy that specifies the conditions for this subscription's expiration. A @@ -198,12 +201,15 @@ export class Subscription extends EventEmitter { create!: Function; iam: IAM; name: string; - metadata; + + metadata: Metadata; request: Function; private _subscriber: Subscriber; - constructor(pubsub: PubSub, name: string, options?) { + constructor(pubsub: PubSub, name: string, options?: SubscriptionCallOptions) { super(); + + options = options || {}; this.pubsub = pubsub; @@ -292,7 +298,9 @@ export class Subscription extends EventEmitter { * // If the callback is omitted a Promise will be returned. * subscription.close().then(() => {}); */ - close(callback?: (err?: Error) => void) { + close(): Promise; + close(callback: RequestCallback): void; + close(callback?: RequestCallback): void|Promise { this._subscriber.close().then(() => callback!(), callback); } /** @@ -338,14 +346,23 @@ export class Subscription extends EventEmitter { * const apiResponse = data[1]; * }); */ - createSnapshot(name, gaxOpts, callback) { + createSnapshot(name: string, callback: CreateSnapshotCallback): void; + createSnapshot(name: string, gaxOpts?: CallOptions): + Promise; + createSnapshot( + name: string, gaxOpts: CallOptions, + callback: CreateSnapshotCallback): void; + createSnapshot( + name: string, gaxOptsOrCallback?: CallOptions|CreateSnapshotCallback, + callback?: CreateSnapshotCallback): void|Promise { if (!is.string(name)) { throw new Error('A name is required to create a snapshot.'); } - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const snapshot = this.snapshot(name); const reqOpts = { name: snapshot.name, @@ -358,13 +375,13 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - (err, resp) => { + (err: Error, resp: google.pubsub.v1.Snapshot) => { if (err) { - callback(err, null, resp); + callback!(err, null, resp); return; } snapshot.metadata = resp; - callback(null, snapshot, resp); + callback!(null, snapshot, resp); }); } /** @@ -396,11 +413,22 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - delete(gaxOpts?, callback?) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + + + delete(callback: RequestCallback): void; + delete(gaxOpts?: CallOptions): Promise; + delete( + gaxOpts: CallOptions, + callback: RequestCallback): void; + delete( + gaxOptsOrCallback?: CallOptions|RequestCallback, + callback?: RequestCallback): + void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + callback = callback || noop; const reqOpts = { subscription: this.name, @@ -450,17 +478,20 @@ export class Subscription extends EventEmitter { * const exists = data[0]; * }); */ - exists(callback) { + exists(): Promise; + exists(callback: ExistsCallback): void; + exists(callback?: ExistsCallback): void|Promise { this.getMetadata(err => { if (!err) { - callback(null, true); + callback!(null, true); return; } + if (err.code === 5) { - callback(null, false); + callback!(null, false); return; } - callback(err); + callback!(err); }); } /** @@ -503,22 +534,29 @@ export class Subscription extends EventEmitter { * const apiResponse = data[1]; * }); */ - get(gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + get(callback: CreateSubscriptionCallback): void; + get(gaxOpts?: GetCallOptions): Promise; + get(gaxOpts: GetCallOptions, callback: CreateSubscriptionCallback): void; + get(gaxOptsOrCallback?: GetCallOptions|CreateSubscriptionCallback, + callback?: CreateSubscriptionCallback): + void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; const autoCreate = !!gaxOpts.autoCreate && is.fn(this.create); delete gaxOpts.autoCreate; this.getMetadata(gaxOpts, (err, apiResponse) => { if (!err) { - callback(null, this, apiResponse); + callback!(null, this, apiResponse!); return; } + if (err.code !== 5 || !autoCreate) { - callback(err, null, apiResponse); + callback!(err, null, apiResponse!); return; } + this.create(gaxOpts, callback); }); } @@ -559,11 +597,18 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - getMetadata(gaxOpts?, callback?) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + getMetadata(gaxOpts?: CallOptions): Promise; + getMetadata(callback: GetSubscriptionMetadataCallback): void; + getMetadata(gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback): + void; + getMetadata( + gaxOptsOrCallback?: CallOptions|GetSubscriptionMetadataCallback, + callback?: GetSubscriptionMetadataCallback): + void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; const reqOpts = { subscription: this.name, }; @@ -574,11 +619,11 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - (err, apiResponse) => { + (err: Error, apiResponse: google.pubsub.v1.Subscription) => { if (!err) { this.metadata = apiResponse; } - callback(err, apiResponse); + callback!(err, apiResponse); }); } /** @@ -629,11 +674,23 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - modifyPushConfig(config, gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + modifyPushConfig(config: PushConfig, gaxOpts?: CallOptions): + Promise; + modifyPushConfig( + config: PushConfig, + callback: RequestCallback): void; + modifyPushConfig( + config: PushConfig, gaxOpts: CallOptions, + callback: RequestCallback): void; + modifyPushConfig( + config: PushConfig, + gaxOptsOrCallback?: CallOptions|RequestCallback, + callback?: RequestCallback): + void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; const reqOpts = { subscription: this.name, pushConfig: config, @@ -710,11 +767,21 @@ export class Subscription extends EventEmitter { * * subscription.seek(date, callback); */ - seek(snapshot, gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + seek(snapshot: string|Date, gaxOpts?: CallOptions): + Promise; + seek(snapshot: string|Date, callback: google.pubsub.v1.ISeekResponse): void; + seek( + snapshot: string|Date, gaxOpts: CallOptions, + callback: google.pubsub.v1.ISeekResponse): void; + seek( + snapshot: string|Date, + gaxOptsOrCallback: CallOptions|google.pubsub.v1.ISeekResponse, + callback?: google.pubsub.v1.ISeekResponse): + void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; interface ReqOpts { subscription?: string; @@ -725,10 +792,12 @@ export class Subscription extends EventEmitter { subscription: this.name, }; - if (is.string(snapshot)) { - reqOpts.snapshot = Snapshot.formatName_(this.projectId, snapshot); + if (typeof snapshot === 'string') { + reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); + + } else if (is.date(snapshot)) { - reqOpts.time = snapshot; + reqOpts.time = snapshot as Date; } else { throw new Error('Either a snapshot name or Date is needed to seek to.'); } @@ -777,11 +846,25 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - setMetadata(metadata, gaxOpts?, callback?) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + setMetadata(metadata: Metadata, gaxOpts?: CallOptions): + Promise; + setMetadata( + metadata: Metadata, + callback: RequestCallback): void; + setMetadata( + metadata: Metadata, gaxOpts: CallOptions, + callback: RequestCallback): void; + setMetadata( + metadata: Metadata, + gaxOptsOrCallback?: CallOptions| + RequestCallback, + callback?: RequestCallback): + void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const subscription = Subscription.formatMetadata_(metadata); const fields = Object.keys(subscription).map(snakeCase); subscription.name = this.name; @@ -847,7 +930,8 @@ export class Subscription extends EventEmitter { * * @private */ - static formatMetadata_(metadata: SubscriptionMetadataRaw) { + static formatMetadata_(metadata: SubscriptionMetadataRaw): + SubscriptionMetadata { let formatted = {} as SubscriptionMetadata; if (metadata.messageRetentionDuration) { diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 62549e890f7..4f9575999c8 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -20,9 +20,12 @@ import {CallOptions} from 'google-gax'; import * as is from 'is'; import {Readable} from 'stream'; -import {CreateTopicCallback, CreateTopicResponse, Metadata, PubSub} from '.'; +import {google} from '../proto/pubsub'; + +import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, CreateTopicCallback, CreateTopicResponse, ExistsCallback, GetCallOptions, Metadata, PublisherCallOptions, PubSub, RequestCallback, SubscriptionCallOptions} from '.'; import {IAM} from './iam'; import {PublishCallback, Publisher, PublishOptions} from './publisher'; +import {Subscription} from './subscription'; import * as util from './util'; /** @@ -196,8 +199,24 @@ export class Topic { * const apiResponse = data[1]; * }); */ - createSubscription(name: string, options, callback?) { - this.pubsub.createSubscription(this, name, options, callback); + createSubscription(name: string, callback: CreateSubscriptionCallback): void; + createSubscription(name: string, options?: CreateSubscriptionOptions): + Promise; + createSubscription( + name: string, options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback): void; + createSubscription( + name: string, + optionsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, + callback?: CreateSubscriptionCallback): + void|Promise { + const options = + typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + + this.pubsub.createSubscription( + this, name, options as CreateSubscriptionOptions, callback!); } /** * Delete the topic. This will not delete subscriptions to this topic. @@ -226,11 +245,20 @@ export class Topic { * const apiResponse = data[0]; * }); */ - delete(gaxOpts?, callback?) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + delete(callback: RequestCallback): void; + delete(gaxOpts?: CallOptions): Promise; + delete( + gaxOpts: CallOptions, + callback: RequestCallback): void; + delete( + gaxOptsOrCallback?: CallOptions|RequestCallback, + callback?: RequestCallback): + void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + callback = callback || util.noop; const reqOpts = { topic: this.name, @@ -240,7 +268,7 @@ export class Topic { client: 'PublisherClient', method: 'deleteTopic', reqOpts, - gaxOpts, + gaxOpts: gaxOpts as CallOptions, }, callback); } @@ -274,13 +302,19 @@ export class Topic { * const exists = data[0]; * }); */ - exists(callback) { - this.getMetadata(err => { + exists(callback: ExistsCallback) { + this.getMetadata((err) => { if (!err) { callback(null, true); return; } - if (err.code === 5) { + let code = 0; + if (err.hasOwnProperty('code')) { + code = + (Object.getOwnPropertyDescriptor(err, 'code') as PropertyDescriptor) + .value; + } + if (code === 5) { callback(null, false); return; } @@ -326,23 +360,33 @@ export class Topic { * const apiResponse = data[1]; * }); */ - get(gaxOpts, callback) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + get(callback: CreateTopicCallback): void; + get(gaxOpts?: CallOptions&GetCallOptions): Promise; + get(gaxOpts: CallOptions&GetCallOptions, callback: CreateTopicCallback): void; + get(gaxOptsOrCallback?: CallOptions&GetCallOptions|CreateTopicCallback, + callback?: CreateTopicCallback): void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; const autoCreate = !!gaxOpts.autoCreate; delete gaxOpts.autoCreate; this.getMetadata(gaxOpts, (err, apiResponse) => { if (!err) { - callback(null, this, apiResponse); + callback!(null, this, apiResponse!); return; } - if (err.code !== 5 || !autoCreate) { - callback(err, null, apiResponse); + let code = 0; + if (err.hasOwnProperty('code')) { + code = + (Object.getOwnPropertyDescriptor(err, 'code') as PropertyDescriptor) + .value; + } + if (code !== 5 || !autoCreate) { + callback!(err, null, apiResponse!); return; } - this.create(gaxOpts, callback); + this.create(gaxOpts, callback!); }); } /** @@ -379,26 +423,34 @@ export class Topic { * const apiResponse = data[0]; * }); */ - getMetadata(gaxOpts, callback?) { - if (is.fn(gaxOpts)) { - callback = gaxOpts; - gaxOpts = {}; - } + getMetadata(callback: RequestCallback): void; + getMetadata( + gaxOpts: CallOptions, + callback: RequestCallback): void; + getMetadata(gaxOpts?: CallOptions): Promise; + getMetadata( + gaxOptsOrCallback?: CallOptions|RequestCallback, + callback?: RequestCallback): + void|Promise { + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; const reqOpts = { topic: this.name, }; - this.request( + this.request( { client: 'PublisherClient', method: 'getTopic', reqOpts, - gaxOpts, + gaxOpts: gaxOpts as CallOptions, }, (err, apiResponse) => { if (!err) { this.metadata = apiResponse; } - callback(err, apiResponse); + callback!(err, apiResponse); }); } /** @@ -437,17 +489,29 @@ export class Topic { * const subscriptions = data[0]; * }); */ - getSubscriptions(options, callback?) { + getSubscriptions(callback: RequestCallback): void; + getSubscriptions( + options: SubscriptionCallOptions, + callback: RequestCallback): void; + getSubscriptions( + options?: SubscriptionCallOptions, + ): Promise; + getSubscriptions( + optionsOrCallback?: SubscriptionCallOptions| + RequestCallback, + callback?: RequestCallback): + void|Promise { const self = this; - if (is.fn(options)) { - callback = options; - options = {}; - } + const options = + typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + const reqOpts = Object.assign( { topic: this.name, }, - options); + options as SubscriptionCallOptions); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; const gaxOpts = Object.assign( @@ -462,16 +526,16 @@ export class Topic { reqOpts, gaxOpts, }, - // tslint:disable-next-line only-arrow-functions - function() { - const subscriptions = arguments[1]; + // tslint:disable-next-line no-any + (...args: any[]) => { + const subscriptions = args[1]; if (subscriptions) { - arguments[1] = subscriptions.map(sub => { + args[1] = subscriptions.map((sub: string) => { // ListTopicSubscriptions only returns sub names return self.subscription(sub); }); } - callback.apply(null, arguments); + callback!(...args); }); } /** @@ -641,7 +705,7 @@ export class Topic { * // message.publishTime = Timestamp when Pub/Sub received the message. * }); */ - subscription(name, options?) { + subscription(name: string, options?: SubscriptionCallOptions): Subscription { options = options || {}; options.topic = this; return this.pubsub.subscription(name, options); diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 43705c1565e..a264827d666 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -188,7 +188,7 @@ describe('pubsub', () => { const topic = pubsub.topic(TOPIC_NAMES[0]); topic.getMetadata((err, metadata) => { assert.ifError(err); - assert.strictEqual(metadata.name, topic.name); + assert.strictEqual(metadata!.name, topic.name); done(); }); }); @@ -248,8 +248,8 @@ describe('pubsub', () => { it('should list all subscriptions registered to the topic', done => { topic.getSubscriptions((err, subs) => { assert.ifError(err); - assert.strictEqual(subs.length, SUBSCRIPTIONS.length); - assert(subs[0] instanceof Subscription); + assert.strictEqual(subs!.length, SUBSCRIPTIONS.length); + assert(subs![0] instanceof Subscription); done(); }); }); @@ -297,7 +297,7 @@ describe('pubsub', () => { topic.createSubscription(subName, (err, sub) => { assert.ifError(err); assert(sub instanceof Subscription); - sub.delete(done); + sub!.delete(done); }); }); @@ -330,27 +330,29 @@ describe('pubsub', () => { it('should create a subscription with message retention', done => { const subName = generateSubName(); const threeDaysInSeconds = 3 * 24 * 60 * 60; + const callOptions = { + messageRetentionDuration: threeDaysInSeconds, + topic: '', + name: '' + }; - topic.createSubscription( - subName, { - messageRetentionDuration: threeDaysInSeconds, - }, - (err, sub) => { - assert.ifError(err); - sub.getMetadata((err, metadata) => { - assert.ifError(err); + topic.createSubscription(subName, callOptions, (err, sub) => { + assert.ifError(err); - assert.strictEqual(metadata.retainAckedMessages, true); - assert.strictEqual( - Number(metadata.messageRetentionDuration.seconds), - threeDaysInSeconds); - assert.strictEqual( - Number(metadata.messageRetentionDuration.nanos), 0); + sub!.getMetadata((err, metadata) => { + assert.ifError(err); - sub.delete(done); - }); - }); + assert.strictEqual(metadata!.retainAckedMessages, true); + assert.strictEqual( + Number(metadata!.messageRetentionDuration!.seconds), + threeDaysInSeconds); + assert.strictEqual( + Number(metadata!.messageRetentionDuration!.nanos), 0); + + sub!.delete(done); + }); + }); }); it('should set metadata for a subscription', () => { From 00cb7839412462efabcf13712059c5c3cc338c57 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 25 Jan 2019 19:23:00 -0800 Subject: [PATCH 0326/1115] fix(test): broken snapshot test hook (#448) --- handwritten/pubsub/system-test/pubsub.ts | 27 ++++++++---------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index a264827d666..583127efd2c 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -597,29 +597,20 @@ describe('pubsub', () => { }); } - function wait(milliseconds) { - return () => { - return new Promise(resolve => { - setTimeout(resolve, milliseconds); - }); - }; - } - - before(() => { - topic = pubsub.topic(TOPIC_NAMES[0]); + before(async () => { + topic = pubsub.topic(generateTopicName()); subscription = topic.subscription(generateSubName()); snapshot = subscription.snapshot(SNAPSHOT_NAME); - return deleteAllSnapshots() - .then(wait(2500)) - .then(subscription.create.bind(subscription)) - .then(wait(2500)) - .then(snapshot.create.bind(snapshot)) - .then(wait(2500)); + await deleteAllSnapshots(); + await topic.create(); + await subscription.create(); + await snapshot.create(); }); - after(() => { - return deleteAllSnapshots(); + after(async () => { + await deleteAllSnapshots(); + await topic.delete(); }); it('should get a list of snapshots', done => { From 0b2a2654efc24a49ef74b231a5fbe6380980928a Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 25 Jan 2019 22:00:01 -0800 Subject: [PATCH 0327/1115] fix(auth): pass project id to gax clients (#447) --- handwritten/pubsub/src/index.ts | 2 ++ handwritten/pubsub/test/index.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 48285441be9..ab751a68e9e 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -806,6 +806,8 @@ export class PubSub { return; } this.projectId = projectId!; + this.options.projectId = projectId!; + this.getClient_(config, callback); }); return; diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 30c6efd29bc..a29704028a2 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -1084,6 +1084,7 @@ describe('PubSub', () => { pubsub.getClient_(CONFIG, err => { assert.ifError(err); assert.strictEqual(pubsub.projectId, PROJECT_ID); + assert.strictEqual(pubsub.options.projectId, PROJECT_ID); done(); }); }); From 728878992ae07c002b5ae53101e61b6042a83a18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 25 Jan 2019 22:08:38 -0800 Subject: [PATCH 0328/1115] fix(deps): update dependency google-gax to ^0.24.0 (#444) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1b37c525fa1..51fcfb959c1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,7 +57,7 @@ "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auth-library": "^3.0.0", - "google-gax": "^0.23.0", + "google-gax": "^0.24.0", "is": "^3.0.1", "is-stream-ended": "^0.1.4", "lodash.chunk": "^4.2.0", From e021dac5e4fd2a5459c1efc02b375aad78364cf1 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Sat, 26 Jan 2019 07:58:54 -0800 Subject: [PATCH 0329/1115] chore: remove trailing whitespace in package.json --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/synth.metadata | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 51fcfb959c1..660ff708e07 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -30,7 +30,7 @@ "google pubsub", "pubsub" ], - "scripts": { + "scripts": { "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index a59a16bd0da..e8514143146 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-01-17T12:50:57.746664Z", + "updateTime": "2019-01-26T12:16:21.653703Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.6", - "dockerImage": "googleapis/artman@sha256:12722f2ca3fbc3b53cc6aa5f0e569d7d221b46bd876a2136497089dec5e3634e" + "version": "0.16.7", + "dockerImage": "googleapis/artman@sha256:d6c8ced606eb49973ca95d2af7c55a681acc042db0f87d135968349e7bf6dd80" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0ac60e21a1aa86c07c1836865b35308ba8178b05", - "internalRef": "229626798" + "sha": "a6b4398490269577fc511f297b85763ba4701403", + "internalRef": "230969086" } }, { From ad1b03e9bfc9312b34c4953a35cdee4539f0f7dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sat, 26 Jan 2019 12:36:03 -0500 Subject: [PATCH 0330/1115] chore(deps): update dependency eslint-config-prettier to v4 (#450) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 660ff708e07..5e23f7a2ff0 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -81,7 +81,7 @@ "@types/uuid": "^3.4.4", "codecov": "^3.0.0", "eslint": "^5.0.0", - "eslint-config-prettier": "^3.0.0", + "eslint-config-prettier": "^4.0.0", "eslint-plugin-node": "^8.0.0", "eslint-plugin-prettier": "^3.0.0", "gts": "^0.9.0", From 1632c9c939b5d2c552a00bde2863c7403251e9ac Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 28 Jan 2019 10:07:44 -0800 Subject: [PATCH 0331/1115] Release v0.24.0 (#452) --- handwritten/pubsub/CHANGELOG.md | 24 ++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c334ececa08..9244cd8b350 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,30 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.24.0 + +01-28-2019 09:54 PST + +### New Features +- fix(auth): pass project id to gax clients ([#447](https://github.com/googleapis/nodejs-pubsub/pull/447)) +- refactor(typescript): noImplicityAny for topic.ts and subscription.ts ([#420](https://github.com/googleapis/nodejs-pubsub/pull/420)) +- refactor: improve subscriber error handling ([#440](https://github.com/googleapis/nodejs-pubsub/pull/440)) +- feat(subscription): auto close sub on non-recoverable errors ([#441](https://github.com/googleapis/nodejs-pubsub/pull/441)) + +### Dependencies +- chore(deps): update dependency eslint-config-prettier to v4 ([#450](https://github.com/googleapis/nodejs-pubsub/pull/450)) +- fix(deps): update dependency google-gax to ^0.24.0 ([#444](https://github.com/googleapis/nodejs-pubsub/pull/444)) +- fix(deps): update dependency google-auth-library to v3 ([#433](https://github.com/googleapis/nodejs-pubsub/pull/433)) + +### Documentation +- build: ignore googleapis.com in doc link check ([#439](https://github.com/googleapis/nodejs-pubsub/pull/439)) +- chore: update year in the license headers. ([#434](https://github.com/googleapis/nodejs-pubsub/pull/434)) + +### Internal / Testing Changes +- chore: remove trailing whitespace in package.json +- fix(sample): factor setTimeout jitter into assertion ([#449](https://github.com/googleapis/nodejs-pubsub/pull/449)) +- fix(test): broken snapshot test hook ([#448](https://github.com/googleapis/nodejs-pubsub/pull/448)) + ## v0.23.0 01-16-2019 13:09 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5e23f7a2ff0..a0a1a13f1b6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.23.0", + "version": "0.24.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 9cfe44780dcb9fd0206bc21c6d045bdd34be9ca9 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 29 Jan 2019 11:55:32 -0800 Subject: [PATCH 0332/1115] fix(publisher): unbound max send message size (#454) --- handwritten/pubsub/src/index.ts | 1 + handwritten/pubsub/test/index.ts | 36 +++++++++++++------------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index ab751a68e9e..c427d329a14 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -272,6 +272,7 @@ export class PubSub { this.options = Object.assign( { 'grpc.keepalive_time_ms': 300000, + 'grpc.max_send_message_length': -1, 'grpc.max_receive_message_length': 20000001, libName: 'gccl', libVersion: PKG.version, diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index a29704028a2..a79e974558a 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -183,6 +183,15 @@ describe('PubSub', () => { }); describe('instantiation', () => { + const DEFAULT_OPTIONS = { + 'grpc.keepalive_time_ms': 300000, + 'grpc.max_send_message_length': -1, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version, + scopes: [], + }; + it('should extend the correct methods', () => { assert(extended); // See `fakePaginator.extend` }); @@ -236,19 +245,10 @@ describe('PubSub', () => { a: 'b', c: 'd', }; + const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, options); googleAuthOverride = options_ => { - assert.deepStrictEqual( - options_, - Object.assign( - { - 'grpc.max_receive_message_length': 20000001, - 'grpc.keepalive_time_ms': 300000, - libName: 'gccl', - libVersion: PKG.version, - scopes: [], - }, - options)); + assert.deepStrictEqual(options_, expectedOptions); return fakeGoogleAuthInstance; }; @@ -257,17 +257,9 @@ describe('PubSub', () => { }); it('should localize the options provided', () => { - assert.deepStrictEqual( - pubsub.options, - Object.assign( - { - 'grpc.max_receive_message_length': 20000001, - 'grpc.keepalive_time_ms': 300000, - libName: 'gccl', - libVersion: PKG.version, - scopes: [], - }, - OPTIONS)); + const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, OPTIONS); + + assert.deepStrictEqual(pubsub.options, expectedOptions); }); it('should set the projectId', () => { From 760217d18eb089294d2aaba340c3c7ac111a7fb9 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 29 Jan 2019 14:55:17 -0800 Subject: [PATCH 0333/1115] Release v0.24.1 (#455) --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 9244cd8b350..0790cfb33f3 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.24.1 + +01-29-2019 13:17 PST + +### Bug Fixes + +- fix(publisher): unbound max send message size ([#454](https://github.com/googleapis/nodejs-pubsub/pull/454)) + ## v0.24.0 01-28-2019 09:54 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a0a1a13f1b6..e7b65091a34 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.24.0", + "version": "0.24.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From a41526833de18cad74dc2e19f0d4b79ddc51d6f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Wed, 30 Jan 2019 12:19:23 -0800 Subject: [PATCH 0334/1115] fix(deps): update dependency google-gax to ^0.25.0 (#456) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e7b65091a34..ead65c02e53 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,7 +57,7 @@ "duplexify": "^3.5.4", "extend": "^3.0.1", "google-auth-library": "^3.0.0", - "google-gax": "^0.24.0", + "google-gax": "^0.25.0", "is": "^3.0.1", "is-stream-ended": "^0.1.4", "lodash.chunk": "^4.2.0", From 44a1d7d505e6ea39634827da8850f0b56c848120 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Fri, 1 Feb 2019 07:35:12 -0800 Subject: [PATCH 0335/1115] test: make smoke test spam less (#459) * test: make smoke test spam less If we had charged tests for using lines of stdout, this one would've gone bankrupt soon. * lint --- handwritten/pubsub/smoke-test/publisher_smoke_test.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index b68c4ba1701..b1b5a977e51 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -83,12 +83,16 @@ describe('PublisherSmokeTest', () => { }); const formattedProject = client.projectPath(projectId); + let counter = 0; client .listTopicsStream({project: formattedProject}) - .on('data', element => { - console.log(element); + .on('data', () => { + ++counter; }) .on('error', done) - .on('end', done); + .on('end', () => { + console.log(`${counter} elements received.`); + done(); + }); }); }); From 8069c60699d2c7a4321d45fbecb77d52cd4c8b44 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 1 Feb 2019 13:25:13 -0800 Subject: [PATCH 0336/1115] Automerge by dpebot Automerge by dpebot --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ead65c02e53..496212b3bbb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -95,7 +95,7 @@ "proxyquire": "^2.0.0", "sinon": "^7.1.1", "source-map-support": "^0.5.9", - "typescript": "~3.2.0", + "typescript": "~3.3.0", "uuid": "^3.1.0" } } From 778b32f57b9b578bcdbcefc527bc383bb2b364b2 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Tue, 5 Feb 2019 08:25:41 -0800 Subject: [PATCH 0337/1115] test: update code style of smoke test (#463) --- .../pubsub/smoke-test/publisher_smoke_test.js | 18 +++++++----------- handwritten/pubsub/src/v1/publisher_client.js | 16 ++++++++-------- handwritten/pubsub/src/v1/subscriber_client.js | 16 ++++++++-------- handwritten/pubsub/synth.metadata | 10 +++++----- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index b1b5a977e51..cce42c0d383 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -34,8 +34,8 @@ describe('PublisherSmokeTest', () => { .listTopics({project: formattedProject}) .then(responses => { const resources = responses[0]; - for (let i = 0; i < resources.length; i += 1) { - console.log(resources[i]); + for (const resource of resources) { + console.log(resource); } }) .then(done) @@ -60,8 +60,8 @@ describe('PublisherSmokeTest', () => { const nextRequest = responses[1]; // The actual response object, if necessary. // const rawResponse = responses[2]; - for (let i = 0; i < resources.length; i += 1) { - console.log(resources[i]); + for (const resource of resources) { + console.log(resource); } if (nextRequest) { // Fetch the next page. @@ -83,16 +83,12 @@ describe('PublisherSmokeTest', () => { }); const formattedProject = client.projectPath(projectId); - let counter = 0; client .listTopicsStream({project: formattedProject}) - .on('data', () => { - ++counter; + .on('data', element => { + console.log(element); }) .on('error', done) - .on('end', () => { - console.log(`${counter} elements received.`); - done(); - }); + .on('end', done); }); }); diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index c76c1fbf0e4..0743a4cd92e 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -562,8 +562,8 @@ class PublisherClient { * client.listTopics({project: formattedProject}) * .then(responses => { * const resources = responses[0]; - * for (let i = 0; i < resources.length; i += 1) { - * // doThingsWith(resources[i]) + * for (const resource of resources) { + * // doThingsWith(resource) * } * }) * .catch(err => { @@ -582,8 +582,8 @@ class PublisherClient { * const nextRequest = responses[1]; * // The actual response object, if necessary. * // const rawResponse = responses[2]; - * for (let i = 0; i < resources.length; i += 1) { - * // doThingsWith(resources[i]); + * for (const resource of resources) { + * // doThingsWith(resource); * } * if (nextRequest) { * // Fetch the next page. @@ -713,8 +713,8 @@ class PublisherClient { * client.listTopicSubscriptions({topic: formattedTopic}) * .then(responses => { * const resources = responses[0]; - * for (let i = 0; i < resources.length; i += 1) { - * // doThingsWith(resources[i]) + * for (const resource of resources) { + * // doThingsWith(resource) * } * }) * .catch(err => { @@ -733,8 +733,8 @@ class PublisherClient { * const nextRequest = responses[1]; * // The actual response object, if necessary. * // const rawResponse = responses[2]; - * for (let i = 0; i < resources.length; i += 1) { - * // doThingsWith(resources[i]); + * for (const resource of resources) { + * // doThingsWith(resource); * } * if (nextRequest) { * // Fetch the next page. diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index a108eb30bae..0520bcad0bb 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -574,8 +574,8 @@ class SubscriberClient { * client.listSubscriptions({project: formattedProject}) * .then(responses => { * const resources = responses[0]; - * for (let i = 0; i < resources.length; i += 1) { - * // doThingsWith(resources[i]) + * for (const resource of resources) { + * // doThingsWith(resource) * } * }) * .catch(err => { @@ -594,8 +594,8 @@ class SubscriberClient { * const nextRequest = responses[1]; * // The actual response object, if necessary. * // const rawResponse = responses[2]; - * for (let i = 0; i < resources.length; i += 1) { - * // doThingsWith(resources[i]); + * for (const resource of resources) { + * // doThingsWith(resource); * } * if (nextRequest) { * // Fetch the next page. @@ -1053,8 +1053,8 @@ class SubscriberClient { * client.listSnapshots({project: formattedProject}) * .then(responses => { * const resources = responses[0]; - * for (let i = 0; i < resources.length; i += 1) { - * // doThingsWith(resources[i]) + * for (const resource of resources) { + * // doThingsWith(resource) * } * }) * .catch(err => { @@ -1073,8 +1073,8 @@ class SubscriberClient { * const nextRequest = responses[1]; * // The actual response object, if necessary. * // const rawResponse = responses[2]; - * for (let i = 0; i < resources.length; i += 1) { - * // doThingsWith(resources[i]); + * for (const resource of resources) { + * // doThingsWith(resource); * } * if (nextRequest) { * // Fetch the next page. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index e8514143146..cb3539f9f6f 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-01-26T12:16:21.653703Z", + "updateTime": "2019-02-05T12:16:03.207914Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.7", - "dockerImage": "googleapis/artman@sha256:d6c8ced606eb49973ca95d2af7c55a681acc042db0f87d135968349e7bf6dd80" + "version": "0.16.9", + "dockerImage": "googleapis/artman@sha256:80c39fa84e7203c8f355e01bdeef82155013cc39dcaa48fba7a6fe2c253623e3" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a6b4398490269577fc511f297b85763ba4701403", - "internalRef": "230969086" + "sha": "f26c727dde5051abefc5ad9e7dee82a2686ad2b0", + "internalRef": "232306662" } }, { From add781ec9ca1d7f7ed6f0c53f9826148bfd5d0c3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 5 Feb 2019 09:24:02 -0800 Subject: [PATCH 0338/1115] fix(deps): update dependency duplexify to v4 (#462) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 496212b3bbb..640025afd6d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "arrify": "^1.0.0", "async-each": "^1.0.1", "delay": "^4.0.0", - "duplexify": "^3.5.4", + "duplexify": "^4.0.0", "extend": "^3.0.1", "google-auth-library": "^3.0.0", "google-gax": "^0.25.0", From 2494ee80e0cd6c224d6b9929dfaf7bbc9ab4a8bc Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 5 Feb 2019 13:52:30 -0800 Subject: [PATCH 0339/1115] docs: add lint/fix example to contributing guide (#464) --- handwritten/pubsub/.github/CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/handwritten/pubsub/.github/CONTRIBUTING.md b/handwritten/pubsub/.github/CONTRIBUTING.md index aaeac9f9483..b958f235007 100644 --- a/handwritten/pubsub/.github/CONTRIBUTING.md +++ b/handwritten/pubsub/.github/CONTRIBUTING.md @@ -50,4 +50,8 @@ accept your pull requests. npm test +1. Lint (and maybe fix) any changes: + + npm run fix + [setup]: https://cloud.google.com/nodejs/docs/setup From 01fe4eac0eb30624e5974d778d940b0b1a8469fd Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 7 Feb 2019 13:41:04 -0800 Subject: [PATCH 0340/1115] docs: make mention of message change in changelog (#469) --- handwritten/pubsub/CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 0790cfb33f3..84817d4823a 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -95,6 +95,19 @@ const subscription = topic.subscription('my-sub', { }); ``` +#### BREAKING: messages are no longer plain objects. ([#388](https://github.com/googleapis/nodejs-pubsub/pull/388)) + +Messages were refactored into a [class](https://github.com/googleapis/nodejs-pubsub/blob/52305c7ee5bbc9caba1369a45ae7fdcdeba1c89b/src/subscriber.ts#L59), +this will only affect (some) users who treat messages like plain old objects. + +The following example is something that would have worked previously, but will +now throw a `TypeError` since `ack` lives on the prototype chain. + +```js +const m = Object.assign({}, message, customData); +m.ack(); // TypeError: m.ack is not a function +``` + ### New Features - feat(topic): create method for publishing json ([#430](https://github.com/googleapis/nodejs-pubsub/pull/430)) From eb99eee483ed31fcb11d2d679fa3dfe52b6b11bb Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 7 Feb 2019 15:41:29 -0800 Subject: [PATCH 0341/1115] chore: move CONTRIBUTING.md to root (#470) --- handwritten/pubsub/{.github => }/CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename handwritten/pubsub/{.github => }/CONTRIBUTING.md (100%) diff --git a/handwritten/pubsub/.github/CONTRIBUTING.md b/handwritten/pubsub/CONTRIBUTING.md similarity index 100% rename from handwritten/pubsub/.github/CONTRIBUTING.md rename to handwritten/pubsub/CONTRIBUTING.md From 5f7ed8777b828aaa1f86afc0a60636528173817c Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 7 Feb 2019 18:48:02 -0800 Subject: [PATCH 0342/1115] docs: update contributing path in README (#471) --- handwritten/pubsub/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 67ae9d75995..7c0e3a8bffe 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -79,7 +79,7 @@ More Information: [Google Cloud Platform Launch Stages][launch_stages] ## Contributing -Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-pubsub/blob/master/.github/CONTRIBUTING.md). +Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-pubsub/blob/master/CONTRIBUTING.md). ## License From aa9aee1796f01b66ff37c0ee40d03ceb23c9c87e Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Fri, 8 Feb 2019 15:10:01 +0530 Subject: [PATCH 0343/1115] refactor(typescript): noImplicityAny for snapshot.ts and publisher.ts (#457) --- handwritten/pubsub/src/index.ts | 39 +++--- handwritten/pubsub/src/publisher.ts | 53 +++++--- handwritten/pubsub/src/snapshot.ts | 179 ++++++++++++++----------- handwritten/pubsub/src/subscription.ts | 65 +++++---- handwritten/pubsub/src/topic.ts | 22 +-- handwritten/pubsub/test/snapshot.ts | 61 +++++---- 6 files changed, 234 insertions(+), 185 deletions(-) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index c427d329a14..e9aebf2d572 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -33,19 +33,22 @@ const PKG = require('../../package.json'); const v1 = require('./v1'); import {Snapshot} from './snapshot'; -import {Subscription, SubscriptionMetadata, SubscriptionMetadataRaw} from './subscription'; +import {Subscription, SubscriptionMetadataRaw} from './subscription'; import {Topic, PublishOptions} from './topic'; import {CallOptions} from 'google-gax'; import {Readable} from 'stream'; import {google} from '../proto/pubsub'; import {ServiceError} from 'grpc'; +import {FlowControlOptions} from './lease-manager'; +import {BatchPublishOptions} from './publisher'; const opts = {} as gax.GrpcClientOptions; const {grpc} = new gax.GrpcClient(opts); +export type SeekCallback = RequestCallback; export interface GetSubscriptionMetadataCallback { - (err: ServiceError|null, res?: google.pubsub.v1.Subscription|null): void; + (err: ServiceError|null, res?: google.pubsub.v1.ISubscription|null): void; } export interface ExistsCallback { @@ -56,28 +59,22 @@ export interface GetCallOptions extends CallOptions { autoCreate?: boolean; } -export interface PushConfig { - pushEndpoint: string; - attibutes?: Map; +export interface Attributes { + [key: string]: string; } export interface SubscriptionCallOptions { - flowControl?: - {maxBytes?: number, maxMessages?: number, allowExcessMessages: boolean;}; + flowControl?: FlowControlOptions; maxConnections?: number; topic?: Topic; ackDeadline?: number; autoPaginate?: boolean; gaxOpts?: CallOptions; - batching?: - {maxBytes?: number, maxMessages?: number, maxMilliseconds?: number}; + batching?: BatchPublishOptions; } -export interface PublisherCallOptions { - batching?: - {maxBytes?: number, maxMessages?: number, maxMilliseconds?: number}; -} + /** * @callback CreateTopicCallback @@ -87,7 +84,7 @@ export interface PublisherCallOptions { */ export interface CreateSnapshotCallback { (err: Error|null, snapshot?: Snapshot|null, - apiResponse?: google.pubsub.v1.Snapshot): void; + apiResponse?: google.pubsub.v1.ISnapshot): void; } /** @@ -95,7 +92,7 @@ export interface CreateSnapshotCallback { * @property {Snapshot}. * @property {object} 1 The full API response. */ -export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.Snapshot]; +export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.ISnapshot]; /** * Project ID placeholder. @@ -112,7 +109,7 @@ export type Metadata = any; * @property {Topic} 0 The new {@link Topic}. * @property {object} 1 The full API response. */ -export type CreateTopicResponse = [Topic, google.pubsub.v1.Topic]; +export type CreateTopicResponse = [Topic, google.pubsub.v1.ITopic]; /** * @callback CreateTopicCallback @@ -122,7 +119,7 @@ export type CreateTopicResponse = [Topic, google.pubsub.v1.Topic]; */ export interface CreateTopicCallback { (err?: Error|null, topic?: Topic|null, - apiResponse?: google.pubsub.v1.Topic): void; + apiResponse?: google.pubsub.v1.ITopic): void; } /** @@ -133,7 +130,7 @@ export interface CreateTopicCallback { */ export interface CreateSubscriptionCallback { (err?: Error|null, subscription?: Subscription|null, - apiResponse?: google.pubsub.v1.Subscription): void; + apiResponse?: google.pubsub.v1.ISubscription): void; } export type Client = 'PublisherClient'|'SubscriberClient'; @@ -160,11 +157,11 @@ export interface RequestCallback { * @property {object} 1 The full API response. */ export type CreateSubscriptionResponse = - [Subscription, google.pubsub.v1.Subscription]; + [Subscription, google.pubsub.v1.ISubscription]; export interface CreateSubscriptionOptions { - flowControl?: {maxBytes?: number; maxMessages?: number;}; + flowControl?: FlowControlOptions; gaxOpts?: CallOptions; /** * Duration in seconds. @@ -406,7 +403,7 @@ export class PubSub { name: subscription.name, }); - this.request( + this.request( { client: 'SubscriberClient', method: 'createSubscription', diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index ba62612fd63..a738268e710 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -17,21 +17,26 @@ import {promisifyAll} from '@google-cloud/promisify'; import * as arrify from 'arrify'; import {CallOptions} from 'google-gax'; -import {ServiceError} from 'grpc'; +import {google} from '../proto/pubsub'; const each = require('async-each'); import * as extend from 'extend'; import * as is from 'is'; import {Topic} from './topic'; +import {Attributes} from '.'; +import {ServiceError} from 'grpc'; -export interface PublishCallback { - (err: null|ServiceError, messageId: string): void; +interface Inventory { + callbacks: PublishCallback[]; + queued: google.pubsub.v1.IPubsubMessage[]; + bytes: number; } -interface PublishApiResponse { - messageIds: string[]; +export interface PublishCallback { + (err?: ServiceError|null, messageId?: string|null): void; } + /** * @typedef BatchPublishOptions * @property {number} [maxBytes=1024^2 * 5] The maximum number of bytes to @@ -41,7 +46,7 @@ interface PublishApiResponse { * @property {number} [maxMilliseconds=100] The maximum duration to wait before * sending a payload. */ -interface BatchPublishOptions { +export interface BatchPublishOptions { maxBytes?: number; maxMessages?: number; maxMilliseconds?: number; @@ -80,7 +85,7 @@ export class Publisher { // tslint:disable-next-line variable-name Promise?: PromiseConstructor; topic: Topic; - inventory_; + inventory_: Inventory; settings!: PublishOptions; timeoutHandle_?: NodeJS.Timer; constructor(topic: Topic, options?: PublishOptions) { @@ -157,17 +162,22 @@ export class Publisher { * //- * publisher.publish(data).then((messageId) => {}); */ - publish(data: Buffer, attributes?: object): Promise; + publish(data: Buffer, attributes?: Attributes): Promise; publish(data: Buffer, callback: PublishCallback): void; - publish(data: Buffer, attributes: object, callback: PublishCallback): void; - publish(data: Buffer, attributes?, callback?): Promise|void { + publish(data: Buffer, attributes: Attributes, callback: PublishCallback): + void; + publish( + data: Buffer, attributesOrCallback?: Attributes|PublishCallback, + callback?: PublishCallback): Promise|void { if (!(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); } - if (is.fn(attributes)) { - callback = attributes; - attributes = {}; - } + + const attributes = + typeof attributesOrCallback === 'object' ? attributesOrCallback : {}; + callback = typeof attributesOrCallback === 'function' ? + attributesOrCallback : + callback; // Ensure the `attributes` object only has string values for (const key of Object.keys(attributes)) { const value = attributes[key]; @@ -185,10 +195,10 @@ export class Publisher { this.publish_(); } // add it to the queue! - this.queue_(data, attributes, callback); + this.queue_(data, attributes, callback!); // next lets check if this message brings us to the message cap or if we // hit the max byte limit - const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages!; + const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; if (this.inventory_.bytes >= opts.maxBytes! || hasMaxMessages) { this.publish_(); return; @@ -247,7 +257,7 @@ export class Publisher { topic: this.topic.name, messages, }; - this.topic.request( + this.topic.request( { client: 'PublisherClient', method: 'publish', @@ -256,7 +266,7 @@ export class Publisher { }, (err, resp) => { const messageIds = arrify(resp && resp.messageIds); - each(callbacks, (callback, next) => { + each(callbacks, (callback: PublishCallback, next: Function) => { const messageId = messageIds[callbacks.indexOf(callback)]; callback(err, messageId); next(); @@ -272,13 +282,16 @@ export class Publisher { * @param {object} attributes The message attributes. * @param {function} callback The callback function. */ - queue_(data, attrs, callback) { + queue_(data: Buffer, attrs: Attributes): Promise; + queue_(data: Buffer, attrs: Attributes, callback: PublishCallback): void; + queue_(data: Buffer, attrs: Attributes, callback?: PublishCallback): + void|Promise { this.inventory_.queued.push({ data, attributes: attrs, }); this.inventory_.bytes += data.length; - this.inventory_.callbacks.push(callback); + this.inventory_.callbacks.push(callback!); } } diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 58150c9cab9..b5940397cd4 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -15,9 +15,12 @@ */ import {promisifyAll} from '@google-cloud/promisify'; -import * as is from 'is'; +import {CallOptions} from 'google-gax'; -import {PubSub} from '.'; +import {google} from '../proto/pubsub'; + +import {CreateSnapshotCallback, CreateSnapshotResponse, RequestCallback, SeekCallback, Subscription} from '.'; +import {PubSub} from './index'; import * as util from './util'; /** @@ -85,85 +88,17 @@ import * as util from './util'; * }); */ export class Snapshot { - parent; + parent: Subscription|PubSub; name: string; // tslint:disable-next-line variable-name Promise?: PromiseConstructor; - create; - seek; - metadata; - constructor(parent, name: string) { - if (parent.Promise) { + metadata!: google.pubsub.v1.ISnapshot; + constructor(parent: Subscription|PubSub, name: string) { + if (parent instanceof PubSub) { this.Promise = parent.Promise; } this.parent = parent; this.name = Snapshot.formatName_(parent.projectId, name); - if (is.fn(parent.createSnapshot)) { - /** - * Create a snapshot with the given name. - * - * **This is only available if you accessed this object through - * {@link Subscription#snapshot}.** - * - * @method Snapshot#create - * @param {string} name Name of the snapshot. - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error from the API call, may be null. - * @param {Snapshot} callback.snapshot The newly created - * snapshot. - * @param {object} callback.apiResponse The full API response from the - * service. - * - * @example - * const subscription = pubsub.subscription('my-subscription'); - * const snapshot = subscription.snapshot('my-snapshot'); - * - * const callback = (err, snapshot, apiResponse) => { - * if (!err) { - * // The snapshot was created successfully. - * } - * }; - * - * snapshot.create('my-snapshot', callback); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * snapshot.create('my-snapshot').then((data) => { - * const snapshot = data[0]; - * const apiResponse = data[1]; - * }); - */ - this.create = parent.createSnapshot.bind(parent, name); - } - if (is.fn(parent.seek)) { - /** - * Seeks an existing subscription to the snapshot. - * - * **This is only available if you accessed this object through - * {@link Subscription#snapshot}.** - * - * @method Snapshot#seek - * @param {function} callback The callback function. - * @param {?error} callback.err An error from the API call, may be null. - * @param {object} callback.apiResponse The full API response from the - * service. - * - * @example - * const subscription = pubsub.subscription('my-subscription'); - * const snapshot = subscription.snapshot('my-snapshot'); - * - * snapshot.seek((err, apiResponse) => {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * snapshot.seek().then((data) => { - * const apiResponse = data[0]; - * }); - */ - this.seek = parent.seek.bind(parent, name); - } } /** @@ -185,12 +120,15 @@ export class Snapshot { * const apiResponse = data[0]; * }); */ - delete(callback) { + delete(): Promise; + delete(callback: RequestCallback): void; + delete(callback?: RequestCallback): + void|Promise { const reqOpts = { snapshot: this.name, }; callback = callback || util.noop; - this.parent.request( + this.parent.request( { client: 'SubscriberClient', method: 'deleteSnapshot', @@ -207,8 +145,97 @@ export class Snapshot { static formatName_(projectId: string, name: string) { return 'projects/' + projectId + '/snapshots/' + name.split('/').pop(); } + + /** + * Create a snapshot with the given name. + * + * **This is only available if you accessed this object through + * {@link Subscription#snapshot}.** + * + * @method Snapshot#create + * @param {string} name Name of the snapshot. + * @param {function} [callback] The callback function. + * @param {?error} callback.err An error from the API call, may be null. + * @param {Snapshot} callback.snapshot The newly created + * snapshot. + * @param {object} callback.apiResponse The full API response from the + * service. + * + * @example + * const subscription = pubsub.subscription('my-subscription'); + * const snapshot = subscription.snapshot('my-snapshot'); + * + * const callback = (err, snapshot, apiResponse) => { + * if (!err) { + * // The snapshot was created successfully. + * } + * }; + * + * snapshot.create('my-snapshot', callback); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.create('my-snapshot').then((data) => { + * const snapshot = data[0]; + * const apiResponse = data[1]; + * }); + */ + create(gaxOpts?: CallOptions): Promise; + create(callback: CreateSnapshotCallback): void; + create(gaxOpts: CallOptions, callback: CreateSnapshotCallback): void; + create( + gaxOpts?: CallOptions|CreateSnapshotCallback, + callback?: CreateSnapshotCallback): void|Promise { + if (!(this.parent instanceof Subscription)) { + throw new Error( + `This is only available if you accessed this object through Subscription#snapshot`); + } + return (this.parent as Subscription) + .createSnapshot(this.name, gaxOpts! as CallOptions, callback!); + } + + /** + * Seeks an existing subscription to the snapshot. + * + * **This is only available if you accessed this object through + * {@link Subscription#snapshot}.** + * + * @method Snapshot#seek + * @param {function} callback The callback function. + * @param {?error} callback.err An error from the API call, may be null. + * @param {object} callback.apiResponse The full API response from the + * service. + * + * @example + * const subscription = pubsub.subscription('my-subscription'); + * const snapshot = subscription.snapshot('my-snapshot'); + * + * snapshot.seek((err, apiResponse) => {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * snapshot.seek().then((data) => { + * const apiResponse = data[0]; + * }); + */ + seek(gaxOpts?: CallOptions): Promise; + seek(callback: SeekCallback): void; + seek(gaxOpts: CallOptions, callback: SeekCallback): void; + seek(gaxOpts?: CallOptions|SeekCallback, callback?: SeekCallback): + void|Promise { + if (!(this.parent instanceof Subscription)) { + throw new Error( + `This is only available if you accessed this object through Subscription#snapshot`); + } + return (this.parent as Subscription) + .seek(this.name, gaxOpts! as CallOptions, callback!); + } } + + /*! Developer Documentation * * All async methods (except for streams) will return a Promise in the event diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 75333c42bf2..43317028d2b 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -23,7 +23,7 @@ import * as snakeCase from 'lodash.snakecase'; import {google} from '../proto/pubsub'; -import {CreateSnapshotCallback, CreateSnapshotResponse, CreateSubscriptionCallback, CreateSubscriptionResponse, ExistsCallback, GetCallOptions, GetSubscriptionMetadataCallback, Metadata, PubSub, PushConfig, RequestCallback, SubscriptionCallOptions} from '.'; +import {CreateSnapshotCallback, CreateSnapshotResponse, CreateSubscriptionCallback, CreateSubscriptionResponse, ExistsCallback, GetCallOptions, GetSubscriptionMetadataCallback, Metadata, PubSub, RequestCallback, SeekCallback, SubscriptionCallOptions} from '.'; import {IAM} from './iam'; import {Snapshot} from './snapshot'; import {Subscriber, SubscriberOptions} from './subscriber'; @@ -203,17 +203,16 @@ export class Subscription extends EventEmitter { name: string; metadata: Metadata; - request: Function; + request: typeof PubSub.prototype.request; private _subscriber: Subscriber; constructor(pubsub: PubSub, name: string, options?: SubscriptionCallOptions) { super(); - - options = options || {}; this.pubsub = pubsub; - this.request = pubsub.request.bind(pubsub); + // tslint:disable-next-line no-any + this.request = pubsub.request.bind(pubsub) as any; this.name = Subscription.formatName_(this.projectId, name); if (options.topic) { @@ -298,6 +297,7 @@ export class Subscription extends EventEmitter { * // If the callback is omitted a Promise will be returned. * subscription.close().then(() => {}); */ + close(): Promise; close(callback: RequestCallback): void; close(callback?: RequestCallback): void|Promise { @@ -368,20 +368,20 @@ export class Subscription extends EventEmitter { name: snapshot.name, subscription: this.name, }; - this.request( + this.request( { client: 'SubscriberClient', method: 'createSnapshot', reqOpts, gaxOpts, }, - (err: Error, resp: google.pubsub.v1.Snapshot) => { + (err, resp) => { if (err) { - callback!(err, null, resp); + callback!(err, null, resp!); return; } - snapshot.metadata = resp; - callback!(null, snapshot, resp); + snapshot.metadata = resp!; + callback!(null, snapshot, resp!); }); } /** @@ -429,6 +429,7 @@ export class Subscription extends EventEmitter { callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + callback = callback || noop; const reqOpts = { subscription: this.name, @@ -597,14 +598,14 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - getMetadata(gaxOpts?: CallOptions): Promise; + getMetadata(gaxOpts?: CallOptions): Promise; getMetadata(callback: GetSubscriptionMetadataCallback): void; getMetadata(gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback): void; getMetadata( gaxOptsOrCallback?: CallOptions|GetSubscriptionMetadataCallback, callback?: GetSubscriptionMetadataCallback): - void|Promise { + void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -612,18 +613,18 @@ export class Subscription extends EventEmitter { const reqOpts = { subscription: this.name, }; - this.request( + this.request( { client: 'SubscriberClient', method: 'getSubscription', reqOpts, gaxOpts, }, - (err: Error, apiResponse: google.pubsub.v1.Subscription) => { + (err, apiResponse) => { if (!err) { this.metadata = apiResponse; } - callback!(err, apiResponse); + callback!(err!, apiResponse); }); } /** @@ -702,7 +703,7 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - callback); + callback!); } /** * Opens the Subscription to receive messages. In general this method @@ -769,15 +770,12 @@ export class Subscription extends EventEmitter { */ seek(snapshot: string|Date, gaxOpts?: CallOptions): Promise; - seek(snapshot: string|Date, callback: google.pubsub.v1.ISeekResponse): void; - seek( - snapshot: string|Date, gaxOpts: CallOptions, - callback: google.pubsub.v1.ISeekResponse): void; + seek(snapshot: string|Date, callback: SeekCallback): void; + seek(snapshot: string|Date, gaxOpts: CallOptions, callback: SeekCallback): + void; seek( - snapshot: string|Date, - gaxOptsOrCallback: CallOptions|google.pubsub.v1.ISeekResponse, - callback?: google.pubsub.v1.ISeekResponse): - void|Promise { + snapshot: string|Date, gaxOptsOrCallback?: CallOptions|SeekCallback, + callback?: SeekCallback): void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -796,6 +794,7 @@ export class Subscription extends EventEmitter { reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); + } else if (is.date(snapshot)) { reqOpts.time = snapshot as Date; } else { @@ -808,7 +807,7 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - callback); + callback!); } /** * @typedef {array} SetSubscriptionMetadataResponse @@ -847,19 +846,19 @@ export class Subscription extends EventEmitter { * }); */ setMetadata(metadata: Metadata, gaxOpts?: CallOptions): - Promise; + Promise; setMetadata( metadata: Metadata, - callback: RequestCallback): void; + callback: RequestCallback): void; setMetadata( metadata: Metadata, gaxOpts: CallOptions, - callback: RequestCallback): void; + callback: RequestCallback): void; setMetadata( metadata: Metadata, gaxOptsOrCallback?: CallOptions| - RequestCallback, - callback?: RequestCallback): - void|Promise { + RequestCallback, + callback?: RequestCallback): + void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -881,7 +880,7 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - callback); + callback!); } /** * Sets the Subscription options. @@ -903,7 +902,7 @@ export class Subscription extends EventEmitter { * @example * const snapshot = subscription.snapshot('my-snapshot'); */ - snapshot(name: string) { + snapshot(name: string): Snapshot { return this.pubsub.snapshot.call(this, name); } /** diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 4f9575999c8..7eda9d188b4 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -22,7 +22,7 @@ import {Readable} from 'stream'; import {google} from '../proto/pubsub'; -import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, CreateTopicCallback, CreateTopicResponse, ExistsCallback, GetCallOptions, Metadata, PublisherCallOptions, PubSub, RequestCallback, SubscriptionCallOptions} from '.'; +import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, CreateTopicCallback, CreateTopicResponse, ExistsCallback, GetCallOptions, Metadata, PubSub, RequestCallback, SubscriptionCallOptions} from '.'; import {IAM} from './iam'; import {PublishCallback, Publisher, PublishOptions} from './publisher'; import {Subscription} from './subscription'; @@ -361,9 +361,9 @@ export class Topic { * }); */ get(callback: CreateTopicCallback): void; - get(gaxOpts?: CallOptions&GetCallOptions): Promise; - get(gaxOpts: CallOptions&GetCallOptions, callback: CreateTopicCallback): void; - get(gaxOptsOrCallback?: CallOptions&GetCallOptions|CreateTopicCallback, + get(gaxOpts?: GetCallOptions): Promise; + get(gaxOpts: GetCallOptions, callback: CreateTopicCallback): void; + get(gaxOptsOrCallback?: GetCallOptions|CreateTopicCallback, callback?: CreateTopicCallback): void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; @@ -423,15 +423,15 @@ export class Topic { * const apiResponse = data[0]; * }); */ - getMetadata(callback: RequestCallback): void; + getMetadata(callback: RequestCallback): void; getMetadata( gaxOpts: CallOptions, - callback: RequestCallback): void; - getMetadata(gaxOpts?: CallOptions): Promise; + callback: RequestCallback): void; + getMetadata(gaxOpts?: CallOptions): Promise; getMetadata( - gaxOptsOrCallback?: CallOptions|RequestCallback, - callback?: RequestCallback): - void|Promise { + gaxOptsOrCallback?: CallOptions|RequestCallback, + callback?: RequestCallback): + void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -439,7 +439,7 @@ export class Topic { const reqOpts = { topic: this.name, }; - this.request( + this.request( { client: 'PublisherClient', method: 'getTopic', diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 619fe783108..edc63a5300b 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -19,12 +19,14 @@ import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; +import {PubSub, Subscription} from '../src'; +import {Snapshot} from '../src/snapshot'; import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { // tslint:disable-next-line variable-name - promisifyAll(Class) { + promisifyAll(Class: Snapshot) { if (Class.name === 'Snapshot') { promisified = true; } @@ -43,9 +45,7 @@ describe('Snapshot', () => { projectId: PROJECT_ID, }; - // tslint:disable-next-line no-any - const SUBSCRIPTION: any = { - Promise: {}, + const SUBSCRIPTION = { projectId: PROJECT_ID, pubsub: PUBSUB, api: {}, @@ -53,6 +53,7 @@ describe('Snapshot', () => { seek() {}, }; + before(() => { Snapshot = proxyquire('../src/snapshot', { '@google-cloud/promisify': fakePromisify, @@ -85,7 +86,9 @@ describe('Snapshot', () => { }); it('should localize parent.Promise', () => { - assert.strictEqual(snapshot.Promise, SUBSCRIPTION.Promise); + const pubsub = new PubSub(); + snapshot = new Snapshot(pubsub, SNAPSHOT_NAME); + assert.strictEqual(snapshot.Promise, pubsub.Promise); }); it('should localize the parent', () => { @@ -117,24 +120,30 @@ describe('Snapshot', () => { }); describe('with Subscription parent', () => { + let pubsub: PubSub; + let subscription: Subscription; + before(() => { + pubsub = new PubSub(PUBSUB); + subscription = pubsub.subscription('test'); + }); it('should include the create method', done => { - SUBSCRIPTION.createSnapshot = (name, callback) => { - assert.strictEqual(name, SNAPSHOT_NAME); - callback(); // The done function - }; - - const snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); - snapshot.create(done); + sandbox.stub(subscription, 'createSnapshot') + .callsFake((name: string) => { + assert.strictEqual(name, FULL_SNAPSHOT_NAME); + done(); + }); + + const snapshot = new Snapshot(subscription, SNAPSHOT_NAME); + snapshot.create(assert.ifError); }); - it('should create a seek method', done => { - SUBSCRIPTION.seek = (name, callback) => { - assert.strictEqual(name, SNAPSHOT_NAME); - callback(); // The done function - }; - - const snapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); - snapshot.seek(done); + it('should call the seek method', done => { + sandbox.stub(subscription, 'seek').callsFake((snapshot) => { + assert.strictEqual(snapshot, FULL_SNAPSHOT_NAME); + done(); + }); + const snapshot = new Snapshot(subscription, SNAPSHOT_NAME); + snapshot.seek(assert.ifError); }); }); @@ -145,12 +154,16 @@ describe('Snapshot', () => { snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); }); - it('should not include the create method', () => { - assert.strictEqual(snapshot.create, undefined); + it('should throw on create method', () => { + assert.throws( + () => snapshot.create(), + /This is only available if you accessed this object through Subscription#snapshot/); }); - it('should not include a seek method', () => { - assert.strictEqual(snapshot.seek, undefined); + it('should throw on seek method', () => { + assert.throws( + () => snapshot.seek(), + /This is only available if you accessed this object through Subscription#snapshot/); }); }); }); From e1fc7e168697fbc5edf715540cffc764f65bd768 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Fri, 8 Feb 2019 16:41:36 -0800 Subject: [PATCH 0344/1115] build: test using @grpc/grpc-js in CI (#472) * build: test using @grpc/grpc-js in CI * simplify configs --- .../.kokoro/continuous/node8/system-test-grpcjs.cfg | 12 ++++++++++++ .../.kokoro/presubmit/node8/system-test-grpcjs.cfg | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 handwritten/pubsub/.kokoro/continuous/node8/system-test-grpcjs.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/system-test-grpcjs.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node8/system-test-grpcjs.cfg b/handwritten/pubsub/.kokoro/continuous/node8/system-test-grpcjs.cfg new file mode 100644 index 00000000000..1f9eaee5ec5 --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node8/system-test-grpcjs.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/system-test.sh" +} + +env_vars: { + key: "GOOGLE_CLOUD_USE_GRPC_JS" + value: "1" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/system-test-grpcjs.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/system-test-grpcjs.cfg new file mode 100644 index 00000000000..1f9eaee5ec5 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node8/system-test-grpcjs.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/system-test.sh" +} + +env_vars: { + key: "GOOGLE_CLOUD_USE_GRPC_JS" + value: "1" +} From 7970bdadc83faf8faf5e70712087e42e000fe4cf Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Sun, 10 Feb 2019 20:54:13 -0800 Subject: [PATCH 0345/1115] build: create docs test npm scripts (#474) --- handwritten/pubsub/.kokoro/docs.sh | 10 +--------- handwritten/pubsub/package.json | 7 +++++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/.kokoro/docs.sh b/handwritten/pubsub/.kokoro/docs.sh index ea6e514f45d..a4f318794e6 100755 --- a/handwritten/pubsub/.kokoro/docs.sh +++ b/handwritten/pubsub/.kokoro/docs.sh @@ -22,12 +22,4 @@ cd $(dirname $0)/.. npm install -npm run docs - -# Check broken links -BIN=./node_modules/.bin - -npm install broken-link-checker -npm install http-server -$BIN/http-server -p 8080 docs/ & -$BIN/blc http://localhost:8080 -r --exclude www.googleapis.com +npm run docs-test diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 640025afd6d..3f9ec9ab1bd 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -45,7 +45,9 @@ "prepare": "npm run compile", "pretest": "npm run compile", "proto": "npm run proto:pubsub", - "proto:pubsub": "mkdir -p proto && pbjs -t static-module -w commonjs -p node_modules/google-proto-files google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -" + "proto:pubsub": "mkdir -p proto && pbjs -t static-module -w commonjs -p node_modules/google-proto-files google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", + "docs-test": "blcl docs -r --exclude www.googleapis.com", + "predocs-test": "npm run docs" }, "dependencies": { "@google-cloud/paginator": "^0.1.0", @@ -96,6 +98,7 @@ "sinon": "^7.1.1", "source-map-support": "^0.5.9", "typescript": "~3.3.0", - "uuid": "^3.1.0" + "uuid": "^3.1.0", + "broken-link-checker-local": "^0.2.0" } } From eeaa2a8cc3787745bfda4aef52316c4406ccb435 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 14 Feb 2019 08:23:36 -0800 Subject: [PATCH 0346/1115] fix(deps): update dependency @google-cloud/promisify to ^0.4.0 (#478) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3f9ec9ab1bd..6851f4a0665 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "dependencies": { "@google-cloud/paginator": "^0.1.0", "@google-cloud/projectify": "^0.3.0", - "@google-cloud/promisify": "^0.3.0", + "@google-cloud/promisify": "^0.4.0", "arrify": "^1.0.0", "async-each": "^1.0.1", "delay": "^4.0.0", From 8a9bd10ee04b022ea74e9eb54ec74b458bcb2313 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 14 Feb 2019 08:50:23 -0800 Subject: [PATCH 0347/1115] docs: update links in contrib guide (#479) --- handwritten/pubsub/CONTRIBUTING.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/CONTRIBUTING.md b/handwritten/pubsub/CONTRIBUTING.md index b958f235007..78aaa61b269 100644 --- a/handwritten/pubsub/CONTRIBUTING.md +++ b/handwritten/pubsub/CONTRIBUTING.md @@ -16,11 +16,9 @@ Please fill out either the individual or corporate Contributor License Agreement (CLA). * If you are an individual writing original source code and you're sure you - own the intellectual property, then you'll need to sign an [individual CLA] - (https://developers.google.com/open-source/cla/individual). + own the intellectual property, then you'll need to sign an [individual CLA](https://developers.google.com/open-source/cla/individual). * If you work for a company that wants to allow you to contribute your work, - then you'll need to sign a [corporate CLA] - (https://developers.google.com/open-source/cla/corporate). + then you'll need to sign a [corporate CLA](https://developers.google.com/open-source/cla/corporate). Follow either of the two links above to access the appropriate CLA and instructions for how to sign and return it. Once we receive it, we'll be able to From 6ac238128f0edfee5bf875ccd75e25f303d896f4 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 14 Feb 2019 13:17:40 -0800 Subject: [PATCH 0348/1115] build: use linkinator for docs test (#477) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6851f4a0665..311d8c1cc79 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -46,7 +46,7 @@ "pretest": "npm run compile", "proto": "npm run proto:pubsub", "proto:pubsub": "mkdir -p proto && pbjs -t static-module -w commonjs -p node_modules/google-proto-files google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", - "docs-test": "blcl docs -r --exclude www.googleapis.com", + "docs-test": "linkinator docs -r --skip www.googleapis.com", "predocs-test": "npm run docs" }, "dependencies": { @@ -99,6 +99,6 @@ "source-map-support": "^0.5.9", "typescript": "~3.3.0", "uuid": "^3.1.0", - "broken-link-checker-local": "^0.2.0" + "linkinator": "^1.1.2" } } From 200627ed23a3101a1505d736d792872224625bf3 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Thu, 14 Feb 2019 14:35:18 -0800 Subject: [PATCH 0349/1115] fix: throw on invalid credentials and update retry config (#476) --- handwritten/pubsub/src/v1/publisher_client.js | 8 +++++ .../src/v1/publisher_client_config.json | 18 ++++++----- .../pubsub/src/v1/subscriber_client.js | 8 +++++ .../src/v1/subscriber_client_config.json | 30 +++++++++---------- handwritten/pubsub/synth.metadata | 10 +++---- 5 files changed, 46 insertions(+), 28 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 0743a4cd92e..342ec508bb2 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -196,6 +196,10 @@ class PublisherClient { function() { const args = Array.prototype.slice.call(arguments, 0); return stub[methodName].apply(stub, args); + }, + err => + function() { + throw err; } ), defaults[methodName], @@ -229,6 +233,10 @@ class PublisherClient { function() { const args = Array.prototype.slice.call(arguments, 0); return stub[methodName].apply(stub, args); + }, + err => + function() { + throw err; } ), defaults[methodName], diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index a1e423d073a..07b6522cd26 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -3,11 +3,15 @@ "google.pubsub.v1.Publisher": { "retry_codes": { "idempotent": [ - "DEADLINE_EXCEEDED", + "ABORTED", + "UNAVAILABLE", + "UNKNOWN" + ], + "non_idempotent": [ "UNAVAILABLE" ], - "non_idempotent": [], - "one_plus_delivery": [ + "none": [], + "publish": [ "ABORTED", "CANCELLED", "DEADLINE_EXCEEDED", @@ -40,17 +44,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, @@ -77,7 +81,7 @@ }, "DeleteTopic": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "SetIamPolicy": { diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 0520bcad0bb..597a9c0f916 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -174,6 +174,10 @@ class SubscriberClient { function() { const args = Array.prototype.slice.call(arguments, 0); return stub[methodName].apply(stub, args); + }, + err => + function() { + throw err; } ), defaults[methodName], @@ -215,6 +219,10 @@ class SubscriberClient { function() { const args = Array.prototype.slice.call(arguments, 0); return stub[methodName].apply(stub, args); + }, + err => + function() { + throw err; } ), defaults[methodName], diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 83a4be3af8d..74153622d34 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -3,16 +3,14 @@ "google.pubsub.v1.Subscriber": { "retry_codes": { "idempotent": [ - "DEADLINE_EXCEEDED", - "UNAVAILABLE" + "ABORTED", + "UNAVAILABLE", + "UNKNOWN" ], - "pull": [ - "DEADLINE_EXCEEDED", - "INTERNAL", - "RESOURCE_EXHAUSTED", + "non_idempotent": [ "UNAVAILABLE" ], - "non_idempotent": [] + "none": [] }, "retry_params": { "default": { @@ -56,7 +54,7 @@ }, "UpdateSubscription": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "ListSubscriptions": { @@ -66,7 +64,7 @@ }, "DeleteSubscription": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "ModifyAckDeadline": { @@ -76,17 +74,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": { @@ -101,22 +99,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/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index cb3539f9f6f..8b31fe65190 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-02-05T12:16:03.207914Z", + "updateTime": "2019-02-13T12:21:35.607578Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.9", - "dockerImage": "googleapis/artman@sha256:80c39fa84e7203c8f355e01bdeef82155013cc39dcaa48fba7a6fe2c253623e3" + "version": "0.16.13", + "dockerImage": "googleapis/artman@sha256:5fd9aee1d82a00cebf425c8fa431f5457539562f5867ad9c54370f0ec9a7ccaa" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "f26c727dde5051abefc5ad9e7dee82a2686ad2b0", - "internalRef": "232306662" + "sha": "ca61898878f0926dd9dcc68ba90764f17133efe4", + "internalRef": "233680013" } }, { From 2c01f8acb48fddf557e1d85b6e60be7dca23252c Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Sun, 17 Feb 2019 19:29:47 -0800 Subject: [PATCH 0350/1115] fix: ignore messages that come in after close (#485) --- handwritten/pubsub/src/lease-manager.ts | 4 ++- handwritten/pubsub/src/subscriber.ts | 14 ++++++---- handwritten/pubsub/system-test/pubsub.ts | 34 +++++++++--------------- handwritten/pubsub/test/lease-manager.ts | 18 ++++++++++++- handwritten/pubsub/test/subscriber.ts | 12 +++++++++ 5 files changed, 53 insertions(+), 29 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index d612eeb9a8a..564f632fa1d 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -216,7 +216,9 @@ export class LeaseManager extends EventEmitter { * @param {Message} message The message to emit. */ private _dispense(message: Message): void { - process.nextTick(() => this._subscriber.emit('message', message)); + if (this._subscriber.isOpen) { + process.nextTick(() => this._subscriber.emit('message', message)); + } } /** * Loops through inventory and extends the deadlines for any messages that diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index dea67dae6c1..d32191eaf62 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -365,13 +365,17 @@ export class Subscriber extends EventEmitter { * * @private */ - private _onData(response: PullResponse): void { - response.receivedMessages.forEach((data: ReceivedMessage) => { + private _onData({receivedMessages}: PullResponse): void { + for (const data of receivedMessages) { const message = new Message(this, data); - message.modAck(this.ackDeadline); - this._inventory.add(message); - }); + if (this.isOpen) { + message.modAck(this.ackDeadline); + this._inventory.add(message); + } else { + message.nack(); + } + } } /** diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 583127efd2c..1ebeaa42495 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -415,11 +415,8 @@ describe('pubsub', () => { subscription.on('message', ack); function ack(message) { - // remove listener to we only ack first message - subscription.removeListener('message', ack); - message.ack(); - setTimeout(() => subscription.close(done), 2500); + subscription.close(done); } }); @@ -430,11 +427,8 @@ describe('pubsub', () => { subscription.on('message', nack); function nack(message) { - // remove listener to we only ack first message - subscription.removeListener('message', nack); - message.nack(); - setTimeout(() => subscription.close(done), 2500); + subscription.close(done); } }); @@ -588,13 +582,8 @@ describe('pubsub', () => { let subscription; let snapshot; - function deleteAllSnapshots() { - // tslint:disable-next-line no-any - return (pubsub.getSnapshots() as any).then(data => { - return Promise.all(data[0].map(snapshot => { - return snapshot.delete(); - })); - }); + function getSnapshotName({name}) { + return name.split('/').pop(); } before(async () => { @@ -602,22 +591,23 @@ describe('pubsub', () => { subscription = topic.subscription(generateSubName()); snapshot = subscription.snapshot(SNAPSHOT_NAME); - await deleteAllSnapshots(); await topic.create(); await subscription.create(); await snapshot.create(); }); after(async () => { - await deleteAllSnapshots(); + await snapshot.delete(); + await subscription.delete(); await topic.delete(); }); it('should get a list of snapshots', done => { pubsub.getSnapshots((err, snapshots) => { assert.ifError(err); - assert.strictEqual(snapshots.length, 1); - assert.strictEqual(snapshots[0].name.split('/').pop(), SNAPSHOT_NAME); + assert(snapshots.length > 0); + const names = snapshots.map(getSnapshotName); + assert(names.includes(SNAPSHOT_NAME)); done(); }); }); @@ -633,9 +623,9 @@ describe('pubsub', () => { snapshots.push(snapshot); }) .on('end', () => { - assert.strictEqual(snapshots.length, 1); - assert.strictEqual( - snapshots[0].name.split('/').pop(), SNAPSHOT_NAME); + assert(snapshots.length > 0); + const names = snapshots.map(getSnapshotName); + assert(names.includes(SNAPSHOT_NAME)); done(); }); }); diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 5baec4d4078..02d018931d1 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -26,6 +26,7 @@ const fakeos = { class FakeSubscriber extends EventEmitter { ackDeadline = 10; + isOpen = true; modAckLatency = 2000; async modAck(message: FakeMessage, deadline: number): Promise {} } @@ -140,7 +141,7 @@ describe('LeaseManager', () => { }); it('should not dispatch the message if the inventory is full', done => { - const message = new FakeMessage(); + const fakeMessage = new FakeMessage(); leaseManager.isFull = () => true; leaseManager.setOptions({allowExcessMessages: false}); @@ -149,6 +150,21 @@ describe('LeaseManager', () => { done(new Error('Test should not have dispatched message.')); }); + leaseManager.add(fakeMessage); + setImmediate(done); + }); + + it('should not dispatch the message if the sub closes', done => { + const fakeMessage = new FakeMessage(); + + leaseManager.isFull = () => false; + + subscriber.isOpen = false; + subscriber.on('message', () => { + done(new Error('Test should not have dispatched message.')); + }); + + leaseManager.add(fakeMessage); setImmediate(done); }); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index d0286f31357..d9db40a215a 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -320,6 +320,18 @@ describe('Subscriber', () => { subscriber.close(); }); + it('should nack any messages that come in after', () => { + const stream: FakeMessageStream = stubs.get('messageStream'); + const stub = sandbox.stub(subscriber, 'nack'); + const pullResponse = {receivedMessages: [RECEIVED_MESSAGE]}; + + subscriber.close(); + stream.emit('data', pullResponse); + + const [{ackId}] = stub.lastCall.args; + assert.strictEqual(ackId, RECEIVED_MESSAGE.ackId); + }); + describe('flushing the queues', () => { it('should wait for any pending acks', async () => { const ackQueue: FakeAckQueue = stubs.get('ackQueue'); From 07e3747e1ea212be0c79ee626d6e2f8846e59d30 Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Mon, 18 Feb 2019 11:41:37 +0530 Subject: [PATCH 0351/1115] refactor(ts): improve TypeScript types (#482) --- handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/index.ts | 147 +++++++++++++++++------ handwritten/pubsub/src/message-queues.ts | 20 +-- handwritten/pubsub/src/message-stream.ts | 3 +- handwritten/pubsub/src/topic.ts | 43 ++++--- handwritten/pubsub/system-test/pubsub.ts | 8 +- 6 files changed, 154 insertions(+), 68 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 311d8c1cc79..2c47a1a82f3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -9,6 +9,7 @@ }, "repository": "googleapis/nodejs-pubsub", "main": "./build/src/index.js", + "types": "./build/src/index.d.ts", "files": [ "build/protos", "build/src", diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index e9aebf2d572..20d79d14d55 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -38,13 +38,59 @@ import {Topic, PublishOptions} from './topic'; import {CallOptions} from 'google-gax'; import {Readable} from 'stream'; import {google} from '../proto/pubsub'; -import {ServiceError} from 'grpc'; +import {ServiceError, ChannelCredentials} from 'grpc'; import {FlowControlOptions} from './lease-manager'; import {BatchPublishOptions} from './publisher'; const opts = {} as gax.GrpcClientOptions; const {grpc} = new gax.GrpcClient(opts); +export interface GetTopicMetadataCallback { + (err?: ServiceError|null, res?: google.pubsub.v1.ITopic|null): void; +} + +export interface ClientConfig { + projectId?: string; + keyFilename?: string; + apiEndpoint?: string; + email?: string; + autoRetry?: boolean; + maxRetries?: number; + promise?: PromiseConstructor; + servicePath?: string; + port?: string; + sslCreds?: ChannelCredentials; +} + +// tslint:disable-next-line no-any +type Arguments = [(Error | null)?,(T| null)?,any?]; + +interface Options { + gaxOpts?: CallOptions; + pageSize?: number; + pageToken?: string; + autoPaginate?: boolean; +} + +export interface GetSnapshotsOptions extends Options {} +export interface GetSnapshotsCallback { + (err?: Error|null, snapshots?: Snapshot[]|null, apiResponse?: object): void; +} + +export interface GetSubscriptionsOptions extends Options { + topic?: Topic; + project?: string; +} +export interface GetSubscriptionsCallback { + (err?: Error|null, subscriptions?: Subscription[]|null, + apiResponse?: object): void; +} + +export interface GetTopicsOptions extends Options {} +export interface GetTopicsCallback { + (err?: Error|null, topics?: Topic[]|null, apiResponse?: object): void; +} + export type SeekCallback = RequestCallback; export interface GetSubscriptionMetadataCallback { @@ -77,7 +123,7 @@ export interface SubscriptionCallOptions { /** - * @callback CreateTopicCallback + * @callback CreateSnapshotCallback * @param {?Error} err Request error, if any. * @param {Snapshot} snapshot * @param {object} apiResponse The full API response. @@ -243,7 +289,7 @@ interface GetClientCallback { * Full quickstart example: */ export class PubSub { - options; + options: ClientConfig; isEmulator: boolean; api: {[key: string]: gax.ClientStub}; auth: GoogleAuth; @@ -255,12 +301,12 @@ export class PubSub { getSnapshotsStream = paginator.streamify('getSnapshots') as() => Readable; getTopicsStream = paginator.streamify('getTopics') as() => Readable; - constructor(options?) { + constructor(options?: ClientConfig) { options = options || {}; // Determine what scopes are needed. // It is the union of the scopes on both clients. const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; - const allScopes = {}; + const allScopes: {[key: string]: boolean} = {}; for (const clientClass of clientClasses) { for (const scope of clientClass.scopes) { allScopes[scope] = true; @@ -498,7 +544,7 @@ export class PubSub { const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; const leadingProtocol = new RegExp('^https*://'); const trailingSlashes = new RegExp('/*$'); - const baseUrlParts = baseUrl.replace(leadingProtocol, '') + const baseUrlParts = baseUrl!.replace(leadingProtocol, '') .replace(trailingSlashes, '') .split(':'); this.options.servicePath = baseUrlParts[0]; @@ -552,12 +598,20 @@ export class PubSub { * const snapshots = data[0]; * }); */ - getSnapshots(options?, callback?) { + getSnapshots(option?: GetSnapshotsOptions): + Promise; + getSnapshots(callback: GetSnapshotsCallback): void; + getSnapshots(option: GetSnapshotsOptions, callback: GetSnapshotsCallback): + void; + getSnapshots( + optionsOrCallback?: GetSnapshotsOptions|GetSnapshotsCallback, + callback?: GetSnapshotsCallback): + void|Promise { const self = this; - if (is.fn(options)) { - callback = options; - options = {}; - } + const options = + typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; const reqOpts = Object.assign( { project: 'projects/' + this.projectId, @@ -577,17 +631,16 @@ export class PubSub { reqOpts, gaxOpts, }, - // tslint:disable-next-line only-arrow-functions - function() { - const snapshots = arguments[1]; + (...args: Arguments) => { + const snapshots = args[1]; if (snapshots) { - arguments[1] = snapshots.map(snapshot => { - const snapshotInstance = self.snapshot(snapshot.name); + args[1] = snapshots.map((snapshot: Snapshot) => { + const snapshotInstance = self.snapshot(snapshot.name!); snapshotInstance.metadata = snapshot; return snapshotInstance; }); } - callback.apply(null, arguments); + callback!(...args); }); } /** @@ -647,18 +700,28 @@ export class PubSub { * const subscriptions = data[0]; * }); */ - getSubscriptions(options, callback?) { + getSubscriptions(options?: GetSubscriptionsOptions): + Promise; + getSubscriptions(callback: GetSubscriptionsCallback): void; + getSubscriptions( + options: GetSubscriptionsOptions, + callback: GetSubscriptionsCallback): void; + getSubscriptions( + optionsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback, + callback?: GetSubscriptionsCallback): + void|Promise { const self = this; - if (is.fn(options)) { - callback = options; - options = {}; - } + const options = + typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + let topic = options.topic; if (topic) { if (!(topic instanceof Topic)) { topic = this.topic(topic); } - return topic.getSubscriptions(options, callback); + return topic.getSubscriptions(options, callback!); } const reqOpts = Object.assign({}, options); reqOpts.project = 'projects/' + this.projectId; @@ -676,17 +739,16 @@ export class PubSub { reqOpts, gaxOpts, }, - // tslint:disable-next-line only-arrow-functions - function() { - const subscriptions = arguments[1]; + (...args: Arguments) => { + const subscriptions = args[1]; if (subscriptions) { - arguments[1] = subscriptions.map(sub => { + args[1] = subscriptions.map((sub: Subscription) => { const subscriptionInstance = self.subscription(sub.name); subscriptionInstance.metadata = sub; return subscriptionInstance; }); } - callback.apply(null, arguments); + callback!(...args); }); } /** @@ -745,12 +807,20 @@ export class PubSub { * const topics = data[0]; * }); */ - getTopics(options, callback?) { + getTopics(options: GetTopicsOptions): + Promise; + getTopics(callback: GetTopicsCallback): void; + getTopics(options: GetTopicsOptions, callback: GetTopicsCallback): void; + getTopics( + optionsOrCallback?: GetTopicsOptions|GetTopicsCallback, + callback?: GetTopicsCallback): + void|Promise { const self = this; - if (is.fn(options)) { - callback = options; - options = {}; - } + const options = + typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + const reqOpts = Object.assign( { project: 'projects/' + this.projectId, @@ -770,17 +840,16 @@ export class PubSub { reqOpts, gaxOpts, }, - // tslint:disable-next-line only-arrow-functions - function() { - const topics = arguments[1]; + (...args: Arguments) => { + const topics = args[1]; if (topics) { - arguments[1] = topics.map(topic => { + args[1] = topics.map((topic: Topic) => { const topicInstance = self.topic(topic.name); topicInstance.metadata = topic; return topicInstance; }); } - callback.apply(null, arguments); + callback!(...args); }); } /** @@ -892,7 +961,7 @@ export class PubSub { * // message.publishTime = Date when Pub/Sub received the message. * }); */ - subscription(name: string, options?) { + subscription(name: string, options?: SubscriptionCallOptions) { if (!name) { throw new Error('A name must be specified for a subscription.'); } diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index da0f9a0d638..9801213f96a 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -158,7 +158,7 @@ export abstract class MessageQueue { * @param {BatchOptions} options Batching options. * @private */ - setOptions(options): void { + setOptions(options: BatchOptions): void { const defaults: BatchOptions = {maxMessages: 3000, maxMilliseconds: 100}; this._options = Object.assign(defaults, options); @@ -212,14 +212,16 @@ export class ModAckQueue extends MessageQueue { protected async _sendBatch(batch: QueuedMessages): Promise { const client = await this._subscriber.getClient(); const subscription = this._subscriber.name; - const modAckTable = batch.reduce((table, [ackId, deadline]) => { - if (!table[deadline!]) { - table[deadline!] = []; - } - - table[deadline!].push(ackId); - return table; - }, {}); + const modAckTable: {[index: string]: string[]} = batch.reduce( + (table: {[index: string]: string[]}, [ackId, deadline]) => { + if (!table[deadline!]) { + table[deadline!] = []; + } + + table[deadline!].push(ackId); + return table; + }, + {}); const modAckRequests = Object.keys(modAckTable).map(async (deadline) => { const ackIds = modAckTable[deadline]; diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 58ec3c54272..f72f58409c5 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -15,6 +15,7 @@ */ import {promisify} from '@google-cloud/promisify'; +import {Gaxios} from 'gaxios'; import {ClientStub} from 'google-gax'; import {ClientDuplexStream, Metadata, ServiceError, status, StatusObject} from 'grpc'; import * as isStreamEnded from 'is-stream-ended'; @@ -224,7 +225,7 @@ export class MessageStream extends PassThrough { * @returns {Promise} */ private async _fillStreamPool(): Promise { - let client; + let client!: ClientStub; try { client = await this._getClient(); diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 7eda9d188b4..a0eedd6e37f 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -22,7 +22,7 @@ import {Readable} from 'stream'; import {google} from '../proto/pubsub'; -import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, CreateTopicCallback, CreateTopicResponse, ExistsCallback, GetCallOptions, Metadata, PubSub, RequestCallback, SubscriptionCallOptions} from '.'; +import {Attributes, CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, CreateTopicCallback, CreateTopicResponse, ExistsCallback, GetCallOptions, GetTopicMetadataCallback, Metadata, PubSub, RequestCallback, SubscriptionCallOptions} from '.'; import {IAM} from './iam'; import {PublishCallback, Publisher, PublishOptions} from './publisher'; import {Subscription} from './subscription'; @@ -423,14 +423,12 @@ export class Topic { * const apiResponse = data[0]; * }); */ - getMetadata(callback: RequestCallback): void; - getMetadata( - gaxOpts: CallOptions, - callback: RequestCallback): void; + getMetadata(callback: GetTopicMetadataCallback): void; + getMetadata(gaxOpts: CallOptions, callback: GetTopicMetadataCallback): void; getMetadata(gaxOpts?: CallOptions): Promise; getMetadata( - gaxOptsOrCallback?: CallOptions|RequestCallback, - callback?: RequestCallback): + gaxOptsOrCallback?: CallOptions|GetTopicMetadataCallback, + callback?: GetTopicMetadataCallback): void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; @@ -580,11 +578,19 @@ export class Topic { * //- * topic.publish(data).then((messageId) => {}); */ - publish(data: Buffer, attributes?: object): Promise; + publish(data: Buffer, attributes?: Attributes): Promise; publish(data: Buffer, callback: PublishCallback): void; - publish(data: Buffer, attributes: object, callback: PublishCallback): void; - publish(data: Buffer, attributes?, callback?): Promise|void { - return this.publisher.publish(data, attributes, callback); + publish(data: Buffer, attributes: Attributes, callback: PublishCallback): + void; + publish( + data: Buffer, attributesOrCallback?: Attributes|PublishCallback, + callback?: PublishCallback): Promise|void { + const attributes = + typeof attributesOrCallback === 'object' ? attributesOrCallback : {}; + callback = typeof attributesOrCallback === 'function' ? + attributesOrCallback : + callback; + return this.publisher.publish(data, attributes, callback!); } /** * Publish the provided JSON. It should be noted that all messages published @@ -634,17 +640,24 @@ export class Topic { * //- * topic.publishJSON(data).then((messageId) => {}); */ - publishJSON(json: object, attributes?: object): Promise; + publishJSON(json: object, attributes?: Attributes): Promise; publishJSON(json: object, callback: PublishCallback): void; - publishJSON(json: object, attributes: object, callback: PublishCallback): + publishJSON(json: object, attributes: Attributes, callback: PublishCallback): void; - publishJSON(json: object, attributes?, callback?): Promise|void { + publishJSON( + json: object, attributesOrCallback?: Attributes|PublishCallback, + callback?: PublishCallback): Promise|void { if (!is.object(json)) { throw new Error('First parameter should be an object.'); } + const attributes = + typeof attributesOrCallback === 'object' ? attributesOrCallback : {}; + callback = typeof attributesOrCallback === 'function' ? + attributesOrCallback : + callback; const data = Buffer.from(JSON.stringify(json)); - return this.publish(data, attributes, callback); + return this.publish(data, attributes, callback!); } /** * Set the publisher options. diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 1ebeaa42495..fcd9e09b01a 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -81,7 +81,7 @@ describe('pubsub', () => { pubsub.getTopics((err, topics) => { assert.ifError(err); - const results = topics.filter(topic => { + const results = topics!.filter(topic => { const name = getTopicName(topic); return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); @@ -123,7 +123,7 @@ describe('pubsub', () => { }, (err, topics) => { assert.ifError(err); - assert.strictEqual(topics.length, TOPIC_NAMES.length - 1); + assert.strictEqual(topics!.length, TOPIC_NAMES.length - 1); done(); }); }); @@ -605,8 +605,8 @@ describe('pubsub', () => { it('should get a list of snapshots', done => { pubsub.getSnapshots((err, snapshots) => { assert.ifError(err); - assert(snapshots.length > 0); - const names = snapshots.map(getSnapshotName); + assert(snapshots!.length > 0); + const names = snapshots!.map(getSnapshotName); assert(names.includes(SNAPSHOT_NAME)); done(); }); From e40edaa6a8446753e7b206acb81d9b822cc467ab Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Tue, 19 Feb 2019 22:44:41 +0530 Subject: [PATCH 0352/1115] refactor(ts): noImplicitAny for subscription test file (#489) --- handwritten/pubsub/test/subscription.ts | 419 ++++++++++++++---------- 1 file changed, 242 insertions(+), 177 deletions(-) diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 0f613f8b001..60f8cf6ff04 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -17,15 +17,20 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import {EventEmitter} from 'events'; +import {ServiceError} from 'grpc'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; -import {SubscriberOptions} from '../src/subscriber'; +import {google} from '../proto/pubsub'; +import {CreateSubscriptionCallback, ExistsCallback, GetCallOptions, GetSubscriptionMetadataCallback, RequestCallback, RequestConfig, SeekCallback, Subscription} from '../src'; +import {Snapshot} from '../src/snapshot'; +import {Message, SubscriberOptions} from '../src/subscriber'; +import {SubscriptionMetadataRaw} from '../src/subscription'; import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { - promisifyAll: (klass, options) => { + promisifyAll: (klass: Function, options: pfy.PromisifyAllOptions) => { if (klass.name !== 'Subscription') { return; } @@ -116,7 +121,7 @@ describe('Subscription', () => { }); it('should localize pubsub request method', done => { - PUBSUB.request = callback => { + PUBSUB.request = (callback: CreateSubscriptionCallback) => { callback(); // the done fn }; @@ -128,7 +133,7 @@ describe('Subscription', () => { const formattedName = 'a/b/c/d'; const formatName = Subscription.formatName_; - Subscription.formatName_ = (projectId, name) => { + Subscription.formatName_ = (projectId: string, name: string) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, SUB_NAME); @@ -144,11 +149,13 @@ describe('Subscription', () => { it('should make a create method if a topic is found', done => { const TOPIC_NAME = 'test-topic'; - PUBSUB.createSubscription = (topic, subName, callback) => { - assert.strictEqual(topic, TOPIC_NAME); - assert.strictEqual(subName, SUB_NAME); - callback(); // the done function - }; + PUBSUB.createSubscription = + (topic: string, subName: string, + callback: CreateSubscriptionCallback) => { + assert.strictEqual(topic, TOPIC_NAME); + assert.strictEqual(subName, SUB_NAME); + callback(); // the done function + }; const subscription = new Subscription(PUBSUB, SUB_NAME, { topic: TOPIC_NAME, @@ -193,7 +200,7 @@ describe('Subscription', () => { it('should emit messages', done => { const message = {}; - subscription.on('message', msg => { + subscription.on('message', (msg: Message) => { assert.strictEqual(msg, message); done(); }); @@ -204,7 +211,7 @@ describe('Subscription', () => { it('should emit errors', done => { const error = new Error('err'); - subscription.on('error', err => { + subscription.on('error', (err: Error) => { assert.strictEqual(err, error); done(); }); @@ -280,7 +287,7 @@ describe('Subscription', () => { sandbox.stub(subscriber, 'close').rejects(fakeErr); - subscription.close(err => { + subscription.close((err: Error) => { assert.strictEqual(err, fakeErr); done(); }); @@ -291,7 +298,7 @@ describe('Subscription', () => { const SNAPSHOT_NAME = 'test-snapshot'; beforeEach(() => { - subscription.snapshot = (name) => { + subscription.snapshot = (name: string) => { return { name, }; @@ -305,7 +312,7 @@ describe('Subscription', () => { }); it('should make the correct request', done => { - subscription.request = config => { + subscription.request = (config: RequestConfig) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSnapshot'); assert.deepStrictEqual(config.reqOpts, { @@ -321,7 +328,7 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = config => { + subscription.request = (config: RequestConfig) => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -333,16 +340,21 @@ describe('Subscription', () => { const error = new Error('err'); const apiResponse = {}; - subscription.request = (config, callback) => { - callback(error, apiResponse); - }; + subscription.request = + (config: RequestConfig, + callback: RequestCallback) => { + callback(error, apiResponse); + }; - subscription.createSnapshot(SNAPSHOT_NAME, (err, snapshot, resp) => { - assert.strictEqual(err, error); - assert.strictEqual(snapshot, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.createSnapshot( + SNAPSHOT_NAME, + (err: Error, snapshot: Snapshot, + resp: google.pubsub.v1.ISnapshot) => { + assert.strictEqual(err, error); + assert.strictEqual(snapshot, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should return a snapshot object with metadata', done => { @@ -353,17 +365,21 @@ describe('Subscription', () => { return fakeSnapshot; }; - subscription.request = (config, callback) => { - callback(null, apiResponse); - }; + subscription.request = + (config: RequestConfig, + callback: RequestCallback) => { + callback(null, apiResponse); + }; - subscription.createSnapshot(SNAPSHOT_NAME, (err, snapshot, resp) => { - assert.ifError(err); - assert.strictEqual(snapshot, fakeSnapshot); - assert.strictEqual(snapshot.metadata, apiResponse); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.createSnapshot( + SNAPSHOT_NAME, + (err: Error, snapshot: Snapshot, resp: google.pubsub.v1.Snapshot) => { + assert.ifError(err); + assert.strictEqual(snapshot, fakeSnapshot); + assert.strictEqual(snapshot.metadata, apiResponse); + assert.strictEqual(resp, apiResponse); + done(); + }); }); }); @@ -374,7 +390,7 @@ describe('Subscription', () => { }); it('should make the correct request', done => { - subscription.request = config => { + subscription.request = (config: RequestConfig) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSubscription'); assert.deepStrictEqual(config.reqOpts, { @@ -389,7 +405,7 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = config => { + subscription.request = (config: RequestConfig) => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -401,9 +417,11 @@ describe('Subscription', () => { const apiResponse = {}; beforeEach(() => { - subscription.request = (config, callback) => { - callback(null, apiResponse); - }; + subscription.request = + (config: RequestConfig, + callback: RequestCallback) => { + callback(null, apiResponse); + }; }); it('should optionally accept a callback', done => { @@ -416,7 +434,7 @@ describe('Subscription', () => { }); it('should return the api response', done => { - subscription.delete((err, resp) => { + subscription.delete((err: Error, resp: google.protobuf.Empty) => { assert.ifError(err); assert.strictEqual(resp, apiResponse); done(); @@ -428,7 +446,7 @@ describe('Subscription', () => { subscription.open(); - subscription.delete(err => { + subscription.delete((err: Error) => { assert.ifError(err); assert.strictEqual(stub.callCount, 1); done(); @@ -440,13 +458,14 @@ describe('Subscription', () => { const error = new Error('err'); beforeEach(() => { - subscription.request = (config, callback) => { - callback(error); - }; + subscription.request = + (config: RequestConfig, callback: ExistsCallback) => { + callback(error); + }; }); it('should return the error to the callback', done => { - subscription.delete(err => { + subscription.delete((err: Error) => { assert.strictEqual(err, error); done(); }); @@ -476,11 +495,12 @@ describe('Subscription', () => { describe('exists', () => { it('should return true if it finds metadata', done => { - subscription.getMetadata = callback => { - callback(null, {}); - }; + subscription.getMetadata = + (callback: GetSubscriptionMetadataCallback) => { + callback(null, {}); + }; - subscription.exists((err, exists) => { + subscription.exists((err: Error, exists: boolean) => { assert.ifError(err); assert(exists); done(); @@ -488,11 +508,13 @@ describe('Subscription', () => { }); it('should return false if a not found error occurs', done => { - subscription.getMetadata = callback => { - callback({code: 5}); - }; + const error = {code: 5} as ServiceError; + subscription.getMetadata = + (callback: GetSubscriptionMetadataCallback) => { + callback(error); + }; - subscription.exists((err, exists) => { + subscription.exists((err: Error, exists: boolean) => { assert.ifError(err); assert.strictEqual(exists, false); done(); @@ -500,13 +522,14 @@ describe('Subscription', () => { }); it('should pass back any other type of error', done => { - const error = {code: 4}; + const error = {code: 4} as ServiceError; - subscription.getMetadata = callback => { - callback(error); - }; + subscription.getMetadata = + (callback: GetSubscriptionMetadataCallback) => { + callback(error); + }; - subscription.exists((err, exists) => { + subscription.exists((err: Error, exists: boolean) => { assert.strictEqual(err, error); assert.strictEqual(exists, undefined); done(); @@ -525,7 +548,7 @@ describe('Subscription', () => { a: 'a', }; - subscription.getMetadata = gaxOpts => { + subscription.getMetadata = (gaxOpts: GetCallOptions) => { assert.strictEqual(gaxOpts, options); assert.strictEqual(gaxOpts.autoCreate, undefined); done(); @@ -538,27 +561,33 @@ describe('Subscription', () => { const fakeMetadata = {}; beforeEach(() => { - subscription.getMetadata = (gaxOpts, callback) => { - callback(null, fakeMetadata); - }; + subscription.getMetadata = + (gaxOpts: GetCallOptions, + callback: GetSubscriptionMetadataCallback) => { + callback(null, fakeMetadata); + }; }); it('should call through to getMetadata', done => { - subscription.get((err, sub, resp) => { - assert.ifError(err); - assert.strictEqual(sub, subscription); - assert.strictEqual(resp, fakeMetadata); - done(); - }); + subscription.get( + (err: Error, sub: Subscription, + resp: google.pubsub.v1.ISubscription) => { + assert.ifError(err); + assert.strictEqual(sub, subscription); + assert.strictEqual(resp, fakeMetadata); + done(); + }); }); it('should optionally accept options', done => { const options = {}; - subscription.getMetadata = (gaxOpts, callback) => { - assert.strictEqual(gaxOpts, options); - callback(); // the done fn - }; + subscription.getMetadata = + (gaxOpts: GetCallOptions, + callback: GetSubscriptionMetadataCallback) => { + assert.strictEqual(gaxOpts, options); + callback(null); // the done fn + }; subscription.get(options, done); }); @@ -566,71 +595,86 @@ describe('Subscription', () => { describe('error', () => { it('should pass back errors when not auto-creating', done => { - const error = {code: 4}; + const error = {code: 4} as ServiceError; const apiResponse = {}; - subscription.getMetadata = (gaxOpts, callback) => { - callback(error, apiResponse); - }; - - subscription.get((err, sub, resp) => { - assert.strictEqual(err, error); - assert.strictEqual(sub, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.getMetadata = + (gaxOpts: GetCallOptions, + callback: GetSubscriptionMetadataCallback) => { + callback(error, apiResponse); + }; + + subscription.get( + (err: Error, sub: Subscription, + resp: google.pubsub.v1.ISubscription) => { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should pass back 404 errors if autoCreate is false', done => { - const error = {code: 5}; + const error = {code: 5} as ServiceError; const apiResponse = {}; - subscription.getMetadata = (gaxOpts, callback) => { - callback(error, apiResponse); - }; - - subscription.get((err, sub, resp) => { - assert.strictEqual(err, error); - assert.strictEqual(sub, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.getMetadata = + (gaxOpts: GetCallOptions, + callback: GetSubscriptionMetadataCallback) => { + callback(error, apiResponse); + }; + + subscription.get( + (err: Error, sub: Subscription, + resp: google.pubsub.v1.ISubscription) => { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should pass back 404 errors if create doesnt exist', done => { - const error = {code: 5}; + const error = {code: 5} as ServiceError; const apiResponse = {}; - subscription.getMetadata = (gaxOpts, callback) => { - callback(error, apiResponse); - }; + subscription.getMetadata = + (gaxOpts: GetCallOptions, + callback: GetSubscriptionMetadataCallback) => { + callback(error, apiResponse); + }; delete subscription.create; - subscription.get((err, sub, resp) => { - assert.strictEqual(err, error); - assert.strictEqual(sub, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.get( + (err: Error, sub: Subscription, + resp: google.pubsub.v1.ISubscription) => { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should create the sub if 404 + autoCreate is true', done => { - const error = {code: 5}; + const error = {code: 5} as ServiceError; const apiResponse = {}; const fakeOptions = { autoCreate: true, }; - subscription.getMetadata = (gaxOpts, callback) => { - callback(error, apiResponse); - }; + subscription.getMetadata = + (gaxOpts: GetCallOptions, + callback: GetSubscriptionMetadataCallback) => { + callback(error, apiResponse); + }; - subscription.create = (options, callback) => { - assert.strictEqual(options, fakeOptions); - callback(); // the done fn - }; + subscription.create = + (options: GetCallOptions, callback: CreateSubscriptionCallback) => { + assert.strictEqual(options, fakeOptions); + callback(); // the done fn + }; subscription.get(fakeOptions, done); }); @@ -639,7 +683,7 @@ describe('Subscription', () => { describe('getMetadata', () => { it('should make the correct request', done => { - subscription.request = config => { + subscription.request = (config: RequestConfig) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getSubscription'); assert.deepStrictEqual(config.reqOpts, { @@ -654,7 +698,7 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = config => { + subscription.request = (config: RequestConfig) => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -666,30 +710,36 @@ describe('Subscription', () => { const error = new Error('err'); const apiResponse = {}; - subscription.request = (config, callback) => { - callback(error, apiResponse); - }; + subscription.request = + (config: RequestConfig, + callback: GetSubscriptionMetadataCallback) => { + callback(error, apiResponse); + }; - subscription.getMetadata((err, metadata) => { - assert.strictEqual(err, error); - assert.strictEqual(metadata, apiResponse); - done(); - }); + subscription.getMetadata( + (err: ServiceError, metadata: google.pubsub.v1.ISubscription) => { + assert.strictEqual(err, error); + assert.strictEqual(metadata, apiResponse); + done(); + }); }); it('should set the metadata if no error occurs', done => { const apiResponse = {}; - subscription.request = (config, callback) => { - callback(null, apiResponse); - }; + subscription.request = + (config: RequestConfig, + callback: GetSubscriptionMetadataCallback) => { + callback(null, apiResponse); + }; - subscription.getMetadata((err, metadata) => { - assert.ifError(err); - assert.strictEqual(metadata, apiResponse); - assert.strictEqual(subscription.metadata, apiResponse); - done(); - }); + subscription.getMetadata( + (err: ServiceError, metadata: google.pubsub.v1.ISubscription) => { + assert.ifError(err); + assert.strictEqual(metadata, apiResponse); + assert.strictEqual(subscription.metadata, apiResponse); + done(); + }); }); }); @@ -697,15 +747,17 @@ describe('Subscription', () => { const fakeConfig = {}; it('should make the correct request', done => { - subscription.request = (config, callback) => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'modifyPushConfig'); - assert.deepStrictEqual(config.reqOpts, { - subscription: subscription.name, - pushConfig: fakeConfig, - }); - callback(); // the done fn - }; + subscription.request = + (config: RequestConfig, + callback: RequestCallback) => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'modifyPushConfig'); + assert.deepStrictEqual(config.reqOpts, { + subscription: subscription.name, + pushConfig: fakeConfig, + }); + callback(); // the done fn + }; subscription.modifyPushConfig(fakeConfig, done); }); @@ -713,10 +765,12 @@ describe('Subscription', () => { it('should optionally accept gaxOpts', done => { const gaxOpts = {}; - subscription.request = (config, callback) => { - assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn - }; + subscription.request = + (config: RequestConfig, + callback: RequestCallback) => { + assert.strictEqual(config.gaxOpts, gaxOpts); + callback(); // the done fn + }; subscription.modifyPushConfig(fakeConfig, gaxOpts, done); }); @@ -758,32 +812,34 @@ describe('Subscription', () => { }); it('should make the correct api request', done => { - FakeSnapshot.formatName_ = (projectId, name) => { + FakeSnapshot.formatName_ = (projectId: string, name: string) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, FAKE_SNAPSHOT_NAME); return FAKE_FULL_SNAPSHOT_NAME; }; - subscription.request = (config, callback) => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'seek'); - assert.deepStrictEqual(config.reqOpts, { - subscription: subscription.name, - snapshot: FAKE_FULL_SNAPSHOT_NAME, - }); - callback(); // the done fn - }; + subscription.request = + (config: RequestConfig, callback: SeekCallback) => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'seek'); + assert.deepStrictEqual(config.reqOpts, { + subscription: subscription.name, + snapshot: FAKE_FULL_SNAPSHOT_NAME, + }); + callback(); // the done fn + }; subscription.seek(FAKE_SNAPSHOT_NAME, done); }); it('should optionally accept a Date object', done => { const date = new Date(); - - subscription.request = (config, callback) => { - assert.strictEqual(config.reqOpts.time, date); - callback(); // the done fn - }; + const reqOpts = {subscription: SUB_FULL_NAME, time: date}; + subscription.request = + (config: RequestConfig, callback: SeekCallback) => { + assert.deepStrictEqual(config.reqOpts, reqOpts); + callback(); // the done fn + }; subscription.seek(date, done); }); @@ -791,10 +847,11 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = (config, callback) => { - assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn - }; + subscription.request = + (config: RequestConfig, callback: SeekCallback) => { + assert.strictEqual(config.gaxOpts, gaxOpts); + callback(); // the done fn + }; subscription.seek(FAKE_SNAPSHOT_NAME, gaxOpts, done); }); @@ -806,7 +863,7 @@ describe('Subscription', () => { }; beforeEach(() => { - Subscription.formatMetadata_ = metadata => { + Subscription.formatMetadata_ = (metadata: SubscriptionMetadataRaw) => { return Object.assign({}, metadata); }; }); @@ -824,31 +881,39 @@ describe('Subscription', () => { }, formattedMetadata); - Subscription.formatMetadata_ = metadata => { + Subscription.formatMetadata_ = (metadata: SubscriptionMetadataRaw) => { assert.strictEqual(metadata, METADATA); return formattedMetadata; }; - subscription.request = (config, callback) => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'updateSubscription'); - assert.deepStrictEqual(config.reqOpts.subscription, expectedBody); - assert.deepStrictEqual(config.reqOpts.updateMask, { + const reqOpts = { + subscription: expectedBody, + updateMask: { paths: ['push_config'], - }); - callback(); // the done fn + } }; + subscription.request = + (config: RequestConfig, + callback: RequestCallback) => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'updateSubscription'); + assert.deepStrictEqual(config.reqOpts, reqOpts); + callback(); // the done fn + }; + subscription.setMetadata(METADATA, done); }); it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = (config, callback) => { - assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn - }; + subscription.request = + (config: RequestConfig, + callback: RequestCallback) => { + assert.strictEqual(config.gaxOpts, gaxOpts); + callback(); // the done fn + }; subscription.setMetadata(METADATA, gaxOpts, done); }); @@ -869,7 +934,7 @@ describe('Subscription', () => { const SNAPSHOT_NAME = 'a'; it('should call through to pubsub.snapshot', done => { - PUBSUB.snapshot = function(name) { + PUBSUB.snapshot = function(name: string) { assert.strictEqual(this, subscription); assert.strictEqual(name, SNAPSHOT_NAME); done(); From 2e5b8fb8ca78f47e6fc456bbc65891ecab368fe4 Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Tue, 19 Feb 2019 23:10:16 +0530 Subject: [PATCH 0353/1115] refactor(typescript): noImplicityAny for Topic test file refactor(typescript): noImplicityAny for Topic test file refactor(typescript) changes for #313 (it's a good idea to open an issue first for discussion) - [ ] Tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) #487 automerged by dpebot --- handwritten/pubsub/test/topic.ts | 282 +++++++++++++++++-------------- 1 file changed, 158 insertions(+), 124 deletions(-) diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 9cfba19491a..3b9d973351e 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -16,14 +16,18 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; +import {CallOptions} from 'google-gax'; +import {ServiceError} from 'grpc'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; +import {google} from '../proto/pubsub'; +import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateTopicCallback, ExistsCallback, GetCallOptions, GetTopicMetadataCallback, Metadata, RequestCallback, RequestConfig, Subscription, SubscriptionCallOptions, Topic} from '../src'; import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { - promisifyAll: (klass, options) => { + promisifyAll: (klass: Function, options: pfy.PromisifyAllOptions) => { if (klass.name !== 'Topic') { return; } @@ -65,7 +69,7 @@ class FakePublisher { let extended = false; const fakePaginator = { // tslint:disable-next-line variable-name - extend(Class, methods) { + extend(Class: Function, methods: string[]) { if (Class.name !== 'Topic') { return; } @@ -73,7 +77,7 @@ const fakePaginator = { assert.deepStrictEqual(methods, ['getSubscriptions']); extended = true; }, - streamify(methodName) { + streamify(methodName: string) { return methodName; }, }; @@ -82,7 +86,7 @@ describe('Topic', () => { // tslint:disable-next-line no-any variable-name let Topic: any; // tslint:disable-next-line no-any - let topic: any; + let topic: typeof Topic; const PROJECT_ID = 'test-project'; const TOPIC_NAME = 'projects/' + PROJECT_ID + '/topics/test-topic'; @@ -135,7 +139,7 @@ describe('Topic', () => { const formattedName = 'a/b/c/d'; const formatName_ = Topic.formatName_; - Topic.formatName_ = (projectId, name) => { + Topic.formatName_ = (projectId: string, name: string) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, TOPIC_NAME); @@ -164,7 +168,7 @@ describe('Topic', () => { }); it('should localize the request function', done => { - PUBSUB.request = callback => { + PUBSUB.request = (callback: RequestCallback) => { callback(); // the done fn }; @@ -194,11 +198,13 @@ describe('Topic', () => { it('should call the parent createTopic method', done => { const options_ = {}; - PUBSUB.createTopic = (name, options, callback) => { - assert.strictEqual(name, topic.name); - assert.strictEqual(options, options_); - callback(); // the done fn - }; + PUBSUB.createTopic = + (name: string, options: CallOptions, + callback: CreateTopicCallback) => { + assert.strictEqual(name, topic.name); + assert.strictEqual(options, options_); + callback(); // the done fn + }; topic.create(options_, done); }); @@ -209,12 +215,14 @@ describe('Topic', () => { const NAME = 'sub-name'; const OPTIONS = {a: 'a'}; - PUBSUB.createSubscription = (topic_, name, options, callback) => { - assert.strictEqual(topic_, topic); - assert.strictEqual(name, NAME); - assert.strictEqual(options, OPTIONS); - callback(); // the done fn - }; + PUBSUB.createSubscription = + (topic_: Topic, name: string, options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback) => { + assert.strictEqual(topic_, topic); + assert.strictEqual(name, NAME); + assert.strictEqual(options, OPTIONS); + callback(); // the done fn + }; topic.createSubscription(NAME, OPTIONS, done); }); @@ -222,12 +230,14 @@ describe('Topic', () => { describe('delete', () => { it('should make the proper request', done => { - topic.request = (config, callback) => { - assert.strictEqual(config.client, 'PublisherClient'); - assert.strictEqual(config.method, 'deleteTopic'); - assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); - callback(); // the done fn - }; + topic.request = + (config: RequestConfig, + callback: RequestCallback) => { + assert.strictEqual(config.client, 'PublisherClient'); + assert.strictEqual(config.method, 'deleteTopic'); + assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); + callback(); // the done fn + }; topic.delete(done); }); @@ -235,19 +245,23 @@ describe('Topic', () => { it('should optionally accept gax options', done => { const options = {}; - topic.request = (config, callback) => { - assert.strictEqual(config.gaxOpts, options); - callback(); // the done fn - }; + topic.request = + (config: RequestConfig, + callback: RequestCallback) => { + assert.strictEqual(config.gaxOpts, options); + callback(); // the done fn + }; topic.delete(options, done); }); it('should optionally accept a callback', done => { sandbox.stub(util, 'noop').callsFake(done); - topic.request = (config, callback) => { - callback(); // the done fn - }; + topic.request = + (config: RequestConfig, + callback: RequestCallback) => { + callback(); // the done fn + }; topic.delete(); }); }); @@ -259,7 +273,7 @@ describe('Topic', () => { a: 'a', }; - topic.getMetadata = gaxOpts => { + topic.getMetadata = (gaxOpts: GetCallOptions) => { assert.strictEqual(gaxOpts, options); assert.strictEqual(gaxOpts.autoCreate, undefined); done(); @@ -272,27 +286,31 @@ describe('Topic', () => { const fakeMetadata = {}; beforeEach(() => { - topic.getMetadata = (gaxOpts, callback) => { - callback(null, fakeMetadata); - }; + topic.getMetadata = + (gaxOpts: GetCallOptions, + callback: RequestCallback) => { + callback(null, fakeMetadata); + }; }); it('should call through to getMetadata', done => { - topic.get((err, _topic, resp) => { - assert.ifError(err); - assert.strictEqual(_topic, topic); - assert.strictEqual(resp, fakeMetadata); - done(); - }); + topic.get( + (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { + assert.ifError(err); + assert.strictEqual(_topic, topic); + assert.strictEqual(resp, fakeMetadata); + done(); + }); }); it('should optionally accept options', done => { const options = {}; - topic.getMetadata = (gaxOpts, callback) => { - assert.strictEqual(gaxOpts, options); - callback(); // the done fn - }; + topic.getMetadata = + (gaxOpts: GetCallOptions, callback: RequestCallback) => { + assert.strictEqual(gaxOpts, options); + callback(); // the done fn + }; topic.get(options, done); }); @@ -300,53 +318,59 @@ describe('Topic', () => { describe('error', () => { it('should pass back errors when not auto-creating', done => { - const error = {code: 4}; - const apiResponse = {}; - - topic.getMetadata = (gaxOpts, callback) => { - callback(error, apiResponse); - }; - - topic.get((err, _topic, resp) => { - assert.strictEqual(err, error); - assert.strictEqual(_topic, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + const error = {code: 4} as ServiceError; + const apiResponse = {} as Topic; + + topic.getMetadata = + (gaxOpts: GetCallOptions, callback: GetTopicMetadataCallback) => { + callback(error, apiResponse); + }; + + topic.get( + (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { + assert.strictEqual(err, error); + assert.strictEqual(_topic, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should pass back 404 errors if autoCreate is false', done => { - const error = {code: 5}; - const apiResponse = {}; - - topic.getMetadata = (gaxOpts, callback) => { - callback(error, apiResponse); - }; - - topic.get((err, _topic, resp) => { - assert.strictEqual(err, error); - assert.strictEqual(_topic, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + const error = {code: 5} as ServiceError; + const apiResponse = {} as Topic; + + topic.getMetadata = + (gaxOpts: GetCallOptions, callback: GetTopicMetadataCallback) => { + callback(error, apiResponse); + }; + + topic.get( + (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { + assert.strictEqual(err, error); + assert.strictEqual(_topic, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should create the topic if 404 + autoCreate is true', done => { - const error = {code: 5}; - const apiResponse = {}; + const error = {code: 5} as ServiceError; + const apiResponse = {} as Topic; const fakeOptions = { autoCreate: true, }; - topic.getMetadata = (gaxOpts, callback) => { - callback(error, apiResponse); - }; + topic.getMetadata = + (gaxOpts: GetCallOptions, callback: GetTopicMetadataCallback) => { + callback(error, apiResponse); + }; - topic.create = (options, callback) => { - assert.strictEqual(options, fakeOptions); - callback(); // the done fn - }; + topic.create = + (options: CallOptions, callback: CreateTopicCallback) => { + assert.strictEqual(options, fakeOptions); + callback(); // the done fn + }; topic.get(fakeOptions, done); }); @@ -355,11 +379,11 @@ describe('Topic', () => { describe('exists', () => { it('should return true if it finds metadata', done => { - topic.getMetadata = callback => { + topic.getMetadata = (callback: GetTopicMetadataCallback) => { callback(null, {}); }; - topic.exists((err, exists) => { + topic.exists((err: Error, exists: ExistsCallback) => { assert.ifError(err); assert(exists); done(); @@ -367,11 +391,12 @@ describe('Topic', () => { }); it('should return false if a not found error occurs', done => { - topic.getMetadata = callback => { - callback({code: 5}); + const error = {code: 5} as ServiceError; + topic.getMetadata = (callback: GetTopicMetadataCallback) => { + callback(error); }; - topic.exists((err, exists) => { + topic.exists((err: Error, exists: ExistsCallback) => { assert.ifError(err); assert.strictEqual(exists, false); done(); @@ -379,13 +404,13 @@ describe('Topic', () => { }); it('should pass back any other type of error', done => { - const error = {code: 4}; + const error = {code: 4} as ServiceError; - topic.getMetadata = callback => { + topic.getMetadata = (callback: GetTopicMetadataCallback) => { callback(error); }; - topic.exists((err, exists) => { + topic.exists((err: Error, exists: ExistsCallback) => { assert.strictEqual(err, error); assert.strictEqual(exists, undefined); done(); @@ -395,7 +420,7 @@ describe('Topic', () => { describe('getMetadata', () => { it('should make the proper request', done => { - topic.request = config => { + topic.request = (config: RequestConfig) => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'getTopic'); assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); @@ -408,7 +433,7 @@ describe('Topic', () => { it('should optionally accept gax options', done => { const options = {}; - topic.request = config => { + topic.request = (config: RequestConfig) => { assert.strictEqual(config.gaxOpts, options); done(); }; @@ -420,11 +445,12 @@ describe('Topic', () => { const error = new Error('err'); const apiResponse = {}; - topic.request = (config, callback) => { - callback(error, apiResponse); - }; + topic.request = + (config: RequestConfig, callback: GetTopicMetadataCallback) => { + callback(error, apiResponse); + }; - topic.getMetadata((err, metadata) => { + topic.getMetadata((err: Error, metadata: google.pubsub.v1.ITopic) => { assert.strictEqual(err, error); assert.strictEqual(metadata, apiResponse); done(); @@ -434,11 +460,12 @@ describe('Topic', () => { it('should set the metadata if no error occurs', done => { const apiResponse = {}; - topic.request = (config, callback) => { - callback(null, apiResponse); - }; + topic.request = + (config: RequestConfig, callback: GetTopicMetadataCallback) => { + callback(null, apiResponse); + }; - topic.getMetadata((err, metadata) => { + topic.getMetadata((err: Error, metadata: google.pubsub.v1.ITopic) => { assert.ifError(err); assert.strictEqual(metadata, apiResponse); assert.strictEqual(topic.metadata, apiResponse); @@ -473,7 +500,7 @@ describe('Topic', () => { delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; - topic.request = config => { + topic.request = (config: RequestConfig) => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'listTopicSubscriptions'); assert.deepStrictEqual(config.reqOpts, expectedOptions); @@ -485,7 +512,7 @@ describe('Topic', () => { }); it('should accept only a callback', done => { - topic.request = config => { + topic.request = (config: RequestConfig) => { assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); assert.deepStrictEqual(config.gaxOpts, {autoPaginate: undefined}); done(); @@ -497,17 +524,18 @@ describe('Topic', () => { it('should create subscription objects', done => { const fakeSubs = ['a', 'b', 'c']; - topic.subscription = name => { + topic.subscription = (name: string) => { return { name, }; }; - topic.request = (config, callback) => { - callback(null, fakeSubs); - }; + topic.request = + (config: RequestConfig, callback: RequestCallback) => { + callback(null, fakeSubs); + }; - topic.getSubscriptions((err, subscriptions) => { + topic.getSubscriptions((err: Error, subscriptions: Subscription[]) => { assert.ifError(err); assert.deepStrictEqual(subscriptions, [ {name: 'a'}, @@ -524,17 +552,21 @@ describe('Topic', () => { const nextQuery_ = {}; const apiResponse_ = {}; - topic.request = (config, callback) => { - callback(err_, subs_, nextQuery_, apiResponse_); - }; - - topic.getSubscriptions((err, subs, nextQuery, apiResponse) => { - assert.strictEqual(err, err_); - assert.deepStrictEqual(subs, subs_); - assert.strictEqual(nextQuery, nextQuery_); - assert.strictEqual(apiResponse, apiResponse_); - done(); - }); + topic.request = + // tslint:disable-next-line:no-any + (config: RequestConfig, callback: (...args: any[]) => void) => { + callback(err_, subs_, nextQuery_, apiResponse_); + }; + + topic.getSubscriptions( + // tslint:disable-next-line:no-any + (err: Error, subs: boolean, nextQuery: any, apiResponse: any) => { + assert.strictEqual(err, err_); + assert.deepStrictEqual(subs, subs_); + assert.strictEqual(nextQuery, nextQuery_); + assert.strictEqual(apiResponse, apiResponse_); + done(); + }); }); }); @@ -602,20 +634,22 @@ describe('Topic', () => { const subscriptionName = 'subName'; const opts = {}; - topic.parent.subscription = (name, options) => { - assert.strictEqual(name, subscriptionName); - assert.deepStrictEqual(options, opts); - done(); - }; + topic.parent.subscription = + (name: string, options: SubscriptionCallOptions) => { + assert.strictEqual(name, subscriptionName); + assert.deepStrictEqual(options, opts); + done(); + }; topic.subscription(subscriptionName, opts); }); it('should attach the topic instance to the options', done => { - topic.parent.subscription = (name, options) => { - assert.strictEqual(options.topic, topic); - done(); - }; + topic.parent.subscription = + (name: string, options: SubscriptionCallOptions) => { + assert.strictEqual(options.topic, topic); + done(); + }; topic.subscription(); }); From a1d7c1cb398db192e0136d773d02be589e91d8ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 19 Feb 2019 10:32:37 -0800 Subject: [PATCH 0354/1115] chore(deps): update dependency mocha to v6 chore(deps): update dependency mocha to v6 This PR contains the following updates: | Package | Type | Update | Change | References | |---|---|---|---|---| | mocha | devDependencies | major | `^5.2.0` -> `^6.0.0` | [homepage](https://mochajs.org/), [source](https://togithub.com/mochajs/mocha) | --- ### Release Notes
mochajs/mocha ### [`v6.0.0`](https://togithub.com/mochajs/mocha/blob/master/CHANGELOG.md#​600--2019-02-18) [Compare Source](https://togithub.com/mochajs/mocha/compare/v5.2.0...v6.0.0) #### :tada: Enhancements - [#​3726](https://togithub.com/mochajs/mocha/issues/3726): Add ability to unload files from `require` cache ([**@​plroebuck**](https://togithub.com/plroebuck)) #### :bug: Fixes - [#​3737](https://togithub.com/mochajs/mocha/issues/3737): Fix falsy values from options globals ([**@​plroebuck**](https://togithub.com/plroebuck)) - [#​3707](https://togithub.com/mochajs/mocha/issues/3707): Fix encapsulation issues for `Suite#_onlyTests` and `Suite#_onlySuites` ([**@​vkarpov15**](https://togithub.com/vkarpov15)) - [#​3711](https://togithub.com/mochajs/mocha/issues/3711): Fix diagnostic messages dealing with plurality and markup of output ([**@​plroebuck**](https://togithub.com/plroebuck)) - [#​3723](https://togithub.com/mochajs/mocha/issues/3723): Fix "reporter-option" to allow comma-separated options ([**@​boneskull**](https://togithub.com/boneskull)) - [#​3722](https://togithub.com/mochajs/mocha/issues/3722): Fix code quality and performance of `lookupFiles` and `files` ([**@​plroebuck**](https://togithub.com/plroebuck)) - [#​3650](https://togithub.com/mochajs/mocha/issues/3650), [#​3654](https://togithub.com/mochajs/mocha/issues/3654): Fix noisy error message when no files found ([**@​craigtaub**](https://togithub.com/craigtaub)) - [#​3632](https://togithub.com/mochajs/mocha/issues/3632): Tests having an empty title are no longer confused with the "root" suite ([**@​juergba**](https://togithub.com/juergba)) - [#​3666](https://togithub.com/mochajs/mocha/issues/3666): Fix missing error codes ([**@​vkarpov15**](https://togithub.com/vkarpov15)) - [#​3684](https://togithub.com/mochajs/mocha/issues/3684): Fix exiting problem in Node.js v11.7.0+ ([**@​addaleax**](https://togithub.com/addaleax)) - [#​3691](https://togithub.com/mochajs/mocha/issues/3691): Fix `--delay` (and other boolean options) not working in all cases ([**@​boneskull**](https://togithub.com/boneskull)) - [#​3692](https://togithub.com/mochajs/mocha/issues/3692): Fix invalid command-line argument usage not causing actual errors ([**@​boneskull**](https://togithub.com/boneskull)) - [#​3698](https://togithub.com/mochajs/mocha/issues/3698), [#​3699](https://togithub.com/mochajs/mocha/issues/3699): Fix debug-related Node.js options not working in all cases ([**@​boneskull**](https://togithub.com/boneskull)) - [#​3700](https://togithub.com/mochajs/mocha/issues/3700): Growl notifications now show the correct number of tests run ([**@​outsideris**](https://togithub.com/outsideris)) - [#​3686](https://togithub.com/mochajs/mocha/issues/3686): Avoid potential ReDoS when diffing large objects ([**@​cyjake**](https://togithub.com/cyjake)) - [#​3715](https://togithub.com/mochajs/mocha/issues/3715): Fix incorrect order of emitted events when used programmatically ([**@​boneskull**](https://togithub.com/boneskull)) - [#​3706](https://togithub.com/mochajs/mocha/issues/3706): Fix regression wherein `--reporter-option`/`--reporter-options` did not support comma-separated key/value pairs ([**@​boneskull**](https://togithub.com/boneskull)) #### :book: Documentation - [#​3652](https://togithub.com/mochajs/mocha/issues/3652): Switch from Jekyll to Eleventy ([**@​Munter**](https://togithub.com/Munter)) #### :nut_and_bolt: Other - [#​3677](https://togithub.com/mochajs/mocha/issues/3677): Add error objects for createUnsupportedError and createInvalidExceptionError ([**@​boneskull**](https://togithub.com/boneskull)) - [#​3733](https://togithub.com/mochajs/mocha/issues/3733): Removed unnecessary processing in post-processing hook ([**@​wanseob**](https://togithub.com/wanseob)) - [#​3730](https://togithub.com/mochajs/mocha/issues/3730): Update nyc to latest version ([**@​coreyfarrell**](https://togithub.com/coreyfarrell)) - [#​3648](https://togithub.com/mochajs/mocha/issues/3648), [#​3680](https://togithub.com/mochajs/mocha/issues/3680): Fixes to support latest versions of [unexpected](https://npm.im/unexpected) and [unexpected-sinon](https://npm.im/unexpected-sinon) ([**@​sunesimonsen**](https://togithub.com/sunesimonsen)) - [#​3638](https://togithub.com/mochajs/mocha/issues/3638): Add meta tag to site ([**@​MartijnCuppens**](https://togithub.com/MartijnCuppens)) - [#​3653](https://togithub.com/mochajs/mocha/issues/3653): Fix parts of test suite failing to run on Windows ([**@​boneskull**](https://togithub.com/boneskull))
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is stale, or if you modify the PR title to begin with "`rebase!`". :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/marketplace/renovate). View repository job log [here](https://renovatebot.com/dashboard#googleapis/nodejs-pubsub). #488 automerged by dpebot --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2c47a1a82f3..28af07d8d39 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -91,7 +91,7 @@ "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", - "mocha": "^5.0.0", + "mocha": "^6.0.0", "nyc": "^13.0.0", "power-assert": "^1.4.4", "prettier": "^1.9.1", From 519e7c3a55d0cd868cedc8291a3e8443dda627c5 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Sat, 23 Feb 2019 14:41:04 -0800 Subject: [PATCH 0355/1115] Release @google-cloud/pubsub v0.25.0 (#491) --- handwritten/pubsub/CHANGELOG.md | 42 +++++++++++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 84817d4823a..148bb188f69 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,48 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.25.0 + +02-20-2019 10:35 PST + +### Implementation Changes +- fix: throw on invalid credentials and update retry config ([#476](https://github.com/googleapis/nodejs-pubsub/pull/476)) + +The retry logic for **all** methods has changed. It is possible that this could go unnoticed, however if you suddenly start seeing errors in places that were previously quiet, this might account for said errors. + +### New Features +- refactor(ts): improve TypeScript types ([#482](https://github.com/googleapis/nodejs-pubsub/pull/482)) +- refactor(typescript): noImplicityAny for snapshot.ts and publisher.ts ([#457](https://github.com/googleapis/nodejs-pubsub/pull/457)) + +### Bug Fixes +- fix: ignore messages that come in after close ([#485](https://github.com/googleapis/nodejs-pubsub/pull/485)) + +### Dependencies +- chore(deps): update dependency mocha to v6 ([#488](https://github.com/googleapis/nodejs-pubsub/pull/488)) +- fix(deps): update dependency @google-cloud/promisify to ^0.4.0 ([#478](https://github.com/googleapis/nodejs-pubsub/pull/478)) +- fix(deps): update dependency yargs to v13 ([#475](https://github.com/googleapis/nodejs-pubsub/pull/475)) +- fix(deps): update dependency duplexify to v4 ([#462](https://github.com/googleapis/nodejs-pubsub/pull/462)) +- fix(deps): update dependency google-gax to ^0.25.0 ([#456](https://github.com/googleapis/nodejs-pubsub/pull/456)) + +### Documentation +- docs: update links in contrib guide ([#479](https://github.com/googleapis/nodejs-pubsub/pull/479)) +- docs: update contributing path in README ([#471](https://github.com/googleapis/nodejs-pubsub/pull/471)) +- chore: move CONTRIBUTING.md to root ([#470](https://github.com/googleapis/nodejs-pubsub/pull/470)) +- docs: make mention of message change in changelog ([#469](https://github.com/googleapis/nodejs-pubsub/pull/469)) +- docs: add lint/fix example to contributing guide ([#464](https://github.com/googleapis/nodejs-pubsub/pull/464)) +- fix(sample): fix retry codes in retry sample code ([#458](https://github.com/googleapis/nodejs-pubsub/pull/458)) + +### Internal / Testing Changes +- test(samples): correctly handle publishTime value ([#495](https://github.com/googleapis/nodejs-pubsub/pull/495)) +- test: fix publishTime issues ([#494](https://github.com/googleapis/nodejs-pubsub/pull/494)) +- refactor(typescript): noImplicityAny for Topic test file ([#487](https://github.com/googleapis/nodejs-pubsub/pull/487)) +- refactor(ts): noImplicitAny for subscription test file ([#489](https://github.com/googleapis/nodejs-pubsub/pull/489)) +- build: use linkinator for docs test ([#477](https://github.com/googleapis/nodejs-pubsub/pull/477)) +- build: create docs test npm scripts ([#474](https://github.com/googleapis/nodejs-pubsub/pull/474)) +- build: test using @grpc/grpc-js in CI ([#472](https://github.com/googleapis/nodejs-pubsub/pull/472)) +- test: update code style of smoke test ([#463](https://github.com/googleapis/nodejs-pubsub/pull/463)) +- test: make smoke test spam less ([#459](https://github.com/googleapis/nodejs-pubsub/pull/459)) + ## v0.24.1 01-29-2019 13:17 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 28af07d8d39..5d1b41f42fd 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.24.1", + "version": "0.25.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 5e90b3b5b2d3451b8722e95e0cc6a2aad9678e71 Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Mon, 25 Feb 2019 10:16:56 +0530 Subject: [PATCH 0356/1115] refactor(typescript): noImplicitAny for snapshot and subscriber test file (#490) --- handwritten/pubsub/test/snapshot.ts | 28 +++++++++++++-------------- handwritten/pubsub/test/subscriber.ts | 11 ++++++----- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index edc63a5300b..60dac16844d 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -19,14 +19,14 @@ import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; -import {PubSub, Subscription} from '../src'; -import {Snapshot} from '../src/snapshot'; +import {PubSub, RequestConfig, Subscription} from '../src'; +import * as snapTypes from '../src/snapshot'; import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { // tslint:disable-next-line variable-name - promisifyAll(Class: Snapshot) { + promisifyAll(Class: Function) { if (Class.name === 'Snapshot') { promisified = true; } @@ -35,15 +35,16 @@ const fakePromisify = Object.assign({}, pfy, { describe('Snapshot', () => { // tslint:disable-next-line variable-name - let Snapshot; - let snapshot; + let Snapshot: typeof snapTypes.Snapshot; + + let snapshot: snapTypes.Snapshot; const SNAPSHOT_NAME = 'a'; const PROJECT_ID = 'grape-spaceship-123'; const PUBSUB = { projectId: PROJECT_ID, - }; + } as {} as PubSub; const SUBSCRIPTION = { projectId: PROJECT_ID, @@ -51,7 +52,7 @@ describe('Snapshot', () => { api: {}, createSnapshot() {}, seek() {}, - }; + } as {} as Subscription; before(() => { @@ -68,7 +69,7 @@ describe('Snapshot', () => { describe('initialization', () => { const FULL_SNAPSHOT_NAME = 'a/b/c/d'; - let formatName_; + let formatName_: (projectId: string, name: string) => string; before(() => { formatName_ = Snapshot.formatName_; @@ -97,7 +98,7 @@ describe('Snapshot', () => { describe('name', () => { it('should create and cache the full name', () => { - Snapshot.formatName_ = (projectId, name) => { + Snapshot.formatName_ = (projectId: string, name: string) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, SNAPSHOT_NAME); return FULL_SNAPSHOT_NAME; @@ -108,7 +109,7 @@ describe('Snapshot', () => { }); it('should pull the projectId from parent object', () => { - Snapshot.formatName_ = (projectId, name) => { + Snapshot.formatName_ = (projectId: string, name: string) => { assert.strictEqual(projectId, PROJECT_ID); assert.strictEqual(name, SNAPSHOT_NAME); return FULL_SNAPSHOT_NAME; @@ -148,8 +149,6 @@ describe('Snapshot', () => { }); describe('with PubSub parent', () => { - let snapshot; - beforeEach(() => { snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); }); @@ -184,7 +183,7 @@ describe('Snapshot', () => { describe('delete', () => { it('should make the correct request', done => { - snapshot.parent.request = (config, callback) => { + snapshot.parent.request = (config: RequestConfig, callback: Function) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSnapshot'); assert.deepStrictEqual(config.reqOpts, {snapshot: snapshot.name}); @@ -196,7 +195,8 @@ describe('Snapshot', () => { it('should optionally accept a callback', done => { sandbox.stub(util, 'noop').callsFake(done); - snapshot.parent.request = (config, callback) => { + + snapshot.parent.request = (config: RequestConfig, callback: Function) => { callback(); // the done fn }; snapshot.delete(); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index d9db40a215a..78fd8e5bcb2 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -20,13 +20,14 @@ import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {PassThrough} from 'stream'; import * as uuid from 'uuid'; - +import {Subscription} from '../src'; import {HistogramOptions} from '../src/histogram'; import {FlowControlOptions} from '../src/lease-manager'; import {BatchOptions} from '../src/message-queues'; import {MessageStreamOptions} from '../src/message-stream'; import * as s from '../src/subscriber'; + const stubs = new Map(); class FakeClient {} @@ -129,7 +130,8 @@ describe('Subscriber', () => { const fakeProjectify = {replaceProjectIdToken: sandbox.stub()}; - let subscription; + + let subscription: Subscription; // tslint:disable-next-line variable-name let Message: typeof s.Message; @@ -153,7 +155,7 @@ describe('Subscriber', () => { }); beforeEach(() => { - subscription = new FakeSubscription(); + subscription = new FakeSubscription() as {} as Subscription; subscriber = new Subscriber(subscription); message = new Message(subscriber, RECEIVED_MESSAGE); subscriber.open(); @@ -375,10 +377,9 @@ describe('Subscriber', () => { describe('getClient', () => { it('should get a subscriber client', async () => { - const pubsub = subscription.pubsub; + const pubsub = subscription.pubsub as {} as FakePubSub; const spy = sandbox.spy(pubsub, 'getClient_'); const client = await subscriber.getClient(); - const [options] = spy.lastCall.args; assert.deepStrictEqual(options, {client: 'SubscriberClient'}); assert.strictEqual(client, pubsub.client); From 55bba937238044fc7ea59ab172bea6c89586de30 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 26 Feb 2019 06:55:11 -0800 Subject: [PATCH 0357/1115] feat(typescript): ship typescript declaration files (#498) --- handwritten/pubsub/package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5d1b41f42fd..47c6ec66e23 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -11,10 +11,9 @@ "main": "./build/src/index.js", "types": "./build/src/index.d.ts", "files": [ + "build/proto", "build/protos", "build/src", - "!**/*.d.ts", - "!**/*.js.map", "AUTHORS", "CONTRIBUTORS", "LICENSE" @@ -42,7 +41,7 @@ "fix": "eslint --fix '**/*.js' && gts fix", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", "clean": "gts clean", - "compile": "tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", + "compile": "tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp -r proto build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", "prepare": "npm run compile", "pretest": "npm run compile", "proto": "npm run proto:pubsub", From 8dfd777efecf70c1a4658df7fc1f79a3227d30b2 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 27 Feb 2019 15:16:57 -0800 Subject: [PATCH 0358/1115] fix(messageStream): remove call to destroy grpc stream (#499) --- handwritten/pubsub/src/message-stream.ts | 37 ++++++------------- handwritten/pubsub/test/message-stream.ts | 44 +++++++---------------- 2 files changed, 24 insertions(+), 57 deletions(-) diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index f72f58409c5..96cfa4d4a6e 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -19,7 +19,7 @@ import {Gaxios} from 'gaxios'; import {ClientStub} from 'google-gax'; import {ClientDuplexStream, Metadata, ServiceError, status, StatusObject} from 'grpc'; import * as isStreamEnded from 'is-stream-ended'; -import {Duplex, PassThrough} from 'stream'; +import {PassThrough} from 'stream'; import {PullResponse, Subscriber} from './subscriber'; @@ -109,29 +109,6 @@ export class ChannelError extends Error implements ServiceError { } } -/** - * Ponyfill for destroying streams. - * - * @private - * - * @param {stream} stream The stream to destroy. - * @param {error?} err Error to emit. - */ -export function destroy(stream: Duplex, err?: Error): void { - const nativeDestroy = Duplex.prototype.destroy; - - if (typeof nativeDestroy === 'function') { - return nativeDestroy.call(stream, err); - } - - process.nextTick(() => { - if (err) { - stream.emit('error', err); - } - stream.emit('close'); - }); -} - /** * @typedef {object} MessageStreamOptions * @property {number} [highWaterMark=0] Configures the Buffer level for all @@ -197,7 +174,16 @@ export class MessageStream extends PassThrough { stream.cancel(); } - return destroy(this, err); + if (typeof super.destroy === 'function') { + return super.destroy(err); + } + + process.nextTick(() => { + if (err) { + this.emit('error', err); + } + this.emit('close'); + }); } /** * Adds a StreamingPull stream to the combined stream. @@ -329,7 +315,6 @@ export class MessageStream extends PassThrough { */ private _onStatus(stream: PullStream, status: StatusObject): void { if (this.destroyed) { - destroy(stream); return; } diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 66d6c632f4a..acdfafd0dd0 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -41,21 +41,18 @@ interface StreamOptions { highWaterMark?: number; } -class FakeDuplex extends Duplex { - destroy(err?: Error): void { - if (super.destroy) { - return super.destroy(err); - } - destroy(this, err); - } -} - class FakePassThrough extends PassThrough { options: StreamOptions; constructor(options: StreamOptions) { super(options); this.options = options; } + destroy(err?: Error): void { + if (super.destroy) { + return super.destroy(err); + } + destroy(this, err); + } } class FakeGrpcStream extends Duplex { @@ -136,10 +133,9 @@ describe('MessageStream', () => { let messageStream; before(() => { - MessageStream = - proxyquire('../src/message-stream.js', { - 'stream': {Duplex: FakeDuplex, PassThrough: FakePassThrough} - }).MessageStream; + MessageStream = proxyquire('../src/message-stream.js', { + 'stream': {PassThrough: FakePassThrough} + }).MessageStream; }); beforeEach(() => { @@ -257,7 +253,7 @@ describe('MessageStream', () => { describe('destroy', () => { it('should noop if already destroyed', done => { - const stub = sandbox.stub(FakeDuplex.prototype, 'destroy') + const stub = sandbox.stub(FakePassThrough.prototype, 'destroy') .callsFake(function(this: Duplex) { if (this === messageStream) { done(); @@ -309,13 +305,13 @@ describe('MessageStream', () => { let destroy; before(() => { - destroy = FakeDuplex.prototype.destroy; + destroy = FakePassThrough.prototype.destroy; // tslint:disable-next-line no-any - FakeDuplex.prototype.destroy = (false as any); + FakePassThrough.prototype.destroy = (false as any); }); after(() => { - FakeDuplex.prototype.destroy = destroy; + FakePassThrough.prototype.destroy = destroy; }); it('should emit close', done => { @@ -446,20 +442,6 @@ describe('MessageStream', () => { }); describe('on status', () => { - it('should destroy the stream if the message stream is destroyed', - done => { - const [stream] = client.streams; - const stub = sandbox.stub(FakeDuplex.prototype, 'destroy') - .callsFake(function(this: Duplex) { - if (this === stream) { - done(); - } - }); - - messageStream.destroy(); - stream.emit('status', {}); - }); - it('should wait for end to fire before creating a new stream', done => { const [stream] = client.streams; const expectedCount = stream.listenerCount('end') + 1; From 1cb1c8170701a0f3f7f5e18cd816bbf843df627a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Thu, 28 Feb 2019 05:27:36 -0800 Subject: [PATCH 0359/1115] feat(subscription): support push config auth methods (#504) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/proto/pubsub.d.ts | 351 ++++++------------ .../protos/google/pubsub/v1/pubsub.proto | 38 +- handwritten/pubsub/src/subscription.ts | 18 +- .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 35 ++ handwritten/pubsub/synth.metadata | 12 +- 6 files changed, 192 insertions(+), 264 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 47c6ec66e23..d78b01a6db3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -45,7 +45,7 @@ "prepare": "npm run compile", "pretest": "npm run compile", "proto": "npm run proto:pubsub", - "proto:pubsub": "mkdir -p proto && pbjs -t static-module -w commonjs -p node_modules/google-proto-files google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", + "proto:pubsub": "mkdir -p proto && pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", "docs-test": "linkinator docs -r --skip www.googleapis.com", "predocs-test": "npm run docs" }, diff --git a/handwritten/pubsub/proto/pubsub.d.ts b/handwritten/pubsub/proto/pubsub.d.ts index 935b63002c2..572388ae9e4 100644 --- a/handwritten/pubsub/proto/pubsub.d.ts +++ b/handwritten/pubsub/proto/pubsub.d.ts @@ -2146,6 +2146,9 @@ export namespace google { /** PushConfig attributes */ attributes?: ({ [k: string]: string }|null); + + /** PushConfig oidcToken */ + oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); } /** Represents a PushConfig. */ @@ -2163,6 +2166,12 @@ export namespace google { /** PushConfig attributes. */ public attributes: { [k: string]: string }; + /** PushConfig oidcToken. */ + public oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + + /** PushConfig authenticationMethod. */ + public authenticationMethod?: "oidcToken"; + /** * Creates a new PushConfig instance using the specified properties. * @param [properties] Properties to set @@ -2234,6 +2243,105 @@ export namespace google { public toJSON(): { [k: string]: any }; } + namespace PushConfig { + + /** Properties of an OidcToken. */ + interface IOidcToken { + + /** OidcToken serviceAccountEmail */ + serviceAccountEmail?: (string|null); + + /** OidcToken audience */ + audience?: (string|null); + } + + /** Represents an OidcToken. */ + class OidcToken implements IOidcToken { + + /** + * Constructs a new OidcToken. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.PushConfig.IOidcToken); + + /** OidcToken serviceAccountEmail. */ + public serviceAccountEmail: string; + + /** OidcToken audience. */ + public audience: string; + + /** + * Creates a new OidcToken instance using the specified properties. + * @param [properties] Properties to set + * @returns OidcToken instance + */ + public static create(properties?: google.pubsub.v1.PushConfig.IOidcToken): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @param message OidcToken message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @param message OidcToken message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an OidcToken message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Decodes an OidcToken message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Verifies an OidcToken message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OidcToken + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Creates a plain object from an OidcToken message. Also converts values to other types if specified. + * @param message OidcToken + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig.OidcToken, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this OidcToken to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + /** Properties of a ReceivedMessage. */ interface IReceivedMessage { @@ -4377,9 +4485,6 @@ export namespace google { /** Http rules */ rules?: (google.api.IHttpRule[]|null); - - /** Http fullyDecodeReservedExpansion */ - fullyDecodeReservedExpansion?: (boolean|null); } /** Represents a Http. */ @@ -4394,9 +4499,6 @@ export namespace google { /** Http rules. */ public rules: google.api.IHttpRule[]; - /** Http fullyDecodeReservedExpansion. */ - public fullyDecodeReservedExpansion: boolean; - /** * Creates a new Http instance using the specified properties. * @param [properties] Properties to set @@ -4495,9 +4597,6 @@ export namespace google { /** HttpRule body */ body?: (string|null); - /** HttpRule responseBody */ - responseBody?: (string|null); - /** HttpRule additionalBindings */ additionalBindings?: (google.api.IHttpRule[]|null); } @@ -4535,9 +4634,6 @@ export namespace google { /** HttpRule body. */ public body: string; - /** HttpRule responseBody. */ - public responseBody: string; - /** HttpRule additionalBindings. */ public additionalBindings: google.api.IHttpRule[]; @@ -5115,9 +5211,6 @@ export namespace google { /** ExtensionRange end */ end?: (number|null); - - /** ExtensionRange options */ - options?: (google.protobuf.IExtensionRangeOptions|null); } /** Represents an ExtensionRange. */ @@ -5135,9 +5228,6 @@ export namespace google { /** ExtensionRange end. */ public end: number; - /** ExtensionRange options. */ - public options?: (google.protobuf.IExtensionRangeOptions|null); - /** * Creates a new ExtensionRange instance using the specified properties. * @param [properties] Properties to set @@ -5306,96 +5396,6 @@ export namespace google { } } - /** Properties of an ExtensionRangeOptions. */ - interface IExtensionRangeOptions { - - /** ExtensionRangeOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an ExtensionRangeOptions. */ - class ExtensionRangeOptions implements IExtensionRangeOptions { - - /** - * Constructs a new ExtensionRangeOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IExtensionRangeOptions); - - /** ExtensionRangeOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new ExtensionRangeOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ExtensionRangeOptions instance - */ - public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; - - /** - * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; - - /** - * Verifies an ExtensionRangeOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExtensionRangeOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; - - /** - * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. - * @param message ExtensionRangeOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ExtensionRangeOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - /** Properties of a FieldDescriptorProto. */ interface IFieldDescriptorProto { @@ -5679,12 +5679,6 @@ export namespace google { /** EnumDescriptorProto options */ options?: (google.protobuf.IEnumOptions|null); - - /** EnumDescriptorProto reservedRange */ - reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); - - /** EnumDescriptorProto reservedName */ - reservedName?: (string[]|null); } /** Represents an EnumDescriptorProto. */ @@ -5705,12 +5699,6 @@ export namespace google { /** EnumDescriptorProto options. */ public options?: (google.protobuf.IEnumOptions|null); - /** EnumDescriptorProto reservedRange. */ - public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; - - /** EnumDescriptorProto reservedName. */ - public reservedName: string[]; - /** * Creates a new EnumDescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -5782,105 +5770,6 @@ export namespace google { public toJSON(): { [k: string]: any }; } - namespace EnumDescriptorProto { - - /** Properties of an EnumReservedRange. */ - interface IEnumReservedRange { - - /** EnumReservedRange start */ - start?: (number|null); - - /** EnumReservedRange end */ - end?: (number|null); - } - - /** Represents an EnumReservedRange. */ - class EnumReservedRange implements IEnumReservedRange { - - /** - * Constructs a new EnumReservedRange. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); - - /** EnumReservedRange start. */ - public start: number; - - /** EnumReservedRange end. */ - public end: number; - - /** - * Creates a new EnumReservedRange instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumReservedRange instance - */ - public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumReservedRange message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Verifies an EnumReservedRange message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumReservedRange - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. - * @param message EnumReservedRange - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumReservedRange to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - /** Properties of an EnumValueDescriptorProto. */ interface IEnumValueDescriptorProto { @@ -6238,9 +6127,6 @@ export namespace google { /** FileOptions pyGenericServices */ pyGenericServices?: (boolean|null); - /** FileOptions phpGenericServices */ - phpGenericServices?: (boolean|null); - /** FileOptions deprecated */ deprecated?: (boolean|null); @@ -6259,15 +6145,6 @@ export namespace google { /** FileOptions phpClassPrefix */ phpClassPrefix?: (string|null); - /** FileOptions phpNamespace */ - phpNamespace?: (string|null); - - /** FileOptions phpMetadataNamespace */ - phpMetadataNamespace?: (string|null); - - /** FileOptions rubyPackage */ - rubyPackage?: (string|null); - /** FileOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -6311,9 +6188,6 @@ export namespace google { /** FileOptions pyGenericServices. */ public pyGenericServices: boolean; - /** FileOptions phpGenericServices. */ - public phpGenericServices: boolean; - /** FileOptions deprecated. */ public deprecated: boolean; @@ -6332,15 +6206,6 @@ export namespace google { /** FileOptions phpClassPrefix. */ public phpClassPrefix: string; - /** FileOptions phpNamespace. */ - public phpNamespace: string; - - /** FileOptions phpMetadataNamespace. */ - public phpMetadataNamespace: string; - - /** FileOptions rubyPackage. */ - public rubyPackage: string; - /** FileOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 02d0bf34b3e..095a37b156f 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC. +// Copyright 2019 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -651,6 +651,42 @@ message PushConfig { // * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. // * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. map attributes = 2; + + // An authentication method used by push endpoints to verify the source of + // push requests. This can be used with push endpoints that are private by + // default to allow requests only from the Cloud Pub/Sub system, for example. + // This field is optional and should be set only by users interested in + // authenticated push. + // EXPERIMENTAL: This field a part of a closed alpha that may not be + // accessible to all users. It may be changed in backward-incompatible ways + // and is not subject to any SLA or deprecation policy. It is not recommended + // for production use. + oneof authentication_method { + // If specified, Pub/Sub will generate and attach an OIDC JWT token as an + // `Authorization` header in the HTTP request for every pushed message. + OidcToken oidc_token = 3; + } + + // Contains information needed for generating an + // [OpenID Connect + // token](https://developers.google.com/identity/protocols/OpenIDConnect). + message OidcToken { + // [Service account + // email](https://cloud.google.com/iam/docs/service-accounts) + // to be used for generating the OIDC token. The caller (for + // CreateSubscription, UpdateSubscription, and ModifyPushConfig calls) must + // have the iam.serviceAccounts.actAs permission for the service account. + // See https://cloud.google.com/iam/docs/understanding-roles#service-accounts-roles. + string service_account_email = 1; + + // Audience to be used when generating OIDC token. The audience claim + // identifies the recipients that the JWT is intended for. The audience + // value is a single case-sensitive string. Having multiple values (array) + // for the audience field is not supported. More info about the OIDC JWT + // token audience here: https://tools.ietf.org/html/rfc7519#section-4.1.3 + // Note: if not specified, the Push endpoint URL will be used. + string audience = 2; + } } // A message and its corresponding acknowledgment ID. diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 43317028d2b..5cbcc397e2b 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -50,14 +50,6 @@ import {noop} from './util'; * terminated by 's'. Example: "3.5s". */ -/** - * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions#PushConfig - */ -export interface PushConfig { - pushEndpoint: string; - attributes?: {[key: string]: string;}; -} - /** * @see https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Duration */ @@ -72,7 +64,7 @@ export interface Duration { export interface TSubscriptionMetadata { name: string; topic: string; - pushConfig?: PushConfig; + pushConfig?: google.pubsub.v1.IPushConfig; ackDeadlineSeconds?: number; retainAckedMessages?: boolean; labels?: {[key: string]: string;}; @@ -675,16 +667,16 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - modifyPushConfig(config: PushConfig, gaxOpts?: CallOptions): + modifyPushConfig(config: google.pubsub.v1.IPushConfig, gaxOpts?: CallOptions): Promise; modifyPushConfig( - config: PushConfig, + config: google.pubsub.v1.IPushConfig, callback: RequestCallback): void; modifyPushConfig( - config: PushConfig, gaxOpts: CallOptions, + config: google.pubsub.v1.IPushConfig, gaxOpts: CallOptions, callback: RequestCallback): void; modifyPushConfig( - config: PushConfig, + config: google.pubsub.v1.IPushConfig, gaxOptsOrCallback?: CallOptions|RequestCallback, callback?: RequestCallback): void|Promise { diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index d3863e4e7f2..c30756dd9b4 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -475,12 +475,47 @@ const ExpirationPolicy = { * * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. * * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. * + * @property {Object} oidcToken + * If specified, Pub/Sub will generate and attach an OIDC JWT token as an + * `Authorization` header in the HTTP request for every pushed message. + * + * This object should have the same structure as [OidcToken]{@link google.pubsub.v1.OidcToken} + * * @typedef PushConfig * @memberof google.pubsub.v1 * @see [google.pubsub.v1.PushConfig definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} */ const PushConfig = { // This is for documentation. Actual contents will be loaded by gRPC. + + /** + * Contains information needed for generating an + * [OpenID Connect + * token](https://developers.google.com/identity/protocols/OpenIDConnect). + * + * @property {string} serviceAccountEmail + * [Service account + * email](https://cloud.google.com/iam/docs/service-accounts) + * to be used for generating the OIDC token. The caller (for + * CreateSubscription, UpdateSubscription, and ModifyPushConfig calls) must + * have the iam.serviceAccounts.actAs permission for the service account. + * See https://cloud.google.com/iam/docs/understanding-roles#service-accounts-roles. + * + * @property {string} audience + * Audience to be used when generating OIDC token. The audience claim + * identifies the recipients that the JWT is intended for. The audience + * value is a single case-sensitive string. Having multiple values (array) + * for the audience field is not supported. More info about the OIDC JWT + * token audience here: https://tools.ietf.org/html/rfc7519#section-4.1.3 + * Note: if not specified, the Push endpoint URL will be used. + * + * @typedef OidcToken + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.PushConfig.OidcToken definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ + OidcToken: { + // This is for documentation. Actual contents will be loaded by gRPC. + } }; /** diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 8b31fe65190..5993b9c77c6 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,26 +1,26 @@ { - "updateTime": "2019-02-13T12:21:35.607578Z", + "updateTime": "2019-02-28T12:18:55.555938Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.13", - "dockerImage": "googleapis/artman@sha256:5fd9aee1d82a00cebf425c8fa431f5457539562f5867ad9c54370f0ec9a7ccaa" + "version": "0.16.14", + "dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "ca61898878f0926dd9dcc68ba90764f17133efe4", - "internalRef": "233680013" + "sha": "9c769d3a0e67e4df9b9e8eee480124c2700a7e6c", + "internalRef": "235997788" } }, { "template": { "name": "node_library", "origin": "synthtool.gcp", - "version": "2019.1.16" + "version": "2019.2.26" } } ], From 1895ab2ebe0677108a606c156894a1503b442854 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 28 Feb 2019 05:35:29 -0800 Subject: [PATCH 0360/1115] feat(message): use precise-date for message publish time (#503) --- handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/subscriber.ts | 104 ++++++++++++++++++++------ handwritten/pubsub/test/subscriber.ts | 33 ++++---- 3 files changed, 95 insertions(+), 43 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d78b01a6db3..035bd35a3d9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,6 +51,7 @@ }, "dependencies": { "@google-cloud/paginator": "^0.1.0", + "@google-cloud/precise-date": "^0.1.0", "@google-cloud/projectify": "^0.3.0", "@google-cloud/promisify": "^0.4.0", "arrify": "^1.0.0", diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index d32191eaf62..2cf542af36b 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import {DateStruct, PreciseDate} from '@google-cloud/precise-date'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisify} from '@google-cloud/promisify'; import {EventEmitter} from 'events'; @@ -46,33 +47,91 @@ export interface PullResponse { receivedMessages: ReceivedMessage[]; } +/** + * Date object with nanosecond precision. Supports all standard Date arguments + * in addition to several custom types. + * + * @external PreciseDate + * @see {@link https://github.com/googleapis/nodejs-precise-date|PreciseDate} + */ /** * Message objects provide a simple interface for users to get message data and * acknowledge the message. * - * @private - * @class - * - * @param {Subscriber} sub The parent subscriber. - * @param {object} message The raw message response. + * @example + * subscription.on('message', message => { + * // { + * // ackId: 'RUFeQBJMJAxESVMrQwsqWBFOBCEhPjA', + * // attributes: {key: 'value'}, + * // data: Buffer.from('Hello, world!), + * // id: '1551297743043', + * // publishTime: new PreciseDate('2019-02-27T20:02:19.029534186Z'), + * // received: 1551297743043, + * // length: 13 + * // } + * }); */ export class Message { ackId: string; attributes: {}; data: Buffer; id: string; - publishTime: Date; + publishTime: PreciseDate; received: number; private _handled: boolean; private _length: number; private _subscriber: Subscriber; + /** + * @hideconstructor + * + * @param {Subscriber} sub The parent subscriber. + * @param {object} message The raw message response. + */ constructor(sub: Subscriber, {ackId, message}: ReceivedMessage) { + /** + * This ID is used to acknowledge the message. + * + * @name Message#ackId + * @type {string} + */ this.ackId = ackId; + /** + * Optional attributes for this message. + * + * @name Message#attributes + * @type {object} + */ this.attributes = message.attributes || {}; + /** + * The message data as a Buffer. + * + * @name Message#data + * @type {Buffer} + */ this.data = message.data; + /** + * ID of the message, assigned by the server when the message is published. + * Guaranteed to be unique within the topic. + * + * @name Message#id + * @type {string} + */ this.id = message.messageId; - this.publishTime = Message.formatTimestamp(message.publishTime); + /** + * The time at which the message was published. + * + * @name Message#publishTime + * @type {external:PreciseDate} + */ + this.publishTime = new PreciseDate(message.publishTime as DateStruct); + /** + * The time at which the message was recieved by the subscription. + * + * @name Message#recieved + * @type {number} + */ this.received = Date.now(); + this._handled = false; this._length = this.data.length; this._subscriber = sub; @@ -81,14 +140,17 @@ export class Message { * The length of the message data. * * @type {number} - * @private */ get length() { return this._length; } /** * Acknowledges the message. - * @private + * + * @example + * subscription.on('message', message => { + * message.ack(); + * }); */ ack(): void { if (!this._handled) { @@ -113,7 +175,16 @@ export class Message { * * @param {number} [delay=0] The desired time to wait before the * redelivery occurs. - * @private + * + * @example + * subscription.on('message', message => { + * message.nack(); + * }); + * + * @example Specify a delay to redeliver the message + * subscription.on('message', message => { + * message.nack(60); // redeliver in 1 minute + * }); */ nack(delay?: number): void { if (!this._handled) { @@ -121,19 +192,6 @@ export class Message { this._subscriber.nack(this, delay); } } - /** - * Formats the protobuf timestamp into a JavaScript date. - * - * @private - * - * @param {object} timestamp The protobuf timestamp. - * @return {date} - */ - static formatTimestamp({nanos = 0, seconds = 0}: protobuf.ITimestamp): Date { - const ms: number = Number(nanos) / 1e6; - const s: number = Number(seconds) * 1000; - return new Date(ms + s); - } } /** diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 78fd8e5bcb2..4204d127749 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -16,6 +16,7 @@ import * as assert from 'assert'; import {EventEmitter} from 'events'; +import {common as protobuf} from 'protobufjs'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {PassThrough} from 'stream'; @@ -115,6 +116,13 @@ class FakeMessageStream extends PassThrough { destroy(error?: Error): void {} } +class FakePreciseDate { + value: protobuf.ITimestamp; + constructor(date: protobuf.ITimestamp) { + this.value = date; + } +} + const RECEIVED_MESSAGE = { ackId: uuid.v4(), message: { @@ -142,6 +150,7 @@ describe('Subscriber', () => { before(() => { const s = proxyquire('../src/subscriber.js', { + '@google-cloud/precise-date': {PreciseDate: FakePreciseDate}, '@google-cloud/projectify': fakeProjectify, './histogram': {Histogram: FakeHistogram}, './lease-manager': {LeaseManager: FakeLeaseManager}, @@ -599,15 +608,12 @@ describe('Subscriber', () => { }); it('should localize publishTime', () => { - const fakeDate = new Date(); - - sandbox.stub(Message, 'formatTimestamp') - .withArgs(RECEIVED_MESSAGE.message.publishTime) - .returns(fakeDate); - const m = new Message(subscriber, RECEIVED_MESSAGE); + const timestamp = m.publishTime as unknown as FakePreciseDate; - assert.strictEqual(m.publishTime, fakeDate); + assert(timestamp instanceof FakePreciseDate); + assert.strictEqual( + timestamp.value, RECEIVED_MESSAGE.message.publishTime); }); it('should localize recieved time', () => { @@ -700,18 +706,5 @@ describe('Subscriber', () => { assert.strictEqual(stub.callCount, 0); }); }); - - describe('formatTimestamp', () => { - it('should format the timestamp object', () => { - const publishTime = RECEIVED_MESSAGE.message.publishTime; - const actual = Message.formatTimestamp(publishTime); - - const ms = publishTime.nanos / 1e6; - const s = publishTime.seconds * 1000; - const expectedDate = new Date(ms + s); - - assert.deepStrictEqual(actual, expectedDate); - }); - }); }); }); From 8d5f3373f5c475e6b16298e5db69552d02e7ab86 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 28 Feb 2019 05:59:15 -0800 Subject: [PATCH 0361/1115] Release @google-cloud/pubsub v0.26.0 (#505) --- handwritten/pubsub/CHANGELOG.md | 19 +++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 148bb188f69..f40bc1aa97c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,25 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.26.0 + +02-28-2019 05:42 PST + +### BREAKING: `message.publishTime` is now represented by a [`PreciseDate`](https://github.com/googleapis/nodejs-precise-date) object. ([#503](https://github.com/googleapis/nodejs-pubsub/pull/503)) + +The `PreciseDate` class extends the native Date object, so most users should be unaffected by this change. The notable differences between PreciseDate and Date objects are: + +- `toISOString()` now returns as a RFC 3339 formatted string. +- Nano and microsecond data is available via `date.getNanoseconds()` and `date.getMicroseconds()` respectively. + +### New Features +- feat(typescript): ship typescript declaration files ([#498](https://github.com/googleapis/nodejs-pubsub/pull/498)) +- feat(subscription): support push config auth methods ([#504](https://github.com/googleapis/nodejs-pubsub/pull/504)) + +### Internal / Testing Changes +- refactor(typescript): noImplicitAny for snapshot and subscriber test file ([#490](https://github.com/googleapis/nodejs-pubsub/pull/490)) +- fix(messageStream): remove call to destroy grpc stream ([#499](https://github.com/googleapis/nodejs-pubsub/pull/499)) + ## v0.25.0 02-20-2019 10:35 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 035bd35a3d9..64b179ae2e3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.25.0", + "version": "0.26.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 08c6591919525799c29bb21d32042a6055bc654c Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Fri, 1 Mar 2019 22:11:47 +0530 Subject: [PATCH 0362/1115] refactor(ts): enable noImplicitAny for IAM test file (#501) --- handwritten/pubsub/test/iam.ts | 39 +++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index a163848cffd..db3556914e4 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -18,12 +18,14 @@ import * as promisify from '@google-cloud/promisify'; import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; +import {PubSub, RequestConfig} from '../src'; +import * as iamTypes from '../src/iam'; import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, promisify, { // tslint:disable-next-line variable-name - promisifyAll(Class) { + promisifyAll(Class: typeof iamTypes.IAM) { if (Class.name === 'IAM') { promisified = true; } @@ -31,14 +33,14 @@ const fakePromisify = Object.assign({}, promisify, { }); describe('IAM', () => { - let IAM; - let iam; + let IAM: typeof iamTypes.IAM; + let iam: iamTypes.IAM; const PUBSUB = { options: {}, Promise: {}, request: util.noop, - }; + } as {} as PubSub; const ID = 'id'; before(() => { @@ -64,12 +66,12 @@ describe('IAM', () => { const fakeRequest = () => {}; const fakePubsub = { request: { - bind(context) { + bind(context: PubSub) { assert.strictEqual(context, fakePubsub); return fakeRequest; }, }, - }; + } as {} as PubSub; const iam = new IAM(fakePubsub, ID); assert.strictEqual(iam.request, fakeRequest); @@ -87,9 +89,10 @@ describe('IAM', () => { describe('getPolicy', () => { it('should make the correct API request', done => { iam.request = (config, callback) => { + const reqOpts = {resource: iam.id}; assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getIamPolicy'); - assert.strictEqual(config.reqOpts.resource, iam.id); + assert.deepStrictEqual(config.reqOpts, reqOpts); callback(); // done() }; @@ -110,20 +113,21 @@ describe('IAM', () => { }); describe('setPolicy', () => { - const policy = {etag: 'ACAB'}; + const policy = {etag: 'ACAB', bindings: []} as iamTypes.Policy; it('should throw an error if a policy is not supplied', () => { assert.throws(() => { - iam.setPolicy(util.noop); + // tslint:disable-next-line no-any + (iam as any).setPolicy(util.noop); }, /A policy object is required\./); }); it('should make the correct API request', done => { iam.request = (config, callback) => { + const reqOpts = {resource: iam.id, policy}; assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'setIamPolicy'); - assert.strictEqual(config.reqOpts.resource, iam.id); - assert.strictEqual(config.reqOpts.policy, policy); + assert.deepStrictEqual(config.reqOpts, reqOpts); callback(); // done() }; @@ -134,7 +138,7 @@ describe('IAM', () => { it('should accept gax options', done => { const gaxOpts = {}; - iam.request = config => { + iam.request = (config: RequestConfig) => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -146,18 +150,19 @@ describe('IAM', () => { describe('testPermissions', () => { it('should throw an error if permissions are missing', () => { assert.throws(() => { - iam.testPermissions(util.noop); + // tslint:disable-next-line no-any + (iam as any).testPermissions(util.noop); }, /Permissions are required\./); }); it('should make the correct API request', done => { const permissions = 'storage.bucket.list'; + const reqOpts = {resource: iam.id, permissions: [permissions]}; iam.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'testIamPermissions'); - assert.strictEqual(config.reqOpts.resource, iam.id); - assert.deepStrictEqual(config.reqOpts.permissions, [permissions]); + assert.deepStrictEqual(config.reqOpts, reqOpts); done(); }; @@ -182,7 +187,7 @@ describe('IAM', () => { const error = new Error('Error.'); const apiResponse = {}; - iam.request = (config, callback) => { + iam.request = (config, callback: Function) => { callback(error, apiResponse); }; @@ -200,7 +205,7 @@ describe('IAM', () => { permissions: ['storage.bucket.consume'], }; - iam.request = (config, callback) => { + iam.request = (config, callback: Function) => { callback(null, apiResponse); }; From eba69ad35fccf127b871162097a9fd1bb9e8c7e8 Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Fri, 1 Mar 2019 22:14:15 +0530 Subject: [PATCH 0363/1115] refactor(ts): enable noImplicitAny for lease-manager test file (#508) --- handwritten/pubsub/test/lease-manager.ts | 81 ++++++++++++------------ 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 02d018931d1..1d6b0cfabea 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -19,6 +19,9 @@ import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; +import * as leaseTypes from '../src/lease-manager'; +import {Message, Subscriber} from '../src/subscriber'; + const FREE_MEM = 9376387072; const fakeos = { freemem: () => FREE_MEM @@ -43,11 +46,11 @@ class FakeMessage { describe('LeaseManager', () => { const sandbox = sinon.createSandbox(); - let subscriber: FakeSubscriber; + let subscriber: Subscriber; // tslint:disable-next-line variable-name - let LeaseManager; - let leaseManager; + let LeaseManager: typeof leaseTypes.LeaseManager; + let leaseManager: leaseTypes.LeaseManager; before(() => { LeaseManager = proxyquire('../src/lease-manager.js', { @@ -58,7 +61,7 @@ describe('LeaseManager', () => { }); beforeEach(() => { - subscriber = new FakeSubscriber(); + subscriber = new FakeSubscriber() as {} as Subscriber; leaseManager = new LeaseManager(subscriber); }); @@ -86,8 +89,8 @@ describe('LeaseManager', () => { it('should return the number of pending messages', () => { leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); - leaseManager.add(new FakeMessage()); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); + leaseManager.add(new FakeMessage() as Message); assert.strictEqual(leaseManager.pending, 1); }); @@ -95,8 +98,8 @@ describe('LeaseManager', () => { describe('size', () => { it('should return the number of messages', () => { - leaseManager.add(new FakeMessage()); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); + leaseManager.add(new FakeMessage() as Message); assert.strictEqual(leaseManager.size, 2); }); @@ -104,7 +107,7 @@ describe('LeaseManager', () => { describe('add', () => { it('should update the bytes/size values', () => { - const message = new FakeMessage(); + const message = new FakeMessage() as Message; leaseManager.add(message); @@ -113,7 +116,7 @@ describe('LeaseManager', () => { }); it('should dispatch the message if allowExcessMessages is true', done => { - const fakeMessage = new FakeMessage(); + const fakeMessage = new FakeMessage() as Message; leaseManager.isFull = () => true; leaseManager.setOptions({allowExcessMessages: true}); @@ -127,7 +130,7 @@ describe('LeaseManager', () => { }); it('should dispatch the message if the inventory is not full', done => { - const fakeMessage = new FakeMessage(); + const fakeMessage = new FakeMessage() as Message; leaseManager.isFull = () => false; leaseManager.setOptions({allowExcessMessages: false}); @@ -141,7 +144,7 @@ describe('LeaseManager', () => { }); it('should not dispatch the message if the inventory is full', done => { - const fakeMessage = new FakeMessage(); + const fakeMessage = new FakeMessage() as Message; leaseManager.isFull = () => true; leaseManager.setOptions({allowExcessMessages: false}); @@ -155,7 +158,7 @@ describe('LeaseManager', () => { }); it('should not dispatch the message if the sub closes', done => { - const fakeMessage = new FakeMessage(); + const fakeMessage = new FakeMessage() as Message; leaseManager.isFull = () => false; @@ -172,7 +175,7 @@ describe('LeaseManager', () => { leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); leaseManager.on('full', done); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); }); describe('extending deadlines', () => { @@ -192,7 +195,7 @@ describe('LeaseManager', () => { }); it('should schedule a lease extension', () => { - const message = new FakeMessage(); + const message = new FakeMessage() as Message; const stub = sandbox.stub(message, 'modAck').withArgs(subscriber.ackDeadline); @@ -209,7 +212,7 @@ describe('LeaseManager', () => { // since only 1 timeout should be set, even if add messages at different // times, they should all get extended at the same time messages.forEach(message => { - leaseManager.add(message); + leaseManager.add(message as Message); clock.tick(halfway); }); @@ -225,7 +228,7 @@ describe('LeaseManager', () => { const badMessages = [new FakeMessage(), new FakeMessage()]; leaseManager.setOptions({maxExtension}); - badMessages.forEach(message => leaseManager.add(message)); + badMessages.forEach(message => leaseManager.add(message as Message)); clock.tick(halfway); // only message that shouldn't be forgotten @@ -233,7 +236,7 @@ describe('LeaseManager', () => { const removeStub = sandbox.stub(leaseManager, 'remove'); const modAckStub = sandbox.stub(goodMessage, 'modAck'); - leaseManager.add(goodMessage); + leaseManager.add(goodMessage as Message); clock.tick(halfway); // make sure the expired messages were forgotten @@ -253,7 +256,7 @@ describe('LeaseManager', () => { const stub = sandbox.stub(message, 'modAck').withArgs(subscriber.ackDeadline); - leaseManager.add(message); + leaseManager.add(message as Message); clock.tick(expectedTimeout); assert.strictEqual(stub.callCount, 1); @@ -265,8 +268,8 @@ describe('LeaseManager', () => { describe('clear', () => { it('should completely clear out the inventory', () => { - leaseManager.add(new FakeMessage()); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); + leaseManager.add(new FakeMessage() as Message); leaseManager.clear(); assert.strictEqual(leaseManager.bytes, 0); @@ -275,7 +278,7 @@ describe('LeaseManager', () => { it('should emit the free event if it was full', done => { leaseManager.setOptions({maxMessages: 1}); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); leaseManager.on('free', done); setImmediate(() => leaseManager.clear()); @@ -285,7 +288,7 @@ describe('LeaseManager', () => { const clock = sandbox.useFakeTimers(); const stub = sandbox.stub(subscriber, 'modAck').resolves(); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); leaseManager.clear(); // this would otherwise trigger a minimum of 2 modAcks @@ -300,8 +303,8 @@ describe('LeaseManager', () => { const maxMessages = 1; leaseManager.setOptions({maxMessages}); - leaseManager.add(new FakeMessage()); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); + leaseManager.add(new FakeMessage() as Message); assert.strictEqual(leaseManager.isFull(), true); }); @@ -311,7 +314,7 @@ describe('LeaseManager', () => { const maxBytes = message.length - 1; leaseManager.setOptions({maxBytes}); - leaseManager.add(message); + leaseManager.add(message as Message); assert.strictEqual(leaseManager.isFull(), true); }); @@ -322,7 +325,7 @@ describe('LeaseManager', () => { const maxBytes = message.length + 1; leaseManager.setOptions({maxMessages, maxBytes}); - leaseManager.add(message); + leaseManager.add(message as Message); assert.strictEqual(leaseManager.isFull(), false); }); @@ -332,15 +335,15 @@ describe('LeaseManager', () => { it('should noop for unknown messages', () => { const message = new FakeMessage(); - leaseManager.add(message); - leaseManager.remove(new FakeMessage()); + leaseManager.add(message as Message); + leaseManager.remove(new FakeMessage() as Message); assert.strictEqual(leaseManager.size, 1); assert.strictEqual(leaseManager.bytes, message.length); }); it('should update the bytes/size values', () => { - const message = new FakeMessage(); + const message = new FakeMessage() as Message; leaseManager.add(message); leaseManager.remove(message); @@ -350,7 +353,7 @@ describe('LeaseManager', () => { }); it('should emit the free event if there is free space', done => { - const message = new FakeMessage(); + const message = new FakeMessage() as Message; leaseManager.setOptions({maxMessages: 1}); leaseManager.add(message); @@ -363,7 +366,7 @@ describe('LeaseManager', () => { }); it('should remove a message from the pending state', done => { - const pending = new FakeMessage(); + const pending = new FakeMessage() as Message; leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); @@ -373,7 +376,7 @@ describe('LeaseManager', () => { } }); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); leaseManager.add(pending); leaseManager.remove(pending); @@ -382,8 +385,8 @@ describe('LeaseManager', () => { }); it('should dispense a pending messages', done => { - const temp = new FakeMessage(); - const pending = new FakeMessage(); + const temp = new FakeMessage() as Message; + const pending = new FakeMessage() as Message; leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); @@ -404,7 +407,7 @@ describe('LeaseManager', () => { it('should cancel any extensions if no messages are left', () => { const clock = sandbox.useFakeTimers(); - const message = new FakeMessage(); + const message = new FakeMessage() as Message; const stub = sandbox.stub(subscriber, 'modAck').resolves(); leaseManager.add(message); @@ -420,7 +423,7 @@ describe('LeaseManager', () => { it('should allow excess messages by default', () => {}); it('should default maxBytes to 20% of free memory', () => { - const littleMessage = new FakeMessage(); + const littleMessage = new FakeMessage() as Message; const bigMessage = new FakeMessage(); leaseManager.add(littleMessage); @@ -428,14 +431,14 @@ describe('LeaseManager', () => { leaseManager.remove(littleMessage); bigMessage.length = FREE_MEM * 0.21; - leaseManager.add(bigMessage); + leaseManager.add(bigMessage as Message); assert.strictEqual(leaseManager.isFull(), true); }); it('should cap maxMessages at 100', () => { for (let i = 0; i < 100; i++) { assert.strictEqual(leaseManager.isFull(), false); - leaseManager.add(new FakeMessage()); + leaseManager.add(new FakeMessage() as Message); } assert.strictEqual(leaseManager.isFull(), true); From 02c4d4e332bf8b8fc6d64a771be2246b391a320a Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Fri, 1 Mar 2019 22:15:10 +0530 Subject: [PATCH 0364/1115] refactor(ts): enable noImplicitAny for Histogram and Message_queues test file (#510) --- handwritten/pubsub/test/histogram.ts | 2 +- handwritten/pubsub/test/message-queues.ts | 61 +++++++++++++---------- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/handwritten/pubsub/test/histogram.ts b/handwritten/pubsub/test/histogram.ts index 65a6115ba14..44b1432b825 100644 --- a/handwritten/pubsub/test/histogram.ts +++ b/handwritten/pubsub/test/histogram.ts @@ -18,7 +18,7 @@ import * as assert from 'assert'; import {Histogram} from '../src/histogram.js'; describe('Histogram', () => { - let histogram; + let histogram: Histogram; const MIN_VALUE = 10000; const MAX_VALUE = 600000; diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 1ecdc31e738..c7ab64472dd 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -16,16 +16,24 @@ import * as assert from 'assert'; import {EventEmitter} from 'events'; +import {CallOptions} from 'google-gax'; import {Metadata, ServiceError} from 'grpc'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import * as uuid from 'uuid'; +import * as messageTypes from '../src/message-queues'; import {BatchError} from '../src/message-queues'; +import {Message, Subscriber} from '../src/subscriber'; class FakeClient { - async acknowledge(reqOpts, callOptions): Promise {} - async modifyAckDeadline(reqOpts, callOptions): Promise {} + async acknowledge( + reqOpts: {subscription: string, ackIds: string[]}, + callOptions: CallOptions): Promise {} + async modifyAckDeadline( + reqOpts: + {subscription: string, ackIds: string[], ackDeadlineSeconds: number}, + callOptions: CallOptions): Promise {} } class FakeSubscriber extends EventEmitter { @@ -52,14 +60,14 @@ class FakeMessage { describe('MessageQueues', () => { const sandbox = sinon.createSandbox(); - let subscriber; + let subscriber: FakeSubscriber; + // tslint:disable-next-line variable-name no-any + let MessageQueue: any; // tslint:disable-next-line variable-name - let MessageQueue; + let AckQueue: typeof messageTypes.AckQueue; // tslint:disable-next-line variable-name - let AckQueue; - // tslint:disable-next-line variable-name - let ModAckQueue; + let ModAckQueue: typeof messageTypes.ModAckQueue; before(() => { const queues = proxyquire('../src/message-queues.js', {}); @@ -84,7 +92,7 @@ describe('MessageQueues', () => { afterEach(() => sandbox.restore()); describe('MessageQueue', () => { - let messageQueue; + let messageQueue: typeof MessageQueue; beforeEach(() => { messageQueue = new MessageQueue(subscriber); @@ -116,7 +124,7 @@ describe('MessageQueues', () => { describe('add', () => { it('should increase the number of pending requests', () => { - messageQueue.add(new FakeMessage()); + messageQueue.add(new FakeMessage() as Message); assert.strictEqual(messageQueue.numPendingRequests, 1); }); @@ -124,7 +132,7 @@ describe('MessageQueues', () => { const stub = sandbox.stub(messageQueue, 'flush'); messageQueue.setOptions({maxMessages: 1}); - messageQueue.add(new FakeMessage()); + messageQueue.add(new FakeMessage() as Message); assert.strictEqual(stub.callCount, 1); }); @@ -135,7 +143,7 @@ describe('MessageQueues', () => { const delay = 1000; messageQueue.setOptions({maxMilliseconds: delay}); - messageQueue.add(new FakeMessage()); + messageQueue.add(new FakeMessage() as Message); assert.strictEqual(stub.callCount, 0); clock.tick(delay); @@ -150,7 +158,7 @@ describe('MessageQueues', () => { const delay = 1000; messageQueue.setOptions({maxMilliseconds: delay}); - messageQueue.add(new FakeMessage()); + messageQueue.add(new FakeMessage() as Message); messageQueue.flush(); clock.tick(delay); @@ -158,7 +166,7 @@ describe('MessageQueues', () => { }); it('should remove the messages from the queue', () => { - messageQueue.add(new FakeMessage()); + messageQueue.add(new FakeMessage() as Message); messageQueue.flush(); assert.strictEqual(messageQueue.numPendingRequests, 0); @@ -168,7 +176,7 @@ describe('MessageQueues', () => { const message = new FakeMessage(); const deadline = 10; - messageQueue.add(message, deadline); + messageQueue.add(message as Message, deadline); messageQueue.flush(); const expectedBatch = [[message.ackId, deadline]]; @@ -263,10 +271,10 @@ describe('MessageQueues', () => { }); describe('AckQueue', () => { - let ackQueue; + let ackQueue: messageTypes.AckQueue; beforeEach(() => { - ackQueue = new AckQueue(subscriber); + ackQueue = new AckQueue(subscriber as {} as Subscriber); }); it('should send batches via Client#acknowledge', async () => { @@ -282,7 +290,7 @@ describe('MessageQueues', () => { ackIds: messages.map(({ackId}) => ackId), }; - messages.forEach(message => ackQueue.add(message)); + messages.forEach(message => ackQueue.add(message as Message)); await ackQueue.flush(); const [reqOpts] = stub.lastCall.args; @@ -326,16 +334,16 @@ describe('MessageQueues', () => { done(); }); - messages.forEach(message => ackQueue.add(message)); + messages.forEach(message => ackQueue.add(message as Message)); ackQueue.flush(); }); }); describe('ModAckQueue', () => { - let modAckQueue; + let modAckQueue: messageTypes.ModAckQueue; beforeEach(() => { - modAckQueue = new ModAckQueue(subscriber); + modAckQueue = new ModAckQueue(subscriber as {} as Subscriber); }); it('should send batches via Client#modifyAckDeadline', async () => { @@ -355,7 +363,8 @@ describe('MessageQueues', () => { ackIds: messages.map(({ackId}) => ackId), }; - messages.forEach(message => modAckQueue.add(message, deadline)); + messages.forEach( + message => modAckQueue.add(message as Message, deadline)); await modAckQueue.flush(); const [reqOpts] = stub.lastCall.args; @@ -386,8 +395,10 @@ describe('MessageQueues', () => { ackIds: messages2.map(({ackId}) => ackId), }; - messages1.forEach(message => modAckQueue.add(message, deadline1)); - messages2.forEach(message => modAckQueue.add(message, deadline2)); + messages1.forEach( + message => modAckQueue.add(message as Message, deadline1)); + messages2.forEach( + message => modAckQueue.add(message as Message, deadline2)); await modAckQueue.flush(); const [reqOpts1] = stub.getCall(0).args; @@ -403,7 +414,7 @@ describe('MessageQueues', () => { sandbox.stub(subscriber.client, 'modifyAckDeadline').resolves(); modAckQueue.setOptions({callOptions: fakeCallOptions}); - modAckQueue.add(new FakeMessage(), 10); + modAckQueue.add(new FakeMessage() as Message, 10); await modAckQueue.flush(); const [, callOptions] = stub.lastCall.args; @@ -436,7 +447,7 @@ describe('MessageQueues', () => { done(); }); - messages.forEach(message => modAckQueue.add(message)); + messages.forEach(message => modAckQueue.add(message as Message)); modAckQueue.flush(); }); }); From f0e286148f29fca6e19425e310e58b94f2031ae5 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Fri, 1 Mar 2019 08:53:30 -0800 Subject: [PATCH 0365/1115] docs: update comments on protos (#509) --- .../protos/google/pubsub/v1/pubsub.proto | 50 +++++++++++-------- .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 9 ++-- .../pubsub/src/v1/subscriber_client.js | 17 ++++--- handwritten/pubsub/synth.metadata | 6 +-- 4 files changed, 46 insertions(+), 36 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 095a37b156f..9d79638f8fd 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -32,7 +32,6 @@ option java_package = "com.google.pubsub.v1"; option php_namespace = "Google\\Cloud\\PubSub\\V1"; option ruby_package = "Google::Cloud::PubSub::V1"; - // The service that an application uses to manipulate topics, and to send // messages to a topic. service Publisher { @@ -79,7 +78,8 @@ service Publisher { } // Lists the names of the subscriptions on this topic. - rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) returns (ListTopicSubscriptionsResponse) { + rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) + returns (ListTopicSubscriptionsResponse) { option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}/subscriptions" }; @@ -94,7 +94,8 @@ service Publisher { // BETA: This feature is part of a beta release. This API might be // changed in backward-incompatible ways and is not recommended for production // use. It is not subject to any SLA or deprecation policy. - rpc ListTopicSnapshots(ListTopicSnapshotsRequest) returns (ListTopicSnapshotsResponse) { + rpc ListTopicSnapshots(ListTopicSnapshotsRequest) + returns (ListTopicSnapshotsResponse) { option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}/snapshots" }; @@ -125,9 +126,10 @@ service Subscriber { // If the name is not provided in the request, the server will assign a random // name for this subscription on the same project as the topic, conforming // to the - // [resource name format](https://cloud.google.com/pubsub/docs/admin#resource_names). - // The generated name is populated in the returned Subscription object. - // Note that for REST API requests, you must specify a name in the request. + // [resource name + // format](https://cloud.google.com/pubsub/docs/admin#resource_names). The + // generated name is populated in the returned Subscription object. Note that + // for REST API requests, you must specify a name in the request. rpc CreateSubscription(Subscription) returns (Subscription) { option (google.api.http) = { put: "/v1/{name=projects/*/subscriptions/*}" @@ -152,7 +154,8 @@ service Subscriber { } // Lists matching subscriptions. - rpc ListSubscriptions(ListSubscriptionsRequest) returns (ListSubscriptionsResponse) { + rpc ListSubscriptions(ListSubscriptionsRequest) + returns (ListSubscriptionsResponse) { option (google.api.http) = { get: "/v1/{project=projects/*}/subscriptions" }; @@ -163,7 +166,8 @@ service Subscriber { // `NOT_FOUND`. After a subscription is deleted, a new one may be created with // the same name, but the new one has no association with the old // subscription or its topic unless the same topic is specified. - rpc DeleteSubscription(DeleteSubscriptionRequest) returns (google.protobuf.Empty) { + rpc DeleteSubscription(DeleteSubscriptionRequest) + returns (google.protobuf.Empty) { option (google.api.http) = { delete: "/v1/{subscription=projects/*/subscriptions/*}" }; @@ -174,7 +178,8 @@ service Subscriber { // subscriber, or to make the message available for redelivery if the // processing was interrupted. Note that this does not modify the // subscription-level `ackDeadlineSeconds` used for subsequent messages. - rpc ModifyAckDeadline(ModifyAckDeadlineRequest) returns (google.protobuf.Empty) { + rpc ModifyAckDeadline(ModifyAckDeadlineRequest) + returns (google.protobuf.Empty) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline" body: "*" @@ -212,8 +217,8 @@ service Subscriber { // reassign server-side resources, in which case, the client should // re-establish the stream. Flow control can be achieved by configuring the // underlying RPC channel. - rpc StreamingPull(stream StreamingPullRequest) returns (stream StreamingPullResponse) { - } + rpc StreamingPull(stream StreamingPullRequest) + returns (stream StreamingPullResponse) {} // Modifies the `PushConfig` for a specified subscription. // @@ -221,7 +226,8 @@ service Subscriber { // an empty `PushConfig`) or vice versa, or change the endpoint URL and other // attributes of a push subscription. Messages will accumulate for delivery // continuously through the call regardless of changes to the `PushConfig`. - rpc ModifyPushConfig(ModifyPushConfigRequest) returns (google.protobuf.Empty) { + rpc ModifyPushConfig(ModifyPushConfigRequest) + returns (google.protobuf.Empty) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig" body: "*" @@ -275,9 +281,10 @@ service Subscriber { // the request, the server will assign a random // name for this snapshot on the same project as the subscription, conforming // to the - // [resource name format](https://cloud.google.com/pubsub/docs/admin#resource_names). - // The generated name is populated in the returned Snapshot object. Note that - // for REST API requests, you must specify a name in the request. + // [resource name + // format](https://cloud.google.com/pubsub/docs/admin#resource_names). The + // generated name is populated in the returned Snapshot object. Note that for + // REST API requests, you must specify a name in the request. rpc CreateSnapshot(CreateSnapshotRequest) returns (Snapshot) { option (google.api.http) = { put: "/v1/{name=projects/*/snapshots/*}" @@ -576,7 +583,8 @@ message Subscription { // messages are not expunged from the subscription's backlog, even if they are // acknowledged, until they fall out of the `message_retention_duration` // window. This must be true if you would like to - // + // // Seek to a timestamp. //

// BETA: This feature is part of a beta release. This API might be @@ -872,9 +880,9 @@ message StreamingPullResponse { } // Request for the `CreateSnapshot` method.

-// BETA: This feature is part of a beta release. This API might be changed in -// backward-incompatible ways and is not recommended for production use. -// It is not subject to any SLA or deprecation policy. +// BETA: This feature is part of a beta release. This API might be +// changed in backward-incompatible ways and is not recommended for production +// use. It is not subject to any SLA or deprecation policy. message CreateSnapshotRequest { // Optional user-provided name for this snapshot. // If the name is not provided in the request, the server will assign a random @@ -1028,6 +1036,4 @@ message SeekRequest { } // Response for the `Seek` method (this response is empty). -message SeekResponse { - -} +message SeekResponse {} diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index c30756dd9b4..938a76bbe03 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -378,7 +378,8 @@ const DeleteTopicRequest = { * messages are not expunged from the subscription's backlog, even if they are * acknowledged, until they fall out of the `message_retention_duration` * window. This must be true if you would like to - * + * * Seek to a timestamp. *

* BETA: This feature is part of a beta release. This API might be @@ -820,9 +821,9 @@ const StreamingPullResponse = { /** * Request for the `CreateSnapshot` method.

- * BETA: This feature is part of a beta release. This API might be changed in - * backward-incompatible ways and is not recommended for production use. - * It is not subject to any SLA or deprecation policy. + * BETA: This feature is part of a beta release. This API might be + * changed in backward-incompatible ways and is not recommended for production + * use. It is not subject to any SLA or deprecation policy. * * @property {string} name * Optional user-provided name for this snapshot. diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 597a9c0f916..e826a5c4e13 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -291,9 +291,10 @@ class SubscriberClient { * If the name is not provided in the request, the server will assign a random * name for this subscription on the same project as the topic, conforming * to the - * [resource name format](https://cloud.google.com/pubsub/docs/admin#resource_names). - * The generated name is populated in the returned Subscription object. - * Note that for REST API requests, you must specify a name in the request. + * [resource name + * format](https://cloud.google.com/pubsub/docs/admin#resource_names). The + * generated name is populated in the returned Subscription object. Note that + * for REST API requests, you must specify a name in the request. * * @param {Object} request * The request object that will be sent. @@ -341,7 +342,8 @@ class SubscriberClient { * messages are not expunged from the subscription's backlog, even if they are * acknowledged, until they fall out of the `message_retention_duration` * window. This must be true if you would like to - * + * * Seek to a timestamp. *

* BETA: This feature is part of a beta release. This API might be @@ -1180,9 +1182,10 @@ class SubscriberClient { * the request, the server will assign a random * name for this snapshot on the same project as the subscription, conforming * to the - * [resource name format](https://cloud.google.com/pubsub/docs/admin#resource_names). - * The generated name is populated in the returned Snapshot object. Note that - * for REST API requests, you must specify a name in the request. + * [resource name + * format](https://cloud.google.com/pubsub/docs/admin#resource_names). The + * generated name is populated in the returned Snapshot object. Note that for + * REST API requests, you must specify a name in the request. * * @param {Object} request * The request object that will be sent. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 5993b9c77c6..957eb402b9a 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-02-28T12:18:55.555938Z", + "updateTime": "2019-03-01T12:18:24.808590Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "9c769d3a0e67e4df9b9e8eee480124c2700a7e6c", - "internalRef": "235997788" + "sha": "41d72d444fbe445f4da89e13be02078734fb7875", + "internalRef": "236230004" } }, { From b5811ed65ca5f0a6bffc8ef0183ce95e9364f738 Mon Sep 17 00:00:00 2001 From: Alex <7764119+AVaksman@users.noreply.github.com> Date: Fri, 1 Mar 2019 12:15:19 -0500 Subject: [PATCH 0366/1115] fix(ts): fix getPolicy promise return signature (#511) --- handwritten/pubsub/src/iam.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 5dc0365e0db..335e58bddf1 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -176,7 +176,7 @@ export class IAM { this.id = id; } - getPolicy(gaxOpts?: CallOptions): Promise; + getPolicy(gaxOpts?: CallOptions): Promise; getPolicy(callback: GetPolicyCallback): void; getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; /** @@ -211,7 +211,7 @@ export class IAM { */ getPolicy( gaxOptsOrCallback?: CallOptions|GetPolicyCallback, - callback?: GetPolicyCallback): Promise|void { + callback?: GetPolicyCallback): Promise|void { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = From ed6c5406f821d11d2ea1f0d7fb1668d9b4784753 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 1 Mar 2019 12:22:47 -0800 Subject: [PATCH 0367/1115] fix(docs): ensure docs are not removed by typescript (#512) --- handwritten/pubsub/src/iam.ts | 70 ++++++------ handwritten/pubsub/src/index.ts | 58 ++++------ handwritten/pubsub/src/snapshot.ts | 17 +-- handwritten/pubsub/src/subscription.ts | 141 +++++++++++++------------ handwritten/pubsub/src/topic.ts | 82 ++++++++------ 5 files changed, 186 insertions(+), 182 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 335e58bddf1..94d887496a0 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -23,46 +23,21 @@ import * as arrify from 'arrify'; import {CallOptions} from 'google-gax'; import {PubSub} from '.'; -/** - * @callback GetPolicyCallback - * @param {?Error} err Request error, if any. - * @param {object} acl The policy. - */ export interface GetPolicyCallback { (err?: Error|null, acl?: Policy|null): void; } -/** - * @callback SetPolicyCallback - * @param {?Error} err Request error, if any. - * @param {object} acl The policy. - */ export interface SetPolicyCallback { (err?: Error|null, acl?: Policy|null): void; } -/** - * @typedef {array} SetPolicyResponse - * @property {object} 0 The policy. - */ export type SetPolicyResponse = [Policy]; - -/** - * @typedef {array} GetPolicyResponse - * @property {object} 0 The policy. - */ export type GetPolicyResponse = [Policy]; -/** - * @typedef {string[]} PermissionsResponse - * A subset of TestPermissionsRequest.permissions that the caller is allowed. - * @see https://cloud.google.com/pubsub/docs/reference/rpc/google.iam.v1#google.iam.v1.TestIamPermissionsRequest - */ export interface PermissionsResponse { permissions: string|string[]; } - /** * Shows which IAM permissions is allowed. * The key to this object are the IAM permissions (string) and the values are @@ -72,19 +47,8 @@ export type IamPermissionsMap = { [key: string]: boolean }; -/** - * @typedef {array} TestIamPermissionsResponse - * @property {object[]} 0 A subset of permissions that the caller is allowed. - * @property {PermissionsResponse} 1 The full API response. - */ export type TestIamPermissionsResponse = [PermissionsResponse]; -/** - * @callback TestIamPermissionsCallback - * @param {?Error} err Request error, if any. - * @param {TestIamPermissionsAPIResponse} permissions A subset of permissions that the caller is allowed. - * @param {PermissionsResponse} apiResponse The full API response. - */ export interface TestIamPermissionsCallback { (err?: Error|null, permissions?: IamPermissionsMap|null, apiResponse?: PermissionsResponse): void; @@ -179,6 +143,15 @@ export class IAM { getPolicy(gaxOpts?: CallOptions): Promise; getPolicy(callback: GetPolicyCallback): void; getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; + /** + * @typedef {array} GetPolicyResponse + * @property {object} 0 The policy. + */ + /** + * @callback GetPolicyCallback + * @param {?Error} err Request error, if any. + * @param {object} acl The policy. + */ /** * Get the IAM policy * @@ -235,6 +208,15 @@ export class IAM { setPolicy(policy: Policy, gaxOpts: CallOptions, callback: SetPolicyCallback): void; setPolicy(policy: Policy, callback: SetPolicyCallback): void; + /** + * @typedef {array} SetPolicyResponse + * @property {object} 0 The policy. + */ + /** + * @callback SetPolicyCallback + * @param {?Error} err Request error, if any. + * @param {object} acl The policy. + */ /** * Set the IAM policy * @@ -317,6 +299,22 @@ export class IAM { callback: TestIamPermissionsCallback): void; testPermissions( permissions: string|string[], callback: TestIamPermissionsCallback): void; + /** + * @callback TestIamPermissionsCallback + * @param {?Error} err Request error, if any. + * @param {TestIamPermissionsAPIResponse} permissions A subset of permissions that the caller is allowed. + * @param {PermissionsResponse} apiResponse The full API response. + */ + /** + * @typedef {array} TestIamPermissionsResponse + * @property {object[]} 0 A subset of permissions that the caller is allowed. + * @property {PermissionsResponse} 1 The full API response. + */ + /** + * @typedef {string[]} PermissionsResponse + * A subset of TestPermissionsRequest.permissions that the caller is allowed. + * @see https://cloud.google.com/pubsub/docs/reference/rpc/google.iam.v1#google.iam.v1.TestIamPermissionsRequest + */ /** * Test a set of permissions for a resource. * diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 20d79d14d55..3a60e11737d 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -109,7 +109,6 @@ export interface Attributes { [key: string]: string; } - export interface SubscriptionCallOptions { flowControl?: FlowControlOptions; maxConnections?: number; @@ -120,24 +119,11 @@ export interface SubscriptionCallOptions { batching?: BatchPublishOptions; } - - -/** - * @callback CreateSnapshotCallback - * @param {?Error} err Request error, if any. - * @param {Snapshot} snapshot - * @param {object} apiResponse The full API response. - */ export interface CreateSnapshotCallback { (err: Error|null, snapshot?: Snapshot|null, apiResponse?: google.pubsub.v1.ISnapshot): void; } -/** - * @typedef {array} CreateSnapshotResponse - * @property {Snapshot}. - * @property {object} 1 The full API response. - */ export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.ISnapshot]; /** @@ -150,30 +136,13 @@ const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; // tslint:disable-next-line:no-any export type Metadata = any; -/** - * @typedef {array} CreateTopicResponse - * @property {Topic} 0 The new {@link Topic}. - * @property {object} 1 The full API response. - */ export type CreateTopicResponse = [Topic, google.pubsub.v1.ITopic]; -/** - * @callback CreateTopicCallback - * @param {?Error} err Request error, if any. - * @param {Topic} topic The new {@link Topic}. - * @param {object} apiResponse The full API response. - */ export interface CreateTopicCallback { (err?: Error|null, topic?: Topic|null, apiResponse?: google.pubsub.v1.ITopic): void; } -/** - * @callback CreateSubscriptionCallback - * @param {?Error} err Request error, if any. - * @param {Subscription} Subscription - * @param {object} apiResponse The full API response. - */ export interface CreateSubscriptionCallback { (err?: Error|null, subscription?: Subscription|null, apiResponse?: google.pubsub.v1.ISubscription): void; @@ -197,11 +166,6 @@ export interface RequestCallback { (err?: Error|null, res?: TResponse|null): void; } -/** - * @typedef {array} CreateSubscriptionResponse - * @property {Subscription} 0 The new {@link Subscription}. - * @property {object} 1 The full API response. - */ export type CreateSubscriptionResponse = [Subscription, google.pubsub.v1.ISubscription]; @@ -345,6 +309,17 @@ export class PubSub { createSubscription( topic: Topic|string, name: string, callback: CreateSubscriptionCallback): void; + /** + * @typedef {array} CreateSubscriptionResponse + * @property {Subscription} 0 The new {@link Subscription}. + * @property {object} 1 The full API response. + */ + /** + * @callback CreateSubscriptionCallback + * @param {?Error} err Request error, if any. + * @param {Subscription} Subscription + * @param {object} apiResponse The full API response. + */ /** * Options for creating a subscription. * @@ -470,6 +445,17 @@ export class PubSub { createTopic( name: string, gaxOpts: CallOptions, callback?: CreateTopicCallback): void; createTopic(name: string, callback: CreateTopicCallback): void; + /** + * @typedef {array} CreateTopicResponse + * @property {Topic} 0 The new {@link Topic}. + * @property {object} 1 The full API response. + */ + /** + * @callback CreateTopicCallback + * @param {?Error} err Request error, if any. + * @param {Topic} topic The new {@link Topic}. + * @param {object} apiResponse The full API response. + */ /** * Create a topic with the given name. * diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index b5940397cd4..275ee2dcab3 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -101,6 +101,8 @@ export class Snapshot { this.name = Snapshot.formatName_(parent.projectId, name); } + delete(): Promise; + delete(callback: RequestCallback): void; /** * Delete the snapshot. * @@ -120,8 +122,6 @@ export class Snapshot { * const apiResponse = data[0]; * }); */ - delete(): Promise; - delete(callback: RequestCallback): void; delete(callback?: RequestCallback): void|Promise { const reqOpts = { @@ -136,6 +136,7 @@ export class Snapshot { }, callback); } + /*@ * Format the name of a snapshot. A snapshot's full name is in the format of * projects/{projectId}/snapshots/{snapshotName} @@ -146,6 +147,9 @@ export class Snapshot { return 'projects/' + projectId + '/snapshots/' + name.split('/').pop(); } + create(gaxOpts?: CallOptions): Promise; + create(callback: CreateSnapshotCallback): void; + create(gaxOpts: CallOptions, callback: CreateSnapshotCallback): void; /** * Create a snapshot with the given name. * @@ -181,9 +185,6 @@ export class Snapshot { * const apiResponse = data[1]; * }); */ - create(gaxOpts?: CallOptions): Promise; - create(callback: CreateSnapshotCallback): void; - create(gaxOpts: CallOptions, callback: CreateSnapshotCallback): void; create( gaxOpts?: CallOptions|CreateSnapshotCallback, callback?: CreateSnapshotCallback): void|Promise { @@ -195,6 +196,9 @@ export class Snapshot { .createSnapshot(this.name, gaxOpts! as CallOptions, callback!); } + seek(gaxOpts?: CallOptions): Promise; + seek(callback: SeekCallback): void; + seek(gaxOpts: CallOptions, callback: SeekCallback): void; /** * Seeks an existing subscription to the snapshot. * @@ -220,9 +224,6 @@ export class Snapshot { * const apiResponse = data[0]; * }); */ - seek(gaxOpts?: CallOptions): Promise; - seek(callback: SeekCallback): void; - seek(gaxOpts: CallOptions, callback: SeekCallback): void; seek(gaxOpts?: CallOptions|SeekCallback, callback?: SeekCallback): void|Promise { if (!(this.parent instanceof Subscription)) { diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 5cbcc397e2b..8fb1e2e8a95 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -29,27 +29,6 @@ import {Snapshot} from './snapshot'; import {Subscriber, SubscriberOptions} from './subscriber'; import {noop} from './util'; - -/** - * @typedef {object} ExpirationPolicy - * A policy that specifies the conditions for this subscription's expiration. A - * subscription is considered active as long as any connected subscriber is - * successfully consuming messages from the subscription or is issuing - * operations on the subscription. If expirationPolicy is not set, a default - * policy with ttl of 31 days will be used. The minimum allowed value for - * expirationPolicy.ttl is 1 day. BETA: This feature is part of a beta release. - * This API might be changed in backward-incompatible ways and is not - * recommended for production use. It is not subject to any SLA or deprecation - * policy. - * @property {string} ttl Specifies the "time-to-live" duration for an associated - * resource. The resource expires if it is not active for a period of ttl. The - * eeedefinition of "activity" depends on the type of the associated resource. - * The minimum and maximum allowed values for ttl depend on the type of the - * associated resource, as well. If ttl is not set, the associated resource - * never expires. A duration in seconds with up to nine fractional digits, - * terminated by 's'. Example: "3.5s". - */ - /** * @see https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Duration */ @@ -83,6 +62,25 @@ export interface SubscriptionMetadata extends TSubscriptionMetadata { messageRetentionDuration?: Duration; } +/** + * @typedef {object} ExpirationPolicy + * A policy that specifies the conditions for this subscription's expiration. A + * subscription is considered active as long as any connected subscriber is + * successfully consuming messages from the subscription or is issuing + * operations on the subscription. If expirationPolicy is not set, a default + * policy with ttl of 31 days will be used. The minimum allowed value for + * expirationPolicy.ttl is 1 day. BETA: This feature is part of a beta release. + * This API might be changed in backward-incompatible ways and is not + * recommended for production use. It is not subject to any SLA or deprecation + * policy. + * @property {string} ttl Specifies the "time-to-live" duration for an associated + * resource. The resource expires if it is not active for a period of ttl. The + * eeedefinition of "activity" depends on the type of the associated resource. + * The minimum and maximum allowed values for ttl depend on the type of the + * associated resource, as well. If ttl is not set, the associated resource + * never expires. A duration in seconds with up to nine fractional digits, + * terminated by 's'. Example: "3.5s". + */ /** * A Subscription object will give you access to your Cloud Pub/Sub * subscription. @@ -256,6 +254,7 @@ export class Subscription extends EventEmitter { this._listen(); } + /** * Indicates if the Subscription is open and receiving messages. * @@ -264,12 +263,16 @@ export class Subscription extends EventEmitter { get isOpen(): boolean { return !!(this._subscriber && this._subscriber.isOpen); } + /** * @type {string} */ get projectId(): string { return this.pubsub && this.pubsub.projectId || '{{projectId}}'; } + + close(): Promise; + close(callback: RequestCallback): void; /** * Closes the Subscription, once this is called you will no longer receive * message events unless you call {Subscription#open} or add new message @@ -289,12 +292,16 @@ export class Subscription extends EventEmitter { * // If the callback is omitted a Promise will be returned. * subscription.close().then(() => {}); */ - - close(): Promise; - close(callback: RequestCallback): void; close(callback?: RequestCallback): void|Promise { this._subscriber.close().then(() => callback!(), callback); } + + createSnapshot(name: string, callback: CreateSnapshotCallback): void; + createSnapshot(name: string, gaxOpts?: CallOptions): + Promise; + createSnapshot( + name: string, gaxOpts: CallOptions, + callback: CreateSnapshotCallback): void; /** * @typedef {array} CreateSnapshotResponse * @property {Snapshot} 0 The new {@link Snapshot}. @@ -338,12 +345,6 @@ export class Subscription extends EventEmitter { * const apiResponse = data[1]; * }); */ - createSnapshot(name: string, callback: CreateSnapshotCallback): void; - createSnapshot(name: string, gaxOpts?: CallOptions): - Promise; - createSnapshot( - name: string, gaxOpts: CallOptions, - callback: CreateSnapshotCallback): void; createSnapshot( name: string, gaxOptsOrCallback?: CallOptions|CreateSnapshotCallback, callback?: CreateSnapshotCallback): void|Promise { @@ -376,6 +377,12 @@ export class Subscription extends EventEmitter { callback!(null, snapshot, resp!); }); } + + delete(callback: RequestCallback): void; + delete(gaxOpts?: CallOptions): Promise; + delete( + gaxOpts: CallOptions, + callback: RequestCallback): void; /** * Delete the subscription. Pull requests from the current subscription will * be errored once unsubscription is complete. @@ -405,13 +412,6 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - - - delete(callback: RequestCallback): void; - delete(gaxOpts?: CallOptions): Promise; - delete( - gaxOpts: CallOptions, - callback: RequestCallback): void; delete( gaxOptsOrCallback?: CallOptions|RequestCallback, callback?: RequestCallback): @@ -440,6 +440,9 @@ export class Subscription extends EventEmitter { }, callback); } + + exists(): Promise; + exists(callback: ExistsCallback): void; /** * @typedef {array} SubscriptionExistsResponse * @property {boolean} 0 Whether the subscription exists @@ -471,8 +474,6 @@ export class Subscription extends EventEmitter { * const exists = data[0]; * }); */ - exists(): Promise; - exists(callback: ExistsCallback): void; exists(callback?: ExistsCallback): void|Promise { this.getMetadata(err => { if (!err) { @@ -487,6 +488,10 @@ export class Subscription extends EventEmitter { callback!(err); }); } + + get(callback: CreateSubscriptionCallback): void; + get(gaxOpts?: GetCallOptions): Promise; + get(gaxOpts: GetCallOptions, callback: CreateSubscriptionCallback): void; /** * @typedef {array} GetSubscriptionResponse * @property {Subscription} 0 The {@link Subscription}. @@ -527,9 +532,6 @@ export class Subscription extends EventEmitter { * const apiResponse = data[1]; * }); */ - get(callback: CreateSubscriptionCallback): void; - get(gaxOpts?: GetCallOptions): Promise; - get(gaxOpts: GetCallOptions, callback: CreateSubscriptionCallback): void; get(gaxOptsOrCallback?: GetCallOptions|CreateSubscriptionCallback, callback?: CreateSubscriptionCallback): void|Promise { @@ -553,6 +555,11 @@ export class Subscription extends EventEmitter { this.create(gaxOpts, callback); }); } + + getMetadata(gaxOpts?: CallOptions): Promise; + getMetadata(callback: GetSubscriptionMetadataCallback): void; + getMetadata(gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback): + void; /** * @typedef {array} GetSubscriptionMetadataResponse * @property {object} 0 The full API response. @@ -590,10 +597,6 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - getMetadata(gaxOpts?: CallOptions): Promise; - getMetadata(callback: GetSubscriptionMetadataCallback): void; - getMetadata(gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback): - void; getMetadata( gaxOptsOrCallback?: CallOptions|GetSubscriptionMetadataCallback, callback?: GetSubscriptionMetadataCallback): @@ -619,6 +622,15 @@ export class Subscription extends EventEmitter { callback!(err!, apiResponse); }); } + + modifyPushConfig(config: google.pubsub.v1.IPushConfig, gaxOpts?: CallOptions): + Promise; + modifyPushConfig( + config: google.pubsub.v1.IPushConfig, + callback: RequestCallback): void; + modifyPushConfig( + config: google.pubsub.v1.IPushConfig, gaxOpts: CallOptions, + callback: RequestCallback): void; /** * @typedef {array} ModifyPushConfigResponse * @property {object} 0 The full API response. @@ -667,14 +679,6 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - modifyPushConfig(config: google.pubsub.v1.IPushConfig, gaxOpts?: CallOptions): - Promise; - modifyPushConfig( - config: google.pubsub.v1.IPushConfig, - callback: RequestCallback): void; - modifyPushConfig( - config: google.pubsub.v1.IPushConfig, gaxOpts: CallOptions, - callback: RequestCallback): void; modifyPushConfig( config: google.pubsub.v1.IPushConfig, gaxOptsOrCallback?: CallOptions|RequestCallback, @@ -697,6 +701,7 @@ export class Subscription extends EventEmitter { }, callback!); } + /** * Opens the Subscription to receive messages. In general this method * shouldn't need to be called, unless you wish to receive messages after @@ -723,6 +728,12 @@ export class Subscription extends EventEmitter { this._subscriber.open(); } } + + seek(snapshot: string|Date, gaxOpts?: CallOptions): + Promise; + seek(snapshot: string|Date, callback: SeekCallback): void; + seek(snapshot: string|Date, gaxOpts: CallOptions, callback: SeekCallback): + void; /** * @typedef {array} SeekResponse * @property {object} 0 The full API response. @@ -760,11 +771,6 @@ export class Subscription extends EventEmitter { * * subscription.seek(date, callback); */ - seek(snapshot: string|Date, gaxOpts?: CallOptions): - Promise; - seek(snapshot: string|Date, callback: SeekCallback): void; - seek(snapshot: string|Date, gaxOpts: CallOptions, callback: SeekCallback): - void; seek( snapshot: string|Date, gaxOptsOrCallback?: CallOptions|SeekCallback, callback?: SeekCallback): void|Promise { @@ -801,6 +807,15 @@ export class Subscription extends EventEmitter { }, callback!); } + + setMetadata(metadata: Metadata, gaxOpts?: CallOptions): + Promise; + setMetadata( + metadata: Metadata, + callback: RequestCallback): void; + setMetadata( + metadata: Metadata, gaxOpts: CallOptions, + callback: RequestCallback): void; /** * @typedef {array} SetSubscriptionMetadataResponse * @property {object} 0 The full API response. @@ -837,14 +852,6 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - setMetadata(metadata: Metadata, gaxOpts?: CallOptions): - Promise; - setMetadata( - metadata: Metadata, - callback: RequestCallback): void; - setMetadata( - metadata: Metadata, gaxOpts: CallOptions, - callback: RequestCallback): void; setMetadata( metadata: Metadata, gaxOptsOrCallback?: CallOptions| diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index a0eedd6e37f..5ace355896f 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -121,6 +121,10 @@ export class Topic { */ this.iam = new IAM(pubsub, this.name); } + + create(gaxOpts?: CallOptions): Promise; + create(callback: CreateTopicCallback): void; + create(gaxOpts: CallOptions, callback: CreateTopicCallback): void; /** * Create a topic. * @@ -149,9 +153,6 @@ export class Topic { * const apiResponse = data[1]; * }); */ - create(gaxOpts?: CallOptions): Promise; - create(callback: CreateTopicCallback): void; - create(gaxOpts: CallOptions, callback: CreateTopicCallback): void; create( gaxOptsOrCallback?: CallOptions|CreateTopicCallback, callback?: CreateTopicCallback): Promise|void { @@ -162,6 +163,13 @@ export class Topic { this.pubsub.createTopic(this.name, gaxOpts, callback); } + + createSubscription(name: string, callback: CreateSubscriptionCallback): void; + createSubscription(name: string, options?: CreateSubscriptionOptions): + Promise; + createSubscription( + name: string, options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback): void; /** * Create a subscription to this topic. * @@ -199,12 +207,6 @@ export class Topic { * const apiResponse = data[1]; * }); */ - createSubscription(name: string, callback: CreateSubscriptionCallback): void; - createSubscription(name: string, options?: CreateSubscriptionOptions): - Promise; - createSubscription( - name: string, options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback): void; createSubscription( name: string, optionsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, @@ -218,6 +220,12 @@ export class Topic { this.pubsub.createSubscription( this, name, options as CreateSubscriptionOptions, callback!); } + + delete(callback: RequestCallback): void; + delete(gaxOpts?: CallOptions): Promise; + delete( + gaxOpts: CallOptions, + callback: RequestCallback): void; /** * Delete the topic. This will not delete subscriptions to this topic. * @@ -245,11 +253,6 @@ export class Topic { * const apiResponse = data[0]; * }); */ - delete(callback: RequestCallback): void; - delete(gaxOpts?: CallOptions): Promise; - delete( - gaxOpts: CallOptions, - callback: RequestCallback): void; delete( gaxOptsOrCallback?: CallOptions|RequestCallback, callback?: RequestCallback): @@ -272,6 +275,7 @@ export class Topic { }, callback); } + /** * @typedef {array} TopicExistsResponse * @property {boolean} 0 Whether the topic exists @@ -321,6 +325,10 @@ export class Topic { callback(err); }); } + + get(callback: CreateTopicCallback): void; + get(gaxOpts?: GetCallOptions): Promise; + get(gaxOpts: GetCallOptions, callback: CreateTopicCallback): void; /** * @typedef {array} GetTopicResponse * @property {Topic} 0 The {@link Topic}. @@ -360,9 +368,6 @@ export class Topic { * const apiResponse = data[1]; * }); */ - get(callback: CreateTopicCallback): void; - get(gaxOpts?: GetCallOptions): Promise; - get(gaxOpts: GetCallOptions, callback: CreateTopicCallback): void; get(gaxOptsOrCallback?: GetCallOptions|CreateTopicCallback, callback?: CreateTopicCallback): void|Promise { const gaxOpts = @@ -389,6 +394,10 @@ export class Topic { this.create(gaxOpts, callback!); }); } + + getMetadata(callback: GetTopicMetadataCallback): void; + getMetadata(gaxOpts: CallOptions, callback: GetTopicMetadataCallback): void; + getMetadata(gaxOpts?: CallOptions): Promise; /** * @typedef {array} GetTopicMetadataResponse * @property {object} 0 The full API response. @@ -423,9 +432,6 @@ export class Topic { * const apiResponse = data[0]; * }); */ - getMetadata(callback: GetTopicMetadataCallback): void; - getMetadata(gaxOpts: CallOptions, callback: GetTopicMetadataCallback): void; - getMetadata(gaxOpts?: CallOptions): Promise; getMetadata( gaxOptsOrCallback?: CallOptions|GetTopicMetadataCallback, callback?: GetTopicMetadataCallback): @@ -451,6 +457,14 @@ export class Topic { callback!(err, apiResponse); }); } + + getSubscriptions(callback: RequestCallback): void; + getSubscriptions( + options: SubscriptionCallOptions, + callback: RequestCallback): void; + getSubscriptions( + options?: SubscriptionCallOptions, + ): Promise; /** * Get a list of the subscriptions registered to this topic. You may * optionally provide a query object as the first argument to customize the @@ -487,13 +501,6 @@ export class Topic { * const subscriptions = data[0]; * }); */ - getSubscriptions(callback: RequestCallback): void; - getSubscriptions( - options: SubscriptionCallOptions, - callback: RequestCallback): void; - getSubscriptions( - options?: SubscriptionCallOptions, - ): Promise; getSubscriptions( optionsOrCallback?: SubscriptionCallOptions| RequestCallback, @@ -536,6 +543,11 @@ export class Topic { callback!(...args); }); } + + publish(data: Buffer, attributes?: Attributes): Promise; + publish(data: Buffer, callback: PublishCallback): void; + publish(data: Buffer, attributes: Attributes, callback: PublishCallback): + void; /** * Publish the provided message. * @@ -578,10 +590,6 @@ export class Topic { * //- * topic.publish(data).then((messageId) => {}); */ - publish(data: Buffer, attributes?: Attributes): Promise; - publish(data: Buffer, callback: PublishCallback): void; - publish(data: Buffer, attributes: Attributes, callback: PublishCallback): - void; publish( data: Buffer, attributesOrCallback?: Attributes|PublishCallback, callback?: PublishCallback): Promise|void { @@ -592,6 +600,11 @@ export class Topic { callback; return this.publisher.publish(data, attributes, callback!); } + + publishJSON(json: object, attributes?: Attributes): Promise; + publishJSON(json: object, callback: PublishCallback): void; + publishJSON(json: object, attributes: Attributes, callback: PublishCallback): + void; /** * Publish the provided JSON. It should be noted that all messages published * are done so in the form of a Buffer. This is simply a convenience method @@ -640,10 +653,6 @@ export class Topic { * //- * topic.publishJSON(data).then((messageId) => {}); */ - publishJSON(json: object, attributes?: Attributes): Promise; - publishJSON(json: object, callback: PublishCallback): void; - publishJSON(json: object, attributes: Attributes, callback: PublishCallback): - void; publishJSON( json: object, attributesOrCallback?: Attributes|PublishCallback, callback?: PublishCallback): Promise|void { @@ -659,6 +668,7 @@ export class Topic { const data = Buffer.from(JSON.stringify(json)); return this.publish(data, attributes, callback!); } + /** * Set the publisher options. * @@ -679,6 +689,7 @@ export class Topic { setPublishOptions(options: PublishOptions): void { this.publisher.setOptions(options); } + /** * Create a Subscription object. This command by itself will not run any API * requests. You will receive a {module:pubsub/subscription} object, @@ -723,6 +734,7 @@ export class Topic { options.topic = this; return this.pubsub.subscription(name, options); } + /** * Format the name of a topic. A Topic's full name is in the format of * 'projects/{projectId}/topics/{topicName}'. From 479c0c5b412c66eccfbd59d979869b041e661d88 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Sat, 2 Mar 2019 10:48:50 -0800 Subject: [PATCH 0368/1115] refactor(typescript): various fixes/refactors to types (#515) --- handwritten/pubsub/package.json | 4 +- handwritten/pubsub/proto/iam.d.ts | 4074 ++++++++++++++++++++++ handwritten/pubsub/src/iam.ts | 67 +- handwritten/pubsub/src/index.ts | 310 +- handwritten/pubsub/src/publisher.ts | 10 +- handwritten/pubsub/src/snapshot.ts | 41 +- handwritten/pubsub/src/subscription.ts | 271 +- handwritten/pubsub/src/topic.ts | 127 +- handwritten/pubsub/system-test/pubsub.ts | 11 +- handwritten/pubsub/test/iam.ts | 14 +- handwritten/pubsub/test/index.ts | 24 +- handwritten/pubsub/test/snapshot.ts | 56 +- handwritten/pubsub/test/subscription.ts | 249 +- handwritten/pubsub/test/topic.ts | 104 +- 14 files changed, 4769 insertions(+), 593 deletions(-) create mode 100644 handwritten/pubsub/proto/iam.d.ts diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 64b179ae2e3..7df205eca60 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -45,7 +45,9 @@ "prepare": "npm run compile", "pretest": "npm run compile", "proto": "npm run proto:pubsub", - "proto:pubsub": "mkdir -p proto && pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", + "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", + "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -o proto/iam.d.ts -", + "proto-types": "mkdir -p proto && npm run proto:pubsub && npm run proto:iam", "docs-test": "linkinator docs -r --skip www.googleapis.com", "predocs-test": "npm run docs" }, diff --git a/handwritten/pubsub/proto/iam.d.ts b/handwritten/pubsub/proto/iam.d.ts new file mode 100644 index 00000000000..92ecb2096d7 --- /dev/null +++ b/handwritten/pubsub/proto/iam.d.ts @@ -0,0 +1,4074 @@ +import * as $protobuf from "protobufjs"; +/** Namespace google. */ +export namespace google { + + /** Namespace iam. */ + namespace iam { + + /** Namespace v1. */ + namespace v1 { + + /** Represents a IAMPolicy */ + class IAMPolicy extends $protobuf.rpc.Service { + + /** + * Constructs a new IAMPolicy service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new IAMPolicy service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): IAMPolicy; + + /** + * Calls SetIamPolicy. + * @param request SetIamPolicyRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Policy + */ + public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.SetIamPolicyCallback): void; + + /** + * Calls SetIamPolicy. + * @param request SetIamPolicyRequest message or plain object + * @returns Promise + */ + public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest): Promise; + + /** + * Calls GetIamPolicy. + * @param request GetIamPolicyRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Policy + */ + public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.GetIamPolicyCallback): void; + + /** + * Calls GetIamPolicy. + * @param request GetIamPolicyRequest message or plain object + * @returns Promise + */ + public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest): Promise; + + /** + * Calls TestIamPermissions. + * @param request TestIamPermissionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and TestIamPermissionsResponse + */ + public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest, callback: google.iam.v1.IAMPolicy.TestIamPermissionsCallback): void; + + /** + * Calls TestIamPermissions. + * @param request TestIamPermissionsRequest message or plain object + * @returns Promise + */ + public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest): Promise; + } + + namespace IAMPolicy { + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. + * @param error Error, if any + * @param [response] Policy + */ + type SetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. + * @param error Error, if any + * @param [response] Policy + */ + type GetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. + * @param error Error, if any + * @param [response] TestIamPermissionsResponse + */ + type TestIamPermissionsCallback = (error: (Error|null), response?: google.iam.v1.TestIamPermissionsResponse) => void; + } + + /** Properties of a SetIamPolicyRequest. */ + interface ISetIamPolicyRequest { + + /** SetIamPolicyRequest resource */ + resource?: (string|null); + + /** SetIamPolicyRequest policy */ + policy?: (google.iam.v1.IPolicy|null); + } + + /** Represents a SetIamPolicyRequest. */ + class SetIamPolicyRequest implements ISetIamPolicyRequest { + + /** + * Constructs a new SetIamPolicyRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ISetIamPolicyRequest); + + /** SetIamPolicyRequest resource. */ + public resource: string; + + /** SetIamPolicyRequest policy. */ + public policy?: (google.iam.v1.IPolicy|null); + + /** + * Creates a new SetIamPolicyRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns SetIamPolicyRequest instance + */ + public static create(properties?: google.iam.v1.ISetIamPolicyRequest): google.iam.v1.SetIamPolicyRequest; + + /** + * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @param message SetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @param message SetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SetIamPolicyRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.SetIamPolicyRequest; + + /** + * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.SetIamPolicyRequest; + + /** + * Verifies a SetIamPolicyRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SetIamPolicyRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.SetIamPolicyRequest; + + /** + * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. + * @param message SetIamPolicyRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.SetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SetIamPolicyRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetIamPolicyRequest. */ + interface IGetIamPolicyRequest { + + /** GetIamPolicyRequest resource */ + resource?: (string|null); + } + + /** Represents a GetIamPolicyRequest. */ + class GetIamPolicyRequest implements IGetIamPolicyRequest { + + /** + * Constructs a new GetIamPolicyRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IGetIamPolicyRequest); + + /** GetIamPolicyRequest resource. */ + public resource: string; + + /** + * Creates a new GetIamPolicyRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetIamPolicyRequest instance + */ + public static create(properties?: google.iam.v1.IGetIamPolicyRequest): google.iam.v1.GetIamPolicyRequest; + + /** + * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @param message GetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @param message GetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetIamPolicyRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetIamPolicyRequest; + + /** + * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetIamPolicyRequest; + + /** + * Verifies a GetIamPolicyRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetIamPolicyRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.GetIamPolicyRequest; + + /** + * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. + * @param message GetIamPolicyRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.GetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetIamPolicyRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a TestIamPermissionsRequest. */ + interface ITestIamPermissionsRequest { + + /** TestIamPermissionsRequest resource */ + resource?: (string|null); + + /** TestIamPermissionsRequest permissions */ + permissions?: (string[]|null); + } + + /** Represents a TestIamPermissionsRequest. */ + class TestIamPermissionsRequest implements ITestIamPermissionsRequest { + + /** + * Constructs a new TestIamPermissionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ITestIamPermissionsRequest); + + /** TestIamPermissionsRequest resource. */ + public resource: string; + + /** TestIamPermissionsRequest permissions. */ + public permissions: string[]; + + /** + * Creates a new TestIamPermissionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns TestIamPermissionsRequest instance + */ + public static create(properties?: google.iam.v1.ITestIamPermissionsRequest): google.iam.v1.TestIamPermissionsRequest; + + /** + * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @param message TestIamPermissionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @param message TestIamPermissionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TestIamPermissionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsRequest; + + /** + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns TestIamPermissionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsRequest; + + /** + * Verifies a TestIamPermissionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns TestIamPermissionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsRequest; + + /** + * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. + * @param message TestIamPermissionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.TestIamPermissionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this TestIamPermissionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a TestIamPermissionsResponse. */ + interface ITestIamPermissionsResponse { + + /** TestIamPermissionsResponse permissions */ + permissions?: (string[]|null); + } + + /** Represents a TestIamPermissionsResponse. */ + class TestIamPermissionsResponse implements ITestIamPermissionsResponse { + + /** + * Constructs a new TestIamPermissionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ITestIamPermissionsResponse); + + /** TestIamPermissionsResponse permissions. */ + public permissions: string[]; + + /** + * Creates a new TestIamPermissionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns TestIamPermissionsResponse instance + */ + public static create(properties?: google.iam.v1.ITestIamPermissionsResponse): google.iam.v1.TestIamPermissionsResponse; + + /** + * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @param message TestIamPermissionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @param message TestIamPermissionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TestIamPermissionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsResponse; + + /** + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns TestIamPermissionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsResponse; + + /** + * Verifies a TestIamPermissionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns TestIamPermissionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsResponse; + + /** + * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. + * @param message TestIamPermissionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.TestIamPermissionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this TestIamPermissionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Policy. */ + interface IPolicy { + + /** Policy version */ + version?: (number|null); + + /** Policy bindings */ + bindings?: (google.iam.v1.IBinding[]|null); + + /** Policy etag */ + etag?: (Uint8Array|null); + } + + /** Represents a Policy. */ + class Policy implements IPolicy { + + /** + * Constructs a new Policy. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IPolicy); + + /** Policy version. */ + public version: number; + + /** Policy bindings. */ + public bindings: google.iam.v1.IBinding[]; + + /** Policy etag. */ + public etag: Uint8Array; + + /** + * Creates a new Policy instance using the specified properties. + * @param [properties] Properties to set + * @returns Policy instance + */ + public static create(properties?: google.iam.v1.IPolicy): google.iam.v1.Policy; + + /** + * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @param message Policy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @param message Policy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Policy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Policy; + + /** + * Decodes a Policy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Policy; + + /** + * Verifies a Policy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Policy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Policy + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.Policy; + + /** + * Creates a plain object from a Policy message. Also converts values to other types if specified. + * @param message Policy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.Policy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Policy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Binding. */ + interface IBinding { + + /** Binding role */ + role?: (string|null); + + /** Binding members */ + members?: (string[]|null); + } + + /** Represents a Binding. */ + class Binding implements IBinding { + + /** + * Constructs a new Binding. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IBinding); + + /** Binding role. */ + public role: string; + + /** Binding members. */ + public members: string[]; + + /** + * Creates a new Binding instance using the specified properties. + * @param [properties] Properties to set + * @returns Binding instance + */ + public static create(properties?: google.iam.v1.IBinding): google.iam.v1.Binding; + + /** + * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @param message Binding message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @param message Binding message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Binding message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Binding + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Binding; + + /** + * Decodes a Binding message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Binding + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Binding; + + /** + * Verifies a Binding message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Binding message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Binding + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.Binding; + + /** + * Creates a plain object from a Binding message. Also converts values to other types if specified. + * @param message Binding + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.Binding, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Binding to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PolicyDelta. */ + interface IPolicyDelta { + + /** PolicyDelta bindingDeltas */ + bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); + } + + /** Represents a PolicyDelta. */ + class PolicyDelta implements IPolicyDelta { + + /** + * Constructs a new PolicyDelta. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IPolicyDelta); + + /** PolicyDelta bindingDeltas. */ + public bindingDeltas: google.iam.v1.IBindingDelta[]; + + /** + * Creates a new PolicyDelta instance using the specified properties. + * @param [properties] Properties to set + * @returns PolicyDelta instance + */ + public static create(properties?: google.iam.v1.IPolicyDelta): google.iam.v1.PolicyDelta; + + /** + * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @param message PolicyDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @param message PolicyDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PolicyDelta message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PolicyDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.PolicyDelta; + + /** + * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PolicyDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.PolicyDelta; + + /** + * Verifies a PolicyDelta message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PolicyDelta + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.PolicyDelta; + + /** + * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. + * @param message PolicyDelta + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.PolicyDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PolicyDelta to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a BindingDelta. */ + interface IBindingDelta { + + /** BindingDelta action */ + action?: (google.iam.v1.BindingDelta.Action|null); + + /** BindingDelta role */ + role?: (string|null); + + /** BindingDelta member */ + member?: (string|null); + } + + /** Represents a BindingDelta. */ + class BindingDelta implements IBindingDelta { + + /** + * Constructs a new BindingDelta. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IBindingDelta); + + /** BindingDelta action. */ + public action: google.iam.v1.BindingDelta.Action; + + /** BindingDelta role. */ + public role: string; + + /** BindingDelta member. */ + public member: string; + + /** + * Creates a new BindingDelta instance using the specified properties. + * @param [properties] Properties to set + * @returns BindingDelta instance + */ + public static create(properties?: google.iam.v1.IBindingDelta): google.iam.v1.BindingDelta; + + /** + * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @param message BindingDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @param message BindingDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a BindingDelta message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns BindingDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.BindingDelta; + + /** + * Decodes a BindingDelta message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns BindingDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.BindingDelta; + + /** + * Verifies a BindingDelta message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns BindingDelta + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.BindingDelta; + + /** + * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. + * @param message BindingDelta + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.BindingDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this BindingDelta to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace BindingDelta { + + /** Action enum. */ + enum Action { + ACTION_UNSPECIFIED = 0, + ADD = 1, + REMOVE = 2 + } + } + } + } + + /** Namespace api. */ + namespace api { + + /** Properties of a Http. */ + interface IHttp { + + /** Http rules */ + rules?: (google.api.IHttpRule[]|null); + } + + /** Represents a Http. */ + class Http implements IHttp { + + /** + * Constructs a new Http. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IHttp); + + /** Http rules. */ + public rules: google.api.IHttpRule[]; + + /** + * Creates a new Http instance using the specified properties. + * @param [properties] Properties to set + * @returns Http instance + */ + public static create(properties?: google.api.IHttp): google.api.Http; + + /** + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Http message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; + + /** + * Decodes a Http message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; + + /** + * Verifies a Http message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Http message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Http + */ + public static fromObject(object: { [k: string]: any }): google.api.Http; + + /** + * Creates a plain object from a Http message. Also converts values to other types if specified. + * @param message Http + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Http to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a HttpRule. */ + interface IHttpRule { + + /** HttpRule selector */ + selector?: (string|null); + + /** HttpRule get */ + get?: (string|null); + + /** HttpRule put */ + put?: (string|null); + + /** HttpRule post */ + post?: (string|null); + + /** HttpRule delete */ + "delete"?: (string|null); + + /** HttpRule patch */ + patch?: (string|null); + + /** HttpRule custom */ + custom?: (google.api.ICustomHttpPattern|null); + + /** HttpRule body */ + body?: (string|null); + + /** HttpRule additionalBindings */ + additionalBindings?: (google.api.IHttpRule[]|null); + } + + /** Represents a HttpRule. */ + class HttpRule implements IHttpRule { + + /** + * Constructs a new HttpRule. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IHttpRule); + + /** HttpRule selector. */ + public selector: string; + + /** HttpRule get. */ + public get: string; + + /** HttpRule put. */ + public put: string; + + /** HttpRule post. */ + public post: string; + + /** HttpRule delete. */ + public delete: string; + + /** HttpRule patch. */ + public patch: string; + + /** HttpRule custom. */ + public custom?: (google.api.ICustomHttpPattern|null); + + /** HttpRule body. */ + public body: string; + + /** HttpRule additionalBindings. */ + public additionalBindings: google.api.IHttpRule[]; + + /** HttpRule pattern. */ + public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); + + /** + * Creates a new HttpRule instance using the specified properties. + * @param [properties] Properties to set + * @returns HttpRule instance + */ + public static create(properties?: google.api.IHttpRule): google.api.HttpRule; + + /** + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a HttpRule message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; + + /** + * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; + + /** + * Verifies a HttpRule message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns HttpRule + */ + public static fromObject(object: { [k: string]: any }): google.api.HttpRule; + + /** + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * @param message HttpRule + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this HttpRule to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a CustomHttpPattern. */ + interface ICustomHttpPattern { + + /** CustomHttpPattern kind */ + kind?: (string|null); + + /** CustomHttpPattern path */ + path?: (string|null); + } + + /** Represents a CustomHttpPattern. */ + class CustomHttpPattern implements ICustomHttpPattern { + + /** + * Constructs a new CustomHttpPattern. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ICustomHttpPattern); + + /** CustomHttpPattern kind. */ + public kind: string; + + /** CustomHttpPattern path. */ + public path: string; + + /** + * Creates a new CustomHttpPattern instance using the specified properties. + * @param [properties] Properties to set + * @returns CustomHttpPattern instance + */ + public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; + + /** + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; + + /** + * Verifies a CustomHttpPattern message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CustomHttpPattern + */ + public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; + + /** + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * @param message CustomHttpPattern + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CustomHttpPattern to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Namespace protobuf. */ + namespace protobuf { + + /** Properties of a FileDescriptorSet. */ + interface IFileDescriptorSet { + + /** FileDescriptorSet file */ + file?: (google.protobuf.IFileDescriptorProto[]|null); + } + + /** Represents a FileDescriptorSet. */ + class FileDescriptorSet implements IFileDescriptorSet { + + /** + * Constructs a new FileDescriptorSet. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorSet); + + /** FileDescriptorSet file. */ + public file: google.protobuf.IFileDescriptorProto[]; + + /** + * Creates a new FileDescriptorSet instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorSet instance + */ + public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; + + /** + * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; + + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; + + /** + * Verifies a FileDescriptorSet message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorSet + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; + + /** + * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. + * @param message FileDescriptorSet + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileDescriptorSet to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FileDescriptorProto. */ + interface IFileDescriptorProto { + + /** FileDescriptorProto name */ + name?: (string|null); + + /** FileDescriptorProto package */ + "package"?: (string|null); + + /** FileDescriptorProto dependency */ + dependency?: (string[]|null); + + /** FileDescriptorProto publicDependency */ + publicDependency?: (number[]|null); + + /** FileDescriptorProto weakDependency */ + weakDependency?: (number[]|null); + + /** FileDescriptorProto messageType */ + messageType?: (google.protobuf.IDescriptorProto[]|null); + + /** FileDescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + + /** FileDescriptorProto service */ + service?: (google.protobuf.IServiceDescriptorProto[]|null); + + /** FileDescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** FileDescriptorProto options */ + options?: (google.protobuf.IFileOptions|null); + + /** FileDescriptorProto sourceCodeInfo */ + sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + + /** FileDescriptorProto syntax */ + syntax?: (string|null); + } + + /** Represents a FileDescriptorProto. */ + class FileDescriptorProto implements IFileDescriptorProto { + + /** + * Constructs a new FileDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorProto); + + /** FileDescriptorProto name. */ + public name: string; + + /** FileDescriptorProto package. */ + public package: string; + + /** FileDescriptorProto dependency. */ + public dependency: string[]; + + /** FileDescriptorProto publicDependency. */ + public publicDependency: number[]; + + /** FileDescriptorProto weakDependency. */ + public weakDependency: number[]; + + /** FileDescriptorProto messageType. */ + public messageType: google.protobuf.IDescriptorProto[]; + + /** FileDescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; + + /** FileDescriptorProto service. */ + public service: google.protobuf.IServiceDescriptorProto[]; + + /** FileDescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; + + /** FileDescriptorProto options. */ + public options?: (google.protobuf.IFileOptions|null); + + /** FileDescriptorProto sourceCodeInfo. */ + public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + + /** FileDescriptorProto syntax. */ + public syntax: string; + + /** + * Creates a new FileDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; + + /** + * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; + + /** + * Verifies a FileDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; + + /** + * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. + * @param message FileDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DescriptorProto. */ + interface IDescriptorProto { + + /** DescriptorProto name */ + name?: (string|null); + + /** DescriptorProto field */ + field?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** DescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** DescriptorProto nestedType */ + nestedType?: (google.protobuf.IDescriptorProto[]|null); + + /** DescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + + /** DescriptorProto extensionRange */ + extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); + + /** DescriptorProto oneofDecl */ + oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); + + /** DescriptorProto options */ + options?: (google.protobuf.IMessageOptions|null); + + /** DescriptorProto reservedRange */ + reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); + + /** DescriptorProto reservedName */ + reservedName?: (string[]|null); + } + + /** Represents a DescriptorProto. */ + class DescriptorProto implements IDescriptorProto { + + /** + * Constructs a new DescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDescriptorProto); + + /** DescriptorProto name. */ + public name: string; + + /** DescriptorProto field. */ + public field: google.protobuf.IFieldDescriptorProto[]; + + /** DescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; + + /** DescriptorProto nestedType. */ + public nestedType: google.protobuf.IDescriptorProto[]; + + /** DescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; + + /** DescriptorProto extensionRange. */ + public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; + + /** DescriptorProto oneofDecl. */ + public oneofDecl: google.protobuf.IOneofDescriptorProto[]; + + /** DescriptorProto options. */ + public options?: (google.protobuf.IMessageOptions|null); + + /** DescriptorProto reservedRange. */ + public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; + + /** DescriptorProto reservedName. */ + public reservedName: string[]; + + /** + * Creates a new DescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns DescriptorProto instance + */ + public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; + + /** + * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; + + /** + * Verifies a DescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; + + /** + * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * @param message DescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace DescriptorProto { + + /** Properties of an ExtensionRange. */ + interface IExtensionRange { + + /** ExtensionRange start */ + start?: (number|null); + + /** ExtensionRange end */ + end?: (number|null); + } + + /** Represents an ExtensionRange. */ + class ExtensionRange implements IExtensionRange { + + /** + * Constructs a new ExtensionRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); + + /** ExtensionRange start. */ + public start: number; + + /** ExtensionRange end. */ + public end: number; + + /** + * Creates a new ExtensionRange instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRange instance + */ + public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExtensionRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Verifies an ExtensionRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. + * @param message ExtensionRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExtensionRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ReservedRange. */ + interface IReservedRange { + + /** ReservedRange start */ + start?: (number|null); + + /** ReservedRange end */ + end?: (number|null); + } + + /** Represents a ReservedRange. */ + class ReservedRange implements IReservedRange { + + /** + * Constructs a new ReservedRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); + + /** ReservedRange start. */ + public start: number; + + /** ReservedRange end. */ + public end: number; + + /** + * Creates a new ReservedRange instance using the specified properties. + * @param [properties] Properties to set + * @returns ReservedRange instance + */ + public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ReservedRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Decodes a ReservedRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Verifies a ReservedRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ReservedRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. + * @param message ReservedRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ReservedRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a FieldDescriptorProto. */ + interface IFieldDescriptorProto { + + /** FieldDescriptorProto name */ + name?: (string|null); + + /** FieldDescriptorProto number */ + number?: (number|null); + + /** FieldDescriptorProto label */ + label?: (google.protobuf.FieldDescriptorProto.Label|null); + + /** FieldDescriptorProto type */ + type?: (google.protobuf.FieldDescriptorProto.Type|null); + + /** FieldDescriptorProto typeName */ + typeName?: (string|null); + + /** FieldDescriptorProto extendee */ + extendee?: (string|null); + + /** FieldDescriptorProto defaultValue */ + defaultValue?: (string|null); + + /** FieldDescriptorProto oneofIndex */ + oneofIndex?: (number|null); + + /** FieldDescriptorProto jsonName */ + jsonName?: (string|null); + + /** FieldDescriptorProto options */ + options?: (google.protobuf.IFieldOptions|null); + } + + /** Represents a FieldDescriptorProto. */ + class FieldDescriptorProto implements IFieldDescriptorProto { + + /** + * Constructs a new FieldDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldDescriptorProto); + + /** FieldDescriptorProto name. */ + public name: string; + + /** FieldDescriptorProto number. */ + public number: number; + + /** FieldDescriptorProto label. */ + public label: google.protobuf.FieldDescriptorProto.Label; + + /** FieldDescriptorProto type. */ + public type: google.protobuf.FieldDescriptorProto.Type; + + /** FieldDescriptorProto typeName. */ + public typeName: string; + + /** FieldDescriptorProto extendee. */ + public extendee: string; + + /** FieldDescriptorProto defaultValue. */ + public defaultValue: string; + + /** FieldDescriptorProto oneofIndex. */ + public oneofIndex: number; + + /** FieldDescriptorProto jsonName. */ + public jsonName: string; + + /** FieldDescriptorProto options. */ + public options?: (google.protobuf.IFieldOptions|null); + + /** + * Creates a new FieldDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; + + /** + * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; + + /** + * Verifies a FieldDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; + + /** + * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. + * @param message FieldDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FieldDescriptorProto { + + /** Type enum. */ + enum Type { + TYPE_DOUBLE = 1, + TYPE_FLOAT = 2, + TYPE_INT64 = 3, + TYPE_UINT64 = 4, + TYPE_INT32 = 5, + TYPE_FIXED64 = 6, + TYPE_FIXED32 = 7, + TYPE_BOOL = 8, + TYPE_STRING = 9, + TYPE_GROUP = 10, + TYPE_MESSAGE = 11, + TYPE_BYTES = 12, + TYPE_UINT32 = 13, + TYPE_ENUM = 14, + TYPE_SFIXED32 = 15, + TYPE_SFIXED64 = 16, + TYPE_SINT32 = 17, + TYPE_SINT64 = 18 + } + + /** Label enum. */ + enum Label { + LABEL_OPTIONAL = 1, + LABEL_REQUIRED = 2, + LABEL_REPEATED = 3 + } + } + + /** Properties of an OneofDescriptorProto. */ + interface IOneofDescriptorProto { + + /** OneofDescriptorProto name */ + name?: (string|null); + + /** OneofDescriptorProto options */ + options?: (google.protobuf.IOneofOptions|null); + } + + /** Represents an OneofDescriptorProto. */ + class OneofDescriptorProto implements IOneofDescriptorProto { + + /** + * Constructs a new OneofDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofDescriptorProto); + + /** OneofDescriptorProto name. */ + public name: string; + + /** OneofDescriptorProto options. */ + public options?: (google.protobuf.IOneofOptions|null); + + /** + * Creates a new OneofDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofDescriptorProto instance + */ + public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; + + /** + * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; + + /** + * Verifies an OneofDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; + + /** + * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. + * @param message OneofDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this OneofDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumDescriptorProto. */ + interface IEnumDescriptorProto { + + /** EnumDescriptorProto name */ + name?: (string|null); + + /** EnumDescriptorProto value */ + value?: (google.protobuf.IEnumValueDescriptorProto[]|null); + + /** EnumDescriptorProto options */ + options?: (google.protobuf.IEnumOptions|null); + } + + /** Represents an EnumDescriptorProto. */ + class EnumDescriptorProto implements IEnumDescriptorProto { + + /** + * Constructs a new EnumDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumDescriptorProto); + + /** EnumDescriptorProto name. */ + public name: string; + + /** EnumDescriptorProto value. */ + public value: google.protobuf.IEnumValueDescriptorProto[]; + + /** EnumDescriptorProto options. */ + public options?: (google.protobuf.IEnumOptions|null); + + /** + * Creates a new EnumDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; + + /** + * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; + + /** + * Verifies an EnumDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; + + /** + * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. + * @param message EnumDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumValueDescriptorProto. */ + interface IEnumValueDescriptorProto { + + /** EnumValueDescriptorProto name */ + name?: (string|null); + + /** EnumValueDescriptorProto number */ + number?: (number|null); + + /** EnumValueDescriptorProto options */ + options?: (google.protobuf.IEnumValueOptions|null); + } + + /** Represents an EnumValueDescriptorProto. */ + class EnumValueDescriptorProto implements IEnumValueDescriptorProto { + + /** + * Constructs a new EnumValueDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueDescriptorProto); + + /** EnumValueDescriptorProto name. */ + public name: string; + + /** EnumValueDescriptorProto number. */ + public number: number; + + /** EnumValueDescriptorProto options. */ + public options?: (google.protobuf.IEnumValueOptions|null); + + /** + * Creates a new EnumValueDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; + + /** + * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; + + /** + * Verifies an EnumValueDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; + + /** + * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. + * @param message EnumValueDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumValueDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ServiceDescriptorProto. */ + interface IServiceDescriptorProto { + + /** ServiceDescriptorProto name */ + name?: (string|null); + + /** ServiceDescriptorProto method */ + method?: (google.protobuf.IMethodDescriptorProto[]|null); + + /** ServiceDescriptorProto options */ + options?: (google.protobuf.IServiceOptions|null); + } + + /** Represents a ServiceDescriptorProto. */ + class ServiceDescriptorProto implements IServiceDescriptorProto { + + /** + * Constructs a new ServiceDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceDescriptorProto); + + /** ServiceDescriptorProto name. */ + public name: string; + + /** ServiceDescriptorProto method. */ + public method: google.protobuf.IMethodDescriptorProto[]; + + /** ServiceDescriptorProto options. */ + public options?: (google.protobuf.IServiceOptions|null); + + /** + * Creates a new ServiceDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceDescriptorProto instance + */ + public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; + + /** + * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; + + /** + * Verifies a ServiceDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; + + /** + * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. + * @param message ServiceDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ServiceDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a MethodDescriptorProto. */ + interface IMethodDescriptorProto { + + /** MethodDescriptorProto name */ + name?: (string|null); + + /** MethodDescriptorProto inputType */ + inputType?: (string|null); + + /** MethodDescriptorProto outputType */ + outputType?: (string|null); + + /** MethodDescriptorProto options */ + options?: (google.protobuf.IMethodOptions|null); + + /** MethodDescriptorProto clientStreaming */ + clientStreaming?: (boolean|null); + + /** MethodDescriptorProto serverStreaming */ + serverStreaming?: (boolean|null); + } + + /** Represents a MethodDescriptorProto. */ + class MethodDescriptorProto implements IMethodDescriptorProto { + + /** + * Constructs a new MethodDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodDescriptorProto); + + /** MethodDescriptorProto name. */ + public name: string; + + /** MethodDescriptorProto inputType. */ + public inputType: string; + + /** MethodDescriptorProto outputType. */ + public outputType: string; + + /** MethodDescriptorProto options. */ + public options?: (google.protobuf.IMethodOptions|null); + + /** MethodDescriptorProto clientStreaming. */ + public clientStreaming: boolean; + + /** MethodDescriptorProto serverStreaming. */ + public serverStreaming: boolean; + + /** + * Creates a new MethodDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodDescriptorProto instance + */ + public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; + + /** + * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; + + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; + + /** + * Verifies a MethodDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; + + /** + * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. + * @param message MethodDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MethodDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FileOptions. */ + interface IFileOptions { + + /** FileOptions javaPackage */ + javaPackage?: (string|null); + + /** FileOptions javaOuterClassname */ + javaOuterClassname?: (string|null); + + /** FileOptions javaMultipleFiles */ + javaMultipleFiles?: (boolean|null); + + /** FileOptions javaGenerateEqualsAndHash */ + javaGenerateEqualsAndHash?: (boolean|null); + + /** FileOptions javaStringCheckUtf8 */ + javaStringCheckUtf8?: (boolean|null); + + /** FileOptions optimizeFor */ + optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|null); + + /** FileOptions goPackage */ + goPackage?: (string|null); + + /** FileOptions ccGenericServices */ + ccGenericServices?: (boolean|null); + + /** FileOptions javaGenericServices */ + javaGenericServices?: (boolean|null); + + /** FileOptions pyGenericServices */ + pyGenericServices?: (boolean|null); + + /** FileOptions deprecated */ + deprecated?: (boolean|null); + + /** FileOptions ccEnableArenas */ + ccEnableArenas?: (boolean|null); + + /** FileOptions objcClassPrefix */ + objcClassPrefix?: (string|null); + + /** FileOptions csharpNamespace */ + csharpNamespace?: (string|null); + + /** FileOptions swiftPrefix */ + swiftPrefix?: (string|null); + + /** FileOptions phpClassPrefix */ + phpClassPrefix?: (string|null); + + /** FileOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a FileOptions. */ + class FileOptions implements IFileOptions { + + /** + * Constructs a new FileOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileOptions); + + /** FileOptions javaPackage. */ + public javaPackage: string; + + /** FileOptions javaOuterClassname. */ + public javaOuterClassname: string; + + /** FileOptions javaMultipleFiles. */ + public javaMultipleFiles: boolean; + + /** FileOptions javaGenerateEqualsAndHash. */ + public javaGenerateEqualsAndHash: boolean; + + /** FileOptions javaStringCheckUtf8. */ + public javaStringCheckUtf8: boolean; + + /** FileOptions optimizeFor. */ + public optimizeFor: google.protobuf.FileOptions.OptimizeMode; + + /** FileOptions goPackage. */ + public goPackage: string; + + /** FileOptions ccGenericServices. */ + public ccGenericServices: boolean; + + /** FileOptions javaGenericServices. */ + public javaGenericServices: boolean; + + /** FileOptions pyGenericServices. */ + public pyGenericServices: boolean; + + /** FileOptions deprecated. */ + public deprecated: boolean; + + /** FileOptions ccEnableArenas. */ + public ccEnableArenas: boolean; + + /** FileOptions objcClassPrefix. */ + public objcClassPrefix: string; + + /** FileOptions csharpNamespace. */ + public csharpNamespace: string; + + /** FileOptions swiftPrefix. */ + public swiftPrefix: string; + + /** FileOptions phpClassPrefix. */ + public phpClassPrefix: string; + + /** FileOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new FileOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FileOptions instance + */ + public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; + + /** + * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; + + /** + * Decodes a FileOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; + + /** + * Verifies a FileOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; + + /** + * Creates a plain object from a FileOptions message. Also converts values to other types if specified. + * @param message FileOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FileOptions { + + /** OptimizeMode enum. */ + enum OptimizeMode { + SPEED = 1, + CODE_SIZE = 2, + LITE_RUNTIME = 3 + } + } + + /** Properties of a MessageOptions. */ + interface IMessageOptions { + + /** MessageOptions messageSetWireFormat */ + messageSetWireFormat?: (boolean|null); + + /** MessageOptions noStandardDescriptorAccessor */ + noStandardDescriptorAccessor?: (boolean|null); + + /** MessageOptions deprecated */ + deprecated?: (boolean|null); + + /** MessageOptions mapEntry */ + mapEntry?: (boolean|null); + + /** MessageOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a MessageOptions. */ + class MessageOptions implements IMessageOptions { + + /** + * Constructs a new MessageOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMessageOptions); + + /** MessageOptions messageSetWireFormat. */ + public messageSetWireFormat: boolean; + + /** MessageOptions noStandardDescriptorAccessor. */ + public noStandardDescriptorAccessor: boolean; + + /** MessageOptions deprecated. */ + public deprecated: boolean; + + /** MessageOptions mapEntry. */ + public mapEntry: boolean; + + /** MessageOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new MessageOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageOptions instance + */ + public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; + + /** + * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MessageOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; + + /** + * Decodes a MessageOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; + + /** + * Verifies a MessageOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; + + /** + * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. + * @param message MessageOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MessageOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldOptions. */ + interface IFieldOptions { + + /** FieldOptions ctype */ + ctype?: (google.protobuf.FieldOptions.CType|null); + + /** FieldOptions packed */ + packed?: (boolean|null); + + /** FieldOptions jstype */ + jstype?: (google.protobuf.FieldOptions.JSType|null); + + /** FieldOptions lazy */ + lazy?: (boolean|null); + + /** FieldOptions deprecated */ + deprecated?: (boolean|null); + + /** FieldOptions weak */ + weak?: (boolean|null); + + /** FieldOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a FieldOptions. */ + class FieldOptions implements IFieldOptions { + + /** + * Constructs a new FieldOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldOptions); + + /** FieldOptions ctype. */ + public ctype: google.protobuf.FieldOptions.CType; + + /** FieldOptions packed. */ + public packed: boolean; + + /** FieldOptions jstype. */ + public jstype: google.protobuf.FieldOptions.JSType; + + /** FieldOptions lazy. */ + public lazy: boolean; + + /** FieldOptions deprecated. */ + public deprecated: boolean; + + /** FieldOptions weak. */ + public weak: boolean; + + /** FieldOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new FieldOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldOptions instance + */ + public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; + + /** + * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; + + /** + * Decodes a FieldOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; + + /** + * Verifies a FieldOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; + + /** + * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. + * @param message FieldOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FieldOptions { + + /** CType enum. */ + enum CType { + STRING = 0, + CORD = 1, + STRING_PIECE = 2 + } + + /** JSType enum. */ + enum JSType { + JS_NORMAL = 0, + JS_STRING = 1, + JS_NUMBER = 2 + } + } + + /** Properties of an OneofOptions. */ + interface IOneofOptions { + + /** OneofOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an OneofOptions. */ + class OneofOptions implements IOneofOptions { + + /** + * Constructs a new OneofOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofOptions); + + /** OneofOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new OneofOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofOptions instance + */ + public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; + + /** + * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an OneofOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; + + /** + * Decodes an OneofOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; + + /** + * Verifies an OneofOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; + + /** + * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. + * @param message OneofOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this OneofOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumOptions. */ + interface IEnumOptions { + + /** EnumOptions allowAlias */ + allowAlias?: (boolean|null); + + /** EnumOptions deprecated */ + deprecated?: (boolean|null); + + /** EnumOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an EnumOptions. */ + class EnumOptions implements IEnumOptions { + + /** + * Constructs a new EnumOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumOptions); + + /** EnumOptions allowAlias. */ + public allowAlias: boolean; + + /** EnumOptions deprecated. */ + public deprecated: boolean; + + /** EnumOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new EnumOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumOptions instance + */ + public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; + + /** + * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; + + /** + * Decodes an EnumOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; + + /** + * Verifies an EnumOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; + + /** + * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. + * @param message EnumOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumValueOptions. */ + interface IEnumValueOptions { + + /** EnumValueOptions deprecated */ + deprecated?: (boolean|null); + + /** EnumValueOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an EnumValueOptions. */ + class EnumValueOptions implements IEnumValueOptions { + + /** + * Constructs a new EnumValueOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueOptions); + + /** EnumValueOptions deprecated. */ + public deprecated: boolean; + + /** EnumValueOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new EnumValueOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueOptions instance + */ + public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; + + /** + * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; + + /** + * Verifies an EnumValueOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; + + /** + * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. + * @param message EnumValueOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumValueOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ServiceOptions. */ + interface IServiceOptions { + + /** ServiceOptions deprecated */ + deprecated?: (boolean|null); + + /** ServiceOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a ServiceOptions. */ + class ServiceOptions implements IServiceOptions { + + /** + * Constructs a new ServiceOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceOptions); + + /** ServiceOptions deprecated. */ + public deprecated: boolean; + + /** ServiceOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new ServiceOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceOptions instance + */ + public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; + + /** + * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; + + /** + * Verifies a ServiceOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; + + /** + * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. + * @param message ServiceOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ServiceOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a MethodOptions. */ + interface IMethodOptions { + + /** MethodOptions deprecated */ + deprecated?: (boolean|null); + + /** MethodOptions idempotencyLevel */ + idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|null); + + /** MethodOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** MethodOptions .google.api.http */ + ".google.api.http"?: (google.api.IHttpRule|null); + } + + /** Represents a MethodOptions. */ + class MethodOptions implements IMethodOptions { + + /** + * Constructs a new MethodOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodOptions); + + /** MethodOptions deprecated. */ + public deprecated: boolean; + + /** MethodOptions idempotencyLevel. */ + public idempotencyLevel: google.protobuf.MethodOptions.IdempotencyLevel; + + /** MethodOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new MethodOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodOptions instance + */ + public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; + + /** + * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; + + /** + * Decodes a MethodOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; + + /** + * Verifies a MethodOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; + + /** + * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. + * @param message MethodOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MethodOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace MethodOptions { + + /** IdempotencyLevel enum. */ + enum IdempotencyLevel { + IDEMPOTENCY_UNKNOWN = 0, + NO_SIDE_EFFECTS = 1, + IDEMPOTENT = 2 + } + } + + /** Properties of an UninterpretedOption. */ + interface IUninterpretedOption { + + /** UninterpretedOption name */ + name?: (google.protobuf.UninterpretedOption.INamePart[]|null); + + /** UninterpretedOption identifierValue */ + identifierValue?: (string|null); + + /** UninterpretedOption positiveIntValue */ + positiveIntValue?: (number|Long|null); + + /** UninterpretedOption negativeIntValue */ + negativeIntValue?: (number|Long|null); + + /** UninterpretedOption doubleValue */ + doubleValue?: (number|null); + + /** UninterpretedOption stringValue */ + stringValue?: (Uint8Array|null); + + /** UninterpretedOption aggregateValue */ + aggregateValue?: (string|null); + } + + /** Represents an UninterpretedOption. */ + class UninterpretedOption implements IUninterpretedOption { + + /** + * Constructs a new UninterpretedOption. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IUninterpretedOption); + + /** UninterpretedOption name. */ + public name: google.protobuf.UninterpretedOption.INamePart[]; + + /** UninterpretedOption identifierValue. */ + public identifierValue: string; + + /** UninterpretedOption positiveIntValue. */ + public positiveIntValue: (number|Long); + + /** UninterpretedOption negativeIntValue. */ + public negativeIntValue: (number|Long); + + /** UninterpretedOption doubleValue. */ + public doubleValue: number; + + /** UninterpretedOption stringValue. */ + public stringValue: Uint8Array; + + /** UninterpretedOption aggregateValue. */ + public aggregateValue: string; + + /** + * Creates a new UninterpretedOption instance using the specified properties. + * @param [properties] Properties to set + * @returns UninterpretedOption instance + */ + public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; + + /** + * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; + + /** + * Verifies an UninterpretedOption message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UninterpretedOption + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; + + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @param message UninterpretedOption + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UninterpretedOption to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace UninterpretedOption { + + /** Properties of a NamePart. */ + interface INamePart { + + /** NamePart namePart */ + namePart: string; + + /** NamePart isExtension */ + isExtension: boolean; + } + + /** Represents a NamePart. */ + class NamePart implements INamePart { + + /** + * Constructs a new NamePart. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.UninterpretedOption.INamePart); + + /** NamePart namePart. */ + public namePart: string; + + /** NamePart isExtension. */ + public isExtension: boolean; + + /** + * Creates a new NamePart instance using the specified properties. + * @param [properties] Properties to set + * @returns NamePart instance + */ + public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; + + /** + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a NamePart message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; + + /** + * Decodes a NamePart message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; + + /** + * Verifies a NamePart message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns NamePart + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; + + /** + * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * @param message NamePart + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this NamePart to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a SourceCodeInfo. */ + interface ISourceCodeInfo { + + /** SourceCodeInfo location */ + location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); + } + + /** Represents a SourceCodeInfo. */ + class SourceCodeInfo implements ISourceCodeInfo { + + /** + * Constructs a new SourceCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ISourceCodeInfo); + + /** SourceCodeInfo location. */ + public location: google.protobuf.SourceCodeInfo.ILocation[]; + + /** + * Creates a new SourceCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns SourceCodeInfo instance + */ + public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; + + /** + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; + + /** + * Verifies a SourceCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SourceCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; + + /** + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. + * @param message SourceCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SourceCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace SourceCodeInfo { + + /** Properties of a Location. */ + interface ILocation { + + /** Location path */ + path?: (number[]|null); + + /** Location span */ + span?: (number[]|null); + + /** Location leadingComments */ + leadingComments?: (string|null); + + /** Location trailingComments */ + trailingComments?: (string|null); + + /** Location leadingDetachedComments */ + leadingDetachedComments?: (string[]|null); + } + + /** Represents a Location. */ + class Location implements ILocation { + + /** + * Constructs a new Location. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); + + /** Location path. */ + public path: number[]; + + /** Location span. */ + public span: number[]; + + /** Location leadingComments. */ + public leadingComments: string; + + /** Location trailingComments. */ + public trailingComments: string; + + /** Location leadingDetachedComments. */ + public leadingDetachedComments: string[]; + + /** + * Creates a new Location instance using the specified properties. + * @param [properties] Properties to set + * @returns Location instance + */ + public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; + + /** + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Location message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; + + /** + * Decodes a Location message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; + + /** + * Verifies a Location message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Location message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Location + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; + + /** + * Creates a plain object from a Location message. Also converts values to other types if specified. + * @param message Location + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Location to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a GeneratedCodeInfo. */ + interface IGeneratedCodeInfo { + + /** GeneratedCodeInfo annotation */ + annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); + } + + /** Represents a GeneratedCodeInfo. */ + class GeneratedCodeInfo implements IGeneratedCodeInfo { + + /** + * Constructs a new GeneratedCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IGeneratedCodeInfo); + + /** GeneratedCodeInfo annotation. */ + public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; + + /** + * Creates a new GeneratedCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns GeneratedCodeInfo instance + */ + public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; + + /** + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; + + /** + * Verifies a GeneratedCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GeneratedCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; + + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @param message GeneratedCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GeneratedCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace GeneratedCodeInfo { + + /** Properties of an Annotation. */ + interface IAnnotation { + + /** Annotation path */ + path?: (number[]|null); + + /** Annotation sourceFile */ + sourceFile?: (string|null); + + /** Annotation begin */ + begin?: (number|null); + + /** Annotation end */ + end?: (number|null); + } + + /** Represents an Annotation. */ + class Annotation implements IAnnotation { + + /** + * Constructs a new Annotation. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); + + /** Annotation path. */ + public path: number[]; + + /** Annotation sourceFile. */ + public sourceFile: string; + + /** Annotation begin. */ + public begin: number; + + /** Annotation end. */ + public end: number; + + /** + * Creates a new Annotation instance using the specified properties. + * @param [properties] Properties to set + * @returns Annotation instance + */ + public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Annotation message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Decodes an Annotation message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Verifies an Annotation message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Annotation + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Creates a plain object from an Annotation message. Also converts values to other types if specified. + * @param message Annotation + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Annotation to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + } +} diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 94d887496a0..8e0e91dd0df 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -21,23 +21,21 @@ import {promisifyAll} from '@google-cloud/promisify'; import * as arrify from 'arrify'; import {CallOptions} from 'google-gax'; -import {PubSub} from '.'; -export interface GetPolicyCallback { - (err?: Error|null, acl?: Policy|null): void; -} +import {google} from '../proto/iam'; -export interface SetPolicyCallback { - (err?: Error|null, acl?: Policy|null): void; -} +import {Omit, PubSub, RequestCallback, ResourceCallback} from '.'; + +export type Policy = { + etag?: string|Buffer +}&Omit; + +export type GetPolicyCallback = RequestCallback; +export type SetPolicyCallback = RequestCallback; export type SetPolicyResponse = [Policy]; export type GetPolicyResponse = [Policy]; -export interface PermissionsResponse { - permissions: string|string[]; -} - /** * Shows which IAM permissions is allowed. * The key to this object are the IAM permissions (string) and the values are @@ -47,43 +45,10 @@ export type IamPermissionsMap = { [key: string]: boolean }; -export type TestIamPermissionsResponse = [PermissionsResponse]; - -export interface TestIamPermissionsCallback { - (err?: Error|null, permissions?: IamPermissionsMap|null, - apiResponse?: PermissionsResponse): void; -} - -/** - * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy#Expr - */ -export interface Expr { - expression: string; - title: string; - description: string; - location: string; -} - -/** - * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy#Binding - */ -export interface Binding { - role: string; - members: string[]; - condition?: Expr; -} - -/** - * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy - */ -export interface Policy { - /** - * @deprecated - */ - version?: number; - etag?: string; - bindings: Binding[]; -} +export type TestIamPermissionsResponse = + [IamPermissionsMap, google.iam.v1.ITestIamPermissionsResponse]; +export type TestIamPermissionsCallback = ResourceCallback< + IamPermissionsMap, google.iam.v1.ITestIamPermissionsResponse>; /** * [IAM (Identity and Access @@ -282,7 +247,7 @@ export class IAM { policy, }; - this.request( + this.request( { client: 'SubscriberClient', method: 'setIamPolicy', @@ -394,7 +359,7 @@ export class IAM { permissions: arrify(permissions), }; - this.request( + this.request( { client: 'SubscriberClient', method: 'testIamPermissions', @@ -408,7 +373,7 @@ export class IAM { } const availablePermissions = arrify(resp!.permissions); - const permissionHash = + const permissionHash: IamPermissionsMap = (permissions as string[]).reduce((acc, permission) => { acc[permission] = availablePermissions.indexOf(permission) > -1; return acc; diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 3a60e11737d..5d8a3db02b7 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -33,10 +33,11 @@ const PKG = require('../../package.json'); const v1 = require('./v1'); import {Snapshot} from './snapshot'; -import {Subscription, SubscriptionMetadataRaw} from './subscription'; -import {Topic, PublishOptions} from './topic'; +import {Subscription, SubscriptionMetadata, SubscriptionOptions, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse} from './subscription'; +import {Topic, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, CreateTopicCallback, CreateTopicResponse} from './topic'; +import {PublishOptions} from './publisher'; import {CallOptions} from 'google-gax'; -import {Readable} from 'stream'; +import {Transform} from 'stream'; import {google} from '../proto/pubsub'; import {ServiceError, ChannelCredentials} from 'grpc'; import {FlowControlOptions} from './lease-manager'; @@ -45,152 +46,102 @@ import {BatchPublishOptions} from './publisher'; const opts = {} as gax.GrpcClientOptions; const {grpc} = new gax.GrpcClient(opts); -export interface GetTopicMetadataCallback { - (err?: ServiceError|null, res?: google.pubsub.v1.ITopic|null): void; -} +/** + * Project ID placeholder. + * @type {string} + * @private + */ +const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; + +export type Omit = Pick>; -export interface ClientConfig { - projectId?: string; - keyFilename?: string; +export interface ClientConfig extends gax.GrpcClientOptions { apiEndpoint?: string; - email?: string; - autoRetry?: boolean; - maxRetries?: number; - promise?: PromiseConstructor; servicePath?: string; - port?: string; + port?: string|number; sslCreds?: ChannelCredentials; } -// tslint:disable-next-line no-any -type Arguments = [(Error | null)?,(T| null)?,any?]; - -interface Options { +export interface PageOptions { gaxOpts?: CallOptions; pageSize?: number; pageToken?: string; autoPaginate?: boolean; } -export interface GetSnapshotsOptions extends Options {} -export interface GetSnapshotsCallback { - (err?: Error|null, snapshots?: Snapshot[]|null, apiResponse?: object): void; -} +export type GetSnapshotsCallback = + RequestCallback; -export interface GetSubscriptionsOptions extends Options { - topic?: Topic; - project?: string; -} -export interface GetSubscriptionsCallback { - (err?: Error|null, subscriptions?: Subscription[]|null, - apiResponse?: object): void; -} +export type GetSnapshotsResponse = + PagedResponse; -export interface GetTopicsOptions extends Options {} -export interface GetTopicsCallback { - (err?: Error|null, topics?: Topic[]|null, apiResponse?: object): void; -} +export type GetSubscriptionsOptions = PageOptions&{topic?: string | Topic}; -export type SeekCallback = RequestCallback; +type GetAllSubscriptionsCallback = + RequestCallback; -export interface GetSubscriptionMetadataCallback { - (err: ServiceError|null, res?: google.pubsub.v1.ISubscription|null): void; -} +type GetAllSubscriptionsResponse = + PagedResponse; -export interface ExistsCallback { - (err: Error|null, res?: boolean): void; -} +export type GetSubscriptionsCallback = + GetAllSubscriptionsCallback|GetTopicSubscriptionsCallback; -export interface GetCallOptions extends CallOptions { - autoCreate?: boolean; -} +export type GetSubscriptionsResponse = + GetAllSubscriptionsResponse|GetTopicSubscriptionsResponse; -export interface Attributes { - [key: string]: string; -} +export type GetTopicsCallback = + RequestCallback; -export interface SubscriptionCallOptions { - flowControl?: FlowControlOptions; - maxConnections?: number; - topic?: Topic; - ackDeadline?: number; - autoPaginate?: boolean; - gaxOpts?: CallOptions; - batching?: BatchPublishOptions; -} +export type GetTopicsResponse = + PagedResponse; -export interface CreateSnapshotCallback { - (err: Error|null, snapshot?: Snapshot|null, - apiResponse?: google.pubsub.v1.ISnapshot): void; -} +export type EmptyCallback = RequestCallback; +export type EmptyResponse = [google.protobuf.IEmpty]; -export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.ISnapshot]; +export type ExistsCallback = RequestCallback; +export type ExistsResponse = [boolean]; -/** - * Project ID placeholder. - * @type {string} - * @private - */ -const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; - -// tslint:disable-next-line:no-any -export type Metadata = any; - -export type CreateTopicResponse = [Topic, google.pubsub.v1.ITopic]; - -export interface CreateTopicCallback { - (err?: Error|null, topic?: Topic|null, - apiResponse?: google.pubsub.v1.ITopic): void; -} - -export interface CreateSubscriptionCallback { - (err?: Error|null, subscription?: Subscription|null, - apiResponse?: google.pubsub.v1.ISubscription): void; +export interface GetClientConfig { + client: 'PublisherClient'|'SubscriberClient'; } -export type Client = 'PublisherClient'|'SubscriberClient'; - -export interface RequestConfig { - client: Client; +export interface RequestConfig extends GetClientConfig { method: string; reqOpts?: object; gaxOpts?: CallOptions; } -export interface GetClientConfig { - client: Client; - method?: string; +export interface ResourceCallback { + (err: ServiceError|null, resource?: Resource|null, + response?: Response|null): void; } -export interface RequestCallback { - (err?: Error|null, res?: TResponse|null): void; +export type RequestCallback = + R extends void ? NormalCallback: PagedCallback; + +export interface NormalCallback { + (err: ServiceError|null, res?: TResponse|null): void; } -export type CreateSubscriptionResponse = - [Subscription, google.pubsub.v1.ISubscription]; +export interface PagedCallback { + (err: ServiceError|null, results?: Item[]|null, nextQuery?: {}|null, + response?: Response|null): void; +} +export type PagedResponse = + [Item[]]|[Item[], {} | null, Response]; -export interface CreateSubscriptionOptions { - flowControl?: FlowControlOptions; - gaxOpts?: CallOptions; - /** - * Duration in seconds. - */ - messageRetentionDuration?: number; - pushEndpoint?: string; -} +export type ObjectStream = { + addListener(event: 'data', listener: (data: O) => void): ObjectStream; + emit(event: 'data', data: O): boolean; + on(event: 'data', listener: (data: O) => void): ObjectStream; + once(event: 'data', listener: (data: O) => void): ObjectStream; + prependListener(event: 'data', listener: (data: O) => void): ObjectStream; + prependOnceListener(event: 'data', listener: (data: O) => void): + ObjectStream; +}&Transform; -/** - * Callback function to PubSub.getClient_(). - * @internal - */ interface GetClientCallback { - /** - * @param err - Error, if any. - * @param gaxClient - The gax client specified in RequestConfig.client. - * Typed any since it's importing Javascript source. - */ - // tslint:disable-next-line:no-any (err: Error|null, gaxClient?: gax.ClientStub): void; } @@ -261,9 +212,11 @@ export class PubSub { // tslint:disable-next-line variable-name Promise?: PromiseConstructor; getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => - Readable; - getSnapshotsStream = paginator.streamify('getSnapshots') as() => Readable; - getTopicsStream = paginator.streamify('getTopics') as() => Readable; + ObjectStream; + getSnapshotsStream = paginator.streamify('getSnapshots') as() => + ObjectStream; + getTopicsStream = paginator.streamify('getTopics') as() => + ObjectStream; constructor(options?: ClientConfig) { options = options || {}; @@ -413,7 +366,7 @@ export class PubSub { delete options.flowControl; const metadata = - Subscription.formatMetadata_(options as SubscriptionMetadataRaw); + Subscription.formatMetadata_(options as SubscriptionMetadata); let subscriptionCtorOptions = flowControl ? {flowControl} : {}; subscriptionCtorOptions = Object.assign(subscriptionCtorOptions, metadata); @@ -433,10 +386,10 @@ export class PubSub { }, (err, resp) => { if (err) { - callback!(err, null, resp!); + callback!(err, null, resp); return; } - subscription.metadata = resp; + subscription.metadata = resp!; callback!(null, subscription, resp!); }); } @@ -498,7 +451,7 @@ export class PubSub { callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; - this.request( + this.request( { client: 'PublisherClient', method: 'createTopic', @@ -510,8 +463,8 @@ export class PubSub { callback!(err, null, resp); return; } - topic.metadata = resp; - callback!(null, topic, resp); + topic.metadata = resp!; + callback!(null, topic, resp!); }); } /** @@ -538,6 +491,10 @@ export class PubSub { this.options.sslCreds = grpc.credentials.createInsecure(); this.isEmulator = true; } + + getSnapshots(option?: PageOptions): Promise; + getSnapshots(callback: GetSnapshotsCallback): void; + getSnapshots(option: PageOptions, callback: GetSnapshotsCallback): void; /** * Query object for listing snapshots. * @@ -584,15 +541,9 @@ export class PubSub { * const snapshots = data[0]; * }); */ - getSnapshots(option?: GetSnapshotsOptions): - Promise; - getSnapshots(callback: GetSnapshotsCallback): void; - getSnapshots(option: GetSnapshotsOptions, callback: GetSnapshotsCallback): - void; getSnapshots( - optionsOrCallback?: GetSnapshotsOptions|GetSnapshotsCallback, - callback?: GetSnapshotsCallback): - void|Promise { + optionsOrCallback?: PageOptions|GetSnapshotsCallback, + callback?: GetSnapshotsCallback): void|Promise { const self = this; const options = typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; @@ -610,25 +561,35 @@ export class PubSub { autoPaginate: options.autoPaginate, }, options.gaxOpts); - this.request( + this.request< + google.pubsub.v1.ISnapshot, google.pubsub.v1.IListSnapshotsResponse>( { client: 'SubscriberClient', method: 'listSnapshots', reqOpts, gaxOpts, }, - (...args: Arguments) => { - const snapshots = args[1]; - if (snapshots) { - args[1] = snapshots.map((snapshot: Snapshot) => { + (err, rawSnapshots, ...args) => { + let snapshots: Snapshot[]; + + if (rawSnapshots) { + snapshots = rawSnapshots.map(snapshot => { const snapshotInstance = self.snapshot(snapshot.name!); snapshotInstance.metadata = snapshot; return snapshotInstance; }); } - callback!(...args); + + callback!(err, snapshots!, ...args); }); } + + getSubscriptions(options?: GetSubscriptionsOptions): + Promise; + getSubscriptions(callback: GetSubscriptionsCallback): void; + getSubscriptions( + options: GetSubscriptionsOptions, + callback: GetSubscriptionsCallback): void; /** * Query object for listing subscriptions. * @@ -686,12 +647,6 @@ export class PubSub { * const subscriptions = data[0]; * }); */ - getSubscriptions(options?: GetSubscriptionsOptions): - Promise; - getSubscriptions(callback: GetSubscriptionsCallback): void; - getSubscriptions( - options: GetSubscriptionsOptions, - callback: GetSubscriptionsCallback): void; getSubscriptions( optionsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback, callback?: GetSubscriptionsCallback): @@ -707,36 +662,50 @@ export class PubSub { if (!(topic instanceof Topic)) { topic = this.topic(topic); } - return topic.getSubscriptions(options, callback!); + return topic.getSubscriptions( + options, callback as GetTopicSubscriptionsCallback); } - const reqOpts = Object.assign({}, options); + const reqOpts = Object.assign({}, options) as + google.pubsub.v1.IListSubscriptionsRequest; reqOpts.project = 'projects/' + this.projectId; - delete reqOpts.gaxOpts; - delete reqOpts.autoPaginate; + + delete (reqOpts as GetSubscriptionsOptions).gaxOpts; + delete (reqOpts as GetSubscriptionsOptions).autoPaginate; + const gaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, options.gaxOpts); - this.request( + + this.request< + google.pubsub.v1.ISubscription, + google.pubsub.v1.IListSubscriptionsResponse>( { client: 'SubscriberClient', method: 'listSubscriptions', reqOpts, gaxOpts, }, - (...args: Arguments) => { - const subscriptions = args[1]; - if (subscriptions) { - args[1] = subscriptions.map((sub: Subscription) => { - const subscriptionInstance = self.subscription(sub.name); + (err, rawSubs, ...args) => { + let subscriptions: Subscription[]; + + if (rawSubs) { + subscriptions = rawSubs.map(sub => { + const subscriptionInstance = self.subscription(sub.name!); subscriptionInstance.metadata = sub; return subscriptionInstance; }); } - callback!(...args); + + (callback as GetAllSubscriptionsCallback)( + err, subscriptions!, ...args); }); } + + getTopics(options: PageOptions): Promise; + getTopics(callback: GetTopicsCallback): void; + getTopics(options: PageOptions, callback: GetTopicsCallback): void; /** * Query object for listing topics. * @@ -793,14 +762,9 @@ export class PubSub { * const topics = data[0]; * }); */ - getTopics(options: GetTopicsOptions): - Promise; - getTopics(callback: GetTopicsCallback): void; - getTopics(options: GetTopicsOptions, callback: GetTopicsCallback): void; getTopics( - optionsOrCallback?: GetTopicsOptions|GetTopicsCallback, - callback?: GetTopicsCallback): - void|Promise { + optionsOrCallback?: PageOptions|GetTopicsCallback, + callback?: GetTopicsCallback): void|Promise { const self = this; const options = typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; @@ -819,25 +783,35 @@ export class PubSub { autoPaginate: options.autoPaginate, }, options.gaxOpts); - this.request( + this.request( { client: 'PublisherClient', method: 'listTopics', reqOpts, gaxOpts, }, - (...args: Arguments) => { - const topics = args[1]; - if (topics) { - args[1] = topics.map((topic: Topic) => { + (err, rawTopics, ...args) => { + let topics: Topic[]; + + if (rawTopics) { + topics = rawTopics.map(topic => { const topicInstance = self.topic(topic.name); topicInstance.metadata = topic; return topicInstance; }); } - callback!(...args); + + callback!(err, topics!, ...args); }); } + /** + * Callback function to PubSub.getClient_(). + * @private + * @callback GetClientCallback + * @param err - Error, if any. + * @param gaxClient - The gax client specified in RequestConfig.client. + * Typed any since it's importing Javascript source. + */ /** * Get the PubSub client object. * @@ -885,9 +859,7 @@ export class PubSub { * @param {object} config.reqOpts Request options. * @param {function} [callback] The callback function. */ - // tslint:disable-next-line:no-any - request( - config: RequestConfig, callback: RequestCallback) { + request(config: RequestConfig, callback: RequestCallback) { const self = this; this.getClient_(config, (err, client) => { if (err) { @@ -914,7 +886,7 @@ export class PubSub { * * const snapshot = pubsub.snapshot('my-snapshot'); */ - snapshot(name: string) { + snapshot(name: string): Snapshot { if (!is.string(name)) { throw new Error('You must supply a valid name for the snapshot.'); } @@ -947,7 +919,7 @@ export class PubSub { * // message.publishTime = Date when Pub/Sub received the message. * }); */ - subscription(name: string, options?: SubscriptionCallOptions) { + subscription(name: string, options?: SubscriptionOptions): Subscription { if (!name) { throw new Error('A name must be specified for a subscription.'); } diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index a738268e710..fe434b2e8e0 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -23,7 +23,7 @@ const each = require('async-each'); import * as extend from 'extend'; import * as is from 'is'; import {Topic} from './topic'; -import {Attributes} from '.'; +import {RequestCallback} from '.'; import {ServiceError} from 'grpc'; interface Inventory { @@ -32,10 +32,10 @@ interface Inventory { bytes: number; } -export interface PublishCallback { - (err?: ServiceError|null, messageId?: string|null): void; -} - +export type Attributes = { + [key: string]: string +}; +export type PublishCallback = RequestCallback; /** * @typedef BatchPublishOptions diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 275ee2dcab3..164827500ee 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -19,10 +19,18 @@ import {CallOptions} from 'google-gax'; import {google} from '../proto/pubsub'; -import {CreateSnapshotCallback, CreateSnapshotResponse, RequestCallback, SeekCallback, Subscription} from '.'; +import {EmptyCallback, EmptyResponse, RequestCallback, ResourceCallback} from '.'; import {PubSub} from './index'; +import {Subscription} from './subscription'; import * as util from './util'; +export type CreateSnapshotCallback = + ResourceCallback; +export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.ISnapshot]; + +export type SeekCallback = RequestCallback; +export type SeekResponse = [google.pubsub.v1.ISnapshot]; + /** * A Snapshot object will give you access to your Cloud Pub/Sub snapshot. * @@ -92,7 +100,7 @@ export class Snapshot { name: string; // tslint:disable-next-line variable-name Promise?: PromiseConstructor; - metadata!: google.pubsub.v1.ISnapshot; + metadata?: google.pubsub.v1.ISnapshot; constructor(parent: Subscription|PubSub, name: string) { if (parent instanceof PubSub) { this.Promise = parent.Promise; @@ -101,8 +109,8 @@ export class Snapshot { this.name = Snapshot.formatName_(parent.projectId, name); } - delete(): Promise; - delete(callback: RequestCallback): void; + delete(): Promise; + delete(callback: EmptyCallback): void; /** * Delete the snapshot. * @@ -122,8 +130,7 @@ export class Snapshot { * const apiResponse = data[0]; * }); */ - delete(callback?: RequestCallback): - void|Promise { + delete(callback?: EmptyCallback): void|Promise { const reqOpts = { snapshot: this.name, }; @@ -192,11 +199,22 @@ export class Snapshot { throw new Error( `This is only available if you accessed this object through Subscription#snapshot`); } - return (this.parent as Subscription) - .createSnapshot(this.name, gaxOpts! as CallOptions, callback!); + + const options = typeof gaxOpts === 'function' ? {} : gaxOpts; + callback = typeof gaxOpts === 'function' ? gaxOpts : callback; + + return this.parent.createSnapshot( + this.name, gaxOpts! as CallOptions, (err, snapshot, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + Object.assign(this, snapshot); + callback!(null, this, resp); + }); } - seek(gaxOpts?: CallOptions): Promise; + seek(gaxOpts?: CallOptions): Promise; seek(callback: SeekCallback): void; seek(gaxOpts: CallOptions, callback: SeekCallback): void; /** @@ -225,13 +243,12 @@ export class Snapshot { * }); */ seek(gaxOpts?: CallOptions|SeekCallback, callback?: SeekCallback): - void|Promise { + void|Promise { if (!(this.parent instanceof Subscription)) { throw new Error( `This is only available if you accessed this object through Subscription#snapshot`); } - return (this.parent as Subscription) - .seek(this.name, gaxOpts! as CallOptions, callback!); + return this.parent.seek(this.name, gaxOpts! as CallOptions, callback!); } } diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 8fb1e2e8a95..a1a6ec69dfc 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -23,44 +23,46 @@ import * as snakeCase from 'lodash.snakecase'; import {google} from '../proto/pubsub'; -import {CreateSnapshotCallback, CreateSnapshotResponse, CreateSubscriptionCallback, CreateSubscriptionResponse, ExistsCallback, GetCallOptions, GetSubscriptionMetadataCallback, Metadata, PubSub, RequestCallback, SeekCallback, SubscriptionCallOptions} from '.'; +import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, Omit, PubSub, RequestCallback, ResourceCallback} from '.'; import {IAM} from './iam'; -import {Snapshot} from './snapshot'; -import {Subscriber, SubscriberOptions} from './subscriber'; +import {FlowControlOptions} from './lease-manager'; +import {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot'; +import {Message, Subscriber, SubscriberOptions} from './subscriber'; +import {Topic} from './topic'; import {noop} from './util'; -/** - * @see https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Duration - */ -export interface Duration { - seconds: number; - nanos: number; -} +export type SubscriptionMetadata = { + messageRetentionDuration?: google.protobuf.IDuration|number; + pushEndpoint?: string; +}&Omit; -/** - * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions - */ -export interface TSubscriptionMetadata { - name: string; - topic: string; - pushConfig?: google.pubsub.v1.IPushConfig; - ackDeadlineSeconds?: number; - retainAckedMessages?: boolean; - labels?: {[key: string]: string;}; - expirationPolicy?: {ttl: string;}; -} +export type SubscriptionOptions = SubscriberOptions&{topic?: Topic}; +export type SubscriptionCloseCallback = (err?: Error) => void; -export interface SubscriptionMetadataRaw extends TSubscriptionMetadata { - /** - * Duration in seconds. - */ - messageRetentionDuration?: number; - pushEndpoint?: string; -} +type SubscriptionCallback = + ResourceCallback; +type SubscriptionResponse = [Subscription, google.pubsub.v1.ISubscription]; -export interface SubscriptionMetadata extends TSubscriptionMetadata { - messageRetentionDuration?: Duration; -} +export type CreateSubscriptionOptions = SubscriptionMetadata&{ + gaxOpts?: CallOptions; + flowControl?: FlowControlOptions; +}; + +export type CreateSubscriptionCallback = SubscriptionCallback; +export type CreateSubscriptionResponse = SubscriptionResponse; + +export type GetSubscriptionOptions = CallOptions&{autoCreate?: boolean}; +export type GetSubscriptionCallback = SubscriptionCallback; +export type GetSubscriptionResponse = SubscriptionCallback; + +type MetadataCallback = RequestCallback; +type MetadataResponse = [google.pubsub.v1.ISubscription]; + +export type GetSubscriptionMetadataCallback = MetadataCallback; +export type GetSubscriptionMetadataResponse = MetadataResponse; + +export type SetSubscriptionMetadataCallback = MetadataCallback; +export type SetSubscriptionMetadataResponse = MetadataResponse; /** * @typedef {object} ExpirationPolicy @@ -188,14 +190,13 @@ export interface SubscriptionMetadata extends TSubscriptionMetadata { */ export class Subscription extends EventEmitter { pubsub: PubSub; - create!: Function; iam: IAM; name: string; - - metadata: Metadata; + topic?: Topic; + metadata?: google.pubsub.v1.ISubscription; request: typeof PubSub.prototype.request; private _subscriber: Subscriber; - constructor(pubsub: PubSub, name: string, options?: SubscriptionCallOptions) { + constructor(pubsub: PubSub, name: string, options?: SubscriptionOptions) { super(); options = options || {}; @@ -204,10 +205,7 @@ export class Subscription extends EventEmitter { // tslint:disable-next-line no-any this.request = pubsub.request.bind(pubsub) as any; this.name = Subscription.formatName_(this.projectId, name); - - if (options.topic) { - this.create = pubsub.createSubscription.bind(pubsub, options.topic, name); - } + this.topic = options.topic; /** * [IAM (Identity and Access @@ -247,7 +245,7 @@ export class Subscription extends EventEmitter { */ this.iam = new IAM(pubsub, this.name); - this._subscriber = new Subscriber(this, options as SubscriberOptions); + this._subscriber = new Subscriber(this, options); this._subscriber.on('error', err => this.emit('error', err)) .on('message', message => this.emit('message', message)) .on('close', () => this.emit('close')); @@ -272,7 +270,7 @@ export class Subscription extends EventEmitter { } close(): Promise; - close(callback: RequestCallback): void; + close(callback: SubscriptionCloseCallback): void; /** * Closes the Subscription, once this is called you will no longer receive * message events unless you call {Subscription#open} or add new message @@ -292,10 +290,72 @@ export class Subscription extends EventEmitter { * // If the callback is omitted a Promise will be returned. * subscription.close().then(() => {}); */ - close(callback?: RequestCallback): void|Promise { + close(callback?: SubscriptionCloseCallback): void|Promise { this._subscriber.close().then(() => callback!(), callback); } + create(options?: CreateSubscriptionOptions): + Promise; + create(callback: CreateSubscriptionCallback): void; + create( + options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback): void; + /** + * Create a subscription. + * + * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * + * @throws {Error} If subscription name is omitted. + * + * @param {string} name The name of the subscription. + * @param {CreateSubscriptionRequest} [options] See a + * [Subscription + * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * @param {CreateSubscriptionCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('newMessages'); + * const callback = function(err, subscription, apiResponse) {}; + * + * subscription.create(callback); + * + * @example With options + * subscription.create({ + * ackDeadlineSeconds: 90 + * }, callback); + * + * @example If the callback is omitted, we'll return a + * Promise. const [sub, apiResponse] = await subscription.create(); + */ + create( + optsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, + callback?: CreateSubscriptionCallback): + void|Promise { + if (!this.topic) { + throw new Error( + 'Subscriptions can only be created when accessed through Topics'); + } + + const name = this.name.split('/').pop(); + const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + + this.pubsub.createSubscription( + this.topic, name!, options, (err, sub, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + Object.assign(this, sub); + callback!(null, this, resp); + }); + } + createSnapshot(name: string, callback: CreateSnapshotCallback): void; createSnapshot(name: string, gaxOpts?: CallOptions): Promise; @@ -370,7 +430,7 @@ export class Subscription extends EventEmitter { }, (err, resp) => { if (err) { - callback!(err, null, resp!); + callback!(err, null, resp); return; } snapshot.metadata = resp!; @@ -378,11 +438,9 @@ export class Subscription extends EventEmitter { }); } - delete(callback: RequestCallback): void; - delete(gaxOpts?: CallOptions): Promise; - delete( - gaxOpts: CallOptions, - callback: RequestCallback): void; + delete(callback: EmptyCallback): void; + delete(gaxOpts?: CallOptions): Promise; + delete(gaxOpts: CallOptions, callback: EmptyCallback): void; /** * Delete the subscription. Pull requests from the current subscription will * be errored once unsubscription is complete. @@ -413,9 +471,8 @@ export class Subscription extends EventEmitter { * }); */ delete( - gaxOptsOrCallback?: CallOptions|RequestCallback, - callback?: RequestCallback): - void|Promise { + gaxOptsOrCallback?: CallOptions|EmptyCallback, + callback?: EmptyCallback): void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -431,17 +488,17 @@ export class Subscription extends EventEmitter { this._subscriber.close(); } - this.request( + this.request( { client: 'SubscriberClient', method: 'deleteSubscription', reqOpts, gaxOpts, }, - callback); + callback!); } - exists(): Promise; + exists(): Promise; exists(callback: ExistsCallback): void; /** * @typedef {array} SubscriptionExistsResponse @@ -474,7 +531,7 @@ export class Subscription extends EventEmitter { * const exists = data[0]; * }); */ - exists(callback?: ExistsCallback): void|Promise { + exists(callback?: ExistsCallback): void|Promise { this.getMetadata(err => { if (!err) { callback!(null, true); @@ -489,9 +546,9 @@ export class Subscription extends EventEmitter { }); } - get(callback: CreateSubscriptionCallback): void; - get(gaxOpts?: GetCallOptions): Promise; - get(gaxOpts: GetCallOptions, callback: CreateSubscriptionCallback): void; + get(callback: GetSubscriptionCallback): void; + get(gaxOpts?: GetSubscriptionOptions): Promise; + get(gaxOpts: GetSubscriptionOptions, callback: GetSubscriptionCallback): void; /** * @typedef {array} GetSubscriptionResponse * @property {Subscription} 0 The {@link Subscription}. @@ -532,14 +589,14 @@ export class Subscription extends EventEmitter { * const apiResponse = data[1]; * }); */ - get(gaxOptsOrCallback?: GetCallOptions|CreateSubscriptionCallback, - callback?: CreateSubscriptionCallback): - void|Promise { + get(gaxOptsOrCallback?: GetSubscriptionOptions|GetSubscriptionCallback, + callback?: GetSubscriptionCallback): + void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; - const autoCreate = !!gaxOpts.autoCreate && is.fn(this.create); + const autoCreate = !!gaxOpts.autoCreate && this.topic; delete gaxOpts.autoCreate; this.getMetadata(gaxOpts, (err, apiResponse) => { if (!err) { @@ -548,15 +605,15 @@ export class Subscription extends EventEmitter { } if (err.code !== 5 || !autoCreate) { - callback!(err, null, apiResponse!); + callback!(err, null, apiResponse); return; } - this.create(gaxOpts, callback); + this.create({gaxOpts}, callback!); }); } - getMetadata(gaxOpts?: CallOptions): Promise; + getMetadata(gaxOpts?: CallOptions): Promise; getMetadata(callback: GetSubscriptionMetadataCallback): void; getMetadata(gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback): void; @@ -600,7 +657,7 @@ export class Subscription extends EventEmitter { getMetadata( gaxOptsOrCallback?: CallOptions|GetSubscriptionMetadataCallback, callback?: GetSubscriptionMetadataCallback): - void|Promise { + void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -617,20 +674,19 @@ export class Subscription extends EventEmitter { }, (err, apiResponse) => { if (!err) { - this.metadata = apiResponse; + this.metadata = apiResponse!; } - callback!(err!, apiResponse); + callback!(err!, apiResponse!); }); } modifyPushConfig(config: google.pubsub.v1.IPushConfig, gaxOpts?: CallOptions): - Promise; + Promise; modifyPushConfig( - config: google.pubsub.v1.IPushConfig, - callback: RequestCallback): void; + config: google.pubsub.v1.IPushConfig, callback: EmptyCallback): void; modifyPushConfig( config: google.pubsub.v1.IPushConfig, gaxOpts: CallOptions, - callback: RequestCallback): void; + callback: EmptyCallback): void; /** * @typedef {array} ModifyPushConfigResponse * @property {object} 0 The full API response. @@ -681,9 +737,8 @@ export class Subscription extends EventEmitter { */ modifyPushConfig( config: google.pubsub.v1.IPushConfig, - gaxOptsOrCallback?: CallOptions|RequestCallback, - callback?: RequestCallback): - void|Promise { + gaxOptsOrCallback?: CallOptions|EmptyCallback, + callback?: EmptyCallback): void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -692,7 +747,7 @@ export class Subscription extends EventEmitter { subscription: this.name, pushConfig: config, }; - this.request( + this.request( { client: 'SubscriberClient', method: 'modifyPushConfig', @@ -729,8 +784,7 @@ export class Subscription extends EventEmitter { } } - seek(snapshot: string|Date, gaxOpts?: CallOptions): - Promise; + seek(snapshot: string|Date, gaxOpts?: CallOptions): Promise; seek(snapshot: string|Date, callback: SeekCallback): void; seek(snapshot: string|Date, gaxOpts: CallOptions, callback: SeekCallback): void; @@ -773,32 +827,25 @@ export class Subscription extends EventEmitter { */ seek( snapshot: string|Date, gaxOptsOrCallback?: CallOptions|SeekCallback, - callback?: SeekCallback): void|Promise { + callback?: SeekCallback): void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; - interface ReqOpts { - subscription?: string; - snapshot?: string; - time?: Date; - } - const reqOpts: ReqOpts = { + const reqOpts: google.pubsub.v1.ISeekRequest = { subscription: this.name, }; if (typeof snapshot === 'string') { reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); - - - } else if (is.date(snapshot)) { - reqOpts.time = snapshot as Date; + reqOpts.time = snapshot as google.protobuf.ITimestamp; } else { throw new Error('Either a snapshot name or Date is needed to seek to.'); } - this.request( + + this.request( { client: 'SubscriberClient', method: 'seek', @@ -808,14 +855,14 @@ export class Subscription extends EventEmitter { callback!); } - setMetadata(metadata: Metadata, gaxOpts?: CallOptions): - Promise; + setMetadata(metadata: SubscriptionMetadata, gaxOpts?: CallOptions): + Promise; setMetadata( - metadata: Metadata, - callback: RequestCallback): void; + metadata: SubscriptionMetadata, + callback: SetSubscriptionMetadataCallback): void; setMetadata( - metadata: Metadata, gaxOpts: CallOptions, - callback: RequestCallback): void; + metadata: SubscriptionMetadata, gaxOpts: CallOptions, + callback: SetSubscriptionMetadataCallback): void; /** * @typedef {array} SetSubscriptionMetadataResponse * @property {object} 0 The full API response. @@ -853,11 +900,10 @@ export class Subscription extends EventEmitter { * }); */ setMetadata( - metadata: Metadata, - gaxOptsOrCallback?: CallOptions| - RequestCallback, - callback?: RequestCallback): - void|Promise { + metadata: SubscriptionMetadata, + gaxOptsOrCallback?: CallOptions|SetSubscriptionMetadataCallback, + callback?: SetSubscriptionMetadataCallback): + void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -872,7 +918,7 @@ export class Subscription extends EventEmitter { paths: fields, }, }; - this.request( + this.request( { client: 'SubscriberClient', method: 'updateSubscription', @@ -928,31 +974,26 @@ export class Subscription extends EventEmitter { * * @private */ - static formatMetadata_(metadata: SubscriptionMetadataRaw): - SubscriptionMetadata { - let formatted = {} as SubscriptionMetadata; + static formatMetadata_(metadata: SubscriptionMetadata): + google.pubsub.v1.ISubscription { + const formatted = extend(true, {}, metadata); - if (metadata.messageRetentionDuration) { + if (typeof metadata.messageRetentionDuration === 'number') { formatted.retainAckedMessages = true; - formatted.messageRetentionDuration = { + (formatted as google.pubsub.v1.ISubscription).messageRetentionDuration = { seconds: metadata.messageRetentionDuration, nanos: 0, }; - delete metadata.messageRetentionDuration; - delete metadata.retainAckedMessages; } if (metadata.pushEndpoint) { formatted.pushConfig = { pushEndpoint: metadata.pushEndpoint, }; - delete metadata.pushEndpoint; + delete formatted.pushEndpoint; } - formatted = extend(true, formatted, metadata); - - - return formatted; + return formatted as google.pubsub.v1.ISubscription; } /*! * Format the name of a subscription. A subscription's full name is in the diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 5ace355896f..906aa88ff59 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -22,12 +22,31 @@ import {Readable} from 'stream'; import {google} from '../proto/pubsub'; -import {Attributes, CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, CreateTopicCallback, CreateTopicResponse, ExistsCallback, GetCallOptions, GetTopicMetadataCallback, Metadata, PubSub, RequestCallback, SubscriptionCallOptions} from '.'; +import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, ObjectStream, PagedResponse, PageOptions, PubSub, RequestCallback, ResourceCallback} from '.'; import {IAM} from './iam'; -import {PublishCallback, Publisher, PublishOptions} from './publisher'; -import {Subscription} from './subscription'; +import {Attributes, PublishCallback, Publisher, PublishOptions} from './publisher'; +import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, Subscription, SubscriptionOptions} from './subscription'; import * as util from './util'; +type TopicCallback = ResourceCallback; +type TopicResponse = [Topic, google.pubsub.v1.ITopic]; + +export type CreateTopicCallback = TopicCallback; +export type CreateTopicResponse = TopicResponse; + +export type GetTopicCallback = TopicCallback; +export type GetTopicResponse = TopicResponse; + +export type GetTopicOptions = CallOptions&{autoCreate?: boolean}; + +export type GetTopicMetadataCallback = RequestCallback; +export type GetTopicMetadataResponse = [google.pubsub.v1.ITopic]; + +export type GetTopicSubscriptionsCallback = RequestCallback< + Subscription, google.pubsub.v1.IListTopicSubscriptionsResponse>; +export type GetTopicSubscriptionsResponse = PagedResponse< + Subscription, google.pubsub.v1.IListTopicSubscriptionsResponse>; + /** * A Topic object allows you to interact with a Cloud Pub/Sub topic. * @@ -49,10 +68,10 @@ export class Topic { pubsub: PubSub; request: typeof PubSub.prototype.request; iam: IAM; - metadata: Metadata; + metadata?: google.pubsub.v1.ITopic; publisher: Publisher; getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => - Readable; + ObjectStream; constructor(pubsub: PubSub, name: string, options?: PublishOptions) { if (pubsub.Promise) { @@ -221,11 +240,9 @@ export class Topic { this, name, options as CreateSubscriptionOptions, callback!); } - delete(callback: RequestCallback): void; - delete(gaxOpts?: CallOptions): Promise; - delete( - gaxOpts: CallOptions, - callback: RequestCallback): void; + delete(callback: EmptyCallback): void; + delete(gaxOpts?: CallOptions): Promise; + delete(gaxOpts: CallOptions, callback: EmptyCallback): void; /** * Delete the topic. This will not delete subscriptions to this topic. * @@ -254,9 +271,8 @@ export class Topic { * }); */ delete( - gaxOptsOrCallback?: CallOptions|RequestCallback, - callback?: RequestCallback): - void|Promise { + gaxOptsOrCallback?: CallOptions|EmptyCallback, + callback?: EmptyCallback): void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -266,7 +282,7 @@ export class Topic { const reqOpts = { topic: this.name, }; - this.request( + this.request( { client: 'PublisherClient', method: 'deleteTopic', @@ -276,6 +292,8 @@ export class Topic { callback); } + exists(): Promise; + exists(callback: ExistsCallback): void; /** * @typedef {array} TopicExistsResponse * @property {boolean} 0 Whether the topic exists @@ -306,10 +324,10 @@ export class Topic { * const exists = data[0]; * }); */ - exists(callback: ExistsCallback) { + exists(callback?: ExistsCallback): void|Promise { this.getMetadata((err) => { if (!err) { - callback(null, true); + callback!(null, true); return; } let code = 0; @@ -319,16 +337,16 @@ export class Topic { .value; } if (code === 5) { - callback(null, false); + callback!(null, false); return; } - callback(err); + callback!(err); }); } - get(callback: CreateTopicCallback): void; - get(gaxOpts?: GetCallOptions): Promise; - get(gaxOpts: GetCallOptions, callback: CreateTopicCallback): void; + get(callback: GetTopicCallback): void; + get(gaxOpts?: GetTopicOptions): Promise; + get(gaxOpts: GetTopicOptions, callback: GetTopicCallback): void; /** * @typedef {array} GetTopicResponse * @property {Topic} 0 The {@link Topic}. @@ -368,8 +386,8 @@ export class Topic { * const apiResponse = data[1]; * }); */ - get(gaxOptsOrCallback?: GetCallOptions|CreateTopicCallback, - callback?: CreateTopicCallback): void|Promise { + get(gaxOptsOrCallback?: GetTopicOptions|GetTopicCallback, + callback?: GetTopicCallback): void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -397,7 +415,7 @@ export class Topic { getMetadata(callback: GetTopicMetadataCallback): void; getMetadata(gaxOpts: CallOptions, callback: GetTopicMetadataCallback): void; - getMetadata(gaxOpts?: CallOptions): Promise; + getMetadata(gaxOpts?: CallOptions): Promise; /** * @typedef {array} GetTopicMetadataResponse * @property {object} 0 The full API response. @@ -435,7 +453,7 @@ export class Topic { getMetadata( gaxOptsOrCallback?: CallOptions|GetTopicMetadataCallback, callback?: GetTopicMetadataCallback): - void|Promise { + void|Promise { const gaxOpts = typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; callback = @@ -452,19 +470,17 @@ export class Topic { }, (err, apiResponse) => { if (!err) { - this.metadata = apiResponse; + this.metadata = apiResponse!; } - callback!(err, apiResponse); + callback!(err, apiResponse!); }); } - getSubscriptions(callback: RequestCallback): void; - getSubscriptions( - options: SubscriptionCallOptions, - callback: RequestCallback): void; + getSubscriptions(callback: GetTopicSubscriptionsCallback): void; getSubscriptions( - options?: SubscriptionCallOptions, - ): Promise; + options: PageOptions, callback: GetTopicSubscriptionsCallback): void; + getSubscriptions(options?: PageOptions): + Promise; /** * Get a list of the subscriptions registered to this topic. You may * optionally provide a query object as the first argument to customize the @@ -502,45 +518,46 @@ export class Topic { * }); */ getSubscriptions( - optionsOrCallback?: SubscriptionCallOptions| - RequestCallback, - callback?: RequestCallback): - void|Promise { + optionsOrCallback?: PageOptions|GetTopicSubscriptionsCallback, + callback?: GetTopicSubscriptionsCallback): + void|Promise { const self = this; const options = typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; callback = typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; - const reqOpts = Object.assign( - { - topic: this.name, - }, - options as SubscriptionCallOptions); - delete reqOpts.gaxOpts; - delete reqOpts.autoPaginate; + const reqOpts: google.pubsub.v1.IListTopicSubscriptionsRequest = + Object.assign( + { + topic: this.name, + }, + options as SubscriptionOptions); + + delete (reqOpts as PageOptions).gaxOpts; + delete (reqOpts as PageOptions).autoPaginate; + const gaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, options.gaxOpts); - this.request( + + this.request( { client: 'PublisherClient', method: 'listTopicSubscriptions', reqOpts, gaxOpts, }, - // tslint:disable-next-line no-any - (...args: any[]) => { - const subscriptions = args[1]; - if (subscriptions) { - args[1] = subscriptions.map((sub: string) => { - // ListTopicSubscriptions only returns sub names - return self.subscription(sub); - }); + (err, subNames, ...args) => { + let subscriptions: Subscription[]; + + if (subNames) { + subscriptions = subNames.map(sub => this.subscription(sub)); } - callback!(...args); + + callback!(err, subscriptions!, ...args); }); } @@ -729,7 +746,7 @@ export class Topic { * // message.publishTime = Timestamp when Pub/Sub received the message. * }); */ - subscription(name: string, options?: SubscriptionCallOptions): Subscription { + subscription(name: string, options?: SubscriptionOptions): Subscription { options = options || {}; options.topic = this; return this.pubsub.subscription(name, options); diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index fcd9e09b01a..5b75e3a79d3 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -368,15 +368,12 @@ describe('pubsub', () => { .then(() => { return subscription.getMetadata(); }) - .then(data => { - const metadata = data[0]; + .then(([metadata]) => { + const {seconds, nanos} = metadata.messageRetentionDuration!; assert.strictEqual(metadata.retainAckedMessages, true); - assert.strictEqual( - Number(metadata.messageRetentionDuration.seconds), - threeDaysInSeconds); - assert.strictEqual( - Number(metadata.messageRetentionDuration.nanos), 0); + assert.strictEqual(Number(seconds), threeDaysInSeconds); + assert.strictEqual(Number(nanos), 0); }); }); diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index db3556914e4..67d32ec5043 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -88,16 +88,16 @@ describe('IAM', () => { describe('getPolicy', () => { it('should make the correct API request', done => { - iam.request = (config, callback) => { + iam.request = (config) => { const reqOpts = {resource: iam.id}; assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getIamPolicy'); assert.deepStrictEqual(config.reqOpts, reqOpts); - callback(); // done() + done(); }; - iam.getPolicy(done); + iam.getPolicy(assert.ifError); }); it('should accept gax options', done => { @@ -113,7 +113,7 @@ describe('IAM', () => { }); describe('setPolicy', () => { - const policy = {etag: 'ACAB', bindings: []} as iamTypes.Policy; + const policy: iamTypes.Policy = {etag: 'ACAB', bindings: []}; it('should throw an error if a policy is not supplied', () => { assert.throws(() => { @@ -123,16 +123,16 @@ describe('IAM', () => { }); it('should make the correct API request', done => { - iam.request = (config, callback) => { + iam.request = (config) => { const reqOpts = {resource: iam.id, policy}; assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'setIamPolicy'); assert.deepStrictEqual(config.reqOpts, reqOpts); - callback(); // done() + done(); }; - iam.setPolicy(policy, done); + iam.setPolicy(policy, assert.ifError); }); it('should accept gax options', done => { diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index a79e974558a..34a9c30f320 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -748,7 +748,7 @@ describe('PubSub', () => { it('should pass back all parameters', done => { const err_ = new Error('abc'); - const snapshots_ = null; + const snapshots_ = undefined; const nextQuery_ = {}; const apiResponse_ = {}; @@ -833,7 +833,7 @@ describe('PubSub', () => { it('should pass back all params', done => { const err_ = new Error('err'); - const subs_ = false; + const subs_ = undefined; const nextQuery_ = {}; const apiResponse_ = {}; @@ -860,12 +860,12 @@ describe('PubSub', () => { topic, }; - topic.getSubscriptions = (options, callback) => { + topic.getSubscriptions = (options) => { assert.strictEqual(options, opts); - callback(); // the done fn + done(); }; - pubsub.getSubscriptions(opts, done); + pubsub.getSubscriptions(opts, assert.ifError); }); it('should create a topic instance from a name', done => { @@ -874,9 +874,9 @@ describe('PubSub', () => { }; const fakeTopic = { - getSubscriptions(options, callback) { + getSubscriptions(options) { assert.strictEqual(options, opts); - callback(); // the done fn + done(); }, }; @@ -885,7 +885,7 @@ describe('PubSub', () => { return fakeTopic; }; - pubsub.getSubscriptions(opts, done); + pubsub.getSubscriptions(opts, assert.ifError); }); }); }); @@ -960,7 +960,7 @@ describe('PubSub', () => { it('should pass back all params', done => { const err_ = new Error('err'); - const topics_ = false; + const topics_ = undefined; const nextQuery_ = {}; const apiResponse_ = {}; @@ -1232,10 +1232,10 @@ describe('PubSub', () => { }; const fakeClient = { - fakeMethod(reqOpts, gaxOpts, callback) { + fakeMethod(reqOpts, gaxOpts) { assert.strictEqual(reqOpts, replacedReqOpts); assert.strictEqual(gaxOpts, CONFIG.gaxOpts); - callback(); // done() + done(); }, }; @@ -1243,7 +1243,7 @@ describe('PubSub', () => { callback(null, fakeClient); }; - pubsub.request(CONFIG, done); + pubsub.request(CONFIG, assert.ifError); }); }); diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 60dac16844d..fe7fd7e3aef 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -127,15 +127,55 @@ describe('Snapshot', () => { pubsub = new PubSub(PUBSUB); subscription = pubsub.subscription('test'); }); - it('should include the create method', done => { - sandbox.stub(subscription, 'createSnapshot') - .callsFake((name: string) => { - assert.strictEqual(name, FULL_SNAPSHOT_NAME); - done(); - }); - const snapshot = new Snapshot(subscription, SNAPSHOT_NAME); - snapshot.create(assert.ifError); + describe('create', () => { + beforeEach(() => { + snapshot = new Snapshot(subscription, SNAPSHOT_NAME); + }); + + it('should call createSnapshot', done => { + const fakeOpts = {}; + sandbox.stub(subscription, 'createSnapshot') + .callsFake((name, options) => { + assert.strictEqual(name, FULL_SNAPSHOT_NAME); + assert.strictEqual(options, fakeOpts); + done(); + }); + + snapshot.create(fakeOpts, assert.ifError); + }); + + it('should return any request errors', done => { + const fakeError = new Error('err'); + const fakeResponse = {}; + const stub = sandbox.stub(subscription, 'createSnapshot'); + + snapshot.create((err, snap, resp) => { + assert.strictEqual(err, fakeError); + assert.strictEqual(snap, null); + assert.strictEqual(resp, fakeResponse); + done(); + }); + + const callback = stub.lastCall.args[2]; + setImmediate(callback, fakeError, null, fakeResponse); + }); + + it('should return the correct snapshot', done => { + const fakeSnapshot = new Snapshot(SUBSCRIPTION, SNAPSHOT_NAME); + const fakeResponse = {}; + const stub = sandbox.stub(subscription, 'createSnapshot'); + + snapshot.create((err, snap, resp) => { + assert.ifError(err); + assert.strictEqual(snap, snapshot); + assert.strictEqual(resp, fakeResponse); + done(); + }); + + const callback = stub.lastCall.args[2]; + setImmediate(callback, null, fakeSnapshot, fakeResponse); + }); }); it('should call the seek method', done => { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 60f8cf6ff04..39843883e6b 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -17,15 +17,16 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import {EventEmitter} from 'events'; +import {CallOptions} from 'google-gax'; import {ServiceError} from 'grpc'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {google} from '../proto/pubsub'; -import {CreateSubscriptionCallback, ExistsCallback, GetCallOptions, GetSubscriptionMetadataCallback, RequestCallback, RequestConfig, SeekCallback, Subscription} from '../src'; -import {Snapshot} from '../src/snapshot'; +import {ExistsCallback, RequestCallback, RequestConfig} from '../src'; +import {SeekCallback, Snapshot} from '../src/snapshot'; import {Message, SubscriberOptions} from '../src/subscriber'; -import {SubscriptionMetadataRaw} from '../src/subscription'; +import {CreateSubscriptionCallback, CreateSubscriptionOptions, GetSubscriptionMetadataCallback, Subscription, SubscriptionMetadata} from '../src/subscription'; import * as util from '../src/util'; let promisified = false; @@ -88,6 +89,7 @@ describe('Subscription', () => { projectId: PROJECT_ID, Promise: {}, request: util.noop, + createSubscription: util.noop, }; before(() => { @@ -121,12 +123,12 @@ describe('Subscription', () => { }); it('should localize pubsub request method', done => { - PUBSUB.request = (callback: CreateSubscriptionCallback) => { - callback(); // the done fn + PUBSUB.request = () => { + done(); }; const subscription = new Subscription(PUBSUB, SUB_NAME); - subscription.request(done); + subscription.request(assert.ifError); }); it('should format the sub name', () => { @@ -146,24 +148,6 @@ describe('Subscription', () => { assert.strictEqual(subscription.name, formattedName); }); - it('should make a create method if a topic is found', done => { - const TOPIC_NAME = 'test-topic'; - - PUBSUB.createSubscription = - (topic: string, subName: string, - callback: CreateSubscriptionCallback) => { - assert.strictEqual(topic, TOPIC_NAME); - assert.strictEqual(subName, SUB_NAME); - callback(); // the done function - }; - - const subscription = new Subscription(PUBSUB, SUB_NAME, { - topic: TOPIC_NAME, - }); - - subscription.create(done); - }); - it('should create an IAM object', () => { assert(subscription.iam instanceof FakeIAM); const args = subscription.iam.calledWith_; @@ -294,6 +278,89 @@ describe('Subscription', () => { }); }); + describe('create', () => { + const TOPIC_NAME = 'hi-ho-silver'; + + beforeEach(() => { + subscription.topic = TOPIC_NAME; + }); + + it('should throw an error if theres no topic', () => { + const expectedError = + /Subscriptions can only be created when accessed through Topics/; + delete subscription.topic; + assert.throws(() => subscription.create(), expectedError); + }); + + it('should pass the correct params', () => { + const fakeOptions = {}; + const stub = sandbox.stub(PUBSUB, 'createSubscription'); + + subscription.create(fakeOptions, assert.ifError); + + const [topic, name, options] = stub.lastCall.args; + assert.strictEqual(topic, TOPIC_NAME); + assert.strictEqual(name, SUB_NAME); + assert.strictEqual(options, fakeOptions); + }); + + it('should optionally accept options', () => { + const stub = sandbox.stub(PUBSUB, 'createSubscription'); + + subscription.create(assert.ifError); + + const options = stub.lastCall.args[2]; + assert.deepStrictEqual(options, {}); + }); + + it('should return any request errors', done => { + const fakeErr = new Error('err'); + const fakeResponse = {}; + const stub = sandbox.stub(PUBSUB, 'createSubscription'); + + subscription.create((err, sub, resp) => { + assert.strictEqual(err, fakeErr); + assert.strictEqual(sub, null); + assert.strictEqual(resp, fakeResponse); + done(); + }); + + const callback = stub.lastCall.args[3]; + setImmediate(callback, fakeErr, null, fakeResponse); + }); + + it('should update the subscription', done => { + const stub = sandbox.stub(PUBSUB, 'createSubscription'); + const fakeSub = new Subscription(PUBSUB, SUB_FULL_NAME); + const fakeResponse = {}; + + subscription.create(err => { + assert.ifError(err); + assert.strictEqual(subscription.metadata, fakeResponse); + done(); + }); + + const callback = stub.lastCall.args[3]; + fakeSub.metadata = fakeResponse; + setImmediate(callback, null, fakeSub, fakeResponse); + }); + + it('should pass back all the things', done => { + const fakeResponse = {}; + const stub = sandbox.stub(PUBSUB, 'createSubscription'); + + subscription.create((err, sub, resp) => { + assert.ifError(err); + assert.strictEqual(sub, subscription); + assert.strictEqual(resp, fakeResponse); + done(); + }); + + const callback = stub.lastCall.args[3]; + setImmediate(callback, null, null, fakeResponse); + }); + }); + describe('createSnapshot', () => { const SNAPSHOT_NAME = 'test-snapshot'; @@ -548,9 +615,10 @@ describe('Subscription', () => { a: 'a', }; - subscription.getMetadata = (gaxOpts: GetCallOptions) => { + subscription.getMetadata = (gaxOpts: CallOptions) => { assert.strictEqual(gaxOpts, options); - assert.strictEqual(gaxOpts.autoCreate, undefined); + // tslint:disable-next-line no-any + assert.strictEqual((gaxOpts as any).autoCreate, undefined); done(); }; @@ -562,7 +630,7 @@ describe('Subscription', () => { beforeEach(() => { subscription.getMetadata = - (gaxOpts: GetCallOptions, + (gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback) => { callback(null, fakeMetadata); }; @@ -583,7 +651,7 @@ describe('Subscription', () => { const options = {}; subscription.getMetadata = - (gaxOpts: GetCallOptions, + (gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback) => { assert.strictEqual(gaxOpts, options); callback(null); // the done fn @@ -599,7 +667,7 @@ describe('Subscription', () => { const apiResponse = {}; subscription.getMetadata = - (gaxOpts: GetCallOptions, + (gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback) => { callback(error, apiResponse); }; @@ -619,7 +687,7 @@ describe('Subscription', () => { const apiResponse = {}; subscription.getMetadata = - (gaxOpts: GetCallOptions, + (gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback) => { callback(error, apiResponse); }; @@ -639,7 +707,7 @@ describe('Subscription', () => { const apiResponse = {}; subscription.getMetadata = - (gaxOpts: GetCallOptions, + (gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback) => { callback(error, apiResponse); }; @@ -665,18 +733,18 @@ describe('Subscription', () => { }; subscription.getMetadata = - (gaxOpts: GetCallOptions, + (gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback) => { callback(error, apiResponse); }; - subscription.create = - (options: GetCallOptions, callback: CreateSubscriptionCallback) => { - assert.strictEqual(options, fakeOptions); - callback(); // the done fn - }; + subscription.create = (options: CreateSubscriptionOptions) => { + assert.strictEqual(options.gaxOpts, fakeOptions); + done(); + }; - subscription.get(fakeOptions, done); + subscription.topic = 'hi-ho-silver'; + subscription.get(fakeOptions, assert.ifError); }); }); }); @@ -747,32 +815,28 @@ describe('Subscription', () => { const fakeConfig = {}; it('should make the correct request', done => { - subscription.request = - (config: RequestConfig, - callback: RequestCallback) => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'modifyPushConfig'); - assert.deepStrictEqual(config.reqOpts, { - subscription: subscription.name, - pushConfig: fakeConfig, - }); - callback(); // the done fn - }; + subscription.request = (config: RequestConfig) => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'modifyPushConfig'); + assert.deepStrictEqual(config.reqOpts, { + subscription: subscription.name, + pushConfig: fakeConfig, + }); + done(); + }; - subscription.modifyPushConfig(fakeConfig, done); + subscription.modifyPushConfig(fakeConfig, assert.ifError); }); it('should optionally accept gaxOpts', done => { const gaxOpts = {}; - subscription.request = - (config: RequestConfig, - callback: RequestCallback) => { - assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn - }; + subscription.request = (config: RequestConfig) => { + assert.strictEqual(config.gaxOpts, gaxOpts); + done(); + }; - subscription.modifyPushConfig(fakeConfig, gaxOpts, done); + subscription.modifyPushConfig(fakeConfig, gaxOpts, assert.ifError); }); }); @@ -818,42 +882,39 @@ describe('Subscription', () => { return FAKE_FULL_SNAPSHOT_NAME; }; - subscription.request = - (config: RequestConfig, callback: SeekCallback) => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'seek'); - assert.deepStrictEqual(config.reqOpts, { - subscription: subscription.name, - snapshot: FAKE_FULL_SNAPSHOT_NAME, - }); - callback(); // the done fn - }; + subscription.request = (config: RequestConfig) => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'seek'); + assert.deepStrictEqual(config.reqOpts, { + subscription: subscription.name, + snapshot: FAKE_FULL_SNAPSHOT_NAME, + }); + done(); + }; - subscription.seek(FAKE_SNAPSHOT_NAME, done); + subscription.seek(FAKE_SNAPSHOT_NAME, assert.ifError); }); it('should optionally accept a Date object', done => { const date = new Date(); const reqOpts = {subscription: SUB_FULL_NAME, time: date}; - subscription.request = - (config: RequestConfig, callback: SeekCallback) => { - assert.deepStrictEqual(config.reqOpts, reqOpts); - callback(); // the done fn - }; + subscription.request = (config: RequestConfig) => { + assert.deepStrictEqual(config.reqOpts, reqOpts); + done(); + }; - subscription.seek(date, done); + subscription.seek(date, assert.ifError); }); it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = - (config: RequestConfig, callback: SeekCallback) => { - assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn - }; + subscription.request = (config: RequestConfig) => { + assert.strictEqual(config.gaxOpts, gaxOpts); + done(); + }; - subscription.seek(FAKE_SNAPSHOT_NAME, gaxOpts, done); + subscription.seek(FAKE_SNAPSHOT_NAME, gaxOpts, assert.ifError); }); }); @@ -863,7 +924,7 @@ describe('Subscription', () => { }; beforeEach(() => { - Subscription.formatMetadata_ = (metadata: SubscriptionMetadataRaw) => { + Subscription.formatMetadata_ = (metadata: SubscriptionMetadata) => { return Object.assign({}, metadata); }; }); @@ -881,7 +942,7 @@ describe('Subscription', () => { }, formattedMetadata); - Subscription.formatMetadata_ = (metadata: SubscriptionMetadataRaw) => { + Subscription.formatMetadata_ = (metadata: SubscriptionMetadata) => { assert.strictEqual(metadata, METADATA); return formattedMetadata; }; @@ -893,14 +954,12 @@ describe('Subscription', () => { } }; - subscription.request = - (config: RequestConfig, - callback: RequestCallback) => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'updateSubscription'); - assert.deepStrictEqual(config.reqOpts, reqOpts); - callback(); // the done fn - }; + subscription.request = (config: RequestConfig) => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'updateSubscription'); + assert.deepStrictEqual(config.reqOpts, reqOpts); + done(); + }; subscription.setMetadata(METADATA, done); }); @@ -908,12 +967,10 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = - (config: RequestConfig, - callback: RequestCallback) => { - assert.strictEqual(config.gaxOpts, gaxOpts); - callback(); // the done fn - }; + subscription.request = (config: RequestConfig) => { + assert.strictEqual(config.gaxOpts, gaxOpts); + done(); + }; subscription.setMetadata(METADATA, gaxOpts, done); }); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 3b9d973351e..d130aae74da 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -22,7 +22,9 @@ import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {google} from '../proto/pubsub'; -import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateTopicCallback, ExistsCallback, GetCallOptions, GetTopicMetadataCallback, Metadata, RequestCallback, RequestConfig, Subscription, SubscriptionCallOptions, Topic} from '../src'; +import {ExistsCallback, RequestCallback, RequestConfig} from '../src'; +import {CreateSubscriptionCallback, CreateSubscriptionOptions, Subscription, SubscriptionOptions} from '../src/subscription'; +import {CreateTopicCallback, GetTopicMetadataCallback, Topic} from '../src/topic'; import * as util from '../src/util'; let promisified = false; @@ -168,12 +170,12 @@ describe('Topic', () => { }); it('should localize the request function', done => { - PUBSUB.request = (callback: RequestCallback) => { - callback(); // the done fn + PUBSUB.request = () => { + done(); }; const topic = new Topic(PUBSUB, TOPIC_NAME); - topic.request(done); + topic.request(assert.ifError); }); it('should create an iam object', () => { @@ -198,15 +200,13 @@ describe('Topic', () => { it('should call the parent createTopic method', done => { const options_ = {}; - PUBSUB.createTopic = - (name: string, options: CallOptions, - callback: CreateTopicCallback) => { - assert.strictEqual(name, topic.name); - assert.strictEqual(options, options_); - callback(); // the done fn - }; + PUBSUB.createTopic = (name: string, options: CallOptions) => { + assert.strictEqual(name, topic.name); + assert.strictEqual(options, options_); + done(); + }; - topic.create(options_, done); + topic.create(options_, assert.ifError); }); }); @@ -216,51 +216,46 @@ describe('Topic', () => { const OPTIONS = {a: 'a'}; PUBSUB.createSubscription = - (topic_: Topic, name: string, options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback) => { + (topic_: Topic, name: string, options: CreateSubscriptionOptions) => { assert.strictEqual(topic_, topic); assert.strictEqual(name, NAME); assert.strictEqual(options, OPTIONS); - callback(); // the done fn + done(); }; - topic.createSubscription(NAME, OPTIONS, done); + topic.createSubscription(NAME, OPTIONS, assert.ifError); }); }); describe('delete', () => { it('should make the proper request', done => { - topic.request = - (config: RequestConfig, - callback: RequestCallback) => { - assert.strictEqual(config.client, 'PublisherClient'); - assert.strictEqual(config.method, 'deleteTopic'); - assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); - callback(); // the done fn - }; + topic.request = (config: RequestConfig) => { + assert.strictEqual(config.client, 'PublisherClient'); + assert.strictEqual(config.method, 'deleteTopic'); + assert.deepStrictEqual(config.reqOpts, {topic: topic.name}); + done(); + }; - topic.delete(done); + topic.delete(assert.ifError); }); it('should optionally accept gax options', done => { const options = {}; - topic.request = - (config: RequestConfig, - callback: RequestCallback) => { - assert.strictEqual(config.gaxOpts, options); - callback(); // the done fn - }; + topic.request = (config: RequestConfig) => { + assert.strictEqual(config.gaxOpts, options); + done(); + }; - topic.delete(options, done); + topic.delete(options, assert.ifError); }); it('should optionally accept a callback', done => { - sandbox.stub(util, 'noop').callsFake(done); topic.request = (config: RequestConfig, callback: RequestCallback) => { - callback(); // the done fn + assert.strictEqual(typeof callback, 'function'); + done(); }; topic.delete(); }); @@ -273,9 +268,10 @@ describe('Topic', () => { a: 'a', }; - topic.getMetadata = (gaxOpts: GetCallOptions) => { + topic.getMetadata = (gaxOpts: CallOptions) => { assert.strictEqual(gaxOpts, options); - assert.strictEqual(gaxOpts.autoCreate, undefined); + // tslint:disable-next-line no-any + assert.strictEqual((gaxOpts as any).autoCreate, undefined); done(); }; @@ -287,7 +283,7 @@ describe('Topic', () => { beforeEach(() => { topic.getMetadata = - (gaxOpts: GetCallOptions, + (gaxOpts: CallOptions, callback: RequestCallback) => { callback(null, fakeMetadata); }; @@ -306,13 +302,12 @@ describe('Topic', () => { it('should optionally accept options', done => { const options = {}; - topic.getMetadata = - (gaxOpts: GetCallOptions, callback: RequestCallback) => { - assert.strictEqual(gaxOpts, options); - callback(); // the done fn - }; + topic.getMetadata = (gaxOpts: CallOptions) => { + assert.strictEqual(gaxOpts, options); + done(); + }; - topic.get(options, done); + topic.get(options, assert.ifError); }); }); @@ -322,7 +317,7 @@ describe('Topic', () => { const apiResponse = {} as Topic; topic.getMetadata = - (gaxOpts: GetCallOptions, callback: GetTopicMetadataCallback) => { + (gaxOpts: CallOptions, callback: GetTopicMetadataCallback) => { callback(error, apiResponse); }; @@ -340,7 +335,7 @@ describe('Topic', () => { const apiResponse = {} as Topic; topic.getMetadata = - (gaxOpts: GetCallOptions, callback: GetTopicMetadataCallback) => { + (gaxOpts: CallOptions, callback: GetTopicMetadataCallback) => { callback(error, apiResponse); }; @@ -362,17 +357,16 @@ describe('Topic', () => { }; topic.getMetadata = - (gaxOpts: GetCallOptions, callback: GetTopicMetadataCallback) => { + (gaxOpts: CallOptions, callback: GetTopicMetadataCallback) => { callback(error, apiResponse); }; - topic.create = - (options: CallOptions, callback: CreateTopicCallback) => { - assert.strictEqual(options, fakeOptions); - callback(); // the done fn - }; + topic.create = (options: CallOptions) => { + assert.strictEqual(options, fakeOptions); + done(); + }; - topic.get(fakeOptions, done); + topic.get(fakeOptions, assert.ifError); }); }); }); @@ -548,7 +542,7 @@ describe('Topic', () => { it('should pass all params to the callback', done => { const err_ = new Error('err'); - const subs_ = false; + const subs_ = undefined; const nextQuery_ = {}; const apiResponse_ = {}; @@ -635,7 +629,7 @@ describe('Topic', () => { const opts = {}; topic.parent.subscription = - (name: string, options: SubscriptionCallOptions) => { + (name: string, options: SubscriptionOptions) => { assert.strictEqual(name, subscriptionName); assert.deepStrictEqual(options, opts); done(); @@ -646,7 +640,7 @@ describe('Topic', () => { it('should attach the topic instance to the options', done => { topic.parent.subscription = - (name: string, options: SubscriptionCallOptions) => { + (name: string, options: SubscriptionOptions) => { assert.strictEqual(options.topic, topic); done(); }; From 7ff4f5121804dd621ab8e86323517cb54e4e5d98 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Sat, 2 Mar 2019 11:49:24 -0800 Subject: [PATCH 0369/1115] fix(typescript): export all the types (#516) --- handwritten/pubsub/src/iam.ts | 2 +- handwritten/pubsub/src/index.ts | 1050 +--------------------- handwritten/pubsub/src/publisher.ts | 2 +- handwritten/pubsub/src/pubsub.ts | 1052 +++++++++++++++++++++++ handwritten/pubsub/src/snapshot.ts | 2 +- handwritten/pubsub/src/subscription.ts | 2 +- handwritten/pubsub/src/topic.ts | 2 +- handwritten/pubsub/test/iam.ts | 2 +- handwritten/pubsub/test/index.ts | 2 +- handwritten/pubsub/test/snapshot.ts | 3 +- handwritten/pubsub/test/subscriber.ts | 3 +- handwritten/pubsub/test/subscription.ts | 2 +- handwritten/pubsub/test/topic.ts | 2 +- 13 files changed, 1076 insertions(+), 1050 deletions(-) create mode 100644 handwritten/pubsub/src/pubsub.ts diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 8e0e91dd0df..b9bef871f36 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -24,7 +24,7 @@ import {CallOptions} from 'google-gax'; import {google} from '../proto/iam'; -import {Omit, PubSub, RequestCallback, ResourceCallback} from '.'; +import {Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; export type Policy = { etag?: string|Buffer diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 5d8a3db02b7..479d6cb5739 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -21,1044 +21,6 @@ * @namespace google.protobuf */ -import {paginator} from '@google-cloud/paginator'; -import {replaceProjectIdToken} from '@google-cloud/projectify'; -import {promisifyAll} from '@google-cloud/promisify'; -import * as extend from 'extend'; -import {GoogleAuth} from 'google-auth-library'; -import * as gax from 'google-gax'; -import * as is from 'is'; - -const PKG = require('../../package.json'); -const v1 = require('./v1'); - -import {Snapshot} from './snapshot'; -import {Subscription, SubscriptionMetadata, SubscriptionOptions, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse} from './subscription'; -import {Topic, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, CreateTopicCallback, CreateTopicResponse} from './topic'; -import {PublishOptions} from './publisher'; -import {CallOptions} from 'google-gax'; -import {Transform} from 'stream'; -import {google} from '../proto/pubsub'; -import {ServiceError, ChannelCredentials} from 'grpc'; -import {FlowControlOptions} from './lease-manager'; -import {BatchPublishOptions} from './publisher'; - -const opts = {} as gax.GrpcClientOptions; -const {grpc} = new gax.GrpcClient(opts); - -/** - * Project ID placeholder. - * @type {string} - * @private - */ -const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; - -export type Omit = Pick>; - -export interface ClientConfig extends gax.GrpcClientOptions { - apiEndpoint?: string; - servicePath?: string; - port?: string|number; - sslCreds?: ChannelCredentials; -} - -export interface PageOptions { - gaxOpts?: CallOptions; - pageSize?: number; - pageToken?: string; - autoPaginate?: boolean; -} - -export type GetSnapshotsCallback = - RequestCallback; - -export type GetSnapshotsResponse = - PagedResponse; - -export type GetSubscriptionsOptions = PageOptions&{topic?: string | Topic}; - -type GetAllSubscriptionsCallback = - RequestCallback; - -type GetAllSubscriptionsResponse = - PagedResponse; - -export type GetSubscriptionsCallback = - GetAllSubscriptionsCallback|GetTopicSubscriptionsCallback; - -export type GetSubscriptionsResponse = - GetAllSubscriptionsResponse|GetTopicSubscriptionsResponse; - -export type GetTopicsCallback = - RequestCallback; - -export type GetTopicsResponse = - PagedResponse; - -export type EmptyCallback = RequestCallback; -export type EmptyResponse = [google.protobuf.IEmpty]; - -export type ExistsCallback = RequestCallback; -export type ExistsResponse = [boolean]; - -export interface GetClientConfig { - client: 'PublisherClient'|'SubscriberClient'; -} - -export interface RequestConfig extends GetClientConfig { - method: string; - reqOpts?: object; - gaxOpts?: CallOptions; -} - -export interface ResourceCallback { - (err: ServiceError|null, resource?: Resource|null, - response?: Response|null): void; -} - -export type RequestCallback = - R extends void ? NormalCallback: PagedCallback; - -export interface NormalCallback { - (err: ServiceError|null, res?: TResponse|null): void; -} - -export interface PagedCallback { - (err: ServiceError|null, results?: Item[]|null, nextQuery?: {}|null, - response?: Response|null): void; -} - -export type PagedResponse = - [Item[]]|[Item[], {} | null, Response]; - -export type ObjectStream = { - addListener(event: 'data', listener: (data: O) => void): ObjectStream; - emit(event: 'data', data: O): boolean; - on(event: 'data', listener: (data: O) => void): ObjectStream; - once(event: 'data', listener: (data: O) => void): ObjectStream; - prependListener(event: 'data', listener: (data: O) => void): ObjectStream; - prependOnceListener(event: 'data', listener: (data: O) => void): - ObjectStream; -}&Transform; - -interface GetClientCallback { - (err: Error|null, gaxClient?: gax.ClientStub): void; -} - -/** - * @typedef {object} ClientConfig - * @property {string} [projectId] The project ID from the Google Developer's - * Console, e.g. 'grape-spaceship-123'. We will also check the environment - * variable `GCLOUD_PROJECT` for your project ID. If your app is running in - * an environment which supports {@link - * https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application - * Application Default Credentials}, your project ID will be detected - * automatically. - * @property {string} [keyFilename] Full path to the a .json, .pem, or .p12 key - * downloaded from the Google Developers Console. If you provide a path to a - * JSON file, the `projectId` option above is not necessary. NOTE: .pem and - * .p12 require you to specify the `email` option as well. - * @property {string} [apiEndpoint] The `apiEndpoint` from options will set the - * host. If not set, the `PUBSUB_EMULATOR_HOST` environment variable from - * the gcloud SDK is honored, otherwise the actual API endpoint will be - * used. - * @property {string} [email] Account email address. Required when using a .pem - * or .p12 keyFilename. - * @property {object} [credentials] Credentials object. - * @property {string} [credentials.client_email] - * @property {string} [credentials.private_key] - * @property {boolean} [autoRetry=true] Automatically retry requests if the - * response is related to rate limits or certain intermittent server errors. - * We will exponentially backoff subsequent requests by default. - * @property {number} [maxRetries=3] Maximum number of automatic retries - * attempted before returning the error. - * @property {Constructor} [promise] Custom promise module to use instead of - * native Promises. - */ -/** - * [Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a - * reliable, many-to-many, asynchronous messaging service from Cloud - * Platform. - * - * @class - * - * @see [Cloud Pub/Sub overview]{@link https://developers.google.com/pubsub/overview} - * - * @param {ClientConfig} [options] Configuration options. - * - * @example Import the client library - * const {PubSub} = require('@google-cloud/pubsub'); - * - * @example Create a client that uses Application - * Default Credentials (ADC): const pubsub = new PubSub(); - * - * @example Create a client with explicit - * credentials: const pubsub = new PubSub({ projectId: - * 'your-project-id', keyFilename: '/path/to/keyfile.json' - * }); - * - * @example include:samples/quickstart.js - * region_tag:pubsub_quickstart_create_topic - * Full quickstart example: - */ -export class PubSub { - options: ClientConfig; - isEmulator: boolean; - api: {[key: string]: gax.ClientStub}; - auth: GoogleAuth; - projectId: string; - // tslint:disable-next-line variable-name - Promise?: PromiseConstructor; - getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => - ObjectStream; - getSnapshotsStream = paginator.streamify('getSnapshots') as() => - ObjectStream; - getTopicsStream = paginator.streamify('getTopics') as() => - ObjectStream; - - constructor(options?: ClientConfig) { - options = options || {}; - // Determine what scopes are needed. - // It is the union of the scopes on both clients. - const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; - const allScopes: {[key: string]: boolean} = {}; - for (const clientClass of clientClasses) { - for (const scope of clientClass.scopes) { - allScopes[scope] = true; - } - } - this.options = Object.assign( - { - 'grpc.keepalive_time_ms': 300000, - 'grpc.max_send_message_length': -1, - 'grpc.max_receive_message_length': 20000001, - libName: 'gccl', - libVersion: PKG.version, - scopes: Object.keys(allScopes), - }, - options); - /** - * @name PubSub#isEmulator - * @type {boolean} - */ - this.isEmulator = false; - this.determineBaseUrl_(); - this.api = {}; - this.auth = new GoogleAuth(this.options); - this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; - if (this.options.promise) { - this.Promise = this.options.promise; - } - } - - createSubscription( - topic: Topic|string, name: string, - options?: CreateSubscriptionOptions): Promise; - createSubscription( - topic: Topic|string, name: string, options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback): void; - createSubscription( - topic: Topic|string, name: string, - callback: CreateSubscriptionCallback): void; - /** - * @typedef {array} CreateSubscriptionResponse - * @property {Subscription} 0 The new {@link Subscription}. - * @property {object} 1 The full API response. - */ - /** - * @callback CreateSubscriptionCallback - * @param {?Error} err Request error, if any. - * @param {Subscription} Subscription - * @param {object} apiResponse The full API response. - */ - /** - * Options for creating a subscription. - * - * See a [Subscription - * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). - * - * @typedef {object} CreateSubscriptionRequest - * @property {object} [flowControl] Flow control configurations for - * receiving messages. Note that these options do not persist across - * subscription instances. - * @property {number} [flowControl.maxBytes] The maximum number of bytes - * in un-acked messages to allow before the subscription pauses incoming - * messages. Defaults to 20% of free memory. - * @property {number} [flowControl.maxMessages=Infinity] The maximum number - * of un-acked messages to allow before the subscription pauses incoming - * messages. - * @property {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number|date} [messageRetentionDuration] Set this to override - * the default duration of 7 days. This value is expected in seconds. - * Acceptable values are in the range of 10 minutes and 7 days. - * @property {string} [pushEndpoint] A URL to a custom endpoint that - * messages should be pushed to. - * @property {boolean} [retainAckedMessages=false] If set, acked messages - * are retained in the subscription's backlog for the length of time - * specified by `options.messageRetentionDuration`. - * @property {ExpirationPolicy} [expirationPolicy] A policy that specifies - * the conditions for this subscription's expiration. - */ - /** - * Create a subscription to a topic. - * - * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} - * @see {@link Topic#createSubscription} - * - * @throws {Error} If a Topic instance or topic name is not provided. - * @throws {Error} If a subscription name is not provided. - * - * @param {Topic|string} topic The Topic to create a - * subscription to. - * @param {string} name The name of the subscription. - * @param {CreateSubscriptionRequest} [options] See a - * [Subscription - * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). - * @param {CreateSubscriptionCallback} [callback] Callback function. - * @returns {Promise} - * - * @example Subscribe to a topic. - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = 'messageCenter'; - * const name = 'newMessages'; - * - * const callback = function(err, subscription, apiResponse) {}; - * - * pubsub.createSubscription(topic, name, callback); - * - * @example If the callback is omitted, we'll return a - * Promise. pubsub.createSubscription(topic, - * name).then(function(data) { const subscription = data[0]; const apiResponse - * = data[1]; - * }); - */ - createSubscription( - topic: Topic|string, name: string, - optionsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, - callback?: CreateSubscriptionCallback): - Promise|void { - if (!is.string(topic) && !(topic instanceof Topic)) { - throw new Error('A Topic is required for a new subscription.'); - } - if (!is.string(name)) { - throw new Error('A subscription name is required.'); - } - if (typeof topic === 'string') { - topic = this.topic(topic); - } - let options = typeof optionsOrCallback === 'object' ? - optionsOrCallback : - {} as CreateSubscriptionOptions; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; - - // Make a deep copy of options to not pollute caller object. - options = extend(true, {}, options); - - const gaxOpts = options.gaxOpts; - const flowControl = options.flowControl; - delete options.gaxOpts; - delete options.flowControl; - - const metadata = - Subscription.formatMetadata_(options as SubscriptionMetadata); - - let subscriptionCtorOptions = flowControl ? {flowControl} : {}; - subscriptionCtorOptions = Object.assign(subscriptionCtorOptions, metadata); - const subscription = this.subscription(name, subscriptionCtorOptions); - - const reqOpts = Object.assign(metadata, { - topic: topic.name, - name: subscription.name, - }); - - this.request( - { - client: 'SubscriberClient', - method: 'createSubscription', - reqOpts, - gaxOpts, - }, - (err, resp) => { - if (err) { - callback!(err, null, resp); - return; - } - subscription.metadata = resp!; - callback!(null, subscription, resp!); - }); - } - - createTopic(name: string, gaxOpts: CallOptions): Promise; - createTopic( - name: string, gaxOpts: CallOptions, callback?: CreateTopicCallback): void; - createTopic(name: string, callback: CreateTopicCallback): void; - /** - * @typedef {array} CreateTopicResponse - * @property {Topic} 0 The new {@link Topic}. - * @property {object} 1 The full API response. - */ - /** - * @callback CreateTopicCallback - * @param {?Error} err Request error, if any. - * @param {Topic} topic The new {@link Topic}. - * @param {object} apiResponse The full API response. - */ - /** - * Create a topic with the given name. - * - * @see [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create} - * - * @param {string} name Name of the topic. - * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @param {CreateTopicCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.createTopic('my-new-topic', function(err, topic, apiResponse) { - * if (!err) { - * // The topic was created successfully. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.createTopic('my-new-topic').then(function(data) { - * const topic = data[0]; - * const apiResponse = data[1]; - * }); - */ - createTopic( - name: string, gaxOptsOrCallback?: CallOptions|CreateTopicCallback, - callback?: CreateTopicCallback): Promise|void { - const topic = this.topic(name); - const reqOpts = { - name: topic.name, - }; - - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; - - this.request( - { - client: 'PublisherClient', - method: 'createTopic', - reqOpts, - gaxOpts, - }, - (err, resp) => { - if (err) { - callback!(err, null, resp); - return; - } - topic.metadata = resp!; - callback!(null, topic, resp!); - }); - } - /** - * Determine the appropriate endpoint to use for API requests, first trying - * the local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null - * we try Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), - * otherwise the default JSON API. - * - * @private - */ - determineBaseUrl_() { - const apiEndpoint = this.options.apiEndpoint; - if (!apiEndpoint && !process.env.PUBSUB_EMULATOR_HOST) { - return; - } - const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; - const leadingProtocol = new RegExp('^https*://'); - const trailingSlashes = new RegExp('/*$'); - const baseUrlParts = baseUrl!.replace(leadingProtocol, '') - .replace(trailingSlashes, '') - .split(':'); - this.options.servicePath = baseUrlParts[0]; - this.options.port = baseUrlParts[1]; - this.options.sslCreds = grpc.credentials.createInsecure(); - this.isEmulator = true; - } - - getSnapshots(option?: PageOptions): Promise; - getSnapshots(callback: GetSnapshotsCallback): void; - getSnapshots(option: PageOptions, callback: GetSnapshotsCallback): void; - /** - * Query object for listing snapshots. - * - * @typedef {object} GetSnapshotsRequest - * @property {boolean} [autoPaginate=true] Have pagination handled - * automatically. - * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number} [options.pageSize] Maximum number of results to return. - * @property {string} [options.pageToken] Page token. - */ - /** - * @typedef {array} GetSnapshotsResponse - * @property {Snapshot[]} 0 Array of {@link Snapshot} instances. - * @property {object} 1 The full API response. - */ - /** - * @callback GetSnapshotsCallback - * @param {?Error} err Request error, if any. - * @param {Snapshot[]} snapshots Array of {@link Snapshot} instances. - * @param {object} apiResponse The full API response. - */ - /** - * Get a list of snapshots. - * - * @param {GetSnapshotsRequest} [query] Query object for listing snapshots. - * @param {GetSnapshotsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getSnapshots(function(err, snapshots) { - * if (!err) { - * // snapshots is an array of Snapshot objects. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.getSnapshots().then(function(data) { - * const snapshots = data[0]; - * }); - */ - getSnapshots( - optionsOrCallback?: PageOptions|GetSnapshotsCallback, - callback?: GetSnapshotsCallback): void|Promise { - const self = this; - const options = - typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; - const reqOpts = Object.assign( - { - project: 'projects/' + this.projectId, - }, - options); - delete reqOpts.gaxOpts; - delete reqOpts.autoPaginate; - const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); - this.request< - google.pubsub.v1.ISnapshot, google.pubsub.v1.IListSnapshotsResponse>( - { - client: 'SubscriberClient', - method: 'listSnapshots', - reqOpts, - gaxOpts, - }, - (err, rawSnapshots, ...args) => { - let snapshots: Snapshot[]; - - if (rawSnapshots) { - snapshots = rawSnapshots.map(snapshot => { - const snapshotInstance = self.snapshot(snapshot.name!); - snapshotInstance.metadata = snapshot; - return snapshotInstance; - }); - } - - callback!(err, snapshots!, ...args); - }); - } - - getSubscriptions(options?: GetSubscriptionsOptions): - Promise; - getSubscriptions(callback: GetSubscriptionsCallback): void; - getSubscriptions( - options: GetSubscriptionsOptions, - callback: GetSubscriptionsCallback): void; - /** - * Query object for listing subscriptions. - * - * @typedef {object} GetSubscriptionsRequest - * @property {boolean} [autoPaginate=true] Have pagination handled - * automatically. - * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number} [options.pageSize] Maximum number of results to return. - * @property {string} [options.pageToken] Page token. - * @param {string|Topic} options.topic - The name of the topic to - * list subscriptions from. - */ - /** - * @typedef {array} GetSubscriptionsResponse - * @property {Subscription[]} 0 Array of {@link Subscription} instances. - * @property {object} 1 The full API response. - */ - /** - * @callback GetSubscriptionsCallback - * @param {?Error} err Request error, if any. - * @param {Subscription[]} subscriptions Array of {@link Subscription} instances. - * @param {object} apiResponse The full API response. - */ - /** - * Get a list of the subscriptions registered to all of your project's topics. - * You may optionally provide a query object as the first argument to - * customize the response. - * - * Your provided callback will be invoked with an error object if an API error - * occurred or an array of {@link Subscription} objects. - * - * To get subscriptions for a topic, see {@link Topic}. - * - * @see [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list} - * - * @param {GetSubscriptionsRequest} [query] Query object for listing subscriptions. - * @param {GetSubscriptionsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getSubscriptions(function(err, subscriptions) { - * if (!err) { - * // subscriptions is an array of Subscription objects. - * } - * }); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.getSubscriptions().then(function(data) { - * const subscriptions = data[0]; - * }); - */ - getSubscriptions( - optionsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback, - callback?: GetSubscriptionsCallback): - void|Promise { - const self = this; - const options = - typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; - - let topic = options.topic; - if (topic) { - if (!(topic instanceof Topic)) { - topic = this.topic(topic); - } - return topic.getSubscriptions( - options, callback as GetTopicSubscriptionsCallback); - } - const reqOpts = Object.assign({}, options) as - google.pubsub.v1.IListSubscriptionsRequest; - reqOpts.project = 'projects/' + this.projectId; - - delete (reqOpts as GetSubscriptionsOptions).gaxOpts; - delete (reqOpts as GetSubscriptionsOptions).autoPaginate; - - const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); - - this.request< - google.pubsub.v1.ISubscription, - google.pubsub.v1.IListSubscriptionsResponse>( - { - client: 'SubscriberClient', - method: 'listSubscriptions', - reqOpts, - gaxOpts, - }, - (err, rawSubs, ...args) => { - let subscriptions: Subscription[]; - - if (rawSubs) { - subscriptions = rawSubs.map(sub => { - const subscriptionInstance = self.subscription(sub.name!); - subscriptionInstance.metadata = sub; - return subscriptionInstance; - }); - } - - (callback as GetAllSubscriptionsCallback)( - err, subscriptions!, ...args); - }); - } - - getTopics(options: PageOptions): Promise; - getTopics(callback: GetTopicsCallback): void; - getTopics(options: PageOptions, callback: GetTopicsCallback): void; - /** - * Query object for listing topics. - * - * @typedef {object} GetTopicsRequest - * @property {boolean} [autoPaginate=true] Have pagination handled - * automatically. - * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number} [options.pageSize] Maximum number of results to return. - * @property {string} [options.pageToken] Page token. - */ - /** - * @typedef {array} GetTopicsResponse - * @property {Topic[]} 0 Array of {@link Topic} instances. - * @property {object} 1 The full API response. - */ - /** - * @callback GetTopicsCallback - * @param {?Error} err Request error, if any. - * @param {Topic[]} topics Array of {@link Topic} instances. - * @param {object} apiResponse The full API response. - */ - /** - * Get a list of the topics registered to your project. You may optionally - * provide a query object as the first argument to customize the response. - * - * @see [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list} - * - * @param {GetTopicsRequest} [query] Query object for listing topics. - * @param {GetTopicsCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getTopics(function(err, topics) { - * if (!err) { - * // topics is an array of Topic objects. - * } - * }); - * - * //- - * // Customize the query. - * //- - * pubsub.getTopics({ - * pageSize: 3 - * }, function(err, topics) {}); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * pubsub.getTopics().then(function(data) { - * const topics = data[0]; - * }); - */ - getTopics( - optionsOrCallback?: PageOptions|GetTopicsCallback, - callback?: GetTopicsCallback): void|Promise { - const self = this; - const options = - typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; - - const reqOpts = Object.assign( - { - project: 'projects/' + this.projectId, - }, - options); - delete reqOpts.gaxOpts; - delete reqOpts.autoPaginate; - const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); - this.request( - { - client: 'PublisherClient', - method: 'listTopics', - reqOpts, - gaxOpts, - }, - (err, rawTopics, ...args) => { - let topics: Topic[]; - - if (rawTopics) { - topics = rawTopics.map(topic => { - const topicInstance = self.topic(topic.name); - topicInstance.metadata = topic; - return topicInstance; - }); - } - - callback!(err, topics!, ...args); - }); - } - /** - * Callback function to PubSub.getClient_(). - * @private - * @callback GetClientCallback - * @param err - Error, if any. - * @param gaxClient - The gax client specified in RequestConfig.client. - * Typed any since it's importing Javascript source. - */ - /** - * Get the PubSub client object. - * - * @private - * - * @param {object} config Configuration object. - * @param {object} config.gaxOpts GAX options. - * @param {function} config.method The gax method to call. - * @param {object} config.reqOpts Request options. - * @param {function} [callback] The callback function. - */ - getClient_(config: GetClientConfig, callback: GetClientCallback) { - const hasProjectId = - this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; - if (!hasProjectId && !this.isEmulator) { - this.auth.getProjectId((err, projectId) => { - if (err) { - callback(err); - return; - } - this.projectId = projectId!; - this.options.projectId = projectId!; - - this.getClient_(config, callback); - }); - return; - } - let gaxClient = this.api[config.client]; - if (!gaxClient) { - // Lazily instantiate client. - gaxClient = new v1[config.client](this.options) as gax.ClientStub; - this.api[config.client] = gaxClient; - } - callback(null, gaxClient); - } - /** - * Funnel all API requests through this method, to be sure we have a project - * ID. - * - * @private - * - * @param {object} config Configuration object. - * @param {object} config.gaxOpts GAX options. - * @param {function} config.method The gax method to call. - * @param {object} config.reqOpts Request options. - * @param {function} [callback] The callback function. - */ - request(config: RequestConfig, callback: RequestCallback) { - const self = this; - this.getClient_(config, (err, client) => { - if (err) { - callback(err); - return; - } - let reqOpts = extend(true, {}, config.reqOpts); - reqOpts = replaceProjectIdToken(reqOpts, self.projectId); - client![config.method](reqOpts, config.gaxOpts, callback); - }); - } - /** - * Create a Snapshot object. See {@link Subscription#createSnapshot} to - * create a snapshot. - * - * @throws {Error} If a name is not provided. - * - * @param {string} name The name of the snapshot. - * @returns {Snapshot} A {@link Snapshot} instance. - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const snapshot = pubsub.snapshot('my-snapshot'); - */ - snapshot(name: string): Snapshot { - if (!is.string(name)) { - throw new Error('You must supply a valid name for the snapshot.'); - } - return new Snapshot(this, name); - } - /** - * Create a Subscription object. This command by itself will not run any API - * requests. You will receive a {@link Subscription} object, - * which will allow you to interact with a subscription. - * - * @throws {Error} If subscription name is omitted. - * - * @param {string} name Name of the subscription. - * @param {SubscriberOptions} [options] Subscription options. - * @returns {Subscription} A {@link Subscription} instance. - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const subscription = pubsub.subscription('my-subscription'); - * - * // Register a listener for `message` events. - * subscription.on('message', function(message) { - * // Called every time a message is received. - * // message.id = ID of the message. - * // message.ackId = ID used to acknowledge the message receival. - * // message.data = Contents of the message. - * // message.attributes = Attributes of the message. - * // message.publishTime = Date when Pub/Sub received the message. - * }); - */ - subscription(name: string, options?: SubscriptionOptions): Subscription { - if (!name) { - throw new Error('A name must be specified for a subscription.'); - } - return new Subscription(this, name, options); - } - /** - * Create a Topic object. See {@link PubSub#createTopic} to create a topic. - * - * @throws {Error} If a name is not provided. - * - * @param {string} name The name of the topic. - * @returns {Topic} A {@link Topic} instance. - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - */ - topic(name: string, options?: PublishOptions): Topic { - if (!name) { - throw new Error('A name must be specified for a topic.'); - } - return new Topic(this, name, options); - } -} - -/** - * Get a list of the {@link Snapshot} objects as a readable object stream. - * - * @method PubSub#getSnapshotsStream - * @param {GetSnapshotsRequest} [options] Configuration object. See - * {@link PubSub#getSnapshots} for a complete list of options. - * @returns {ReadableStream} A readable stream of {@link Snapshot} instances. - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getSnapshotsStream() - * .on('error', console.error) - * .on('data', function(snapshot) { - * // snapshot is a Snapshot object. - * }) - * .on('end', function() { - * // All snapshots retrieved. - * }); - * - * //- - * // If you anticipate many results, you can end a stream early to prevent - * // unnecessary processing and API requests. - * //- - * pubsub.getSnapshotsStream() - * .on('data', function(snapshot) { - * this.end(); - * }); - */ - -/** - * Get a list of the {@link Subscription} objects registered to all of - * your project's topics as a readable object stream. - * - * @method PubSub#getSubscriptionsStream - * @param {GetSubscriptionsRequest} [options] Configuration object. See - * {@link PubSub#getSubscriptions} for a complete list of options. - * @returns {ReadableStream} A readable stream of {@link Subscription} instances. - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getSubscriptionsStream() - * .on('error', console.error) - * .on('data', function(subscription) { - * // subscription is a Subscription object. - * }) - * .on('end', function() { - * // All subscriptions retrieved. - * }); - * - * //- - * // If you anticipate many results, you can end a stream early to prevent - * // unnecessary processing and API requests. - * //- - * pubsub.getSubscriptionsStream() - * .on('data', function(subscription) { - * this.end(); - * }); - */ - -/** - * Get a list of the {module:pubsub/topic} objects registered to your project as - * a readable object stream. - * - * @method PubSub#getTopicsStream - * @param {GetTopicsRequest} [options] Configuration object. See - * {@link PubSub#getTopics} for a complete list of options. - * @returns {ReadableStream} A readable stream of {@link Topic} instances. - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * pubsub.getTopicsStream() - * .on('error', console.error) - * .on('data', function(topic) { - * // topic is a Topic object. - * }) - * .on('end', function() { - * // All topics retrieved. - * }); - * - * //- - * // If you anticipate many results, you can end a stream early to prevent - * // unnecessary processing and API requests. - * //- - * pubsub.getTopicsStream() - * .on('data', function(topic) { - * this.end(); - * }); - */ - -/*! Developer Documentation - * - * These methods can be agto-paginated. - */ -paginator.extend(PubSub, ['getSnapshots', 'getSubscriptions', 'getTopics']); - -/*! Developer Documentation - * - * All async methods (except for streams) will return a Promise in the event - * that a callback is omitted. - */ -promisifyAll(PubSub, { - exclude: ['request', 'snapshot', 'subscription', 'topic'], -}); - -export {Subscription, Topic, PublishOptions}; - /** * The default export of the `@google-cloud/pubsub` package is the * {@link PubSub} class. @@ -1112,4 +74,14 @@ export {Subscription, Topic, PublishOptions}; * @property {constructor} SubscriberClient * Reference to {@link v1.SubscriberClient}. */ -module.exports.v1 = v1; +module.exports.v1 = require('./v1'); + +export {CallOptions} from 'google-gax'; +export {ServiceError} from 'grpc'; +export {Policy, GetPolicyCallback, SetPolicyCallback, SetPolicyResponse, GetPolicyResponse, IamPermissionsMap, TestIamPermissionsResponse, TestIamPermissionsCallback, IAM} from './iam'; +export {Attributes, PublishCallback} from './publisher'; +export {PageOptions, GetSnapshotsCallback, GetSnapshotsResponse, GetSubscriptionsCallback, GetSubscriptionsResponse, GetTopicsCallback, GetTopicsResponse, EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, PubSub} from './pubsub'; +export {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot'; +export {Message} from './subscriber'; +export {SubscriptionMetadata, SubscriptionOptions, SubscriptionCloseCallback, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, GetSubscriptionOptions, GetSubscriptionCallback, GetSubscriptionResponse, GetSubscriptionMetadataCallback, GetSubscriptionMetadataResponse, SetSubscriptionMetadataCallback, SetSubscriptionMetadataResponse, Subscription} from './subscription'; +export {CreateTopicCallback, CreateTopicResponse, GetTopicCallback, GetTopicResponse, GetTopicOptions, GetTopicMetadataCallback, GetTopicMetadataResponse, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, Topic} from './topic'; diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index fe434b2e8e0..bdeecd07231 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -23,7 +23,7 @@ const each = require('async-each'); import * as extend from 'extend'; import * as is from 'is'; import {Topic} from './topic'; -import {RequestCallback} from '.'; +import {RequestCallback} from './pubsub'; import {ServiceError} from 'grpc'; interface Inventory { diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts new file mode 100644 index 00000000000..136134aac79 --- /dev/null +++ b/handwritten/pubsub/src/pubsub.ts @@ -0,0 +1,1052 @@ +/*! + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +import {paginator} from '@google-cloud/paginator'; +import {replaceProjectIdToken} from '@google-cloud/projectify'; +import {promisifyAll} from '@google-cloud/promisify'; +import * as extend from 'extend'; +import {GoogleAuth} from 'google-auth-library'; +import * as gax from 'google-gax'; +import * as is from 'is'; + +const PKG = require('../../package.json'); +const v1 = require('./v1'); + +import {Snapshot} from './snapshot'; +import {Subscription, SubscriptionMetadata, SubscriptionOptions, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse} from './subscription'; +import {Topic, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, CreateTopicCallback, CreateTopicResponse} from './topic'; +import {PublishOptions} from './publisher'; +import {CallOptions} from 'google-gax'; +import {Transform} from 'stream'; +import {google} from '../proto/pubsub'; +import {ServiceError, ChannelCredentials} from 'grpc'; +import {FlowControlOptions} from './lease-manager'; +import {BatchPublishOptions} from './publisher'; + +const opts = {} as gax.GrpcClientOptions; +const {grpc} = new gax.GrpcClient(opts); + +/** + * Project ID placeholder. + * @type {string} + * @private + */ +const PROJECT_ID_PLACEHOLDER = '{{projectId}}'; + +export type Omit = Pick>; + +export interface ClientConfig extends gax.GrpcClientOptions { + apiEndpoint?: string; + servicePath?: string; + port?: string|number; + sslCreds?: ChannelCredentials; +} + +export interface PageOptions { + gaxOpts?: CallOptions; + pageSize?: number; + pageToken?: string; + autoPaginate?: boolean; +} + +export type GetSnapshotsCallback = + RequestCallback; + +export type GetSnapshotsResponse = + PagedResponse; + +export type GetSubscriptionsOptions = PageOptions&{topic?: string | Topic}; + +type GetAllSubscriptionsCallback = + RequestCallback; + +type GetAllSubscriptionsResponse = + PagedResponse; + +export type GetSubscriptionsCallback = + GetAllSubscriptionsCallback|GetTopicSubscriptionsCallback; + +export type GetSubscriptionsResponse = + GetAllSubscriptionsResponse|GetTopicSubscriptionsResponse; + +export type GetTopicsCallback = + RequestCallback; + +export type GetTopicsResponse = + PagedResponse; + +export type EmptyCallback = RequestCallback; +export type EmptyResponse = [google.protobuf.IEmpty]; + +export type ExistsCallback = RequestCallback; +export type ExistsResponse = [boolean]; + +export interface GetClientConfig { + client: 'PublisherClient'|'SubscriberClient'; +} + +export interface RequestConfig extends GetClientConfig { + method: string; + reqOpts?: object; + gaxOpts?: CallOptions; +} + +export interface ResourceCallback { + (err: ServiceError|null, resource?: Resource|null, + response?: Response|null): void; +} + +export type RequestCallback = + R extends void ? NormalCallback: PagedCallback; + +export interface NormalCallback { + (err: ServiceError|null, res?: TResponse|null): void; +} + +export interface PagedCallback { + (err: ServiceError|null, results?: Item[]|null, nextQuery?: {}|null, + response?: Response|null): void; +} + +export type PagedResponse = + [Item[]]|[Item[], {} | null, Response]; + +export type ObjectStream = { + addListener(event: 'data', listener: (data: O) => void): ObjectStream; + emit(event: 'data', data: O): boolean; + on(event: 'data', listener: (data: O) => void): ObjectStream; + once(event: 'data', listener: (data: O) => void): ObjectStream; + prependListener(event: 'data', listener: (data: O) => void): ObjectStream; + prependOnceListener(event: 'data', listener: (data: O) => void): + ObjectStream; +}&Transform; + +interface GetClientCallback { + (err: Error|null, gaxClient?: gax.ClientStub): void; +} + +/** + * @typedef {object} ClientConfig + * @property {string} [projectId] The project ID from the Google Developer's + * Console, e.g. 'grape-spaceship-123'. We will also check the environment + * variable `GCLOUD_PROJECT` for your project ID. If your app is running in + * an environment which supports {@link + * https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application + * Application Default Credentials}, your project ID will be detected + * automatically. + * @property {string} [keyFilename] Full path to the a .json, .pem, or .p12 key + * downloaded from the Google Developers Console. If you provide a path to a + * JSON file, the `projectId` option above is not necessary. NOTE: .pem and + * .p12 require you to specify the `email` option as well. + * @property {string} [apiEndpoint] The `apiEndpoint` from options will set the + * host. If not set, the `PUBSUB_EMULATOR_HOST` environment variable from + * the gcloud SDK is honored, otherwise the actual API endpoint will be + * used. + * @property {string} [email] Account email address. Required when using a .pem + * or .p12 keyFilename. + * @property {object} [credentials] Credentials object. + * @property {string} [credentials.client_email] + * @property {string} [credentials.private_key] + * @property {boolean} [autoRetry=true] Automatically retry requests if the + * response is related to rate limits or certain intermittent server errors. + * We will exponentially backoff subsequent requests by default. + * @property {number} [maxRetries=3] Maximum number of automatic retries + * attempted before returning the error. + * @property {Constructor} [promise] Custom promise module to use instead of + * native Promises. + */ +/** + * [Cloud Pub/Sub](https://developers.google.com/pubsub/overview) is a + * reliable, many-to-many, asynchronous messaging service from Cloud + * Platform. + * + * @class + * + * @see [Cloud Pub/Sub overview]{@link https://developers.google.com/pubsub/overview} + * + * @param {ClientConfig} [options] Configuration options. + * + * @example Import the client library + * const {PubSub} = require('@google-cloud/pubsub'); + * + * @example Create a client that uses Application + * Default Credentials (ADC): const pubsub = new PubSub(); + * + * @example Create a client with explicit + * credentials: const pubsub = new PubSub({ projectId: + * 'your-project-id', keyFilename: '/path/to/keyfile.json' + * }); + * + * @example include:samples/quickstart.js + * region_tag:pubsub_quickstart_create_topic + * Full quickstart example: + */ +export class PubSub { + options: ClientConfig; + isEmulator: boolean; + api: {[key: string]: gax.ClientStub}; + auth: GoogleAuth; + projectId: string; + // tslint:disable-next-line variable-name + Promise?: PromiseConstructor; + getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => + ObjectStream; + getSnapshotsStream = paginator.streamify('getSnapshots') as() => + ObjectStream; + getTopicsStream = paginator.streamify('getTopics') as() => + ObjectStream; + + constructor(options?: ClientConfig) { + options = options || {}; + // Determine what scopes are needed. + // It is the union of the scopes on both clients. + const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; + const allScopes: {[key: string]: boolean} = {}; + for (const clientClass of clientClasses) { + for (const scope of clientClass.scopes) { + allScopes[scope] = true; + } + } + this.options = Object.assign( + { + 'grpc.keepalive_time_ms': 300000, + 'grpc.max_send_message_length': -1, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version, + scopes: Object.keys(allScopes), + }, + options); + /** + * @name PubSub#isEmulator + * @type {boolean} + */ + this.isEmulator = false; + this.determineBaseUrl_(); + this.api = {}; + this.auth = new GoogleAuth(this.options); + this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; + if (this.options.promise) { + this.Promise = this.options.promise; + } + } + + createSubscription( + topic: Topic|string, name: string, + options?: CreateSubscriptionOptions): Promise; + createSubscription( + topic: Topic|string, name: string, options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback): void; + createSubscription( + topic: Topic|string, name: string, + callback: CreateSubscriptionCallback): void; + /** + * @typedef {array} CreateSubscriptionResponse + * @property {Subscription} 0 The new {@link Subscription}. + * @property {object} 1 The full API response. + */ + /** + * @callback CreateSubscriptionCallback + * @param {?Error} err Request error, if any. + * @param {Subscription} Subscription + * @param {object} apiResponse The full API response. + */ + /** + * Options for creating a subscription. + * + * See a [Subscription + * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * + * @typedef {object} CreateSubscriptionRequest + * @property {object} [flowControl] Flow control configurations for + * receiving messages. Note that these options do not persist across + * subscription instances. + * @property {number} [flowControl.maxBytes] The maximum number of bytes + * in un-acked messages to allow before the subscription pauses incoming + * messages. Defaults to 20% of free memory. + * @property {number} [flowControl.maxMessages=Infinity] The maximum number + * of un-acked messages to allow before the subscription pauses incoming + * messages. + * @property {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number|date} [messageRetentionDuration] Set this to override + * the default duration of 7 days. This value is expected in seconds. + * Acceptable values are in the range of 10 minutes and 7 days. + * @property {string} [pushEndpoint] A URL to a custom endpoint that + * messages should be pushed to. + * @property {boolean} [retainAckedMessages=false] If set, acked messages + * are retained in the subscription's backlog for the length of time + * specified by `options.messageRetentionDuration`. + * @property {ExpirationPolicy} [expirationPolicy] A policy that specifies + * the conditions for this subscription's expiration. + */ + /** + * Create a subscription to a topic. + * + * @see [Subscriptions: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/create} + * @see {@link Topic#createSubscription} + * + * @throws {Error} If a Topic instance or topic name is not provided. + * @throws {Error} If a subscription name is not provided. + * + * @param {Topic|string} topic The Topic to create a + * subscription to. + * @param {string} name The name of the subscription. + * @param {CreateSubscriptionRequest} [options] See a + * [Subscription + * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * @param {CreateSubscriptionCallback} [callback] Callback function. + * @returns {Promise} + * + * @example Subscribe to a topic. + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = 'messageCenter'; + * const name = 'newMessages'; + * + * const callback = function(err, subscription, apiResponse) {}; + * + * pubsub.createSubscription(topic, name, callback); + * + * @example If the callback is omitted, we'll return a + * Promise. pubsub.createSubscription(topic, + * name).then(function(data) { const subscription = data[0]; const apiResponse + * = data[1]; + * }); + */ + createSubscription( + topic: Topic|string, name: string, + optionsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, + callback?: CreateSubscriptionCallback): + Promise|void { + if (!is.string(topic) && !(topic instanceof Topic)) { + throw new Error('A Topic is required for a new subscription.'); + } + if (!is.string(name)) { + throw new Error('A subscription name is required.'); + } + if (typeof topic === 'string') { + topic = this.topic(topic); + } + let options = typeof optionsOrCallback === 'object' ? + optionsOrCallback : + {} as CreateSubscriptionOptions; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + + // Make a deep copy of options to not pollute caller object. + options = extend(true, {}, options); + + const gaxOpts = options.gaxOpts; + const flowControl = options.flowControl; + delete options.gaxOpts; + delete options.flowControl; + + const metadata = + Subscription.formatMetadata_(options as SubscriptionMetadata); + + let subscriptionCtorOptions = flowControl ? {flowControl} : {}; + subscriptionCtorOptions = Object.assign(subscriptionCtorOptions, metadata); + const subscription = this.subscription(name, subscriptionCtorOptions); + + const reqOpts = Object.assign(metadata, { + topic: topic.name, + name: subscription.name, + }); + + this.request( + { + client: 'SubscriberClient', + method: 'createSubscription', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + subscription.metadata = resp!; + callback!(null, subscription, resp!); + }); + } + + createTopic(name: string, gaxOpts: CallOptions): Promise; + createTopic( + name: string, gaxOpts: CallOptions, callback?: CreateTopicCallback): void; + createTopic(name: string, callback: CreateTopicCallback): void; + /** + * @typedef {array} CreateTopicResponse + * @property {Topic} 0 The new {@link Topic}. + * @property {object} 1 The full API response. + */ + /** + * @callback CreateTopicCallback + * @param {?Error} err Request error, if any. + * @param {Topic} topic The new {@link Topic}. + * @param {object} apiResponse The full API response. + */ + /** + * Create a topic with the given name. + * + * @see [Topics: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/create} + * + * @param {string} name Name of the topic. + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {CreateTopicCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.createTopic('my-new-topic', function(err, topic, apiResponse) { + * if (!err) { + * // The topic was created successfully. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.createTopic('my-new-topic').then(function(data) { + * const topic = data[0]; + * const apiResponse = data[1]; + * }); + */ + createTopic( + name: string, gaxOptsOrCallback?: CallOptions|CreateTopicCallback, + callback?: CreateTopicCallback): Promise|void { + const topic = this.topic(name); + const reqOpts = { + name: topic.name, + }; + + const gaxOpts = + typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; + callback = + typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + + this.request( + { + client: 'PublisherClient', + method: 'createTopic', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + topic.metadata = resp!; + callback!(null, topic, resp!); + }); + } + /** + * Determine the appropriate endpoint to use for API requests, first trying + * the local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null + * we try Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), + * otherwise the default JSON API. + * + * @private + */ + determineBaseUrl_() { + const apiEndpoint = this.options.apiEndpoint; + if (!apiEndpoint && !process.env.PUBSUB_EMULATOR_HOST) { + return; + } + const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; + const leadingProtocol = new RegExp('^https*://'); + const trailingSlashes = new RegExp('/*$'); + const baseUrlParts = baseUrl!.replace(leadingProtocol, '') + .replace(trailingSlashes, '') + .split(':'); + this.options.servicePath = baseUrlParts[0]; + this.options.port = baseUrlParts[1]; + this.options.sslCreds = grpc.credentials.createInsecure(); + this.isEmulator = true; + } + + getSnapshots(option?: PageOptions): Promise; + getSnapshots(callback: GetSnapshotsCallback): void; + getSnapshots(option: PageOptions, callback: GetSnapshotsCallback): void; + /** + * Query object for listing snapshots. + * + * @typedef {object} GetSnapshotsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + */ + /** + * @typedef {array} GetSnapshotsResponse + * @property {Snapshot[]} 0 Array of {@link Snapshot} instances. + * @property {object} 1 The full API response. + */ + /** + * @callback GetSnapshotsCallback + * @param {?Error} err Request error, if any. + * @param {Snapshot[]} snapshots Array of {@link Snapshot} instances. + * @param {object} apiResponse The full API response. + */ + /** + * Get a list of snapshots. + * + * @param {GetSnapshotsRequest} [query] Query object for listing snapshots. + * @param {GetSnapshotsCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getSnapshots(function(err, snapshots) { + * if (!err) { + * // snapshots is an array of Snapshot objects. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.getSnapshots().then(function(data) { + * const snapshots = data[0]; + * }); + */ + getSnapshots( + optionsOrCallback?: PageOptions|GetSnapshotsCallback, + callback?: GetSnapshotsCallback): void|Promise { + const self = this; + const options = + typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + const reqOpts = Object.assign( + { + project: 'projects/' + this.projectId, + }, + options); + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + const gaxOpts = Object.assign( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); + this.request< + google.pubsub.v1.ISnapshot, google.pubsub.v1.IListSnapshotsResponse>( + { + client: 'SubscriberClient', + method: 'listSnapshots', + reqOpts, + gaxOpts, + }, + (err, rawSnapshots, ...args) => { + let snapshots: Snapshot[]; + + if (rawSnapshots) { + snapshots = rawSnapshots.map(snapshot => { + const snapshotInstance = self.snapshot(snapshot.name!); + snapshotInstance.metadata = snapshot; + return snapshotInstance; + }); + } + + callback!(err, snapshots!, ...args); + }); + } + + getSubscriptions(options?: GetSubscriptionsOptions): + Promise; + getSubscriptions(callback: GetSubscriptionsCallback): void; + getSubscriptions( + options: GetSubscriptionsOptions, + callback: GetSubscriptionsCallback): void; + /** + * Query object for listing subscriptions. + * + * @typedef {object} GetSubscriptionsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + * @param {string|Topic} options.topic - The name of the topic to + * list subscriptions from. + */ + /** + * @typedef {array} GetSubscriptionsResponse + * @property {Subscription[]} 0 Array of {@link Subscription} instances. + * @property {object} 1 The full API response. + */ + /** + * @callback GetSubscriptionsCallback + * @param {?Error} err Request error, if any. + * @param {Subscription[]} subscriptions Array of {@link Subscription} instances. + * @param {object} apiResponse The full API response. + */ + /** + * Get a list of the subscriptions registered to all of your project's topics. + * You may optionally provide a query object as the first argument to + * customize the response. + * + * Your provided callback will be invoked with an error object if an API error + * occurred or an array of {@link Subscription} objects. + * + * To get subscriptions for a topic, see {@link Topic}. + * + * @see [Subscriptions: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/list} + * + * @param {GetSubscriptionsRequest} [query] Query object for listing subscriptions. + * @param {GetSubscriptionsCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getSubscriptions(function(err, subscriptions) { + * if (!err) { + * // subscriptions is an array of Subscription objects. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.getSubscriptions().then(function(data) { + * const subscriptions = data[0]; + * }); + */ + getSubscriptions( + optionsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback, + callback?: GetSubscriptionsCallback): + void|Promise { + const self = this; + const options = + typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + + let topic = options.topic; + if (topic) { + if (!(topic instanceof Topic)) { + topic = this.topic(topic); + } + return topic.getSubscriptions( + options, callback as GetTopicSubscriptionsCallback); + } + const reqOpts = Object.assign({}, options) as + google.pubsub.v1.IListSubscriptionsRequest; + reqOpts.project = 'projects/' + this.projectId; + + delete (reqOpts as GetSubscriptionsOptions).gaxOpts; + delete (reqOpts as GetSubscriptionsOptions).autoPaginate; + + const gaxOpts = Object.assign( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); + + this.request< + google.pubsub.v1.ISubscription, + google.pubsub.v1.IListSubscriptionsResponse>( + { + client: 'SubscriberClient', + method: 'listSubscriptions', + reqOpts, + gaxOpts, + }, + (err, rawSubs, ...args) => { + let subscriptions: Subscription[]; + + if (rawSubs) { + subscriptions = rawSubs.map(sub => { + const subscriptionInstance = self.subscription(sub.name!); + subscriptionInstance.metadata = sub; + return subscriptionInstance; + }); + } + + (callback as GetAllSubscriptionsCallback)( + err, subscriptions!, ...args); + }); + } + + getTopics(options: PageOptions): Promise; + getTopics(callback: GetTopicsCallback): void; + getTopics(options: PageOptions, callback: GetTopicsCallback): void; + /** + * Query object for listing topics. + * + * @typedef {object} GetTopicsRequest + * @property {boolean} [autoPaginate=true] Have pagination handled + * automatically. + * @property {object} [options.gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @property {number} [options.pageSize] Maximum number of results to return. + * @property {string} [options.pageToken] Page token. + */ + /** + * @typedef {array} GetTopicsResponse + * @property {Topic[]} 0 Array of {@link Topic} instances. + * @property {object} 1 The full API response. + */ + /** + * @callback GetTopicsCallback + * @param {?Error} err Request error, if any. + * @param {Topic[]} topics Array of {@link Topic} instances. + * @param {object} apiResponse The full API response. + */ + /** + * Get a list of the topics registered to your project. You may optionally + * provide a query object as the first argument to customize the response. + * + * @see [Topics: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/list} + * + * @param {GetTopicsRequest} [query] Query object for listing topics. + * @param {GetTopicsCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getTopics(function(err, topics) { + * if (!err) { + * // topics is an array of Topic objects. + * } + * }); + * + * //- + * // Customize the query. + * //- + * pubsub.getTopics({ + * pageSize: 3 + * }, function(err, topics) {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.getTopics().then(function(data) { + * const topics = data[0]; + * }); + */ + getTopics( + optionsOrCallback?: PageOptions|GetTopicsCallback, + callback?: GetTopicsCallback): void|Promise { + const self = this; + const options = + typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; + callback = + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + + const reqOpts = Object.assign( + { + project: 'projects/' + this.projectId, + }, + options); + delete reqOpts.gaxOpts; + delete reqOpts.autoPaginate; + const gaxOpts = Object.assign( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts); + this.request( + { + client: 'PublisherClient', + method: 'listTopics', + reqOpts, + gaxOpts, + }, + (err, rawTopics, ...args) => { + let topics: Topic[]; + + if (rawTopics) { + topics = rawTopics.map(topic => { + const topicInstance = self.topic(topic.name); + topicInstance.metadata = topic; + return topicInstance; + }); + } + + callback!(err, topics!, ...args); + }); + } + /** + * Callback function to PubSub.getClient_(). + * @private + * @callback GetClientCallback + * @param err - Error, if any. + * @param gaxClient - The gax client specified in RequestConfig.client. + * Typed any since it's importing Javascript source. + */ + /** + * Get the PubSub client object. + * + * @private + * + * @param {object} config Configuration object. + * @param {object} config.gaxOpts GAX options. + * @param {function} config.method The gax method to call. + * @param {object} config.reqOpts Request options. + * @param {function} [callback] The callback function. + */ + getClient_(config: GetClientConfig, callback: GetClientCallback) { + const hasProjectId = + this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; + if (!hasProjectId && !this.isEmulator) { + this.auth.getProjectId((err, projectId) => { + if (err) { + callback(err); + return; + } + this.projectId = projectId!; + this.options.projectId = projectId!; + + this.getClient_(config, callback); + }); + return; + } + let gaxClient = this.api[config.client]; + if (!gaxClient) { + // Lazily instantiate client. + gaxClient = new v1[config.client](this.options) as gax.ClientStub; + this.api[config.client] = gaxClient; + } + callback(null, gaxClient); + } + /** + * Funnel all API requests through this method, to be sure we have a project + * ID. + * + * @private + * + * @param {object} config Configuration object. + * @param {object} config.gaxOpts GAX options. + * @param {function} config.method The gax method to call. + * @param {object} config.reqOpts Request options. + * @param {function} [callback] The callback function. + */ + request(config: RequestConfig, callback: RequestCallback) { + const self = this; + this.getClient_(config, (err, client) => { + if (err) { + callback(err); + return; + } + let reqOpts = extend(true, {}, config.reqOpts); + reqOpts = replaceProjectIdToken(reqOpts, self.projectId); + client![config.method](reqOpts, config.gaxOpts, callback); + }); + } + /** + * Create a Snapshot object. See {@link Subscription#createSnapshot} to + * create a snapshot. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name The name of the snapshot. + * @returns {Snapshot} A {@link Snapshot} instance. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const snapshot = pubsub.snapshot('my-snapshot'); + */ + snapshot(name: string): Snapshot { + if (!is.string(name)) { + throw new Error('You must supply a valid name for the snapshot.'); + } + return new Snapshot(this, name); + } + /** + * Create a Subscription object. This command by itself will not run any API + * requests. You will receive a {@link Subscription} object, + * which will allow you to interact with a subscription. + * + * @throws {Error} If subscription name is omitted. + * + * @param {string} name Name of the subscription. + * @param {SubscriberOptions} [options] Subscription options. + * @returns {Subscription} A {@link Subscription} instance. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const subscription = pubsub.subscription('my-subscription'); + * + * // Register a listener for `message` events. + * subscription.on('message', function(message) { + * // Called every time a message is received. + * // message.id = ID of the message. + * // message.ackId = ID used to acknowledge the message receival. + * // message.data = Contents of the message. + * // message.attributes = Attributes of the message. + * // message.publishTime = Date when Pub/Sub received the message. + * }); + */ + subscription(name: string, options?: SubscriptionOptions): Subscription { + if (!name) { + throw new Error('A name must be specified for a subscription.'); + } + return new Subscription(this, name, options); + } + /** + * Create a Topic object. See {@link PubSub#createTopic} to create a topic. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name The name of the topic. + * @returns {Topic} A {@link Topic} instance. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + */ + topic(name: string, options?: PublishOptions): Topic { + if (!name) { + throw new Error('A name must be specified for a topic.'); + } + return new Topic(this, name, options); + } +} + +/** + * Get a list of the {@link Snapshot} objects as a readable object stream. + * + * @method PubSub#getSnapshotsStream + * @param {GetSnapshotsRequest} [options] Configuration object. See + * {@link PubSub#getSnapshots} for a complete list of options. + * @returns {ReadableStream} A readable stream of {@link Snapshot} instances. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getSnapshotsStream() + * .on('error', console.error) + * .on('data', function(snapshot) { + * // snapshot is a Snapshot object. + * }) + * .on('end', function() { + * // All snapshots retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * pubsub.getSnapshotsStream() + * .on('data', function(snapshot) { + * this.end(); + * }); + */ + +/** + * Get a list of the {@link Subscription} objects registered to all of + * your project's topics as a readable object stream. + * + * @method PubSub#getSubscriptionsStream + * @param {GetSubscriptionsRequest} [options] Configuration object. See + * {@link PubSub#getSubscriptions} for a complete list of options. + * @returns {ReadableStream} A readable stream of {@link Subscription} instances. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getSubscriptionsStream() + * .on('error', console.error) + * .on('data', function(subscription) { + * // subscription is a Subscription object. + * }) + * .on('end', function() { + * // All subscriptions retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * pubsub.getSubscriptionsStream() + * .on('data', function(subscription) { + * this.end(); + * }); + */ + +/** + * Get a list of the {module:pubsub/topic} objects registered to your project as + * a readable object stream. + * + * @method PubSub#getTopicsStream + * @param {GetTopicsRequest} [options] Configuration object. See + * {@link PubSub#getTopics} for a complete list of options. + * @returns {ReadableStream} A readable stream of {@link Topic} instances. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.getTopicsStream() + * .on('error', console.error) + * .on('data', function(topic) { + * // topic is a Topic object. + * }) + * .on('end', function() { + * // All topics retrieved. + * }); + * + * //- + * // If you anticipate many results, you can end a stream early to prevent + * // unnecessary processing and API requests. + * //- + * pubsub.getTopicsStream() + * .on('data', function(topic) { + * this.end(); + * }); + */ + +/*! Developer Documentation + * + * These methods can be agto-paginated. + */ +paginator.extend(PubSub, ['getSnapshots', 'getSubscriptions', 'getTopics']); + +/*! Developer Documentation + * + * All async methods (except for streams) will return a Promise in the event + * that a callback is omitted. + */ +promisifyAll(PubSub, { + exclude: ['request', 'snapshot', 'subscription', 'topic'], +}); diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 164827500ee..cfacb29ac57 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -19,8 +19,8 @@ import {CallOptions} from 'google-gax'; import {google} from '../proto/pubsub'; -import {EmptyCallback, EmptyResponse, RequestCallback, ResourceCallback} from '.'; import {PubSub} from './index'; +import {EmptyCallback, EmptyResponse, RequestCallback, ResourceCallback} from './pubsub'; import {Subscription} from './subscription'; import * as util from './util'; diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index a1a6ec69dfc..838e38e3537 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -23,9 +23,9 @@ import * as snakeCase from 'lodash.snakecase'; import {google} from '../proto/pubsub'; -import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, Omit, PubSub, RequestCallback, ResourceCallback} from '.'; import {IAM} from './iam'; import {FlowControlOptions} from './lease-manager'; +import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; import {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot'; import {Message, Subscriber, SubscriberOptions} from './subscriber'; import {Topic} from './topic'; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 906aa88ff59..9f625b9b117 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -22,9 +22,9 @@ import {Readable} from 'stream'; import {google} from '../proto/pubsub'; -import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, ObjectStream, PagedResponse, PageOptions, PubSub, RequestCallback, ResourceCallback} from '.'; import {IAM} from './iam'; import {Attributes, PublishCallback, Publisher, PublishOptions} from './publisher'; +import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, ObjectStream, PagedResponse, PageOptions, PubSub, RequestCallback, ResourceCallback} from './pubsub'; import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, Subscription, SubscriptionOptions} from './subscription'; import * as util from './util'; diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index 67d32ec5043..830122e02d5 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -18,8 +18,8 @@ import * as promisify from '@google-cloud/promisify'; import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; -import {PubSub, RequestConfig} from '../src'; import * as iamTypes from '../src/iam'; +import {PubSub, RequestConfig} from '../src/pubsub'; import * as util from '../src/util'; let promisified = false; diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 34a9c30f320..4680592e3eb 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -149,7 +149,7 @@ describe('PubSub', () => { before(() => { delete process.env.PUBSUB_EMULATOR_HOST; - PubSub = proxyquire('../src', { + PubSub = proxyquire('../src/pubsub', { '@google-cloud/paginator': { paginator: fakePaginator, }, diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index fe7fd7e3aef..1f6e5c84cdc 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -19,8 +19,9 @@ import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; -import {PubSub, RequestConfig, Subscription} from '../src'; +import {PubSub, RequestConfig} from '../src/pubsub'; import * as snapTypes from '../src/snapshot'; +import {Subscription} from '../src/subscription'; import * as util from '../src/util'; let promisified = false; diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 4204d127749..5d40c29a7cc 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -21,12 +21,13 @@ import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {PassThrough} from 'stream'; import * as uuid from 'uuid'; -import {Subscription} from '../src'; + import {HistogramOptions} from '../src/histogram'; import {FlowControlOptions} from '../src/lease-manager'; import {BatchOptions} from '../src/message-queues'; import {MessageStreamOptions} from '../src/message-stream'; import * as s from '../src/subscriber'; +import {Subscription} from '../src/subscription'; const stubs = new Map(); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 39843883e6b..61a860c8933 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -23,7 +23,7 @@ import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {google} from '../proto/pubsub'; -import {ExistsCallback, RequestCallback, RequestConfig} from '../src'; +import {ExistsCallback, RequestCallback, RequestConfig} from '../src/pubsub'; import {SeekCallback, Snapshot} from '../src/snapshot'; import {Message, SubscriberOptions} from '../src/subscriber'; import {CreateSubscriptionCallback, CreateSubscriptionOptions, GetSubscriptionMetadataCallback, Subscription, SubscriptionMetadata} from '../src/subscription'; diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index d130aae74da..b35f4919a57 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -22,7 +22,7 @@ import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {google} from '../proto/pubsub'; -import {ExistsCallback, RequestCallback, RequestConfig} from '../src'; +import {ExistsCallback, RequestCallback, RequestConfig} from '../src/pubsub'; import {CreateSubscriptionCallback, CreateSubscriptionOptions, Subscription, SubscriptionOptions} from '../src/subscription'; import {CreateTopicCallback, GetTopicMetadataCallback, Topic} from '../src/topic'; import * as util from '../src/util'; From 3fffcdf6780e8b66c72b8cf276ab7ee0ab295e37 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Sat, 2 Mar 2019 21:42:09 -0800 Subject: [PATCH 0370/1115] refactor: clean up unused packages (#517) * refactor: clean up unused packages * fix system test --- handwritten/pubsub/package.json | 11 ++--- handwritten/pubsub/src/iam.ts | 3 +- handwritten/pubsub/src/message-stream.ts | 1 - handwritten/pubsub/src/publisher.ts | 3 +- handwritten/pubsub/src/pubsub.ts | 6 +-- handwritten/pubsub/src/subscription.ts | 7 ++- handwritten/pubsub/src/topic.ts | 6 +-- handwritten/pubsub/system-test/pubsub.ts | 61 ++++++++---------------- handwritten/pubsub/test/topic.ts | 28 ++++------- 9 files changed, 43 insertions(+), 83 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7df205eca60..2f8d2d5fa90 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -56,28 +56,22 @@ "@google-cloud/precise-date": "^0.1.0", "@google-cloud/projectify": "^0.3.0", "@google-cloud/promisify": "^0.4.0", + "@sindresorhus/is": "^0.15.0", "arrify": "^1.0.0", "async-each": "^1.0.1", - "delay": "^4.0.0", - "duplexify": "^4.0.0", "extend": "^3.0.1", "google-auth-library": "^3.0.0", "google-gax": "^0.25.0", - "is": "^3.0.1", "is-stream-ended": "^0.1.4", - "lodash.chunk": "^4.2.0", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", "p-defer": "^1.0.0", - "protobufjs": "^6.8.1", - "through2": "^3.0.0" + "protobufjs": "^6.8.1" }, "devDependencies": { "@google-cloud/nodejs-repo-tools": "^3.0.0", "@types/arrify": "^1.0.4", - "@types/duplexify": "^3.6.0", "@types/extend": "^3.0.0", - "@types/is": "0.0.21", "@types/mocha": "^5.2.5", "@types/p-defer": "^1.0.3", "@types/proxyquire": "^1.3.28", @@ -100,6 +94,7 @@ "proxyquire": "^2.0.0", "sinon": "^7.1.1", "source-map-support": "^0.5.9", + "through2": "^3.0.0", "typescript": "~3.3.0", "uuid": "^3.1.0", "linkinator": "^1.1.2" diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index b9bef871f36..a797bf003d5 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -100,8 +100,7 @@ export class IAM { this.Promise = pubsub.Promise; } this.pubsub = pubsub; - // tslint:disable-next-line no-any - this.request = pubsub.request.bind(pubsub) as any; + this.request = pubsub.request.bind(pubsub); this.id = id; } diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 96cfa4d4a6e..c52400a35b1 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -15,7 +15,6 @@ */ import {promisify} from '@google-cloud/promisify'; -import {Gaxios} from 'gaxios'; import {ClientStub} from 'google-gax'; import {ClientDuplexStream, Metadata, ServiceError, status, StatusObject} from 'grpc'; import * as isStreamEnded from 'is-stream-ended'; diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index bdeecd07231..7e2a1fd5735 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -21,10 +21,9 @@ import {google} from '../proto/pubsub'; const each = require('async-each'); import * as extend from 'extend'; -import * as is from 'is'; +import is from '@sindresorhus/is'; import {Topic} from './topic'; import {RequestCallback} from './pubsub'; -import {ServiceError} from 'grpc'; interface Inventory { callbacks: PublishCallback[]; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 136134aac79..ffc87b5b83b 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -18,10 +18,10 @@ import {paginator} from '@google-cloud/paginator'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisifyAll} from '@google-cloud/promisify'; +import is from '@sindresorhus/is'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; import * as gax from 'google-gax'; -import * as is from 'is'; const PKG = require('../../package.json'); const v1 = require('./v1'); @@ -34,8 +34,6 @@ import {CallOptions} from 'google-gax'; import {Transform} from 'stream'; import {google} from '../proto/pubsub'; import {ServiceError, ChannelCredentials} from 'grpc'; -import {FlowControlOptions} from './lease-manager'; -import {BatchPublishOptions} from './publisher'; const opts = {} as gax.GrpcClientOptions; const {grpc} = new gax.GrpcClient(opts); @@ -697,7 +695,7 @@ export class PubSub { }); } - getTopics(options: PageOptions): Promise; + getTopics(options?: PageOptions): Promise; getTopics(callback: GetTopicsCallback): void; getTopics(options: PageOptions, callback: GetTopicsCallback): void; /** diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 838e38e3537..0b0e4d325a7 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -15,10 +15,10 @@ */ import {promisifyAll} from '@google-cloud/promisify'; +import is from '@sindresorhus/is'; import {EventEmitter} from 'events'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; -import * as is from 'is'; import * as snakeCase from 'lodash.snakecase'; import {google} from '../proto/pubsub'; @@ -27,7 +27,7 @@ import {IAM} from './iam'; import {FlowControlOptions} from './lease-manager'; import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; import {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot'; -import {Message, Subscriber, SubscriberOptions} from './subscriber'; +import {Subscriber, SubscriberOptions} from './subscriber'; import {Topic} from './topic'; import {noop} from './util'; @@ -202,8 +202,7 @@ export class Subscription extends EventEmitter { options = options || {}; this.pubsub = pubsub; - // tslint:disable-next-line no-any - this.request = pubsub.request.bind(pubsub) as any; + this.request = pubsub.request.bind(pubsub); this.name = Subscription.formatName_(this.projectId, name); this.topic = options.topic; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 9f625b9b117..bd5277d5634 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -16,9 +16,8 @@ import {paginator} from '@google-cloud/paginator'; import {promisifyAll} from '@google-cloud/promisify'; +import is from '@sindresorhus/is'; import {CallOptions} from 'google-gax'; -import * as is from 'is'; -import {Readable} from 'stream'; import {google} from '../proto/pubsub'; @@ -95,8 +94,7 @@ export class Topic { * @type {PubSub} */ this.parent = this.pubsub = pubsub; - // tslint:disable-next-line no-any - this.request = pubsub.request.bind(pubsub) as any; + this.request = pubsub.request.bind(pubsub); /** * [IAM (Identity and Access * Management)](https://cloud.google.com/pubsub/access_control) allows you diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 5b75e3a79d3..742b0f16ac3 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -17,7 +17,8 @@ import * as assert from 'assert'; import * as defer from 'p-defer'; import * as uuid from 'uuid'; -import {PubSub, Subscription, Topic} from '../src'; + +import {Message, PubSub, Snapshot, Subscription, Topic} from '../src'; const pubsub = new PubSub(); @@ -60,7 +61,7 @@ describe('pubsub', () => { for (let i = 0; i < 6; i++) { await topic.publish(Buffer.from(message), options); } - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { subscription.on('error', reject); subscription.once('message', resolve); }); @@ -77,28 +78,19 @@ describe('pubsub', () => { }); describe('Topic', () => { - it('should be listed', done => { - pubsub.getTopics((err, topics) => { - assert.ifError(err); - - const results = topics!.filter(topic => { - const name = getTopicName(topic); - return TOPIC_FULL_NAMES.indexOf(name) !== -1; - }); - - // get all topics in list of known names - assert.strictEqual(results.length, TOPIC_NAMES.length); - done(); + it('should be listed', async () => { + const [topics] = await pubsub.getTopics(); + const results = topics.filter(topic => { + const name = getTopicName(topic); + return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); + // get all topics in list of known names + assert.strictEqual(results.length, TOPIC_NAMES.length); }); it('should list topics in a stream', done => { - // tslint:disable-next-line no-any - const topicsEmitted: any[] = []; - - // tslint:disable-next-line no-any - (pubsub as any) - .getTopicsStream() + const topicsEmitted = new Array(); + pubsub.getTopicsStream() .on('error', done) .on('data', topic => { @@ -115,17 +107,12 @@ describe('pubsub', () => { }); }); - it('should allow manual paging', done => { - pubsub.getTopics( - { - pageSize: TOPIC_NAMES.length - 1, - gaxOpts: {autoPaginate: false}, - }, - (err, topics) => { - assert.ifError(err); - assert.strictEqual(topics!.length, TOPIC_NAMES.length - 1); - done(); - }); + it('should allow manual paging', async () => { + const [topics] = await pubsub.getTopics({ + pageSize: TOPIC_NAMES.length - 1, + gaxOpts: {autoPaginate: false}, + }); + assert.strictEqual(topics.length, TOPIC_NAMES.length - 1); }); it('should be created and deleted', done => { @@ -178,8 +165,7 @@ describe('pubsub', () => { const attrs = { customAttribute: 'value', }; - // tslint:disable-next-line no-any - const message: any = await publishPop(data, attrs); + const message = await publishPop(data, attrs); assert.deepStrictEqual(message.data, data); assert.deepStrictEqual(message.attributes, attrs); }); @@ -610,15 +596,10 @@ describe('pubsub', () => { }); it('should get a list of snapshots as a stream', done => { - // tslint:disable-next-line no-any - const snapshots: any[] = []; - + const snapshots = new Array(); pubsub.getSnapshotsStream() .on('error', done) - .on('data', - snapshot => { - snapshots.push(snapshot); - }) + .on('data', snapshot => snapshots.push(snapshot)) .on('end', () => { assert(snapshots.length > 0); const names = snapshots.map(getSnapshotName); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index b35f4919a57..e8cd65330c7 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -23,8 +23,8 @@ import * as sinon from 'sinon'; import {google} from '../proto/pubsub'; import {ExistsCallback, RequestCallback, RequestConfig} from '../src/pubsub'; -import {CreateSubscriptionCallback, CreateSubscriptionOptions, Subscription, SubscriptionOptions} from '../src/subscription'; -import {CreateTopicCallback, GetTopicMetadataCallback, Topic} from '../src/topic'; +import {CreateSubscriptionOptions, Subscription, SubscriptionOptions} from '../src/subscription'; +import {GetTopicMetadataCallback, Topic} from '../src/topic'; import * as util from '../src/util'; let promisified = false; @@ -41,26 +41,20 @@ const fakePromisify = Object.assign({}, pfy, { }); class FakeIAM { - // tslint:disable-next-line no-any - calledWith_: any[]; - // tslint:disable-next-line no-any - constructor(...args: any[]) { + calledWith_: Array<{}>; + constructor(...args: Array<{}>) { this.calledWith_ = args; } } class FakePublisher { - // tslint:disable-next-line no-any - calledWith_: any[]; - // tslint:disable-next-line no-any - published_!: any[]; + calledWith_: Array<{}>; + published_!: Array<{}>; options_!: object; - // tslint:disable-next-line no-any - constructor(...args: any[]) { + constructor(...args: Array<{}>) { this.calledWith_ = args; } - // tslint:disable-next-line no-any - publish(...args: any[]) { + publish(...args: Array<{}>) { this.published_ = args; } setOptions(options: object) { @@ -70,12 +64,10 @@ class FakePublisher { let extended = false; const fakePaginator = { - // tslint:disable-next-line variable-name - extend(Class: Function, methods: string[]) { - if (Class.name !== 'Topic') { + extend(klass: Function, methods: string[]) { + if (klass.name !== 'Topic') { return; } - assert.deepStrictEqual(methods, ['getSubscriptions']); extended = true; }, From 3de90720f830f8f5247e3324e78492cc6238151e Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Mon, 4 Mar 2019 21:17:34 +0530 Subject: [PATCH 0371/1115] refactor(ts): noImplicitAny for publisher test file (#520) --- handwritten/pubsub/test/publisher.ts | 131 +++++++++++++++------------ 1 file changed, 72 insertions(+), 59 deletions(-) diff --git a/handwritten/pubsub/test/publisher.ts b/handwritten/pubsub/test/publisher.ts index 45c1a391278..2d4e7a4613c 100644 --- a/handwritten/pubsub/test/publisher.ts +++ b/handwritten/pubsub/test/publisher.ts @@ -18,13 +18,16 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; - +import * as publishTypes from '../src/publisher'; +import {RequestConfig} from '../src/pubsub'; +import {Topic} from '../src/topic'; import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { - // tslint:disable-next-line variable-name - promisifyAll(Class, options) { + promisifyAll( + // tslint:disable-next-line variable-name + Class: typeof publishTypes.Publisher, options: pfy.PromisifyAllOptions) { if (Class.name === 'Publisher') { assert.deepStrictEqual( options, {singular: true, exclude: ['setOptions']}); @@ -37,17 +40,17 @@ describe('Publisher', () => { const sandbox = sinon.createSandbox(); // tslint:disable-next-line variable-name - let Publisher; - let publisher; - let batchOpts; + let Publisher: typeof publishTypes.Publisher; + let publisher: publishTypes.Publisher; + let batchOpts: publishTypes.BatchPublishOptions; const TOPIC_NAME = 'test-topic'; - // tslint:disable-next-line no-any - const TOPIC: any = { + + const TOPIC = { name: TOPIC_NAME, Promise: {}, request: util.noop, - }; + } as {} as Topic; before(() => { Publisher = proxyquire('../src/publisher.js', { @@ -58,7 +61,7 @@ describe('Publisher', () => { beforeEach(() => { TOPIC.request = util.noop; publisher = new Publisher(TOPIC); - batchOpts = publisher.settings.batching; + batchOpts = publisher.settings.batching!; }); afterEach(() => sandbox.restore()); @@ -96,10 +99,11 @@ describe('Publisher', () => { }); describe('publish', () => { + const sandbox = sinon.createSandbox(); const DATA = Buffer.from('hello'); const ATTRS = {a: 'a'}; - let globalSetTimeout; + let globalSetTimeout: Function; before(() => { globalSetTimeout = global.setTimeout; @@ -111,13 +115,17 @@ describe('Publisher', () => { (global as any).setTimeout = util.noop; }); + afterEach(() => sandbox.restore()); + after(() => { - global.setTimeout = globalSetTimeout; + // tslint:disable-next-line no-any + (global as any).setTimeout = globalSetTimeout; }); it('should throw an error when data is not a buffer', () => { assert.throws(() => { - publisher.publish('hello', {}, assert.ifError); + // tslint:disable-next-line no-any + (publisher as any).publish('hello', {}, assert.ifError); }, /Data must be in the form of a Buffer\./); }); @@ -128,32 +136,34 @@ describe('Publisher', () => { }; const expectedErrorMessage = ` -All attributes must be in the form of a string. -\nInvalid value of type "${typeof true}" provided for "key2". - `.trim(); + All attributes must be in the form of a string. + \nInvalid value of type "${typeof true}" provided for "key2". + `.trim(); assert.throws(() => { - publisher.publish(DATA, brokenAttrs, assert.ifError); - }, new RegExp(expectedErrorMessage)); + // tslint:disable-next-line no-any + (publisher as any).publish(DATA, brokenAttrs, assert.ifError); + }, expectedErrorMessage); }); it('should queue the data', done => { - publisher.queue_ = (data, attrs, callback) => { - assert.strictEqual(data, DATA); - assert.strictEqual(attrs, ATTRS); - callback(); // the done fn - }; + sandbox.stub(publisher, 'queue_') + .callsFake((data, attrs, callback: Function) => { + assert.strictEqual(data, DATA); + assert.strictEqual(attrs, ATTRS); + callback(); // the done fn + }); publisher.publish(DATA, ATTRS, done); }); it('should optionally accept attributes', done => { - publisher.queue_ = (data, attrs, callback) => { - assert.strictEqual(data, DATA); - assert.deepStrictEqual(attrs, {}); - callback(); // the done fn - }; - + sandbox.stub(publisher, 'queue_') + .callsFake((data, attrs, callback: Function) => { + assert.strictEqual(data, DATA); + assert.deepStrictEqual(attrs, {}); + callback(); // the done fn + }); publisher.publish(DATA, done); }); @@ -165,26 +175,27 @@ All attributes must be in the form of a string. publisher.inventory_.bytes = 0; }; - publisher.queue_ = (data, attrs, callback) => { - assert.strictEqual(publisher.inventory_.bytes, 0); - queueCalled = true; - callback(); // the done fn - }; + sandbox.stub(publisher, 'queue_') + .callsFake((data, attrs, callback: Function) => { + assert.strictEqual(publisher.inventory_.bytes, 0); + queueCalled = true; + callback(); // the done fn + }); - publisher.inventory_.bytes = batchOpts.maxBytes - 1; + publisher.inventory_.bytes = batchOpts.maxBytes! - 1; publisher.publish(DATA, done); }); it('should not attempt to publish empty payload if data puts payload above size cap', done => { const pushRequests: Array<{}> = []; - publisher.settings.batching.maxBytes = 2; + publisher.settings.batching!.maxBytes = 2; publisher.inventory_.bytes = 0; publisher.publish_ = () => { assert.notStrictEqual(publisher.inventory_.queued.length, 0); pushRequests.push(publisher.inventory_.queued); - publisher.inventory_.callbacks.forEach(callback => { + publisher.inventory_.callbacks.forEach((callback: Function) => { callback(); }); }; @@ -203,21 +214,21 @@ All attributes must be in the form of a string. }); it('should publish if data puts payload at size cap', done => { - publisher.queue_ = () => { + sandbox.stub(publisher, 'queue_').callsFake(() => { publisher.inventory_.bytes += DATA.length; - }; + }); publisher.publish_ = done; - publisher.inventory_.bytes = batchOpts.maxBytes - DATA.length; + publisher.inventory_.bytes = batchOpts.maxBytes! - DATA.length; publisher.publish(DATA, util.noop); }); it('should publish if data puts payload at message cap', done => { let queueCalled = false; - publisher.queue_ = () => { + sandbox.stub(publisher, 'queue_').callsFake(() => { queueCalled = true; - }; + }); publisher.publish_ = () => { assert(queueCalled); @@ -233,12 +244,14 @@ All attributes must be in the form of a string. const fakeTimeoutHandle = 12345; // tslint:disable-next-line no-any - (global as any).setTimeout = (callback, duration) => { - assert.strictEqual(duration, batchOpts.maxMilliseconds); - global.setTimeout = globalSetTimeout; - setImmediate(callback); - return fakeTimeoutHandle; - }; + (global as any).setTimeout = + // tslint:disable-next-line no-any + (callback: (...args: any[]) => void, duration: number) => { + assert.strictEqual(duration, batchOpts.maxMilliseconds); + global.setTimeout = globalSetTimeout; + setImmediate(callback); + return fakeTimeoutHandle; + }; publisher.publish_ = done; publisher.publish(DATA, util.noop); @@ -246,13 +259,13 @@ All attributes must be in the form of a string. assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); }); - it('should not set a timeout if one exists', () => { - const fakeTimeoutHandle = 'not-a-real-handle'; + // it('should not set a timeout if one exists', () => { + // const fakeTimeoutHandle = 'not-a-real-handle'; - publisher.timeoutHandle_ = 'not-a-real-handle'; - publisher.publish(DATA, util.noop); - assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); - }); + // publisher.timeoutHandle_ = 'not-a-real-handle'; + // publisher.publish(DATA, util.noop); + // assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); + // }); }); describe('setOptions', () => { @@ -294,7 +307,7 @@ All attributes must be in the form of a string. batching: {maxBytes: expected + 1024}, }); - assert.strictEqual(publisher.settings.batching.maxBytes, expected); + assert.strictEqual(publisher.settings.batching!.maxBytes, expected); }); it('should cap maxMessages', () => { @@ -302,7 +315,7 @@ All attributes must be in the form of a string. batching: {maxMessages: 2000}, }); - assert.strictEqual(publisher.settings.batching.maxMessages, 1000); + assert.strictEqual(publisher.settings.batching!.maxMessages, 1000); }); it('should capture gaxOptions', () => { @@ -310,7 +323,7 @@ All attributes must be in the form of a string. publisher.setOptions({ gaxOpts: fakeGaxOpts, - }); + } as publishTypes.PublishOptions); assert.deepStrictEqual(publisher.settings.gaxOpts, fakeGaxOpts); }); @@ -338,7 +351,7 @@ All attributes must be in the form of a string. it('should make the correct request', done => { const FAKE_MESSAGE = {}; - const FAKE_GAX_OPTS = {a: 'b'}; + const FAKE_GAX_OPTS = {timeout: 10, maxRetries: 4}; TOPIC.request = config => { assert.strictEqual(config.client, 'PublisherClient'); @@ -380,7 +393,7 @@ All attributes must be in the form of a string. }, ]; - TOPIC.request = (config, callback) => { + TOPIC.request = (config: RequestConfig, callback: Function) => { callback(error, {messageIds: FAKE_IDS}); }; From 74230605b22fb872cbe7846608a5523e338ec31f Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Mon, 4 Mar 2019 21:34:38 +0530 Subject: [PATCH 0372/1115] refactor(ts): enable noImplicitAny for pubsub system test file (#519) --- handwritten/pubsub/system-test/pubsub.ts | 54 +++++++++++++----------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 742b0f16ac3..2c6f6194f50 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -18,7 +18,8 @@ import * as assert from 'assert'; import * as defer from 'p-defer'; import * as uuid from 'uuid'; -import {Message, PubSub, Snapshot, Subscription, Topic} from '../src'; +import {Message, PubSub, ServiceError, Snapshot, Subscription, Topic} from '../src'; +import {Policy} from '../src/iam'; const pubsub = new PubSub(); @@ -53,7 +54,7 @@ describe('pubsub', () => { return topic.name.split('/').pop(); } - async function publishPop(message, options = {}) { + async function publishPop(message: Buffer, options = {}) { const topic = pubsub.topic(generateTopicName()); const subscription = topic.subscription(generateSubName()); await topic.create(); @@ -256,11 +257,12 @@ describe('pubsub', () => { }); it('should list all subscriptions regardless of topic', done => { - pubsub.getSubscriptions((err, subscriptions) => { - assert.ifError(err); - assert(subscriptions instanceof Array); - done(); - }); + pubsub.getSubscriptions( + (err: ServiceError|null, subscriptions?: Subscription[]|null) => { + assert.ifError(err); + assert(subscriptions instanceof Array); + done(); + }); }); it('should list all subscriptions as a stream', done => { @@ -397,7 +399,7 @@ describe('pubsub', () => { subscription.on('error', done); subscription.on('message', ack); - function ack(message) { + function ack(message: Message) { message.ack(); subscription.close(done); } @@ -409,7 +411,7 @@ describe('pubsub', () => { subscription.on('error', done); subscription.on('message', nack); - function nack(message) { + function nack(message: Message) { message.nack(); subscription.close(done); } @@ -456,8 +458,9 @@ describe('pubsub', () => { return deferred.promise; - function onmessage(message) { - const testid = message.attributes.testid; + function onmessage(message: Message) { + // tslint:disable-next-line no-any + const testid = (message.attributes as any).testid; if (!testid) { return; @@ -492,7 +495,7 @@ describe('pubsub', () => { }); } - function publish(messageCount) { + function publish(messageCount: number) { const data = Buffer.from('Hello, world!'); const promises: Array> = []; @@ -536,11 +539,12 @@ describe('pubsub', () => { ], }; - topic.iam.setPolicy(policy, (err, newPolicy) => { - assert.ifError(err); - assert.deepStrictEqual(newPolicy.bindings, policy.bindings); - done(); - }); + topic.iam.setPolicy( + policy, (err: ServiceError|null, newPolicy?: Policy|null) => { + assert.ifError(err); + assert.deepStrictEqual(newPolicy!.bindings, policy.bindings); + done(); + }); }); it('should test the iam permissions', done => { @@ -561,11 +565,11 @@ describe('pubsub', () => { describe('Snapshot', () => { const SNAPSHOT_NAME = generateSnapshotName(); - let topic; - let subscription; - let snapshot; + let topic: Topic; + let subscription: Subscription; + let snapshot: Snapshot; - function getSnapshotName({name}) { + function getSnapshotName({name}: {name: string}) { return name.split('/').pop(); } @@ -609,8 +613,8 @@ describe('pubsub', () => { }); describe('seeking', () => { - let subscription; - let messageId; + let subscription: Subscription; + let messageId: string; beforeEach(() => { subscription = topic.subscription(generateSubName()); @@ -641,7 +645,7 @@ describe('pubsub', () => { message.ack(); if (++messageCount === 1) { - snapshot.seek(err => { + snapshot!.seek(err => { assert.ifError(err); }); return; @@ -665,7 +669,7 @@ describe('pubsub', () => { message.ack(); if (++messageCount === 1) { - subscription.seek(message.publishTime, err => { + subscription.seek(message.publishTime, (err: ServiceError|null) => { assert.ifError(err); }); return; From e87d1b89380c7e30e85041a2f9efd2ef138bbc69 Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Mon, 4 Mar 2019 21:55:40 +0530 Subject: [PATCH 0373/1115] refactor(typescript):noImplicitAny for index test file (#502) --- handwritten/pubsub/src/topic.ts | 16 +- handwritten/pubsub/test/index.ts | 356 +++++++++++++++++-------------- 2 files changed, 201 insertions(+), 171 deletions(-) diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index bd5277d5634..81a6b219d1d 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -328,13 +328,7 @@ export class Topic { callback!(null, true); return; } - let code = 0; - if (err.hasOwnProperty('code')) { - code = - (Object.getOwnPropertyDescriptor(err, 'code') as PropertyDescriptor) - .value; - } - if (code === 5) { + if (err.code === 5) { callback!(null, false); return; } @@ -397,13 +391,7 @@ export class Topic { callback!(null, this, apiResponse!); return; } - let code = 0; - if (err.hasOwnProperty('code')) { - code = - (Object.getOwnPropertyDescriptor(err, 'code') as PropertyDescriptor) - .value; - } - if (code !== 5 || !autoCreate) { + if (err.code !== 5 || !autoCreate) { callback!(err, null, apiResponse!); return; } diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 4680592e3eb..2acac60e50c 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -19,17 +19,24 @@ import * as promisify from '@google-cloud/promisify'; import * as arrify from 'arrify'; import * as assert from 'assert'; import * as gax from 'google-gax'; +import {CallOptions, ServiceError} from 'grpc'; import * as proxyquire from 'proxyquire'; +import * as sinon from 'sinon'; +import {google} from '../proto/pubsub'; +import * as pubsubTypes from '../src/pubsub'; +import {Snapshot} from '../src/snapshot'; import * as subby from '../src/subscription'; +import {Topic} from '../src/topic'; import * as util from '../src/util'; -const PKG = require('../../package.json'); +const PKG = require('../../package.json'); +const sandbox = sinon.createSandbox(); const fakeCreds = {}; const fakeGoogleGax = { GrpcClient: class extends gax.GrpcClient{ - constructor(opts) { + constructor(opts: gax.GrpcClientOptions) { super(opts); this.grpc = { credentials: { @@ -43,17 +50,23 @@ const fakeGoogleGax = { }; const subscriptionCached = subby.Subscription; -let subscriptionOverride; -function Subscription(a, b, c) { +// tslint:disable-next-line no-any +let subscriptionOverride: any; + +function Subscription( + pubsub: pubsubTypes.PubSub, name: string, + options: subby.SubscriptionOptions) { const overrideFn = subscriptionOverride || subscriptionCached; - return new overrideFn(a, b, c); + return new overrideFn(pubsub, name, options); } let promisified = false; const fakePromisify = Object.assign({}, promisify, { - // tslint:disable-next-line variable-name - promisifyAll(Class, options) { + promisifyAll( + // tslint:disable-next-line variable-name + Class: typeof pubsubTypes.PubSub, + options: promisify.PromisifyAllOptions) { if (Class.name !== 'PubSub') { return; } @@ -68,7 +81,7 @@ const fakePromisify = Object.assign({}, promisify, { }, }); -let pjyOverride; +let pjyOverride: Function; function fakePjy() { return (pjyOverride || pjy.replaceProjectIdToken).apply(null, arguments); } @@ -91,7 +104,7 @@ class FakeTopic { let extended = false; const fakePaginator = { // tslint:disable-next-line variable-name - extend(Class, methods) { + extend(Class: typeof pubsubTypes.PubSub, methods: string[]) { if (Class.name !== 'PubSub') { return; } @@ -106,12 +119,12 @@ const fakePaginator = { extended = true; }, - streamify(methodName) { + streamify(methodName: string) { return methodName; }, }; -let googleAuthOverride; +let googleAuthOverride: Function|null; function fakeGoogleAuth() { return (googleAuthOverride || util.noop).apply(null, arguments); } @@ -120,9 +133,10 @@ const v1Override = {}; // tslint:disable-next-line no-any let v1ClientOverrides: any = {}; -function defineOverridableClient(clientName) { +function defineOverridableClient(clientName: string) { function DefaultClient() {} - DefaultClient.scopes = []; + // tslint:disable-next-line no-any + (DefaultClient as any).scopes = []; Object.defineProperty(v1Override, clientName, { get() { @@ -137,13 +151,14 @@ defineOverridableClient('SubscriberClient'); describe('PubSub', () => { // tslint:disable-next-line variable-name - let PubSub; + let PubSub: typeof pubsubTypes.PubSub; const PROJECT_ID = 'test-project'; - let pubsub; + + let pubsub: pubsubTypes.PubSub; const OPTIONS = { projectId: PROJECT_ID, promise: {}, - }; + } as pubsubTypes.ClientConfig; const PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; @@ -177,7 +192,6 @@ describe('PubSub', () => { beforeEach(() => { v1ClientOverrides = {}; googleAuthOverride = null; - subscriptionOverride = null; pubsub = new PubSub(OPTIONS); pubsub.projectId = PROJECT_ID; }); @@ -218,7 +232,9 @@ describe('PubSub', () => { v1ClientOverrides.PublisherClient.scopes = ['b', 'c', 'd', 'e']; const pubsub = new PubSub({}); - assert.deepStrictEqual(pubsub.options.scopes, ['a', 'b', 'c', 'd', 'e']); + const options = {scopes: ['a', 'b', 'c', 'd', 'e']}; + const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, options); + assert.deepStrictEqual(pubsub.options, expectedOptions); }); it('should attempt to determine the service path and port', () => { @@ -244,10 +260,10 @@ describe('PubSub', () => { const options = { a: 'b', c: 'd', - }; + } as pubsubTypes.ClientConfig; const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, options); - googleAuthOverride = options_ => { + googleAuthOverride = (options_: pubsubTypes.ClientConfig) => { assert.deepStrictEqual(options_, expectedOptions); return fakeGoogleAuthInstance; }; @@ -282,9 +298,10 @@ describe('PubSub', () => { describe('createSubscription', () => { const TOPIC_NAME = 'topic'; + pubsub = new pubsubTypes.PubSub({}); const TOPIC = Object.assign(new FakeTopic(), { name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, - }); + }) as {} as Topic; const SUB_NAME = 'subscription'; const SUBSCRIPTION = { @@ -295,27 +312,31 @@ describe('PubSub', () => { name: 'subscription-name', }; + + beforeEach(() => { - // tslint:disable-next-line no-any - (Subscription as any).formatMetadata_ = metadata => { - return Object.assign({}, metadata); - }; + (Subscription as {} as typeof subby.Subscription).formatMetadata_ = + (metadata: subby.SubscriptionMetadata) => { + return Object.assign({}, metadata) as subby.SubscriptionMetadata; + }; }); it('should throw if no Topic is provided', () => { assert.throws(() => { - pubsub.createSubscription(); + // tslint:disable-next-line no-any + (pubsub as any).createSubscription(); }, /A Topic is required for a new subscription\./); }); it('should throw if no subscription name is provided', () => { assert.throws(() => { - pubsub.createSubscription(TOPIC_NAME); + // tslint:disable-next-line no-any + (pubsub as any).createSubscription(TOPIC_NAME); }, /A subscription name is required./); }); it('should not require configuration options', done => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(null, apiResponse); }; @@ -323,15 +344,15 @@ describe('PubSub', () => { }); it('should allow undefined/optional configuration options', done => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(null, apiResponse); }; - - pubsub.createSubscription(TOPIC, SUB_NAME, undefined, done); + // tslint:disable-next-line no-any + (pubsub as any).createSubscription(TOPIC, SUB_NAME, undefined, done); }); it('should create a Subscription', done => { - const opts = {a: 'b', c: 'd'}; + const opts = {a: 'b', c: 'd'} as subby.CreateSubscriptionOptions; pubsub.request = util.noop; @@ -339,9 +360,8 @@ describe('PubSub', () => { assert.strictEqual(subName, SUB_NAME); assert.deepStrictEqual(options, opts); setImmediate(done); - return SUBSCRIPTION; + return SUBSCRIPTION as subby.Subscription; }; - pubsub.createSubscription(TOPIC, SUB_NAME, opts, assert.ifError); }); @@ -365,20 +385,21 @@ describe('PubSub', () => { pubsub.topic = topicName => { return { name: topicName, - }; + } as Topic; }; - pubsub.subscription = subName => { return { name: subName, - }; + } as subby.Subscription; }; + + const reqOpts = {topic: TOPIC.name, name: SUB_NAME}; + pubsub.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSubscription'); - assert.strictEqual(config.reqOpts.topic, TOPIC.name); - assert.strictEqual(config.reqOpts.name, SUB_NAME); + assert.deepStrictEqual(config.reqOpts, reqOpts); assert.deepStrictEqual(config.gaxOpts, options.gaxOpts); done(); }; @@ -392,25 +413,22 @@ describe('PubSub', () => { pushEndpoint: 'https://domain/push', }; - const expectedBody = Object.assign( - { - topic: TOPIC.name, - name: SUB_NAME, - }, - options); + const expectedBody = + Object.assign({topic: TOPIC.name, name: SUB_NAME}, options); pubsub.topic = () => { return { name: TOPIC_NAME, - }; + } as Topic; }; pubsub.subscription = () => { return { name: SUB_NAME, - }; + } as subby.Subscription; }; + pubsub.request = config => { assert.notStrictEqual(config.reqOpts, options); assert.deepStrictEqual(config.reqOpts, expectedBody); @@ -433,13 +451,13 @@ describe('PubSub', () => { pubsub.topic = () => { return { name: TOPIC_NAME, - }; + } as Topic; }; pubsub.subscription = () => { return { name: SUB_NAME, - }; + } as subby.Subscription; }; pubsub.request = config => { @@ -457,13 +475,13 @@ describe('PubSub', () => { a: 'a', }; - // tslint:disable-next-line no-any - (Subscription as any).formatMetadata_ = metadata => { - assert.deepStrictEqual(metadata, fakeMetadata); - return formatted; - }; + (Subscription as {} as typeof subby.Subscription).formatMetadata_ = + (metadata: subby.SubscriptionMetadata) => { + assert.deepStrictEqual(metadata, fakeMetadata); + return formatted as {} as subby.SubscriptionMetadata; + }; - pubsub.request = config => { + pubsub.request = (config: pubsubTypes.RequestConfig) => { assert.strictEqual(config.reqOpts, formatted); done(); }; @@ -476,17 +494,19 @@ describe('PubSub', () => { const apiResponse = {name: SUB_NAME}; beforeEach(() => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(error, apiResponse); }; }); it('should return error & API response to the callback', done => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(error, apiResponse); }; - function callback(err, sub, resp) { + function callback( + err?: Error|null, sub?: subby.Subscription|null, + resp?: google.pubsub.v1.ISubscription|null) { assert.strictEqual(err, error); assert.strictEqual(sub, null); assert.strictEqual(resp, apiResponse); @@ -501,23 +521,24 @@ describe('PubSub', () => { const apiResponse = {name: SUB_NAME}; beforeEach(() => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(null, apiResponse); }; }); it('should return Subscription & resp to the callback', done => { const subscription = {}; - pubsub.subscription = () => { - return subscription; + return subscription as subby.Subscription; }; - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(null, apiResponse); }; - function callback(err, sub, resp) { + function callback( + err?: Error|null, sub?: subby.Subscription|null, + resp?: google.pubsub.v1.ISubscription|null) { assert.ifError(err); assert.strictEqual(sub, subscription); assert.strictEqual(resp, apiResponse); @@ -531,6 +552,7 @@ describe('PubSub', () => { describe('createTopic', () => { it('should make the correct API request', done => { + const pubsub = new pubsubTypes.PubSub(); const topicName = 'new-topic-name'; const formattedName = 'formatted-name'; const gaxOpts = {}; @@ -540,9 +562,11 @@ describe('PubSub', () => { return { name: formattedName, - }; + } as Topic; }; + + pubsub.request = config => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'createTopic'); @@ -559,7 +583,7 @@ describe('PubSub', () => { const apiResponse = {}; beforeEach(() => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(error, apiResponse); }; }); @@ -578,7 +602,7 @@ describe('PubSub', () => { const apiResponse = {}; beforeEach(() => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(null, apiResponse); }; }); @@ -589,7 +613,7 @@ describe('PubSub', () => { pubsub.topic = name => { assert.strictEqual(name, topicName); - return topicInstance; + return topicInstance as Topic; }; pubsub.createTopic(topicName, (err, topic) => { @@ -610,7 +634,7 @@ describe('PubSub', () => { }); describe('determineBaseUrl_', () => { - function setHost(host) { + function setHost(host: string) { process.env.PUBSUB_EMULATOR_HOST = host; } @@ -683,7 +707,7 @@ describe('PubSub', () => { const apiResponse = {snapshots: [{name: SNAPSHOT_NAME}]}; beforeEach(() => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(null, apiResponse.snapshots, {}, apiResponse); }; }); @@ -704,7 +728,7 @@ describe('PubSub', () => { e: 'f', }, autoPaginate: false, - }; + } as {} as pubsubTypes.PageOptions; const expectedOptions = Object.assign({}, options, { project: 'projects/' + pubsub.projectId, @@ -733,15 +757,15 @@ describe('PubSub', () => { it('should return Snapshot instances with metadata', done => { const snapshot = {}; - pubsub.snapshot = name => { + sandbox.stub(pubsub, 'snapshot').callsFake(name => { assert.strictEqual(name, SNAPSHOT_NAME); - return snapshot; - }; + return snapshot as Snapshot; + }); pubsub.getSnapshots((err, snapshots) => { assert.ifError(err); - assert.strictEqual(snapshots[0], snapshot); - assert.strictEqual(snapshots[0].metadata, apiResponse.snapshots[0]); + assert.strictEqual(snapshots![0], snapshot); + assert.strictEqual(snapshots![0].metadata, apiResponse.snapshots[0]); done(); }); }); @@ -752,15 +776,14 @@ describe('PubSub', () => { const nextQuery_ = {}; const apiResponse_ = {}; - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(err_, snapshots_, nextQuery_, apiResponse_); }; - pubsub.getSnapshots((err, snapshots, nextQuery, apiResponse) => { + pubsub.getSnapshots((err, snapshots, apiResponse) => { assert.strictEqual(err, err_); assert.deepStrictEqual(snapshots, snapshots_); - assert.strictEqual(nextQuery, nextQuery_); - assert.strictEqual(apiResponse, apiResponse_); + assert.strictEqual(apiResponse, nextQuery_); done(); }); }); @@ -770,7 +793,7 @@ describe('PubSub', () => { const apiResponse = {subscriptions: [{name: 'fake-subscription'}]}; beforeEach(() => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(null, apiResponse.subscriptions, {}, apiResponse); }; }); @@ -789,7 +812,7 @@ describe('PubSub', () => { a: 'b', }, autoPaginate: false, - }; + } as {} as pubsubTypes.GetSubscriptionsOptions; const expectedGaxOpts = Object.assign( { @@ -815,8 +838,10 @@ describe('PubSub', () => { pubsub.request = config => { const reqOpts = config.reqOpts; - assert.strictEqual(reqOpts.pageSize, opts.pageSize); - assert.strictEqual(reqOpts.pageToken, opts.pageToken); + const expectedOptions = Object.assign({}, opts, { + project: 'projects/' + pubsub.projectId, + }); + assert.deepStrictEqual(reqOpts, expectedOptions); done(); }; @@ -824,11 +849,13 @@ describe('PubSub', () => { }); it('should return Subscription instances', done => { - pubsub.getSubscriptions((err, subscriptions) => { - assert.ifError(err); - assert(subscriptions[0] instanceof subscriptionCached); - done(); - }); + pubsub.getSubscriptions( + (err: ServiceError|null, + subscriptions?: subby.Subscription[]|null) => { + assert.ifError(err); + assert(subscriptions![0] instanceof subscriptionCached); + done(); + }); }); it('should pass back all params', done => { @@ -837,17 +864,19 @@ describe('PubSub', () => { const nextQuery_ = {}; const apiResponse_ = {}; - pubsub.request = (config, callback) => { + + pubsub.request = (config, callback: Function) => { callback(err_, subs_, nextQuery_, apiResponse_); }; - pubsub.getSubscriptions((err, subs, nextQuery, apiResponse) => { - assert.strictEqual(err, err_); - assert.deepStrictEqual(subs, subs_); - assert.strictEqual(nextQuery, nextQuery_); - assert.strictEqual(apiResponse, apiResponse_); - done(); - }); + pubsub.getSubscriptions( + (err: ServiceError|null, subs?: subby.Subscription[]|null, + apiResponse?: google.pubsub.v1.IListSubscriptionsResponse|null) => { + assert.strictEqual(err, err_); + assert.deepStrictEqual(subs, subs_); + assert.strictEqual(apiResponse, nextQuery_); + done(); + }); }); describe('with topic', () => { @@ -858,9 +887,9 @@ describe('PubSub', () => { const opts = { topic, - }; + } as {} as pubsubTypes.GetSubscriptionsOptions; - topic.getSubscriptions = (options) => { + topic.getSubscriptions = (options: pubsubTypes.PageOptions) => { assert.strictEqual(options, opts); done(); }; @@ -871,18 +900,18 @@ describe('PubSub', () => { it('should create a topic instance from a name', done => { const opts = { topic: TOPIC_NAME, - }; + } as {} as pubsubTypes.GetSubscriptionsOptions; const fakeTopic = { - getSubscriptions(options) { + getSubscriptions(options: pubsubTypes.PageOptions) { assert.strictEqual(options, opts); done(); }, }; - pubsub.topic = name => { + pubsub.topic = (name: string) => { assert.strictEqual(name, TOPIC_NAME); - return fakeTopic; + return fakeTopic as Topic; }; pubsub.getSubscriptions(opts, assert.ifError); @@ -895,7 +924,7 @@ describe('PubSub', () => { const apiResponse = {topics: [{name: topicName}]}; beforeEach(() => { - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(null, apiResponse.topics, {}, apiResponse); }; }); @@ -916,7 +945,7 @@ describe('PubSub', () => { e: 'f', }, autoPaginate: false, - }; + } as {} as pubsubTypes.PageOptions; const expectedOptions = Object.assign({}, options, { project: 'projects/' + pubsub.projectId, @@ -947,13 +976,14 @@ describe('PubSub', () => { pubsub.topic = name => { assert.strictEqual(name, topicName); - return topic; + return topic as Topic; }; + pubsub.getTopics((err, topics) => { assert.ifError(err); - assert.strictEqual(topics[0], topic); - assert.strictEqual(topics[0].metadata, apiResponse.topics[0]); + assert.strictEqual(topics![0], topic); + assert.strictEqual(topics![0].metadata, apiResponse.topics[0]); done(); }); }); @@ -964,15 +994,14 @@ describe('PubSub', () => { const nextQuery_ = {}; const apiResponse_ = {}; - pubsub.request = (config, callback) => { + pubsub.request = (config, callback: Function) => { callback(err_, topics_, nextQuery_, apiResponse_); }; - pubsub.getTopics((err, topics, nextQuery, apiResponse) => { + pubsub.getTopics((err, topics, apiResponse) => { assert.strictEqual(err, err_); assert.deepStrictEqual(topics, topics_); - assert.strictEqual(nextQuery, nextQuery_); - assert.strictEqual(apiResponse, apiResponse_); + assert.strictEqual(apiResponse, nextQuery_); done(); }); }); @@ -984,22 +1013,22 @@ describe('PubSub', () => { method: 'fakeMethod', reqOpts: {a: 'a'}, gaxOpts: {b: 'b'}, - }; + } as pubsubTypes.RequestConfig; beforeEach(() => { delete pubsub.projectId; + afterEach(() => sandbox.restore()); - pubsub.auth = { - getProjectId(callback) { + sandbox.stub(pubsub, 'auth').value({ + getProjectId: (callback: Function) => { callback(null, PROJECT_ID); - }, - }; + } + }); - pjyOverride = reqOpts => { + // tslint:disable-next-line no-any + pjyOverride = (reqOpts: any) => { return reqOpts; }; - - pubsub.config = CONFIG; }); it('should call getClient_ with the correct config', done => { @@ -1013,11 +1042,11 @@ describe('PubSub', () => { it('should return error from getClient_', done => { const expectedError = new Error('some error'); - pubsub.getClient_ = (config, callback) => { + pubsub.getClient_ = (config, callback: Function) => { callback(expectedError); }; - pubsub.request(CONFIG, err => { + pubsub.request(CONFIG, (err: ServiceError|null) => { assert.strictEqual(expectedError, err); done(); }); @@ -1026,19 +1055,20 @@ describe('PubSub', () => { it('should call client method with correct options', done => { const fakeClient = {}; // tslint:disable-next-line no-any - (fakeClient as any).fakeMethod = (reqOpts, gaxOpts) => { + (fakeClient as any).fakeMethod = (reqOpts: any, gaxOpts: CallOptions) => { assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); done(); }; - pubsub.getClient_ = (config, callback) => { + pubsub.getClient_ = (config, callback: Function) => { callback(null, fakeClient); }; pubsub.request(CONFIG, assert.ifError); }); it('should replace the project id token on reqOpts', done => { - pjyOverride = (reqOpts, projectId) => { + // tslint:disable-next-line no-any + pjyOverride = (reqOpts: any, projectId: string) => { assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); done(); @@ -1051,16 +1081,14 @@ describe('PubSub', () => { const FAKE_CLIENT_INSTANCE = class {}; const CONFIG = { client: 'FakeClient', - }; + } as {} as pubsubTypes.GetClientConfig; beforeEach(() => { - pubsub.auth = { - getProjectId: util.noop, - }; + sandbox.stub(pubsub, 'auth').value({getProjectId: () => util.noop}); v1ClientOverrides.FakeClient = FAKE_CLIENT_INSTANCE; }); - + afterEach(() => sandbox.restore()); describe('project ID', () => { beforeEach(() => { delete pubsub.projectId; @@ -1068,10 +1096,13 @@ describe('PubSub', () => { }); it('should get and cache the project ID', done => { - pubsub.auth.getProjectId = callback => { - assert.strictEqual(typeof callback, 'function'); - callback(null, PROJECT_ID); - }; + sandbox.stub(pubsub, 'auth').value({ + getProjectId: (callback: Function) => { + assert.strictEqual(typeof callback, 'function'); + callback(null, PROJECT_ID); + } + }); + pubsub.getClient_(CONFIG, err => { assert.ifError(err); @@ -1084,19 +1115,20 @@ describe('PubSub', () => { it('should get the project ID if placeholder', done => { pubsub.projectId = '{{projectId}}'; - pubsub.auth.getProjectId = () => { - done(); - }; + sandbox.stub(pubsub, 'auth').value({ + getProjectId: () => { + done(); + } + }); pubsub.getClient_(CONFIG, assert.ifError); }); it('should return errors to the callback', done => { const error = new Error('err'); - - pubsub.auth.getProjectId = callback => { + sandbox.stub(pubsub.auth, 'getProjectId').callsFake(callback => { callback(error); - }; + }); pubsub.getClient_(CONFIG, err => { assert.strictEqual(err, error); @@ -1149,8 +1181,9 @@ describe('PubSub', () => { }); it('should return the correct client', done => { - // tslint:disable-next-line only-arrow-functions - v1ClientOverrides.FakeClient = function(options) { + // tslint:disable-next-line only-arrow-functions no-any + v1ClientOverrides.FakeClient = function( + options: pubsubTypes.ClientConfig) { assert.strictEqual(options, pubsub.options); return FAKE_CLIENT_INSTANCE; }; @@ -1169,22 +1202,23 @@ describe('PubSub', () => { method: 'fakeMethod', reqOpts: {a: 'a'}, gaxOpts: {}, - }; + } as pubsubTypes.RequestConfig; const FAKE_CLIENT_INSTANCE = { [CONFIG.method]: util.noop, }; beforeEach(() => { - pjyOverride = reqOpts => { + // tslint:disable-next-line no-any + pjyOverride = (reqOpts: any) => { return reqOpts; }; - pubsub.getClient_ = (config, callback) => { + pubsub.getClient_ = (config, callback: Function) => { callback(null, FAKE_CLIENT_INSTANCE); }; }); - + afterEach(() => sandbox.restore()); it('should get the client', done => { pubsub.getClient_ = config => { assert.strictEqual(config, CONFIG); @@ -1201,14 +1235,15 @@ describe('PubSub', () => { callback(error); }; - pubsub.request(CONFIG, err => { + pubsub.request(CONFIG, (err: ServiceError|null) => { assert.strictEqual(err, error); done(); }); }); it('should replace the project id token on reqOpts', done => { - pjyOverride = (reqOpts, projectId) => { + // tslint:disable-next-line no-any + pjyOverride = (reqOpts: any, projectId: string) => { assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); done(); @@ -1223,7 +1258,7 @@ describe('PubSub', () => { method: 'fakeMethod', reqOpts: {a: 'a'}, gaxOpts: {}, - }; + } as {} as pubsubTypes.RequestConfig; const replacedReqOpts = {}; @@ -1232,14 +1267,15 @@ describe('PubSub', () => { }; const fakeClient = { - fakeMethod(reqOpts, gaxOpts) { + // tslint:disable-next-line no-any + fakeMethod(reqOpts: any, gaxOpts: CallOptions) { assert.strictEqual(reqOpts, replacedReqOpts); assert.strictEqual(gaxOpts, CONFIG.gaxOpts); done(); }, }; - pubsub.getClient_ = (config, callback) => { + pubsub.getClient_ = (config, callback: Function) => { callback(null, fakeClient); }; @@ -1250,14 +1286,15 @@ describe('PubSub', () => { describe('snapshot', () => { it('should throw if a name is not provided', () => { assert.throws(() => { - pubsub.snapshot(); + // tslint:disable-next-line no-any + (pubsub as any).snapshot(); }, /You must supply a valid name for the snapshot\./); }); it('should return a Snapshot object', () => { const SNAPSHOT_NAME = 'new-snapshot'; const snapshot = pubsub.snapshot(SNAPSHOT_NAME); - const args = snapshot.calledWith_; + const args = (snapshot as {} as FakeSnapshot).calledWith_; assert(snapshot instanceof FakeSnapshot); assert.strictEqual(args[0], pubsub); @@ -1278,7 +1315,8 @@ describe('PubSub', () => { it('should pass specified name to the Subscription', done => { // tslint:disable-next-line only-arrow-functions - subscriptionOverride = function(pubsub, name) { + subscriptionOverride = function( + pubsub: pubsubTypes.PubSub, name: string) { assert.strictEqual(name, SUB_NAME); done(); }; @@ -1287,7 +1325,9 @@ describe('PubSub', () => { it('should honor settings', done => { // tslint:disable-next-line only-arrow-functions - subscriptionOverride = function(pubsub, name, options) { + subscriptionOverride = function( + pubsub: pubsubTypes.PubSub, name: string, + options: subby.SubscriptionOptions) { assert.strictEqual(options, CONFIG); done(); }; @@ -1296,7 +1336,8 @@ describe('PubSub', () => { it('should throw if a name is not provided', () => { assert.throws(() => { - return pubsub.subscription(); + // tslint:disable-next-line no-any + return (pubsub as any).subscription(); }, /A name must be specified for a subscription\./); }); }); @@ -1304,7 +1345,8 @@ describe('PubSub', () => { describe('topic', () => { it('should throw if a name is not provided', () => { assert.throws(() => { - pubsub.topic(); + // tslint:disable-next-line no-any + (pubsub as any).topic(); }, /A name must be specified for a topic\./); }); @@ -1317,7 +1359,7 @@ describe('PubSub', () => { const fakeOptions = {}; const topic = pubsub.topic(fakeName, fakeOptions); - const [ps, name, options] = topic.calledWith_; + const [ps, name, options] = (topic as {} as FakeTopic).calledWith_; assert.strictEqual(ps, pubsub); assert.strictEqual(name, fakeName); From 5e8f1f5c139ece36e9ef1d8bc7ee2ba2b2126cdc Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 4 Mar 2019 09:27:11 -0800 Subject: [PATCH 0374/1115] Release v0.27.0 (#521) --- handwritten/pubsub/CHANGELOG.md | 25 +++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index f40bc1aa97c..e5f05e7fb0e 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,31 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.27.0 + +03-04-2019 08:42 PST + + +### Bug Fixes +- refactor(typescript): various fixes/refactors to types ([#515](https://github.com/googleapis/nodejs-pubsub/pull/515)) +- fix(ts): fix getPolicy promise return signature ([#511](https://github.com/googleapis/nodejs-pubsub/pull/511)) +- fix(typescript): export all the types ([#516](https://github.com/googleapis/nodejs-pubsub/pull/516)) + +### Dependencies +- refactor: clean up unused packages ([#517](https://github.com/googleapis/nodejs-pubsub/pull/517)) + +### Documentation +- fix(docs): ensure docs are not removed by typescript ([#512](https://github.com/googleapis/nodejs-pubsub/pull/512)) +- docs: update comments on protos ([#509](https://github.com/googleapis/nodejs-pubsub/pull/509)) + +### Internal / Testing Changes +- refactor(typescript):noImplicitAny for index test file ([#502](https://github.com/googleapis/nodejs-pubsub/pull/502)) +- refactor(ts): enable noImplicitAny for IAM test file ([#501](https://github.com/googleapis/nodejs-pubsub/pull/501)) +- refactor(ts): enable noImplicitAny for lease-manager test file ([#508](https://github.com/googleapis/nodejs-pubsub/pull/508)) +- refactor(ts): enable noImplicitAny for Histogram and Message_queues test file ([#510](https://github.com/googleapis/nodejs-pubsub/pull/510)) +- refactor(ts): enable noImplicitAny for pubsub system test file ([#519](https://github.com/googleapis/nodejs-pubsub/pull/519)) +- refactor(ts): noImplicitAny for publisher test file ([#520](https://github.com/googleapis/nodejs-pubsub/pull/520)) + ## v0.26.0 02-28-2019 05:42 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2f8d2d5fa90..20b4c9559b3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.26.0", + "version": "0.27.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 2482383b3d0b6cce75483d160519bde20dbb40c3 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Tue, 5 Mar 2019 05:34:27 -0800 Subject: [PATCH 0375/1115] build: update release configuration This PR was generated using Autosynth. :rainbow: Here's the log from Synthtool: ``` synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py. synthtool > Ensuring dependencies. synthtool > Pulling artman image. latest: Pulling from googleapis/artman Digest: sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7 Status: Image is up to date for googleapis/artman:latest synthtool > Cloning googleapis. synthtool > Running generator for google/pubsub/artman_pubsub.yaml. synthtool > Generated code into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/js/pubsub-v1. .eslintignore .eslintrc.yml .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md .github/ISSUE_TEMPLATE/support_request.md .jsdoc.js .kokoro/common.cfg .kokoro/continuous/node10/common.cfg .kokoro/continuous/node10/test.cfg .kokoro/continuous/node11/common.cfg .kokoro/continuous/node11/test.cfg .kokoro/continuous/node6/common.cfg .kokoro/continuous/node6/test.cfg .kokoro/continuous/node8/common.cfg .kokoro/continuous/node8/docs.cfg .kokoro/continuous/node8/lint.cfg .kokoro/continuous/node8/samples-test.cfg .kokoro/continuous/node8/system-test-grpcjs.cfg .kokoro/continuous/node8/system-test.cfg .kokoro/continuous/node8/test.cfg .kokoro/docs.sh .kokoro/lint.sh .kokoro/presubmit/node10/common.cfg .kokoro/presubmit/node10/test.cfg .kokoro/presubmit/node11/common.cfg .kokoro/presubmit/node11/test.cfg .kokoro/presubmit/node6/common.cfg .kokoro/presubmit/node6/test.cfg .kokoro/presubmit/node8/common.cfg .kokoro/presubmit/node8/docs.cfg .kokoro/presubmit/node8/lint.cfg .kokoro/presubmit/node8/samples-test.cfg .kokoro/presubmit/node8/system-test-grpcjs.cfg .kokoro/presubmit/node8/system-test.cfg .kokoro/presubmit/node8/test.cfg .kokoro/presubmit/windows/common.cfg .kokoro/presubmit/windows/test.cfg .kokoro/publish.sh .kokoro/release/publish.cfg .kokoro/samples-test.sh .kokoro/system-test.sh .kokoro/test.bat .kokoro/test.sh .kokoro/trampoline.sh .nycrc .prettierignore .prettierrc CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE codecov.yaml renovate.json synthtool > Replaced ' }\n\\s*/\\*\\*\n\\s+\\* The DNS address for this API service.' in src/v1/subscriber_client.js. synthtool > Replaced '../../package.json' in src/v1/publisher_client.js. synthtool > Replaced '../../package.json' in src/v1/subscriber_client.js. synthtool > Replaced 'https:\\/\\/cloud\\.google\\.com[\\s\\*]*http:\\/\\/(.*)[\\s\\*]*\\)' in src/v1/doc/google/protobuf/doc_timestamp.js. synthtool > Replaced 'toISOString\\]' in src/v1/doc/google/protobuf/doc_timestamp.js. > grpc@1.19.0 install /tmpfs/src/git/autosynth/working_repo/node_modules/grpc > node-pre-gyp install --fallback-to-build --library=static_library node-pre-gyp WARN Using needle for node-pre-gyp https download [grpc] Success: "/tmpfs/src/git/autosynth/working_repo/node_modules/grpc/src/node/extension_binary/node-v57-linux-x64-glibc/grpc_node.node" is installed via remote > protobufjs@6.8.8 postinstall /tmpfs/src/git/autosynth/working_repo/node_modules/protobufjs > node scripts/postinstall > @google-cloud/pubsub@0.27.0 prepare /tmpfs/src/git/autosynth/working_repo > npm run compile > @google-cloud/pubsub@0.27.0 compile /tmpfs/src/git/autosynth/working_repo > tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp -r proto build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test npm notice created a lockfile as package-lock.json. You should commit this file. npm WARN optional SKIPPING OPTIONAL DEPENDENCY: fsevents@1.2.7 (node_modules/fsevents): npm WARN notsup SKIPPING OPTIONAL DEPENDENCY: Unsupported platform for fsevents@1.2.7: wanted {"os":"darwin","arch":"any"} (current: {"os":"linux","arch":"x64"}) added 1139 packages from 1333 contributors and audited 7197 packages in 33.139s found 1 low severity vulnerability run `npm audit fix` to fix them, or `npm audit` for details > @google-cloud/pubsub@0.27.0 fix /tmpfs/src/git/autosynth/working_repo > eslint --fix '**/*.js' && gts fix synthtool > Cleaned up 2 temporary directories. synthtool > Wrote metadata to synth.metadata. ``` --- .../pubsub/.kokoro/release/publish.cfg | 20 +++++++++++++++++++ handwritten/pubsub/synth.metadata | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index da86c3da3f1..297813671a9 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -18,6 +18,26 @@ before_action { } } +# Fetch magictoken to use with Magic Github Proxy +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "releasetool-magictoken" + } + } +} + +# Fetch api key to use with Magic Github Proxy +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "magic-github-proxy-api-key" + } + } +} + # Download trampoline resources. gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 957eb402b9a..6cd4db45097 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-03-01T12:18:24.808590Z", + "updateTime": "2019-03-05T12:21:31.683736Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "41d72d444fbe445f4da89e13be02078734fb7875", - "internalRef": "236230004" + "sha": "b4a22569c88f1f0444e889d8139ddacb799f287c", + "internalRef": "236712632" } }, { From e981ec535d0fae15a8170ab5ff6bc0e6f3f4036f Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Tue, 5 Mar 2019 18:36:02 -0800 Subject: [PATCH 0376/1115] fix(typo): correct typo: recieved => received (#527) --- handwritten/pubsub/src/subscriber.ts | 2 +- handwritten/pubsub/test/message-stream.ts | 6 +++--- handwritten/pubsub/test/subscriber.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 2cf542af36b..e8a7c48d975 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -127,7 +127,7 @@ export class Message { /** * The time at which the message was recieved by the subscription. * - * @name Message#recieved + * @name Message#received * @type {number} */ this.received = Date.now(); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index acdfafd0dd0..8a939e3cc0b 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -336,11 +336,11 @@ describe('MessageStream', () => { describe('initialization', () => { it('should pipe to the message stream', done => { const fakeResponses = [{}, {}, {}, {}, {}]; - const recieved: object[] = []; + const received: object[] = []; - messageStream.on('data', chunk => recieved.push(chunk)) + messageStream.on('data', chunk => received.push(chunk)) .on('end', () => { - assert.deepStrictEqual(recieved, fakeResponses); + assert.deepStrictEqual(received, fakeResponses); done(); }); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 5d40c29a7cc..16d00ec71fa 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -617,7 +617,7 @@ describe('Subscriber', () => { timestamp.value, RECEIVED_MESSAGE.message.publishTime); }); - it('should localize recieved time', () => { + it('should localize received time', () => { const now = Date.now(); sandbox.stub(global.Date, 'now').returns(now); From 944c2597fc00de277ec77485cdd84ea5103295b7 Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Wed, 6 Mar 2019 23:25:33 +0530 Subject: [PATCH 0377/1115] refactor(typescript): noImplicitAny for message-stream test file (#522) --- handwritten/pubsub/test/message-stream.ts | 31 +++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 8a939e3cc0b..0d98b5c8a1a 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -15,11 +15,13 @@ */ import * as assert from 'assert'; -import {Metadata} from 'grpc'; +import {Metadata, ServiceError} from 'grpc'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {Duplex, PassThrough} from 'stream'; import * as uuid from 'uuid'; +import * as messageTypes from '../src/message-stream'; +import {Subscriber} from '../src/subscriber'; // just need this for unit tests.. we have a ponyfill for destroy on // MessageStream and gax streams use Duplexify @@ -112,7 +114,7 @@ class FakeSubscriber { name: string; ackDeadline: number; client: FakeGaxClient; - constructor(client) { + constructor(client: FakeGaxClient) { this.name = uuid.v4(); this.ackDeadline = Math.floor(Math.random() * 600); this.client = client; @@ -126,11 +128,11 @@ describe('MessageStream', () => { const sandbox = sinon.createSandbox(); let client: FakeGrpcClient; - let subscriber: FakeSubscriber; + let subscriber: Subscriber; // tslint:disable-next-line variable-name - let MessageStream; - let messageStream; + let MessageStream: typeof messageTypes.MessageStream; + let messageStream: messageTypes.MessageStream; before(() => { MessageStream = proxyquire('../src/message-stream.js', { @@ -141,7 +143,7 @@ describe('MessageStream', () => { beforeEach(() => { const gaxClient = new FakeGaxClient(); client = gaxClient.client; // we hit the grpc client directly - subscriber = new FakeSubscriber(gaxClient); + subscriber = new FakeSubscriber(gaxClient) as {} as Subscriber; messageStream = new MessageStream(subscriber); }); @@ -156,8 +158,8 @@ describe('MessageStream', () => { objectMode: true, highWaterMark: 0, }; - - assert.deepStrictEqual(messageStream.options, expectedOptions); + assert.deepStrictEqual( + (messageStream as {} as FakePassThrough).options, expectedOptions); }); it('should respect the highWaterMark option', () => { @@ -169,7 +171,8 @@ describe('MessageStream', () => { highWaterMark, }; - assert.deepStrictEqual(ms.options, expectedOptions); + assert.deepStrictEqual( + (ms as {} as FakePassThrough).options, expectedOptions); }); it('should set destroyed to false', () => { @@ -302,7 +305,7 @@ describe('MessageStream', () => { }); describe('without native destroy', () => { - let destroy; + let destroy: (err?: Error) => void; before(() => { destroy = FakePassThrough.prototype.destroy; @@ -338,7 +341,7 @@ describe('MessageStream', () => { const fakeResponses = [{}, {}, {}, {}, {}]; const received: object[] = []; - messageStream.on('data', chunk => received.push(chunk)) + messageStream.on('data', (chunk: Buffer) => received.push(chunk)) .on('end', () => { assert.deepStrictEqual(received, fakeResponses); done(); @@ -379,7 +382,7 @@ describe('MessageStream', () => { const fakeError = new Error('err'); const expectedMessage = `Failed to connect to channel. Reason: err`; - ms.on('error', err => { + ms.on('error', (err: ServiceError) => { assert.strictEqual(err.code, 2); assert.strictEqual(err.message, expectedMessage); assert.strictEqual(ms.destroyed, true); @@ -397,7 +400,7 @@ describe('MessageStream', () => { const ms = new MessageStream(subscriber); const fakeError = new Error('Failed to connect before the deadline'); - ms.on('error', err => { + ms.on('error', (err: ServiceError) => { assert.strictEqual(err.code, 4); done(); }); @@ -483,7 +486,7 @@ describe('MessageStream', () => { details: 'Err', }; - messageStream.on('error', err => { + messageStream.on('error', (err: ServiceError) => { assert(err instanceof Error); assert.strictEqual(err.code, fakeStatus.code); assert.strictEqual(err.message, fakeStatus.details); From dd75779d8898a6c7bc09398ac5a5add981e51f46 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Wed, 6 Mar 2019 15:20:56 -0800 Subject: [PATCH 0378/1115] build: use node10 to run samples-test, system-test etc (#529) --- handwritten/pubsub/.kokoro/continuous/{node8 => node10}/docs.cfg | 0 handwritten/pubsub/.kokoro/continuous/{node8 => node10}/lint.cfg | 0 .../pubsub/.kokoro/continuous/{node8 => node10}/samples-test.cfg | 0 .../.kokoro/continuous/{node8 => node10}/system-test-grpcjs.cfg | 0 .../pubsub/.kokoro/continuous/{node8 => node10}/system-test.cfg | 0 handwritten/pubsub/.kokoro/presubmit/{node8 => node10}/docs.cfg | 0 handwritten/pubsub/.kokoro/presubmit/{node8 => node10}/lint.cfg | 0 .../pubsub/.kokoro/presubmit/{node8 => node10}/samples-test.cfg | 0 .../.kokoro/presubmit/{node8 => node10}/system-test-grpcjs.cfg | 0 .../pubsub/.kokoro/presubmit/{node8 => node10}/system-test.cfg | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename handwritten/pubsub/.kokoro/continuous/{node8 => node10}/docs.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node8 => node10}/lint.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node8 => node10}/samples-test.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node8 => node10}/system-test-grpcjs.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node8 => node10}/system-test.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node8 => node10}/docs.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node8 => node10}/lint.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node8 => node10}/samples-test.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node8 => node10}/system-test-grpcjs.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node8 => node10}/system-test.cfg (100%) diff --git a/handwritten/pubsub/.kokoro/continuous/node8/docs.cfg b/handwritten/pubsub/.kokoro/continuous/node10/docs.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node8/docs.cfg rename to handwritten/pubsub/.kokoro/continuous/node10/docs.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node8/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node10/lint.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node8/lint.cfg rename to handwritten/pubsub/.kokoro/continuous/node10/lint.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node8/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/samples-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node8/samples-test.cfg rename to handwritten/pubsub/.kokoro/continuous/node10/samples-test.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node8/system-test-grpcjs.cfg b/handwritten/pubsub/.kokoro/continuous/node10/system-test-grpcjs.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node8/system-test-grpcjs.cfg rename to handwritten/pubsub/.kokoro/continuous/node10/system-test-grpcjs.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node8/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/system-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node8/system-test.cfg rename to handwritten/pubsub/.kokoro/continuous/node10/system-test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/docs.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/docs.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node8/docs.cfg rename to handwritten/pubsub/.kokoro/presubmit/node10/docs.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/lint.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/lint.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node8/lint.cfg rename to handwritten/pubsub/.kokoro/presubmit/node10/lint.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/samples-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node8/samples-test.cfg rename to handwritten/pubsub/.kokoro/presubmit/node10/samples-test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/system-test-grpcjs.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/system-test-grpcjs.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node8/system-test-grpcjs.cfg rename to handwritten/pubsub/.kokoro/presubmit/node10/system-test-grpcjs.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/system-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node8/system-test.cfg rename to handwritten/pubsub/.kokoro/presubmit/node10/system-test.cfg From 55b56753883dc81fd2dc5e1eb784778b9f385cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natan=20S=C4=85gol?= Date: Thu, 7 Mar 2019 00:55:20 +0100 Subject: [PATCH 0379/1115] fix(typescript): correct response type of `Subscription.get` (#525) --- handwritten/pubsub/src/pubsub.ts | 15 ++++++++------- handwritten/pubsub/src/subscription.ts | 8 ++++---- handwritten/pubsub/src/topic.ts | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index ffc87b5b83b..63d7e3ea06f 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -249,10 +249,10 @@ export class PubSub { topic: Topic|string, name: string, options?: CreateSubscriptionOptions): Promise; createSubscription( - topic: Topic|string, name: string, options: CreateSubscriptionOptions, + topic: Topic|string, name: string, callback: CreateSubscriptionCallback): void; createSubscription( - topic: Topic|string, name: string, + topic: Topic|string, name: string, options: CreateSubscriptionOptions, callback: CreateSubscriptionCallback): void; /** * @typedef {array} CreateSubscriptionResponse @@ -386,10 +386,11 @@ export class PubSub { }); } - createTopic(name: string, gaxOpts: CallOptions): Promise; - createTopic( - name: string, gaxOpts: CallOptions, callback?: CreateTopicCallback): void; + createTopic(name: string, gaxOpts?: CallOptions): + Promise; createTopic(name: string, callback: CreateTopicCallback): void; + createTopic( + name: string, gaxOpts: CallOptions, callback: CreateTopicCallback): void; /** * @typedef {array} CreateTopicResponse * @property {Topic} 0 The new {@link Topic}. @@ -484,9 +485,9 @@ export class PubSub { this.isEmulator = true; } - getSnapshots(option?: PageOptions): Promise; + getSnapshots(options?: PageOptions): Promise; getSnapshots(callback: GetSnapshotsCallback): void; - getSnapshots(option: PageOptions, callback: GetSnapshotsCallback): void; + getSnapshots(options: PageOptions, callback: GetSnapshotsCallback): void; /** * Query object for listing snapshots. * diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 0b0e4d325a7..fedbc10ce93 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -53,7 +53,7 @@ export type CreateSubscriptionResponse = SubscriptionResponse; export type GetSubscriptionOptions = CallOptions&{autoCreate?: boolean}; export type GetSubscriptionCallback = SubscriptionCallback; -export type GetSubscriptionResponse = SubscriptionCallback; +export type GetSubscriptionResponse = SubscriptionResponse; type MetadataCallback = RequestCallback; type MetadataResponse = [google.pubsub.v1.ISubscription]; @@ -355,9 +355,9 @@ export class Subscription extends EventEmitter { }); } - createSnapshot(name: string, callback: CreateSnapshotCallback): void; createSnapshot(name: string, gaxOpts?: CallOptions): Promise; + createSnapshot(name: string, callback: CreateSnapshotCallback): void; createSnapshot( name: string, gaxOpts: CallOptions, callback: CreateSnapshotCallback): void; @@ -437,8 +437,8 @@ export class Subscription extends EventEmitter { }); } - delete(callback: EmptyCallback): void; delete(gaxOpts?: CallOptions): Promise; + delete(callback: EmptyCallback): void; delete(gaxOpts: CallOptions, callback: EmptyCallback): void; /** * Delete the subscription. Pull requests from the current subscription will @@ -545,8 +545,8 @@ export class Subscription extends EventEmitter { }); } - get(callback: GetSubscriptionCallback): void; get(gaxOpts?: GetSubscriptionOptions): Promise; + get(callback: GetSubscriptionCallback): void; get(gaxOpts: GetSubscriptionOptions, callback: GetSubscriptionCallback): void; /** * @typedef {array} GetSubscriptionResponse diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 81a6b219d1d..4c943814cc6 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -178,7 +178,7 @@ export class Topic { callback = typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; - this.pubsub.createTopic(this.name, gaxOpts, callback); + this.pubsub.createTopic(this.name, gaxOpts, callback!); } createSubscription(name: string, callback: CreateSubscriptionCallback): void; From 7ff31af3e446837e195f7c8752cc4fd125889fae Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 6 Mar 2019 16:08:05 -0800 Subject: [PATCH 0380/1115] refactor: type fixes and some light housekeeping (#528) --- handwritten/pubsub/package.json | 4 +- handwritten/pubsub/proto/iam.d.ts | 1 + handwritten/pubsub/proto/pubsub.d.ts | 1 + handwritten/pubsub/src/iam.ts | 24 +++----- handwritten/pubsub/src/index.ts | 2 +- handwritten/pubsub/src/pubsub.ts | 55 ++++++++--------- handwritten/pubsub/src/snapshot.ts | 16 ++--- handwritten/pubsub/src/subscription.ts | 78 ++++++++++-------------- handwritten/pubsub/src/topic.ts | 80 ++++++++++--------------- handwritten/pubsub/test/snapshot.ts | 9 --- handwritten/pubsub/test/subscription.ts | 9 --- handwritten/pubsub/test/topic.ts | 10 ---- 12 files changed, 112 insertions(+), 177 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 20b4c9559b3..4e592587db3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -45,8 +45,8 @@ "prepare": "npm run compile", "pretest": "npm run compile", "proto": "npm run proto:pubsub", - "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", - "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -o proto/iam.d.ts -", + "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -i long -o proto/pubsub.d.ts -", + "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -i long -o proto/iam.d.ts -", "proto-types": "mkdir -p proto && npm run proto:pubsub && npm run proto:iam", "docs-test": "linkinator docs -r --skip www.googleapis.com", "predocs-test": "npm run docs" diff --git a/handwritten/pubsub/proto/iam.d.ts b/handwritten/pubsub/proto/iam.d.ts index 92ecb2096d7..79818b5022e 100644 --- a/handwritten/pubsub/proto/iam.d.ts +++ b/handwritten/pubsub/proto/iam.d.ts @@ -1,4 +1,5 @@ import * as $protobuf from "protobufjs"; +import * as long from "long"; /** Namespace google. */ export namespace google { diff --git a/handwritten/pubsub/proto/pubsub.d.ts b/handwritten/pubsub/proto/pubsub.d.ts index 572388ae9e4..fe2ce163239 100644 --- a/handwritten/pubsub/proto/pubsub.d.ts +++ b/handwritten/pubsub/proto/pubsub.d.ts @@ -1,4 +1,5 @@ import * as $protobuf from "protobufjs"; +import * as long from "long"; /** Namespace google. */ export namespace google { diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index a797bf003d5..39988e722d2 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -147,12 +147,10 @@ export class IAM { * }); */ getPolicy( - gaxOptsOrCallback?: CallOptions|GetPolicyCallback, + optsOrCallback?: CallOptions|GetPolicyCallback, callback?: GetPolicyCallback): Promise|void { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const reqOpts = { resource: this.id, @@ -230,16 +228,14 @@ export class IAM { * }); */ setPolicy( - policy: Policy, gaxOptsOrCallback?: CallOptions|SetPolicyCallback, + policy: Policy, optsOrCallback?: CallOptions|SetPolicyCallback, callback?: SetPolicyCallback): Promise|void { if (!(typeof policy === 'object')) { throw new Error('A policy object is required.'); } - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const reqOpts = { resource: this.id, @@ -341,17 +337,15 @@ export class IAM { */ testPermissions( permissions: string|string[], - gaxOptsOrCallback?: CallOptions|TestIamPermissionsCallback, + optsOrCallback?: CallOptions|TestIamPermissionsCallback, callback?: TestIamPermissionsCallback): Promise|void { if (!Array.isArray(permissions) && !(typeof permissions === 'string')) { throw new Error('Permissions are required.'); } - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const reqOpts = { resource: this.id, diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 479d6cb5739..1756689bb72 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -83,5 +83,5 @@ export {Attributes, PublishCallback} from './publisher'; export {PageOptions, GetSnapshotsCallback, GetSnapshotsResponse, GetSubscriptionsCallback, GetSubscriptionsResponse, GetTopicsCallback, GetTopicsResponse, EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, PubSub} from './pubsub'; export {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot'; export {Message} from './subscriber'; -export {SubscriptionMetadata, SubscriptionOptions, SubscriptionCloseCallback, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, GetSubscriptionOptions, GetSubscriptionCallback, GetSubscriptionResponse, GetSubscriptionMetadataCallback, GetSubscriptionMetadataResponse, SetSubscriptionMetadataCallback, SetSubscriptionMetadataResponse, Subscription} from './subscription'; +export {PushConfig, SubscriptionMetadata, SubscriptionOptions, SubscriptionCloseCallback, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, GetSubscriptionOptions, GetSubscriptionCallback, GetSubscriptionResponse, GetSubscriptionMetadataCallback, GetSubscriptionMetadataResponse, SetSubscriptionMetadataCallback, SetSubscriptionMetadataResponse, Subscription} from './subscription'; export {CreateTopicCallback, CreateTopicResponse, GetTopicCallback, GetTopicResponse, GetTopicOptions, GetTopicMetadataCallback, GetTopicMetadataResponse, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, Topic} from './topic'; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 63d7e3ea06f..d0c8247fd85 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -432,17 +432,15 @@ export class PubSub { * }); */ createTopic( - name: string, gaxOptsOrCallback?: CallOptions|CreateTopicCallback, + name: string, optsOrCallback?: CallOptions|CreateTopicCallback, callback?: CreateTopicCallback): Promise|void { const topic = this.topic(name); const reqOpts = { name: topic.name, }; - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; this.request( { @@ -535,25 +533,26 @@ export class PubSub { * }); */ getSnapshots( - optionsOrCallback?: PageOptions|GetSnapshotsCallback, + optsOrCallback?: PageOptions|GetSnapshotsCallback, callback?: GetSnapshotsCallback): void|Promise { - const self = this; - const options = - typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + const reqOpts = Object.assign( { project: 'projects/' + this.projectId, }, options); + delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; + const gaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, options.gaxOpts); + this.request< google.pubsub.v1.ISnapshot, google.pubsub.v1.IListSnapshotsResponse>( { @@ -567,7 +566,7 @@ export class PubSub { if (rawSnapshots) { snapshots = rawSnapshots.map(snapshot => { - const snapshotInstance = self.snapshot(snapshot.name!); + const snapshotInstance = this.snapshot(snapshot.name!); snapshotInstance.metadata = snapshot; return snapshotInstance; }); @@ -578,7 +577,7 @@ export class PubSub { } getSubscriptions(options?: GetSubscriptionsOptions): - Promise; + Promise; getSubscriptions(callback: GetSubscriptionsCallback): void; getSubscriptions( options: GetSubscriptionsOptions, @@ -641,14 +640,11 @@ export class PubSub { * }); */ getSubscriptions( - optionsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback, + optsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback, callback?: GetSubscriptionsCallback): - void|Promise { - const self = this; - const options = - typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + void|Promise { + const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; let topic = options.topic; if (topic) { @@ -685,7 +681,7 @@ export class PubSub { if (rawSubs) { subscriptions = rawSubs.map(sub => { - const subscriptionInstance = self.subscription(sub.name!); + const subscriptionInstance = this.subscription(sub.name!); subscriptionInstance.metadata = sub; return subscriptionInstance; }); @@ -756,26 +752,26 @@ export class PubSub { * }); */ getTopics( - optionsOrCallback?: PageOptions|GetTopicsCallback, + optsOrCallback?: PageOptions|GetTopicsCallback, callback?: GetTopicsCallback): void|Promise { - const self = this; - const options = - typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const reqOpts = Object.assign( { project: 'projects/' + this.projectId, }, options); + delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; + const gaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, options.gaxOpts); + this.request( { client: 'PublisherClient', @@ -788,7 +784,7 @@ export class PubSub { if (rawTopics) { topics = rawTopics.map(topic => { - const topicInstance = self.topic(topic.name); + const topicInstance = this.topic(topic.name); topicInstance.metadata = topic; return topicInstance; }); @@ -853,14 +849,13 @@ export class PubSub { * @param {function} [callback] The callback function. */ request(config: RequestConfig, callback: RequestCallback) { - const self = this; this.getClient_(config, (err, client) => { if (err) { callback(err); return; } let reqOpts = extend(true, {}, config.reqOpts); - reqOpts = replaceProjectIdToken(reqOpts, self.projectId); + reqOpts = replaceProjectIdToken(reqOpts, this.projectId); client![config.method](reqOpts, config.gaxOpts, callback); }); } diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index cfacb29ac57..36ebe9a4280 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -28,8 +28,8 @@ export type CreateSnapshotCallback = ResourceCallback; export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.ISnapshot]; -export type SeekCallback = RequestCallback; -export type SeekResponse = [google.pubsub.v1.ISnapshot]; +export type SeekCallback = RequestCallback; +export type SeekResponse = [google.pubsub.v1.ISeekResponse]; /** * A Snapshot object will give you access to your Cloud Pub/Sub snapshot. @@ -134,14 +134,14 @@ export class Snapshot { const reqOpts = { snapshot: this.name, }; - callback = callback || util.noop; + this.parent.request( { client: 'SubscriberClient', method: 'deleteSnapshot', reqOpts, }, - callback); + callback!); } /*@ @@ -193,18 +193,18 @@ export class Snapshot { * }); */ create( - gaxOpts?: CallOptions|CreateSnapshotCallback, + optsOrCallback?: CallOptions|CreateSnapshotCallback, callback?: CreateSnapshotCallback): void|Promise { if (!(this.parent instanceof Subscription)) { throw new Error( `This is only available if you accessed this object through Subscription#snapshot`); } - const options = typeof gaxOpts === 'function' ? {} : gaxOpts; - callback = typeof gaxOpts === 'function' ? gaxOpts : callback; + const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; return this.parent.createSnapshot( - this.name, gaxOpts! as CallOptions, (err, snapshot, resp) => { + this.name, options, (err, snapshot, resp) => { if (err) { callback!(err, null, resp); return; diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index fedbc10ce93..858ed40eceb 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -31,6 +31,8 @@ import {Subscriber, SubscriberOptions} from './subscriber'; import {Topic} from './topic'; import {noop} from './util'; +export type PushConfig = google.pubsub.v1.IPushConfig; + export type SubscriptionMetadata = { messageRetentionDuration?: google.protobuf.IDuration|number; pushEndpoint?: string; @@ -405,15 +407,13 @@ export class Subscription extends EventEmitter { * }); */ createSnapshot( - name: string, gaxOptsOrCallback?: CallOptions|CreateSnapshotCallback, + name: string, optsOrCallback?: CallOptions|CreateSnapshotCallback, callback?: CreateSnapshotCallback): void|Promise { if (!is.string(name)) { throw new Error('A name is required to create a snapshot.'); } - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const snapshot = this.snapshot(name); const reqOpts = { @@ -469,16 +469,11 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - delete( - gaxOptsOrCallback?: CallOptions|EmptyCallback, - callback?: EmptyCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; - + delete(optsOrCallback?: CallOptions|EmptyCallback, callback?: EmptyCallback): + void|Promise { + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; - callback = callback || noop; const reqOpts = { subscription: this.name, }; @@ -588,15 +583,15 @@ export class Subscription extends EventEmitter { * const apiResponse = data[1]; * }); */ - get(gaxOptsOrCallback?: GetSubscriptionOptions|GetSubscriptionCallback, + get(optsOrCallback?: GetSubscriptionOptions|GetSubscriptionCallback, callback?: GetSubscriptionCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + const autoCreate = !!gaxOpts.autoCreate && this.topic; delete gaxOpts.autoCreate; + this.getMetadata(gaxOpts, (err, apiResponse) => { if (!err) { callback!(null, this, apiResponse!); @@ -654,16 +649,16 @@ export class Subscription extends EventEmitter { * }); */ getMetadata( - gaxOptsOrCallback?: CallOptions|GetSubscriptionMetadataCallback, + optsOrCallback?: CallOptions|GetSubscriptionMetadataCallback, callback?: GetSubscriptionMetadataCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + const reqOpts = { subscription: this.name, }; + this.request( { client: 'SubscriberClient', @@ -679,13 +674,11 @@ export class Subscription extends EventEmitter { }); } - modifyPushConfig(config: google.pubsub.v1.IPushConfig, gaxOpts?: CallOptions): + modifyPushConfig(config: PushConfig, gaxOpts?: CallOptions): Promise; + modifyPushConfig(config: PushConfig, callback: EmptyCallback): void; modifyPushConfig( - config: google.pubsub.v1.IPushConfig, callback: EmptyCallback): void; - modifyPushConfig( - config: google.pubsub.v1.IPushConfig, gaxOpts: CallOptions, - callback: EmptyCallback): void; + config: PushConfig, gaxOpts: CallOptions, callback: EmptyCallback): void; /** * @typedef {array} ModifyPushConfigResponse * @property {object} 0 The full API response. @@ -735,17 +728,16 @@ export class Subscription extends EventEmitter { * }); */ modifyPushConfig( - config: google.pubsub.v1.IPushConfig, - gaxOptsOrCallback?: CallOptions|EmptyCallback, + config: PushConfig, optsOrCallback?: CallOptions|EmptyCallback, callback?: EmptyCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + const reqOpts = { subscription: this.name, pushConfig: config, }; + this.request( { client: 'SubscriberClient', @@ -825,12 +817,10 @@ export class Subscription extends EventEmitter { * subscription.seek(date, callback); */ seek( - snapshot: string|Date, gaxOptsOrCallback?: CallOptions|SeekCallback, + snapshot: string|Date, optsOrCallback?: CallOptions|SeekCallback, callback?: SeekCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const reqOpts: google.pubsub.v1.ISeekRequest = { subscription: this.name, @@ -900,13 +890,11 @@ export class Subscription extends EventEmitter { */ setMetadata( metadata: SubscriptionMetadata, - gaxOptsOrCallback?: CallOptions|SetSubscriptionMetadataCallback, + optsOrCallback?: CallOptions|SetSubscriptionMetadataCallback, callback?: SetSubscriptionMetadataCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const subscription = Subscription.formatMetadata_(metadata); const fields = Object.keys(subscription).map(snakeCase); diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 4c943814cc6..5b42bacbe66 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -171,12 +171,10 @@ export class Topic { * }); */ create( - gaxOptsOrCallback?: CallOptions|CreateTopicCallback, + optsOrCallback?: CallOptions|CreateTopicCallback, callback?: CreateTopicCallback): Promise|void { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; this.pubsub.createTopic(this.name, gaxOpts, callback!); } @@ -226,13 +224,11 @@ export class Topic { */ createSubscription( name: string, - optionsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, + optsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, callback?: CreateSubscriptionCallback): void|Promise { - const options = - typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; this.pubsub.createSubscription( this, name, options as CreateSubscriptionOptions, callback!); @@ -268,18 +264,15 @@ export class Topic { * const apiResponse = data[0]; * }); */ - delete( - gaxOptsOrCallback?: CallOptions|EmptyCallback, - callback?: EmptyCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; - - callback = callback || util.noop; + delete(optsOrCallback?: CallOptions|EmptyCallback, callback?: EmptyCallback): + void|Promise { + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + const reqOpts = { topic: this.name, }; + this.request( { client: 'PublisherClient', @@ -287,7 +280,7 @@ export class Topic { reqOpts, gaxOpts: gaxOpts as CallOptions, }, - callback); + callback!); } exists(): Promise; @@ -378,14 +371,14 @@ export class Topic { * const apiResponse = data[1]; * }); */ - get(gaxOptsOrCallback?: GetTopicOptions|GetTopicCallback, + get(optsOrCallback?: GetTopicOptions|GetTopicCallback, callback?: GetTopicCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + const autoCreate = !!gaxOpts.autoCreate; delete gaxOpts.autoCreate; + this.getMetadata(gaxOpts, (err, apiResponse) => { if (!err) { callback!(null, this, apiResponse!); @@ -437,16 +430,16 @@ export class Topic { * }); */ getMetadata( - gaxOptsOrCallback?: CallOptions|GetTopicMetadataCallback, + optsOrCallback?: CallOptions|GetTopicMetadataCallback, callback?: GetTopicMetadataCallback): void|Promise { - const gaxOpts = - typeof gaxOptsOrCallback === 'object' ? gaxOptsOrCallback : {}; - callback = - typeof gaxOptsOrCallback === 'function' ? gaxOptsOrCallback : callback; + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + const reqOpts = { topic: this.name, }; + this.request( { client: 'PublisherClient', @@ -504,14 +497,11 @@ export class Topic { * }); */ getSubscriptions( - optionsOrCallback?: PageOptions|GetTopicSubscriptionsCallback, + optsOrCallback?: PageOptions|GetTopicSubscriptionsCallback, callback?: GetTopicSubscriptionsCallback): void|Promise { - const self = this; - const options = - typeof optionsOrCallback === 'object' ? optionsOrCallback : {}; - callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const reqOpts: google.pubsub.v1.IListTopicSubscriptionsRequest = Object.assign( @@ -594,13 +584,10 @@ export class Topic { * topic.publish(data).then((messageId) => {}); */ publish( - data: Buffer, attributesOrCallback?: Attributes|PublishCallback, + data: Buffer, attrsOrCb?: Attributes|PublishCallback, callback?: PublishCallback): Promise|void { - const attributes = - typeof attributesOrCallback === 'object' ? attributesOrCallback : {}; - callback = typeof attributesOrCallback === 'function' ? - attributesOrCallback : - callback; + const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; + callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; return this.publisher.publish(data, attributes, callback!); } @@ -657,16 +644,13 @@ export class Topic { * topic.publishJSON(data).then((messageId) => {}); */ publishJSON( - json: object, attributesOrCallback?: Attributes|PublishCallback, + json: object, attrsOrCb?: Attributes|PublishCallback, callback?: PublishCallback): Promise|void { if (!is.object(json)) { throw new Error('First parameter should be an object.'); } - const attributes = - typeof attributesOrCallback === 'object' ? attributesOrCallback : {}; - callback = typeof attributesOrCallback === 'function' ? - attributesOrCallback : - callback; + const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; + callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; const data = Buffer.from(JSON.stringify(json)); return this.publish(data, attributes, callback!); diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 1f6e5c84cdc..098da790e1c 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -233,14 +233,5 @@ describe('Snapshot', () => { snapshot.delete(done); }); - - it('should optionally accept a callback', done => { - sandbox.stub(util, 'noop').callsFake(done); - - snapshot.parent.request = (config: RequestConfig, callback: Function) => { - callback(); // the done fn - }; - snapshot.delete(); - }); }); }); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 61a860c8933..eafcfcb6567 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -491,15 +491,6 @@ describe('Subscription', () => { }; }); - it('should optionally accept a callback', done => { - sandbox.stub(util, 'noop').callsFake((err?, resp?) => { - assert.ifError(err); - assert.strictEqual(resp, apiResponse); - done(); - }); - subscription.delete(); - }); - it('should return the api response', done => { subscription.delete((err: Error, resp: google.protobuf.Empty) => { assert.ifError(err); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index e8cd65330c7..abd8ad9c2e5 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -241,16 +241,6 @@ describe('Topic', () => { topic.delete(options, assert.ifError); }); - - it('should optionally accept a callback', done => { - topic.request = - (config: RequestConfig, - callback: RequestCallback) => { - assert.strictEqual(typeof callback, 'function'); - done(); - }; - topic.delete(); - }); }); describe('get', () => { From 798860811cdfbe25063ccf4880bde562a1bf2a38 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 7 Mar 2019 08:33:07 -0800 Subject: [PATCH 0381/1115] Release v0.27.1 (#531) --- handwritten/pubsub/CHANGELOG.md | 16 ++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index e5f05e7fb0e..49059490152 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,22 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.27.1 + +03-06-2019 20:11 PST + +### Bug Fixes +- fix(typescript): correct response type of `Subscription.get` ([#525](https://github.com/googleapis/nodejs-pubsub/pull/525)) + +### Documentation +- fix(typo): correct typo: recieved => received ([#527](https://github.com/googleapis/nodejs-pubsub/pull/527)) + +### Internal / Testing Changes +- build: update release configuration +- refactor(typescript): noImplicitAny for message-stream test file ([#522](https://github.com/googleapis/nodejs-pubsub/pull/522)) +- build: use node10 to run samples-test, system-test etc ([#529](https://github.com/googleapis/nodejs-pubsub/pull/529)) +- refactor: type fixes and some light housekeeping ([#528](https://github.com/googleapis/nodejs-pubsub/pull/528)) + ## v0.27.0 03-04-2019 08:42 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4e592587db3..bac607115cb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.27.0", + "version": "0.27.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 6a158d39b101513e2c3d537bedab4b16f6a01a66 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 7 Mar 2019 18:05:41 -0800 Subject: [PATCH 0382/1115] build: Add docuploader credentials to node publish jobs (#533) --- .../pubsub/.kokoro/release/publish.cfg | 9 ++++++ handwritten/pubsub/synth.metadata | 28 +++---------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 297813671a9..779a0654395 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -18,6 +18,15 @@ before_action { } } +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "docuploader_service_account" + } + } +} + # Fetch magictoken to use with Magic Github Proxy before_action { fetch_keystore { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 6cd4db45097..1d032610982 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,38 +1,18 @@ { - "updateTime": "2019-03-05T12:21:31.683736Z", + "updateTime": "2019-03-08T00:45:45.387967Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.14", - "dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7" + "version": "0.16.15", + "dockerImage": "googleapis/artman@sha256:9caadfa59d48224cba5f3217eb9d61a155b78ccf31e628abef385bc5b7ed3bd2" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "b4a22569c88f1f0444e889d8139ddacb799f287c", - "internalRef": "236712632" - } - }, - { - "template": { - "name": "node_library", - "origin": "synthtool.gcp", - "version": "2019.2.26" - } - } - ], - "destinations": [ - { - "client": { - "source": "googleapis", - "apiName": "pubsub", - "apiVersion": "v1", - "language": "nodejs", - "generator": "gapic", - "config": "google/pubsub/artman_pubsub.yaml" + "sha": "c986e1d9618ac41343962b353d136201d72626ae" } } ] From de9c32eef2cd4cf5b0d0f175813fb78c68e10599 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 8 Mar 2019 11:18:18 -0800 Subject: [PATCH 0383/1115] test: add missing packages and install test (#536) --- handwritten/pubsub/package.json | 13 +++-- .../system-test/fixtures/sample/package.json | 23 ++++++++ .../system-test/fixtures/sample/src/index.ts | 8 +++ .../system-test/fixtures/sample/tsconfig.json | 12 ++++ handwritten/pubsub/system-test/install.ts | 56 +++++++++++++++++++ 5 files changed, 108 insertions(+), 4 deletions(-) create mode 100644 handwritten/pubsub/system-test/fixtures/sample/package.json create mode 100644 handwritten/pubsub/system-test/fixtures/sample/src/index.ts create mode 100644 handwritten/pubsub/system-test/fixtures/sample/tsconfig.json create mode 100644 handwritten/pubsub/system-test/install.ts diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index bac607115cb..d85a9ed00fb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,6 +57,8 @@ "@google-cloud/projectify": "^0.3.0", "@google-cloud/promisify": "^0.4.0", "@sindresorhus/is": "^0.15.0", + "@types/duplexify": "^3.6.0", + "@types/p-defer": "^1.0.3", "arrify": "^1.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", @@ -71,9 +73,9 @@ "devDependencies": { "@google-cloud/nodejs-repo-tools": "^3.0.0", "@types/arrify": "^1.0.4", + "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/mocha": "^5.2.5", - "@types/p-defer": "^1.0.3", "@types/proxyquire": "^1.3.28", "@types/sinon": "^7.0.0", "@types/through2": "^2.0.34", @@ -83,11 +85,15 @@ "eslint-config-prettier": "^4.0.0", "eslint-plugin-node": "^8.0.0", "eslint-plugin-prettier": "^3.0.0", + "execa": "^1.0.0", "gts": "^0.9.0", - "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", + "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", + "linkinator": "^1.1.2", "mocha": "^6.0.0", + "mv": "^2.1.1", + "ncp": "^2.0.0", "nyc": "^13.0.0", "power-assert": "^1.4.4", "prettier": "^1.9.1", @@ -96,7 +102,6 @@ "source-map-support": "^0.5.9", "through2": "^3.0.0", "typescript": "~3.3.0", - "uuid": "^3.1.0", - "linkinator": "^1.1.2" + "uuid": "^3.1.0" } } diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json new file mode 100644 index 00000000000..b83e6a633d7 --- /dev/null +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -0,0 +1,23 @@ +{ + "name": "pubsub-sample-fixture", + "description": "An app we're using to test the library.", + "scripts": { + "check": "gts check", + "clean": "gts clean", + "compile": "tsc -p .", + "fix": "gts fix", + "prepare": "npm run compile", + "pretest": "npm run compile", + "posttest": "npm run check", + "start": "node build/src/index.js" + }, + "license": "Apache-2.0", + "dependencies": { + "@google-cloud/pubsub": "file:./pubsub.tgz" + }, + "devDependencies": { + "@types/node": "^10.3.0", + "typescript": "^3.0.0", + "gts": "^0.9.0" + } +} diff --git a/handwritten/pubsub/system-test/fixtures/sample/src/index.ts b/handwritten/pubsub/system-test/fixtures/sample/src/index.ts new file mode 100644 index 00000000000..afa3eac5749 --- /dev/null +++ b/handwritten/pubsub/system-test/fixtures/sample/src/index.ts @@ -0,0 +1,8 @@ +import {PubSub} from '@google-cloud/pubsub'; + +async function main() { + const pubsub = new PubSub(); + console.log(pubsub); +} + +main(); diff --git a/handwritten/pubsub/system-test/fixtures/sample/tsconfig.json b/handwritten/pubsub/system-test/fixtures/sample/tsconfig.json new file mode 100644 index 00000000000..67e8b218b2a --- /dev/null +++ b/handwritten/pubsub/system-test/fixtures/sample/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "./node_modules/gts/tsconfig-google.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "types": ["node"], + "skipLibCheck": true, + }, + "include": [ + "src/*.ts" + ] +} diff --git a/handwritten/pubsub/system-test/install.ts b/handwritten/pubsub/system-test/install.ts new file mode 100644 index 00000000000..9f19523e9b8 --- /dev/null +++ b/handwritten/pubsub/system-test/install.ts @@ -0,0 +1,56 @@ +/** + * Copyright 2019 Google LLC. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as execa from 'execa'; +import * as mv from 'mv'; +import {ncp} from 'ncp'; +import * as tmp from 'tmp'; +import {promisify} from 'util'; + +const keep = false; +const mvp = promisify(mv) as {} as (...args: string[]) => Promise; +const ncpp = promisify(ncp); +const stagingDir = tmp.dirSync({keep, unsafeCleanup: true}); +const stagingPath = stagingDir.name; +const pkg = require('../../package.json'); + +describe('📦 pack and install', () => { + /** + * Create a staging directory with temp fixtures used to test on a fresh + * application. + */ + it('should be able to use the d.ts', async () => { + await execa('npm', ['pack', '--unsafe-perm']); + const tarball = `google-cloud-pubsub-${pkg.version}.tgz`; + await mvp(tarball, `${stagingPath}/pubsub.tgz`); + await ncpp('system-test/fixtures/sample', `${stagingPath}/`); + await execa( + 'npm', ['install', '--unsafe-perm'], + {cwd: `${stagingPath}/`, stdio: 'inherit'}); + await execa( + 'node', ['--throw-deprecation', 'build/src/index.js'], + {cwd: `${stagingPath}/`, stdio: 'inherit'}); + }); + + /** + * CLEAN UP - remove the staging directory when done. + */ + after('cleanup staging', () => { + if (!keep) { + stagingDir.removeCallback(); + } + }); +}); From a5e3ecbc60fede06d81e65d416f5dee012a01469 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 8 Mar 2019 19:39:38 -0800 Subject: [PATCH 0384/1115] feat(topic): create setMetadata method (#537) --- handwritten/pubsub/src/index.ts | 2 +- handwritten/pubsub/src/topic.ts | 92 +++++++++++++++++++++++++++++--- handwritten/pubsub/test/topic.ts | 49 +++++++++++++++++ 3 files changed, 136 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 1756689bb72..f4d61a17deb 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -84,4 +84,4 @@ export {PageOptions, GetSnapshotsCallback, GetSnapshotsResponse, GetSubscription export {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot'; export {Message} from './subscriber'; export {PushConfig, SubscriptionMetadata, SubscriptionOptions, SubscriptionCloseCallback, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, GetSubscriptionOptions, GetSubscriptionCallback, GetSubscriptionResponse, GetSubscriptionMetadataCallback, GetSubscriptionMetadataResponse, SetSubscriptionMetadataCallback, SetSubscriptionMetadataResponse, Subscription} from './subscription'; -export {CreateTopicCallback, CreateTopicResponse, GetTopicCallback, GetTopicResponse, GetTopicOptions, GetTopicMetadataCallback, GetTopicMetadataResponse, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, Topic} from './topic'; +export {CreateTopicCallback, CreateTopicResponse, GetTopicCallback, GetTopicResponse, GetTopicOptions, GetTopicMetadataCallback, GetTopicMetadataResponse, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, SetTopicMetadataCallback, SetTopicMetadataResponse, Topic, TopicMetadata} from './topic'; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 5b42bacbe66..c1ee435ec93 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -27,8 +27,10 @@ import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, ObjectStre import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, Subscription, SubscriptionOptions} from './subscription'; import * as util from './util'; -type TopicCallback = ResourceCallback; -type TopicResponse = [Topic, google.pubsub.v1.ITopic]; +export type TopicMetadata = google.pubsub.v1.ITopic; + +type TopicCallback = ResourceCallback; +type TopicResponse = [Topic, TopicMetadata]; export type CreateTopicCallback = TopicCallback; export type CreateTopicResponse = TopicResponse; @@ -38,8 +40,14 @@ export type GetTopicResponse = TopicResponse; export type GetTopicOptions = CallOptions&{autoCreate?: boolean}; -export type GetTopicMetadataCallback = RequestCallback; -export type GetTopicMetadataResponse = [google.pubsub.v1.ITopic]; +type MetadataCallback = RequestCallback; +type MetadataResponse = [TopicMetadata]; + +export type GetTopicMetadataCallback = MetadataCallback; +export type GetTopicMetadataResponse = MetadataResponse; + +export type SetTopicMetadataCallback = MetadataCallback; +export type SetTopicMetadataResponse = MetadataResponse; export type GetTopicSubscriptionsCallback = RequestCallback< Subscription, google.pubsub.v1.IListTopicSubscriptionsResponse>; @@ -67,7 +75,7 @@ export class Topic { pubsub: PubSub; request: typeof PubSub.prototype.request; iam: IAM; - metadata?: google.pubsub.v1.ITopic; + metadata?: TopicMetadata; publisher: Publisher; getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => ObjectStream; @@ -440,7 +448,7 @@ export class Topic { topic: this.name, }; - this.request( + this.request( { client: 'PublisherClient', method: 'getTopic', @@ -656,6 +664,78 @@ export class Topic { return this.publish(data, attributes, callback!); } + setMetadata(options: TopicMetadata, gaxOpts?: CallOptions): + Promise; + setMetadata(options: TopicMetadata, callback: SetTopicMetadataCallback): void; + setMetadata( + options: TopicMetadata, gaxOpts: CallOptions, + callback: SetTopicMetadataCallback): void; + /** + * @typedef {array} SetTopicMetadataResponse + * @property {object} 0 The full API response. + */ + /** + * @callback SetTopicMetadataCallback + * @param {?Error} err Request error, if any. + * @param {object} apiResponse The full API response. + */ + /** + * Updates the topic. + * + * @see [UpdateTopicRequest API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/UpdateTopicRequest} + * + * @param {object} metadata The fields to update. This should be structured + * like a {@link + * https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics#Topic|Topic + * object}. + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * @param {SetTopicMetadataCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const metadata = { + * labels: {foo: 'bar'} + * }; + * + * topic.setMetadata(metadata, err => { + * if (err) { + * // Error handling omitted. + * } + * }); + * + * @example If the callback is omitted, we'll return a + * Promise. + * topic.setMetadata(metadata).then((data) => { + * const apiResponse = data[0]; + * }); + */ + setMetadata( + options: TopicMetadata, + optsOrCallback?: CallOptions|SetTopicMetadataCallback, + callback?: SetTopicMetadataCallback): + void|Promise { + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + + const topic = Object.assign({name: this.name}, options); + const updateMask = {paths: Object.keys(options)}; + const reqOpts = {topic, updateMask}; + + this.request( + { + client: 'PublisherClient', + method: 'updateTopic', + reqOpts, + gaxOpts, + }, + callback!); + } + /** * Set the publisher options. * diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index abd8ad9c2e5..c33cf75fc48 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -593,6 +593,55 @@ describe('Topic', () => { }); }); + describe('setMetadata', () => { + const METADATA = { + labels: {yee: 'haw'}, + }; + + let requestStub: sinon.SinonStub; + + beforeEach(() => { + requestStub = sandbox.stub(topic, 'request'); + }); + + it('should call the correct rpc', () => { + topic.setMetadata(METADATA, assert.ifError); + + const [{client, method}] = requestStub.lastCall.args; + assert.strictEqual(client, 'PublisherClient'); + assert.strictEqual(method, 'updateTopic'); + }); + + it('should send the correct request options', () => { + topic.setMetadata(METADATA, assert.ifError); + + const expectedTopic = Object.assign({name: topic.name}, METADATA); + const expectedUpdateMask = {paths: ['labels']}; + + const [{reqOpts}] = requestStub.lastCall.args; + assert.deepStrictEqual(reqOpts.topic, expectedTopic); + assert.deepStrictEqual(reqOpts.updateMask, expectedUpdateMask); + }); + + it('should accept call options', () => { + const callOptions = {}; + + topic.setMetadata(METADATA, callOptions, assert.ifError); + + const [{gaxOpts}] = requestStub.lastCall.args; + assert.strictEqual(gaxOpts, callOptions); + }); + + it('should pass the user callback to request', () => { + const spy = sandbox.spy(); + + topic.setMetadata(METADATA, spy); + + const [, callback] = requestStub.lastCall.args; + assert.strictEqual(callback, spy); + }); + }); + describe('setPublishOptions', () => { it('should call through to Publisher#setOptions', () => { const fakeOptions = {}; From dcac6d3d4c1dd3de8961401375168558a45ffffa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sat, 9 Mar 2019 12:05:13 -0800 Subject: [PATCH 0385/1115] fix(deps): update dependency @google-cloud/paginator to ^0.2.0 fix(deps): update dependency @google-cloud/paginator to ^0.2.0 This PR contains the following updates: | Package | Type | Update | Change | References | |---|---|---|---|---| | @​google-cloud/paginator | dependencies | minor | [`^0.1.0` -> `^0.2.0`](https://diff.intrinsic.com/@google-cloud/paginator/0.1.2/0.2.0) | [source](https://togithub.com/googleapis/nodejs-paginator) | --- ### Release Notes
googleapis/nodejs-paginator ### [`v0.2.0`](https://togithub.com/googleapis/nodejs-paginator/blob/master/CHANGELOG.md#v020) [Compare Source](https://togithub.com/googleapis/nodejs-paginator/compare/v0.1.2...v0.2.0) 03-08-2019 12:15 PST ##### New Features - feat: handle promise based functions ([#​91](https://togithub.com/googleapis/nodejs-paginator/pull/91)) - refactor(ts): create generic for object streams ([#​101](https://togithub.com/googleapis/nodejs-paginator/pull/101)) ##### Dependencies - chore(deps): update dependency through2 to v3 ([#​53](https://togithub.com/googleapis/nodejs-paginator/pull/53)) - chore(deps): update dependency [@​types/is](https://togithub.com/types/is) to v0.0.21 ([#​55](https://togithub.com/googleapis/nodejs-paginator/pull/55)) - chore(deps): update dependency gts to ^0.9.0 ([#​57](https://togithub.com/googleapis/nodejs-paginator/pull/57)) - fix: Pin [@​types/sinon](https://togithub.com/types/sinon) to last compatible version ([#​61](https://togithub.com/googleapis/nodejs-paginator/pull/61)) - refactor: trim a few dependencies ([#​60](https://togithub.com/googleapis/nodejs-paginator/pull/60)) - chore(deps): update dependency [@​types/sinon](https://togithub.com/types/sinon) to v5.0.7 ([#​62](https://togithub.com/googleapis/nodejs-paginator/pull/62)) - chore(deps): update dependency [@​types/sinon](https://togithub.com/types/sinon) to v7 ([#​81](https://togithub.com/googleapis/nodejs-paginator/pull/81)) - chore(deps): update dependency mocha to v6 ##### Documentation - docs: add lint/fix example to contributing guide ([#​85](https://togithub.com/googleapis/nodejs-paginator/pull/85)) - chore: move CONTRIBUTING.md to root ([#​87](https://togithub.com/googleapis/nodejs-paginator/pull/87)) - docs: update links in contrib guide ([#​94](https://togithub.com/googleapis/nodejs-paginator/pull/94)) - docs: update contributing path in README ([#​88](https://togithub.com/googleapis/nodejs-paginator/pull/88)) ##### Internal / Testing Changes - chore: include build in eslintignore ([#​49](https://togithub.com/googleapis/nodejs-paginator/pull/49)) - chore: update CircleCI config ([#​52](https://togithub.com/googleapis/nodejs-paginator/pull/52)) - chore: use latest npm on Windows ([#​54](https://togithub.com/googleapis/nodejs-paginator/pull/54)) - chore: update eslintignore config ([#​56](https://togithub.com/googleapis/nodejs-paginator/pull/56)) - chore: add synth.metadata - fix(build): fix system key decryption ([#​64](https://togithub.com/googleapis/nodejs-paginator/pull/64)) - chore: update license file ([#​68](https://togithub.com/googleapis/nodejs-paginator/pull/68)) - chore(build): update prettier config ([#​69](https://togithub.com/googleapis/nodejs-paginator/pull/69)) - chore: nyc ignore build/test by default ([#​71](https://togithub.com/googleapis/nodejs-paginator/pull/71)) - chore: always nyc report before calling codecov ([#​72](https://togithub.com/googleapis/nodejs-paginator/pull/72)) - build: add Kokoro configs for autorelease ([#​75](https://togithub.com/googleapis/nodejs-paginator/pull/75)) - fix(build): fix Kokoro release script ([#​76](https://togithub.com/googleapis/nodejs-paginator/pull/76)) - chore: fix publish.sh permission +x ([#​77](https://togithub.com/googleapis/nodejs-paginator/pull/77)) - chore: update nyc and eslint configs ([#​79](https://togithub.com/googleapis/nodejs-paginator/pull/79)) - chore(build): inject yoshi automation key ([#​80](https://togithub.com/googleapis/nodejs-paginator/pull/80)) - build: check broken links in generated docs ([#​82](https://togithub.com/googleapis/nodejs-paginator/pull/82)) - build: ignore googleapis.com in doc link check ([#​84](https://togithub.com/googleapis/nodejs-paginator/pull/84)) - build: test using [@​grpc/grpc-js](https://togithub.com/grpc/grpc-js) in CI ([#​89](https://togithub.com/googleapis/nodejs-paginator/pull/89)) - build: create docs test npm scripts ([#​90](https://togithub.com/googleapis/nodejs-paginator/pull/90)) - build: use linkinator for docs test ([#​93](https://togithub.com/googleapis/nodejs-paginator/pull/93)) - build: update release configuration - build: fix types for sinon ([#​98](https://togithub.com/googleapis/nodejs-paginator/pull/98)) - build: use node10 to run samples-test, system-test etc ([#​97](https://togithub.com/googleapis/nodejs-paginator/pull/97)) - build: Add docuploader credentials to node publish jobs ([#​99](https://togithub.com/googleapis/nodejs-paginator/pull/99))
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is stale, or if you modify the PR title to begin with "`rebase!`". :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/marketplace/renovate). View repository job log [here](https://renovatebot.com/dashboard#googleapis/nodejs-pubsub). #538 automerged by dpebot --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d85a9ed00fb..f6b87c662d6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "predocs-test": "npm run docs" }, "dependencies": { - "@google-cloud/paginator": "^0.1.0", + "@google-cloud/paginator": "^0.2.0", "@google-cloud/precise-date": "^0.1.0", "@google-cloud/projectify": "^0.3.0", "@google-cloud/promisify": "^0.4.0", From d725f58ab57e655a34c4d77f96d970a79b5cbd29 Mon Sep 17 00:00:00 2001 From: praveenqlogic <44371467+praveenqlogic@users.noreply.github.com> Date: Mon, 11 Mar 2019 21:25:01 +0530 Subject: [PATCH 0386/1115] refactor(typescript): noImplicitAny for Subscription test file (#534) --- handwritten/pubsub/src/subscription.ts | 2 +- handwritten/pubsub/test/histogram.ts | 2 +- handwritten/pubsub/test/subscription.ts | 348 ++++++++++-------------- 3 files changed, 148 insertions(+), 204 deletions(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 858ed40eceb..40f74be4c21 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -194,7 +194,7 @@ export class Subscription extends EventEmitter { pubsub: PubSub; iam: IAM; name: string; - topic?: Topic; + topic?: Topic|string; metadata?: google.pubsub.v1.ISubscription; request: typeof PubSub.prototype.request; private _subscriber: Subscriber; diff --git a/handwritten/pubsub/test/histogram.ts b/handwritten/pubsub/test/histogram.ts index 44b1432b825..5d816eca4f5 100644 --- a/handwritten/pubsub/test/histogram.ts +++ b/handwritten/pubsub/test/histogram.ts @@ -92,7 +92,7 @@ describe('Histogram', () => { }); describe('percentile', () => { - function range(a, b) { + function range(a: number, b: number) { const result: number[] = []; for (; a < b; a++) { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index eafcfcb6567..09eec808753 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -17,27 +17,26 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import {EventEmitter} from 'events'; -import {CallOptions} from 'google-gax'; import {ServiceError} from 'grpc'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; -import {google} from '../proto/pubsub'; -import {ExistsCallback, RequestCallback, RequestConfig} from '../src/pubsub'; -import {SeekCallback, Snapshot} from '../src/snapshot'; +import {PubSub, RequestConfig} from '../src/pubsub'; +import {Snapshot} from '../src/snapshot'; import {Message, SubscriberOptions} from '../src/subscriber'; -import {CreateSubscriptionCallback, CreateSubscriptionOptions, GetSubscriptionMetadataCallback, Subscription, SubscriptionMetadata} from '../src/subscription'; +import * as subby from '../src/subscription'; import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { - promisifyAll: (klass: Function, options: pfy.PromisifyAllOptions) => { - if (klass.name !== 'Subscription') { - return; - } - promisified = true; - assert.deepStrictEqual(options.exclude, ['open', 'snapshot']); - }, + promisifyAll: + (klass: subby.Subscription, options: pfy.PromisifyAllOptions) => { + if (klass.name !== 'Subscription') { + return; + } + promisified = true; + assert.deepStrictEqual(options.exclude, ['open', 'snapshot']); + }, }); class FakeIAM { @@ -75,22 +74,21 @@ class FakeSubscriber extends EventEmitter { } describe('Subscription', () => { - // tslint:disable-next-line no-any variable-name - let Subscription: any; - // tslint:disable-next-line no-any - let subscription: any; + // tslint:disable-next-line variable-name + let Subscription: typeof subby.Subscription; + let subscription: subby.Subscription; const PROJECT_ID = 'test-project'; const SUB_NAME = 'test-subscription'; const SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; - // tslint:disable-next-line no-any - const PUBSUB: any = { + + const PUBSUB = { projectId: PROJECT_ID, Promise: {}, request: util.noop, createSubscription: util.noop, - }; + } as {} as PubSub; before(() => { Subscription = proxyquire('../src/subscription.js', { @@ -128,7 +126,8 @@ describe('Subscription', () => { }; const subscription = new Subscription(PUBSUB, SUB_NAME); - subscription.request(assert.ifError); + // tslint:disable-next-line no-any + (subscription as any).request(assert.ifError); }); it('should format the sub name', () => { @@ -150,7 +149,7 @@ describe('Subscription', () => { it('should create an IAM object', () => { assert(subscription.iam instanceof FakeIAM); - const args = subscription.iam.calledWith_; + const args = (subscription.iam as {} as FakeIAM).calledWith_; assert.strictEqual(args[0], PUBSUB); assert.strictEqual(args[1], subscription.name); }); @@ -211,7 +210,7 @@ describe('Subscription', () => { describe('formatMetadata_', () => { it('should make a copy of the metadata', () => { - const metadata = {a: 'a'}; + const metadata = {a: 'a'} as subby.SubscriptionMetadata; const formatted = Subscription.formatMetadata_(metadata); assert.deepStrictEqual(metadata, formatted); @@ -228,10 +227,10 @@ describe('Subscription', () => { const formatted = Subscription.formatMetadata_(metadata); assert.strictEqual(formatted.retainAckedMessages, true); - assert.strictEqual(formatted.messageRetentionDuration.nanos, 0); + assert.strictEqual(formatted.messageRetentionDuration!.nanos, 0); assert.strictEqual( - formatted.messageRetentionDuration.seconds, threeDaysInSeconds); + formatted.messageRetentionDuration!.seconds, threeDaysInSeconds); }); it('should format pushEndpoint', () => { @@ -243,8 +242,9 @@ describe('Subscription', () => { const formatted = Subscription.formatMetadata_(metadata); - assert.strictEqual(formatted.pushConfig.pushEndpoint, pushEndpoint); - assert.strictEqual(formatted.pushEndpoint, undefined); + assert.strictEqual(formatted.pushConfig!.pushEndpoint, pushEndpoint); + assert.strictEqual( + (formatted as subby.SubscriptionMetadata).pushEndpoint, undefined); }); }); @@ -271,7 +271,7 @@ describe('Subscription', () => { sandbox.stub(subscriber, 'close').rejects(fakeErr); - subscription.close((err: Error) => { + subscription.close(err => { assert.strictEqual(err, fakeErr); done(); }); @@ -368,18 +368,19 @@ describe('Subscription', () => { subscription.snapshot = (name: string) => { return { name, - }; + } as Snapshot; }; }); it('should throw an error if a snapshot name is not found', () => { assert.throws(() => { - subscription.createSnapshot(); + // tslint:disable-next-line no-any + (subscription as any).createSnapshot(); }, /A name is required to create a snapshot\./); }); it('should make the correct request', done => { - subscription.request = (config: RequestConfig) => { + subscription.request = (config) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSnapshot'); assert.deepStrictEqual(config.reqOpts, { @@ -395,7 +396,7 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = (config: RequestConfig) => { + subscription.request = (config) => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -407,21 +408,16 @@ describe('Subscription', () => { const error = new Error('err'); const apiResponse = {}; - subscription.request = - (config: RequestConfig, - callback: RequestCallback) => { - callback(error, apiResponse); - }; + subscription.request = (config, callback: Function) => { + callback(error, apiResponse); + }; - subscription.createSnapshot( - SNAPSHOT_NAME, - (err: Error, snapshot: Snapshot, - resp: google.pubsub.v1.ISnapshot) => { - assert.strictEqual(err, error); - assert.strictEqual(snapshot, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.createSnapshot(SNAPSHOT_NAME, (err, snapshot, resp) => { + assert.strictEqual(err, error); + assert.strictEqual(snapshot, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should return a snapshot object with metadata', done => { @@ -429,31 +425,27 @@ describe('Subscription', () => { const fakeSnapshot = {}; subscription.snapshot = () => { - return fakeSnapshot; + return fakeSnapshot as Snapshot; }; - subscription.request = - (config: RequestConfig, - callback: RequestCallback) => { - callback(null, apiResponse); - }; - - subscription.createSnapshot( - SNAPSHOT_NAME, - (err: Error, snapshot: Snapshot, resp: google.pubsub.v1.Snapshot) => { - assert.ifError(err); - assert.strictEqual(snapshot, fakeSnapshot); - assert.strictEqual(snapshot.metadata, apiResponse); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.request = (config, callback: Function) => { + callback(null, apiResponse); + }; + + subscription.createSnapshot(SNAPSHOT_NAME, (err, snapshot, resp) => { + assert.ifError(err); + assert.strictEqual(snapshot, fakeSnapshot); + assert.strictEqual(snapshot!.metadata, apiResponse); + assert.strictEqual(resp, apiResponse); + done(); + }); }); }); describe('delete', () => { beforeEach(() => { - subscription.removeAllListeners = util.noop; - subscription.close = util.noop; + sandbox.stub(subscription, 'removeAllListeners').yields(util.noop); + sandbox.stub(subscription, 'close').yields(util.noop); }); it('should make the correct request', done => { @@ -484,15 +476,13 @@ describe('Subscription', () => { const apiResponse = {}; beforeEach(() => { - subscription.request = - (config: RequestConfig, - callback: RequestCallback) => { - callback(null, apiResponse); - }; + subscription.request = (config, callback: Function) => { + callback(null, apiResponse); + }; }); it('should return the api response', done => { - subscription.delete((err: Error, resp: google.protobuf.Empty) => { + subscription.delete((err, resp) => { assert.ifError(err); assert.strictEqual(resp, apiResponse); done(); @@ -504,7 +494,7 @@ describe('Subscription', () => { subscription.open(); - subscription.delete((err: Error) => { + subscription.delete(err => { assert.ifError(err); assert.strictEqual(stub.callCount, 1); done(); @@ -516,21 +506,21 @@ describe('Subscription', () => { const error = new Error('err'); beforeEach(() => { - subscription.request = - (config: RequestConfig, callback: ExistsCallback) => { - callback(error); - }; + subscription.request = (config, callback) => { + callback(error); + }; }); it('should return the error to the callback', done => { - subscription.delete((err: Error) => { + subscription.delete(err => { assert.strictEqual(err, error); done(); }); }); it('should not remove all the listeners', done => { - subscription.removeAllListeners = () => { + // tslint:disable-next-line no-any + (subscription as any).removeAllListeners = () => { done(new Error('Should not be called.')); }; @@ -540,7 +530,7 @@ describe('Subscription', () => { }); it('should not close the subscription', done => { - subscription.close = () => { + subscription.close = async () => { done(new Error('Should not be called.')); }; @@ -553,12 +543,9 @@ describe('Subscription', () => { describe('exists', () => { it('should return true if it finds metadata', done => { - subscription.getMetadata = - (callback: GetSubscriptionMetadataCallback) => { - callback(null, {}); - }; + sandbox.stub(subscription, 'getMetadata').yields(null, {}); - subscription.exists((err: Error, exists: boolean) => { + subscription.exists((err, exists) => { assert.ifError(err); assert(exists); done(); @@ -567,12 +554,9 @@ describe('Subscription', () => { it('should return false if a not found error occurs', done => { const error = {code: 5} as ServiceError; - subscription.getMetadata = - (callback: GetSubscriptionMetadataCallback) => { - callback(error); - }; + sandbox.stub(subscription, 'getMetadata').yields(error); - subscription.exists((err: Error, exists: boolean) => { + subscription.exists((err, exists) => { assert.ifError(err); assert.strictEqual(exists, false); done(); @@ -581,13 +565,9 @@ describe('Subscription', () => { it('should pass back any other type of error', done => { const error = {code: 4} as ServiceError; + sandbox.stub(subscription, 'getMetadata').yields(error); - subscription.getMetadata = - (callback: GetSubscriptionMetadataCallback) => { - callback(error); - }; - - subscription.exists((err: Error, exists: boolean) => { + subscription.exists((err, exists) => { assert.strictEqual(err, error); assert.strictEqual(exists, undefined); done(); @@ -596,22 +576,18 @@ describe('Subscription', () => { }); describe('get', () => { - beforeEach(() => { - subscription.create = util.noop; - }); - it('should delete the autoCreate option', done => { const options = { autoCreate: true, a: 'a', }; - - subscription.getMetadata = (gaxOpts: CallOptions) => { + sandbox.stub(subscription, 'getMetadata').callsFake((gaxOpts) => { assert.strictEqual(gaxOpts, options); // tslint:disable-next-line no-any - assert.strictEqual((gaxOpts as any).autoCreate, undefined); + assert.strictEqual((gaxOpts as typeof options).autoCreate, undefined); done(); - }; + }); + subscription.get(options, assert.ifError); }); @@ -619,34 +595,27 @@ describe('Subscription', () => { describe('success', () => { const fakeMetadata = {}; - beforeEach(() => { - subscription.getMetadata = - (gaxOpts: CallOptions, - callback: GetSubscriptionMetadataCallback) => { - callback(null, fakeMetadata); - }; - }); - it('should call through to getMetadata', done => { - subscription.get( - (err: Error, sub: Subscription, - resp: google.pubsub.v1.ISubscription) => { - assert.ifError(err); - assert.strictEqual(sub, subscription); - assert.strictEqual(resp, fakeMetadata); - done(); + sandbox.stub(subscription, 'getMetadata') + .callsFake((gaxOpts, callback) => { + callback(null, fakeMetadata); }); + + subscription.get((err, sub, resp) => { + assert.ifError(err); + assert.strictEqual(sub, subscription); + assert.strictEqual(resp, fakeMetadata); + done(); + }); }); it('should optionally accept options', done => { const options = {}; - - subscription.getMetadata = - (gaxOpts: CallOptions, - callback: GetSubscriptionMetadataCallback) => { + sandbox.stub(subscription, 'getMetadata') + .callsFake((gaxOpts, callback) => { assert.strictEqual(gaxOpts, options); callback(null); // the done fn - }; + }); subscription.get(options, done); }); @@ -656,63 +625,45 @@ describe('Subscription', () => { it('should pass back errors when not auto-creating', done => { const error = {code: 4} as ServiceError; const apiResponse = {}; + sandbox.stub(subscription, 'getMetadata') + .callsArgWith(1, error, apiResponse); - subscription.getMetadata = - (gaxOpts: CallOptions, - callback: GetSubscriptionMetadataCallback) => { - callback(error, apiResponse); - }; - - subscription.get( - (err: Error, sub: Subscription, - resp: google.pubsub.v1.ISubscription) => { - assert.strictEqual(err, error); - assert.strictEqual(sub, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.get((err, sub, resp) => { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should pass back 404 errors if autoCreate is false', done => { const error = {code: 5} as ServiceError; const apiResponse = {}; + sandbox.stub(subscription, 'getMetadata') + .callsArgWith(1, error, apiResponse); - subscription.getMetadata = - (gaxOpts: CallOptions, - callback: GetSubscriptionMetadataCallback) => { - callback(error, apiResponse); - }; - - subscription.get( - (err: Error, sub: Subscription, - resp: google.pubsub.v1.ISubscription) => { - assert.strictEqual(err, error); - assert.strictEqual(sub, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.get((err, sub, resp) => { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should pass back 404 errors if create doesnt exist', done => { const error = {code: 5} as ServiceError; const apiResponse = {}; - - subscription.getMetadata = - (gaxOpts: CallOptions, - callback: GetSubscriptionMetadataCallback) => { - callback(error, apiResponse); - }; + sandbox.stub(subscription, 'getMetadata') + .callsArgWith(1, error, apiResponse); delete subscription.create; - subscription.get( - (err: Error, sub: Subscription, - resp: google.pubsub.v1.ISubscription) => { - assert.strictEqual(err, error); - assert.strictEqual(sub, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + subscription.get((err, sub, resp) => { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + }); }); it('should create the sub if 404 + autoCreate is true', done => { @@ -722,17 +673,14 @@ describe('Subscription', () => { const fakeOptions = { autoCreate: true, }; + sandbox.stub(subscription, 'getMetadata') + .callsArgWith(1, error, apiResponse); - subscription.getMetadata = - (gaxOpts: CallOptions, - callback: GetSubscriptionMetadataCallback) => { - callback(error, apiResponse); - }; - - subscription.create = (options: CreateSubscriptionOptions) => { + sandbox.stub(subscription, 'create').callsFake((options) => { assert.strictEqual(options.gaxOpts, fakeOptions); done(); - }; + }); + subscription.topic = 'hi-ho-silver'; subscription.get(fakeOptions, assert.ifError); @@ -742,7 +690,7 @@ describe('Subscription', () => { describe('getMetadata', () => { it('should make the correct request', done => { - subscription.request = (config: RequestConfig) => { + subscription.request = (config) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getSubscription'); assert.deepStrictEqual(config.reqOpts, { @@ -757,7 +705,7 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = (config: RequestConfig) => { + subscription.request = (config) => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -769,36 +717,30 @@ describe('Subscription', () => { const error = new Error('err'); const apiResponse = {}; - subscription.request = - (config: RequestConfig, - callback: GetSubscriptionMetadataCallback) => { - callback(error, apiResponse); - }; + subscription.request = (config, callback: Function) => { + callback(error, apiResponse); + }; - subscription.getMetadata( - (err: ServiceError, metadata: google.pubsub.v1.ISubscription) => { - assert.strictEqual(err, error); - assert.strictEqual(metadata, apiResponse); - done(); - }); + subscription.getMetadata((err, metadata) => { + assert.strictEqual(err, error); + assert.strictEqual(metadata, apiResponse); + done(); + }); }); it('should set the metadata if no error occurs', done => { const apiResponse = {}; - subscription.request = - (config: RequestConfig, - callback: GetSubscriptionMetadataCallback) => { - callback(null, apiResponse); - }; + subscription.request = (config, callback: Function) => { + callback(null, apiResponse); + }; - subscription.getMetadata( - (err: ServiceError, metadata: google.pubsub.v1.ISubscription) => { - assert.ifError(err); - assert.strictEqual(metadata, apiResponse); - assert.strictEqual(subscription.metadata, apiResponse); - done(); - }); + subscription.getMetadata((err, metadata) => { + assert.ifError(err); + assert.strictEqual(metadata, apiResponse); + assert.strictEqual(subscription.metadata, apiResponse); + done(); + }); }); }); @@ -806,7 +748,7 @@ describe('Subscription', () => { const fakeConfig = {}; it('should make the correct request', done => { - subscription.request = (config: RequestConfig) => { + subscription.request = (config) => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'modifyPushConfig'); assert.deepStrictEqual(config.reqOpts, { @@ -822,7 +764,7 @@ describe('Subscription', () => { it('should optionally accept gaxOpts', done => { const gaxOpts = {}; - subscription.request = (config: RequestConfig) => { + subscription.request = (config) => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -862,7 +804,8 @@ describe('Subscription', () => { it('should throw if a name or date is not provided', () => { assert.throws(() => { - subscription.seek(); + // tslint:disable-next-line no-any + (subscription as any).seek(); }, /Either a snapshot name or Date is needed to seek to\./); }); @@ -915,7 +858,7 @@ describe('Subscription', () => { }; beforeEach(() => { - Subscription.formatMetadata_ = (metadata: SubscriptionMetadata) => { + Subscription.formatMetadata_ = (metadata: subby.SubscriptionMetadata) => { return Object.assign({}, metadata); }; }); @@ -933,7 +876,7 @@ describe('Subscription', () => { }, formattedMetadata); - Subscription.formatMetadata_ = (metadata: SubscriptionMetadata) => { + Subscription.formatMetadata_ = (metadata) => { assert.strictEqual(metadata, METADATA); return formattedMetadata; }; @@ -982,7 +925,8 @@ describe('Subscription', () => { const SNAPSHOT_NAME = 'a'; it('should call through to pubsub.snapshot', done => { - PUBSUB.snapshot = function(name: string) { + // tslint:disable-next-line no-any + (PUBSUB as any).snapshot = function(name: string) { assert.strictEqual(this, subscription); assert.strictEqual(name, SNAPSHOT_NAME); done(); From f67a8ea6243c7d969982574b92bc6da01f667591 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 11 Mar 2019 10:15:29 -0700 Subject: [PATCH 0387/1115] Release v0.28.0 (#539) --- handwritten/pubsub/CHANGELOG.md | 15 +++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 49059490152..0dd97922972 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,21 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.28.0 + +03-11-2019 09:11 PDT + +### New Features +- feat(topic): create setMetadata method ([#537](https://github.com/googleapis/nodejs-pubsub/pull/537)) + +### Dependencies +- fix(deps): update dependency @google-cloud/paginator to ^0.2.0 + +### Internal / Testing Changes +- build: Add docuploader credentials to node publish jobs ([#533](https://github.com/googleapis/nodejs-pubsub/pull/533)) +- test: add missing packages and install test ([#536](https://github.com/googleapis/nodejs-pubsub/pull/536)) +- refactor(typescript): noImplicitAny for Subscription test file ([#534](https://github.com/googleapis/nodejs-pubsub/pull/534)) + ## v0.27.1 03-06-2019 20:11 PST diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f6b87c662d6..0d934d01d17 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.27.1", + "version": "0.28.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From d9dfa767a121f428f0c966296157de4cf943dc68 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 11 Mar 2019 13:39:12 -0700 Subject: [PATCH 0388/1115] fix(typescript): correctly import long (#541) --- handwritten/pubsub/package.json | 1 + handwritten/pubsub/proto/iam.d.ts | 2 +- handwritten/pubsub/proto/pubsub.d.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0d934d01d17..bff67832350 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,6 +58,7 @@ "@google-cloud/promisify": "^0.4.0", "@sindresorhus/is": "^0.15.0", "@types/duplexify": "^3.6.0", + "@types/long": "^4.0.0", "@types/p-defer": "^1.0.3", "arrify": "^1.0.0", "async-each": "^1.0.1", diff --git a/handwritten/pubsub/proto/iam.d.ts b/handwritten/pubsub/proto/iam.d.ts index 79818b5022e..3343cbbb787 100644 --- a/handwritten/pubsub/proto/iam.d.ts +++ b/handwritten/pubsub/proto/iam.d.ts @@ -1,5 +1,5 @@ import * as $protobuf from "protobufjs"; -import * as long from "long"; +import * as Long from "long"; /** Namespace google. */ export namespace google { diff --git a/handwritten/pubsub/proto/pubsub.d.ts b/handwritten/pubsub/proto/pubsub.d.ts index fe2ce163239..be2b7bf802f 100644 --- a/handwritten/pubsub/proto/pubsub.d.ts +++ b/handwritten/pubsub/proto/pubsub.d.ts @@ -1,5 +1,5 @@ import * as $protobuf from "protobufjs"; -import * as long from "long"; +import * as Long from "long"; /** Namespace google. */ export namespace google { From 7c9bfbed40bce4fb15918a8ed6e836f85d9c7f4b Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 11 Mar 2019 13:49:09 -0700 Subject: [PATCH 0389/1115] refactor: fix/simplify proto gen scripts (#542) --- handwritten/pubsub/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index bff67832350..863220cb0b9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -44,10 +44,9 @@ "compile": "tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp -r proto build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", "prepare": "npm run compile", "pretest": "npm run compile", - "proto": "npm run proto:pubsub", - "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -i long -o proto/pubsub.d.ts -", - "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -i long -o proto/iam.d.ts -", - "proto-types": "mkdir -p proto && npm run proto:pubsub && npm run proto:iam", + "proto": "mkdirp proto && npm run proto:pubsub && npm run proto:iam", + "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", + "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -o proto/iam.d.ts -", "docs-test": "linkinator docs -r --skip www.googleapis.com", "predocs-test": "npm run docs" }, @@ -92,6 +91,7 @@ "jsdoc": "^3.5.5", "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", "linkinator": "^1.1.2", + "mkdirp": "^0.5.1", "mocha": "^6.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", From 65645e29445598c62b13938eb58e6fbadf14b243 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 11 Mar 2019 15:35:46 -0700 Subject: [PATCH 0390/1115] testing: set skipLibCheck to false for ts install test (#543) --- handwritten/pubsub/system-test/fixtures/sample/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/system-test/fixtures/sample/tsconfig.json b/handwritten/pubsub/system-test/fixtures/sample/tsconfig.json index 67e8b218b2a..ecf766a7216 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/tsconfig.json +++ b/handwritten/pubsub/system-test/fixtures/sample/tsconfig.json @@ -4,7 +4,7 @@ "rootDir": ".", "outDir": "build", "types": ["node"], - "skipLibCheck": true, + "skipLibCheck": false, }, "include": [ "src/*.ts" From f20c879c341627ac326fecbb36da2309ae874c4e Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 11 Mar 2019 15:57:03 -0700 Subject: [PATCH 0391/1115] Release v0.28.1 (#544) --- handwritten/pubsub/CHANGELOG.md | 11 +++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 0dd97922972..e12e3e9b482 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,17 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## v0.28.1 + +03-11-2019 15:36 PDT + +### Bug Fixes +- fix(typescript): correctly import long ([#541](https://github.com/googleapis/nodejs-pubsub/pull/541)) + +### Internal / Testing Changes +- testing: set skipLibCheck to false for ts install test ([#543](https://github.com/googleapis/nodejs-pubsub/pull/543)) +- refactor: fix/simplify proto gen scripts ([#542](https://github.com/googleapis/nodejs-pubsub/pull/542)) + ## v0.28.0 03-11-2019 09:11 PDT diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 863220cb0b9..72038deccdb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.28.0", + "version": "0.28.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From fb73c49d50e990f7ea74d2f383c291fb3d4ac76e Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Tue, 12 Mar 2019 06:39:54 -0700 Subject: [PATCH 0392/1115] chore: update require statement code style This PR was generated using Autosynth. :rainbow: Here's the log from Synthtool: ``` synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py. synthtool > Ensuring dependencies. synthtool > Pulling artman image. latest: Pulling from googleapis/artman Digest: sha256:30babbfce7f05a62b1892c63c575aa2c8c502eb4bcc8f3bb90ec83e955d5d319 Status: Image is up to date for googleapis/artman:latest synthtool > Cloning googleapis. synthtool > Running generator for google/pubsub/artman_pubsub.yaml. synthtool > Generated code into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/js/pubsub-v1. .eslintignore .eslintrc.yml .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md .github/ISSUE_TEMPLATE/support_request.md .jsdoc.js .kokoro/common.cfg .kokoro/continuous/node10/common.cfg .kokoro/continuous/node10/docs.cfg .kokoro/continuous/node10/lint.cfg .kokoro/continuous/node10/samples-test.cfg .kokoro/continuous/node10/system-test-grpcjs.cfg .kokoro/continuous/node10/system-test.cfg .kokoro/continuous/node10/test.cfg .kokoro/continuous/node11/common.cfg .kokoro/continuous/node11/test.cfg .kokoro/continuous/node6/common.cfg .kokoro/continuous/node6/test.cfg .kokoro/continuous/node8/common.cfg .kokoro/continuous/node8/test.cfg .kokoro/docs.sh .kokoro/lint.sh .kokoro/presubmit/node10/common.cfg .kokoro/presubmit/node10/docs.cfg .kokoro/presubmit/node10/lint.cfg .kokoro/presubmit/node10/samples-test.cfg .kokoro/presubmit/node10/system-test-grpcjs.cfg .kokoro/presubmit/node10/system-test.cfg .kokoro/presubmit/node10/test.cfg .kokoro/presubmit/node11/common.cfg .kokoro/presubmit/node11/test.cfg .kokoro/presubmit/node6/common.cfg .kokoro/presubmit/node6/test.cfg .kokoro/presubmit/node8/common.cfg .kokoro/presubmit/node8/test.cfg .kokoro/presubmit/windows/common.cfg .kokoro/presubmit/windows/test.cfg .kokoro/publish.sh .kokoro/release/publish.cfg .kokoro/samples-test.sh .kokoro/system-test.sh .kokoro/test.bat .kokoro/test.sh .kokoro/trampoline.sh .nycrc .prettierignore .prettierrc CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE codecov.yaml renovate.json synthtool > Replaced ' }\n\\s*/\\*\\*\n\\s+\\* The DNS address for this API service.' in src/v1/subscriber_client.js. synthtool > Replaced '../../package.json' in src/v1/publisher_client.js. synthtool > Replaced '../../package.json' in src/v1/subscriber_client.js. synthtool > Replaced 'https:\\/\\/cloud\\.google\\.com[\\s\\*]*http:\\/\\/(.*)[\\s\\*]*\\)' in src/v1/doc/google/protobuf/doc_timestamp.js. synthtool > Replaced 'toISOString\\]' in src/v1/doc/google/protobuf/doc_timestamp.js. > grpc@1.19.0 install /tmpfs/src/git/autosynth/working_repo/node_modules/grpc > node-pre-gyp install --fallback-to-build --library=static_library node-pre-gyp WARN Using needle for node-pre-gyp https download [grpc] Success: "/tmpfs/src/git/autosynth/working_repo/node_modules/grpc/src/node/extension_binary/node-v57-linux-x64-glibc/grpc_node.node" is installed via remote > protobufjs@6.8.8 postinstall /tmpfs/src/git/autosynth/working_repo/node_modules/protobufjs > node scripts/postinstall > @google-cloud/pubsub@0.28.1 prepare /tmpfs/src/git/autosynth/working_repo > npm run compile > @google-cloud/pubsub@0.28.1 compile /tmpfs/src/git/autosynth/working_repo > tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp -r proto build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test npm notice created a lockfile as package-lock.json. You should commit this file. npm WARN optional SKIPPING OPTIONAL DEPENDENCY: fsevents@1.2.7 (node_modules/fsevents): npm WARN notsup SKIPPING OPTIONAL DEPENDENCY: Unsupported platform for fsevents@1.2.7: wanted {"os":"darwin","arch":"any"} (current: {"os":"linux","arch":"x64"}) added 1136 packages from 1342 contributors and audited 7245 packages in 34.864s found 1 low severity vulnerability run `npm audit fix` to fix them, or `npm audit` for details > @google-cloud/pubsub@0.28.1 fix /tmpfs/src/git/autosynth/working_repo > eslint --fix '**/*.js' && gts fix synthtool > Cleaned up 2 temporary directories. synthtool > Wrote metadata to synth.metadata. ``` --- handwritten/pubsub/src/v1/publisher_client.js | 2 +- .../pubsub/src/v1/subscriber_client.js | 2 +- handwritten/pubsub/synth.metadata | 28 ++++++++++++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 342ec508bb2..0c8982f19eb 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -14,7 +14,7 @@ 'use strict'; -const gapicConfig = require('./publisher_client_config'); +const gapicConfig = require('./publisher_client_config.json'); const gax = require('google-gax'); const merge = require('lodash.merge'); const path = require('path'); diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index e826a5c4e13..0c2668a589d 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -14,7 +14,7 @@ 'use strict'; -const gapicConfig = require('./subscriber_client_config'); +const gapicConfig = require('./subscriber_client_config.json'); const gax = require('google-gax'); const merge = require('lodash.merge'); const path = require('path'); diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 1d032610982..d14c7fc4fc3 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,18 +1,38 @@ { - "updateTime": "2019-03-08T00:45:45.387967Z", + "updateTime": "2019-03-12T11:21:02.533632Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.15", - "dockerImage": "googleapis/artman@sha256:9caadfa59d48224cba5f3217eb9d61a155b78ccf31e628abef385bc5b7ed3bd2" + "version": "0.16.16", + "dockerImage": "googleapis/artman@sha256:30babbfce7f05a62b1892c63c575aa2c8c502eb4bcc8f3bb90ec83e955d5d319" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "c986e1d9618ac41343962b353d136201d72626ae" + "sha": "abd1c9a99c5cd7179d8e5e0c8d4c8e761054cc78", + "internalRef": "237945492" + } + }, + { + "template": { + "name": "node_library", + "origin": "synthtool.gcp", + "version": "2019.2.26" + } + } + ], + "destinations": [ + { + "client": { + "source": "googleapis", + "apiName": "pubsub", + "apiVersion": "v1", + "language": "nodejs", + "generator": "gapic", + "config": "google/pubsub/artman_pubsub.yaml" } } ] From b2cb9922ca819f5abc03bf6e8462940b7e255846 Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 14 Mar 2019 17:15:03 -0700 Subject: [PATCH 0393/1115] build: use per-repo npm publish token (#551) --- handwritten/pubsub/.kokoro/release/publish.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 779a0654395..e747a8e2fda 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -47,6 +47,15 @@ before_action { } } +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "google-cloud-pubsub-npm-token" + } + } +} + # Download trampoline resources. gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" From baea538727bd97609604be25606d9a7e5c2d48da Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Tue, 19 Mar 2019 18:14:14 -0700 Subject: [PATCH 0394/1115] chore: publish to npm using wombat (#554) --- handwritten/pubsub/.kokoro/publish.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh index f2a8adc0b43..c0a8c7dda8e 100755 --- a/handwritten/pubsub/.kokoro/publish.sh +++ b/handwritten/pubsub/.kokoro/publish.sh @@ -24,8 +24,8 @@ python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source / cd $(dirname $0)/.. -NPM_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_google_cloud_npm_token) -echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc +NPM_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_google-cloud-pubsub-npm-token) +echo "//wombat-dressing-room.appspot.com/:_authToken=${NPM_TOKEN}" > ~/.npmrc npm install -npm publish --access=public +npm publish --access=public --registry=https://wombat-dressing-room.appspot.com From 1c3049077841d04b096257719445b76a5953386a Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 21 Mar 2019 11:42:46 -0700 Subject: [PATCH 0395/1115] feat(subscription): accept pull timeout option (#556) --- handwritten/pubsub/src/message-stream.ts | 15 ++++- handwritten/pubsub/test/message-stream.ts | 70 ++++++++++++++++++----- 2 files changed, 69 insertions(+), 16 deletions(-) diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index c52400a35b1..26d10d55308 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -52,12 +52,20 @@ const RETRY_CODES: status[] = [ 15, // dataloss ]; +/*! + * Deadline for the stream. + */ +const PULL_TIMEOUT = require('./v1/subscriber_client_config.json') + .interfaces['google.pubsub.v1.Subscriber'] + .methods.StreamingPull.timeout_millis; + /*! * default stream options */ const DEFAULT_OPTIONS: MessageStreamOptions = { highWaterMark: 0, maxStreams: 5, + pullTimeout: PULL_TIMEOUT, timeout: 300000, }; @@ -115,11 +123,15 @@ export class ChannelError extends Error implements ServiceError { * {@link https://nodejs.org/en/docs/guides/backpressuring-in-streams/} for * more details. * @property {number} [maxStreams=5] Number of streaming connections to make. + * @property {number} [pullTimeout=900000] Timeout to be applied to each + * underlying stream. Essentially this just closes a `StreamingPull` request + * after the specified time. * @property {number} [timeout=300000] Timeout for establishing a connection. */ export interface MessageStreamOptions { highWaterMark?: number; maxStreams?: number; + pullTimeout?: number; timeout?: number; } @@ -222,13 +234,14 @@ export class MessageStream extends PassThrough { return; } + const deadline = Date.now() + this._options.pullTimeout!; const request: StreamingPullRequest = { subscription: this._subscriber.name, streamAckDeadlineSeconds: this._subscriber.ackDeadline, }; for (let i = this._streams.size; i < this._options.maxStreams!; i++) { - const stream: PullStream = client.streamingPull(); + const stream: PullStream = client.streamingPull({deadline}); this._addStream(stream); stream.write(request); } diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 0d98b5c8a1a..081013fec4d 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -23,6 +23,19 @@ import * as uuid from 'uuid'; import * as messageTypes from '../src/message-stream'; import {Subscriber} from '../src/subscriber'; +const FAKE_STREAMING_PULL_TIMEOUT = 123456789; +const FAKE_CLIENT_CONFIG = { + interfaces: { + 'google.pubsub.v1.Subscriber': { + methods: { + StreamingPull: { + timeout_millis: FAKE_STREAMING_PULL_TIMEOUT, + } + } + } + } +}; + // just need this for unit tests.. we have a ponyfill for destroy on // MessageStream and gax streams use Duplexify function destroy(stream: Duplex, err?: Error): void { @@ -43,6 +56,10 @@ interface StreamOptions { highWaterMark?: number; } +interface StreamingPullOptions { + deadline: number; +} + class FakePassThrough extends PassThrough { options: StreamOptions; constructor(options: StreamOptions) { @@ -58,9 +75,11 @@ class FakePassThrough extends PassThrough { } class FakeGrpcStream extends Duplex { + options: StreamingPullOptions; _readableState!: StreamState; - constructor() { + constructor(options: StreamingPullOptions) { super({objectMode: true}); + this.options = options; } cancel(): void { const status = { @@ -99,8 +118,8 @@ class FakeGaxClient { class FakeGrpcClient { deadline?: number; streams = ([] as FakeGrpcStream[]); - streamingPull(): FakeGrpcStream { - const stream = new FakeGrpcStream(); + streamingPull(options: StreamingPullOptions): FakeGrpcStream { + const stream = new FakeGrpcStream(options); this.streams.push(stream); return stream; } @@ -134,13 +153,19 @@ describe('MessageStream', () => { let MessageStream: typeof messageTypes.MessageStream; let messageStream: messageTypes.MessageStream; + let now: number; + before(() => { MessageStream = proxyquire('../src/message-stream.js', { - 'stream': {PassThrough: FakePassThrough} + 'stream': {PassThrough: FakePassThrough}, + './v1/subscriber_client_config.json': FAKE_CLIENT_CONFIG, }).MessageStream; }); beforeEach(() => { + now = Date.now(); + sandbox.stub(global.Date, 'now').returns(now); + const gaxClient = new FakeGaxClient(); client = gaxClient.client; // we hit the grpc client directly subscriber = new FakeSubscriber(gaxClient) as {} as Subscriber; @@ -191,18 +216,19 @@ describe('MessageStream', () => { assert.strictEqual(client.streams.length, 5); }); - it('should default timeout to 5 minutes', done => { - const timeout = 60000 * 5; - const now = Date.now(); - - sandbox.stub(global.Date, 'now').returns(now); - messageStream = new MessageStream(subscriber); + it('should pull pullTimeouts default from config file', () => { + const expectedDeadline = now + FAKE_STREAMING_PULL_TIMEOUT; - setImmediate(() => { - assert.strictEqual(client.deadline, now + timeout); - done(); + client.streams.forEach(stream => { + const deadline = stream.options.deadline; + assert.strictEqual(deadline, expectedDeadline); }); }); + + it('should default timeout to 5 minutes', () => { + const expectedTimeout = now + 60000 * 5; + assert.strictEqual(client.deadline, expectedTimeout); + }); }); describe('user options', () => { @@ -238,11 +264,25 @@ describe('MessageStream', () => { }); }); + it('should respect the pullTimeout option', done => { + const pullTimeout = 1234; + const expectedDeadline = now + pullTimeout; + + messageStream = new MessageStream(subscriber, {pullTimeout}); + + setImmediate(() => { + client.streams.forEach(stream => { + const deadline = stream.options.deadline; + assert.strictEqual(deadline, expectedDeadline); + }); + done(); + }); + }); + it('should respect the timeout option', done => { const timeout = 12345; - const now = Date.now(); + const expectedDeadline = now + timeout; - sandbox.stub(global.Date, 'now').returns(now); messageStream = new MessageStream(subscriber, {timeout}); setImmediate(() => { From 2ebf4c7b7a10cc0b1e89ed0730bde38c3e64adac Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Mon, 25 Mar 2019 12:04:57 -0700 Subject: [PATCH 0396/1115] feat(subscriber): ordered messages --- .../protos/google/pubsub/v1/pubsub.proto | 18 ++++++++++++++++++ .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 18 ++++++++++++++++++ handwritten/pubsub/src/v1/subscriber_client.js | 8 ++++++++ handwritten/pubsub/synth.metadata | 10 +++++----- handwritten/pubsub/test/gapic-v1.js | 6 ++++++ 5 files changed, 55 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 9d79638f8fd..715af9c18c4 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -406,6 +406,15 @@ message PubsubMessage { // it receives the `Publish` call. It must not be populated by the // publisher in a `Publish` call. google.protobuf.Timestamp publish_time = 4; + + // Identifies related messages for which publish order should be respected. + // If a `Subscription` has `enable_message_ordering` set to `true`, messages + // published with the same `ordering_key` value will be delivered to + // subscribers in the order in which they are received by the Pub/Sub system. + // EXPERIMENTAL: This feature is part of a closed alpha release. This + // API might be changed in backward-incompatible ways and is not recommended + // for production use. It is not subject to any SLA or deprecation policy. + string ordering_key = 5; } // Request for the GetTopic method. @@ -607,6 +616,15 @@ message Subscription { // managing labels. map labels = 9; + // If true, messages published with the same `ordering_key` in `PubsubMessage` + // will be delivered to the subscribers in the order in which they + // are received by the Pub/Sub system. Otherwise, they may be delivered in + // any order. + // EXPERIMENTAL: This feature is part of a closed alpha release. This + // API might be changed in backward-incompatible ways and is not recommended + // for production use. It is not subject to any SLA or deprecation policy. + bool enable_message_ordering = 10; + // A policy that specifies the conditions for this subscription's expiration. // A subscription is considered active as long as any connected subscriber is // successfully consuming messages from the subscription or is issuing diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index 938a76bbe03..93f824d6544 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -95,6 +95,15 @@ const Topic = { * * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} * + * @property {string} orderingKey + * Identifies related messages for which publish order should be respected. + * If a `Subscription` has `enable_message_ordering` set to `true`, messages + * published with the same `ordering_key` value will be delivered to + * subscribers in the order in which they are received by the Pub/Sub system. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * * @typedef PubsubMessage * @memberof google.pubsub.v1 * @see [google.pubsub.v1.PubsubMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} @@ -403,6 +412,15 @@ const DeleteTopicRequest = { * See Creating and * managing labels. * + * @property {boolean} enableMessageOrdering + * If true, messages published with the same `ordering_key` in `PubsubMessage` + * will be delivered to the subscribers in the order in which they + * are received by the Pub/Sub system. Otherwise, they may be delivered in + * any order. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * * @property {Object} expirationPolicy * A policy that specifies the conditions for this subscription's expiration. * A subscription is considered active as long as any connected subscriber is diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 0c2668a589d..7b2877ebc1e 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -364,6 +364,14 @@ class SubscriberClient { * @param {Object.} [request.labels] * See Creating and * managing labels. + * @param {boolean} [request.enableMessageOrdering] + * If true, messages published with the same `ordering_key` in `PubsubMessage` + * will be delivered to the subscribers in the order in which they + * are received by the Pub/Sub system. Otherwise, they may be delivered in + * any order. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. * @param {Object} [request.expirationPolicy] * A policy that specifies the conditions for this subscription's expiration. * A subscription is considered active as long as any connected subscriber is diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index d14c7fc4fc3..09817b1de85 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-12T11:21:02.533632Z", + "updateTime": "2019-03-23T11:19:52.456128Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.16", - "dockerImage": "googleapis/artman@sha256:30babbfce7f05a62b1892c63c575aa2c8c502eb4bcc8f3bb90ec83e955d5d319" + "version": "0.16.19", + "dockerImage": "googleapis/artman@sha256:70ba28fda87e032ae44e6df41b7fc342c1b0cce1ed90658c4890eb4f613038c2" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "abd1c9a99c5cd7179d8e5e0c8d4c8e761054cc78", - "internalRef": "237945492" + "sha": "e80435a132c53da26f46daf0787035ee63fb942b", + "internalRef": "239938670" } }, { diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index 0a98fb1b1f9..75ae89329f0 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -673,11 +673,13 @@ describe('SubscriberClient', () => { const topic2 = 'topic2-1139259102'; const ackDeadlineSeconds = 2135351438; const retainAckedMessages = false; + const enableMessageOrdering = true; const expectedResponse = { name: name2, topic: topic2, ackDeadlineSeconds: ackDeadlineSeconds, retainAckedMessages: retainAckedMessages, + enableMessageOrdering: enableMessageOrdering, }; // Mock Grpc layer @@ -747,11 +749,13 @@ describe('SubscriberClient', () => { const topic = 'topic110546223'; const ackDeadlineSeconds = 2135351438; const retainAckedMessages = false; + const enableMessageOrdering = true; const expectedResponse = { name: name, topic: topic, ackDeadlineSeconds: ackDeadlineSeconds, retainAckedMessages: retainAckedMessages, + enableMessageOrdering: enableMessageOrdering, }; // Mock Grpc layer @@ -825,11 +829,13 @@ describe('SubscriberClient', () => { const topic = 'topic110546223'; const ackDeadlineSeconds2 = 921632575; const retainAckedMessages = false; + const enableMessageOrdering = true; const expectedResponse = { name: name, topic: topic, ackDeadlineSeconds: ackDeadlineSeconds2, retainAckedMessages: retainAckedMessages, + enableMessageOrdering: enableMessageOrdering, }; // Mock Grpc layer From a9eeb3a1192937e68acd9fe0f9638778789e5059 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 25 Mar 2019 16:01:10 -0400 Subject: [PATCH 0397/1115] fix(deps): update dependency p-defer to v2 (#553) --- handwritten/pubsub/package.json | 3 +-- handwritten/pubsub/src/message-queues.ts | 4 ++-- handwritten/pubsub/system-test/pubsub.ts | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 72038deccdb..51901f65be2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,6 @@ "@sindresorhus/is": "^0.15.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", - "@types/p-defer": "^1.0.3", "arrify": "^1.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", @@ -67,7 +66,7 @@ "is-stream-ended": "^0.1.4", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", - "p-defer": "^1.0.0", + "p-defer": "^2.0.1", "protobufjs": "^6.8.1" }, "devDependencies": { diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 9801213f96a..ede336fa34d 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -16,7 +16,7 @@ import {CallOptions} from 'google-gax'; import {Metadata, ServiceError, status} from 'grpc'; -import * as defer from 'p-defer'; +import defer, {DeferredPromise} from 'p-defer'; import {Message, Subscriber} from './subscriber'; @@ -71,7 +71,7 @@ export class BatchError extends Error implements ServiceError { */ export abstract class MessageQueue { numPendingRequests: number; - protected _onFlush?: defer.DeferredPromise; + protected _onFlush?: DeferredPromise; protected _options!: BatchOptions; protected _requests: QueuedMessages; protected _subscriber: Subscriber; diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 2c6f6194f50..5003afac470 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import * as defer from 'p-defer'; +import defer from 'p-defer'; import * as uuid from 'uuid'; import {Message, PubSub, ServiceError, Snapshot, Subscription, Topic} from '../src'; From a518cecb63629c5713142ff16cd8c913338ad6d1 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 27 Mar 2019 09:23:44 -0700 Subject: [PATCH 0398/1115] feat(subscription): ordered messages (#560) --- handwritten/pubsub/proto/pubsub.d.ts | 12 ++++++ handwritten/pubsub/src/subscriber.ts | 54 ++++++++++++++------------- handwritten/pubsub/test/subscriber.ts | 6 +++ 3 files changed, 46 insertions(+), 26 deletions(-) diff --git a/handwritten/pubsub/proto/pubsub.d.ts b/handwritten/pubsub/proto/pubsub.d.ts index be2b7bf802f..9f83c9c210a 100644 --- a/handwritten/pubsub/proto/pubsub.d.ts +++ b/handwritten/pubsub/proto/pubsub.d.ts @@ -767,6 +767,9 @@ export namespace google { /** PubsubMessage publishTime */ publishTime?: (google.protobuf.ITimestamp|null); + + /** PubsubMessage orderingKey */ + orderingKey?: (string|null); } /** Represents a PubsubMessage. */ @@ -790,6 +793,9 @@ export namespace google { /** PubsubMessage publishTime. */ public publishTime?: (google.protobuf.ITimestamp|null); + /** PubsubMessage orderingKey. */ + public orderingKey: string; + /** * Creates a new PubsubMessage instance using the specified properties. * @param [properties] Properties to set @@ -1941,6 +1947,9 @@ export namespace google { /** Subscription labels */ labels?: ({ [k: string]: string }|null); + /** Subscription enableMessageOrdering */ + enableMessageOrdering?: (boolean|null); + /** Subscription expirationPolicy */ expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); } @@ -1975,6 +1984,9 @@ export namespace google { /** Subscription labels. */ public labels: { [k: string]: string }; + /** Subscription enableMessageOrdering. */ + public enableMessageOrdering: boolean; + /** Subscription expirationPolicy. */ public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index e8a7c48d975..6e72fc93eb6 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -21,31 +21,15 @@ import {EventEmitter} from 'events'; import {ClientStub} from 'google-gax'; import {common as protobuf} from 'protobufjs'; +import {google} from '../proto/pubsub'; + import {Histogram} from './histogram'; import {FlowControlOptions, LeaseManager} from './lease-manager'; import {AckQueue, BatchOptions, ModAckQueue} from './message-queues'; import {MessageStream, MessageStreamOptions} from './message-stream'; import {Subscription} from './subscription'; -/** - * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/pull#ReceivedMessage - */ -interface ReceivedMessage { - ackId: string; - message: { - attributes: {}, - data: Buffer, - messageId: string, - publishTime: protobuf.ITimestamp - }; -} - -/** - * @see https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/pull#body.PullResponse - */ -export interface PullResponse { - receivedMessages: ReceivedMessage[]; -} +export type PullResponse = google.pubsub.v1.IPullResponse; /** * Date object with nanosecond precision. Supports all standard Date arguments @@ -65,6 +49,7 @@ export interface PullResponse { * // attributes: {key: 'value'}, * // data: Buffer.from('Hello, world!), * // id: '1551297743043', + * // orderingKey: 'ordering-key', * // publishTime: new PreciseDate('2019-02-27T20:02:19.029534186Z'), * // received: 1551297743043, * // length: 13 @@ -76,6 +61,7 @@ export class Message { attributes: {}; data: Buffer; id: string; + orderingKey?: string; publishTime: PreciseDate; received: number; private _handled: boolean; @@ -87,28 +73,29 @@ export class Message { * @param {Subscriber} sub The parent subscriber. * @param {object} message The raw message response. */ - constructor(sub: Subscriber, {ackId, message}: ReceivedMessage) { + constructor(sub: Subscriber, {ackId, + message}: google.pubsub.v1.IReceivedMessage) { /** * This ID is used to acknowledge the message. * * @name Message#ackId * @type {string} */ - this.ackId = ackId; + this.ackId = ackId!; /** * Optional attributes for this message. * * @name Message#attributes * @type {object} */ - this.attributes = message.attributes || {}; + this.attributes = message!.attributes || {}; /** * The message data as a Buffer. * * @name Message#data * @type {Buffer} */ - this.data = message.data; + this.data = message!.data as Buffer; /** * ID of the message, assigned by the server when the message is published. * Guaranteed to be unique within the topic. @@ -116,14 +103,29 @@ export class Message { * @name Message#id * @type {string} */ - this.id = message.messageId; + this.id = message!.messageId!; + /** + * Identifies related messages for which publish order should be respected. + * If a `Subscription` has `enableMessageOrdering` set to `true`, messages + * published with the same `orderingKey` value will be delivered to + * subscribers in the order in which they are received by the Pub/Sub + * system. + * + * **EXPERIMENTAL:** This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * + * @name Message#orderingKey + * @type {string} + */ + this.orderingKey = message!.orderingKey!; /** * The time at which the message was published. * * @name Message#publishTime * @type {external:PreciseDate} */ - this.publishTime = new PreciseDate(message.publishTime as DateStruct); + this.publishTime = new PreciseDate(message!.publishTime as DateStruct); /** * The time at which the message was recieved by the subscription. * @@ -424,7 +426,7 @@ export class Subscriber extends EventEmitter { * @private */ private _onData({receivedMessages}: PullResponse): void { - for (const data of receivedMessages) { + for (const data of receivedMessages!) { const message = new Message(this, data); if (this.isOpen) { diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 16d00ec71fa..4e17999347b 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -130,6 +130,7 @@ const RECEIVED_MESSAGE = { attributes: {}, data: Buffer.from('Hello, world!'), messageId: uuid.v4(), + orderingKey: 'ordering-key', publishTime: {seconds: 12, nanos: 32} } }; @@ -608,6 +609,11 @@ describe('Subscriber', () => { assert.strictEqual(message.id, RECEIVED_MESSAGE.message.messageId); }); + it('should localize orderingKey', () => { + assert.strictEqual( + message.orderingKey, RECEIVED_MESSAGE.message.orderingKey); + }); + it('should localize publishTime', () => { const m = new Message(subscriber, RECEIVED_MESSAGE); const timestamp = m.publishTime as unknown as FakePreciseDate; From c4b044018bfa97a7d154d57e0a2a1a03d198959c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Thu, 28 Mar 2019 15:15:03 -0700 Subject: [PATCH 0399/1115] fix: include 'x-goog-request-params' header in requests (#562) --- handwritten/pubsub/src/v1/publisher_client.js | 70 +++++++++++ .../pubsub/src/v1/subscriber_client.js | 119 ++++++++++++++++++ handwritten/pubsub/synth.metadata | 10 +- 3 files changed, 194 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 0c8982f19eb..cdc6c66d996 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -345,6 +345,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + name: request.name, + }); return this._innerApiCalls.createTopic(request, options, callback); } @@ -407,6 +414,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + 'topic.name': request.topic.name, + }); return this._innerApiCalls.updateTopic(request, options, callback); } @@ -468,6 +482,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic, + }); return this._innerApiCalls.publish(request, options, callback); } @@ -515,6 +536,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic, + }); return this._innerApiCalls.getTopic(request, options, callback); } @@ -610,6 +638,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project, + }); return this._innerApiCalls.listTopics(request, options, callback); } @@ -761,6 +796,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic, + }); return this._innerApiCalls.listTopicSubscriptions( request, @@ -864,6 +906,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic, + }); return this._innerApiCalls.deleteTopic(request, options, callback); } @@ -925,6 +974,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); return this._innerApiCalls.setIamPolicy(request, options, callback); } @@ -975,6 +1031,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); return this._innerApiCalls.getIamPolicy(request, options, callback); } @@ -1035,6 +1098,13 @@ class PublisherClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); return this._innerApiCalls.testIamPermissions(request, options, callback); } diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 7b2877ebc1e..0096dd0a187 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -424,6 +424,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + name: request.name, + }); return this._innerApiCalls.createSubscription(request, options, callback); } @@ -471,6 +478,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription, + }); return this._innerApiCalls.getSubscription(request, options, callback); } @@ -537,6 +551,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + 'subscription.name': request.subscription.name, + }); return this._innerApiCalls.updateSubscription(request, options, callback); } @@ -632,6 +653,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project, + }); return this._innerApiCalls.listSubscriptions(request, options, callback); } @@ -731,6 +759,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription, + }); return this._innerApiCalls.deleteSubscription(request, options, callback); } @@ -792,6 +827,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription, + }); return this._innerApiCalls.modifyAckDeadline(request, options, callback); } @@ -845,6 +887,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription, + }); return this._innerApiCalls.acknowledge(request, options, callback); } @@ -907,6 +956,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription, + }); return this._innerApiCalls.pull(request, options, callback); } @@ -1008,6 +1064,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription, + }); return this._innerApiCalls.modifyPushConfig(request, options, callback); } @@ -1111,6 +1174,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project, + }); return this._innerApiCalls.listSnapshots(request, options, callback); } @@ -1258,6 +1328,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + name: request.name, + }); return this._innerApiCalls.createSnapshot(request, options, callback); } @@ -1335,6 +1412,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + 'snapshot.name': request.snapshot.name, + }); return this._innerApiCalls.updateSnapshot(request, options, callback); } @@ -1386,6 +1470,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + snapshot: request.snapshot, + }); return this._innerApiCalls.deleteSnapshot(request, options, callback); } @@ -1460,6 +1551,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription, + }); return this._innerApiCalls.seek(request, options, callback); } @@ -1521,6 +1619,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); return this._innerApiCalls.setIamPolicy(request, options, callback); } @@ -1571,6 +1676,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); return this._innerApiCalls.getIamPolicy(request, options, callback); } @@ -1631,6 +1743,13 @@ class SubscriberClient { options = {}; } options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); return this._innerApiCalls.testIamPermissions(request, options, callback); } diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 09817b1de85..36b84ffe914 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-23T11:19:52.456128Z", + "updateTime": "2019-03-28T11:38:39.375456Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.19", - "dockerImage": "googleapis/artman@sha256:70ba28fda87e032ae44e6df41b7fc342c1b0cce1ed90658c4890eb4f613038c2" + "version": "0.16.20", + "dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e80435a132c53da26f46daf0787035ee63fb942b", - "internalRef": "239938670" + "sha": "6a84b3267b0a95e922608b9891219075047eee29", + "internalRef": "240640999" } }, { From d62e5270967c04a954c3a26144dd67f549c351df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 1 Apr 2019 09:19:40 -0700 Subject: [PATCH 0400/1115] chore(deps): update dependency typescript to ~3.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chore(deps): update dependency typescript to ~3.4.0 This PR contains the following updates: | Package | Type | Update | Change | References | |---|---|---|---|---| | typescript | devDependencies | minor | [`~3.3.0` -> `~3.4.0`](https://diff.intrinsic.com/typescript/3.3.4000/3.4.1) | [homepage](https://www.typescriptlang.org/), [source](https://togithub.com/Microsoft/TypeScript) | --- ### Release Notes
Microsoft/TypeScript ### [`v3.4.1`](https://togithub.com/Microsoft/TypeScript/releases/v3.4.1) [Compare Source](https://togithub.com/Microsoft/TypeScript/compare/v3.3.4000...v3.4.1) For release notes, check out the [release announcement](https://devblogs.microsoft.com/typescript/announcing-typescript-3-4/). For the complete list of fixed issues, check out the - [fixed issues query for Typescript v3.4 RC](https://togithub.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A%22TypeScript+3.4%22+is%3Aclosed+). - [fixed issues query for Typescript v3.4.1](https://togithub.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue+milestone%3A%22TypeScript+3.4.1%22+is%3Aclosed+). Downloads are available on: - [npm](https://www.npmjs.com/package/typescript) - [Visual Studio 2017](https://marketplace.visualstudio.com/items?itemName=TypeScriptTeam.typescript-341-vs2017) ([Select new version in project options](https://togithub.com/Microsoft/TypeScript/wiki/Updating-TypeScript-in-Visual-Studio-2017)) - [NuGet package](https://www.nuget.org/packages/Microsoft.TypeScript.MSBuild) Special thanks to all of our contributors this release: - [@​AnyhowStep](https://togithub.com/AnyhowStep) - Alan Pierce - Alexander Tarasyuk - Anders Hejlsberg - Andy Hanson - Benedikt Meurer - Benjamin Lichtman - Collins Abitekaniza - Daniel Krom - Daniel Rosenwasser - [@​fullheightcoding](https://togithub.com/fullheightcoding) - Gabriela Araujo Britto - [@​ispedals](https://togithub.com/ispedals) - Jack Williams - Jesse Trinity - Jordi Oliveras Rovira - Joseph Wunderlich - K. Preißer - Kagami Sascha Rosylight - Klaus Meinhardt - Masahiro Wakame - Matt McCutchen - Matthew Aynalem - Mine Starks - Nathan Shively-Sanders - Ron Buckton - Ryan Cavanaugh - Sheetal Nandi - Titian Cernicova-Dragomir - [@​tomholub](https://togithub.com/tomholub) - Wenlu Wang - Wesley Wigham
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is stale, or if you modify the PR title to begin with "`rebase!`". :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/marketplace/renovate). View repository job log [here](https://renovatebot.com/dashboard#googleapis/nodejs-pubsub). #563 automerged by dpebot --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 51901f65be2..9f19b4f454f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -101,7 +101,7 @@ "sinon": "^7.1.1", "source-map-support": "^0.5.9", "through2": "^3.0.0", - "typescript": "~3.3.0", + "typescript": "~3.4.0", "uuid": "^3.1.0" } } From 8801cf715c40a8921b17cd060e6b5f701c847956 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 5 Apr 2019 11:13:52 -0700 Subject: [PATCH 0401/1115] fix(deps): update dependency arrify to v2 (#565) --- handwritten/pubsub/package.json | 3 +-- handwritten/pubsub/src/iam.ts | 4 ++-- handwritten/pubsub/src/publisher.ts | 4 ++-- handwritten/pubsub/test/index.ts | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9f19b4f454f..6e706fba72e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "@sindresorhus/is": "^0.15.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", - "arrify": "^1.0.0", + "arrify": "^2.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", "google-auth-library": "^3.0.0", @@ -71,7 +71,6 @@ }, "devDependencies": { "@google-cloud/nodejs-repo-tools": "^3.0.0", - "@types/arrify": "^1.0.4", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/mocha": "^5.2.5", diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 39988e722d2..2d9fd2ee1d4 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -19,7 +19,7 @@ */ import {promisifyAll} from '@google-cloud/promisify'; -import * as arrify from 'arrify'; +import arrify = require('arrify'); import {CallOptions} from 'google-gax'; import {google} from '../proto/iam'; @@ -365,7 +365,7 @@ export class IAM { return; } - const availablePermissions = arrify(resp!.permissions); + const availablePermissions = arrify(resp!.permissions!); const permissionHash: IamPermissionsMap = (permissions as string[]).reduce((acc, permission) => { acc[permission] = availablePermissions.indexOf(permission) > -1; diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 7e2a1fd5735..2cd0ddce73d 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -15,7 +15,7 @@ */ import {promisifyAll} from '@google-cloud/promisify'; -import * as arrify from 'arrify'; +import arrify = require('arrify'); import {CallOptions} from 'google-gax'; import {google} from '../proto/pubsub'; @@ -264,7 +264,7 @@ export class Publisher { gaxOpts: this.settings!.gaxOpts!, }, (err, resp) => { - const messageIds = arrify(resp && resp.messageIds); + const messageIds = arrify(resp! && resp!.messageIds!); each(callbacks, (callback: PublishCallback, next: Function) => { const messageId = messageIds[callbacks.indexOf(callback)]; callback(err, messageId); diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 2acac60e50c..328f4e3ec61 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -16,7 +16,7 @@ import * as pjy from '@google-cloud/projectify'; import * as promisify from '@google-cloud/promisify'; -import * as arrify from 'arrify'; +import arrify = require('arrify'); import * as assert from 'assert'; import * as gax from 'google-gax'; import {CallOptions, ServiceError} from 'grpc'; From 71b222c1494dffa1a15868488dd11049cf1ca71e Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 5 Apr 2019 14:34:41 -0700 Subject: [PATCH 0402/1115] refactor: use execSync for tests refactor: use execSync for tests #564 automerged by dpebot --- handwritten/pubsub/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6e706fba72e..c789ce454d2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -83,7 +83,6 @@ "eslint-config-prettier": "^4.0.0", "eslint-plugin-node": "^8.0.0", "eslint-plugin-prettier": "^3.0.0", - "execa": "^1.0.0", "gts": "^0.9.0", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", From ac50070adcdf52450437c82986a109cd669e696d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 18 Apr 2019 12:27:58 -0700 Subject: [PATCH 0403/1115] chore(deps): update dependency nyc to v14 (#572) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c789ce454d2..1ef674741a9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -92,7 +92,7 @@ "mocha": "^6.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", - "nyc": "^13.0.0", + "nyc": "^14.0.0", "power-assert": "^1.4.4", "prettier": "^1.9.1", "proxyquire": "^2.0.0", From db03a846c8a270baa1ccb0ab2b203ee888e091a4 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Mon, 22 Apr 2019 08:41:30 -0700 Subject: [PATCH 0404/1115] chore(docs): formatting updates (#577) --- .../v1/doc/google/protobuf/doc_field_mask.js | 44 ++++++++----------- .../v1/doc/google/protobuf/doc_timestamp.js | 26 ++++++----- handwritten/pubsub/synth.metadata | 12 ++--- 3 files changed, 38 insertions(+), 44 deletions(-) diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js index d55d97e6e38..011207b8626 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js @@ -84,57 +84,49 @@ * describe the updated values, the API ignores the values of all * fields not covered by the mask. * - * If a repeated field is specified for an update operation, the existing - * repeated values in the target resource will be overwritten by the new values. - * Note that a repeated field is only allowed in the last position of a `paths` - * string. + * If a repeated field is specified for an update operation, new values will + * be appended to the existing repeated field in the target resource. Note that + * a repeated field is only allowed in the last position of a `paths` string. * * If a sub-message is specified in the last position of the field mask for an - * update operation, then the existing sub-message in the target resource is - * overwritten. Given the target message: + * update operation, then new value will be merged into the existing sub-message + * in the target resource. + * + * For example, given the target message: * * f { * b { - * d : 1 - * x : 2 + * d: 1 + * x: 2 * } - * c : 1 + * c: [1] * } * * And an update message: * * f { * b { - * d : 10 + * d: 10 * } + * c: [2] * } * * then if the field mask is: * - * paths: "f.b" + * paths: ["f.b", "f.c"] * * then the result will be: * * f { * b { - * d : 10 + * d: 10 + * x: 2 * } - * c : 1 + * c: [1, 2] * } * - * However, if the update mask was: - * - * paths: "f.b.d" - * - * then the result would be: - * - * f { - * b { - * d : 10 - * x : 2 - * } - * c : 1 - * } + * An implementation may provide options to override this default behavior for + * repeated and message fields. * * In order to reset a field's value to the default, the field must * be in the mask and set to the default value in the provided resource. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js index b47f41c2b30..98c19dbf0d3 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js @@ -16,17 +16,19 @@ // to be loaded as the JS file. /** - * A Timestamp represents a point in time independent of any time zone - * or calendar, represented as seconds and fractions of seconds at - * nanosecond resolution in UTC Epoch time. It is encoded using the - * Proleptic Gregorian Calendar which extends the Gregorian calendar - * backwards to year one. It is encoded assuming all minutes are 60 - * seconds long, i.e. leap seconds are "smeared" so that no leap second - * table is needed for interpretation. Range is from - * 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. - * By restricting to that range, we ensure that we can convert to - * and from RFC 3339 date strings. - * See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt). + * A Timestamp represents a point in time independent of any time zone or local + * calendar, encoded as a count of seconds and fractions of seconds at + * nanosecond resolution. The count is relative to an epoch at UTC midnight on + * January 1, 1970, in the proleptic Gregorian calendar which extends the + * Gregorian calendar backwards to year one. + * + * All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap + * second table is needed for interpretation, using a [24-hour linear + * smear](https://developers.google.com/time/smear). + * + * The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By + * restricting to that range, we ensure that we can convert to and from [RFC + * 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings. * * # Examples * @@ -91,7 +93,7 @@ * method. In Python, a standard `datetime.datetime` object can be converted * to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) * with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one - * can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) to obtain a formatter capable of generating timestamps in this format. + * can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D) to obtain a formatter capable of generating timestamps in this format. * * @property {number} seconds * Represents seconds of UTC time since Unix epoch diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 36b84ffe914..ccf854847c8 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,26 +1,26 @@ { - "updateTime": "2019-03-28T11:38:39.375456Z", + "updateTime": "2019-04-21T11:49:48.531515Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.20", - "dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e" + "version": "0.16.26", + "dockerImage": "googleapis/artman@sha256:314eae2a40f6f7822db77365cf5f45bd513d628ae17773fd0473f460e7c2a665" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "6a84b3267b0a95e922608b9891219075047eee29", - "internalRef": "240640999" + "sha": "3369c803f56d52662ea3792076deb8545183bdb0", + "internalRef": "244282812" } }, { "template": { "name": "node_library", "origin": "synthtool.gcp", - "version": "2019.2.26" + "version": "2019.4.10" } } ], From 98fb691cae1ef908f3569e431d9ae651b8394c1a Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 29 Apr 2019 15:04:42 -0700 Subject: [PATCH 0405/1115] update to .nycrc with --all enabled (#581) --- handwritten/pubsub/.nycrc | 40 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/handwritten/pubsub/.nycrc b/handwritten/pubsub/.nycrc index 88b001cb587..bfe4073a6ab 100644 --- a/handwritten/pubsub/.nycrc +++ b/handwritten/pubsub/.nycrc @@ -1,28 +1,22 @@ { "report-dir": "./.coverage", - "reporter": "lcov", + "reporter": ["text", "lcov"], "exclude": [ - "src/*{/*,/**/*}.js", - "src/*/v*/*.js", - "test/**/*.js", - "build/test" + "**/*-test", + "**/.coverage", + "**/apis", + "**/benchmark", + "**/docs", + "**/samples", + "**/scripts", + "**/src/**/v*/**/*.js", + "**/test", + ".jsdoc.js", + "**/.jsdoc.js", + "karma.conf.js", + "webpack-tests.config.js", + "webpack.config.js" ], - "watermarks": { - "branches": [ - 95, - 100 - ], - "functions": [ - 95, - 100 - ], - "lines": [ - 95, - 100 - ], - "statements": [ - 95, - 100 - ] - } + "exclude-after-remap": false, + "all": true } From 9c482843518c9bce117396a46a5df6def403fbf6 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Tue, 30 Apr 2019 10:58:03 -0700 Subject: [PATCH 0406/1115] chore: update formatting for generated code (#580) --- handwritten/pubsub/src/v1/publisher_client.js | 38 +++--- .../pubsub/src/v1/subscriber_client.js | 108 +++++++++--------- handwritten/pubsub/synth.metadata | 10 +- 3 files changed, 78 insertions(+), 78 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index cdc6c66d996..a19c9be28a3 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -106,10 +106,10 @@ class PublisherClient { // identifiers to uniquely identify resources within the API. // Create useful helper objects for these. this._pathTemplates = { + projectPathTemplate: new gax.PathTemplate('projects/{project}'), topicPathTemplate: new gax.PathTemplate( 'projects/{project}/topics/{topic}' ), - projectPathTemplate: new gax.PathTemplate('projects/{project}'), }; // Some of the methods on this service return "paged" results, @@ -1113,6 +1113,18 @@ class PublisherClient { // -- Path templates -- // -------------------- + /** + * Return a fully-qualified project resource name string. + * + * @param {String} project + * @returns {String} + */ + projectPath(project) { + return this._pathTemplates.projectPathTemplate.render({ + project: project, + }); + } + /** * Return a fully-qualified topic resource name string. * @@ -1128,15 +1140,14 @@ class PublisherClient { } /** - * Return a fully-qualified project resource name string. + * Parse the projectName from a project resource. * - * @param {String} project - * @returns {String} + * @param {String} projectName + * A fully-qualified path representing a project resources. + * @returns {String} - A string representing the project. */ - projectPath(project) { - return this._pathTemplates.projectPathTemplate.render({ - project: project, - }); + matchProjectFromProjectName(projectName) { + return this._pathTemplates.projectPathTemplate.match(projectName).project; } /** @@ -1160,17 +1171,6 @@ class PublisherClient { matchTopicFromTopicName(topicName) { return this._pathTemplates.topicPathTemplate.match(topicName).topic; } - - /** - * Parse the projectName from a project resource. - * - * @param {String} projectName - * A fully-qualified path representing a project resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromProjectName(projectName) { - return this._pathTemplates.projectPathTemplate.match(projectName).project; - } } module.exports = PublisherClient; diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 0096dd0a187..04699be0907 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -106,16 +106,16 @@ class SubscriberClient { // identifiers to uniquely identify resources within the API. // Create useful helper objects for these. this._pathTemplates = { + projectPathTemplate: new gax.PathTemplate('projects/{project}'), + snapshotPathTemplate: new gax.PathTemplate( + 'projects/{project}/snapshots/{snapshot}' + ), subscriptionPathTemplate: new gax.PathTemplate( 'projects/{project}/subscriptions/{subscription}' ), topicPathTemplate: new gax.PathTemplate( 'projects/{project}/topics/{topic}' ), - projectPathTemplate: new gax.PathTemplate('projects/{project}'), - snapshotPathTemplate: new gax.PathTemplate( - 'projects/{project}/snapshots/{snapshot}' - ), }; // Some of the methods on this service return "paged" results, @@ -1758,6 +1758,32 @@ class SubscriberClient { // -- Path templates -- // -------------------- + /** + * Return a fully-qualified project resource name string. + * + * @param {String} project + * @returns {String} + */ + projectPath(project) { + return this._pathTemplates.projectPathTemplate.render({ + project: project, + }); + } + + /** + * Return a fully-qualified snapshot resource name string. + * + * @param {String} project + * @param {String} snapshot + * @returns {String} + */ + snapshotPath(project, snapshot) { + return this._pathTemplates.snapshotPathTemplate.render({ + project: project, + snapshot: snapshot, + }); + } + /** * Return a fully-qualified subscription resource name string. * @@ -1787,29 +1813,37 @@ class SubscriberClient { } /** - * Return a fully-qualified project resource name string. + * Parse the projectName from a project resource. * - * @param {String} project - * @returns {String} + * @param {String} projectName + * A fully-qualified path representing a project resources. + * @returns {String} - A string representing the project. */ - projectPath(project) { - return this._pathTemplates.projectPathTemplate.render({ - project: project, - }); + matchProjectFromProjectName(projectName) { + return this._pathTemplates.projectPathTemplate.match(projectName).project; } /** - * Return a fully-qualified snapshot resource name string. + * Parse the snapshotName from a snapshot resource. * - * @param {String} project - * @param {String} snapshot - * @returns {String} + * @param {String} snapshotName + * A fully-qualified path representing a snapshot resources. + * @returns {String} - A string representing the project. */ - snapshotPath(project, snapshot) { - return this._pathTemplates.snapshotPathTemplate.render({ - project: project, - snapshot: snapshot, - }); + matchProjectFromSnapshotName(snapshotName) { + return this._pathTemplates.snapshotPathTemplate.match(snapshotName).project; + } + + /** + * Parse the snapshotName from a snapshot resource. + * + * @param {String} snapshotName + * A fully-qualified path representing a snapshot resources. + * @returns {String} - A string representing the snapshot. + */ + matchSnapshotFromSnapshotName(snapshotName) { + return this._pathTemplates.snapshotPathTemplate.match(snapshotName) + .snapshot; } /** @@ -1857,40 +1891,6 @@ class SubscriberClient { matchTopicFromTopicName(topicName) { return this._pathTemplates.topicPathTemplate.match(topicName).topic; } - - /** - * Parse the projectName from a project resource. - * - * @param {String} projectName - * A fully-qualified path representing a project resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromProjectName(projectName) { - return this._pathTemplates.projectPathTemplate.match(projectName).project; - } - - /** - * Parse the snapshotName from a snapshot resource. - * - * @param {String} snapshotName - * A fully-qualified path representing a snapshot resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromSnapshotName(snapshotName) { - return this._pathTemplates.snapshotPathTemplate.match(snapshotName).project; - } - - /** - * Parse the snapshotName from a snapshot resource. - * - * @param {String} snapshotName - * A fully-qualified path representing a snapshot resources. - * @returns {String} - A string representing the snapshot. - */ - matchSnapshotFromSnapshotName(snapshotName) { - return this._pathTemplates.snapshotPathTemplate.match(snapshotName) - .snapshot; - } } module.exports = SubscriberClient; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index ccf854847c8..8f1f84887f0 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-04-21T11:49:48.531515Z", + "updateTime": "2019-04-27T11:16:15.360383Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.26", - "dockerImage": "googleapis/artman@sha256:314eae2a40f6f7822db77365cf5f45bd513d628ae17773fd0473f460e7c2a665" + "version": "0.17.1", + "dockerImage": "googleapis/artman@sha256:a40ca4dd4ef031c0ded4df4909ffdf7b3f20d29b23e682ef991eb60ba0ca6025" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "3369c803f56d52662ea3792076deb8545183bdb0", - "internalRef": "244282812" + "sha": "808110e242c682d7ac2bab6d9c49fc3bf72d7604", + "internalRef": "245313728" } }, { From 589d7e2ef4ee80e9db194ebf80cb95bfeb04a15c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 2 May 2019 09:16:12 -0700 Subject: [PATCH 0407/1115] fix(deps): update dependency google-gax to ^0.26.0 (#583) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1ef674741a9..a85c59955c4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -62,7 +62,7 @@ "async-each": "^1.0.1", "extend": "^3.0.1", "google-auth-library": "^3.0.0", - "google-gax": "^0.25.0", + "google-gax": "^0.26.0", "is-stream-ended": "^0.1.4", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", From a39e244b5ea176cd2efb16db95ffa3e49fcf6603 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 2 May 2019 10:01:52 -0700 Subject: [PATCH 0408/1115] chore: removing node6 CI (#585) --- .../.kokoro/continuous/node6/common.cfg | 24 ------------------- .../pubsub/.kokoro/continuous/node6/test.cfg | 0 .../pubsub/.kokoro/presubmit/node6/common.cfg | 24 ------------------- .../pubsub/.kokoro/presubmit/node6/test.cfg | 0 4 files changed, 48 deletions(-) delete mode 100644 handwritten/pubsub/.kokoro/continuous/node6/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node6/test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node6/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node6/test.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node6/common.cfg b/handwritten/pubsub/.kokoro/continuous/node6/common.cfg deleted file mode 100644 index 0ba415564ca..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node6/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/continuous/node6/test.cfg b/handwritten/pubsub/.kokoro/continuous/node6/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg deleted file mode 100644 index 0ba415564ca..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node6/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:6-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node6/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node6/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 From a9c7c67c55dd203039b087116daa833dccf52d1b Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Thu, 2 May 2019 11:31:01 -0700 Subject: [PATCH 0409/1115] build!: upgrade engines field to >=8.10.0 (#584) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a85c59955c4..72bec6bf834 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "author": "Google Inc.", "engines": { - "node": ">=6.0.0" + "node": ">=8.10.0" }, "repository": "googleapis/nodejs-pubsub", "main": "./build/src/index.js", From 5587379854ac2eeb09188d322edc86bd5550e64a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 2 May 2019 20:32:32 -0700 Subject: [PATCH 0410/1115] chore(deps): update dependency gts to v1 (#579) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/histogram.ts | 6 +- handwritten/pubsub/src/iam.ts | 133 ++--- handwritten/pubsub/src/index.ts | 69 ++- handwritten/pubsub/src/lease-manager.ts | 2 +- handwritten/pubsub/src/message-queues.ts | 30 +- handwritten/pubsub/src/message-stream.ts | 53 +- handwritten/pubsub/src/publisher.ts | 74 +-- handwritten/pubsub/src/pubsub.ts | 469 ++++++++++-------- handwritten/pubsub/src/snapshot.ts | 70 +-- handwritten/pubsub/src/subscriber.ts | 20 +- handwritten/pubsub/src/subscription.ts | 310 +++++++----- handwritten/pubsub/src/topic.ts | 264 ++++++---- .../system-test/fixtures/sample/package.json | 2 +- handwritten/pubsub/system-test/install.ts | 16 +- handwritten/pubsub/system-test/pubsub.ts | 210 ++++---- handwritten/pubsub/test/iam.ts | 16 +- handwritten/pubsub/test/index.ts | 218 ++++---- handwritten/pubsub/test/lease-manager.ts | 25 +- handwritten/pubsub/test/message-queues.ts | 71 +-- handwritten/pubsub/test/message-stream.ts | 68 +-- handwritten/pubsub/test/publisher.ts | 124 ++--- handwritten/pubsub/test/snapshot.ts | 40 +- handwritten/pubsub/test/subscriber.ts | 66 ++- handwritten/pubsub/test/subscription.ts | 117 +++-- handwritten/pubsub/test/topic.ts | 245 +++++---- 26 files changed, 1593 insertions(+), 1127 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 72bec6bf834..9da70e19f91 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -83,7 +83,7 @@ "eslint-config-prettier": "^4.0.0", "eslint-plugin-node": "^8.0.0", "eslint-plugin-prettier": "^3.0.0", - "gts": "^0.9.0", + "gts": "^1.0.0", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.5.5", "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", diff --git a/handwritten/pubsub/src/histogram.ts b/handwritten/pubsub/src/histogram.ts index cc733620080..6a7d50c2b2a 100644 --- a/handwritten/pubsub/src/histogram.ts +++ b/handwritten/pubsub/src/histogram.ts @@ -32,8 +32,10 @@ export class Histogram { data: Map; length: number; constructor(options?: HistogramOptions) { - this.options = - Object.assign({min: 0, max: Number.MAX_SAFE_INTEGER}, options); + this.options = Object.assign( + {min: 0, max: Number.MAX_SAFE_INTEGER}, + options + ); this.data = new Map(); this.length = 0; } diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 2d9fd2ee1d4..b980140042e 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -27,8 +27,8 @@ import {google} from '../proto/iam'; import {Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; export type Policy = { - etag?: string|Buffer -}&Omit; + etag?: string | Buffer; +} & Omit; export type GetPolicyCallback = RequestCallback; export type SetPolicyCallback = RequestCallback; @@ -41,14 +41,18 @@ export type GetPolicyResponse = [Policy]; * The key to this object are the IAM permissions (string) and the values are * booleans, true if permissions are granted to the corresponding key. */ -export type IamPermissionsMap = { - [key: string]: boolean -}; +export interface IamPermissionsMap { + [key: string]: boolean; +} -export type TestIamPermissionsResponse = - [IamPermissionsMap, google.iam.v1.ITestIamPermissionsResponse]; +export type TestIamPermissionsResponse = [ + IamPermissionsMap, + google.iam.v1.ITestIamPermissionsResponse +]; export type TestIamPermissionsCallback = ResourceCallback< - IamPermissionsMap, google.iam.v1.ITestIamPermissionsResponse>; + IamPermissionsMap, + google.iam.v1.ITestIamPermissionsResponse +>; /** * [IAM (Identity and Access @@ -147,8 +151,9 @@ export class IAM { * }); */ getPolicy( - optsOrCallback?: CallOptions|GetPolicyCallback, - callback?: GetPolicyCallback): Promise|void { + optsOrCallback?: CallOptions | GetPolicyCallback, + callback?: GetPolicyCallback + ): Promise | void { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -157,18 +162,22 @@ export class IAM { }; this.request( - { - client: 'SubscriberClient', - method: 'getIamPolicy', - reqOpts, - gaxOpts, - }, - callback!); + { + client: 'SubscriberClient', + method: 'getIamPolicy', + reqOpts, + gaxOpts, + }, + callback! + ); } setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise; - setPolicy(policy: Policy, gaxOpts: CallOptions, callback: SetPolicyCallback): - void; + setPolicy( + policy: Policy, + gaxOpts: CallOptions, + callback: SetPolicyCallback + ): void; setPolicy(policy: Policy, callback: SetPolicyCallback): void; /** * @typedef {array} SetPolicyResponse @@ -228,8 +237,10 @@ export class IAM { * }); */ setPolicy( - policy: Policy, optsOrCallback?: CallOptions|SetPolicyCallback, - callback?: SetPolicyCallback): Promise|void { + policy: Policy, + optsOrCallback?: CallOptions | SetPolicyCallback, + callback?: SetPolicyCallback + ): Promise | void { if (!(typeof policy === 'object')) { throw new Error('A policy object is required.'); } @@ -243,22 +254,29 @@ export class IAM { }; this.request( - { - client: 'SubscriberClient', - method: 'setIamPolicy', - reqOpts, - gaxOpts, - }, - callback!); + { + client: 'SubscriberClient', + method: 'setIamPolicy', + reqOpts, + gaxOpts, + }, + callback! + ); } - testPermissions(permissions: string|string[], gaxOpts?: CallOptions): - Promise; testPermissions( - permissions: string|string[], gaxOpts: CallOptions, - callback: TestIamPermissionsCallback): void; + permissions: string | string[], + gaxOpts?: CallOptions + ): Promise; + testPermissions( + permissions: string | string[], + gaxOpts: CallOptions, + callback: TestIamPermissionsCallback + ): void; testPermissions( - permissions: string|string[], callback: TestIamPermissionsCallback): void; + permissions: string | string[], + callback: TestIamPermissionsCallback + ): void; /** * @callback TestIamPermissionsCallback * @param {?Error} err Request error, if any. @@ -336,10 +354,10 @@ export class IAM { * }); */ testPermissions( - permissions: string|string[], - optsOrCallback?: CallOptions|TestIamPermissionsCallback, - callback?: TestIamPermissionsCallback): - Promise|void { + permissions: string | string[], + optsOrCallback?: CallOptions | TestIamPermissionsCallback, + callback?: TestIamPermissionsCallback + ): Promise | void { if (!Array.isArray(permissions) && !(typeof permissions === 'string')) { throw new Error('Permissions are required.'); } @@ -353,26 +371,29 @@ export class IAM { }; this.request( - { - client: 'SubscriberClient', - method: 'testIamPermissions', - reqOpts, - gaxOpts, - }, - (err, resp) => { - if (err) { - callback!(err, null, resp!); - return; - } + { + client: 'SubscriberClient', + method: 'testIamPermissions', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback!(err, null, resp!); + return; + } - const availablePermissions = arrify(resp!.permissions!); - const permissionHash: IamPermissionsMap = - (permissions as string[]).reduce((acc, permission) => { - acc[permission] = availablePermissions.indexOf(permission) > -1; - return acc; - }, {} as {[key: string]: boolean}); - callback!(null, permissionHash, resp!); - }); + const availablePermissions = arrify(resp!.permissions!); + const permissionHash: IamPermissionsMap = (permissions as string[]).reduce( + (acc, permission) => { + acc[permission] = availablePermissions.indexOf(permission) > -1; + return acc; + }, + {} as {[key: string]: boolean} + ); + callback!(null, permissionHash, resp!); + } + ); } } diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index f4d61a17deb..7cceebb7faa 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -78,10 +78,69 @@ module.exports.v1 = require('./v1'); export {CallOptions} from 'google-gax'; export {ServiceError} from 'grpc'; -export {Policy, GetPolicyCallback, SetPolicyCallback, SetPolicyResponse, GetPolicyResponse, IamPermissionsMap, TestIamPermissionsResponse, TestIamPermissionsCallback, IAM} from './iam'; +export { + Policy, + GetPolicyCallback, + SetPolicyCallback, + SetPolicyResponse, + GetPolicyResponse, + IamPermissionsMap, + TestIamPermissionsResponse, + TestIamPermissionsCallback, + IAM, +} from './iam'; export {Attributes, PublishCallback} from './publisher'; -export {PageOptions, GetSnapshotsCallback, GetSnapshotsResponse, GetSubscriptionsCallback, GetSubscriptionsResponse, GetTopicsCallback, GetTopicsResponse, EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, PubSub} from './pubsub'; -export {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot'; +export { + PageOptions, + GetSnapshotsCallback, + GetSnapshotsResponse, + GetSubscriptionsCallback, + GetSubscriptionsResponse, + GetTopicsCallback, + GetTopicsResponse, + EmptyCallback, + EmptyResponse, + ExistsCallback, + ExistsResponse, + PubSub, +} from './pubsub'; +export { + CreateSnapshotCallback, + CreateSnapshotResponse, + SeekCallback, + SeekResponse, + Snapshot, +} from './snapshot'; export {Message} from './subscriber'; -export {PushConfig, SubscriptionMetadata, SubscriptionOptions, SubscriptionCloseCallback, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, GetSubscriptionOptions, GetSubscriptionCallback, GetSubscriptionResponse, GetSubscriptionMetadataCallback, GetSubscriptionMetadataResponse, SetSubscriptionMetadataCallback, SetSubscriptionMetadataResponse, Subscription} from './subscription'; -export {CreateTopicCallback, CreateTopicResponse, GetTopicCallback, GetTopicResponse, GetTopicOptions, GetTopicMetadataCallback, GetTopicMetadataResponse, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, SetTopicMetadataCallback, SetTopicMetadataResponse, Topic, TopicMetadata} from './topic'; +export { + PushConfig, + SubscriptionMetadata, + SubscriptionOptions, + SubscriptionCloseCallback, + CreateSubscriptionOptions, + CreateSubscriptionCallback, + CreateSubscriptionResponse, + GetSubscriptionOptions, + GetSubscriptionCallback, + GetSubscriptionResponse, + GetSubscriptionMetadataCallback, + GetSubscriptionMetadataResponse, + SetSubscriptionMetadataCallback, + SetSubscriptionMetadataResponse, + Subscription, +} from './subscription'; +export { + CreateTopicCallback, + CreateTopicResponse, + GetTopicCallback, + GetTopicResponse, + GetTopicOptions, + GetTopicMetadataCallback, + GetTopicMetadataResponse, + GetTopicSubscriptionsCallback, + GetTopicSubscriptionsResponse, + SetTopicMetadataCallback, + SetTopicMetadataResponse, + Topic, + TopicMetadata, +} from './topic'; diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index 564f632fa1d..ddf587bf02c 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -187,7 +187,7 @@ export class LeaseManager extends EventEmitter { allowExcessMessages: true, maxBytes: freemem() * 0.2, maxExtension: Infinity, - maxMessages: 100 + maxMessages: 100, }; this._options = Object.assign(defaults, options); diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index ede336fa34d..7918661d9d2 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -51,8 +51,11 @@ export class BatchError extends Error implements ServiceError { code?: status; metadata?: Metadata; constructor(err: ServiceError, ackIds: string[], rpc: string) { - super(`Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ - err.message}`); + super( + `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ + err.message + }` + ); this.ackIds = ackIds; this.code = err.code; @@ -213,17 +216,18 @@ export class ModAckQueue extends MessageQueue { const client = await this._subscriber.getClient(); const subscription = this._subscriber.name; const modAckTable: {[index: string]: string[]} = batch.reduce( - (table: {[index: string]: string[]}, [ackId, deadline]) => { - if (!table[deadline!]) { - table[deadline!] = []; - } - - table[deadline!].push(ackId); - return table; - }, - {}); - - const modAckRequests = Object.keys(modAckTable).map(async (deadline) => { + (table: {[index: string]: string[]}, [ackId, deadline]) => { + if (!table[deadline!]) { + table[deadline!] = []; + } + + table[deadline!].push(ackId); + return table; + }, + {} + ); + + const modAckRequests = Object.keys(modAckTable).map(async deadline => { const ackIds = modAckTable[deadline]; const ackDeadlineSeconds = Number(deadline); const reqOpts = {subscription, ackIds, ackDeadlineSeconds}; diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 26d10d55308..313a85e3fe4 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -16,7 +16,13 @@ import {promisify} from '@google-cloud/promisify'; import {ClientStub} from 'google-gax'; -import {ClientDuplexStream, Metadata, ServiceError, status, StatusObject} from 'grpc'; +import { + ClientDuplexStream, + Metadata, + ServiceError, + status, + StatusObject, +} from 'grpc'; import * as isStreamEnded from 'is-stream-ended'; import {PassThrough} from 'stream'; @@ -41,23 +47,23 @@ const UNKNOWN: status = 2; * codes to retry streams */ const RETRY_CODES: status[] = [ - 0, // ok - 1, // canceled - 2, // unknown - 4, // deadline exceeded - 8, // resource exhausted - 10, // aborted - 13, // internal error - 14, // unavailable - 15, // dataloss + 0, // ok + 1, // canceled + 2, // unknown + 4, // deadline exceeded + 8, // resource exhausted + 10, // aborted + 13, // internal error + 14, // unavailable + 15, // dataloss ]; /*! * Deadline for the stream. */ -const PULL_TIMEOUT = require('./v1/subscriber_client_config.json') - .interfaces['google.pubsub.v1.Subscriber'] - .methods.StreamingPull.timeout_millis; +const PULL_TIMEOUT = require('./v1/subscriber_client_config.json').interfaces[ + 'google.pubsub.v1.Subscriber' +].methods.StreamingPull.timeout_millis; /*! * default stream options @@ -81,8 +87,9 @@ interface StreamingPullRequest { streamAckDeadlineSeconds?: number; } -type PullStream = ClientDuplexStream& - {_readableState: StreamState}; +type PullStream = ClientDuplexStream & { + _readableState: StreamState; +}; /** * Error wrapper for gRPC status objects. @@ -162,8 +169,10 @@ export class MessageStream extends PassThrough { this._fillStreamPool(); - this._keepAliveHandle = - setInterval(() => this._keepAlive(), KEEP_ALIVE_INTERVAL); + this._keepAliveHandle = setInterval( + () => this._keepAlive(), + KEEP_ALIVE_INTERVAL + ); this._keepAliveHandle.unref(); } /** @@ -207,9 +216,13 @@ export class MessageStream extends PassThrough { this._setHighWaterMark(stream); this._streams.set(stream, false); - stream.on('error', err => this._onError(stream, err)) - .once('status', status => this._onStatus(stream, status)) - .pipe(this, {end: false}); + stream + .on('error', err => this._onError(stream, err)) + .once('status', status => this._onStatus(stream, status)) + .pipe( + this, + {end: false} + ); } /** * Attempts to create and cache the desired number of StreamingPull requests. diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 2cd0ddce73d..2b94327de3b 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -31,9 +31,9 @@ interface Inventory { bytes: number; } -export type Attributes = { - [key: string]: string -}; +export interface Attributes { + [key: string]: string; +} export type PublishCallback = RequestCallback; /** @@ -163,20 +163,26 @@ export class Publisher { */ publish(data: Buffer, attributes?: Attributes): Promise; publish(data: Buffer, callback: PublishCallback): void; - publish(data: Buffer, attributes: Attributes, callback: PublishCallback): - void; publish( - data: Buffer, attributesOrCallback?: Attributes|PublishCallback, - callback?: PublishCallback): Promise|void { + data: Buffer, + attributes: Attributes, + callback: PublishCallback + ): void; + publish( + data: Buffer, + attributesOrCallback?: Attributes | PublishCallback, + callback?: PublishCallback + ): Promise | void { if (!(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); } const attributes = - typeof attributesOrCallback === 'object' ? attributesOrCallback : {}; - callback = typeof attributesOrCallback === 'function' ? - attributesOrCallback : - callback; + typeof attributesOrCallback === 'object' ? attributesOrCallback : {}; + callback = + typeof attributesOrCallback === 'function' + ? attributesOrCallback + : callback; // Ensure the `attributes` object only has string values for (const key of Object.keys(attributes)) { const value = attributes[key]; @@ -189,8 +195,10 @@ export class Publisher { const opts = this.settings!.batching!; // if this message puts us over the maxBytes option, then let's ship // what we have and add it to the next batch - if (this.inventory_.bytes > 0 && - this.inventory_.bytes + data.length > opts.maxBytes!) { + if ( + this.inventory_.bytes > 0 && + this.inventory_.bytes + data.length > opts.maxBytes! + ) { this.publish_(); } // add it to the queue! @@ -204,8 +212,10 @@ export class Publisher { } // otherwise let's set a timeout to send the next batch if (!this.timeoutHandle_) { - this.timeoutHandle_ = - setTimeout(this.publish_.bind(this), opts.maxMilliseconds!); + this.timeoutHandle_ = setTimeout( + this.publish_.bind(this), + opts.maxMilliseconds! + ); } } /** @@ -257,20 +267,21 @@ export class Publisher { messages, }; this.topic.request( - { - client: 'PublisherClient', - method: 'publish', - reqOpts, - gaxOpts: this.settings!.gaxOpts!, - }, - (err, resp) => { - const messageIds = arrify(resp! && resp!.messageIds!); - each(callbacks, (callback: PublishCallback, next: Function) => { - const messageId = messageIds[callbacks.indexOf(callback)]; - callback(err, messageId); - next(); - }); + { + client: 'PublisherClient', + method: 'publish', + reqOpts, + gaxOpts: this.settings!.gaxOpts!, + }, + (err, resp) => { + const messageIds = arrify(resp! && resp!.messageIds!); + each(callbacks, (callback: PublishCallback, next: Function) => { + const messageId = messageIds[callbacks.indexOf(callback)]; + callback(err, messageId); + next(); }); + } + ); } /** * Queues message to be sent to the server. @@ -283,8 +294,11 @@ export class Publisher { */ queue_(data: Buffer, attrs: Attributes): Promise; queue_(data: Buffer, attrs: Attributes, callback: PublishCallback): void; - queue_(data: Buffer, attrs: Attributes, callback?: PublishCallback): - void|Promise { + queue_( + data: Buffer, + attrs: Attributes, + callback?: PublishCallback + ): void | Promise { this.inventory_.queued.push({ data, attributes: attrs, diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index d0c8247fd85..e3cc3211150 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -14,7 +14,6 @@ * limitations under the License. */ - import {paginator} from '@google-cloud/paginator'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisifyAll} from '@google-cloud/promisify'; @@ -27,8 +26,21 @@ const PKG = require('../../package.json'); const v1 = require('./v1'); import {Snapshot} from './snapshot'; -import {Subscription, SubscriptionMetadata, SubscriptionOptions, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse} from './subscription'; -import {Topic, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, CreateTopicCallback, CreateTopicResponse} from './topic'; +import { + Subscription, + SubscriptionMetadata, + SubscriptionOptions, + CreateSubscriptionOptions, + CreateSubscriptionCallback, + CreateSubscriptionResponse, +} from './subscription'; +import { + Topic, + GetTopicSubscriptionsCallback, + GetTopicSubscriptionsResponse, + CreateTopicCallback, + CreateTopicResponse, +} from './topic'; import {PublishOptions} from './publisher'; import {CallOptions} from 'google-gax'; import {Transform} from 'stream'; @@ -50,7 +62,7 @@ export type Omit = Pick>; export interface ClientConfig extends gax.GrpcClientOptions { apiEndpoint?: string; servicePath?: string; - port?: string|number; + port?: string | number; sslCreds?: ChannelCredentials; } @@ -61,31 +73,45 @@ export interface PageOptions { autoPaginate?: boolean; } -export type GetSnapshotsCallback = - RequestCallback; +export type GetSnapshotsCallback = RequestCallback< + Snapshot, + google.pubsub.v1.IListSnapshotsResponse +>; -export type GetSnapshotsResponse = - PagedResponse; +export type GetSnapshotsResponse = PagedResponse< + Snapshot, + google.pubsub.v1.IListSnapshotsResponse +>; -export type GetSubscriptionsOptions = PageOptions&{topic?: string | Topic}; +export type GetSubscriptionsOptions = PageOptions & {topic?: string | Topic}; -type GetAllSubscriptionsCallback = - RequestCallback; +type GetAllSubscriptionsCallback = RequestCallback< + Subscription, + google.pubsub.v1.IListSubscriptionsResponse +>; -type GetAllSubscriptionsResponse = - PagedResponse; +type GetAllSubscriptionsResponse = PagedResponse< + Subscription, + google.pubsub.v1.IListSubscriptionsResponse +>; export type GetSubscriptionsCallback = - GetAllSubscriptionsCallback|GetTopicSubscriptionsCallback; + | GetAllSubscriptionsCallback + | GetTopicSubscriptionsCallback; export type GetSubscriptionsResponse = - GetAllSubscriptionsResponse|GetTopicSubscriptionsResponse; + | GetAllSubscriptionsResponse + | GetTopicSubscriptionsResponse; -export type GetTopicsCallback = - RequestCallback; +export type GetTopicsCallback = RequestCallback< + Topic, + google.pubsub.v1.IListTopicsResponse +>; -export type GetTopicsResponse = - PagedResponse; +export type GetTopicsResponse = PagedResponse< + Topic, + google.pubsub.v1.IListTopicsResponse +>; export type EmptyCallback = RequestCallback; export type EmptyResponse = [google.protobuf.IEmpty]; @@ -94,7 +120,7 @@ export type ExistsCallback = RequestCallback; export type ExistsResponse = [boolean]; export interface GetClientConfig { - client: 'PublisherClient'|'SubscriberClient'; + client: 'PublisherClient' | 'SubscriberClient'; } export interface RequestConfig extends GetClientConfig { @@ -104,24 +130,33 @@ export interface RequestConfig extends GetClientConfig { } export interface ResourceCallback { - (err: ServiceError|null, resource?: Resource|null, - response?: Response|null): void; + ( + err: ServiceError | null, + resource?: Resource | null, + response?: Response | null + ): void; } -export type RequestCallback = - R extends void ? NormalCallback: PagedCallback; +export type RequestCallback = R extends void + ? NormalCallback + : PagedCallback; export interface NormalCallback { - (err: ServiceError|null, res?: TResponse|null): void; + (err: ServiceError | null, res?: TResponse | null): void; } export interface PagedCallback { - (err: ServiceError|null, results?: Item[]|null, nextQuery?: {}|null, - response?: Response|null): void; + ( + err: ServiceError | null, + results?: Item[] | null, + nextQuery?: {} | null, + response?: Response | null + ): void; } export type PagedResponse = - [Item[]]|[Item[], {} | null, Response]; + | [Item[]] + | [Item[], {} | null, Response]; export type ObjectStream = { addListener(event: 'data', listener: (data: O) => void): ObjectStream; @@ -129,12 +164,14 @@ export type ObjectStream = { on(event: 'data', listener: (data: O) => void): ObjectStream; once(event: 'data', listener: (data: O) => void): ObjectStream; prependListener(event: 'data', listener: (data: O) => void): ObjectStream; - prependOnceListener(event: 'data', listener: (data: O) => void): - ObjectStream; -}&Transform; + prependOnceListener( + event: 'data', + listener: (data: O) => void + ): ObjectStream; +} & Transform; interface GetClientCallback { - (err: Error|null, gaxClient?: gax.ClientStub): void; + (err: Error | null, gaxClient?: gax.ClientStub): void; } /** @@ -203,12 +240,15 @@ export class PubSub { projectId: string; // tslint:disable-next-line variable-name Promise?: PromiseConstructor; - getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => - ObjectStream; - getSnapshotsStream = paginator.streamify('getSnapshots') as() => - ObjectStream; - getTopicsStream = paginator.streamify('getTopics') as() => - ObjectStream; + getSubscriptionsStream = paginator.streamify( + 'getSubscriptions' + ) as () => ObjectStream; + getSnapshotsStream = paginator.streamify( + 'getSnapshots' + ) as () => ObjectStream; + getTopicsStream = paginator.streamify('getTopics') as () => ObjectStream< + Topic + >; constructor(options?: ClientConfig) { options = options || {}; @@ -222,15 +262,16 @@ export class PubSub { } } this.options = Object.assign( - { - 'grpc.keepalive_time_ms': 300000, - 'grpc.max_send_message_length': -1, - 'grpc.max_receive_message_length': 20000001, - libName: 'gccl', - libVersion: PKG.version, - scopes: Object.keys(allScopes), - }, - options); + { + 'grpc.keepalive_time_ms': 300000, + 'grpc.max_send_message_length': -1, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version, + scopes: Object.keys(allScopes), + }, + options + ); /** * @name PubSub#isEmulator * @type {boolean} @@ -246,14 +287,21 @@ export class PubSub { } createSubscription( - topic: Topic|string, name: string, - options?: CreateSubscriptionOptions): Promise; + topic: Topic | string, + name: string, + options?: CreateSubscriptionOptions + ): Promise; createSubscription( - topic: Topic|string, name: string, - callback: CreateSubscriptionCallback): void; + topic: Topic | string, + name: string, + callback: CreateSubscriptionCallback + ): void; createSubscription( - topic: Topic|string, name: string, options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback): void; + topic: Topic | string, + name: string, + options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback + ): void; /** * @typedef {array} CreateSubscriptionResponse * @property {Subscription} 0 The new {@link Subscription}. @@ -330,10 +378,11 @@ export class PubSub { * }); */ createSubscription( - topic: Topic|string, name: string, - optionsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, - callback?: CreateSubscriptionCallback): - Promise|void { + topic: Topic | string, + name: string, + optionsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, + callback?: CreateSubscriptionCallback + ): Promise | void { if (!is.string(topic) && !(topic instanceof Topic)) { throw new Error('A Topic is required for a new subscription.'); } @@ -343,11 +392,12 @@ export class PubSub { if (typeof topic === 'string') { topic = this.topic(topic); } - let options = typeof optionsOrCallback === 'object' ? - optionsOrCallback : - {} as CreateSubscriptionOptions; + let options = + typeof optionsOrCallback === 'object' + ? optionsOrCallback + : ({} as CreateSubscriptionOptions); callback = - typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; + typeof optionsOrCallback === 'function' ? optionsOrCallback : callback; // Make a deep copy of options to not pollute caller object. options = extend(true, {}, options); @@ -357,8 +407,9 @@ export class PubSub { delete options.gaxOpts; delete options.flowControl; - const metadata = - Subscription.formatMetadata_(options as SubscriptionMetadata); + const metadata = Subscription.formatMetadata_( + options as SubscriptionMetadata + ); let subscriptionCtorOptions = flowControl ? {flowControl} : {}; subscriptionCtorOptions = Object.assign(subscriptionCtorOptions, metadata); @@ -370,27 +421,33 @@ export class PubSub { }); this.request( - { - client: 'SubscriberClient', - method: 'createSubscription', - reqOpts, - gaxOpts, - }, - (err, resp) => { - if (err) { - callback!(err, null, resp); - return; - } - subscription.metadata = resp!; - callback!(null, subscription, resp!); - }); + { + client: 'SubscriberClient', + method: 'createSubscription', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + subscription.metadata = resp!; + callback!(null, subscription, resp!); + } + ); } - createTopic(name: string, gaxOpts?: CallOptions): - Promise; + createTopic( + name: string, + gaxOpts?: CallOptions + ): Promise; createTopic(name: string, callback: CreateTopicCallback): void; createTopic( - name: string, gaxOpts: CallOptions, callback: CreateTopicCallback): void; + name: string, + gaxOpts: CallOptions, + callback: CreateTopicCallback + ): void; /** * @typedef {array} CreateTopicResponse * @property {Topic} 0 The new {@link Topic}. @@ -432,8 +489,10 @@ export class PubSub { * }); */ createTopic( - name: string, optsOrCallback?: CallOptions|CreateTopicCallback, - callback?: CreateTopicCallback): Promise|void { + name: string, + optsOrCallback?: CallOptions | CreateTopicCallback, + callback?: CreateTopicCallback + ): Promise | void { const topic = this.topic(name); const reqOpts = { name: topic.name, @@ -443,20 +502,21 @@ export class PubSub { callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; this.request( - { - client: 'PublisherClient', - method: 'createTopic', - reqOpts, - gaxOpts, - }, - (err, resp) => { - if (err) { - callback!(err, null, resp); - return; - } - topic.metadata = resp!; - callback!(null, topic, resp!); - }); + { + client: 'PublisherClient', + method: 'createTopic', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + topic.metadata = resp!; + callback!(null, topic, resp!); + } + ); } /** * Determine the appropriate endpoint to use for API requests, first trying @@ -474,9 +534,10 @@ export class PubSub { const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; const leadingProtocol = new RegExp('^https*://'); const trailingSlashes = new RegExp('/*$'); - const baseUrlParts = baseUrl!.replace(leadingProtocol, '') - .replace(trailingSlashes, '') - .split(':'); + const baseUrlParts = baseUrl! + .replace(leadingProtocol, '') + .replace(trailingSlashes, '') + .split(':'); this.options.servicePath = baseUrlParts[0]; this.options.port = baseUrlParts[1]; this.options.sslCreds = grpc.credentials.createInsecure(); @@ -533,55 +594,63 @@ export class PubSub { * }); */ getSnapshots( - optsOrCallback?: PageOptions|GetSnapshotsCallback, - callback?: GetSnapshotsCallback): void|Promise { + optsOrCallback?: PageOptions | GetSnapshotsCallback, + callback?: GetSnapshotsCallback + ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const reqOpts = Object.assign( - { - project: 'projects/' + this.projectId, - }, - options); + { + project: 'projects/' + this.projectId, + }, + options + ); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); this.request< - google.pubsub.v1.ISnapshot, google.pubsub.v1.IListSnapshotsResponse>( - { - client: 'SubscriberClient', - method: 'listSnapshots', - reqOpts, - gaxOpts, - }, - (err, rawSnapshots, ...args) => { - let snapshots: Snapshot[]; - - if (rawSnapshots) { - snapshots = rawSnapshots.map(snapshot => { - const snapshotInstance = this.snapshot(snapshot.name!); - snapshotInstance.metadata = snapshot; - return snapshotInstance; - }); - } - - callback!(err, snapshots!, ...args); - }); + google.pubsub.v1.ISnapshot, + google.pubsub.v1.IListSnapshotsResponse + >( + { + client: 'SubscriberClient', + method: 'listSnapshots', + reqOpts, + gaxOpts, + }, + (err, rawSnapshots, ...args) => { + let snapshots: Snapshot[]; + + if (rawSnapshots) { + snapshots = rawSnapshots.map(snapshot => { + const snapshotInstance = this.snapshot(snapshot.name!); + snapshotInstance.metadata = snapshot; + return snapshotInstance; + }); + } + + callback!(err, snapshots!, ...args); + } + ); } - getSubscriptions(options?: GetSubscriptionsOptions): - Promise; + getSubscriptions( + options?: GetSubscriptionsOptions + ): Promise; getSubscriptions(callback: GetSubscriptionsCallback): void; getSubscriptions( - options: GetSubscriptionsOptions, - callback: GetSubscriptionsCallback): void; + options: GetSubscriptionsOptions, + callback: GetSubscriptionsCallback + ): void; /** * Query object for listing subscriptions. * @@ -640,9 +709,9 @@ export class PubSub { * }); */ getSubscriptions( - optsOrCallback?: GetSubscriptionsOptions|GetSubscriptionsCallback, - callback?: GetSubscriptionsCallback): - void|Promise { + optsOrCallback?: GetSubscriptionsOptions | GetSubscriptionsCallback, + callback?: GetSubscriptionsCallback + ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -652,44 +721,50 @@ export class PubSub { topic = this.topic(topic); } return topic.getSubscriptions( - options, callback as GetTopicSubscriptionsCallback); + options, + callback as GetTopicSubscriptionsCallback + ); } - const reqOpts = Object.assign({}, options) as - google.pubsub.v1.IListSubscriptionsRequest; + const reqOpts = Object.assign( + {}, + options + ) as google.pubsub.v1.IListSubscriptionsRequest; reqOpts.project = 'projects/' + this.projectId; delete (reqOpts as GetSubscriptionsOptions).gaxOpts; delete (reqOpts as GetSubscriptionsOptions).autoPaginate; const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); this.request< - google.pubsub.v1.ISubscription, - google.pubsub.v1.IListSubscriptionsResponse>( - { - client: 'SubscriberClient', - method: 'listSubscriptions', - reqOpts, - gaxOpts, - }, - (err, rawSubs, ...args) => { - let subscriptions: Subscription[]; - - if (rawSubs) { - subscriptions = rawSubs.map(sub => { - const subscriptionInstance = this.subscription(sub.name!); - subscriptionInstance.metadata = sub; - return subscriptionInstance; - }); - } - - (callback as GetAllSubscriptionsCallback)( - err, subscriptions!, ...args); - }); + google.pubsub.v1.ISubscription, + google.pubsub.v1.IListSubscriptionsResponse + >( + { + client: 'SubscriberClient', + method: 'listSubscriptions', + reqOpts, + gaxOpts, + }, + (err, rawSubs, ...args) => { + let subscriptions: Subscription[]; + + if (rawSubs) { + subscriptions = rawSubs.map(sub => { + const subscriptionInstance = this.subscription(sub.name!); + subscriptionInstance.metadata = sub; + return subscriptionInstance; + }); + } + + (callback as GetAllSubscriptionsCallback)(err, subscriptions!, ...args); + } + ); } getTopics(options?: PageOptions): Promise; @@ -752,46 +827,50 @@ export class PubSub { * }); */ getTopics( - optsOrCallback?: PageOptions|GetTopicsCallback, - callback?: GetTopicsCallback): void|Promise { + optsOrCallback?: PageOptions | GetTopicsCallback, + callback?: GetTopicsCallback + ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const reqOpts = Object.assign( - { - project: 'projects/' + this.projectId, - }, - options); + { + project: 'projects/' + this.projectId, + }, + options + ); delete reqOpts.gaxOpts; delete reqOpts.autoPaginate; const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); this.request( - { - client: 'PublisherClient', - method: 'listTopics', - reqOpts, - gaxOpts, - }, - (err, rawTopics, ...args) => { - let topics: Topic[]; - - if (rawTopics) { - topics = rawTopics.map(topic => { - const topicInstance = this.topic(topic.name); - topicInstance.metadata = topic; - return topicInstance; - }); - } - - callback!(err, topics!, ...args); - }); + { + client: 'PublisherClient', + method: 'listTopics', + reqOpts, + gaxOpts, + }, + (err, rawTopics, ...args) => { + let topics: Topic[]; + + if (rawTopics) { + topics = rawTopics.map(topic => { + const topicInstance = this.topic(topic.name); + topicInstance.metadata = topic; + return topicInstance; + }); + } + + callback!(err, topics!, ...args); + } + ); } /** * Callback function to PubSub.getClient_(). @@ -814,7 +893,7 @@ export class PubSub { */ getClient_(config: GetClientConfig, callback: GetClientCallback) { const hasProjectId = - this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; + this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; if (!hasProjectId && !this.isEmulator) { this.auth.getProjectId((err, projectId) => { if (err) { diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 36ebe9a4280..d2070c9c62b 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -20,12 +20,19 @@ import {CallOptions} from 'google-gax'; import {google} from '../proto/pubsub'; import {PubSub} from './index'; -import {EmptyCallback, EmptyResponse, RequestCallback, ResourceCallback} from './pubsub'; +import { + EmptyCallback, + EmptyResponse, + RequestCallback, + ResourceCallback, +} from './pubsub'; import {Subscription} from './subscription'; import * as util from './util'; -export type CreateSnapshotCallback = - ResourceCallback; +export type CreateSnapshotCallback = ResourceCallback< + Snapshot, + google.pubsub.v1.ISnapshot +>; export type CreateSnapshotResponse = [Snapshot, google.pubsub.v1.ISnapshot]; export type SeekCallback = RequestCallback; @@ -96,12 +103,12 @@ export type SeekResponse = [google.pubsub.v1.ISeekResponse]; * }); */ export class Snapshot { - parent: Subscription|PubSub; + parent: Subscription | PubSub; name: string; // tslint:disable-next-line variable-name Promise?: PromiseConstructor; metadata?: google.pubsub.v1.ISnapshot; - constructor(parent: Subscription|PubSub, name: string) { + constructor(parent: Subscription | PubSub, name: string) { if (parent instanceof PubSub) { this.Promise = parent.Promise; } @@ -130,18 +137,19 @@ export class Snapshot { * const apiResponse = data[0]; * }); */ - delete(callback?: EmptyCallback): void|Promise { + delete(callback?: EmptyCallback): void | Promise { const reqOpts = { snapshot: this.name, }; this.parent.request( - { - client: 'SubscriberClient', - method: 'deleteSnapshot', - reqOpts, - }, - callback!); + { + client: 'SubscriberClient', + method: 'deleteSnapshot', + reqOpts, + }, + callback! + ); } /*@ @@ -193,25 +201,30 @@ export class Snapshot { * }); */ create( - optsOrCallback?: CallOptions|CreateSnapshotCallback, - callback?: CreateSnapshotCallback): void|Promise { + optsOrCallback?: CallOptions | CreateSnapshotCallback, + callback?: CreateSnapshotCallback + ): void | Promise { if (!(this.parent instanceof Subscription)) { throw new Error( - `This is only available if you accessed this object through Subscription#snapshot`); + `This is only available if you accessed this object through Subscription#snapshot` + ); } const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; return this.parent.createSnapshot( - this.name, options, (err, snapshot, resp) => { - if (err) { - callback!(err, null, resp); - return; - } - Object.assign(this, snapshot); - callback!(null, this, resp); - }); + this.name, + options, + (err, snapshot, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + Object.assign(this, snapshot); + callback!(null, this, resp); + } + ); } seek(gaxOpts?: CallOptions): Promise; @@ -242,18 +255,19 @@ export class Snapshot { * const apiResponse = data[0]; * }); */ - seek(gaxOpts?: CallOptions|SeekCallback, callback?: SeekCallback): - void|Promise { + seek( + gaxOpts?: CallOptions | SeekCallback, + callback?: SeekCallback + ): void | Promise { if (!(this.parent instanceof Subscription)) { throw new Error( - `This is only available if you accessed this object through Subscription#snapshot`); + `This is only available if you accessed this object through Subscription#snapshot` + ); } return this.parent.seek(this.name, gaxOpts! as CallOptions, callback!); } } - - /*! Developer Documentation * * All async methods (except for streams) will return a Promise in the event diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 6e72fc93eb6..fb76a30363a 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -73,8 +73,10 @@ export class Message { * @param {Subscriber} sub The parent subscriber. * @param {object} message The raw message response. */ - constructor(sub: Subscriber, {ackId, - message}: google.pubsub.v1.IReceivedMessage) { + constructor( + sub: Subscriber, + {ackId, message}: google.pubsub.v1.IReceivedMessage + ) { /** * This ID is used to acknowledge the message. * @@ -323,7 +325,7 @@ export class Subscriber extends EventEmitter { async getClient(): Promise { const pubsub = this._subscription.pubsub; const [client] = await promisify(pubsub.getClient_).call(pubsub, { - client: 'SubscriberClient' + client: 'SubscriberClient', }); return client; @@ -370,12 +372,14 @@ export class Subscriber extends EventEmitter { this._inventory = new LeaseManager(this, flowControl); this._stream = new MessageStream(this, streamingOptions); - this._stream.on('error', err => this.emit('error', err)) - .on('data', (data: PullResponse) => this._onData(data)) - .once('close', () => this.close()); + this._stream + .on('error', err => this.emit('error', err)) + .on('data', (data: PullResponse) => this._onData(data)) + .once('close', () => this.close()); - this._inventory.on('full', () => this._stream.pause()) - .on('free', () => this._stream.resume()); + this._inventory + .on('full', () => this._stream.pause()) + .on('free', () => this._stream.resume()); this.isOpen = true; } diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 40f74be4c21..e4f2e860479 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -25,8 +25,23 @@ import {google} from '../proto/pubsub'; import {IAM} from './iam'; import {FlowControlOptions} from './lease-manager'; -import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; -import {CreateSnapshotCallback, CreateSnapshotResponse, SeekCallback, SeekResponse, Snapshot} from './snapshot'; +import { + EmptyCallback, + EmptyResponse, + ExistsCallback, + ExistsResponse, + Omit, + PubSub, + RequestCallback, + ResourceCallback, +} from './pubsub'; +import { + CreateSnapshotCallback, + CreateSnapshotResponse, + SeekCallback, + SeekResponse, + Snapshot, +} from './snapshot'; import {Subscriber, SubscriberOptions} from './subscriber'; import {Topic} from './topic'; import {noop} from './util'; @@ -34,18 +49,20 @@ import {noop} from './util'; export type PushConfig = google.pubsub.v1.IPushConfig; export type SubscriptionMetadata = { - messageRetentionDuration?: google.protobuf.IDuration|number; + messageRetentionDuration?: google.protobuf.IDuration | number; pushEndpoint?: string; -}&Omit; +} & Omit; -export type SubscriptionOptions = SubscriberOptions&{topic?: Topic}; +export type SubscriptionOptions = SubscriberOptions & {topic?: Topic}; export type SubscriptionCloseCallback = (err?: Error) => void; -type SubscriptionCallback = - ResourceCallback; +type SubscriptionCallback = ResourceCallback< + Subscription, + google.pubsub.v1.ISubscription +>; type SubscriptionResponse = [Subscription, google.pubsub.v1.ISubscription]; -export type CreateSubscriptionOptions = SubscriptionMetadata&{ +export type CreateSubscriptionOptions = SubscriptionMetadata & { gaxOpts?: CallOptions; flowControl?: FlowControlOptions; }; @@ -53,7 +70,7 @@ export type CreateSubscriptionOptions = SubscriptionMetadata&{ export type CreateSubscriptionCallback = SubscriptionCallback; export type CreateSubscriptionResponse = SubscriptionResponse; -export type GetSubscriptionOptions = CallOptions&{autoCreate?: boolean}; +export type GetSubscriptionOptions = CallOptions & {autoCreate?: boolean}; export type GetSubscriptionCallback = SubscriptionCallback; export type GetSubscriptionResponse = SubscriptionResponse; @@ -194,7 +211,7 @@ export class Subscription extends EventEmitter { pubsub: PubSub; iam: IAM; name: string; - topic?: Topic|string; + topic?: Topic | string; metadata?: google.pubsub.v1.ISubscription; request: typeof PubSub.prototype.request; private _subscriber: Subscriber; @@ -247,9 +264,10 @@ export class Subscription extends EventEmitter { this.iam = new IAM(pubsub, this.name); this._subscriber = new Subscriber(this, options); - this._subscriber.on('error', err => this.emit('error', err)) - .on('message', message => this.emit('message', message)) - .on('close', () => this.emit('close')); + this._subscriber + .on('error', err => this.emit('error', err)) + .on('message', message => this.emit('message', message)) + .on('close', () => this.emit('close')); this._listen(); } @@ -267,7 +285,7 @@ export class Subscription extends EventEmitter { * @type {string} */ get projectId(): string { - return this.pubsub && this.pubsub.projectId || '{{projectId}}'; + return (this.pubsub && this.pubsub.projectId) || '{{projectId}}'; } close(): Promise; @@ -291,16 +309,18 @@ export class Subscription extends EventEmitter { * // If the callback is omitted a Promise will be returned. * subscription.close().then(() => {}); */ - close(callback?: SubscriptionCloseCallback): void|Promise { + close(callback?: SubscriptionCloseCallback): void | Promise { this._subscriber.close().then(() => callback!(), callback); } - create(options?: CreateSubscriptionOptions): - Promise; + create( + options?: CreateSubscriptionOptions + ): Promise; create(callback: CreateSubscriptionCallback): void; create( - options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback): void; + options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback + ): void; /** * Create a subscription. * @@ -334,12 +354,13 @@ export class Subscription extends EventEmitter { * Promise. const [sub, apiResponse] = await subscription.create(); */ create( - optsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, - callback?: CreateSubscriptionCallback): - void|Promise { + optsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, + callback?: CreateSubscriptionCallback + ): void | Promise { if (!this.topic) { throw new Error( - 'Subscriptions can only be created when accessed through Topics'); + 'Subscriptions can only be created when accessed through Topics' + ); } const name = this.name.split('/').pop(); @@ -347,22 +368,30 @@ export class Subscription extends EventEmitter { callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; this.pubsub.createSubscription( - this.topic, name!, options, (err, sub, resp) => { - if (err) { - callback!(err, null, resp); - return; - } - Object.assign(this, sub); - callback!(null, this, resp); - }); + this.topic, + name!, + options, + (err, sub, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + Object.assign(this, sub); + callback!(null, this, resp); + } + ); } - createSnapshot(name: string, gaxOpts?: CallOptions): - Promise; + createSnapshot( + name: string, + gaxOpts?: CallOptions + ): Promise; createSnapshot(name: string, callback: CreateSnapshotCallback): void; createSnapshot( - name: string, gaxOpts: CallOptions, - callback: CreateSnapshotCallback): void; + name: string, + gaxOpts: CallOptions, + callback: CreateSnapshotCallback + ): void; /** * @typedef {array} CreateSnapshotResponse * @property {Snapshot} 0 The new {@link Snapshot}. @@ -407,8 +436,10 @@ export class Subscription extends EventEmitter { * }); */ createSnapshot( - name: string, optsOrCallback?: CallOptions|CreateSnapshotCallback, - callback?: CreateSnapshotCallback): void|Promise { + name: string, + optsOrCallback?: CallOptions | CreateSnapshotCallback, + callback?: CreateSnapshotCallback + ): void | Promise { if (!is.string(name)) { throw new Error('A name is required to create a snapshot.'); } @@ -421,20 +452,21 @@ export class Subscription extends EventEmitter { subscription: this.name, }; this.request( - { - client: 'SubscriberClient', - method: 'createSnapshot', - reqOpts, - gaxOpts, - }, - (err, resp) => { - if (err) { - callback!(err, null, resp); - return; - } - snapshot.metadata = resp!; - callback!(null, snapshot, resp!); - }); + { + client: 'SubscriberClient', + method: 'createSnapshot', + reqOpts, + gaxOpts, + }, + (err, resp) => { + if (err) { + callback!(err, null, resp); + return; + } + snapshot.metadata = resp!; + callback!(null, snapshot, resp!); + } + ); } delete(gaxOpts?: CallOptions): Promise; @@ -469,8 +501,10 @@ export class Subscription extends EventEmitter { * const apiResponse = data[0]; * }); */ - delete(optsOrCallback?: CallOptions|EmptyCallback, callback?: EmptyCallback): - void|Promise { + delete( + optsOrCallback?: CallOptions | EmptyCallback, + callback?: EmptyCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -483,13 +517,14 @@ export class Subscription extends EventEmitter { } this.request( - { - client: 'SubscriberClient', - method: 'deleteSubscription', - reqOpts, - gaxOpts, - }, - callback!); + { + client: 'SubscriberClient', + method: 'deleteSubscription', + reqOpts, + gaxOpts, + }, + callback! + ); } exists(): Promise; @@ -525,7 +560,7 @@ export class Subscription extends EventEmitter { * const exists = data[0]; * }); */ - exists(callback?: ExistsCallback): void|Promise { + exists(callback?: ExistsCallback): void | Promise { this.getMetadata(err => { if (!err) { callback!(null, true); @@ -583,9 +618,10 @@ export class Subscription extends EventEmitter { * const apiResponse = data[1]; * }); */ - get(optsOrCallback?: GetSubscriptionOptions|GetSubscriptionCallback, - callback?: GetSubscriptionCallback): - void|Promise { + get( + optsOrCallback?: GetSubscriptionOptions | GetSubscriptionCallback, + callback?: GetSubscriptionCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -609,8 +645,10 @@ export class Subscription extends EventEmitter { getMetadata(gaxOpts?: CallOptions): Promise; getMetadata(callback: GetSubscriptionMetadataCallback): void; - getMetadata(gaxOpts: CallOptions, callback: GetSubscriptionMetadataCallback): - void; + getMetadata( + gaxOpts: CallOptions, + callback: GetSubscriptionMetadataCallback + ): void; /** * @typedef {array} GetSubscriptionMetadataResponse * @property {object} 0 The full API response. @@ -649,9 +687,9 @@ export class Subscription extends EventEmitter { * }); */ getMetadata( - optsOrCallback?: CallOptions|GetSubscriptionMetadataCallback, - callback?: GetSubscriptionMetadataCallback): - void|Promise { + optsOrCallback?: CallOptions | GetSubscriptionMetadataCallback, + callback?: GetSubscriptionMetadataCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -660,25 +698,31 @@ export class Subscription extends EventEmitter { }; this.request( - { - client: 'SubscriberClient', - method: 'getSubscription', - reqOpts, - gaxOpts, - }, - (err, apiResponse) => { - if (!err) { - this.metadata = apiResponse!; - } - callback!(err!, apiResponse!); - }); + { + client: 'SubscriberClient', + method: 'getSubscription', + reqOpts, + gaxOpts, + }, + (err, apiResponse) => { + if (!err) { + this.metadata = apiResponse!; + } + callback!(err!, apiResponse!); + } + ); } - modifyPushConfig(config: PushConfig, gaxOpts?: CallOptions): - Promise; + modifyPushConfig( + config: PushConfig, + gaxOpts?: CallOptions + ): Promise; modifyPushConfig(config: PushConfig, callback: EmptyCallback): void; modifyPushConfig( - config: PushConfig, gaxOpts: CallOptions, callback: EmptyCallback): void; + config: PushConfig, + gaxOpts: CallOptions, + callback: EmptyCallback + ): void; /** * @typedef {array} ModifyPushConfigResponse * @property {object} 0 The full API response. @@ -728,8 +772,10 @@ export class Subscription extends EventEmitter { * }); */ modifyPushConfig( - config: PushConfig, optsOrCallback?: CallOptions|EmptyCallback, - callback?: EmptyCallback): void|Promise { + config: PushConfig, + optsOrCallback?: CallOptions | EmptyCallback, + callback?: EmptyCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -739,13 +785,14 @@ export class Subscription extends EventEmitter { }; this.request( - { - client: 'SubscriberClient', - method: 'modifyPushConfig', - reqOpts, - gaxOpts, - }, - callback!); + { + client: 'SubscriberClient', + method: 'modifyPushConfig', + reqOpts, + gaxOpts, + }, + callback! + ); } /** @@ -775,10 +822,13 @@ export class Subscription extends EventEmitter { } } - seek(snapshot: string|Date, gaxOpts?: CallOptions): Promise; - seek(snapshot: string|Date, callback: SeekCallback): void; - seek(snapshot: string|Date, gaxOpts: CallOptions, callback: SeekCallback): - void; + seek(snapshot: string | Date, gaxOpts?: CallOptions): Promise; + seek(snapshot: string | Date, callback: SeekCallback): void; + seek( + snapshot: string | Date, + gaxOpts: CallOptions, + callback: SeekCallback + ): void; /** * @typedef {array} SeekResponse * @property {object} 0 The full API response. @@ -817,8 +867,10 @@ export class Subscription extends EventEmitter { * subscription.seek(date, callback); */ seek( - snapshot: string|Date, optsOrCallback?: CallOptions|SeekCallback, - callback?: SeekCallback): void|Promise { + snapshot: string | Date, + optsOrCallback?: CallOptions | SeekCallback, + callback?: SeekCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -835,23 +887,29 @@ export class Subscription extends EventEmitter { } this.request( - { - client: 'SubscriberClient', - method: 'seek', - reqOpts, - gaxOpts, - }, - callback!); + { + client: 'SubscriberClient', + method: 'seek', + reqOpts, + gaxOpts, + }, + callback! + ); } - setMetadata(metadata: SubscriptionMetadata, gaxOpts?: CallOptions): - Promise; setMetadata( - metadata: SubscriptionMetadata, - callback: SetSubscriptionMetadataCallback): void; + metadata: SubscriptionMetadata, + gaxOpts?: CallOptions + ): Promise; + setMetadata( + metadata: SubscriptionMetadata, + callback: SetSubscriptionMetadataCallback + ): void; setMetadata( - metadata: SubscriptionMetadata, gaxOpts: CallOptions, - callback: SetSubscriptionMetadataCallback): void; + metadata: SubscriptionMetadata, + gaxOpts: CallOptions, + callback: SetSubscriptionMetadataCallback + ): void; /** * @typedef {array} SetSubscriptionMetadataResponse * @property {object} 0 The full API response. @@ -889,10 +947,10 @@ export class Subscription extends EventEmitter { * }); */ setMetadata( - metadata: SubscriptionMetadata, - optsOrCallback?: CallOptions|SetSubscriptionMetadataCallback, - callback?: SetSubscriptionMetadataCallback): - void|Promise { + metadata: SubscriptionMetadata, + optsOrCallback?: CallOptions | SetSubscriptionMetadataCallback, + callback?: SetSubscriptionMetadataCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -906,13 +964,14 @@ export class Subscription extends EventEmitter { }, }; this.request( - { - client: 'SubscriberClient', - method: 'updateSubscription', - reqOpts, - gaxOpts, - }, - callback!); + { + client: 'SubscriberClient', + method: 'updateSubscription', + reqOpts, + gaxOpts, + }, + callback! + ); } /** * Sets the Subscription options. @@ -961,8 +1020,9 @@ export class Subscription extends EventEmitter { * * @private */ - static formatMetadata_(metadata: SubscriptionMetadata): - google.pubsub.v1.ISubscription { + static formatMetadata_( + metadata: SubscriptionMetadata + ): google.pubsub.v1.ISubscription { const formatted = extend(true, {}, metadata); if (typeof metadata.messageRetentionDuration === 'number') { diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index c1ee435ec93..2f2af1f1c6d 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -22,9 +22,31 @@ import {CallOptions} from 'google-gax'; import {google} from '../proto/pubsub'; import {IAM} from './iam'; -import {Attributes, PublishCallback, Publisher, PublishOptions} from './publisher'; -import {EmptyCallback, EmptyResponse, ExistsCallback, ExistsResponse, ObjectStream, PagedResponse, PageOptions, PubSub, RequestCallback, ResourceCallback} from './pubsub'; -import {CreateSubscriptionCallback, CreateSubscriptionOptions, CreateSubscriptionResponse, Subscription, SubscriptionOptions} from './subscription'; +import { + Attributes, + PublishCallback, + Publisher, + PublishOptions, +} from './publisher'; +import { + EmptyCallback, + EmptyResponse, + ExistsCallback, + ExistsResponse, + ObjectStream, + PagedResponse, + PageOptions, + PubSub, + RequestCallback, + ResourceCallback, +} from './pubsub'; +import { + CreateSubscriptionCallback, + CreateSubscriptionOptions, + CreateSubscriptionResponse, + Subscription, + SubscriptionOptions, +} from './subscription'; import * as util from './util'; export type TopicMetadata = google.pubsub.v1.ITopic; @@ -38,7 +60,7 @@ export type CreateTopicResponse = TopicResponse; export type GetTopicCallback = TopicCallback; export type GetTopicResponse = TopicResponse; -export type GetTopicOptions = CallOptions&{autoCreate?: boolean}; +export type GetTopicOptions = CallOptions & {autoCreate?: boolean}; type MetadataCallback = RequestCallback; type MetadataResponse = [TopicMetadata]; @@ -50,9 +72,13 @@ export type SetTopicMetadataCallback = MetadataCallback; export type SetTopicMetadataResponse = MetadataResponse; export type GetTopicSubscriptionsCallback = RequestCallback< - Subscription, google.pubsub.v1.IListTopicSubscriptionsResponse>; + Subscription, + google.pubsub.v1.IListTopicSubscriptionsResponse +>; export type GetTopicSubscriptionsResponse = PagedResponse< - Subscription, google.pubsub.v1.IListTopicSubscriptionsResponse>; + Subscription, + google.pubsub.v1.IListTopicSubscriptionsResponse +>; /** * A Topic object allows you to interact with a Cloud Pub/Sub topic. @@ -77,8 +103,9 @@ export class Topic { iam: IAM; metadata?: TopicMetadata; publisher: Publisher; - getSubscriptionsStream = paginator.streamify('getSubscriptions') as() => - ObjectStream; + getSubscriptionsStream = paginator.streamify( + 'getSubscriptions' + ) as () => ObjectStream; constructor(pubsub: PubSub, name: string, options?: PublishOptions) { if (pubsub.Promise) { @@ -179,8 +206,9 @@ export class Topic { * }); */ create( - optsOrCallback?: CallOptions|CreateTopicCallback, - callback?: CreateTopicCallback): Promise|void { + optsOrCallback?: CallOptions | CreateTopicCallback, + callback?: CreateTopicCallback + ): Promise | void { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -188,11 +216,15 @@ export class Topic { } createSubscription(name: string, callback: CreateSubscriptionCallback): void; - createSubscription(name: string, options?: CreateSubscriptionOptions): - Promise; createSubscription( - name: string, options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback): void; + name: string, + options?: CreateSubscriptionOptions + ): Promise; + createSubscription( + name: string, + options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback + ): void; /** * Create a subscription to this topic. * @@ -231,15 +263,19 @@ export class Topic { * }); */ createSubscription( - name: string, - optsOrCallback?: CreateSubscriptionOptions|CreateSubscriptionCallback, - callback?: CreateSubscriptionCallback): - void|Promise { + name: string, + optsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, + callback?: CreateSubscriptionCallback + ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; this.pubsub.createSubscription( - this, name, options as CreateSubscriptionOptions, callback!); + this, + name, + options as CreateSubscriptionOptions, + callback! + ); } delete(callback: EmptyCallback): void; @@ -272,8 +308,10 @@ export class Topic { * const apiResponse = data[0]; * }); */ - delete(optsOrCallback?: CallOptions|EmptyCallback, callback?: EmptyCallback): - void|Promise { + delete( + optsOrCallback?: CallOptions | EmptyCallback, + callback?: EmptyCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -282,13 +320,14 @@ export class Topic { }; this.request( - { - client: 'PublisherClient', - method: 'deleteTopic', - reqOpts, - gaxOpts: gaxOpts as CallOptions, - }, - callback!); + { + client: 'PublisherClient', + method: 'deleteTopic', + reqOpts, + gaxOpts: gaxOpts as CallOptions, + }, + callback! + ); } exists(): Promise; @@ -323,8 +362,8 @@ export class Topic { * const exists = data[0]; * }); */ - exists(callback?: ExistsCallback): void|Promise { - this.getMetadata((err) => { + exists(callback?: ExistsCallback): void | Promise { + this.getMetadata(err => { if (!err) { callback!(null, true); return; @@ -379,8 +418,10 @@ export class Topic { * const apiResponse = data[1]; * }); */ - get(optsOrCallback?: GetTopicOptions|GetTopicCallback, - callback?: GetTopicCallback): void|Promise { + get( + optsOrCallback?: GetTopicOptions | GetTopicCallback, + callback?: GetTopicCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -438,9 +479,9 @@ export class Topic { * }); */ getMetadata( - optsOrCallback?: CallOptions|GetTopicMetadataCallback, - callback?: GetTopicMetadataCallback): - void|Promise { + optsOrCallback?: CallOptions | GetTopicMetadataCallback, + callback?: GetTopicMetadataCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -449,25 +490,29 @@ export class Topic { }; this.request( - { - client: 'PublisherClient', - method: 'getTopic', - reqOpts, - gaxOpts: gaxOpts as CallOptions, - }, - (err, apiResponse) => { - if (!err) { - this.metadata = apiResponse!; - } - callback!(err, apiResponse!); - }); + { + client: 'PublisherClient', + method: 'getTopic', + reqOpts, + gaxOpts: gaxOpts as CallOptions, + }, + (err, apiResponse) => { + if (!err) { + this.metadata = apiResponse!; + } + callback!(err, apiResponse!); + } + ); } getSubscriptions(callback: GetTopicSubscriptionsCallback): void; getSubscriptions( - options: PageOptions, callback: GetTopicSubscriptionsCallback): void; - getSubscriptions(options?: PageOptions): - Promise; + options: PageOptions, + callback: GetTopicSubscriptionsCallback + ): void; + getSubscriptions( + options?: PageOptions + ): Promise; /** * Get a list of the subscriptions registered to this topic. You may * optionally provide a query object as the first argument to customize the @@ -505,50 +550,55 @@ export class Topic { * }); */ getSubscriptions( - optsOrCallback?: PageOptions|GetTopicSubscriptionsCallback, - callback?: GetTopicSubscriptionsCallback): - void|Promise { + optsOrCallback?: PageOptions | GetTopicSubscriptionsCallback, + callback?: GetTopicSubscriptionsCallback + ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; - const reqOpts: google.pubsub.v1.IListTopicSubscriptionsRequest = - Object.assign( - { - topic: this.name, - }, - options as SubscriptionOptions); + const reqOpts: google.pubsub.v1.IListTopicSubscriptionsRequest = Object.assign( + { + topic: this.name, + }, + options as SubscriptionOptions + ); delete (reqOpts as PageOptions).gaxOpts; delete (reqOpts as PageOptions).autoPaginate; const gaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); this.request( - { - client: 'PublisherClient', - method: 'listTopicSubscriptions', - reqOpts, - gaxOpts, - }, - (err, subNames, ...args) => { - let subscriptions: Subscription[]; - - if (subNames) { - subscriptions = subNames.map(sub => this.subscription(sub)); - } - - callback!(err, subscriptions!, ...args); - }); + { + client: 'PublisherClient', + method: 'listTopicSubscriptions', + reqOpts, + gaxOpts, + }, + (err, subNames, ...args) => { + let subscriptions: Subscription[]; + + if (subNames) { + subscriptions = subNames.map(sub => this.subscription(sub)); + } + + callback!(err, subscriptions!, ...args); + } + ); } publish(data: Buffer, attributes?: Attributes): Promise; publish(data: Buffer, callback: PublishCallback): void; - publish(data: Buffer, attributes: Attributes, callback: PublishCallback): - void; + publish( + data: Buffer, + attributes: Attributes, + callback: PublishCallback + ): void; /** * Publish the provided message. * @@ -592,8 +642,10 @@ export class Topic { * topic.publish(data).then((messageId) => {}); */ publish( - data: Buffer, attrsOrCb?: Attributes|PublishCallback, - callback?: PublishCallback): Promise|void { + data: Buffer, + attrsOrCb?: Attributes | PublishCallback, + callback?: PublishCallback + ): Promise | void { const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; return this.publisher.publish(data, attributes, callback!); @@ -601,8 +653,11 @@ export class Topic { publishJSON(json: object, attributes?: Attributes): Promise; publishJSON(json: object, callback: PublishCallback): void; - publishJSON(json: object, attributes: Attributes, callback: PublishCallback): - void; + publishJSON( + json: object, + attributes: Attributes, + callback: PublishCallback + ): void; /** * Publish the provided JSON. It should be noted that all messages published * are done so in the form of a Buffer. This is simply a convenience method @@ -652,8 +707,10 @@ export class Topic { * topic.publishJSON(data).then((messageId) => {}); */ publishJSON( - json: object, attrsOrCb?: Attributes|PublishCallback, - callback?: PublishCallback): Promise|void { + json: object, + attrsOrCb?: Attributes | PublishCallback, + callback?: PublishCallback + ): Promise | void { if (!is.object(json)) { throw new Error('First parameter should be an object.'); } @@ -664,12 +721,16 @@ export class Topic { return this.publish(data, attributes, callback!); } - setMetadata(options: TopicMetadata, gaxOpts?: CallOptions): - Promise; + setMetadata( + options: TopicMetadata, + gaxOpts?: CallOptions + ): Promise; setMetadata(options: TopicMetadata, callback: SetTopicMetadataCallback): void; setMetadata( - options: TopicMetadata, gaxOpts: CallOptions, - callback: SetTopicMetadataCallback): void; + options: TopicMetadata, + gaxOpts: CallOptions, + callback: SetTopicMetadataCallback + ): void; /** * @typedef {array} SetTopicMetadataResponse * @property {object} 0 The full API response. @@ -715,10 +776,10 @@ export class Topic { * }); */ setMetadata( - options: TopicMetadata, - optsOrCallback?: CallOptions|SetTopicMetadataCallback, - callback?: SetTopicMetadataCallback): - void|Promise { + options: TopicMetadata, + optsOrCallback?: CallOptions | SetTopicMetadataCallback, + callback?: SetTopicMetadataCallback + ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -727,13 +788,14 @@ export class Topic { const reqOpts = {topic, updateMask}; this.request( - { - client: 'PublisherClient', - method: 'updateTopic', - reqOpts, - gaxOpts, - }, - callback!); + { + client: 'PublisherClient', + method: 'updateTopic', + reqOpts, + gaxOpts, + }, + callback! + ); } /** diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index b83e6a633d7..14c4a7f7f8f 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -18,6 +18,6 @@ "devDependencies": { "@types/node": "^10.3.0", "typescript": "^3.0.0", - "gts": "^0.9.0" + "gts": "^1.0.0" } } diff --git a/handwritten/pubsub/system-test/install.ts b/handwritten/pubsub/system-test/install.ts index 9f19523e9b8..7b1d95480a5 100644 --- a/handwritten/pubsub/system-test/install.ts +++ b/handwritten/pubsub/system-test/install.ts @@ -21,7 +21,7 @@ import * as tmp from 'tmp'; import {promisify} from 'util'; const keep = false; -const mvp = promisify(mv) as {} as (...args: string[]) => Promise; +const mvp = (promisify(mv) as {}) as (...args: string[]) => Promise; const ncpp = promisify(ncp); const stagingDir = tmp.dirSync({keep, unsafeCleanup: true}); const stagingPath = stagingDir.name; @@ -37,12 +37,14 @@ describe('📦 pack and install', () => { const tarball = `google-cloud-pubsub-${pkg.version}.tgz`; await mvp(tarball, `${stagingPath}/pubsub.tgz`); await ncpp('system-test/fixtures/sample', `${stagingPath}/`); - await execa( - 'npm', ['install', '--unsafe-perm'], - {cwd: `${stagingPath}/`, stdio: 'inherit'}); - await execa( - 'node', ['--throw-deprecation', 'build/src/index.js'], - {cwd: `${stagingPath}/`, stdio: 'inherit'}); + await execa('npm', ['install', '--unsafe-perm'], { + cwd: `${stagingPath}/`, + stdio: 'inherit', + }); + await execa('node', ['--throw-deprecation', 'build/src/index.js'], { + cwd: `${stagingPath}/`, + stdio: 'inherit', + }); }); /** diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 5003afac470..0dffd9eade1 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -18,7 +18,14 @@ import * as assert from 'assert'; import defer from 'p-defer'; import * as uuid from 'uuid'; -import {Message, PubSub, ServiceError, Snapshot, Subscription, Topic} from '../src'; +import { + Message, + PubSub, + ServiceError, + Snapshot, + Subscription, + Topic, +} from '../src'; import {Policy} from '../src/iam'; const pubsub = new PubSub(); @@ -91,21 +98,21 @@ describe('pubsub', () => { it('should list topics in a stream', done => { const topicsEmitted = new Array(); - pubsub.getTopicsStream() - .on('error', done) - .on('data', - topic => { - topicsEmitted.push(topic); - }) - .on('end', () => { - const results = topicsEmitted.filter(topic => { - const name = getTopicName(topic); - return TOPIC_FULL_NAMES.indexOf(name) !== -1; - }); - - assert.strictEqual(results.length, TOPIC_NAMES.length); - done(); + pubsub + .getTopicsStream() + .on('error', done) + .on('data', topic => { + topicsEmitted.push(topic); + }) + .on('end', () => { + const results = topicsEmitted.filter(topic => { + const name = getTopicName(topic); + return TOPIC_FULL_NAMES.indexOf(name) !== -1; }); + + assert.strictEqual(results.length, TOPIC_NAMES.length); + done(); + }); }); it('should allow manual paging', async () => { @@ -203,13 +210,15 @@ describe('pubsub', () => { after(() => { // Delete subscriptions - return Promise.all(SUBSCRIPTIONS.map(async s => { - try { - await s.delete(); - } catch (e) { - await topic.delete(); - } - })); + return Promise.all( + SUBSCRIPTIONS.map(async s => { + try { + await s.delete(); + } catch (e) { + await topic.delete(); + } + }) + ); }); it('should return error if creating an existing subscription', done => { @@ -243,41 +252,41 @@ describe('pubsub', () => { it('should list all topic subscriptions as a stream', done => { const subscriptionsEmitted: Array<{}> = []; - topic.getSubscriptionsStream() - .on('error', done) - .on('data', - subscription => { - subscriptionsEmitted.push(subscription); - }) - .on('end', () => { - assert.strictEqual( - subscriptionsEmitted.length, SUBSCRIPTIONS.length); - done(); - }); + topic + .getSubscriptionsStream() + .on('error', done) + .on('data', subscription => { + subscriptionsEmitted.push(subscription); + }) + .on('end', () => { + assert.strictEqual(subscriptionsEmitted.length, SUBSCRIPTIONS.length); + done(); + }); }); it('should list all subscriptions regardless of topic', done => { pubsub.getSubscriptions( - (err: ServiceError|null, subscriptions?: Subscription[]|null) => { - assert.ifError(err); - assert(subscriptions instanceof Array); - done(); - }); + (err: ServiceError | null, subscriptions?: Subscription[] | null) => { + assert.ifError(err); + assert(subscriptions instanceof Array); + done(); + } + ); }); it('should list all subscriptions as a stream', done => { let subscriptionEmitted = false; - pubsub.getSubscriptionsStream() - .on('error', done) - .on('data', - subscription => { - subscriptionEmitted = subscription instanceof Subscription; - }) - .on('end', () => { - assert.strictEqual(subscriptionEmitted, true); - done(); - }); + pubsub + .getSubscriptionsStream() + .on('error', done) + .on('data', subscription => { + subscriptionEmitted = subscription instanceof Subscription; + }) + .on('end', () => { + assert.strictEqual(subscriptionEmitted, true); + done(); + }); }); it('should allow creation and deletion of a subscription', done => { @@ -321,10 +330,9 @@ describe('pubsub', () => { const callOptions = { messageRetentionDuration: threeDaysInSeconds, topic: '', - name: '' + name: '', }; - topic.createSubscription(subName, callOptions, (err, sub) => { assert.ifError(err); @@ -333,10 +341,13 @@ describe('pubsub', () => { assert.strictEqual(metadata!.retainAckedMessages, true); assert.strictEqual( - Number(metadata!.messageRetentionDuration!.seconds), - threeDaysInSeconds); + Number(metadata!.messageRetentionDuration!.seconds), + threeDaysInSeconds + ); assert.strictEqual( - Number(metadata!.messageRetentionDuration!.nanos), 0); + Number(metadata!.messageRetentionDuration!.nanos), + 0 + ); sub!.delete(done); }); @@ -347,22 +358,23 @@ describe('pubsub', () => { const subscription = topic.subscription(generateSubName()); const threeDaysInSeconds = 3 * 24 * 60 * 60; - return subscription.create() - .then(() => { - return subscription.setMetadata({ - messageRetentionDuration: threeDaysInSeconds, - }); - }) - .then(() => { - return subscription.getMetadata(); - }) - .then(([metadata]) => { - const {seconds, nanos} = metadata.messageRetentionDuration!; - - assert.strictEqual(metadata.retainAckedMessages, true); - assert.strictEqual(Number(seconds), threeDaysInSeconds); - assert.strictEqual(Number(nanos), 0); + return subscription + .create() + .then(() => { + return subscription.setMetadata({ + messageRetentionDuration: threeDaysInSeconds, }); + }) + .then(() => { + return subscription.getMetadata(); + }) + .then(([metadata]) => { + const {seconds, nanos} = metadata.messageRetentionDuration!; + + assert.strictEqual(metadata.retainAckedMessages, true); + assert.strictEqual(Number(seconds), threeDaysInSeconds); + assert.strictEqual(Number(nanos), 0); + }); }); it('should error when using a non-existent subscription', done => { @@ -421,9 +433,9 @@ describe('pubsub', () => { const maxMessages = 3; let messageCount = 0; - const subscription = topic.subscription( - SUB_NAMES[0], - {flowControl: {maxMessages, allowExcessMessages: false}}); + const subscription = topic.subscription(SUB_NAMES[0], { + flowControl: {maxMessages, allowExcessMessages: false}, + }); subscription.on('error', done); subscription.on('message', onMessage); @@ -438,6 +450,7 @@ describe('pubsub', () => { }); // can be ran manually to test options/memory usage/etc. + // tslint:disable-next-line ban it.skip('should handle a large volume of messages', async function() { const MESSAGES = 200000; @@ -540,11 +553,13 @@ describe('pubsub', () => { }; topic.iam.setPolicy( - policy, (err: ServiceError|null, newPolicy?: Policy|null) => { - assert.ifError(err); - assert.deepStrictEqual(newPolicy!.bindings, policy.bindings); - done(); - }); + policy, + (err: ServiceError | null, newPolicy?: Policy | null) => { + assert.ifError(err); + assert.deepStrictEqual(newPolicy!.bindings, policy.bindings); + done(); + } + ); }); it('should test the iam permissions', done => { @@ -601,15 +616,16 @@ describe('pubsub', () => { it('should get a list of snapshots as a stream', done => { const snapshots = new Array(); - pubsub.getSnapshotsStream() - .on('error', done) - .on('data', snapshot => snapshots.push(snapshot)) - .on('end', () => { - assert(snapshots.length > 0); - const names = snapshots.map(getSnapshotName); - assert(names.includes(SNAPSHOT_NAME)); - done(); - }); + pubsub + .getSnapshotsStream() + .on('error', done) + .on('data', snapshot => snapshots.push(snapshot)) + .on('end', () => { + assert(snapshots.length > 0); + const names = snapshots.map(getSnapshotName); + assert(names.includes(SNAPSHOT_NAME)); + done(); + }); }); describe('seeking', () => { @@ -619,13 +635,14 @@ describe('pubsub', () => { beforeEach(() => { subscription = topic.subscription(generateSubName()); - return subscription.create() - .then(() => { - return topic.publish(Buffer.from('Hello, world!')); - }) - .then(_messageId => { - messageId = _messageId; - }); + return subscription + .create() + .then(() => { + return topic.publish(Buffer.from('Hello, world!')); + }) + .then(_messageId => { + messageId = _messageId; + }); }); it('should seek to a snapshot', done => { @@ -669,9 +686,12 @@ describe('pubsub', () => { message.ack(); if (++messageCount === 1) { - subscription.seek(message.publishTime, (err: ServiceError|null) => { - assert.ifError(err); - }); + subscription.seek( + message.publishTime, + (err: ServiceError | null) => { + assert.ifError(err); + } + ); return; } diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index 830122e02d5..c2d980e3d5c 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -36,17 +36,17 @@ describe('IAM', () => { let IAM: typeof iamTypes.IAM; let iam: iamTypes.IAM; - const PUBSUB = { + const PUBSUB = ({ options: {}, Promise: {}, request: util.noop, - } as {} as PubSub; + } as {}) as PubSub; const ID = 'id'; before(() => { IAM = proxyquire('../src/iam.js', { - '@google-cloud/promisify': fakePromisify, - }).IAM; + '@google-cloud/promisify': fakePromisify, + }).IAM; }); beforeEach(() => { @@ -64,14 +64,14 @@ describe('IAM', () => { it('should localize pubsub#request', () => { const fakeRequest = () => {}; - const fakePubsub = { + const fakePubsub = ({ request: { bind(context: PubSub) { assert.strictEqual(context, fakePubsub); return fakeRequest; }, }, - } as {} as PubSub; + } as {}) as PubSub; const iam = new IAM(fakePubsub, ID); assert.strictEqual(iam.request, fakeRequest); @@ -88,7 +88,7 @@ describe('IAM', () => { describe('getPolicy', () => { it('should make the correct API request', done => { - iam.request = (config) => { + iam.request = config => { const reqOpts = {resource: iam.id}; assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getIamPolicy'); @@ -123,7 +123,7 @@ describe('IAM', () => { }); it('should make the correct API request', done => { - iam.request = (config) => { + iam.request = config => { const reqOpts = {resource: iam.id, policy}; assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'setIamPolicy'); diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 328f4e3ec61..583dac8545e 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -30,12 +30,11 @@ import * as subby from '../src/subscription'; import {Topic} from '../src/topic'; import * as util from '../src/util'; - const PKG = require('../../package.json'); const sandbox = sinon.createSandbox(); const fakeCreds = {}; const fakeGoogleGax = { - GrpcClient: class extends gax.GrpcClient{ + GrpcClient: class extends gax.GrpcClient { constructor(opts: gax.GrpcClientOptions) { super(opts); this.grpc = { @@ -55,8 +54,10 @@ const subscriptionCached = subby.Subscription; let subscriptionOverride: any; function Subscription( - pubsub: pubsubTypes.PubSub, name: string, - options: subby.SubscriptionOptions) { + pubsub: pubsubTypes.PubSub, + name: string, + options: subby.SubscriptionOptions +) { const overrideFn = subscriptionOverride || subscriptionCached; return new overrideFn(pubsub, name, options); } @@ -64,9 +65,10 @@ function Subscription( let promisified = false; const fakePromisify = Object.assign({}, promisify, { promisifyAll( - // tslint:disable-next-line variable-name - Class: typeof pubsubTypes.PubSub, - options: promisify.PromisifyAllOptions) { + // tslint:disable-next-line variable-name + Class: typeof pubsubTypes.PubSub, + options: promisify.PromisifyAllOptions + ) { if (Class.name !== 'PubSub') { return; } @@ -124,7 +126,7 @@ const fakePaginator = { }, }; -let googleAuthOverride: Function|null; +let googleAuthOverride: Function | null; function fakeGoogleAuth() { return (googleAuthOverride || util.noop).apply(null, arguments); } @@ -165,22 +167,22 @@ describe('PubSub', () => { before(() => { delete process.env.PUBSUB_EMULATOR_HOST; PubSub = proxyquire('../src/pubsub', { - '@google-cloud/paginator': { - paginator: fakePaginator, - }, - '@google-cloud/promisify': fakePromisify, - '@google-cloud/projectify': { - replaceProjectIdToken: fakePjy, - }, - 'google-auth-library': { - GoogleAuth: fakeGoogleAuth, - }, - 'google-gax': fakeGoogleGax, - './snapshot': {Snapshot: FakeSnapshot}, - './subscription': {Subscription}, - './topic': {Topic: FakeTopic}, - './v1': v1Override, - }).PubSub; + '@google-cloud/paginator': { + paginator: fakePaginator, + }, + '@google-cloud/promisify': fakePromisify, + '@google-cloud/projectify': { + replaceProjectIdToken: fakePjy, + }, + 'google-auth-library': { + GoogleAuth: fakeGoogleAuth, + }, + 'google-gax': fakeGoogleGax, + './snapshot': {Snapshot: FakeSnapshot}, + './subscription': {Subscription}, + './topic': {Topic: FakeTopic}, + './v1': v1Override, + }).PubSub; }); after(() => { @@ -207,7 +209,7 @@ describe('PubSub', () => { }; it('should extend the correct methods', () => { - assert(extended); // See `fakePaginator.extend` + assert(extended); // See `fakePaginator.extend` }); it('should streamify the correct methods', () => { @@ -299,9 +301,9 @@ describe('PubSub', () => { describe('createSubscription', () => { const TOPIC_NAME = 'topic'; pubsub = new pubsubTypes.PubSub({}); - const TOPIC = Object.assign(new FakeTopic(), { + const TOPIC = (Object.assign(new FakeTopic(), { name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, - }) as {} as Topic; + }) as {}) as Topic; const SUB_NAME = 'subscription'; const SUBSCRIPTION = { @@ -312,13 +314,12 @@ describe('PubSub', () => { name: 'subscription-name', }; - - beforeEach(() => { - (Subscription as {} as typeof subby.Subscription).formatMetadata_ = - (metadata: subby.SubscriptionMetadata) => { - return Object.assign({}, metadata) as subby.SubscriptionMetadata; - }; + ((Subscription as {}) as typeof subby.Subscription).formatMetadata_ = ( + metadata: subby.SubscriptionMetadata + ) => { + return Object.assign({}, metadata) as subby.SubscriptionMetadata; + }; }); it('should throw if no Topic is provided', () => { @@ -393,7 +394,6 @@ describe('PubSub', () => { } as subby.Subscription; }; - const reqOpts = {topic: TOPIC.name, name: SUB_NAME}; pubsub.request = config => { @@ -413,8 +413,10 @@ describe('PubSub', () => { pushEndpoint: 'https://domain/push', }; - const expectedBody = - Object.assign({topic: TOPIC.name, name: SUB_NAME}, options); + const expectedBody = Object.assign( + {topic: TOPIC.name, name: SUB_NAME}, + options + ); pubsub.topic = () => { return { @@ -428,7 +430,6 @@ describe('PubSub', () => { } as subby.Subscription; }; - pubsub.request = config => { assert.notStrictEqual(config.reqOpts, options); assert.deepStrictEqual(config.reqOpts, expectedBody); @@ -475,11 +476,12 @@ describe('PubSub', () => { a: 'a', }; - (Subscription as {} as typeof subby.Subscription).formatMetadata_ = - (metadata: subby.SubscriptionMetadata) => { - assert.deepStrictEqual(metadata, fakeMetadata); - return formatted as {} as subby.SubscriptionMetadata; - }; + ((Subscription as {}) as typeof subby.Subscription).formatMetadata_ = ( + metadata: subby.SubscriptionMetadata + ) => { + assert.deepStrictEqual(metadata, fakeMetadata); + return (formatted as {}) as subby.SubscriptionMetadata; + }; pubsub.request = (config: pubsubTypes.RequestConfig) => { assert.strictEqual(config.reqOpts, formatted); @@ -505,8 +507,10 @@ describe('PubSub', () => { }; function callback( - err?: Error|null, sub?: subby.Subscription|null, - resp?: google.pubsub.v1.ISubscription|null) { + err?: Error | null, + sub?: subby.Subscription | null, + resp?: google.pubsub.v1.ISubscription | null + ) { assert.strictEqual(err, error); assert.strictEqual(sub, null); assert.strictEqual(resp, apiResponse); @@ -537,8 +541,10 @@ describe('PubSub', () => { }; function callback( - err?: Error|null, sub?: subby.Subscription|null, - resp?: google.pubsub.v1.ISubscription|null) { + err?: Error | null, + sub?: subby.Subscription | null, + resp?: google.pubsub.v1.ISubscription | null + ) { assert.ifError(err); assert.strictEqual(sub, subscription); assert.strictEqual(resp, apiResponse); @@ -565,8 +571,6 @@ describe('PubSub', () => { } as Topic; }; - - pubsub.request = config => { assert.strictEqual(config.client, 'PublisherClient'); assert.strictEqual(config.method, 'createTopic'); @@ -721,24 +725,25 @@ describe('PubSub', () => { }); it('should build the right request', done => { - const options = { + const options = ({ a: 'b', c: 'd', gaxOpts: { e: 'f', }, autoPaginate: false, - } as {} as pubsubTypes.PageOptions; + } as {}) as pubsubTypes.PageOptions; const expectedOptions = Object.assign({}, options, { project: 'projects/' + pubsub.projectId, }); const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; @@ -807,18 +812,19 @@ describe('PubSub', () => { }); it('should pass the correct arguments to the API', done => { - const options = { + const options = ({ gaxOpts: { a: 'b', }, autoPaginate: false, - } as {} as pubsubTypes.GetSubscriptionsOptions; + } as {}) as pubsubTypes.GetSubscriptionsOptions; const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); const project = 'projects/' + pubsub.projectId; @@ -850,12 +856,15 @@ describe('PubSub', () => { it('should return Subscription instances', done => { pubsub.getSubscriptions( - (err: ServiceError|null, - subscriptions?: subby.Subscription[]|null) => { - assert.ifError(err); - assert(subscriptions![0] instanceof subscriptionCached); - done(); - }); + ( + err: ServiceError | null, + subscriptions?: subby.Subscription[] | null + ) => { + assert.ifError(err); + assert(subscriptions![0] instanceof subscriptionCached); + done(); + } + ); }); it('should pass back all params', done => { @@ -864,19 +873,22 @@ describe('PubSub', () => { const nextQuery_ = {}; const apiResponse_ = {}; - pubsub.request = (config, callback: Function) => { callback(err_, subs_, nextQuery_, apiResponse_); }; pubsub.getSubscriptions( - (err: ServiceError|null, subs?: subby.Subscription[]|null, - apiResponse?: google.pubsub.v1.IListSubscriptionsResponse|null) => { - assert.strictEqual(err, err_); - assert.deepStrictEqual(subs, subs_); - assert.strictEqual(apiResponse, nextQuery_); - done(); - }); + ( + err: ServiceError | null, + subs?: subby.Subscription[] | null, + apiResponse?: google.pubsub.v1.IListSubscriptionsResponse | null + ) => { + assert.strictEqual(err, err_); + assert.deepStrictEqual(subs, subs_); + assert.strictEqual(apiResponse, nextQuery_); + done(); + } + ); }); describe('with topic', () => { @@ -885,9 +897,9 @@ describe('PubSub', () => { it('should call topic.getSubscriptions', done => { const topic = new FakeTopic(); - const opts = { + const opts = ({ topic, - } as {} as pubsubTypes.GetSubscriptionsOptions; + } as {}) as pubsubTypes.GetSubscriptionsOptions; topic.getSubscriptions = (options: pubsubTypes.PageOptions) => { assert.strictEqual(options, opts); @@ -898,9 +910,9 @@ describe('PubSub', () => { }); it('should create a topic instance from a name', done => { - const opts = { + const opts = ({ topic: TOPIC_NAME, - } as {} as pubsubTypes.GetSubscriptionsOptions; + } as {}) as pubsubTypes.GetSubscriptionsOptions; const fakeTopic = { getSubscriptions(options: pubsubTypes.PageOptions) { @@ -938,24 +950,25 @@ describe('PubSub', () => { }); it('should build the right request', done => { - const options = { + const options = ({ a: 'b', c: 'd', gaxOpts: { e: 'f', }, autoPaginate: false, - } as {} as pubsubTypes.PageOptions; + } as {}) as pubsubTypes.PageOptions; const expectedOptions = Object.assign({}, options, { project: 'projects/' + pubsub.projectId, }); const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; @@ -979,7 +992,6 @@ describe('PubSub', () => { return topic as Topic; }; - pubsub.getTopics((err, topics) => { assert.ifError(err); assert.strictEqual(topics![0], topic); @@ -1022,7 +1034,7 @@ describe('PubSub', () => { sandbox.stub(pubsub, 'auth').value({ getProjectId: (callback: Function) => { callback(null, PROJECT_ID); - } + }, }); // tslint:disable-next-line no-any @@ -1046,7 +1058,7 @@ describe('PubSub', () => { callback(expectedError); }; - pubsub.request(CONFIG, (err: ServiceError|null) => { + pubsub.request(CONFIG, (err: ServiceError | null) => { assert.strictEqual(expectedError, err); done(); }); @@ -1079,9 +1091,9 @@ describe('PubSub', () => { describe('getClient_', () => { const FAKE_CLIENT_INSTANCE = class {}; - const CONFIG = { + const CONFIG = ({ client: 'FakeClient', - } as {} as pubsubTypes.GetClientConfig; + } as {}) as pubsubTypes.GetClientConfig; beforeEach(() => { sandbox.stub(pubsub, 'auth').value({getProjectId: () => util.noop}); @@ -1100,10 +1112,9 @@ describe('PubSub', () => { getProjectId: (callback: Function) => { assert.strictEqual(typeof callback, 'function'); callback(null, PROJECT_ID); - } + }, }); - pubsub.getClient_(CONFIG, err => { assert.ifError(err); assert.strictEqual(pubsub.projectId, PROJECT_ID); @@ -1118,7 +1129,7 @@ describe('PubSub', () => { sandbox.stub(pubsub, 'auth').value({ getProjectId: () => { done(); - } + }, }); pubsub.getClient_(CONFIG, assert.ifError); @@ -1183,7 +1194,8 @@ describe('PubSub', () => { it('should return the correct client', done => { // tslint:disable-next-line only-arrow-functions no-any v1ClientOverrides.FakeClient = function( - options: pubsubTypes.ClientConfig) { + options: pubsubTypes.ClientConfig + ) { assert.strictEqual(options, pubsub.options); return FAKE_CLIENT_INSTANCE; }; @@ -1235,7 +1247,7 @@ describe('PubSub', () => { callback(error); }; - pubsub.request(CONFIG, (err: ServiceError|null) => { + pubsub.request(CONFIG, (err: ServiceError | null) => { assert.strictEqual(err, error); done(); }); @@ -1253,12 +1265,12 @@ describe('PubSub', () => { }); it('should call the client method correctly', done => { - const CONFIG = { + const CONFIG = ({ client: 'FakeClient', method: 'fakeMethod', reqOpts: {a: 'a'}, gaxOpts: {}, - } as {} as pubsubTypes.RequestConfig; + } as {}) as pubsubTypes.RequestConfig; const replacedReqOpts = {}; @@ -1294,7 +1306,7 @@ describe('PubSub', () => { it('should return a Snapshot object', () => { const SNAPSHOT_NAME = 'new-snapshot'; const snapshot = pubsub.snapshot(SNAPSHOT_NAME); - const args = (snapshot as {} as FakeSnapshot).calledWith_; + const args = ((snapshot as {}) as FakeSnapshot).calledWith_; assert(snapshot instanceof FakeSnapshot); assert.strictEqual(args[0], pubsub); @@ -1316,7 +1328,9 @@ describe('PubSub', () => { it('should pass specified name to the Subscription', done => { // tslint:disable-next-line only-arrow-functions subscriptionOverride = function( - pubsub: pubsubTypes.PubSub, name: string) { + pubsub: pubsubTypes.PubSub, + name: string + ) { assert.strictEqual(name, SUB_NAME); done(); }; @@ -1326,8 +1340,10 @@ describe('PubSub', () => { it('should honor settings', done => { // tslint:disable-next-line only-arrow-functions subscriptionOverride = function( - pubsub: pubsubTypes.PubSub, name: string, - options: subby.SubscriptionOptions) { + pubsub: pubsubTypes.PubSub, + name: string, + options: subby.SubscriptionOptions + ) { assert.strictEqual(options, CONFIG); done(); }; @@ -1359,7 +1375,7 @@ describe('PubSub', () => { const fakeOptions = {}; const topic = pubsub.topic(fakeName, fakeOptions); - const [ps, name, options] = (topic as {} as FakeTopic).calledWith_; + const [ps, name, options] = ((topic as {}) as FakeTopic).calledWith_; assert.strictEqual(ps, pubsub); assert.strictEqual(name, fakeName); diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 1d6b0cfabea..dba9c6a26e0 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -24,7 +24,7 @@ import {Message, Subscriber} from '../src/subscriber'; const FREE_MEM = 9376387072; const fakeos = { - freemem: () => FREE_MEM + freemem: () => FREE_MEM, }; class FakeSubscriber extends EventEmitter { @@ -54,14 +54,13 @@ describe('LeaseManager', () => { before(() => { LeaseManager = proxyquire('../src/lease-manager.js', { - 'os': fakeos, - '../src/subscriber': - {Subscriber: FakeSubscriber, Message: FakeMessage} - }).LeaseManager; + os: fakeos, + '../src/subscriber': {Subscriber: FakeSubscriber, Message: FakeMessage}, + }).LeaseManager; }); beforeEach(() => { - subscriber = new FakeSubscriber() as {} as Subscriber; + subscriber = (new FakeSubscriber() as {}) as Subscriber; leaseManager = new LeaseManager(subscriber); }); @@ -189,15 +188,16 @@ describe('LeaseManager', () => { sandbox.stub(global.Math, 'random').returns(random); clock = sandbox.useFakeTimers(); expectedTimeout = - ((subscriber.ackDeadline * 1000) * 0.9 - subscriber.modAckLatency) * - random; + (subscriber.ackDeadline * 1000 * 0.9 - subscriber.modAckLatency) * + random; halfway = expectedTimeout / 2; }); it('should schedule a lease extension', () => { const message = new FakeMessage() as Message; - const stub = - sandbox.stub(message, 'modAck').withArgs(subscriber.ackDeadline); + const stub = sandbox + .stub(message, 'modAck') + .withArgs(subscriber.ackDeadline); leaseManager.add(message); clock.tick(expectedTimeout); @@ -253,8 +253,9 @@ describe('LeaseManager', () => { it('should continuously extend the deadlines', () => { const message = new FakeMessage(); - const stub = - sandbox.stub(message, 'modAck').withArgs(subscriber.ackDeadline); + const stub = sandbox + .stub(message, 'modAck') + .withArgs(subscriber.ackDeadline); leaseManager.add(message as Message); clock.tick(expectedTimeout); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index c7ab64472dd..b95979e4710 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -28,12 +28,17 @@ import {Message, Subscriber} from '../src/subscriber'; class FakeClient { async acknowledge( - reqOpts: {subscription: string, ackIds: string[]}, - callOptions: CallOptions): Promise {} + reqOpts: {subscription: string; ackIds: string[]}, + callOptions: CallOptions + ): Promise {} async modifyAckDeadline( - reqOpts: - {subscription: string, ackIds: string[], ackDeadlineSeconds: number}, - callOptions: CallOptions): Promise {} + reqOpts: { + subscription: string; + ackIds: string[]; + ackDeadlineSeconds: number; + }, + callOptions: CallOptions + ): Promise {} } class FakeSubscriber extends EventEmitter { @@ -78,7 +83,7 @@ describe('MessageQueues', () => { type QueuedMessages = Array<[string, number?]>; MessageQueue = class MessageQueue extends queues.MessageQueue { - batches = ([] as QueuedMessages[]); + batches = [] as QueuedMessages[]; protected async _sendBatch(batch: QueuedMessages): Promise { this.batches.push(batch); } @@ -274,7 +279,7 @@ describe('MessageQueues', () => { let ackQueue: messageTypes.AckQueue; beforeEach(() => { - ackQueue = new AckQueue(subscriber as {} as Subscriber); + ackQueue = new AckQueue((subscriber as {}) as Subscriber); }); it('should send batches via Client#acknowledge', async () => { @@ -321,8 +326,7 @@ describe('MessageQueues', () => { fakeError.code = 2; fakeError.metadata = new Metadata(); - const expectedMessage = - `Failed to "acknowledge" for 3 message(s). Reason: Err.`; + const expectedMessage = `Failed to "acknowledge" for 3 message(s). Reason: Err.`; sandbox.stub(subscriber.client, 'acknowledge').rejects(fakeError); @@ -343,7 +347,7 @@ describe('MessageQueues', () => { let modAckQueue: messageTypes.ModAckQueue; beforeEach(() => { - modAckQueue = new ModAckQueue(subscriber as {} as Subscriber); + modAckQueue = new ModAckQueue((subscriber as {}) as Subscriber); }); it('should send batches via Client#modifyAckDeadline', async () => { @@ -354,8 +358,9 @@ describe('MessageQueues', () => { new FakeMessage(), ]; - const stub = - sandbox.stub(subscriber.client, 'modifyAckDeadline').resolves(); + const stub = sandbox + .stub(subscriber.client, 'modifyAckDeadline') + .resolves(); const expectedReqOpts = { subscription: subscriber.name, @@ -363,8 +368,9 @@ describe('MessageQueues', () => { ackIds: messages.map(({ackId}) => ackId), }; - messages.forEach( - message => modAckQueue.add(message as Message, deadline)); + messages.forEach(message => + modAckQueue.add(message as Message, deadline) + ); await modAckQueue.flush(); const [reqOpts] = stub.lastCall.args; @@ -375,13 +381,20 @@ describe('MessageQueues', () => { const deadline1 = 600; const deadline2 = 1000; - const messages1 = - [new FakeMessage(), new FakeMessage(), new FakeMessage()]; - const messages2 = - [new FakeMessage(), new FakeMessage(), new FakeMessage()]; + const messages1 = [ + new FakeMessage(), + new FakeMessage(), + new FakeMessage(), + ]; + const messages2 = [ + new FakeMessage(), + new FakeMessage(), + new FakeMessage(), + ]; - const stub = - sandbox.stub(subscriber.client, 'modifyAckDeadline').resolves(); + const stub = sandbox + .stub(subscriber.client, 'modifyAckDeadline') + .resolves(); const expectedReqOpts1 = { subscription: subscriber.name, @@ -395,10 +408,12 @@ describe('MessageQueues', () => { ackIds: messages2.map(({ackId}) => ackId), }; - messages1.forEach( - message => modAckQueue.add(message as Message, deadline1)); - messages2.forEach( - message => modAckQueue.add(message as Message, deadline2)); + messages1.forEach(message => + modAckQueue.add(message as Message, deadline1) + ); + messages2.forEach(message => + modAckQueue.add(message as Message, deadline2) + ); await modAckQueue.flush(); const [reqOpts1] = stub.getCall(0).args; @@ -410,8 +425,9 @@ describe('MessageQueues', () => { it('should send call options', async () => { const fakeCallOptions = {timeout: 10000}; - const stub = - sandbox.stub(subscriber.client, 'modifyAckDeadline').resolves(); + const stub = sandbox + .stub(subscriber.client, 'modifyAckDeadline') + .resolves(); modAckQueue.setOptions({callOptions: fakeCallOptions}); modAckQueue.add(new FakeMessage() as Message, 10); @@ -434,8 +450,7 @@ describe('MessageQueues', () => { fakeError.code = 2; fakeError.metadata = new Metadata(); - const expectedMessage = - `Failed to "modifyAckDeadline" for 3 message(s). Reason: Err.`; + const expectedMessage = `Failed to "modifyAckDeadline" for 3 message(s). Reason: Err.`; sandbox.stub(subscriber.client, 'modifyAckDeadline').rejects(fakeError); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 081013fec4d..e0754b22288 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -30,10 +30,10 @@ const FAKE_CLIENT_CONFIG = { methods: { StreamingPull: { timeout_millis: FAKE_STREAMING_PULL_TIMEOUT, - } - } - } - } + }, + }, + }, + }, }; // just need this for unit tests.. we have a ponyfill for destroy on @@ -117,7 +117,7 @@ class FakeGaxClient { class FakeGrpcClient { deadline?: number; - streams = ([] as FakeGrpcStream[]); + streams = [] as FakeGrpcStream[]; streamingPull(options: StreamingPullOptions): FakeGrpcStream { const stream = new FakeGrpcStream(options); this.streams.push(stream); @@ -157,9 +157,9 @@ describe('MessageStream', () => { before(() => { MessageStream = proxyquire('../src/message-stream.js', { - 'stream': {PassThrough: FakePassThrough}, - './v1/subscriber_client_config.json': FAKE_CLIENT_CONFIG, - }).MessageStream; + stream: {PassThrough: FakePassThrough}, + './v1/subscriber_client_config.json': FAKE_CLIENT_CONFIG, + }).MessageStream; }); beforeEach(() => { @@ -167,8 +167,8 @@ describe('MessageStream', () => { sandbox.stub(global.Date, 'now').returns(now); const gaxClient = new FakeGaxClient(); - client = gaxClient.client; // we hit the grpc client directly - subscriber = new FakeSubscriber(gaxClient) as {} as Subscriber; + client = gaxClient.client; // we hit the grpc client directly + subscriber = (new FakeSubscriber(gaxClient) as {}) as Subscriber; messageStream = new MessageStream(subscriber); }); @@ -184,7 +184,9 @@ describe('MessageStream', () => { highWaterMark: 0, }; assert.deepStrictEqual( - (messageStream as {} as FakePassThrough).options, expectedOptions); + ((messageStream as {}) as FakePassThrough).options, + expectedOptions + ); }); it('should respect the highWaterMark option', () => { @@ -197,7 +199,9 @@ describe('MessageStream', () => { }; assert.deepStrictEqual( - (ms as {} as FakePassThrough).options, expectedOptions); + ((ms as {}) as FakePassThrough).options, + expectedOptions + ); }); it('should set destroyed to false', () => { @@ -247,7 +251,9 @@ describe('MessageStream', () => { assert.strictEqual(client.streams.length, 5); client.streams.forEach(stream => { assert.strictEqual( - stream._readableState.highWaterMark, highWaterMark); + stream._readableState.highWaterMark, + highWaterMark + ); }); done(); }); @@ -296,12 +302,13 @@ describe('MessageStream', () => { describe('destroy', () => { it('should noop if already destroyed', done => { - const stub = sandbox.stub(FakePassThrough.prototype, 'destroy') - .callsFake(function(this: Duplex) { - if (this === messageStream) { - done(); - } - }); + const stub = sandbox + .stub(FakePassThrough.prototype, 'destroy') + .callsFake(function(this: Duplex) { + if (this === messageStream) { + done(); + } + }); messageStream.destroy(); messageStream.destroy(); @@ -320,7 +327,7 @@ describe('MessageStream', () => { }); messageStream.destroy(); - clock.tick(frequency * 2); // for good measure + clock.tick(frequency * 2); // for good measure stubs.forEach(stub => { assert.strictEqual(stub.callCount, 0); @@ -350,7 +357,7 @@ describe('MessageStream', () => { before(() => { destroy = FakePassThrough.prototype.destroy; // tslint:disable-next-line no-any - FakePassThrough.prototype.destroy = (false as any); + FakePassThrough.prototype.destroy = false as any; }); after(() => { @@ -381,20 +388,23 @@ describe('MessageStream', () => { const fakeResponses = [{}, {}, {}, {}, {}]; const received: object[] = []; - messageStream.on('data', (chunk: Buffer) => received.push(chunk)) - .on('end', () => { - assert.deepStrictEqual(received, fakeResponses); - done(); - }); + messageStream + .on('data', (chunk: Buffer) => received.push(chunk)) + .on('end', () => { + assert.deepStrictEqual(received, fakeResponses); + done(); + }); client.streams.forEach((stream, i) => stream.push(fakeResponses[i])); setImmediate(() => messageStream.end()); }); it('should not end the message stream', done => { - messageStream.on('data', () => {}).on('end', () => { - done(new Error('Should not be called.')); - }); + messageStream + .on('data', () => {}) + .on('end', () => { + done(new Error('Should not be called.')); + }); client.streams.forEach(stream => stream.push(null)); setImmediate(done); diff --git a/handwritten/pubsub/test/publisher.ts b/handwritten/pubsub/test/publisher.ts index 2d4e7a4613c..0e9966f97a7 100644 --- a/handwritten/pubsub/test/publisher.ts +++ b/handwritten/pubsub/test/publisher.ts @@ -26,11 +26,15 @@ import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { promisifyAll( - // tslint:disable-next-line variable-name - Class: typeof publishTypes.Publisher, options: pfy.PromisifyAllOptions) { + // tslint:disable-next-line variable-name + Class: typeof publishTypes.Publisher, + options: pfy.PromisifyAllOptions + ) { if (Class.name === 'Publisher') { - assert.deepStrictEqual( - options, {singular: true, exclude: ['setOptions']}); + assert.deepStrictEqual(options, { + singular: true, + exclude: ['setOptions'], + }); promisified = true; } }, @@ -46,16 +50,16 @@ describe('Publisher', () => { const TOPIC_NAME = 'test-topic'; - const TOPIC = { + const TOPIC = ({ name: TOPIC_NAME, Promise: {}, request: util.noop, - } as {} as Topic; + } as {}) as Topic; before(() => { Publisher = proxyquire('../src/publisher.js', { - '@google-cloud/promisify': fakePromisify, - }).Publisher; + '@google-cloud/promisify': fakePromisify, + }).Publisher; }); beforeEach(() => { @@ -147,23 +151,25 @@ describe('Publisher', () => { }); it('should queue the data', done => { - sandbox.stub(publisher, 'queue_') - .callsFake((data, attrs, callback: Function) => { - assert.strictEqual(data, DATA); - assert.strictEqual(attrs, ATTRS); - callback(); // the done fn - }); + sandbox + .stub(publisher, 'queue_') + .callsFake((data, attrs, callback: Function) => { + assert.strictEqual(data, DATA); + assert.strictEqual(attrs, ATTRS); + callback(); // the done fn + }); publisher.publish(DATA, ATTRS, done); }); it('should optionally accept attributes', done => { - sandbox.stub(publisher, 'queue_') - .callsFake((data, attrs, callback: Function) => { - assert.strictEqual(data, DATA); - assert.deepStrictEqual(attrs, {}); - callback(); // the done fn - }); + sandbox + .stub(publisher, 'queue_') + .callsFake((data, attrs, callback: Function) => { + assert.strictEqual(data, DATA); + assert.deepStrictEqual(attrs, {}); + callback(); // the done fn + }); publisher.publish(DATA, done); }); @@ -175,43 +181,43 @@ describe('Publisher', () => { publisher.inventory_.bytes = 0; }; - sandbox.stub(publisher, 'queue_') - .callsFake((data, attrs, callback: Function) => { - assert.strictEqual(publisher.inventory_.bytes, 0); - queueCalled = true; - callback(); // the done fn - }); + sandbox + .stub(publisher, 'queue_') + .callsFake((data, attrs, callback: Function) => { + assert.strictEqual(publisher.inventory_.bytes, 0); + queueCalled = true; + callback(); // the done fn + }); publisher.inventory_.bytes = batchOpts.maxBytes! - 1; publisher.publish(DATA, done); }); - it('should not attempt to publish empty payload if data puts payload above size cap', - done => { - const pushRequests: Array<{}> = []; - publisher.settings.batching!.maxBytes = 2; - publisher.inventory_.bytes = 0; - - publisher.publish_ = () => { - assert.notStrictEqual(publisher.inventory_.queued.length, 0); - pushRequests.push(publisher.inventory_.queued); - publisher.inventory_.callbacks.forEach((callback: Function) => { - callback(); - }); - }; - - publisher.publish(DATA, () => { - assert.deepStrictEqual(pushRequests, [ - [ - { - data: DATA, - attributes: {}, - }, - ], - ]); - done(); - }); - }); + it('should not attempt to publish empty payload if data puts payload above size cap', done => { + const pushRequests: Array<{}> = []; + publisher.settings.batching!.maxBytes = 2; + publisher.inventory_.bytes = 0; + + publisher.publish_ = () => { + assert.notStrictEqual(publisher.inventory_.queued.length, 0); + pushRequests.push(publisher.inventory_.queued); + publisher.inventory_.callbacks.forEach((callback: Function) => { + callback(); + }); + }; + + publisher.publish(DATA, () => { + assert.deepStrictEqual(pushRequests, [ + [ + { + data: DATA, + attributes: {}, + }, + ], + ]); + done(); + }); + }); it('should publish if data puts payload at size cap', done => { sandbox.stub(publisher, 'queue_').callsFake(() => { @@ -245,13 +251,13 @@ describe('Publisher', () => { // tslint:disable-next-line no-any (global as any).setTimeout = - // tslint:disable-next-line no-any - (callback: (...args: any[]) => void, duration: number) => { - assert.strictEqual(duration, batchOpts.maxMilliseconds); - global.setTimeout = globalSetTimeout; - setImmediate(callback); - return fakeTimeoutHandle; - }; + // tslint:disable-next-line no-any + (callback: (...args: any[]) => void, duration: number) => { + assert.strictEqual(duration, batchOpts.maxMilliseconds); + global.setTimeout = globalSetTimeout; + setImmediate(callback); + return fakeTimeoutHandle; + }; publisher.publish_ = done; publisher.publish(DATA, util.noop); diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 098da790e1c..fa8b40ba318 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -43,23 +43,22 @@ describe('Snapshot', () => { const SNAPSHOT_NAME = 'a'; const PROJECT_ID = 'grape-spaceship-123'; - const PUBSUB = { + const PUBSUB = ({ projectId: PROJECT_ID, - } as {} as PubSub; + } as {}) as PubSub; - const SUBSCRIPTION = { + const SUBSCRIPTION = ({ projectId: PROJECT_ID, pubsub: PUBSUB, api: {}, createSnapshot() {}, seek() {}, - } as {} as Subscription; - + } as {}) as Subscription; before(() => { Snapshot = proxyquire('../src/snapshot', { - '@google-cloud/promisify': fakePromisify, - }).Snapshot; + '@google-cloud/promisify': fakePromisify, + }).Snapshot; }); const sandbox = sinon.createSandbox(); @@ -136,12 +135,13 @@ describe('Snapshot', () => { it('should call createSnapshot', done => { const fakeOpts = {}; - sandbox.stub(subscription, 'createSnapshot') - .callsFake((name, options) => { - assert.strictEqual(name, FULL_SNAPSHOT_NAME); - assert.strictEqual(options, fakeOpts); - done(); - }); + sandbox + .stub(subscription, 'createSnapshot') + .callsFake((name, options) => { + assert.strictEqual(name, FULL_SNAPSHOT_NAME); + assert.strictEqual(options, fakeOpts); + done(); + }); snapshot.create(fakeOpts, assert.ifError); }); @@ -180,7 +180,7 @@ describe('Snapshot', () => { }); it('should call the seek method', done => { - sandbox.stub(subscription, 'seek').callsFake((snapshot) => { + sandbox.stub(subscription, 'seek').callsFake(snapshot => { assert.strictEqual(snapshot, FULL_SNAPSHOT_NAME); done(); }); @@ -196,14 +196,16 @@ describe('Snapshot', () => { it('should throw on create method', () => { assert.throws( - () => snapshot.create(), - /This is only available if you accessed this object through Subscription#snapshot/); + () => snapshot.create(), + /This is only available if you accessed this object through Subscription#snapshot/ + ); }); it('should throw on seek method', () => { assert.throws( - () => snapshot.seek(), - /This is only available if you accessed this object through Subscription#snapshot/); + () => snapshot.seek(), + /This is only available if you accessed this object through Subscription#snapshot/ + ); }); }); }); @@ -228,7 +230,7 @@ describe('Snapshot', () => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'deleteSnapshot'); assert.deepStrictEqual(config.reqOpts, {snapshot: snapshot.name}); - callback(); // the done fn + callback(); // the done fn }; snapshot.delete(done); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 4e17999347b..ba2dde92bed 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -29,7 +29,6 @@ import {MessageStreamOptions} from '../src/message-stream'; import * as s from '../src/subscriber'; import {Subscription} from '../src/subscription'; - const stubs = new Map(); class FakeClient {} @@ -39,7 +38,7 @@ interface ClientOptions { } interface ClientCallback { - (error: null|Error, client: FakeClient): void; + (error: null | Error, client: FakeClient): void; } class FakePubSub { @@ -131,8 +130,8 @@ const RECEIVED_MESSAGE = { data: Buffer.from('Hello, world!'), messageId: uuid.v4(), orderingKey: 'ordering-key', - publishTime: {seconds: 12, nanos: 32} - } + publishTime: {seconds: 12, nanos: 32}, + }, }; describe('Subscriber', () => { @@ -140,7 +139,6 @@ describe('Subscriber', () => { const fakeProjectify = {replaceProjectIdToken: sandbox.stub()}; - let subscription: Subscription; // tslint:disable-next-line variable-name @@ -156,8 +154,10 @@ describe('Subscriber', () => { '@google-cloud/projectify': fakeProjectify, './histogram': {Histogram: FakeHistogram}, './lease-manager': {LeaseManager: FakeLeaseManager}, - './message-queues': - {AckQueue: FakeAckQueue, ModAckQueue: FakeModAckQueue}, + './message-queues': { + AckQueue: FakeAckQueue, + ModAckQueue: FakeModAckQueue, + }, './message-stream': {MessageStream: FakeMessageStream}, }); @@ -166,7 +166,7 @@ describe('Subscriber', () => { }); beforeEach(() => { - subscription = new FakeSubscription() as {} as Subscription; + subscription = (new FakeSubscription() as {}) as Subscription; subscriber = new Subscriber(subscription); message = new Message(subscriber, RECEIVED_MESSAGE); subscriber.open(); @@ -202,7 +202,10 @@ describe('Subscriber', () => { const latencies: FakeHistogram = stubs.get('latencies'); const fakeLatency = 234; - sandbox.stub(latencies, 'percentile').withArgs(99).returns(fakeLatency); + sandbox + .stub(latencies, 'percentile') + .withArgs(99) + .returns(fakeLatency); const maxMilliseconds = stubs.get('modAckQueue').maxMilliseconds; const expectedLatency = fakeLatency * 1000 + maxMilliseconds; @@ -216,8 +219,8 @@ describe('Subscriber', () => { const fakeName = 'abcd'; fakeProjectify.replaceProjectIdToken - .withArgs(subscription.name, subscription.projectId) - .returns(fakeName); + .withArgs(subscription.name, subscription.projectId) + .returns(fakeName); const name = subscriber.name; assert.strictEqual(name, fakeName); @@ -226,8 +229,8 @@ describe('Subscriber', () => { it('should cache the name', () => { const fakeName = 'abcd'; const stub = fakeProjectify.replaceProjectIdToken - .withArgs(subscription.name, subscription.projectId) - .returns(fakeName); + .withArgs(subscription.name, subscription.projectId) + .returns(fakeName); const name = subscriber.name; assert.strictEqual(name, fakeName); @@ -251,7 +254,10 @@ describe('Subscriber', () => { const fakeDeadline = 312123; - sandbox.stub(histogram, 'percentile').withArgs(99).returns(fakeDeadline); + sandbox + .stub(histogram, 'percentile') + .withArgs(99) + .returns(fakeDeadline); subscriber.ack(message); @@ -287,10 +293,13 @@ describe('Subscriber', () => { const onFlushStub = sandbox.stub(ackQueue, 'onFlush').resolves(); - sandbox.stub(inventory, 'remove').withArgs(message).callsFake(() => { - assert.strictEqual(onFlushStub.callCount, 1); - done(); - }); + sandbox + .stub(inventory, 'remove') + .withArgs(message) + .callsFake(() => { + assert.strictEqual(onFlushStub.callCount, 1); + done(); + }); subscriber.ack(message); }); @@ -301,8 +310,9 @@ describe('Subscriber', () => { const s = new Subscriber(subscription); const stream: FakeMessageStream = stubs.get('messageStream'); - sandbox.stub(stream, 'destroy') - .rejects(new Error('should not be called.')); + sandbox + .stub(stream, 'destroy') + .rejects(new Error('should not be called.')); return s.close(); }); @@ -388,7 +398,7 @@ describe('Subscriber', () => { describe('getClient', () => { it('should get a subscriber client', async () => { - const pubsub = subscription.pubsub as {} as FakePubSub; + const pubsub = (subscription.pubsub as {}) as FakePubSub; const spy = sandbox.spy(pubsub, 'getClient_'); const client = await subscriber.getClient(); const [options] = spy.lastCall.args; @@ -598,7 +608,9 @@ describe('Subscriber', () => { it('should localize attributes', () => { assert.strictEqual( - message.attributes, RECEIVED_MESSAGE.message.attributes); + message.attributes, + RECEIVED_MESSAGE.message.attributes + ); }); it('should localize data', () => { @@ -611,16 +623,20 @@ describe('Subscriber', () => { it('should localize orderingKey', () => { assert.strictEqual( - message.orderingKey, RECEIVED_MESSAGE.message.orderingKey); + message.orderingKey, + RECEIVED_MESSAGE.message.orderingKey + ); }); it('should localize publishTime', () => { const m = new Message(subscriber, RECEIVED_MESSAGE); - const timestamp = m.publishTime as unknown as FakePreciseDate; + const timestamp = (m.publishTime as unknown) as FakePreciseDate; assert(timestamp instanceof FakePreciseDate); assert.strictEqual( - timestamp.value, RECEIVED_MESSAGE.message.publishTime); + timestamp.value, + RECEIVED_MESSAGE.message.publishTime + ); }); it('should localize received time', () => { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 09eec808753..1d89f895a18 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -29,14 +29,16 @@ import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { - promisifyAll: - (klass: subby.Subscription, options: pfy.PromisifyAllOptions) => { - if (klass.name !== 'Subscription') { - return; - } - promisified = true; - assert.deepStrictEqual(options.exclude, ['open', 'snapshot']); - }, + promisifyAll: ( + klass: subby.Subscription, + options: pfy.PromisifyAllOptions + ) => { + if (klass.name !== 'Subscription') { + return; + } + promisified = true; + assert.deepStrictEqual(options.exclude, ['open', 'snapshot']); + }, }); class FakeIAM { @@ -82,21 +84,20 @@ describe('Subscription', () => { const SUB_NAME = 'test-subscription'; const SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; - - const PUBSUB = { + const PUBSUB = ({ projectId: PROJECT_ID, Promise: {}, request: util.noop, createSubscription: util.noop, - } as {} as PubSub; + } as {}) as PubSub; before(() => { Subscription = proxyquire('../src/subscription.js', { - '@google-cloud/promisify': fakePromisify, - './iam.js': {IAM: FakeIAM}, - './snapshot.js': {Snapshot: FakeSnapshot}, - './subscriber.js': {Subscriber: FakeSubscriber}, - }).Subscription; + '@google-cloud/promisify': fakePromisify, + './iam.js': {IAM: FakeIAM}, + './snapshot.js': {Snapshot: FakeSnapshot}, + './subscriber.js': {Subscriber: FakeSubscriber}, + }).Subscription; }); const sandbox = sinon.createSandbox(); @@ -149,7 +150,7 @@ describe('Subscription', () => { it('should create an IAM object', () => { assert(subscription.iam instanceof FakeIAM); - const args = (subscription.iam as {} as FakeIAM).calledWith_; + const args = ((subscription.iam as {}) as FakeIAM).calledWith_; assert.strictEqual(args[0], PUBSUB); assert.strictEqual(args[1], subscription.name); }); @@ -230,7 +231,9 @@ describe('Subscription', () => { assert.strictEqual(formatted.messageRetentionDuration!.nanos, 0); assert.strictEqual( - formatted.messageRetentionDuration!.seconds, threeDaysInSeconds); + formatted.messageRetentionDuration!.seconds, + threeDaysInSeconds + ); }); it('should format pushEndpoint', () => { @@ -244,7 +247,9 @@ describe('Subscription', () => { assert.strictEqual(formatted.pushConfig!.pushEndpoint, pushEndpoint); assert.strictEqual( - (formatted as subby.SubscriptionMetadata).pushEndpoint, undefined); + (formatted as subby.SubscriptionMetadata).pushEndpoint, + undefined + ); }); }); @@ -286,8 +291,7 @@ describe('Subscription', () => { }); it('should throw an error if theres no topic', () => { - const expectedError = - /Subscriptions can only be created when accessed through Topics/; + const expectedError = /Subscriptions can only be created when accessed through Topics/; delete subscription.topic; assert.throws(() => subscription.create(), expectedError); }); @@ -380,7 +384,7 @@ describe('Subscription', () => { }); it('should make the correct request', done => { - subscription.request = (config) => { + subscription.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'createSnapshot'); assert.deepStrictEqual(config.reqOpts, { @@ -396,7 +400,7 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = (config) => { + subscription.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -581,14 +585,13 @@ describe('Subscription', () => { autoCreate: true, a: 'a', }; - sandbox.stub(subscription, 'getMetadata').callsFake((gaxOpts) => { + sandbox.stub(subscription, 'getMetadata').callsFake(gaxOpts => { assert.strictEqual(gaxOpts, options); // tslint:disable-next-line no-any assert.strictEqual((gaxOpts as typeof options).autoCreate, undefined); done(); }); - subscription.get(options, assert.ifError); }); @@ -596,10 +599,11 @@ describe('Subscription', () => { const fakeMetadata = {}; it('should call through to getMetadata', done => { - sandbox.stub(subscription, 'getMetadata') - .callsFake((gaxOpts, callback) => { - callback(null, fakeMetadata); - }); + sandbox + .stub(subscription, 'getMetadata') + .callsFake((gaxOpts, callback) => { + callback(null, fakeMetadata); + }); subscription.get((err, sub, resp) => { assert.ifError(err); @@ -611,11 +615,12 @@ describe('Subscription', () => { it('should optionally accept options', done => { const options = {}; - sandbox.stub(subscription, 'getMetadata') - .callsFake((gaxOpts, callback) => { - assert.strictEqual(gaxOpts, options); - callback(null); // the done fn - }); + sandbox + .stub(subscription, 'getMetadata') + .callsFake((gaxOpts, callback) => { + assert.strictEqual(gaxOpts, options); + callback(null); // the done fn + }); subscription.get(options, done); }); @@ -625,8 +630,9 @@ describe('Subscription', () => { it('should pass back errors when not auto-creating', done => { const error = {code: 4} as ServiceError; const apiResponse = {}; - sandbox.stub(subscription, 'getMetadata') - .callsArgWith(1, error, apiResponse); + sandbox + .stub(subscription, 'getMetadata') + .callsArgWith(1, error, apiResponse); subscription.get((err, sub, resp) => { assert.strictEqual(err, error); @@ -639,8 +645,9 @@ describe('Subscription', () => { it('should pass back 404 errors if autoCreate is false', done => { const error = {code: 5} as ServiceError; const apiResponse = {}; - sandbox.stub(subscription, 'getMetadata') - .callsArgWith(1, error, apiResponse); + sandbox + .stub(subscription, 'getMetadata') + .callsArgWith(1, error, apiResponse); subscription.get((err, sub, resp) => { assert.strictEqual(err, error); @@ -653,8 +660,9 @@ describe('Subscription', () => { it('should pass back 404 errors if create doesnt exist', done => { const error = {code: 5} as ServiceError; const apiResponse = {}; - sandbox.stub(subscription, 'getMetadata') - .callsArgWith(1, error, apiResponse); + sandbox + .stub(subscription, 'getMetadata') + .callsArgWith(1, error, apiResponse); delete subscription.create; @@ -673,15 +681,15 @@ describe('Subscription', () => { const fakeOptions = { autoCreate: true, }; - sandbox.stub(subscription, 'getMetadata') - .callsArgWith(1, error, apiResponse); + sandbox + .stub(subscription, 'getMetadata') + .callsArgWith(1, error, apiResponse); - sandbox.stub(subscription, 'create').callsFake((options) => { + sandbox.stub(subscription, 'create').callsFake(options => { assert.strictEqual(options.gaxOpts, fakeOptions); done(); }); - subscription.topic = 'hi-ho-silver'; subscription.get(fakeOptions, assert.ifError); }); @@ -690,7 +698,7 @@ describe('Subscription', () => { describe('getMetadata', () => { it('should make the correct request', done => { - subscription.request = (config) => { + subscription.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'getSubscription'); assert.deepStrictEqual(config.reqOpts, { @@ -705,7 +713,7 @@ describe('Subscription', () => { it('should optionally accept gax options', done => { const gaxOpts = {}; - subscription.request = (config) => { + subscription.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -748,7 +756,7 @@ describe('Subscription', () => { const fakeConfig = {}; it('should make the correct request', done => { - subscription.request = (config) => { + subscription.request = config => { assert.strictEqual(config.client, 'SubscriberClient'); assert.strictEqual(config.method, 'modifyPushConfig'); assert.deepStrictEqual(config.reqOpts, { @@ -764,7 +772,7 @@ describe('Subscription', () => { it('should optionally accept gaxOpts', done => { const gaxOpts = {}; - subscription.request = (config) => { + subscription.request = config => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; @@ -871,12 +879,13 @@ describe('Subscription', () => { }; const expectedBody = Object.assign( - { - name: SUB_FULL_NAME, - }, - formattedMetadata); + { + name: SUB_FULL_NAME, + }, + formattedMetadata + ); - Subscription.formatMetadata_ = (metadata) => { + Subscription.formatMetadata_ = metadata => { assert.strictEqual(metadata, METADATA); return formattedMetadata; }; @@ -885,7 +894,7 @@ describe('Subscription', () => { subscription: expectedBody, updateMask: { paths: ['push_config'], - } + }, }; subscription.request = (config: RequestConfig) => { diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index c33cf75fc48..ecf15a2e786 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -23,7 +23,11 @@ import * as sinon from 'sinon'; import {google} from '../proto/pubsub'; import {ExistsCallback, RequestCallback, RequestConfig} from '../src/pubsub'; -import {CreateSubscriptionOptions, Subscription, SubscriptionOptions} from '../src/subscription'; +import { + CreateSubscriptionOptions, + Subscription, + SubscriptionOptions, +} from '../src/subscription'; import {GetTopicMetadataCallback, Topic} from '../src/topic'; import * as util from '../src/util'; @@ -34,9 +38,12 @@ const fakePromisify = Object.assign({}, pfy, { return; } promisified = true; - assert.deepStrictEqual( - options.exclude, - ['publish', 'publishJSON', 'setPublishOptions', 'subscription']); + assert.deepStrictEqual(options.exclude, [ + 'publish', + 'publishJSON', + 'setPublishOptions', + 'subscription', + ]); }, }); @@ -96,13 +103,13 @@ describe('Topic', () => { before(() => { Topic = proxyquire('../src/topic.js', { - '@google-cloud/promisify': fakePromisify, - '@google-cloud/paginator': { - paginator: fakePaginator, - }, - './iam': {IAM: FakeIAM}, - './publisher': {Publisher: FakePublisher}, - }).Topic; + '@google-cloud/promisify': fakePromisify, + '@google-cloud/paginator': { + paginator: fakePaginator, + }, + './iam': {IAM: FakeIAM}, + './publisher': {Publisher: FakePublisher}, + }).Topic; }); const sandbox = sinon.createSandbox(); @@ -114,7 +121,7 @@ describe('Topic', () => { describe('initialization', () => { it('should extend the correct methods', () => { - assert(extended); // See `fakePaginator.extend` + assert(extended); // See `fakePaginator.extend` }); it('should streamify the correct methods', () => { @@ -177,8 +184,10 @@ describe('Topic', () => { describe('formatName_', () => { it('should format name', () => { - const formattedName = - Topic.formatName_(PROJECT_ID, TOPIC_UNFORMATTED_NAME); + const formattedName = Topic.formatName_( + PROJECT_ID, + TOPIC_UNFORMATTED_NAME + ); assert.strictEqual(formattedName, TOPIC_NAME); }); @@ -207,13 +216,16 @@ describe('Topic', () => { const NAME = 'sub-name'; const OPTIONS = {a: 'a'}; - PUBSUB.createSubscription = - (topic_: Topic, name: string, options: CreateSubscriptionOptions) => { - assert.strictEqual(topic_, topic); - assert.strictEqual(name, NAME); - assert.strictEqual(options, OPTIONS); - done(); - }; + PUBSUB.createSubscription = ( + topic_: Topic, + name: string, + options: CreateSubscriptionOptions + ) => { + assert.strictEqual(topic_, topic); + assert.strictEqual(name, NAME); + assert.strictEqual(options, OPTIONS); + done(); + }; topic.createSubscription(NAME, OPTIONS, assert.ifError); }); @@ -264,21 +276,23 @@ describe('Topic', () => { const fakeMetadata = {}; beforeEach(() => { - topic.getMetadata = - (gaxOpts: CallOptions, - callback: RequestCallback) => { - callback(null, fakeMetadata); - }; + topic.getMetadata = ( + gaxOpts: CallOptions, + callback: RequestCallback + ) => { + callback(null, fakeMetadata); + }; }); it('should call through to getMetadata', done => { topic.get( - (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { - assert.ifError(err); - assert.strictEqual(_topic, topic); - assert.strictEqual(resp, fakeMetadata); - done(); - }); + (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { + assert.ifError(err); + assert.strictEqual(_topic, topic); + assert.strictEqual(resp, fakeMetadata); + done(); + } + ); }); it('should optionally accept options', done => { @@ -298,36 +312,42 @@ describe('Topic', () => { const error = {code: 4} as ServiceError; const apiResponse = {} as Topic; - topic.getMetadata = - (gaxOpts: CallOptions, callback: GetTopicMetadataCallback) => { - callback(error, apiResponse); - }; + topic.getMetadata = ( + gaxOpts: CallOptions, + callback: GetTopicMetadataCallback + ) => { + callback(error, apiResponse); + }; topic.get( - (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { - assert.strictEqual(err, error); - assert.strictEqual(_topic, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { + assert.strictEqual(err, error); + assert.strictEqual(_topic, null); + assert.strictEqual(resp, apiResponse); + done(); + } + ); }); it('should pass back 404 errors if autoCreate is false', done => { const error = {code: 5} as ServiceError; const apiResponse = {} as Topic; - topic.getMetadata = - (gaxOpts: CallOptions, callback: GetTopicMetadataCallback) => { - callback(error, apiResponse); - }; + topic.getMetadata = ( + gaxOpts: CallOptions, + callback: GetTopicMetadataCallback + ) => { + callback(error, apiResponse); + }; topic.get( - (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { - assert.strictEqual(err, error); - assert.strictEqual(_topic, null); - assert.strictEqual(resp, apiResponse); - done(); - }); + (err: Error, _topic: Topic, resp: google.pubsub.v1.ITopic) => { + assert.strictEqual(err, error); + assert.strictEqual(_topic, null); + assert.strictEqual(resp, apiResponse); + done(); + } + ); }); it('should create the topic if 404 + autoCreate is true', done => { @@ -338,10 +358,12 @@ describe('Topic', () => { autoCreate: true, }; - topic.getMetadata = - (gaxOpts: CallOptions, callback: GetTopicMetadataCallback) => { - callback(error, apiResponse); - }; + topic.getMetadata = ( + gaxOpts: CallOptions, + callback: GetTopicMetadataCallback + ) => { + callback(error, apiResponse); + }; topic.create = (options: CallOptions) => { assert.strictEqual(options, fakeOptions); @@ -421,10 +443,12 @@ describe('Topic', () => { const error = new Error('err'); const apiResponse = {}; - topic.request = - (config: RequestConfig, callback: GetTopicMetadataCallback) => { - callback(error, apiResponse); - }; + topic.request = ( + config: RequestConfig, + callback: GetTopicMetadataCallback + ) => { + callback(error, apiResponse); + }; topic.getMetadata((err: Error, metadata: google.pubsub.v1.ITopic) => { assert.strictEqual(err, error); @@ -436,10 +460,12 @@ describe('Topic', () => { it('should set the metadata if no error occurs', done => { const apiResponse = {}; - topic.request = - (config: RequestConfig, callback: GetTopicMetadataCallback) => { - callback(null, apiResponse); - }; + topic.request = ( + config: RequestConfig, + callback: GetTopicMetadataCallback + ) => { + callback(null, apiResponse); + }; topic.getMetadata((err: Error, metadata: google.pubsub.v1.ITopic) => { assert.ifError(err); @@ -462,16 +488,18 @@ describe('Topic', () => { }; const expectedOptions = Object.assign( - { - topic: topic.name, - }, - options); + { + topic: topic.name, + }, + options + ); const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts); + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); delete expectedOptions.gaxOpts; delete expectedOptions.autoPaginate; @@ -506,10 +534,12 @@ describe('Topic', () => { }; }; - topic.request = - (config: RequestConfig, callback: RequestCallback) => { - callback(null, fakeSubs); - }; + topic.request = ( + config: RequestConfig, + callback: RequestCallback + ) => { + callback(null, fakeSubs); + }; topic.getSubscriptions((err: Error, subscriptions: Subscription[]) => { assert.ifError(err); @@ -529,20 +559,21 @@ describe('Topic', () => { const apiResponse_ = {}; topic.request = - // tslint:disable-next-line:no-any - (config: RequestConfig, callback: (...args: any[]) => void) => { - callback(err_, subs_, nextQuery_, apiResponse_); - }; + // tslint:disable-next-line:no-any + (config: RequestConfig, callback: (...args: any[]) => void) => { + callback(err_, subs_, nextQuery_, apiResponse_); + }; topic.getSubscriptions( - // tslint:disable-next-line:no-any - (err: Error, subs: boolean, nextQuery: any, apiResponse: any) => { - assert.strictEqual(err, err_); - assert.deepStrictEqual(subs, subs_); - assert.strictEqual(nextQuery, nextQuery_); - assert.strictEqual(apiResponse, apiResponse_); - done(); - }); + // tslint:disable-next-line:no-any + (err: Error, subs: boolean, nextQuery: any, apiResponse: any) => { + assert.strictEqual(err, err_); + assert.deepStrictEqual(subs, subs_); + assert.strictEqual(nextQuery, nextQuery_); + assert.strictEqual(apiResponse, apiResponse_); + done(); + } + ); }); }); @@ -553,9 +584,10 @@ describe('Topic', () => { const callback = () => {}; const fakePromise = Promise.resolve(); - const stub = sandbox.stub(topic.publisher, 'publish') - .withArgs(data, attributes, callback) - .returns(fakePromise); + const stub = sandbox + .stub(topic.publisher, 'publish') + .withArgs(data, attributes, callback) + .returns(fakePromise); const promise = topic.publish(data, attributes, callback); assert.strictEqual(promise, fakePromise); @@ -645,8 +677,9 @@ describe('Topic', () => { describe('setPublishOptions', () => { it('should call through to Publisher#setOptions', () => { const fakeOptions = {}; - const stub = - sandbox.stub(topic.publisher, 'setOptions').withArgs(fakeOptions); + const stub = sandbox + .stub(topic.publisher, 'setOptions') + .withArgs(fakeOptions); topic.setPublishOptions(fakeOptions); @@ -659,22 +692,26 @@ describe('Topic', () => { const subscriptionName = 'subName'; const opts = {}; - topic.parent.subscription = - (name: string, options: SubscriptionOptions) => { - assert.strictEqual(name, subscriptionName); - assert.deepStrictEqual(options, opts); - done(); - }; + topic.parent.subscription = ( + name: string, + options: SubscriptionOptions + ) => { + assert.strictEqual(name, subscriptionName); + assert.deepStrictEqual(options, opts); + done(); + }; topic.subscription(subscriptionName, opts); }); it('should attach the topic instance to the options', done => { - topic.parent.subscription = - (name: string, options: SubscriptionOptions) => { - assert.strictEqual(options.topic, topic); - done(); - }; + topic.parent.subscription = ( + name: string, + options: SubscriptionOptions + ) => { + assert.strictEqual(options.topic, topic); + done(); + }; topic.subscription(); }); From 8a0f1839379f9f384dcbf1b1dbbfbaf5cea5ff0e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 3 May 2019 07:28:36 -0700 Subject: [PATCH 0411/1115] fix(deps): update dependency @google-cloud/promisify to v1 (#589) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9da70e19f91..b7a0e27bcab 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@google-cloud/paginator": "^0.2.0", "@google-cloud/precise-date": "^0.1.0", "@google-cloud/projectify": "^0.3.0", - "@google-cloud/promisify": "^0.4.0", + "@google-cloud/promisify": "^1.0.0", "@sindresorhus/is": "^0.15.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", From 486a7ba75824cc4f2c434651e13ba948b0a3a10c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 3 May 2019 07:37:13 -0700 Subject: [PATCH 0412/1115] fix(deps): update dependency @google-cloud/projectify to v1 (#588) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b7a0e27bcab..dfdb2405a60 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,7 +53,7 @@ "dependencies": { "@google-cloud/paginator": "^0.2.0", "@google-cloud/precise-date": "^0.1.0", - "@google-cloud/projectify": "^0.3.0", + "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", "@sindresorhus/is": "^0.15.0", "@types/duplexify": "^3.6.0", From e5e78404f9189c492881b283b9ef06d791c89fa0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 3 May 2019 08:21:09 -0700 Subject: [PATCH 0413/1115] chore(deps): update dependency eslint-plugin-node to v9 (#587) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index dfdb2405a60..48dfb43f7e4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -81,7 +81,7 @@ "codecov": "^3.0.0", "eslint": "^5.0.0", "eslint-config-prettier": "^4.0.0", - "eslint-plugin-node": "^8.0.0", + "eslint-plugin-node": "^9.0.0", "eslint-plugin-prettier": "^3.0.0", "gts": "^1.0.0", "intelli-espower-loader": "^1.0.1", From 4988ff7f9204f322e018dfba757ad3e240f2076d Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Fri, 3 May 2019 09:21:11 -0700 Subject: [PATCH 0414/1115] chore: do not run CI on grpc-js (#586) --- .../.kokoro/continuous/node10/system-test-grpcjs.cfg | 12 ------------ .../.kokoro/presubmit/node10/system-test-grpcjs.cfg | 12 ------------ 2 files changed, 24 deletions(-) delete mode 100644 handwritten/pubsub/.kokoro/continuous/node10/system-test-grpcjs.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node10/system-test-grpcjs.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node10/system-test-grpcjs.cfg b/handwritten/pubsub/.kokoro/continuous/node10/system-test-grpcjs.cfg deleted file mode 100644 index 1f9eaee5ec5..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node10/system-test-grpcjs.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/system-test.sh" -} - -env_vars: { - key: "GOOGLE_CLOUD_USE_GRPC_JS" - value: "1" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/system-test-grpcjs.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/system-test-grpcjs.cfg deleted file mode 100644 index 1f9eaee5ec5..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node10/system-test-grpcjs.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/system-test.sh" -} - -env_vars: { - key: "GOOGLE_CLOUD_USE_GRPC_JS" - value: "1" -} From db8c3f782907ebdef47f3b045c7b4d412cb8cc64 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 6 May 2019 15:45:16 -0700 Subject: [PATCH 0415/1115] build: patch Windows container, fixing Node 10 (#596) --- handwritten/pubsub/.kokoro/test.bat | 10 +++++++++- handwritten/pubsub/package.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat index 767320757e0..fddff757050 100644 --- a/handwritten/pubsub/.kokoro/test.bat +++ b/handwritten/pubsub/.kokoro/test.bat @@ -17,7 +17,15 @@ cd /d %~dp0 cd .. -call npm install -g npm@latest || goto :error +@rem The image we're currently running has a broken version of Node.js enabled +@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional +@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to +@rem install npm for v10.15.3. +call nvm use v8.9.1 || goto :error +call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error +call nvm use v10.15.3 || goto :error +call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error + call npm install || goto :error call npm run test || goto :error diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 48dfb43f7e4..665f4bdee94 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -85,7 +85,7 @@ "eslint-plugin-prettier": "^3.0.0", "gts": "^1.0.0", "intelli-espower-loader": "^1.0.1", - "jsdoc": "^3.5.5", + "jsdoc": "3.5.5", "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", "linkinator": "^1.1.2", "mkdirp": "^0.5.1", From 35e2e56d7848c99f23cc32b97dd5b7a6923c6433 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 6 May 2019 16:12:24 -0700 Subject: [PATCH 0416/1115] build: allow Node 10 to push to codecov (#597) --- handwritten/pubsub/.kokoro/continuous/node10/test.cfg | 9 +++++++++ handwritten/pubsub/.kokoro/continuous/node8/test.cfg | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg index e69de29bb2d..468b8c7197a 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg @@ -0,0 +1,9 @@ +# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} diff --git a/handwritten/pubsub/.kokoro/continuous/node8/test.cfg b/handwritten/pubsub/.kokoro/continuous/node8/test.cfg index 468b8c7197a..e69de29bb2d 100644 --- a/handwritten/pubsub/.kokoro/continuous/node8/test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node8/test.cfg @@ -1,9 +0,0 @@ -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} From de8499f22524ad894ed44193a6d2ce195e6d6b8c Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 6 May 2019 21:26:35 -0700 Subject: [PATCH 0417/1115] build: allow Node 10 on presubmit to push to codecov (#598) --- handwritten/pubsub/.kokoro/presubmit/node10/test.cfg | 9 +++++++++ handwritten/pubsub/.kokoro/presubmit/node8/test.cfg | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg index e69de29bb2d..468b8c7197a 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg @@ -0,0 +1,9 @@ +# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg index 468b8c7197a..e69de29bb2d 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg @@ -1,9 +0,0 @@ -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} From 9b45fb8c602a41736fc793e1daa7563e3968e9a7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 7 May 2019 13:38:20 -0400 Subject: [PATCH 0418/1115] fix(deps): update dependency @google-cloud/paginator to v1 (#592) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 665f4bdee94..5775281a218 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ "predocs-test": "npm run docs" }, "dependencies": { - "@google-cloud/paginator": "^0.2.0", + "@google-cloud/paginator": "^1.0.0", "@google-cloud/precise-date": "^0.1.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", From cd6e06b8fc4bebab1e0eec306a329acd1a3826db Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Tue, 7 May 2019 12:49:48 -0700 Subject: [PATCH 0419/1115] build: update build config and doc comments (#593) --- handwritten/pubsub/.kokoro/lint.sh | 10 +- handwritten/pubsub/.kokoro/samples-test.sh | 16 +- handwritten/pubsub/.kokoro/test.sh | 12 +- .../protos/google/pubsub/v1/pubsub.proto | 532 ++++++++---------- .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 74 +-- handwritten/pubsub/src/v1/publisher_client.js | 8 + .../pubsub/src/v1/subscriber_client.js | 37 +- handwritten/pubsub/synth.metadata | 12 +- handwritten/pubsub/test/gapic-v1.js | 6 + 9 files changed, 308 insertions(+), 399 deletions(-) diff --git a/handwritten/pubsub/.kokoro/lint.sh b/handwritten/pubsub/.kokoro/lint.sh index 7c2ea2a28f9..bcb7508363b 100755 --- a/handwritten/pubsub/.kokoro/lint.sh +++ b/handwritten/pubsub/.kokoro/lint.sh @@ -23,9 +23,11 @@ cd $(dirname $0)/.. npm install # Install and link samples -cd samples/ -npm link ../ -npm install -cd .. +if [ -f samples/package.json ]; then + cd samples/ + npm link ../ + npm install + cd .. +fi npm run lint diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 5a81ec01fcc..f83f712a88a 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -31,12 +31,14 @@ if [ -f .kokoro/pre-samples-test.sh ]; then set -x fi -npm install +if [ -f samples/package.json ]; then + npm install -# Install and link samples -cd samples/ -npm link ../ -npm install -cd .. + # Install and link samples + cd samples/ + npm link ../ + npm install + cd .. -npm run samples-test + npm run samples-test +fi diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 4d6c3f83188..f7e9fe78163 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -22,6 +22,14 @@ cd $(dirname $0)/.. npm install npm test -./node_modules/nyc/bin/nyc.js report -bash $KOKORO_GFILE_DIR/codecov.sh +COVERAGE_NODE=10 +if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then + NYC_BIN=./node_modules/nyc/bin/nyc.js + if [ -f "$NYC_BIN" ]; then + $NYC_BIN report + fi + bash $KOKORO_GFILE_DIR/codecov.sh +else + echo "coverage is only reported for Node $COVERAGE_NODE" +fi diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 715af9c18c4..7cea47b1e53 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -18,6 +18,7 @@ syntax = "proto3"; package google.pubsub.v1; import "google/api/annotations.proto"; +import "google/api/resource.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; @@ -90,10 +91,7 @@ service Publisher { // operations, which allow // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot.

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. + // captured by a snapshot. rpc ListTopicSnapshots(ListTopicSnapshotsRequest) returns (ListTopicSnapshotsResponse) { option (google.api.http) = { @@ -113,6 +111,207 @@ service Publisher { } } +message MessageStoragePolicy { + // The list of GCP region IDs where messages that are published to the topic + // may be persisted in storage. Messages published by publishers running in + // non-allowed GCP regions (or running outside of GCP altogether) will be + // routed for storage in one of the allowed regions. An empty list indicates a + // misconfiguration at the project or organization level, which will result in + // all Publish operations failing. + repeated string allowed_persistence_regions = 1; +} + +// A topic resource. +message Topic { + // The name of the topic. It must have the format + // `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, + // and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), + // underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent + // signs (`%`). It must be between 3 and 255 characters in length, and it + // must not start with `"goog"`. + string name = 1; + + // See Creating and + // managing labels. + map labels = 2; + + // Policy constraining how messages published to the topic may be stored. It + // is determined when the topic is created based on the policy configured at + // the project level. It must not be set by the caller in the request to + // CreateTopic or to UpdateTopic. This field will be populated in the + // responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the + // response, then no constraints are in effect. + MessageStoragePolicy message_storage_policy = 3; + + // The resource name of the Cloud KMS CryptoKey to be used to protect access + // to messages published on this topic. + // + // The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*`. + // EXPERIMENTAL: This feature is part of a closed alpha release. This + // API might be changed in backward-incompatible ways and is not recommended + // for production use. It is not subject to any SLA or deprecation policy. + string kms_key_name = 5; +} + +// A message that is published by publishers and consumed by subscribers. The +// message must contain either a non-empty data field or at least one attribute. +// Note that client libraries represent this object differently +// depending on the language. See the corresponding +// client +// library documentation for more information. See +// Quotas and limits +// for more information about message limits. +message PubsubMessage { + // The message data field. If this field is empty, the message must contain + // at least one attribute. + bytes data = 1; + + // Optional attributes for this message. + map attributes = 2; + + // ID of this message, assigned by the server when the message is published. + // Guaranteed to be unique within the topic. This value may be read by a + // subscriber that receives a `PubsubMessage` via a `Pull` call or a push + // delivery. It must not be populated by the publisher in a `Publish` call. + string message_id = 3; + + // The time at which the message was published, populated by the server when + // it receives the `Publish` call. It must not be populated by the + // publisher in a `Publish` call. + google.protobuf.Timestamp publish_time = 4; + + // Identifies related messages for which publish order should be respected. + // If a `Subscription` has `enable_message_ordering` set to `true`, messages + // published with the same `ordering_key` value will be delivered to + // subscribers in the order in which they are received by the Pub/Sub system. + // EXPERIMENTAL: This feature is part of a closed alpha release. This + // API might be changed in backward-incompatible ways and is not recommended + // for production use. It is not subject to any SLA or deprecation policy. + string ordering_key = 5; +} + +// Request for the GetTopic method. +message GetTopicRequest { + // The name of the topic to get. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; +} + +// Request for the UpdateTopic method. +message UpdateTopicRequest { + // The updated topic object. + Topic topic = 1; + + // Indicates which fields in the provided topic to update. Must be specified + // and non-empty. Note that if `update_mask` contains + // "message_storage_policy" then the new value will be determined based on the + // policy configured at the project or organization level. The + // `message_storage_policy` must not be set in the `topic` provided above. + google.protobuf.FieldMask update_mask = 2; +} + +// Request for the Publish method. +message PublishRequest { + // The messages in the request will be published on this topic. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; + + // The messages to publish. + repeated PubsubMessage messages = 2; +} + +// Response for the `Publish` method. +message PublishResponse { + // The server-assigned ID of each published message, in the same order as + // the messages in the request. IDs are guaranteed to be unique within + // the topic. + repeated string message_ids = 1; +} + +// Request for the `ListTopics` method. +message ListTopicsRequest { + // The name of the project in which to list topics. + // Format is `projects/{project-id}`. + string project = 1; + + // Maximum number of topics to return. + int32 page_size = 2; + + // The value returned by the last `ListTopicsResponse`; indicates that this is + // a continuation of a prior `ListTopics` call, and that the system should + // return the next page of data. + string page_token = 3; +} + +// Response for the `ListTopics` method. +message ListTopicsResponse { + // The resulting topics. + repeated Topic topics = 1; + + // If not empty, indicates that there may be more topics that match the + // request; this value should be passed in a new `ListTopicsRequest`. + string next_page_token = 2; +} + +// Request for the `ListTopicSubscriptions` method. +message ListTopicSubscriptionsRequest { + // The name of the topic that subscriptions are attached to. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; + + // Maximum number of subscription names to return. + int32 page_size = 2; + + // The value returned by the last `ListTopicSubscriptionsResponse`; indicates + // that this is a continuation of a prior `ListTopicSubscriptions` call, and + // that the system should return the next page of data. + string page_token = 3; +} + +// Response for the `ListTopicSubscriptions` method. +message ListTopicSubscriptionsResponse { + // The names of the subscriptions that match the request. + repeated string subscriptions = 1; + + // If not empty, indicates that there may be more subscriptions that match + // the request; this value should be passed in a new + // `ListTopicSubscriptionsRequest` to get more subscriptions. + string next_page_token = 2; +} + +// Request for the `ListTopicSnapshots` method. +message ListTopicSnapshotsRequest { + // The name of the topic that snapshots are attached to. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; + + // Maximum number of snapshot names to return. + int32 page_size = 2; + + // The value returned by the last `ListTopicSnapshotsResponse`; indicates + // that this is a continuation of a prior `ListTopicSnapshots` call, and + // that the system should return the next page of data. + string page_token = 3; +} + +// Response for the `ListTopicSnapshots` method. +message ListTopicSnapshotsResponse { + // The names of the snapshots that match the request. + repeated string snapshots = 1; + + // If not empty, indicates that there may be more snapshots that match + // the request; this value should be passed in a new + // `ListTopicSnapshotsRequest` to get more snapshots. + string next_page_token = 2; +} + +// Request for the `DeleteTopic` method. +message DeleteTopicRequest { + // Name of the topic to delete. + // Format is `projects/{project}/topics/{topic}`. + string topic = 1; +} + // The service that an application uses to manipulate subscriptions and to // consume messages from a subscription via the `Pull` method or by // establishing a bi-directional stream using the `StreamingPull` method. @@ -238,10 +437,7 @@ service Subscriber { // Seek // operations, which allow you to manage message acknowledgments in bulk. That // is, you can set the acknowledgment state of messages in an existing - // subscription to the state captured by a snapshot.

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. + // subscription to the state captured by a snapshot. rpc GetSnapshot(GetSnapshotRequest) returns (Snapshot) { option (google.api.http) = { get: "/v1/{snapshot=projects/*/snapshots/*}" @@ -253,10 +449,7 @@ service Subscriber { // operations, which allow // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot.

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. + // captured by a snapshot. rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) { option (google.api.http) = { get: "/v1/{project=projects/*}/snapshots" @@ -269,11 +462,7 @@ service Subscriber { // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state // captured by a snapshot. - //

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy.

- // If the snapshot already exists, returns `ALREADY_EXISTS`. + //

If the snapshot already exists, returns `ALREADY_EXISTS`. // If the requested subscription doesn't exist, returns `NOT_FOUND`. // If the backlog in the subscription is too old -- and the resulting snapshot // would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. @@ -297,11 +486,7 @@ service Subscriber { // operations, which allow // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot.

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. - // Note that certain properties of a snapshot are not modifiable. + // captured by a snapshot. rpc UpdateSnapshot(UpdateSnapshotRequest) returns (Snapshot) { option (google.api.http) = { patch: "/v1/{snapshot.name=projects/*/snapshots/*}" @@ -315,9 +500,6 @@ service Subscriber { // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state // captured by a snapshot.

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. // When the snapshot is deleted, all messages retained in the snapshot // are immediately dropped. After a snapshot is deleted, a new one may be // created with the same name, but the new one has no association with the old @@ -335,10 +517,7 @@ service Subscriber { // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state // captured by a snapshot. Note that both the subscription and the snapshot - // must be on the same topic.

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. + // must be on the same topic. rpc Seek(SeekRequest) returns (SeekResponse) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:seek" @@ -347,204 +526,6 @@ service Subscriber { } } -message MessageStoragePolicy { - // The list of GCP region IDs where messages that are published to the topic - // may be persisted in storage. Messages published by publishers running in - // non-allowed GCP regions (or running outside of GCP altogether) will be - // routed for storage in one of the allowed regions. An empty list indicates a - // misconfiguration at the project or organization level, which will result in - // all Publish operations failing. - repeated string allowed_persistence_regions = 1; -} - -// A topic resource. -message Topic { - // The name of the topic. It must have the format - // `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, - // and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), - // underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent - // signs (`%`). It must be between 3 and 255 characters in length, and it - // must not start with `"goog"`. - string name = 1; - - // See Creating and - // managing labels. - map labels = 2; - - // Policy constraining how messages published to the topic may be stored. It - // is determined when the topic is created based on the policy configured at - // the project level. It must not be set by the caller in the request to - // CreateTopic or to UpdateTopic. This field will be populated in the - // responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the - // response, then no constraints are in effect. - MessageStoragePolicy message_storage_policy = 3; -} - -// A message that is published by publishers and consumed by subscribers. The -// message must contain either a non-empty data field or at least one attribute. -// Note that client libraries represent this object differently -// depending on the language. See the corresponding -// client -// library documentation for more information. See -// Quotas and limits -// for more information about message limits. -message PubsubMessage { - // The message data field. If this field is empty, the message must contain - // at least one attribute. - bytes data = 1; - - // Optional attributes for this message. - map attributes = 2; - - // ID of this message, assigned by the server when the message is published. - // Guaranteed to be unique within the topic. This value may be read by a - // subscriber that receives a `PubsubMessage` via a `Pull` call or a push - // delivery. It must not be populated by the publisher in a `Publish` call. - string message_id = 3; - - // The time at which the message was published, populated by the server when - // it receives the `Publish` call. It must not be populated by the - // publisher in a `Publish` call. - google.protobuf.Timestamp publish_time = 4; - - // Identifies related messages for which publish order should be respected. - // If a `Subscription` has `enable_message_ordering` set to `true`, messages - // published with the same `ordering_key` value will be delivered to - // subscribers in the order in which they are received by the Pub/Sub system. - // EXPERIMENTAL: This feature is part of a closed alpha release. This - // API might be changed in backward-incompatible ways and is not recommended - // for production use. It is not subject to any SLA or deprecation policy. - string ordering_key = 5; -} - -// Request for the GetTopic method. -message GetTopicRequest { - // The name of the topic to get. - // Format is `projects/{project}/topics/{topic}`. - string topic = 1; -} - -// Request for the UpdateTopic method. -message UpdateTopicRequest { - // The updated topic object. - Topic topic = 1; - - // Indicates which fields in the provided topic to update. Must be specified - // and non-empty. Note that if `update_mask` contains - // "message_storage_policy" then the new value will be determined based on the - // policy configured at the project or organization level. The - // `message_storage_policy` must not be set in the `topic` provided above. - google.protobuf.FieldMask update_mask = 2; -} - -// Request for the Publish method. -message PublishRequest { - // The messages in the request will be published on this topic. - // Format is `projects/{project}/topics/{topic}`. - string topic = 1; - - // The messages to publish. - repeated PubsubMessage messages = 2; -} - -// Response for the `Publish` method. -message PublishResponse { - // The server-assigned ID of each published message, in the same order as - // the messages in the request. IDs are guaranteed to be unique within - // the topic. - repeated string message_ids = 1; -} - -// Request for the `ListTopics` method. -message ListTopicsRequest { - // The name of the project in which to list topics. - // Format is `projects/{project-id}`. - string project = 1; - - // Maximum number of topics to return. - int32 page_size = 2; - - // The value returned by the last `ListTopicsResponse`; indicates that this is - // a continuation of a prior `ListTopics` call, and that the system should - // return the next page of data. - string page_token = 3; -} - -// Response for the `ListTopics` method. -message ListTopicsResponse { - // The resulting topics. - repeated Topic topics = 1; - - // If not empty, indicates that there may be more topics that match the - // request; this value should be passed in a new `ListTopicsRequest`. - string next_page_token = 2; -} - -// Request for the `ListTopicSubscriptions` method. -message ListTopicSubscriptionsRequest { - // The name of the topic that subscriptions are attached to. - // Format is `projects/{project}/topics/{topic}`. - string topic = 1; - - // Maximum number of subscription names to return. - int32 page_size = 2; - - // The value returned by the last `ListTopicSubscriptionsResponse`; indicates - // that this is a continuation of a prior `ListTopicSubscriptions` call, and - // that the system should return the next page of data. - string page_token = 3; -} - -// Response for the `ListTopicSubscriptions` method. -message ListTopicSubscriptionsResponse { - // The names of the subscriptions that match the request. - repeated string subscriptions = 1; - - // If not empty, indicates that there may be more subscriptions that match - // the request; this value should be passed in a new - // `ListTopicSubscriptionsRequest` to get more subscriptions. - string next_page_token = 2; -} - -// Request for the `ListTopicSnapshots` method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. -message ListTopicSnapshotsRequest { - // The name of the topic that snapshots are attached to. - // Format is `projects/{project}/topics/{topic}`. - string topic = 1; - - // Maximum number of snapshot names to return. - int32 page_size = 2; - - // The value returned by the last `ListTopicSnapshotsResponse`; indicates - // that this is a continuation of a prior `ListTopicSnapshots` call, and - // that the system should return the next page of data. - string page_token = 3; -} - -// Response for the `ListTopicSnapshots` method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. -message ListTopicSnapshotsResponse { - // The names of the snapshots that match the request. - repeated string snapshots = 1; - - // If not empty, indicates that there may be more snapshots that match - // the request; this value should be passed in a new - // `ListTopicSnapshotsRequest` to get more snapshots. - string next_page_token = 2; -} - -// Request for the `DeleteTopic` method. -message DeleteTopicRequest { - // Name of the topic to delete. - // Format is `projects/{project}/topics/{topic}`. - string topic = 1; -} - // A subscription resource. message Subscription { // The name of the subscription. It must have the format @@ -595,10 +576,6 @@ message Subscription { // // Seek to a timestamp. - //

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. bool retain_acked_messages = 7; // How long to retain unacknowledged messages in the subscription's backlog, @@ -606,10 +583,7 @@ message Subscription { // If `retain_acked_messages` is true, then this also configures the retention // of acknowledged messages, and thus configures how far back in time a `Seek` // can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - // minutes.

- // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. + // minutes. google.protobuf.Duration message_retention_duration = 8; // See Creating and @@ -631,9 +605,6 @@ message Subscription { // operations on the subscription. If `expiration_policy` is not set, a // *default policy* with `ttl` of 31 days will be used. The minimum allowed // value for `expiration_policy.ttl` is 1 day. - // BETA: This feature is part of a beta release. This API might be - // changed in backward-incompatible ways and is not recommended for production - // use. It is not subject to any SLA or deprecation policy. ExpirationPolicy expiration_policy = 11; } @@ -651,6 +622,26 @@ message ExpirationPolicy { // Configuration for a push delivery endpoint. message PushConfig { + // Contains information needed for generating an + // [OpenID Connect + // token](https://developers.google.com/identity/protocols/OpenIDConnect). + message OidcToken { + // [Service account + // email](https://cloud.google.com/iam/docs/service-accounts) + // to be used for generating the OIDC token. The caller (for + // CreateSubscription, UpdateSubscription, and ModifyPushConfig RPCs) must + // have the iam.serviceAccounts.actAs permission for the service account. + string service_account_email = 1; + + // Audience to be used when generating OIDC token. The audience claim + // identifies the recipients that the JWT is intended for. The audience + // value is a single case-sensitive string. Having multiple values (array) + // for the audience field is not supported. More info about the OIDC JWT + // token audience here: https://tools.ietf.org/html/rfc7519#section-4.1.3 + // Note: if not specified, the Push endpoint URL will be used. + string audience = 2; + } + // A URL locating the endpoint to which messages should be pushed. // For example, a Webhook endpoint might use "https://example.com/push". string push_endpoint = 1; @@ -683,36 +674,11 @@ message PushConfig { // default to allow requests only from the Cloud Pub/Sub system, for example. // This field is optional and should be set only by users interested in // authenticated push. - // EXPERIMENTAL: This field a part of a closed alpha that may not be - // accessible to all users. It may be changed in backward-incompatible ways - // and is not subject to any SLA or deprecation policy. It is not recommended - // for production use. oneof authentication_method { // If specified, Pub/Sub will generate and attach an OIDC JWT token as an // `Authorization` header in the HTTP request for every pushed message. OidcToken oidc_token = 3; } - - // Contains information needed for generating an - // [OpenID Connect - // token](https://developers.google.com/identity/protocols/OpenIDConnect). - message OidcToken { - // [Service account - // email](https://cloud.google.com/iam/docs/service-accounts) - // to be used for generating the OIDC token. The caller (for - // CreateSubscription, UpdateSubscription, and ModifyPushConfig calls) must - // have the iam.serviceAccounts.actAs permission for the service account. - // See https://cloud.google.com/iam/docs/understanding-roles#service-accounts-roles. - string service_account_email = 1; - - // Audience to be used when generating OIDC token. The audience claim - // identifies the recipients that the JWT is intended for. The audience - // value is a single case-sensitive string. Having multiple values (array) - // for the audience field is not supported. More info about the OIDC JWT - // token audience here: https://tools.ietf.org/html/rfc7519#section-4.1.3 - // Note: if not specified, the Push endpoint URL will be used. - string audience = 2; - } } // A message and its corresponding acknowledgment ID. @@ -897,10 +863,7 @@ message StreamingPullResponse { repeated ReceivedMessage received_messages = 1; } -// Request for the `CreateSnapshot` method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. +// Request for the `CreateSnapshot` method. message CreateSnapshotRequest { // Optional user-provided name for this snapshot. // If the name is not provided in the request, the server will assign a random @@ -927,10 +890,7 @@ message CreateSnapshotRequest { map labels = 3; } -// Request for the UpdateSnapshot method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. +// Request for the UpdateSnapshot method. message UpdateSnapshotRequest { // The updated snapshot object. Snapshot snapshot = 1; @@ -945,10 +905,7 @@ message UpdateSnapshotRequest { // operations, which allow // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state -// captured by a snapshot.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. +// captured by a snapshot. message Snapshot { // The name of the snapshot. string name = 1; @@ -973,20 +930,14 @@ message Snapshot { map labels = 4; } -// Request for the GetSnapshot method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. +// Request for the GetSnapshot method. message GetSnapshotRequest { // The name of the snapshot to get. // Format is `projects/{project}/snapshots/{snap}`. string snapshot = 1; } -// Request for the `ListSnapshots` method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. +// Request for the `ListSnapshots` method. message ListSnapshotsRequest { // The name of the project in which to list snapshots. // Format is `projects/{project-id}`. @@ -1001,10 +952,7 @@ message ListSnapshotsRequest { string page_token = 3; } -// Response for the `ListSnapshots` method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. +// Response for the `ListSnapshots` method. message ListSnapshotsResponse { // The resulting snapshots. repeated Snapshot snapshots = 1; @@ -1014,20 +962,14 @@ message ListSnapshotsResponse { string next_page_token = 2; } -// Request for the `DeleteSnapshot` method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. +// Request for the `DeleteSnapshot` method. message DeleteSnapshotRequest { // The name of the snapshot to delete. // Format is `projects/{project}/snapshots/{snap}`. string snapshot = 1; } -// Request for the `Seek` method.

-// BETA: This feature is part of a beta release. This API might be -// changed in backward-incompatible ways and is not recommended for production -// use. It is not subject to any SLA or deprecation policy. +// Request for the `Seek` method. message SeekRequest { // The subscription to affect. string subscription = 1; diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index 93f824d6544..fdb2cb4e089 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -57,6 +57,15 @@ const MessageStoragePolicy = { * * This object should have the same structure as [MessageStoragePolicy]{@link google.pubsub.v1.MessageStoragePolicy} * + * @property {string} kmsKeyName + * The resource name of the Cloud KMS CryptoKey to be used to protect access + * to messages published on this topic. + * + * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * * @typedef Topic * @memberof google.pubsub.v1 * @see [google.pubsub.v1.Topic definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} @@ -274,10 +283,7 @@ const ListTopicSubscriptionsResponse = { }; /** - * Request for the `ListTopicSnapshots` method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Request for the `ListTopicSnapshots` method. * * @property {string} topic * The name of the topic that snapshots are attached to. @@ -300,10 +306,7 @@ const ListTopicSnapshotsRequest = { }; /** - * Response for the `ListTopicSnapshots` method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Response for the `ListTopicSnapshots` method. * * @property {string[]} snapshots * The names of the snapshots that match the request. @@ -390,10 +393,6 @@ const DeleteTopicRequest = { * * Seek to a timestamp. - *

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. * * @property {Object} messageRetentionDuration * How long to retain unacknowledged messages in the subscription's backlog, @@ -401,10 +400,7 @@ const DeleteTopicRequest = { * If `retain_acked_messages` is true, then this also configures the retention * of acknowledged messages, and thus configures how far back in time a `Seek` * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - * minutes.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * minutes. * * This object should have the same structure as [Duration]{@link google.protobuf.Duration} * @@ -428,9 +424,6 @@ const DeleteTopicRequest = { * operations on the subscription. If `expiration_policy` is not set, a * *default policy* with `ttl` of 31 days will be used. The minimum allowed * value for `expiration_policy.ttl` is 1 day. - * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. * * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} * @@ -516,9 +509,8 @@ const PushConfig = { * [Service account * email](https://cloud.google.com/iam/docs/service-accounts) * to be used for generating the OIDC token. The caller (for - * CreateSubscription, UpdateSubscription, and ModifyPushConfig calls) must + * CreateSubscription, UpdateSubscription, and ModifyPushConfig RPCs) must * have the iam.serviceAccounts.actAs permission for the service account. - * See https://cloud.google.com/iam/docs/understanding-roles#service-accounts-roles. * * @property {string} audience * Audience to be used when generating OIDC token. The audience claim @@ -838,10 +830,7 @@ const StreamingPullResponse = { }; /** - * Request for the `CreateSnapshot` method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Request for the `CreateSnapshot` method. * * @property {string} name * Optional user-provided name for this snapshot. @@ -876,10 +865,7 @@ const CreateSnapshotRequest = { }; /** - * Request for the UpdateSnapshot method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Request for the UpdateSnapshot method. * * @property {Object} snapshot * The updated snapshot object. @@ -906,10 +892,7 @@ const UpdateSnapshotRequest = { * operations, which allow * you to manage message acknowledgments in bulk. That is, you can set the * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * captured by a snapshot. * * @property {string} name * The name of the snapshot. @@ -944,10 +927,7 @@ const Snapshot = { }; /** - * Request for the GetSnapshot method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Request for the GetSnapshot method. * * @property {string} snapshot * The name of the snapshot to get. @@ -962,10 +942,7 @@ const GetSnapshotRequest = { }; /** - * Request for the `ListSnapshots` method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Request for the `ListSnapshots` method. * * @property {string} project * The name of the project in which to list snapshots. @@ -988,10 +965,7 @@ const ListSnapshotsRequest = { }; /** - * Response for the `ListSnapshots` method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Response for the `ListSnapshots` method. * * @property {Object[]} snapshots * The resulting snapshots. @@ -1011,10 +985,7 @@ const ListSnapshotsResponse = { }; /** - * Request for the `DeleteSnapshot` method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Request for the `DeleteSnapshot` method. * * @property {string} snapshot * The name of the snapshot to delete. @@ -1029,10 +1000,7 @@ const DeleteSnapshotRequest = { }; /** - * Request for the `Seek` method.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * Request for the `Seek` method. * * @property {string} subscription * The subscription to affect. diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index a19c9be28a3..85ac9d65630 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -310,6 +310,14 @@ class PublisherClient { * response, then no constraints are in effect. * * This object should have the same structure as [MessageStoragePolicy]{@link google.pubsub.v1.MessageStoragePolicy} + * @param {string} [request.kmsKeyName] + * The resource name of the Cloud KMS CryptoKey to be used to protect access + * to messages published on this topic. + * + * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 04699be0907..d029bfe574e 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -345,20 +345,13 @@ class SubscriberClient { * * Seek to a timestamp. - *

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. * @param {Object} [request.messageRetentionDuration] * How long to retain unacknowledged messages in the subscription's backlog, * from the moment a message is published. * If `retain_acked_messages` is true, then this also configures the retention * of acknowledged messages, and thus configures how far back in time a `Seek` * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - * minutes.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * minutes. * * This object should have the same structure as [Duration]{@link google.protobuf.Duration} * @param {Object.} [request.labels] @@ -379,9 +372,6 @@ class SubscriberClient { * operations on the subscription. If `expiration_policy` is not set, a * *default policy* with `ttl` of 31 days will be used. The minimum allowed * value for `expiration_policy.ttl` is 1 day. - * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. * * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} * @param {Object} [options] @@ -1081,10 +1071,7 @@ class SubscriberClient { * operations, which allow * you to manage message acknowledgments in bulk. That is, you can set the * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * captured by a snapshot. * * @param {Object} request * The request object that will be sent. @@ -1248,11 +1235,7 @@ class SubscriberClient { * you to manage message acknowledgments in bulk. That is, you can set the * acknowledgment state of messages in an existing subscription to the state * captured by a snapshot. - *

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy.

- * If the snapshot already exists, returns `ALREADY_EXISTS`. + *

If the snapshot already exists, returns `ALREADY_EXISTS`. * If the requested subscription doesn't exist, returns `NOT_FOUND`. * If the backlog in the subscription is too old -- and the resulting snapshot * would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. @@ -1345,11 +1328,7 @@ class SubscriberClient { * operations, which allow * you to manage message acknowledgments in bulk. That is, you can set the * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. - * Note that certain properties of a snapshot are not modifiable. + * captured by a snapshot. * * @param {Object} request * The request object that will be sent. @@ -1430,9 +1409,6 @@ class SubscriberClient { * you to manage message acknowledgments in bulk. That is, you can set the * acknowledgment state of messages in an existing subscription to the state * captured by a snapshot.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. * When the snapshot is deleted, all messages retained in the snapshot * are immediately dropped. After a snapshot is deleted, a new one may be * created with the same name, but the new one has no association with the old @@ -1489,10 +1465,7 @@ class SubscriberClient { * you to manage message acknowledgments in bulk. That is, you can set the * acknowledgment state of messages in an existing subscription to the state * captured by a snapshot. Note that both the subscription and the snapshot - * must be on the same topic.

- * BETA: This feature is part of a beta release. This API might be - * changed in backward-incompatible ways and is not recommended for production - * use. It is not subject to any SLA or deprecation policy. + * must be on the same topic. * * @param {Object} request * The request object that will be sent. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 8f1f84887f0..7ef91abc94c 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,26 +1,26 @@ { - "updateTime": "2019-04-27T11:16:15.360383Z", + "updateTime": "2019-05-04T11:20:08.592023Z", "sources": [ { "generator": { "name": "artman", - "version": "0.17.1", - "dockerImage": "googleapis/artman@sha256:a40ca4dd4ef031c0ded4df4909ffdf7b3f20d29b23e682ef991eb60ba0ca6025" + "version": "0.18.0", + "dockerImage": "googleapis/artman@sha256:29bd82cc42c43825fde408e63fc955f3f9d07ff9989243d7aa0f91a35c7884dc" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "808110e242c682d7ac2bab6d9c49fc3bf72d7604", - "internalRef": "245313728" + "sha": "39c876cca5403e7e8282ce2229033cc3cc02962c", + "internalRef": "246561601" } }, { "template": { "name": "node_library", "origin": "synthtool.gcp", - "version": "2019.4.10" + "version": "2019.5.2" } } ], diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index 75ae89329f0..93015444243 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -39,8 +39,10 @@ describe('PublisherClient', () => { // Mock response const name2 = 'name2-1052831874'; + const kmsKeyName = 'kmsKeyName2094986649'; const expectedResponse = { name: name2, + kmsKeyName: kmsKeyName, }; // Mock Grpc layer @@ -101,8 +103,10 @@ describe('PublisherClient', () => { // Mock response const name = 'name3373707'; + const kmsKeyName = 'kmsKeyName2094986649'; const expectedResponse = { name: name, + kmsKeyName: kmsKeyName, }; // Mock Grpc layer @@ -236,8 +240,10 @@ describe('PublisherClient', () => { // Mock response const name = 'name3373707'; + const kmsKeyName = 'kmsKeyName2094986649'; const expectedResponse = { name: name, + kmsKeyName: kmsKeyName, }; // Mock Grpc layer From b22fbf4c9145e5f08f4365c1cd1f2538abf0a1cf Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Wed, 8 May 2019 17:02:58 -0700 Subject: [PATCH 0420/1115] fix: DEADLINE_EXCEEDED no longer treated as idempotent and retried --- .../pubsub/src/v1/doc/google/type/doc_expr.js | 16 ++++++++++++++++ handwritten/pubsub/src/v1/publisher_client.js | 13 +++++++------ .../pubsub/src/v1/publisher_client_config.json | 1 - handwritten/pubsub/src/v1/subscriber_client.js | 13 +++++++------ handwritten/pubsub/synth.metadata | 10 +++++----- 5 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 handwritten/pubsub/src/v1/doc/google/type/doc_expr.js diff --git a/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js b/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js new file mode 100644 index 00000000000..f26716efea0 --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js @@ -0,0 +1,16 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 85ac9d65630..b7e81bf30cb 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -933,8 +933,7 @@ class PublisherClient { * The request object that will be sent. * @param {string} request.resource * REQUIRED: The resource for which the policy is being specified. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. + * See the operation documentation for the appropriate value for this field. * @param {Object} request.policy * REQUIRED: The complete policy to be applied to the `resource`. The size of * the policy is limited to a few 10s of KB. An empty policy is a @@ -1002,8 +1001,7 @@ class PublisherClient { * The request object that will be sent. * @param {string} request.resource * REQUIRED: The resource for which the policy is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. + * See the operation documentation for the appropriate value for this field. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -1055,12 +1053,15 @@ class PublisherClient { * If the resource does not exist, this will return an empty set of * permissions, not a NOT_FOUND error. * + * Note: This operation is designed to be used for building permission-aware + * UIs and command-line tools, not for authorization checking. This operation + * may "fail open" without warning. + * * @param {Object} request * The request object that will be sent. * @param {string} request.resource * REQUIRED: The resource for which the policy detail is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. + * See the operation documentation for the appropriate value for this field. * @param {string[]} request.permissions * The set of permissions to check for the `resource`. Permissions with * wildcards (such as '*' or 'storage.*') are not allowed. For more diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 07b6522cd26..9f8e11874d0 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -14,7 +14,6 @@ "publish": [ "ABORTED", "CANCELLED", - "DEADLINE_EXCEEDED", "INTERNAL", "RESOURCE_EXHAUSTED", "UNAVAILABLE", diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index d029bfe574e..2049d181cb4 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -1543,8 +1543,7 @@ class SubscriberClient { * The request object that will be sent. * @param {string} request.resource * REQUIRED: The resource for which the policy is being specified. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. + * See the operation documentation for the appropriate value for this field. * @param {Object} request.policy * REQUIRED: The complete policy to be applied to the `resource`. The size of * the policy is limited to a few 10s of KB. An empty policy is a @@ -1612,8 +1611,7 @@ class SubscriberClient { * The request object that will be sent. * @param {string} request.resource * REQUIRED: The resource for which the policy is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. + * See the operation documentation for the appropriate value for this field. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. @@ -1665,12 +1663,15 @@ class SubscriberClient { * If the resource does not exist, this will return an empty set of * permissions, not a NOT_FOUND error. * + * Note: This operation is designed to be used for building permission-aware + * UIs and command-line tools, not for authorization checking. This operation + * may "fail open" without warning. + * * @param {Object} request * The request object that will be sent. * @param {string} request.resource * REQUIRED: The resource for which the policy detail is being requested. - * `resource` is usually specified as a path. For example, a Project - * resource is specified as `projects/{project}`. + * See the operation documentation for the appropriate value for this field. * @param {string[]} request.permissions * The set of permissions to check for the `resource`. Permissions with * wildcards (such as '*' or 'storage.*') are not allowed. For more diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 7ef91abc94c..e48e4438bc9 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-05-04T11:20:08.592023Z", + "updateTime": "2019-05-08T12:04:26.586274Z", "sources": [ { "generator": { "name": "artman", - "version": "0.18.0", - "dockerImage": "googleapis/artman@sha256:29bd82cc42c43825fde408e63fc955f3f9d07ff9989243d7aa0f91a35c7884dc" + "version": "0.19.0", + "dockerImage": "googleapis/artman@sha256:d3df563538225ac6caac45d8ad86499500211d1bcb2536955a6dbda15e1b368e" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "39c876cca5403e7e8282ce2229033cc3cc02962c", - "internalRef": "246561601" + "sha": "51145ff7812d2bb44c1219d0b76dac92a8bd94b2", + "internalRef": "247143125" } }, { From 4dfc5789b09eaecc33fbdee3b7fd2ffa6ae295d2 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 9 May 2019 10:36:16 -0700 Subject: [PATCH 0421/1115] test: fix snapshot fixture creation (#602) --- handwritten/pubsub/test/snapshot.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index fa8b40ba318..44f9f5bfa00 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -124,7 +124,7 @@ describe('Snapshot', () => { let pubsub: PubSub; let subscription: Subscription; before(() => { - pubsub = new PubSub(PUBSUB); + pubsub = new PubSub({projectId: PROJECT_ID}); subscription = pubsub.subscription('test'); }); From d0fc9b45085e4e2dd74ac8f926edd9d8a68d793a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Fri, 10 May 2019 15:04:03 -0700 Subject: [PATCH 0422/1115] fix: DEADLINE_EXCEEDED retry code is idempotent (#605) --- handwritten/pubsub/src/v1/publisher_client_config.json | 1 + handwritten/pubsub/synth.metadata | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 9f8e11874d0..07b6522cd26 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -14,6 +14,7 @@ "publish": [ "ABORTED", "CANCELLED", + "DEADLINE_EXCEEDED", "INTERNAL", "RESOURCE_EXHAUSTED", "UNAVAILABLE", diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index e48e4438bc9..ed253da6015 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-05-08T12:04:26.586274Z", + "updateTime": "2019-05-10T12:09:34.175348Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "51145ff7812d2bb44c1219d0b76dac92a8bd94b2", - "internalRef": "247143125" + "sha": "07883be5bf3c3233095e99d8e92b8094f5d7084a", + "internalRef": "247530843" } }, { From 52d2569666bbd3d17881cf225ec4b0e66d35ce57 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 10 May 2019 15:04:32 -0700 Subject: [PATCH 0423/1115] fix(deps): update dependency google-auth-library to v4 (#601) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5775281a218..17504fd310a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -61,7 +61,7 @@ "arrify": "^2.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", - "google-auth-library": "^3.0.0", + "google-auth-library": "^4.0.0", "google-gax": "^0.26.0", "is-stream-ended": "^0.1.4", "lodash.merge": "^4.6.0", From f80b0635921ce0d4342233e000e22c7b025fe5a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 10 May 2019 15:04:52 -0700 Subject: [PATCH 0424/1115] fix(deps): update dependency @google-cloud/precise-date to v1 (#603) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 17504fd310a..f014a256837 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@google-cloud/paginator": "^1.0.0", - "@google-cloud/precise-date": "^0.1.0", + "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", "@sindresorhus/is": "^0.15.0", @@ -61,7 +61,7 @@ "arrify": "^2.0.0", "async-each": "^1.0.1", "extend": "^3.0.1", - "google-auth-library": "^4.0.0", + "google-auth-library": "^3.0.0", "google-gax": "^0.26.0", "is-stream-ended": "^0.1.4", "lodash.merge": "^4.6.0", From 9100d3d3bd8b5d17d1f2e94c65ee3b82140e10a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 10 May 2019 15:05:16 -0700 Subject: [PATCH 0425/1115] fix(deps): update dependency google-gax to v1 (#604) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f014a256837..319367e748e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -62,7 +62,7 @@ "async-each": "^1.0.1", "extend": "^3.0.1", "google-auth-library": "^3.0.0", - "google-gax": "^0.26.0", + "google-gax": "^1.0.0", "is-stream-ended": "^0.1.4", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", From 045e337c277f2ddd6fd7f861d017275b076dd575 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 14 May 2019 19:53:50 -0700 Subject: [PATCH 0426/1115] refactor: use core grpc (#608) --- handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/pubsub.ts | 3 ++- handwritten/pubsub/test/index.ts | 24 +++++++----------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 319367e748e..69e8d9dd352 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -63,6 +63,7 @@ "extend": "^3.0.1", "google-auth-library": "^3.0.0", "google-gax": "^1.0.0", + "grpc": "^1.20.3", "is-stream-ended": "^0.1.4", "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index e3cc3211150..5dfa3e60970 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -21,6 +21,7 @@ import is from '@sindresorhus/is'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; import * as gax from 'google-gax'; +import * as grpc from 'grpc'; const PKG = require('../../package.json'); const v1 = require('./v1'); @@ -48,7 +49,6 @@ import {google} from '../proto/pubsub'; import {ServiceError, ChannelCredentials} from 'grpc'; const opts = {} as gax.GrpcClientOptions; -const {grpc} = new gax.GrpcClient(opts); /** * Project ID placeholder. @@ -263,6 +263,7 @@ export class PubSub { } this.options = Object.assign( { + grpc, 'grpc.keepalive_time_ms': 300000, 'grpc.max_send_message_length': -1, 'grpc.max_receive_message_length': 20000001, diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 583dac8545e..20cba5f885f 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -19,7 +19,8 @@ import * as promisify from '@google-cloud/promisify'; import arrify = require('arrify'); import * as assert from 'assert'; import * as gax from 'google-gax'; -import {CallOptions, ServiceError} from 'grpc'; +import * as grpc from 'grpc'; +import {CallOptions, ServiceError, ChannelCredentials} from 'grpc'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -32,21 +33,9 @@ import * as util from '../src/util'; const PKG = require('../../package.json'); const sandbox = sinon.createSandbox(); -const fakeCreds = {}; -const fakeGoogleGax = { - GrpcClient: class extends gax.GrpcClient { - constructor(opts: gax.GrpcClientOptions) { - super(opts); - this.grpc = { - credentials: { - createInsecure() { - return fakeCreds; - }, - }, - } as gax.GrpcModule; - } - }, -}; + +const fakeCreds = {} as ChannelCredentials; +sandbox.stub(grpc.credentials, 'createInsecure').returns(fakeCreds); const subscriptionCached = subby.Subscription; @@ -177,7 +166,7 @@ describe('PubSub', () => { 'google-auth-library': { GoogleAuth: fakeGoogleAuth, }, - 'google-gax': fakeGoogleGax, + grpc, './snapshot': {Snapshot: FakeSnapshot}, './subscription': {Subscription}, './topic': {Topic: FakeTopic}, @@ -200,6 +189,7 @@ describe('PubSub', () => { describe('instantiation', () => { const DEFAULT_OPTIONS = { + grpc, 'grpc.keepalive_time_ms': 300000, 'grpc.max_send_message_length': -1, 'grpc.max_receive_message_length': 20000001, From 9c400084a92fd10dec2571e356257668b06537f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Wed, 15 May 2019 08:33:54 -0700 Subject: [PATCH 0427/1115] chore(deps): update dependency jsdoc to v3.6.2 (#606) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 69e8d9dd352..a7e62e2dfa9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -86,7 +86,7 @@ "eslint-plugin-prettier": "^3.0.0", "gts": "^1.0.0", "intelli-espower-loader": "^1.0.1", - "jsdoc": "3.5.5", + "jsdoc": "^3.6.2", "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", "linkinator": "^1.1.2", "mkdirp": "^0.5.1", From bd5bcad7c21fe787eb74390326f74fb17760d89a Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 15 May 2019 11:19:50 -0700 Subject: [PATCH 0428/1115] refactor(subscriber): message stream retry logic (#607) --- handwritten/pubsub/src/message-stream.ts | 57 +++++-------- handwritten/pubsub/src/pull-retry.ts | 78 ++++++++++++++++++ handwritten/pubsub/test/message-stream.ts | 4 +- handwritten/pubsub/test/pull-retry.ts | 97 +++++++++++++++++++++++ 4 files changed, 197 insertions(+), 39 deletions(-) create mode 100644 handwritten/pubsub/src/pull-retry.ts create mode 100644 handwritten/pubsub/test/pull-retry.ts diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 313a85e3fe4..532436799bf 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -26,38 +26,15 @@ import { import * as isStreamEnded from 'is-stream-ended'; import {PassThrough} from 'stream'; -import {PullResponse, Subscriber} from './subscriber'; +import {PullRetry} from './pull-retry'; +import {Subscriber} from './subscriber'; +import {google} from '../proto/pubsub'; /*! * Frequency to ping streams. */ const KEEP_ALIVE_INTERVAL = 30000; -/*! - * Deadline Exceeded status code - */ -const DEADLINE: status = 4; - -/*! - * Unknown status code - */ -const UNKNOWN: status = 2; - -/*! - * codes to retry streams - */ -const RETRY_CODES: status[] = [ - 0, // ok - 1, // canceled - 2, // unknown - 4, // deadline exceeded - 8, // resource exhausted - 10, // aborted - 13, // internal error - 14, // unavailable - 15, // dataloss -]; - /*! * Deadline for the stream. */ @@ -79,14 +56,8 @@ interface StreamState { highWaterMark: number; } -interface StreamingPullRequest { - subscription?: string; - ackIds?: string[]; - modifyDeadlineSeconds?: number[]; - modifyDeadlineAckIds?: string[]; - streamAckDeadlineSeconds?: number; -} - +type StreamingPullRequest = google.pubsub.v1.IStreamingPullRequest; +type PullResponse = google.pubsub.v1.IPullResponse; type PullStream = ClientDuplexStream & { _readableState: StreamState; }; @@ -119,7 +90,9 @@ export class ChannelError extends Error implements ServiceError { code: status; constructor(err: Error) { super(`Failed to connect to channel. Reason: ${err.message}`); - this.code = err.message.includes('deadline') ? DEADLINE : UNKNOWN; + this.code = err.message.includes('deadline') + ? status.DEADLINE_EXCEEDED + : status.UNKNOWN; } } @@ -154,7 +127,9 @@ export interface MessageStreamOptions { export class MessageStream extends PassThrough { destroyed: boolean; private _keepAliveHandle: NodeJS.Timer; + private _fillHandle?: NodeJS.Timer; private _options: MessageStreamOptions; + private _retrier: PullRetry; private _streams: Map; private _subscriber: Subscriber; constructor(sub: Subscriber, options = {} as MessageStreamOptions) { @@ -164,6 +139,7 @@ export class MessageStream extends PassThrough { this.destroyed = false; this._options = options; + this._retrier = new PullRetry(); this._streams = new Map(); this._subscriber = sub; @@ -253,6 +229,8 @@ export class MessageStream extends PassThrough { streamAckDeadlineSeconds: this._subscriber.ackDeadline, }; + delete this._fillHandle; + for (let i = this._streams.size; i < this._options.maxStreams!; i++) { const stream: PullStream = client.streamingPull({deadline}); this._addStream(stream); @@ -302,8 +280,13 @@ export class MessageStream extends PassThrough { private _onEnd(stream: PullStream, status: StatusObject): void { this._removeStream(stream); - if (RETRY_CODES.includes(status.code)) { - this._fillStreamPool(); + if (this._fillHandle) { + return; + } + + if (this._retrier.retry(status)) { + const delay = this._retrier.createTimeout(); + this._fillHandle = setTimeout(() => this._fillStreamPool(), delay); } else if (!this._streams.size) { this.destroy(new StatusError(status)); } diff --git a/handwritten/pubsub/src/pull-retry.ts b/handwritten/pubsub/src/pull-retry.ts new file mode 100644 index 00000000000..838ade599b3 --- /dev/null +++ b/handwritten/pubsub/src/pull-retry.ts @@ -0,0 +1,78 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import {StatusObject, status} from 'grpc'; + +/*! + * retryable status codes + */ +export const RETRY_CODES: status[] = [ + status.OK, + status.CANCELLED, + status.UNKNOWN, + status.DEADLINE_EXCEEDED, + status.RESOURCE_EXHAUSTED, + status.ABORTED, + status.INTERNAL, + status.UNAVAILABLE, + status.DATA_LOSS, +]; + +/** + * Used to track pull requests and determine if additional requests should be + * made, etc. + * + * @class + * @private + */ +export class PullRetry { + private failures = 0; + /** + * Generates a timeout that can be used for applying a backoff based on the + * current number of failed requests. + * + * @see {@link https://cloud.google.com/iot/docs/how-tos/exponential-backoff} + * @private + * @returns {number} + */ + createTimeout(): number { + if (this.failures === 0) { + return 0; + } + return Math.pow(2, this.failures) * 1000 + Math.floor(Math.random() * 1000); + } + /** + * Determines if a request status should be retried. + * + * Deadlines behave kind of unexpectedly on streams, rather than using it as + * an indicator of when to give up trying to connect, it actually dictates + * how long the stream should stay open. Because of this, it is virtually + * impossible to determine whether or not a deadline error is the result of + * the server closing the stream or if we timed out waiting for a connection. + * + * @private + * @param {object} status The request status. + * @returns {boolean} + */ + retry(err: StatusObject): boolean { + if (err.code === status.OK || err.code === status.DEADLINE_EXCEEDED) { + this.failures = 0; + } else { + this.failures += 1; + } + + return RETRY_CODES.includes(err.code); + } +} diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index e0754b22288..2757bc19075 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -506,7 +506,7 @@ describe('MessageStream', () => { stream.push(null); setImmediate(() => { - assert.strictEqual(client.streams.length, 6); + assert.strictEqual(client.streams.length, 5); done(); }); }); @@ -524,7 +524,7 @@ describe('MessageStream', () => { assert.strictEqual(stream.listenerCount('end'), count); setImmediate(() => { - assert.strictEqual(client.streams.length, 6); + assert.strictEqual(client.streams.length, 5); done(); }); }); diff --git a/handwritten/pubsub/test/pull-retry.ts b/handwritten/pubsub/test/pull-retry.ts new file mode 100644 index 00000000000..4c098234a4a --- /dev/null +++ b/handwritten/pubsub/test/pull-retry.ts @@ -0,0 +1,97 @@ +/** + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import assert = require('assert'); +import sinon = require('sinon'); +import {StatusObject, status} from 'grpc'; +import {PullRetry} from '../src/pull-retry'; + +describe('PullRetry', () => { + const sandbox = sinon.createSandbox(); + + let retrier: PullRetry; + + beforeEach(() => { + retrier = new PullRetry(); + }); + + afterEach(() => { + sandbox.restore(); + }); + + describe('createTimeout', () => { + it('should return 0 when no failures have occurred', () => { + assert.strictEqual(retrier.createTimeout(), 0); + }); + + it('should use a backoff factoring in the failure count', () => { + const random = Math.random(); + const expected = Math.pow(2, 1) * 1000 + Math.floor(random * 1000); + + sandbox.stub(global.Math, 'random').returns(random); + + retrier.retry({code: status.CANCELLED} as StatusObject); + assert.strictEqual(retrier.createTimeout(), expected); + }); + }); + + describe('retry', () => { + it('should return true for retryable errors', () => { + [ + status.OK, + status.CANCELLED, + status.UNKNOWN, + status.DEADLINE_EXCEEDED, + status.RESOURCE_EXHAUSTED, + status.ABORTED, + status.INTERNAL, + status.UNAVAILABLE, + status.DATA_LOSS, + ].forEach((code: status) => { + const shouldRetry = retrier.retry({code} as StatusObject); + assert.strictEqual(shouldRetry, true); + }); + }); + + it('should return false for non-retryable errors', () => { + [ + status.INVALID_ARGUMENT, + status.NOT_FOUND, + status.PERMISSION_DENIED, + status.FAILED_PRECONDITION, + status.OUT_OF_RANGE, + status.UNIMPLEMENTED, + ].forEach((code: status) => { + const shouldRetry = retrier.retry({code} as StatusObject); + assert.strictEqual(shouldRetry, false); + }); + }); + + it('should reset the failure count on OK', () => { + retrier.retry({code: status.CANCELLED} as StatusObject); + retrier.retry({code: status.OK} as StatusObject); + + assert.strictEqual(retrier.createTimeout(), 0); + }); + + it('should reset the failure count on DEADLINE_EXCEEDED', () => { + retrier.retry({code: status.CANCELLED} as StatusObject); + retrier.retry({code: status.DEADLINE_EXCEEDED} as StatusObject); + + assert.strictEqual(retrier.createTimeout(), 0); + }); + }); +}); From 7e9add18209c4241224a13cc22d63ebd94ecc46a Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 16 May 2019 11:29:33 -0700 Subject: [PATCH 0429/1115] chore: release 0.29.0 (#609) --- handwritten/pubsub/CHANGELOG.md | 37 ++++++++++++++++++++++++++++++++- handwritten/pubsub/package.json | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index e12e3e9b482..5fa26aecfc3 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,42 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +## [0.29.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.28.1...v0.29.0) (2019-05-15) + + +### Bug Fixes + +* **deps:** update dependency @google-cloud/paginator to v1 ([#592](https://www.github.com/googleapis/nodejs-pubsub/issues/592)) ([181553a](https://www.github.com/googleapis/nodejs-pubsub/commit/181553a)) +* **deps:** update dependency @google-cloud/precise-date to v1 ([#603](https://www.github.com/googleapis/nodejs-pubsub/issues/603)) ([2e669a1](https://www.github.com/googleapis/nodejs-pubsub/commit/2e669a1)) +* **deps:** update dependency @google-cloud/projectify to v1 ([#588](https://www.github.com/googleapis/nodejs-pubsub/issues/588)) ([d01d010](https://www.github.com/googleapis/nodejs-pubsub/commit/d01d010)) +* **deps:** update dependency @google-cloud/promisify to v1 ([#589](https://www.github.com/googleapis/nodejs-pubsub/issues/589)) ([dad7530](https://www.github.com/googleapis/nodejs-pubsub/commit/dad7530)) +* **deps:** update dependency arrify to v2 ([#565](https://www.github.com/googleapis/nodejs-pubsub/issues/565)) ([8e3b7b8](https://www.github.com/googleapis/nodejs-pubsub/commit/8e3b7b8)) +* **deps:** update dependency google-auth-library to v4 ([#601](https://www.github.com/googleapis/nodejs-pubsub/issues/601)) ([baf9d39](https://www.github.com/googleapis/nodejs-pubsub/commit/baf9d39)) +* **deps:** update dependency google-gax to v1 ([#604](https://www.github.com/googleapis/nodejs-pubsub/issues/604)) ([6415e7c](https://www.github.com/googleapis/nodejs-pubsub/commit/6415e7c)) +* DEADLINE_EXCEEDED no longer treated as idempotent and retried ([39b1dac](https://www.github.com/googleapis/nodejs-pubsub/commit/39b1dac)) +* DEADLINE_EXCEEDED retry code is idempotent ([#605](https://www.github.com/googleapis/nodejs-pubsub/issues/605)) ([1ae8db9](https://www.github.com/googleapis/nodejs-pubsub/commit/1ae8db9)) +* **deps:** update dependency google-gax to ^0.26.0 ([#583](https://www.github.com/googleapis/nodejs-pubsub/issues/583)) ([4214a4f](https://www.github.com/googleapis/nodejs-pubsub/commit/4214a4f)) +* include 'x-goog-request-params' header in requests ([#562](https://www.github.com/googleapis/nodejs-pubsub/issues/562)) ([482e745](https://www.github.com/googleapis/nodejs-pubsub/commit/482e745)) +* relax strictEqual to match RegExp ([#566](https://www.github.com/googleapis/nodejs-pubsub/issues/566)) ([3388fb7](https://www.github.com/googleapis/nodejs-pubsub/commit/3388fb7)) +* **deps:** update dependency p-defer to v2 ([#553](https://www.github.com/googleapis/nodejs-pubsub/issues/553)) ([fe33e40](https://www.github.com/googleapis/nodejs-pubsub/commit/fe33e40)) + + +### Build System + +* upgrade engines field to >=8.10.0 ([#584](https://www.github.com/googleapis/nodejs-pubsub/issues/584)) ([2116474](https://www.github.com/googleapis/nodejs-pubsub/commit/2116474)) + + +### Features + +* **subscriber:** ordered messages ([1ae4719](https://www.github.com/googleapis/nodejs-pubsub/commit/1ae4719)) +* **subscription:** accept pull timeout option ([#556](https://www.github.com/googleapis/nodejs-pubsub/issues/556)) ([468e1bf](https://www.github.com/googleapis/nodejs-pubsub/commit/468e1bf)) +* **subscription:** ordered messages ([#560](https://www.github.com/googleapis/nodejs-pubsub/issues/560)) ([38502ad](https://www.github.com/googleapis/nodejs-pubsub/commit/38502ad)) + + +### BREAKING CHANGES + +* upgrade engines field to >=8.10.0 (#584) + ## v0.28.1 03-11-2019 15:36 PDT @@ -513,4 +549,3 @@ const pubsub = new PubSub(); - Configure Renovate (#144) - refactor: drop repo-tool as an exec wrapper (#150) - fix: update linking for samples (#146) - diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a7e62e2dfa9..9657c6924f7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.28.1", + "version": "0.29.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 1e978dff16161db722c20a690c641dc129a9d27d Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 16 May 2019 13:39:21 -0700 Subject: [PATCH 0430/1115] fix: use typescript import/export for gapics (#611) --- handwritten/pubsub/src/index.ts | 3 +- handwritten/pubsub/test/index.ts | 1361 +--------------------------- handwritten/pubsub/test/pubsub.ts | 1375 +++++++++++++++++++++++++++++ 3 files changed, 1382 insertions(+), 1357 deletions(-) create mode 100644 handwritten/pubsub/test/pubsub.ts diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 7cceebb7faa..f7dc6610dbc 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -74,7 +74,8 @@ * @property {constructor} SubscriberClient * Reference to {@link v1.SubscriberClient}. */ -module.exports.v1 = require('./v1'); +const v1 = require('./v1'); +export {v1}; export {CallOptions} from 'google-gax'; export {ServiceError} from 'grpc'; diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 20cba5f885f..ae7927ba697 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -1,5 +1,5 @@ /** - * Copyright 2014 Google Inc. All Rights Reserved. + * Copyright 2019 Google Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,1362 +14,11 @@ * limitations under the License. */ -import * as pjy from '@google-cloud/projectify'; -import * as promisify from '@google-cloud/promisify'; -import arrify = require('arrify'); import * as assert from 'assert'; -import * as gax from 'google-gax'; -import * as grpc from 'grpc'; -import {CallOptions, ServiceError, ChannelCredentials} from 'grpc'; -import * as proxyquire from 'proxyquire'; -import * as sinon from 'sinon'; +import * as pubsub from '../src'; -import {google} from '../proto/pubsub'; -import * as pubsubTypes from '../src/pubsub'; -import {Snapshot} from '../src/snapshot'; -import * as subby from '../src/subscription'; -import {Topic} from '../src/topic'; -import * as util from '../src/util'; - -const PKG = require('../../package.json'); -const sandbox = sinon.createSandbox(); - -const fakeCreds = {} as ChannelCredentials; -sandbox.stub(grpc.credentials, 'createInsecure').returns(fakeCreds); - -const subscriptionCached = subby.Subscription; - -// tslint:disable-next-line no-any -let subscriptionOverride: any; - -function Subscription( - pubsub: pubsubTypes.PubSub, - name: string, - options: subby.SubscriptionOptions -) { - const overrideFn = subscriptionOverride || subscriptionCached; - return new overrideFn(pubsub, name, options); -} - -let promisified = false; -const fakePromisify = Object.assign({}, promisify, { - promisifyAll( - // tslint:disable-next-line variable-name - Class: typeof pubsubTypes.PubSub, - options: promisify.PromisifyAllOptions - ) { - if (Class.name !== 'PubSub') { - return; - } - - promisified = true; - assert.deepStrictEqual(options.exclude, [ - 'request', - 'snapshot', - 'subscription', - 'topic', - ]); - }, -}); - -let pjyOverride: Function; -function fakePjy() { - return (pjyOverride || pjy.replaceProjectIdToken).apply(null, arguments); -} - -class FakeSnapshot { - calledWith_: IArguments; - constructor() { - this.calledWith_ = arguments; - } -} - -class FakeTopic { - calledWith_: IArguments; - getSubscriptions?: Function; - constructor() { - this.calledWith_ = arguments; - } -} - -let extended = false; -const fakePaginator = { - // tslint:disable-next-line variable-name - extend(Class: typeof pubsubTypes.PubSub, methods: string[]) { - if (Class.name !== 'PubSub') { - return; - } - - methods = arrify(methods); - assert.strictEqual(Class.name, 'PubSub'); - assert.deepStrictEqual(methods, [ - 'getSnapshots', - 'getSubscriptions', - 'getTopics', - ]); - - extended = true; - }, - streamify(methodName: string) { - return methodName; - }, -}; - -let googleAuthOverride: Function | null; -function fakeGoogleAuth() { - return (googleAuthOverride || util.noop).apply(null, arguments); -} - -const v1Override = {}; -// tslint:disable-next-line no-any -let v1ClientOverrides: any = {}; - -function defineOverridableClient(clientName: string) { - function DefaultClient() {} - // tslint:disable-next-line no-any - (DefaultClient as any).scopes = []; - - Object.defineProperty(v1Override, clientName, { - get() { - return v1ClientOverrides[clientName] || DefaultClient; - }, - }); -} - -defineOverridableClient('FakeClient'); -defineOverridableClient('PublisherClient'); -defineOverridableClient('SubscriberClient'); - -describe('PubSub', () => { - // tslint:disable-next-line variable-name - let PubSub: typeof pubsubTypes.PubSub; - const PROJECT_ID = 'test-project'; - - let pubsub: pubsubTypes.PubSub; - const OPTIONS = { - projectId: PROJECT_ID, - promise: {}, - } as pubsubTypes.ClientConfig; - - const PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; - - before(() => { - delete process.env.PUBSUB_EMULATOR_HOST; - PubSub = proxyquire('../src/pubsub', { - '@google-cloud/paginator': { - paginator: fakePaginator, - }, - '@google-cloud/promisify': fakePromisify, - '@google-cloud/projectify': { - replaceProjectIdToken: fakePjy, - }, - 'google-auth-library': { - GoogleAuth: fakeGoogleAuth, - }, - grpc, - './snapshot': {Snapshot: FakeSnapshot}, - './subscription': {Subscription}, - './topic': {Topic: FakeTopic}, - './v1': v1Override, - }).PubSub; - }); - - after(() => { - if (PUBSUB_EMULATOR_HOST) { - process.env.PUBSUB_EMULATOR_HOST = PUBSUB_EMULATOR_HOST; - } - }); - - beforeEach(() => { - v1ClientOverrides = {}; - googleAuthOverride = null; - pubsub = new PubSub(OPTIONS); - pubsub.projectId = PROJECT_ID; - }); - - describe('instantiation', () => { - const DEFAULT_OPTIONS = { - grpc, - 'grpc.keepalive_time_ms': 300000, - 'grpc.max_send_message_length': -1, - 'grpc.max_receive_message_length': 20000001, - libName: 'gccl', - libVersion: PKG.version, - scopes: [], - }; - - it('should extend the correct methods', () => { - assert(extended); // See `fakePaginator.extend` - }); - - it('should streamify the correct methods', () => { - assert.strictEqual(pubsub.getSnapshotsStream, 'getSnapshots'); - assert.strictEqual(pubsub.getSubscriptionsStream, 'getSubscriptions'); - assert.strictEqual(pubsub.getTopicsStream, 'getTopics'); - }); - - it('should promisify all the things', () => { - assert(promisified); - }); - - it('should return an instance', () => { - assert(new PubSub() instanceof PubSub); - }); - - it('should combine all required scopes', () => { - v1ClientOverrides.SubscriberClient = {}; - v1ClientOverrides.SubscriberClient.scopes = ['a', 'b', 'c']; - - v1ClientOverrides.PublisherClient = {}; - v1ClientOverrides.PublisherClient.scopes = ['b', 'c', 'd', 'e']; - - const pubsub = new PubSub({}); - const options = {scopes: ['a', 'b', 'c', 'd', 'e']}; - const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, options); - assert.deepStrictEqual(pubsub.options, expectedOptions); - }); - - it('should attempt to determine the service path and port', () => { - const determineBaseUrl_ = PubSub.prototype.determineBaseUrl_; - let called = false; - - PubSub.prototype.determineBaseUrl_ = () => { - PubSub.prototype.determineBaseUrl_ = determineBaseUrl_; - called = true; - }; - - // tslint:disable-next-line no-unused-expression - new PubSub({}); - assert(called); - }); - - it('should initialize the API object', () => { - assert.deepStrictEqual(pubsub.api, {}); - }); - - it('should cache a local google-auth-library instance', () => { - const fakeGoogleAuthInstance = {}; - const options = { - a: 'b', - c: 'd', - } as pubsubTypes.ClientConfig; - const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, options); - - googleAuthOverride = (options_: pubsubTypes.ClientConfig) => { - assert.deepStrictEqual(options_, expectedOptions); - return fakeGoogleAuthInstance; - }; - - const pubsub = new PubSub(options); - assert.strictEqual(pubsub.auth, fakeGoogleAuthInstance); - }); - - it('should localize the options provided', () => { - const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, OPTIONS); - - assert.deepStrictEqual(pubsub.options, expectedOptions); - }); - - it('should set the projectId', () => { - assert.strictEqual(pubsub.projectId, PROJECT_ID); - }); - - it('should default the projectId to the token', () => { - const pubsub = new PubSub({}); - assert.strictEqual(pubsub.projectId, '{{projectId}}'); - }); - - it('should set isEmulator to false by default', () => { - assert.strictEqual(pubsub.isEmulator, false); - }); - - it('should localize a Promise override', () => { - assert.strictEqual(pubsub.Promise, OPTIONS.promise); - }); - }); - - describe('createSubscription', () => { - const TOPIC_NAME = 'topic'; - pubsub = new pubsubTypes.PubSub({}); - const TOPIC = (Object.assign(new FakeTopic(), { - name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, - }) as {}) as Topic; - - const SUB_NAME = 'subscription'; - const SUBSCRIPTION = { - name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME, - }; - - const apiResponse = { - name: 'subscription-name', - }; - - beforeEach(() => { - ((Subscription as {}) as typeof subby.Subscription).formatMetadata_ = ( - metadata: subby.SubscriptionMetadata - ) => { - return Object.assign({}, metadata) as subby.SubscriptionMetadata; - }; - }); - - it('should throw if no Topic is provided', () => { - assert.throws(() => { - // tslint:disable-next-line no-any - (pubsub as any).createSubscription(); - }, /A Topic is required for a new subscription\./); - }); - - it('should throw if no subscription name is provided', () => { - assert.throws(() => { - // tslint:disable-next-line no-any - (pubsub as any).createSubscription(TOPIC_NAME); - }, /A subscription name is required./); - }); - - it('should not require configuration options', done => { - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse); - }; - - pubsub.createSubscription(TOPIC, SUB_NAME, done); - }); - - it('should allow undefined/optional configuration options', done => { - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse); - }; - // tslint:disable-next-line no-any - (pubsub as any).createSubscription(TOPIC, SUB_NAME, undefined, done); - }); - - it('should create a Subscription', done => { - const opts = {a: 'b', c: 'd'} as subby.CreateSubscriptionOptions; - - pubsub.request = util.noop; - - pubsub.subscription = (subName, options) => { - assert.strictEqual(subName, SUB_NAME); - assert.deepStrictEqual(options, opts); - setImmediate(done); - return SUBSCRIPTION as subby.Subscription; - }; - pubsub.createSubscription(TOPIC, SUB_NAME, opts, assert.ifError); - }); - - it('should create a Topic object from a string', done => { - pubsub.request = util.noop; - - pubsub.topic = topicName => { - assert.strictEqual(topicName, TOPIC_NAME); - setImmediate(done); - return TOPIC; - }; - - pubsub.createSubscription(TOPIC_NAME, SUB_NAME, assert.ifError); - }); - - it('should send correct request', done => { - const options = { - gaxOpts: {}, - }; - - pubsub.topic = topicName => { - return { - name: topicName, - } as Topic; - }; - pubsub.subscription = subName => { - return { - name: subName, - } as subby.Subscription; - }; - - const reqOpts = {topic: TOPIC.name, name: SUB_NAME}; - - pubsub.request = config => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'createSubscription'); - assert.deepStrictEqual(config.reqOpts, reqOpts); - assert.deepStrictEqual(config.gaxOpts, options.gaxOpts); - done(); - }; - - pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); - }); - - it('should pass options to the api request', done => { - const options = { - retainAckedMessages: true, - pushEndpoint: 'https://domain/push', - }; - - const expectedBody = Object.assign( - {topic: TOPIC.name, name: SUB_NAME}, - options - ); - - pubsub.topic = () => { - return { - name: TOPIC_NAME, - } as Topic; - }; - - pubsub.subscription = () => { - return { - name: SUB_NAME, - } as subby.Subscription; - }; - - pubsub.request = config => { - assert.notStrictEqual(config.reqOpts, options); - assert.deepStrictEqual(config.reqOpts, expectedBody); - done(); - }; - - pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); - }); - - it('should discard flow control options', done => { - const options = { - flowControl: {}, - }; - - const expectedBody = { - topic: TOPIC.name, - name: SUB_NAME, - }; - - pubsub.topic = () => { - return { - name: TOPIC_NAME, - } as Topic; - }; - - pubsub.subscription = () => { - return { - name: SUB_NAME, - } as subby.Subscription; - }; - - pubsub.request = config => { - assert.notStrictEqual(config.reqOpts, options); - assert.deepStrictEqual(config.reqOpts, expectedBody); - done(); - }; - - pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); - }); - - it('should format the metadata', done => { - const fakeMetadata = {}; - const formatted = { - a: 'a', - }; - - ((Subscription as {}) as typeof subby.Subscription).formatMetadata_ = ( - metadata: subby.SubscriptionMetadata - ) => { - assert.deepStrictEqual(metadata, fakeMetadata); - return (formatted as {}) as subby.SubscriptionMetadata; - }; - - pubsub.request = (config: pubsubTypes.RequestConfig) => { - assert.strictEqual(config.reqOpts, formatted); - done(); - }; - - pubsub.createSubscription(TOPIC, SUB_NAME, fakeMetadata, assert.ifError); - }); - - describe('error', () => { - const error = new Error('Error.'); - const apiResponse = {name: SUB_NAME}; - - beforeEach(() => { - pubsub.request = (config, callback: Function) => { - callback(error, apiResponse); - }; - }); - - it('should return error & API response to the callback', done => { - pubsub.request = (config, callback: Function) => { - callback(error, apiResponse); - }; - - function callback( - err?: Error | null, - sub?: subby.Subscription | null, - resp?: google.pubsub.v1.ISubscription | null - ) { - assert.strictEqual(err, error); - assert.strictEqual(sub, null); - assert.strictEqual(resp, apiResponse); - done(); - } - - pubsub.createSubscription(TOPIC_NAME, SUB_NAME, callback); - }); - }); - - describe('success', () => { - const apiResponse = {name: SUB_NAME}; - - beforeEach(() => { - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse); - }; - }); - - it('should return Subscription & resp to the callback', done => { - const subscription = {}; - pubsub.subscription = () => { - return subscription as subby.Subscription; - }; - - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse); - }; - - function callback( - err?: Error | null, - sub?: subby.Subscription | null, - resp?: google.pubsub.v1.ISubscription | null - ) { - assert.ifError(err); - assert.strictEqual(sub, subscription); - assert.strictEqual(resp, apiResponse); - done(); - } - - pubsub.createSubscription(TOPIC_NAME, SUB_NAME, callback); - }); - }); - }); - - describe('createTopic', () => { - it('should make the correct API request', done => { - const pubsub = new pubsubTypes.PubSub(); - const topicName = 'new-topic-name'; - const formattedName = 'formatted-name'; - const gaxOpts = {}; - - pubsub.topic = name => { - assert.strictEqual(name, topicName); - - return { - name: formattedName, - } as Topic; - }; - - pubsub.request = config => { - assert.strictEqual(config.client, 'PublisherClient'); - assert.strictEqual(config.method, 'createTopic'); - assert.deepStrictEqual(config.reqOpts, {name: formattedName}); - assert.deepStrictEqual(config.gaxOpts, gaxOpts); - done(); - }; - - pubsub.createTopic(topicName, gaxOpts, () => {}); - }); - - describe('error', () => { - const error = new Error('Error.'); - const apiResponse = {}; - - beforeEach(() => { - pubsub.request = (config, callback: Function) => { - callback(error, apiResponse); - }; - }); - - it('should return an error & API response', done => { - pubsub.createTopic('new-topic', (err, topic, apiResponse_) => { - assert.strictEqual(err, error); - assert.strictEqual(topic, null); - assert.strictEqual(apiResponse_, apiResponse); - done(); - }); - }); - }); - - describe('success', () => { - const apiResponse = {}; - - beforeEach(() => { - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse); - }; - }); - - it('should return a Topic object', done => { - const topicName = 'new-topic'; - const topicInstance = {}; - - pubsub.topic = name => { - assert.strictEqual(name, topicName); - return topicInstance as Topic; - }; - - pubsub.createTopic(topicName, (err, topic) => { - assert.ifError(err); - assert.strictEqual(topic, topicInstance); - done(); - }); - }); - - it('should pass apiResponse to callback', done => { - pubsub.createTopic('new-topic', (err, topic, apiResponse_) => { - assert.ifError(err); - assert.strictEqual(apiResponse_, apiResponse); - done(); - }); - }); - }); - }); - - describe('determineBaseUrl_', () => { - function setHost(host: string) { - process.env.PUBSUB_EMULATOR_HOST = host; - } - - beforeEach(() => { - delete process.env.PUBSUB_EMULATOR_HOST; - }); - - it('should do nothing if correct options are not set', () => { - pubsub.determineBaseUrl_(); - - assert.strictEqual(pubsub.options.servicePath, undefined); - assert.strictEqual(pubsub.options.port, undefined); - }); - - it('should use the apiEndpoint option', () => { - const defaultBaseUrl_ = 'defaulturl'; - const testingUrl = 'localhost:8085'; - - setHost(defaultBaseUrl_); - pubsub.options.apiEndpoint = testingUrl; - pubsub.determineBaseUrl_(); - - assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, '8085'); - assert.strictEqual(pubsub.options.sslCreds, fakeCreds); - assert.strictEqual(pubsub.isEmulator, true); - }); - - it('should remove slashes from the baseUrl', () => { - setHost('localhost:8080/'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, '8080'); - - setHost('localhost:8081//'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, '8081'); - }); - - it('should set the port to undefined if not set', () => { - setHost('localhost'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, undefined); - }); - - describe('with PUBSUB_EMULATOR_HOST environment variable', () => { - const PUBSUB_EMULATOR_HOST = 'localhost:9090'; - - beforeEach(() => { - setHost(PUBSUB_EMULATOR_HOST); - }); - - after(() => { - delete process.env.PUBSUB_EMULATOR_HOST; - }); - - it('should use the PUBSUB_EMULATOR_HOST env var', () => { - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, '9090'); - assert.strictEqual(pubsub.isEmulator, true); - }); - }); - }); - - describe('getSnapshots', () => { - const SNAPSHOT_NAME = 'fake-snapshot'; - const apiResponse = {snapshots: [{name: SNAPSHOT_NAME}]}; - - beforeEach(() => { - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse.snapshots, {}, apiResponse); - }; - }); - - it('should accept a query and a callback', done => { - pubsub.getSnapshots({}, done); - }); - - it('should accept just a callback', done => { - pubsub.getSnapshots(done); - }); - - it('should build the right request', done => { - const options = ({ - a: 'b', - c: 'd', - gaxOpts: { - e: 'f', - }, - autoPaginate: false, - } as {}) as pubsubTypes.PageOptions; - - const expectedOptions = Object.assign({}, options, { - project: 'projects/' + pubsub.projectId, - }); - - const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); - - delete expectedOptions.gaxOpts; - delete expectedOptions.autoPaginate; - - pubsub.request = config => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'listSnapshots'); - assert.deepStrictEqual(config.reqOpts, expectedOptions); - assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); - done(); - }; - - pubsub.getSnapshots(options, assert.ifError); - }); - - it('should return Snapshot instances with metadata', done => { - const snapshot = {}; - - sandbox.stub(pubsub, 'snapshot').callsFake(name => { - assert.strictEqual(name, SNAPSHOT_NAME); - return snapshot as Snapshot; - }); - - pubsub.getSnapshots((err, snapshots) => { - assert.ifError(err); - assert.strictEqual(snapshots![0], snapshot); - assert.strictEqual(snapshots![0].metadata, apiResponse.snapshots[0]); - done(); - }); - }); - - it('should pass back all parameters', done => { - const err_ = new Error('abc'); - const snapshots_ = undefined; - const nextQuery_ = {}; - const apiResponse_ = {}; - - pubsub.request = (config, callback: Function) => { - callback(err_, snapshots_, nextQuery_, apiResponse_); - }; - - pubsub.getSnapshots((err, snapshots, apiResponse) => { - assert.strictEqual(err, err_); - assert.deepStrictEqual(snapshots, snapshots_); - assert.strictEqual(apiResponse, nextQuery_); - done(); - }); - }); - }); - - describe('getSubscriptions', () => { - const apiResponse = {subscriptions: [{name: 'fake-subscription'}]}; - - beforeEach(() => { - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse.subscriptions, {}, apiResponse); - }; - }); - - it('should accept a query and a callback', done => { - pubsub.getSubscriptions({}, done); - }); - - it('should accept just a callback', done => { - pubsub.getSubscriptions(done); - }); - - it('should pass the correct arguments to the API', done => { - const options = ({ - gaxOpts: { - a: 'b', - }, - autoPaginate: false, - } as {}) as pubsubTypes.GetSubscriptionsOptions; - - const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); - - const project = 'projects/' + pubsub.projectId; - - pubsub.request = config => { - assert.strictEqual(config.client, 'SubscriberClient'); - assert.strictEqual(config.method, 'listSubscriptions'); - assert.deepStrictEqual(config.reqOpts, {project}); - assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); - done(); - }; - - pubsub.getSubscriptions(options, assert.ifError); - }); - - it('should pass options to API request', done => { - const opts = {pageSize: 10, pageToken: 'abc'}; - - pubsub.request = config => { - const reqOpts = config.reqOpts; - const expectedOptions = Object.assign({}, opts, { - project: 'projects/' + pubsub.projectId, - }); - assert.deepStrictEqual(reqOpts, expectedOptions); - done(); - }; - - pubsub.getSubscriptions(opts, assert.ifError); - }); - - it('should return Subscription instances', done => { - pubsub.getSubscriptions( - ( - err: ServiceError | null, - subscriptions?: subby.Subscription[] | null - ) => { - assert.ifError(err); - assert(subscriptions![0] instanceof subscriptionCached); - done(); - } - ); - }); - - it('should pass back all params', done => { - const err_ = new Error('err'); - const subs_ = undefined; - const nextQuery_ = {}; - const apiResponse_ = {}; - - pubsub.request = (config, callback: Function) => { - callback(err_, subs_, nextQuery_, apiResponse_); - }; - - pubsub.getSubscriptions( - ( - err: ServiceError | null, - subs?: subby.Subscription[] | null, - apiResponse?: google.pubsub.v1.IListSubscriptionsResponse | null - ) => { - assert.strictEqual(err, err_); - assert.deepStrictEqual(subs, subs_); - assert.strictEqual(apiResponse, nextQuery_); - done(); - } - ); - }); - - describe('with topic', () => { - const TOPIC_NAME = 'topic-name'; - - it('should call topic.getSubscriptions', done => { - const topic = new FakeTopic(); - - const opts = ({ - topic, - } as {}) as pubsubTypes.GetSubscriptionsOptions; - - topic.getSubscriptions = (options: pubsubTypes.PageOptions) => { - assert.strictEqual(options, opts); - done(); - }; - - pubsub.getSubscriptions(opts, assert.ifError); - }); - - it('should create a topic instance from a name', done => { - const opts = ({ - topic: TOPIC_NAME, - } as {}) as pubsubTypes.GetSubscriptionsOptions; - - const fakeTopic = { - getSubscriptions(options: pubsubTypes.PageOptions) { - assert.strictEqual(options, opts); - done(); - }, - }; - - pubsub.topic = (name: string) => { - assert.strictEqual(name, TOPIC_NAME); - return fakeTopic as Topic; - }; - - pubsub.getSubscriptions(opts, assert.ifError); - }); - }); - }); - - describe('getTopics', () => { - const topicName = 'fake-topic'; - const apiResponse = {topics: [{name: topicName}]}; - - beforeEach(() => { - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse.topics, {}, apiResponse); - }; - }); - - it('should accept a query and a callback', done => { - pubsub.getTopics({}, done); - }); - - it('should accept just a callback', done => { - pubsub.getTopics(done); - }); - - it('should build the right request', done => { - const options = ({ - a: 'b', - c: 'd', - gaxOpts: { - e: 'f', - }, - autoPaginate: false, - } as {}) as pubsubTypes.PageOptions; - - const expectedOptions = Object.assign({}, options, { - project: 'projects/' + pubsub.projectId, - }); - - const expectedGaxOpts = Object.assign( - { - autoPaginate: options.autoPaginate, - }, - options.gaxOpts - ); - - delete expectedOptions.gaxOpts; - delete expectedOptions.autoPaginate; - - pubsub.request = config => { - assert.strictEqual(config.client, 'PublisherClient'); - assert.strictEqual(config.method, 'listTopics'); - assert.deepStrictEqual(config.reqOpts, expectedOptions); - assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); - done(); - }; - - pubsub.getTopics(options, assert.ifError); - }); - - it('should return Topic instances with metadata', done => { - const topic = {}; - - pubsub.topic = name => { - assert.strictEqual(name, topicName); - return topic as Topic; - }; - - pubsub.getTopics((err, topics) => { - assert.ifError(err); - assert.strictEqual(topics![0], topic); - assert.strictEqual(topics![0].metadata, apiResponse.topics[0]); - done(); - }); - }); - - it('should pass back all params', done => { - const err_ = new Error('err'); - const topics_ = undefined; - const nextQuery_ = {}; - const apiResponse_ = {}; - - pubsub.request = (config, callback: Function) => { - callback(err_, topics_, nextQuery_, apiResponse_); - }; - - pubsub.getTopics((err, topics, apiResponse) => { - assert.strictEqual(err, err_); - assert.deepStrictEqual(topics, topics_); - assert.strictEqual(apiResponse, nextQuery_); - done(); - }); - }); - }); - - describe('request', () => { - const CONFIG = { - client: 'PublisherClient', - method: 'fakeMethod', - reqOpts: {a: 'a'}, - gaxOpts: {b: 'b'}, - } as pubsubTypes.RequestConfig; - - beforeEach(() => { - delete pubsub.projectId; - afterEach(() => sandbox.restore()); - - sandbox.stub(pubsub, 'auth').value({ - getProjectId: (callback: Function) => { - callback(null, PROJECT_ID); - }, - }); - - // tslint:disable-next-line no-any - pjyOverride = (reqOpts: any) => { - return reqOpts; - }; - }); - - it('should call getClient_ with the correct config', done => { - pubsub.getClient_ = config => { - assert.strictEqual(config, CONFIG); - done(); - }; - - pubsub.request(CONFIG, assert.ifError); - }); - - it('should return error from getClient_', done => { - const expectedError = new Error('some error'); - pubsub.getClient_ = (config, callback: Function) => { - callback(expectedError); - }; - - pubsub.request(CONFIG, (err: ServiceError | null) => { - assert.strictEqual(expectedError, err); - done(); - }); - }); - - it('should call client method with correct options', done => { - const fakeClient = {}; - // tslint:disable-next-line no-any - (fakeClient as any).fakeMethod = (reqOpts: any, gaxOpts: CallOptions) => { - assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); - assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); - done(); - }; - pubsub.getClient_ = (config, callback: Function) => { - callback(null, fakeClient); - }; - pubsub.request(CONFIG, assert.ifError); - }); - - it('should replace the project id token on reqOpts', done => { - // tslint:disable-next-line no-any - pjyOverride = (reqOpts: any, projectId: string) => { - assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); - assert.strictEqual(projectId, PROJECT_ID); - done(); - }; - pubsub.request(CONFIG, assert.ifError); - }); - }); - - describe('getClient_', () => { - const FAKE_CLIENT_INSTANCE = class {}; - const CONFIG = ({ - client: 'FakeClient', - } as {}) as pubsubTypes.GetClientConfig; - - beforeEach(() => { - sandbox.stub(pubsub, 'auth').value({getProjectId: () => util.noop}); - - v1ClientOverrides.FakeClient = FAKE_CLIENT_INSTANCE; - }); - afterEach(() => sandbox.restore()); - describe('project ID', () => { - beforeEach(() => { - delete pubsub.projectId; - pubsub.isEmulator = false; - }); - - it('should get and cache the project ID', done => { - sandbox.stub(pubsub, 'auth').value({ - getProjectId: (callback: Function) => { - assert.strictEqual(typeof callback, 'function'); - callback(null, PROJECT_ID); - }, - }); - - pubsub.getClient_(CONFIG, err => { - assert.ifError(err); - assert.strictEqual(pubsub.projectId, PROJECT_ID); - assert.strictEqual(pubsub.options.projectId, PROJECT_ID); - done(); - }); - }); - - it('should get the project ID if placeholder', done => { - pubsub.projectId = '{{projectId}}'; - - sandbox.stub(pubsub, 'auth').value({ - getProjectId: () => { - done(); - }, - }); - - pubsub.getClient_(CONFIG, assert.ifError); - }); - - it('should return errors to the callback', done => { - const error = new Error('err'); - sandbox.stub(pubsub.auth, 'getProjectId').callsFake(callback => { - callback(error); - }); - - pubsub.getClient_(CONFIG, err => { - assert.strictEqual(err, error); - done(); - }); - }); - - it('should not get the project ID if already known', () => { - pubsub.projectId = PROJECT_ID; - - pubsub.auth.getProjectId = () => { - throw new Error('getProjectId should not be called.'); - }; - - pubsub.getClient_(CONFIG, assert.ifError); - }); - - it('should not get the project ID if inside emulator', () => { - pubsub.isEmulator = true; - - pubsub.auth.getProjectId = () => { - throw new Error('getProjectId should not be called.'); - }; - - pubsub.getClient_(CONFIG, assert.ifError); - }); - }); - - it('should cache the client', done => { - delete pubsub.api.fakeClient; - - let numTimesFakeClientInstantiated = 0; - - // tslint:disable-next-line only-arrow-functions - v1ClientOverrides.FakeClient = function() { - numTimesFakeClientInstantiated++; - return FAKE_CLIENT_INSTANCE; - }; - - pubsub.getClient_(CONFIG, err => { - assert.ifError(err); - assert.strictEqual(pubsub.api.FakeClient, FAKE_CLIENT_INSTANCE); - - pubsub.getClient_(CONFIG, err => { - assert.ifError(err); - assert.strictEqual(numTimesFakeClientInstantiated, 1); - done(); - }); - }); - }); - - it('should return the correct client', done => { - // tslint:disable-next-line only-arrow-functions no-any - v1ClientOverrides.FakeClient = function( - options: pubsubTypes.ClientConfig - ) { - assert.strictEqual(options, pubsub.options); - return FAKE_CLIENT_INSTANCE; - }; - - pubsub.getClient_(CONFIG, (err, client) => { - assert.ifError(err); - assert.strictEqual(client, FAKE_CLIENT_INSTANCE); - done(); - }); - }); - }); - - describe('request', () => { - const CONFIG = { - client: 'SubscriberClient', - method: 'fakeMethod', - reqOpts: {a: 'a'}, - gaxOpts: {}, - } as pubsubTypes.RequestConfig; - - const FAKE_CLIENT_INSTANCE = { - [CONFIG.method]: util.noop, - }; - - beforeEach(() => { - // tslint:disable-next-line no-any - pjyOverride = (reqOpts: any) => { - return reqOpts; - }; - - pubsub.getClient_ = (config, callback: Function) => { - callback(null, FAKE_CLIENT_INSTANCE); - }; - }); - afterEach(() => sandbox.restore()); - it('should get the client', done => { - pubsub.getClient_ = config => { - assert.strictEqual(config, CONFIG); - done(); - }; - - pubsub.request(CONFIG, assert.ifError); - }); - - it('should return error from getting the client', done => { - const error = new Error('Error.'); - - pubsub.getClient_ = (config, callback) => { - callback(error); - }; - - pubsub.request(CONFIG, (err: ServiceError | null) => { - assert.strictEqual(err, error); - done(); - }); - }); - - it('should replace the project id token on reqOpts', done => { - // tslint:disable-next-line no-any - pjyOverride = (reqOpts: any, projectId: string) => { - assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); - assert.strictEqual(projectId, PROJECT_ID); - done(); - }; - - pubsub.request(CONFIG, assert.ifError); - }); - - it('should call the client method correctly', done => { - const CONFIG = ({ - client: 'FakeClient', - method: 'fakeMethod', - reqOpts: {a: 'a'}, - gaxOpts: {}, - } as {}) as pubsubTypes.RequestConfig; - - const replacedReqOpts = {}; - - pjyOverride = () => { - return replacedReqOpts; - }; - - const fakeClient = { - // tslint:disable-next-line no-any - fakeMethod(reqOpts: any, gaxOpts: CallOptions) { - assert.strictEqual(reqOpts, replacedReqOpts); - assert.strictEqual(gaxOpts, CONFIG.gaxOpts); - done(); - }, - }; - - pubsub.getClient_ = (config, callback: Function) => { - callback(null, fakeClient); - }; - - pubsub.request(CONFIG, assert.ifError); - }); - }); - - describe('snapshot', () => { - it('should throw if a name is not provided', () => { - assert.throws(() => { - // tslint:disable-next-line no-any - (pubsub as any).snapshot(); - }, /You must supply a valid name for the snapshot\./); - }); - - it('should return a Snapshot object', () => { - const SNAPSHOT_NAME = 'new-snapshot'; - const snapshot = pubsub.snapshot(SNAPSHOT_NAME); - const args = ((snapshot as {}) as FakeSnapshot).calledWith_; - - assert(snapshot instanceof FakeSnapshot); - assert.strictEqual(args[0], pubsub); - assert.strictEqual(args[1], SNAPSHOT_NAME); - }); - }); - - describe('subscription', () => { - const SUB_NAME = 'new-sub-name'; - const CONFIG = {}; - - it('should return a Subscription object', () => { - // tslint:disable-next-line only-arrow-functions - subscriptionOverride = function() {}; - const subscription = pubsub.subscription(SUB_NAME, {}); - assert(subscription instanceof subscriptionOverride); - }); - - it('should pass specified name to the Subscription', done => { - // tslint:disable-next-line only-arrow-functions - subscriptionOverride = function( - pubsub: pubsubTypes.PubSub, - name: string - ) { - assert.strictEqual(name, SUB_NAME); - done(); - }; - pubsub.subscription(SUB_NAME); - }); - - it('should honor settings', done => { - // tslint:disable-next-line only-arrow-functions - subscriptionOverride = function( - pubsub: pubsubTypes.PubSub, - name: string, - options: subby.SubscriptionOptions - ) { - assert.strictEqual(options, CONFIG); - done(); - }; - pubsub.subscription(SUB_NAME, CONFIG); - }); - - it('should throw if a name is not provided', () => { - assert.throws(() => { - // tslint:disable-next-line no-any - return (pubsub as any).subscription(); - }, /A name must be specified for a subscription\./); - }); - }); - - describe('topic', () => { - it('should throw if a name is not provided', () => { - assert.throws(() => { - // tslint:disable-next-line no-any - (pubsub as any).topic(); - }, /A name must be specified for a topic\./); - }); - - it('should return a Topic object', () => { - assert(pubsub.topic('new-topic') instanceof FakeTopic); - }); - - it('should pass the correct args', () => { - const fakeName = 'with-options'; - const fakeOptions = {}; - const topic = pubsub.topic(fakeName, fakeOptions); - - const [ps, name, options] = ((topic as {}) as FakeTopic).calledWith_; - - assert.strictEqual(ps, pubsub); - assert.strictEqual(name, fakeName); - assert.strictEqual(options, fakeOptions); - }); +describe('exports', () => { + it('should export the gapic clients', () => { + assert.ok(pubsub.v1); }); }); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts new file mode 100644 index 00000000000..20cba5f885f --- /dev/null +++ b/handwritten/pubsub/test/pubsub.ts @@ -0,0 +1,1375 @@ +/** + * Copyright 2014 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as pjy from '@google-cloud/projectify'; +import * as promisify from '@google-cloud/promisify'; +import arrify = require('arrify'); +import * as assert from 'assert'; +import * as gax from 'google-gax'; +import * as grpc from 'grpc'; +import {CallOptions, ServiceError, ChannelCredentials} from 'grpc'; +import * as proxyquire from 'proxyquire'; +import * as sinon from 'sinon'; + +import {google} from '../proto/pubsub'; +import * as pubsubTypes from '../src/pubsub'; +import {Snapshot} from '../src/snapshot'; +import * as subby from '../src/subscription'; +import {Topic} from '../src/topic'; +import * as util from '../src/util'; + +const PKG = require('../../package.json'); +const sandbox = sinon.createSandbox(); + +const fakeCreds = {} as ChannelCredentials; +sandbox.stub(grpc.credentials, 'createInsecure').returns(fakeCreds); + +const subscriptionCached = subby.Subscription; + +// tslint:disable-next-line no-any +let subscriptionOverride: any; + +function Subscription( + pubsub: pubsubTypes.PubSub, + name: string, + options: subby.SubscriptionOptions +) { + const overrideFn = subscriptionOverride || subscriptionCached; + return new overrideFn(pubsub, name, options); +} + +let promisified = false; +const fakePromisify = Object.assign({}, promisify, { + promisifyAll( + // tslint:disable-next-line variable-name + Class: typeof pubsubTypes.PubSub, + options: promisify.PromisifyAllOptions + ) { + if (Class.name !== 'PubSub') { + return; + } + + promisified = true; + assert.deepStrictEqual(options.exclude, [ + 'request', + 'snapshot', + 'subscription', + 'topic', + ]); + }, +}); + +let pjyOverride: Function; +function fakePjy() { + return (pjyOverride || pjy.replaceProjectIdToken).apply(null, arguments); +} + +class FakeSnapshot { + calledWith_: IArguments; + constructor() { + this.calledWith_ = arguments; + } +} + +class FakeTopic { + calledWith_: IArguments; + getSubscriptions?: Function; + constructor() { + this.calledWith_ = arguments; + } +} + +let extended = false; +const fakePaginator = { + // tslint:disable-next-line variable-name + extend(Class: typeof pubsubTypes.PubSub, methods: string[]) { + if (Class.name !== 'PubSub') { + return; + } + + methods = arrify(methods); + assert.strictEqual(Class.name, 'PubSub'); + assert.deepStrictEqual(methods, [ + 'getSnapshots', + 'getSubscriptions', + 'getTopics', + ]); + + extended = true; + }, + streamify(methodName: string) { + return methodName; + }, +}; + +let googleAuthOverride: Function | null; +function fakeGoogleAuth() { + return (googleAuthOverride || util.noop).apply(null, arguments); +} + +const v1Override = {}; +// tslint:disable-next-line no-any +let v1ClientOverrides: any = {}; + +function defineOverridableClient(clientName: string) { + function DefaultClient() {} + // tslint:disable-next-line no-any + (DefaultClient as any).scopes = []; + + Object.defineProperty(v1Override, clientName, { + get() { + return v1ClientOverrides[clientName] || DefaultClient; + }, + }); +} + +defineOverridableClient('FakeClient'); +defineOverridableClient('PublisherClient'); +defineOverridableClient('SubscriberClient'); + +describe('PubSub', () => { + // tslint:disable-next-line variable-name + let PubSub: typeof pubsubTypes.PubSub; + const PROJECT_ID = 'test-project'; + + let pubsub: pubsubTypes.PubSub; + const OPTIONS = { + projectId: PROJECT_ID, + promise: {}, + } as pubsubTypes.ClientConfig; + + const PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; + + before(() => { + delete process.env.PUBSUB_EMULATOR_HOST; + PubSub = proxyquire('../src/pubsub', { + '@google-cloud/paginator': { + paginator: fakePaginator, + }, + '@google-cloud/promisify': fakePromisify, + '@google-cloud/projectify': { + replaceProjectIdToken: fakePjy, + }, + 'google-auth-library': { + GoogleAuth: fakeGoogleAuth, + }, + grpc, + './snapshot': {Snapshot: FakeSnapshot}, + './subscription': {Subscription}, + './topic': {Topic: FakeTopic}, + './v1': v1Override, + }).PubSub; + }); + + after(() => { + if (PUBSUB_EMULATOR_HOST) { + process.env.PUBSUB_EMULATOR_HOST = PUBSUB_EMULATOR_HOST; + } + }); + + beforeEach(() => { + v1ClientOverrides = {}; + googleAuthOverride = null; + pubsub = new PubSub(OPTIONS); + pubsub.projectId = PROJECT_ID; + }); + + describe('instantiation', () => { + const DEFAULT_OPTIONS = { + grpc, + 'grpc.keepalive_time_ms': 300000, + 'grpc.max_send_message_length': -1, + 'grpc.max_receive_message_length': 20000001, + libName: 'gccl', + libVersion: PKG.version, + scopes: [], + }; + + it('should extend the correct methods', () => { + assert(extended); // See `fakePaginator.extend` + }); + + it('should streamify the correct methods', () => { + assert.strictEqual(pubsub.getSnapshotsStream, 'getSnapshots'); + assert.strictEqual(pubsub.getSubscriptionsStream, 'getSubscriptions'); + assert.strictEqual(pubsub.getTopicsStream, 'getTopics'); + }); + + it('should promisify all the things', () => { + assert(promisified); + }); + + it('should return an instance', () => { + assert(new PubSub() instanceof PubSub); + }); + + it('should combine all required scopes', () => { + v1ClientOverrides.SubscriberClient = {}; + v1ClientOverrides.SubscriberClient.scopes = ['a', 'b', 'c']; + + v1ClientOverrides.PublisherClient = {}; + v1ClientOverrides.PublisherClient.scopes = ['b', 'c', 'd', 'e']; + + const pubsub = new PubSub({}); + const options = {scopes: ['a', 'b', 'c', 'd', 'e']}; + const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, options); + assert.deepStrictEqual(pubsub.options, expectedOptions); + }); + + it('should attempt to determine the service path and port', () => { + const determineBaseUrl_ = PubSub.prototype.determineBaseUrl_; + let called = false; + + PubSub.prototype.determineBaseUrl_ = () => { + PubSub.prototype.determineBaseUrl_ = determineBaseUrl_; + called = true; + }; + + // tslint:disable-next-line no-unused-expression + new PubSub({}); + assert(called); + }); + + it('should initialize the API object', () => { + assert.deepStrictEqual(pubsub.api, {}); + }); + + it('should cache a local google-auth-library instance', () => { + const fakeGoogleAuthInstance = {}; + const options = { + a: 'b', + c: 'd', + } as pubsubTypes.ClientConfig; + const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, options); + + googleAuthOverride = (options_: pubsubTypes.ClientConfig) => { + assert.deepStrictEqual(options_, expectedOptions); + return fakeGoogleAuthInstance; + }; + + const pubsub = new PubSub(options); + assert.strictEqual(pubsub.auth, fakeGoogleAuthInstance); + }); + + it('should localize the options provided', () => { + const expectedOptions = Object.assign({}, DEFAULT_OPTIONS, OPTIONS); + + assert.deepStrictEqual(pubsub.options, expectedOptions); + }); + + it('should set the projectId', () => { + assert.strictEqual(pubsub.projectId, PROJECT_ID); + }); + + it('should default the projectId to the token', () => { + const pubsub = new PubSub({}); + assert.strictEqual(pubsub.projectId, '{{projectId}}'); + }); + + it('should set isEmulator to false by default', () => { + assert.strictEqual(pubsub.isEmulator, false); + }); + + it('should localize a Promise override', () => { + assert.strictEqual(pubsub.Promise, OPTIONS.promise); + }); + }); + + describe('createSubscription', () => { + const TOPIC_NAME = 'topic'; + pubsub = new pubsubTypes.PubSub({}); + const TOPIC = (Object.assign(new FakeTopic(), { + name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, + }) as {}) as Topic; + + const SUB_NAME = 'subscription'; + const SUBSCRIPTION = { + name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME, + }; + + const apiResponse = { + name: 'subscription-name', + }; + + beforeEach(() => { + ((Subscription as {}) as typeof subby.Subscription).formatMetadata_ = ( + metadata: subby.SubscriptionMetadata + ) => { + return Object.assign({}, metadata) as subby.SubscriptionMetadata; + }; + }); + + it('should throw if no Topic is provided', () => { + assert.throws(() => { + // tslint:disable-next-line no-any + (pubsub as any).createSubscription(); + }, /A Topic is required for a new subscription\./); + }); + + it('should throw if no subscription name is provided', () => { + assert.throws(() => { + // tslint:disable-next-line no-any + (pubsub as any).createSubscription(TOPIC_NAME); + }, /A subscription name is required./); + }); + + it('should not require configuration options', done => { + pubsub.request = (config, callback: Function) => { + callback(null, apiResponse); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, done); + }); + + it('should allow undefined/optional configuration options', done => { + pubsub.request = (config, callback: Function) => { + callback(null, apiResponse); + }; + // tslint:disable-next-line no-any + (pubsub as any).createSubscription(TOPIC, SUB_NAME, undefined, done); + }); + + it('should create a Subscription', done => { + const opts = {a: 'b', c: 'd'} as subby.CreateSubscriptionOptions; + + pubsub.request = util.noop; + + pubsub.subscription = (subName, options) => { + assert.strictEqual(subName, SUB_NAME); + assert.deepStrictEqual(options, opts); + setImmediate(done); + return SUBSCRIPTION as subby.Subscription; + }; + pubsub.createSubscription(TOPIC, SUB_NAME, opts, assert.ifError); + }); + + it('should create a Topic object from a string', done => { + pubsub.request = util.noop; + + pubsub.topic = topicName => { + assert.strictEqual(topicName, TOPIC_NAME); + setImmediate(done); + return TOPIC; + }; + + pubsub.createSubscription(TOPIC_NAME, SUB_NAME, assert.ifError); + }); + + it('should send correct request', done => { + const options = { + gaxOpts: {}, + }; + + pubsub.topic = topicName => { + return { + name: topicName, + } as Topic; + }; + pubsub.subscription = subName => { + return { + name: subName, + } as subby.Subscription; + }; + + const reqOpts = {topic: TOPIC.name, name: SUB_NAME}; + + pubsub.request = config => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'createSubscription'); + assert.deepStrictEqual(config.reqOpts, reqOpts); + assert.deepStrictEqual(config.gaxOpts, options.gaxOpts); + done(); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); + }); + + it('should pass options to the api request', done => { + const options = { + retainAckedMessages: true, + pushEndpoint: 'https://domain/push', + }; + + const expectedBody = Object.assign( + {topic: TOPIC.name, name: SUB_NAME}, + options + ); + + pubsub.topic = () => { + return { + name: TOPIC_NAME, + } as Topic; + }; + + pubsub.subscription = () => { + return { + name: SUB_NAME, + } as subby.Subscription; + }; + + pubsub.request = config => { + assert.notStrictEqual(config.reqOpts, options); + assert.deepStrictEqual(config.reqOpts, expectedBody); + done(); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); + }); + + it('should discard flow control options', done => { + const options = { + flowControl: {}, + }; + + const expectedBody = { + topic: TOPIC.name, + name: SUB_NAME, + }; + + pubsub.topic = () => { + return { + name: TOPIC_NAME, + } as Topic; + }; + + pubsub.subscription = () => { + return { + name: SUB_NAME, + } as subby.Subscription; + }; + + pubsub.request = config => { + assert.notStrictEqual(config.reqOpts, options); + assert.deepStrictEqual(config.reqOpts, expectedBody); + done(); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); + }); + + it('should format the metadata', done => { + const fakeMetadata = {}; + const formatted = { + a: 'a', + }; + + ((Subscription as {}) as typeof subby.Subscription).formatMetadata_ = ( + metadata: subby.SubscriptionMetadata + ) => { + assert.deepStrictEqual(metadata, fakeMetadata); + return (formatted as {}) as subby.SubscriptionMetadata; + }; + + pubsub.request = (config: pubsubTypes.RequestConfig) => { + assert.strictEqual(config.reqOpts, formatted); + done(); + }; + + pubsub.createSubscription(TOPIC, SUB_NAME, fakeMetadata, assert.ifError); + }); + + describe('error', () => { + const error = new Error('Error.'); + const apiResponse = {name: SUB_NAME}; + + beforeEach(() => { + pubsub.request = (config, callback: Function) => { + callback(error, apiResponse); + }; + }); + + it('should return error & API response to the callback', done => { + pubsub.request = (config, callback: Function) => { + callback(error, apiResponse); + }; + + function callback( + err?: Error | null, + sub?: subby.Subscription | null, + resp?: google.pubsub.v1.ISubscription | null + ) { + assert.strictEqual(err, error); + assert.strictEqual(sub, null); + assert.strictEqual(resp, apiResponse); + done(); + } + + pubsub.createSubscription(TOPIC_NAME, SUB_NAME, callback); + }); + }); + + describe('success', () => { + const apiResponse = {name: SUB_NAME}; + + beforeEach(() => { + pubsub.request = (config, callback: Function) => { + callback(null, apiResponse); + }; + }); + + it('should return Subscription & resp to the callback', done => { + const subscription = {}; + pubsub.subscription = () => { + return subscription as subby.Subscription; + }; + + pubsub.request = (config, callback: Function) => { + callback(null, apiResponse); + }; + + function callback( + err?: Error | null, + sub?: subby.Subscription | null, + resp?: google.pubsub.v1.ISubscription | null + ) { + assert.ifError(err); + assert.strictEqual(sub, subscription); + assert.strictEqual(resp, apiResponse); + done(); + } + + pubsub.createSubscription(TOPIC_NAME, SUB_NAME, callback); + }); + }); + }); + + describe('createTopic', () => { + it('should make the correct API request', done => { + const pubsub = new pubsubTypes.PubSub(); + const topicName = 'new-topic-name'; + const formattedName = 'formatted-name'; + const gaxOpts = {}; + + pubsub.topic = name => { + assert.strictEqual(name, topicName); + + return { + name: formattedName, + } as Topic; + }; + + pubsub.request = config => { + assert.strictEqual(config.client, 'PublisherClient'); + assert.strictEqual(config.method, 'createTopic'); + assert.deepStrictEqual(config.reqOpts, {name: formattedName}); + assert.deepStrictEqual(config.gaxOpts, gaxOpts); + done(); + }; + + pubsub.createTopic(topicName, gaxOpts, () => {}); + }); + + describe('error', () => { + const error = new Error('Error.'); + const apiResponse = {}; + + beforeEach(() => { + pubsub.request = (config, callback: Function) => { + callback(error, apiResponse); + }; + }); + + it('should return an error & API response', done => { + pubsub.createTopic('new-topic', (err, topic, apiResponse_) => { + assert.strictEqual(err, error); + assert.strictEqual(topic, null); + assert.strictEqual(apiResponse_, apiResponse); + done(); + }); + }); + }); + + describe('success', () => { + const apiResponse = {}; + + beforeEach(() => { + pubsub.request = (config, callback: Function) => { + callback(null, apiResponse); + }; + }); + + it('should return a Topic object', done => { + const topicName = 'new-topic'; + const topicInstance = {}; + + pubsub.topic = name => { + assert.strictEqual(name, topicName); + return topicInstance as Topic; + }; + + pubsub.createTopic(topicName, (err, topic) => { + assert.ifError(err); + assert.strictEqual(topic, topicInstance); + done(); + }); + }); + + it('should pass apiResponse to callback', done => { + pubsub.createTopic('new-topic', (err, topic, apiResponse_) => { + assert.ifError(err); + assert.strictEqual(apiResponse_, apiResponse); + done(); + }); + }); + }); + }); + + describe('determineBaseUrl_', () => { + function setHost(host: string) { + process.env.PUBSUB_EMULATOR_HOST = host; + } + + beforeEach(() => { + delete process.env.PUBSUB_EMULATOR_HOST; + }); + + it('should do nothing if correct options are not set', () => { + pubsub.determineBaseUrl_(); + + assert.strictEqual(pubsub.options.servicePath, undefined); + assert.strictEqual(pubsub.options.port, undefined); + }); + + it('should use the apiEndpoint option', () => { + const defaultBaseUrl_ = 'defaulturl'; + const testingUrl = 'localhost:8085'; + + setHost(defaultBaseUrl_); + pubsub.options.apiEndpoint = testingUrl; + pubsub.determineBaseUrl_(); + + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, '8085'); + assert.strictEqual(pubsub.options.sslCreds, fakeCreds); + assert.strictEqual(pubsub.isEmulator, true); + }); + + it('should remove slashes from the baseUrl', () => { + setHost('localhost:8080/'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, '8080'); + + setHost('localhost:8081//'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, '8081'); + }); + + it('should set the port to undefined if not set', () => { + setHost('localhost'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, undefined); + }); + + describe('with PUBSUB_EMULATOR_HOST environment variable', () => { + const PUBSUB_EMULATOR_HOST = 'localhost:9090'; + + beforeEach(() => { + setHost(PUBSUB_EMULATOR_HOST); + }); + + after(() => { + delete process.env.PUBSUB_EMULATOR_HOST; + }); + + it('should use the PUBSUB_EMULATOR_HOST env var', () => { + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, '9090'); + assert.strictEqual(pubsub.isEmulator, true); + }); + }); + }); + + describe('getSnapshots', () => { + const SNAPSHOT_NAME = 'fake-snapshot'; + const apiResponse = {snapshots: [{name: SNAPSHOT_NAME}]}; + + beforeEach(() => { + pubsub.request = (config, callback: Function) => { + callback(null, apiResponse.snapshots, {}, apiResponse); + }; + }); + + it('should accept a query and a callback', done => { + pubsub.getSnapshots({}, done); + }); + + it('should accept just a callback', done => { + pubsub.getSnapshots(done); + }); + + it('should build the right request', done => { + const options = ({ + a: 'b', + c: 'd', + gaxOpts: { + e: 'f', + }, + autoPaginate: false, + } as {}) as pubsubTypes.PageOptions; + + const expectedOptions = Object.assign({}, options, { + project: 'projects/' + pubsub.projectId, + }); + + const expectedGaxOpts = Object.assign( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + + delete expectedOptions.gaxOpts; + delete expectedOptions.autoPaginate; + + pubsub.request = config => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'listSnapshots'); + assert.deepStrictEqual(config.reqOpts, expectedOptions); + assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); + done(); + }; + + pubsub.getSnapshots(options, assert.ifError); + }); + + it('should return Snapshot instances with metadata', done => { + const snapshot = {}; + + sandbox.stub(pubsub, 'snapshot').callsFake(name => { + assert.strictEqual(name, SNAPSHOT_NAME); + return snapshot as Snapshot; + }); + + pubsub.getSnapshots((err, snapshots) => { + assert.ifError(err); + assert.strictEqual(snapshots![0], snapshot); + assert.strictEqual(snapshots![0].metadata, apiResponse.snapshots[0]); + done(); + }); + }); + + it('should pass back all parameters', done => { + const err_ = new Error('abc'); + const snapshots_ = undefined; + const nextQuery_ = {}; + const apiResponse_ = {}; + + pubsub.request = (config, callback: Function) => { + callback(err_, snapshots_, nextQuery_, apiResponse_); + }; + + pubsub.getSnapshots((err, snapshots, apiResponse) => { + assert.strictEqual(err, err_); + assert.deepStrictEqual(snapshots, snapshots_); + assert.strictEqual(apiResponse, nextQuery_); + done(); + }); + }); + }); + + describe('getSubscriptions', () => { + const apiResponse = {subscriptions: [{name: 'fake-subscription'}]}; + + beforeEach(() => { + pubsub.request = (config, callback: Function) => { + callback(null, apiResponse.subscriptions, {}, apiResponse); + }; + }); + + it('should accept a query and a callback', done => { + pubsub.getSubscriptions({}, done); + }); + + it('should accept just a callback', done => { + pubsub.getSubscriptions(done); + }); + + it('should pass the correct arguments to the API', done => { + const options = ({ + gaxOpts: { + a: 'b', + }, + autoPaginate: false, + } as {}) as pubsubTypes.GetSubscriptionsOptions; + + const expectedGaxOpts = Object.assign( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + + const project = 'projects/' + pubsub.projectId; + + pubsub.request = config => { + assert.strictEqual(config.client, 'SubscriberClient'); + assert.strictEqual(config.method, 'listSubscriptions'); + assert.deepStrictEqual(config.reqOpts, {project}); + assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); + done(); + }; + + pubsub.getSubscriptions(options, assert.ifError); + }); + + it('should pass options to API request', done => { + const opts = {pageSize: 10, pageToken: 'abc'}; + + pubsub.request = config => { + const reqOpts = config.reqOpts; + const expectedOptions = Object.assign({}, opts, { + project: 'projects/' + pubsub.projectId, + }); + assert.deepStrictEqual(reqOpts, expectedOptions); + done(); + }; + + pubsub.getSubscriptions(opts, assert.ifError); + }); + + it('should return Subscription instances', done => { + pubsub.getSubscriptions( + ( + err: ServiceError | null, + subscriptions?: subby.Subscription[] | null + ) => { + assert.ifError(err); + assert(subscriptions![0] instanceof subscriptionCached); + done(); + } + ); + }); + + it('should pass back all params', done => { + const err_ = new Error('err'); + const subs_ = undefined; + const nextQuery_ = {}; + const apiResponse_ = {}; + + pubsub.request = (config, callback: Function) => { + callback(err_, subs_, nextQuery_, apiResponse_); + }; + + pubsub.getSubscriptions( + ( + err: ServiceError | null, + subs?: subby.Subscription[] | null, + apiResponse?: google.pubsub.v1.IListSubscriptionsResponse | null + ) => { + assert.strictEqual(err, err_); + assert.deepStrictEqual(subs, subs_); + assert.strictEqual(apiResponse, nextQuery_); + done(); + } + ); + }); + + describe('with topic', () => { + const TOPIC_NAME = 'topic-name'; + + it('should call topic.getSubscriptions', done => { + const topic = new FakeTopic(); + + const opts = ({ + topic, + } as {}) as pubsubTypes.GetSubscriptionsOptions; + + topic.getSubscriptions = (options: pubsubTypes.PageOptions) => { + assert.strictEqual(options, opts); + done(); + }; + + pubsub.getSubscriptions(opts, assert.ifError); + }); + + it('should create a topic instance from a name', done => { + const opts = ({ + topic: TOPIC_NAME, + } as {}) as pubsubTypes.GetSubscriptionsOptions; + + const fakeTopic = { + getSubscriptions(options: pubsubTypes.PageOptions) { + assert.strictEqual(options, opts); + done(); + }, + }; + + pubsub.topic = (name: string) => { + assert.strictEqual(name, TOPIC_NAME); + return fakeTopic as Topic; + }; + + pubsub.getSubscriptions(opts, assert.ifError); + }); + }); + }); + + describe('getTopics', () => { + const topicName = 'fake-topic'; + const apiResponse = {topics: [{name: topicName}]}; + + beforeEach(() => { + pubsub.request = (config, callback: Function) => { + callback(null, apiResponse.topics, {}, apiResponse); + }; + }); + + it('should accept a query and a callback', done => { + pubsub.getTopics({}, done); + }); + + it('should accept just a callback', done => { + pubsub.getTopics(done); + }); + + it('should build the right request', done => { + const options = ({ + a: 'b', + c: 'd', + gaxOpts: { + e: 'f', + }, + autoPaginate: false, + } as {}) as pubsubTypes.PageOptions; + + const expectedOptions = Object.assign({}, options, { + project: 'projects/' + pubsub.projectId, + }); + + const expectedGaxOpts = Object.assign( + { + autoPaginate: options.autoPaginate, + }, + options.gaxOpts + ); + + delete expectedOptions.gaxOpts; + delete expectedOptions.autoPaginate; + + pubsub.request = config => { + assert.strictEqual(config.client, 'PublisherClient'); + assert.strictEqual(config.method, 'listTopics'); + assert.deepStrictEqual(config.reqOpts, expectedOptions); + assert.deepStrictEqual(config.gaxOpts, expectedGaxOpts); + done(); + }; + + pubsub.getTopics(options, assert.ifError); + }); + + it('should return Topic instances with metadata', done => { + const topic = {}; + + pubsub.topic = name => { + assert.strictEqual(name, topicName); + return topic as Topic; + }; + + pubsub.getTopics((err, topics) => { + assert.ifError(err); + assert.strictEqual(topics![0], topic); + assert.strictEqual(topics![0].metadata, apiResponse.topics[0]); + done(); + }); + }); + + it('should pass back all params', done => { + const err_ = new Error('err'); + const topics_ = undefined; + const nextQuery_ = {}; + const apiResponse_ = {}; + + pubsub.request = (config, callback: Function) => { + callback(err_, topics_, nextQuery_, apiResponse_); + }; + + pubsub.getTopics((err, topics, apiResponse) => { + assert.strictEqual(err, err_); + assert.deepStrictEqual(topics, topics_); + assert.strictEqual(apiResponse, nextQuery_); + done(); + }); + }); + }); + + describe('request', () => { + const CONFIG = { + client: 'PublisherClient', + method: 'fakeMethod', + reqOpts: {a: 'a'}, + gaxOpts: {b: 'b'}, + } as pubsubTypes.RequestConfig; + + beforeEach(() => { + delete pubsub.projectId; + afterEach(() => sandbox.restore()); + + sandbox.stub(pubsub, 'auth').value({ + getProjectId: (callback: Function) => { + callback(null, PROJECT_ID); + }, + }); + + // tslint:disable-next-line no-any + pjyOverride = (reqOpts: any) => { + return reqOpts; + }; + }); + + it('should call getClient_ with the correct config', done => { + pubsub.getClient_ = config => { + assert.strictEqual(config, CONFIG); + done(); + }; + + pubsub.request(CONFIG, assert.ifError); + }); + + it('should return error from getClient_', done => { + const expectedError = new Error('some error'); + pubsub.getClient_ = (config, callback: Function) => { + callback(expectedError); + }; + + pubsub.request(CONFIG, (err: ServiceError | null) => { + assert.strictEqual(expectedError, err); + done(); + }); + }); + + it('should call client method with correct options', done => { + const fakeClient = {}; + // tslint:disable-next-line no-any + (fakeClient as any).fakeMethod = (reqOpts: any, gaxOpts: CallOptions) => { + assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); + assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); + done(); + }; + pubsub.getClient_ = (config, callback: Function) => { + callback(null, fakeClient); + }; + pubsub.request(CONFIG, assert.ifError); + }); + + it('should replace the project id token on reqOpts', done => { + // tslint:disable-next-line no-any + pjyOverride = (reqOpts: any, projectId: string) => { + assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); + assert.strictEqual(projectId, PROJECT_ID); + done(); + }; + pubsub.request(CONFIG, assert.ifError); + }); + }); + + describe('getClient_', () => { + const FAKE_CLIENT_INSTANCE = class {}; + const CONFIG = ({ + client: 'FakeClient', + } as {}) as pubsubTypes.GetClientConfig; + + beforeEach(() => { + sandbox.stub(pubsub, 'auth').value({getProjectId: () => util.noop}); + + v1ClientOverrides.FakeClient = FAKE_CLIENT_INSTANCE; + }); + afterEach(() => sandbox.restore()); + describe('project ID', () => { + beforeEach(() => { + delete pubsub.projectId; + pubsub.isEmulator = false; + }); + + it('should get and cache the project ID', done => { + sandbox.stub(pubsub, 'auth').value({ + getProjectId: (callback: Function) => { + assert.strictEqual(typeof callback, 'function'); + callback(null, PROJECT_ID); + }, + }); + + pubsub.getClient_(CONFIG, err => { + assert.ifError(err); + assert.strictEqual(pubsub.projectId, PROJECT_ID); + assert.strictEqual(pubsub.options.projectId, PROJECT_ID); + done(); + }); + }); + + it('should get the project ID if placeholder', done => { + pubsub.projectId = '{{projectId}}'; + + sandbox.stub(pubsub, 'auth').value({ + getProjectId: () => { + done(); + }, + }); + + pubsub.getClient_(CONFIG, assert.ifError); + }); + + it('should return errors to the callback', done => { + const error = new Error('err'); + sandbox.stub(pubsub.auth, 'getProjectId').callsFake(callback => { + callback(error); + }); + + pubsub.getClient_(CONFIG, err => { + assert.strictEqual(err, error); + done(); + }); + }); + + it('should not get the project ID if already known', () => { + pubsub.projectId = PROJECT_ID; + + pubsub.auth.getProjectId = () => { + throw new Error('getProjectId should not be called.'); + }; + + pubsub.getClient_(CONFIG, assert.ifError); + }); + + it('should not get the project ID if inside emulator', () => { + pubsub.isEmulator = true; + + pubsub.auth.getProjectId = () => { + throw new Error('getProjectId should not be called.'); + }; + + pubsub.getClient_(CONFIG, assert.ifError); + }); + }); + + it('should cache the client', done => { + delete pubsub.api.fakeClient; + + let numTimesFakeClientInstantiated = 0; + + // tslint:disable-next-line only-arrow-functions + v1ClientOverrides.FakeClient = function() { + numTimesFakeClientInstantiated++; + return FAKE_CLIENT_INSTANCE; + }; + + pubsub.getClient_(CONFIG, err => { + assert.ifError(err); + assert.strictEqual(pubsub.api.FakeClient, FAKE_CLIENT_INSTANCE); + + pubsub.getClient_(CONFIG, err => { + assert.ifError(err); + assert.strictEqual(numTimesFakeClientInstantiated, 1); + done(); + }); + }); + }); + + it('should return the correct client', done => { + // tslint:disable-next-line only-arrow-functions no-any + v1ClientOverrides.FakeClient = function( + options: pubsubTypes.ClientConfig + ) { + assert.strictEqual(options, pubsub.options); + return FAKE_CLIENT_INSTANCE; + }; + + pubsub.getClient_(CONFIG, (err, client) => { + assert.ifError(err); + assert.strictEqual(client, FAKE_CLIENT_INSTANCE); + done(); + }); + }); + }); + + describe('request', () => { + const CONFIG = { + client: 'SubscriberClient', + method: 'fakeMethod', + reqOpts: {a: 'a'}, + gaxOpts: {}, + } as pubsubTypes.RequestConfig; + + const FAKE_CLIENT_INSTANCE = { + [CONFIG.method]: util.noop, + }; + + beforeEach(() => { + // tslint:disable-next-line no-any + pjyOverride = (reqOpts: any) => { + return reqOpts; + }; + + pubsub.getClient_ = (config, callback: Function) => { + callback(null, FAKE_CLIENT_INSTANCE); + }; + }); + afterEach(() => sandbox.restore()); + it('should get the client', done => { + pubsub.getClient_ = config => { + assert.strictEqual(config, CONFIG); + done(); + }; + + pubsub.request(CONFIG, assert.ifError); + }); + + it('should return error from getting the client', done => { + const error = new Error('Error.'); + + pubsub.getClient_ = (config, callback) => { + callback(error); + }; + + pubsub.request(CONFIG, (err: ServiceError | null) => { + assert.strictEqual(err, error); + done(); + }); + }); + + it('should replace the project id token on reqOpts', done => { + // tslint:disable-next-line no-any + pjyOverride = (reqOpts: any, projectId: string) => { + assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); + assert.strictEqual(projectId, PROJECT_ID); + done(); + }; + + pubsub.request(CONFIG, assert.ifError); + }); + + it('should call the client method correctly', done => { + const CONFIG = ({ + client: 'FakeClient', + method: 'fakeMethod', + reqOpts: {a: 'a'}, + gaxOpts: {}, + } as {}) as pubsubTypes.RequestConfig; + + const replacedReqOpts = {}; + + pjyOverride = () => { + return replacedReqOpts; + }; + + const fakeClient = { + // tslint:disable-next-line no-any + fakeMethod(reqOpts: any, gaxOpts: CallOptions) { + assert.strictEqual(reqOpts, replacedReqOpts); + assert.strictEqual(gaxOpts, CONFIG.gaxOpts); + done(); + }, + }; + + pubsub.getClient_ = (config, callback: Function) => { + callback(null, fakeClient); + }; + + pubsub.request(CONFIG, assert.ifError); + }); + }); + + describe('snapshot', () => { + it('should throw if a name is not provided', () => { + assert.throws(() => { + // tslint:disable-next-line no-any + (pubsub as any).snapshot(); + }, /You must supply a valid name for the snapshot\./); + }); + + it('should return a Snapshot object', () => { + const SNAPSHOT_NAME = 'new-snapshot'; + const snapshot = pubsub.snapshot(SNAPSHOT_NAME); + const args = ((snapshot as {}) as FakeSnapshot).calledWith_; + + assert(snapshot instanceof FakeSnapshot); + assert.strictEqual(args[0], pubsub); + assert.strictEqual(args[1], SNAPSHOT_NAME); + }); + }); + + describe('subscription', () => { + const SUB_NAME = 'new-sub-name'; + const CONFIG = {}; + + it('should return a Subscription object', () => { + // tslint:disable-next-line only-arrow-functions + subscriptionOverride = function() {}; + const subscription = pubsub.subscription(SUB_NAME, {}); + assert(subscription instanceof subscriptionOverride); + }); + + it('should pass specified name to the Subscription', done => { + // tslint:disable-next-line only-arrow-functions + subscriptionOverride = function( + pubsub: pubsubTypes.PubSub, + name: string + ) { + assert.strictEqual(name, SUB_NAME); + done(); + }; + pubsub.subscription(SUB_NAME); + }); + + it('should honor settings', done => { + // tslint:disable-next-line only-arrow-functions + subscriptionOverride = function( + pubsub: pubsubTypes.PubSub, + name: string, + options: subby.SubscriptionOptions + ) { + assert.strictEqual(options, CONFIG); + done(); + }; + pubsub.subscription(SUB_NAME, CONFIG); + }); + + it('should throw if a name is not provided', () => { + assert.throws(() => { + // tslint:disable-next-line no-any + return (pubsub as any).subscription(); + }, /A name must be specified for a subscription\./); + }); + }); + + describe('topic', () => { + it('should throw if a name is not provided', () => { + assert.throws(() => { + // tslint:disable-next-line no-any + (pubsub as any).topic(); + }, /A name must be specified for a topic\./); + }); + + it('should return a Topic object', () => { + assert(pubsub.topic('new-topic') instanceof FakeTopic); + }); + + it('should pass the correct args', () => { + const fakeName = 'with-options'; + const fakeOptions = {}; + const topic = pubsub.topic(fakeName, fakeOptions); + + const [ps, name, options] = ((topic as {}) as FakeTopic).calledWith_; + + assert.strictEqual(ps, pubsub); + assert.strictEqual(name, fakeName); + assert.strictEqual(options, fakeOptions); + }); + }); +}); From f19e90521527d906923be3130faf9513b6463b39 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Fri, 17 May 2019 08:16:52 -0700 Subject: [PATCH 0431/1115] build: add new kokoro config for coverage and release-please (#612) --- .../.kokoro/continuous/node10/common.cfg | 10 ++++++++ .../pubsub/.kokoro/continuous/node10/test.cfg | 9 ------- .../.kokoro/presubmit/node10/common.cfg | 10 ++++++++ .../pubsub/.kokoro/presubmit/node10/test.cfg | 9 ------- .../pubsub/.kokoro/release-candidate-issue.sh | 25 +++++++++++++++++++ .../pubsub/.kokoro/release-requested.sh | 25 +++++++++++++++++++ handwritten/pubsub/.kokoro/release/common.cfg | 8 ++++++ .../pubsub/.kokoro/release/publish.cfg | 9 ------- .../release/release-candidate-issue.cfg | 22 ++++++++++++++++ .../.kokoro/release/release-requested.cfg | 22 ++++++++++++++++ handwritten/pubsub/.kokoro/samples-test.sh | 13 ++++++++++ handwritten/pubsub/.kokoro/system-test.sh | 13 ++++++++++ handwritten/pubsub/.kokoro/test.sh | 4 ++- handwritten/pubsub/synth.metadata | 8 +++--- 14 files changed, 155 insertions(+), 32 deletions(-) create mode 100755 handwritten/pubsub/.kokoro/release-candidate-issue.sh create mode 100755 handwritten/pubsub/.kokoro/release-requested.sh create mode 100644 handwritten/pubsub/.kokoro/release/common.cfg create mode 100644 handwritten/pubsub/.kokoro/release/release-candidate-issue.cfg create mode 100644 handwritten/pubsub/.kokoro/release/release-requested.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg index abfbbfb207d..43ee965c88c 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg @@ -7,6 +7,16 @@ action { } } +# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} + # Download trampoline resources. gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" diff --git a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg index 468b8c7197a..e69de29bb2d 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg @@ -1,9 +0,0 @@ -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg index abfbbfb207d..43ee965c88c 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg @@ -7,6 +7,16 @@ action { } } +# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} + # Download trampoline resources. gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg index 468b8c7197a..e69de29bb2d 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg @@ -1,9 +0,0 @@ -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} diff --git a/handwritten/pubsub/.kokoro/release-candidate-issue.sh b/handwritten/pubsub/.kokoro/release-candidate-issue.sh new file mode 100755 index 00000000000..314e5d36e0c --- /dev/null +++ b/handwritten/pubsub/.kokoro/release-candidate-issue.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +export NPM_CONFIG_PREFIX=/home/node/.npm-global + +GITHUB_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_yoshi-automation-github-key) + +npx release-please candidate-issue --token=$GITHUB_TOKEN \ + --repo-url=googleapis/nodejs-pubsub \ + --package-name=@google-cloud/pubsub diff --git a/handwritten/pubsub/.kokoro/release-requested.sh b/handwritten/pubsub/.kokoro/release-requested.sh new file mode 100755 index 00000000000..259190832e6 --- /dev/null +++ b/handwritten/pubsub/.kokoro/release-requested.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +export NPM_CONFIG_PREFIX=/home/node/.npm-global + +GITHUB_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_yoshi-automation-github-key) + +npx release-please detect-checked --token=$GITHUB_TOKEN \ + --repo-url=googleapis/nodejs-pubsub \ + --package-name=@google-cloud/pubsub diff --git a/handwritten/pubsub/.kokoro/release/common.cfg b/handwritten/pubsub/.kokoro/release/common.cfg new file mode 100644 index 00000000000..3ba2eb095fe --- /dev/null +++ b/handwritten/pubsub/.kokoro/release/common.cfg @@ -0,0 +1,8 @@ +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + } + } +} diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index e747a8e2fda..632440add32 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -9,15 +9,6 @@ before_action { } } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - } - } -} - before_action { fetch_keystore { keystore_resource { diff --git a/handwritten/pubsub/.kokoro/release/release-candidate-issue.cfg b/handwritten/pubsub/.kokoro/release/release-candidate-issue.cfg new file mode 100644 index 00000000000..d08e057d985 --- /dev/null +++ b/handwritten/pubsub/.kokoro/release/release-candidate-issue.cfg @@ -0,0 +1,22 @@ +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/release-candidate-issue.sh" +} diff --git a/handwritten/pubsub/.kokoro/release/release-requested.cfg b/handwritten/pubsub/.kokoro/release/release-requested.cfg new file mode 100644 index 00000000000..470805626d3 --- /dev/null +++ b/handwritten/pubsub/.kokoro/release/release-requested.cfg @@ -0,0 +1,22 @@ +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/release-requested.sh" +} diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index f83f712a88a..07d31dccc45 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -42,3 +42,16 @@ if [ -f samples/package.json ]; then npm run samples-test fi + +# codecov combines coverage across integration and unit tests. Include +# the logic below for any environment you wish to collect coverage for: +COVERAGE_NODE=10 +if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then + NYC_BIN=./node_modules/nyc/bin/nyc.js + if [ -f "$NYC_BIN" ]; then + $NYC_BIN report || true + fi + bash $KOKORO_GFILE_DIR/codecov.sh +else + echo "coverage is only reported for Node $COVERAGE_NODE" +fi diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index fd8f0b638d0..b7374d0ad45 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -34,3 +34,16 @@ fi npm install npm run system-test + +# codecov combines coverage across integration and unit tests. Include +# the logic below for any environment you wish to collect coverage for: +COVERAGE_NODE=10 +if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then + NYC_BIN=./node_modules/nyc/bin/nyc.js + if [ -f "$NYC_BIN" ]; then + $NYC_BIN report || true + fi + bash $KOKORO_GFILE_DIR/codecov.sh +else + echo "coverage is only reported for Node $COVERAGE_NODE" +fi diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index f7e9fe78163..bfc7b26154e 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -23,11 +23,13 @@ cd $(dirname $0)/.. npm install npm test +# codecov combines coverage across integration and unit tests. Include +# the logic below for any environment you wish to collect coverage for: COVERAGE_NODE=10 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then - $NYC_BIN report + $NYC_BIN report || true fi bash $KOKORO_GFILE_DIR/codecov.sh else diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index ed253da6015..7f8932963b3 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-05-10T12:09:34.175348Z", + "updateTime": "2019-05-17T01:09:23.905696Z", "sources": [ { "generator": { @@ -12,15 +12,15 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "07883be5bf3c3233095e99d8e92b8094f5d7084a", - "internalRef": "247530843" + "sha": "03269e767cff9dd644d7784a4d4350b2ba6daf69", + "internalRef": "248524261" } }, { "template": { "name": "node_library", "origin": "synthtool.gcp", - "version": "2019.5.2" + "version": "2019.4.10" } } ], From d87e0c288ed475e3fcf715bc6bf9454add6e6c49 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Fri, 17 May 2019 16:49:58 -0700 Subject: [PATCH 0432/1115] build: updated kokoro config for coverage and release-please (#613) --- .../pubsub/.kokoro/continuous/node10/test.cfg | 19 ++++++++++++++ .../pubsub/.kokoro/release-candidate-issue.sh | 25 ------------------- .../pubsub/.kokoro/release-requested.sh | 25 ------------------- .../pubsub/.kokoro/release/publish.cfg | 9 +++++++ .../release/release-candidate-issue.cfg | 22 ---------------- .../.kokoro/release/release-requested.cfg | 22 ---------------- handwritten/pubsub/.kokoro/test.sh | 8 ++++++ handwritten/pubsub/synth.metadata | 6 ++--- 8 files changed, 39 insertions(+), 97 deletions(-) delete mode 100755 handwritten/pubsub/.kokoro/release-candidate-issue.sh delete mode 100755 handwritten/pubsub/.kokoro/release-requested.sh delete mode 100644 handwritten/pubsub/.kokoro/release/release-candidate-issue.cfg delete mode 100644 handwritten/pubsub/.kokoro/release/release-requested.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg index e69de29bb2d..38c174e6b3d 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg @@ -0,0 +1,19 @@ +# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} + +# token used by release-please to keep an up-to-date release PR. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + } + } +} diff --git a/handwritten/pubsub/.kokoro/release-candidate-issue.sh b/handwritten/pubsub/.kokoro/release-candidate-issue.sh deleted file mode 100755 index 314e5d36e0c..00000000000 --- a/handwritten/pubsub/.kokoro/release-candidate-issue.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -eo pipefail - -export NPM_CONFIG_PREFIX=/home/node/.npm-global - -GITHUB_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_yoshi-automation-github-key) - -npx release-please candidate-issue --token=$GITHUB_TOKEN \ - --repo-url=googleapis/nodejs-pubsub \ - --package-name=@google-cloud/pubsub diff --git a/handwritten/pubsub/.kokoro/release-requested.sh b/handwritten/pubsub/.kokoro/release-requested.sh deleted file mode 100755 index 259190832e6..00000000000 --- a/handwritten/pubsub/.kokoro/release-requested.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -eo pipefail - -export NPM_CONFIG_PREFIX=/home/node/.npm-global - -GITHUB_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_yoshi-automation-github-key) - -npx release-please detect-checked --token=$GITHUB_TOKEN \ - --repo-url=googleapis/nodejs-pubsub \ - --package-name=@google-cloud/pubsub diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 632440add32..e747a8e2fda 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -9,6 +9,15 @@ before_action { } } +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + } + } +} + before_action { fetch_keystore { keystore_resource { diff --git a/handwritten/pubsub/.kokoro/release/release-candidate-issue.cfg b/handwritten/pubsub/.kokoro/release/release-candidate-issue.cfg deleted file mode 100644 index d08e057d985..00000000000 --- a/handwritten/pubsub/.kokoro/release/release-candidate-issue.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/release-candidate-issue.sh" -} diff --git a/handwritten/pubsub/.kokoro/release/release-requested.cfg b/handwritten/pubsub/.kokoro/release/release-requested.cfg deleted file mode 100644 index 470805626d3..00000000000 --- a/handwritten/pubsub/.kokoro/release/release-requested.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/release-requested.sh" -} diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index bfc7b26154e..46d3a40ff02 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -35,3 +35,11 @@ if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then else echo "coverage is only reported for Node $COVERAGE_NODE" fi + +# if the GITHUB_TOKEN is set, we kick off a task to update the release-PR. +GITHUB_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_yoshi-automation-github-key) || true +if [ "$GITHUB_TOKEN" ]; then + npx release-please release-pr --token=$GITHUB_TOKEN \ + --repo-url=googleapis/nodejs-pubsub \ + --package-name=@google-cloud/pubsub +fi diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 7f8932963b3..f8d9472076c 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-05-17T01:09:23.905696Z", + "updateTime": "2019-05-17T19:48:45.431779Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "03269e767cff9dd644d7784a4d4350b2ba6daf69", - "internalRef": "248524261" + "sha": "99efb1441b7c2aeb75c69f8baf9b61d4221bb744", + "internalRef": "248724297" } }, { From e1a0a0e235249cdadc2d9ae758265d232b9379dd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 17 May 2019 21:19:09 -0700 Subject: [PATCH 0433/1115] chore: release 0.29.1 (#614) * updated CHANGELOG.md * updated package.json * updated samples/package.json --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 5fa26aecfc3..9609569fc9e 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +### [0.29.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.29.0...v0.29.1) (2019-05-18) + + +### Bug Fixes + +* use typescript import/export for gapics ([#611](https://www.github.com/googleapis/nodejs-pubsub/issues/611)) ([e882e1a](https://www.github.com/googleapis/nodejs-pubsub/commit/e882e1a)) + ## [0.29.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.28.1...v0.29.0) (2019-05-15) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9657c6924f7..4f1019dd622 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.29.0", + "version": "0.29.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 995a0b7238be8d2d1810d18909298464d784d9cd Mon Sep 17 00:00:00 2001 From: Bryan Kendall Date: Mon, 20 May 2019 12:02:25 -0700 Subject: [PATCH 0434/1115] docs: fix npm link for @google-cloud/pubsub (#616) --- handwritten/pubsub/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 9609569fc9e..daa2ec0932d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -2,7 +2,7 @@ [npm history][1] -[1]: https://www.npmjs.com/package/nodejs-pubsub?activeTab=versions +[1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions ### [0.29.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.29.0...v0.29.1) (2019-05-18) From af7e5c670e3c81a2024a40bd8c1204d00418908c Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 20 May 2019 16:22:53 -0700 Subject: [PATCH 0435/1115] revert!: remove pullTimeout subscriber option (#618) --- handwritten/pubsub/src/message-stream.ts | 7 +------ handwritten/pubsub/test/message-stream.ts | 15 --------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 532436799bf..8ca1cb62cd9 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -48,7 +48,6 @@ const PULL_TIMEOUT = require('./v1/subscriber_client_config.json').interfaces[ const DEFAULT_OPTIONS: MessageStreamOptions = { highWaterMark: 0, maxStreams: 5, - pullTimeout: PULL_TIMEOUT, timeout: 300000, }; @@ -103,15 +102,11 @@ export class ChannelError extends Error implements ServiceError { * {@link https://nodejs.org/en/docs/guides/backpressuring-in-streams/} for * more details. * @property {number} [maxStreams=5] Number of streaming connections to make. - * @property {number} [pullTimeout=900000] Timeout to be applied to each - * underlying stream. Essentially this just closes a `StreamingPull` request - * after the specified time. * @property {number} [timeout=300000] Timeout for establishing a connection. */ export interface MessageStreamOptions { highWaterMark?: number; maxStreams?: number; - pullTimeout?: number; timeout?: number; } @@ -223,7 +218,7 @@ export class MessageStream extends PassThrough { return; } - const deadline = Date.now() + this._options.pullTimeout!; + const deadline = Date.now() + PULL_TIMEOUT; const request: StreamingPullRequest = { subscription: this._subscriber.name, streamAckDeadlineSeconds: this._subscriber.ackDeadline, diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 2757bc19075..a00e2b891b0 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -270,21 +270,6 @@ describe('MessageStream', () => { }); }); - it('should respect the pullTimeout option', done => { - const pullTimeout = 1234; - const expectedDeadline = now + pullTimeout; - - messageStream = new MessageStream(subscriber, {pullTimeout}); - - setImmediate(() => { - client.streams.forEach(stream => { - const deadline = stream.options.deadline; - assert.strictEqual(deadline, expectedDeadline); - }); - done(); - }); - }); - it('should respect the timeout option', done => { const timeout = 12345; const expectedDeadline = now + timeout; From 5e6995bc9990b68ee51f8696fc269d35b8ec2a4b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 21 May 2019 08:18:48 -0700 Subject: [PATCH 0436/1115] refactor: drop dependency on lodash.merge and update links (#620) --- handwritten/pubsub/package.json | 1 - handwritten/pubsub/src/v1/publisher_client.js | 38 ++++++------- .../pubsub/src/v1/subscriber_client.js | 54 ++++++++----------- handwritten/pubsub/synth.metadata | 12 ++--- 4 files changed, 44 insertions(+), 61 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4f1019dd622..93c3a312357 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -65,7 +65,6 @@ "google-gax": "^1.0.0", "grpc": "^1.20.3", "is-stream-ended": "^0.1.4", - "lodash.merge": "^4.6.0", "lodash.snakecase": "^4.1.1", "p-defer": "^2.0.1", "protobufjs": "^6.8.1" diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index b7e81bf30cb..4509850326d 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -16,7 +16,6 @@ const gapicConfig = require('./publisher_client_config.json'); const gax = require('google-gax'); -const merge = require('lodash.merge'); const path = require('path'); const protobuf = require('protobufjs'); @@ -90,16 +89,9 @@ class PublisherClient { } // Load the applicable protos. - const protos = merge( - {}, - gaxGrpc.loadProto( - path.join(__dirname, '..', '..', 'protos'), - 'google/iam/v1/iam_policy.proto' - ), - gaxGrpc.loadProto( - path.join(__dirname, '..', '..', 'protos'), - 'google/pubsub/v1/pubsub.proto' - ) + const protos = gaxGrpc.loadProto( + path.join(__dirname, '..', '..', 'protos'), + ['google/iam/v1/iam_policy.proto', 'google/pubsub/v1/pubsub.proto'] ); // This API contains "path templates"; forward-slash-separated @@ -320,7 +312,7 @@ class PublisherClient { * for production use. It is not subject to any SLA or deprecation policy. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -384,7 +376,7 @@ class PublisherClient { * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -448,7 +440,7 @@ class PublisherClient { * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -511,7 +503,7 @@ class PublisherClient { * Format is `projects/{project}/topics/{topic}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -571,7 +563,7 @@ class PublisherClient { * resources in a page. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -683,7 +675,7 @@ class PublisherClient { * resources in a page. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @returns {Stream} * An object stream which emits an object representing [Topic]{@link google.pubsub.v1.Topic} on 'data' event. * @@ -729,7 +721,7 @@ class PublisherClient { * resources in a page. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -845,7 +837,7 @@ class PublisherClient { * resources in a page. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @returns {Stream} * An object stream which emits a string on 'data' event. * @@ -889,7 +881,7 @@ class PublisherClient { * Format is `projects/{project}/topics/{topic}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error)} [callback] * The function which will be called with the result of the API call. * @returns {Promise} - The promise which resolves when API call finishes. @@ -943,7 +935,7 @@ class PublisherClient { * This object should have the same structure as [Policy]{@link google.iam.v1.Policy} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -1004,7 +996,7 @@ class PublisherClient { * See the operation documentation for the appropriate value for this field. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -1069,7 +1061,7 @@ class PublisherClient { * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 2049d181cb4..5e27c55f649 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -16,7 +16,6 @@ const gapicConfig = require('./subscriber_client_config.json'); const gax = require('google-gax'); -const merge = require('lodash.merge'); const path = require('path'); const VERSION = require('../../../package.json').version; @@ -90,16 +89,9 @@ class SubscriberClient { } // Load the applicable protos. - const protos = merge( - {}, - gaxGrpc.loadProto( - path.join(__dirname, '..', '..', 'protos'), - 'google/iam/v1/iam_policy.proto' - ), - gaxGrpc.loadProto( - path.join(__dirname, '..', '..', 'protos'), - 'google/pubsub/v1/pubsub.proto' - ) + const protos = gaxGrpc.loadProto( + path.join(__dirname, '..', '..', 'protos'), + ['google/iam/v1/iam_policy.proto', 'google/pubsub/v1/pubsub.proto'] ); // This API contains "path templates"; forward-slash-separated @@ -376,7 +368,7 @@ class SubscriberClient { * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -435,7 +427,7 @@ class SubscriberClient { * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -496,7 +488,7 @@ class SubscriberClient { * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -568,7 +560,7 @@ class SubscriberClient { * resources in a page. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -680,7 +672,7 @@ class SubscriberClient { * resources in a page. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @returns {Stream} * An object stream which emits an object representing [Subscription]{@link google.pubsub.v1.Subscription} on 'data' event. * @@ -724,7 +716,7 @@ class SubscriberClient { * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error)} [callback] * The function which will be called with the result of the API call. * @returns {Promise} - The promise which resolves when API call finishes. @@ -785,7 +777,7 @@ class SubscriberClient { * The maximum deadline you can specify is 600 seconds (10 minutes). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error)} [callback] * The function which will be called with the result of the API call. * @returns {Promise} - The promise which resolves when API call finishes. @@ -847,7 +839,7 @@ class SubscriberClient { * by the Pub/Sub system in the `Pull` response. Must not be empty. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error)} [callback] * The function which will be called with the result of the API call. * @returns {Promise} - The promise which resolves when API call finishes. @@ -908,7 +900,7 @@ class SubscriberClient { * least one message is available, rather than returning no messages. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -968,7 +960,7 @@ class SubscriberClient { * * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @returns {Stream} * An object stream which is both readable and writable. It accepts objects * representing [StreamingPullRequest]{@link google.pubsub.v1.StreamingPullRequest} for write() method, and @@ -1024,7 +1016,7 @@ class SubscriberClient { * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error)} [callback] * The function which will be called with the result of the API call. * @returns {Promise} - The promise which resolves when API call finishes. @@ -1086,7 +1078,7 @@ class SubscriberClient { * resources in a page. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -1198,7 +1190,7 @@ class SubscriberClient { * resources in a page. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @returns {Stream} * An object stream which emits an object representing [Snapshot]{@link google.pubsub.v1.Snapshot} on 'data' event. * @@ -1273,7 +1265,7 @@ class SubscriberClient { * managing labels. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -1343,7 +1335,7 @@ class SubscriberClient { * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -1421,7 +1413,7 @@ class SubscriberClient { * Format is `projects/{project}/snapshots/{snap}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error)} [callback] * The function which will be called with the result of the API call. * @returns {Promise} - The promise which resolves when API call finishes. @@ -1491,7 +1483,7 @@ class SubscriberClient { * Format is `projects/{project}/snapshots/{snap}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -1553,7 +1545,7 @@ class SubscriberClient { * This object should have the same structure as [Policy]{@link google.iam.v1.Policy} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -1614,7 +1606,7 @@ class SubscriberClient { * See the operation documentation for the appropriate value for this field. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * @@ -1679,7 +1671,7 @@ class SubscriberClient { * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/global.html#CallOptions} for the details. + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index f8d9472076c..17a8a789f82 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,26 +1,26 @@ { - "updateTime": "2019-05-17T19:48:45.431779Z", + "updateTime": "2019-05-21T11:21:25.330639Z", "sources": [ { "generator": { "name": "artman", - "version": "0.19.0", - "dockerImage": "googleapis/artman@sha256:d3df563538225ac6caac45d8ad86499500211d1bcb2536955a6dbda15e1b368e" + "version": "0.20.0", + "dockerImage": "googleapis/artman@sha256:3246adac900f4bdbd62920e80de2e5877380e44036b3feae13667ec255ebf5ec" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "99efb1441b7c2aeb75c69f8baf9b61d4221bb744", - "internalRef": "248724297" + "sha": "32a10f69e2c9ce15bba13ab1ff928bacebb25160", + "internalRef": "249058354" } }, { "template": { "name": "node_library", "origin": "synthtool.gcp", - "version": "2019.4.10" + "version": "2019.5.2" } } ], From dd297720a1d31a0bae3ba2ef197fedb9c3f89203 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 23 May 2019 02:39:14 +0000 Subject: [PATCH 0437/1115] chore: use published jsdoc-baseline package (#621) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 93c3a312357..e685d81a04d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -86,7 +86,7 @@ "gts": "^1.0.0", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.6.2", - "jsdoc-baseline": "git+https://github.com/hegemonic/jsdoc-baseline.git", + "jsdoc-baseline": "^0.1.0", "linkinator": "^1.1.2", "mkdirp": "^0.5.1", "mocha": "^6.0.0", From 1326f70dae0d468b0f02b22999b557307b11ac91 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 23 May 2019 13:34:56 -0700 Subject: [PATCH 0438/1115] fix(typescript): pin grpc to previous working version (#624) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e685d81a04d..e04d9e01a15 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -63,7 +63,7 @@ "extend": "^3.0.1", "google-auth-library": "^3.0.0", "google-gax": "^1.0.0", - "grpc": "^1.20.3", + "grpc": "1.20.3", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^2.0.1", From c898550661ae373cbe0d66fbaa3f5086f060eb19 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 23 May 2019 15:25:44 -0700 Subject: [PATCH 0439/1115] fix(subscription)!: decouple retainAckedMessages from messageRetentionDuration (#625) * fix(subscription)!: decouple retainAckedMessages from messageRetentionDuration * remove system-test assertions --- handwritten/pubsub/src/subscription.ts | 1 - handwritten/pubsub/system-test/pubsub.ts | 2 -- handwritten/pubsub/test/subscription.ts | 1 - 3 files changed, 4 deletions(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index e4f2e860479..09bfc9a1a83 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -1026,7 +1026,6 @@ export class Subscription extends EventEmitter { const formatted = extend(true, {}, metadata); if (typeof metadata.messageRetentionDuration === 'number') { - formatted.retainAckedMessages = true; (formatted as google.pubsub.v1.ISubscription).messageRetentionDuration = { seconds: metadata.messageRetentionDuration, nanos: 0, diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 0dffd9eade1..05e1a821cfa 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -339,7 +339,6 @@ describe('pubsub', () => { sub!.getMetadata((err, metadata) => { assert.ifError(err); - assert.strictEqual(metadata!.retainAckedMessages, true); assert.strictEqual( Number(metadata!.messageRetentionDuration!.seconds), threeDaysInSeconds @@ -371,7 +370,6 @@ describe('pubsub', () => { .then(([metadata]) => { const {seconds, nanos} = metadata.messageRetentionDuration!; - assert.strictEqual(metadata.retainAckedMessages, true); assert.strictEqual(Number(seconds), threeDaysInSeconds); assert.strictEqual(Number(nanos), 0); }); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 1d89f895a18..0d647693a1e 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -227,7 +227,6 @@ describe('Subscription', () => { const formatted = Subscription.formatMetadata_(metadata); - assert.strictEqual(formatted.retainAckedMessages, true); assert.strictEqual(formatted.messageRetentionDuration!.nanos, 0); assert.strictEqual( From 4ef5e6fb388cad0480ccf80efdebbf6c3073358b Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Thu, 23 May 2019 17:11:53 -0700 Subject: [PATCH 0440/1115] build: add configuration for automated doc deployment (#626) --- handwritten/pubsub/.kokoro/release/docs.cfg | 26 +++++++++++ handwritten/pubsub/.kokoro/release/docs.sh | 50 +++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 handwritten/pubsub/.kokoro/release/docs.cfg create mode 100755 handwritten/pubsub/.kokoro/release/docs.sh diff --git a/handwritten/pubsub/.kokoro/release/docs.cfg b/handwritten/pubsub/.kokoro/release/docs.cfg new file mode 100644 index 00000000000..178ab697396 --- /dev/null +++ b/handwritten/pubsub/.kokoro/release/docs.cfg @@ -0,0 +1,26 @@ +# service account used to publish up-to-date docs. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "docuploader_service_account" + } + } +} + +# doc publications use a Python image. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/release/docs.sh" +} diff --git a/handwritten/pubsub/.kokoro/release/docs.sh b/handwritten/pubsub/.kokoro/release/docs.sh new file mode 100755 index 00000000000..4d3a0868531 --- /dev/null +++ b/handwritten/pubsub/.kokoro/release/docs.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +# build jsdocs (Python is installed on the Node 10 docker image). +if [[ -z "$CREDENTIALS" ]]; then + # if CREDENTIALS are explicitly set, assume we're testing locally + # and don't set NPM_CONFIG_PREFIX. + export NPM_CONFIG_PREFIX=/home/node/.npm-global + export PATH="$PATH:/home/node/.npm-global/bin" + cd $(dirname $0)/../.. +fi +npm install +npm run docs + +# create docs.metadata, based on package.json and .repo-metadata.json. +npm i json@9.0.6 -g +python3 -m pip install --user gcp-docuploader +python3 -m docuploader create-metadata \ + --name=$(cat .repo-metadata.json | json name) \ + --version=$(cat package.json | json version) \ + --language=$(cat .repo-metadata.json | json language) \ + --distribution-name=$(cat .repo-metadata.json | json distribution_name) \ + --product-page=$(cat .repo-metadata.json | json product_documentation) \ + --github-repository=$(cat .repo-metadata.json | json repo) \ + --issue-tracker=$(cat .repo-metadata.json | json issue_tracker) +cp docs.metadata ./docs/docs.metadata + +# deploy the docs. +if [[ -z "$CREDENTIALS" ]]; then + CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account +fi +if [[ -z "$BUCKET" ]]; then + BUCKET=docs-staging +fi +python3 -m docuploader upload ./docs --credentials $CREDENTIALS --staging-bucket $BUCKET From d481bdafbb121e7e700a3ce8f6e56b07f0dcbee4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 23 May 2019 20:59:20 -0700 Subject: [PATCH 0441/1115] fix(deps): update dependency @sindresorhus/is to ^0.17.0 (#591) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e04d9e01a15..c5835aed29d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -55,7 +55,7 @@ "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", - "@sindresorhus/is": "^0.15.0", + "@sindresorhus/is": "^0.17.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From 376dc2e7e807a7ddd39c0e5c5ec3c1826ae2643a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 24 May 2019 08:25:43 -0700 Subject: [PATCH 0442/1115] fix: update rpc timeout settings (#628) --- handwritten/pubsub/src/v1/subscriber_client_config.json | 4 ++-- handwritten/pubsub/synth.metadata | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 74153622d34..45c1ace9f93 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -26,9 +26,9 @@ "initial_retry_delay_millis": 100, "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 12000, + "initial_rpc_timeout_millis": 25000, "rpc_timeout_multiplier": 1.0, - "max_rpc_timeout_millis": 12000, + "max_rpc_timeout_millis": 25000, "total_timeout_millis": 600000 }, "streaming_messaging": { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 17a8a789f82..cd339d97ddc 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-05-21T11:21:25.330639Z", + "updateTime": "2019-05-24T11:19:37.761336Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "32a10f69e2c9ce15bba13ab1ff928bacebb25160", - "internalRef": "249058354" + "sha": "0537189470f04f24836d6959821c24197a0ed120", + "internalRef": "249742806" } }, { From 599c385deb9afe81ec8700c7601360f8191cc7f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Tue, 28 May 2019 08:11:24 -0700 Subject: [PATCH 0443/1115] fix(deps): update dependency grpc to v1.21.1 (#629) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c5835aed29d..cb22aa5af8b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -63,7 +63,7 @@ "extend": "^3.0.1", "google-auth-library": "^3.0.0", "google-gax": "^1.0.0", - "grpc": "1.20.3", + "grpc": "1.21.1", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^2.0.1", From 7ad1b45969619379e5ddfa570149a9e01b0ec723 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 28 May 2019 20:40:11 +0000 Subject: [PATCH 0444/1115] build: ignore proto files in test coverage (#632) --- handwritten/pubsub/.nycrc | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/.nycrc b/handwritten/pubsub/.nycrc index bfe4073a6ab..83a421a0628 100644 --- a/handwritten/pubsub/.nycrc +++ b/handwritten/pubsub/.nycrc @@ -10,6 +10,7 @@ "**/samples", "**/scripts", "**/src/**/v*/**/*.js", + "**/protos", "**/test", ".jsdoc.js", "**/.jsdoc.js", From 3fce1dbc2458a68feb795741f50692fb2b3e1311 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 29 May 2019 11:05:29 -0700 Subject: [PATCH 0445/1115] docs(subscription): mention 100 stream limit (#633) --- handwritten/pubsub/src/subscription.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 09bfc9a1a83..e5f76e32a9a 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -134,6 +134,12 @@ export type SetSubscriptionMetadataResponse = MetadataResponse; * nack of such message when the processing is done. **Note:** message * redelivery is still possible. * + * By default each {@link PubSub} instance can handle 100 open streams, with + * default options this translates to less than 20 Subscriptions per PubSub + * instance. If you wish to create more Subscriptions than that, you can either + * create multiple PubSub instances or lower the + * `options.streamingOptions.maxStreams` value on each Subscription object. + * * @class * * @param {PubSub} pubsub PubSub object. From 897bfe43e27689ee38f6f9b11b0a800c3496aa13 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Wed, 29 May 2019 21:54:18 +0200 Subject: [PATCH 0446/1115] build: remove verbose logging from test scripts (#634) --- handwritten/pubsub/.kokoro/docs.sh | 2 +- handwritten/pubsub/.kokoro/lint.sh | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- handwritten/pubsub/.kokoro/trampoline.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/.kokoro/docs.sh b/handwritten/pubsub/.kokoro/docs.sh index a4f318794e6..952403faede 100755 --- a/handwritten/pubsub/.kokoro/docs.sh +++ b/handwritten/pubsub/.kokoro/docs.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -xeo pipefail +set -eo pipefail export NPM_CONFIG_PREFIX=/home/node/.npm-global diff --git a/handwritten/pubsub/.kokoro/lint.sh b/handwritten/pubsub/.kokoro/lint.sh index bcb7508363b..b03cb0439a6 100755 --- a/handwritten/pubsub/.kokoro/lint.sh +++ b/handwritten/pubsub/.kokoro/lint.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -xeo pipefail +set -eo pipefail export NPM_CONFIG_PREFIX=/home/node/.npm-global diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 07d31dccc45..20e3241c9e9 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -xeo pipefail +set -eo pipefail export NPM_CONFIG_PREFIX=/home/node/.npm-global diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index b7374d0ad45..fc5824e6667 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -xeo pipefail +set -eo pipefail export NPM_CONFIG_PREFIX=/home/node/.npm-global diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 46d3a40ff02..2ef3c60f8ac 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -xeo pipefail +set -eo pipefail export NPM_CONFIG_PREFIX=/home/node/.npm-global diff --git a/handwritten/pubsub/.kokoro/trampoline.sh b/handwritten/pubsub/.kokoro/trampoline.sh index 87ffd2ca960..9bd4905c4b5 100755 --- a/handwritten/pubsub/.kokoro/trampoline.sh +++ b/handwritten/pubsub/.kokoro/trampoline.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -xeo pipefail +set -eo pipefail # Always run the cleanup script, regardless of the success of bouncing into # the container. From 7bc9e798c70bf57a9c481b1c5584bd3d62d56b86 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 30 May 2019 10:46:30 -0700 Subject: [PATCH 0447/1115] chore(deps): update dependency typescript to ~3.5.0 (#635) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cb22aa5af8b..869f9fc0103 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -99,7 +99,7 @@ "sinon": "^7.1.1", "source-map-support": "^0.5.9", "through2": "^3.0.0", - "typescript": "~3.4.0", + "typescript": "~3.5.0", "uuid": "^3.1.0" } } From 7f46feefa4acc53ccf0c1f0da96c93685322b53d Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Wed, 5 Jun 2019 17:03:24 +0200 Subject: [PATCH 0448/1115] feat: add .repo-metadata.json, start generating README.md (#636) --- handwritten/pubsub/.cloud-repo-tools.json | 23 ------- handwritten/pubsub/.gitignore | 1 + handwritten/pubsub/.readme-partials.yml | 3 + handwritten/pubsub/.repo-metadata.json | 13 ++++ handwritten/pubsub/README.md | 73 +++++++++++++++-------- handwritten/pubsub/package.json | 1 - handwritten/pubsub/synth.metadata | 10 ++-- 7 files changed, 69 insertions(+), 55 deletions(-) delete mode 100644 handwritten/pubsub/.cloud-repo-tools.json create mode 100644 handwritten/pubsub/.readme-partials.yml create mode 100644 handwritten/pubsub/.repo-metadata.json diff --git a/handwritten/pubsub/.cloud-repo-tools.json b/handwritten/pubsub/.cloud-repo-tools.json deleted file mode 100644 index feabed1e164..00000000000 --- a/handwritten/pubsub/.cloud-repo-tools.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "requiresKeyFile": true, - "requiresProjectId": true, - "product": "pubsub", - "client_reference_url": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest", - "release_quality": "beta", - "samples": [ - { - "id": "subscriptions", - "name": "Subscriptions", - "file": "subscriptions.js", - "docs_link": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest/Subscription", - "usage": "node subscriptions.js --help" - }, - { - "id": "topics", - "name": "Topics", - "file": "topics.js", - "docs_link": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest/Topic", - "usage": "node topics.js --help" - } - ] -} diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 43ba03dde0c..0bb5e785871 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -13,3 +13,4 @@ system-test/*key.json .DS_Store google-cloud-logging-winston-*.tgz google-cloud-logging-bunyan-*.tgz +__pycache__ diff --git a/handwritten/pubsub/.readme-partials.yml b/handwritten/pubsub/.readme-partials.yml new file mode 100644 index 00000000000..53ba54f3d10 --- /dev/null +++ b/handwritten/pubsub/.readme-partials.yml @@ -0,0 +1,3 @@ +introduction: |- + [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows + you to send and receive messages between independent applications. diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json new file mode 100644 index 00000000000..1bbea42306c --- /dev/null +++ b/handwritten/pubsub/.repo-metadata.json @@ -0,0 +1,13 @@ +{ + "name": "pubsub", + "name_pretty": "Google Cloud Pub/Sub", + "product_documentation": "https://cloud.google.com/pubsub/docs/", + "client_documentation": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest/", + "issue_tracker": "https://issuetracker.google.com/savedsearches/559741", + "release_level": "beta", + "language": "nodejs", + "repo": "googleapis/nodejs-pubsub", + "distribution_name": "@google-cloud/pubsub", + "api_id": "pubsub.googleapis.com", + "requires_billing": true +} diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 7c0e3a8bffe..440939c43d4 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -1,38 +1,59 @@ [//]: # "This README.md file is auto-generated, all changes to this file will be lost." -[//]: # "To regenerate it, use `npm run generate-scaffolding`." +[//]: # "To regenerate it, use `python -m synthtool`." Google Cloud Platform logo # [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) -[![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages) +[![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.org/package/@google-cloud/pubsub) [![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-pubsub/master.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-pubsub) -[Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. -* [Using the client library](#using-the-client-library) + +[Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows +you to send and receive messages between independent applications. + + +* [Google Cloud Pub/Sub Node.js Client API Reference][client-docs] +* [Google Cloud Pub/Sub Documentation][product-docs] +* [github.com/googleapis/nodejs-pubsub](https://github.com/googleapis/nodejs-pubsub) + +Read more about the client libraries for Cloud APIs, including the older +Google APIs Client Libraries, in [Client Libraries Explained][explained]. + +[explained]: https://cloud.google.com/apis/docs/client-libraries-explained + +**Table of contents:** + + +* [Quickstart](#quickstart) + * [Before you begin](#before-you-begin) + * [Installing the client library](#installing-the-client-library) + * [Using the client library](#using-the-client-library) * [Samples](#samples) * [Versioning](#versioning) * [Contributing](#contributing) * [License](#license) -## Using the client library +## Quickstart -1. [Select or create a Cloud Platform project][projects]. +### Before you begin +1. [Select or create a Cloud Platform project][projects]. 1. [Enable billing for your project][billing]. - 1. [Enable the Google Cloud Pub/Sub API][enable_api]. - 1. [Set up authentication with a service account][auth] so you can access the API from your local workstation. -1. Install the client library: +### Installing the client library + +```bash +npm install @google-cloud/pubsub +``` - npm install --save @google-cloud/pubsub -1. Try an example: +### Using the client library ```javascript // Imports the Google Cloud client library @@ -49,8 +70,11 @@ async function quickstart( const [topic] = await pubsub.createTopic(topicName); console.log(`Topic ${topic.name} created.`); } + ``` + + ## Samples Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree/master/samples) directory. The samples' `README.md` @@ -58,21 +82,29 @@ has instructions for running the samples. | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | +| Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/quickstart.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/quickstart.js,samples/README.md) | | Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/subscriptions.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/subscriptions.js,samples/README.md) | | Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/topics.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/topics.js,samples/README.md) | -The [Cloud Pub/Sub Node.js Client API Reference][client-docs] documentation + + +The [Google Cloud Pub/Sub Node.js Client API Reference][client-docs] documentation also contains samples. ## Versioning This library follows [Semantic Versioning](http://semver.org/). + + This library is considered to be in **beta**. This means it is expected to be mostly stable while we work toward a general availability release; however, complete stability is not guaranteed. We will address issues and requests against beta libraries with a high priority. + + + More Information: [Google Cloud Platform Launch Stages][launch_stages] [launch_stages]: https://cloud.google.com/terms/launch-stages @@ -87,21 +119,10 @@ Apache Version 2.0 See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) -## What's Next - -* [Cloud Pub/Sub Documentation][product-docs] -* [Cloud Pub/Sub Node.js Client API Reference][client-docs] -* [github.com/googleapis/nodejs-pubsub](https://github.com/googleapis/nodejs-pubsub) - -Read more about the client libraries for Cloud APIs, including the older -Google APIs Client Libraries, in [Client Libraries Explained][explained]. - -[explained]: https://cloud.google.com/apis/docs/client-libraries-explained - -[client-docs]: https://cloud.google.com/nodejs/docs/reference/pubsub/latest -[product-docs]: https://cloud.google.com/pubsub/docs +[client-docs]: https://cloud.google.com/nodejs/docs/reference/pubsub/latest/ +[product-docs]: https://cloud.google.com/pubsub/docs/ [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png [projects]: https://console.cloud.google.com/project [billing]: https://support.google.com/cloud/answer/6293499#enable-billing [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com -[auth]: https://cloud.google.com/docs/authentication/getting-started +[auth]: https://cloud.google.com/docs/authentication/getting-started \ No newline at end of file diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 869f9fc0103..499c63cc26d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -39,7 +39,6 @@ "predocs": "npm run compile", "docs": "jsdoc -c .jsdoc.js", "fix": "eslint --fix '**/*.js' && gts fix", - "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", "clean": "gts clean", "compile": "tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp -r proto build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", "prepare": "npm run compile", diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index cd339d97ddc..107d2a1dfac 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-05-24T11:19:37.761336Z", + "updateTime": "2019-06-05T14:48:21.972507Z", "sources": [ { "generator": { "name": "artman", - "version": "0.20.0", - "dockerImage": "googleapis/artman@sha256:3246adac900f4bdbd62920e80de2e5877380e44036b3feae13667ec255ebf5ec" + "version": "0.23.1", + "dockerImage": "googleapis/artman@sha256:9d5cae1454da64ac3a87028f8ef486b04889e351c83bb95e83b8fab3959faed0" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0537189470f04f24836d6959821c24197a0ed120", - "internalRef": "249742806" + "sha": "47c142a7cecc6efc9f6f8af804b8be55392b795b", + "internalRef": "251635729" } }, { From 3cfa765907c320ef837a578b00c8ac64e4b6d0c6 Mon Sep 17 00:00:00 2001 From: Ramakrishnan Kandasamy <38713281+rmkanda@users.noreply.github.com> Date: Fri, 7 Jun 2019 23:24:34 +0530 Subject: [PATCH 0449/1115] fix(deps): upgrade module extend to fix CVE-2018-16492 (#644) Upgrade module extend to fix CVE-2018-16492 Prototype pollution vulnerability --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 499c63cc26d..044b988cd1e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -59,7 +59,7 @@ "@types/long": "^4.0.0", "arrify": "^2.0.0", "async-each": "^1.0.1", - "extend": "^3.0.1", + "extend": "^3.0.2", "google-auth-library": "^3.0.0", "google-gax": "^1.0.0", "grpc": "1.21.1", From bf25a7cd1034b0bbf352bb8220dd39d4ee2307e3 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 7 Jun 2019 15:20:03 -0700 Subject: [PATCH 0450/1115] fix: update regex to target correct comment (#646) --- handwritten/pubsub/src/message-queues.ts | 4 +--- handwritten/pubsub/synth.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 7918661d9d2..bbb62e0c469 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -52,9 +52,7 @@ export class BatchError extends Error implements ServiceError { metadata?: Metadata; constructor(err: ServiceError, ackIds: string[], rpc: string) { super( - `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ - err.message - }` + `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${err.message}` ); this.ackIds = ackIds; diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 7fd9232a3ff..7bf3a4a4922 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -23,7 +23,7 @@ # https://github.com/googleapis/gapic-generator/issues/2127 s.replace("src/v1/subscriber_client.js", - " }\n\s*/\*\*\n\s+\* The DNS address for this API service.", + " }\n\s*/\*\*\n\s+\* The DNS address for this API service\.", "\n // note: editing generated code\n" " this.waitForReady = function(deadline, callback) {\n" " return subscriberStub.then(\n" From 0ae6125f632b6fb8c0d7d3c71d961b6479c93d1e Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sat, 8 Jun 2019 12:40:03 -0700 Subject: [PATCH 0451/1115] feat: support apiEndpoint override (#647) --- handwritten/pubsub/src/v1/publisher_client.js | 14 ++++++- .../src/v1/publisher_client_config.json | 2 +- .../pubsub/src/v1/subscriber_client.js | 14 ++++++- handwritten/pubsub/synth.metadata | 10 ++--- handwritten/pubsub/test/gapic-v1.js | 42 +++++++++++++++++++ 5 files changed, 74 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 4509850326d..02e2c1065ed 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -57,14 +57,18 @@ class PublisherClient { * API remote host. */ constructor(opts) { + opts = opts || {}; this._descriptors = {}; + const servicePath = + opts.servicePath || opts.apiEndpoint || this.constructor.servicePath; + // Ensure that options include the service address and port. opts = Object.assign( { clientConfig: {}, port: this.constructor.port, - servicePath: this.constructor.servicePath, + servicePath, }, opts ); @@ -245,6 +249,14 @@ class PublisherClient { return 'pubsub.googleapis.com'; } + /** + * The DNS address for this API service - same as servicePath(), + * exists for compatibility reasons. + */ + static get apiEndpoint() { + return 'pubsub.googleapis.com'; + } + /** * The port for this API service. */ diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 07b6522cd26..b1ec0bb46e7 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -35,7 +35,7 @@ "initial_retry_delay_millis": 100, "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 12000, + "initial_rpc_timeout_millis": 25000, "rpc_timeout_multiplier": 1.0, "max_rpc_timeout_millis": 30000, "total_timeout_millis": 600000 diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 5e27c55f649..7161725412e 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -57,14 +57,18 @@ class SubscriberClient { * API remote host. */ constructor(opts) { + opts = opts || {}; this._descriptors = {}; + const servicePath = + opts.servicePath || opts.apiEndpoint || this.constructor.servicePath; + // Ensure that options include the service address and port. opts = Object.assign( { clientConfig: {}, port: this.constructor.port, - servicePath: this.constructor.servicePath, + servicePath, }, opts ); @@ -242,6 +246,14 @@ class SubscriberClient { return 'pubsub.googleapis.com'; } + /** + * The DNS address for this API service - same as servicePath(), + * exists for compatibility reasons. + */ + static get apiEndpoint() { + return 'pubsub.googleapis.com'; + } + /** * The port for this API service. */ diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 107d2a1dfac..febca94e4b3 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-06-05T14:48:21.972507Z", + "updateTime": "2019-06-08T11:18:37.058486Z", "sources": [ { "generator": { "name": "artman", - "version": "0.23.1", - "dockerImage": "googleapis/artman@sha256:9d5cae1454da64ac3a87028f8ef486b04889e351c83bb95e83b8fab3959faed0" + "version": "0.24.0", + "dockerImage": "googleapis/artman@sha256:ce425884865f57f18307e597bca1a74a3619b7098688d4995261f3ffb3488681" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "47c142a7cecc6efc9f6f8af804b8be55392b795b", - "internalRef": "251635729" + "sha": "a12347ec47a7f3d18e35f2effc4295c0b0983213", + "internalRef": "252108410" } }, { diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index 93015444243..539a4d05ff9 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -24,6 +24,27 @@ const error = new Error(); error.code = FAKE_STATUS_CODE; describe('PublisherClient', () => { + it('has servicePath', () => { + const servicePath = pubsubModule.v1.PublisherClient.servicePath; + assert(servicePath); + }); + + it('has apiEndpoint', () => { + const apiEndpoint = pubsubModule.v1.PublisherClient.apiEndpoint; + assert(apiEndpoint); + }); + + it('has port', () => { + const port = pubsubModule.v1.PublisherClient.port; + assert(port); + assert(typeof port === 'number'); + }); + + it('should create a client with no options', () => { + const client = new pubsubModule.v1.PublisherClient(); + assert(client); + }); + describe('createTopic', () => { it('invokes createTopic without error', done => { const client = new pubsubModule.v1.PublisherClient({ @@ -656,6 +677,27 @@ describe('PublisherClient', () => { }); }); describe('SubscriberClient', () => { + it('has servicePath', () => { + const servicePath = pubsubModule.v1.SubscriberClient.servicePath; + assert(servicePath); + }); + + it('has apiEndpoint', () => { + const apiEndpoint = pubsubModule.v1.SubscriberClient.apiEndpoint; + assert(apiEndpoint); + }); + + it('has port', () => { + const port = pubsubModule.v1.SubscriberClient.port; + assert(port); + assert(typeof port === 'number'); + }); + + it('should create a client with no options', () => { + const client = new pubsubModule.v1.SubscriberClient(); + assert(client); + }); + describe('createSubscription', () => { it('invokes createSubscription without error', done => { const client = new pubsubModule.v1.SubscriberClient({ From 812b7b83b0d811fabe302976a2e891f400610d9f Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 10 Jun 2019 07:54:56 -0700 Subject: [PATCH 0452/1115] build: remove unused clang format (#648) --- handwritten/pubsub/.clang-format | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 handwritten/pubsub/.clang-format diff --git a/handwritten/pubsub/.clang-format b/handwritten/pubsub/.clang-format deleted file mode 100644 index 7d6cf97e108..00000000000 --- a/handwritten/pubsub/.clang-format +++ /dev/null @@ -1,3 +0,0 @@ -Language: JavaScript -BasedOnStyle: Google -ColumnLimit: 80 \ No newline at end of file From 6f99cf5a0046bd330632d5580aaf70d4b49f7ecc Mon Sep 17 00:00:00 2001 From: Jiren Patel Date: Tue, 11 Jun 2019 20:32:44 +0530 Subject: [PATCH 0453/1115] chore: cleanup resources for system test cases (#630) --- handwritten/pubsub/system-test/pubsub.ts | 75 +++++++++++++++++++++--- 1 file changed, 67 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 05e1a821cfa..940de681db8 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -28,8 +28,20 @@ import { } from '../src'; import {Policy} from '../src/iam'; +type Resource = Topic | Subscription | Snapshot; + +const PREFIX = 'gcloud-tests'; +const CURRENT_TIME = Date.now(); + const pubsub = new PubSub(); +function shortUUID() { + return uuid + .v1() + .split('-') + .shift(); +} + describe('pubsub', () => { const TOPIC_NAMES = [ generateTopicName(), @@ -45,22 +57,67 @@ describe('pubsub', () => { const TOPIC_FULL_NAMES = TOPICS.map(getTopicName); + function generateName(name: string) { + return [PREFIX, name, shortUUID(), CURRENT_TIME].join('-'); + } + function generateSnapshotName() { - return 'test-snapshot-' + uuid.v4(); + return generateName('snapshot'); } function generateSubName() { - return 'test-subscription-' + uuid.v4(); + return generateName('subscription'); } function generateTopicName() { - return 'test-topic-' + uuid.v4(); + return generateName('topic'); } function getTopicName(topic: Topic) { return topic.name.split('/').pop(); } + function deleteTestResource(resource: Resource) { + // Delete resource from current test run. + if (resource.name.includes(CURRENT_TIME.toString())) { + resource.delete(); + return; + } + + // Delete left over resources which is older then 1 hour. + if (!resource.name.includes(PREFIX)) { + return; + } + + const createdAt = Number(resource.name.split('-').pop()); + const timeDiff = (Date.now() - createdAt) / (1000 * 60 * 60); + + if (timeDiff > 1) { + resource.delete(); + } + } + + async function deleteTestResources(): Promise { + const topicStream = pubsub.getTopicsStream().on('data', deleteTestResource); + const subscriptionStream = pubsub + .getSubscriptionsStream() + .on('data', deleteTestResource); + const snapshotStream = pubsub + .getSnapshotsStream() + .on('data', deleteTestResource); + + const streams = [topicStream, subscriptionStream, snapshotStream].map( + stream => { + return new Promise((resolve, reject) => { + stream.on('error', reject); + stream.on('end', resolve); + }); + } + ); + + return Promise.all(streams); + } + async function publishPop(message: Buffer, options = {}) { const topic = pubsub.topic(generateTopicName()); const subscription = topic.subscription(generateSubName()); @@ -75,14 +132,16 @@ describe('pubsub', () => { }); } - before(() => { - // create all needed topics - return Promise.all(TOPICS.map(t => t.create())); + before(async () => { + await deleteTestResources(); + + // create all needed topics with metadata + await Promise.all(TOPICS.map(t => t.create())); }); after(() => { - // Delete topics - return Promise.all(TOPICS.map(t => t.delete())); + // Delete all created test resources + return deleteTestResources(); }); describe('Topic', () => { From b65c74c61a1a02b5c863b3e70f3413eafe543b98 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 12 Jun 2019 08:10:38 -0700 Subject: [PATCH 0454/1115] docs: update return type in jsdoc for Buffers (#655) --- .../pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js | 2 +- handwritten/pubsub/src/v1/publisher_client.js | 2 +- handwritten/pubsub/synth.metadata | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index fdb2cb4e089..d0cedb93624 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -84,7 +84,7 @@ const Topic = { * Quotas and limits * for more information about message limits. * - * @property {string} data + * @property {Buffer} data * The message data field. If this field is empty, the message must contain * at least one attribute. * diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 02e2c1065ed..0447f66c820 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -470,7 +470,7 @@ class PublisherClient { * }); * * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * const data = ''; + * const data = Buffer.from(''); * const messagesElement = { * data: data, * }; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index febca94e4b3..88fffdb919e 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-06-08T11:18:37.058486Z", + "updateTime": "2019-06-12T11:21:35.782835Z", "sources": [ { "generator": { "name": "artman", - "version": "0.24.0", - "dockerImage": "googleapis/artman@sha256:ce425884865f57f18307e597bca1a74a3619b7098688d4995261f3ffb3488681" + "version": "0.24.1", + "dockerImage": "googleapis/artman@sha256:6018498e15310260dc9b03c9d576608908ed9fbabe42e1494ff3d827fea27b19" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a12347ec47a7f3d18e35f2effc4295c0b0983213", - "internalRef": "252108410" + "sha": "f117dac435e96ebe58d85280a3faf2350c4d4219", + "internalRef": "252714985" } }, { From a9d0308bf06b9694cd2b6613cff0e1750bc71624 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 12 Jun 2019 13:29:22 -0700 Subject: [PATCH 0455/1115] fix(deps): update dependency p-defer to v3 (#650) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/message-queues.ts | 4 ++-- handwritten/pubsub/system-test/pubsub.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 044b988cd1e..c040d3e754e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -65,7 +65,7 @@ "grpc": "1.21.1", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", - "p-defer": "^2.0.1", + "p-defer": "^3.0.0", "protobufjs": "^6.8.1" }, "devDependencies": { diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index bbb62e0c469..a20fa07b9ab 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -16,7 +16,7 @@ import {CallOptions} from 'google-gax'; import {Metadata, ServiceError, status} from 'grpc'; -import defer, {DeferredPromise} from 'p-defer'; +import defer = require('p-defer'); import {Message, Subscriber} from './subscriber'; @@ -72,7 +72,7 @@ export class BatchError extends Error implements ServiceError { */ export abstract class MessageQueue { numPendingRequests: number; - protected _onFlush?: DeferredPromise; + protected _onFlush?: defer.DeferredPromise; protected _options!: BatchOptions; protected _requests: QueuedMessages; protected _subscriber: Subscriber; diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 940de681db8..c031d2a6472 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import defer from 'p-defer'; +import defer = require('p-defer'); import * as uuid from 'uuid'; import { From 095d978ec34f5775ba980f129c505d82e3142597 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 12 Jun 2019 14:07:46 -0700 Subject: [PATCH 0456/1115] build: enable noImplicitAny in the tsconfig (#654) --- handwritten/pubsub/package.json | 6 +++++- handwritten/pubsub/src/subscription.ts | 2 +- handwritten/pubsub/tsconfig.json | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c040d3e754e..b50d0cfa291 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", - "@sindresorhus/is": "^0.17.0", + "@sindresorhus/is": "^0.17.1", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", @@ -72,10 +72,14 @@ "@google-cloud/nodejs-repo-tools": "^3.0.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", + "@types/lodash.snakecase": "^4.1.6", "@types/mocha": "^5.2.5", + "@types/mv": "^2.1.0", + "@types/ncp": "^2.0.1", "@types/proxyquire": "^1.3.28", "@types/sinon": "^7.0.0", "@types/through2": "^2.0.34", + "@types/tmp": "^0.1.0", "@types/uuid": "^3.4.4", "codecov": "^3.0.0", "eslint": "^5.0.0", diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index e5f76e32a9a..6c5d6602cb2 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -19,7 +19,7 @@ import is from '@sindresorhus/is'; import {EventEmitter} from 'events'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; -import * as snakeCase from 'lodash.snakecase'; +import snakeCase = require('lodash.snakecase'); import {google} from '../proto/pubsub'; diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index 5dc9ad65f2c..b10ee498aef 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -2,8 +2,7 @@ "extends": "./node_modules/gts/tsconfig-google.json", "compilerOptions": { "rootDir": ".", - "outDir": "build", - "noImplicitAny": false + "outDir": "build" }, "include": [ "src/*.ts", From 1ce38051e3a8cf93d53a3fcf2d01151a2daf8d73 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 12 Jun 2019 15:22:52 -0700 Subject: [PATCH 0457/1115] docs(subscription): add flow control example (#652) --- handwritten/pubsub/src/subscription.ts | 35 +++++++++++++------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 6c5d6602cb2..11c532a57fe 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -146,45 +146,34 @@ export type SetSubscriptionMetadataResponse = MetadataResponse; * @param {string} name The name of the subscription. * @param {SubscriberOptions} [options] Options for handling messages. * - * @example + * @example From {@link PubSub#getSubscriptions} * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * - * //- - * // From {@link PubSub#getSubscriptions}: - * //- * pubsub.getSubscriptions((err, subscriptions) => { * // `subscriptions` is an array of Subscription objects. * }); * - * //- - * // From {@link Topic#getSubscriptions}: - * //- + * @example From {@link Topic#getSubscriptions} * const topic = pubsub.topic('my-topic'); * topic.getSubscriptions((err, subscriptions) => { * // `subscriptions` is an array of Subscription objects. * }); * - * //- - * // From {@link Topic#createSubscription}: - * //- + * @example {@link Topic#createSubscription} * const topic = pubsub.topic('my-topic'); * topic.createSubscription('new-subscription', (err, subscription) => { * // `subscription` is a Subscription object. * }); * - * //- - * // From {@link Topic#subscription}: - * //- + * @example {@link Topic#subscription} * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * // `subscription` is a Subscription object. * - * //- - * // Once you have obtained a subscription object, you may begin to register - * // listeners. This will automatically trigger pulling for messages. - * //- - * + * @example Once you have obtained a subscription object, you may begin + * to register listeners. This will automatically trigger pulling for messages. + * * // Register an error handler. * subscription.on('error', (err) => {}); * @@ -212,6 +201,16 @@ export type SetSubscriptionMetadataResponse = MetadataResponse; * * // Remove the listener from receiving `message` events. * subscription.removeListener('message', onMessage); + * + * @example To apply a fine level of flow control, consider the + * following configuration + * const subscription = topic.subscription('my-sub', { + * flowControl: { + * maxMessages: 1, + * // this tells the client to manage and lock any excess messages + * allowExcessMessages: false + * } + * }); */ export class Subscription extends EventEmitter { pubsub: PubSub; From 06064d7914fb4a5a3e8de8a2969aa986bc2f8982 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 12 Jun 2019 16:42:45 -0700 Subject: [PATCH 0458/1115] docs(subscription): fix duration doc types (#656) --- handwritten/pubsub/src/pubsub.ts | 7 ++++--- handwritten/pubsub/src/subscription.ts | 18 +++++++----------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 5dfa3e60970..fbd59e8d3a4 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -332,9 +332,10 @@ export class PubSub { * messages. * @property {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - * @property {number|date} [messageRetentionDuration] Set this to override - * the default duration of 7 days. This value is expected in seconds. - * Acceptable values are in the range of 10 minutes and 7 days. + * @property {number|google.protobuf.Duration} [messageRetentionDuration] Set + * this to override the default duration of 7 days. This value is expected + * in seconds. Acceptable values are in the range of 10 minutes and 7 + * days. * @property {string} [pushEndpoint] A URL to a custom endpoint that * messages should be pushed to. * @property {boolean} [retainAckedMessages=false] If set, acked messages diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 11c532a57fe..7d0be0858c4 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -90,17 +90,13 @@ export type SetSubscriptionMetadataResponse = MetadataResponse; * successfully consuming messages from the subscription or is issuing * operations on the subscription. If expirationPolicy is not set, a default * policy with ttl of 31 days will be used. The minimum allowed value for - * expirationPolicy.ttl is 1 day. BETA: This feature is part of a beta release. - * This API might be changed in backward-incompatible ways and is not - * recommended for production use. It is not subject to any SLA or deprecation - * policy. - * @property {string} ttl Specifies the "time-to-live" duration for an associated - * resource. The resource expires if it is not active for a period of ttl. The - * eeedefinition of "activity" depends on the type of the associated resource. - * The minimum and maximum allowed values for ttl depend on the type of the - * associated resource, as well. If ttl is not set, the associated resource - * never expires. A duration in seconds with up to nine fractional digits, - * terminated by 's'. Example: "3.5s". + * expirationPolicy.ttl is 1 day. + * @property {google.protobuf.Duration} ttl Specifies the "time-to-live" + * duration for an associated resource. The resource expires if it is not + * active for a period of `ttl`. The definition of "activity" depends on the + * type of the associated resource. The minimum and maximum allowed values + * for `ttl` depend on the type of the associated resource, as well. If + * `ttl` is not set, the associated resource never expires. */ /** * A Subscription object will give you access to your Cloud Pub/Sub From 87bddae248031b2829ffca08fea3c7c81a6c76b5 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Wed, 12 Jun 2019 22:10:18 -0700 Subject: [PATCH 0459/1115] fix(docs): move to new client docs URL (#657) --- handwritten/pubsub/.repo-metadata.json | 4 ++-- handwritten/pubsub/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json index 1bbea42306c..f41ac8b9a18 100644 --- a/handwritten/pubsub/.repo-metadata.json +++ b/handwritten/pubsub/.repo-metadata.json @@ -2,7 +2,7 @@ "name": "pubsub", "name_pretty": "Google Cloud Pub/Sub", "product_documentation": "https://cloud.google.com/pubsub/docs/", - "client_documentation": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest/", + "client_documentation": "https://googleapis.dev/nodejs/pubsub/latest", "issue_tracker": "https://issuetracker.google.com/savedsearches/559741", "release_level": "beta", "language": "nodejs", @@ -10,4 +10,4 @@ "distribution_name": "@google-cloud/pubsub", "api_id": "pubsub.googleapis.com", "requires_billing": true -} +} \ No newline at end of file diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 440939c43d4..ac61d9d2c5b 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -119,7 +119,7 @@ Apache Version 2.0 See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) -[client-docs]: https://cloud.google.com/nodejs/docs/reference/pubsub/latest/ +[client-docs]: https://googleapis.dev/nodejs/pubsub/latest [product-docs]: https://cloud.google.com/pubsub/docs/ [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png [projects]: https://console.cloud.google.com/project From 2ecc29492e2a5fa6418f470c5186bde3c1fcf504 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 14 Jun 2019 11:36:44 -0700 Subject: [PATCH 0460/1115] fix(deps)!: use grpc-js instead of grpc extension (#658) --- handwritten/pubsub/package.json | 1 - handwritten/pubsub/src/index.ts | 2 +- handwritten/pubsub/src/message-queues.ts | 8 +++++--- handwritten/pubsub/src/message-stream.ts | 23 +++++++++++++++++------ handwritten/pubsub/src/pubsub.ts | 10 +++------- handwritten/pubsub/src/pull-retry.ts | 2 +- handwritten/pubsub/system-test/pubsub.ts | 19 +++++++++++++++++++ handwritten/pubsub/test/message-queues.ts | 6 +++--- handwritten/pubsub/test/message-stream.ts | 2 +- handwritten/pubsub/test/pubsub.ts | 8 ++------ handwritten/pubsub/test/pull-retry.ts | 2 +- handwritten/pubsub/test/subscription.ts | 4 ++-- handwritten/pubsub/test/topic.ts | 4 ++-- 13 files changed, 57 insertions(+), 34 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b50d0cfa291..1bb48914965 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -62,7 +62,6 @@ "extend": "^3.0.2", "google-auth-library": "^3.0.0", "google-gax": "^1.0.0", - "grpc": "1.21.1", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0", diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index f7dc6610dbc..36b892c5ea8 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -77,8 +77,8 @@ const v1 = require('./v1'); export {v1}; +export {ServiceError} from '@grpc/grpc-js'; export {CallOptions} from 'google-gax'; -export {ServiceError} from 'grpc'; export { Policy, GetPolicyCallback, diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index a20fa07b9ab..32f98f221e9 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -15,7 +15,7 @@ */ import {CallOptions} from 'google-gax'; -import {Metadata, ServiceError, status} from 'grpc'; +import {Metadata, ServiceError, status} from '@grpc/grpc-js'; import defer = require('p-defer'); import {Message, Subscriber} from './subscriber'; @@ -48,8 +48,9 @@ export interface BatchOptions { */ export class BatchError extends Error implements ServiceError { ackIds: string[]; - code?: status; - metadata?: Metadata; + code: status; + details: string; + metadata: Metadata; constructor(err: ServiceError, ackIds: string[], rpc: string) { super( `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${err.message}` @@ -57,6 +58,7 @@ export class BatchError extends Error implements ServiceError { this.ackIds = ackIds; this.code = err.code; + this.details = err.details; this.metadata = err.metadata; } } diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 8ca1cb62cd9..f78bd452296 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -22,7 +22,7 @@ import { ServiceError, status, StatusObject, -} from 'grpc'; +} from '@grpc/grpc-js'; import * as isStreamEnded from 'is-stream-ended'; import {PassThrough} from 'stream'; @@ -69,11 +69,13 @@ type PullStream = ClientDuplexStream & { * @param {object} status The gRPC status object. */ export class StatusError extends Error implements ServiceError { - code?: status; - metadata?: Metadata; + code: status; + details: string; + metadata: Metadata; constructor(status: StatusObject) { super(status.details); this.code = status.code; + this.details = status.details; this.metadata = status.metadata; } } @@ -87,11 +89,15 @@ export class StatusError extends Error implements ServiceError { */ export class ChannelError extends Error implements ServiceError { code: status; + details: string; + metadata: Metadata; constructor(err: Error) { super(`Failed to connect to channel. Reason: ${err.message}`); this.code = err.message.includes('deadline') ? status.DEADLINE_EXCEEDED : status.UNKNOWN; + this.details = err.message; + this.metadata = new Metadata(); } } @@ -259,9 +265,14 @@ export class MessageStream extends PassThrough { * @private */ private _keepAlive(): void { - for (const stream of this._streams.keys()) { - stream.write({}); - } + this._streams.forEach((receivedStatus, stream) => { + // its possible that a status event fires off (signaling the rpc being + // closed) but the stream hasn't drained yet, writing to this stream will + // result in a `write after end` error + if (!receivedStatus) { + stream.write({}); + } + }); } /** * Once the stream has nothing left to read, we'll remove it and attempt to diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index fbd59e8d3a4..1c961db495a 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -21,7 +21,8 @@ import is from '@sindresorhus/is'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; import * as gax from 'google-gax'; -import * as grpc from 'grpc'; +import * as grpc from '@grpc/grpc-js'; +import {ServiceError, ChannelCredentials} from '@grpc/grpc-js'; const PKG = require('../../package.json'); const v1 = require('./v1'); @@ -46,7 +47,6 @@ import {PublishOptions} from './publisher'; import {CallOptions} from 'google-gax'; import {Transform} from 'stream'; import {google} from '../proto/pubsub'; -import {ServiceError, ChannelCredentials} from 'grpc'; const opts = {} as gax.GrpcClientOptions; @@ -263,10 +263,6 @@ export class PubSub { } this.options = Object.assign( { - grpc, - 'grpc.keepalive_time_ms': 300000, - 'grpc.max_send_message_length': -1, - 'grpc.max_receive_message_length': 20000001, libName: 'gccl', libVersion: PKG.version, scopes: Object.keys(allScopes), @@ -932,7 +928,7 @@ export class PubSub { request(config: RequestConfig, callback: RequestCallback) { this.getClient_(config, (err, client) => { if (err) { - callback(err); + callback(err as ServiceError); return; } let reqOpts = extend(true, {}, config.reqOpts); diff --git a/handwritten/pubsub/src/pull-retry.ts b/handwritten/pubsub/src/pull-retry.ts index 838ade599b3..462721c3eb0 100644 --- a/handwritten/pubsub/src/pull-retry.ts +++ b/handwritten/pubsub/src/pull-retry.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {StatusObject, status} from 'grpc'; +import {StatusObject, status} from '@grpc/grpc-js'; /*! * retryable status codes diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index c031d2a6472..55fcc1f469f 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -15,6 +15,7 @@ */ import * as assert from 'assert'; +import * as crypto from 'crypto'; import defer = require('p-defer'); import * as uuid from 'uuid'; @@ -506,6 +507,24 @@ describe('pubsub', () => { } }); + it('should send and receive large messages', done => { + const subscription = topic.subscription(SUB_NAMES[0]); + const buf = crypto.randomBytes(9000000); // 9mb + + topic.publish(buf, (err, messageId) => { + assert.ifError(err); + + subscription.on('error', done).on('message', ({id, data}: Message) => { + if (id !== messageId) { + return; + } + + assert.deepStrictEqual(data, buf); + subscription.close(done); + }); + }); + }); + // can be ran manually to test options/memory usage/etc. // tslint:disable-next-line ban it.skip('should handle a large volume of messages', async function() { diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index b95979e4710..cddd0ccaf40 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import {EventEmitter} from 'events'; import {CallOptions} from 'google-gax'; -import {Metadata, ServiceError} from 'grpc'; +import {Metadata, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import * as uuid from 'uuid'; @@ -322,7 +322,7 @@ describe('MessageQueues', () => { const ackIds = messages.map(message => message.ackId); - const fakeError: ServiceError = new Error('Err.'); + const fakeError = new Error('Err.') as ServiceError; fakeError.code = 2; fakeError.metadata = new Metadata(); @@ -446,7 +446,7 @@ describe('MessageQueues', () => { const ackIds = messages.map(message => message.ackId); - const fakeError: ServiceError = new Error('Err.'); + const fakeError = new Error('Err.') as ServiceError; fakeError.code = 2; fakeError.metadata = new Metadata(); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index a00e2b891b0..5e83aebe121 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import {Metadata, ServiceError} from 'grpc'; +import {Metadata, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {Duplex, PassThrough} from 'stream'; diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 20cba5f885f..bcba89379bb 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -19,8 +19,8 @@ import * as promisify from '@google-cloud/promisify'; import arrify = require('arrify'); import * as assert from 'assert'; import * as gax from 'google-gax'; -import * as grpc from 'grpc'; -import {CallOptions, ServiceError, ChannelCredentials} from 'grpc'; +import * as grpc from '@grpc/grpc-js'; +import {CallOptions, ChannelCredentials, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -189,10 +189,6 @@ describe('PubSub', () => { describe('instantiation', () => { const DEFAULT_OPTIONS = { - grpc, - 'grpc.keepalive_time_ms': 300000, - 'grpc.max_send_message_length': -1, - 'grpc.max_receive_message_length': 20000001, libName: 'gccl', libVersion: PKG.version, scopes: [], diff --git a/handwritten/pubsub/test/pull-retry.ts b/handwritten/pubsub/test/pull-retry.ts index 4c098234a4a..ea844c490c5 100644 --- a/handwritten/pubsub/test/pull-retry.ts +++ b/handwritten/pubsub/test/pull-retry.ts @@ -16,7 +16,7 @@ import assert = require('assert'); import sinon = require('sinon'); -import {StatusObject, status} from 'grpc'; +import {StatusObject, status} from '@grpc/grpc-js'; import {PullRetry} from '../src/pull-retry'; describe('PullRetry', () => { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 0d647693a1e..4ee0c4dc1ea 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -17,7 +17,7 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import {EventEmitter} from 'events'; -import {ServiceError} from 'grpc'; +import {ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -506,7 +506,7 @@ describe('Subscription', () => { }); describe('error', () => { - const error = new Error('err'); + const error = new Error('err') as ServiceError; beforeEach(() => { subscription.request = (config, callback) => { diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index ecf15a2e786..695dfd3a9cf 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -17,7 +17,7 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import {CallOptions} from 'google-gax'; -import {ServiceError} from 'grpc'; +import {ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -440,7 +440,7 @@ describe('Topic', () => { }); it('should pass back any errors that occur', done => { - const error = new Error('err'); + const error = new Error('err') as ServiceError; const apiResponse = {}; topic.request = ( From 69ed6e1c6247024be07879eeb134976b90b3c963 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 14 Jun 2019 11:38:53 -0700 Subject: [PATCH 0461/1115] docs(topic): move publish option docs to publisher constructor (#659) --- handwritten/pubsub/src/publisher.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts index 2b94327de3b..613d3de2cb8 100644 --- a/handwritten/pubsub/src/publisher.ts +++ b/handwritten/pubsub/src/publisher.ts @@ -36,6 +36,17 @@ export interface Attributes { } export type PublishCallback = RequestCallback; +export interface BatchPublishOptions { + maxBytes?: number; + maxMessages?: number; + maxMilliseconds?: number; +} + +export interface PublishOptions { + batching?: BatchPublishOptions; + gaxOpts?: CallOptions; +} + /** * @typedef BatchPublishOptions * @property {number} [maxBytes=1024^2 * 5] The maximum number of bytes to @@ -45,23 +56,12 @@ export type PublishCallback = RequestCallback; * @property {number} [maxMilliseconds=100] The maximum duration to wait before * sending a payload. */ -export interface BatchPublishOptions { - maxBytes?: number; - maxMessages?: number; - maxMilliseconds?: number; -} - /** * @typedef PublishOptions * @property {BatchPublishOptions} [batching] Batching settings. * @property {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. */ -export interface PublishOptions { - batching?: BatchPublishOptions; - gaxOpts?: CallOptions; -} - /** * A Publisher object allows you to publish messages to a specific topic. * From 73b166dc181d442d89eb529474d6695c1b2a83e4 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 17 Jun 2019 07:43:43 -0700 Subject: [PATCH 0462/1115] chore: release 0.30.0 (#660) --- handwritten/pubsub/CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index daa2ec0932d..be0b4b6c48d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,39 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [0.30.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.29.1...v0.30.0) (2019-06-17) + + +### ⚠ BREAKING CHANGES + +* **deps:** use grpc-js instead of grpc extension (#658) +* **subscription:** decouple retainAckedMessages from messageRetentionDuration (#625) +* remove pullTimeout subscriber option (#618) + +### Bug Fixes + +* **deps:** update dependency @sindresorhus/is to ^0.17.0 ([#591](https://www.github.com/googleapis/nodejs-pubsub/issues/591)) ([06fae6e](https://www.github.com/googleapis/nodejs-pubsub/commit/06fae6e)) +* **deps:** update dependency grpc to v1.21.1 ([#629](https://www.github.com/googleapis/nodejs-pubsub/issues/629)) ([fcf75a2](https://www.github.com/googleapis/nodejs-pubsub/commit/fcf75a2)) +* **deps:** update dependency p-defer to v3 ([#650](https://www.github.com/googleapis/nodejs-pubsub/issues/650)) ([50f9d4e](https://www.github.com/googleapis/nodejs-pubsub/commit/50f9d4e)) +* **deps:** upgrade module extend to fix CVE-2018-16492 ([#644](https://www.github.com/googleapis/nodejs-pubsub/issues/644)) ([cd54630](https://www.github.com/googleapis/nodejs-pubsub/commit/cd54630)) +* **deps:** use grpc-js instead of grpc extension ([#658](https://www.github.com/googleapis/nodejs-pubsub/issues/658)) ([535a917](https://www.github.com/googleapis/nodejs-pubsub/commit/535a917)) +* **docs:** move to new client docs URL ([#657](https://www.github.com/googleapis/nodejs-pubsub/issues/657)) ([a9972ea](https://www.github.com/googleapis/nodejs-pubsub/commit/a9972ea)) +* update regex to target correct comment ([#646](https://www.github.com/googleapis/nodejs-pubsub/issues/646)) ([9e8f245](https://www.github.com/googleapis/nodejs-pubsub/commit/9e8f245)) +* update rpc timeout settings ([#628](https://www.github.com/googleapis/nodejs-pubsub/issues/628)) ([2a1a430](https://www.github.com/googleapis/nodejs-pubsub/commit/2a1a430)) +* **subscription:** decouple retainAckedMessages from messageRetentionDuration ([#625](https://www.github.com/googleapis/nodejs-pubsub/issues/625)) ([3431e7c](https://www.github.com/googleapis/nodejs-pubsub/commit/3431e7c)) +* **typescript:** pin grpc to previous working version ([#624](https://www.github.com/googleapis/nodejs-pubsub/issues/624)) ([2167536](https://www.github.com/googleapis/nodejs-pubsub/commit/2167536)) + + +### Features + +* add .repo-metadata.json, start generating README.md ([#636](https://www.github.com/googleapis/nodejs-pubsub/issues/636)) ([142f56c](https://www.github.com/googleapis/nodejs-pubsub/commit/142f56c)) +* support apiEndpoint override ([#647](https://www.github.com/googleapis/nodejs-pubsub/issues/647)) ([b44f566](https://www.github.com/googleapis/nodejs-pubsub/commit/b44f566)) + + +### Reverts + +* remove pullTimeout subscriber option ([#618](https://www.github.com/googleapis/nodejs-pubsub/issues/618)) ([4fc9724](https://www.github.com/googleapis/nodejs-pubsub/commit/4fc9724)) + ### [0.29.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.29.0...v0.29.1) (2019-05-18) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1bb48914965..7a92817bf0a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.29.1", + "version": "0.30.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From a8d3458070f042bb3e34a99d99fa65ce2c035cca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 17 Jun 2019 08:19:51 -0700 Subject: [PATCH 0463/1115] chore(deps): update dependency eslint-config-prettier to v5 (#662) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7a92817bf0a..0d0b261d45c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -82,7 +82,7 @@ "@types/uuid": "^3.4.4", "codecov": "^3.0.0", "eslint": "^5.0.0", - "eslint-config-prettier": "^4.0.0", + "eslint-config-prettier": "^5.0.0", "eslint-plugin-node": "^9.0.0", "eslint-plugin-prettier": "^3.0.0", "gts": "^1.0.0", From 3cd9b1cc36f15682026943c8281cb2f5d76125e4 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Tue, 18 Jun 2019 21:50:22 -0700 Subject: [PATCH 0464/1115] build: switch to GitHub magic proxy, for release-please (#663) --- .../pubsub/.kokoro/continuous/node10/test.cfg | 22 +++++++++++++++++-- handwritten/pubsub/.kokoro/test.sh | 11 +++++----- handwritten/pubsub/synth.metadata | 10 ++++----- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg index 38c174e6b3d..fefee48ba76 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg @@ -8,12 +8,30 @@ before_action { } } -# token used by release-please to keep an up-to-date release PR. +# tokens used by release-please to keep an up-to-date release PR. before_action { fetch_keystore { keystore_resource { keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" + keyname: "github-magic-proxy-key-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-token-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-url-release-please" } } } diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 2ef3c60f8ac..67b63d811fb 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -36,10 +36,11 @@ else echo "coverage is only reported for Node $COVERAGE_NODE" fi -# if the GITHUB_TOKEN is set, we kick off a task to update the release-PR. -GITHUB_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_yoshi-automation-github-key) || true -if [ "$GITHUB_TOKEN" ]; then - npx release-please release-pr --token=$GITHUB_TOKEN \ +# if release-please keys set, we kick off a task to update the release-PR. +if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then + npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ --repo-url=googleapis/nodejs-pubsub \ - --package-name=@google-cloud/pubsub + --package-name=@google-cloud/pubsub \ + --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ + --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please fi diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 88fffdb919e..6aaa79dd8bb 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-06-12T11:21:35.782835Z", + "updateTime": "2019-06-18T01:03:19.302618Z", "sources": [ { "generator": { "name": "artman", - "version": "0.24.1", - "dockerImage": "googleapis/artman@sha256:6018498e15310260dc9b03c9d576608908ed9fbabe42e1494ff3d827fea27b19" + "version": "0.26.0", + "dockerImage": "googleapis/artman@sha256:6db0735b0d3beec5b887153a2a7c7411fc7bb53f73f6f389a822096bd14a3a15" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "f117dac435e96ebe58d85280a3faf2350c4d4219", - "internalRef": "252714985" + "sha": "384aa843867c4d17756d14a01f047b6368494d32", + "internalRef": "253675319" } }, { From c21760c9a145721dcbcaf26bc614c4e369d27a0b Mon Sep 17 00:00:00 2001 From: Stephen Date: Fri, 21 Jun 2019 13:29:20 -0400 Subject: [PATCH 0465/1115] fix(deps): include missing @grpc/grpc-js dependency (#665) --- handwritten/pubsub/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0d0b261d45c..b726be8928c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,6 +54,7 @@ "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", + "@grpc/grpc-js": "^0.4.3", "@sindresorhus/is": "^0.17.1", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", From 636c95a0beb963621eff45cc03409838efac5c93 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 21 Jun 2019 10:39:26 -0700 Subject: [PATCH 0466/1115] chore: release 0.30.1 (#666) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index be0b4b6c48d..9eb7a4e5a26 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [0.30.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.30.0...v0.30.1) (2019-06-21) + + +### Bug Fixes + +* **deps:** include missing @grpc/grpc-js dependency ([#665](https://www.github.com/googleapis/nodejs-pubsub/issues/665)) ([5f42f60](https://www.github.com/googleapis/nodejs-pubsub/commit/5f42f60)) + ## [0.30.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.29.1...v0.30.0) (2019-06-17) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b726be8928c..fc930472c0a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.30.0", + "version": "0.30.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 205d1e460eb5ad71332b20804e66520437fdd448 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 24 Jun 2019 17:27:14 -0700 Subject: [PATCH 0467/1115] fix(docs): reference docs should link to section of googleapis.dev with API reference (#670) --- handwritten/pubsub/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index ac61d9d2c5b..be0bb9d9adf 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -119,10 +119,12 @@ Apache Version 2.0 See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) -[client-docs]: https://googleapis.dev/nodejs/pubsub/latest +[client-docs]: https://googleapis.dev/nodejs/pubsub/latest#reference [product-docs]: https://cloud.google.com/pubsub/docs/ [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png [projects]: https://console.cloud.google.com/project [billing]: https://support.google.com/cloud/answer/6293499#enable-billing [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com -[auth]: https://cloud.google.com/docs/authentication/getting-started \ No newline at end of file +[auth]: https://cloud.google.com/docs/authentication/getting-started + + From ce00fe32553fdefca221a01bdcfa3c49949ce999 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Thu, 27 Jun 2019 13:50:30 -0700 Subject: [PATCH 0468/1115] docs: improve header linking to other external docs (#673) --- handwritten/pubsub/.jsdoc.js | 3 +++ handwritten/pubsub/.readme-partials.yml | 7 +++++++ handwritten/pubsub/README.md | 7 +++++++ handwritten/pubsub/synth.metadata | 10 +++++----- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index d48e7e73534..49562326faa 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -41,5 +41,8 @@ module.exports = { sourceFiles: false, systemName: '@google-cloud/pubsub', theme: 'lumen' + }, + markdown: { + idInHeadings: true } }; diff --git a/handwritten/pubsub/.readme-partials.yml b/handwritten/pubsub/.readme-partials.yml index 53ba54f3d10..45098c0845e 100644 --- a/handwritten/pubsub/.readme-partials.yml +++ b/handwritten/pubsub/.readme-partials.yml @@ -1,3 +1,10 @@ introduction: |- [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. + + This document contains to an [API reference](https://googleapis.dev/nodejs/pubsub/latest/index.html#reference), samples, + and other resources useful to developing Node.js applications. + For additional help developing Pub/Sub applications, in Node.js and other languages, see our + [Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), + [publisher](https://cloud.google.com/pubsub/docs/publisher), and [subscriber](https://cloud.google.com/pubsub/docs/subscriber) + guides. diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index be0bb9d9adf..2dc3b4d6af8 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -14,6 +14,13 @@ [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. +This document contains to an [API reference](https://googleapis.dev/nodejs/pubsub/latest/index.html#reference), samples, +and other resources useful to developing Node.js applications. +For additional help developing Pub/Sub applications, in Node.js and other languages, see our +[Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), +[publisher](https://cloud.google.com/pubsub/docs/publisher), and [subscriber](https://cloud.google.com/pubsub/docs/subscriber) +guides. + * [Google Cloud Pub/Sub Node.js Client API Reference][client-docs] * [Google Cloud Pub/Sub Documentation][product-docs] diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 6aaa79dd8bb..6adea0612c7 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-06-18T01:03:19.302618Z", + "updateTime": "2019-06-25T21:35:12.178824Z", "sources": [ { "generator": { "name": "artman", - "version": "0.26.0", - "dockerImage": "googleapis/artman@sha256:6db0735b0d3beec5b887153a2a7c7411fc7bb53f73f6f389a822096bd14a3a15" + "version": "0.29.0", + "dockerImage": "googleapis/artman@sha256:b79c8c20ee51e5302686c9d1294672d59290df1489be93749ef17d0172cc508d" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "384aa843867c4d17756d14a01f047b6368494d32", - "internalRef": "253675319" + "sha": "de1150ccad2a3daa4e265a0948bec54fdf9c8b54", + "internalRef": "254446031" } }, { From f8601996cf7a434dc7787589bd942cc053db5ab2 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 28 Jun 2019 10:07:05 -0700 Subject: [PATCH 0469/1115] build: use config file for linkinator (#677) --- handwritten/pubsub/linkinator.config.json | 7 +++++++ handwritten/pubsub/package.json | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 handwritten/pubsub/linkinator.config.json diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json new file mode 100644 index 00000000000..d780d6bfff5 --- /dev/null +++ b/handwritten/pubsub/linkinator.config.json @@ -0,0 +1,7 @@ +{ + "recurse": true, + "skip": [ + "https://codecov.io/gh/googleapis/", + "www.googleapis.com" + ] +} diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index fc930472c0a..b02dd28ee47 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -46,7 +46,7 @@ "proto": "mkdirp proto && npm run proto:pubsub && npm run proto:iam", "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -o proto/iam.d.ts -", - "docs-test": "linkinator docs -r --skip www.googleapis.com", + "docs-test": "linkinator docs", "predocs-test": "npm run docs" }, "dependencies": { @@ -90,7 +90,7 @@ "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.6.2", "jsdoc-baseline": "^0.1.0", - "linkinator": "^1.1.2", + "linkinator": "^1.5.0", "mkdirp": "^0.5.1", "mocha": "^6.0.0", "mv": "^2.1.1", From 0f3b0176c3b5836357a7c8b56082994e2ff0c460 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 1 Jul 2019 11:15:34 -0400 Subject: [PATCH 0470/1115] revert(message)!: remove nack delay parameter (#668) --- handwritten/pubsub/src/subscriber.ts | 18 ++++-------------- handwritten/pubsub/test/subscriber.ts | 8 +++----- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index fb76a30363a..2197f0338b3 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -175,25 +175,16 @@ export class Message { } /** * Removes the message from our inventory and schedules it to be redelivered. - * If the delay parameter is unset, it will be redelivered immediately. - * - * @param {number} [delay=0] The desired time to wait before the - * redelivery occurs. * * @example * subscription.on('message', message => { * message.nack(); * }); - * - * @example Specify a delay to redeliver the message - * subscription.on('message', message => { - * message.nack(60); // redeliver in 1 minute - * }); */ - nack(delay?: number): void { + nack(): void { if (!this._handled) { this._handled = true; - this._subscriber.nack(this, delay); + this._subscriber.nack(this); } } } @@ -352,12 +343,11 @@ export class Subscriber extends EventEmitter { * it from our inventory. * * @param {Message} message The message. - * @param {number} [delay=0] Delay to wait before redelivery. * @return {Promise} * @private */ - async nack(message: Message, delay = 0): Promise { - await this.modAck(message, delay); + async nack(message: Message): Promise { + await this.modAck(message, 0); this._inventory.remove(message); } /** diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index ba2dde92bed..218ec26b990 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -709,22 +709,20 @@ describe('Subscriber', () => { describe('nack', () => { it('should nack the message', () => { - const fakeDelay = 10; const stub = sandbox.stub(subscriber, 'modAck'); - message.nack(fakeDelay); + message.nack(); const [msg, delay] = stub.lastCall.args; assert.strictEqual(msg, message); - assert.strictEqual(delay, fakeDelay); + assert.strictEqual(delay, 0); }); it('should not nack the message if its been handled', () => { - const delay = 10; const stub = sandbox.stub(subscriber, 'modAck'); message.ack(); - message.nack(delay); + message.nack(); assert.strictEqual(stub.callCount, 0); }); From 0509e822b203828d1a37772c542d752f401ef128 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 2 Jul 2019 14:45:19 -0700 Subject: [PATCH 0471/1115] docs: add docs for GetPolicyOptions on the publisher client (#682) --- .../src/v1/doc/google/iam/v1/doc_options.js | 16 ++++++++++++++++ handwritten/pubsub/src/v1/publisher_client.js | 5 +++++ handwritten/pubsub/src/v1/subscriber_client.js | 5 +++++ handwritten/pubsub/synth.metadata | 10 +++++----- 4 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js new file mode 100644 index 00000000000..f26716efea0 --- /dev/null +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js @@ -0,0 +1,16 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Note: this file is purely for documentation. Any contents are not expected +// to be loaded as the JS file. diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 0447f66c820..87b8facf625 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -1006,6 +1006,11 @@ class PublisherClient { * @param {string} request.resource * REQUIRED: The resource for which the policy is being requested. * See the operation documentation for the appropriate value for this field. + * @param {Object} [request.options] + * OPTIONAL: A `GetPolicyOptions` object for specifying options to + * `GetIamPolicy`. This field is only used by Cloud IAM. + * + * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 7161725412e..1e5a4ab6495 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -1616,6 +1616,11 @@ class SubscriberClient { * @param {string} request.resource * REQUIRED: The resource for which the policy is being requested. * See the operation documentation for the appropriate value for this field. + * @param {Object} [request.options] + * OPTIONAL: A `GetPolicyOptions` object for specifying options to + * `GetIamPolicy`. This field is only used by Cloud IAM. + * + * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 6adea0612c7..ee3af1a4851 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-06-25T21:35:12.178824Z", + "updateTime": "2019-07-02T11:45:25.185485Z", "sources": [ { "generator": { "name": "artman", - "version": "0.29.0", - "dockerImage": "googleapis/artman@sha256:b79c8c20ee51e5302686c9d1294672d59290df1489be93749ef17d0172cc508d" + "version": "0.29.3", + "dockerImage": "googleapis/artman@sha256:8900f94a81adaab0238965aa8a7b3648791f4f3a95ee65adc6a56cfcc3753101" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "de1150ccad2a3daa4e265a0948bec54fdf9c8b54", - "internalRef": "254446031" + "sha": "5322233f8cbec4d3f8c17feca2507ef27d4a07c9", + "internalRef": "256042411" } }, { From b0e049d805fd665bd1247c1fbd3d5aae0a78e87f Mon Sep 17 00:00:00 2001 From: Tianzi Cai Date: Mon, 15 Jul 2019 10:51:56 -0700 Subject: [PATCH 0472/1115] Rewrite subscriber flow control example (#683) * Rewrite flowcontrol sample * Alex's suggestions * reset & passed all tests locally * lint * lint * comment * kir's suggestions * Dave's suggestions * change timeout back to 10 sec --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b02dd28ee47..80793550c18 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -97,7 +97,7 @@ "ncp": "^2.0.0", "nyc": "^14.0.0", "power-assert": "^1.4.4", - "prettier": "^1.9.1", + "prettier": "^1.18.2", "proxyquire": "^2.0.0", "sinon": "^7.1.1", "source-map-support": "^0.5.9", From 4df981ab6465f9f347fb79738c95b7d2e9d3fba7 Mon Sep 17 00:00:00 2001 From: Jose Donizetti Date: Wed, 17 Jul 2019 14:50:13 -0300 Subject: [PATCH 0473/1115] docs(topic): fix createSubscription option documentation (#688) --- handwritten/pubsub/src/topic.ts | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 2f2af1f1c6d..97542498316 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -827,18 +827,7 @@ export class Topic { * @throws {Error} If subscription name is omitted. * * @param {string} name Name of the subscription. - * @param {object} [options] Configuration object. - * @param {object} [options.flowControl] Flow control configurations for - * receiving messages. Note that these options do not persist across - * subscription instances. - * @param {number} [options.flowControl.maxBytes] The maximum number of bytes - * in un-acked messages to allow before the subscription pauses incoming - * messages. Defaults to 20% of free memory. - * @param {number} [options.flowControl.maxMessages=Infinity] The maximum number - * of un-acked messages to allow before the subscription pauses incoming - * messages. - * @param {number} [options.maxConnections=5] Use this to limit the number of - * connections to be used when sending and receiving messages. + * @param {SubscriptionOptions} [options] Subscription options. * @return {Subscription} * * @example From 3c52b475bbc390476bf63f1ffeec4a4a01c30336 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 17 Jul 2019 15:13:15 -0400 Subject: [PATCH 0474/1115] docs(subscription): fix links to retrieving/creating subscriptions (#692) --- handwritten/pubsub/src/subscription.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 7d0be0858c4..04dbf1c28cc 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -106,11 +106,11 @@ export type SetSubscriptionMetadataResponse = MetadataResponse; * * - {@link Pubsub#getSubscriptions} * - {@link Topic#getSubscriptions} - * - {@link Topic#createSubscription} * * Subscription objects may be created directly with: * - * - {@link Topic#subscription} + * - {@link Pubsub#createSubscription} + * - {@link Topic#createSubscription} * * All Subscription objects are instances of an * [EventEmitter](http://nodejs.org/api/events.html). The subscription will pull From 99138b3c8134055e3aaaa280f5153cffb3b5f068 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 18 Jul 2019 21:26:47 -0400 Subject: [PATCH 0475/1115] docs(subscription): ensure sub options are not removed by ts (#691) * docs(subscription): ensure sub options are not removed by ts * update topic#subscription param type * update pubsub#subscription options description --- handwritten/pubsub/src/pubsub.ts | 2 +- handwritten/pubsub/src/subscriber.ts | 14 +++++++------- handwritten/pubsub/src/topic.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 1c961db495a..5e792bfedd0 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -965,7 +965,7 @@ export class PubSub { * @throws {Error} If subscription name is omitted. * * @param {string} name Name of the subscription. - * @param {SubscriberOptions} [options] Subscription options. + * @param {SubscriberOptions} [options] Configuration object. * @returns {Subscription} A {@link Subscription} instance. * * @example diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 2197f0338b3..62c502f77e6 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -189,6 +189,13 @@ export class Message { } } +export interface SubscriberOptions { + ackDeadline?: number; + batching?: BatchOptions; + flowControl?: FlowControlOptions; + streamingOptions?: MessageStreamOptions; +} + /** * @typedef {object} SubscriberOptions * @property {number} [ackDeadline=10] Acknowledge deadline in seconds. If left @@ -198,13 +205,6 @@ export class Message { * @property {FlowControlOptions} [flowControl] Flow control options. * @property {MessageStreamOptions} [streamingOptions] Streaming options. */ -export interface SubscriberOptions { - ackDeadline?: number; - batching?: BatchOptions; - flowControl?: FlowControlOptions; - streamingOptions?: MessageStreamOptions; -} - /** * Subscriber class is used to manage all message related functionality. * diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 97542498316..2d43e8a2c24 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -827,7 +827,7 @@ export class Topic { * @throws {Error} If subscription name is omitted. * * @param {string} name Name of the subscription. - * @param {SubscriptionOptions} [options] Subscription options. + * @param {SubscriberOptions} [options] Configuration object. * @return {Subscription} * * @example From 390967ad6b01c61722e49e972d3d4b236e6c2087 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Thu, 18 Jul 2019 21:27:24 -0400 Subject: [PATCH 0476/1115] docs(subscription): fix broken links to pubsub methods (#693) --- handwritten/pubsub/src/subscription.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 04dbf1c28cc..336ba0870ac 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -104,12 +104,12 @@ export type SetSubscriptionMetadataResponse = MetadataResponse; * * Subscriptions are sometimes retrieved when using various methods: * - * - {@link Pubsub#getSubscriptions} + * - {@link PubSub#getSubscriptions} * - {@link Topic#getSubscriptions} * * Subscription objects may be created directly with: * - * - {@link Pubsub#createSubscription} + * - {@link PubSub#createSubscription} * - {@link Topic#createSubscription} * * All Subscription objects are instances of an From c775fd24f9bedea7574d1884bc55c97869bac2f5 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 22 Jul 2019 22:31:32 -0700 Subject: [PATCH 0477/1115] chore(deps): drop dependency on through2 (#694) --- handwritten/pubsub/package.json | 2 -- handwritten/pubsub/test/gapic-v1.js | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 80793550c18..8f8e6458ad5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -78,7 +78,6 @@ "@types/ncp": "^2.0.1", "@types/proxyquire": "^1.3.28", "@types/sinon": "^7.0.0", - "@types/through2": "^2.0.34", "@types/tmp": "^0.1.0", "@types/uuid": "^3.4.4", "codecov": "^3.0.0", @@ -101,7 +100,6 @@ "proxyquire": "^2.0.0", "sinon": "^7.1.1", "source-map-support": "^0.5.9", - "through2": "^3.0.0", "typescript": "~3.5.0", "uuid": "^3.1.0" } diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index 539a4d05ff9..daa237ef586 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -15,7 +15,7 @@ 'use strict'; const assert = require('assert'); -const through2 = require('through2'); +const {PassThrough} = require('stream'); const pubsubModule = require('../src'); @@ -1941,13 +1941,16 @@ function mockSimpleGrpcMethod(expectedRequest, response, error) { function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { return () => { - const mockStream = through2.obj((chunk, enc, callback) => { - assert.deepStrictEqual(chunk, expectedRequest); - if (error) { - callback(error); - } else { - callback(null, response); - } + const mockStream = new PassThrough({ + objectMode: true, + transform: (chunk, enc, callback) => { + assert.deepStrictEqual(chunk, expectedRequest); + if (error) { + callback(error); + } else { + callback(null, response); + } + }, }); return mockStream; }; From e346502fd4f6f8c97448b6114c978e958d1bf1da Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 26 Jul 2019 18:15:04 +0300 Subject: [PATCH 0478/1115] fix(deps): update dependency google-auth-library to v5 (#702) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8f8e6458ad5..cdf8e80a19c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -61,7 +61,7 @@ "arrify": "^2.0.0", "async-each": "^1.0.1", "extend": "^3.0.2", - "google-auth-library": "^3.0.0", + "google-auth-library": "^5.0.0", "google-gax": "^1.0.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From f2d74aa600dabac17c4f20067351bdbfe7f128b8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 26 Jul 2019 18:58:28 +0300 Subject: [PATCH 0479/1115] chore(deps): update linters (#699) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cdf8e80a19c..7e609d82e53 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -81,8 +81,8 @@ "@types/tmp": "^0.1.0", "@types/uuid": "^3.4.4", "codecov": "^3.0.0", - "eslint": "^5.0.0", - "eslint-config-prettier": "^5.0.0", + "eslint": "^6.0.0", + "eslint-config-prettier": "^6.0.0", "eslint-plugin-node": "^9.0.0", "eslint-plugin-prettier": "^3.0.0", "gts": "^1.0.0", From 870691ebb57529d0d3f80b2e4fa0693407498cf0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 30 Jul 2019 02:34:49 +0300 Subject: [PATCH 0480/1115] fix(deps): update dependency @grpc/grpc-js to ^0.5.0 (#698) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7e609d82e53..3a86dac5975 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", - "@grpc/grpc-js": "^0.4.3", + "@grpc/grpc-js": "^0.5.0", "@sindresorhus/is": "^0.17.1", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", From 7685a708b843cf27bbd05cc43a5d2f4d07642143 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 30 Jul 2019 02:35:10 +0300 Subject: [PATCH 0481/1115] fix(deps): update dependency @google-cloud/paginator to v2 (#700) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3a86dac5975..9255efd758d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "predocs-test": "npm run docs" }, "dependencies": { - "@google-cloud/paginator": "^1.0.0", + "@google-cloud/paginator": "^2.0.0", "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", From cda047e7300e964be2984795aa67771427cdf4c5 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 30 Jul 2019 11:44:18 -0700 Subject: [PATCH 0482/1115] docs: use jsdoc-fresh as the template (#704) --- handwritten/pubsub/.jsdoc.js | 2 +- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/index.ts | 18 ++++++++---------- handwritten/pubsub/src/pubsub.ts | 31 ++++++++++++++----------------- 4 files changed, 24 insertions(+), 29 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index 49562326faa..b41e2eeb400 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -20,7 +20,7 @@ module.exports = { opts: { readme: './README.md', package: './package.json', - template: './node_modules/jsdoc-baseline', + template: './node_modules/jsdoc-fresh', recurse: true, verbose: true, destination: './docs/' diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9255efd758d..3d7907732ec 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -88,7 +88,7 @@ "gts": "^1.0.0", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.6.2", - "jsdoc-baseline": "^0.1.0", + "jsdoc-fresh": "^1.0.1", "linkinator": "^1.5.0", "mkdirp": "^0.5.1", "mocha": "^6.0.0", diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 36b892c5ea8..d9afa0001c3 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -31,21 +31,19 @@ * @module {PubSub} @google-cloud/pubsub * @alias nodejs-pubsub * - * @example Install the client library with npm: npm install --save - * @google-cloud/pubsub + * @example Install the client library with npm: + * npm install @google-cloud/pubsub * * @example Import the client library * const {PubSub} = require('@google-cloud/pubsub'); * - * @example Create a client that uses Application - * Default Credentials (ADC): const pubsub = new PubSub(); + * @example Create a client that uses Application Default Credentials (ADC): + * const pubsub = new PubSub(); * - * @example Create a client with explicit - * credentials: const pubsub = new PubSub({ projectId: - * 'your-project-id', keyFilename: '/path/to/keyfile.json' + * @example Create a client with explicit credentials: + * const pubsub = new PubSub({ + * projectId: 'your-project-id', + * keyFilename: '/path/to/keyfile.json' * }); * * @example include:samples/quickstart.js diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 5e792bfedd0..e09cb1b69d8 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -218,14 +218,13 @@ interface GetClientCallback { * @example Import the client library * const {PubSub} = require('@google-cloud/pubsub'); * - * @example Create a client that uses Application - * Default Credentials (ADC): const pubsub = new PubSub(); + * @example Create a client that uses Application Default Credentials (ADC): + * const pubsub = new PubSub(); * - * @example Create a client with explicit - * credentials: const pubsub = new PubSub({ projectId: - * 'your-project-id', keyFilename: '/path/to/keyfile.json' + * @example Create a client with explicit credentials: + * const pubsub = new PubSub({ + * projectId: 'your-project-id', + * keyFilename: '/path/to/keyfile.json' * }); * * @example include:samples/quickstart.js @@ -349,12 +348,9 @@ export class PubSub { * @throws {Error} If a Topic instance or topic name is not provided. * @throws {Error} If a subscription name is not provided. * - * @param {Topic|string} topic The Topic to create a - * subscription to. + * @param {Topic|string} topic The Topic to create a subscription to. * @param {string} name The name of the subscription. - * @param {CreateSubscriptionRequest} [options] See a - * [Subscription - * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). + * @param {CreateSubscriptionRequest} [options] See a [Subscription resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). * @param {CreateSubscriptionCallback} [callback] Callback function. * @returns {Promise} * @@ -369,11 +365,12 @@ export class PubSub { * * pubsub.createSubscription(topic, name, callback); * - * @example If the callback is omitted, we'll return a - * Promise. pubsub.createSubscription(topic, - * name).then(function(data) { const subscription = data[0]; const apiResponse - * = data[1]; - * }); + * @example If the callback is omitted, we'll return a Promise. + * pubsub.createSubscription(topic, name) + * .then(function(data) { + * const subscription = data[0]; + * const apiResponse = data[1]; + * }); */ createSubscription( topic: Topic | string, From b6bb64378f1378e980defde725981cbf97afd8c6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 30 Jul 2019 22:29:01 +0300 Subject: [PATCH 0483/1115] fix(deps): update dependency @sindresorhus/is to v1 (#701) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3d7907732ec..65439a8e23a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -55,7 +55,7 @@ "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", "@grpc/grpc-js": "^0.5.0", - "@sindresorhus/is": "^0.17.1", + "@sindresorhus/is": "^1.0.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From 48949187e4783801a1da91eb0d8b1209b8c0a429 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 30 Jul 2019 13:25:17 -0700 Subject: [PATCH 0484/1115] chore: release 0.30.2 (#705) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] --- handwritten/pubsub/CHANGELOG.md | 20 ++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 9eb7a4e5a26..a775bfeabbe 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,26 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [0.30.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.30.1...v0.30.2) (2019-07-30) + + +### ⚠ BREAKING CHANGES + +* **message:** remove nack delay parameter (#668) + +### Bug Fixes + +* **deps:** update dependency @google-cloud/paginator to v2 ([#700](https://www.github.com/googleapis/nodejs-pubsub/issues/700)) ([a5c0160](https://www.github.com/googleapis/nodejs-pubsub/commit/a5c0160)) +* **deps:** update dependency @grpc/grpc-js to ^0.5.0 ([#698](https://www.github.com/googleapis/nodejs-pubsub/issues/698)) ([d48e578](https://www.github.com/googleapis/nodejs-pubsub/commit/d48e578)) +* **deps:** update dependency @sindresorhus/is to v1 ([#701](https://www.github.com/googleapis/nodejs-pubsub/issues/701)) ([e715172](https://www.github.com/googleapis/nodejs-pubsub/commit/e715172)) +* **deps:** update dependency google-auth-library to v5 ([#702](https://www.github.com/googleapis/nodejs-pubsub/issues/702)) ([3a15956](https://www.github.com/googleapis/nodejs-pubsub/commit/3a15956)) +* **docs:** reference docs should link to section of googleapis.dev with API reference ([#670](https://www.github.com/googleapis/nodejs-pubsub/issues/670)) ([c92a09a](https://www.github.com/googleapis/nodejs-pubsub/commit/c92a09a)) + + +### Reverts + +* **message:** remove nack delay parameter ([#668](https://www.github.com/googleapis/nodejs-pubsub/issues/668)) ([ca8fe65](https://www.github.com/googleapis/nodejs-pubsub/commit/ca8fe65)) + ### [0.30.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.30.0...v0.30.1) (2019-06-21) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 65439a8e23a..3d77cfbe00f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.30.1", + "version": "0.30.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From ff942dbad61021a6356ad8d3e87600ce58c04975 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 31 Jul 2019 15:21:31 -0400 Subject: [PATCH 0485/1115] docs(subscription): prevent sub options from getting removed (#707) --- handwritten/pubsub/src/lease-manager.ts | 14 +++++++------- handwritten/pubsub/src/message-queues.ts | 20 ++++++++++---------- handwritten/pubsub/src/message-stream.ts | 12 ++++++------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index ddf587bf02c..f704919fc31 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -19,6 +19,13 @@ import {freemem} from 'os'; import {Message, Subscriber} from './subscriber'; +export interface FlowControlOptions { + allowExcessMessages?: boolean; + maxBytes?: number; + maxExtension?: number; + maxMessages?: number; +} + /** * @typedef {object} FlowControlOptions * @property {boolean} [allowExcessMessages=true] PubSub delivers messages in @@ -38,13 +45,6 @@ import {Message, Subscriber} from './subscriber'; * any given message batch could contain a greater number of messages than * the desired amount of messages. */ -export interface FlowControlOptions { - allowExcessMessages?: boolean; - maxBytes?: number; - maxExtension?: number; - maxMessages?: number; -} - /** * Manages a Subscribers inventory while auto-magically extending the message * deadlines. diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 32f98f221e9..614ef0e2c83 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -22,16 +22,6 @@ import {Message, Subscriber} from './subscriber'; type QueuedMessages = Array<[string, number?]>; -/** - * @typedef {object} BatchOptions - * @property {object} [callOptions] Request configuration option, outlined - * here: {@link https://googleapis.github.io/gax-nodejs/CallSettings.html}. - * @property {number} [maxMessages=3000] Maximum number of messages allowed in - * each batch sent. - * @property {number} [maxMilliseconds=100] Maximum duration to wait before - * sending a batch. Batches can be sent earlier if the maxMessages option - * is met before the configured duration has passed. - */ export interface BatchOptions { callOptions?: CallOptions; maxMessages?: number; @@ -63,6 +53,16 @@ export class BatchError extends Error implements ServiceError { } } +/** + * @typedef {object} BatchOptions + * @property {object} [callOptions] Request configuration option, outlined + * here: {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html}. + * @property {number} [maxMessages=3000] Maximum number of messages allowed in + * each batch sent. + * @property {number} [maxMilliseconds=100] Maximum duration to wait before + * sending a batch. Batches can be sent earlier if the maxMessages option + * is met before the configured duration has passed. + */ /** * Class for buffering ack/modAck requests. * diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index f78bd452296..02025341f4f 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -101,6 +101,12 @@ export class ChannelError extends Error implements ServiceError { } } +export interface MessageStreamOptions { + highWaterMark?: number; + maxStreams?: number; + timeout?: number; +} + /** * @typedef {object} MessageStreamOptions * @property {number} [highWaterMark=0] Configures the Buffer level for all @@ -110,12 +116,6 @@ export class ChannelError extends Error implements ServiceError { * @property {number} [maxStreams=5] Number of streaming connections to make. * @property {number} [timeout=300000] Timeout for establishing a connection. */ -export interface MessageStreamOptions { - highWaterMark?: number; - maxStreams?: number; - timeout?: number; -} - /** * Streaming class used to manage multiple StreamingPull requests. * From 595c74c947ebf9e5c968b52061a4d299fde0f26e Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 31 Jul 2019 16:07:09 -0700 Subject: [PATCH 0486/1115] docs: document apiEndpoint over servicePath (#708) --- handwritten/pubsub/src/v1/publisher_client.js | 2 +- handwritten/pubsub/src/v1/subscriber_client.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 87b8facf625..2d6affa380e 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -53,7 +53,7 @@ class PublisherClient { * your project ID will be detected automatically. * @param {function} [options.promise] - Custom promise module to use instead * of native Promises. - * @param {string} [options.servicePath] - The domain name of the + * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. */ constructor(opts) { diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 1e5a4ab6495..a50d0b2a623 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -53,7 +53,7 @@ class SubscriberClient { * your project ID will be detected automatically. * @param {function} [options.promise] - Custom promise module to use instead * of native Promises. - * @param {string} [options.servicePath] - The domain name of the + * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. */ constructor(opts) { From b083b7a9abeba7297ca7a87b84963fbfc9a64404 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Wed, 31 Jul 2019 19:08:24 -0700 Subject: [PATCH 0487/1115] build: add Node 12 remove Node 11 (#709) --- .../pubsub/.kokoro/continuous/{node11 => node12}/common.cfg | 2 +- .../pubsub/.kokoro/continuous/{node11 => node12}/test.cfg | 0 .../pubsub/.kokoro/presubmit/{node11 => node12}/common.cfg | 2 +- .../pubsub/.kokoro/presubmit/{node11 => node12}/test.cfg | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename handwritten/pubsub/.kokoro/continuous/{node11 => node12}/common.cfg (89%) rename handwritten/pubsub/.kokoro/continuous/{node11 => node12}/test.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node11 => node12}/common.cfg (89%) rename handwritten/pubsub/.kokoro/presubmit/{node11 => node12}/test.cfg (100%) diff --git a/handwritten/pubsub/.kokoro/continuous/node11/common.cfg b/handwritten/pubsub/.kokoro/continuous/node12/common.cfg similarity index 89% rename from handwritten/pubsub/.kokoro/continuous/node11/common.cfg rename to handwritten/pubsub/.kokoro/continuous/node12/common.cfg index 2f471029988..f5f54f91e51 100644 --- a/handwritten/pubsub/.kokoro/continuous/node11/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node12/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:11-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node11/test.cfg b/handwritten/pubsub/.kokoro/continuous/node12/test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node11/test.cfg rename to handwritten/pubsub/.kokoro/continuous/node12/test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node11/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg similarity index 89% rename from handwritten/pubsub/.kokoro/presubmit/node11/common.cfg rename to handwritten/pubsub/.kokoro/presubmit/node12/common.cfg index 2f471029988..f5f54f91e51 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node11/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:11-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/presubmit/node11/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node11/test.cfg rename to handwritten/pubsub/.kokoro/presubmit/node12/test.cfg From 36e50a0f1362d98e825144091298bc00511b1539 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 2 Aug 2019 10:52:57 -0700 Subject: [PATCH 0488/1115] fix: allow calls with no request, add JSON proto --- handwritten/pubsub/protos/protos.json | 1866 +++++++++++++++++ .../pubsub/src/service_proto_list.json | 1 + handwritten/pubsub/src/v1/publisher_client.js | 10 + .../pubsub/src/v1/subscriber_client.js | 17 + handwritten/pubsub/synth.metadata | 10 +- 5 files changed, 1899 insertions(+), 5 deletions(-) create mode 100644 handwritten/pubsub/protos/protos.json create mode 100644 handwritten/pubsub/src/service_proto_list.json diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json new file mode 100644 index 00000000000..ec00f7c86cc --- /dev/null +++ b/handwritten/pubsub/protos/protos.json @@ -0,0 +1,1866 @@ +{ + "nested": { + "google": { + "nested": { + "pubsub": { + "nested": { + "v1": { + "options": { + "cc_enable_arenas": true, + "csharp_namespace": "Google.Cloud.PubSub.V1", + "go_package": "google.golang.org/genproto/googleapis/pubsub/v1;pubsub", + "java_multiple_files": true, + "java_outer_classname": "PubsubProto", + "java_package": "com.google.pubsub.v1", + "php_namespace": "Google\\Cloud\\PubSub\\V1", + "ruby_package": "Google::Cloud::PubSub::V1" + }, + "nested": { + "Publisher": { + "methods": { + "CreateTopic": { + "requestType": "Topic", + "responseType": "Topic", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/topics/*}", + "(google.api.http).body": "*" + } + }, + "UpdateTopic": { + "requestType": "UpdateTopicRequest", + "responseType": "Topic", + "options": { + "(google.api.http).patch": "/v1/{topic.name=projects/*/topics/*}", + "(google.api.http).body": "*" + } + }, + "Publish": { + "requestType": "PublishRequest", + "responseType": "PublishResponse", + "options": { + "(google.api.http).post": "/v1/{topic=projects/*/topics/*}:publish", + "(google.api.http).body": "*" + } + }, + "GetTopic": { + "requestType": "GetTopicRequest", + "responseType": "Topic", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}" + } + }, + "ListTopics": { + "requestType": "ListTopicsRequest", + "responseType": "ListTopicsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/topics" + } + }, + "ListTopicSubscriptions": { + "requestType": "ListTopicSubscriptionsRequest", + "responseType": "ListTopicSubscriptionsResponse", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/subscriptions" + } + }, + "ListTopicSnapshots": { + "requestType": "ListTopicSnapshotsRequest", + "responseType": "ListTopicSnapshotsResponse", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/snapshots" + } + }, + "DeleteTopic": { + "requestType": "DeleteTopicRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}" + } + } + } + }, + "MessageStoragePolicy": { + "fields": { + "allowedPersistenceRegions": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "Topic": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "labels": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "messageStoragePolicy": { + "type": "MessageStoragePolicy", + "id": 3 + }, + "kmsKeyName": { + "type": "string", + "id": 5 + } + } + }, + "PubsubMessage": { + "fields": { + "data": { + "type": "bytes", + "id": 1 + }, + "attributes": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "messageId": { + "type": "string", + "id": 3 + }, + "publishTime": { + "type": "google.protobuf.Timestamp", + "id": 4 + }, + "orderingKey": { + "type": "string", + "id": 5 + } + } + }, + "GetTopicRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1 + } + } + }, + "UpdateTopicRequest": { + "fields": { + "topic": { + "type": "Topic", + "id": 1 + }, + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2 + } + } + }, + "PublishRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1 + }, + "messages": { + "rule": "repeated", + "type": "PubsubMessage", + "id": 2 + } + } + }, + "PublishResponse": { + "fields": { + "messageIds": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "ListTopicsRequest": { + "fields": { + "project": { + "type": "string", + "id": 1 + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListTopicsResponse": { + "fields": { + "topics": { + "rule": "repeated", + "type": "Topic", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "ListTopicSubscriptionsRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1 + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListTopicSubscriptionsResponse": { + "fields": { + "subscriptions": { + "rule": "repeated", + "type": "string", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "ListTopicSnapshotsRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1 + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListTopicSnapshotsResponse": { + "fields": { + "snapshots": { + "rule": "repeated", + "type": "string", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "DeleteTopicRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1 + } + } + }, + "Subscriber": { + "methods": { + "CreateSubscription": { + "requestType": "Subscription", + "responseType": "Subscription", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/subscriptions/*}", + "(google.api.http).body": "*" + } + }, + "GetSubscription": { + "requestType": "GetSubscriptionRequest", + "responseType": "Subscription", + "options": { + "(google.api.http).get": "/v1/{subscription=projects/*/subscriptions/*}" + } + }, + "UpdateSubscription": { + "requestType": "UpdateSubscriptionRequest", + "responseType": "Subscription", + "options": { + "(google.api.http).patch": "/v1/{subscription.name=projects/*/subscriptions/*}", + "(google.api.http).body": "*" + } + }, + "ListSubscriptions": { + "requestType": "ListSubscriptionsRequest", + "responseType": "ListSubscriptionsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/subscriptions" + } + }, + "DeleteSubscription": { + "requestType": "DeleteSubscriptionRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{subscription=projects/*/subscriptions/*}" + } + }, + "ModifyAckDeadline": { + "requestType": "ModifyAckDeadlineRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline", + "(google.api.http).body": "*" + } + }, + "Acknowledge": { + "requestType": "AcknowledgeRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:acknowledge", + "(google.api.http).body": "*" + } + }, + "Pull": { + "requestType": "PullRequest", + "responseType": "PullResponse", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:pull", + "(google.api.http).body": "*" + } + }, + "StreamingPull": { + "requestType": "StreamingPullRequest", + "requestStream": true, + "responseType": "StreamingPullResponse", + "responseStream": true + }, + "ModifyPushConfig": { + "requestType": "ModifyPushConfigRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig", + "(google.api.http).body": "*" + } + }, + "GetSnapshot": { + "requestType": "GetSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).get": "/v1/{snapshot=projects/*/snapshots/*}" + } + }, + "ListSnapshots": { + "requestType": "ListSnapshotsRequest", + "responseType": "ListSnapshotsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/snapshots" + } + }, + "CreateSnapshot": { + "requestType": "CreateSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/snapshots/*}", + "(google.api.http).body": "*" + } + }, + "UpdateSnapshot": { + "requestType": "UpdateSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).patch": "/v1/{snapshot.name=projects/*/snapshots/*}", + "(google.api.http).body": "*" + } + }, + "DeleteSnapshot": { + "requestType": "DeleteSnapshotRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{snapshot=projects/*/snapshots/*}" + } + }, + "Seek": { + "requestType": "SeekRequest", + "responseType": "SeekResponse", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:seek", + "(google.api.http).body": "*" + } + } + } + }, + "Subscription": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "topic": { + "type": "string", + "id": 2 + }, + "pushConfig": { + "type": "PushConfig", + "id": 4 + }, + "ackDeadlineSeconds": { + "type": "int32", + "id": 5 + }, + "retainAckedMessages": { + "type": "bool", + "id": 7 + }, + "messageRetentionDuration": { + "type": "google.protobuf.Duration", + "id": 8 + }, + "labels": { + "keyType": "string", + "type": "string", + "id": 9 + }, + "enableMessageOrdering": { + "type": "bool", + "id": 10 + }, + "expirationPolicy": { + "type": "ExpirationPolicy", + "id": 11 + } + } + }, + "ExpirationPolicy": { + "fields": { + "ttl": { + "type": "google.protobuf.Duration", + "id": 1 + } + } + }, + "PushConfig": { + "oneofs": { + "authenticationMethod": { + "oneof": [ + "oidcToken" + ] + } + }, + "fields": { + "pushEndpoint": { + "type": "string", + "id": 1 + }, + "attributes": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "oidcToken": { + "type": "OidcToken", + "id": 3 + } + }, + "nested": { + "OidcToken": { + "fields": { + "serviceAccountEmail": { + "type": "string", + "id": 1 + }, + "audience": { + "type": "string", + "id": 2 + } + } + } + } + }, + "ReceivedMessage": { + "fields": { + "ackId": { + "type": "string", + "id": 1 + }, + "message": { + "type": "PubsubMessage", + "id": 2 + } + } + }, + "GetSubscriptionRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1 + } + } + }, + "UpdateSubscriptionRequest": { + "fields": { + "subscription": { + "type": "Subscription", + "id": 1 + }, + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2 + } + } + }, + "ListSubscriptionsRequest": { + "fields": { + "project": { + "type": "string", + "id": 1 + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListSubscriptionsResponse": { + "fields": { + "subscriptions": { + "rule": "repeated", + "type": "Subscription", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "DeleteSubscriptionRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1 + } + } + }, + "ModifyPushConfigRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1 + }, + "pushConfig": { + "type": "PushConfig", + "id": 2 + } + } + }, + "PullRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1 + }, + "returnImmediately": { + "type": "bool", + "id": 2 + }, + "maxMessages": { + "type": "int32", + "id": 3 + } + } + }, + "PullResponse": { + "fields": { + "receivedMessages": { + "rule": "repeated", + "type": "ReceivedMessage", + "id": 1 + } + } + }, + "ModifyAckDeadlineRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1 + }, + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 4 + }, + "ackDeadlineSeconds": { + "type": "int32", + "id": 3 + } + } + }, + "AcknowledgeRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1 + }, + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 2 + } + } + }, + "StreamingPullRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1 + }, + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 2 + }, + "modifyDeadlineSeconds": { + "rule": "repeated", + "type": "int32", + "id": 3 + }, + "modifyDeadlineAckIds": { + "rule": "repeated", + "type": "string", + "id": 4 + }, + "streamAckDeadlineSeconds": { + "type": "int32", + "id": 5 + } + } + }, + "StreamingPullResponse": { + "fields": { + "receivedMessages": { + "rule": "repeated", + "type": "ReceivedMessage", + "id": 1 + } + } + }, + "CreateSnapshotRequest": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "subscription": { + "type": "string", + "id": 2 + }, + "labels": { + "keyType": "string", + "type": "string", + "id": 3 + } + } + }, + "UpdateSnapshotRequest": { + "fields": { + "snapshot": { + "type": "Snapshot", + "id": 1 + }, + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2 + } + } + }, + "Snapshot": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "topic": { + "type": "string", + "id": 2 + }, + "expireTime": { + "type": "google.protobuf.Timestamp", + "id": 3 + }, + "labels": { + "keyType": "string", + "type": "string", + "id": 4 + } + } + }, + "GetSnapshotRequest": { + "fields": { + "snapshot": { + "type": "string", + "id": 1 + } + } + }, + "ListSnapshotsRequest": { + "fields": { + "project": { + "type": "string", + "id": 1 + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListSnapshotsResponse": { + "fields": { + "snapshots": { + "rule": "repeated", + "type": "Snapshot", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "DeleteSnapshotRequest": { + "fields": { + "snapshot": { + "type": "string", + "id": 1 + } + } + }, + "SeekRequest": { + "oneofs": { + "target": { + "oneof": [ + "time", + "snapshot" + ] + } + }, + "fields": { + "subscription": { + "type": "string", + "id": 1 + }, + "time": { + "type": "google.protobuf.Timestamp", + "id": 2 + }, + "snapshot": { + "type": "string", + "id": 3 + } + } + }, + "SeekResponse": { + "fields": {} + } + } + } + } + }, + "api": { + "options": { + "go_package": "google.golang.org/genproto/googleapis/api/annotations;annotations", + "java_multiple_files": true, + "java_outer_classname": "ResourceProto", + "java_package": "com.google.api", + "objc_class_prefix": "GAPI", + "cc_enable_arenas": true + }, + "nested": { + "http": { + "type": "HttpRule", + "id": 72295728, + "extend": "google.protobuf.MethodOptions" + }, + "Http": { + "fields": { + "rules": { + "rule": "repeated", + "type": "HttpRule", + "id": 1 + }, + "fullyDecodeReservedExpansion": { + "type": "bool", + "id": 2 + } + } + }, + "HttpRule": { + "oneofs": { + "pattern": { + "oneof": [ + "get", + "put", + "post", + "delete", + "patch", + "custom" + ] + } + }, + "fields": { + "selector": { + "type": "string", + "id": 1 + }, + "get": { + "type": "string", + "id": 2 + }, + "put": { + "type": "string", + "id": 3 + }, + "post": { + "type": "string", + "id": 4 + }, + "delete": { + "type": "string", + "id": 5 + }, + "patch": { + "type": "string", + "id": 6 + }, + "custom": { + "type": "CustomHttpPattern", + "id": 8 + }, + "body": { + "type": "string", + "id": 7 + }, + "responseBody": { + "type": "string", + "id": 12 + }, + "additionalBindings": { + "rule": "repeated", + "type": "HttpRule", + "id": 11 + } + } + }, + "CustomHttpPattern": { + "fields": { + "kind": { + "type": "string", + "id": 1 + }, + "path": { + "type": "string", + "id": 2 + } + } + }, + "resourceReference": { + "type": "google.api.ResourceReference", + "id": 1055, + "extend": "google.protobuf.FieldOptions" + }, + "resource": { + "type": "google.api.ResourceDescriptor", + "id": 1053, + "extend": "google.protobuf.MessageOptions" + }, + "ResourceDescriptor": { + "fields": { + "type": { + "type": "string", + "id": 1 + }, + "pattern": { + "rule": "repeated", + "type": "string", + "id": 2 + }, + "nameField": { + "type": "string", + "id": 3 + }, + "history": { + "type": "History", + "id": 4 + } + }, + "nested": { + "History": { + "values": { + "HISTORY_UNSPECIFIED": 0, + "ORIGINALLY_SINGLE_PATTERN": 1, + "FUTURE_MULTI_PATTERN": 2 + } + } + } + }, + "ResourceReference": { + "fields": { + "type": { + "type": "string", + "id": 1 + }, + "childType": { + "type": "string", + "id": 2 + } + } + } + } + }, + "protobuf": { + "options": { + "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", + "java_package": "com.google.protobuf", + "java_outer_classname": "DescriptorProtos", + "csharp_namespace": "Google.Protobuf.Reflection", + "objc_class_prefix": "GPB", + "cc_enable_arenas": true, + "optimize_for": "SPEED" + }, + "nested": { + "FileDescriptorSet": { + "fields": { + "file": { + "rule": "repeated", + "type": "FileDescriptorProto", + "id": 1 + } + } + }, + "FileDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "package": { + "type": "string", + "id": 2 + }, + "dependency": { + "rule": "repeated", + "type": "string", + "id": 3 + }, + "publicDependency": { + "rule": "repeated", + "type": "int32", + "id": 10, + "options": { + "packed": false + } + }, + "weakDependency": { + "rule": "repeated", + "type": "int32", + "id": 11, + "options": { + "packed": false + } + }, + "messageType": { + "rule": "repeated", + "type": "DescriptorProto", + "id": 4 + }, + "enumType": { + "rule": "repeated", + "type": "EnumDescriptorProto", + "id": 5 + }, + "service": { + "rule": "repeated", + "type": "ServiceDescriptorProto", + "id": 6 + }, + "extension": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 7 + }, + "options": { + "type": "FileOptions", + "id": 8 + }, + "sourceCodeInfo": { + "type": "SourceCodeInfo", + "id": 9 + }, + "syntax": { + "type": "string", + "id": 12 + } + } + }, + "DescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "field": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 2 + }, + "extension": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 6 + }, + "nestedType": { + "rule": "repeated", + "type": "DescriptorProto", + "id": 3 + }, + "enumType": { + "rule": "repeated", + "type": "EnumDescriptorProto", + "id": 4 + }, + "extensionRange": { + "rule": "repeated", + "type": "ExtensionRange", + "id": 5 + }, + "oneofDecl": { + "rule": "repeated", + "type": "OneofDescriptorProto", + "id": 8 + }, + "options": { + "type": "MessageOptions", + "id": 7 + }, + "reservedRange": { + "rule": "repeated", + "type": "ReservedRange", + "id": 9 + }, + "reservedName": { + "rule": "repeated", + "type": "string", + "id": 10 + } + }, + "nested": { + "ExtensionRange": { + "fields": { + "start": { + "type": "int32", + "id": 1 + }, + "end": { + "type": "int32", + "id": 2 + }, + "options": { + "type": "ExtensionRangeOptions", + "id": 3 + } + } + }, + "ReservedRange": { + "fields": { + "start": { + "type": "int32", + "id": 1 + }, + "end": { + "type": "int32", + "id": 2 + } + } + } + } + }, + "ExtensionRangeOptions": { + "fields": { + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "FieldDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "number": { + "type": "int32", + "id": 3 + }, + "label": { + "type": "Label", + "id": 4 + }, + "type": { + "type": "Type", + "id": 5 + }, + "typeName": { + "type": "string", + "id": 6 + }, + "extendee": { + "type": "string", + "id": 2 + }, + "defaultValue": { + "type": "string", + "id": 7 + }, + "oneofIndex": { + "type": "int32", + "id": 9 + }, + "jsonName": { + "type": "string", + "id": 10 + }, + "options": { + "type": "FieldOptions", + "id": 8 + } + }, + "nested": { + "Type": { + "values": { + "TYPE_DOUBLE": 1, + "TYPE_FLOAT": 2, + "TYPE_INT64": 3, + "TYPE_UINT64": 4, + "TYPE_INT32": 5, + "TYPE_FIXED64": 6, + "TYPE_FIXED32": 7, + "TYPE_BOOL": 8, + "TYPE_STRING": 9, + "TYPE_GROUP": 10, + "TYPE_MESSAGE": 11, + "TYPE_BYTES": 12, + "TYPE_UINT32": 13, + "TYPE_ENUM": 14, + "TYPE_SFIXED32": 15, + "TYPE_SFIXED64": 16, + "TYPE_SINT32": 17, + "TYPE_SINT64": 18 + } + }, + "Label": { + "values": { + "LABEL_OPTIONAL": 1, + "LABEL_REQUIRED": 2, + "LABEL_REPEATED": 3 + } + } + } + }, + "OneofDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "options": { + "type": "OneofOptions", + "id": 2 + } + } + }, + "EnumDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "value": { + "rule": "repeated", + "type": "EnumValueDescriptorProto", + "id": 2 + }, + "options": { + "type": "EnumOptions", + "id": 3 + }, + "reservedRange": { + "rule": "repeated", + "type": "EnumReservedRange", + "id": 4 + }, + "reservedName": { + "rule": "repeated", + "type": "string", + "id": 5 + } + }, + "nested": { + "EnumReservedRange": { + "fields": { + "start": { + "type": "int32", + "id": 1 + }, + "end": { + "type": "int32", + "id": 2 + } + } + } + } + }, + "EnumValueDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "number": { + "type": "int32", + "id": 2 + }, + "options": { + "type": "EnumValueOptions", + "id": 3 + } + } + }, + "ServiceDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "method": { + "rule": "repeated", + "type": "MethodDescriptorProto", + "id": 2 + }, + "options": { + "type": "ServiceOptions", + "id": 3 + } + } + }, + "MethodDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "inputType": { + "type": "string", + "id": 2 + }, + "outputType": { + "type": "string", + "id": 3 + }, + "options": { + "type": "MethodOptions", + "id": 4 + }, + "clientStreaming": { + "type": "bool", + "id": 5, + "options": { + "default": false + } + }, + "serverStreaming": { + "type": "bool", + "id": 6, + "options": { + "default": false + } + } + } + }, + "FileOptions": { + "fields": { + "javaPackage": { + "type": "string", + "id": 1 + }, + "javaOuterClassname": { + "type": "string", + "id": 8 + }, + "javaMultipleFiles": { + "type": "bool", + "id": 10, + "options": { + "default": false + } + }, + "javaGenerateEqualsAndHash": { + "type": "bool", + "id": 20, + "options": { + "deprecated": true + } + }, + "javaStringCheckUtf8": { + "type": "bool", + "id": 27, + "options": { + "default": false + } + }, + "optimizeFor": { + "type": "OptimizeMode", + "id": 9, + "options": { + "default": "SPEED" + } + }, + "goPackage": { + "type": "string", + "id": 11 + }, + "ccGenericServices": { + "type": "bool", + "id": 16, + "options": { + "default": false + } + }, + "javaGenericServices": { + "type": "bool", + "id": 17, + "options": { + "default": false + } + }, + "pyGenericServices": { + "type": "bool", + "id": 18, + "options": { + "default": false + } + }, + "phpGenericServices": { + "type": "bool", + "id": 42, + "options": { + "default": false + } + }, + "deprecated": { + "type": "bool", + "id": 23, + "options": { + "default": false + } + }, + "ccEnableArenas": { + "type": "bool", + "id": 31, + "options": { + "default": false + } + }, + "objcClassPrefix": { + "type": "string", + "id": 36 + }, + "csharpNamespace": { + "type": "string", + "id": 37 + }, + "swiftPrefix": { + "type": "string", + "id": 39 + }, + "phpClassPrefix": { + "type": "string", + "id": 40 + }, + "phpNamespace": { + "type": "string", + "id": 41 + }, + "phpMetadataNamespace": { + "type": "string", + "id": 44 + }, + "rubyPackage": { + "type": "string", + "id": 45 + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 38, + 38 + ] + ], + "nested": { + "OptimizeMode": { + "values": { + "SPEED": 1, + "CODE_SIZE": 2, + "LITE_RUNTIME": 3 + } + } + } + }, + "MessageOptions": { + "fields": { + "messageSetWireFormat": { + "type": "bool", + "id": 1, + "options": { + "default": false + } + }, + "noStandardDescriptorAccessor": { + "type": "bool", + "id": 2, + "options": { + "default": false + } + }, + "deprecated": { + "type": "bool", + "id": 3, + "options": { + "default": false + } + }, + "mapEntry": { + "type": "bool", + "id": 7 + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 8, + 8 + ], + [ + 9, + 9 + ] + ] + }, + "FieldOptions": { + "fields": { + "ctype": { + "type": "CType", + "id": 1, + "options": { + "default": "STRING" + } + }, + "packed": { + "type": "bool", + "id": 2 + }, + "jstype": { + "type": "JSType", + "id": 6, + "options": { + "default": "JS_NORMAL" + } + }, + "lazy": { + "type": "bool", + "id": 5, + "options": { + "default": false + } + }, + "deprecated": { + "type": "bool", + "id": 3, + "options": { + "default": false + } + }, + "weak": { + "type": "bool", + "id": 10, + "options": { + "default": false + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 4, + 4 + ] + ], + "nested": { + "CType": { + "values": { + "STRING": 0, + "CORD": 1, + "STRING_PIECE": 2 + } + }, + "JSType": { + "values": { + "JS_NORMAL": 0, + "JS_STRING": 1, + "JS_NUMBER": 2 + } + } + } + }, + "OneofOptions": { + "fields": { + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "EnumOptions": { + "fields": { + "allowAlias": { + "type": "bool", + "id": 2 + }, + "deprecated": { + "type": "bool", + "id": 3, + "options": { + "default": false + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 5, + 5 + ] + ] + }, + "EnumValueOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 1, + "options": { + "default": false + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "ServiceOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 33, + "options": { + "default": false + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "MethodOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 33, + "options": { + "default": false + } + }, + "idempotencyLevel": { + "type": "IdempotencyLevel", + "id": 34, + "options": { + "default": "IDEMPOTENCY_UNKNOWN" + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "nested": { + "IdempotencyLevel": { + "values": { + "IDEMPOTENCY_UNKNOWN": 0, + "NO_SIDE_EFFECTS": 1, + "IDEMPOTENT": 2 + } + } + } + }, + "UninterpretedOption": { + "fields": { + "name": { + "rule": "repeated", + "type": "NamePart", + "id": 2 + }, + "identifierValue": { + "type": "string", + "id": 3 + }, + "positiveIntValue": { + "type": "uint64", + "id": 4 + }, + "negativeIntValue": { + "type": "int64", + "id": 5 + }, + "doubleValue": { + "type": "double", + "id": 6 + }, + "stringValue": { + "type": "bytes", + "id": 7 + }, + "aggregateValue": { + "type": "string", + "id": 8 + } + }, + "nested": { + "NamePart": { + "fields": { + "namePart": { + "rule": "required", + "type": "string", + "id": 1 + }, + "isExtension": { + "rule": "required", + "type": "bool", + "id": 2 + } + } + } + } + }, + "SourceCodeInfo": { + "fields": { + "location": { + "rule": "repeated", + "type": "Location", + "id": 1 + } + }, + "nested": { + "Location": { + "fields": { + "path": { + "rule": "repeated", + "type": "int32", + "id": 1 + }, + "span": { + "rule": "repeated", + "type": "int32", + "id": 2 + }, + "leadingComments": { + "type": "string", + "id": 3 + }, + "trailingComments": { + "type": "string", + "id": 4 + }, + "leadingDetachedComments": { + "rule": "repeated", + "type": "string", + "id": 6 + } + } + } + } + }, + "GeneratedCodeInfo": { + "fields": { + "annotation": { + "rule": "repeated", + "type": "Annotation", + "id": 1 + } + }, + "nested": { + "Annotation": { + "fields": { + "path": { + "rule": "repeated", + "type": "int32", + "id": 1 + }, + "sourceFile": { + "type": "string", + "id": 2 + }, + "begin": { + "type": "int32", + "id": 3 + }, + "end": { + "type": "int32", + "id": 4 + } + } + } + } + }, + "Duration": { + "fields": { + "seconds": { + "type": "int64", + "id": 1 + }, + "nanos": { + "type": "int32", + "id": 2 + } + } + }, + "Empty": { + "fields": {} + }, + "FieldMask": { + "fields": { + "paths": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "Timestamp": { + "fields": { + "seconds": { + "type": "int64", + "id": 1 + }, + "nanos": { + "type": "int32", + "id": 2 + } + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/handwritten/pubsub/src/service_proto_list.json b/handwritten/pubsub/src/service_proto_list.json new file mode 100644 index 00000000000..4b20fe08d9d --- /dev/null +++ b/handwritten/pubsub/src/service_proto_list.json @@ -0,0 +1 @@ +["../protos/google/pubsub/v1/pubsub.proto"] \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 2d6affa380e..25dfdc26d06 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -356,6 +356,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -425,6 +426,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -493,6 +495,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -547,6 +550,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -649,6 +653,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -807,6 +812,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -917,6 +923,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -984,6 +991,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1045,6 +1053,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1115,6 +1124,7 @@ class PublisherClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index a50d0b2a623..944d87d057f 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -417,6 +417,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -471,6 +472,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -544,6 +546,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -646,6 +649,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -752,6 +756,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -820,6 +825,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -880,6 +886,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -949,6 +956,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1057,6 +1065,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1164,6 +1173,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1314,6 +1324,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1394,6 +1405,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1449,6 +1461,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1527,6 +1540,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1594,6 +1608,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1655,6 +1670,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; @@ -1725,6 +1741,7 @@ class SubscriberClient { callback = options; options = {}; } + request = request || {}; options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index ee3af1a4851..24d4f3c455c 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-07-02T11:45:25.185485Z", + "updateTime": "2019-08-02T11:22:03.345597Z", "sources": [ { "generator": { "name": "artman", - "version": "0.29.3", - "dockerImage": "googleapis/artman@sha256:8900f94a81adaab0238965aa8a7b3648791f4f3a95ee65adc6a56cfcc3753101" + "version": "0.32.0", + "dockerImage": "googleapis/artman@sha256:6929f343c400122d85818195b18613330a12a014bffc1e08499550d40571479d" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "5322233f8cbec4d3f8c17feca2507ef27d4a07c9", - "internalRef": "256042411" + "sha": "3a40d3a5f5e5a33fd49888a8a33ed021f65c0ccf", + "internalRef": "261297518" } }, { From 7966160995164043d59dba0c79cf33c8426f8a31 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sat, 3 Aug 2019 16:03:15 -0700 Subject: [PATCH 0489/1115] docs: update jsdoc comments for pubsub (#713) --- .../protos/google/pubsub/v1/pubsub.proto | 47 ++++++------ handwritten/pubsub/protos/protos.json | 72 ++++++------------- .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 35 ++++----- handwritten/pubsub/src/v1/publisher_client.js | 12 +--- handwritten/pubsub/synth.metadata | 10 +-- 5 files changed, 69 insertions(+), 107 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 7cea47b1e53..ea0d4c7e53e 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package google.pubsub.v1; import "google/api/annotations.proto"; -import "google/api/resource.proto"; +import "google/api/client.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; @@ -36,6 +36,11 @@ option ruby_package = "Google::Cloud::PubSub::V1"; // The service that an application uses to manipulate topics, and to send // messages to a topic. service Publisher { + option (google.api.default_host) = "pubsub.googleapis.com"; + option (google.api.oauth_scopes) = + "https://www.googleapis.com/auth/cloud-platform," + "https://www.googleapis.com/auth/pubsub"; + // Creates the given topic with the given name. See the // // resource name rules. @@ -112,12 +117,11 @@ service Publisher { } message MessageStoragePolicy { - // The list of GCP region IDs where messages that are published to the topic + // A list of IDs of GCP regions where messages that are published to the topic // may be persisted in storage. Messages published by publishers running in // non-allowed GCP regions (or running outside of GCP altogether) will be - // routed for storage in one of the allowed regions. An empty list indicates a - // misconfiguration at the project or organization level, which will result in - // all Publish operations failing. + // routed for storage in one of the allowed regions. An empty list means that + // no regions are allowed, and is not a valid configuration. repeated string allowed_persistence_regions = 1; } @@ -135,21 +139,15 @@ message Topic { // managing labels. map labels = 2; - // Policy constraining how messages published to the topic may be stored. It - // is determined when the topic is created based on the policy configured at - // the project level. It must not be set by the caller in the request to - // CreateTopic or to UpdateTopic. This field will be populated in the - // responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the - // response, then no constraints are in effect. + // Policy constraining the set of Google Cloud Platform regions where messages + // published to the topic may be stored. If not present, then no constraints + // are in effect. MessageStoragePolicy message_storage_policy = 3; // The resource name of the Cloud KMS CryptoKey to be used to protect access // to messages published on this topic. // // The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*`. - // EXPERIMENTAL: This feature is part of a closed alpha release. This - // API might be changed in backward-incompatible ways and is not recommended - // for production use. It is not subject to any SLA or deprecation policy. string kms_key_name = 5; } @@ -316,6 +314,11 @@ message DeleteTopicRequest { // consume messages from a subscription via the `Pull` method or by // establishing a bi-directional stream using the `StreamingPull` method. service Subscriber { + option (google.api.default_host) = "pubsub.googleapis.com"; + option (google.api.oauth_scopes) = + "https://www.googleapis.com/auth/cloud-platform," + "https://www.googleapis.com/auth/pubsub"; + // Creates a subscription to a given topic. See the // // resource name rules. @@ -646,27 +649,27 @@ message PushConfig { // For example, a Webhook endpoint might use "https://example.com/push". string push_endpoint = 1; - // Endpoint configuration attributes. - // - // Every endpoint has a set of API supported attributes that can be used to - // control different aspects of the message delivery. + // Endpoint configuration attributes that can be used to control different + // aspects of the message delivery. // - // The currently supported attribute is `x-goog-version`, which you can + // The only currently supported attribute is `x-goog-version`, which you can // use to change the format of the pushed message. This attribute // indicates the version of the data expected by the endpoint. This // controls the shape of the pushed message (i.e., its fields and metadata). - // The endpoint version is based on the version of the Pub/Sub API. // // If not present during the `CreateSubscription` call, it will default to - // the version of the API used to make such call. If not present during a + // the version of the Pub/Sub API used to make such call. If not present in a // `ModifyPushConfig` call, its value will not be changed. `GetSubscription` // calls will always return a valid version, even if the subscription was // created without this attribute. // - // The possible values for this attribute are: + // The only supported values for the `x-goog-version` attribute are: // // * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. // * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. + // + // For example: + // 
attributes { "x-goog-version": "v1" }
map attributes = 2; // An authentication method used by push endpoints to verify the source of diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index ec00f7c86cc..f9a34d5bbf2 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -17,6 +17,10 @@ }, "nested": { "Publisher": { + "options": { + "(google.api.default_host)": "pubsub.googleapis.com", + "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" + }, "methods": { "CreateTopic": { "requestType": "Topic", @@ -272,6 +276,10 @@ } }, "Subscriber": { + "options": { + "(google.api.default_host)": "pubsub.googleapis.com", + "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" + }, "methods": { "CreateSubscription": { "requestType": "Subscription", @@ -784,7 +792,7 @@ "options": { "go_package": "google.golang.org/genproto/googleapis/api/annotations;annotations", "java_multiple_files": true, - "java_outer_classname": "ResourceProto", + "java_outer_classname": "ClientProto", "java_package": "com.google.api", "objc_class_prefix": "GAPI", "cc_enable_arenas": true @@ -877,57 +885,21 @@ } } }, - "resourceReference": { - "type": "google.api.ResourceReference", - "id": 1055, - "extend": "google.protobuf.FieldOptions" - }, - "resource": { - "type": "google.api.ResourceDescriptor", - "id": 1053, - "extend": "google.protobuf.MessageOptions" + "methodSignature": { + "rule": "repeated", + "type": "string", + "id": 1051, + "extend": "google.protobuf.MethodOptions" }, - "ResourceDescriptor": { - "fields": { - "type": { - "type": "string", - "id": 1 - }, - "pattern": { - "rule": "repeated", - "type": "string", - "id": 2 - }, - "nameField": { - "type": "string", - "id": 3 - }, - "history": { - "type": "History", - "id": 4 - } - }, - "nested": { - "History": { - "values": { - "HISTORY_UNSPECIFIED": 0, - "ORIGINALLY_SINGLE_PATTERN": 1, - "FUTURE_MULTI_PATTERN": 2 - } - } - } + "defaultHost": { + "type": "string", + "id": 1049, + "extend": "google.protobuf.ServiceOptions" }, - "ResourceReference": { - "fields": { - "type": { - "type": "string", - "id": 1 - }, - "childType": { - "type": "string", - "id": 2 - } - } + "oauthScopes": { + "type": "string", + "id": 1050, + "extend": "google.protobuf.ServiceOptions" } } }, diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index d0cedb93624..95c44443eee 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -17,12 +17,11 @@ /** * @property {string[]} allowedPersistenceRegions - * The list of GCP region IDs where messages that are published to the topic + * A list of IDs of GCP regions where messages that are published to the topic * may be persisted in storage. Messages published by publishers running in * non-allowed GCP regions (or running outside of GCP altogether) will be - * routed for storage in one of the allowed regions. An empty list indicates a - * misconfiguration at the project or organization level, which will result in - * all Publish operations failing. + * routed for storage in one of the allowed regions. An empty list means that + * no regions are allowed, and is not a valid configuration. * * @typedef MessageStoragePolicy * @memberof google.pubsub.v1 @@ -48,12 +47,9 @@ const MessageStoragePolicy = { * managing labels. * * @property {Object} messageStoragePolicy - * Policy constraining how messages published to the topic may be stored. It - * is determined when the topic is created based on the policy configured at - * the project level. It must not be set by the caller in the request to - * CreateTopic or to UpdateTopic. This field will be populated in the - * responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the - * response, then no constraints are in effect. + * Policy constraining the set of Google Cloud Platform regions where messages + * published to the topic may be stored. If not present, then no constraints + * are in effect. * * This object should have the same structure as [MessageStoragePolicy]{@link google.pubsub.v1.MessageStoragePolicy} * @@ -62,9 +58,6 @@ const MessageStoragePolicy = { * to messages published on this topic. * * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. * * @typedef Topic * @memberof google.pubsub.v1 @@ -465,28 +458,28 @@ const ExpirationPolicy = { * For example, a Webhook endpoint might use "https://example.com/push". * * @property {Object.} attributes - * Endpoint configuration attributes. + * Endpoint configuration attributes that can be used to control different + * aspects of the message delivery. * - * Every endpoint has a set of API supported attributes that can be used to - * control different aspects of the message delivery. - * - * The currently supported attribute is `x-goog-version`, which you can + * The only currently supported attribute is `x-goog-version`, which you can * use to change the format of the pushed message. This attribute * indicates the version of the data expected by the endpoint. This * controls the shape of the pushed message (i.e., its fields and metadata). - * The endpoint version is based on the version of the Pub/Sub API. * * If not present during the `CreateSubscription` call, it will default to - * the version of the API used to make such call. If not present during a + * the version of the Pub/Sub API used to make such call. If not present in a * `ModifyPushConfig` call, its value will not be changed. `GetSubscription` * calls will always return a valid version, even if the subscription was * created without this attribute. * - * The possible values for this attribute are: + * The only supported values for the `x-goog-version` attribute are: * * * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. * * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. * + * For example: + * 
attributes { "x-goog-version": "v1" }
+ * * @property {Object} oidcToken * If specified, Pub/Sub will generate and attach an OIDC JWT token as an * `Authorization` header in the HTTP request for every pushed message. diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 25dfdc26d06..696d8e76751 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -306,12 +306,9 @@ class PublisherClient { * See Creating and * managing labels. * @param {Object} [request.messageStoragePolicy] - * Policy constraining how messages published to the topic may be stored. It - * is determined when the topic is created based on the policy configured at - * the project level. It must not be set by the caller in the request to - * CreateTopic or to UpdateTopic. This field will be populated in the - * responses for GetTopic, CreateTopic, and UpdateTopic: if not present in the - * response, then no constraints are in effect. + * Policy constraining the set of Google Cloud Platform regions where messages + * published to the topic may be stored. If not present, then no constraints + * are in effect. * * This object should have the same structure as [MessageStoragePolicy]{@link google.pubsub.v1.MessageStoragePolicy} * @param {string} [request.kmsKeyName] @@ -319,9 +316,6 @@ class PublisherClient { * to messages published on this topic. * * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 24d4f3c455c..b41e5fedd11 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-08-02T11:22:03.345597Z", + "updateTime": "2019-08-03T11:19:03.749438Z", "sources": [ { "generator": { "name": "artman", - "version": "0.32.0", - "dockerImage": "googleapis/artman@sha256:6929f343c400122d85818195b18613330a12a014bffc1e08499550d40571479d" + "version": "0.32.1", + "dockerImage": "googleapis/artman@sha256:a684d40ba9a4e15946f5f2ca6b4bd9fe301192f522e9de4fff622118775f309b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "3a40d3a5f5e5a33fd49888a8a33ed021f65c0ccf", - "internalRef": "261297518" + "sha": "7b212a8d2319cd81a7b6942c25dbf4550480a06c", + "internalRef": "261339454" } }, { From 3e9c458134bf0348c107585185155b16dd972ccd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sat, 3 Aug 2019 16:17:15 -0700 Subject: [PATCH 0490/1115] chore: release 0.30.3 (#712) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index a775bfeabbe..1d20176d50c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [0.30.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.30.2...v0.30.3) (2019-08-03) + + +### Bug Fixes + +* allow calls with no request, add JSON proto ([1e73a69](https://www.github.com/googleapis/nodejs-pubsub/commit/1e73a69)) + ### [0.30.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.30.1...v0.30.2) (2019-07-30) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3d77cfbe00f..65cd51cd0f7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.30.2", + "version": "0.30.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From c27b0e19ee8586ba03697c2ca5f9c541c45976c0 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Thu, 15 Aug 2019 15:32:27 -0700 Subject: [PATCH 0491/1115] feat(debug): capture stack trace in errors rather than message (#718) --- handwritten/pubsub/src/index.ts | 7 +++++++ handwritten/pubsub/src/message-queues.ts | 4 +++- handwritten/pubsub/src/message-stream.ts | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index d9afa0001c3..7c4fba4680b 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -143,3 +143,10 @@ export { Topic, TopicMetadata, } from './topic'; + +if (process.env.DEBUG_GRPC) { + console.info('gRPC logging set to verbose'); + const {setLogger, setLogVerbosity, logVerbosity} = require('@grpc/grpc-js'); + setLogger(console); + setLogVerbosity(logVerbosity.DEBUG); +} diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 614ef0e2c83..455c33eac9f 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -43,7 +43,9 @@ export class BatchError extends Error implements ServiceError { metadata: Metadata; constructor(err: ServiceError, ackIds: string[], rpc: string) { super( - `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${err.message}` + `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ + process.env.DEBUG_GRPC ? err.stack : err.message + }` ); this.ackIds = ackIds; diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 02025341f4f..088a2210c77 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -92,7 +92,11 @@ export class ChannelError extends Error implements ServiceError { details: string; metadata: Metadata; constructor(err: Error) { - super(`Failed to connect to channel. Reason: ${err.message}`); + super( + `Failed to connect to channel. Reason: ${ + process.env.DEBUG_GRPC ? err.stack : err.message + }` + ); this.code = err.message.includes('deadline') ? status.DEADLINE_EXCEEDED : status.UNKNOWN; From a756bd812b2b481a38c1271a9b7742ad4dad5fb6 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 15 Aug 2019 15:44:42 -0700 Subject: [PATCH 0492/1115] chore: release 0.31.0 (#719) --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 1d20176d50c..caeb8a2ee39 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [0.31.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.30.3...v0.31.0) (2019-08-15) + + +### Features + +* **debug:** capture stack trace in errors rather than message ([#718](https://www.github.com/googleapis/nodejs-pubsub/issues/718)) ([bfed3f1](https://www.github.com/googleapis/nodejs-pubsub/commit/bfed3f1)) + ### [0.30.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.30.2...v0.30.3) (2019-08-03) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 65cd51cd0f7..e5cd02baafb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.30.3", + "version": "0.31.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From c681fd17bd4e940b289aefeef535c29d06b74156 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sun, 25 Aug 2019 19:29:28 -0700 Subject: [PATCH 0493/1115] fix: use process versions object for client header (#722) --- handwritten/pubsub/src/v1/publisher_client.js | 2 +- handwritten/pubsub/src/v1/subscriber_client.js | 2 +- handwritten/pubsub/synth.metadata | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 696d8e76751..c7882fa28c6 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -83,7 +83,7 @@ class PublisherClient { // Determine the client header string. const clientHeader = [ - `gl-node/${process.version}`, + `gl-node/${process.versions.node}`, `grpc/${gaxGrpc.grpcVersion}`, `gax/${gax.version}`, `gapic/${VERSION}`, diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 944d87d057f..6efb6fdf122 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -83,7 +83,7 @@ class SubscriberClient { // Determine the client header string. const clientHeader = [ - `gl-node/${process.version}`, + `gl-node/${process.versions.node}`, `grpc/${gaxGrpc.grpcVersion}`, `gax/${gax.version}`, `gapic/${VERSION}`, diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index b41e5fedd11..478183c639d 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-08-03T11:19:03.749438Z", + "updateTime": "2019-08-21T11:19:31.648707Z", "sources": [ { "generator": { "name": "artman", - "version": "0.32.1", - "dockerImage": "googleapis/artman@sha256:a684d40ba9a4e15946f5f2ca6b4bd9fe301192f522e9de4fff622118775f309b" + "version": "0.34.0", + "dockerImage": "googleapis/artman@sha256:38a27ba6245f96c3e86df7acb2ebcc33b4f186d9e475efe2d64303aec3d4e0ea" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "7b212a8d2319cd81a7b6942c25dbf4550480a06c", - "internalRef": "261339454" + "sha": "11592a15391951348a64f5c303399733b1c5b3b2", + "internalRef": "264425502" } }, { From dca3bf6f084654754e5453bc927e78c6fd76e70c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 27 Aug 2019 13:01:56 -0700 Subject: [PATCH 0494/1115] chore: release 0.31.1 (#721) --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index caeb8a2ee39..d317127e027 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [0.31.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.31.0...v0.31.1) (2019-08-27) + + +### Bug Fixes + +* **deps:** update dependency yargs to v14 ([b0ceb5e](https://www.github.com/googleapis/nodejs-pubsub/commit/b0ceb5e)) +* use process versions object for client header ([#722](https://www.github.com/googleapis/nodejs-pubsub/issues/722)) ([e65185b](https://www.github.com/googleapis/nodejs-pubsub/commit/e65185b)) + ## [0.31.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.30.3...v0.31.0) (2019-08-15) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e5cd02baafb..38e5c627e9c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.31.0", + "version": "0.31.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 203f65ba450964148298056190b1e097a83d3c76 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 29 Aug 2019 18:36:07 +0300 Subject: [PATCH 0495/1115] chore(deps): update dependency typescript to ~3.6.0 (#728) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 38e5c627e9c..77a39d2a8ad 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -100,7 +100,7 @@ "proxyquire": "^2.0.0", "sinon": "^7.1.1", "source-map-support": "^0.5.9", - "typescript": "~3.5.0", + "typescript": "~3.6.0", "uuid": "^3.1.0" } } From 01384a0049eacb724ebe20ea3f6cb89593b3f0db Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 3 Sep 2019 14:38:26 -0700 Subject: [PATCH 0496/1115] feat: introduces DeadLetterPolicy --- .../protos/google/pubsub/v1/pubsub.proto | 69 +++++++++++++++- handwritten/pubsub/protos/protos.json | 20 +++++ .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 79 ++++++++++++++++++- .../pubsub/src/v1/subscriber_client.js | 19 ++++- handwritten/pubsub/synth.metadata | 6 +- 5 files changed, 184 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index ea0d4c7e53e..3ad6355a8bf 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -609,6 +609,52 @@ message Subscription { // *default policy* with `ttl` of 31 days will be used. The minimum allowed // value for `expiration_policy.ttl` is 1 day. ExpirationPolicy expiration_policy = 11; + + // A policy that specifies the conditions for dead lettering messages in + // this subscription. If dead_letter_policy is not set, dead lettering + // is disabled. + // + // The Cloud Pub/Sub service account associated with this subscriptions's + // parent project (i.e., + // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have + // permission to Acknowledge() messages on this subscription. + // EXPERIMENTAL: This feature is part of a closed alpha release. This + // API might be changed in backward-incompatible ways and is not recommended + // for production use. It is not subject to any SLA or deprecation policy. + DeadLetterPolicy dead_letter_policy = 13; +} + +// Dead lettering is done on a best effort basis. The same message might be +// dead lettered multiple times. +// +// If validation on any of the fields fails at subscription creation/updation, +// the create/update subscription request will fail. +message DeadLetterPolicy { + // The name of the topic to which dead letter messages should be published. + // Format is `projects/{project}/topics/{topic}`.The Cloud Pub/Sub service + // account associated with the enclosing subscription's parent project (i.e., + // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have + // permission to Publish() to this topic. + // + // The operation will fail if the topic does not exist. + // Users should ensure that there is a subscription attached to this topic + // since messages published to a topic with no subscriptions are lost. + string dead_letter_topic = 1; + + // The maximum number of delivery attempts for any message. The value must be + // between 5 and 100. + // + // The number of delivery attempts is defined as 1 + (the sum of number of + // NACKs and number of times the acknowledgement deadline has been exceeded + // for the message). + // + // A NACK is any call to ModifyAckDeadline with a 0 deadline. Note that + // client libraries may automatically extend ack_deadlines. + // + // This field will be honored on a best effort basis. + // + // If this parameter is 0, a default value of 5 is used. + int32 max_delivery_attempts = 2; } // A policy that specifies the conditions for resource expiration (i.e., @@ -691,6 +737,24 @@ message ReceivedMessage { // The message. PubsubMessage message = 2; + + // Delivery attempt counter is 1 + (the sum of number of NACKs and number of + // ack_deadline exceeds) for this message. + // + // A NACK is any call to ModifyAckDeadline with a 0 deadline. An ack_deadline + // exceeds event is whenever a message is not acknowledged within + // ack_deadline. Note that ack_deadline is initially + // Subscription.ackDeadlineSeconds, but may get extended automatically by + // the client library. + // + // The first delivery of a given message will have this value as 1. The value + // is calculated at best effort and is approximate. + // + // If a DeadLetterPolicy is not set on the subscription, this will be 0. + // EXPERIMENTAL: This feature is part of a closed alpha release. This + // API might be changed in backward-incompatible ways and is not recommended + // for production use. It is not subject to any SLA or deprecation policy. + int32 delivery_attempt = 3; } // Request for the GetSubscription method. @@ -770,8 +834,9 @@ message PullRequest { // least one message is available, rather than returning no messages. bool return_immediately = 2; - // The maximum number of messages returned for this request. The Pub/Sub - // system may return fewer than the number specified. + // The maximum number of messages to return for this request. Must be a + // positive integer. The Pub/Sub system may return fewer than the number + // specified. int32 max_messages = 3; } diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index f9a34d5bbf2..357e047e1b5 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -441,6 +441,22 @@ "expirationPolicy": { "type": "ExpirationPolicy", "id": 11 + }, + "deadLetterPolicy": { + "type": "DeadLetterPolicy", + "id": 13 + } + } + }, + "DeadLetterPolicy": { + "fields": { + "deadLetterTopic": { + "type": "string", + "id": 1 + }, + "maxDeliveryAttempts": { + "type": "int32", + "id": 2 } } }, @@ -499,6 +515,10 @@ "message": { "type": "PubsubMessage", "id": 2 + }, + "deliveryAttempt": { + "type": "int32", + "id": 3 } } }, diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index 95c44443eee..28609238a96 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -420,6 +420,21 @@ const DeleteTopicRequest = { * * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} * + * @property {Object} deadLetterPolicy + * A policy that specifies the conditions for dead lettering messages in + * this subscription. If dead_letter_policy is not set, dead lettering + * is disabled. + * + * The Cloud Pub/Sub service account associated with this subscriptions's + * parent project (i.e., + * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have + * permission to Acknowledge() messages on this subscription. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * + * This object should have the same structure as [DeadLetterPolicy]{@link google.pubsub.v1.DeadLetterPolicy} + * * @typedef Subscription * @memberof google.pubsub.v1 * @see [google.pubsub.v1.Subscription definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} @@ -428,6 +443,47 @@ const Subscription = { // This is for documentation. Actual contents will be loaded by gRPC. }; +/** + * Dead lettering is done on a best effort basis. The same message might be + * dead lettered multiple times. + * + * If validation on any of the fields fails at subscription creation/updation, + * the create/update subscription request will fail. + * + * @property {string} deadLetterTopic + * The name of the topic to which dead letter messages should be published. + * Format is `projects/{project}/topics/{topic}`.The Cloud Pub/Sub service + * account associated with the enclosing subscription's parent project (i.e., + * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have + * permission to Publish() to this topic. + * + * The operation will fail if the topic does not exist. + * Users should ensure that there is a subscription attached to this topic + * since messages published to a topic with no subscriptions are lost. + * + * @property {number} maxDeliveryAttempts + * The maximum number of delivery attempts for any message. The value must be + * between 5 and 100. + * + * The number of delivery attempts is defined as 1 + (the sum of number of + * NACKs and number of times the acknowledgement deadline has been exceeded + * for the message). + * + * A NACK is any call to ModifyAckDeadline with a 0 deadline. Note that + * client libraries may automatically extend ack_deadlines. + * + * This field will be honored on a best effort basis. + * + * If this parameter is 0, a default value of 5 is used. + * + * @typedef DeadLetterPolicy + * @memberof google.pubsub.v1 + * @see [google.pubsub.v1.DeadLetterPolicy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} + */ +const DeadLetterPolicy = { + // This is for documentation. Actual contents will be loaded by gRPC. +}; + /** * A policy that specifies the conditions for resource expiration (i.e., * automatic resource deletion). @@ -533,6 +589,24 @@ const PushConfig = { * * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} * + * @property {number} deliveryAttempt + * Delivery attempt counter is 1 + (the sum of number of NACKs and number of + * ack_deadline exceeds) for this message. + * + * A NACK is any call to ModifyAckDeadline with a 0 deadline. An ack_deadline + * exceeds event is whenever a message is not acknowledged within + * ack_deadline. Note that ack_deadline is initially + * Subscription.ackDeadlineSeconds, but may get extended automatically by + * the client library. + * + * The first delivery of a given message will have this value as 1. The value + * is calculated at best effort and is approximate. + * + * If a DeadLetterPolicy is not set on the subscription, this will be 0. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * * @typedef ReceivedMessage * @memberof google.pubsub.v1 * @see [google.pubsub.v1.ReceivedMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} @@ -676,8 +750,9 @@ const ModifyPushConfigRequest = { * least one message is available, rather than returning no messages. * * @property {number} maxMessages - * The maximum number of messages returned for this request. The Pub/Sub - * system may return fewer than the number specified. + * The maximum number of messages to return for this request. Must be a + * positive integer. The Pub/Sub system may return fewer than the number + * specified. * * @typedef PullRequest * @memberof google.pubsub.v1 diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 6efb6fdf122..3d0c54d37fc 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -378,6 +378,20 @@ class SubscriberClient { * value for `expiration_policy.ttl` is 1 day. * * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} + * @param {Object} [request.deadLetterPolicy] + * A policy that specifies the conditions for dead lettering messages in + * this subscription. If dead_letter_policy is not set, dead lettering + * is disabled. + * + * The Cloud Pub/Sub service account associated with this subscriptions's + * parent project (i.e., + * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have + * permission to Acknowledge() messages on this subscription. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * + * This object should have the same structure as [DeadLetterPolicy]{@link google.pubsub.v1.DeadLetterPolicy} * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. @@ -910,8 +924,9 @@ class SubscriberClient { * The subscription from which messages should be pulled. * Format is `projects/{project}/subscriptions/{sub}`. * @param {number} request.maxMessages - * The maximum number of messages returned for this request. The Pub/Sub - * system may return fewer than the number specified. + * The maximum number of messages to return for this request. Must be a + * positive integer. The Pub/Sub system may return fewer than the number + * specified. * @param {boolean} [request.returnImmediately] * If this field set to true, the system will respond immediately even if * it there are no messages available to return in the `Pull` response. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 478183c639d..f7dba0569ab 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-08-21T11:19:31.648707Z", + "updateTime": "2019-08-26T11:13:07.048476Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "11592a15391951348a64f5c303399733b1c5b3b2", - "internalRef": "264425502" + "sha": "b97af5f7fea49d533900b62cca171da0e49743de", + "internalRef": "265156479" } }, { From f019b5a03b896151548dc4e0135e85f4c6ae5ed5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 Sep 2019 22:04:13 +0300 Subject: [PATCH 0497/1115] chore(deps): update dependency eslint-plugin-node to v10 (#732) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 77a39d2a8ad..073038c7dbd 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -83,7 +83,7 @@ "codecov": "^3.0.0", "eslint": "^6.0.0", "eslint-config-prettier": "^6.0.0", - "eslint-plugin-node": "^9.0.0", + "eslint-plugin-node": "^10.0.0", "eslint-plugin-prettier": "^3.0.0", "gts": "^1.0.0", "intelli-espower-loader": "^1.0.1", From a8f064e17c1a3d6b5d72000125173754b7a455a4 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Fri, 6 Sep 2019 14:45:03 -0700 Subject: [PATCH 0498/1115] feat: update IAM protos (#734) --- handwritten/pubsub/proto/iam.d.ts | 345 +++++++++++++++++- .../protos/google/iam/v1/iam_policy.proto | 43 ++- .../pubsub/protos/google/iam/v1/options.proto | 37 ++ .../pubsub/protos/google/iam/v1/policy.proto | 88 ++++- .../pubsub/protos/google/type/expr.proto | 52 +++ handwritten/pubsub/system-test/pubsub.ts | 5 +- 6 files changed, 544 insertions(+), 26 deletions(-) create mode 100644 handwritten/pubsub/protos/google/iam/v1/options.proto create mode 100644 handwritten/pubsub/protos/google/type/expr.proto diff --git a/handwritten/pubsub/proto/iam.d.ts b/handwritten/pubsub/proto/iam.d.ts index 3343cbbb787..4a149a1a864 100644 --- a/handwritten/pubsub/proto/iam.d.ts +++ b/handwritten/pubsub/proto/iam.d.ts @@ -1,5 +1,4 @@ import * as $protobuf from "protobufjs"; -import * as Long from "long"; /** Namespace google. */ export namespace google { @@ -197,6 +196,9 @@ export namespace google { /** GetIamPolicyRequest resource */ resource?: (string|null); + + /** GetIamPolicyRequest options */ + options?: (google.iam.v1.IGetPolicyOptions|null); } /** Represents a GetIamPolicyRequest. */ @@ -211,6 +213,9 @@ export namespace google { /** GetIamPolicyRequest resource. */ public resource: string; + /** GetIamPolicyRequest options. */ + public options?: (google.iam.v1.IGetPolicyOptions|null); + /** * Creates a new GetIamPolicyRequest instance using the specified properties. * @param [properties] Properties to set @@ -468,6 +473,96 @@ export namespace google { public toJSON(): { [k: string]: any }; } + /** Properties of a GetPolicyOptions. */ + interface IGetPolicyOptions { + + /** GetPolicyOptions requestedPolicyVersion */ + requestedPolicyVersion?: (number|null); + } + + /** Represents a GetPolicyOptions. */ + class GetPolicyOptions implements IGetPolicyOptions { + + /** + * Constructs a new GetPolicyOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IGetPolicyOptions); + + /** GetPolicyOptions requestedPolicyVersion. */ + public requestedPolicyVersion: number; + + /** + * Creates a new GetPolicyOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns GetPolicyOptions instance + */ + public static create(properties?: google.iam.v1.IGetPolicyOptions): google.iam.v1.GetPolicyOptions; + + /** + * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @param message GetPolicyOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @param message GetPolicyOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetPolicyOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetPolicyOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetPolicyOptions; + + /** + * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetPolicyOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetPolicyOptions; + + /** + * Verifies a GetPolicyOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetPolicyOptions + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.GetPolicyOptions; + + /** + * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. + * @param message GetPolicyOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.GetPolicyOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetPolicyOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + /** Properties of a Policy. */ interface IPolicy { @@ -578,6 +673,9 @@ export namespace google { /** Binding members */ members?: (string[]|null); + + /** Binding condition */ + condition?: (google.type.IExpr|null); } /** Represents a Binding. */ @@ -595,6 +693,9 @@ export namespace google { /** Binding members. */ public members: string[]; + /** Binding condition. */ + public condition?: (google.type.IExpr|null); + /** * Creates a new Binding instance using the specified properties. * @param [properties] Properties to set @@ -671,6 +772,9 @@ export namespace google { /** PolicyDelta bindingDeltas */ bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); + + /** PolicyDelta auditConfigDeltas */ + auditConfigDeltas?: (google.iam.v1.IAuditConfigDelta[]|null); } /** Represents a PolicyDelta. */ @@ -685,6 +789,9 @@ export namespace google { /** PolicyDelta bindingDeltas. */ public bindingDeltas: google.iam.v1.IBindingDelta[]; + /** PolicyDelta auditConfigDeltas. */ + public auditConfigDeltas: google.iam.v1.IAuditConfigDelta[]; + /** * Creates a new PolicyDelta instance using the specified properties. * @param [properties] Properties to set @@ -767,6 +874,9 @@ export namespace google { /** BindingDelta member */ member?: (string|null); + + /** BindingDelta condition */ + condition?: (google.type.IExpr|null); } /** Represents a BindingDelta. */ @@ -787,6 +897,9 @@ export namespace google { /** BindingDelta member. */ public member: string; + /** BindingDelta condition. */ + public condition?: (google.type.IExpr|null); + /** * Creates a new BindingDelta instance using the specified properties. * @param [properties] Properties to set @@ -867,6 +980,124 @@ export namespace google { REMOVE = 2 } } + + /** Properties of an AuditConfigDelta. */ + interface IAuditConfigDelta { + + /** AuditConfigDelta action */ + action?: (google.iam.v1.AuditConfigDelta.Action|null); + + /** AuditConfigDelta service */ + service?: (string|null); + + /** AuditConfigDelta exemptedMember */ + exemptedMember?: (string|null); + + /** AuditConfigDelta logType */ + logType?: (string|null); + } + + /** Represents an AuditConfigDelta. */ + class AuditConfigDelta implements IAuditConfigDelta { + + /** + * Constructs a new AuditConfigDelta. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IAuditConfigDelta); + + /** AuditConfigDelta action. */ + public action: google.iam.v1.AuditConfigDelta.Action; + + /** AuditConfigDelta service. */ + public service: string; + + /** AuditConfigDelta exemptedMember. */ + public exemptedMember: string; + + /** AuditConfigDelta logType. */ + public logType: string; + + /** + * Creates a new AuditConfigDelta instance using the specified properties. + * @param [properties] Properties to set + * @returns AuditConfigDelta instance + */ + public static create(properties?: google.iam.v1.IAuditConfigDelta): google.iam.v1.AuditConfigDelta; + + /** + * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @param message AuditConfigDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @param message AuditConfigDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AuditConfigDelta message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AuditConfigDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.AuditConfigDelta; + + /** + * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AuditConfigDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.AuditConfigDelta; + + /** + * Verifies an AuditConfigDelta message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AuditConfigDelta + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.AuditConfigDelta; + + /** + * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. + * @param message AuditConfigDelta + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.AuditConfigDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AuditConfigDelta to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace AuditConfigDelta { + + /** Action enum. */ + enum Action { + ACTION_UNSPECIFIED = 0, + ADD = 1, + REMOVE = 2 + } + } } } @@ -4072,4 +4303,116 @@ export namespace google { } } } + + /** Namespace type. */ + namespace type { + + /** Properties of an Expr. */ + interface IExpr { + + /** Expr expression */ + expression?: (string|null); + + /** Expr title */ + title?: (string|null); + + /** Expr description */ + description?: (string|null); + + /** Expr location */ + location?: (string|null); + } + + /** Represents an Expr. */ + class Expr implements IExpr { + + /** + * Constructs a new Expr. + * @param [properties] Properties to set + */ + constructor(properties?: google.type.IExpr); + + /** Expr expression. */ + public expression: string; + + /** Expr title. */ + public title: string; + + /** Expr description. */ + public description: string; + + /** Expr location. */ + public location: string; + + /** + * Creates a new Expr instance using the specified properties. + * @param [properties] Properties to set + * @returns Expr instance + */ + public static create(properties?: google.type.IExpr): google.type.Expr; + + /** + * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @param message Expr message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @param message Expr message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Expr message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.type.Expr; + + /** + * Decodes an Expr message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.type.Expr; + + /** + * Verifies an Expr message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Expr message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Expr + */ + public static fromObject(object: { [k: string]: any }): google.type.Expr; + + /** + * Creates a plain object from an Expr message. Also converts values to other types if specified. + * @param message Expr + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.type.Expr, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Expr to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } } diff --git a/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto b/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto index 15e216f194d..8825cdc7f35 100644 --- a/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto +++ b/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto @@ -1,4 +1,4 @@ -// Copyright 2016 Google Inc. +// Copyright 2019 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,13 +11,16 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; package google.iam.v1; -import "google/api/annotations.proto"; +import "google/iam/v1/options.proto"; import "google/iam/v1/policy.proto"; +import "google/api/annotations.proto"; +import "google/api/client.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.Iam.V1"; @@ -25,7 +28,7 @@ option go_package = "google.golang.org/genproto/googleapis/iam/v1;iam"; option java_multiple_files = true; option java_outer_classname = "IamPolicyProto"; option java_package = "com.google.iam.v1"; - +option php_namespace = "Google\\Cloud\\Iam\\V1"; // ## API Overview // @@ -53,32 +56,46 @@ option java_package = "com.google.iam.v1"; // are created and deleted implicitly with the resources to which they are // attached. service IAMPolicy { + option (google.api.default_host) = "iam-meta-api.googleapis.com"; + // Sets the access control policy on the specified resource. Replaces any // existing policy. rpc SetIamPolicy(SetIamPolicyRequest) returns (Policy) { - option (google.api.http) = { post: "/v1/{resource=**}:setIamPolicy" body: "*" }; + option (google.api.http) = { + post: "/v1/{resource=**}:setIamPolicy" + body: "*" + }; } // Gets the access control policy for a resource. // Returns an empty policy if the resource exists and does not have a policy // set. rpc GetIamPolicy(GetIamPolicyRequest) returns (Policy) { - option (google.api.http) = { post: "/v1/{resource=**}:getIamPolicy" body: "*" }; + option (google.api.http) = { + post: "/v1/{resource=**}:getIamPolicy" + body: "*" + }; } // Returns permissions that a caller has on the specified resource. // If the resource does not exist, this will return an empty set of // permissions, not a NOT_FOUND error. + // + // Note: This operation is designed to be used for building permission-aware + // UIs and command-line tools, not for authorization checking. This operation + // may "fail open" without warning. rpc TestIamPermissions(TestIamPermissionsRequest) returns (TestIamPermissionsResponse) { - option (google.api.http) = { post: "/v1/{resource=**}:testIamPermissions" body: "*" }; + option (google.api.http) = { + post: "/v1/{resource=**}:testIamPermissions" + body: "*" + }; } } // Request message for `SetIamPolicy` method. message SetIamPolicyRequest { // REQUIRED: The resource for which the policy is being specified. - // `resource` is usually specified as a path. For example, a Project - // resource is specified as `projects/{project}`. + // See the operation documentation for the appropriate value for this field. string resource = 1; // REQUIRED: The complete policy to be applied to the `resource`. The size of @@ -91,16 +108,18 @@ message SetIamPolicyRequest { // Request message for `GetIamPolicy` method. message GetIamPolicyRequest { // REQUIRED: The resource for which the policy is being requested. - // `resource` is usually specified as a path. For example, a Project - // resource is specified as `projects/{project}`. + // See the operation documentation for the appropriate value for this field. string resource = 1; + + // OPTIONAL: A `GetPolicyOptions` object for specifying options to + // `GetIamPolicy`. This field is only used by Cloud IAM. + google.iam.v1.GetPolicyOptions options = 2; } // Request message for `TestIamPermissions` method. message TestIamPermissionsRequest { // REQUIRED: The resource for which the policy detail is being requested. - // `resource` is usually specified as a path. For example, a Project - // resource is specified as `projects/{project}`. + // See the operation documentation for the appropriate value for this field. string resource = 1; // The set of permissions to check for the `resource`. Permissions with diff --git a/handwritten/pubsub/protos/google/iam/v1/options.proto b/handwritten/pubsub/protos/google/iam/v1/options.proto new file mode 100644 index 00000000000..24e886366b8 --- /dev/null +++ b/handwritten/pubsub/protos/google/iam/v1/options.proto @@ -0,0 +1,37 @@ +// Copyright 2019 Google LLC. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +syntax = "proto3"; + +package google.iam.v1; + +import "google/api/annotations.proto"; + +option cc_enable_arenas = true; +option csharp_namespace = "Google.Cloud.Iam.V1"; +option go_package = "google.golang.org/genproto/googleapis/iam/v1;iam"; +option java_multiple_files = true; +option java_outer_classname = "OptionsProto"; +option java_package = "com.google.iam.v1"; +option php_namespace = "Google\\Cloud\\Iam\\V1"; + +// Encapsulates settings provided to GetIamPolicy. +message GetPolicyOptions { + // Optional. The policy format version to be returned. + // Acceptable values are 0 and 1. + // If the value is 0, or the field is omitted, policy format version 1 will be + // returned. + int32 requested_policy_version = 1; +} diff --git a/handwritten/pubsub/protos/google/iam/v1/policy.proto b/handwritten/pubsub/protos/google/iam/v1/policy.proto index a09b5443138..4aef8aec4b9 100644 --- a/handwritten/pubsub/protos/google/iam/v1/policy.proto +++ b/handwritten/pubsub/protos/google/iam/v1/policy.proto @@ -1,4 +1,4 @@ -// Copyright 2016 Google Inc. +// Copyright 2019 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,11 +11,13 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; package google.iam.v1; +import "google/type/expr.proto"; import "google/api/annotations.proto"; option cc_enable_arenas = true; @@ -24,18 +26,18 @@ option go_package = "google.golang.org/genproto/googleapis/iam/v1;iam"; option java_multiple_files = true; option java_outer_classname = "PolicyProto"; option java_package = "com.google.iam.v1"; - +option php_namespace = "Google\\Cloud\\Iam\\V1"; // Defines an Identity and Access Management (IAM) policy. It is used to // specify access control policies for Cloud Platform resources. // // -// A `Policy` consists of a list of `bindings`. A `Binding` binds a list of +// A `Policy` consists of a list of `bindings`. A `binding` binds a list of // `members` to a `role`, where the members can be user accounts, Google groups, // Google domains, and service accounts. A `role` is a named list of permissions // defined by IAM. // -// **Example** +// **JSON Example** // // { // "bindings": [ @@ -45,7 +47,7 @@ option java_package = "com.google.iam.v1"; // "user:mike@example.com", // "group:admins@example.com", // "domain:google.com", -// "serviceAccount:my-other-app@appspot.gserviceaccount.com", +// "serviceAccount:my-other-app@appspot.gserviceaccount.com" // ] // }, // { @@ -55,14 +57,27 @@ option java_package = "com.google.iam.v1"; // ] // } // +// **YAML Example** +// +// bindings: +// - members: +// - user:mike@example.com +// - group:admins@example.com +// - domain:google.com +// - serviceAccount:my-other-app@appspot.gserviceaccount.com +// role: roles/owner +// - members: +// - user:sean@example.com +// role: roles/viewer +// +// // For a description of IAM and its features, see the -// [IAM developer's guide](https://cloud.google.com/iam). +// [IAM developer's guide](https://cloud.google.com/iam/docs). message Policy { - // Version of the `Policy`. The default version is 0. + // Deprecated. int32 version = 1; // Associates a list of `members` to a `role`. - // Multiple `bindings` must not be specified for the same `role`. // `bindings` with no members will result in an error. repeated Binding bindings = 4; @@ -75,7 +90,7 @@ message Policy { // ensure that their change will be applied to the same version of the policy. // // If no `etag` is provided in the call to `setIamPolicy`, then the existing - // policy is overwritten blindly. + // policy is overwritten. bytes etag = 3; } @@ -83,7 +98,6 @@ message Policy { message Binding { // Role that is assigned to `members`. // For example, `roles/viewer`, `roles/editor`, or `roles/owner`. - // Required string role = 1; // Specifies the identities requesting access for a Cloud Platform resource. @@ -96,7 +110,7 @@ message Binding { // who is authenticated with a Google account or a service account. // // * `user:{emailid}`: An email address that represents a specific Google - // account. For example, `alice@gmail.com` or `joe@example.com`. + // account. For example, `alice@example.com` . // // // * `serviceAccount:{emailid}`: An email address that represents a service @@ -105,17 +119,27 @@ message Binding { // * `group:{emailid}`: An email address that represents a Google group. // For example, `admins@example.com`. // - // * `domain:{domain}`: A Google Apps domain name that represents all the + // + // * `domain:{domain}`: The G Suite domain (primary) that represents all the // users of that domain. For example, `google.com` or `example.com`. // // repeated string members = 2; + + // The condition that is associated with this binding. + // NOTE: An unsatisfied condition will not allow user access via current + // binding. Different bindings, including their conditions, are examined + // independently. + google.type.Expr condition = 3; } // The difference delta between two policies. message PolicyDelta { // The delta for Bindings between two policies. repeated BindingDelta binding_deltas = 1; + + // The delta for AuditConfigs between two policies. + repeated AuditConfigDelta audit_config_deltas = 2; } // One delta entry for Binding. Each individual change (only one member in each @@ -146,4 +170,44 @@ message BindingDelta { // Follows the same format of Binding.members. // Required string member = 3; + + // The condition that is associated with this binding. This field is logged + // only for Cloud Audit Logging. + google.type.Expr condition = 4; +} + +// One delta entry for AuditConfig. Each individual change (only one +// exempted_member in each entry) to a AuditConfig will be a separate entry. +message AuditConfigDelta { + // The type of action performed on an audit configuration in a policy. + enum Action { + // Unspecified. + ACTION_UNSPECIFIED = 0; + + // Addition of an audit configuration. + ADD = 1; + + // Removal of an audit configuration. + REMOVE = 2; + } + + // The action that was performed on an audit configuration in a policy. + // Required + Action action = 1; + + // Specifies a service that was configured for Cloud Audit Logging. + // For example, `storage.googleapis.com`, `cloudsql.googleapis.com`. + // `allServices` is a special value that covers all services. + // Required + string service = 2; + + // A single identity that is exempted from "data access" audit + // logging for the `service` specified above. + // Follows the same format of Binding.members. + string exempted_member = 3; + + // Specifies the log_type that was be enabled. ADMIN_ACTIVITY is always + // enabled, and cannot be configured. + // Required + string log_type = 4; } diff --git a/handwritten/pubsub/protos/google/type/expr.proto b/handwritten/pubsub/protos/google/type/expr.proto new file mode 100644 index 00000000000..444742513a6 --- /dev/null +++ b/handwritten/pubsub/protos/google/type/expr.proto @@ -0,0 +1,52 @@ +// Copyright 2019 Google LLC. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +syntax = "proto3"; + +package google.type; + +option go_package = "google.golang.org/genproto/googleapis/type/expr;expr"; +option java_multiple_files = true; +option java_outer_classname = "ExprProto"; +option java_package = "com.google.type"; +option objc_class_prefix = "GTP"; + + +// Represents an expression text. Example: +// +// title: "User account presence" +// description: "Determines whether the request has a user account" +// expression: "size(request.user) > 0" +message Expr { + // Textual representation of an expression in + // Common Expression Language syntax. + // + // The application context of the containing message determines which + // well-known feature set of CEL is supported. + string expression = 1; + + // An optional title for the expression, i.e. a short string describing + // its purpose. This can be used e.g. in UIs which allow to enter the + // expression. + string title = 2; + + // An optional description of the expression. This is a longer text which + // describes the expression, e.g. when hovered over it in a UI. + string description = 3; + + // An optional string indicating the location of the expression for error + // reporting, e.g. a file name and a position in the file. + string location = 4; +} diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 55fcc1f469f..fd86eea9c83 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -632,7 +632,10 @@ describe('pubsub', () => { policy, (err: ServiceError | null, newPolicy?: Policy | null) => { assert.ifError(err); - assert.deepStrictEqual(newPolicy!.bindings, policy.bindings); + const expectedBindings = policy.bindings.map(binding => + Object.assign({condition: null}, binding) + ); + assert.deepStrictEqual(newPolicy!.bindings, expectedBindings); done(); } ); From 86a36739720cc32eaa3a703937708ff74cbba18d Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Fri, 6 Sep 2019 18:40:47 -0400 Subject: [PATCH 0499/1115] update .nycrc ignore rules (#735) --- handwritten/pubsub/.nycrc | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/.nycrc b/handwritten/pubsub/.nycrc index 83a421a0628..23e322204ec 100644 --- a/handwritten/pubsub/.nycrc +++ b/handwritten/pubsub/.nycrc @@ -6,6 +6,7 @@ "**/.coverage", "**/apis", "**/benchmark", + "**/conformance", "**/docs", "**/samples", "**/scripts", From 68476599cbb4ac769d60f12c95a94b8c141ce74b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 6 Sep 2019 18:31:33 -0700 Subject: [PATCH 0500/1115] feat: load protos from JSON, grpc-fallback support (#730) * [CHANGE ME] Re-generated to pick up changes in the API or client library generator. * remove browser files --- handwritten/pubsub/README.md | 4 +- handwritten/pubsub/protos/protos.json | 224 ++++++++++++++++++ .../v1/doc/google/protobuf/doc_timestamp.js | 10 +- handwritten/pubsub/src/v1/publisher_client.js | 131 +++++----- .../pubsub/src/v1/publisher_proto_list.json | 4 + .../pubsub/src/v1/subscriber_client.js | 111 +++++---- .../pubsub/src/v1/subscriber_proto_list.json | 4 + handwritten/pubsub/synth.metadata | 10 +- handwritten/pubsub/synth.py | 5 + handwritten/pubsub/test/gapic-v1.js | 10 + 10 files changed, 397 insertions(+), 116 deletions(-) create mode 100644 handwritten/pubsub/src/v1/publisher_proto_list.json create mode 100644 handwritten/pubsub/src/v1/subscriber_proto_list.json diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 2dc3b4d6af8..2d51f66add2 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -126,12 +126,10 @@ Apache Version 2.0 See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) -[client-docs]: https://googleapis.dev/nodejs/pubsub/latest#reference +[client-docs]: https://googleapis.dev/nodejs/pubsub/latest [product-docs]: https://cloud.google.com/pubsub/docs/ [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png [projects]: https://console.cloud.google.com/project [billing]: https://support.google.com/cloud/answer/6293499#enable-billing [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com [auth]: https://cloud.google.com/docs/authentication/getting-started - - diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 357e047e1b5..603fccad993 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1851,6 +1851,230 @@ } } } + }, + "iam": { + "nested": { + "v1": { + "options": { + "cc_enable_arenas": true, + "csharp_namespace": "Google.Cloud.Iam.V1", + "go_package": "google.golang.org/genproto/googleapis/iam/v1;iam", + "java_multiple_files": true, + "java_outer_classname": "PolicyProto", + "java_package": "com.google.iam.v1", + "php_namespace": "Google\\Cloud\\Iam\\V1" + }, + "nested": { + "IAMPolicy": { + "methods": { + "SetIamPolicy": { + "requestType": "SetIamPolicyRequest", + "responseType": "Policy", + "options": { + "(google.api.http).post": "/v1/{resource=**}:setIamPolicy", + "(google.api.http).body": "*" + } + }, + "GetIamPolicy": { + "requestType": "GetIamPolicyRequest", + "responseType": "Policy", + "options": { + "(google.api.http).post": "/v1/{resource=**}:getIamPolicy", + "(google.api.http).body": "*" + } + }, + "TestIamPermissions": { + "requestType": "TestIamPermissionsRequest", + "responseType": "TestIamPermissionsResponse", + "options": { + "(google.api.http).post": "/v1/{resource=**}:testIamPermissions", + "(google.api.http).body": "*" + } + } + } + }, + "SetIamPolicyRequest": { + "fields": { + "resource": { + "type": "string", + "id": 1 + }, + "policy": { + "type": "Policy", + "id": 2 + } + } + }, + "GetIamPolicyRequest": { + "fields": { + "resource": { + "type": "string", + "id": 1 + } + } + }, + "TestIamPermissionsRequest": { + "fields": { + "resource": { + "type": "string", + "id": 1 + }, + "permissions": { + "rule": "repeated", + "type": "string", + "id": 2 + } + } + }, + "TestIamPermissionsResponse": { + "fields": { + "permissions": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "Policy": { + "fields": { + "version": { + "type": "int32", + "id": 1 + }, + "bindings": { + "rule": "repeated", + "type": "Binding", + "id": 4 + }, + "etag": { + "type": "bytes", + "id": 3 + } + } + }, + "Binding": { + "fields": { + "role": { + "type": "string", + "id": 1 + }, + "members": { + "rule": "repeated", + "type": "string", + "id": 2 + }, + "condition": { + "type": "google.type.Expr", + "id": 3 + } + } + }, + "PolicyDelta": { + "fields": { + "bindingDeltas": { + "rule": "repeated", + "type": "BindingDelta", + "id": 1 + }, + "auditConfigDeltas": { + "rule": "repeated", + "type": "AuditConfigDelta", + "id": 2 + } + } + }, + "BindingDelta": { + "fields": { + "action": { + "type": "Action", + "id": 1 + }, + "role": { + "type": "string", + "id": 2 + }, + "member": { + "type": "string", + "id": 3 + }, + "condition": { + "type": "google.type.Expr", + "id": 4 + } + }, + "nested": { + "Action": { + "values": { + "ACTION_UNSPECIFIED": 0, + "ADD": 1, + "REMOVE": 2 + } + } + } + }, + "AuditConfigDelta": { + "fields": { + "action": { + "type": "Action", + "id": 1 + }, + "service": { + "type": "string", + "id": 2 + }, + "exemptedMember": { + "type": "string", + "id": 3 + }, + "logType": { + "type": "string", + "id": 4 + } + }, + "nested": { + "Action": { + "values": { + "ACTION_UNSPECIFIED": 0, + "ADD": 1, + "REMOVE": 2 + } + } + } + } + } + } + } + }, + "type": { + "options": { + "go_package": "google.golang.org/genproto/googleapis/type/expr;expr", + "java_multiple_files": true, + "java_outer_classname": "ExprProto", + "java_package": "com.google.type", + "objc_class_prefix": "GTP" + }, + "nested": { + "Expr": { + "fields": { + "expression": { + "type": "string", + "id": 1 + }, + "title": { + "type": "string", + "id": 2 + }, + "description": { + "type": "string", + "id": 3 + }, + "location": { + "type": "string", + "id": 4 + } + } + } + } } } } diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js index 98c19dbf0d3..c457acc0c7d 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js @@ -89,11 +89,13 @@ * 01:30 UTC on January 15, 2017. * * In JavaScript, one can convert a Date object to this format using the - * standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) + * standard + * [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) * method. In Python, a standard `datetime.datetime` object can be converted - * to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) - * with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one - * can use the Joda Time's [`ISODateTimeFormat.dateTime()`](https://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D) to obtain a formatter capable of generating timestamps in this format. + * to this format using + * [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with + * the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use + * the Joda Time's [`ISODateTimeFormat.dateTime()`](https://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D) to obtain a formatter capable of generating timestamps in this format. * * @property {number} seconds * Represents seconds of UTC time since Unix epoch diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index c7882fa28c6..d7c06e826f8 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -17,7 +17,6 @@ const gapicConfig = require('./publisher_client_config.json'); const gax = require('google-gax'); const path = require('path'); -const protobuf = require('protobufjs'); const VERSION = require('../../../package.json').version; @@ -60,6 +59,16 @@ class PublisherClient { opts = opts || {}; this._descriptors = {}; + if (global.isBrowser) { + // If we're in browser, we use gRPC fallback. + opts.fallback = true; + } + + // If we are in browser, we are already using fallback because of the + // "browser" field in package.json. + // But if we were explicitly requested to use fallback, let's do it now. + const gaxModule = !global.isBrowser && opts.fallback ? gax.fallback : gax; + const servicePath = opts.servicePath || opts.apiEndpoint || this.constructor.servicePath; @@ -76,34 +85,49 @@ class PublisherClient { // Create a `gaxGrpc` object, with any grpc-specific options // sent to the client. opts.scopes = this.constructor.scopes; - const gaxGrpc = new gax.GrpcClient(opts); + const gaxGrpc = new gaxModule.GrpcClient(opts); // Save the auth object to the client, for use by other methods. this.auth = gaxGrpc.auth; // Determine the client header string. - const clientHeader = [ - `gl-node/${process.versions.node}`, - `grpc/${gaxGrpc.grpcVersion}`, - `gax/${gax.version}`, - `gapic/${VERSION}`, - ]; + const clientHeader = []; + + if (typeof process !== 'undefined' && 'versions' in process) { + clientHeader.push(`gl-node/${process.versions.node}`); + } + clientHeader.push(`gax/${gaxModule.version}`); + if (opts.fallback) { + clientHeader.push(`gl-web/${gaxModule.version}`); + } else { + clientHeader.push(`grpc/${gaxGrpc.grpcVersion}`); + } + clientHeader.push(`gapic/${VERSION}`); if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. + // For Node.js, pass the path to JSON proto file. + // For browsers, pass the JSON content. + + const nodejsProtoPath = path.join( + __dirname, + '..', + '..', + 'protos', + 'protos.json' + ); const protos = gaxGrpc.loadProto( - path.join(__dirname, '..', '..', 'protos'), - ['google/iam/v1/iam_policy.proto', 'google/pubsub/v1/pubsub.proto'] + opts.fallback ? require('../../protos/protos.json') : nodejsProtoPath ); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. // Create useful helper objects for these. this._pathTemplates = { - projectPathTemplate: new gax.PathTemplate('projects/{project}'), - topicPathTemplate: new gax.PathTemplate( + projectPathTemplate: new gaxModule.PathTemplate('projects/{project}'), + topicPathTemplate: new gaxModule.PathTemplate( 'projects/{project}/topics/{topic}' ), }; @@ -112,43 +136,26 @@ class PublisherClient { // (e.g. 50 results at a time, with tokens to get subsequent // pages). Denote the keys used for pagination and results. this._descriptors.page = { - listTopics: new gax.PageDescriptor( + listTopics: new gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', 'topics' ), - listTopicSubscriptions: new gax.PageDescriptor( + listTopicSubscriptions: new gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', 'subscriptions' ), }; - let protoFilesRoot = new gax.GoogleProtoFilesRoot(); - protoFilesRoot = protobuf.loadSync( - path.join( - __dirname, - '..', - '..', - 'protos', - 'google/iam/v1/iam_policy.proto' - ), - protoFilesRoot - ); - protoFilesRoot = protobuf.loadSync( - path.join( - __dirname, - '..', - '..', - 'protos', - 'google/pubsub/v1/pubsub.proto' - ), - protoFilesRoot - ); + + const protoFilesRoot = opts.fallback + ? gaxModule.protobuf.Root.fromJSON(require('../../protos/protos.json')) + : gaxModule.protobuf.loadSync(nodejsProtoPath); // Some methods on this API support automatically batching // requests; denote this. this._descriptors.batching = { - publish: new gax.BundleDescriptor( + publish: new gaxModule.BundleDescriptor( 'messages', ['topic'], 'messageIds', @@ -174,7 +181,9 @@ class PublisherClient { // Put together the "service stub" for // google.iam.v1.IAMPolicy. const iamPolicyStub = gaxGrpc.createStub( - protos.google.iam.v1.IAMPolicy, + opts.fallback + ? protos.lookupService('google.iam.v1.IAMPolicy') + : protos.google.iam.v1.IAMPolicy, opts ); @@ -186,18 +195,16 @@ class PublisherClient { 'testIamPermissions', ]; for (const methodName of iamPolicyStubMethods) { - this._innerApiCalls[methodName] = gax.createApiCall( - iamPolicyStub.then( - stub => - function() { - const args = Array.prototype.slice.call(arguments, 0); - return stub[methodName].apply(stub, args); - }, - err => - function() { - throw err; - } - ), + const innerCallPromise = iamPolicyStub.then( + stub => (...args) => { + return stub[methodName].apply(stub, args); + }, + err => () => { + throw err; + } + ); + this._innerApiCalls[methodName] = gaxModule.createApiCall( + innerCallPromise, defaults[methodName], this._descriptors.page[methodName] || this._descriptors.batching[methodName] @@ -207,7 +214,9 @@ class PublisherClient { // Put together the "service stub" for // google.pubsub.v1.Publisher. const publisherStub = gaxGrpc.createStub( - protos.google.pubsub.v1.Publisher, + opts.fallback + ? protos.lookupService('google.pubsub.v1.Publisher') + : protos.google.pubsub.v1.Publisher, opts ); @@ -223,18 +232,16 @@ class PublisherClient { 'deleteTopic', ]; for (const methodName of publisherStubMethods) { - this._innerApiCalls[methodName] = gax.createApiCall( - publisherStub.then( - stub => - function() { - const args = Array.prototype.slice.call(arguments, 0); - return stub[methodName].apply(stub, args); - }, - err => - function() { - throw err; - } - ), + const innerCallPromise = publisherStub.then( + stub => (...args) => { + return stub[methodName].apply(stub, args); + }, + err => () => { + throw err; + } + ); + this._innerApiCalls[methodName] = gaxModule.createApiCall( + innerCallPromise, defaults[methodName], this._descriptors.page[methodName] || this._descriptors.batching[methodName] diff --git a/handwritten/pubsub/src/v1/publisher_proto_list.json b/handwritten/pubsub/src/v1/publisher_proto_list.json new file mode 100644 index 00000000000..6e307cc9fa8 --- /dev/null +++ b/handwritten/pubsub/src/v1/publisher_proto_list.json @@ -0,0 +1,4 @@ +[ + "../../protos/google/iam/v1/iam_policy.proto", + "../../protos/google/pubsub/v1/pubsub.proto" +] diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 3d0c54d37fc..9749aa62bca 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -60,6 +60,16 @@ class SubscriberClient { opts = opts || {}; this._descriptors = {}; + if (global.isBrowser) { + // If we're in browser, we use gRPC fallback. + opts.fallback = true; + } + + // If we are in browser, we are already using fallback because of the + // "browser" field in package.json. + // But if we were explicitly requested to use fallback, let's do it now. + const gaxModule = !global.isBrowser && opts.fallback ? gax.fallback : gax; + const servicePath = opts.servicePath || opts.apiEndpoint || this.constructor.servicePath; @@ -76,40 +86,55 @@ class SubscriberClient { // Create a `gaxGrpc` object, with any grpc-specific options // sent to the client. opts.scopes = this.constructor.scopes; - const gaxGrpc = new gax.GrpcClient(opts); + const gaxGrpc = new gaxModule.GrpcClient(opts); // Save the auth object to the client, for use by other methods. this.auth = gaxGrpc.auth; // Determine the client header string. - const clientHeader = [ - `gl-node/${process.versions.node}`, - `grpc/${gaxGrpc.grpcVersion}`, - `gax/${gax.version}`, - `gapic/${VERSION}`, - ]; + const clientHeader = []; + + if (typeof process !== 'undefined' && 'versions' in process) { + clientHeader.push(`gl-node/${process.versions.node}`); + } + clientHeader.push(`gax/${gaxModule.version}`); + if (opts.fallback) { + clientHeader.push(`gl-web/${gaxModule.version}`); + } else { + clientHeader.push(`grpc/${gaxGrpc.grpcVersion}`); + } + clientHeader.push(`gapic/${VERSION}`); if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. + // For Node.js, pass the path to JSON proto file. + // For browsers, pass the JSON content. + + const nodejsProtoPath = path.join( + __dirname, + '..', + '..', + 'protos', + 'protos.json' + ); const protos = gaxGrpc.loadProto( - path.join(__dirname, '..', '..', 'protos'), - ['google/iam/v1/iam_policy.proto', 'google/pubsub/v1/pubsub.proto'] + opts.fallback ? require('../../protos/protos.json') : nodejsProtoPath ); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. // Create useful helper objects for these. this._pathTemplates = { - projectPathTemplate: new gax.PathTemplate('projects/{project}'), - snapshotPathTemplate: new gax.PathTemplate( + projectPathTemplate: new gaxModule.PathTemplate('projects/{project}'), + snapshotPathTemplate: new gaxModule.PathTemplate( 'projects/{project}/snapshots/{snapshot}' ), - subscriptionPathTemplate: new gax.PathTemplate( + subscriptionPathTemplate: new gaxModule.PathTemplate( 'projects/{project}/subscriptions/{subscription}' ), - topicPathTemplate: new gax.PathTemplate( + topicPathTemplate: new gaxModule.PathTemplate( 'projects/{project}/topics/{topic}' ), }; @@ -118,12 +143,12 @@ class SubscriberClient { // (e.g. 50 results at a time, with tokens to get subsequent // pages). Denote the keys used for pagination and results. this._descriptors.page = { - listSubscriptions: new gax.PageDescriptor( + listSubscriptions: new gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', 'subscriptions' ), - listSnapshots: new gax.PageDescriptor( + listSnapshots: new gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', 'snapshots' @@ -133,7 +158,9 @@ class SubscriberClient { // Some of the methods on this service provide streaming responses. // Provide descriptors for these. this._descriptors.stream = { - streamingPull: new gax.StreamDescriptor(gax.StreamType.BIDI_STREAMING), + streamingPull: new gaxModule.StreamDescriptor( + gax.StreamType.BIDI_STREAMING + ), }; // Put together the default options sent with requests. @@ -152,7 +179,9 @@ class SubscriberClient { // Put together the "service stub" for // google.iam.v1.IAMPolicy. const iamPolicyStub = gaxGrpc.createStub( - protos.google.iam.v1.IAMPolicy, + opts.fallback + ? protos.lookupService('google.iam.v1.IAMPolicy') + : protos.google.iam.v1.IAMPolicy, opts ); @@ -164,18 +193,16 @@ class SubscriberClient { 'testIamPermissions', ]; for (const methodName of iamPolicyStubMethods) { - this._innerApiCalls[methodName] = gax.createApiCall( - iamPolicyStub.then( - stub => - function() { - const args = Array.prototype.slice.call(arguments, 0); - return stub[methodName].apply(stub, args); - }, - err => - function() { - throw err; - } - ), + const innerCallPromise = iamPolicyStub.then( + stub => (...args) => { + return stub[methodName].apply(stub, args); + }, + err => () => { + throw err; + } + ); + this._innerApiCalls[methodName] = gaxModule.createApiCall( + innerCallPromise, defaults[methodName], this._descriptors.page[methodName] || this._descriptors.stream[methodName] @@ -185,7 +212,9 @@ class SubscriberClient { // Put together the "service stub" for // google.pubsub.v1.Subscriber. const subscriberStub = gaxGrpc.createStub( - protos.google.pubsub.v1.Subscriber, + opts.fallback + ? protos.lookupService('google.pubsub.v1.Subscriber') + : protos.google.pubsub.v1.Subscriber, opts ); @@ -209,18 +238,16 @@ class SubscriberClient { 'seek', ]; for (const methodName of subscriberStubMethods) { - this._innerApiCalls[methodName] = gax.createApiCall( - subscriberStub.then( - stub => - function() { - const args = Array.prototype.slice.call(arguments, 0); - return stub[methodName].apply(stub, args); - }, - err => - function() { - throw err; - } - ), + const innerCallPromise = subscriberStub.then( + stub => (...args) => { + return stub[methodName].apply(stub, args); + }, + err => () => { + throw err; + } + ); + this._innerApiCalls[methodName] = gaxModule.createApiCall( + innerCallPromise, defaults[methodName], this._descriptors.page[methodName] || this._descriptors.stream[methodName] diff --git a/handwritten/pubsub/src/v1/subscriber_proto_list.json b/handwritten/pubsub/src/v1/subscriber_proto_list.json new file mode 100644 index 00000000000..6e307cc9fa8 --- /dev/null +++ b/handwritten/pubsub/src/v1/subscriber_proto_list.json @@ -0,0 +1,4 @@ +[ + "../../protos/google/iam/v1/iam_policy.proto", + "../../protos/google/pubsub/v1/pubsub.proto" +] diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index f7dba0569ab..6b17a657f2d 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-08-26T11:13:07.048476Z", + "updateTime": "2019-09-06T20:16:48.226791Z", "sources": [ { "generator": { "name": "artman", - "version": "0.34.0", - "dockerImage": "googleapis/artman@sha256:38a27ba6245f96c3e86df7acb2ebcc33b4f186d9e475efe2d64303aec3d4e0ea" + "version": "0.36.2", + "dockerImage": "googleapis/artman@sha256:0e6f3a668cd68afc768ecbe08817cf6e56a0e64fcbdb1c58c3b97492d12418a1" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "b97af5f7fea49d533900b62cca171da0e49743de", - "internalRef": "265156479" + "sha": "960b76b1f0c46d12610088977d1129cc7405f3dc", + "internalRef": "267478864" } }, { diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 7bf3a4a4922..3142a3ab26e 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -2,6 +2,7 @@ import synthtool.gcp as gcp import logging import subprocess +import os logging.basicConfig(level=logging.DEBUG) @@ -50,7 +51,11 @@ 'toISOString)') # [END fix-dead-link] +# No browser support for TypeScript libraries yet +os.unlink('webpack.config.js') +os.unlink('src/browser.js') # Node.js specific cleanup subprocess.run(['npm', 'install']) subprocess.run(['npm', 'run', 'fix']) +subprocess.run(['npx', 'compileProtos', 'src']) diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index daa237ef586..3fbf891a462 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -45,6 +45,11 @@ describe('PublisherClient', () => { assert(client); }); + it('should create a client with gRPC fallback', () => { + const client = new pubsubModule.v1.PublisherClient({fallback: true}); + assert(client); + }); + describe('createTopic', () => { it('invokes createTopic without error', done => { const client = new pubsubModule.v1.PublisherClient({ @@ -698,6 +703,11 @@ describe('SubscriberClient', () => { assert(client); }); + it('should create a client with gRPC fallback', () => { + const client = new pubsubModule.v1.SubscriberClient({fallback: true}); + assert(client); + }); + describe('createSubscription', () => { it('invokes createSubscription without error', done => { const client = new pubsubModule.v1.SubscriberClient({ From 89e5b14060dccbf61c9d2f121d4d8ece2db74937 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 9 Sep 2019 10:55:39 -0700 Subject: [PATCH 0501/1115] fix: update IAM protos (#736) --- handwritten/pubsub/protos/protos.json | 15 +++++++++++++++ handwritten/pubsub/synth.metadata | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 603fccad993..dd95be73804 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1866,6 +1866,9 @@ }, "nested": { "IAMPolicy": { + "options": { + "(google.api.default_host)": "iam-meta-api.googleapis.com" + }, "methods": { "SetIamPolicy": { "requestType": "SetIamPolicyRequest", @@ -1910,6 +1913,10 @@ "resource": { "type": "string", "id": 1 + }, + "options": { + "type": "google.iam.v1.GetPolicyOptions", + "id": 2 } } }, @@ -1935,6 +1942,14 @@ } } }, + "GetPolicyOptions": { + "fields": { + "requestedPolicyVersion": { + "type": "int32", + "id": 1 + } + } + }, "Policy": { "fields": { "version": { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 6b17a657f2d..989beeea8a4 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-09-06T20:16:48.226791Z", + "updateTime": "2019-09-07T11:18:52.108530Z", "sources": [ { "generator": { From 24f6ca2e02324970ab3405c2fa1a1c9aa791a7d6 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 10 Sep 2019 12:27:02 -0400 Subject: [PATCH 0502/1115] fix: pull projectId from auth client with emulator (#731) --- handwritten/pubsub/src/pubsub.ts | 51 +++++++++--- handwritten/pubsub/test/pubsub.ts | 129 ++++++++++++++++-------------- 2 files changed, 108 insertions(+), 72 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index e09cb1b69d8..a9864538e5e 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -526,6 +526,7 @@ export class PubSub { if (!apiEndpoint && !process.env.PUBSUB_EMULATOR_HOST) { return; } + const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; const leadingProtocol = new RegExp('^https*://'); const trailingSlashes = new RegExp('/*$'); @@ -537,6 +538,10 @@ export class PubSub { this.options.port = baseUrlParts[1]; this.options.sslCreds = grpc.credentials.createInsecure(); this.isEmulator = true; + + if (!this.options.projectId && process.env.PUBSUB_PROJECT_ID) { + this.options.projectId = process.env.PUBSUB_PROJECT_ID; + } } getSnapshots(options?: PageOptions): Promise; @@ -887,28 +892,48 @@ export class PubSub { * @param {function} [callback] The callback function. */ getClient_(config: GetClientConfig, callback: GetClientCallback) { - const hasProjectId = - this.projectId && this.projectId !== PROJECT_ID_PLACEHOLDER; - if (!hasProjectId && !this.isEmulator) { - this.auth.getProjectId((err, projectId) => { - if (err) { - callback(err); - return; + this.getClientAsync_(config).then( + client => callback(null, client), + callback + ); + } + /** + * Get the PubSub client object. + * + * @private + * + * @param {object} config Configuration object. + * @param {object} config.gaxOpts GAX options. + * @param {function} config.method The gax method to call. + * @param {object} config.reqOpts Request options. + * @returns {Promise} + */ + async getClientAsync_(config: GetClientConfig): Promise { + if (!this.projectId || this.projectId === PROJECT_ID_PLACEHOLDER) { + let projectId; + + try { + projectId = await this.auth.getProjectId(); + } catch (e) { + if (!this.isEmulator) { + throw e; } - this.projectId = projectId!; - this.options.projectId = projectId!; + projectId = ''; + } - this.getClient_(config, callback); - }); - return; + this.projectId = projectId!; + this.options.projectId = projectId!; } + let gaxClient = this.api[config.client]; + if (!gaxClient) { // Lazily instantiate client. gaxClient = new v1[config.client](this.options) as gax.ClientStub; this.api[config.client] = gaxClient; } - callback(null, gaxClient); + + return gaxClient; } /** * Funnel all API requests through this method, to be sure we have a project diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index bcba89379bb..4e377a6d8ae 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -125,9 +125,10 @@ const v1Override = {}; let v1ClientOverrides: any = {}; function defineOverridableClient(clientName: string) { - function DefaultClient() {} - // tslint:disable-next-line no-any - (DefaultClient as any).scopes = []; + class DefaultClient { + static scopes = [] as string[]; + fakeMethod() {} + } Object.defineProperty(v1Override, clientName, { get() { @@ -1018,9 +1019,7 @@ describe('PubSub', () => { afterEach(() => sandbox.restore()); sandbox.stub(pubsub, 'auth').value({ - getProjectId: (callback: Function) => { - callback(null, PROJECT_ID); - }, + getProjectId: () => Promise.resolve(PROJECT_ID), }); // tslint:disable-next-line no-any @@ -1075,7 +1074,7 @@ describe('PubSub', () => { }); }); - describe('getClient_', () => { + describe('getClientAsync_', () => { const FAKE_CLIENT_INSTANCE = class {}; const CONFIG = ({ client: 'FakeClient', @@ -1083,78 +1082,68 @@ describe('PubSub', () => { beforeEach(() => { sandbox.stub(pubsub, 'auth').value({getProjectId: () => util.noop}); - v1ClientOverrides.FakeClient = FAKE_CLIENT_INSTANCE; }); + afterEach(() => sandbox.restore()); + describe('project ID', () => { beforeEach(() => { delete pubsub.projectId; pubsub.isEmulator = false; }); - it('should get and cache the project ID', done => { - sandbox.stub(pubsub, 'auth').value({ - getProjectId: (callback: Function) => { - assert.strictEqual(typeof callback, 'function'); - callback(null, PROJECT_ID); - }, - }); + it('should get and cache the project ID', async () => { + sandbox.stub(pubsub.auth, 'getProjectId').resolves(PROJECT_ID); - pubsub.getClient_(CONFIG, err => { - assert.ifError(err); - assert.strictEqual(pubsub.projectId, PROJECT_ID); - assert.strictEqual(pubsub.options.projectId, PROJECT_ID); - done(); - }); + await pubsub.getClientAsync_(CONFIG); + + assert.strictEqual(pubsub.projectId, PROJECT_ID); + assert.strictEqual(pubsub.options.projectId, PROJECT_ID); }); - it('should get the project ID if placeholder', done => { + it('should get the project ID if placeholder', async () => { pubsub.projectId = '{{projectId}}'; + sandbox.stub(pubsub.auth, 'getProjectId').resolves(PROJECT_ID); - sandbox.stub(pubsub, 'auth').value({ - getProjectId: () => { - done(); - }, - }); + await pubsub.getClientAsync_(CONFIG); - pubsub.getClient_(CONFIG, assert.ifError); + assert.strictEqual(pubsub.projectId, PROJECT_ID); }); - it('should return errors to the callback', done => { + it('should return auth errors that occur', async () => { const error = new Error('err'); - sandbox.stub(pubsub.auth, 'getProjectId').callsFake(callback => { - callback(error); - }); + sandbox.stub(pubsub.auth, 'getProjectId').rejects(error); - pubsub.getClient_(CONFIG, err => { - assert.strictEqual(err, error); - done(); - }); + try { + await pubsub.getClientAsync_(CONFIG); + throw new Error('getClientAsync_ should have thrown an error'); + } catch (e) { + assert.strictEqual(e, error); + } }); - it('should not get the project ID if already known', () => { - pubsub.projectId = PROJECT_ID; + it('should ignore auth errors when using the emulator', async () => { + pubsub.isEmulator = true; - pubsub.auth.getProjectId = () => { - throw new Error('getProjectId should not be called.'); - }; + const error = new Error('err'); + sandbox.stub(pubsub.auth, 'getProjectId').rejects(error); - pubsub.getClient_(CONFIG, assert.ifError); + await pubsub.getClientAsync_(CONFIG); + assert.strictEqual(pubsub.projectId, ''); }); - it('should not get the project ID if inside emulator', () => { - pubsub.isEmulator = true; + it('should not get the project ID if already known', async () => { + pubsub.projectId = PROJECT_ID; - pubsub.auth.getProjectId = () => { - throw new Error('getProjectId should not be called.'); - }; + const error = new Error('getProjectId should not be called.'); + sandbox.stub(pubsub.auth, 'getProjectId').rejects(error); - pubsub.getClient_(CONFIG, assert.ifError); + await pubsub.getClientAsync_(CONFIG); }); }); - it('should cache the client', done => { + it('should cache the client', async () => { delete pubsub.api.fakeClient; let numTimesFakeClientInstantiated = 0; @@ -1165,19 +1154,14 @@ describe('PubSub', () => { return FAKE_CLIENT_INSTANCE; }; - pubsub.getClient_(CONFIG, err => { - assert.ifError(err); - assert.strictEqual(pubsub.api.FakeClient, FAKE_CLIENT_INSTANCE); + await pubsub.getClientAsync_(CONFIG); + assert.strictEqual(pubsub.api.FakeClient, FAKE_CLIENT_INSTANCE); - pubsub.getClient_(CONFIG, err => { - assert.ifError(err); - assert.strictEqual(numTimesFakeClientInstantiated, 1); - done(); - }); - }); + await pubsub.getClientAsync_(CONFIG); + assert.strictEqual(numTimesFakeClientInstantiated, 1); }); - it('should return the correct client', done => { + it('should return the correct client', async () => { // tslint:disable-next-line only-arrow-functions no-any v1ClientOverrides.FakeClient = function( options: pubsubTypes.ClientConfig @@ -1186,12 +1170,39 @@ describe('PubSub', () => { return FAKE_CLIENT_INSTANCE; }; + const client = await pubsub.getClientAsync_(CONFIG); + assert.strictEqual(client, FAKE_CLIENT_INSTANCE); + }); + }); + + describe('getClient_', () => { + const FAKE_CLIENT_INSTANCE = ({} as unknown) as gax.ClientStub; + const CONFIG = ({ + client: 'FakeClient', + } as {}) as pubsubTypes.GetClientConfig; + + it('should get the client', done => { + sandbox + .stub(pubsub, 'getClientAsync_') + .withArgs(CONFIG) + .resolves(FAKE_CLIENT_INSTANCE); + pubsub.getClient_(CONFIG, (err, client) => { assert.ifError(err); assert.strictEqual(client, FAKE_CLIENT_INSTANCE); done(); }); }); + + it('should pass back any errors', done => { + const error = new Error('err'); + sandbox.stub(pubsub, 'getClientAsync_').rejects(error); + + pubsub.getClient_(CONFIG, err => { + assert.strictEqual(err, error); + done(); + }); + }); }); describe('request', () => { From 30951e253a5b1a261f111f30f6396cf8c38ffaeb Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 11 Sep 2019 06:40:35 -0700 Subject: [PATCH 0503/1115] chore: release 0.32.0 (#729) --- handwritten/pubsub/CHANGELOG.md | 15 +++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index d317127e027..64ccbd10466 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,21 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [0.32.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.31.1...v0.32.0) (2019-09-11) + + +### Bug Fixes + +* pull projectId from auth client with emulator ([#731](https://www.github.com/googleapis/nodejs-pubsub/issues/731)) ([3840cad](https://www.github.com/googleapis/nodejs-pubsub/commit/3840cad)) +* update IAM protos ([#736](https://www.github.com/googleapis/nodejs-pubsub/issues/736)) ([055fa33](https://www.github.com/googleapis/nodejs-pubsub/commit/055fa33)) + + +### Features + +* introduces DeadLetterPolicy ([e24c545](https://www.github.com/googleapis/nodejs-pubsub/commit/e24c545)) +* load protos from JSON, grpc-fallback support ([#730](https://www.github.com/googleapis/nodejs-pubsub/issues/730)) ([2071954](https://www.github.com/googleapis/nodejs-pubsub/commit/2071954)) +* update IAM protos ([#734](https://www.github.com/googleapis/nodejs-pubsub/issues/734)) ([91fa2ef](https://www.github.com/googleapis/nodejs-pubsub/commit/91fa2ef)) + ### [0.31.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.31.0...v0.31.1) (2019-08-27) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 073038c7dbd..7a1ab42b38c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.31.1", + "version": "0.32.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 0cc63b903e5c702ef83b5293442044a6a60bc78b Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Fri, 13 Sep 2019 10:03:12 -0700 Subject: [PATCH 0504/1115] chore(deps): update dependency google-gax to ^1.5.2 (#740) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7a1ab42b38c..3a61d1b2520 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -62,7 +62,7 @@ "async-each": "^1.0.1", "extend": "^3.0.2", "google-auth-library": "^5.0.0", - "google-gax": "^1.0.0", + "google-gax": "^1.5.2", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0", From 96651d804c22a22a9d264ddfbe2116d71f7f29a4 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Fri, 13 Sep 2019 10:19:46 -0700 Subject: [PATCH 0505/1115] chore: release 0.32.1 (#741) * updated CHANGELOG.md * updated package.json * updated samples/package.json * Update CHANGELOG.md --- handwritten/pubsub/CHANGELOG.md | 6 ++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 64ccbd10466..63566ef51ee 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,12 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [0.32.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.32.0...v0.32.1) (2019-09-13) + +### Updates + +* dependency `google-gax` updated to `^1.5.2` to make sure the new version is pulled. + ## [0.32.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.31.1...v0.32.0) (2019-09-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3a61d1b2520..898cd45eeb0 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.32.0", + "version": "0.32.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From a4cda5ce1a2166fd55af4336d24a8dbed0c013b8 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Mon, 16 Sep 2019 09:07:01 -0400 Subject: [PATCH 0506/1115] docs(subscription): fix batch options type reference (#744) --- handwritten/pubsub/src/subscriber.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 62c502f77e6..df599748189 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -201,7 +201,7 @@ export interface SubscriberOptions { * @property {number} [ackDeadline=10] Acknowledge deadline in seconds. If left * unset the initial value will be 10 seconds, but it will evolve into the * 99th percentile time it takes to acknowledge a message. - * @property {BatchingOptions} [batching] Request batching options. + * @property {BatchOptions} [batching] Request batching options. * @property {FlowControlOptions} [flowControl] Flow control options. * @property {MessageStreamOptions} [streamingOptions] Streaming options. */ From f4505c5437138198f02ecdcabdd77009c87f32f3 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Tue, 17 Sep 2019 12:18:55 -0700 Subject: [PATCH 0507/1115] build: switch to releasing with GitHub bot (#746) --- handwritten/pubsub/.github/release-please.yml | 1 + .../pubsub/.kokoro/continuous/node10/test.cfg | 28 ------------------- handwritten/pubsub/.kokoro/test.sh | 9 ------ 3 files changed, 1 insertion(+), 37 deletions(-) create mode 100644 handwritten/pubsub/.github/release-please.yml diff --git a/handwritten/pubsub/.github/release-please.yml b/handwritten/pubsub/.github/release-please.yml new file mode 100644 index 00000000000..22902da70ad --- /dev/null +++ b/handwritten/pubsub/.github/release-please.yml @@ -0,0 +1 @@ +releaseType: javascript diff --git a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg index fefee48ba76..468b8c7197a 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg @@ -7,31 +7,3 @@ before_action { } } } - -# tokens used by release-please to keep an up-to-date release PR. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-key-release-please" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-token-release-please" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-url-release-please" - } - } -} diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 67b63d811fb..9db11bb09d6 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -35,12 +35,3 @@ if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then else echo "coverage is only reported for Node $COVERAGE_NODE" fi - -# if release-please keys set, we kick off a task to update the release-PR. -if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then - npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ - --repo-url=googleapis/nodejs-pubsub \ - --package-name=@google-cloud/pubsub \ - --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ - --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please -fi From f98e8aa046e45de882978893042e38818c43a5ef Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 17 Sep 2019 17:13:01 -0400 Subject: [PATCH 0508/1115] chore!: set release level to GA (#745) --- handwritten/pubsub/.repo-metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json index f41ac8b9a18..ed687cd1957 100644 --- a/handwritten/pubsub/.repo-metadata.json +++ b/handwritten/pubsub/.repo-metadata.json @@ -4,10 +4,10 @@ "product_documentation": "https://cloud.google.com/pubsub/docs/", "client_documentation": "https://googleapis.dev/nodejs/pubsub/latest", "issue_tracker": "https://issuetracker.google.com/savedsearches/559741", - "release_level": "beta", + "release_level": "ga", "language": "nodejs", "repo": "googleapis/nodejs-pubsub", "distribution_name": "@google-cloud/pubsub", "api_id": "pubsub.googleapis.com", "requires_billing": true -} \ No newline at end of file +} From b43c4460e23109747b20d58a42939b5ea02a270f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 18 Sep 2019 05:43:29 -0700 Subject: [PATCH 0509/1115] docs: update README release level to GA (#748) --- handwritten/pubsub/.github/release-please.yml | 1 - handwritten/pubsub/README.md | 11 ++++++----- handwritten/pubsub/synth.metadata | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/.github/release-please.yml b/handwritten/pubsub/.github/release-please.yml index 22902da70ad..e69de29bb2d 100644 --- a/handwritten/pubsub/.github/release-please.yml +++ b/handwritten/pubsub/.github/release-please.yml @@ -1 +0,0 @@ -releaseType: javascript diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 2d51f66add2..f28e1d38afb 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -4,7 +4,7 @@ # [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) -[![release level](https://img.shields.io/badge/release%20level-beta-yellow.svg?style=flat)](https://cloud.google.com/terms/launch-stages) +[![release level](https://img.shields.io/badge/release%20level-general%20availability%20%28GA%29-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.org/package/@google-cloud/pubsub) [![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-pubsub/master.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-pubsub) @@ -103,11 +103,12 @@ also contains samples. This library follows [Semantic Versioning](http://semver.org/). +This library is considered to be **General Availability (GA)**. This means it +is stable; the code surface will not change in backwards-incompatible ways +unless absolutely necessary (e.g. because of critical security issues) or with +an extensive deprecation period. Issues and requests against **GA** libraries +are addressed with the highest priority. -This library is considered to be in **beta**. This means it is expected to be -mostly stable while we work toward a general availability release; however, -complete stability is not guaranteed. We will address issues and requests -against beta libraries with a high priority. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 989beeea8a4..fd7408b737c 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-09-07T11:18:52.108530Z", + "updateTime": "2019-09-18T11:25:10.499614Z", "sources": [ { "generator": { "name": "artman", - "version": "0.36.2", - "dockerImage": "googleapis/artman@sha256:0e6f3a668cd68afc768ecbe08817cf6e56a0e64fcbdb1c58c3b97492d12418a1" + "version": "0.36.3", + "dockerImage": "googleapis/artman@sha256:66ca01f27ef7dc50fbfb7743b67028115a6a8acf43b2d82f9fc826de008adac4" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "960b76b1f0c46d12610088977d1129cc7405f3dc", - "internalRef": "267478864" + "sha": "4aeb1260230bbf56c9d958ff28dfb3eba019fcd0", + "internalRef": "269598918" } }, { From fe3e90c957bb696a2f95374d2242fec92513d208 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 09:13:58 -0400 Subject: [PATCH 0510/1115] chore: release 1.0.0 (#749) --- handwritten/pubsub/CHANGELOG.md | 11 +++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 63566ef51ee..f6f76ca0cee 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,17 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [1.0.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.32.1...v1.0.0) (2019-09-18) + + +### ⚠ BREAKING CHANGES + +* set release level to GA (#745) + +### Miscellaneous Chores + +* set release level to GA ([#745](https://www.github.com/googleapis/nodejs-pubsub/issues/745)) ([2e90c5b](https://www.github.com/googleapis/nodejs-pubsub/commit/2e90c5b)) + ### [0.32.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.32.0...v0.32.1) (2019-09-13) ### Updates diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 898cd45eeb0..d8b38852ef4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "0.32.1", + "version": "1.0.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From e70809e04943e8dbcb3497f11b3e8b35aad6e019 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 23 Sep 2019 06:10:51 -0700 Subject: [PATCH 0511/1115] feat: .d.ts for protos (#755) --- handwritten/pubsub/.eslintignore | 1 + handwritten/pubsub/protos/protos.d.ts | 9637 ++++++++++ handwritten/pubsub/protos/protos.js | 23451 ++++++++++++++++++++++++ handwritten/pubsub/synth.metadata | 6 +- 4 files changed, 33092 insertions(+), 3 deletions(-) create mode 100644 handwritten/pubsub/protos/protos.d.ts create mode 100644 handwritten/pubsub/protos/protos.js diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index f0c7aead4bf..09b31fe735a 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -2,3 +2,4 @@ src/**/doc/* build/ docs/ +protos/ diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts new file mode 100644 index 00000000000..80bd6ad949d --- /dev/null +++ b/handwritten/pubsub/protos/protos.d.ts @@ -0,0 +1,9637 @@ +import * as $protobuf from "protobufjs"; +/** Namespace google. */ +export namespace google { + + /** Namespace pubsub. */ + namespace pubsub { + + /** Namespace v1. */ + namespace v1 { + + /** Represents a Publisher */ + class Publisher extends $protobuf.rpc.Service { + + /** + * Constructs a new Publisher service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new Publisher service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Publisher; + + /** + * Calls CreateTopic. + * @param request Topic message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public createTopic(request: google.pubsub.v1.ITopic, callback: google.pubsub.v1.Publisher.CreateTopicCallback): void; + + /** + * Calls CreateTopic. + * @param request Topic message or plain object + * @returns Promise + */ + public createTopic(request: google.pubsub.v1.ITopic): Promise; + + /** + * Calls UpdateTopic. + * @param request UpdateTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest, callback: google.pubsub.v1.Publisher.UpdateTopicCallback): void; + + /** + * Calls UpdateTopic. + * @param request UpdateTopicRequest message or plain object + * @returns Promise + */ + public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest): Promise; + + /** + * Calls Publish. + * @param request PublishRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PublishResponse + */ + public publish(request: google.pubsub.v1.IPublishRequest, callback: google.pubsub.v1.Publisher.PublishCallback): void; + + /** + * Calls Publish. + * @param request PublishRequest message or plain object + * @returns Promise + */ + public publish(request: google.pubsub.v1.IPublishRequest): Promise; + + /** + * Calls GetTopic. + * @param request GetTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public getTopic(request: google.pubsub.v1.IGetTopicRequest, callback: google.pubsub.v1.Publisher.GetTopicCallback): void; + + /** + * Calls GetTopic. + * @param request GetTopicRequest message or plain object + * @returns Promise + */ + public getTopic(request: google.pubsub.v1.IGetTopicRequest): Promise; + + /** + * Calls ListTopics. + * @param request ListTopicsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicsResponse + */ + public listTopics(request: google.pubsub.v1.IListTopicsRequest, callback: google.pubsub.v1.Publisher.ListTopicsCallback): void; + + /** + * Calls ListTopics. + * @param request ListTopicsRequest message or plain object + * @returns Promise + */ + public listTopics(request: google.pubsub.v1.IListTopicsRequest): Promise; + + /** + * Calls ListTopicSubscriptions. + * @param request ListTopicSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse + */ + public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest, callback: google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback): void; + + /** + * Calls ListTopicSubscriptions. + * @param request ListTopicSubscriptionsRequest message or plain object + * @returns Promise + */ + public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest): Promise; + + /** + * Calls ListTopicSnapshots. + * @param request ListTopicSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse + */ + public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest, callback: google.pubsub.v1.Publisher.ListTopicSnapshotsCallback): void; + + /** + * Calls ListTopicSnapshots. + * @param request ListTopicSnapshotsRequest message or plain object + * @returns Promise + */ + public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest): Promise; + + /** + * Calls DeleteTopic. + * @param request DeleteTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest, callback: google.pubsub.v1.Publisher.DeleteTopicCallback): void; + + /** + * Calls DeleteTopic. + * @param request DeleteTopicRequest message or plain object + * @returns Promise + */ + public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest): Promise; + } + + namespace Publisher { + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type CreateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type UpdateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * @param error Error, if any + * @param [response] PublishResponse + */ + type PublishCallback = (error: (Error|null), response?: google.pubsub.v1.PublishResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type GetTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * @param error Error, if any + * @param [response] ListTopicsResponse + */ + type ListTopicsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * @param error Error, if any + * @param [response] ListTopicSubscriptionsResponse + */ + type ListTopicSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSubscriptionsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * @param error Error, if any + * @param [response] ListTopicSnapshotsResponse + */ + type ListTopicSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSnapshotsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + } + + /** Properties of a MessageStoragePolicy. */ + interface IMessageStoragePolicy { + + /** MessageStoragePolicy allowedPersistenceRegions */ + allowedPersistenceRegions?: (string[]|null); + } + + /** Represents a MessageStoragePolicy. */ + class MessageStoragePolicy implements IMessageStoragePolicy { + + /** + * Constructs a new MessageStoragePolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); + + /** MessageStoragePolicy allowedPersistenceRegions. */ + public allowedPersistenceRegions: string[]; + + /** + * Creates a new MessageStoragePolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageStoragePolicy instance + */ + public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; + + /** + * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; + + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; + + /** + * Verifies a MessageStoragePolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageStoragePolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; + + /** + * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * @param message MessageStoragePolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MessageStoragePolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Topic. */ + interface ITopic { + + /** Topic name */ + name?: (string|null); + + /** Topic labels */ + labels?: ({ [k: string]: string }|null); + + /** Topic messageStoragePolicy */ + messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + + /** Topic kmsKeyName */ + kmsKeyName?: (string|null); + } + + /** Represents a Topic. */ + class Topic implements ITopic { + + /** + * Constructs a new Topic. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ITopic); + + /** Topic name. */ + public name: string; + + /** Topic labels. */ + public labels: { [k: string]: string }; + + /** Topic messageStoragePolicy. */ + public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + + /** Topic kmsKeyName. */ + public kmsKeyName: string; + + /** + * Creates a new Topic instance using the specified properties. + * @param [properties] Properties to set + * @returns Topic instance + */ + public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; + + /** + * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Topic message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; + + /** + * Decodes a Topic message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; + + /** + * Verifies a Topic message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Topic + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; + + /** + * Creates a plain object from a Topic message. Also converts values to other types if specified. + * @param message Topic + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Topic to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PubsubMessage. */ + interface IPubsubMessage { + + /** PubsubMessage data */ + data?: (Uint8Array|null); + + /** PubsubMessage attributes */ + attributes?: ({ [k: string]: string }|null); + + /** PubsubMessage messageId */ + messageId?: (string|null); + + /** PubsubMessage publishTime */ + publishTime?: (google.protobuf.ITimestamp|null); + + /** PubsubMessage orderingKey */ + orderingKey?: (string|null); + } + + /** Represents a PubsubMessage. */ + class PubsubMessage implements IPubsubMessage { + + /** + * Constructs a new PubsubMessage. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPubsubMessage); + + /** PubsubMessage data. */ + public data: Uint8Array; + + /** PubsubMessage attributes. */ + public attributes: { [k: string]: string }; + + /** PubsubMessage messageId. */ + public messageId: string; + + /** PubsubMessage publishTime. */ + public publishTime?: (google.protobuf.ITimestamp|null); + + /** PubsubMessage orderingKey. */ + public orderingKey: string; + + /** + * Creates a new PubsubMessage instance using the specified properties. + * @param [properties] Properties to set + * @returns PubsubMessage instance + */ + public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; + + /** + * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PubsubMessage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; + + /** + * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; + + /** + * Verifies a PubsubMessage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PubsubMessage + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; + + /** + * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * @param message PubsubMessage + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PubsubMessage to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetTopicRequest. */ + interface IGetTopicRequest { + + /** GetTopicRequest topic */ + topic?: (string|null); + } + + /** Represents a GetTopicRequest. */ + class GetTopicRequest implements IGetTopicRequest { + + /** + * Constructs a new GetTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetTopicRequest); + + /** GetTopicRequest topic. */ + public topic: string; + + /** + * Creates a new GetTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; + + /** + * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; + + /** + * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; + + /** + * Verifies a GetTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; + + /** + * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * @param message GetTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an UpdateTopicRequest. */ + interface IUpdateTopicRequest { + + /** UpdateTopicRequest topic */ + topic?: (google.pubsub.v1.ITopic|null); + + /** UpdateTopicRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } + + /** Represents an UpdateTopicRequest. */ + class UpdateTopicRequest implements IUpdateTopicRequest { + + /** + * Constructs a new UpdateTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); + + /** UpdateTopicRequest topic. */ + public topic?: (google.pubsub.v1.ITopic|null); + + /** UpdateTopicRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); + + /** + * Creates a new UpdateTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; + + /** + * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; + + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; + + /** + * Verifies an UpdateTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; + + /** + * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * @param message UpdateTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UpdateTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PublishRequest. */ + interface IPublishRequest { + + /** PublishRequest topic */ + topic?: (string|null); + + /** PublishRequest messages */ + messages?: (google.pubsub.v1.IPubsubMessage[]|null); + } + + /** Represents a PublishRequest. */ + class PublishRequest implements IPublishRequest { + + /** + * Constructs a new PublishRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPublishRequest); + + /** PublishRequest topic. */ + public topic: string; + + /** PublishRequest messages. */ + public messages: google.pubsub.v1.IPubsubMessage[]; + + /** + * Creates a new PublishRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns PublishRequest instance + */ + public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; + + /** + * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PublishRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PublishRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; + + /** + * Decodes a PublishRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PublishRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; + + /** + * Verifies a PublishRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PublishRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; + + /** + * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. + * @param message PublishRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PublishRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PublishResponse. */ + interface IPublishResponse { + + /** PublishResponse messageIds */ + messageIds?: (string[]|null); + } + + /** Represents a PublishResponse. */ + class PublishResponse implements IPublishResponse { + + /** + * Constructs a new PublishResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPublishResponse); + + /** PublishResponse messageIds. */ + public messageIds: string[]; + + /** + * Creates a new PublishResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns PublishResponse instance + */ + public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; + + /** + * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PublishResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; + + /** + * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; + + /** + * Verifies a PublishResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PublishResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; + + /** + * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * @param message PublishResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PublishResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicsRequest. */ + interface IListTopicsRequest { + + /** ListTopicsRequest project */ + project?: (string|null); + + /** ListTopicsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListTopicsRequest. */ + class ListTopicsRequest implements IListTopicsRequest { + + /** + * Constructs a new ListTopicsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicsRequest); + + /** ListTopicsRequest project. */ + public project: string; + + /** ListTopicsRequest pageSize. */ + public pageSize: number; + + /** ListTopicsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListTopicsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; + + /** + * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; + + /** + * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; + + /** + * Verifies a ListTopicsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; + + /** + * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * @param message ListTopicsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicsResponse. */ + interface IListTopicsResponse { + + /** ListTopicsResponse topics */ + topics?: (google.pubsub.v1.ITopic[]|null); + + /** ListTopicsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListTopicsResponse. */ + class ListTopicsResponse implements IListTopicsResponse { + + /** + * Constructs a new ListTopicsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicsResponse); + + /** ListTopicsResponse topics. */ + public topics: google.pubsub.v1.ITopic[]; + + /** ListTopicsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListTopicsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; + + /** + * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; + + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; + + /** + * Verifies a ListTopicsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; + + /** + * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * @param message ListTopicsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicSubscriptionsRequest. */ + interface IListTopicSubscriptionsRequest { + + /** ListTopicSubscriptionsRequest topic */ + topic?: (string|null); + + /** ListTopicSubscriptionsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicSubscriptionsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListTopicSubscriptionsRequest. */ + class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { + + /** + * Constructs a new ListTopicSubscriptionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); + + /** ListTopicSubscriptionsRequest topic. */ + public topic: string; + + /** ListTopicSubscriptionsRequest pageSize. */ + public pageSize: number; + + /** ListTopicSubscriptionsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSubscriptionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; + + /** + * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; + + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; + + /** + * Verifies a ListTopicSubscriptionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSubscriptionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; + + /** + * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicSubscriptionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicSubscriptionsResponse. */ + interface IListTopicSubscriptionsResponse { + + /** ListTopicSubscriptionsResponse subscriptions */ + subscriptions?: (string[]|null); + + /** ListTopicSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListTopicSubscriptionsResponse. */ + class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { + + /** + * Constructs a new ListTopicSubscriptionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); + + /** ListTopicSubscriptionsResponse subscriptions. */ + public subscriptions: string[]; + + /** ListTopicSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSubscriptionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; + + /** + * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; + + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; + + /** + * Verifies a ListTopicSubscriptionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSubscriptionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; + + /** + * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicSubscriptionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicSnapshotsRequest. */ + interface IListTopicSnapshotsRequest { + + /** ListTopicSnapshotsRequest topic */ + topic?: (string|null); + + /** ListTopicSnapshotsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicSnapshotsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListTopicSnapshotsRequest. */ + class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { + + /** + * Constructs a new ListTopicSnapshotsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); + + /** ListTopicSnapshotsRequest topic. */ + public topic: string; + + /** ListTopicSnapshotsRequest pageSize. */ + public pageSize: number; + + /** ListTopicSnapshotsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListTopicSnapshotsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSnapshotsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; + + /** + * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; + + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; + + /** + * Verifies a ListTopicSnapshotsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSnapshotsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; + + /** + * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicSnapshotsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListTopicSnapshotsResponse. */ + interface IListTopicSnapshotsResponse { + + /** ListTopicSnapshotsResponse snapshots */ + snapshots?: (string[]|null); + + /** ListTopicSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListTopicSnapshotsResponse. */ + class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { + + /** + * Constructs a new ListTopicSnapshotsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); + + /** ListTopicSnapshotsResponse snapshots. */ + public snapshots: string[]; + + /** ListTopicSnapshotsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListTopicSnapshotsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSnapshotsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; + + /** + * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; + + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; + + /** + * Verifies a ListTopicSnapshotsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSnapshotsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; + + /** + * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListTopicSnapshotsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DeleteTopicRequest. */ + interface IDeleteTopicRequest { + + /** DeleteTopicRequest topic */ + topic?: (string|null); + } + + /** Represents a DeleteTopicRequest. */ + class DeleteTopicRequest implements IDeleteTopicRequest { + + /** + * Constructs a new DeleteTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); + + /** DeleteTopicRequest topic. */ + public topic: string; + + /** + * Creates a new DeleteTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; + + /** + * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; + + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; + + /** + * Verifies a DeleteTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; + + /** + * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. + * @param message DeleteTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeleteTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Represents a Subscriber */ + class Subscriber extends $protobuf.rpc.Service { + + /** + * Constructs a new Subscriber service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new Subscriber service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; + + /** + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; + + /** + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @returns Promise + */ + public createSubscription(request: google.pubsub.v1.ISubscription): Promise; + + /** + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; + + /** + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @returns Promise + */ + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; + + /** + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; + + /** + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @returns Promise + */ + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; + + /** + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse + */ + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; + + /** + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @returns Promise + */ + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; + + /** + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; + + /** + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @returns Promise + */ + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; + + /** + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; + + /** + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @returns Promise + */ + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; + + /** + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; + + /** + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @returns Promise + */ + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; + + /** + * Calls Pull. + * @param request PullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PullResponse + */ + public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; + + /** + * Calls Pull. + * @param request PullRequest message or plain object + * @returns Promise + */ + public pull(request: google.pubsub.v1.IPullRequest): Promise; + + /** + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and StreamingPullResponse + */ + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; + + /** + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @returns Promise + */ + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; + + /** + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; + + /** + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @returns Promise + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; + + /** + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; + + /** + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @returns Promise + */ + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; + + /** + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse + */ + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; + + /** + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @returns Promise + */ + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; + + /** + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; + + /** + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @returns Promise + */ + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; + + /** + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; + + /** + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @returns Promise + */ + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; + + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; + + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @returns Promise + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; + + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @param callback Node-style callback called with the error, if any, and SeekResponse + */ + public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; + + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @returns Promise + */ + public seek(request: google.pubsub.v1.ISeekRequest): Promise; + } + + namespace Subscriber { + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * @param error Error, if any + * @param [response] ListSubscriptionsResponse + */ + type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * @param error Error, if any + * @param [response] Empty + */ + type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * @param error Error, if any + * @param [response] PullResponse + */ + type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * @param error Error, if any + * @param [response] StreamingPullResponse + */ + type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * @param error Error, if any + * @param [response] ListSnapshotsResponse + */ + type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * @param error Error, if any + * @param [response] SeekResponse + */ + type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; + } + + /** Properties of a Subscription. */ + interface ISubscription { + + /** Subscription name */ + name?: (string|null); + + /** Subscription topic */ + topic?: (string|null); + + /** Subscription pushConfig */ + pushConfig?: (google.pubsub.v1.IPushConfig|null); + + /** Subscription ackDeadlineSeconds */ + ackDeadlineSeconds?: (number|null); + + /** Subscription retainAckedMessages */ + retainAckedMessages?: (boolean|null); + + /** Subscription messageRetentionDuration */ + messageRetentionDuration?: (google.protobuf.IDuration|null); + + /** Subscription labels */ + labels?: ({ [k: string]: string }|null); + + /** Subscription enableMessageOrdering */ + enableMessageOrdering?: (boolean|null); + + /** Subscription expirationPolicy */ + expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + + /** Subscription deadLetterPolicy */ + deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); + } + + /** Represents a Subscription. */ + class Subscription implements ISubscription { + + /** + * Constructs a new Subscription. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISubscription); + + /** Subscription name. */ + public name: string; + + /** Subscription topic. */ + public topic: string; + + /** Subscription pushConfig. */ + public pushConfig?: (google.pubsub.v1.IPushConfig|null); + + /** Subscription ackDeadlineSeconds. */ + public ackDeadlineSeconds: number; + + /** Subscription retainAckedMessages. */ + public retainAckedMessages: boolean; + + /** Subscription messageRetentionDuration. */ + public messageRetentionDuration?: (google.protobuf.IDuration|null); + + /** Subscription labels. */ + public labels: { [k: string]: string }; + + /** Subscription enableMessageOrdering. */ + public enableMessageOrdering: boolean; + + /** Subscription expirationPolicy. */ + public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + + /** Subscription deadLetterPolicy. */ + public deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); + + /** + * Creates a new Subscription instance using the specified properties. + * @param [properties] Properties to set + * @returns Subscription instance + */ + public static create(properties?: google.pubsub.v1.ISubscription): google.pubsub.v1.Subscription; + + /** + * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @param message Subscription message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @param message Subscription message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Subscription message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Subscription; + + /** + * Decodes a Subscription message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Subscription; + + /** + * Verifies a Subscription message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Subscription message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Subscription + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Subscription; + + /** + * Creates a plain object from a Subscription message. Also converts values to other types if specified. + * @param message Subscription + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Subscription, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Subscription to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DeadLetterPolicy. */ + interface IDeadLetterPolicy { + + /** DeadLetterPolicy deadLetterTopic */ + deadLetterTopic?: (string|null); + + /** DeadLetterPolicy maxDeliveryAttempts */ + maxDeliveryAttempts?: (number|null); + } + + /** Represents a DeadLetterPolicy. */ + class DeadLetterPolicy implements IDeadLetterPolicy { + + /** + * Constructs a new DeadLetterPolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeadLetterPolicy); + + /** DeadLetterPolicy deadLetterTopic. */ + public deadLetterTopic: string; + + /** DeadLetterPolicy maxDeliveryAttempts. */ + public maxDeliveryAttempts: number; + + /** + * Creates a new DeadLetterPolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns DeadLetterPolicy instance + */ + public static create(properties?: google.pubsub.v1.IDeadLetterPolicy): google.pubsub.v1.DeadLetterPolicy; + + /** + * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @param message DeadLetterPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @param message DeadLetterPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeadLetterPolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeadLetterPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeadLetterPolicy; + + /** + * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeadLetterPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeadLetterPolicy; + + /** + * Verifies a DeadLetterPolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeadLetterPolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeadLetterPolicy; + + /** + * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. + * @param message DeadLetterPolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeadLetterPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeadLetterPolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an ExpirationPolicy. */ + interface IExpirationPolicy { + + /** ExpirationPolicy ttl */ + ttl?: (google.protobuf.IDuration|null); + } + + /** Represents an ExpirationPolicy. */ + class ExpirationPolicy implements IExpirationPolicy { + + /** + * Constructs a new ExpirationPolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IExpirationPolicy); + + /** ExpirationPolicy ttl. */ + public ttl?: (google.protobuf.IDuration|null); + + /** + * Creates a new ExpirationPolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns ExpirationPolicy instance + */ + public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; + + /** + * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; + + /** + * Verifies an ExpirationPolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExpirationPolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; + + /** + * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. + * @param message ExpirationPolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExpirationPolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PushConfig. */ + interface IPushConfig { + + /** PushConfig pushEndpoint */ + pushEndpoint?: (string|null); + + /** PushConfig attributes */ + attributes?: ({ [k: string]: string }|null); + + /** PushConfig oidcToken */ + oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + } + + /** Represents a PushConfig. */ + class PushConfig implements IPushConfig { + + /** + * Constructs a new PushConfig. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPushConfig); + + /** PushConfig pushEndpoint. */ + public pushEndpoint: string; + + /** PushConfig attributes. */ + public attributes: { [k: string]: string }; + + /** PushConfig oidcToken. */ + public oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + + /** PushConfig authenticationMethod. */ + public authenticationMethod?: "oidcToken"; + + /** + * Creates a new PushConfig instance using the specified properties. + * @param [properties] Properties to set + * @returns PushConfig instance + */ + public static create(properties?: google.pubsub.v1.IPushConfig): google.pubsub.v1.PushConfig; + + /** + * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @param message PushConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @param message PushConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PushConfig message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig; + + /** + * Decodes a PushConfig message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig; + + /** + * Verifies a PushConfig message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PushConfig + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig; + + /** + * Creates a plain object from a PushConfig message. Also converts values to other types if specified. + * @param message PushConfig + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PushConfig to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace PushConfig { + + /** Properties of an OidcToken. */ + interface IOidcToken { + + /** OidcToken serviceAccountEmail */ + serviceAccountEmail?: (string|null); + + /** OidcToken audience */ + audience?: (string|null); + } + + /** Represents an OidcToken. */ + class OidcToken implements IOidcToken { + + /** + * Constructs a new OidcToken. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.PushConfig.IOidcToken); + + /** OidcToken serviceAccountEmail. */ + public serviceAccountEmail: string; + + /** OidcToken audience. */ + public audience: string; + + /** + * Creates a new OidcToken instance using the specified properties. + * @param [properties] Properties to set + * @returns OidcToken instance + */ + public static create(properties?: google.pubsub.v1.PushConfig.IOidcToken): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @param message OidcToken message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @param message OidcToken message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an OidcToken message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Decodes an OidcToken message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Verifies an OidcToken message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OidcToken + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Creates a plain object from an OidcToken message. Also converts values to other types if specified. + * @param message OidcToken + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig.OidcToken, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this OidcToken to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a ReceivedMessage. */ + interface IReceivedMessage { + + /** ReceivedMessage ackId */ + ackId?: (string|null); + + /** ReceivedMessage message */ + message?: (google.pubsub.v1.IPubsubMessage|null); + + /** ReceivedMessage deliveryAttempt */ + deliveryAttempt?: (number|null); + } + + /** Represents a ReceivedMessage. */ + class ReceivedMessage implements IReceivedMessage { + + /** + * Constructs a new ReceivedMessage. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IReceivedMessage); + + /** ReceivedMessage ackId. */ + public ackId: string; + + /** ReceivedMessage message. */ + public message?: (google.pubsub.v1.IPubsubMessage|null); + + /** ReceivedMessage deliveryAttempt. */ + public deliveryAttempt: number; + + /** + * Creates a new ReceivedMessage instance using the specified properties. + * @param [properties] Properties to set + * @returns ReceivedMessage instance + */ + public static create(properties?: google.pubsub.v1.IReceivedMessage): google.pubsub.v1.ReceivedMessage; + + /** + * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @param message ReceivedMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @param message ReceivedMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ReceivedMessage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ReceivedMessage; + + /** + * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ReceivedMessage; + + /** + * Verifies a ReceivedMessage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ReceivedMessage + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ReceivedMessage; + + /** + * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. + * @param message ReceivedMessage + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ReceivedMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ReceivedMessage to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetSubscriptionRequest. */ + interface IGetSubscriptionRequest { + + /** GetSubscriptionRequest subscription */ + subscription?: (string|null); + } + + /** Represents a GetSubscriptionRequest. */ + class GetSubscriptionRequest implements IGetSubscriptionRequest { + + /** + * Constructs a new GetSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetSubscriptionRequest); + + /** GetSubscriptionRequest subscription. */ + public subscription: string; + + /** + * Creates a new GetSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetSubscriptionRequest): google.pubsub.v1.GetSubscriptionRequest; + + /** + * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @param message GetSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @param message GetSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSubscriptionRequest; + + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSubscriptionRequest; + + /** + * Verifies a GetSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSubscriptionRequest; + + /** + * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. + * @param message GetSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an UpdateSubscriptionRequest. */ + interface IUpdateSubscriptionRequest { + + /** UpdateSubscriptionRequest subscription */ + subscription?: (google.pubsub.v1.ISubscription|null); + + /** UpdateSubscriptionRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } + + /** Represents an UpdateSubscriptionRequest. */ + class UpdateSubscriptionRequest implements IUpdateSubscriptionRequest { + + /** + * Constructs a new UpdateSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateSubscriptionRequest); + + /** UpdateSubscriptionRequest subscription. */ + public subscription?: (google.pubsub.v1.ISubscription|null); + + /** UpdateSubscriptionRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); + + /** + * Creates a new UpdateSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateSubscriptionRequest): google.pubsub.v1.UpdateSubscriptionRequest; + + /** + * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @param message UpdateSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @param message UpdateSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSubscriptionRequest; + + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSubscriptionRequest; + + /** + * Verifies an UpdateSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSubscriptionRequest; + + /** + * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. + * @param message UpdateSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UpdateSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSubscriptionsRequest. */ + interface IListSubscriptionsRequest { + + /** ListSubscriptionsRequest project */ + project?: (string|null); + + /** ListSubscriptionsRequest pageSize */ + pageSize?: (number|null); + + /** ListSubscriptionsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListSubscriptionsRequest. */ + class ListSubscriptionsRequest implements IListSubscriptionsRequest { + + /** + * Constructs a new ListSubscriptionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSubscriptionsRequest); + + /** ListSubscriptionsRequest project. */ + public project: string; + + /** ListSubscriptionsRequest pageSize. */ + public pageSize: number; + + /** ListSubscriptionsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListSubscriptionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSubscriptionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSubscriptionsRequest): google.pubsub.v1.ListSubscriptionsRequest; + + /** + * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @param message ListSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @param message ListSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsRequest; + + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsRequest; + + /** + * Verifies a ListSubscriptionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSubscriptionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsRequest; + + /** + * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListSubscriptionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSubscriptionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSubscriptionsResponse. */ + interface IListSubscriptionsResponse { + + /** ListSubscriptionsResponse subscriptions */ + subscriptions?: (google.pubsub.v1.ISubscription[]|null); + + /** ListSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListSubscriptionsResponse. */ + class ListSubscriptionsResponse implements IListSubscriptionsResponse { + + /** + * Constructs a new ListSubscriptionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSubscriptionsResponse); + + /** ListSubscriptionsResponse subscriptions. */ + public subscriptions: google.pubsub.v1.ISubscription[]; + + /** ListSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListSubscriptionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSubscriptionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListSubscriptionsResponse): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @param message ListSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @param message ListSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Verifies a ListSubscriptionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSubscriptionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListSubscriptionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSubscriptionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DeleteSubscriptionRequest. */ + interface IDeleteSubscriptionRequest { + + /** DeleteSubscriptionRequest subscription */ + subscription?: (string|null); + } + + /** Represents a DeleteSubscriptionRequest. */ + class DeleteSubscriptionRequest implements IDeleteSubscriptionRequest { + + /** + * Constructs a new DeleteSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteSubscriptionRequest); + + /** DeleteSubscriptionRequest subscription. */ + public subscription: string; + + /** + * Creates a new DeleteSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteSubscriptionRequest): google.pubsub.v1.DeleteSubscriptionRequest; + + /** + * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @param message DeleteSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @param message DeleteSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSubscriptionRequest; + + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSubscriptionRequest; + + /** + * Verifies a DeleteSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSubscriptionRequest; + + /** + * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. + * @param message DeleteSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeleteSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ModifyPushConfigRequest. */ + interface IModifyPushConfigRequest { + + /** ModifyPushConfigRequest subscription */ + subscription?: (string|null); + + /** ModifyPushConfigRequest pushConfig */ + pushConfig?: (google.pubsub.v1.IPushConfig|null); + } + + /** Represents a ModifyPushConfigRequest. */ + class ModifyPushConfigRequest implements IModifyPushConfigRequest { + + /** + * Constructs a new ModifyPushConfigRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IModifyPushConfigRequest); + + /** ModifyPushConfigRequest subscription. */ + public subscription: string; + + /** ModifyPushConfigRequest pushConfig. */ + public pushConfig?: (google.pubsub.v1.IPushConfig|null); + + /** + * Creates a new ModifyPushConfigRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ModifyPushConfigRequest instance + */ + public static create(properties?: google.pubsub.v1.IModifyPushConfigRequest): google.pubsub.v1.ModifyPushConfigRequest; + + /** + * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @param message ModifyPushConfigRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @param message ModifyPushConfigRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyPushConfigRequest; + + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyPushConfigRequest; + + /** + * Verifies a ModifyPushConfigRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ModifyPushConfigRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyPushConfigRequest; + + /** + * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. + * @param message ModifyPushConfigRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ModifyPushConfigRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ModifyPushConfigRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PullRequest. */ + interface IPullRequest { + + /** PullRequest subscription */ + subscription?: (string|null); + + /** PullRequest returnImmediately */ + returnImmediately?: (boolean|null); + + /** PullRequest maxMessages */ + maxMessages?: (number|null); + } + + /** Represents a PullRequest. */ + class PullRequest implements IPullRequest { + + /** + * Constructs a new PullRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPullRequest); + + /** PullRequest subscription. */ + public subscription: string; + + /** PullRequest returnImmediately. */ + public returnImmediately: boolean; + + /** PullRequest maxMessages. */ + public maxMessages: number; + + /** + * Creates a new PullRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns PullRequest instance + */ + public static create(properties?: google.pubsub.v1.IPullRequest): google.pubsub.v1.PullRequest; + + /** + * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @param message PullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @param message PullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PullRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullRequest; + + /** + * Decodes a PullRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullRequest; + + /** + * Verifies a PullRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PullRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullRequest; + + /** + * Creates a plain object from a PullRequest message. Also converts values to other types if specified. + * @param message PullRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PullRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PullResponse. */ + interface IPullResponse { + + /** PullResponse receivedMessages */ + receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + } + + /** Represents a PullResponse. */ + class PullResponse implements IPullResponse { + + /** + * Constructs a new PullResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPullResponse); + + /** PullResponse receivedMessages. */ + public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + + /** + * Creates a new PullResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns PullResponse instance + */ + public static create(properties?: google.pubsub.v1.IPullResponse): google.pubsub.v1.PullResponse; + + /** + * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @param message PullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @param message PullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PullResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullResponse; + + /** + * Decodes a PullResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullResponse; + + /** + * Verifies a PullResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PullResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullResponse; + + /** + * Creates a plain object from a PullResponse message. Also converts values to other types if specified. + * @param message PullResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PullResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ModifyAckDeadlineRequest. */ + interface IModifyAckDeadlineRequest { + + /** ModifyAckDeadlineRequest subscription */ + subscription?: (string|null); + + /** ModifyAckDeadlineRequest ackIds */ + ackIds?: (string[]|null); + + /** ModifyAckDeadlineRequest ackDeadlineSeconds */ + ackDeadlineSeconds?: (number|null); + } + + /** Represents a ModifyAckDeadlineRequest. */ + class ModifyAckDeadlineRequest implements IModifyAckDeadlineRequest { + + /** + * Constructs a new ModifyAckDeadlineRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IModifyAckDeadlineRequest); + + /** ModifyAckDeadlineRequest subscription. */ + public subscription: string; + + /** ModifyAckDeadlineRequest ackIds. */ + public ackIds: string[]; + + /** ModifyAckDeadlineRequest ackDeadlineSeconds. */ + public ackDeadlineSeconds: number; + + /** + * Creates a new ModifyAckDeadlineRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ModifyAckDeadlineRequest instance + */ + public static create(properties?: google.pubsub.v1.IModifyAckDeadlineRequest): google.pubsub.v1.ModifyAckDeadlineRequest; + + /** + * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @param message ModifyAckDeadlineRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @param message ModifyAckDeadlineRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyAckDeadlineRequest; + + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyAckDeadlineRequest; + + /** + * Verifies a ModifyAckDeadlineRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ModifyAckDeadlineRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyAckDeadlineRequest; + + /** + * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. + * @param message ModifyAckDeadlineRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ModifyAckDeadlineRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ModifyAckDeadlineRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an AcknowledgeRequest. */ + interface IAcknowledgeRequest { + + /** AcknowledgeRequest subscription */ + subscription?: (string|null); + + /** AcknowledgeRequest ackIds */ + ackIds?: (string[]|null); + } + + /** Represents an AcknowledgeRequest. */ + class AcknowledgeRequest implements IAcknowledgeRequest { + + /** + * Constructs a new AcknowledgeRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IAcknowledgeRequest); + + /** AcknowledgeRequest subscription. */ + public subscription: string; + + /** AcknowledgeRequest ackIds. */ + public ackIds: string[]; + + /** + * Creates a new AcknowledgeRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns AcknowledgeRequest instance + */ + public static create(properties?: google.pubsub.v1.IAcknowledgeRequest): google.pubsub.v1.AcknowledgeRequest; + + /** + * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @param message AcknowledgeRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @param message AcknowledgeRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.AcknowledgeRequest; + + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.AcknowledgeRequest; + + /** + * Verifies an AcknowledgeRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AcknowledgeRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.AcknowledgeRequest; + + /** + * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. + * @param message AcknowledgeRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.AcknowledgeRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AcknowledgeRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a StreamingPullRequest. */ + interface IStreamingPullRequest { + + /** StreamingPullRequest subscription */ + subscription?: (string|null); + + /** StreamingPullRequest ackIds */ + ackIds?: (string[]|null); + + /** StreamingPullRequest modifyDeadlineSeconds */ + modifyDeadlineSeconds?: (number[]|null); + + /** StreamingPullRequest modifyDeadlineAckIds */ + modifyDeadlineAckIds?: (string[]|null); + + /** StreamingPullRequest streamAckDeadlineSeconds */ + streamAckDeadlineSeconds?: (number|null); + } + + /** Represents a StreamingPullRequest. */ + class StreamingPullRequest implements IStreamingPullRequest { + + /** + * Constructs a new StreamingPullRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IStreamingPullRequest); + + /** StreamingPullRequest subscription. */ + public subscription: string; + + /** StreamingPullRequest ackIds. */ + public ackIds: string[]; + + /** StreamingPullRequest modifyDeadlineSeconds. */ + public modifyDeadlineSeconds: number[]; + + /** StreamingPullRequest modifyDeadlineAckIds. */ + public modifyDeadlineAckIds: string[]; + + /** StreamingPullRequest streamAckDeadlineSeconds. */ + public streamAckDeadlineSeconds: number; + + /** + * Creates a new StreamingPullRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns StreamingPullRequest instance + */ + public static create(properties?: google.pubsub.v1.IStreamingPullRequest): google.pubsub.v1.StreamingPullRequest; + + /** + * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @param message StreamingPullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @param message StreamingPullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullRequest; + + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullRequest; + + /** + * Verifies a StreamingPullRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns StreamingPullRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullRequest; + + /** + * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. + * @param message StreamingPullRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this StreamingPullRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a StreamingPullResponse. */ + interface IStreamingPullResponse { + + /** StreamingPullResponse receivedMessages */ + receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + } + + /** Represents a StreamingPullResponse. */ + class StreamingPullResponse implements IStreamingPullResponse { + + /** + * Constructs a new StreamingPullResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IStreamingPullResponse); + + /** StreamingPullResponse receivedMessages. */ + public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + + /** + * Creates a new StreamingPullResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns StreamingPullResponse instance + */ + public static create(properties?: google.pubsub.v1.IStreamingPullResponse): google.pubsub.v1.StreamingPullResponse; + + /** + * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @param message StreamingPullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @param message StreamingPullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a StreamingPullResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns StreamingPullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse; + + /** + * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns StreamingPullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse; + + /** + * Verifies a StreamingPullResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns StreamingPullResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse; + + /** + * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. + * @param message StreamingPullResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this StreamingPullResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a CreateSnapshotRequest. */ + interface ICreateSnapshotRequest { + + /** CreateSnapshotRequest name */ + name?: (string|null); + + /** CreateSnapshotRequest subscription */ + subscription?: (string|null); + + /** CreateSnapshotRequest labels */ + labels?: ({ [k: string]: string }|null); + } + + /** Represents a CreateSnapshotRequest. */ + class CreateSnapshotRequest implements ICreateSnapshotRequest { + + /** + * Constructs a new CreateSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ICreateSnapshotRequest); + + /** CreateSnapshotRequest name. */ + public name: string; + + /** CreateSnapshotRequest subscription. */ + public subscription: string; + + /** CreateSnapshotRequest labels. */ + public labels: { [k: string]: string }; + + /** + * Creates a new CreateSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns CreateSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.ICreateSnapshotRequest): google.pubsub.v1.CreateSnapshotRequest; + + /** + * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @param message CreateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @param message CreateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CreateSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CreateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CreateSnapshotRequest; + + /** + * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CreateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CreateSnapshotRequest; + + /** + * Verifies a CreateSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CreateSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CreateSnapshotRequest; + + /** + * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. + * @param message CreateSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.CreateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CreateSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an UpdateSnapshotRequest. */ + interface IUpdateSnapshotRequest { + + /** UpdateSnapshotRequest snapshot */ + snapshot?: (google.pubsub.v1.ISnapshot|null); + + /** UpdateSnapshotRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } + + /** Represents an UpdateSnapshotRequest. */ + class UpdateSnapshotRequest implements IUpdateSnapshotRequest { + + /** + * Constructs a new UpdateSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateSnapshotRequest); + + /** UpdateSnapshotRequest snapshot. */ + public snapshot?: (google.pubsub.v1.ISnapshot|null); + + /** UpdateSnapshotRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); + + /** + * Creates a new UpdateSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateSnapshotRequest): google.pubsub.v1.UpdateSnapshotRequest; + + /** + * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @param message UpdateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @param message UpdateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSnapshotRequest; + + /** + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSnapshotRequest; + + /** + * Verifies an UpdateSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSnapshotRequest; + + /** + * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. + * @param message UpdateSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UpdateSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Snapshot. */ + interface ISnapshot { + + /** Snapshot name */ + name?: (string|null); + + /** Snapshot topic */ + topic?: (string|null); + + /** Snapshot expireTime */ + expireTime?: (google.protobuf.ITimestamp|null); + + /** Snapshot labels */ + labels?: ({ [k: string]: string }|null); + } + + /** Represents a Snapshot. */ + class Snapshot implements ISnapshot { + + /** + * Constructs a new Snapshot. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISnapshot); + + /** Snapshot name. */ + public name: string; + + /** Snapshot topic. */ + public topic: string; + + /** Snapshot expireTime. */ + public expireTime?: (google.protobuf.ITimestamp|null); + + /** Snapshot labels. */ + public labels: { [k: string]: string }; + + /** + * Creates a new Snapshot instance using the specified properties. + * @param [properties] Properties to set + * @returns Snapshot instance + */ + public static create(properties?: google.pubsub.v1.ISnapshot): google.pubsub.v1.Snapshot; + + /** + * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @param message Snapshot message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @param message Snapshot message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Snapshot message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Snapshot + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Snapshot; + + /** + * Decodes a Snapshot message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Snapshot + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Snapshot; + + /** + * Verifies a Snapshot message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Snapshot + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Snapshot; + + /** + * Creates a plain object from a Snapshot message. Also converts values to other types if specified. + * @param message Snapshot + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Snapshot, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Snapshot to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetSnapshotRequest. */ + interface IGetSnapshotRequest { + + /** GetSnapshotRequest snapshot */ + snapshot?: (string|null); + } + + /** Represents a GetSnapshotRequest. */ + class GetSnapshotRequest implements IGetSnapshotRequest { + + /** + * Constructs a new GetSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetSnapshotRequest); + + /** GetSnapshotRequest snapshot. */ + public snapshot: string; + + /** + * Creates a new GetSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetSnapshotRequest): google.pubsub.v1.GetSnapshotRequest; + + /** + * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @param message GetSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @param message GetSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSnapshotRequest; + + /** + * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSnapshotRequest; + + /** + * Verifies a GetSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSnapshotRequest; + + /** + * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. + * @param message GetSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSnapshotsRequest. */ + interface IListSnapshotsRequest { + + /** ListSnapshotsRequest project */ + project?: (string|null); + + /** ListSnapshotsRequest pageSize */ + pageSize?: (number|null); + + /** ListSnapshotsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListSnapshotsRequest. */ + class ListSnapshotsRequest implements IListSnapshotsRequest { + + /** + * Constructs a new ListSnapshotsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSnapshotsRequest); + + /** ListSnapshotsRequest project. */ + public project: string; + + /** ListSnapshotsRequest pageSize. */ + public pageSize: number; + + /** ListSnapshotsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListSnapshotsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSnapshotsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSnapshotsRequest): google.pubsub.v1.ListSnapshotsRequest; + + /** + * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @param message ListSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @param message ListSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSnapshotsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsRequest; + + /** + * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsRequest; + + /** + * Verifies a ListSnapshotsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSnapshotsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsRequest; + + /** + * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListSnapshotsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSnapshotsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSnapshotsResponse. */ + interface IListSnapshotsResponse { + + /** ListSnapshotsResponse snapshots */ + snapshots?: (google.pubsub.v1.ISnapshot[]|null); + + /** ListSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListSnapshotsResponse. */ + class ListSnapshotsResponse implements IListSnapshotsResponse { + + /** + * Constructs a new ListSnapshotsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSnapshotsResponse); + + /** ListSnapshotsResponse snapshots. */ + public snapshots: google.pubsub.v1.ISnapshot[]; + + /** ListSnapshotsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListSnapshotsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSnapshotsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListSnapshotsResponse): google.pubsub.v1.ListSnapshotsResponse; + + /** + * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @param message ListSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @param message ListSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSnapshotsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsResponse; + + /** + * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsResponse; + + /** + * Verifies a ListSnapshotsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSnapshotsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsResponse; + + /** + * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListSnapshotsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSnapshotsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DeleteSnapshotRequest. */ + interface IDeleteSnapshotRequest { + + /** DeleteSnapshotRequest snapshot */ + snapshot?: (string|null); + } + + /** Represents a DeleteSnapshotRequest. */ + class DeleteSnapshotRequest implements IDeleteSnapshotRequest { + + /** + * Constructs a new DeleteSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteSnapshotRequest); + + /** DeleteSnapshotRequest snapshot. */ + public snapshot: string; + + /** + * Creates a new DeleteSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteSnapshotRequest): google.pubsub.v1.DeleteSnapshotRequest; + + /** + * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @param message DeleteSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @param message DeleteSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSnapshotRequest; + + /** + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSnapshotRequest; + + /** + * Verifies a DeleteSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSnapshotRequest; + + /** + * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. + * @param message DeleteSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeleteSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a SeekRequest. */ + interface ISeekRequest { + + /** SeekRequest subscription */ + subscription?: (string|null); + + /** SeekRequest time */ + time?: (google.protobuf.ITimestamp|null); + + /** SeekRequest snapshot */ + snapshot?: (string|null); + } + + /** Represents a SeekRequest. */ + class SeekRequest implements ISeekRequest { + + /** + * Constructs a new SeekRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISeekRequest); + + /** SeekRequest subscription. */ + public subscription: string; + + /** SeekRequest time. */ + public time?: (google.protobuf.ITimestamp|null); + + /** SeekRequest snapshot. */ + public snapshot: string; + + /** SeekRequest target. */ + public target?: ("time"|"snapshot"); + + /** + * Creates a new SeekRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns SeekRequest instance + */ + public static create(properties?: google.pubsub.v1.ISeekRequest): google.pubsub.v1.SeekRequest; + + /** + * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @param message SeekRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @param message SeekRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SeekRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SeekRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekRequest; + + /** + * Decodes a SeekRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SeekRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekRequest; + + /** + * Verifies a SeekRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SeekRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekRequest; + + /** + * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. + * @param message SeekRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.SeekRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SeekRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a SeekResponse. */ + interface ISeekResponse { + } + + /** Represents a SeekResponse. */ + class SeekResponse implements ISeekResponse { + + /** + * Constructs a new SeekResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISeekResponse); + + /** + * Creates a new SeekResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns SeekResponse instance + */ + public static create(properties?: google.pubsub.v1.ISeekResponse): google.pubsub.v1.SeekResponse; + + /** + * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @param message SeekResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @param message SeekResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SeekResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SeekResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekResponse; + + /** + * Decodes a SeekResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SeekResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekResponse; + + /** + * Verifies a SeekResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SeekResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekResponse; + + /** + * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. + * @param message SeekResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.SeekResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SeekResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + } + + /** Namespace api. */ + namespace api { + + /** Properties of a Http. */ + interface IHttp { + + /** Http rules */ + rules?: (google.api.IHttpRule[]|null); + + /** Http fullyDecodeReservedExpansion */ + fullyDecodeReservedExpansion?: (boolean|null); + } + + /** Represents a Http. */ + class Http implements IHttp { + + /** + * Constructs a new Http. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IHttp); + + /** Http rules. */ + public rules: google.api.IHttpRule[]; + + /** Http fullyDecodeReservedExpansion. */ + public fullyDecodeReservedExpansion: boolean; + + /** + * Creates a new Http instance using the specified properties. + * @param [properties] Properties to set + * @returns Http instance + */ + public static create(properties?: google.api.IHttp): google.api.Http; + + /** + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Http message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; + + /** + * Decodes a Http message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; + + /** + * Verifies a Http message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Http message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Http + */ + public static fromObject(object: { [k: string]: any }): google.api.Http; + + /** + * Creates a plain object from a Http message. Also converts values to other types if specified. + * @param message Http + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Http to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a HttpRule. */ + interface IHttpRule { + + /** HttpRule selector */ + selector?: (string|null); + + /** HttpRule get */ + get?: (string|null); + + /** HttpRule put */ + put?: (string|null); + + /** HttpRule post */ + post?: (string|null); + + /** HttpRule delete */ + "delete"?: (string|null); + + /** HttpRule patch */ + patch?: (string|null); + + /** HttpRule custom */ + custom?: (google.api.ICustomHttpPattern|null); + + /** HttpRule body */ + body?: (string|null); + + /** HttpRule responseBody */ + responseBody?: (string|null); + + /** HttpRule additionalBindings */ + additionalBindings?: (google.api.IHttpRule[]|null); + } + + /** Represents a HttpRule. */ + class HttpRule implements IHttpRule { + + /** + * Constructs a new HttpRule. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IHttpRule); + + /** HttpRule selector. */ + public selector: string; + + /** HttpRule get. */ + public get: string; + + /** HttpRule put. */ + public put: string; + + /** HttpRule post. */ + public post: string; + + /** HttpRule delete. */ + public delete: string; + + /** HttpRule patch. */ + public patch: string; + + /** HttpRule custom. */ + public custom?: (google.api.ICustomHttpPattern|null); + + /** HttpRule body. */ + public body: string; + + /** HttpRule responseBody. */ + public responseBody: string; + + /** HttpRule additionalBindings. */ + public additionalBindings: google.api.IHttpRule[]; + + /** HttpRule pattern. */ + public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); + + /** + * Creates a new HttpRule instance using the specified properties. + * @param [properties] Properties to set + * @returns HttpRule instance + */ + public static create(properties?: google.api.IHttpRule): google.api.HttpRule; + + /** + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a HttpRule message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; + + /** + * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; + + /** + * Verifies a HttpRule message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns HttpRule + */ + public static fromObject(object: { [k: string]: any }): google.api.HttpRule; + + /** + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * @param message HttpRule + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this HttpRule to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a CustomHttpPattern. */ + interface ICustomHttpPattern { + + /** CustomHttpPattern kind */ + kind?: (string|null); + + /** CustomHttpPattern path */ + path?: (string|null); + } + + /** Represents a CustomHttpPattern. */ + class CustomHttpPattern implements ICustomHttpPattern { + + /** + * Constructs a new CustomHttpPattern. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ICustomHttpPattern); + + /** CustomHttpPattern kind. */ + public kind: string; + + /** CustomHttpPattern path. */ + public path: string; + + /** + * Creates a new CustomHttpPattern instance using the specified properties. + * @param [properties] Properties to set + * @returns CustomHttpPattern instance + */ + public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; + + /** + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; + + /** + * Verifies a CustomHttpPattern message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CustomHttpPattern + */ + public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; + + /** + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * @param message CustomHttpPattern + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CustomHttpPattern to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Namespace protobuf. */ + namespace protobuf { + + /** Properties of a FileDescriptorSet. */ + interface IFileDescriptorSet { + + /** FileDescriptorSet file */ + file?: (google.protobuf.IFileDescriptorProto[]|null); + } + + /** Represents a FileDescriptorSet. */ + class FileDescriptorSet implements IFileDescriptorSet { + + /** + * Constructs a new FileDescriptorSet. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorSet); + + /** FileDescriptorSet file. */ + public file: google.protobuf.IFileDescriptorProto[]; + + /** + * Creates a new FileDescriptorSet instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorSet instance + */ + public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; + + /** + * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; + + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; + + /** + * Verifies a FileDescriptorSet message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorSet + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; + + /** + * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. + * @param message FileDescriptorSet + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileDescriptorSet to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FileDescriptorProto. */ + interface IFileDescriptorProto { + + /** FileDescriptorProto name */ + name?: (string|null); + + /** FileDescriptorProto package */ + "package"?: (string|null); + + /** FileDescriptorProto dependency */ + dependency?: (string[]|null); + + /** FileDescriptorProto publicDependency */ + publicDependency?: (number[]|null); + + /** FileDescriptorProto weakDependency */ + weakDependency?: (number[]|null); + + /** FileDescriptorProto messageType */ + messageType?: (google.protobuf.IDescriptorProto[]|null); + + /** FileDescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + + /** FileDescriptorProto service */ + service?: (google.protobuf.IServiceDescriptorProto[]|null); + + /** FileDescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** FileDescriptorProto options */ + options?: (google.protobuf.IFileOptions|null); + + /** FileDescriptorProto sourceCodeInfo */ + sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + + /** FileDescriptorProto syntax */ + syntax?: (string|null); + } + + /** Represents a FileDescriptorProto. */ + class FileDescriptorProto implements IFileDescriptorProto { + + /** + * Constructs a new FileDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorProto); + + /** FileDescriptorProto name. */ + public name: string; + + /** FileDescriptorProto package. */ + public package: string; + + /** FileDescriptorProto dependency. */ + public dependency: string[]; + + /** FileDescriptorProto publicDependency. */ + public publicDependency: number[]; + + /** FileDescriptorProto weakDependency. */ + public weakDependency: number[]; + + /** FileDescriptorProto messageType. */ + public messageType: google.protobuf.IDescriptorProto[]; + + /** FileDescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; + + /** FileDescriptorProto service. */ + public service: google.protobuf.IServiceDescriptorProto[]; + + /** FileDescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; + + /** FileDescriptorProto options. */ + public options?: (google.protobuf.IFileOptions|null); + + /** FileDescriptorProto sourceCodeInfo. */ + public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + + /** FileDescriptorProto syntax. */ + public syntax: string; + + /** + * Creates a new FileDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; + + /** + * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; + + /** + * Verifies a FileDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; + + /** + * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. + * @param message FileDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DescriptorProto. */ + interface IDescriptorProto { + + /** DescriptorProto name */ + name?: (string|null); + + /** DescriptorProto field */ + field?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** DescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** DescriptorProto nestedType */ + nestedType?: (google.protobuf.IDescriptorProto[]|null); + + /** DescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + + /** DescriptorProto extensionRange */ + extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); + + /** DescriptorProto oneofDecl */ + oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); + + /** DescriptorProto options */ + options?: (google.protobuf.IMessageOptions|null); + + /** DescriptorProto reservedRange */ + reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); + + /** DescriptorProto reservedName */ + reservedName?: (string[]|null); + } + + /** Represents a DescriptorProto. */ + class DescriptorProto implements IDescriptorProto { + + /** + * Constructs a new DescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDescriptorProto); + + /** DescriptorProto name. */ + public name: string; + + /** DescriptorProto field. */ + public field: google.protobuf.IFieldDescriptorProto[]; + + /** DescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; + + /** DescriptorProto nestedType. */ + public nestedType: google.protobuf.IDescriptorProto[]; + + /** DescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; + + /** DescriptorProto extensionRange. */ + public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; + + /** DescriptorProto oneofDecl. */ + public oneofDecl: google.protobuf.IOneofDescriptorProto[]; + + /** DescriptorProto options. */ + public options?: (google.protobuf.IMessageOptions|null); + + /** DescriptorProto reservedRange. */ + public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; + + /** DescriptorProto reservedName. */ + public reservedName: string[]; + + /** + * Creates a new DescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns DescriptorProto instance + */ + public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; + + /** + * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; + + /** + * Verifies a DescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; + + /** + * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * @param message DescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace DescriptorProto { + + /** Properties of an ExtensionRange. */ + interface IExtensionRange { + + /** ExtensionRange start */ + start?: (number|null); + + /** ExtensionRange end */ + end?: (number|null); + + /** ExtensionRange options */ + options?: (google.protobuf.IExtensionRangeOptions|null); + } + + /** Represents an ExtensionRange. */ + class ExtensionRange implements IExtensionRange { + + /** + * Constructs a new ExtensionRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); + + /** ExtensionRange start. */ + public start: number; + + /** ExtensionRange end. */ + public end: number; + + /** ExtensionRange options. */ + public options?: (google.protobuf.IExtensionRangeOptions|null); + + /** + * Creates a new ExtensionRange instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRange instance + */ + public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExtensionRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Verifies an ExtensionRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; + + /** + * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. + * @param message ExtensionRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExtensionRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ReservedRange. */ + interface IReservedRange { + + /** ReservedRange start */ + start?: (number|null); + + /** ReservedRange end */ + end?: (number|null); + } + + /** Represents a ReservedRange. */ + class ReservedRange implements IReservedRange { + + /** + * Constructs a new ReservedRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); + + /** ReservedRange start. */ + public start: number; + + /** ReservedRange end. */ + public end: number; + + /** + * Creates a new ReservedRange instance using the specified properties. + * @param [properties] Properties to set + * @returns ReservedRange instance + */ + public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ReservedRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Decodes a ReservedRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Verifies a ReservedRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ReservedRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. + * @param message ReservedRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ReservedRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of an ExtensionRangeOptions. */ + interface IExtensionRangeOptions { + + /** ExtensionRangeOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an ExtensionRangeOptions. */ + class ExtensionRangeOptions implements IExtensionRangeOptions { + + /** + * Constructs a new ExtensionRangeOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IExtensionRangeOptions); + + /** ExtensionRangeOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRangeOptions instance + */ + public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; + + /** + * Verifies an ExtensionRangeOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRangeOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; + + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @param message ExtensionRangeOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExtensionRangeOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldDescriptorProto. */ + interface IFieldDescriptorProto { + + /** FieldDescriptorProto name */ + name?: (string|null); + + /** FieldDescriptorProto number */ + number?: (number|null); + + /** FieldDescriptorProto label */ + label?: (google.protobuf.FieldDescriptorProto.Label|null); + + /** FieldDescriptorProto type */ + type?: (google.protobuf.FieldDescriptorProto.Type|null); + + /** FieldDescriptorProto typeName */ + typeName?: (string|null); + + /** FieldDescriptorProto extendee */ + extendee?: (string|null); + + /** FieldDescriptorProto defaultValue */ + defaultValue?: (string|null); + + /** FieldDescriptorProto oneofIndex */ + oneofIndex?: (number|null); + + /** FieldDescriptorProto jsonName */ + jsonName?: (string|null); + + /** FieldDescriptorProto options */ + options?: (google.protobuf.IFieldOptions|null); + } + + /** Represents a FieldDescriptorProto. */ + class FieldDescriptorProto implements IFieldDescriptorProto { + + /** + * Constructs a new FieldDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldDescriptorProto); + + /** FieldDescriptorProto name. */ + public name: string; + + /** FieldDescriptorProto number. */ + public number: number; + + /** FieldDescriptorProto label. */ + public label: google.protobuf.FieldDescriptorProto.Label; + + /** FieldDescriptorProto type. */ + public type: google.protobuf.FieldDescriptorProto.Type; + + /** FieldDescriptorProto typeName. */ + public typeName: string; + + /** FieldDescriptorProto extendee. */ + public extendee: string; + + /** FieldDescriptorProto defaultValue. */ + public defaultValue: string; + + /** FieldDescriptorProto oneofIndex. */ + public oneofIndex: number; + + /** FieldDescriptorProto jsonName. */ + public jsonName: string; + + /** FieldDescriptorProto options. */ + public options?: (google.protobuf.IFieldOptions|null); + + /** + * Creates a new FieldDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; + + /** + * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; + + /** + * Verifies a FieldDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; + + /** + * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. + * @param message FieldDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FieldDescriptorProto { + + /** Type enum. */ + enum Type { + TYPE_DOUBLE = 1, + TYPE_FLOAT = 2, + TYPE_INT64 = 3, + TYPE_UINT64 = 4, + TYPE_INT32 = 5, + TYPE_FIXED64 = 6, + TYPE_FIXED32 = 7, + TYPE_BOOL = 8, + TYPE_STRING = 9, + TYPE_GROUP = 10, + TYPE_MESSAGE = 11, + TYPE_BYTES = 12, + TYPE_UINT32 = 13, + TYPE_ENUM = 14, + TYPE_SFIXED32 = 15, + TYPE_SFIXED64 = 16, + TYPE_SINT32 = 17, + TYPE_SINT64 = 18 + } + + /** Label enum. */ + enum Label { + LABEL_OPTIONAL = 1, + LABEL_REQUIRED = 2, + LABEL_REPEATED = 3 + } + } + + /** Properties of an OneofDescriptorProto. */ + interface IOneofDescriptorProto { + + /** OneofDescriptorProto name */ + name?: (string|null); + + /** OneofDescriptorProto options */ + options?: (google.protobuf.IOneofOptions|null); + } + + /** Represents an OneofDescriptorProto. */ + class OneofDescriptorProto implements IOneofDescriptorProto { + + /** + * Constructs a new OneofDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofDescriptorProto); + + /** OneofDescriptorProto name. */ + public name: string; + + /** OneofDescriptorProto options. */ + public options?: (google.protobuf.IOneofOptions|null); + + /** + * Creates a new OneofDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofDescriptorProto instance + */ + public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; + + /** + * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; + + /** + * Verifies an OneofDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; + + /** + * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. + * @param message OneofDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this OneofDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumDescriptorProto. */ + interface IEnumDescriptorProto { + + /** EnumDescriptorProto name */ + name?: (string|null); + + /** EnumDescriptorProto value */ + value?: (google.protobuf.IEnumValueDescriptorProto[]|null); + + /** EnumDescriptorProto options */ + options?: (google.protobuf.IEnumOptions|null); + + /** EnumDescriptorProto reservedRange */ + reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); + + /** EnumDescriptorProto reservedName */ + reservedName?: (string[]|null); + } + + /** Represents an EnumDescriptorProto. */ + class EnumDescriptorProto implements IEnumDescriptorProto { + + /** + * Constructs a new EnumDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumDescriptorProto); + + /** EnumDescriptorProto name. */ + public name: string; + + /** EnumDescriptorProto value. */ + public value: google.protobuf.IEnumValueDescriptorProto[]; + + /** EnumDescriptorProto options. */ + public options?: (google.protobuf.IEnumOptions|null); + + /** EnumDescriptorProto reservedRange. */ + public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; + + /** EnumDescriptorProto reservedName. */ + public reservedName: string[]; + + /** + * Creates a new EnumDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; + + /** + * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; + + /** + * Verifies an EnumDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; + + /** + * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. + * @param message EnumDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace EnumDescriptorProto { + + /** Properties of an EnumReservedRange. */ + interface IEnumReservedRange { + + /** EnumReservedRange start */ + start?: (number|null); + + /** EnumReservedRange end */ + end?: (number|null); + } + + /** Represents an EnumReservedRange. */ + class EnumReservedRange implements IEnumReservedRange { + + /** + * Constructs a new EnumReservedRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); + + /** EnumReservedRange start. */ + public start: number; + + /** EnumReservedRange end. */ + public end: number; + + /** + * Creates a new EnumReservedRange instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumReservedRange instance + */ + public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Verifies an EnumReservedRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumReservedRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * @param message EnumReservedRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumReservedRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of an EnumValueDescriptorProto. */ + interface IEnumValueDescriptorProto { + + /** EnumValueDescriptorProto name */ + name?: (string|null); + + /** EnumValueDescriptorProto number */ + number?: (number|null); + + /** EnumValueDescriptorProto options */ + options?: (google.protobuf.IEnumValueOptions|null); + } + + /** Represents an EnumValueDescriptorProto. */ + class EnumValueDescriptorProto implements IEnumValueDescriptorProto { + + /** + * Constructs a new EnumValueDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueDescriptorProto); + + /** EnumValueDescriptorProto name. */ + public name: string; + + /** EnumValueDescriptorProto number. */ + public number: number; + + /** EnumValueDescriptorProto options. */ + public options?: (google.protobuf.IEnumValueOptions|null); + + /** + * Creates a new EnumValueDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; + + /** + * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; + + /** + * Verifies an EnumValueDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; + + /** + * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. + * @param message EnumValueDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumValueDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ServiceDescriptorProto. */ + interface IServiceDescriptorProto { + + /** ServiceDescriptorProto name */ + name?: (string|null); + + /** ServiceDescriptorProto method */ + method?: (google.protobuf.IMethodDescriptorProto[]|null); + + /** ServiceDescriptorProto options */ + options?: (google.protobuf.IServiceOptions|null); + } + + /** Represents a ServiceDescriptorProto. */ + class ServiceDescriptorProto implements IServiceDescriptorProto { + + /** + * Constructs a new ServiceDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceDescriptorProto); + + /** ServiceDescriptorProto name. */ + public name: string; + + /** ServiceDescriptorProto method. */ + public method: google.protobuf.IMethodDescriptorProto[]; + + /** ServiceDescriptorProto options. */ + public options?: (google.protobuf.IServiceOptions|null); + + /** + * Creates a new ServiceDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceDescriptorProto instance + */ + public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; + + /** + * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; + + /** + * Verifies a ServiceDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; + + /** + * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. + * @param message ServiceDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ServiceDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a MethodDescriptorProto. */ + interface IMethodDescriptorProto { + + /** MethodDescriptorProto name */ + name?: (string|null); + + /** MethodDescriptorProto inputType */ + inputType?: (string|null); + + /** MethodDescriptorProto outputType */ + outputType?: (string|null); + + /** MethodDescriptorProto options */ + options?: (google.protobuf.IMethodOptions|null); + + /** MethodDescriptorProto clientStreaming */ + clientStreaming?: (boolean|null); + + /** MethodDescriptorProto serverStreaming */ + serverStreaming?: (boolean|null); + } + + /** Represents a MethodDescriptorProto. */ + class MethodDescriptorProto implements IMethodDescriptorProto { + + /** + * Constructs a new MethodDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodDescriptorProto); + + /** MethodDescriptorProto name. */ + public name: string; + + /** MethodDescriptorProto inputType. */ + public inputType: string; + + /** MethodDescriptorProto outputType. */ + public outputType: string; + + /** MethodDescriptorProto options. */ + public options?: (google.protobuf.IMethodOptions|null); + + /** MethodDescriptorProto clientStreaming. */ + public clientStreaming: boolean; + + /** MethodDescriptorProto serverStreaming. */ + public serverStreaming: boolean; + + /** + * Creates a new MethodDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodDescriptorProto instance + */ + public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; + + /** + * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; + + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; + + /** + * Verifies a MethodDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; + + /** + * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. + * @param message MethodDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MethodDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FileOptions. */ + interface IFileOptions { + + /** FileOptions javaPackage */ + javaPackage?: (string|null); + + /** FileOptions javaOuterClassname */ + javaOuterClassname?: (string|null); + + /** FileOptions javaMultipleFiles */ + javaMultipleFiles?: (boolean|null); + + /** FileOptions javaGenerateEqualsAndHash */ + javaGenerateEqualsAndHash?: (boolean|null); + + /** FileOptions javaStringCheckUtf8 */ + javaStringCheckUtf8?: (boolean|null); + + /** FileOptions optimizeFor */ + optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|null); + + /** FileOptions goPackage */ + goPackage?: (string|null); + + /** FileOptions ccGenericServices */ + ccGenericServices?: (boolean|null); + + /** FileOptions javaGenericServices */ + javaGenericServices?: (boolean|null); + + /** FileOptions pyGenericServices */ + pyGenericServices?: (boolean|null); + + /** FileOptions phpGenericServices */ + phpGenericServices?: (boolean|null); + + /** FileOptions deprecated */ + deprecated?: (boolean|null); + + /** FileOptions ccEnableArenas */ + ccEnableArenas?: (boolean|null); + + /** FileOptions objcClassPrefix */ + objcClassPrefix?: (string|null); + + /** FileOptions csharpNamespace */ + csharpNamespace?: (string|null); + + /** FileOptions swiftPrefix */ + swiftPrefix?: (string|null); + + /** FileOptions phpClassPrefix */ + phpClassPrefix?: (string|null); + + /** FileOptions phpNamespace */ + phpNamespace?: (string|null); + + /** FileOptions phpMetadataNamespace */ + phpMetadataNamespace?: (string|null); + + /** FileOptions rubyPackage */ + rubyPackage?: (string|null); + + /** FileOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a FileOptions. */ + class FileOptions implements IFileOptions { + + /** + * Constructs a new FileOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileOptions); + + /** FileOptions javaPackage. */ + public javaPackage: string; + + /** FileOptions javaOuterClassname. */ + public javaOuterClassname: string; + + /** FileOptions javaMultipleFiles. */ + public javaMultipleFiles: boolean; + + /** FileOptions javaGenerateEqualsAndHash. */ + public javaGenerateEqualsAndHash: boolean; + + /** FileOptions javaStringCheckUtf8. */ + public javaStringCheckUtf8: boolean; + + /** FileOptions optimizeFor. */ + public optimizeFor: google.protobuf.FileOptions.OptimizeMode; + + /** FileOptions goPackage. */ + public goPackage: string; + + /** FileOptions ccGenericServices. */ + public ccGenericServices: boolean; + + /** FileOptions javaGenericServices. */ + public javaGenericServices: boolean; + + /** FileOptions pyGenericServices. */ + public pyGenericServices: boolean; + + /** FileOptions phpGenericServices. */ + public phpGenericServices: boolean; + + /** FileOptions deprecated. */ + public deprecated: boolean; + + /** FileOptions ccEnableArenas. */ + public ccEnableArenas: boolean; + + /** FileOptions objcClassPrefix. */ + public objcClassPrefix: string; + + /** FileOptions csharpNamespace. */ + public csharpNamespace: string; + + /** FileOptions swiftPrefix. */ + public swiftPrefix: string; + + /** FileOptions phpClassPrefix. */ + public phpClassPrefix: string; + + /** FileOptions phpNamespace. */ + public phpNamespace: string; + + /** FileOptions phpMetadataNamespace. */ + public phpMetadataNamespace: string; + + /** FileOptions rubyPackage. */ + public rubyPackage: string; + + /** FileOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new FileOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FileOptions instance + */ + public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; + + /** + * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FileOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; + + /** + * Decodes a FileOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; + + /** + * Verifies a FileOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; + + /** + * Creates a plain object from a FileOptions message. Also converts values to other types if specified. + * @param message FileOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FileOptions { + + /** OptimizeMode enum. */ + enum OptimizeMode { + SPEED = 1, + CODE_SIZE = 2, + LITE_RUNTIME = 3 + } + } + + /** Properties of a MessageOptions. */ + interface IMessageOptions { + + /** MessageOptions messageSetWireFormat */ + messageSetWireFormat?: (boolean|null); + + /** MessageOptions noStandardDescriptorAccessor */ + noStandardDescriptorAccessor?: (boolean|null); + + /** MessageOptions deprecated */ + deprecated?: (boolean|null); + + /** MessageOptions mapEntry */ + mapEntry?: (boolean|null); + + /** MessageOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a MessageOptions. */ + class MessageOptions implements IMessageOptions { + + /** + * Constructs a new MessageOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMessageOptions); + + /** MessageOptions messageSetWireFormat. */ + public messageSetWireFormat: boolean; + + /** MessageOptions noStandardDescriptorAccessor. */ + public noStandardDescriptorAccessor: boolean; + + /** MessageOptions deprecated. */ + public deprecated: boolean; + + /** MessageOptions mapEntry. */ + public mapEntry: boolean; + + /** MessageOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new MessageOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageOptions instance + */ + public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; + + /** + * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MessageOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; + + /** + * Decodes a MessageOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; + + /** + * Verifies a MessageOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; + + /** + * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. + * @param message MessageOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MessageOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldOptions. */ + interface IFieldOptions { + + /** FieldOptions ctype */ + ctype?: (google.protobuf.FieldOptions.CType|null); + + /** FieldOptions packed */ + packed?: (boolean|null); + + /** FieldOptions jstype */ + jstype?: (google.protobuf.FieldOptions.JSType|null); + + /** FieldOptions lazy */ + lazy?: (boolean|null); + + /** FieldOptions deprecated */ + deprecated?: (boolean|null); + + /** FieldOptions weak */ + weak?: (boolean|null); + + /** FieldOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents a FieldOptions. */ + class FieldOptions implements IFieldOptions { + + /** + * Constructs a new FieldOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldOptions); + + /** FieldOptions ctype. */ + public ctype: google.protobuf.FieldOptions.CType; + + /** FieldOptions packed. */ + public packed: boolean; + + /** FieldOptions jstype. */ + public jstype: google.protobuf.FieldOptions.JSType; + + /** FieldOptions lazy. */ + public lazy: boolean; + + /** FieldOptions deprecated. */ + public deprecated: boolean; + + /** FieldOptions weak. */ + public weak: boolean; + + /** FieldOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new FieldOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldOptions instance + */ + public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; + + /** + * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; + + /** + * Decodes a FieldOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; + + /** + * Verifies a FieldOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; + + /** + * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. + * @param message FieldOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace FieldOptions { + + /** CType enum. */ + enum CType { + STRING = 0, + CORD = 1, + STRING_PIECE = 2 + } + + /** JSType enum. */ + enum JSType { + JS_NORMAL = 0, + JS_STRING = 1, + JS_NUMBER = 2 + } + } + + /** Properties of an OneofOptions. */ + interface IOneofOptions { + + /** OneofOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an OneofOptions. */ + class OneofOptions implements IOneofOptions { + + /** + * Constructs a new OneofOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofOptions); + + /** OneofOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new OneofOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofOptions instance + */ + public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; + + /** + * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an OneofOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; + + /** + * Decodes an OneofOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; + + /** + * Verifies an OneofOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; + + /** + * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. + * @param message OneofOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this OneofOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumOptions. */ + interface IEnumOptions { + + /** EnumOptions allowAlias */ + allowAlias?: (boolean|null); + + /** EnumOptions deprecated */ + deprecated?: (boolean|null); + + /** EnumOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an EnumOptions. */ + class EnumOptions implements IEnumOptions { + + /** + * Constructs a new EnumOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumOptions); + + /** EnumOptions allowAlias. */ + public allowAlias: boolean; + + /** EnumOptions deprecated. */ + public deprecated: boolean; + + /** EnumOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new EnumOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumOptions instance + */ + public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; + + /** + * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; + + /** + * Decodes an EnumOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; + + /** + * Verifies an EnumOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; + + /** + * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. + * @param message EnumOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an EnumValueOptions. */ + interface IEnumValueOptions { + + /** EnumValueOptions deprecated */ + deprecated?: (boolean|null); + + /** EnumValueOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an EnumValueOptions. */ + class EnumValueOptions implements IEnumValueOptions { + + /** + * Constructs a new EnumValueOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueOptions); + + /** EnumValueOptions deprecated. */ + public deprecated: boolean; + + /** EnumValueOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new EnumValueOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueOptions instance + */ + public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; + + /** + * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; + + /** + * Verifies an EnumValueOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; + + /** + * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. + * @param message EnumValueOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumValueOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ServiceOptions. */ + interface IServiceOptions { + + /** ServiceOptions deprecated */ + deprecated?: (boolean|null); + + /** ServiceOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** ServiceOptions .google.api.defaultHost */ + ".google.api.defaultHost"?: (string|null); + + /** ServiceOptions .google.api.oauthScopes */ + ".google.api.oauthScopes"?: (string|null); + } + + /** Represents a ServiceOptions. */ + class ServiceOptions implements IServiceOptions { + + /** + * Constructs a new ServiceOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceOptions); + + /** ServiceOptions deprecated. */ + public deprecated: boolean; + + /** ServiceOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new ServiceOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceOptions instance + */ + public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; + + /** + * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; + + /** + * Verifies a ServiceOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; + + /** + * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. + * @param message ServiceOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ServiceOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a MethodOptions. */ + interface IMethodOptions { + + /** MethodOptions deprecated */ + deprecated?: (boolean|null); + + /** MethodOptions idempotencyLevel */ + idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|null); + + /** MethodOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** MethodOptions .google.api.http */ + ".google.api.http"?: (google.api.IHttpRule|null); + + /** MethodOptions .google.api.methodSignature */ + ".google.api.methodSignature"?: (string[]|null); + } + + /** Represents a MethodOptions. */ + class MethodOptions implements IMethodOptions { + + /** + * Constructs a new MethodOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodOptions); + + /** MethodOptions deprecated. */ + public deprecated: boolean; + + /** MethodOptions idempotencyLevel. */ + public idempotencyLevel: google.protobuf.MethodOptions.IdempotencyLevel; + + /** MethodOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new MethodOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodOptions instance + */ + public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; + + /** + * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; + + /** + * Decodes a MethodOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; + + /** + * Verifies a MethodOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; + + /** + * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. + * @param message MethodOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MethodOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace MethodOptions { + + /** IdempotencyLevel enum. */ + enum IdempotencyLevel { + IDEMPOTENCY_UNKNOWN = 0, + NO_SIDE_EFFECTS = 1, + IDEMPOTENT = 2 + } + } + + /** Properties of an UninterpretedOption. */ + interface IUninterpretedOption { + + /** UninterpretedOption name */ + name?: (google.protobuf.UninterpretedOption.INamePart[]|null); + + /** UninterpretedOption identifierValue */ + identifierValue?: (string|null); + + /** UninterpretedOption positiveIntValue */ + positiveIntValue?: (number|Long|null); + + /** UninterpretedOption negativeIntValue */ + negativeIntValue?: (number|Long|null); + + /** UninterpretedOption doubleValue */ + doubleValue?: (number|null); + + /** UninterpretedOption stringValue */ + stringValue?: (Uint8Array|null); + + /** UninterpretedOption aggregateValue */ + aggregateValue?: (string|null); + } + + /** Represents an UninterpretedOption. */ + class UninterpretedOption implements IUninterpretedOption { + + /** + * Constructs a new UninterpretedOption. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IUninterpretedOption); + + /** UninterpretedOption name. */ + public name: google.protobuf.UninterpretedOption.INamePart[]; + + /** UninterpretedOption identifierValue. */ + public identifierValue: string; + + /** UninterpretedOption positiveIntValue. */ + public positiveIntValue: (number|Long); + + /** UninterpretedOption negativeIntValue. */ + public negativeIntValue: (number|Long); + + /** UninterpretedOption doubleValue. */ + public doubleValue: number; + + /** UninterpretedOption stringValue. */ + public stringValue: Uint8Array; + + /** UninterpretedOption aggregateValue. */ + public aggregateValue: string; + + /** + * Creates a new UninterpretedOption instance using the specified properties. + * @param [properties] Properties to set + * @returns UninterpretedOption instance + */ + public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; + + /** + * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; + + /** + * Verifies an UninterpretedOption message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UninterpretedOption + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; + + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @param message UninterpretedOption + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UninterpretedOption to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace UninterpretedOption { + + /** Properties of a NamePart. */ + interface INamePart { + + /** NamePart namePart */ + namePart: string; + + /** NamePart isExtension */ + isExtension: boolean; + } + + /** Represents a NamePart. */ + class NamePart implements INamePart { + + /** + * Constructs a new NamePart. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.UninterpretedOption.INamePart); + + /** NamePart namePart. */ + public namePart: string; + + /** NamePart isExtension. */ + public isExtension: boolean; + + /** + * Creates a new NamePart instance using the specified properties. + * @param [properties] Properties to set + * @returns NamePart instance + */ + public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; + + /** + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a NamePart message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; + + /** + * Decodes a NamePart message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; + + /** + * Verifies a NamePart message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns NamePart + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; + + /** + * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * @param message NamePart + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this NamePart to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a SourceCodeInfo. */ + interface ISourceCodeInfo { + + /** SourceCodeInfo location */ + location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); + } + + /** Represents a SourceCodeInfo. */ + class SourceCodeInfo implements ISourceCodeInfo { + + /** + * Constructs a new SourceCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ISourceCodeInfo); + + /** SourceCodeInfo location. */ + public location: google.protobuf.SourceCodeInfo.ILocation[]; + + /** + * Creates a new SourceCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns SourceCodeInfo instance + */ + public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; + + /** + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; + + /** + * Verifies a SourceCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SourceCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; + + /** + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. + * @param message SourceCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SourceCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace SourceCodeInfo { + + /** Properties of a Location. */ + interface ILocation { + + /** Location path */ + path?: (number[]|null); + + /** Location span */ + span?: (number[]|null); + + /** Location leadingComments */ + leadingComments?: (string|null); + + /** Location trailingComments */ + trailingComments?: (string|null); + + /** Location leadingDetachedComments */ + leadingDetachedComments?: (string[]|null); + } + + /** Represents a Location. */ + class Location implements ILocation { + + /** + * Constructs a new Location. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); + + /** Location path. */ + public path: number[]; + + /** Location span. */ + public span: number[]; + + /** Location leadingComments. */ + public leadingComments: string; + + /** Location trailingComments. */ + public trailingComments: string; + + /** Location leadingDetachedComments. */ + public leadingDetachedComments: string[]; + + /** + * Creates a new Location instance using the specified properties. + * @param [properties] Properties to set + * @returns Location instance + */ + public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; + + /** + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Location message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; + + /** + * Decodes a Location message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; + + /** + * Verifies a Location message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Location message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Location + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; + + /** + * Creates a plain object from a Location message. Also converts values to other types if specified. + * @param message Location + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Location to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a GeneratedCodeInfo. */ + interface IGeneratedCodeInfo { + + /** GeneratedCodeInfo annotation */ + annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); + } + + /** Represents a GeneratedCodeInfo. */ + class GeneratedCodeInfo implements IGeneratedCodeInfo { + + /** + * Constructs a new GeneratedCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IGeneratedCodeInfo); + + /** GeneratedCodeInfo annotation. */ + public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; + + /** + * Creates a new GeneratedCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns GeneratedCodeInfo instance + */ + public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; + + /** + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; + + /** + * Verifies a GeneratedCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GeneratedCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; + + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @param message GeneratedCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GeneratedCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace GeneratedCodeInfo { + + /** Properties of an Annotation. */ + interface IAnnotation { + + /** Annotation path */ + path?: (number[]|null); + + /** Annotation sourceFile */ + sourceFile?: (string|null); + + /** Annotation begin */ + begin?: (number|null); + + /** Annotation end */ + end?: (number|null); + } + + /** Represents an Annotation. */ + class Annotation implements IAnnotation { + + /** + * Constructs a new Annotation. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); + + /** Annotation path. */ + public path: number[]; + + /** Annotation sourceFile. */ + public sourceFile: string; + + /** Annotation begin. */ + public begin: number; + + /** Annotation end. */ + public end: number; + + /** + * Creates a new Annotation instance using the specified properties. + * @param [properties] Properties to set + * @returns Annotation instance + */ + public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Annotation message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Decodes an Annotation message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Verifies an Annotation message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Annotation + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Creates a plain object from an Annotation message. Also converts values to other types if specified. + * @param message Annotation + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Annotation to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a Duration. */ + interface IDuration { + + /** Duration seconds */ + seconds?: (number|Long|null); + + /** Duration nanos */ + nanos?: (number|null); + } + + /** Represents a Duration. */ + class Duration implements IDuration { + + /** + * Constructs a new Duration. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDuration); + + /** Duration seconds. */ + public seconds: (number|Long); + + /** Duration nanos. */ + public nanos: number; + + /** + * Creates a new Duration instance using the specified properties. + * @param [properties] Properties to set + * @returns Duration instance + */ + public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; + + /** + * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Duration message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; + + /** + * Decodes a Duration message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; + + /** + * Verifies a Duration message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Duration + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; + + /** + * Creates a plain object from a Duration message. Also converts values to other types if specified. + * @param message Duration + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Duration to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an Empty. */ + interface IEmpty { + } + + /** Represents an Empty. */ + class Empty implements IEmpty { + + /** + * Constructs a new Empty. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEmpty); + + /** + * Creates a new Empty instance using the specified properties. + * @param [properties] Properties to set + * @returns Empty instance + */ + public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; + + /** + * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Empty message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; + + /** + * Decodes an Empty message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; + + /** + * Verifies an Empty message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Empty message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Empty + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; + + /** + * Creates a plain object from an Empty message. Also converts values to other types if specified. + * @param message Empty + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Empty to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldMask. */ + interface IFieldMask { + + /** FieldMask paths */ + paths?: (string[]|null); + } + + /** Represents a FieldMask. */ + class FieldMask implements IFieldMask { + + /** + * Constructs a new FieldMask. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldMask); + + /** FieldMask paths. */ + public paths: string[]; + + /** + * Creates a new FieldMask instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldMask instance + */ + public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; + + /** + * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldMask message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; + + /** + * Decodes a FieldMask message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; + + /** + * Verifies a FieldMask message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldMask + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; + + /** + * Creates a plain object from a FieldMask message. Also converts values to other types if specified. + * @param message FieldMask + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldMask to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Timestamp. */ + interface ITimestamp { + + /** Timestamp seconds */ + seconds?: (number|Long|null); + + /** Timestamp nanos */ + nanos?: (number|null); + } + + /** Represents a Timestamp. */ + class Timestamp implements ITimestamp { + + /** + * Constructs a new Timestamp. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ITimestamp); + + /** Timestamp seconds. */ + public seconds: (number|Long); + + /** Timestamp nanos. */ + public nanos: number; + + /** + * Creates a new Timestamp instance using the specified properties. + * @param [properties] Properties to set + * @returns Timestamp instance + */ + public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; + + /** + * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Timestamp message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; + + /** + * Decodes a Timestamp message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; + + /** + * Verifies a Timestamp message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Timestamp + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; + + /** + * Creates a plain object from a Timestamp message. Also converts values to other types if specified. + * @param message Timestamp + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Timestamp to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Namespace iam. */ + namespace iam { + + /** Namespace v1. */ + namespace v1 { + + /** Represents a IAMPolicy */ + class IAMPolicy extends $protobuf.rpc.Service { + + /** + * Constructs a new IAMPolicy service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new IAMPolicy service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): IAMPolicy; + + /** + * Calls SetIamPolicy. + * @param request SetIamPolicyRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Policy + */ + public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.SetIamPolicyCallback): void; + + /** + * Calls SetIamPolicy. + * @param request SetIamPolicyRequest message or plain object + * @returns Promise + */ + public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest): Promise; + + /** + * Calls GetIamPolicy. + * @param request GetIamPolicyRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Policy + */ + public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.GetIamPolicyCallback): void; + + /** + * Calls GetIamPolicy. + * @param request GetIamPolicyRequest message or plain object + * @returns Promise + */ + public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest): Promise; + + /** + * Calls TestIamPermissions. + * @param request TestIamPermissionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and TestIamPermissionsResponse + */ + public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest, callback: google.iam.v1.IAMPolicy.TestIamPermissionsCallback): void; + + /** + * Calls TestIamPermissions. + * @param request TestIamPermissionsRequest message or plain object + * @returns Promise + */ + public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest): Promise; + } + + namespace IAMPolicy { + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. + * @param error Error, if any + * @param [response] Policy + */ + type SetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. + * @param error Error, if any + * @param [response] Policy + */ + type GetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. + * @param error Error, if any + * @param [response] TestIamPermissionsResponse + */ + type TestIamPermissionsCallback = (error: (Error|null), response?: google.iam.v1.TestIamPermissionsResponse) => void; + } + + /** Properties of a SetIamPolicyRequest. */ + interface ISetIamPolicyRequest { + + /** SetIamPolicyRequest resource */ + resource?: (string|null); + + /** SetIamPolicyRequest policy */ + policy?: (google.iam.v1.IPolicy|null); + } + + /** Represents a SetIamPolicyRequest. */ + class SetIamPolicyRequest implements ISetIamPolicyRequest { + + /** + * Constructs a new SetIamPolicyRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ISetIamPolicyRequest); + + /** SetIamPolicyRequest resource. */ + public resource: string; + + /** SetIamPolicyRequest policy. */ + public policy?: (google.iam.v1.IPolicy|null); + + /** + * Creates a new SetIamPolicyRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns SetIamPolicyRequest instance + */ + public static create(properties?: google.iam.v1.ISetIamPolicyRequest): google.iam.v1.SetIamPolicyRequest; + + /** + * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @param message SetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @param message SetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SetIamPolicyRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.SetIamPolicyRequest; + + /** + * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.SetIamPolicyRequest; + + /** + * Verifies a SetIamPolicyRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SetIamPolicyRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.SetIamPolicyRequest; + + /** + * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. + * @param message SetIamPolicyRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.SetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SetIamPolicyRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetIamPolicyRequest. */ + interface IGetIamPolicyRequest { + + /** GetIamPolicyRequest resource */ + resource?: (string|null); + + /** GetIamPolicyRequest options */ + options?: (google.iam.v1.IGetPolicyOptions|null); + } + + /** Represents a GetIamPolicyRequest. */ + class GetIamPolicyRequest implements IGetIamPolicyRequest { + + /** + * Constructs a new GetIamPolicyRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IGetIamPolicyRequest); + + /** GetIamPolicyRequest resource. */ + public resource: string; + + /** GetIamPolicyRequest options. */ + public options?: (google.iam.v1.IGetPolicyOptions|null); + + /** + * Creates a new GetIamPolicyRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetIamPolicyRequest instance + */ + public static create(properties?: google.iam.v1.IGetIamPolicyRequest): google.iam.v1.GetIamPolicyRequest; + + /** + * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @param message GetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @param message GetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetIamPolicyRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetIamPolicyRequest; + + /** + * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetIamPolicyRequest; + + /** + * Verifies a GetIamPolicyRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetIamPolicyRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.GetIamPolicyRequest; + + /** + * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. + * @param message GetIamPolicyRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.GetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetIamPolicyRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a TestIamPermissionsRequest. */ + interface ITestIamPermissionsRequest { + + /** TestIamPermissionsRequest resource */ + resource?: (string|null); + + /** TestIamPermissionsRequest permissions */ + permissions?: (string[]|null); + } + + /** Represents a TestIamPermissionsRequest. */ + class TestIamPermissionsRequest implements ITestIamPermissionsRequest { + + /** + * Constructs a new TestIamPermissionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ITestIamPermissionsRequest); + + /** TestIamPermissionsRequest resource. */ + public resource: string; + + /** TestIamPermissionsRequest permissions. */ + public permissions: string[]; + + /** + * Creates a new TestIamPermissionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns TestIamPermissionsRequest instance + */ + public static create(properties?: google.iam.v1.ITestIamPermissionsRequest): google.iam.v1.TestIamPermissionsRequest; + + /** + * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @param message TestIamPermissionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @param message TestIamPermissionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TestIamPermissionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsRequest; + + /** + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns TestIamPermissionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsRequest; + + /** + * Verifies a TestIamPermissionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns TestIamPermissionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsRequest; + + /** + * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. + * @param message TestIamPermissionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.TestIamPermissionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this TestIamPermissionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a TestIamPermissionsResponse. */ + interface ITestIamPermissionsResponse { + + /** TestIamPermissionsResponse permissions */ + permissions?: (string[]|null); + } + + /** Represents a TestIamPermissionsResponse. */ + class TestIamPermissionsResponse implements ITestIamPermissionsResponse { + + /** + * Constructs a new TestIamPermissionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ITestIamPermissionsResponse); + + /** TestIamPermissionsResponse permissions. */ + public permissions: string[]; + + /** + * Creates a new TestIamPermissionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns TestIamPermissionsResponse instance + */ + public static create(properties?: google.iam.v1.ITestIamPermissionsResponse): google.iam.v1.TestIamPermissionsResponse; + + /** + * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @param message TestIamPermissionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @param message TestIamPermissionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TestIamPermissionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsResponse; + + /** + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns TestIamPermissionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsResponse; + + /** + * Verifies a TestIamPermissionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns TestIamPermissionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsResponse; + + /** + * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. + * @param message TestIamPermissionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.TestIamPermissionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this TestIamPermissionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetPolicyOptions. */ + interface IGetPolicyOptions { + + /** GetPolicyOptions requestedPolicyVersion */ + requestedPolicyVersion?: (number|null); + } + + /** Represents a GetPolicyOptions. */ + class GetPolicyOptions implements IGetPolicyOptions { + + /** + * Constructs a new GetPolicyOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IGetPolicyOptions); + + /** GetPolicyOptions requestedPolicyVersion. */ + public requestedPolicyVersion: number; + + /** + * Creates a new GetPolicyOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns GetPolicyOptions instance + */ + public static create(properties?: google.iam.v1.IGetPolicyOptions): google.iam.v1.GetPolicyOptions; + + /** + * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @param message GetPolicyOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @param message GetPolicyOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetPolicyOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetPolicyOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetPolicyOptions; + + /** + * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetPolicyOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetPolicyOptions; + + /** + * Verifies a GetPolicyOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetPolicyOptions + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.GetPolicyOptions; + + /** + * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. + * @param message GetPolicyOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.GetPolicyOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetPolicyOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Policy. */ + interface IPolicy { + + /** Policy version */ + version?: (number|null); + + /** Policy bindings */ + bindings?: (google.iam.v1.IBinding[]|null); + + /** Policy etag */ + etag?: (Uint8Array|null); + } + + /** Represents a Policy. */ + class Policy implements IPolicy { + + /** + * Constructs a new Policy. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IPolicy); + + /** Policy version. */ + public version: number; + + /** Policy bindings. */ + public bindings: google.iam.v1.IBinding[]; + + /** Policy etag. */ + public etag: Uint8Array; + + /** + * Creates a new Policy instance using the specified properties. + * @param [properties] Properties to set + * @returns Policy instance + */ + public static create(properties?: google.iam.v1.IPolicy): google.iam.v1.Policy; + + /** + * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @param message Policy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @param message Policy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Policy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Policy; + + /** + * Decodes a Policy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Policy; + + /** + * Verifies a Policy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Policy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Policy + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.Policy; + + /** + * Creates a plain object from a Policy message. Also converts values to other types if specified. + * @param message Policy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.Policy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Policy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Binding. */ + interface IBinding { + + /** Binding role */ + role?: (string|null); + + /** Binding members */ + members?: (string[]|null); + + /** Binding condition */ + condition?: (google.type.IExpr|null); + } + + /** Represents a Binding. */ + class Binding implements IBinding { + + /** + * Constructs a new Binding. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IBinding); + + /** Binding role. */ + public role: string; + + /** Binding members. */ + public members: string[]; + + /** Binding condition. */ + public condition?: (google.type.IExpr|null); + + /** + * Creates a new Binding instance using the specified properties. + * @param [properties] Properties to set + * @returns Binding instance + */ + public static create(properties?: google.iam.v1.IBinding): google.iam.v1.Binding; + + /** + * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @param message Binding message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @param message Binding message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Binding message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Binding + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Binding; + + /** + * Decodes a Binding message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Binding + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Binding; + + /** + * Verifies a Binding message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Binding message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Binding + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.Binding; + + /** + * Creates a plain object from a Binding message. Also converts values to other types if specified. + * @param message Binding + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.Binding, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Binding to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a PolicyDelta. */ + interface IPolicyDelta { + + /** PolicyDelta bindingDeltas */ + bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); + + /** PolicyDelta auditConfigDeltas */ + auditConfigDeltas?: (google.iam.v1.IAuditConfigDelta[]|null); + } + + /** Represents a PolicyDelta. */ + class PolicyDelta implements IPolicyDelta { + + /** + * Constructs a new PolicyDelta. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IPolicyDelta); + + /** PolicyDelta bindingDeltas. */ + public bindingDeltas: google.iam.v1.IBindingDelta[]; + + /** PolicyDelta auditConfigDeltas. */ + public auditConfigDeltas: google.iam.v1.IAuditConfigDelta[]; + + /** + * Creates a new PolicyDelta instance using the specified properties. + * @param [properties] Properties to set + * @returns PolicyDelta instance + */ + public static create(properties?: google.iam.v1.IPolicyDelta): google.iam.v1.PolicyDelta; + + /** + * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @param message PolicyDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @param message PolicyDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PolicyDelta message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PolicyDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.PolicyDelta; + + /** + * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PolicyDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.PolicyDelta; + + /** + * Verifies a PolicyDelta message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PolicyDelta + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.PolicyDelta; + + /** + * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. + * @param message PolicyDelta + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.PolicyDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PolicyDelta to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a BindingDelta. */ + interface IBindingDelta { + + /** BindingDelta action */ + action?: (google.iam.v1.BindingDelta.Action|null); + + /** BindingDelta role */ + role?: (string|null); + + /** BindingDelta member */ + member?: (string|null); + + /** BindingDelta condition */ + condition?: (google.type.IExpr|null); + } + + /** Represents a BindingDelta. */ + class BindingDelta implements IBindingDelta { + + /** + * Constructs a new BindingDelta. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IBindingDelta); + + /** BindingDelta action. */ + public action: google.iam.v1.BindingDelta.Action; + + /** BindingDelta role. */ + public role: string; + + /** BindingDelta member. */ + public member: string; + + /** BindingDelta condition. */ + public condition?: (google.type.IExpr|null); + + /** + * Creates a new BindingDelta instance using the specified properties. + * @param [properties] Properties to set + * @returns BindingDelta instance + */ + public static create(properties?: google.iam.v1.IBindingDelta): google.iam.v1.BindingDelta; + + /** + * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @param message BindingDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @param message BindingDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a BindingDelta message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns BindingDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.BindingDelta; + + /** + * Decodes a BindingDelta message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns BindingDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.BindingDelta; + + /** + * Verifies a BindingDelta message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns BindingDelta + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.BindingDelta; + + /** + * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. + * @param message BindingDelta + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.BindingDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this BindingDelta to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace BindingDelta { + + /** Action enum. */ + enum Action { + ACTION_UNSPECIFIED = 0, + ADD = 1, + REMOVE = 2 + } + } + + /** Properties of an AuditConfigDelta. */ + interface IAuditConfigDelta { + + /** AuditConfigDelta action */ + action?: (google.iam.v1.AuditConfigDelta.Action|null); + + /** AuditConfigDelta service */ + service?: (string|null); + + /** AuditConfigDelta exemptedMember */ + exemptedMember?: (string|null); + + /** AuditConfigDelta logType */ + logType?: (string|null); + } + + /** Represents an AuditConfigDelta. */ + class AuditConfigDelta implements IAuditConfigDelta { + + /** + * Constructs a new AuditConfigDelta. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IAuditConfigDelta); + + /** AuditConfigDelta action. */ + public action: google.iam.v1.AuditConfigDelta.Action; + + /** AuditConfigDelta service. */ + public service: string; + + /** AuditConfigDelta exemptedMember. */ + public exemptedMember: string; + + /** AuditConfigDelta logType. */ + public logType: string; + + /** + * Creates a new AuditConfigDelta instance using the specified properties. + * @param [properties] Properties to set + * @returns AuditConfigDelta instance + */ + public static create(properties?: google.iam.v1.IAuditConfigDelta): google.iam.v1.AuditConfigDelta; + + /** + * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @param message AuditConfigDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @param message AuditConfigDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AuditConfigDelta message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AuditConfigDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.AuditConfigDelta; + + /** + * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AuditConfigDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.AuditConfigDelta; + + /** + * Verifies an AuditConfigDelta message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AuditConfigDelta + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.AuditConfigDelta; + + /** + * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. + * @param message AuditConfigDelta + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.AuditConfigDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AuditConfigDelta to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace AuditConfigDelta { + + /** Action enum. */ + enum Action { + ACTION_UNSPECIFIED = 0, + ADD = 1, + REMOVE = 2 + } + } + } + } + + /** Namespace type. */ + namespace type { + + /** Properties of an Expr. */ + interface IExpr { + + /** Expr expression */ + expression?: (string|null); + + /** Expr title */ + title?: (string|null); + + /** Expr description */ + description?: (string|null); + + /** Expr location */ + location?: (string|null); + } + + /** Represents an Expr. */ + class Expr implements IExpr { + + /** + * Constructs a new Expr. + * @param [properties] Properties to set + */ + constructor(properties?: google.type.IExpr); + + /** Expr expression. */ + public expression: string; + + /** Expr title. */ + public title: string; + + /** Expr description. */ + public description: string; + + /** Expr location. */ + public location: string; + + /** + * Creates a new Expr instance using the specified properties. + * @param [properties] Properties to set + * @returns Expr instance + */ + public static create(properties?: google.type.IExpr): google.type.Expr; + + /** + * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @param message Expr message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @param message Expr message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Expr message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.type.Expr; + + /** + * Decodes an Expr message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.type.Expr; + + /** + * Verifies an Expr message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Expr message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Expr + */ + public static fromObject(object: { [k: string]: any }): google.type.Expr; + + /** + * Creates a plain object from an Expr message. Also converts values to other types if specified. + * @param message Expr + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.type.Expr, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Expr to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } +} diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js new file mode 100644 index 00000000000..fa617cc8a02 --- /dev/null +++ b/handwritten/pubsub/protos/protos.js @@ -0,0 +1,23451 @@ +/*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/ +(function(global, factory) { /* global define, require, module */ + + /* AMD */ if (typeof define === 'function' && define.amd) + define(["protobufjs/minimal"], factory); + + /* CommonJS */ else if (typeof require === 'function' && typeof module === 'object' && module && module.exports) + module.exports = factory(require("protobufjs/minimal")); + +})(this, function($protobuf) { + "use strict"; + + // Common aliases + var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; + + // Exported root namespace + var $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {}); + + $root.google = (function() { + + /** + * Namespace google. + * @exports google + * @namespace + */ + var google = {}; + + google.pubsub = (function() { + + /** + * Namespace pubsub. + * @memberof google + * @namespace + */ + var pubsub = {}; + + pubsub.v1 = (function() { + + /** + * Namespace v1. + * @memberof google.pubsub + * @namespace + */ + var v1 = {}; + + v1.Publisher = (function() { + + /** + * Constructs a new Publisher service. + * @memberof google.pubsub.v1 + * @classdesc Represents a Publisher + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function Publisher(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } + + (Publisher.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Publisher; + + /** + * Creates new Publisher service using the specified rpc implementation. + * @function create + * @memberof google.pubsub.v1.Publisher + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {Publisher} RPC service. Useful where requests and/or responses are streamed. + */ + Publisher.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef CreateTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic + */ + + /** + * Calls CreateTopic. + * @function createTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.ITopic} request Topic message or plain object + * @param {google.pubsub.v1.Publisher.CreateTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.createTopic = function createTopic(request, callback) { + return this.rpcCall(createTopic, $root.google.pubsub.v1.Topic, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "CreateTopic" }); + + /** + * Calls CreateTopic. + * @function createTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.ITopic} request Topic message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef UpdateTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic + */ + + /** + * Calls UpdateTopic. + * @function updateTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.UpdateTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.updateTopic = function updateTopic(request, callback) { + return this.rpcCall(updateTopic, $root.google.pubsub.v1.UpdateTopicRequest, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "UpdateTopic" }); + + /** + * Calls UpdateTopic. + * @function updateTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * @memberof google.pubsub.v1.Publisher + * @typedef PublishCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.PublishResponse} [response] PublishResponse + */ + + /** + * Calls Publish. + * @function publish + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object + * @param {google.pubsub.v1.Publisher.PublishCallback} callback Node-style callback called with the error, if any, and PublishResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.publish = function publish(request, callback) { + return this.rpcCall(publish, $root.google.pubsub.v1.PublishRequest, $root.google.pubsub.v1.PublishResponse, request, callback); + }, "name", { value: "Publish" }); + + /** + * Calls Publish. + * @function publish + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef GetTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic + */ + + /** + * Calls GetTopic. + * @function getTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.GetTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.getTopic = function getTopic(request, callback) { + return this.rpcCall(getTopic, $root.google.pubsub.v1.GetTopicRequest, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "GetTopic" }); + + /** + * Calls GetTopic. + * @function getTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicsResponse} [response] ListTopicsResponse + */ + + /** + * Calls ListTopics. + * @function listTopics + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicsCallback} callback Node-style callback called with the error, if any, and ListTopicsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.listTopics = function listTopics(request, callback) { + return this.rpcCall(listTopics, $root.google.pubsub.v1.ListTopicsRequest, $root.google.pubsub.v1.ListTopicsResponse, request, callback); + }, "name", { value: "ListTopics" }); + + /** + * Calls ListTopics. + * @function listTopics + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicSubscriptionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} [response] ListTopicSubscriptionsResponse + */ + + /** + * Calls ListTopicSubscriptions. + * @function listTopicSubscriptions + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.listTopicSubscriptions = function listTopicSubscriptions(request, callback) { + return this.rpcCall(listTopicSubscriptions, $root.google.pubsub.v1.ListTopicSubscriptionsRequest, $root.google.pubsub.v1.ListTopicSubscriptionsResponse, request, callback); + }, "name", { value: "ListTopicSubscriptions" }); + + /** + * Calls ListTopicSubscriptions. + * @function listTopicSubscriptions + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicSnapshotsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicSnapshotsResponse} [response] ListTopicSnapshotsResponse + */ + + /** + * Calls ListTopicSnapshots. + * @function listTopicSnapshots + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicSnapshotsCallback} callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.listTopicSnapshots = function listTopicSnapshots(request, callback) { + return this.rpcCall(listTopicSnapshots, $root.google.pubsub.v1.ListTopicSnapshotsRequest, $root.google.pubsub.v1.ListTopicSnapshotsResponse, request, callback); + }, "name", { value: "ListTopicSnapshots" }); + + /** + * Calls ListTopicSnapshots. + * @function listTopicSnapshots + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef DeleteTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls DeleteTopic. + * @function deleteTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.DeleteTopicCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.deleteTopic = function deleteTopic(request, callback) { + return this.rpcCall(deleteTopic, $root.google.pubsub.v1.DeleteTopicRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteTopic" }); + + /** + * Calls DeleteTopic. + * @function deleteTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return Publisher; + })(); + + v1.MessageStoragePolicy = (function() { + + /** + * Properties of a MessageStoragePolicy. + * @memberof google.pubsub.v1 + * @interface IMessageStoragePolicy + * @property {Array.|null} [allowedPersistenceRegions] MessageStoragePolicy allowedPersistenceRegions + */ + + /** + * Constructs a new MessageStoragePolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents a MessageStoragePolicy. + * @implements IMessageStoragePolicy + * @constructor + * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set + */ + function MessageStoragePolicy(properties) { + this.allowedPersistenceRegions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * MessageStoragePolicy allowedPersistenceRegions. + * @member {Array.} allowedPersistenceRegions + * @memberof google.pubsub.v1.MessageStoragePolicy + * @instance + */ + MessageStoragePolicy.prototype.allowedPersistenceRegions = $util.emptyArray; + + /** + * Creates a new MessageStoragePolicy instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy instance + */ + MessageStoragePolicy.create = function create(properties) { + return new MessageStoragePolicy(properties); + }; + + /** + * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageStoragePolicy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.allowedPersistenceRegions != null && message.allowedPersistenceRegions.length) + for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.allowedPersistenceRegions[i]); + return writer; + }; + + /** + * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageStoragePolicy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageStoragePolicy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.MessageStoragePolicy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.allowedPersistenceRegions && message.allowedPersistenceRegions.length)) + message.allowedPersistenceRegions = []; + message.allowedPersistenceRegions.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageStoragePolicy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a MessageStoragePolicy message. + * @function verify + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MessageStoragePolicy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.allowedPersistenceRegions != null && message.hasOwnProperty("allowedPersistenceRegions")) { + if (!Array.isArray(message.allowedPersistenceRegions)) + return "allowedPersistenceRegions: array expected"; + for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) + if (!$util.isString(message.allowedPersistenceRegions[i])) + return "allowedPersistenceRegions: string[] expected"; + } + return null; + }; + + /** + * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + */ + MessageStoragePolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.MessageStoragePolicy) + return object; + var message = new $root.google.pubsub.v1.MessageStoragePolicy(); + if (object.allowedPersistenceRegions) { + if (!Array.isArray(object.allowedPersistenceRegions)) + throw TypeError(".google.pubsub.v1.MessageStoragePolicy.allowedPersistenceRegions: array expected"); + message.allowedPersistenceRegions = []; + for (var i = 0; i < object.allowedPersistenceRegions.length; ++i) + message.allowedPersistenceRegions[i] = String(object.allowedPersistenceRegions[i]); + } + return message; + }; + + /** + * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {google.pubsub.v1.MessageStoragePolicy} message MessageStoragePolicy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MessageStoragePolicy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.allowedPersistenceRegions = []; + if (message.allowedPersistenceRegions && message.allowedPersistenceRegions.length) { + object.allowedPersistenceRegions = []; + for (var j = 0; j < message.allowedPersistenceRegions.length; ++j) + object.allowedPersistenceRegions[j] = message.allowedPersistenceRegions[j]; + } + return object; + }; + + /** + * Converts this MessageStoragePolicy to JSON. + * @function toJSON + * @memberof google.pubsub.v1.MessageStoragePolicy + * @instance + * @returns {Object.} JSON object + */ + MessageStoragePolicy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return MessageStoragePolicy; + })(); + + v1.Topic = (function() { + + /** + * Properties of a Topic. + * @memberof google.pubsub.v1 + * @interface ITopic + * @property {string|null} [name] Topic name + * @property {Object.|null} [labels] Topic labels + * @property {google.pubsub.v1.IMessageStoragePolicy|null} [messageStoragePolicy] Topic messageStoragePolicy + * @property {string|null} [kmsKeyName] Topic kmsKeyName + */ + + /** + * Constructs a new Topic. + * @memberof google.pubsub.v1 + * @classdesc Represents a Topic. + * @implements ITopic + * @constructor + * @param {google.pubsub.v1.ITopic=} [properties] Properties to set + */ + function Topic(properties) { + this.labels = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Topic name. + * @member {string} name + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.name = ""; + + /** + * Topic labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.labels = $util.emptyObject; + + /** + * Topic messageStoragePolicy. + * @member {google.pubsub.v1.IMessageStoragePolicy|null|undefined} messageStoragePolicy + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.messageStoragePolicy = null; + + /** + * Topic kmsKeyName. + * @member {string} kmsKeyName + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.kmsKeyName = ""; + + /** + * Creates a new Topic instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.Topic + * @static + * @param {google.pubsub.v1.ITopic=} [properties] Properties to set + * @returns {google.pubsub.v1.Topic} Topic instance + */ + Topic.create = function create(properties) { + return new Topic(properties); + }; + + /** + * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.Topic + * @static + * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Topic.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) + $root.google.pubsub.v1.MessageStoragePolicy.encode(message.messageStoragePolicy, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.kmsKeyName); + return writer; + }; + + /** + * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.Topic + * @static + * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Topic.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Topic message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.Topic + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.Topic} Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Topic.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); + break; + case 3: + message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); + break; + case 5: + message.kmsKeyName = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Topic message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.Topic + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.Topic} Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Topic.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Topic message. + * @function verify + * @memberof google.pubsub.v1.Topic + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Topic.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; + } + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) { + var error = $root.google.pubsub.v1.MessageStoragePolicy.verify(message.messageStoragePolicy); + if (error) + return "messageStoragePolicy." + error; + } + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + if (!$util.isString(message.kmsKeyName)) + return "kmsKeyName: string expected"; + return null; + }; + + /** + * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.Topic + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.Topic} Topic + */ + Topic.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Topic) + return object; + var message = new $root.google.pubsub.v1.Topic(); + if (object.name != null) + message.name = String(object.name); + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Topic.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); + } + if (object.messageStoragePolicy != null) { + if (typeof object.messageStoragePolicy !== "object") + throw TypeError(".google.pubsub.v1.Topic.messageStoragePolicy: object expected"); + message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.fromObject(object.messageStoragePolicy); + } + if (object.kmsKeyName != null) + message.kmsKeyName = String(object.kmsKeyName); + return message; + }; + + /** + * Creates a plain object from a Topic message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.Topic + * @static + * @param {google.pubsub.v1.Topic} message Topic + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Topic.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.messageStoragePolicy = null; + object.kmsKeyName = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) + object.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.toObject(message.messageStoragePolicy, options); + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + object.kmsKeyName = message.kmsKeyName; + return object; + }; + + /** + * Converts this Topic to JSON. + * @function toJSON + * @memberof google.pubsub.v1.Topic + * @instance + * @returns {Object.} JSON object + */ + Topic.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Topic; + })(); + + v1.PubsubMessage = (function() { + + /** + * Properties of a PubsubMessage. + * @memberof google.pubsub.v1 + * @interface IPubsubMessage + * @property {Uint8Array|null} [data] PubsubMessage data + * @property {Object.|null} [attributes] PubsubMessage attributes + * @property {string|null} [messageId] PubsubMessage messageId + * @property {google.protobuf.ITimestamp|null} [publishTime] PubsubMessage publishTime + * @property {string|null} [orderingKey] PubsubMessage orderingKey + */ + + /** + * Constructs a new PubsubMessage. + * @memberof google.pubsub.v1 + * @classdesc Represents a PubsubMessage. + * @implements IPubsubMessage + * @constructor + * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set + */ + function PubsubMessage(properties) { + this.attributes = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PubsubMessage data. + * @member {Uint8Array} data + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.data = $util.newBuffer([]); + + /** + * PubsubMessage attributes. + * @member {Object.} attributes + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.attributes = $util.emptyObject; + + /** + * PubsubMessage messageId. + * @member {string} messageId + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.messageId = ""; + + /** + * PubsubMessage publishTime. + * @member {google.protobuf.ITimestamp|null|undefined} publishTime + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.publishTime = null; + + /** + * PubsubMessage orderingKey. + * @member {string} orderingKey + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.orderingKey = ""; + + /** + * Creates a new PubsubMessage instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage instance + */ + PubsubMessage.create = function create(properties) { + return new PubsubMessage(properties); + }; + + /** + * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PubsubMessage.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.data != null && message.hasOwnProperty("data")) + writer.uint32(/* id 1, wireType 2 =*/10).bytes(message.data); + if (message.attributes != null && message.hasOwnProperty("attributes")) + for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); + if (message.messageId != null && message.hasOwnProperty("messageId")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.messageId); + if (message.publishTime != null && message.hasOwnProperty("publishTime")) + $root.google.protobuf.Timestamp.encode(message.publishTime, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.orderingKey); + return writer; + }; + + /** + * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PubsubMessage.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PubsubMessage message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PubsubMessage.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.data = reader.bytes(); + break; + case 2: + reader.skip().pos++; + if (message.attributes === $util.emptyObject) + message.attributes = {}; + key = reader.string(); + reader.pos++; + message.attributes[key] = reader.string(); + break; + case 3: + message.messageId = reader.string(); + break; + case 4: + message.publishTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + case 5: + message.orderingKey = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PubsubMessage.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PubsubMessage message. + * @function verify + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PubsubMessage.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.data != null && message.hasOwnProperty("data")) + if (!(message.data && typeof message.data.length === "number" || $util.isString(message.data))) + return "data: buffer expected"; + if (message.attributes != null && message.hasOwnProperty("attributes")) { + if (!$util.isObject(message.attributes)) + return "attributes: object expected"; + var key = Object.keys(message.attributes); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.attributes[key[i]])) + return "attributes: string{k:string} expected"; + } + if (message.messageId != null && message.hasOwnProperty("messageId")) + if (!$util.isString(message.messageId)) + return "messageId: string expected"; + if (message.publishTime != null && message.hasOwnProperty("publishTime")) { + var error = $root.google.protobuf.Timestamp.verify(message.publishTime); + if (error) + return "publishTime." + error; + } + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + if (!$util.isString(message.orderingKey)) + return "orderingKey: string expected"; + return null; + }; + + /** + * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + */ + PubsubMessage.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PubsubMessage) + return object; + var message = new $root.google.pubsub.v1.PubsubMessage(); + if (object.data != null) + if (typeof object.data === "string") + $util.base64.decode(object.data, message.data = $util.newBuffer($util.base64.length(object.data)), 0); + else if (object.data.length) + message.data = object.data; + if (object.attributes) { + if (typeof object.attributes !== "object") + throw TypeError(".google.pubsub.v1.PubsubMessage.attributes: object expected"); + message.attributes = {}; + for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) + message.attributes[keys[i]] = String(object.attributes[keys[i]]); + } + if (object.messageId != null) + message.messageId = String(object.messageId); + if (object.publishTime != null) { + if (typeof object.publishTime !== "object") + throw TypeError(".google.pubsub.v1.PubsubMessage.publishTime: object expected"); + message.publishTime = $root.google.protobuf.Timestamp.fromObject(object.publishTime); + } + if (object.orderingKey != null) + message.orderingKey = String(object.orderingKey); + return message; + }; + + /** + * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {google.pubsub.v1.PubsubMessage} message PubsubMessage + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PubsubMessage.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.attributes = {}; + if (options.defaults) { + if (options.bytes === String) + object.data = ""; + else { + object.data = []; + if (options.bytes !== Array) + object.data = $util.newBuffer(object.data); + } + object.messageId = ""; + object.publishTime = null; + object.orderingKey = ""; + } + if (message.data != null && message.hasOwnProperty("data")) + object.data = options.bytes === String ? $util.base64.encode(message.data, 0, message.data.length) : options.bytes === Array ? Array.prototype.slice.call(message.data) : message.data; + var keys2; + if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { + object.attributes = {}; + for (var j = 0; j < keys2.length; ++j) + object.attributes[keys2[j]] = message.attributes[keys2[j]]; + } + if (message.messageId != null && message.hasOwnProperty("messageId")) + object.messageId = message.messageId; + if (message.publishTime != null && message.hasOwnProperty("publishTime")) + object.publishTime = $root.google.protobuf.Timestamp.toObject(message.publishTime, options); + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + object.orderingKey = message.orderingKey; + return object; + }; + + /** + * Converts this PubsubMessage to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PubsubMessage + * @instance + * @returns {Object.} JSON object + */ + PubsubMessage.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return PubsubMessage; + })(); + + v1.GetTopicRequest = (function() { + + /** + * Properties of a GetTopicRequest. + * @memberof google.pubsub.v1 + * @interface IGetTopicRequest + * @property {string|null} [topic] GetTopicRequest topic + */ + + /** + * Constructs a new GetTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetTopicRequest. + * @implements IGetTopicRequest + * @constructor + * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set + */ + function GetTopicRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetTopicRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.GetTopicRequest + * @instance + */ + GetTopicRequest.prototype.topic = ""; + + /** + * Creates a new GetTopicRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest instance + */ + GetTopicRequest.create = function create(properties) { + return new GetTopicRequest(properties); + }; + + /** + * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetTopicRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + return writer; + }; + + /** + * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GetTopicRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetTopicRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetTopicRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetTopicRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GetTopicRequest message. + * @function verify + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetTopicRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + return null; + }; + + /** + * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + */ + GetTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetTopicRequest) + return object; + var message = new $root.google.pubsub.v1.GetTopicRequest(); + if (object.topic != null) + message.topic = String(object.topic); + return message; + }; + + /** + * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {google.pubsub.v1.GetTopicRequest} message GetTopicRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GetTopicRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + return object; + }; + + /** + * Converts this GetTopicRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.GetTopicRequest + * @instance + * @returns {Object.} JSON object + */ + GetTopicRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return GetTopicRequest; + })(); + + v1.UpdateTopicRequest = (function() { + + /** + * Properties of an UpdateTopicRequest. + * @memberof google.pubsub.v1 + * @interface IUpdateTopicRequest + * @property {google.pubsub.v1.ITopic|null} [topic] UpdateTopicRequest topic + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateTopicRequest updateMask + */ + + /** + * Constructs a new UpdateTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an UpdateTopicRequest. + * @implements IUpdateTopicRequest + * @constructor + * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set + */ + function UpdateTopicRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * UpdateTopicRequest topic. + * @member {google.pubsub.v1.ITopic|null|undefined} topic + * @memberof google.pubsub.v1.UpdateTopicRequest + * @instance + */ + UpdateTopicRequest.prototype.topic = null; + + /** + * UpdateTopicRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateTopicRequest + * @instance + */ + UpdateTopicRequest.prototype.updateMask = null; + + /** + * Creates a new UpdateTopicRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest instance + */ + UpdateTopicRequest.create = function create(properties) { + return new UpdateTopicRequest(properties); + }; + + /** + * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateTopicRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + $root.google.pubsub.v1.Topic.encode(message.topic, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateTopicRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateTopicRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = $root.google.pubsub.v1.Topic.decode(reader, reader.uint32()); + break; + case 2: + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateTopicRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an UpdateTopicRequest message. + * @function verify + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + UpdateTopicRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) { + var error = $root.google.pubsub.v1.Topic.verify(message.topic); + if (error) + return "topic." + error; + } + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + if (error) + return "updateMask." + error; + } + return null; + }; + + /** + * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + */ + UpdateTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateTopicRequest) + return object; + var message = new $root.google.pubsub.v1.UpdateTopicRequest(); + if (object.topic != null) { + if (typeof object.topic !== "object") + throw TypeError(".google.pubsub.v1.UpdateTopicRequest.topic: object expected"); + message.topic = $root.google.pubsub.v1.Topic.fromObject(object.topic); + } + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateTopicRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + } + return message; + }; + + /** + * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.UpdateTopicRequest} message UpdateTopicRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UpdateTopicRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = null; + object.updateMask = null; + } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = $root.google.pubsub.v1.Topic.toObject(message.topic, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); + return object; + }; + + /** + * Converts this UpdateTopicRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.UpdateTopicRequest + * @instance + * @returns {Object.} JSON object + */ + UpdateTopicRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return UpdateTopicRequest; + })(); + + v1.PublishRequest = (function() { + + /** + * Properties of a PublishRequest. + * @memberof google.pubsub.v1 + * @interface IPublishRequest + * @property {string|null} [topic] PublishRequest topic + * @property {Array.|null} [messages] PublishRequest messages + */ + + /** + * Constructs a new PublishRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a PublishRequest. + * @implements IPublishRequest + * @constructor + * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set + */ + function PublishRequest(properties) { + this.messages = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PublishRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.PublishRequest + * @instance + */ + PublishRequest.prototype.topic = ""; + + /** + * PublishRequest messages. + * @member {Array.} messages + * @memberof google.pubsub.v1.PublishRequest + * @instance + */ + PublishRequest.prototype.messages = $util.emptyArray; + + /** + * Creates a new PublishRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.PublishRequest} PublishRequest instance + */ + PublishRequest.create = function create(properties) { + return new PublishRequest(properties); + }; + + /** + * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PublishRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.messages != null && message.messages.length) + for (var i = 0; i < message.messages.length; ++i) + $root.google.pubsub.v1.PubsubMessage.encode(message.messages[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PublishRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PublishRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PublishRequest} PublishRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PublishRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + case 2: + if (!(message.messages && message.messages.length)) + message.messages = []; + message.messages.push($root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PublishRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PublishRequest} PublishRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PublishRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PublishRequest message. + * @function verify + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PublishRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.messages != null && message.hasOwnProperty("messages")) { + if (!Array.isArray(message.messages)) + return "messages: array expected"; + for (var i = 0; i < message.messages.length; ++i) { + var error = $root.google.pubsub.v1.PubsubMessage.verify(message.messages[i]); + if (error) + return "messages." + error; + } + } + return null; + }; + + /** + * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PublishRequest} PublishRequest + */ + PublishRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PublishRequest) + return object; + var message = new $root.google.pubsub.v1.PublishRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.messages) { + if (!Array.isArray(object.messages)) + throw TypeError(".google.pubsub.v1.PublishRequest.messages: array expected"); + message.messages = []; + for (var i = 0; i < object.messages.length; ++i) { + if (typeof object.messages[i] !== "object") + throw TypeError(".google.pubsub.v1.PublishRequest.messages: object expected"); + message.messages[i] = $root.google.pubsub.v1.PubsubMessage.fromObject(object.messages[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {google.pubsub.v1.PublishRequest} message PublishRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PublishRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.messages = []; + if (options.defaults) + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.messages && message.messages.length) { + object.messages = []; + for (var j = 0; j < message.messages.length; ++j) + object.messages[j] = $root.google.pubsub.v1.PubsubMessage.toObject(message.messages[j], options); + } + return object; + }; + + /** + * Converts this PublishRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PublishRequest + * @instance + * @returns {Object.} JSON object + */ + PublishRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return PublishRequest; + })(); + + v1.PublishResponse = (function() { + + /** + * Properties of a PublishResponse. + * @memberof google.pubsub.v1 + * @interface IPublishResponse + * @property {Array.|null} [messageIds] PublishResponse messageIds + */ + + /** + * Constructs a new PublishResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a PublishResponse. + * @implements IPublishResponse + * @constructor + * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set + */ + function PublishResponse(properties) { + this.messageIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PublishResponse messageIds. + * @member {Array.} messageIds + * @memberof google.pubsub.v1.PublishResponse + * @instance + */ + PublishResponse.prototype.messageIds = $util.emptyArray; + + /** + * Creates a new PublishResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.PublishResponse} PublishResponse instance + */ + PublishResponse.create = function create(properties) { + return new PublishResponse(properties); + }; + + /** + * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PublishResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.messageIds != null && message.messageIds.length) + for (var i = 0; i < message.messageIds.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.messageIds[i]); + return writer; + }; + + /** + * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PublishResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PublishResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PublishResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.messageIds && message.messageIds.length)) + message.messageIds = []; + message.messageIds.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PublishResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PublishResponse message. + * @function verify + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PublishResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.messageIds != null && message.hasOwnProperty("messageIds")) { + if (!Array.isArray(message.messageIds)) + return "messageIds: array expected"; + for (var i = 0; i < message.messageIds.length; ++i) + if (!$util.isString(message.messageIds[i])) + return "messageIds: string[] expected"; + } + return null; + }; + + /** + * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PublishResponse} PublishResponse + */ + PublishResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PublishResponse) + return object; + var message = new $root.google.pubsub.v1.PublishResponse(); + if (object.messageIds) { + if (!Array.isArray(object.messageIds)) + throw TypeError(".google.pubsub.v1.PublishResponse.messageIds: array expected"); + message.messageIds = []; + for (var i = 0; i < object.messageIds.length; ++i) + message.messageIds[i] = String(object.messageIds[i]); + } + return message; + }; + + /** + * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {google.pubsub.v1.PublishResponse} message PublishResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PublishResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.messageIds = []; + if (message.messageIds && message.messageIds.length) { + object.messageIds = []; + for (var j = 0; j < message.messageIds.length; ++j) + object.messageIds[j] = message.messageIds[j]; + } + return object; + }; + + /** + * Converts this PublishResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PublishResponse + * @instance + * @returns {Object.} JSON object + */ + PublishResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return PublishResponse; + })(); + + v1.ListTopicsRequest = (function() { + + /** + * Properties of a ListTopicsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicsRequest + * @property {string|null} [project] ListTopicsRequest project + * @property {number|null} [pageSize] ListTopicsRequest pageSize + * @property {string|null} [pageToken] ListTopicsRequest pageToken + */ + + /** + * Constructs a new ListTopicsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicsRequest. + * @implements IListTopicsRequest + * @constructor + * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set + */ + function ListTopicsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListTopicsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + */ + ListTopicsRequest.prototype.project = ""; + + /** + * ListTopicsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + */ + ListTopicsRequest.prototype.pageSize = 0; + + /** + * ListTopicsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + */ + ListTopicsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListTopicsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest instance + */ + ListTopicsRequest.create = function create(properties) { + return new ListTopicsRequest(properties); + }; + + /** + * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListTopicsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.project = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + */ + ListTopicsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicsRequest) + return object; + var message = new $root.google.pubsub.v1.ListTopicsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; + + /** + * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {google.pubsub.v1.ListTopicsRequest} message ListTopicsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; + + /** + * Converts this ListTopicsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + * @returns {Object.} JSON object + */ + ListTopicsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListTopicsRequest; + })(); + + v1.ListTopicsResponse = (function() { + + /** + * Properties of a ListTopicsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicsResponse + * @property {Array.|null} [topics] ListTopicsResponse topics + * @property {string|null} [nextPageToken] ListTopicsResponse nextPageToken + */ + + /** + * Constructs a new ListTopicsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicsResponse. + * @implements IListTopicsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set + */ + function ListTopicsResponse(properties) { + this.topics = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListTopicsResponse topics. + * @member {Array.} topics + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + */ + ListTopicsResponse.prototype.topics = $util.emptyArray; + + /** + * ListTopicsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + */ + ListTopicsResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListTopicsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse instance + */ + ListTopicsResponse.create = function create(properties) { + return new ListTopicsResponse(properties); + }; + + /** + * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topics != null && message.topics.length) + for (var i = 0; i < message.topics.length; ++i) + $root.google.pubsub.v1.Topic.encode(message.topics[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.topics && message.topics.length)) + message.topics = []; + message.topics.push($root.google.pubsub.v1.Topic.decode(reader, reader.uint32())); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topics != null && message.hasOwnProperty("topics")) { + if (!Array.isArray(message.topics)) + return "topics: array expected"; + for (var i = 0; i < message.topics.length; ++i) { + var error = $root.google.pubsub.v1.Topic.verify(message.topics[i]); + if (error) + return "topics." + error; + } + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + */ + ListTopicsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicsResponse(); + if (object.topics) { + if (!Array.isArray(object.topics)) + throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: array expected"); + message.topics = []; + for (var i = 0; i < object.topics.length; ++i) { + if (typeof object.topics[i] !== "object") + throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: object expected"); + message.topics[i] = $root.google.pubsub.v1.Topic.fromObject(object.topics[i]); + } + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; + + /** + * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.ListTopicsResponse} message ListTopicsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.topics = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.topics && message.topics.length) { + object.topics = []; + for (var j = 0; j < message.topics.length; ++j) + object.topics[j] = $root.google.pubsub.v1.Topic.toObject(message.topics[j], options); + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListTopicsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListTopicsResponse; + })(); + + v1.ListTopicSubscriptionsRequest = (function() { + + /** + * Properties of a ListTopicSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicSubscriptionsRequest + * @property {string|null} [topic] ListTopicSubscriptionsRequest topic + * @property {number|null} [pageSize] ListTopicSubscriptionsRequest pageSize + * @property {string|null} [pageToken] ListTopicSubscriptionsRequest pageToken + */ + + /** + * Constructs a new ListTopicSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSubscriptionsRequest. + * @implements IListTopicSubscriptionsRequest + * @constructor + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set + */ + function ListTopicSubscriptionsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListTopicSubscriptionsRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.topic = ""; + + /** + * ListTopicSubscriptionsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.pageSize = 0; + + /** + * ListTopicSubscriptionsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest instance + */ + ListTopicSubscriptionsRequest.create = function create(properties) { + return new ListTopicSubscriptionsRequest(properties); + }; + + /** + * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicSubscriptionsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSubscriptionsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + */ + ListTopicSubscriptionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsRequest) + return object; + var message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; + + /** + * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.ListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSubscriptionsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = ""; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; + + /** + * Converts this ListTopicSubscriptionsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + * @returns {Object.} JSON object + */ + ListTopicSubscriptionsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListTopicSubscriptionsRequest; + })(); + + v1.ListTopicSubscriptionsResponse = (function() { + + /** + * Properties of a ListTopicSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicSubscriptionsResponse + * @property {Array.|null} [subscriptions] ListTopicSubscriptionsResponse subscriptions + * @property {string|null} [nextPageToken] ListTopicSubscriptionsResponse nextPageToken + */ + + /** + * Constructs a new ListTopicSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSubscriptionsResponse. + * @implements IListTopicSubscriptionsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set + */ + function ListTopicSubscriptionsResponse(properties) { + this.subscriptions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListTopicSubscriptionsResponse subscriptions. + * @member {Array.} subscriptions + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + */ + ListTopicSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; + + /** + * ListTopicSubscriptionsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + */ + ListTopicSubscriptionsResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse instance + */ + ListTopicSubscriptionsResponse.create = function create(properties) { + return new ListTopicSubscriptionsResponse(properties); + }; + + /** + * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscriptions != null && message.subscriptions.length) + for (var i = 0; i < message.subscriptions.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscriptions[i]); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.subscriptions && message.subscriptions.length)) + message.subscriptions = []; + message.subscriptions.push(reader.string()); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicSubscriptionsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSubscriptionsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { + if (!Array.isArray(message.subscriptions)) + return "subscriptions: array expected"; + for (var i = 0; i < message.subscriptions.length; ++i) + if (!$util.isString(message.subscriptions[i])) + return "subscriptions: string[] expected"; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + */ + ListTopicSubscriptionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); + if (object.subscriptions) { + if (!Array.isArray(object.subscriptions)) + throw TypeError(".google.pubsub.v1.ListTopicSubscriptionsResponse.subscriptions: array expected"); + message.subscriptions = []; + for (var i = 0; i < object.subscriptions.length; ++i) + message.subscriptions[i] = String(object.subscriptions[i]); + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; + + /** + * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSubscriptionsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.subscriptions = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.subscriptions && message.subscriptions.length) { + object.subscriptions = []; + for (var j = 0; j < message.subscriptions.length; ++j) + object.subscriptions[j] = message.subscriptions[j]; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListTopicSubscriptionsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicSubscriptionsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListTopicSubscriptionsResponse; + })(); + + v1.ListTopicSnapshotsRequest = (function() { + + /** + * Properties of a ListTopicSnapshotsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicSnapshotsRequest + * @property {string|null} [topic] ListTopicSnapshotsRequest topic + * @property {number|null} [pageSize] ListTopicSnapshotsRequest pageSize + * @property {string|null} [pageToken] ListTopicSnapshotsRequest pageToken + */ + + /** + * Constructs a new ListTopicSnapshotsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSnapshotsRequest. + * @implements IListTopicSnapshotsRequest + * @constructor + * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set + */ + function ListTopicSnapshotsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListTopicSnapshotsRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.topic = ""; + + /** + * ListTopicSnapshotsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.pageSize = 0; + + /** + * ListTopicSnapshotsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListTopicSnapshotsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest instance + */ + ListTopicSnapshotsRequest.create = function create(properties) { + return new ListTopicSnapshotsRequest(properties); + }; + + /** + * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicSnapshotsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSnapshotsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + */ + ListTopicSnapshotsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsRequest) + return object; + var message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; + + /** + * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.ListTopicSnapshotsRequest} message ListTopicSnapshotsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSnapshotsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = ""; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; + + /** + * Converts this ListTopicSnapshotsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + * @returns {Object.} JSON object + */ + ListTopicSnapshotsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListTopicSnapshotsRequest; + })(); + + v1.ListTopicSnapshotsResponse = (function() { + + /** + * Properties of a ListTopicSnapshotsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicSnapshotsResponse + * @property {Array.|null} [snapshots] ListTopicSnapshotsResponse snapshots + * @property {string|null} [nextPageToken] ListTopicSnapshotsResponse nextPageToken + */ + + /** + * Constructs a new ListTopicSnapshotsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSnapshotsResponse. + * @implements IListTopicSnapshotsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set + */ + function ListTopicSnapshotsResponse(properties) { + this.snapshots = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListTopicSnapshotsResponse snapshots. + * @member {Array.} snapshots + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + */ + ListTopicSnapshotsResponse.prototype.snapshots = $util.emptyArray; + + /** + * ListTopicSnapshotsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + */ + ListTopicSnapshotsResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListTopicSnapshotsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse instance + */ + ListTopicSnapshotsResponse.create = function create(properties) { + return new ListTopicSnapshotsResponse(properties); + }; + + /** + * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.snapshots != null && message.snapshots.length) + for (var i = 0; i < message.snapshots.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshots[i]); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.snapshots && message.snapshots.length)) + message.snapshots = []; + message.snapshots.push(reader.string()); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicSnapshotsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSnapshotsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.snapshots != null && message.hasOwnProperty("snapshots")) { + if (!Array.isArray(message.snapshots)) + return "snapshots: array expected"; + for (var i = 0; i < message.snapshots.length; ++i) + if (!$util.isString(message.snapshots[i])) + return "snapshots: string[] expected"; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + */ + ListTopicSnapshotsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); + if (object.snapshots) { + if (!Array.isArray(object.snapshots)) + throw TypeError(".google.pubsub.v1.ListTopicSnapshotsResponse.snapshots: array expected"); + message.snapshots = []; + for (var i = 0; i < object.snapshots.length; ++i) + message.snapshots[i] = String(object.snapshots[i]); + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; + + /** + * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.ListTopicSnapshotsResponse} message ListTopicSnapshotsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSnapshotsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.snapshots = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.snapshots && message.snapshots.length) { + object.snapshots = []; + for (var j = 0; j < message.snapshots.length; ++j) + object.snapshots[j] = message.snapshots[j]; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListTopicSnapshotsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicSnapshotsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListTopicSnapshotsResponse; + })(); + + v1.DeleteTopicRequest = (function() { + + /** + * Properties of a DeleteTopicRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteTopicRequest + * @property {string|null} [topic] DeleteTopicRequest topic + */ + + /** + * Constructs a new DeleteTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteTopicRequest. + * @implements IDeleteTopicRequest + * @constructor + * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set + */ + function DeleteTopicRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DeleteTopicRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.DeleteTopicRequest + * @instance + */ + DeleteTopicRequest.prototype.topic = ""; + + /** + * Creates a new DeleteTopicRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest instance + */ + DeleteTopicRequest.create = function create(properties) { + return new DeleteTopicRequest(properties); + }; + + /** + * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteTopicRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + return writer; + }; + + /** + * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteTopicRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteTopicRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteTopicRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DeleteTopicRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteTopicRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + return null; + }; + + /** + * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + */ + DeleteTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteTopicRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteTopicRequest(); + if (object.topic != null) + message.topic = String(object.topic); + return message; + }; + + /** + * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.DeleteTopicRequest} message DeleteTopicRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteTopicRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + return object; + }; + + /** + * Converts this DeleteTopicRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteTopicRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteTopicRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return DeleteTopicRequest; + })(); + + v1.Subscriber = (function() { + + /** + * Constructs a new Subscriber service. + * @memberof google.pubsub.v1 + * @classdesc Represents a Subscriber + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function Subscriber(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } + + (Subscriber.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Subscriber; + + /** + * Creates new Subscriber service using the specified rpc implementation. + * @function create + * @memberof google.pubsub.v1.Subscriber + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {Subscriber} RPC service. Useful where requests and/or responses are streamed. + */ + Subscriber.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef CreateSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ + + /** + * Calls CreateSubscription. + * @function createSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object + * @param {google.pubsub.v1.Subscriber.CreateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.createSubscription = function createSubscription(request, callback) { + return this.rpcCall(createSubscription, $root.google.pubsub.v1.Subscription, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "CreateSubscription" }); + + /** + * Calls CreateSubscription. + * @function createSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef GetSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ + + /** + * Calls GetSubscription. + * @function getSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.GetSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.getSubscription = function getSubscription(request, callback) { + return this.rpcCall(getSubscription, $root.google.pubsub.v1.GetSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "GetSubscription" }); + + /** + * Calls GetSubscription. + * @function getSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef UpdateSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ + + /** + * Calls UpdateSubscription. + * @function updateSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.UpdateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.updateSubscription = function updateSubscription(request, callback) { + return this.rpcCall(updateSubscription, $root.google.pubsub.v1.UpdateSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "UpdateSubscription" }); + + /** + * Calls UpdateSubscription. + * @function updateSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ListSubscriptionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListSubscriptionsResponse} [response] ListSubscriptionsResponse + */ + + /** + * Calls ListSubscriptions. + * @function listSubscriptions + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ListSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListSubscriptionsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.listSubscriptions = function listSubscriptions(request, callback) { + return this.rpcCall(listSubscriptions, $root.google.pubsub.v1.ListSubscriptionsRequest, $root.google.pubsub.v1.ListSubscriptionsResponse, request, callback); + }, "name", { value: "ListSubscriptions" }); + + /** + * Calls ListSubscriptions. + * @function listSubscriptions + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef DeleteSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls DeleteSubscription. + * @function deleteSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.DeleteSubscriptionCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.deleteSubscription = function deleteSubscription(request, callback) { + return this.rpcCall(deleteSubscription, $root.google.pubsub.v1.DeleteSubscriptionRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteSubscription" }); + + /** + * Calls DeleteSubscription. + * @function deleteSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ModifyAckDeadlineCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls ModifyAckDeadline. + * @function modifyAckDeadline + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.modifyAckDeadline = function modifyAckDeadline(request, callback) { + return this.rpcCall(modifyAckDeadline, $root.google.pubsub.v1.ModifyAckDeadlineRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "ModifyAckDeadline" }); + + /** + * Calls ModifyAckDeadline. + * @function modifyAckDeadline + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * @memberof google.pubsub.v1.Subscriber + * @typedef AcknowledgeCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls Acknowledge. + * @function acknowledge + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object + * @param {google.pubsub.v1.Subscriber.AcknowledgeCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.acknowledge = function acknowledge(request, callback) { + return this.rpcCall(acknowledge, $root.google.pubsub.v1.AcknowledgeRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "Acknowledge" }); + + /** + * Calls Acknowledge. + * @function acknowledge + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * @memberof google.pubsub.v1.Subscriber + * @typedef PullCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.PullResponse} [response] PullResponse + */ + + /** + * Calls Pull. + * @function pull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object + * @param {google.pubsub.v1.Subscriber.PullCallback} callback Node-style callback called with the error, if any, and PullResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.pull = function pull(request, callback) { + return this.rpcCall(pull, $root.google.pubsub.v1.PullRequest, $root.google.pubsub.v1.PullResponse, request, callback); + }, "name", { value: "Pull" }); + + /** + * Calls Pull. + * @function pull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * @memberof google.pubsub.v1.Subscriber + * @typedef StreamingPullCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.StreamingPullResponse} [response] StreamingPullResponse + */ + + /** + * Calls StreamingPull. + * @function streamingPull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object + * @param {google.pubsub.v1.Subscriber.StreamingPullCallback} callback Node-style callback called with the error, if any, and StreamingPullResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.streamingPull = function streamingPull(request, callback) { + return this.rpcCall(streamingPull, $root.google.pubsub.v1.StreamingPullRequest, $root.google.pubsub.v1.StreamingPullResponse, request, callback); + }, "name", { value: "StreamingPull" }); + + /** + * Calls StreamingPull. + * @function streamingPull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ModifyPushConfigCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls ModifyPushConfig. + * @function modifyPushConfig + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ModifyPushConfigCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.modifyPushConfig = function modifyPushConfig(request, callback) { + return this.rpcCall(modifyPushConfig, $root.google.pubsub.v1.ModifyPushConfigRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "ModifyPushConfig" }); + + /** + * Calls ModifyPushConfig. + * @function modifyPushConfig + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef GetSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ + + /** + * Calls GetSnapshot. + * @function getSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.GetSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.getSnapshot = function getSnapshot(request, callback) { + return this.rpcCall(getSnapshot, $root.google.pubsub.v1.GetSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "GetSnapshot" }); + + /** + * Calls GetSnapshot. + * @function getSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ListSnapshotsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListSnapshotsResponse} [response] ListSnapshotsResponse + */ + + /** + * Calls ListSnapshots. + * @function listSnapshots + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ListSnapshotsCallback} callback Node-style callback called with the error, if any, and ListSnapshotsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.listSnapshots = function listSnapshots(request, callback) { + return this.rpcCall(listSnapshots, $root.google.pubsub.v1.ListSnapshotsRequest, $root.google.pubsub.v1.ListSnapshotsResponse, request, callback); + }, "name", { value: "ListSnapshots" }); + + /** + * Calls ListSnapshots. + * @function listSnapshots + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef CreateSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ + + /** + * Calls CreateSnapshot. + * @function createSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.CreateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.createSnapshot = function createSnapshot(request, callback) { + return this.rpcCall(createSnapshot, $root.google.pubsub.v1.CreateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "CreateSnapshot" }); + + /** + * Calls CreateSnapshot. + * @function createSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef UpdateSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ + + /** + * Calls UpdateSnapshot. + * @function updateSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.UpdateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.updateSnapshot = function updateSnapshot(request, callback) { + return this.rpcCall(updateSnapshot, $root.google.pubsub.v1.UpdateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "UpdateSnapshot" }); + + /** + * Calls UpdateSnapshot. + * @function updateSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef DeleteSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls DeleteSnapshot. + * @function deleteSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.DeleteSnapshotCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.deleteSnapshot = function deleteSnapshot(request, callback) { + return this.rpcCall(deleteSnapshot, $root.google.pubsub.v1.DeleteSnapshotRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteSnapshot" }); + + /** + * Calls DeleteSnapshot. + * @function deleteSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * @memberof google.pubsub.v1.Subscriber + * @typedef SeekCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.SeekResponse} [response] SeekResponse + */ + + /** + * Calls Seek. + * @function seek + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object + * @param {google.pubsub.v1.Subscriber.SeekCallback} callback Node-style callback called with the error, if any, and SeekResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.seek = function seek(request, callback) { + return this.rpcCall(seek, $root.google.pubsub.v1.SeekRequest, $root.google.pubsub.v1.SeekResponse, request, callback); + }, "name", { value: "Seek" }); + + /** + * Calls Seek. + * @function seek + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return Subscriber; + })(); + + v1.Subscription = (function() { + + /** + * Properties of a Subscription. + * @memberof google.pubsub.v1 + * @interface ISubscription + * @property {string|null} [name] Subscription name + * @property {string|null} [topic] Subscription topic + * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] Subscription pushConfig + * @property {number|null} [ackDeadlineSeconds] Subscription ackDeadlineSeconds + * @property {boolean|null} [retainAckedMessages] Subscription retainAckedMessages + * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Subscription messageRetentionDuration + * @property {Object.|null} [labels] Subscription labels + * @property {boolean|null} [enableMessageOrdering] Subscription enableMessageOrdering + * @property {google.pubsub.v1.IExpirationPolicy|null} [expirationPolicy] Subscription expirationPolicy + * @property {google.pubsub.v1.IDeadLetterPolicy|null} [deadLetterPolicy] Subscription deadLetterPolicy + */ + + /** + * Constructs a new Subscription. + * @memberof google.pubsub.v1 + * @classdesc Represents a Subscription. + * @implements ISubscription + * @constructor + * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set + */ + function Subscription(properties) { + this.labels = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Subscription name. + * @member {string} name + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.name = ""; + + /** + * Subscription topic. + * @member {string} topic + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.topic = ""; + + /** + * Subscription pushConfig. + * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.pushConfig = null; + + /** + * Subscription ackDeadlineSeconds. + * @member {number} ackDeadlineSeconds + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.ackDeadlineSeconds = 0; + + /** + * Subscription retainAckedMessages. + * @member {boolean} retainAckedMessages + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.retainAckedMessages = false; + + /** + * Subscription messageRetentionDuration. + * @member {google.protobuf.IDuration|null|undefined} messageRetentionDuration + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.messageRetentionDuration = null; + + /** + * Subscription labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.labels = $util.emptyObject; + + /** + * Subscription enableMessageOrdering. + * @member {boolean} enableMessageOrdering + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.enableMessageOrdering = false; + + /** + * Subscription expirationPolicy. + * @member {google.pubsub.v1.IExpirationPolicy|null|undefined} expirationPolicy + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.expirationPolicy = null; + + /** + * Subscription deadLetterPolicy. + * @member {google.pubsub.v1.IDeadLetterPolicy|null|undefined} deadLetterPolicy + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.deadLetterPolicy = null; + + /** + * Creates a new Subscription instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set + * @returns {google.pubsub.v1.Subscription} Subscription instance + */ + Subscription.create = function create(properties) { + return new Subscription(properties); + }; + + /** + * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Subscription.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.ackDeadlineSeconds); + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + writer.uint32(/* id 7, wireType 0 =*/56).bool(message.retainAckedMessages); + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) + $root.google.protobuf.Duration.encode(message.messageRetentionDuration, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 9, wireType 2 =*/74).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.enableMessageOrdering); + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) + $root.google.pubsub.v1.ExpirationPolicy.encode(message.expirationPolicy, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) + $root.google.pubsub.v1.DeadLetterPolicy.encode(message.deadLetterPolicy, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Subscription.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Subscription message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.Subscription + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.Subscription} Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Subscription.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.topic = reader.string(); + break; + case 4: + message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); + break; + case 5: + message.ackDeadlineSeconds = reader.int32(); + break; + case 7: + message.retainAckedMessages = reader.bool(); + break; + case 8: + message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + case 9: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); + break; + case 10: + message.enableMessageOrdering = reader.bool(); + break; + case 11: + message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.decode(reader, reader.uint32()); + break; + case 13: + message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Subscription message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.Subscription + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.Subscription} Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Subscription.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Subscription message. + * @function verify + * @memberof google.pubsub.v1.Subscription + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Subscription.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { + var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); + if (error) + return "pushConfig." + error; + } + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + if (!$util.isInteger(message.ackDeadlineSeconds)) + return "ackDeadlineSeconds: integer expected"; + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + if (typeof message.retainAckedMessages !== "boolean") + return "retainAckedMessages: boolean expected"; + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) { + var error = $root.google.protobuf.Duration.verify(message.messageRetentionDuration); + if (error) + return "messageRetentionDuration." + error; + } + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; + } + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + if (typeof message.enableMessageOrdering !== "boolean") + return "enableMessageOrdering: boolean expected"; + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) { + var error = $root.google.pubsub.v1.ExpirationPolicy.verify(message.expirationPolicy); + if (error) + return "expirationPolicy." + error; + } + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) { + var error = $root.google.pubsub.v1.DeadLetterPolicy.verify(message.deadLetterPolicy); + if (error) + return "deadLetterPolicy." + error; + } + return null; + }; + + /** + * Creates a Subscription message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.Subscription + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.Subscription} Subscription + */ + Subscription.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Subscription) + return object; + var message = new $root.google.pubsub.v1.Subscription(); + if (object.name != null) + message.name = String(object.name); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pushConfig != null) { + if (typeof object.pushConfig !== "object") + throw TypeError(".google.pubsub.v1.Subscription.pushConfig: object expected"); + message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); + } + if (object.ackDeadlineSeconds != null) + message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; + if (object.retainAckedMessages != null) + message.retainAckedMessages = Boolean(object.retainAckedMessages); + if (object.messageRetentionDuration != null) { + if (typeof object.messageRetentionDuration !== "object") + throw TypeError(".google.pubsub.v1.Subscription.messageRetentionDuration: object expected"); + message.messageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.messageRetentionDuration); + } + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Subscription.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); + } + if (object.enableMessageOrdering != null) + message.enableMessageOrdering = Boolean(object.enableMessageOrdering); + if (object.expirationPolicy != null) { + if (typeof object.expirationPolicy !== "object") + throw TypeError(".google.pubsub.v1.Subscription.expirationPolicy: object expected"); + message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.fromObject(object.expirationPolicy); + } + if (object.deadLetterPolicy != null) { + if (typeof object.deadLetterPolicy !== "object") + throw TypeError(".google.pubsub.v1.Subscription.deadLetterPolicy: object expected"); + message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.fromObject(object.deadLetterPolicy); + } + return message; + }; + + /** + * Creates a plain object from a Subscription message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.Subscription} message Subscription + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Subscription.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.topic = ""; + object.pushConfig = null; + object.ackDeadlineSeconds = 0; + object.retainAckedMessages = false; + object.messageRetentionDuration = null; + object.enableMessageOrdering = false; + object.expirationPolicy = null; + object.deadLetterPolicy = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + object.ackDeadlineSeconds = message.ackDeadlineSeconds; + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + object.retainAckedMessages = message.retainAckedMessages; + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) + object.messageRetentionDuration = $root.google.protobuf.Duration.toObject(message.messageRetentionDuration, options); + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + object.enableMessageOrdering = message.enableMessageOrdering; + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) + object.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.toObject(message.expirationPolicy, options); + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) + object.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.toObject(message.deadLetterPolicy, options); + return object; + }; + + /** + * Converts this Subscription to JSON. + * @function toJSON + * @memberof google.pubsub.v1.Subscription + * @instance + * @returns {Object.} JSON object + */ + Subscription.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Subscription; + })(); + + v1.DeadLetterPolicy = (function() { + + /** + * Properties of a DeadLetterPolicy. + * @memberof google.pubsub.v1 + * @interface IDeadLetterPolicy + * @property {string|null} [deadLetterTopic] DeadLetterPolicy deadLetterTopic + * @property {number|null} [maxDeliveryAttempts] DeadLetterPolicy maxDeliveryAttempts + */ + + /** + * Constructs a new DeadLetterPolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeadLetterPolicy. + * @implements IDeadLetterPolicy + * @constructor + * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set + */ + function DeadLetterPolicy(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DeadLetterPolicy deadLetterTopic. + * @member {string} deadLetterTopic + * @memberof google.pubsub.v1.DeadLetterPolicy + * @instance + */ + DeadLetterPolicy.prototype.deadLetterTopic = ""; + + /** + * DeadLetterPolicy maxDeliveryAttempts. + * @member {number} maxDeliveryAttempts + * @memberof google.pubsub.v1.DeadLetterPolicy + * @instance + */ + DeadLetterPolicy.prototype.maxDeliveryAttempts = 0; + + /** + * Creates a new DeadLetterPolicy instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy instance + */ + DeadLetterPolicy.create = function create(properties) { + return new DeadLetterPolicy(properties); + }; + + /** + * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeadLetterPolicy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.deadLetterTopic); + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.maxDeliveryAttempts); + return writer; + }; + + /** + * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeadLetterPolicy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DeadLetterPolicy message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeadLetterPolicy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeadLetterPolicy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.deadLetterTopic = reader.string(); + break; + case 2: + message.maxDeliveryAttempts = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeadLetterPolicy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DeadLetterPolicy message. + * @function verify + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeadLetterPolicy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + if (!$util.isString(message.deadLetterTopic)) + return "deadLetterTopic: string expected"; + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + if (!$util.isInteger(message.maxDeliveryAttempts)) + return "maxDeliveryAttempts: integer expected"; + return null; + }; + + /** + * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + */ + DeadLetterPolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeadLetterPolicy) + return object; + var message = new $root.google.pubsub.v1.DeadLetterPolicy(); + if (object.deadLetterTopic != null) + message.deadLetterTopic = String(object.deadLetterTopic); + if (object.maxDeliveryAttempts != null) + message.maxDeliveryAttempts = object.maxDeliveryAttempts | 0; + return message; + }; + + /** + * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {google.pubsub.v1.DeadLetterPolicy} message DeadLetterPolicy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeadLetterPolicy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.deadLetterTopic = ""; + object.maxDeliveryAttempts = 0; + } + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + object.deadLetterTopic = message.deadLetterTopic; + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + object.maxDeliveryAttempts = message.maxDeliveryAttempts; + return object; + }; + + /** + * Converts this DeadLetterPolicy to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeadLetterPolicy + * @instance + * @returns {Object.} JSON object + */ + DeadLetterPolicy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return DeadLetterPolicy; + })(); + + v1.ExpirationPolicy = (function() { + + /** + * Properties of an ExpirationPolicy. + * @memberof google.pubsub.v1 + * @interface IExpirationPolicy + * @property {google.protobuf.IDuration|null} [ttl] ExpirationPolicy ttl + */ + + /** + * Constructs a new ExpirationPolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents an ExpirationPolicy. + * @implements IExpirationPolicy + * @constructor + * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set + */ + function ExpirationPolicy(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ExpirationPolicy ttl. + * @member {google.protobuf.IDuration|null|undefined} ttl + * @memberof google.pubsub.v1.ExpirationPolicy + * @instance + */ + ExpirationPolicy.prototype.ttl = null; + + /** + * Creates a new ExpirationPolicy instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy instance + */ + ExpirationPolicy.create = function create(properties) { + return new ExpirationPolicy(properties); + }; + + /** + * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExpirationPolicy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ttl != null && message.hasOwnProperty("ttl")) + $root.google.protobuf.Duration.encode(message.ttl, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExpirationPolicy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExpirationPolicy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ExpirationPolicy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ttl = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExpirationPolicy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ExpirationPolicy message. + * @function verify + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExpirationPolicy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ttl != null && message.hasOwnProperty("ttl")) { + var error = $root.google.protobuf.Duration.verify(message.ttl); + if (error) + return "ttl." + error; + } + return null; + }; + + /** + * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + */ + ExpirationPolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ExpirationPolicy) + return object; + var message = new $root.google.pubsub.v1.ExpirationPolicy(); + if (object.ttl != null) { + if (typeof object.ttl !== "object") + throw TypeError(".google.pubsub.v1.ExpirationPolicy.ttl: object expected"); + message.ttl = $root.google.protobuf.Duration.fromObject(object.ttl); + } + return message; + }; + + /** + * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.ExpirationPolicy} message ExpirationPolicy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExpirationPolicy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.ttl = null; + if (message.ttl != null && message.hasOwnProperty("ttl")) + object.ttl = $root.google.protobuf.Duration.toObject(message.ttl, options); + return object; + }; + + /** + * Converts this ExpirationPolicy to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ExpirationPolicy + * @instance + * @returns {Object.} JSON object + */ + ExpirationPolicy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ExpirationPolicy; + })(); + + v1.PushConfig = (function() { + + /** + * Properties of a PushConfig. + * @memberof google.pubsub.v1 + * @interface IPushConfig + * @property {string|null} [pushEndpoint] PushConfig pushEndpoint + * @property {Object.|null} [attributes] PushConfig attributes + * @property {google.pubsub.v1.PushConfig.IOidcToken|null} [oidcToken] PushConfig oidcToken + */ + + /** + * Constructs a new PushConfig. + * @memberof google.pubsub.v1 + * @classdesc Represents a PushConfig. + * @implements IPushConfig + * @constructor + * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set + */ + function PushConfig(properties) { + this.attributes = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PushConfig pushEndpoint. + * @member {string} pushEndpoint + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.pushEndpoint = ""; + + /** + * PushConfig attributes. + * @member {Object.} attributes + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.attributes = $util.emptyObject; + + /** + * PushConfig oidcToken. + * @member {google.pubsub.v1.PushConfig.IOidcToken|null|undefined} oidcToken + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.oidcToken = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * PushConfig authenticationMethod. + * @member {"oidcToken"|undefined} authenticationMethod + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + Object.defineProperty(PushConfig.prototype, "authenticationMethod", { + get: $util.oneOfGetter($oneOfFields = ["oidcToken"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new PushConfig instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set + * @returns {google.pubsub.v1.PushConfig} PushConfig instance + */ + PushConfig.create = function create(properties) { + return new PushConfig(properties); + }; + + /** + * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PushConfig.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.pushEndpoint); + if (message.attributes != null && message.hasOwnProperty("attributes")) + for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) + $root.google.pubsub.v1.PushConfig.OidcToken.encode(message.oidcToken, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PushConfig.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PushConfig message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PushConfig} PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PushConfig.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.pushEndpoint = reader.string(); + break; + case 2: + reader.skip().pos++; + if (message.attributes === $util.emptyObject) + message.attributes = {}; + key = reader.string(); + reader.pos++; + message.attributes[key] = reader.string(); + break; + case 3: + message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PushConfig message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PushConfig} PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PushConfig.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PushConfig message. + * @function verify + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PushConfig.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + if (!$util.isString(message.pushEndpoint)) + return "pushEndpoint: string expected"; + if (message.attributes != null && message.hasOwnProperty("attributes")) { + if (!$util.isObject(message.attributes)) + return "attributes: object expected"; + var key = Object.keys(message.attributes); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.attributes[key[i]])) + return "attributes: string{k:string} expected"; + } + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { + properties.authenticationMethod = 1; + { + var error = $root.google.pubsub.v1.PushConfig.OidcToken.verify(message.oidcToken); + if (error) + return "oidcToken." + error; + } + } + return null; + }; + + /** + * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PushConfig} PushConfig + */ + PushConfig.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PushConfig) + return object; + var message = new $root.google.pubsub.v1.PushConfig(); + if (object.pushEndpoint != null) + message.pushEndpoint = String(object.pushEndpoint); + if (object.attributes) { + if (typeof object.attributes !== "object") + throw TypeError(".google.pubsub.v1.PushConfig.attributes: object expected"); + message.attributes = {}; + for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) + message.attributes[keys[i]] = String(object.attributes[keys[i]]); + } + if (object.oidcToken != null) { + if (typeof object.oidcToken !== "object") + throw TypeError(".google.pubsub.v1.PushConfig.oidcToken: object expected"); + message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.fromObject(object.oidcToken); + } + return message; + }; + + /** + * Creates a plain object from a PushConfig message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.PushConfig} message PushConfig + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PushConfig.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.attributes = {}; + if (options.defaults) + object.pushEndpoint = ""; + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + object.pushEndpoint = message.pushEndpoint; + var keys2; + if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { + object.attributes = {}; + for (var j = 0; j < keys2.length; ++j) + object.attributes[keys2[j]] = message.attributes[keys2[j]]; + } + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { + object.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.toObject(message.oidcToken, options); + if (options.oneofs) + object.authenticationMethod = "oidcToken"; + } + return object; + }; + + /** + * Converts this PushConfig to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PushConfig + * @instance + * @returns {Object.} JSON object + */ + PushConfig.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + PushConfig.OidcToken = (function() { + + /** + * Properties of an OidcToken. + * @memberof google.pubsub.v1.PushConfig + * @interface IOidcToken + * @property {string|null} [serviceAccountEmail] OidcToken serviceAccountEmail + * @property {string|null} [audience] OidcToken audience + */ + + /** + * Constructs a new OidcToken. + * @memberof google.pubsub.v1.PushConfig + * @classdesc Represents an OidcToken. + * @implements IOidcToken + * @constructor + * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set + */ + function OidcToken(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * OidcToken serviceAccountEmail. + * @member {string} serviceAccountEmail + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + */ + OidcToken.prototype.serviceAccountEmail = ""; + + /** + * OidcToken audience. + * @member {string} audience + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + */ + OidcToken.prototype.audience = ""; + + /** + * Creates a new OidcToken instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken instance + */ + OidcToken.create = function create(properties) { + return new OidcToken(properties); + }; + + /** + * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OidcToken.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.serviceAccountEmail); + if (message.audience != null && message.hasOwnProperty("audience")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.audience); + return writer; + }; + + /** + * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OidcToken.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an OidcToken message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OidcToken.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.OidcToken(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.serviceAccountEmail = reader.string(); + break; + case 2: + message.audience = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an OidcToken message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OidcToken.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an OidcToken message. + * @function verify + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OidcToken.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + if (!$util.isString(message.serviceAccountEmail)) + return "serviceAccountEmail: string expected"; + if (message.audience != null && message.hasOwnProperty("audience")) + if (!$util.isString(message.audience)) + return "audience: string expected"; + return null; + }; + + /** + * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + */ + OidcToken.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PushConfig.OidcToken) + return object; + var message = new $root.google.pubsub.v1.PushConfig.OidcToken(); + if (object.serviceAccountEmail != null) + message.serviceAccountEmail = String(object.serviceAccountEmail); + if (object.audience != null) + message.audience = String(object.audience); + return message; + }; + + /** + * Creates a plain object from an OidcToken message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.OidcToken} message OidcToken + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OidcToken.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.serviceAccountEmail = ""; + object.audience = ""; + } + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + object.serviceAccountEmail = message.serviceAccountEmail; + if (message.audience != null && message.hasOwnProperty("audience")) + object.audience = message.audience; + return object; + }; + + /** + * Converts this OidcToken to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + * @returns {Object.} JSON object + */ + OidcToken.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return OidcToken; + })(); + + return PushConfig; + })(); + + v1.ReceivedMessage = (function() { + + /** + * Properties of a ReceivedMessage. + * @memberof google.pubsub.v1 + * @interface IReceivedMessage + * @property {string|null} [ackId] ReceivedMessage ackId + * @property {google.pubsub.v1.IPubsubMessage|null} [message] ReceivedMessage message + * @property {number|null} [deliveryAttempt] ReceivedMessage deliveryAttempt + */ + + /** + * Constructs a new ReceivedMessage. + * @memberof google.pubsub.v1 + * @classdesc Represents a ReceivedMessage. + * @implements IReceivedMessage + * @constructor + * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set + */ + function ReceivedMessage(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ReceivedMessage ackId. + * @member {string} ackId + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.ackId = ""; + + /** + * ReceivedMessage message. + * @member {google.pubsub.v1.IPubsubMessage|null|undefined} message + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.message = null; + + /** + * ReceivedMessage deliveryAttempt. + * @member {number} deliveryAttempt + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.deliveryAttempt = 0; + + /** + * Creates a new ReceivedMessage instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage instance + */ + ReceivedMessage.create = function create(properties) { + return new ReceivedMessage(properties); + }; + + /** + * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ReceivedMessage.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ackId != null && message.hasOwnProperty("ackId")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.ackId); + if (message.message != null && message.hasOwnProperty("message")) + $root.google.pubsub.v1.PubsubMessage.encode(message.message, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.deliveryAttempt); + return writer; + }; + + /** + * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ReceivedMessage.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ReceivedMessage message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ReceivedMessage.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ReceivedMessage(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ackId = reader.string(); + break; + case 2: + message.message = $root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32()); + break; + case 3: + message.deliveryAttempt = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ReceivedMessage.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ReceivedMessage message. + * @function verify + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ReceivedMessage.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ackId != null && message.hasOwnProperty("ackId")) + if (!$util.isString(message.ackId)) + return "ackId: string expected"; + if (message.message != null && message.hasOwnProperty("message")) { + var error = $root.google.pubsub.v1.PubsubMessage.verify(message.message); + if (error) + return "message." + error; + } + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + if (!$util.isInteger(message.deliveryAttempt)) + return "deliveryAttempt: integer expected"; + return null; + }; + + /** + * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + */ + ReceivedMessage.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ReceivedMessage) + return object; + var message = new $root.google.pubsub.v1.ReceivedMessage(); + if (object.ackId != null) + message.ackId = String(object.ackId); + if (object.message != null) { + if (typeof object.message !== "object") + throw TypeError(".google.pubsub.v1.ReceivedMessage.message: object expected"); + message.message = $root.google.pubsub.v1.PubsubMessage.fromObject(object.message); + } + if (object.deliveryAttempt != null) + message.deliveryAttempt = object.deliveryAttempt | 0; + return message; + }; + + /** + * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.ReceivedMessage} message ReceivedMessage + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ReceivedMessage.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.ackId = ""; + object.message = null; + object.deliveryAttempt = 0; + } + if (message.ackId != null && message.hasOwnProperty("ackId")) + object.ackId = message.ackId; + if (message.message != null && message.hasOwnProperty("message")) + object.message = $root.google.pubsub.v1.PubsubMessage.toObject(message.message, options); + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + object.deliveryAttempt = message.deliveryAttempt; + return object; + }; + + /** + * Converts this ReceivedMessage to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + * @returns {Object.} JSON object + */ + ReceivedMessage.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ReceivedMessage; + })(); + + v1.GetSubscriptionRequest = (function() { + + /** + * Properties of a GetSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IGetSubscriptionRequest + * @property {string|null} [subscription] GetSubscriptionRequest subscription + */ + + /** + * Constructs a new GetSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetSubscriptionRequest. + * @implements IGetSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set + */ + function GetSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetSubscriptionRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @instance + */ + GetSubscriptionRequest.prototype.subscription = ""; + + /** + * Creates a new GetSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest instance + */ + GetSubscriptionRequest.create = function create(properties) { + return new GetSubscriptionRequest(properties); + }; + + /** + * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + return writer; + }; + + /** + * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GetSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + return null; + }; + + /** + * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest + */ + GetSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.GetSubscriptionRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + return message; + }; + + /** + * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {google.pubsub.v1.GetSubscriptionRequest} message GetSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GetSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + return object; + }; + + /** + * Converts this GetSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + GetSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return GetSubscriptionRequest; + })(); + + v1.UpdateSubscriptionRequest = (function() { + + /** + * Properties of an UpdateSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IUpdateSubscriptionRequest + * @property {google.pubsub.v1.ISubscription|null} [subscription] UpdateSubscriptionRequest subscription + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSubscriptionRequest updateMask + */ + + /** + * Constructs a new UpdateSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an UpdateSubscriptionRequest. + * @implements IUpdateSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set + */ + function UpdateSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * UpdateSubscriptionRequest subscription. + * @member {google.pubsub.v1.ISubscription|null|undefined} subscription + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + */ + UpdateSubscriptionRequest.prototype.subscription = null; + + /** + * UpdateSubscriptionRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + */ + UpdateSubscriptionRequest.prototype.updateMask = null; + + /** + * Creates a new UpdateSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest instance + */ + UpdateSubscriptionRequest.create = function create(properties) { + return new UpdateSubscriptionRequest(properties); + }; + + /** + * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + $root.google.pubsub.v1.Subscription.encode(message.subscription, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = $root.google.pubsub.v1.Subscription.decode(reader, reader.uint32()); + break; + case 2: + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an UpdateSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + UpdateSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) { + var error = $root.google.pubsub.v1.Subscription.verify(message.subscription); + if (error) + return "subscription." + error; + } + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + if (error) + return "updateMask." + error; + } + return null; + }; + + /** + * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + */ + UpdateSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); + if (object.subscription != null) { + if (typeof object.subscription !== "object") + throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.subscription: object expected"); + message.subscription = $root.google.pubsub.v1.Subscription.fromObject(object.subscription); + } + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + } + return message; + }; + + /** + * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.UpdateSubscriptionRequest} message UpdateSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UpdateSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = null; + object.updateMask = null; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = $root.google.pubsub.v1.Subscription.toObject(message.subscription, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); + return object; + }; + + /** + * Converts this UpdateSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + UpdateSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return UpdateSubscriptionRequest; + })(); + + v1.ListSubscriptionsRequest = (function() { + + /** + * Properties of a ListSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @interface IListSubscriptionsRequest + * @property {string|null} [project] ListSubscriptionsRequest project + * @property {number|null} [pageSize] ListSubscriptionsRequest pageSize + * @property {string|null} [pageToken] ListSubscriptionsRequest pageToken + */ + + /** + * Constructs a new ListSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSubscriptionsRequest. + * @implements IListSubscriptionsRequest + * @constructor + * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set + */ + function ListSubscriptionsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListSubscriptionsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + */ + ListSubscriptionsRequest.prototype.project = ""; + + /** + * ListSubscriptionsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + */ + ListSubscriptionsRequest.prototype.pageSize = 0; + + /** + * ListSubscriptionsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + */ + ListSubscriptionsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListSubscriptionsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest instance + */ + ListSubscriptionsRequest.create = function create(properties) { + return new ListSubscriptionsRequest(properties); + }; + + /** + * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSubscriptionsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; + + /** + * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSubscriptionsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.project = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListSubscriptionsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSubscriptionsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + */ + ListSubscriptionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSubscriptionsRequest) + return object; + var message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; + + /** + * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {google.pubsub.v1.ListSubscriptionsRequest} message ListSubscriptionsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSubscriptionsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; + + /** + * Converts this ListSubscriptionsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + * @returns {Object.} JSON object + */ + ListSubscriptionsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListSubscriptionsRequest; + })(); + + v1.ListSubscriptionsResponse = (function() { + + /** + * Properties of a ListSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @interface IListSubscriptionsResponse + * @property {Array.|null} [subscriptions] ListSubscriptionsResponse subscriptions + * @property {string|null} [nextPageToken] ListSubscriptionsResponse nextPageToken + */ + + /** + * Constructs a new ListSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSubscriptionsResponse. + * @implements IListSubscriptionsResponse + * @constructor + * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set + */ + function ListSubscriptionsResponse(properties) { + this.subscriptions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListSubscriptionsResponse subscriptions. + * @member {Array.} subscriptions + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @instance + */ + ListSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; + + /** + * ListSubscriptionsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @instance + */ + ListSubscriptionsResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListSubscriptionsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse instance + */ + ListSubscriptionsResponse.create = function create(properties) { + return new ListSubscriptionsResponse(properties); + }; + + /** + * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSubscriptionsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscriptions != null && message.subscriptions.length) + for (var i = 0; i < message.subscriptions.length; ++i) + $root.google.pubsub.v1.Subscription.encode(message.subscriptions[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSubscriptionsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.subscriptions && message.subscriptions.length)) + message.subscriptions = []; + message.subscriptions.push($root.google.pubsub.v1.Subscription.decode(reader, reader.uint32())); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListSubscriptionsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSubscriptionsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { + if (!Array.isArray(message.subscriptions)) + return "subscriptions: array expected"; + for (var i = 0; i < message.subscriptions.length; ++i) { + var error = $root.google.pubsub.v1.Subscription.verify(message.subscriptions[i]); + if (error) + return "subscriptions." + error; + } + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; + + /** + * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + */ + ListSubscriptionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSubscriptionsResponse) + return object; + var message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); + if (object.subscriptions) { + if (!Array.isArray(object.subscriptions)) + throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: array expected"); + message.subscriptions = []; + for (var i = 0; i < object.subscriptions.length; ++i) { + if (typeof object.subscriptions[i] !== "object") + throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: object expected"); + message.subscriptions[i] = $root.google.pubsub.v1.Subscription.fromObject(object.subscriptions[i]); + } + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; + + /** + * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {google.pubsub.v1.ListSubscriptionsResponse} message ListSubscriptionsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSubscriptionsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.subscriptions = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.subscriptions && message.subscriptions.length) { + object.subscriptions = []; + for (var j = 0; j < message.subscriptions.length; ++j) + object.subscriptions[j] = $root.google.pubsub.v1.Subscription.toObject(message.subscriptions[j], options); + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListSubscriptionsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @instance + * @returns {Object.} JSON object + */ + ListSubscriptionsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListSubscriptionsResponse; + })(); + + v1.DeleteSubscriptionRequest = (function() { + + /** + * Properties of a DeleteSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteSubscriptionRequest + * @property {string|null} [subscription] DeleteSubscriptionRequest subscription + */ + + /** + * Constructs a new DeleteSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteSubscriptionRequest. + * @implements IDeleteSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set + */ + function DeleteSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DeleteSubscriptionRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @instance + */ + DeleteSubscriptionRequest.prototype.subscription = ""; + + /** + * Creates a new DeleteSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest instance + */ + DeleteSubscriptionRequest.create = function create(properties) { + return new DeleteSubscriptionRequest(properties); + }; + + /** + * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + return writer; + }; + + /** + * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DeleteSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + return null; + }; + + /** + * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + */ + DeleteSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + return message; + }; + + /** + * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.DeleteSubscriptionRequest} message DeleteSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + return object; + }; + + /** + * Converts this DeleteSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return DeleteSubscriptionRequest; + })(); + + v1.ModifyPushConfigRequest = (function() { + + /** + * Properties of a ModifyPushConfigRequest. + * @memberof google.pubsub.v1 + * @interface IModifyPushConfigRequest + * @property {string|null} [subscription] ModifyPushConfigRequest subscription + * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] ModifyPushConfigRequest pushConfig + */ + + /** + * Constructs a new ModifyPushConfigRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ModifyPushConfigRequest. + * @implements IModifyPushConfigRequest + * @constructor + * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set + */ + function ModifyPushConfigRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ModifyPushConfigRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @instance + */ + ModifyPushConfigRequest.prototype.subscription = ""; + + /** + * ModifyPushConfigRequest pushConfig. + * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @instance + */ + ModifyPushConfigRequest.prototype.pushConfig = null; + + /** + * Creates a new ModifyPushConfigRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest instance + */ + ModifyPushConfigRequest.create = function create(properties) { + return new ModifyPushConfigRequest(properties); + }; + + /** + * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyPushConfigRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyPushConfigRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyPushConfigRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyPushConfigRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ModifyPushConfigRequest message. + * @function verify + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ModifyPushConfigRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { + var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); + if (error) + return "pushConfig." + error; + } + return null; + }; + + /** + * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest + */ + ModifyPushConfigRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ModifyPushConfigRequest) + return object; + var message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.pushConfig != null) { + if (typeof object.pushConfig !== "object") + throw TypeError(".google.pubsub.v1.ModifyPushConfigRequest.pushConfig: object expected"); + message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); + } + return message; + }; + + /** + * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.ModifyPushConfigRequest} message ModifyPushConfigRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ModifyPushConfigRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = ""; + object.pushConfig = null; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); + return object; + }; + + /** + * Converts this ModifyPushConfigRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @instance + * @returns {Object.} JSON object + */ + ModifyPushConfigRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ModifyPushConfigRequest; + })(); + + v1.PullRequest = (function() { + + /** + * Properties of a PullRequest. + * @memberof google.pubsub.v1 + * @interface IPullRequest + * @property {string|null} [subscription] PullRequest subscription + * @property {boolean|null} [returnImmediately] PullRequest returnImmediately + * @property {number|null} [maxMessages] PullRequest maxMessages + */ + + /** + * Constructs a new PullRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a PullRequest. + * @implements IPullRequest + * @constructor + * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set + */ + function PullRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PullRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.subscription = ""; + + /** + * PullRequest returnImmediately. + * @member {boolean} returnImmediately + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.returnImmediately = false; + + /** + * PullRequest maxMessages. + * @member {number} maxMessages + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.maxMessages = 0; + + /** + * Creates a new PullRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.PullRequest} PullRequest instance + */ + PullRequest.create = function create(properties) { + return new PullRequest(properties); + }; + + /** + * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.returnImmediately); + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.maxMessages); + return writer; + }; + + /** + * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PullRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PullRequest} PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + message.returnImmediately = reader.bool(); + break; + case 3: + message.maxMessages = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PullRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PullRequest} PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PullRequest message. + * @function verify + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PullRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + if (typeof message.returnImmediately !== "boolean") + return "returnImmediately: boolean expected"; + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + if (!$util.isInteger(message.maxMessages)) + return "maxMessages: integer expected"; + return null; + }; + + /** + * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PullRequest} PullRequest + */ + PullRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PullRequest) + return object; + var message = new $root.google.pubsub.v1.PullRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.returnImmediately != null) + message.returnImmediately = Boolean(object.returnImmediately); + if (object.maxMessages != null) + message.maxMessages = object.maxMessages | 0; + return message; + }; + + /** + * Creates a plain object from a PullRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.PullRequest} message PullRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PullRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = ""; + object.returnImmediately = false; + object.maxMessages = 0; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + object.returnImmediately = message.returnImmediately; + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + object.maxMessages = message.maxMessages; + return object; + }; + + /** + * Converts this PullRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PullRequest + * @instance + * @returns {Object.} JSON object + */ + PullRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return PullRequest; + })(); + + v1.PullResponse = (function() { + + /** + * Properties of a PullResponse. + * @memberof google.pubsub.v1 + * @interface IPullResponse + * @property {Array.|null} [receivedMessages] PullResponse receivedMessages + */ + + /** + * Constructs a new PullResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a PullResponse. + * @implements IPullResponse + * @constructor + * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set + */ + function PullResponse(properties) { + this.receivedMessages = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PullResponse receivedMessages. + * @member {Array.} receivedMessages + * @memberof google.pubsub.v1.PullResponse + * @instance + */ + PullResponse.prototype.receivedMessages = $util.emptyArray; + + /** + * Creates a new PullResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.PullResponse} PullResponse instance + */ + PullResponse.create = function create(properties) { + return new PullResponse(properties); + }; + + /** + * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.receivedMessages != null && message.receivedMessages.length) + for (var i = 0; i < message.receivedMessages.length; ++i) + $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PullResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PullResponse} PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.receivedMessages && message.receivedMessages.length)) + message.receivedMessages = []; + message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PullResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PullResponse} PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PullResponse message. + * @function verify + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PullResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { + if (!Array.isArray(message.receivedMessages)) + return "receivedMessages: array expected"; + for (var i = 0; i < message.receivedMessages.length; ++i) { + var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); + if (error) + return "receivedMessages." + error; + } + } + return null; + }; + + /** + * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PullResponse} PullResponse + */ + PullResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PullResponse) + return object; + var message = new $root.google.pubsub.v1.PullResponse(); + if (object.receivedMessages) { + if (!Array.isArray(object.receivedMessages)) + throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: array expected"); + message.receivedMessages = []; + for (var i = 0; i < object.receivedMessages.length; ++i) { + if (typeof object.receivedMessages[i] !== "object") + throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: object expected"); + message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a PullResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.PullResponse} message PullResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PullResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.receivedMessages = []; + if (message.receivedMessages && message.receivedMessages.length) { + object.receivedMessages = []; + for (var j = 0; j < message.receivedMessages.length; ++j) + object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); + } + return object; + }; + + /** + * Converts this PullResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PullResponse + * @instance + * @returns {Object.} JSON object + */ + PullResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return PullResponse; + })(); + + v1.ModifyAckDeadlineRequest = (function() { + + /** + * Properties of a ModifyAckDeadlineRequest. + * @memberof google.pubsub.v1 + * @interface IModifyAckDeadlineRequest + * @property {string|null} [subscription] ModifyAckDeadlineRequest subscription + * @property {Array.|null} [ackIds] ModifyAckDeadlineRequest ackIds + * @property {number|null} [ackDeadlineSeconds] ModifyAckDeadlineRequest ackDeadlineSeconds + */ + + /** + * Constructs a new ModifyAckDeadlineRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ModifyAckDeadlineRequest. + * @implements IModifyAckDeadlineRequest + * @constructor + * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set + */ + function ModifyAckDeadlineRequest(properties) { + this.ackIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ModifyAckDeadlineRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.subscription = ""; + + /** + * ModifyAckDeadlineRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.ackIds = $util.emptyArray; + + /** + * ModifyAckDeadlineRequest ackDeadlineSeconds. + * @member {number} ackDeadlineSeconds + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.ackDeadlineSeconds = 0; + + /** + * Creates a new ModifyAckDeadlineRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest instance + */ + ModifyAckDeadlineRequest.create = function create(properties) { + return new ModifyAckDeadlineRequest(properties); + }; + + /** + * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyAckDeadlineRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.ackDeadlineSeconds); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.ackIds[i]); + return writer; + }; + + /** + * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyAckDeadlineRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyAckDeadlineRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 4: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + case 3: + message.ackDeadlineSeconds = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyAckDeadlineRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ModifyAckDeadlineRequest message. + * @function verify + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ModifyAckDeadlineRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + if (!$util.isInteger(message.ackDeadlineSeconds)) + return "ackDeadlineSeconds: integer expected"; + return null; + }; + + /** + * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + */ + ModifyAckDeadlineRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ModifyAckDeadlineRequest) + return object; + var message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.ModifyAckDeadlineRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + if (object.ackDeadlineSeconds != null) + message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; + return message; + }; + + /** + * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.ModifyAckDeadlineRequest} message ModifyAckDeadlineRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ModifyAckDeadlineRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.ackIds = []; + if (options.defaults) { + object.subscription = ""; + object.ackDeadlineSeconds = 0; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + object.ackDeadlineSeconds = message.ackDeadlineSeconds; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + return object; + }; + + /** + * Converts this ModifyAckDeadlineRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + * @returns {Object.} JSON object + */ + ModifyAckDeadlineRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ModifyAckDeadlineRequest; + })(); + + v1.AcknowledgeRequest = (function() { + + /** + * Properties of an AcknowledgeRequest. + * @memberof google.pubsub.v1 + * @interface IAcknowledgeRequest + * @property {string|null} [subscription] AcknowledgeRequest subscription + * @property {Array.|null} [ackIds] AcknowledgeRequest ackIds + */ + + /** + * Constructs a new AcknowledgeRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an AcknowledgeRequest. + * @implements IAcknowledgeRequest + * @constructor + * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set + */ + function AcknowledgeRequest(properties) { + this.ackIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * AcknowledgeRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.AcknowledgeRequest + * @instance + */ + AcknowledgeRequest.prototype.subscription = ""; + + /** + * AcknowledgeRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.AcknowledgeRequest + * @instance + */ + AcknowledgeRequest.prototype.ackIds = $util.emptyArray; + + /** + * Creates a new AcknowledgeRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest instance + */ + AcknowledgeRequest.create = function create(properties) { + return new AcknowledgeRequest(properties); + }; + + /** + * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AcknowledgeRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); + return writer; + }; + + /** + * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AcknowledgeRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AcknowledgeRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.AcknowledgeRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AcknowledgeRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AcknowledgeRequest message. + * @function verify + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AcknowledgeRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + return null; + }; + + /** + * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + */ + AcknowledgeRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.AcknowledgeRequest) + return object; + var message = new $root.google.pubsub.v1.AcknowledgeRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.AcknowledgeRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + return message; + }; + + /** + * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.AcknowledgeRequest} message AcknowledgeRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AcknowledgeRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.ackIds = []; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + return object; + }; + + /** + * Converts this AcknowledgeRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.AcknowledgeRequest + * @instance + * @returns {Object.} JSON object + */ + AcknowledgeRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return AcknowledgeRequest; + })(); + + v1.StreamingPullRequest = (function() { + + /** + * Properties of a StreamingPullRequest. + * @memberof google.pubsub.v1 + * @interface IStreamingPullRequest + * @property {string|null} [subscription] StreamingPullRequest subscription + * @property {Array.|null} [ackIds] StreamingPullRequest ackIds + * @property {Array.|null} [modifyDeadlineSeconds] StreamingPullRequest modifyDeadlineSeconds + * @property {Array.|null} [modifyDeadlineAckIds] StreamingPullRequest modifyDeadlineAckIds + * @property {number|null} [streamAckDeadlineSeconds] StreamingPullRequest streamAckDeadlineSeconds + */ + + /** + * Constructs a new StreamingPullRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a StreamingPullRequest. + * @implements IStreamingPullRequest + * @constructor + * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set + */ + function StreamingPullRequest(properties) { + this.ackIds = []; + this.modifyDeadlineSeconds = []; + this.modifyDeadlineAckIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * StreamingPullRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.subscription = ""; + + /** + * StreamingPullRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.ackIds = $util.emptyArray; + + /** + * StreamingPullRequest modifyDeadlineSeconds. + * @member {Array.} modifyDeadlineSeconds + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.modifyDeadlineSeconds = $util.emptyArray; + + /** + * StreamingPullRequest modifyDeadlineAckIds. + * @member {Array.} modifyDeadlineAckIds + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.modifyDeadlineAckIds = $util.emptyArray; + + /** + * StreamingPullRequest streamAckDeadlineSeconds. + * @member {number} streamAckDeadlineSeconds + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.streamAckDeadlineSeconds = 0; + + /** + * Creates a new StreamingPullRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest instance + */ + StreamingPullRequest.create = function create(properties) { + return new StreamingPullRequest(properties); + }; + + /** + * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + StreamingPullRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); + if (message.modifyDeadlineSeconds != null && message.modifyDeadlineSeconds.length) { + writer.uint32(/* id 3, wireType 2 =*/26).fork(); + for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) + writer.int32(message.modifyDeadlineSeconds[i]); + writer.ldelim(); + } + if (message.modifyDeadlineAckIds != null && message.modifyDeadlineAckIds.length) + for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.modifyDeadlineAckIds[i]); + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.streamAckDeadlineSeconds); + return writer; + }; + + /** + * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + StreamingPullRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + StreamingPullRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + case 3: + if (!(message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length)) + message.modifyDeadlineSeconds = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.modifyDeadlineSeconds.push(reader.int32()); + } else + message.modifyDeadlineSeconds.push(reader.int32()); + break; + case 4: + if (!(message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length)) + message.modifyDeadlineAckIds = []; + message.modifyDeadlineAckIds.push(reader.string()); + break; + case 5: + message.streamAckDeadlineSeconds = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + StreamingPullRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a StreamingPullRequest message. + * @function verify + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + StreamingPullRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + if (message.modifyDeadlineSeconds != null && message.hasOwnProperty("modifyDeadlineSeconds")) { + if (!Array.isArray(message.modifyDeadlineSeconds)) + return "modifyDeadlineSeconds: array expected"; + for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) + if (!$util.isInteger(message.modifyDeadlineSeconds[i])) + return "modifyDeadlineSeconds: integer[] expected"; + } + if (message.modifyDeadlineAckIds != null && message.hasOwnProperty("modifyDeadlineAckIds")) { + if (!Array.isArray(message.modifyDeadlineAckIds)) + return "modifyDeadlineAckIds: array expected"; + for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) + if (!$util.isString(message.modifyDeadlineAckIds[i])) + return "modifyDeadlineAckIds: string[] expected"; + } + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + if (!$util.isInteger(message.streamAckDeadlineSeconds)) + return "streamAckDeadlineSeconds: integer expected"; + return null; + }; + + /** + * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest + */ + StreamingPullRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullRequest) + return object; + var message = new $root.google.pubsub.v1.StreamingPullRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + if (object.modifyDeadlineSeconds) { + if (!Array.isArray(object.modifyDeadlineSeconds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineSeconds: array expected"); + message.modifyDeadlineSeconds = []; + for (var i = 0; i < object.modifyDeadlineSeconds.length; ++i) + message.modifyDeadlineSeconds[i] = object.modifyDeadlineSeconds[i] | 0; + } + if (object.modifyDeadlineAckIds) { + if (!Array.isArray(object.modifyDeadlineAckIds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineAckIds: array expected"); + message.modifyDeadlineAckIds = []; + for (var i = 0; i < object.modifyDeadlineAckIds.length; ++i) + message.modifyDeadlineAckIds[i] = String(object.modifyDeadlineAckIds[i]); + } + if (object.streamAckDeadlineSeconds != null) + message.streamAckDeadlineSeconds = object.streamAckDeadlineSeconds | 0; + return message; + }; + + /** + * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {google.pubsub.v1.StreamingPullRequest} message StreamingPullRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + StreamingPullRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.ackIds = []; + object.modifyDeadlineSeconds = []; + object.modifyDeadlineAckIds = []; + } + if (options.defaults) { + object.subscription = ""; + object.streamAckDeadlineSeconds = 0; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + if (message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length) { + object.modifyDeadlineSeconds = []; + for (var j = 0; j < message.modifyDeadlineSeconds.length; ++j) + object.modifyDeadlineSeconds[j] = message.modifyDeadlineSeconds[j]; + } + if (message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length) { + object.modifyDeadlineAckIds = []; + for (var j = 0; j < message.modifyDeadlineAckIds.length; ++j) + object.modifyDeadlineAckIds[j] = message.modifyDeadlineAckIds[j]; + } + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + object.streamAckDeadlineSeconds = message.streamAckDeadlineSeconds; + return object; + }; + + /** + * Converts this StreamingPullRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + * @returns {Object.} JSON object + */ + StreamingPullRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return StreamingPullRequest; + })(); + + v1.StreamingPullResponse = (function() { + + /** + * Properties of a StreamingPullResponse. + * @memberof google.pubsub.v1 + * @interface IStreamingPullResponse + * @property {Array.|null} [receivedMessages] StreamingPullResponse receivedMessages + */ + + /** + * Constructs a new StreamingPullResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a StreamingPullResponse. + * @implements IStreamingPullResponse + * @constructor + * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set + */ + function StreamingPullResponse(properties) { + this.receivedMessages = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * StreamingPullResponse receivedMessages. + * @member {Array.} receivedMessages + * @memberof google.pubsub.v1.StreamingPullResponse + * @instance + */ + StreamingPullResponse.prototype.receivedMessages = $util.emptyArray; + + /** + * Creates a new StreamingPullResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse instance + */ + StreamingPullResponse.create = function create(properties) { + return new StreamingPullResponse(properties); + }; + + /** + * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + StreamingPullResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.receivedMessages != null && message.receivedMessages.length) + for (var i = 0; i < message.receivedMessages.length; ++i) + $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + StreamingPullResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a StreamingPullResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + StreamingPullResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.receivedMessages && message.receivedMessages.length)) + message.receivedMessages = []; + message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + StreamingPullResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a StreamingPullResponse message. + * @function verify + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + StreamingPullResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { + if (!Array.isArray(message.receivedMessages)) + return "receivedMessages: array expected"; + for (var i = 0; i < message.receivedMessages.length; ++i) { + var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); + if (error) + return "receivedMessages." + error; + } + } + return null; + }; + + /** + * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse + */ + StreamingPullResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullResponse) + return object; + var message = new $root.google.pubsub.v1.StreamingPullResponse(); + if (object.receivedMessages) { + if (!Array.isArray(object.receivedMessages)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: array expected"); + message.receivedMessages = []; + for (var i = 0; i < object.receivedMessages.length; ++i) { + if (typeof object.receivedMessages[i] !== "object") + throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: object expected"); + message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {google.pubsub.v1.StreamingPullResponse} message StreamingPullResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + StreamingPullResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.receivedMessages = []; + if (message.receivedMessages && message.receivedMessages.length) { + object.receivedMessages = []; + for (var j = 0; j < message.receivedMessages.length; ++j) + object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); + } + return object; + }; + + /** + * Converts this StreamingPullResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.StreamingPullResponse + * @instance + * @returns {Object.} JSON object + */ + StreamingPullResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return StreamingPullResponse; + })(); + + v1.CreateSnapshotRequest = (function() { + + /** + * Properties of a CreateSnapshotRequest. + * @memberof google.pubsub.v1 + * @interface ICreateSnapshotRequest + * @property {string|null} [name] CreateSnapshotRequest name + * @property {string|null} [subscription] CreateSnapshotRequest subscription + * @property {Object.|null} [labels] CreateSnapshotRequest labels + */ + + /** + * Constructs a new CreateSnapshotRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a CreateSnapshotRequest. + * @implements ICreateSnapshotRequest + * @constructor + * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set + */ + function CreateSnapshotRequest(properties) { + this.labels = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CreateSnapshotRequest name. + * @member {string} name + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @instance + */ + CreateSnapshotRequest.prototype.name = ""; + + /** + * CreateSnapshotRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @instance + */ + CreateSnapshotRequest.prototype.subscription = ""; + + /** + * CreateSnapshotRequest labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @instance + */ + CreateSnapshotRequest.prototype.labels = $util.emptyObject; + + /** + * Creates a new CreateSnapshotRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest instance + */ + CreateSnapshotRequest.create = function create(properties) { + return new CreateSnapshotRequest(properties); + }; + + /** + * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CreateSnapshotRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.subscription); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + return writer; + }; + + /** + * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CreateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CreateSnapshotRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CreateSnapshotRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.subscription = reader.string(); + break; + case 3: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CreateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CreateSnapshotRequest message. + * @function verify + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CreateSnapshotRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; + } + return null; + }; + + /** + * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest + */ + CreateSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.CreateSnapshotRequest) + return object; + var message = new $root.google.pubsub.v1.CreateSnapshotRequest(); + if (object.name != null) + message.name = String(object.name); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.CreateSnapshotRequest.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); + } + return message; + }; + + /** + * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {google.pubsub.v1.CreateSnapshotRequest} message CreateSnapshotRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CreateSnapshotRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.subscription = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } + return object; + }; + + /** + * Converts this CreateSnapshotRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @instance + * @returns {Object.} JSON object + */ + CreateSnapshotRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return CreateSnapshotRequest; + })(); + + v1.UpdateSnapshotRequest = (function() { + + /** + * Properties of an UpdateSnapshotRequest. + * @memberof google.pubsub.v1 + * @interface IUpdateSnapshotRequest + * @property {google.pubsub.v1.ISnapshot|null} [snapshot] UpdateSnapshotRequest snapshot + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSnapshotRequest updateMask + */ + + /** + * Constructs a new UpdateSnapshotRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an UpdateSnapshotRequest. + * @implements IUpdateSnapshotRequest + * @constructor + * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set + */ + function UpdateSnapshotRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * UpdateSnapshotRequest snapshot. + * @member {google.pubsub.v1.ISnapshot|null|undefined} snapshot + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @instance + */ + UpdateSnapshotRequest.prototype.snapshot = null; + + /** + * UpdateSnapshotRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @instance + */ + UpdateSnapshotRequest.prototype.updateMask = null; + + /** + * Creates a new UpdateSnapshotRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest instance + */ + UpdateSnapshotRequest.create = function create(properties) { + return new UpdateSnapshotRequest(properties); + }; + + /** + * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateSnapshotRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + $root.google.pubsub.v1.Snapshot.encode(message.snapshot, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateSnapshotRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.snapshot = $root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32()); + break; + case 2: + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an UpdateSnapshotRequest message. + * @function verify + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + UpdateSnapshotRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshot); + if (error) + return "snapshot." + error; + } + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + if (error) + return "updateMask." + error; + } + return null; + }; + + /** + * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest + */ + UpdateSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateSnapshotRequest) + return object; + var message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); + if (object.snapshot != null) { + if (typeof object.snapshot !== "object") + throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.snapshot: object expected"); + message.snapshot = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshot); + } + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + } + return message; + }; + + /** + * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {google.pubsub.v1.UpdateSnapshotRequest} message UpdateSnapshotRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UpdateSnapshotRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.snapshot = null; + object.updateMask = null; + } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = $root.google.pubsub.v1.Snapshot.toObject(message.snapshot, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); + return object; + }; + + /** + * Converts this UpdateSnapshotRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @instance + * @returns {Object.} JSON object + */ + UpdateSnapshotRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return UpdateSnapshotRequest; + })(); + + v1.Snapshot = (function() { + + /** + * Properties of a Snapshot. + * @memberof google.pubsub.v1 + * @interface ISnapshot + * @property {string|null} [name] Snapshot name + * @property {string|null} [topic] Snapshot topic + * @property {google.protobuf.ITimestamp|null} [expireTime] Snapshot expireTime + * @property {Object.|null} [labels] Snapshot labels + */ + + /** + * Constructs a new Snapshot. + * @memberof google.pubsub.v1 + * @classdesc Represents a Snapshot. + * @implements ISnapshot + * @constructor + * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set + */ + function Snapshot(properties) { + this.labels = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Snapshot name. + * @member {string} name + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.name = ""; + + /** + * Snapshot topic. + * @member {string} topic + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.topic = ""; + + /** + * Snapshot expireTime. + * @member {google.protobuf.ITimestamp|null|undefined} expireTime + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.expireTime = null; + + /** + * Snapshot labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.labels = $util.emptyObject; + + /** + * Creates a new Snapshot instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set + * @returns {google.pubsub.v1.Snapshot} Snapshot instance + */ + Snapshot.create = function create(properties) { + return new Snapshot(properties); + }; + + /** + * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Snapshot.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); + if (message.expireTime != null && message.hasOwnProperty("expireTime")) + $root.google.protobuf.Timestamp.encode(message.expireTime, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + return writer; + }; + + /** + * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Snapshot.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Snapshot message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.Snapshot} Snapshot + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Snapshot.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.topic = reader.string(); + break; + case 3: + message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + case 4: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Snapshot message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.Snapshot} Snapshot + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Snapshot.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Snapshot message. + * @function verify + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Snapshot.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.expireTime != null && message.hasOwnProperty("expireTime")) { + var error = $root.google.protobuf.Timestamp.verify(message.expireTime); + if (error) + return "expireTime." + error; + } + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; + } + return null; + }; + + /** + * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.Snapshot} Snapshot + */ + Snapshot.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Snapshot) + return object; + var message = new $root.google.pubsub.v1.Snapshot(); + if (object.name != null) + message.name = String(object.name); + if (object.topic != null) + message.topic = String(object.topic); + if (object.expireTime != null) { + if (typeof object.expireTime !== "object") + throw TypeError(".google.pubsub.v1.Snapshot.expireTime: object expected"); + message.expireTime = $root.google.protobuf.Timestamp.fromObject(object.expireTime); + } + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Snapshot.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); + } + return message; + }; + + /** + * Creates a plain object from a Snapshot message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {google.pubsub.v1.Snapshot} message Snapshot + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Snapshot.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.topic = ""; + object.expireTime = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.expireTime != null && message.hasOwnProperty("expireTime")) + object.expireTime = $root.google.protobuf.Timestamp.toObject(message.expireTime, options); + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } + return object; + }; + + /** + * Converts this Snapshot to JSON. + * @function toJSON + * @memberof google.pubsub.v1.Snapshot + * @instance + * @returns {Object.} JSON object + */ + Snapshot.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Snapshot; + })(); + + v1.GetSnapshotRequest = (function() { + + /** + * Properties of a GetSnapshotRequest. + * @memberof google.pubsub.v1 + * @interface IGetSnapshotRequest + * @property {string|null} [snapshot] GetSnapshotRequest snapshot + */ + + /** + * Constructs a new GetSnapshotRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetSnapshotRequest. + * @implements IGetSnapshotRequest + * @constructor + * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set + */ + function GetSnapshotRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetSnapshotRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.GetSnapshotRequest + * @instance + */ + GetSnapshotRequest.prototype.snapshot = ""; + + /** + * Creates a new GetSnapshotRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest instance + */ + GetSnapshotRequest.create = function create(properties) { + return new GetSnapshotRequest(properties); + }; + + /** + * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetSnapshotRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); + return writer; + }; + + /** + * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GetSnapshotRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetSnapshotRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSnapshotRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.snapshot = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GetSnapshotRequest message. + * @function verify + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetSnapshotRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; + return null; + }; + + /** + * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest + */ + GetSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetSnapshotRequest) + return object; + var message = new $root.google.pubsub.v1.GetSnapshotRequest(); + if (object.snapshot != null) + message.snapshot = String(object.snapshot); + return message; + }; + + /** + * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {google.pubsub.v1.GetSnapshotRequest} message GetSnapshotRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GetSnapshotRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.snapshot = ""; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = message.snapshot; + return object; + }; + + /** + * Converts this GetSnapshotRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.GetSnapshotRequest + * @instance + * @returns {Object.} JSON object + */ + GetSnapshotRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return GetSnapshotRequest; + })(); + + v1.ListSnapshotsRequest = (function() { + + /** + * Properties of a ListSnapshotsRequest. + * @memberof google.pubsub.v1 + * @interface IListSnapshotsRequest + * @property {string|null} [project] ListSnapshotsRequest project + * @property {number|null} [pageSize] ListSnapshotsRequest pageSize + * @property {string|null} [pageToken] ListSnapshotsRequest pageToken + */ + + /** + * Constructs a new ListSnapshotsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSnapshotsRequest. + * @implements IListSnapshotsRequest + * @constructor + * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set + */ + function ListSnapshotsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListSnapshotsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @instance + */ + ListSnapshotsRequest.prototype.project = ""; + + /** + * ListSnapshotsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @instance + */ + ListSnapshotsRequest.prototype.pageSize = 0; + + /** + * ListSnapshotsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @instance + */ + ListSnapshotsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListSnapshotsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest instance + */ + ListSnapshotsRequest.create = function create(properties) { + return new ListSnapshotsRequest(properties); + }; + + /** + * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSnapshotsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; + + /** + * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListSnapshotsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSnapshotsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.project = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListSnapshotsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSnapshotsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest + */ + ListSnapshotsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSnapshotsRequest) + return object; + var message = new $root.google.pubsub.v1.ListSnapshotsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; + + /** + * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {google.pubsub.v1.ListSnapshotsRequest} message ListSnapshotsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSnapshotsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; + + /** + * Converts this ListSnapshotsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @instance + * @returns {Object.} JSON object + */ + ListSnapshotsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListSnapshotsRequest; + })(); + + v1.ListSnapshotsResponse = (function() { + + /** + * Properties of a ListSnapshotsResponse. + * @memberof google.pubsub.v1 + * @interface IListSnapshotsResponse + * @property {Array.|null} [snapshots] ListSnapshotsResponse snapshots + * @property {string|null} [nextPageToken] ListSnapshotsResponse nextPageToken + */ + + /** + * Constructs a new ListSnapshotsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSnapshotsResponse. + * @implements IListSnapshotsResponse + * @constructor + * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set + */ + function ListSnapshotsResponse(properties) { + this.snapshots = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListSnapshotsResponse snapshots. + * @member {Array.} snapshots + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @instance + */ + ListSnapshotsResponse.prototype.snapshots = $util.emptyArray; + + /** + * ListSnapshotsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @instance + */ + ListSnapshotsResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListSnapshotsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse instance + */ + ListSnapshotsResponse.create = function create(properties) { + return new ListSnapshotsResponse(properties); + }; + + /** + * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSnapshotsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.snapshots != null && message.snapshots.length) + for (var i = 0; i < message.snapshots.length; ++i) + $root.google.pubsub.v1.Snapshot.encode(message.snapshots[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListSnapshotsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSnapshotsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.snapshots && message.snapshots.length)) + message.snapshots = []; + message.snapshots.push($root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32())); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListSnapshotsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSnapshotsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.snapshots != null && message.hasOwnProperty("snapshots")) { + if (!Array.isArray(message.snapshots)) + return "snapshots: array expected"; + for (var i = 0; i < message.snapshots.length; ++i) { + var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshots[i]); + if (error) + return "snapshots." + error; + } + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; + + /** + * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse + */ + ListSnapshotsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSnapshotsResponse) + return object; + var message = new $root.google.pubsub.v1.ListSnapshotsResponse(); + if (object.snapshots) { + if (!Array.isArray(object.snapshots)) + throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: array expected"); + message.snapshots = []; + for (var i = 0; i < object.snapshots.length; ++i) { + if (typeof object.snapshots[i] !== "object") + throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: object expected"); + message.snapshots[i] = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshots[i]); + } + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; + + /** + * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {google.pubsub.v1.ListSnapshotsResponse} message ListSnapshotsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSnapshotsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.snapshots = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.snapshots && message.snapshots.length) { + object.snapshots = []; + for (var j = 0; j < message.snapshots.length; ++j) + object.snapshots[j] = $root.google.pubsub.v1.Snapshot.toObject(message.snapshots[j], options); + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListSnapshotsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @instance + * @returns {Object.} JSON object + */ + ListSnapshotsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListSnapshotsResponse; + })(); + + v1.DeleteSnapshotRequest = (function() { + + /** + * Properties of a DeleteSnapshotRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteSnapshotRequest + * @property {string|null} [snapshot] DeleteSnapshotRequest snapshot + */ + + /** + * Constructs a new DeleteSnapshotRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteSnapshotRequest. + * @implements IDeleteSnapshotRequest + * @constructor + * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set + */ + function DeleteSnapshotRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DeleteSnapshotRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @instance + */ + DeleteSnapshotRequest.prototype.snapshot = ""; + + /** + * Creates a new DeleteSnapshotRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest instance + */ + DeleteSnapshotRequest.create = function create(properties) { + return new DeleteSnapshotRequest(properties); + }; + + /** + * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSnapshotRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); + return writer; + }; + + /** + * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSnapshotRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.snapshot = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DeleteSnapshotRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteSnapshotRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; + return null; + }; + + /** + * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest + */ + DeleteSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteSnapshotRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); + if (object.snapshot != null) + message.snapshot = String(object.snapshot); + return message; + }; + + /** + * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {google.pubsub.v1.DeleteSnapshotRequest} message DeleteSnapshotRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteSnapshotRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.snapshot = ""; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = message.snapshot; + return object; + }; + + /** + * Converts this DeleteSnapshotRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteSnapshotRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return DeleteSnapshotRequest; + })(); + + v1.SeekRequest = (function() { + + /** + * Properties of a SeekRequest. + * @memberof google.pubsub.v1 + * @interface ISeekRequest + * @property {string|null} [subscription] SeekRequest subscription + * @property {google.protobuf.ITimestamp|null} [time] SeekRequest time + * @property {string|null} [snapshot] SeekRequest snapshot + */ + + /** + * Constructs a new SeekRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a SeekRequest. + * @implements ISeekRequest + * @constructor + * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set + */ + function SeekRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * SeekRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.SeekRequest + * @instance + */ + SeekRequest.prototype.subscription = ""; + + /** + * SeekRequest time. + * @member {google.protobuf.ITimestamp|null|undefined} time + * @memberof google.pubsub.v1.SeekRequest + * @instance + */ + SeekRequest.prototype.time = null; + + /** + * SeekRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.SeekRequest + * @instance + */ + SeekRequest.prototype.snapshot = ""; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * SeekRequest target. + * @member {"time"|"snapshot"|undefined} target + * @memberof google.pubsub.v1.SeekRequest + * @instance + */ + Object.defineProperty(SeekRequest.prototype, "target", { + get: $util.oneOfGetter($oneOfFields = ["time", "snapshot"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new SeekRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.SeekRequest} SeekRequest instance + */ + SeekRequest.create = function create(properties) { + return new SeekRequest(properties); + }; + + /** + * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SeekRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.time != null && message.hasOwnProperty("time")) + $root.google.protobuf.Timestamp.encode(message.time, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.snapshot); + return writer; + }; + + /** + * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SeekRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SeekRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.SeekRequest} SeekRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SeekRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + message.time = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + case 3: + message.snapshot = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SeekRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.SeekRequest} SeekRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SeekRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SeekRequest message. + * @function verify + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SeekRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.time != null && message.hasOwnProperty("time")) { + properties.target = 1; + { + var error = $root.google.protobuf.Timestamp.verify(message.time); + if (error) + return "time." + error; + } + } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + if (properties.target === 1) + return "target: multiple values"; + properties.target = 1; + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; + } + return null; + }; + + /** + * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.SeekRequest} SeekRequest + */ + SeekRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.SeekRequest) + return object; + var message = new $root.google.pubsub.v1.SeekRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.time != null) { + if (typeof object.time !== "object") + throw TypeError(".google.pubsub.v1.SeekRequest.time: object expected"); + message.time = $root.google.protobuf.Timestamp.fromObject(object.time); + } + if (object.snapshot != null) + message.snapshot = String(object.snapshot); + return message; + }; + + /** + * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {google.pubsub.v1.SeekRequest} message SeekRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SeekRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.time != null && message.hasOwnProperty("time")) { + object.time = $root.google.protobuf.Timestamp.toObject(message.time, options); + if (options.oneofs) + object.target = "time"; + } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + object.snapshot = message.snapshot; + if (options.oneofs) + object.target = "snapshot"; + } + return object; + }; + + /** + * Converts this SeekRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.SeekRequest + * @instance + * @returns {Object.} JSON object + */ + SeekRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return SeekRequest; + })(); + + v1.SeekResponse = (function() { + + /** + * Properties of a SeekResponse. + * @memberof google.pubsub.v1 + * @interface ISeekResponse + */ + + /** + * Constructs a new SeekResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a SeekResponse. + * @implements ISeekResponse + * @constructor + * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set + */ + function SeekResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new SeekResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.SeekResponse} SeekResponse instance + */ + SeekResponse.create = function create(properties) { + return new SeekResponse(properties); + }; + + /** + * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SeekResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SeekResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SeekResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.SeekResponse} SeekResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SeekResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SeekResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.SeekResponse} SeekResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SeekResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SeekResponse message. + * @function verify + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SeekResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.SeekResponse} SeekResponse + */ + SeekResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.SeekResponse) + return object; + return new $root.google.pubsub.v1.SeekResponse(); + }; + + /** + * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {google.pubsub.v1.SeekResponse} message SeekResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SeekResponse.toObject = function toObject() { + return {}; + }; + + /** + * Converts this SeekResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.SeekResponse + * @instance + * @returns {Object.} JSON object + */ + SeekResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return SeekResponse; + })(); + + return v1; + })(); + + return pubsub; + })(); + + google.api = (function() { + + /** + * Namespace api. + * @memberof google + * @namespace + */ + var api = {}; + + api.Http = (function() { + + /** + * Properties of a Http. + * @memberof google.api + * @interface IHttp + * @property {Array.|null} [rules] Http rules + * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion + */ + + /** + * Constructs a new Http. + * @memberof google.api + * @classdesc Represents a Http. + * @implements IHttp + * @constructor + * @param {google.api.IHttp=} [properties] Properties to set + */ + function Http(properties) { + this.rules = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Http rules. + * @member {Array.} rules + * @memberof google.api.Http + * @instance + */ + Http.prototype.rules = $util.emptyArray; + + /** + * Http fullyDecodeReservedExpansion. + * @member {boolean} fullyDecodeReservedExpansion + * @memberof google.api.Http + * @instance + */ + Http.prototype.fullyDecodeReservedExpansion = false; + + /** + * Creates a new Http instance using the specified properties. + * @function create + * @memberof google.api.Http + * @static + * @param {google.api.IHttp=} [properties] Properties to set + * @returns {google.api.Http} Http instance + */ + Http.create = function create(properties) { + return new Http(properties); + }; + + /** + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @function encode + * @memberof google.api.Http + * @static + * @param {google.api.IHttp} message Http message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Http.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.rules != null && message.rules.length) + for (var i = 0; i < message.rules.length; ++i) + $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); + return writer; + }; + + /** + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.Http + * @static + * @param {google.api.IHttp} message Http message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Http.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Http message from the specified reader or buffer. + * @function decode + * @memberof google.api.Http + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.Http} Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Http.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.rules && message.rules.length)) + message.rules = []; + message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + break; + case 2: + message.fullyDecodeReservedExpansion = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Http message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.Http + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.Http} Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Http.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Http message. + * @function verify + * @memberof google.api.Http + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Http.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.rules != null && message.hasOwnProperty("rules")) { + if (!Array.isArray(message.rules)) + return "rules: array expected"; + for (var i = 0; i < message.rules.length; ++i) { + var error = $root.google.api.HttpRule.verify(message.rules[i]); + if (error) + return "rules." + error; + } + } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + if (typeof message.fullyDecodeReservedExpansion !== "boolean") + return "fullyDecodeReservedExpansion: boolean expected"; + return null; + }; + + /** + * Creates a Http message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.Http + * @static + * @param {Object.} object Plain object + * @returns {google.api.Http} Http + */ + Http.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.Http) + return object; + var message = new $root.google.api.Http(); + if (object.rules) { + if (!Array.isArray(object.rules)) + throw TypeError(".google.api.Http.rules: array expected"); + message.rules = []; + for (var i = 0; i < object.rules.length; ++i) { + if (typeof object.rules[i] !== "object") + throw TypeError(".google.api.Http.rules: object expected"); + message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); + } + } + if (object.fullyDecodeReservedExpansion != null) + message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); + return message; + }; + + /** + * Creates a plain object from a Http message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.Http + * @static + * @param {google.api.Http} message Http + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Http.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.rules = []; + if (options.defaults) + object.fullyDecodeReservedExpansion = false; + if (message.rules && message.rules.length) { + object.rules = []; + for (var j = 0; j < message.rules.length; ++j) + object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); + } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; + return object; + }; + + /** + * Converts this Http to JSON. + * @function toJSON + * @memberof google.api.Http + * @instance + * @returns {Object.} JSON object + */ + Http.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Http; + })(); + + api.HttpRule = (function() { + + /** + * Properties of a HttpRule. + * @memberof google.api + * @interface IHttpRule + * @property {string|null} [selector] HttpRule selector + * @property {string|null} [get] HttpRule get + * @property {string|null} [put] HttpRule put + * @property {string|null} [post] HttpRule post + * @property {string|null} ["delete"] HttpRule delete + * @property {string|null} [patch] HttpRule patch + * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom + * @property {string|null} [body] HttpRule body + * @property {string|null} [responseBody] HttpRule responseBody + * @property {Array.|null} [additionalBindings] HttpRule additionalBindings + */ + + /** + * Constructs a new HttpRule. + * @memberof google.api + * @classdesc Represents a HttpRule. + * @implements IHttpRule + * @constructor + * @param {google.api.IHttpRule=} [properties] Properties to set + */ + function HttpRule(properties) { + this.additionalBindings = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * HttpRule selector. + * @member {string} selector + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.selector = ""; + + /** + * HttpRule get. + * @member {string} get + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.get = ""; + + /** + * HttpRule put. + * @member {string} put + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.put = ""; + + /** + * HttpRule post. + * @member {string} post + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.post = ""; + + /** + * HttpRule delete. + * @member {string} delete + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype["delete"] = ""; + + /** + * HttpRule patch. + * @member {string} patch + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.patch = ""; + + /** + * HttpRule custom. + * @member {google.api.ICustomHttpPattern|null|undefined} custom + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.custom = null; + + /** + * HttpRule body. + * @member {string} body + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.body = ""; + + /** + * HttpRule responseBody. + * @member {string} responseBody + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.responseBody = ""; + + /** + * HttpRule additionalBindings. + * @member {Array.} additionalBindings + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.additionalBindings = $util.emptyArray; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * HttpRule pattern. + * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern + * @memberof google.api.HttpRule + * @instance + */ + Object.defineProperty(HttpRule.prototype, "pattern", { + get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new HttpRule instance using the specified properties. + * @function create + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule=} [properties] Properties to set + * @returns {google.api.HttpRule} HttpRule instance + */ + HttpRule.create = function create(properties) { + return new HttpRule(properties); + }; + + /** + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @function encode + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + HttpRule.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.selector != null && message.hasOwnProperty("selector")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); + if (message.get != null && message.hasOwnProperty("get")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.get); + if (message.put != null && message.hasOwnProperty("put")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.put); + if (message.post != null && message.hasOwnProperty("post")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.post); + if (message["delete"] != null && message.hasOwnProperty("delete")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]); + if (message.patch != null && message.hasOwnProperty("patch")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch); + if (message.body != null && message.hasOwnProperty("body")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.body); + if (message.custom != null && message.hasOwnProperty("custom")) + $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.additionalBindings != null && message.additionalBindings.length) + for (var i = 0; i < message.additionalBindings.length; ++i) + $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); + return writer; + }; + + /** + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + HttpRule.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a HttpRule message from the specified reader or buffer. + * @function decode + * @memberof google.api.HttpRule + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.HttpRule} HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + HttpRule.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.selector = reader.string(); + break; + case 2: + message.get = reader.string(); + break; + case 3: + message.put = reader.string(); + break; + case 4: + message.post = reader.string(); + break; + case 5: + message["delete"] = reader.string(); + break; + case 6: + message.patch = reader.string(); + break; + case 8: + message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); + break; + case 7: + message.body = reader.string(); + break; + case 12: + message.responseBody = reader.string(); + break; + case 11: + if (!(message.additionalBindings && message.additionalBindings.length)) + message.additionalBindings = []; + message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.HttpRule + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.HttpRule} HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + HttpRule.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a HttpRule message. + * @function verify + * @memberof google.api.HttpRule + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + HttpRule.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.selector != null && message.hasOwnProperty("selector")) + if (!$util.isString(message.selector)) + return "selector: string expected"; + if (message.get != null && message.hasOwnProperty("get")) { + properties.pattern = 1; + if (!$util.isString(message.get)) + return "get: string expected"; + } + if (message.put != null && message.hasOwnProperty("put")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.put)) + return "put: string expected"; + } + if (message.post != null && message.hasOwnProperty("post")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.post)) + return "post: string expected"; + } + if (message["delete"] != null && message.hasOwnProperty("delete")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message["delete"])) + return "delete: string expected"; + } + if (message.patch != null && message.hasOwnProperty("patch")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.patch)) + return "patch: string expected"; + } + if (message.custom != null && message.hasOwnProperty("custom")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + { + var error = $root.google.api.CustomHttpPattern.verify(message.custom); + if (error) + return "custom." + error; + } + } + if (message.body != null && message.hasOwnProperty("body")) + if (!$util.isString(message.body)) + return "body: string expected"; + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + if (!$util.isString(message.responseBody)) + return "responseBody: string expected"; + if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { + if (!Array.isArray(message.additionalBindings)) + return "additionalBindings: array expected"; + for (var i = 0; i < message.additionalBindings.length; ++i) { + var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]); + if (error) + return "additionalBindings." + error; + } + } + return null; + }; + + /** + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.HttpRule + * @static + * @param {Object.} object Plain object + * @returns {google.api.HttpRule} HttpRule + */ + HttpRule.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.HttpRule) + return object; + var message = new $root.google.api.HttpRule(); + if (object.selector != null) + message.selector = String(object.selector); + if (object.get != null) + message.get = String(object.get); + if (object.put != null) + message.put = String(object.put); + if (object.post != null) + message.post = String(object.post); + if (object["delete"] != null) + message["delete"] = String(object["delete"]); + if (object.patch != null) + message.patch = String(object.patch); + if (object.custom != null) { + if (typeof object.custom !== "object") + throw TypeError(".google.api.HttpRule.custom: object expected"); + message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom); + } + if (object.body != null) + message.body = String(object.body); + if (object.responseBody != null) + message.responseBody = String(object.responseBody); + if (object.additionalBindings) { + if (!Array.isArray(object.additionalBindings)) + throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); + message.additionalBindings = []; + for (var i = 0; i < object.additionalBindings.length; ++i) { + if (typeof object.additionalBindings[i] !== "object") + throw TypeError(".google.api.HttpRule.additionalBindings: object expected"); + message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.HttpRule + * @static + * @param {google.api.HttpRule} message HttpRule + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + HttpRule.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.additionalBindings = []; + if (options.defaults) { + object.selector = ""; + object.body = ""; + object.responseBody = ""; + } + if (message.selector != null && message.hasOwnProperty("selector")) + object.selector = message.selector; + if (message.get != null && message.hasOwnProperty("get")) { + object.get = message.get; + if (options.oneofs) + object.pattern = "get"; + } + if (message.put != null && message.hasOwnProperty("put")) { + object.put = message.put; + if (options.oneofs) + object.pattern = "put"; + } + if (message.post != null && message.hasOwnProperty("post")) { + object.post = message.post; + if (options.oneofs) + object.pattern = "post"; + } + if (message["delete"] != null && message.hasOwnProperty("delete")) { + object["delete"] = message["delete"]; + if (options.oneofs) + object.pattern = "delete"; + } + if (message.patch != null && message.hasOwnProperty("patch")) { + object.patch = message.patch; + if (options.oneofs) + object.pattern = "patch"; + } + if (message.body != null && message.hasOwnProperty("body")) + object.body = message.body; + if (message.custom != null && message.hasOwnProperty("custom")) { + object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options); + if (options.oneofs) + object.pattern = "custom"; + } + if (message.additionalBindings && message.additionalBindings.length) { + object.additionalBindings = []; + for (var j = 0; j < message.additionalBindings.length; ++j) + object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); + } + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + object.responseBody = message.responseBody; + return object; + }; + + /** + * Converts this HttpRule to JSON. + * @function toJSON + * @memberof google.api.HttpRule + * @instance + * @returns {Object.} JSON object + */ + HttpRule.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return HttpRule; + })(); + + api.CustomHttpPattern = (function() { + + /** + * Properties of a CustomHttpPattern. + * @memberof google.api + * @interface ICustomHttpPattern + * @property {string|null} [kind] CustomHttpPattern kind + * @property {string|null} [path] CustomHttpPattern path + */ + + /** + * Constructs a new CustomHttpPattern. + * @memberof google.api + * @classdesc Represents a CustomHttpPattern. + * @implements ICustomHttpPattern + * @constructor + * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + */ + function CustomHttpPattern(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CustomHttpPattern kind. + * @member {string} kind + * @memberof google.api.CustomHttpPattern + * @instance + */ + CustomHttpPattern.prototype.kind = ""; + + /** + * CustomHttpPattern path. + * @member {string} path + * @memberof google.api.CustomHttpPattern + * @instance + */ + CustomHttpPattern.prototype.path = ""; + + /** + * Creates a new CustomHttpPattern instance using the specified properties. + * @function create + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance + */ + CustomHttpPattern.create = function create(properties) { + return new CustomHttpPattern(properties); + }; + + /** + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @function encode + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CustomHttpPattern.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.kind != null && message.hasOwnProperty("kind")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind); + if (message.path != null && message.hasOwnProperty("path")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.path); + return writer; + }; + + /** + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer. + * @function decode + * @memberof google.api.CustomHttpPattern + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CustomHttpPattern.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.kind = reader.string(); + break; + case 2: + message.path = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.CustomHttpPattern + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CustomHttpPattern message. + * @function verify + * @memberof google.api.CustomHttpPattern + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CustomHttpPattern.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.kind != null && message.hasOwnProperty("kind")) + if (!$util.isString(message.kind)) + return "kind: string expected"; + if (message.path != null && message.hasOwnProperty("path")) + if (!$util.isString(message.path)) + return "path: string expected"; + return null; + }; + + /** + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.CustomHttpPattern + * @static + * @param {Object.} object Plain object + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + */ + CustomHttpPattern.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.CustomHttpPattern) + return object; + var message = new $root.google.api.CustomHttpPattern(); + if (object.kind != null) + message.kind = String(object.kind); + if (object.path != null) + message.path = String(object.path); + return message; + }; + + /** + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.CustomHttpPattern} message CustomHttpPattern + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CustomHttpPattern.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.kind = ""; + object.path = ""; + } + if (message.kind != null && message.hasOwnProperty("kind")) + object.kind = message.kind; + if (message.path != null && message.hasOwnProperty("path")) + object.path = message.path; + return object; + }; + + /** + * Converts this CustomHttpPattern to JSON. + * @function toJSON + * @memberof google.api.CustomHttpPattern + * @instance + * @returns {Object.} JSON object + */ + CustomHttpPattern.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return CustomHttpPattern; + })(); + + return api; + })(); + + google.protobuf = (function() { + + /** + * Namespace protobuf. + * @memberof google + * @namespace + */ + var protobuf = {}; + + protobuf.FileDescriptorSet = (function() { + + /** + * Properties of a FileDescriptorSet. + * @memberof google.protobuf + * @interface IFileDescriptorSet + * @property {Array.|null} [file] FileDescriptorSet file + */ + + /** + * Constructs a new FileDescriptorSet. + * @memberof google.protobuf + * @classdesc Represents a FileDescriptorSet. + * @implements IFileDescriptorSet + * @constructor + * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set + */ + function FileDescriptorSet(properties) { + this.file = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FileDescriptorSet file. + * @member {Array.} file + * @memberof google.protobuf.FileDescriptorSet + * @instance + */ + FileDescriptorSet.prototype.file = $util.emptyArray; + + /** + * Creates a new FileDescriptorSet instance using the specified properties. + * @function create + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet instance + */ + FileDescriptorSet.create = function create(properties) { + return new FileDescriptorSet(properties); + }; + + /** + * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorSet.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.file != null && message.file.length) + for (var i = 0; i < message.file.length; ++i) + $root.google.protobuf.FileDescriptorProto.encode(message.file[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorSet.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorSet.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorSet(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.file && message.file.length)) + message.file = []; + message.file.push($root.google.protobuf.FileDescriptorProto.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorSet.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FileDescriptorSet message. + * @function verify + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileDescriptorSet.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.file != null && message.hasOwnProperty("file")) { + if (!Array.isArray(message.file)) + return "file: array expected"; + for (var i = 0; i < message.file.length; ++i) { + var error = $root.google.protobuf.FileDescriptorProto.verify(message.file[i]); + if (error) + return "file." + error; + } + } + return null; + }; + + /** + * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + */ + FileDescriptorSet.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileDescriptorSet) + return object; + var message = new $root.google.protobuf.FileDescriptorSet(); + if (object.file) { + if (!Array.isArray(object.file)) + throw TypeError(".google.protobuf.FileDescriptorSet.file: array expected"); + message.file = []; + for (var i = 0; i < object.file.length; ++i) { + if (typeof object.file[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorSet.file: object expected"); + message.file[i] = $root.google.protobuf.FileDescriptorProto.fromObject(object.file[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.FileDescriptorSet} message FileDescriptorSet + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileDescriptorSet.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.file = []; + if (message.file && message.file.length) { + object.file = []; + for (var j = 0; j < message.file.length; ++j) + object.file[j] = $root.google.protobuf.FileDescriptorProto.toObject(message.file[j], options); + } + return object; + }; + + /** + * Converts this FileDescriptorSet to JSON. + * @function toJSON + * @memberof google.protobuf.FileDescriptorSet + * @instance + * @returns {Object.} JSON object + */ + FileDescriptorSet.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return FileDescriptorSet; + })(); + + protobuf.FileDescriptorProto = (function() { + + /** + * Properties of a FileDescriptorProto. + * @memberof google.protobuf + * @interface IFileDescriptorProto + * @property {string|null} [name] FileDescriptorProto name + * @property {string|null} ["package"] FileDescriptorProto package + * @property {Array.|null} [dependency] FileDescriptorProto dependency + * @property {Array.|null} [publicDependency] FileDescriptorProto publicDependency + * @property {Array.|null} [weakDependency] FileDescriptorProto weakDependency + * @property {Array.|null} [messageType] FileDescriptorProto messageType + * @property {Array.|null} [enumType] FileDescriptorProto enumType + * @property {Array.|null} [service] FileDescriptorProto service + * @property {Array.|null} [extension] FileDescriptorProto extension + * @property {google.protobuf.IFileOptions|null} [options] FileDescriptorProto options + * @property {google.protobuf.ISourceCodeInfo|null} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo + * @property {string|null} [syntax] FileDescriptorProto syntax + */ + + /** + * Constructs a new FileDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a FileDescriptorProto. + * @implements IFileDescriptorProto + * @constructor + * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set + */ + function FileDescriptorProto(properties) { + this.dependency = []; + this.publicDependency = []; + this.weakDependency = []; + this.messageType = []; + this.enumType = []; + this.service = []; + this.extension = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FileDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.name = ""; + + /** + * FileDescriptorProto package. + * @member {string} package + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype["package"] = ""; + + /** + * FileDescriptorProto dependency. + * @member {Array.} dependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.dependency = $util.emptyArray; + + /** + * FileDescriptorProto publicDependency. + * @member {Array.} publicDependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.publicDependency = $util.emptyArray; + + /** + * FileDescriptorProto weakDependency. + * @member {Array.} weakDependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.weakDependency = $util.emptyArray; + + /** + * FileDescriptorProto messageType. + * @member {Array.} messageType + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.messageType = $util.emptyArray; + + /** + * FileDescriptorProto enumType. + * @member {Array.} enumType + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.enumType = $util.emptyArray; + + /** + * FileDescriptorProto service. + * @member {Array.} service + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.service = $util.emptyArray; + + /** + * FileDescriptorProto extension. + * @member {Array.} extension + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.extension = $util.emptyArray; + + /** + * FileDescriptorProto options. + * @member {google.protobuf.IFileOptions|null|undefined} options + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.options = null; + + /** + * FileDescriptorProto sourceCodeInfo. + * @member {google.protobuf.ISourceCodeInfo|null|undefined} sourceCodeInfo + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.sourceCodeInfo = null; + + /** + * FileDescriptorProto syntax. + * @member {string} syntax + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.syntax = ""; + + /** + * Creates a new FileDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto instance + */ + FileDescriptorProto.create = function create(properties) { + return new FileDescriptorProto(properties); + }; + + /** + * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message["package"] != null && message.hasOwnProperty("package")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message["package"]); + if (message.dependency != null && message.dependency.length) + for (var i = 0; i < message.dependency.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.dependency[i]); + if (message.messageType != null && message.messageType.length) + for (var i = 0; i < message.messageType.length; ++i) + $root.google.protobuf.DescriptorProto.encode(message.messageType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.enumType != null && message.enumType.length) + for (var i = 0; i < message.enumType.length; ++i) + $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.service != null && message.service.length) + for (var i = 0; i < message.service.length; ++i) + $root.google.protobuf.ServiceDescriptorProto.encode(message.service[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.extension != null && message.extension.length) + for (var i = 0; i < message.extension.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.FileOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) + $root.google.protobuf.SourceCodeInfo.encode(message.sourceCodeInfo, writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); + if (message.publicDependency != null && message.publicDependency.length) + for (var i = 0; i < message.publicDependency.length; ++i) + writer.uint32(/* id 10, wireType 0 =*/80).int32(message.publicDependency[i]); + if (message.weakDependency != null && message.weakDependency.length) + for (var i = 0; i < message.weakDependency.length; ++i) + writer.uint32(/* id 11, wireType 0 =*/88).int32(message.weakDependency[i]); + if (message.syntax != null && message.hasOwnProperty("syntax")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); + return writer; + }; + + /** + * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message["package"] = reader.string(); + break; + case 3: + if (!(message.dependency && message.dependency.length)) + message.dependency = []; + message.dependency.push(reader.string()); + break; + case 10: + if (!(message.publicDependency && message.publicDependency.length)) + message.publicDependency = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.publicDependency.push(reader.int32()); + } else + message.publicDependency.push(reader.int32()); + break; + case 11: + if (!(message.weakDependency && message.weakDependency.length)) + message.weakDependency = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.weakDependency.push(reader.int32()); + } else + message.weakDependency.push(reader.int32()); + break; + case 4: + if (!(message.messageType && message.messageType.length)) + message.messageType = []; + message.messageType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.enumType && message.enumType.length)) + message.enumType = []; + message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); + break; + case 6: + if (!(message.service && message.service.length)) + message.service = []; + message.service.push($root.google.protobuf.ServiceDescriptorProto.decode(reader, reader.uint32())); + break; + case 7: + if (!(message.extension && message.extension.length)) + message.extension = []; + message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 8: + message.options = $root.google.protobuf.FileOptions.decode(reader, reader.uint32()); + break; + case 9: + message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.decode(reader, reader.uint32()); + break; + case 12: + message.syntax = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FileDescriptorProto message. + * @function verify + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message["package"] != null && message.hasOwnProperty("package")) + if (!$util.isString(message["package"])) + return "package: string expected"; + if (message.dependency != null && message.hasOwnProperty("dependency")) { + if (!Array.isArray(message.dependency)) + return "dependency: array expected"; + for (var i = 0; i < message.dependency.length; ++i) + if (!$util.isString(message.dependency[i])) + return "dependency: string[] expected"; + } + if (message.publicDependency != null && message.hasOwnProperty("publicDependency")) { + if (!Array.isArray(message.publicDependency)) + return "publicDependency: array expected"; + for (var i = 0; i < message.publicDependency.length; ++i) + if (!$util.isInteger(message.publicDependency[i])) + return "publicDependency: integer[] expected"; + } + if (message.weakDependency != null && message.hasOwnProperty("weakDependency")) { + if (!Array.isArray(message.weakDependency)) + return "weakDependency: array expected"; + for (var i = 0; i < message.weakDependency.length; ++i) + if (!$util.isInteger(message.weakDependency[i])) + return "weakDependency: integer[] expected"; + } + if (message.messageType != null && message.hasOwnProperty("messageType")) { + if (!Array.isArray(message.messageType)) + return "messageType: array expected"; + for (var i = 0; i < message.messageType.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.verify(message.messageType[i]); + if (error) + return "messageType." + error; + } + } + if (message.enumType != null && message.hasOwnProperty("enumType")) { + if (!Array.isArray(message.enumType)) + return "enumType: array expected"; + for (var i = 0; i < message.enumType.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); + if (error) + return "enumType." + error; + } + } + if (message.service != null && message.hasOwnProperty("service")) { + if (!Array.isArray(message.service)) + return "service: array expected"; + for (var i = 0; i < message.service.length; ++i) { + var error = $root.google.protobuf.ServiceDescriptorProto.verify(message.service[i]); + if (error) + return "service." + error; + } + } + if (message.extension != null && message.hasOwnProperty("extension")) { + if (!Array.isArray(message.extension)) + return "extension: array expected"; + for (var i = 0; i < message.extension.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); + if (error) + return "extension." + error; + } + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.FileOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) { + var error = $root.google.protobuf.SourceCodeInfo.verify(message.sourceCodeInfo); + if (error) + return "sourceCodeInfo." + error; + } + if (message.syntax != null && message.hasOwnProperty("syntax")) + if (!$util.isString(message.syntax)) + return "syntax: string expected"; + return null; + }; + + /** + * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + */ + FileDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileDescriptorProto) + return object; + var message = new $root.google.protobuf.FileDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object["package"] != null) + message["package"] = String(object["package"]); + if (object.dependency) { + if (!Array.isArray(object.dependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.dependency: array expected"); + message.dependency = []; + for (var i = 0; i < object.dependency.length; ++i) + message.dependency[i] = String(object.dependency[i]); + } + if (object.publicDependency) { + if (!Array.isArray(object.publicDependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.publicDependency: array expected"); + message.publicDependency = []; + for (var i = 0; i < object.publicDependency.length; ++i) + message.publicDependency[i] = object.publicDependency[i] | 0; + } + if (object.weakDependency) { + if (!Array.isArray(object.weakDependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.weakDependency: array expected"); + message.weakDependency = []; + for (var i = 0; i < object.weakDependency.length; ++i) + message.weakDependency[i] = object.weakDependency[i] | 0; + } + if (object.messageType) { + if (!Array.isArray(object.messageType)) + throw TypeError(".google.protobuf.FileDescriptorProto.messageType: array expected"); + message.messageType = []; + for (var i = 0; i < object.messageType.length; ++i) { + if (typeof object.messageType[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.messageType: object expected"); + message.messageType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.messageType[i]); + } + } + if (object.enumType) { + if (!Array.isArray(object.enumType)) + throw TypeError(".google.protobuf.FileDescriptorProto.enumType: array expected"); + message.enumType = []; + for (var i = 0; i < object.enumType.length; ++i) { + if (typeof object.enumType[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.enumType: object expected"); + message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); + } + } + if (object.service) { + if (!Array.isArray(object.service)) + throw TypeError(".google.protobuf.FileDescriptorProto.service: array expected"); + message.service = []; + for (var i = 0; i < object.service.length; ++i) { + if (typeof object.service[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.service: object expected"); + message.service[i] = $root.google.protobuf.ServiceDescriptorProto.fromObject(object.service[i]); + } + } + if (object.extension) { + if (!Array.isArray(object.extension)) + throw TypeError(".google.protobuf.FileDescriptorProto.extension: array expected"); + message.extension = []; + for (var i = 0; i < object.extension.length; ++i) { + if (typeof object.extension[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.extension: object expected"); + message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.FileOptions.fromObject(object.options); + } + if (object.sourceCodeInfo != null) { + if (typeof object.sourceCodeInfo !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.sourceCodeInfo: object expected"); + message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.fromObject(object.sourceCodeInfo); + } + if (object.syntax != null) + message.syntax = String(object.syntax); + return message; + }; + + /** + * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.FileDescriptorProto} message FileDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.dependency = []; + object.messageType = []; + object.enumType = []; + object.service = []; + object.extension = []; + object.publicDependency = []; + object.weakDependency = []; + } + if (options.defaults) { + object.name = ""; + object["package"] = ""; + object.options = null; + object.sourceCodeInfo = null; + object.syntax = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message["package"] != null && message.hasOwnProperty("package")) + object["package"] = message["package"]; + if (message.dependency && message.dependency.length) { + object.dependency = []; + for (var j = 0; j < message.dependency.length; ++j) + object.dependency[j] = message.dependency[j]; + } + if (message.messageType && message.messageType.length) { + object.messageType = []; + for (var j = 0; j < message.messageType.length; ++j) + object.messageType[j] = $root.google.protobuf.DescriptorProto.toObject(message.messageType[j], options); + } + if (message.enumType && message.enumType.length) { + object.enumType = []; + for (var j = 0; j < message.enumType.length; ++j) + object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); + } + if (message.service && message.service.length) { + object.service = []; + for (var j = 0; j < message.service.length; ++j) + object.service[j] = $root.google.protobuf.ServiceDescriptorProto.toObject(message.service[j], options); + } + if (message.extension && message.extension.length) { + object.extension = []; + for (var j = 0; j < message.extension.length; ++j) + object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.FileOptions.toObject(message.options, options); + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) + object.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.toObject(message.sourceCodeInfo, options); + if (message.publicDependency && message.publicDependency.length) { + object.publicDependency = []; + for (var j = 0; j < message.publicDependency.length; ++j) + object.publicDependency[j] = message.publicDependency[j]; + } + if (message.weakDependency && message.weakDependency.length) { + object.weakDependency = []; + for (var j = 0; j < message.weakDependency.length; ++j) + object.weakDependency[j] = message.weakDependency[j]; + } + if (message.syntax != null && message.hasOwnProperty("syntax")) + object.syntax = message.syntax; + return object; + }; + + /** + * Converts this FileDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.FileDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + FileDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return FileDescriptorProto; + })(); + + protobuf.DescriptorProto = (function() { + + /** + * Properties of a DescriptorProto. + * @memberof google.protobuf + * @interface IDescriptorProto + * @property {string|null} [name] DescriptorProto name + * @property {Array.|null} [field] DescriptorProto field + * @property {Array.|null} [extension] DescriptorProto extension + * @property {Array.|null} [nestedType] DescriptorProto nestedType + * @property {Array.|null} [enumType] DescriptorProto enumType + * @property {Array.|null} [extensionRange] DescriptorProto extensionRange + * @property {Array.|null} [oneofDecl] DescriptorProto oneofDecl + * @property {google.protobuf.IMessageOptions|null} [options] DescriptorProto options + * @property {Array.|null} [reservedRange] DescriptorProto reservedRange + * @property {Array.|null} [reservedName] DescriptorProto reservedName + */ + + /** + * Constructs a new DescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a DescriptorProto. + * @implements IDescriptorProto + * @constructor + * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set + */ + function DescriptorProto(properties) { + this.field = []; + this.extension = []; + this.nestedType = []; + this.enumType = []; + this.extensionRange = []; + this.oneofDecl = []; + this.reservedRange = []; + this.reservedName = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DescriptorProto name. + * @member {string} name + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.name = ""; + + /** + * DescriptorProto field. + * @member {Array.} field + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.field = $util.emptyArray; + + /** + * DescriptorProto extension. + * @member {Array.} extension + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.extension = $util.emptyArray; + + /** + * DescriptorProto nestedType. + * @member {Array.} nestedType + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.nestedType = $util.emptyArray; + + /** + * DescriptorProto enumType. + * @member {Array.} enumType + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.enumType = $util.emptyArray; + + /** + * DescriptorProto extensionRange. + * @member {Array.} extensionRange + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.extensionRange = $util.emptyArray; + + /** + * DescriptorProto oneofDecl. + * @member {Array.} oneofDecl + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.oneofDecl = $util.emptyArray; + + /** + * DescriptorProto options. + * @member {google.protobuf.IMessageOptions|null|undefined} options + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.options = null; + + /** + * DescriptorProto reservedRange. + * @member {Array.} reservedRange + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.reservedRange = $util.emptyArray; + + /** + * DescriptorProto reservedName. + * @member {Array.} reservedName + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.reservedName = $util.emptyArray; + + /** + * Creates a new DescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto} DescriptorProto instance + */ + DescriptorProto.create = function create(properties) { + return new DescriptorProto(properties); + }; + + /** + * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.field != null && message.field.length) + for (var i = 0; i < message.field.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.field[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.nestedType != null && message.nestedType.length) + for (var i = 0; i < message.nestedType.length; ++i) + $root.google.protobuf.DescriptorProto.encode(message.nestedType[i], writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.enumType != null && message.enumType.length) + for (var i = 0; i < message.enumType.length; ++i) + $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.extensionRange != null && message.extensionRange.length) + for (var i = 0; i < message.extensionRange.length; ++i) + $root.google.protobuf.DescriptorProto.ExtensionRange.encode(message.extensionRange[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.extension != null && message.extension.length) + for (var i = 0; i < message.extension.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.MessageOptions.encode(message.options, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); + if (message.oneofDecl != null && message.oneofDecl.length) + for (var i = 0; i < message.oneofDecl.length; ++i) + $root.google.protobuf.OneofDescriptorProto.encode(message.oneofDecl[i], writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.reservedRange != null && message.reservedRange.length) + for (var i = 0; i < message.reservedRange.length; ++i) + $root.google.protobuf.DescriptorProto.ReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); + if (message.reservedName != null && message.reservedName.length) + for (var i = 0; i < message.reservedName.length; ++i) + writer.uint32(/* id 10, wireType 2 =*/82).string(message.reservedName[i]); + return writer; + }; + + /** + * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.DescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.field && message.field.length)) + message.field = []; + message.field.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 6: + if (!(message.extension && message.extension.length)) + message.extension = []; + message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + if (!(message.nestedType && message.nestedType.length)) + message.nestedType = []; + message.nestedType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); + break; + case 4: + if (!(message.enumType && message.enumType.length)) + message.enumType = []; + message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.extensionRange && message.extensionRange.length)) + message.extensionRange = []; + message.extensionRange.push($root.google.protobuf.DescriptorProto.ExtensionRange.decode(reader, reader.uint32())); + break; + case 8: + if (!(message.oneofDecl && message.oneofDecl.length)) + message.oneofDecl = []; + message.oneofDecl.push($root.google.protobuf.OneofDescriptorProto.decode(reader, reader.uint32())); + break; + case 7: + message.options = $root.google.protobuf.MessageOptions.decode(reader, reader.uint32()); + break; + case 9: + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.DescriptorProto.ReservedRange.decode(reader, reader.uint32())); + break; + case 10: + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.DescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DescriptorProto message. + * @function verify + * @memberof google.protobuf.DescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.field != null && message.hasOwnProperty("field")) { + if (!Array.isArray(message.field)) + return "field: array expected"; + for (var i = 0; i < message.field.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.field[i]); + if (error) + return "field." + error; + } + } + if (message.extension != null && message.hasOwnProperty("extension")) { + if (!Array.isArray(message.extension)) + return "extension: array expected"; + for (var i = 0; i < message.extension.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); + if (error) + return "extension." + error; + } + } + if (message.nestedType != null && message.hasOwnProperty("nestedType")) { + if (!Array.isArray(message.nestedType)) + return "nestedType: array expected"; + for (var i = 0; i < message.nestedType.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.verify(message.nestedType[i]); + if (error) + return "nestedType." + error; + } + } + if (message.enumType != null && message.hasOwnProperty("enumType")) { + if (!Array.isArray(message.enumType)) + return "enumType: array expected"; + for (var i = 0; i < message.enumType.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); + if (error) + return "enumType." + error; + } + } + if (message.extensionRange != null && message.hasOwnProperty("extensionRange")) { + if (!Array.isArray(message.extensionRange)) + return "extensionRange: array expected"; + for (var i = 0; i < message.extensionRange.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.ExtensionRange.verify(message.extensionRange[i]); + if (error) + return "extensionRange." + error; + } + } + if (message.oneofDecl != null && message.hasOwnProperty("oneofDecl")) { + if (!Array.isArray(message.oneofDecl)) + return "oneofDecl: array expected"; + for (var i = 0; i < message.oneofDecl.length; ++i) { + var error = $root.google.protobuf.OneofDescriptorProto.verify(message.oneofDecl[i]); + if (error) + return "oneofDecl." + error; + } + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.MessageOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { + if (!Array.isArray(message.reservedRange)) + return "reservedRange: array expected"; + for (var i = 0; i < message.reservedRange.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.ReservedRange.verify(message.reservedRange[i]); + if (error) + return "reservedRange." + error; + } + } + if (message.reservedName != null && message.hasOwnProperty("reservedName")) { + if (!Array.isArray(message.reservedName)) + return "reservedName: array expected"; + for (var i = 0; i < message.reservedName.length; ++i) + if (!$util.isString(message.reservedName[i])) + return "reservedName: string[] expected"; + } + return null; + }; + + /** + * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.DescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.DescriptorProto} DescriptorProto + */ + DescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto) + return object; + var message = new $root.google.protobuf.DescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.field) { + if (!Array.isArray(object.field)) + throw TypeError(".google.protobuf.DescriptorProto.field: array expected"); + message.field = []; + for (var i = 0; i < object.field.length; ++i) { + if (typeof object.field[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.field: object expected"); + message.field[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.field[i]); + } + } + if (object.extension) { + if (!Array.isArray(object.extension)) + throw TypeError(".google.protobuf.DescriptorProto.extension: array expected"); + message.extension = []; + for (var i = 0; i < object.extension.length; ++i) { + if (typeof object.extension[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.extension: object expected"); + message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); + } + } + if (object.nestedType) { + if (!Array.isArray(object.nestedType)) + throw TypeError(".google.protobuf.DescriptorProto.nestedType: array expected"); + message.nestedType = []; + for (var i = 0; i < object.nestedType.length; ++i) { + if (typeof object.nestedType[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.nestedType: object expected"); + message.nestedType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.nestedType[i]); + } + } + if (object.enumType) { + if (!Array.isArray(object.enumType)) + throw TypeError(".google.protobuf.DescriptorProto.enumType: array expected"); + message.enumType = []; + for (var i = 0; i < object.enumType.length; ++i) { + if (typeof object.enumType[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.enumType: object expected"); + message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); + } + } + if (object.extensionRange) { + if (!Array.isArray(object.extensionRange)) + throw TypeError(".google.protobuf.DescriptorProto.extensionRange: array expected"); + message.extensionRange = []; + for (var i = 0; i < object.extensionRange.length; ++i) { + if (typeof object.extensionRange[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.extensionRange: object expected"); + message.extensionRange[i] = $root.google.protobuf.DescriptorProto.ExtensionRange.fromObject(object.extensionRange[i]); + } + } + if (object.oneofDecl) { + if (!Array.isArray(object.oneofDecl)) + throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: array expected"); + message.oneofDecl = []; + for (var i = 0; i < object.oneofDecl.length; ++i) { + if (typeof object.oneofDecl[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: object expected"); + message.oneofDecl[i] = $root.google.protobuf.OneofDescriptorProto.fromObject(object.oneofDecl[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.DescriptorProto.options: object expected"); + message.options = $root.google.protobuf.MessageOptions.fromObject(object.options); + } + if (object.reservedRange) { + if (!Array.isArray(object.reservedRange)) + throw TypeError(".google.protobuf.DescriptorProto.reservedRange: array expected"); + message.reservedRange = []; + for (var i = 0; i < object.reservedRange.length; ++i) { + if (typeof object.reservedRange[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.reservedRange: object expected"); + message.reservedRange[i] = $root.google.protobuf.DescriptorProto.ReservedRange.fromObject(object.reservedRange[i]); + } + } + if (object.reservedName) { + if (!Array.isArray(object.reservedName)) + throw TypeError(".google.protobuf.DescriptorProto.reservedName: array expected"); + message.reservedName = []; + for (var i = 0; i < object.reservedName.length; ++i) + message.reservedName[i] = String(object.reservedName[i]); + } + return message; + }; + + /** + * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.DescriptorProto} message DescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.field = []; + object.nestedType = []; + object.enumType = []; + object.extensionRange = []; + object.extension = []; + object.oneofDecl = []; + object.reservedRange = []; + object.reservedName = []; + } + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.field && message.field.length) { + object.field = []; + for (var j = 0; j < message.field.length; ++j) + object.field[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.field[j], options); + } + if (message.nestedType && message.nestedType.length) { + object.nestedType = []; + for (var j = 0; j < message.nestedType.length; ++j) + object.nestedType[j] = $root.google.protobuf.DescriptorProto.toObject(message.nestedType[j], options); + } + if (message.enumType && message.enumType.length) { + object.enumType = []; + for (var j = 0; j < message.enumType.length; ++j) + object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); + } + if (message.extensionRange && message.extensionRange.length) { + object.extensionRange = []; + for (var j = 0; j < message.extensionRange.length; ++j) + object.extensionRange[j] = $root.google.protobuf.DescriptorProto.ExtensionRange.toObject(message.extensionRange[j], options); + } + if (message.extension && message.extension.length) { + object.extension = []; + for (var j = 0; j < message.extension.length; ++j) + object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.MessageOptions.toObject(message.options, options); + if (message.oneofDecl && message.oneofDecl.length) { + object.oneofDecl = []; + for (var j = 0; j < message.oneofDecl.length; ++j) + object.oneofDecl[j] = $root.google.protobuf.OneofDescriptorProto.toObject(message.oneofDecl[j], options); + } + if (message.reservedRange && message.reservedRange.length) { + object.reservedRange = []; + for (var j = 0; j < message.reservedRange.length; ++j) + object.reservedRange[j] = $root.google.protobuf.DescriptorProto.ReservedRange.toObject(message.reservedRange[j], options); + } + if (message.reservedName && message.reservedName.length) { + object.reservedName = []; + for (var j = 0; j < message.reservedName.length; ++j) + object.reservedName[j] = message.reservedName[j]; + } + return object; + }; + + /** + * Converts this DescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.DescriptorProto + * @instance + * @returns {Object.} JSON object + */ + DescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + DescriptorProto.ExtensionRange = (function() { + + /** + * Properties of an ExtensionRange. + * @memberof google.protobuf.DescriptorProto + * @interface IExtensionRange + * @property {number|null} [start] ExtensionRange start + * @property {number|null} [end] ExtensionRange end + * @property {google.protobuf.IExtensionRangeOptions|null} [options] ExtensionRange options + */ + + /** + * Constructs a new ExtensionRange. + * @memberof google.protobuf.DescriptorProto + * @classdesc Represents an ExtensionRange. + * @implements IExtensionRange + * @constructor + * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set + */ + function ExtensionRange(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ExtensionRange start. + * @member {number} start + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @instance + */ + ExtensionRange.prototype.start = 0; + + /** + * ExtensionRange end. + * @member {number} end + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @instance + */ + ExtensionRange.prototype.end = 0; + + /** + * ExtensionRange options. + * @member {google.protobuf.IExtensionRangeOptions|null|undefined} options + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @instance + */ + ExtensionRange.prototype.options = null; + + /** + * Creates a new ExtensionRange instance using the specified properties. + * @function create + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange instance + */ + ExtensionRange.create = function create(properties) { + return new ExtensionRange(properties); + }; + + /** + * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @function encode + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRange.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.ExtensionRangeOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRange.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an ExtensionRange message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRange.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.start = reader.int32(); + break; + case 2: + message.end = reader.int32(); + break; + case 3: + message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRange.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ExtensionRange message. + * @function verify + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExtensionRange.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.ExtensionRangeOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; + + /** + * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange + */ + ExtensionRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto.ExtensionRange) + return object; + var message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.DescriptorProto.ExtensionRange.options: object expected"); + message.options = $root.google.protobuf.ExtensionRangeOptions.fromObject(object.options); + } + return message; + }; + + /** + * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {google.protobuf.DescriptorProto.ExtensionRange} message ExtensionRange + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExtensionRange.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.start = 0; + object.end = 0; + object.options = null; + } + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.ExtensionRangeOptions.toObject(message.options, options); + return object; + }; + + /** + * Converts this ExtensionRange to JSON. + * @function toJSON + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @instance + * @returns {Object.} JSON object + */ + ExtensionRange.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ExtensionRange; + })(); + + DescriptorProto.ReservedRange = (function() { + + /** + * Properties of a ReservedRange. + * @memberof google.protobuf.DescriptorProto + * @interface IReservedRange + * @property {number|null} [start] ReservedRange start + * @property {number|null} [end] ReservedRange end + */ + + /** + * Constructs a new ReservedRange. + * @memberof google.protobuf.DescriptorProto + * @classdesc Represents a ReservedRange. + * @implements IReservedRange + * @constructor + * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set + */ + function ReservedRange(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ReservedRange start. + * @member {number} start + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @instance + */ + ReservedRange.prototype.start = 0; + + /** + * ReservedRange end. + * @member {number} end + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @instance + */ + ReservedRange.prototype.end = 0; + + /** + * Creates a new ReservedRange instance using the specified properties. + * @function create + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange instance + */ + ReservedRange.create = function create(properties) { + return new ReservedRange(properties); + }; + + /** + * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @function encode + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ReservedRange.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + return writer; + }; + + /** + * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ReservedRange.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ReservedRange message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ReservedRange.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ReservedRange(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.start = reader.int32(); + break; + case 2: + message.end = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ReservedRange message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ReservedRange.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ReservedRange message. + * @function verify + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ReservedRange.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; + return null; + }; + + /** + * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange + */ + ReservedRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto.ReservedRange) + return object; + var message = new $root.google.protobuf.DescriptorProto.ReservedRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; + return message; + }; + + /** + * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {google.protobuf.DescriptorProto.ReservedRange} message ReservedRange + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ReservedRange.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.start = 0; + object.end = 0; + } + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; + return object; + }; + + /** + * Converts this ReservedRange to JSON. + * @function toJSON + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @instance + * @returns {Object.} JSON object + */ + ReservedRange.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ReservedRange; + })(); + + return DescriptorProto; + })(); + + protobuf.ExtensionRangeOptions = (function() { + + /** + * Properties of an ExtensionRangeOptions. + * @memberof google.protobuf + * @interface IExtensionRangeOptions + * @property {Array.|null} [uninterpretedOption] ExtensionRangeOptions uninterpretedOption + */ + + /** + * Constructs a new ExtensionRangeOptions. + * @memberof google.protobuf + * @classdesc Represents an ExtensionRangeOptions. + * @implements IExtensionRangeOptions + * @constructor + * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set + */ + function ExtensionRangeOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ExtensionRangeOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + */ + ExtensionRangeOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions instance + */ + ExtensionRangeOptions.create = function create(properties) { + return new ExtensionRangeOptions(properties); + }; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRangeOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRangeOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRangeOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRangeOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ExtensionRangeOptions message. + * @function verify + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExtensionRangeOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + */ + ExtensionRangeOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ExtensionRangeOptions) + return object; + var message = new $root.google.protobuf.ExtensionRangeOptions(); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.ExtensionRangeOptions} message ExtensionRangeOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExtensionRangeOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; + + /** + * Converts this ExtensionRangeOptions to JSON. + * @function toJSON + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + * @returns {Object.} JSON object + */ + ExtensionRangeOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ExtensionRangeOptions; + })(); + + protobuf.FieldDescriptorProto = (function() { + + /** + * Properties of a FieldDescriptorProto. + * @memberof google.protobuf + * @interface IFieldDescriptorProto + * @property {string|null} [name] FieldDescriptorProto name + * @property {number|null} [number] FieldDescriptorProto number + * @property {google.protobuf.FieldDescriptorProto.Label|null} [label] FieldDescriptorProto label + * @property {google.protobuf.FieldDescriptorProto.Type|null} [type] FieldDescriptorProto type + * @property {string|null} [typeName] FieldDescriptorProto typeName + * @property {string|null} [extendee] FieldDescriptorProto extendee + * @property {string|null} [defaultValue] FieldDescriptorProto defaultValue + * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex + * @property {string|null} [jsonName] FieldDescriptorProto jsonName + * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options + */ + + /** + * Constructs a new FieldDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a FieldDescriptorProto. + * @implements IFieldDescriptorProto + * @constructor + * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set + */ + function FieldDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FieldDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.name = ""; + + /** + * FieldDescriptorProto number. + * @member {number} number + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.number = 0; + + /** + * FieldDescriptorProto label. + * @member {google.protobuf.FieldDescriptorProto.Label} label + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.label = 1; + + /** + * FieldDescriptorProto type. + * @member {google.protobuf.FieldDescriptorProto.Type} type + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.type = 1; + + /** + * FieldDescriptorProto typeName. + * @member {string} typeName + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.typeName = ""; + + /** + * FieldDescriptorProto extendee. + * @member {string} extendee + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.extendee = ""; + + /** + * FieldDescriptorProto defaultValue. + * @member {string} defaultValue + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.defaultValue = ""; + + /** + * FieldDescriptorProto oneofIndex. + * @member {number} oneofIndex + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.oneofIndex = 0; + + /** + * FieldDescriptorProto jsonName. + * @member {string} jsonName + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.jsonName = ""; + + /** + * FieldDescriptorProto options. + * @member {google.protobuf.IFieldOptions|null|undefined} options + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.options = null; + + /** + * Creates a new FieldDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto instance + */ + FieldDescriptorProto.create = function create(properties) { + return new FieldDescriptorProto(properties); + }; + + /** + * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.extendee != null && message.hasOwnProperty("extendee")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.extendee); + if (message.number != null && message.hasOwnProperty("number")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.number); + if (message.label != null && message.hasOwnProperty("label")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.label); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.type); + if (message.typeName != null && message.hasOwnProperty("typeName")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.typeName); + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.defaultValue); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.FieldOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); + return writer; + }; + + /** + * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 3: + message.number = reader.int32(); + break; + case 4: + message.label = reader.int32(); + break; + case 5: + message.type = reader.int32(); + break; + case 6: + message.typeName = reader.string(); + break; + case 2: + message.extendee = reader.string(); + break; + case 7: + message.defaultValue = reader.string(); + break; + case 9: + message.oneofIndex = reader.int32(); + break; + case 10: + message.jsonName = reader.string(); + break; + case 8: + message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FieldDescriptorProto message. + * @function verify + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.number != null && message.hasOwnProperty("number")) + if (!$util.isInteger(message.number)) + return "number: integer expected"; + if (message.label != null && message.hasOwnProperty("label")) + switch (message.label) { + default: + return "label: enum value expected"; + case 1: + case 2: + case 3: + break; + } + if (message.type != null && message.hasOwnProperty("type")) + switch (message.type) { + default: + return "type: enum value expected"; + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + break; + } + if (message.typeName != null && message.hasOwnProperty("typeName")) + if (!$util.isString(message.typeName)) + return "typeName: string expected"; + if (message.extendee != null && message.hasOwnProperty("extendee")) + if (!$util.isString(message.extendee)) + return "extendee: string expected"; + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + if (!$util.isString(message.defaultValue)) + return "defaultValue: string expected"; + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + if (!$util.isInteger(message.oneofIndex)) + return "oneofIndex: integer expected"; + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + if (!$util.isString(message.jsonName)) + return "jsonName: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.FieldOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; + + /** + * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + */ + FieldDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldDescriptorProto) + return object; + var message = new $root.google.protobuf.FieldDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.number != null) + message.number = object.number | 0; + switch (object.label) { + case "LABEL_OPTIONAL": + case 1: + message.label = 1; + break; + case "LABEL_REQUIRED": + case 2: + message.label = 2; + break; + case "LABEL_REPEATED": + case 3: + message.label = 3; + break; + } + switch (object.type) { + case "TYPE_DOUBLE": + case 1: + message.type = 1; + break; + case "TYPE_FLOAT": + case 2: + message.type = 2; + break; + case "TYPE_INT64": + case 3: + message.type = 3; + break; + case "TYPE_UINT64": + case 4: + message.type = 4; + break; + case "TYPE_INT32": + case 5: + message.type = 5; + break; + case "TYPE_FIXED64": + case 6: + message.type = 6; + break; + case "TYPE_FIXED32": + case 7: + message.type = 7; + break; + case "TYPE_BOOL": + case 8: + message.type = 8; + break; + case "TYPE_STRING": + case 9: + message.type = 9; + break; + case "TYPE_GROUP": + case 10: + message.type = 10; + break; + case "TYPE_MESSAGE": + case 11: + message.type = 11; + break; + case "TYPE_BYTES": + case 12: + message.type = 12; + break; + case "TYPE_UINT32": + case 13: + message.type = 13; + break; + case "TYPE_ENUM": + case 14: + message.type = 14; + break; + case "TYPE_SFIXED32": + case 15: + message.type = 15; + break; + case "TYPE_SFIXED64": + case 16: + message.type = 16; + break; + case "TYPE_SINT32": + case 17: + message.type = 17; + break; + case "TYPE_SINT64": + case 18: + message.type = 18; + break; + } + if (object.typeName != null) + message.typeName = String(object.typeName); + if (object.extendee != null) + message.extendee = String(object.extendee); + if (object.defaultValue != null) + message.defaultValue = String(object.defaultValue); + if (object.oneofIndex != null) + message.oneofIndex = object.oneofIndex | 0; + if (object.jsonName != null) + message.jsonName = String(object.jsonName); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.FieldDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.FieldOptions.fromObject(object.options); + } + return message; + }; + + /** + * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.FieldDescriptorProto} message FieldDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.extendee = ""; + object.number = 0; + object.label = options.enums === String ? "LABEL_OPTIONAL" : 1; + object.type = options.enums === String ? "TYPE_DOUBLE" : 1; + object.typeName = ""; + object.defaultValue = ""; + object.options = null; + object.oneofIndex = 0; + object.jsonName = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.extendee != null && message.hasOwnProperty("extendee")) + object.extendee = message.extendee; + if (message.number != null && message.hasOwnProperty("number")) + object.number = message.number; + if (message.label != null && message.hasOwnProperty("label")) + object.label = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Label[message.label] : message.label; + if (message.type != null && message.hasOwnProperty("type")) + object.type = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Type[message.type] : message.type; + if (message.typeName != null && message.hasOwnProperty("typeName")) + object.typeName = message.typeName; + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + object.defaultValue = message.defaultValue; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.FieldOptions.toObject(message.options, options); + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + object.oneofIndex = message.oneofIndex; + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + object.jsonName = message.jsonName; + return object; + }; + + /** + * Converts this FieldDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.FieldDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + FieldDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Type enum. + * @name google.protobuf.FieldDescriptorProto.Type + * @enum {string} + * @property {number} TYPE_DOUBLE=1 TYPE_DOUBLE value + * @property {number} TYPE_FLOAT=2 TYPE_FLOAT value + * @property {number} TYPE_INT64=3 TYPE_INT64 value + * @property {number} TYPE_UINT64=4 TYPE_UINT64 value + * @property {number} TYPE_INT32=5 TYPE_INT32 value + * @property {number} TYPE_FIXED64=6 TYPE_FIXED64 value + * @property {number} TYPE_FIXED32=7 TYPE_FIXED32 value + * @property {number} TYPE_BOOL=8 TYPE_BOOL value + * @property {number} TYPE_STRING=9 TYPE_STRING value + * @property {number} TYPE_GROUP=10 TYPE_GROUP value + * @property {number} TYPE_MESSAGE=11 TYPE_MESSAGE value + * @property {number} TYPE_BYTES=12 TYPE_BYTES value + * @property {number} TYPE_UINT32=13 TYPE_UINT32 value + * @property {number} TYPE_ENUM=14 TYPE_ENUM value + * @property {number} TYPE_SFIXED32=15 TYPE_SFIXED32 value + * @property {number} TYPE_SFIXED64=16 TYPE_SFIXED64 value + * @property {number} TYPE_SINT32=17 TYPE_SINT32 value + * @property {number} TYPE_SINT64=18 TYPE_SINT64 value + */ + FieldDescriptorProto.Type = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "TYPE_DOUBLE"] = 1; + values[valuesById[2] = "TYPE_FLOAT"] = 2; + values[valuesById[3] = "TYPE_INT64"] = 3; + values[valuesById[4] = "TYPE_UINT64"] = 4; + values[valuesById[5] = "TYPE_INT32"] = 5; + values[valuesById[6] = "TYPE_FIXED64"] = 6; + values[valuesById[7] = "TYPE_FIXED32"] = 7; + values[valuesById[8] = "TYPE_BOOL"] = 8; + values[valuesById[9] = "TYPE_STRING"] = 9; + values[valuesById[10] = "TYPE_GROUP"] = 10; + values[valuesById[11] = "TYPE_MESSAGE"] = 11; + values[valuesById[12] = "TYPE_BYTES"] = 12; + values[valuesById[13] = "TYPE_UINT32"] = 13; + values[valuesById[14] = "TYPE_ENUM"] = 14; + values[valuesById[15] = "TYPE_SFIXED32"] = 15; + values[valuesById[16] = "TYPE_SFIXED64"] = 16; + values[valuesById[17] = "TYPE_SINT32"] = 17; + values[valuesById[18] = "TYPE_SINT64"] = 18; + return values; + })(); + + /** + * Label enum. + * @name google.protobuf.FieldDescriptorProto.Label + * @enum {string} + * @property {number} LABEL_OPTIONAL=1 LABEL_OPTIONAL value + * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value + * @property {number} LABEL_REPEATED=3 LABEL_REPEATED value + */ + FieldDescriptorProto.Label = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "LABEL_OPTIONAL"] = 1; + values[valuesById[2] = "LABEL_REQUIRED"] = 2; + values[valuesById[3] = "LABEL_REPEATED"] = 3; + return values; + })(); + + return FieldDescriptorProto; + })(); + + protobuf.OneofDescriptorProto = (function() { + + /** + * Properties of an OneofDescriptorProto. + * @memberof google.protobuf + * @interface IOneofDescriptorProto + * @property {string|null} [name] OneofDescriptorProto name + * @property {google.protobuf.IOneofOptions|null} [options] OneofDescriptorProto options + */ + + /** + * Constructs a new OneofDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an OneofDescriptorProto. + * @implements IOneofDescriptorProto + * @constructor + * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set + */ + function OneofDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * OneofDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.OneofDescriptorProto + * @instance + */ + OneofDescriptorProto.prototype.name = ""; + + /** + * OneofDescriptorProto options. + * @member {google.protobuf.IOneofOptions|null|undefined} options + * @memberof google.protobuf.OneofDescriptorProto + * @instance + */ + OneofDescriptorProto.prototype.options = null; + + /** + * Creates a new OneofDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto instance + */ + OneofDescriptorProto.create = function create(properties) { + return new OneofDescriptorProto(properties); + }; + + /** + * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.OneofOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.options = $root.google.protobuf.OneofOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an OneofDescriptorProto message. + * @function verify + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OneofDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.OneofOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; + + /** + * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + */ + OneofDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.OneofDescriptorProto) + return object; + var message = new $root.google.protobuf.OneofDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.OneofDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.OneofOptions.fromObject(object.options); + } + return message; + }; + + /** + * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.OneofDescriptorProto} message OneofDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OneofDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.OneofOptions.toObject(message.options, options); + return object; + }; + + /** + * Converts this OneofDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.OneofDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + OneofDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return OneofDescriptorProto; + })(); + + protobuf.EnumDescriptorProto = (function() { + + /** + * Properties of an EnumDescriptorProto. + * @memberof google.protobuf + * @interface IEnumDescriptorProto + * @property {string|null} [name] EnumDescriptorProto name + * @property {Array.|null} [value] EnumDescriptorProto value + * @property {google.protobuf.IEnumOptions|null} [options] EnumDescriptorProto options + * @property {Array.|null} [reservedRange] EnumDescriptorProto reservedRange + * @property {Array.|null} [reservedName] EnumDescriptorProto reservedName + */ + + /** + * Constructs a new EnumDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an EnumDescriptorProto. + * @implements IEnumDescriptorProto + * @constructor + * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set + */ + function EnumDescriptorProto(properties) { + this.value = []; + this.reservedRange = []; + this.reservedName = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EnumDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.name = ""; + + /** + * EnumDescriptorProto value. + * @member {Array.} value + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.value = $util.emptyArray; + + /** + * EnumDescriptorProto options. + * @member {google.protobuf.IEnumOptions|null|undefined} options + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.options = null; + + /** + * EnumDescriptorProto reservedRange. + * @member {Array.} reservedRange + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.reservedRange = $util.emptyArray; + + /** + * EnumDescriptorProto reservedName. + * @member {Array.} reservedName + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.reservedName = $util.emptyArray; + + /** + * Creates a new EnumDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto instance + */ + EnumDescriptorProto.create = function create(properties) { + return new EnumDescriptorProto(properties); + }; + + /** + * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.value != null && message.value.length) + for (var i = 0; i < message.value.length; ++i) + $root.google.protobuf.EnumValueDescriptorProto.encode(message.value[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.EnumOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.reservedRange != null && message.reservedRange.length) + for (var i = 0; i < message.reservedRange.length; ++i) + $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.reservedName != null && message.reservedName.length) + for (var i = 0; i < message.reservedName.length; ++i) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.reservedName[i]); + return writer; + }; + + /** + * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.value && message.value.length)) + message.value = []; + message.value.push($root.google.protobuf.EnumValueDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); + break; + case 4: + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EnumDescriptorProto message. + * @function verify + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.value != null && message.hasOwnProperty("value")) { + if (!Array.isArray(message.value)) + return "value: array expected"; + for (var i = 0; i < message.value.length; ++i) { + var error = $root.google.protobuf.EnumValueDescriptorProto.verify(message.value[i]); + if (error) + return "value." + error; + } + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.EnumOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { + if (!Array.isArray(message.reservedRange)) + return "reservedRange: array expected"; + for (var i = 0; i < message.reservedRange.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.verify(message.reservedRange[i]); + if (error) + return "reservedRange." + error; + } + } + if (message.reservedName != null && message.hasOwnProperty("reservedName")) { + if (!Array.isArray(message.reservedName)) + return "reservedName: array expected"; + for (var i = 0; i < message.reservedName.length; ++i) + if (!$util.isString(message.reservedName[i])) + return "reservedName: string[] expected"; + } + return null; + }; + + /** + * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + */ + EnumDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumDescriptorProto) + return object; + var message = new $root.google.protobuf.EnumDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.value) { + if (!Array.isArray(object.value)) + throw TypeError(".google.protobuf.EnumDescriptorProto.value: array expected"); + message.value = []; + for (var i = 0; i < object.value.length; ++i) { + if (typeof object.value[i] !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.value: object expected"); + message.value[i] = $root.google.protobuf.EnumValueDescriptorProto.fromObject(object.value[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.EnumOptions.fromObject(object.options); + } + if (object.reservedRange) { + if (!Array.isArray(object.reservedRange)) + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: array expected"); + message.reservedRange = []; + for (var i = 0; i < object.reservedRange.length; ++i) { + if (typeof object.reservedRange[i] !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: object expected"); + message.reservedRange[i] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.fromObject(object.reservedRange[i]); + } + } + if (object.reservedName) { + if (!Array.isArray(object.reservedName)) + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedName: array expected"); + message.reservedName = []; + for (var i = 0; i < object.reservedName.length; ++i) + message.reservedName[i] = String(object.reservedName[i]); + } + return message; + }; + + /** + * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.EnumDescriptorProto} message EnumDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.value = []; + object.reservedRange = []; + object.reservedName = []; + } + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.value && message.value.length) { + object.value = []; + for (var j = 0; j < message.value.length; ++j) + object.value[j] = $root.google.protobuf.EnumValueDescriptorProto.toObject(message.value[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.EnumOptions.toObject(message.options, options); + if (message.reservedRange && message.reservedRange.length) { + object.reservedRange = []; + for (var j = 0; j < message.reservedRange.length; ++j) + object.reservedRange[j] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.toObject(message.reservedRange[j], options); + } + if (message.reservedName && message.reservedName.length) { + object.reservedName = []; + for (var j = 0; j < message.reservedName.length; ++j) + object.reservedName[j] = message.reservedName[j]; + } + return object; + }; + + /** + * Converts this EnumDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.EnumDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + EnumDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + EnumDescriptorProto.EnumReservedRange = (function() { + + /** + * Properties of an EnumReservedRange. + * @memberof google.protobuf.EnumDescriptorProto + * @interface IEnumReservedRange + * @property {number|null} [start] EnumReservedRange start + * @property {number|null} [end] EnumReservedRange end + */ + + /** + * Constructs a new EnumReservedRange. + * @memberof google.protobuf.EnumDescriptorProto + * @classdesc Represents an EnumReservedRange. + * @implements IEnumReservedRange + * @constructor + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set + */ + function EnumReservedRange(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EnumReservedRange start. + * @member {number} start + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @instance + */ + EnumReservedRange.prototype.start = 0; + + /** + * EnumReservedRange end. + * @member {number} end + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @instance + */ + EnumReservedRange.prototype.end = 0; + + /** + * Creates a new EnumReservedRange instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange instance + */ + EnumReservedRange.create = function create(properties) { + return new EnumReservedRange(properties); + }; + + /** + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumReservedRange.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + return writer; + }; + + /** + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumReservedRange.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumReservedRange.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.start = reader.int32(); + break; + case 2: + message.end = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumReservedRange.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EnumReservedRange message. + * @function verify + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumReservedRange.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; + return null; + }; + + /** + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + */ + EnumReservedRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumDescriptorProto.EnumReservedRange) + return object; + var message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; + return message; + }; + + /** + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {google.protobuf.EnumDescriptorProto.EnumReservedRange} message EnumReservedRange + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumReservedRange.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.start = 0; + object.end = 0; + } + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; + return object; + }; + + /** + * Converts this EnumReservedRange to JSON. + * @function toJSON + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @instance + * @returns {Object.} JSON object + */ + EnumReservedRange.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return EnumReservedRange; + })(); + + return EnumDescriptorProto; + })(); + + protobuf.EnumValueDescriptorProto = (function() { + + /** + * Properties of an EnumValueDescriptorProto. + * @memberof google.protobuf + * @interface IEnumValueDescriptorProto + * @property {string|null} [name] EnumValueDescriptorProto name + * @property {number|null} [number] EnumValueDescriptorProto number + * @property {google.protobuf.IEnumValueOptions|null} [options] EnumValueDescriptorProto options + */ + + /** + * Constructs a new EnumValueDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an EnumValueDescriptorProto. + * @implements IEnumValueDescriptorProto + * @constructor + * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set + */ + function EnumValueDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EnumValueDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.name = ""; + + /** + * EnumValueDescriptorProto number. + * @member {number} number + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.number = 0; + + /** + * EnumValueDescriptorProto options. + * @member {google.protobuf.IEnumValueOptions|null|undefined} options + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.options = null; + + /** + * Creates a new EnumValueDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto instance + */ + EnumValueDescriptorProto.create = function create(properties) { + return new EnumValueDescriptorProto(properties); + }; + + /** + * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.number != null && message.hasOwnProperty("number")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.number); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.EnumValueOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.number = reader.int32(); + break; + case 3: + message.options = $root.google.protobuf.EnumValueOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EnumValueDescriptorProto message. + * @function verify + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumValueDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.number != null && message.hasOwnProperty("number")) + if (!$util.isInteger(message.number)) + return "number: integer expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.EnumValueOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; + + /** + * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + */ + EnumValueDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumValueDescriptorProto) + return object; + var message = new $root.google.protobuf.EnumValueDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.number != null) + message.number = object.number | 0; + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.EnumValueDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.EnumValueOptions.fromObject(object.options); + } + return message; + }; + + /** + * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.EnumValueDescriptorProto} message EnumValueDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumValueDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.number = 0; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.number != null && message.hasOwnProperty("number")) + object.number = message.number; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.EnumValueOptions.toObject(message.options, options); + return object; + }; + + /** + * Converts this EnumValueDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + EnumValueDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return EnumValueDescriptorProto; + })(); + + protobuf.ServiceDescriptorProto = (function() { + + /** + * Properties of a ServiceDescriptorProto. + * @memberof google.protobuf + * @interface IServiceDescriptorProto + * @property {string|null} [name] ServiceDescriptorProto name + * @property {Array.|null} [method] ServiceDescriptorProto method + * @property {google.protobuf.IServiceOptions|null} [options] ServiceDescriptorProto options + */ + + /** + * Constructs a new ServiceDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a ServiceDescriptorProto. + * @implements IServiceDescriptorProto + * @constructor + * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set + */ + function ServiceDescriptorProto(properties) { + this.method = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ServiceDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.name = ""; + + /** + * ServiceDescriptorProto method. + * @member {Array.} method + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.method = $util.emptyArray; + + /** + * ServiceDescriptorProto options. + * @member {google.protobuf.IServiceOptions|null|undefined} options + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.options = null; + + /** + * Creates a new ServiceDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto instance + */ + ServiceDescriptorProto.create = function create(properties) { + return new ServiceDescriptorProto(properties); + }; + + /** + * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.method != null && message.method.length) + for (var i = 0; i < message.method.length; ++i) + $root.google.protobuf.MethodDescriptorProto.encode(message.method[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.ServiceOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.method && message.method.length)) + message.method = []; + message.method.push($root.google.protobuf.MethodDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + message.options = $root.google.protobuf.ServiceOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ServiceDescriptorProto message. + * @function verify + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ServiceDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.method != null && message.hasOwnProperty("method")) { + if (!Array.isArray(message.method)) + return "method: array expected"; + for (var i = 0; i < message.method.length; ++i) { + var error = $root.google.protobuf.MethodDescriptorProto.verify(message.method[i]); + if (error) + return "method." + error; + } + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.ServiceOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; + + /** + * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + */ + ServiceDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ServiceDescriptorProto) + return object; + var message = new $root.google.protobuf.ServiceDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.method) { + if (!Array.isArray(object.method)) + throw TypeError(".google.protobuf.ServiceDescriptorProto.method: array expected"); + message.method = []; + for (var i = 0; i < object.method.length; ++i) { + if (typeof object.method[i] !== "object") + throw TypeError(".google.protobuf.ServiceDescriptorProto.method: object expected"); + message.method[i] = $root.google.protobuf.MethodDescriptorProto.fromObject(object.method[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.ServiceDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.ServiceOptions.fromObject(object.options); + } + return message; + }; + + /** + * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.ServiceDescriptorProto} message ServiceDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ServiceDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.method = []; + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.method && message.method.length) { + object.method = []; + for (var j = 0; j < message.method.length; ++j) + object.method[j] = $root.google.protobuf.MethodDescriptorProto.toObject(message.method[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.ServiceOptions.toObject(message.options, options); + return object; + }; + + /** + * Converts this ServiceDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + ServiceDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ServiceDescriptorProto; + })(); + + protobuf.MethodDescriptorProto = (function() { + + /** + * Properties of a MethodDescriptorProto. + * @memberof google.protobuf + * @interface IMethodDescriptorProto + * @property {string|null} [name] MethodDescriptorProto name + * @property {string|null} [inputType] MethodDescriptorProto inputType + * @property {string|null} [outputType] MethodDescriptorProto outputType + * @property {google.protobuf.IMethodOptions|null} [options] MethodDescriptorProto options + * @property {boolean|null} [clientStreaming] MethodDescriptorProto clientStreaming + * @property {boolean|null} [serverStreaming] MethodDescriptorProto serverStreaming + */ + + /** + * Constructs a new MethodDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a MethodDescriptorProto. + * @implements IMethodDescriptorProto + * @constructor + * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set + */ + function MethodDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * MethodDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.name = ""; + + /** + * MethodDescriptorProto inputType. + * @member {string} inputType + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.inputType = ""; + + /** + * MethodDescriptorProto outputType. + * @member {string} outputType + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.outputType = ""; + + /** + * MethodDescriptorProto options. + * @member {google.protobuf.IMethodOptions|null|undefined} options + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.options = null; + + /** + * MethodDescriptorProto clientStreaming. + * @member {boolean} clientStreaming + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.clientStreaming = false; + + /** + * MethodDescriptorProto serverStreaming. + * @member {boolean} serverStreaming + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.serverStreaming = false; + + /** + * Creates a new MethodDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto instance + */ + MethodDescriptorProto.create = function create(properties) { + return new MethodDescriptorProto(properties); + }; + + /** + * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.inputType != null && message.hasOwnProperty("inputType")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.inputType); + if (message.outputType != null && message.hasOwnProperty("outputType")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputType); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.MethodOptions.encode(message.options, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + writer.uint32(/* id 5, wireType 0 =*/40).bool(message.clientStreaming); + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + writer.uint32(/* id 6, wireType 0 =*/48).bool(message.serverStreaming); + return writer; + }; + + /** + * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.inputType = reader.string(); + break; + case 3: + message.outputType = reader.string(); + break; + case 4: + message.options = $root.google.protobuf.MethodOptions.decode(reader, reader.uint32()); + break; + case 5: + message.clientStreaming = reader.bool(); + break; + case 6: + message.serverStreaming = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a MethodDescriptorProto message. + * @function verify + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MethodDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.inputType != null && message.hasOwnProperty("inputType")) + if (!$util.isString(message.inputType)) + return "inputType: string expected"; + if (message.outputType != null && message.hasOwnProperty("outputType")) + if (!$util.isString(message.outputType)) + return "outputType: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.MethodOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + if (typeof message.clientStreaming !== "boolean") + return "clientStreaming: boolean expected"; + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + if (typeof message.serverStreaming !== "boolean") + return "serverStreaming: boolean expected"; + return null; + }; + + /** + * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + */ + MethodDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MethodDescriptorProto) + return object; + var message = new $root.google.protobuf.MethodDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.inputType != null) + message.inputType = String(object.inputType); + if (object.outputType != null) + message.outputType = String(object.outputType); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.MethodDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.MethodOptions.fromObject(object.options); + } + if (object.clientStreaming != null) + message.clientStreaming = Boolean(object.clientStreaming); + if (object.serverStreaming != null) + message.serverStreaming = Boolean(object.serverStreaming); + return message; + }; + + /** + * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.MethodDescriptorProto} message MethodDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MethodDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.inputType = ""; + object.outputType = ""; + object.options = null; + object.clientStreaming = false; + object.serverStreaming = false; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.inputType != null && message.hasOwnProperty("inputType")) + object.inputType = message.inputType; + if (message.outputType != null && message.hasOwnProperty("outputType")) + object.outputType = message.outputType; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.MethodOptions.toObject(message.options, options); + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + object.clientStreaming = message.clientStreaming; + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + object.serverStreaming = message.serverStreaming; + return object; + }; + + /** + * Converts this MethodDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.MethodDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + MethodDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return MethodDescriptorProto; + })(); + + protobuf.FileOptions = (function() { + + /** + * Properties of a FileOptions. + * @memberof google.protobuf + * @interface IFileOptions + * @property {string|null} [javaPackage] FileOptions javaPackage + * @property {string|null} [javaOuterClassname] FileOptions javaOuterClassname + * @property {boolean|null} [javaMultipleFiles] FileOptions javaMultipleFiles + * @property {boolean|null} [javaGenerateEqualsAndHash] FileOptions javaGenerateEqualsAndHash + * @property {boolean|null} [javaStringCheckUtf8] FileOptions javaStringCheckUtf8 + * @property {google.protobuf.FileOptions.OptimizeMode|null} [optimizeFor] FileOptions optimizeFor + * @property {string|null} [goPackage] FileOptions goPackage + * @property {boolean|null} [ccGenericServices] FileOptions ccGenericServices + * @property {boolean|null} [javaGenericServices] FileOptions javaGenericServices + * @property {boolean|null} [pyGenericServices] FileOptions pyGenericServices + * @property {boolean|null} [phpGenericServices] FileOptions phpGenericServices + * @property {boolean|null} [deprecated] FileOptions deprecated + * @property {boolean|null} [ccEnableArenas] FileOptions ccEnableArenas + * @property {string|null} [objcClassPrefix] FileOptions objcClassPrefix + * @property {string|null} [csharpNamespace] FileOptions csharpNamespace + * @property {string|null} [swiftPrefix] FileOptions swiftPrefix + * @property {string|null} [phpClassPrefix] FileOptions phpClassPrefix + * @property {string|null} [phpNamespace] FileOptions phpNamespace + * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace + * @property {string|null} [rubyPackage] FileOptions rubyPackage + * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption + */ + + /** + * Constructs a new FileOptions. + * @memberof google.protobuf + * @classdesc Represents a FileOptions. + * @implements IFileOptions + * @constructor + * @param {google.protobuf.IFileOptions=} [properties] Properties to set + */ + function FileOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FileOptions javaPackage. + * @member {string} javaPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaPackage = ""; + + /** + * FileOptions javaOuterClassname. + * @member {string} javaOuterClassname + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaOuterClassname = ""; + + /** + * FileOptions javaMultipleFiles. + * @member {boolean} javaMultipleFiles + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaMultipleFiles = false; + + /** + * FileOptions javaGenerateEqualsAndHash. + * @member {boolean} javaGenerateEqualsAndHash + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaGenerateEqualsAndHash = false; + + /** + * FileOptions javaStringCheckUtf8. + * @member {boolean} javaStringCheckUtf8 + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaStringCheckUtf8 = false; + + /** + * FileOptions optimizeFor. + * @member {google.protobuf.FileOptions.OptimizeMode} optimizeFor + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.optimizeFor = 1; + + /** + * FileOptions goPackage. + * @member {string} goPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.goPackage = ""; + + /** + * FileOptions ccGenericServices. + * @member {boolean} ccGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.ccGenericServices = false; + + /** + * FileOptions javaGenericServices. + * @member {boolean} javaGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaGenericServices = false; + + /** + * FileOptions pyGenericServices. + * @member {boolean} pyGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.pyGenericServices = false; + + /** + * FileOptions phpGenericServices. + * @member {boolean} phpGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpGenericServices = false; + + /** + * FileOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.deprecated = false; + + /** + * FileOptions ccEnableArenas. + * @member {boolean} ccEnableArenas + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.ccEnableArenas = false; + + /** + * FileOptions objcClassPrefix. + * @member {string} objcClassPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.objcClassPrefix = ""; + + /** + * FileOptions csharpNamespace. + * @member {string} csharpNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.csharpNamespace = ""; + + /** + * FileOptions swiftPrefix. + * @member {string} swiftPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.swiftPrefix = ""; + + /** + * FileOptions phpClassPrefix. + * @member {string} phpClassPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpClassPrefix = ""; + + /** + * FileOptions phpNamespace. + * @member {string} phpNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpNamespace = ""; + + /** + * FileOptions phpMetadataNamespace. + * @member {string} phpMetadataNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpMetadataNamespace = ""; + + /** + * FileOptions rubyPackage. + * @member {string} rubyPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.rubyPackage = ""; + + /** + * FileOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new FileOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions=} [properties] Properties to set + * @returns {google.protobuf.FileOptions} FileOptions instance + */ + FileOptions.create = function create(properties) { + return new FileOptions(properties); + }; + + /** + * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.javaPackage); + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + writer.uint32(/* id 8, wireType 2 =*/66).string(message.javaOuterClassname); + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + writer.uint32(/* id 9, wireType 0 =*/72).int32(message.optimizeFor); + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.javaMultipleFiles); + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + writer.uint32(/* id 11, wireType 2 =*/90).string(message.goPackage); + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + writer.uint32(/* id 16, wireType 0 =*/128).bool(message.ccGenericServices); + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + writer.uint32(/* id 17, wireType 0 =*/136).bool(message.javaGenericServices); + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + writer.uint32(/* id 18, wireType 0 =*/144).bool(message.pyGenericServices); + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + writer.uint32(/* id 20, wireType 0 =*/160).bool(message.javaGenerateEqualsAndHash); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 23, wireType 0 =*/184).bool(message.deprecated); + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + writer.uint32(/* id 27, wireType 0 =*/216).bool(message.javaStringCheckUtf8); + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + writer.uint32(/* id 31, wireType 0 =*/248).bool(message.ccEnableArenas); + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + writer.uint32(/* id 36, wireType 2 =*/290).string(message.objcClassPrefix); + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + writer.uint32(/* id 37, wireType 2 =*/298).string(message.csharpNamespace); + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + writer.uint32(/* id 39, wireType 2 =*/314).string(message.swiftPrefix); + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FileOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileOptions} FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.javaPackage = reader.string(); + break; + case 8: + message.javaOuterClassname = reader.string(); + break; + case 10: + message.javaMultipleFiles = reader.bool(); + break; + case 20: + message.javaGenerateEqualsAndHash = reader.bool(); + break; + case 27: + message.javaStringCheckUtf8 = reader.bool(); + break; + case 9: + message.optimizeFor = reader.int32(); + break; + case 11: + message.goPackage = reader.string(); + break; + case 16: + message.ccGenericServices = reader.bool(); + break; + case 17: + message.javaGenericServices = reader.bool(); + break; + case 18: + message.pyGenericServices = reader.bool(); + break; + case 42: + message.phpGenericServices = reader.bool(); + break; + case 23: + message.deprecated = reader.bool(); + break; + case 31: + message.ccEnableArenas = reader.bool(); + break; + case 36: + message.objcClassPrefix = reader.string(); + break; + case 37: + message.csharpNamespace = reader.string(); + break; + case 39: + message.swiftPrefix = reader.string(); + break; + case 40: + message.phpClassPrefix = reader.string(); + break; + case 41: + message.phpNamespace = reader.string(); + break; + case 44: + message.phpMetadataNamespace = reader.string(); + break; + case 45: + message.rubyPackage = reader.string(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FileOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileOptions} FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FileOptions message. + * @function verify + * @memberof google.protobuf.FileOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + if (!$util.isString(message.javaPackage)) + return "javaPackage: string expected"; + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + if (!$util.isString(message.javaOuterClassname)) + return "javaOuterClassname: string expected"; + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + if (typeof message.javaMultipleFiles !== "boolean") + return "javaMultipleFiles: boolean expected"; + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + if (typeof message.javaGenerateEqualsAndHash !== "boolean") + return "javaGenerateEqualsAndHash: boolean expected"; + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + if (typeof message.javaStringCheckUtf8 !== "boolean") + return "javaStringCheckUtf8: boolean expected"; + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + switch (message.optimizeFor) { + default: + return "optimizeFor: enum value expected"; + case 1: + case 2: + case 3: + break; + } + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + if (!$util.isString(message.goPackage)) + return "goPackage: string expected"; + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + if (typeof message.ccGenericServices !== "boolean") + return "ccGenericServices: boolean expected"; + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + if (typeof message.javaGenericServices !== "boolean") + return "javaGenericServices: boolean expected"; + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + if (typeof message.pyGenericServices !== "boolean") + return "pyGenericServices: boolean expected"; + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + if (typeof message.phpGenericServices !== "boolean") + return "phpGenericServices: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + if (typeof message.ccEnableArenas !== "boolean") + return "ccEnableArenas: boolean expected"; + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + if (!$util.isString(message.objcClassPrefix)) + return "objcClassPrefix: string expected"; + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + if (!$util.isString(message.csharpNamespace)) + return "csharpNamespace: string expected"; + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + if (!$util.isString(message.swiftPrefix)) + return "swiftPrefix: string expected"; + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + if (!$util.isString(message.phpClassPrefix)) + return "phpClassPrefix: string expected"; + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + if (!$util.isString(message.phpNamespace)) + return "phpNamespace: string expected"; + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + if (!$util.isString(message.phpMetadataNamespace)) + return "phpMetadataNamespace: string expected"; + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + if (!$util.isString(message.rubyPackage)) + return "rubyPackage: string expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileOptions} FileOptions + */ + FileOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileOptions) + return object; + var message = new $root.google.protobuf.FileOptions(); + if (object.javaPackage != null) + message.javaPackage = String(object.javaPackage); + if (object.javaOuterClassname != null) + message.javaOuterClassname = String(object.javaOuterClassname); + if (object.javaMultipleFiles != null) + message.javaMultipleFiles = Boolean(object.javaMultipleFiles); + if (object.javaGenerateEqualsAndHash != null) + message.javaGenerateEqualsAndHash = Boolean(object.javaGenerateEqualsAndHash); + if (object.javaStringCheckUtf8 != null) + message.javaStringCheckUtf8 = Boolean(object.javaStringCheckUtf8); + switch (object.optimizeFor) { + case "SPEED": + case 1: + message.optimizeFor = 1; + break; + case "CODE_SIZE": + case 2: + message.optimizeFor = 2; + break; + case "LITE_RUNTIME": + case 3: + message.optimizeFor = 3; + break; + } + if (object.goPackage != null) + message.goPackage = String(object.goPackage); + if (object.ccGenericServices != null) + message.ccGenericServices = Boolean(object.ccGenericServices); + if (object.javaGenericServices != null) + message.javaGenericServices = Boolean(object.javaGenericServices); + if (object.pyGenericServices != null) + message.pyGenericServices = Boolean(object.pyGenericServices); + if (object.phpGenericServices != null) + message.phpGenericServices = Boolean(object.phpGenericServices); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.ccEnableArenas != null) + message.ccEnableArenas = Boolean(object.ccEnableArenas); + if (object.objcClassPrefix != null) + message.objcClassPrefix = String(object.objcClassPrefix); + if (object.csharpNamespace != null) + message.csharpNamespace = String(object.csharpNamespace); + if (object.swiftPrefix != null) + message.swiftPrefix = String(object.swiftPrefix); + if (object.phpClassPrefix != null) + message.phpClassPrefix = String(object.phpClassPrefix); + if (object.phpNamespace != null) + message.phpNamespace = String(object.phpNamespace); + if (object.phpMetadataNamespace != null) + message.phpMetadataNamespace = String(object.phpMetadataNamespace); + if (object.rubyPackage != null) + message.rubyPackage = String(object.rubyPackage); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a FileOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.FileOptions} message FileOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.javaPackage = ""; + object.javaOuterClassname = ""; + object.optimizeFor = options.enums === String ? "SPEED" : 1; + object.javaMultipleFiles = false; + object.goPackage = ""; + object.ccGenericServices = false; + object.javaGenericServices = false; + object.pyGenericServices = false; + object.javaGenerateEqualsAndHash = false; + object.deprecated = false; + object.javaStringCheckUtf8 = false; + object.ccEnableArenas = false; + object.objcClassPrefix = ""; + object.csharpNamespace = ""; + object.swiftPrefix = ""; + object.phpClassPrefix = ""; + object.phpNamespace = ""; + object.phpGenericServices = false; + object.phpMetadataNamespace = ""; + object.rubyPackage = ""; + } + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + object.javaPackage = message.javaPackage; + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + object.javaOuterClassname = message.javaOuterClassname; + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + object.optimizeFor = options.enums === String ? $root.google.protobuf.FileOptions.OptimizeMode[message.optimizeFor] : message.optimizeFor; + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + object.javaMultipleFiles = message.javaMultipleFiles; + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + object.goPackage = message.goPackage; + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + object.ccGenericServices = message.ccGenericServices; + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + object.javaGenericServices = message.javaGenericServices; + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + object.pyGenericServices = message.pyGenericServices; + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + object.javaGenerateEqualsAndHash = message.javaGenerateEqualsAndHash; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + object.javaStringCheckUtf8 = message.javaStringCheckUtf8; + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + object.ccEnableArenas = message.ccEnableArenas; + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + object.objcClassPrefix = message.objcClassPrefix; + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + object.csharpNamespace = message.csharpNamespace; + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + object.swiftPrefix = message.swiftPrefix; + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + object.phpClassPrefix = message.phpClassPrefix; + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + object.phpNamespace = message.phpNamespace; + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + object.phpGenericServices = message.phpGenericServices; + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + object.phpMetadataNamespace = message.phpMetadataNamespace; + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + object.rubyPackage = message.rubyPackage; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; + + /** + * Converts this FileOptions to JSON. + * @function toJSON + * @memberof google.protobuf.FileOptions + * @instance + * @returns {Object.} JSON object + */ + FileOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * OptimizeMode enum. + * @name google.protobuf.FileOptions.OptimizeMode + * @enum {string} + * @property {number} SPEED=1 SPEED value + * @property {number} CODE_SIZE=2 CODE_SIZE value + * @property {number} LITE_RUNTIME=3 LITE_RUNTIME value + */ + FileOptions.OptimizeMode = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "SPEED"] = 1; + values[valuesById[2] = "CODE_SIZE"] = 2; + values[valuesById[3] = "LITE_RUNTIME"] = 3; + return values; + })(); + + return FileOptions; + })(); + + protobuf.MessageOptions = (function() { + + /** + * Properties of a MessageOptions. + * @memberof google.protobuf + * @interface IMessageOptions + * @property {boolean|null} [messageSetWireFormat] MessageOptions messageSetWireFormat + * @property {boolean|null} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor + * @property {boolean|null} [deprecated] MessageOptions deprecated + * @property {boolean|null} [mapEntry] MessageOptions mapEntry + * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption + */ + + /** + * Constructs a new MessageOptions. + * @memberof google.protobuf + * @classdesc Represents a MessageOptions. + * @implements IMessageOptions + * @constructor + * @param {google.protobuf.IMessageOptions=} [properties] Properties to set + */ + function MessageOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * MessageOptions messageSetWireFormat. + * @member {boolean} messageSetWireFormat + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.messageSetWireFormat = false; + + /** + * MessageOptions noStandardDescriptorAccessor. + * @member {boolean} noStandardDescriptorAccessor + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.noStandardDescriptorAccessor = false; + + /** + * MessageOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.deprecated = false; + + /** + * MessageOptions mapEntry. + * @member {boolean} mapEntry + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.mapEntry = false; + + /** + * MessageOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new MessageOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions=} [properties] Properties to set + * @returns {google.protobuf.MessageOptions} MessageOptions instance + */ + MessageOptions.create = function create(properties) { + return new MessageOptions(properties); + }; + + /** + * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.messageSetWireFormat); + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.noStandardDescriptorAccessor); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a MessageOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.MessageOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.MessageOptions} MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MessageOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.messageSetWireFormat = reader.bool(); + break; + case 2: + message.noStandardDescriptorAccessor = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 7: + message.mapEntry = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a MessageOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.MessageOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.MessageOptions} MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a MessageOptions message. + * @function verify + * @memberof google.protobuf.MessageOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MessageOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + if (typeof message.messageSetWireFormat !== "boolean") + return "messageSetWireFormat: boolean expected"; + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + if (typeof message.noStandardDescriptorAccessor !== "boolean") + return "noStandardDescriptorAccessor: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + if (typeof message.mapEntry !== "boolean") + return "mapEntry: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.MessageOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.MessageOptions} MessageOptions + */ + MessageOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MessageOptions) + return object; + var message = new $root.google.protobuf.MessageOptions(); + if (object.messageSetWireFormat != null) + message.messageSetWireFormat = Boolean(object.messageSetWireFormat); + if (object.noStandardDescriptorAccessor != null) + message.noStandardDescriptorAccessor = Boolean(object.noStandardDescriptorAccessor); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.mapEntry != null) + message.mapEntry = Boolean(object.mapEntry); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.MessageOptions} message MessageOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MessageOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.messageSetWireFormat = false; + object.noStandardDescriptorAccessor = false; + object.deprecated = false; + object.mapEntry = false; + } + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + object.messageSetWireFormat = message.messageSetWireFormat; + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + object.noStandardDescriptorAccessor = message.noStandardDescriptorAccessor; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + object.mapEntry = message.mapEntry; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; + + /** + * Converts this MessageOptions to JSON. + * @function toJSON + * @memberof google.protobuf.MessageOptions + * @instance + * @returns {Object.} JSON object + */ + MessageOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return MessageOptions; + })(); + + protobuf.FieldOptions = (function() { + + /** + * Properties of a FieldOptions. + * @memberof google.protobuf + * @interface IFieldOptions + * @property {google.protobuf.FieldOptions.CType|null} [ctype] FieldOptions ctype + * @property {boolean|null} [packed] FieldOptions packed + * @property {google.protobuf.FieldOptions.JSType|null} [jstype] FieldOptions jstype + * @property {boolean|null} [lazy] FieldOptions lazy + * @property {boolean|null} [deprecated] FieldOptions deprecated + * @property {boolean|null} [weak] FieldOptions weak + * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption + */ + + /** + * Constructs a new FieldOptions. + * @memberof google.protobuf + * @classdesc Represents a FieldOptions. + * @implements IFieldOptions + * @constructor + * @param {google.protobuf.IFieldOptions=} [properties] Properties to set + */ + function FieldOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FieldOptions ctype. + * @member {google.protobuf.FieldOptions.CType} ctype + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.ctype = 0; + + /** + * FieldOptions packed. + * @member {boolean} packed + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.packed = false; + + /** + * FieldOptions jstype. + * @member {google.protobuf.FieldOptions.JSType} jstype + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.jstype = 0; + + /** + * FieldOptions lazy. + * @member {boolean} lazy + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.lazy = false; + + /** + * FieldOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.deprecated = false; + + /** + * FieldOptions weak. + * @member {boolean} weak + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.weak = false; + + /** + * FieldOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new FieldOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions=} [properties] Properties to set + * @returns {google.protobuf.FieldOptions} FieldOptions instance + */ + FieldOptions.create = function create(properties) { + return new FieldOptions(properties); + }; + + /** + * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ctype != null && message.hasOwnProperty("ctype")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.ctype); + if (message.packed != null && message.hasOwnProperty("packed")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.packed); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.lazy != null && message.hasOwnProperty("lazy")) + writer.uint32(/* id 5, wireType 0 =*/40).bool(message.lazy); + if (message.jstype != null && message.hasOwnProperty("jstype")) + writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jstype); + if (message.weak != null && message.hasOwnProperty("weak")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FieldOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldOptions} FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ctype = reader.int32(); + break; + case 2: + message.packed = reader.bool(); + break; + case 6: + message.jstype = reader.int32(); + break; + case 5: + message.lazy = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 10: + message.weak = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FieldOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldOptions} FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FieldOptions message. + * @function verify + * @memberof google.protobuf.FieldOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ctype != null && message.hasOwnProperty("ctype")) + switch (message.ctype) { + default: + return "ctype: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.packed != null && message.hasOwnProperty("packed")) + if (typeof message.packed !== "boolean") + return "packed: boolean expected"; + if (message.jstype != null && message.hasOwnProperty("jstype")) + switch (message.jstype) { + default: + return "jstype: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.lazy != null && message.hasOwnProperty("lazy")) + if (typeof message.lazy !== "boolean") + return "lazy: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.weak != null && message.hasOwnProperty("weak")) + if (typeof message.weak !== "boolean") + return "weak: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldOptions} FieldOptions + */ + FieldOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldOptions) + return object; + var message = new $root.google.protobuf.FieldOptions(); + switch (object.ctype) { + case "STRING": + case 0: + message.ctype = 0; + break; + case "CORD": + case 1: + message.ctype = 1; + break; + case "STRING_PIECE": + case 2: + message.ctype = 2; + break; + } + if (object.packed != null) + message.packed = Boolean(object.packed); + switch (object.jstype) { + case "JS_NORMAL": + case 0: + message.jstype = 0; + break; + case "JS_STRING": + case 1: + message.jstype = 1; + break; + case "JS_NUMBER": + case 2: + message.jstype = 2; + break; + } + if (object.lazy != null) + message.lazy = Boolean(object.lazy); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.weak != null) + message.weak = Boolean(object.weak); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.FieldOptions} message FieldOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.ctype = options.enums === String ? "STRING" : 0; + object.packed = false; + object.deprecated = false; + object.lazy = false; + object.jstype = options.enums === String ? "JS_NORMAL" : 0; + object.weak = false; + } + if (message.ctype != null && message.hasOwnProperty("ctype")) + object.ctype = options.enums === String ? $root.google.protobuf.FieldOptions.CType[message.ctype] : message.ctype; + if (message.packed != null && message.hasOwnProperty("packed")) + object.packed = message.packed; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.lazy != null && message.hasOwnProperty("lazy")) + object.lazy = message.lazy; + if (message.jstype != null && message.hasOwnProperty("jstype")) + object.jstype = options.enums === String ? $root.google.protobuf.FieldOptions.JSType[message.jstype] : message.jstype; + if (message.weak != null && message.hasOwnProperty("weak")) + object.weak = message.weak; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; + + /** + * Converts this FieldOptions to JSON. + * @function toJSON + * @memberof google.protobuf.FieldOptions + * @instance + * @returns {Object.} JSON object + */ + FieldOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * CType enum. + * @name google.protobuf.FieldOptions.CType + * @enum {string} + * @property {number} STRING=0 STRING value + * @property {number} CORD=1 CORD value + * @property {number} STRING_PIECE=2 STRING_PIECE value + */ + FieldOptions.CType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STRING"] = 0; + values[valuesById[1] = "CORD"] = 1; + values[valuesById[2] = "STRING_PIECE"] = 2; + return values; + })(); + + /** + * JSType enum. + * @name google.protobuf.FieldOptions.JSType + * @enum {string} + * @property {number} JS_NORMAL=0 JS_NORMAL value + * @property {number} JS_STRING=1 JS_STRING value + * @property {number} JS_NUMBER=2 JS_NUMBER value + */ + FieldOptions.JSType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "JS_NORMAL"] = 0; + values[valuesById[1] = "JS_STRING"] = 1; + values[valuesById[2] = "JS_NUMBER"] = 2; + return values; + })(); + + return FieldOptions; + })(); + + protobuf.OneofOptions = (function() { + + /** + * Properties of an OneofOptions. + * @memberof google.protobuf + * @interface IOneofOptions + * @property {Array.|null} [uninterpretedOption] OneofOptions uninterpretedOption + */ + + /** + * Constructs a new OneofOptions. + * @memberof google.protobuf + * @classdesc Represents an OneofOptions. + * @implements IOneofOptions + * @constructor + * @param {google.protobuf.IOneofOptions=} [properties] Properties to set + */ + function OneofOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * OneofOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.OneofOptions + * @instance + */ + OneofOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new OneofOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions=} [properties] Properties to set + * @returns {google.protobuf.OneofOptions} OneofOptions instance + */ + OneofOptions.create = function create(properties) { + return new OneofOptions(properties); + }; + + /** + * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an OneofOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.OneofOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.OneofOptions} OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an OneofOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.OneofOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.OneofOptions} OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an OneofOptions message. + * @function verify + * @memberof google.protobuf.OneofOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OneofOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.OneofOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.OneofOptions} OneofOptions + */ + OneofOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.OneofOptions) + return object; + var message = new $root.google.protobuf.OneofOptions(); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.OneofOptions} message OneofOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OneofOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; + + /** + * Converts this OneofOptions to JSON. + * @function toJSON + * @memberof google.protobuf.OneofOptions + * @instance + * @returns {Object.} JSON object + */ + OneofOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return OneofOptions; + })(); + + protobuf.EnumOptions = (function() { + + /** + * Properties of an EnumOptions. + * @memberof google.protobuf + * @interface IEnumOptions + * @property {boolean|null} [allowAlias] EnumOptions allowAlias + * @property {boolean|null} [deprecated] EnumOptions deprecated + * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption + */ + + /** + * Constructs a new EnumOptions. + * @memberof google.protobuf + * @classdesc Represents an EnumOptions. + * @implements IEnumOptions + * @constructor + * @param {google.protobuf.IEnumOptions=} [properties] Properties to set + */ + function EnumOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EnumOptions allowAlias. + * @member {boolean} allowAlias + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.allowAlias = false; + + /** + * EnumOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.deprecated = false; + + /** + * EnumOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new EnumOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions=} [properties] Properties to set + * @returns {google.protobuf.EnumOptions} EnumOptions instance + */ + EnumOptions.create = function create(properties) { + return new EnumOptions(properties); + }; + + /** + * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EnumOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumOptions} EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 2: + message.allowAlias = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an EnumOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumOptions} EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EnumOptions message. + * @function verify + * @memberof google.protobuf.EnumOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + if (typeof message.allowAlias !== "boolean") + return "allowAlias: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumOptions} EnumOptions + */ + EnumOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumOptions) + return object; + var message = new $root.google.protobuf.EnumOptions(); + if (object.allowAlias != null) + message.allowAlias = Boolean(object.allowAlias); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.EnumOptions} message EnumOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.allowAlias = false; + object.deprecated = false; + } + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + object.allowAlias = message.allowAlias; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; + + /** + * Converts this EnumOptions to JSON. + * @function toJSON + * @memberof google.protobuf.EnumOptions + * @instance + * @returns {Object.} JSON object + */ + EnumOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return EnumOptions; + })(); + + protobuf.EnumValueOptions = (function() { + + /** + * Properties of an EnumValueOptions. + * @memberof google.protobuf + * @interface IEnumValueOptions + * @property {boolean|null} [deprecated] EnumValueOptions deprecated + * @property {Array.|null} [uninterpretedOption] EnumValueOptions uninterpretedOption + */ + + /** + * Constructs a new EnumValueOptions. + * @memberof google.protobuf + * @classdesc Represents an EnumValueOptions. + * @implements IEnumValueOptions + * @constructor + * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set + */ + function EnumValueOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EnumValueOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.deprecated = false; + + /** + * EnumValueOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new EnumValueOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions instance + */ + EnumValueOptions.create = function create(properties) { + return new EnumValueOptions(properties); + }; + + /** + * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EnumValueOptions message. + * @function verify + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumValueOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + */ + EnumValueOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumValueOptions) + return object; + var message = new $root.google.protobuf.EnumValueOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.EnumValueOptions} message EnumValueOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumValueOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) + object.deprecated = false; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; + + /** + * Converts this EnumValueOptions to JSON. + * @function toJSON + * @memberof google.protobuf.EnumValueOptions + * @instance + * @returns {Object.} JSON object + */ + EnumValueOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return EnumValueOptions; + })(); + + protobuf.ServiceOptions = (function() { + + /** + * Properties of a ServiceOptions. + * @memberof google.protobuf + * @interface IServiceOptions + * @property {boolean|null} [deprecated] ServiceOptions deprecated + * @property {Array.|null} [uninterpretedOption] ServiceOptions uninterpretedOption + * @property {string|null} [".google.api.defaultHost"] ServiceOptions .google.api.defaultHost + * @property {string|null} [".google.api.oauthScopes"] ServiceOptions .google.api.oauthScopes + */ + + /** + * Constructs a new ServiceOptions. + * @memberof google.protobuf + * @classdesc Represents a ServiceOptions. + * @implements IServiceOptions + * @constructor + * @param {google.protobuf.IServiceOptions=} [properties] Properties to set + */ + function ServiceOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ServiceOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype.deprecated = false; + + /** + * ServiceOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * ServiceOptions .google.api.defaultHost. + * @member {string} .google.api.defaultHost + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype[".google.api.defaultHost"] = ""; + + /** + * ServiceOptions .google.api.oauthScopes. + * @member {string} .google.api.oauthScopes + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype[".google.api.oauthScopes"] = ""; + + /** + * Creates a new ServiceOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions=} [properties] Properties to set + * @returns {google.protobuf.ServiceOptions} ServiceOptions instance + */ + ServiceOptions.create = function create(properties) { + return new ServiceOptions(properties); + }; + + /** + * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + writer.uint32(/* id 1049, wireType 2 =*/8394).string(message[".google.api.defaultHost"]); + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + writer.uint32(/* id 1050, wireType 2 =*/8402).string(message[".google.api.oauthScopes"]); + return writer; + }; + + /** + * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ServiceOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ServiceOptions} ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 33: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1049: + message[".google.api.defaultHost"] = reader.string(); + break; + case 1050: + message[".google.api.oauthScopes"] = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ServiceOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ServiceOptions} ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ServiceOptions message. + * @function verify + * @memberof google.protobuf.ServiceOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ServiceOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + if (!$util.isString(message[".google.api.defaultHost"])) + return ".google.api.defaultHost: string expected"; + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + if (!$util.isString(message[".google.api.oauthScopes"])) + return ".google.api.oauthScopes: string expected"; + return null; + }; + + /** + * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ServiceOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ServiceOptions} ServiceOptions + */ + ServiceOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ServiceOptions) + return object; + var message = new $root.google.protobuf.ServiceOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + if (object[".google.api.defaultHost"] != null) + message[".google.api.defaultHost"] = String(object[".google.api.defaultHost"]); + if (object[".google.api.oauthScopes"] != null) + message[".google.api.oauthScopes"] = String(object[".google.api.oauthScopes"]); + return message; + }; + + /** + * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.ServiceOptions} message ServiceOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ServiceOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.deprecated = false; + object[".google.api.defaultHost"] = ""; + object[".google.api.oauthScopes"] = ""; + } + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + object[".google.api.defaultHost"] = message[".google.api.defaultHost"]; + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + object[".google.api.oauthScopes"] = message[".google.api.oauthScopes"]; + return object; + }; + + /** + * Converts this ServiceOptions to JSON. + * @function toJSON + * @memberof google.protobuf.ServiceOptions + * @instance + * @returns {Object.} JSON object + */ + ServiceOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ServiceOptions; + })(); + + protobuf.MethodOptions = (function() { + + /** + * Properties of a MethodOptions. + * @memberof google.protobuf + * @interface IMethodOptions + * @property {boolean|null} [deprecated] MethodOptions deprecated + * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel + * @property {Array.|null} [uninterpretedOption] MethodOptions uninterpretedOption + * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http + * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature + */ + + /** + * Constructs a new MethodOptions. + * @memberof google.protobuf + * @classdesc Represents a MethodOptions. + * @implements IMethodOptions + * @constructor + * @param {google.protobuf.IMethodOptions=} [properties] Properties to set + */ + function MethodOptions(properties) { + this.uninterpretedOption = []; + this[".google.api.methodSignature"] = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * MethodOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype.deprecated = false; + + /** + * MethodOptions idempotencyLevel. + * @member {google.protobuf.MethodOptions.IdempotencyLevel} idempotencyLevel + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype.idempotencyLevel = 0; + + /** + * MethodOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * MethodOptions .google.api.http. + * @member {google.api.IHttpRule|null|undefined} .google.api.http + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype[".google.api.http"] = null; + + /** + * MethodOptions .google.api.methodSignature. + * @member {Array.} .google.api.methodSignature + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; + + /** + * Creates a new MethodOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.MethodOptions + * @static + * @param {google.protobuf.IMethodOptions=} [properties] Properties to set + * @returns {google.protobuf.MethodOptions} MethodOptions instance + */ + MethodOptions.create = function create(properties) { + return new MethodOptions(properties); + }; + + /** + * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.MethodOptions + * @static + * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + writer.uint32(/* id 34, wireType 0 =*/272).int32(message.idempotencyLevel); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.methodSignature"] != null && message[".google.api.methodSignature"].length) + for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) + writer.uint32(/* id 1051, wireType 2 =*/8410).string(message[".google.api.methodSignature"][i]); + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) + $root.google.api.HttpRule.encode(message[".google.api.http"], writer.uint32(/* id 72295728, wireType 2 =*/578365826).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.MethodOptions + * @static + * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a MethodOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.MethodOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.MethodOptions} MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 33: + message.deprecated = reader.bool(); + break; + case 34: + message.idempotencyLevel = reader.int32(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 72295728: + message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); + break; + case 1051: + if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) + message[".google.api.methodSignature"] = []; + message[".google.api.methodSignature"].push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a MethodOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.MethodOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.MethodOptions} MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a MethodOptions message. + * @function verify + * @memberof google.protobuf.MethodOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MethodOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + switch (message.idempotencyLevel) { + default: + return "idempotencyLevel: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { + var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); + if (error) + return ".google.api.http." + error; + } + if (message[".google.api.methodSignature"] != null && message.hasOwnProperty(".google.api.methodSignature")) { + if (!Array.isArray(message[".google.api.methodSignature"])) + return ".google.api.methodSignature: array expected"; + for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) + if (!$util.isString(message[".google.api.methodSignature"][i])) + return ".google.api.methodSignature: string[] expected"; + } + return null; + }; + + /** + * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.MethodOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.MethodOptions} MethodOptions + */ + MethodOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MethodOptions) + return object; + var message = new $root.google.protobuf.MethodOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + switch (object.idempotencyLevel) { + case "IDEMPOTENCY_UNKNOWN": + case 0: + message.idempotencyLevel = 0; + break; + case "NO_SIDE_EFFECTS": + case 1: + message.idempotencyLevel = 1; + break; + case "IDEMPOTENT": + case 2: + message.idempotencyLevel = 2; + break; + } + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + if (object[".google.api.http"] != null) { + if (typeof object[".google.api.http"] !== "object") + throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); + message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); + } + if (object[".google.api.methodSignature"]) { + if (!Array.isArray(object[".google.api.methodSignature"])) + throw TypeError(".google.protobuf.MethodOptions..google.api.methodSignature: array expected"); + message[".google.api.methodSignature"] = []; + for (var i = 0; i < object[".google.api.methodSignature"].length; ++i) + message[".google.api.methodSignature"][i] = String(object[".google.api.methodSignature"][i]); + } + return message; + }; + + /** + * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.MethodOptions + * @static + * @param {google.protobuf.MethodOptions} message MethodOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MethodOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.uninterpretedOption = []; + object[".google.api.methodSignature"] = []; + } + if (options.defaults) { + object.deprecated = false; + object.idempotencyLevel = options.enums === String ? "IDEMPOTENCY_UNKNOWN" : 0; + object[".google.api.http"] = null; + } + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + object.idempotencyLevel = options.enums === String ? $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] : message.idempotencyLevel; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length) { + object[".google.api.methodSignature"] = []; + for (var j = 0; j < message[".google.api.methodSignature"].length; ++j) + object[".google.api.methodSignature"][j] = message[".google.api.methodSignature"][j]; + } + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) + object[".google.api.http"] = $root.google.api.HttpRule.toObject(message[".google.api.http"], options); + return object; + }; + + /** + * Converts this MethodOptions to JSON. + * @function toJSON + * @memberof google.protobuf.MethodOptions + * @instance + * @returns {Object.} JSON object + */ + MethodOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * IdempotencyLevel enum. + * @name google.protobuf.MethodOptions.IdempotencyLevel + * @enum {string} + * @property {number} IDEMPOTENCY_UNKNOWN=0 IDEMPOTENCY_UNKNOWN value + * @property {number} NO_SIDE_EFFECTS=1 NO_SIDE_EFFECTS value + * @property {number} IDEMPOTENT=2 IDEMPOTENT value + */ + MethodOptions.IdempotencyLevel = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "IDEMPOTENCY_UNKNOWN"] = 0; + values[valuesById[1] = "NO_SIDE_EFFECTS"] = 1; + values[valuesById[2] = "IDEMPOTENT"] = 2; + return values; + })(); + + return MethodOptions; + })(); + + protobuf.UninterpretedOption = (function() { + + /** + * Properties of an UninterpretedOption. + * @memberof google.protobuf + * @interface IUninterpretedOption + * @property {Array.|null} [name] UninterpretedOption name + * @property {string|null} [identifierValue] UninterpretedOption identifierValue + * @property {number|Long|null} [positiveIntValue] UninterpretedOption positiveIntValue + * @property {number|Long|null} [negativeIntValue] UninterpretedOption negativeIntValue + * @property {number|null} [doubleValue] UninterpretedOption doubleValue + * @property {Uint8Array|null} [stringValue] UninterpretedOption stringValue + * @property {string|null} [aggregateValue] UninterpretedOption aggregateValue + */ + + /** + * Constructs a new UninterpretedOption. + * @memberof google.protobuf + * @classdesc Represents an UninterpretedOption. + * @implements IUninterpretedOption + * @constructor + * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set + */ + function UninterpretedOption(properties) { + this.name = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * UninterpretedOption name. + * @member {Array.} name + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.name = $util.emptyArray; + + /** + * UninterpretedOption identifierValue. + * @member {string} identifierValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.identifierValue = ""; + + /** + * UninterpretedOption positiveIntValue. + * @member {number|Long} positiveIntValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.positiveIntValue = $util.Long ? $util.Long.fromBits(0,0,true) : 0; + + /** + * UninterpretedOption negativeIntValue. + * @member {number|Long} negativeIntValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.negativeIntValue = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * UninterpretedOption doubleValue. + * @member {number} doubleValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.doubleValue = 0; + + /** + * UninterpretedOption stringValue. + * @member {Uint8Array} stringValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.stringValue = $util.newBuffer([]); + + /** + * UninterpretedOption aggregateValue. + * @member {string} aggregateValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.aggregateValue = ""; + + /** + * Creates a new UninterpretedOption instance using the specified properties. + * @function create + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption instance + */ + UninterpretedOption.create = function create(properties) { + return new UninterpretedOption(properties); + }; + + /** + * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @function encode + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UninterpretedOption.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.name.length) + for (var i = 0; i < message.name.length; ++i) + $root.google.protobuf.UninterpretedOption.NamePart.encode(message.name[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.identifierValue); + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + writer.uint32(/* id 4, wireType 0 =*/32).uint64(message.positiveIntValue); + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + writer.uint32(/* id 5, wireType 0 =*/40).int64(message.negativeIntValue); + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + writer.uint32(/* id 6, wireType 1 =*/49).double(message.doubleValue); + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + writer.uint32(/* id 7, wireType 2 =*/58).bytes(message.stringValue); + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + writer.uint32(/* id 8, wireType 2 =*/66).string(message.aggregateValue); + return writer; + }; + + /** + * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UninterpretedOption.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UninterpretedOption.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 2: + if (!(message.name && message.name.length)) + message.name = []; + message.name.push($root.google.protobuf.UninterpretedOption.NamePart.decode(reader, reader.uint32())); + break; + case 3: + message.identifierValue = reader.string(); + break; + case 4: + message.positiveIntValue = reader.uint64(); + break; + case 5: + message.negativeIntValue = reader.int64(); + break; + case 6: + message.doubleValue = reader.double(); + break; + case 7: + message.stringValue = reader.bytes(); + break; + case 8: + message.aggregateValue = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UninterpretedOption.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an UninterpretedOption message. + * @function verify + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + UninterpretedOption.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) { + if (!Array.isArray(message.name)) + return "name: array expected"; + for (var i = 0; i < message.name.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.NamePart.verify(message.name[i]); + if (error) + return "name." + error; + } + } + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + if (!$util.isString(message.identifierValue)) + return "identifierValue: string expected"; + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + if (!$util.isInteger(message.positiveIntValue) && !(message.positiveIntValue && $util.isInteger(message.positiveIntValue.low) && $util.isInteger(message.positiveIntValue.high))) + return "positiveIntValue: integer|Long expected"; + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + if (!$util.isInteger(message.negativeIntValue) && !(message.negativeIntValue && $util.isInteger(message.negativeIntValue.low) && $util.isInteger(message.negativeIntValue.high))) + return "negativeIntValue: integer|Long expected"; + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + if (typeof message.doubleValue !== "number") + return "doubleValue: number expected"; + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + if (!(message.stringValue && typeof message.stringValue.length === "number" || $util.isString(message.stringValue))) + return "stringValue: buffer expected"; + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + if (!$util.isString(message.aggregateValue)) + return "aggregateValue: string expected"; + return null; + }; + + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption + */ + UninterpretedOption.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.UninterpretedOption) + return object; + var message = new $root.google.protobuf.UninterpretedOption(); + if (object.name) { + if (!Array.isArray(object.name)) + throw TypeError(".google.protobuf.UninterpretedOption.name: array expected"); + message.name = []; + for (var i = 0; i < object.name.length; ++i) { + if (typeof object.name[i] !== "object") + throw TypeError(".google.protobuf.UninterpretedOption.name: object expected"); + message.name[i] = $root.google.protobuf.UninterpretedOption.NamePart.fromObject(object.name[i]); + } + } + if (object.identifierValue != null) + message.identifierValue = String(object.identifierValue); + if (object.positiveIntValue != null) + if ($util.Long) + (message.positiveIntValue = $util.Long.fromValue(object.positiveIntValue)).unsigned = true; + else if (typeof object.positiveIntValue === "string") + message.positiveIntValue = parseInt(object.positiveIntValue, 10); + else if (typeof object.positiveIntValue === "number") + message.positiveIntValue = object.positiveIntValue; + else if (typeof object.positiveIntValue === "object") + message.positiveIntValue = new $util.LongBits(object.positiveIntValue.low >>> 0, object.positiveIntValue.high >>> 0).toNumber(true); + if (object.negativeIntValue != null) + if ($util.Long) + (message.negativeIntValue = $util.Long.fromValue(object.negativeIntValue)).unsigned = false; + else if (typeof object.negativeIntValue === "string") + message.negativeIntValue = parseInt(object.negativeIntValue, 10); + else if (typeof object.negativeIntValue === "number") + message.negativeIntValue = object.negativeIntValue; + else if (typeof object.negativeIntValue === "object") + message.negativeIntValue = new $util.LongBits(object.negativeIntValue.low >>> 0, object.negativeIntValue.high >>> 0).toNumber(); + if (object.doubleValue != null) + message.doubleValue = Number(object.doubleValue); + if (object.stringValue != null) + if (typeof object.stringValue === "string") + $util.base64.decode(object.stringValue, message.stringValue = $util.newBuffer($util.base64.length(object.stringValue)), 0); + else if (object.stringValue.length) + message.stringValue = object.stringValue; + if (object.aggregateValue != null) + message.aggregateValue = String(object.aggregateValue); + return message; + }; + + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.UninterpretedOption} message UninterpretedOption + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UninterpretedOption.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.name = []; + if (options.defaults) { + object.identifierValue = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, true); + object.positiveIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.positiveIntValue = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.negativeIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.negativeIntValue = options.longs === String ? "0" : 0; + object.doubleValue = 0; + if (options.bytes === String) + object.stringValue = ""; + else { + object.stringValue = []; + if (options.bytes !== Array) + object.stringValue = $util.newBuffer(object.stringValue); + } + object.aggregateValue = ""; + } + if (message.name && message.name.length) { + object.name = []; + for (var j = 0; j < message.name.length; ++j) + object.name[j] = $root.google.protobuf.UninterpretedOption.NamePart.toObject(message.name[j], options); + } + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + object.identifierValue = message.identifierValue; + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + if (typeof message.positiveIntValue === "number") + object.positiveIntValue = options.longs === String ? String(message.positiveIntValue) : message.positiveIntValue; + else + object.positiveIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.positiveIntValue) : options.longs === Number ? new $util.LongBits(message.positiveIntValue.low >>> 0, message.positiveIntValue.high >>> 0).toNumber(true) : message.positiveIntValue; + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + if (typeof message.negativeIntValue === "number") + object.negativeIntValue = options.longs === String ? String(message.negativeIntValue) : message.negativeIntValue; + else + object.negativeIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.negativeIntValue) : options.longs === Number ? new $util.LongBits(message.negativeIntValue.low >>> 0, message.negativeIntValue.high >>> 0).toNumber() : message.negativeIntValue; + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + object.doubleValue = options.json && !isFinite(message.doubleValue) ? String(message.doubleValue) : message.doubleValue; + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + object.stringValue = options.bytes === String ? $util.base64.encode(message.stringValue, 0, message.stringValue.length) : options.bytes === Array ? Array.prototype.slice.call(message.stringValue) : message.stringValue; + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + object.aggregateValue = message.aggregateValue; + return object; + }; + + /** + * Converts this UninterpretedOption to JSON. + * @function toJSON + * @memberof google.protobuf.UninterpretedOption + * @instance + * @returns {Object.} JSON object + */ + UninterpretedOption.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + UninterpretedOption.NamePart = (function() { + + /** + * Properties of a NamePart. + * @memberof google.protobuf.UninterpretedOption + * @interface INamePart + * @property {string} namePart NamePart namePart + * @property {boolean} isExtension NamePart isExtension + */ + + /** + * Constructs a new NamePart. + * @memberof google.protobuf.UninterpretedOption + * @classdesc Represents a NamePart. + * @implements INamePart + * @constructor + * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set + */ + function NamePart(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * NamePart namePart. + * @member {string} namePart + * @memberof google.protobuf.UninterpretedOption.NamePart + * @instance + */ + NamePart.prototype.namePart = ""; + + /** + * NamePart isExtension. + * @member {boolean} isExtension + * @memberof google.protobuf.UninterpretedOption.NamePart + * @instance + */ + NamePart.prototype.isExtension = false; + + /** + * Creates a new NamePart instance using the specified properties. + * @function create + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart instance + */ + NamePart.create = function create(properties) { + return new NamePart(properties); + }; + + /** + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @function encode + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NamePart.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + writer.uint32(/* id 1, wireType 2 =*/10).string(message.namePart); + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.isExtension); + return writer; + }; + + /** + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NamePart.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a NamePart message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NamePart.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption.NamePart(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.namePart = reader.string(); + break; + case 2: + message.isExtension = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + if (!message.hasOwnProperty("namePart")) + throw $util.ProtocolError("missing required 'namePart'", { instance: message }); + if (!message.hasOwnProperty("isExtension")) + throw $util.ProtocolError("missing required 'isExtension'", { instance: message }); + return message; + }; + + /** + * Decodes a NamePart message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NamePart.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a NamePart message. + * @function verify + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + NamePart.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (!$util.isString(message.namePart)) + return "namePart: string expected"; + if (typeof message.isExtension !== "boolean") + return "isExtension: boolean expected"; + return null; + }; + + /** + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + */ + NamePart.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.UninterpretedOption.NamePart) + return object; + var message = new $root.google.protobuf.UninterpretedOption.NamePart(); + if (object.namePart != null) + message.namePart = String(object.namePart); + if (object.isExtension != null) + message.isExtension = Boolean(object.isExtension); + return message; + }; + + /** + * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {google.protobuf.UninterpretedOption.NamePart} message NamePart + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + NamePart.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.namePart = ""; + object.isExtension = false; + } + if (message.namePart != null && message.hasOwnProperty("namePart")) + object.namePart = message.namePart; + if (message.isExtension != null && message.hasOwnProperty("isExtension")) + object.isExtension = message.isExtension; + return object; + }; + + /** + * Converts this NamePart to JSON. + * @function toJSON + * @memberof google.protobuf.UninterpretedOption.NamePart + * @instance + * @returns {Object.} JSON object + */ + NamePart.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return NamePart; + })(); + + return UninterpretedOption; + })(); + + protobuf.SourceCodeInfo = (function() { + + /** + * Properties of a SourceCodeInfo. + * @memberof google.protobuf + * @interface ISourceCodeInfo + * @property {Array.|null} [location] SourceCodeInfo location + */ + + /** + * Constructs a new SourceCodeInfo. + * @memberof google.protobuf + * @classdesc Represents a SourceCodeInfo. + * @implements ISourceCodeInfo + * @constructor + * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set + */ + function SourceCodeInfo(properties) { + this.location = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * SourceCodeInfo location. + * @member {Array.} location + * @memberof google.protobuf.SourceCodeInfo + * @instance + */ + SourceCodeInfo.prototype.location = $util.emptyArray; + + /** + * Creates a new SourceCodeInfo instance using the specified properties. + * @function create + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo instance + */ + SourceCodeInfo.create = function create(properties) { + return new SourceCodeInfo(properties); + }; + + /** + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @function encode + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SourceCodeInfo.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.location != null && message.location.length) + for (var i = 0; i < message.location.length; ++i) + $root.google.protobuf.SourceCodeInfo.Location.encode(message.location[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SourceCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SourceCodeInfo.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.location && message.location.length)) + message.location = []; + message.location.push($root.google.protobuf.SourceCodeInfo.Location.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SourceCodeInfo.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SourceCodeInfo message. + * @function verify + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SourceCodeInfo.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.location != null && message.hasOwnProperty("location")) { + if (!Array.isArray(message.location)) + return "location: array expected"; + for (var i = 0; i < message.location.length; ++i) { + var error = $root.google.protobuf.SourceCodeInfo.Location.verify(message.location[i]); + if (error) + return "location." + error; + } + } + return null; + }; + + /** + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo + */ + SourceCodeInfo.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.SourceCodeInfo) + return object; + var message = new $root.google.protobuf.SourceCodeInfo(); + if (object.location) { + if (!Array.isArray(object.location)) + throw TypeError(".google.protobuf.SourceCodeInfo.location: array expected"); + message.location = []; + for (var i = 0; i < object.location.length; ++i) { + if (typeof object.location[i] !== "object") + throw TypeError(".google.protobuf.SourceCodeInfo.location: object expected"); + message.location[i] = $root.google.protobuf.SourceCodeInfo.Location.fromObject(object.location[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {google.protobuf.SourceCodeInfo} message SourceCodeInfo + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SourceCodeInfo.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.location = []; + if (message.location && message.location.length) { + object.location = []; + for (var j = 0; j < message.location.length; ++j) + object.location[j] = $root.google.protobuf.SourceCodeInfo.Location.toObject(message.location[j], options); + } + return object; + }; + + /** + * Converts this SourceCodeInfo to JSON. + * @function toJSON + * @memberof google.protobuf.SourceCodeInfo + * @instance + * @returns {Object.} JSON object + */ + SourceCodeInfo.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + SourceCodeInfo.Location = (function() { + + /** + * Properties of a Location. + * @memberof google.protobuf.SourceCodeInfo + * @interface ILocation + * @property {Array.|null} [path] Location path + * @property {Array.|null} [span] Location span + * @property {string|null} [leadingComments] Location leadingComments + * @property {string|null} [trailingComments] Location trailingComments + * @property {Array.|null} [leadingDetachedComments] Location leadingDetachedComments + */ + + /** + * Constructs a new Location. + * @memberof google.protobuf.SourceCodeInfo + * @classdesc Represents a Location. + * @implements ILocation + * @constructor + * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set + */ + function Location(properties) { + this.path = []; + this.span = []; + this.leadingDetachedComments = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Location path. + * @member {Array.} path + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.path = $util.emptyArray; + + /** + * Location span. + * @member {Array.} span + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.span = $util.emptyArray; + + /** + * Location leadingComments. + * @member {string} leadingComments + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.leadingComments = ""; + + /** + * Location trailingComments. + * @member {string} trailingComments + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.trailingComments = ""; + + /** + * Location leadingDetachedComments. + * @member {Array.} leadingDetachedComments + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.leadingDetachedComments = $util.emptyArray; + + /** + * Creates a new Location instance using the specified properties. + * @function create + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set + * @returns {google.protobuf.SourceCodeInfo.Location} Location instance + */ + Location.create = function create(properties) { + return new Location(properties); + }; + + /** + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @function encode + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Location.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.path != null && message.path.length) { + writer.uint32(/* id 1, wireType 2 =*/10).fork(); + for (var i = 0; i < message.path.length; ++i) + writer.int32(message.path[i]); + writer.ldelim(); + } + if (message.span != null && message.span.length) { + writer.uint32(/* id 2, wireType 2 =*/18).fork(); + for (var i = 0; i < message.span.length; ++i) + writer.int32(message.span[i]); + writer.ldelim(); + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.leadingComments); + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.trailingComments); + if (message.leadingDetachedComments != null && message.leadingDetachedComments.length) + for (var i = 0; i < message.leadingDetachedComments.length; ++i) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.leadingDetachedComments[i]); + return writer; + }; + + /** + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Location.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Location message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.SourceCodeInfo.Location} Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Location.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo.Location(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.path && message.path.length)) + message.path = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.path.push(reader.int32()); + } else + message.path.push(reader.int32()); + break; + case 2: + if (!(message.span && message.span.length)) + message.span = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.span.push(reader.int32()); + } else + message.span.push(reader.int32()); + break; + case 3: + message.leadingComments = reader.string(); + break; + case 4: + message.trailingComments = reader.string(); + break; + case 6: + if (!(message.leadingDetachedComments && message.leadingDetachedComments.length)) + message.leadingDetachedComments = []; + message.leadingDetachedComments.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Location message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.SourceCodeInfo.Location} Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Location.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Location message. + * @function verify + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Location.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.path != null && message.hasOwnProperty("path")) { + if (!Array.isArray(message.path)) + return "path: array expected"; + for (var i = 0; i < message.path.length; ++i) + if (!$util.isInteger(message.path[i])) + return "path: integer[] expected"; + } + if (message.span != null && message.hasOwnProperty("span")) { + if (!Array.isArray(message.span)) + return "span: array expected"; + for (var i = 0; i < message.span.length; ++i) + if (!$util.isInteger(message.span[i])) + return "span: integer[] expected"; + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + if (!$util.isString(message.leadingComments)) + return "leadingComments: string expected"; + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + if (!$util.isString(message.trailingComments)) + return "trailingComments: string expected"; + if (message.leadingDetachedComments != null && message.hasOwnProperty("leadingDetachedComments")) { + if (!Array.isArray(message.leadingDetachedComments)) + return "leadingDetachedComments: array expected"; + for (var i = 0; i < message.leadingDetachedComments.length; ++i) + if (!$util.isString(message.leadingDetachedComments[i])) + return "leadingDetachedComments: string[] expected"; + } + return null; + }; + + /** + * Creates a Location message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.SourceCodeInfo.Location} Location + */ + Location.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.SourceCodeInfo.Location) + return object; + var message = new $root.google.protobuf.SourceCodeInfo.Location(); + if (object.path) { + if (!Array.isArray(object.path)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.path: array expected"); + message.path = []; + for (var i = 0; i < object.path.length; ++i) + message.path[i] = object.path[i] | 0; + } + if (object.span) { + if (!Array.isArray(object.span)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.span: array expected"); + message.span = []; + for (var i = 0; i < object.span.length; ++i) + message.span[i] = object.span[i] | 0; + } + if (object.leadingComments != null) + message.leadingComments = String(object.leadingComments); + if (object.trailingComments != null) + message.trailingComments = String(object.trailingComments); + if (object.leadingDetachedComments) { + if (!Array.isArray(object.leadingDetachedComments)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.leadingDetachedComments: array expected"); + message.leadingDetachedComments = []; + for (var i = 0; i < object.leadingDetachedComments.length; ++i) + message.leadingDetachedComments[i] = String(object.leadingDetachedComments[i]); + } + return message; + }; + + /** + * Creates a plain object from a Location message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {google.protobuf.SourceCodeInfo.Location} message Location + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Location.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.path = []; + object.span = []; + object.leadingDetachedComments = []; + } + if (options.defaults) { + object.leadingComments = ""; + object.trailingComments = ""; + } + if (message.path && message.path.length) { + object.path = []; + for (var j = 0; j < message.path.length; ++j) + object.path[j] = message.path[j]; + } + if (message.span && message.span.length) { + object.span = []; + for (var j = 0; j < message.span.length; ++j) + object.span[j] = message.span[j]; + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + object.leadingComments = message.leadingComments; + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + object.trailingComments = message.trailingComments; + if (message.leadingDetachedComments && message.leadingDetachedComments.length) { + object.leadingDetachedComments = []; + for (var j = 0; j < message.leadingDetachedComments.length; ++j) + object.leadingDetachedComments[j] = message.leadingDetachedComments[j]; + } + return object; + }; + + /** + * Converts this Location to JSON. + * @function toJSON + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + * @returns {Object.} JSON object + */ + Location.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Location; + })(); + + return SourceCodeInfo; + })(); + + protobuf.GeneratedCodeInfo = (function() { + + /** + * Properties of a GeneratedCodeInfo. + * @memberof google.protobuf + * @interface IGeneratedCodeInfo + * @property {Array.|null} [annotation] GeneratedCodeInfo annotation + */ + + /** + * Constructs a new GeneratedCodeInfo. + * @memberof google.protobuf + * @classdesc Represents a GeneratedCodeInfo. + * @implements IGeneratedCodeInfo + * @constructor + * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set + */ + function GeneratedCodeInfo(properties) { + this.annotation = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GeneratedCodeInfo annotation. + * @member {Array.} annotation + * @memberof google.protobuf.GeneratedCodeInfo + * @instance + */ + GeneratedCodeInfo.prototype.annotation = $util.emptyArray; + + /** + * Creates a new GeneratedCodeInfo instance using the specified properties. + * @function create + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo instance + */ + GeneratedCodeInfo.create = function create(properties) { + return new GeneratedCodeInfo(properties); + }; + + /** + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @function encode + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GeneratedCodeInfo.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.annotation != null && message.annotation.length) + for (var i = 0; i < message.annotation.length; ++i) + $root.google.protobuf.GeneratedCodeInfo.Annotation.encode(message.annotation[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GeneratedCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GeneratedCodeInfo.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.annotation && message.annotation.length)) + message.annotation = []; + message.annotation.push($root.google.protobuf.GeneratedCodeInfo.Annotation.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GeneratedCodeInfo.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GeneratedCodeInfo message. + * @function verify + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GeneratedCodeInfo.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.annotation != null && message.hasOwnProperty("annotation")) { + if (!Array.isArray(message.annotation)) + return "annotation: array expected"; + for (var i = 0; i < message.annotation.length; ++i) { + var error = $root.google.protobuf.GeneratedCodeInfo.Annotation.verify(message.annotation[i]); + if (error) + return "annotation." + error; + } + } + return null; + }; + + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo + */ + GeneratedCodeInfo.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.GeneratedCodeInfo) + return object; + var message = new $root.google.protobuf.GeneratedCodeInfo(); + if (object.annotation) { + if (!Array.isArray(object.annotation)) + throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: array expected"); + message.annotation = []; + for (var i = 0; i < object.annotation.length; ++i) { + if (typeof object.annotation[i] !== "object") + throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: object expected"); + message.annotation[i] = $root.google.protobuf.GeneratedCodeInfo.Annotation.fromObject(object.annotation[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.GeneratedCodeInfo} message GeneratedCodeInfo + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GeneratedCodeInfo.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.annotation = []; + if (message.annotation && message.annotation.length) { + object.annotation = []; + for (var j = 0; j < message.annotation.length; ++j) + object.annotation[j] = $root.google.protobuf.GeneratedCodeInfo.Annotation.toObject(message.annotation[j], options); + } + return object; + }; + + /** + * Converts this GeneratedCodeInfo to JSON. + * @function toJSON + * @memberof google.protobuf.GeneratedCodeInfo + * @instance + * @returns {Object.} JSON object + */ + GeneratedCodeInfo.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + GeneratedCodeInfo.Annotation = (function() { + + /** + * Properties of an Annotation. + * @memberof google.protobuf.GeneratedCodeInfo + * @interface IAnnotation + * @property {Array.|null} [path] Annotation path + * @property {string|null} [sourceFile] Annotation sourceFile + * @property {number|null} [begin] Annotation begin + * @property {number|null} [end] Annotation end + */ + + /** + * Constructs a new Annotation. + * @memberof google.protobuf.GeneratedCodeInfo + * @classdesc Represents an Annotation. + * @implements IAnnotation + * @constructor + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set + */ + function Annotation(properties) { + this.path = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Annotation path. + * @member {Array.} path + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.path = $util.emptyArray; + + /** + * Annotation sourceFile. + * @member {string} sourceFile + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.sourceFile = ""; + + /** + * Annotation begin. + * @member {number} begin + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.begin = 0; + + /** + * Annotation end. + * @member {number} end + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.end = 0; + + /** + * Creates a new Annotation instance using the specified properties. + * @function create + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation instance + */ + Annotation.create = function create(properties) { + return new Annotation(properties); + }; + + /** + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @function encode + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Annotation.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.path != null && message.path.length) { + writer.uint32(/* id 1, wireType 2 =*/10).fork(); + for (var i = 0; i < message.path.length; ++i) + writer.int32(message.path[i]); + writer.ldelim(); + } + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.sourceFile); + if (message.begin != null && message.hasOwnProperty("begin")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.begin); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.end); + return writer; + }; + + /** + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Annotation.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an Annotation message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Annotation.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.path && message.path.length)) + message.path = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.path.push(reader.int32()); + } else + message.path.push(reader.int32()); + break; + case 2: + message.sourceFile = reader.string(); + break; + case 3: + message.begin = reader.int32(); + break; + case 4: + message.end = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an Annotation message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Annotation.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an Annotation message. + * @function verify + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Annotation.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.path != null && message.hasOwnProperty("path")) { + if (!Array.isArray(message.path)) + return "path: array expected"; + for (var i = 0; i < message.path.length; ++i) + if (!$util.isInteger(message.path[i])) + return "path: integer[] expected"; + } + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + if (!$util.isString(message.sourceFile)) + return "sourceFile: string expected"; + if (message.begin != null && message.hasOwnProperty("begin")) + if (!$util.isInteger(message.begin)) + return "begin: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; + return null; + }; + + /** + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation + */ + Annotation.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.GeneratedCodeInfo.Annotation) + return object; + var message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); + if (object.path) { + if (!Array.isArray(object.path)) + throw TypeError(".google.protobuf.GeneratedCodeInfo.Annotation.path: array expected"); + message.path = []; + for (var i = 0; i < object.path.length; ++i) + message.path[i] = object.path[i] | 0; + } + if (object.sourceFile != null) + message.sourceFile = String(object.sourceFile); + if (object.begin != null) + message.begin = object.begin | 0; + if (object.end != null) + message.end = object.end | 0; + return message; + }; + + /** + * Creates a plain object from an Annotation message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {google.protobuf.GeneratedCodeInfo.Annotation} message Annotation + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Annotation.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.path = []; + if (options.defaults) { + object.sourceFile = ""; + object.begin = 0; + object.end = 0; + } + if (message.path && message.path.length) { + object.path = []; + for (var j = 0; j < message.path.length; ++j) + object.path[j] = message.path[j]; + } + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + object.sourceFile = message.sourceFile; + if (message.begin != null && message.hasOwnProperty("begin")) + object.begin = message.begin; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; + return object; + }; + + /** + * Converts this Annotation to JSON. + * @function toJSON + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + * @returns {Object.} JSON object + */ + Annotation.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Annotation; + })(); + + return GeneratedCodeInfo; + })(); + + protobuf.Duration = (function() { + + /** + * Properties of a Duration. + * @memberof google.protobuf + * @interface IDuration + * @property {number|Long|null} [seconds] Duration seconds + * @property {number|null} [nanos] Duration nanos + */ + + /** + * Constructs a new Duration. + * @memberof google.protobuf + * @classdesc Represents a Duration. + * @implements IDuration + * @constructor + * @param {google.protobuf.IDuration=} [properties] Properties to set + */ + function Duration(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Duration seconds. + * @member {number|Long} seconds + * @memberof google.protobuf.Duration + * @instance + */ + Duration.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * Duration nanos. + * @member {number} nanos + * @memberof google.protobuf.Duration + * @instance + */ + Duration.prototype.nanos = 0; + + /** + * Creates a new Duration instance using the specified properties. + * @function create + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.IDuration=} [properties] Properties to set + * @returns {google.protobuf.Duration} Duration instance + */ + Duration.create = function create(properties) { + return new Duration(properties); + }; + + /** + * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @function encode + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.IDuration} message Duration message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Duration.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.seconds != null && message.hasOwnProperty("seconds")) + writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); + if (message.nanos != null && message.hasOwnProperty("nanos")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); + return writer; + }; + + /** + * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.IDuration} message Duration message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Duration.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Duration message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.Duration + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.Duration} Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Duration.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Duration(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.seconds = reader.int64(); + break; + case 2: + message.nanos = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Duration message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.Duration + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.Duration} Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Duration.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Duration message. + * @function verify + * @memberof google.protobuf.Duration + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Duration.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) + return "seconds: integer|Long expected"; + if (message.nanos != null && message.hasOwnProperty("nanos")) + if (!$util.isInteger(message.nanos)) + return "nanos: integer expected"; + return null; + }; + + /** + * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.Duration + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.Duration} Duration + */ + Duration.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Duration) + return object; + var message = new $root.google.protobuf.Duration(); + if (object.seconds != null) + if ($util.Long) + (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; + else if (typeof object.seconds === "string") + message.seconds = parseInt(object.seconds, 10); + else if (typeof object.seconds === "number") + message.seconds = object.seconds; + else if (typeof object.seconds === "object") + message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); + if (object.nanos != null) + message.nanos = object.nanos | 0; + return message; + }; + + /** + * Creates a plain object from a Duration message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.Duration} message Duration + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Duration.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.seconds = options.longs === String ? "0" : 0; + object.nanos = 0; + } + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (typeof message.seconds === "number") + object.seconds = options.longs === String ? String(message.seconds) : message.seconds; + else + object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; + if (message.nanos != null && message.hasOwnProperty("nanos")) + object.nanos = message.nanos; + return object; + }; + + /** + * Converts this Duration to JSON. + * @function toJSON + * @memberof google.protobuf.Duration + * @instance + * @returns {Object.} JSON object + */ + Duration.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Duration; + })(); + + protobuf.Empty = (function() { + + /** + * Properties of an Empty. + * @memberof google.protobuf + * @interface IEmpty + */ + + /** + * Constructs a new Empty. + * @memberof google.protobuf + * @classdesc Represents an Empty. + * @implements IEmpty + * @constructor + * @param {google.protobuf.IEmpty=} [properties] Properties to set + */ + function Empty(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new Empty instance using the specified properties. + * @function create + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.IEmpty=} [properties] Properties to set + * @returns {google.protobuf.Empty} Empty instance + */ + Empty.create = function create(properties) { + return new Empty(properties); + }; + + /** + * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @function encode + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.IEmpty} message Empty message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Empty.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.IEmpty} message Empty message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Empty.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an Empty message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.Empty + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.Empty} Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Empty.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Empty(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an Empty message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.Empty + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.Empty} Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Empty.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an Empty message. + * @function verify + * @memberof google.protobuf.Empty + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Empty.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates an Empty message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.Empty + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.Empty} Empty + */ + Empty.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Empty) + return object; + return new $root.google.protobuf.Empty(); + }; + + /** + * Creates a plain object from an Empty message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.Empty} message Empty + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Empty.toObject = function toObject() { + return {}; + }; + + /** + * Converts this Empty to JSON. + * @function toJSON + * @memberof google.protobuf.Empty + * @instance + * @returns {Object.} JSON object + */ + Empty.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Empty; + })(); + + protobuf.FieldMask = (function() { + + /** + * Properties of a FieldMask. + * @memberof google.protobuf + * @interface IFieldMask + * @property {Array.|null} [paths] FieldMask paths + */ + + /** + * Constructs a new FieldMask. + * @memberof google.protobuf + * @classdesc Represents a FieldMask. + * @implements IFieldMask + * @constructor + * @param {google.protobuf.IFieldMask=} [properties] Properties to set + */ + function FieldMask(properties) { + this.paths = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FieldMask paths. + * @member {Array.} paths + * @memberof google.protobuf.FieldMask + * @instance + */ + FieldMask.prototype.paths = $util.emptyArray; + + /** + * Creates a new FieldMask instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask=} [properties] Properties to set + * @returns {google.protobuf.FieldMask} FieldMask instance + */ + FieldMask.create = function create(properties) { + return new FieldMask(properties); + }; + + /** + * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldMask.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.paths != null && message.paths.length) + for (var i = 0; i < message.paths.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.paths[i]); + return writer; + }; + + /** + * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldMask.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FieldMask message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldMask + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldMask} FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldMask.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldMask(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.paths && message.paths.length)) + message.paths = []; + message.paths.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FieldMask message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldMask + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldMask} FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldMask.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FieldMask message. + * @function verify + * @memberof google.protobuf.FieldMask + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldMask.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.paths != null && message.hasOwnProperty("paths")) { + if (!Array.isArray(message.paths)) + return "paths: array expected"; + for (var i = 0; i < message.paths.length; ++i) + if (!$util.isString(message.paths[i])) + return "paths: string[] expected"; + } + return null; + }; + + /** + * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldMask + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldMask} FieldMask + */ + FieldMask.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldMask) + return object; + var message = new $root.google.protobuf.FieldMask(); + if (object.paths) { + if (!Array.isArray(object.paths)) + throw TypeError(".google.protobuf.FieldMask.paths: array expected"); + message.paths = []; + for (var i = 0; i < object.paths.length; ++i) + message.paths[i] = String(object.paths[i]); + } + return message; + }; + + /** + * Creates a plain object from a FieldMask message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.FieldMask} message FieldMask + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldMask.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.paths = []; + if (message.paths && message.paths.length) { + object.paths = []; + for (var j = 0; j < message.paths.length; ++j) + object.paths[j] = message.paths[j]; + } + return object; + }; + + /** + * Converts this FieldMask to JSON. + * @function toJSON + * @memberof google.protobuf.FieldMask + * @instance + * @returns {Object.} JSON object + */ + FieldMask.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return FieldMask; + })(); + + protobuf.Timestamp = (function() { + + /** + * Properties of a Timestamp. + * @memberof google.protobuf + * @interface ITimestamp + * @property {number|Long|null} [seconds] Timestamp seconds + * @property {number|null} [nanos] Timestamp nanos + */ + + /** + * Constructs a new Timestamp. + * @memberof google.protobuf + * @classdesc Represents a Timestamp. + * @implements ITimestamp + * @constructor + * @param {google.protobuf.ITimestamp=} [properties] Properties to set + */ + function Timestamp(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Timestamp seconds. + * @member {number|Long} seconds + * @memberof google.protobuf.Timestamp + * @instance + */ + Timestamp.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * Timestamp nanos. + * @member {number} nanos + * @memberof google.protobuf.Timestamp + * @instance + */ + Timestamp.prototype.nanos = 0; + + /** + * Creates a new Timestamp instance using the specified properties. + * @function create + * @memberof google.protobuf.Timestamp + * @static + * @param {google.protobuf.ITimestamp=} [properties] Properties to set + * @returns {google.protobuf.Timestamp} Timestamp instance + */ + Timestamp.create = function create(properties) { + return new Timestamp(properties); + }; + + /** + * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @function encode + * @memberof google.protobuf.Timestamp + * @static + * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Timestamp.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.seconds != null && message.hasOwnProperty("seconds")) + writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); + if (message.nanos != null && message.hasOwnProperty("nanos")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); + return writer; + }; + + /** + * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.Timestamp + * @static + * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Timestamp.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Timestamp message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.Timestamp + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.Timestamp} Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Timestamp.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Timestamp(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.seconds = reader.int64(); + break; + case 2: + message.nanos = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Timestamp message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.Timestamp + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.Timestamp} Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Timestamp.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Timestamp message. + * @function verify + * @memberof google.protobuf.Timestamp + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Timestamp.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) + return "seconds: integer|Long expected"; + if (message.nanos != null && message.hasOwnProperty("nanos")) + if (!$util.isInteger(message.nanos)) + return "nanos: integer expected"; + return null; + }; + + /** + * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.Timestamp + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.Timestamp} Timestamp + */ + Timestamp.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Timestamp) + return object; + var message = new $root.google.protobuf.Timestamp(); + if (object.seconds != null) + if ($util.Long) + (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; + else if (typeof object.seconds === "string") + message.seconds = parseInt(object.seconds, 10); + else if (typeof object.seconds === "number") + message.seconds = object.seconds; + else if (typeof object.seconds === "object") + message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); + if (object.nanos != null) + message.nanos = object.nanos | 0; + return message; + }; + + /** + * Creates a plain object from a Timestamp message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.Timestamp + * @static + * @param {google.protobuf.Timestamp} message Timestamp + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Timestamp.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.seconds = options.longs === String ? "0" : 0; + object.nanos = 0; + } + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (typeof message.seconds === "number") + object.seconds = options.longs === String ? String(message.seconds) : message.seconds; + else + object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; + if (message.nanos != null && message.hasOwnProperty("nanos")) + object.nanos = message.nanos; + return object; + }; + + /** + * Converts this Timestamp to JSON. + * @function toJSON + * @memberof google.protobuf.Timestamp + * @instance + * @returns {Object.} JSON object + */ + Timestamp.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Timestamp; + })(); + + return protobuf; + })(); + + google.iam = (function() { + + /** + * Namespace iam. + * @memberof google + * @namespace + */ + var iam = {}; + + iam.v1 = (function() { + + /** + * Namespace v1. + * @memberof google.iam + * @namespace + */ + var v1 = {}; + + v1.IAMPolicy = (function() { + + /** + * Constructs a new IAMPolicy service. + * @memberof google.iam.v1 + * @classdesc Represents a IAMPolicy + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function IAMPolicy(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } + + (IAMPolicy.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = IAMPolicy; + + /** + * Creates new IAMPolicy service using the specified rpc implementation. + * @function create + * @memberof google.iam.v1.IAMPolicy + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {IAMPolicy} RPC service. Useful where requests and/or responses are streamed. + */ + IAMPolicy.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. + * @memberof google.iam.v1.IAMPolicy + * @typedef SetIamPolicyCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.iam.v1.Policy} [response] Policy + */ + + /** + * Calls SetIamPolicy. + * @function setIamPolicy + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.ISetIamPolicyRequest} request SetIamPolicyRequest message or plain object + * @param {google.iam.v1.IAMPolicy.SetIamPolicyCallback} callback Node-style callback called with the error, if any, and Policy + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(IAMPolicy.prototype.setIamPolicy = function setIamPolicy(request, callback) { + return this.rpcCall(setIamPolicy, $root.google.iam.v1.SetIamPolicyRequest, $root.google.iam.v1.Policy, request, callback); + }, "name", { value: "SetIamPolicy" }); + + /** + * Calls SetIamPolicy. + * @function setIamPolicy + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.ISetIamPolicyRequest} request SetIamPolicyRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. + * @memberof google.iam.v1.IAMPolicy + * @typedef GetIamPolicyCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.iam.v1.Policy} [response] Policy + */ + + /** + * Calls GetIamPolicy. + * @function getIamPolicy + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.IGetIamPolicyRequest} request GetIamPolicyRequest message or plain object + * @param {google.iam.v1.IAMPolicy.GetIamPolicyCallback} callback Node-style callback called with the error, if any, and Policy + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(IAMPolicy.prototype.getIamPolicy = function getIamPolicy(request, callback) { + return this.rpcCall(getIamPolicy, $root.google.iam.v1.GetIamPolicyRequest, $root.google.iam.v1.Policy, request, callback); + }, "name", { value: "GetIamPolicy" }); + + /** + * Calls GetIamPolicy. + * @function getIamPolicy + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.IGetIamPolicyRequest} request GetIamPolicyRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. + * @memberof google.iam.v1.IAMPolicy + * @typedef TestIamPermissionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.iam.v1.TestIamPermissionsResponse} [response] TestIamPermissionsResponse + */ + + /** + * Calls TestIamPermissions. + * @function testIamPermissions + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.ITestIamPermissionsRequest} request TestIamPermissionsRequest message or plain object + * @param {google.iam.v1.IAMPolicy.TestIamPermissionsCallback} callback Node-style callback called with the error, if any, and TestIamPermissionsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(IAMPolicy.prototype.testIamPermissions = function testIamPermissions(request, callback) { + return this.rpcCall(testIamPermissions, $root.google.iam.v1.TestIamPermissionsRequest, $root.google.iam.v1.TestIamPermissionsResponse, request, callback); + }, "name", { value: "TestIamPermissions" }); + + /** + * Calls TestIamPermissions. + * @function testIamPermissions + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.ITestIamPermissionsRequest} request TestIamPermissionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return IAMPolicy; + })(); + + v1.SetIamPolicyRequest = (function() { + + /** + * Properties of a SetIamPolicyRequest. + * @memberof google.iam.v1 + * @interface ISetIamPolicyRequest + * @property {string|null} [resource] SetIamPolicyRequest resource + * @property {google.iam.v1.IPolicy|null} [policy] SetIamPolicyRequest policy + */ + + /** + * Constructs a new SetIamPolicyRequest. + * @memberof google.iam.v1 + * @classdesc Represents a SetIamPolicyRequest. + * @implements ISetIamPolicyRequest + * @constructor + * @param {google.iam.v1.ISetIamPolicyRequest=} [properties] Properties to set + */ + function SetIamPolicyRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * SetIamPolicyRequest resource. + * @member {string} resource + * @memberof google.iam.v1.SetIamPolicyRequest + * @instance + */ + SetIamPolicyRequest.prototype.resource = ""; + + /** + * SetIamPolicyRequest policy. + * @member {google.iam.v1.IPolicy|null|undefined} policy + * @memberof google.iam.v1.SetIamPolicyRequest + * @instance + */ + SetIamPolicyRequest.prototype.policy = null; + + /** + * Creates a new SetIamPolicyRequest instance using the specified properties. + * @function create + * @memberof google.iam.v1.SetIamPolicyRequest + * @static + * @param {google.iam.v1.ISetIamPolicyRequest=} [properties] Properties to set + * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest instance + */ + SetIamPolicyRequest.create = function create(properties) { + return new SetIamPolicyRequest(properties); + }; + + /** + * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.SetIamPolicyRequest + * @static + * @param {google.iam.v1.ISetIamPolicyRequest} message SetIamPolicyRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SetIamPolicyRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.resource != null && message.hasOwnProperty("resource")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); + if (message.policy != null && message.hasOwnProperty("policy")) + $root.google.iam.v1.Policy.encode(message.policy, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.SetIamPolicyRequest + * @static + * @param {google.iam.v1.ISetIamPolicyRequest} message SetIamPolicyRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SetIamPolicyRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SetIamPolicyRequest message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.SetIamPolicyRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SetIamPolicyRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.SetIamPolicyRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.resource = reader.string(); + break; + case 2: + message.policy = $root.google.iam.v1.Policy.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.SetIamPolicyRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SetIamPolicyRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SetIamPolicyRequest message. + * @function verify + * @memberof google.iam.v1.SetIamPolicyRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SetIamPolicyRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.resource != null && message.hasOwnProperty("resource")) + if (!$util.isString(message.resource)) + return "resource: string expected"; + if (message.policy != null && message.hasOwnProperty("policy")) { + var error = $root.google.iam.v1.Policy.verify(message.policy); + if (error) + return "policy." + error; + } + return null; + }; + + /** + * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.SetIamPolicyRequest + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + */ + SetIamPolicyRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.SetIamPolicyRequest) + return object; + var message = new $root.google.iam.v1.SetIamPolicyRequest(); + if (object.resource != null) + message.resource = String(object.resource); + if (object.policy != null) { + if (typeof object.policy !== "object") + throw TypeError(".google.iam.v1.SetIamPolicyRequest.policy: object expected"); + message.policy = $root.google.iam.v1.Policy.fromObject(object.policy); + } + return message; + }; + + /** + * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.SetIamPolicyRequest + * @static + * @param {google.iam.v1.SetIamPolicyRequest} message SetIamPolicyRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SetIamPolicyRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.resource = ""; + object.policy = null; + } + if (message.resource != null && message.hasOwnProperty("resource")) + object.resource = message.resource; + if (message.policy != null && message.hasOwnProperty("policy")) + object.policy = $root.google.iam.v1.Policy.toObject(message.policy, options); + return object; + }; + + /** + * Converts this SetIamPolicyRequest to JSON. + * @function toJSON + * @memberof google.iam.v1.SetIamPolicyRequest + * @instance + * @returns {Object.} JSON object + */ + SetIamPolicyRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return SetIamPolicyRequest; + })(); + + v1.GetIamPolicyRequest = (function() { + + /** + * Properties of a GetIamPolicyRequest. + * @memberof google.iam.v1 + * @interface IGetIamPolicyRequest + * @property {string|null} [resource] GetIamPolicyRequest resource + * @property {google.iam.v1.IGetPolicyOptions|null} [options] GetIamPolicyRequest options + */ + + /** + * Constructs a new GetIamPolicyRequest. + * @memberof google.iam.v1 + * @classdesc Represents a GetIamPolicyRequest. + * @implements IGetIamPolicyRequest + * @constructor + * @param {google.iam.v1.IGetIamPolicyRequest=} [properties] Properties to set + */ + function GetIamPolicyRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetIamPolicyRequest resource. + * @member {string} resource + * @memberof google.iam.v1.GetIamPolicyRequest + * @instance + */ + GetIamPolicyRequest.prototype.resource = ""; + + /** + * GetIamPolicyRequest options. + * @member {google.iam.v1.IGetPolicyOptions|null|undefined} options + * @memberof google.iam.v1.GetIamPolicyRequest + * @instance + */ + GetIamPolicyRequest.prototype.options = null; + + /** + * Creates a new GetIamPolicyRequest instance using the specified properties. + * @function create + * @memberof google.iam.v1.GetIamPolicyRequest + * @static + * @param {google.iam.v1.IGetIamPolicyRequest=} [properties] Properties to set + * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest instance + */ + GetIamPolicyRequest.create = function create(properties) { + return new GetIamPolicyRequest(properties); + }; + + /** + * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.GetIamPolicyRequest + * @static + * @param {google.iam.v1.IGetIamPolicyRequest} message GetIamPolicyRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetIamPolicyRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.resource != null && message.hasOwnProperty("resource")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.iam.v1.GetPolicyOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.GetIamPolicyRequest + * @static + * @param {google.iam.v1.IGetIamPolicyRequest} message GetIamPolicyRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetIamPolicyRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GetIamPolicyRequest message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.GetIamPolicyRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetIamPolicyRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.GetIamPolicyRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.resource = reader.string(); + break; + case 2: + message.options = $root.google.iam.v1.GetPolicyOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.GetIamPolicyRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetIamPolicyRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GetIamPolicyRequest message. + * @function verify + * @memberof google.iam.v1.GetIamPolicyRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetIamPolicyRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.resource != null && message.hasOwnProperty("resource")) + if (!$util.isString(message.resource)) + return "resource: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.iam.v1.GetPolicyOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; + + /** + * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.GetIamPolicyRequest + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + */ + GetIamPolicyRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.GetIamPolicyRequest) + return object; + var message = new $root.google.iam.v1.GetIamPolicyRequest(); + if (object.resource != null) + message.resource = String(object.resource); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.iam.v1.GetIamPolicyRequest.options: object expected"); + message.options = $root.google.iam.v1.GetPolicyOptions.fromObject(object.options); + } + return message; + }; + + /** + * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.GetIamPolicyRequest + * @static + * @param {google.iam.v1.GetIamPolicyRequest} message GetIamPolicyRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GetIamPolicyRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.resource = ""; + object.options = null; + } + if (message.resource != null && message.hasOwnProperty("resource")) + object.resource = message.resource; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.iam.v1.GetPolicyOptions.toObject(message.options, options); + return object; + }; + + /** + * Converts this GetIamPolicyRequest to JSON. + * @function toJSON + * @memberof google.iam.v1.GetIamPolicyRequest + * @instance + * @returns {Object.} JSON object + */ + GetIamPolicyRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return GetIamPolicyRequest; + })(); + + v1.TestIamPermissionsRequest = (function() { + + /** + * Properties of a TestIamPermissionsRequest. + * @memberof google.iam.v1 + * @interface ITestIamPermissionsRequest + * @property {string|null} [resource] TestIamPermissionsRequest resource + * @property {Array.|null} [permissions] TestIamPermissionsRequest permissions + */ + + /** + * Constructs a new TestIamPermissionsRequest. + * @memberof google.iam.v1 + * @classdesc Represents a TestIamPermissionsRequest. + * @implements ITestIamPermissionsRequest + * @constructor + * @param {google.iam.v1.ITestIamPermissionsRequest=} [properties] Properties to set + */ + function TestIamPermissionsRequest(properties) { + this.permissions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * TestIamPermissionsRequest resource. + * @member {string} resource + * @memberof google.iam.v1.TestIamPermissionsRequest + * @instance + */ + TestIamPermissionsRequest.prototype.resource = ""; + + /** + * TestIamPermissionsRequest permissions. + * @member {Array.} permissions + * @memberof google.iam.v1.TestIamPermissionsRequest + * @instance + */ + TestIamPermissionsRequest.prototype.permissions = $util.emptyArray; + + /** + * Creates a new TestIamPermissionsRequest instance using the specified properties. + * @function create + * @memberof google.iam.v1.TestIamPermissionsRequest + * @static + * @param {google.iam.v1.ITestIamPermissionsRequest=} [properties] Properties to set + * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest instance + */ + TestIamPermissionsRequest.create = function create(properties) { + return new TestIamPermissionsRequest(properties); + }; + + /** + * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.TestIamPermissionsRequest + * @static + * @param {google.iam.v1.ITestIamPermissionsRequest} message TestIamPermissionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TestIamPermissionsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.resource != null && message.hasOwnProperty("resource")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); + if (message.permissions != null && message.permissions.length) + for (var i = 0; i < message.permissions.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.permissions[i]); + return writer; + }; + + /** + * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.TestIamPermissionsRequest + * @static + * @param {google.iam.v1.ITestIamPermissionsRequest} message TestIamPermissionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TestIamPermissionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.TestIamPermissionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TestIamPermissionsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.TestIamPermissionsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.resource = reader.string(); + break; + case 2: + if (!(message.permissions && message.permissions.length)) + message.permissions = []; + message.permissions.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.TestIamPermissionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TestIamPermissionsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a TestIamPermissionsRequest message. + * @function verify + * @memberof google.iam.v1.TestIamPermissionsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + TestIamPermissionsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.resource != null && message.hasOwnProperty("resource")) + if (!$util.isString(message.resource)) + return "resource: string expected"; + if (message.permissions != null && message.hasOwnProperty("permissions")) { + if (!Array.isArray(message.permissions)) + return "permissions: array expected"; + for (var i = 0; i < message.permissions.length; ++i) + if (!$util.isString(message.permissions[i])) + return "permissions: string[] expected"; + } + return null; + }; + + /** + * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.TestIamPermissionsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest + */ + TestIamPermissionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.TestIamPermissionsRequest) + return object; + var message = new $root.google.iam.v1.TestIamPermissionsRequest(); + if (object.resource != null) + message.resource = String(object.resource); + if (object.permissions) { + if (!Array.isArray(object.permissions)) + throw TypeError(".google.iam.v1.TestIamPermissionsRequest.permissions: array expected"); + message.permissions = []; + for (var i = 0; i < object.permissions.length; ++i) + message.permissions[i] = String(object.permissions[i]); + } + return message; + }; + + /** + * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.TestIamPermissionsRequest + * @static + * @param {google.iam.v1.TestIamPermissionsRequest} message TestIamPermissionsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + TestIamPermissionsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.permissions = []; + if (options.defaults) + object.resource = ""; + if (message.resource != null && message.hasOwnProperty("resource")) + object.resource = message.resource; + if (message.permissions && message.permissions.length) { + object.permissions = []; + for (var j = 0; j < message.permissions.length; ++j) + object.permissions[j] = message.permissions[j]; + } + return object; + }; + + /** + * Converts this TestIamPermissionsRequest to JSON. + * @function toJSON + * @memberof google.iam.v1.TestIamPermissionsRequest + * @instance + * @returns {Object.} JSON object + */ + TestIamPermissionsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return TestIamPermissionsRequest; + })(); + + v1.TestIamPermissionsResponse = (function() { + + /** + * Properties of a TestIamPermissionsResponse. + * @memberof google.iam.v1 + * @interface ITestIamPermissionsResponse + * @property {Array.|null} [permissions] TestIamPermissionsResponse permissions + */ + + /** + * Constructs a new TestIamPermissionsResponse. + * @memberof google.iam.v1 + * @classdesc Represents a TestIamPermissionsResponse. + * @implements ITestIamPermissionsResponse + * @constructor + * @param {google.iam.v1.ITestIamPermissionsResponse=} [properties] Properties to set + */ + function TestIamPermissionsResponse(properties) { + this.permissions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * TestIamPermissionsResponse permissions. + * @member {Array.} permissions + * @memberof google.iam.v1.TestIamPermissionsResponse + * @instance + */ + TestIamPermissionsResponse.prototype.permissions = $util.emptyArray; + + /** + * Creates a new TestIamPermissionsResponse instance using the specified properties. + * @function create + * @memberof google.iam.v1.TestIamPermissionsResponse + * @static + * @param {google.iam.v1.ITestIamPermissionsResponse=} [properties] Properties to set + * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse instance + */ + TestIamPermissionsResponse.create = function create(properties) { + return new TestIamPermissionsResponse(properties); + }; + + /** + * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.TestIamPermissionsResponse + * @static + * @param {google.iam.v1.ITestIamPermissionsResponse} message TestIamPermissionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TestIamPermissionsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.permissions != null && message.permissions.length) + for (var i = 0; i < message.permissions.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.permissions[i]); + return writer; + }; + + /** + * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.TestIamPermissionsResponse + * @static + * @param {google.iam.v1.ITestIamPermissionsResponse} message TestIamPermissionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TestIamPermissionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.TestIamPermissionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TestIamPermissionsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.TestIamPermissionsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.permissions && message.permissions.length)) + message.permissions = []; + message.permissions.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.TestIamPermissionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TestIamPermissionsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a TestIamPermissionsResponse message. + * @function verify + * @memberof google.iam.v1.TestIamPermissionsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + TestIamPermissionsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.permissions != null && message.hasOwnProperty("permissions")) { + if (!Array.isArray(message.permissions)) + return "permissions: array expected"; + for (var i = 0; i < message.permissions.length; ++i) + if (!$util.isString(message.permissions[i])) + return "permissions: string[] expected"; + } + return null; + }; + + /** + * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.TestIamPermissionsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + */ + TestIamPermissionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.TestIamPermissionsResponse) + return object; + var message = new $root.google.iam.v1.TestIamPermissionsResponse(); + if (object.permissions) { + if (!Array.isArray(object.permissions)) + throw TypeError(".google.iam.v1.TestIamPermissionsResponse.permissions: array expected"); + message.permissions = []; + for (var i = 0; i < object.permissions.length; ++i) + message.permissions[i] = String(object.permissions[i]); + } + return message; + }; + + /** + * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.TestIamPermissionsResponse + * @static + * @param {google.iam.v1.TestIamPermissionsResponse} message TestIamPermissionsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + TestIamPermissionsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.permissions = []; + if (message.permissions && message.permissions.length) { + object.permissions = []; + for (var j = 0; j < message.permissions.length; ++j) + object.permissions[j] = message.permissions[j]; + } + return object; + }; + + /** + * Converts this TestIamPermissionsResponse to JSON. + * @function toJSON + * @memberof google.iam.v1.TestIamPermissionsResponse + * @instance + * @returns {Object.} JSON object + */ + TestIamPermissionsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return TestIamPermissionsResponse; + })(); + + v1.GetPolicyOptions = (function() { + + /** + * Properties of a GetPolicyOptions. + * @memberof google.iam.v1 + * @interface IGetPolicyOptions + * @property {number|null} [requestedPolicyVersion] GetPolicyOptions requestedPolicyVersion + */ + + /** + * Constructs a new GetPolicyOptions. + * @memberof google.iam.v1 + * @classdesc Represents a GetPolicyOptions. + * @implements IGetPolicyOptions + * @constructor + * @param {google.iam.v1.IGetPolicyOptions=} [properties] Properties to set + */ + function GetPolicyOptions(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetPolicyOptions requestedPolicyVersion. + * @member {number} requestedPolicyVersion + * @memberof google.iam.v1.GetPolicyOptions + * @instance + */ + GetPolicyOptions.prototype.requestedPolicyVersion = 0; + + /** + * Creates a new GetPolicyOptions instance using the specified properties. + * @function create + * @memberof google.iam.v1.GetPolicyOptions + * @static + * @param {google.iam.v1.IGetPolicyOptions=} [properties] Properties to set + * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions instance + */ + GetPolicyOptions.create = function create(properties) { + return new GetPolicyOptions(properties); + }; + + /** + * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.GetPolicyOptions + * @static + * @param {google.iam.v1.IGetPolicyOptions} message GetPolicyOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetPolicyOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.requestedPolicyVersion); + return writer; + }; + + /** + * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.GetPolicyOptions + * @static + * @param {google.iam.v1.IGetPolicyOptions} message GetPolicyOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetPolicyOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GetPolicyOptions message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.GetPolicyOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetPolicyOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.GetPolicyOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.requestedPolicyVersion = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.GetPolicyOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetPolicyOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GetPolicyOptions message. + * @function verify + * @memberof google.iam.v1.GetPolicyOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetPolicyOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) + if (!$util.isInteger(message.requestedPolicyVersion)) + return "requestedPolicyVersion: integer expected"; + return null; + }; + + /** + * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.GetPolicyOptions + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + */ + GetPolicyOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.GetPolicyOptions) + return object; + var message = new $root.google.iam.v1.GetPolicyOptions(); + if (object.requestedPolicyVersion != null) + message.requestedPolicyVersion = object.requestedPolicyVersion | 0; + return message; + }; + + /** + * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.GetPolicyOptions + * @static + * @param {google.iam.v1.GetPolicyOptions} message GetPolicyOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GetPolicyOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.requestedPolicyVersion = 0; + if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) + object.requestedPolicyVersion = message.requestedPolicyVersion; + return object; + }; + + /** + * Converts this GetPolicyOptions to JSON. + * @function toJSON + * @memberof google.iam.v1.GetPolicyOptions + * @instance + * @returns {Object.} JSON object + */ + GetPolicyOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return GetPolicyOptions; + })(); + + v1.Policy = (function() { + + /** + * Properties of a Policy. + * @memberof google.iam.v1 + * @interface IPolicy + * @property {number|null} [version] Policy version + * @property {Array.|null} [bindings] Policy bindings + * @property {Uint8Array|null} [etag] Policy etag + */ + + /** + * Constructs a new Policy. + * @memberof google.iam.v1 + * @classdesc Represents a Policy. + * @implements IPolicy + * @constructor + * @param {google.iam.v1.IPolicy=} [properties] Properties to set + */ + function Policy(properties) { + this.bindings = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Policy version. + * @member {number} version + * @memberof google.iam.v1.Policy + * @instance + */ + Policy.prototype.version = 0; + + /** + * Policy bindings. + * @member {Array.} bindings + * @memberof google.iam.v1.Policy + * @instance + */ + Policy.prototype.bindings = $util.emptyArray; + + /** + * Policy etag. + * @member {Uint8Array} etag + * @memberof google.iam.v1.Policy + * @instance + */ + Policy.prototype.etag = $util.newBuffer([]); + + /** + * Creates a new Policy instance using the specified properties. + * @function create + * @memberof google.iam.v1.Policy + * @static + * @param {google.iam.v1.IPolicy=} [properties] Properties to set + * @returns {google.iam.v1.Policy} Policy instance + */ + Policy.create = function create(properties) { + return new Policy(properties); + }; + + /** + * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.Policy + * @static + * @param {google.iam.v1.IPolicy} message Policy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Policy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.version != null && message.hasOwnProperty("version")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.version); + if (message.etag != null && message.hasOwnProperty("etag")) + writer.uint32(/* id 3, wireType 2 =*/26).bytes(message.etag); + if (message.bindings != null && message.bindings.length) + for (var i = 0; i < message.bindings.length; ++i) + $root.google.iam.v1.Binding.encode(message.bindings[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.Policy + * @static + * @param {google.iam.v1.IPolicy} message Policy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Policy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Policy message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.Policy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.Policy} Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Policy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.Policy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.version = reader.int32(); + break; + case 4: + if (!(message.bindings && message.bindings.length)) + message.bindings = []; + message.bindings.push($root.google.iam.v1.Binding.decode(reader, reader.uint32())); + break; + case 3: + message.etag = reader.bytes(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Policy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.Policy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.Policy} Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Policy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Policy message. + * @function verify + * @memberof google.iam.v1.Policy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Policy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.version != null && message.hasOwnProperty("version")) + if (!$util.isInteger(message.version)) + return "version: integer expected"; + if (message.bindings != null && message.hasOwnProperty("bindings")) { + if (!Array.isArray(message.bindings)) + return "bindings: array expected"; + for (var i = 0; i < message.bindings.length; ++i) { + var error = $root.google.iam.v1.Binding.verify(message.bindings[i]); + if (error) + return "bindings." + error; + } + } + if (message.etag != null && message.hasOwnProperty("etag")) + if (!(message.etag && typeof message.etag.length === "number" || $util.isString(message.etag))) + return "etag: buffer expected"; + return null; + }; + + /** + * Creates a Policy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.Policy + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.Policy} Policy + */ + Policy.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.Policy) + return object; + var message = new $root.google.iam.v1.Policy(); + if (object.version != null) + message.version = object.version | 0; + if (object.bindings) { + if (!Array.isArray(object.bindings)) + throw TypeError(".google.iam.v1.Policy.bindings: array expected"); + message.bindings = []; + for (var i = 0; i < object.bindings.length; ++i) { + if (typeof object.bindings[i] !== "object") + throw TypeError(".google.iam.v1.Policy.bindings: object expected"); + message.bindings[i] = $root.google.iam.v1.Binding.fromObject(object.bindings[i]); + } + } + if (object.etag != null) + if (typeof object.etag === "string") + $util.base64.decode(object.etag, message.etag = $util.newBuffer($util.base64.length(object.etag)), 0); + else if (object.etag.length) + message.etag = object.etag; + return message; + }; + + /** + * Creates a plain object from a Policy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.Policy + * @static + * @param {google.iam.v1.Policy} message Policy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Policy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.bindings = []; + if (options.defaults) { + object.version = 0; + if (options.bytes === String) + object.etag = ""; + else { + object.etag = []; + if (options.bytes !== Array) + object.etag = $util.newBuffer(object.etag); + } + } + if (message.version != null && message.hasOwnProperty("version")) + object.version = message.version; + if (message.etag != null && message.hasOwnProperty("etag")) + object.etag = options.bytes === String ? $util.base64.encode(message.etag, 0, message.etag.length) : options.bytes === Array ? Array.prototype.slice.call(message.etag) : message.etag; + if (message.bindings && message.bindings.length) { + object.bindings = []; + for (var j = 0; j < message.bindings.length; ++j) + object.bindings[j] = $root.google.iam.v1.Binding.toObject(message.bindings[j], options); + } + return object; + }; + + /** + * Converts this Policy to JSON. + * @function toJSON + * @memberof google.iam.v1.Policy + * @instance + * @returns {Object.} JSON object + */ + Policy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Policy; + })(); + + v1.Binding = (function() { + + /** + * Properties of a Binding. + * @memberof google.iam.v1 + * @interface IBinding + * @property {string|null} [role] Binding role + * @property {Array.|null} [members] Binding members + * @property {google.type.IExpr|null} [condition] Binding condition + */ + + /** + * Constructs a new Binding. + * @memberof google.iam.v1 + * @classdesc Represents a Binding. + * @implements IBinding + * @constructor + * @param {google.iam.v1.IBinding=} [properties] Properties to set + */ + function Binding(properties) { + this.members = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Binding role. + * @member {string} role + * @memberof google.iam.v1.Binding + * @instance + */ + Binding.prototype.role = ""; + + /** + * Binding members. + * @member {Array.} members + * @memberof google.iam.v1.Binding + * @instance + */ + Binding.prototype.members = $util.emptyArray; + + /** + * Binding condition. + * @member {google.type.IExpr|null|undefined} condition + * @memberof google.iam.v1.Binding + * @instance + */ + Binding.prototype.condition = null; + + /** + * Creates a new Binding instance using the specified properties. + * @function create + * @memberof google.iam.v1.Binding + * @static + * @param {google.iam.v1.IBinding=} [properties] Properties to set + * @returns {google.iam.v1.Binding} Binding instance + */ + Binding.create = function create(properties) { + return new Binding(properties); + }; + + /** + * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.Binding + * @static + * @param {google.iam.v1.IBinding} message Binding message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Binding.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.role != null && message.hasOwnProperty("role")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.role); + if (message.members != null && message.members.length) + for (var i = 0; i < message.members.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.members[i]); + if (message.condition != null && message.hasOwnProperty("condition")) + $root.google.type.Expr.encode(message.condition, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.Binding + * @static + * @param {google.iam.v1.IBinding} message Binding message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Binding.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Binding message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.Binding + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.Binding} Binding + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Binding.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.Binding(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.role = reader.string(); + break; + case 2: + if (!(message.members && message.members.length)) + message.members = []; + message.members.push(reader.string()); + break; + case 3: + message.condition = $root.google.type.Expr.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Binding message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.Binding + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.Binding} Binding + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Binding.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Binding message. + * @function verify + * @memberof google.iam.v1.Binding + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Binding.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.role != null && message.hasOwnProperty("role")) + if (!$util.isString(message.role)) + return "role: string expected"; + if (message.members != null && message.hasOwnProperty("members")) { + if (!Array.isArray(message.members)) + return "members: array expected"; + for (var i = 0; i < message.members.length; ++i) + if (!$util.isString(message.members[i])) + return "members: string[] expected"; + } + if (message.condition != null && message.hasOwnProperty("condition")) { + var error = $root.google.type.Expr.verify(message.condition); + if (error) + return "condition." + error; + } + return null; + }; + + /** + * Creates a Binding message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.Binding + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.Binding} Binding + */ + Binding.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.Binding) + return object; + var message = new $root.google.iam.v1.Binding(); + if (object.role != null) + message.role = String(object.role); + if (object.members) { + if (!Array.isArray(object.members)) + throw TypeError(".google.iam.v1.Binding.members: array expected"); + message.members = []; + for (var i = 0; i < object.members.length; ++i) + message.members[i] = String(object.members[i]); + } + if (object.condition != null) { + if (typeof object.condition !== "object") + throw TypeError(".google.iam.v1.Binding.condition: object expected"); + message.condition = $root.google.type.Expr.fromObject(object.condition); + } + return message; + }; + + /** + * Creates a plain object from a Binding message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.Binding + * @static + * @param {google.iam.v1.Binding} message Binding + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Binding.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.members = []; + if (options.defaults) { + object.role = ""; + object.condition = null; + } + if (message.role != null && message.hasOwnProperty("role")) + object.role = message.role; + if (message.members && message.members.length) { + object.members = []; + for (var j = 0; j < message.members.length; ++j) + object.members[j] = message.members[j]; + } + if (message.condition != null && message.hasOwnProperty("condition")) + object.condition = $root.google.type.Expr.toObject(message.condition, options); + return object; + }; + + /** + * Converts this Binding to JSON. + * @function toJSON + * @memberof google.iam.v1.Binding + * @instance + * @returns {Object.} JSON object + */ + Binding.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Binding; + })(); + + v1.PolicyDelta = (function() { + + /** + * Properties of a PolicyDelta. + * @memberof google.iam.v1 + * @interface IPolicyDelta + * @property {Array.|null} [bindingDeltas] PolicyDelta bindingDeltas + * @property {Array.|null} [auditConfigDeltas] PolicyDelta auditConfigDeltas + */ + + /** + * Constructs a new PolicyDelta. + * @memberof google.iam.v1 + * @classdesc Represents a PolicyDelta. + * @implements IPolicyDelta + * @constructor + * @param {google.iam.v1.IPolicyDelta=} [properties] Properties to set + */ + function PolicyDelta(properties) { + this.bindingDeltas = []; + this.auditConfigDeltas = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PolicyDelta bindingDeltas. + * @member {Array.} bindingDeltas + * @memberof google.iam.v1.PolicyDelta + * @instance + */ + PolicyDelta.prototype.bindingDeltas = $util.emptyArray; + + /** + * PolicyDelta auditConfigDeltas. + * @member {Array.} auditConfigDeltas + * @memberof google.iam.v1.PolicyDelta + * @instance + */ + PolicyDelta.prototype.auditConfigDeltas = $util.emptyArray; + + /** + * Creates a new PolicyDelta instance using the specified properties. + * @function create + * @memberof google.iam.v1.PolicyDelta + * @static + * @param {google.iam.v1.IPolicyDelta=} [properties] Properties to set + * @returns {google.iam.v1.PolicyDelta} PolicyDelta instance + */ + PolicyDelta.create = function create(properties) { + return new PolicyDelta(properties); + }; + + /** + * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.PolicyDelta + * @static + * @param {google.iam.v1.IPolicyDelta} message PolicyDelta message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PolicyDelta.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.bindingDeltas != null && message.bindingDeltas.length) + for (var i = 0; i < message.bindingDeltas.length; ++i) + $root.google.iam.v1.BindingDelta.encode(message.bindingDeltas[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.auditConfigDeltas != null && message.auditConfigDeltas.length) + for (var i = 0; i < message.auditConfigDeltas.length; ++i) + $root.google.iam.v1.AuditConfigDelta.encode(message.auditConfigDeltas[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.PolicyDelta + * @static + * @param {google.iam.v1.IPolicyDelta} message PolicyDelta message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PolicyDelta.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PolicyDelta message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.PolicyDelta + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.PolicyDelta} PolicyDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PolicyDelta.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.PolicyDelta(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.bindingDeltas && message.bindingDeltas.length)) + message.bindingDeltas = []; + message.bindingDeltas.push($root.google.iam.v1.BindingDelta.decode(reader, reader.uint32())); + break; + case 2: + if (!(message.auditConfigDeltas && message.auditConfigDeltas.length)) + message.auditConfigDeltas = []; + message.auditConfigDeltas.push($root.google.iam.v1.AuditConfigDelta.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.PolicyDelta + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.PolicyDelta} PolicyDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PolicyDelta.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PolicyDelta message. + * @function verify + * @memberof google.iam.v1.PolicyDelta + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PolicyDelta.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.bindingDeltas != null && message.hasOwnProperty("bindingDeltas")) { + if (!Array.isArray(message.bindingDeltas)) + return "bindingDeltas: array expected"; + for (var i = 0; i < message.bindingDeltas.length; ++i) { + var error = $root.google.iam.v1.BindingDelta.verify(message.bindingDeltas[i]); + if (error) + return "bindingDeltas." + error; + } + } + if (message.auditConfigDeltas != null && message.hasOwnProperty("auditConfigDeltas")) { + if (!Array.isArray(message.auditConfigDeltas)) + return "auditConfigDeltas: array expected"; + for (var i = 0; i < message.auditConfigDeltas.length; ++i) { + var error = $root.google.iam.v1.AuditConfigDelta.verify(message.auditConfigDeltas[i]); + if (error) + return "auditConfigDeltas." + error; + } + } + return null; + }; + + /** + * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.PolicyDelta + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.PolicyDelta} PolicyDelta + */ + PolicyDelta.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.PolicyDelta) + return object; + var message = new $root.google.iam.v1.PolicyDelta(); + if (object.bindingDeltas) { + if (!Array.isArray(object.bindingDeltas)) + throw TypeError(".google.iam.v1.PolicyDelta.bindingDeltas: array expected"); + message.bindingDeltas = []; + for (var i = 0; i < object.bindingDeltas.length; ++i) { + if (typeof object.bindingDeltas[i] !== "object") + throw TypeError(".google.iam.v1.PolicyDelta.bindingDeltas: object expected"); + message.bindingDeltas[i] = $root.google.iam.v1.BindingDelta.fromObject(object.bindingDeltas[i]); + } + } + if (object.auditConfigDeltas) { + if (!Array.isArray(object.auditConfigDeltas)) + throw TypeError(".google.iam.v1.PolicyDelta.auditConfigDeltas: array expected"); + message.auditConfigDeltas = []; + for (var i = 0; i < object.auditConfigDeltas.length; ++i) { + if (typeof object.auditConfigDeltas[i] !== "object") + throw TypeError(".google.iam.v1.PolicyDelta.auditConfigDeltas: object expected"); + message.auditConfigDeltas[i] = $root.google.iam.v1.AuditConfigDelta.fromObject(object.auditConfigDeltas[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.PolicyDelta + * @static + * @param {google.iam.v1.PolicyDelta} message PolicyDelta + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PolicyDelta.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.bindingDeltas = []; + object.auditConfigDeltas = []; + } + if (message.bindingDeltas && message.bindingDeltas.length) { + object.bindingDeltas = []; + for (var j = 0; j < message.bindingDeltas.length; ++j) + object.bindingDeltas[j] = $root.google.iam.v1.BindingDelta.toObject(message.bindingDeltas[j], options); + } + if (message.auditConfigDeltas && message.auditConfigDeltas.length) { + object.auditConfigDeltas = []; + for (var j = 0; j < message.auditConfigDeltas.length; ++j) + object.auditConfigDeltas[j] = $root.google.iam.v1.AuditConfigDelta.toObject(message.auditConfigDeltas[j], options); + } + return object; + }; + + /** + * Converts this PolicyDelta to JSON. + * @function toJSON + * @memberof google.iam.v1.PolicyDelta + * @instance + * @returns {Object.} JSON object + */ + PolicyDelta.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return PolicyDelta; + })(); + + v1.BindingDelta = (function() { + + /** + * Properties of a BindingDelta. + * @memberof google.iam.v1 + * @interface IBindingDelta + * @property {google.iam.v1.BindingDelta.Action|null} [action] BindingDelta action + * @property {string|null} [role] BindingDelta role + * @property {string|null} [member] BindingDelta member + * @property {google.type.IExpr|null} [condition] BindingDelta condition + */ + + /** + * Constructs a new BindingDelta. + * @memberof google.iam.v1 + * @classdesc Represents a BindingDelta. + * @implements IBindingDelta + * @constructor + * @param {google.iam.v1.IBindingDelta=} [properties] Properties to set + */ + function BindingDelta(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * BindingDelta action. + * @member {google.iam.v1.BindingDelta.Action} action + * @memberof google.iam.v1.BindingDelta + * @instance + */ + BindingDelta.prototype.action = 0; + + /** + * BindingDelta role. + * @member {string} role + * @memberof google.iam.v1.BindingDelta + * @instance + */ + BindingDelta.prototype.role = ""; + + /** + * BindingDelta member. + * @member {string} member + * @memberof google.iam.v1.BindingDelta + * @instance + */ + BindingDelta.prototype.member = ""; + + /** + * BindingDelta condition. + * @member {google.type.IExpr|null|undefined} condition + * @memberof google.iam.v1.BindingDelta + * @instance + */ + BindingDelta.prototype.condition = null; + + /** + * Creates a new BindingDelta instance using the specified properties. + * @function create + * @memberof google.iam.v1.BindingDelta + * @static + * @param {google.iam.v1.IBindingDelta=} [properties] Properties to set + * @returns {google.iam.v1.BindingDelta} BindingDelta instance + */ + BindingDelta.create = function create(properties) { + return new BindingDelta(properties); + }; + + /** + * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.BindingDelta + * @static + * @param {google.iam.v1.IBindingDelta} message BindingDelta message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + BindingDelta.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.action != null && message.hasOwnProperty("action")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.action); + if (message.role != null && message.hasOwnProperty("role")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.role); + if (message.member != null && message.hasOwnProperty("member")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.member); + if (message.condition != null && message.hasOwnProperty("condition")) + $root.google.type.Expr.encode(message.condition, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.BindingDelta + * @static + * @param {google.iam.v1.IBindingDelta} message BindingDelta message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + BindingDelta.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a BindingDelta message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.BindingDelta + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.BindingDelta} BindingDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + BindingDelta.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.BindingDelta(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.action = reader.int32(); + break; + case 2: + message.role = reader.string(); + break; + case 3: + message.member = reader.string(); + break; + case 4: + message.condition = $root.google.type.Expr.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a BindingDelta message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.BindingDelta + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.BindingDelta} BindingDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + BindingDelta.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a BindingDelta message. + * @function verify + * @memberof google.iam.v1.BindingDelta + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + BindingDelta.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.action != null && message.hasOwnProperty("action")) + switch (message.action) { + default: + return "action: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.role != null && message.hasOwnProperty("role")) + if (!$util.isString(message.role)) + return "role: string expected"; + if (message.member != null && message.hasOwnProperty("member")) + if (!$util.isString(message.member)) + return "member: string expected"; + if (message.condition != null && message.hasOwnProperty("condition")) { + var error = $root.google.type.Expr.verify(message.condition); + if (error) + return "condition." + error; + } + return null; + }; + + /** + * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.BindingDelta + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.BindingDelta} BindingDelta + */ + BindingDelta.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.BindingDelta) + return object; + var message = new $root.google.iam.v1.BindingDelta(); + switch (object.action) { + case "ACTION_UNSPECIFIED": + case 0: + message.action = 0; + break; + case "ADD": + case 1: + message.action = 1; + break; + case "REMOVE": + case 2: + message.action = 2; + break; + } + if (object.role != null) + message.role = String(object.role); + if (object.member != null) + message.member = String(object.member); + if (object.condition != null) { + if (typeof object.condition !== "object") + throw TypeError(".google.iam.v1.BindingDelta.condition: object expected"); + message.condition = $root.google.type.Expr.fromObject(object.condition); + } + return message; + }; + + /** + * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.BindingDelta + * @static + * @param {google.iam.v1.BindingDelta} message BindingDelta + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + BindingDelta.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.action = options.enums === String ? "ACTION_UNSPECIFIED" : 0; + object.role = ""; + object.member = ""; + object.condition = null; + } + if (message.action != null && message.hasOwnProperty("action")) + object.action = options.enums === String ? $root.google.iam.v1.BindingDelta.Action[message.action] : message.action; + if (message.role != null && message.hasOwnProperty("role")) + object.role = message.role; + if (message.member != null && message.hasOwnProperty("member")) + object.member = message.member; + if (message.condition != null && message.hasOwnProperty("condition")) + object.condition = $root.google.type.Expr.toObject(message.condition, options); + return object; + }; + + /** + * Converts this BindingDelta to JSON. + * @function toJSON + * @memberof google.iam.v1.BindingDelta + * @instance + * @returns {Object.} JSON object + */ + BindingDelta.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Action enum. + * @name google.iam.v1.BindingDelta.Action + * @enum {string} + * @property {number} ACTION_UNSPECIFIED=0 ACTION_UNSPECIFIED value + * @property {number} ADD=1 ADD value + * @property {number} REMOVE=2 REMOVE value + */ + BindingDelta.Action = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "ACTION_UNSPECIFIED"] = 0; + values[valuesById[1] = "ADD"] = 1; + values[valuesById[2] = "REMOVE"] = 2; + return values; + })(); + + return BindingDelta; + })(); + + v1.AuditConfigDelta = (function() { + + /** + * Properties of an AuditConfigDelta. + * @memberof google.iam.v1 + * @interface IAuditConfigDelta + * @property {google.iam.v1.AuditConfigDelta.Action|null} [action] AuditConfigDelta action + * @property {string|null} [service] AuditConfigDelta service + * @property {string|null} [exemptedMember] AuditConfigDelta exemptedMember + * @property {string|null} [logType] AuditConfigDelta logType + */ + + /** + * Constructs a new AuditConfigDelta. + * @memberof google.iam.v1 + * @classdesc Represents an AuditConfigDelta. + * @implements IAuditConfigDelta + * @constructor + * @param {google.iam.v1.IAuditConfigDelta=} [properties] Properties to set + */ + function AuditConfigDelta(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * AuditConfigDelta action. + * @member {google.iam.v1.AuditConfigDelta.Action} action + * @memberof google.iam.v1.AuditConfigDelta + * @instance + */ + AuditConfigDelta.prototype.action = 0; + + /** + * AuditConfigDelta service. + * @member {string} service + * @memberof google.iam.v1.AuditConfigDelta + * @instance + */ + AuditConfigDelta.prototype.service = ""; + + /** + * AuditConfigDelta exemptedMember. + * @member {string} exemptedMember + * @memberof google.iam.v1.AuditConfigDelta + * @instance + */ + AuditConfigDelta.prototype.exemptedMember = ""; + + /** + * AuditConfigDelta logType. + * @member {string} logType + * @memberof google.iam.v1.AuditConfigDelta + * @instance + */ + AuditConfigDelta.prototype.logType = ""; + + /** + * Creates a new AuditConfigDelta instance using the specified properties. + * @function create + * @memberof google.iam.v1.AuditConfigDelta + * @static + * @param {google.iam.v1.IAuditConfigDelta=} [properties] Properties to set + * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta instance + */ + AuditConfigDelta.create = function create(properties) { + return new AuditConfigDelta(properties); + }; + + /** + * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.AuditConfigDelta + * @static + * @param {google.iam.v1.IAuditConfigDelta} message AuditConfigDelta message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AuditConfigDelta.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.action != null && message.hasOwnProperty("action")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.action); + if (message.service != null && message.hasOwnProperty("service")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.service); + if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.exemptedMember); + if (message.logType != null && message.hasOwnProperty("logType")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.logType); + return writer; + }; + + /** + * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.AuditConfigDelta + * @static + * @param {google.iam.v1.IAuditConfigDelta} message AuditConfigDelta message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AuditConfigDelta.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AuditConfigDelta message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.AuditConfigDelta + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AuditConfigDelta.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.AuditConfigDelta(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.action = reader.int32(); + break; + case 2: + message.service = reader.string(); + break; + case 3: + message.exemptedMember = reader.string(); + break; + case 4: + message.logType = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.AuditConfigDelta + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AuditConfigDelta.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AuditConfigDelta message. + * @function verify + * @memberof google.iam.v1.AuditConfigDelta + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AuditConfigDelta.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.action != null && message.hasOwnProperty("action")) + switch (message.action) { + default: + return "action: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.service != null && message.hasOwnProperty("service")) + if (!$util.isString(message.service)) + return "service: string expected"; + if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) + if (!$util.isString(message.exemptedMember)) + return "exemptedMember: string expected"; + if (message.logType != null && message.hasOwnProperty("logType")) + if (!$util.isString(message.logType)) + return "logType: string expected"; + return null; + }; + + /** + * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.AuditConfigDelta + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + */ + AuditConfigDelta.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.AuditConfigDelta) + return object; + var message = new $root.google.iam.v1.AuditConfigDelta(); + switch (object.action) { + case "ACTION_UNSPECIFIED": + case 0: + message.action = 0; + break; + case "ADD": + case 1: + message.action = 1; + break; + case "REMOVE": + case 2: + message.action = 2; + break; + } + if (object.service != null) + message.service = String(object.service); + if (object.exemptedMember != null) + message.exemptedMember = String(object.exemptedMember); + if (object.logType != null) + message.logType = String(object.logType); + return message; + }; + + /** + * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.AuditConfigDelta + * @static + * @param {google.iam.v1.AuditConfigDelta} message AuditConfigDelta + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AuditConfigDelta.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.action = options.enums === String ? "ACTION_UNSPECIFIED" : 0; + object.service = ""; + object.exemptedMember = ""; + object.logType = ""; + } + if (message.action != null && message.hasOwnProperty("action")) + object.action = options.enums === String ? $root.google.iam.v1.AuditConfigDelta.Action[message.action] : message.action; + if (message.service != null && message.hasOwnProperty("service")) + object.service = message.service; + if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) + object.exemptedMember = message.exemptedMember; + if (message.logType != null && message.hasOwnProperty("logType")) + object.logType = message.logType; + return object; + }; + + /** + * Converts this AuditConfigDelta to JSON. + * @function toJSON + * @memberof google.iam.v1.AuditConfigDelta + * @instance + * @returns {Object.} JSON object + */ + AuditConfigDelta.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Action enum. + * @name google.iam.v1.AuditConfigDelta.Action + * @enum {string} + * @property {number} ACTION_UNSPECIFIED=0 ACTION_UNSPECIFIED value + * @property {number} ADD=1 ADD value + * @property {number} REMOVE=2 REMOVE value + */ + AuditConfigDelta.Action = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "ACTION_UNSPECIFIED"] = 0; + values[valuesById[1] = "ADD"] = 1; + values[valuesById[2] = "REMOVE"] = 2; + return values; + })(); + + return AuditConfigDelta; + })(); + + return v1; + })(); + + return iam; + })(); + + google.type = (function() { + + /** + * Namespace type. + * @memberof google + * @namespace + */ + var type = {}; + + type.Expr = (function() { + + /** + * Properties of an Expr. + * @memberof google.type + * @interface IExpr + * @property {string|null} [expression] Expr expression + * @property {string|null} [title] Expr title + * @property {string|null} [description] Expr description + * @property {string|null} [location] Expr location + */ + + /** + * Constructs a new Expr. + * @memberof google.type + * @classdesc Represents an Expr. + * @implements IExpr + * @constructor + * @param {google.type.IExpr=} [properties] Properties to set + */ + function Expr(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Expr expression. + * @member {string} expression + * @memberof google.type.Expr + * @instance + */ + Expr.prototype.expression = ""; + + /** + * Expr title. + * @member {string} title + * @memberof google.type.Expr + * @instance + */ + Expr.prototype.title = ""; + + /** + * Expr description. + * @member {string} description + * @memberof google.type.Expr + * @instance + */ + Expr.prototype.description = ""; + + /** + * Expr location. + * @member {string} location + * @memberof google.type.Expr + * @instance + */ + Expr.prototype.location = ""; + + /** + * Creates a new Expr instance using the specified properties. + * @function create + * @memberof google.type.Expr + * @static + * @param {google.type.IExpr=} [properties] Properties to set + * @returns {google.type.Expr} Expr instance + */ + Expr.create = function create(properties) { + return new Expr(properties); + }; + + /** + * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @function encode + * @memberof google.type.Expr + * @static + * @param {google.type.IExpr} message Expr message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Expr.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.expression != null && message.hasOwnProperty("expression")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.expression); + if (message.title != null && message.hasOwnProperty("title")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.title); + if (message.description != null && message.hasOwnProperty("description")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.description); + if (message.location != null && message.hasOwnProperty("location")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.location); + return writer; + }; + + /** + * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @function encodeDelimited + * @memberof google.type.Expr + * @static + * @param {google.type.IExpr} message Expr message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Expr.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an Expr message from the specified reader or buffer. + * @function decode + * @memberof google.type.Expr + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.type.Expr} Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Expr.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.type.Expr(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.expression = reader.string(); + break; + case 2: + message.title = reader.string(); + break; + case 3: + message.description = reader.string(); + break; + case 4: + message.location = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an Expr message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.type.Expr + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.type.Expr} Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Expr.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an Expr message. + * @function verify + * @memberof google.type.Expr + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Expr.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.expression != null && message.hasOwnProperty("expression")) + if (!$util.isString(message.expression)) + return "expression: string expected"; + if (message.title != null && message.hasOwnProperty("title")) + if (!$util.isString(message.title)) + return "title: string expected"; + if (message.description != null && message.hasOwnProperty("description")) + if (!$util.isString(message.description)) + return "description: string expected"; + if (message.location != null && message.hasOwnProperty("location")) + if (!$util.isString(message.location)) + return "location: string expected"; + return null; + }; + + /** + * Creates an Expr message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.type.Expr + * @static + * @param {Object.} object Plain object + * @returns {google.type.Expr} Expr + */ + Expr.fromObject = function fromObject(object) { + if (object instanceof $root.google.type.Expr) + return object; + var message = new $root.google.type.Expr(); + if (object.expression != null) + message.expression = String(object.expression); + if (object.title != null) + message.title = String(object.title); + if (object.description != null) + message.description = String(object.description); + if (object.location != null) + message.location = String(object.location); + return message; + }; + + /** + * Creates a plain object from an Expr message. Also converts values to other types if specified. + * @function toObject + * @memberof google.type.Expr + * @static + * @param {google.type.Expr} message Expr + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Expr.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.expression = ""; + object.title = ""; + object.description = ""; + object.location = ""; + } + if (message.expression != null && message.hasOwnProperty("expression")) + object.expression = message.expression; + if (message.title != null && message.hasOwnProperty("title")) + object.title = message.title; + if (message.description != null && message.hasOwnProperty("description")) + object.description = message.description; + if (message.location != null && message.hasOwnProperty("location")) + object.location = message.location; + return object; + }; + + /** + * Converts this Expr to JSON. + * @function toJSON + * @memberof google.type.Expr + * @instance + * @returns {Object.} JSON object + */ + Expr.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Expr; + })(); + + return type; + })(); + + return google; + })(); + + return $root; +}); diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index fd7408b737c..ba4f80a56b8 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-09-18T11:25:10.499614Z", + "updateTime": "2019-09-20T11:20:36.513316Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "4aeb1260230bbf56c9d958ff28dfb3eba019fcd0", - "internalRef": "269598918" + "sha": "44e588d97e7497dff01107d39b6a19062f9a4ffa", + "internalRef": "270200097" } }, { From 5a71176d9516d937c72472ef4ce0bf3a1756b88c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Sep 2019 18:29:57 +0300 Subject: [PATCH 0512/1115] fix(deps): update dependency @grpc/grpc-js to ^0.6.0 (#759) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d8b38852ef4..3a0592f6057 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", - "@grpc/grpc-js": "^0.5.0", + "@grpc/grpc-js": "^0.6.0", "@sindresorhus/is": "^1.0.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", From 2dc8b1cb110e9deaf1f0237a495ebc736f4f3a16 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2019 11:41:24 -0400 Subject: [PATCH 0513/1115] chore: release 1.1.0 (#756) --- handwritten/pubsub/CHANGELOG.md | 13 +++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index f6f76ca0cee..268fd898ecd 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,19 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [1.1.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.0.0...v1.1.0) (2019-09-25) + + +### Bug Fixes + +* **deps:** update dependency @google-cloud/pubsub to v1 ([#750](https://www.github.com/googleapis/nodejs-pubsub/issues/750)) ([82305de](https://www.github.com/googleapis/nodejs-pubsub/commit/82305de)) +* **deps:** update dependency @grpc/grpc-js to ^0.6.0 ([#759](https://www.github.com/googleapis/nodejs-pubsub/issues/759)) ([fda95c7](https://www.github.com/googleapis/nodejs-pubsub/commit/fda95c7)) + + +### Features + +* .d.ts for protos ([#755](https://www.github.com/googleapis/nodejs-pubsub/issues/755)) ([32aab9f](https://www.github.com/googleapis/nodejs-pubsub/commit/32aab9f)) + ## [1.0.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v0.32.1...v1.0.0) (2019-09-18) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3a0592f6057..e8881cebd1f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 9ae7ddb05da44f342eddeaf400bfb1f38273f97e Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 27 Sep 2019 10:06:56 -0700 Subject: [PATCH 0514/1115] fix: update messaging retry timeout durations (#761) --- handwritten/pubsub/src/v1/publisher_client_config.json | 6 +++--- .../pubsub/src/v1/subscriber_client_config.json | 6 +++--- handwritten/pubsub/synth.metadata | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index b1ec0bb46e7..c0f9ef66e89 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -35,9 +35,9 @@ "initial_retry_delay_millis": 100, "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 25000, - "rpc_timeout_multiplier": 1.0, - "max_rpc_timeout_millis": 30000, + "initial_rpc_timeout_millis": 5000, + "rpc_timeout_multiplier": 1.3, + "max_rpc_timeout_millis": 600000, "total_timeout_millis": 600000 } }, diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 45c1ace9f93..64d425afda1 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -26,9 +26,9 @@ "initial_retry_delay_millis": 100, "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 25000, - "rpc_timeout_multiplier": 1.0, - "max_rpc_timeout_millis": 25000, + "initial_rpc_timeout_millis": 5000, + "rpc_timeout_multiplier": 1.3, + "max_rpc_timeout_millis": 600000, "total_timeout_millis": 600000 }, "streaming_messaging": { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index ba4f80a56b8..86dda50d9ff 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-09-20T11:20:36.513316Z", + "updateTime": "2019-09-27T11:22:55.490918Z", "sources": [ { "generator": { "name": "artman", - "version": "0.36.3", - "dockerImage": "googleapis/artman@sha256:66ca01f27ef7dc50fbfb7743b67028115a6a8acf43b2d82f9fc826de008adac4" + "version": "0.37.1", + "dockerImage": "googleapis/artman@sha256:6068f67900a3f0bdece596b97bda8fc70406ca0e137a941f4c81d3217c994a80" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "44e588d97e7497dff01107d39b6a19062f9a4ffa", - "internalRef": "270200097" + "sha": "cd112d8d255e0099df053643d4bd12c228ef7b1b", + "internalRef": "271468707" } }, { From 40b7b834cee12e185b3a61d27b679477b5783f8d Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 27 Sep 2019 17:39:23 -0400 Subject: [PATCH 0515/1115] chore: update pull request template --- handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md b/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md index 809750308d7..46cd1076bd7 100644 --- a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md +++ b/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,7 @@ -Fixes # (it's a good idea to open an issue first for discussion) - -- [ ] Tests and linter pass +Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: +- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/{{metadata['repo']['name']}}/issues) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea +- [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) + +Fixes # 🦕 From b9cefe16ca078f435359b7fcef54c47e1fcd810c Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Tue, 1 Oct 2019 20:16:18 -0700 Subject: [PATCH 0516/1115] fix(docs): explain PubSub.v1 property (#766) --- handwritten/pubsub/src/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 7c4fba4680b..c6c943174eb 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -52,6 +52,8 @@ */ /** + * Reference to internal generated clients, advanced use only. + * * @name PubSub.v1 * @see v1.PublisherClient * @see v1.SubscriberClient @@ -63,6 +65,8 @@ */ /** + * Reference to internal generated clients, advanced use only. + * * @name module:@google-cloud/pubsub.v1 * @see v1.PublisherClient * @see v1.SubscriberClient From d40639bb21a44da3d19c1356ab8525b735b5cddd Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 2 Oct 2019 01:09:50 -0700 Subject: [PATCH 0517/1115] fix: use compatible version of google-gax * fix: use compatible version of google-gax * fix: use gax v1.6.3 --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e8881cebd1f..29811c90ec3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -62,7 +62,7 @@ "async-each": "^1.0.1", "extend": "^3.0.2", "google-auth-library": "^5.0.0", - "google-gax": "^1.5.2", + "google-gax": "^1.6.3", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0", From 8131ba7c62588658cfef45a2b6a2f41afcfa0963 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 4 Oct 2019 13:30:15 -0700 Subject: [PATCH 0518/1115] chore: update pull request template (#765) --- handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md | 2 +- handwritten/pubsub/synth.metadata | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md b/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md index 46cd1076bd7..520a0c2dd83 100644 --- a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md +++ b/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,5 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: -- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/{{metadata['repo']['name']}}/issues) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea +- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 86dda50d9ff..8e9bc517066 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-09-27T11:22:55.490918Z", + "updateTime": "2019-10-01T11:27:12.911749Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "cd112d8d255e0099df053643d4bd12c228ef7b1b", - "internalRef": "271468707" + "sha": "ce3c574d1266026cebea3a893247790bd68191c2", + "internalRef": "272147209" } }, { From 7cf1f4cc3db0f1dbfdee9bd203d6be8a6fcca6c1 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 8 Oct 2019 13:25:20 -0400 Subject: [PATCH 0519/1115] fix(deps): pin @grpc/grpc-js to ^0.6.6 (#772) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 29811c90ec3..1a1ead16277 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", - "@grpc/grpc-js": "^0.6.0", + "@grpc/grpc-js": "^0.6.6", "@sindresorhus/is": "^1.0.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", From 81a345d20c938aa24f21565e321ce265bab7a176 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2019 13:39:11 -0400 Subject: [PATCH 0520/1115] chore: release 1.1.1 (#762) --- handwritten/pubsub/CHANGELOG.md | 10 ++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 268fd898ecd..bdc0d13cae6 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,16 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [1.1.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.0...v1.1.1) (2019-10-08) + + +### Bug Fixes + +* update messaging retry timeout durations ([#761](https://www.github.com/googleapis/nodejs-pubsub/issues/761)) ([922fe92](https://www.github.com/googleapis/nodejs-pubsub/commit/922fe92)) +* use compatible version of google-gax ([060207a](https://www.github.com/googleapis/nodejs-pubsub/commit/060207a)) +* **deps:** pin @grpc/grpc-js to ^0.6.6 ([#772](https://www.github.com/googleapis/nodejs-pubsub/issues/772)) ([3c5199d](https://www.github.com/googleapis/nodejs-pubsub/commit/3c5199d)) +* **docs:** explain PubSub.v1 property ([#766](https://www.github.com/googleapis/nodejs-pubsub/issues/766)) ([157a86d](https://www.github.com/googleapis/nodejs-pubsub/commit/157a86d)) + ## [1.1.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.0.0...v1.1.0) (2019-09-25) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1a1ead16277..9e7f051a0cf 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.1.0", + "version": "1.1.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 880a353e89052ae76a654e0f697d74ff1169d707 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Tue, 8 Oct 2019 17:21:26 -0700 Subject: [PATCH 0521/1115] chore: update CONTRIBUTING.md and make releaseType node (#774) --- handwritten/pubsub/.github/release-please.yml | 1 + handwritten/pubsub/CONTRIBUTING.md | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/handwritten/pubsub/.github/release-please.yml b/handwritten/pubsub/.github/release-please.yml index e69de29bb2d..85344b92c7f 100644 --- a/handwritten/pubsub/.github/release-please.yml +++ b/handwritten/pubsub/.github/release-please.yml @@ -0,0 +1 @@ +releaseType: node diff --git a/handwritten/pubsub/CONTRIBUTING.md b/handwritten/pubsub/CONTRIBUTING.md index 78aaa61b269..f6c4cf010e3 100644 --- a/handwritten/pubsub/CONTRIBUTING.md +++ b/handwritten/pubsub/CONTRIBUTING.md @@ -34,6 +34,7 @@ accept your pull requests. 1. Ensure that your code adheres to the existing style in the code to which you are contributing. 1. Ensure that your code has an appropriate set of tests which all pass. +1. Title your pull request following [Conventional Commits](https://www.conventionalcommits.org/) styling. 1. Submit a pull request. ## Running the tests @@ -46,8 +47,17 @@ accept your pull requests. 1. Run the tests: + # Run unit tests. npm test + # Run sample integration tests. + gcloud auth application-default login + npm run samples-test + + # Run all system tests. + gcloud auth application-default login + npm run system-test + 1. Lint (and maybe fix) any changes: npm run fix From 32c63f513d4a59f57094e4ed712d1777f39b06f8 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 9 Oct 2019 18:06:38 -0400 Subject: [PATCH 0522/1115] fix(deps): remove direct dependency on @grpc/grpc-js (#773) --- handwritten/pubsub/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9e7f051a0cf..491f31b082e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,6 @@ "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", - "@grpc/grpc-js": "^0.6.6", "@sindresorhus/is": "^1.0.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", From 02a02019eead3107e2df7dd7e2a2cdfcc0b38863 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2019 14:50:29 -0700 Subject: [PATCH 0523/1115] chore: release 1.1.2 (#777) --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index bdc0d13cae6..111509b4281 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [1.1.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.1...v1.1.2) (2019-10-09) + + +### Bug Fixes + +* **deps:** remove direct dependency on @grpc/grpc-js ([#773](https://www.github.com/googleapis/nodejs-pubsub/issues/773)) ([0bebf9b](https://www.github.com/googleapis/nodejs-pubsub/commit/0bebf9b)) + ### [1.1.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.0...v1.1.1) (2019-10-08) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 491f31b082e..90f95d2e5b6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.1.1", + "version": "1.1.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 0da65556dd1870b06c39deb6964c44b1a3ceae56 Mon Sep 17 00:00:00 2001 From: Alex Hong <9397363+hongalex@users.noreply.github.com> Date: Mon, 14 Oct 2019 13:01:00 -0700 Subject: [PATCH 0524/1115] build: adding benchmarking script (#778) --- handwritten/pubsub/bin/README.md | 13 +++++ handwritten/pubsub/bin/benchwrapper.js | 73 ++++++++++++++++++++++++++ handwritten/pubsub/bin/pubsub.proto | 32 +++++++++++ handwritten/pubsub/package.json | 8 ++- 4 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 handwritten/pubsub/bin/README.md create mode 100644 handwritten/pubsub/bin/benchwrapper.js create mode 100644 handwritten/pubsub/bin/pubsub.proto diff --git a/handwritten/pubsub/bin/README.md b/handwritten/pubsub/bin/README.md new file mode 100644 index 00000000000..c7e6274589e --- /dev/null +++ b/handwritten/pubsub/bin/README.md @@ -0,0 +1,13 @@ +# benchwrapper + +benchwrapper is a lightweight gRPC server that wraps the pubsub library for +bencharmking purposes. + +## Running + +``` +cd nodejs-pubsub +npm install +export PUBSUB_EMULATOR_HOST=localhost:8080 +npm run benchwrapper -- --port 50051 +``` diff --git a/handwritten/pubsub/bin/benchwrapper.js b/handwritten/pubsub/bin/benchwrapper.js new file mode 100644 index 00000000000..30efd87c65c --- /dev/null +++ b/handwritten/pubsub/bin/benchwrapper.js @@ -0,0 +1,73 @@ +/** + * Copyright 2019 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const grpc = require('grpc'); +const protoLoader = require('@grpc/proto-loader'); +const {PubSub} = require('../build/src'); + +const argv = require('yargs') + .option('port', { + description: 'The port that the Node.js benchwrapper should run on.', + type: 'number', + demand: true, + }) + .parse(); + +const PROTO_PATH = __dirname + '/pubsub.proto'; +// Suggested options for similarity to existing grpc.load behavior. +const packageDefinition = protoLoader.loadSync(PROTO_PATH, { + keepCase: true, + longs: String, + enums: String, + defaults: true, + oneofs: true, +}); +const protoDescriptor = grpc.loadPackageDefinition(packageDefinition); +const pubsubBenchWrapper = protoDescriptor.pubsub_bench; + +const client = new PubSub(); + +function recv(call, callback) { + const subName = call.request.sub_name; + + const sub = client.subscription(subName); + + sub.setOptions({ + streamingOptions: { + maxStreams: 1, + }, + }); + + sub.on('message', message => { + message.ack(); + }); + + sub.on('error', () => { + // We look for an error here since we expect the server + // the close the stream with an grpc "OK" error, which + // indicates a successfully closed stream. + callback(null, null); + }); +} + +const server = new grpc.Server(); + +server.addService(pubsubBenchWrapper['PubsubBenchWrapper']['service'], { + Recv: recv, +}); +console.log(`starting on localhost:${argv.port}`); +server.bind(`0.0.0.0:${argv.port}`, grpc.ServerCredentials.createInsecure()); +server.start(); diff --git a/handwritten/pubsub/bin/pubsub.proto b/handwritten/pubsub/bin/pubsub.proto new file mode 100644 index 00000000000..0c3e50d7f76 --- /dev/null +++ b/handwritten/pubsub/bin/pubsub.proto @@ -0,0 +1,32 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package pubsub_bench; + +option java_multiple_files = true; + +message PubsubRecv { + // The subscription identifier corresponding to number of messages sent. + string sub_name = 1; +} + +// TODO(deklerk): Replace with Google's canonical Empty. +message EmptyResponse {} + +service PubsubBenchWrapper { + // Recv represents opening a streaming pull stream to receive messages on. + rpc Recv(PubsubRecv) returns (EmptyResponse) {} +} diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 90f95d2e5b6..97e1f4d645c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -47,7 +47,8 @@ "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -o proto/iam.d.ts -", "docs-test": "linkinator docs", - "predocs-test": "npm run docs" + "predocs-test": "npm run docs", + "benchwrapper": "node bin/benchwrapper.js" }, "dependencies": { "@google-cloud/paginator": "^2.0.0", @@ -69,6 +70,7 @@ }, "devDependencies": { "@google-cloud/nodejs-repo-tools": "^3.0.0", + "@grpc/proto-loader": "^0.5.2", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", @@ -84,6 +86,7 @@ "eslint-config-prettier": "^6.0.0", "eslint-plugin-node": "^10.0.0", "eslint-plugin-prettier": "^3.0.0", + "grpc": "^1.24.0", "gts": "^1.0.0", "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.6.2", @@ -100,6 +103,7 @@ "sinon": "^7.1.1", "source-map-support": "^0.5.9", "typescript": "~3.6.0", - "uuid": "^3.1.0" + "uuid": "^3.1.0", + "yargs": "^14.2.0" } } From ff097a8454e385cc48d0efab93d2adcb08cd0b45 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Tue, 15 Oct 2019 17:21:41 -0700 Subject: [PATCH 0525/1115] fix(docs): add documentation about running C++ gRPC bindings (#782) --- handwritten/pubsub/.readme-partials.yml | 16 ++++++++++++++++ handwritten/pubsub/README.md | 14 ++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/handwritten/pubsub/.readme-partials.yml b/handwritten/pubsub/.readme-partials.yml index 45098c0845e..407a6a877f4 100644 --- a/handwritten/pubsub/.readme-partials.yml +++ b/handwritten/pubsub/.readme-partials.yml @@ -8,3 +8,19 @@ introduction: |- [Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), [publisher](https://cloud.google.com/pubsub/docs/publisher), and [subscriber](https://cloud.google.com/pubsub/docs/subscriber) guides. +body: |- + ## Running gRPC C++ bindings + + For some workflows and environments it might make sense to use the C++ gRPC implementation, + instead of the default one (see: [#770](https://github.com/googleapis/nodejs-pubsub/issues/770)): + + To configure `@google-cloud/pubsub` to use an alternative `grpc` transport: + + 1. `npm install grpc`, adding `grpc` as a dependency. + 1. instantiate `@google-cloud/pubsub` with `grpc`: + + ```js + const {PubSub} = require('@google-cloud/pubsub'); + const grpc = require('grpc'); + const pubsub = new PubSub({grpc}); + ``` diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index f28e1d38afb..26feaf8adeb 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -79,7 +79,21 @@ async function quickstart( } ``` +## Running gRPC C++ bindings +For some workflows and environments it might make sense to use the C++ gRPC implementation, +instead of the default one (see: [#770](https://github.com/googleapis/nodejs-pubsub/issues/770)): + +To configure `@google-cloud/pubsub` to use an alternative `grpc` transport: + +1. `npm install grpc`, adding `grpc` as a dependency. +1. instantiate `@google-cloud/pubsub` with `grpc`: + + ```js + const {PubSub} = require('@google-cloud/pubsub'); + const grpc = require('grpc'); + const pubsub = new PubSub({grpc}); + ``` ## Samples From 094f1884665b38a057478b103461d06ae8b30363 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Fri, 18 Oct 2019 14:54:52 -0700 Subject: [PATCH 0526/1115] fix(deps): explicit update to google-auth-library with various fixes (#785) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 97e1f4d645c..e57a0d75469 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -61,7 +61,7 @@ "arrify": "^2.0.0", "async-each": "^1.0.1", "extend": "^3.0.2", - "google-auth-library": "^5.0.0", + "google-auth-library": "^5.5.0", "google-gax": "^1.6.3", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 03e2e00c637d109d7cf3f8600629502c3eacbc24 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2019 10:21:24 -0400 Subject: [PATCH 0527/1115] chore: release 1.1.3 (#783) --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 111509b4281..352c570dc82 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [1.1.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.2...v1.1.3) (2019-10-18) + + +### Bug Fixes + +* **deps:** explicit update to google-auth-library with various fixes ([#785](https://www.github.com/googleapis/nodejs-pubsub/issues/785)) ([c7b0069](https://www.github.com/googleapis/nodejs-pubsub/commit/c7b006995fb8fe432e8561d189cddbd20c8e0dce)) +* **docs:** add documentation about running C++ gRPC bindings ([#782](https://www.github.com/googleapis/nodejs-pubsub/issues/782)) ([bdc690e](https://www.github.com/googleapis/nodejs-pubsub/commit/bdc690e6d102862f11a5ea4901c98effe1d3c427)) + ### [1.1.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.1...v1.1.2) (2019-10-09) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e57a0d75469..c5da703ad16 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.1.2", + "version": "1.1.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From f567a8c2898ecc6ce6cd16bf8cf2d8d7e4c23749 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 21 Oct 2019 17:49:44 -0700 Subject: [PATCH 0528/1115] fix(deps): bump google-gax to 1.7.5 (#792) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c5da703ad16..72a7b87d088 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -62,7 +62,7 @@ "async-each": "^1.0.1", "extend": "^3.0.2", "google-auth-library": "^5.5.0", - "google-gax": "^1.6.3", + "google-gax": "^1.7.5", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0", From 0a1861ff49b43d247b54b420b22b21e2c666ef3d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 10:34:12 -0700 Subject: [PATCH 0529/1115] chore: release 1.1.4 (#793) --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 352c570dc82..61b15903fb2 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [1.1.4](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.3...v1.1.4) (2019-10-22) + + +### Bug Fixes + +* **deps:** bump google-gax to 1.7.5 ([#792](https://www.github.com/googleapis/nodejs-pubsub/issues/792)) ([d584d07](https://www.github.com/googleapis/nodejs-pubsub/commit/d584d07c8a8291444487eef947e01a832dfde372)) + ### [1.1.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.2...v1.1.3) (2019-10-18) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 72a7b87d088..1c968a3ac06 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.1.3", + "version": "1.1.4", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From be59095c4a39730d64d225cc3506f86a48d9cdd5 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Tue, 22 Oct 2019 15:32:31 -0400 Subject: [PATCH 0530/1115] fix: pull emulator creds from local grpc instance (#795) --- handwritten/pubsub/src/pubsub.ts | 3 ++- handwritten/pubsub/test/pubsub.ts | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index a9864538e5e..aaa69bd0734 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -527,6 +527,7 @@ export class PubSub { return; } + const grpcInstance = this.options.grpc || grpc; const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; const leadingProtocol = new RegExp('^https*://'); const trailingSlashes = new RegExp('/*$'); @@ -536,7 +537,7 @@ export class PubSub { .split(':'); this.options.servicePath = baseUrlParts[0]; this.options.port = baseUrlParts[1]; - this.options.sslCreds = grpc.credentials.createInsecure(); + this.options.sslCreds = grpcInstance.credentials.createInsecure(); this.isEmulator = true; if (!this.options.projectId && process.env.PUBSUB_PROJECT_ID) { diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 4e377a6d8ae..66150c08613 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -673,6 +673,20 @@ describe('PubSub', () => { assert.strictEqual(pubsub.options.port, undefined); }); + it('should create credentials from local grpc if present', () => { + const fakeCredentials = {}; + const fakeGrpc = { + credentials: { + createInsecure: () => fakeCredentials, + }, + }; + + setHost('localhost'); + pubsub.options.grpc = (fakeGrpc as unknown) as typeof grpc; + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.sslCreds, fakeCredentials); + }); + describe('with PUBSUB_EMULATOR_HOST environment variable', () => { const PUBSUB_EMULATOR_HOST = 'localhost:9090'; From 43d73f2f68eb269ca88875e079887dc19d86ef34 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2019 15:47:58 -0400 Subject: [PATCH 0531/1115] chore: release 1.1.5 (#796) --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 61b15903fb2..28f38e9d94b 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [1.1.5](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.4...v1.1.5) (2019-10-22) + + +### Bug Fixes + +* pull emulator creds from local grpc instance ([#795](https://www.github.com/googleapis/nodejs-pubsub/issues/795)) ([1749b62](https://www.github.com/googleapis/nodejs-pubsub/commit/1749b626e6bff5fefd1b1b8c673c480a10be9cf9)) + ### [1.1.4](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.3...v1.1.4) (2019-10-22) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1c968a3ac06..323dbd28776 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.1.4", + "version": "1.1.5", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 62c2f6965411019e37ed99f289c0378091e49e07 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 1 Nov 2019 12:45:56 -0700 Subject: [PATCH 0532/1115] test: don't exclude src/ in coverage --- handwritten/pubsub/.nycrc | 1 - handwritten/pubsub/synth.metadata | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/.nycrc b/handwritten/pubsub/.nycrc index 23e322204ec..367688844eb 100644 --- a/handwritten/pubsub/.nycrc +++ b/handwritten/pubsub/.nycrc @@ -10,7 +10,6 @@ "**/docs", "**/samples", "**/scripts", - "**/src/**/v*/**/*.js", "**/protos", "**/test", ".jsdoc.js", diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 8e9bc517066..be978586b4f 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,26 +1,26 @@ { - "updateTime": "2019-10-01T11:27:12.911749Z", + "updateTime": "2019-11-01T19:17:17.866509Z", "sources": [ { "generator": { "name": "artman", - "version": "0.37.1", - "dockerImage": "googleapis/artman@sha256:6068f67900a3f0bdece596b97bda8fc70406ca0e137a941f4c81d3217c994a80" + "version": "0.41.0", + "dockerImage": "googleapis/artman@sha256:75b38a3b073a7b243545f2332463096624c802bb1e56b8cb6f22ba1ecd325fa9" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "ce3c574d1266026cebea3a893247790bd68191c2", - "internalRef": "272147209" + "sha": "bba93d7148ff203d400a4929cd0fbc7dafd8dae2", + "internalRef": "277920288" } }, { "template": { "name": "node_library", "origin": "synthtool.gcp", - "version": "2019.5.2" + "version": "2019.10.17" } } ], From 1c2f02ba36eb1d45172d0476b09869606fc7b3b1 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sat, 9 Nov 2019 15:49:23 -0800 Subject: [PATCH 0533/1115] refactor: run prettier (#813) --- handwritten/pubsub/src/message-stream.ts | 5 +---- handwritten/pubsub/synth.metadata | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 088a2210c77..9ef6016961b 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -200,10 +200,7 @@ export class MessageStream extends PassThrough { stream .on('error', err => this._onError(stream, err)) .once('status', status => this._onStatus(stream, status)) - .pipe( - this, - {end: false} - ); + .pipe(this, {end: false}); } /** * Attempts to create and cache the desired number of StreamingPull requests. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index be978586b4f..3962ab89b90 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-11-01T19:17:17.866509Z", + "updateTime": "2019-11-09T12:21:09.265592Z", "sources": [ { "generator": { "name": "artman", - "version": "0.41.0", - "dockerImage": "googleapis/artman@sha256:75b38a3b073a7b243545f2332463096624c802bb1e56b8cb6f22ba1ecd325fa9" + "version": "0.41.1", + "dockerImage": "googleapis/artman@sha256:545c758c76c3f779037aa259023ec3d1ef2d57d2c8cd00a222cb187d63ceac5e" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "bba93d7148ff203d400a4929cd0fbc7dafd8dae2", - "internalRef": "277920288" + "sha": "34e661f58d58fa57da8ed113a3d8bb3de26b307d", + "internalRef": "279417429" } }, { From 22694eafa110f1143dbaf48a018c423f61ec20cd Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 15 Nov 2019 10:20:09 -0800 Subject: [PATCH 0534/1115] chore: add gitattributes to kokoro --- handwritten/pubsub/.kokoro/.gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 handwritten/pubsub/.kokoro/.gitattributes diff --git a/handwritten/pubsub/.kokoro/.gitattributes b/handwritten/pubsub/.kokoro/.gitattributes new file mode 100644 index 00000000000..87acd4f484e --- /dev/null +++ b/handwritten/pubsub/.kokoro/.gitattributes @@ -0,0 +1 @@ +* linguist-generated=true From f91d9356170290542764f1f4abe08e4f0625541b Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 18 Nov 2019 19:14:12 -0800 Subject: [PATCH 0535/1115] fix(docs): snippets are now replaced in jsdoc comments (#815) --- handwritten/pubsub/.jsdoc.js | 3 ++- handwritten/pubsub/package.json | 1 + handwritten/pubsub/system-test/pubsub.ts | 23 +++++++++++------------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index b41e2eeb400..6139e0dd040 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -26,7 +26,8 @@ module.exports = { destination: './docs/' }, plugins: [ - 'plugins/markdown' + 'plugins/markdown', + 'jsdoc-region-tag' ], source: { excludePattern: '(^|\\/|\\\\)[._]', diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 323dbd28776..e57a1c66597 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -91,6 +91,7 @@ "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", + "jsdoc-region-tag": "^1.0.2", "linkinator": "^1.5.0", "mkdirp": "^0.5.1", "mocha": "^6.0.0", diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index fd86eea9c83..4850725b344 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -710,23 +710,22 @@ describe('pubsub', () => { describe('seeking', () => { let subscription: Subscription; let messageId: string; + const snapshotName = generateSnapshotName(); - beforeEach(() => { + beforeEach(async () => { subscription = topic.subscription(generateSubName()); - - return subscription - .create() - .then(() => { - return topic.publish(Buffer.from('Hello, world!')); - }) - .then(_messageId => { - messageId = _messageId; - }); + await subscription.create(); + messageId = await topic.publish(Buffer.from('Hello, world!')); + // The first call to `createSnapshot` consistently fails, + // see: https://github.com/googleapis/nodejs-pubsub/issues/821 + try { + await subscription.createSnapshot(snapshotName); + } catch (err) { + console.warn(err.message); + } }); it('should seek to a snapshot', done => { - const snapshotName = generateSnapshotName(); - subscription.createSnapshot(snapshotName, (err, snapshot) => { assert.ifError(err); From d77c15a4e3e6beb5780d086df189c016afb747d7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 19 Nov 2019 05:04:53 +0100 Subject: [PATCH 0536/1115] fix(deps): update dependency yargs to v15 (#820) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e57a1c66597..1b82091d858 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -105,6 +105,6 @@ "source-map-support": "^0.5.9", "typescript": "~3.6.0", "uuid": "^3.1.0", - "yargs": "^14.2.0" + "yargs": "^15.0.0" } } From f2a269ff504434a5f7edad550aa841cfe9424e86 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 18 Nov 2019 20:13:52 -0800 Subject: [PATCH 0537/1115] chore: clean up package.json (#809) --- handwritten/pubsub/package.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1b82091d858..7326d9d7250 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -13,10 +13,7 @@ "files": [ "build/proto", "build/protos", - "build/src", - "AUTHORS", - "CONTRIBUTORS", - "LICENSE" + "build/src" ], "keywords": [ "google apis client", @@ -34,7 +31,7 @@ "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", - "test": "nyc mocha build/test", + "test": "c8 mocha build/test", "lint": "eslint '**/*.js' && gts check", "predocs": "npm run compile", "docs": "jsdoc -c .jsdoc.js", @@ -69,7 +66,6 @@ "protobufjs": "^6.8.1" }, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "^3.0.0", "@grpc/proto-loader": "^0.5.2", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", @@ -81,6 +77,7 @@ "@types/sinon": "^7.0.0", "@types/tmp": "^0.1.0", "@types/uuid": "^3.4.4", + "c8": "^6.0.1", "codecov": "^3.0.0", "eslint": "^6.0.0", "eslint-config-prettier": "^6.0.0", @@ -97,7 +94,6 @@ "mocha": "^6.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", - "nyc": "^14.0.0", "power-assert": "^1.4.4", "prettier": "^1.18.2", "proxyquire": "^2.0.0", From b1b395fb86563d23a44dfe79c154ef9cc8d1e9c3 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 18 Nov 2019 20:21:28 -0800 Subject: [PATCH 0538/1115] fix: include long import in proto typescript declaration file (#816) --- handwritten/pubsub/protos/protos.d.ts | 1 + handwritten/pubsub/synth.metadata | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 80bd6ad949d..569efb8c26e 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1,3 +1,4 @@ +import * as Long from "long"; import * as $protobuf from "protobufjs"; /** Namespace google. */ export namespace google { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 3962ab89b90..5d4ea7fda2c 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-11-09T12:21:09.265592Z", + "updateTime": "2019-11-12T12:21:39.195123Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "34e661f58d58fa57da8ed113a3d8bb3de26b307d", - "internalRef": "279417429" + "sha": "f69562be0608904932bdcfbc5ad8b9a22d9dceb8", + "internalRef": "279774957" } }, { From c08fa3933aca0cd18d53378c948e5a403f4ffbbd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 19 Nov 2019 09:49:24 -0800 Subject: [PATCH 0539/1115] fix: adds streaming pull retry, and increases request thresholds --- handwritten/pubsub/protos/protos.d.ts | 14 ++++++++++++++ handwritten/pubsub/protos/protos.js | 14 ++++++++++++++ .../pubsub/src/v1/publisher_client_config.json | 8 ++++---- .../pubsub/src/v1/subscriber_client_config.json | 10 ++++++++-- handwritten/pubsub/synth.metadata | 10 +++++----- 5 files changed, 45 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 569efb8c26e..dbfc1471793 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1,3 +1,17 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + import * as Long from "long"; import * as $protobuf from "protobufjs"; /** Namespace google. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index fa617cc8a02..ffd08431852 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -1,3 +1,17 @@ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/ (function(global, factory) { /* global define, require, module */ diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index c0f9ef66e89..71406059d6b 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -37,8 +37,8 @@ "max_retry_delay_millis": 60000, "initial_rpc_timeout_millis": 5000, "rpc_timeout_multiplier": 1.3, - "max_rpc_timeout_millis": 600000, - "total_timeout_millis": 600000 + "max_rpc_timeout_millis": 60000, + "total_timeout_millis": 60000 } }, "methods": { @@ -57,9 +57,9 @@ "retry_codes_name": "publish", "retry_params_name": "messaging", "bundling": { - "element_count_threshold": 10, + "element_count_threshold": 100, "element_count_limit": 1000, - "request_byte_threshold": 1024, + "request_byte_threshold": 1048576, "request_byte_limit": 10485760, "delay_threshold_millis": 10 } diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index 64d425afda1..e4f432d090a 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -10,7 +10,13 @@ "non_idempotent": [ "UNAVAILABLE" ], - "none": [] + "streaming_pull": [ + "ABORTED", + "DEADLINE_EXCEEDED", + "INTERNAL", + "RESOURCE_EXHAUSTED", + "UNAVAILABLE" + ] }, "retry_params": { "default": { @@ -84,7 +90,7 @@ }, "StreamingPull": { "timeout_millis": 900000, - "retry_codes_name": "none", + "retry_codes_name": "streaming_pull", "retry_params_name": "streaming_messaging" }, "ModifyPushConfig": { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 5d4ea7fda2c..6c433b7d511 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-11-12T12:21:39.195123Z", + "updateTime": "2019-11-19T12:24:12.897704Z", "sources": [ { "generator": { "name": "artman", - "version": "0.41.1", - "dockerImage": "googleapis/artman@sha256:545c758c76c3f779037aa259023ec3d1ef2d57d2c8cd00a222cb187d63ceac5e" + "version": "0.42.1", + "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "f69562be0608904932bdcfbc5ad8b9a22d9dceb8", - "internalRef": "279774957" + "sha": "d8dd7fe8d5304f7bd1c52207703d7f27d5328c5a", + "internalRef": "281088257" } }, { From e59ff14cb0e8299b5e0a04da8e56426ad7e49e4d Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 25 Nov 2019 08:58:48 -0800 Subject: [PATCH 0540/1115] chore: update license headers (#828) --- handwritten/pubsub/bin/benchwrapper.js | 28 +++++++++++------------ handwritten/pubsub/system-test/install.ts | 28 +++++++++++------------ handwritten/pubsub/system-test/pubsub.ts | 28 +++++++++++------------ handwritten/pubsub/test/histogram.ts | 28 +++++++++++------------ handwritten/pubsub/test/iam.ts | 28 +++++++++++------------ handwritten/pubsub/test/index.ts | 28 +++++++++++------------ handwritten/pubsub/test/publisher.ts | 28 +++++++++++------------ handwritten/pubsub/test/pubsub.ts | 28 +++++++++++------------ handwritten/pubsub/test/pull-retry.ts | 28 +++++++++++------------ handwritten/pubsub/test/snapshot.ts | 28 +++++++++++------------ handwritten/pubsub/test/subscription.ts | 28 +++++++++++------------ handwritten/pubsub/test/topic.ts | 28 +++++++++++------------ 12 files changed, 156 insertions(+), 180 deletions(-) diff --git a/handwritten/pubsub/bin/benchwrapper.js b/handwritten/pubsub/bin/benchwrapper.js index 30efd87c65c..d4571051d6a 100644 --- a/handwritten/pubsub/bin/benchwrapper.js +++ b/handwritten/pubsub/bin/benchwrapper.js @@ -1,18 +1,16 @@ -/** - * Copyright 2019 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. const grpc = require('grpc'); const protoLoader = require('@grpc/proto-loader'); diff --git a/handwritten/pubsub/system-test/install.ts b/handwritten/pubsub/system-test/install.ts index 7b1d95480a5..58495a7467b 100644 --- a/handwritten/pubsub/system-test/install.ts +++ b/handwritten/pubsub/system-test/install.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2019 Google LLC. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as execa from 'execa'; import * as mv from 'mv'; diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 4850725b344..af62304872a 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2014 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as assert from 'assert'; import * as crypto from 'crypto'; diff --git a/handwritten/pubsub/test/histogram.ts b/handwritten/pubsub/test/histogram.ts index 5d816eca4f5..3726dac1707 100644 --- a/handwritten/pubsub/test/histogram.ts +++ b/handwritten/pubsub/test/histogram.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2017 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2017 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as assert from 'assert'; import {Histogram} from '../src/histogram.js'; diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index c2d980e3d5c..31c64b9710c 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2014 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as promisify from '@google-cloud/promisify'; import * as assert from 'assert'; diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index ae7927ba697..9245e5fe550 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2019 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as assert from 'assert'; import * as pubsub from '../src'; diff --git a/handwritten/pubsub/test/publisher.ts b/handwritten/pubsub/test/publisher.ts index 0e9966f97a7..ea3a2ce064c 100644 --- a/handwritten/pubsub/test/publisher.ts +++ b/handwritten/pubsub/test/publisher.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2017 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2017 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 66150c08613..cefb8b97672 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2014 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as pjy from '@google-cloud/projectify'; import * as promisify from '@google-cloud/promisify'; diff --git a/handwritten/pubsub/test/pull-retry.ts b/handwritten/pubsub/test/pull-retry.ts index ea844c490c5..d272566d3d7 100644 --- a/handwritten/pubsub/test/pull-retry.ts +++ b/handwritten/pubsub/test/pull-retry.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2019 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import assert = require('assert'); import sinon = require('sinon'); diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 44f9f5bfa00..8f4f614a9e5 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2014 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 4ee0c4dc1ea..c5ce505cfc3 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2014 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 695dfd3a9cf..9433de8c3a6 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -1,18 +1,16 @@ -/** - * Copyright 2014 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2014 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; From 0d26f3c8ec4358e251d2f055c2f517dbb93d1e2b Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Thu, 5 Dec 2019 10:45:58 -0800 Subject: [PATCH 0541/1115] fix(deps): pin TypeScript below 3.7.0 --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7326d9d7250..859ef0505e5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -99,7 +99,7 @@ "proxyquire": "^2.0.0", "sinon": "^7.1.1", "source-map-support": "^0.5.9", - "typescript": "~3.6.0", + "typescript": "3.6.4", "uuid": "^3.1.0", "yargs": "^15.0.0" } From 93c19835afa789cf81a7766a657a918a9165978a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 14:09:57 -0800 Subject: [PATCH 0542/1115] chore: release 1.1.6 (#822) --- handwritten/pubsub/CHANGELOG.md | 10 ++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 28f38e9d94b..17bfd199736 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,16 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [1.1.6](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.5...v1.1.6) (2019-11-25) + + +### Bug Fixes + +* **deps:** update dependency yargs to v15 ([#820](https://www.github.com/googleapis/nodejs-pubsub/issues/820)) ([3615211](https://www.github.com/googleapis/nodejs-pubsub/commit/36152114829c384a97b4f19b9006704a0f216878)) +* **docs:** snippets are now replaced in jsdoc comments ([#815](https://www.github.com/googleapis/nodejs-pubsub/issues/815)) ([b0b26ad](https://www.github.com/googleapis/nodejs-pubsub/commit/b0b26ade6096aa39fbc36a5c270982f3b6f9192e)) +* adds streaming pull retry, and increases request thresholds ([a7d4d04](https://www.github.com/googleapis/nodejs-pubsub/commit/a7d4d04c1b728e3d29626656889da0dd747b94ce)) +* include long import in proto typescript declaration file ([#816](https://www.github.com/googleapis/nodejs-pubsub/issues/816)) ([4b3b813](https://www.github.com/googleapis/nodejs-pubsub/commit/4b3b81384ad4e46f75ee23f3b174842ada212bfe)) + ### [1.1.5](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.4...v1.1.5) (2019-10-22) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 859ef0505e5..6bac091c70c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.1.5", + "version": "1.1.6", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From aa47f72145928847423bb147c2b73ff6848a8244 Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 12 Dec 2019 16:08:22 -0500 Subject: [PATCH 0543/1115] test(system): fix snapshot tests (#827) --- handwritten/pubsub/system-test/pubsub.ts | 56 ++++++++++++------------ 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index af62304872a..7ac3fde4670 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -707,46 +707,44 @@ describe('pubsub', () => { describe('seeking', () => { let subscription: Subscription; + let snapshot: Snapshot; let messageId: string; const snapshotName = generateSnapshotName(); beforeEach(async () => { subscription = topic.subscription(generateSubName()); - await subscription.create(); - messageId = await topic.publish(Buffer.from('Hello, world!')); - // The first call to `createSnapshot` consistently fails, - // see: https://github.com/googleapis/nodejs-pubsub/issues/821 - try { - await subscription.createSnapshot(snapshotName); - } catch (err) { - console.warn(err.message); - } + snapshot = subscription.snapshot(generateSnapshotName()); + + return subscription + .create() + .then(() => { + return snapshot.create(); + }) + .then(() => { + return topic.publish(Buffer.from('Hello, world!')); + }) + .then(_messageId => { + messageId = _messageId; + }); }); it('should seek to a snapshot', done => { - subscription.createSnapshot(snapshotName, (err, snapshot) => { - assert.ifError(err); - - let messageCount = 0; - - subscription.on('error', done); - subscription.on('message', message => { - if (message.id !== messageId) { - return; - } + let messageCount = 0; - message.ack(); + subscription.on('error', done); + subscription.on('message', message => { + if (message.id !== messageId) { + return; + } + message.ack(); - if (++messageCount === 1) { - snapshot!.seek(err => { - assert.ifError(err); - }); - return; - } + if (++messageCount === 1) { + snapshot!.seek(assert.ifError); + return; + } - assert.strictEqual(messageCount, 2); - subscription.close(done); - }); + assert.strictEqual(messageCount, 2); + subscription.close(done); }); }); From 09fdbbf83b0fb3ab43f250698dfd259f64a6e0a0 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Fri, 13 Dec 2019 14:16:00 -0500 Subject: [PATCH 0544/1115] feat: ordered messaging (#716) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/publisher.ts | 319 - handwritten/pubsub/src/publisher/index.ts | 202 + .../pubsub/src/publisher/message-batch.ts | 98 + .../pubsub/src/publisher/message-queues.ts | 301 + .../pubsub/src/publisher/publish-error.ts | 74 + handwritten/pubsub/src/topic.ts | 136 +- .../fixtures/ordered-messages.json | 60031 ++++++++++++++++ handwritten/pubsub/system-test/pubsub.ts | 118 +- handwritten/pubsub/test/publisher.ts | 435 - handwritten/pubsub/test/publisher/index.ts | 315 + .../pubsub/test/publisher/message-batch.ts | 176 + .../pubsub/test/publisher/message-queues.ts | 661 + .../pubsub/test/publisher/publish-error.ts | 61 + handwritten/pubsub/test/topic.ts | 76 +- handwritten/pubsub/tsconfig.json | 4 +- 16 files changed, 62193 insertions(+), 816 deletions(-) delete mode 100644 handwritten/pubsub/src/publisher.ts create mode 100644 handwritten/pubsub/src/publisher/index.ts create mode 100644 handwritten/pubsub/src/publisher/message-batch.ts create mode 100644 handwritten/pubsub/src/publisher/message-queues.ts create mode 100644 handwritten/pubsub/src/publisher/publish-error.ts create mode 100644 handwritten/pubsub/system-test/fixtures/ordered-messages.json delete mode 100644 handwritten/pubsub/test/publisher.ts create mode 100644 handwritten/pubsub/test/publisher/index.ts create mode 100644 handwritten/pubsub/test/publisher/message-batch.ts create mode 100644 handwritten/pubsub/test/publisher/message-queues.ts create mode 100644 handwritten/pubsub/test/publisher/publish-error.ts diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6bac091c70c..20519b4512a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -31,7 +31,7 @@ "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", - "test": "c8 mocha build/test", + "test": "c8 mocha build/test/*{,/*}.js", "lint": "eslint '**/*.js' && gts check", "predocs": "npm run compile", "docs": "jsdoc -c .jsdoc.js", diff --git a/handwritten/pubsub/src/publisher.ts b/handwritten/pubsub/src/publisher.ts deleted file mode 100644 index 613d3de2cb8..00000000000 --- a/handwritten/pubsub/src/publisher.ts +++ /dev/null @@ -1,319 +0,0 @@ -/*! - * Copyright 2017 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import {promisifyAll} from '@google-cloud/promisify'; -import arrify = require('arrify'); -import {CallOptions} from 'google-gax'; -import {google} from '../proto/pubsub'; - -const each = require('async-each'); -import * as extend from 'extend'; -import is from '@sindresorhus/is'; -import {Topic} from './topic'; -import {RequestCallback} from './pubsub'; - -interface Inventory { - callbacks: PublishCallback[]; - queued: google.pubsub.v1.IPubsubMessage[]; - bytes: number; -} - -export interface Attributes { - [key: string]: string; -} -export type PublishCallback = RequestCallback; - -export interface BatchPublishOptions { - maxBytes?: number; - maxMessages?: number; - maxMilliseconds?: number; -} - -export interface PublishOptions { - batching?: BatchPublishOptions; - gaxOpts?: CallOptions; -} - -/** - * @typedef BatchPublishOptions - * @property {number} [maxBytes=1024^2 * 5] The maximum number of bytes to - * buffer before sending a payload. - * @property {number} [maxMessages=1000] The maximum number of messages to - * buffer before sending a payload. - * @property {number} [maxMilliseconds=100] The maximum duration to wait before - * sending a payload. - */ -/** - * @typedef PublishOptions - * @property {BatchPublishOptions} [batching] Batching settings. - * @property {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. - */ -/** - * A Publisher object allows you to publish messages to a specific topic. - * - * @private - * @class - * - * @see [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} - * - * @param {Topic} topic The topic associated with this publisher. - * @param {PublishOptions} [options] Configuration object. - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const publisher = topic.publisher(); - */ -export class Publisher { - // tslint:disable-next-line variable-name - Promise?: PromiseConstructor; - topic: Topic; - inventory_: Inventory; - settings!: PublishOptions; - timeoutHandle_?: NodeJS.Timer; - constructor(topic: Topic, options?: PublishOptions) { - if (topic.Promise) { - this.Promise = topic.Promise; - } - - this.setOptions(options); - - this.topic = topic; - // this object keeps track of all messages scheduled to be published - // queued is essentially the `messages` field for the publish rpc req opts - // bytes is used to track the size of the combined payload - // callbacks is an array of callbacks - each callback is associated with a - // specific message. - this.inventory_ = { - callbacks: [], - queued: [], - bytes: 0, - }; - } - /** - * @typedef {array} PublishResponse - * @property {string} 0 The id for the message. - */ - /** - * @callback PublishCallback - * @param {?Error} err Request error, if any. - * @param {string} messageId The id for the message. - */ - /** - * Publish the provided message. - * - * @private - * - * @throws {TypeError} If data is not a Buffer object. - * @throws {TypeError} If any value in `attributes` object is not a string. - * - * @param {buffer} data The message data. This must come in the form of a - * Buffer object. - * @param {object.} [attributes] Attributes for this message. - * @param {PublishCallback} [callback] Callback function. - * @returns {Promise} - * - * @example - * const {PubSub} = require('@google-cloud/pubsub'); - * const pubsub = new PubSub(); - * - * const topic = pubsub.topic('my-topic'); - * const publisher = topic.publisher(); - * - * const data = Buffer.from('Hello, world!'); - * - * const callback = (err, messageId) => { - * if (err) { - * // Error handling omitted. - * } - * }; - * - * publisher.publish(data, callback); - * - * //- - * // Optionally you can provide an object containing attributes for the - * // message. Note that all values in the object must be strings. - * //- - * const attributes = { - * key: 'value' - * }; - * - * publisher.publish(data, attributes, callback); - * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- - * publisher.publish(data).then((messageId) => {}); - */ - publish(data: Buffer, attributes?: Attributes): Promise; - publish(data: Buffer, callback: PublishCallback): void; - publish( - data: Buffer, - attributes: Attributes, - callback: PublishCallback - ): void; - publish( - data: Buffer, - attributesOrCallback?: Attributes | PublishCallback, - callback?: PublishCallback - ): Promise | void { - if (!(data instanceof Buffer)) { - throw new TypeError('Data must be in the form of a Buffer.'); - } - - const attributes = - typeof attributesOrCallback === 'object' ? attributesOrCallback : {}; - callback = - typeof attributesOrCallback === 'function' - ? attributesOrCallback - : callback; - // Ensure the `attributes` object only has string values - for (const key of Object.keys(attributes)) { - const value = attributes[key]; - if (!is.string(value)) { - throw new TypeError(`All attributes must be in the form of a string. -\nInvalid value of type "${typeof value}" provided for "${key}".`); - } - } - - const opts = this.settings!.batching!; - // if this message puts us over the maxBytes option, then let's ship - // what we have and add it to the next batch - if ( - this.inventory_.bytes > 0 && - this.inventory_.bytes + data.length > opts.maxBytes! - ) { - this.publish_(); - } - // add it to the queue! - this.queue_(data, attributes, callback!); - // next lets check if this message brings us to the message cap or if we - // hit the max byte limit - const hasMaxMessages = this.inventory_.queued.length === opts.maxMessages; - if (this.inventory_.bytes >= opts.maxBytes! || hasMaxMessages) { - this.publish_(); - return; - } - // otherwise let's set a timeout to send the next batch - if (!this.timeoutHandle_) { - this.timeoutHandle_ = setTimeout( - this.publish_.bind(this), - opts.maxMilliseconds! - ); - } - } - /** - * Sets the Publisher options. - * - * @private - * - * @param {PublishOptions} options The publisher options. - */ - setOptions(options = {} as PublishOptions): void { - const defaults = { - batching: { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 100, - }, - }; - - const {batching, gaxOpts} = extend(true, defaults, options); - - this.settings = { - batching: { - maxBytes: Math.min(batching.maxBytes, Math.pow(1024, 2) * 9), - maxMessages: Math.min(batching.maxMessages, 1000), - maxMilliseconds: batching.maxMilliseconds, - }, - gaxOpts, - }; - } - /** - * This publishes a batch of messages and should never be called directly. - * - * @private - */ - publish_() { - const callbacks = this.inventory_.callbacks; - const messages = this.inventory_.queued; - this.inventory_.callbacks = []; - this.inventory_.queued = []; - this.inventory_.bytes = 0; - - if (this.timeoutHandle_) { - clearTimeout(this.timeoutHandle_); - delete this.timeoutHandle_; - } - - const reqOpts = { - topic: this.topic.name, - messages, - }; - this.topic.request( - { - client: 'PublisherClient', - method: 'publish', - reqOpts, - gaxOpts: this.settings!.gaxOpts!, - }, - (err, resp) => { - const messageIds = arrify(resp! && resp!.messageIds!); - each(callbacks, (callback: PublishCallback, next: Function) => { - const messageId = messageIds[callbacks.indexOf(callback)]; - callback(err, messageId); - next(); - }); - } - ); - } - /** - * Queues message to be sent to the server. - * - * @private - * - * @param {buffer} data The message data. - * @param {object} attributes The message attributes. - * @param {function} callback The callback function. - */ - queue_(data: Buffer, attrs: Attributes): Promise; - queue_(data: Buffer, attrs: Attributes, callback: PublishCallback): void; - queue_( - data: Buffer, - attrs: Attributes, - callback?: PublishCallback - ): void | Promise { - this.inventory_.queued.push({ - data, - attributes: attrs, - }); - this.inventory_.bytes += data.length; - this.inventory_.callbacks.push(callback!); - } -} - -/*! Developer Documentation - * - * All async methods (except for streams) will return a Promise in the event - * that a callback is omitted. - */ -promisifyAll(Publisher, { - singular: true, - exclude: ['setOptions'], -}); diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts new file mode 100644 index 00000000000..26c3704cb38 --- /dev/null +++ b/handwritten/pubsub/src/publisher/index.ts @@ -0,0 +1,202 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {promisifyAll} from '@google-cloud/promisify'; +import * as extend from 'extend'; +import {CallOptions} from 'google-gax'; + +import {MessageBatch, BatchPublishOptions} from './message-batch'; +import {Queue, OrderedQueue} from './message-queues'; +import {Topic} from '../topic'; +import {RequestCallback} from '../pubsub'; +import {google} from '../../proto/pubsub'; + +export type PubsubMessage = google.pubsub.v1.IPubsubMessage; + +export interface Attributes { + [key: string]: string; +} + +export type PublishCallback = RequestCallback; + +export interface PublishOptions { + batching?: BatchPublishOptions; + gaxOpts?: CallOptions; + messageOrdering?: boolean; +} + +export const BATCH_LIMITS: BatchPublishOptions = { + maxBytes: Math.pow(1024, 2) * 9, + maxMessages: 1000, +}; + +/** + * A Publisher object allows you to publish messages to a specific topic. + * + * @private + * @class + * + * @see [Topics: publish API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/publish} + * + * @param {Topic} topic The topic associated with this publisher. + * @param {PublishOptions} [options] Configuration object. + */ +export class Publisher { + // tslint:disable-next-line variable-name + Promise?: PromiseConstructor; + topic: Topic; + settings!: PublishOptions; + queue: Queue; + orderedQueues: Map; + constructor(topic: Topic, options?: PublishOptions) { + if (topic.Promise) { + this.Promise = topic.Promise; + } + + this.setOptions(options); + this.topic = topic; + this.queue = new Queue(this); + this.orderedQueues = new Map(); + } + publish(data: Buffer, attributes?: Attributes): Promise; + publish(data: Buffer, callback: PublishCallback): void; + publish( + data: Buffer, + attributes: Attributes, + callback: PublishCallback + ): void; + /** + * Publish the provided message. + * + * @deprecated use {@link Publisher#publishMessage} instead. + * + * @private + * @see Publisher#publishMessage + * + * @param {buffer} data The message data. This must come in the form of a + * Buffer object. + * @param {object.} [attributes] Attributes for this message. + * @param {PublishCallback} [callback] Callback function. + * @returns {Promise} + */ + publish( + data: Buffer, + attrsOrCb?: Attributes | PublishCallback, + callback?: PublishCallback + ): Promise | void { + const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; + callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; + return this.publishMessage({data, attributes}, callback!); + } + /** + * Publish the provided message. + * + * @private + * + * @throws {TypeError} If data is not a Buffer object. + * @throws {TypeError} If any value in `attributes` object is not a string. + * + * @param {PubsubMessage} [message] Options for this message. + * @param {PublishCallback} [callback] Callback function. + */ + publishMessage(message: PubsubMessage, callback: PublishCallback): void { + const {data, attributes = {}} = message; + + if (!(data instanceof Buffer)) { + throw new TypeError('Data must be in the form of a Buffer.'); + } + + for (const key of Object.keys(attributes!)) { + const value = attributes![key]; + if (typeof value !== 'string') { + throw new TypeError(`All attributes must be in the form of a string. +\nInvalid value of type "${typeof value}" provided for "${key}".`); + } + } + + if (!message.orderingKey) { + this.queue.add(message, callback); + return; + } + + const key = message.orderingKey; + + if (!this.orderedQueues.has(key)) { + const queue = new OrderedQueue(this, key); + this.orderedQueues.set(key, queue); + queue.once('drain', () => this.orderedQueues.delete(key)); + } + + const queue = this.orderedQueues.get(key)!; + queue.add(message, callback); + } + /** + * Indicates to the publisher that it is safe to continue publishing for the + * supplied ordering key. + * + * @private + * + * @param {string} key The ordering key to continue publishing for. + */ + resumePublishing(key: string) { + const queue = this.orderedQueues.get(key); + + if (queue) { + queue.resumePublishing(); + } + } + /** + * Sets the Publisher options. + * + * @private + * + * @param {PublishOptions} options The publisher options. + */ + setOptions(options = {} as PublishOptions): void { + const defaults = { + batching: { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 100, + }, + messageOrdering: false, + gaxOpts: { + isBundling: false, + }, + }; + + const {batching, gaxOpts, messageOrdering} = extend( + true, + defaults, + options + ); + + this.settings = { + batching: { + maxBytes: Math.min(batching.maxBytes, BATCH_LIMITS.maxBytes!), + maxMessages: Math.min(batching.maxMessages, BATCH_LIMITS.maxMessages!), + maxMilliseconds: batching.maxMilliseconds, + }, + gaxOpts, + messageOrdering, + }; + } +} + +promisifyAll(Publisher, { + singular: true, + exclude: ['publish', 'setOptions'], +}); diff --git a/handwritten/pubsub/src/publisher/message-batch.ts b/handwritten/pubsub/src/publisher/message-batch.ts new file mode 100644 index 00000000000..bb2a4862af3 --- /dev/null +++ b/handwritten/pubsub/src/publisher/message-batch.ts @@ -0,0 +1,98 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {BATCH_LIMITS, PubsubMessage, PublishCallback} from './'; + +export interface BatchPublishOptions { + maxBytes?: number; + maxMessages?: number; + maxMilliseconds?: number; +} + +/** + * @typedef BatchPublishOptions + * @property {number} [maxBytes=1024^2 * 5] The maximum number of bytes to + * buffer before sending a payload. + * @property {number} [maxMessages=1000] The maximum number of messages to + * buffer before sending a payload. + * @property {number} [maxMilliseconds=100] The maximum duration to wait before + * sending a payload. + */ +/** + * Call used to help batch messages. + * + * @private + * + * @param {BatchPublishOptions} options The batching options. + */ +export class MessageBatch { + options: BatchPublishOptions; + messages: PubsubMessage[]; + callbacks: PublishCallback[]; + created: number; + bytes: number; + constructor(options: BatchPublishOptions) { + this.options = options; + this.messages = []; + this.callbacks = []; + this.created = Date.now(); + this.bytes = 0; + } + /** + * Adds a message to the current batch. + * + * @param {object} message The message to publish. + * @param {PublishCallback} callback The callback function. + */ + add(message: PubsubMessage, callback: PublishCallback): void { + this.messages.push(message); + this.callbacks.push(callback); + this.bytes += message.data!.length; + } + /** + * Indicates if a given message can fit in the batch. + * + * @param {object} message The message in question. + * @returns {boolean} + */ + canFit({data}: PubsubMessage): boolean { + const {maxMessages, maxBytes} = this.options; + return ( + this.messages.length < maxMessages! && + this.bytes + data!.length <= maxBytes! + ); + } + /** + * Checks to see if this batch is at the maximum allowed payload size. + * When publishing ordered messages, it is ok to exceed the user configured + * thresholds while a batch is in flight. + * + * @returns {boolean} + */ + isAtMax(): boolean { + const {maxMessages, maxBytes} = BATCH_LIMITS; + return this.messages.length >= maxMessages! || this.bytes >= maxBytes!; + } + /** + * Indicates if the batch is at capacity. + * + * @returns {boolean} + */ + isFull(): boolean { + const {maxMessages, maxBytes} = this.options; + return this.messages.length >= maxMessages! || this.bytes >= maxBytes!; + } +} diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts new file mode 100644 index 00000000000..0886d3624f0 --- /dev/null +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -0,0 +1,301 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {ServiceError} from '@grpc/grpc-js'; +import {EventEmitter} from 'events'; + +import {BatchPublishOptions, MessageBatch} from './message-batch'; +import {PublishError} from './publish-error'; +import {Publisher, PubsubMessage, PublishCallback, BATCH_LIMITS} from './'; +import {google} from '../../proto/pubsub'; + +export interface PublishDone { + (err: ServiceError | null): void; +} + +/** + * Queues are used to manage publishing batches of messages. + * + * @private + * + * @param {Publisher} publisher The parent publisher. + */ +export abstract class MessageQueue extends EventEmitter { + batchOptions: BatchPublishOptions; + publisher: Publisher; + pending?: NodeJS.Timer; + constructor(publisher: Publisher) { + super(); + this.publisher = publisher; + this.batchOptions = publisher.settings.batching!; + } + /** + * Adds a message to the queue. + * + * @abstract + * + * @param {object} message The message to publish. + * @param {PublishCallback} callback The publish callback. + */ + abstract add(message: PubsubMessage, callback: PublishCallback): void; + /** + * Method to initiate publishing. + * + * @abstract + */ + abstract publish(): void; + /** + * Accepts a batch of messages and publishes them to the API. + * + * @param {object[]} messages The messages to publish. + * @param {PublishCallback[]} callbacks The corresponding callback functions. + * @param {function} [callback] Callback to be fired when publish is done. + */ + _publish( + messages: PubsubMessage[], + callbacks: PublishCallback[], + callback?: PublishDone + ): void { + const {topic, settings} = this.publisher; + const reqOpts = { + topic: topic.name, + messages, + }; + + topic.request( + { + client: 'PublisherClient', + method: 'publish', + reqOpts, + gaxOpts: settings.gaxOpts!, + }, + (err, resp) => { + const messageIds = (resp && resp.messageIds) || []; + callbacks.forEach((callback, i) => callback(err, messageIds[i])); + + if (typeof callback === 'function') { + callback(err); + } + } + ); + } +} + +/** + * Standard message queue used for publishing messages. + * + * @private + * @extends MessageQueue + * + * @param {Publisher} publisher The publisher. + */ +export class Queue extends MessageQueue { + batch: MessageBatch; + constructor(publisher: Publisher) { + super(publisher); + this.batch = new MessageBatch(this.batchOptions); + } + /** + * Adds a message to the queue. + * + * @param {PubsubMessage} message The message to publish. + * @param {PublishCallback} callback The publish callback. + */ + add(message: PubsubMessage, callback: PublishCallback): void { + if (!this.batch.canFit(message)) { + this.publish(); + } + + this.batch.add(message, callback); + + if (this.batch.isFull()) { + this.publish(); + } else if (!this.pending) { + const {maxMilliseconds} = this.batchOptions; + this.pending = setTimeout(() => this.publish(), maxMilliseconds!); + } + } + /** + * Cancels any pending publishes and calls _publish immediately. + */ + publish(): void { + const {messages, callbacks} = this.batch; + + this.batch = new MessageBatch(this.batchOptions); + + if (this.pending) { + clearTimeout(this.pending); + delete this.pending; + } + + this._publish(messages, callbacks); + } +} + +/** + * Queue for handling ordered messages. Unlike the standard queue, this + * ensures that batches are published one at a time and throws an exception in + * the event that any batch fails to publish. + * + * @private + * @extends MessageQueue + * + * @param {Publisher} publisher The publisher. + * @param {string} key The key used to order the messages. + */ +export class OrderedQueue extends MessageQueue { + batches: MessageBatch[]; + inFlight: boolean; + error?: null | PublishError; + key: string; + constructor(publisher: Publisher, key: string) { + super(publisher); + this.batches = []; + this.inFlight = false; + this.key = key; + } + /** + * Reference to the batch we're currently filling. + * @returns {MessageBatch} + */ + get currentBatch(): MessageBatch { + if (!this.batches.length) { + this.batches.push(this.createBatch()); + } + return this.batches[0]; + } + /** + * Adds a message to a batch, creating a new batch if need be. + * + * @param {object} message The message to publish. + * @param {PublishCallback} callback The publish callback. + */ + add(message: PubsubMessage, callback: PublishCallback): void { + if (this.error) { + callback(this.error); + return; + } + + if (this.inFlight) { + // in the event that a batch is currently in flight, we can overfill + // the next batch as long as it hasn't hit the API limit + if (this.currentBatch.isAtMax()) { + this.batches.unshift(this.createBatch()); + } + + this.currentBatch.add(message, callback); + return; + } + + if (!this.currentBatch.canFit(message)) { + this.publish(); + } + + this.currentBatch.add(message, callback); + + // it is possible that we triggered a publish earlier, so we'll need to + // check again here + if (!this.inFlight) { + if (this.currentBatch.isFull()) { + this.publish(); + } else if (!this.pending) { + this.beginNextPublish(); + } + } + } + /** + * Starts a timeout to publish any pending messages. + */ + beginNextPublish(): void { + const maxMilliseconds = this.batchOptions.maxMilliseconds!; + const timeWaiting = Date.now() - this.currentBatch.created; + const delay = Math.max(0, maxMilliseconds - timeWaiting); + + this.pending = setTimeout(() => this.publish(), delay); + } + /** + * Creates a new {@link MessageBatch} instance. + * + * @returns {MessageBatch} + */ + createBatch() { + return new MessageBatch(this.batchOptions); + } + /** + * In the event of a publish failure, we need to cache the error in question + * and reject all pending publish calls, prompting the user to call + * {@link OrderedQueue#resumePublishing}. + * + * @param {Error} err The publishing error. + */ + handlePublishFailure(err: ServiceError): void { + this.error = new PublishError(this.key, err); + + // reject all pending publishes + while (this.batches.length) { + const {callbacks} = this.batches.pop()!; + callbacks.forEach(callback => callback(err)); + } + } + /** + * Publishes the messages. If successful it will prepare the next batch to be + * published immediately after. If an error occurs, it will reject all + * pending messages. In the event that no pending messages/batches are left, + * a "drain" event will be fired, indicating to the publisher that it is + * safe to delete this queue. + * + * @fires OrderedQueue#drain + */ + publish(): void { + this.inFlight = true; + + if (this.pending) { + clearTimeout(this.pending); + delete this.pending; + } + + const {messages, callbacks} = this.batches.pop()!; + + this._publish(messages, callbacks, (err: null | ServiceError) => { + this.inFlight = false; + + if (err) { + this.handlePublishFailure(err); + } else if (this.batches.length) { + this.beginNextPublish(); + } else { + this.emit('drain'); + } + }); + } + + /** + * Tells the queue it is ok to continue publishing messages. + */ + resumePublishing(): void { + delete this.error; + + // once this is called, we'll make this object eligible for garbage + // collection. by wrapping in nextTick() we'll give users an opportunity + // to use it again instead of deleting instantly and then creating a new + // instance. + process.nextTick(() => { + if (!this.batches.length) { + this.emit('drain'); + } + }); + } +} diff --git a/handwritten/pubsub/src/publisher/publish-error.ts b/handwritten/pubsub/src/publisher/publish-error.ts new file mode 100644 index 00000000000..6a2bd650793 --- /dev/null +++ b/handwritten/pubsub/src/publisher/publish-error.ts @@ -0,0 +1,74 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {ServiceError, Metadata, status} from '@grpc/grpc-js'; + +/** + * Exception to be thrown during failed ordered publish. + * + * @class + * @extends Error + */ +export class PublishError extends Error implements ServiceError { + code: status; + details: string; + metadata: Metadata; + orderingKey: string; + error: ServiceError; + constructor(key: string, err: ServiceError) { + super(`Unable to publish for key "${key}". Reason: ${err.message}`); + + /** + * The gRPC status code. + * + * @name PublishError#code + * @type {number} + */ + this.code = err.code; + + /** + * The gRPC status details. + * + * @name PublishError#details + * @type {string} + */ + this.details = err.details; + + /** + * The gRPC metadata object. + * + * @name PublishError#metadata + * @type {object} + */ + this.metadata = err.metadata; + + /** + * The ordering key this failure occurred for. + * + * @name PublishError#orderingKey + * @type {string} + */ + this.orderingKey = key; + + /** + * The original gRPC error. + * + * @name PublishError#error + * @type {Error} + */ + this.error = err; + } +} diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 2d43e8a2c24..73f396cd520 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -27,6 +27,7 @@ import { PublishCallback, Publisher, PublishOptions, + PubsubMessage, } from './publisher'; import { EmptyCallback, @@ -80,18 +81,25 @@ export type GetTopicSubscriptionsResponse = PagedResponse< google.pubsub.v1.IListTopicSubscriptionsResponse >; +// tslint:disable-next-line no-any +export type MessageOptions = PubsubMessage & {json?: any}; + /** * A Topic object allows you to interact with a Cloud Pub/Sub topic. * * @class * @param {PubSub} pubsub PubSub object. * @param {string} name Name of the topic. + * @param {PublishOptions} [options] Publisher configuration object. * * @example * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); + * + * @example To enable message ordering, set `enableMessageOrdering` to true. Please note that this does not persist to an actual topic. + * const topic = pubsub.topic('ordered-topic', {enableMessageOrdering: true}); */ export class Topic { // tslint:disable-next-line variable-name @@ -602,6 +610,8 @@ export class Topic { /** * Publish the provided message. * + * @deprecated Please use {@link Topic#publishMessage}. + * * @throws {TypeError} If data is not a Buffer object. * @throws {TypeError} If any value in `attributes` object is not a string. * @@ -626,19 +636,14 @@ export class Topic { * * topic.publish(data, callback); * - * //- - * // Optionally you can provide an object containing attributes for the - * // message. Note that all values in the object must be strings. - * //- + * @example Optionally you can provide an object containing attributes for the message. Note that all values in the object must be strings. * const attributes = { * key: 'value' * }; * * topic.publish(data, attributes, callback); * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- + * @example If the callback is omitted, we'll return a Promise. * topic.publish(data).then((messageId) => {}); */ publish( @@ -648,7 +653,7 @@ export class Topic { ): Promise | void { const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; - return this.publisher.publish(data, attributes, callback!); + return this.publishMessage({data, attributes}, callback!); } publishJSON(json: object, attributes?: Attributes): Promise; @@ -665,7 +670,7 @@ export class Topic { * {@link Subscription} objects will always return message data in the form of * a Buffer, so any JSON published will require manual deserialization. * - * @see Topic#publish + * @deprecated Please use the `json` option via {@link Topic#publishMessage}. * * @throws {Error} If non-object data is provided. * @@ -691,19 +696,14 @@ export class Topic { * * topic.publishJSON(data, callback); * - * //- - * // Optionally you can provide an object containing attributes for the - * // message. Note that all values in the object must be strings. - * //- + * @example Optionally you can provide an object containing attributes for the message. Note that all values in the object must be strings. * const attributes = { * key: 'value' * }; * * topic.publishJSON(data, attributes, callback); * - * //- - * // If the callback is omitted, we'll return a Promise. - * //- + * @example If the callback is omitted, we'll return a Promise. * topic.publishJSON(data).then((messageId) => {}); */ publishJSON( @@ -717,8 +717,100 @@ export class Topic { const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; - const data = Buffer.from(JSON.stringify(json)); - return this.publish(data, attributes, callback!); + return this.publishMessage({json, attributes}, callback!); + } + + publishMessage(message: MessageOptions): Promise<[string]>; + publishMessage(message: MessageOptions, callback: PublishCallback): void; + /** + * @typedef {object} MessageOptions + * @property {buffer} [data] The message data. + * @property {object} [json] Convenience property to publish JSON data. This + * will transform the provided JSON into a Buffer before publishing. + * {@link Subscription} objects will always return message data in the + * form of a Buffer, so any JSON published will require manual + * deserialization. + * @property {object.} [attributes] Attributes for this + * message. + * @property {string} [orderingKey] A message ordering key. + */ + /** + * Publish the provided message. + * + * @throws {TypeError} If data is not a Buffer object. + * @throws {TypeError} If any value in `attributes` object is not a string. + * + * @param {MessageOptions} message Message object. + * @param {PublishCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * const topic = pubsub.topic('my-topic'); + * + * const data = Buffer.from('Hello, world!'); + * + * const callback = (err, messageId) => { + * if (err) { + * // Error handling omitted. + * } + * }; + * + * topic.publishMessage({data}, callback); + * + * @example Publish JSON message data. + * const json = {foo: 'bar'}; + * + * topic.publishMessage({json}, callback); + * + * @example To publish messages in order (this is still experimental), make sure message ordering is enabled and provide an ordering key + * const topic = pubsub.topic('ordered-topic', {messageOrdering: true}); + * const orderingKey = 'my-key'; + * + * topic.publishMessage({data, orderingKey}, callback); + * + * @example If the callback is omitted, we'll return a Promise. + * const [messageId] = await topic.publishMessage({data}); + */ + publishMessage( + message: MessageOptions, + callback?: PublishCallback + ): Promise<[string]> | void { + message = Object.assign({}, message); + + if (is.object(message.json)) { + message.data = Buffer.from(JSON.stringify(message.json)); + delete message.json; + } + + return this.publisher.publishMessage(message, callback!); + } + + /** + * In the event that the client fails to publish an ordered message, all + * subsequent publish calls using the same ordering key will fail. Calling + * this method will disregard the publish failure, allowing the supplied + * ordering key to be used again in the future. + * + * @param {string} orderingKey The ordering key in question. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * const topic = pubsub.topic('my-topic', {messageOrdering: true}); + * + * const orderingKey = 'foo'; + * const data = Buffer.from('Hello, order!'); + * + * topic.publishMessage({data, orderingKey}, err => { + * if (err) { + * topic.resumePublishing(orderingKey); + * } + * }); + */ + resumePublishing(orderingKey: string): void { + this.publisher.resumePublishing(orderingKey); } setMetadata( @@ -916,7 +1008,13 @@ paginator.extend(Topic, ['getSubscriptions']); * that a callback is omitted. */ promisifyAll(Topic, { - exclude: ['publish', 'publishJSON', 'setPublishOptions', 'subscription'], + exclude: [ + 'publish', + 'publishJSON', + 'publishMessage', + 'setPublishOptions', + 'subscription', + ], }); export {PublishOptions}; diff --git a/handwritten/pubsub/system-test/fixtures/ordered-messages.json b/handwritten/pubsub/system-test/fixtures/ordered-messages.json new file mode 100644 index 00000000000..295ecf88cb8 --- /dev/null +++ b/handwritten/pubsub/system-test/fixtures/ordered-messages.json @@ -0,0 +1,60031 @@ +{ + "input": [ + { + "key": "", + "message": "message1" + }, + { + "key": "AAA", + "message": "message2" + }, + { + "key": "BBB", + "message": "message3" + }, + { + "key": "CCC", + "message": "message4" + }, + { + "key": "DDD", + "message": "message5" + }, + { + "key": "", + "message": "message6" + }, + { + "key": "AAA", + "message": "message7" + }, + { + "key": "BBB", + "message": "message8" + }, + { + "key": "CCC", + "message": "message9" + }, + { + "key": "DDD", + "message": "message10" + }, + { + "key": "", + "message": "message11" + }, + { + "key": "AAA", + "message": "message12" + }, + { + "key": "BBB", + "message": "message13" + }, + { + "key": "CCC", + "message": "message14" + }, + { + "key": "DDD", + "message": "message15" + }, + { + "key": "", + "message": "message16" + }, + { + "key": "AAA", + "message": "message17" + }, + { + "key": "BBB", + "message": "message18" + }, + { + "key": "CCC", + "message": "message19" + }, + { + "key": "DDD", + "message": "message20" + }, + { + "key": "", + "message": "message21" + }, + { + "key": "AAA", + "message": "message22" + }, + { + "key": "BBB", + "message": "message23" + }, + { + "key": "CCC", + "message": "message24" + }, + { + "key": "DDD", + "message": "message25" + }, + { + "key": "", + "message": "message26" + }, + { + "key": "AAA", + "message": "message27" + }, + { + "key": "BBB", + "message": "message28" + }, + { + "key": "CCC", + "message": "message29" + }, + { + "key": "DDD", + "message": "message30" + }, + { + "key": "", + "message": "message31" + }, + { + "key": "AAA", + "message": "message32" + }, + { + "key": "BBB", + "message": "message33" + }, + { + "key": "CCC", + "message": "message34" + }, + { + "key": "DDD", + "message": "message35" + }, + { + "key": "", + "message": "message36" + }, + { + "key": "AAA", + "message": "message37" + }, + { + "key": "BBB", + "message": "message38" + }, + { + "key": "CCC", + "message": "message39" + }, + { + "key": "DDD", + "message": "message40" + }, + { + "key": "", + "message": "message41" + }, + { + "key": "AAA", + "message": "message42" + }, + { + "key": "BBB", + "message": "message43" + }, + { + "key": "CCC", + "message": "message44" + }, + { + "key": "DDD", + "message": "message45" + }, + { + "key": "", + "message": "message46" + }, + { + "key": "AAA", + "message": "message47" + }, + { + "key": "BBB", + "message": "message48" + }, + { + "key": "CCC", + "message": "message49" + }, + { + "key": "DDD", + "message": "message50" + }, + { + "key": "", + "message": "message51" + }, + { + "key": "AAA", + "message": "message52" + }, + { + "key": "BBB", + "message": "message53" + }, + { + "key": "CCC", + "message": "message54" + }, + { + "key": "DDD", + "message": "message55" + }, + { + "key": "", + "message": "message56" + }, + { + "key": "AAA", + "message": "message57" + }, + { + "key": "BBB", + "message": "message58" + }, + { + "key": "CCC", + "message": "message59" + }, + { + "key": "DDD", + "message": "message60" + }, + { + "key": "", + "message": "message61" + }, + { + "key": "AAA", + "message": "message62" + }, + { + "key": "BBB", + "message": "message63" + }, + { + "key": "CCC", + "message": "message64" + }, + { + "key": "DDD", + "message": "message65" + }, + { + "key": "", + "message": "message66" + }, + { + "key": "AAA", + "message": "message67" + }, + { + "key": "BBB", + "message": "message68" + }, + { + "key": "CCC", + "message": "message69" + }, + { + "key": "DDD", + "message": "message70" + }, + { + "key": "", + "message": "message71" + }, + { + "key": "AAA", + "message": "message72" + }, + { + "key": "BBB", + "message": "message73" + }, + { + "key": "CCC", + "message": "message74" + }, + { + "key": "DDD", + "message": "message75" + }, + { + "key": "", + "message": "message76" + }, + { + "key": "AAA", + "message": "message77" + }, + { + "key": "BBB", + "message": "message78" + }, + { + "key": "CCC", + "message": "message79" + }, + { + "key": "DDD", + "message": "message80" + }, + { + "key": "", + "message": "message81" + }, + { + "key": "AAA", + "message": "message82" + }, + { + "key": "BBB", + "message": "message83" + }, + { + "key": "CCC", + "message": "message84" + }, + { + "key": "DDD", + "message": "message85" + }, + { + "key": "", + "message": "message86" + }, + { + "key": "AAA", + "message": "message87" + }, + { + "key": "BBB", + "message": "message88" + }, + { + "key": "CCC", + "message": "message89" + }, + { + "key": "DDD", + "message": "message90" + }, + { + "key": "", + "message": "message91" + }, + { + "key": "AAA", + "message": "message92" + }, + { + "key": "BBB", + "message": "message93" + }, + { + "key": "CCC", + "message": "message94" + }, + { + "key": "DDD", + "message": "message95" + }, + { + "key": "", + "message": "message96" + }, + { + "key": "AAA", + "message": "message97" + }, + { + "key": "BBB", + "message": "message98" + }, + { + "key": "CCC", + "message": "message99" + }, + { + "key": "DDD", + "message": "message100" + }, + { + "key": "", + "message": "message101" + }, + { + "key": "AAA", + "message": "message102" + }, + { + "key": "BBB", + "message": "message103" + }, + { + "key": "CCC", + "message": "message104" + }, + { + "key": "DDD", + "message": "message105" + }, + { + "key": "", + "message": "message106" + }, + { + "key": "AAA", + "message": "message107" + }, + { + "key": "BBB", + "message": "message108" + }, + { + "key": "CCC", + "message": "message109" + }, + { + "key": "DDD", + "message": "message110" + }, + { + "key": "", + "message": "message111" + }, + { + "key": "AAA", + "message": "message112" + }, + { + "key": "BBB", + "message": "message113" + }, + { + "key": "CCC", + "message": "message114" + }, + { + "key": "DDD", + "message": "message115" + }, + { + "key": "", + "message": "message116" + }, + { + "key": "AAA", + "message": "message117" + }, + { + "key": "BBB", + "message": "message118" + }, + { + "key": "CCC", + "message": "message119" + }, + { + "key": "DDD", + "message": "message120" + }, + { + "key": "", + "message": "message121" + }, + { + "key": "AAA", + "message": "message122" + }, + { + "key": "BBB", + "message": "message123" + }, + { + "key": "CCC", + "message": "message124" + }, + { + "key": "DDD", + "message": "message125" + }, + { + "key": "", + "message": "message126" + }, + { + "key": "AAA", + "message": "message127" + }, + { + "key": "BBB", + "message": "message128" + }, + { + "key": "CCC", + "message": "message129" + }, + { + "key": "DDD", + "message": "message130" + }, + { + "key": "", + "message": "message131" + }, + { + "key": "AAA", + "message": "message132" + }, + { + "key": "BBB", + "message": "message133" + }, + { + "key": "CCC", + "message": "message134" + }, + { + "key": "DDD", + "message": "message135" + }, + { + "key": "", + "message": "message136" + }, + { + "key": "AAA", + "message": "message137" + }, + { + "key": "BBB", + "message": "message138" + }, + { + "key": "CCC", + "message": "message139" + }, + { + "key": "DDD", + "message": "message140" + }, + { + "key": "", + "message": "message141" + }, + { + "key": "AAA", + "message": "message142" + }, + { + "key": "BBB", + "message": "message143" + }, + { + "key": "CCC", + "message": "message144" + }, + { + "key": "DDD", + "message": "message145" + }, + { + "key": "", + "message": "message146" + }, + { + "key": "AAA", + "message": "message147" + }, + { + "key": "BBB", + "message": "message148" + }, + { + "key": "CCC", + "message": "message149" + }, + { + "key": "DDD", + "message": "message150" + }, + { + "key": "", + "message": "message151" + }, + { + "key": "AAA", + "message": "message152" + }, + { + "key": "BBB", + "message": "message153" + }, + { + "key": "CCC", + "message": "message154" + }, + { + "key": "DDD", + "message": "message155" + }, + { + "key": "", + "message": "message156" + }, + { + "key": "AAA", + "message": "message157" + }, + { + "key": "BBB", + "message": "message158" + }, + { + "key": "CCC", + "message": "message159" + }, + { + "key": "DDD", + "message": "message160" + }, + { + "key": "", + "message": "message161" + }, + { + "key": "AAA", + "message": "message162" + }, + { + "key": "BBB", + "message": "message163" + }, + { + "key": "CCC", + "message": "message164" + }, + { + "key": "DDD", + "message": "message165" + }, + { + "key": "", + "message": "message166" + }, + { + "key": "AAA", + "message": "message167" + }, + { + "key": "BBB", + "message": "message168" + }, + { + "key": "CCC", + "message": "message169" + }, + { + "key": "DDD", + "message": "message170" + }, + { + "key": "", + "message": "message171" + }, + { + "key": "AAA", + "message": "message172" + }, + { + "key": "BBB", + "message": "message173" + }, + { + "key": "CCC", + "message": "message174" + }, + { + "key": "DDD", + "message": "message175" + }, + { + "key": "", + "message": "message176" + }, + { + "key": "AAA", + "message": "message177" + }, + { + "key": "BBB", + "message": "message178" + }, + { + "key": "CCC", + "message": "message179" + }, + { + "key": "DDD", + "message": "message180" + }, + { + "key": "", + "message": "message181" + }, + { + "key": "AAA", + "message": "message182" + }, + { + "key": "BBB", + "message": "message183" + }, + { + "key": "CCC", + "message": "message184" + }, + { + "key": "DDD", + "message": "message185" + }, + { + "key": "", + "message": "message186" + }, + { + "key": "AAA", + "message": "message187" + }, + { + "key": "BBB", + "message": "message188" + }, + { + "key": "CCC", + "message": "message189" + }, + { + "key": "DDD", + "message": "message190" + }, + { + "key": "", + "message": "message191" + }, + { + "key": "AAA", + "message": "message192" + }, + { + "key": "BBB", + "message": "message193" + }, + { + "key": "CCC", + "message": "message194" + }, + { + "key": "DDD", + "message": "message195" + }, + { + "key": "", + "message": "message196" + }, + { + "key": "AAA", + "message": "message197" + }, + { + "key": "BBB", + "message": "message198" + }, + { + "key": "CCC", + "message": "message199" + }, + { + "key": "DDD", + "message": "message200" + }, + { + "key": "", + "message": "message201" + }, + { + "key": "AAA", + "message": "message202" + }, + { + "key": "BBB", + "message": "message203" + }, + { + "key": "CCC", + "message": "message204" + }, + { + "key": "DDD", + "message": "message205" + }, + { + "key": "", + "message": "message206" + }, + { + "key": "AAA", + "message": "message207" + }, + { + "key": "BBB", + "message": "message208" + }, + { + "key": "CCC", + "message": "message209" + }, + { + "key": "DDD", + "message": "message210" + }, + { + "key": "", + "message": "message211" + }, + { + "key": "AAA", + "message": "message212" + }, + { + "key": "BBB", + "message": "message213" + }, + { + "key": "CCC", + "message": "message214" + }, + { + "key": "DDD", + "message": "message215" + }, + { + "key": "", + "message": "message216" + }, + { + "key": "AAA", + "message": "message217" + }, + { + "key": "BBB", + "message": "message218" + }, + { + "key": "CCC", + "message": "message219" + }, + { + "key": "DDD", + "message": "message220" + }, + { + "key": "", + "message": "message221" + }, + { + "key": "AAA", + "message": "message222" + }, + { + "key": "BBB", + "message": "message223" + }, + { + "key": "CCC", + "message": "message224" + }, + { + "key": "DDD", + "message": "message225" + }, + { + "key": "", + "message": "message226" + }, + { + "key": "AAA", + "message": "message227" + }, + { + "key": "BBB", + "message": "message228" + }, + { + "key": "CCC", + "message": "message229" + }, + { + "key": "DDD", + "message": "message230" + }, + { + "key": "", + "message": "message231" + }, + { + "key": "AAA", + "message": "message232" + }, + { + "key": "BBB", + "message": "message233" + }, + { + "key": "CCC", + "message": "message234" + }, + { + "key": "DDD", + "message": "message235" + }, + { + "key": "", + "message": "message236" + }, + { + "key": "AAA", + "message": "message237" + }, + { + "key": "BBB", + "message": "message238" + }, + { + "key": "CCC", + "message": "message239" + }, + { + "key": "DDD", + "message": "message240" + }, + { + "key": "", + "message": "message241" + }, + { + "key": "AAA", + "message": "message242" + }, + { + "key": "BBB", + "message": "message243" + }, + { + "key": "CCC", + "message": "message244" + }, + { + "key": "DDD", + "message": "message245" + }, + { + "key": "", + "message": "message246" + }, + { + "key": "AAA", + "message": "message247" + }, + { + "key": "BBB", + "message": "message248" + }, + { + "key": "CCC", + "message": "message249" + }, + { + "key": "DDD", + "message": "message250" + }, + { + "key": "", + "message": "message251" + }, + { + "key": "AAA", + "message": "message252" + }, + { + "key": "BBB", + "message": "message253" + }, + { + "key": "CCC", + "message": "message254" + }, + { + "key": "DDD", + "message": "message255" + }, + { + "key": "", + "message": "message256" + }, + { + "key": "AAA", + "message": "message257" + }, + { + "key": "BBB", + "message": "message258" + }, + { + "key": "CCC", + "message": "message259" + }, + { + "key": "DDD", + "message": "message260" + }, + { + "key": "", + "message": "message261" + }, + { + "key": "AAA", + "message": "message262" + }, + { + "key": "BBB", + "message": "message263" + }, + { + "key": "CCC", + "message": "message264" + }, + { + "key": "DDD", + "message": "message265" + }, + { + "key": "", + "message": "message266" + }, + { + "key": "AAA", + "message": "message267" + }, + { + "key": "BBB", + "message": "message268" + }, + { + "key": "CCC", + "message": "message269" + }, + { + "key": "DDD", + "message": "message270" + }, + { + "key": "", + "message": "message271" + }, + { + "key": "AAA", + "message": "message272" + }, + { + "key": "BBB", + "message": "message273" + }, + { + "key": "CCC", + "message": "message274" + }, + { + "key": "DDD", + "message": "message275" + }, + { + "key": "", + "message": "message276" + }, + { + "key": "AAA", + "message": "message277" + }, + { + "key": "BBB", + "message": "message278" + }, + { + "key": "CCC", + "message": "message279" + }, + { + "key": "DDD", + "message": "message280" + }, + { + "key": "", + "message": "message281" + }, + { + "key": "AAA", + "message": "message282" + }, + { + "key": "BBB", + "message": "message283" + }, + { + "key": "CCC", + "message": "message284" + }, + { + "key": "DDD", + "message": "message285" + }, + { + "key": "", + "message": "message286" + }, + { + "key": "AAA", + "message": "message287" + }, + { + "key": "BBB", + "message": "message288" + }, + { + "key": "CCC", + "message": "message289" + }, + { + "key": "DDD", + "message": "message290" + }, + { + "key": "", + "message": "message291" + }, + { + "key": "AAA", + "message": "message292" + }, + { + "key": "BBB", + "message": "message293" + }, + { + "key": "CCC", + "message": "message294" + }, + { + "key": "DDD", + "message": "message295" + }, + { + "key": "", + "message": "message296" + }, + { + "key": "AAA", + "message": "message297" + }, + { + "key": "BBB", + "message": "message298" + }, + { + "key": "CCC", + "message": "message299" + }, + { + "key": "DDD", + "message": "message300" + }, + { + "key": "", + "message": "message301" + }, + { + "key": "AAA", + "message": "message302" + }, + { + "key": "BBB", + "message": "message303" + }, + { + "key": "CCC", + "message": "message304" + }, + { + "key": "DDD", + "message": "message305" + }, + { + "key": "", + "message": "message306" + }, + { + "key": "AAA", + "message": "message307" + }, + { + "key": "BBB", + "message": "message308" + }, + { + "key": "CCC", + "message": "message309" + }, + { + "key": "DDD", + "message": "message310" + }, + { + "key": "", + "message": "message311" + }, + { + "key": "AAA", + "message": "message312" + }, + { + "key": "BBB", + "message": "message313" + }, + { + "key": "CCC", + "message": "message314" + }, + { + "key": "DDD", + "message": "message315" + }, + { + "key": "", + "message": "message316" + }, + { + "key": "AAA", + "message": "message317" + }, + { + "key": "BBB", + "message": "message318" + }, + { + "key": "CCC", + "message": "message319" + }, + { + "key": "DDD", + "message": "message320" + }, + { + "key": "", + "message": "message321" + }, + { + "key": "AAA", + "message": "message322" + }, + { + "key": "BBB", + "message": "message323" + }, + { + "key": "CCC", + "message": "message324" + }, + { + "key": "DDD", + "message": "message325" + }, + { + "key": "", + "message": "message326" + }, + { + "key": "AAA", + "message": "message327" + }, + { + "key": "BBB", + "message": "message328" + }, + { + "key": "CCC", + "message": "message329" + }, + { + "key": "DDD", + "message": "message330" + }, + { + "key": "", + "message": "message331" + }, + { + "key": "AAA", + "message": "message332" + }, + { + "key": "BBB", + "message": "message333" + }, + { + "key": "CCC", + "message": "message334" + }, + { + "key": "DDD", + "message": "message335" + }, + { + "key": "", + "message": "message336" + }, + { + "key": "AAA", + "message": "message337" + }, + { + "key": "BBB", + "message": "message338" + }, + { + "key": "CCC", + "message": "message339" + }, + { + "key": "DDD", + "message": "message340" + }, + { + "key": "", + "message": "message341" + }, + { + "key": "AAA", + "message": "message342" + }, + { + "key": "BBB", + "message": "message343" + }, + { + "key": "CCC", + "message": "message344" + }, + { + "key": "DDD", + "message": "message345" + }, + { + "key": "", + "message": "message346" + }, + { + "key": "AAA", + "message": "message347" + }, + { + "key": "BBB", + "message": "message348" + }, + { + "key": "CCC", + "message": "message349" + }, + { + "key": "DDD", + "message": "message350" + }, + { + "key": "", + "message": "message351" + }, + { + "key": "AAA", + "message": "message352" + }, + { + "key": "BBB", + "message": "message353" + }, + { + "key": "CCC", + "message": "message354" + }, + { + "key": "DDD", + "message": "message355" + }, + { + "key": "", + "message": "message356" + }, + { + "key": "AAA", + "message": "message357" + }, + { + "key": "BBB", + "message": "message358" + }, + { + "key": "CCC", + "message": "message359" + }, + { + "key": "DDD", + "message": "message360" + }, + { + "key": "", + "message": "message361" + }, + { + "key": "AAA", + "message": "message362" + }, + { + "key": "BBB", + "message": "message363" + }, + { + "key": "CCC", + "message": "message364" + }, + { + "key": "DDD", + "message": "message365" + }, + { + "key": "", + "message": "message366" + }, + { + "key": "AAA", + "message": "message367" + }, + { + "key": "BBB", + "message": "message368" + }, + { + "key": "CCC", + "message": "message369" + }, + { + "key": "DDD", + "message": "message370" + }, + { + "key": "", + "message": "message371" + }, + { + "key": "AAA", + "message": "message372" + }, + { + "key": "BBB", + "message": "message373" + }, + { + "key": "CCC", + "message": "message374" + }, + { + "key": "DDD", + "message": "message375" + }, + { + "key": "", + "message": "message376" + }, + { + "key": "AAA", + "message": "message377" + }, + { + "key": "BBB", + "message": "message378" + }, + { + "key": "CCC", + "message": "message379" + }, + { + "key": "DDD", + "message": "message380" + }, + { + "key": "", + "message": "message381" + }, + { + "key": "AAA", + "message": "message382" + }, + { + "key": "BBB", + "message": "message383" + }, + { + "key": "CCC", + "message": "message384" + }, + { + "key": "DDD", + "message": "message385" + }, + { + "key": "", + "message": "message386" + }, + { + "key": "AAA", + "message": "message387" + }, + { + "key": "BBB", + "message": "message388" + }, + { + "key": "CCC", + "message": "message389" + }, + { + "key": "DDD", + "message": "message390" + }, + { + "key": "", + "message": "message391" + }, + { + "key": "AAA", + "message": "message392" + }, + { + "key": "BBB", + "message": "message393" + }, + { + "key": "CCC", + "message": "message394" + }, + { + "key": "DDD", + "message": "message395" + }, + { + "key": "", + "message": "message396" + }, + { + "key": "AAA", + "message": "message397" + }, + { + "key": "BBB", + "message": "message398" + }, + { + "key": "CCC", + "message": "message399" + }, + { + "key": "DDD", + "message": "message400" + }, + { + "key": "", + "message": "message401" + }, + { + "key": "AAA", + "message": "message402" + }, + { + "key": "BBB", + "message": "message403" + }, + { + "key": "CCC", + "message": "message404" + }, + { + "key": "DDD", + "message": "message405" + }, + { + "key": "", + "message": "message406" + }, + { + "key": "AAA", + "message": "message407" + }, + { + "key": "BBB", + "message": "message408" + }, + { + "key": "CCC", + "message": "message409" + }, + { + "key": "DDD", + "message": "message410" + }, + { + "key": "", + "message": "message411" + }, + { + "key": "AAA", + "message": "message412" + }, + { + "key": "BBB", + "message": "message413" + }, + { + "key": "CCC", + "message": "message414" + }, + { + "key": "DDD", + "message": "message415" + }, + { + "key": "", + "message": "message416" + }, + { + "key": "AAA", + "message": "message417" + }, + { + "key": "BBB", + "message": "message418" + }, + { + "key": "CCC", + "message": "message419" + }, + { + "key": "DDD", + "message": "message420" + }, + { + "key": "", + "message": "message421" + }, + { + "key": "AAA", + "message": "message422" + }, + { + "key": "BBB", + "message": "message423" + }, + { + "key": "CCC", + "message": "message424" + }, + { + "key": "DDD", + "message": "message425" + }, + { + "key": "", + "message": "message426" + }, + { + "key": "AAA", + "message": "message427" + }, + { + "key": "BBB", + "message": "message428" + }, + { + "key": "CCC", + "message": "message429" + }, + { + "key": "DDD", + "message": "message430" + }, + { + "key": "", + "message": "message431" + }, + { + "key": "AAA", + "message": "message432" + }, + { + "key": "BBB", + "message": "message433" + }, + { + "key": "CCC", + "message": "message434" + }, + { + "key": "DDD", + "message": "message435" + }, + { + "key": "", + "message": "message436" + }, + { + "key": "AAA", + "message": "message437" + }, + { + "key": "BBB", + "message": "message438" + }, + { + "key": "CCC", + "message": "message439" + }, + { + "key": "DDD", + "message": "message440" + }, + { + "key": "", + "message": "message441" + }, + { + "key": "AAA", + "message": "message442" + }, + { + "key": "BBB", + "message": "message443" + }, + { + "key": "CCC", + "message": "message444" + }, + { + "key": "DDD", + "message": "message445" + }, + { + "key": "", + "message": "message446" + }, + { + "key": "AAA", + "message": "message447" + }, + { + "key": "BBB", + "message": "message448" + }, + { + "key": "CCC", + "message": "message449" + }, + { + "key": "DDD", + "message": "message450" + }, + { + "key": "", + "message": "message451" + }, + { + "key": "AAA", + "message": "message452" + }, + { + "key": "BBB", + "message": "message453" + }, + { + "key": "CCC", + "message": "message454" + }, + { + "key": "DDD", + "message": "message455" + }, + { + "key": "", + "message": "message456" + }, + { + "key": "AAA", + "message": "message457" + }, + { + "key": "BBB", + "message": "message458" + }, + { + "key": "CCC", + "message": "message459" + }, + { + "key": "DDD", + "message": "message460" + }, + { + "key": "", + "message": "message461" + }, + { + "key": "AAA", + "message": "message462" + }, + { + "key": "BBB", + "message": "message463" + }, + { + "key": "CCC", + "message": "message464" + }, + { + "key": "DDD", + "message": "message465" + }, + { + "key": "", + "message": "message466" + }, + { + "key": "AAA", + "message": "message467" + }, + { + "key": "BBB", + "message": "message468" + }, + { + "key": "CCC", + "message": "message469" + }, + { + "key": "DDD", + "message": "message470" + }, + { + "key": "", + "message": "message471" + }, + { + "key": "AAA", + "message": "message472" + }, + { + "key": "BBB", + "message": "message473" + }, + { + "key": "CCC", + "message": "message474" + }, + { + "key": "DDD", + "message": "message475" + }, + { + "key": "", + "message": "message476" + }, + { + "key": "AAA", + "message": "message477" + }, + { + "key": "BBB", + "message": "message478" + }, + { + "key": "CCC", + "message": "message479" + }, + { + "key": "DDD", + "message": "message480" + }, + { + "key": "", + "message": "message481" + }, + { + "key": "AAA", + "message": "message482" + }, + { + "key": "BBB", + "message": "message483" + }, + { + "key": "CCC", + "message": "message484" + }, + { + "key": "DDD", + "message": "message485" + }, + { + "key": "", + "message": "message486" + }, + { + "key": "AAA", + "message": "message487" + }, + { + "key": "BBB", + "message": "message488" + }, + { + "key": "CCC", + "message": "message489" + }, + { + "key": "DDD", + "message": "message490" + }, + { + "key": "", + "message": "message491" + }, + { + "key": "AAA", + "message": "message492" + }, + { + "key": "BBB", + "message": "message493" + }, + { + "key": "CCC", + "message": "message494" + }, + { + "key": "DDD", + "message": "message495" + }, + { + "key": "", + "message": "message496" + }, + { + "key": "AAA", + "message": "message497" + }, + { + "key": "BBB", + "message": "message498" + }, + { + "key": "CCC", + "message": "message499" + }, + { + "key": "DDD", + "message": "message500" + }, + { + "key": "", + "message": "message501" + }, + { + "key": "AAA", + "message": "message502" + }, + { + "key": "BBB", + "message": "message503" + }, + { + "key": "CCC", + "message": "message504" + }, + { + "key": "DDD", + "message": "message505" + }, + { + "key": "", + "message": "message506" + }, + { + "key": "AAA", + "message": "message507" + }, + { + "key": "BBB", + "message": "message508" + }, + { + "key": "CCC", + "message": "message509" + }, + { + "key": "DDD", + "message": "message510" + }, + { + "key": "", + "message": "message511" + }, + { + "key": "AAA", + "message": "message512" + }, + { + "key": "BBB", + "message": "message513" + }, + { + "key": "CCC", + "message": "message514" + }, + { + "key": "DDD", + "message": "message515" + }, + { + "key": "", + "message": "message516" + }, + { + "key": "AAA", + "message": "message517" + }, + { + "key": "BBB", + "message": "message518" + }, + { + "key": "CCC", + "message": "message519" + }, + { + "key": "DDD", + "message": "message520" + }, + { + "key": "", + "message": "message521" + }, + { + "key": "AAA", + "message": "message522" + }, + { + "key": "BBB", + "message": "message523" + }, + { + "key": "CCC", + "message": "message524" + }, + { + "key": "DDD", + "message": "message525" + }, + { + "key": "", + "message": "message526" + }, + { + "key": "AAA", + "message": "message527" + }, + { + "key": "BBB", + "message": "message528" + }, + { + "key": "CCC", + "message": "message529" + }, + { + "key": "DDD", + "message": "message530" + }, + { + "key": "", + "message": "message531" + }, + { + "key": "AAA", + "message": "message532" + }, + { + "key": "BBB", + "message": "message533" + }, + { + "key": "CCC", + "message": "message534" + }, + { + "key": "DDD", + "message": "message535" + }, + { + "key": "", + "message": "message536" + }, + { + "key": "AAA", + "message": "message537" + }, + { + "key": "BBB", + "message": "message538" + }, + { + "key": "CCC", + "message": "message539" + }, + { + "key": "DDD", + "message": "message540" + }, + { + "key": "", + "message": "message541" + }, + { + "key": "AAA", + "message": "message542" + }, + { + "key": "BBB", + "message": "message543" + }, + { + "key": "CCC", + "message": "message544" + }, + { + "key": "DDD", + "message": "message545" + }, + { + "key": "", + "message": "message546" + }, + { + "key": "AAA", + "message": "message547" + }, + { + "key": "BBB", + "message": "message548" + }, + { + "key": "CCC", + "message": "message549" + }, + { + "key": "DDD", + "message": "message550" + }, + { + "key": "", + "message": "message551" + }, + { + "key": "AAA", + "message": "message552" + }, + { + "key": "BBB", + "message": "message553" + }, + { + "key": "CCC", + "message": "message554" + }, + { + "key": "DDD", + "message": "message555" + }, + { + "key": "", + "message": "message556" + }, + { + "key": "AAA", + "message": "message557" + }, + { + "key": "BBB", + "message": "message558" + }, + { + "key": "CCC", + "message": "message559" + }, + { + "key": "DDD", + "message": "message560" + }, + { + "key": "", + "message": "message561" + }, + { + "key": "AAA", + "message": "message562" + }, + { + "key": "BBB", + "message": "message563" + }, + { + "key": "CCC", + "message": "message564" + }, + { + "key": "DDD", + "message": "message565" + }, + { + "key": "", + "message": "message566" + }, + { + "key": "AAA", + "message": "message567" + }, + { + "key": "BBB", + "message": "message568" + }, + { + "key": "CCC", + "message": "message569" + }, + { + "key": "DDD", + "message": "message570" + }, + { + "key": "", + "message": "message571" + }, + { + "key": "AAA", + "message": "message572" + }, + { + "key": "BBB", + "message": "message573" + }, + { + "key": "CCC", + "message": "message574" + }, + { + "key": "DDD", + "message": "message575" + }, + { + "key": "", + "message": "message576" + }, + { + "key": "AAA", + "message": "message577" + }, + { + "key": "BBB", + "message": "message578" + }, + { + "key": "CCC", + "message": "message579" + }, + { + "key": "DDD", + "message": "message580" + }, + { + "key": "", + "message": "message581" + }, + { + "key": "AAA", + "message": "message582" + }, + { + "key": "BBB", + "message": "message583" + }, + { + "key": "CCC", + "message": "message584" + }, + { + "key": "DDD", + "message": "message585" + }, + { + "key": "", + "message": "message586" + }, + { + "key": "AAA", + "message": "message587" + }, + { + "key": "BBB", + "message": "message588" + }, + { + "key": "CCC", + "message": "message589" + }, + { + "key": "DDD", + "message": "message590" + }, + { + "key": "", + "message": "message591" + }, + { + "key": "AAA", + "message": "message592" + }, + { + "key": "BBB", + "message": "message593" + }, + { + "key": "CCC", + "message": "message594" + }, + { + "key": "DDD", + "message": "message595" + }, + { + "key": "", + "message": "message596" + }, + { + "key": "AAA", + "message": "message597" + }, + { + "key": "BBB", + "message": "message598" + }, + { + "key": "CCC", + "message": "message599" + }, + { + "key": "DDD", + "message": "message600" + }, + { + "key": "", + "message": "message601" + }, + { + "key": "AAA", + "message": "message602" + }, + { + "key": "BBB", + "message": "message603" + }, + { + "key": "CCC", + "message": "message604" + }, + { + "key": "DDD", + "message": "message605" + }, + { + "key": "", + "message": "message606" + }, + { + "key": "AAA", + "message": "message607" + }, + { + "key": "BBB", + "message": "message608" + }, + { + "key": "CCC", + "message": "message609" + }, + { + "key": "DDD", + "message": "message610" + }, + { + "key": "", + "message": "message611" + }, + { + "key": "AAA", + "message": "message612" + }, + { + "key": "BBB", + "message": "message613" + }, + { + "key": "CCC", + "message": "message614" + }, + { + "key": "DDD", + "message": "message615" + }, + { + "key": "", + "message": "message616" + }, + { + "key": "AAA", + "message": "message617" + }, + { + "key": "BBB", + "message": "message618" + }, + { + "key": "CCC", + "message": "message619" + }, + { + "key": "DDD", + "message": "message620" + }, + { + "key": "", + "message": "message621" + }, + { + "key": "AAA", + "message": "message622" + }, + { + "key": "BBB", + "message": "message623" + }, + { + "key": "CCC", + "message": "message624" + }, + { + "key": "DDD", + "message": "message625" + }, + { + "key": "", + "message": "message626" + }, + { + "key": "AAA", + "message": "message627" + }, + { + "key": "BBB", + "message": "message628" + }, + { + "key": "CCC", + "message": "message629" + }, + { + "key": "DDD", + "message": "message630" + }, + { + "key": "", + "message": "message631" + }, + { + "key": "AAA", + "message": "message632" + }, + { + "key": "BBB", + "message": "message633" + }, + { + "key": "CCC", + "message": "message634" + }, + { + "key": "DDD", + "message": "message635" + }, + { + "key": "", + "message": "message636" + }, + { + "key": "AAA", + "message": "message637" + }, + { + "key": "BBB", + "message": "message638" + }, + { + "key": "CCC", + "message": "message639" + }, + { + "key": "DDD", + "message": "message640" + }, + { + "key": "", + "message": "message641" + }, + { + "key": "AAA", + "message": "message642" + }, + { + "key": "BBB", + "message": "message643" + }, + { + "key": "CCC", + "message": "message644" + }, + { + "key": "DDD", + "message": "message645" + }, + { + "key": "", + "message": "message646" + }, + { + "key": "AAA", + "message": "message647" + }, + { + "key": "BBB", + "message": "message648" + }, + { + "key": "CCC", + "message": "message649" + }, + { + "key": "DDD", + "message": "message650" + }, + { + "key": "", + "message": "message651" + }, + { + "key": "AAA", + "message": "message652" + }, + { + "key": "BBB", + "message": "message653" + }, + { + "key": "CCC", + "message": "message654" + }, + { + "key": "DDD", + "message": "message655" + }, + { + "key": "", + "message": "message656" + }, + { + "key": "AAA", + "message": "message657" + }, + { + "key": "BBB", + "message": "message658" + }, + { + "key": "CCC", + "message": "message659" + }, + { + "key": "DDD", + "message": "message660" + }, + { + "key": "", + "message": "message661" + }, + { + "key": "AAA", + "message": "message662" + }, + { + "key": "BBB", + "message": "message663" + }, + { + "key": "CCC", + "message": "message664" + }, + { + "key": "DDD", + "message": "message665" + }, + { + "key": "", + "message": "message666" + }, + { + "key": "AAA", + "message": "message667" + }, + { + "key": "BBB", + "message": "message668" + }, + { + "key": "CCC", + "message": "message669" + }, + { + "key": "DDD", + "message": "message670" + }, + { + "key": "", + "message": "message671" + }, + { + "key": "AAA", + "message": "message672" + }, + { + "key": "BBB", + "message": "message673" + }, + { + "key": "CCC", + "message": "message674" + }, + { + "key": "DDD", + "message": "message675" + }, + { + "key": "", + "message": "message676" + }, + { + "key": "AAA", + "message": "message677" + }, + { + "key": "BBB", + "message": "message678" + }, + { + "key": "CCC", + "message": "message679" + }, + { + "key": "DDD", + "message": "message680" + }, + { + "key": "", + "message": "message681" + }, + { + "key": "AAA", + "message": "message682" + }, + { + "key": "BBB", + "message": "message683" + }, + { + "key": "CCC", + "message": "message684" + }, + { + "key": "DDD", + "message": "message685" + }, + { + "key": "", + "message": "message686" + }, + { + "key": "AAA", + "message": "message687" + }, + { + "key": "BBB", + "message": "message688" + }, + { + "key": "CCC", + "message": "message689" + }, + { + "key": "DDD", + "message": "message690" + }, + { + "key": "", + "message": "message691" + }, + { + "key": "AAA", + "message": "message692" + }, + { + "key": "BBB", + "message": "message693" + }, + { + "key": "CCC", + "message": "message694" + }, + { + "key": "DDD", + "message": "message695" + }, + { + "key": "", + "message": "message696" + }, + { + "key": "AAA", + "message": "message697" + }, + { + "key": "BBB", + "message": "message698" + }, + { + "key": "CCC", + "message": "message699" + }, + { + "key": "DDD", + "message": "message700" + }, + { + "key": "", + "message": "message701" + }, + { + "key": "AAA", + "message": "message702" + }, + { + "key": "BBB", + "message": "message703" + }, + { + "key": "CCC", + "message": "message704" + }, + { + "key": "DDD", + "message": "message705" + }, + { + "key": "", + "message": "message706" + }, + { + "key": "AAA", + "message": "message707" + }, + { + "key": "BBB", + "message": "message708" + }, + { + "key": "CCC", + "message": "message709" + }, + { + "key": "DDD", + "message": "message710" + }, + { + "key": "", + "message": "message711" + }, + { + "key": "AAA", + "message": "message712" + }, + { + "key": "BBB", + "message": "message713" + }, + { + "key": "CCC", + "message": "message714" + }, + { + "key": "DDD", + "message": "message715" + }, + { + "key": "", + "message": "message716" + }, + { + "key": "AAA", + "message": "message717" + }, + { + "key": "BBB", + "message": "message718" + }, + { + "key": "CCC", + "message": "message719" + }, + { + "key": "DDD", + "message": "message720" + }, + { + "key": "", + "message": "message721" + }, + { + "key": "AAA", + "message": "message722" + }, + { + "key": "BBB", + "message": "message723" + }, + { + "key": "CCC", + "message": "message724" + }, + { + "key": "DDD", + "message": "message725" + }, + { + "key": "", + "message": "message726" + }, + { + "key": "AAA", + "message": "message727" + }, + { + "key": "BBB", + "message": "message728" + }, + { + "key": "CCC", + "message": "message729" + }, + { + "key": "DDD", + "message": "message730" + }, + { + "key": "", + "message": "message731" + }, + { + "key": "AAA", + "message": "message732" + }, + { + "key": "BBB", + "message": "message733" + }, + { + "key": "CCC", + "message": "message734" + }, + { + "key": "DDD", + "message": "message735" + }, + { + "key": "", + "message": "message736" + }, + { + "key": "AAA", + "message": "message737" + }, + { + "key": "BBB", + "message": "message738" + }, + { + "key": "CCC", + "message": "message739" + }, + { + "key": "DDD", + "message": "message740" + }, + { + "key": "", + "message": "message741" + }, + { + "key": "AAA", + "message": "message742" + }, + { + "key": "BBB", + "message": "message743" + }, + { + "key": "CCC", + "message": "message744" + }, + { + "key": "DDD", + "message": "message745" + }, + { + "key": "", + "message": "message746" + }, + { + "key": "AAA", + "message": "message747" + }, + { + "key": "BBB", + "message": "message748" + }, + { + "key": "CCC", + "message": "message749" + }, + { + "key": "DDD", + "message": "message750" + }, + { + "key": "", + "message": "message751" + }, + { + "key": "AAA", + "message": "message752" + }, + { + "key": "BBB", + "message": "message753" + }, + { + "key": "CCC", + "message": "message754" + }, + { + "key": "DDD", + "message": "message755" + }, + { + "key": "", + "message": "message756" + }, + { + "key": "AAA", + "message": "message757" + }, + { + "key": "BBB", + "message": "message758" + }, + { + "key": "CCC", + "message": "message759" + }, + { + "key": "DDD", + "message": "message760" + }, + { + "key": "", + "message": "message761" + }, + { + "key": "AAA", + "message": "message762" + }, + { + "key": "BBB", + "message": "message763" + }, + { + "key": "CCC", + "message": "message764" + }, + { + "key": "DDD", + "message": "message765" + }, + { + "key": "", + "message": "message766" + }, + { + "key": "AAA", + "message": "message767" + }, + { + "key": "BBB", + "message": "message768" + }, + { + "key": "CCC", + "message": "message769" + }, + { + "key": "DDD", + "message": "message770" + }, + { + "key": "", + "message": "message771" + }, + { + "key": "AAA", + "message": "message772" + }, + { + "key": "BBB", + "message": "message773" + }, + { + "key": "CCC", + "message": "message774" + }, + { + "key": "DDD", + "message": "message775" + }, + { + "key": "", + "message": "message776" + }, + { + "key": "AAA", + "message": "message777" + }, + { + "key": "BBB", + "message": "message778" + }, + { + "key": "CCC", + "message": "message779" + }, + { + "key": "DDD", + "message": "message780" + }, + { + "key": "", + "message": "message781" + }, + { + "key": "AAA", + "message": "message782" + }, + { + "key": "BBB", + "message": "message783" + }, + { + "key": "CCC", + "message": "message784" + }, + { + "key": "DDD", + "message": "message785" + }, + { + "key": "", + "message": "message786" + }, + { + "key": "AAA", + "message": "message787" + }, + { + "key": "BBB", + "message": "message788" + }, + { + "key": "CCC", + "message": "message789" + }, + { + "key": "DDD", + "message": "message790" + }, + { + "key": "", + "message": "message791" + }, + { + "key": "AAA", + "message": "message792" + }, + { + "key": "BBB", + "message": "message793" + }, + { + "key": "CCC", + "message": "message794" + }, + { + "key": "DDD", + "message": "message795" + }, + { + "key": "", + "message": "message796" + }, + { + "key": "AAA", + "message": "message797" + }, + { + "key": "BBB", + "message": "message798" + }, + { + "key": "CCC", + "message": "message799" + }, + { + "key": "DDD", + "message": "message800" + }, + { + "key": "", + "message": "message801" + }, + { + "key": "AAA", + "message": "message802" + }, + { + "key": "BBB", + "message": "message803" + }, + { + "key": "CCC", + "message": "message804" + }, + { + "key": "DDD", + "message": "message805" + }, + { + "key": "", + "message": "message806" + }, + { + "key": "AAA", + "message": "message807" + }, + { + "key": "BBB", + "message": "message808" + }, + { + "key": "CCC", + "message": "message809" + }, + { + "key": "DDD", + "message": "message810" + }, + { + "key": "", + "message": "message811" + }, + { + "key": "AAA", + "message": "message812" + }, + { + "key": "BBB", + "message": "message813" + }, + { + "key": "CCC", + "message": "message814" + }, + { + "key": "DDD", + "message": "message815" + }, + { + "key": "", + "message": "message816" + }, + { + "key": "AAA", + "message": "message817" + }, + { + "key": "BBB", + "message": "message818" + }, + { + "key": "CCC", + "message": "message819" + }, + { + "key": "DDD", + "message": "message820" + }, + { + "key": "", + "message": "message821" + }, + { + "key": "AAA", + "message": "message822" + }, + { + "key": "BBB", + "message": "message823" + }, + { + "key": "CCC", + "message": "message824" + }, + { + "key": "DDD", + "message": "message825" + }, + { + "key": "", + "message": "message826" + }, + { + "key": "AAA", + "message": "message827" + }, + { + "key": "BBB", + "message": "message828" + }, + { + "key": "CCC", + "message": "message829" + }, + { + "key": "DDD", + "message": "message830" + }, + { + "key": "", + "message": "message831" + }, + { + "key": "AAA", + "message": "message832" + }, + { + "key": "BBB", + "message": "message833" + }, + { + "key": "CCC", + "message": "message834" + }, + { + "key": "DDD", + "message": "message835" + }, + { + "key": "", + "message": "message836" + }, + { + "key": "AAA", + "message": "message837" + }, + { + "key": "BBB", + "message": "message838" + }, + { + "key": "CCC", + "message": "message839" + }, + { + "key": "DDD", + "message": "message840" + }, + { + "key": "", + "message": "message841" + }, + { + "key": "AAA", + "message": "message842" + }, + { + "key": "BBB", + "message": "message843" + }, + { + "key": "CCC", + "message": "message844" + }, + { + "key": "DDD", + "message": "message845" + }, + { + "key": "", + "message": "message846" + }, + { + "key": "AAA", + "message": "message847" + }, + { + "key": "BBB", + "message": "message848" + }, + { + "key": "CCC", + "message": "message849" + }, + { + "key": "DDD", + "message": "message850" + }, + { + "key": "", + "message": "message851" + }, + { + "key": "AAA", + "message": "message852" + }, + { + "key": "BBB", + "message": "message853" + }, + { + "key": "CCC", + "message": "message854" + }, + { + "key": "DDD", + "message": "message855" + }, + { + "key": "", + "message": "message856" + }, + { + "key": "AAA", + "message": "message857" + }, + { + "key": "BBB", + "message": "message858" + }, + { + "key": "CCC", + "message": "message859" + }, + { + "key": "DDD", + "message": "message860" + }, + { + "key": "", + "message": "message861" + }, + { + "key": "AAA", + "message": "message862" + }, + { + "key": "BBB", + "message": "message863" + }, + { + "key": "CCC", + "message": "message864" + }, + { + "key": "DDD", + "message": "message865" + }, + { + "key": "", + "message": "message866" + }, + { + "key": "AAA", + "message": "message867" + }, + { + "key": "BBB", + "message": "message868" + }, + { + "key": "CCC", + "message": "message869" + }, + { + "key": "DDD", + "message": "message870" + }, + { + "key": "", + "message": "message871" + }, + { + "key": "AAA", + "message": "message872" + }, + { + "key": "BBB", + "message": "message873" + }, + { + "key": "CCC", + "message": "message874" + }, + { + "key": "DDD", + "message": "message875" + }, + { + "key": "", + "message": "message876" + }, + { + "key": "AAA", + "message": "message877" + }, + { + "key": "BBB", + "message": "message878" + }, + { + "key": "CCC", + "message": "message879" + }, + { + "key": "DDD", + "message": "message880" + }, + { + "key": "", + "message": "message881" + }, + { + "key": "AAA", + "message": "message882" + }, + { + "key": "BBB", + "message": "message883" + }, + { + "key": "CCC", + "message": "message884" + }, + { + "key": "DDD", + "message": "message885" + }, + { + "key": "", + "message": "message886" + }, + { + "key": "AAA", + "message": "message887" + }, + { + "key": "BBB", + "message": "message888" + }, + { + "key": "CCC", + "message": "message889" + }, + { + "key": "DDD", + "message": "message890" + }, + { + "key": "", + "message": "message891" + }, + { + "key": "AAA", + "message": "message892" + }, + { + "key": "BBB", + "message": "message893" + }, + { + "key": "CCC", + "message": "message894" + }, + { + "key": "DDD", + "message": "message895" + }, + { + "key": "", + "message": "message896" + }, + { + "key": "AAA", + "message": "message897" + }, + { + "key": "BBB", + "message": "message898" + }, + { + "key": "CCC", + "message": "message899" + }, + { + "key": "DDD", + "message": "message900" + }, + { + "key": "", + "message": "message901" + }, + { + "key": "AAA", + "message": "message902" + }, + { + "key": "BBB", + "message": "message903" + }, + { + "key": "CCC", + "message": "message904" + }, + { + "key": "DDD", + "message": "message905" + }, + { + "key": "", + "message": "message906" + }, + { + "key": "AAA", + "message": "message907" + }, + { + "key": "BBB", + "message": "message908" + }, + { + "key": "CCC", + "message": "message909" + }, + { + "key": "DDD", + "message": "message910" + }, + { + "key": "", + "message": "message911" + }, + { + "key": "AAA", + "message": "message912" + }, + { + "key": "BBB", + "message": "message913" + }, + { + "key": "CCC", + "message": "message914" + }, + { + "key": "DDD", + "message": "message915" + }, + { + "key": "", + "message": "message916" + }, + { + "key": "AAA", + "message": "message917" + }, + { + "key": "BBB", + "message": "message918" + }, + { + "key": "CCC", + "message": "message919" + }, + { + "key": "DDD", + "message": "message920" + }, + { + "key": "", + "message": "message921" + }, + { + "key": "AAA", + "message": "message922" + }, + { + "key": "BBB", + "message": "message923" + }, + { + "key": "CCC", + "message": "message924" + }, + { + "key": "DDD", + "message": "message925" + }, + { + "key": "", + "message": "message926" + }, + { + "key": "AAA", + "message": "message927" + }, + { + "key": "BBB", + "message": "message928" + }, + { + "key": "CCC", + "message": "message929" + }, + { + "key": "DDD", + "message": "message930" + }, + { + "key": "", + "message": "message931" + }, + { + "key": "AAA", + "message": "message932" + }, + { + "key": "BBB", + "message": "message933" + }, + { + "key": "CCC", + "message": "message934" + }, + { + "key": "DDD", + "message": "message935" + }, + { + "key": "", + "message": "message936" + }, + { + "key": "AAA", + "message": "message937" + }, + { + "key": "BBB", + "message": "message938" + }, + { + "key": "CCC", + "message": "message939" + }, + { + "key": "DDD", + "message": "message940" + }, + { + "key": "", + "message": "message941" + }, + { + "key": "AAA", + "message": "message942" + }, + { + "key": "BBB", + "message": "message943" + }, + { + "key": "CCC", + "message": "message944" + }, + { + "key": "DDD", + "message": "message945" + }, + { + "key": "", + "message": "message946" + }, + { + "key": "AAA", + "message": "message947" + }, + { + "key": "BBB", + "message": "message948" + }, + { + "key": "CCC", + "message": "message949" + }, + { + "key": "DDD", + "message": "message950" + }, + { + "key": "", + "message": "message951" + }, + { + "key": "AAA", + "message": "message952" + }, + { + "key": "BBB", + "message": "message953" + }, + { + "key": "CCC", + "message": "message954" + }, + { + "key": "DDD", + "message": "message955" + }, + { + "key": "", + "message": "message956" + }, + { + "key": "AAA", + "message": "message957" + }, + { + "key": "BBB", + "message": "message958" + }, + { + "key": "CCC", + "message": "message959" + }, + { + "key": "DDD", + "message": "message960" + }, + { + "key": "", + "message": "message961" + }, + { + "key": "AAA", + "message": "message962" + }, + { + "key": "BBB", + "message": "message963" + }, + { + "key": "CCC", + "message": "message964" + }, + { + "key": "DDD", + "message": "message965" + }, + { + "key": "", + "message": "message966" + }, + { + "key": "AAA", + "message": "message967" + }, + { + "key": "BBB", + "message": "message968" + }, + { + "key": "CCC", + "message": "message969" + }, + { + "key": "DDD", + "message": "message970" + }, + { + "key": "", + "message": "message971" + }, + { + "key": "AAA", + "message": "message972" + }, + { + "key": "BBB", + "message": "message973" + }, + { + "key": "CCC", + "message": "message974" + }, + { + "key": "DDD", + "message": "message975" + }, + { + "key": "", + "message": "message976" + }, + { + "key": "AAA", + "message": "message977" + }, + { + "key": "BBB", + "message": "message978" + }, + { + "key": "CCC", + "message": "message979" + }, + { + "key": "DDD", + "message": "message980" + }, + { + "key": "", + "message": "message981" + }, + { + "key": "AAA", + "message": "message982" + }, + { + "key": "BBB", + "message": "message983" + }, + { + "key": "CCC", + "message": "message984" + }, + { + "key": "DDD", + "message": "message985" + }, + { + "key": "", + "message": "message986" + }, + { + "key": "AAA", + "message": "message987" + }, + { + "key": "BBB", + "message": "message988" + }, + { + "key": "CCC", + "message": "message989" + }, + { + "key": "DDD", + "message": "message990" + }, + { + "key": "", + "message": "message991" + }, + { + "key": "AAA", + "message": "message992" + }, + { + "key": "BBB", + "message": "message993" + }, + { + "key": "CCC", + "message": "message994" + }, + { + "key": "DDD", + "message": "message995" + }, + { + "key": "", + "message": "message996" + }, + { + "key": "AAA", + "message": "message997" + }, + { + "key": "BBB", + "message": "message998" + }, + { + "key": "CCC", + "message": "message999" + }, + { + "key": "DDD", + "message": "message1000" + }, + { + "key": "", + "message": "message1001" + }, + { + "key": "AAA", + "message": "message1002" + }, + { + "key": "BBB", + "message": "message1003" + }, + { + "key": "CCC", + "message": "message1004" + }, + { + "key": "DDD", + "message": "message1005" + }, + { + "key": "", + "message": "message1006" + }, + { + "key": "AAA", + "message": "message1007" + }, + { + "key": "BBB", + "message": "message1008" + }, + { + "key": "CCC", + "message": "message1009" + }, + { + "key": "DDD", + "message": "message1010" + }, + { + "key": "", + "message": "message1011" + }, + { + "key": "AAA", + "message": "message1012" + }, + { + "key": "BBB", + "message": "message1013" + }, + { + "key": "CCC", + "message": "message1014" + }, + { + "key": "DDD", + "message": "message1015" + }, + { + "key": "", + "message": "message1016" + }, + { + "key": "AAA", + "message": "message1017" + }, + { + "key": "BBB", + "message": "message1018" + }, + { + "key": "CCC", + "message": "message1019" + }, + { + "key": "DDD", + "message": "message1020" + }, + { + "key": "", + "message": "message1021" + }, + { + "key": "AAA", + "message": "message1022" + }, + { + "key": "BBB", + "message": "message1023" + }, + { + "key": "CCC", + "message": "message1024" + }, + { + "key": "DDD", + "message": "message1025" + }, + { + "key": "", + "message": "message1026" + }, + { + "key": "AAA", + "message": "message1027" + }, + { + "key": "BBB", + "message": "message1028" + }, + { + "key": "CCC", + "message": "message1029" + }, + { + "key": "DDD", + "message": "message1030" + }, + { + "key": "", + "message": "message1031" + }, + { + "key": "AAA", + "message": "message1032" + }, + { + "key": "BBB", + "message": "message1033" + }, + { + "key": "CCC", + "message": "message1034" + }, + { + "key": "DDD", + "message": "message1035" + }, + { + "key": "", + "message": "message1036" + }, + { + "key": "AAA", + "message": "message1037" + }, + { + "key": "BBB", + "message": "message1038" + }, + { + "key": "CCC", + "message": "message1039" + }, + { + "key": "DDD", + "message": "message1040" + }, + { + "key": "", + "message": "message1041" + }, + { + "key": "AAA", + "message": "message1042" + }, + { + "key": "BBB", + "message": "message1043" + }, + { + "key": "CCC", + "message": "message1044" + }, + { + "key": "DDD", + "message": "message1045" + }, + { + "key": "", + "message": "message1046" + }, + { + "key": "AAA", + "message": "message1047" + }, + { + "key": "BBB", + "message": "message1048" + }, + { + "key": "CCC", + "message": "message1049" + }, + { + "key": "DDD", + "message": "message1050" + }, + { + "key": "", + "message": "message1051" + }, + { + "key": "AAA", + "message": "message1052" + }, + { + "key": "BBB", + "message": "message1053" + }, + { + "key": "CCC", + "message": "message1054" + }, + { + "key": "DDD", + "message": "message1055" + }, + { + "key": "", + "message": "message1056" + }, + { + "key": "AAA", + "message": "message1057" + }, + { + "key": "BBB", + "message": "message1058" + }, + { + "key": "CCC", + "message": "message1059" + }, + { + "key": "DDD", + "message": "message1060" + }, + { + "key": "", + "message": "message1061" + }, + { + "key": "AAA", + "message": "message1062" + }, + { + "key": "BBB", + "message": "message1063" + }, + { + "key": "CCC", + "message": "message1064" + }, + { + "key": "DDD", + "message": "message1065" + }, + { + "key": "", + "message": "message1066" + }, + { + "key": "AAA", + "message": "message1067" + }, + { + "key": "BBB", + "message": "message1068" + }, + { + "key": "CCC", + "message": "message1069" + }, + { + "key": "DDD", + "message": "message1070" + }, + { + "key": "", + "message": "message1071" + }, + { + "key": "AAA", + "message": "message1072" + }, + { + "key": "BBB", + "message": "message1073" + }, + { + "key": "CCC", + "message": "message1074" + }, + { + "key": "DDD", + "message": "message1075" + }, + { + "key": "", + "message": "message1076" + }, + { + "key": "AAA", + "message": "message1077" + }, + { + "key": "BBB", + "message": "message1078" + }, + { + "key": "CCC", + "message": "message1079" + }, + { + "key": "DDD", + "message": "message1080" + }, + { + "key": "", + "message": "message1081" + }, + { + "key": "AAA", + "message": "message1082" + }, + { + "key": "BBB", + "message": "message1083" + }, + { + "key": "CCC", + "message": "message1084" + }, + { + "key": "DDD", + "message": "message1085" + }, + { + "key": "", + "message": "message1086" + }, + { + "key": "AAA", + "message": "message1087" + }, + { + "key": "BBB", + "message": "message1088" + }, + { + "key": "CCC", + "message": "message1089" + }, + { + "key": "DDD", + "message": "message1090" + }, + { + "key": "", + "message": "message1091" + }, + { + "key": "AAA", + "message": "message1092" + }, + { + "key": "BBB", + "message": "message1093" + }, + { + "key": "CCC", + "message": "message1094" + }, + { + "key": "DDD", + "message": "message1095" + }, + { + "key": "", + "message": "message1096" + }, + { + "key": "AAA", + "message": "message1097" + }, + { + "key": "BBB", + "message": "message1098" + }, + { + "key": "CCC", + "message": "message1099" + }, + { + "key": "DDD", + "message": "message1100" + }, + { + "key": "", + "message": "message1101" + }, + { + "key": "AAA", + "message": "message1102" + }, + { + "key": "BBB", + "message": "message1103" + }, + { + "key": "CCC", + "message": "message1104" + }, + { + "key": "DDD", + "message": "message1105" + }, + { + "key": "", + "message": "message1106" + }, + { + "key": "AAA", + "message": "message1107" + }, + { + "key": "BBB", + "message": "message1108" + }, + { + "key": "CCC", + "message": "message1109" + }, + { + "key": "DDD", + "message": "message1110" + }, + { + "key": "", + "message": "message1111" + }, + { + "key": "AAA", + "message": "message1112" + }, + { + "key": "BBB", + "message": "message1113" + }, + { + "key": "CCC", + "message": "message1114" + }, + { + "key": "DDD", + "message": "message1115" + }, + { + "key": "", + "message": "message1116" + }, + { + "key": "AAA", + "message": "message1117" + }, + { + "key": "BBB", + "message": "message1118" + }, + { + "key": "CCC", + "message": "message1119" + }, + { + "key": "DDD", + "message": "message1120" + }, + { + "key": "", + "message": "message1121" + }, + { + "key": "AAA", + "message": "message1122" + }, + { + "key": "BBB", + "message": "message1123" + }, + { + "key": "CCC", + "message": "message1124" + }, + { + "key": "DDD", + "message": "message1125" + }, + { + "key": "", + "message": "message1126" + }, + { + "key": "AAA", + "message": "message1127" + }, + { + "key": "BBB", + "message": "message1128" + }, + { + "key": "CCC", + "message": "message1129" + }, + { + "key": "DDD", + "message": "message1130" + }, + { + "key": "", + "message": "message1131" + }, + { + "key": "AAA", + "message": "message1132" + }, + { + "key": "BBB", + "message": "message1133" + }, + { + "key": "CCC", + "message": "message1134" + }, + { + "key": "DDD", + "message": "message1135" + }, + { + "key": "", + "message": "message1136" + }, + { + "key": "AAA", + "message": "message1137" + }, + { + "key": "BBB", + "message": "message1138" + }, + { + "key": "CCC", + "message": "message1139" + }, + { + "key": "DDD", + "message": "message1140" + }, + { + "key": "", + "message": "message1141" + }, + { + "key": "AAA", + "message": "message1142" + }, + { + "key": "BBB", + "message": "message1143" + }, + { + "key": "CCC", + "message": "message1144" + }, + { + "key": "DDD", + "message": "message1145" + }, + { + "key": "", + "message": "message1146" + }, + { + "key": "AAA", + "message": "message1147" + }, + { + "key": "BBB", + "message": "message1148" + }, + { + "key": "CCC", + "message": "message1149" + }, + { + "key": "DDD", + "message": "message1150" + }, + { + "key": "", + "message": "message1151" + }, + { + "key": "AAA", + "message": "message1152" + }, + { + "key": "BBB", + "message": "message1153" + }, + { + "key": "CCC", + "message": "message1154" + }, + { + "key": "DDD", + "message": "message1155" + }, + { + "key": "", + "message": "message1156" + }, + { + "key": "AAA", + "message": "message1157" + }, + { + "key": "BBB", + "message": "message1158" + }, + { + "key": "CCC", + "message": "message1159" + }, + { + "key": "DDD", + "message": "message1160" + }, + { + "key": "", + "message": "message1161" + }, + { + "key": "AAA", + "message": "message1162" + }, + { + "key": "BBB", + "message": "message1163" + }, + { + "key": "CCC", + "message": "message1164" + }, + { + "key": "DDD", + "message": "message1165" + }, + { + "key": "", + "message": "message1166" + }, + { + "key": "AAA", + "message": "message1167" + }, + { + "key": "BBB", + "message": "message1168" + }, + { + "key": "CCC", + "message": "message1169" + }, + { + "key": "DDD", + "message": "message1170" + }, + { + "key": "", + "message": "message1171" + }, + { + "key": "AAA", + "message": "message1172" + }, + { + "key": "BBB", + "message": "message1173" + }, + { + "key": "CCC", + "message": "message1174" + }, + { + "key": "DDD", + "message": "message1175" + }, + { + "key": "", + "message": "message1176" + }, + { + "key": "AAA", + "message": "message1177" + }, + { + "key": "BBB", + "message": "message1178" + }, + { + "key": "CCC", + "message": "message1179" + }, + { + "key": "DDD", + "message": "message1180" + }, + { + "key": "", + "message": "message1181" + }, + { + "key": "AAA", + "message": "message1182" + }, + { + "key": "BBB", + "message": "message1183" + }, + { + "key": "CCC", + "message": "message1184" + }, + { + "key": "DDD", + "message": "message1185" + }, + { + "key": "", + "message": "message1186" + }, + { + "key": "AAA", + "message": "message1187" + }, + { + "key": "BBB", + "message": "message1188" + }, + { + "key": "CCC", + "message": "message1189" + }, + { + "key": "DDD", + "message": "message1190" + }, + { + "key": "", + "message": "message1191" + }, + { + "key": "AAA", + "message": "message1192" + }, + { + "key": "BBB", + "message": "message1193" + }, + { + "key": "CCC", + "message": "message1194" + }, + { + "key": "DDD", + "message": "message1195" + }, + { + "key": "", + "message": "message1196" + }, + { + "key": "AAA", + "message": "message1197" + }, + { + "key": "BBB", + "message": "message1198" + }, + { + "key": "CCC", + "message": "message1199" + }, + { + "key": "DDD", + "message": "message1200" + }, + { + "key": "", + "message": "message1201" + }, + { + "key": "AAA", + "message": "message1202" + }, + { + "key": "BBB", + "message": "message1203" + }, + { + "key": "CCC", + "message": "message1204" + }, + { + "key": "DDD", + "message": "message1205" + }, + { + "key": "", + "message": "message1206" + }, + { + "key": "AAA", + "message": "message1207" + }, + { + "key": "BBB", + "message": "message1208" + }, + { + "key": "CCC", + "message": "message1209" + }, + { + "key": "DDD", + "message": "message1210" + }, + { + "key": "", + "message": "message1211" + }, + { + "key": "AAA", + "message": "message1212" + }, + { + "key": "BBB", + "message": "message1213" + }, + { + "key": "CCC", + "message": "message1214" + }, + { + "key": "DDD", + "message": "message1215" + }, + { + "key": "", + "message": "message1216" + }, + { + "key": "AAA", + "message": "message1217" + }, + { + "key": "BBB", + "message": "message1218" + }, + { + "key": "CCC", + "message": "message1219" + }, + { + "key": "DDD", + "message": "message1220" + }, + { + "key": "", + "message": "message1221" + }, + { + "key": "AAA", + "message": "message1222" + }, + { + "key": "BBB", + "message": "message1223" + }, + { + "key": "CCC", + "message": "message1224" + }, + { + "key": "DDD", + "message": "message1225" + }, + { + "key": "", + "message": "message1226" + }, + { + "key": "AAA", + "message": "message1227" + }, + { + "key": "BBB", + "message": "message1228" + }, + { + "key": "CCC", + "message": "message1229" + }, + { + "key": "DDD", + "message": "message1230" + }, + { + "key": "", + "message": "message1231" + }, + { + "key": "AAA", + "message": "message1232" + }, + { + "key": "BBB", + "message": "message1233" + }, + { + "key": "CCC", + "message": "message1234" + }, + { + "key": "DDD", + "message": "message1235" + }, + { + "key": "", + "message": "message1236" + }, + { + "key": "AAA", + "message": "message1237" + }, + { + "key": "BBB", + "message": "message1238" + }, + { + "key": "CCC", + "message": "message1239" + }, + { + "key": "DDD", + "message": "message1240" + }, + { + "key": "", + "message": "message1241" + }, + { + "key": "AAA", + "message": "message1242" + }, + { + "key": "BBB", + "message": "message1243" + }, + { + "key": "CCC", + "message": "message1244" + }, + { + "key": "DDD", + "message": "message1245" + }, + { + "key": "", + "message": "message1246" + }, + { + "key": "AAA", + "message": "message1247" + }, + { + "key": "BBB", + "message": "message1248" + }, + { + "key": "CCC", + "message": "message1249" + }, + { + "key": "DDD", + "message": "message1250" + }, + { + "key": "", + "message": "message1251" + }, + { + "key": "AAA", + "message": "message1252" + }, + { + "key": "BBB", + "message": "message1253" + }, + { + "key": "CCC", + "message": "message1254" + }, + { + "key": "DDD", + "message": "message1255" + }, + { + "key": "", + "message": "message1256" + }, + { + "key": "AAA", + "message": "message1257" + }, + { + "key": "BBB", + "message": "message1258" + }, + { + "key": "CCC", + "message": "message1259" + }, + { + "key": "DDD", + "message": "message1260" + }, + { + "key": "", + "message": "message1261" + }, + { + "key": "AAA", + "message": "message1262" + }, + { + "key": "BBB", + "message": "message1263" + }, + { + "key": "CCC", + "message": "message1264" + }, + { + "key": "DDD", + "message": "message1265" + }, + { + "key": "", + "message": "message1266" + }, + { + "key": "AAA", + "message": "message1267" + }, + { + "key": "BBB", + "message": "message1268" + }, + { + "key": "CCC", + "message": "message1269" + }, + { + "key": "DDD", + "message": "message1270" + }, + { + "key": "", + "message": "message1271" + }, + { + "key": "AAA", + "message": "message1272" + }, + { + "key": "BBB", + "message": "message1273" + }, + { + "key": "CCC", + "message": "message1274" + }, + { + "key": "DDD", + "message": "message1275" + }, + { + "key": "", + "message": "message1276" + }, + { + "key": "AAA", + "message": "message1277" + }, + { + "key": "BBB", + "message": "message1278" + }, + { + "key": "CCC", + "message": "message1279" + }, + { + "key": "DDD", + "message": "message1280" + }, + { + "key": "", + "message": "message1281" + }, + { + "key": "AAA", + "message": "message1282" + }, + { + "key": "BBB", + "message": "message1283" + }, + { + "key": "CCC", + "message": "message1284" + }, + { + "key": "DDD", + "message": "message1285" + }, + { + "key": "", + "message": "message1286" + }, + { + "key": "AAA", + "message": "message1287" + }, + { + "key": "BBB", + "message": "message1288" + }, + { + "key": "CCC", + "message": "message1289" + }, + { + "key": "DDD", + "message": "message1290" + }, + { + "key": "", + "message": "message1291" + }, + { + "key": "AAA", + "message": "message1292" + }, + { + "key": "BBB", + "message": "message1293" + }, + { + "key": "CCC", + "message": "message1294" + }, + { + "key": "DDD", + "message": "message1295" + }, + { + "key": "", + "message": "message1296" + }, + { + "key": "AAA", + "message": "message1297" + }, + { + "key": "BBB", + "message": "message1298" + }, + { + "key": "CCC", + "message": "message1299" + }, + { + "key": "DDD", + "message": "message1300" + }, + { + "key": "", + "message": "message1301" + }, + { + "key": "AAA", + "message": "message1302" + }, + { + "key": "BBB", + "message": "message1303" + }, + { + "key": "CCC", + "message": "message1304" + }, + { + "key": "DDD", + "message": "message1305" + }, + { + "key": "", + "message": "message1306" + }, + { + "key": "AAA", + "message": "message1307" + }, + { + "key": "BBB", + "message": "message1308" + }, + { + "key": "CCC", + "message": "message1309" + }, + { + "key": "DDD", + "message": "message1310" + }, + { + "key": "", + "message": "message1311" + }, + { + "key": "AAA", + "message": "message1312" + }, + { + "key": "BBB", + "message": "message1313" + }, + { + "key": "CCC", + "message": "message1314" + }, + { + "key": "DDD", + "message": "message1315" + }, + { + "key": "", + "message": "message1316" + }, + { + "key": "AAA", + "message": "message1317" + }, + { + "key": "BBB", + "message": "message1318" + }, + { + "key": "CCC", + "message": "message1319" + }, + { + "key": "DDD", + "message": "message1320" + }, + { + "key": "", + "message": "message1321" + }, + { + "key": "AAA", + "message": "message1322" + }, + { + "key": "BBB", + "message": "message1323" + }, + { + "key": "CCC", + "message": "message1324" + }, + { + "key": "DDD", + "message": "message1325" + }, + { + "key": "", + "message": "message1326" + }, + { + "key": "AAA", + "message": "message1327" + }, + { + "key": "BBB", + "message": "message1328" + }, + { + "key": "CCC", + "message": "message1329" + }, + { + "key": "DDD", + "message": "message1330" + }, + { + "key": "", + "message": "message1331" + }, + { + "key": "AAA", + "message": "message1332" + }, + { + "key": "BBB", + "message": "message1333" + }, + { + "key": "CCC", + "message": "message1334" + }, + { + "key": "DDD", + "message": "message1335" + }, + { + "key": "", + "message": "message1336" + }, + { + "key": "AAA", + "message": "message1337" + }, + { + "key": "BBB", + "message": "message1338" + }, + { + "key": "CCC", + "message": "message1339" + }, + { + "key": "DDD", + "message": "message1340" + }, + { + "key": "", + "message": "message1341" + }, + { + "key": "AAA", + "message": "message1342" + }, + { + "key": "BBB", + "message": "message1343" + }, + { + "key": "CCC", + "message": "message1344" + }, + { + "key": "DDD", + "message": "message1345" + }, + { + "key": "", + "message": "message1346" + }, + { + "key": "AAA", + "message": "message1347" + }, + { + "key": "BBB", + "message": "message1348" + }, + { + "key": "CCC", + "message": "message1349" + }, + { + "key": "DDD", + "message": "message1350" + }, + { + "key": "", + "message": "message1351" + }, + { + "key": "AAA", + "message": "message1352" + }, + { + "key": "BBB", + "message": "message1353" + }, + { + "key": "CCC", + "message": "message1354" + }, + { + "key": "DDD", + "message": "message1355" + }, + { + "key": "", + "message": "message1356" + }, + { + "key": "AAA", + "message": "message1357" + }, + { + "key": "BBB", + "message": "message1358" + }, + { + "key": "CCC", + "message": "message1359" + }, + { + "key": "DDD", + "message": "message1360" + }, + { + "key": "", + "message": "message1361" + }, + { + "key": "AAA", + "message": "message1362" + }, + { + "key": "BBB", + "message": "message1363" + }, + { + "key": "CCC", + "message": "message1364" + }, + { + "key": "DDD", + "message": "message1365" + }, + { + "key": "", + "message": "message1366" + }, + { + "key": "AAA", + "message": "message1367" + }, + { + "key": "BBB", + "message": "message1368" + }, + { + "key": "CCC", + "message": "message1369" + }, + { + "key": "DDD", + "message": "message1370" + }, + { + "key": "", + "message": "message1371" + }, + { + "key": "AAA", + "message": "message1372" + }, + { + "key": "BBB", + "message": "message1373" + }, + { + "key": "CCC", + "message": "message1374" + }, + { + "key": "DDD", + "message": "message1375" + }, + { + "key": "", + "message": "message1376" + }, + { + "key": "AAA", + "message": "message1377" + }, + { + "key": "BBB", + "message": "message1378" + }, + { + "key": "CCC", + "message": "message1379" + }, + { + "key": "DDD", + "message": "message1380" + }, + { + "key": "", + "message": "message1381" + }, + { + "key": "AAA", + "message": "message1382" + }, + { + "key": "BBB", + "message": "message1383" + }, + { + "key": "CCC", + "message": "message1384" + }, + { + "key": "DDD", + "message": "message1385" + }, + { + "key": "", + "message": "message1386" + }, + { + "key": "AAA", + "message": "message1387" + }, + { + "key": "BBB", + "message": "message1388" + }, + { + "key": "CCC", + "message": "message1389" + }, + { + "key": "DDD", + "message": "message1390" + }, + { + "key": "", + "message": "message1391" + }, + { + "key": "AAA", + "message": "message1392" + }, + { + "key": "BBB", + "message": "message1393" + }, + { + "key": "CCC", + "message": "message1394" + }, + { + "key": "DDD", + "message": "message1395" + }, + { + "key": "", + "message": "message1396" + }, + { + "key": "AAA", + "message": "message1397" + }, + { + "key": "BBB", + "message": "message1398" + }, + { + "key": "CCC", + "message": "message1399" + }, + { + "key": "DDD", + "message": "message1400" + }, + { + "key": "", + "message": "message1401" + }, + { + "key": "AAA", + "message": "message1402" + }, + { + "key": "BBB", + "message": "message1403" + }, + { + "key": "CCC", + "message": "message1404" + }, + { + "key": "DDD", + "message": "message1405" + }, + { + "key": "", + "message": "message1406" + }, + { + "key": "AAA", + "message": "message1407" + }, + { + "key": "BBB", + "message": "message1408" + }, + { + "key": "CCC", + "message": "message1409" + }, + { + "key": "DDD", + "message": "message1410" + }, + { + "key": "", + "message": "message1411" + }, + { + "key": "AAA", + "message": "message1412" + }, + { + "key": "BBB", + "message": "message1413" + }, + { + "key": "CCC", + "message": "message1414" + }, + { + "key": "DDD", + "message": "message1415" + }, + { + "key": "", + "message": "message1416" + }, + { + "key": "AAA", + "message": "message1417" + }, + { + "key": "BBB", + "message": "message1418" + }, + { + "key": "CCC", + "message": "message1419" + }, + { + "key": "DDD", + "message": "message1420" + }, + { + "key": "", + "message": "message1421" + }, + { + "key": "AAA", + "message": "message1422" + }, + { + "key": "BBB", + "message": "message1423" + }, + { + "key": "CCC", + "message": "message1424" + }, + { + "key": "DDD", + "message": "message1425" + }, + { + "key": "", + "message": "message1426" + }, + { + "key": "AAA", + "message": "message1427" + }, + { + "key": "BBB", + "message": "message1428" + }, + { + "key": "CCC", + "message": "message1429" + }, + { + "key": "DDD", + "message": "message1430" + }, + { + "key": "", + "message": "message1431" + }, + { + "key": "AAA", + "message": "message1432" + }, + { + "key": "BBB", + "message": "message1433" + }, + { + "key": "CCC", + "message": "message1434" + }, + { + "key": "DDD", + "message": "message1435" + }, + { + "key": "", + "message": "message1436" + }, + { + "key": "AAA", + "message": "message1437" + }, + { + "key": "BBB", + "message": "message1438" + }, + { + "key": "CCC", + "message": "message1439" + }, + { + "key": "DDD", + "message": "message1440" + }, + { + "key": "", + "message": "message1441" + }, + { + "key": "AAA", + "message": "message1442" + }, + { + "key": "BBB", + "message": "message1443" + }, + { + "key": "CCC", + "message": "message1444" + }, + { + "key": "DDD", + "message": "message1445" + }, + { + "key": "", + "message": "message1446" + }, + { + "key": "AAA", + "message": "message1447" + }, + { + "key": "BBB", + "message": "message1448" + }, + { + "key": "CCC", + "message": "message1449" + }, + { + "key": "DDD", + "message": "message1450" + }, + { + "key": "", + "message": "message1451" + }, + { + "key": "AAA", + "message": "message1452" + }, + { + "key": "BBB", + "message": "message1453" + }, + { + "key": "CCC", + "message": "message1454" + }, + { + "key": "DDD", + "message": "message1455" + }, + { + "key": "", + "message": "message1456" + }, + { + "key": "AAA", + "message": "message1457" + }, + { + "key": "BBB", + "message": "message1458" + }, + { + "key": "CCC", + "message": "message1459" + }, + { + "key": "DDD", + "message": "message1460" + }, + { + "key": "", + "message": "message1461" + }, + { + "key": "AAA", + "message": "message1462" + }, + { + "key": "BBB", + "message": "message1463" + }, + { + "key": "CCC", + "message": "message1464" + }, + { + "key": "DDD", + "message": "message1465" + }, + { + "key": "", + "message": "message1466" + }, + { + "key": "AAA", + "message": "message1467" + }, + { + "key": "BBB", + "message": "message1468" + }, + { + "key": "CCC", + "message": "message1469" + }, + { + "key": "DDD", + "message": "message1470" + }, + { + "key": "", + "message": "message1471" + }, + { + "key": "AAA", + "message": "message1472" + }, + { + "key": "BBB", + "message": "message1473" + }, + { + "key": "CCC", + "message": "message1474" + }, + { + "key": "DDD", + "message": "message1475" + }, + { + "key": "", + "message": "message1476" + }, + { + "key": "AAA", + "message": "message1477" + }, + { + "key": "BBB", + "message": "message1478" + }, + { + "key": "CCC", + "message": "message1479" + }, + { + "key": "DDD", + "message": "message1480" + }, + { + "key": "", + "message": "message1481" + }, + { + "key": "AAA", + "message": "message1482" + }, + { + "key": "BBB", + "message": "message1483" + }, + { + "key": "CCC", + "message": "message1484" + }, + { + "key": "DDD", + "message": "message1485" + }, + { + "key": "", + "message": "message1486" + }, + { + "key": "AAA", + "message": "message1487" + }, + { + "key": "BBB", + "message": "message1488" + }, + { + "key": "CCC", + "message": "message1489" + }, + { + "key": "DDD", + "message": "message1490" + }, + { + "key": "", + "message": "message1491" + }, + { + "key": "AAA", + "message": "message1492" + }, + { + "key": "BBB", + "message": "message1493" + }, + { + "key": "CCC", + "message": "message1494" + }, + { + "key": "DDD", + "message": "message1495" + }, + { + "key": "", + "message": "message1496" + }, + { + "key": "AAA", + "message": "message1497" + }, + { + "key": "BBB", + "message": "message1498" + }, + { + "key": "CCC", + "message": "message1499" + }, + { + "key": "DDD", + "message": "message1500" + }, + { + "key": "", + "message": "message1501" + }, + { + "key": "AAA", + "message": "message1502" + }, + { + "key": "BBB", + "message": "message1503" + }, + { + "key": "CCC", + "message": "message1504" + }, + { + "key": "DDD", + "message": "message1505" + }, + { + "key": "", + "message": "message1506" + }, + { + "key": "AAA", + "message": "message1507" + }, + { + "key": "BBB", + "message": "message1508" + }, + { + "key": "CCC", + "message": "message1509" + }, + { + "key": "DDD", + "message": "message1510" + }, + { + "key": "", + "message": "message1511" + }, + { + "key": "AAA", + "message": "message1512" + }, + { + "key": "BBB", + "message": "message1513" + }, + { + "key": "CCC", + "message": "message1514" + }, + { + "key": "DDD", + "message": "message1515" + }, + { + "key": "", + "message": "message1516" + }, + { + "key": "AAA", + "message": "message1517" + }, + { + "key": "BBB", + "message": "message1518" + }, + { + "key": "CCC", + "message": "message1519" + }, + { + "key": "DDD", + "message": "message1520" + }, + { + "key": "", + "message": "message1521" + }, + { + "key": "AAA", + "message": "message1522" + }, + { + "key": "BBB", + "message": "message1523" + }, + { + "key": "CCC", + "message": "message1524" + }, + { + "key": "DDD", + "message": "message1525" + }, + { + "key": "", + "message": "message1526" + }, + { + "key": "AAA", + "message": "message1527" + }, + { + "key": "BBB", + "message": "message1528" + }, + { + "key": "CCC", + "message": "message1529" + }, + { + "key": "DDD", + "message": "message1530" + }, + { + "key": "", + "message": "message1531" + }, + { + "key": "AAA", + "message": "message1532" + }, + { + "key": "BBB", + "message": "message1533" + }, + { + "key": "CCC", + "message": "message1534" + }, + { + "key": "DDD", + "message": "message1535" + }, + { + "key": "", + "message": "message1536" + }, + { + "key": "AAA", + "message": "message1537" + }, + { + "key": "BBB", + "message": "message1538" + }, + { + "key": "CCC", + "message": "message1539" + }, + { + "key": "DDD", + "message": "message1540" + }, + { + "key": "", + "message": "message1541" + }, + { + "key": "AAA", + "message": "message1542" + }, + { + "key": "BBB", + "message": "message1543" + }, + { + "key": "CCC", + "message": "message1544" + }, + { + "key": "DDD", + "message": "message1545" + }, + { + "key": "", + "message": "message1546" + }, + { + "key": "AAA", + "message": "message1547" + }, + { + "key": "BBB", + "message": "message1548" + }, + { + "key": "CCC", + "message": "message1549" + }, + { + "key": "DDD", + "message": "message1550" + }, + { + "key": "", + "message": "message1551" + }, + { + "key": "AAA", + "message": "message1552" + }, + { + "key": "BBB", + "message": "message1553" + }, + { + "key": "CCC", + "message": "message1554" + }, + { + "key": "DDD", + "message": "message1555" + }, + { + "key": "", + "message": "message1556" + }, + { + "key": "AAA", + "message": "message1557" + }, + { + "key": "BBB", + "message": "message1558" + }, + { + "key": "CCC", + "message": "message1559" + }, + { + "key": "DDD", + "message": "message1560" + }, + { + "key": "", + "message": "message1561" + }, + { + "key": "AAA", + "message": "message1562" + }, + { + "key": "BBB", + "message": "message1563" + }, + { + "key": "CCC", + "message": "message1564" + }, + { + "key": "DDD", + "message": "message1565" + }, + { + "key": "", + "message": "message1566" + }, + { + "key": "AAA", + "message": "message1567" + }, + { + "key": "BBB", + "message": "message1568" + }, + { + "key": "CCC", + "message": "message1569" + }, + { + "key": "DDD", + "message": "message1570" + }, + { + "key": "", + "message": "message1571" + }, + { + "key": "AAA", + "message": "message1572" + }, + { + "key": "BBB", + "message": "message1573" + }, + { + "key": "CCC", + "message": "message1574" + }, + { + "key": "DDD", + "message": "message1575" + }, + { + "key": "", + "message": "message1576" + }, + { + "key": "AAA", + "message": "message1577" + }, + { + "key": "BBB", + "message": "message1578" + }, + { + "key": "CCC", + "message": "message1579" + }, + { + "key": "DDD", + "message": "message1580" + }, + { + "key": "", + "message": "message1581" + }, + { + "key": "AAA", + "message": "message1582" + }, + { + "key": "BBB", + "message": "message1583" + }, + { + "key": "CCC", + "message": "message1584" + }, + { + "key": "DDD", + "message": "message1585" + }, + { + "key": "", + "message": "message1586" + }, + { + "key": "AAA", + "message": "message1587" + }, + { + "key": "BBB", + "message": "message1588" + }, + { + "key": "CCC", + "message": "message1589" + }, + { + "key": "DDD", + "message": "message1590" + }, + { + "key": "", + "message": "message1591" + }, + { + "key": "AAA", + "message": "message1592" + }, + { + "key": "BBB", + "message": "message1593" + }, + { + "key": "CCC", + "message": "message1594" + }, + { + "key": "DDD", + "message": "message1595" + }, + { + "key": "", + "message": "message1596" + }, + { + "key": "AAA", + "message": "message1597" + }, + { + "key": "BBB", + "message": "message1598" + }, + { + "key": "CCC", + "message": "message1599" + }, + { + "key": "DDD", + "message": "message1600" + }, + { + "key": "", + "message": "message1601" + }, + { + "key": "AAA", + "message": "message1602" + }, + { + "key": "BBB", + "message": "message1603" + }, + { + "key": "CCC", + "message": "message1604" + }, + { + "key": "DDD", + "message": "message1605" + }, + { + "key": "", + "message": "message1606" + }, + { + "key": "AAA", + "message": "message1607" + }, + { + "key": "BBB", + "message": "message1608" + }, + { + "key": "CCC", + "message": "message1609" + }, + { + "key": "DDD", + "message": "message1610" + }, + { + "key": "", + "message": "message1611" + }, + { + "key": "AAA", + "message": "message1612" + }, + { + "key": "BBB", + "message": "message1613" + }, + { + "key": "CCC", + "message": "message1614" + }, + { + "key": "DDD", + "message": "message1615" + }, + { + "key": "", + "message": "message1616" + }, + { + "key": "AAA", + "message": "message1617" + }, + { + "key": "BBB", + "message": "message1618" + }, + { + "key": "CCC", + "message": "message1619" + }, + { + "key": "DDD", + "message": "message1620" + }, + { + "key": "", + "message": "message1621" + }, + { + "key": "AAA", + "message": "message1622" + }, + { + "key": "BBB", + "message": "message1623" + }, + { + "key": "CCC", + "message": "message1624" + }, + { + "key": "DDD", + "message": "message1625" + }, + { + "key": "", + "message": "message1626" + }, + { + "key": "AAA", + "message": "message1627" + }, + { + "key": "BBB", + "message": "message1628" + }, + { + "key": "CCC", + "message": "message1629" + }, + { + "key": "DDD", + "message": "message1630" + }, + { + "key": "", + "message": "message1631" + }, + { + "key": "AAA", + "message": "message1632" + }, + { + "key": "BBB", + "message": "message1633" + }, + { + "key": "CCC", + "message": "message1634" + }, + { + "key": "DDD", + "message": "message1635" + }, + { + "key": "", + "message": "message1636" + }, + { + "key": "AAA", + "message": "message1637" + }, + { + "key": "BBB", + "message": "message1638" + }, + { + "key": "CCC", + "message": "message1639" + }, + { + "key": "DDD", + "message": "message1640" + }, + { + "key": "", + "message": "message1641" + }, + { + "key": "AAA", + "message": "message1642" + }, + { + "key": "BBB", + "message": "message1643" + }, + { + "key": "CCC", + "message": "message1644" + }, + { + "key": "DDD", + "message": "message1645" + }, + { + "key": "", + "message": "message1646" + }, + { + "key": "AAA", + "message": "message1647" + }, + { + "key": "BBB", + "message": "message1648" + }, + { + "key": "CCC", + "message": "message1649" + }, + { + "key": "DDD", + "message": "message1650" + }, + { + "key": "", + "message": "message1651" + }, + { + "key": "AAA", + "message": "message1652" + }, + { + "key": "BBB", + "message": "message1653" + }, + { + "key": "CCC", + "message": "message1654" + }, + { + "key": "DDD", + "message": "message1655" + }, + { + "key": "", + "message": "message1656" + }, + { + "key": "AAA", + "message": "message1657" + }, + { + "key": "BBB", + "message": "message1658" + }, + { + "key": "CCC", + "message": "message1659" + }, + { + "key": "DDD", + "message": "message1660" + }, + { + "key": "", + "message": "message1661" + }, + { + "key": "AAA", + "message": "message1662" + }, + { + "key": "BBB", + "message": "message1663" + }, + { + "key": "CCC", + "message": "message1664" + }, + { + "key": "DDD", + "message": "message1665" + }, + { + "key": "", + "message": "message1666" + }, + { + "key": "AAA", + "message": "message1667" + }, + { + "key": "BBB", + "message": "message1668" + }, + { + "key": "CCC", + "message": "message1669" + }, + { + "key": "DDD", + "message": "message1670" + }, + { + "key": "", + "message": "message1671" + }, + { + "key": "AAA", + "message": "message1672" + }, + { + "key": "BBB", + "message": "message1673" + }, + { + "key": "CCC", + "message": "message1674" + }, + { + "key": "DDD", + "message": "message1675" + }, + { + "key": "", + "message": "message1676" + }, + { + "key": "AAA", + "message": "message1677" + }, + { + "key": "BBB", + "message": "message1678" + }, + { + "key": "CCC", + "message": "message1679" + }, + { + "key": "DDD", + "message": "message1680" + }, + { + "key": "", + "message": "message1681" + }, + { + "key": "AAA", + "message": "message1682" + }, + { + "key": "BBB", + "message": "message1683" + }, + { + "key": "CCC", + "message": "message1684" + }, + { + "key": "DDD", + "message": "message1685" + }, + { + "key": "", + "message": "message1686" + }, + { + "key": "AAA", + "message": "message1687" + }, + { + "key": "BBB", + "message": "message1688" + }, + { + "key": "CCC", + "message": "message1689" + }, + { + "key": "DDD", + "message": "message1690" + }, + { + "key": "", + "message": "message1691" + }, + { + "key": "AAA", + "message": "message1692" + }, + { + "key": "BBB", + "message": "message1693" + }, + { + "key": "CCC", + "message": "message1694" + }, + { + "key": "DDD", + "message": "message1695" + }, + { + "key": "", + "message": "message1696" + }, + { + "key": "AAA", + "message": "message1697" + }, + { + "key": "BBB", + "message": "message1698" + }, + { + "key": "CCC", + "message": "message1699" + }, + { + "key": "DDD", + "message": "message1700" + }, + { + "key": "", + "message": "message1701" + }, + { + "key": "AAA", + "message": "message1702" + }, + { + "key": "BBB", + "message": "message1703" + }, + { + "key": "CCC", + "message": "message1704" + }, + { + "key": "DDD", + "message": "message1705" + }, + { + "key": "", + "message": "message1706" + }, + { + "key": "AAA", + "message": "message1707" + }, + { + "key": "BBB", + "message": "message1708" + }, + { + "key": "CCC", + "message": "message1709" + }, + { + "key": "DDD", + "message": "message1710" + }, + { + "key": "", + "message": "message1711" + }, + { + "key": "AAA", + "message": "message1712" + }, + { + "key": "BBB", + "message": "message1713" + }, + { + "key": "CCC", + "message": "message1714" + }, + { + "key": "DDD", + "message": "message1715" + }, + { + "key": "", + "message": "message1716" + }, + { + "key": "AAA", + "message": "message1717" + }, + { + "key": "BBB", + "message": "message1718" + }, + { + "key": "CCC", + "message": "message1719" + }, + { + "key": "DDD", + "message": "message1720" + }, + { + "key": "", + "message": "message1721" + }, + { + "key": "AAA", + "message": "message1722" + }, + { + "key": "BBB", + "message": "message1723" + }, + { + "key": "CCC", + "message": "message1724" + }, + { + "key": "DDD", + "message": "message1725" + }, + { + "key": "", + "message": "message1726" + }, + { + "key": "AAA", + "message": "message1727" + }, + { + "key": "BBB", + "message": "message1728" + }, + { + "key": "CCC", + "message": "message1729" + }, + { + "key": "DDD", + "message": "message1730" + }, + { + "key": "", + "message": "message1731" + }, + { + "key": "AAA", + "message": "message1732" + }, + { + "key": "BBB", + "message": "message1733" + }, + { + "key": "CCC", + "message": "message1734" + }, + { + "key": "DDD", + "message": "message1735" + }, + { + "key": "", + "message": "message1736" + }, + { + "key": "AAA", + "message": "message1737" + }, + { + "key": "BBB", + "message": "message1738" + }, + { + "key": "CCC", + "message": "message1739" + }, + { + "key": "DDD", + "message": "message1740" + }, + { + "key": "", + "message": "message1741" + }, + { + "key": "AAA", + "message": "message1742" + }, + { + "key": "BBB", + "message": "message1743" + }, + { + "key": "CCC", + "message": "message1744" + }, + { + "key": "DDD", + "message": "message1745" + }, + { + "key": "", + "message": "message1746" + }, + { + "key": "AAA", + "message": "message1747" + }, + { + "key": "BBB", + "message": "message1748" + }, + { + "key": "CCC", + "message": "message1749" + }, + { + "key": "DDD", + "message": "message1750" + }, + { + "key": "", + "message": "message1751" + }, + { + "key": "AAA", + "message": "message1752" + }, + { + "key": "BBB", + "message": "message1753" + }, + { + "key": "CCC", + "message": "message1754" + }, + { + "key": "DDD", + "message": "message1755" + }, + { + "key": "", + "message": "message1756" + }, + { + "key": "AAA", + "message": "message1757" + }, + { + "key": "BBB", + "message": "message1758" + }, + { + "key": "CCC", + "message": "message1759" + }, + { + "key": "DDD", + "message": "message1760" + }, + { + "key": "", + "message": "message1761" + }, + { + "key": "AAA", + "message": "message1762" + }, + { + "key": "BBB", + "message": "message1763" + }, + { + "key": "CCC", + "message": "message1764" + }, + { + "key": "DDD", + "message": "message1765" + }, + { + "key": "", + "message": "message1766" + }, + { + "key": "AAA", + "message": "message1767" + }, + { + "key": "BBB", + "message": "message1768" + }, + { + "key": "CCC", + "message": "message1769" + }, + { + "key": "DDD", + "message": "message1770" + }, + { + "key": "", + "message": "message1771" + }, + { + "key": "AAA", + "message": "message1772" + }, + { + "key": "BBB", + "message": "message1773" + }, + { + "key": "CCC", + "message": "message1774" + }, + { + "key": "DDD", + "message": "message1775" + }, + { + "key": "", + "message": "message1776" + }, + { + "key": "AAA", + "message": "message1777" + }, + { + "key": "BBB", + "message": "message1778" + }, + { + "key": "CCC", + "message": "message1779" + }, + { + "key": "DDD", + "message": "message1780" + }, + { + "key": "", + "message": "message1781" + }, + { + "key": "AAA", + "message": "message1782" + }, + { + "key": "BBB", + "message": "message1783" + }, + { + "key": "CCC", + "message": "message1784" + }, + { + "key": "DDD", + "message": "message1785" + }, + { + "key": "", + "message": "message1786" + }, + { + "key": "AAA", + "message": "message1787" + }, + { + "key": "BBB", + "message": "message1788" + }, + { + "key": "CCC", + "message": "message1789" + }, + { + "key": "DDD", + "message": "message1790" + }, + { + "key": "", + "message": "message1791" + }, + { + "key": "AAA", + "message": "message1792" + }, + { + "key": "BBB", + "message": "message1793" + }, + { + "key": "CCC", + "message": "message1794" + }, + { + "key": "DDD", + "message": "message1795" + }, + { + "key": "", + "message": "message1796" + }, + { + "key": "AAA", + "message": "message1797" + }, + { + "key": "BBB", + "message": "message1798" + }, + { + "key": "CCC", + "message": "message1799" + }, + { + "key": "DDD", + "message": "message1800" + }, + { + "key": "", + "message": "message1801" + }, + { + "key": "AAA", + "message": "message1802" + }, + { + "key": "BBB", + "message": "message1803" + }, + { + "key": "CCC", + "message": "message1804" + }, + { + "key": "DDD", + "message": "message1805" + }, + { + "key": "", + "message": "message1806" + }, + { + "key": "AAA", + "message": "message1807" + }, + { + "key": "BBB", + "message": "message1808" + }, + { + "key": "CCC", + "message": "message1809" + }, + { + "key": "DDD", + "message": "message1810" + }, + { + "key": "", + "message": "message1811" + }, + { + "key": "AAA", + "message": "message1812" + }, + { + "key": "BBB", + "message": "message1813" + }, + { + "key": "CCC", + "message": "message1814" + }, + { + "key": "DDD", + "message": "message1815" + }, + { + "key": "", + "message": "message1816" + }, + { + "key": "AAA", + "message": "message1817" + }, + { + "key": "BBB", + "message": "message1818" + }, + { + "key": "CCC", + "message": "message1819" + }, + { + "key": "DDD", + "message": "message1820" + }, + { + "key": "", + "message": "message1821" + }, + { + "key": "AAA", + "message": "message1822" + }, + { + "key": "BBB", + "message": "message1823" + }, + { + "key": "CCC", + "message": "message1824" + }, + { + "key": "DDD", + "message": "message1825" + }, + { + "key": "", + "message": "message1826" + }, + { + "key": "AAA", + "message": "message1827" + }, + { + "key": "BBB", + "message": "message1828" + }, + { + "key": "CCC", + "message": "message1829" + }, + { + "key": "DDD", + "message": "message1830" + }, + { + "key": "", + "message": "message1831" + }, + { + "key": "AAA", + "message": "message1832" + }, + { + "key": "BBB", + "message": "message1833" + }, + { + "key": "CCC", + "message": "message1834" + }, + { + "key": "DDD", + "message": "message1835" + }, + { + "key": "", + "message": "message1836" + }, + { + "key": "AAA", + "message": "message1837" + }, + { + "key": "BBB", + "message": "message1838" + }, + { + "key": "CCC", + "message": "message1839" + }, + { + "key": "DDD", + "message": "message1840" + }, + { + "key": "", + "message": "message1841" + }, + { + "key": "AAA", + "message": "message1842" + }, + { + "key": "BBB", + "message": "message1843" + }, + { + "key": "CCC", + "message": "message1844" + }, + { + "key": "DDD", + "message": "message1845" + }, + { + "key": "", + "message": "message1846" + }, + { + "key": "AAA", + "message": "message1847" + }, + { + "key": "BBB", + "message": "message1848" + }, + { + "key": "CCC", + "message": "message1849" + }, + { + "key": "DDD", + "message": "message1850" + }, + { + "key": "", + "message": "message1851" + }, + { + "key": "AAA", + "message": "message1852" + }, + { + "key": "BBB", + "message": "message1853" + }, + { + "key": "CCC", + "message": "message1854" + }, + { + "key": "DDD", + "message": "message1855" + }, + { + "key": "", + "message": "message1856" + }, + { + "key": "AAA", + "message": "message1857" + }, + { + "key": "BBB", + "message": "message1858" + }, + { + "key": "CCC", + "message": "message1859" + }, + { + "key": "DDD", + "message": "message1860" + }, + { + "key": "", + "message": "message1861" + }, + { + "key": "AAA", + "message": "message1862" + }, + { + "key": "BBB", + "message": "message1863" + }, + { + "key": "CCC", + "message": "message1864" + }, + { + "key": "DDD", + "message": "message1865" + }, + { + "key": "", + "message": "message1866" + }, + { + "key": "AAA", + "message": "message1867" + }, + { + "key": "BBB", + "message": "message1868" + }, + { + "key": "CCC", + "message": "message1869" + }, + { + "key": "DDD", + "message": "message1870" + }, + { + "key": "", + "message": "message1871" + }, + { + "key": "AAA", + "message": "message1872" + }, + { + "key": "BBB", + "message": "message1873" + }, + { + "key": "CCC", + "message": "message1874" + }, + { + "key": "DDD", + "message": "message1875" + }, + { + "key": "", + "message": "message1876" + }, + { + "key": "AAA", + "message": "message1877" + }, + { + "key": "BBB", + "message": "message1878" + }, + { + "key": "CCC", + "message": "message1879" + }, + { + "key": "DDD", + "message": "message1880" + }, + { + "key": "", + "message": "message1881" + }, + { + "key": "AAA", + "message": "message1882" + }, + { + "key": "BBB", + "message": "message1883" + }, + { + "key": "CCC", + "message": "message1884" + }, + { + "key": "DDD", + "message": "message1885" + }, + { + "key": "", + "message": "message1886" + }, + { + "key": "AAA", + "message": "message1887" + }, + { + "key": "BBB", + "message": "message1888" + }, + { + "key": "CCC", + "message": "message1889" + }, + { + "key": "DDD", + "message": "message1890" + }, + { + "key": "", + "message": "message1891" + }, + { + "key": "AAA", + "message": "message1892" + }, + { + "key": "BBB", + "message": "message1893" + }, + { + "key": "CCC", + "message": "message1894" + }, + { + "key": "DDD", + "message": "message1895" + }, + { + "key": "", + "message": "message1896" + }, + { + "key": "AAA", + "message": "message1897" + }, + { + "key": "BBB", + "message": "message1898" + }, + { + "key": "CCC", + "message": "message1899" + }, + { + "key": "DDD", + "message": "message1900" + }, + { + "key": "", + "message": "message1901" + }, + { + "key": "AAA", + "message": "message1902" + }, + { + "key": "BBB", + "message": "message1903" + }, + { + "key": "CCC", + "message": "message1904" + }, + { + "key": "DDD", + "message": "message1905" + }, + { + "key": "", + "message": "message1906" + }, + { + "key": "AAA", + "message": "message1907" + }, + { + "key": "BBB", + "message": "message1908" + }, + { + "key": "CCC", + "message": "message1909" + }, + { + "key": "DDD", + "message": "message1910" + }, + { + "key": "", + "message": "message1911" + }, + { + "key": "AAA", + "message": "message1912" + }, + { + "key": "BBB", + "message": "message1913" + }, + { + "key": "CCC", + "message": "message1914" + }, + { + "key": "DDD", + "message": "message1915" + }, + { + "key": "", + "message": "message1916" + }, + { + "key": "AAA", + "message": "message1917" + }, + { + "key": "BBB", + "message": "message1918" + }, + { + "key": "CCC", + "message": "message1919" + }, + { + "key": "DDD", + "message": "message1920" + }, + { + "key": "", + "message": "message1921" + }, + { + "key": "AAA", + "message": "message1922" + }, + { + "key": "BBB", + "message": "message1923" + }, + { + "key": "CCC", + "message": "message1924" + }, + { + "key": "DDD", + "message": "message1925" + }, + { + "key": "", + "message": "message1926" + }, + { + "key": "AAA", + "message": "message1927" + }, + { + "key": "BBB", + "message": "message1928" + }, + { + "key": "CCC", + "message": "message1929" + }, + { + "key": "DDD", + "message": "message1930" + }, + { + "key": "", + "message": "message1931" + }, + { + "key": "AAA", + "message": "message1932" + }, + { + "key": "BBB", + "message": "message1933" + }, + { + "key": "CCC", + "message": "message1934" + }, + { + "key": "DDD", + "message": "message1935" + }, + { + "key": "", + "message": "message1936" + }, + { + "key": "AAA", + "message": "message1937" + }, + { + "key": "BBB", + "message": "message1938" + }, + { + "key": "CCC", + "message": "message1939" + }, + { + "key": "DDD", + "message": "message1940" + }, + { + "key": "", + "message": "message1941" + }, + { + "key": "AAA", + "message": "message1942" + }, + { + "key": "BBB", + "message": "message1943" + }, + { + "key": "CCC", + "message": "message1944" + }, + { + "key": "DDD", + "message": "message1945" + }, + { + "key": "", + "message": "message1946" + }, + { + "key": "AAA", + "message": "message1947" + }, + { + "key": "BBB", + "message": "message1948" + }, + { + "key": "CCC", + "message": "message1949" + }, + { + "key": "DDD", + "message": "message1950" + }, + { + "key": "", + "message": "message1951" + }, + { + "key": "AAA", + "message": "message1952" + }, + { + "key": "BBB", + "message": "message1953" + }, + { + "key": "CCC", + "message": "message1954" + }, + { + "key": "DDD", + "message": "message1955" + }, + { + "key": "", + "message": "message1956" + }, + { + "key": "AAA", + "message": "message1957" + }, + { + "key": "BBB", + "message": "message1958" + }, + { + "key": "CCC", + "message": "message1959" + }, + { + "key": "DDD", + "message": "message1960" + }, + { + "key": "", + "message": "message1961" + }, + { + "key": "AAA", + "message": "message1962" + }, + { + "key": "BBB", + "message": "message1963" + }, + { + "key": "CCC", + "message": "message1964" + }, + { + "key": "DDD", + "message": "message1965" + }, + { + "key": "", + "message": "message1966" + }, + { + "key": "AAA", + "message": "message1967" + }, + { + "key": "BBB", + "message": "message1968" + }, + { + "key": "CCC", + "message": "message1969" + }, + { + "key": "DDD", + "message": "message1970" + }, + { + "key": "", + "message": "message1971" + }, + { + "key": "AAA", + "message": "message1972" + }, + { + "key": "BBB", + "message": "message1973" + }, + { + "key": "CCC", + "message": "message1974" + }, + { + "key": "DDD", + "message": "message1975" + }, + { + "key": "", + "message": "message1976" + }, + { + "key": "AAA", + "message": "message1977" + }, + { + "key": "BBB", + "message": "message1978" + }, + { + "key": "CCC", + "message": "message1979" + }, + { + "key": "DDD", + "message": "message1980" + }, + { + "key": "", + "message": "message1981" + }, + { + "key": "AAA", + "message": "message1982" + }, + { + "key": "BBB", + "message": "message1983" + }, + { + "key": "CCC", + "message": "message1984" + }, + { + "key": "DDD", + "message": "message1985" + }, + { + "key": "", + "message": "message1986" + }, + { + "key": "AAA", + "message": "message1987" + }, + { + "key": "BBB", + "message": "message1988" + }, + { + "key": "CCC", + "message": "message1989" + }, + { + "key": "DDD", + "message": "message1990" + }, + { + "key": "", + "message": "message1991" + }, + { + "key": "AAA", + "message": "message1992" + }, + { + "key": "BBB", + "message": "message1993" + }, + { + "key": "CCC", + "message": "message1994" + }, + { + "key": "DDD", + "message": "message1995" + }, + { + "key": "", + "message": "message1996" + }, + { + "key": "AAA", + "message": "message1997" + }, + { + "key": "BBB", + "message": "message1998" + }, + { + "key": "CCC", + "message": "message1999" + }, + { + "key": "DDD", + "message": "message2000" + }, + { + "key": "", + "message": "message2001" + }, + { + "key": "", + "message": "message2002" + }, + { + "key": "", + "message": "message2003" + }, + { + "key": "", + "message": "message2004" + }, + { + "key": "", + "message": "message2005" + }, + { + "key": "", + "message": "message2006" + }, + { + "key": "", + "message": "message2007" + }, + { + "key": "", + "message": "message2008" + }, + { + "key": "", + "message": "message2009" + }, + { + "key": "", + "message": "message2010" + }, + { + "key": "", + "message": "message2011" + }, + { + "key": "", + "message": "message2012" + }, + { + "key": "", + "message": "message2013" + }, + { + "key": "", + "message": "message2014" + }, + { + "key": "", + "message": "message2015" + }, + { + "key": "", + "message": "message2016" + }, + { + "key": "", + "message": "message2017" + }, + { + "key": "", + "message": "message2018" + }, + { + "key": "", + "message": "message2019" + }, + { + "key": "", + "message": "message2020" + }, + { + "key": "", + "message": "message2021" + }, + { + "key": "", + "message": "message2022" + }, + { + "key": "", + "message": "message2023" + }, + { + "key": "", + "message": "message2024" + }, + { + "key": "", + "message": "message2025" + }, + { + "key": "", + "message": "message2026" + }, + { + "key": "", + "message": "message2027" + }, + { + "key": "", + "message": "message2028" + }, + { + "key": "", + "message": "message2029" + }, + { + "key": "", + "message": "message2030" + }, + { + "key": "", + "message": "message2031" + }, + { + "key": "", + "message": "message2032" + }, + { + "key": "", + "message": "message2033" + }, + { + "key": "", + "message": "message2034" + }, + { + "key": "", + "message": "message2035" + }, + { + "key": "", + "message": "message2036" + }, + { + "key": "", + "message": "message2037" + }, + { + "key": "", + "message": "message2038" + }, + { + "key": "", + "message": "message2039" + }, + { + "key": "", + "message": "message2040" + }, + { + "key": "", + "message": "message2041" + }, + { + "key": "", + "message": "message2042" + }, + { + "key": "", + "message": "message2043" + }, + { + "key": "", + "message": "message2044" + }, + { + "key": "", + "message": "message2045" + }, + { + "key": "", + "message": "message2046" + }, + { + "key": "", + "message": "message2047" + }, + { + "key": "", + "message": "message2048" + }, + { + "key": "", + "message": "message2049" + }, + { + "key": "", + "message": "message2050" + }, + { + "key": "", + "message": "message2051" + }, + { + "key": "", + "message": "message2052" + }, + { + "key": "", + "message": "message2053" + }, + { + "key": "", + "message": "message2054" + }, + { + "key": "", + "message": "message2055" + }, + { + "key": "", + "message": "message2056" + }, + { + "key": "", + "message": "message2057" + }, + { + "key": "", + "message": "message2058" + }, + { + "key": "", + "message": "message2059" + }, + { + "key": "", + "message": "message2060" + }, + { + "key": "", + "message": "message2061" + }, + { + "key": "", + "message": "message2062" + }, + { + "key": "", + "message": "message2063" + }, + { + "key": "", + "message": "message2064" + }, + { + "key": "", + "message": "message2065" + }, + { + "key": "", + "message": "message2066" + }, + { + "key": "", + "message": "message2067" + }, + { + "key": "", + "message": "message2068" + }, + { + "key": "", + "message": "message2069" + }, + { + "key": "", + "message": "message2070" + }, + { + "key": "", + "message": "message2071" + }, + { + "key": "", + "message": "message2072" + }, + { + "key": "", + "message": "message2073" + }, + { + "key": "", + "message": "message2074" + }, + { + "key": "", + "message": "message2075" + }, + { + "key": "", + "message": "message2076" + }, + { + "key": "", + "message": "message2077" + }, + { + "key": "", + "message": "message2078" + }, + { + "key": "", + "message": "message2079" + }, + { + "key": "", + "message": "message2080" + }, + { + "key": "", + "message": "message2081" + }, + { + "key": "", + "message": "message2082" + }, + { + "key": "", + "message": "message2083" + }, + { + "key": "", + "message": "message2084" + }, + { + "key": "", + "message": "message2085" + }, + { + "key": "", + "message": "message2086" + }, + { + "key": "", + "message": "message2087" + }, + { + "key": "", + "message": "message2088" + }, + { + "key": "", + "message": "message2089" + }, + { + "key": "", + "message": "message2090" + }, + { + "key": "", + "message": "message2091" + }, + { + "key": "", + "message": "message2092" + }, + { + "key": "", + "message": "message2093" + }, + { + "key": "", + "message": "message2094" + }, + { + "key": "", + "message": "message2095" + }, + { + "key": "", + "message": "message2096" + }, + { + "key": "", + "message": "message2097" + }, + { + "key": "", + "message": "message2098" + }, + { + "key": "", + "message": "message2099" + }, + { + "key": "", + "message": "message2100" + }, + { + "key": "", + "message": "message2101" + }, + { + "key": "", + "message": "message2102" + }, + { + "key": "", + "message": "message2103" + }, + { + "key": "", + "message": "message2104" + }, + { + "key": "", + "message": "message2105" + }, + { + "key": "", + "message": "message2106" + }, + { + "key": "", + "message": "message2107" + }, + { + "key": "", + "message": "message2108" + }, + { + "key": "", + "message": "message2109" + }, + { + "key": "", + "message": "message2110" + }, + { + "key": "", + "message": "message2111" + }, + { + "key": "", + "message": "message2112" + }, + { + "key": "", + "message": "message2113" + }, + { + "key": "", + "message": "message2114" + }, + { + "key": "", + "message": "message2115" + }, + { + "key": "", + "message": "message2116" + }, + { + "key": "", + "message": "message2117" + }, + { + "key": "", + "message": "message2118" + }, + { + "key": "", + "message": "message2119" + }, + { + "key": "", + "message": "message2120" + }, + { + "key": "", + "message": "message2121" + }, + { + "key": "", + "message": "message2122" + }, + { + "key": "", + "message": "message2123" + }, + { + "key": "", + "message": "message2124" + }, + { + "key": "", + "message": "message2125" + }, + { + "key": "", + "message": "message2126" + }, + { + "key": "", + "message": "message2127" + }, + { + "key": "", + "message": "message2128" + }, + { + "key": "", + "message": "message2129" + }, + { + "key": "", + "message": "message2130" + }, + { + "key": "", + "message": "message2131" + }, + { + "key": "", + "message": "message2132" + }, + { + "key": "", + "message": "message2133" + }, + { + "key": "", + "message": "message2134" + }, + { + "key": "", + "message": "message2135" + }, + { + "key": "", + "message": "message2136" + }, + { + "key": "", + "message": "message2137" + }, + { + "key": "", + "message": "message2138" + }, + { + "key": "", + "message": "message2139" + }, + { + "key": "", + "message": "message2140" + }, + { + "key": "", + "message": "message2141" + }, + { + "key": "", + "message": "message2142" + }, + { + "key": "", + "message": "message2143" + }, + { + "key": "", + "message": "message2144" + }, + { + "key": "", + "message": "message2145" + }, + { + "key": "", + "message": "message2146" + }, + { + "key": "", + "message": "message2147" + }, + { + "key": "", + "message": "message2148" + }, + { + "key": "", + "message": "message2149" + }, + { + "key": "", + "message": "message2150" + }, + { + "key": "", + "message": "message2151" + }, + { + "key": "", + "message": "message2152" + }, + { + "key": "", + "message": "message2153" + }, + { + "key": "", + "message": "message2154" + }, + { + "key": "", + "message": "message2155" + }, + { + "key": "", + "message": "message2156" + }, + { + "key": "", + "message": "message2157" + }, + { + "key": "", + "message": "message2158" + }, + { + "key": "", + "message": "message2159" + }, + { + "key": "", + "message": "message2160" + }, + { + "key": "", + "message": "message2161" + }, + { + "key": "", + "message": "message2162" + }, + { + "key": "", + "message": "message2163" + }, + { + "key": "", + "message": "message2164" + }, + { + "key": "", + "message": "message2165" + }, + { + "key": "", + "message": "message2166" + }, + { + "key": "", + "message": "message2167" + }, + { + "key": "", + "message": "message2168" + }, + { + "key": "", + "message": "message2169" + }, + { + "key": "", + "message": "message2170" + }, + { + "key": "", + "message": "message2171" + }, + { + "key": "", + "message": "message2172" + }, + { + "key": "", + "message": "message2173" + }, + { + "key": "", + "message": "message2174" + }, + { + "key": "", + "message": "message2175" + }, + { + "key": "", + "message": "message2176" + }, + { + "key": "", + "message": "message2177" + }, + { + "key": "", + "message": "message2178" + }, + { + "key": "", + "message": "message2179" + }, + { + "key": "", + "message": "message2180" + }, + { + "key": "", + "message": "message2181" + }, + { + "key": "", + "message": "message2182" + }, + { + "key": "", + "message": "message2183" + }, + { + "key": "", + "message": "message2184" + }, + { + "key": "", + "message": "message2185" + }, + { + "key": "", + "message": "message2186" + }, + { + "key": "", + "message": "message2187" + }, + { + "key": "", + "message": "message2188" + }, + { + "key": "", + "message": "message2189" + }, + { + "key": "", + "message": "message2190" + }, + { + "key": "", + "message": "message2191" + }, + { + "key": "", + "message": "message2192" + }, + { + "key": "", + "message": "message2193" + }, + { + "key": "", + "message": "message2194" + }, + { + "key": "", + "message": "message2195" + }, + { + "key": "", + "message": "message2196" + }, + { + "key": "", + "message": "message2197" + }, + { + "key": "", + "message": "message2198" + }, + { + "key": "", + "message": "message2199" + }, + { + "key": "", + "message": "message2200" + }, + { + "key": "", + "message": "message2201" + }, + { + "key": "", + "message": "message2202" + }, + { + "key": "", + "message": "message2203" + }, + { + "key": "", + "message": "message2204" + }, + { + "key": "", + "message": "message2205" + }, + { + "key": "", + "message": "message2206" + }, + { + "key": "", + "message": "message2207" + }, + { + "key": "", + "message": "message2208" + }, + { + "key": "", + "message": "message2209" + }, + { + "key": "", + "message": "message2210" + }, + { + "key": "", + "message": "message2211" + }, + { + "key": "", + "message": "message2212" + }, + { + "key": "", + "message": "message2213" + }, + { + "key": "", + "message": "message2214" + }, + { + "key": "", + "message": "message2215" + }, + { + "key": "", + "message": "message2216" + }, + { + "key": "", + "message": "message2217" + }, + { + "key": "", + "message": "message2218" + }, + { + "key": "", + "message": "message2219" + }, + { + "key": "", + "message": "message2220" + }, + { + "key": "", + "message": "message2221" + }, + { + "key": "", + "message": "message2222" + }, + { + "key": "", + "message": "message2223" + }, + { + "key": "", + "message": "message2224" + }, + { + "key": "", + "message": "message2225" + }, + { + "key": "", + "message": "message2226" + }, + { + "key": "", + "message": "message2227" + }, + { + "key": "", + "message": "message2228" + }, + { + "key": "", + "message": "message2229" + }, + { + "key": "", + "message": "message2230" + }, + { + "key": "", + "message": "message2231" + }, + { + "key": "", + "message": "message2232" + }, + { + "key": "", + "message": "message2233" + }, + { + "key": "", + "message": "message2234" + }, + { + "key": "", + "message": "message2235" + }, + { + "key": "", + "message": "message2236" + }, + { + "key": "", + "message": "message2237" + }, + { + "key": "", + "message": "message2238" + }, + { + "key": "", + "message": "message2239" + }, + { + "key": "", + "message": "message2240" + }, + { + "key": "", + "message": "message2241" + }, + { + "key": "", + "message": "message2242" + }, + { + "key": "", + "message": "message2243" + }, + { + "key": "", + "message": "message2244" + }, + { + "key": "", + "message": "message2245" + }, + { + "key": "", + "message": "message2246" + }, + { + "key": "", + "message": "message2247" + }, + { + "key": "", + "message": "message2248" + }, + { + "key": "", + "message": "message2249" + }, + { + "key": "", + "message": "message2250" + }, + { + "key": "", + "message": "message2251" + }, + { + "key": "", + "message": "message2252" + }, + { + "key": "", + "message": "message2253" + }, + { + "key": "", + "message": "message2254" + }, + { + "key": "", + "message": "message2255" + }, + { + "key": "", + "message": "message2256" + }, + { + "key": "", + "message": "message2257" + }, + { + "key": "", + "message": "message2258" + }, + { + "key": "", + "message": "message2259" + }, + { + "key": "", + "message": "message2260" + }, + { + "key": "", + "message": "message2261" + }, + { + "key": "", + "message": "message2262" + }, + { + "key": "", + "message": "message2263" + }, + { + "key": "", + "message": "message2264" + }, + { + "key": "", + "message": "message2265" + }, + { + "key": "", + "message": "message2266" + }, + { + "key": "", + "message": "message2267" + }, + { + "key": "", + "message": "message2268" + }, + { + "key": "", + "message": "message2269" + }, + { + "key": "", + "message": "message2270" + }, + { + "key": "", + "message": "message2271" + }, + { + "key": "", + "message": "message2272" + }, + { + "key": "", + "message": "message2273" + }, + { + "key": "", + "message": "message2274" + }, + { + "key": "", + "message": "message2275" + }, + { + "key": "", + "message": "message2276" + }, + { + "key": "", + "message": "message2277" + }, + { + "key": "", + "message": "message2278" + }, + { + "key": "", + "message": "message2279" + }, + { + "key": "", + "message": "message2280" + }, + { + "key": "", + "message": "message2281" + }, + { + "key": "", + "message": "message2282" + }, + { + "key": "", + "message": "message2283" + }, + { + "key": "", + "message": "message2284" + }, + { + "key": "", + "message": "message2285" + }, + { + "key": "", + "message": "message2286" + }, + { + "key": "", + "message": "message2287" + }, + { + "key": "", + "message": "message2288" + }, + { + "key": "", + "message": "message2289" + }, + { + "key": "", + "message": "message2290" + }, + { + "key": "", + "message": "message2291" + }, + { + "key": "", + "message": "message2292" + }, + { + "key": "", + "message": "message2293" + }, + { + "key": "", + "message": "message2294" + }, + { + "key": "", + "message": "message2295" + }, + { + "key": "", + "message": "message2296" + }, + { + "key": "", + "message": "message2297" + }, + { + "key": "", + "message": "message2298" + }, + { + "key": "", + "message": "message2299" + }, + { + "key": "", + "message": "message2300" + }, + { + "key": "", + "message": "message2301" + }, + { + "key": "", + "message": "message2302" + }, + { + "key": "", + "message": "message2303" + }, + { + "key": "", + "message": "message2304" + }, + { + "key": "", + "message": "message2305" + }, + { + "key": "", + "message": "message2306" + }, + { + "key": "", + "message": "message2307" + }, + { + "key": "", + "message": "message2308" + }, + { + "key": "", + "message": "message2309" + }, + { + "key": "", + "message": "message2310" + }, + { + "key": "", + "message": "message2311" + }, + { + "key": "", + "message": "message2312" + }, + { + "key": "", + "message": "message2313" + }, + { + "key": "", + "message": "message2314" + }, + { + "key": "", + "message": "message2315" + }, + { + "key": "", + "message": "message2316" + }, + { + "key": "", + "message": "message2317" + }, + { + "key": "", + "message": "message2318" + }, + { + "key": "", + "message": "message2319" + }, + { + "key": "", + "message": "message2320" + }, + { + "key": "", + "message": "message2321" + }, + { + "key": "", + "message": "message2322" + }, + { + "key": "", + "message": "message2323" + }, + { + "key": "", + "message": "message2324" + }, + { + "key": "", + "message": "message2325" + }, + { + "key": "", + "message": "message2326" + }, + { + "key": "", + "message": "message2327" + }, + { + "key": "", + "message": "message2328" + }, + { + "key": "", + "message": "message2329" + }, + { + "key": "", + "message": "message2330" + }, + { + "key": "", + "message": "message2331" + }, + { + "key": "", + "message": "message2332" + }, + { + "key": "", + "message": "message2333" + }, + { + "key": "", + "message": "message2334" + }, + { + "key": "", + "message": "message2335" + }, + { + "key": "", + "message": "message2336" + }, + { + "key": "", + "message": "message2337" + }, + { + "key": "", + "message": "message2338" + }, + { + "key": "", + "message": "message2339" + }, + { + "key": "", + "message": "message2340" + }, + { + "key": "", + "message": "message2341" + }, + { + "key": "", + "message": "message2342" + }, + { + "key": "", + "message": "message2343" + }, + { + "key": "", + "message": "message2344" + }, + { + "key": "", + "message": "message2345" + }, + { + "key": "", + "message": "message2346" + }, + { + "key": "", + "message": "message2347" + }, + { + "key": "", + "message": "message2348" + }, + { + "key": "", + "message": "message2349" + }, + { + "key": "", + "message": "message2350" + }, + { + "key": "", + "message": "message2351" + }, + { + "key": "", + "message": "message2352" + }, + { + "key": "", + "message": "message2353" + }, + { + "key": "", + "message": "message2354" + }, + { + "key": "", + "message": "message2355" + }, + { + "key": "", + "message": "message2356" + }, + { + "key": "", + "message": "message2357" + }, + { + "key": "", + "message": "message2358" + }, + { + "key": "", + "message": "message2359" + }, + { + "key": "", + "message": "message2360" + }, + { + "key": "", + "message": "message2361" + }, + { + "key": "", + "message": "message2362" + }, + { + "key": "", + "message": "message2363" + }, + { + "key": "", + "message": "message2364" + }, + { + "key": "", + "message": "message2365" + }, + { + "key": "", + "message": "message2366" + }, + { + "key": "", + "message": "message2367" + }, + { + "key": "", + "message": "message2368" + }, + { + "key": "", + "message": "message2369" + }, + { + "key": "", + "message": "message2370" + }, + { + "key": "", + "message": "message2371" + }, + { + "key": "", + "message": "message2372" + }, + { + "key": "", + "message": "message2373" + }, + { + "key": "", + "message": "message2374" + }, + { + "key": "", + "message": "message2375" + }, + { + "key": "", + "message": "message2376" + }, + { + "key": "", + "message": "message2377" + }, + { + "key": "", + "message": "message2378" + }, + { + "key": "", + "message": "message2379" + }, + { + "key": "", + "message": "message2380" + }, + { + "key": "", + "message": "message2381" + }, + { + "key": "", + "message": "message2382" + }, + { + "key": "", + "message": "message2383" + }, + { + "key": "", + "message": "message2384" + }, + { + "key": "", + "message": "message2385" + }, + { + "key": "", + "message": "message2386" + }, + { + "key": "", + "message": "message2387" + }, + { + "key": "", + "message": "message2388" + }, + { + "key": "", + "message": "message2389" + }, + { + "key": "", + "message": "message2390" + }, + { + "key": "", + "message": "message2391" + }, + { + "key": "", + "message": "message2392" + }, + { + "key": "", + "message": "message2393" + }, + { + "key": "", + "message": "message2394" + }, + { + "key": "", + "message": "message2395" + }, + { + "key": "", + "message": "message2396" + }, + { + "key": "", + "message": "message2397" + }, + { + "key": "", + "message": "message2398" + }, + { + "key": "", + "message": "message2399" + }, + { + "key": "", + "message": "message2400" + }, + { + "key": "AAA", + "message": "message2401" + }, + { + "key": "AAA", + "message": "message2402" + }, + { + "key": "AAA", + "message": "message2403" + }, + { + "key": "AAA", + "message": "message2404" + }, + { + "key": "AAA", + "message": "message2405" + }, + { + "key": "AAA", + "message": "message2406" + }, + { + "key": "AAA", + "message": "message2407" + }, + { + "key": "AAA", + "message": "message2408" + }, + { + "key": "AAA", + "message": "message2409" + }, + { + "key": "AAA", + "message": "message2410" + }, + { + "key": "AAA", + "message": "message2411" + }, + { + "key": "AAA", + "message": "message2412" + }, + { + "key": "AAA", + "message": "message2413" + }, + { + "key": "AAA", + "message": "message2414" + }, + { + "key": "AAA", + "message": "message2415" + }, + { + "key": "AAA", + "message": "message2416" + }, + { + "key": "AAA", + "message": "message2417" + }, + { + "key": "AAA", + "message": "message2418" + }, + { + "key": "AAA", + "message": "message2419" + }, + { + "key": "AAA", + "message": "message2420" + }, + { + "key": "AAA", + "message": "message2421" + }, + { + "key": "AAA", + "message": "message2422" + }, + { + "key": "AAA", + "message": "message2423" + }, + { + "key": "AAA", + "message": "message2424" + }, + { + "key": "AAA", + "message": "message2425" + }, + { + "key": "AAA", + "message": "message2426" + }, + { + "key": "AAA", + "message": "message2427" + }, + { + "key": "AAA", + "message": "message2428" + }, + { + "key": "AAA", + "message": "message2429" + }, + { + "key": "AAA", + "message": "message2430" + }, + { + "key": "AAA", + "message": "message2431" + }, + { + "key": "AAA", + "message": "message2432" + }, + { + "key": "AAA", + "message": "message2433" + }, + { + "key": "AAA", + "message": "message2434" + }, + { + "key": "AAA", + "message": "message2435" + }, + { + "key": "AAA", + "message": "message2436" + }, + { + "key": "AAA", + "message": "message2437" + }, + { + "key": "AAA", + "message": "message2438" + }, + { + "key": "AAA", + "message": "message2439" + }, + { + "key": "AAA", + "message": "message2440" + }, + { + "key": "AAA", + "message": "message2441" + }, + { + "key": "AAA", + "message": "message2442" + }, + { + "key": "AAA", + "message": "message2443" + }, + { + "key": "AAA", + "message": "message2444" + }, + { + "key": "AAA", + "message": "message2445" + }, + { + "key": "AAA", + "message": "message2446" + }, + { + "key": "AAA", + "message": "message2447" + }, + { + "key": "AAA", + "message": "message2448" + }, + { + "key": "AAA", + "message": "message2449" + }, + { + "key": "AAA", + "message": "message2450" + }, + { + "key": "AAA", + "message": "message2451" + }, + { + "key": "AAA", + "message": "message2452" + }, + { + "key": "AAA", + "message": "message2453" + }, + { + "key": "AAA", + "message": "message2454" + }, + { + "key": "AAA", + "message": "message2455" + }, + { + "key": "AAA", + "message": "message2456" + }, + { + "key": "AAA", + "message": "message2457" + }, + { + "key": "AAA", + "message": "message2458" + }, + { + "key": "AAA", + "message": "message2459" + }, + { + "key": "AAA", + "message": "message2460" + }, + { + "key": "AAA", + "message": "message2461" + }, + { + "key": "AAA", + "message": "message2462" + }, + { + "key": "AAA", + "message": "message2463" + }, + { + "key": "AAA", + "message": "message2464" + }, + { + "key": "AAA", + "message": "message2465" + }, + { + "key": "AAA", + "message": "message2466" + }, + { + "key": "AAA", + "message": "message2467" + }, + { + "key": "AAA", + "message": "message2468" + }, + { + "key": "AAA", + "message": "message2469" + }, + { + "key": "AAA", + "message": "message2470" + }, + { + "key": "AAA", + "message": "message2471" + }, + { + "key": "AAA", + "message": "message2472" + }, + { + "key": "AAA", + "message": "message2473" + }, + { + "key": "AAA", + "message": "message2474" + }, + { + "key": "AAA", + "message": "message2475" + }, + { + "key": "AAA", + "message": "message2476" + }, + { + "key": "AAA", + "message": "message2477" + }, + { + "key": "AAA", + "message": "message2478" + }, + { + "key": "AAA", + "message": "message2479" + }, + { + "key": "AAA", + "message": "message2480" + }, + { + "key": "AAA", + "message": "message2481" + }, + { + "key": "AAA", + "message": "message2482" + }, + { + "key": "AAA", + "message": "message2483" + }, + { + "key": "AAA", + "message": "message2484" + }, + { + "key": "AAA", + "message": "message2485" + }, + { + "key": "AAA", + "message": "message2486" + }, + { + "key": "AAA", + "message": "message2487" + }, + { + "key": "AAA", + "message": "message2488" + }, + { + "key": "AAA", + "message": "message2489" + }, + { + "key": "AAA", + "message": "message2490" + }, + { + "key": "AAA", + "message": "message2491" + }, + { + "key": "AAA", + "message": "message2492" + }, + { + "key": "AAA", + "message": "message2493" + }, + { + "key": "AAA", + "message": "message2494" + }, + { + "key": "AAA", + "message": "message2495" + }, + { + "key": "AAA", + "message": "message2496" + }, + { + "key": "AAA", + "message": "message2497" + }, + { + "key": "AAA", + "message": "message2498" + }, + { + "key": "AAA", + "message": "message2499" + }, + { + "key": "AAA", + "message": "message2500" + }, + { + "key": "AAA", + "message": "message2501" + }, + { + "key": "AAA", + "message": "message2502" + }, + { + "key": "AAA", + "message": "message2503" + }, + { + "key": "AAA", + "message": "message2504" + }, + { + "key": "AAA", + "message": "message2505" + }, + { + "key": "AAA", + "message": "message2506" + }, + { + "key": "AAA", + "message": "message2507" + }, + { + "key": "AAA", + "message": "message2508" + }, + { + "key": "AAA", + "message": "message2509" + }, + { + "key": "AAA", + "message": "message2510" + }, + { + "key": "AAA", + "message": "message2511" + }, + { + "key": "AAA", + "message": "message2512" + }, + { + "key": "AAA", + "message": "message2513" + }, + { + "key": "AAA", + "message": "message2514" + }, + { + "key": "AAA", + "message": "message2515" + }, + { + "key": "AAA", + "message": "message2516" + }, + { + "key": "AAA", + "message": "message2517" + }, + { + "key": "AAA", + "message": "message2518" + }, + { + "key": "AAA", + "message": "message2519" + }, + { + "key": "AAA", + "message": "message2520" + }, + { + "key": "AAA", + "message": "message2521" + }, + { + "key": "AAA", + "message": "message2522" + }, + { + "key": "AAA", + "message": "message2523" + }, + { + "key": "AAA", + "message": "message2524" + }, + { + "key": "AAA", + "message": "message2525" + }, + { + "key": "AAA", + "message": "message2526" + }, + { + "key": "AAA", + "message": "message2527" + }, + { + "key": "AAA", + "message": "message2528" + }, + { + "key": "AAA", + "message": "message2529" + }, + { + "key": "AAA", + "message": "message2530" + }, + { + "key": "AAA", + "message": "message2531" + }, + { + "key": "AAA", + "message": "message2532" + }, + { + "key": "AAA", + "message": "message2533" + }, + { + "key": "AAA", + "message": "message2534" + }, + { + "key": "AAA", + "message": "message2535" + }, + { + "key": "AAA", + "message": "message2536" + }, + { + "key": "AAA", + "message": "message2537" + }, + { + "key": "AAA", + "message": "message2538" + }, + { + "key": "AAA", + "message": "message2539" + }, + { + "key": "AAA", + "message": "message2540" + }, + { + "key": "AAA", + "message": "message2541" + }, + { + "key": "AAA", + "message": "message2542" + }, + { + "key": "AAA", + "message": "message2543" + }, + { + "key": "AAA", + "message": "message2544" + }, + { + "key": "AAA", + "message": "message2545" + }, + { + "key": "AAA", + "message": "message2546" + }, + { + "key": "AAA", + "message": "message2547" + }, + { + "key": "AAA", + "message": "message2548" + }, + { + "key": "AAA", + "message": "message2549" + }, + { + "key": "AAA", + "message": "message2550" + }, + { + "key": "AAA", + "message": "message2551" + }, + { + "key": "AAA", + "message": "message2552" + }, + { + "key": "AAA", + "message": "message2553" + }, + { + "key": "AAA", + "message": "message2554" + }, + { + "key": "AAA", + "message": "message2555" + }, + { + "key": "AAA", + "message": "message2556" + }, + { + "key": "AAA", + "message": "message2557" + }, + { + "key": "AAA", + "message": "message2558" + }, + { + "key": "AAA", + "message": "message2559" + }, + { + "key": "AAA", + "message": "message2560" + }, + { + "key": "AAA", + "message": "message2561" + }, + { + "key": "AAA", + "message": "message2562" + }, + { + "key": "AAA", + "message": "message2563" + }, + { + "key": "AAA", + "message": "message2564" + }, + { + "key": "AAA", + "message": "message2565" + }, + { + "key": "AAA", + "message": "message2566" + }, + { + "key": "AAA", + "message": "message2567" + }, + { + "key": "AAA", + "message": "message2568" + }, + { + "key": "AAA", + "message": "message2569" + }, + { + "key": "AAA", + "message": "message2570" + }, + { + "key": "AAA", + "message": "message2571" + }, + { + "key": "AAA", + "message": "message2572" + }, + { + "key": "AAA", + "message": "message2573" + }, + { + "key": "AAA", + "message": "message2574" + }, + { + "key": "AAA", + "message": "message2575" + }, + { + "key": "AAA", + "message": "message2576" + }, + { + "key": "AAA", + "message": "message2577" + }, + { + "key": "AAA", + "message": "message2578" + }, + { + "key": "AAA", + "message": "message2579" + }, + { + "key": "AAA", + "message": "message2580" + }, + { + "key": "AAA", + "message": "message2581" + }, + { + "key": "AAA", + "message": "message2582" + }, + { + "key": "AAA", + "message": "message2583" + }, + { + "key": "AAA", + "message": "message2584" + }, + { + "key": "AAA", + "message": "message2585" + }, + { + "key": "AAA", + "message": "message2586" + }, + { + "key": "AAA", + "message": "message2587" + }, + { + "key": "AAA", + "message": "message2588" + }, + { + "key": "AAA", + "message": "message2589" + }, + { + "key": "AAA", + "message": "message2590" + }, + { + "key": "AAA", + "message": "message2591" + }, + { + "key": "AAA", + "message": "message2592" + }, + { + "key": "AAA", + "message": "message2593" + }, + { + "key": "AAA", + "message": "message2594" + }, + { + "key": "AAA", + "message": "message2595" + }, + { + "key": "AAA", + "message": "message2596" + }, + { + "key": "AAA", + "message": "message2597" + }, + { + "key": "AAA", + "message": "message2598" + }, + { + "key": "AAA", + "message": "message2599" + }, + { + "key": "AAA", + "message": "message2600" + }, + { + "key": "AAA", + "message": "message2601" + }, + { + "key": "AAA", + "message": "message2602" + }, + { + "key": "AAA", + "message": "message2603" + }, + { + "key": "AAA", + "message": "message2604" + }, + { + "key": "AAA", + "message": "message2605" + }, + { + "key": "AAA", + "message": "message2606" + }, + { + "key": "AAA", + "message": "message2607" + }, + { + "key": "AAA", + "message": "message2608" + }, + { + "key": "AAA", + "message": "message2609" + }, + { + "key": "AAA", + "message": "message2610" + }, + { + "key": "AAA", + "message": "message2611" + }, + { + "key": "AAA", + "message": "message2612" + }, + { + "key": "AAA", + "message": "message2613" + }, + { + "key": "AAA", + "message": "message2614" + }, + { + "key": "AAA", + "message": "message2615" + }, + { + "key": "AAA", + "message": "message2616" + }, + { + "key": "AAA", + "message": "message2617" + }, + { + "key": "AAA", + "message": "message2618" + }, + { + "key": "AAA", + "message": "message2619" + }, + { + "key": "AAA", + "message": "message2620" + }, + { + "key": "AAA", + "message": "message2621" + }, + { + "key": "AAA", + "message": "message2622" + }, + { + "key": "AAA", + "message": "message2623" + }, + { + "key": "AAA", + "message": "message2624" + }, + { + "key": "AAA", + "message": "message2625" + }, + { + "key": "AAA", + "message": "message2626" + }, + { + "key": "AAA", + "message": "message2627" + }, + { + "key": "AAA", + "message": "message2628" + }, + { + "key": "AAA", + "message": "message2629" + }, + { + "key": "AAA", + "message": "message2630" + }, + { + "key": "AAA", + "message": "message2631" + }, + { + "key": "AAA", + "message": "message2632" + }, + { + "key": "AAA", + "message": "message2633" + }, + { + "key": "AAA", + "message": "message2634" + }, + { + "key": "AAA", + "message": "message2635" + }, + { + "key": "AAA", + "message": "message2636" + }, + { + "key": "AAA", + "message": "message2637" + }, + { + "key": "AAA", + "message": "message2638" + }, + { + "key": "AAA", + "message": "message2639" + }, + { + "key": "AAA", + "message": "message2640" + }, + { + "key": "AAA", + "message": "message2641" + }, + { + "key": "AAA", + "message": "message2642" + }, + { + "key": "AAA", + "message": "message2643" + }, + { + "key": "AAA", + "message": "message2644" + }, + { + "key": "AAA", + "message": "message2645" + }, + { + "key": "AAA", + "message": "message2646" + }, + { + "key": "AAA", + "message": "message2647" + }, + { + "key": "AAA", + "message": "message2648" + }, + { + "key": "AAA", + "message": "message2649" + }, + { + "key": "AAA", + "message": "message2650" + }, + { + "key": "AAA", + "message": "message2651" + }, + { + "key": "AAA", + "message": "message2652" + }, + { + "key": "AAA", + "message": "message2653" + }, + { + "key": "AAA", + "message": "message2654" + }, + { + "key": "AAA", + "message": "message2655" + }, + { + "key": "AAA", + "message": "message2656" + }, + { + "key": "AAA", + "message": "message2657" + }, + { + "key": "AAA", + "message": "message2658" + }, + { + "key": "AAA", + "message": "message2659" + }, + { + "key": "AAA", + "message": "message2660" + }, + { + "key": "AAA", + "message": "message2661" + }, + { + "key": "AAA", + "message": "message2662" + }, + { + "key": "AAA", + "message": "message2663" + }, + { + "key": "AAA", + "message": "message2664" + }, + { + "key": "AAA", + "message": "message2665" + }, + { + "key": "AAA", + "message": "message2666" + }, + { + "key": "AAA", + "message": "message2667" + }, + { + "key": "AAA", + "message": "message2668" + }, + { + "key": "AAA", + "message": "message2669" + }, + { + "key": "AAA", + "message": "message2670" + }, + { + "key": "AAA", + "message": "message2671" + }, + { + "key": "AAA", + "message": "message2672" + }, + { + "key": "AAA", + "message": "message2673" + }, + { + "key": "AAA", + "message": "message2674" + }, + { + "key": "AAA", + "message": "message2675" + }, + { + "key": "AAA", + "message": "message2676" + }, + { + "key": "AAA", + "message": "message2677" + }, + { + "key": "AAA", + "message": "message2678" + }, + { + "key": "AAA", + "message": "message2679" + }, + { + "key": "AAA", + "message": "message2680" + }, + { + "key": "AAA", + "message": "message2681" + }, + { + "key": "AAA", + "message": "message2682" + }, + { + "key": "AAA", + "message": "message2683" + }, + { + "key": "AAA", + "message": "message2684" + }, + { + "key": "AAA", + "message": "message2685" + }, + { + "key": "AAA", + "message": "message2686" + }, + { + "key": "AAA", + "message": "message2687" + }, + { + "key": "AAA", + "message": "message2688" + }, + { + "key": "AAA", + "message": "message2689" + }, + { + "key": "AAA", + "message": "message2690" + }, + { + "key": "AAA", + "message": "message2691" + }, + { + "key": "AAA", + "message": "message2692" + }, + { + "key": "AAA", + "message": "message2693" + }, + { + "key": "AAA", + "message": "message2694" + }, + { + "key": "AAA", + "message": "message2695" + }, + { + "key": "AAA", + "message": "message2696" + }, + { + "key": "AAA", + "message": "message2697" + }, + { + "key": "AAA", + "message": "message2698" + }, + { + "key": "AAA", + "message": "message2699" + }, + { + "key": "AAA", + "message": "message2700" + }, + { + "key": "AAA", + "message": "message2701" + }, + { + "key": "AAA", + "message": "message2702" + }, + { + "key": "AAA", + "message": "message2703" + }, + { + "key": "AAA", + "message": "message2704" + }, + { + "key": "AAA", + "message": "message2705" + }, + { + "key": "AAA", + "message": "message2706" + }, + { + "key": "AAA", + "message": "message2707" + }, + { + "key": "AAA", + "message": "message2708" + }, + { + "key": "AAA", + "message": "message2709" + }, + { + "key": "AAA", + "message": "message2710" + }, + { + "key": "AAA", + "message": "message2711" + }, + { + "key": "AAA", + "message": "message2712" + }, + { + "key": "AAA", + "message": "message2713" + }, + { + "key": "AAA", + "message": "message2714" + }, + { + "key": "AAA", + "message": "message2715" + }, + { + "key": "AAA", + "message": "message2716" + }, + { + "key": "AAA", + "message": "message2717" + }, + { + "key": "AAA", + "message": "message2718" + }, + { + "key": "AAA", + "message": "message2719" + }, + { + "key": "AAA", + "message": "message2720" + }, + { + "key": "AAA", + "message": "message2721" + }, + { + "key": "AAA", + "message": "message2722" + }, + { + "key": "AAA", + "message": "message2723" + }, + { + "key": "AAA", + "message": "message2724" + }, + { + "key": "AAA", + "message": "message2725" + }, + { + "key": "AAA", + "message": "message2726" + }, + { + "key": "AAA", + "message": "message2727" + }, + { + "key": "AAA", + "message": "message2728" + }, + { + "key": "AAA", + "message": "message2729" + }, + { + "key": "AAA", + "message": "message2730" + }, + { + "key": "AAA", + "message": "message2731" + }, + { + "key": "AAA", + "message": "message2732" + }, + { + "key": "AAA", + "message": "message2733" + }, + { + "key": "AAA", + "message": "message2734" + }, + { + "key": "AAA", + "message": "message2735" + }, + { + "key": "AAA", + "message": "message2736" + }, + { + "key": "AAA", + "message": "message2737" + }, + { + "key": "AAA", + "message": "message2738" + }, + { + "key": "AAA", + "message": "message2739" + }, + { + "key": "AAA", + "message": "message2740" + }, + { + "key": "AAA", + "message": "message2741" + }, + { + "key": "AAA", + "message": "message2742" + }, + { + "key": "AAA", + "message": "message2743" + }, + { + "key": "AAA", + "message": "message2744" + }, + { + "key": "AAA", + "message": "message2745" + }, + { + "key": "AAA", + "message": "message2746" + }, + { + "key": "AAA", + "message": "message2747" + }, + { + "key": "AAA", + "message": "message2748" + }, + { + "key": "AAA", + "message": "message2749" + }, + { + "key": "AAA", + "message": "message2750" + }, + { + "key": "AAA", + "message": "message2751" + }, + { + "key": "AAA", + "message": "message2752" + }, + { + "key": "AAA", + "message": "message2753" + }, + { + "key": "AAA", + "message": "message2754" + }, + { + "key": "AAA", + "message": "message2755" + }, + { + "key": "AAA", + "message": "message2756" + }, + { + "key": "AAA", + "message": "message2757" + }, + { + "key": "AAA", + "message": "message2758" + }, + { + "key": "AAA", + "message": "message2759" + }, + { + "key": "AAA", + "message": "message2760" + }, + { + "key": "AAA", + "message": "message2761" + }, + { + "key": "AAA", + "message": "message2762" + }, + { + "key": "AAA", + "message": "message2763" + }, + { + "key": "AAA", + "message": "message2764" + }, + { + "key": "AAA", + "message": "message2765" + }, + { + "key": "AAA", + "message": "message2766" + }, + { + "key": "AAA", + "message": "message2767" + }, + { + "key": "AAA", + "message": "message2768" + }, + { + "key": "AAA", + "message": "message2769" + }, + { + "key": "AAA", + "message": "message2770" + }, + { + "key": "AAA", + "message": "message2771" + }, + { + "key": "AAA", + "message": "message2772" + }, + { + "key": "AAA", + "message": "message2773" + }, + { + "key": "AAA", + "message": "message2774" + }, + { + "key": "AAA", + "message": "message2775" + }, + { + "key": "AAA", + "message": "message2776" + }, + { + "key": "AAA", + "message": "message2777" + }, + { + "key": "AAA", + "message": "message2778" + }, + { + "key": "AAA", + "message": "message2779" + }, + { + "key": "AAA", + "message": "message2780" + }, + { + "key": "AAA", + "message": "message2781" + }, + { + "key": "AAA", + "message": "message2782" + }, + { + "key": "AAA", + "message": "message2783" + }, + { + "key": "AAA", + "message": "message2784" + }, + { + "key": "AAA", + "message": "message2785" + }, + { + "key": "AAA", + "message": "message2786" + }, + { + "key": "AAA", + "message": "message2787" + }, + { + "key": "AAA", + "message": "message2788" + }, + { + "key": "AAA", + "message": "message2789" + }, + { + "key": "AAA", + "message": "message2790" + }, + { + "key": "AAA", + "message": "message2791" + }, + { + "key": "AAA", + "message": "message2792" + }, + { + "key": "AAA", + "message": "message2793" + }, + { + "key": "AAA", + "message": "message2794" + }, + { + "key": "AAA", + "message": "message2795" + }, + { + "key": "AAA", + "message": "message2796" + }, + { + "key": "AAA", + "message": "message2797" + }, + { + "key": "AAA", + "message": "message2798" + }, + { + "key": "AAA", + "message": "message2799" + }, + { + "key": "AAA", + "message": "message2800" + }, + { + "key": "BBB", + "message": "message2801" + }, + { + "key": "BBB", + "message": "message2802" + }, + { + "key": "BBB", + "message": "message2803" + }, + { + "key": "BBB", + "message": "message2804" + }, + { + "key": "BBB", + "message": "message2805" + }, + { + "key": "BBB", + "message": "message2806" + }, + { + "key": "BBB", + "message": "message2807" + }, + { + "key": "BBB", + "message": "message2808" + }, + { + "key": "BBB", + "message": "message2809" + }, + { + "key": "BBB", + "message": "message2810" + }, + { + "key": "BBB", + "message": "message2811" + }, + { + "key": "BBB", + "message": "message2812" + }, + { + "key": "BBB", + "message": "message2813" + }, + { + "key": "BBB", + "message": "message2814" + }, + { + "key": "BBB", + "message": "message2815" + }, + { + "key": "BBB", + "message": "message2816" + }, + { + "key": "BBB", + "message": "message2817" + }, + { + "key": "BBB", + "message": "message2818" + }, + { + "key": "BBB", + "message": "message2819" + }, + { + "key": "BBB", + "message": "message2820" + }, + { + "key": "BBB", + "message": "message2821" + }, + { + "key": "BBB", + "message": "message2822" + }, + { + "key": "BBB", + "message": "message2823" + }, + { + "key": "BBB", + "message": "message2824" + }, + { + "key": "BBB", + "message": "message2825" + }, + { + "key": "BBB", + "message": "message2826" + }, + { + "key": "BBB", + "message": "message2827" + }, + { + "key": "BBB", + "message": "message2828" + }, + { + "key": "BBB", + "message": "message2829" + }, + { + "key": "BBB", + "message": "message2830" + }, + { + "key": "BBB", + "message": "message2831" + }, + { + "key": "BBB", + "message": "message2832" + }, + { + "key": "BBB", + "message": "message2833" + }, + { + "key": "BBB", + "message": "message2834" + }, + { + "key": "BBB", + "message": "message2835" + }, + { + "key": "BBB", + "message": "message2836" + }, + { + "key": "BBB", + "message": "message2837" + }, + { + "key": "BBB", + "message": "message2838" + }, + { + "key": "BBB", + "message": "message2839" + }, + { + "key": "BBB", + "message": "message2840" + }, + { + "key": "BBB", + "message": "message2841" + }, + { + "key": "BBB", + "message": "message2842" + }, + { + "key": "BBB", + "message": "message2843" + }, + { + "key": "BBB", + "message": "message2844" + }, + { + "key": "BBB", + "message": "message2845" + }, + { + "key": "BBB", + "message": "message2846" + }, + { + "key": "BBB", + "message": "message2847" + }, + { + "key": "BBB", + "message": "message2848" + }, + { + "key": "BBB", + "message": "message2849" + }, + { + "key": "BBB", + "message": "message2850" + }, + { + "key": "BBB", + "message": "message2851" + }, + { + "key": "BBB", + "message": "message2852" + }, + { + "key": "BBB", + "message": "message2853" + }, + { + "key": "BBB", + "message": "message2854" + }, + { + "key": "BBB", + "message": "message2855" + }, + { + "key": "BBB", + "message": "message2856" + }, + { + "key": "BBB", + "message": "message2857" + }, + { + "key": "BBB", + "message": "message2858" + }, + { + "key": "BBB", + "message": "message2859" + }, + { + "key": "BBB", + "message": "message2860" + }, + { + "key": "BBB", + "message": "message2861" + }, + { + "key": "BBB", + "message": "message2862" + }, + { + "key": "BBB", + "message": "message2863" + }, + { + "key": "BBB", + "message": "message2864" + }, + { + "key": "BBB", + "message": "message2865" + }, + { + "key": "BBB", + "message": "message2866" + }, + { + "key": "BBB", + "message": "message2867" + }, + { + "key": "BBB", + "message": "message2868" + }, + { + "key": "BBB", + "message": "message2869" + }, + { + "key": "BBB", + "message": "message2870" + }, + { + "key": "BBB", + "message": "message2871" + }, + { + "key": "BBB", + "message": "message2872" + }, + { + "key": "BBB", + "message": "message2873" + }, + { + "key": "BBB", + "message": "message2874" + }, + { + "key": "BBB", + "message": "message2875" + }, + { + "key": "BBB", + "message": "message2876" + }, + { + "key": "BBB", + "message": "message2877" + }, + { + "key": "BBB", + "message": "message2878" + }, + { + "key": "BBB", + "message": "message2879" + }, + { + "key": "BBB", + "message": "message2880" + }, + { + "key": "BBB", + "message": "message2881" + }, + { + "key": "BBB", + "message": "message2882" + }, + { + "key": "BBB", + "message": "message2883" + }, + { + "key": "BBB", + "message": "message2884" + }, + { + "key": "BBB", + "message": "message2885" + }, + { + "key": "BBB", + "message": "message2886" + }, + { + "key": "BBB", + "message": "message2887" + }, + { + "key": "BBB", + "message": "message2888" + }, + { + "key": "BBB", + "message": "message2889" + }, + { + "key": "BBB", + "message": "message2890" + }, + { + "key": "BBB", + "message": "message2891" + }, + { + "key": "BBB", + "message": "message2892" + }, + { + "key": "BBB", + "message": "message2893" + }, + { + "key": "BBB", + "message": "message2894" + }, + { + "key": "BBB", + "message": "message2895" + }, + { + "key": "BBB", + "message": "message2896" + }, + { + "key": "BBB", + "message": "message2897" + }, + { + "key": "BBB", + "message": "message2898" + }, + { + "key": "BBB", + "message": "message2899" + }, + { + "key": "BBB", + "message": "message2900" + }, + { + "key": "BBB", + "message": "message2901" + }, + { + "key": "BBB", + "message": "message2902" + }, + { + "key": "BBB", + "message": "message2903" + }, + { + "key": "BBB", + "message": "message2904" + }, + { + "key": "BBB", + "message": "message2905" + }, + { + "key": "BBB", + "message": "message2906" + }, + { + "key": "BBB", + "message": "message2907" + }, + { + "key": "BBB", + "message": "message2908" + }, + { + "key": "BBB", + "message": "message2909" + }, + { + "key": "BBB", + "message": "message2910" + }, + { + "key": "BBB", + "message": "message2911" + }, + { + "key": "BBB", + "message": "message2912" + }, + { + "key": "BBB", + "message": "message2913" + }, + { + "key": "BBB", + "message": "message2914" + }, + { + "key": "BBB", + "message": "message2915" + }, + { + "key": "BBB", + "message": "message2916" + }, + { + "key": "BBB", + "message": "message2917" + }, + { + "key": "BBB", + "message": "message2918" + }, + { + "key": "BBB", + "message": "message2919" + }, + { + "key": "BBB", + "message": "message2920" + }, + { + "key": "BBB", + "message": "message2921" + }, + { + "key": "BBB", + "message": "message2922" + }, + { + "key": "BBB", + "message": "message2923" + }, + { + "key": "BBB", + "message": "message2924" + }, + { + "key": "BBB", + "message": "message2925" + }, + { + "key": "BBB", + "message": "message2926" + }, + { + "key": "BBB", + "message": "message2927" + }, + { + "key": "BBB", + "message": "message2928" + }, + { + "key": "BBB", + "message": "message2929" + }, + { + "key": "BBB", + "message": "message2930" + }, + { + "key": "BBB", + "message": "message2931" + }, + { + "key": "BBB", + "message": "message2932" + }, + { + "key": "BBB", + "message": "message2933" + }, + { + "key": "BBB", + "message": "message2934" + }, + { + "key": "BBB", + "message": "message2935" + }, + { + "key": "BBB", + "message": "message2936" + }, + { + "key": "BBB", + "message": "message2937" + }, + { + "key": "BBB", + "message": "message2938" + }, + { + "key": "BBB", + "message": "message2939" + }, + { + "key": "BBB", + "message": "message2940" + }, + { + "key": "BBB", + "message": "message2941" + }, + { + "key": "BBB", + "message": "message2942" + }, + { + "key": "BBB", + "message": "message2943" + }, + { + "key": "BBB", + "message": "message2944" + }, + { + "key": "BBB", + "message": "message2945" + }, + { + "key": "BBB", + "message": "message2946" + }, + { + "key": "BBB", + "message": "message2947" + }, + { + "key": "BBB", + "message": "message2948" + }, + { + "key": "BBB", + "message": "message2949" + }, + { + "key": "BBB", + "message": "message2950" + }, + { + "key": "BBB", + "message": "message2951" + }, + { + "key": "BBB", + "message": "message2952" + }, + { + "key": "BBB", + "message": "message2953" + }, + { + "key": "BBB", + "message": "message2954" + }, + { + "key": "BBB", + "message": "message2955" + }, + { + "key": "BBB", + "message": "message2956" + }, + { + "key": "BBB", + "message": "message2957" + }, + { + "key": "BBB", + "message": "message2958" + }, + { + "key": "BBB", + "message": "message2959" + }, + { + "key": "BBB", + "message": "message2960" + }, + { + "key": "BBB", + "message": "message2961" + }, + { + "key": "BBB", + "message": "message2962" + }, + { + "key": "BBB", + "message": "message2963" + }, + { + "key": "BBB", + "message": "message2964" + }, + { + "key": "BBB", + "message": "message2965" + }, + { + "key": "BBB", + "message": "message2966" + }, + { + "key": "BBB", + "message": "message2967" + }, + { + "key": "BBB", + "message": "message2968" + }, + { + "key": "BBB", + "message": "message2969" + }, + { + "key": "BBB", + "message": "message2970" + }, + { + "key": "BBB", + "message": "message2971" + }, + { + "key": "BBB", + "message": "message2972" + }, + { + "key": "BBB", + "message": "message2973" + }, + { + "key": "BBB", + "message": "message2974" + }, + { + "key": "BBB", + "message": "message2975" + }, + { + "key": "BBB", + "message": "message2976" + }, + { + "key": "BBB", + "message": "message2977" + }, + { + "key": "BBB", + "message": "message2978" + }, + { + "key": "BBB", + "message": "message2979" + }, + { + "key": "BBB", + "message": "message2980" + }, + { + "key": "BBB", + "message": "message2981" + }, + { + "key": "BBB", + "message": "message2982" + }, + { + "key": "BBB", + "message": "message2983" + }, + { + "key": "BBB", + "message": "message2984" + }, + { + "key": "BBB", + "message": "message2985" + }, + { + "key": "BBB", + "message": "message2986" + }, + { + "key": "BBB", + "message": "message2987" + }, + { + "key": "BBB", + "message": "message2988" + }, + { + "key": "BBB", + "message": "message2989" + }, + { + "key": "BBB", + "message": "message2990" + }, + { + "key": "BBB", + "message": "message2991" + }, + { + "key": "BBB", + "message": "message2992" + }, + { + "key": "BBB", + "message": "message2993" + }, + { + "key": "BBB", + "message": "message2994" + }, + { + "key": "BBB", + "message": "message2995" + }, + { + "key": "BBB", + "message": "message2996" + }, + { + "key": "BBB", + "message": "message2997" + }, + { + "key": "BBB", + "message": "message2998" + }, + { + "key": "BBB", + "message": "message2999" + }, + { + "key": "BBB", + "message": "message3000" + }, + { + "key": "BBB", + "message": "message3001" + }, + { + "key": "BBB", + "message": "message3002" + }, + { + "key": "BBB", + "message": "message3003" + }, + { + "key": "BBB", + "message": "message3004" + }, + { + "key": "BBB", + "message": "message3005" + }, + { + "key": "BBB", + "message": "message3006" + }, + { + "key": "BBB", + "message": "message3007" + }, + { + "key": "BBB", + "message": "message3008" + }, + { + "key": "BBB", + "message": "message3009" + }, + { + "key": "BBB", + "message": "message3010" + }, + { + "key": "BBB", + "message": "message3011" + }, + { + "key": "BBB", + "message": "message3012" + }, + { + "key": "BBB", + "message": "message3013" + }, + { + "key": "BBB", + "message": "message3014" + }, + { + "key": "BBB", + "message": "message3015" + }, + { + "key": "BBB", + "message": "message3016" + }, + { + "key": "BBB", + "message": "message3017" + }, + { + "key": "BBB", + "message": "message3018" + }, + { + "key": "BBB", + "message": "message3019" + }, + { + "key": "BBB", + "message": "message3020" + }, + { + "key": "BBB", + "message": "message3021" + }, + { + "key": "BBB", + "message": "message3022" + }, + { + "key": "BBB", + "message": "message3023" + }, + { + "key": "BBB", + "message": "message3024" + }, + { + "key": "BBB", + "message": "message3025" + }, + { + "key": "BBB", + "message": "message3026" + }, + { + "key": "BBB", + "message": "message3027" + }, + { + "key": "BBB", + "message": "message3028" + }, + { + "key": "BBB", + "message": "message3029" + }, + { + "key": "BBB", + "message": "message3030" + }, + { + "key": "BBB", + "message": "message3031" + }, + { + "key": "BBB", + "message": "message3032" + }, + { + "key": "BBB", + "message": "message3033" + }, + { + "key": "BBB", + "message": "message3034" + }, + { + "key": "BBB", + "message": "message3035" + }, + { + "key": "BBB", + "message": "message3036" + }, + { + "key": "BBB", + "message": "message3037" + }, + { + "key": "BBB", + "message": "message3038" + }, + { + "key": "BBB", + "message": "message3039" + }, + { + "key": "BBB", + "message": "message3040" + }, + { + "key": "BBB", + "message": "message3041" + }, + { + "key": "BBB", + "message": "message3042" + }, + { + "key": "BBB", + "message": "message3043" + }, + { + "key": "BBB", + "message": "message3044" + }, + { + "key": "BBB", + "message": "message3045" + }, + { + "key": "BBB", + "message": "message3046" + }, + { + "key": "BBB", + "message": "message3047" + }, + { + "key": "BBB", + "message": "message3048" + }, + { + "key": "BBB", + "message": "message3049" + }, + { + "key": "BBB", + "message": "message3050" + }, + { + "key": "BBB", + "message": "message3051" + }, + { + "key": "BBB", + "message": "message3052" + }, + { + "key": "BBB", + "message": "message3053" + }, + { + "key": "BBB", + "message": "message3054" + }, + { + "key": "BBB", + "message": "message3055" + }, + { + "key": "BBB", + "message": "message3056" + }, + { + "key": "BBB", + "message": "message3057" + }, + { + "key": "BBB", + "message": "message3058" + }, + { + "key": "BBB", + "message": "message3059" + }, + { + "key": "BBB", + "message": "message3060" + }, + { + "key": "BBB", + "message": "message3061" + }, + { + "key": "BBB", + "message": "message3062" + }, + { + "key": "BBB", + "message": "message3063" + }, + { + "key": "BBB", + "message": "message3064" + }, + { + "key": "BBB", + "message": "message3065" + }, + { + "key": "BBB", + "message": "message3066" + }, + { + "key": "BBB", + "message": "message3067" + }, + { + "key": "BBB", + "message": "message3068" + }, + { + "key": "BBB", + "message": "message3069" + }, + { + "key": "BBB", + "message": "message3070" + }, + { + "key": "BBB", + "message": "message3071" + }, + { + "key": "BBB", + "message": "message3072" + }, + { + "key": "BBB", + "message": "message3073" + }, + { + "key": "BBB", + "message": "message3074" + }, + { + "key": "BBB", + "message": "message3075" + }, + { + "key": "BBB", + "message": "message3076" + }, + { + "key": "BBB", + "message": "message3077" + }, + { + "key": "BBB", + "message": "message3078" + }, + { + "key": "BBB", + "message": "message3079" + }, + { + "key": "BBB", + "message": "message3080" + }, + { + "key": "BBB", + "message": "message3081" + }, + { + "key": "BBB", + "message": "message3082" + }, + { + "key": "BBB", + "message": "message3083" + }, + { + "key": "BBB", + "message": "message3084" + }, + { + "key": "BBB", + "message": "message3085" + }, + { + "key": "BBB", + "message": "message3086" + }, + { + "key": "BBB", + "message": "message3087" + }, + { + "key": "BBB", + "message": "message3088" + }, + { + "key": "BBB", + "message": "message3089" + }, + { + "key": "BBB", + "message": "message3090" + }, + { + "key": "BBB", + "message": "message3091" + }, + { + "key": "BBB", + "message": "message3092" + }, + { + "key": "BBB", + "message": "message3093" + }, + { + "key": "BBB", + "message": "message3094" + }, + { + "key": "BBB", + "message": "message3095" + }, + { + "key": "BBB", + "message": "message3096" + }, + { + "key": "BBB", + "message": "message3097" + }, + { + "key": "BBB", + "message": "message3098" + }, + { + "key": "BBB", + "message": "message3099" + }, + { + "key": "BBB", + "message": "message3100" + }, + { + "key": "BBB", + "message": "message3101" + }, + { + "key": "BBB", + "message": "message3102" + }, + { + "key": "BBB", + "message": "message3103" + }, + { + "key": "BBB", + "message": "message3104" + }, + { + "key": "BBB", + "message": "message3105" + }, + { + "key": "BBB", + "message": "message3106" + }, + { + "key": "BBB", + "message": "message3107" + }, + { + "key": "BBB", + "message": "message3108" + }, + { + "key": "BBB", + "message": "message3109" + }, + { + "key": "BBB", + "message": "message3110" + }, + { + "key": "BBB", + "message": "message3111" + }, + { + "key": "BBB", + "message": "message3112" + }, + { + "key": "BBB", + "message": "message3113" + }, + { + "key": "BBB", + "message": "message3114" + }, + { + "key": "BBB", + "message": "message3115" + }, + { + "key": "BBB", + "message": "message3116" + }, + { + "key": "BBB", + "message": "message3117" + }, + { + "key": "BBB", + "message": "message3118" + }, + { + "key": "BBB", + "message": "message3119" + }, + { + "key": "BBB", + "message": "message3120" + }, + { + "key": "BBB", + "message": "message3121" + }, + { + "key": "BBB", + "message": "message3122" + }, + { + "key": "BBB", + "message": "message3123" + }, + { + "key": "BBB", + "message": "message3124" + }, + { + "key": "BBB", + "message": "message3125" + }, + { + "key": "BBB", + "message": "message3126" + }, + { + "key": "BBB", + "message": "message3127" + }, + { + "key": "BBB", + "message": "message3128" + }, + { + "key": "BBB", + "message": "message3129" + }, + { + "key": "BBB", + "message": "message3130" + }, + { + "key": "BBB", + "message": "message3131" + }, + { + "key": "BBB", + "message": "message3132" + }, + { + "key": "BBB", + "message": "message3133" + }, + { + "key": "BBB", + "message": "message3134" + }, + { + "key": "BBB", + "message": "message3135" + }, + { + "key": "BBB", + "message": "message3136" + }, + { + "key": "BBB", + "message": "message3137" + }, + { + "key": "BBB", + "message": "message3138" + }, + { + "key": "BBB", + "message": "message3139" + }, + { + "key": "BBB", + "message": "message3140" + }, + { + "key": "BBB", + "message": "message3141" + }, + { + "key": "BBB", + "message": "message3142" + }, + { + "key": "BBB", + "message": "message3143" + }, + { + "key": "BBB", + "message": "message3144" + }, + { + "key": "BBB", + "message": "message3145" + }, + { + "key": "BBB", + "message": "message3146" + }, + { + "key": "BBB", + "message": "message3147" + }, + { + "key": "BBB", + "message": "message3148" + }, + { + "key": "BBB", + "message": "message3149" + }, + { + "key": "BBB", + "message": "message3150" + }, + { + "key": "BBB", + "message": "message3151" + }, + { + "key": "BBB", + "message": "message3152" + }, + { + "key": "BBB", + "message": "message3153" + }, + { + "key": "BBB", + "message": "message3154" + }, + { + "key": "BBB", + "message": "message3155" + }, + { + "key": "BBB", + "message": "message3156" + }, + { + "key": "BBB", + "message": "message3157" + }, + { + "key": "BBB", + "message": "message3158" + }, + { + "key": "BBB", + "message": "message3159" + }, + { + "key": "BBB", + "message": "message3160" + }, + { + "key": "BBB", + "message": "message3161" + }, + { + "key": "BBB", + "message": "message3162" + }, + { + "key": "BBB", + "message": "message3163" + }, + { + "key": "BBB", + "message": "message3164" + }, + { + "key": "BBB", + "message": "message3165" + }, + { + "key": "BBB", + "message": "message3166" + }, + { + "key": "BBB", + "message": "message3167" + }, + { + "key": "BBB", + "message": "message3168" + }, + { + "key": "BBB", + "message": "message3169" + }, + { + "key": "BBB", + "message": "message3170" + }, + { + "key": "BBB", + "message": "message3171" + }, + { + "key": "BBB", + "message": "message3172" + }, + { + "key": "BBB", + "message": "message3173" + }, + { + "key": "BBB", + "message": "message3174" + }, + { + "key": "BBB", + "message": "message3175" + }, + { + "key": "BBB", + "message": "message3176" + }, + { + "key": "BBB", + "message": "message3177" + }, + { + "key": "BBB", + "message": "message3178" + }, + { + "key": "BBB", + "message": "message3179" + }, + { + "key": "BBB", + "message": "message3180" + }, + { + "key": "BBB", + "message": "message3181" + }, + { + "key": "BBB", + "message": "message3182" + }, + { + "key": "BBB", + "message": "message3183" + }, + { + "key": "BBB", + "message": "message3184" + }, + { + "key": "BBB", + "message": "message3185" + }, + { + "key": "BBB", + "message": "message3186" + }, + { + "key": "BBB", + "message": "message3187" + }, + { + "key": "BBB", + "message": "message3188" + }, + { + "key": "BBB", + "message": "message3189" + }, + { + "key": "BBB", + "message": "message3190" + }, + { + "key": "BBB", + "message": "message3191" + }, + { + "key": "BBB", + "message": "message3192" + }, + { + "key": "BBB", + "message": "message3193" + }, + { + "key": "BBB", + "message": "message3194" + }, + { + "key": "BBB", + "message": "message3195" + }, + { + "key": "BBB", + "message": "message3196" + }, + { + "key": "BBB", + "message": "message3197" + }, + { + "key": "BBB", + "message": "message3198" + }, + { + "key": "BBB", + "message": "message3199" + }, + { + "key": "BBB", + "message": "message3200" + }, + { + "key": "CCC", + "message": "message3201" + }, + { + "key": "CCC", + "message": "message3202" + }, + { + "key": "CCC", + "message": "message3203" + }, + { + "key": "CCC", + "message": "message3204" + }, + { + "key": "CCC", + "message": "message3205" + }, + { + "key": "CCC", + "message": "message3206" + }, + { + "key": "CCC", + "message": "message3207" + }, + { + "key": "CCC", + "message": "message3208" + }, + { + "key": "CCC", + "message": "message3209" + }, + { + "key": "CCC", + "message": "message3210" + }, + { + "key": "CCC", + "message": "message3211" + }, + { + "key": "CCC", + "message": "message3212" + }, + { + "key": "CCC", + "message": "message3213" + }, + { + "key": "CCC", + "message": "message3214" + }, + { + "key": "CCC", + "message": "message3215" + }, + { + "key": "CCC", + "message": "message3216" + }, + { + "key": "CCC", + "message": "message3217" + }, + { + "key": "CCC", + "message": "message3218" + }, + { + "key": "CCC", + "message": "message3219" + }, + { + "key": "CCC", + "message": "message3220" + }, + { + "key": "CCC", + "message": "message3221" + }, + { + "key": "CCC", + "message": "message3222" + }, + { + "key": "CCC", + "message": "message3223" + }, + { + "key": "CCC", + "message": "message3224" + }, + { + "key": "CCC", + "message": "message3225" + }, + { + "key": "CCC", + "message": "message3226" + }, + { + "key": "CCC", + "message": "message3227" + }, + { + "key": "CCC", + "message": "message3228" + }, + { + "key": "CCC", + "message": "message3229" + }, + { + "key": "CCC", + "message": "message3230" + }, + { + "key": "CCC", + "message": "message3231" + }, + { + "key": "CCC", + "message": "message3232" + }, + { + "key": "CCC", + "message": "message3233" + }, + { + "key": "CCC", + "message": "message3234" + }, + { + "key": "CCC", + "message": "message3235" + }, + { + "key": "CCC", + "message": "message3236" + }, + { + "key": "CCC", + "message": "message3237" + }, + { + "key": "CCC", + "message": "message3238" + }, + { + "key": "CCC", + "message": "message3239" + }, + { + "key": "CCC", + "message": "message3240" + }, + { + "key": "CCC", + "message": "message3241" + }, + { + "key": "CCC", + "message": "message3242" + }, + { + "key": "CCC", + "message": "message3243" + }, + { + "key": "CCC", + "message": "message3244" + }, + { + "key": "CCC", + "message": "message3245" + }, + { + "key": "CCC", + "message": "message3246" + }, + { + "key": "CCC", + "message": "message3247" + }, + { + "key": "CCC", + "message": "message3248" + }, + { + "key": "CCC", + "message": "message3249" + }, + { + "key": "CCC", + "message": "message3250" + }, + { + "key": "CCC", + "message": "message3251" + }, + { + "key": "CCC", + "message": "message3252" + }, + { + "key": "CCC", + "message": "message3253" + }, + { + "key": "CCC", + "message": "message3254" + }, + { + "key": "CCC", + "message": "message3255" + }, + { + "key": "CCC", + "message": "message3256" + }, + { + "key": "CCC", + "message": "message3257" + }, + { + "key": "CCC", + "message": "message3258" + }, + { + "key": "CCC", + "message": "message3259" + }, + { + "key": "CCC", + "message": "message3260" + }, + { + "key": "CCC", + "message": "message3261" + }, + { + "key": "CCC", + "message": "message3262" + }, + { + "key": "CCC", + "message": "message3263" + }, + { + "key": "CCC", + "message": "message3264" + }, + { + "key": "CCC", + "message": "message3265" + }, + { + "key": "CCC", + "message": "message3266" + }, + { + "key": "CCC", + "message": "message3267" + }, + { + "key": "CCC", + "message": "message3268" + }, + { + "key": "CCC", + "message": "message3269" + }, + { + "key": "CCC", + "message": "message3270" + }, + { + "key": "CCC", + "message": "message3271" + }, + { + "key": "CCC", + "message": "message3272" + }, + { + "key": "CCC", + "message": "message3273" + }, + { + "key": "CCC", + "message": "message3274" + }, + { + "key": "CCC", + "message": "message3275" + }, + { + "key": "CCC", + "message": "message3276" + }, + { + "key": "CCC", + "message": "message3277" + }, + { + "key": "CCC", + "message": "message3278" + }, + { + "key": "CCC", + "message": "message3279" + }, + { + "key": "CCC", + "message": "message3280" + }, + { + "key": "CCC", + "message": "message3281" + }, + { + "key": "CCC", + "message": "message3282" + }, + { + "key": "CCC", + "message": "message3283" + }, + { + "key": "CCC", + "message": "message3284" + }, + { + "key": "CCC", + "message": "message3285" + }, + { + "key": "CCC", + "message": "message3286" + }, + { + "key": "CCC", + "message": "message3287" + }, + { + "key": "CCC", + "message": "message3288" + }, + { + "key": "CCC", + "message": "message3289" + }, + { + "key": "CCC", + "message": "message3290" + }, + { + "key": "CCC", + "message": "message3291" + }, + { + "key": "CCC", + "message": "message3292" + }, + { + "key": "CCC", + "message": "message3293" + }, + { + "key": "CCC", + "message": "message3294" + }, + { + "key": "CCC", + "message": "message3295" + }, + { + "key": "CCC", + "message": "message3296" + }, + { + "key": "CCC", + "message": "message3297" + }, + { + "key": "CCC", + "message": "message3298" + }, + { + "key": "CCC", + "message": "message3299" + }, + { + "key": "CCC", + "message": "message3300" + }, + { + "key": "CCC", + "message": "message3301" + }, + { + "key": "CCC", + "message": "message3302" + }, + { + "key": "CCC", + "message": "message3303" + }, + { + "key": "CCC", + "message": "message3304" + }, + { + "key": "CCC", + "message": "message3305" + }, + { + "key": "CCC", + "message": "message3306" + }, + { + "key": "CCC", + "message": "message3307" + }, + { + "key": "CCC", + "message": "message3308" + }, + { + "key": "CCC", + "message": "message3309" + }, + { + "key": "CCC", + "message": "message3310" + }, + { + "key": "CCC", + "message": "message3311" + }, + { + "key": "CCC", + "message": "message3312" + }, + { + "key": "CCC", + "message": "message3313" + }, + { + "key": "CCC", + "message": "message3314" + }, + { + "key": "CCC", + "message": "message3315" + }, + { + "key": "CCC", + "message": "message3316" + }, + { + "key": "CCC", + "message": "message3317" + }, + { + "key": "CCC", + "message": "message3318" + }, + { + "key": "CCC", + "message": "message3319" + }, + { + "key": "CCC", + "message": "message3320" + }, + { + "key": "CCC", + "message": "message3321" + }, + { + "key": "CCC", + "message": "message3322" + }, + { + "key": "CCC", + "message": "message3323" + }, + { + "key": "CCC", + "message": "message3324" + }, + { + "key": "CCC", + "message": "message3325" + }, + { + "key": "CCC", + "message": "message3326" + }, + { + "key": "CCC", + "message": "message3327" + }, + { + "key": "CCC", + "message": "message3328" + }, + { + "key": "CCC", + "message": "message3329" + }, + { + "key": "CCC", + "message": "message3330" + }, + { + "key": "CCC", + "message": "message3331" + }, + { + "key": "CCC", + "message": "message3332" + }, + { + "key": "CCC", + "message": "message3333" + }, + { + "key": "CCC", + "message": "message3334" + }, + { + "key": "CCC", + "message": "message3335" + }, + { + "key": "CCC", + "message": "message3336" + }, + { + "key": "CCC", + "message": "message3337" + }, + { + "key": "CCC", + "message": "message3338" + }, + { + "key": "CCC", + "message": "message3339" + }, + { + "key": "CCC", + "message": "message3340" + }, + { + "key": "CCC", + "message": "message3341" + }, + { + "key": "CCC", + "message": "message3342" + }, + { + "key": "CCC", + "message": "message3343" + }, + { + "key": "CCC", + "message": "message3344" + }, + { + "key": "CCC", + "message": "message3345" + }, + { + "key": "CCC", + "message": "message3346" + }, + { + "key": "CCC", + "message": "message3347" + }, + { + "key": "CCC", + "message": "message3348" + }, + { + "key": "CCC", + "message": "message3349" + }, + { + "key": "CCC", + "message": "message3350" + }, + { + "key": "CCC", + "message": "message3351" + }, + { + "key": "CCC", + "message": "message3352" + }, + { + "key": "CCC", + "message": "message3353" + }, + { + "key": "CCC", + "message": "message3354" + }, + { + "key": "CCC", + "message": "message3355" + }, + { + "key": "CCC", + "message": "message3356" + }, + { + "key": "CCC", + "message": "message3357" + }, + { + "key": "CCC", + "message": "message3358" + }, + { + "key": "CCC", + "message": "message3359" + }, + { + "key": "CCC", + "message": "message3360" + }, + { + "key": "CCC", + "message": "message3361" + }, + { + "key": "CCC", + "message": "message3362" + }, + { + "key": "CCC", + "message": "message3363" + }, + { + "key": "CCC", + "message": "message3364" + }, + { + "key": "CCC", + "message": "message3365" + }, + { + "key": "CCC", + "message": "message3366" + }, + { + "key": "CCC", + "message": "message3367" + }, + { + "key": "CCC", + "message": "message3368" + }, + { + "key": "CCC", + "message": "message3369" + }, + { + "key": "CCC", + "message": "message3370" + }, + { + "key": "CCC", + "message": "message3371" + }, + { + "key": "CCC", + "message": "message3372" + }, + { + "key": "CCC", + "message": "message3373" + }, + { + "key": "CCC", + "message": "message3374" + }, + { + "key": "CCC", + "message": "message3375" + }, + { + "key": "CCC", + "message": "message3376" + }, + { + "key": "CCC", + "message": "message3377" + }, + { + "key": "CCC", + "message": "message3378" + }, + { + "key": "CCC", + "message": "message3379" + }, + { + "key": "CCC", + "message": "message3380" + }, + { + "key": "CCC", + "message": "message3381" + }, + { + "key": "CCC", + "message": "message3382" + }, + { + "key": "CCC", + "message": "message3383" + }, + { + "key": "CCC", + "message": "message3384" + }, + { + "key": "CCC", + "message": "message3385" + }, + { + "key": "CCC", + "message": "message3386" + }, + { + "key": "CCC", + "message": "message3387" + }, + { + "key": "CCC", + "message": "message3388" + }, + { + "key": "CCC", + "message": "message3389" + }, + { + "key": "CCC", + "message": "message3390" + }, + { + "key": "CCC", + "message": "message3391" + }, + { + "key": "CCC", + "message": "message3392" + }, + { + "key": "CCC", + "message": "message3393" + }, + { + "key": "CCC", + "message": "message3394" + }, + { + "key": "CCC", + "message": "message3395" + }, + { + "key": "CCC", + "message": "message3396" + }, + { + "key": "CCC", + "message": "message3397" + }, + { + "key": "CCC", + "message": "message3398" + }, + { + "key": "CCC", + "message": "message3399" + }, + { + "key": "CCC", + "message": "message3400" + }, + { + "key": "CCC", + "message": "message3401" + }, + { + "key": "CCC", + "message": "message3402" + }, + { + "key": "CCC", + "message": "message3403" + }, + { + "key": "CCC", + "message": "message3404" + }, + { + "key": "CCC", + "message": "message3405" + }, + { + "key": "CCC", + "message": "message3406" + }, + { + "key": "CCC", + "message": "message3407" + }, + { + "key": "CCC", + "message": "message3408" + }, + { + "key": "CCC", + "message": "message3409" + }, + { + "key": "CCC", + "message": "message3410" + }, + { + "key": "CCC", + "message": "message3411" + }, + { + "key": "CCC", + "message": "message3412" + }, + { + "key": "CCC", + "message": "message3413" + }, + { + "key": "CCC", + "message": "message3414" + }, + { + "key": "CCC", + "message": "message3415" + }, + { + "key": "CCC", + "message": "message3416" + }, + { + "key": "CCC", + "message": "message3417" + }, + { + "key": "CCC", + "message": "message3418" + }, + { + "key": "CCC", + "message": "message3419" + }, + { + "key": "CCC", + "message": "message3420" + }, + { + "key": "CCC", + "message": "message3421" + }, + { + "key": "CCC", + "message": "message3422" + }, + { + "key": "CCC", + "message": "message3423" + }, + { + "key": "CCC", + "message": "message3424" + }, + { + "key": "CCC", + "message": "message3425" + }, + { + "key": "CCC", + "message": "message3426" + }, + { + "key": "CCC", + "message": "message3427" + }, + { + "key": "CCC", + "message": "message3428" + }, + { + "key": "CCC", + "message": "message3429" + }, + { + "key": "CCC", + "message": "message3430" + }, + { + "key": "CCC", + "message": "message3431" + }, + { + "key": "CCC", + "message": "message3432" + }, + { + "key": "CCC", + "message": "message3433" + }, + { + "key": "CCC", + "message": "message3434" + }, + { + "key": "CCC", + "message": "message3435" + }, + { + "key": "CCC", + "message": "message3436" + }, + { + "key": "CCC", + "message": "message3437" + }, + { + "key": "CCC", + "message": "message3438" + }, + { + "key": "CCC", + "message": "message3439" + }, + { + "key": "CCC", + "message": "message3440" + }, + { + "key": "CCC", + "message": "message3441" + }, + { + "key": "CCC", + "message": "message3442" + }, + { + "key": "CCC", + "message": "message3443" + }, + { + "key": "CCC", + "message": "message3444" + }, + { + "key": "CCC", + "message": "message3445" + }, + { + "key": "CCC", + "message": "message3446" + }, + { + "key": "CCC", + "message": "message3447" + }, + { + "key": "CCC", + "message": "message3448" + }, + { + "key": "CCC", + "message": "message3449" + }, + { + "key": "CCC", + "message": "message3450" + }, + { + "key": "CCC", + "message": "message3451" + }, + { + "key": "CCC", + "message": "message3452" + }, + { + "key": "CCC", + "message": "message3453" + }, + { + "key": "CCC", + "message": "message3454" + }, + { + "key": "CCC", + "message": "message3455" + }, + { + "key": "CCC", + "message": "message3456" + }, + { + "key": "CCC", + "message": "message3457" + }, + { + "key": "CCC", + "message": "message3458" + }, + { + "key": "CCC", + "message": "message3459" + }, + { + "key": "CCC", + "message": "message3460" + }, + { + "key": "CCC", + "message": "message3461" + }, + { + "key": "CCC", + "message": "message3462" + }, + { + "key": "CCC", + "message": "message3463" + }, + { + "key": "CCC", + "message": "message3464" + }, + { + "key": "CCC", + "message": "message3465" + }, + { + "key": "CCC", + "message": "message3466" + }, + { + "key": "CCC", + "message": "message3467" + }, + { + "key": "CCC", + "message": "message3468" + }, + { + "key": "CCC", + "message": "message3469" + }, + { + "key": "CCC", + "message": "message3470" + }, + { + "key": "CCC", + "message": "message3471" + }, + { + "key": "CCC", + "message": "message3472" + }, + { + "key": "CCC", + "message": "message3473" + }, + { + "key": "CCC", + "message": "message3474" + }, + { + "key": "CCC", + "message": "message3475" + }, + { + "key": "CCC", + "message": "message3476" + }, + { + "key": "CCC", + "message": "message3477" + }, + { + "key": "CCC", + "message": "message3478" + }, + { + "key": "CCC", + "message": "message3479" + }, + { + "key": "CCC", + "message": "message3480" + }, + { + "key": "CCC", + "message": "message3481" + }, + { + "key": "CCC", + "message": "message3482" + }, + { + "key": "CCC", + "message": "message3483" + }, + { + "key": "CCC", + "message": "message3484" + }, + { + "key": "CCC", + "message": "message3485" + }, + { + "key": "CCC", + "message": "message3486" + }, + { + "key": "CCC", + "message": "message3487" + }, + { + "key": "CCC", + "message": "message3488" + }, + { + "key": "CCC", + "message": "message3489" + }, + { + "key": "CCC", + "message": "message3490" + }, + { + "key": "CCC", + "message": "message3491" + }, + { + "key": "CCC", + "message": "message3492" + }, + { + "key": "CCC", + "message": "message3493" + }, + { + "key": "CCC", + "message": "message3494" + }, + { + "key": "CCC", + "message": "message3495" + }, + { + "key": "CCC", + "message": "message3496" + }, + { + "key": "CCC", + "message": "message3497" + }, + { + "key": "CCC", + "message": "message3498" + }, + { + "key": "CCC", + "message": "message3499" + }, + { + "key": "CCC", + "message": "message3500" + }, + { + "key": "CCC", + "message": "message3501" + }, + { + "key": "CCC", + "message": "message3502" + }, + { + "key": "CCC", + "message": "message3503" + }, + { + "key": "CCC", + "message": "message3504" + }, + { + "key": "CCC", + "message": "message3505" + }, + { + "key": "CCC", + "message": "message3506" + }, + { + "key": "CCC", + "message": "message3507" + }, + { + "key": "CCC", + "message": "message3508" + }, + { + "key": "CCC", + "message": "message3509" + }, + { + "key": "CCC", + "message": "message3510" + }, + { + "key": "CCC", + "message": "message3511" + }, + { + "key": "CCC", + "message": "message3512" + }, + { + "key": "CCC", + "message": "message3513" + }, + { + "key": "CCC", + "message": "message3514" + }, + { + "key": "CCC", + "message": "message3515" + }, + { + "key": "CCC", + "message": "message3516" + }, + { + "key": "CCC", + "message": "message3517" + }, + { + "key": "CCC", + "message": "message3518" + }, + { + "key": "CCC", + "message": "message3519" + }, + { + "key": "CCC", + "message": "message3520" + }, + { + "key": "CCC", + "message": "message3521" + }, + { + "key": "CCC", + "message": "message3522" + }, + { + "key": "CCC", + "message": "message3523" + }, + { + "key": "CCC", + "message": "message3524" + }, + { + "key": "CCC", + "message": "message3525" + }, + { + "key": "CCC", + "message": "message3526" + }, + { + "key": "CCC", + "message": "message3527" + }, + { + "key": "CCC", + "message": "message3528" + }, + { + "key": "CCC", + "message": "message3529" + }, + { + "key": "CCC", + "message": "message3530" + }, + { + "key": "CCC", + "message": "message3531" + }, + { + "key": "CCC", + "message": "message3532" + }, + { + "key": "CCC", + "message": "message3533" + }, + { + "key": "CCC", + "message": "message3534" + }, + { + "key": "CCC", + "message": "message3535" + }, + { + "key": "CCC", + "message": "message3536" + }, + { + "key": "CCC", + "message": "message3537" + }, + { + "key": "CCC", + "message": "message3538" + }, + { + "key": "CCC", + "message": "message3539" + }, + { + "key": "CCC", + "message": "message3540" + }, + { + "key": "CCC", + "message": "message3541" + }, + { + "key": "CCC", + "message": "message3542" + }, + { + "key": "CCC", + "message": "message3543" + }, + { + "key": "CCC", + "message": "message3544" + }, + { + "key": "CCC", + "message": "message3545" + }, + { + "key": "CCC", + "message": "message3546" + }, + { + "key": "CCC", + "message": "message3547" + }, + { + "key": "CCC", + "message": "message3548" + }, + { + "key": "CCC", + "message": "message3549" + }, + { + "key": "CCC", + "message": "message3550" + }, + { + "key": "CCC", + "message": "message3551" + }, + { + "key": "CCC", + "message": "message3552" + }, + { + "key": "CCC", + "message": "message3553" + }, + { + "key": "CCC", + "message": "message3554" + }, + { + "key": "CCC", + "message": "message3555" + }, + { + "key": "CCC", + "message": "message3556" + }, + { + "key": "CCC", + "message": "message3557" + }, + { + "key": "CCC", + "message": "message3558" + }, + { + "key": "CCC", + "message": "message3559" + }, + { + "key": "CCC", + "message": "message3560" + }, + { + "key": "CCC", + "message": "message3561" + }, + { + "key": "CCC", + "message": "message3562" + }, + { + "key": "CCC", + "message": "message3563" + }, + { + "key": "CCC", + "message": "message3564" + }, + { + "key": "CCC", + "message": "message3565" + }, + { + "key": "CCC", + "message": "message3566" + }, + { + "key": "CCC", + "message": "message3567" + }, + { + "key": "CCC", + "message": "message3568" + }, + { + "key": "CCC", + "message": "message3569" + }, + { + "key": "CCC", + "message": "message3570" + }, + { + "key": "CCC", + "message": "message3571" + }, + { + "key": "CCC", + "message": "message3572" + }, + { + "key": "CCC", + "message": "message3573" + }, + { + "key": "CCC", + "message": "message3574" + }, + { + "key": "CCC", + "message": "message3575" + }, + { + "key": "CCC", + "message": "message3576" + }, + { + "key": "CCC", + "message": "message3577" + }, + { + "key": "CCC", + "message": "message3578" + }, + { + "key": "CCC", + "message": "message3579" + }, + { + "key": "CCC", + "message": "message3580" + }, + { + "key": "CCC", + "message": "message3581" + }, + { + "key": "CCC", + "message": "message3582" + }, + { + "key": "CCC", + "message": "message3583" + }, + { + "key": "CCC", + "message": "message3584" + }, + { + "key": "CCC", + "message": "message3585" + }, + { + "key": "CCC", + "message": "message3586" + }, + { + "key": "CCC", + "message": "message3587" + }, + { + "key": "CCC", + "message": "message3588" + }, + { + "key": "CCC", + "message": "message3589" + }, + { + "key": "CCC", + "message": "message3590" + }, + { + "key": "CCC", + "message": "message3591" + }, + { + "key": "CCC", + "message": "message3592" + }, + { + "key": "CCC", + "message": "message3593" + }, + { + "key": "CCC", + "message": "message3594" + }, + { + "key": "CCC", + "message": "message3595" + }, + { + "key": "CCC", + "message": "message3596" + }, + { + "key": "CCC", + "message": "message3597" + }, + { + "key": "CCC", + "message": "message3598" + }, + { + "key": "CCC", + "message": "message3599" + }, + { + "key": "CCC", + "message": "message3600" + }, + { + "key": "DDD", + "message": "message3601" + }, + { + "key": "DDD", + "message": "message3602" + }, + { + "key": "DDD", + "message": "message3603" + }, + { + "key": "DDD", + "message": "message3604" + }, + { + "key": "DDD", + "message": "message3605" + }, + { + "key": "DDD", + "message": "message3606" + }, + { + "key": "DDD", + "message": "message3607" + }, + { + "key": "DDD", + "message": "message3608" + }, + { + "key": "DDD", + "message": "message3609" + }, + { + "key": "DDD", + "message": "message3610" + }, + { + "key": "DDD", + "message": "message3611" + }, + { + "key": "DDD", + "message": "message3612" + }, + { + "key": "DDD", + "message": "message3613" + }, + { + "key": "DDD", + "message": "message3614" + }, + { + "key": "DDD", + "message": "message3615" + }, + { + "key": "DDD", + "message": "message3616" + }, + { + "key": "DDD", + "message": "message3617" + }, + { + "key": "DDD", + "message": "message3618" + }, + { + "key": "DDD", + "message": "message3619" + }, + { + "key": "DDD", + "message": "message3620" + }, + { + "key": "DDD", + "message": "message3621" + }, + { + "key": "DDD", + "message": "message3622" + }, + { + "key": "DDD", + "message": "message3623" + }, + { + "key": "DDD", + "message": "message3624" + }, + { + "key": "DDD", + "message": "message3625" + }, + { + "key": "DDD", + "message": "message3626" + }, + { + "key": "DDD", + "message": "message3627" + }, + { + "key": "DDD", + "message": "message3628" + }, + { + "key": "DDD", + "message": "message3629" + }, + { + "key": "DDD", + "message": "message3630" + }, + { + "key": "DDD", + "message": "message3631" + }, + { + "key": "DDD", + "message": "message3632" + }, + { + "key": "DDD", + "message": "message3633" + }, + { + "key": "DDD", + "message": "message3634" + }, + { + "key": "DDD", + "message": "message3635" + }, + { + "key": "DDD", + "message": "message3636" + }, + { + "key": "DDD", + "message": "message3637" + }, + { + "key": "DDD", + "message": "message3638" + }, + { + "key": "DDD", + "message": "message3639" + }, + { + "key": "DDD", + "message": "message3640" + }, + { + "key": "DDD", + "message": "message3641" + }, + { + "key": "DDD", + "message": "message3642" + }, + { + "key": "DDD", + "message": "message3643" + }, + { + "key": "DDD", + "message": "message3644" + }, + { + "key": "DDD", + "message": "message3645" + }, + { + "key": "DDD", + "message": "message3646" + }, + { + "key": "DDD", + "message": "message3647" + }, + { + "key": "DDD", + "message": "message3648" + }, + { + "key": "DDD", + "message": "message3649" + }, + { + "key": "DDD", + "message": "message3650" + }, + { + "key": "DDD", + "message": "message3651" + }, + { + "key": "DDD", + "message": "message3652" + }, + { + "key": "DDD", + "message": "message3653" + }, + { + "key": "DDD", + "message": "message3654" + }, + { + "key": "DDD", + "message": "message3655" + }, + { + "key": "DDD", + "message": "message3656" + }, + { + "key": "DDD", + "message": "message3657" + }, + { + "key": "DDD", + "message": "message3658" + }, + { + "key": "DDD", + "message": "message3659" + }, + { + "key": "DDD", + "message": "message3660" + }, + { + "key": "DDD", + "message": "message3661" + }, + { + "key": "DDD", + "message": "message3662" + }, + { + "key": "DDD", + "message": "message3663" + }, + { + "key": "DDD", + "message": "message3664" + }, + { + "key": "DDD", + "message": "message3665" + }, + { + "key": "DDD", + "message": "message3666" + }, + { + "key": "DDD", + "message": "message3667" + }, + { + "key": "DDD", + "message": "message3668" + }, + { + "key": "DDD", + "message": "message3669" + }, + { + "key": "DDD", + "message": "message3670" + }, + { + "key": "DDD", + "message": "message3671" + }, + { + "key": "DDD", + "message": "message3672" + }, + { + "key": "DDD", + "message": "message3673" + }, + { + "key": "DDD", + "message": "message3674" + }, + { + "key": "DDD", + "message": "message3675" + }, + { + "key": "DDD", + "message": "message3676" + }, + { + "key": "DDD", + "message": "message3677" + }, + { + "key": "DDD", + "message": "message3678" + }, + { + "key": "DDD", + "message": "message3679" + }, + { + "key": "DDD", + "message": "message3680" + }, + { + "key": "DDD", + "message": "message3681" + }, + { + "key": "DDD", + "message": "message3682" + }, + { + "key": "DDD", + "message": "message3683" + }, + { + "key": "DDD", + "message": "message3684" + }, + { + "key": "DDD", + "message": "message3685" + }, + { + "key": "DDD", + "message": "message3686" + }, + { + "key": "DDD", + "message": "message3687" + }, + { + "key": "DDD", + "message": "message3688" + }, + { + "key": "DDD", + "message": "message3689" + }, + { + "key": "DDD", + "message": "message3690" + }, + { + "key": "DDD", + "message": "message3691" + }, + { + "key": "DDD", + "message": "message3692" + }, + { + "key": "DDD", + "message": "message3693" + }, + { + "key": "DDD", + "message": "message3694" + }, + { + "key": "DDD", + "message": "message3695" + }, + { + "key": "DDD", + "message": "message3696" + }, + { + "key": "DDD", + "message": "message3697" + }, + { + "key": "DDD", + "message": "message3698" + }, + { + "key": "DDD", + "message": "message3699" + }, + { + "key": "DDD", + "message": "message3700" + }, + { + "key": "DDD", + "message": "message3701" + }, + { + "key": "DDD", + "message": "message3702" + }, + { + "key": "DDD", + "message": "message3703" + }, + { + "key": "DDD", + "message": "message3704" + }, + { + "key": "DDD", + "message": "message3705" + }, + { + "key": "DDD", + "message": "message3706" + }, + { + "key": "DDD", + "message": "message3707" + }, + { + "key": "DDD", + "message": "message3708" + }, + { + "key": "DDD", + "message": "message3709" + }, + { + "key": "DDD", + "message": "message3710" + }, + { + "key": "DDD", + "message": "message3711" + }, + { + "key": "DDD", + "message": "message3712" + }, + { + "key": "DDD", + "message": "message3713" + }, + { + "key": "DDD", + "message": "message3714" + }, + { + "key": "DDD", + "message": "message3715" + }, + { + "key": "DDD", + "message": "message3716" + }, + { + "key": "DDD", + "message": "message3717" + }, + { + "key": "DDD", + "message": "message3718" + }, + { + "key": "DDD", + "message": "message3719" + }, + { + "key": "DDD", + "message": "message3720" + }, + { + "key": "DDD", + "message": "message3721" + }, + { + "key": "DDD", + "message": "message3722" + }, + { + "key": "DDD", + "message": "message3723" + }, + { + "key": "DDD", + "message": "message3724" + }, + { + "key": "DDD", + "message": "message3725" + }, + { + "key": "DDD", + "message": "message3726" + }, + { + "key": "DDD", + "message": "message3727" + }, + { + "key": "DDD", + "message": "message3728" + }, + { + "key": "DDD", + "message": "message3729" + }, + { + "key": "DDD", + "message": "message3730" + }, + { + "key": "DDD", + "message": "message3731" + }, + { + "key": "DDD", + "message": "message3732" + }, + { + "key": "DDD", + "message": "message3733" + }, + { + "key": "DDD", + "message": "message3734" + }, + { + "key": "DDD", + "message": "message3735" + }, + { + "key": "DDD", + "message": "message3736" + }, + { + "key": "DDD", + "message": "message3737" + }, + { + "key": "DDD", + "message": "message3738" + }, + { + "key": "DDD", + "message": "message3739" + }, + { + "key": "DDD", + "message": "message3740" + }, + { + "key": "DDD", + "message": "message3741" + }, + { + "key": "DDD", + "message": "message3742" + }, + { + "key": "DDD", + "message": "message3743" + }, + { + "key": "DDD", + "message": "message3744" + }, + { + "key": "DDD", + "message": "message3745" + }, + { + "key": "DDD", + "message": "message3746" + }, + { + "key": "DDD", + "message": "message3747" + }, + { + "key": "DDD", + "message": "message3748" + }, + { + "key": "DDD", + "message": "message3749" + }, + { + "key": "DDD", + "message": "message3750" + }, + { + "key": "DDD", + "message": "message3751" + }, + { + "key": "DDD", + "message": "message3752" + }, + { + "key": "DDD", + "message": "message3753" + }, + { + "key": "DDD", + "message": "message3754" + }, + { + "key": "DDD", + "message": "message3755" + }, + { + "key": "DDD", + "message": "message3756" + }, + { + "key": "DDD", + "message": "message3757" + }, + { + "key": "DDD", + "message": "message3758" + }, + { + "key": "DDD", + "message": "message3759" + }, + { + "key": "DDD", + "message": "message3760" + }, + { + "key": "DDD", + "message": "message3761" + }, + { + "key": "DDD", + "message": "message3762" + }, + { + "key": "DDD", + "message": "message3763" + }, + { + "key": "DDD", + "message": "message3764" + }, + { + "key": "DDD", + "message": "message3765" + }, + { + "key": "DDD", + "message": "message3766" + }, + { + "key": "DDD", + "message": "message3767" + }, + { + "key": "DDD", + "message": "message3768" + }, + { + "key": "DDD", + "message": "message3769" + }, + { + "key": "DDD", + "message": "message3770" + }, + { + "key": "DDD", + "message": "message3771" + }, + { + "key": "DDD", + "message": "message3772" + }, + { + "key": "DDD", + "message": "message3773" + }, + { + "key": "DDD", + "message": "message3774" + }, + { + "key": "DDD", + "message": "message3775" + }, + { + "key": "DDD", + "message": "message3776" + }, + { + "key": "DDD", + "message": "message3777" + }, + { + "key": "DDD", + "message": "message3778" + }, + { + "key": "DDD", + "message": "message3779" + }, + { + "key": "DDD", + "message": "message3780" + }, + { + "key": "DDD", + "message": "message3781" + }, + { + "key": "DDD", + "message": "message3782" + }, + { + "key": "DDD", + "message": "message3783" + }, + { + "key": "DDD", + "message": "message3784" + }, + { + "key": "DDD", + "message": "message3785" + }, + { + "key": "DDD", + "message": "message3786" + }, + { + "key": "DDD", + "message": "message3787" + }, + { + "key": "DDD", + "message": "message3788" + }, + { + "key": "DDD", + "message": "message3789" + }, + { + "key": "DDD", + "message": "message3790" + }, + { + "key": "DDD", + "message": "message3791" + }, + { + "key": "DDD", + "message": "message3792" + }, + { + "key": "DDD", + "message": "message3793" + }, + { + "key": "DDD", + "message": "message3794" + }, + { + "key": "DDD", + "message": "message3795" + }, + { + "key": "DDD", + "message": "message3796" + }, + { + "key": "DDD", + "message": "message3797" + }, + { + "key": "DDD", + "message": "message3798" + }, + { + "key": "DDD", + "message": "message3799" + }, + { + "key": "DDD", + "message": "message3800" + }, + { + "key": "DDD", + "message": "message3801" + }, + { + "key": "DDD", + "message": "message3802" + }, + { + "key": "DDD", + "message": "message3803" + }, + { + "key": "DDD", + "message": "message3804" + }, + { + "key": "DDD", + "message": "message3805" + }, + { + "key": "DDD", + "message": "message3806" + }, + { + "key": "DDD", + "message": "message3807" + }, + { + "key": "DDD", + "message": "message3808" + }, + { + "key": "DDD", + "message": "message3809" + }, + { + "key": "DDD", + "message": "message3810" + }, + { + "key": "DDD", + "message": "message3811" + }, + { + "key": "DDD", + "message": "message3812" + }, + { + "key": "DDD", + "message": "message3813" + }, + { + "key": "DDD", + "message": "message3814" + }, + { + "key": "DDD", + "message": "message3815" + }, + { + "key": "DDD", + "message": "message3816" + }, + { + "key": "DDD", + "message": "message3817" + }, + { + "key": "DDD", + "message": "message3818" + }, + { + "key": "DDD", + "message": "message3819" + }, + { + "key": "DDD", + "message": "message3820" + }, + { + "key": "DDD", + "message": "message3821" + }, + { + "key": "DDD", + "message": "message3822" + }, + { + "key": "DDD", + "message": "message3823" + }, + { + "key": "DDD", + "message": "message3824" + }, + { + "key": "DDD", + "message": "message3825" + }, + { + "key": "DDD", + "message": "message3826" + }, + { + "key": "DDD", + "message": "message3827" + }, + { + "key": "DDD", + "message": "message3828" + }, + { + "key": "DDD", + "message": "message3829" + }, + { + "key": "DDD", + "message": "message3830" + }, + { + "key": "DDD", + "message": "message3831" + }, + { + "key": "DDD", + "message": "message3832" + }, + { + "key": "DDD", + "message": "message3833" + }, + { + "key": "DDD", + "message": "message3834" + }, + { + "key": "DDD", + "message": "message3835" + }, + { + "key": "DDD", + "message": "message3836" + }, + { + "key": "DDD", + "message": "message3837" + }, + { + "key": "DDD", + "message": "message3838" + }, + { + "key": "DDD", + "message": "message3839" + }, + { + "key": "DDD", + "message": "message3840" + }, + { + "key": "DDD", + "message": "message3841" + }, + { + "key": "DDD", + "message": "message3842" + }, + { + "key": "DDD", + "message": "message3843" + }, + { + "key": "DDD", + "message": "message3844" + }, + { + "key": "DDD", + "message": "message3845" + }, + { + "key": "DDD", + "message": "message3846" + }, + { + "key": "DDD", + "message": "message3847" + }, + { + "key": "DDD", + "message": "message3848" + }, + { + "key": "DDD", + "message": "message3849" + }, + { + "key": "DDD", + "message": "message3850" + }, + { + "key": "DDD", + "message": "message3851" + }, + { + "key": "DDD", + "message": "message3852" + }, + { + "key": "DDD", + "message": "message3853" + }, + { + "key": "DDD", + "message": "message3854" + }, + { + "key": "DDD", + "message": "message3855" + }, + { + "key": "DDD", + "message": "message3856" + }, + { + "key": "DDD", + "message": "message3857" + }, + { + "key": "DDD", + "message": "message3858" + }, + { + "key": "DDD", + "message": "message3859" + }, + { + "key": "DDD", + "message": "message3860" + }, + { + "key": "DDD", + "message": "message3861" + }, + { + "key": "DDD", + "message": "message3862" + }, + { + "key": "DDD", + "message": "message3863" + }, + { + "key": "DDD", + "message": "message3864" + }, + { + "key": "DDD", + "message": "message3865" + }, + { + "key": "DDD", + "message": "message3866" + }, + { + "key": "DDD", + "message": "message3867" + }, + { + "key": "DDD", + "message": "message3868" + }, + { + "key": "DDD", + "message": "message3869" + }, + { + "key": "DDD", + "message": "message3870" + }, + { + "key": "DDD", + "message": "message3871" + }, + { + "key": "DDD", + "message": "message3872" + }, + { + "key": "DDD", + "message": "message3873" + }, + { + "key": "DDD", + "message": "message3874" + }, + { + "key": "DDD", + "message": "message3875" + }, + { + "key": "DDD", + "message": "message3876" + }, + { + "key": "DDD", + "message": "message3877" + }, + { + "key": "DDD", + "message": "message3878" + }, + { + "key": "DDD", + "message": "message3879" + }, + { + "key": "DDD", + "message": "message3880" + }, + { + "key": "DDD", + "message": "message3881" + }, + { + "key": "DDD", + "message": "message3882" + }, + { + "key": "DDD", + "message": "message3883" + }, + { + "key": "DDD", + "message": "message3884" + }, + { + "key": "DDD", + "message": "message3885" + }, + { + "key": "DDD", + "message": "message3886" + }, + { + "key": "DDD", + "message": "message3887" + }, + { + "key": "DDD", + "message": "message3888" + }, + { + "key": "DDD", + "message": "message3889" + }, + { + "key": "DDD", + "message": "message3890" + }, + { + "key": "DDD", + "message": "message3891" + }, + { + "key": "DDD", + "message": "message3892" + }, + { + "key": "DDD", + "message": "message3893" + }, + { + "key": "DDD", + "message": "message3894" + }, + { + "key": "DDD", + "message": "message3895" + }, + { + "key": "DDD", + "message": "message3896" + }, + { + "key": "DDD", + "message": "message3897" + }, + { + "key": "DDD", + "message": "message3898" + }, + { + "key": "DDD", + "message": "message3899" + }, + { + "key": "DDD", + "message": "message3900" + }, + { + "key": "DDD", + "message": "message3901" + }, + { + "key": "DDD", + "message": "message3902" + }, + { + "key": "DDD", + "message": "message3903" + }, + { + "key": "DDD", + "message": "message3904" + }, + { + "key": "DDD", + "message": "message3905" + }, + { + "key": "DDD", + "message": "message3906" + }, + { + "key": "DDD", + "message": "message3907" + }, + { + "key": "DDD", + "message": "message3908" + }, + { + "key": "DDD", + "message": "message3909" + }, + { + "key": "DDD", + "message": "message3910" + }, + { + "key": "DDD", + "message": "message3911" + }, + { + "key": "DDD", + "message": "message3912" + }, + { + "key": "DDD", + "message": "message3913" + }, + { + "key": "DDD", + "message": "message3914" + }, + { + "key": "DDD", + "message": "message3915" + }, + { + "key": "DDD", + "message": "message3916" + }, + { + "key": "DDD", + "message": "message3917" + }, + { + "key": "DDD", + "message": "message3918" + }, + { + "key": "DDD", + "message": "message3919" + }, + { + "key": "DDD", + "message": "message3920" + }, + { + "key": "DDD", + "message": "message3921" + }, + { + "key": "DDD", + "message": "message3922" + }, + { + "key": "DDD", + "message": "message3923" + }, + { + "key": "DDD", + "message": "message3924" + }, + { + "key": "DDD", + "message": "message3925" + }, + { + "key": "DDD", + "message": "message3926" + }, + { + "key": "DDD", + "message": "message3927" + }, + { + "key": "DDD", + "message": "message3928" + }, + { + "key": "DDD", + "message": "message3929" + }, + { + "key": "DDD", + "message": "message3930" + }, + { + "key": "DDD", + "message": "message3931" + }, + { + "key": "DDD", + "message": "message3932" + }, + { + "key": "DDD", + "message": "message3933" + }, + { + "key": "DDD", + "message": "message3934" + }, + { + "key": "DDD", + "message": "message3935" + }, + { + "key": "DDD", + "message": "message3936" + }, + { + "key": "DDD", + "message": "message3937" + }, + { + "key": "DDD", + "message": "message3938" + }, + { + "key": "DDD", + "message": "message3939" + }, + { + "key": "DDD", + "message": "message3940" + }, + { + "key": "DDD", + "message": "message3941" + }, + { + "key": "DDD", + "message": "message3942" + }, + { + "key": "DDD", + "message": "message3943" + }, + { + "key": "DDD", + "message": "message3944" + }, + { + "key": "DDD", + "message": "message3945" + }, + { + "key": "DDD", + "message": "message3946" + }, + { + "key": "DDD", + "message": "message3947" + }, + { + "key": "DDD", + "message": "message3948" + }, + { + "key": "DDD", + "message": "message3949" + }, + { + "key": "DDD", + "message": "message3950" + }, + { + "key": "DDD", + "message": "message3951" + }, + { + "key": "DDD", + "message": "message3952" + }, + { + "key": "DDD", + "message": "message3953" + }, + { + "key": "DDD", + "message": "message3954" + }, + { + "key": "DDD", + "message": "message3955" + }, + { + "key": "DDD", + "message": "message3956" + }, + { + "key": "DDD", + "message": "message3957" + }, + { + "key": "DDD", + "message": "message3958" + }, + { + "key": "DDD", + "message": "message3959" + }, + { + "key": "DDD", + "message": "message3960" + }, + { + "key": "DDD", + "message": "message3961" + }, + { + "key": "DDD", + "message": "message3962" + }, + { + "key": "DDD", + "message": "message3963" + }, + { + "key": "DDD", + "message": "message3964" + }, + { + "key": "DDD", + "message": "message3965" + }, + { + "key": "DDD", + "message": "message3966" + }, + { + "key": "DDD", + "message": "message3967" + }, + { + "key": "DDD", + "message": "message3968" + }, + { + "key": "DDD", + "message": "message3969" + }, + { + "key": "DDD", + "message": "message3970" + }, + { + "key": "DDD", + "message": "message3971" + }, + { + "key": "DDD", + "message": "message3972" + }, + { + "key": "DDD", + "message": "message3973" + }, + { + "key": "DDD", + "message": "message3974" + }, + { + "key": "DDD", + "message": "message3975" + }, + { + "key": "DDD", + "message": "message3976" + }, + { + "key": "DDD", + "message": "message3977" + }, + { + "key": "DDD", + "message": "message3978" + }, + { + "key": "DDD", + "message": "message3979" + }, + { + "key": "DDD", + "message": "message3980" + }, + { + "key": "DDD", + "message": "message3981" + }, + { + "key": "DDD", + "message": "message3982" + }, + { + "key": "DDD", + "message": "message3983" + }, + { + "key": "DDD", + "message": "message3984" + }, + { + "key": "DDD", + "message": "message3985" + }, + { + "key": "DDD", + "message": "message3986" + }, + { + "key": "DDD", + "message": "message3987" + }, + { + "key": "DDD", + "message": "message3988" + }, + { + "key": "DDD", + "message": "message3989" + }, + { + "key": "DDD", + "message": "message3990" + }, + { + "key": "DDD", + "message": "message3991" + }, + { + "key": "DDD", + "message": "message3992" + }, + { + "key": "DDD", + "message": "message3993" + }, + { + "key": "DDD", + "message": "message3994" + }, + { + "key": "DDD", + "message": "message3995" + }, + { + "key": "DDD", + "message": "message3996" + }, + { + "key": "DDD", + "message": "message3997" + }, + { + "key": "DDD", + "message": "message3998" + }, + { + "key": "DDD", + "message": "message3999" + }, + { + "key": "DDD", + "message": "message4000" + }, + { + "key": "CCC", + "message": "message4001" + }, + { + "key": "", + "message": "message4002" + }, + { + "key": "AAA", + "message": "message4003" + }, + { + "key": "CCC", + "message": "message4004" + }, + { + "key": "AAA", + "message": "message4005" + }, + { + "key": "CCC", + "message": "message4006" + }, + { + "key": "BBB", + "message": "message4007" + }, + { + "key": "AAA", + "message": "message4008" + }, + { + "key": "BBB", + "message": "message4009" + }, + { + "key": "BBB", + "message": "message4010" + }, + { + "key": "BBB", + "message": "message4011" + }, + { + "key": "BBB", + "message": "message4012" + }, + { + "key": "BBB", + "message": "message4013" + }, + { + "key": "DDD", + "message": "message4014" + }, + { + "key": "DDD", + "message": "message4015" + }, + { + "key": "DDD", + "message": "message4016" + }, + { + "key": "CCC", + "message": "message4017" + }, + { + "key": "CCC", + "message": "message4018" + }, + { + "key": "CCC", + "message": "message4019" + }, + { + "key": "", + "message": "message4020" + }, + { + "key": "CCC", + "message": "message4021" + }, + { + "key": "DDD", + "message": "message4022" + }, + { + "key": "AAA", + "message": "message4023" + }, + { + "key": "DDD", + "message": "message4024" + }, + { + "key": "", + "message": "message4025" + }, + { + "key": "", + "message": "message4026" + }, + { + "key": "DDD", + "message": "message4027" + }, + { + "key": "DDD", + "message": "message4028" + }, + { + "key": "CCC", + "message": "message4029" + }, + { + "key": "CCC", + "message": "message4030" + }, + { + "key": "DDD", + "message": "message4031" + }, + { + "key": "CCC", + "message": "message4032" + }, + { + "key": "", + "message": "message4033" + }, + { + "key": "CCC", + "message": "message4034" + }, + { + "key": "DDD", + "message": "message4035" + }, + { + "key": "", + "message": "message4036" + }, + { + "key": "", + "message": "message4037" + }, + { + "key": "CCC", + "message": "message4038" + }, + { + "key": "AAA", + "message": "message4039" + }, + { + "key": "", + "message": "message4040" + }, + { + "key": "DDD", + "message": "message4041" + }, + { + "key": "BBB", + "message": "message4042" + }, + { + "key": "DDD", + "message": "message4043" + }, + { + "key": "AAA", + "message": "message4044" + }, + { + "key": "DDD", + "message": "message4045" + }, + { + "key": "CCC", + "message": "message4046" + }, + { + "key": "", + "message": "message4047" + }, + { + "key": "CCC", + "message": "message4048" + }, + { + "key": "CCC", + "message": "message4049" + }, + { + "key": "DDD", + "message": "message4050" + }, + { + "key": "AAA", + "message": "message4051" + }, + { + "key": "DDD", + "message": "message4052" + }, + { + "key": "", + "message": "message4053" + }, + { + "key": "DDD", + "message": "message4054" + }, + { + "key": "AAA", + "message": "message4055" + }, + { + "key": "CCC", + "message": "message4056" + }, + { + "key": "BBB", + "message": "message4057" + }, + { + "key": "DDD", + "message": "message4058" + }, + { + "key": "", + "message": "message4059" + }, + { + "key": "CCC", + "message": "message4060" + }, + { + "key": "AAA", + "message": "message4061" + }, + { + "key": "", + "message": "message4062" + }, + { + "key": "", + "message": "message4063" + }, + { + "key": "DDD", + "message": "message4064" + }, + { + "key": "CCC", + "message": "message4065" + }, + { + "key": "DDD", + "message": "message4066" + }, + { + "key": "AAA", + "message": "message4067" + }, + { + "key": "", + "message": "message4068" + }, + { + "key": "AAA", + "message": "message4069" + }, + { + "key": "AAA", + "message": "message4070" + }, + { + "key": "CCC", + "message": "message4071" + }, + { + "key": "CCC", + "message": "message4072" + }, + { + "key": "CCC", + "message": "message4073" + }, + { + "key": "DDD", + "message": "message4074" + }, + { + "key": "CCC", + "message": "message4075" + }, + { + "key": "CCC", + "message": "message4076" + }, + { + "key": "AAA", + "message": "message4077" + }, + { + "key": "", + "message": "message4078" + }, + { + "key": "", + "message": "message4079" + }, + { + "key": "CCC", + "message": "message4080" + }, + { + "key": "BBB", + "message": "message4081" + }, + { + "key": "CCC", + "message": "message4082" + }, + { + "key": "", + "message": "message4083" + }, + { + "key": "CCC", + "message": "message4084" + }, + { + "key": "", + "message": "message4085" + }, + { + "key": "", + "message": "message4086" + }, + { + "key": "DDD", + "message": "message4087" + }, + { + "key": "DDD", + "message": "message4088" + }, + { + "key": "", + "message": "message4089" + }, + { + "key": "DDD", + "message": "message4090" + }, + { + "key": "AAA", + "message": "message4091" + }, + { + "key": "CCC", + "message": "message4092" + }, + { + "key": "DDD", + "message": "message4093" + }, + { + "key": "", + "message": "message4094" + }, + { + "key": "", + "message": "message4095" + }, + { + "key": "CCC", + "message": "message4096" + }, + { + "key": "CCC", + "message": "message4097" + }, + { + "key": "", + "message": "message4098" + }, + { + "key": "AAA", + "message": "message4099" + }, + { + "key": "AAA", + "message": "message4100" + }, + { + "key": "AAA", + "message": "message4101" + }, + { + "key": "", + "message": "message4102" + }, + { + "key": "AAA", + "message": "message4103" + }, + { + "key": "BBB", + "message": "message4104" + }, + { + "key": "CCC", + "message": "message4105" + }, + { + "key": "", + "message": "message4106" + }, + { + "key": "CCC", + "message": "message4107" + }, + { + "key": "", + "message": "message4108" + }, + { + "key": "BBB", + "message": "message4109" + }, + { + "key": "BBB", + "message": "message4110" + }, + { + "key": "CCC", + "message": "message4111" + }, + { + "key": "CCC", + "message": "message4112" + }, + { + "key": "", + "message": "message4113" + }, + { + "key": "", + "message": "message4114" + }, + { + "key": "BBB", + "message": "message4115" + }, + { + "key": "AAA", + "message": "message4116" + }, + { + "key": "BBB", + "message": "message4117" + }, + { + "key": "BBB", + "message": "message4118" + }, + { + "key": "BBB", + "message": "message4119" + }, + { + "key": "CCC", + "message": "message4120" + }, + { + "key": "CCC", + "message": "message4121" + }, + { + "key": "BBB", + "message": "message4122" + }, + { + "key": "CCC", + "message": "message4123" + }, + { + "key": "AAA", + "message": "message4124" + }, + { + "key": "AAA", + "message": "message4125" + }, + { + "key": "DDD", + "message": "message4126" + }, + { + "key": "DDD", + "message": "message4127" + }, + { + "key": "CCC", + "message": "message4128" + }, + { + "key": "DDD", + "message": "message4129" + }, + { + "key": "", + "message": "message4130" + }, + { + "key": "", + "message": "message4131" + }, + { + "key": "AAA", + "message": "message4132" + }, + { + "key": "DDD", + "message": "message4133" + }, + { + "key": "CCC", + "message": "message4134" + }, + { + "key": "DDD", + "message": "message4135" + }, + { + "key": "BBB", + "message": "message4136" + }, + { + "key": "BBB", + "message": "message4137" + }, + { + "key": "", + "message": "message4138" + }, + { + "key": "DDD", + "message": "message4139" + }, + { + "key": "", + "message": "message4140" + }, + { + "key": "CCC", + "message": "message4141" + }, + { + "key": "AAA", + "message": "message4142" + }, + { + "key": "CCC", + "message": "message4143" + }, + { + "key": "BBB", + "message": "message4144" + }, + { + "key": "DDD", + "message": "message4145" + }, + { + "key": "", + "message": "message4146" + }, + { + "key": "", + "message": "message4147" + }, + { + "key": "DDD", + "message": "message4148" + }, + { + "key": "CCC", + "message": "message4149" + }, + { + "key": "CCC", + "message": "message4150" + }, + { + "key": "BBB", + "message": "message4151" + }, + { + "key": "BBB", + "message": "message4152" + }, + { + "key": "BBB", + "message": "message4153" + }, + { + "key": "BBB", + "message": "message4154" + }, + { + "key": "AAA", + "message": "message4155" + }, + { + "key": "CCC", + "message": "message4156" + }, + { + "key": "", + "message": "message4157" + }, + { + "key": "", + "message": "message4158" + }, + { + "key": "AAA", + "message": "message4159" + }, + { + "key": "AAA", + "message": "message4160" + }, + { + "key": "CCC", + "message": "message4161" + }, + { + "key": "AAA", + "message": "message4162" + }, + { + "key": "AAA", + "message": "message4163" + }, + { + "key": "AAA", + "message": "message4164" + }, + { + "key": "DDD", + "message": "message4165" + }, + { + "key": "AAA", + "message": "message4166" + }, + { + "key": "DDD", + "message": "message4167" + }, + { + "key": "DDD", + "message": "message4168" + }, + { + "key": "AAA", + "message": "message4169" + }, + { + "key": "BBB", + "message": "message4170" + }, + { + "key": "BBB", + "message": "message4171" + }, + { + "key": "BBB", + "message": "message4172" + }, + { + "key": "BBB", + "message": "message4173" + }, + { + "key": "CCC", + "message": "message4174" + }, + { + "key": "AAA", + "message": "message4175" + }, + { + "key": "", + "message": "message4176" + }, + { + "key": "AAA", + "message": "message4177" + }, + { + "key": "AAA", + "message": "message4178" + }, + { + "key": "DDD", + "message": "message4179" + }, + { + "key": "CCC", + "message": "message4180" + }, + { + "key": "", + "message": "message4181" + }, + { + "key": "CCC", + "message": "message4182" + }, + { + "key": "BBB", + "message": "message4183" + }, + { + "key": "BBB", + "message": "message4184" + }, + { + "key": "DDD", + "message": "message4185" + }, + { + "key": "AAA", + "message": "message4186" + }, + { + "key": "AAA", + "message": "message4187" + }, + { + "key": "CCC", + "message": "message4188" + }, + { + "key": "DDD", + "message": "message4189" + }, + { + "key": "BBB", + "message": "message4190" + }, + { + "key": "DDD", + "message": "message4191" + }, + { + "key": "", + "message": "message4192" + }, + { + "key": "BBB", + "message": "message4193" + }, + { + "key": "DDD", + "message": "message4194" + }, + { + "key": "BBB", + "message": "message4195" + }, + { + "key": "CCC", + "message": "message4196" + }, + { + "key": "", + "message": "message4197" + }, + { + "key": "DDD", + "message": "message4198" + }, + { + "key": "", + "message": "message4199" + }, + { + "key": "CCC", + "message": "message4200" + }, + { + "key": "BBB", + "message": "message4201" + }, + { + "key": "", + "message": "message4202" + }, + { + "key": "DDD", + "message": "message4203" + }, + { + "key": "BBB", + "message": "message4204" + }, + { + "key": "AAA", + "message": "message4205" + }, + { + "key": "DDD", + "message": "message4206" + }, + { + "key": "BBB", + "message": "message4207" + }, + { + "key": "AAA", + "message": "message4208" + }, + { + "key": "BBB", + "message": "message4209" + }, + { + "key": "BBB", + "message": "message4210" + }, + { + "key": "", + "message": "message4211" + }, + { + "key": "", + "message": "message4212" + }, + { + "key": "CCC", + "message": "message4213" + }, + { + "key": "BBB", + "message": "message4214" + }, + { + "key": "AAA", + "message": "message4215" + }, + { + "key": "AAA", + "message": "message4216" + }, + { + "key": "", + "message": "message4217" + }, + { + "key": "", + "message": "message4218" + }, + { + "key": "DDD", + "message": "message4219" + }, + { + "key": "", + "message": "message4220" + }, + { + "key": "AAA", + "message": "message4221" + }, + { + "key": "CCC", + "message": "message4222" + }, + { + "key": "", + "message": "message4223" + }, + { + "key": "CCC", + "message": "message4224" + }, + { + "key": "BBB", + "message": "message4225" + }, + { + "key": "DDD", + "message": "message4226" + }, + { + "key": "AAA", + "message": "message4227" + }, + { + "key": "CCC", + "message": "message4228" + }, + { + "key": "DDD", + "message": "message4229" + }, + { + "key": "BBB", + "message": "message4230" + }, + { + "key": "AAA", + "message": "message4231" + }, + { + "key": "BBB", + "message": "message4232" + }, + { + "key": "CCC", + "message": "message4233" + }, + { + "key": "DDD", + "message": "message4234" + }, + { + "key": "BBB", + "message": "message4235" + }, + { + "key": "CCC", + "message": "message4236" + }, + { + "key": "CCC", + "message": "message4237" + }, + { + "key": "CCC", + "message": "message4238" + }, + { + "key": "", + "message": "message4239" + }, + { + "key": "BBB", + "message": "message4240" + }, + { + "key": "", + "message": "message4241" + }, + { + "key": "CCC", + "message": "message4242" + }, + { + "key": "DDD", + "message": "message4243" + }, + { + "key": "CCC", + "message": "message4244" + }, + { + "key": "AAA", + "message": "message4245" + }, + { + "key": "DDD", + "message": "message4246" + }, + { + "key": "BBB", + "message": "message4247" + }, + { + "key": "BBB", + "message": "message4248" + }, + { + "key": "", + "message": "message4249" + }, + { + "key": "BBB", + "message": "message4250" + }, + { + "key": "DDD", + "message": "message4251" + }, + { + "key": "", + "message": "message4252" + }, + { + "key": "DDD", + "message": "message4253" + }, + { + "key": "AAA", + "message": "message4254" + }, + { + "key": "DDD", + "message": "message4255" + }, + { + "key": "BBB", + "message": "message4256" + }, + { + "key": "", + "message": "message4257" + }, + { + "key": "CCC", + "message": "message4258" + }, + { + "key": "", + "message": "message4259" + }, + { + "key": "AAA", + "message": "message4260" + }, + { + "key": "BBB", + "message": "message4261" + }, + { + "key": "CCC", + "message": "message4262" + }, + { + "key": "", + "message": "message4263" + }, + { + "key": "BBB", + "message": "message4264" + }, + { + "key": "BBB", + "message": "message4265" + }, + { + "key": "", + "message": "message4266" + }, + { + "key": "", + "message": "message4267" + }, + { + "key": "", + "message": "message4268" + }, + { + "key": "AAA", + "message": "message4269" + }, + { + "key": "AAA", + "message": "message4270" + }, + { + "key": "DDD", + "message": "message4271" + }, + { + "key": "DDD", + "message": "message4272" + }, + { + "key": "BBB", + "message": "message4273" + }, + { + "key": "DDD", + "message": "message4274" + }, + { + "key": "DDD", + "message": "message4275" + }, + { + "key": "BBB", + "message": "message4276" + }, + { + "key": "", + "message": "message4277" + }, + { + "key": "DDD", + "message": "message4278" + }, + { + "key": "BBB", + "message": "message4279" + }, + { + "key": "BBB", + "message": "message4280" + }, + { + "key": "", + "message": "message4281" + }, + { + "key": "CCC", + "message": "message4282" + }, + { + "key": "CCC", + "message": "message4283" + }, + { + "key": "DDD", + "message": "message4284" + }, + { + "key": "CCC", + "message": "message4285" + }, + { + "key": "AAA", + "message": "message4286" + }, + { + "key": "DDD", + "message": "message4287" + }, + { + "key": "BBB", + "message": "message4288" + }, + { + "key": "DDD", + "message": "message4289" + }, + { + "key": "CCC", + "message": "message4290" + }, + { + "key": "", + "message": "message4291" + }, + { + "key": "AAA", + "message": "message4292" + }, + { + "key": "AAA", + "message": "message4293" + }, + { + "key": "", + "message": "message4294" + }, + { + "key": "", + "message": "message4295" + }, + { + "key": "DDD", + "message": "message4296" + }, + { + "key": "CCC", + "message": "message4297" + }, + { + "key": "AAA", + "message": "message4298" + }, + { + "key": "", + "message": "message4299" + }, + { + "key": "", + "message": "message4300" + }, + { + "key": "DDD", + "message": "message4301" + }, + { + "key": "CCC", + "message": "message4302" + }, + { + "key": "CCC", + "message": "message4303" + }, + { + "key": "AAA", + "message": "message4304" + }, + { + "key": "CCC", + "message": "message4305" + }, + { + "key": "CCC", + "message": "message4306" + }, + { + "key": "CCC", + "message": "message4307" + }, + { + "key": "AAA", + "message": "message4308" + }, + { + "key": "BBB", + "message": "message4309" + }, + { + "key": "DDD", + "message": "message4310" + }, + { + "key": "AAA", + "message": "message4311" + }, + { + "key": "AAA", + "message": "message4312" + }, + { + "key": "AAA", + "message": "message4313" + }, + { + "key": "", + "message": "message4314" + }, + { + "key": "AAA", + "message": "message4315" + }, + { + "key": "AAA", + "message": "message4316" + }, + { + "key": "DDD", + "message": "message4317" + }, + { + "key": "AAA", + "message": "message4318" + }, + { + "key": "CCC", + "message": "message4319" + }, + { + "key": "", + "message": "message4320" + }, + { + "key": "", + "message": "message4321" + }, + { + "key": "", + "message": "message4322" + }, + { + "key": "BBB", + "message": "message4323" + }, + { + "key": "CCC", + "message": "message4324" + }, + { + "key": "AAA", + "message": "message4325" + }, + { + "key": "AAA", + "message": "message4326" + }, + { + "key": "", + "message": "message4327" + }, + { + "key": "CCC", + "message": "message4328" + }, + { + "key": "DDD", + "message": "message4329" + }, + { + "key": "DDD", + "message": "message4330" + }, + { + "key": "BBB", + "message": "message4331" + }, + { + "key": "CCC", + "message": "message4332" + }, + { + "key": "", + "message": "message4333" + }, + { + "key": "", + "message": "message4334" + }, + { + "key": "", + "message": "message4335" + }, + { + "key": "CCC", + "message": "message4336" + }, + { + "key": "", + "message": "message4337" + }, + { + "key": "DDD", + "message": "message4338" + }, + { + "key": "BBB", + "message": "message4339" + }, + { + "key": "CCC", + "message": "message4340" + }, + { + "key": "BBB", + "message": "message4341" + }, + { + "key": "CCC", + "message": "message4342" + }, + { + "key": "CCC", + "message": "message4343" + }, + { + "key": "BBB", + "message": "message4344" + }, + { + "key": "CCC", + "message": "message4345" + }, + { + "key": "DDD", + "message": "message4346" + }, + { + "key": "AAA", + "message": "message4347" + }, + { + "key": "DDD", + "message": "message4348" + }, + { + "key": "", + "message": "message4349" + }, + { + "key": "DDD", + "message": "message4350" + }, + { + "key": "DDD", + "message": "message4351" + }, + { + "key": "AAA", + "message": "message4352" + }, + { + "key": "AAA", + "message": "message4353" + }, + { + "key": "BBB", + "message": "message4354" + }, + { + "key": "BBB", + "message": "message4355" + }, + { + "key": "AAA", + "message": "message4356" + }, + { + "key": "CCC", + "message": "message4357" + }, + { + "key": "BBB", + "message": "message4358" + }, + { + "key": "BBB", + "message": "message4359" + }, + { + "key": "BBB", + "message": "message4360" + }, + { + "key": "", + "message": "message4361" + }, + { + "key": "DDD", + "message": "message4362" + }, + { + "key": "", + "message": "message4363" + }, + { + "key": "DDD", + "message": "message4364" + }, + { + "key": "", + "message": "message4365" + }, + { + "key": "AAA", + "message": "message4366" + }, + { + "key": "AAA", + "message": "message4367" + }, + { + "key": "DDD", + "message": "message4368" + }, + { + "key": "AAA", + "message": "message4369" + }, + { + "key": "CCC", + "message": "message4370" + }, + { + "key": "BBB", + "message": "message4371" + }, + { + "key": "AAA", + "message": "message4372" + }, + { + "key": "BBB", + "message": "message4373" + }, + { + "key": "BBB", + "message": "message4374" + }, + { + "key": "CCC", + "message": "message4375" + }, + { + "key": "AAA", + "message": "message4376" + }, + { + "key": "AAA", + "message": "message4377" + }, + { + "key": "DDD", + "message": "message4378" + }, + { + "key": "AAA", + "message": "message4379" + }, + { + "key": "BBB", + "message": "message4380" + }, + { + "key": "DDD", + "message": "message4381" + }, + { + "key": "CCC", + "message": "message4382" + }, + { + "key": "CCC", + "message": "message4383" + }, + { + "key": "DDD", + "message": "message4384" + }, + { + "key": "CCC", + "message": "message4385" + }, + { + "key": "DDD", + "message": "message4386" + }, + { + "key": "BBB", + "message": "message4387" + }, + { + "key": "BBB", + "message": "message4388" + }, + { + "key": "", + "message": "message4389" + }, + { + "key": "", + "message": "message4390" + }, + { + "key": "AAA", + "message": "message4391" + }, + { + "key": "BBB", + "message": "message4392" + }, + { + "key": "BBB", + "message": "message4393" + }, + { + "key": "AAA", + "message": "message4394" + }, + { + "key": "CCC", + "message": "message4395" + }, + { + "key": "CCC", + "message": "message4396" + }, + { + "key": "", + "message": "message4397" + }, + { + "key": "DDD", + "message": "message4398" + }, + { + "key": "AAA", + "message": "message4399" + }, + { + "key": "BBB", + "message": "message4400" + }, + { + "key": "BBB", + "message": "message4401" + }, + { + "key": "BBB", + "message": "message4402" + }, + { + "key": "", + "message": "message4403" + }, + { + "key": "BBB", + "message": "message4404" + }, + { + "key": "DDD", + "message": "message4405" + }, + { + "key": "CCC", + "message": "message4406" + }, + { + "key": "DDD", + "message": "message4407" + }, + { + "key": "AAA", + "message": "message4408" + }, + { + "key": "CCC", + "message": "message4409" + }, + { + "key": "CCC", + "message": "message4410" + }, + { + "key": "DDD", + "message": "message4411" + }, + { + "key": "", + "message": "message4412" + }, + { + "key": "DDD", + "message": "message4413" + }, + { + "key": "BBB", + "message": "message4414" + }, + { + "key": "CCC", + "message": "message4415" + }, + { + "key": "", + "message": "message4416" + }, + { + "key": "BBB", + "message": "message4417" + }, + { + "key": "CCC", + "message": "message4418" + }, + { + "key": "AAA", + "message": "message4419" + }, + { + "key": "AAA", + "message": "message4420" + }, + { + "key": "CCC", + "message": "message4421" + }, + { + "key": "CCC", + "message": "message4422" + }, + { + "key": "DDD", + "message": "message4423" + }, + { + "key": "DDD", + "message": "message4424" + }, + { + "key": "AAA", + "message": "message4425" + }, + { + "key": "BBB", + "message": "message4426" + }, + { + "key": "DDD", + "message": "message4427" + }, + { + "key": "", + "message": "message4428" + }, + { + "key": "DDD", + "message": "message4429" + }, + { + "key": "", + "message": "message4430" + }, + { + "key": "DDD", + "message": "message4431" + }, + { + "key": "BBB", + "message": "message4432" + }, + { + "key": "BBB", + "message": "message4433" + }, + { + "key": "BBB", + "message": "message4434" + }, + { + "key": "BBB", + "message": "message4435" + }, + { + "key": "CCC", + "message": "message4436" + }, + { + "key": "CCC", + "message": "message4437" + }, + { + "key": "", + "message": "message4438" + }, + { + "key": "AAA", + "message": "message4439" + }, + { + "key": "", + "message": "message4440" + }, + { + "key": "BBB", + "message": "message4441" + }, + { + "key": "AAA", + "message": "message4442" + }, + { + "key": "AAA", + "message": "message4443" + }, + { + "key": "BBB", + "message": "message4444" + }, + { + "key": "DDD", + "message": "message4445" + }, + { + "key": "", + "message": "message4446" + }, + { + "key": "AAA", + "message": "message4447" + }, + { + "key": "AAA", + "message": "message4448" + }, + { + "key": "", + "message": "message4449" + }, + { + "key": "BBB", + "message": "message4450" + }, + { + "key": "BBB", + "message": "message4451" + }, + { + "key": "CCC", + "message": "message4452" + }, + { + "key": "CCC", + "message": "message4453" + }, + { + "key": "CCC", + "message": "message4454" + }, + { + "key": "", + "message": "message4455" + }, + { + "key": "", + "message": "message4456" + }, + { + "key": "CCC", + "message": "message4457" + }, + { + "key": "CCC", + "message": "message4458" + }, + { + "key": "BBB", + "message": "message4459" + }, + { + "key": "AAA", + "message": "message4460" + }, + { + "key": "AAA", + "message": "message4461" + }, + { + "key": "AAA", + "message": "message4462" + }, + { + "key": "BBB", + "message": "message4463" + }, + { + "key": "BBB", + "message": "message4464" + }, + { + "key": "", + "message": "message4465" + }, + { + "key": "AAA", + "message": "message4466" + }, + { + "key": "AAA", + "message": "message4467" + }, + { + "key": "AAA", + "message": "message4468" + }, + { + "key": "CCC", + "message": "message4469" + }, + { + "key": "", + "message": "message4470" + }, + { + "key": "DDD", + "message": "message4471" + }, + { + "key": "AAA", + "message": "message4472" + }, + { + "key": "AAA", + "message": "message4473" + }, + { + "key": "DDD", + "message": "message4474" + }, + { + "key": "BBB", + "message": "message4475" + }, + { + "key": "DDD", + "message": "message4476" + }, + { + "key": "BBB", + "message": "message4477" + }, + { + "key": "AAA", + "message": "message4478" + }, + { + "key": "BBB", + "message": "message4479" + }, + { + "key": "AAA", + "message": "message4480" + }, + { + "key": "CCC", + "message": "message4481" + }, + { + "key": "AAA", + "message": "message4482" + }, + { + "key": "AAA", + "message": "message4483" + }, + { + "key": "CCC", + "message": "message4484" + }, + { + "key": "AAA", + "message": "message4485" + }, + { + "key": "BBB", + "message": "message4486" + }, + { + "key": "", + "message": "message4487" + }, + { + "key": "", + "message": "message4488" + }, + { + "key": "BBB", + "message": "message4489" + }, + { + "key": "CCC", + "message": "message4490" + }, + { + "key": "BBB", + "message": "message4491" + }, + { + "key": "DDD", + "message": "message4492" + }, + { + "key": "", + "message": "message4493" + }, + { + "key": "DDD", + "message": "message4494" + }, + { + "key": "AAA", + "message": "message4495" + }, + { + "key": "CCC", + "message": "message4496" + }, + { + "key": "DDD", + "message": "message4497" + }, + { + "key": "CCC", + "message": "message4498" + }, + { + "key": "BBB", + "message": "message4499" + }, + { + "key": "CCC", + "message": "message4500" + }, + { + "key": "", + "message": "message4501" + }, + { + "key": "BBB", + "message": "message4502" + }, + { + "key": "AAA", + "message": "message4503" + }, + { + "key": "AAA", + "message": "message4504" + }, + { + "key": "BBB", + "message": "message4505" + }, + { + "key": "", + "message": "message4506" + }, + { + "key": "", + "message": "message4507" + }, + { + "key": "DDD", + "message": "message4508" + }, + { + "key": "", + "message": "message4509" + }, + { + "key": "BBB", + "message": "message4510" + }, + { + "key": "", + "message": "message4511" + }, + { + "key": "", + "message": "message4512" + }, + { + "key": "BBB", + "message": "message4513" + }, + { + "key": "DDD", + "message": "message4514" + }, + { + "key": "BBB", + "message": "message4515" + }, + { + "key": "BBB", + "message": "message4516" + }, + { + "key": "AAA", + "message": "message4517" + }, + { + "key": "DDD", + "message": "message4518" + }, + { + "key": "DDD", + "message": "message4519" + }, + { + "key": "AAA", + "message": "message4520" + }, + { + "key": "DDD", + "message": "message4521" + }, + { + "key": "CCC", + "message": "message4522" + }, + { + "key": "CCC", + "message": "message4523" + }, + { + "key": "DDD", + "message": "message4524" + }, + { + "key": "BBB", + "message": "message4525" + }, + { + "key": "CCC", + "message": "message4526" + }, + { + "key": "BBB", + "message": "message4527" + }, + { + "key": "", + "message": "message4528" + }, + { + "key": "", + "message": "message4529" + }, + { + "key": "BBB", + "message": "message4530" + }, + { + "key": "DDD", + "message": "message4531" + }, + { + "key": "DDD", + "message": "message4532" + }, + { + "key": "DDD", + "message": "message4533" + }, + { + "key": "", + "message": "message4534" + }, + { + "key": "BBB", + "message": "message4535" + }, + { + "key": "", + "message": "message4536" + }, + { + "key": "CCC", + "message": "message4537" + }, + { + "key": "DDD", + "message": "message4538" + }, + { + "key": "", + "message": "message4539" + }, + { + "key": "CCC", + "message": "message4540" + }, + { + "key": "CCC", + "message": "message4541" + }, + { + "key": "DDD", + "message": "message4542" + }, + { + "key": "BBB", + "message": "message4543" + }, + { + "key": "DDD", + "message": "message4544" + }, + { + "key": "BBB", + "message": "message4545" + }, + { + "key": "CCC", + "message": "message4546" + }, + { + "key": "CCC", + "message": "message4547" + }, + { + "key": "", + "message": "message4548" + }, + { + "key": "AAA", + "message": "message4549" + }, + { + "key": "BBB", + "message": "message4550" + }, + { + "key": "DDD", + "message": "message4551" + }, + { + "key": "BBB", + "message": "message4552" + }, + { + "key": "DDD", + "message": "message4553" + }, + { + "key": "", + "message": "message4554" + }, + { + "key": "AAA", + "message": "message4555" + }, + { + "key": "DDD", + "message": "message4556" + }, + { + "key": "", + "message": "message4557" + }, + { + "key": "CCC", + "message": "message4558" + }, + { + "key": "BBB", + "message": "message4559" + }, + { + "key": "DDD", + "message": "message4560" + }, + { + "key": "AAA", + "message": "message4561" + }, + { + "key": "AAA", + "message": "message4562" + }, + { + "key": "DDD", + "message": "message4563" + }, + { + "key": "AAA", + "message": "message4564" + }, + { + "key": "AAA", + "message": "message4565" + }, + { + "key": "DDD", + "message": "message4566" + }, + { + "key": "DDD", + "message": "message4567" + }, + { + "key": "", + "message": "message4568" + }, + { + "key": "CCC", + "message": "message4569" + }, + { + "key": "BBB", + "message": "message4570" + }, + { + "key": "CCC", + "message": "message4571" + }, + { + "key": "CCC", + "message": "message4572" + }, + { + "key": "CCC", + "message": "message4573" + }, + { + "key": "", + "message": "message4574" + }, + { + "key": "DDD", + "message": "message4575" + }, + { + "key": "AAA", + "message": "message4576" + }, + { + "key": "", + "message": "message4577" + }, + { + "key": "CCC", + "message": "message4578" + }, + { + "key": "BBB", + "message": "message4579" + }, + { + "key": "BBB", + "message": "message4580" + }, + { + "key": "AAA", + "message": "message4581" + }, + { + "key": "CCC", + "message": "message4582" + }, + { + "key": "AAA", + "message": "message4583" + }, + { + "key": "DDD", + "message": "message4584" + }, + { + "key": "DDD", + "message": "message4585" + }, + { + "key": "BBB", + "message": "message4586" + }, + { + "key": "CCC", + "message": "message4587" + }, + { + "key": "CCC", + "message": "message4588" + }, + { + "key": "AAA", + "message": "message4589" + }, + { + "key": "AAA", + "message": "message4590" + }, + { + "key": "", + "message": "message4591" + }, + { + "key": "CCC", + "message": "message4592" + }, + { + "key": "DDD", + "message": "message4593" + }, + { + "key": "CCC", + "message": "message4594" + }, + { + "key": "AAA", + "message": "message4595" + }, + { + "key": "DDD", + "message": "message4596" + }, + { + "key": "DDD", + "message": "message4597" + }, + { + "key": "DDD", + "message": "message4598" + }, + { + "key": "CCC", + "message": "message4599" + }, + { + "key": "", + "message": "message4600" + }, + { + "key": "", + "message": "message4601" + }, + { + "key": "", + "message": "message4602" + }, + { + "key": "AAA", + "message": "message4603" + }, + { + "key": "", + "message": "message4604" + }, + { + "key": "CCC", + "message": "message4605" + }, + { + "key": "DDD", + "message": "message4606" + }, + { + "key": "DDD", + "message": "message4607" + }, + { + "key": "", + "message": "message4608" + }, + { + "key": "AAA", + "message": "message4609" + }, + { + "key": "BBB", + "message": "message4610" + }, + { + "key": "CCC", + "message": "message4611" + }, + { + "key": "CCC", + "message": "message4612" + }, + { + "key": "CCC", + "message": "message4613" + }, + { + "key": "AAA", + "message": "message4614" + }, + { + "key": "BBB", + "message": "message4615" + }, + { + "key": "", + "message": "message4616" + }, + { + "key": "", + "message": "message4617" + }, + { + "key": "", + "message": "message4618" + }, + { + "key": "CCC", + "message": "message4619" + }, + { + "key": "DDD", + "message": "message4620" + }, + { + "key": "AAA", + "message": "message4621" + }, + { + "key": "CCC", + "message": "message4622" + }, + { + "key": "BBB", + "message": "message4623" + }, + { + "key": "DDD", + "message": "message4624" + }, + { + "key": "BBB", + "message": "message4625" + }, + { + "key": "AAA", + "message": "message4626" + }, + { + "key": "BBB", + "message": "message4627" + }, + { + "key": "CCC", + "message": "message4628" + }, + { + "key": "", + "message": "message4629" + }, + { + "key": "AAA", + "message": "message4630" + }, + { + "key": "AAA", + "message": "message4631" + }, + { + "key": "", + "message": "message4632" + }, + { + "key": "", + "message": "message4633" + }, + { + "key": "DDD", + "message": "message4634" + }, + { + "key": "DDD", + "message": "message4635" + }, + { + "key": "CCC", + "message": "message4636" + }, + { + "key": "AAA", + "message": "message4637" + }, + { + "key": "", + "message": "message4638" + }, + { + "key": "", + "message": "message4639" + }, + { + "key": "AAA", + "message": "message4640" + }, + { + "key": "CCC", + "message": "message4641" + }, + { + "key": "BBB", + "message": "message4642" + }, + { + "key": "AAA", + "message": "message4643" + }, + { + "key": "AAA", + "message": "message4644" + }, + { + "key": "AAA", + "message": "message4645" + }, + { + "key": "BBB", + "message": "message4646" + }, + { + "key": "BBB", + "message": "message4647" + }, + { + "key": "", + "message": "message4648" + }, + { + "key": "AAA", + "message": "message4649" + }, + { + "key": "DDD", + "message": "message4650" + }, + { + "key": "AAA", + "message": "message4651" + }, + { + "key": "DDD", + "message": "message4652" + }, + { + "key": "", + "message": "message4653" + }, + { + "key": "AAA", + "message": "message4654" + }, + { + "key": "DDD", + "message": "message4655" + }, + { + "key": "AAA", + "message": "message4656" + }, + { + "key": "", + "message": "message4657" + }, + { + "key": "", + "message": "message4658" + }, + { + "key": "DDD", + "message": "message4659" + }, + { + "key": "DDD", + "message": "message4660" + }, + { + "key": "CCC", + "message": "message4661" + }, + { + "key": "BBB", + "message": "message4662" + }, + { + "key": "AAA", + "message": "message4663" + }, + { + "key": "DDD", + "message": "message4664" + }, + { + "key": "DDD", + "message": "message4665" + }, + { + "key": "BBB", + "message": "message4666" + }, + { + "key": "CCC", + "message": "message4667" + }, + { + "key": "", + "message": "message4668" + }, + { + "key": "", + "message": "message4669" + }, + { + "key": "CCC", + "message": "message4670" + }, + { + "key": "DDD", + "message": "message4671" + }, + { + "key": "DDD", + "message": "message4672" + }, + { + "key": "", + "message": "message4673" + }, + { + "key": "CCC", + "message": "message4674" + }, + { + "key": "", + "message": "message4675" + }, + { + "key": "DDD", + "message": "message4676" + }, + { + "key": "", + "message": "message4677" + }, + { + "key": "", + "message": "message4678" + }, + { + "key": "BBB", + "message": "message4679" + }, + { + "key": "DDD", + "message": "message4680" + }, + { + "key": "", + "message": "message4681" + }, + { + "key": "", + "message": "message4682" + }, + { + "key": "", + "message": "message4683" + }, + { + "key": "BBB", + "message": "message4684" + }, + { + "key": "AAA", + "message": "message4685" + }, + { + "key": "", + "message": "message4686" + }, + { + "key": "", + "message": "message4687" + }, + { + "key": "CCC", + "message": "message4688" + }, + { + "key": "AAA", + "message": "message4689" + }, + { + "key": "BBB", + "message": "message4690" + }, + { + "key": "DDD", + "message": "message4691" + }, + { + "key": "CCC", + "message": "message4692" + }, + { + "key": "", + "message": "message4693" + }, + { + "key": "DDD", + "message": "message4694" + }, + { + "key": "", + "message": "message4695" + }, + { + "key": "BBB", + "message": "message4696" + }, + { + "key": "", + "message": "message4697" + }, + { + "key": "", + "message": "message4698" + }, + { + "key": "DDD", + "message": "message4699" + }, + { + "key": "BBB", + "message": "message4700" + }, + { + "key": "CCC", + "message": "message4701" + }, + { + "key": "CCC", + "message": "message4702" + }, + { + "key": "AAA", + "message": "message4703" + }, + { + "key": "AAA", + "message": "message4704" + }, + { + "key": "AAA", + "message": "message4705" + }, + { + "key": "", + "message": "message4706" + }, + { + "key": "CCC", + "message": "message4707" + }, + { + "key": "BBB", + "message": "message4708" + }, + { + "key": "BBB", + "message": "message4709" + }, + { + "key": "DDD", + "message": "message4710" + }, + { + "key": "AAA", + "message": "message4711" + }, + { + "key": "BBB", + "message": "message4712" + }, + { + "key": "CCC", + "message": "message4713" + }, + { + "key": "DDD", + "message": "message4714" + }, + { + "key": "AAA", + "message": "message4715" + }, + { + "key": "AAA", + "message": "message4716" + }, + { + "key": "", + "message": "message4717" + }, + { + "key": "BBB", + "message": "message4718" + }, + { + "key": "AAA", + "message": "message4719" + }, + { + "key": "BBB", + "message": "message4720" + }, + { + "key": "DDD", + "message": "message4721" + }, + { + "key": "", + "message": "message4722" + }, + { + "key": "AAA", + "message": "message4723" + }, + { + "key": "DDD", + "message": "message4724" + }, + { + "key": "AAA", + "message": "message4725" + }, + { + "key": "AAA", + "message": "message4726" + }, + { + "key": "CCC", + "message": "message4727" + }, + { + "key": "DDD", + "message": "message4728" + }, + { + "key": "DDD", + "message": "message4729" + }, + { + "key": "DDD", + "message": "message4730" + }, + { + "key": "DDD", + "message": "message4731" + }, + { + "key": "BBB", + "message": "message4732" + }, + { + "key": "", + "message": "message4733" + }, + { + "key": "BBB", + "message": "message4734" + }, + { + "key": "AAA", + "message": "message4735" + }, + { + "key": "DDD", + "message": "message4736" + }, + { + "key": "BBB", + "message": "message4737" + }, + { + "key": "AAA", + "message": "message4738" + }, + { + "key": "BBB", + "message": "message4739" + }, + { + "key": "AAA", + "message": "message4740" + }, + { + "key": "AAA", + "message": "message4741" + }, + { + "key": "", + "message": "message4742" + }, + { + "key": "DDD", + "message": "message4743" + }, + { + "key": "CCC", + "message": "message4744" + }, + { + "key": "CCC", + "message": "message4745" + }, + { + "key": "DDD", + "message": "message4746" + }, + { + "key": "BBB", + "message": "message4747" + }, + { + "key": "CCC", + "message": "message4748" + }, + { + "key": "BBB", + "message": "message4749" + }, + { + "key": "CCC", + "message": "message4750" + }, + { + "key": "DDD", + "message": "message4751" + }, + { + "key": "", + "message": "message4752" + }, + { + "key": "CCC", + "message": "message4753" + }, + { + "key": "", + "message": "message4754" + }, + { + "key": "", + "message": "message4755" + }, + { + "key": "AAA", + "message": "message4756" + }, + { + "key": "DDD", + "message": "message4757" + }, + { + "key": "", + "message": "message4758" + }, + { + "key": "DDD", + "message": "message4759" + }, + { + "key": "", + "message": "message4760" + }, + { + "key": "", + "message": "message4761" + }, + { + "key": "DDD", + "message": "message4762" + }, + { + "key": "", + "message": "message4763" + }, + { + "key": "BBB", + "message": "message4764" + }, + { + "key": "CCC", + "message": "message4765" + }, + { + "key": "AAA", + "message": "message4766" + }, + { + "key": "AAA", + "message": "message4767" + }, + { + "key": "CCC", + "message": "message4768" + }, + { + "key": "BBB", + "message": "message4769" + }, + { + "key": "AAA", + "message": "message4770" + }, + { + "key": "CCC", + "message": "message4771" + }, + { + "key": "CCC", + "message": "message4772" + }, + { + "key": "", + "message": "message4773" + }, + { + "key": "BBB", + "message": "message4774" + }, + { + "key": "BBB", + "message": "message4775" + }, + { + "key": "CCC", + "message": "message4776" + }, + { + "key": "BBB", + "message": "message4777" + }, + { + "key": "BBB", + "message": "message4778" + }, + { + "key": "CCC", + "message": "message4779" + }, + { + "key": "AAA", + "message": "message4780" + }, + { + "key": "CCC", + "message": "message4781" + }, + { + "key": "BBB", + "message": "message4782" + }, + { + "key": "BBB", + "message": "message4783" + }, + { + "key": "", + "message": "message4784" + }, + { + "key": "DDD", + "message": "message4785" + }, + { + "key": "DDD", + "message": "message4786" + }, + { + "key": "DDD", + "message": "message4787" + }, + { + "key": "CCC", + "message": "message4788" + }, + { + "key": "", + "message": "message4789" + }, + { + "key": "CCC", + "message": "message4790" + }, + { + "key": "CCC", + "message": "message4791" + }, + { + "key": "DDD", + "message": "message4792" + }, + { + "key": "AAA", + "message": "message4793" + }, + { + "key": "", + "message": "message4794" + }, + { + "key": "", + "message": "message4795" + }, + { + "key": "CCC", + "message": "message4796" + }, + { + "key": "CCC", + "message": "message4797" + }, + { + "key": "AAA", + "message": "message4798" + }, + { + "key": "CCC", + "message": "message4799" + }, + { + "key": "AAA", + "message": "message4800" + }, + { + "key": "DDD", + "message": "message4801" + }, + { + "key": "AAA", + "message": "message4802" + }, + { + "key": "", + "message": "message4803" + }, + { + "key": "BBB", + "message": "message4804" + }, + { + "key": "", + "message": "message4805" + }, + { + "key": "AAA", + "message": "message4806" + }, + { + "key": "CCC", + "message": "message4807" + }, + { + "key": "DDD", + "message": "message4808" + }, + { + "key": "AAA", + "message": "message4809" + }, + { + "key": "", + "message": "message4810" + }, + { + "key": "CCC", + "message": "message4811" + }, + { + "key": "CCC", + "message": "message4812" + }, + { + "key": "", + "message": "message4813" + }, + { + "key": "", + "message": "message4814" + }, + { + "key": "BBB", + "message": "message4815" + }, + { + "key": "AAA", + "message": "message4816" + }, + { + "key": "BBB", + "message": "message4817" + }, + { + "key": "CCC", + "message": "message4818" + }, + { + "key": "BBB", + "message": "message4819" + }, + { + "key": "CCC", + "message": "message4820" + }, + { + "key": "BBB", + "message": "message4821" + }, + { + "key": "AAA", + "message": "message4822" + }, + { + "key": "", + "message": "message4823" + }, + { + "key": "AAA", + "message": "message4824" + }, + { + "key": "BBB", + "message": "message4825" + }, + { + "key": "AAA", + "message": "message4826" + }, + { + "key": "CCC", + "message": "message4827" + }, + { + "key": "", + "message": "message4828" + }, + { + "key": "BBB", + "message": "message4829" + }, + { + "key": "BBB", + "message": "message4830" + }, + { + "key": "CCC", + "message": "message4831" + }, + { + "key": "CCC", + "message": "message4832" + }, + { + "key": "CCC", + "message": "message4833" + }, + { + "key": "AAA", + "message": "message4834" + }, + { + "key": "BBB", + "message": "message4835" + }, + { + "key": "BBB", + "message": "message4836" + }, + { + "key": "BBB", + "message": "message4837" + }, + { + "key": "CCC", + "message": "message4838" + }, + { + "key": "", + "message": "message4839" + }, + { + "key": "CCC", + "message": "message4840" + }, + { + "key": "BBB", + "message": "message4841" + }, + { + "key": "DDD", + "message": "message4842" + }, + { + "key": "AAA", + "message": "message4843" + }, + { + "key": "BBB", + "message": "message4844" + }, + { + "key": "DDD", + "message": "message4845" + }, + { + "key": "DDD", + "message": "message4846" + }, + { + "key": "CCC", + "message": "message4847" + }, + { + "key": "CCC", + "message": "message4848" + }, + { + "key": "CCC", + "message": "message4849" + }, + { + "key": "AAA", + "message": "message4850" + }, + { + "key": "DDD", + "message": "message4851" + }, + { + "key": "BBB", + "message": "message4852" + }, + { + "key": "DDD", + "message": "message4853" + }, + { + "key": "", + "message": "message4854" + }, + { + "key": "CCC", + "message": "message4855" + }, + { + "key": "BBB", + "message": "message4856" + }, + { + "key": "", + "message": "message4857" + }, + { + "key": "AAA", + "message": "message4858" + }, + { + "key": "DDD", + "message": "message4859" + }, + { + "key": "CCC", + "message": "message4860" + }, + { + "key": "DDD", + "message": "message4861" + }, + { + "key": "AAA", + "message": "message4862" + }, + { + "key": "DDD", + "message": "message4863" + }, + { + "key": "AAA", + "message": "message4864" + }, + { + "key": "BBB", + "message": "message4865" + }, + { + "key": "AAA", + "message": "message4866" + }, + { + "key": "", + "message": "message4867" + }, + { + "key": "CCC", + "message": "message4868" + }, + { + "key": "BBB", + "message": "message4869" + }, + { + "key": "", + "message": "message4870" + }, + { + "key": "BBB", + "message": "message4871" + }, + { + "key": "", + "message": "message4872" + }, + { + "key": "CCC", + "message": "message4873" + }, + { + "key": "AAA", + "message": "message4874" + }, + { + "key": "", + "message": "message4875" + }, + { + "key": "DDD", + "message": "message4876" + }, + { + "key": "AAA", + "message": "message4877" + }, + { + "key": "AAA", + "message": "message4878" + }, + { + "key": "AAA", + "message": "message4879" + }, + { + "key": "CCC", + "message": "message4880" + }, + { + "key": "CCC", + "message": "message4881" + }, + { + "key": "DDD", + "message": "message4882" + }, + { + "key": "CCC", + "message": "message4883" + }, + { + "key": "CCC", + "message": "message4884" + }, + { + "key": "", + "message": "message4885" + }, + { + "key": "", + "message": "message4886" + }, + { + "key": "BBB", + "message": "message4887" + }, + { + "key": "DDD", + "message": "message4888" + }, + { + "key": "DDD", + "message": "message4889" + }, + { + "key": "DDD", + "message": "message4890" + }, + { + "key": "CCC", + "message": "message4891" + }, + { + "key": "AAA", + "message": "message4892" + }, + { + "key": "DDD", + "message": "message4893" + }, + { + "key": "DDD", + "message": "message4894" + }, + { + "key": "", + "message": "message4895" + }, + { + "key": "BBB", + "message": "message4896" + }, + { + "key": "CCC", + "message": "message4897" + }, + { + "key": "CCC", + "message": "message4898" + }, + { + "key": "", + "message": "message4899" + }, + { + "key": "BBB", + "message": "message4900" + }, + { + "key": "CCC", + "message": "message4901" + }, + { + "key": "AAA", + "message": "message4902" + }, + { + "key": "", + "message": "message4903" + }, + { + "key": "", + "message": "message4904" + }, + { + "key": "CCC", + "message": "message4905" + }, + { + "key": "DDD", + "message": "message4906" + }, + { + "key": "", + "message": "message4907" + }, + { + "key": "", + "message": "message4908" + }, + { + "key": "AAA", + "message": "message4909" + }, + { + "key": "", + "message": "message4910" + }, + { + "key": "AAA", + "message": "message4911" + }, + { + "key": "CCC", + "message": "message4912" + }, + { + "key": "CCC", + "message": "message4913" + }, + { + "key": "", + "message": "message4914" + }, + { + "key": "", + "message": "message4915" + }, + { + "key": "BBB", + "message": "message4916" + }, + { + "key": "BBB", + "message": "message4917" + }, + { + "key": "", + "message": "message4918" + }, + { + "key": "BBB", + "message": "message4919" + }, + { + "key": "", + "message": "message4920" + }, + { + "key": "BBB", + "message": "message4921" + }, + { + "key": "AAA", + "message": "message4922" + }, + { + "key": "", + "message": "message4923" + }, + { + "key": "BBB", + "message": "message4924" + }, + { + "key": "CCC", + "message": "message4925" + }, + { + "key": "BBB", + "message": "message4926" + }, + { + "key": "CCC", + "message": "message4927" + }, + { + "key": "BBB", + "message": "message4928" + }, + { + "key": "DDD", + "message": "message4929" + }, + { + "key": "", + "message": "message4930" + }, + { + "key": "BBB", + "message": "message4931" + }, + { + "key": "AAA", + "message": "message4932" + }, + { + "key": "DDD", + "message": "message4933" + }, + { + "key": "", + "message": "message4934" + }, + { + "key": "AAA", + "message": "message4935" + }, + { + "key": "BBB", + "message": "message4936" + }, + { + "key": "", + "message": "message4937" + }, + { + "key": "BBB", + "message": "message4938" + }, + { + "key": "BBB", + "message": "message4939" + }, + { + "key": "CCC", + "message": "message4940" + }, + { + "key": "CCC", + "message": "message4941" + }, + { + "key": "BBB", + "message": "message4942" + }, + { + "key": "AAA", + "message": "message4943" + }, + { + "key": "", + "message": "message4944" + }, + { + "key": "CCC", + "message": "message4945" + }, + { + "key": "AAA", + "message": "message4946" + }, + { + "key": "DDD", + "message": "message4947" + }, + { + "key": "DDD", + "message": "message4948" + }, + { + "key": "DDD", + "message": "message4949" + }, + { + "key": "CCC", + "message": "message4950" + }, + { + "key": "BBB", + "message": "message4951" + }, + { + "key": "", + "message": "message4952" + }, + { + "key": "CCC", + "message": "message4953" + }, + { + "key": "DDD", + "message": "message4954" + }, + { + "key": "AAA", + "message": "message4955" + }, + { + "key": "BBB", + "message": "message4956" + }, + { + "key": "BBB", + "message": "message4957" + }, + { + "key": "BBB", + "message": "message4958" + }, + { + "key": "", + "message": "message4959" + }, + { + "key": "CCC", + "message": "message4960" + }, + { + "key": "BBB", + "message": "message4961" + }, + { + "key": "AAA", + "message": "message4962" + }, + { + "key": "DDD", + "message": "message4963" + }, + { + "key": "BBB", + "message": "message4964" + }, + { + "key": "", + "message": "message4965" + }, + { + "key": "BBB", + "message": "message4966" + }, + { + "key": "AAA", + "message": "message4967" + }, + { + "key": "DDD", + "message": "message4968" + }, + { + "key": "DDD", + "message": "message4969" + }, + { + "key": "CCC", + "message": "message4970" + }, + { + "key": "BBB", + "message": "message4971" + }, + { + "key": "AAA", + "message": "message4972" + }, + { + "key": "CCC", + "message": "message4973" + }, + { + "key": "BBB", + "message": "message4974" + }, + { + "key": "CCC", + "message": "message4975" + }, + { + "key": "AAA", + "message": "message4976" + }, + { + "key": "CCC", + "message": "message4977" + }, + { + "key": "", + "message": "message4978" + }, + { + "key": "", + "message": "message4979" + }, + { + "key": "BBB", + "message": "message4980" + }, + { + "key": "CCC", + "message": "message4981" + }, + { + "key": "", + "message": "message4982" + }, + { + "key": "BBB", + "message": "message4983" + }, + { + "key": "AAA", + "message": "message4984" + }, + { + "key": "AAA", + "message": "message4985" + }, + { + "key": "", + "message": "message4986" + }, + { + "key": "", + "message": "message4987" + }, + { + "key": "DDD", + "message": "message4988" + }, + { + "key": "CCC", + "message": "message4989" + }, + { + "key": "BBB", + "message": "message4990" + }, + { + "key": "", + "message": "message4991" + }, + { + "key": "CCC", + "message": "message4992" + }, + { + "key": "AAA", + "message": "message4993" + }, + { + "key": "AAA", + "message": "message4994" + }, + { + "key": "BBB", + "message": "message4995" + }, + { + "key": "AAA", + "message": "message4996" + }, + { + "key": "AAA", + "message": "message4997" + }, + { + "key": "BBB", + "message": "message4998" + }, + { + "key": "CCC", + "message": "message4999" + }, + { + "key": "BBB", + "message": "message5000" + }, + { + "key": "AAA", + "message": "message5001" + }, + { + "key": "CCC", + "message": "message5002" + }, + { + "key": "", + "message": "message5003" + }, + { + "key": "DDD", + "message": "message5004" + }, + { + "key": "DDD", + "message": "message5005" + }, + { + "key": "CCC", + "message": "message5006" + }, + { + "key": "BBB", + "message": "message5007" + }, + { + "key": "CCC", + "message": "message5008" + }, + { + "key": "AAA", + "message": "message5009" + }, + { + "key": "AAA", + "message": "message5010" + }, + { + "key": "AAA", + "message": "message5011" + }, + { + "key": "", + "message": "message5012" + }, + { + "key": "BBB", + "message": "message5013" + }, + { + "key": "AAA", + "message": "message5014" + }, + { + "key": "DDD", + "message": "message5015" + }, + { + "key": "", + "message": "message5016" + }, + { + "key": "", + "message": "message5017" + }, + { + "key": "", + "message": "message5018" + }, + { + "key": "", + "message": "message5019" + }, + { + "key": "CCC", + "message": "message5020" + }, + { + "key": "BBB", + "message": "message5021" + }, + { + "key": "DDD", + "message": "message5022" + }, + { + "key": "CCC", + "message": "message5023" + }, + { + "key": "AAA", + "message": "message5024" + }, + { + "key": "CCC", + "message": "message5025" + }, + { + "key": "BBB", + "message": "message5026" + }, + { + "key": "DDD", + "message": "message5027" + }, + { + "key": "BBB", + "message": "message5028" + }, + { + "key": "CCC", + "message": "message5029" + }, + { + "key": "AAA", + "message": "message5030" + }, + { + "key": "CCC", + "message": "message5031" + }, + { + "key": "DDD", + "message": "message5032" + }, + { + "key": "CCC", + "message": "message5033" + }, + { + "key": "AAA", + "message": "message5034" + }, + { + "key": "AAA", + "message": "message5035" + }, + { + "key": "AAA", + "message": "message5036" + }, + { + "key": "DDD", + "message": "message5037" + }, + { + "key": "CCC", + "message": "message5038" + }, + { + "key": "", + "message": "message5039" + }, + { + "key": "AAA", + "message": "message5040" + }, + { + "key": "BBB", + "message": "message5041" + }, + { + "key": "CCC", + "message": "message5042" + }, + { + "key": "CCC", + "message": "message5043" + }, + { + "key": "CCC", + "message": "message5044" + }, + { + "key": "CCC", + "message": "message5045" + }, + { + "key": "CCC", + "message": "message5046" + }, + { + "key": "BBB", + "message": "message5047" + }, + { + "key": "DDD", + "message": "message5048" + }, + { + "key": "", + "message": "message5049" + }, + { + "key": "AAA", + "message": "message5050" + }, + { + "key": "DDD", + "message": "message5051" + }, + { + "key": "DDD", + "message": "message5052" + }, + { + "key": "BBB", + "message": "message5053" + }, + { + "key": "AAA", + "message": "message5054" + }, + { + "key": "BBB", + "message": "message5055" + }, + { + "key": "DDD", + "message": "message5056" + }, + { + "key": "AAA", + "message": "message5057" + }, + { + "key": "", + "message": "message5058" + }, + { + "key": "AAA", + "message": "message5059" + }, + { + "key": "DDD", + "message": "message5060" + }, + { + "key": "", + "message": "message5061" + }, + { + "key": "", + "message": "message5062" + }, + { + "key": "", + "message": "message5063" + }, + { + "key": "BBB", + "message": "message5064" + }, + { + "key": "BBB", + "message": "message5065" + }, + { + "key": "DDD", + "message": "message5066" + }, + { + "key": "DDD", + "message": "message5067" + }, + { + "key": "CCC", + "message": "message5068" + }, + { + "key": "BBB", + "message": "message5069" + }, + { + "key": "CCC", + "message": "message5070" + }, + { + "key": "DDD", + "message": "message5071" + }, + { + "key": "CCC", + "message": "message5072" + }, + { + "key": "DDD", + "message": "message5073" + }, + { + "key": "DDD", + "message": "message5074" + }, + { + "key": "", + "message": "message5075" + }, + { + "key": "DDD", + "message": "message5076" + }, + { + "key": "AAA", + "message": "message5077" + }, + { + "key": "BBB", + "message": "message5078" + }, + { + "key": "BBB", + "message": "message5079" + }, + { + "key": "AAA", + "message": "message5080" + }, + { + "key": "DDD", + "message": "message5081" + }, + { + "key": "CCC", + "message": "message5082" + }, + { + "key": "DDD", + "message": "message5083" + }, + { + "key": "DDD", + "message": "message5084" + }, + { + "key": "BBB", + "message": "message5085" + }, + { + "key": "AAA", + "message": "message5086" + }, + { + "key": "", + "message": "message5087" + }, + { + "key": "", + "message": "message5088" + }, + { + "key": "CCC", + "message": "message5089" + }, + { + "key": "DDD", + "message": "message5090" + }, + { + "key": "CCC", + "message": "message5091" + }, + { + "key": "", + "message": "message5092" + }, + { + "key": "BBB", + "message": "message5093" + }, + { + "key": "AAA", + "message": "message5094" + }, + { + "key": "BBB", + "message": "message5095" + }, + { + "key": "DDD", + "message": "message5096" + }, + { + "key": "CCC", + "message": "message5097" + }, + { + "key": "AAA", + "message": "message5098" + }, + { + "key": "AAA", + "message": "message5099" + }, + { + "key": "", + "message": "message5100" + }, + { + "key": "", + "message": "message5101" + }, + { + "key": "CCC", + "message": "message5102" + }, + { + "key": "", + "message": "message5103" + }, + { + "key": "DDD", + "message": "message5104" + }, + { + "key": "", + "message": "message5105" + }, + { + "key": "BBB", + "message": "message5106" + }, + { + "key": "BBB", + "message": "message5107" + }, + { + "key": "DDD", + "message": "message5108" + }, + { + "key": "BBB", + "message": "message5109" + }, + { + "key": "AAA", + "message": "message5110" + }, + { + "key": "BBB", + "message": "message5111" + }, + { + "key": "AAA", + "message": "message5112" + }, + { + "key": "CCC", + "message": "message5113" + }, + { + "key": "", + "message": "message5114" + }, + { + "key": "AAA", + "message": "message5115" + }, + { + "key": "AAA", + "message": "message5116" + }, + { + "key": "AAA", + "message": "message5117" + }, + { + "key": "DDD", + "message": "message5118" + }, + { + "key": "AAA", + "message": "message5119" + }, + { + "key": "BBB", + "message": "message5120" + }, + { + "key": "DDD", + "message": "message5121" + }, + { + "key": "AAA", + "message": "message5122" + }, + { + "key": "AAA", + "message": "message5123" + }, + { + "key": "DDD", + "message": "message5124" + }, + { + "key": "BBB", + "message": "message5125" + }, + { + "key": "BBB", + "message": "message5126" + }, + { + "key": "", + "message": "message5127" + }, + { + "key": "CCC", + "message": "message5128" + }, + { + "key": "", + "message": "message5129" + }, + { + "key": "", + "message": "message5130" + }, + { + "key": "CCC", + "message": "message5131" + }, + { + "key": "AAA", + "message": "message5132" + }, + { + "key": "BBB", + "message": "message5133" + }, + { + "key": "DDD", + "message": "message5134" + }, + { + "key": "BBB", + "message": "message5135" + }, + { + "key": "", + "message": "message5136" + }, + { + "key": "", + "message": "message5137" + }, + { + "key": "CCC", + "message": "message5138" + }, + { + "key": "", + "message": "message5139" + }, + { + "key": "AAA", + "message": "message5140" + }, + { + "key": "", + "message": "message5141" + }, + { + "key": "DDD", + "message": "message5142" + }, + { + "key": "BBB", + "message": "message5143" + }, + { + "key": "DDD", + "message": "message5144" + }, + { + "key": "", + "message": "message5145" + }, + { + "key": "AAA", + "message": "message5146" + }, + { + "key": "BBB", + "message": "message5147" + }, + { + "key": "BBB", + "message": "message5148" + }, + { + "key": "AAA", + "message": "message5149" + }, + { + "key": "BBB", + "message": "message5150" + }, + { + "key": "CCC", + "message": "message5151" + }, + { + "key": "BBB", + "message": "message5152" + }, + { + "key": "AAA", + "message": "message5153" + }, + { + "key": "", + "message": "message5154" + }, + { + "key": "DDD", + "message": "message5155" + }, + { + "key": "DDD", + "message": "message5156" + }, + { + "key": "DDD", + "message": "message5157" + }, + { + "key": "", + "message": "message5158" + }, + { + "key": "DDD", + "message": "message5159" + }, + { + "key": "AAA", + "message": "message5160" + }, + { + "key": "DDD", + "message": "message5161" + }, + { + "key": "CCC", + "message": "message5162" + }, + { + "key": "AAA", + "message": "message5163" + }, + { + "key": "BBB", + "message": "message5164" + }, + { + "key": "CCC", + "message": "message5165" + }, + { + "key": "BBB", + "message": "message5166" + }, + { + "key": "DDD", + "message": "message5167" + }, + { + "key": "AAA", + "message": "message5168" + }, + { + "key": "DDD", + "message": "message5169" + }, + { + "key": "DDD", + "message": "message5170" + }, + { + "key": "BBB", + "message": "message5171" + }, + { + "key": "AAA", + "message": "message5172" + }, + { + "key": "DDD", + "message": "message5173" + }, + { + "key": "AAA", + "message": "message5174" + }, + { + "key": "AAA", + "message": "message5175" + }, + { + "key": "", + "message": "message5176" + }, + { + "key": "AAA", + "message": "message5177" + }, + { + "key": "", + "message": "message5178" + }, + { + "key": "", + "message": "message5179" + }, + { + "key": "AAA", + "message": "message5180" + }, + { + "key": "CCC", + "message": "message5181" + }, + { + "key": "AAA", + "message": "message5182" + }, + { + "key": "BBB", + "message": "message5183" + }, + { + "key": "AAA", + "message": "message5184" + }, + { + "key": "AAA", + "message": "message5185" + }, + { + "key": "CCC", + "message": "message5186" + }, + { + "key": "", + "message": "message5187" + }, + { + "key": "AAA", + "message": "message5188" + }, + { + "key": "CCC", + "message": "message5189" + }, + { + "key": "BBB", + "message": "message5190" + }, + { + "key": "", + "message": "message5191" + }, + { + "key": "CCC", + "message": "message5192" + }, + { + "key": "BBB", + "message": "message5193" + }, + { + "key": "CCC", + "message": "message5194" + }, + { + "key": "BBB", + "message": "message5195" + }, + { + "key": "", + "message": "message5196" + }, + { + "key": "AAA", + "message": "message5197" + }, + { + "key": "AAA", + "message": "message5198" + }, + { + "key": "CCC", + "message": "message5199" + }, + { + "key": "BBB", + "message": "message5200" + }, + { + "key": "BBB", + "message": "message5201" + }, + { + "key": "CCC", + "message": "message5202" + }, + { + "key": "", + "message": "message5203" + }, + { + "key": "AAA", + "message": "message5204" + }, + { + "key": "CCC", + "message": "message5205" + }, + { + "key": "AAA", + "message": "message5206" + }, + { + "key": "", + "message": "message5207" + }, + { + "key": "DDD", + "message": "message5208" + }, + { + "key": "CCC", + "message": "message5209" + }, + { + "key": "", + "message": "message5210" + }, + { + "key": "", + "message": "message5211" + }, + { + "key": "BBB", + "message": "message5212" + }, + { + "key": "", + "message": "message5213" + }, + { + "key": "CCC", + "message": "message5214" + }, + { + "key": "DDD", + "message": "message5215" + }, + { + "key": "", + "message": "message5216" + }, + { + "key": "", + "message": "message5217" + }, + { + "key": "DDD", + "message": "message5218" + }, + { + "key": "AAA", + "message": "message5219" + }, + { + "key": "AAA", + "message": "message5220" + }, + { + "key": "CCC", + "message": "message5221" + }, + { + "key": "BBB", + "message": "message5222" + }, + { + "key": "DDD", + "message": "message5223" + }, + { + "key": "DDD", + "message": "message5224" + }, + { + "key": "CCC", + "message": "message5225" + }, + { + "key": "AAA", + "message": "message5226" + }, + { + "key": "DDD", + "message": "message5227" + }, + { + "key": "DDD", + "message": "message5228" + }, + { + "key": "DDD", + "message": "message5229" + }, + { + "key": "AAA", + "message": "message5230" + }, + { + "key": "BBB", + "message": "message5231" + }, + { + "key": "BBB", + "message": "message5232" + }, + { + "key": "BBB", + "message": "message5233" + }, + { + "key": "BBB", + "message": "message5234" + }, + { + "key": "AAA", + "message": "message5235" + }, + { + "key": "AAA", + "message": "message5236" + }, + { + "key": "AAA", + "message": "message5237" + }, + { + "key": "AAA", + "message": "message5238" + }, + { + "key": "DDD", + "message": "message5239" + }, + { + "key": "CCC", + "message": "message5240" + }, + { + "key": "AAA", + "message": "message5241" + }, + { + "key": "BBB", + "message": "message5242" + }, + { + "key": "BBB", + "message": "message5243" + }, + { + "key": "AAA", + "message": "message5244" + }, + { + "key": "", + "message": "message5245" + }, + { + "key": "DDD", + "message": "message5246" + }, + { + "key": "CCC", + "message": "message5247" + }, + { + "key": "BBB", + "message": "message5248" + }, + { + "key": "BBB", + "message": "message5249" + }, + { + "key": "DDD", + "message": "message5250" + }, + { + "key": "BBB", + "message": "message5251" + }, + { + "key": "", + "message": "message5252" + }, + { + "key": "CCC", + "message": "message5253" + }, + { + "key": "", + "message": "message5254" + }, + { + "key": "AAA", + "message": "message5255" + }, + { + "key": "", + "message": "message5256" + }, + { + "key": "BBB", + "message": "message5257" + }, + { + "key": "CCC", + "message": "message5258" + }, + { + "key": "BBB", + "message": "message5259" + }, + { + "key": "CCC", + "message": "message5260" + }, + { + "key": "BBB", + "message": "message5261" + }, + { + "key": "", + "message": "message5262" + }, + { + "key": "DDD", + "message": "message5263" + }, + { + "key": "AAA", + "message": "message5264" + }, + { + "key": "DDD", + "message": "message5265" + }, + { + "key": "", + "message": "message5266" + }, + { + "key": "CCC", + "message": "message5267" + }, + { + "key": "AAA", + "message": "message5268" + }, + { + "key": "CCC", + "message": "message5269" + }, + { + "key": "AAA", + "message": "message5270" + }, + { + "key": "AAA", + "message": "message5271" + }, + { + "key": "CCC", + "message": "message5272" + }, + { + "key": "AAA", + "message": "message5273" + }, + { + "key": "", + "message": "message5274" + }, + { + "key": "DDD", + "message": "message5275" + }, + { + "key": "DDD", + "message": "message5276" + }, + { + "key": "BBB", + "message": "message5277" + }, + { + "key": "DDD", + "message": "message5278" + }, + { + "key": "AAA", + "message": "message5279" + }, + { + "key": "BBB", + "message": "message5280" + }, + { + "key": "DDD", + "message": "message5281" + }, + { + "key": "DDD", + "message": "message5282" + }, + { + "key": "AAA", + "message": "message5283" + }, + { + "key": "", + "message": "message5284" + }, + { + "key": "DDD", + "message": "message5285" + }, + { + "key": "BBB", + "message": "message5286" + }, + { + "key": "BBB", + "message": "message5287" + }, + { + "key": "DDD", + "message": "message5288" + }, + { + "key": "", + "message": "message5289" + }, + { + "key": "BBB", + "message": "message5290" + }, + { + "key": "CCC", + "message": "message5291" + }, + { + "key": "AAA", + "message": "message5292" + }, + { + "key": "AAA", + "message": "message5293" + }, + { + "key": "CCC", + "message": "message5294" + }, + { + "key": "", + "message": "message5295" + }, + { + "key": "AAA", + "message": "message5296" + }, + { + "key": "", + "message": "message5297" + }, + { + "key": "CCC", + "message": "message5298" + }, + { + "key": "AAA", + "message": "message5299" + }, + { + "key": "AAA", + "message": "message5300" + }, + { + "key": "CCC", + "message": "message5301" + }, + { + "key": "BBB", + "message": "message5302" + }, + { + "key": "", + "message": "message5303" + }, + { + "key": "DDD", + "message": "message5304" + }, + { + "key": "BBB", + "message": "message5305" + }, + { + "key": "CCC", + "message": "message5306" + }, + { + "key": "BBB", + "message": "message5307" + }, + { + "key": "", + "message": "message5308" + }, + { + "key": "BBB", + "message": "message5309" + }, + { + "key": "CCC", + "message": "message5310" + }, + { + "key": "", + "message": "message5311" + }, + { + "key": "CCC", + "message": "message5312" + }, + { + "key": "AAA", + "message": "message5313" + }, + { + "key": "BBB", + "message": "message5314" + }, + { + "key": "DDD", + "message": "message5315" + }, + { + "key": "", + "message": "message5316" + }, + { + "key": "DDD", + "message": "message5317" + }, + { + "key": "CCC", + "message": "message5318" + }, + { + "key": "DDD", + "message": "message5319" + }, + { + "key": "", + "message": "message5320" + }, + { + "key": "", + "message": "message5321" + }, + { + "key": "BBB", + "message": "message5322" + }, + { + "key": "DDD", + "message": "message5323" + }, + { + "key": "BBB", + "message": "message5324" + }, + { + "key": "", + "message": "message5325" + }, + { + "key": "CCC", + "message": "message5326" + }, + { + "key": "CCC", + "message": "message5327" + }, + { + "key": "DDD", + "message": "message5328" + }, + { + "key": "BBB", + "message": "message5329" + }, + { + "key": "BBB", + "message": "message5330" + }, + { + "key": "", + "message": "message5331" + }, + { + "key": "", + "message": "message5332" + }, + { + "key": "BBB", + "message": "message5333" + }, + { + "key": "AAA", + "message": "message5334" + }, + { + "key": "", + "message": "message5335" + }, + { + "key": "AAA", + "message": "message5336" + }, + { + "key": "AAA", + "message": "message5337" + }, + { + "key": "", + "message": "message5338" + }, + { + "key": "CCC", + "message": "message5339" + }, + { + "key": "AAA", + "message": "message5340" + }, + { + "key": "BBB", + "message": "message5341" + }, + { + "key": "DDD", + "message": "message5342" + }, + { + "key": "", + "message": "message5343" + }, + { + "key": "CCC", + "message": "message5344" + }, + { + "key": "", + "message": "message5345" + }, + { + "key": "CCC", + "message": "message5346" + }, + { + "key": "CCC", + "message": "message5347" + }, + { + "key": "CCC", + "message": "message5348" + }, + { + "key": "", + "message": "message5349" + }, + { + "key": "BBB", + "message": "message5350" + }, + { + "key": "AAA", + "message": "message5351" + }, + { + "key": "CCC", + "message": "message5352" + }, + { + "key": "CCC", + "message": "message5353" + }, + { + "key": "CCC", + "message": "message5354" + }, + { + "key": "", + "message": "message5355" + }, + { + "key": "DDD", + "message": "message5356" + }, + { + "key": "AAA", + "message": "message5357" + }, + { + "key": "CCC", + "message": "message5358" + }, + { + "key": "DDD", + "message": "message5359" + }, + { + "key": "CCC", + "message": "message5360" + }, + { + "key": "CCC", + "message": "message5361" + }, + { + "key": "DDD", + "message": "message5362" + }, + { + "key": "AAA", + "message": "message5363" + }, + { + "key": "DDD", + "message": "message5364" + }, + { + "key": "DDD", + "message": "message5365" + }, + { + "key": "", + "message": "message5366" + }, + { + "key": "AAA", + "message": "message5367" + }, + { + "key": "", + "message": "message5368" + }, + { + "key": "", + "message": "message5369" + }, + { + "key": "DDD", + "message": "message5370" + }, + { + "key": "CCC", + "message": "message5371" + }, + { + "key": "", + "message": "message5372" + }, + { + "key": "AAA", + "message": "message5373" + }, + { + "key": "BBB", + "message": "message5374" + }, + { + "key": "", + "message": "message5375" + }, + { + "key": "CCC", + "message": "message5376" + }, + { + "key": "CCC", + "message": "message5377" + }, + { + "key": "BBB", + "message": "message5378" + }, + { + "key": "DDD", + "message": "message5379" + }, + { + "key": "BBB", + "message": "message5380" + }, + { + "key": "AAA", + "message": "message5381" + }, + { + "key": "DDD", + "message": "message5382" + }, + { + "key": "AAA", + "message": "message5383" + }, + { + "key": "BBB", + "message": "message5384" + }, + { + "key": "CCC", + "message": "message5385" + }, + { + "key": "AAA", + "message": "message5386" + }, + { + "key": "BBB", + "message": "message5387" + }, + { + "key": "", + "message": "message5388" + }, + { + "key": "DDD", + "message": "message5389" + }, + { + "key": "CCC", + "message": "message5390" + }, + { + "key": "CCC", + "message": "message5391" + }, + { + "key": "AAA", + "message": "message5392" + }, + { + "key": "BBB", + "message": "message5393" + }, + { + "key": "AAA", + "message": "message5394" + }, + { + "key": "DDD", + "message": "message5395" + }, + { + "key": "CCC", + "message": "message5396" + }, + { + "key": "CCC", + "message": "message5397" + }, + { + "key": "DDD", + "message": "message5398" + }, + { + "key": "CCC", + "message": "message5399" + }, + { + "key": "BBB", + "message": "message5400" + }, + { + "key": "CCC", + "message": "message5401" + }, + { + "key": "AAA", + "message": "message5402" + }, + { + "key": "", + "message": "message5403" + }, + { + "key": "CCC", + "message": "message5404" + }, + { + "key": "", + "message": "message5405" + }, + { + "key": "", + "message": "message5406" + }, + { + "key": "CCC", + "message": "message5407" + }, + { + "key": "AAA", + "message": "message5408" + }, + { + "key": "CCC", + "message": "message5409" + }, + { + "key": "BBB", + "message": "message5410" + }, + { + "key": "BBB", + "message": "message5411" + }, + { + "key": "DDD", + "message": "message5412" + }, + { + "key": "BBB", + "message": "message5413" + }, + { + "key": "AAA", + "message": "message5414" + }, + { + "key": "CCC", + "message": "message5415" + }, + { + "key": "CCC", + "message": "message5416" + }, + { + "key": "", + "message": "message5417" + }, + { + "key": "AAA", + "message": "message5418" + }, + { + "key": "AAA", + "message": "message5419" + }, + { + "key": "AAA", + "message": "message5420" + }, + { + "key": "DDD", + "message": "message5421" + }, + { + "key": "DDD", + "message": "message5422" + }, + { + "key": "AAA", + "message": "message5423" + }, + { + "key": "BBB", + "message": "message5424" + }, + { + "key": "DDD", + "message": "message5425" + }, + { + "key": "DDD", + "message": "message5426" + }, + { + "key": "", + "message": "message5427" + }, + { + "key": "AAA", + "message": "message5428" + }, + { + "key": "AAA", + "message": "message5429" + }, + { + "key": "BBB", + "message": "message5430" + }, + { + "key": "BBB", + "message": "message5431" + }, + { + "key": "AAA", + "message": "message5432" + }, + { + "key": "BBB", + "message": "message5433" + }, + { + "key": "AAA", + "message": "message5434" + }, + { + "key": "AAA", + "message": "message5435" + }, + { + "key": "BBB", + "message": "message5436" + }, + { + "key": "CCC", + "message": "message5437" + }, + { + "key": "AAA", + "message": "message5438" + }, + { + "key": "DDD", + "message": "message5439" + }, + { + "key": "DDD", + "message": "message5440" + }, + { + "key": "DDD", + "message": "message5441" + }, + { + "key": "AAA", + "message": "message5442" + }, + { + "key": "DDD", + "message": "message5443" + }, + { + "key": "AAA", + "message": "message5444" + }, + { + "key": "BBB", + "message": "message5445" + }, + { + "key": "DDD", + "message": "message5446" + }, + { + "key": "AAA", + "message": "message5447" + }, + { + "key": "BBB", + "message": "message5448" + }, + { + "key": "AAA", + "message": "message5449" + }, + { + "key": "BBB", + "message": "message5450" + }, + { + "key": "BBB", + "message": "message5451" + }, + { + "key": "DDD", + "message": "message5452" + }, + { + "key": "AAA", + "message": "message5453" + }, + { + "key": "BBB", + "message": "message5454" + }, + { + "key": "CCC", + "message": "message5455" + }, + { + "key": "", + "message": "message5456" + }, + { + "key": "CCC", + "message": "message5457" + }, + { + "key": "AAA", + "message": "message5458" + }, + { + "key": "", + "message": "message5459" + }, + { + "key": "CCC", + "message": "message5460" + }, + { + "key": "DDD", + "message": "message5461" + }, + { + "key": "CCC", + "message": "message5462" + }, + { + "key": "AAA", + "message": "message5463" + }, + { + "key": "DDD", + "message": "message5464" + }, + { + "key": "CCC", + "message": "message5465" + }, + { + "key": "", + "message": "message5466" + }, + { + "key": "BBB", + "message": "message5467" + }, + { + "key": "BBB", + "message": "message5468" + }, + { + "key": "DDD", + "message": "message5469" + }, + { + "key": "BBB", + "message": "message5470" + }, + { + "key": "CCC", + "message": "message5471" + }, + { + "key": "BBB", + "message": "message5472" + }, + { + "key": "", + "message": "message5473" + }, + { + "key": "DDD", + "message": "message5474" + }, + { + "key": "CCC", + "message": "message5475" + }, + { + "key": "CCC", + "message": "message5476" + }, + { + "key": "DDD", + "message": "message5477" + }, + { + "key": "AAA", + "message": "message5478" + }, + { + "key": "DDD", + "message": "message5479" + }, + { + "key": "DDD", + "message": "message5480" + }, + { + "key": "", + "message": "message5481" + }, + { + "key": "DDD", + "message": "message5482" + }, + { + "key": "DDD", + "message": "message5483" + }, + { + "key": "DDD", + "message": "message5484" + }, + { + "key": "CCC", + "message": "message5485" + }, + { + "key": "DDD", + "message": "message5486" + }, + { + "key": "BBB", + "message": "message5487" + }, + { + "key": "AAA", + "message": "message5488" + }, + { + "key": "BBB", + "message": "message5489" + }, + { + "key": "DDD", + "message": "message5490" + }, + { + "key": "", + "message": "message5491" + }, + { + "key": "AAA", + "message": "message5492" + }, + { + "key": "BBB", + "message": "message5493" + }, + { + "key": "DDD", + "message": "message5494" + }, + { + "key": "CCC", + "message": "message5495" + }, + { + "key": "BBB", + "message": "message5496" + }, + { + "key": "AAA", + "message": "message5497" + }, + { + "key": "", + "message": "message5498" + }, + { + "key": "DDD", + "message": "message5499" + }, + { + "key": "AAA", + "message": "message5500" + }, + { + "key": "CCC", + "message": "message5501" + }, + { + "key": "BBB", + "message": "message5502" + }, + { + "key": "", + "message": "message5503" + }, + { + "key": "DDD", + "message": "message5504" + }, + { + "key": "", + "message": "message5505" + }, + { + "key": "CCC", + "message": "message5506" + }, + { + "key": "BBB", + "message": "message5507" + }, + { + "key": "AAA", + "message": "message5508" + }, + { + "key": "", + "message": "message5509" + }, + { + "key": "CCC", + "message": "message5510" + }, + { + "key": "DDD", + "message": "message5511" + }, + { + "key": "CCC", + "message": "message5512" + }, + { + "key": "AAA", + "message": "message5513" + }, + { + "key": "", + "message": "message5514" + }, + { + "key": "CCC", + "message": "message5515" + }, + { + "key": "CCC", + "message": "message5516" + }, + { + "key": "BBB", + "message": "message5517" + }, + { + "key": "DDD", + "message": "message5518" + }, + { + "key": "DDD", + "message": "message5519" + }, + { + "key": "", + "message": "message5520" + }, + { + "key": "", + "message": "message5521" + }, + { + "key": "BBB", + "message": "message5522" + }, + { + "key": "AAA", + "message": "message5523" + }, + { + "key": "BBB", + "message": "message5524" + }, + { + "key": "", + "message": "message5525" + }, + { + "key": "DDD", + "message": "message5526" + }, + { + "key": "AAA", + "message": "message5527" + }, + { + "key": "DDD", + "message": "message5528" + }, + { + "key": "DDD", + "message": "message5529" + }, + { + "key": "AAA", + "message": "message5530" + }, + { + "key": "AAA", + "message": "message5531" + }, + { + "key": "", + "message": "message5532" + }, + { + "key": "AAA", + "message": "message5533" + }, + { + "key": "", + "message": "message5534" + }, + { + "key": "CCC", + "message": "message5535" + }, + { + "key": "DDD", + "message": "message5536" + }, + { + "key": "", + "message": "message5537" + }, + { + "key": "DDD", + "message": "message5538" + }, + { + "key": "", + "message": "message5539" + }, + { + "key": "AAA", + "message": "message5540" + }, + { + "key": "DDD", + "message": "message5541" + }, + { + "key": "BBB", + "message": "message5542" + }, + { + "key": "DDD", + "message": "message5543" + }, + { + "key": "DDD", + "message": "message5544" + }, + { + "key": "DDD", + "message": "message5545" + }, + { + "key": "CCC", + "message": "message5546" + }, + { + "key": "CCC", + "message": "message5547" + }, + { + "key": "DDD", + "message": "message5548" + }, + { + "key": "DDD", + "message": "message5549" + }, + { + "key": "DDD", + "message": "message5550" + }, + { + "key": "DDD", + "message": "message5551" + }, + { + "key": "BBB", + "message": "message5552" + }, + { + "key": "", + "message": "message5553" + }, + { + "key": "DDD", + "message": "message5554" + }, + { + "key": "DDD", + "message": "message5555" + }, + { + "key": "DDD", + "message": "message5556" + }, + { + "key": "", + "message": "message5557" + }, + { + "key": "AAA", + "message": "message5558" + }, + { + "key": "", + "message": "message5559" + }, + { + "key": "DDD", + "message": "message5560" + }, + { + "key": "CCC", + "message": "message5561" + }, + { + "key": "BBB", + "message": "message5562" + }, + { + "key": "AAA", + "message": "message5563" + }, + { + "key": "AAA", + "message": "message5564" + }, + { + "key": "CCC", + "message": "message5565" + }, + { + "key": "BBB", + "message": "message5566" + }, + { + "key": "", + "message": "message5567" + }, + { + "key": "AAA", + "message": "message5568" + }, + { + "key": "DDD", + "message": "message5569" + }, + { + "key": "", + "message": "message5570" + }, + { + "key": "", + "message": "message5571" + }, + { + "key": "BBB", + "message": "message5572" + }, + { + "key": "BBB", + "message": "message5573" + }, + { + "key": "BBB", + "message": "message5574" + }, + { + "key": "DDD", + "message": "message5575" + }, + { + "key": "", + "message": "message5576" + }, + { + "key": "DDD", + "message": "message5577" + }, + { + "key": "", + "message": "message5578" + }, + { + "key": "AAA", + "message": "message5579" + }, + { + "key": "", + "message": "message5580" + }, + { + "key": "BBB", + "message": "message5581" + }, + { + "key": "AAA", + "message": "message5582" + }, + { + "key": "CCC", + "message": "message5583" + }, + { + "key": "CCC", + "message": "message5584" + }, + { + "key": "BBB", + "message": "message5585" + }, + { + "key": "BBB", + "message": "message5586" + }, + { + "key": "CCC", + "message": "message5587" + }, + { + "key": "DDD", + "message": "message5588" + }, + { + "key": "BBB", + "message": "message5589" + }, + { + "key": "", + "message": "message5590" + }, + { + "key": "AAA", + "message": "message5591" + }, + { + "key": "DDD", + "message": "message5592" + }, + { + "key": "", + "message": "message5593" + }, + { + "key": "BBB", + "message": "message5594" + }, + { + "key": "BBB", + "message": "message5595" + }, + { + "key": "CCC", + "message": "message5596" + }, + { + "key": "BBB", + "message": "message5597" + }, + { + "key": "", + "message": "message5598" + }, + { + "key": "BBB", + "message": "message5599" + }, + { + "key": "", + "message": "message5600" + }, + { + "key": "BBB", + "message": "message5601" + }, + { + "key": "BBB", + "message": "message5602" + }, + { + "key": "BBB", + "message": "message5603" + }, + { + "key": "", + "message": "message5604" + }, + { + "key": "BBB", + "message": "message5605" + }, + { + "key": "", + "message": "message5606" + }, + { + "key": "AAA", + "message": "message5607" + }, + { + "key": "", + "message": "message5608" + }, + { + "key": "DDD", + "message": "message5609" + }, + { + "key": "BBB", + "message": "message5610" + }, + { + "key": "CCC", + "message": "message5611" + }, + { + "key": "DDD", + "message": "message5612" + }, + { + "key": "AAA", + "message": "message5613" + }, + { + "key": "AAA", + "message": "message5614" + }, + { + "key": "AAA", + "message": "message5615" + }, + { + "key": "DDD", + "message": "message5616" + }, + { + "key": "BBB", + "message": "message5617" + }, + { + "key": "DDD", + "message": "message5618" + }, + { + "key": "BBB", + "message": "message5619" + }, + { + "key": "", + "message": "message5620" + }, + { + "key": "CCC", + "message": "message5621" + }, + { + "key": "AAA", + "message": "message5622" + }, + { + "key": "AAA", + "message": "message5623" + }, + { + "key": "AAA", + "message": "message5624" + }, + { + "key": "DDD", + "message": "message5625" + }, + { + "key": "BBB", + "message": "message5626" + }, + { + "key": "CCC", + "message": "message5627" + }, + { + "key": "DDD", + "message": "message5628" + }, + { + "key": "", + "message": "message5629" + }, + { + "key": "DDD", + "message": "message5630" + }, + { + "key": "CCC", + "message": "message5631" + }, + { + "key": "BBB", + "message": "message5632" + }, + { + "key": "DDD", + "message": "message5633" + }, + { + "key": "DDD", + "message": "message5634" + }, + { + "key": "", + "message": "message5635" + }, + { + "key": "BBB", + "message": "message5636" + }, + { + "key": "DDD", + "message": "message5637" + }, + { + "key": "", + "message": "message5638" + }, + { + "key": "BBB", + "message": "message5639" + }, + { + "key": "CCC", + "message": "message5640" + }, + { + "key": "BBB", + "message": "message5641" + }, + { + "key": "CCC", + "message": "message5642" + }, + { + "key": "AAA", + "message": "message5643" + }, + { + "key": "", + "message": "message5644" + }, + { + "key": "", + "message": "message5645" + }, + { + "key": "DDD", + "message": "message5646" + }, + { + "key": "BBB", + "message": "message5647" + }, + { + "key": "BBB", + "message": "message5648" + }, + { + "key": "CCC", + "message": "message5649" + }, + { + "key": "", + "message": "message5650" + }, + { + "key": "DDD", + "message": "message5651" + }, + { + "key": "BBB", + "message": "message5652" + }, + { + "key": "", + "message": "message5653" + }, + { + "key": "DDD", + "message": "message5654" + }, + { + "key": "CCC", + "message": "message5655" + }, + { + "key": "DDD", + "message": "message5656" + }, + { + "key": "CCC", + "message": "message5657" + }, + { + "key": "CCC", + "message": "message5658" + }, + { + "key": "AAA", + "message": "message5659" + }, + { + "key": "", + "message": "message5660" + }, + { + "key": "DDD", + "message": "message5661" + }, + { + "key": "AAA", + "message": "message5662" + }, + { + "key": "AAA", + "message": "message5663" + }, + { + "key": "BBB", + "message": "message5664" + }, + { + "key": "AAA", + "message": "message5665" + }, + { + "key": "CCC", + "message": "message5666" + }, + { + "key": "CCC", + "message": "message5667" + }, + { + "key": "BBB", + "message": "message5668" + }, + { + "key": "AAA", + "message": "message5669" + }, + { + "key": "CCC", + "message": "message5670" + }, + { + "key": "DDD", + "message": "message5671" + }, + { + "key": "AAA", + "message": "message5672" + }, + { + "key": "DDD", + "message": "message5673" + }, + { + "key": "DDD", + "message": "message5674" + }, + { + "key": "", + "message": "message5675" + }, + { + "key": "CCC", + "message": "message5676" + }, + { + "key": "DDD", + "message": "message5677" + }, + { + "key": "CCC", + "message": "message5678" + }, + { + "key": "AAA", + "message": "message5679" + }, + { + "key": "DDD", + "message": "message5680" + }, + { + "key": "", + "message": "message5681" + }, + { + "key": "CCC", + "message": "message5682" + }, + { + "key": "DDD", + "message": "message5683" + }, + { + "key": "CCC", + "message": "message5684" + }, + { + "key": "AAA", + "message": "message5685" + }, + { + "key": "", + "message": "message5686" + }, + { + "key": "", + "message": "message5687" + }, + { + "key": "DDD", + "message": "message5688" + }, + { + "key": "AAA", + "message": "message5689" + }, + { + "key": "DDD", + "message": "message5690" + }, + { + "key": "CCC", + "message": "message5691" + }, + { + "key": "AAA", + "message": "message5692" + }, + { + "key": "CCC", + "message": "message5693" + }, + { + "key": "AAA", + "message": "message5694" + }, + { + "key": "DDD", + "message": "message5695" + }, + { + "key": "DDD", + "message": "message5696" + }, + { + "key": "", + "message": "message5697" + }, + { + "key": "DDD", + "message": "message5698" + }, + { + "key": "DDD", + "message": "message5699" + }, + { + "key": "", + "message": "message5700" + }, + { + "key": "AAA", + "message": "message5701" + }, + { + "key": "DDD", + "message": "message5702" + }, + { + "key": "DDD", + "message": "message5703" + }, + { + "key": "BBB", + "message": "message5704" + }, + { + "key": "BBB", + "message": "message5705" + }, + { + "key": "", + "message": "message5706" + }, + { + "key": "AAA", + "message": "message5707" + }, + { + "key": "", + "message": "message5708" + }, + { + "key": "BBB", + "message": "message5709" + }, + { + "key": "BBB", + "message": "message5710" + }, + { + "key": "AAA", + "message": "message5711" + }, + { + "key": "", + "message": "message5712" + }, + { + "key": "BBB", + "message": "message5713" + }, + { + "key": "AAA", + "message": "message5714" + }, + { + "key": "AAA", + "message": "message5715" + }, + { + "key": "BBB", + "message": "message5716" + }, + { + "key": "CCC", + "message": "message5717" + }, + { + "key": "CCC", + "message": "message5718" + }, + { + "key": "CCC", + "message": "message5719" + }, + { + "key": "", + "message": "message5720" + }, + { + "key": "DDD", + "message": "message5721" + }, + { + "key": "CCC", + "message": "message5722" + }, + { + "key": "DDD", + "message": "message5723" + }, + { + "key": "", + "message": "message5724" + }, + { + "key": "AAA", + "message": "message5725" + }, + { + "key": "DDD", + "message": "message5726" + }, + { + "key": "", + "message": "message5727" + }, + { + "key": "DDD", + "message": "message5728" + }, + { + "key": "", + "message": "message5729" + }, + { + "key": "CCC", + "message": "message5730" + }, + { + "key": "BBB", + "message": "message5731" + }, + { + "key": "BBB", + "message": "message5732" + }, + { + "key": "CCC", + "message": "message5733" + }, + { + "key": "DDD", + "message": "message5734" + }, + { + "key": "CCC", + "message": "message5735" + }, + { + "key": "", + "message": "message5736" + }, + { + "key": "", + "message": "message5737" + }, + { + "key": "CCC", + "message": "message5738" + }, + { + "key": "AAA", + "message": "message5739" + }, + { + "key": "CCC", + "message": "message5740" + }, + { + "key": "CCC", + "message": "message5741" + }, + { + "key": "", + "message": "message5742" + }, + { + "key": "AAA", + "message": "message5743" + }, + { + "key": "BBB", + "message": "message5744" + }, + { + "key": "BBB", + "message": "message5745" + }, + { + "key": "", + "message": "message5746" + }, + { + "key": "AAA", + "message": "message5747" + }, + { + "key": "AAA", + "message": "message5748" + }, + { + "key": "CCC", + "message": "message5749" + }, + { + "key": "BBB", + "message": "message5750" + }, + { + "key": "", + "message": "message5751" + }, + { + "key": "", + "message": "message5752" + }, + { + "key": "DDD", + "message": "message5753" + }, + { + "key": "", + "message": "message5754" + }, + { + "key": "BBB", + "message": "message5755" + }, + { + "key": "AAA", + "message": "message5756" + }, + { + "key": "AAA", + "message": "message5757" + }, + { + "key": "CCC", + "message": "message5758" + }, + { + "key": "AAA", + "message": "message5759" + }, + { + "key": "DDD", + "message": "message5760" + }, + { + "key": "AAA", + "message": "message5761" + }, + { + "key": "CCC", + "message": "message5762" + }, + { + "key": "", + "message": "message5763" + }, + { + "key": "CCC", + "message": "message5764" + }, + { + "key": "AAA", + "message": "message5765" + }, + { + "key": "BBB", + "message": "message5766" + }, + { + "key": "DDD", + "message": "message5767" + }, + { + "key": "BBB", + "message": "message5768" + }, + { + "key": "AAA", + "message": "message5769" + }, + { + "key": "", + "message": "message5770" + }, + { + "key": "BBB", + "message": "message5771" + }, + { + "key": "", + "message": "message5772" + }, + { + "key": "CCC", + "message": "message5773" + }, + { + "key": "BBB", + "message": "message5774" + }, + { + "key": "AAA", + "message": "message5775" + }, + { + "key": "AAA", + "message": "message5776" + }, + { + "key": "", + "message": "message5777" + }, + { + "key": "DDD", + "message": "message5778" + }, + { + "key": "", + "message": "message5779" + }, + { + "key": "", + "message": "message5780" + }, + { + "key": "", + "message": "message5781" + }, + { + "key": "BBB", + "message": "message5782" + }, + { + "key": "DDD", + "message": "message5783" + }, + { + "key": "", + "message": "message5784" + }, + { + "key": "DDD", + "message": "message5785" + }, + { + "key": "AAA", + "message": "message5786" + }, + { + "key": "CCC", + "message": "message5787" + }, + { + "key": "DDD", + "message": "message5788" + }, + { + "key": "DDD", + "message": "message5789" + }, + { + "key": "CCC", + "message": "message5790" + }, + { + "key": "", + "message": "message5791" + }, + { + "key": "", + "message": "message5792" + }, + { + "key": "DDD", + "message": "message5793" + }, + { + "key": "BBB", + "message": "message5794" + }, + { + "key": "BBB", + "message": "message5795" + }, + { + "key": "CCC", + "message": "message5796" + }, + { + "key": "CCC", + "message": "message5797" + }, + { + "key": "", + "message": "message5798" + }, + { + "key": "DDD", + "message": "message5799" + }, + { + "key": "", + "message": "message5800" + }, + { + "key": "", + "message": "message5801" + }, + { + "key": "AAA", + "message": "message5802" + }, + { + "key": "CCC", + "message": "message5803" + }, + { + "key": "BBB", + "message": "message5804" + }, + { + "key": "", + "message": "message5805" + }, + { + "key": "AAA", + "message": "message5806" + }, + { + "key": "BBB", + "message": "message5807" + }, + { + "key": "CCC", + "message": "message5808" + }, + { + "key": "BBB", + "message": "message5809" + }, + { + "key": "CCC", + "message": "message5810" + }, + { + "key": "", + "message": "message5811" + }, + { + "key": "", + "message": "message5812" + }, + { + "key": "AAA", + "message": "message5813" + }, + { + "key": "CCC", + "message": "message5814" + }, + { + "key": "DDD", + "message": "message5815" + }, + { + "key": "BBB", + "message": "message5816" + }, + { + "key": "", + "message": "message5817" + }, + { + "key": "DDD", + "message": "message5818" + }, + { + "key": "DDD", + "message": "message5819" + }, + { + "key": "BBB", + "message": "message5820" + }, + { + "key": "DDD", + "message": "message5821" + }, + { + "key": "AAA", + "message": "message5822" + }, + { + "key": "CCC", + "message": "message5823" + }, + { + "key": "BBB", + "message": "message5824" + }, + { + "key": "BBB", + "message": "message5825" + }, + { + "key": "", + "message": "message5826" + }, + { + "key": "BBB", + "message": "message5827" + }, + { + "key": "CCC", + "message": "message5828" + }, + { + "key": "CCC", + "message": "message5829" + }, + { + "key": "DDD", + "message": "message5830" + }, + { + "key": "BBB", + "message": "message5831" + }, + { + "key": "CCC", + "message": "message5832" + }, + { + "key": "AAA", + "message": "message5833" + }, + { + "key": "AAA", + "message": "message5834" + }, + { + "key": "BBB", + "message": "message5835" + }, + { + "key": "BBB", + "message": "message5836" + }, + { + "key": "", + "message": "message5837" + }, + { + "key": "AAA", + "message": "message5838" + }, + { + "key": "DDD", + "message": "message5839" + }, + { + "key": "AAA", + "message": "message5840" + }, + { + "key": "DDD", + "message": "message5841" + }, + { + "key": "", + "message": "message5842" + }, + { + "key": "CCC", + "message": "message5843" + }, + { + "key": "BBB", + "message": "message5844" + }, + { + "key": "BBB", + "message": "message5845" + }, + { + "key": "CCC", + "message": "message5846" + }, + { + "key": "CCC", + "message": "message5847" + }, + { + "key": "AAA", + "message": "message5848" + }, + { + "key": "BBB", + "message": "message5849" + }, + { + "key": "DDD", + "message": "message5850" + }, + { + "key": "", + "message": "message5851" + }, + { + "key": "CCC", + "message": "message5852" + }, + { + "key": "CCC", + "message": "message5853" + }, + { + "key": "AAA", + "message": "message5854" + }, + { + "key": "CCC", + "message": "message5855" + }, + { + "key": "AAA", + "message": "message5856" + }, + { + "key": "BBB", + "message": "message5857" + }, + { + "key": "", + "message": "message5858" + }, + { + "key": "DDD", + "message": "message5859" + }, + { + "key": "DDD", + "message": "message5860" + }, + { + "key": "", + "message": "message5861" + }, + { + "key": "BBB", + "message": "message5862" + }, + { + "key": "DDD", + "message": "message5863" + }, + { + "key": "BBB", + "message": "message5864" + }, + { + "key": "", + "message": "message5865" + }, + { + "key": "CCC", + "message": "message5866" + }, + { + "key": "", + "message": "message5867" + }, + { + "key": "", + "message": "message5868" + }, + { + "key": "AAA", + "message": "message5869" + }, + { + "key": "", + "message": "message5870" + }, + { + "key": "BBB", + "message": "message5871" + }, + { + "key": "AAA", + "message": "message5872" + }, + { + "key": "CCC", + "message": "message5873" + }, + { + "key": "AAA", + "message": "message5874" + }, + { + "key": "CCC", + "message": "message5875" + }, + { + "key": "AAA", + "message": "message5876" + }, + { + "key": "DDD", + "message": "message5877" + }, + { + "key": "AAA", + "message": "message5878" + }, + { + "key": "BBB", + "message": "message5879" + }, + { + "key": "CCC", + "message": "message5880" + }, + { + "key": "AAA", + "message": "message5881" + }, + { + "key": "AAA", + "message": "message5882" + }, + { + "key": "", + "message": "message5883" + }, + { + "key": "BBB", + "message": "message5884" + }, + { + "key": "DDD", + "message": "message5885" + }, + { + "key": "DDD", + "message": "message5886" + }, + { + "key": "", + "message": "message5887" + }, + { + "key": "AAA", + "message": "message5888" + }, + { + "key": "", + "message": "message5889" + }, + { + "key": "AAA", + "message": "message5890" + }, + { + "key": "CCC", + "message": "message5891" + }, + { + "key": "BBB", + "message": "message5892" + }, + { + "key": "", + "message": "message5893" + }, + { + "key": "AAA", + "message": "message5894" + }, + { + "key": "AAA", + "message": "message5895" + }, + { + "key": "BBB", + "message": "message5896" + }, + { + "key": "CCC", + "message": "message5897" + }, + { + "key": "CCC", + "message": "message5898" + }, + { + "key": "AAA", + "message": "message5899" + }, + { + "key": "", + "message": "message5900" + }, + { + "key": "", + "message": "message5901" + }, + { + "key": "CCC", + "message": "message5902" + }, + { + "key": "DDD", + "message": "message5903" + }, + { + "key": "CCC", + "message": "message5904" + }, + { + "key": "BBB", + "message": "message5905" + }, + { + "key": "DDD", + "message": "message5906" + }, + { + "key": "BBB", + "message": "message5907" + }, + { + "key": "BBB", + "message": "message5908" + }, + { + "key": "DDD", + "message": "message5909" + }, + { + "key": "DDD", + "message": "message5910" + }, + { + "key": "", + "message": "message5911" + }, + { + "key": "DDD", + "message": "message5912" + }, + { + "key": "AAA", + "message": "message5913" + }, + { + "key": "AAA", + "message": "message5914" + }, + { + "key": "AAA", + "message": "message5915" + }, + { + "key": "", + "message": "message5916" + }, + { + "key": "DDD", + "message": "message5917" + }, + { + "key": "DDD", + "message": "message5918" + }, + { + "key": "BBB", + "message": "message5919" + }, + { + "key": "BBB", + "message": "message5920" + }, + { + "key": "AAA", + "message": "message5921" + }, + { + "key": "", + "message": "message5922" + }, + { + "key": "CCC", + "message": "message5923" + }, + { + "key": "DDD", + "message": "message5924" + }, + { + "key": "BBB", + "message": "message5925" + }, + { + "key": "", + "message": "message5926" + }, + { + "key": "BBB", + "message": "message5927" + }, + { + "key": "", + "message": "message5928" + }, + { + "key": "BBB", + "message": "message5929" + }, + { + "key": "CCC", + "message": "message5930" + }, + { + "key": "CCC", + "message": "message5931" + }, + { + "key": "BBB", + "message": "message5932" + }, + { + "key": "AAA", + "message": "message5933" + }, + { + "key": "CCC", + "message": "message5934" + }, + { + "key": "BBB", + "message": "message5935" + }, + { + "key": "DDD", + "message": "message5936" + }, + { + "key": "AAA", + "message": "message5937" + }, + { + "key": "", + "message": "message5938" + }, + { + "key": "CCC", + "message": "message5939" + }, + { + "key": "AAA", + "message": "message5940" + }, + { + "key": "DDD", + "message": "message5941" + }, + { + "key": "BBB", + "message": "message5942" + }, + { + "key": "CCC", + "message": "message5943" + }, + { + "key": "BBB", + "message": "message5944" + }, + { + "key": "AAA", + "message": "message5945" + }, + { + "key": "CCC", + "message": "message5946" + }, + { + "key": "BBB", + "message": "message5947" + }, + { + "key": "", + "message": "message5948" + }, + { + "key": "", + "message": "message5949" + }, + { + "key": "DDD", + "message": "message5950" + }, + { + "key": "", + "message": "message5951" + }, + { + "key": "BBB", + "message": "message5952" + }, + { + "key": "DDD", + "message": "message5953" + }, + { + "key": "BBB", + "message": "message5954" + }, + { + "key": "DDD", + "message": "message5955" + }, + { + "key": "BBB", + "message": "message5956" + }, + { + "key": "DDD", + "message": "message5957" + }, + { + "key": "AAA", + "message": "message5958" + }, + { + "key": "CCC", + "message": "message5959" + }, + { + "key": "", + "message": "message5960" + }, + { + "key": "", + "message": "message5961" + }, + { + "key": "BBB", + "message": "message5962" + }, + { + "key": "BBB", + "message": "message5963" + }, + { + "key": "", + "message": "message5964" + }, + { + "key": "DDD", + "message": "message5965" + }, + { + "key": "AAA", + "message": "message5966" + }, + { + "key": "", + "message": "message5967" + }, + { + "key": "BBB", + "message": "message5968" + }, + { + "key": "AAA", + "message": "message5969" + }, + { + "key": "", + "message": "message5970" + }, + { + "key": "DDD", + "message": "message5971" + }, + { + "key": "", + "message": "message5972" + }, + { + "key": "DDD", + "message": "message5973" + }, + { + "key": "CCC", + "message": "message5974" + }, + { + "key": "DDD", + "message": "message5975" + }, + { + "key": "CCC", + "message": "message5976" + }, + { + "key": "AAA", + "message": "message5977" + }, + { + "key": "", + "message": "message5978" + }, + { + "key": "DDD", + "message": "message5979" + }, + { + "key": "AAA", + "message": "message5980" + }, + { + "key": "", + "message": "message5981" + }, + { + "key": "DDD", + "message": "message5982" + }, + { + "key": "DDD", + "message": "message5983" + }, + { + "key": "BBB", + "message": "message5984" + }, + { + "key": "DDD", + "message": "message5985" + }, + { + "key": "DDD", + "message": "message5986" + }, + { + "key": "CCC", + "message": "message5987" + }, + { + "key": "CCC", + "message": "message5988" + }, + { + "key": "CCC", + "message": "message5989" + }, + { + "key": "DDD", + "message": "message5990" + }, + { + "key": "DDD", + "message": "message5991" + }, + { + "key": "AAA", + "message": "message5992" + }, + { + "key": "BBB", + "message": "message5993" + }, + { + "key": "BBB", + "message": "message5994" + }, + { + "key": "AAA", + "message": "message5995" + }, + { + "key": "DDD", + "message": "message5996" + }, + { + "key": "AAA", + "message": "message5997" + }, + { + "key": "", + "message": "message5998" + }, + { + "key": "AAA", + "message": "message5999" + }, + { + "key": "CCC", + "message": "message6000" + }, + { + "key": "key0", + "message": "message6001" + }, + { + "key": "key1", + "message": "message6002" + }, + { + "key": "key2", + "message": "message6003" + }, + { + "key": "key3", + "message": "message6004" + }, + { + "key": "key4", + "message": "message6005" + }, + { + "key": "key5", + "message": "message6006" + }, + { + "key": "key6", + "message": "message6007" + }, + { + "key": "key7", + "message": "message6008" + }, + { + "key": "key8", + "message": "message6009" + }, + { + "key": "key9", + "message": "message6010" + }, + { + "key": "key10", + "message": "message6011" + }, + { + "key": "key11", + "message": "message6012" + }, + { + "key": "key12", + "message": "message6013" + }, + { + "key": "key13", + "message": "message6014" + }, + { + "key": "key14", + "message": "message6015" + }, + { + "key": "key15", + "message": "message6016" + }, + { + "key": "key16", + "message": "message6017" + }, + { + "key": "key17", + "message": "message6018" + }, + { + "key": "key18", + "message": "message6019" + }, + { + "key": "key19", + "message": "message6020" + }, + { + "key": "key20", + "message": "message6021" + }, + { + "key": "key21", + "message": "message6022" + }, + { + "key": "key22", + "message": "message6023" + }, + { + "key": "key23", + "message": "message6024" + }, + { + "key": "key24", + "message": "message6025" + }, + { + "key": "key25", + "message": "message6026" + }, + { + "key": "key26", + "message": "message6027" + }, + { + "key": "key27", + "message": "message6028" + }, + { + "key": "key28", + "message": "message6029" + }, + { + "key": "key29", + "message": "message6030" + }, + { + "key": "key30", + "message": "message6031" + }, + { + "key": "key31", + "message": "message6032" + }, + { + "key": "key32", + "message": "message6033" + }, + { + "key": "key33", + "message": "message6034" + }, + { + "key": "key34", + "message": "message6035" + }, + { + "key": "key35", + "message": "message6036" + }, + { + "key": "key36", + "message": "message6037" + }, + { + "key": "key37", + "message": "message6038" + }, + { + "key": "key38", + "message": "message6039" + }, + { + "key": "key39", + "message": "message6040" + }, + { + "key": "key40", + "message": "message6041" + }, + { + "key": "key41", + "message": "message6042" + }, + { + "key": "key42", + "message": "message6043" + }, + { + "key": "key43", + "message": "message6044" + }, + { + "key": "key44", + "message": "message6045" + }, + { + "key": "key45", + "message": "message6046" + }, + { + "key": "key46", + "message": "message6047" + }, + { + "key": "key47", + "message": "message6048" + }, + { + "key": "key48", + "message": "message6049" + }, + { + "key": "key49", + "message": "message6050" + }, + { + "key": "key50", + "message": "message6051" + }, + { + "key": "key51", + "message": "message6052" + }, + { + "key": "key52", + "message": "message6053" + }, + { + "key": "key53", + "message": "message6054" + }, + { + "key": "key54", + "message": "message6055" + }, + { + "key": "key55", + "message": "message6056" + }, + { + "key": "key56", + "message": "message6057" + }, + { + "key": "key57", + "message": "message6058" + }, + { + "key": "key58", + "message": "message6059" + }, + { + "key": "key59", + "message": "message6060" + }, + { + "key": "key60", + "message": "message6061" + }, + { + "key": "key61", + "message": "message6062" + }, + { + "key": "key62", + "message": "message6063" + }, + { + "key": "key63", + "message": "message6064" + }, + { + "key": "key64", + "message": "message6065" + }, + { + "key": "key65", + "message": "message6066" + }, + { + "key": "key66", + "message": "message6067" + }, + { + "key": "key67", + "message": "message6068" + }, + { + "key": "key68", + "message": "message6069" + }, + { + "key": "key69", + "message": "message6070" + }, + { + "key": "key70", + "message": "message6071" + }, + { + "key": "key71", + "message": "message6072" + }, + { + "key": "key72", + "message": "message6073" + }, + { + "key": "key73", + "message": "message6074" + }, + { + "key": "key74", + "message": "message6075" + }, + { + "key": "key75", + "message": "message6076" + }, + { + "key": "key76", + "message": "message6077" + }, + { + "key": "key77", + "message": "message6078" + }, + { + "key": "key78", + "message": "message6079" + }, + { + "key": "key79", + "message": "message6080" + }, + { + "key": "key80", + "message": "message6081" + }, + { + "key": "key81", + "message": "message6082" + }, + { + "key": "key82", + "message": "message6083" + }, + { + "key": "key83", + "message": "message6084" + }, + { + "key": "key84", + "message": "message6085" + }, + { + "key": "key85", + "message": "message6086" + }, + { + "key": "key86", + "message": "message6087" + }, + { + "key": "key87", + "message": "message6088" + }, + { + "key": "key88", + "message": "message6089" + }, + { + "key": "key89", + "message": "message6090" + }, + { + "key": "key90", + "message": "message6091" + }, + { + "key": "key91", + "message": "message6092" + }, + { + "key": "key92", + "message": "message6093" + }, + { + "key": "key93", + "message": "message6094" + }, + { + "key": "key94", + "message": "message6095" + }, + { + "key": "key95", + "message": "message6096" + }, + { + "key": "key96", + "message": "message6097" + }, + { + "key": "key97", + "message": "message6098" + }, + { + "key": "key98", + "message": "message6099" + }, + { + "key": "key99", + "message": "message6100" + }, + { + "key": "key100", + "message": "message6101" + }, + { + "key": "key101", + "message": "message6102" + }, + { + "key": "key102", + "message": "message6103" + }, + { + "key": "key103", + "message": "message6104" + }, + { + "key": "key104", + "message": "message6105" + }, + { + "key": "key105", + "message": "message6106" + }, + { + "key": "key106", + "message": "message6107" + }, + { + "key": "key107", + "message": "message6108" + }, + { + "key": "key108", + "message": "message6109" + }, + { + "key": "key109", + "message": "message6110" + }, + { + "key": "key110", + "message": "message6111" + }, + { + "key": "key111", + "message": "message6112" + }, + { + "key": "key112", + "message": "message6113" + }, + { + "key": "key113", + "message": "message6114" + }, + { + "key": "key114", + "message": "message6115" + }, + { + "key": "key115", + "message": "message6116" + }, + { + "key": "key116", + "message": "message6117" + }, + { + "key": "key117", + "message": "message6118" + }, + { + "key": "key118", + "message": "message6119" + }, + { + "key": "key119", + "message": "message6120" + }, + { + "key": "key120", + "message": "message6121" + }, + { + "key": "key121", + "message": "message6122" + }, + { + "key": "key122", + "message": "message6123" + }, + { + "key": "key123", + "message": "message6124" + }, + { + "key": "key124", + "message": "message6125" + }, + { + "key": "key125", + "message": "message6126" + }, + { + "key": "key126", + "message": "message6127" + }, + { + "key": "key127", + "message": "message6128" + }, + { + "key": "key128", + "message": "message6129" + }, + { + "key": "key129", + "message": "message6130" + }, + { + "key": "key130", + "message": "message6131" + }, + { + "key": "key131", + "message": "message6132" + }, + { + "key": "key132", + "message": "message6133" + }, + { + "key": "key133", + "message": "message6134" + }, + { + "key": "key134", + "message": "message6135" + }, + { + "key": "key135", + "message": "message6136" + }, + { + "key": "key136", + "message": "message6137" + }, + { + "key": "key137", + "message": "message6138" + }, + { + "key": "key138", + "message": "message6139" + }, + { + "key": "key139", + "message": "message6140" + }, + { + "key": "key140", + "message": "message6141" + }, + { + "key": "key141", + "message": "message6142" + }, + { + "key": "key142", + "message": "message6143" + }, + { + "key": "key143", + "message": "message6144" + }, + { + "key": "key144", + "message": "message6145" + }, + { + "key": "key145", + "message": "message6146" + }, + { + "key": "key146", + "message": "message6147" + }, + { + "key": "key147", + "message": "message6148" + }, + { + "key": "key148", + "message": "message6149" + }, + { + "key": "key149", + "message": "message6150" + }, + { + "key": "key150", + "message": "message6151" + }, + { + "key": "key151", + "message": "message6152" + }, + { + "key": "key152", + "message": "message6153" + }, + { + "key": "key153", + "message": "message6154" + }, + { + "key": "key154", + "message": "message6155" + }, + { + "key": "key155", + "message": "message6156" + }, + { + "key": "key156", + "message": "message6157" + }, + { + "key": "key157", + "message": "message6158" + }, + { + "key": "key158", + "message": "message6159" + }, + { + "key": "key159", + "message": "message6160" + }, + { + "key": "key160", + "message": "message6161" + }, + { + "key": "key161", + "message": "message6162" + }, + { + "key": "key162", + "message": "message6163" + }, + { + "key": "key163", + "message": "message6164" + }, + { + "key": "key164", + "message": "message6165" + }, + { + "key": "key165", + "message": "message6166" + }, + { + "key": "key166", + "message": "message6167" + }, + { + "key": "key167", + "message": "message6168" + }, + { + "key": "key168", + "message": "message6169" + }, + { + "key": "key169", + "message": "message6170" + }, + { + "key": "key170", + "message": "message6171" + }, + { + "key": "key171", + "message": "message6172" + }, + { + "key": "key172", + "message": "message6173" + }, + { + "key": "key173", + "message": "message6174" + }, + { + "key": "key174", + "message": "message6175" + }, + { + "key": "key175", + "message": "message6176" + }, + { + "key": "key176", + "message": "message6177" + }, + { + "key": "key177", + "message": "message6178" + }, + { + "key": "key178", + "message": "message6179" + }, + { + "key": "key179", + "message": "message6180" + }, + { + "key": "key180", + "message": "message6181" + }, + { + "key": "key181", + "message": "message6182" + }, + { + "key": "key182", + "message": "message6183" + }, + { + "key": "key183", + "message": "message6184" + }, + { + "key": "key184", + "message": "message6185" + }, + { + "key": "key185", + "message": "message6186" + }, + { + "key": "key186", + "message": "message6187" + }, + { + "key": "key187", + "message": "message6188" + }, + { + "key": "key188", + "message": "message6189" + }, + { + "key": "key189", + "message": "message6190" + }, + { + "key": "key190", + "message": "message6191" + }, + { + "key": "key191", + "message": "message6192" + }, + { + "key": "key192", + "message": "message6193" + }, + { + "key": "key193", + "message": "message6194" + }, + { + "key": "key194", + "message": "message6195" + }, + { + "key": "key195", + "message": "message6196" + }, + { + "key": "key196", + "message": "message6197" + }, + { + "key": "key197", + "message": "message6198" + }, + { + "key": "key198", + "message": "message6199" + }, + { + "key": "key199", + "message": "message6200" + }, + { + "key": "key200", + "message": "message6201" + }, + { + "key": "key201", + "message": "message6202" + }, + { + "key": "key202", + "message": "message6203" + }, + { + "key": "key203", + "message": "message6204" + }, + { + "key": "key204", + "message": "message6205" + }, + { + "key": "key205", + "message": "message6206" + }, + { + "key": "key206", + "message": "message6207" + }, + { + "key": "key207", + "message": "message6208" + }, + { + "key": "key208", + "message": "message6209" + }, + { + "key": "key209", + "message": "message6210" + }, + { + "key": "key210", + "message": "message6211" + }, + { + "key": "key211", + "message": "message6212" + }, + { + "key": "key212", + "message": "message6213" + }, + { + "key": "key213", + "message": "message6214" + }, + { + "key": "key214", + "message": "message6215" + }, + { + "key": "key215", + "message": "message6216" + }, + { + "key": "key216", + "message": "message6217" + }, + { + "key": "key217", + "message": "message6218" + }, + { + "key": "key218", + "message": "message6219" + }, + { + "key": "key219", + "message": "message6220" + }, + { + "key": "key220", + "message": "message6221" + }, + { + "key": "key221", + "message": "message6222" + }, + { + "key": "key222", + "message": "message6223" + }, + { + "key": "key223", + "message": "message6224" + }, + { + "key": "key224", + "message": "message6225" + }, + { + "key": "key225", + "message": "message6226" + }, + { + "key": "key226", + "message": "message6227" + }, + { + "key": "key227", + "message": "message6228" + }, + { + "key": "key228", + "message": "message6229" + }, + { + "key": "key229", + "message": "message6230" + }, + { + "key": "key230", + "message": "message6231" + }, + { + "key": "key231", + "message": "message6232" + }, + { + "key": "key232", + "message": "message6233" + }, + { + "key": "key233", + "message": "message6234" + }, + { + "key": "key234", + "message": "message6235" + }, + { + "key": "key235", + "message": "message6236" + }, + { + "key": "key236", + "message": "message6237" + }, + { + "key": "key237", + "message": "message6238" + }, + { + "key": "key238", + "message": "message6239" + }, + { + "key": "key239", + "message": "message6240" + }, + { + "key": "key240", + "message": "message6241" + }, + { + "key": "key241", + "message": "message6242" + }, + { + "key": "key242", + "message": "message6243" + }, + { + "key": "key243", + "message": "message6244" + }, + { + "key": "key244", + "message": "message6245" + }, + { + "key": "key245", + "message": "message6246" + }, + { + "key": "key246", + "message": "message6247" + }, + { + "key": "key247", + "message": "message6248" + }, + { + "key": "key248", + "message": "message6249" + }, + { + "key": "key249", + "message": "message6250" + }, + { + "key": "key250", + "message": "message6251" + }, + { + "key": "key251", + "message": "message6252" + }, + { + "key": "key252", + "message": "message6253" + }, + { + "key": "key253", + "message": "message6254" + }, + { + "key": "key254", + "message": "message6255" + }, + { + "key": "key255", + "message": "message6256" + }, + { + "key": "key256", + "message": "message6257" + }, + { + "key": "key257", + "message": "message6258" + }, + { + "key": "key258", + "message": "message6259" + }, + { + "key": "key259", + "message": "message6260" + }, + { + "key": "key260", + "message": "message6261" + }, + { + "key": "key261", + "message": "message6262" + }, + { + "key": "key262", + "message": "message6263" + }, + { + "key": "key263", + "message": "message6264" + }, + { + "key": "key264", + "message": "message6265" + }, + { + "key": "key265", + "message": "message6266" + }, + { + "key": "key266", + "message": "message6267" + }, + { + "key": "key267", + "message": "message6268" + }, + { + "key": "key268", + "message": "message6269" + }, + { + "key": "key269", + "message": "message6270" + }, + { + "key": "key270", + "message": "message6271" + }, + { + "key": "key271", + "message": "message6272" + }, + { + "key": "key272", + "message": "message6273" + }, + { + "key": "key273", + "message": "message6274" + }, + { + "key": "key274", + "message": "message6275" + }, + { + "key": "key275", + "message": "message6276" + }, + { + "key": "key276", + "message": "message6277" + }, + { + "key": "key277", + "message": "message6278" + }, + { + "key": "key278", + "message": "message6279" + }, + { + "key": "key279", + "message": "message6280" + }, + { + "key": "key280", + "message": "message6281" + }, + { + "key": "key281", + "message": "message6282" + }, + { + "key": "key282", + "message": "message6283" + }, + { + "key": "key283", + "message": "message6284" + }, + { + "key": "key284", + "message": "message6285" + }, + { + "key": "key285", + "message": "message6286" + }, + { + "key": "key286", + "message": "message6287" + }, + { + "key": "key287", + "message": "message6288" + }, + { + "key": "key288", + "message": "message6289" + }, + { + "key": "key289", + "message": "message6290" + }, + { + "key": "key290", + "message": "message6291" + }, + { + "key": "key291", + "message": "message6292" + }, + { + "key": "key292", + "message": "message6293" + }, + { + "key": "key293", + "message": "message6294" + }, + { + "key": "key294", + "message": "message6295" + }, + { + "key": "key295", + "message": "message6296" + }, + { + "key": "key296", + "message": "message6297" + }, + { + "key": "key297", + "message": "message6298" + }, + { + "key": "key298", + "message": "message6299" + }, + { + "key": "key299", + "message": "message6300" + }, + { + "key": "key300", + "message": "message6301" + }, + { + "key": "key301", + "message": "message6302" + }, + { + "key": "key302", + "message": "message6303" + }, + { + "key": "key303", + "message": "message6304" + }, + { + "key": "key304", + "message": "message6305" + }, + { + "key": "key305", + "message": "message6306" + }, + { + "key": "key306", + "message": "message6307" + }, + { + "key": "key307", + "message": "message6308" + }, + { + "key": "key308", + "message": "message6309" + }, + { + "key": "key309", + "message": "message6310" + }, + { + "key": "key310", + "message": "message6311" + }, + { + "key": "key311", + "message": "message6312" + }, + { + "key": "key312", + "message": "message6313" + }, + { + "key": "key313", + "message": "message6314" + }, + { + "key": "key314", + "message": "message6315" + }, + { + "key": "key315", + "message": "message6316" + }, + { + "key": "key316", + "message": "message6317" + }, + { + "key": "key317", + "message": "message6318" + }, + { + "key": "key318", + "message": "message6319" + }, + { + "key": "key319", + "message": "message6320" + }, + { + "key": "key320", + "message": "message6321" + }, + { + "key": "key321", + "message": "message6322" + }, + { + "key": "key322", + "message": "message6323" + }, + { + "key": "key323", + "message": "message6324" + }, + { + "key": "key324", + "message": "message6325" + }, + { + "key": "key325", + "message": "message6326" + }, + { + "key": "key326", + "message": "message6327" + }, + { + "key": "key327", + "message": "message6328" + }, + { + "key": "key328", + "message": "message6329" + }, + { + "key": "key329", + "message": "message6330" + }, + { + "key": "key330", + "message": "message6331" + }, + { + "key": "key331", + "message": "message6332" + }, + { + "key": "key332", + "message": "message6333" + }, + { + "key": "key333", + "message": "message6334" + }, + { + "key": "key334", + "message": "message6335" + }, + { + "key": "key335", + "message": "message6336" + }, + { + "key": "key336", + "message": "message6337" + }, + { + "key": "key337", + "message": "message6338" + }, + { + "key": "key338", + "message": "message6339" + }, + { + "key": "key339", + "message": "message6340" + }, + { + "key": "key340", + "message": "message6341" + }, + { + "key": "key341", + "message": "message6342" + }, + { + "key": "key342", + "message": "message6343" + }, + { + "key": "key343", + "message": "message6344" + }, + { + "key": "key344", + "message": "message6345" + }, + { + "key": "key345", + "message": "message6346" + }, + { + "key": "key346", + "message": "message6347" + }, + { + "key": "key347", + "message": "message6348" + }, + { + "key": "key348", + "message": "message6349" + }, + { + "key": "key349", + "message": "message6350" + }, + { + "key": "key350", + "message": "message6351" + }, + { + "key": "key351", + "message": "message6352" + }, + { + "key": "key352", + "message": "message6353" + }, + { + "key": "key353", + "message": "message6354" + }, + { + "key": "key354", + "message": "message6355" + }, + { + "key": "key355", + "message": "message6356" + }, + { + "key": "key356", + "message": "message6357" + }, + { + "key": "key357", + "message": "message6358" + }, + { + "key": "key358", + "message": "message6359" + }, + { + "key": "key359", + "message": "message6360" + }, + { + "key": "key360", + "message": "message6361" + }, + { + "key": "key361", + "message": "message6362" + }, + { + "key": "key362", + "message": "message6363" + }, + { + "key": "key363", + "message": "message6364" + }, + { + "key": "key364", + "message": "message6365" + }, + { + "key": "key365", + "message": "message6366" + }, + { + "key": "key366", + "message": "message6367" + }, + { + "key": "key367", + "message": "message6368" + }, + { + "key": "key368", + "message": "message6369" + }, + { + "key": "key369", + "message": "message6370" + }, + { + "key": "key370", + "message": "message6371" + }, + { + "key": "key371", + "message": "message6372" + }, + { + "key": "key372", + "message": "message6373" + }, + { + "key": "key373", + "message": "message6374" + }, + { + "key": "key374", + "message": "message6375" + }, + { + "key": "key375", + "message": "message6376" + }, + { + "key": "key376", + "message": "message6377" + }, + { + "key": "key377", + "message": "message6378" + }, + { + "key": "key378", + "message": "message6379" + }, + { + "key": "key379", + "message": "message6380" + }, + { + "key": "key380", + "message": "message6381" + }, + { + "key": "key381", + "message": "message6382" + }, + { + "key": "key382", + "message": "message6383" + }, + { + "key": "key383", + "message": "message6384" + }, + { + "key": "key384", + "message": "message6385" + }, + { + "key": "key385", + "message": "message6386" + }, + { + "key": "key386", + "message": "message6387" + }, + { + "key": "key387", + "message": "message6388" + }, + { + "key": "key388", + "message": "message6389" + }, + { + "key": "key389", + "message": "message6390" + }, + { + "key": "key390", + "message": "message6391" + }, + { + "key": "key391", + "message": "message6392" + }, + { + "key": "key392", + "message": "message6393" + }, + { + "key": "key393", + "message": "message6394" + }, + { + "key": "key394", + "message": "message6395" + }, + { + "key": "key395", + "message": "message6396" + }, + { + "key": "key396", + "message": "message6397" + }, + { + "key": "key397", + "message": "message6398" + }, + { + "key": "key398", + "message": "message6399" + }, + { + "key": "key399", + "message": "message6400" + }, + { + "key": "key400", + "message": "message6401" + }, + { + "key": "key401", + "message": "message6402" + }, + { + "key": "key402", + "message": "message6403" + }, + { + "key": "key403", + "message": "message6404" + }, + { + "key": "key404", + "message": "message6405" + }, + { + "key": "key405", + "message": "message6406" + }, + { + "key": "key406", + "message": "message6407" + }, + { + "key": "key407", + "message": "message6408" + }, + { + "key": "key408", + "message": "message6409" + }, + { + "key": "key409", + "message": "message6410" + }, + { + "key": "key410", + "message": "message6411" + }, + { + "key": "key411", + "message": "message6412" + }, + { + "key": "key412", + "message": "message6413" + }, + { + "key": "key413", + "message": "message6414" + }, + { + "key": "key414", + "message": "message6415" + }, + { + "key": "key415", + "message": "message6416" + }, + { + "key": "key416", + "message": "message6417" + }, + { + "key": "key417", + "message": "message6418" + }, + { + "key": "key418", + "message": "message6419" + }, + { + "key": "key419", + "message": "message6420" + }, + { + "key": "key420", + "message": "message6421" + }, + { + "key": "key421", + "message": "message6422" + }, + { + "key": "key422", + "message": "message6423" + }, + { + "key": "key423", + "message": "message6424" + }, + { + "key": "key424", + "message": "message6425" + }, + { + "key": "key425", + "message": "message6426" + }, + { + "key": "key426", + "message": "message6427" + }, + { + "key": "key427", + "message": "message6428" + }, + { + "key": "key428", + "message": "message6429" + }, + { + "key": "key429", + "message": "message6430" + }, + { + "key": "key430", + "message": "message6431" + }, + { + "key": "key431", + "message": "message6432" + }, + { + "key": "key432", + "message": "message6433" + }, + { + "key": "key433", + "message": "message6434" + }, + { + "key": "key434", + "message": "message6435" + }, + { + "key": "key435", + "message": "message6436" + }, + { + "key": "key436", + "message": "message6437" + }, + { + "key": "key437", + "message": "message6438" + }, + { + "key": "key438", + "message": "message6439" + }, + { + "key": "key439", + "message": "message6440" + }, + { + "key": "key440", + "message": "message6441" + }, + { + "key": "key441", + "message": "message6442" + }, + { + "key": "key442", + "message": "message6443" + }, + { + "key": "key443", + "message": "message6444" + }, + { + "key": "key444", + "message": "message6445" + }, + { + "key": "key445", + "message": "message6446" + }, + { + "key": "key446", + "message": "message6447" + }, + { + "key": "key447", + "message": "message6448" + }, + { + "key": "key448", + "message": "message6449" + }, + { + "key": "key449", + "message": "message6450" + }, + { + "key": "key450", + "message": "message6451" + }, + { + "key": "key451", + "message": "message6452" + }, + { + "key": "key452", + "message": "message6453" + }, + { + "key": "key453", + "message": "message6454" + }, + { + "key": "key454", + "message": "message6455" + }, + { + "key": "key455", + "message": "message6456" + }, + { + "key": "key456", + "message": "message6457" + }, + { + "key": "key457", + "message": "message6458" + }, + { + "key": "key458", + "message": "message6459" + }, + { + "key": "key459", + "message": "message6460" + }, + { + "key": "key460", + "message": "message6461" + }, + { + "key": "key461", + "message": "message6462" + }, + { + "key": "key462", + "message": "message6463" + }, + { + "key": "key463", + "message": "message6464" + }, + { + "key": "key464", + "message": "message6465" + }, + { + "key": "key465", + "message": "message6466" + }, + { + "key": "key466", + "message": "message6467" + }, + { + "key": "key467", + "message": "message6468" + }, + { + "key": "key468", + "message": "message6469" + }, + { + "key": "key469", + "message": "message6470" + }, + { + "key": "key470", + "message": "message6471" + }, + { + "key": "key471", + "message": "message6472" + }, + { + "key": "key472", + "message": "message6473" + }, + { + "key": "key473", + "message": "message6474" + }, + { + "key": "key474", + "message": "message6475" + }, + { + "key": "key475", + "message": "message6476" + }, + { + "key": "key476", + "message": "message6477" + }, + { + "key": "key477", + "message": "message6478" + }, + { + "key": "key478", + "message": "message6479" + }, + { + "key": "key479", + "message": "message6480" + }, + { + "key": "key480", + "message": "message6481" + }, + { + "key": "key481", + "message": "message6482" + }, + { + "key": "key482", + "message": "message6483" + }, + { + "key": "key483", + "message": "message6484" + }, + { + "key": "key484", + "message": "message6485" + }, + { + "key": "key485", + "message": "message6486" + }, + { + "key": "key486", + "message": "message6487" + }, + { + "key": "key487", + "message": "message6488" + }, + { + "key": "key488", + "message": "message6489" + }, + { + "key": "key489", + "message": "message6490" + }, + { + "key": "key490", + "message": "message6491" + }, + { + "key": "key491", + "message": "message6492" + }, + { + "key": "key492", + "message": "message6493" + }, + { + "key": "key493", + "message": "message6494" + }, + { + "key": "key494", + "message": "message6495" + }, + { + "key": "key495", + "message": "message6496" + }, + { + "key": "key496", + "message": "message6497" + }, + { + "key": "key497", + "message": "message6498" + }, + { + "key": "key498", + "message": "message6499" + }, + { + "key": "key499", + "message": "message6500" + }, + { + "key": "key500", + "message": "message6501" + }, + { + "key": "key501", + "message": "message6502" + }, + { + "key": "key502", + "message": "message6503" + }, + { + "key": "key503", + "message": "message6504" + }, + { + "key": "key504", + "message": "message6505" + }, + { + "key": "key505", + "message": "message6506" + }, + { + "key": "key506", + "message": "message6507" + }, + { + "key": "key507", + "message": "message6508" + }, + { + "key": "key508", + "message": "message6509" + }, + { + "key": "key509", + "message": "message6510" + }, + { + "key": "key510", + "message": "message6511" + }, + { + "key": "key511", + "message": "message6512" + }, + { + "key": "key512", + "message": "message6513" + }, + { + "key": "key513", + "message": "message6514" + }, + { + "key": "key514", + "message": "message6515" + }, + { + "key": "key515", + "message": "message6516" + }, + { + "key": "key516", + "message": "message6517" + }, + { + "key": "key517", + "message": "message6518" + }, + { + "key": "key518", + "message": "message6519" + }, + { + "key": "key519", + "message": "message6520" + }, + { + "key": "key520", + "message": "message6521" + }, + { + "key": "key521", + "message": "message6522" + }, + { + "key": "key522", + "message": "message6523" + }, + { + "key": "key523", + "message": "message6524" + }, + { + "key": "key524", + "message": "message6525" + }, + { + "key": "key525", + "message": "message6526" + }, + { + "key": "key526", + "message": "message6527" + }, + { + "key": "key527", + "message": "message6528" + }, + { + "key": "key528", + "message": "message6529" + }, + { + "key": "key529", + "message": "message6530" + }, + { + "key": "key530", + "message": "message6531" + }, + { + "key": "key531", + "message": "message6532" + }, + { + "key": "key532", + "message": "message6533" + }, + { + "key": "key533", + "message": "message6534" + }, + { + "key": "key534", + "message": "message6535" + }, + { + "key": "key535", + "message": "message6536" + }, + { + "key": "key536", + "message": "message6537" + }, + { + "key": "key537", + "message": "message6538" + }, + { + "key": "key538", + "message": "message6539" + }, + { + "key": "key539", + "message": "message6540" + }, + { + "key": "key540", + "message": "message6541" + }, + { + "key": "key541", + "message": "message6542" + }, + { + "key": "key542", + "message": "message6543" + }, + { + "key": "key543", + "message": "message6544" + }, + { + "key": "key544", + "message": "message6545" + }, + { + "key": "key545", + "message": "message6546" + }, + { + "key": "key546", + "message": "message6547" + }, + { + "key": "key547", + "message": "message6548" + }, + { + "key": "key548", + "message": "message6549" + }, + { + "key": "key549", + "message": "message6550" + }, + { + "key": "key550", + "message": "message6551" + }, + { + "key": "key551", + "message": "message6552" + }, + { + "key": "key552", + "message": "message6553" + }, + { + "key": "key553", + "message": "message6554" + }, + { + "key": "key554", + "message": "message6555" + }, + { + "key": "key555", + "message": "message6556" + }, + { + "key": "key556", + "message": "message6557" + }, + { + "key": "key557", + "message": "message6558" + }, + { + "key": "key558", + "message": "message6559" + }, + { + "key": "key559", + "message": "message6560" + }, + { + "key": "key560", + "message": "message6561" + }, + { + "key": "key561", + "message": "message6562" + }, + { + "key": "key562", + "message": "message6563" + }, + { + "key": "key563", + "message": "message6564" + }, + { + "key": "key564", + "message": "message6565" + }, + { + "key": "key565", + "message": "message6566" + }, + { + "key": "key566", + "message": "message6567" + }, + { + "key": "key567", + "message": "message6568" + }, + { + "key": "key568", + "message": "message6569" + }, + { + "key": "key569", + "message": "message6570" + }, + { + "key": "key570", + "message": "message6571" + }, + { + "key": "key571", + "message": "message6572" + }, + { + "key": "key572", + "message": "message6573" + }, + { + "key": "key573", + "message": "message6574" + }, + { + "key": "key574", + "message": "message6575" + }, + { + "key": "key575", + "message": "message6576" + }, + { + "key": "key576", + "message": "message6577" + }, + { + "key": "key577", + "message": "message6578" + }, + { + "key": "key578", + "message": "message6579" + }, + { + "key": "key579", + "message": "message6580" + }, + { + "key": "key580", + "message": "message6581" + }, + { + "key": "key581", + "message": "message6582" + }, + { + "key": "key582", + "message": "message6583" + }, + { + "key": "key583", + "message": "message6584" + }, + { + "key": "key584", + "message": "message6585" + }, + { + "key": "key585", + "message": "message6586" + }, + { + "key": "key586", + "message": "message6587" + }, + { + "key": "key587", + "message": "message6588" + }, + { + "key": "key588", + "message": "message6589" + }, + { + "key": "key589", + "message": "message6590" + }, + { + "key": "key590", + "message": "message6591" + }, + { + "key": "key591", + "message": "message6592" + }, + { + "key": "key592", + "message": "message6593" + }, + { + "key": "key593", + "message": "message6594" + }, + { + "key": "key594", + "message": "message6595" + }, + { + "key": "key595", + "message": "message6596" + }, + { + "key": "key596", + "message": "message6597" + }, + { + "key": "key597", + "message": "message6598" + }, + { + "key": "key598", + "message": "message6599" + }, + { + "key": "key599", + "message": "message6600" + }, + { + "key": "key600", + "message": "message6601" + }, + { + "key": "key601", + "message": "message6602" + }, + { + "key": "key602", + "message": "message6603" + }, + { + "key": "key603", + "message": "message6604" + }, + { + "key": "key604", + "message": "message6605" + }, + { + "key": "key605", + "message": "message6606" + }, + { + "key": "key606", + "message": "message6607" + }, + { + "key": "key607", + "message": "message6608" + }, + { + "key": "key608", + "message": "message6609" + }, + { + "key": "key609", + "message": "message6610" + }, + { + "key": "key610", + "message": "message6611" + }, + { + "key": "key611", + "message": "message6612" + }, + { + "key": "key612", + "message": "message6613" + }, + { + "key": "key613", + "message": "message6614" + }, + { + "key": "key614", + "message": "message6615" + }, + { + "key": "key615", + "message": "message6616" + }, + { + "key": "key616", + "message": "message6617" + }, + { + "key": "key617", + "message": "message6618" + }, + { + "key": "key618", + "message": "message6619" + }, + { + "key": "key619", + "message": "message6620" + }, + { + "key": "key620", + "message": "message6621" + }, + { + "key": "key621", + "message": "message6622" + }, + { + "key": "key622", + "message": "message6623" + }, + { + "key": "key623", + "message": "message6624" + }, + { + "key": "key624", + "message": "message6625" + }, + { + "key": "key625", + "message": "message6626" + }, + { + "key": "key626", + "message": "message6627" + }, + { + "key": "key627", + "message": "message6628" + }, + { + "key": "key628", + "message": "message6629" + }, + { + "key": "key629", + "message": "message6630" + }, + { + "key": "key630", + "message": "message6631" + }, + { + "key": "key631", + "message": "message6632" + }, + { + "key": "key632", + "message": "message6633" + }, + { + "key": "key633", + "message": "message6634" + }, + { + "key": "key634", + "message": "message6635" + }, + { + "key": "key635", + "message": "message6636" + }, + { + "key": "key636", + "message": "message6637" + }, + { + "key": "key637", + "message": "message6638" + }, + { + "key": "key638", + "message": "message6639" + }, + { + "key": "key639", + "message": "message6640" + }, + { + "key": "key640", + "message": "message6641" + }, + { + "key": "key641", + "message": "message6642" + }, + { + "key": "key642", + "message": "message6643" + }, + { + "key": "key643", + "message": "message6644" + }, + { + "key": "key644", + "message": "message6645" + }, + { + "key": "key645", + "message": "message6646" + }, + { + "key": "key646", + "message": "message6647" + }, + { + "key": "key647", + "message": "message6648" + }, + { + "key": "key648", + "message": "message6649" + }, + { + "key": "key649", + "message": "message6650" + }, + { + "key": "key650", + "message": "message6651" + }, + { + "key": "key651", + "message": "message6652" + }, + { + "key": "key652", + "message": "message6653" + }, + { + "key": "key653", + "message": "message6654" + }, + { + "key": "key654", + "message": "message6655" + }, + { + "key": "key655", + "message": "message6656" + }, + { + "key": "key656", + "message": "message6657" + }, + { + "key": "key657", + "message": "message6658" + }, + { + "key": "key658", + "message": "message6659" + }, + { + "key": "key659", + "message": "message6660" + }, + { + "key": "key660", + "message": "message6661" + }, + { + "key": "key661", + "message": "message6662" + }, + { + "key": "key662", + "message": "message6663" + }, + { + "key": "key663", + "message": "message6664" + }, + { + "key": "key664", + "message": "message6665" + }, + { + "key": "key665", + "message": "message6666" + }, + { + "key": "key666", + "message": "message6667" + }, + { + "key": "key667", + "message": "message6668" + }, + { + "key": "key668", + "message": "message6669" + }, + { + "key": "key669", + "message": "message6670" + }, + { + "key": "key670", + "message": "message6671" + }, + { + "key": "key671", + "message": "message6672" + }, + { + "key": "key672", + "message": "message6673" + }, + { + "key": "key673", + "message": "message6674" + }, + { + "key": "key674", + "message": "message6675" + }, + { + "key": "key675", + "message": "message6676" + }, + { + "key": "key676", + "message": "message6677" + }, + { + "key": "key677", + "message": "message6678" + }, + { + "key": "key678", + "message": "message6679" + }, + { + "key": "key679", + "message": "message6680" + }, + { + "key": "key680", + "message": "message6681" + }, + { + "key": "key681", + "message": "message6682" + }, + { + "key": "key682", + "message": "message6683" + }, + { + "key": "key683", + "message": "message6684" + }, + { + "key": "key684", + "message": "message6685" + }, + { + "key": "key685", + "message": "message6686" + }, + { + "key": "key686", + "message": "message6687" + }, + { + "key": "key687", + "message": "message6688" + }, + { + "key": "key688", + "message": "message6689" + }, + { + "key": "key689", + "message": "message6690" + }, + { + "key": "key690", + "message": "message6691" + }, + { + "key": "key691", + "message": "message6692" + }, + { + "key": "key692", + "message": "message6693" + }, + { + "key": "key693", + "message": "message6694" + }, + { + "key": "key694", + "message": "message6695" + }, + { + "key": "key695", + "message": "message6696" + }, + { + "key": "key696", + "message": "message6697" + }, + { + "key": "key697", + "message": "message6698" + }, + { + "key": "key698", + "message": "message6699" + }, + { + "key": "key699", + "message": "message6700" + }, + { + "key": "key700", + "message": "message6701" + }, + { + "key": "key701", + "message": "message6702" + }, + { + "key": "key702", + "message": "message6703" + }, + { + "key": "key703", + "message": "message6704" + }, + { + "key": "key704", + "message": "message6705" + }, + { + "key": "key705", + "message": "message6706" + }, + { + "key": "key706", + "message": "message6707" + }, + { + "key": "key707", + "message": "message6708" + }, + { + "key": "key708", + "message": "message6709" + }, + { + "key": "key709", + "message": "message6710" + }, + { + "key": "key710", + "message": "message6711" + }, + { + "key": "key711", + "message": "message6712" + }, + { + "key": "key712", + "message": "message6713" + }, + { + "key": "key713", + "message": "message6714" + }, + { + "key": "key714", + "message": "message6715" + }, + { + "key": "key715", + "message": "message6716" + }, + { + "key": "key716", + "message": "message6717" + }, + { + "key": "key717", + "message": "message6718" + }, + { + "key": "key718", + "message": "message6719" + }, + { + "key": "key719", + "message": "message6720" + }, + { + "key": "key720", + "message": "message6721" + }, + { + "key": "key721", + "message": "message6722" + }, + { + "key": "key722", + "message": "message6723" + }, + { + "key": "key723", + "message": "message6724" + }, + { + "key": "key724", + "message": "message6725" + }, + { + "key": "key725", + "message": "message6726" + }, + { + "key": "key726", + "message": "message6727" + }, + { + "key": "key727", + "message": "message6728" + }, + { + "key": "key728", + "message": "message6729" + }, + { + "key": "key729", + "message": "message6730" + }, + { + "key": "key730", + "message": "message6731" + }, + { + "key": "key731", + "message": "message6732" + }, + { + "key": "key732", + "message": "message6733" + }, + { + "key": "key733", + "message": "message6734" + }, + { + "key": "key734", + "message": "message6735" + }, + { + "key": "key735", + "message": "message6736" + }, + { + "key": "key736", + "message": "message6737" + }, + { + "key": "key737", + "message": "message6738" + }, + { + "key": "key738", + "message": "message6739" + }, + { + "key": "key739", + "message": "message6740" + }, + { + "key": "key740", + "message": "message6741" + }, + { + "key": "key741", + "message": "message6742" + }, + { + "key": "key742", + "message": "message6743" + }, + { + "key": "key743", + "message": "message6744" + }, + { + "key": "key744", + "message": "message6745" + }, + { + "key": "key745", + "message": "message6746" + }, + { + "key": "key746", + "message": "message6747" + }, + { + "key": "key747", + "message": "message6748" + }, + { + "key": "key748", + "message": "message6749" + }, + { + "key": "key749", + "message": "message6750" + }, + { + "key": "key750", + "message": "message6751" + }, + { + "key": "key751", + "message": "message6752" + }, + { + "key": "key752", + "message": "message6753" + }, + { + "key": "key753", + "message": "message6754" + }, + { + "key": "key754", + "message": "message6755" + }, + { + "key": "key755", + "message": "message6756" + }, + { + "key": "key756", + "message": "message6757" + }, + { + "key": "key757", + "message": "message6758" + }, + { + "key": "key758", + "message": "message6759" + }, + { + "key": "key759", + "message": "message6760" + }, + { + "key": "key760", + "message": "message6761" + }, + { + "key": "key761", + "message": "message6762" + }, + { + "key": "key762", + "message": "message6763" + }, + { + "key": "key763", + "message": "message6764" + }, + { + "key": "key764", + "message": "message6765" + }, + { + "key": "key765", + "message": "message6766" + }, + { + "key": "key766", + "message": "message6767" + }, + { + "key": "key767", + "message": "message6768" + }, + { + "key": "key768", + "message": "message6769" + }, + { + "key": "key769", + "message": "message6770" + }, + { + "key": "key770", + "message": "message6771" + }, + { + "key": "key771", + "message": "message6772" + }, + { + "key": "key772", + "message": "message6773" + }, + { + "key": "key773", + "message": "message6774" + }, + { + "key": "key774", + "message": "message6775" + }, + { + "key": "key775", + "message": "message6776" + }, + { + "key": "key776", + "message": "message6777" + }, + { + "key": "key777", + "message": "message6778" + }, + { + "key": "key778", + "message": "message6779" + }, + { + "key": "key779", + "message": "message6780" + }, + { + "key": "key780", + "message": "message6781" + }, + { + "key": "key781", + "message": "message6782" + }, + { + "key": "key782", + "message": "message6783" + }, + { + "key": "key783", + "message": "message6784" + }, + { + "key": "key784", + "message": "message6785" + }, + { + "key": "key785", + "message": "message6786" + }, + { + "key": "key786", + "message": "message6787" + }, + { + "key": "key787", + "message": "message6788" + }, + { + "key": "key788", + "message": "message6789" + }, + { + "key": "key789", + "message": "message6790" + }, + { + "key": "key790", + "message": "message6791" + }, + { + "key": "key791", + "message": "message6792" + }, + { + "key": "key792", + "message": "message6793" + }, + { + "key": "key793", + "message": "message6794" + }, + { + "key": "key794", + "message": "message6795" + }, + { + "key": "key795", + "message": "message6796" + }, + { + "key": "key796", + "message": "message6797" + }, + { + "key": "key797", + "message": "message6798" + }, + { + "key": "key798", + "message": "message6799" + }, + { + "key": "key799", + "message": "message6800" + }, + { + "key": "key800", + "message": "message6801" + }, + { + "key": "key801", + "message": "message6802" + }, + { + "key": "key802", + "message": "message6803" + }, + { + "key": "key803", + "message": "message6804" + }, + { + "key": "key804", + "message": "message6805" + }, + { + "key": "key805", + "message": "message6806" + }, + { + "key": "key806", + "message": "message6807" + }, + { + "key": "key807", + "message": "message6808" + }, + { + "key": "key808", + "message": "message6809" + }, + { + "key": "key809", + "message": "message6810" + }, + { + "key": "key810", + "message": "message6811" + }, + { + "key": "key811", + "message": "message6812" + }, + { + "key": "key812", + "message": "message6813" + }, + { + "key": "key813", + "message": "message6814" + }, + { + "key": "key814", + "message": "message6815" + }, + { + "key": "key815", + "message": "message6816" + }, + { + "key": "key816", + "message": "message6817" + }, + { + "key": "key817", + "message": "message6818" + }, + { + "key": "key818", + "message": "message6819" + }, + { + "key": "key819", + "message": "message6820" + }, + { + "key": "key820", + "message": "message6821" + }, + { + "key": "key821", + "message": "message6822" + }, + { + "key": "key822", + "message": "message6823" + }, + { + "key": "key823", + "message": "message6824" + }, + { + "key": "key824", + "message": "message6825" + }, + { + "key": "key825", + "message": "message6826" + }, + { + "key": "key826", + "message": "message6827" + }, + { + "key": "key827", + "message": "message6828" + }, + { + "key": "key828", + "message": "message6829" + }, + { + "key": "key829", + "message": "message6830" + }, + { + "key": "key830", + "message": "message6831" + }, + { + "key": "key831", + "message": "message6832" + }, + { + "key": "key832", + "message": "message6833" + }, + { + "key": "key833", + "message": "message6834" + }, + { + "key": "key834", + "message": "message6835" + }, + { + "key": "key835", + "message": "message6836" + }, + { + "key": "key836", + "message": "message6837" + }, + { + "key": "key837", + "message": "message6838" + }, + { + "key": "key838", + "message": "message6839" + }, + { + "key": "key839", + "message": "message6840" + }, + { + "key": "key840", + "message": "message6841" + }, + { + "key": "key841", + "message": "message6842" + }, + { + "key": "key842", + "message": "message6843" + }, + { + "key": "key843", + "message": "message6844" + }, + { + "key": "key844", + "message": "message6845" + }, + { + "key": "key845", + "message": "message6846" + }, + { + "key": "key846", + "message": "message6847" + }, + { + "key": "key847", + "message": "message6848" + }, + { + "key": "key848", + "message": "message6849" + }, + { + "key": "key849", + "message": "message6850" + }, + { + "key": "key850", + "message": "message6851" + }, + { + "key": "key851", + "message": "message6852" + }, + { + "key": "key852", + "message": "message6853" + }, + { + "key": "key853", + "message": "message6854" + }, + { + "key": "key854", + "message": "message6855" + }, + { + "key": "key855", + "message": "message6856" + }, + { + "key": "key856", + "message": "message6857" + }, + { + "key": "key857", + "message": "message6858" + }, + { + "key": "key858", + "message": "message6859" + }, + { + "key": "key859", + "message": "message6860" + }, + { + "key": "key860", + "message": "message6861" + }, + { + "key": "key861", + "message": "message6862" + }, + { + "key": "key862", + "message": "message6863" + }, + { + "key": "key863", + "message": "message6864" + }, + { + "key": "key864", + "message": "message6865" + }, + { + "key": "key865", + "message": "message6866" + }, + { + "key": "key866", + "message": "message6867" + }, + { + "key": "key867", + "message": "message6868" + }, + { + "key": "key868", + "message": "message6869" + }, + { + "key": "key869", + "message": "message6870" + }, + { + "key": "key870", + "message": "message6871" + }, + { + "key": "key871", + "message": "message6872" + }, + { + "key": "key872", + "message": "message6873" + }, + { + "key": "key873", + "message": "message6874" + }, + { + "key": "key874", + "message": "message6875" + }, + { + "key": "key875", + "message": "message6876" + }, + { + "key": "key876", + "message": "message6877" + }, + { + "key": "key877", + "message": "message6878" + }, + { + "key": "key878", + "message": "message6879" + }, + { + "key": "key879", + "message": "message6880" + }, + { + "key": "key880", + "message": "message6881" + }, + { + "key": "key881", + "message": "message6882" + }, + { + "key": "key882", + "message": "message6883" + }, + { + "key": "key883", + "message": "message6884" + }, + { + "key": "key884", + "message": "message6885" + }, + { + "key": "key885", + "message": "message6886" + }, + { + "key": "key886", + "message": "message6887" + }, + { + "key": "key887", + "message": "message6888" + }, + { + "key": "key888", + "message": "message6889" + }, + { + "key": "key889", + "message": "message6890" + }, + { + "key": "key890", + "message": "message6891" + }, + { + "key": "key891", + "message": "message6892" + }, + { + "key": "key892", + "message": "message6893" + }, + { + "key": "key893", + "message": "message6894" + }, + { + "key": "key894", + "message": "message6895" + }, + { + "key": "key895", + "message": "message6896" + }, + { + "key": "key896", + "message": "message6897" + }, + { + "key": "key897", + "message": "message6898" + }, + { + "key": "key898", + "message": "message6899" + }, + { + "key": "key899", + "message": "message6900" + }, + { + "key": "key900", + "message": "message6901" + }, + { + "key": "key901", + "message": "message6902" + }, + { + "key": "key902", + "message": "message6903" + }, + { + "key": "key903", + "message": "message6904" + }, + { + "key": "key904", + "message": "message6905" + }, + { + "key": "key905", + "message": "message6906" + }, + { + "key": "key906", + "message": "message6907" + }, + { + "key": "key907", + "message": "message6908" + }, + { + "key": "key908", + "message": "message6909" + }, + { + "key": "key909", + "message": "message6910" + }, + { + "key": "key910", + "message": "message6911" + }, + { + "key": "key911", + "message": "message6912" + }, + { + "key": "key912", + "message": "message6913" + }, + { + "key": "key913", + "message": "message6914" + }, + { + "key": "key914", + "message": "message6915" + }, + { + "key": "key915", + "message": "message6916" + }, + { + "key": "key916", + "message": "message6917" + }, + { + "key": "key917", + "message": "message6918" + }, + { + "key": "key918", + "message": "message6919" + }, + { + "key": "key919", + "message": "message6920" + }, + { + "key": "key920", + "message": "message6921" + }, + { + "key": "key921", + "message": "message6922" + }, + { + "key": "key922", + "message": "message6923" + }, + { + "key": "key923", + "message": "message6924" + }, + { + "key": "key924", + "message": "message6925" + }, + { + "key": "key925", + "message": "message6926" + }, + { + "key": "key926", + "message": "message6927" + }, + { + "key": "key927", + "message": "message6928" + }, + { + "key": "key928", + "message": "message6929" + }, + { + "key": "key929", + "message": "message6930" + }, + { + "key": "key930", + "message": "message6931" + }, + { + "key": "key931", + "message": "message6932" + }, + { + "key": "key932", + "message": "message6933" + }, + { + "key": "key933", + "message": "message6934" + }, + { + "key": "key934", + "message": "message6935" + }, + { + "key": "key935", + "message": "message6936" + }, + { + "key": "key936", + "message": "message6937" + }, + { + "key": "key937", + "message": "message6938" + }, + { + "key": "key938", + "message": "message6939" + }, + { + "key": "key939", + "message": "message6940" + }, + { + "key": "key940", + "message": "message6941" + }, + { + "key": "key941", + "message": "message6942" + }, + { + "key": "key942", + "message": "message6943" + }, + { + "key": "key943", + "message": "message6944" + }, + { + "key": "key944", + "message": "message6945" + }, + { + "key": "key945", + "message": "message6946" + }, + { + "key": "key946", + "message": "message6947" + }, + { + "key": "key947", + "message": "message6948" + }, + { + "key": "key948", + "message": "message6949" + }, + { + "key": "key949", + "message": "message6950" + }, + { + "key": "key950", + "message": "message6951" + }, + { + "key": "key951", + "message": "message6952" + }, + { + "key": "key952", + "message": "message6953" + }, + { + "key": "key953", + "message": "message6954" + }, + { + "key": "key954", + "message": "message6955" + }, + { + "key": "key955", + "message": "message6956" + }, + { + "key": "key956", + "message": "message6957" + }, + { + "key": "key957", + "message": "message6958" + }, + { + "key": "key958", + "message": "message6959" + }, + { + "key": "key959", + "message": "message6960" + }, + { + "key": "key960", + "message": "message6961" + }, + { + "key": "key961", + "message": "message6962" + }, + { + "key": "key962", + "message": "message6963" + }, + { + "key": "key963", + "message": "message6964" + }, + { + "key": "key964", + "message": "message6965" + }, + { + "key": "key965", + "message": "message6966" + }, + { + "key": "key966", + "message": "message6967" + }, + { + "key": "key967", + "message": "message6968" + }, + { + "key": "key968", + "message": "message6969" + }, + { + "key": "key969", + "message": "message6970" + }, + { + "key": "key970", + "message": "message6971" + }, + { + "key": "key971", + "message": "message6972" + }, + { + "key": "key972", + "message": "message6973" + }, + { + "key": "key973", + "message": "message6974" + }, + { + "key": "key974", + "message": "message6975" + }, + { + "key": "key975", + "message": "message6976" + }, + { + "key": "key976", + "message": "message6977" + }, + { + "key": "key977", + "message": "message6978" + }, + { + "key": "key978", + "message": "message6979" + }, + { + "key": "key979", + "message": "message6980" + }, + { + "key": "key980", + "message": "message6981" + }, + { + "key": "key981", + "message": "message6982" + }, + { + "key": "key982", + "message": "message6983" + }, + { + "key": "key983", + "message": "message6984" + }, + { + "key": "key984", + "message": "message6985" + }, + { + "key": "key985", + "message": "message6986" + }, + { + "key": "key986", + "message": "message6987" + }, + { + "key": "key987", + "message": "message6988" + }, + { + "key": "key988", + "message": "message6989" + }, + { + "key": "key989", + "message": "message6990" + }, + { + "key": "key990", + "message": "message6991" + }, + { + "key": "key991", + "message": "message6992" + }, + { + "key": "key992", + "message": "message6993" + }, + { + "key": "key993", + "message": "message6994" + }, + { + "key": "key994", + "message": "message6995" + }, + { + "key": "key995", + "message": "message6996" + }, + { + "key": "key996", + "message": "message6997" + }, + { + "key": "key997", + "message": "message6998" + }, + { + "key": "key998", + "message": "message6999" + }, + { + "key": "key999", + "message": "message7000" + }, + { + "key": "key1000", + "message": "message7001" + }, + { + "key": "key1001", + "message": "message7002" + }, + { + "key": "key1002", + "message": "message7003" + }, + { + "key": "key1003", + "message": "message7004" + }, + { + "key": "key1004", + "message": "message7005" + }, + { + "key": "key1005", + "message": "message7006" + }, + { + "key": "key1006", + "message": "message7007" + }, + { + "key": "key1007", + "message": "message7008" + }, + { + "key": "key1008", + "message": "message7009" + }, + { + "key": "key1009", + "message": "message7010" + }, + { + "key": "key1010", + "message": "message7011" + }, + { + "key": "key1011", + "message": "message7012" + }, + { + "key": "key1012", + "message": "message7013" + }, + { + "key": "key1013", + "message": "message7014" + }, + { + "key": "key1014", + "message": "message7015" + }, + { + "key": "key1015", + "message": "message7016" + }, + { + "key": "key1016", + "message": "message7017" + }, + { + "key": "key1017", + "message": "message7018" + }, + { + "key": "key1018", + "message": "message7019" + }, + { + "key": "key1019", + "message": "message7020" + }, + { + "key": "key1020", + "message": "message7021" + }, + { + "key": "key1021", + "message": "message7022" + }, + { + "key": "key1022", + "message": "message7023" + }, + { + "key": "key1023", + "message": "message7024" + }, + { + "key": "key1024", + "message": "message7025" + }, + { + "key": "key1025", + "message": "message7026" + }, + { + "key": "key1026", + "message": "message7027" + }, + { + "key": "key1027", + "message": "message7028" + }, + { + "key": "key1028", + "message": "message7029" + }, + { + "key": "key1029", + "message": "message7030" + }, + { + "key": "key1030", + "message": "message7031" + }, + { + "key": "key1031", + "message": "message7032" + }, + { + "key": "key1032", + "message": "message7033" + }, + { + "key": "key1033", + "message": "message7034" + }, + { + "key": "key1034", + "message": "message7035" + }, + { + "key": "key1035", + "message": "message7036" + }, + { + "key": "key1036", + "message": "message7037" + }, + { + "key": "key1037", + "message": "message7038" + }, + { + "key": "key1038", + "message": "message7039" + }, + { + "key": "key1039", + "message": "message7040" + }, + { + "key": "key1040", + "message": "message7041" + }, + { + "key": "key1041", + "message": "message7042" + }, + { + "key": "key1042", + "message": "message7043" + }, + { + "key": "key1043", + "message": "message7044" + }, + { + "key": "key1044", + "message": "message7045" + }, + { + "key": "key1045", + "message": "message7046" + }, + { + "key": "key1046", + "message": "message7047" + }, + { + "key": "key1047", + "message": "message7048" + }, + { + "key": "key1048", + "message": "message7049" + }, + { + "key": "key1049", + "message": "message7050" + }, + { + "key": "key1050", + "message": "message7051" + }, + { + "key": "key1051", + "message": "message7052" + }, + { + "key": "key1052", + "message": "message7053" + }, + { + "key": "key1053", + "message": "message7054" + }, + { + "key": "key1054", + "message": "message7055" + }, + { + "key": "key1055", + "message": "message7056" + }, + { + "key": "key1056", + "message": "message7057" + }, + { + "key": "key1057", + "message": "message7058" + }, + { + "key": "key1058", + "message": "message7059" + }, + { + "key": "key1059", + "message": "message7060" + }, + { + "key": "key1060", + "message": "message7061" + }, + { + "key": "key1061", + "message": "message7062" + }, + { + "key": "key1062", + "message": "message7063" + }, + { + "key": "key1063", + "message": "message7064" + }, + { + "key": "key1064", + "message": "message7065" + }, + { + "key": "key1065", + "message": "message7066" + }, + { + "key": "key1066", + "message": "message7067" + }, + { + "key": "key1067", + "message": "message7068" + }, + { + "key": "key1068", + "message": "message7069" + }, + { + "key": "key1069", + "message": "message7070" + }, + { + "key": "key1070", + "message": "message7071" + }, + { + "key": "key1071", + "message": "message7072" + }, + { + "key": "key1072", + "message": "message7073" + }, + { + "key": "key1073", + "message": "message7074" + }, + { + "key": "key1074", + "message": "message7075" + }, + { + "key": "key1075", + "message": "message7076" + }, + { + "key": "key1076", + "message": "message7077" + }, + { + "key": "key1077", + "message": "message7078" + }, + { + "key": "key1078", + "message": "message7079" + }, + { + "key": "key1079", + "message": "message7080" + }, + { + "key": "key1080", + "message": "message7081" + }, + { + "key": "key1081", + "message": "message7082" + }, + { + "key": "key1082", + "message": "message7083" + }, + { + "key": "key1083", + "message": "message7084" + }, + { + "key": "key1084", + "message": "message7085" + }, + { + "key": "key1085", + "message": "message7086" + }, + { + "key": "key1086", + "message": "message7087" + }, + { + "key": "key1087", + "message": "message7088" + }, + { + "key": "key1088", + "message": "message7089" + }, + { + "key": "key1089", + "message": "message7090" + }, + { + "key": "key1090", + "message": "message7091" + }, + { + "key": "key1091", + "message": "message7092" + }, + { + "key": "key1092", + "message": "message7093" + }, + { + "key": "key1093", + "message": "message7094" + }, + { + "key": "key1094", + "message": "message7095" + }, + { + "key": "key1095", + "message": "message7096" + }, + { + "key": "key1096", + "message": "message7097" + }, + { + "key": "key1097", + "message": "message7098" + }, + { + "key": "key1098", + "message": "message7099" + }, + { + "key": "key1099", + "message": "message7100" + }, + { + "key": "key1100", + "message": "message7101" + }, + { + "key": "key1101", + "message": "message7102" + }, + { + "key": "key1102", + "message": "message7103" + }, + { + "key": "key1103", + "message": "message7104" + }, + { + "key": "key1104", + "message": "message7105" + }, + { + "key": "key1105", + "message": "message7106" + }, + { + "key": "key1106", + "message": "message7107" + }, + { + "key": "key1107", + "message": "message7108" + }, + { + "key": "key1108", + "message": "message7109" + }, + { + "key": "key1109", + "message": "message7110" + }, + { + "key": "key1110", + "message": "message7111" + }, + { + "key": "key1111", + "message": "message7112" + }, + { + "key": "key1112", + "message": "message7113" + }, + { + "key": "key1113", + "message": "message7114" + }, + { + "key": "key1114", + "message": "message7115" + }, + { + "key": "key1115", + "message": "message7116" + }, + { + "key": "key1116", + "message": "message7117" + }, + { + "key": "key1117", + "message": "message7118" + }, + { + "key": "key1118", + "message": "message7119" + }, + { + "key": "key1119", + "message": "message7120" + }, + { + "key": "key1120", + "message": "message7121" + }, + { + "key": "key1121", + "message": "message7122" + }, + { + "key": "key1122", + "message": "message7123" + }, + { + "key": "key1123", + "message": "message7124" + }, + { + "key": "key1124", + "message": "message7125" + }, + { + "key": "key1125", + "message": "message7126" + }, + { + "key": "key1126", + "message": "message7127" + }, + { + "key": "key1127", + "message": "message7128" + }, + { + "key": "key1128", + "message": "message7129" + }, + { + "key": "key1129", + "message": "message7130" + }, + { + "key": "key1130", + "message": "message7131" + }, + { + "key": "key1131", + "message": "message7132" + }, + { + "key": "key1132", + "message": "message7133" + }, + { + "key": "key1133", + "message": "message7134" + }, + { + "key": "key1134", + "message": "message7135" + }, + { + "key": "key1135", + "message": "message7136" + }, + { + "key": "key1136", + "message": "message7137" + }, + { + "key": "key1137", + "message": "message7138" + }, + { + "key": "key1138", + "message": "message7139" + }, + { + "key": "key1139", + "message": "message7140" + }, + { + "key": "key1140", + "message": "message7141" + }, + { + "key": "key1141", + "message": "message7142" + }, + { + "key": "key1142", + "message": "message7143" + }, + { + "key": "key1143", + "message": "message7144" + }, + { + "key": "key1144", + "message": "message7145" + }, + { + "key": "key1145", + "message": "message7146" + }, + { + "key": "key1146", + "message": "message7147" + }, + { + "key": "key1147", + "message": "message7148" + }, + { + "key": "key1148", + "message": "message7149" + }, + { + "key": "key1149", + "message": "message7150" + }, + { + "key": "key1150", + "message": "message7151" + }, + { + "key": "key1151", + "message": "message7152" + }, + { + "key": "key1152", + "message": "message7153" + }, + { + "key": "key1153", + "message": "message7154" + }, + { + "key": "key1154", + "message": "message7155" + }, + { + "key": "key1155", + "message": "message7156" + }, + { + "key": "key1156", + "message": "message7157" + }, + { + "key": "key1157", + "message": "message7158" + }, + { + "key": "key1158", + "message": "message7159" + }, + { + "key": "key1159", + "message": "message7160" + }, + { + "key": "key1160", + "message": "message7161" + }, + { + "key": "key1161", + "message": "message7162" + }, + { + "key": "key1162", + "message": "message7163" + }, + { + "key": "key1163", + "message": "message7164" + }, + { + "key": "key1164", + "message": "message7165" + }, + { + "key": "key1165", + "message": "message7166" + }, + { + "key": "key1166", + "message": "message7167" + }, + { + "key": "key1167", + "message": "message7168" + }, + { + "key": "key1168", + "message": "message7169" + }, + { + "key": "key1169", + "message": "message7170" + }, + { + "key": "key1170", + "message": "message7171" + }, + { + "key": "key1171", + "message": "message7172" + }, + { + "key": "key1172", + "message": "message7173" + }, + { + "key": "key1173", + "message": "message7174" + }, + { + "key": "key1174", + "message": "message7175" + }, + { + "key": "key1175", + "message": "message7176" + }, + { + "key": "key1176", + "message": "message7177" + }, + { + "key": "key1177", + "message": "message7178" + }, + { + "key": "key1178", + "message": "message7179" + }, + { + "key": "key1179", + "message": "message7180" + }, + { + "key": "key1180", + "message": "message7181" + }, + { + "key": "key1181", + "message": "message7182" + }, + { + "key": "key1182", + "message": "message7183" + }, + { + "key": "key1183", + "message": "message7184" + }, + { + "key": "key1184", + "message": "message7185" + }, + { + "key": "key1185", + "message": "message7186" + }, + { + "key": "key1186", + "message": "message7187" + }, + { + "key": "key1187", + "message": "message7188" + }, + { + "key": "key1188", + "message": "message7189" + }, + { + "key": "key1189", + "message": "message7190" + }, + { + "key": "key1190", + "message": "message7191" + }, + { + "key": "key1191", + "message": "message7192" + }, + { + "key": "key1192", + "message": "message7193" + }, + { + "key": "key1193", + "message": "message7194" + }, + { + "key": "key1194", + "message": "message7195" + }, + { + "key": "key1195", + "message": "message7196" + }, + { + "key": "key1196", + "message": "message7197" + }, + { + "key": "key1197", + "message": "message7198" + }, + { + "key": "key1198", + "message": "message7199" + }, + { + "key": "key1199", + "message": "message7200" + }, + { + "key": "key1200", + "message": "message7201" + }, + { + "key": "key1201", + "message": "message7202" + }, + { + "key": "key1202", + "message": "message7203" + }, + { + "key": "key1203", + "message": "message7204" + }, + { + "key": "key1204", + "message": "message7205" + }, + { + "key": "key1205", + "message": "message7206" + }, + { + "key": "key1206", + "message": "message7207" + }, + { + "key": "key1207", + "message": "message7208" + }, + { + "key": "key1208", + "message": "message7209" + }, + { + "key": "key1209", + "message": "message7210" + }, + { + "key": "key1210", + "message": "message7211" + }, + { + "key": "key1211", + "message": "message7212" + }, + { + "key": "key1212", + "message": "message7213" + }, + { + "key": "key1213", + "message": "message7214" + }, + { + "key": "key1214", + "message": "message7215" + }, + { + "key": "key1215", + "message": "message7216" + }, + { + "key": "key1216", + "message": "message7217" + }, + { + "key": "key1217", + "message": "message7218" + }, + { + "key": "key1218", + "message": "message7219" + }, + { + "key": "key1219", + "message": "message7220" + }, + { + "key": "key1220", + "message": "message7221" + }, + { + "key": "key1221", + "message": "message7222" + }, + { + "key": "key1222", + "message": "message7223" + }, + { + "key": "key1223", + "message": "message7224" + }, + { + "key": "key1224", + "message": "message7225" + }, + { + "key": "key1225", + "message": "message7226" + }, + { + "key": "key1226", + "message": "message7227" + }, + { + "key": "key1227", + "message": "message7228" + }, + { + "key": "key1228", + "message": "message7229" + }, + { + "key": "key1229", + "message": "message7230" + }, + { + "key": "key1230", + "message": "message7231" + }, + { + "key": "key1231", + "message": "message7232" + }, + { + "key": "key1232", + "message": "message7233" + }, + { + "key": "key1233", + "message": "message7234" + }, + { + "key": "key1234", + "message": "message7235" + }, + { + "key": "key1235", + "message": "message7236" + }, + { + "key": "key1236", + "message": "message7237" + }, + { + "key": "key1237", + "message": "message7238" + }, + { + "key": "key1238", + "message": "message7239" + }, + { + "key": "key1239", + "message": "message7240" + }, + { + "key": "key1240", + "message": "message7241" + }, + { + "key": "key1241", + "message": "message7242" + }, + { + "key": "key1242", + "message": "message7243" + }, + { + "key": "key1243", + "message": "message7244" + }, + { + "key": "key1244", + "message": "message7245" + }, + { + "key": "key1245", + "message": "message7246" + }, + { + "key": "key1246", + "message": "message7247" + }, + { + "key": "key1247", + "message": "message7248" + }, + { + "key": "key1248", + "message": "message7249" + }, + { + "key": "key1249", + "message": "message7250" + }, + { + "key": "key1250", + "message": "message7251" + }, + { + "key": "key1251", + "message": "message7252" + }, + { + "key": "key1252", + "message": "message7253" + }, + { + "key": "key1253", + "message": "message7254" + }, + { + "key": "key1254", + "message": "message7255" + }, + { + "key": "key1255", + "message": "message7256" + }, + { + "key": "key1256", + "message": "message7257" + }, + { + "key": "key1257", + "message": "message7258" + }, + { + "key": "key1258", + "message": "message7259" + }, + { + "key": "key1259", + "message": "message7260" + }, + { + "key": "key1260", + "message": "message7261" + }, + { + "key": "key1261", + "message": "message7262" + }, + { + "key": "key1262", + "message": "message7263" + }, + { + "key": "key1263", + "message": "message7264" + }, + { + "key": "key1264", + "message": "message7265" + }, + { + "key": "key1265", + "message": "message7266" + }, + { + "key": "key1266", + "message": "message7267" + }, + { + "key": "key1267", + "message": "message7268" + }, + { + "key": "key1268", + "message": "message7269" + }, + { + "key": "key1269", + "message": "message7270" + }, + { + "key": "key1270", + "message": "message7271" + }, + { + "key": "key1271", + "message": "message7272" + }, + { + "key": "key1272", + "message": "message7273" + }, + { + "key": "key1273", + "message": "message7274" + }, + { + "key": "key1274", + "message": "message7275" + }, + { + "key": "key1275", + "message": "message7276" + }, + { + "key": "key1276", + "message": "message7277" + }, + { + "key": "key1277", + "message": "message7278" + }, + { + "key": "key1278", + "message": "message7279" + }, + { + "key": "key1279", + "message": "message7280" + }, + { + "key": "key1280", + "message": "message7281" + }, + { + "key": "key1281", + "message": "message7282" + }, + { + "key": "key1282", + "message": "message7283" + }, + { + "key": "key1283", + "message": "message7284" + }, + { + "key": "key1284", + "message": "message7285" + }, + { + "key": "key1285", + "message": "message7286" + }, + { + "key": "key1286", + "message": "message7287" + }, + { + "key": "key1287", + "message": "message7288" + }, + { + "key": "key1288", + "message": "message7289" + }, + { + "key": "key1289", + "message": "message7290" + }, + { + "key": "key1290", + "message": "message7291" + }, + { + "key": "key1291", + "message": "message7292" + }, + { + "key": "key1292", + "message": "message7293" + }, + { + "key": "key1293", + "message": "message7294" + }, + { + "key": "key1294", + "message": "message7295" + }, + { + "key": "key1295", + "message": "message7296" + }, + { + "key": "key1296", + "message": "message7297" + }, + { + "key": "key1297", + "message": "message7298" + }, + { + "key": "key1298", + "message": "message7299" + }, + { + "key": "key1299", + "message": "message7300" + }, + { + "key": "key1300", + "message": "message7301" + }, + { + "key": "key1301", + "message": "message7302" + }, + { + "key": "key1302", + "message": "message7303" + }, + { + "key": "key1303", + "message": "message7304" + }, + { + "key": "key1304", + "message": "message7305" + }, + { + "key": "key1305", + "message": "message7306" + }, + { + "key": "key1306", + "message": "message7307" + }, + { + "key": "key1307", + "message": "message7308" + }, + { + "key": "key1308", + "message": "message7309" + }, + { + "key": "key1309", + "message": "message7310" + }, + { + "key": "key1310", + "message": "message7311" + }, + { + "key": "key1311", + "message": "message7312" + }, + { + "key": "key1312", + "message": "message7313" + }, + { + "key": "key1313", + "message": "message7314" + }, + { + "key": "key1314", + "message": "message7315" + }, + { + "key": "key1315", + "message": "message7316" + }, + { + "key": "key1316", + "message": "message7317" + }, + { + "key": "key1317", + "message": "message7318" + }, + { + "key": "key1318", + "message": "message7319" + }, + { + "key": "key1319", + "message": "message7320" + }, + { + "key": "key1320", + "message": "message7321" + }, + { + "key": "key1321", + "message": "message7322" + }, + { + "key": "key1322", + "message": "message7323" + }, + { + "key": "key1323", + "message": "message7324" + }, + { + "key": "key1324", + "message": "message7325" + }, + { + "key": "key1325", + "message": "message7326" + }, + { + "key": "key1326", + "message": "message7327" + }, + { + "key": "key1327", + "message": "message7328" + }, + { + "key": "key1328", + "message": "message7329" + }, + { + "key": "key1329", + "message": "message7330" + }, + { + "key": "key1330", + "message": "message7331" + }, + { + "key": "key1331", + "message": "message7332" + }, + { + "key": "key1332", + "message": "message7333" + }, + { + "key": "key1333", + "message": "message7334" + }, + { + "key": "key1334", + "message": "message7335" + }, + { + "key": "key1335", + "message": "message7336" + }, + { + "key": "key1336", + "message": "message7337" + }, + { + "key": "key1337", + "message": "message7338" + }, + { + "key": "key1338", + "message": "message7339" + }, + { + "key": "key1339", + "message": "message7340" + }, + { + "key": "key1340", + "message": "message7341" + }, + { + "key": "key1341", + "message": "message7342" + }, + { + "key": "key1342", + "message": "message7343" + }, + { + "key": "key1343", + "message": "message7344" + }, + { + "key": "key1344", + "message": "message7345" + }, + { + "key": "key1345", + "message": "message7346" + }, + { + "key": "key1346", + "message": "message7347" + }, + { + "key": "key1347", + "message": "message7348" + }, + { + "key": "key1348", + "message": "message7349" + }, + { + "key": "key1349", + "message": "message7350" + }, + { + "key": "key1350", + "message": "message7351" + }, + { + "key": "key1351", + "message": "message7352" + }, + { + "key": "key1352", + "message": "message7353" + }, + { + "key": "key1353", + "message": "message7354" + }, + { + "key": "key1354", + "message": "message7355" + }, + { + "key": "key1355", + "message": "message7356" + }, + { + "key": "key1356", + "message": "message7357" + }, + { + "key": "key1357", + "message": "message7358" + }, + { + "key": "key1358", + "message": "message7359" + }, + { + "key": "key1359", + "message": "message7360" + }, + { + "key": "key1360", + "message": "message7361" + }, + { + "key": "key1361", + "message": "message7362" + }, + { + "key": "key1362", + "message": "message7363" + }, + { + "key": "key1363", + "message": "message7364" + }, + { + "key": "key1364", + "message": "message7365" + }, + { + "key": "key1365", + "message": "message7366" + }, + { + "key": "key1366", + "message": "message7367" + }, + { + "key": "key1367", + "message": "message7368" + }, + { + "key": "key1368", + "message": "message7369" + }, + { + "key": "key1369", + "message": "message7370" + }, + { + "key": "key1370", + "message": "message7371" + }, + { + "key": "key1371", + "message": "message7372" + }, + { + "key": "key1372", + "message": "message7373" + }, + { + "key": "key1373", + "message": "message7374" + }, + { + "key": "key1374", + "message": "message7375" + }, + { + "key": "key1375", + "message": "message7376" + }, + { + "key": "key1376", + "message": "message7377" + }, + { + "key": "key1377", + "message": "message7378" + }, + { + "key": "key1378", + "message": "message7379" + }, + { + "key": "key1379", + "message": "message7380" + }, + { + "key": "key1380", + "message": "message7381" + }, + { + "key": "key1381", + "message": "message7382" + }, + { + "key": "key1382", + "message": "message7383" + }, + { + "key": "key1383", + "message": "message7384" + }, + { + "key": "key1384", + "message": "message7385" + }, + { + "key": "key1385", + "message": "message7386" + }, + { + "key": "key1386", + "message": "message7387" + }, + { + "key": "key1387", + "message": "message7388" + }, + { + "key": "key1388", + "message": "message7389" + }, + { + "key": "key1389", + "message": "message7390" + }, + { + "key": "key1390", + "message": "message7391" + }, + { + "key": "key1391", + "message": "message7392" + }, + { + "key": "key1392", + "message": "message7393" + }, + { + "key": "key1393", + "message": "message7394" + }, + { + "key": "key1394", + "message": "message7395" + }, + { + "key": "key1395", + "message": "message7396" + }, + { + "key": "key1396", + "message": "message7397" + }, + { + "key": "key1397", + "message": "message7398" + }, + { + "key": "key1398", + "message": "message7399" + }, + { + "key": "key1399", + "message": "message7400" + }, + { + "key": "key1400", + "message": "message7401" + }, + { + "key": "key1401", + "message": "message7402" + }, + { + "key": "key1402", + "message": "message7403" + }, + { + "key": "key1403", + "message": "message7404" + }, + { + "key": "key1404", + "message": "message7405" + }, + { + "key": "key1405", + "message": "message7406" + }, + { + "key": "key1406", + "message": "message7407" + }, + { + "key": "key1407", + "message": "message7408" + }, + { + "key": "key1408", + "message": "message7409" + }, + { + "key": "key1409", + "message": "message7410" + }, + { + "key": "key1410", + "message": "message7411" + }, + { + "key": "key1411", + "message": "message7412" + }, + { + "key": "key1412", + "message": "message7413" + }, + { + "key": "key1413", + "message": "message7414" + }, + { + "key": "key1414", + "message": "message7415" + }, + { + "key": "key1415", + "message": "message7416" + }, + { + "key": "key1416", + "message": "message7417" + }, + { + "key": "key1417", + "message": "message7418" + }, + { + "key": "key1418", + "message": "message7419" + }, + { + "key": "key1419", + "message": "message7420" + }, + { + "key": "key1420", + "message": "message7421" + }, + { + "key": "key1421", + "message": "message7422" + }, + { + "key": "key1422", + "message": "message7423" + }, + { + "key": "key1423", + "message": "message7424" + }, + { + "key": "key1424", + "message": "message7425" + }, + { + "key": "key1425", + "message": "message7426" + }, + { + "key": "key1426", + "message": "message7427" + }, + { + "key": "key1427", + "message": "message7428" + }, + { + "key": "key1428", + "message": "message7429" + }, + { + "key": "key1429", + "message": "message7430" + }, + { + "key": "key1430", + "message": "message7431" + }, + { + "key": "key1431", + "message": "message7432" + }, + { + "key": "key1432", + "message": "message7433" + }, + { + "key": "key1433", + "message": "message7434" + }, + { + "key": "key1434", + "message": "message7435" + }, + { + "key": "key1435", + "message": "message7436" + }, + { + "key": "key1436", + "message": "message7437" + }, + { + "key": "key1437", + "message": "message7438" + }, + { + "key": "key1438", + "message": "message7439" + }, + { + "key": "key1439", + "message": "message7440" + }, + { + "key": "key1440", + "message": "message7441" + }, + { + "key": "key1441", + "message": "message7442" + }, + { + "key": "key1442", + "message": "message7443" + }, + { + "key": "key1443", + "message": "message7444" + }, + { + "key": "key1444", + "message": "message7445" + }, + { + "key": "key1445", + "message": "message7446" + }, + { + "key": "key1446", + "message": "message7447" + }, + { + "key": "key1447", + "message": "message7448" + }, + { + "key": "key1448", + "message": "message7449" + }, + { + "key": "key1449", + "message": "message7450" + }, + { + "key": "key1450", + "message": "message7451" + }, + { + "key": "key1451", + "message": "message7452" + }, + { + "key": "key1452", + "message": "message7453" + }, + { + "key": "key1453", + "message": "message7454" + }, + { + "key": "key1454", + "message": "message7455" + }, + { + "key": "key1455", + "message": "message7456" + }, + { + "key": "key1456", + "message": "message7457" + }, + { + "key": "key1457", + "message": "message7458" + }, + { + "key": "key1458", + "message": "message7459" + }, + { + "key": "key1459", + "message": "message7460" + }, + { + "key": "key1460", + "message": "message7461" + }, + { + "key": "key1461", + "message": "message7462" + }, + { + "key": "key1462", + "message": "message7463" + }, + { + "key": "key1463", + "message": "message7464" + }, + { + "key": "key1464", + "message": "message7465" + }, + { + "key": "key1465", + "message": "message7466" + }, + { + "key": "key1466", + "message": "message7467" + }, + { + "key": "key1467", + "message": "message7468" + }, + { + "key": "key1468", + "message": "message7469" + }, + { + "key": "key1469", + "message": "message7470" + }, + { + "key": "key1470", + "message": "message7471" + }, + { + "key": "key1471", + "message": "message7472" + }, + { + "key": "key1472", + "message": "message7473" + }, + { + "key": "key1473", + "message": "message7474" + }, + { + "key": "key1474", + "message": "message7475" + }, + { + "key": "key1475", + "message": "message7476" + }, + { + "key": "key1476", + "message": "message7477" + }, + { + "key": "key1477", + "message": "message7478" + }, + { + "key": "key1478", + "message": "message7479" + }, + { + "key": "key1479", + "message": "message7480" + }, + { + "key": "key1480", + "message": "message7481" + }, + { + "key": "key1481", + "message": "message7482" + }, + { + "key": "key1482", + "message": "message7483" + }, + { + "key": "key1483", + "message": "message7484" + }, + { + "key": "key1484", + "message": "message7485" + }, + { + "key": "key1485", + "message": "message7486" + }, + { + "key": "key1486", + "message": "message7487" + }, + { + "key": "key1487", + "message": "message7488" + }, + { + "key": "key1488", + "message": "message7489" + }, + { + "key": "key1489", + "message": "message7490" + }, + { + "key": "key1490", + "message": "message7491" + }, + { + "key": "key1491", + "message": "message7492" + }, + { + "key": "key1492", + "message": "message7493" + }, + { + "key": "key1493", + "message": "message7494" + }, + { + "key": "key1494", + "message": "message7495" + }, + { + "key": "key1495", + "message": "message7496" + }, + { + "key": "key1496", + "message": "message7497" + }, + { + "key": "key1497", + "message": "message7498" + }, + { + "key": "key1498", + "message": "message7499" + }, + { + "key": "key1499", + "message": "message7500" + }, + { + "key": "key1500", + "message": "message7501" + }, + { + "key": "key1501", + "message": "message7502" + }, + { + "key": "key1502", + "message": "message7503" + }, + { + "key": "key1503", + "message": "message7504" + }, + { + "key": "key1504", + "message": "message7505" + }, + { + "key": "key1505", + "message": "message7506" + }, + { + "key": "key1506", + "message": "message7507" + }, + { + "key": "key1507", + "message": "message7508" + }, + { + "key": "key1508", + "message": "message7509" + }, + { + "key": "key1509", + "message": "message7510" + }, + { + "key": "key1510", + "message": "message7511" + }, + { + "key": "key1511", + "message": "message7512" + }, + { + "key": "key1512", + "message": "message7513" + }, + { + "key": "key1513", + "message": "message7514" + }, + { + "key": "key1514", + "message": "message7515" + }, + { + "key": "key1515", + "message": "message7516" + }, + { + "key": "key1516", + "message": "message7517" + }, + { + "key": "key1517", + "message": "message7518" + }, + { + "key": "key1518", + "message": "message7519" + }, + { + "key": "key1519", + "message": "message7520" + }, + { + "key": "key1520", + "message": "message7521" + }, + { + "key": "key1521", + "message": "message7522" + }, + { + "key": "key1522", + "message": "message7523" + }, + { + "key": "key1523", + "message": "message7524" + }, + { + "key": "key1524", + "message": "message7525" + }, + { + "key": "key1525", + "message": "message7526" + }, + { + "key": "key1526", + "message": "message7527" + }, + { + "key": "key1527", + "message": "message7528" + }, + { + "key": "key1528", + "message": "message7529" + }, + { + "key": "key1529", + "message": "message7530" + }, + { + "key": "key1530", + "message": "message7531" + }, + { + "key": "key1531", + "message": "message7532" + }, + { + "key": "key1532", + "message": "message7533" + }, + { + "key": "key1533", + "message": "message7534" + }, + { + "key": "key1534", + "message": "message7535" + }, + { + "key": "key1535", + "message": "message7536" + }, + { + "key": "key1536", + "message": "message7537" + }, + { + "key": "key1537", + "message": "message7538" + }, + { + "key": "key1538", + "message": "message7539" + }, + { + "key": "key1539", + "message": "message7540" + }, + { + "key": "key1540", + "message": "message7541" + }, + { + "key": "key1541", + "message": "message7542" + }, + { + "key": "key1542", + "message": "message7543" + }, + { + "key": "key1543", + "message": "message7544" + }, + { + "key": "key1544", + "message": "message7545" + }, + { + "key": "key1545", + "message": "message7546" + }, + { + "key": "key1546", + "message": "message7547" + }, + { + "key": "key1547", + "message": "message7548" + }, + { + "key": "key1548", + "message": "message7549" + }, + { + "key": "key1549", + "message": "message7550" + }, + { + "key": "key1550", + "message": "message7551" + }, + { + "key": "key1551", + "message": "message7552" + }, + { + "key": "key1552", + "message": "message7553" + }, + { + "key": "key1553", + "message": "message7554" + }, + { + "key": "key1554", + "message": "message7555" + }, + { + "key": "key1555", + "message": "message7556" + }, + { + "key": "key1556", + "message": "message7557" + }, + { + "key": "key1557", + "message": "message7558" + }, + { + "key": "key1558", + "message": "message7559" + }, + { + "key": "key1559", + "message": "message7560" + }, + { + "key": "key1560", + "message": "message7561" + }, + { + "key": "key1561", + "message": "message7562" + }, + { + "key": "key1562", + "message": "message7563" + }, + { + "key": "key1563", + "message": "message7564" + }, + { + "key": "key1564", + "message": "message7565" + }, + { + "key": "key1565", + "message": "message7566" + }, + { + "key": "key1566", + "message": "message7567" + }, + { + "key": "key1567", + "message": "message7568" + }, + { + "key": "key1568", + "message": "message7569" + }, + { + "key": "key1569", + "message": "message7570" + }, + { + "key": "key1570", + "message": "message7571" + }, + { + "key": "key1571", + "message": "message7572" + }, + { + "key": "key1572", + "message": "message7573" + }, + { + "key": "key1573", + "message": "message7574" + }, + { + "key": "key1574", + "message": "message7575" + }, + { + "key": "key1575", + "message": "message7576" + }, + { + "key": "key1576", + "message": "message7577" + }, + { + "key": "key1577", + "message": "message7578" + }, + { + "key": "key1578", + "message": "message7579" + }, + { + "key": "key1579", + "message": "message7580" + }, + { + "key": "key1580", + "message": "message7581" + }, + { + "key": "key1581", + "message": "message7582" + }, + { + "key": "key1582", + "message": "message7583" + }, + { + "key": "key1583", + "message": "message7584" + }, + { + "key": "key1584", + "message": "message7585" + }, + { + "key": "key1585", + "message": "message7586" + }, + { + "key": "key1586", + "message": "message7587" + }, + { + "key": "key1587", + "message": "message7588" + }, + { + "key": "key1588", + "message": "message7589" + }, + { + "key": "key1589", + "message": "message7590" + }, + { + "key": "key1590", + "message": "message7591" + }, + { + "key": "key1591", + "message": "message7592" + }, + { + "key": "key1592", + "message": "message7593" + }, + { + "key": "key1593", + "message": "message7594" + }, + { + "key": "key1594", + "message": "message7595" + }, + { + "key": "key1595", + "message": "message7596" + }, + { + "key": "key1596", + "message": "message7597" + }, + { + "key": "key1597", + "message": "message7598" + }, + { + "key": "key1598", + "message": "message7599" + }, + { + "key": "key1599", + "message": "message7600" + }, + { + "key": "key1600", + "message": "message7601" + }, + { + "key": "key1601", + "message": "message7602" + }, + { + "key": "key1602", + "message": "message7603" + }, + { + "key": "key1603", + "message": "message7604" + }, + { + "key": "key1604", + "message": "message7605" + }, + { + "key": "key1605", + "message": "message7606" + }, + { + "key": "key1606", + "message": "message7607" + }, + { + "key": "key1607", + "message": "message7608" + }, + { + "key": "key1608", + "message": "message7609" + }, + { + "key": "key1609", + "message": "message7610" + }, + { + "key": "key1610", + "message": "message7611" + }, + { + "key": "key1611", + "message": "message7612" + }, + { + "key": "key1612", + "message": "message7613" + }, + { + "key": "key1613", + "message": "message7614" + }, + { + "key": "key1614", + "message": "message7615" + }, + { + "key": "key1615", + "message": "message7616" + }, + { + "key": "key1616", + "message": "message7617" + }, + { + "key": "key1617", + "message": "message7618" + }, + { + "key": "key1618", + "message": "message7619" + }, + { + "key": "key1619", + "message": "message7620" + }, + { + "key": "key1620", + "message": "message7621" + }, + { + "key": "key1621", + "message": "message7622" + }, + { + "key": "key1622", + "message": "message7623" + }, + { + "key": "key1623", + "message": "message7624" + }, + { + "key": "key1624", + "message": "message7625" + }, + { + "key": "key1625", + "message": "message7626" + }, + { + "key": "key1626", + "message": "message7627" + }, + { + "key": "key1627", + "message": "message7628" + }, + { + "key": "key1628", + "message": "message7629" + }, + { + "key": "key1629", + "message": "message7630" + }, + { + "key": "key1630", + "message": "message7631" + }, + { + "key": "key1631", + "message": "message7632" + }, + { + "key": "key1632", + "message": "message7633" + }, + { + "key": "key1633", + "message": "message7634" + }, + { + "key": "key1634", + "message": "message7635" + }, + { + "key": "key1635", + "message": "message7636" + }, + { + "key": "key1636", + "message": "message7637" + }, + { + "key": "key1637", + "message": "message7638" + }, + { + "key": "key1638", + "message": "message7639" + }, + { + "key": "key1639", + "message": "message7640" + }, + { + "key": "key1640", + "message": "message7641" + }, + { + "key": "key1641", + "message": "message7642" + }, + { + "key": "key1642", + "message": "message7643" + }, + { + "key": "key1643", + "message": "message7644" + }, + { + "key": "key1644", + "message": "message7645" + }, + { + "key": "key1645", + "message": "message7646" + }, + { + "key": "key1646", + "message": "message7647" + }, + { + "key": "key1647", + "message": "message7648" + }, + { + "key": "key1648", + "message": "message7649" + }, + { + "key": "key1649", + "message": "message7650" + }, + { + "key": "key1650", + "message": "message7651" + }, + { + "key": "key1651", + "message": "message7652" + }, + { + "key": "key1652", + "message": "message7653" + }, + { + "key": "key1653", + "message": "message7654" + }, + { + "key": "key1654", + "message": "message7655" + }, + { + "key": "key1655", + "message": "message7656" + }, + { + "key": "key1656", + "message": "message7657" + }, + { + "key": "key1657", + "message": "message7658" + }, + { + "key": "key1658", + "message": "message7659" + }, + { + "key": "key1659", + "message": "message7660" + }, + { + "key": "key1660", + "message": "message7661" + }, + { + "key": "key1661", + "message": "message7662" + }, + { + "key": "key1662", + "message": "message7663" + }, + { + "key": "key1663", + "message": "message7664" + }, + { + "key": "key1664", + "message": "message7665" + }, + { + "key": "key1665", + "message": "message7666" + }, + { + "key": "key1666", + "message": "message7667" + }, + { + "key": "key1667", + "message": "message7668" + }, + { + "key": "key1668", + "message": "message7669" + }, + { + "key": "key1669", + "message": "message7670" + }, + { + "key": "key1670", + "message": "message7671" + }, + { + "key": "key1671", + "message": "message7672" + }, + { + "key": "key1672", + "message": "message7673" + }, + { + "key": "key1673", + "message": "message7674" + }, + { + "key": "key1674", + "message": "message7675" + }, + { + "key": "key1675", + "message": "message7676" + }, + { + "key": "key1676", + "message": "message7677" + }, + { + "key": "key1677", + "message": "message7678" + }, + { + "key": "key1678", + "message": "message7679" + }, + { + "key": "key1679", + "message": "message7680" + }, + { + "key": "key1680", + "message": "message7681" + }, + { + "key": "key1681", + "message": "message7682" + }, + { + "key": "key1682", + "message": "message7683" + }, + { + "key": "key1683", + "message": "message7684" + }, + { + "key": "key1684", + "message": "message7685" + }, + { + "key": "key1685", + "message": "message7686" + }, + { + "key": "key1686", + "message": "message7687" + }, + { + "key": "key1687", + "message": "message7688" + }, + { + "key": "key1688", + "message": "message7689" + }, + { + "key": "key1689", + "message": "message7690" + }, + { + "key": "key1690", + "message": "message7691" + }, + { + "key": "key1691", + "message": "message7692" + }, + { + "key": "key1692", + "message": "message7693" + }, + { + "key": "key1693", + "message": "message7694" + }, + { + "key": "key1694", + "message": "message7695" + }, + { + "key": "key1695", + "message": "message7696" + }, + { + "key": "key1696", + "message": "message7697" + }, + { + "key": "key1697", + "message": "message7698" + }, + { + "key": "key1698", + "message": "message7699" + }, + { + "key": "key1699", + "message": "message7700" + }, + { + "key": "key1700", + "message": "message7701" + }, + { + "key": "key1701", + "message": "message7702" + }, + { + "key": "key1702", + "message": "message7703" + }, + { + "key": "key1703", + "message": "message7704" + }, + { + "key": "key1704", + "message": "message7705" + }, + { + "key": "key1705", + "message": "message7706" + }, + { + "key": "key1706", + "message": "message7707" + }, + { + "key": "key1707", + "message": "message7708" + }, + { + "key": "key1708", + "message": "message7709" + }, + { + "key": "key1709", + "message": "message7710" + }, + { + "key": "key1710", + "message": "message7711" + }, + { + "key": "key1711", + "message": "message7712" + }, + { + "key": "key1712", + "message": "message7713" + }, + { + "key": "key1713", + "message": "message7714" + }, + { + "key": "key1714", + "message": "message7715" + }, + { + "key": "key1715", + "message": "message7716" + }, + { + "key": "key1716", + "message": "message7717" + }, + { + "key": "key1717", + "message": "message7718" + }, + { + "key": "key1718", + "message": "message7719" + }, + { + "key": "key1719", + "message": "message7720" + }, + { + "key": "key1720", + "message": "message7721" + }, + { + "key": "key1721", + "message": "message7722" + }, + { + "key": "key1722", + "message": "message7723" + }, + { + "key": "key1723", + "message": "message7724" + }, + { + "key": "key1724", + "message": "message7725" + }, + { + "key": "key1725", + "message": "message7726" + }, + { + "key": "key1726", + "message": "message7727" + }, + { + "key": "key1727", + "message": "message7728" + }, + { + "key": "key1728", + "message": "message7729" + }, + { + "key": "key1729", + "message": "message7730" + }, + { + "key": "key1730", + "message": "message7731" + }, + { + "key": "key1731", + "message": "message7732" + }, + { + "key": "key1732", + "message": "message7733" + }, + { + "key": "key1733", + "message": "message7734" + }, + { + "key": "key1734", + "message": "message7735" + }, + { + "key": "key1735", + "message": "message7736" + }, + { + "key": "key1736", + "message": "message7737" + }, + { + "key": "key1737", + "message": "message7738" + }, + { + "key": "key1738", + "message": "message7739" + }, + { + "key": "key1739", + "message": "message7740" + }, + { + "key": "key1740", + "message": "message7741" + }, + { + "key": "key1741", + "message": "message7742" + }, + { + "key": "key1742", + "message": "message7743" + }, + { + "key": "key1743", + "message": "message7744" + }, + { + "key": "key1744", + "message": "message7745" + }, + { + "key": "key1745", + "message": "message7746" + }, + { + "key": "key1746", + "message": "message7747" + }, + { + "key": "key1747", + "message": "message7748" + }, + { + "key": "key1748", + "message": "message7749" + }, + { + "key": "key1749", + "message": "message7750" + }, + { + "key": "key1750", + "message": "message7751" + }, + { + "key": "key1751", + "message": "message7752" + }, + { + "key": "key1752", + "message": "message7753" + }, + { + "key": "key1753", + "message": "message7754" + }, + { + "key": "key1754", + "message": "message7755" + }, + { + "key": "key1755", + "message": "message7756" + }, + { + "key": "key1756", + "message": "message7757" + }, + { + "key": "key1757", + "message": "message7758" + }, + { + "key": "key1758", + "message": "message7759" + }, + { + "key": "key1759", + "message": "message7760" + }, + { + "key": "key1760", + "message": "message7761" + }, + { + "key": "key1761", + "message": "message7762" + }, + { + "key": "key1762", + "message": "message7763" + }, + { + "key": "key1763", + "message": "message7764" + }, + { + "key": "key1764", + "message": "message7765" + }, + { + "key": "key1765", + "message": "message7766" + }, + { + "key": "key1766", + "message": "message7767" + }, + { + "key": "key1767", + "message": "message7768" + }, + { + "key": "key1768", + "message": "message7769" + }, + { + "key": "key1769", + "message": "message7770" + }, + { + "key": "key1770", + "message": "message7771" + }, + { + "key": "key1771", + "message": "message7772" + }, + { + "key": "key1772", + "message": "message7773" + }, + { + "key": "key1773", + "message": "message7774" + }, + { + "key": "key1774", + "message": "message7775" + }, + { + "key": "key1775", + "message": "message7776" + }, + { + "key": "key1776", + "message": "message7777" + }, + { + "key": "key1777", + "message": "message7778" + }, + { + "key": "key1778", + "message": "message7779" + }, + { + "key": "key1779", + "message": "message7780" + }, + { + "key": "key1780", + "message": "message7781" + }, + { + "key": "key1781", + "message": "message7782" + }, + { + "key": "key1782", + "message": "message7783" + }, + { + "key": "key1783", + "message": "message7784" + }, + { + "key": "key1784", + "message": "message7785" + }, + { + "key": "key1785", + "message": "message7786" + }, + { + "key": "key1786", + "message": "message7787" + }, + { + "key": "key1787", + "message": "message7788" + }, + { + "key": "key1788", + "message": "message7789" + }, + { + "key": "key1789", + "message": "message7790" + }, + { + "key": "key1790", + "message": "message7791" + }, + { + "key": "key1791", + "message": "message7792" + }, + { + "key": "key1792", + "message": "message7793" + }, + { + "key": "key1793", + "message": "message7794" + }, + { + "key": "key1794", + "message": "message7795" + }, + { + "key": "key1795", + "message": "message7796" + }, + { + "key": "key1796", + "message": "message7797" + }, + { + "key": "key1797", + "message": "message7798" + }, + { + "key": "key1798", + "message": "message7799" + }, + { + "key": "key1799", + "message": "message7800" + }, + { + "key": "key1800", + "message": "message7801" + }, + { + "key": "key1801", + "message": "message7802" + }, + { + "key": "key1802", + "message": "message7803" + }, + { + "key": "key1803", + "message": "message7804" + }, + { + "key": "key1804", + "message": "message7805" + }, + { + "key": "key1805", + "message": "message7806" + }, + { + "key": "key1806", + "message": "message7807" + }, + { + "key": "key1807", + "message": "message7808" + }, + { + "key": "key1808", + "message": "message7809" + }, + { + "key": "key1809", + "message": "message7810" + }, + { + "key": "key1810", + "message": "message7811" + }, + { + "key": "key1811", + "message": "message7812" + }, + { + "key": "key1812", + "message": "message7813" + }, + { + "key": "key1813", + "message": "message7814" + }, + { + "key": "key1814", + "message": "message7815" + }, + { + "key": "key1815", + "message": "message7816" + }, + { + "key": "key1816", + "message": "message7817" + }, + { + "key": "key1817", + "message": "message7818" + }, + { + "key": "key1818", + "message": "message7819" + }, + { + "key": "key1819", + "message": "message7820" + }, + { + "key": "key1820", + "message": "message7821" + }, + { + "key": "key1821", + "message": "message7822" + }, + { + "key": "key1822", + "message": "message7823" + }, + { + "key": "key1823", + "message": "message7824" + }, + { + "key": "key1824", + "message": "message7825" + }, + { + "key": "key1825", + "message": "message7826" + }, + { + "key": "key1826", + "message": "message7827" + }, + { + "key": "key1827", + "message": "message7828" + }, + { + "key": "key1828", + "message": "message7829" + }, + { + "key": "key1829", + "message": "message7830" + }, + { + "key": "key1830", + "message": "message7831" + }, + { + "key": "key1831", + "message": "message7832" + }, + { + "key": "key1832", + "message": "message7833" + }, + { + "key": "key1833", + "message": "message7834" + }, + { + "key": "key1834", + "message": "message7835" + }, + { + "key": "key1835", + "message": "message7836" + }, + { + "key": "key1836", + "message": "message7837" + }, + { + "key": "key1837", + "message": "message7838" + }, + { + "key": "key1838", + "message": "message7839" + }, + { + "key": "key1839", + "message": "message7840" + }, + { + "key": "key1840", + "message": "message7841" + }, + { + "key": "key1841", + "message": "message7842" + }, + { + "key": "key1842", + "message": "message7843" + }, + { + "key": "key1843", + "message": "message7844" + }, + { + "key": "key1844", + "message": "message7845" + }, + { + "key": "key1845", + "message": "message7846" + }, + { + "key": "key1846", + "message": "message7847" + }, + { + "key": "key1847", + "message": "message7848" + }, + { + "key": "key1848", + "message": "message7849" + }, + { + "key": "key1849", + "message": "message7850" + }, + { + "key": "key1850", + "message": "message7851" + }, + { + "key": "key1851", + "message": "message7852" + }, + { + "key": "key1852", + "message": "message7853" + }, + { + "key": "key1853", + "message": "message7854" + }, + { + "key": "key1854", + "message": "message7855" + }, + { + "key": "key1855", + "message": "message7856" + }, + { + "key": "key1856", + "message": "message7857" + }, + { + "key": "key1857", + "message": "message7858" + }, + { + "key": "key1858", + "message": "message7859" + }, + { + "key": "key1859", + "message": "message7860" + }, + { + "key": "key1860", + "message": "message7861" + }, + { + "key": "key1861", + "message": "message7862" + }, + { + "key": "key1862", + "message": "message7863" + }, + { + "key": "key1863", + "message": "message7864" + }, + { + "key": "key1864", + "message": "message7865" + }, + { + "key": "key1865", + "message": "message7866" + }, + { + "key": "key1866", + "message": "message7867" + }, + { + "key": "key1867", + "message": "message7868" + }, + { + "key": "key1868", + "message": "message7869" + }, + { + "key": "key1869", + "message": "message7870" + }, + { + "key": "key1870", + "message": "message7871" + }, + { + "key": "key1871", + "message": "message7872" + }, + { + "key": "key1872", + "message": "message7873" + }, + { + "key": "key1873", + "message": "message7874" + }, + { + "key": "key1874", + "message": "message7875" + }, + { + "key": "key1875", + "message": "message7876" + }, + { + "key": "key1876", + "message": "message7877" + }, + { + "key": "key1877", + "message": "message7878" + }, + { + "key": "key1878", + "message": "message7879" + }, + { + "key": "key1879", + "message": "message7880" + }, + { + "key": "key1880", + "message": "message7881" + }, + { + "key": "key1881", + "message": "message7882" + }, + { + "key": "key1882", + "message": "message7883" + }, + { + "key": "key1883", + "message": "message7884" + }, + { + "key": "key1884", + "message": "message7885" + }, + { + "key": "key1885", + "message": "message7886" + }, + { + "key": "key1886", + "message": "message7887" + }, + { + "key": "key1887", + "message": "message7888" + }, + { + "key": "key1888", + "message": "message7889" + }, + { + "key": "key1889", + "message": "message7890" + }, + { + "key": "key1890", + "message": "message7891" + }, + { + "key": "key1891", + "message": "message7892" + }, + { + "key": "key1892", + "message": "message7893" + }, + { + "key": "key1893", + "message": "message7894" + }, + { + "key": "key1894", + "message": "message7895" + }, + { + "key": "key1895", + "message": "message7896" + }, + { + "key": "key1896", + "message": "message7897" + }, + { + "key": "key1897", + "message": "message7898" + }, + { + "key": "key1898", + "message": "message7899" + }, + { + "key": "key1899", + "message": "message7900" + }, + { + "key": "key1900", + "message": "message7901" + }, + { + "key": "key1901", + "message": "message7902" + }, + { + "key": "key1902", + "message": "message7903" + }, + { + "key": "key1903", + "message": "message7904" + }, + { + "key": "key1904", + "message": "message7905" + }, + { + "key": "key1905", + "message": "message7906" + }, + { + "key": "key1906", + "message": "message7907" + }, + { + "key": "key1907", + "message": "message7908" + }, + { + "key": "key1908", + "message": "message7909" + }, + { + "key": "key1909", + "message": "message7910" + }, + { + "key": "key1910", + "message": "message7911" + }, + { + "key": "key1911", + "message": "message7912" + }, + { + "key": "key1912", + "message": "message7913" + }, + { + "key": "key1913", + "message": "message7914" + }, + { + "key": "key1914", + "message": "message7915" + }, + { + "key": "key1915", + "message": "message7916" + }, + { + "key": "key1916", + "message": "message7917" + }, + { + "key": "key1917", + "message": "message7918" + }, + { + "key": "key1918", + "message": "message7919" + }, + { + "key": "key1919", + "message": "message7920" + }, + { + "key": "key1920", + "message": "message7921" + }, + { + "key": "key1921", + "message": "message7922" + }, + { + "key": "key1922", + "message": "message7923" + }, + { + "key": "key1923", + "message": "message7924" + }, + { + "key": "key1924", + "message": "message7925" + }, + { + "key": "key1925", + "message": "message7926" + }, + { + "key": "key1926", + "message": "message7927" + }, + { + "key": "key1927", + "message": "message7928" + }, + { + "key": "key1928", + "message": "message7929" + }, + { + "key": "key1929", + "message": "message7930" + }, + { + "key": "key1930", + "message": "message7931" + }, + { + "key": "key1931", + "message": "message7932" + }, + { + "key": "key1932", + "message": "message7933" + }, + { + "key": "key1933", + "message": "message7934" + }, + { + "key": "key1934", + "message": "message7935" + }, + { + "key": "key1935", + "message": "message7936" + }, + { + "key": "key1936", + "message": "message7937" + }, + { + "key": "key1937", + "message": "message7938" + }, + { + "key": "key1938", + "message": "message7939" + }, + { + "key": "key1939", + "message": "message7940" + }, + { + "key": "key1940", + "message": "message7941" + }, + { + "key": "key1941", + "message": "message7942" + }, + { + "key": "key1942", + "message": "message7943" + }, + { + "key": "key1943", + "message": "message7944" + }, + { + "key": "key1944", + "message": "message7945" + }, + { + "key": "key1945", + "message": "message7946" + }, + { + "key": "key1946", + "message": "message7947" + }, + { + "key": "key1947", + "message": "message7948" + }, + { + "key": "key1948", + "message": "message7949" + }, + { + "key": "key1949", + "message": "message7950" + }, + { + "key": "key1950", + "message": "message7951" + }, + { + "key": "key1951", + "message": "message7952" + }, + { + "key": "key1952", + "message": "message7953" + }, + { + "key": "key1953", + "message": "message7954" + }, + { + "key": "key1954", + "message": "message7955" + }, + { + "key": "key1955", + "message": "message7956" + }, + { + "key": "key1956", + "message": "message7957" + }, + { + "key": "key1957", + "message": "message7958" + }, + { + "key": "key1958", + "message": "message7959" + }, + { + "key": "key1959", + "message": "message7960" + }, + { + "key": "key1960", + "message": "message7961" + }, + { + "key": "key1961", + "message": "message7962" + }, + { + "key": "key1962", + "message": "message7963" + }, + { + "key": "key1963", + "message": "message7964" + }, + { + "key": "key1964", + "message": "message7965" + }, + { + "key": "key1965", + "message": "message7966" + }, + { + "key": "key1966", + "message": "message7967" + }, + { + "key": "key1967", + "message": "message7968" + }, + { + "key": "key1968", + "message": "message7969" + }, + { + "key": "key1969", + "message": "message7970" + }, + { + "key": "key1970", + "message": "message7971" + }, + { + "key": "key1971", + "message": "message7972" + }, + { + "key": "key1972", + "message": "message7973" + }, + { + "key": "key1973", + "message": "message7974" + }, + { + "key": "key1974", + "message": "message7975" + }, + { + "key": "key1975", + "message": "message7976" + }, + { + "key": "key1976", + "message": "message7977" + }, + { + "key": "key1977", + "message": "message7978" + }, + { + "key": "key1978", + "message": "message7979" + }, + { + "key": "key1979", + "message": "message7980" + }, + { + "key": "key1980", + "message": "message7981" + }, + { + "key": "key1981", + "message": "message7982" + }, + { + "key": "key1982", + "message": "message7983" + }, + { + "key": "key1983", + "message": "message7984" + }, + { + "key": "key1984", + "message": "message7985" + }, + { + "key": "key1985", + "message": "message7986" + }, + { + "key": "key1986", + "message": "message7987" + }, + { + "key": "key1987", + "message": "message7988" + }, + { + "key": "key1988", + "message": "message7989" + }, + { + "key": "key1989", + "message": "message7990" + }, + { + "key": "key1990", + "message": "message7991" + }, + { + "key": "key1991", + "message": "message7992" + }, + { + "key": "key1992", + "message": "message7993" + }, + { + "key": "key1993", + "message": "message7994" + }, + { + "key": "key1994", + "message": "message7995" + }, + { + "key": "key1995", + "message": "message7996" + }, + { + "key": "key1996", + "message": "message7997" + }, + { + "key": "key1997", + "message": "message7998" + }, + { + "key": "key1998", + "message": "message7999" + }, + { + "key": "key1999", + "message": "message8000" + }, + { + "key": "", + "message": "message8001" + }, + { + "key": "", + "message": "message8002" + }, + { + "key": "", + "message": "message8003" + }, + { + "key": "", + "message": "message8004" + }, + { + "key": "", + "message": "message8005" + }, + { + "key": "", + "message": "message8006_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8007" + }, + { + "key": "", + "message": "message8008" + }, + { + "key": "", + "message": "message8009" + }, + { + "key": "", + "message": "message8010" + }, + { + "key": "", + "message": "message8011" + }, + { + "key": "", + "message": "message8012" + }, + { + "key": "", + "message": "message8013" + }, + { + "key": "", + "message": "message8014" + }, + { + "key": "", + "message": "message8015" + }, + { + "key": "", + "message": "message8016_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8017" + }, + { + "key": "", + "message": "message8018" + }, + { + "key": "", + "message": "message8019" + }, + { + "key": "", + "message": "message8020" + }, + { + "key": "", + "message": "message8021" + }, + { + "key": "", + "message": "message8022" + }, + { + "key": "", + "message": "message8023" + }, + { + "key": "", + "message": "message8024" + }, + { + "key": "", + "message": "message8025" + }, + { + "key": "", + "message": "message8026_xxxxxxxxx" + }, + { + "key": "", + "message": "message8027" + }, + { + "key": "", + "message": "message8028" + }, + { + "key": "", + "message": "message8029" + }, + { + "key": "", + "message": "message8030" + }, + { + "key": "", + "message": "message8031" + }, + { + "key": "", + "message": "message8032" + }, + { + "key": "", + "message": "message8033" + }, + { + "key": "", + "message": "message8034" + }, + { + "key": "", + "message": "message8035" + }, + { + "key": "", + "message": "message8036_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8037" + }, + { + "key": "", + "message": "message8038" + }, + { + "key": "", + "message": "message8039" + }, + { + "key": "", + "message": "message8040" + }, + { + "key": "", + "message": "message8041" + }, + { + "key": "", + "message": "message8042" + }, + { + "key": "", + "message": "message8043" + }, + { + "key": "", + "message": "message8044" + }, + { + "key": "", + "message": "message8045" + }, + { + "key": "", + "message": "message8046_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8047" + }, + { + "key": "", + "message": "message8048" + }, + { + "key": "", + "message": "message8049" + }, + { + "key": "", + "message": "message8050" + }, + { + "key": "", + "message": "message8051" + }, + { + "key": "", + "message": "message8052" + }, + { + "key": "", + "message": "message8053" + }, + { + "key": "", + "message": "message8054" + }, + { + "key": "", + "message": "message8055" + }, + { + "key": "", + "message": "message8056_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8057" + }, + { + "key": "", + "message": "message8058" + }, + { + "key": "", + "message": "message8059" + }, + { + "key": "", + "message": "message8060" + }, + { + "key": "", + "message": "message8061" + }, + { + "key": "", + "message": "message8062" + }, + { + "key": "", + "message": "message8063" + }, + { + "key": "", + "message": "message8064" + }, + { + "key": "", + "message": "message8065" + }, + { + "key": "", + "message": "message8066_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8067" + }, + { + "key": "", + "message": "message8068" + }, + { + "key": "", + "message": "message8069" + }, + { + "key": "", + "message": "message8070" + }, + { + "key": "", + "message": "message8071" + }, + { + "key": "", + "message": "message8072" + }, + { + "key": "", + "message": "message8073" + }, + { + "key": "", + "message": "message8074" + }, + { + "key": "", + "message": "message8075" + }, + { + "key": "", + "message": "message8076_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8077" + }, + { + "key": "", + "message": "message8078" + }, + { + "key": "", + "message": "message8079" + }, + { + "key": "", + "message": "message8080" + }, + { + "key": "", + "message": "message8081" + }, + { + "key": "", + "message": "message8082" + }, + { + "key": "", + "message": "message8083" + }, + { + "key": "", + "message": "message8084" + }, + { + "key": "", + "message": "message8085" + }, + { + "key": "", + "message": "message8086_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8087" + }, + { + "key": "", + "message": "message8088" + }, + { + "key": "", + "message": "message8089" + }, + { + "key": "", + "message": "message8090" + }, + { + "key": "", + "message": "message8091" + }, + { + "key": "", + "message": "message8092" + }, + { + "key": "", + "message": "message8093" + }, + { + "key": "", + "message": "message8094" + }, + { + "key": "", + "message": "message8095" + }, + { + "key": "", + "message": "message8096_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8097" + }, + { + "key": "", + "message": "message8098" + }, + { + "key": "", + "message": "message8099" + }, + { + "key": "", + "message": "message8100_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8101" + }, + { + "key": "", + "message": "message8102" + }, + { + "key": "", + "message": "message8103" + }, + { + "key": "", + "message": "message8104" + }, + { + "key": "", + "message": "message8105" + }, + { + "key": "", + "message": "message8106_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8107" + }, + { + "key": "", + "message": "message8108" + }, + { + "key": "", + "message": "message8109" + }, + { + "key": "", + "message": "message8110" + }, + { + "key": "", + "message": "message8111" + }, + { + "key": "", + "message": "message8112" + }, + { + "key": "", + "message": "message8113" + }, + { + "key": "", + "message": "message8114" + }, + { + "key": "", + "message": "message8115" + }, + { + "key": "", + "message": "message8116_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8117" + }, + { + "key": "", + "message": "message8118" + }, + { + "key": "", + "message": "message8119" + }, + { + "key": "", + "message": "message8120" + }, + { + "key": "", + "message": "message8121" + }, + { + "key": "", + "message": "message8122" + }, + { + "key": "", + "message": "message8123" + }, + { + "key": "", + "message": "message8124" + }, + { + "key": "", + "message": "message8125" + }, + { + "key": "", + "message": "message8126_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8127" + }, + { + "key": "", + "message": "message8128" + }, + { + "key": "", + "message": "message8129" + }, + { + "key": "", + "message": "message8130" + }, + { + "key": "", + "message": "message8131" + }, + { + "key": "", + "message": "message8132" + }, + { + "key": "", + "message": "message8133" + }, + { + "key": "", + "message": "message8134" + }, + { + "key": "", + "message": "message8135" + }, + { + "key": "", + "message": "message8136_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8137" + }, + { + "key": "", + "message": "message8138" + }, + { + "key": "", + "message": "message8139" + }, + { + "key": "", + "message": "message8140" + }, + { + "key": "", + "message": "message8141" + }, + { + "key": "", + "message": "message8142" + }, + { + "key": "", + "message": "message8143" + }, + { + "key": "", + "message": "message8144" + }, + { + "key": "", + "message": "message8145" + }, + { + "key": "", + "message": "message8146_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8147" + }, + { + "key": "", + "message": "message8148" + }, + { + "key": "", + "message": "message8149" + }, + { + "key": "", + "message": "message8150" + }, + { + "key": "", + "message": "message8151" + }, + { + "key": "", + "message": "message8152" + }, + { + "key": "", + "message": "message8153" + }, + { + "key": "", + "message": "message8154" + }, + { + "key": "", + "message": "message8155" + }, + { + "key": "", + "message": "message8156_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8157" + }, + { + "key": "", + "message": "message8158" + }, + { + "key": "", + "message": "message8159" + }, + { + "key": "", + "message": "message8160" + }, + { + "key": "", + "message": "message8161" + }, + { + "key": "", + "message": "message8162" + }, + { + "key": "", + "message": "message8163" + }, + { + "key": "", + "message": "message8164" + }, + { + "key": "", + "message": "message8165" + }, + { + "key": "", + "message": "message8166_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8167" + }, + { + "key": "", + "message": "message8168" + }, + { + "key": "", + "message": "message8169" + }, + { + "key": "", + "message": "message8170" + }, + { + "key": "", + "message": "message8171" + }, + { + "key": "", + "message": "message8172" + }, + { + "key": "", + "message": "message8173" + }, + { + "key": "", + "message": "message8174" + }, + { + "key": "", + "message": "message8175" + }, + { + "key": "", + "message": "message8176_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8177" + }, + { + "key": "", + "message": "message8178" + }, + { + "key": "", + "message": "message8179" + }, + { + "key": "", + "message": "message8180" + }, + { + "key": "", + "message": "message8181" + }, + { + "key": "", + "message": "message8182" + }, + { + "key": "", + "message": "message8183" + }, + { + "key": "", + "message": "message8184" + }, + { + "key": "", + "message": "message8185" + }, + { + "key": "", + "message": "message8186_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8187" + }, + { + "key": "", + "message": "message8188" + }, + { + "key": "", + "message": "message8189" + }, + { + "key": "", + "message": "message8190" + }, + { + "key": "", + "message": "message8191" + }, + { + "key": "", + "message": "message8192" + }, + { + "key": "", + "message": "message8193" + }, + { + "key": "", + "message": "message8194" + }, + { + "key": "", + "message": "message8195" + }, + { + "key": "", + "message": "message8196_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8197" + }, + { + "key": "", + "message": "message8198" + }, + { + "key": "", + "message": "message8199" + }, + { + "key": "", + "message": "message8200_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8201" + }, + { + "key": "", + "message": "message8202" + }, + { + "key": "", + "message": "message8203" + }, + { + "key": "", + "message": "message8204" + }, + { + "key": "", + "message": "message8205" + }, + { + "key": "", + "message": "message8206_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8207" + }, + { + "key": "", + "message": "message8208" + }, + { + "key": "", + "message": "message8209" + }, + { + "key": "", + "message": "message8210" + }, + { + "key": "", + "message": "message8211" + }, + { + "key": "", + "message": "message8212" + }, + { + "key": "", + "message": "message8213" + }, + { + "key": "", + "message": "message8214" + }, + { + "key": "", + "message": "message8215" + }, + { + "key": "", + "message": "message8216_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8217" + }, + { + "key": "", + "message": "message8218" + }, + { + "key": "", + "message": "message8219" + }, + { + "key": "", + "message": "message8220" + }, + { + "key": "", + "message": "message8221" + }, + { + "key": "", + "message": "message8222" + }, + { + "key": "", + "message": "message8223" + }, + { + "key": "", + "message": "message8224" + }, + { + "key": "", + "message": "message8225" + }, + { + "key": "", + "message": "message8226_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8227" + }, + { + "key": "", + "message": "message8228" + }, + { + "key": "", + "message": "message8229" + }, + { + "key": "", + "message": "message8230" + }, + { + "key": "", + "message": "message8231" + }, + { + "key": "", + "message": "message8232" + }, + { + "key": "", + "message": "message8233" + }, + { + "key": "", + "message": "message8234" + }, + { + "key": "", + "message": "message8235" + }, + { + "key": "", + "message": "message8236_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8237" + }, + { + "key": "", + "message": "message8238" + }, + { + "key": "", + "message": "message8239" + }, + { + "key": "", + "message": "message8240" + }, + { + "key": "", + "message": "message8241" + }, + { + "key": "", + "message": "message8242" + }, + { + "key": "", + "message": "message8243" + }, + { + "key": "", + "message": "message8244" + }, + { + "key": "", + "message": "message8245" + }, + { + "key": "", + "message": "message8246_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8247" + }, + { + "key": "", + "message": "message8248" + }, + { + "key": "", + "message": "message8249" + }, + { + "key": "", + "message": "message8250" + }, + { + "key": "", + "message": "message8251" + }, + { + "key": "", + "message": "message8252" + }, + { + "key": "", + "message": "message8253" + }, + { + "key": "", + "message": "message8254" + }, + { + "key": "", + "message": "message8255" + }, + { + "key": "", + "message": "message8256_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8257" + }, + { + "key": "", + "message": "message8258" + }, + { + "key": "", + "message": "message8259" + }, + { + "key": "", + "message": "message8260" + }, + { + "key": "", + "message": "message8261" + }, + { + "key": "", + "message": "message8262" + }, + { + "key": "", + "message": "message8263" + }, + { + "key": "", + "message": "message8264" + }, + { + "key": "", + "message": "message8265" + }, + { + "key": "", + "message": "message8266_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8267" + }, + { + "key": "", + "message": "message8268" + }, + { + "key": "", + "message": "message8269" + }, + { + "key": "", + "message": "message8270" + }, + { + "key": "", + "message": "message8271" + }, + { + "key": "", + "message": "message8272" + }, + { + "key": "", + "message": "message8273" + }, + { + "key": "", + "message": "message8274" + }, + { + "key": "", + "message": "message8275" + }, + { + "key": "", + "message": "message8276_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8277" + }, + { + "key": "", + "message": "message8278" + }, + { + "key": "", + "message": "message8279" + }, + { + "key": "", + "message": "message8280" + }, + { + "key": "", + "message": "message8281" + }, + { + "key": "", + "message": "message8282" + }, + { + "key": "", + "message": "message8283" + }, + { + "key": "", + "message": "message8284" + }, + { + "key": "", + "message": "message8285" + }, + { + "key": "", + "message": "message8286_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8287" + }, + { + "key": "", + "message": "message8288" + }, + { + "key": "", + "message": "message8289" + }, + { + "key": "", + "message": "message8290" + }, + { + "key": "", + "message": "message8291" + }, + { + "key": "", + "message": "message8292" + }, + { + "key": "", + "message": "message8293" + }, + { + "key": "", + "message": "message8294" + }, + { + "key": "", + "message": "message8295" + }, + { + "key": "", + "message": "message8296_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8297" + }, + { + "key": "", + "message": "message8298" + }, + { + "key": "", + "message": "message8299" + }, + { + "key": "", + "message": "message8300_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8301" + }, + { + "key": "", + "message": "message8302" + }, + { + "key": "", + "message": "message8303" + }, + { + "key": "", + "message": "message8304" + }, + { + "key": "", + "message": "message8305" + }, + { + "key": "", + "message": "message8306_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8307" + }, + { + "key": "", + "message": "message8308" + }, + { + "key": "", + "message": "message8309" + }, + { + "key": "", + "message": "message8310" + }, + { + "key": "", + "message": "message8311" + }, + { + "key": "", + "message": "message8312" + }, + { + "key": "", + "message": "message8313" + }, + { + "key": "", + "message": "message8314" + }, + { + "key": "", + "message": "message8315" + }, + { + "key": "", + "message": "message8316_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8317" + }, + { + "key": "", + "message": "message8318" + }, + { + "key": "", + "message": "message8319" + }, + { + "key": "", + "message": "message8320" + }, + { + "key": "", + "message": "message8321" + }, + { + "key": "", + "message": "message8322" + }, + { + "key": "", + "message": "message8323" + }, + { + "key": "", + "message": "message8324" + }, + { + "key": "", + "message": "message8325" + }, + { + "key": "", + "message": "message8326_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8327" + }, + { + "key": "", + "message": "message8328" + }, + { + "key": "", + "message": "message8329" + }, + { + "key": "", + "message": "message8330" + }, + { + "key": "", + "message": "message8331" + }, + { + "key": "", + "message": "message8332" + }, + { + "key": "", + "message": "message8333" + }, + { + "key": "", + "message": "message8334" + }, + { + "key": "", + "message": "message8335" + }, + { + "key": "", + "message": "message8336_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8337" + }, + { + "key": "", + "message": "message8338" + }, + { + "key": "", + "message": "message8339" + }, + { + "key": "", + "message": "message8340" + }, + { + "key": "", + "message": "message8341" + }, + { + "key": "", + "message": "message8342" + }, + { + "key": "", + "message": "message8343" + }, + { + "key": "", + "message": "message8344" + }, + { + "key": "", + "message": "message8345" + }, + { + "key": "", + "message": "message8346_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8347" + }, + { + "key": "", + "message": "message8348" + }, + { + "key": "", + "message": "message8349" + }, + { + "key": "", + "message": "message8350" + }, + { + "key": "", + "message": "message8351" + }, + { + "key": "", + "message": "message8352" + }, + { + "key": "", + "message": "message8353" + }, + { + "key": "", + "message": "message8354" + }, + { + "key": "", + "message": "message8355" + }, + { + "key": "", + "message": "message8356_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8357" + }, + { + "key": "", + "message": "message8358" + }, + { + "key": "", + "message": "message8359" + }, + { + "key": "", + "message": "message8360" + }, + { + "key": "", + "message": "message8361" + }, + { + "key": "", + "message": "message8362" + }, + { + "key": "", + "message": "message8363" + }, + { + "key": "", + "message": "message8364" + }, + { + "key": "", + "message": "message8365" + }, + { + "key": "", + "message": "message8366_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8367" + }, + { + "key": "", + "message": "message8368" + }, + { + "key": "", + "message": "message8369" + }, + { + "key": "", + "message": "message8370" + }, + { + "key": "", + "message": "message8371" + }, + { + "key": "", + "message": "message8372" + }, + { + "key": "", + "message": "message8373" + }, + { + "key": "", + "message": "message8374" + }, + { + "key": "", + "message": "message8375" + }, + { + "key": "", + "message": "message8376_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8377" + }, + { + "key": "", + "message": "message8378" + }, + { + "key": "", + "message": "message8379" + }, + { + "key": "", + "message": "message8380" + }, + { + "key": "", + "message": "message8381" + }, + { + "key": "", + "message": "message8382" + }, + { + "key": "", + "message": "message8383" + }, + { + "key": "", + "message": "message8384" + }, + { + "key": "", + "message": "message8385" + }, + { + "key": "", + "message": "message8386_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8387" + }, + { + "key": "", + "message": "message8388" + }, + { + "key": "", + "message": "message8389" + }, + { + "key": "", + "message": "message8390" + }, + { + "key": "", + "message": "message8391" + }, + { + "key": "", + "message": "message8392" + }, + { + "key": "", + "message": "message8393" + }, + { + "key": "", + "message": "message8394" + }, + { + "key": "", + "message": "message8395" + }, + { + "key": "", + "message": "message8396_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "", + "message": "message8397" + }, + { + "key": "", + "message": "message8398" + }, + { + "key": "", + "message": "message8399" + }, + { + "key": "", + "message": "message8400_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8401" + }, + { + "key": "AAA", + "message": "message8402" + }, + { + "key": "AAA", + "message": "message8403" + }, + { + "key": "AAA", + "message": "message8404" + }, + { + "key": "AAA", + "message": "message8405" + }, + { + "key": "AAA", + "message": "message8406_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8407" + }, + { + "key": "AAA", + "message": "message8408" + }, + { + "key": "AAA", + "message": "message8409" + }, + { + "key": "AAA", + "message": "message8410" + }, + { + "key": "AAA", + "message": "message8411" + }, + { + "key": "AAA", + "message": "message8412" + }, + { + "key": "AAA", + "message": "message8413" + }, + { + "key": "AAA", + "message": "message8414" + }, + { + "key": "AAA", + "message": "message8415" + }, + { + "key": "AAA", + "message": "message8416_xxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8417" + }, + { + "key": "AAA", + "message": "message8418" + }, + { + "key": "AAA", + "message": "message8419" + }, + { + "key": "AAA", + "message": "message8420" + }, + { + "key": "AAA", + "message": "message8421" + }, + { + "key": "AAA", + "message": "message8422" + }, + { + "key": "AAA", + "message": "message8423" + }, + { + "key": "AAA", + "message": "message8424" + }, + { + "key": "AAA", + "message": "message8425" + }, + { + "key": "AAA", + "message": "message8426_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8427" + }, + { + "key": "AAA", + "message": "message8428" + }, + { + "key": "AAA", + "message": "message8429" + }, + { + "key": "AAA", + "message": "message8430" + }, + { + "key": "AAA", + "message": "message8431" + }, + { + "key": "AAA", + "message": "message8432" + }, + { + "key": "AAA", + "message": "message8433" + }, + { + "key": "AAA", + "message": "message8434" + }, + { + "key": "AAA", + "message": "message8435" + }, + { + "key": "AAA", + "message": "message8436_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8437" + }, + { + "key": "AAA", + "message": "message8438" + }, + { + "key": "AAA", + "message": "message8439" + }, + { + "key": "AAA", + "message": "message8440" + }, + { + "key": "AAA", + "message": "message8441" + }, + { + "key": "AAA", + "message": "message8442" + }, + { + "key": "AAA", + "message": "message8443" + }, + { + "key": "AAA", + "message": "message8444" + }, + { + "key": "AAA", + "message": "message8445" + }, + { + "key": "AAA", + "message": "message8446_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8447" + }, + { + "key": "AAA", + "message": "message8448" + }, + { + "key": "AAA", + "message": "message8449" + }, + { + "key": "AAA", + "message": "message8450" + }, + { + "key": "AAA", + "message": "message8451" + }, + { + "key": "AAA", + "message": "message8452" + }, + { + "key": "AAA", + "message": "message8453" + }, + { + "key": "AAA", + "message": "message8454" + }, + { + "key": "AAA", + "message": "message8455" + }, + { + "key": "AAA", + "message": "message8456_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8457" + }, + { + "key": "AAA", + "message": "message8458" + }, + { + "key": "AAA", + "message": "message8459" + }, + { + "key": "AAA", + "message": "message8460" + }, + { + "key": "AAA", + "message": "message8461" + }, + { + "key": "AAA", + "message": "message8462" + }, + { + "key": "AAA", + "message": "message8463" + }, + { + "key": "AAA", + "message": "message8464" + }, + { + "key": "AAA", + "message": "message8465" + }, + { + "key": "AAA", + "message": "message8466_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8467" + }, + { + "key": "AAA", + "message": "message8468" + }, + { + "key": "AAA", + "message": "message8469" + }, + { + "key": "AAA", + "message": "message8470" + }, + { + "key": "AAA", + "message": "message8471" + }, + { + "key": "AAA", + "message": "message8472" + }, + { + "key": "AAA", + "message": "message8473" + }, + { + "key": "AAA", + "message": "message8474" + }, + { + "key": "AAA", + "message": "message8475" + }, + { + "key": "AAA", + "message": "message8476_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8477" + }, + { + "key": "AAA", + "message": "message8478" + }, + { + "key": "AAA", + "message": "message8479" + }, + { + "key": "AAA", + "message": "message8480" + }, + { + "key": "AAA", + "message": "message8481" + }, + { + "key": "AAA", + "message": "message8482" + }, + { + "key": "AAA", + "message": "message8483" + }, + { + "key": "AAA", + "message": "message8484" + }, + { + "key": "AAA", + "message": "message8485" + }, + { + "key": "AAA", + "message": "message8486_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8487" + }, + { + "key": "AAA", + "message": "message8488" + }, + { + "key": "AAA", + "message": "message8489" + }, + { + "key": "AAA", + "message": "message8490" + }, + { + "key": "AAA", + "message": "message8491" + }, + { + "key": "AAA", + "message": "message8492" + }, + { + "key": "AAA", + "message": "message8493" + }, + { + "key": "AAA", + "message": "message8494" + }, + { + "key": "AAA", + "message": "message8495" + }, + { + "key": "AAA", + "message": "message8496_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8497" + }, + { + "key": "AAA", + "message": "message8498" + }, + { + "key": "AAA", + "message": "message8499" + }, + { + "key": "AAA", + "message": "message8500_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8501" + }, + { + "key": "AAA", + "message": "message8502" + }, + { + "key": "AAA", + "message": "message8503" + }, + { + "key": "AAA", + "message": "message8504" + }, + { + "key": "AAA", + "message": "message8505" + }, + { + "key": "AAA", + "message": "message8506_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8507" + }, + { + "key": "AAA", + "message": "message8508" + }, + { + "key": "AAA", + "message": "message8509" + }, + { + "key": "AAA", + "message": "message8510" + }, + { + "key": "AAA", + "message": "message8511" + }, + { + "key": "AAA", + "message": "message8512" + }, + { + "key": "AAA", + "message": "message8513" + }, + { + "key": "AAA", + "message": "message8514" + }, + { + "key": "AAA", + "message": "message8515" + }, + { + "key": "AAA", + "message": "message8516_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8517" + }, + { + "key": "AAA", + "message": "message8518" + }, + { + "key": "AAA", + "message": "message8519" + }, + { + "key": "AAA", + "message": "message8520" + }, + { + "key": "AAA", + "message": "message8521" + }, + { + "key": "AAA", + "message": "message8522" + }, + { + "key": "AAA", + "message": "message8523" + }, + { + "key": "AAA", + "message": "message8524" + }, + { + "key": "AAA", + "message": "message8525" + }, + { + "key": "AAA", + "message": "message8526_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8527" + }, + { + "key": "AAA", + "message": "message8528" + }, + { + "key": "AAA", + "message": "message8529" + }, + { + "key": "AAA", + "message": "message8530" + }, + { + "key": "AAA", + "message": "message8531" + }, + { + "key": "AAA", + "message": "message8532" + }, + { + "key": "AAA", + "message": "message8533" + }, + { + "key": "AAA", + "message": "message8534" + }, + { + "key": "AAA", + "message": "message8535" + }, + { + "key": "AAA", + "message": "message8536_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8537" + }, + { + "key": "AAA", + "message": "message8538" + }, + { + "key": "AAA", + "message": "message8539" + }, + { + "key": "AAA", + "message": "message8540" + }, + { + "key": "AAA", + "message": "message8541" + }, + { + "key": "AAA", + "message": "message8542" + }, + { + "key": "AAA", + "message": "message8543" + }, + { + "key": "AAA", + "message": "message8544" + }, + { + "key": "AAA", + "message": "message8545" + }, + { + "key": "AAA", + "message": "message8546_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8547" + }, + { + "key": "AAA", + "message": "message8548" + }, + { + "key": "AAA", + "message": "message8549" + }, + { + "key": "AAA", + "message": "message8550" + }, + { + "key": "AAA", + "message": "message8551" + }, + { + "key": "AAA", + "message": "message8552" + }, + { + "key": "AAA", + "message": "message8553" + }, + { + "key": "AAA", + "message": "message8554" + }, + { + "key": "AAA", + "message": "message8555" + }, + { + "key": "AAA", + "message": "message8556_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8557" + }, + { + "key": "AAA", + "message": "message8558" + }, + { + "key": "AAA", + "message": "message8559" + }, + { + "key": "AAA", + "message": "message8560" + }, + { + "key": "AAA", + "message": "message8561" + }, + { + "key": "AAA", + "message": "message8562" + }, + { + "key": "AAA", + "message": "message8563" + }, + { + "key": "AAA", + "message": "message8564" + }, + { + "key": "AAA", + "message": "message8565" + }, + { + "key": "AAA", + "message": "message8566_xxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8567" + }, + { + "key": "AAA", + "message": "message8568" + }, + { + "key": "AAA", + "message": "message8569" + }, + { + "key": "AAA", + "message": "message8570" + }, + { + "key": "AAA", + "message": "message8571" + }, + { + "key": "AAA", + "message": "message8572" + }, + { + "key": "AAA", + "message": "message8573" + }, + { + "key": "AAA", + "message": "message8574" + }, + { + "key": "AAA", + "message": "message8575" + }, + { + "key": "AAA", + "message": "message8576_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8577" + }, + { + "key": "AAA", + "message": "message8578" + }, + { + "key": "AAA", + "message": "message8579" + }, + { + "key": "AAA", + "message": "message8580" + }, + { + "key": "AAA", + "message": "message8581" + }, + { + "key": "AAA", + "message": "message8582" + }, + { + "key": "AAA", + "message": "message8583" + }, + { + "key": "AAA", + "message": "message8584" + }, + { + "key": "AAA", + "message": "message8585" + }, + { + "key": "AAA", + "message": "message8586_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8587" + }, + { + "key": "AAA", + "message": "message8588" + }, + { + "key": "AAA", + "message": "message8589" + }, + { + "key": "AAA", + "message": "message8590" + }, + { + "key": "AAA", + "message": "message8591" + }, + { + "key": "AAA", + "message": "message8592" + }, + { + "key": "AAA", + "message": "message8593" + }, + { + "key": "AAA", + "message": "message8594" + }, + { + "key": "AAA", + "message": "message8595" + }, + { + "key": "AAA", + "message": "message8596_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8597" + }, + { + "key": "AAA", + "message": "message8598" + }, + { + "key": "AAA", + "message": "message8599" + }, + { + "key": "AAA", + "message": "message8600_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8601" + }, + { + "key": "AAA", + "message": "message8602" + }, + { + "key": "AAA", + "message": "message8603" + }, + { + "key": "AAA", + "message": "message8604" + }, + { + "key": "AAA", + "message": "message8605" + }, + { + "key": "AAA", + "message": "message8606_xxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8607" + }, + { + "key": "AAA", + "message": "message8608" + }, + { + "key": "AAA", + "message": "message8609" + }, + { + "key": "AAA", + "message": "message8610" + }, + { + "key": "AAA", + "message": "message8611" + }, + { + "key": "AAA", + "message": "message8612" + }, + { + "key": "AAA", + "message": "message8613" + }, + { + "key": "AAA", + "message": "message8614" + }, + { + "key": "AAA", + "message": "message8615" + }, + { + "key": "AAA", + "message": "message8616_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8617" + }, + { + "key": "AAA", + "message": "message8618" + }, + { + "key": "AAA", + "message": "message8619" + }, + { + "key": "AAA", + "message": "message8620" + }, + { + "key": "AAA", + "message": "message8621" + }, + { + "key": "AAA", + "message": "message8622" + }, + { + "key": "AAA", + "message": "message8623" + }, + { + "key": "AAA", + "message": "message8624" + }, + { + "key": "AAA", + "message": "message8625" + }, + { + "key": "AAA", + "message": "message8626_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8627" + }, + { + "key": "AAA", + "message": "message8628" + }, + { + "key": "AAA", + "message": "message8629" + }, + { + "key": "AAA", + "message": "message8630" + }, + { + "key": "AAA", + "message": "message8631" + }, + { + "key": "AAA", + "message": "message8632" + }, + { + "key": "AAA", + "message": "message8633" + }, + { + "key": "AAA", + "message": "message8634" + }, + { + "key": "AAA", + "message": "message8635" + }, + { + "key": "AAA", + "message": "message8636_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8637" + }, + { + "key": "AAA", + "message": "message8638" + }, + { + "key": "AAA", + "message": "message8639" + }, + { + "key": "AAA", + "message": "message8640" + }, + { + "key": "AAA", + "message": "message8641" + }, + { + "key": "AAA", + "message": "message8642" + }, + { + "key": "AAA", + "message": "message8643" + }, + { + "key": "AAA", + "message": "message8644" + }, + { + "key": "AAA", + "message": "message8645" + }, + { + "key": "AAA", + "message": "message8646_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8647" + }, + { + "key": "AAA", + "message": "message8648" + }, + { + "key": "AAA", + "message": "message8649" + }, + { + "key": "AAA", + "message": "message8650" + }, + { + "key": "AAA", + "message": "message8651" + }, + { + "key": "AAA", + "message": "message8652" + }, + { + "key": "AAA", + "message": "message8653" + }, + { + "key": "AAA", + "message": "message8654" + }, + { + "key": "AAA", + "message": "message8655" + }, + { + "key": "AAA", + "message": "message8656_xxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8657" + }, + { + "key": "AAA", + "message": "message8658" + }, + { + "key": "AAA", + "message": "message8659" + }, + { + "key": "AAA", + "message": "message8660" + }, + { + "key": "AAA", + "message": "message8661" + }, + { + "key": "AAA", + "message": "message8662" + }, + { + "key": "AAA", + "message": "message8663" + }, + { + "key": "AAA", + "message": "message8664" + }, + { + "key": "AAA", + "message": "message8665" + }, + { + "key": "AAA", + "message": "message8666_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8667" + }, + { + "key": "AAA", + "message": "message8668" + }, + { + "key": "AAA", + "message": "message8669" + }, + { + "key": "AAA", + "message": "message8670" + }, + { + "key": "AAA", + "message": "message8671" + }, + { + "key": "AAA", + "message": "message8672" + }, + { + "key": "AAA", + "message": "message8673" + }, + { + "key": "AAA", + "message": "message8674" + }, + { + "key": "AAA", + "message": "message8675" + }, + { + "key": "AAA", + "message": "message8676_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8677" + }, + { + "key": "AAA", + "message": "message8678" + }, + { + "key": "AAA", + "message": "message8679" + }, + { + "key": "AAA", + "message": "message8680" + }, + { + "key": "AAA", + "message": "message8681" + }, + { + "key": "AAA", + "message": "message8682" + }, + { + "key": "AAA", + "message": "message8683" + }, + { + "key": "AAA", + "message": "message8684" + }, + { + "key": "AAA", + "message": "message8685" + }, + { + "key": "AAA", + "message": "message8686_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8687" + }, + { + "key": "AAA", + "message": "message8688" + }, + { + "key": "AAA", + "message": "message8689" + }, + { + "key": "AAA", + "message": "message8690" + }, + { + "key": "AAA", + "message": "message8691" + }, + { + "key": "AAA", + "message": "message8692" + }, + { + "key": "AAA", + "message": "message8693" + }, + { + "key": "AAA", + "message": "message8694" + }, + { + "key": "AAA", + "message": "message8695" + }, + { + "key": "AAA", + "message": "message8696_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8697" + }, + { + "key": "AAA", + "message": "message8698" + }, + { + "key": "AAA", + "message": "message8699" + }, + { + "key": "AAA", + "message": "message8700_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8701" + }, + { + "key": "AAA", + "message": "message8702" + }, + { + "key": "AAA", + "message": "message8703" + }, + { + "key": "AAA", + "message": "message8704" + }, + { + "key": "AAA", + "message": "message8705" + }, + { + "key": "AAA", + "message": "message8706_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8707" + }, + { + "key": "AAA", + "message": "message8708" + }, + { + "key": "AAA", + "message": "message8709" + }, + { + "key": "AAA", + "message": "message8710" + }, + { + "key": "AAA", + "message": "message8711" + }, + { + "key": "AAA", + "message": "message8712" + }, + { + "key": "AAA", + "message": "message8713" + }, + { + "key": "AAA", + "message": "message8714" + }, + { + "key": "AAA", + "message": "message8715" + }, + { + "key": "AAA", + "message": "message8716_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8717" + }, + { + "key": "AAA", + "message": "message8718" + }, + { + "key": "AAA", + "message": "message8719" + }, + { + "key": "AAA", + "message": "message8720" + }, + { + "key": "AAA", + "message": "message8721" + }, + { + "key": "AAA", + "message": "message8722" + }, + { + "key": "AAA", + "message": "message8723" + }, + { + "key": "AAA", + "message": "message8724" + }, + { + "key": "AAA", + "message": "message8725" + }, + { + "key": "AAA", + "message": "message8726_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8727" + }, + { + "key": "AAA", + "message": "message8728" + }, + { + "key": "AAA", + "message": "message8729" + }, + { + "key": "AAA", + "message": "message8730" + }, + { + "key": "AAA", + "message": "message8731" + }, + { + "key": "AAA", + "message": "message8732" + }, + { + "key": "AAA", + "message": "message8733" + }, + { + "key": "AAA", + "message": "message8734" + }, + { + "key": "AAA", + "message": "message8735" + }, + { + "key": "AAA", + "message": "message8736_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8737" + }, + { + "key": "AAA", + "message": "message8738" + }, + { + "key": "AAA", + "message": "message8739" + }, + { + "key": "AAA", + "message": "message8740" + }, + { + "key": "AAA", + "message": "message8741" + }, + { + "key": "AAA", + "message": "message8742" + }, + { + "key": "AAA", + "message": "message8743" + }, + { + "key": "AAA", + "message": "message8744" + }, + { + "key": "AAA", + "message": "message8745" + }, + { + "key": "AAA", + "message": "message8746_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8747" + }, + { + "key": "AAA", + "message": "message8748" + }, + { + "key": "AAA", + "message": "message8749" + }, + { + "key": "AAA", + "message": "message8750" + }, + { + "key": "AAA", + "message": "message8751" + }, + { + "key": "AAA", + "message": "message8752" + }, + { + "key": "AAA", + "message": "message8753" + }, + { + "key": "AAA", + "message": "message8754" + }, + { + "key": "AAA", + "message": "message8755" + }, + { + "key": "AAA", + "message": "message8756_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8757" + }, + { + "key": "AAA", + "message": "message8758" + }, + { + "key": "AAA", + "message": "message8759" + }, + { + "key": "AAA", + "message": "message8760" + }, + { + "key": "AAA", + "message": "message8761" + }, + { + "key": "AAA", + "message": "message8762" + }, + { + "key": "AAA", + "message": "message8763" + }, + { + "key": "AAA", + "message": "message8764" + }, + { + "key": "AAA", + "message": "message8765" + }, + { + "key": "AAA", + "message": "message8766_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8767" + }, + { + "key": "AAA", + "message": "message8768" + }, + { + "key": "AAA", + "message": "message8769" + }, + { + "key": "AAA", + "message": "message8770" + }, + { + "key": "AAA", + "message": "message8771" + }, + { + "key": "AAA", + "message": "message8772" + }, + { + "key": "AAA", + "message": "message8773" + }, + { + "key": "AAA", + "message": "message8774" + }, + { + "key": "AAA", + "message": "message8775" + }, + { + "key": "AAA", + "message": "message8776_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8777" + }, + { + "key": "AAA", + "message": "message8778" + }, + { + "key": "AAA", + "message": "message8779" + }, + { + "key": "AAA", + "message": "message8780" + }, + { + "key": "AAA", + "message": "message8781" + }, + { + "key": "AAA", + "message": "message8782" + }, + { + "key": "AAA", + "message": "message8783" + }, + { + "key": "AAA", + "message": "message8784" + }, + { + "key": "AAA", + "message": "message8785" + }, + { + "key": "AAA", + "message": "message8786_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8787" + }, + { + "key": "AAA", + "message": "message8788" + }, + { + "key": "AAA", + "message": "message8789" + }, + { + "key": "AAA", + "message": "message8790" + }, + { + "key": "AAA", + "message": "message8791" + }, + { + "key": "AAA", + "message": "message8792" + }, + { + "key": "AAA", + "message": "message8793" + }, + { + "key": "AAA", + "message": "message8794" + }, + { + "key": "AAA", + "message": "message8795" + }, + { + "key": "AAA", + "message": "message8796_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "AAA", + "message": "message8797" + }, + { + "key": "AAA", + "message": "message8798" + }, + { + "key": "AAA", + "message": "message8799" + }, + { + "key": "AAA", + "message": "message8800_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8801" + }, + { + "key": "BBB", + "message": "message8802" + }, + { + "key": "BBB", + "message": "message8803" + }, + { + "key": "BBB", + "message": "message8804" + }, + { + "key": "BBB", + "message": "message8805" + }, + { + "key": "BBB", + "message": "message8806_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8807" + }, + { + "key": "BBB", + "message": "message8808" + }, + { + "key": "BBB", + "message": "message8809" + }, + { + "key": "BBB", + "message": "message8810" + }, + { + "key": "BBB", + "message": "message8811" + }, + { + "key": "BBB", + "message": "message8812" + }, + { + "key": "BBB", + "message": "message8813" + }, + { + "key": "BBB", + "message": "message8814" + }, + { + "key": "BBB", + "message": "message8815" + }, + { + "key": "BBB", + "message": "message8816_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8817" + }, + { + "key": "BBB", + "message": "message8818" + }, + { + "key": "BBB", + "message": "message8819" + }, + { + "key": "BBB", + "message": "message8820" + }, + { + "key": "BBB", + "message": "message8821" + }, + { + "key": "BBB", + "message": "message8822" + }, + { + "key": "BBB", + "message": "message8823" + }, + { + "key": "BBB", + "message": "message8824" + }, + { + "key": "BBB", + "message": "message8825" + }, + { + "key": "BBB", + "message": "message8826_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8827" + }, + { + "key": "BBB", + "message": "message8828" + }, + { + "key": "BBB", + "message": "message8829" + }, + { + "key": "BBB", + "message": "message8830" + }, + { + "key": "BBB", + "message": "message8831" + }, + { + "key": "BBB", + "message": "message8832" + }, + { + "key": "BBB", + "message": "message8833" + }, + { + "key": "BBB", + "message": "message8834" + }, + { + "key": "BBB", + "message": "message8835" + }, + { + "key": "BBB", + "message": "message8836_xxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8837" + }, + { + "key": "BBB", + "message": "message8838" + }, + { + "key": "BBB", + "message": "message8839" + }, + { + "key": "BBB", + "message": "message8840" + }, + { + "key": "BBB", + "message": "message8841" + }, + { + "key": "BBB", + "message": "message8842" + }, + { + "key": "BBB", + "message": "message8843" + }, + { + "key": "BBB", + "message": "message8844" + }, + { + "key": "BBB", + "message": "message8845" + }, + { + "key": "BBB", + "message": "message8846_xxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8847" + }, + { + "key": "BBB", + "message": "message8848" + }, + { + "key": "BBB", + "message": "message8849" + }, + { + "key": "BBB", + "message": "message8850" + }, + { + "key": "BBB", + "message": "message8851" + }, + { + "key": "BBB", + "message": "message8852" + }, + { + "key": "BBB", + "message": "message8853" + }, + { + "key": "BBB", + "message": "message8854" + }, + { + "key": "BBB", + "message": "message8855" + }, + { + "key": "BBB", + "message": "message8856_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8857" + }, + { + "key": "BBB", + "message": "message8858" + }, + { + "key": "BBB", + "message": "message8859" + }, + { + "key": "BBB", + "message": "message8860" + }, + { + "key": "BBB", + "message": "message8861" + }, + { + "key": "BBB", + "message": "message8862" + }, + { + "key": "BBB", + "message": "message8863" + }, + { + "key": "BBB", + "message": "message8864" + }, + { + "key": "BBB", + "message": "message8865" + }, + { + "key": "BBB", + "message": "message8866_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8867" + }, + { + "key": "BBB", + "message": "message8868" + }, + { + "key": "BBB", + "message": "message8869" + }, + { + "key": "BBB", + "message": "message8870" + }, + { + "key": "BBB", + "message": "message8871" + }, + { + "key": "BBB", + "message": "message8872" + }, + { + "key": "BBB", + "message": "message8873" + }, + { + "key": "BBB", + "message": "message8874" + }, + { + "key": "BBB", + "message": "message8875" + }, + { + "key": "BBB", + "message": "message8876_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8877" + }, + { + "key": "BBB", + "message": "message8878" + }, + { + "key": "BBB", + "message": "message8879" + }, + { + "key": "BBB", + "message": "message8880" + }, + { + "key": "BBB", + "message": "message8881" + }, + { + "key": "BBB", + "message": "message8882" + }, + { + "key": "BBB", + "message": "message8883" + }, + { + "key": "BBB", + "message": "message8884" + }, + { + "key": "BBB", + "message": "message8885" + }, + { + "key": "BBB", + "message": "message8886_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8887" + }, + { + "key": "BBB", + "message": "message8888" + }, + { + "key": "BBB", + "message": "message8889" + }, + { + "key": "BBB", + "message": "message8890" + }, + { + "key": "BBB", + "message": "message8891" + }, + { + "key": "BBB", + "message": "message8892" + }, + { + "key": "BBB", + "message": "message8893" + }, + { + "key": "BBB", + "message": "message8894" + }, + { + "key": "BBB", + "message": "message8895" + }, + { + "key": "BBB", + "message": "message8896_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8897" + }, + { + "key": "BBB", + "message": "message8898" + }, + { + "key": "BBB", + "message": "message8899" + }, + { + "key": "BBB", + "message": "message8900_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8901" + }, + { + "key": "BBB", + "message": "message8902" + }, + { + "key": "BBB", + "message": "message8903" + }, + { + "key": "BBB", + "message": "message8904" + }, + { + "key": "BBB", + "message": "message8905" + }, + { + "key": "BBB", + "message": "message8906_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8907" + }, + { + "key": "BBB", + "message": "message8908" + }, + { + "key": "BBB", + "message": "message8909" + }, + { + "key": "BBB", + "message": "message8910" + }, + { + "key": "BBB", + "message": "message8911" + }, + { + "key": "BBB", + "message": "message8912" + }, + { + "key": "BBB", + "message": "message8913" + }, + { + "key": "BBB", + "message": "message8914" + }, + { + "key": "BBB", + "message": "message8915" + }, + { + "key": "BBB", + "message": "message8916_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8917" + }, + { + "key": "BBB", + "message": "message8918" + }, + { + "key": "BBB", + "message": "message8919" + }, + { + "key": "BBB", + "message": "message8920" + }, + { + "key": "BBB", + "message": "message8921" + }, + { + "key": "BBB", + "message": "message8922" + }, + { + "key": "BBB", + "message": "message8923" + }, + { + "key": "BBB", + "message": "message8924" + }, + { + "key": "BBB", + "message": "message8925" + }, + { + "key": "BBB", + "message": "message8926_xxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8927" + }, + { + "key": "BBB", + "message": "message8928" + }, + { + "key": "BBB", + "message": "message8929" + }, + { + "key": "BBB", + "message": "message8930" + }, + { + "key": "BBB", + "message": "message8931" + }, + { + "key": "BBB", + "message": "message8932" + }, + { + "key": "BBB", + "message": "message8933" + }, + { + "key": "BBB", + "message": "message8934" + }, + { + "key": "BBB", + "message": "message8935" + }, + { + "key": "BBB", + "message": "message8936_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8937" + }, + { + "key": "BBB", + "message": "message8938" + }, + { + "key": "BBB", + "message": "message8939" + }, + { + "key": "BBB", + "message": "message8940" + }, + { + "key": "BBB", + "message": "message8941" + }, + { + "key": "BBB", + "message": "message8942" + }, + { + "key": "BBB", + "message": "message8943" + }, + { + "key": "BBB", + "message": "message8944" + }, + { + "key": "BBB", + "message": "message8945" + }, + { + "key": "BBB", + "message": "message8946_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8947" + }, + { + "key": "BBB", + "message": "message8948" + }, + { + "key": "BBB", + "message": "message8949" + }, + { + "key": "BBB", + "message": "message8950" + }, + { + "key": "BBB", + "message": "message8951" + }, + { + "key": "BBB", + "message": "message8952" + }, + { + "key": "BBB", + "message": "message8953" + }, + { + "key": "BBB", + "message": "message8954" + }, + { + "key": "BBB", + "message": "message8955" + }, + { + "key": "BBB", + "message": "message8956_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8957" + }, + { + "key": "BBB", + "message": "message8958" + }, + { + "key": "BBB", + "message": "message8959" + }, + { + "key": "BBB", + "message": "message8960" + }, + { + "key": "BBB", + "message": "message8961" + }, + { + "key": "BBB", + "message": "message8962" + }, + { + "key": "BBB", + "message": "message8963" + }, + { + "key": "BBB", + "message": "message8964" + }, + { + "key": "BBB", + "message": "message8965" + }, + { + "key": "BBB", + "message": "message8966_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8967" + }, + { + "key": "BBB", + "message": "message8968" + }, + { + "key": "BBB", + "message": "message8969" + }, + { + "key": "BBB", + "message": "message8970" + }, + { + "key": "BBB", + "message": "message8971" + }, + { + "key": "BBB", + "message": "message8972" + }, + { + "key": "BBB", + "message": "message8973" + }, + { + "key": "BBB", + "message": "message8974" + }, + { + "key": "BBB", + "message": "message8975" + }, + { + "key": "BBB", + "message": "message8976_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8977" + }, + { + "key": "BBB", + "message": "message8978" + }, + { + "key": "BBB", + "message": "message8979" + }, + { + "key": "BBB", + "message": "message8980" + }, + { + "key": "BBB", + "message": "message8981" + }, + { + "key": "BBB", + "message": "message8982" + }, + { + "key": "BBB", + "message": "message8983" + }, + { + "key": "BBB", + "message": "message8984" + }, + { + "key": "BBB", + "message": "message8985" + }, + { + "key": "BBB", + "message": "message8986_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8987" + }, + { + "key": "BBB", + "message": "message8988" + }, + { + "key": "BBB", + "message": "message8989" + }, + { + "key": "BBB", + "message": "message8990" + }, + { + "key": "BBB", + "message": "message8991" + }, + { + "key": "BBB", + "message": "message8992" + }, + { + "key": "BBB", + "message": "message8993" + }, + { + "key": "BBB", + "message": "message8994" + }, + { + "key": "BBB", + "message": "message8995" + }, + { + "key": "BBB", + "message": "message8996_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message8997" + }, + { + "key": "BBB", + "message": "message8998" + }, + { + "key": "BBB", + "message": "message8999" + }, + { + "key": "BBB", + "message": "message9000_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9001" + }, + { + "key": "BBB", + "message": "message9002" + }, + { + "key": "BBB", + "message": "message9003" + }, + { + "key": "BBB", + "message": "message9004" + }, + { + "key": "BBB", + "message": "message9005" + }, + { + "key": "BBB", + "message": "message9006_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9007" + }, + { + "key": "BBB", + "message": "message9008" + }, + { + "key": "BBB", + "message": "message9009" + }, + { + "key": "BBB", + "message": "message9010" + }, + { + "key": "BBB", + "message": "message9011" + }, + { + "key": "BBB", + "message": "message9012" + }, + { + "key": "BBB", + "message": "message9013" + }, + { + "key": "BBB", + "message": "message9014" + }, + { + "key": "BBB", + "message": "message9015" + }, + { + "key": "BBB", + "message": "message9016_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9017" + }, + { + "key": "BBB", + "message": "message9018" + }, + { + "key": "BBB", + "message": "message9019" + }, + { + "key": "BBB", + "message": "message9020" + }, + { + "key": "BBB", + "message": "message9021" + }, + { + "key": "BBB", + "message": "message9022" + }, + { + "key": "BBB", + "message": "message9023" + }, + { + "key": "BBB", + "message": "message9024" + }, + { + "key": "BBB", + "message": "message9025" + }, + { + "key": "BBB", + "message": "message9026_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9027" + }, + { + "key": "BBB", + "message": "message9028" + }, + { + "key": "BBB", + "message": "message9029" + }, + { + "key": "BBB", + "message": "message9030" + }, + { + "key": "BBB", + "message": "message9031" + }, + { + "key": "BBB", + "message": "message9032" + }, + { + "key": "BBB", + "message": "message9033" + }, + { + "key": "BBB", + "message": "message9034" + }, + { + "key": "BBB", + "message": "message9035" + }, + { + "key": "BBB", + "message": "message9036_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9037" + }, + { + "key": "BBB", + "message": "message9038" + }, + { + "key": "BBB", + "message": "message9039" + }, + { + "key": "BBB", + "message": "message9040" + }, + { + "key": "BBB", + "message": "message9041" + }, + { + "key": "BBB", + "message": "message9042" + }, + { + "key": "BBB", + "message": "message9043" + }, + { + "key": "BBB", + "message": "message9044" + }, + { + "key": "BBB", + "message": "message9045" + }, + { + "key": "BBB", + "message": "message9046_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9047" + }, + { + "key": "BBB", + "message": "message9048" + }, + { + "key": "BBB", + "message": "message9049" + }, + { + "key": "BBB", + "message": "message9050" + }, + { + "key": "BBB", + "message": "message9051" + }, + { + "key": "BBB", + "message": "message9052" + }, + { + "key": "BBB", + "message": "message9053" + }, + { + "key": "BBB", + "message": "message9054" + }, + { + "key": "BBB", + "message": "message9055" + }, + { + "key": "BBB", + "message": "message9056_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9057" + }, + { + "key": "BBB", + "message": "message9058" + }, + { + "key": "BBB", + "message": "message9059" + }, + { + "key": "BBB", + "message": "message9060" + }, + { + "key": "BBB", + "message": "message9061" + }, + { + "key": "BBB", + "message": "message9062" + }, + { + "key": "BBB", + "message": "message9063" + }, + { + "key": "BBB", + "message": "message9064" + }, + { + "key": "BBB", + "message": "message9065" + }, + { + "key": "BBB", + "message": "message9066_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9067" + }, + { + "key": "BBB", + "message": "message9068" + }, + { + "key": "BBB", + "message": "message9069" + }, + { + "key": "BBB", + "message": "message9070" + }, + { + "key": "BBB", + "message": "message9071" + }, + { + "key": "BBB", + "message": "message9072" + }, + { + "key": "BBB", + "message": "message9073" + }, + { + "key": "BBB", + "message": "message9074" + }, + { + "key": "BBB", + "message": "message9075" + }, + { + "key": "BBB", + "message": "message9076_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9077" + }, + { + "key": "BBB", + "message": "message9078" + }, + { + "key": "BBB", + "message": "message9079" + }, + { + "key": "BBB", + "message": "message9080" + }, + { + "key": "BBB", + "message": "message9081" + }, + { + "key": "BBB", + "message": "message9082" + }, + { + "key": "BBB", + "message": "message9083" + }, + { + "key": "BBB", + "message": "message9084" + }, + { + "key": "BBB", + "message": "message9085" + }, + { + "key": "BBB", + "message": "message9086_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9087" + }, + { + "key": "BBB", + "message": "message9088" + }, + { + "key": "BBB", + "message": "message9089" + }, + { + "key": "BBB", + "message": "message9090" + }, + { + "key": "BBB", + "message": "message9091" + }, + { + "key": "BBB", + "message": "message9092" + }, + { + "key": "BBB", + "message": "message9093" + }, + { + "key": "BBB", + "message": "message9094" + }, + { + "key": "BBB", + "message": "message9095" + }, + { + "key": "BBB", + "message": "message9096_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9097" + }, + { + "key": "BBB", + "message": "message9098" + }, + { + "key": "BBB", + "message": "message9099" + }, + { + "key": "BBB", + "message": "message9100_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9101" + }, + { + "key": "BBB", + "message": "message9102" + }, + { + "key": "BBB", + "message": "message9103" + }, + { + "key": "BBB", + "message": "message9104" + }, + { + "key": "BBB", + "message": "message9105" + }, + { + "key": "BBB", + "message": "message9106_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9107" + }, + { + "key": "BBB", + "message": "message9108" + }, + { + "key": "BBB", + "message": "message9109" + }, + { + "key": "BBB", + "message": "message9110" + }, + { + "key": "BBB", + "message": "message9111" + }, + { + "key": "BBB", + "message": "message9112" + }, + { + "key": "BBB", + "message": "message9113" + }, + { + "key": "BBB", + "message": "message9114" + }, + { + "key": "BBB", + "message": "message9115" + }, + { + "key": "BBB", + "message": "message9116_xxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9117" + }, + { + "key": "BBB", + "message": "message9118" + }, + { + "key": "BBB", + "message": "message9119" + }, + { + "key": "BBB", + "message": "message9120" + }, + { + "key": "BBB", + "message": "message9121" + }, + { + "key": "BBB", + "message": "message9122" + }, + { + "key": "BBB", + "message": "message9123" + }, + { + "key": "BBB", + "message": "message9124" + }, + { + "key": "BBB", + "message": "message9125" + }, + { + "key": "BBB", + "message": "message9126_xxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9127" + }, + { + "key": "BBB", + "message": "message9128" + }, + { + "key": "BBB", + "message": "message9129" + }, + { + "key": "BBB", + "message": "message9130" + }, + { + "key": "BBB", + "message": "message9131" + }, + { + "key": "BBB", + "message": "message9132" + }, + { + "key": "BBB", + "message": "message9133" + }, + { + "key": "BBB", + "message": "message9134" + }, + { + "key": "BBB", + "message": "message9135" + }, + { + "key": "BBB", + "message": "message9136_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9137" + }, + { + "key": "BBB", + "message": "message9138" + }, + { + "key": "BBB", + "message": "message9139" + }, + { + "key": "BBB", + "message": "message9140" + }, + { + "key": "BBB", + "message": "message9141" + }, + { + "key": "BBB", + "message": "message9142" + }, + { + "key": "BBB", + "message": "message9143" + }, + { + "key": "BBB", + "message": "message9144" + }, + { + "key": "BBB", + "message": "message9145" + }, + { + "key": "BBB", + "message": "message9146_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9147" + }, + { + "key": "BBB", + "message": "message9148" + }, + { + "key": "BBB", + "message": "message9149" + }, + { + "key": "BBB", + "message": "message9150" + }, + { + "key": "BBB", + "message": "message9151" + }, + { + "key": "BBB", + "message": "message9152" + }, + { + "key": "BBB", + "message": "message9153" + }, + { + "key": "BBB", + "message": "message9154" + }, + { + "key": "BBB", + "message": "message9155" + }, + { + "key": "BBB", + "message": "message9156_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9157" + }, + { + "key": "BBB", + "message": "message9158" + }, + { + "key": "BBB", + "message": "message9159" + }, + { + "key": "BBB", + "message": "message9160" + }, + { + "key": "BBB", + "message": "message9161" + }, + { + "key": "BBB", + "message": "message9162" + }, + { + "key": "BBB", + "message": "message9163" + }, + { + "key": "BBB", + "message": "message9164" + }, + { + "key": "BBB", + "message": "message9165" + }, + { + "key": "BBB", + "message": "message9166_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9167" + }, + { + "key": "BBB", + "message": "message9168" + }, + { + "key": "BBB", + "message": "message9169" + }, + { + "key": "BBB", + "message": "message9170" + }, + { + "key": "BBB", + "message": "message9171" + }, + { + "key": "BBB", + "message": "message9172" + }, + { + "key": "BBB", + "message": "message9173" + }, + { + "key": "BBB", + "message": "message9174" + }, + { + "key": "BBB", + "message": "message9175" + }, + { + "key": "BBB", + "message": "message9176_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9177" + }, + { + "key": "BBB", + "message": "message9178" + }, + { + "key": "BBB", + "message": "message9179" + }, + { + "key": "BBB", + "message": "message9180" + }, + { + "key": "BBB", + "message": "message9181" + }, + { + "key": "BBB", + "message": "message9182" + }, + { + "key": "BBB", + "message": "message9183" + }, + { + "key": "BBB", + "message": "message9184" + }, + { + "key": "BBB", + "message": "message9185" + }, + { + "key": "BBB", + "message": "message9186_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9187" + }, + { + "key": "BBB", + "message": "message9188" + }, + { + "key": "BBB", + "message": "message9189" + }, + { + "key": "BBB", + "message": "message9190" + }, + { + "key": "BBB", + "message": "message9191" + }, + { + "key": "BBB", + "message": "message9192" + }, + { + "key": "BBB", + "message": "message9193" + }, + { + "key": "BBB", + "message": "message9194" + }, + { + "key": "BBB", + "message": "message9195" + }, + { + "key": "BBB", + "message": "message9196_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "BBB", + "message": "message9197" + }, + { + "key": "BBB", + "message": "message9198" + }, + { + "key": "BBB", + "message": "message9199" + }, + { + "key": "BBB", + "message": "message9200_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9201" + }, + { + "key": "CCC", + "message": "message9202" + }, + { + "key": "CCC", + "message": "message9203" + }, + { + "key": "CCC", + "message": "message9204" + }, + { + "key": "CCC", + "message": "message9205" + }, + { + "key": "CCC", + "message": "message9206_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9207" + }, + { + "key": "CCC", + "message": "message9208" + }, + { + "key": "CCC", + "message": "message9209" + }, + { + "key": "CCC", + "message": "message9210" + }, + { + "key": "CCC", + "message": "message9211" + }, + { + "key": "CCC", + "message": "message9212" + }, + { + "key": "CCC", + "message": "message9213" + }, + { + "key": "CCC", + "message": "message9214" + }, + { + "key": "CCC", + "message": "message9215" + }, + { + "key": "CCC", + "message": "message9216_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9217" + }, + { + "key": "CCC", + "message": "message9218" + }, + { + "key": "CCC", + "message": "message9219" + }, + { + "key": "CCC", + "message": "message9220" + }, + { + "key": "CCC", + "message": "message9221" + }, + { + "key": "CCC", + "message": "message9222" + }, + { + "key": "CCC", + "message": "message9223" + }, + { + "key": "CCC", + "message": "message9224" + }, + { + "key": "CCC", + "message": "message9225" + }, + { + "key": "CCC", + "message": "message9226_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9227" + }, + { + "key": "CCC", + "message": "message9228" + }, + { + "key": "CCC", + "message": "message9229" + }, + { + "key": "CCC", + "message": "message9230" + }, + { + "key": "CCC", + "message": "message9231" + }, + { + "key": "CCC", + "message": "message9232" + }, + { + "key": "CCC", + "message": "message9233" + }, + { + "key": "CCC", + "message": "message9234" + }, + { + "key": "CCC", + "message": "message9235" + }, + { + "key": "CCC", + "message": "message9236_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9237" + }, + { + "key": "CCC", + "message": "message9238" + }, + { + "key": "CCC", + "message": "message9239" + }, + { + "key": "CCC", + "message": "message9240" + }, + { + "key": "CCC", + "message": "message9241" + }, + { + "key": "CCC", + "message": "message9242" + }, + { + "key": "CCC", + "message": "message9243" + }, + { + "key": "CCC", + "message": "message9244" + }, + { + "key": "CCC", + "message": "message9245" + }, + { + "key": "CCC", + "message": "message9246_xxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9247" + }, + { + "key": "CCC", + "message": "message9248" + }, + { + "key": "CCC", + "message": "message9249" + }, + { + "key": "CCC", + "message": "message9250" + }, + { + "key": "CCC", + "message": "message9251" + }, + { + "key": "CCC", + "message": "message9252" + }, + { + "key": "CCC", + "message": "message9253" + }, + { + "key": "CCC", + "message": "message9254" + }, + { + "key": "CCC", + "message": "message9255" + }, + { + "key": "CCC", + "message": "message9256_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9257" + }, + { + "key": "CCC", + "message": "message9258" + }, + { + "key": "CCC", + "message": "message9259" + }, + { + "key": "CCC", + "message": "message9260" + }, + { + "key": "CCC", + "message": "message9261" + }, + { + "key": "CCC", + "message": "message9262" + }, + { + "key": "CCC", + "message": "message9263" + }, + { + "key": "CCC", + "message": "message9264" + }, + { + "key": "CCC", + "message": "message9265" + }, + { + "key": "CCC", + "message": "message9266_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9267" + }, + { + "key": "CCC", + "message": "message9268" + }, + { + "key": "CCC", + "message": "message9269" + }, + { + "key": "CCC", + "message": "message9270" + }, + { + "key": "CCC", + "message": "message9271" + }, + { + "key": "CCC", + "message": "message9272" + }, + { + "key": "CCC", + "message": "message9273" + }, + { + "key": "CCC", + "message": "message9274" + }, + { + "key": "CCC", + "message": "message9275" + }, + { + "key": "CCC", + "message": "message9276_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9277" + }, + { + "key": "CCC", + "message": "message9278" + }, + { + "key": "CCC", + "message": "message9279" + }, + { + "key": "CCC", + "message": "message9280" + }, + { + "key": "CCC", + "message": "message9281" + }, + { + "key": "CCC", + "message": "message9282" + }, + { + "key": "CCC", + "message": "message9283" + }, + { + "key": "CCC", + "message": "message9284" + }, + { + "key": "CCC", + "message": "message9285" + }, + { + "key": "CCC", + "message": "message9286_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9287" + }, + { + "key": "CCC", + "message": "message9288" + }, + { + "key": "CCC", + "message": "message9289" + }, + { + "key": "CCC", + "message": "message9290" + }, + { + "key": "CCC", + "message": "message9291" + }, + { + "key": "CCC", + "message": "message9292" + }, + { + "key": "CCC", + "message": "message9293" + }, + { + "key": "CCC", + "message": "message9294" + }, + { + "key": "CCC", + "message": "message9295" + }, + { + "key": "CCC", + "message": "message9296_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9297" + }, + { + "key": "CCC", + "message": "message9298" + }, + { + "key": "CCC", + "message": "message9299" + }, + { + "key": "CCC", + "message": "message9300_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9301" + }, + { + "key": "CCC", + "message": "message9302" + }, + { + "key": "CCC", + "message": "message9303" + }, + { + "key": "CCC", + "message": "message9304" + }, + { + "key": "CCC", + "message": "message9305" + }, + { + "key": "CCC", + "message": "message9306_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9307" + }, + { + "key": "CCC", + "message": "message9308" + }, + { + "key": "CCC", + "message": "message9309" + }, + { + "key": "CCC", + "message": "message9310" + }, + { + "key": "CCC", + "message": "message9311" + }, + { + "key": "CCC", + "message": "message9312" + }, + { + "key": "CCC", + "message": "message9313" + }, + { + "key": "CCC", + "message": "message9314" + }, + { + "key": "CCC", + "message": "message9315" + }, + { + "key": "CCC", + "message": "message9316_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9317" + }, + { + "key": "CCC", + "message": "message9318" + }, + { + "key": "CCC", + "message": "message9319" + }, + { + "key": "CCC", + "message": "message9320" + }, + { + "key": "CCC", + "message": "message9321" + }, + { + "key": "CCC", + "message": "message9322" + }, + { + "key": "CCC", + "message": "message9323" + }, + { + "key": "CCC", + "message": "message9324" + }, + { + "key": "CCC", + "message": "message9325" + }, + { + "key": "CCC", + "message": "message9326_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9327" + }, + { + "key": "CCC", + "message": "message9328" + }, + { + "key": "CCC", + "message": "message9329" + }, + { + "key": "CCC", + "message": "message9330" + }, + { + "key": "CCC", + "message": "message9331" + }, + { + "key": "CCC", + "message": "message9332" + }, + { + "key": "CCC", + "message": "message9333" + }, + { + "key": "CCC", + "message": "message9334" + }, + { + "key": "CCC", + "message": "message9335" + }, + { + "key": "CCC", + "message": "message9336_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9337" + }, + { + "key": "CCC", + "message": "message9338" + }, + { + "key": "CCC", + "message": "message9339" + }, + { + "key": "CCC", + "message": "message9340" + }, + { + "key": "CCC", + "message": "message9341" + }, + { + "key": "CCC", + "message": "message9342" + }, + { + "key": "CCC", + "message": "message9343" + }, + { + "key": "CCC", + "message": "message9344" + }, + { + "key": "CCC", + "message": "message9345" + }, + { + "key": "CCC", + "message": "message9346_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9347" + }, + { + "key": "CCC", + "message": "message9348" + }, + { + "key": "CCC", + "message": "message9349" + }, + { + "key": "CCC", + "message": "message9350" + }, + { + "key": "CCC", + "message": "message9351" + }, + { + "key": "CCC", + "message": "message9352" + }, + { + "key": "CCC", + "message": "message9353" + }, + { + "key": "CCC", + "message": "message9354" + }, + { + "key": "CCC", + "message": "message9355" + }, + { + "key": "CCC", + "message": "message9356_xxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9357" + }, + { + "key": "CCC", + "message": "message9358" + }, + { + "key": "CCC", + "message": "message9359" + }, + { + "key": "CCC", + "message": "message9360" + }, + { + "key": "CCC", + "message": "message9361" + }, + { + "key": "CCC", + "message": "message9362" + }, + { + "key": "CCC", + "message": "message9363" + }, + { + "key": "CCC", + "message": "message9364" + }, + { + "key": "CCC", + "message": "message9365" + }, + { + "key": "CCC", + "message": "message9366_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9367" + }, + { + "key": "CCC", + "message": "message9368" + }, + { + "key": "CCC", + "message": "message9369" + }, + { + "key": "CCC", + "message": "message9370" + }, + { + "key": "CCC", + "message": "message9371" + }, + { + "key": "CCC", + "message": "message9372" + }, + { + "key": "CCC", + "message": "message9373" + }, + { + "key": "CCC", + "message": "message9374" + }, + { + "key": "CCC", + "message": "message9375" + }, + { + "key": "CCC", + "message": "message9376_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9377" + }, + { + "key": "CCC", + "message": "message9378" + }, + { + "key": "CCC", + "message": "message9379" + }, + { + "key": "CCC", + "message": "message9380" + }, + { + "key": "CCC", + "message": "message9381" + }, + { + "key": "CCC", + "message": "message9382" + }, + { + "key": "CCC", + "message": "message9383" + }, + { + "key": "CCC", + "message": "message9384" + }, + { + "key": "CCC", + "message": "message9385" + }, + { + "key": "CCC", + "message": "message9386_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9387" + }, + { + "key": "CCC", + "message": "message9388" + }, + { + "key": "CCC", + "message": "message9389" + }, + { + "key": "CCC", + "message": "message9390" + }, + { + "key": "CCC", + "message": "message9391" + }, + { + "key": "CCC", + "message": "message9392" + }, + { + "key": "CCC", + "message": "message9393" + }, + { + "key": "CCC", + "message": "message9394" + }, + { + "key": "CCC", + "message": "message9395" + }, + { + "key": "CCC", + "message": "message9396_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9397" + }, + { + "key": "CCC", + "message": "message9398" + }, + { + "key": "CCC", + "message": "message9399" + }, + { + "key": "CCC", + "message": "message9400_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9401" + }, + { + "key": "CCC", + "message": "message9402" + }, + { + "key": "CCC", + "message": "message9403" + }, + { + "key": "CCC", + "message": "message9404" + }, + { + "key": "CCC", + "message": "message9405" + }, + { + "key": "CCC", + "message": "message9406_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9407" + }, + { + "key": "CCC", + "message": "message9408" + }, + { + "key": "CCC", + "message": "message9409" + }, + { + "key": "CCC", + "message": "message9410" + }, + { + "key": "CCC", + "message": "message9411" + }, + { + "key": "CCC", + "message": "message9412" + }, + { + "key": "CCC", + "message": "message9413" + }, + { + "key": "CCC", + "message": "message9414" + }, + { + "key": "CCC", + "message": "message9415" + }, + { + "key": "CCC", + "message": "message9416_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9417" + }, + { + "key": "CCC", + "message": "message9418" + }, + { + "key": "CCC", + "message": "message9419" + }, + { + "key": "CCC", + "message": "message9420" + }, + { + "key": "CCC", + "message": "message9421" + }, + { + "key": "CCC", + "message": "message9422" + }, + { + "key": "CCC", + "message": "message9423" + }, + { + "key": "CCC", + "message": "message9424" + }, + { + "key": "CCC", + "message": "message9425" + }, + { + "key": "CCC", + "message": "message9426_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9427" + }, + { + "key": "CCC", + "message": "message9428" + }, + { + "key": "CCC", + "message": "message9429" + }, + { + "key": "CCC", + "message": "message9430" + }, + { + "key": "CCC", + "message": "message9431" + }, + { + "key": "CCC", + "message": "message9432" + }, + { + "key": "CCC", + "message": "message9433" + }, + { + "key": "CCC", + "message": "message9434" + }, + { + "key": "CCC", + "message": "message9435" + }, + { + "key": "CCC", + "message": "message9436_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9437" + }, + { + "key": "CCC", + "message": "message9438" + }, + { + "key": "CCC", + "message": "message9439" + }, + { + "key": "CCC", + "message": "message9440" + }, + { + "key": "CCC", + "message": "message9441" + }, + { + "key": "CCC", + "message": "message9442" + }, + { + "key": "CCC", + "message": "message9443" + }, + { + "key": "CCC", + "message": "message9444" + }, + { + "key": "CCC", + "message": "message9445" + }, + { + "key": "CCC", + "message": "message9446_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9447" + }, + { + "key": "CCC", + "message": "message9448" + }, + { + "key": "CCC", + "message": "message9449" + }, + { + "key": "CCC", + "message": "message9450" + }, + { + "key": "CCC", + "message": "message9451" + }, + { + "key": "CCC", + "message": "message9452" + }, + { + "key": "CCC", + "message": "message9453" + }, + { + "key": "CCC", + "message": "message9454" + }, + { + "key": "CCC", + "message": "message9455" + }, + { + "key": "CCC", + "message": "message9456_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9457" + }, + { + "key": "CCC", + "message": "message9458" + }, + { + "key": "CCC", + "message": "message9459" + }, + { + "key": "CCC", + "message": "message9460" + }, + { + "key": "CCC", + "message": "message9461" + }, + { + "key": "CCC", + "message": "message9462" + }, + { + "key": "CCC", + "message": "message9463" + }, + { + "key": "CCC", + "message": "message9464" + }, + { + "key": "CCC", + "message": "message9465" + }, + { + "key": "CCC", + "message": "message9466_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9467" + }, + { + "key": "CCC", + "message": "message9468" + }, + { + "key": "CCC", + "message": "message9469" + }, + { + "key": "CCC", + "message": "message9470" + }, + { + "key": "CCC", + "message": "message9471" + }, + { + "key": "CCC", + "message": "message9472" + }, + { + "key": "CCC", + "message": "message9473" + }, + { + "key": "CCC", + "message": "message9474" + }, + { + "key": "CCC", + "message": "message9475" + }, + { + "key": "CCC", + "message": "message9476_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9477" + }, + { + "key": "CCC", + "message": "message9478" + }, + { + "key": "CCC", + "message": "message9479" + }, + { + "key": "CCC", + "message": "message9480" + }, + { + "key": "CCC", + "message": "message9481" + }, + { + "key": "CCC", + "message": "message9482" + }, + { + "key": "CCC", + "message": "message9483" + }, + { + "key": "CCC", + "message": "message9484" + }, + { + "key": "CCC", + "message": "message9485" + }, + { + "key": "CCC", + "message": "message9486_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9487" + }, + { + "key": "CCC", + "message": "message9488" + }, + { + "key": "CCC", + "message": "message9489" + }, + { + "key": "CCC", + "message": "message9490" + }, + { + "key": "CCC", + "message": "message9491" + }, + { + "key": "CCC", + "message": "message9492" + }, + { + "key": "CCC", + "message": "message9493" + }, + { + "key": "CCC", + "message": "message9494" + }, + { + "key": "CCC", + "message": "message9495" + }, + { + "key": "CCC", + "message": "message9496_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9497" + }, + { + "key": "CCC", + "message": "message9498" + }, + { + "key": "CCC", + "message": "message9499" + }, + { + "key": "CCC", + "message": "message9500_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9501" + }, + { + "key": "CCC", + "message": "message9502" + }, + { + "key": "CCC", + "message": "message9503" + }, + { + "key": "CCC", + "message": "message9504" + }, + { + "key": "CCC", + "message": "message9505" + }, + { + "key": "CCC", + "message": "message9506_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9507" + }, + { + "key": "CCC", + "message": "message9508" + }, + { + "key": "CCC", + "message": "message9509" + }, + { + "key": "CCC", + "message": "message9510" + }, + { + "key": "CCC", + "message": "message9511" + }, + { + "key": "CCC", + "message": "message9512" + }, + { + "key": "CCC", + "message": "message9513" + }, + { + "key": "CCC", + "message": "message9514" + }, + { + "key": "CCC", + "message": "message9515" + }, + { + "key": "CCC", + "message": "message9516_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9517" + }, + { + "key": "CCC", + "message": "message9518" + }, + { + "key": "CCC", + "message": "message9519" + }, + { + "key": "CCC", + "message": "message9520" + }, + { + "key": "CCC", + "message": "message9521" + }, + { + "key": "CCC", + "message": "message9522" + }, + { + "key": "CCC", + "message": "message9523" + }, + { + "key": "CCC", + "message": "message9524" + }, + { + "key": "CCC", + "message": "message9525" + }, + { + "key": "CCC", + "message": "message9526_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9527" + }, + { + "key": "CCC", + "message": "message9528" + }, + { + "key": "CCC", + "message": "message9529" + }, + { + "key": "CCC", + "message": "message9530" + }, + { + "key": "CCC", + "message": "message9531" + }, + { + "key": "CCC", + "message": "message9532" + }, + { + "key": "CCC", + "message": "message9533" + }, + { + "key": "CCC", + "message": "message9534" + }, + { + "key": "CCC", + "message": "message9535" + }, + { + "key": "CCC", + "message": "message9536_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9537" + }, + { + "key": "CCC", + "message": "message9538" + }, + { + "key": "CCC", + "message": "message9539" + }, + { + "key": "CCC", + "message": "message9540" + }, + { + "key": "CCC", + "message": "message9541" + }, + { + "key": "CCC", + "message": "message9542" + }, + { + "key": "CCC", + "message": "message9543" + }, + { + "key": "CCC", + "message": "message9544" + }, + { + "key": "CCC", + "message": "message9545" + }, + { + "key": "CCC", + "message": "message9546_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9547" + }, + { + "key": "CCC", + "message": "message9548" + }, + { + "key": "CCC", + "message": "message9549" + }, + { + "key": "CCC", + "message": "message9550" + }, + { + "key": "CCC", + "message": "message9551" + }, + { + "key": "CCC", + "message": "message9552" + }, + { + "key": "CCC", + "message": "message9553" + }, + { + "key": "CCC", + "message": "message9554" + }, + { + "key": "CCC", + "message": "message9555" + }, + { + "key": "CCC", + "message": "message9556_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9557" + }, + { + "key": "CCC", + "message": "message9558" + }, + { + "key": "CCC", + "message": "message9559" + }, + { + "key": "CCC", + "message": "message9560" + }, + { + "key": "CCC", + "message": "message9561" + }, + { + "key": "CCC", + "message": "message9562" + }, + { + "key": "CCC", + "message": "message9563" + }, + { + "key": "CCC", + "message": "message9564" + }, + { + "key": "CCC", + "message": "message9565" + }, + { + "key": "CCC", + "message": "message9566_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9567" + }, + { + "key": "CCC", + "message": "message9568" + }, + { + "key": "CCC", + "message": "message9569" + }, + { + "key": "CCC", + "message": "message9570" + }, + { + "key": "CCC", + "message": "message9571" + }, + { + "key": "CCC", + "message": "message9572" + }, + { + "key": "CCC", + "message": "message9573" + }, + { + "key": "CCC", + "message": "message9574" + }, + { + "key": "CCC", + "message": "message9575" + }, + { + "key": "CCC", + "message": "message9576_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9577" + }, + { + "key": "CCC", + "message": "message9578" + }, + { + "key": "CCC", + "message": "message9579" + }, + { + "key": "CCC", + "message": "message9580" + }, + { + "key": "CCC", + "message": "message9581" + }, + { + "key": "CCC", + "message": "message9582" + }, + { + "key": "CCC", + "message": "message9583" + }, + { + "key": "CCC", + "message": "message9584" + }, + { + "key": "CCC", + "message": "message9585" + }, + { + "key": "CCC", + "message": "message9586_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9587" + }, + { + "key": "CCC", + "message": "message9588" + }, + { + "key": "CCC", + "message": "message9589" + }, + { + "key": "CCC", + "message": "message9590" + }, + { + "key": "CCC", + "message": "message9591" + }, + { + "key": "CCC", + "message": "message9592" + }, + { + "key": "CCC", + "message": "message9593" + }, + { + "key": "CCC", + "message": "message9594" + }, + { + "key": "CCC", + "message": "message9595" + }, + { + "key": "CCC", + "message": "message9596_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "CCC", + "message": "message9597" + }, + { + "key": "CCC", + "message": "message9598" + }, + { + "key": "CCC", + "message": "message9599" + }, + { + "key": "CCC", + "message": "message9600_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9601" + }, + { + "key": "DDD", + "message": "message9602" + }, + { + "key": "DDD", + "message": "message9603" + }, + { + "key": "DDD", + "message": "message9604" + }, + { + "key": "DDD", + "message": "message9605" + }, + { + "key": "DDD", + "message": "message9606_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9607" + }, + { + "key": "DDD", + "message": "message9608" + }, + { + "key": "DDD", + "message": "message9609" + }, + { + "key": "DDD", + "message": "message9610" + }, + { + "key": "DDD", + "message": "message9611" + }, + { + "key": "DDD", + "message": "message9612" + }, + { + "key": "DDD", + "message": "message9613" + }, + { + "key": "DDD", + "message": "message9614" + }, + { + "key": "DDD", + "message": "message9615" + }, + { + "key": "DDD", + "message": "message9616_xxxxxxxx" + }, + { + "key": "DDD", + "message": "message9617" + }, + { + "key": "DDD", + "message": "message9618" + }, + { + "key": "DDD", + "message": "message9619" + }, + { + "key": "DDD", + "message": "message9620" + }, + { + "key": "DDD", + "message": "message9621" + }, + { + "key": "DDD", + "message": "message9622" + }, + { + "key": "DDD", + "message": "message9623" + }, + { + "key": "DDD", + "message": "message9624" + }, + { + "key": "DDD", + "message": "message9625" + }, + { + "key": "DDD", + "message": "message9626_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9627" + }, + { + "key": "DDD", + "message": "message9628" + }, + { + "key": "DDD", + "message": "message9629" + }, + { + "key": "DDD", + "message": "message9630" + }, + { + "key": "DDD", + "message": "message9631" + }, + { + "key": "DDD", + "message": "message9632" + }, + { + "key": "DDD", + "message": "message9633" + }, + { + "key": "DDD", + "message": "message9634" + }, + { + "key": "DDD", + "message": "message9635" + }, + { + "key": "DDD", + "message": "message9636_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9637" + }, + { + "key": "DDD", + "message": "message9638" + }, + { + "key": "DDD", + "message": "message9639" + }, + { + "key": "DDD", + "message": "message9640" + }, + { + "key": "DDD", + "message": "message9641" + }, + { + "key": "DDD", + "message": "message9642" + }, + { + "key": "DDD", + "message": "message9643" + }, + { + "key": "DDD", + "message": "message9644" + }, + { + "key": "DDD", + "message": "message9645" + }, + { + "key": "DDD", + "message": "message9646_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9647" + }, + { + "key": "DDD", + "message": "message9648" + }, + { + "key": "DDD", + "message": "message9649" + }, + { + "key": "DDD", + "message": "message9650" + }, + { + "key": "DDD", + "message": "message9651" + }, + { + "key": "DDD", + "message": "message9652" + }, + { + "key": "DDD", + "message": "message9653" + }, + { + "key": "DDD", + "message": "message9654" + }, + { + "key": "DDD", + "message": "message9655" + }, + { + "key": "DDD", + "message": "message9656_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9657" + }, + { + "key": "DDD", + "message": "message9658" + }, + { + "key": "DDD", + "message": "message9659" + }, + { + "key": "DDD", + "message": "message9660" + }, + { + "key": "DDD", + "message": "message9661" + }, + { + "key": "DDD", + "message": "message9662" + }, + { + "key": "DDD", + "message": "message9663" + }, + { + "key": "DDD", + "message": "message9664" + }, + { + "key": "DDD", + "message": "message9665" + }, + { + "key": "DDD", + "message": "message9666_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9667" + }, + { + "key": "DDD", + "message": "message9668" + }, + { + "key": "DDD", + "message": "message9669" + }, + { + "key": "DDD", + "message": "message9670" + }, + { + "key": "DDD", + "message": "message9671" + }, + { + "key": "DDD", + "message": "message9672" + }, + { + "key": "DDD", + "message": "message9673" + }, + { + "key": "DDD", + "message": "message9674" + }, + { + "key": "DDD", + "message": "message9675" + }, + { + "key": "DDD", + "message": "message9676_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9677" + }, + { + "key": "DDD", + "message": "message9678" + }, + { + "key": "DDD", + "message": "message9679" + }, + { + "key": "DDD", + "message": "message9680" + }, + { + "key": "DDD", + "message": "message9681" + }, + { + "key": "DDD", + "message": "message9682" + }, + { + "key": "DDD", + "message": "message9683" + }, + { + "key": "DDD", + "message": "message9684" + }, + { + "key": "DDD", + "message": "message9685" + }, + { + "key": "DDD", + "message": "message9686_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9687" + }, + { + "key": "DDD", + "message": "message9688" + }, + { + "key": "DDD", + "message": "message9689" + }, + { + "key": "DDD", + "message": "message9690" + }, + { + "key": "DDD", + "message": "message9691" + }, + { + "key": "DDD", + "message": "message9692" + }, + { + "key": "DDD", + "message": "message9693" + }, + { + "key": "DDD", + "message": "message9694" + }, + { + "key": "DDD", + "message": "message9695" + }, + { + "key": "DDD", + "message": "message9696_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9697" + }, + { + "key": "DDD", + "message": "message9698" + }, + { + "key": "DDD", + "message": "message9699" + }, + { + "key": "DDD", + "message": "message9700_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9701" + }, + { + "key": "DDD", + "message": "message9702" + }, + { + "key": "DDD", + "message": "message9703" + }, + { + "key": "DDD", + "message": "message9704" + }, + { + "key": "DDD", + "message": "message9705" + }, + { + "key": "DDD", + "message": "message9706_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9707" + }, + { + "key": "DDD", + "message": "message9708" + }, + { + "key": "DDD", + "message": "message9709" + }, + { + "key": "DDD", + "message": "message9710" + }, + { + "key": "DDD", + "message": "message9711" + }, + { + "key": "DDD", + "message": "message9712" + }, + { + "key": "DDD", + "message": "message9713" + }, + { + "key": "DDD", + "message": "message9714" + }, + { + "key": "DDD", + "message": "message9715" + }, + { + "key": "DDD", + "message": "message9716_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9717" + }, + { + "key": "DDD", + "message": "message9718" + }, + { + "key": "DDD", + "message": "message9719" + }, + { + "key": "DDD", + "message": "message9720" + }, + { + "key": "DDD", + "message": "message9721" + }, + { + "key": "DDD", + "message": "message9722" + }, + { + "key": "DDD", + "message": "message9723" + }, + { + "key": "DDD", + "message": "message9724" + }, + { + "key": "DDD", + "message": "message9725" + }, + { + "key": "DDD", + "message": "message9726_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9727" + }, + { + "key": "DDD", + "message": "message9728" + }, + { + "key": "DDD", + "message": "message9729" + }, + { + "key": "DDD", + "message": "message9730" + }, + { + "key": "DDD", + "message": "message9731" + }, + { + "key": "DDD", + "message": "message9732" + }, + { + "key": "DDD", + "message": "message9733" + }, + { + "key": "DDD", + "message": "message9734" + }, + { + "key": "DDD", + "message": "message9735" + }, + { + "key": "DDD", + "message": "message9736_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9737" + }, + { + "key": "DDD", + "message": "message9738" + }, + { + "key": "DDD", + "message": "message9739" + }, + { + "key": "DDD", + "message": "message9740" + }, + { + "key": "DDD", + "message": "message9741" + }, + { + "key": "DDD", + "message": "message9742" + }, + { + "key": "DDD", + "message": "message9743" + }, + { + "key": "DDD", + "message": "message9744" + }, + { + "key": "DDD", + "message": "message9745" + }, + { + "key": "DDD", + "message": "message9746_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9747" + }, + { + "key": "DDD", + "message": "message9748" + }, + { + "key": "DDD", + "message": "message9749" + }, + { + "key": "DDD", + "message": "message9750" + }, + { + "key": "DDD", + "message": "message9751" + }, + { + "key": "DDD", + "message": "message9752" + }, + { + "key": "DDD", + "message": "message9753" + }, + { + "key": "DDD", + "message": "message9754" + }, + { + "key": "DDD", + "message": "message9755" + }, + { + "key": "DDD", + "message": "message9756_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9757" + }, + { + "key": "DDD", + "message": "message9758" + }, + { + "key": "DDD", + "message": "message9759" + }, + { + "key": "DDD", + "message": "message9760" + }, + { + "key": "DDD", + "message": "message9761" + }, + { + "key": "DDD", + "message": "message9762" + }, + { + "key": "DDD", + "message": "message9763" + }, + { + "key": "DDD", + "message": "message9764" + }, + { + "key": "DDD", + "message": "message9765" + }, + { + "key": "DDD", + "message": "message9766_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9767" + }, + { + "key": "DDD", + "message": "message9768" + }, + { + "key": "DDD", + "message": "message9769" + }, + { + "key": "DDD", + "message": "message9770" + }, + { + "key": "DDD", + "message": "message9771" + }, + { + "key": "DDD", + "message": "message9772" + }, + { + "key": "DDD", + "message": "message9773" + }, + { + "key": "DDD", + "message": "message9774" + }, + { + "key": "DDD", + "message": "message9775" + }, + { + "key": "DDD", + "message": "message9776_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9777" + }, + { + "key": "DDD", + "message": "message9778" + }, + { + "key": "DDD", + "message": "message9779" + }, + { + "key": "DDD", + "message": "message9780" + }, + { + "key": "DDD", + "message": "message9781" + }, + { + "key": "DDD", + "message": "message9782" + }, + { + "key": "DDD", + "message": "message9783" + }, + { + "key": "DDD", + "message": "message9784" + }, + { + "key": "DDD", + "message": "message9785" + }, + { + "key": "DDD", + "message": "message9786_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9787" + }, + { + "key": "DDD", + "message": "message9788" + }, + { + "key": "DDD", + "message": "message9789" + }, + { + "key": "DDD", + "message": "message9790" + }, + { + "key": "DDD", + "message": "message9791" + }, + { + "key": "DDD", + "message": "message9792" + }, + { + "key": "DDD", + "message": "message9793" + }, + { + "key": "DDD", + "message": "message9794" + }, + { + "key": "DDD", + "message": "message9795" + }, + { + "key": "DDD", + "message": "message9796_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9797" + }, + { + "key": "DDD", + "message": "message9798" + }, + { + "key": "DDD", + "message": "message9799" + }, + { + "key": "DDD", + "message": "message9800_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9801" + }, + { + "key": "DDD", + "message": "message9802" + }, + { + "key": "DDD", + "message": "message9803" + }, + { + "key": "DDD", + "message": "message9804" + }, + { + "key": "DDD", + "message": "message9805" + }, + { + "key": "DDD", + "message": "message9806_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9807" + }, + { + "key": "DDD", + "message": "message9808" + }, + { + "key": "DDD", + "message": "message9809" + }, + { + "key": "DDD", + "message": "message9810" + }, + { + "key": "DDD", + "message": "message9811" + }, + { + "key": "DDD", + "message": "message9812" + }, + { + "key": "DDD", + "message": "message9813" + }, + { + "key": "DDD", + "message": "message9814" + }, + { + "key": "DDD", + "message": "message9815" + }, + { + "key": "DDD", + "message": "message9816_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9817" + }, + { + "key": "DDD", + "message": "message9818" + }, + { + "key": "DDD", + "message": "message9819" + }, + { + "key": "DDD", + "message": "message9820" + }, + { + "key": "DDD", + "message": "message9821" + }, + { + "key": "DDD", + "message": "message9822" + }, + { + "key": "DDD", + "message": "message9823" + }, + { + "key": "DDD", + "message": "message9824" + }, + { + "key": "DDD", + "message": "message9825" + }, + { + "key": "DDD", + "message": "message9826_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9827" + }, + { + "key": "DDD", + "message": "message9828" + }, + { + "key": "DDD", + "message": "message9829" + }, + { + "key": "DDD", + "message": "message9830" + }, + { + "key": "DDD", + "message": "message9831" + }, + { + "key": "DDD", + "message": "message9832" + }, + { + "key": "DDD", + "message": "message9833" + }, + { + "key": "DDD", + "message": "message9834" + }, + { + "key": "DDD", + "message": "message9835" + }, + { + "key": "DDD", + "message": "message9836_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9837" + }, + { + "key": "DDD", + "message": "message9838" + }, + { + "key": "DDD", + "message": "message9839" + }, + { + "key": "DDD", + "message": "message9840" + }, + { + "key": "DDD", + "message": "message9841" + }, + { + "key": "DDD", + "message": "message9842" + }, + { + "key": "DDD", + "message": "message9843" + }, + { + "key": "DDD", + "message": "message9844" + }, + { + "key": "DDD", + "message": "message9845" + }, + { + "key": "DDD", + "message": "message9846_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9847" + }, + { + "key": "DDD", + "message": "message9848" + }, + { + "key": "DDD", + "message": "message9849" + }, + { + "key": "DDD", + "message": "message9850" + }, + { + "key": "DDD", + "message": "message9851" + }, + { + "key": "DDD", + "message": "message9852" + }, + { + "key": "DDD", + "message": "message9853" + }, + { + "key": "DDD", + "message": "message9854" + }, + { + "key": "DDD", + "message": "message9855" + }, + { + "key": "DDD", + "message": "message9856_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9857" + }, + { + "key": "DDD", + "message": "message9858" + }, + { + "key": "DDD", + "message": "message9859" + }, + { + "key": "DDD", + "message": "message9860" + }, + { + "key": "DDD", + "message": "message9861" + }, + { + "key": "DDD", + "message": "message9862" + }, + { + "key": "DDD", + "message": "message9863" + }, + { + "key": "DDD", + "message": "message9864" + }, + { + "key": "DDD", + "message": "message9865" + }, + { + "key": "DDD", + "message": "message9866_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9867" + }, + { + "key": "DDD", + "message": "message9868" + }, + { + "key": "DDD", + "message": "message9869" + }, + { + "key": "DDD", + "message": "message9870" + }, + { + "key": "DDD", + "message": "message9871" + }, + { + "key": "DDD", + "message": "message9872" + }, + { + "key": "DDD", + "message": "message9873" + }, + { + "key": "DDD", + "message": "message9874" + }, + { + "key": "DDD", + "message": "message9875" + }, + { + "key": "DDD", + "message": "message9876_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9877" + }, + { + "key": "DDD", + "message": "message9878" + }, + { + "key": "DDD", + "message": "message9879" + }, + { + "key": "DDD", + "message": "message9880" + }, + { + "key": "DDD", + "message": "message9881" + }, + { + "key": "DDD", + "message": "message9882" + }, + { + "key": "DDD", + "message": "message9883" + }, + { + "key": "DDD", + "message": "message9884" + }, + { + "key": "DDD", + "message": "message9885" + }, + { + "key": "DDD", + "message": "message9886_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9887" + }, + { + "key": "DDD", + "message": "message9888" + }, + { + "key": "DDD", + "message": "message9889" + }, + { + "key": "DDD", + "message": "message9890" + }, + { + "key": "DDD", + "message": "message9891" + }, + { + "key": "DDD", + "message": "message9892" + }, + { + "key": "DDD", + "message": "message9893" + }, + { + "key": "DDD", + "message": "message9894" + }, + { + "key": "DDD", + "message": "message9895" + }, + { + "key": "DDD", + "message": "message9896_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9897" + }, + { + "key": "DDD", + "message": "message9898" + }, + { + "key": "DDD", + "message": "message9899" + }, + { + "key": "DDD", + "message": "message9900_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9901" + }, + { + "key": "DDD", + "message": "message9902" + }, + { + "key": "DDD", + "message": "message9903" + }, + { + "key": "DDD", + "message": "message9904" + }, + { + "key": "DDD", + "message": "message9905" + }, + { + "key": "DDD", + "message": "message9906_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9907" + }, + { + "key": "DDD", + "message": "message9908" + }, + { + "key": "DDD", + "message": "message9909" + }, + { + "key": "DDD", + "message": "message9910" + }, + { + "key": "DDD", + "message": "message9911" + }, + { + "key": "DDD", + "message": "message9912" + }, + { + "key": "DDD", + "message": "message9913" + }, + { + "key": "DDD", + "message": "message9914" + }, + { + "key": "DDD", + "message": "message9915" + }, + { + "key": "DDD", + "message": "message9916_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9917" + }, + { + "key": "DDD", + "message": "message9918" + }, + { + "key": "DDD", + "message": "message9919" + }, + { + "key": "DDD", + "message": "message9920" + }, + { + "key": "DDD", + "message": "message9921" + }, + { + "key": "DDD", + "message": "message9922" + }, + { + "key": "DDD", + "message": "message9923" + }, + { + "key": "DDD", + "message": "message9924" + }, + { + "key": "DDD", + "message": "message9925" + }, + { + "key": "DDD", + "message": "message9926_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9927" + }, + { + "key": "DDD", + "message": "message9928" + }, + { + "key": "DDD", + "message": "message9929" + }, + { + "key": "DDD", + "message": "message9930" + }, + { + "key": "DDD", + "message": "message9931" + }, + { + "key": "DDD", + "message": "message9932" + }, + { + "key": "DDD", + "message": "message9933" + }, + { + "key": "DDD", + "message": "message9934" + }, + { + "key": "DDD", + "message": "message9935" + }, + { + "key": "DDD", + "message": "message9936_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9937" + }, + { + "key": "DDD", + "message": "message9938" + }, + { + "key": "DDD", + "message": "message9939" + }, + { + "key": "DDD", + "message": "message9940" + }, + { + "key": "DDD", + "message": "message9941" + }, + { + "key": "DDD", + "message": "message9942" + }, + { + "key": "DDD", + "message": "message9943" + }, + { + "key": "DDD", + "message": "message9944" + }, + { + "key": "DDD", + "message": "message9945" + }, + { + "key": "DDD", + "message": "message9946_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9947" + }, + { + "key": "DDD", + "message": "message9948" + }, + { + "key": "DDD", + "message": "message9949" + }, + { + "key": "DDD", + "message": "message9950" + }, + { + "key": "DDD", + "message": "message9951" + }, + { + "key": "DDD", + "message": "message9952" + }, + { + "key": "DDD", + "message": "message9953" + }, + { + "key": "DDD", + "message": "message9954" + }, + { + "key": "DDD", + "message": "message9955" + }, + { + "key": "DDD", + "message": "message9956_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9957" + }, + { + "key": "DDD", + "message": "message9958" + }, + { + "key": "DDD", + "message": "message9959" + }, + { + "key": "DDD", + "message": "message9960" + }, + { + "key": "DDD", + "message": "message9961" + }, + { + "key": "DDD", + "message": "message9962" + }, + { + "key": "DDD", + "message": "message9963" + }, + { + "key": "DDD", + "message": "message9964" + }, + { + "key": "DDD", + "message": "message9965" + }, + { + "key": "DDD", + "message": "message9966_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9967" + }, + { + "key": "DDD", + "message": "message9968" + }, + { + "key": "DDD", + "message": "message9969" + }, + { + "key": "DDD", + "message": "message9970" + }, + { + "key": "DDD", + "message": "message9971" + }, + { + "key": "DDD", + "message": "message9972" + }, + { + "key": "DDD", + "message": "message9973" + }, + { + "key": "DDD", + "message": "message9974" + }, + { + "key": "DDD", + "message": "message9975" + }, + { + "key": "DDD", + "message": "message9976_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9977" + }, + { + "key": "DDD", + "message": "message9978" + }, + { + "key": "DDD", + "message": "message9979" + }, + { + "key": "DDD", + "message": "message9980" + }, + { + "key": "DDD", + "message": "message9981" + }, + { + "key": "DDD", + "message": "message9982" + }, + { + "key": "DDD", + "message": "message9983" + }, + { + "key": "DDD", + "message": "message9984" + }, + { + "key": "DDD", + "message": "message9985" + }, + { + "key": "DDD", + "message": "message9986_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9987" + }, + { + "key": "DDD", + "message": "message9988" + }, + { + "key": "DDD", + "message": "message9989" + }, + { + "key": "DDD", + "message": "message9990" + }, + { + "key": "DDD", + "message": "message9991" + }, + { + "key": "DDD", + "message": "message9992" + }, + { + "key": "DDD", + "message": "message9993" + }, + { + "key": "DDD", + "message": "message9994" + }, + { + "key": "DDD", + "message": "message9995" + }, + { + "key": "DDD", + "message": "message9996_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, + { + "key": "DDD", + "message": "message9997" + }, + { + "key": "DDD", + "message": "message9998" + }, + { + "key": "DDD", + "message": "message9999" + }, + { + "key": "DDD", + "message": "message10000_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + } + ], + "expected": [ + { + "key": "", + "messages": [ + "message1", + "message6", + "message11", + "message16", + "message21", + "message26", + "message31", + "message36", + "message41", + "message46", + "message51", + "message56", + "message61", + "message66", + "message71", + "message76", + "message81", + "message86", + "message91", + "message96", + "message101", + "message106", + "message111", + "message116", + "message121", + "message126", + "message131", + "message136", + "message141", + "message146", + "message151", + "message156", + "message161", + "message166", + "message171", + "message176", + "message181", + "message186", + "message191", + "message196", + "message201", + "message206", + "message211", + "message216", + "message221", + "message226", + "message231", + "message236", + "message241", + "message246", + "message251", + "message256", + "message261", + "message266", + "message271", + "message276", + "message281", + "message286", + "message291", + "message296", + "message301", + "message306", + "message311", + "message316", + "message321", + "message326", + "message331", + "message336", + "message341", + "message346", + "message351", + "message356", + "message361", + "message366", + "message371", + "message376", + "message381", + "message386", + "message391", + "message396", + "message401", + "message406", + "message411", + "message416", + "message421", + "message426", + "message431", + "message436", + "message441", + "message446", + "message451", + "message456", + "message461", + "message466", + "message471", + "message476", + "message481", + "message486", + "message491", + "message496", + "message501", + "message506", + "message511", + "message516", + "message521", + "message526", + "message531", + "message536", + "message541", + "message546", + "message551", + "message556", + "message561", + "message566", + "message571", + "message576", + "message581", + "message586", + "message591", + "message596", + "message601", + "message606", + "message611", + "message616", + "message621", + "message626", + "message631", + "message636", + "message641", + "message646", + "message651", + "message656", + "message661", + "message666", + "message671", + "message676", + "message681", + "message686", + "message691", + "message696", + "message701", + "message706", + "message711", + "message716", + "message721", + "message726", + "message731", + "message736", + "message741", + "message746", + "message751", + "message756", + "message761", + "message766", + "message771", + "message776", + "message781", + "message786", + "message791", + "message796", + "message801", + "message806", + "message811", + "message816", + "message821", + "message826", + "message831", + "message836", + "message841", + "message846", + "message851", + "message856", + "message861", + "message866", + "message871", + "message876", + "message881", + "message886", + "message891", + "message896", + "message901", + "message906", + "message911", + "message916", + "message921", + "message926", + "message931", + "message936", + "message941", + "message946", + "message951", + "message956", + "message961", + "message966", + "message971", + "message976", + "message981", + "message986", + "message991", + "message996", + "message1001", + "message1006", + "message1011", + "message1016", + "message1021", + "message1026", + "message1031", + "message1036", + "message1041", + "message1046", + "message1051", + "message1056", + "message1061", + "message1066", + "message1071", + "message1076", + "message1081", + "message1086", + "message1091", + "message1096", + "message1101", + "message1106", + "message1111", + "message1116", + "message1121", + "message1126", + "message1131", + "message1136", + "message1141", + "message1146", + "message1151", + "message1156", + "message1161", + "message1166", + "message1171", + "message1176", + "message1181", + "message1186", + "message1191", + "message1196", + "message1201", + "message1206", + "message1211", + "message1216", + "message1221", + "message1226", + "message1231", + "message1236", + "message1241", + "message1246", + "message1251", + "message1256", + "message1261", + "message1266", + "message1271", + "message1276", + "message1281", + "message1286", + "message1291", + "message1296", + "message1301", + "message1306", + "message1311", + "message1316", + "message1321", + "message1326", + "message1331", + "message1336", + "message1341", + "message1346", + "message1351", + "message1356", + "message1361", + "message1366", + "message1371", + "message1376", + "message1381", + "message1386", + "message1391", + "message1396", + "message1401", + "message1406", + "message1411", + "message1416", + "message1421", + "message1426", + "message1431", + "message1436", + "message1441", + "message1446", + "message1451", + "message1456", + "message1461", + "message1466", + "message1471", + "message1476", + "message1481", + "message1486", + "message1491", + "message1496", + "message1501", + "message1506", + "message1511", + "message1516", + "message1521", + "message1526", + "message1531", + "message1536", + "message1541", + "message1546", + "message1551", + "message1556", + "message1561", + "message1566", + "message1571", + "message1576", + "message1581", + "message1586", + "message1591", + "message1596", + "message1601", + "message1606", + "message1611", + "message1616", + "message1621", + "message1626", + "message1631", + "message1636", + "message1641", + "message1646", + "message1651", + "message1656", + "message1661", + "message1666", + "message1671", + "message1676", + "message1681", + "message1686", + "message1691", + "message1696", + "message1701", + "message1706", + "message1711", + "message1716", + "message1721", + "message1726", + "message1731", + "message1736", + "message1741", + "message1746", + "message1751", + "message1756", + "message1761", + "message1766", + "message1771", + "message1776", + "message1781", + "message1786", + "message1791", + "message1796", + "message1801", + "message1806", + "message1811", + "message1816", + "message1821", + "message1826", + "message1831", + "message1836", + "message1841", + "message1846", + "message1851", + "message1856", + "message1861", + "message1866", + "message1871", + "message1876", + "message1881", + "message1886", + "message1891", + "message1896", + "message1901", + "message1906", + "message1911", + "message1916", + "message1921", + "message1926", + "message1931", + "message1936", + "message1941", + "message1946", + "message1951", + "message1956", + "message1961", + "message1966", + "message1971", + "message1976", + "message1981", + "message1986", + "message1991", + "message1996", + "message2001", + "message2002", + "message2003", + "message2004", + "message2005", + "message2006", + "message2007", + "message2008", + "message2009", + "message2010", + "message2011", + "message2012", + "message2013", + "message2014", + "message2015", + "message2016", + "message2017", + "message2018", + "message2019", + "message2020", + "message2021", + "message2022", + "message2023", + "message2024", + "message2025", + "message2026", + "message2027", + "message2028", + "message2029", + "message2030", + "message2031", + "message2032", + "message2033", + "message2034", + "message2035", + "message2036", + "message2037", + "message2038", + "message2039", + "message2040", + "message2041", + "message2042", + "message2043", + "message2044", + "message2045", + "message2046", + "message2047", + "message2048", + "message2049", + "message2050", + "message2051", + "message2052", + "message2053", + "message2054", + "message2055", + "message2056", + "message2057", + "message2058", + "message2059", + "message2060", + "message2061", + "message2062", + "message2063", + "message2064", + "message2065", + "message2066", + "message2067", + "message2068", + "message2069", + "message2070", + "message2071", + "message2072", + "message2073", + "message2074", + "message2075", + "message2076", + "message2077", + "message2078", + "message2079", + "message2080", + "message2081", + "message2082", + "message2083", + "message2084", + "message2085", + "message2086", + "message2087", + "message2088", + "message2089", + "message2090", + "message2091", + "message2092", + "message2093", + "message2094", + "message2095", + "message2096", + "message2097", + "message2098", + "message2099", + "message2100", + "message2101", + "message2102", + "message2103", + "message2104", + "message2105", + "message2106", + "message2107", + "message2108", + "message2109", + "message2110", + "message2111", + "message2112", + "message2113", + "message2114", + "message2115", + "message2116", + "message2117", + "message2118", + "message2119", + "message2120", + "message2121", + "message2122", + "message2123", + "message2124", + "message2125", + "message2126", + "message2127", + "message2128", + "message2129", + "message2130", + "message2131", + "message2132", + "message2133", + "message2134", + "message2135", + "message2136", + "message2137", + "message2138", + "message2139", + "message2140", + "message2141", + "message2142", + "message2143", + "message2144", + "message2145", + "message2146", + "message2147", + "message2148", + "message2149", + "message2150", + "message2151", + "message2152", + "message2153", + "message2154", + "message2155", + "message2156", + "message2157", + "message2158", + "message2159", + "message2160", + "message2161", + "message2162", + "message2163", + "message2164", + "message2165", + "message2166", + "message2167", + "message2168", + "message2169", + "message2170", + "message2171", + "message2172", + "message2173", + "message2174", + "message2175", + "message2176", + "message2177", + "message2178", + "message2179", + "message2180", + "message2181", + "message2182", + "message2183", + "message2184", + "message2185", + "message2186", + "message2187", + "message2188", + "message2189", + "message2190", + "message2191", + "message2192", + "message2193", + "message2194", + "message2195", + "message2196", + "message2197", + "message2198", + "message2199", + "message2200", + "message2201", + "message2202", + "message2203", + "message2204", + "message2205", + "message2206", + "message2207", + "message2208", + "message2209", + "message2210", + "message2211", + "message2212", + "message2213", + "message2214", + "message2215", + "message2216", + "message2217", + "message2218", + "message2219", + "message2220", + "message2221", + "message2222", + "message2223", + "message2224", + "message2225", + "message2226", + "message2227", + "message2228", + "message2229", + "message2230", + "message2231", + "message2232", + "message2233", + "message2234", + "message2235", + "message2236", + "message2237", + "message2238", + "message2239", + "message2240", + "message2241", + "message2242", + "message2243", + "message2244", + "message2245", + "message2246", + "message2247", + "message2248", + "message2249", + "message2250", + "message2251", + "message2252", + "message2253", + "message2254", + "message2255", + "message2256", + "message2257", + "message2258", + "message2259", + "message2260", + "message2261", + "message2262", + "message2263", + "message2264", + "message2265", + "message2266", + "message2267", + "message2268", + "message2269", + "message2270", + "message2271", + "message2272", + "message2273", + "message2274", + "message2275", + "message2276", + "message2277", + "message2278", + "message2279", + "message2280", + "message2281", + "message2282", + "message2283", + "message2284", + "message2285", + "message2286", + "message2287", + "message2288", + "message2289", + "message2290", + "message2291", + "message2292", + "message2293", + "message2294", + "message2295", + "message2296", + "message2297", + "message2298", + "message2299", + "message2300", + "message2301", + "message2302", + "message2303", + "message2304", + "message2305", + "message2306", + "message2307", + "message2308", + "message2309", + "message2310", + "message2311", + "message2312", + "message2313", + "message2314", + "message2315", + "message2316", + "message2317", + "message2318", + "message2319", + "message2320", + "message2321", + "message2322", + "message2323", + "message2324", + "message2325", + "message2326", + "message2327", + "message2328", + "message2329", + "message2330", + "message2331", + "message2332", + "message2333", + "message2334", + "message2335", + "message2336", + "message2337", + "message2338", + "message2339", + "message2340", + "message2341", + "message2342", + "message2343", + "message2344", + "message2345", + "message2346", + "message2347", + "message2348", + "message2349", + "message2350", + "message2351", + "message2352", + "message2353", + "message2354", + "message2355", + "message2356", + "message2357", + "message2358", + "message2359", + "message2360", + "message2361", + "message2362", + "message2363", + "message2364", + "message2365", + "message2366", + "message2367", + "message2368", + "message2369", + "message2370", + "message2371", + "message2372", + "message2373", + "message2374", + "message2375", + "message2376", + "message2377", + "message2378", + "message2379", + "message2380", + "message2381", + "message2382", + "message2383", + "message2384", + "message2385", + "message2386", + "message2387", + "message2388", + "message2389", + "message2390", + "message2391", + "message2392", + "message2393", + "message2394", + "message2395", + "message2396", + "message2397", + "message2398", + "message2399", + "message2400", + "message4002", + "message4020", + "message4025", + "message4026", + "message4033", + "message4036", + "message4037", + "message4040", + "message4047", + "message4053", + "message4059", + "message4062", + "message4063", + "message4068", + "message4078", + "message4079", + "message4083", + "message4085", + "message4086", + "message4089", + "message4094", + "message4095", + "message4098", + "message4102", + "message4106", + "message4108", + "message4113", + "message4114", + "message4130", + "message4131", + "message4138", + "message4140", + "message4146", + "message4147", + "message4157", + "message4158", + "message4176", + "message4181", + "message4192", + "message4197", + "message4199", + "message4202", + "message4211", + "message4212", + "message4217", + "message4218", + "message4220", + "message4223", + "message4239", + "message4241", + "message4249", + "message4252", + "message4257", + "message4259", + "message4263", + "message4266", + "message4267", + "message4268", + "message4277", + "message4281", + "message4291", + "message4294", + "message4295", + "message4299", + "message4300", + "message4314", + "message4320", + "message4321", + "message4322", + "message4327", + "message4333", + "message4334", + "message4335", + "message4337", + "message4349", + "message4361", + "message4363", + "message4365", + "message4389", + "message4390", + "message4397", + "message4403", + "message4412", + "message4416", + "message4428", + "message4430", + "message4438", + "message4440", + "message4446", + "message4449", + "message4455", + "message4456", + "message4465", + "message4470", + "message4487", + "message4488", + "message4493", + "message4501", + "message4506", + "message4507", + "message4509", + "message4511", + "message4512", + "message4528", + "message4529", + "message4534", + "message4536", + "message4539", + "message4548", + "message4554", + "message4557", + "message4568", + "message4574", + "message4577", + "message4591", + "message4600", + "message4601", + "message4602", + "message4604", + "message4608", + "message4616", + "message4617", + "message4618", + "message4629", + "message4632", + "message4633", + "message4638", + "message4639", + "message4648", + "message4653", + "message4657", + "message4658", + "message4668", + "message4669", + "message4673", + "message4675", + "message4677", + "message4678", + "message4681", + "message4682", + "message4683", + "message4686", + "message4687", + "message4693", + "message4695", + "message4697", + "message4698", + "message4706", + "message4717", + "message4722", + "message4733", + "message4742", + "message4752", + "message4754", + "message4755", + "message4758", + "message4760", + "message4761", + "message4763", + "message4773", + "message4784", + "message4789", + "message4794", + "message4795", + "message4803", + "message4805", + "message4810", + "message4813", + "message4814", + "message4823", + "message4828", + "message4839", + "message4854", + "message4857", + "message4867", + "message4870", + "message4872", + "message4875", + "message4885", + "message4886", + "message4895", + "message4899", + "message4903", + "message4904", + "message4907", + "message4908", + "message4910", + "message4914", + "message4915", + "message4918", + "message4920", + "message4923", + "message4930", + "message4934", + "message4937", + "message4944", + "message4952", + "message4959", + "message4965", + "message4978", + "message4979", + "message4982", + "message4986", + "message4987", + "message4991", + "message5003", + "message5012", + "message5016", + "message5017", + "message5018", + "message5019", + "message5039", + "message5049", + "message5058", + "message5061", + "message5062", + "message5063", + "message5075", + "message5087", + "message5088", + "message5092", + "message5100", + "message5101", + "message5103", + "message5105", + "message5114", + "message5127", + "message5129", + "message5130", + "message5136", + "message5137", + "message5139", + "message5141", + "message5145", + "message5154", + "message5158", + "message5176", + "message5178", + "message5179", + "message5187", + "message5191", + "message5196", + "message5203", + "message5207", + "message5210", + "message5211", + "message5213", + "message5216", + "message5217", + "message5245", + "message5252", + "message5254", + "message5256", + "message5262", + "message5266", + "message5274", + "message5284", + "message5289", + "message5295", + "message5297", + "message5303", + "message5308", + "message5311", + "message5316", + "message5320", + "message5321", + "message5325", + "message5331", + "message5332", + "message5335", + "message5338", + "message5343", + "message5345", + "message5349", + "message5355", + "message5366", + "message5368", + "message5369", + "message5372", + "message5375", + "message5388", + "message5403", + "message5405", + "message5406", + "message5417", + "message5427", + "message5456", + "message5459", + "message5466", + "message5473", + "message5481", + "message5491", + "message5498", + "message5503", + "message5505", + "message5509", + "message5514", + "message5520", + "message5521", + "message5525", + "message5532", + "message5534", + "message5537", + "message5539", + "message5553", + "message5557", + "message5559", + "message5567", + "message5570", + "message5571", + "message5576", + "message5578", + "message5580", + "message5590", + "message5593", + "message5598", + "message5600", + "message5604", + "message5606", + "message5608", + "message5620", + "message5629", + "message5635", + "message5638", + "message5644", + "message5645", + "message5650", + "message5653", + "message5660", + "message5675", + "message5681", + "message5686", + "message5687", + "message5697", + "message5700", + "message5706", + "message5708", + "message5712", + "message5720", + "message5724", + "message5727", + "message5729", + "message5736", + "message5737", + "message5742", + "message5746", + "message5751", + "message5752", + "message5754", + "message5763", + "message5770", + "message5772", + "message5777", + "message5779", + "message5780", + "message5781", + "message5784", + "message5791", + "message5792", + "message5798", + "message5800", + "message5801", + "message5805", + "message5811", + "message5812", + "message5817", + "message5826", + "message5837", + "message5842", + "message5851", + "message5858", + "message5861", + "message5865", + "message5867", + "message5868", + "message5870", + "message5883", + "message5887", + "message5889", + "message5893", + "message5900", + "message5901", + "message5911", + "message5916", + "message5922", + "message5926", + "message5928", + "message5938", + "message5948", + "message5949", + "message5951", + "message5960", + "message5961", + "message5964", + "message5967", + "message5970", + "message5972", + "message5978", + "message5981", + "message5998", + "message8001", + "message8002", + "message8003", + "message8004", + "message8005", + "message8006_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8007", + "message8008", + "message8009", + "message8010", + "message8011", + "message8012", + "message8013", + "message8014", + "message8015", + "message8016_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8017", + "message8018", + "message8019", + "message8020", + "message8021", + "message8022", + "message8023", + "message8024", + "message8025", + "message8026_xxxxxxxxx", + "message8027", + "message8028", + "message8029", + "message8030", + "message8031", + "message8032", + "message8033", + "message8034", + "message8035", + "message8036_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8037", + "message8038", + "message8039", + "message8040", + "message8041", + "message8042", + "message8043", + "message8044", + "message8045", + "message8046_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8047", + "message8048", + "message8049", + "message8050", + "message8051", + "message8052", + "message8053", + "message8054", + "message8055", + "message8056_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8057", + "message8058", + "message8059", + "message8060", + "message8061", + "message8062", + "message8063", + "message8064", + "message8065", + "message8066_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8067", + "message8068", + "message8069", + "message8070", + "message8071", + "message8072", + "message8073", + "message8074", + "message8075", + "message8076_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8077", + "message8078", + "message8079", + "message8080", + "message8081", + "message8082", + "message8083", + "message8084", + "message8085", + "message8086_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8087", + "message8088", + "message8089", + "message8090", + "message8091", + "message8092", + "message8093", + "message8094", + "message8095", + "message8096_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8097", + "message8098", + "message8099", + "message8100_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8101", + "message8102", + "message8103", + "message8104", + "message8105", + "message8106_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8107", + "message8108", + "message8109", + "message8110", + "message8111", + "message8112", + "message8113", + "message8114", + "message8115", + "message8116_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8117", + "message8118", + "message8119", + "message8120", + "message8121", + "message8122", + "message8123", + "message8124", + "message8125", + "message8126_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8127", + "message8128", + "message8129", + "message8130", + "message8131", + "message8132", + "message8133", + "message8134", + "message8135", + "message8136_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8137", + "message8138", + "message8139", + "message8140", + "message8141", + "message8142", + "message8143", + "message8144", + "message8145", + "message8146_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8147", + "message8148", + "message8149", + "message8150", + "message8151", + "message8152", + "message8153", + "message8154", + "message8155", + "message8156_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8157", + "message8158", + "message8159", + "message8160", + "message8161", + "message8162", + "message8163", + "message8164", + "message8165", + "message8166_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8167", + "message8168", + "message8169", + "message8170", + "message8171", + "message8172", + "message8173", + "message8174", + "message8175", + "message8176_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8177", + "message8178", + "message8179", + "message8180", + "message8181", + "message8182", + "message8183", + "message8184", + "message8185", + "message8186_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8187", + "message8188", + "message8189", + "message8190", + "message8191", + "message8192", + "message8193", + "message8194", + "message8195", + "message8196_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8197", + "message8198", + "message8199", + "message8200_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8201", + "message8202", + "message8203", + "message8204", + "message8205", + "message8206_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8207", + "message8208", + "message8209", + "message8210", + "message8211", + "message8212", + "message8213", + "message8214", + "message8215", + "message8216_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8217", + "message8218", + "message8219", + "message8220", + "message8221", + "message8222", + "message8223", + "message8224", + "message8225", + "message8226_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8227", + "message8228", + "message8229", + "message8230", + "message8231", + "message8232", + "message8233", + "message8234", + "message8235", + "message8236_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8237", + "message8238", + "message8239", + "message8240", + "message8241", + "message8242", + "message8243", + "message8244", + "message8245", + "message8246_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8247", + "message8248", + "message8249", + "message8250", + "message8251", + "message8252", + "message8253", + "message8254", + "message8255", + "message8256_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8257", + "message8258", + "message8259", + "message8260", + "message8261", + "message8262", + "message8263", + "message8264", + "message8265", + "message8266_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8267", + "message8268", + "message8269", + "message8270", + "message8271", + "message8272", + "message8273", + "message8274", + "message8275", + "message8276_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8277", + "message8278", + "message8279", + "message8280", + "message8281", + "message8282", + "message8283", + "message8284", + "message8285", + "message8286_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8287", + "message8288", + "message8289", + "message8290", + "message8291", + "message8292", + "message8293", + "message8294", + "message8295", + "message8296_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8297", + "message8298", + "message8299", + "message8300_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8301", + "message8302", + "message8303", + "message8304", + "message8305", + "message8306_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8307", + "message8308", + "message8309", + "message8310", + "message8311", + "message8312", + "message8313", + "message8314", + "message8315", + "message8316_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8317", + "message8318", + "message8319", + "message8320", + "message8321", + "message8322", + "message8323", + "message8324", + "message8325", + "message8326_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8327", + "message8328", + "message8329", + "message8330", + "message8331", + "message8332", + "message8333", + "message8334", + "message8335", + "message8336_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8337", + "message8338", + "message8339", + "message8340", + "message8341", + "message8342", + "message8343", + "message8344", + "message8345", + "message8346_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8347", + "message8348", + "message8349", + "message8350", + "message8351", + "message8352", + "message8353", + "message8354", + "message8355", + "message8356_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8357", + "message8358", + "message8359", + "message8360", + "message8361", + "message8362", + "message8363", + "message8364", + "message8365", + "message8366_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8367", + "message8368", + "message8369", + "message8370", + "message8371", + "message8372", + "message8373", + "message8374", + "message8375", + "message8376_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8377", + "message8378", + "message8379", + "message8380", + "message8381", + "message8382", + "message8383", + "message8384", + "message8385", + "message8386_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8387", + "message8388", + "message8389", + "message8390", + "message8391", + "message8392", + "message8393", + "message8394", + "message8395", + "message8396_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8397", + "message8398", + "message8399", + "message8400_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + ] + }, + { + "key": "AAA", + "messages": [ + "message2", + "message7", + "message12", + "message17", + "message22", + "message27", + "message32", + "message37", + "message42", + "message47", + "message52", + "message57", + "message62", + "message67", + "message72", + "message77", + "message82", + "message87", + "message92", + "message97", + "message102", + "message107", + "message112", + "message117", + "message122", + "message127", + "message132", + "message137", + "message142", + "message147", + "message152", + "message157", + "message162", + "message167", + "message172", + "message177", + "message182", + "message187", + "message192", + "message197", + "message202", + "message207", + "message212", + "message217", + "message222", + "message227", + "message232", + "message237", + "message242", + "message247", + "message252", + "message257", + "message262", + "message267", + "message272", + "message277", + "message282", + "message287", + "message292", + "message297", + "message302", + "message307", + "message312", + "message317", + "message322", + "message327", + "message332", + "message337", + "message342", + "message347", + "message352", + "message357", + "message362", + "message367", + "message372", + "message377", + "message382", + "message387", + "message392", + "message397", + "message402", + "message407", + "message412", + "message417", + "message422", + "message427", + "message432", + "message437", + "message442", + "message447", + "message452", + "message457", + "message462", + "message467", + "message472", + "message477", + "message482", + "message487", + "message492", + "message497", + "message502", + "message507", + "message512", + "message517", + "message522", + "message527", + "message532", + "message537", + "message542", + "message547", + "message552", + "message557", + "message562", + "message567", + "message572", + "message577", + "message582", + "message587", + "message592", + "message597", + "message602", + "message607", + "message612", + "message617", + "message622", + "message627", + "message632", + "message637", + "message642", + "message647", + "message652", + "message657", + "message662", + "message667", + "message672", + "message677", + "message682", + "message687", + "message692", + "message697", + "message702", + "message707", + "message712", + "message717", + "message722", + "message727", + "message732", + "message737", + "message742", + "message747", + "message752", + "message757", + "message762", + "message767", + "message772", + "message777", + "message782", + "message787", + "message792", + "message797", + "message802", + "message807", + "message812", + "message817", + "message822", + "message827", + "message832", + "message837", + "message842", + "message847", + "message852", + "message857", + "message862", + "message867", + "message872", + "message877", + "message882", + "message887", + "message892", + "message897", + "message902", + "message907", + "message912", + "message917", + "message922", + "message927", + "message932", + "message937", + "message942", + "message947", + "message952", + "message957", + "message962", + "message967", + "message972", + "message977", + "message982", + "message987", + "message992", + "message997", + "message1002", + "message1007", + "message1012", + "message1017", + "message1022", + "message1027", + "message1032", + "message1037", + "message1042", + "message1047", + "message1052", + "message1057", + "message1062", + "message1067", + "message1072", + "message1077", + "message1082", + "message1087", + "message1092", + "message1097", + "message1102", + "message1107", + "message1112", + "message1117", + "message1122", + "message1127", + "message1132", + "message1137", + "message1142", + "message1147", + "message1152", + "message1157", + "message1162", + "message1167", + "message1172", + "message1177", + "message1182", + "message1187", + "message1192", + "message1197", + "message1202", + "message1207", + "message1212", + "message1217", + "message1222", + "message1227", + "message1232", + "message1237", + "message1242", + "message1247", + "message1252", + "message1257", + "message1262", + "message1267", + "message1272", + "message1277", + "message1282", + "message1287", + "message1292", + "message1297", + "message1302", + "message1307", + "message1312", + "message1317", + "message1322", + "message1327", + "message1332", + "message1337", + "message1342", + "message1347", + "message1352", + "message1357", + "message1362", + "message1367", + "message1372", + "message1377", + "message1382", + "message1387", + "message1392", + "message1397", + "message1402", + "message1407", + "message1412", + "message1417", + "message1422", + "message1427", + "message1432", + "message1437", + "message1442", + "message1447", + "message1452", + "message1457", + "message1462", + "message1467", + "message1472", + "message1477", + "message1482", + "message1487", + "message1492", + "message1497", + "message1502", + "message1507", + "message1512", + "message1517", + "message1522", + "message1527", + "message1532", + "message1537", + "message1542", + "message1547", + "message1552", + "message1557", + "message1562", + "message1567", + "message1572", + "message1577", + "message1582", + "message1587", + "message1592", + "message1597", + "message1602", + "message1607", + "message1612", + "message1617", + "message1622", + "message1627", + "message1632", + "message1637", + "message1642", + "message1647", + "message1652", + "message1657", + "message1662", + "message1667", + "message1672", + "message1677", + "message1682", + "message1687", + "message1692", + "message1697", + "message1702", + "message1707", + "message1712", + "message1717", + "message1722", + "message1727", + "message1732", + "message1737", + "message1742", + "message1747", + "message1752", + "message1757", + "message1762", + "message1767", + "message1772", + "message1777", + "message1782", + "message1787", + "message1792", + "message1797", + "message1802", + "message1807", + "message1812", + "message1817", + "message1822", + "message1827", + "message1832", + "message1837", + "message1842", + "message1847", + "message1852", + "message1857", + "message1862", + "message1867", + "message1872", + "message1877", + "message1882", + "message1887", + "message1892", + "message1897", + "message1902", + "message1907", + "message1912", + "message1917", + "message1922", + "message1927", + "message1932", + "message1937", + "message1942", + "message1947", + "message1952", + "message1957", + "message1962", + "message1967", + "message1972", + "message1977", + "message1982", + "message1987", + "message1992", + "message1997", + "message2401", + "message2402", + "message2403", + "message2404", + "message2405", + "message2406", + "message2407", + "message2408", + "message2409", + "message2410", + "message2411", + "message2412", + "message2413", + "message2414", + "message2415", + "message2416", + "message2417", + "message2418", + "message2419", + "message2420", + "message2421", + "message2422", + "message2423", + "message2424", + "message2425", + "message2426", + "message2427", + "message2428", + "message2429", + "message2430", + "message2431", + "message2432", + "message2433", + "message2434", + "message2435", + "message2436", + "message2437", + "message2438", + "message2439", + "message2440", + "message2441", + "message2442", + "message2443", + "message2444", + "message2445", + "message2446", + "message2447", + "message2448", + "message2449", + "message2450", + "message2451", + "message2452", + "message2453", + "message2454", + "message2455", + "message2456", + "message2457", + "message2458", + "message2459", + "message2460", + "message2461", + "message2462", + "message2463", + "message2464", + "message2465", + "message2466", + "message2467", + "message2468", + "message2469", + "message2470", + "message2471", + "message2472", + "message2473", + "message2474", + "message2475", + "message2476", + "message2477", + "message2478", + "message2479", + "message2480", + "message2481", + "message2482", + "message2483", + "message2484", + "message2485", + "message2486", + "message2487", + "message2488", + "message2489", + "message2490", + "message2491", + "message2492", + "message2493", + "message2494", + "message2495", + "message2496", + "message2497", + "message2498", + "message2499", + "message2500", + "message2501", + "message2502", + "message2503", + "message2504", + "message2505", + "message2506", + "message2507", + "message2508", + "message2509", + "message2510", + "message2511", + "message2512", + "message2513", + "message2514", + "message2515", + "message2516", + "message2517", + "message2518", + "message2519", + "message2520", + "message2521", + "message2522", + "message2523", + "message2524", + "message2525", + "message2526", + "message2527", + "message2528", + "message2529", + "message2530", + "message2531", + "message2532", + "message2533", + "message2534", + "message2535", + "message2536", + "message2537", + "message2538", + "message2539", + "message2540", + "message2541", + "message2542", + "message2543", + "message2544", + "message2545", + "message2546", + "message2547", + "message2548", + "message2549", + "message2550", + "message2551", + "message2552", + "message2553", + "message2554", + "message2555", + "message2556", + "message2557", + "message2558", + "message2559", + "message2560", + "message2561", + "message2562", + "message2563", + "message2564", + "message2565", + "message2566", + "message2567", + "message2568", + "message2569", + "message2570", + "message2571", + "message2572", + "message2573", + "message2574", + "message2575", + "message2576", + "message2577", + "message2578", + "message2579", + "message2580", + "message2581", + "message2582", + "message2583", + "message2584", + "message2585", + "message2586", + "message2587", + "message2588", + "message2589", + "message2590", + "message2591", + "message2592", + "message2593", + "message2594", + "message2595", + "message2596", + "message2597", + "message2598", + "message2599", + "message2600", + "message2601", + "message2602", + "message2603", + "message2604", + "message2605", + "message2606", + "message2607", + "message2608", + "message2609", + "message2610", + "message2611", + "message2612", + "message2613", + "message2614", + "message2615", + "message2616", + "message2617", + "message2618", + "message2619", + "message2620", + "message2621", + "message2622", + "message2623", + "message2624", + "message2625", + "message2626", + "message2627", + "message2628", + "message2629", + "message2630", + "message2631", + "message2632", + "message2633", + "message2634", + "message2635", + "message2636", + "message2637", + "message2638", + "message2639", + "message2640", + "message2641", + "message2642", + "message2643", + "message2644", + "message2645", + "message2646", + "message2647", + "message2648", + "message2649", + "message2650", + "message2651", + "message2652", + "message2653", + "message2654", + "message2655", + "message2656", + "message2657", + "message2658", + "message2659", + "message2660", + "message2661", + "message2662", + "message2663", + "message2664", + "message2665", + "message2666", + "message2667", + "message2668", + "message2669", + "message2670", + "message2671", + "message2672", + "message2673", + "message2674", + "message2675", + "message2676", + "message2677", + "message2678", + "message2679", + "message2680", + "message2681", + "message2682", + "message2683", + "message2684", + "message2685", + "message2686", + "message2687", + "message2688", + "message2689", + "message2690", + "message2691", + "message2692", + "message2693", + "message2694", + "message2695", + "message2696", + "message2697", + "message2698", + "message2699", + "message2700", + "message2701", + "message2702", + "message2703", + "message2704", + "message2705", + "message2706", + "message2707", + "message2708", + "message2709", + "message2710", + "message2711", + "message2712", + "message2713", + "message2714", + "message2715", + "message2716", + "message2717", + "message2718", + "message2719", + "message2720", + "message2721", + "message2722", + "message2723", + "message2724", + "message2725", + "message2726", + "message2727", + "message2728", + "message2729", + "message2730", + "message2731", + "message2732", + "message2733", + "message2734", + "message2735", + "message2736", + "message2737", + "message2738", + "message2739", + "message2740", + "message2741", + "message2742", + "message2743", + "message2744", + "message2745", + "message2746", + "message2747", + "message2748", + "message2749", + "message2750", + "message2751", + "message2752", + "message2753", + "message2754", + "message2755", + "message2756", + "message2757", + "message2758", + "message2759", + "message2760", + "message2761", + "message2762", + "message2763", + "message2764", + "message2765", + "message2766", + "message2767", + "message2768", + "message2769", + "message2770", + "message2771", + "message2772", + "message2773", + "message2774", + "message2775", + "message2776", + "message2777", + "message2778", + "message2779", + "message2780", + "message2781", + "message2782", + "message2783", + "message2784", + "message2785", + "message2786", + "message2787", + "message2788", + "message2789", + "message2790", + "message2791", + "message2792", + "message2793", + "message2794", + "message2795", + "message2796", + "message2797", + "message2798", + "message2799", + "message2800", + "message4003", + "message4005", + "message4008", + "message4023", + "message4039", + "message4044", + "message4051", + "message4055", + "message4061", + "message4067", + "message4069", + "message4070", + "message4077", + "message4091", + "message4099", + "message4100", + "message4101", + "message4103", + "message4116", + "message4124", + "message4125", + "message4132", + "message4142", + "message4155", + "message4159", + "message4160", + "message4162", + "message4163", + "message4164", + "message4166", + "message4169", + "message4175", + "message4177", + "message4178", + "message4186", + "message4187", + "message4205", + "message4208", + "message4215", + "message4216", + "message4221", + "message4227", + "message4231", + "message4245", + "message4254", + "message4260", + "message4269", + "message4270", + "message4286", + "message4292", + "message4293", + "message4298", + "message4304", + "message4308", + "message4311", + "message4312", + "message4313", + "message4315", + "message4316", + "message4318", + "message4325", + "message4326", + "message4347", + "message4352", + "message4353", + "message4356", + "message4366", + "message4367", + "message4369", + "message4372", + "message4376", + "message4377", + "message4379", + "message4391", + "message4394", + "message4399", + "message4408", + "message4419", + "message4420", + "message4425", + "message4439", + "message4442", + "message4443", + "message4447", + "message4448", + "message4460", + "message4461", + "message4462", + "message4466", + "message4467", + "message4468", + "message4472", + "message4473", + "message4478", + "message4480", + "message4482", + "message4483", + "message4485", + "message4495", + "message4503", + "message4504", + "message4517", + "message4520", + "message4549", + "message4555", + "message4561", + "message4562", + "message4564", + "message4565", + "message4576", + "message4581", + "message4583", + "message4589", + "message4590", + "message4595", + "message4603", + "message4609", + "message4614", + "message4621", + "message4626", + "message4630", + "message4631", + "message4637", + "message4640", + "message4643", + "message4644", + "message4645", + "message4649", + "message4651", + "message4654", + "message4656", + "message4663", + "message4685", + "message4689", + "message4703", + "message4704", + "message4705", + "message4711", + "message4715", + "message4716", + "message4719", + "message4723", + "message4725", + "message4726", + "message4735", + "message4738", + "message4740", + "message4741", + "message4756", + "message4766", + "message4767", + "message4770", + "message4780", + "message4793", + "message4798", + "message4800", + "message4802", + "message4806", + "message4809", + "message4816", + "message4822", + "message4824", + "message4826", + "message4834", + "message4843", + "message4850", + "message4858", + "message4862", + "message4864", + "message4866", + "message4874", + "message4877", + "message4878", + "message4879", + "message4892", + "message4902", + "message4909", + "message4911", + "message4922", + "message4932", + "message4935", + "message4943", + "message4946", + "message4955", + "message4962", + "message4967", + "message4972", + "message4976", + "message4984", + "message4985", + "message4993", + "message4994", + "message4996", + "message4997", + "message5001", + "message5009", + "message5010", + "message5011", + "message5014", + "message5024", + "message5030", + "message5034", + "message5035", + "message5036", + "message5040", + "message5050", + "message5054", + "message5057", + "message5059", + "message5077", + "message5080", + "message5086", + "message5094", + "message5098", + "message5099", + "message5110", + "message5112", + "message5115", + "message5116", + "message5117", + "message5119", + "message5122", + "message5123", + "message5132", + "message5140", + "message5146", + "message5149", + "message5153", + "message5160", + "message5163", + "message5168", + "message5172", + "message5174", + "message5175", + "message5177", + "message5180", + "message5182", + "message5184", + "message5185", + "message5188", + "message5197", + "message5198", + "message5204", + "message5206", + "message5219", + "message5220", + "message5226", + "message5230", + "message5235", + "message5236", + "message5237", + "message5238", + "message5241", + "message5244", + "message5255", + "message5264", + "message5268", + "message5270", + "message5271", + "message5273", + "message5279", + "message5283", + "message5292", + "message5293", + "message5296", + "message5299", + "message5300", + "message5313", + "message5334", + "message5336", + "message5337", + "message5340", + "message5351", + "message5357", + "message5363", + "message5367", + "message5373", + "message5381", + "message5383", + "message5386", + "message5392", + "message5394", + "message5402", + "message5408", + "message5414", + "message5418", + "message5419", + "message5420", + "message5423", + "message5428", + "message5429", + "message5432", + "message5434", + "message5435", + "message5438", + "message5442", + "message5444", + "message5447", + "message5449", + "message5453", + "message5458", + "message5463", + "message5478", + "message5488", + "message5492", + "message5497", + "message5500", + "message5508", + "message5513", + "message5523", + "message5527", + "message5530", + "message5531", + "message5533", + "message5540", + "message5558", + "message5563", + "message5564", + "message5568", + "message5579", + "message5582", + "message5591", + "message5607", + "message5613", + "message5614", + "message5615", + "message5622", + "message5623", + "message5624", + "message5643", + "message5659", + "message5662", + "message5663", + "message5665", + "message5669", + "message5672", + "message5679", + "message5685", + "message5689", + "message5692", + "message5694", + "message5701", + "message5707", + "message5711", + "message5714", + "message5715", + "message5725", + "message5739", + "message5743", + "message5747", + "message5748", + "message5756", + "message5757", + "message5759", + "message5761", + "message5765", + "message5769", + "message5775", + "message5776", + "message5786", + "message5802", + "message5806", + "message5813", + "message5822", + "message5833", + "message5834", + "message5838", + "message5840", + "message5848", + "message5854", + "message5856", + "message5869", + "message5872", + "message5874", + "message5876", + "message5878", + "message5881", + "message5882", + "message5888", + "message5890", + "message5894", + "message5895", + "message5899", + "message5913", + "message5914", + "message5915", + "message5921", + "message5933", + "message5937", + "message5940", + "message5945", + "message5958", + "message5966", + "message5969", + "message5977", + "message5980", + "message5992", + "message5995", + "message5997", + "message5999", + "message8401", + "message8402", + "message8403", + "message8404", + "message8405", + "message8406_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8407", + "message8408", + "message8409", + "message8410", + "message8411", + "message8412", + "message8413", + "message8414", + "message8415", + "message8416_xxxxxxxxxxxxxxxxxxxx", + "message8417", + "message8418", + "message8419", + "message8420", + "message8421", + "message8422", + "message8423", + "message8424", + "message8425", + "message8426_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8427", + "message8428", + "message8429", + "message8430", + "message8431", + "message8432", + "message8433", + "message8434", + "message8435", + "message8436_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8437", + "message8438", + "message8439", + "message8440", + "message8441", + "message8442", + "message8443", + "message8444", + "message8445", + "message8446_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8447", + "message8448", + "message8449", + "message8450", + "message8451", + "message8452", + "message8453", + "message8454", + "message8455", + "message8456_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8457", + "message8458", + "message8459", + "message8460", + "message8461", + "message8462", + "message8463", + "message8464", + "message8465", + "message8466_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8467", + "message8468", + "message8469", + "message8470", + "message8471", + "message8472", + "message8473", + "message8474", + "message8475", + "message8476_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8477", + "message8478", + "message8479", + "message8480", + "message8481", + "message8482", + "message8483", + "message8484", + "message8485", + "message8486_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8487", + "message8488", + "message8489", + "message8490", + "message8491", + "message8492", + "message8493", + "message8494", + "message8495", + "message8496_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8497", + "message8498", + "message8499", + "message8500_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8501", + "message8502", + "message8503", + "message8504", + "message8505", + "message8506_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8507", + "message8508", + "message8509", + "message8510", + "message8511", + "message8512", + "message8513", + "message8514", + "message8515", + "message8516_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8517", + "message8518", + "message8519", + "message8520", + "message8521", + "message8522", + "message8523", + "message8524", + "message8525", + "message8526_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8527", + "message8528", + "message8529", + "message8530", + "message8531", + "message8532", + "message8533", + "message8534", + "message8535", + "message8536_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8537", + "message8538", + "message8539", + "message8540", + "message8541", + "message8542", + "message8543", + "message8544", + "message8545", + "message8546_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8547", + "message8548", + "message8549", + "message8550", + "message8551", + "message8552", + "message8553", + "message8554", + "message8555", + "message8556_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8557", + "message8558", + "message8559", + "message8560", + "message8561", + "message8562", + "message8563", + "message8564", + "message8565", + "message8566_xxxxxxxxxxxxxxxxxxxxxxxx", + "message8567", + "message8568", + "message8569", + "message8570", + "message8571", + "message8572", + "message8573", + "message8574", + "message8575", + "message8576_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8577", + "message8578", + "message8579", + "message8580", + "message8581", + "message8582", + "message8583", + "message8584", + "message8585", + "message8586_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8587", + "message8588", + "message8589", + "message8590", + "message8591", + "message8592", + "message8593", + "message8594", + "message8595", + "message8596_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8597", + "message8598", + "message8599", + "message8600_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8601", + "message8602", + "message8603", + "message8604", + "message8605", + "message8606_xxxxxxxxxxxxxxxxxx", + "message8607", + "message8608", + "message8609", + "message8610", + "message8611", + "message8612", + "message8613", + "message8614", + "message8615", + "message8616_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8617", + "message8618", + "message8619", + "message8620", + "message8621", + "message8622", + "message8623", + "message8624", + "message8625", + "message8626_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8627", + "message8628", + "message8629", + "message8630", + "message8631", + "message8632", + "message8633", + "message8634", + "message8635", + "message8636_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8637", + "message8638", + "message8639", + "message8640", + "message8641", + "message8642", + "message8643", + "message8644", + "message8645", + "message8646_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8647", + "message8648", + "message8649", + "message8650", + "message8651", + "message8652", + "message8653", + "message8654", + "message8655", + "message8656_xxxxxxxxxxxxx", + "message8657", + "message8658", + "message8659", + "message8660", + "message8661", + "message8662", + "message8663", + "message8664", + "message8665", + "message8666_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8667", + "message8668", + "message8669", + "message8670", + "message8671", + "message8672", + "message8673", + "message8674", + "message8675", + "message8676_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8677", + "message8678", + "message8679", + "message8680", + "message8681", + "message8682", + "message8683", + "message8684", + "message8685", + "message8686_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8687", + "message8688", + "message8689", + "message8690", + "message8691", + "message8692", + "message8693", + "message8694", + "message8695", + "message8696_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8697", + "message8698", + "message8699", + "message8700_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8701", + "message8702", + "message8703", + "message8704", + "message8705", + "message8706_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8707", + "message8708", + "message8709", + "message8710", + "message8711", + "message8712", + "message8713", + "message8714", + "message8715", + "message8716_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8717", + "message8718", + "message8719", + "message8720", + "message8721", + "message8722", + "message8723", + "message8724", + "message8725", + "message8726_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8727", + "message8728", + "message8729", + "message8730", + "message8731", + "message8732", + "message8733", + "message8734", + "message8735", + "message8736_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8737", + "message8738", + "message8739", + "message8740", + "message8741", + "message8742", + "message8743", + "message8744", + "message8745", + "message8746_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8747", + "message8748", + "message8749", + "message8750", + "message8751", + "message8752", + "message8753", + "message8754", + "message8755", + "message8756_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8757", + "message8758", + "message8759", + "message8760", + "message8761", + "message8762", + "message8763", + "message8764", + "message8765", + "message8766_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8767", + "message8768", + "message8769", + "message8770", + "message8771", + "message8772", + "message8773", + "message8774", + "message8775", + "message8776_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8777", + "message8778", + "message8779", + "message8780", + "message8781", + "message8782", + "message8783", + "message8784", + "message8785", + "message8786_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8787", + "message8788", + "message8789", + "message8790", + "message8791", + "message8792", + "message8793", + "message8794", + "message8795", + "message8796_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8797", + "message8798", + "message8799", + "message8800_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + ] + }, + { + "key": "BBB", + "messages": [ + "message3", + "message8", + "message13", + "message18", + "message23", + "message28", + "message33", + "message38", + "message43", + "message48", + "message53", + "message58", + "message63", + "message68", + "message73", + "message78", + "message83", + "message88", + "message93", + "message98", + "message103", + "message108", + "message113", + "message118", + "message123", + "message128", + "message133", + "message138", + "message143", + "message148", + "message153", + "message158", + "message163", + "message168", + "message173", + "message178", + "message183", + "message188", + "message193", + "message198", + "message203", + "message208", + "message213", + "message218", + "message223", + "message228", + "message233", + "message238", + "message243", + "message248", + "message253", + "message258", + "message263", + "message268", + "message273", + "message278", + "message283", + "message288", + "message293", + "message298", + "message303", + "message308", + "message313", + "message318", + "message323", + "message328", + "message333", + "message338", + "message343", + "message348", + "message353", + "message358", + "message363", + "message368", + "message373", + "message378", + "message383", + "message388", + "message393", + "message398", + "message403", + "message408", + "message413", + "message418", + "message423", + "message428", + "message433", + "message438", + "message443", + "message448", + "message453", + "message458", + "message463", + "message468", + "message473", + "message478", + "message483", + "message488", + "message493", + "message498", + "message503", + "message508", + "message513", + "message518", + "message523", + "message528", + "message533", + "message538", + "message543", + "message548", + "message553", + "message558", + "message563", + "message568", + "message573", + "message578", + "message583", + "message588", + "message593", + "message598", + "message603", + "message608", + "message613", + "message618", + "message623", + "message628", + "message633", + "message638", + "message643", + "message648", + "message653", + "message658", + "message663", + "message668", + "message673", + "message678", + "message683", + "message688", + "message693", + "message698", + "message703", + "message708", + "message713", + "message718", + "message723", + "message728", + "message733", + "message738", + "message743", + "message748", + "message753", + "message758", + "message763", + "message768", + "message773", + "message778", + "message783", + "message788", + "message793", + "message798", + "message803", + "message808", + "message813", + "message818", + "message823", + "message828", + "message833", + "message838", + "message843", + "message848", + "message853", + "message858", + "message863", + "message868", + "message873", + "message878", + "message883", + "message888", + "message893", + "message898", + "message903", + "message908", + "message913", + "message918", + "message923", + "message928", + "message933", + "message938", + "message943", + "message948", + "message953", + "message958", + "message963", + "message968", + "message973", + "message978", + "message983", + "message988", + "message993", + "message998", + "message1003", + "message1008", + "message1013", + "message1018", + "message1023", + "message1028", + "message1033", + "message1038", + "message1043", + "message1048", + "message1053", + "message1058", + "message1063", + "message1068", + "message1073", + "message1078", + "message1083", + "message1088", + "message1093", + "message1098", + "message1103", + "message1108", + "message1113", + "message1118", + "message1123", + "message1128", + "message1133", + "message1138", + "message1143", + "message1148", + "message1153", + "message1158", + "message1163", + "message1168", + "message1173", + "message1178", + "message1183", + "message1188", + "message1193", + "message1198", + "message1203", + "message1208", + "message1213", + "message1218", + "message1223", + "message1228", + "message1233", + "message1238", + "message1243", + "message1248", + "message1253", + "message1258", + "message1263", + "message1268", + "message1273", + "message1278", + "message1283", + "message1288", + "message1293", + "message1298", + "message1303", + "message1308", + "message1313", + "message1318", + "message1323", + "message1328", + "message1333", + "message1338", + "message1343", + "message1348", + "message1353", + "message1358", + "message1363", + "message1368", + "message1373", + "message1378", + "message1383", + "message1388", + "message1393", + "message1398", + "message1403", + "message1408", + "message1413", + "message1418", + "message1423", + "message1428", + "message1433", + "message1438", + "message1443", + "message1448", + "message1453", + "message1458", + "message1463", + "message1468", + "message1473", + "message1478", + "message1483", + "message1488", + "message1493", + "message1498", + "message1503", + "message1508", + "message1513", + "message1518", + "message1523", + "message1528", + "message1533", + "message1538", + "message1543", + "message1548", + "message1553", + "message1558", + "message1563", + "message1568", + "message1573", + "message1578", + "message1583", + "message1588", + "message1593", + "message1598", + "message1603", + "message1608", + "message1613", + "message1618", + "message1623", + "message1628", + "message1633", + "message1638", + "message1643", + "message1648", + "message1653", + "message1658", + "message1663", + "message1668", + "message1673", + "message1678", + "message1683", + "message1688", + "message1693", + "message1698", + "message1703", + "message1708", + "message1713", + "message1718", + "message1723", + "message1728", + "message1733", + "message1738", + "message1743", + "message1748", + "message1753", + "message1758", + "message1763", + "message1768", + "message1773", + "message1778", + "message1783", + "message1788", + "message1793", + "message1798", + "message1803", + "message1808", + "message1813", + "message1818", + "message1823", + "message1828", + "message1833", + "message1838", + "message1843", + "message1848", + "message1853", + "message1858", + "message1863", + "message1868", + "message1873", + "message1878", + "message1883", + "message1888", + "message1893", + "message1898", + "message1903", + "message1908", + "message1913", + "message1918", + "message1923", + "message1928", + "message1933", + "message1938", + "message1943", + "message1948", + "message1953", + "message1958", + "message1963", + "message1968", + "message1973", + "message1978", + "message1983", + "message1988", + "message1993", + "message1998", + "message2801", + "message2802", + "message2803", + "message2804", + "message2805", + "message2806", + "message2807", + "message2808", + "message2809", + "message2810", + "message2811", + "message2812", + "message2813", + "message2814", + "message2815", + "message2816", + "message2817", + "message2818", + "message2819", + "message2820", + "message2821", + "message2822", + "message2823", + "message2824", + "message2825", + "message2826", + "message2827", + "message2828", + "message2829", + "message2830", + "message2831", + "message2832", + "message2833", + "message2834", + "message2835", + "message2836", + "message2837", + "message2838", + "message2839", + "message2840", + "message2841", + "message2842", + "message2843", + "message2844", + "message2845", + "message2846", + "message2847", + "message2848", + "message2849", + "message2850", + "message2851", + "message2852", + "message2853", + "message2854", + "message2855", + "message2856", + "message2857", + "message2858", + "message2859", + "message2860", + "message2861", + "message2862", + "message2863", + "message2864", + "message2865", + "message2866", + "message2867", + "message2868", + "message2869", + "message2870", + "message2871", + "message2872", + "message2873", + "message2874", + "message2875", + "message2876", + "message2877", + "message2878", + "message2879", + "message2880", + "message2881", + "message2882", + "message2883", + "message2884", + "message2885", + "message2886", + "message2887", + "message2888", + "message2889", + "message2890", + "message2891", + "message2892", + "message2893", + "message2894", + "message2895", + "message2896", + "message2897", + "message2898", + "message2899", + "message2900", + "message2901", + "message2902", + "message2903", + "message2904", + "message2905", + "message2906", + "message2907", + "message2908", + "message2909", + "message2910", + "message2911", + "message2912", + "message2913", + "message2914", + "message2915", + "message2916", + "message2917", + "message2918", + "message2919", + "message2920", + "message2921", + "message2922", + "message2923", + "message2924", + "message2925", + "message2926", + "message2927", + "message2928", + "message2929", + "message2930", + "message2931", + "message2932", + "message2933", + "message2934", + "message2935", + "message2936", + "message2937", + "message2938", + "message2939", + "message2940", + "message2941", + "message2942", + "message2943", + "message2944", + "message2945", + "message2946", + "message2947", + "message2948", + "message2949", + "message2950", + "message2951", + "message2952", + "message2953", + "message2954", + "message2955", + "message2956", + "message2957", + "message2958", + "message2959", + "message2960", + "message2961", + "message2962", + "message2963", + "message2964", + "message2965", + "message2966", + "message2967", + "message2968", + "message2969", + "message2970", + "message2971", + "message2972", + "message2973", + "message2974", + "message2975", + "message2976", + "message2977", + "message2978", + "message2979", + "message2980", + "message2981", + "message2982", + "message2983", + "message2984", + "message2985", + "message2986", + "message2987", + "message2988", + "message2989", + "message2990", + "message2991", + "message2992", + "message2993", + "message2994", + "message2995", + "message2996", + "message2997", + "message2998", + "message2999", + "message3000", + "message3001", + "message3002", + "message3003", + "message3004", + "message3005", + "message3006", + "message3007", + "message3008", + "message3009", + "message3010", + "message3011", + "message3012", + "message3013", + "message3014", + "message3015", + "message3016", + "message3017", + "message3018", + "message3019", + "message3020", + "message3021", + "message3022", + "message3023", + "message3024", + "message3025", + "message3026", + "message3027", + "message3028", + "message3029", + "message3030", + "message3031", + "message3032", + "message3033", + "message3034", + "message3035", + "message3036", + "message3037", + "message3038", + "message3039", + "message3040", + "message3041", + "message3042", + "message3043", + "message3044", + "message3045", + "message3046", + "message3047", + "message3048", + "message3049", + "message3050", + "message3051", + "message3052", + "message3053", + "message3054", + "message3055", + "message3056", + "message3057", + "message3058", + "message3059", + "message3060", + "message3061", + "message3062", + "message3063", + "message3064", + "message3065", + "message3066", + "message3067", + "message3068", + "message3069", + "message3070", + "message3071", + "message3072", + "message3073", + "message3074", + "message3075", + "message3076", + "message3077", + "message3078", + "message3079", + "message3080", + "message3081", + "message3082", + "message3083", + "message3084", + "message3085", + "message3086", + "message3087", + "message3088", + "message3089", + "message3090", + "message3091", + "message3092", + "message3093", + "message3094", + "message3095", + "message3096", + "message3097", + "message3098", + "message3099", + "message3100", + "message3101", + "message3102", + "message3103", + "message3104", + "message3105", + "message3106", + "message3107", + "message3108", + "message3109", + "message3110", + "message3111", + "message3112", + "message3113", + "message3114", + "message3115", + "message3116", + "message3117", + "message3118", + "message3119", + "message3120", + "message3121", + "message3122", + "message3123", + "message3124", + "message3125", + "message3126", + "message3127", + "message3128", + "message3129", + "message3130", + "message3131", + "message3132", + "message3133", + "message3134", + "message3135", + "message3136", + "message3137", + "message3138", + "message3139", + "message3140", + "message3141", + "message3142", + "message3143", + "message3144", + "message3145", + "message3146", + "message3147", + "message3148", + "message3149", + "message3150", + "message3151", + "message3152", + "message3153", + "message3154", + "message3155", + "message3156", + "message3157", + "message3158", + "message3159", + "message3160", + "message3161", + "message3162", + "message3163", + "message3164", + "message3165", + "message3166", + "message3167", + "message3168", + "message3169", + "message3170", + "message3171", + "message3172", + "message3173", + "message3174", + "message3175", + "message3176", + "message3177", + "message3178", + "message3179", + "message3180", + "message3181", + "message3182", + "message3183", + "message3184", + "message3185", + "message3186", + "message3187", + "message3188", + "message3189", + "message3190", + "message3191", + "message3192", + "message3193", + "message3194", + "message3195", + "message3196", + "message3197", + "message3198", + "message3199", + "message3200", + "message4007", + "message4009", + "message4010", + "message4011", + "message4012", + "message4013", + "message4042", + "message4057", + "message4081", + "message4104", + "message4109", + "message4110", + "message4115", + "message4117", + "message4118", + "message4119", + "message4122", + "message4136", + "message4137", + "message4144", + "message4151", + "message4152", + "message4153", + "message4154", + "message4170", + "message4171", + "message4172", + "message4173", + "message4183", + "message4184", + "message4190", + "message4193", + "message4195", + "message4201", + "message4204", + "message4207", + "message4209", + "message4210", + "message4214", + "message4225", + "message4230", + "message4232", + "message4235", + "message4240", + "message4247", + "message4248", + "message4250", + "message4256", + "message4261", + "message4264", + "message4265", + "message4273", + "message4276", + "message4279", + "message4280", + "message4288", + "message4309", + "message4323", + "message4331", + "message4339", + "message4341", + "message4344", + "message4354", + "message4355", + "message4358", + "message4359", + "message4360", + "message4371", + "message4373", + "message4374", + "message4380", + "message4387", + "message4388", + "message4392", + "message4393", + "message4400", + "message4401", + "message4402", + "message4404", + "message4414", + "message4417", + "message4426", + "message4432", + "message4433", + "message4434", + "message4435", + "message4441", + "message4444", + "message4450", + "message4451", + "message4459", + "message4463", + "message4464", + "message4475", + "message4477", + "message4479", + "message4486", + "message4489", + "message4491", + "message4499", + "message4502", + "message4505", + "message4510", + "message4513", + "message4515", + "message4516", + "message4525", + "message4527", + "message4530", + "message4535", + "message4543", + "message4545", + "message4550", + "message4552", + "message4559", + "message4570", + "message4579", + "message4580", + "message4586", + "message4610", + "message4615", + "message4623", + "message4625", + "message4627", + "message4642", + "message4646", + "message4647", + "message4662", + "message4666", + "message4679", + "message4684", + "message4690", + "message4696", + "message4700", + "message4708", + "message4709", + "message4712", + "message4718", + "message4720", + "message4732", + "message4734", + "message4737", + "message4739", + "message4747", + "message4749", + "message4764", + "message4769", + "message4774", + "message4775", + "message4777", + "message4778", + "message4782", + "message4783", + "message4804", + "message4815", + "message4817", + "message4819", + "message4821", + "message4825", + "message4829", + "message4830", + "message4835", + "message4836", + "message4837", + "message4841", + "message4844", + "message4852", + "message4856", + "message4865", + "message4869", + "message4871", + "message4887", + "message4896", + "message4900", + "message4916", + "message4917", + "message4919", + "message4921", + "message4924", + "message4926", + "message4928", + "message4931", + "message4936", + "message4938", + "message4939", + "message4942", + "message4951", + "message4956", + "message4957", + "message4958", + "message4961", + "message4964", + "message4966", + "message4971", + "message4974", + "message4980", + "message4983", + "message4990", + "message4995", + "message4998", + "message5000", + "message5007", + "message5013", + "message5021", + "message5026", + "message5028", + "message5041", + "message5047", + "message5053", + "message5055", + "message5064", + "message5065", + "message5069", + "message5078", + "message5079", + "message5085", + "message5093", + "message5095", + "message5106", + "message5107", + "message5109", + "message5111", + "message5120", + "message5125", + "message5126", + "message5133", + "message5135", + "message5143", + "message5147", + "message5148", + "message5150", + "message5152", + "message5164", + "message5166", + "message5171", + "message5183", + "message5190", + "message5193", + "message5195", + "message5200", + "message5201", + "message5212", + "message5222", + "message5231", + "message5232", + "message5233", + "message5234", + "message5242", + "message5243", + "message5248", + "message5249", + "message5251", + "message5257", + "message5259", + "message5261", + "message5277", + "message5280", + "message5286", + "message5287", + "message5290", + "message5302", + "message5305", + "message5307", + "message5309", + "message5314", + "message5322", + "message5324", + "message5329", + "message5330", + "message5333", + "message5341", + "message5350", + "message5374", + "message5378", + "message5380", + "message5384", + "message5387", + "message5393", + "message5400", + "message5410", + "message5411", + "message5413", + "message5424", + "message5430", + "message5431", + "message5433", + "message5436", + "message5445", + "message5448", + "message5450", + "message5451", + "message5454", + "message5467", + "message5468", + "message5470", + "message5472", + "message5487", + "message5489", + "message5493", + "message5496", + "message5502", + "message5507", + "message5517", + "message5522", + "message5524", + "message5542", + "message5552", + "message5562", + "message5566", + "message5572", + "message5573", + "message5574", + "message5581", + "message5585", + "message5586", + "message5589", + "message5594", + "message5595", + "message5597", + "message5599", + "message5601", + "message5602", + "message5603", + "message5605", + "message5610", + "message5617", + "message5619", + "message5626", + "message5632", + "message5636", + "message5639", + "message5641", + "message5647", + "message5648", + "message5652", + "message5664", + "message5668", + "message5704", + "message5705", + "message5709", + "message5710", + "message5713", + "message5716", + "message5731", + "message5732", + "message5744", + "message5745", + "message5750", + "message5755", + "message5766", + "message5768", + "message5771", + "message5774", + "message5782", + "message5794", + "message5795", + "message5804", + "message5807", + "message5809", + "message5816", + "message5820", + "message5824", + "message5825", + "message5827", + "message5831", + "message5835", + "message5836", + "message5844", + "message5845", + "message5849", + "message5857", + "message5862", + "message5864", + "message5871", + "message5879", + "message5884", + "message5892", + "message5896", + "message5905", + "message5907", + "message5908", + "message5919", + "message5920", + "message5925", + "message5927", + "message5929", + "message5932", + "message5935", + "message5942", + "message5944", + "message5947", + "message5952", + "message5954", + "message5956", + "message5962", + "message5963", + "message5968", + "message5984", + "message5993", + "message5994", + "message8801", + "message8802", + "message8803", + "message8804", + "message8805", + "message8806_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8807", + "message8808", + "message8809", + "message8810", + "message8811", + "message8812", + "message8813", + "message8814", + "message8815", + "message8816_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8817", + "message8818", + "message8819", + "message8820", + "message8821", + "message8822", + "message8823", + "message8824", + "message8825", + "message8826_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8827", + "message8828", + "message8829", + "message8830", + "message8831", + "message8832", + "message8833", + "message8834", + "message8835", + "message8836_xxxxxxxxxxxxxxxxxxxxxxxxx", + "message8837", + "message8838", + "message8839", + "message8840", + "message8841", + "message8842", + "message8843", + "message8844", + "message8845", + "message8846_xxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8847", + "message8848", + "message8849", + "message8850", + "message8851", + "message8852", + "message8853", + "message8854", + "message8855", + "message8856_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8857", + "message8858", + "message8859", + "message8860", + "message8861", + "message8862", + "message8863", + "message8864", + "message8865", + "message8866_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8867", + "message8868", + "message8869", + "message8870", + "message8871", + "message8872", + "message8873", + "message8874", + "message8875", + "message8876_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8877", + "message8878", + "message8879", + "message8880", + "message8881", + "message8882", + "message8883", + "message8884", + "message8885", + "message8886_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8887", + "message8888", + "message8889", + "message8890", + "message8891", + "message8892", + "message8893", + "message8894", + "message8895", + "message8896_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8897", + "message8898", + "message8899", + "message8900_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8901", + "message8902", + "message8903", + "message8904", + "message8905", + "message8906_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8907", + "message8908", + "message8909", + "message8910", + "message8911", + "message8912", + "message8913", + "message8914", + "message8915", + "message8916_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8917", + "message8918", + "message8919", + "message8920", + "message8921", + "message8922", + "message8923", + "message8924", + "message8925", + "message8926_xxxxxxxxx", + "message8927", + "message8928", + "message8929", + "message8930", + "message8931", + "message8932", + "message8933", + "message8934", + "message8935", + "message8936_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8937", + "message8938", + "message8939", + "message8940", + "message8941", + "message8942", + "message8943", + "message8944", + "message8945", + "message8946_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8947", + "message8948", + "message8949", + "message8950", + "message8951", + "message8952", + "message8953", + "message8954", + "message8955", + "message8956_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8957", + "message8958", + "message8959", + "message8960", + "message8961", + "message8962", + "message8963", + "message8964", + "message8965", + "message8966_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8967", + "message8968", + "message8969", + "message8970", + "message8971", + "message8972", + "message8973", + "message8974", + "message8975", + "message8976_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8977", + "message8978", + "message8979", + "message8980", + "message8981", + "message8982", + "message8983", + "message8984", + "message8985", + "message8986_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8987", + "message8988", + "message8989", + "message8990", + "message8991", + "message8992", + "message8993", + "message8994", + "message8995", + "message8996_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message8997", + "message8998", + "message8999", + "message9000_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9001", + "message9002", + "message9003", + "message9004", + "message9005", + "message9006_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9007", + "message9008", + "message9009", + "message9010", + "message9011", + "message9012", + "message9013", + "message9014", + "message9015", + "message9016_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9017", + "message9018", + "message9019", + "message9020", + "message9021", + "message9022", + "message9023", + "message9024", + "message9025", + "message9026_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9027", + "message9028", + "message9029", + "message9030", + "message9031", + "message9032", + "message9033", + "message9034", + "message9035", + "message9036_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9037", + "message9038", + "message9039", + "message9040", + "message9041", + "message9042", + "message9043", + "message9044", + "message9045", + "message9046_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9047", + "message9048", + "message9049", + "message9050", + "message9051", + "message9052", + "message9053", + "message9054", + "message9055", + "message9056_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9057", + "message9058", + "message9059", + "message9060", + "message9061", + "message9062", + "message9063", + "message9064", + "message9065", + "message9066_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9067", + "message9068", + "message9069", + "message9070", + "message9071", + "message9072", + "message9073", + "message9074", + "message9075", + "message9076_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9077", + "message9078", + "message9079", + "message9080", + "message9081", + "message9082", + "message9083", + "message9084", + "message9085", + "message9086_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9087", + "message9088", + "message9089", + "message9090", + "message9091", + "message9092", + "message9093", + "message9094", + "message9095", + "message9096_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9097", + "message9098", + "message9099", + "message9100_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9101", + "message9102", + "message9103", + "message9104", + "message9105", + "message9106_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9107", + "message9108", + "message9109", + "message9110", + "message9111", + "message9112", + "message9113", + "message9114", + "message9115", + "message9116_xxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9117", + "message9118", + "message9119", + "message9120", + "message9121", + "message9122", + "message9123", + "message9124", + "message9125", + "message9126_xxxxxxxxxxxxxxx", + "message9127", + "message9128", + "message9129", + "message9130", + "message9131", + "message9132", + "message9133", + "message9134", + "message9135", + "message9136_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9137", + "message9138", + "message9139", + "message9140", + "message9141", + "message9142", + "message9143", + "message9144", + "message9145", + "message9146_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9147", + "message9148", + "message9149", + "message9150", + "message9151", + "message9152", + "message9153", + "message9154", + "message9155", + "message9156_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9157", + "message9158", + "message9159", + "message9160", + "message9161", + "message9162", + "message9163", + "message9164", + "message9165", + "message9166_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9167", + "message9168", + "message9169", + "message9170", + "message9171", + "message9172", + "message9173", + "message9174", + "message9175", + "message9176_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9177", + "message9178", + "message9179", + "message9180", + "message9181", + "message9182", + "message9183", + "message9184", + "message9185", + "message9186_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9187", + "message9188", + "message9189", + "message9190", + "message9191", + "message9192", + "message9193", + "message9194", + "message9195", + "message9196_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9197", + "message9198", + "message9199", + "message9200_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + ] + }, + { + "key": "CCC", + "messages": [ + "message4", + "message9", + "message14", + "message19", + "message24", + "message29", + "message34", + "message39", + "message44", + "message49", + "message54", + "message59", + "message64", + "message69", + "message74", + "message79", + "message84", + "message89", + "message94", + "message99", + "message104", + "message109", + "message114", + "message119", + "message124", + "message129", + "message134", + "message139", + "message144", + "message149", + "message154", + "message159", + "message164", + "message169", + "message174", + "message179", + "message184", + "message189", + "message194", + "message199", + "message204", + "message209", + "message214", + "message219", + "message224", + "message229", + "message234", + "message239", + "message244", + "message249", + "message254", + "message259", + "message264", + "message269", + "message274", + "message279", + "message284", + "message289", + "message294", + "message299", + "message304", + "message309", + "message314", + "message319", + "message324", + "message329", + "message334", + "message339", + "message344", + "message349", + "message354", + "message359", + "message364", + "message369", + "message374", + "message379", + "message384", + "message389", + "message394", + "message399", + "message404", + "message409", + "message414", + "message419", + "message424", + "message429", + "message434", + "message439", + "message444", + "message449", + "message454", + "message459", + "message464", + "message469", + "message474", + "message479", + "message484", + "message489", + "message494", + "message499", + "message504", + "message509", + "message514", + "message519", + "message524", + "message529", + "message534", + "message539", + "message544", + "message549", + "message554", + "message559", + "message564", + "message569", + "message574", + "message579", + "message584", + "message589", + "message594", + "message599", + "message604", + "message609", + "message614", + "message619", + "message624", + "message629", + "message634", + "message639", + "message644", + "message649", + "message654", + "message659", + "message664", + "message669", + "message674", + "message679", + "message684", + "message689", + "message694", + "message699", + "message704", + "message709", + "message714", + "message719", + "message724", + "message729", + "message734", + "message739", + "message744", + "message749", + "message754", + "message759", + "message764", + "message769", + "message774", + "message779", + "message784", + "message789", + "message794", + "message799", + "message804", + "message809", + "message814", + "message819", + "message824", + "message829", + "message834", + "message839", + "message844", + "message849", + "message854", + "message859", + "message864", + "message869", + "message874", + "message879", + "message884", + "message889", + "message894", + "message899", + "message904", + "message909", + "message914", + "message919", + "message924", + "message929", + "message934", + "message939", + "message944", + "message949", + "message954", + "message959", + "message964", + "message969", + "message974", + "message979", + "message984", + "message989", + "message994", + "message999", + "message1004", + "message1009", + "message1014", + "message1019", + "message1024", + "message1029", + "message1034", + "message1039", + "message1044", + "message1049", + "message1054", + "message1059", + "message1064", + "message1069", + "message1074", + "message1079", + "message1084", + "message1089", + "message1094", + "message1099", + "message1104", + "message1109", + "message1114", + "message1119", + "message1124", + "message1129", + "message1134", + "message1139", + "message1144", + "message1149", + "message1154", + "message1159", + "message1164", + "message1169", + "message1174", + "message1179", + "message1184", + "message1189", + "message1194", + "message1199", + "message1204", + "message1209", + "message1214", + "message1219", + "message1224", + "message1229", + "message1234", + "message1239", + "message1244", + "message1249", + "message1254", + "message1259", + "message1264", + "message1269", + "message1274", + "message1279", + "message1284", + "message1289", + "message1294", + "message1299", + "message1304", + "message1309", + "message1314", + "message1319", + "message1324", + "message1329", + "message1334", + "message1339", + "message1344", + "message1349", + "message1354", + "message1359", + "message1364", + "message1369", + "message1374", + "message1379", + "message1384", + "message1389", + "message1394", + "message1399", + "message1404", + "message1409", + "message1414", + "message1419", + "message1424", + "message1429", + "message1434", + "message1439", + "message1444", + "message1449", + "message1454", + "message1459", + "message1464", + "message1469", + "message1474", + "message1479", + "message1484", + "message1489", + "message1494", + "message1499", + "message1504", + "message1509", + "message1514", + "message1519", + "message1524", + "message1529", + "message1534", + "message1539", + "message1544", + "message1549", + "message1554", + "message1559", + "message1564", + "message1569", + "message1574", + "message1579", + "message1584", + "message1589", + "message1594", + "message1599", + "message1604", + "message1609", + "message1614", + "message1619", + "message1624", + "message1629", + "message1634", + "message1639", + "message1644", + "message1649", + "message1654", + "message1659", + "message1664", + "message1669", + "message1674", + "message1679", + "message1684", + "message1689", + "message1694", + "message1699", + "message1704", + "message1709", + "message1714", + "message1719", + "message1724", + "message1729", + "message1734", + "message1739", + "message1744", + "message1749", + "message1754", + "message1759", + "message1764", + "message1769", + "message1774", + "message1779", + "message1784", + "message1789", + "message1794", + "message1799", + "message1804", + "message1809", + "message1814", + "message1819", + "message1824", + "message1829", + "message1834", + "message1839", + "message1844", + "message1849", + "message1854", + "message1859", + "message1864", + "message1869", + "message1874", + "message1879", + "message1884", + "message1889", + "message1894", + "message1899", + "message1904", + "message1909", + "message1914", + "message1919", + "message1924", + "message1929", + "message1934", + "message1939", + "message1944", + "message1949", + "message1954", + "message1959", + "message1964", + "message1969", + "message1974", + "message1979", + "message1984", + "message1989", + "message1994", + "message1999", + "message3201", + "message3202", + "message3203", + "message3204", + "message3205", + "message3206", + "message3207", + "message3208", + "message3209", + "message3210", + "message3211", + "message3212", + "message3213", + "message3214", + "message3215", + "message3216", + "message3217", + "message3218", + "message3219", + "message3220", + "message3221", + "message3222", + "message3223", + "message3224", + "message3225", + "message3226", + "message3227", + "message3228", + "message3229", + "message3230", + "message3231", + "message3232", + "message3233", + "message3234", + "message3235", + "message3236", + "message3237", + "message3238", + "message3239", + "message3240", + "message3241", + "message3242", + "message3243", + "message3244", + "message3245", + "message3246", + "message3247", + "message3248", + "message3249", + "message3250", + "message3251", + "message3252", + "message3253", + "message3254", + "message3255", + "message3256", + "message3257", + "message3258", + "message3259", + "message3260", + "message3261", + "message3262", + "message3263", + "message3264", + "message3265", + "message3266", + "message3267", + "message3268", + "message3269", + "message3270", + "message3271", + "message3272", + "message3273", + "message3274", + "message3275", + "message3276", + "message3277", + "message3278", + "message3279", + "message3280", + "message3281", + "message3282", + "message3283", + "message3284", + "message3285", + "message3286", + "message3287", + "message3288", + "message3289", + "message3290", + "message3291", + "message3292", + "message3293", + "message3294", + "message3295", + "message3296", + "message3297", + "message3298", + "message3299", + "message3300", + "message3301", + "message3302", + "message3303", + "message3304", + "message3305", + "message3306", + "message3307", + "message3308", + "message3309", + "message3310", + "message3311", + "message3312", + "message3313", + "message3314", + "message3315", + "message3316", + "message3317", + "message3318", + "message3319", + "message3320", + "message3321", + "message3322", + "message3323", + "message3324", + "message3325", + "message3326", + "message3327", + "message3328", + "message3329", + "message3330", + "message3331", + "message3332", + "message3333", + "message3334", + "message3335", + "message3336", + "message3337", + "message3338", + "message3339", + "message3340", + "message3341", + "message3342", + "message3343", + "message3344", + "message3345", + "message3346", + "message3347", + "message3348", + "message3349", + "message3350", + "message3351", + "message3352", + "message3353", + "message3354", + "message3355", + "message3356", + "message3357", + "message3358", + "message3359", + "message3360", + "message3361", + "message3362", + "message3363", + "message3364", + "message3365", + "message3366", + "message3367", + "message3368", + "message3369", + "message3370", + "message3371", + "message3372", + "message3373", + "message3374", + "message3375", + "message3376", + "message3377", + "message3378", + "message3379", + "message3380", + "message3381", + "message3382", + "message3383", + "message3384", + "message3385", + "message3386", + "message3387", + "message3388", + "message3389", + "message3390", + "message3391", + "message3392", + "message3393", + "message3394", + "message3395", + "message3396", + "message3397", + "message3398", + "message3399", + "message3400", + "message3401", + "message3402", + "message3403", + "message3404", + "message3405", + "message3406", + "message3407", + "message3408", + "message3409", + "message3410", + "message3411", + "message3412", + "message3413", + "message3414", + "message3415", + "message3416", + "message3417", + "message3418", + "message3419", + "message3420", + "message3421", + "message3422", + "message3423", + "message3424", + "message3425", + "message3426", + "message3427", + "message3428", + "message3429", + "message3430", + "message3431", + "message3432", + "message3433", + "message3434", + "message3435", + "message3436", + "message3437", + "message3438", + "message3439", + "message3440", + "message3441", + "message3442", + "message3443", + "message3444", + "message3445", + "message3446", + "message3447", + "message3448", + "message3449", + "message3450", + "message3451", + "message3452", + "message3453", + "message3454", + "message3455", + "message3456", + "message3457", + "message3458", + "message3459", + "message3460", + "message3461", + "message3462", + "message3463", + "message3464", + "message3465", + "message3466", + "message3467", + "message3468", + "message3469", + "message3470", + "message3471", + "message3472", + "message3473", + "message3474", + "message3475", + "message3476", + "message3477", + "message3478", + "message3479", + "message3480", + "message3481", + "message3482", + "message3483", + "message3484", + "message3485", + "message3486", + "message3487", + "message3488", + "message3489", + "message3490", + "message3491", + "message3492", + "message3493", + "message3494", + "message3495", + "message3496", + "message3497", + "message3498", + "message3499", + "message3500", + "message3501", + "message3502", + "message3503", + "message3504", + "message3505", + "message3506", + "message3507", + "message3508", + "message3509", + "message3510", + "message3511", + "message3512", + "message3513", + "message3514", + "message3515", + "message3516", + "message3517", + "message3518", + "message3519", + "message3520", + "message3521", + "message3522", + "message3523", + "message3524", + "message3525", + "message3526", + "message3527", + "message3528", + "message3529", + "message3530", + "message3531", + "message3532", + "message3533", + "message3534", + "message3535", + "message3536", + "message3537", + "message3538", + "message3539", + "message3540", + "message3541", + "message3542", + "message3543", + "message3544", + "message3545", + "message3546", + "message3547", + "message3548", + "message3549", + "message3550", + "message3551", + "message3552", + "message3553", + "message3554", + "message3555", + "message3556", + "message3557", + "message3558", + "message3559", + "message3560", + "message3561", + "message3562", + "message3563", + "message3564", + "message3565", + "message3566", + "message3567", + "message3568", + "message3569", + "message3570", + "message3571", + "message3572", + "message3573", + "message3574", + "message3575", + "message3576", + "message3577", + "message3578", + "message3579", + "message3580", + "message3581", + "message3582", + "message3583", + "message3584", + "message3585", + "message3586", + "message3587", + "message3588", + "message3589", + "message3590", + "message3591", + "message3592", + "message3593", + "message3594", + "message3595", + "message3596", + "message3597", + "message3598", + "message3599", + "message3600", + "message4001", + "message4004", + "message4006", + "message4017", + "message4018", + "message4019", + "message4021", + "message4029", + "message4030", + "message4032", + "message4034", + "message4038", + "message4046", + "message4048", + "message4049", + "message4056", + "message4060", + "message4065", + "message4071", + "message4072", + "message4073", + "message4075", + "message4076", + "message4080", + "message4082", + "message4084", + "message4092", + "message4096", + "message4097", + "message4105", + "message4107", + "message4111", + "message4112", + "message4120", + "message4121", + "message4123", + "message4128", + "message4134", + "message4141", + "message4143", + "message4149", + "message4150", + "message4156", + "message4161", + "message4174", + "message4180", + "message4182", + "message4188", + "message4196", + "message4200", + "message4213", + "message4222", + "message4224", + "message4228", + "message4233", + "message4236", + "message4237", + "message4238", + "message4242", + "message4244", + "message4258", + "message4262", + "message4282", + "message4283", + "message4285", + "message4290", + "message4297", + "message4302", + "message4303", + "message4305", + "message4306", + "message4307", + "message4319", + "message4324", + "message4328", + "message4332", + "message4336", + "message4340", + "message4342", + "message4343", + "message4345", + "message4357", + "message4370", + "message4375", + "message4382", + "message4383", + "message4385", + "message4395", + "message4396", + "message4406", + "message4409", + "message4410", + "message4415", + "message4418", + "message4421", + "message4422", + "message4436", + "message4437", + "message4452", + "message4453", + "message4454", + "message4457", + "message4458", + "message4469", + "message4481", + "message4484", + "message4490", + "message4496", + "message4498", + "message4500", + "message4522", + "message4523", + "message4526", + "message4537", + "message4540", + "message4541", + "message4546", + "message4547", + "message4558", + "message4569", + "message4571", + "message4572", + "message4573", + "message4578", + "message4582", + "message4587", + "message4588", + "message4592", + "message4594", + "message4599", + "message4605", + "message4611", + "message4612", + "message4613", + "message4619", + "message4622", + "message4628", + "message4636", + "message4641", + "message4661", + "message4667", + "message4670", + "message4674", + "message4688", + "message4692", + "message4701", + "message4702", + "message4707", + "message4713", + "message4727", + "message4744", + "message4745", + "message4748", + "message4750", + "message4753", + "message4765", + "message4768", + "message4771", + "message4772", + "message4776", + "message4779", + "message4781", + "message4788", + "message4790", + "message4791", + "message4796", + "message4797", + "message4799", + "message4807", + "message4811", + "message4812", + "message4818", + "message4820", + "message4827", + "message4831", + "message4832", + "message4833", + "message4838", + "message4840", + "message4847", + "message4848", + "message4849", + "message4855", + "message4860", + "message4868", + "message4873", + "message4880", + "message4881", + "message4883", + "message4884", + "message4891", + "message4897", + "message4898", + "message4901", + "message4905", + "message4912", + "message4913", + "message4925", + "message4927", + "message4940", + "message4941", + "message4945", + "message4950", + "message4953", + "message4960", + "message4970", + "message4973", + "message4975", + "message4977", + "message4981", + "message4989", + "message4992", + "message4999", + "message5002", + "message5006", + "message5008", + "message5020", + "message5023", + "message5025", + "message5029", + "message5031", + "message5033", + "message5038", + "message5042", + "message5043", + "message5044", + "message5045", + "message5046", + "message5068", + "message5070", + "message5072", + "message5082", + "message5089", + "message5091", + "message5097", + "message5102", + "message5113", + "message5128", + "message5131", + "message5138", + "message5151", + "message5162", + "message5165", + "message5181", + "message5186", + "message5189", + "message5192", + "message5194", + "message5199", + "message5202", + "message5205", + "message5209", + "message5214", + "message5221", + "message5225", + "message5240", + "message5247", + "message5253", + "message5258", + "message5260", + "message5267", + "message5269", + "message5272", + "message5291", + "message5294", + "message5298", + "message5301", + "message5306", + "message5310", + "message5312", + "message5318", + "message5326", + "message5327", + "message5339", + "message5344", + "message5346", + "message5347", + "message5348", + "message5352", + "message5353", + "message5354", + "message5358", + "message5360", + "message5361", + "message5371", + "message5376", + "message5377", + "message5385", + "message5390", + "message5391", + "message5396", + "message5397", + "message5399", + "message5401", + "message5404", + "message5407", + "message5409", + "message5415", + "message5416", + "message5437", + "message5455", + "message5457", + "message5460", + "message5462", + "message5465", + "message5471", + "message5475", + "message5476", + "message5485", + "message5495", + "message5501", + "message5506", + "message5510", + "message5512", + "message5515", + "message5516", + "message5535", + "message5546", + "message5547", + "message5561", + "message5565", + "message5583", + "message5584", + "message5587", + "message5596", + "message5611", + "message5621", + "message5627", + "message5631", + "message5640", + "message5642", + "message5649", + "message5655", + "message5657", + "message5658", + "message5666", + "message5667", + "message5670", + "message5676", + "message5678", + "message5682", + "message5684", + "message5691", + "message5693", + "message5717", + "message5718", + "message5719", + "message5722", + "message5730", + "message5733", + "message5735", + "message5738", + "message5740", + "message5741", + "message5749", + "message5758", + "message5762", + "message5764", + "message5773", + "message5787", + "message5790", + "message5796", + "message5797", + "message5803", + "message5808", + "message5810", + "message5814", + "message5823", + "message5828", + "message5829", + "message5832", + "message5843", + "message5846", + "message5847", + "message5852", + "message5853", + "message5855", + "message5866", + "message5873", + "message5875", + "message5880", + "message5891", + "message5897", + "message5898", + "message5902", + "message5904", + "message5923", + "message5930", + "message5931", + "message5934", + "message5939", + "message5943", + "message5946", + "message5959", + "message5974", + "message5976", + "message5987", + "message5988", + "message5989", + "message6000", + "message9201", + "message9202", + "message9203", + "message9204", + "message9205", + "message9206_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9207", + "message9208", + "message9209", + "message9210", + "message9211", + "message9212", + "message9213", + "message9214", + "message9215", + "message9216_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9217", + "message9218", + "message9219", + "message9220", + "message9221", + "message9222", + "message9223", + "message9224", + "message9225", + "message9226_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9227", + "message9228", + "message9229", + "message9230", + "message9231", + "message9232", + "message9233", + "message9234", + "message9235", + "message9236_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9237", + "message9238", + "message9239", + "message9240", + "message9241", + "message9242", + "message9243", + "message9244", + "message9245", + "message9246_xxxxxxxxxxxxx", + "message9247", + "message9248", + "message9249", + "message9250", + "message9251", + "message9252", + "message9253", + "message9254", + "message9255", + "message9256_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9257", + "message9258", + "message9259", + "message9260", + "message9261", + "message9262", + "message9263", + "message9264", + "message9265", + "message9266_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9267", + "message9268", + "message9269", + "message9270", + "message9271", + "message9272", + "message9273", + "message9274", + "message9275", + "message9276_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9277", + "message9278", + "message9279", + "message9280", + "message9281", + "message9282", + "message9283", + "message9284", + "message9285", + "message9286_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9287", + "message9288", + "message9289", + "message9290", + "message9291", + "message9292", + "message9293", + "message9294", + "message9295", + "message9296_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9297", + "message9298", + "message9299", + "message9300_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9301", + "message9302", + "message9303", + "message9304", + "message9305", + "message9306_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9307", + "message9308", + "message9309", + "message9310", + "message9311", + "message9312", + "message9313", + "message9314", + "message9315", + "message9316_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9317", + "message9318", + "message9319", + "message9320", + "message9321", + "message9322", + "message9323", + "message9324", + "message9325", + "message9326_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9327", + "message9328", + "message9329", + "message9330", + "message9331", + "message9332", + "message9333", + "message9334", + "message9335", + "message9336_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9337", + "message9338", + "message9339", + "message9340", + "message9341", + "message9342", + "message9343", + "message9344", + "message9345", + "message9346_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9347", + "message9348", + "message9349", + "message9350", + "message9351", + "message9352", + "message9353", + "message9354", + "message9355", + "message9356_xxxxxxxxxxxxxxxx", + "message9357", + "message9358", + "message9359", + "message9360", + "message9361", + "message9362", + "message9363", + "message9364", + "message9365", + "message9366_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9367", + "message9368", + "message9369", + "message9370", + "message9371", + "message9372", + "message9373", + "message9374", + "message9375", + "message9376_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9377", + "message9378", + "message9379", + "message9380", + "message9381", + "message9382", + "message9383", + "message9384", + "message9385", + "message9386_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9387", + "message9388", + "message9389", + "message9390", + "message9391", + "message9392", + "message9393", + "message9394", + "message9395", + "message9396_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9397", + "message9398", + "message9399", + "message9400_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9401", + "message9402", + "message9403", + "message9404", + "message9405", + "message9406_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9407", + "message9408", + "message9409", + "message9410", + "message9411", + "message9412", + "message9413", + "message9414", + "message9415", + "message9416_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9417", + "message9418", + "message9419", + "message9420", + "message9421", + "message9422", + "message9423", + "message9424", + "message9425", + "message9426_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9427", + "message9428", + "message9429", + "message9430", + "message9431", + "message9432", + "message9433", + "message9434", + "message9435", + "message9436_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9437", + "message9438", + "message9439", + "message9440", + "message9441", + "message9442", + "message9443", + "message9444", + "message9445", + "message9446_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9447", + "message9448", + "message9449", + "message9450", + "message9451", + "message9452", + "message9453", + "message9454", + "message9455", + "message9456_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9457", + "message9458", + "message9459", + "message9460", + "message9461", + "message9462", + "message9463", + "message9464", + "message9465", + "message9466_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9467", + "message9468", + "message9469", + "message9470", + "message9471", + "message9472", + "message9473", + "message9474", + "message9475", + "message9476_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9477", + "message9478", + "message9479", + "message9480", + "message9481", + "message9482", + "message9483", + "message9484", + "message9485", + "message9486_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9487", + "message9488", + "message9489", + "message9490", + "message9491", + "message9492", + "message9493", + "message9494", + "message9495", + "message9496_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9497", + "message9498", + "message9499", + "message9500_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9501", + "message9502", + "message9503", + "message9504", + "message9505", + "message9506_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9507", + "message9508", + "message9509", + "message9510", + "message9511", + "message9512", + "message9513", + "message9514", + "message9515", + "message9516_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9517", + "message9518", + "message9519", + "message9520", + "message9521", + "message9522", + "message9523", + "message9524", + "message9525", + "message9526_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9527", + "message9528", + "message9529", + "message9530", + "message9531", + "message9532", + "message9533", + "message9534", + "message9535", + "message9536_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9537", + "message9538", + "message9539", + "message9540", + "message9541", + "message9542", + "message9543", + "message9544", + "message9545", + "message9546_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9547", + "message9548", + "message9549", + "message9550", + "message9551", + "message9552", + "message9553", + "message9554", + "message9555", + "message9556_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9557", + "message9558", + "message9559", + "message9560", + "message9561", + "message9562", + "message9563", + "message9564", + "message9565", + "message9566_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9567", + "message9568", + "message9569", + "message9570", + "message9571", + "message9572", + "message9573", + "message9574", + "message9575", + "message9576_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9577", + "message9578", + "message9579", + "message9580", + "message9581", + "message9582", + "message9583", + "message9584", + "message9585", + "message9586_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9587", + "message9588", + "message9589", + "message9590", + "message9591", + "message9592", + "message9593", + "message9594", + "message9595", + "message9596_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9597", + "message9598", + "message9599", + "message9600_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + ] + }, + { + "key": "DDD", + "messages": [ + "message5", + "message10", + "message15", + "message20", + "message25", + "message30", + "message35", + "message40", + "message45", + "message50", + "message55", + "message60", + "message65", + "message70", + "message75", + "message80", + "message85", + "message90", + "message95", + "message100", + "message105", + "message110", + "message115", + "message120", + "message125", + "message130", + "message135", + "message140", + "message145", + "message150", + "message155", + "message160", + "message165", + "message170", + "message175", + "message180", + "message185", + "message190", + "message195", + "message200", + "message205", + "message210", + "message215", + "message220", + "message225", + "message230", + "message235", + "message240", + "message245", + "message250", + "message255", + "message260", + "message265", + "message270", + "message275", + "message280", + "message285", + "message290", + "message295", + "message300", + "message305", + "message310", + "message315", + "message320", + "message325", + "message330", + "message335", + "message340", + "message345", + "message350", + "message355", + "message360", + "message365", + "message370", + "message375", + "message380", + "message385", + "message390", + "message395", + "message400", + "message405", + "message410", + "message415", + "message420", + "message425", + "message430", + "message435", + "message440", + "message445", + "message450", + "message455", + "message460", + "message465", + "message470", + "message475", + "message480", + "message485", + "message490", + "message495", + "message500", + "message505", + "message510", + "message515", + "message520", + "message525", + "message530", + "message535", + "message540", + "message545", + "message550", + "message555", + "message560", + "message565", + "message570", + "message575", + "message580", + "message585", + "message590", + "message595", + "message600", + "message605", + "message610", + "message615", + "message620", + "message625", + "message630", + "message635", + "message640", + "message645", + "message650", + "message655", + "message660", + "message665", + "message670", + "message675", + "message680", + "message685", + "message690", + "message695", + "message700", + "message705", + "message710", + "message715", + "message720", + "message725", + "message730", + "message735", + "message740", + "message745", + "message750", + "message755", + "message760", + "message765", + "message770", + "message775", + "message780", + "message785", + "message790", + "message795", + "message800", + "message805", + "message810", + "message815", + "message820", + "message825", + "message830", + "message835", + "message840", + "message845", + "message850", + "message855", + "message860", + "message865", + "message870", + "message875", + "message880", + "message885", + "message890", + "message895", + "message900", + "message905", + "message910", + "message915", + "message920", + "message925", + "message930", + "message935", + "message940", + "message945", + "message950", + "message955", + "message960", + "message965", + "message970", + "message975", + "message980", + "message985", + "message990", + "message995", + "message1000", + "message1005", + "message1010", + "message1015", + "message1020", + "message1025", + "message1030", + "message1035", + "message1040", + "message1045", + "message1050", + "message1055", + "message1060", + "message1065", + "message1070", + "message1075", + "message1080", + "message1085", + "message1090", + "message1095", + "message1100", + "message1105", + "message1110", + "message1115", + "message1120", + "message1125", + "message1130", + "message1135", + "message1140", + "message1145", + "message1150", + "message1155", + "message1160", + "message1165", + "message1170", + "message1175", + "message1180", + "message1185", + "message1190", + "message1195", + "message1200", + "message1205", + "message1210", + "message1215", + "message1220", + "message1225", + "message1230", + "message1235", + "message1240", + "message1245", + "message1250", + "message1255", + "message1260", + "message1265", + "message1270", + "message1275", + "message1280", + "message1285", + "message1290", + "message1295", + "message1300", + "message1305", + "message1310", + "message1315", + "message1320", + "message1325", + "message1330", + "message1335", + "message1340", + "message1345", + "message1350", + "message1355", + "message1360", + "message1365", + "message1370", + "message1375", + "message1380", + "message1385", + "message1390", + "message1395", + "message1400", + "message1405", + "message1410", + "message1415", + "message1420", + "message1425", + "message1430", + "message1435", + "message1440", + "message1445", + "message1450", + "message1455", + "message1460", + "message1465", + "message1470", + "message1475", + "message1480", + "message1485", + "message1490", + "message1495", + "message1500", + "message1505", + "message1510", + "message1515", + "message1520", + "message1525", + "message1530", + "message1535", + "message1540", + "message1545", + "message1550", + "message1555", + "message1560", + "message1565", + "message1570", + "message1575", + "message1580", + "message1585", + "message1590", + "message1595", + "message1600", + "message1605", + "message1610", + "message1615", + "message1620", + "message1625", + "message1630", + "message1635", + "message1640", + "message1645", + "message1650", + "message1655", + "message1660", + "message1665", + "message1670", + "message1675", + "message1680", + "message1685", + "message1690", + "message1695", + "message1700", + "message1705", + "message1710", + "message1715", + "message1720", + "message1725", + "message1730", + "message1735", + "message1740", + "message1745", + "message1750", + "message1755", + "message1760", + "message1765", + "message1770", + "message1775", + "message1780", + "message1785", + "message1790", + "message1795", + "message1800", + "message1805", + "message1810", + "message1815", + "message1820", + "message1825", + "message1830", + "message1835", + "message1840", + "message1845", + "message1850", + "message1855", + "message1860", + "message1865", + "message1870", + "message1875", + "message1880", + "message1885", + "message1890", + "message1895", + "message1900", + "message1905", + "message1910", + "message1915", + "message1920", + "message1925", + "message1930", + "message1935", + "message1940", + "message1945", + "message1950", + "message1955", + "message1960", + "message1965", + "message1970", + "message1975", + "message1980", + "message1985", + "message1990", + "message1995", + "message2000", + "message3601", + "message3602", + "message3603", + "message3604", + "message3605", + "message3606", + "message3607", + "message3608", + "message3609", + "message3610", + "message3611", + "message3612", + "message3613", + "message3614", + "message3615", + "message3616", + "message3617", + "message3618", + "message3619", + "message3620", + "message3621", + "message3622", + "message3623", + "message3624", + "message3625", + "message3626", + "message3627", + "message3628", + "message3629", + "message3630", + "message3631", + "message3632", + "message3633", + "message3634", + "message3635", + "message3636", + "message3637", + "message3638", + "message3639", + "message3640", + "message3641", + "message3642", + "message3643", + "message3644", + "message3645", + "message3646", + "message3647", + "message3648", + "message3649", + "message3650", + "message3651", + "message3652", + "message3653", + "message3654", + "message3655", + "message3656", + "message3657", + "message3658", + "message3659", + "message3660", + "message3661", + "message3662", + "message3663", + "message3664", + "message3665", + "message3666", + "message3667", + "message3668", + "message3669", + "message3670", + "message3671", + "message3672", + "message3673", + "message3674", + "message3675", + "message3676", + "message3677", + "message3678", + "message3679", + "message3680", + "message3681", + "message3682", + "message3683", + "message3684", + "message3685", + "message3686", + "message3687", + "message3688", + "message3689", + "message3690", + "message3691", + "message3692", + "message3693", + "message3694", + "message3695", + "message3696", + "message3697", + "message3698", + "message3699", + "message3700", + "message3701", + "message3702", + "message3703", + "message3704", + "message3705", + "message3706", + "message3707", + "message3708", + "message3709", + "message3710", + "message3711", + "message3712", + "message3713", + "message3714", + "message3715", + "message3716", + "message3717", + "message3718", + "message3719", + "message3720", + "message3721", + "message3722", + "message3723", + "message3724", + "message3725", + "message3726", + "message3727", + "message3728", + "message3729", + "message3730", + "message3731", + "message3732", + "message3733", + "message3734", + "message3735", + "message3736", + "message3737", + "message3738", + "message3739", + "message3740", + "message3741", + "message3742", + "message3743", + "message3744", + "message3745", + "message3746", + "message3747", + "message3748", + "message3749", + "message3750", + "message3751", + "message3752", + "message3753", + "message3754", + "message3755", + "message3756", + "message3757", + "message3758", + "message3759", + "message3760", + "message3761", + "message3762", + "message3763", + "message3764", + "message3765", + "message3766", + "message3767", + "message3768", + "message3769", + "message3770", + "message3771", + "message3772", + "message3773", + "message3774", + "message3775", + "message3776", + "message3777", + "message3778", + "message3779", + "message3780", + "message3781", + "message3782", + "message3783", + "message3784", + "message3785", + "message3786", + "message3787", + "message3788", + "message3789", + "message3790", + "message3791", + "message3792", + "message3793", + "message3794", + "message3795", + "message3796", + "message3797", + "message3798", + "message3799", + "message3800", + "message3801", + "message3802", + "message3803", + "message3804", + "message3805", + "message3806", + "message3807", + "message3808", + "message3809", + "message3810", + "message3811", + "message3812", + "message3813", + "message3814", + "message3815", + "message3816", + "message3817", + "message3818", + "message3819", + "message3820", + "message3821", + "message3822", + "message3823", + "message3824", + "message3825", + "message3826", + "message3827", + "message3828", + "message3829", + "message3830", + "message3831", + "message3832", + "message3833", + "message3834", + "message3835", + "message3836", + "message3837", + "message3838", + "message3839", + "message3840", + "message3841", + "message3842", + "message3843", + "message3844", + "message3845", + "message3846", + "message3847", + "message3848", + "message3849", + "message3850", + "message3851", + "message3852", + "message3853", + "message3854", + "message3855", + "message3856", + "message3857", + "message3858", + "message3859", + "message3860", + "message3861", + "message3862", + "message3863", + "message3864", + "message3865", + "message3866", + "message3867", + "message3868", + "message3869", + "message3870", + "message3871", + "message3872", + "message3873", + "message3874", + "message3875", + "message3876", + "message3877", + "message3878", + "message3879", + "message3880", + "message3881", + "message3882", + "message3883", + "message3884", + "message3885", + "message3886", + "message3887", + "message3888", + "message3889", + "message3890", + "message3891", + "message3892", + "message3893", + "message3894", + "message3895", + "message3896", + "message3897", + "message3898", + "message3899", + "message3900", + "message3901", + "message3902", + "message3903", + "message3904", + "message3905", + "message3906", + "message3907", + "message3908", + "message3909", + "message3910", + "message3911", + "message3912", + "message3913", + "message3914", + "message3915", + "message3916", + "message3917", + "message3918", + "message3919", + "message3920", + "message3921", + "message3922", + "message3923", + "message3924", + "message3925", + "message3926", + "message3927", + "message3928", + "message3929", + "message3930", + "message3931", + "message3932", + "message3933", + "message3934", + "message3935", + "message3936", + "message3937", + "message3938", + "message3939", + "message3940", + "message3941", + "message3942", + "message3943", + "message3944", + "message3945", + "message3946", + "message3947", + "message3948", + "message3949", + "message3950", + "message3951", + "message3952", + "message3953", + "message3954", + "message3955", + "message3956", + "message3957", + "message3958", + "message3959", + "message3960", + "message3961", + "message3962", + "message3963", + "message3964", + "message3965", + "message3966", + "message3967", + "message3968", + "message3969", + "message3970", + "message3971", + "message3972", + "message3973", + "message3974", + "message3975", + "message3976", + "message3977", + "message3978", + "message3979", + "message3980", + "message3981", + "message3982", + "message3983", + "message3984", + "message3985", + "message3986", + "message3987", + "message3988", + "message3989", + "message3990", + "message3991", + "message3992", + "message3993", + "message3994", + "message3995", + "message3996", + "message3997", + "message3998", + "message3999", + "message4000", + "message4014", + "message4015", + "message4016", + "message4022", + "message4024", + "message4027", + "message4028", + "message4031", + "message4035", + "message4041", + "message4043", + "message4045", + "message4050", + "message4052", + "message4054", + "message4058", + "message4064", + "message4066", + "message4074", + "message4087", + "message4088", + "message4090", + "message4093", + "message4126", + "message4127", + "message4129", + "message4133", + "message4135", + "message4139", + "message4145", + "message4148", + "message4165", + "message4167", + "message4168", + "message4179", + "message4185", + "message4189", + "message4191", + "message4194", + "message4198", + "message4203", + "message4206", + "message4219", + "message4226", + "message4229", + "message4234", + "message4243", + "message4246", + "message4251", + "message4253", + "message4255", + "message4271", + "message4272", + "message4274", + "message4275", + "message4278", + "message4284", + "message4287", + "message4289", + "message4296", + "message4301", + "message4310", + "message4317", + "message4329", + "message4330", + "message4338", + "message4346", + "message4348", + "message4350", + "message4351", + "message4362", + "message4364", + "message4368", + "message4378", + "message4381", + "message4384", + "message4386", + "message4398", + "message4405", + "message4407", + "message4411", + "message4413", + "message4423", + "message4424", + "message4427", + "message4429", + "message4431", + "message4445", + "message4471", + "message4474", + "message4476", + "message4492", + "message4494", + "message4497", + "message4508", + "message4514", + "message4518", + "message4519", + "message4521", + "message4524", + "message4531", + "message4532", + "message4533", + "message4538", + "message4542", + "message4544", + "message4551", + "message4553", + "message4556", + "message4560", + "message4563", + "message4566", + "message4567", + "message4575", + "message4584", + "message4585", + "message4593", + "message4596", + "message4597", + "message4598", + "message4606", + "message4607", + "message4620", + "message4624", + "message4634", + "message4635", + "message4650", + "message4652", + "message4655", + "message4659", + "message4660", + "message4664", + "message4665", + "message4671", + "message4672", + "message4676", + "message4680", + "message4691", + "message4694", + "message4699", + "message4710", + "message4714", + "message4721", + "message4724", + "message4728", + "message4729", + "message4730", + "message4731", + "message4736", + "message4743", + "message4746", + "message4751", + "message4757", + "message4759", + "message4762", + "message4785", + "message4786", + "message4787", + "message4792", + "message4801", + "message4808", + "message4842", + "message4845", + "message4846", + "message4851", + "message4853", + "message4859", + "message4861", + "message4863", + "message4876", + "message4882", + "message4888", + "message4889", + "message4890", + "message4893", + "message4894", + "message4906", + "message4929", + "message4933", + "message4947", + "message4948", + "message4949", + "message4954", + "message4963", + "message4968", + "message4969", + "message4988", + "message5004", + "message5005", + "message5015", + "message5022", + "message5027", + "message5032", + "message5037", + "message5048", + "message5051", + "message5052", + "message5056", + "message5060", + "message5066", + "message5067", + "message5071", + "message5073", + "message5074", + "message5076", + "message5081", + "message5083", + "message5084", + "message5090", + "message5096", + "message5104", + "message5108", + "message5118", + "message5121", + "message5124", + "message5134", + "message5142", + "message5144", + "message5155", + "message5156", + "message5157", + "message5159", + "message5161", + "message5167", + "message5169", + "message5170", + "message5173", + "message5208", + "message5215", + "message5218", + "message5223", + "message5224", + "message5227", + "message5228", + "message5229", + "message5239", + "message5246", + "message5250", + "message5263", + "message5265", + "message5275", + "message5276", + "message5278", + "message5281", + "message5282", + "message5285", + "message5288", + "message5304", + "message5315", + "message5317", + "message5319", + "message5323", + "message5328", + "message5342", + "message5356", + "message5359", + "message5362", + "message5364", + "message5365", + "message5370", + "message5379", + "message5382", + "message5389", + "message5395", + "message5398", + "message5412", + "message5421", + "message5422", + "message5425", + "message5426", + "message5439", + "message5440", + "message5441", + "message5443", + "message5446", + "message5452", + "message5461", + "message5464", + "message5469", + "message5474", + "message5477", + "message5479", + "message5480", + "message5482", + "message5483", + "message5484", + "message5486", + "message5490", + "message5494", + "message5499", + "message5504", + "message5511", + "message5518", + "message5519", + "message5526", + "message5528", + "message5529", + "message5536", + "message5538", + "message5541", + "message5543", + "message5544", + "message5545", + "message5548", + "message5549", + "message5550", + "message5551", + "message5554", + "message5555", + "message5556", + "message5560", + "message5569", + "message5575", + "message5577", + "message5588", + "message5592", + "message5609", + "message5612", + "message5616", + "message5618", + "message5625", + "message5628", + "message5630", + "message5633", + "message5634", + "message5637", + "message5646", + "message5651", + "message5654", + "message5656", + "message5661", + "message5671", + "message5673", + "message5674", + "message5677", + "message5680", + "message5683", + "message5688", + "message5690", + "message5695", + "message5696", + "message5698", + "message5699", + "message5702", + "message5703", + "message5721", + "message5723", + "message5726", + "message5728", + "message5734", + "message5753", + "message5760", + "message5767", + "message5778", + "message5783", + "message5785", + "message5788", + "message5789", + "message5793", + "message5799", + "message5815", + "message5818", + "message5819", + "message5821", + "message5830", + "message5839", + "message5841", + "message5850", + "message5859", + "message5860", + "message5863", + "message5877", + "message5885", + "message5886", + "message5903", + "message5906", + "message5909", + "message5910", + "message5912", + "message5917", + "message5918", + "message5924", + "message5936", + "message5941", + "message5950", + "message5953", + "message5955", + "message5957", + "message5965", + "message5971", + "message5973", + "message5975", + "message5979", + "message5982", + "message5983", + "message5985", + "message5986", + "message5990", + "message5991", + "message5996", + "message9601", + "message9602", + "message9603", + "message9604", + "message9605", + "message9606_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9607", + "message9608", + "message9609", + "message9610", + "message9611", + "message9612", + "message9613", + "message9614", + "message9615", + "message9616_xxxxxxxx", + "message9617", + "message9618", + "message9619", + "message9620", + "message9621", + "message9622", + "message9623", + "message9624", + "message9625", + "message9626_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9627", + "message9628", + "message9629", + "message9630", + "message9631", + "message9632", + "message9633", + "message9634", + "message9635", + "message9636_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9637", + "message9638", + "message9639", + "message9640", + "message9641", + "message9642", + "message9643", + "message9644", + "message9645", + "message9646_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9647", + "message9648", + "message9649", + "message9650", + "message9651", + "message9652", + "message9653", + "message9654", + "message9655", + "message9656_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9657", + "message9658", + "message9659", + "message9660", + "message9661", + "message9662", + "message9663", + "message9664", + "message9665", + "message9666_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9667", + "message9668", + "message9669", + "message9670", + "message9671", + "message9672", + "message9673", + "message9674", + "message9675", + "message9676_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9677", + "message9678", + "message9679", + "message9680", + "message9681", + "message9682", + "message9683", + "message9684", + "message9685", + "message9686_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9687", + "message9688", + "message9689", + "message9690", + "message9691", + "message9692", + "message9693", + "message9694", + "message9695", + "message9696_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9697", + "message9698", + "message9699", + "message9700_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9701", + "message9702", + "message9703", + "message9704", + "message9705", + "message9706_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9707", + "message9708", + "message9709", + "message9710", + "message9711", + "message9712", + "message9713", + "message9714", + "message9715", + "message9716_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9717", + "message9718", + "message9719", + "message9720", + "message9721", + "message9722", + "message9723", + "message9724", + "message9725", + "message9726_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9727", + "message9728", + "message9729", + "message9730", + "message9731", + "message9732", + "message9733", + "message9734", + "message9735", + "message9736_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9737", + "message9738", + "message9739", + "message9740", + "message9741", + "message9742", + "message9743", + "message9744", + "message9745", + "message9746_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9747", + "message9748", + "message9749", + "message9750", + "message9751", + "message9752", + "message9753", + "message9754", + "message9755", + "message9756_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9757", + "message9758", + "message9759", + "message9760", + "message9761", + "message9762", + "message9763", + "message9764", + "message9765", + "message9766_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9767", + "message9768", + "message9769", + "message9770", + "message9771", + "message9772", + "message9773", + "message9774", + "message9775", + "message9776_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9777", + "message9778", + "message9779", + "message9780", + "message9781", + "message9782", + "message9783", + "message9784", + "message9785", + "message9786_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9787", + "message9788", + "message9789", + "message9790", + "message9791", + "message9792", + "message9793", + "message9794", + "message9795", + "message9796_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9797", + "message9798", + "message9799", + "message9800_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9801", + "message9802", + "message9803", + "message9804", + "message9805", + "message9806_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9807", + "message9808", + "message9809", + "message9810", + "message9811", + "message9812", + "message9813", + "message9814", + "message9815", + "message9816_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9817", + "message9818", + "message9819", + "message9820", + "message9821", + "message9822", + "message9823", + "message9824", + "message9825", + "message9826_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9827", + "message9828", + "message9829", + "message9830", + "message9831", + "message9832", + "message9833", + "message9834", + "message9835", + "message9836_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9837", + "message9838", + "message9839", + "message9840", + "message9841", + "message9842", + "message9843", + "message9844", + "message9845", + "message9846_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9847", + "message9848", + "message9849", + "message9850", + "message9851", + "message9852", + "message9853", + "message9854", + "message9855", + "message9856_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9857", + "message9858", + "message9859", + "message9860", + "message9861", + "message9862", + "message9863", + "message9864", + "message9865", + "message9866_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9867", + "message9868", + "message9869", + "message9870", + "message9871", + "message9872", + "message9873", + "message9874", + "message9875", + "message9876_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9877", + "message9878", + "message9879", + "message9880", + "message9881", + "message9882", + "message9883", + "message9884", + "message9885", + "message9886_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9887", + "message9888", + "message9889", + "message9890", + "message9891", + "message9892", + "message9893", + "message9894", + "message9895", + "message9896_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9897", + "message9898", + "message9899", + "message9900_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9901", + "message9902", + "message9903", + "message9904", + "message9905", + "message9906_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9907", + "message9908", + "message9909", + "message9910", + "message9911", + "message9912", + "message9913", + "message9914", + "message9915", + "message9916_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9917", + "message9918", + "message9919", + "message9920", + "message9921", + "message9922", + "message9923", + "message9924", + "message9925", + "message9926_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9927", + "message9928", + "message9929", + "message9930", + "message9931", + "message9932", + "message9933", + "message9934", + "message9935", + "message9936_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9937", + "message9938", + "message9939", + "message9940", + "message9941", + "message9942", + "message9943", + "message9944", + "message9945", + "message9946_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9947", + "message9948", + "message9949", + "message9950", + "message9951", + "message9952", + "message9953", + "message9954", + "message9955", + "message9956_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9957", + "message9958", + "message9959", + "message9960", + "message9961", + "message9962", + "message9963", + "message9964", + "message9965", + "message9966_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9967", + "message9968", + "message9969", + "message9970", + "message9971", + "message9972", + "message9973", + "message9974", + "message9975", + "message9976_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9977", + "message9978", + "message9979", + "message9980", + "message9981", + "message9982", + "message9983", + "message9984", + "message9985", + "message9986_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9987", + "message9988", + "message9989", + "message9990", + "message9991", + "message9992", + "message9993", + "message9994", + "message9995", + "message9996_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", + "message9997", + "message9998", + "message9999", + "message10000_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + ] + }, + { + "key": "key0", + "messages": [ + "message6001" + ] + }, + { + "key": "key1", + "messages": [ + "message6002" + ] + }, + { + "key": "key2", + "messages": [ + "message6003" + ] + }, + { + "key": "key3", + "messages": [ + "message6004" + ] + }, + { + "key": "key4", + "messages": [ + "message6005" + ] + }, + { + "key": "key5", + "messages": [ + "message6006" + ] + }, + { + "key": "key6", + "messages": [ + "message6007" + ] + }, + { + "key": "key7", + "messages": [ + "message6008" + ] + }, + { + "key": "key8", + "messages": [ + "message6009" + ] + }, + { + "key": "key9", + "messages": [ + "message6010" + ] + }, + { + "key": "key10", + "messages": [ + "message6011" + ] + }, + { + "key": "key11", + "messages": [ + "message6012" + ] + }, + { + "key": "key12", + "messages": [ + "message6013" + ] + }, + { + "key": "key13", + "messages": [ + "message6014" + ] + }, + { + "key": "key14", + "messages": [ + "message6015" + ] + }, + { + "key": "key15", + "messages": [ + "message6016" + ] + }, + { + "key": "key16", + "messages": [ + "message6017" + ] + }, + { + "key": "key17", + "messages": [ + "message6018" + ] + }, + { + "key": "key18", + "messages": [ + "message6019" + ] + }, + { + "key": "key19", + "messages": [ + "message6020" + ] + }, + { + "key": "key20", + "messages": [ + "message6021" + ] + }, + { + "key": "key21", + "messages": [ + "message6022" + ] + }, + { + "key": "key22", + "messages": [ + "message6023" + ] + }, + { + "key": "key23", + "messages": [ + "message6024" + ] + }, + { + "key": "key24", + "messages": [ + "message6025" + ] + }, + { + "key": "key25", + "messages": [ + "message6026" + ] + }, + { + "key": "key26", + "messages": [ + "message6027" + ] + }, + { + "key": "key27", + "messages": [ + "message6028" + ] + }, + { + "key": "key28", + "messages": [ + "message6029" + ] + }, + { + "key": "key29", + "messages": [ + "message6030" + ] + }, + { + "key": "key30", + "messages": [ + "message6031" + ] + }, + { + "key": "key31", + "messages": [ + "message6032" + ] + }, + { + "key": "key32", + "messages": [ + "message6033" + ] + }, + { + "key": "key33", + "messages": [ + "message6034" + ] + }, + { + "key": "key34", + "messages": [ + "message6035" + ] + }, + { + "key": "key35", + "messages": [ + "message6036" + ] + }, + { + "key": "key36", + "messages": [ + "message6037" + ] + }, + { + "key": "key37", + "messages": [ + "message6038" + ] + }, + { + "key": "key38", + "messages": [ + "message6039" + ] + }, + { + "key": "key39", + "messages": [ + "message6040" + ] + }, + { + "key": "key40", + "messages": [ + "message6041" + ] + }, + { + "key": "key41", + "messages": [ + "message6042" + ] + }, + { + "key": "key42", + "messages": [ + "message6043" + ] + }, + { + "key": "key43", + "messages": [ + "message6044" + ] + }, + { + "key": "key44", + "messages": [ + "message6045" + ] + }, + { + "key": "key45", + "messages": [ + "message6046" + ] + }, + { + "key": "key46", + "messages": [ + "message6047" + ] + }, + { + "key": "key47", + "messages": [ + "message6048" + ] + }, + { + "key": "key48", + "messages": [ + "message6049" + ] + }, + { + "key": "key49", + "messages": [ + "message6050" + ] + }, + { + "key": "key50", + "messages": [ + "message6051" + ] + }, + { + "key": "key51", + "messages": [ + "message6052" + ] + }, + { + "key": "key52", + "messages": [ + "message6053" + ] + }, + { + "key": "key53", + "messages": [ + "message6054" + ] + }, + { + "key": "key54", + "messages": [ + "message6055" + ] + }, + { + "key": "key55", + "messages": [ + "message6056" + ] + }, + { + "key": "key56", + "messages": [ + "message6057" + ] + }, + { + "key": "key57", + "messages": [ + "message6058" + ] + }, + { + "key": "key58", + "messages": [ + "message6059" + ] + }, + { + "key": "key59", + "messages": [ + "message6060" + ] + }, + { + "key": "key60", + "messages": [ + "message6061" + ] + }, + { + "key": "key61", + "messages": [ + "message6062" + ] + }, + { + "key": "key62", + "messages": [ + "message6063" + ] + }, + { + "key": "key63", + "messages": [ + "message6064" + ] + }, + { + "key": "key64", + "messages": [ + "message6065" + ] + }, + { + "key": "key65", + "messages": [ + "message6066" + ] + }, + { + "key": "key66", + "messages": [ + "message6067" + ] + }, + { + "key": "key67", + "messages": [ + "message6068" + ] + }, + { + "key": "key68", + "messages": [ + "message6069" + ] + }, + { + "key": "key69", + "messages": [ + "message6070" + ] + }, + { + "key": "key70", + "messages": [ + "message6071" + ] + }, + { + "key": "key71", + "messages": [ + "message6072" + ] + }, + { + "key": "key72", + "messages": [ + "message6073" + ] + }, + { + "key": "key73", + "messages": [ + "message6074" + ] + }, + { + "key": "key74", + "messages": [ + "message6075" + ] + }, + { + "key": "key75", + "messages": [ + "message6076" + ] + }, + { + "key": "key76", + "messages": [ + "message6077" + ] + }, + { + "key": "key77", + "messages": [ + "message6078" + ] + }, + { + "key": "key78", + "messages": [ + "message6079" + ] + }, + { + "key": "key79", + "messages": [ + "message6080" + ] + }, + { + "key": "key80", + "messages": [ + "message6081" + ] + }, + { + "key": "key81", + "messages": [ + "message6082" + ] + }, + { + "key": "key82", + "messages": [ + "message6083" + ] + }, + { + "key": "key83", + "messages": [ + "message6084" + ] + }, + { + "key": "key84", + "messages": [ + "message6085" + ] + }, + { + "key": "key85", + "messages": [ + "message6086" + ] + }, + { + "key": "key86", + "messages": [ + "message6087" + ] + }, + { + "key": "key87", + "messages": [ + "message6088" + ] + }, + { + "key": "key88", + "messages": [ + "message6089" + ] + }, + { + "key": "key89", + "messages": [ + "message6090" + ] + }, + { + "key": "key90", + "messages": [ + "message6091" + ] + }, + { + "key": "key91", + "messages": [ + "message6092" + ] + }, + { + "key": "key92", + "messages": [ + "message6093" + ] + }, + { + "key": "key93", + "messages": [ + "message6094" + ] + }, + { + "key": "key94", + "messages": [ + "message6095" + ] + }, + { + "key": "key95", + "messages": [ + "message6096" + ] + }, + { + "key": "key96", + "messages": [ + "message6097" + ] + }, + { + "key": "key97", + "messages": [ + "message6098" + ] + }, + { + "key": "key98", + "messages": [ + "message6099" + ] + }, + { + "key": "key99", + "messages": [ + "message6100" + ] + }, + { + "key": "key100", + "messages": [ + "message6101" + ] + }, + { + "key": "key101", + "messages": [ + "message6102" + ] + }, + { + "key": "key102", + "messages": [ + "message6103" + ] + }, + { + "key": "key103", + "messages": [ + "message6104" + ] + }, + { + "key": "key104", + "messages": [ + "message6105" + ] + }, + { + "key": "key105", + "messages": [ + "message6106" + ] + }, + { + "key": "key106", + "messages": [ + "message6107" + ] + }, + { + "key": "key107", + "messages": [ + "message6108" + ] + }, + { + "key": "key108", + "messages": [ + "message6109" + ] + }, + { + "key": "key109", + "messages": [ + "message6110" + ] + }, + { + "key": "key110", + "messages": [ + "message6111" + ] + }, + { + "key": "key111", + "messages": [ + "message6112" + ] + }, + { + "key": "key112", + "messages": [ + "message6113" + ] + }, + { + "key": "key113", + "messages": [ + "message6114" + ] + }, + { + "key": "key114", + "messages": [ + "message6115" + ] + }, + { + "key": "key115", + "messages": [ + "message6116" + ] + }, + { + "key": "key116", + "messages": [ + "message6117" + ] + }, + { + "key": "key117", + "messages": [ + "message6118" + ] + }, + { + "key": "key118", + "messages": [ + "message6119" + ] + }, + { + "key": "key119", + "messages": [ + "message6120" + ] + }, + { + "key": "key120", + "messages": [ + "message6121" + ] + }, + { + "key": "key121", + "messages": [ + "message6122" + ] + }, + { + "key": "key122", + "messages": [ + "message6123" + ] + }, + { + "key": "key123", + "messages": [ + "message6124" + ] + }, + { + "key": "key124", + "messages": [ + "message6125" + ] + }, + { + "key": "key125", + "messages": [ + "message6126" + ] + }, + { + "key": "key126", + "messages": [ + "message6127" + ] + }, + { + "key": "key127", + "messages": [ + "message6128" + ] + }, + { + "key": "key128", + "messages": [ + "message6129" + ] + }, + { + "key": "key129", + "messages": [ + "message6130" + ] + }, + { + "key": "key130", + "messages": [ + "message6131" + ] + }, + { + "key": "key131", + "messages": [ + "message6132" + ] + }, + { + "key": "key132", + "messages": [ + "message6133" + ] + }, + { + "key": "key133", + "messages": [ + "message6134" + ] + }, + { + "key": "key134", + "messages": [ + "message6135" + ] + }, + { + "key": "key135", + "messages": [ + "message6136" + ] + }, + { + "key": "key136", + "messages": [ + "message6137" + ] + }, + { + "key": "key137", + "messages": [ + "message6138" + ] + }, + { + "key": "key138", + "messages": [ + "message6139" + ] + }, + { + "key": "key139", + "messages": [ + "message6140" + ] + }, + { + "key": "key140", + "messages": [ + "message6141" + ] + }, + { + "key": "key141", + "messages": [ + "message6142" + ] + }, + { + "key": "key142", + "messages": [ + "message6143" + ] + }, + { + "key": "key143", + "messages": [ + "message6144" + ] + }, + { + "key": "key144", + "messages": [ + "message6145" + ] + }, + { + "key": "key145", + "messages": [ + "message6146" + ] + }, + { + "key": "key146", + "messages": [ + "message6147" + ] + }, + { + "key": "key147", + "messages": [ + "message6148" + ] + }, + { + "key": "key148", + "messages": [ + "message6149" + ] + }, + { + "key": "key149", + "messages": [ + "message6150" + ] + }, + { + "key": "key150", + "messages": [ + "message6151" + ] + }, + { + "key": "key151", + "messages": [ + "message6152" + ] + }, + { + "key": "key152", + "messages": [ + "message6153" + ] + }, + { + "key": "key153", + "messages": [ + "message6154" + ] + }, + { + "key": "key154", + "messages": [ + "message6155" + ] + }, + { + "key": "key155", + "messages": [ + "message6156" + ] + }, + { + "key": "key156", + "messages": [ + "message6157" + ] + }, + { + "key": "key157", + "messages": [ + "message6158" + ] + }, + { + "key": "key158", + "messages": [ + "message6159" + ] + }, + { + "key": "key159", + "messages": [ + "message6160" + ] + }, + { + "key": "key160", + "messages": [ + "message6161" + ] + }, + { + "key": "key161", + "messages": [ + "message6162" + ] + }, + { + "key": "key162", + "messages": [ + "message6163" + ] + }, + { + "key": "key163", + "messages": [ + "message6164" + ] + }, + { + "key": "key164", + "messages": [ + "message6165" + ] + }, + { + "key": "key165", + "messages": [ + "message6166" + ] + }, + { + "key": "key166", + "messages": [ + "message6167" + ] + }, + { + "key": "key167", + "messages": [ + "message6168" + ] + }, + { + "key": "key168", + "messages": [ + "message6169" + ] + }, + { + "key": "key169", + "messages": [ + "message6170" + ] + }, + { + "key": "key170", + "messages": [ + "message6171" + ] + }, + { + "key": "key171", + "messages": [ + "message6172" + ] + }, + { + "key": "key172", + "messages": [ + "message6173" + ] + }, + { + "key": "key173", + "messages": [ + "message6174" + ] + }, + { + "key": "key174", + "messages": [ + "message6175" + ] + }, + { + "key": "key175", + "messages": [ + "message6176" + ] + }, + { + "key": "key176", + "messages": [ + "message6177" + ] + }, + { + "key": "key177", + "messages": [ + "message6178" + ] + }, + { + "key": "key178", + "messages": [ + "message6179" + ] + }, + { + "key": "key179", + "messages": [ + "message6180" + ] + }, + { + "key": "key180", + "messages": [ + "message6181" + ] + }, + { + "key": "key181", + "messages": [ + "message6182" + ] + }, + { + "key": "key182", + "messages": [ + "message6183" + ] + }, + { + "key": "key183", + "messages": [ + "message6184" + ] + }, + { + "key": "key184", + "messages": [ + "message6185" + ] + }, + { + "key": "key185", + "messages": [ + "message6186" + ] + }, + { + "key": "key186", + "messages": [ + "message6187" + ] + }, + { + "key": "key187", + "messages": [ + "message6188" + ] + }, + { + "key": "key188", + "messages": [ + "message6189" + ] + }, + { + "key": "key189", + "messages": [ + "message6190" + ] + }, + { + "key": "key190", + "messages": [ + "message6191" + ] + }, + { + "key": "key191", + "messages": [ + "message6192" + ] + }, + { + "key": "key192", + "messages": [ + "message6193" + ] + }, + { + "key": "key193", + "messages": [ + "message6194" + ] + }, + { + "key": "key194", + "messages": [ + "message6195" + ] + }, + { + "key": "key195", + "messages": [ + "message6196" + ] + }, + { + "key": "key196", + "messages": [ + "message6197" + ] + }, + { + "key": "key197", + "messages": [ + "message6198" + ] + }, + { + "key": "key198", + "messages": [ + "message6199" + ] + }, + { + "key": "key199", + "messages": [ + "message6200" + ] + }, + { + "key": "key200", + "messages": [ + "message6201" + ] + }, + { + "key": "key201", + "messages": [ + "message6202" + ] + }, + { + "key": "key202", + "messages": [ + "message6203" + ] + }, + { + "key": "key203", + "messages": [ + "message6204" + ] + }, + { + "key": "key204", + "messages": [ + "message6205" + ] + }, + { + "key": "key205", + "messages": [ + "message6206" + ] + }, + { + "key": "key206", + "messages": [ + "message6207" + ] + }, + { + "key": "key207", + "messages": [ + "message6208" + ] + }, + { + "key": "key208", + "messages": [ + "message6209" + ] + }, + { + "key": "key209", + "messages": [ + "message6210" + ] + }, + { + "key": "key210", + "messages": [ + "message6211" + ] + }, + { + "key": "key211", + "messages": [ + "message6212" + ] + }, + { + "key": "key212", + "messages": [ + "message6213" + ] + }, + { + "key": "key213", + "messages": [ + "message6214" + ] + }, + { + "key": "key214", + "messages": [ + "message6215" + ] + }, + { + "key": "key215", + "messages": [ + "message6216" + ] + }, + { + "key": "key216", + "messages": [ + "message6217" + ] + }, + { + "key": "key217", + "messages": [ + "message6218" + ] + }, + { + "key": "key218", + "messages": [ + "message6219" + ] + }, + { + "key": "key219", + "messages": [ + "message6220" + ] + }, + { + "key": "key220", + "messages": [ + "message6221" + ] + }, + { + "key": "key221", + "messages": [ + "message6222" + ] + }, + { + "key": "key222", + "messages": [ + "message6223" + ] + }, + { + "key": "key223", + "messages": [ + "message6224" + ] + }, + { + "key": "key224", + "messages": [ + "message6225" + ] + }, + { + "key": "key225", + "messages": [ + "message6226" + ] + }, + { + "key": "key226", + "messages": [ + "message6227" + ] + }, + { + "key": "key227", + "messages": [ + "message6228" + ] + }, + { + "key": "key228", + "messages": [ + "message6229" + ] + }, + { + "key": "key229", + "messages": [ + "message6230" + ] + }, + { + "key": "key230", + "messages": [ + "message6231" + ] + }, + { + "key": "key231", + "messages": [ + "message6232" + ] + }, + { + "key": "key232", + "messages": [ + "message6233" + ] + }, + { + "key": "key233", + "messages": [ + "message6234" + ] + }, + { + "key": "key234", + "messages": [ + "message6235" + ] + }, + { + "key": "key235", + "messages": [ + "message6236" + ] + }, + { + "key": "key236", + "messages": [ + "message6237" + ] + }, + { + "key": "key237", + "messages": [ + "message6238" + ] + }, + { + "key": "key238", + "messages": [ + "message6239" + ] + }, + { + "key": "key239", + "messages": [ + "message6240" + ] + }, + { + "key": "key240", + "messages": [ + "message6241" + ] + }, + { + "key": "key241", + "messages": [ + "message6242" + ] + }, + { + "key": "key242", + "messages": [ + "message6243" + ] + }, + { + "key": "key243", + "messages": [ + "message6244" + ] + }, + { + "key": "key244", + "messages": [ + "message6245" + ] + }, + { + "key": "key245", + "messages": [ + "message6246" + ] + }, + { + "key": "key246", + "messages": [ + "message6247" + ] + }, + { + "key": "key247", + "messages": [ + "message6248" + ] + }, + { + "key": "key248", + "messages": [ + "message6249" + ] + }, + { + "key": "key249", + "messages": [ + "message6250" + ] + }, + { + "key": "key250", + "messages": [ + "message6251" + ] + }, + { + "key": "key251", + "messages": [ + "message6252" + ] + }, + { + "key": "key252", + "messages": [ + "message6253" + ] + }, + { + "key": "key253", + "messages": [ + "message6254" + ] + }, + { + "key": "key254", + "messages": [ + "message6255" + ] + }, + { + "key": "key255", + "messages": [ + "message6256" + ] + }, + { + "key": "key256", + "messages": [ + "message6257" + ] + }, + { + "key": "key257", + "messages": [ + "message6258" + ] + }, + { + "key": "key258", + "messages": [ + "message6259" + ] + }, + { + "key": "key259", + "messages": [ + "message6260" + ] + }, + { + "key": "key260", + "messages": [ + "message6261" + ] + }, + { + "key": "key261", + "messages": [ + "message6262" + ] + }, + { + "key": "key262", + "messages": [ + "message6263" + ] + }, + { + "key": "key263", + "messages": [ + "message6264" + ] + }, + { + "key": "key264", + "messages": [ + "message6265" + ] + }, + { + "key": "key265", + "messages": [ + "message6266" + ] + }, + { + "key": "key266", + "messages": [ + "message6267" + ] + }, + { + "key": "key267", + "messages": [ + "message6268" + ] + }, + { + "key": "key268", + "messages": [ + "message6269" + ] + }, + { + "key": "key269", + "messages": [ + "message6270" + ] + }, + { + "key": "key270", + "messages": [ + "message6271" + ] + }, + { + "key": "key271", + "messages": [ + "message6272" + ] + }, + { + "key": "key272", + "messages": [ + "message6273" + ] + }, + { + "key": "key273", + "messages": [ + "message6274" + ] + }, + { + "key": "key274", + "messages": [ + "message6275" + ] + }, + { + "key": "key275", + "messages": [ + "message6276" + ] + }, + { + "key": "key276", + "messages": [ + "message6277" + ] + }, + { + "key": "key277", + "messages": [ + "message6278" + ] + }, + { + "key": "key278", + "messages": [ + "message6279" + ] + }, + { + "key": "key279", + "messages": [ + "message6280" + ] + }, + { + "key": "key280", + "messages": [ + "message6281" + ] + }, + { + "key": "key281", + "messages": [ + "message6282" + ] + }, + { + "key": "key282", + "messages": [ + "message6283" + ] + }, + { + "key": "key283", + "messages": [ + "message6284" + ] + }, + { + "key": "key284", + "messages": [ + "message6285" + ] + }, + { + "key": "key285", + "messages": [ + "message6286" + ] + }, + { + "key": "key286", + "messages": [ + "message6287" + ] + }, + { + "key": "key287", + "messages": [ + "message6288" + ] + }, + { + "key": "key288", + "messages": [ + "message6289" + ] + }, + { + "key": "key289", + "messages": [ + "message6290" + ] + }, + { + "key": "key290", + "messages": [ + "message6291" + ] + }, + { + "key": "key291", + "messages": [ + "message6292" + ] + }, + { + "key": "key292", + "messages": [ + "message6293" + ] + }, + { + "key": "key293", + "messages": [ + "message6294" + ] + }, + { + "key": "key294", + "messages": [ + "message6295" + ] + }, + { + "key": "key295", + "messages": [ + "message6296" + ] + }, + { + "key": "key296", + "messages": [ + "message6297" + ] + }, + { + "key": "key297", + "messages": [ + "message6298" + ] + }, + { + "key": "key298", + "messages": [ + "message6299" + ] + }, + { + "key": "key299", + "messages": [ + "message6300" + ] + }, + { + "key": "key300", + "messages": [ + "message6301" + ] + }, + { + "key": "key301", + "messages": [ + "message6302" + ] + }, + { + "key": "key302", + "messages": [ + "message6303" + ] + }, + { + "key": "key303", + "messages": [ + "message6304" + ] + }, + { + "key": "key304", + "messages": [ + "message6305" + ] + }, + { + "key": "key305", + "messages": [ + "message6306" + ] + }, + { + "key": "key306", + "messages": [ + "message6307" + ] + }, + { + "key": "key307", + "messages": [ + "message6308" + ] + }, + { + "key": "key308", + "messages": [ + "message6309" + ] + }, + { + "key": "key309", + "messages": [ + "message6310" + ] + }, + { + "key": "key310", + "messages": [ + "message6311" + ] + }, + { + "key": "key311", + "messages": [ + "message6312" + ] + }, + { + "key": "key312", + "messages": [ + "message6313" + ] + }, + { + "key": "key313", + "messages": [ + "message6314" + ] + }, + { + "key": "key314", + "messages": [ + "message6315" + ] + }, + { + "key": "key315", + "messages": [ + "message6316" + ] + }, + { + "key": "key316", + "messages": [ + "message6317" + ] + }, + { + "key": "key317", + "messages": [ + "message6318" + ] + }, + { + "key": "key318", + "messages": [ + "message6319" + ] + }, + { + "key": "key319", + "messages": [ + "message6320" + ] + }, + { + "key": "key320", + "messages": [ + "message6321" + ] + }, + { + "key": "key321", + "messages": [ + "message6322" + ] + }, + { + "key": "key322", + "messages": [ + "message6323" + ] + }, + { + "key": "key323", + "messages": [ + "message6324" + ] + }, + { + "key": "key324", + "messages": [ + "message6325" + ] + }, + { + "key": "key325", + "messages": [ + "message6326" + ] + }, + { + "key": "key326", + "messages": [ + "message6327" + ] + }, + { + "key": "key327", + "messages": [ + "message6328" + ] + }, + { + "key": "key328", + "messages": [ + "message6329" + ] + }, + { + "key": "key329", + "messages": [ + "message6330" + ] + }, + { + "key": "key330", + "messages": [ + "message6331" + ] + }, + { + "key": "key331", + "messages": [ + "message6332" + ] + }, + { + "key": "key332", + "messages": [ + "message6333" + ] + }, + { + "key": "key333", + "messages": [ + "message6334" + ] + }, + { + "key": "key334", + "messages": [ + "message6335" + ] + }, + { + "key": "key335", + "messages": [ + "message6336" + ] + }, + { + "key": "key336", + "messages": [ + "message6337" + ] + }, + { + "key": "key337", + "messages": [ + "message6338" + ] + }, + { + "key": "key338", + "messages": [ + "message6339" + ] + }, + { + "key": "key339", + "messages": [ + "message6340" + ] + }, + { + "key": "key340", + "messages": [ + "message6341" + ] + }, + { + "key": "key341", + "messages": [ + "message6342" + ] + }, + { + "key": "key342", + "messages": [ + "message6343" + ] + }, + { + "key": "key343", + "messages": [ + "message6344" + ] + }, + { + "key": "key344", + "messages": [ + "message6345" + ] + }, + { + "key": "key345", + "messages": [ + "message6346" + ] + }, + { + "key": "key346", + "messages": [ + "message6347" + ] + }, + { + "key": "key347", + "messages": [ + "message6348" + ] + }, + { + "key": "key348", + "messages": [ + "message6349" + ] + }, + { + "key": "key349", + "messages": [ + "message6350" + ] + }, + { + "key": "key350", + "messages": [ + "message6351" + ] + }, + { + "key": "key351", + "messages": [ + "message6352" + ] + }, + { + "key": "key352", + "messages": [ + "message6353" + ] + }, + { + "key": "key353", + "messages": [ + "message6354" + ] + }, + { + "key": "key354", + "messages": [ + "message6355" + ] + }, + { + "key": "key355", + "messages": [ + "message6356" + ] + }, + { + "key": "key356", + "messages": [ + "message6357" + ] + }, + { + "key": "key357", + "messages": [ + "message6358" + ] + }, + { + "key": "key358", + "messages": [ + "message6359" + ] + }, + { + "key": "key359", + "messages": [ + "message6360" + ] + }, + { + "key": "key360", + "messages": [ + "message6361" + ] + }, + { + "key": "key361", + "messages": [ + "message6362" + ] + }, + { + "key": "key362", + "messages": [ + "message6363" + ] + }, + { + "key": "key363", + "messages": [ + "message6364" + ] + }, + { + "key": "key364", + "messages": [ + "message6365" + ] + }, + { + "key": "key365", + "messages": [ + "message6366" + ] + }, + { + "key": "key366", + "messages": [ + "message6367" + ] + }, + { + "key": "key367", + "messages": [ + "message6368" + ] + }, + { + "key": "key368", + "messages": [ + "message6369" + ] + }, + { + "key": "key369", + "messages": [ + "message6370" + ] + }, + { + "key": "key370", + "messages": [ + "message6371" + ] + }, + { + "key": "key371", + "messages": [ + "message6372" + ] + }, + { + "key": "key372", + "messages": [ + "message6373" + ] + }, + { + "key": "key373", + "messages": [ + "message6374" + ] + }, + { + "key": "key374", + "messages": [ + "message6375" + ] + }, + { + "key": "key375", + "messages": [ + "message6376" + ] + }, + { + "key": "key376", + "messages": [ + "message6377" + ] + }, + { + "key": "key377", + "messages": [ + "message6378" + ] + }, + { + "key": "key378", + "messages": [ + "message6379" + ] + }, + { + "key": "key379", + "messages": [ + "message6380" + ] + }, + { + "key": "key380", + "messages": [ + "message6381" + ] + }, + { + "key": "key381", + "messages": [ + "message6382" + ] + }, + { + "key": "key382", + "messages": [ + "message6383" + ] + }, + { + "key": "key383", + "messages": [ + "message6384" + ] + }, + { + "key": "key384", + "messages": [ + "message6385" + ] + }, + { + "key": "key385", + "messages": [ + "message6386" + ] + }, + { + "key": "key386", + "messages": [ + "message6387" + ] + }, + { + "key": "key387", + "messages": [ + "message6388" + ] + }, + { + "key": "key388", + "messages": [ + "message6389" + ] + }, + { + "key": "key389", + "messages": [ + "message6390" + ] + }, + { + "key": "key390", + "messages": [ + "message6391" + ] + }, + { + "key": "key391", + "messages": [ + "message6392" + ] + }, + { + "key": "key392", + "messages": [ + "message6393" + ] + }, + { + "key": "key393", + "messages": [ + "message6394" + ] + }, + { + "key": "key394", + "messages": [ + "message6395" + ] + }, + { + "key": "key395", + "messages": [ + "message6396" + ] + }, + { + "key": "key396", + "messages": [ + "message6397" + ] + }, + { + "key": "key397", + "messages": [ + "message6398" + ] + }, + { + "key": "key398", + "messages": [ + "message6399" + ] + }, + { + "key": "key399", + "messages": [ + "message6400" + ] + }, + { + "key": "key400", + "messages": [ + "message6401" + ] + }, + { + "key": "key401", + "messages": [ + "message6402" + ] + }, + { + "key": "key402", + "messages": [ + "message6403" + ] + }, + { + "key": "key403", + "messages": [ + "message6404" + ] + }, + { + "key": "key404", + "messages": [ + "message6405" + ] + }, + { + "key": "key405", + "messages": [ + "message6406" + ] + }, + { + "key": "key406", + "messages": [ + "message6407" + ] + }, + { + "key": "key407", + "messages": [ + "message6408" + ] + }, + { + "key": "key408", + "messages": [ + "message6409" + ] + }, + { + "key": "key409", + "messages": [ + "message6410" + ] + }, + { + "key": "key410", + "messages": [ + "message6411" + ] + }, + { + "key": "key411", + "messages": [ + "message6412" + ] + }, + { + "key": "key412", + "messages": [ + "message6413" + ] + }, + { + "key": "key413", + "messages": [ + "message6414" + ] + }, + { + "key": "key414", + "messages": [ + "message6415" + ] + }, + { + "key": "key415", + "messages": [ + "message6416" + ] + }, + { + "key": "key416", + "messages": [ + "message6417" + ] + }, + { + "key": "key417", + "messages": [ + "message6418" + ] + }, + { + "key": "key418", + "messages": [ + "message6419" + ] + }, + { + "key": "key419", + "messages": [ + "message6420" + ] + }, + { + "key": "key420", + "messages": [ + "message6421" + ] + }, + { + "key": "key421", + "messages": [ + "message6422" + ] + }, + { + "key": "key422", + "messages": [ + "message6423" + ] + }, + { + "key": "key423", + "messages": [ + "message6424" + ] + }, + { + "key": "key424", + "messages": [ + "message6425" + ] + }, + { + "key": "key425", + "messages": [ + "message6426" + ] + }, + { + "key": "key426", + "messages": [ + "message6427" + ] + }, + { + "key": "key427", + "messages": [ + "message6428" + ] + }, + { + "key": "key428", + "messages": [ + "message6429" + ] + }, + { + "key": "key429", + "messages": [ + "message6430" + ] + }, + { + "key": "key430", + "messages": [ + "message6431" + ] + }, + { + "key": "key431", + "messages": [ + "message6432" + ] + }, + { + "key": "key432", + "messages": [ + "message6433" + ] + }, + { + "key": "key433", + "messages": [ + "message6434" + ] + }, + { + "key": "key434", + "messages": [ + "message6435" + ] + }, + { + "key": "key435", + "messages": [ + "message6436" + ] + }, + { + "key": "key436", + "messages": [ + "message6437" + ] + }, + { + "key": "key437", + "messages": [ + "message6438" + ] + }, + { + "key": "key438", + "messages": [ + "message6439" + ] + }, + { + "key": "key439", + "messages": [ + "message6440" + ] + }, + { + "key": "key440", + "messages": [ + "message6441" + ] + }, + { + "key": "key441", + "messages": [ + "message6442" + ] + }, + { + "key": "key442", + "messages": [ + "message6443" + ] + }, + { + "key": "key443", + "messages": [ + "message6444" + ] + }, + { + "key": "key444", + "messages": [ + "message6445" + ] + }, + { + "key": "key445", + "messages": [ + "message6446" + ] + }, + { + "key": "key446", + "messages": [ + "message6447" + ] + }, + { + "key": "key447", + "messages": [ + "message6448" + ] + }, + { + "key": "key448", + "messages": [ + "message6449" + ] + }, + { + "key": "key449", + "messages": [ + "message6450" + ] + }, + { + "key": "key450", + "messages": [ + "message6451" + ] + }, + { + "key": "key451", + "messages": [ + "message6452" + ] + }, + { + "key": "key452", + "messages": [ + "message6453" + ] + }, + { + "key": "key453", + "messages": [ + "message6454" + ] + }, + { + "key": "key454", + "messages": [ + "message6455" + ] + }, + { + "key": "key455", + "messages": [ + "message6456" + ] + }, + { + "key": "key456", + "messages": [ + "message6457" + ] + }, + { + "key": "key457", + "messages": [ + "message6458" + ] + }, + { + "key": "key458", + "messages": [ + "message6459" + ] + }, + { + "key": "key459", + "messages": [ + "message6460" + ] + }, + { + "key": "key460", + "messages": [ + "message6461" + ] + }, + { + "key": "key461", + "messages": [ + "message6462" + ] + }, + { + "key": "key462", + "messages": [ + "message6463" + ] + }, + { + "key": "key463", + "messages": [ + "message6464" + ] + }, + { + "key": "key464", + "messages": [ + "message6465" + ] + }, + { + "key": "key465", + "messages": [ + "message6466" + ] + }, + { + "key": "key466", + "messages": [ + "message6467" + ] + }, + { + "key": "key467", + "messages": [ + "message6468" + ] + }, + { + "key": "key468", + "messages": [ + "message6469" + ] + }, + { + "key": "key469", + "messages": [ + "message6470" + ] + }, + { + "key": "key470", + "messages": [ + "message6471" + ] + }, + { + "key": "key471", + "messages": [ + "message6472" + ] + }, + { + "key": "key472", + "messages": [ + "message6473" + ] + }, + { + "key": "key473", + "messages": [ + "message6474" + ] + }, + { + "key": "key474", + "messages": [ + "message6475" + ] + }, + { + "key": "key475", + "messages": [ + "message6476" + ] + }, + { + "key": "key476", + "messages": [ + "message6477" + ] + }, + { + "key": "key477", + "messages": [ + "message6478" + ] + }, + { + "key": "key478", + "messages": [ + "message6479" + ] + }, + { + "key": "key479", + "messages": [ + "message6480" + ] + }, + { + "key": "key480", + "messages": [ + "message6481" + ] + }, + { + "key": "key481", + "messages": [ + "message6482" + ] + }, + { + "key": "key482", + "messages": [ + "message6483" + ] + }, + { + "key": "key483", + "messages": [ + "message6484" + ] + }, + { + "key": "key484", + "messages": [ + "message6485" + ] + }, + { + "key": "key485", + "messages": [ + "message6486" + ] + }, + { + "key": "key486", + "messages": [ + "message6487" + ] + }, + { + "key": "key487", + "messages": [ + "message6488" + ] + }, + { + "key": "key488", + "messages": [ + "message6489" + ] + }, + { + "key": "key489", + "messages": [ + "message6490" + ] + }, + { + "key": "key490", + "messages": [ + "message6491" + ] + }, + { + "key": "key491", + "messages": [ + "message6492" + ] + }, + { + "key": "key492", + "messages": [ + "message6493" + ] + }, + { + "key": "key493", + "messages": [ + "message6494" + ] + }, + { + "key": "key494", + "messages": [ + "message6495" + ] + }, + { + "key": "key495", + "messages": [ + "message6496" + ] + }, + { + "key": "key496", + "messages": [ + "message6497" + ] + }, + { + "key": "key497", + "messages": [ + "message6498" + ] + }, + { + "key": "key498", + "messages": [ + "message6499" + ] + }, + { + "key": "key499", + "messages": [ + "message6500" + ] + }, + { + "key": "key500", + "messages": [ + "message6501" + ] + }, + { + "key": "key501", + "messages": [ + "message6502" + ] + }, + { + "key": "key502", + "messages": [ + "message6503" + ] + }, + { + "key": "key503", + "messages": [ + "message6504" + ] + }, + { + "key": "key504", + "messages": [ + "message6505" + ] + }, + { + "key": "key505", + "messages": [ + "message6506" + ] + }, + { + "key": "key506", + "messages": [ + "message6507" + ] + }, + { + "key": "key507", + "messages": [ + "message6508" + ] + }, + { + "key": "key508", + "messages": [ + "message6509" + ] + }, + { + "key": "key509", + "messages": [ + "message6510" + ] + }, + { + "key": "key510", + "messages": [ + "message6511" + ] + }, + { + "key": "key511", + "messages": [ + "message6512" + ] + }, + { + "key": "key512", + "messages": [ + "message6513" + ] + }, + { + "key": "key513", + "messages": [ + "message6514" + ] + }, + { + "key": "key514", + "messages": [ + "message6515" + ] + }, + { + "key": "key515", + "messages": [ + "message6516" + ] + }, + { + "key": "key516", + "messages": [ + "message6517" + ] + }, + { + "key": "key517", + "messages": [ + "message6518" + ] + }, + { + "key": "key518", + "messages": [ + "message6519" + ] + }, + { + "key": "key519", + "messages": [ + "message6520" + ] + }, + { + "key": "key520", + "messages": [ + "message6521" + ] + }, + { + "key": "key521", + "messages": [ + "message6522" + ] + }, + { + "key": "key522", + "messages": [ + "message6523" + ] + }, + { + "key": "key523", + "messages": [ + "message6524" + ] + }, + { + "key": "key524", + "messages": [ + "message6525" + ] + }, + { + "key": "key525", + "messages": [ + "message6526" + ] + }, + { + "key": "key526", + "messages": [ + "message6527" + ] + }, + { + "key": "key527", + "messages": [ + "message6528" + ] + }, + { + "key": "key528", + "messages": [ + "message6529" + ] + }, + { + "key": "key529", + "messages": [ + "message6530" + ] + }, + { + "key": "key530", + "messages": [ + "message6531" + ] + }, + { + "key": "key531", + "messages": [ + "message6532" + ] + }, + { + "key": "key532", + "messages": [ + "message6533" + ] + }, + { + "key": "key533", + "messages": [ + "message6534" + ] + }, + { + "key": "key534", + "messages": [ + "message6535" + ] + }, + { + "key": "key535", + "messages": [ + "message6536" + ] + }, + { + "key": "key536", + "messages": [ + "message6537" + ] + }, + { + "key": "key537", + "messages": [ + "message6538" + ] + }, + { + "key": "key538", + "messages": [ + "message6539" + ] + }, + { + "key": "key539", + "messages": [ + "message6540" + ] + }, + { + "key": "key540", + "messages": [ + "message6541" + ] + }, + { + "key": "key541", + "messages": [ + "message6542" + ] + }, + { + "key": "key542", + "messages": [ + "message6543" + ] + }, + { + "key": "key543", + "messages": [ + "message6544" + ] + }, + { + "key": "key544", + "messages": [ + "message6545" + ] + }, + { + "key": "key545", + "messages": [ + "message6546" + ] + }, + { + "key": "key546", + "messages": [ + "message6547" + ] + }, + { + "key": "key547", + "messages": [ + "message6548" + ] + }, + { + "key": "key548", + "messages": [ + "message6549" + ] + }, + { + "key": "key549", + "messages": [ + "message6550" + ] + }, + { + "key": "key550", + "messages": [ + "message6551" + ] + }, + { + "key": "key551", + "messages": [ + "message6552" + ] + }, + { + "key": "key552", + "messages": [ + "message6553" + ] + }, + { + "key": "key553", + "messages": [ + "message6554" + ] + }, + { + "key": "key554", + "messages": [ + "message6555" + ] + }, + { + "key": "key555", + "messages": [ + "message6556" + ] + }, + { + "key": "key556", + "messages": [ + "message6557" + ] + }, + { + "key": "key557", + "messages": [ + "message6558" + ] + }, + { + "key": "key558", + "messages": [ + "message6559" + ] + }, + { + "key": "key559", + "messages": [ + "message6560" + ] + }, + { + "key": "key560", + "messages": [ + "message6561" + ] + }, + { + "key": "key561", + "messages": [ + "message6562" + ] + }, + { + "key": "key562", + "messages": [ + "message6563" + ] + }, + { + "key": "key563", + "messages": [ + "message6564" + ] + }, + { + "key": "key564", + "messages": [ + "message6565" + ] + }, + { + "key": "key565", + "messages": [ + "message6566" + ] + }, + { + "key": "key566", + "messages": [ + "message6567" + ] + }, + { + "key": "key567", + "messages": [ + "message6568" + ] + }, + { + "key": "key568", + "messages": [ + "message6569" + ] + }, + { + "key": "key569", + "messages": [ + "message6570" + ] + }, + { + "key": "key570", + "messages": [ + "message6571" + ] + }, + { + "key": "key571", + "messages": [ + "message6572" + ] + }, + { + "key": "key572", + "messages": [ + "message6573" + ] + }, + { + "key": "key573", + "messages": [ + "message6574" + ] + }, + { + "key": "key574", + "messages": [ + "message6575" + ] + }, + { + "key": "key575", + "messages": [ + "message6576" + ] + }, + { + "key": "key576", + "messages": [ + "message6577" + ] + }, + { + "key": "key577", + "messages": [ + "message6578" + ] + }, + { + "key": "key578", + "messages": [ + "message6579" + ] + }, + { + "key": "key579", + "messages": [ + "message6580" + ] + }, + { + "key": "key580", + "messages": [ + "message6581" + ] + }, + { + "key": "key581", + "messages": [ + "message6582" + ] + }, + { + "key": "key582", + "messages": [ + "message6583" + ] + }, + { + "key": "key583", + "messages": [ + "message6584" + ] + }, + { + "key": "key584", + "messages": [ + "message6585" + ] + }, + { + "key": "key585", + "messages": [ + "message6586" + ] + }, + { + "key": "key586", + "messages": [ + "message6587" + ] + }, + { + "key": "key587", + "messages": [ + "message6588" + ] + }, + { + "key": "key588", + "messages": [ + "message6589" + ] + }, + { + "key": "key589", + "messages": [ + "message6590" + ] + }, + { + "key": "key590", + "messages": [ + "message6591" + ] + }, + { + "key": "key591", + "messages": [ + "message6592" + ] + }, + { + "key": "key592", + "messages": [ + "message6593" + ] + }, + { + "key": "key593", + "messages": [ + "message6594" + ] + }, + { + "key": "key594", + "messages": [ + "message6595" + ] + }, + { + "key": "key595", + "messages": [ + "message6596" + ] + }, + { + "key": "key596", + "messages": [ + "message6597" + ] + }, + { + "key": "key597", + "messages": [ + "message6598" + ] + }, + { + "key": "key598", + "messages": [ + "message6599" + ] + }, + { + "key": "key599", + "messages": [ + "message6600" + ] + }, + { + "key": "key600", + "messages": [ + "message6601" + ] + }, + { + "key": "key601", + "messages": [ + "message6602" + ] + }, + { + "key": "key602", + "messages": [ + "message6603" + ] + }, + { + "key": "key603", + "messages": [ + "message6604" + ] + }, + { + "key": "key604", + "messages": [ + "message6605" + ] + }, + { + "key": "key605", + "messages": [ + "message6606" + ] + }, + { + "key": "key606", + "messages": [ + "message6607" + ] + }, + { + "key": "key607", + "messages": [ + "message6608" + ] + }, + { + "key": "key608", + "messages": [ + "message6609" + ] + }, + { + "key": "key609", + "messages": [ + "message6610" + ] + }, + { + "key": "key610", + "messages": [ + "message6611" + ] + }, + { + "key": "key611", + "messages": [ + "message6612" + ] + }, + { + "key": "key612", + "messages": [ + "message6613" + ] + }, + { + "key": "key613", + "messages": [ + "message6614" + ] + }, + { + "key": "key614", + "messages": [ + "message6615" + ] + }, + { + "key": "key615", + "messages": [ + "message6616" + ] + }, + { + "key": "key616", + "messages": [ + "message6617" + ] + }, + { + "key": "key617", + "messages": [ + "message6618" + ] + }, + { + "key": "key618", + "messages": [ + "message6619" + ] + }, + { + "key": "key619", + "messages": [ + "message6620" + ] + }, + { + "key": "key620", + "messages": [ + "message6621" + ] + }, + { + "key": "key621", + "messages": [ + "message6622" + ] + }, + { + "key": "key622", + "messages": [ + "message6623" + ] + }, + { + "key": "key623", + "messages": [ + "message6624" + ] + }, + { + "key": "key624", + "messages": [ + "message6625" + ] + }, + { + "key": "key625", + "messages": [ + "message6626" + ] + }, + { + "key": "key626", + "messages": [ + "message6627" + ] + }, + { + "key": "key627", + "messages": [ + "message6628" + ] + }, + { + "key": "key628", + "messages": [ + "message6629" + ] + }, + { + "key": "key629", + "messages": [ + "message6630" + ] + }, + { + "key": "key630", + "messages": [ + "message6631" + ] + }, + { + "key": "key631", + "messages": [ + "message6632" + ] + }, + { + "key": "key632", + "messages": [ + "message6633" + ] + }, + { + "key": "key633", + "messages": [ + "message6634" + ] + }, + { + "key": "key634", + "messages": [ + "message6635" + ] + }, + { + "key": "key635", + "messages": [ + "message6636" + ] + }, + { + "key": "key636", + "messages": [ + "message6637" + ] + }, + { + "key": "key637", + "messages": [ + "message6638" + ] + }, + { + "key": "key638", + "messages": [ + "message6639" + ] + }, + { + "key": "key639", + "messages": [ + "message6640" + ] + }, + { + "key": "key640", + "messages": [ + "message6641" + ] + }, + { + "key": "key641", + "messages": [ + "message6642" + ] + }, + { + "key": "key642", + "messages": [ + "message6643" + ] + }, + { + "key": "key643", + "messages": [ + "message6644" + ] + }, + { + "key": "key644", + "messages": [ + "message6645" + ] + }, + { + "key": "key645", + "messages": [ + "message6646" + ] + }, + { + "key": "key646", + "messages": [ + "message6647" + ] + }, + { + "key": "key647", + "messages": [ + "message6648" + ] + }, + { + "key": "key648", + "messages": [ + "message6649" + ] + }, + { + "key": "key649", + "messages": [ + "message6650" + ] + }, + { + "key": "key650", + "messages": [ + "message6651" + ] + }, + { + "key": "key651", + "messages": [ + "message6652" + ] + }, + { + "key": "key652", + "messages": [ + "message6653" + ] + }, + { + "key": "key653", + "messages": [ + "message6654" + ] + }, + { + "key": "key654", + "messages": [ + "message6655" + ] + }, + { + "key": "key655", + "messages": [ + "message6656" + ] + }, + { + "key": "key656", + "messages": [ + "message6657" + ] + }, + { + "key": "key657", + "messages": [ + "message6658" + ] + }, + { + "key": "key658", + "messages": [ + "message6659" + ] + }, + { + "key": "key659", + "messages": [ + "message6660" + ] + }, + { + "key": "key660", + "messages": [ + "message6661" + ] + }, + { + "key": "key661", + "messages": [ + "message6662" + ] + }, + { + "key": "key662", + "messages": [ + "message6663" + ] + }, + { + "key": "key663", + "messages": [ + "message6664" + ] + }, + { + "key": "key664", + "messages": [ + "message6665" + ] + }, + { + "key": "key665", + "messages": [ + "message6666" + ] + }, + { + "key": "key666", + "messages": [ + "message6667" + ] + }, + { + "key": "key667", + "messages": [ + "message6668" + ] + }, + { + "key": "key668", + "messages": [ + "message6669" + ] + }, + { + "key": "key669", + "messages": [ + "message6670" + ] + }, + { + "key": "key670", + "messages": [ + "message6671" + ] + }, + { + "key": "key671", + "messages": [ + "message6672" + ] + }, + { + "key": "key672", + "messages": [ + "message6673" + ] + }, + { + "key": "key673", + "messages": [ + "message6674" + ] + }, + { + "key": "key674", + "messages": [ + "message6675" + ] + }, + { + "key": "key675", + "messages": [ + "message6676" + ] + }, + { + "key": "key676", + "messages": [ + "message6677" + ] + }, + { + "key": "key677", + "messages": [ + "message6678" + ] + }, + { + "key": "key678", + "messages": [ + "message6679" + ] + }, + { + "key": "key679", + "messages": [ + "message6680" + ] + }, + { + "key": "key680", + "messages": [ + "message6681" + ] + }, + { + "key": "key681", + "messages": [ + "message6682" + ] + }, + { + "key": "key682", + "messages": [ + "message6683" + ] + }, + { + "key": "key683", + "messages": [ + "message6684" + ] + }, + { + "key": "key684", + "messages": [ + "message6685" + ] + }, + { + "key": "key685", + "messages": [ + "message6686" + ] + }, + { + "key": "key686", + "messages": [ + "message6687" + ] + }, + { + "key": "key687", + "messages": [ + "message6688" + ] + }, + { + "key": "key688", + "messages": [ + "message6689" + ] + }, + { + "key": "key689", + "messages": [ + "message6690" + ] + }, + { + "key": "key690", + "messages": [ + "message6691" + ] + }, + { + "key": "key691", + "messages": [ + "message6692" + ] + }, + { + "key": "key692", + "messages": [ + "message6693" + ] + }, + { + "key": "key693", + "messages": [ + "message6694" + ] + }, + { + "key": "key694", + "messages": [ + "message6695" + ] + }, + { + "key": "key695", + "messages": [ + "message6696" + ] + }, + { + "key": "key696", + "messages": [ + "message6697" + ] + }, + { + "key": "key697", + "messages": [ + "message6698" + ] + }, + { + "key": "key698", + "messages": [ + "message6699" + ] + }, + { + "key": "key699", + "messages": [ + "message6700" + ] + }, + { + "key": "key700", + "messages": [ + "message6701" + ] + }, + { + "key": "key701", + "messages": [ + "message6702" + ] + }, + { + "key": "key702", + "messages": [ + "message6703" + ] + }, + { + "key": "key703", + "messages": [ + "message6704" + ] + }, + { + "key": "key704", + "messages": [ + "message6705" + ] + }, + { + "key": "key705", + "messages": [ + "message6706" + ] + }, + { + "key": "key706", + "messages": [ + "message6707" + ] + }, + { + "key": "key707", + "messages": [ + "message6708" + ] + }, + { + "key": "key708", + "messages": [ + "message6709" + ] + }, + { + "key": "key709", + "messages": [ + "message6710" + ] + }, + { + "key": "key710", + "messages": [ + "message6711" + ] + }, + { + "key": "key711", + "messages": [ + "message6712" + ] + }, + { + "key": "key712", + "messages": [ + "message6713" + ] + }, + { + "key": "key713", + "messages": [ + "message6714" + ] + }, + { + "key": "key714", + "messages": [ + "message6715" + ] + }, + { + "key": "key715", + "messages": [ + "message6716" + ] + }, + { + "key": "key716", + "messages": [ + "message6717" + ] + }, + { + "key": "key717", + "messages": [ + "message6718" + ] + }, + { + "key": "key718", + "messages": [ + "message6719" + ] + }, + { + "key": "key719", + "messages": [ + "message6720" + ] + }, + { + "key": "key720", + "messages": [ + "message6721" + ] + }, + { + "key": "key721", + "messages": [ + "message6722" + ] + }, + { + "key": "key722", + "messages": [ + "message6723" + ] + }, + { + "key": "key723", + "messages": [ + "message6724" + ] + }, + { + "key": "key724", + "messages": [ + "message6725" + ] + }, + { + "key": "key725", + "messages": [ + "message6726" + ] + }, + { + "key": "key726", + "messages": [ + "message6727" + ] + }, + { + "key": "key727", + "messages": [ + "message6728" + ] + }, + { + "key": "key728", + "messages": [ + "message6729" + ] + }, + { + "key": "key729", + "messages": [ + "message6730" + ] + }, + { + "key": "key730", + "messages": [ + "message6731" + ] + }, + { + "key": "key731", + "messages": [ + "message6732" + ] + }, + { + "key": "key732", + "messages": [ + "message6733" + ] + }, + { + "key": "key733", + "messages": [ + "message6734" + ] + }, + { + "key": "key734", + "messages": [ + "message6735" + ] + }, + { + "key": "key735", + "messages": [ + "message6736" + ] + }, + { + "key": "key736", + "messages": [ + "message6737" + ] + }, + { + "key": "key737", + "messages": [ + "message6738" + ] + }, + { + "key": "key738", + "messages": [ + "message6739" + ] + }, + { + "key": "key739", + "messages": [ + "message6740" + ] + }, + { + "key": "key740", + "messages": [ + "message6741" + ] + }, + { + "key": "key741", + "messages": [ + "message6742" + ] + }, + { + "key": "key742", + "messages": [ + "message6743" + ] + }, + { + "key": "key743", + "messages": [ + "message6744" + ] + }, + { + "key": "key744", + "messages": [ + "message6745" + ] + }, + { + "key": "key745", + "messages": [ + "message6746" + ] + }, + { + "key": "key746", + "messages": [ + "message6747" + ] + }, + { + "key": "key747", + "messages": [ + "message6748" + ] + }, + { + "key": "key748", + "messages": [ + "message6749" + ] + }, + { + "key": "key749", + "messages": [ + "message6750" + ] + }, + { + "key": "key750", + "messages": [ + "message6751" + ] + }, + { + "key": "key751", + "messages": [ + "message6752" + ] + }, + { + "key": "key752", + "messages": [ + "message6753" + ] + }, + { + "key": "key753", + "messages": [ + "message6754" + ] + }, + { + "key": "key754", + "messages": [ + "message6755" + ] + }, + { + "key": "key755", + "messages": [ + "message6756" + ] + }, + { + "key": "key756", + "messages": [ + "message6757" + ] + }, + { + "key": "key757", + "messages": [ + "message6758" + ] + }, + { + "key": "key758", + "messages": [ + "message6759" + ] + }, + { + "key": "key759", + "messages": [ + "message6760" + ] + }, + { + "key": "key760", + "messages": [ + "message6761" + ] + }, + { + "key": "key761", + "messages": [ + "message6762" + ] + }, + { + "key": "key762", + "messages": [ + "message6763" + ] + }, + { + "key": "key763", + "messages": [ + "message6764" + ] + }, + { + "key": "key764", + "messages": [ + "message6765" + ] + }, + { + "key": "key765", + "messages": [ + "message6766" + ] + }, + { + "key": "key766", + "messages": [ + "message6767" + ] + }, + { + "key": "key767", + "messages": [ + "message6768" + ] + }, + { + "key": "key768", + "messages": [ + "message6769" + ] + }, + { + "key": "key769", + "messages": [ + "message6770" + ] + }, + { + "key": "key770", + "messages": [ + "message6771" + ] + }, + { + "key": "key771", + "messages": [ + "message6772" + ] + }, + { + "key": "key772", + "messages": [ + "message6773" + ] + }, + { + "key": "key773", + "messages": [ + "message6774" + ] + }, + { + "key": "key774", + "messages": [ + "message6775" + ] + }, + { + "key": "key775", + "messages": [ + "message6776" + ] + }, + { + "key": "key776", + "messages": [ + "message6777" + ] + }, + { + "key": "key777", + "messages": [ + "message6778" + ] + }, + { + "key": "key778", + "messages": [ + "message6779" + ] + }, + { + "key": "key779", + "messages": [ + "message6780" + ] + }, + { + "key": "key780", + "messages": [ + "message6781" + ] + }, + { + "key": "key781", + "messages": [ + "message6782" + ] + }, + { + "key": "key782", + "messages": [ + "message6783" + ] + }, + { + "key": "key783", + "messages": [ + "message6784" + ] + }, + { + "key": "key784", + "messages": [ + "message6785" + ] + }, + { + "key": "key785", + "messages": [ + "message6786" + ] + }, + { + "key": "key786", + "messages": [ + "message6787" + ] + }, + { + "key": "key787", + "messages": [ + "message6788" + ] + }, + { + "key": "key788", + "messages": [ + "message6789" + ] + }, + { + "key": "key789", + "messages": [ + "message6790" + ] + }, + { + "key": "key790", + "messages": [ + "message6791" + ] + }, + { + "key": "key791", + "messages": [ + "message6792" + ] + }, + { + "key": "key792", + "messages": [ + "message6793" + ] + }, + { + "key": "key793", + "messages": [ + "message6794" + ] + }, + { + "key": "key794", + "messages": [ + "message6795" + ] + }, + { + "key": "key795", + "messages": [ + "message6796" + ] + }, + { + "key": "key796", + "messages": [ + "message6797" + ] + }, + { + "key": "key797", + "messages": [ + "message6798" + ] + }, + { + "key": "key798", + "messages": [ + "message6799" + ] + }, + { + "key": "key799", + "messages": [ + "message6800" + ] + }, + { + "key": "key800", + "messages": [ + "message6801" + ] + }, + { + "key": "key801", + "messages": [ + "message6802" + ] + }, + { + "key": "key802", + "messages": [ + "message6803" + ] + }, + { + "key": "key803", + "messages": [ + "message6804" + ] + }, + { + "key": "key804", + "messages": [ + "message6805" + ] + }, + { + "key": "key805", + "messages": [ + "message6806" + ] + }, + { + "key": "key806", + "messages": [ + "message6807" + ] + }, + { + "key": "key807", + "messages": [ + "message6808" + ] + }, + { + "key": "key808", + "messages": [ + "message6809" + ] + }, + { + "key": "key809", + "messages": [ + "message6810" + ] + }, + { + "key": "key810", + "messages": [ + "message6811" + ] + }, + { + "key": "key811", + "messages": [ + "message6812" + ] + }, + { + "key": "key812", + "messages": [ + "message6813" + ] + }, + { + "key": "key813", + "messages": [ + "message6814" + ] + }, + { + "key": "key814", + "messages": [ + "message6815" + ] + }, + { + "key": "key815", + "messages": [ + "message6816" + ] + }, + { + "key": "key816", + "messages": [ + "message6817" + ] + }, + { + "key": "key817", + "messages": [ + "message6818" + ] + }, + { + "key": "key818", + "messages": [ + "message6819" + ] + }, + { + "key": "key819", + "messages": [ + "message6820" + ] + }, + { + "key": "key820", + "messages": [ + "message6821" + ] + }, + { + "key": "key821", + "messages": [ + "message6822" + ] + }, + { + "key": "key822", + "messages": [ + "message6823" + ] + }, + { + "key": "key823", + "messages": [ + "message6824" + ] + }, + { + "key": "key824", + "messages": [ + "message6825" + ] + }, + { + "key": "key825", + "messages": [ + "message6826" + ] + }, + { + "key": "key826", + "messages": [ + "message6827" + ] + }, + { + "key": "key827", + "messages": [ + "message6828" + ] + }, + { + "key": "key828", + "messages": [ + "message6829" + ] + }, + { + "key": "key829", + "messages": [ + "message6830" + ] + }, + { + "key": "key830", + "messages": [ + "message6831" + ] + }, + { + "key": "key831", + "messages": [ + "message6832" + ] + }, + { + "key": "key832", + "messages": [ + "message6833" + ] + }, + { + "key": "key833", + "messages": [ + "message6834" + ] + }, + { + "key": "key834", + "messages": [ + "message6835" + ] + }, + { + "key": "key835", + "messages": [ + "message6836" + ] + }, + { + "key": "key836", + "messages": [ + "message6837" + ] + }, + { + "key": "key837", + "messages": [ + "message6838" + ] + }, + { + "key": "key838", + "messages": [ + "message6839" + ] + }, + { + "key": "key839", + "messages": [ + "message6840" + ] + }, + { + "key": "key840", + "messages": [ + "message6841" + ] + }, + { + "key": "key841", + "messages": [ + "message6842" + ] + }, + { + "key": "key842", + "messages": [ + "message6843" + ] + }, + { + "key": "key843", + "messages": [ + "message6844" + ] + }, + { + "key": "key844", + "messages": [ + "message6845" + ] + }, + { + "key": "key845", + "messages": [ + "message6846" + ] + }, + { + "key": "key846", + "messages": [ + "message6847" + ] + }, + { + "key": "key847", + "messages": [ + "message6848" + ] + }, + { + "key": "key848", + "messages": [ + "message6849" + ] + }, + { + "key": "key849", + "messages": [ + "message6850" + ] + }, + { + "key": "key850", + "messages": [ + "message6851" + ] + }, + { + "key": "key851", + "messages": [ + "message6852" + ] + }, + { + "key": "key852", + "messages": [ + "message6853" + ] + }, + { + "key": "key853", + "messages": [ + "message6854" + ] + }, + { + "key": "key854", + "messages": [ + "message6855" + ] + }, + { + "key": "key855", + "messages": [ + "message6856" + ] + }, + { + "key": "key856", + "messages": [ + "message6857" + ] + }, + { + "key": "key857", + "messages": [ + "message6858" + ] + }, + { + "key": "key858", + "messages": [ + "message6859" + ] + }, + { + "key": "key859", + "messages": [ + "message6860" + ] + }, + { + "key": "key860", + "messages": [ + "message6861" + ] + }, + { + "key": "key861", + "messages": [ + "message6862" + ] + }, + { + "key": "key862", + "messages": [ + "message6863" + ] + }, + { + "key": "key863", + "messages": [ + "message6864" + ] + }, + { + "key": "key864", + "messages": [ + "message6865" + ] + }, + { + "key": "key865", + "messages": [ + "message6866" + ] + }, + { + "key": "key866", + "messages": [ + "message6867" + ] + }, + { + "key": "key867", + "messages": [ + "message6868" + ] + }, + { + "key": "key868", + "messages": [ + "message6869" + ] + }, + { + "key": "key869", + "messages": [ + "message6870" + ] + }, + { + "key": "key870", + "messages": [ + "message6871" + ] + }, + { + "key": "key871", + "messages": [ + "message6872" + ] + }, + { + "key": "key872", + "messages": [ + "message6873" + ] + }, + { + "key": "key873", + "messages": [ + "message6874" + ] + }, + { + "key": "key874", + "messages": [ + "message6875" + ] + }, + { + "key": "key875", + "messages": [ + "message6876" + ] + }, + { + "key": "key876", + "messages": [ + "message6877" + ] + }, + { + "key": "key877", + "messages": [ + "message6878" + ] + }, + { + "key": "key878", + "messages": [ + "message6879" + ] + }, + { + "key": "key879", + "messages": [ + "message6880" + ] + }, + { + "key": "key880", + "messages": [ + "message6881" + ] + }, + { + "key": "key881", + "messages": [ + "message6882" + ] + }, + { + "key": "key882", + "messages": [ + "message6883" + ] + }, + { + "key": "key883", + "messages": [ + "message6884" + ] + }, + { + "key": "key884", + "messages": [ + "message6885" + ] + }, + { + "key": "key885", + "messages": [ + "message6886" + ] + }, + { + "key": "key886", + "messages": [ + "message6887" + ] + }, + { + "key": "key887", + "messages": [ + "message6888" + ] + }, + { + "key": "key888", + "messages": [ + "message6889" + ] + }, + { + "key": "key889", + "messages": [ + "message6890" + ] + }, + { + "key": "key890", + "messages": [ + "message6891" + ] + }, + { + "key": "key891", + "messages": [ + "message6892" + ] + }, + { + "key": "key892", + "messages": [ + "message6893" + ] + }, + { + "key": "key893", + "messages": [ + "message6894" + ] + }, + { + "key": "key894", + "messages": [ + "message6895" + ] + }, + { + "key": "key895", + "messages": [ + "message6896" + ] + }, + { + "key": "key896", + "messages": [ + "message6897" + ] + }, + { + "key": "key897", + "messages": [ + "message6898" + ] + }, + { + "key": "key898", + "messages": [ + "message6899" + ] + }, + { + "key": "key899", + "messages": [ + "message6900" + ] + }, + { + "key": "key900", + "messages": [ + "message6901" + ] + }, + { + "key": "key901", + "messages": [ + "message6902" + ] + }, + { + "key": "key902", + "messages": [ + "message6903" + ] + }, + { + "key": "key903", + "messages": [ + "message6904" + ] + }, + { + "key": "key904", + "messages": [ + "message6905" + ] + }, + { + "key": "key905", + "messages": [ + "message6906" + ] + }, + { + "key": "key906", + "messages": [ + "message6907" + ] + }, + { + "key": "key907", + "messages": [ + "message6908" + ] + }, + { + "key": "key908", + "messages": [ + "message6909" + ] + }, + { + "key": "key909", + "messages": [ + "message6910" + ] + }, + { + "key": "key910", + "messages": [ + "message6911" + ] + }, + { + "key": "key911", + "messages": [ + "message6912" + ] + }, + { + "key": "key912", + "messages": [ + "message6913" + ] + }, + { + "key": "key913", + "messages": [ + "message6914" + ] + }, + { + "key": "key914", + "messages": [ + "message6915" + ] + }, + { + "key": "key915", + "messages": [ + "message6916" + ] + }, + { + "key": "key916", + "messages": [ + "message6917" + ] + }, + { + "key": "key917", + "messages": [ + "message6918" + ] + }, + { + "key": "key918", + "messages": [ + "message6919" + ] + }, + { + "key": "key919", + "messages": [ + "message6920" + ] + }, + { + "key": "key920", + "messages": [ + "message6921" + ] + }, + { + "key": "key921", + "messages": [ + "message6922" + ] + }, + { + "key": "key922", + "messages": [ + "message6923" + ] + }, + { + "key": "key923", + "messages": [ + "message6924" + ] + }, + { + "key": "key924", + "messages": [ + "message6925" + ] + }, + { + "key": "key925", + "messages": [ + "message6926" + ] + }, + { + "key": "key926", + "messages": [ + "message6927" + ] + }, + { + "key": "key927", + "messages": [ + "message6928" + ] + }, + { + "key": "key928", + "messages": [ + "message6929" + ] + }, + { + "key": "key929", + "messages": [ + "message6930" + ] + }, + { + "key": "key930", + "messages": [ + "message6931" + ] + }, + { + "key": "key931", + "messages": [ + "message6932" + ] + }, + { + "key": "key932", + "messages": [ + "message6933" + ] + }, + { + "key": "key933", + "messages": [ + "message6934" + ] + }, + { + "key": "key934", + "messages": [ + "message6935" + ] + }, + { + "key": "key935", + "messages": [ + "message6936" + ] + }, + { + "key": "key936", + "messages": [ + "message6937" + ] + }, + { + "key": "key937", + "messages": [ + "message6938" + ] + }, + { + "key": "key938", + "messages": [ + "message6939" + ] + }, + { + "key": "key939", + "messages": [ + "message6940" + ] + }, + { + "key": "key940", + "messages": [ + "message6941" + ] + }, + { + "key": "key941", + "messages": [ + "message6942" + ] + }, + { + "key": "key942", + "messages": [ + "message6943" + ] + }, + { + "key": "key943", + "messages": [ + "message6944" + ] + }, + { + "key": "key944", + "messages": [ + "message6945" + ] + }, + { + "key": "key945", + "messages": [ + "message6946" + ] + }, + { + "key": "key946", + "messages": [ + "message6947" + ] + }, + { + "key": "key947", + "messages": [ + "message6948" + ] + }, + { + "key": "key948", + "messages": [ + "message6949" + ] + }, + { + "key": "key949", + "messages": [ + "message6950" + ] + }, + { + "key": "key950", + "messages": [ + "message6951" + ] + }, + { + "key": "key951", + "messages": [ + "message6952" + ] + }, + { + "key": "key952", + "messages": [ + "message6953" + ] + }, + { + "key": "key953", + "messages": [ + "message6954" + ] + }, + { + "key": "key954", + "messages": [ + "message6955" + ] + }, + { + "key": "key955", + "messages": [ + "message6956" + ] + }, + { + "key": "key956", + "messages": [ + "message6957" + ] + }, + { + "key": "key957", + "messages": [ + "message6958" + ] + }, + { + "key": "key958", + "messages": [ + "message6959" + ] + }, + { + "key": "key959", + "messages": [ + "message6960" + ] + }, + { + "key": "key960", + "messages": [ + "message6961" + ] + }, + { + "key": "key961", + "messages": [ + "message6962" + ] + }, + { + "key": "key962", + "messages": [ + "message6963" + ] + }, + { + "key": "key963", + "messages": [ + "message6964" + ] + }, + { + "key": "key964", + "messages": [ + "message6965" + ] + }, + { + "key": "key965", + "messages": [ + "message6966" + ] + }, + { + "key": "key966", + "messages": [ + "message6967" + ] + }, + { + "key": "key967", + "messages": [ + "message6968" + ] + }, + { + "key": "key968", + "messages": [ + "message6969" + ] + }, + { + "key": "key969", + "messages": [ + "message6970" + ] + }, + { + "key": "key970", + "messages": [ + "message6971" + ] + }, + { + "key": "key971", + "messages": [ + "message6972" + ] + }, + { + "key": "key972", + "messages": [ + "message6973" + ] + }, + { + "key": "key973", + "messages": [ + "message6974" + ] + }, + { + "key": "key974", + "messages": [ + "message6975" + ] + }, + { + "key": "key975", + "messages": [ + "message6976" + ] + }, + { + "key": "key976", + "messages": [ + "message6977" + ] + }, + { + "key": "key977", + "messages": [ + "message6978" + ] + }, + { + "key": "key978", + "messages": [ + "message6979" + ] + }, + { + "key": "key979", + "messages": [ + "message6980" + ] + }, + { + "key": "key980", + "messages": [ + "message6981" + ] + }, + { + "key": "key981", + "messages": [ + "message6982" + ] + }, + { + "key": "key982", + "messages": [ + "message6983" + ] + }, + { + "key": "key983", + "messages": [ + "message6984" + ] + }, + { + "key": "key984", + "messages": [ + "message6985" + ] + }, + { + "key": "key985", + "messages": [ + "message6986" + ] + }, + { + "key": "key986", + "messages": [ + "message6987" + ] + }, + { + "key": "key987", + "messages": [ + "message6988" + ] + }, + { + "key": "key988", + "messages": [ + "message6989" + ] + }, + { + "key": "key989", + "messages": [ + "message6990" + ] + }, + { + "key": "key990", + "messages": [ + "message6991" + ] + }, + { + "key": "key991", + "messages": [ + "message6992" + ] + }, + { + "key": "key992", + "messages": [ + "message6993" + ] + }, + { + "key": "key993", + "messages": [ + "message6994" + ] + }, + { + "key": "key994", + "messages": [ + "message6995" + ] + }, + { + "key": "key995", + "messages": [ + "message6996" + ] + }, + { + "key": "key996", + "messages": [ + "message6997" + ] + }, + { + "key": "key997", + "messages": [ + "message6998" + ] + }, + { + "key": "key998", + "messages": [ + "message6999" + ] + }, + { + "key": "key999", + "messages": [ + "message7000" + ] + }, + { + "key": "key1000", + "messages": [ + "message7001" + ] + }, + { + "key": "key1001", + "messages": [ + "message7002" + ] + }, + { + "key": "key1002", + "messages": [ + "message7003" + ] + }, + { + "key": "key1003", + "messages": [ + "message7004" + ] + }, + { + "key": "key1004", + "messages": [ + "message7005" + ] + }, + { + "key": "key1005", + "messages": [ + "message7006" + ] + }, + { + "key": "key1006", + "messages": [ + "message7007" + ] + }, + { + "key": "key1007", + "messages": [ + "message7008" + ] + }, + { + "key": "key1008", + "messages": [ + "message7009" + ] + }, + { + "key": "key1009", + "messages": [ + "message7010" + ] + }, + { + "key": "key1010", + "messages": [ + "message7011" + ] + }, + { + "key": "key1011", + "messages": [ + "message7012" + ] + }, + { + "key": "key1012", + "messages": [ + "message7013" + ] + }, + { + "key": "key1013", + "messages": [ + "message7014" + ] + }, + { + "key": "key1014", + "messages": [ + "message7015" + ] + }, + { + "key": "key1015", + "messages": [ + "message7016" + ] + }, + { + "key": "key1016", + "messages": [ + "message7017" + ] + }, + { + "key": "key1017", + "messages": [ + "message7018" + ] + }, + { + "key": "key1018", + "messages": [ + "message7019" + ] + }, + { + "key": "key1019", + "messages": [ + "message7020" + ] + }, + { + "key": "key1020", + "messages": [ + "message7021" + ] + }, + { + "key": "key1021", + "messages": [ + "message7022" + ] + }, + { + "key": "key1022", + "messages": [ + "message7023" + ] + }, + { + "key": "key1023", + "messages": [ + "message7024" + ] + }, + { + "key": "key1024", + "messages": [ + "message7025" + ] + }, + { + "key": "key1025", + "messages": [ + "message7026" + ] + }, + { + "key": "key1026", + "messages": [ + "message7027" + ] + }, + { + "key": "key1027", + "messages": [ + "message7028" + ] + }, + { + "key": "key1028", + "messages": [ + "message7029" + ] + }, + { + "key": "key1029", + "messages": [ + "message7030" + ] + }, + { + "key": "key1030", + "messages": [ + "message7031" + ] + }, + { + "key": "key1031", + "messages": [ + "message7032" + ] + }, + { + "key": "key1032", + "messages": [ + "message7033" + ] + }, + { + "key": "key1033", + "messages": [ + "message7034" + ] + }, + { + "key": "key1034", + "messages": [ + "message7035" + ] + }, + { + "key": "key1035", + "messages": [ + "message7036" + ] + }, + { + "key": "key1036", + "messages": [ + "message7037" + ] + }, + { + "key": "key1037", + "messages": [ + "message7038" + ] + }, + { + "key": "key1038", + "messages": [ + "message7039" + ] + }, + { + "key": "key1039", + "messages": [ + "message7040" + ] + }, + { + "key": "key1040", + "messages": [ + "message7041" + ] + }, + { + "key": "key1041", + "messages": [ + "message7042" + ] + }, + { + "key": "key1042", + "messages": [ + "message7043" + ] + }, + { + "key": "key1043", + "messages": [ + "message7044" + ] + }, + { + "key": "key1044", + "messages": [ + "message7045" + ] + }, + { + "key": "key1045", + "messages": [ + "message7046" + ] + }, + { + "key": "key1046", + "messages": [ + "message7047" + ] + }, + { + "key": "key1047", + "messages": [ + "message7048" + ] + }, + { + "key": "key1048", + "messages": [ + "message7049" + ] + }, + { + "key": "key1049", + "messages": [ + "message7050" + ] + }, + { + "key": "key1050", + "messages": [ + "message7051" + ] + }, + { + "key": "key1051", + "messages": [ + "message7052" + ] + }, + { + "key": "key1052", + "messages": [ + "message7053" + ] + }, + { + "key": "key1053", + "messages": [ + "message7054" + ] + }, + { + "key": "key1054", + "messages": [ + "message7055" + ] + }, + { + "key": "key1055", + "messages": [ + "message7056" + ] + }, + { + "key": "key1056", + "messages": [ + "message7057" + ] + }, + { + "key": "key1057", + "messages": [ + "message7058" + ] + }, + { + "key": "key1058", + "messages": [ + "message7059" + ] + }, + { + "key": "key1059", + "messages": [ + "message7060" + ] + }, + { + "key": "key1060", + "messages": [ + "message7061" + ] + }, + { + "key": "key1061", + "messages": [ + "message7062" + ] + }, + { + "key": "key1062", + "messages": [ + "message7063" + ] + }, + { + "key": "key1063", + "messages": [ + "message7064" + ] + }, + { + "key": "key1064", + "messages": [ + "message7065" + ] + }, + { + "key": "key1065", + "messages": [ + "message7066" + ] + }, + { + "key": "key1066", + "messages": [ + "message7067" + ] + }, + { + "key": "key1067", + "messages": [ + "message7068" + ] + }, + { + "key": "key1068", + "messages": [ + "message7069" + ] + }, + { + "key": "key1069", + "messages": [ + "message7070" + ] + }, + { + "key": "key1070", + "messages": [ + "message7071" + ] + }, + { + "key": "key1071", + "messages": [ + "message7072" + ] + }, + { + "key": "key1072", + "messages": [ + "message7073" + ] + }, + { + "key": "key1073", + "messages": [ + "message7074" + ] + }, + { + "key": "key1074", + "messages": [ + "message7075" + ] + }, + { + "key": "key1075", + "messages": [ + "message7076" + ] + }, + { + "key": "key1076", + "messages": [ + "message7077" + ] + }, + { + "key": "key1077", + "messages": [ + "message7078" + ] + }, + { + "key": "key1078", + "messages": [ + "message7079" + ] + }, + { + "key": "key1079", + "messages": [ + "message7080" + ] + }, + { + "key": "key1080", + "messages": [ + "message7081" + ] + }, + { + "key": "key1081", + "messages": [ + "message7082" + ] + }, + { + "key": "key1082", + "messages": [ + "message7083" + ] + }, + { + "key": "key1083", + "messages": [ + "message7084" + ] + }, + { + "key": "key1084", + "messages": [ + "message7085" + ] + }, + { + "key": "key1085", + "messages": [ + "message7086" + ] + }, + { + "key": "key1086", + "messages": [ + "message7087" + ] + }, + { + "key": "key1087", + "messages": [ + "message7088" + ] + }, + { + "key": "key1088", + "messages": [ + "message7089" + ] + }, + { + "key": "key1089", + "messages": [ + "message7090" + ] + }, + { + "key": "key1090", + "messages": [ + "message7091" + ] + }, + { + "key": "key1091", + "messages": [ + "message7092" + ] + }, + { + "key": "key1092", + "messages": [ + "message7093" + ] + }, + { + "key": "key1093", + "messages": [ + "message7094" + ] + }, + { + "key": "key1094", + "messages": [ + "message7095" + ] + }, + { + "key": "key1095", + "messages": [ + "message7096" + ] + }, + { + "key": "key1096", + "messages": [ + "message7097" + ] + }, + { + "key": "key1097", + "messages": [ + "message7098" + ] + }, + { + "key": "key1098", + "messages": [ + "message7099" + ] + }, + { + "key": "key1099", + "messages": [ + "message7100" + ] + }, + { + "key": "key1100", + "messages": [ + "message7101" + ] + }, + { + "key": "key1101", + "messages": [ + "message7102" + ] + }, + { + "key": "key1102", + "messages": [ + "message7103" + ] + }, + { + "key": "key1103", + "messages": [ + "message7104" + ] + }, + { + "key": "key1104", + "messages": [ + "message7105" + ] + }, + { + "key": "key1105", + "messages": [ + "message7106" + ] + }, + { + "key": "key1106", + "messages": [ + "message7107" + ] + }, + { + "key": "key1107", + "messages": [ + "message7108" + ] + }, + { + "key": "key1108", + "messages": [ + "message7109" + ] + }, + { + "key": "key1109", + "messages": [ + "message7110" + ] + }, + { + "key": "key1110", + "messages": [ + "message7111" + ] + }, + { + "key": "key1111", + "messages": [ + "message7112" + ] + }, + { + "key": "key1112", + "messages": [ + "message7113" + ] + }, + { + "key": "key1113", + "messages": [ + "message7114" + ] + }, + { + "key": "key1114", + "messages": [ + "message7115" + ] + }, + { + "key": "key1115", + "messages": [ + "message7116" + ] + }, + { + "key": "key1116", + "messages": [ + "message7117" + ] + }, + { + "key": "key1117", + "messages": [ + "message7118" + ] + }, + { + "key": "key1118", + "messages": [ + "message7119" + ] + }, + { + "key": "key1119", + "messages": [ + "message7120" + ] + }, + { + "key": "key1120", + "messages": [ + "message7121" + ] + }, + { + "key": "key1121", + "messages": [ + "message7122" + ] + }, + { + "key": "key1122", + "messages": [ + "message7123" + ] + }, + { + "key": "key1123", + "messages": [ + "message7124" + ] + }, + { + "key": "key1124", + "messages": [ + "message7125" + ] + }, + { + "key": "key1125", + "messages": [ + "message7126" + ] + }, + { + "key": "key1126", + "messages": [ + "message7127" + ] + }, + { + "key": "key1127", + "messages": [ + "message7128" + ] + }, + { + "key": "key1128", + "messages": [ + "message7129" + ] + }, + { + "key": "key1129", + "messages": [ + "message7130" + ] + }, + { + "key": "key1130", + "messages": [ + "message7131" + ] + }, + { + "key": "key1131", + "messages": [ + "message7132" + ] + }, + { + "key": "key1132", + "messages": [ + "message7133" + ] + }, + { + "key": "key1133", + "messages": [ + "message7134" + ] + }, + { + "key": "key1134", + "messages": [ + "message7135" + ] + }, + { + "key": "key1135", + "messages": [ + "message7136" + ] + }, + { + "key": "key1136", + "messages": [ + "message7137" + ] + }, + { + "key": "key1137", + "messages": [ + "message7138" + ] + }, + { + "key": "key1138", + "messages": [ + "message7139" + ] + }, + { + "key": "key1139", + "messages": [ + "message7140" + ] + }, + { + "key": "key1140", + "messages": [ + "message7141" + ] + }, + { + "key": "key1141", + "messages": [ + "message7142" + ] + }, + { + "key": "key1142", + "messages": [ + "message7143" + ] + }, + { + "key": "key1143", + "messages": [ + "message7144" + ] + }, + { + "key": "key1144", + "messages": [ + "message7145" + ] + }, + { + "key": "key1145", + "messages": [ + "message7146" + ] + }, + { + "key": "key1146", + "messages": [ + "message7147" + ] + }, + { + "key": "key1147", + "messages": [ + "message7148" + ] + }, + { + "key": "key1148", + "messages": [ + "message7149" + ] + }, + { + "key": "key1149", + "messages": [ + "message7150" + ] + }, + { + "key": "key1150", + "messages": [ + "message7151" + ] + }, + { + "key": "key1151", + "messages": [ + "message7152" + ] + }, + { + "key": "key1152", + "messages": [ + "message7153" + ] + }, + { + "key": "key1153", + "messages": [ + "message7154" + ] + }, + { + "key": "key1154", + "messages": [ + "message7155" + ] + }, + { + "key": "key1155", + "messages": [ + "message7156" + ] + }, + { + "key": "key1156", + "messages": [ + "message7157" + ] + }, + { + "key": "key1157", + "messages": [ + "message7158" + ] + }, + { + "key": "key1158", + "messages": [ + "message7159" + ] + }, + { + "key": "key1159", + "messages": [ + "message7160" + ] + }, + { + "key": "key1160", + "messages": [ + "message7161" + ] + }, + { + "key": "key1161", + "messages": [ + "message7162" + ] + }, + { + "key": "key1162", + "messages": [ + "message7163" + ] + }, + { + "key": "key1163", + "messages": [ + "message7164" + ] + }, + { + "key": "key1164", + "messages": [ + "message7165" + ] + }, + { + "key": "key1165", + "messages": [ + "message7166" + ] + }, + { + "key": "key1166", + "messages": [ + "message7167" + ] + }, + { + "key": "key1167", + "messages": [ + "message7168" + ] + }, + { + "key": "key1168", + "messages": [ + "message7169" + ] + }, + { + "key": "key1169", + "messages": [ + "message7170" + ] + }, + { + "key": "key1170", + "messages": [ + "message7171" + ] + }, + { + "key": "key1171", + "messages": [ + "message7172" + ] + }, + { + "key": "key1172", + "messages": [ + "message7173" + ] + }, + { + "key": "key1173", + "messages": [ + "message7174" + ] + }, + { + "key": "key1174", + "messages": [ + "message7175" + ] + }, + { + "key": "key1175", + "messages": [ + "message7176" + ] + }, + { + "key": "key1176", + "messages": [ + "message7177" + ] + }, + { + "key": "key1177", + "messages": [ + "message7178" + ] + }, + { + "key": "key1178", + "messages": [ + "message7179" + ] + }, + { + "key": "key1179", + "messages": [ + "message7180" + ] + }, + { + "key": "key1180", + "messages": [ + "message7181" + ] + }, + { + "key": "key1181", + "messages": [ + "message7182" + ] + }, + { + "key": "key1182", + "messages": [ + "message7183" + ] + }, + { + "key": "key1183", + "messages": [ + "message7184" + ] + }, + { + "key": "key1184", + "messages": [ + "message7185" + ] + }, + { + "key": "key1185", + "messages": [ + "message7186" + ] + }, + { + "key": "key1186", + "messages": [ + "message7187" + ] + }, + { + "key": "key1187", + "messages": [ + "message7188" + ] + }, + { + "key": "key1188", + "messages": [ + "message7189" + ] + }, + { + "key": "key1189", + "messages": [ + "message7190" + ] + }, + { + "key": "key1190", + "messages": [ + "message7191" + ] + }, + { + "key": "key1191", + "messages": [ + "message7192" + ] + }, + { + "key": "key1192", + "messages": [ + "message7193" + ] + }, + { + "key": "key1193", + "messages": [ + "message7194" + ] + }, + { + "key": "key1194", + "messages": [ + "message7195" + ] + }, + { + "key": "key1195", + "messages": [ + "message7196" + ] + }, + { + "key": "key1196", + "messages": [ + "message7197" + ] + }, + { + "key": "key1197", + "messages": [ + "message7198" + ] + }, + { + "key": "key1198", + "messages": [ + "message7199" + ] + }, + { + "key": "key1199", + "messages": [ + "message7200" + ] + }, + { + "key": "key1200", + "messages": [ + "message7201" + ] + }, + { + "key": "key1201", + "messages": [ + "message7202" + ] + }, + { + "key": "key1202", + "messages": [ + "message7203" + ] + }, + { + "key": "key1203", + "messages": [ + "message7204" + ] + }, + { + "key": "key1204", + "messages": [ + "message7205" + ] + }, + { + "key": "key1205", + "messages": [ + "message7206" + ] + }, + { + "key": "key1206", + "messages": [ + "message7207" + ] + }, + { + "key": "key1207", + "messages": [ + "message7208" + ] + }, + { + "key": "key1208", + "messages": [ + "message7209" + ] + }, + { + "key": "key1209", + "messages": [ + "message7210" + ] + }, + { + "key": "key1210", + "messages": [ + "message7211" + ] + }, + { + "key": "key1211", + "messages": [ + "message7212" + ] + }, + { + "key": "key1212", + "messages": [ + "message7213" + ] + }, + { + "key": "key1213", + "messages": [ + "message7214" + ] + }, + { + "key": "key1214", + "messages": [ + "message7215" + ] + }, + { + "key": "key1215", + "messages": [ + "message7216" + ] + }, + { + "key": "key1216", + "messages": [ + "message7217" + ] + }, + { + "key": "key1217", + "messages": [ + "message7218" + ] + }, + { + "key": "key1218", + "messages": [ + "message7219" + ] + }, + { + "key": "key1219", + "messages": [ + "message7220" + ] + }, + { + "key": "key1220", + "messages": [ + "message7221" + ] + }, + { + "key": "key1221", + "messages": [ + "message7222" + ] + }, + { + "key": "key1222", + "messages": [ + "message7223" + ] + }, + { + "key": "key1223", + "messages": [ + "message7224" + ] + }, + { + "key": "key1224", + "messages": [ + "message7225" + ] + }, + { + "key": "key1225", + "messages": [ + "message7226" + ] + }, + { + "key": "key1226", + "messages": [ + "message7227" + ] + }, + { + "key": "key1227", + "messages": [ + "message7228" + ] + }, + { + "key": "key1228", + "messages": [ + "message7229" + ] + }, + { + "key": "key1229", + "messages": [ + "message7230" + ] + }, + { + "key": "key1230", + "messages": [ + "message7231" + ] + }, + { + "key": "key1231", + "messages": [ + "message7232" + ] + }, + { + "key": "key1232", + "messages": [ + "message7233" + ] + }, + { + "key": "key1233", + "messages": [ + "message7234" + ] + }, + { + "key": "key1234", + "messages": [ + "message7235" + ] + }, + { + "key": "key1235", + "messages": [ + "message7236" + ] + }, + { + "key": "key1236", + "messages": [ + "message7237" + ] + }, + { + "key": "key1237", + "messages": [ + "message7238" + ] + }, + { + "key": "key1238", + "messages": [ + "message7239" + ] + }, + { + "key": "key1239", + "messages": [ + "message7240" + ] + }, + { + "key": "key1240", + "messages": [ + "message7241" + ] + }, + { + "key": "key1241", + "messages": [ + "message7242" + ] + }, + { + "key": "key1242", + "messages": [ + "message7243" + ] + }, + { + "key": "key1243", + "messages": [ + "message7244" + ] + }, + { + "key": "key1244", + "messages": [ + "message7245" + ] + }, + { + "key": "key1245", + "messages": [ + "message7246" + ] + }, + { + "key": "key1246", + "messages": [ + "message7247" + ] + }, + { + "key": "key1247", + "messages": [ + "message7248" + ] + }, + { + "key": "key1248", + "messages": [ + "message7249" + ] + }, + { + "key": "key1249", + "messages": [ + "message7250" + ] + }, + { + "key": "key1250", + "messages": [ + "message7251" + ] + }, + { + "key": "key1251", + "messages": [ + "message7252" + ] + }, + { + "key": "key1252", + "messages": [ + "message7253" + ] + }, + { + "key": "key1253", + "messages": [ + "message7254" + ] + }, + { + "key": "key1254", + "messages": [ + "message7255" + ] + }, + { + "key": "key1255", + "messages": [ + "message7256" + ] + }, + { + "key": "key1256", + "messages": [ + "message7257" + ] + }, + { + "key": "key1257", + "messages": [ + "message7258" + ] + }, + { + "key": "key1258", + "messages": [ + "message7259" + ] + }, + { + "key": "key1259", + "messages": [ + "message7260" + ] + }, + { + "key": "key1260", + "messages": [ + "message7261" + ] + }, + { + "key": "key1261", + "messages": [ + "message7262" + ] + }, + { + "key": "key1262", + "messages": [ + "message7263" + ] + }, + { + "key": "key1263", + "messages": [ + "message7264" + ] + }, + { + "key": "key1264", + "messages": [ + "message7265" + ] + }, + { + "key": "key1265", + "messages": [ + "message7266" + ] + }, + { + "key": "key1266", + "messages": [ + "message7267" + ] + }, + { + "key": "key1267", + "messages": [ + "message7268" + ] + }, + { + "key": "key1268", + "messages": [ + "message7269" + ] + }, + { + "key": "key1269", + "messages": [ + "message7270" + ] + }, + { + "key": "key1270", + "messages": [ + "message7271" + ] + }, + { + "key": "key1271", + "messages": [ + "message7272" + ] + }, + { + "key": "key1272", + "messages": [ + "message7273" + ] + }, + { + "key": "key1273", + "messages": [ + "message7274" + ] + }, + { + "key": "key1274", + "messages": [ + "message7275" + ] + }, + { + "key": "key1275", + "messages": [ + "message7276" + ] + }, + { + "key": "key1276", + "messages": [ + "message7277" + ] + }, + { + "key": "key1277", + "messages": [ + "message7278" + ] + }, + { + "key": "key1278", + "messages": [ + "message7279" + ] + }, + { + "key": "key1279", + "messages": [ + "message7280" + ] + }, + { + "key": "key1280", + "messages": [ + "message7281" + ] + }, + { + "key": "key1281", + "messages": [ + "message7282" + ] + }, + { + "key": "key1282", + "messages": [ + "message7283" + ] + }, + { + "key": "key1283", + "messages": [ + "message7284" + ] + }, + { + "key": "key1284", + "messages": [ + "message7285" + ] + }, + { + "key": "key1285", + "messages": [ + "message7286" + ] + }, + { + "key": "key1286", + "messages": [ + "message7287" + ] + }, + { + "key": "key1287", + "messages": [ + "message7288" + ] + }, + { + "key": "key1288", + "messages": [ + "message7289" + ] + }, + { + "key": "key1289", + "messages": [ + "message7290" + ] + }, + { + "key": "key1290", + "messages": [ + "message7291" + ] + }, + { + "key": "key1291", + "messages": [ + "message7292" + ] + }, + { + "key": "key1292", + "messages": [ + "message7293" + ] + }, + { + "key": "key1293", + "messages": [ + "message7294" + ] + }, + { + "key": "key1294", + "messages": [ + "message7295" + ] + }, + { + "key": "key1295", + "messages": [ + "message7296" + ] + }, + { + "key": "key1296", + "messages": [ + "message7297" + ] + }, + { + "key": "key1297", + "messages": [ + "message7298" + ] + }, + { + "key": "key1298", + "messages": [ + "message7299" + ] + }, + { + "key": "key1299", + "messages": [ + "message7300" + ] + }, + { + "key": "key1300", + "messages": [ + "message7301" + ] + }, + { + "key": "key1301", + "messages": [ + "message7302" + ] + }, + { + "key": "key1302", + "messages": [ + "message7303" + ] + }, + { + "key": "key1303", + "messages": [ + "message7304" + ] + }, + { + "key": "key1304", + "messages": [ + "message7305" + ] + }, + { + "key": "key1305", + "messages": [ + "message7306" + ] + }, + { + "key": "key1306", + "messages": [ + "message7307" + ] + }, + { + "key": "key1307", + "messages": [ + "message7308" + ] + }, + { + "key": "key1308", + "messages": [ + "message7309" + ] + }, + { + "key": "key1309", + "messages": [ + "message7310" + ] + }, + { + "key": "key1310", + "messages": [ + "message7311" + ] + }, + { + "key": "key1311", + "messages": [ + "message7312" + ] + }, + { + "key": "key1312", + "messages": [ + "message7313" + ] + }, + { + "key": "key1313", + "messages": [ + "message7314" + ] + }, + { + "key": "key1314", + "messages": [ + "message7315" + ] + }, + { + "key": "key1315", + "messages": [ + "message7316" + ] + }, + { + "key": "key1316", + "messages": [ + "message7317" + ] + }, + { + "key": "key1317", + "messages": [ + "message7318" + ] + }, + { + "key": "key1318", + "messages": [ + "message7319" + ] + }, + { + "key": "key1319", + "messages": [ + "message7320" + ] + }, + { + "key": "key1320", + "messages": [ + "message7321" + ] + }, + { + "key": "key1321", + "messages": [ + "message7322" + ] + }, + { + "key": "key1322", + "messages": [ + "message7323" + ] + }, + { + "key": "key1323", + "messages": [ + "message7324" + ] + }, + { + "key": "key1324", + "messages": [ + "message7325" + ] + }, + { + "key": "key1325", + "messages": [ + "message7326" + ] + }, + { + "key": "key1326", + "messages": [ + "message7327" + ] + }, + { + "key": "key1327", + "messages": [ + "message7328" + ] + }, + { + "key": "key1328", + "messages": [ + "message7329" + ] + }, + { + "key": "key1329", + "messages": [ + "message7330" + ] + }, + { + "key": "key1330", + "messages": [ + "message7331" + ] + }, + { + "key": "key1331", + "messages": [ + "message7332" + ] + }, + { + "key": "key1332", + "messages": [ + "message7333" + ] + }, + { + "key": "key1333", + "messages": [ + "message7334" + ] + }, + { + "key": "key1334", + "messages": [ + "message7335" + ] + }, + { + "key": "key1335", + "messages": [ + "message7336" + ] + }, + { + "key": "key1336", + "messages": [ + "message7337" + ] + }, + { + "key": "key1337", + "messages": [ + "message7338" + ] + }, + { + "key": "key1338", + "messages": [ + "message7339" + ] + }, + { + "key": "key1339", + "messages": [ + "message7340" + ] + }, + { + "key": "key1340", + "messages": [ + "message7341" + ] + }, + { + "key": "key1341", + "messages": [ + "message7342" + ] + }, + { + "key": "key1342", + "messages": [ + "message7343" + ] + }, + { + "key": "key1343", + "messages": [ + "message7344" + ] + }, + { + "key": "key1344", + "messages": [ + "message7345" + ] + }, + { + "key": "key1345", + "messages": [ + "message7346" + ] + }, + { + "key": "key1346", + "messages": [ + "message7347" + ] + }, + { + "key": "key1347", + "messages": [ + "message7348" + ] + }, + { + "key": "key1348", + "messages": [ + "message7349" + ] + }, + { + "key": "key1349", + "messages": [ + "message7350" + ] + }, + { + "key": "key1350", + "messages": [ + "message7351" + ] + }, + { + "key": "key1351", + "messages": [ + "message7352" + ] + }, + { + "key": "key1352", + "messages": [ + "message7353" + ] + }, + { + "key": "key1353", + "messages": [ + "message7354" + ] + }, + { + "key": "key1354", + "messages": [ + "message7355" + ] + }, + { + "key": "key1355", + "messages": [ + "message7356" + ] + }, + { + "key": "key1356", + "messages": [ + "message7357" + ] + }, + { + "key": "key1357", + "messages": [ + "message7358" + ] + }, + { + "key": "key1358", + "messages": [ + "message7359" + ] + }, + { + "key": "key1359", + "messages": [ + "message7360" + ] + }, + { + "key": "key1360", + "messages": [ + "message7361" + ] + }, + { + "key": "key1361", + "messages": [ + "message7362" + ] + }, + { + "key": "key1362", + "messages": [ + "message7363" + ] + }, + { + "key": "key1363", + "messages": [ + "message7364" + ] + }, + { + "key": "key1364", + "messages": [ + "message7365" + ] + }, + { + "key": "key1365", + "messages": [ + "message7366" + ] + }, + { + "key": "key1366", + "messages": [ + "message7367" + ] + }, + { + "key": "key1367", + "messages": [ + "message7368" + ] + }, + { + "key": "key1368", + "messages": [ + "message7369" + ] + }, + { + "key": "key1369", + "messages": [ + "message7370" + ] + }, + { + "key": "key1370", + "messages": [ + "message7371" + ] + }, + { + "key": "key1371", + "messages": [ + "message7372" + ] + }, + { + "key": "key1372", + "messages": [ + "message7373" + ] + }, + { + "key": "key1373", + "messages": [ + "message7374" + ] + }, + { + "key": "key1374", + "messages": [ + "message7375" + ] + }, + { + "key": "key1375", + "messages": [ + "message7376" + ] + }, + { + "key": "key1376", + "messages": [ + "message7377" + ] + }, + { + "key": "key1377", + "messages": [ + "message7378" + ] + }, + { + "key": "key1378", + "messages": [ + "message7379" + ] + }, + { + "key": "key1379", + "messages": [ + "message7380" + ] + }, + { + "key": "key1380", + "messages": [ + "message7381" + ] + }, + { + "key": "key1381", + "messages": [ + "message7382" + ] + }, + { + "key": "key1382", + "messages": [ + "message7383" + ] + }, + { + "key": "key1383", + "messages": [ + "message7384" + ] + }, + { + "key": "key1384", + "messages": [ + "message7385" + ] + }, + { + "key": "key1385", + "messages": [ + "message7386" + ] + }, + { + "key": "key1386", + "messages": [ + "message7387" + ] + }, + { + "key": "key1387", + "messages": [ + "message7388" + ] + }, + { + "key": "key1388", + "messages": [ + "message7389" + ] + }, + { + "key": "key1389", + "messages": [ + "message7390" + ] + }, + { + "key": "key1390", + "messages": [ + "message7391" + ] + }, + { + "key": "key1391", + "messages": [ + "message7392" + ] + }, + { + "key": "key1392", + "messages": [ + "message7393" + ] + }, + { + "key": "key1393", + "messages": [ + "message7394" + ] + }, + { + "key": "key1394", + "messages": [ + "message7395" + ] + }, + { + "key": "key1395", + "messages": [ + "message7396" + ] + }, + { + "key": "key1396", + "messages": [ + "message7397" + ] + }, + { + "key": "key1397", + "messages": [ + "message7398" + ] + }, + { + "key": "key1398", + "messages": [ + "message7399" + ] + }, + { + "key": "key1399", + "messages": [ + "message7400" + ] + }, + { + "key": "key1400", + "messages": [ + "message7401" + ] + }, + { + "key": "key1401", + "messages": [ + "message7402" + ] + }, + { + "key": "key1402", + "messages": [ + "message7403" + ] + }, + { + "key": "key1403", + "messages": [ + "message7404" + ] + }, + { + "key": "key1404", + "messages": [ + "message7405" + ] + }, + { + "key": "key1405", + "messages": [ + "message7406" + ] + }, + { + "key": "key1406", + "messages": [ + "message7407" + ] + }, + { + "key": "key1407", + "messages": [ + "message7408" + ] + }, + { + "key": "key1408", + "messages": [ + "message7409" + ] + }, + { + "key": "key1409", + "messages": [ + "message7410" + ] + }, + { + "key": "key1410", + "messages": [ + "message7411" + ] + }, + { + "key": "key1411", + "messages": [ + "message7412" + ] + }, + { + "key": "key1412", + "messages": [ + "message7413" + ] + }, + { + "key": "key1413", + "messages": [ + "message7414" + ] + }, + { + "key": "key1414", + "messages": [ + "message7415" + ] + }, + { + "key": "key1415", + "messages": [ + "message7416" + ] + }, + { + "key": "key1416", + "messages": [ + "message7417" + ] + }, + { + "key": "key1417", + "messages": [ + "message7418" + ] + }, + { + "key": "key1418", + "messages": [ + "message7419" + ] + }, + { + "key": "key1419", + "messages": [ + "message7420" + ] + }, + { + "key": "key1420", + "messages": [ + "message7421" + ] + }, + { + "key": "key1421", + "messages": [ + "message7422" + ] + }, + { + "key": "key1422", + "messages": [ + "message7423" + ] + }, + { + "key": "key1423", + "messages": [ + "message7424" + ] + }, + { + "key": "key1424", + "messages": [ + "message7425" + ] + }, + { + "key": "key1425", + "messages": [ + "message7426" + ] + }, + { + "key": "key1426", + "messages": [ + "message7427" + ] + }, + { + "key": "key1427", + "messages": [ + "message7428" + ] + }, + { + "key": "key1428", + "messages": [ + "message7429" + ] + }, + { + "key": "key1429", + "messages": [ + "message7430" + ] + }, + { + "key": "key1430", + "messages": [ + "message7431" + ] + }, + { + "key": "key1431", + "messages": [ + "message7432" + ] + }, + { + "key": "key1432", + "messages": [ + "message7433" + ] + }, + { + "key": "key1433", + "messages": [ + "message7434" + ] + }, + { + "key": "key1434", + "messages": [ + "message7435" + ] + }, + { + "key": "key1435", + "messages": [ + "message7436" + ] + }, + { + "key": "key1436", + "messages": [ + "message7437" + ] + }, + { + "key": "key1437", + "messages": [ + "message7438" + ] + }, + { + "key": "key1438", + "messages": [ + "message7439" + ] + }, + { + "key": "key1439", + "messages": [ + "message7440" + ] + }, + { + "key": "key1440", + "messages": [ + "message7441" + ] + }, + { + "key": "key1441", + "messages": [ + "message7442" + ] + }, + { + "key": "key1442", + "messages": [ + "message7443" + ] + }, + { + "key": "key1443", + "messages": [ + "message7444" + ] + }, + { + "key": "key1444", + "messages": [ + "message7445" + ] + }, + { + "key": "key1445", + "messages": [ + "message7446" + ] + }, + { + "key": "key1446", + "messages": [ + "message7447" + ] + }, + { + "key": "key1447", + "messages": [ + "message7448" + ] + }, + { + "key": "key1448", + "messages": [ + "message7449" + ] + }, + { + "key": "key1449", + "messages": [ + "message7450" + ] + }, + { + "key": "key1450", + "messages": [ + "message7451" + ] + }, + { + "key": "key1451", + "messages": [ + "message7452" + ] + }, + { + "key": "key1452", + "messages": [ + "message7453" + ] + }, + { + "key": "key1453", + "messages": [ + "message7454" + ] + }, + { + "key": "key1454", + "messages": [ + "message7455" + ] + }, + { + "key": "key1455", + "messages": [ + "message7456" + ] + }, + { + "key": "key1456", + "messages": [ + "message7457" + ] + }, + { + "key": "key1457", + "messages": [ + "message7458" + ] + }, + { + "key": "key1458", + "messages": [ + "message7459" + ] + }, + { + "key": "key1459", + "messages": [ + "message7460" + ] + }, + { + "key": "key1460", + "messages": [ + "message7461" + ] + }, + { + "key": "key1461", + "messages": [ + "message7462" + ] + }, + { + "key": "key1462", + "messages": [ + "message7463" + ] + }, + { + "key": "key1463", + "messages": [ + "message7464" + ] + }, + { + "key": "key1464", + "messages": [ + "message7465" + ] + }, + { + "key": "key1465", + "messages": [ + "message7466" + ] + }, + { + "key": "key1466", + "messages": [ + "message7467" + ] + }, + { + "key": "key1467", + "messages": [ + "message7468" + ] + }, + { + "key": "key1468", + "messages": [ + "message7469" + ] + }, + { + "key": "key1469", + "messages": [ + "message7470" + ] + }, + { + "key": "key1470", + "messages": [ + "message7471" + ] + }, + { + "key": "key1471", + "messages": [ + "message7472" + ] + }, + { + "key": "key1472", + "messages": [ + "message7473" + ] + }, + { + "key": "key1473", + "messages": [ + "message7474" + ] + }, + { + "key": "key1474", + "messages": [ + "message7475" + ] + }, + { + "key": "key1475", + "messages": [ + "message7476" + ] + }, + { + "key": "key1476", + "messages": [ + "message7477" + ] + }, + { + "key": "key1477", + "messages": [ + "message7478" + ] + }, + { + "key": "key1478", + "messages": [ + "message7479" + ] + }, + { + "key": "key1479", + "messages": [ + "message7480" + ] + }, + { + "key": "key1480", + "messages": [ + "message7481" + ] + }, + { + "key": "key1481", + "messages": [ + "message7482" + ] + }, + { + "key": "key1482", + "messages": [ + "message7483" + ] + }, + { + "key": "key1483", + "messages": [ + "message7484" + ] + }, + { + "key": "key1484", + "messages": [ + "message7485" + ] + }, + { + "key": "key1485", + "messages": [ + "message7486" + ] + }, + { + "key": "key1486", + "messages": [ + "message7487" + ] + }, + { + "key": "key1487", + "messages": [ + "message7488" + ] + }, + { + "key": "key1488", + "messages": [ + "message7489" + ] + }, + { + "key": "key1489", + "messages": [ + "message7490" + ] + }, + { + "key": "key1490", + "messages": [ + "message7491" + ] + }, + { + "key": "key1491", + "messages": [ + "message7492" + ] + }, + { + "key": "key1492", + "messages": [ + "message7493" + ] + }, + { + "key": "key1493", + "messages": [ + "message7494" + ] + }, + { + "key": "key1494", + "messages": [ + "message7495" + ] + }, + { + "key": "key1495", + "messages": [ + "message7496" + ] + }, + { + "key": "key1496", + "messages": [ + "message7497" + ] + }, + { + "key": "key1497", + "messages": [ + "message7498" + ] + }, + { + "key": "key1498", + "messages": [ + "message7499" + ] + }, + { + "key": "key1499", + "messages": [ + "message7500" + ] + }, + { + "key": "key1500", + "messages": [ + "message7501" + ] + }, + { + "key": "key1501", + "messages": [ + "message7502" + ] + }, + { + "key": "key1502", + "messages": [ + "message7503" + ] + }, + { + "key": "key1503", + "messages": [ + "message7504" + ] + }, + { + "key": "key1504", + "messages": [ + "message7505" + ] + }, + { + "key": "key1505", + "messages": [ + "message7506" + ] + }, + { + "key": "key1506", + "messages": [ + "message7507" + ] + }, + { + "key": "key1507", + "messages": [ + "message7508" + ] + }, + { + "key": "key1508", + "messages": [ + "message7509" + ] + }, + { + "key": "key1509", + "messages": [ + "message7510" + ] + }, + { + "key": "key1510", + "messages": [ + "message7511" + ] + }, + { + "key": "key1511", + "messages": [ + "message7512" + ] + }, + { + "key": "key1512", + "messages": [ + "message7513" + ] + }, + { + "key": "key1513", + "messages": [ + "message7514" + ] + }, + { + "key": "key1514", + "messages": [ + "message7515" + ] + }, + { + "key": "key1515", + "messages": [ + "message7516" + ] + }, + { + "key": "key1516", + "messages": [ + "message7517" + ] + }, + { + "key": "key1517", + "messages": [ + "message7518" + ] + }, + { + "key": "key1518", + "messages": [ + "message7519" + ] + }, + { + "key": "key1519", + "messages": [ + "message7520" + ] + }, + { + "key": "key1520", + "messages": [ + "message7521" + ] + }, + { + "key": "key1521", + "messages": [ + "message7522" + ] + }, + { + "key": "key1522", + "messages": [ + "message7523" + ] + }, + { + "key": "key1523", + "messages": [ + "message7524" + ] + }, + { + "key": "key1524", + "messages": [ + "message7525" + ] + }, + { + "key": "key1525", + "messages": [ + "message7526" + ] + }, + { + "key": "key1526", + "messages": [ + "message7527" + ] + }, + { + "key": "key1527", + "messages": [ + "message7528" + ] + }, + { + "key": "key1528", + "messages": [ + "message7529" + ] + }, + { + "key": "key1529", + "messages": [ + "message7530" + ] + }, + { + "key": "key1530", + "messages": [ + "message7531" + ] + }, + { + "key": "key1531", + "messages": [ + "message7532" + ] + }, + { + "key": "key1532", + "messages": [ + "message7533" + ] + }, + { + "key": "key1533", + "messages": [ + "message7534" + ] + }, + { + "key": "key1534", + "messages": [ + "message7535" + ] + }, + { + "key": "key1535", + "messages": [ + "message7536" + ] + }, + { + "key": "key1536", + "messages": [ + "message7537" + ] + }, + { + "key": "key1537", + "messages": [ + "message7538" + ] + }, + { + "key": "key1538", + "messages": [ + "message7539" + ] + }, + { + "key": "key1539", + "messages": [ + "message7540" + ] + }, + { + "key": "key1540", + "messages": [ + "message7541" + ] + }, + { + "key": "key1541", + "messages": [ + "message7542" + ] + }, + { + "key": "key1542", + "messages": [ + "message7543" + ] + }, + { + "key": "key1543", + "messages": [ + "message7544" + ] + }, + { + "key": "key1544", + "messages": [ + "message7545" + ] + }, + { + "key": "key1545", + "messages": [ + "message7546" + ] + }, + { + "key": "key1546", + "messages": [ + "message7547" + ] + }, + { + "key": "key1547", + "messages": [ + "message7548" + ] + }, + { + "key": "key1548", + "messages": [ + "message7549" + ] + }, + { + "key": "key1549", + "messages": [ + "message7550" + ] + }, + { + "key": "key1550", + "messages": [ + "message7551" + ] + }, + { + "key": "key1551", + "messages": [ + "message7552" + ] + }, + { + "key": "key1552", + "messages": [ + "message7553" + ] + }, + { + "key": "key1553", + "messages": [ + "message7554" + ] + }, + { + "key": "key1554", + "messages": [ + "message7555" + ] + }, + { + "key": "key1555", + "messages": [ + "message7556" + ] + }, + { + "key": "key1556", + "messages": [ + "message7557" + ] + }, + { + "key": "key1557", + "messages": [ + "message7558" + ] + }, + { + "key": "key1558", + "messages": [ + "message7559" + ] + }, + { + "key": "key1559", + "messages": [ + "message7560" + ] + }, + { + "key": "key1560", + "messages": [ + "message7561" + ] + }, + { + "key": "key1561", + "messages": [ + "message7562" + ] + }, + { + "key": "key1562", + "messages": [ + "message7563" + ] + }, + { + "key": "key1563", + "messages": [ + "message7564" + ] + }, + { + "key": "key1564", + "messages": [ + "message7565" + ] + }, + { + "key": "key1565", + "messages": [ + "message7566" + ] + }, + { + "key": "key1566", + "messages": [ + "message7567" + ] + }, + { + "key": "key1567", + "messages": [ + "message7568" + ] + }, + { + "key": "key1568", + "messages": [ + "message7569" + ] + }, + { + "key": "key1569", + "messages": [ + "message7570" + ] + }, + { + "key": "key1570", + "messages": [ + "message7571" + ] + }, + { + "key": "key1571", + "messages": [ + "message7572" + ] + }, + { + "key": "key1572", + "messages": [ + "message7573" + ] + }, + { + "key": "key1573", + "messages": [ + "message7574" + ] + }, + { + "key": "key1574", + "messages": [ + "message7575" + ] + }, + { + "key": "key1575", + "messages": [ + "message7576" + ] + }, + { + "key": "key1576", + "messages": [ + "message7577" + ] + }, + { + "key": "key1577", + "messages": [ + "message7578" + ] + }, + { + "key": "key1578", + "messages": [ + "message7579" + ] + }, + { + "key": "key1579", + "messages": [ + "message7580" + ] + }, + { + "key": "key1580", + "messages": [ + "message7581" + ] + }, + { + "key": "key1581", + "messages": [ + "message7582" + ] + }, + { + "key": "key1582", + "messages": [ + "message7583" + ] + }, + { + "key": "key1583", + "messages": [ + "message7584" + ] + }, + { + "key": "key1584", + "messages": [ + "message7585" + ] + }, + { + "key": "key1585", + "messages": [ + "message7586" + ] + }, + { + "key": "key1586", + "messages": [ + "message7587" + ] + }, + { + "key": "key1587", + "messages": [ + "message7588" + ] + }, + { + "key": "key1588", + "messages": [ + "message7589" + ] + }, + { + "key": "key1589", + "messages": [ + "message7590" + ] + }, + { + "key": "key1590", + "messages": [ + "message7591" + ] + }, + { + "key": "key1591", + "messages": [ + "message7592" + ] + }, + { + "key": "key1592", + "messages": [ + "message7593" + ] + }, + { + "key": "key1593", + "messages": [ + "message7594" + ] + }, + { + "key": "key1594", + "messages": [ + "message7595" + ] + }, + { + "key": "key1595", + "messages": [ + "message7596" + ] + }, + { + "key": "key1596", + "messages": [ + "message7597" + ] + }, + { + "key": "key1597", + "messages": [ + "message7598" + ] + }, + { + "key": "key1598", + "messages": [ + "message7599" + ] + }, + { + "key": "key1599", + "messages": [ + "message7600" + ] + }, + { + "key": "key1600", + "messages": [ + "message7601" + ] + }, + { + "key": "key1601", + "messages": [ + "message7602" + ] + }, + { + "key": "key1602", + "messages": [ + "message7603" + ] + }, + { + "key": "key1603", + "messages": [ + "message7604" + ] + }, + { + "key": "key1604", + "messages": [ + "message7605" + ] + }, + { + "key": "key1605", + "messages": [ + "message7606" + ] + }, + { + "key": "key1606", + "messages": [ + "message7607" + ] + }, + { + "key": "key1607", + "messages": [ + "message7608" + ] + }, + { + "key": "key1608", + "messages": [ + "message7609" + ] + }, + { + "key": "key1609", + "messages": [ + "message7610" + ] + }, + { + "key": "key1610", + "messages": [ + "message7611" + ] + }, + { + "key": "key1611", + "messages": [ + "message7612" + ] + }, + { + "key": "key1612", + "messages": [ + "message7613" + ] + }, + { + "key": "key1613", + "messages": [ + "message7614" + ] + }, + { + "key": "key1614", + "messages": [ + "message7615" + ] + }, + { + "key": "key1615", + "messages": [ + "message7616" + ] + }, + { + "key": "key1616", + "messages": [ + "message7617" + ] + }, + { + "key": "key1617", + "messages": [ + "message7618" + ] + }, + { + "key": "key1618", + "messages": [ + "message7619" + ] + }, + { + "key": "key1619", + "messages": [ + "message7620" + ] + }, + { + "key": "key1620", + "messages": [ + "message7621" + ] + }, + { + "key": "key1621", + "messages": [ + "message7622" + ] + }, + { + "key": "key1622", + "messages": [ + "message7623" + ] + }, + { + "key": "key1623", + "messages": [ + "message7624" + ] + }, + { + "key": "key1624", + "messages": [ + "message7625" + ] + }, + { + "key": "key1625", + "messages": [ + "message7626" + ] + }, + { + "key": "key1626", + "messages": [ + "message7627" + ] + }, + { + "key": "key1627", + "messages": [ + "message7628" + ] + }, + { + "key": "key1628", + "messages": [ + "message7629" + ] + }, + { + "key": "key1629", + "messages": [ + "message7630" + ] + }, + { + "key": "key1630", + "messages": [ + "message7631" + ] + }, + { + "key": "key1631", + "messages": [ + "message7632" + ] + }, + { + "key": "key1632", + "messages": [ + "message7633" + ] + }, + { + "key": "key1633", + "messages": [ + "message7634" + ] + }, + { + "key": "key1634", + "messages": [ + "message7635" + ] + }, + { + "key": "key1635", + "messages": [ + "message7636" + ] + }, + { + "key": "key1636", + "messages": [ + "message7637" + ] + }, + { + "key": "key1637", + "messages": [ + "message7638" + ] + }, + { + "key": "key1638", + "messages": [ + "message7639" + ] + }, + { + "key": "key1639", + "messages": [ + "message7640" + ] + }, + { + "key": "key1640", + "messages": [ + "message7641" + ] + }, + { + "key": "key1641", + "messages": [ + "message7642" + ] + }, + { + "key": "key1642", + "messages": [ + "message7643" + ] + }, + { + "key": "key1643", + "messages": [ + "message7644" + ] + }, + { + "key": "key1644", + "messages": [ + "message7645" + ] + }, + { + "key": "key1645", + "messages": [ + "message7646" + ] + }, + { + "key": "key1646", + "messages": [ + "message7647" + ] + }, + { + "key": "key1647", + "messages": [ + "message7648" + ] + }, + { + "key": "key1648", + "messages": [ + "message7649" + ] + }, + { + "key": "key1649", + "messages": [ + "message7650" + ] + }, + { + "key": "key1650", + "messages": [ + "message7651" + ] + }, + { + "key": "key1651", + "messages": [ + "message7652" + ] + }, + { + "key": "key1652", + "messages": [ + "message7653" + ] + }, + { + "key": "key1653", + "messages": [ + "message7654" + ] + }, + { + "key": "key1654", + "messages": [ + "message7655" + ] + }, + { + "key": "key1655", + "messages": [ + "message7656" + ] + }, + { + "key": "key1656", + "messages": [ + "message7657" + ] + }, + { + "key": "key1657", + "messages": [ + "message7658" + ] + }, + { + "key": "key1658", + "messages": [ + "message7659" + ] + }, + { + "key": "key1659", + "messages": [ + "message7660" + ] + }, + { + "key": "key1660", + "messages": [ + "message7661" + ] + }, + { + "key": "key1661", + "messages": [ + "message7662" + ] + }, + { + "key": "key1662", + "messages": [ + "message7663" + ] + }, + { + "key": "key1663", + "messages": [ + "message7664" + ] + }, + { + "key": "key1664", + "messages": [ + "message7665" + ] + }, + { + "key": "key1665", + "messages": [ + "message7666" + ] + }, + { + "key": "key1666", + "messages": [ + "message7667" + ] + }, + { + "key": "key1667", + "messages": [ + "message7668" + ] + }, + { + "key": "key1668", + "messages": [ + "message7669" + ] + }, + { + "key": "key1669", + "messages": [ + "message7670" + ] + }, + { + "key": "key1670", + "messages": [ + "message7671" + ] + }, + { + "key": "key1671", + "messages": [ + "message7672" + ] + }, + { + "key": "key1672", + "messages": [ + "message7673" + ] + }, + { + "key": "key1673", + "messages": [ + "message7674" + ] + }, + { + "key": "key1674", + "messages": [ + "message7675" + ] + }, + { + "key": "key1675", + "messages": [ + "message7676" + ] + }, + { + "key": "key1676", + "messages": [ + "message7677" + ] + }, + { + "key": "key1677", + "messages": [ + "message7678" + ] + }, + { + "key": "key1678", + "messages": [ + "message7679" + ] + }, + { + "key": "key1679", + "messages": [ + "message7680" + ] + }, + { + "key": "key1680", + "messages": [ + "message7681" + ] + }, + { + "key": "key1681", + "messages": [ + "message7682" + ] + }, + { + "key": "key1682", + "messages": [ + "message7683" + ] + }, + { + "key": "key1683", + "messages": [ + "message7684" + ] + }, + { + "key": "key1684", + "messages": [ + "message7685" + ] + }, + { + "key": "key1685", + "messages": [ + "message7686" + ] + }, + { + "key": "key1686", + "messages": [ + "message7687" + ] + }, + { + "key": "key1687", + "messages": [ + "message7688" + ] + }, + { + "key": "key1688", + "messages": [ + "message7689" + ] + }, + { + "key": "key1689", + "messages": [ + "message7690" + ] + }, + { + "key": "key1690", + "messages": [ + "message7691" + ] + }, + { + "key": "key1691", + "messages": [ + "message7692" + ] + }, + { + "key": "key1692", + "messages": [ + "message7693" + ] + }, + { + "key": "key1693", + "messages": [ + "message7694" + ] + }, + { + "key": "key1694", + "messages": [ + "message7695" + ] + }, + { + "key": "key1695", + "messages": [ + "message7696" + ] + }, + { + "key": "key1696", + "messages": [ + "message7697" + ] + }, + { + "key": "key1697", + "messages": [ + "message7698" + ] + }, + { + "key": "key1698", + "messages": [ + "message7699" + ] + }, + { + "key": "key1699", + "messages": [ + "message7700" + ] + }, + { + "key": "key1700", + "messages": [ + "message7701" + ] + }, + { + "key": "key1701", + "messages": [ + "message7702" + ] + }, + { + "key": "key1702", + "messages": [ + "message7703" + ] + }, + { + "key": "key1703", + "messages": [ + "message7704" + ] + }, + { + "key": "key1704", + "messages": [ + "message7705" + ] + }, + { + "key": "key1705", + "messages": [ + "message7706" + ] + }, + { + "key": "key1706", + "messages": [ + "message7707" + ] + }, + { + "key": "key1707", + "messages": [ + "message7708" + ] + }, + { + "key": "key1708", + "messages": [ + "message7709" + ] + }, + { + "key": "key1709", + "messages": [ + "message7710" + ] + }, + { + "key": "key1710", + "messages": [ + "message7711" + ] + }, + { + "key": "key1711", + "messages": [ + "message7712" + ] + }, + { + "key": "key1712", + "messages": [ + "message7713" + ] + }, + { + "key": "key1713", + "messages": [ + "message7714" + ] + }, + { + "key": "key1714", + "messages": [ + "message7715" + ] + }, + { + "key": "key1715", + "messages": [ + "message7716" + ] + }, + { + "key": "key1716", + "messages": [ + "message7717" + ] + }, + { + "key": "key1717", + "messages": [ + "message7718" + ] + }, + { + "key": "key1718", + "messages": [ + "message7719" + ] + }, + { + "key": "key1719", + "messages": [ + "message7720" + ] + }, + { + "key": "key1720", + "messages": [ + "message7721" + ] + }, + { + "key": "key1721", + "messages": [ + "message7722" + ] + }, + { + "key": "key1722", + "messages": [ + "message7723" + ] + }, + { + "key": "key1723", + "messages": [ + "message7724" + ] + }, + { + "key": "key1724", + "messages": [ + "message7725" + ] + }, + { + "key": "key1725", + "messages": [ + "message7726" + ] + }, + { + "key": "key1726", + "messages": [ + "message7727" + ] + }, + { + "key": "key1727", + "messages": [ + "message7728" + ] + }, + { + "key": "key1728", + "messages": [ + "message7729" + ] + }, + { + "key": "key1729", + "messages": [ + "message7730" + ] + }, + { + "key": "key1730", + "messages": [ + "message7731" + ] + }, + { + "key": "key1731", + "messages": [ + "message7732" + ] + }, + { + "key": "key1732", + "messages": [ + "message7733" + ] + }, + { + "key": "key1733", + "messages": [ + "message7734" + ] + }, + { + "key": "key1734", + "messages": [ + "message7735" + ] + }, + { + "key": "key1735", + "messages": [ + "message7736" + ] + }, + { + "key": "key1736", + "messages": [ + "message7737" + ] + }, + { + "key": "key1737", + "messages": [ + "message7738" + ] + }, + { + "key": "key1738", + "messages": [ + "message7739" + ] + }, + { + "key": "key1739", + "messages": [ + "message7740" + ] + }, + { + "key": "key1740", + "messages": [ + "message7741" + ] + }, + { + "key": "key1741", + "messages": [ + "message7742" + ] + }, + { + "key": "key1742", + "messages": [ + "message7743" + ] + }, + { + "key": "key1743", + "messages": [ + "message7744" + ] + }, + { + "key": "key1744", + "messages": [ + "message7745" + ] + }, + { + "key": "key1745", + "messages": [ + "message7746" + ] + }, + { + "key": "key1746", + "messages": [ + "message7747" + ] + }, + { + "key": "key1747", + "messages": [ + "message7748" + ] + }, + { + "key": "key1748", + "messages": [ + "message7749" + ] + }, + { + "key": "key1749", + "messages": [ + "message7750" + ] + }, + { + "key": "key1750", + "messages": [ + "message7751" + ] + }, + { + "key": "key1751", + "messages": [ + "message7752" + ] + }, + { + "key": "key1752", + "messages": [ + "message7753" + ] + }, + { + "key": "key1753", + "messages": [ + "message7754" + ] + }, + { + "key": "key1754", + "messages": [ + "message7755" + ] + }, + { + "key": "key1755", + "messages": [ + "message7756" + ] + }, + { + "key": "key1756", + "messages": [ + "message7757" + ] + }, + { + "key": "key1757", + "messages": [ + "message7758" + ] + }, + { + "key": "key1758", + "messages": [ + "message7759" + ] + }, + { + "key": "key1759", + "messages": [ + "message7760" + ] + }, + { + "key": "key1760", + "messages": [ + "message7761" + ] + }, + { + "key": "key1761", + "messages": [ + "message7762" + ] + }, + { + "key": "key1762", + "messages": [ + "message7763" + ] + }, + { + "key": "key1763", + "messages": [ + "message7764" + ] + }, + { + "key": "key1764", + "messages": [ + "message7765" + ] + }, + { + "key": "key1765", + "messages": [ + "message7766" + ] + }, + { + "key": "key1766", + "messages": [ + "message7767" + ] + }, + { + "key": "key1767", + "messages": [ + "message7768" + ] + }, + { + "key": "key1768", + "messages": [ + "message7769" + ] + }, + { + "key": "key1769", + "messages": [ + "message7770" + ] + }, + { + "key": "key1770", + "messages": [ + "message7771" + ] + }, + { + "key": "key1771", + "messages": [ + "message7772" + ] + }, + { + "key": "key1772", + "messages": [ + "message7773" + ] + }, + { + "key": "key1773", + "messages": [ + "message7774" + ] + }, + { + "key": "key1774", + "messages": [ + "message7775" + ] + }, + { + "key": "key1775", + "messages": [ + "message7776" + ] + }, + { + "key": "key1776", + "messages": [ + "message7777" + ] + }, + { + "key": "key1777", + "messages": [ + "message7778" + ] + }, + { + "key": "key1778", + "messages": [ + "message7779" + ] + }, + { + "key": "key1779", + "messages": [ + "message7780" + ] + }, + { + "key": "key1780", + "messages": [ + "message7781" + ] + }, + { + "key": "key1781", + "messages": [ + "message7782" + ] + }, + { + "key": "key1782", + "messages": [ + "message7783" + ] + }, + { + "key": "key1783", + "messages": [ + "message7784" + ] + }, + { + "key": "key1784", + "messages": [ + "message7785" + ] + }, + { + "key": "key1785", + "messages": [ + "message7786" + ] + }, + { + "key": "key1786", + "messages": [ + "message7787" + ] + }, + { + "key": "key1787", + "messages": [ + "message7788" + ] + }, + { + "key": "key1788", + "messages": [ + "message7789" + ] + }, + { + "key": "key1789", + "messages": [ + "message7790" + ] + }, + { + "key": "key1790", + "messages": [ + "message7791" + ] + }, + { + "key": "key1791", + "messages": [ + "message7792" + ] + }, + { + "key": "key1792", + "messages": [ + "message7793" + ] + }, + { + "key": "key1793", + "messages": [ + "message7794" + ] + }, + { + "key": "key1794", + "messages": [ + "message7795" + ] + }, + { + "key": "key1795", + "messages": [ + "message7796" + ] + }, + { + "key": "key1796", + "messages": [ + "message7797" + ] + }, + { + "key": "key1797", + "messages": [ + "message7798" + ] + }, + { + "key": "key1798", + "messages": [ + "message7799" + ] + }, + { + "key": "key1799", + "messages": [ + "message7800" + ] + }, + { + "key": "key1800", + "messages": [ + "message7801" + ] + }, + { + "key": "key1801", + "messages": [ + "message7802" + ] + }, + { + "key": "key1802", + "messages": [ + "message7803" + ] + }, + { + "key": "key1803", + "messages": [ + "message7804" + ] + }, + { + "key": "key1804", + "messages": [ + "message7805" + ] + }, + { + "key": "key1805", + "messages": [ + "message7806" + ] + }, + { + "key": "key1806", + "messages": [ + "message7807" + ] + }, + { + "key": "key1807", + "messages": [ + "message7808" + ] + }, + { + "key": "key1808", + "messages": [ + "message7809" + ] + }, + { + "key": "key1809", + "messages": [ + "message7810" + ] + }, + { + "key": "key1810", + "messages": [ + "message7811" + ] + }, + { + "key": "key1811", + "messages": [ + "message7812" + ] + }, + { + "key": "key1812", + "messages": [ + "message7813" + ] + }, + { + "key": "key1813", + "messages": [ + "message7814" + ] + }, + { + "key": "key1814", + "messages": [ + "message7815" + ] + }, + { + "key": "key1815", + "messages": [ + "message7816" + ] + }, + { + "key": "key1816", + "messages": [ + "message7817" + ] + }, + { + "key": "key1817", + "messages": [ + "message7818" + ] + }, + { + "key": "key1818", + "messages": [ + "message7819" + ] + }, + { + "key": "key1819", + "messages": [ + "message7820" + ] + }, + { + "key": "key1820", + "messages": [ + "message7821" + ] + }, + { + "key": "key1821", + "messages": [ + "message7822" + ] + }, + { + "key": "key1822", + "messages": [ + "message7823" + ] + }, + { + "key": "key1823", + "messages": [ + "message7824" + ] + }, + { + "key": "key1824", + "messages": [ + "message7825" + ] + }, + { + "key": "key1825", + "messages": [ + "message7826" + ] + }, + { + "key": "key1826", + "messages": [ + "message7827" + ] + }, + { + "key": "key1827", + "messages": [ + "message7828" + ] + }, + { + "key": "key1828", + "messages": [ + "message7829" + ] + }, + { + "key": "key1829", + "messages": [ + "message7830" + ] + }, + { + "key": "key1830", + "messages": [ + "message7831" + ] + }, + { + "key": "key1831", + "messages": [ + "message7832" + ] + }, + { + "key": "key1832", + "messages": [ + "message7833" + ] + }, + { + "key": "key1833", + "messages": [ + "message7834" + ] + }, + { + "key": "key1834", + "messages": [ + "message7835" + ] + }, + { + "key": "key1835", + "messages": [ + "message7836" + ] + }, + { + "key": "key1836", + "messages": [ + "message7837" + ] + }, + { + "key": "key1837", + "messages": [ + "message7838" + ] + }, + { + "key": "key1838", + "messages": [ + "message7839" + ] + }, + { + "key": "key1839", + "messages": [ + "message7840" + ] + }, + { + "key": "key1840", + "messages": [ + "message7841" + ] + }, + { + "key": "key1841", + "messages": [ + "message7842" + ] + }, + { + "key": "key1842", + "messages": [ + "message7843" + ] + }, + { + "key": "key1843", + "messages": [ + "message7844" + ] + }, + { + "key": "key1844", + "messages": [ + "message7845" + ] + }, + { + "key": "key1845", + "messages": [ + "message7846" + ] + }, + { + "key": "key1846", + "messages": [ + "message7847" + ] + }, + { + "key": "key1847", + "messages": [ + "message7848" + ] + }, + { + "key": "key1848", + "messages": [ + "message7849" + ] + }, + { + "key": "key1849", + "messages": [ + "message7850" + ] + }, + { + "key": "key1850", + "messages": [ + "message7851" + ] + }, + { + "key": "key1851", + "messages": [ + "message7852" + ] + }, + { + "key": "key1852", + "messages": [ + "message7853" + ] + }, + { + "key": "key1853", + "messages": [ + "message7854" + ] + }, + { + "key": "key1854", + "messages": [ + "message7855" + ] + }, + { + "key": "key1855", + "messages": [ + "message7856" + ] + }, + { + "key": "key1856", + "messages": [ + "message7857" + ] + }, + { + "key": "key1857", + "messages": [ + "message7858" + ] + }, + { + "key": "key1858", + "messages": [ + "message7859" + ] + }, + { + "key": "key1859", + "messages": [ + "message7860" + ] + }, + { + "key": "key1860", + "messages": [ + "message7861" + ] + }, + { + "key": "key1861", + "messages": [ + "message7862" + ] + }, + { + "key": "key1862", + "messages": [ + "message7863" + ] + }, + { + "key": "key1863", + "messages": [ + "message7864" + ] + }, + { + "key": "key1864", + "messages": [ + "message7865" + ] + }, + { + "key": "key1865", + "messages": [ + "message7866" + ] + }, + { + "key": "key1866", + "messages": [ + "message7867" + ] + }, + { + "key": "key1867", + "messages": [ + "message7868" + ] + }, + { + "key": "key1868", + "messages": [ + "message7869" + ] + }, + { + "key": "key1869", + "messages": [ + "message7870" + ] + }, + { + "key": "key1870", + "messages": [ + "message7871" + ] + }, + { + "key": "key1871", + "messages": [ + "message7872" + ] + }, + { + "key": "key1872", + "messages": [ + "message7873" + ] + }, + { + "key": "key1873", + "messages": [ + "message7874" + ] + }, + { + "key": "key1874", + "messages": [ + "message7875" + ] + }, + { + "key": "key1875", + "messages": [ + "message7876" + ] + }, + { + "key": "key1876", + "messages": [ + "message7877" + ] + }, + { + "key": "key1877", + "messages": [ + "message7878" + ] + }, + { + "key": "key1878", + "messages": [ + "message7879" + ] + }, + { + "key": "key1879", + "messages": [ + "message7880" + ] + }, + { + "key": "key1880", + "messages": [ + "message7881" + ] + }, + { + "key": "key1881", + "messages": [ + "message7882" + ] + }, + { + "key": "key1882", + "messages": [ + "message7883" + ] + }, + { + "key": "key1883", + "messages": [ + "message7884" + ] + }, + { + "key": "key1884", + "messages": [ + "message7885" + ] + }, + { + "key": "key1885", + "messages": [ + "message7886" + ] + }, + { + "key": "key1886", + "messages": [ + "message7887" + ] + }, + { + "key": "key1887", + "messages": [ + "message7888" + ] + }, + { + "key": "key1888", + "messages": [ + "message7889" + ] + }, + { + "key": "key1889", + "messages": [ + "message7890" + ] + }, + { + "key": "key1890", + "messages": [ + "message7891" + ] + }, + { + "key": "key1891", + "messages": [ + "message7892" + ] + }, + { + "key": "key1892", + "messages": [ + "message7893" + ] + }, + { + "key": "key1893", + "messages": [ + "message7894" + ] + }, + { + "key": "key1894", + "messages": [ + "message7895" + ] + }, + { + "key": "key1895", + "messages": [ + "message7896" + ] + }, + { + "key": "key1896", + "messages": [ + "message7897" + ] + }, + { + "key": "key1897", + "messages": [ + "message7898" + ] + }, + { + "key": "key1898", + "messages": [ + "message7899" + ] + }, + { + "key": "key1899", + "messages": [ + "message7900" + ] + }, + { + "key": "key1900", + "messages": [ + "message7901" + ] + }, + { + "key": "key1901", + "messages": [ + "message7902" + ] + }, + { + "key": "key1902", + "messages": [ + "message7903" + ] + }, + { + "key": "key1903", + "messages": [ + "message7904" + ] + }, + { + "key": "key1904", + "messages": [ + "message7905" + ] + }, + { + "key": "key1905", + "messages": [ + "message7906" + ] + }, + { + "key": "key1906", + "messages": [ + "message7907" + ] + }, + { + "key": "key1907", + "messages": [ + "message7908" + ] + }, + { + "key": "key1908", + "messages": [ + "message7909" + ] + }, + { + "key": "key1909", + "messages": [ + "message7910" + ] + }, + { + "key": "key1910", + "messages": [ + "message7911" + ] + }, + { + "key": "key1911", + "messages": [ + "message7912" + ] + }, + { + "key": "key1912", + "messages": [ + "message7913" + ] + }, + { + "key": "key1913", + "messages": [ + "message7914" + ] + }, + { + "key": "key1914", + "messages": [ + "message7915" + ] + }, + { + "key": "key1915", + "messages": [ + "message7916" + ] + }, + { + "key": "key1916", + "messages": [ + "message7917" + ] + }, + { + "key": "key1917", + "messages": [ + "message7918" + ] + }, + { + "key": "key1918", + "messages": [ + "message7919" + ] + }, + { + "key": "key1919", + "messages": [ + "message7920" + ] + }, + { + "key": "key1920", + "messages": [ + "message7921" + ] + }, + { + "key": "key1921", + "messages": [ + "message7922" + ] + }, + { + "key": "key1922", + "messages": [ + "message7923" + ] + }, + { + "key": "key1923", + "messages": [ + "message7924" + ] + }, + { + "key": "key1924", + "messages": [ + "message7925" + ] + }, + { + "key": "key1925", + "messages": [ + "message7926" + ] + }, + { + "key": "key1926", + "messages": [ + "message7927" + ] + }, + { + "key": "key1927", + "messages": [ + "message7928" + ] + }, + { + "key": "key1928", + "messages": [ + "message7929" + ] + }, + { + "key": "key1929", + "messages": [ + "message7930" + ] + }, + { + "key": "key1930", + "messages": [ + "message7931" + ] + }, + { + "key": "key1931", + "messages": [ + "message7932" + ] + }, + { + "key": "key1932", + "messages": [ + "message7933" + ] + }, + { + "key": "key1933", + "messages": [ + "message7934" + ] + }, + { + "key": "key1934", + "messages": [ + "message7935" + ] + }, + { + "key": "key1935", + "messages": [ + "message7936" + ] + }, + { + "key": "key1936", + "messages": [ + "message7937" + ] + }, + { + "key": "key1937", + "messages": [ + "message7938" + ] + }, + { + "key": "key1938", + "messages": [ + "message7939" + ] + }, + { + "key": "key1939", + "messages": [ + "message7940" + ] + }, + { + "key": "key1940", + "messages": [ + "message7941" + ] + }, + { + "key": "key1941", + "messages": [ + "message7942" + ] + }, + { + "key": "key1942", + "messages": [ + "message7943" + ] + }, + { + "key": "key1943", + "messages": [ + "message7944" + ] + }, + { + "key": "key1944", + "messages": [ + "message7945" + ] + }, + { + "key": "key1945", + "messages": [ + "message7946" + ] + }, + { + "key": "key1946", + "messages": [ + "message7947" + ] + }, + { + "key": "key1947", + "messages": [ + "message7948" + ] + }, + { + "key": "key1948", + "messages": [ + "message7949" + ] + }, + { + "key": "key1949", + "messages": [ + "message7950" + ] + }, + { + "key": "key1950", + "messages": [ + "message7951" + ] + }, + { + "key": "key1951", + "messages": [ + "message7952" + ] + }, + { + "key": "key1952", + "messages": [ + "message7953" + ] + }, + { + "key": "key1953", + "messages": [ + "message7954" + ] + }, + { + "key": "key1954", + "messages": [ + "message7955" + ] + }, + { + "key": "key1955", + "messages": [ + "message7956" + ] + }, + { + "key": "key1956", + "messages": [ + "message7957" + ] + }, + { + "key": "key1957", + "messages": [ + "message7958" + ] + }, + { + "key": "key1958", + "messages": [ + "message7959" + ] + }, + { + "key": "key1959", + "messages": [ + "message7960" + ] + }, + { + "key": "key1960", + "messages": [ + "message7961" + ] + }, + { + "key": "key1961", + "messages": [ + "message7962" + ] + }, + { + "key": "key1962", + "messages": [ + "message7963" + ] + }, + { + "key": "key1963", + "messages": [ + "message7964" + ] + }, + { + "key": "key1964", + "messages": [ + "message7965" + ] + }, + { + "key": "key1965", + "messages": [ + "message7966" + ] + }, + { + "key": "key1966", + "messages": [ + "message7967" + ] + }, + { + "key": "key1967", + "messages": [ + "message7968" + ] + }, + { + "key": "key1968", + "messages": [ + "message7969" + ] + }, + { + "key": "key1969", + "messages": [ + "message7970" + ] + }, + { + "key": "key1970", + "messages": [ + "message7971" + ] + }, + { + "key": "key1971", + "messages": [ + "message7972" + ] + }, + { + "key": "key1972", + "messages": [ + "message7973" + ] + }, + { + "key": "key1973", + "messages": [ + "message7974" + ] + }, + { + "key": "key1974", + "messages": [ + "message7975" + ] + }, + { + "key": "key1975", + "messages": [ + "message7976" + ] + }, + { + "key": "key1976", + "messages": [ + "message7977" + ] + }, + { + "key": "key1977", + "messages": [ + "message7978" + ] + }, + { + "key": "key1978", + "messages": [ + "message7979" + ] + }, + { + "key": "key1979", + "messages": [ + "message7980" + ] + }, + { + "key": "key1980", + "messages": [ + "message7981" + ] + }, + { + "key": "key1981", + "messages": [ + "message7982" + ] + }, + { + "key": "key1982", + "messages": [ + "message7983" + ] + }, + { + "key": "key1983", + "messages": [ + "message7984" + ] + }, + { + "key": "key1984", + "messages": [ + "message7985" + ] + }, + { + "key": "key1985", + "messages": [ + "message7986" + ] + }, + { + "key": "key1986", + "messages": [ + "message7987" + ] + }, + { + "key": "key1987", + "messages": [ + "message7988" + ] + }, + { + "key": "key1988", + "messages": [ + "message7989" + ] + }, + { + "key": "key1989", + "messages": [ + "message7990" + ] + }, + { + "key": "key1990", + "messages": [ + "message7991" + ] + }, + { + "key": "key1991", + "messages": [ + "message7992" + ] + }, + { + "key": "key1992", + "messages": [ + "message7993" + ] + }, + { + "key": "key1993", + "messages": [ + "message7994" + ] + }, + { + "key": "key1994", + "messages": [ + "message7995" + ] + }, + { + "key": "key1995", + "messages": [ + "message7996" + ] + }, + { + "key": "key1996", + "messages": [ + "message7997" + ] + }, + { + "key": "key1997", + "messages": [ + "message7998" + ] + }, + { + "key": "key1998", + "messages": [ + "message7999" + ] + }, + { + "key": "key1999", + "messages": [ + "message8000" + ] + } + ] +} diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 7ac3fde4670..dbabe959f3d 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -26,6 +26,7 @@ import { Topic, } from '../src'; import {Policy} from '../src/iam'; +import {MessageOptions} from '../src/topic'; type Resource = Topic | Subscription | Snapshot; @@ -117,13 +118,13 @@ describe('pubsub', () => { return Promise.all(streams); } - async function publishPop(message: Buffer, options = {}) { + async function publishPop(message: MessageOptions) { const topic = pubsub.topic(generateTopicName()); const subscription = topic.subscription(generateSubName()); await topic.create(); await subscription.create(); for (let i = 0; i < 6; i++) { - await topic.publish(Buffer.from(message), options); + await topic.publishMessage(message); } return new Promise((resolve, reject) => { subscription.on('error', reject); @@ -217,9 +218,12 @@ describe('pubsub', () => { it('should publish a message', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); - const message = Buffer.from('message from me'); + const message = { + data: Buffer.from('message from me'), + orderingKey: 'a', + }; - topic.publish(message, (err, messageId) => { + topic.publishMessage(message, (err, messageId) => { assert.ifError(err); assert.strictEqual(typeof messageId, 'string'); done(); @@ -228,12 +232,12 @@ describe('pubsub', () => { it('should publish a message with attributes', async () => { const data = Buffer.from('raw message data'); - const attrs = { + const attributes = { customAttribute: 'value', }; - const message = await publishPop(data, attrs); + const message = await publishPop({data, attributes}); assert.deepStrictEqual(message.data, data); - assert.deepStrictEqual(message.attributes, attrs); + assert.deepStrictEqual(message.attributes, attributes); }); it('should get the metadata of a topic', done => { @@ -244,6 +248,88 @@ describe('pubsub', () => { done(); }); }); + + describe('ordered messages', () => { + interface Expected { + key: string; + messages: string[]; + } + + interface Input { + key: string; + message: string; + } + + interface Pending { + [key: string]: string[]; + } + + it('should pass the acceptance tests', async () => { + const [topic] = await pubsub.createTopic(generateName('orderedtopic')); + const [subscription] = await topic.createSubscription( + generateName('orderedsub'), + { + enableMessageOrdering: true, + } + ); + const { + input, + expected, + } = require('../../system-test/fixtures/ordered-messages.json'); + + const publishes = input.map(({key, message}: Input) => { + const options: MessageOptions = { + data: Buffer.from(message), + }; + + if (key) { + options.orderingKey = key; + } + + return topic.publishMessage(options); + }); + + await Promise.all(publishes); + + const pending: Pending = {}; + + expected.forEach(({key, messages}: Expected) => { + pending[key] = messages; + }); + + const deferred = defer(); + + subscription + .on('error', deferred.reject) + .on('message', (message: Message) => { + const key = message.orderingKey || ''; + const data = message.data.toString(); + const messages = pending[key]; + const expected = messages[0]; + + if (key && data !== expected) { + deferred.reject( + new Error( + `Expected "${expected}" but received "${data}" for key "${key}"` + ) + ); + subscription.close(); + return; + } + + message.ack(); + messages.splice(messages.indexOf(data), 1); + + if (!pending[key].length) delete pending[key]; + if (!Object.keys(pending).length) { + deferred.resolve(); + } + }); + + await deferred.promise; + await Promise.all([topic.delete(), subscription.delete()]); + }); + }); }); describe('Subscription', () => { @@ -261,7 +347,8 @@ describe('pubsub', () => { await topic.create(); await Promise.all(SUBSCRIPTIONS.map(s => s.create())); for (let i = 0; i < 10; i++) { - await topic.publish(Buffer.from('hello')); + const data = Buffer.from('hello'); + await topic.publishMessage({data}); } await new Promise(r => setTimeout(r, 2500)); }); @@ -507,17 +594,17 @@ describe('pubsub', () => { it('should send and receive large messages', done => { const subscription = topic.subscription(SUB_NAMES[0]); - const buf = crypto.randomBytes(9000000); // 9mb + const data = crypto.randomBytes(9000000); // 9mb - topic.publish(buf, (err, messageId) => { + topic.publishMessage({data}, (err, messageId) => { assert.ifError(err); - subscription.on('error', done).on('message', ({id, data}: Message) => { - if (id !== messageId) { + subscription.on('error', done).on('message', (message: Message) => { + if (message.id !== messageId) { return; } - assert.deepStrictEqual(data, buf); + assert.deepStrictEqual(data, message.data); subscription.close(done); }); }); @@ -584,14 +671,15 @@ describe('pubsub', () => { function publish(messageCount: number) { const data = Buffer.from('Hello, world!'); - const promises: Array> = []; + const promises: Array> = []; let id = 0; for (let i = 0; i < messageCount; i++) { const testid = String(++id); + const attributes = {testid}; messages.add(testid); - promises.push(topic.publish(data, {testid})); + promises.push(topic.publishMessage({data, attributes})); } return Promise.all(promises); diff --git a/handwritten/pubsub/test/publisher.ts b/handwritten/pubsub/test/publisher.ts deleted file mode 100644 index ea3a2ce064c..00000000000 --- a/handwritten/pubsub/test/publisher.ts +++ /dev/null @@ -1,435 +0,0 @@ -// Copyright 2017 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import * as pfy from '@google-cloud/promisify'; -import * as assert from 'assert'; -import * as proxyquire from 'proxyquire'; -import * as sinon from 'sinon'; -import * as publishTypes from '../src/publisher'; -import {RequestConfig} from '../src/pubsub'; -import {Topic} from '../src/topic'; -import * as util from '../src/util'; - -let promisified = false; -const fakePromisify = Object.assign({}, pfy, { - promisifyAll( - // tslint:disable-next-line variable-name - Class: typeof publishTypes.Publisher, - options: pfy.PromisifyAllOptions - ) { - if (Class.name === 'Publisher') { - assert.deepStrictEqual(options, { - singular: true, - exclude: ['setOptions'], - }); - promisified = true; - } - }, -}); - -describe('Publisher', () => { - const sandbox = sinon.createSandbox(); - - // tslint:disable-next-line variable-name - let Publisher: typeof publishTypes.Publisher; - let publisher: publishTypes.Publisher; - let batchOpts: publishTypes.BatchPublishOptions; - - const TOPIC_NAME = 'test-topic'; - - const TOPIC = ({ - name: TOPIC_NAME, - Promise: {}, - request: util.noop, - } as {}) as Topic; - - before(() => { - Publisher = proxyquire('../src/publisher.js', { - '@google-cloud/promisify': fakePromisify, - }).Publisher; - }); - - beforeEach(() => { - TOPIC.request = util.noop; - publisher = new Publisher(TOPIC); - batchOpts = publisher.settings.batching!; - }); - - afterEach(() => sandbox.restore()); - - describe('initialization', () => { - it('should promisify all the things', () => { - assert(promisified); - }); - - it('should pass any options to setOptions', () => { - const stub = sandbox.stub(Publisher.prototype, 'setOptions'); - - const fakeOptions = {}; - const p = new Publisher(TOPIC, fakeOptions); - - const [options] = stub.lastCall.args; - assert.strictEqual(options, fakeOptions); - }); - - it('should localize topic.Promise', () => { - assert.strictEqual(publisher.Promise, TOPIC.Promise); - }); - - it('should localize the topic object', () => { - assert.strictEqual(publisher.topic, TOPIC); - }); - - it('should create an inventory object', () => { - assert.deepStrictEqual(publisher.inventory_, { - callbacks: [], - queued: [], - bytes: 0, - }); - }); - }); - - describe('publish', () => { - const sandbox = sinon.createSandbox(); - const DATA = Buffer.from('hello'); - const ATTRS = {a: 'a'}; - - let globalSetTimeout: Function; - - before(() => { - globalSetTimeout = global.setTimeout; - }); - - beforeEach(() => { - publisher.publish_ = util.noop; - // tslint:disable-next-line no-any - (global as any).setTimeout = util.noop; - }); - - afterEach(() => sandbox.restore()); - - after(() => { - // tslint:disable-next-line no-any - (global as any).setTimeout = globalSetTimeout; - }); - - it('should throw an error when data is not a buffer', () => { - assert.throws(() => { - // tslint:disable-next-line no-any - (publisher as any).publish('hello', {}, assert.ifError); - }, /Data must be in the form of a Buffer\./); - }); - - it('should throw when an attribute value is not a string', () => { - const brokenAttrs = { - key1: 'value', - key2: true, - }; - - const expectedErrorMessage = ` - All attributes must be in the form of a string. - \nInvalid value of type "${typeof true}" provided for "key2". - `.trim(); - - assert.throws(() => { - // tslint:disable-next-line no-any - (publisher as any).publish(DATA, brokenAttrs, assert.ifError); - }, expectedErrorMessage); - }); - - it('should queue the data', done => { - sandbox - .stub(publisher, 'queue_') - .callsFake((data, attrs, callback: Function) => { - assert.strictEqual(data, DATA); - assert.strictEqual(attrs, ATTRS); - callback(); // the done fn - }); - - publisher.publish(DATA, ATTRS, done); - }); - - it('should optionally accept attributes', done => { - sandbox - .stub(publisher, 'queue_') - .callsFake((data, attrs, callback: Function) => { - assert.strictEqual(data, DATA); - assert.deepStrictEqual(attrs, {}); - callback(); // the done fn - }); - publisher.publish(DATA, done); - }); - - it('should publish if data puts payload size over cap', done => { - let queueCalled = false; - - publisher.publish_ = () => { - assert.strictEqual(queueCalled, false); - publisher.inventory_.bytes = 0; - }; - - sandbox - .stub(publisher, 'queue_') - .callsFake((data, attrs, callback: Function) => { - assert.strictEqual(publisher.inventory_.bytes, 0); - queueCalled = true; - callback(); // the done fn - }); - - publisher.inventory_.bytes = batchOpts.maxBytes! - 1; - publisher.publish(DATA, done); - }); - - it('should not attempt to publish empty payload if data puts payload above size cap', done => { - const pushRequests: Array<{}> = []; - publisher.settings.batching!.maxBytes = 2; - publisher.inventory_.bytes = 0; - - publisher.publish_ = () => { - assert.notStrictEqual(publisher.inventory_.queued.length, 0); - pushRequests.push(publisher.inventory_.queued); - publisher.inventory_.callbacks.forEach((callback: Function) => { - callback(); - }); - }; - - publisher.publish(DATA, () => { - assert.deepStrictEqual(pushRequests, [ - [ - { - data: DATA, - attributes: {}, - }, - ], - ]); - done(); - }); - }); - - it('should publish if data puts payload at size cap', done => { - sandbox.stub(publisher, 'queue_').callsFake(() => { - publisher.inventory_.bytes += DATA.length; - }); - - publisher.publish_ = done; - publisher.inventory_.bytes = batchOpts.maxBytes! - DATA.length; - publisher.publish(DATA, util.noop); - }); - - it('should publish if data puts payload at message cap', done => { - let queueCalled = false; - - sandbox.stub(publisher, 'queue_').callsFake(() => { - queueCalled = true; - }); - - publisher.publish_ = () => { - assert(queueCalled); - done(); - }; - - publisher.inventory_.queued = new Array(batchOpts.maxMessages).fill({}); - publisher.publish(DATA, util.noop); - }); - - it('should set a timeout if a publish did not occur', done => { - const globalSetTimeout = global.setTimeout; - const fakeTimeoutHandle = 12345; - - // tslint:disable-next-line no-any - (global as any).setTimeout = - // tslint:disable-next-line no-any - (callback: (...args: any[]) => void, duration: number) => { - assert.strictEqual(duration, batchOpts.maxMilliseconds); - global.setTimeout = globalSetTimeout; - setImmediate(callback); - return fakeTimeoutHandle; - }; - - publisher.publish_ = done; - publisher.publish(DATA, util.noop); - - assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); - }); - - // it('should not set a timeout if one exists', () => { - // const fakeTimeoutHandle = 'not-a-real-handle'; - - // publisher.timeoutHandle_ = 'not-a-real-handle'; - // publisher.publish(DATA, util.noop); - // assert.strictEqual(publisher.timeoutHandle_, fakeTimeoutHandle); - // }); - }); - - describe('setOptions', () => { - beforeEach(() => { - delete publisher.settings; - }); - - it('should provide default values for batching', () => { - publisher.setOptions({}); - - assert.deepStrictEqual(publisher.settings.batching, { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 100, - }); - }); - - it('should capture user specified options', () => { - const options = { - batching: { - maxBytes: 10, - maxMessages: 11, - maxMilliseconds: 12, - }, - gaxOpts: {}, - }; - const optionsCopy = Object.assign({}, options); - - publisher.setOptions(options); - - assert.deepStrictEqual(publisher.settings, options); - assert.deepStrictEqual(options, optionsCopy); - }); - - it('should cap maxBytes', () => { - const expected = Math.pow(1024, 2) * 9; - - publisher.setOptions({ - batching: {maxBytes: expected + 1024}, - }); - - assert.strictEqual(publisher.settings.batching!.maxBytes, expected); - }); - - it('should cap maxMessages', () => { - publisher.setOptions({ - batching: {maxMessages: 2000}, - }); - - assert.strictEqual(publisher.settings.batching!.maxMessages, 1000); - }); - - it('should capture gaxOptions', () => { - const fakeGaxOpts = {a: 'a'}; - - publisher.setOptions({ - gaxOpts: fakeGaxOpts, - } as publishTypes.PublishOptions); - - assert.deepStrictEqual(publisher.settings.gaxOpts, fakeGaxOpts); - }); - }); - - describe('publish_', () => { - it('should cancel any publish timeouts', done => { - publisher.timeoutHandle_ = setTimeout(done, 1); - publisher.publish_(); - assert.strictEqual(publisher.timeoutHandle_, undefined); - done(); - }); - - it('should reset the inventory object', () => { - publisher.inventory_.callbacks.push(util.noop); - publisher.inventory_.queued.push({}); - publisher.inventory_.bytes = 5; - - publisher.publish_(); - - assert.deepStrictEqual(publisher.inventory_.callbacks, []); - assert.deepStrictEqual(publisher.inventory_.queued, []); - assert.strictEqual(publisher.inventory_.bytes, 0); - }); - - it('should make the correct request', done => { - const FAKE_MESSAGE = {}; - const FAKE_GAX_OPTS = {timeout: 10, maxRetries: 4}; - - TOPIC.request = config => { - assert.strictEqual(config.client, 'PublisherClient'); - assert.strictEqual(config.method, 'publish'); - assert.deepStrictEqual(config.reqOpts, { - topic: TOPIC_NAME, - messages: [FAKE_MESSAGE], - }); - assert.strictEqual(config.gaxOpts, FAKE_GAX_OPTS); - done(); - }; - - publisher.inventory_.queued.push(FAKE_MESSAGE); - publisher.settings.gaxOpts = FAKE_GAX_OPTS; - publisher.publish_(); - }); - - it('should pass back the err/msg id to correct callback', done => { - const error = new Error('err'); - const FAKE_IDS = ['abc', 'def']; - let callbackCalls = 0; - - publisher.inventory_.callbacks = [ - (err, messageId) => { - assert.strictEqual(err, error); - assert.strictEqual(messageId, FAKE_IDS[0]); - callbackCalls += 1; - }, - (err, messageId) => { - assert.strictEqual(err, error); - assert.strictEqual(messageId, FAKE_IDS[1]); - callbackCalls += 1; - }, - (err, messageId) => { - assert.strictEqual(err, error); - assert.strictEqual(messageId, undefined); - assert.strictEqual(callbackCalls, 2); - done(); - }, - ]; - - TOPIC.request = (config: RequestConfig, callback: Function) => { - callback(error, {messageIds: FAKE_IDS}); - }; - - publisher.publish_(); - }); - }); - - describe('queue_', () => { - const DATA = Buffer.from('hello'); - const ATTRS = {a: 'a'}; - - it('should add the data and attrs to the inventory', () => { - publisher.queue_(DATA, ATTRS, util.noop); - - assert.deepStrictEqual(publisher.inventory_.queued, [ - { - data: DATA, - attributes: ATTRS, - }, - ]); - }); - - it('should update the inventory size', () => { - publisher.queue_(DATA, ATTRS, util.noop); - - assert.strictEqual(publisher.inventory_.bytes, DATA.length); - }); - - it('should capture the callback', () => { - publisher.queue_(DATA, ATTRS, util.noop); - - assert.deepStrictEqual(publisher.inventory_.callbacks, [util.noop]); - }); - }); -}); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts new file mode 100644 index 00000000000..56133c85ca4 --- /dev/null +++ b/handwritten/pubsub/test/publisher/index.ts @@ -0,0 +1,315 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as pfy from '@google-cloud/promisify'; +import * as assert from 'assert'; +import {EventEmitter} from 'events'; +import * as proxyquire from 'proxyquire'; +import * as sinon from 'sinon'; + +import {Topic} from '../../src'; +import * as p from '../../src/publisher'; +import * as q from '../../src/publisher/message-queues'; +import {PublishError} from '../../src/publisher/publish-error'; + +let promisified = false; +const fakePromisify = Object.assign({}, pfy, { + promisifyAll: (ctor: Function, options: pfy.PromisifyAllOptions) => { + if (ctor.name !== 'Publisher') { + return; + } + promisified = true; + assert.ok(options.singular); + assert.deepStrictEqual(options.exclude, ['publish', 'setOptions']); + }, +}); + +class FakeQueue extends EventEmitter { + publisher: p.Publisher; + constructor(publisher: p.Publisher) { + super(); + this.publisher = publisher; + } + add(message: p.PubsubMessage, callback: p.PublishCallback): void {} +} + +class FakeOrderedQueue extends FakeQueue { + orderingKey: string; + error?: Error; + constructor(publisher: p.Publisher, key: string) { + super(publisher); + this.orderingKey = key; + } + resumePublishing(): void {} +} + +describe('Publisher', () => { + const sandbox = sinon.createSandbox(); + const topic = {} as Topic; + + // tslint:disable-next-line variable-name + let Publisher: typeof p.Publisher; + let publisher: p.Publisher; + + before(() => { + const mocked = proxyquire('../../src/publisher/index.js', { + '@google-cloud/promisify': fakePromisify, + './message-queues': { + Queue: FakeQueue, + OrderedQueue: FakeOrderedQueue, + }, + }); + + Publisher = mocked.Publisher; + }); + + beforeEach(() => { + publisher = new Publisher(topic); + }); + + afterEach(() => { + sandbox.restore(); + }); + + describe('initialization', () => { + it('should promisify all the things', () => { + assert(promisified); + }); + + it('should localize Promise class if set', () => { + const t = {Promise} as Topic; + publisher = new Publisher(t); + assert.strictEqual(publisher.Promise, Promise); + }); + + it('should capture user options', () => { + const stub = sandbox.stub(Publisher.prototype, 'setOptions'); + + const options = {}; + publisher = new Publisher(topic, options); + + assert.ok(stub.calledWith(options)); + }); + + it('should localize topic instance', () => { + assert.strictEqual(publisher.topic, topic); + }); + + it('should create a message queue', () => { + assert(publisher.queue instanceof FakeQueue); + assert.strictEqual(publisher.queue.publisher, publisher); + }); + + it('should create a map for ordered queues', () => { + assert(publisher.orderedQueues instanceof Map); + }); + }); + + describe('publish', () => { + const buffer = Buffer.from('Hello, world!'); + const spy = sandbox.spy(); + + it('should call through to publishMessage', () => { + const stub = sandbox.stub(publisher, 'publishMessage'); + + publisher.publish(buffer, spy); + + const [{data}, callback] = stub.lastCall.args; + assert.strictEqual(data, buffer); + assert.strictEqual(callback, spy); + }); + + it('should optionally accept attributes', () => { + const stub = sandbox.stub(publisher, 'publishMessage'); + const attrs = {}; + + publisher.publish(buffer, attrs, spy); + + const [{attributes}, callback] = stub.lastCall.args; + assert.strictEqual(attributes, attrs); + assert.strictEqual(callback, spy); + }); + }); + + describe('publishMessage', () => { + const data = Buffer.from('hello, world!'); + const spy = sandbox.spy(); + + it('should throw an error if data is not a Buffer', () => { + const badData = {} as Buffer; + assert.throws( + () => publisher.publishMessage({data: badData}, spy), + /Data must be in the form of a Buffer\./ + ); + }); + + it('should throw an error if attributes are wrong format', () => { + const attributes = {foo: {bar: 'baz'}} as {}; + + assert.throws( + () => publisher.publishMessage({data, attributes}, spy), + /All attributes must be in the form of a string.\n\nInvalid value of type "object" provided for "foo"\./ + ); + }); + + it('should add non-ordered messages to the message queue', () => { + const stub = sandbox.stub(publisher.queue, 'add'); + const fakeMessage = {data}; + + publisher.publishMessage(fakeMessage, spy); + + const [message, callback] = stub.lastCall.args; + assert.strictEqual(message, fakeMessage); + assert.strictEqual(callback, spy); + }); + + describe('ordered messages', () => { + const orderingKey = 'foo'; + const fakeMessage = {data, orderingKey}; + + let queue: FakeOrderedQueue; + + beforeEach(() => { + queue = new FakeOrderedQueue(publisher, orderingKey); + publisher.orderedQueues.set( + orderingKey, + (queue as unknown) as q.OrderedQueue + ); + }); + + it('should create a new queue for a message if need be', () => { + publisher.orderedQueues.clear(); + publisher.publishMessage(fakeMessage, spy); + + queue = (publisher.orderedQueues.get( + orderingKey + ) as unknown) as FakeOrderedQueue; + + assert(queue instanceof FakeOrderedQueue); + assert.strictEqual(queue.publisher, publisher); + assert.strictEqual(queue.orderingKey, orderingKey); + }); + + it('should add the ordered message to the correct queue', () => { + const stub = sandbox.stub(queue, 'add'); + + publisher.publishMessage(fakeMessage, spy); + + const [message, callback] = stub.lastCall.args; + assert.strictEqual(message, fakeMessage); + assert.strictEqual(callback, spy); + }); + + it('should return an error if the queue encountered an error', done => { + const error = new Error('err') as PublishError; + sandbox + .stub(queue, 'add') + .callsFake((message, callback) => callback(error)); + + publisher.publishMessage(fakeMessage, err => { + assert.strictEqual(err, error); + done(); + }); + }); + + it('should delete the queue once it is empty', () => { + publisher.orderedQueues.clear(); + publisher.publishMessage(fakeMessage, spy); + + queue = (publisher.orderedQueues.get( + orderingKey + ) as unknown) as FakeOrderedQueue; + queue.emit('drain'); + + assert.strictEqual(publisher.orderedQueues.size, 0); + }); + }); + }); + + describe('resumePublishing', () => { + it('should resume publishing for the provided ordering key', () => { + const orderingKey = 'foo'; + const queue = new FakeOrderedQueue(publisher, orderingKey); + const stub = sandbox.stub(queue, 'resumePublishing'); + + publisher.orderedQueues.set( + orderingKey, + (queue as unknown) as q.OrderedQueue + ); + publisher.resumePublishing(orderingKey); + + assert.strictEqual(stub.callCount, 1); + }); + }); + + describe('setOptions', () => { + it('should apply default values', () => { + publisher.setOptions({}); + + assert.deepStrictEqual(publisher.settings, { + batching: { + maxBytes: Math.pow(1024, 2) * 5, + maxMessages: 1000, + maxMilliseconds: 100, + }, + messageOrdering: false, + gaxOpts: { + isBundling: false, + }, + }); + }); + + it('should capture user provided values', () => { + const options = { + batching: { + maxBytes: 10, + maxMessages: 10, + maxMilliseconds: 1, + }, + messageOrdering: true, + gaxOpts: { + isBundling: true, + }, + }; + + publisher.setOptions(options); + + assert.deepStrictEqual(publisher.settings, options); + }); + + it('should cap maxBytes at 9MB', () => { + publisher.setOptions({ + batching: { + maxBytes: Math.pow(1024, 2) * 10, + }, + }); + + const expected = Math.pow(1024, 2) * 9; + assert.strictEqual(publisher.settings.batching!.maxBytes, expected); + }); + + it('should cap maxMessages at 1000', () => { + publisher.setOptions({ + batching: { + maxMessages: 1001, + }, + }); + + const expected = 1000; + assert.strictEqual(publisher.settings.batching!.maxMessages, 1000); + }); + }); +}); diff --git a/handwritten/pubsub/test/publisher/message-batch.ts b/handwritten/pubsub/test/publisher/message-batch.ts new file mode 100644 index 00000000000..2fc81b18adb --- /dev/null +++ b/handwritten/pubsub/test/publisher/message-batch.ts @@ -0,0 +1,176 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {randomBytes} from 'crypto'; +import * as sinon from 'sinon'; + +import {MessageBatch} from '../../src/publisher/message-batch'; + +describe('MessageBatch', () => { + let batch: MessageBatch; + + const sandbox = sinon.createSandbox(); + + const options = { + maxBytes: 1000, + maxMessages: 100, + }; + + beforeEach(() => { + batch = new MessageBatch(Object.assign({}, options)); + }); + + afterEach(() => { + sandbox.restore(); + }); + + describe('initialization', () => { + it('should localize options', () => { + assert.deepStrictEqual(batch.options, options); + }); + + it('should create a message array', () => { + assert.deepStrictEqual(batch.messages, []); + }); + + it('should create a callback array', () => { + assert.deepStrictEqual(batch.callbacks, []); + }); + + it('should capture the creation time', () => { + const now = Date.now(); + + sandbox.stub(Date, 'now').returns(now); + batch = new MessageBatch(options); + + assert.strictEqual(batch.created, now); + }); + + it('should initialize bytes to 0', () => { + assert.strictEqual(batch.bytes, 0); + }); + }); + + describe('add', () => { + const callback = sandbox.spy(); + const message = { + data: Buffer.from('Hello, world!'), + }; + + it('should add the message to the message array', () => { + batch.add(message, callback); + assert.deepStrictEqual(batch.messages, [message]); + }); + + it('should add the callback to the callback array', () => { + batch.add(message, callback); + assert.deepStrictEqual(batch.callbacks, [callback]); + }); + + it('should adjust the byte count', () => { + batch.add(message, callback); + assert.strictEqual(batch.bytes, message.data.length); + }); + }); + + describe('canFit', () => { + const message = { + data: Buffer.from('Hello, world!'), + }; + + it('should return false if too many messages', () => { + batch.options.maxMessages = 0; + const canFit = batch.canFit(message); + assert.strictEqual(canFit, false); + }); + + it('should return false if too many bytes', () => { + batch.options.maxBytes = message.data.length - 1; + const canFit = batch.canFit(message); + assert.strictEqual(canFit, false); + }); + + it('should return true if it can fit', () => { + const canFit = batch.canFit(message); + assert.strictEqual(canFit, true); + }); + }); + + describe('isAtMax', () => { + it('should return true if at max message limit', () => { + // tslint:disable-next-line ban + Array(1000) + .fill({ + data: Buffer.from('Hello!'), + }) + .forEach(message => { + batch.add(message, sandbox.spy()); + }); + + const isAtMax = batch.isAtMax(); + assert.strictEqual(isAtMax, true); + }); + + it('should return true if at max byte limit', () => { + const message = { + data: randomBytes(Math.pow(1024, 2) * 9), + }; + + batch.add(message, sandbox.spy()); + + const isAtMax = batch.isAtMax(); + assert.strictEqual(isAtMax, true); + }); + + it('should return false if it is not full', () => { + const message = { + data: randomBytes(500), + }; + + batch.add(message, sandbox.spy()); + + const isAtMax = batch.isAtMax(); + assert.strictEqual(isAtMax, false); + }); + }); + + describe('isFull', () => { + const message = { + data: Buffer.from('Hello, world!'), + }; + + it('should return true if at max message limit', () => { + batch.options.maxMessages = 1; + batch.add(message, sandbox.spy()); + const isFull = batch.isFull(); + assert.strictEqual(isFull, true); + }); + + it('should return true if at max byte limit', () => { + batch.options.maxBytes = message.data.length; + batch.add(message, sandbox.spy()); + const isFull = batch.isFull(); + assert.strictEqual(isFull, true); + }); + + it('should return false if it is not full', () => { + batch.add(message, sandbox.spy()); + const isFull = batch.isFull(); + assert.strictEqual(isFull, false); + }); + }); +}); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts new file mode 100644 index 00000000000..5cd2c2b0ef0 --- /dev/null +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -0,0 +1,661 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {ServiceError} from '@grpc/grpc-js'; +import * as assert from 'assert'; +import {EventEmitter} from 'events'; +import * as proxyquire from 'proxyquire'; +import * as sinon from 'sinon'; + +import {RequestConfig, RequestCallback} from '../../src/pubsub'; +import * as p from '../../src/publisher'; +import * as b from '../../src/publisher/message-batch'; +import * as q from '../../src/publisher/message-queues'; +import {PublishError} from '../../src/publisher/publish-error'; + +class FakeTopic { + name = 'fake-topic'; + request(config: RequestConfig, callback: RequestCallback): void {} +} + +class FakePublisher { + topic: FakeTopic; + settings: p.PublishOptions; + constructor(topic: FakeTopic) { + this.topic = topic; + this.settings = { + batching: {}, + }; + } +} + +class FakeMessageBatch { + callbacks: p.PublishCallback[]; + created: number; + messages: p.PubsubMessage[]; + options: b.BatchPublishOptions; + constructor(options = {} as b.BatchPublishOptions) { + this.callbacks = []; + this.created = Date.now(); + this.messages = []; + this.options = options; + } + add(message: p.PubsubMessage, callback: p.PublishCallback): void {} + canFit(message: p.PubsubMessage): boolean { + return true; + } + isAtMax(): boolean { + return false; + } + isFull(): boolean { + return false; + } +} + +class FakePublishError { + orderingKey: string; + error: ServiceError; + constructor(key: string, error: ServiceError) { + this.orderingKey = key; + this.error = error; + } +} + +describe('Message Queues', () => { + const sandbox = sinon.createSandbox(); + + // tslint:disable-next-line no-any variable-name + let MessageQueue: any; + // tslint:disable-next-line variable-name + let Queue: typeof q.Queue; + // tslint:disable-next-line variable-name + let OrderedQueue: typeof q.OrderedQueue; + + let topic: FakeTopic; + let publisher: FakePublisher; + + before(() => { + const mocked = proxyquire('../../src/publisher/message-queues.js', { + './message-batch': {MessageBatch: FakeMessageBatch}, + './publish-error': {PublishError: FakePublishError}, + }); + + MessageQueue = mocked.MessageQueue; + Queue = mocked.Queue; + OrderedQueue = mocked.OrderedQueue; + }); + + beforeEach(() => { + topic = new FakeTopic(); + publisher = new FakePublisher(topic); + }); + + afterEach(() => { + sandbox.restore(); + }); + + describe('MessageQueue', () => { + let queue: q.Queue; + + beforeEach(() => { + queue = new MessageQueue(publisher as p.Publisher); + }); + + describe('initialization', () => { + it('should extend EventEmitter', () => { + assert(queue instanceof EventEmitter); + }); + + it('should localize the publisher', () => { + assert.strictEqual(queue.publisher, publisher); + }); + + it('should localize the batch options', () => { + const batching = {maxMessages: 1001}; + publisher.settings = {batching}; + + queue = new MessageQueue(publisher as p.Publisher); + assert.strictEqual(queue.batchOptions, batching); + }); + }); + + describe('_publish', () => { + const messages = [{}, {}, {}]; + const callbacks = messages.map(() => sandbox.spy()); + + it('should make the correct request', () => { + const stub = sandbox.stub(topic, 'request'); + + queue._publish(messages, callbacks); + + const [{client, method, reqOpts}] = stub.lastCall.args; + assert.strictEqual(client, 'PublisherClient'); + assert.strictEqual(method, 'publish'); + assert.deepStrictEqual(reqOpts, {topic: topic.name, messages}); + }); + + it('should pass along any gax options', () => { + const stub = sandbox.stub(topic, 'request'); + const callOptions = {}; + + publisher.settings.gaxOpts = callOptions; + queue._publish(messages, callbacks); + + const [{gaxOpts}] = stub.lastCall.args; + assert.strictEqual(gaxOpts, callOptions); + }); + + it('should pass back any request errors', done => { + const error = new Error('err') as ServiceError; + + sandbox.stub(topic, 'request').callsFake((config, callback) => { + callback(error); + }); + + queue._publish(messages, callbacks, err => { + assert.strictEqual(err, error); + + callbacks.forEach(callback => { + const [err] = callback.lastCall.args; + assert.strictEqual(err, error); + }); + + done(); + }); + }); + + it('should pass back message ids', done => { + const messageIds = messages.map((_, i) => `message${i}`); + + sandbox.stub(topic, 'request').callsFake((config, callback) => { + callback(null, {messageIds}); + }); + + queue._publish(messages, callbacks, err => { + assert.ifError(err); + + callbacks.forEach((callback, i) => { + const [, messageId] = callback.lastCall.args; + const expectedId = `message${i}`; + assert.strictEqual(messageId, expectedId); + }); + + done(); + }); + }); + }); + }); + + describe('Queue', () => { + let queue: q.Queue; + + beforeEach(() => { + queue = new Queue(publisher as p.Publisher); + }); + + describe('initialization', () => { + it('should create a message batch', () => { + assert.ok(queue.batch instanceof FakeMessageBatch); + assert.strictEqual(queue.batch.options, queue.batchOptions); + }); + }); + + describe('add', () => { + const spy = sandbox.spy(); + const fakeMessage: p.PubsubMessage = {}; + + it('should publish immediately if unable to fit message', done => { + const addStub = sandbox.stub(queue.batch, 'add'); + sandbox.stub(queue.batch, 'canFit').returns(false); + + sandbox + .stub(queue, 'publish') + .onCall(0) + .callsFake(() => { + assert.strictEqual(addStub.callCount, 0); + done(); + }); + + queue.add(fakeMessage, spy); + }); + + it('should add the message to the batch', () => { + const stub = sandbox.stub(queue.batch, 'add'); + sandbox.stub(queue, 'publish'); + + queue.add(fakeMessage, spy); + + const [message, callback] = stub.lastCall.args; + assert.strictEqual(message, fakeMessage); + assert.strictEqual(callback, spy); + }); + + it('should publish immediately if the batch became full', () => { + const stub = sandbox.stub(queue, 'publish'); + sandbox.stub(queue.batch, 'isFull').returns(true); + + queue.add(fakeMessage, spy); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should set a timeout to publish if need be', () => { + const clock = sandbox.useFakeTimers(); + const stub = sandbox.stub(queue, 'publish'); + const maxMilliseconds = 1234; + + queue.batchOptions = {maxMilliseconds}; + queue.add(fakeMessage, spy); + + assert.strictEqual(stub.callCount, 0); + clock.tick(maxMilliseconds); + assert.strictEqual(stub.callCount, 1); + clock.restore(); + }); + + it('should noop if a timeout is already set', () => { + const clock = sandbox.useFakeTimers(); + const stub = sandbox.stub(queue, 'publish'); + const maxMilliseconds = 1234; + + queue.batchOptions = {maxMilliseconds}; + queue.pending = (1234 as unknown) as NodeJS.Timer; + queue.add(fakeMessage, spy); + + clock.tick(maxMilliseconds); + assert.strictEqual(stub.callCount, 0); + clock.restore(); + }); + }); + + describe('publish', () => { + it('should create a new batch', () => { + const oldBatch = queue.batch; + + queue.publish(); + + assert.notStrictEqual(oldBatch, queue.batch); + assert.ok(queue.batch instanceof FakeMessageBatch); + assert.strictEqual(queue.batch.options, queue.batchOptions); + }); + + it('should cancel any pending publish calls', () => { + const fakeHandle = (1234 as unknown) as NodeJS.Timer; + const stub = sandbox.stub(global, 'clearTimeout').withArgs(fakeHandle); + + queue.pending = fakeHandle; + queue.publish(); + + assert.strictEqual(stub.callCount, 1); + assert.strictEqual(queue.pending, undefined); + }); + + it('should publish the messages', () => { + const batch = queue.batch; + const stub = sandbox.stub(queue, '_publish'); + + queue.publish(); + + const [messages, callbacks] = stub.lastCall.args; + assert.strictEqual(messages, batch.messages); + assert.strictEqual(callbacks, batch.callbacks); + }); + }); + }); + + describe('OrderedQueue', () => { + const key = 'abcd'; + let queue: q.OrderedQueue; + + beforeEach(() => { + queue = new OrderedQueue(publisher as p.Publisher, key); + }); + + describe('initialization', () => { + it('should create an array of batches', () => { + assert.deepStrictEqual(queue.batches, []); + }); + + it('should default inFlight ot false', () => { + assert.strictEqual(queue.inFlight, false); + }); + + it('should localize the ordering key', () => { + assert.strictEqual(queue.key, key); + }); + }); + + describe('currentBatch', () => { + it('should return the oldest known batch', () => { + const batches = [ + new FakeMessageBatch(), + new FakeMessageBatch(), + ] as b.MessageBatch[]; + queue.batches.push(...batches); + assert.strictEqual(queue.currentBatch, batches[0]); + }); + + it('should create a new batch if one does not exist', () => { + assert.strictEqual(queue.batches.length, 0); + assert.ok(queue.currentBatch instanceof FakeMessageBatch); + assert.strictEqual(queue.batches.length, 1); + }); + }); + + describe('add', () => { + const fakeMessage: p.PubsubMessage = {}; + const spy = sandbox.spy(); + + let batch: FakeMessageBatch; + + beforeEach(() => { + batch = queue.currentBatch as FakeMessageBatch; + }); + + describe('with batch in flight', () => { + beforeEach(() => { + queue.inFlight = true; + }); + + it('should add the message to current batch', () => { + const stub = sandbox.stub(batch, 'add'); + + queue.add(fakeMessage, spy); + + const [message, callback] = stub.lastCall.args; + assert.strictEqual(message, fakeMessage); + assert.strictEqual(callback, spy); + }); + + it('should create a new batch if current one is at max', () => { + const fakeBatch = new FakeMessageBatch() as b.MessageBatch; + const stub = sandbox.stub(fakeBatch, 'add'); + + sandbox.stub(batch, 'isAtMax').returns(true); + sandbox.stub(queue, 'createBatch').returns(fakeBatch); + + queue.add(fakeMessage, spy); + + assert.deepStrictEqual(queue.batches, [fakeBatch, batch]); + const [message, callback] = stub.lastCall.args; + assert.strictEqual(message, fakeMessage); + assert.strictEqual(callback, spy); + }); + }); + + describe('without a batch in flight', () => { + it('should publish immediately if it cannot fit the message', done => { + const addStub = sandbox.stub(batch, 'add'); + + sandbox + .stub(batch, 'canFit') + .withArgs(fakeMessage) + .returns(false); + sandbox + .stub(queue, 'publish') + .onCall(0) + .callsFake(() => { + assert.strictEqual(addStub.callCount, 0); + done(); + }); + + queue.add(fakeMessage, spy); + }); + + it('should add the message to the current batch', () => { + const stub = sandbox.stub(batch, 'add'); + + queue.add(fakeMessage, spy); + + const [message, callback] = stub.lastCall.args; + assert.strictEqual(message, fakeMessage); + assert.strictEqual(callback, spy); + }); + + it('should noop after adding if a publish was triggered', () => { + const publishStub = sandbox.stub(queue, 'publish'); + const beginPublishStub = sandbox.stub(queue, 'beginNextPublish'); + + sandbox.stub(batch, 'canFit').returns(false); + + publishStub.onCall(0).callsFake(() => { + queue.inFlight = true; + }); + + queue.add(fakeMessage, spy); + + assert.strictEqual(publishStub.callCount, 1); + assert.strictEqual(beginPublishStub.callCount, 0); + }); + + it('should publish immediately if the batch is full', () => { + const stub = sandbox.stub(queue, 'publish'); + + sandbox.stub(batch, 'isFull').returns(true); + queue.add(fakeMessage, spy); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should schedule a publish if one is not pending', () => { + const stub = sandbox.stub(queue, 'beginNextPublish'); + + queue.add(fakeMessage, spy); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should noop after adding if a publish is already pending', () => { + const stub = sandbox.stub(queue, 'beginNextPublish'); + + queue.pending = (1234 as unknown) as NodeJS.Timer; + queue.add(fakeMessage, spy); + + assert.strictEqual(stub.callCount, 0); + }); + }); + }); + + describe('beginNextPublish', () => { + const maxMilliseconds = 10000; + let clock: sinon.SinonFakeTimers; + + beforeEach(() => { + queue.batchOptions = {maxMilliseconds}; + clock = sinon.useFakeTimers(); + }); + + afterEach(() => { + clock.restore(); + }); + + it('should set a timeout that will call publish', done => { + sandbox.stub(queue, 'publish').callsFake(done); + queue.beginNextPublish(); + clock.tick(maxMilliseconds); + }); + + it('should factor in the time the batch has been sitting', done => { + const halfway = maxMilliseconds / 2; + sandbox.stub(queue, 'publish').callsFake(done); + queue.currentBatch.created = Date.now() - halfway; + queue.beginNextPublish(); + clock.tick(halfway); + }); + + it('should not set a timeout with a negative number', () => { + const stub = sandbox.stub(global, 'setTimeout'); + + queue.currentBatch.created = Date.now() - maxMilliseconds * 2; + queue.beginNextPublish(); + + const [, delay] = stub.lastCall.args; + assert.strictEqual(delay, 0); + }); + }); + + describe('createBatch', () => { + it('should create a batch with the correct options', () => { + const batchOptions = {}; + queue.batchOptions = batchOptions; + const batch = queue.createBatch(); + + assert.ok(batch instanceof FakeMessageBatch); + assert.strictEqual(batch.options, batchOptions); + }); + }); + + describe('handlePublishFailure', () => { + const error = new Error('err') as ServiceError; + + it('should localize the publish error', () => { + queue.handlePublishFailure(error); + + assert.ok(queue.error instanceof FakePublishError); + assert.strictEqual(queue.error!.orderingKey, key); + assert.strictEqual(queue.error!.error, error); + }); + + it('should pass the error to call pending callbacks', () => { + const spies = [sandbox.spy(), sandbox.spy()]; + + queue.currentBatch.callbacks = spies; + queue.handlePublishFailure(error); + + assert.strictEqual(queue.batches.length, 0); + + spies.forEach(spy => { + assert.ok(spy.calledWith(error)); + }); + }); + }); + + describe('publish', () => { + const fakeMessages = [{}, {}] as p.PubsubMessage[]; + const spies = [sandbox.spy(), sandbox.spy()] as p.PublishCallback[]; + + beforeEach(() => { + queue.currentBatch.messages = fakeMessages; + queue.currentBatch.callbacks = spies; + }); + + it('should set inFlight to true', () => { + queue.publish(); + assert.strictEqual(queue.inFlight, true); + }); + + it('should cancel any pending publishes', () => { + const fakeHandle = (1234 as unknown) as NodeJS.Timer; + const stub = sandbox.stub(global, 'clearTimeout'); + + queue.pending = fakeHandle; + queue.publish(); + + const [handle] = stub.lastCall.args; + assert.strictEqual(handle, fakeHandle); + assert.strictEqual(queue.pending, undefined); + }); + + it('should remove the oldest batch from the batch list', () => { + const oldestBatch = queue.currentBatch; + + queue.publish(); + + assert.notStrictEqual(queue.currentBatch, oldestBatch); + }); + + it('should publish the batch', () => { + const stub = sandbox.stub(queue, '_publish'); + + queue.publish(); + + const [messages, callbacks] = stub.lastCall.args; + assert.strictEqual(messages, fakeMessages); + assert.strictEqual(callbacks, spies); + }); + + it('should set inFlight to false after publishing', () => { + sandbox.stub(queue, '_publish').callsFake((m, c, done) => done!(null)); + + queue.publish(); + + assert.strictEqual(queue.inFlight, false); + }); + + it('should handle any publish failures', () => { + const error = new Error('err') as ServiceError; + const stub = sandbox.stub(queue, 'handlePublishFailure'); + + sandbox.stub(queue, '_publish').callsFake((m, c, done) => done!(error)); + + queue.publish(); + + const [err] = stub.lastCall.args; + assert.strictEqual(err, error); + }); + + it('should begin another publish if there are pending batches', () => { + const stub = sandbox.stub(queue, 'beginNextPublish'); + sandbox.stub(queue, '_publish').callsFake((m, c, done) => done!(null)); + + const secondBatch = new FakeMessageBatch(); + secondBatch.messages = fakeMessages; + secondBatch.callbacks = spies; + + queue.batches.push(secondBatch as b.MessageBatch); + queue.publish(); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should emit "drain" if there is nothing left to publish', () => { + const spy = sandbox.spy(); + sandbox.stub(queue, '_publish').callsFake((m, c, done) => done!(null)); + + queue.on('drain', spy); + queue.publish(); + + assert.strictEqual(spy.callCount, 1); + }); + }); + + describe('resumePublishing', () => { + const error = new Error('err') as PublishError; + + beforeEach(() => { + queue.error = error; + }); + + it('should delete the cached publish error', () => { + queue.resumePublishing(); + assert.strictEqual(queue.error, undefined); + }); + + it('should emit the drain event if there are no more batches', done => { + queue.on('drain', done); + queue.resumePublishing(); + }); + + it('should not emit the drain event if publishing continues', done => { + queue.on('drain', () => done(new Error('Should not be called.'))); + queue.resumePublishing(); + + assert.ok(queue.currentBatch); + process.nextTick(() => done()); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/publisher/publish-error.ts b/handwritten/pubsub/test/publisher/publish-error.ts new file mode 100644 index 00000000000..52bb9104486 --- /dev/null +++ b/handwritten/pubsub/test/publisher/publish-error.ts @@ -0,0 +1,61 @@ +/*! + * Copyright 2019 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {ServiceError, Metadata} from '@grpc/grpc-js'; +import {PublishError} from '../../src/publisher/publish-error'; + +describe('PublishError', () => { + let error: PublishError; + + const orderingKey = 'abcd'; + const fakeError = new Error('Oh noes') as ServiceError; + + fakeError.code = 1; + fakeError.details = 'Something went wrong!'; + fakeError.metadata = new Metadata(); + + beforeEach(() => { + error = new PublishError(orderingKey, fakeError); + }); + + it('should give a helpful message', () => { + assert.strictEqual( + error.message, + `Unable to publish for key "${orderingKey}". Reason: ${fakeError.message}` + ); + }); + + it('should capture the error code', () => { + assert.strictEqual(error.code, fakeError.code); + }); + + it('should capture the error details', () => { + assert.strictEqual(error.details, fakeError.details); + }); + + it('should capture the error metadata', () => { + assert.strictEqual(error.metadata, fakeError.metadata); + }); + + it('should capture the ordering key', () => { + assert.strictEqual(error.orderingKey, orderingKey); + }); + + it('should capture the original error', () => { + assert.strictEqual(error.error, fakeError); + }); +}); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 9433de8c3a6..172e6686675 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -39,6 +39,7 @@ const fakePromisify = Object.assign({}, pfy, { assert.deepStrictEqual(options.exclude, [ 'publish', 'publishJSON', + 'publishMessage', 'setPublishOptions', 'subscription', ]); @@ -59,7 +60,7 @@ class FakePublisher { constructor(...args: Array<{}>) { this.calledWith_ = args; } - publish(...args: Array<{}>) { + publishMessage(...args: Array<{}>) { this.published_ = args; } setOptions(options: object) { @@ -576,19 +577,19 @@ describe('Topic', () => { }); describe('publish', () => { - it('should call through to Publisher#publish', () => { - const data = Buffer.from('Hello, world!'); - const attributes = {}; - const callback = () => {}; + it('should call through to Topic#publishMessage', () => { + const fdata = Buffer.from('Hello, world!'); + const fattributes = {}; + const fcallback = () => {}; - const fakePromise = Promise.resolve(); - const stub = sandbox - .stub(topic.publisher, 'publish') - .withArgs(data, attributes, callback) - .returns(fakePromise); + const stub = sandbox.stub(topic, 'publishMessage'); - const promise = topic.publish(data, attributes, callback); - assert.strictEqual(promise, fakePromise); + topic.publish(fdata, fattributes, fcallback); + + const [{data, attributes}, callback] = stub.lastCall.args; + assert.strictEqual(data, fdata); + assert.strictEqual(attributes, fattributes); + assert.strictEqual(callback, fcallback); }); }); @@ -599,30 +600,55 @@ describe('Topic', () => { assert.throws(() => topic.publishJSON('hi'), expectedError); }); - it('should transform JSON into a Buffer', () => { - const stub = sandbox.stub(topic, 'publish'); - const json = {foo: 'bar'}; - const expectedBuffer = Buffer.from(JSON.stringify(json)); - - topic.publishJSON(json); - - const [buffer] = stub.lastCall.args; - assert.deepStrictEqual(buffer, expectedBuffer); - }); - it('should pass along the attributes and callback', () => { - const stub = sandbox.stub(topic, 'publish'); + const stub = sandbox.stub(topic, 'publishMessage'); const fakeAttributes = {}; const fakeCallback = () => {}; topic.publishJSON({}, fakeAttributes, fakeCallback); - const [, attributes, callback] = stub.lastCall.args; + const [{attributes}, callback] = stub.lastCall.args; assert.strictEqual(attributes, fakeAttributes); assert.strictEqual(callback, fakeCallback); }); }); + describe('publishMessage', () => { + it('should call through to Publisher#publishMessage', () => { + const stub = sandbox.stub(topic.publisher, 'publishMessage'); + + const fdata = Buffer.from('Hello, world!'); + const fattributes = {}; + const fcallback = () => {}; + + topic.publish(fdata, fattributes, fcallback); + + const [{data, attributes}, callback] = stub.lastCall.args; + assert.strictEqual(data, fdata); + assert.strictEqual(attributes, fattributes); + assert.strictEqual(callback, fcallback); + }); + + it('should transform JSON into a Buffer', () => { + const json = {foo: 'bar'}; + const expectedBuffer = Buffer.from(JSON.stringify(json)); + const stub = sandbox.stub(topic.publisher, 'publishMessage'); + + topic.publishMessage({json}); + + const [{data}] = stub.lastCall.args; + assert.deepStrictEqual(data, expectedBuffer); + }); + + it('should return the return value of Publisher#publishMessage', () => { + const fakePromise = Promise.resolve(); + sandbox.stub(topic.publisher, 'publishMessage').resolves(fakePromise); + + const promise = topic.publishMessage({data: Buffer.from('hi')}); + assert.strictEqual(promise, fakePromise); + }); + }); + describe('setMetadata', () => { const METADATA = { labels: {yee: 'haw'}, diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index b10ee498aef..31be13957ed 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -5,8 +5,8 @@ "outDir": "build" }, "include": [ - "src/*.ts", - "test/*.ts", + "src/**/*.ts", + "test/**/*.ts", "system-test/*.ts" ] } From b7600de453e28ec90259c28f1460709e9b4a9ad5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2019 14:14:44 -0500 Subject: [PATCH 0545/1115] chore: release 1.2.0 (#835) --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 17bfd199736..46792b67772 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [1.2.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.6...v1.2.0) (2019-12-13) + + +### Features + +* ordered messaging ([#716](https://www.github.com/googleapis/nodejs-pubsub/issues/716)) ([b2f96ff](https://www.github.com/googleapis/nodejs-pubsub/commit/b2f96ffe6c1db93741f40804786f8c294717676b)) + ### [1.1.6](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.5...v1.1.6) (2019-11-25) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 20519b4512a..453ecd2726a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.1.6", + "version": "1.2.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 9281532b78eedd3f48e261027378077bc79c2a68 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Thu, 26 Dec 2019 16:28:46 -0500 Subject: [PATCH 0546/1115] docs: update jsdoc license/samples-README (#836) --- handwritten/pubsub/.jsdoc.js | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index 6139e0dd040..5e602eaff24 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -1,18 +1,17 @@ -/*! - * Copyright 2018 Google LLC. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2019 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// 'use strict'; From 77ec381ab206b23ecfaedff70fda385a0d2b4775 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 31 Dec 2019 23:05:21 +0200 Subject: [PATCH 0547/1115] chore(deps): update dependency sinon to v8 (#839) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 453ecd2726a..810128d0be3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -97,7 +97,7 @@ "power-assert": "^1.4.4", "prettier": "^1.18.2", "proxyquire": "^2.0.0", - "sinon": "^7.1.1", + "sinon": "^8.0.0", "source-map-support": "^0.5.9", "typescript": "3.6.4", "uuid": "^3.1.0", From d34d3798f3f2682e1086e34a530b269a321bfab2 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 2 Jan 2020 09:51:47 -0800 Subject: [PATCH 0548/1115] refactor: drop usage of is (#843) --- handwritten/pubsub/package.json | 1 - handwritten/pubsub/src/pubsub.ts | 7 +++---- handwritten/pubsub/src/subscription.ts | 5 ++--- handwritten/pubsub/src/topic.ts | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 810128d0be3..0ce0b26cbe2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,6 @@ "@google-cloud/precise-date": "^1.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", - "@sindresorhus/is": "^1.0.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index aaa69bd0734..af215e32b34 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -17,7 +17,6 @@ import {paginator} from '@google-cloud/paginator'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisifyAll} from '@google-cloud/promisify'; -import is from '@sindresorhus/is'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; import * as gax from 'google-gax'; @@ -378,10 +377,10 @@ export class PubSub { optionsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, callback?: CreateSubscriptionCallback ): Promise | void { - if (!is.string(topic) && !(topic instanceof Topic)) { + if (typeof topic !== 'string' && !(topic instanceof Topic)) { throw new Error('A Topic is required for a new subscription.'); } - if (!is.string(name)) { + if (typeof name !== 'string') { throw new Error('A subscription name is required.'); } if (typeof topic === 'string') { @@ -975,7 +974,7 @@ export class PubSub { * const snapshot = pubsub.snapshot('my-snapshot'); */ snapshot(name: string): Snapshot { - if (!is.string(name)) { + if (typeof name !== 'string') { throw new Error('You must supply a valid name for the snapshot.'); } return new Snapshot(this, name); diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 336ba0870ac..f90436e01bc 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -15,7 +15,6 @@ */ import {promisifyAll} from '@google-cloud/promisify'; -import is from '@sindresorhus/is'; import {EventEmitter} from 'events'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; @@ -441,7 +440,7 @@ export class Subscription extends EventEmitter { optsOrCallback?: CallOptions | CreateSnapshotCallback, callback?: CreateSnapshotCallback ): void | Promise { - if (!is.string(name)) { + if (typeof name !== 'string') { throw new Error('A name is required to create a snapshot.'); } const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; @@ -881,7 +880,7 @@ export class Subscription extends EventEmitter { if (typeof snapshot === 'string') { reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); - } else if (is.date(snapshot)) { + } else if (Object.prototype.toString.call(snapshot) === '[object Date]') { reqOpts.time = snapshot as google.protobuf.ITimestamp; } else { throw new Error('Either a snapshot name or Date is needed to seek to.'); diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 73f396cd520..7f66763fcc1 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -16,7 +16,6 @@ import {paginator} from '@google-cloud/paginator'; import {promisifyAll} from '@google-cloud/promisify'; -import is from '@sindresorhus/is'; import {CallOptions} from 'google-gax'; import {google} from '../proto/pubsub'; @@ -711,7 +710,7 @@ export class Topic { attrsOrCb?: Attributes | PublishCallback, callback?: PublishCallback ): Promise | void { - if (!is.object(json)) { + if (!json || typeof json !== 'object') { throw new Error('First parameter should be an object.'); } const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; @@ -779,7 +778,7 @@ export class Topic { ): Promise<[string]> | void { message = Object.assign({}, message); - if (is.object(message.json)) { + if (message.json && typeof message.json === 'object') { message.data = Buffer.from(JSON.stringify(message.json)); delete message.json; } From 28b225375c1dd1039ac9ff0245e4ef6af7680b9c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 3 Jan 2020 22:52:41 -0800 Subject: [PATCH 0549/1115] build: adds list of files to synth.metadata Co-authored-by: Benjamin E. Coe Co-authored-by: Alexander Fenster --- handwritten/pubsub/synth.metadata | 3468 ++++++++++++++++++++++++++++- 1 file changed, 3463 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 6c433b7d511..62be76aacc2 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-11-19T12:24:12.897704Z", + "updateTime": "2019-12-21T12:23:10.592493Z", "sources": [ { "generator": { "name": "artman", - "version": "0.42.1", - "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57" + "version": "0.42.3", + "dockerImage": "googleapis/artman@sha256:feed210b5723c6f524b52ef6d7740a030f2d1a8f7c29a71c5e5b4481ceaad7f5" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "d8dd7fe8d5304f7bd1c52207703d7f27d5328c5a", - "internalRef": "281088257" + "sha": "1a380ea21dea9b6ac6ad28c60ad96d9d73574e19", + "internalRef": "286616241" } }, { @@ -35,5 +35,3463 @@ "config": "google/pubsub/artman_pubsub.yaml" } } + ], + "newFiles": [ + { + "path": ".repo-metadata.json" + }, + { + "path": "README.md" + }, + { + "path": "package.json" + }, + { + "path": "CHANGELOG.md" + }, + { + "path": ".gitignore" + }, + { + "path": "CODE_OF_CONDUCT.md" + }, + { + "path": "CONTRIBUTING.md" + }, + { + "path": ".prettierrc" + }, + { + "path": "package-lock.json" + }, + { + "path": ".eslintignore" + }, + { + "path": "linkinator.config.json" + }, + { + "path": ".eslintrc.yml" + }, + { + "path": "renovate.json" + }, + { + "path": "synth.metadata" + }, + { + "path": ".prettierignore" + }, + { + "path": "synth.py" + }, + { + "path": ".readme-partials.yml" + }, + { + "path": "codecov.yaml" + }, + { + "path": "tslint.json" + }, + { + "path": ".jsdoc.js" + }, + { + "path": "LICENSE" + }, + { + "path": ".nycrc" + }, + { + "path": "tsconfig.json" + }, + { + "path": "src/util.ts" + }, + { + "path": "src/pull-retry.ts" + }, + { + "path": "src/subscriber.ts" + }, + { + "path": "src/message-stream.ts" + }, + { + "path": "src/index.ts" + }, + { + "path": "src/lease-manager.ts" + }, + { + "path": "src/.eslintrc.yml" + }, + { + "path": "src/histogram.ts" + }, + { + "path": "src/subscription.ts" + }, + { + "path": "src/snapshot.ts" + }, + { + "path": "src/pubsub.ts" + }, + { + "path": "src/topic.ts" + }, + { + "path": "src/message-queues.ts" + }, + { + "path": "src/service_proto_list.json" + }, + { + "path": "src/iam.ts" + }, + { + "path": "src/v1/publisher_client.js" + }, + { + "path": "src/v1/publisher_client_config.json" + }, + { + "path": "src/v1/subscriber_client_config.json" + }, + { + "path": "src/v1/index.js" + }, + { + "path": "src/v1/publisher_proto_list.json" + }, + { + "path": "src/v1/subscriber_proto_list.json" + }, + { + "path": "src/v1/subscriber_client.js" + }, + { + "path": "src/v1/doc/google/type/doc_expr.js" + }, + { + "path": "src/v1/doc/google/iam/v1/doc_policy.js" + }, + { + "path": "src/v1/doc/google/iam/v1/doc_options.js" + }, + { + "path": "src/v1/doc/google/iam/v1/doc_iam_policy.js" + }, + { + "path": "src/v1/doc/google/pubsub/v1/doc_pubsub.js" + }, + { + "path": "src/v1/doc/google/protobuf/doc_field_mask.js" + }, + { + "path": "src/v1/doc/google/protobuf/doc_duration.js" + }, + { + "path": "src/v1/doc/google/protobuf/doc_timestamp.js" + }, + { + "path": "src/v1/doc/google/protobuf/doc_empty.js" + }, + { + "path": "src/publisher/message-batch.ts" + }, + { + "path": "src/publisher/index.ts" + }, + { + "path": "src/publisher/publish-error.ts" + }, + { + "path": "src/publisher/message-queues.ts" + }, + { + "path": "build/src/index.d.ts" + }, + { + "path": "build/src/subscriber.js.map" + }, + { + "path": "build/src/lease-manager.js.map" + }, + { + "path": "build/src/pull-retry.js.map" + }, + { + "path": "build/src/pull-retry.js" + }, + { + "path": "build/src/iam.js.map" + }, + { + "path": "build/src/index.js.map" + }, + { + "path": "build/src/message-stream.js.map" + }, + { + "path": "build/src/message-queues.d.ts" + }, + { + "path": "build/src/snapshot.d.ts" + }, + { + "path": "build/src/iam.d.ts" + }, + { + "path": "build/src/subscriber.js" + }, + { + "path": "build/src/snapshot.js.map" + }, + { + "path": "build/src/subscriber.d.ts" + }, + { + "path": "build/src/subscription.js.map" + }, + { + "path": "build/src/util.js.map" + }, + { + "path": "build/src/histogram.js" + }, + { + "path": "build/src/subscription.js" + }, + { + "path": "build/src/lease-manager.d.ts" + }, + { + "path": "build/src/subscription.d.ts" + }, + { + "path": "build/src/message-queues.js.map" + }, + { + "path": "build/src/index.js" + }, + { + "path": "build/src/message-stream.js" + }, + { + "path": "build/src/topic.js.map" + }, + { + "path": "build/src/lease-manager.js" + }, + { + "path": "build/src/topic.js" + }, + { + "path": "build/src/snapshot.js" + }, + { + "path": "build/src/topic.d.ts" + }, + { + "path": "build/src/util.js" + }, + { + "path": "build/src/pubsub.d.ts" + }, + { + "path": "build/src/iam.js" + }, + { + "path": "build/src/message-stream.d.ts" + }, + { + "path": "build/src/pull-retry.d.ts" + }, + { + "path": "build/src/util.d.ts" + }, + { + "path": "build/src/pubsub.js.map" + }, + { + "path": "build/src/histogram.js.map" + }, + { + "path": "build/src/message-queues.js" + }, + { + "path": "build/src/histogram.d.ts" + }, + { + "path": "build/src/pubsub.js" + }, + { + "path": "build/src/v1/publisher_client.js" + }, + { + "path": "build/src/v1/publisher_client_config.json" + }, + { + "path": "build/src/v1/subscriber_client_config.json" + }, + { + "path": "build/src/v1/index.js" + }, + { + "path": "build/src/v1/publisher_proto_list.json" + }, + { + "path": "build/src/v1/subscriber_proto_list.json" + }, + { + "path": "build/src/v1/subscriber_client.js" + }, + { + "path": "build/src/v1/doc/google/type/doc_expr.js" + }, + { + "path": "build/src/v1/doc/google/iam/v1/doc_policy.js" + }, + { + "path": "build/src/v1/doc/google/iam/v1/doc_options.js" + }, + { + "path": "build/src/v1/doc/google/iam/v1/doc_iam_policy.js" + }, + { + "path": "build/src/v1/doc/google/pubsub/v1/doc_pubsub.js" + }, + { + "path": "build/src/v1/doc/google/protobuf/doc_field_mask.js" + }, + { + "path": "build/src/v1/doc/google/protobuf/doc_duration.js" + }, + { + "path": "build/src/v1/doc/google/protobuf/doc_timestamp.js" + }, + { + "path": "build/src/v1/doc/google/protobuf/doc_empty.js" + }, + { + "path": "build/src/publisher/index.d.ts" + }, + { + "path": "build/src/publisher/index.js.map" + }, + { + "path": "build/src/publisher/message-queues.d.ts" + }, + { + "path": "build/src/publisher/publish-error.js.map" + }, + { + "path": "build/src/publisher/publish-error.js" + }, + { + "path": "build/src/publisher/message-batch.js" + }, + { + "path": "build/src/publisher/publish-error.d.ts" + }, + { + "path": "build/src/publisher/message-queues.js.map" + }, + { + "path": "build/src/publisher/index.js" + }, + { + "path": "build/src/publisher/message-batch.d.ts" + }, + { + "path": "build/src/publisher/message-batch.js.map" + }, + { + "path": "build/src/publisher/message-queues.js" + }, + { + "path": "build/proto/iam.d.ts" + }, + { + "path": "build/proto/pubsub.d.ts" + }, + { + "path": "build/protos/protos.json" + }, + { + "path": "build/protos/protos.js" + }, + { + "path": "build/protos/protos.d.ts" + }, + { + "path": "build/protos/google/type/expr.proto" + }, + { + "path": "build/protos/google/api/billing.proto" + }, + { + "path": "build/protos/google/api/documentation.proto" + }, + { + "path": "build/protos/google/api/distribution.proto" + }, + { + "path": "build/protos/google/api/auth.proto" + }, + { + "path": "build/protos/google/api/annotations.proto" + }, + { + "path": "build/protos/google/api/context.proto" + }, + { + "path": "build/protos/google/api/config_change.proto" + }, + { + "path": "build/protos/google/api/logging.proto" + }, + { + "path": "build/protos/google/api/system_parameter.proto" + }, + { + "path": "build/protos/google/api/label.proto" + }, + { + "path": "build/protos/google/api/quota.proto" + }, + { + "path": "build/protos/google/api/source_info.proto" + }, + { + "path": "build/protos/google/api/control.proto" + }, + { + "path": "build/protos/google/api/httpbody.proto" + }, + { + "path": "build/protos/google/api/usage.proto" + }, + { + "path": "build/protos/google/api/log.proto" + }, + { + "path": "build/protos/google/api/monitored_resource.proto" + }, + { + "path": "build/protos/google/api/service.proto" + }, + { + "path": "build/protos/google/api/consumer.proto" + }, + { + "path": "build/protos/google/api/http.proto" + }, + { + "path": "build/protos/google/api/backend.proto" + }, + { + "path": "build/protos/google/api/monitoring.proto" + }, + { + "path": "build/protos/google/api/endpoint.proto" + }, + { + "path": "build/protos/google/api/metric.proto" + }, + { + "path": "build/protos/google/api/servicecontrol/v1/distribution.proto" + }, + { + "path": "build/protos/google/api/servicecontrol/v1/operation.proto" + }, + { + "path": "build/protos/google/api/servicecontrol/v1/service_controller.proto" + }, + { + "path": "build/protos/google/api/servicecontrol/v1/metric_value.proto" + }, + { + "path": "build/protos/google/api/servicecontrol/v1/log_entry.proto" + }, + { + "path": "build/protos/google/api/servicecontrol/v1/check_error.proto" + }, + { + "path": "build/protos/google/api/experimental/authorization_config.proto" + }, + { + "path": "build/protos/google/api/experimental/experimental.proto" + }, + { + "path": "build/protos/google/api/servicemanagement/v1/servicemanager.proto" + }, + { + "path": "build/protos/google/api/servicemanagement/v1/resources.proto" + }, + { + "path": "build/protos/google/iam/v1/iam_policy.proto" + }, + { + "path": "build/protos/google/iam/v1/options.proto" + }, + { + "path": "build/protos/google/iam/v1/policy.proto" + }, + { + "path": "build/protos/google/iam/admin/v1/iam.proto" + }, + { + "path": "build/protos/google/pubsub/v1/pubsub.proto" + }, + { + "path": "build/protos/google/protobuf/struct.proto" + }, + { + "path": "build/protos/google/protobuf/api.proto" + }, + { + "path": "build/protos/google/protobuf/field_mask.proto" + }, + { + "path": "build/protos/google/protobuf/type.proto" + }, + { + "path": "build/protos/google/protobuf/any.proto" + }, + { + "path": "build/protos/google/protobuf/descriptor.proto" + }, + { + "path": "build/protos/google/protobuf/source_context.proto" + }, + { + "path": "build/protos/google/protobuf/duration.proto" + }, + { + "path": "build/protos/google/protobuf/wrappers.proto" + }, + { + "path": "build/protos/google/protobuf/empty.proto" + }, + { + "path": "build/protos/google/protobuf/timestamp.proto" + }, + { + "path": "build/protos/google/protobuf/util/json_format_proto3.proto" + }, + { + "path": "build/test/index.d.ts" + }, + { + "path": "build/test/subscriber.js.map" + }, + { + "path": "build/test/lease-manager.js.map" + }, + { + "path": "build/test/pull-retry.js.map" + }, + { + "path": "build/test/pull-retry.js" + }, + { + "path": "build/test/iam.js.map" + }, + { + "path": "build/test/index.js.map" + }, + { + "path": "build/test/message-stream.js.map" + }, + { + "path": "build/test/message-queues.d.ts" + }, + { + "path": "build/test/snapshot.d.ts" + }, + { + "path": "build/test/iam.d.ts" + }, + { + "path": "build/test/subscriber.js" + }, + { + "path": "build/test/snapshot.js.map" + }, + { + "path": "build/test/subscriber.d.ts" + }, + { + "path": "build/test/subscription.js.map" + }, + { + "path": "build/test/histogram.js" + }, + { + "path": "build/test/subscription.js" + }, + { + "path": "build/test/lease-manager.d.ts" + }, + { + "path": "build/test/subscription.d.ts" + }, + { + "path": "build/test/message-queues.js.map" + }, + { + "path": "build/test/index.js" + }, + { + "path": "build/test/message-stream.js" + }, + { + "path": "build/test/topic.js.map" + }, + { + "path": "build/test/lease-manager.js" + }, + { + "path": "build/test/topic.js" + }, + { + "path": "build/test/gapic-v1.js" + }, + { + "path": "build/test/snapshot.js" + }, + { + "path": "build/test/topic.d.ts" + }, + { + "path": "build/test/pubsub.d.ts" + }, + { + "path": "build/test/iam.js" + }, + { + "path": "build/test/message-stream.d.ts" + }, + { + "path": "build/test/pull-retry.d.ts" + }, + { + "path": "build/test/pubsub.js.map" + }, + { + "path": "build/test/histogram.js.map" + }, + { + "path": "build/test/message-queues.js" + }, + { + "path": "build/test/histogram.d.ts" + }, + { + "path": "build/test/pubsub.js" + }, + { + "path": "build/test/publisher/index.d.ts" + }, + { + "path": "build/test/publisher/index.js.map" + }, + { + "path": "build/test/publisher/message-queues.d.ts" + }, + { + "path": "build/test/publisher/publish-error.js.map" + }, + { + "path": "build/test/publisher/publish-error.js" + }, + { + "path": "build/test/publisher/message-batch.js" + }, + { + "path": "build/test/publisher/publish-error.d.ts" + }, + { + "path": "build/test/publisher/message-queues.js.map" + }, + { + "path": "build/test/publisher/index.js" + }, + { + "path": "build/test/publisher/message-batch.d.ts" + }, + { + "path": "build/test/publisher/message-batch.js.map" + }, + { + "path": "build/test/publisher/message-queues.js" + }, + { + "path": "build/system-test/install.js.map" + }, + { + "path": "build/system-test/install.d.ts" + }, + { + "path": "build/system-test/install.js" + }, + { + "path": "build/system-test/publisher_smoke_test.js" + }, + { + "path": "build/system-test/pubsub.d.ts" + }, + { + "path": "build/system-test/pubsub.js.map" + }, + { + "path": "build/system-test/pubsub.js" + }, + { + "path": "__pycache__/synth.cpython-36.pyc" + }, + { + "path": "proto/iam.d.ts" + }, + { + "path": "proto/pubsub.d.ts" + }, + { + "path": "samples/README.md" + }, + { + "path": "samples/package.json" + }, + { + "path": "samples/subscriptions.js" + }, + { + "path": "samples/topics.js" + }, + { + "path": "samples/.eslintrc.yml" + }, + { + "path": "samples/quickstart.js" + }, + { + "path": "samples/system-test/topics.test.js" + }, + { + "path": "samples/system-test/quickstart.test.js" + }, + { + "path": "samples/system-test/.eslintrc.yml" + }, + { + "path": "samples/system-test/subscriptions.test.js" + }, + { + "path": ".github/PULL_REQUEST_TEMPLATE.md" + }, + { + "path": ".github/release-please.yml" + }, + { + "path": ".github/ISSUE_TEMPLATE/support_request.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/feature_request.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/bug_report.md" + }, + { + "path": "bin/README.md" + }, + { + "path": "bin/benchwrapper.js" + }, + { + "path": "bin/pubsub.proto" + }, + { + "path": ".kokoro/test.sh" + }, + { + "path": ".kokoro/docs.sh" + }, + { + "path": ".kokoro/samples-test.sh" + }, + { + "path": ".kokoro/.gitattributes" + }, + { + "path": ".kokoro/trampoline.sh" + }, + { + "path": ".kokoro/lint.sh" + }, + { + "path": ".kokoro/publish.sh" + }, + { + "path": ".kokoro/test.bat" + }, + { + "path": ".kokoro/common.cfg" + }, + { + "path": ".kokoro/system-test.sh" + }, + { + "path": ".kokoro/release/docs.cfg" + }, + { + "path": ".kokoro/release/docs.sh" + }, + { + "path": ".kokoro/release/publish.cfg" + }, + { + "path": ".kokoro/release/common.cfg" + }, + { + "path": ".kokoro/continuous/node10/lint.cfg" + }, + { + "path": ".kokoro/continuous/node10/docs.cfg" + }, + { + "path": ".kokoro/continuous/node10/test.cfg" + }, + { + "path": ".kokoro/continuous/node10/system-test.cfg" + }, + { + "path": ".kokoro/continuous/node10/samples-test.cfg" + }, + { + "path": ".kokoro/continuous/node10/common.cfg" + }, + { + "path": ".kokoro/continuous/node8/test.cfg" + }, + { + "path": ".kokoro/continuous/node8/common.cfg" + }, + { + "path": ".kokoro/continuous/node12/test.cfg" + }, + { + "path": ".kokoro/continuous/node12/common.cfg" + }, + { + "path": ".kokoro/presubmit/node10/lint.cfg" + }, + { + "path": ".kokoro/presubmit/node10/docs.cfg" + }, + { + "path": ".kokoro/presubmit/node10/test.cfg" + }, + { + "path": ".kokoro/presubmit/node10/system-test.cfg" + }, + { + "path": ".kokoro/presubmit/node10/samples-test.cfg" + }, + { + "path": ".kokoro/presubmit/node10/common.cfg" + }, + { + "path": ".kokoro/presubmit/node8/test.cfg" + }, + { + "path": ".kokoro/presubmit/node8/common.cfg" + }, + { + "path": ".kokoro/presubmit/node12/test.cfg" + }, + { + "path": ".kokoro/presubmit/node12/common.cfg" + }, + { + "path": ".kokoro/presubmit/windows/test.cfg" + }, + { + "path": ".kokoro/presubmit/windows/common.cfg" + }, + { + "path": "protos/protos.json" + }, + { + "path": "protos/protos.js" + }, + { + "path": "protos/protos.d.ts" + }, + { + "path": "protos/google/type/expr.proto" + }, + { + "path": "protos/google/api/billing.proto" + }, + { + "path": "protos/google/api/documentation.proto" + }, + { + "path": "protos/google/api/distribution.proto" + }, + { + "path": "protos/google/api/auth.proto" + }, + { + "path": "protos/google/api/annotations.proto" + }, + { + "path": "protos/google/api/context.proto" + }, + { + "path": "protos/google/api/config_change.proto" + }, + { + "path": "protos/google/api/logging.proto" + }, + { + "path": "protos/google/api/system_parameter.proto" + }, + { + "path": "protos/google/api/label.proto" + }, + { + "path": "protos/google/api/quota.proto" + }, + { + "path": "protos/google/api/source_info.proto" + }, + { + "path": "protos/google/api/control.proto" + }, + { + "path": "protos/google/api/httpbody.proto" + }, + { + "path": "protos/google/api/usage.proto" + }, + { + "path": "protos/google/api/log.proto" + }, + { + "path": "protos/google/api/monitored_resource.proto" + }, + { + "path": "protos/google/api/service.proto" + }, + { + "path": "protos/google/api/consumer.proto" + }, + { + "path": "protos/google/api/http.proto" + }, + { + "path": "protos/google/api/backend.proto" + }, + { + "path": "protos/google/api/monitoring.proto" + }, + { + "path": "protos/google/api/endpoint.proto" + }, + { + "path": "protos/google/api/metric.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/distribution.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/operation.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/service_controller.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/metric_value.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/log_entry.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/check_error.proto" + }, + { + "path": "protos/google/api/experimental/authorization_config.proto" + }, + { + "path": "protos/google/api/experimental/experimental.proto" + }, + { + "path": "protos/google/api/servicemanagement/v1/servicemanager.proto" + }, + { + "path": "protos/google/api/servicemanagement/v1/resources.proto" + }, + { + "path": "protos/google/iam/v1/iam_policy.proto" + }, + { + "path": "protos/google/iam/v1/options.proto" + }, + { + "path": "protos/google/iam/v1/policy.proto" + }, + { + "path": "protos/google/iam/admin/v1/iam.proto" + }, + { + "path": "protos/google/pubsub/v1/pubsub.proto" + }, + { + "path": "protos/google/protobuf/struct.proto" + }, + { + "path": "protos/google/protobuf/api.proto" + }, + { + "path": "protos/google/protobuf/field_mask.proto" + }, + { + "path": "protos/google/protobuf/type.proto" + }, + { + "path": "protos/google/protobuf/any.proto" + }, + { + "path": "protos/google/protobuf/descriptor.proto" + }, + { + "path": "protos/google/protobuf/source_context.proto" + }, + { + "path": "protos/google/protobuf/duration.proto" + }, + { + "path": "protos/google/protobuf/wrappers.proto" + }, + { + "path": "protos/google/protobuf/empty.proto" + }, + { + "path": "protos/google/protobuf/timestamp.proto" + }, + { + "path": "protos/google/protobuf/util/json_format_proto3.proto" + }, + { + "path": ".git/packed-refs" + }, + { + "path": ".git/HEAD" + }, + { + "path": ".git/config" + }, + { + "path": ".git/index" + }, + { + "path": ".git/shallow" + }, + { + "path": ".git/logs/HEAD" + }, + { + "path": ".git/logs/refs/remotes/origin/HEAD" + }, + { + "path": ".git/logs/refs/heads/autosynth" + }, + { + "path": ".git/logs/refs/heads/master" + }, + { + "path": ".git/refs/tags/v1.2.0" + }, + { + "path": ".git/refs/remotes/origin/HEAD" + }, + { + "path": ".git/refs/heads/autosynth" + }, + { + "path": ".git/refs/heads/master" + }, + { + "path": ".git/objects/pack/pack-b4f2ef9d72ccc66a51e403518bf05adaa6c8dc0d.pack" + }, + { + "path": ".git/objects/pack/pack-b4f2ef9d72ccc66a51e403518bf05adaa6c8dc0d.idx" + }, + { + "path": "test/pull-retry.ts" + }, + { + "path": "test/subscriber.ts" + }, + { + "path": "test/message-stream.ts" + }, + { + "path": "test/index.ts" + }, + { + "path": "test/lease-manager.ts" + }, + { + "path": "test/.eslintrc.yml" + }, + { + "path": "test/histogram.ts" + }, + { + "path": "test/subscription.ts" + }, + { + "path": "test/gapic-v1.js" + }, + { + "path": "test/snapshot.ts" + }, + { + "path": "test/pubsub.ts" + }, + { + "path": "test/topic.ts" + }, + { + "path": "test/message-queues.ts" + }, + { + "path": "test/iam.ts" + }, + { + "path": "test/mocha.opts" + }, + { + "path": "test/publisher/message-batch.ts" + }, + { + "path": "test/publisher/index.ts" + }, + { + "path": "test/publisher/publish-error.ts" + }, + { + "path": "test/publisher/message-queues.ts" + }, + { + "path": "system-test/pubsub.ts" + }, + { + "path": "system-test/install.ts" + }, + { + "path": "system-test/fixtures/ordered-messages.json" + }, + { + "path": "system-test/fixtures/sample/package.json" + }, + { + "path": "system-test/fixtures/sample/tsconfig.json" + }, + { + "path": "system-test/fixtures/sample/src/index.ts" + }, + { + "path": "node_modules/strip-bom/package.json" + }, + { + "path": "node_modules/string-width/package.json" + }, + { + "path": "node_modules/is-callable/package.json" + }, + { + "path": "node_modules/util-deprecate/package.json" + }, + { + "path": "node_modules/gts/package.json" + }, + { + "path": "node_modules/gts/node_modules/has-flag/package.json" + }, + { + "path": "node_modules/gts/node_modules/color-name/package.json" + }, + { + "path": "node_modules/gts/node_modules/color-convert/package.json" + }, + { + "path": "node_modules/gts/node_modules/supports-color/package.json" + }, + { + "path": "node_modules/gts/node_modules/ansi-styles/package.json" + }, + { + "path": "node_modules/gts/node_modules/chalk/package.json" + }, + { + "path": "node_modules/require-directory/package.json" + }, + { + "path": "node_modules/update-notifier/package.json" + }, + { + "path": "node_modules/esprima/package.json" + }, + { + "path": "node_modules/string_decoder/package.json" + }, + { + "path": "node_modules/string_decoder/node_modules/safe-buffer/package.json" + }, + { + "path": "node_modules/mocha/package.json" + }, + { + "path": "node_modules/mocha/node_modules/locate-path/package.json" + }, + { + "path": "node_modules/mocha/node_modules/find-up/package.json" + }, + { + "path": "node_modules/mocha/node_modules/diff/package.json" + }, + { + "path": "node_modules/mocha/node_modules/yargs-parser/package.json" + }, + { + "path": "node_modules/mocha/node_modules/supports-color/package.json" + }, + { + "path": "node_modules/mocha/node_modules/which/package.json" + }, + { + "path": "node_modules/mocha/node_modules/path-exists/package.json" + }, + { + "path": "node_modules/mocha/node_modules/p-locate/package.json" + }, + { + "path": "node_modules/mocha/node_modules/glob/package.json" + }, + { + "path": "node_modules/mocha/node_modules/ms/package.json" + }, + { + "path": "node_modules/mocha/node_modules/strip-json-comments/package.json" + }, + { + "path": "node_modules/mocha/node_modules/yargs/package.json" + }, + { + "path": "node_modules/is-arguments/package.json" + }, + { + "path": "node_modules/core-util-is/package.json" + }, + { + "path": "node_modules/wrap-ansi/package.json" + }, + { + "path": "node_modules/minimist-options/package.json" + }, + { + "path": "node_modules/minimist-options/node_modules/arrify/package.json" + }, + { + "path": "node_modules/underscore/package.json" + }, + { + "path": "node_modules/type-detect/package.json" + }, + { + "path": "node_modules/keyv/package.json" + }, + { + "path": "node_modules/glob-parent/package.json" + }, + { + "path": "node_modules/walkdir/package.json" + }, + { + "path": "node_modules/@protobufjs/codegen/package.json" + }, + { + "path": "node_modules/@protobufjs/inquire/package.json" + }, + { + "path": "node_modules/@protobufjs/float/package.json" + }, + { + "path": "node_modules/@protobufjs/base64/package.json" + }, + { + "path": "node_modules/@protobufjs/aspromise/package.json" + }, + { + "path": "node_modules/@protobufjs/eventemitter/package.json" + }, + { + "path": "node_modules/@protobufjs/fetch/package.json" + }, + { + "path": "node_modules/@protobufjs/utf8/package.json" + }, + { + "path": "node_modules/@protobufjs/path/package.json" + }, + { + "path": "node_modules/@protobufjs/pool/package.json" + }, + { + "path": "node_modules/global-dirs/package.json" + }, + { + "path": "node_modules/has-flag/package.json" + }, + { + "path": "node_modules/ascli/package.json" + }, + { + "path": "node_modules/locate-path/package.json" + }, + { + "path": "node_modules/colour/package.json" + }, + { + "path": "node_modules/fill-keys/package.json" + }, + { + "path": "node_modules/empower-assert/package.json" + }, + { + "path": "node_modules/convert-source-map/package.json" + }, + { + "path": "node_modules/convert-source-map/node_modules/safe-buffer/package.json" + }, + { + "path": "node_modules/require-main-filename/package.json" + }, + { + "path": "node_modules/bluebird/package.json" + }, + { + "path": "node_modules/string.prototype.trimleft/package.json" + }, + { + "path": "node_modules/range-parser/package.json" + }, + { + "path": "node_modules/espower-loader/package.json" + }, + { + "path": "node_modules/espower-loader/node_modules/source-map/package.json" + }, + { + "path": "node_modules/espower-loader/node_modules/source-map-support/package.json" + }, + { + "path": "node_modules/defer-to-connect/package.json" + }, + { + "path": "node_modules/duplexer3/package.json" + }, + { + "path": "node_modules/indent-string/package.json" + }, + { + "path": "node_modules/eslint/package.json" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/README.md" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/package.json" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/CHANGELOG.md" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/index.js" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/LICENSE" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/lib/parse.js" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/lib/enoent.js" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/escape.js" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/resolveCommand.js" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/readShebang.js" + }, + { + "path": "node_modules/eslint/node_modules/cross-spawn/node_modules/semver/package.json" + }, + { + "path": "node_modules/eslint/node_modules/path-key/package.json" + }, + { + "path": "node_modules/eslint/node_modules/which/package.json" + }, + { + "path": "node_modules/eslint/node_modules/shebang-regex/package.json" + }, + { + "path": "node_modules/eslint/node_modules/shebang-command/package.json" + }, + { + "path": "node_modules/eslint/node_modules/debug/package.json" + }, + { + "path": "node_modules/got/package.json" + }, + { + "path": "node_modules/got/node_modules/get-stream/package.json" + }, + { + "path": "node_modules/got/node_modules/@sindresorhus/is/package.json" + }, + { + "path": "node_modules/estraverse/package.json" + }, + { + "path": "node_modules/mdurl/package.json" + }, + { + "path": "node_modules/eslint-plugin-node/package.json" + }, + { + "path": "node_modules/eslint-plugin-node/node_modules/ignore/package.json" + }, + { + "path": "node_modules/resolve-from/package.json" + }, + { + "path": "node_modules/type-name/package.json" + }, + { + "path": "node_modules/os-locale/package.json" + }, + { + "path": "node_modules/lodash/package.json" + }, + { + "path": "node_modules/strip-ansi/package.json" + }, + { + "path": "node_modules/safe-buffer/package.json" + }, + { + "path": "node_modules/@szmarczak/http-timer/package.json" + }, + { + "path": "node_modules/parent-module/package.json" + }, + { + "path": "node_modules/object-keys/package.json" + }, + { + "path": "node_modules/write/package.json" + }, + { + "path": "node_modules/configstore/package.json" + }, + { + "path": "node_modules/configstore/node_modules/write-file-atomic/package.json" + }, + { + "path": "node_modules/configstore/node_modules/pify/package.json" + }, + { + "path": "node_modules/configstore/node_modules/make-dir/package.json" + }, + { + "path": "node_modules/v8-to-istanbul/package.json" + }, + { + "path": "node_modules/v8-to-istanbul/node_modules/source-map/package.json" + }, + { + "path": "node_modules/dot-prop/package.json" + }, + { + "path": "node_modules/tsutils/package.json" + }, + { + "path": "node_modules/import-fresh/package.json" + }, + { + "path": "node_modules/mute-stream/package.json" + }, + { + "path": "node_modules/wide-align/package.json" + }, + { + "path": "node_modules/wide-align/node_modules/string-width/package.json" + }, + { + "path": "node_modules/wide-align/node_modules/strip-ansi/package.json" + }, + { + "path": "node_modules/wide-align/node_modules/ansi-regex/package.json" + }, + { + "path": "node_modules/eslint-scope/package.json" + }, + { + "path": "node_modules/is-promise/package.json" + }, + { + "path": "node_modules/es6-map/package.json" + }, + { + "path": "node_modules/p-finally/package.json" + }, + { + "path": "node_modules/es6-set/package.json" + }, + { + "path": "node_modules/es6-set/node_modules/es6-symbol/package.json" + }, + { + "path": "node_modules/optjs/package.json" + }, + { + "path": "node_modules/array-find/package.json" + }, + { + "path": "node_modules/js2xmlparser/package.json" + }, + { + "path": "node_modules/istanbul-reports/package.json" + }, + { + "path": "node_modules/indexof/package.json" + }, + { + "path": "node_modules/progress/package.json" + }, + { + "path": "node_modules/registry-url/package.json" + }, + { + "path": "node_modules/google-gax/package.json" + }, + { + "path": "node_modules/nan/package.json" + }, + { + "path": "node_modules/mimic-response/package.json" + }, + { + "path": "node_modules/figures/package.json" + }, + { + "path": "node_modules/eslint-config-prettier/package.json" + }, + { + "path": "node_modules/argparse/package.json" + }, + { + "path": "node_modules/type/package.json" + }, + { + "path": "node_modules/window-size/package.json" + }, + { + "path": "node_modules/domhandler/package.json" + }, + { + "path": "node_modules/error-ex/package.json" + }, + { + "path": "node_modules/ansi-colors/package.json" + }, + { + "path": "node_modules/safer-buffer/package.json" + }, + { + "path": "node_modules/type-fest/package.json" + }, + { + "path": "node_modules/strip-indent/package.json" + }, + { + "path": "node_modules/boxen/package.json" + }, + { + "path": "node_modules/boxen/node_modules/type-fest/package.json" + }, + { + "path": "node_modules/flat-cache/package.json" + }, + { + "path": "node_modules/flat-cache/node_modules/rimraf/package.json" + }, + { + "path": "node_modules/has-symbols/package.json" + }, + { + "path": "node_modules/gcp-metadata/package.json" + }, + { + "path": "node_modules/ansi-align/package.json" + }, + { + "path": "node_modules/find-up/package.json" + }, + { + "path": "node_modules/log-symbols/package.json" + }, + { + "path": "node_modules/merge-estraverse-visitors/package.json" + }, + { + "path": "node_modules/is-extglob/package.json" + }, + { + "path": "node_modules/json-stable-stringify-without-jsonify/package.json" + }, + { + "path": "node_modules/prettier/package.json" + }, + { + "path": "node_modules/jsonexport/package.json" + }, + { + "path": "node_modules/wrappy/package.json" + }, + { + "path": "node_modules/npm-run-path/package.json" + }, + { + "path": "node_modules/npm-run-path/node_modules/path-key/package.json" + }, + { + "path": "node_modules/map-obj/package.json" + }, + { + "path": "node_modules/term-size/package.json" + }, + { + "path": "node_modules/destroy/package.json" + }, + { + "path": "node_modules/growl/package.json" + }, + { + "path": "node_modules/json-schema-traverse/package.json" + }, + { + "path": "node_modules/taffydb/package.json" + }, + { + "path": "node_modules/cross-spawn/package.json" + }, + { + "path": "node_modules/loud-rejection/package.json" + }, + { + "path": "node_modules/is-glob/package.json" + }, + { + "path": "node_modules/get-stream/package.json" + }, + { + "path": "node_modules/@sinonjs/formatio/package.json" + }, + { + "path": "node_modules/@sinonjs/text-encoding/package.json" + }, + { + "path": "node_modules/@sinonjs/commons/package.json" + }, + { + "path": "node_modules/@sinonjs/samsam/package.json" + }, + { + "path": "node_modules/uglify-js/package.json" + }, + { + "path": "node_modules/optimist/package.json" + }, + { + "path": "node_modules/empower/package.json" + }, + { + "path": "node_modules/cacheable-request/package.json" + }, + { + "path": "node_modules/cacheable-request/node_modules/get-stream/package.json" + }, + { + "path": "node_modules/cacheable-request/node_modules/lowercase-keys/package.json" + }, + { + "path": "node_modules/is-ci/package.json" + }, + { + "path": "node_modules/server-destroy/package.json" + }, + { + "path": "node_modules/json-parse-better-errors/package.json" + }, + { + "path": "node_modules/core-js/package.json" + }, + { + "path": "node_modules/set-blocking/package.json" + }, + { + "path": "node_modules/p-defer/package.json" + }, + { + "path": "node_modules/next-tick/package.json" + }, + { + "path": "node_modules/catharsis/package.json" + }, + { + "path": "node_modules/rimraf/package.json" + }, + { + "path": "node_modules/agent-base/package.json" + }, + { + "path": "node_modules/json-bigint/package.json" + }, + { + "path": "node_modules/spdx-exceptions/package.json" + }, + { + "path": "node_modules/color-name/package.json" + }, + { + "path": "node_modules/through/package.json" + }, + { + "path": "node_modules/jws/package.json" + }, + { + "path": "node_modules/path-to-regexp/package.json" + }, + { + "path": "node_modules/path-to-regexp/node_modules/isarray/package.json" + }, + { + "path": "node_modules/inquirer/package.json" + }, + { + "path": "node_modules/inquirer/node_modules/string-width/package.json" + }, + { + "path": "node_modules/inquirer/node_modules/string-width/node_modules/strip-ansi/package.json" + }, + { + "path": "node_modules/inquirer/node_modules/ansi-regex/package.json" + }, + { + "path": "node_modules/inquirer/node_modules/emoji-regex/package.json" + }, + { + "path": "node_modules/inquirer/node_modules/is-fullwidth-code-point/package.json" + }, + { + "path": "node_modules/etag/package.json" + }, + { + "path": "node_modules/power-assert-formatter/package.json" + }, + { + "path": "node_modules/text-table/package.json" + }, + { + "path": "node_modules/color-convert/package.json" + }, + { + "path": "node_modules/escope/package.json" + }, + { + "path": "node_modules/ansi-regex/package.json" + }, + { + "path": "node_modules/is-installed-globally/package.json" + }, + { + "path": "node_modules/redent/package.json" + }, + { + "path": "node_modules/is-buffer/package.json" + }, + { + "path": "node_modules/esrecurse/package.json" + }, + { + "path": "node_modules/tslint/package.json" + }, + { + "path": "node_modules/tslint/node_modules/semver/package.json" + }, + { + "path": "node_modules/decamelize/package.json" + }, + { + "path": "node_modules/parse-json/package.json" + }, + { + "path": "node_modules/mime/package.json" + }, + { + "path": "node_modules/google-auth-library/package.json" + }, + { + "path": "node_modules/ignore/package.json" + }, + { + "path": "node_modules/just-extend/package.json" + }, + { + "path": "node_modules/depd/package.json" + }, + { + "path": "node_modules/camelcase-keys/package.json" + }, + { + "path": "node_modules/camelcase-keys/node_modules/camelcase/package.json" + }, + { + "path": "node_modules/ansi-escapes/package.json" + }, + { + "path": "node_modules/decompress-response/package.json" + }, + { + "path": "node_modules/end-of-stream/package.json" + }, + { + "path": "node_modules/diff-match-patch/package.json" + }, + { + "path": "node_modules/amdefine/package.json" + }, + { + "path": "node_modules/event-emitter/package.json" + }, + { + "path": "node_modules/is-windows/package.json" + }, + { + "path": "node_modules/diff/package.json" + }, + { + "path": "node_modules/tmp/package.json" + }, + { + "path": "node_modules/source-map/package.json" + }, + { + "path": "node_modules/is-obj/package.json" + }, + { + "path": "node_modules/yargs-parser/package.json" + }, + { + "path": "node_modules/teeny-request/package.json" + }, + { + "path": "node_modules/teeny-request/node_modules/https-proxy-agent/package.json" + }, + { + "path": "node_modules/escape-string-regexp/package.json" + }, + { + "path": "node_modules/es-abstract/package.json" + }, + { + "path": "node_modules/linkinator/package.json" + }, + { + "path": "node_modules/linkinator/node_modules/has-flag/package.json" + }, + { + "path": "node_modules/linkinator/node_modules/color-name/package.json" + }, + { + "path": "node_modules/linkinator/node_modules/color-convert/package.json" + }, + { + "path": "node_modules/linkinator/node_modules/supports-color/package.json" + }, + { + "path": "node_modules/linkinator/node_modules/ansi-styles/package.json" + }, + { + "path": "node_modules/linkinator/node_modules/chalk/package.json" + }, + { + "path": "node_modules/import-lazy/package.json" + }, + { + "path": "node_modules/inflight/package.json" + }, + { + "path": "node_modules/concat-map/package.json" + }, + { + "path": "node_modules/object.assign/package.json" + }, + { + "path": "node_modules/es6-symbol/package.json" + }, + { + "path": "node_modules/semver/package.json" + }, + { + "path": "node_modules/jsdoc-fresh/package.json" + }, + { + "path": "node_modules/jsdoc-fresh/node_modules/taffydb/package.json" + }, + { + "path": "node_modules/is-typedarray/package.json" + }, + { + "path": "node_modules/htmlparser2/package.json" + }, + { + "path": "node_modules/htmlparser2/node_modules/readable-stream/package.json" + }, + { + "path": "node_modules/cli-boxes/package.json" + }, + { + "path": "node_modules/supports-color/package.json" + }, + { + "path": "node_modules/path-key/package.json" + }, + { + "path": "node_modules/lru-cache/package.json" + }, + { + "path": "node_modules/module-not-found-error/package.json" + }, + { + "path": "node_modules/rc/package.json" + }, + { + "path": "node_modules/rc/node_modules/minimist/package.json" + }, + { + "path": "node_modules/rc/node_modules/strip-json-comments/package.json" + }, + { + "path": "node_modules/yargs-unparser/package.json" + }, + { + "path": "node_modules/yargs-unparser/node_modules/locate-path/package.json" + }, + { + "path": "node_modules/yargs-unparser/node_modules/find-up/package.json" + }, + { + "path": "node_modules/yargs-unparser/node_modules/yargs-parser/package.json" + }, + { + "path": "node_modules/yargs-unparser/node_modules/path-exists/package.json" + }, + { + "path": "node_modules/yargs-unparser/node_modules/p-locate/package.json" + }, + { + "path": "node_modules/yargs-unparser/node_modules/yargs/package.json" + }, + { + "path": "node_modules/abort-controller/package.json" + }, + { + "path": "node_modules/http-errors/package.json" + }, + { + "path": "node_modules/marked/package.json" + }, + { + "path": "node_modules/is-plain-obj/package.json" + }, + { + "path": "node_modules/minimatch/package.json" + }, + { + "path": "node_modules/send/package.json" + }, + { + "path": "node_modules/send/node_modules/mime/package.json" + }, + { + "path": "node_modules/send/node_modules/ms/package.json" + }, + { + "path": "node_modules/send/node_modules/debug/package.json" + }, + { + "path": "node_modules/send/node_modules/debug/node_modules/ms/package.json" + }, + { + "path": "node_modules/css-select/package.json" + }, + { + "path": "node_modules/uri-js/package.json" + }, + { + "path": "node_modules/grpc/package.json" + }, + { + "path": "node_modules/grpc/node_modules/string-width/package.json" + }, + { + "path": "node_modules/grpc/node_modules/util-deprecate/package.json" + }, + { + "path": "node_modules/grpc/node_modules/string_decoder/package.json" + }, + { + "path": "node_modules/grpc/node_modules/console-control-strings/package.json" + }, + { + "path": "node_modules/grpc/node_modules/osenv/package.json" + }, + { + "path": "node_modules/grpc/node_modules/core-util-is/package.json" + }, + { + "path": "node_modules/grpc/node_modules/wrap-ansi/package.json" + }, + { + "path": "node_modules/grpc/node_modules/node-pre-gyp/package.json" + }, + { + "path": "node_modules/grpc/node_modules/nopt/package.json" + }, + { + "path": "node_modules/grpc/node_modules/detect-libc/package.json" + }, + { + "path": "node_modules/grpc/node_modules/strip-ansi/package.json" + }, + { + "path": "node_modules/grpc/node_modules/safe-buffer/package.json" + }, + { + "path": "node_modules/grpc/node_modules/npm-bundled/package.json" + }, + { + "path": "node_modules/grpc/node_modules/wide-align/package.json" + }, + { + "path": "node_modules/grpc/node_modules/safer-buffer/package.json" + }, + { + "path": "node_modules/grpc/node_modules/.bin/pbjs" + }, + { + "path": "node_modules/grpc/node_modules/wrappy/package.json" + }, + { + "path": "node_modules/grpc/node_modules/npm-packlist/package.json" + }, + { + "path": "node_modules/grpc/node_modules/minipass/package.json" + }, + { + "path": "node_modules/grpc/node_modules/set-blocking/package.json" + }, + { + "path": "node_modules/grpc/node_modules/has-unicode/package.json" + }, + { + "path": "node_modules/grpc/node_modules/rimraf/package.json" + }, + { + "path": "node_modules/grpc/node_modules/ansi-regex/package.json" + }, + { + "path": "node_modules/grpc/node_modules/gauge/package.json" + }, + { + "path": "node_modules/grpc/node_modules/inflight/package.json" + }, + { + "path": "node_modules/grpc/node_modules/concat-map/package.json" + }, + { + "path": "node_modules/grpc/node_modules/semver/package.json" + }, + { + "path": "node_modules/grpc/node_modules/rc/package.json" + }, + { + "path": "node_modules/grpc/node_modules/minimatch/package.json" + }, + { + "path": "node_modules/grpc/node_modules/needle/package.json" + }, + { + "path": "node_modules/grpc/node_modules/yallist/package.json" + }, + { + "path": "node_modules/grpc/node_modules/cliui/package.json" + }, + { + "path": "node_modules/grpc/node_modules/balanced-match/package.json" + }, + { + "path": "node_modules/grpc/node_modules/path-is-absolute/package.json" + }, + { + "path": "node_modules/grpc/node_modules/ignore-walk/package.json" + }, + { + "path": "node_modules/grpc/node_modules/os-tmpdir/package.json" + }, + { + "path": "node_modules/grpc/node_modules/minimist/package.json" + }, + { + "path": "node_modules/grpc/node_modules/os-homedir/package.json" + }, + { + "path": "node_modules/grpc/node_modules/readable-stream/package.json" + }, + { + "path": "node_modules/grpc/node_modules/ini/package.json" + }, + { + "path": "node_modules/grpc/node_modules/camelcase/package.json" + }, + { + "path": "node_modules/grpc/node_modules/deep-extend/package.json" + }, + { + "path": "node_modules/grpc/node_modules/isarray/package.json" + }, + { + "path": "node_modules/grpc/node_modules/fs-minipass/package.json" + }, + { + "path": "node_modules/grpc/node_modules/y18n/package.json" + }, + { + "path": "node_modules/grpc/node_modules/delegates/package.json" + }, + { + "path": "node_modules/grpc/node_modules/mkdirp/package.json" + }, + { + "path": "node_modules/grpc/node_modules/mkdirp/node_modules/minimist/package.json" + }, + { + "path": "node_modules/grpc/node_modules/glob/package.json" + }, + { + "path": "node_modules/grpc/node_modules/inherits/package.json" + }, + { + "path": "node_modules/grpc/node_modules/npmlog/package.json" + }, + { + "path": "node_modules/grpc/node_modules/tar/package.json" + }, + { + "path": "node_modules/grpc/node_modules/chownr/package.json" + }, + { + "path": "node_modules/grpc/node_modules/are-we-there-yet/package.json" + }, + { + "path": "node_modules/grpc/node_modules/ms/package.json" + }, + { + "path": "node_modules/grpc/node_modules/iconv-lite/package.json" + }, + { + "path": "node_modules/grpc/node_modules/sax/package.json" + }, + { + "path": "node_modules/grpc/node_modules/once/package.json" + }, + { + "path": "node_modules/grpc/node_modules/brace-expansion/package.json" + }, + { + "path": "node_modules/grpc/node_modules/number-is-nan/package.json" + }, + { + "path": "node_modules/grpc/node_modules/abbrev/package.json" + }, + { + "path": "node_modules/grpc/node_modules/object-assign/package.json" + }, + { + "path": "node_modules/grpc/node_modules/protobufjs/package.json" + }, + { + "path": "node_modules/grpc/node_modules/protobufjs/bin/pbjs" + }, + { + "path": "node_modules/grpc/node_modules/strip-json-comments/package.json" + }, + { + "path": "node_modules/grpc/node_modules/process-nextick-args/package.json" + }, + { + "path": "node_modules/grpc/node_modules/signal-exit/package.json" + }, + { + "path": "node_modules/grpc/node_modules/code-point-at/package.json" + }, + { + "path": "node_modules/grpc/node_modules/minizlib/package.json" + }, + { + "path": "node_modules/grpc/node_modules/is-fullwidth-code-point/package.json" + }, + { + "path": "node_modules/grpc/node_modules/aproba/package.json" + }, + { + "path": "node_modules/grpc/node_modules/debug/package.json" + }, + { + "path": "node_modules/grpc/node_modules/fs.realpath/package.json" + }, + { + "path": "node_modules/grpc/node_modules/yargs/package.json" + }, + { + "path": "node_modules/google-p12-pem/package.json" + }, + { + "path": "node_modules/spdx-license-ids/package.json" + }, + { + "path": "node_modules/yallist/package.json" + }, + { + "path": "node_modules/setprototypeof/package.json" + }, + { + "path": "node_modules/hosted-git-info/package.json" + }, + { + "path": "node_modules/argv/package.json" + }, + { + "path": "node_modules/package-json/package.json" + }, + { + "path": "node_modules/write-file-atomic/package.json" + }, + { + "path": "node_modules/external-editor/package.json" + }, + { + "path": "node_modules/@sindresorhus/is/package.json" + }, + { + "path": "node_modules/lodash.camelcase/package.json" + }, + { + "path": "node_modules/arrify/package.json" + }, + { + "path": "node_modules/ansi-styles/package.json" + }, + { + "path": "node_modules/parseurl/package.json" + }, + { + "path": "node_modules/boolbase/package.json" + }, + { + "path": "node_modules/cliui/package.json" + }, + { + "path": "node_modules/balanced-match/package.json" + }, + { + "path": "node_modules/acorn/package.json" + }, + { + "path": "node_modules/load-json-file/package.json" + }, + { + "path": "node_modules/load-json-file/node_modules/pify/package.json" + }, + { + "path": "node_modules/builtin-modules/package.json" + }, + { + "path": "node_modules/widest-line/package.json" + }, + { + "path": "node_modules/widest-line/node_modules/string-width/package.json" + }, + { + "path": "node_modules/widest-line/node_modules/strip-ansi/package.json" + }, + { + "path": "node_modules/widest-line/node_modules/ansi-regex/package.json" + }, + { + "path": "node_modules/which/package.json" + }, + { + "path": "node_modules/@bcoe/v8-coverage/package.json" + }, + { + "path": "node_modules/prettier-linter-helpers/package.json" + }, + { + "path": "node_modules/object-inspect/package.json" + }, + { + "path": "node_modules/retry-request/package.json" + }, + { + "path": "node_modules/retry-request/node_modules/debug/package.json" + }, + { + "path": "node_modules/is-arrayish/package.json" + }, + { + "path": "node_modules/shebang-regex/package.json" + }, + { + "path": "node_modules/clone-response/package.json" + }, + { + "path": "node_modules/deep-is/package.json" + }, + { + "path": "node_modules/regexpp/package.json" + }, + { + "path": "node_modules/node-forge/package.json" + }, + { + "path": "node_modules/power-assert/package.json" + }, + { + "path": "node_modules/path-is-absolute/package.json" + }, + { + "path": "node_modules/ignore-walk/package.json" + }, + { + "path": "node_modules/finalhandler/package.json" + }, + { + "path": "node_modules/finalhandler/node_modules/ms/package.json" + }, + { + "path": "node_modules/finalhandler/node_modules/debug/package.json" + }, + { + "path": "node_modules/source-map-support/package.json" + }, + { + "path": "node_modules/lodash.snakecase/package.json" + }, + { + "path": "node_modules/buffer-equal-constant-time/package.json" + }, + { + "path": "node_modules/path-parse/package.json" + }, + { + "path": "node_modules/decamelize-keys/package.json" + }, + { + "path": "node_modules/decamelize-keys/node_modules/map-obj/package.json" + }, + { + "path": "node_modules/os-tmpdir/package.json" + }, + { + "path": "node_modules/power-assert-util-string-width/package.json" + }, + { + "path": "node_modules/url-parse-lax/package.json" + }, + { + "path": "node_modules/linkify-it/package.json" + }, + { + "path": "node_modules/merge-descriptors/package.json" + }, + { + "path": "node_modules/async-each/package.json" + }, + { + "path": "node_modules/minimist/package.json" + }, + { + "path": "node_modules/fresh/package.json" + }, + { + "path": "node_modules/power-assert-context-formatter/package.json" + }, + { + "path": "node_modules/is-stream/package.json" + }, + { + "path": "node_modules/call-matcher/package.json" + }, + { + "path": "node_modules/is-stream-ended/package.json" + }, + { + "path": "node_modules/slice-ansi/package.json" + }, + { + "path": "node_modules/onetime/package.json" + }, + { + "path": "node_modules/spdx-correct/package.json" + }, + { + "path": "node_modules/fast-deep-equal/package.json" + }, + { + "path": "node_modules/readable-stream/package.json" + }, + { + "path": "node_modules/readable-stream/node_modules/safe-buffer/package.json" + }, + { + "path": "node_modules/xdg-basedir/package.json" + }, + { + "path": "node_modules/v8-compile-cache/package.json" + }, + { + "path": "node_modules/callsites/package.json" + }, + { + "path": "node_modules/power-assert-renderer-assertion/package.json" + }, + { + "path": "node_modules/pify/package.json" + }, + { + "path": "node_modules/stream-shift/package.json" + }, + { + "path": "node_modules/crypto-random-string/package.json" + }, + { + "path": "node_modules/escodegen/package.json" + }, + { + "path": "node_modules/escodegen/node_modules/esprima/package.json" + }, + { + "path": "node_modules/entities/package.json" + }, + { + "path": "node_modules/object.getownpropertydescriptors/package.json" + }, + { + "path": "node_modules/power-assert-renderer-file/package.json" + }, + { + "path": "node_modules/unpipe/package.json" + }, + { + "path": "node_modules/array-filter/package.json" + }, + { + "path": "node_modules/furi/package.json" + }, + { + "path": "node_modules/strip-eof/package.json" + }, + { + "path": "node_modules/is-path-inside/package.json" + }, + { + "path": "node_modules/ini/package.json" + }, + { + "path": "node_modules/currently-unhandled/package.json" + }, + { + "path": "node_modules/invert-kv/package.json" + }, + { + "path": "node_modules/validate-npm-package-license/package.json" + }, + { + "path": "node_modules/bignumber.js/package.json" + }, + { + "path": "node_modules/is-yarn-global/package.json" + }, + { + "path": "node_modules/lodash.has/package.json" + }, + { + "path": "node_modules/camelcase/package.json" + }, + { + "path": "node_modules/prelude-ls/package.json" + }, + { + "path": "node_modules/codecov/package.json" + }, + { + "path": "node_modules/es6-promise/package.json" + }, + { + "path": "node_modules/doctrine/package.json" + }, + { + "path": "node_modules/path-exists/package.json" + }, + { + "path": "node_modules/deep-extend/package.json" + }, + { + "path": "node_modules/nth-check/package.json" + }, + { + "path": "node_modules/isarray/package.json" + }, + { + "path": "node_modules/es-to-primitive/package.json" + }, + { + "path": "node_modules/https-proxy-agent/package.json" + }, + { + "path": "node_modules/eslint-plugin-es/package.json" + }, + { + "path": "node_modules/eslint-plugin-es/node_modules/regexpp/package.json" + }, + { + "path": "node_modules/path-type/package.json" + }, + { + "path": "node_modules/path-type/node_modules/pify/package.json" + }, + { + "path": "node_modules/fast-json-stable-stringify/package.json" + }, + { + "path": "node_modules/p-locate/package.json" + }, + { + "path": "node_modules/intelli-espower-loader/package.json" + }, + { + "path": "node_modules/node-fetch/package.json" + }, + { + "path": "node_modules/registry-auth-token/package.json" + }, + { + "path": "node_modules/esutils/package.json" + }, + { + "path": "node_modules/which-module/package.json" + }, + { + "path": "node_modules/function-bind/package.json" + }, + { + "path": "node_modules/lcid/package.json" + }, + { + "path": "node_modules/trim-newlines/package.json" + }, + { + "path": "node_modules/event-target-shim/package.json" + }, + { + "path": "node_modules/on-finished/package.json" + }, + { + "path": "node_modules/y18n/package.json" + }, + { + "path": "node_modules/quick-lru/package.json" + }, + { + "path": "node_modules/js-yaml/package.json" + }, + { + "path": "node_modules/flat/package.json" + }, + { + "path": "node_modules/normalize-package-data/package.json" + }, + { + "path": "node_modules/normalize-package-data/node_modules/semver/package.json" + }, + { + "path": "node_modules/es6-iterator/package.json" + }, + { + "path": "node_modules/typescript/package.json" + }, + { + "path": "node_modules/mkdirp/package.json" + }, + { + "path": "node_modules/mkdirp/node_modules/minimist/package.json" + }, + { + "path": "node_modules/fast-text-encoding/package.json" + }, + { + "path": "node_modules/acorn-es7-plugin/package.json" + }, + { + "path": "node_modules/through2/package.json" + }, + { + "path": "node_modules/eslint-visitor-keys/package.json" + }, + { + "path": "node_modules/glob/package.json" + }, + { + "path": "node_modules/inherits/package.json" + }, + { + "path": "node_modules/string.prototype.trimright/package.json" + }, + { + "path": "node_modules/punycode/package.json" + }, + { + "path": "node_modules/es5-ext/package.json" + }, + { + "path": "node_modules/is-date-object/package.json" + }, + { + "path": "node_modules/sprintf-js/package.json" + }, + { + "path": "node_modules/is-npm/package.json" + }, + { + "path": "node_modules/has-yarn/package.json" + }, + { + "path": "node_modules/get-stdin/package.json" + }, + { + "path": "node_modules/shebang-command/package.json" + }, + { + "path": "node_modules/empower-core/package.json" + }, + { + "path": "node_modules/imurmurhash/package.json" + }, + { + "path": "node_modules/globals/package.json" + }, + { + "path": "node_modules/latest-version/package.json" + }, + { + "path": "node_modules/natural-compare/package.json" + }, + { + "path": "node_modules/bytebuffer/package.json" + }, + { + "path": "node_modules/bytebuffer/node_modules/long/package.json" + }, + { + "path": "node_modules/commander/package.json" + }, + { + "path": "node_modules/path-is-inside/package.json" + }, + { + "path": "node_modules/rxjs/package.json" + }, + { + "path": "node_modules/node-environment-flags/package.json" + }, + { + "path": "node_modules/node-environment-flags/node_modules/semver/package.json" + }, + { + "path": "node_modules/p-limit/package.json" + }, + { + "path": "node_modules/call-signature/package.json" + }, + { + "path": "node_modules/istanbul-lib-coverage/package.json" + }, + { + "path": "node_modules/neo-async/package.json" + }, + { + "path": "node_modules/foreground-child/package.json" + }, + { + "path": "node_modules/he/package.json" + }, + { + "path": "node_modules/meow/package.json" + }, + { + "path": "node_modules/meow/node_modules/locate-path/package.json" + }, + { + "path": "node_modules/meow/node_modules/find-up/package.json" + }, + { + "path": "node_modules/meow/node_modules/yargs-parser/package.json" + }, + { + "path": "node_modules/meow/node_modules/camelcase/package.json" + }, + { + "path": "node_modules/meow/node_modules/path-exists/package.json" + }, + { + "path": "node_modules/meow/node_modules/p-locate/package.json" + }, + { + "path": "node_modules/meow/node_modules/p-limit/package.json" + }, + { + "path": "node_modules/meow/node_modules/p-try/package.json" + }, + { + "path": "node_modules/meow/node_modules/read-pkg-up/package.json" + }, + { + "path": "node_modules/toidentifier/package.json" + }, + { + "path": "node_modules/execa/package.json" + }, + { + "path": "node_modules/execa/node_modules/cross-spawn/package.json" + }, + { + "path": "node_modules/execa/node_modules/lru-cache/package.json" + }, + { + "path": "node_modules/execa/node_modules/yallist/package.json" + }, + { + "path": "node_modules/execa/node_modules/which/package.json" + }, + { + "path": "node_modules/execa/node_modules/shebang-regex/package.json" + }, + { + "path": "node_modules/execa/node_modules/is-stream/package.json" + }, + { + "path": "node_modules/execa/node_modules/shebang-command/package.json" + }, + { + "path": "node_modules/levn/package.json" + }, + { + "path": "node_modules/sinon/package.json" + }, + { + "path": "node_modules/sinon/node_modules/diff/package.json" + }, + { + "path": "node_modules/sinon/node_modules/supports-color/package.json" + }, + { + "path": "node_modules/unique-string/package.json" + }, + { + "path": "node_modules/gaxios/package.json" + }, + { + "path": "node_modules/power-assert-renderer-base/package.json" + }, + { + "path": "node_modules/browser-stdout/package.json" + }, + { + "path": "node_modules/regexp.prototype.flags/package.json" + }, + { + "path": "node_modules/run-async/package.json" + }, + { + "path": "node_modules/cheerio/package.json" + }, + { + "path": "node_modules/eslint-utils/package.json" + }, + { + "path": "node_modules/prepend-http/package.json" + }, + { + "path": "node_modules/urlgrey/package.json" + }, + { + "path": "node_modules/define-properties/package.json" + }, + { + "path": "node_modules/p-timeout/package.json" + }, + { + "path": "node_modules/cli-cursor/package.json" + }, + { + "path": "node_modules/pump/package.json" + }, + { + "path": "node_modules/stringifier/package.json" + }, + { + "path": "node_modules/espower-location-detector/package.json" + }, + { + "path": "node_modules/espower-location-detector/node_modules/source-map/package.json" + }, + { + "path": "node_modules/escape-html/package.json" + }, + { + "path": "node_modules/http-cache-semantics/package.json" + }, + { + "path": "node_modules/to-readable-stream/package.json" + }, + { + "path": "node_modules/eastasianwidth/package.json" + }, + { + "path": "node_modules/chardet/package.json" + }, + { + "path": "node_modules/js-tokens/package.json" + }, + { + "path": "node_modules/chalk/package.json" + }, + { + "path": "node_modules/chalk/node_modules/supports-color/package.json" + }, + { + "path": "node_modules/is-regex/package.json" + }, + { + "path": "node_modules/ajv/package.json" + }, + { + "path": "node_modules/spdx-expression-parse/package.json" + }, + { + "path": "node_modules/cli-width/package.json" + }, + { + "path": "node_modules/ms/package.json" + }, + { + "path": "node_modules/istanbul-lib-report/package.json" + }, + { + "path": "node_modules/base64-js/package.json" + }, + { + "path": "node_modules/encodeurl/package.json" + }, + { + "path": "node_modules/json-buffer/package.json" + }, + { + "path": "node_modules/file-entry-cache/package.json" + }, + { + "path": "node_modules/gtoken/package.json" + }, + { + "path": "node_modules/klaw/package.json" + }, + { + "path": "node_modules/functional-red-black-tree/package.json" + }, + { + "path": "node_modules/dom-serializer/package.json" + }, + { + "path": "node_modules/is-symbol/package.json" + }, + { + "path": "node_modules/@babel/parser/package.json" + }, + { + "path": "node_modules/@babel/highlight/package.json" + }, + { + "path": "node_modules/@babel/code-frame/package.json" + }, + { + "path": "node_modules/type-check/package.json" + }, + { + "path": "node_modules/lolex/package.json" + }, + { + "path": "node_modules/iconv-lite/package.json" + }, + { + "path": "node_modules/is-url/package.json" + }, + { + "path": "node_modules/domutils/package.json" + }, + { + "path": "node_modules/nise/package.json" + }, + { + "path": "node_modules/nise/node_modules/lolex/package.json" + }, + { + "path": "node_modules/p-queue/package.json" + }, + { + "path": "node_modules/eventemitter3/package.json" + }, + { + "path": "node_modules/ext/package.json" + }, + { + "path": "node_modules/ext/node_modules/type/package.json" + }, + { + "path": "node_modules/deep-equal/package.json" + }, + { + "path": "node_modules/parse5/package.json" + }, + { + "path": "node_modules/flatted/package.json" + }, + { + "path": "node_modules/once/package.json" + }, + { + "path": "node_modules/universal-deep-strict-equal/package.json" + }, + { + "path": "node_modules/brace-expansion/package.json" + }, + { + "path": "node_modules/jsdoc-region-tag/package.json" + }, + { + "path": "node_modules/markdown-it-anchor/package.json" + }, + { + "path": "node_modules/traverse/package.json" + }, + { + "path": "node_modules/restore-cursor/package.json" + }, + { + "path": "node_modules/lodash.at/package.json" + }, + { + "path": "node_modules/graceful-fs/package.json" + }, + { + "path": "node_modules/responselike/package.json" + }, + { + "path": "node_modules/pseudomap/package.json" + }, + { + "path": "node_modules/espurify/package.json" + }, + { + "path": "node_modules/espree/package.json" + }, + { + "path": "node_modules/power-assert-renderer-diagram/package.json" + }, + { + "path": "node_modules/word-wrap/package.json" + }, + { + "path": "node_modules/espower-source/package.json" + }, + { + "path": "node_modules/espower-source/node_modules/acorn/package.json" + }, + { + "path": "node_modules/normalize-url/package.json" + }, + { + "path": "node_modules/wordwrap/package.json" + }, + { + "path": "node_modules/ee-first/package.json" + }, + { + "path": "node_modules/table/package.json" + }, + { + "path": "node_modules/handlebars/package.json" + }, + { + "path": "node_modules/es6-weak-map/package.json" + }, + { + "path": "node_modules/protobufjs/package.json" + }, + { + "path": "node_modules/protobufjs/cli/package.json" + }, + { + "path": "node_modules/protobufjs/cli/package-lock.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/semver/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/acorn/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/minimist/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/espree/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/acorn-jsx/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/package.json" + }, + { + "path": "node_modules/protobufjs/node_modules/@types/node/package.json" + }, + { + "path": "node_modules/espower/package.json" + }, + { + "path": "node_modules/espower/node_modules/source-map/package.json" + }, + { + "path": "node_modules/strip-json-comments/package.json" + }, + { + "path": "node_modules/process-nextick-args/package.json" + }, + { + "path": "node_modules/uuid/package.json" + }, + { + "path": "node_modules/array-find-index/package.json" + }, + { + "path": "node_modules/astral-regex/package.json" + }, + { + "path": "node_modules/@grpc/proto-loader/package.json" + }, + { + "path": "node_modules/@grpc/grpc-js/package.json" + }, + { + "path": "node_modules/test-exclude/package.json" + }, + { + "path": "node_modules/es6-promisify/package.json" + }, + { + "path": "node_modules/proxyquire/package.json" + }, + { + "path": "node_modules/p-try/package.json" + }, + { + "path": "node_modules/optionator/package.json" + }, + { + "path": "node_modules/requizzle/package.json" + }, + { + "path": "node_modules/c8/package.json" + }, + { + "path": "node_modules/c8/node_modules/locate-path/package.json" + }, + { + "path": "node_modules/c8/node_modules/path-exists/package.json" + }, + { + "path": "node_modules/c8/node_modules/p-locate/package.json" + }, + { + "path": "node_modules/c8/node_modules/yargs/package.json" + }, + { + "path": "node_modules/c8/node_modules/yargs/node_modules/find-up/package.json" + }, + { + "path": "node_modules/fast-levenshtein/package.json" + }, + { + "path": "node_modules/statuses/package.json" + }, + { + "path": "node_modules/semver-diff/package.json" + }, + { + "path": "node_modules/semver-diff/node_modules/semver/package.json" + }, + { + "path": "node_modules/signal-exit/package.json" + }, + { + "path": "node_modules/jsdoc/package.json" + }, + { + "path": "node_modules/jsdoc/node_modules/escape-string-regexp/package.json" + }, + { + "path": "node_modules/duplexify/package.json" + }, + { + "path": "node_modules/array-from/package.json" + }, + { + "path": "node_modules/object-is/package.json" + }, + { + "path": "node_modules/tslib/package.json" + }, + { + "path": "node_modules/extend/package.json" + }, + { + "path": "node_modules/power-assert-context-reducer-ast/package.json" + }, + { + "path": "node_modules/power-assert-context-reducer-ast/node_modules/acorn/package.json" + }, + { + "path": "node_modules/css-what/package.json" + }, + { + "path": "node_modules/power-assert-renderer-comparison/package.json" + }, + { + "path": "node_modules/ecdsa-sig-formatter/package.json" + }, + { + "path": "node_modules/typedarray-to-buffer/README.md" + }, + { + "path": "node_modules/typedarray-to-buffer/package.json" + }, + { + "path": "node_modules/typedarray-to-buffer/.travis.yml" + }, + { + "path": "node_modules/typedarray-to-buffer/index.js" + }, + { + "path": "node_modules/typedarray-to-buffer/.airtap.yml" + }, + { + "path": "node_modules/typedarray-to-buffer/LICENSE" + }, + { + "path": "node_modules/typedarray-to-buffer/test/basic.js" + }, + { + "path": "node_modules/markdown-it/package.json" + }, + { + "path": "node_modules/tslint-config-prettier/package.json" + }, + { + "path": "node_modules/buffer-from/package.json" + }, + { + "path": "node_modules/domelementtype/package.json" + }, + { + "path": "node_modules/ci-info/package.json" + }, + { + "path": "node_modules/@types/mocha/package.json" + }, + { + "path": "node_modules/@types/lodash/package.json" + }, + { + "path": "node_modules/@types/color-name/package.json" + }, + { + "path": "node_modules/@types/is-windows/package.json" + }, + { + "path": "node_modules/@types/tmp/package.json" + }, + { + "path": "node_modules/@types/lodash.snakecase/package.json" + }, + { + "path": "node_modules/@types/bytebuffer/package.json" + }, + { + "path": "node_modules/@types/istanbul-lib-coverage/package.json" + }, + { + "path": "node_modules/@types/execa/package.json" + }, + { + "path": "node_modules/@types/sinon/package.json" + }, + { + "path": "node_modules/@types/node/package.json" + }, + { + "path": "node_modules/@types/uuid/package.json" + }, + { + "path": "node_modules/@types/proxyquire/package.json" + }, + { + "path": "node_modules/@types/duplexify/package.json" + }, + { + "path": "node_modules/@types/extend/package.json" + }, + { + "path": "node_modules/@types/ncp/package.json" + }, + { + "path": "node_modules/@types/long/package.json" + }, + { + "path": "node_modules/@types/mv/package.json" + }, + { + "path": "node_modules/serve-static/package.json" + }, + { + "path": "node_modules/make-dir/package.json" + }, + { + "path": "node_modules/make-dir/node_modules/semver/package.json" + }, + { + "path": "node_modules/esquery/package.json" + }, + { + "path": "node_modules/ncp/package.json" + }, + { + "path": "node_modules/emoji-regex/package.json" + }, + { + "path": "node_modules/read-pkg/package.json" + }, + { + "path": "node_modules/fast-diff/package.json" + }, + { + "path": "node_modules/xtend/package.json" + }, + { + "path": "node_modules/resolve/package.json" + }, + { + "path": "node_modules/lowercase-keys/package.json" + }, + { + "path": "node_modules/is-fullwidth-code-point/package.json" + }, + { + "path": "node_modules/read-pkg-up/package.json" + }, + { + "path": "node_modules/read-pkg-up/node_modules/locate-path/package.json" + }, + { + "path": "node_modules/read-pkg-up/node_modules/find-up/package.json" + }, + { + "path": "node_modules/read-pkg-up/node_modules/path-exists/package.json" + }, + { + "path": "node_modules/read-pkg-up/node_modules/p-locate/package.json" + }, + { + "path": "node_modules/@google-cloud/precise-date/package.json" + }, + { + "path": "node_modules/@google-cloud/paginator/package.json" + }, + { + "path": "node_modules/@google-cloud/projectify/package.json" + }, + { + "path": "node_modules/@google-cloud/promisify/package.json" + }, + { + "path": "node_modules/p-cancelable/package.json" + }, + { + "path": "node_modules/acorn-jsx/package.json" + }, + { + "path": "node_modules/power-assert-context-traversal/package.json" + }, + { + "path": "node_modules/long/package.json" + }, + { + "path": "node_modules/d/package.json" + }, + { + "path": "node_modules/debug/package.json" + }, + { + "path": "node_modules/mimic-fn/package.json" + }, + { + "path": "node_modules/is-object/package.json" + }, + { + "path": "node_modules/mv/package.json" + }, + { + "path": "node_modules/mv/node_modules/rimraf/package.json" + }, + { + "path": "node_modules/mv/node_modules/glob/package.json" + }, + { + "path": "node_modules/isexe/package.json" + }, + { + "path": "node_modules/multi-stage-sourcemap/package.json" + }, + { + "path": "node_modules/multi-stage-sourcemap/node_modules/source-map/package.json" + }, + { + "path": "node_modules/lodash.clone/package.json" + }, + { + "path": "node_modules/uc.micro/package.json" + }, + { + "path": "node_modules/fs.realpath/package.json" + }, + { + "path": "node_modules/eslint-plugin-prettier/package.json" + }, + { + "path": "node_modules/yargs/package.json" + }, + { + "path": "node_modules/yargs/node_modules/string-width/package.json" + }, + { + "path": "node_modules/yargs/node_modules/wrap-ansi/package.json" + }, + { + "path": "node_modules/yargs/node_modules/strip-ansi/package.json" + }, + { + "path": "node_modules/yargs/node_modules/color-name/package.json" + }, + { + "path": "node_modules/yargs/node_modules/color-convert/package.json" + }, + { + "path": "node_modules/yargs/node_modules/ansi-regex/package.json" + }, + { + "path": "node_modules/yargs/node_modules/yargs-parser/package.json" + }, + { + "path": "node_modules/yargs/node_modules/ansi-styles/package.json" + }, + { + "path": "node_modules/yargs/node_modules/cliui/package.json" + }, + { + "path": "node_modules/yargs/node_modules/emoji-regex/package.json" + }, + { + "path": "node_modules/yargs/node_modules/is-fullwidth-code-point/package.json" + }, + { + "path": "node_modules/nice-try/package.json" + }, + { + "path": "node_modules/has/package.json" + }, + { + "path": "node_modules/xmlcreate/package.json" + }, + { + "path": "node_modules/escallmatch/package.json" + }, + { + "path": "node_modules/escallmatch/node_modules/esprima/package.json" + }, + { + "path": "node_modules/get-caller-file/package.json" + }, + { + "path": "node_modules/jwa/package.json" + }, + { + "path": "smoke-test/.eslintrc.yml" + }, + { + "path": "smoke-test/publisher_smoke_test.js" + } ] } \ No newline at end of file From c05ee32c6939e9453dcfed46d973942329162ee6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 4 Jan 2020 10:15:35 +0200 Subject: [PATCH 0550/1115] chore(deps): update dependency eslint-plugin-node to v11 (#840) Co-authored-by: Benjamin E. Coe Co-authored-by: Alexander Fenster --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0ce0b26cbe2..f9264e7b59c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -80,7 +80,7 @@ "codecov": "^3.0.0", "eslint": "^6.0.0", "eslint-config-prettier": "^6.0.0", - "eslint-plugin-node": "^10.0.0", + "eslint-plugin-node": "^11.0.0", "eslint-plugin-prettier": "^3.0.0", "grpc": "^1.24.0", "gts": "^1.0.0", From 6d25742c3d829e1533fa6252d293266a0ee1f1c3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 4 Jan 2020 10:36:22 +0200 Subject: [PATCH 0551/1115] chore(deps): update dependency c8 to v7 (#838) Co-authored-by: Benjamin E. Coe Co-authored-by: Alexander Fenster --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f9264e7b59c..6b1b6a6fa95 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -76,7 +76,7 @@ "@types/sinon": "^7.0.0", "@types/tmp": "^0.1.0", "@types/uuid": "^3.4.4", - "c8": "^6.0.1", + "c8": "^7.0.0", "codecov": "^3.0.0", "eslint": "^6.0.0", "eslint-config-prettier": "^6.0.0", From 14b27fb3404265910d49396a98551893b9f2fb7d Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Sat, 4 Jan 2020 00:49:40 -0800 Subject: [PATCH 0552/1115] refactor: use explicit mocha imports (#841) * refactor: use explicit mocha imports * test: more imports Co-authored-by: Alexander Fenster --- handwritten/pubsub/smoke-test/.eslintrc.yml | 2 -- handwritten/pubsub/smoke-test/publisher_smoke_test.js | 2 ++ handwritten/pubsub/system-test/pubsub.ts | 1 + handwritten/pubsub/test/.eslintrc.yml | 2 -- handwritten/pubsub/test/gapic-v1.js | 1 + handwritten/pubsub/test/histogram.ts | 1 + handwritten/pubsub/test/iam.ts | 1 + handwritten/pubsub/test/index.ts | 1 + handwritten/pubsub/test/lease-manager.ts | 1 + handwritten/pubsub/test/message-queues.ts | 1 + handwritten/pubsub/test/message-stream.ts | 1 + handwritten/pubsub/test/publisher/index.ts | 1 + handwritten/pubsub/test/publisher/message-batch.ts | 1 + handwritten/pubsub/test/publisher/message-queues.ts | 1 + handwritten/pubsub/test/publisher/publish-error.ts | 1 + handwritten/pubsub/test/pubsub.ts | 1 + handwritten/pubsub/test/snapshot.ts | 1 + handwritten/pubsub/test/subscriber.ts | 1 + handwritten/pubsub/test/subscription.ts | 1 + handwritten/pubsub/test/topic.ts | 1 + 20 files changed, 19 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/smoke-test/.eslintrc.yml b/handwritten/pubsub/smoke-test/.eslintrc.yml index 77ad41e79e9..0d3d77f79f5 100644 --- a/handwritten/pubsub/smoke-test/.eslintrc.yml +++ b/handwritten/pubsub/smoke-test/.eslintrc.yml @@ -1,6 +1,4 @@ --- -env: - mocha: true rules: node/no-missing-require: off no-console: off diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index cce42c0d383..39c5f14e0c1 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -14,6 +14,8 @@ 'use strict'; +const {describe, it} = require('mocha'); + describe('PublisherSmokeTest', () => { if (!process.env.GCLOUD_PROJECT) { throw new Error('Usage: GCLOUD_PROJECT= node #{$0}'); diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index dbabe959f3d..84a67e53b4a 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as crypto from 'crypto'; import defer = require('p-defer'); import * as uuid from 'uuid'; diff --git a/handwritten/pubsub/test/.eslintrc.yml b/handwritten/pubsub/test/.eslintrc.yml index fb2657e4cc9..46afd952546 100644 --- a/handwritten/pubsub/test/.eslintrc.yml +++ b/handwritten/pubsub/test/.eslintrc.yml @@ -1,5 +1,3 @@ --- -env: - mocha: true rules: node/no-missing-require: off diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index 3fbf891a462..f4fa13ecded 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -15,6 +15,7 @@ 'use strict'; const assert = require('assert'); +const {describe, it} = require('mocha'); const {PassThrough} = require('stream'); const pubsubModule = require('../src'); diff --git a/handwritten/pubsub/test/histogram.ts b/handwritten/pubsub/test/histogram.ts index 3726dac1707..fdd31d36744 100644 --- a/handwritten/pubsub/test/histogram.ts +++ b/handwritten/pubsub/test/histogram.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {Histogram} from '../src/histogram.js'; describe('Histogram', () => { diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index 31c64b9710c..183634c19f3 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -14,6 +14,7 @@ import * as promisify from '@google-cloud/promisify'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as proxyquire from 'proxyquire'; import * as iamTypes from '../src/iam'; diff --git a/handwritten/pubsub/test/index.ts b/handwritten/pubsub/test/index.ts index 9245e5fe550..7db1e81601f 100644 --- a/handwritten/pubsub/test/index.ts +++ b/handwritten/pubsub/test/index.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as pubsub from '../src'; describe('exports', () => { diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index dba9c6a26e0..7f2570a0603 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -15,6 +15,7 @@ */ import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index cddd0ccaf40..bb6cb41391d 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -15,6 +15,7 @@ */ import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {EventEmitter} from 'events'; import {CallOptions} from 'google-gax'; import {Metadata, ServiceError} from '@grpc/grpc-js'; diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 5e83aebe121..4931b3380ab 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -15,6 +15,7 @@ */ import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {Metadata, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 56133c85ca4..c545f2afb00 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -16,6 +16,7 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; diff --git a/handwritten/pubsub/test/publisher/message-batch.ts b/handwritten/pubsub/test/publisher/message-batch.ts index 2fc81b18adb..af83498430e 100644 --- a/handwritten/pubsub/test/publisher/message-batch.ts +++ b/handwritten/pubsub/test/publisher/message-batch.ts @@ -15,6 +15,7 @@ */ import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {randomBytes} from 'crypto'; import * as sinon from 'sinon'; diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 5cd2c2b0ef0..d889bae80c4 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -16,6 +16,7 @@ import {ServiceError} from '@grpc/grpc-js'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; diff --git a/handwritten/pubsub/test/publisher/publish-error.ts b/handwritten/pubsub/test/publisher/publish-error.ts index 52bb9104486..4b31cb7b2ad 100644 --- a/handwritten/pubsub/test/publisher/publish-error.ts +++ b/handwritten/pubsub/test/publisher/publish-error.ts @@ -15,6 +15,7 @@ */ import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {ServiceError, Metadata} from '@grpc/grpc-js'; import {PublishError} from '../../src/publisher/publish-error'; diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index cefb8b97672..fd1dd8f2657 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -16,6 +16,7 @@ import * as pjy from '@google-cloud/projectify'; import * as promisify from '@google-cloud/promisify'; import arrify = require('arrify'); import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as gax from 'google-gax'; import * as grpc from '@grpc/grpc-js'; import {CallOptions, ChannelCredentials, ServiceError} from '@grpc/grpc-js'; diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 8f4f614a9e5..bb6b58a6680 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -14,6 +14,7 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 218ec26b990..f575f0c4ac6 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -15,6 +15,7 @@ */ import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {EventEmitter} from 'events'; import {common as protobuf} from 'protobufjs'; import * as proxyquire from 'proxyquire'; diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index c5ce505cfc3..dd96bb39926 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -14,6 +14,7 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {EventEmitter} from 'events'; import {ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 172e6686675..6303c34e36c 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -14,6 +14,7 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; +import {describe, it} from 'mocha'; import {CallOptions} from 'google-gax'; import {ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; From e499717ea0b7159733a51bd631896559fc25f65f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sat, 4 Jan 2020 23:53:13 -0800 Subject: [PATCH 0553/1115] chore: update .nycrc --- handwritten/pubsub/.nycrc | 1 + handwritten/pubsub/protos/protos.d.ts | 2 +- handwritten/pubsub/protos/protos.js | 2 +- handwritten/pubsub/synth.metadata | 2441 +++++++++++++------------ 4 files changed, 1294 insertions(+), 1152 deletions(-) diff --git a/handwritten/pubsub/.nycrc b/handwritten/pubsub/.nycrc index 367688844eb..b18d5472b62 100644 --- a/handwritten/pubsub/.nycrc +++ b/handwritten/pubsub/.nycrc @@ -12,6 +12,7 @@ "**/scripts", "**/protos", "**/test", + "**/*.d.ts", ".jsdoc.js", "**/.jsdoc.js", "karma.conf.js", diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index dbfc1471793..dae4bff7733 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index ffd08431852..d5e1631e41e 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 62be76aacc2..5f02d6e287d 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-12-21T12:23:10.592493Z", + "updateTime": "2020-01-04T12:23:51.003064Z", "sources": [ { "generator": { "name": "artman", - "version": "0.42.3", - "dockerImage": "googleapis/artman@sha256:feed210b5723c6f524b52ef6d7740a030f2d1a8f7c29a71c5e5b4481ceaad7f5" + "version": "0.43.0", + "dockerImage": "googleapis/artman@sha256:264654a37596a44b0668b8ce6ac41082d713f6ee150b3fc6425fa78cc64e4f20" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "1a380ea21dea9b6ac6ad28c60ad96d9d73574e19", - "internalRef": "286616241" + "sha": "91ef2d9dd69807b0b79555f22566fb2d81e49ff9", + "internalRef": "287999179" } }, { @@ -37,2042 +37,2039 @@ } ], "newFiles": [ - { - "path": ".repo-metadata.json" - }, - { - "path": "README.md" - }, { "path": "package.json" }, { - "path": "CHANGELOG.md" + "path": ".prettierignore" }, { - "path": ".gitignore" + "path": "CODE_OF_CONDUCT.md" }, { - "path": "CODE_OF_CONDUCT.md" + "path": "tsconfig.json" }, { - "path": "CONTRIBUTING.md" + "path": ".repo-metadata.json" }, { "path": ".prettierrc" }, { - "path": "package-lock.json" + "path": "CHANGELOG.md" }, { - "path": ".eslintignore" + "path": "renovate.json" }, { - "path": "linkinator.config.json" + "path": ".nycrc" }, { - "path": ".eslintrc.yml" + "path": "LICENSE" }, { - "path": "renovate.json" + "path": "synth.py" }, { - "path": "synth.metadata" + "path": ".eslintignore" }, { - "path": ".prettierignore" + "path": "linkinator.config.json" }, { - "path": "synth.py" + "path": "package-lock.json" + }, + { + "path": "CONTRIBUTING.md" }, { "path": ".readme-partials.yml" }, { - "path": "codecov.yaml" + "path": ".eslintrc.yml" }, { "path": "tslint.json" }, { - "path": ".jsdoc.js" + "path": "README.md" }, { - "path": "LICENSE" + "path": "synth.metadata" }, { - "path": ".nycrc" + "path": ".gitignore" }, { - "path": "tsconfig.json" + "path": "codecov.yaml" }, { - "path": "src/util.ts" + "path": ".jsdoc.js" }, { - "path": "src/pull-retry.ts" + "path": "smoke-test/publisher_smoke_test.js" }, { - "path": "src/subscriber.ts" + "path": "smoke-test/.eslintrc.yml" }, { - "path": "src/message-stream.ts" + "path": ".github/PULL_REQUEST_TEMPLATE.md" }, { - "path": "src/index.ts" + "path": ".github/release-please.yml" }, { - "path": "src/lease-manager.ts" + "path": ".github/ISSUE_TEMPLATE/bug_report.md" }, { - "path": "src/.eslintrc.yml" + "path": ".github/ISSUE_TEMPLATE/feature_request.md" }, { - "path": "src/histogram.ts" + "path": ".github/ISSUE_TEMPLATE/support_request.md" }, { - "path": "src/subscription.ts" + "path": "node_modules/uc.micro/package.json" }, { - "path": "src/snapshot.ts" + "path": "node_modules/eastasianwidth/package.json" }, { - "path": "src/pubsub.ts" + "path": "node_modules/strip-bom/package.json" }, { - "path": "src/topic.ts" + "path": "node_modules/defer-to-connect/package.json" }, { - "path": "src/message-queues.ts" + "path": "node_modules/object-is/package.json" }, { - "path": "src/service_proto_list.json" + "path": "node_modules/is-arguments/package.json" }, { - "path": "src/iam.ts" + "path": "node_modules/eventemitter3/package.json" }, { - "path": "src/v1/publisher_client.js" + "path": "node_modules/long/package.json" }, { - "path": "src/v1/publisher_client_config.json" + "path": "node_modules/lodash/package.json" }, { - "path": "src/v1/subscriber_client_config.json" + "path": "node_modules/diff/package.json" }, { - "path": "src/v1/index.js" + "path": "node_modules/has-flag/package.json" }, { - "path": "src/v1/publisher_proto_list.json" + "path": "node_modules/prelude-ls/package.json" }, { - "path": "src/v1/subscriber_proto_list.json" + "path": "node_modules/source-map/package.json" }, { - "path": "src/v1/subscriber_client.js" + "path": "node_modules/spdx-correct/package.json" }, { - "path": "src/v1/doc/google/type/doc_expr.js" + "path": "node_modules/path-to-regexp/package.json" }, { - "path": "src/v1/doc/google/iam/v1/doc_policy.js" + "path": "node_modules/path-to-regexp/node_modules/isarray/package.json" }, { - "path": "src/v1/doc/google/iam/v1/doc_options.js" + "path": "node_modules/normalize-url/package.json" }, { - "path": "src/v1/doc/google/iam/v1/doc_iam_policy.js" + "path": "node_modules/tmp/package.json" }, { - "path": "src/v1/doc/google/pubsub/v1/doc_pubsub.js" + "path": "node_modules/got/package.json" }, { - "path": "src/v1/doc/google/protobuf/doc_field_mask.js" + "path": "node_modules/got/node_modules/get-stream/package.json" }, { - "path": "src/v1/doc/google/protobuf/doc_duration.js" + "path": "node_modules/agent-base/package.json" }, { - "path": "src/v1/doc/google/protobuf/doc_timestamp.js" + "path": "node_modules/process-nextick-args/package.json" }, { - "path": "src/v1/doc/google/protobuf/doc_empty.js" + "path": "node_modules/optjs/package.json" }, { - "path": "src/publisher/message-batch.ts" + "path": "node_modules/google-gax/package.json" }, { - "path": "src/publisher/index.ts" + "path": "node_modules/next-tick/package.json" }, { - "path": "src/publisher/publish-error.ts" + "path": "node_modules/hosted-git-info/package.json" }, { - "path": "src/publisher/message-queues.ts" + "path": "node_modules/is-symbol/package.json" }, { - "path": "build/src/index.d.ts" + "path": "node_modules/once/package.json" }, { - "path": "build/src/subscriber.js.map" + "path": "node_modules/yargs-parser/package.json" }, { - "path": "build/src/lease-manager.js.map" + "path": "node_modules/ansi-escapes/package.json" }, { - "path": "build/src/pull-retry.js.map" + "path": "node_modules/gcp-metadata/package.json" }, { - "path": "build/src/pull-retry.js" + "path": "node_modules/espower-loader/package.json" }, { - "path": "build/src/iam.js.map" + "path": "node_modules/espower-loader/node_modules/source-map/package.json" }, { - "path": "build/src/index.js.map" + "path": "node_modules/espower-loader/node_modules/source-map-support/package.json" }, { - "path": "build/src/message-stream.js.map" + "path": "node_modules/validate-npm-package-license/package.json" }, { - "path": "build/src/message-queues.d.ts" + "path": "node_modules/doctrine/package.json" }, { - "path": "build/src/snapshot.d.ts" + "path": "node_modules/power-assert-context-formatter/package.json" }, { - "path": "build/src/iam.d.ts" + "path": "node_modules/marked/package.json" }, { - "path": "build/src/subscriber.js" + "path": "node_modules/jsdoc/package.json" }, { - "path": "build/src/snapshot.js.map" + "path": "node_modules/jsdoc/node_modules/escape-string-regexp/package.json" }, { - "path": "build/src/subscriber.d.ts" + "path": "node_modules/flat-cache/package.json" }, { - "path": "build/src/subscription.js.map" + "path": "node_modules/flat-cache/node_modules/rimraf/package.json" }, { - "path": "build/src/util.js.map" + "path": "node_modules/is-npm/package.json" }, { - "path": "build/src/histogram.js" + "path": "node_modules/espower-location-detector/package.json" }, { - "path": "build/src/subscription.js" + "path": "node_modules/espower-location-detector/node_modules/source-map/package.json" }, { - "path": "build/src/lease-manager.d.ts" + "path": "node_modules/base64-js/package.json" }, { - "path": "build/src/subscription.d.ts" + "path": "node_modules/is-glob/package.json" }, { - "path": "build/src/message-queues.js.map" + "path": "node_modules/taffydb/package.json" }, { - "path": "build/src/index.js" + "path": "node_modules/mocha/package.json" }, { - "path": "build/src/message-stream.js" + "path": "node_modules/mocha/node_modules/diff/package.json" }, { - "path": "build/src/topic.js.map" + "path": "node_modules/mocha/node_modules/has-flag/package.json" }, { - "path": "build/src/lease-manager.js" + "path": "node_modules/mocha/node_modules/yargs-parser/package.json" }, { - "path": "build/src/topic.js" + "path": "node_modules/mocha/node_modules/glob/package.json" }, { - "path": "build/src/snapshot.js" + "path": "node_modules/mocha/node_modules/strip-ansi/package.json" }, { - "path": "build/src/topic.d.ts" + "path": "node_modules/mocha/node_modules/ansi-styles/package.json" }, { - "path": "build/src/util.js" + "path": "node_modules/mocha/node_modules/find-up/package.json" }, { - "path": "build/src/pubsub.d.ts" + "path": "node_modules/mocha/node_modules/strip-json-comments/package.json" }, { - "path": "build/src/iam.js" + "path": "node_modules/mocha/node_modules/locate-path/package.json" }, { - "path": "build/src/message-stream.d.ts" + "path": "node_modules/mocha/node_modules/yargs/package.json" }, { - "path": "build/src/pull-retry.d.ts" + "path": "node_modules/mocha/node_modules/is-fullwidth-code-point/package.json" }, { - "path": "build/src/util.d.ts" + "path": "node_modules/mocha/node_modules/supports-color/package.json" }, { - "path": "build/src/pubsub.js.map" + "path": "node_modules/mocha/node_modules/p-locate/package.json" }, { - "path": "build/src/histogram.js.map" + "path": "node_modules/mocha/node_modules/path-exists/package.json" }, { - "path": "build/src/message-queues.js" + "path": "node_modules/mocha/node_modules/ms/package.json" }, { - "path": "build/src/histogram.d.ts" + "path": "node_modules/mocha/node_modules/color-name/package.json" }, { - "path": "build/src/pubsub.js" + "path": "node_modules/mocha/node_modules/ansi-regex/package.json" }, { - "path": "build/src/v1/publisher_client.js" + "path": "node_modules/mocha/node_modules/color-convert/package.json" }, { - "path": "build/src/v1/publisher_client_config.json" + "path": "node_modules/mocha/node_modules/cliui/package.json" }, { - "path": "build/src/v1/subscriber_client_config.json" + "path": "node_modules/mocha/node_modules/wrap-ansi/package.json" }, { - "path": "build/src/v1/index.js" + "path": "node_modules/mocha/node_modules/which/package.json" }, { - "path": "build/src/v1/publisher_proto_list.json" + "path": "node_modules/mocha/node_modules/string-width/package.json" }, { - "path": "build/src/v1/subscriber_proto_list.json" + "path": "node_modules/mocha/node_modules/emoji-regex/package.json" }, { - "path": "build/src/v1/subscriber_client.js" + "path": "node_modules/colour/package.json" }, { - "path": "build/src/v1/doc/google/type/doc_expr.js" + "path": "node_modules/minimist/package.json" }, { - "path": "build/src/v1/doc/google/iam/v1/doc_policy.js" + "path": "node_modules/type/package.json" }, { - "path": "build/src/v1/doc/google/iam/v1/doc_options.js" + "path": "node_modules/yargs-unparser/package.json" }, { - "path": "build/src/v1/doc/google/iam/v1/doc_iam_policy.js" + "path": "node_modules/yargs-unparser/node_modules/yargs-parser/package.json" }, { - "path": "build/src/v1/doc/google/pubsub/v1/doc_pubsub.js" + "path": "node_modules/yargs-unparser/node_modules/strip-ansi/package.json" }, { - "path": "build/src/v1/doc/google/protobuf/doc_field_mask.js" + "path": "node_modules/yargs-unparser/node_modules/ansi-styles/package.json" }, { - "path": "build/src/v1/doc/google/protobuf/doc_duration.js" + "path": "node_modules/yargs-unparser/node_modules/find-up/package.json" }, { - "path": "build/src/v1/doc/google/protobuf/doc_timestamp.js" + "path": "node_modules/yargs-unparser/node_modules/locate-path/package.json" }, { - "path": "build/src/v1/doc/google/protobuf/doc_empty.js" + "path": "node_modules/yargs-unparser/node_modules/yargs/package.json" }, { - "path": "build/src/publisher/index.d.ts" + "path": "node_modules/yargs-unparser/node_modules/is-fullwidth-code-point/package.json" }, { - "path": "build/src/publisher/index.js.map" + "path": "node_modules/yargs-unparser/node_modules/p-locate/package.json" }, { - "path": "build/src/publisher/message-queues.d.ts" + "path": "node_modules/yargs-unparser/node_modules/path-exists/package.json" }, { - "path": "build/src/publisher/publish-error.js.map" + "path": "node_modules/yargs-unparser/node_modules/color-name/package.json" }, { - "path": "build/src/publisher/publish-error.js" + "path": "node_modules/yargs-unparser/node_modules/ansi-regex/package.json" }, { - "path": "build/src/publisher/message-batch.js" + "path": "node_modules/yargs-unparser/node_modules/color-convert/package.json" }, { - "path": "build/src/publisher/publish-error.d.ts" + "path": "node_modules/yargs-unparser/node_modules/cliui/package.json" }, { - "path": "build/src/publisher/message-queues.js.map" + "path": "node_modules/yargs-unparser/node_modules/wrap-ansi/package.json" }, { - "path": "build/src/publisher/index.js" + "path": "node_modules/yargs-unparser/node_modules/string-width/package.json" }, { - "path": "build/src/publisher/message-batch.d.ts" + "path": "node_modules/yargs-unparser/node_modules/emoji-regex/package.json" }, { - "path": "build/src/publisher/message-batch.js.map" + "path": "node_modules/invert-kv/package.json" }, { - "path": "build/src/publisher/message-queues.js" + "path": "node_modules/css-select/package.json" }, { - "path": "build/proto/iam.d.ts" + "path": "node_modules/file-entry-cache/package.json" }, { - "path": "build/proto/pubsub.d.ts" + "path": "node_modules/he/package.json" }, { - "path": "build/protos/protos.json" + "path": "node_modules/npm-run-path/package.json" }, { - "path": "build/protos/protos.js" + "path": "node_modules/npm-run-path/node_modules/path-key/package.json" }, { - "path": "build/protos/protos.d.ts" + "path": "node_modules/xmlcreate/package.json" }, { - "path": "build/protos/google/type/expr.proto" + "path": "node_modules/https-proxy-agent/package.json" }, { - "path": "build/protos/google/api/billing.proto" + "path": "node_modules/ecdsa-sig-formatter/package.json" }, { - "path": "build/protos/google/api/documentation.proto" + "path": "node_modules/nice-try/package.json" }, { - "path": "build/protos/google/api/distribution.proto" + "path": "node_modules/log-symbols/package.json" }, { - "path": "build/protos/google/api/auth.proto" + "path": "node_modules/commander/package.json" }, { - "path": "build/protos/google/api/annotations.proto" + "path": "node_modules/object.getownpropertydescriptors/package.json" }, { - "path": "build/protos/google/api/context.proto" + "path": "node_modules/@protobufjs/path/package.json" }, { - "path": "build/protos/google/api/config_change.proto" + "path": "node_modules/@protobufjs/pool/package.json" }, { - "path": "build/protos/google/api/logging.proto" + "path": "node_modules/@protobufjs/float/package.json" }, { - "path": "build/protos/google/api/system_parameter.proto" + "path": "node_modules/@protobufjs/aspromise/package.json" }, { - "path": "build/protos/google/api/label.proto" + "path": "node_modules/@protobufjs/fetch/package.json" }, { - "path": "build/protos/google/api/quota.proto" + "path": "node_modules/@protobufjs/utf8/package.json" }, { - "path": "build/protos/google/api/source_info.proto" + "path": "node_modules/@protobufjs/codegen/package.json" }, { - "path": "build/protos/google/api/control.proto" + "path": "node_modules/@protobufjs/inquire/package.json" }, { - "path": "build/protos/google/api/httpbody.proto" + "path": "node_modules/@protobufjs/base64/package.json" }, { - "path": "build/protos/google/api/usage.proto" + "path": "node_modules/@protobufjs/eventemitter/package.json" }, { - "path": "build/protos/google/api/log.proto" + "path": "node_modules/gtoken/package.json" }, { - "path": "build/protos/google/api/monitored_resource.proto" + "path": "node_modules/type-detect/package.json" }, { - "path": "build/protos/google/api/service.proto" + "path": "node_modules/through2/package.json" }, { - "path": "build/protos/google/api/consumer.proto" + "path": "node_modules/p-limit/package.json" }, { - "path": "build/protos/google/api/http.proto" + "path": "node_modules/argparse/package.json" }, { - "path": "build/protos/google/api/backend.proto" + "path": "node_modules/eslint-scope/package.json" }, { - "path": "build/protos/google/api/monitoring.proto" + "path": "node_modules/extend/package.json" }, { - "path": "build/protos/google/api/endpoint.proto" + "path": "node_modules/is-path-inside/package.json" }, { - "path": "build/protos/google/api/metric.proto" + "path": "node_modules/destroy/package.json" }, { - "path": "build/protos/google/api/servicecontrol/v1/distribution.proto" + "path": "node_modules/power-assert-formatter/package.json" }, { - "path": "build/protos/google/api/servicecontrol/v1/operation.proto" + "path": "node_modules/read-pkg-up/package.json" }, { - "path": "build/protos/google/api/servicecontrol/v1/service_controller.proto" + "path": "node_modules/read-pkg-up/node_modules/p-limit/package.json" }, { - "path": "build/protos/google/api/servicecontrol/v1/metric_value.proto" + "path": "node_modules/read-pkg-up/node_modules/p-try/package.json" }, { - "path": "build/protos/google/api/servicecontrol/v1/log_entry.proto" + "path": "node_modules/read-pkg-up/node_modules/find-up/package.json" }, { - "path": "build/protos/google/api/servicecontrol/v1/check_error.proto" + "path": "node_modules/read-pkg-up/node_modules/locate-path/package.json" }, { - "path": "build/protos/google/api/experimental/authorization_config.proto" + "path": "node_modules/read-pkg-up/node_modules/p-locate/package.json" }, { - "path": "build/protos/google/api/experimental/experimental.proto" + "path": "node_modules/read-pkg-up/node_modules/path-exists/package.json" }, { - "path": "build/protos/google/api/servicemanagement/v1/servicemanager.proto" + "path": "node_modules/global-dirs/package.json" }, { - "path": "build/protos/google/api/servicemanagement/v1/resources.proto" + "path": "node_modules/fast-deep-equal/package.json" }, { - "path": "build/protos/google/iam/v1/iam_policy.proto" + "path": "node_modules/mimic-fn/package.json" }, { - "path": "build/protos/google/iam/v1/options.proto" + "path": "node_modules/power-assert-context-reducer-ast/package.json" }, { - "path": "build/protos/google/iam/v1/policy.proto" + "path": "node_modules/power-assert-context-reducer-ast/node_modules/acorn/package.json" }, { - "path": "build/protos/google/iam/admin/v1/iam.proto" + "path": "node_modules/core-util-is/package.json" }, { - "path": "build/protos/google/pubsub/v1/pubsub.proto" + "path": "node_modules/string.prototype.trimright/package.json" }, { - "path": "build/protos/google/protobuf/struct.proto" + "path": "node_modules/catharsis/package.json" }, { - "path": "build/protos/google/protobuf/api.proto" + "path": "node_modules/node-fetch/package.json" }, { - "path": "build/protos/google/protobuf/field_mask.proto" + "path": "node_modules/linkinator/package.json" }, { - "path": "build/protos/google/protobuf/type.proto" + "path": "node_modules/linkinator/node_modules/is-npm/package.json" }, { - "path": "build/protos/google/protobuf/any.proto" + "path": "node_modules/linkinator/node_modules/is-path-inside/package.json" }, { - "path": "build/protos/google/protobuf/descriptor.proto" + "path": "node_modules/linkinator/node_modules/read-pkg-up/package.json" }, { - "path": "build/protos/google/protobuf/source_context.proto" + "path": "node_modules/linkinator/node_modules/global-dirs/package.json" }, { - "path": "build/protos/google/protobuf/duration.proto" + "path": "node_modules/linkinator/node_modules/widest-line/package.json" }, { - "path": "build/protos/google/protobuf/wrappers.proto" + "path": "node_modules/linkinator/node_modules/boxen/package.json" }, { - "path": "build/protos/google/protobuf/empty.proto" + "path": "node_modules/linkinator/node_modules/read-pkg/package.json" }, { - "path": "build/protos/google/protobuf/timestamp.proto" + "path": "node_modules/linkinator/node_modules/read-pkg/node_modules/type-fest/package.json" }, { - "path": "build/protos/google/protobuf/util/json_format_proto3.proto" + "path": "node_modules/linkinator/node_modules/redent/package.json" }, { - "path": "build/test/index.d.ts" + "path": "node_modules/linkinator/node_modules/dot-prop/package.json" }, { - "path": "build/test/subscriber.js.map" + "path": "node_modules/linkinator/node_modules/update-notifier/package.json" }, { - "path": "build/test/lease-manager.js.map" + "path": "node_modules/linkinator/node_modules/parse-json/package.json" }, { - "path": "build/test/pull-retry.js.map" + "path": "node_modules/linkinator/node_modules/is-installed-globally/package.json" }, { - "path": "build/test/pull-retry.js" + "path": "node_modules/linkinator/node_modules/chalk/package.json" }, { - "path": "build/test/iam.js.map" + "path": "node_modules/linkinator/node_modules/meow/package.json" }, { - "path": "build/test/index.js.map" + "path": "node_modules/linkinator/node_modules/minimist-options/package.json" }, { - "path": "build/test/message-stream.js.map" + "path": "node_modules/linkinator/node_modules/term-size/package.json" }, { - "path": "build/test/message-queues.d.ts" + "path": "node_modules/linkinator/node_modules/xdg-basedir/package.json" }, { - "path": "build/test/snapshot.d.ts" + "path": "node_modules/linkinator/node_modules/trim-newlines/package.json" }, { - "path": "build/test/iam.d.ts" + "path": "node_modules/linkinator/node_modules/arrify/package.json" }, { - "path": "build/test/subscriber.js" + "path": "node_modules/linkinator/node_modules/unique-string/package.json" }, { - "path": "build/test/snapshot.js.map" + "path": "node_modules/linkinator/node_modules/crypto-random-string/package.json" }, { - "path": "build/test/subscriber.d.ts" + "path": "node_modules/linkinator/node_modules/semver/package.json" }, { - "path": "build/test/subscription.js.map" + "path": "node_modules/linkinator/node_modules/quick-lru/package.json" }, { - "path": "build/test/histogram.js" + "path": "node_modules/linkinator/node_modules/is-obj/package.json" }, { - "path": "build/test/subscription.js" + "path": "node_modules/linkinator/node_modules/camelcase-keys/package.json" }, { - "path": "build/test/lease-manager.d.ts" + "path": "node_modules/linkinator/node_modules/configstore/package.json" }, { - "path": "build/test/subscription.d.ts" + "path": "node_modules/linkinator/node_modules/indent-string/package.json" }, { - "path": "build/test/message-queues.js.map" + "path": "node_modules/linkinator/node_modules/semver-diff/package.json" }, { - "path": "build/test/index.js" + "path": "node_modules/linkinator/node_modules/strip-indent/package.json" }, { - "path": "build/test/message-stream.js" + "path": "node_modules/linkinator/node_modules/map-obj/package.json" }, { - "path": "build/test/topic.js.map" + "path": "node_modules/fresh/package.json" }, { - "path": "build/test/lease-manager.js" + "path": "node_modules/safer-buffer/package.json" }, { - "path": "build/test/topic.js" + "path": "node_modules/is-stream-ended/package.json" }, { - "path": "build/test/gapic-v1.js" + "path": "node_modules/mimic-response/package.json" }, { - "path": "build/test/snapshot.js" + "path": "node_modules/requizzle/package.json" }, { - "path": "build/test/topic.d.ts" + "path": "node_modules/cacheable-request/package.json" }, { - "path": "build/test/pubsub.d.ts" + "path": "node_modules/cacheable-request/node_modules/lowercase-keys/package.json" }, { - "path": "build/test/iam.js" + "path": "node_modules/cacheable-request/node_modules/get-stream/package.json" }, { - "path": "build/test/message-stream.d.ts" + "path": "node_modules/figures/package.json" }, { - "path": "build/test/pull-retry.d.ts" + "path": "node_modules/power-assert-util-string-width/package.json" }, { - "path": "build/test/pubsub.js.map" + "path": "node_modules/multi-stage-sourcemap/package.json" }, { - "path": "build/test/histogram.js.map" + "path": "node_modules/multi-stage-sourcemap/node_modules/source-map/package.json" }, { - "path": "build/test/message-queues.js" + "path": "node_modules/abort-controller/package.json" }, { - "path": "build/test/histogram.d.ts" + "path": "node_modules/widest-line/package.json" }, { - "path": "build/test/pubsub.js" + "path": "node_modules/widest-line/node_modules/strip-ansi/package.json" }, { - "path": "build/test/publisher/index.d.ts" + "path": "node_modules/widest-line/node_modules/is-fullwidth-code-point/package.json" }, { - "path": "build/test/publisher/index.js.map" + "path": "node_modules/widest-line/node_modules/ansi-regex/package.json" }, { - "path": "build/test/publisher/message-queues.d.ts" + "path": "node_modules/widest-line/node_modules/string-width/package.json" }, { - "path": "build/test/publisher/publish-error.js.map" + "path": "node_modules/eslint-plugin-es/package.json" }, { - "path": "build/test/publisher/publish-error.js" + "path": "node_modules/eslint-plugin-es/node_modules/eslint-utils/package.json" }, { - "path": "build/test/publisher/message-batch.js" + "path": "node_modules/eslint-plugin-es/node_modules/regexpp/package.json" }, { - "path": "build/test/publisher/publish-error.d.ts" + "path": "node_modules/boxen/package.json" }, { - "path": "build/test/publisher/message-queues.js.map" + "path": "node_modules/boxen/node_modules/strip-ansi/package.json" }, { - "path": "build/test/publisher/index.js" + "path": "node_modules/boxen/node_modules/type-fest/package.json" }, { - "path": "build/test/publisher/message-batch.d.ts" + "path": "node_modules/boxen/node_modules/is-fullwidth-code-point/package.json" }, { - "path": "build/test/publisher/message-batch.js.map" + "path": "node_modules/boxen/node_modules/ansi-regex/package.json" }, { - "path": "build/test/publisher/message-queues.js" + "path": "node_modules/boxen/node_modules/string-width/package.json" }, { - "path": "build/system-test/install.js.map" + "path": "node_modules/boxen/node_modules/emoji-regex/package.json" }, { - "path": "build/system-test/install.d.ts" + "path": "node_modules/glob/package.json" }, { - "path": "build/system-test/install.js" + "path": "node_modules/buffer-equal-constant-time/package.json" }, { - "path": "build/system-test/publisher_smoke_test.js" + "path": "node_modules/strip-ansi/package.json" }, { - "path": "build/system-test/pubsub.d.ts" + "path": "node_modules/lodash.clone/package.json" }, { - "path": "build/system-test/pubsub.js.map" + "path": "node_modules/acorn-es7-plugin/package.json" }, { - "path": "build/system-test/pubsub.js" + "path": "node_modules/acorn/package.json" }, { - "path": "__pycache__/synth.cpython-36.pyc" + "path": "node_modules/spdx-expression-parse/package.json" }, { - "path": "proto/iam.d.ts" + "path": "node_modules/read-pkg/package.json" }, { - "path": "proto/pubsub.d.ts" + "path": "node_modules/node-environment-flags/package.json" }, { - "path": "samples/README.md" + "path": "node_modules/node-environment-flags/node_modules/semver/package.json" }, { - "path": "samples/package.json" + "path": "node_modules/ansi-styles/package.json" }, { - "path": "samples/subscriptions.js" + "path": "node_modules/escallmatch/package.json" }, { - "path": "samples/topics.js" + "path": "node_modules/escallmatch/node_modules/esprima/package.json" }, { - "path": "samples/.eslintrc.yml" + "path": "node_modules/is-typedarray/package.json" }, { - "path": "samples/quickstart.js" + "path": "node_modules/callsites/package.json" }, { - "path": "samples/system-test/topics.test.js" + "path": "node_modules/safe-buffer/package.json" }, { - "path": "samples/system-test/quickstart.test.js" + "path": "node_modules/type-fest/package.json" }, { - "path": "samples/system-test/.eslintrc.yml" + "path": "node_modules/espree/package.json" }, { - "path": "samples/system-test/subscriptions.test.js" + "path": "node_modules/mv/package.json" }, { - "path": ".github/PULL_REQUEST_TEMPLATE.md" + "path": "node_modules/mv/node_modules/glob/package.json" }, { - "path": ".github/release-please.yml" + "path": "node_modules/mv/node_modules/rimraf/package.json" }, { - "path": ".github/ISSUE_TEMPLATE/support_request.md" + "path": "node_modules/server-destroy/package.json" }, { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" + "path": "node_modules/rc/package.json" }, { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" + "path": "node_modules/rc/node_modules/minimist/package.json" }, { - "path": "bin/README.md" + "path": "node_modules/rc/node_modules/strip-json-comments/package.json" }, { - "path": "bin/benchwrapper.js" + "path": "node_modules/fs.realpath/package.json" }, { - "path": "bin/pubsub.proto" + "path": "node_modules/es6-set/package.json" }, { - "path": ".kokoro/test.sh" + "path": "node_modules/es6-set/node_modules/es6-symbol/package.json" }, { - "path": ".kokoro/docs.sh" + "path": "node_modules/js-yaml/package.json" }, { - "path": ".kokoro/samples-test.sh" + "path": "node_modules/ajv/package.json" }, { - "path": ".kokoro/.gitattributes" + "path": "node_modules/prettier-linter-helpers/package.json" }, { - "path": ".kokoro/trampoline.sh" + "path": "node_modules/p-finally/package.json" }, { - "path": ".kokoro/lint.sh" + "path": "node_modules/redent/package.json" }, { - "path": ".kokoro/publish.sh" + "path": "node_modules/tsutils/package.json" }, { - "path": ".kokoro/test.bat" + "path": "node_modules/diff-match-patch/package.json" }, { - "path": ".kokoro/common.cfg" + "path": "node_modules/signal-exit/package.json" }, { - "path": ".kokoro/system-test.sh" + "path": "node_modules/core-js/package.json" }, { - "path": ".kokoro/release/docs.cfg" + "path": "node_modules/package-json/package.json" }, { - "path": ".kokoro/release/docs.sh" + "path": "node_modules/package-json/node_modules/semver/package.json" }, { - "path": ".kokoro/release/publish.cfg" + "path": "node_modules/indexof/package.json" }, { - "path": ".kokoro/release/common.cfg" + "path": "node_modules/path-type/package.json" }, { - "path": ".kokoro/continuous/node10/lint.cfg" + "path": "node_modules/eslint-utils/package.json" }, { - "path": ".kokoro/continuous/node10/docs.cfg" + "path": "node_modules/p-try/package.json" }, { - "path": ".kokoro/continuous/node10/test.cfg" + "path": "node_modules/empower/package.json" }, { - "path": ".kokoro/continuous/node10/system-test.cfg" + "path": "node_modules/external-editor/package.json" }, { - "path": ".kokoro/continuous/node10/samples-test.cfg" + "path": "node_modules/html-escaper/package.json" }, { - "path": ".kokoro/continuous/node10/common.cfg" + "path": "node_modules/shebang-regex/package.json" }, { - "path": ".kokoro/continuous/node8/test.cfg" + "path": "node_modules/pseudomap/package.json" }, { - "path": ".kokoro/continuous/node8/common.cfg" + "path": "node_modules/async-each/package.json" }, { - "path": ".kokoro/continuous/node12/test.cfg" + "path": "node_modules/regexpp/package.json" }, { - "path": ".kokoro/continuous/node12/common.cfg" + "path": "node_modules/p-cancelable/package.json" }, { - "path": ".kokoro/presubmit/node10/lint.cfg" + "path": "node_modules/set-blocking/package.json" }, { - "path": ".kokoro/presubmit/node10/docs.cfg" + "path": "node_modules/es6-symbol/package.json" }, { - "path": ".kokoro/presubmit/node10/test.cfg" + "path": "node_modules/encodeurl/package.json" }, { - "path": ".kokoro/presubmit/node10/system-test.cfg" + "path": "node_modules/table/package.json" }, { - "path": ".kokoro/presubmit/node10/samples-test.cfg" + "path": "node_modules/table/node_modules/strip-ansi/package.json" }, { - "path": ".kokoro/presubmit/node10/common.cfg" + "path": "node_modules/table/node_modules/is-fullwidth-code-point/package.json" }, { - "path": ".kokoro/presubmit/node8/test.cfg" + "path": "node_modules/table/node_modules/ansi-regex/package.json" }, { - "path": ".kokoro/presubmit/node8/common.cfg" + "path": "node_modules/table/node_modules/string-width/package.json" }, { - "path": ".kokoro/presubmit/node12/test.cfg" + "path": "node_modules/table/node_modules/emoji-regex/package.json" }, { - "path": ".kokoro/presubmit/node12/common.cfg" + "path": "node_modules/has-symbols/package.json" }, { - "path": ".kokoro/presubmit/windows/test.cfg" + "path": "node_modules/escodegen/package.json" }, { - "path": ".kokoro/presubmit/windows/common.cfg" + "path": "node_modules/escodegen/node_modules/source-map/package.json" }, { - "path": "protos/protos.json" + "path": "node_modules/escodegen/node_modules/esprima/package.json" }, { - "path": "protos/protos.js" + "path": "node_modules/module-not-found-error/package.json" }, { - "path": "protos/protos.d.ts" + "path": "node_modules/unpipe/package.json" }, { - "path": "protos/google/type/expr.proto" + "path": "node_modules/dot-prop/package.json" }, { - "path": "protos/google/api/billing.proto" + "path": "node_modules/array-find-index/package.json" }, { - "path": "protos/google/api/documentation.proto" + "path": "node_modules/es-abstract/package.json" }, { - "path": "protos/google/api/distribution.proto" + "path": "node_modules/update-notifier/package.json" }, { - "path": "protos/google/api/auth.proto" + "path": "node_modules/domutils/package.json" }, { - "path": "protos/google/api/annotations.proto" + "path": "node_modules/find-up/package.json" }, { - "path": "protos/google/api/context.proto" + "path": "node_modules/event-emitter/package.json" }, { - "path": "protos/google/api/config_change.proto" + "path": "node_modules/parse-json/package.json" }, { - "path": "protos/google/api/logging.proto" + "path": "node_modules/execa/package.json" }, { - "path": "protos/google/api/system_parameter.proto" + "path": "node_modules/execa/node_modules/shebang-regex/package.json" }, { - "path": "protos/google/api/label.proto" + "path": "node_modules/execa/node_modules/cross-spawn/package.json" }, { - "path": "protos/google/api/quota.proto" + "path": "node_modules/execa/node_modules/is-stream/package.json" }, { - "path": "protos/google/api/source_info.proto" + "path": "node_modules/execa/node_modules/lru-cache/package.json" }, { - "path": "protos/google/api/control.proto" + "path": "node_modules/execa/node_modules/shebang-command/package.json" }, { - "path": "protos/google/api/httpbody.proto" + "path": "node_modules/execa/node_modules/which/package.json" }, { - "path": "protos/google/api/usage.proto" + "path": "node_modules/execa/node_modules/yallist/package.json" }, { - "path": "protos/google/api/log.proto" + "path": "node_modules/linkify-it/package.json" }, { - "path": "protos/google/api/monitored_resource.proto" + "path": "node_modules/@sinonjs/commons/package.json" }, { - "path": "protos/google/api/service.proto" + "path": "node_modules/@sinonjs/text-encoding/package.json" }, { - "path": "protos/google/api/consumer.proto" + "path": "node_modules/@sinonjs/formatio/package.json" }, { - "path": "protos/google/api/http.proto" + "path": "node_modules/@sinonjs/samsam/package.json" }, { - "path": "protos/google/api/backend.proto" + "path": "node_modules/ignore/package.json" }, { - "path": "protos/google/api/monitoring.proto" + "path": "node_modules/strip-eof/package.json" }, { - "path": "protos/google/api/endpoint.proto" + "path": "node_modules/cross-spawn/package.json" }, { - "path": "protos/google/api/metric.proto" + "path": "node_modules/etag/package.json" }, { - "path": "protos/google/api/servicecontrol/v1/distribution.proto" + "path": "node_modules/empower-assert/package.json" }, { - "path": "protos/google/api/servicecontrol/v1/operation.proto" + "path": "node_modules/is-extglob/package.json" }, { - "path": "protos/google/api/servicecontrol/v1/service_controller.proto" + "path": "node_modules/json-bigint/package.json" }, { - "path": "protos/google/api/servicecontrol/v1/metric_value.proto" + "path": "node_modules/strip-json-comments/package.json" }, { - "path": "protos/google/api/servicecontrol/v1/log_entry.proto" + "path": "node_modules/traverse/package.json" }, { - "path": "protos/google/api/servicecontrol/v1/check_error.proto" + "path": "node_modules/escope/package.json" }, { - "path": "protos/google/api/experimental/authorization_config.proto" + "path": "node_modules/prettier/package.json" }, { - "path": "protos/google/api/experimental/experimental.proto" + "path": "node_modules/mime/package.json" }, { - "path": "protos/google/api/servicemanagement/v1/servicemanager.proto" + "path": "node_modules/google-auth-library/package.json" }, { - "path": "protos/google/api/servicemanagement/v1/resources.proto" + "path": "node_modules/json-stable-stringify-without-jsonify/package.json" }, { - "path": "protos/google/iam/v1/iam_policy.proto" + "path": "node_modules/string.prototype.trimleft/package.json" }, { - "path": "protos/google/iam/v1/options.proto" + "path": "node_modules/get-stdin/package.json" }, { - "path": "protos/google/iam/v1/policy.proto" + "path": "node_modules/lcid/package.json" }, { - "path": "protos/google/iam/admin/v1/iam.proto" + "path": "node_modules/espower/package.json" }, { - "path": "protos/google/pubsub/v1/pubsub.proto" + "path": "node_modules/espower/node_modules/source-map/package.json" }, { - "path": "protos/google/protobuf/struct.proto" + "path": "node_modules/minimatch/package.json" }, { - "path": "protos/google/protobuf/api.proto" + "path": "node_modules/json-buffer/package.json" }, { - "path": "protos/google/protobuf/field_mask.proto" + "path": "node_modules/escape-string-regexp/package.json" }, { - "path": "protos/google/protobuf/type.proto" + "path": "node_modules/nth-check/package.json" }, { - "path": "protos/google/protobuf/any.proto" + "path": "node_modules/is-date-object/package.json" }, { - "path": "protos/google/protobuf/descriptor.proto" + "path": "node_modules/lowercase-keys/package.json" }, { - "path": "protos/google/protobuf/source_context.proto" + "path": "node_modules/onetime/package.json" }, { - "path": "protos/google/protobuf/duration.proto" + "path": "node_modules/argv/package.json" }, { - "path": "protos/google/protobuf/wrappers.proto" + "path": "node_modules/codecov/package.json" }, { - "path": "protos/google/protobuf/empty.proto" + "path": "node_modules/uri-js/package.json" }, { - "path": "protos/google/protobuf/timestamp.proto" + "path": "node_modules/power-assert-renderer-comparison/package.json" }, { - "path": "protos/google/protobuf/util/json_format_proto3.proto" + "path": "node_modules/locate-path/package.json" }, { - "path": ".git/packed-refs" + "path": "node_modules/text-table/package.json" }, { - "path": ".git/HEAD" + "path": "node_modules/p-timeout/package.json" }, { - "path": ".git/config" + "path": "node_modules/progress/package.json" }, { - "path": ".git/index" + "path": "node_modules/es5-ext/package.json" }, { - "path": ".git/shallow" + "path": "node_modules/statuses/package.json" }, { - "path": ".git/logs/HEAD" + "path": "node_modules/markdown-it-anchor/package.json" }, { - "path": ".git/logs/refs/remotes/origin/HEAD" + "path": "node_modules/jsonexport/package.json" }, { - "path": ".git/logs/refs/heads/autosynth" + "path": "node_modules/domhandler/package.json" }, { - "path": ".git/logs/refs/heads/master" + "path": "node_modules/just-extend/package.json" }, { - "path": ".git/refs/tags/v1.2.0" + "path": "node_modules/mkdirp/package.json" }, { - "path": ".git/refs/remotes/origin/HEAD" + "path": "node_modules/is-installed-globally/package.json" }, { - "path": ".git/refs/heads/autosynth" + "path": "node_modules/http-cache-semantics/package.json" }, { - "path": ".git/refs/heads/master" + "path": "node_modules/empower-core/package.json" }, { - "path": ".git/objects/pack/pack-b4f2ef9d72ccc66a51e403518bf05adaa6c8dc0d.pack" + "path": "node_modules/string_decoder/package.json" }, { - "path": ".git/objects/pack/pack-b4f2ef9d72ccc66a51e403518bf05adaa6c8dc0d.idx" + "path": "node_modules/string_decoder/node_modules/safe-buffer/package.json" }, { - "path": "test/pull-retry.ts" + "path": "node_modules/htmlparser2/package.json" }, { - "path": "test/subscriber.ts" + "path": "node_modules/htmlparser2/node_modules/readable-stream/package.json" }, { - "path": "test/message-stream.ts" + "path": "node_modules/readable-stream/package.json" }, { - "path": "test/index.ts" + "path": "node_modules/readable-stream/node_modules/safe-buffer/package.json" }, { - "path": "test/lease-manager.ts" + "path": "node_modules/send/package.json" }, { - "path": "test/.eslintrc.yml" + "path": "node_modules/send/node_modules/mime/package.json" }, { - "path": "test/histogram.ts" + "path": "node_modules/send/node_modules/debug/package.json" }, { - "path": "test/subscription.ts" + "path": "node_modules/send/node_modules/debug/node_modules/ms/package.json" }, { - "path": "test/gapic-v1.js" + "path": "node_modules/send/node_modules/ms/package.json" }, { - "path": "test/snapshot.ts" + "path": "node_modules/convert-source-map/package.json" }, { - "path": "test/pubsub.ts" + "path": "node_modules/convert-source-map/node_modules/safe-buffer/package.json" }, { - "path": "test/topic.ts" + "path": "node_modules/js-tokens/package.json" }, { - "path": "test/message-queues.ts" + "path": "node_modules/es6-weak-map/package.json" }, { - "path": "test/iam.ts" + "path": "node_modules/array-filter/package.json" }, { - "path": "test/mocha.opts" + "path": "node_modules/bytebuffer/package.json" }, { - "path": "test/publisher/message-batch.ts" + "path": "node_modules/bytebuffer/node_modules/long/package.json" }, { - "path": "test/publisher/index.ts" + "path": "node_modules/es6-map/package.json" }, { - "path": "test/publisher/publish-error.ts" + "path": "node_modules/to-readable-stream/package.json" }, { - "path": "test/publisher/message-queues.ts" + "path": "node_modules/type-name/package.json" }, { - "path": "system-test/pubsub.ts" + "path": "node_modules/regexp.prototype.flags/package.json" }, { - "path": "system-test/install.ts" + "path": "node_modules/deep-equal/package.json" }, { - "path": "system-test/fixtures/ordered-messages.json" + "path": "node_modules/graceful-fs/package.json" }, { - "path": "system-test/fixtures/sample/package.json" + "path": "node_modules/chalk/package.json" }, { - "path": "system-test/fixtures/sample/tsconfig.json" + "path": "node_modules/chalk/node_modules/has-flag/package.json" }, { - "path": "system-test/fixtures/sample/src/index.ts" + "path": "node_modules/chalk/node_modules/ansi-styles/package.json" }, { - "path": "node_modules/strip-bom/package.json" + "path": "node_modules/chalk/node_modules/supports-color/package.json" }, { - "path": "node_modules/string-width/package.json" + "path": "node_modules/chalk/node_modules/color-name/package.json" }, { - "path": "node_modules/is-callable/package.json" + "path": "node_modules/chalk/node_modules/color-convert/package.json" }, { - "path": "node_modules/util-deprecate/package.json" + "path": "node_modules/write/package.json" }, { - "path": "node_modules/gts/package.json" + "path": "node_modules/ext/package.json" }, { - "path": "node_modules/gts/node_modules/has-flag/package.json" + "path": "node_modules/ext/node_modules/type/package.json" }, { - "path": "node_modules/gts/node_modules/color-name/package.json" + "path": "node_modules/yargs/package.json" }, { - "path": "node_modules/gts/node_modules/color-convert/package.json" + "path": "node_modules/through/package.json" }, { - "path": "node_modules/gts/node_modules/supports-color/package.json" + "path": "node_modules/jsdoc-fresh/package.json" }, { - "path": "node_modules/gts/node_modules/ansi-styles/package.json" + "path": "node_modules/jsdoc-fresh/node_modules/taffydb/package.json" }, { - "path": "node_modules/gts/node_modules/chalk/package.json" + "path": "node_modules/parseurl/package.json" }, { - "path": "node_modules/require-directory/package.json" + "path": "node_modules/setprototypeof/package.json" }, { - "path": "node_modules/update-notifier/package.json" + "path": "node_modules/jwa/package.json" }, { - "path": "node_modules/esprima/package.json" + "path": "node_modules/camelcase/package.json" }, { - "path": "node_modules/string_decoder/package.json" + "path": "node_modules/deep-extend/package.json" }, { - "path": "node_modules/string_decoder/node_modules/safe-buffer/package.json" + "path": "node_modules/inflight/package.json" }, { - "path": "node_modules/mocha/package.json" + "path": "node_modules/istanbul-reports/package.json" }, { - "path": "node_modules/mocha/node_modules/locate-path/package.json" + "path": "node_modules/es6-iterator/package.json" }, { - "path": "node_modules/mocha/node_modules/find-up/package.json" + "path": "node_modules/run-async/package.json" }, { - "path": "node_modules/mocha/node_modules/diff/package.json" + "path": "node_modules/@bcoe/v8-coverage/package.json" }, { - "path": "node_modules/mocha/node_modules/yargs-parser/package.json" + "path": "node_modules/esquery/package.json" }, { - "path": "node_modules/mocha/node_modules/supports-color/package.json" + "path": "node_modules/resolve/package.json" }, { - "path": "node_modules/mocha/node_modules/which/package.json" + "path": "node_modules/functional-red-black-tree/package.json" }, { - "path": "node_modules/mocha/node_modules/path-exists/package.json" + "path": "node_modules/inquirer/package.json" }, { - "path": "node_modules/mocha/node_modules/p-locate/package.json" + "path": "node_modules/inquirer/node_modules/strip-ansi/package.json" }, { - "path": "node_modules/mocha/node_modules/glob/package.json" + "path": "node_modules/inquirer/node_modules/ansi-regex/package.json" }, { - "path": "node_modules/mocha/node_modules/ms/package.json" + "path": "node_modules/json-schema-traverse/package.json" }, { - "path": "node_modules/mocha/node_modules/strip-json-comments/package.json" + "path": "node_modules/loud-rejection/package.json" }, { - "path": "node_modules/mocha/node_modules/yargs/package.json" + "path": "node_modules/meow/package.json" }, { - "path": "node_modules/is-arguments/package.json" + "path": "node_modules/meow/node_modules/yargs-parser/package.json" }, { - "path": "node_modules/core-util-is/package.json" + "path": "node_modules/meow/node_modules/camelcase/package.json" }, { - "path": "node_modules/wrap-ansi/package.json" + "path": "node_modules/es-to-primitive/package.json" }, { - "path": "node_modules/minimist-options/package.json" + "path": "node_modules/ini/package.json" }, { - "path": "node_modules/minimist-options/node_modules/arrify/package.json" + "path": "node_modules/call-signature/package.json" }, { - "path": "node_modules/underscore/package.json" + "path": "node_modules/dom-serializer/package.json" }, { - "path": "node_modules/type-detect/package.json" + "path": "node_modules/on-finished/package.json" }, { - "path": "node_modules/keyv/package.json" + "path": "node_modules/is-fullwidth-code-point/package.json" }, { - "path": "node_modules/glob-parent/package.json" + "path": "node_modules/ansi-colors/package.json" }, { - "path": "node_modules/walkdir/package.json" + "path": "node_modules/end-of-stream/package.json" }, { - "path": "node_modules/@protobufjs/codegen/package.json" + "path": "node_modules/require-main-filename/package.json" }, { - "path": "node_modules/@protobufjs/inquire/package.json" + "path": "node_modules/supports-color/package.json" }, { - "path": "node_modules/@protobufjs/float/package.json" + "path": "node_modules/eslint-visitor-keys/package.json" }, { - "path": "node_modules/@protobufjs/base64/package.json" + "path": "node_modules/get-caller-file/package.json" }, { - "path": "node_modules/@protobufjs/aspromise/package.json" + "path": "node_modules/brace-expansion/package.json" }, { - "path": "node_modules/@protobufjs/eventemitter/package.json" + "path": "node_modules/ignore-walk/package.json" }, { - "path": "node_modules/@protobufjs/fetch/package.json" + "path": "node_modules/urlgrey/package.json" }, { - "path": "node_modules/@protobufjs/utf8/package.json" + "path": "node_modules/balanced-match/package.json" }, { - "path": "node_modules/@protobufjs/path/package.json" + "path": "node_modules/markdown-it/package.json" }, { - "path": "node_modules/@protobufjs/pool/package.json" + "path": "node_modules/rxjs/package.json" }, { - "path": "node_modules/global-dirs/package.json" + "path": "node_modules/iconv-lite/package.json" }, { - "path": "node_modules/has-flag/package.json" + "path": "node_modules/is-plain-obj/package.json" }, { - "path": "node_modules/ascli/package.json" + "path": "node_modules/fast-text-encoding/package.json" }, { - "path": "node_modules/locate-path/package.json" + "path": "node_modules/os-tmpdir/package.json" }, { - "path": "node_modules/colour/package.json" + "path": "node_modules/test-exclude/package.json" }, { - "path": "node_modules/fill-keys/package.json" + "path": "node_modules/resolve-from/package.json" }, { - "path": "node_modules/empower-assert/package.json" + "path": "node_modules/nise/package.json" }, { - "path": "node_modules/convert-source-map/package.json" + "path": "node_modules/source-map-support/package.json" }, { - "path": "node_modules/convert-source-map/node_modules/safe-buffer/package.json" + "path": "node_modules/source-map-support/node_modules/source-map/package.json" }, { - "path": "node_modules/require-main-filename/package.json" + "path": "node_modules/punycode/package.json" }, { - "path": "node_modules/bluebird/package.json" + "path": "node_modules/ee-first/package.json" }, { - "path": "node_modules/string.prototype.trimleft/package.json" + "path": "node_modules/p-locate/package.json" }, { - "path": "node_modules/range-parser/package.json" + "path": "node_modules/@types/long/package.json" }, { - "path": "node_modules/espower-loader/package.json" + "path": "node_modules/@types/lodash/package.json" }, { - "path": "node_modules/espower-loader/node_modules/source-map/package.json" + "path": "node_modules/@types/tmp/package.json" }, { - "path": "node_modules/espower-loader/node_modules/source-map-support/package.json" + "path": "node_modules/@types/mocha/package.json" }, { - "path": "node_modules/defer-to-connect/package.json" + "path": "node_modules/@types/minimist/package.json" }, { - "path": "node_modules/duplexer3/package.json" + "path": "node_modules/@types/extend/package.json" }, { - "path": "node_modules/indent-string/package.json" + "path": "node_modules/@types/mv/package.json" }, { - "path": "node_modules/eslint/package.json" + "path": "node_modules/@types/execa/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/README.md" + "path": "node_modules/@types/bytebuffer/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/package.json" + "path": "node_modules/@types/node/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/CHANGELOG.md" + "path": "node_modules/@types/istanbul-lib-coverage/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/index.js" + "path": "node_modules/@types/sinon/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/LICENSE" + "path": "node_modules/@types/is-windows/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/parse.js" + "path": "node_modules/@types/fs-extra/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/enoent.js" + "path": "node_modules/@types/color-name/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/escape.js" + "path": "node_modules/@types/lodash.snakecase/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/resolveCommand.js" + "path": "node_modules/@types/normalize-package-data/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/readShebang.js" + "path": "node_modules/@types/duplexify/package.json" }, { - "path": "node_modules/eslint/node_modules/cross-spawn/node_modules/semver/package.json" + "path": "node_modules/@types/proxyquire/package.json" }, { - "path": "node_modules/eslint/node_modules/path-key/package.json" + "path": "node_modules/@types/ncp/package.json" }, { - "path": "node_modules/eslint/node_modules/which/package.json" + "path": "node_modules/@types/uuid/package.json" }, { - "path": "node_modules/eslint/node_modules/shebang-regex/package.json" + "path": "node_modules/wide-align/package.json" }, { - "path": "node_modules/eslint/node_modules/shebang-command/package.json" + "path": "node_modules/wide-align/node_modules/strip-ansi/package.json" }, { - "path": "node_modules/eslint/node_modules/debug/package.json" + "path": "node_modules/wide-align/node_modules/is-fullwidth-code-point/package.json" }, { - "path": "node_modules/got/package.json" + "path": "node_modules/wide-align/node_modules/ansi-regex/package.json" }, { - "path": "node_modules/got/node_modules/get-stream/package.json" + "path": "node_modules/wide-align/node_modules/string-width/package.json" }, { - "path": "node_modules/got/node_modules/@sindresorhus/is/package.json" + "path": "node_modules/is-promise/package.json" }, { - "path": "node_modules/estraverse/package.json" + "path": "node_modules/spdx-exceptions/package.json" }, { - "path": "node_modules/mdurl/package.json" + "path": "node_modules/slice-ansi/package.json" }, { - "path": "node_modules/eslint-plugin-node/package.json" + "path": "node_modules/slice-ansi/node_modules/ansi-styles/package.json" }, { - "path": "node_modules/eslint-plugin-node/node_modules/ignore/package.json" + "path": "node_modules/slice-ansi/node_modules/is-fullwidth-code-point/package.json" }, { - "path": "node_modules/resolve-from/package.json" + "path": "node_modules/slice-ansi/node_modules/color-name/package.json" }, { - "path": "node_modules/type-name/package.json" + "path": "node_modules/slice-ansi/node_modules/color-convert/package.json" }, { - "path": "node_modules/os-locale/package.json" + "path": "node_modules/load-json-file/package.json" }, { - "path": "node_modules/lodash/package.json" + "path": "node_modules/eslint-plugin-prettier/package.json" }, { - "path": "node_modules/strip-ansi/package.json" + "path": "node_modules/decompress-response/package.json" }, { - "path": "node_modules/safe-buffer/package.json" + "path": "node_modules/currently-unhandled/package.json" }, { - "path": "node_modules/@szmarczak/http-timer/package.json" + "path": "node_modules/parent-module/package.json" }, { - "path": "node_modules/parent-module/package.json" + "path": "node_modules/jsdoc-region-tag/package.json" }, { - "path": "node_modules/object-keys/package.json" + "path": "node_modules/domelementtype/package.json" }, { - "path": "node_modules/write/package.json" + "path": "node_modules/typedarray-to-buffer/package.json" }, { - "path": "node_modules/configstore/package.json" + "path": "node_modules/typedarray-to-buffer/.airtap.yml" }, { - "path": "node_modules/configstore/node_modules/write-file-atomic/package.json" + "path": "node_modules/typedarray-to-buffer/.travis.yml" }, { - "path": "node_modules/configstore/node_modules/pify/package.json" + "path": "node_modules/typedarray-to-buffer/index.js" }, { - "path": "node_modules/configstore/node_modules/make-dir/package.json" + "path": "node_modules/typedarray-to-buffer/LICENSE" }, { - "path": "node_modules/v8-to-istanbul/package.json" + "path": "node_modules/typedarray-to-buffer/README.md" }, { - "path": "node_modules/v8-to-istanbul/node_modules/source-map/package.json" + "path": "node_modules/typedarray-to-buffer/test/basic.js" }, { - "path": "node_modules/dot-prop/package.json" + "path": "node_modules/sprintf-js/package.json" }, { - "path": "node_modules/tsutils/package.json" + "path": "node_modules/path-key/package.json" }, { - "path": "node_modules/import-fresh/package.json" + "path": "node_modules/isarray/package.json" }, { - "path": "node_modules/mute-stream/package.json" + "path": "node_modules/@grpc/grpc-js/package.json" }, { - "path": "node_modules/wide-align/package.json" + "path": "node_modules/@grpc/grpc-js/node_modules/semver/package.json" }, { - "path": "node_modules/wide-align/node_modules/string-width/package.json" + "path": "node_modules/@grpc/proto-loader/package.json" }, { - "path": "node_modules/wide-align/node_modules/strip-ansi/package.json" + "path": "node_modules/responselike/package.json" }, { - "path": "node_modules/wide-align/node_modules/ansi-regex/package.json" + "path": "node_modules/istanbul-lib-coverage/package.json" }, { - "path": "node_modules/eslint-scope/package.json" + "path": "node_modules/minimist-options/package.json" }, { - "path": "node_modules/is-promise/package.json" + "path": "node_modules/minimist-options/node_modules/arrify/package.json" }, { - "path": "node_modules/es6-map/package.json" + "path": "node_modules/latest-version/package.json" }, { - "path": "node_modules/p-finally/package.json" + "path": "node_modules/amdefine/package.json" }, { - "path": "node_modules/es6-set/package.json" + "path": "node_modules/estraverse/package.json" }, { - "path": "node_modules/es6-set/node_modules/es6-symbol/package.json" + "path": "node_modules/http-errors/package.json" }, { - "path": "node_modules/optjs/package.json" + "path": "node_modules/term-size/package.json" }, { - "path": "node_modules/array-find/package.json" + "path": "node_modules/sinon/package.json" }, { - "path": "node_modules/js2xmlparser/package.json" + "path": "node_modules/bluebird/package.json" }, { - "path": "node_modules/istanbul-reports/package.json" + "path": "node_modules/fill-keys/package.json" }, { - "path": "node_modules/indexof/package.json" + "path": "node_modules/natural-compare/package.json" }, { - "path": "node_modules/progress/package.json" + "path": "node_modules/xdg-basedir/package.json" }, { - "path": "node_modules/registry-url/package.json" + "path": "node_modules/ansi-align/package.json" }, { - "path": "node_modules/google-gax/package.json" + "path": "node_modules/ansi-align/node_modules/strip-ansi/package.json" }, { - "path": "node_modules/nan/package.json" + "path": "node_modules/ansi-align/node_modules/is-fullwidth-code-point/package.json" }, { - "path": "node_modules/mimic-response/package.json" + "path": "node_modules/ansi-align/node_modules/ansi-regex/package.json" }, { - "path": "node_modules/figures/package.json" + "path": "node_modules/ansi-align/node_modules/string-width/package.json" }, { - "path": "node_modules/eslint-config-prettier/package.json" + "path": "node_modules/ansi-align/node_modules/emoji-regex/package.json" }, { - "path": "node_modules/argparse/package.json" + "path": "node_modules/js2xmlparser/package.json" }, { - "path": "node_modules/type/package.json" + "path": "node_modules/teeny-request/package.json" }, { - "path": "node_modules/window-size/package.json" + "path": "node_modules/teeny-request/node_modules/https-proxy-agent/package.json" }, { - "path": "node_modules/domhandler/package.json" + "path": "node_modules/espower-source/package.json" }, { - "path": "node_modules/error-ex/package.json" + "path": "node_modules/espower-source/node_modules/acorn/package.json" }, { - "path": "node_modules/ansi-colors/package.json" + "path": "node_modules/d/package.json" }, { - "path": "node_modules/safer-buffer/package.json" + "path": "node_modules/is-stream/package.json" }, { - "path": "node_modules/type-fest/package.json" + "path": "node_modules/debug/package.json" }, { - "path": "node_modules/strip-indent/package.json" + "path": "node_modules/espurify/package.json" }, { - "path": "node_modules/boxen/package.json" + "path": "node_modules/wrappy/package.json" }, { - "path": "node_modules/boxen/node_modules/type-fest/package.json" + "path": "node_modules/import-fresh/package.json" }, { - "path": "node_modules/flat-cache/package.json" + "path": "node_modules/eslint/package.json" }, { - "path": "node_modules/flat-cache/node_modules/rimraf/package.json" + "path": "node_modules/eslint/node_modules/strip-ansi/package.json" }, { - "path": "node_modules/has-symbols/package.json" + "path": "node_modules/eslint/node_modules/shebang-regex/package.json" }, { - "path": "node_modules/gcp-metadata/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/package.json" }, { - "path": "node_modules/ansi-align/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/CHANGELOG.md" }, { - "path": "node_modules/find-up/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/index.js" }, { - "path": "node_modules/log-symbols/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/LICENSE" }, { - "path": "node_modules/merge-estraverse-visitors/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/README.md" }, { - "path": "node_modules/is-extglob/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/node_modules/semver/package.json" }, { - "path": "node_modules/json-stable-stringify-without-jsonify/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/lib/enoent.js" }, { - "path": "node_modules/prettier/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/lib/parse.js" }, { - "path": "node_modules/jsonexport/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/readShebang.js" }, { - "path": "node_modules/wrappy/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/escape.js" }, { - "path": "node_modules/npm-run-path/package.json" + "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/resolveCommand.js" }, { - "path": "node_modules/npm-run-path/node_modules/path-key/package.json" + "path": "node_modules/eslint/node_modules/path-key/package.json" }, { - "path": "node_modules/map-obj/package.json" + "path": "node_modules/eslint/node_modules/debug/package.json" }, { - "path": "node_modules/term-size/package.json" + "path": "node_modules/eslint/node_modules/semver/package.json" }, { - "path": "node_modules/destroy/package.json" + "path": "node_modules/eslint/node_modules/ansi-regex/package.json" }, { - "path": "node_modules/growl/package.json" + "path": "node_modules/eslint/node_modules/shebang-command/package.json" }, { - "path": "node_modules/json-schema-traverse/package.json" + "path": "node_modules/eslint/node_modules/which/package.json" }, { - "path": "node_modules/taffydb/package.json" + "path": "node_modules/es6-promise/package.json" }, { - "path": "node_modules/cross-spawn/package.json" + "path": "node_modules/is-yarn-global/package.json" }, { - "path": "node_modules/loud-rejection/package.json" + "path": "node_modules/array-find/package.json" }, { - "path": "node_modules/is-glob/package.json" + "path": "node_modules/imurmurhash/package.json" }, { - "path": "node_modules/get-stream/package.json" + "path": "node_modules/globals/package.json" }, { - "path": "node_modules/@sinonjs/formatio/package.json" + "path": "node_modules/is-ci/package.json" }, { - "path": "node_modules/@sinonjs/text-encoding/package.json" + "path": "node_modules/mdurl/package.json" }, { - "path": "node_modules/@sinonjs/commons/package.json" + "path": "node_modules/typescript/package.json" }, { - "path": "node_modules/@sinonjs/samsam/package.json" + "path": "node_modules/error-ex/package.json" }, { - "path": "node_modules/uglify-js/package.json" + "path": "node_modules/is-url/package.json" }, { - "path": "node_modules/optimist/package.json" + "path": "node_modules/tslint-config-prettier/package.json" }, { - "path": "node_modules/empower/package.json" + "path": "node_modules/os-locale/package.json" }, { - "path": "node_modules/cacheable-request/package.json" + "path": "node_modules/stream-shift/package.json" }, { - "path": "node_modules/cacheable-request/node_modules/get-stream/package.json" + "path": "node_modules/ci-info/package.json" }, { - "path": "node_modules/cacheable-request/node_modules/lowercase-keys/package.json" + "path": "node_modules/window-size/package.json" }, { - "path": "node_modules/is-ci/package.json" + "path": "node_modules/path-exists/package.json" }, { - "path": "node_modules/server-destroy/package.json" + "path": "node_modules/esrecurse/package.json" }, { - "path": "node_modules/json-parse-better-errors/package.json" + "path": "node_modules/lru-cache/package.json" }, { - "path": "node_modules/core-js/package.json" + "path": "node_modules/trim-newlines/package.json" }, { - "path": "node_modules/set-blocking/package.json" + "path": "node_modules/json-parse-better-errors/package.json" }, { - "path": "node_modules/p-defer/package.json" + "path": "node_modules/retry-request/package.json" }, { - "path": "node_modules/next-tick/package.json" + "path": "node_modules/retry-request/node_modules/debug/package.json" }, { - "path": "node_modules/catharsis/package.json" + "path": "node_modules/merge-estraverse-visitors/package.json" }, { - "path": "node_modules/rimraf/package.json" + "path": "node_modules/arrify/package.json" }, { - "path": "node_modules/agent-base/package.json" + "path": "node_modules/is-windows/package.json" }, { - "path": "node_modules/json-bigint/package.json" + "path": "node_modules/call-matcher/package.json" }, { - "path": "node_modules/spdx-exceptions/package.json" + "path": "node_modules/furi/package.json" }, { - "path": "node_modules/color-name/package.json" + "path": "node_modules/v8-compile-cache/package.json" }, { - "path": "node_modules/through/package.json" + "path": "node_modules/decamelize/package.json" }, { "path": "node_modules/jws/package.json" }, { - "path": "node_modules/path-to-regexp/package.json" + "path": "node_modules/unique-string/package.json" }, { - "path": "node_modules/path-to-regexp/node_modules/isarray/package.json" + "path": "node_modules/css-what/package.json" }, { - "path": "node_modules/inquirer/package.json" + "path": "node_modules/crypto-random-string/package.json" }, { - "path": "node_modules/inquirer/node_modules/string-width/package.json" + "path": "node_modules/url-parse-lax/package.json" }, { - "path": "node_modules/inquirer/node_modules/string-width/node_modules/strip-ansi/package.json" + "path": "node_modules/@istanbuljs/schema/package.json" }, { - "path": "node_modules/inquirer/node_modules/ansi-regex/package.json" + "path": "node_modules/ms/package.json" }, { - "path": "node_modules/inquirer/node_modules/emoji-regex/package.json" + "path": "node_modules/decamelize-keys/package.json" }, { - "path": "node_modules/inquirer/node_modules/is-fullwidth-code-point/package.json" + "path": "node_modules/decamelize-keys/node_modules/map-obj/package.json" }, { - "path": "node_modules/etag/package.json" + "path": "node_modules/make-dir/package.json" }, { - "path": "node_modules/power-assert-formatter/package.json" + "path": "node_modules/make-dir/node_modules/semver/package.json" }, { - "path": "node_modules/text-table/package.json" + "path": "node_modules/get-stream/package.json" }, { - "path": "node_modules/color-convert/package.json" + "path": "node_modules/is-object/package.json" }, { - "path": "node_modules/escope/package.json" + "path": "node_modules/word-wrap/package.json" }, { - "path": "node_modules/ansi-regex/package.json" + "path": "node_modules/keyv/package.json" }, { - "path": "node_modules/is-installed-globally/package.json" + "path": "node_modules/semver/package.json" }, { - "path": "node_modules/redent/package.json" + "path": "node_modules/esutils/package.json" }, { - "path": "node_modules/is-buffer/package.json" + "path": "node_modules/intelli-espower-loader/package.json" }, { - "path": "node_modules/esrecurse/package.json" + "path": "node_modules/color-name/package.json" }, { - "path": "node_modules/tslint/package.json" + "path": "node_modules/object-keys/package.json" }, { - "path": "node_modules/tslint/node_modules/semver/package.json" + "path": "node_modules/event-target-shim/package.json" }, { - "path": "node_modules/decamelize/package.json" + "path": "node_modules/stringifier/package.json" }, { - "path": "node_modules/parse-json/package.json" + "path": "node_modules/write-file-atomic/package.json" }, { - "path": "node_modules/mime/package.json" + "path": "node_modules/is-regex/package.json" }, { - "path": "node_modules/google-auth-library/package.json" + "path": "node_modules/google-p12-pem/package.json" }, { - "path": "node_modules/ignore/package.json" + "path": "node_modules/v8-to-istanbul/package.json" }, { - "path": "node_modules/just-extend/package.json" + "path": "node_modules/@szmarczak/http-timer/package.json" }, { - "path": "node_modules/depd/package.json" + "path": "node_modules/lodash.get/package.json" }, { - "path": "node_modules/camelcase-keys/package.json" + "path": "node_modules/growl/package.json" }, { - "path": "node_modules/camelcase-keys/node_modules/camelcase/package.json" + "path": "node_modules/flat/package.json" }, { - "path": "node_modules/ansi-escapes/package.json" + "path": "node_modules/path-is-absolute/package.json" }, { - "path": "node_modules/decompress-response/package.json" + "path": "node_modules/path-parse/package.json" }, { - "path": "node_modules/end-of-stream/package.json" + "path": "node_modules/node-forge/package.json" }, { - "path": "node_modules/diff-match-patch/package.json" + "path": "node_modules/levn/package.json" }, { - "path": "node_modules/amdefine/package.json" + "path": "node_modules/chardet/package.json" }, { - "path": "node_modules/event-emitter/package.json" + "path": "node_modules/ascli/package.json" }, { - "path": "node_modules/is-windows/package.json" + "path": "node_modules/lodash.camelcase/package.json" }, { - "path": "node_modules/diff/package.json" + "path": "node_modules/gts/package.json" }, { - "path": "node_modules/tmp/package.json" + "path": "node_modules/gts/node_modules/chalk/package.json" }, { - "path": "node_modules/source-map/package.json" + "path": "node_modules/walkdir/package.json" }, { - "path": "node_modules/is-obj/package.json" + "path": "node_modules/path-is-inside/package.json" }, { - "path": "node_modules/yargs-parser/package.json" + "path": "node_modules/foreground-child/package.json" }, { - "path": "node_modules/teeny-request/package.json" + "path": "node_modules/quick-lru/package.json" }, { - "path": "node_modules/teeny-request/node_modules/https-proxy-agent/package.json" + "path": "node_modules/serve-static/package.json" }, { - "path": "node_modules/escape-string-regexp/package.json" + "path": "node_modules/which-module/package.json" }, { - "path": "node_modules/es-abstract/package.json" + "path": "node_modules/power-assert/package.json" }, { - "path": "node_modules/linkinator/package.json" + "path": "node_modules/is-buffer/package.json" }, { - "path": "node_modules/linkinator/node_modules/has-flag/package.json" + "path": "node_modules/fast-levenshtein/package.json" }, { - "path": "node_modules/linkinator/node_modules/color-name/package.json" + "path": "node_modules/power-assert-context-traversal/package.json" }, { - "path": "node_modules/linkinator/node_modules/color-convert/package.json" + "path": "node_modules/range-parser/package.json" }, { - "path": "node_modules/linkinator/node_modules/supports-color/package.json" + "path": "node_modules/type-check/package.json" }, { - "path": "node_modules/linkinator/node_modules/ansi-styles/package.json" + "path": "node_modules/lodash.snakecase/package.json" }, { - "path": "node_modules/linkinator/node_modules/chalk/package.json" + "path": "node_modules/normalize-package-data/package.json" }, { - "path": "node_modules/import-lazy/package.json" + "path": "node_modules/normalize-package-data/node_modules/semver/package.json" }, { - "path": "node_modules/inflight/package.json" + "path": "node_modules/registry-auth-token/package.json" }, { - "path": "node_modules/concat-map/package.json" + "path": "node_modules/deep-is/package.json" }, { - "path": "node_modules/object.assign/package.json" + "path": "node_modules/cli-boxes/package.json" }, { - "path": "node_modules/es6-symbol/package.json" + "path": "node_modules/finalhandler/package.json" }, { - "path": "node_modules/semver/package.json" + "path": "node_modules/finalhandler/node_modules/debug/package.json" }, { - "path": "node_modules/jsdoc-fresh/package.json" + "path": "node_modules/finalhandler/node_modules/ms/package.json" }, { - "path": "node_modules/jsdoc-fresh/node_modules/taffydb/package.json" + "path": "node_modules/optionator/package.json" }, { - "path": "node_modules/is-typedarray/package.json" + "path": "node_modules/lodash.has/package.json" }, { - "path": "node_modules/htmlparser2/package.json" + "path": "node_modules/xtend/package.json" }, { - "path": "node_modules/htmlparser2/node_modules/readable-stream/package.json" + "path": "node_modules/util-deprecate/package.json" }, { - "path": "node_modules/cli-boxes/package.json" + "path": "node_modules/concat-map/package.json" }, { - "path": "node_modules/supports-color/package.json" + "path": "node_modules/duplexify/package.json" }, { - "path": "node_modules/path-key/package.json" + "path": "node_modules/ansi-regex/package.json" }, { - "path": "node_modules/lru-cache/package.json" + "path": "node_modules/hard-rejection/package.json" }, { - "path": "node_modules/module-not-found-error/package.json" + "path": "node_modules/power-assert-renderer-file/package.json" }, { - "path": "node_modules/rc/package.json" + "path": "node_modules/proxyquire/package.json" }, { - "path": "node_modules/rc/node_modules/minimist/package.json" + "path": "node_modules/gaxios/package.json" }, { - "path": "node_modules/rc/node_modules/strip-json-comments/package.json" + "path": "node_modules/y18n/package.json" }, { - "path": "node_modules/yargs-unparser/package.json" + "path": "node_modules/clone-response/package.json" }, { - "path": "node_modules/yargs-unparser/node_modules/locate-path/package.json" + "path": "node_modules/is-obj/package.json" }, { - "path": "node_modules/yargs-unparser/node_modules/find-up/package.json" + "path": "node_modules/toidentifier/package.json" }, { - "path": "node_modules/yargs-unparser/node_modules/yargs-parser/package.json" + "path": "node_modules/esprima/package.json" }, { - "path": "node_modules/yargs-unparser/node_modules/path-exists/package.json" + "path": "node_modules/pify/package.json" }, { - "path": "node_modules/yargs-unparser/node_modules/p-locate/package.json" + "path": "node_modules/is-callable/package.json" }, { - "path": "node_modules/yargs-unparser/node_modules/yargs/package.json" + "path": "node_modules/grpc/package.json" }, { - "path": "node_modules/abort-controller/package.json" + "path": "node_modules/grpc/node_modules/process-nextick-args/package.json" }, { - "path": "node_modules/http-errors/package.json" + "path": "node_modules/grpc/node_modules/once/package.json" }, { - "path": "node_modules/marked/package.json" + "path": "node_modules/grpc/node_modules/are-we-there-yet/package.json" }, { - "path": "node_modules/is-plain-obj/package.json" + "path": "node_modules/grpc/node_modules/minimist/package.json" }, { - "path": "node_modules/minimatch/package.json" + "path": "node_modules/grpc/node_modules/chownr/package.json" }, { - "path": "node_modules/send/package.json" + "path": "node_modules/grpc/node_modules/needle/package.json" }, { - "path": "node_modules/send/node_modules/mime/package.json" + "path": "node_modules/grpc/node_modules/core-util-is/package.json" }, { - "path": "node_modules/send/node_modules/ms/package.json" + "path": "node_modules/grpc/node_modules/safer-buffer/package.json" }, { - "path": "node_modules/send/node_modules/debug/package.json" + "path": "node_modules/grpc/node_modules/glob/package.json" }, { - "path": "node_modules/send/node_modules/debug/node_modules/ms/package.json" + "path": "node_modules/grpc/node_modules/strip-ansi/package.json" }, { - "path": "node_modules/css-select/package.json" + "path": "node_modules/grpc/node_modules/code-point-at/package.json" }, { - "path": "node_modules/uri-js/package.json" + "path": "node_modules/grpc/node_modules/safe-buffer/package.json" }, { - "path": "node_modules/grpc/package.json" + "path": "node_modules/grpc/node_modules/rc/package.json" }, { - "path": "node_modules/grpc/node_modules/string-width/package.json" + "path": "node_modules/grpc/node_modules/fs.realpath/package.json" }, { - "path": "node_modules/grpc/node_modules/util-deprecate/package.json" + "path": "node_modules/grpc/node_modules/signal-exit/package.json" }, { - "path": "node_modules/grpc/node_modules/string_decoder/package.json" + "path": "node_modules/grpc/node_modules/.bin/pbjs" }, { "path": "node_modules/grpc/node_modules/console-control-strings/package.json" @@ -2081,1417 +2078,1561 @@ "path": "node_modules/grpc/node_modules/osenv/package.json" }, { - "path": "node_modules/grpc/node_modules/core-util-is/package.json" + "path": "node_modules/grpc/node_modules/set-blocking/package.json" }, { - "path": "node_modules/grpc/node_modules/wrap-ansi/package.json" + "path": "node_modules/grpc/node_modules/strip-json-comments/package.json" }, { - "path": "node_modules/grpc/node_modules/node-pre-gyp/package.json" + "path": "node_modules/grpc/node_modules/minimatch/package.json" }, { - "path": "node_modules/grpc/node_modules/nopt/package.json" + "path": "node_modules/grpc/node_modules/mkdirp/package.json" }, { - "path": "node_modules/grpc/node_modules/detect-libc/package.json" + "path": "node_modules/grpc/node_modules/mkdirp/node_modules/minimist/package.json" }, { - "path": "node_modules/grpc/node_modules/strip-ansi/package.json" + "path": "node_modules/grpc/node_modules/string_decoder/package.json" }, { - "path": "node_modules/grpc/node_modules/safe-buffer/package.json" + "path": "node_modules/grpc/node_modules/readable-stream/package.json" }, { - "path": "node_modules/grpc/node_modules/npm-bundled/package.json" + "path": "node_modules/grpc/node_modules/minizlib/package.json" }, { - "path": "node_modules/grpc/node_modules/wide-align/package.json" + "path": "node_modules/grpc/node_modules/npm-bundled/package.json" }, { - "path": "node_modules/grpc/node_modules/safer-buffer/package.json" + "path": "node_modules/grpc/node_modules/yargs/package.json" }, { - "path": "node_modules/grpc/node_modules/.bin/pbjs" + "path": "node_modules/grpc/node_modules/camelcase/package.json" }, { - "path": "node_modules/grpc/node_modules/wrappy/package.json" + "path": "node_modules/grpc/node_modules/deep-extend/package.json" }, { - "path": "node_modules/grpc/node_modules/npm-packlist/package.json" + "path": "node_modules/grpc/node_modules/inflight/package.json" }, { - "path": "node_modules/grpc/node_modules/minipass/package.json" + "path": "node_modules/grpc/node_modules/ini/package.json" }, { - "path": "node_modules/grpc/node_modules/set-blocking/package.json" + "path": "node_modules/grpc/node_modules/os-homedir/package.json" }, { - "path": "node_modules/grpc/node_modules/has-unicode/package.json" + "path": "node_modules/grpc/node_modules/is-fullwidth-code-point/package.json" }, { - "path": "node_modules/grpc/node_modules/rimraf/package.json" + "path": "node_modules/grpc/node_modules/brace-expansion/package.json" }, { - "path": "node_modules/grpc/node_modules/ansi-regex/package.json" + "path": "node_modules/grpc/node_modules/ignore-walk/package.json" }, { - "path": "node_modules/grpc/node_modules/gauge/package.json" + "path": "node_modules/grpc/node_modules/balanced-match/package.json" }, { - "path": "node_modules/grpc/node_modules/inflight/package.json" + "path": "node_modules/grpc/node_modules/iconv-lite/package.json" }, { - "path": "node_modules/grpc/node_modules/concat-map/package.json" + "path": "node_modules/grpc/node_modules/os-tmpdir/package.json" }, { - "path": "node_modules/grpc/node_modules/semver/package.json" + "path": "node_modules/grpc/node_modules/detect-libc/package.json" }, { - "path": "node_modules/grpc/node_modules/rc/package.json" + "path": "node_modules/grpc/node_modules/npm-packlist/package.json" }, { - "path": "node_modules/grpc/node_modules/minimatch/package.json" + "path": "node_modules/grpc/node_modules/wide-align/package.json" }, { - "path": "node_modules/grpc/node_modules/needle/package.json" + "path": "node_modules/grpc/node_modules/number-is-nan/package.json" }, { - "path": "node_modules/grpc/node_modules/yallist/package.json" + "path": "node_modules/grpc/node_modules/isarray/package.json" }, { - "path": "node_modules/grpc/node_modules/cliui/package.json" + "path": "node_modules/grpc/node_modules/debug/package.json" }, { - "path": "node_modules/grpc/node_modules/balanced-match/package.json" + "path": "node_modules/grpc/node_modules/wrappy/package.json" }, { - "path": "node_modules/grpc/node_modules/path-is-absolute/package.json" + "path": "node_modules/grpc/node_modules/nopt/package.json" }, { - "path": "node_modules/grpc/node_modules/ignore-walk/package.json" + "path": "node_modules/grpc/node_modules/delegates/package.json" }, { - "path": "node_modules/grpc/node_modules/os-tmpdir/package.json" + "path": "node_modules/grpc/node_modules/ms/package.json" }, { - "path": "node_modules/grpc/node_modules/minimist/package.json" + "path": "node_modules/grpc/node_modules/npmlog/package.json" }, { - "path": "node_modules/grpc/node_modules/os-homedir/package.json" + "path": "node_modules/grpc/node_modules/semver/package.json" }, { - "path": "node_modules/grpc/node_modules/readable-stream/package.json" + "path": "node_modules/grpc/node_modules/path-is-absolute/package.json" }, { - "path": "node_modules/grpc/node_modules/ini/package.json" + "path": "node_modules/grpc/node_modules/sax/package.json" }, { - "path": "node_modules/grpc/node_modules/camelcase/package.json" + "path": "node_modules/grpc/node_modules/object-assign/package.json" }, { - "path": "node_modules/grpc/node_modules/deep-extend/package.json" + "path": "node_modules/grpc/node_modules/util-deprecate/package.json" }, { - "path": "node_modules/grpc/node_modules/isarray/package.json" + "path": "node_modules/grpc/node_modules/concat-map/package.json" }, { - "path": "node_modules/grpc/node_modules/fs-minipass/package.json" + "path": "node_modules/grpc/node_modules/ansi-regex/package.json" + }, + { + "path": "node_modules/grpc/node_modules/tar/package.json" }, { "path": "node_modules/grpc/node_modules/y18n/package.json" }, { - "path": "node_modules/grpc/node_modules/delegates/package.json" + "path": "node_modules/grpc/node_modules/has-unicode/package.json" }, { - "path": "node_modules/grpc/node_modules/mkdirp/package.json" + "path": "node_modules/grpc/node_modules/cliui/package.json" }, { - "path": "node_modules/grpc/node_modules/mkdirp/node_modules/minimist/package.json" + "path": "node_modules/grpc/node_modules/minipass/package.json" }, { - "path": "node_modules/grpc/node_modules/glob/package.json" + "path": "node_modules/grpc/node_modules/abbrev/package.json" + }, + { + "path": "node_modules/grpc/node_modules/gauge/package.json" + }, + { + "path": "node_modules/grpc/node_modules/protobufjs/package.json" + }, + { + "path": "node_modules/grpc/node_modules/protobufjs/bin/pbjs" + }, + { + "path": "node_modules/grpc/node_modules/fs-minipass/package.json" + }, + { + "path": "node_modules/grpc/node_modules/node-pre-gyp/package.json" + }, + { + "path": "node_modules/grpc/node_modules/wrap-ansi/package.json" + }, + { + "path": "node_modules/grpc/node_modules/aproba/package.json" }, { "path": "node_modules/grpc/node_modules/inherits/package.json" }, { - "path": "node_modules/grpc/node_modules/npmlog/package.json" + "path": "node_modules/grpc/node_modules/string-width/package.json" }, { - "path": "node_modules/grpc/node_modules/tar/package.json" + "path": "node_modules/grpc/node_modules/rimraf/package.json" }, { - "path": "node_modules/grpc/node_modules/chownr/package.json" + "path": "node_modules/grpc/node_modules/yallist/package.json" }, { - "path": "node_modules/grpc/node_modules/are-we-there-yet/package.json" + "path": "node_modules/camelcase-keys/package.json" }, { - "path": "node_modules/grpc/node_modules/ms/package.json" + "path": "node_modules/camelcase-keys/node_modules/camelcase/package.json" }, { - "path": "node_modules/grpc/node_modules/iconv-lite/package.json" + "path": "node_modules/ncp/package.json" }, { - "path": "node_modules/grpc/node_modules/sax/package.json" + "path": "node_modules/is-arrayish/package.json" }, { - "path": "node_modules/grpc/node_modules/once/package.json" + "path": "node_modules/fast-diff/package.json" }, { - "path": "node_modules/grpc/node_modules/brace-expansion/package.json" + "path": "node_modules/configstore/package.json" }, { - "path": "node_modules/grpc/node_modules/number-is-nan/package.json" + "path": "node_modules/configstore/node_modules/make-dir/package.json" }, { - "path": "node_modules/grpc/node_modules/abbrev/package.json" + "path": "node_modules/configstore/node_modules/write-file-atomic/package.json" }, { - "path": "node_modules/grpc/node_modules/object-assign/package.json" + "path": "node_modules/universal-deep-strict-equal/package.json" }, { - "path": "node_modules/grpc/node_modules/protobufjs/package.json" + "path": "node_modules/power-assert-renderer-assertion/package.json" }, { - "path": "node_modules/grpc/node_modules/protobufjs/bin/pbjs" + "path": "node_modules/glob-parent/package.json" }, { - "path": "node_modules/grpc/node_modules/strip-json-comments/package.json" + "path": "node_modules/object.assign/package.json" }, { - "path": "node_modules/grpc/node_modules/process-nextick-args/package.json" + "path": "node_modules/color-convert/package.json" }, { - "path": "node_modules/grpc/node_modules/signal-exit/package.json" + "path": "node_modules/eslint-plugin-node/package.json" }, { - "path": "node_modules/grpc/node_modules/code-point-at/package.json" + "path": "node_modules/eslint-plugin-node/node_modules/eslint-utils/package.json" }, { - "path": "node_modules/grpc/node_modules/minizlib/package.json" + "path": "node_modules/eslint-plugin-node/node_modules/ignore/package.json" }, { - "path": "node_modules/grpc/node_modules/is-fullwidth-code-point/package.json" + "path": "node_modules/eslint-plugin-node/node_modules/semver/package.json" }, { - "path": "node_modules/grpc/node_modules/aproba/package.json" + "path": "node_modules/cliui/package.json" }, { - "path": "node_modules/grpc/node_modules/debug/package.json" + "path": "node_modules/cheerio/package.json" }, { - "path": "node_modules/grpc/node_modules/fs.realpath/package.json" + "path": "node_modules/flatted/package.json" }, { - "path": "node_modules/grpc/node_modules/yargs/package.json" + "path": "node_modules/parse5/package.json" }, { - "path": "node_modules/google-p12-pem/package.json" + "path": "node_modules/power-assert-renderer-base/package.json" }, { - "path": "node_modules/spdx-license-ids/package.json" + "path": "node_modules/lolex/package.json" }, { - "path": "node_modules/yallist/package.json" + "path": "node_modules/es6-promisify/package.json" }, { - "path": "node_modules/setprototypeof/package.json" + "path": "node_modules/shebang-command/package.json" }, { - "path": "node_modules/hosted-git-info/package.json" + "path": "node_modules/indent-string/package.json" }, { - "path": "node_modules/argv/package.json" + "path": "node_modules/tslib/package.json" }, { - "path": "node_modules/package-json/package.json" + "path": "node_modules/prepend-http/package.json" }, { - "path": "node_modules/write-file-atomic/package.json" + "path": "node_modules/fast-json-stable-stringify/package.json" }, { - "path": "node_modules/external-editor/package.json" + "path": "node_modules/semver-diff/package.json" }, { - "path": "node_modules/@sindresorhus/is/package.json" + "path": "node_modules/semver-diff/node_modules/semver/package.json" }, { - "path": "node_modules/lodash.camelcase/package.json" + "path": "node_modules/cli-width/package.json" }, { - "path": "node_modules/arrify/package.json" + "path": "node_modules/escape-html/package.json" }, { - "path": "node_modules/ansi-styles/package.json" + "path": "node_modules/protobufjs/package.json" }, { - "path": "node_modules/parseurl/package.json" + "path": "node_modules/protobufjs/node_modules/@types/node/package.json" + }, + { + "path": "node_modules/protobufjs/cli/package.json" + }, + { + "path": "node_modules/protobufjs/cli/package-lock.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/source-map/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/minimist/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/commander/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/acorn/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/espree/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/uglify-js/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/semver/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/acorn-jsx/package.json" + }, + { + "path": "node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/package.json" + }, + { + "path": "node_modules/has/package.json" }, { "path": "node_modules/boolbase/package.json" }, { - "path": "node_modules/cliui/package.json" + "path": "node_modules/@sindresorhus/is/package.json" }, { - "path": "node_modules/balanced-match/package.json" + "path": "node_modules/acorn-jsx/package.json" }, { - "path": "node_modules/acorn/package.json" + "path": "node_modules/mute-stream/package.json" }, { - "path": "node_modules/load-json-file/package.json" + "path": "node_modules/p-queue/package.json" }, { - "path": "node_modules/load-json-file/node_modules/pify/package.json" + "path": "node_modules/cli-cursor/package.json" }, { - "path": "node_modules/builtin-modules/package.json" + "path": "node_modules/bignumber.js/package.json" }, { - "path": "node_modules/widest-line/package.json" + "path": "node_modules/wrap-ansi/package.json" }, { - "path": "node_modules/widest-line/node_modules/string-width/package.json" + "path": "node_modules/require-directory/package.json" }, { - "path": "node_modules/widest-line/node_modules/strip-ansi/package.json" + "path": "node_modules/uuid/package.json" }, { - "path": "node_modules/widest-line/node_modules/ansi-regex/package.json" + "path": "node_modules/c8/package.json" }, { - "path": "node_modules/which/package.json" + "path": "node_modules/eslint-config-prettier/package.json" }, { - "path": "node_modules/@bcoe/v8-coverage/package.json" + "path": "node_modules/function-bind/package.json" }, { - "path": "node_modules/prettier-linter-helpers/package.json" + "path": "node_modules/merge-descriptors/package.json" + }, + { + "path": "node_modules/istanbul-lib-report/package.json" }, { "path": "node_modules/object-inspect/package.json" }, { - "path": "node_modules/retry-request/package.json" + "path": "node_modules/entities/package.json" }, { - "path": "node_modules/retry-request/node_modules/debug/package.json" + "path": "node_modules/define-properties/package.json" }, { - "path": "node_modules/is-arrayish/package.json" + "path": "node_modules/has-yarn/package.json" }, { - "path": "node_modules/shebang-regex/package.json" + "path": "node_modules/buffer-from/package.json" }, { - "path": "node_modules/clone-response/package.json" + "path": "node_modules/min-indent/package.json" }, { - "path": "node_modules/deep-is/package.json" + "path": "node_modules/p-defer/package.json" }, { - "path": "node_modules/regexpp/package.json" + "path": "node_modules/underscore/package.json" }, { - "path": "node_modules/node-forge/package.json" + "path": "node_modules/power-assert-renderer-diagram/package.json" }, { - "path": "node_modules/power-assert/package.json" + "path": "node_modules/browser-stdout/package.json" }, { - "path": "node_modules/path-is-absolute/package.json" + "path": "node_modules/registry-url/package.json" }, { - "path": "node_modules/ignore-walk/package.json" + "path": "node_modules/which/package.json" }, { - "path": "node_modules/finalhandler/package.json" + "path": "node_modules/@babel/highlight/package.json" }, { - "path": "node_modules/finalhandler/node_modules/ms/package.json" + "path": "node_modules/@babel/code-frame/package.json" }, { - "path": "node_modules/finalhandler/node_modules/debug/package.json" + "path": "node_modules/@babel/parser/package.json" }, { - "path": "node_modules/source-map-support/package.json" + "path": "node_modules/strip-indent/package.json" }, { - "path": "node_modules/lodash.snakecase/package.json" + "path": "node_modules/map-obj/package.json" }, { - "path": "node_modules/buffer-equal-constant-time/package.json" + "path": "node_modules/tslint/package.json" }, { - "path": "node_modules/path-parse/package.json" + "path": "node_modules/tslint/node_modules/semver/package.json" }, { - "path": "node_modules/decamelize-keys/package.json" + "path": "node_modules/duplexer3/package.json" }, { - "path": "node_modules/decamelize-keys/node_modules/map-obj/package.json" + "path": "node_modules/isexe/package.json" }, { - "path": "node_modules/os-tmpdir/package.json" + "path": "node_modules/klaw/package.json" }, { - "path": "node_modules/power-assert-util-string-width/package.json" + "path": "node_modules/inherits/package.json" }, { - "path": "node_modules/url-parse-lax/package.json" + "path": "node_modules/lodash.at/package.json" }, { - "path": "node_modules/linkify-it/package.json" + "path": "node_modules/pump/package.json" }, { - "path": "node_modules/merge-descriptors/package.json" + "path": "node_modules/spdx-license-ids/package.json" }, { - "path": "node_modules/async-each/package.json" + "path": "node_modules/@google-cloud/paginator/package.json" }, { - "path": "node_modules/minimist/package.json" + "path": "node_modules/@google-cloud/projectify/package.json" }, { - "path": "node_modules/fresh/package.json" + "path": "node_modules/@google-cloud/promisify/package.json" }, { - "path": "node_modules/power-assert-context-formatter/package.json" + "path": "node_modules/@google-cloud/precise-date/package.json" }, { - "path": "node_modules/is-stream/package.json" + "path": "node_modules/depd/package.json" }, { - "path": "node_modules/call-matcher/package.json" + "path": "node_modules/import-lazy/package.json" }, { - "path": "node_modules/is-stream-ended/package.json" + "path": "node_modules/string-width/package.json" }, { - "path": "node_modules/slice-ansi/package.json" + "path": "node_modules/nan/package.json" }, { - "path": "node_modules/onetime/package.json" + "path": "node_modules/lines-and-columns/package.json" }, { - "path": "node_modules/spdx-correct/package.json" + "path": "node_modules/astral-regex/package.json" }, { - "path": "node_modules/fast-deep-equal/package.json" + "path": "node_modules/builtin-modules/package.json" }, { - "path": "node_modules/readable-stream/package.json" + "path": "node_modules/rimraf/package.json" }, { - "path": "node_modules/readable-stream/node_modules/safe-buffer/package.json" + "path": "node_modules/restore-cursor/package.json" }, { - "path": "node_modules/xdg-basedir/package.json" + "path": "node_modules/yallist/package.json" }, { - "path": "node_modules/v8-compile-cache/package.json" + "path": "node_modules/emoji-regex/package.json" }, { - "path": "node_modules/callsites/package.json" + "path": "system-test/pubsub.ts" }, { - "path": "node_modules/power-assert-renderer-assertion/package.json" + "path": "system-test/install.ts" }, { - "path": "node_modules/pify/package.json" + "path": "system-test/fixtures/ordered-messages.json" }, { - "path": "node_modules/stream-shift/package.json" + "path": "system-test/fixtures/sample/package.json" }, { - "path": "node_modules/crypto-random-string/package.json" + "path": "system-test/fixtures/sample/tsconfig.json" }, { - "path": "node_modules/escodegen/package.json" + "path": "system-test/fixtures/sample/src/index.ts" }, { - "path": "node_modules/escodegen/node_modules/esprima/package.json" + "path": "proto/pubsub.d.ts" }, { - "path": "node_modules/entities/package.json" + "path": "proto/iam.d.ts" }, { - "path": "node_modules/object.getownpropertydescriptors/package.json" + "path": ".git/config" }, { - "path": "node_modules/power-assert-renderer-file/package.json" + "path": ".git/index" }, { - "path": "node_modules/unpipe/package.json" + "path": ".git/packed-refs" }, { - "path": "node_modules/array-filter/package.json" + "path": ".git/shallow" }, { - "path": "node_modules/furi/package.json" + "path": ".git/HEAD" }, { - "path": "node_modules/strip-eof/package.json" + "path": ".git/refs/heads/autosynth" }, { - "path": "node_modules/is-path-inside/package.json" + "path": ".git/refs/heads/master" }, { - "path": "node_modules/ini/package.json" + "path": ".git/refs/remotes/origin/HEAD" }, { - "path": "node_modules/currently-unhandled/package.json" + "path": ".git/objects/pack/pack-f900966f9c73a5a283fa53bf9972d5a7f2c3cbd1.idx" }, { - "path": "node_modules/invert-kv/package.json" + "path": ".git/objects/pack/pack-f900966f9c73a5a283fa53bf9972d5a7f2c3cbd1.pack" }, { - "path": "node_modules/validate-npm-package-license/package.json" + "path": ".git/logs/HEAD" }, { - "path": "node_modules/bignumber.js/package.json" + "path": ".git/logs/refs/heads/autosynth" }, { - "path": "node_modules/is-yarn-global/package.json" + "path": ".git/logs/refs/heads/master" }, { - "path": "node_modules/lodash.has/package.json" + "path": ".git/logs/refs/remotes/origin/HEAD" }, { - "path": "node_modules/camelcase/package.json" + "path": "src/index.ts" }, { - "path": "node_modules/prelude-ls/package.json" + "path": "src/pubsub.ts" }, { - "path": "node_modules/codecov/package.json" + "path": "src/subscriber.ts" }, { - "path": "node_modules/es6-promise/package.json" + "path": "src/subscription.ts" }, { - "path": "node_modules/doctrine/package.json" + "path": "src/message-queues.ts" }, { - "path": "node_modules/path-exists/package.json" + "path": "src/topic.ts" }, { - "path": "node_modules/deep-extend/package.json" + "path": "src/util.ts" }, { - "path": "node_modules/nth-check/package.json" + "path": "src/iam.ts" }, { - "path": "node_modules/isarray/package.json" + "path": "src/service_proto_list.json" }, { - "path": "node_modules/es-to-primitive/package.json" + "path": "src/message-stream.ts" }, { - "path": "node_modules/https-proxy-agent/package.json" + "path": "src/pull-retry.ts" }, { - "path": "node_modules/eslint-plugin-es/package.json" + "path": "src/histogram.ts" }, { - "path": "node_modules/eslint-plugin-es/node_modules/regexpp/package.json" + "path": "src/.eslintrc.yml" }, { - "path": "node_modules/path-type/package.json" + "path": "src/snapshot.ts" }, { - "path": "node_modules/path-type/node_modules/pify/package.json" + "path": "src/lease-manager.ts" }, { - "path": "node_modules/fast-json-stable-stringify/package.json" + "path": "src/publisher/index.ts" }, { - "path": "node_modules/p-locate/package.json" + "path": "src/publisher/message-queues.ts" }, { - "path": "node_modules/intelli-espower-loader/package.json" + "path": "src/publisher/message-batch.ts" }, { - "path": "node_modules/node-fetch/package.json" + "path": "src/publisher/publish-error.ts" }, { - "path": "node_modules/registry-auth-token/package.json" + "path": "src/v1/publisher_proto_list.json" }, { - "path": "node_modules/esutils/package.json" + "path": "src/v1/index.js" }, { - "path": "node_modules/which-module/package.json" + "path": "src/v1/subscriber_client_config.json" }, { - "path": "node_modules/function-bind/package.json" + "path": "src/v1/publisher_client_config.json" }, { - "path": "node_modules/lcid/package.json" + "path": "src/v1/publisher_client.js" }, { - "path": "node_modules/trim-newlines/package.json" + "path": "src/v1/subscriber_proto_list.json" }, { - "path": "node_modules/event-target-shim/package.json" + "path": "src/v1/subscriber_client.js" }, { - "path": "node_modules/on-finished/package.json" + "path": "src/v1/doc/google/iam/v1/doc_iam_policy.js" }, { - "path": "node_modules/y18n/package.json" + "path": "src/v1/doc/google/iam/v1/doc_options.js" }, { - "path": "node_modules/quick-lru/package.json" + "path": "src/v1/doc/google/iam/v1/doc_policy.js" }, { - "path": "node_modules/js-yaml/package.json" + "path": "src/v1/doc/google/type/doc_expr.js" }, { - "path": "node_modules/flat/package.json" + "path": "src/v1/doc/google/pubsub/v1/doc_pubsub.js" }, { - "path": "node_modules/normalize-package-data/package.json" + "path": "src/v1/doc/google/protobuf/doc_duration.js" }, { - "path": "node_modules/normalize-package-data/node_modules/semver/package.json" + "path": "src/v1/doc/google/protobuf/doc_empty.js" }, { - "path": "node_modules/es6-iterator/package.json" + "path": "src/v1/doc/google/protobuf/doc_timestamp.js" }, { - "path": "node_modules/typescript/package.json" + "path": "src/v1/doc/google/protobuf/doc_field_mask.js" }, { - "path": "node_modules/mkdirp/package.json" + "path": "protos/protos.js" }, { - "path": "node_modules/mkdirp/node_modules/minimist/package.json" + "path": "protos/protos.d.ts" }, { - "path": "node_modules/fast-text-encoding/package.json" + "path": "protos/protos.json" }, { - "path": "node_modules/acorn-es7-plugin/package.json" + "path": "protos/google/iam/admin/v1/iam.proto" }, { - "path": "node_modules/through2/package.json" + "path": "protos/google/iam/v1/iam_policy.proto" + }, + { + "path": "protos/google/iam/v1/options.proto" + }, + { + "path": "protos/google/iam/v1/policy.proto" + }, + { + "path": "protos/google/type/expr.proto" + }, + { + "path": "protos/google/api/distribution.proto" + }, + { + "path": "protos/google/api/monitoring.proto" + }, + { + "path": "protos/google/api/backend.proto" + }, + { + "path": "protos/google/api/control.proto" + }, + { + "path": "protos/google/api/log.proto" + }, + { + "path": "protos/google/api/endpoint.proto" + }, + { + "path": "protos/google/api/annotations.proto" + }, + { + "path": "protos/google/api/billing.proto" + }, + { + "path": "protos/google/api/metric.proto" + }, + { + "path": "protos/google/api/service.proto" + }, + { + "path": "protos/google/api/http.proto" + }, + { + "path": "protos/google/api/quota.proto" + }, + { + "path": "protos/google/api/documentation.proto" + }, + { + "path": "protos/google/api/label.proto" + }, + { + "path": "protos/google/api/consumer.proto" + }, + { + "path": "protos/google/api/monitored_resource.proto" + }, + { + "path": "protos/google/api/logging.proto" + }, + { + "path": "protos/google/api/usage.proto" + }, + { + "path": "protos/google/api/auth.proto" + }, + { + "path": "protos/google/api/httpbody.proto" + }, + { + "path": "protos/google/api/context.proto" + }, + { + "path": "protos/google/api/source_info.proto" + }, + { + "path": "protos/google/api/config_change.proto" + }, + { + "path": "protos/google/api/system_parameter.proto" }, { - "path": "node_modules/eslint-visitor-keys/package.json" + "path": "protos/google/api/experimental/authorization_config.proto" }, { - "path": "node_modules/glob/package.json" + "path": "protos/google/api/experimental/experimental.proto" }, { - "path": "node_modules/inherits/package.json" + "path": "protos/google/api/servicemanagement/v1/servicemanager.proto" }, { - "path": "node_modules/string.prototype.trimright/package.json" + "path": "protos/google/api/servicemanagement/v1/resources.proto" }, { - "path": "node_modules/punycode/package.json" + "path": "protos/google/api/servicecontrol/v1/distribution.proto" }, { - "path": "node_modules/es5-ext/package.json" + "path": "protos/google/api/servicecontrol/v1/log_entry.proto" }, { - "path": "node_modules/is-date-object/package.json" + "path": "protos/google/api/servicecontrol/v1/operation.proto" }, { - "path": "node_modules/sprintf-js/package.json" + "path": "protos/google/api/servicecontrol/v1/metric_value.proto" }, { - "path": "node_modules/is-npm/package.json" + "path": "protos/google/api/servicecontrol/v1/service_controller.proto" }, { - "path": "node_modules/has-yarn/package.json" + "path": "protos/google/api/servicecontrol/v1/check_error.proto" }, { - "path": "node_modules/get-stdin/package.json" + "path": "protos/google/pubsub/v1/pubsub.proto" }, { - "path": "node_modules/shebang-command/package.json" + "path": "protos/google/protobuf/descriptor.proto" }, { - "path": "node_modules/empower-core/package.json" + "path": "protos/google/protobuf/type.proto" }, { - "path": "node_modules/imurmurhash/package.json" + "path": "protos/google/protobuf/field_mask.proto" }, { - "path": "node_modules/globals/package.json" + "path": "protos/google/protobuf/struct.proto" }, { - "path": "node_modules/latest-version/package.json" + "path": "protos/google/protobuf/any.proto" }, { - "path": "node_modules/natural-compare/package.json" + "path": "protos/google/protobuf/wrappers.proto" }, { - "path": "node_modules/bytebuffer/package.json" + "path": "protos/google/protobuf/duration.proto" }, { - "path": "node_modules/bytebuffer/node_modules/long/package.json" + "path": "protos/google/protobuf/empty.proto" }, { - "path": "node_modules/commander/package.json" + "path": "protos/google/protobuf/timestamp.proto" }, { - "path": "node_modules/path-is-inside/package.json" + "path": "protos/google/protobuf/source_context.proto" }, { - "path": "node_modules/rxjs/package.json" + "path": "protos/google/protobuf/api.proto" }, { - "path": "node_modules/node-environment-flags/package.json" + "path": "protos/google/protobuf/util/json_format_proto3.proto" }, { - "path": "node_modules/node-environment-flags/node_modules/semver/package.json" + "path": "__pycache__/synth.cpython-36.pyc" }, { - "path": "node_modules/p-limit/package.json" + "path": ".kokoro/common.cfg" }, { - "path": "node_modules/call-signature/package.json" + "path": ".kokoro/publish.sh" }, { - "path": "node_modules/istanbul-lib-coverage/package.json" + "path": ".kokoro/docs.sh" }, { - "path": "node_modules/neo-async/package.json" + "path": ".kokoro/lint.sh" }, { - "path": "node_modules/foreground-child/package.json" + "path": ".kokoro/.gitattributes" }, { - "path": "node_modules/he/package.json" + "path": ".kokoro/system-test.sh" }, { - "path": "node_modules/meow/package.json" + "path": ".kokoro/test.bat" }, { - "path": "node_modules/meow/node_modules/locate-path/package.json" + "path": ".kokoro/test.sh" }, { - "path": "node_modules/meow/node_modules/find-up/package.json" + "path": ".kokoro/trampoline.sh" }, { - "path": "node_modules/meow/node_modules/yargs-parser/package.json" + "path": ".kokoro/samples-test.sh" }, { - "path": "node_modules/meow/node_modules/camelcase/package.json" + "path": ".kokoro/presubmit/node10/common.cfg" }, { - "path": "node_modules/meow/node_modules/path-exists/package.json" + "path": ".kokoro/presubmit/node10/system-test.cfg" }, { - "path": "node_modules/meow/node_modules/p-locate/package.json" + "path": ".kokoro/presubmit/node10/lint.cfg" }, { - "path": "node_modules/meow/node_modules/p-limit/package.json" + "path": ".kokoro/presubmit/node10/test.cfg" }, { - "path": "node_modules/meow/node_modules/p-try/package.json" + "path": ".kokoro/presubmit/node10/samples-test.cfg" }, { - "path": "node_modules/meow/node_modules/read-pkg-up/package.json" + "path": ".kokoro/presubmit/node10/docs.cfg" }, { - "path": "node_modules/toidentifier/package.json" + "path": ".kokoro/presubmit/node12/common.cfg" }, { - "path": "node_modules/execa/package.json" + "path": ".kokoro/presubmit/node12/test.cfg" }, { - "path": "node_modules/execa/node_modules/cross-spawn/package.json" + "path": ".kokoro/presubmit/node8/common.cfg" }, { - "path": "node_modules/execa/node_modules/lru-cache/package.json" + "path": ".kokoro/presubmit/node8/test.cfg" }, { - "path": "node_modules/execa/node_modules/yallist/package.json" + "path": ".kokoro/presubmit/windows/common.cfg" }, { - "path": "node_modules/execa/node_modules/which/package.json" + "path": ".kokoro/presubmit/windows/test.cfg" }, { - "path": "node_modules/execa/node_modules/shebang-regex/package.json" + "path": ".kokoro/release/common.cfg" }, { - "path": "node_modules/execa/node_modules/is-stream/package.json" + "path": ".kokoro/release/publish.cfg" }, { - "path": "node_modules/execa/node_modules/shebang-command/package.json" + "path": ".kokoro/release/docs.sh" }, { - "path": "node_modules/levn/package.json" + "path": ".kokoro/release/docs.cfg" }, { - "path": "node_modules/sinon/package.json" + "path": ".kokoro/continuous/node10/common.cfg" }, { - "path": "node_modules/sinon/node_modules/diff/package.json" + "path": ".kokoro/continuous/node10/system-test.cfg" }, { - "path": "node_modules/sinon/node_modules/supports-color/package.json" + "path": ".kokoro/continuous/node10/lint.cfg" }, { - "path": "node_modules/unique-string/package.json" + "path": ".kokoro/continuous/node10/test.cfg" }, { - "path": "node_modules/gaxios/package.json" + "path": ".kokoro/continuous/node10/samples-test.cfg" }, { - "path": "node_modules/power-assert-renderer-base/package.json" + "path": ".kokoro/continuous/node10/docs.cfg" }, { - "path": "node_modules/browser-stdout/package.json" + "path": ".kokoro/continuous/node12/common.cfg" }, { - "path": "node_modules/regexp.prototype.flags/package.json" + "path": ".kokoro/continuous/node12/test.cfg" }, { - "path": "node_modules/run-async/package.json" + "path": ".kokoro/continuous/node8/common.cfg" }, { - "path": "node_modules/cheerio/package.json" + "path": ".kokoro/continuous/node8/test.cfg" }, { - "path": "node_modules/eslint-utils/package.json" + "path": "bin/benchwrapper.js" }, { - "path": "node_modules/prepend-http/package.json" + "path": "bin/pubsub.proto" }, { - "path": "node_modules/urlgrey/package.json" + "path": "bin/README.md" }, { - "path": "node_modules/define-properties/package.json" + "path": "samples/package.json" }, { - "path": "node_modules/p-timeout/package.json" + "path": "samples/topics.js" }, { - "path": "node_modules/cli-cursor/package.json" + "path": "samples/quickstart.js" }, { - "path": "node_modules/pump/package.json" + "path": "samples/.eslintrc.yml" }, { - "path": "node_modules/stringifier/package.json" + "path": "samples/subscriptions.js" }, { - "path": "node_modules/espower-location-detector/package.json" + "path": "samples/README.md" }, { - "path": "node_modules/espower-location-detector/node_modules/source-map/package.json" + "path": "samples/system-test/topics.test.js" }, { - "path": "node_modules/escape-html/package.json" + "path": "samples/system-test/quickstart.test.js" }, { - "path": "node_modules/http-cache-semantics/package.json" + "path": "samples/system-test/subscriptions.test.js" }, { - "path": "node_modules/to-readable-stream/package.json" + "path": "build/system-test/pubsub.d.ts" }, { - "path": "node_modules/eastasianwidth/package.json" + "path": "build/system-test/publisher_smoke_test.js" }, { - "path": "node_modules/chardet/package.json" + "path": "build/system-test/install.js" }, { - "path": "node_modules/js-tokens/package.json" + "path": "build/system-test/install.d.ts" }, { - "path": "node_modules/chalk/package.json" + "path": "build/system-test/install.js.map" }, { - "path": "node_modules/chalk/node_modules/supports-color/package.json" + "path": "build/system-test/pubsub.js.map" }, { - "path": "node_modules/is-regex/package.json" + "path": "build/system-test/pubsub.js" }, { - "path": "node_modules/ajv/package.json" + "path": "build/proto/pubsub.d.ts" }, { - "path": "node_modules/spdx-expression-parse/package.json" + "path": "build/proto/iam.d.ts" }, { - "path": "node_modules/cli-width/package.json" + "path": "build/src/message-stream.js.map" }, { - "path": "node_modules/ms/package.json" + "path": "build/src/histogram.js" }, { - "path": "node_modules/istanbul-lib-report/package.json" + "path": "build/src/histogram.d.ts" }, { - "path": "node_modules/base64-js/package.json" + "path": "build/src/message-stream.js" }, { - "path": "node_modules/encodeurl/package.json" + "path": "build/src/subscription.d.ts" }, { - "path": "node_modules/json-buffer/package.json" + "path": "build/src/message-queues.js" }, { - "path": "node_modules/file-entry-cache/package.json" + "path": "build/src/pubsub.d.ts" }, { - "path": "node_modules/gtoken/package.json" + "path": "build/src/lease-manager.js" }, { - "path": "node_modules/klaw/package.json" + "path": "build/src/snapshot.d.ts" }, { - "path": "node_modules/functional-red-black-tree/package.json" + "path": "build/src/snapshot.js" }, { - "path": "node_modules/dom-serializer/package.json" + "path": "build/src/pull-retry.js.map" }, { - "path": "node_modules/is-symbol/package.json" + "path": "build/src/topic.js.map" }, { - "path": "node_modules/@babel/parser/package.json" + "path": "build/src/index.js" }, { - "path": "node_modules/@babel/highlight/package.json" + "path": "build/src/index.js.map" }, { - "path": "node_modules/@babel/code-frame/package.json" + "path": "build/src/util.js" }, { - "path": "node_modules/type-check/package.json" + "path": "build/src/lease-manager.js.map" }, { - "path": "node_modules/lolex/package.json" + "path": "build/src/util.js.map" }, { - "path": "node_modules/iconv-lite/package.json" + "path": "build/src/subscriber.js" }, { - "path": "node_modules/is-url/package.json" + "path": "build/src/iam.d.ts" }, { - "path": "node_modules/domutils/package.json" + "path": "build/src/topic.js" }, { - "path": "node_modules/nise/package.json" + "path": "build/src/iam.js" }, { - "path": "node_modules/nise/node_modules/lolex/package.json" + "path": "build/src/snapshot.js.map" }, { - "path": "node_modules/p-queue/package.json" + "path": "build/src/util.d.ts" }, { - "path": "node_modules/eventemitter3/package.json" + "path": "build/src/lease-manager.d.ts" }, { - "path": "node_modules/ext/package.json" + "path": "build/src/topic.d.ts" }, { - "path": "node_modules/ext/node_modules/type/package.json" + "path": "build/src/subscriber.d.ts" }, { - "path": "node_modules/deep-equal/package.json" + "path": "build/src/subscription.js" }, { - "path": "node_modules/parse5/package.json" + "path": "build/src/iam.js.map" }, { - "path": "node_modules/flatted/package.json" + "path": "build/src/message-stream.d.ts" }, { - "path": "node_modules/once/package.json" + "path": "build/src/histogram.js.map" }, { - "path": "node_modules/universal-deep-strict-equal/package.json" + "path": "build/src/pull-retry.js" }, { - "path": "node_modules/brace-expansion/package.json" + "path": "build/src/subscriber.js.map" }, { - "path": "node_modules/jsdoc-region-tag/package.json" + "path": "build/src/message-queues.d.ts" }, { - "path": "node_modules/markdown-it-anchor/package.json" + "path": "build/src/subscription.js.map" }, { - "path": "node_modules/traverse/package.json" + "path": "build/src/pubsub.js.map" }, { - "path": "node_modules/restore-cursor/package.json" + "path": "build/src/pull-retry.d.ts" }, { - "path": "node_modules/lodash.at/package.json" + "path": "build/src/pubsub.js" }, { - "path": "node_modules/graceful-fs/package.json" + "path": "build/src/message-queues.js.map" }, { - "path": "node_modules/responselike/package.json" + "path": "build/src/index.d.ts" }, { - "path": "node_modules/pseudomap/package.json" + "path": "build/src/publisher/message-queues.js" }, { - "path": "node_modules/espurify/package.json" + "path": "build/src/publisher/publish-error.d.ts" }, { - "path": "node_modules/espree/package.json" + "path": "build/src/publisher/message-batch.js" }, { - "path": "node_modules/power-assert-renderer-diagram/package.json" + "path": "build/src/publisher/index.js" }, { - "path": "node_modules/word-wrap/package.json" + "path": "build/src/publisher/index.js.map" }, { - "path": "node_modules/espower-source/package.json" + "path": "build/src/publisher/publish-error.js" }, { - "path": "node_modules/espower-source/node_modules/acorn/package.json" + "path": "build/src/publisher/message-queues.d.ts" }, { - "path": "node_modules/normalize-url/package.json" + "path": "build/src/publisher/publish-error.js.map" }, { - "path": "node_modules/wordwrap/package.json" + "path": "build/src/publisher/message-batch.d.ts" }, { - "path": "node_modules/ee-first/package.json" + "path": "build/src/publisher/message-batch.js.map" }, { - "path": "node_modules/table/package.json" + "path": "build/src/publisher/message-queues.js.map" }, { - "path": "node_modules/handlebars/package.json" + "path": "build/src/publisher/index.d.ts" }, { - "path": "node_modules/es6-weak-map/package.json" + "path": "build/src/v1/publisher_proto_list.json" }, { - "path": "node_modules/protobufjs/package.json" + "path": "build/src/v1/index.js" }, { - "path": "node_modules/protobufjs/cli/package.json" + "path": "build/src/v1/subscriber_client_config.json" }, { - "path": "node_modules/protobufjs/cli/package-lock.json" + "path": "build/src/v1/publisher_client_config.json" }, { - "path": "node_modules/protobufjs/cli/node_modules/semver/package.json" + "path": "build/src/v1/publisher_client.js" }, { - "path": "node_modules/protobufjs/cli/node_modules/acorn/package.json" + "path": "build/src/v1/subscriber_proto_list.json" }, { - "path": "node_modules/protobufjs/cli/node_modules/minimist/package.json" + "path": "build/src/v1/subscriber_client.js" }, { - "path": "node_modules/protobufjs/cli/node_modules/espree/package.json" + "path": "build/src/v1/doc/google/iam/v1/doc_iam_policy.js" }, { - "path": "node_modules/protobufjs/cli/node_modules/acorn-jsx/package.json" + "path": "build/src/v1/doc/google/iam/v1/doc_options.js" }, { - "path": "node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/package.json" + "path": "build/src/v1/doc/google/iam/v1/doc_policy.js" }, { - "path": "node_modules/protobufjs/node_modules/@types/node/package.json" + "path": "build/src/v1/doc/google/type/doc_expr.js" }, { - "path": "node_modules/espower/package.json" + "path": "build/src/v1/doc/google/pubsub/v1/doc_pubsub.js" }, { - "path": "node_modules/espower/node_modules/source-map/package.json" + "path": "build/src/v1/doc/google/protobuf/doc_duration.js" }, { - "path": "node_modules/strip-json-comments/package.json" + "path": "build/src/v1/doc/google/protobuf/doc_empty.js" }, { - "path": "node_modules/process-nextick-args/package.json" + "path": "build/src/v1/doc/google/protobuf/doc_timestamp.js" }, { - "path": "node_modules/uuid/package.json" + "path": "build/src/v1/doc/google/protobuf/doc_field_mask.js" }, { - "path": "node_modules/array-find-index/package.json" + "path": "build/protos/protos.js" }, { - "path": "node_modules/astral-regex/package.json" + "path": "build/protos/protos.d.ts" }, { - "path": "node_modules/@grpc/proto-loader/package.json" + "path": "build/protos/protos.json" }, { - "path": "node_modules/@grpc/grpc-js/package.json" + "path": "build/protos/google/iam/admin/v1/iam.proto" }, { - "path": "node_modules/test-exclude/package.json" + "path": "build/protos/google/iam/v1/iam_policy.proto" }, { - "path": "node_modules/es6-promisify/package.json" + "path": "build/protos/google/iam/v1/options.proto" }, { - "path": "node_modules/proxyquire/package.json" + "path": "build/protos/google/iam/v1/policy.proto" }, { - "path": "node_modules/p-try/package.json" + "path": "build/protos/google/type/expr.proto" }, { - "path": "node_modules/optionator/package.json" + "path": "build/protos/google/api/distribution.proto" }, { - "path": "node_modules/requizzle/package.json" + "path": "build/protos/google/api/monitoring.proto" }, { - "path": "node_modules/c8/package.json" + "path": "build/protos/google/api/backend.proto" }, { - "path": "node_modules/c8/node_modules/locate-path/package.json" + "path": "build/protos/google/api/control.proto" }, { - "path": "node_modules/c8/node_modules/path-exists/package.json" + "path": "build/protos/google/api/log.proto" }, { - "path": "node_modules/c8/node_modules/p-locate/package.json" + "path": "build/protos/google/api/endpoint.proto" }, { - "path": "node_modules/c8/node_modules/yargs/package.json" + "path": "build/protos/google/api/annotations.proto" }, { - "path": "node_modules/c8/node_modules/yargs/node_modules/find-up/package.json" + "path": "build/protos/google/api/billing.proto" }, { - "path": "node_modules/fast-levenshtein/package.json" + "path": "build/protos/google/api/metric.proto" }, { - "path": "node_modules/statuses/package.json" + "path": "build/protos/google/api/service.proto" }, { - "path": "node_modules/semver-diff/package.json" + "path": "build/protos/google/api/http.proto" }, { - "path": "node_modules/semver-diff/node_modules/semver/package.json" + "path": "build/protos/google/api/quota.proto" }, { - "path": "node_modules/signal-exit/package.json" + "path": "build/protos/google/api/documentation.proto" }, { - "path": "node_modules/jsdoc/package.json" + "path": "build/protos/google/api/label.proto" }, { - "path": "node_modules/jsdoc/node_modules/escape-string-regexp/package.json" + "path": "build/protos/google/api/consumer.proto" }, { - "path": "node_modules/duplexify/package.json" + "path": "build/protos/google/api/monitored_resource.proto" }, { - "path": "node_modules/array-from/package.json" + "path": "build/protos/google/api/logging.proto" }, { - "path": "node_modules/object-is/package.json" + "path": "build/protos/google/api/usage.proto" }, { - "path": "node_modules/tslib/package.json" + "path": "build/protos/google/api/auth.proto" }, { - "path": "node_modules/extend/package.json" + "path": "build/protos/google/api/httpbody.proto" }, { - "path": "node_modules/power-assert-context-reducer-ast/package.json" + "path": "build/protos/google/api/context.proto" }, { - "path": "node_modules/power-assert-context-reducer-ast/node_modules/acorn/package.json" + "path": "build/protos/google/api/source_info.proto" }, { - "path": "node_modules/css-what/package.json" + "path": "build/protos/google/api/config_change.proto" }, { - "path": "node_modules/power-assert-renderer-comparison/package.json" + "path": "build/protos/google/api/system_parameter.proto" }, { - "path": "node_modules/ecdsa-sig-formatter/package.json" + "path": "build/protos/google/api/experimental/authorization_config.proto" }, { - "path": "node_modules/typedarray-to-buffer/README.md" + "path": "build/protos/google/api/experimental/experimental.proto" }, { - "path": "node_modules/typedarray-to-buffer/package.json" + "path": "build/protos/google/api/servicemanagement/v1/servicemanager.proto" }, { - "path": "node_modules/typedarray-to-buffer/.travis.yml" + "path": "build/protos/google/api/servicemanagement/v1/resources.proto" }, { - "path": "node_modules/typedarray-to-buffer/index.js" + "path": "build/protos/google/api/servicecontrol/v1/distribution.proto" }, { - "path": "node_modules/typedarray-to-buffer/.airtap.yml" + "path": "build/protos/google/api/servicecontrol/v1/log_entry.proto" }, { - "path": "node_modules/typedarray-to-buffer/LICENSE" + "path": "build/protos/google/api/servicecontrol/v1/operation.proto" }, { - "path": "node_modules/typedarray-to-buffer/test/basic.js" + "path": "build/protos/google/api/servicecontrol/v1/metric_value.proto" }, { - "path": "node_modules/markdown-it/package.json" + "path": "build/protos/google/api/servicecontrol/v1/service_controller.proto" }, { - "path": "node_modules/tslint-config-prettier/package.json" + "path": "build/protos/google/api/servicecontrol/v1/check_error.proto" }, { - "path": "node_modules/buffer-from/package.json" + "path": "build/protos/google/pubsub/v1/pubsub.proto" }, { - "path": "node_modules/domelementtype/package.json" + "path": "build/protos/google/protobuf/descriptor.proto" }, { - "path": "node_modules/ci-info/package.json" + "path": "build/protos/google/protobuf/type.proto" }, { - "path": "node_modules/@types/mocha/package.json" + "path": "build/protos/google/protobuf/field_mask.proto" }, { - "path": "node_modules/@types/lodash/package.json" + "path": "build/protos/google/protobuf/struct.proto" }, { - "path": "node_modules/@types/color-name/package.json" + "path": "build/protos/google/protobuf/any.proto" }, { - "path": "node_modules/@types/is-windows/package.json" + "path": "build/protos/google/protobuf/wrappers.proto" }, { - "path": "node_modules/@types/tmp/package.json" + "path": "build/protos/google/protobuf/duration.proto" }, { - "path": "node_modules/@types/lodash.snakecase/package.json" + "path": "build/protos/google/protobuf/empty.proto" }, { - "path": "node_modules/@types/bytebuffer/package.json" + "path": "build/protos/google/protobuf/timestamp.proto" }, { - "path": "node_modules/@types/istanbul-lib-coverage/package.json" + "path": "build/protos/google/protobuf/source_context.proto" }, { - "path": "node_modules/@types/execa/package.json" + "path": "build/protos/google/protobuf/api.proto" }, { - "path": "node_modules/@types/sinon/package.json" + "path": "build/protos/google/protobuf/util/json_format_proto3.proto" }, { - "path": "node_modules/@types/node/package.json" + "path": "build/test/message-stream.js.map" }, { - "path": "node_modules/@types/uuid/package.json" + "path": "build/test/histogram.js" }, { - "path": "node_modules/@types/proxyquire/package.json" + "path": "build/test/histogram.d.ts" }, { - "path": "node_modules/@types/duplexify/package.json" + "path": "build/test/message-stream.js" }, { - "path": "node_modules/@types/extend/package.json" + "path": "build/test/subscription.d.ts" }, { - "path": "node_modules/@types/ncp/package.json" + "path": "build/test/message-queues.js" }, { - "path": "node_modules/@types/long/package.json" + "path": "build/test/pubsub.d.ts" }, { - "path": "node_modules/@types/mv/package.json" + "path": "build/test/gapic-v1.js" }, { - "path": "node_modules/serve-static/package.json" + "path": "build/test/lease-manager.js" }, { - "path": "node_modules/make-dir/package.json" + "path": "build/test/snapshot.d.ts" }, { - "path": "node_modules/make-dir/node_modules/semver/package.json" + "path": "build/test/snapshot.js" }, { - "path": "node_modules/esquery/package.json" + "path": "build/test/pull-retry.js.map" }, { - "path": "node_modules/ncp/package.json" + "path": "build/test/topic.js.map" }, { - "path": "node_modules/emoji-regex/package.json" + "path": "build/test/index.js" }, { - "path": "node_modules/read-pkg/package.json" + "path": "build/test/index.js.map" }, { - "path": "node_modules/fast-diff/package.json" + "path": "build/test/lease-manager.js.map" }, { - "path": "node_modules/xtend/package.json" + "path": "build/test/subscriber.js" }, { - "path": "node_modules/resolve/package.json" + "path": "build/test/iam.d.ts" }, { - "path": "node_modules/lowercase-keys/package.json" + "path": "build/test/topic.js" }, { - "path": "node_modules/is-fullwidth-code-point/package.json" + "path": "build/test/iam.js" }, { - "path": "node_modules/read-pkg-up/package.json" + "path": "build/test/snapshot.js.map" }, { - "path": "node_modules/read-pkg-up/node_modules/locate-path/package.json" + "path": "build/test/lease-manager.d.ts" }, { - "path": "node_modules/read-pkg-up/node_modules/find-up/package.json" + "path": "build/test/topic.d.ts" }, { - "path": "node_modules/read-pkg-up/node_modules/path-exists/package.json" + "path": "build/test/subscriber.d.ts" }, { - "path": "node_modules/read-pkg-up/node_modules/p-locate/package.json" + "path": "build/test/subscription.js" }, { - "path": "node_modules/@google-cloud/precise-date/package.json" + "path": "build/test/iam.js.map" }, { - "path": "node_modules/@google-cloud/paginator/package.json" + "path": "build/test/message-stream.d.ts" }, { - "path": "node_modules/@google-cloud/projectify/package.json" + "path": "build/test/histogram.js.map" }, { - "path": "node_modules/@google-cloud/promisify/package.json" + "path": "build/test/pull-retry.js" }, { - "path": "node_modules/p-cancelable/package.json" + "path": "build/test/subscriber.js.map" }, { - "path": "node_modules/acorn-jsx/package.json" + "path": "build/test/message-queues.d.ts" }, { - "path": "node_modules/power-assert-context-traversal/package.json" + "path": "build/test/subscription.js.map" }, { - "path": "node_modules/long/package.json" + "path": "build/test/pubsub.js.map" }, { - "path": "node_modules/d/package.json" + "path": "build/test/pull-retry.d.ts" }, { - "path": "node_modules/debug/package.json" + "path": "build/test/pubsub.js" }, { - "path": "node_modules/mimic-fn/package.json" + "path": "build/test/message-queues.js.map" }, { - "path": "node_modules/is-object/package.json" + "path": "build/test/index.d.ts" }, { - "path": "node_modules/mv/package.json" + "path": "build/test/publisher/message-queues.js" }, { - "path": "node_modules/mv/node_modules/rimraf/package.json" + "path": "build/test/publisher/publish-error.d.ts" }, { - "path": "node_modules/mv/node_modules/glob/package.json" + "path": "build/test/publisher/message-batch.js" }, { - "path": "node_modules/isexe/package.json" + "path": "build/test/publisher/index.js" }, { - "path": "node_modules/multi-stage-sourcemap/package.json" + "path": "build/test/publisher/index.js.map" }, { - "path": "node_modules/multi-stage-sourcemap/node_modules/source-map/package.json" + "path": "build/test/publisher/publish-error.js" }, { - "path": "node_modules/lodash.clone/package.json" + "path": "build/test/publisher/message-queues.d.ts" }, { - "path": "node_modules/uc.micro/package.json" + "path": "build/test/publisher/publish-error.js.map" }, { - "path": "node_modules/fs.realpath/package.json" + "path": "build/test/publisher/message-batch.d.ts" }, { - "path": "node_modules/eslint-plugin-prettier/package.json" + "path": "build/test/publisher/message-batch.js.map" }, { - "path": "node_modules/yargs/package.json" + "path": "build/test/publisher/message-queues.js.map" }, { - "path": "node_modules/yargs/node_modules/string-width/package.json" + "path": "build/test/publisher/index.d.ts" }, { - "path": "node_modules/yargs/node_modules/wrap-ansi/package.json" + "path": "test/index.ts" }, { - "path": "node_modules/yargs/node_modules/strip-ansi/package.json" + "path": "test/pubsub.ts" }, { - "path": "node_modules/yargs/node_modules/color-name/package.json" + "path": "test/subscriber.ts" }, { - "path": "node_modules/yargs/node_modules/color-convert/package.json" + "path": "test/subscription.ts" }, { - "path": "node_modules/yargs/node_modules/ansi-regex/package.json" + "path": "test/message-queues.ts" }, { - "path": "node_modules/yargs/node_modules/yargs-parser/package.json" + "path": "test/gapic-v1.js" }, { - "path": "node_modules/yargs/node_modules/ansi-styles/package.json" + "path": "test/topic.ts" }, { - "path": "node_modules/yargs/node_modules/cliui/package.json" + "path": "test/mocha.opts" }, { - "path": "node_modules/yargs/node_modules/emoji-regex/package.json" + "path": "test/iam.ts" }, { - "path": "node_modules/yargs/node_modules/is-fullwidth-code-point/package.json" + "path": "test/message-stream.ts" }, { - "path": "node_modules/nice-try/package.json" + "path": "test/pull-retry.ts" }, { - "path": "node_modules/has/package.json" + "path": "test/histogram.ts" }, { - "path": "node_modules/xmlcreate/package.json" + "path": "test/.eslintrc.yml" }, { - "path": "node_modules/escallmatch/package.json" + "path": "test/snapshot.ts" }, { - "path": "node_modules/escallmatch/node_modules/esprima/package.json" + "path": "test/lease-manager.ts" }, { - "path": "node_modules/get-caller-file/package.json" + "path": "test/publisher/index.ts" }, { - "path": "node_modules/jwa/package.json" + "path": "test/publisher/message-queues.ts" }, { - "path": "smoke-test/.eslintrc.yml" + "path": "test/publisher/message-batch.ts" }, { - "path": "smoke-test/publisher_smoke_test.js" + "path": "test/publisher/publish-error.ts" } ] } \ No newline at end of file From faaab7c3cb42de4b4e406f2596cd733194238c55 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 7 Jan 2020 01:16:40 +0200 Subject: [PATCH 0554/1115] chore(deps): update dependency mocha to v7 --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6b1b6a6fa95..c2c32d48014 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -90,7 +90,7 @@ "jsdoc-region-tag": "^1.0.2", "linkinator": "^1.5.0", "mkdirp": "^0.5.1", - "mocha": "^6.0.0", + "mocha": "^7.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", "power-assert": "^1.4.4", From cbdda08ff2678231107fa39c274d27225b509c48 Mon Sep 17 00:00:00 2001 From: Dave Gramlich Date: Wed, 8 Jan 2020 10:06:06 -0500 Subject: [PATCH 0555/1115] feat(subscription): dead letter policy support (#799) Co-authored-by: Justin Beckwith --- handwritten/pubsub/proto/pubsub.d.ts | 4583 +++++++++++++++++-------- handwritten/pubsub/src/pubsub.ts | 2 + handwritten/pubsub/src/subscriber.ts | 13 +- handwritten/pubsub/test/subscriber.ts | 16 + 4 files changed, 3109 insertions(+), 1505 deletions(-) diff --git a/handwritten/pubsub/proto/pubsub.d.ts b/handwritten/pubsub/proto/pubsub.d.ts index 9f83c9c210a..c44e9a6dcf8 100644 --- a/handwritten/pubsub/proto/pubsub.d.ts +++ b/handwritten/pubsub/proto/pubsub.d.ts @@ -201,1726 +201,1732 @@ export namespace google { type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; } - /** Represents a Subscriber */ - class Subscriber extends $protobuf.rpc.Service { + /** Properties of a MessageStoragePolicy. */ + interface IMessageStoragePolicy { - /** - * Constructs a new Subscriber service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + /** MessageStoragePolicy allowedPersistenceRegions */ + allowedPersistenceRegions?: (string[]|null); + } - /** - * Creates new Subscriber service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; + /** Represents a MessageStoragePolicy. */ + class MessageStoragePolicy implements IMessageStoragePolicy { /** - * Calls CreateSubscription. - * @param request Subscription message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription + * Constructs a new MessageStoragePolicy. + * @param [properties] Properties to set */ - public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; + constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); - /** - * Calls CreateSubscription. - * @param request Subscription message or plain object - * @returns Promise - */ - public createSubscription(request: google.pubsub.v1.ISubscription): Promise; + /** MessageStoragePolicy allowedPersistenceRegions. */ + public allowedPersistenceRegions: string[]; /** - * Calls GetSubscription. - * @param request GetSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription + * Creates a new MessageStoragePolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageStoragePolicy instance */ - public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; + public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; /** - * Calls GetSubscription. - * @param request GetSubscriptionRequest message or plain object - * @returns Promise + * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; + public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Calls UpdateSubscription. - * @param request UpdateSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription + * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; + public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Calls UpdateSubscription. - * @param request UpdateSubscriptionRequest message or plain object - * @returns Promise + * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; /** - * Calls ListSubscriptions. - * @param request ListSubscriptionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse + * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; /** - * Calls ListSubscriptions. - * @param request ListSubscriptionsRequest message or plain object - * @returns Promise + * Verifies a MessageStoragePolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not */ - public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; + public static verify(message: { [k: string]: any }): (string|null); /** - * Calls DeleteSubscription. - * @param request DeleteSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty + * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageStoragePolicy */ - public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; /** - * Calls DeleteSubscription. - * @param request DeleteSubscriptionRequest message or plain object - * @returns Promise + * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * @param message MessageStoragePolicy + * @param [options] Conversion options + * @returns Plain object */ - public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; + public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Calls ModifyAckDeadline. - * @param request ModifyAckDeadlineRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty + * Converts this MessageStoragePolicy to JSON. + * @returns JSON object */ - public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; + public toJSON(): { [k: string]: any }; + } - /** - * Calls ModifyAckDeadline. - * @param request ModifyAckDeadlineRequest message or plain object - * @returns Promise - */ - public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; + /** Properties of a Topic. */ + interface ITopic { - /** - * Calls Acknowledge. - * @param request AcknowledgeRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; + /** Topic name */ + name?: (string|null); - /** - * Calls Acknowledge. - * @param request AcknowledgeRequest message or plain object - * @returns Promise - */ - public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; + /** Topic labels */ + labels?: ({ [k: string]: string }|null); - /** - * Calls Pull. - * @param request PullRequest message or plain object - * @param callback Node-style callback called with the error, if any, and PullResponse - */ - public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; + /** Topic messageStoragePolicy */ + messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); - /** - * Calls Pull. - * @param request PullRequest message or plain object - * @returns Promise - */ - public pull(request: google.pubsub.v1.IPullRequest): Promise; + /** Topic kmsKeyName */ + kmsKeyName?: (string|null); + } - /** - * Calls StreamingPull. - * @param request StreamingPullRequest message or plain object - * @param callback Node-style callback called with the error, if any, and StreamingPullResponse - */ - public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; + /** Represents a Topic. */ + class Topic implements ITopic { /** - * Calls StreamingPull. - * @param request StreamingPullRequest message or plain object - * @returns Promise + * Constructs a new Topic. + * @param [properties] Properties to set */ - public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; + constructor(properties?: google.pubsub.v1.ITopic); + + /** Topic name. */ + public name: string; + + /** Topic labels. */ + public labels: { [k: string]: string }; + + /** Topic messageStoragePolicy. */ + public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + + /** Topic kmsKeyName. */ + public kmsKeyName: string; /** - * Calls ModifyPushConfig. - * @param request ModifyPushConfigRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty + * Creates a new Topic instance using the specified properties. + * @param [properties] Properties to set + * @returns Topic instance */ - public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; + public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; /** - * Calls ModifyPushConfig. - * @param request ModifyPushConfigRequest message or plain object - * @returns Promise + * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; + public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Calls GetSnapshot. - * @param request GetSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot + * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; + public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Calls GetSnapshot. - * @param request GetSnapshotRequest message or plain object - * @returns Promise + * Decodes a Topic message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; /** - * Calls ListSnapshots. - * @param request ListSnapshotsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse + * Decodes a Topic message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; /** - * Calls ListSnapshots. - * @param request ListSnapshotsRequest message or plain object - * @returns Promise + * Verifies a Topic message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not */ - public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; + public static verify(message: { [k: string]: any }): (string|null); /** - * Calls CreateSnapshot. - * @param request CreateSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot + * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Topic */ - public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; /** - * Calls CreateSnapshot. - * @param request CreateSnapshotRequest message or plain object - * @returns Promise + * Creates a plain object from a Topic message. Also converts values to other types if specified. + * @param message Topic + * @param [options] Conversion options + * @returns Plain object */ - public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; + public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Calls UpdateSnapshot. - * @param request UpdateSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot + * Converts this Topic to JSON. + * @returns JSON object */ - public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; + public toJSON(): { [k: string]: any }; + } - /** - * Calls UpdateSnapshot. - * @param request UpdateSnapshotRequest message or plain object - * @returns Promise - */ - public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; + /** Properties of a PubsubMessage. */ + interface IPubsubMessage { - /** - * Calls DeleteSnapshot. - * @param request DeleteSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; + /** PubsubMessage data */ + data?: (Uint8Array|null); - /** - * Calls DeleteSnapshot. - * @param request DeleteSnapshotRequest message or plain object - * @returns Promise - */ - public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; + /** PubsubMessage attributes */ + attributes?: ({ [k: string]: string }|null); - /** - * Calls Seek. - * @param request SeekRequest message or plain object - * @param callback Node-style callback called with the error, if any, and SeekResponse - */ - public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; + /** PubsubMessage messageId */ + messageId?: (string|null); - /** - * Calls Seek. - * @param request SeekRequest message or plain object - * @returns Promise - */ - public seek(request: google.pubsub.v1.ISeekRequest): Promise; - } + /** PubsubMessage publishTime */ + publishTime?: (google.protobuf.ITimestamp|null); - namespace Subscriber { + /** PubsubMessage orderingKey */ + orderingKey?: (string|null); + } - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + /** Represents a PubsubMessage. */ + class PubsubMessage implements IPubsubMessage { /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. - * @param error Error, if any - * @param [response] Subscription + * Constructs a new PubsubMessage. + * @param [properties] Properties to set */ - type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + constructor(properties?: google.pubsub.v1.IPubsubMessage); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + /** PubsubMessage data. */ + public data: Uint8Array; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. - * @param error Error, if any - * @param [response] ListSubscriptionsResponse - */ - type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; + /** PubsubMessage attributes. */ + public attributes: { [k: string]: string }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** PubsubMessage messageId. */ + public messageId: string; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. - * @param error Error, if any - * @param [response] Empty - */ - type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** PubsubMessage publishTime. */ + public publishTime?: (google.protobuf.ITimestamp|null); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. - * @param error Error, if any - * @param [response] Empty - */ - type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** PubsubMessage orderingKey. */ + public orderingKey: string; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. - * @param error Error, if any - * @param [response] PullResponse + * Creates a new PubsubMessage instance using the specified properties. + * @param [properties] Properties to set + * @returns PubsubMessage instance */ - type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; + public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. - * @param error Error, if any - * @param [response] StreamingPullResponse + * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; + public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. - * @param error Error, if any - * @param [response] Empty + * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. - * @param error Error, if any - * @param [response] Snapshot + * Decodes a PubsubMessage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. - * @param error Error, if any - * @param [response] ListSnapshotsResponse + * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. - * @param error Error, if any - * @param [response] Snapshot + * Verifies a PubsubMessage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not */ - type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + public static verify(message: { [k: string]: any }): (string|null); /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. - * @param error Error, if any - * @param [response] Snapshot + * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PubsubMessage */ - type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. - * @param error Error, if any - * @param [response] Empty + * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * @param message PubsubMessage + * @param [options] Conversion options + * @returns Plain object */ - type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. - * @param error Error, if any - * @param [response] SeekResponse + * Converts this PubsubMessage to JSON. + * @returns JSON object */ - type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; + public toJSON(): { [k: string]: any }; } - /** Properties of a MessageStoragePolicy. */ - interface IMessageStoragePolicy { + /** Properties of a GetTopicRequest. */ + interface IGetTopicRequest { - /** MessageStoragePolicy allowedPersistenceRegions */ - allowedPersistenceRegions?: (string[]|null); + /** GetTopicRequest topic */ + topic?: (string|null); } - /** Represents a MessageStoragePolicy. */ - class MessageStoragePolicy implements IMessageStoragePolicy { + /** Represents a GetTopicRequest. */ + class GetTopicRequest implements IGetTopicRequest { /** - * Constructs a new MessageStoragePolicy. + * Constructs a new GetTopicRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); + constructor(properties?: google.pubsub.v1.IGetTopicRequest); - /** MessageStoragePolicy allowedPersistenceRegions. */ - public allowedPersistenceRegions: string[]; + /** GetTopicRequest topic. */ + public topic: string; /** - * Creates a new MessageStoragePolicy instance using the specified properties. + * Creates a new GetTopicRequest instance using the specified properties. * @param [properties] Properties to set - * @returns MessageStoragePolicy instance + * @returns GetTopicRequest instance */ - public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; + public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; /** - * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @param message MessageStoragePolicy message or plain object to encode + * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @param message MessageStoragePolicy message or plain object to encode + * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * Decodes a GetTopicRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns MessageStoragePolicy + * @returns GetTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns MessageStoragePolicy + * @returns GetTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; /** - * Verifies a MessageStoragePolicy message. + * Verifies a GetTopicRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns MessageStoragePolicy + * @returns GetTopicRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; /** - * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. - * @param message MessageStoragePolicy + * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * @param message GetTopicRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this MessageStoragePolicy to JSON. + * Converts this GetTopicRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a Topic. */ - interface ITopic { + /** Properties of an UpdateTopicRequest. */ + interface IUpdateTopicRequest { - /** Topic name */ - name?: (string|null); - - /** Topic labels */ - labels?: ({ [k: string]: string }|null); + /** UpdateTopicRequest topic */ + topic?: (google.pubsub.v1.ITopic|null); - /** Topic messageStoragePolicy */ - messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + /** UpdateTopicRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); } - /** Represents a Topic. */ - class Topic implements ITopic { + /** Represents an UpdateTopicRequest. */ + class UpdateTopicRequest implements IUpdateTopicRequest { /** - * Constructs a new Topic. + * Constructs a new UpdateTopicRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.ITopic); - - /** Topic name. */ - public name: string; + constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); - /** Topic labels. */ - public labels: { [k: string]: string }; + /** UpdateTopicRequest topic. */ + public topic?: (google.pubsub.v1.ITopic|null); - /** Topic messageStoragePolicy. */ - public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + /** UpdateTopicRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); /** - * Creates a new Topic instance using the specified properties. + * Creates a new UpdateTopicRequest instance using the specified properties. * @param [properties] Properties to set - * @returns Topic instance + * @returns UpdateTopicRequest instance */ - public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; + public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; /** - * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. - * @param message Topic message or plain object to encode + * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. - * @param message Topic message or plain object to encode + * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Topic message from the specified reader or buffer. + * Decodes an UpdateTopicRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Topic + * @returns UpdateTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; /** - * Decodes a Topic message from the specified reader or buffer, length delimited. + * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Topic + * @returns UpdateTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; /** - * Verifies a Topic message. + * Verifies an UpdateTopicRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Topic + * @returns UpdateTopicRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; /** - * Creates a plain object from a Topic message. Also converts values to other types if specified. - * @param message Topic + * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * @param message UpdateTopicRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Topic to JSON. + * Converts this UpdateTopicRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a PubsubMessage. */ - interface IPubsubMessage { - - /** PubsubMessage data */ - data?: (Uint8Array|null); - - /** PubsubMessage attributes */ - attributes?: ({ [k: string]: string }|null); - - /** PubsubMessage messageId */ - messageId?: (string|null); + /** Properties of a PublishRequest. */ + interface IPublishRequest { - /** PubsubMessage publishTime */ - publishTime?: (google.protobuf.ITimestamp|null); + /** PublishRequest topic */ + topic?: (string|null); - /** PubsubMessage orderingKey */ - orderingKey?: (string|null); + /** PublishRequest messages */ + messages?: (google.pubsub.v1.IPubsubMessage[]|null); } - /** Represents a PubsubMessage. */ - class PubsubMessage implements IPubsubMessage { + /** Represents a PublishRequest. */ + class PublishRequest implements IPublishRequest { /** - * Constructs a new PubsubMessage. + * Constructs a new PublishRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IPubsubMessage); - - /** PubsubMessage data. */ - public data: Uint8Array; - - /** PubsubMessage attributes. */ - public attributes: { [k: string]: string }; - - /** PubsubMessage messageId. */ - public messageId: string; + constructor(properties?: google.pubsub.v1.IPublishRequest); - /** PubsubMessage publishTime. */ - public publishTime?: (google.protobuf.ITimestamp|null); + /** PublishRequest topic. */ + public topic: string; - /** PubsubMessage orderingKey. */ - public orderingKey: string; + /** PublishRequest messages. */ + public messages: google.pubsub.v1.IPubsubMessage[]; /** - * Creates a new PubsubMessage instance using the specified properties. + * Creates a new PublishRequest instance using the specified properties. * @param [properties] Properties to set - * @returns PubsubMessage instance + * @returns PublishRequest instance */ - public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; + public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; /** - * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. - * @param message PubsubMessage message or plain object to encode + * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. - * @param message PubsubMessage message or plain object to encode + * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PubsubMessage message from the specified reader or buffer. + * Decodes a PublishRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PubsubMessage + * @returns PublishRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; /** - * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * Decodes a PublishRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PubsubMessage + * @returns PublishRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; /** - * Verifies a PubsubMessage message. + * Verifies a PublishRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PubsubMessage + * @returns PublishRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; /** - * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. - * @param message PubsubMessage + * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. + * @param message PublishRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PubsubMessage to JSON. + * Converts this PublishRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a GetTopicRequest. */ - interface IGetTopicRequest { + /** Properties of a PublishResponse. */ + interface IPublishResponse { - /** GetTopicRequest topic */ - topic?: (string|null); + /** PublishResponse messageIds */ + messageIds?: (string[]|null); } - /** Represents a GetTopicRequest. */ - class GetTopicRequest implements IGetTopicRequest { + /** Represents a PublishResponse. */ + class PublishResponse implements IPublishResponse { /** - * Constructs a new GetTopicRequest. + * Constructs a new PublishResponse. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IGetTopicRequest); + constructor(properties?: google.pubsub.v1.IPublishResponse); - /** GetTopicRequest topic. */ - public topic: string; + /** PublishResponse messageIds. */ + public messageIds: string[]; /** - * Creates a new GetTopicRequest instance using the specified properties. + * Creates a new PublishResponse instance using the specified properties. * @param [properties] Properties to set - * @returns GetTopicRequest instance + * @returns PublishResponse instance */ - public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; + public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; /** - * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. - * @param message GetTopicRequest message or plain object to encode + * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. - * @param message GetTopicRequest message or plain object to encode + * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a GetTopicRequest message from the specified reader or buffer. + * Decodes a PublishResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns GetTopicRequest + * @returns PublishResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; /** - * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * Decodes a PublishResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns GetTopicRequest + * @returns PublishResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; /** - * Verifies a GetTopicRequest message. + * Verifies a PublishResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns GetTopicRequest + * @returns PublishResponse */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; /** - * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. - * @param message GetTopicRequest + * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * @param message PublishResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this GetTopicRequest to JSON. + * Converts this PublishResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of an UpdateTopicRequest. */ - interface IUpdateTopicRequest { + /** Properties of a ListTopicsRequest. */ + interface IListTopicsRequest { - /** UpdateTopicRequest topic */ - topic?: (google.pubsub.v1.ITopic|null); + /** ListTopicsRequest project */ + project?: (string|null); - /** UpdateTopicRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); + /** ListTopicsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicsRequest pageToken */ + pageToken?: (string|null); } - /** Represents an UpdateTopicRequest. */ - class UpdateTopicRequest implements IUpdateTopicRequest { + /** Represents a ListTopicsRequest. */ + class ListTopicsRequest implements IListTopicsRequest { /** - * Constructs a new UpdateTopicRequest. + * Constructs a new ListTopicsRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); + constructor(properties?: google.pubsub.v1.IListTopicsRequest); - /** UpdateTopicRequest topic. */ - public topic?: (google.pubsub.v1.ITopic|null); + /** ListTopicsRequest project. */ + public project: string; - /** UpdateTopicRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); + /** ListTopicsRequest pageSize. */ + public pageSize: number; + + /** ListTopicsRequest pageToken. */ + public pageToken: string; /** - * Creates a new UpdateTopicRequest instance using the specified properties. + * Creates a new ListTopicsRequest instance using the specified properties. * @param [properties] Properties to set - * @returns UpdateTopicRequest instance + * @returns ListTopicsRequest instance */ - public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; + public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; /** - * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. - * @param message UpdateTopicRequest message or plain object to encode + * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. - * @param message UpdateTopicRequest message or plain object to encode + * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * Decodes a ListTopicsRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns UpdateTopicRequest + * @returns ListTopicsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns UpdateTopicRequest + * @returns ListTopicsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; /** - * Verifies an UpdateTopicRequest message. + * Verifies a ListTopicsRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns UpdateTopicRequest + * @returns ListTopicsRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; /** - * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. - * @param message UpdateTopicRequest + * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * @param message ListTopicsRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this UpdateTopicRequest to JSON. + * Converts this ListTopicsRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a PublishRequest. */ - interface IPublishRequest { + /** Properties of a ListTopicsResponse. */ + interface IListTopicsResponse { - /** PublishRequest topic */ - topic?: (string|null); + /** ListTopicsResponse topics */ + topics?: (google.pubsub.v1.ITopic[]|null); - /** PublishRequest messages */ - messages?: (google.pubsub.v1.IPubsubMessage[]|null); + /** ListTopicsResponse nextPageToken */ + nextPageToken?: (string|null); } - /** Represents a PublishRequest. */ - class PublishRequest implements IPublishRequest { + /** Represents a ListTopicsResponse. */ + class ListTopicsResponse implements IListTopicsResponse { /** - * Constructs a new PublishRequest. + * Constructs a new ListTopicsResponse. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IPublishRequest); + constructor(properties?: google.pubsub.v1.IListTopicsResponse); - /** PublishRequest topic. */ - public topic: string; + /** ListTopicsResponse topics. */ + public topics: google.pubsub.v1.ITopic[]; - /** PublishRequest messages. */ - public messages: google.pubsub.v1.IPubsubMessage[]; + /** ListTopicsResponse nextPageToken. */ + public nextPageToken: string; /** - * Creates a new PublishRequest instance using the specified properties. + * Creates a new ListTopicsResponse instance using the specified properties. * @param [properties] Properties to set - * @returns PublishRequest instance + * @returns ListTopicsResponse instance */ - public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; + public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; /** - * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. - * @param message PublishRequest message or plain object to encode + * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. - * @param message PublishRequest message or plain object to encode + * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PublishRequest message from the specified reader or buffer. + * Decodes a ListTopicsResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PublishRequest + * @returns ListTopicsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; /** - * Decodes a PublishRequest message from the specified reader or buffer, length delimited. + * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PublishRequest + * @returns ListTopicsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; /** - * Verifies a PublishRequest message. + * Verifies a ListTopicsResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PublishRequest + * @returns ListTopicsResponse */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; /** - * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. - * @param message PublishRequest + * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * @param message ListTopicsResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PublishRequest to JSON. + * Converts this ListTopicsResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a PublishResponse. */ - interface IPublishResponse { + /** Properties of a ListTopicSubscriptionsRequest. */ + interface IListTopicSubscriptionsRequest { - /** PublishResponse messageIds */ - messageIds?: (string[]|null); + /** ListTopicSubscriptionsRequest topic */ + topic?: (string|null); + + /** ListTopicSubscriptionsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicSubscriptionsRequest pageToken */ + pageToken?: (string|null); } - /** Represents a PublishResponse. */ - class PublishResponse implements IPublishResponse { + /** Represents a ListTopicSubscriptionsRequest. */ + class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { /** - * Constructs a new PublishResponse. + * Constructs a new ListTopicSubscriptionsRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IPublishResponse); + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); - /** PublishResponse messageIds. */ - public messageIds: string[]; + /** ListTopicSubscriptionsRequest topic. */ + public topic: string; + + /** ListTopicSubscriptionsRequest pageSize. */ + public pageSize: number; + + /** ListTopicSubscriptionsRequest pageToken. */ + public pageToken: string; /** - * Creates a new PublishResponse instance using the specified properties. + * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. * @param [properties] Properties to set - * @returns PublishResponse instance + * @returns ListTopicSubscriptionsRequest instance */ - public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; /** - * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. - * @param message PublishResponse message or plain object to encode + * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. - * @param message PublishResponse message or plain object to encode + * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PublishResponse message from the specified reader or buffer. + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PublishResponse + * @returns ListTopicSubscriptionsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; /** - * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PublishResponse + * @returns ListTopicSubscriptionsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; /** - * Verifies a PublishResponse message. + * Verifies a ListTopicSubscriptionsRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PublishResponse + * @returns ListTopicSubscriptionsRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; /** - * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. - * @param message PublishResponse + * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PublishResponse to JSON. + * Converts this ListTopicSubscriptionsRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ListTopicsRequest. */ - interface IListTopicsRequest { - - /** ListTopicsRequest project */ - project?: (string|null); + /** Properties of a ListTopicSubscriptionsResponse. */ + interface IListTopicSubscriptionsResponse { - /** ListTopicsRequest pageSize */ - pageSize?: (number|null); + /** ListTopicSubscriptionsResponse subscriptions */ + subscriptions?: (string[]|null); - /** ListTopicsRequest pageToken */ - pageToken?: (string|null); + /** ListTopicSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); } - /** Represents a ListTopicsRequest. */ - class ListTopicsRequest implements IListTopicsRequest { + /** Represents a ListTopicSubscriptionsResponse. */ + class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { /** - * Constructs a new ListTopicsRequest. + * Constructs a new ListTopicSubscriptionsResponse. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListTopicsRequest); - - /** ListTopicsRequest project. */ - public project: string; + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); - /** ListTopicsRequest pageSize. */ - public pageSize: number; + /** ListTopicSubscriptionsResponse subscriptions. */ + public subscriptions: string[]; - /** ListTopicsRequest pageToken. */ - public pageToken: string; + /** ListTopicSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; /** - * Creates a new ListTopicsRequest instance using the specified properties. + * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. * @param [properties] Properties to set - * @returns ListTopicsRequest instance + * @returns ListTopicSubscriptionsResponse instance */ - public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; /** - * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. - * @param message ListTopicsRequest message or plain object to encode + * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. - * @param message ListTopicsRequest message or plain object to encode + * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListTopicsRequest message from the specified reader or buffer. + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListTopicsRequest + * @returns ListTopicSubscriptionsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; /** - * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListTopicsRequest + * @returns ListTopicSubscriptionsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; /** - * Verifies a ListTopicsRequest message. + * Verifies a ListTopicSubscriptionsResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListTopicsRequest + * @returns ListTopicSubscriptionsResponse */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; /** - * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. - * @param message ListTopicsRequest + * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListTopicsRequest to JSON. + * Converts this ListTopicSubscriptionsResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ListTopicsResponse. */ - interface IListTopicsResponse { + /** Properties of a ListTopicSnapshotsRequest. */ + interface IListTopicSnapshotsRequest { - /** ListTopicsResponse topics */ - topics?: (google.pubsub.v1.ITopic[]|null); + /** ListTopicSnapshotsRequest topic */ + topic?: (string|null); - /** ListTopicsResponse nextPageToken */ - nextPageToken?: (string|null); + /** ListTopicSnapshotsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicSnapshotsRequest pageToken */ + pageToken?: (string|null); } - /** Represents a ListTopicsResponse. */ - class ListTopicsResponse implements IListTopicsResponse { + /** Represents a ListTopicSnapshotsRequest. */ + class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { /** - * Constructs a new ListTopicsResponse. + * Constructs a new ListTopicSnapshotsRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListTopicsResponse); + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); - /** ListTopicsResponse topics. */ - public topics: google.pubsub.v1.ITopic[]; + /** ListTopicSnapshotsRequest topic. */ + public topic: string; - /** ListTopicsResponse nextPageToken. */ - public nextPageToken: string; + /** ListTopicSnapshotsRequest pageSize. */ + public pageSize: number; + + /** ListTopicSnapshotsRequest pageToken. */ + public pageToken: string; /** - * Creates a new ListTopicsResponse instance using the specified properties. + * Creates a new ListTopicSnapshotsRequest instance using the specified properties. * @param [properties] Properties to set - * @returns ListTopicsResponse instance + * @returns ListTopicSnapshotsRequest instance */ - public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; /** - * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. - * @param message ListTopicsResponse message or plain object to encode + * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. - * @param message ListTopicsResponse message or plain object to encode + * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListTopicsResponse message from the specified reader or buffer. + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListTopicsResponse + * @returns ListTopicSnapshotsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; /** - * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListTopicsResponse + * @returns ListTopicSnapshotsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; /** - * Verifies a ListTopicsResponse message. + * Verifies a ListTopicSnapshotsRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListTopicsResponse + * @returns ListTopicSnapshotsRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; /** - * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. - * @param message ListTopicsResponse + * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListTopicsResponse to JSON. + * Converts this ListTopicSnapshotsRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ListTopicSubscriptionsRequest. */ - interface IListTopicSubscriptionsRequest { - - /** ListTopicSubscriptionsRequest topic */ - topic?: (string|null); + /** Properties of a ListTopicSnapshotsResponse. */ + interface IListTopicSnapshotsResponse { - /** ListTopicSubscriptionsRequest pageSize */ - pageSize?: (number|null); + /** ListTopicSnapshotsResponse snapshots */ + snapshots?: (string[]|null); - /** ListTopicSubscriptionsRequest pageToken */ - pageToken?: (string|null); + /** ListTopicSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); } - /** Represents a ListTopicSubscriptionsRequest. */ - class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { + /** Represents a ListTopicSnapshotsResponse. */ + class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { /** - * Constructs a new ListTopicSubscriptionsRequest. + * Constructs a new ListTopicSnapshotsResponse. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); - - /** ListTopicSubscriptionsRequest topic. */ - public topic: string; + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); - /** ListTopicSubscriptionsRequest pageSize. */ - public pageSize: number; + /** ListTopicSnapshotsResponse snapshots. */ + public snapshots: string[]; - /** ListTopicSubscriptionsRequest pageToken. */ - public pageToken: string; + /** ListTopicSnapshotsResponse nextPageToken. */ + public nextPageToken: string; /** - * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * Creates a new ListTopicSnapshotsResponse instance using the specified properties. * @param [properties] Properties to set - * @returns ListTopicSubscriptionsRequest instance + * @returns ListTopicSnapshotsResponse instance */ - public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; /** - * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @param message ListTopicSubscriptionsRequest message or plain object to encode + * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @param message ListTopicSubscriptionsRequest message or plain object to encode + * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListTopicSubscriptionsRequest + * @returns ListTopicSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListTopicSubscriptionsRequest + * @returns ListTopicSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; /** - * Verifies a ListTopicSubscriptionsRequest message. + * Verifies a ListTopicSnapshotsResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListTopicSubscriptionsRequest + * @returns ListTopicSnapshotsResponse */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; /** - * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. - * @param message ListTopicSubscriptionsRequest + * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListTopicSubscriptionsRequest to JSON. + * Converts this ListTopicSnapshotsResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ListTopicSubscriptionsResponse. */ - interface IListTopicSubscriptionsResponse { - - /** ListTopicSubscriptionsResponse subscriptions */ - subscriptions?: (string[]|null); + /** Properties of a DeleteTopicRequest. */ + interface IDeleteTopicRequest { - /** ListTopicSubscriptionsResponse nextPageToken */ - nextPageToken?: (string|null); + /** DeleteTopicRequest topic */ + topic?: (string|null); } - /** Represents a ListTopicSubscriptionsResponse. */ - class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { + /** Represents a DeleteTopicRequest. */ + class DeleteTopicRequest implements IDeleteTopicRequest { /** - * Constructs a new ListTopicSubscriptionsResponse. + * Constructs a new DeleteTopicRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); - - /** ListTopicSubscriptionsResponse subscriptions. */ - public subscriptions: string[]; + constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); - /** ListTopicSubscriptionsResponse nextPageToken. */ - public nextPageToken: string; + /** DeleteTopicRequest topic. */ + public topic: string; /** - * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * Creates a new DeleteTopicRequest instance using the specified properties. * @param [properties] Properties to set - * @returns ListTopicSubscriptionsResponse instance + * @returns DeleteTopicRequest instance */ - public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; + public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; /** - * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @param message ListTopicSubscriptionsResponse message or plain object to encode + * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @param message ListTopicSubscriptionsResponse message or plain object to encode + * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * Decodes a DeleteTopicRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListTopicSubscriptionsResponse + * @returns DeleteTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListTopicSubscriptionsResponse + * @returns DeleteTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; /** - * Verifies a ListTopicSubscriptionsResponse message. + * Verifies a DeleteTopicRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListTopicSubscriptionsResponse + * @returns DeleteTopicRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; /** - * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. - * @param message ListTopicSubscriptionsResponse + * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. + * @param message DeleteTopicRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListTopicSubscriptionsResponse to JSON. + * Converts this DeleteTopicRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ListTopicSnapshotsRequest. */ - interface IListTopicSnapshotsRequest { - - /** ListTopicSnapshotsRequest topic */ - topic?: (string|null); - - /** ListTopicSnapshotsRequest pageSize */ - pageSize?: (number|null); - - /** ListTopicSnapshotsRequest pageToken */ - pageToken?: (string|null); - } - - /** Represents a ListTopicSnapshotsRequest. */ - class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { + /** Represents a Subscriber */ + class Subscriber extends $protobuf.rpc.Service { /** - * Constructs a new ListTopicSnapshotsRequest. - * @param [properties] Properties to set + * Constructs a new Subscriber service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited */ - constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); - - /** ListTopicSnapshotsRequest topic. */ - public topic: string; - - /** ListTopicSnapshotsRequest pageSize. */ - public pageSize: number; - - /** ListTopicSnapshotsRequest pageToken. */ - public pageToken: string; + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); /** - * Creates a new ListTopicSnapshotsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSnapshotsRequest instance + * Creates new Subscriber service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. */ - public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; /** - * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @param message ListTopicSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription */ - public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; /** - * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @param message ListTopicSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @returns Promise */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public createSubscription(request: google.pubsub.v1.ISubscription): Promise; /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @returns Promise */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; /** - * Verifies a ListTopicSnapshotsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription */ - public static verify(message: { [k: string]: any }): (string|null); + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; /** - * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSnapshotsRequest + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @returns Promise */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; /** - * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. - * @param message ListTopicSnapshotsRequest - * @param [options] Conversion options - * @returns Plain object + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse */ - public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; /** - * Converts this ListTopicSnapshotsRequest to JSON. - * @returns JSON object + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @returns Promise */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListTopicSnapshotsResponse. */ - interface IListTopicSnapshotsResponse { - - /** ListTopicSnapshotsResponse snapshots */ - snapshots?: (string[]|null); - - /** ListTopicSnapshotsResponse nextPageToken */ - nextPageToken?: (string|null); - } - - /** Represents a ListTopicSnapshotsResponse. */ - class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; /** - * Constructs a new ListTopicSnapshotsResponse. - * @param [properties] Properties to set + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty */ - constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); - - /** ListTopicSnapshotsResponse snapshots. */ - public snapshots: string[]; - - /** ListTopicSnapshotsResponse nextPageToken. */ - public nextPageToken: string; + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; /** - * Creates a new ListTopicSnapshotsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSnapshotsResponse instance + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @returns Promise */ - public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; /** - * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @param message ListTopicSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty */ - public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; /** - * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @param message ListTopicSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @returns Promise */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @returns Promise */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; /** - * Verifies a ListTopicSnapshotsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not + * Calls Pull. + * @param request PullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PullResponse */ - public static verify(message: { [k: string]: any }): (string|null); + public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; /** - * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSnapshotsResponse + * Calls Pull. + * @param request PullRequest message or plain object + * @returns Promise */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; + public pull(request: google.pubsub.v1.IPullRequest): Promise; /** - * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. - * @param message ListTopicSnapshotsResponse - * @param [options] Conversion options - * @returns Plain object + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and StreamingPullResponse */ - public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; /** - * Converts this ListTopicSnapshotsResponse to JSON. - * @returns JSON object + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @returns Promise */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a DeleteTopicRequest. */ - interface IDeleteTopicRequest { - - /** DeleteTopicRequest topic */ - topic?: (string|null); - } - - /** Represents a DeleteTopicRequest. */ - class DeleteTopicRequest implements IDeleteTopicRequest { + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; /** - * Constructs a new DeleteTopicRequest. - * @param [properties] Properties to set + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty */ - constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); - - /** DeleteTopicRequest topic. */ - public topic: string; + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; /** - * Creates a new DeleteTopicRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteTopicRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @returns Promise + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; /** - * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @param message DeleteTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot */ - public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; /** - * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @param message DeleteTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @returns Promise */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @returns Promise */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; /** - * Verifies a DeleteTopicRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot */ - public static verify(message: { [k: string]: any }): (string|null); + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; /** - * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteTopicRequest + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @returns Promise */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; /** - * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. - * @param message DeleteTopicRequest - * @param [options] Conversion options - * @returns Plain object + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot */ - public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; /** - * Converts this DeleteTopicRequest to JSON. - * @returns JSON object + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @returns Promise */ - public toJSON(): { [k: string]: any }; + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; + + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; + + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @returns Promise + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; + + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @param callback Node-style callback called with the error, if any, and SeekResponse + */ + public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; + + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @returns Promise + */ + public seek(request: google.pubsub.v1.ISeekRequest): Promise; + } + + namespace Subscriber { + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * @param error Error, if any + * @param [response] ListSubscriptionsResponse + */ + type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * @param error Error, if any + * @param [response] Empty + */ + type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * @param error Error, if any + * @param [response] PullResponse + */ + type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * @param error Error, if any + * @param [response] StreamingPullResponse + */ + type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * @param error Error, if any + * @param [response] ListSnapshotsResponse + */ + type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * @param error Error, if any + * @param [response] SeekResponse + */ + type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; } /** Properties of a Subscription. */ @@ -1952,6 +1958,9 @@ export namespace google { /** Subscription expirationPolicy */ expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + + /** Subscription deadLetterPolicy */ + deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); } /** Represents a Subscription. */ @@ -1990,6 +1999,9 @@ export namespace google { /** Subscription expirationPolicy. */ public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + /** Subscription deadLetterPolicy. */ + public deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); + /** * Creates a new Subscription instance using the specified properties. * @param [properties] Properties to set @@ -2061,88 +2073,184 @@ export namespace google { public toJSON(): { [k: string]: any }; } - /** Properties of an ExpirationPolicy. */ - interface IExpirationPolicy { + /** Properties of a DeadLetterPolicy. */ + interface IDeadLetterPolicy { - /** ExpirationPolicy ttl */ - ttl?: (google.protobuf.IDuration|null); + /** DeadLetterPolicy deadLetterTopic */ + deadLetterTopic?: (string|null); + + /** DeadLetterPolicy maxDeliveryAttempts */ + maxDeliveryAttempts?: (number|null); } - /** Represents an ExpirationPolicy. */ - class ExpirationPolicy implements IExpirationPolicy { + /** Represents a DeadLetterPolicy. */ + class DeadLetterPolicy implements IDeadLetterPolicy { /** - * Constructs a new ExpirationPolicy. + * Constructs a new DeadLetterPolicy. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IExpirationPolicy); + constructor(properties?: google.pubsub.v1.IDeadLetterPolicy); - /** ExpirationPolicy ttl. */ - public ttl?: (google.protobuf.IDuration|null); + /** DeadLetterPolicy deadLetterTopic. */ + public deadLetterTopic: string; + + /** DeadLetterPolicy maxDeliveryAttempts. */ + public maxDeliveryAttempts: number; /** - * Creates a new ExpirationPolicy instance using the specified properties. + * Creates a new DeadLetterPolicy instance using the specified properties. * @param [properties] Properties to set - * @returns ExpirationPolicy instance + * @returns DeadLetterPolicy instance */ - public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; + public static create(properties?: google.pubsub.v1.IDeadLetterPolicy): google.pubsub.v1.DeadLetterPolicy; /** - * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @param message ExpirationPolicy message or plain object to encode + * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @param message DeadLetterPolicy message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @param message ExpirationPolicy message or plain object to encode + * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @param message DeadLetterPolicy message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an ExpirationPolicy message from the specified reader or buffer. + * Decodes a DeadLetterPolicy message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ExpirationPolicy + * @returns DeadLetterPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeadLetterPolicy; /** - * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ExpirationPolicy + * @returns DeadLetterPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeadLetterPolicy; /** - * Verifies an ExpirationPolicy message. + * Verifies a DeadLetterPolicy message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ExpirationPolicy + * @returns DeadLetterPolicy */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeadLetterPolicy; /** - * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. - * @param message ExpirationPolicy + * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. + * @param message DeadLetterPolicy * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.DeadLetterPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeadLetterPolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an ExpirationPolicy. */ + interface IExpirationPolicy { + + /** ExpirationPolicy ttl */ + ttl?: (google.protobuf.IDuration|null); + } + + /** Represents an ExpirationPolicy. */ + class ExpirationPolicy implements IExpirationPolicy { + + /** + * Constructs a new ExpirationPolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IExpirationPolicy); + + /** ExpirationPolicy ttl. */ + public ttl?: (google.protobuf.IDuration|null); + + /** + * Creates a new ExpirationPolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns ExpirationPolicy instance + */ + public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; + + /** + * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; + + /** + * Verifies an ExpirationPolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExpirationPolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; + + /** + * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. + * @param message ExpirationPolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** * Converts this ExpirationPolicy to JSON. @@ -2363,6 +2471,9 @@ export namespace google { /** ReceivedMessage message */ message?: (google.pubsub.v1.IPubsubMessage|null); + + /** ReceivedMessage deliveryAttempt */ + deliveryAttempt?: (number|null); } /** Represents a ReceivedMessage. */ @@ -2380,6 +2491,9 @@ export namespace google { /** ReceivedMessage message. */ public message?: (google.pubsub.v1.IPubsubMessage|null); + /** ReceivedMessage deliveryAttempt. */ + public deliveryAttempt: number; + /** * Creates a new ReceivedMessage instance using the specified properties. * @param [properties] Properties to set @@ -4498,6 +4612,9 @@ export namespace google { /** Http rules */ rules?: (google.api.IHttpRule[]|null); + + /** Http fullyDecodeReservedExpansion */ + fullyDecodeReservedExpansion?: (boolean|null); } /** Represents a Http. */ @@ -4512,6 +4629,9 @@ export namespace google { /** Http rules. */ public rules: google.api.IHttpRule[]; + /** Http fullyDecodeReservedExpansion. */ + public fullyDecodeReservedExpansion: boolean; + /** * Creates a new Http instance using the specified properties. * @param [properties] Properties to set @@ -4610,6 +4730,9 @@ export namespace google { /** HttpRule body */ body?: (string|null); + /** HttpRule responseBody */ + responseBody?: (string|null); + /** HttpRule additionalBindings */ additionalBindings?: (google.api.IHttpRule[]|null); } @@ -4647,6 +4770,9 @@ export namespace google { /** HttpRule body. */ public body: string; + /** HttpRule responseBody. */ + public responseBody: string; + /** HttpRule additionalBindings. */ public additionalBindings: google.api.IHttpRule[]; @@ -5224,6 +5350,9 @@ export namespace google { /** ExtensionRange end */ end?: (number|null); + + /** ExtensionRange options */ + options?: (google.protobuf.IExtensionRangeOptions|null); } /** Represents an ExtensionRange. */ @@ -5241,6 +5370,9 @@ export namespace google { /** ExtensionRange end. */ public end: number; + /** ExtensionRange options. */ + public options?: (google.protobuf.IExtensionRangeOptions|null); + /** * Creates a new ExtensionRange instance using the specified properties. * @param [properties] Properties to set @@ -5409,6 +5541,96 @@ export namespace google { } } + /** Properties of an ExtensionRangeOptions. */ + interface IExtensionRangeOptions { + + /** ExtensionRangeOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an ExtensionRangeOptions. */ + class ExtensionRangeOptions implements IExtensionRangeOptions { + + /** + * Constructs a new ExtensionRangeOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IExtensionRangeOptions); + + /** ExtensionRangeOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRangeOptions instance + */ + public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; + + /** + * Verifies an ExtensionRangeOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRangeOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; + + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @param message ExtensionRangeOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExtensionRangeOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + /** Properties of a FieldDescriptorProto. */ interface IFieldDescriptorProto { @@ -5692,6 +5914,12 @@ export namespace google { /** EnumDescriptorProto options */ options?: (google.protobuf.IEnumOptions|null); + + /** EnumDescriptorProto reservedRange */ + reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); + + /** EnumDescriptorProto reservedName */ + reservedName?: (string[]|null); } /** Represents an EnumDescriptorProto. */ @@ -5712,6 +5940,12 @@ export namespace google { /** EnumDescriptorProto options. */ public options?: (google.protobuf.IEnumOptions|null); + /** EnumDescriptorProto reservedRange. */ + public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; + + /** EnumDescriptorProto reservedName. */ + public reservedName: string[]; + /** * Creates a new EnumDescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -5783,6 +6017,105 @@ export namespace google { public toJSON(): { [k: string]: any }; } + namespace EnumDescriptorProto { + + /** Properties of an EnumReservedRange. */ + interface IEnumReservedRange { + + /** EnumReservedRange start */ + start?: (number|null); + + /** EnumReservedRange end */ + end?: (number|null); + } + + /** Represents an EnumReservedRange. */ + class EnumReservedRange implements IEnumReservedRange { + + /** + * Constructs a new EnumReservedRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); + + /** EnumReservedRange start. */ + public start: number; + + /** EnumReservedRange end. */ + public end: number; + + /** + * Creates a new EnumReservedRange instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumReservedRange instance + */ + public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Verifies an EnumReservedRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumReservedRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * @param message EnumReservedRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumReservedRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + /** Properties of an EnumValueDescriptorProto. */ interface IEnumValueDescriptorProto { @@ -6140,6 +6473,9 @@ export namespace google { /** FileOptions pyGenericServices */ pyGenericServices?: (boolean|null); + /** FileOptions phpGenericServices */ + phpGenericServices?: (boolean|null); + /** FileOptions deprecated */ deprecated?: (boolean|null); @@ -6158,6 +6494,15 @@ export namespace google { /** FileOptions phpClassPrefix */ phpClassPrefix?: (string|null); + /** FileOptions phpNamespace */ + phpNamespace?: (string|null); + + /** FileOptions phpMetadataNamespace */ + phpMetadataNamespace?: (string|null); + + /** FileOptions rubyPackage */ + rubyPackage?: (string|null); + /** FileOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -6201,6 +6546,9 @@ export namespace google { /** FileOptions pyGenericServices. */ public pyGenericServices: boolean; + /** FileOptions phpGenericServices. */ + public phpGenericServices: boolean; + /** FileOptions deprecated. */ public deprecated: boolean; @@ -6219,6 +6567,15 @@ export namespace google { /** FileOptions phpClassPrefix. */ public phpClassPrefix: string; + /** FileOptions phpNamespace. */ + public phpNamespace: string; + + /** FileOptions phpMetadataNamespace. */ + public phpMetadataNamespace: string; + + /** FileOptions rubyPackage. */ + public rubyPackage: string; + /** FileOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -6856,6 +7213,12 @@ export namespace google { /** ServiceOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** ServiceOptions .google.api.defaultHost */ + ".google.api.defaultHost"?: (string|null); + + /** ServiceOptions .google.api.oauthScopes */ + ".google.api.oauthScopes"?: (string|null); } /** Represents a ServiceOptions. */ @@ -6958,6 +7321,9 @@ export namespace google { /** MethodOptions .google.api.http */ ".google.api.http"?: (google.api.IHttpRule|null); + + /** MethodOptions .google.api.methodSignature */ + ".google.api.methodSignature"?: (string[]|null); } /** Represents a MethodOptions. */ @@ -7163,896 +7529,2107 @@ export namespace google { */ public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UninterpretedOption - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UninterpretedOption + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; + + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @param message UninterpretedOption + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UninterpretedOption to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace UninterpretedOption { + + /** Properties of a NamePart. */ + interface INamePart { + + /** NamePart namePart */ + namePart: string; + + /** NamePart isExtension */ + isExtension: boolean; + } + + /** Represents a NamePart. */ + class NamePart implements INamePart { + + /** + * Constructs a new NamePart. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.UninterpretedOption.INamePart); + + /** NamePart namePart. */ + public namePart: string; + + /** NamePart isExtension. */ + public isExtension: boolean; + + /** + * Creates a new NamePart instance using the specified properties. + * @param [properties] Properties to set + * @returns NamePart instance + */ + public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; + + /** + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a NamePart message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; + + /** + * Decodes a NamePart message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; + + /** + * Verifies a NamePart message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns NamePart + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; + + /** + * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * @param message NamePart + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this NamePart to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a SourceCodeInfo. */ + interface ISourceCodeInfo { + + /** SourceCodeInfo location */ + location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); + } + + /** Represents a SourceCodeInfo. */ + class SourceCodeInfo implements ISourceCodeInfo { + + /** + * Constructs a new SourceCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ISourceCodeInfo); + + /** SourceCodeInfo location. */ + public location: google.protobuf.SourceCodeInfo.ILocation[]; + + /** + * Creates a new SourceCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns SourceCodeInfo instance + */ + public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; + + /** + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; + + /** + * Verifies a SourceCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SourceCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; + + /** + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. + * @param message SourceCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SourceCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace SourceCodeInfo { + + /** Properties of a Location. */ + interface ILocation { + + /** Location path */ + path?: (number[]|null); + + /** Location span */ + span?: (number[]|null); + + /** Location leadingComments */ + leadingComments?: (string|null); + + /** Location trailingComments */ + trailingComments?: (string|null); + + /** Location leadingDetachedComments */ + leadingDetachedComments?: (string[]|null); + } + + /** Represents a Location. */ + class Location implements ILocation { + + /** + * Constructs a new Location. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); + + /** Location path. */ + public path: number[]; + + /** Location span. */ + public span: number[]; + + /** Location leadingComments. */ + public leadingComments: string; + + /** Location trailingComments. */ + public trailingComments: string; + + /** Location leadingDetachedComments. */ + public leadingDetachedComments: string[]; + + /** + * Creates a new Location instance using the specified properties. + * @param [properties] Properties to set + * @returns Location instance + */ + public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; + + /** + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Location message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; + + /** + * Decodes a Location message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; + + /** + * Verifies a Location message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Location message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Location + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; + + /** + * Creates a plain object from a Location message. Also converts values to other types if specified. + * @param message Location + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Location to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a GeneratedCodeInfo. */ + interface IGeneratedCodeInfo { + + /** GeneratedCodeInfo annotation */ + annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); + } + + /** Represents a GeneratedCodeInfo. */ + class GeneratedCodeInfo implements IGeneratedCodeInfo { + + /** + * Constructs a new GeneratedCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IGeneratedCodeInfo); + + /** GeneratedCodeInfo annotation. */ + public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; + + /** + * Creates a new GeneratedCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns GeneratedCodeInfo instance + */ + public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; + + /** + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; + + /** + * Verifies a GeneratedCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GeneratedCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; + + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @param message GeneratedCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GeneratedCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace GeneratedCodeInfo { + + /** Properties of an Annotation. */ + interface IAnnotation { + + /** Annotation path */ + path?: (number[]|null); + + /** Annotation sourceFile */ + sourceFile?: (string|null); + + /** Annotation begin */ + begin?: (number|null); + + /** Annotation end */ + end?: (number|null); + } + + /** Represents an Annotation. */ + class Annotation implements IAnnotation { + + /** + * Constructs a new Annotation. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); + + /** Annotation path. */ + public path: number[]; + + /** Annotation sourceFile. */ + public sourceFile: string; + + /** Annotation begin. */ + public begin: number; + + /** Annotation end. */ + public end: number; + + /** + * Creates a new Annotation instance using the specified properties. + * @param [properties] Properties to set + * @returns Annotation instance + */ + public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Annotation message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Decodes an Annotation message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Verifies an Annotation message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Annotation + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; + + /** + * Creates a plain object from an Annotation message. Also converts values to other types if specified. + * @param message Annotation + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Annotation to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of a Duration. */ + interface IDuration { + + /** Duration seconds */ + seconds?: (number|Long|null); + + /** Duration nanos */ + nanos?: (number|null); + } + + /** Represents a Duration. */ + class Duration implements IDuration { + + /** + * Constructs a new Duration. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDuration); + + /** Duration seconds. */ + public seconds: (number|Long); + + /** Duration nanos. */ + public nanos: number; + + /** + * Creates a new Duration instance using the specified properties. + * @param [properties] Properties to set + * @returns Duration instance + */ + public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; + + /** + * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Duration message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; + + /** + * Decodes a Duration message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; + + /** + * Verifies a Duration message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Duration + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; + + /** + * Creates a plain object from a Duration message. Also converts values to other types if specified. + * @param message Duration + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Duration to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of an Empty. */ + interface IEmpty { + } + + /** Represents an Empty. */ + class Empty implements IEmpty { + + /** + * Constructs a new Empty. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEmpty); + + /** + * Creates a new Empty instance using the specified properties. + * @param [properties] Properties to set + * @returns Empty instance + */ + public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; + + /** + * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Empty message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; + + /** + * Decodes an Empty message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; + + /** + * Verifies an Empty message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Empty message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Empty + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; + + /** + * Creates a plain object from an Empty message. Also converts values to other types if specified. + * @param message Empty + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Empty to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldMask. */ + interface IFieldMask { + + /** FieldMask paths */ + paths?: (string[]|null); + } + + /** Represents a FieldMask. */ + class FieldMask implements IFieldMask { + + /** + * Constructs a new FieldMask. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldMask); + + /** FieldMask paths. */ + public paths: string[]; + + /** + * Creates a new FieldMask instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldMask instance + */ + public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; + + /** + * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FieldMask message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; + + /** + * Decodes a FieldMask message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; + + /** + * Verifies a FieldMask message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldMask + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; + + /** + * Creates a plain object from a FieldMask message. Also converts values to other types if specified. + * @param message FieldMask + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FieldMask to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a Timestamp. */ + interface ITimestamp { + + /** Timestamp seconds */ + seconds?: (number|Long|null); + + /** Timestamp nanos */ + nanos?: (number|null); + } + + /** Represents a Timestamp. */ + class Timestamp implements ITimestamp { + + /** + * Constructs a new Timestamp. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ITimestamp); + + /** Timestamp seconds. */ + public seconds: (number|Long); + + /** Timestamp nanos. */ + public nanos: number; + + /** + * Creates a new Timestamp instance using the specified properties. + * @param [properties] Properties to set + * @returns Timestamp instance + */ + public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; + + /** + * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Timestamp message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; + + /** + * Decodes a Timestamp message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; + + /** + * Verifies a Timestamp message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Timestamp + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; + + /** + * Creates a plain object from a Timestamp message. Also converts values to other types if specified. + * @param message Timestamp + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Timestamp to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Namespace iam. */ + namespace iam { + + /** Namespace v1. */ + namespace v1 { + + /** Represents a IAMPolicy */ + class IAMPolicy extends $protobuf.rpc.Service { + + /** + * Constructs a new IAMPolicy service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new IAMPolicy service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): IAMPolicy; + + /** + * Calls SetIamPolicy. + * @param request SetIamPolicyRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Policy + */ + public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.SetIamPolicyCallback): void; + + /** + * Calls SetIamPolicy. + * @param request SetIamPolicyRequest message or plain object + * @returns Promise + */ + public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest): Promise; + + /** + * Calls GetIamPolicy. + * @param request GetIamPolicyRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Policy + */ + public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.GetIamPolicyCallback): void; + + /** + * Calls GetIamPolicy. + * @param request GetIamPolicyRequest message or plain object + * @returns Promise + */ + public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest): Promise; + + /** + * Calls TestIamPermissions. + * @param request TestIamPermissionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and TestIamPermissionsResponse + */ + public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest, callback: google.iam.v1.IAMPolicy.TestIamPermissionsCallback): void; + + /** + * Calls TestIamPermissions. + * @param request TestIamPermissionsRequest message or plain object + * @returns Promise + */ + public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest): Promise; + } + + namespace IAMPolicy { + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. + * @param error Error, if any + * @param [response] Policy + */ + type SetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. + * @param error Error, if any + * @param [response] Policy + */ + type GetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. + * @param error Error, if any + * @param [response] TestIamPermissionsResponse + */ + type TestIamPermissionsCallback = (error: (Error|null), response?: google.iam.v1.TestIamPermissionsResponse) => void; + } + + /** Properties of a SetIamPolicyRequest. */ + interface ISetIamPolicyRequest { + + /** SetIamPolicyRequest resource */ + resource?: (string|null); + + /** SetIamPolicyRequest policy */ + policy?: (google.iam.v1.IPolicy|null); + } + + /** Represents a SetIamPolicyRequest. */ + class SetIamPolicyRequest implements ISetIamPolicyRequest { + + /** + * Constructs a new SetIamPolicyRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ISetIamPolicyRequest); + + /** SetIamPolicyRequest resource. */ + public resource: string; + + /** SetIamPolicyRequest policy. */ + public policy?: (google.iam.v1.IPolicy|null); + + /** + * Creates a new SetIamPolicyRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns SetIamPolicyRequest instance + */ + public static create(properties?: google.iam.v1.ISetIamPolicyRequest): google.iam.v1.SetIamPolicyRequest; + + /** + * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @param message SetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @param message SetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SetIamPolicyRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.SetIamPolicyRequest; + + /** + * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.SetIamPolicyRequest; + + /** + * Verifies a SetIamPolicyRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SetIamPolicyRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.SetIamPolicyRequest; + + /** + * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. + * @param message SetIamPolicyRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.SetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SetIamPolicyRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a GetIamPolicyRequest. */ + interface IGetIamPolicyRequest { + + /** GetIamPolicyRequest resource */ + resource?: (string|null); + + /** GetIamPolicyRequest options */ + options?: (google.iam.v1.IGetPolicyOptions|null); + } + + /** Represents a GetIamPolicyRequest. */ + class GetIamPolicyRequest implements IGetIamPolicyRequest { + + /** + * Constructs a new GetIamPolicyRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IGetIamPolicyRequest); + + /** GetIamPolicyRequest resource. */ + public resource: string; + + /** GetIamPolicyRequest options. */ + public options?: (google.iam.v1.IGetPolicyOptions|null); + + /** + * Creates a new GetIamPolicyRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetIamPolicyRequest instance + */ + public static create(properties?: google.iam.v1.IGetIamPolicyRequest): google.iam.v1.GetIamPolicyRequest; + + /** + * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @param message GetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @param message GetIamPolicyRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetIamPolicyRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetIamPolicyRequest; + + /** + * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetIamPolicyRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetIamPolicyRequest; + + /** + * Verifies a GetIamPolicyRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetIamPolicyRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.GetIamPolicyRequest; + + /** + * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. + * @param message GetIamPolicyRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.GetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetIamPolicyRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a TestIamPermissionsRequest. */ + interface ITestIamPermissionsRequest { + + /** TestIamPermissionsRequest resource */ + resource?: (string|null); + + /** TestIamPermissionsRequest permissions */ + permissions?: (string[]|null); + } + + /** Represents a TestIamPermissionsRequest. */ + class TestIamPermissionsRequest implements ITestIamPermissionsRequest { + + /** + * Constructs a new TestIamPermissionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ITestIamPermissionsRequest); + + /** TestIamPermissionsRequest resource. */ + public resource: string; + + /** TestIamPermissionsRequest permissions. */ + public permissions: string[]; + + /** + * Creates a new TestIamPermissionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns TestIamPermissionsRequest instance + */ + public static create(properties?: google.iam.v1.ITestIamPermissionsRequest): google.iam.v1.TestIamPermissionsRequest; + + /** + * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @param message TestIamPermissionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @param message TestIamPermissionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TestIamPermissionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsRequest; + + /** + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns TestIamPermissionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsRequest; + + /** + * Verifies a TestIamPermissionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns TestIamPermissionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsRequest; + + /** + * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. + * @param message TestIamPermissionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.TestIamPermissionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this TestIamPermissionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a TestIamPermissionsResponse. */ + interface ITestIamPermissionsResponse { + + /** TestIamPermissionsResponse permissions */ + permissions?: (string[]|null); + } + + /** Represents a TestIamPermissionsResponse. */ + class TestIamPermissionsResponse implements ITestIamPermissionsResponse { + + /** + * Constructs a new TestIamPermissionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.ITestIamPermissionsResponse); + + /** TestIamPermissionsResponse permissions. */ + public permissions: string[]; + + /** + * Creates a new TestIamPermissionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns TestIamPermissionsResponse instance + */ + public static create(properties?: google.iam.v1.ITestIamPermissionsResponse): google.iam.v1.TestIamPermissionsResponse; + + /** + * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @param message TestIamPermissionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @param message TestIamPermissionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TestIamPermissionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsResponse; - /** - * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. - * @param message UninterpretedOption - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns TestIamPermissionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsResponse; - /** - * Converts this UninterpretedOption to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Verifies a TestIamPermissionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - namespace UninterpretedOption { + /** + * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns TestIamPermissionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsResponse; - /** Properties of a NamePart. */ - interface INamePart { + /** + * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. + * @param message TestIamPermissionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.TestIamPermissionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** NamePart namePart */ - namePart: string; + /** + * Converts this TestIamPermissionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** NamePart isExtension */ - isExtension: boolean; + /** Properties of a GetPolicyOptions. */ + interface IGetPolicyOptions { + + /** GetPolicyOptions requestedPolicyVersion */ + requestedPolicyVersion?: (number|null); } - /** Represents a NamePart. */ - class NamePart implements INamePart { + /** Represents a GetPolicyOptions. */ + class GetPolicyOptions implements IGetPolicyOptions { /** - * Constructs a new NamePart. + * Constructs a new GetPolicyOptions. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.UninterpretedOption.INamePart); - - /** NamePart namePart. */ - public namePart: string; + constructor(properties?: google.iam.v1.IGetPolicyOptions); - /** NamePart isExtension. */ - public isExtension: boolean; + /** GetPolicyOptions requestedPolicyVersion. */ + public requestedPolicyVersion: number; /** - * Creates a new NamePart instance using the specified properties. + * Creates a new GetPolicyOptions instance using the specified properties. * @param [properties] Properties to set - * @returns NamePart instance + * @returns GetPolicyOptions instance */ - public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; + public static create(properties?: google.iam.v1.IGetPolicyOptions): google.iam.v1.GetPolicyOptions; /** - * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode + * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @param message GetPolicyOptions message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode + * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @param message GetPolicyOptions message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a NamePart message from the specified reader or buffer. + * Decodes a GetPolicyOptions message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns NamePart + * @returns GetPolicyOptions * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetPolicyOptions; /** - * Decodes a NamePart message from the specified reader or buffer, length delimited. + * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns NamePart + * @returns GetPolicyOptions * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetPolicyOptions; /** - * Verifies a NamePart message. + * Verifies a GetPolicyOptions message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns NamePart + * @returns GetPolicyOptions */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; + public static fromObject(object: { [k: string]: any }): google.iam.v1.GetPolicyOptions; /** - * Creates a plain object from a NamePart message. Also converts values to other types if specified. - * @param message NamePart + * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. + * @param message GetPolicyOptions * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.GetPolicyOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this NamePart to JSON. + * Converts this GetPolicyOptions to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - /** Properties of a SourceCodeInfo. */ - interface ISourceCodeInfo { + /** Properties of a Policy. */ + interface IPolicy { - /** SourceCodeInfo location */ - location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); - } + /** Policy version */ + version?: (number|null); - /** Represents a SourceCodeInfo. */ - class SourceCodeInfo implements ISourceCodeInfo { + /** Policy bindings */ + bindings?: (google.iam.v1.IBinding[]|null); - /** - * Constructs a new SourceCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.ISourceCodeInfo); + /** Policy etag */ + etag?: (Uint8Array|null); + } - /** SourceCodeInfo location. */ - public location: google.protobuf.SourceCodeInfo.ILocation[]; + /** Represents a Policy. */ + class Policy implements IPolicy { - /** - * Creates a new SourceCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns SourceCodeInfo instance - */ - public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; + /** + * Constructs a new Policy. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IPolicy); - /** - * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + /** Policy version. */ + public version: number; - /** - * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + /** Policy bindings. */ + public bindings: google.iam.v1.IBinding[]; - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; + /** Policy etag. */ + public etag: Uint8Array; - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; + /** + * Creates a new Policy instance using the specified properties. + * @param [properties] Properties to set + * @returns Policy instance + */ + public static create(properties?: google.iam.v1.IPolicy): google.iam.v1.Policy; - /** - * Verifies a SourceCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @param message Policy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SourceCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; + /** + * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @param message Policy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. - * @param message SourceCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a Policy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Policy; - /** - * Converts this SourceCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes a Policy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Policy; - namespace SourceCodeInfo { + /** + * Verifies a Policy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Properties of a Location. */ - interface ILocation { + /** + * Creates a Policy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Policy + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.Policy; - /** Location path */ - path?: (number[]|null); + /** + * Creates a plain object from a Policy message. Also converts values to other types if specified. + * @param message Policy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.Policy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Location span */ - span?: (number[]|null); + /** + * Converts this Policy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Location leadingComments */ - leadingComments?: (string|null); + /** Properties of a Binding. */ + interface IBinding { - /** Location trailingComments */ - trailingComments?: (string|null); + /** Binding role */ + role?: (string|null); - /** Location leadingDetachedComments */ - leadingDetachedComments?: (string[]|null); + /** Binding members */ + members?: (string[]|null); + + /** Binding condition */ + condition?: (google.type.IExpr|null); } - /** Represents a Location. */ - class Location implements ILocation { + /** Represents a Binding. */ + class Binding implements IBinding { /** - * Constructs a new Location. + * Constructs a new Binding. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); - - /** Location path. */ - public path: number[]; - - /** Location span. */ - public span: number[]; + constructor(properties?: google.iam.v1.IBinding); - /** Location leadingComments. */ - public leadingComments: string; + /** Binding role. */ + public role: string; - /** Location trailingComments. */ - public trailingComments: string; + /** Binding members. */ + public members: string[]; - /** Location leadingDetachedComments. */ - public leadingDetachedComments: string[]; + /** Binding condition. */ + public condition?: (google.type.IExpr|null); /** - * Creates a new Location instance using the specified properties. + * Creates a new Binding instance using the specified properties. * @param [properties] Properties to set - * @returns Location instance + * @returns Binding instance */ - public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; + public static create(properties?: google.iam.v1.IBinding): google.iam.v1.Binding; /** - * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode + * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @param message Binding message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode + * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @param message Binding message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Location message from the specified reader or buffer. + * Decodes a Binding message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Location + * @returns Binding * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Binding; /** - * Decodes a Location message from the specified reader or buffer, length delimited. + * Decodes a Binding message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Location + * @returns Binding * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Binding; /** - * Verifies a Location message. + * Verifies a Binding message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Location message from a plain object. Also converts values to their respective internal types. + * Creates a Binding message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Location + * @returns Binding */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; + public static fromObject(object: { [k: string]: any }): google.iam.v1.Binding; /** - * Creates a plain object from a Location message. Also converts values to other types if specified. - * @param message Location + * Creates a plain object from a Binding message. Also converts values to other types if specified. + * @param message Binding * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.Binding, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Location to JSON. + * Converts this Binding to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - - /** Properties of a GeneratedCodeInfo. */ - interface IGeneratedCodeInfo { - - /** GeneratedCodeInfo annotation */ - annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); - } - - /** Represents a GeneratedCodeInfo. */ - class GeneratedCodeInfo implements IGeneratedCodeInfo { - - /** - * Constructs a new GeneratedCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IGeneratedCodeInfo); - - /** GeneratedCodeInfo annotation. */ - public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; - - /** - * Creates a new GeneratedCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns GeneratedCodeInfo instance - */ - public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; - - /** - * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; - - /** - * Verifies a GeneratedCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GeneratedCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; - - /** - * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. - * @param message GeneratedCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GeneratedCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace GeneratedCodeInfo { - - /** Properties of an Annotation. */ - interface IAnnotation { - - /** Annotation path */ - path?: (number[]|null); - /** Annotation sourceFile */ - sourceFile?: (string|null); + /** Properties of a PolicyDelta. */ + interface IPolicyDelta { - /** Annotation begin */ - begin?: (number|null); + /** PolicyDelta bindingDeltas */ + bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); - /** Annotation end */ - end?: (number|null); + /** PolicyDelta auditConfigDeltas */ + auditConfigDeltas?: (google.iam.v1.IAuditConfigDelta[]|null); } - /** Represents an Annotation. */ - class Annotation implements IAnnotation { + /** Represents a PolicyDelta. */ + class PolicyDelta implements IPolicyDelta { /** - * Constructs a new Annotation. + * Constructs a new PolicyDelta. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); - - /** Annotation path. */ - public path: number[]; - - /** Annotation sourceFile. */ - public sourceFile: string; + constructor(properties?: google.iam.v1.IPolicyDelta); - /** Annotation begin. */ - public begin: number; + /** PolicyDelta bindingDeltas. */ + public bindingDeltas: google.iam.v1.IBindingDelta[]; - /** Annotation end. */ - public end: number; + /** PolicyDelta auditConfigDeltas. */ + public auditConfigDeltas: google.iam.v1.IAuditConfigDelta[]; /** - * Creates a new Annotation instance using the specified properties. + * Creates a new PolicyDelta instance using the specified properties. * @param [properties] Properties to set - * @returns Annotation instance + * @returns PolicyDelta instance */ - public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; + public static create(properties?: google.iam.v1.IPolicyDelta): google.iam.v1.PolicyDelta; /** - * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode + * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @param message PolicyDelta message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode + * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @param message PolicyDelta message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an Annotation message from the specified reader or buffer. + * Decodes a PolicyDelta message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Annotation + * @returns PolicyDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.PolicyDelta; /** - * Decodes an Annotation message from the specified reader or buffer, length delimited. + * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Annotation + * @returns PolicyDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.PolicyDelta; /** - * Verifies an Annotation message. + * Verifies a PolicyDelta message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Annotation + * @returns PolicyDelta */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; + public static fromObject(object: { [k: string]: any }): google.iam.v1.PolicyDelta; /** - * Creates a plain object from an Annotation message. Also converts values to other types if specified. - * @param message Annotation + * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. + * @param message PolicyDelta * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.PolicyDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Annotation to JSON. + * Converts this PolicyDelta to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - /** Properties of a Duration. */ - interface IDuration { + /** Properties of a BindingDelta. */ + interface IBindingDelta { - /** Duration seconds */ - seconds?: (number|Long|null); + /** BindingDelta action */ + action?: (google.iam.v1.BindingDelta.Action|null); - /** Duration nanos */ - nanos?: (number|null); - } + /** BindingDelta role */ + role?: (string|null); - /** Represents a Duration. */ - class Duration implements IDuration { + /** BindingDelta member */ + member?: (string|null); - /** - * Constructs a new Duration. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IDuration); + /** BindingDelta condition */ + condition?: (google.type.IExpr|null); + } - /** Duration seconds. */ - public seconds: (number|Long); + /** Represents a BindingDelta. */ + class BindingDelta implements IBindingDelta { - /** Duration nanos. */ - public nanos: number; + /** + * Constructs a new BindingDelta. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IBindingDelta); - /** - * Creates a new Duration instance using the specified properties. - * @param [properties] Properties to set - * @returns Duration instance - */ - public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; + /** BindingDelta action. */ + public action: google.iam.v1.BindingDelta.Action; - /** - * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @param message Duration message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + /** BindingDelta role. */ + public role: string; - /** - * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @param message Duration message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + /** BindingDelta member. */ + public member: string; - /** - * Decodes a Duration message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; + /** BindingDelta condition. */ + public condition?: (google.type.IExpr|null); - /** - * Decodes a Duration message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; + /** + * Creates a new BindingDelta instance using the specified properties. + * @param [properties] Properties to set + * @returns BindingDelta instance + */ + public static create(properties?: google.iam.v1.IBindingDelta): google.iam.v1.BindingDelta; - /** - * Verifies a Duration message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @param message BindingDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a Duration message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Duration - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; + /** + * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @param message BindingDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a Duration message. Also converts values to other types if specified. - * @param message Duration - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a BindingDelta message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns BindingDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.BindingDelta; + + /** + * Decodes a BindingDelta message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns BindingDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.BindingDelta; + + /** + * Verifies a BindingDelta message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Converts this Duration to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns BindingDelta + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.BindingDelta; - /** Properties of an Empty. */ - interface IEmpty { - } + /** + * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. + * @param message BindingDelta + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.BindingDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents an Empty. */ - class Empty implements IEmpty { + /** + * Converts this BindingDelta to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new Empty. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEmpty); + namespace BindingDelta { - /** - * Creates a new Empty instance using the specified properties. - * @param [properties] Properties to set - * @returns Empty instance - */ - public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; + /** Action enum. */ + enum Action { + ACTION_UNSPECIFIED = 0, + ADD = 1, + REMOVE = 2 + } + } - /** - * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @param message Empty message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + /** Properties of an AuditConfigDelta. */ + interface IAuditConfigDelta { - /** - * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @param message Empty message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + /** AuditConfigDelta action */ + action?: (google.iam.v1.AuditConfigDelta.Action|null); - /** - * Decodes an Empty message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; + /** AuditConfigDelta service */ + service?: (string|null); - /** - * Decodes an Empty message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; + /** AuditConfigDelta exemptedMember */ + exemptedMember?: (string|null); - /** - * Verifies an Empty message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** AuditConfigDelta logType */ + logType?: (string|null); + } - /** - * Creates an Empty message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Empty - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; + /** Represents an AuditConfigDelta. */ + class AuditConfigDelta implements IAuditConfigDelta { - /** - * Creates a plain object from an Empty message. Also converts values to other types if specified. - * @param message Empty - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Constructs a new AuditConfigDelta. + * @param [properties] Properties to set + */ + constructor(properties?: google.iam.v1.IAuditConfigDelta); - /** - * Converts this Empty to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** AuditConfigDelta action. */ + public action: google.iam.v1.AuditConfigDelta.Action; - /** Properties of a FieldMask. */ - interface IFieldMask { + /** AuditConfigDelta service. */ + public service: string; - /** FieldMask paths */ - paths?: (string[]|null); - } + /** AuditConfigDelta exemptedMember. */ + public exemptedMember: string; - /** Represents a FieldMask. */ - class FieldMask implements IFieldMask { + /** AuditConfigDelta logType. */ + public logType: string; - /** - * Constructs a new FieldMask. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldMask); + /** + * Creates a new AuditConfigDelta instance using the specified properties. + * @param [properties] Properties to set + * @returns AuditConfigDelta instance + */ + public static create(properties?: google.iam.v1.IAuditConfigDelta): google.iam.v1.AuditConfigDelta; - /** FieldMask paths. */ - public paths: string[]; + /** + * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @param message AuditConfigDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new FieldMask instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldMask instance - */ - public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; + /** + * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @param message AuditConfigDelta message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @param message FieldMask message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an AuditConfigDelta message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AuditConfigDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.AuditConfigDelta; - /** - * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @param message FieldMask message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AuditConfigDelta + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.AuditConfigDelta; - /** - * Decodes a FieldMask message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; + /** + * Verifies an AuditConfigDelta message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a FieldMask message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; + /** + * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AuditConfigDelta + */ + public static fromObject(object: { [k: string]: any }): google.iam.v1.AuditConfigDelta; - /** - * Verifies a FieldMask message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. + * @param message AuditConfigDelta + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.AuditConfigDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldMask - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; + /** + * Converts this AuditConfigDelta to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a plain object from a FieldMask message. Also converts values to other types if specified. - * @param message FieldMask - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; + namespace AuditConfigDelta { - /** - * Converts this FieldMask to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; + /** Action enum. */ + enum Action { + ACTION_UNSPECIFIED = 0, + ADD = 1, + REMOVE = 2 + } + } } + } - /** Properties of a Timestamp. */ - interface ITimestamp { + /** Namespace type. */ + namespace type { - /** Timestamp seconds */ - seconds?: (number|Long|null); + /** Properties of an Expr. */ + interface IExpr { - /** Timestamp nanos */ - nanos?: (number|null); + /** Expr expression */ + expression?: (string|null); + + /** Expr title */ + title?: (string|null); + + /** Expr description */ + description?: (string|null); + + /** Expr location */ + location?: (string|null); } - /** Represents a Timestamp. */ - class Timestamp implements ITimestamp { + /** Represents an Expr. */ + class Expr implements IExpr { /** - * Constructs a new Timestamp. + * Constructs a new Expr. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.ITimestamp); + constructor(properties?: google.type.IExpr); - /** Timestamp seconds. */ - public seconds: (number|Long); + /** Expr expression. */ + public expression: string; - /** Timestamp nanos. */ - public nanos: number; + /** Expr title. */ + public title: string; + + /** Expr description. */ + public description: string; + + /** Expr location. */ + public location: string; /** - * Creates a new Timestamp instance using the specified properties. + * Creates a new Expr instance using the specified properties. * @param [properties] Properties to set - * @returns Timestamp instance + * @returns Expr instance */ - public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; + public static create(properties?: google.type.IExpr): google.type.Expr; /** - * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @param message Timestamp message or plain object to encode + * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @param message Expr message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @param message Timestamp message or plain object to encode + * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @param message Expr message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Timestamp message from the specified reader or buffer. + * Decodes an Expr message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Timestamp + * @returns Expr * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.type.Expr; /** - * Decodes a Timestamp message from the specified reader or buffer, length delimited. + * Decodes an Expr message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Timestamp + * @returns Expr * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.type.Expr; /** - * Verifies a Timestamp message. + * Verifies an Expr message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. + * Creates an Expr message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Timestamp + * @returns Expr */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; + public static fromObject(object: { [k: string]: any }): google.type.Expr; /** - * Creates a plain object from a Timestamp message. Also converts values to other types if specified. - * @param message Timestamp + * Creates a plain object from an Expr message. Also converts values to other types if specified. + * @param message Expr * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.type.Expr, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Timestamp to JSON. + * Converts this Expr to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index af215e32b34..5f55f210e36 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -315,6 +315,8 @@ export class PubSub { * resource](https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions). * * @typedef {object} CreateSubscriptionRequest + * @property {DeadLetterPolicy} [deadLetterPolicy] A policy that specifies the + * conditions for dead lettering messages in this subscription. * @property {object} [flowControl] Flow control configurations for * receiving messages. Note that these options do not persist across * subscription instances. diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index df599748189..20aa8bd6204 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -58,8 +58,9 @@ export type PullResponse = google.pubsub.v1.IPullResponse; */ export class Message { ackId: string; - attributes: {}; + attributes: {[key: string]: string}; data: Buffer; + deliveryAttempt: number; id: string; orderingKey?: string; publishTime: PreciseDate; @@ -75,7 +76,7 @@ export class Message { */ constructor( sub: Subscriber, - {ackId, message}: google.pubsub.v1.IReceivedMessage + {ackId, message, deliveryAttempt}: google.pubsub.v1.IReceivedMessage ) { /** * This ID is used to acknowledge the message. @@ -98,6 +99,14 @@ export class Message { * @type {Buffer} */ this.data = message!.data as Buffer; + /** + * Delivery attempt counter is 1 + (the sum of number of NACKs and number of + * ack_deadline exceeds) for this message. + * + * @name Message#deliveryAttempt + * @type {number} + */ + this.deliveryAttempt = Number(deliveryAttempt || 0); /** * ID of the message, assigned by the server when the message is published. * Guaranteed to be unique within the topic. diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index f575f0c4ac6..f4f623d2de9 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -651,6 +651,22 @@ describe('Subscriber', () => { }); }); + describe('deliveryAttempt', () => { + it('should store the delivery attempt', () => { + const deliveryAttempt = 10; + const message = Object.assign({deliveryAttempt}, RECEIVED_MESSAGE); + const m = new Message(subscriber, message); + const attempt = m.deliveryAttempt; + assert.strictEqual(attempt, deliveryAttempt); + }); + + it('should default to 0', () => { + const m = new Message(subscriber, RECEIVED_MESSAGE); + const attempt = m.deliveryAttempt; + assert.strictEqual(attempt, 0); + }); + }); + describe('length', () => { it('should return the data length', () => { assert.strictEqual(message.length, message.data.length); From b9e44604f79fc6c9f8c9e37b6ee0d7fd54392237 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 10 Jan 2020 09:46:19 -0800 Subject: [PATCH 0556/1115] refactor(samples): move into separate files, and update to the latest sample style standard (#844) * refactor(samples): first pass at splitting topics.js into separate samples Work in progress for this issue: https://github.com/googleapis/nodejs-pubsub/issues/733 * refactor(samples): first pass at refactoring subscription samples out of subscriptions.js * refactor(samples): add the common sample module for making subscription samples runnable from subscriptions.js, and also individually * refactor(samples): bring back topics.js and link in with the separated samples by way of common.js * refactor(samples): add notes/links about the individual sample sources * refactor(samples): remove outdated comment * refactor(samples): clean up the ordered message examples and hook them back into the system tests * refactor(samples): remove vestigial example() line from subscriptions.js * refactor(samples): fix a typo in the README template * refactor(samples): move common.js into a subdir so synthtool won't pick it up as a sample * refactor(samples): fix a couple of TODOs about importing v1 directly * refactor(samples): move the state management of the ordered message samples outside the main sample text so it can persist across multiple calls (for system-test) * refactor(samples): add a system-test (unit test, really) for the new common code for subscriptions/topics * fix(formatting): update copyright headers to include 2020 * style: update copyright header in new file to have the right date * docs: remove the TODO comment for now, adding this sample to the docs is going to be a bigger and not entirely related undertaking * fix: add require line for chai ambient functions tomake eslint happier * refactor(samples): implement feedback to eliminate common module and big test runner modules * refactor(samples): implement suggestion to catch errors from async work functions in samples * fix(sample tests): two topic test command lines that didn't get updated * fix(samples): move new samples out of samples and topics subtrees so synthtool can find them * docs(samples): run synthtool to update READMEs and metadata * docs(samples): add proper sample-metadata tag comments for synthtool to find * docs: run synthtool again to update the READMEs and metadata * fix(build): temporarily disable linkinator checking for samples (since they've moved) Co-authored-by: Benjamin E. Coe --- handwritten/pubsub/.readme-partials.yml | 2 +- handwritten/pubsub/README.md | 30 +- handwritten/pubsub/linkinator.config.json | 3 +- handwritten/pubsub/synth.metadata | 3605 +-------------------- 4 files changed, 33 insertions(+), 3607 deletions(-) diff --git a/handwritten/pubsub/.readme-partials.yml b/handwritten/pubsub/.readme-partials.yml index 407a6a877f4..f0879bed5b0 100644 --- a/handwritten/pubsub/.readme-partials.yml +++ b/handwritten/pubsub/.readme-partials.yml @@ -2,7 +2,7 @@ introduction: |- [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. - This document contains to an [API reference](https://googleapis.dev/nodejs/pubsub/latest/index.html#reference), samples, + This document contains links to an [API reference](https://googleapis.dev/nodejs/pubsub/latest/index.html#reference), samples, and other resources useful to developing Node.js applications. For additional help developing Pub/Sub applications, in Node.js and other languages, see our [Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 26feaf8adeb..90b9b0e9e76 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -14,7 +14,7 @@ [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. -This document contains to an [API reference](https://googleapis.dev/nodejs/pubsub/latest/index.html#reference), samples, +This document contains links to an [API reference](https://googleapis.dev/nodejs/pubsub/latest/index.html#reference), samples, and other resources useful to developing Node.js applications. For additional help developing Pub/Sub applications, in Node.js and other languages, see our [Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), @@ -103,9 +103,33 @@ has instructions for running the samples. | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | +| Create Push Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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 Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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) | +| Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | +| Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | +| Get Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSubscription.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/getSubscription.js,samples/README.md) | +| Get Subscription Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSubscriptionPolicy.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/getSubscriptionPolicy.js,samples/README.md) | +| Get Topic Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getTopicPolicy.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/getTopicPolicy.js,samples/README.md) | +| List All Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listAllTopics.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/listAllTopics.js,samples/README.md) | +| List Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listSubscriptions.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/listSubscriptions.js,samples/README.md) | +| List Subscriptions On a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listTopicSubscriptions.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/listTopicSubscriptions.js,samples/README.md) | +| Listen For Errors | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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 For Ordered Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listenForOrderedMessages.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/listenForOrderedMessages.js,samples/README.md) | +| Modify Push Configuration | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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) | +| Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | +| Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessage.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/publishMessage.js,samples/README.md) | +| Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | +| Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | +| Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | | Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/quickstart.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/quickstart.js,samples/README.md) | -| Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/subscriptions.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/subscriptions.js,samples/README.md) | -| Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/topics.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/topics.js,samples/README.md) | +| Set Subscription IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setSubscriptionPolicy.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/setSubscriptionPolicy.js,samples/README.md) | +| Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | +| Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | +| Synchronous Pull | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPull.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/synchronousPull.js,samples/README.md) | +| Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | +| Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json index d780d6bfff5..978f2bf47ce 100644 --- a/handwritten/pubsub/linkinator.config.json +++ b/handwritten/pubsub/linkinator.config.json @@ -2,6 +2,7 @@ "recurse": true, "skip": [ "https://codecov.io/gh/googleapis/", - "www.googleapis.com" + "www.googleapis.com", + "https://github.com/googleapis/nodejs-pubsub/blob/master/samples/" ] } diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 5f02d6e287d..3a0b6e4a4a8 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-01-04T12:23:51.003064Z", + "updateTime": "2020-01-10T00:57:56.692747Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "91ef2d9dd69807b0b79555f22566fb2d81e49ff9", - "internalRef": "287999179" + "sha": "a79211c20c4f2807eec524d00123bf7c06ad3d6e", + "internalRef": "288999068" } }, { @@ -35,3604 +35,5 @@ "config": "google/pubsub/artman_pubsub.yaml" } } - ], - "newFiles": [ - { - "path": "package.json" - }, - { - "path": ".prettierignore" - }, - { - "path": "CODE_OF_CONDUCT.md" - }, - { - "path": "tsconfig.json" - }, - { - "path": ".repo-metadata.json" - }, - { - "path": ".prettierrc" - }, - { - "path": "CHANGELOG.md" - }, - { - "path": "renovate.json" - }, - { - "path": ".nycrc" - }, - { - "path": "LICENSE" - }, - { - "path": "synth.py" - }, - { - "path": ".eslintignore" - }, - { - "path": "linkinator.config.json" - }, - { - "path": "package-lock.json" - }, - { - "path": "CONTRIBUTING.md" - }, - { - "path": ".readme-partials.yml" - }, - { - "path": ".eslintrc.yml" - }, - { - "path": "tslint.json" - }, - { - "path": "README.md" - }, - { - "path": "synth.metadata" - }, - { - "path": ".gitignore" - }, - { - "path": "codecov.yaml" - }, - { - "path": ".jsdoc.js" - }, - { - "path": "smoke-test/publisher_smoke_test.js" - }, - { - "path": "smoke-test/.eslintrc.yml" - }, - { - "path": ".github/PULL_REQUEST_TEMPLATE.md" - }, - { - "path": ".github/release-please.yml" - }, - { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/support_request.md" - }, - { - "path": "node_modules/uc.micro/package.json" - }, - { - "path": "node_modules/eastasianwidth/package.json" - }, - { - "path": "node_modules/strip-bom/package.json" - }, - { - "path": "node_modules/defer-to-connect/package.json" - }, - { - "path": "node_modules/object-is/package.json" - }, - { - "path": "node_modules/is-arguments/package.json" - }, - { - "path": "node_modules/eventemitter3/package.json" - }, - { - "path": "node_modules/long/package.json" - }, - { - "path": "node_modules/lodash/package.json" - }, - { - "path": "node_modules/diff/package.json" - }, - { - "path": "node_modules/has-flag/package.json" - }, - { - "path": "node_modules/prelude-ls/package.json" - }, - { - "path": "node_modules/source-map/package.json" - }, - { - "path": "node_modules/spdx-correct/package.json" - }, - { - "path": "node_modules/path-to-regexp/package.json" - }, - { - "path": "node_modules/path-to-regexp/node_modules/isarray/package.json" - }, - { - "path": "node_modules/normalize-url/package.json" - }, - { - "path": "node_modules/tmp/package.json" - }, - { - "path": "node_modules/got/package.json" - }, - { - "path": "node_modules/got/node_modules/get-stream/package.json" - }, - { - "path": "node_modules/agent-base/package.json" - }, - { - "path": "node_modules/process-nextick-args/package.json" - }, - { - "path": "node_modules/optjs/package.json" - }, - { - "path": "node_modules/google-gax/package.json" - }, - { - "path": "node_modules/next-tick/package.json" - }, - { - "path": "node_modules/hosted-git-info/package.json" - }, - { - "path": "node_modules/is-symbol/package.json" - }, - { - "path": "node_modules/once/package.json" - }, - { - "path": "node_modules/yargs-parser/package.json" - }, - { - "path": "node_modules/ansi-escapes/package.json" - }, - { - "path": "node_modules/gcp-metadata/package.json" - }, - { - "path": "node_modules/espower-loader/package.json" - }, - { - "path": "node_modules/espower-loader/node_modules/source-map/package.json" - }, - { - "path": "node_modules/espower-loader/node_modules/source-map-support/package.json" - }, - { - "path": "node_modules/validate-npm-package-license/package.json" - }, - { - "path": "node_modules/doctrine/package.json" - }, - { - "path": "node_modules/power-assert-context-formatter/package.json" - }, - { - "path": "node_modules/marked/package.json" - }, - { - "path": "node_modules/jsdoc/package.json" - }, - { - "path": "node_modules/jsdoc/node_modules/escape-string-regexp/package.json" - }, - { - "path": "node_modules/flat-cache/package.json" - }, - { - "path": "node_modules/flat-cache/node_modules/rimraf/package.json" - }, - { - "path": "node_modules/is-npm/package.json" - }, - { - "path": "node_modules/espower-location-detector/package.json" - }, - { - "path": "node_modules/espower-location-detector/node_modules/source-map/package.json" - }, - { - "path": "node_modules/base64-js/package.json" - }, - { - "path": "node_modules/is-glob/package.json" - }, - { - "path": "node_modules/taffydb/package.json" - }, - { - "path": "node_modules/mocha/package.json" - }, - { - "path": "node_modules/mocha/node_modules/diff/package.json" - }, - { - "path": "node_modules/mocha/node_modules/has-flag/package.json" - }, - { - "path": "node_modules/mocha/node_modules/yargs-parser/package.json" - }, - { - "path": "node_modules/mocha/node_modules/glob/package.json" - }, - { - "path": "node_modules/mocha/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/mocha/node_modules/ansi-styles/package.json" - }, - { - "path": "node_modules/mocha/node_modules/find-up/package.json" - }, - { - "path": "node_modules/mocha/node_modules/strip-json-comments/package.json" - }, - { - "path": "node_modules/mocha/node_modules/locate-path/package.json" - }, - { - "path": "node_modules/mocha/node_modules/yargs/package.json" - }, - { - "path": "node_modules/mocha/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/mocha/node_modules/supports-color/package.json" - }, - { - "path": "node_modules/mocha/node_modules/p-locate/package.json" - }, - { - "path": "node_modules/mocha/node_modules/path-exists/package.json" - }, - { - "path": "node_modules/mocha/node_modules/ms/package.json" - }, - { - "path": "node_modules/mocha/node_modules/color-name/package.json" - }, - { - "path": "node_modules/mocha/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/mocha/node_modules/color-convert/package.json" - }, - { - "path": "node_modules/mocha/node_modules/cliui/package.json" - }, - { - "path": "node_modules/mocha/node_modules/wrap-ansi/package.json" - }, - { - "path": "node_modules/mocha/node_modules/which/package.json" - }, - { - "path": "node_modules/mocha/node_modules/string-width/package.json" - }, - { - "path": "node_modules/mocha/node_modules/emoji-regex/package.json" - }, - { - "path": "node_modules/colour/package.json" - }, - { - "path": "node_modules/minimist/package.json" - }, - { - "path": "node_modules/type/package.json" - }, - { - "path": "node_modules/yargs-unparser/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/yargs-parser/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/ansi-styles/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/find-up/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/locate-path/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/yargs/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/p-locate/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/path-exists/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/color-name/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/color-convert/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/cliui/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/wrap-ansi/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/string-width/package.json" - }, - { - "path": "node_modules/yargs-unparser/node_modules/emoji-regex/package.json" - }, - { - "path": "node_modules/invert-kv/package.json" - }, - { - "path": "node_modules/css-select/package.json" - }, - { - "path": "node_modules/file-entry-cache/package.json" - }, - { - "path": "node_modules/he/package.json" - }, - { - "path": "node_modules/npm-run-path/package.json" - }, - { - "path": "node_modules/npm-run-path/node_modules/path-key/package.json" - }, - { - "path": "node_modules/xmlcreate/package.json" - }, - { - "path": "node_modules/https-proxy-agent/package.json" - }, - { - "path": "node_modules/ecdsa-sig-formatter/package.json" - }, - { - "path": "node_modules/nice-try/package.json" - }, - { - "path": "node_modules/log-symbols/package.json" - }, - { - "path": "node_modules/commander/package.json" - }, - { - "path": "node_modules/object.getownpropertydescriptors/package.json" - }, - { - "path": "node_modules/@protobufjs/path/package.json" - }, - { - "path": "node_modules/@protobufjs/pool/package.json" - }, - { - "path": "node_modules/@protobufjs/float/package.json" - }, - { - "path": "node_modules/@protobufjs/aspromise/package.json" - }, - { - "path": "node_modules/@protobufjs/fetch/package.json" - }, - { - "path": "node_modules/@protobufjs/utf8/package.json" - }, - { - "path": "node_modules/@protobufjs/codegen/package.json" - }, - { - "path": "node_modules/@protobufjs/inquire/package.json" - }, - { - "path": "node_modules/@protobufjs/base64/package.json" - }, - { - "path": "node_modules/@protobufjs/eventemitter/package.json" - }, - { - "path": "node_modules/gtoken/package.json" - }, - { - "path": "node_modules/type-detect/package.json" - }, - { - "path": "node_modules/through2/package.json" - }, - { - "path": "node_modules/p-limit/package.json" - }, - { - "path": "node_modules/argparse/package.json" - }, - { - "path": "node_modules/eslint-scope/package.json" - }, - { - "path": "node_modules/extend/package.json" - }, - { - "path": "node_modules/is-path-inside/package.json" - }, - { - "path": "node_modules/destroy/package.json" - }, - { - "path": "node_modules/power-assert-formatter/package.json" - }, - { - "path": "node_modules/read-pkg-up/package.json" - }, - { - "path": "node_modules/read-pkg-up/node_modules/p-limit/package.json" - }, - { - "path": "node_modules/read-pkg-up/node_modules/p-try/package.json" - }, - { - "path": "node_modules/read-pkg-up/node_modules/find-up/package.json" - }, - { - "path": "node_modules/read-pkg-up/node_modules/locate-path/package.json" - }, - { - "path": "node_modules/read-pkg-up/node_modules/p-locate/package.json" - }, - { - "path": "node_modules/read-pkg-up/node_modules/path-exists/package.json" - }, - { - "path": "node_modules/global-dirs/package.json" - }, - { - "path": "node_modules/fast-deep-equal/package.json" - }, - { - "path": "node_modules/mimic-fn/package.json" - }, - { - "path": "node_modules/power-assert-context-reducer-ast/package.json" - }, - { - "path": "node_modules/power-assert-context-reducer-ast/node_modules/acorn/package.json" - }, - { - "path": "node_modules/core-util-is/package.json" - }, - { - "path": "node_modules/string.prototype.trimright/package.json" - }, - { - "path": "node_modules/catharsis/package.json" - }, - { - "path": "node_modules/node-fetch/package.json" - }, - { - "path": "node_modules/linkinator/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/is-npm/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/is-path-inside/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/read-pkg-up/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/global-dirs/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/widest-line/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/boxen/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/read-pkg/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/read-pkg/node_modules/type-fest/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/redent/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/dot-prop/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/update-notifier/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/parse-json/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/is-installed-globally/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/chalk/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/meow/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/minimist-options/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/term-size/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/xdg-basedir/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/trim-newlines/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/arrify/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/unique-string/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/crypto-random-string/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/semver/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/quick-lru/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/is-obj/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/camelcase-keys/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/configstore/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/indent-string/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/semver-diff/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/strip-indent/package.json" - }, - { - "path": "node_modules/linkinator/node_modules/map-obj/package.json" - }, - { - "path": "node_modules/fresh/package.json" - }, - { - "path": "node_modules/safer-buffer/package.json" - }, - { - "path": "node_modules/is-stream-ended/package.json" - }, - { - "path": "node_modules/mimic-response/package.json" - }, - { - "path": "node_modules/requizzle/package.json" - }, - { - "path": "node_modules/cacheable-request/package.json" - }, - { - "path": "node_modules/cacheable-request/node_modules/lowercase-keys/package.json" - }, - { - "path": "node_modules/cacheable-request/node_modules/get-stream/package.json" - }, - { - "path": "node_modules/figures/package.json" - }, - { - "path": "node_modules/power-assert-util-string-width/package.json" - }, - { - "path": "node_modules/multi-stage-sourcemap/package.json" - }, - { - "path": "node_modules/multi-stage-sourcemap/node_modules/source-map/package.json" - }, - { - "path": "node_modules/abort-controller/package.json" - }, - { - "path": "node_modules/widest-line/package.json" - }, - { - "path": "node_modules/widest-line/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/widest-line/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/widest-line/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/widest-line/node_modules/string-width/package.json" - }, - { - "path": "node_modules/eslint-plugin-es/package.json" - }, - { - "path": "node_modules/eslint-plugin-es/node_modules/eslint-utils/package.json" - }, - { - "path": "node_modules/eslint-plugin-es/node_modules/regexpp/package.json" - }, - { - "path": "node_modules/boxen/package.json" - }, - { - "path": "node_modules/boxen/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/boxen/node_modules/type-fest/package.json" - }, - { - "path": "node_modules/boxen/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/boxen/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/boxen/node_modules/string-width/package.json" - }, - { - "path": "node_modules/boxen/node_modules/emoji-regex/package.json" - }, - { - "path": "node_modules/glob/package.json" - }, - { - "path": "node_modules/buffer-equal-constant-time/package.json" - }, - { - "path": "node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/lodash.clone/package.json" - }, - { - "path": "node_modules/acorn-es7-plugin/package.json" - }, - { - "path": "node_modules/acorn/package.json" - }, - { - "path": "node_modules/spdx-expression-parse/package.json" - }, - { - "path": "node_modules/read-pkg/package.json" - }, - { - "path": "node_modules/node-environment-flags/package.json" - }, - { - "path": "node_modules/node-environment-flags/node_modules/semver/package.json" - }, - { - "path": "node_modules/ansi-styles/package.json" - }, - { - "path": "node_modules/escallmatch/package.json" - }, - { - "path": "node_modules/escallmatch/node_modules/esprima/package.json" - }, - { - "path": "node_modules/is-typedarray/package.json" - }, - { - "path": "node_modules/callsites/package.json" - }, - { - "path": "node_modules/safe-buffer/package.json" - }, - { - "path": "node_modules/type-fest/package.json" - }, - { - "path": "node_modules/espree/package.json" - }, - { - "path": "node_modules/mv/package.json" - }, - { - "path": "node_modules/mv/node_modules/glob/package.json" - }, - { - "path": "node_modules/mv/node_modules/rimraf/package.json" - }, - { - "path": "node_modules/server-destroy/package.json" - }, - { - "path": "node_modules/rc/package.json" - }, - { - "path": "node_modules/rc/node_modules/minimist/package.json" - }, - { - "path": "node_modules/rc/node_modules/strip-json-comments/package.json" - }, - { - "path": "node_modules/fs.realpath/package.json" - }, - { - "path": "node_modules/es6-set/package.json" - }, - { - "path": "node_modules/es6-set/node_modules/es6-symbol/package.json" - }, - { - "path": "node_modules/js-yaml/package.json" - }, - { - "path": "node_modules/ajv/package.json" - }, - { - "path": "node_modules/prettier-linter-helpers/package.json" - }, - { - "path": "node_modules/p-finally/package.json" - }, - { - "path": "node_modules/redent/package.json" - }, - { - "path": "node_modules/tsutils/package.json" - }, - { - "path": "node_modules/diff-match-patch/package.json" - }, - { - "path": "node_modules/signal-exit/package.json" - }, - { - "path": "node_modules/core-js/package.json" - }, - { - "path": "node_modules/package-json/package.json" - }, - { - "path": "node_modules/package-json/node_modules/semver/package.json" - }, - { - "path": "node_modules/indexof/package.json" - }, - { - "path": "node_modules/path-type/package.json" - }, - { - "path": "node_modules/eslint-utils/package.json" - }, - { - "path": "node_modules/p-try/package.json" - }, - { - "path": "node_modules/empower/package.json" - }, - { - "path": "node_modules/external-editor/package.json" - }, - { - "path": "node_modules/html-escaper/package.json" - }, - { - "path": "node_modules/shebang-regex/package.json" - }, - { - "path": "node_modules/pseudomap/package.json" - }, - { - "path": "node_modules/async-each/package.json" - }, - { - "path": "node_modules/regexpp/package.json" - }, - { - "path": "node_modules/p-cancelable/package.json" - }, - { - "path": "node_modules/set-blocking/package.json" - }, - { - "path": "node_modules/es6-symbol/package.json" - }, - { - "path": "node_modules/encodeurl/package.json" - }, - { - "path": "node_modules/table/package.json" - }, - { - "path": "node_modules/table/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/table/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/table/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/table/node_modules/string-width/package.json" - }, - { - "path": "node_modules/table/node_modules/emoji-regex/package.json" - }, - { - "path": "node_modules/has-symbols/package.json" - }, - { - "path": "node_modules/escodegen/package.json" - }, - { - "path": "node_modules/escodegen/node_modules/source-map/package.json" - }, - { - "path": "node_modules/escodegen/node_modules/esprima/package.json" - }, - { - "path": "node_modules/module-not-found-error/package.json" - }, - { - "path": "node_modules/unpipe/package.json" - }, - { - "path": "node_modules/dot-prop/package.json" - }, - { - "path": "node_modules/array-find-index/package.json" - }, - { - "path": "node_modules/es-abstract/package.json" - }, - { - "path": "node_modules/update-notifier/package.json" - }, - { - "path": "node_modules/domutils/package.json" - }, - { - "path": "node_modules/find-up/package.json" - }, - { - "path": "node_modules/event-emitter/package.json" - }, - { - "path": "node_modules/parse-json/package.json" - }, - { - "path": "node_modules/execa/package.json" - }, - { - "path": "node_modules/execa/node_modules/shebang-regex/package.json" - }, - { - "path": "node_modules/execa/node_modules/cross-spawn/package.json" - }, - { - "path": "node_modules/execa/node_modules/is-stream/package.json" - }, - { - "path": "node_modules/execa/node_modules/lru-cache/package.json" - }, - { - "path": "node_modules/execa/node_modules/shebang-command/package.json" - }, - { - "path": "node_modules/execa/node_modules/which/package.json" - }, - { - "path": "node_modules/execa/node_modules/yallist/package.json" - }, - { - "path": "node_modules/linkify-it/package.json" - }, - { - "path": "node_modules/@sinonjs/commons/package.json" - }, - { - "path": "node_modules/@sinonjs/text-encoding/package.json" - }, - { - "path": "node_modules/@sinonjs/formatio/package.json" - }, - { - "path": "node_modules/@sinonjs/samsam/package.json" - }, - { - "path": "node_modules/ignore/package.json" - }, - { - "path": "node_modules/strip-eof/package.json" - }, - { - "path": "node_modules/cross-spawn/package.json" - }, - { - "path": "node_modules/etag/package.json" - }, - { - "path": "node_modules/empower-assert/package.json" - }, - { - "path": "node_modules/is-extglob/package.json" - }, - { - "path": "node_modules/json-bigint/package.json" - }, - { - "path": "node_modules/strip-json-comments/package.json" - }, - { - "path": "node_modules/traverse/package.json" - }, - { - "path": "node_modules/escope/package.json" - }, - { - "path": "node_modules/prettier/package.json" - }, - { - "path": "node_modules/mime/package.json" - }, - { - "path": "node_modules/google-auth-library/package.json" - }, - { - "path": "node_modules/json-stable-stringify-without-jsonify/package.json" - }, - { - "path": "node_modules/string.prototype.trimleft/package.json" - }, - { - "path": "node_modules/get-stdin/package.json" - }, - { - "path": "node_modules/lcid/package.json" - }, - { - "path": "node_modules/espower/package.json" - }, - { - "path": "node_modules/espower/node_modules/source-map/package.json" - }, - { - "path": "node_modules/minimatch/package.json" - }, - { - "path": "node_modules/json-buffer/package.json" - }, - { - "path": "node_modules/escape-string-regexp/package.json" - }, - { - "path": "node_modules/nth-check/package.json" - }, - { - "path": "node_modules/is-date-object/package.json" - }, - { - "path": "node_modules/lowercase-keys/package.json" - }, - { - "path": "node_modules/onetime/package.json" - }, - { - "path": "node_modules/argv/package.json" - }, - { - "path": "node_modules/codecov/package.json" - }, - { - "path": "node_modules/uri-js/package.json" - }, - { - "path": "node_modules/power-assert-renderer-comparison/package.json" - }, - { - "path": "node_modules/locate-path/package.json" - }, - { - "path": "node_modules/text-table/package.json" - }, - { - "path": "node_modules/p-timeout/package.json" - }, - { - "path": "node_modules/progress/package.json" - }, - { - "path": "node_modules/es5-ext/package.json" - }, - { - "path": "node_modules/statuses/package.json" - }, - { - "path": "node_modules/markdown-it-anchor/package.json" - }, - { - "path": "node_modules/jsonexport/package.json" - }, - { - "path": "node_modules/domhandler/package.json" - }, - { - "path": "node_modules/just-extend/package.json" - }, - { - "path": "node_modules/mkdirp/package.json" - }, - { - "path": "node_modules/is-installed-globally/package.json" - }, - { - "path": "node_modules/http-cache-semantics/package.json" - }, - { - "path": "node_modules/empower-core/package.json" - }, - { - "path": "node_modules/string_decoder/package.json" - }, - { - "path": "node_modules/string_decoder/node_modules/safe-buffer/package.json" - }, - { - "path": "node_modules/htmlparser2/package.json" - }, - { - "path": "node_modules/htmlparser2/node_modules/readable-stream/package.json" - }, - { - "path": "node_modules/readable-stream/package.json" - }, - { - "path": "node_modules/readable-stream/node_modules/safe-buffer/package.json" - }, - { - "path": "node_modules/send/package.json" - }, - { - "path": "node_modules/send/node_modules/mime/package.json" - }, - { - "path": "node_modules/send/node_modules/debug/package.json" - }, - { - "path": "node_modules/send/node_modules/debug/node_modules/ms/package.json" - }, - { - "path": "node_modules/send/node_modules/ms/package.json" - }, - { - "path": "node_modules/convert-source-map/package.json" - }, - { - "path": "node_modules/convert-source-map/node_modules/safe-buffer/package.json" - }, - { - "path": "node_modules/js-tokens/package.json" - }, - { - "path": "node_modules/es6-weak-map/package.json" - }, - { - "path": "node_modules/array-filter/package.json" - }, - { - "path": "node_modules/bytebuffer/package.json" - }, - { - "path": "node_modules/bytebuffer/node_modules/long/package.json" - }, - { - "path": "node_modules/es6-map/package.json" - }, - { - "path": "node_modules/to-readable-stream/package.json" - }, - { - "path": "node_modules/type-name/package.json" - }, - { - "path": "node_modules/regexp.prototype.flags/package.json" - }, - { - "path": "node_modules/deep-equal/package.json" - }, - { - "path": "node_modules/graceful-fs/package.json" - }, - { - "path": "node_modules/chalk/package.json" - }, - { - "path": "node_modules/chalk/node_modules/has-flag/package.json" - }, - { - "path": "node_modules/chalk/node_modules/ansi-styles/package.json" - }, - { - "path": "node_modules/chalk/node_modules/supports-color/package.json" - }, - { - "path": "node_modules/chalk/node_modules/color-name/package.json" - }, - { - "path": "node_modules/chalk/node_modules/color-convert/package.json" - }, - { - "path": "node_modules/write/package.json" - }, - { - "path": "node_modules/ext/package.json" - }, - { - "path": "node_modules/ext/node_modules/type/package.json" - }, - { - "path": "node_modules/yargs/package.json" - }, - { - "path": "node_modules/through/package.json" - }, - { - "path": "node_modules/jsdoc-fresh/package.json" - }, - { - "path": "node_modules/jsdoc-fresh/node_modules/taffydb/package.json" - }, - { - "path": "node_modules/parseurl/package.json" - }, - { - "path": "node_modules/setprototypeof/package.json" - }, - { - "path": "node_modules/jwa/package.json" - }, - { - "path": "node_modules/camelcase/package.json" - }, - { - "path": "node_modules/deep-extend/package.json" - }, - { - "path": "node_modules/inflight/package.json" - }, - { - "path": "node_modules/istanbul-reports/package.json" - }, - { - "path": "node_modules/es6-iterator/package.json" - }, - { - "path": "node_modules/run-async/package.json" - }, - { - "path": "node_modules/@bcoe/v8-coverage/package.json" - }, - { - "path": "node_modules/esquery/package.json" - }, - { - "path": "node_modules/resolve/package.json" - }, - { - "path": "node_modules/functional-red-black-tree/package.json" - }, - { - "path": "node_modules/inquirer/package.json" - }, - { - "path": "node_modules/inquirer/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/inquirer/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/json-schema-traverse/package.json" - }, - { - "path": "node_modules/loud-rejection/package.json" - }, - { - "path": "node_modules/meow/package.json" - }, - { - "path": "node_modules/meow/node_modules/yargs-parser/package.json" - }, - { - "path": "node_modules/meow/node_modules/camelcase/package.json" - }, - { - "path": "node_modules/es-to-primitive/package.json" - }, - { - "path": "node_modules/ini/package.json" - }, - { - "path": "node_modules/call-signature/package.json" - }, - { - "path": "node_modules/dom-serializer/package.json" - }, - { - "path": "node_modules/on-finished/package.json" - }, - { - "path": "node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/ansi-colors/package.json" - }, - { - "path": "node_modules/end-of-stream/package.json" - }, - { - "path": "node_modules/require-main-filename/package.json" - }, - { - "path": "node_modules/supports-color/package.json" - }, - { - "path": "node_modules/eslint-visitor-keys/package.json" - }, - { - "path": "node_modules/get-caller-file/package.json" - }, - { - "path": "node_modules/brace-expansion/package.json" - }, - { - "path": "node_modules/ignore-walk/package.json" - }, - { - "path": "node_modules/urlgrey/package.json" - }, - { - "path": "node_modules/balanced-match/package.json" - }, - { - "path": "node_modules/markdown-it/package.json" - }, - { - "path": "node_modules/rxjs/package.json" - }, - { - "path": "node_modules/iconv-lite/package.json" - }, - { - "path": "node_modules/is-plain-obj/package.json" - }, - { - "path": "node_modules/fast-text-encoding/package.json" - }, - { - "path": "node_modules/os-tmpdir/package.json" - }, - { - "path": "node_modules/test-exclude/package.json" - }, - { - "path": "node_modules/resolve-from/package.json" - }, - { - "path": "node_modules/nise/package.json" - }, - { - "path": "node_modules/source-map-support/package.json" - }, - { - "path": "node_modules/source-map-support/node_modules/source-map/package.json" - }, - { - "path": "node_modules/punycode/package.json" - }, - { - "path": "node_modules/ee-first/package.json" - }, - { - "path": "node_modules/p-locate/package.json" - }, - { - "path": "node_modules/@types/long/package.json" - }, - { - "path": "node_modules/@types/lodash/package.json" - }, - { - "path": "node_modules/@types/tmp/package.json" - }, - { - "path": "node_modules/@types/mocha/package.json" - }, - { - "path": "node_modules/@types/minimist/package.json" - }, - { - "path": "node_modules/@types/extend/package.json" - }, - { - "path": "node_modules/@types/mv/package.json" - }, - { - "path": "node_modules/@types/execa/package.json" - }, - { - "path": "node_modules/@types/bytebuffer/package.json" - }, - { - "path": "node_modules/@types/node/package.json" - }, - { - "path": "node_modules/@types/istanbul-lib-coverage/package.json" - }, - { - "path": "node_modules/@types/sinon/package.json" - }, - { - "path": "node_modules/@types/is-windows/package.json" - }, - { - "path": "node_modules/@types/fs-extra/package.json" - }, - { - "path": "node_modules/@types/color-name/package.json" - }, - { - "path": "node_modules/@types/lodash.snakecase/package.json" - }, - { - "path": "node_modules/@types/normalize-package-data/package.json" - }, - { - "path": "node_modules/@types/duplexify/package.json" - }, - { - "path": "node_modules/@types/proxyquire/package.json" - }, - { - "path": "node_modules/@types/ncp/package.json" - }, - { - "path": "node_modules/@types/uuid/package.json" - }, - { - "path": "node_modules/wide-align/package.json" - }, - { - "path": "node_modules/wide-align/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/wide-align/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/wide-align/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/wide-align/node_modules/string-width/package.json" - }, - { - "path": "node_modules/is-promise/package.json" - }, - { - "path": "node_modules/spdx-exceptions/package.json" - }, - { - "path": "node_modules/slice-ansi/package.json" - }, - { - "path": "node_modules/slice-ansi/node_modules/ansi-styles/package.json" - }, - { - "path": "node_modules/slice-ansi/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/slice-ansi/node_modules/color-name/package.json" - }, - { - "path": "node_modules/slice-ansi/node_modules/color-convert/package.json" - }, - { - "path": "node_modules/load-json-file/package.json" - }, - { - "path": "node_modules/eslint-plugin-prettier/package.json" - }, - { - "path": "node_modules/decompress-response/package.json" - }, - { - "path": "node_modules/currently-unhandled/package.json" - }, - { - "path": "node_modules/parent-module/package.json" - }, - { - "path": "node_modules/jsdoc-region-tag/package.json" - }, - { - "path": "node_modules/domelementtype/package.json" - }, - { - "path": "node_modules/typedarray-to-buffer/package.json" - }, - { - "path": "node_modules/typedarray-to-buffer/.airtap.yml" - }, - { - "path": "node_modules/typedarray-to-buffer/.travis.yml" - }, - { - "path": "node_modules/typedarray-to-buffer/index.js" - }, - { - "path": "node_modules/typedarray-to-buffer/LICENSE" - }, - { - "path": "node_modules/typedarray-to-buffer/README.md" - }, - { - "path": "node_modules/typedarray-to-buffer/test/basic.js" - }, - { - "path": "node_modules/sprintf-js/package.json" - }, - { - "path": "node_modules/path-key/package.json" - }, - { - "path": "node_modules/isarray/package.json" - }, - { - "path": "node_modules/@grpc/grpc-js/package.json" - }, - { - "path": "node_modules/@grpc/grpc-js/node_modules/semver/package.json" - }, - { - "path": "node_modules/@grpc/proto-loader/package.json" - }, - { - "path": "node_modules/responselike/package.json" - }, - { - "path": "node_modules/istanbul-lib-coverage/package.json" - }, - { - "path": "node_modules/minimist-options/package.json" - }, - { - "path": "node_modules/minimist-options/node_modules/arrify/package.json" - }, - { - "path": "node_modules/latest-version/package.json" - }, - { - "path": "node_modules/amdefine/package.json" - }, - { - "path": "node_modules/estraverse/package.json" - }, - { - "path": "node_modules/http-errors/package.json" - }, - { - "path": "node_modules/term-size/package.json" - }, - { - "path": "node_modules/sinon/package.json" - }, - { - "path": "node_modules/bluebird/package.json" - }, - { - "path": "node_modules/fill-keys/package.json" - }, - { - "path": "node_modules/natural-compare/package.json" - }, - { - "path": "node_modules/xdg-basedir/package.json" - }, - { - "path": "node_modules/ansi-align/package.json" - }, - { - "path": "node_modules/ansi-align/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/ansi-align/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/ansi-align/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/ansi-align/node_modules/string-width/package.json" - }, - { - "path": "node_modules/ansi-align/node_modules/emoji-regex/package.json" - }, - { - "path": "node_modules/js2xmlparser/package.json" - }, - { - "path": "node_modules/teeny-request/package.json" - }, - { - "path": "node_modules/teeny-request/node_modules/https-proxy-agent/package.json" - }, - { - "path": "node_modules/espower-source/package.json" - }, - { - "path": "node_modules/espower-source/node_modules/acorn/package.json" - }, - { - "path": "node_modules/d/package.json" - }, - { - "path": "node_modules/is-stream/package.json" - }, - { - "path": "node_modules/debug/package.json" - }, - { - "path": "node_modules/espurify/package.json" - }, - { - "path": "node_modules/wrappy/package.json" - }, - { - "path": "node_modules/import-fresh/package.json" - }, - { - "path": "node_modules/eslint/package.json" - }, - { - "path": "node_modules/eslint/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/eslint/node_modules/shebang-regex/package.json" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/package.json" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/CHANGELOG.md" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/index.js" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/LICENSE" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/README.md" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/node_modules/semver/package.json" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/enoent.js" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/parse.js" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/readShebang.js" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/escape.js" - }, - { - "path": "node_modules/eslint/node_modules/cross-spawn/lib/util/resolveCommand.js" - }, - { - "path": "node_modules/eslint/node_modules/path-key/package.json" - }, - { - "path": "node_modules/eslint/node_modules/debug/package.json" - }, - { - "path": "node_modules/eslint/node_modules/semver/package.json" - }, - { - "path": "node_modules/eslint/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/eslint/node_modules/shebang-command/package.json" - }, - { - "path": "node_modules/eslint/node_modules/which/package.json" - }, - { - "path": "node_modules/es6-promise/package.json" - }, - { - "path": "node_modules/is-yarn-global/package.json" - }, - { - "path": "node_modules/array-find/package.json" - }, - { - "path": "node_modules/imurmurhash/package.json" - }, - { - "path": "node_modules/globals/package.json" - }, - { - "path": "node_modules/is-ci/package.json" - }, - { - "path": "node_modules/mdurl/package.json" - }, - { - "path": "node_modules/typescript/package.json" - }, - { - "path": "node_modules/error-ex/package.json" - }, - { - "path": "node_modules/is-url/package.json" - }, - { - "path": "node_modules/tslint-config-prettier/package.json" - }, - { - "path": "node_modules/os-locale/package.json" - }, - { - "path": "node_modules/stream-shift/package.json" - }, - { - "path": "node_modules/ci-info/package.json" - }, - { - "path": "node_modules/window-size/package.json" - }, - { - "path": "node_modules/path-exists/package.json" - }, - { - "path": "node_modules/esrecurse/package.json" - }, - { - "path": "node_modules/lru-cache/package.json" - }, - { - "path": "node_modules/trim-newlines/package.json" - }, - { - "path": "node_modules/json-parse-better-errors/package.json" - }, - { - "path": "node_modules/retry-request/package.json" - }, - { - "path": "node_modules/retry-request/node_modules/debug/package.json" - }, - { - "path": "node_modules/merge-estraverse-visitors/package.json" - }, - { - "path": "node_modules/arrify/package.json" - }, - { - "path": "node_modules/is-windows/package.json" - }, - { - "path": "node_modules/call-matcher/package.json" - }, - { - "path": "node_modules/furi/package.json" - }, - { - "path": "node_modules/v8-compile-cache/package.json" - }, - { - "path": "node_modules/decamelize/package.json" - }, - { - "path": "node_modules/jws/package.json" - }, - { - "path": "node_modules/unique-string/package.json" - }, - { - "path": "node_modules/css-what/package.json" - }, - { - "path": "node_modules/crypto-random-string/package.json" - }, - { - "path": "node_modules/url-parse-lax/package.json" - }, - { - "path": "node_modules/@istanbuljs/schema/package.json" - }, - { - "path": "node_modules/ms/package.json" - }, - { - "path": "node_modules/decamelize-keys/package.json" - }, - { - "path": "node_modules/decamelize-keys/node_modules/map-obj/package.json" - }, - { - "path": "node_modules/make-dir/package.json" - }, - { - "path": "node_modules/make-dir/node_modules/semver/package.json" - }, - { - "path": "node_modules/get-stream/package.json" - }, - { - "path": "node_modules/is-object/package.json" - }, - { - "path": "node_modules/word-wrap/package.json" - }, - { - "path": "node_modules/keyv/package.json" - }, - { - "path": "node_modules/semver/package.json" - }, - { - "path": "node_modules/esutils/package.json" - }, - { - "path": "node_modules/intelli-espower-loader/package.json" - }, - { - "path": "node_modules/color-name/package.json" - }, - { - "path": "node_modules/object-keys/package.json" - }, - { - "path": "node_modules/event-target-shim/package.json" - }, - { - "path": "node_modules/stringifier/package.json" - }, - { - "path": "node_modules/write-file-atomic/package.json" - }, - { - "path": "node_modules/is-regex/package.json" - }, - { - "path": "node_modules/google-p12-pem/package.json" - }, - { - "path": "node_modules/v8-to-istanbul/package.json" - }, - { - "path": "node_modules/@szmarczak/http-timer/package.json" - }, - { - "path": "node_modules/lodash.get/package.json" - }, - { - "path": "node_modules/growl/package.json" - }, - { - "path": "node_modules/flat/package.json" - }, - { - "path": "node_modules/path-is-absolute/package.json" - }, - { - "path": "node_modules/path-parse/package.json" - }, - { - "path": "node_modules/node-forge/package.json" - }, - { - "path": "node_modules/levn/package.json" - }, - { - "path": "node_modules/chardet/package.json" - }, - { - "path": "node_modules/ascli/package.json" - }, - { - "path": "node_modules/lodash.camelcase/package.json" - }, - { - "path": "node_modules/gts/package.json" - }, - { - "path": "node_modules/gts/node_modules/chalk/package.json" - }, - { - "path": "node_modules/walkdir/package.json" - }, - { - "path": "node_modules/path-is-inside/package.json" - }, - { - "path": "node_modules/foreground-child/package.json" - }, - { - "path": "node_modules/quick-lru/package.json" - }, - { - "path": "node_modules/serve-static/package.json" - }, - { - "path": "node_modules/which-module/package.json" - }, - { - "path": "node_modules/power-assert/package.json" - }, - { - "path": "node_modules/is-buffer/package.json" - }, - { - "path": "node_modules/fast-levenshtein/package.json" - }, - { - "path": "node_modules/power-assert-context-traversal/package.json" - }, - { - "path": "node_modules/range-parser/package.json" - }, - { - "path": "node_modules/type-check/package.json" - }, - { - "path": "node_modules/lodash.snakecase/package.json" - }, - { - "path": "node_modules/normalize-package-data/package.json" - }, - { - "path": "node_modules/normalize-package-data/node_modules/semver/package.json" - }, - { - "path": "node_modules/registry-auth-token/package.json" - }, - { - "path": "node_modules/deep-is/package.json" - }, - { - "path": "node_modules/cli-boxes/package.json" - }, - { - "path": "node_modules/finalhandler/package.json" - }, - { - "path": "node_modules/finalhandler/node_modules/debug/package.json" - }, - { - "path": "node_modules/finalhandler/node_modules/ms/package.json" - }, - { - "path": "node_modules/optionator/package.json" - }, - { - "path": "node_modules/lodash.has/package.json" - }, - { - "path": "node_modules/xtend/package.json" - }, - { - "path": "node_modules/util-deprecate/package.json" - }, - { - "path": "node_modules/concat-map/package.json" - }, - { - "path": "node_modules/duplexify/package.json" - }, - { - "path": "node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/hard-rejection/package.json" - }, - { - "path": "node_modules/power-assert-renderer-file/package.json" - }, - { - "path": "node_modules/proxyquire/package.json" - }, - { - "path": "node_modules/gaxios/package.json" - }, - { - "path": "node_modules/y18n/package.json" - }, - { - "path": "node_modules/clone-response/package.json" - }, - { - "path": "node_modules/is-obj/package.json" - }, - { - "path": "node_modules/toidentifier/package.json" - }, - { - "path": "node_modules/esprima/package.json" - }, - { - "path": "node_modules/pify/package.json" - }, - { - "path": "node_modules/is-callable/package.json" - }, - { - "path": "node_modules/grpc/package.json" - }, - { - "path": "node_modules/grpc/node_modules/process-nextick-args/package.json" - }, - { - "path": "node_modules/grpc/node_modules/once/package.json" - }, - { - "path": "node_modules/grpc/node_modules/are-we-there-yet/package.json" - }, - { - "path": "node_modules/grpc/node_modules/minimist/package.json" - }, - { - "path": "node_modules/grpc/node_modules/chownr/package.json" - }, - { - "path": "node_modules/grpc/node_modules/needle/package.json" - }, - { - "path": "node_modules/grpc/node_modules/core-util-is/package.json" - }, - { - "path": "node_modules/grpc/node_modules/safer-buffer/package.json" - }, - { - "path": "node_modules/grpc/node_modules/glob/package.json" - }, - { - "path": "node_modules/grpc/node_modules/strip-ansi/package.json" - }, - { - "path": "node_modules/grpc/node_modules/code-point-at/package.json" - }, - { - "path": "node_modules/grpc/node_modules/safe-buffer/package.json" - }, - { - "path": "node_modules/grpc/node_modules/rc/package.json" - }, - { - "path": "node_modules/grpc/node_modules/fs.realpath/package.json" - }, - { - "path": "node_modules/grpc/node_modules/signal-exit/package.json" - }, - { - "path": "node_modules/grpc/node_modules/.bin/pbjs" - }, - { - "path": "node_modules/grpc/node_modules/console-control-strings/package.json" - }, - { - "path": "node_modules/grpc/node_modules/osenv/package.json" - }, - { - "path": "node_modules/grpc/node_modules/set-blocking/package.json" - }, - { - "path": "node_modules/grpc/node_modules/strip-json-comments/package.json" - }, - { - "path": "node_modules/grpc/node_modules/minimatch/package.json" - }, - { - "path": "node_modules/grpc/node_modules/mkdirp/package.json" - }, - { - "path": "node_modules/grpc/node_modules/mkdirp/node_modules/minimist/package.json" - }, - { - "path": "node_modules/grpc/node_modules/string_decoder/package.json" - }, - { - "path": "node_modules/grpc/node_modules/readable-stream/package.json" - }, - { - "path": "node_modules/grpc/node_modules/minizlib/package.json" - }, - { - "path": "node_modules/grpc/node_modules/npm-bundled/package.json" - }, - { - "path": "node_modules/grpc/node_modules/yargs/package.json" - }, - { - "path": "node_modules/grpc/node_modules/camelcase/package.json" - }, - { - "path": "node_modules/grpc/node_modules/deep-extend/package.json" - }, - { - "path": "node_modules/grpc/node_modules/inflight/package.json" - }, - { - "path": "node_modules/grpc/node_modules/ini/package.json" - }, - { - "path": "node_modules/grpc/node_modules/os-homedir/package.json" - }, - { - "path": "node_modules/grpc/node_modules/is-fullwidth-code-point/package.json" - }, - { - "path": "node_modules/grpc/node_modules/brace-expansion/package.json" - }, - { - "path": "node_modules/grpc/node_modules/ignore-walk/package.json" - }, - { - "path": "node_modules/grpc/node_modules/balanced-match/package.json" - }, - { - "path": "node_modules/grpc/node_modules/iconv-lite/package.json" - }, - { - "path": "node_modules/grpc/node_modules/os-tmpdir/package.json" - }, - { - "path": "node_modules/grpc/node_modules/detect-libc/package.json" - }, - { - "path": "node_modules/grpc/node_modules/npm-packlist/package.json" - }, - { - "path": "node_modules/grpc/node_modules/wide-align/package.json" - }, - { - "path": "node_modules/grpc/node_modules/number-is-nan/package.json" - }, - { - "path": "node_modules/grpc/node_modules/isarray/package.json" - }, - { - "path": "node_modules/grpc/node_modules/debug/package.json" - }, - { - "path": "node_modules/grpc/node_modules/wrappy/package.json" - }, - { - "path": "node_modules/grpc/node_modules/nopt/package.json" - }, - { - "path": "node_modules/grpc/node_modules/delegates/package.json" - }, - { - "path": "node_modules/grpc/node_modules/ms/package.json" - }, - { - "path": "node_modules/grpc/node_modules/npmlog/package.json" - }, - { - "path": "node_modules/grpc/node_modules/semver/package.json" - }, - { - "path": "node_modules/grpc/node_modules/path-is-absolute/package.json" - }, - { - "path": "node_modules/grpc/node_modules/sax/package.json" - }, - { - "path": "node_modules/grpc/node_modules/object-assign/package.json" - }, - { - "path": "node_modules/grpc/node_modules/util-deprecate/package.json" - }, - { - "path": "node_modules/grpc/node_modules/concat-map/package.json" - }, - { - "path": "node_modules/grpc/node_modules/ansi-regex/package.json" - }, - { - "path": "node_modules/grpc/node_modules/tar/package.json" - }, - { - "path": "node_modules/grpc/node_modules/y18n/package.json" - }, - { - "path": "node_modules/grpc/node_modules/has-unicode/package.json" - }, - { - "path": "node_modules/grpc/node_modules/cliui/package.json" - }, - { - "path": "node_modules/grpc/node_modules/minipass/package.json" - }, - { - "path": "node_modules/grpc/node_modules/abbrev/package.json" - }, - { - "path": "node_modules/grpc/node_modules/gauge/package.json" - }, - { - "path": "node_modules/grpc/node_modules/protobufjs/package.json" - }, - { - "path": "node_modules/grpc/node_modules/protobufjs/bin/pbjs" - }, - { - "path": "node_modules/grpc/node_modules/fs-minipass/package.json" - }, - { - "path": "node_modules/grpc/node_modules/node-pre-gyp/package.json" - }, - { - "path": "node_modules/grpc/node_modules/wrap-ansi/package.json" - }, - { - "path": "node_modules/grpc/node_modules/aproba/package.json" - }, - { - "path": "node_modules/grpc/node_modules/inherits/package.json" - }, - { - "path": "node_modules/grpc/node_modules/string-width/package.json" - }, - { - "path": "node_modules/grpc/node_modules/rimraf/package.json" - }, - { - "path": "node_modules/grpc/node_modules/yallist/package.json" - }, - { - "path": "node_modules/camelcase-keys/package.json" - }, - { - "path": "node_modules/camelcase-keys/node_modules/camelcase/package.json" - }, - { - "path": "node_modules/ncp/package.json" - }, - { - "path": "node_modules/is-arrayish/package.json" - }, - { - "path": "node_modules/fast-diff/package.json" - }, - { - "path": "node_modules/configstore/package.json" - }, - { - "path": "node_modules/configstore/node_modules/make-dir/package.json" - }, - { - "path": "node_modules/configstore/node_modules/write-file-atomic/package.json" - }, - { - "path": "node_modules/universal-deep-strict-equal/package.json" - }, - { - "path": "node_modules/power-assert-renderer-assertion/package.json" - }, - { - "path": "node_modules/glob-parent/package.json" - }, - { - "path": "node_modules/object.assign/package.json" - }, - { - "path": "node_modules/color-convert/package.json" - }, - { - "path": "node_modules/eslint-plugin-node/package.json" - }, - { - "path": "node_modules/eslint-plugin-node/node_modules/eslint-utils/package.json" - }, - { - "path": "node_modules/eslint-plugin-node/node_modules/ignore/package.json" - }, - { - "path": "node_modules/eslint-plugin-node/node_modules/semver/package.json" - }, - { - "path": "node_modules/cliui/package.json" - }, - { - "path": "node_modules/cheerio/package.json" - }, - { - "path": "node_modules/flatted/package.json" - }, - { - "path": "node_modules/parse5/package.json" - }, - { - "path": "node_modules/power-assert-renderer-base/package.json" - }, - { - "path": "node_modules/lolex/package.json" - }, - { - "path": "node_modules/es6-promisify/package.json" - }, - { - "path": "node_modules/shebang-command/package.json" - }, - { - "path": "node_modules/indent-string/package.json" - }, - { - "path": "node_modules/tslib/package.json" - }, - { - "path": "node_modules/prepend-http/package.json" - }, - { - "path": "node_modules/fast-json-stable-stringify/package.json" - }, - { - "path": "node_modules/semver-diff/package.json" - }, - { - "path": "node_modules/semver-diff/node_modules/semver/package.json" - }, - { - "path": "node_modules/cli-width/package.json" - }, - { - "path": "node_modules/escape-html/package.json" - }, - { - "path": "node_modules/protobufjs/package.json" - }, - { - "path": "node_modules/protobufjs/node_modules/@types/node/package.json" - }, - { - "path": "node_modules/protobufjs/cli/package.json" - }, - { - "path": "node_modules/protobufjs/cli/package-lock.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/source-map/package.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/minimist/package.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/commander/package.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/acorn/package.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/espree/package.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/uglify-js/package.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/semver/package.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/acorn-jsx/package.json" - }, - { - "path": "node_modules/protobufjs/cli/node_modules/acorn-jsx/node_modules/acorn/package.json" - }, - { - "path": "node_modules/has/package.json" - }, - { - "path": "node_modules/boolbase/package.json" - }, - { - "path": "node_modules/@sindresorhus/is/package.json" - }, - { - "path": "node_modules/acorn-jsx/package.json" - }, - { - "path": "node_modules/mute-stream/package.json" - }, - { - "path": "node_modules/p-queue/package.json" - }, - { - "path": "node_modules/cli-cursor/package.json" - }, - { - "path": "node_modules/bignumber.js/package.json" - }, - { - "path": "node_modules/wrap-ansi/package.json" - }, - { - "path": "node_modules/require-directory/package.json" - }, - { - "path": "node_modules/uuid/package.json" - }, - { - "path": "node_modules/c8/package.json" - }, - { - "path": "node_modules/eslint-config-prettier/package.json" - }, - { - "path": "node_modules/function-bind/package.json" - }, - { - "path": "node_modules/merge-descriptors/package.json" - }, - { - "path": "node_modules/istanbul-lib-report/package.json" - }, - { - "path": "node_modules/object-inspect/package.json" - }, - { - "path": "node_modules/entities/package.json" - }, - { - "path": "node_modules/define-properties/package.json" - }, - { - "path": "node_modules/has-yarn/package.json" - }, - { - "path": "node_modules/buffer-from/package.json" - }, - { - "path": "node_modules/min-indent/package.json" - }, - { - "path": "node_modules/p-defer/package.json" - }, - { - "path": "node_modules/underscore/package.json" - }, - { - "path": "node_modules/power-assert-renderer-diagram/package.json" - }, - { - "path": "node_modules/browser-stdout/package.json" - }, - { - "path": "node_modules/registry-url/package.json" - }, - { - "path": "node_modules/which/package.json" - }, - { - "path": "node_modules/@babel/highlight/package.json" - }, - { - "path": "node_modules/@babel/code-frame/package.json" - }, - { - "path": "node_modules/@babel/parser/package.json" - }, - { - "path": "node_modules/strip-indent/package.json" - }, - { - "path": "node_modules/map-obj/package.json" - }, - { - "path": "node_modules/tslint/package.json" - }, - { - "path": "node_modules/tslint/node_modules/semver/package.json" - }, - { - "path": "node_modules/duplexer3/package.json" - }, - { - "path": "node_modules/isexe/package.json" - }, - { - "path": "node_modules/klaw/package.json" - }, - { - "path": "node_modules/inherits/package.json" - }, - { - "path": "node_modules/lodash.at/package.json" - }, - { - "path": "node_modules/pump/package.json" - }, - { - "path": "node_modules/spdx-license-ids/package.json" - }, - { - "path": "node_modules/@google-cloud/paginator/package.json" - }, - { - "path": "node_modules/@google-cloud/projectify/package.json" - }, - { - "path": "node_modules/@google-cloud/promisify/package.json" - }, - { - "path": "node_modules/@google-cloud/precise-date/package.json" - }, - { - "path": "node_modules/depd/package.json" - }, - { - "path": "node_modules/import-lazy/package.json" - }, - { - "path": "node_modules/string-width/package.json" - }, - { - "path": "node_modules/nan/package.json" - }, - { - "path": "node_modules/lines-and-columns/package.json" - }, - { - "path": "node_modules/astral-regex/package.json" - }, - { - "path": "node_modules/builtin-modules/package.json" - }, - { - "path": "node_modules/rimraf/package.json" - }, - { - "path": "node_modules/restore-cursor/package.json" - }, - { - "path": "node_modules/yallist/package.json" - }, - { - "path": "node_modules/emoji-regex/package.json" - }, - { - "path": "system-test/pubsub.ts" - }, - { - "path": "system-test/install.ts" - }, - { - "path": "system-test/fixtures/ordered-messages.json" - }, - { - "path": "system-test/fixtures/sample/package.json" - }, - { - "path": "system-test/fixtures/sample/tsconfig.json" - }, - { - "path": "system-test/fixtures/sample/src/index.ts" - }, - { - "path": "proto/pubsub.d.ts" - }, - { - "path": "proto/iam.d.ts" - }, - { - "path": ".git/config" - }, - { - "path": ".git/index" - }, - { - "path": ".git/packed-refs" - }, - { - "path": ".git/shallow" - }, - { - "path": ".git/HEAD" - }, - { - "path": ".git/refs/heads/autosynth" - }, - { - "path": ".git/refs/heads/master" - }, - { - "path": ".git/refs/remotes/origin/HEAD" - }, - { - "path": ".git/objects/pack/pack-f900966f9c73a5a283fa53bf9972d5a7f2c3cbd1.idx" - }, - { - "path": ".git/objects/pack/pack-f900966f9c73a5a283fa53bf9972d5a7f2c3cbd1.pack" - }, - { - "path": ".git/logs/HEAD" - }, - { - "path": ".git/logs/refs/heads/autosynth" - }, - { - "path": ".git/logs/refs/heads/master" - }, - { - "path": ".git/logs/refs/remotes/origin/HEAD" - }, - { - "path": "src/index.ts" - }, - { - "path": "src/pubsub.ts" - }, - { - "path": "src/subscriber.ts" - }, - { - "path": "src/subscription.ts" - }, - { - "path": "src/message-queues.ts" - }, - { - "path": "src/topic.ts" - }, - { - "path": "src/util.ts" - }, - { - "path": "src/iam.ts" - }, - { - "path": "src/service_proto_list.json" - }, - { - "path": "src/message-stream.ts" - }, - { - "path": "src/pull-retry.ts" - }, - { - "path": "src/histogram.ts" - }, - { - "path": "src/.eslintrc.yml" - }, - { - "path": "src/snapshot.ts" - }, - { - "path": "src/lease-manager.ts" - }, - { - "path": "src/publisher/index.ts" - }, - { - "path": "src/publisher/message-queues.ts" - }, - { - "path": "src/publisher/message-batch.ts" - }, - { - "path": "src/publisher/publish-error.ts" - }, - { - "path": "src/v1/publisher_proto_list.json" - }, - { - "path": "src/v1/index.js" - }, - { - "path": "src/v1/subscriber_client_config.json" - }, - { - "path": "src/v1/publisher_client_config.json" - }, - { - "path": "src/v1/publisher_client.js" - }, - { - "path": "src/v1/subscriber_proto_list.json" - }, - { - "path": "src/v1/subscriber_client.js" - }, - { - "path": "src/v1/doc/google/iam/v1/doc_iam_policy.js" - }, - { - "path": "src/v1/doc/google/iam/v1/doc_options.js" - }, - { - "path": "src/v1/doc/google/iam/v1/doc_policy.js" - }, - { - "path": "src/v1/doc/google/type/doc_expr.js" - }, - { - "path": "src/v1/doc/google/pubsub/v1/doc_pubsub.js" - }, - { - "path": "src/v1/doc/google/protobuf/doc_duration.js" - }, - { - "path": "src/v1/doc/google/protobuf/doc_empty.js" - }, - { - "path": "src/v1/doc/google/protobuf/doc_timestamp.js" - }, - { - "path": "src/v1/doc/google/protobuf/doc_field_mask.js" - }, - { - "path": "protos/protos.js" - }, - { - "path": "protos/protos.d.ts" - }, - { - "path": "protos/protos.json" - }, - { - "path": "protos/google/iam/admin/v1/iam.proto" - }, - { - "path": "protos/google/iam/v1/iam_policy.proto" - }, - { - "path": "protos/google/iam/v1/options.proto" - }, - { - "path": "protos/google/iam/v1/policy.proto" - }, - { - "path": "protos/google/type/expr.proto" - }, - { - "path": "protos/google/api/distribution.proto" - }, - { - "path": "protos/google/api/monitoring.proto" - }, - { - "path": "protos/google/api/backend.proto" - }, - { - "path": "protos/google/api/control.proto" - }, - { - "path": "protos/google/api/log.proto" - }, - { - "path": "protos/google/api/endpoint.proto" - }, - { - "path": "protos/google/api/annotations.proto" - }, - { - "path": "protos/google/api/billing.proto" - }, - { - "path": "protos/google/api/metric.proto" - }, - { - "path": "protos/google/api/service.proto" - }, - { - "path": "protos/google/api/http.proto" - }, - { - "path": "protos/google/api/quota.proto" - }, - { - "path": "protos/google/api/documentation.proto" - }, - { - "path": "protos/google/api/label.proto" - }, - { - "path": "protos/google/api/consumer.proto" - }, - { - "path": "protos/google/api/monitored_resource.proto" - }, - { - "path": "protos/google/api/logging.proto" - }, - { - "path": "protos/google/api/usage.proto" - }, - { - "path": "protos/google/api/auth.proto" - }, - { - "path": "protos/google/api/httpbody.proto" - }, - { - "path": "protos/google/api/context.proto" - }, - { - "path": "protos/google/api/source_info.proto" - }, - { - "path": "protos/google/api/config_change.proto" - }, - { - "path": "protos/google/api/system_parameter.proto" - }, - { - "path": "protos/google/api/experimental/authorization_config.proto" - }, - { - "path": "protos/google/api/experimental/experimental.proto" - }, - { - "path": "protos/google/api/servicemanagement/v1/servicemanager.proto" - }, - { - "path": "protos/google/api/servicemanagement/v1/resources.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/distribution.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/log_entry.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/operation.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/metric_value.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/service_controller.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/check_error.proto" - }, - { - "path": "protos/google/pubsub/v1/pubsub.proto" - }, - { - "path": "protos/google/protobuf/descriptor.proto" - }, - { - "path": "protos/google/protobuf/type.proto" - }, - { - "path": "protos/google/protobuf/field_mask.proto" - }, - { - "path": "protos/google/protobuf/struct.proto" - }, - { - "path": "protos/google/protobuf/any.proto" - }, - { - "path": "protos/google/protobuf/wrappers.proto" - }, - { - "path": "protos/google/protobuf/duration.proto" - }, - { - "path": "protos/google/protobuf/empty.proto" - }, - { - "path": "protos/google/protobuf/timestamp.proto" - }, - { - "path": "protos/google/protobuf/source_context.proto" - }, - { - "path": "protos/google/protobuf/api.proto" - }, - { - "path": "protos/google/protobuf/util/json_format_proto3.proto" - }, - { - "path": "__pycache__/synth.cpython-36.pyc" - }, - { - "path": ".kokoro/common.cfg" - }, - { - "path": ".kokoro/publish.sh" - }, - { - "path": ".kokoro/docs.sh" - }, - { - "path": ".kokoro/lint.sh" - }, - { - "path": ".kokoro/.gitattributes" - }, - { - "path": ".kokoro/system-test.sh" - }, - { - "path": ".kokoro/test.bat" - }, - { - "path": ".kokoro/test.sh" - }, - { - "path": ".kokoro/trampoline.sh" - }, - { - "path": ".kokoro/samples-test.sh" - }, - { - "path": ".kokoro/presubmit/node10/common.cfg" - }, - { - "path": ".kokoro/presubmit/node10/system-test.cfg" - }, - { - "path": ".kokoro/presubmit/node10/lint.cfg" - }, - { - "path": ".kokoro/presubmit/node10/test.cfg" - }, - { - "path": ".kokoro/presubmit/node10/samples-test.cfg" - }, - { - "path": ".kokoro/presubmit/node10/docs.cfg" - }, - { - "path": ".kokoro/presubmit/node12/common.cfg" - }, - { - "path": ".kokoro/presubmit/node12/test.cfg" - }, - { - "path": ".kokoro/presubmit/node8/common.cfg" - }, - { - "path": ".kokoro/presubmit/node8/test.cfg" - }, - { - "path": ".kokoro/presubmit/windows/common.cfg" - }, - { - "path": ".kokoro/presubmit/windows/test.cfg" - }, - { - "path": ".kokoro/release/common.cfg" - }, - { - "path": ".kokoro/release/publish.cfg" - }, - { - "path": ".kokoro/release/docs.sh" - }, - { - "path": ".kokoro/release/docs.cfg" - }, - { - "path": ".kokoro/continuous/node10/common.cfg" - }, - { - "path": ".kokoro/continuous/node10/system-test.cfg" - }, - { - "path": ".kokoro/continuous/node10/lint.cfg" - }, - { - "path": ".kokoro/continuous/node10/test.cfg" - }, - { - "path": ".kokoro/continuous/node10/samples-test.cfg" - }, - { - "path": ".kokoro/continuous/node10/docs.cfg" - }, - { - "path": ".kokoro/continuous/node12/common.cfg" - }, - { - "path": ".kokoro/continuous/node12/test.cfg" - }, - { - "path": ".kokoro/continuous/node8/common.cfg" - }, - { - "path": ".kokoro/continuous/node8/test.cfg" - }, - { - "path": "bin/benchwrapper.js" - }, - { - "path": "bin/pubsub.proto" - }, - { - "path": "bin/README.md" - }, - { - "path": "samples/package.json" - }, - { - "path": "samples/topics.js" - }, - { - "path": "samples/quickstart.js" - }, - { - "path": "samples/.eslintrc.yml" - }, - { - "path": "samples/subscriptions.js" - }, - { - "path": "samples/README.md" - }, - { - "path": "samples/system-test/topics.test.js" - }, - { - "path": "samples/system-test/quickstart.test.js" - }, - { - "path": "samples/system-test/subscriptions.test.js" - }, - { - "path": "build/system-test/pubsub.d.ts" - }, - { - "path": "build/system-test/publisher_smoke_test.js" - }, - { - "path": "build/system-test/install.js" - }, - { - "path": "build/system-test/install.d.ts" - }, - { - "path": "build/system-test/install.js.map" - }, - { - "path": "build/system-test/pubsub.js.map" - }, - { - "path": "build/system-test/pubsub.js" - }, - { - "path": "build/proto/pubsub.d.ts" - }, - { - "path": "build/proto/iam.d.ts" - }, - { - "path": "build/src/message-stream.js.map" - }, - { - "path": "build/src/histogram.js" - }, - { - "path": "build/src/histogram.d.ts" - }, - { - "path": "build/src/message-stream.js" - }, - { - "path": "build/src/subscription.d.ts" - }, - { - "path": "build/src/message-queues.js" - }, - { - "path": "build/src/pubsub.d.ts" - }, - { - "path": "build/src/lease-manager.js" - }, - { - "path": "build/src/snapshot.d.ts" - }, - { - "path": "build/src/snapshot.js" - }, - { - "path": "build/src/pull-retry.js.map" - }, - { - "path": "build/src/topic.js.map" - }, - { - "path": "build/src/index.js" - }, - { - "path": "build/src/index.js.map" - }, - { - "path": "build/src/util.js" - }, - { - "path": "build/src/lease-manager.js.map" - }, - { - "path": "build/src/util.js.map" - }, - { - "path": "build/src/subscriber.js" - }, - { - "path": "build/src/iam.d.ts" - }, - { - "path": "build/src/topic.js" - }, - { - "path": "build/src/iam.js" - }, - { - "path": "build/src/snapshot.js.map" - }, - { - "path": "build/src/util.d.ts" - }, - { - "path": "build/src/lease-manager.d.ts" - }, - { - "path": "build/src/topic.d.ts" - }, - { - "path": "build/src/subscriber.d.ts" - }, - { - "path": "build/src/subscription.js" - }, - { - "path": "build/src/iam.js.map" - }, - { - "path": "build/src/message-stream.d.ts" - }, - { - "path": "build/src/histogram.js.map" - }, - { - "path": "build/src/pull-retry.js" - }, - { - "path": "build/src/subscriber.js.map" - }, - { - "path": "build/src/message-queues.d.ts" - }, - { - "path": "build/src/subscription.js.map" - }, - { - "path": "build/src/pubsub.js.map" - }, - { - "path": "build/src/pull-retry.d.ts" - }, - { - "path": "build/src/pubsub.js" - }, - { - "path": "build/src/message-queues.js.map" - }, - { - "path": "build/src/index.d.ts" - }, - { - "path": "build/src/publisher/message-queues.js" - }, - { - "path": "build/src/publisher/publish-error.d.ts" - }, - { - "path": "build/src/publisher/message-batch.js" - }, - { - "path": "build/src/publisher/index.js" - }, - { - "path": "build/src/publisher/index.js.map" - }, - { - "path": "build/src/publisher/publish-error.js" - }, - { - "path": "build/src/publisher/message-queues.d.ts" - }, - { - "path": "build/src/publisher/publish-error.js.map" - }, - { - "path": "build/src/publisher/message-batch.d.ts" - }, - { - "path": "build/src/publisher/message-batch.js.map" - }, - { - "path": "build/src/publisher/message-queues.js.map" - }, - { - "path": "build/src/publisher/index.d.ts" - }, - { - "path": "build/src/v1/publisher_proto_list.json" - }, - { - "path": "build/src/v1/index.js" - }, - { - "path": "build/src/v1/subscriber_client_config.json" - }, - { - "path": "build/src/v1/publisher_client_config.json" - }, - { - "path": "build/src/v1/publisher_client.js" - }, - { - "path": "build/src/v1/subscriber_proto_list.json" - }, - { - "path": "build/src/v1/subscriber_client.js" - }, - { - "path": "build/src/v1/doc/google/iam/v1/doc_iam_policy.js" - }, - { - "path": "build/src/v1/doc/google/iam/v1/doc_options.js" - }, - { - "path": "build/src/v1/doc/google/iam/v1/doc_policy.js" - }, - { - "path": "build/src/v1/doc/google/type/doc_expr.js" - }, - { - "path": "build/src/v1/doc/google/pubsub/v1/doc_pubsub.js" - }, - { - "path": "build/src/v1/doc/google/protobuf/doc_duration.js" - }, - { - "path": "build/src/v1/doc/google/protobuf/doc_empty.js" - }, - { - "path": "build/src/v1/doc/google/protobuf/doc_timestamp.js" - }, - { - "path": "build/src/v1/doc/google/protobuf/doc_field_mask.js" - }, - { - "path": "build/protos/protos.js" - }, - { - "path": "build/protos/protos.d.ts" - }, - { - "path": "build/protos/protos.json" - }, - { - "path": "build/protos/google/iam/admin/v1/iam.proto" - }, - { - "path": "build/protos/google/iam/v1/iam_policy.proto" - }, - { - "path": "build/protos/google/iam/v1/options.proto" - }, - { - "path": "build/protos/google/iam/v1/policy.proto" - }, - { - "path": "build/protos/google/type/expr.proto" - }, - { - "path": "build/protos/google/api/distribution.proto" - }, - { - "path": "build/protos/google/api/monitoring.proto" - }, - { - "path": "build/protos/google/api/backend.proto" - }, - { - "path": "build/protos/google/api/control.proto" - }, - { - "path": "build/protos/google/api/log.proto" - }, - { - "path": "build/protos/google/api/endpoint.proto" - }, - { - "path": "build/protos/google/api/annotations.proto" - }, - { - "path": "build/protos/google/api/billing.proto" - }, - { - "path": "build/protos/google/api/metric.proto" - }, - { - "path": "build/protos/google/api/service.proto" - }, - { - "path": "build/protos/google/api/http.proto" - }, - { - "path": "build/protos/google/api/quota.proto" - }, - { - "path": "build/protos/google/api/documentation.proto" - }, - { - "path": "build/protos/google/api/label.proto" - }, - { - "path": "build/protos/google/api/consumer.proto" - }, - { - "path": "build/protos/google/api/monitored_resource.proto" - }, - { - "path": "build/protos/google/api/logging.proto" - }, - { - "path": "build/protos/google/api/usage.proto" - }, - { - "path": "build/protos/google/api/auth.proto" - }, - { - "path": "build/protos/google/api/httpbody.proto" - }, - { - "path": "build/protos/google/api/context.proto" - }, - { - "path": "build/protos/google/api/source_info.proto" - }, - { - "path": "build/protos/google/api/config_change.proto" - }, - { - "path": "build/protos/google/api/system_parameter.proto" - }, - { - "path": "build/protos/google/api/experimental/authorization_config.proto" - }, - { - "path": "build/protos/google/api/experimental/experimental.proto" - }, - { - "path": "build/protos/google/api/servicemanagement/v1/servicemanager.proto" - }, - { - "path": "build/protos/google/api/servicemanagement/v1/resources.proto" - }, - { - "path": "build/protos/google/api/servicecontrol/v1/distribution.proto" - }, - { - "path": "build/protos/google/api/servicecontrol/v1/log_entry.proto" - }, - { - "path": "build/protos/google/api/servicecontrol/v1/operation.proto" - }, - { - "path": "build/protos/google/api/servicecontrol/v1/metric_value.proto" - }, - { - "path": "build/protos/google/api/servicecontrol/v1/service_controller.proto" - }, - { - "path": "build/protos/google/api/servicecontrol/v1/check_error.proto" - }, - { - "path": "build/protos/google/pubsub/v1/pubsub.proto" - }, - { - "path": "build/protos/google/protobuf/descriptor.proto" - }, - { - "path": "build/protos/google/protobuf/type.proto" - }, - { - "path": "build/protos/google/protobuf/field_mask.proto" - }, - { - "path": "build/protos/google/protobuf/struct.proto" - }, - { - "path": "build/protos/google/protobuf/any.proto" - }, - { - "path": "build/protos/google/protobuf/wrappers.proto" - }, - { - "path": "build/protos/google/protobuf/duration.proto" - }, - { - "path": "build/protos/google/protobuf/empty.proto" - }, - { - "path": "build/protos/google/protobuf/timestamp.proto" - }, - { - "path": "build/protos/google/protobuf/source_context.proto" - }, - { - "path": "build/protos/google/protobuf/api.proto" - }, - { - "path": "build/protos/google/protobuf/util/json_format_proto3.proto" - }, - { - "path": "build/test/message-stream.js.map" - }, - { - "path": "build/test/histogram.js" - }, - { - "path": "build/test/histogram.d.ts" - }, - { - "path": "build/test/message-stream.js" - }, - { - "path": "build/test/subscription.d.ts" - }, - { - "path": "build/test/message-queues.js" - }, - { - "path": "build/test/pubsub.d.ts" - }, - { - "path": "build/test/gapic-v1.js" - }, - { - "path": "build/test/lease-manager.js" - }, - { - "path": "build/test/snapshot.d.ts" - }, - { - "path": "build/test/snapshot.js" - }, - { - "path": "build/test/pull-retry.js.map" - }, - { - "path": "build/test/topic.js.map" - }, - { - "path": "build/test/index.js" - }, - { - "path": "build/test/index.js.map" - }, - { - "path": "build/test/lease-manager.js.map" - }, - { - "path": "build/test/subscriber.js" - }, - { - "path": "build/test/iam.d.ts" - }, - { - "path": "build/test/topic.js" - }, - { - "path": "build/test/iam.js" - }, - { - "path": "build/test/snapshot.js.map" - }, - { - "path": "build/test/lease-manager.d.ts" - }, - { - "path": "build/test/topic.d.ts" - }, - { - "path": "build/test/subscriber.d.ts" - }, - { - "path": "build/test/subscription.js" - }, - { - "path": "build/test/iam.js.map" - }, - { - "path": "build/test/message-stream.d.ts" - }, - { - "path": "build/test/histogram.js.map" - }, - { - "path": "build/test/pull-retry.js" - }, - { - "path": "build/test/subscriber.js.map" - }, - { - "path": "build/test/message-queues.d.ts" - }, - { - "path": "build/test/subscription.js.map" - }, - { - "path": "build/test/pubsub.js.map" - }, - { - "path": "build/test/pull-retry.d.ts" - }, - { - "path": "build/test/pubsub.js" - }, - { - "path": "build/test/message-queues.js.map" - }, - { - "path": "build/test/index.d.ts" - }, - { - "path": "build/test/publisher/message-queues.js" - }, - { - "path": "build/test/publisher/publish-error.d.ts" - }, - { - "path": "build/test/publisher/message-batch.js" - }, - { - "path": "build/test/publisher/index.js" - }, - { - "path": "build/test/publisher/index.js.map" - }, - { - "path": "build/test/publisher/publish-error.js" - }, - { - "path": "build/test/publisher/message-queues.d.ts" - }, - { - "path": "build/test/publisher/publish-error.js.map" - }, - { - "path": "build/test/publisher/message-batch.d.ts" - }, - { - "path": "build/test/publisher/message-batch.js.map" - }, - { - "path": "build/test/publisher/message-queues.js.map" - }, - { - "path": "build/test/publisher/index.d.ts" - }, - { - "path": "test/index.ts" - }, - { - "path": "test/pubsub.ts" - }, - { - "path": "test/subscriber.ts" - }, - { - "path": "test/subscription.ts" - }, - { - "path": "test/message-queues.ts" - }, - { - "path": "test/gapic-v1.js" - }, - { - "path": "test/topic.ts" - }, - { - "path": "test/mocha.opts" - }, - { - "path": "test/iam.ts" - }, - { - "path": "test/message-stream.ts" - }, - { - "path": "test/pull-retry.ts" - }, - { - "path": "test/histogram.ts" - }, - { - "path": "test/.eslintrc.yml" - }, - { - "path": "test/snapshot.ts" - }, - { - "path": "test/lease-manager.ts" - }, - { - "path": "test/publisher/index.ts" - }, - { - "path": "test/publisher/message-queues.ts" - }, - { - "path": "test/publisher/message-batch.ts" - }, - { - "path": "test/publisher/publish-error.ts" - } ] } \ No newline at end of file From ed80a53c8db8cd8c330d9febbb34de527da10aea Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 13 Jan 2020 16:56:10 -0800 Subject: [PATCH 0557/1115] chore: revert the linkinator change from refactor-samples so that it checks those docs again (#849) --- handwritten/pubsub/linkinator.config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json index 978f2bf47ce..d780d6bfff5 100644 --- a/handwritten/pubsub/linkinator.config.json +++ b/handwritten/pubsub/linkinator.config.json @@ -2,7 +2,6 @@ "recurse": true, "skip": [ "https://codecov.io/gh/googleapis/", - "www.googleapis.com", - "https://github.com/googleapis/nodejs-pubsub/blob/master/samples/" + "www.googleapis.com" ] } From 79f925dca3bd73529da12dd441f9b4371006676c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2020 10:16:26 -0800 Subject: [PATCH 0558/1115] chore: release 1.3.0 (#848) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 46792b67772..8e14319f15d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [1.3.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.2.0...v1.3.0) (2020-01-14) + + +### Features + +* **subscription:** dead letter policy support ([#799](https://www.github.com/googleapis/nodejs-pubsub/issues/799)) ([b5a4195](https://www.github.com/googleapis/nodejs-pubsub/commit/b5a4195238cf8ceed0b066a93066765820dc0488)) + ## [1.2.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.1.6...v1.2.0) (2019-12-13) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c2c32d48014..99947a5ab7e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.2.0", + "version": "1.3.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From e7418b78e2e1f3bc57417533b3d594c6222cfdd8 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 16 Jan 2020 16:43:36 -0800 Subject: [PATCH 0559/1115] docs: update license headers --- handwritten/pubsub/smoke-test/publisher_smoke_test.js | 2 +- .../pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js | 2 +- .../pubsub/src/v1/doc/google/iam/v1/doc_options.js | 2 +- .../pubsub/src/v1/doc/google/iam/v1/doc_policy.js | 2 +- .../pubsub/src/v1/doc/google/protobuf/doc_duration.js | 2 +- .../pubsub/src/v1/doc/google/protobuf/doc_empty.js | 2 +- .../src/v1/doc/google/protobuf/doc_field_mask.js | 2 +- .../pubsub/src/v1/doc/google/protobuf/doc_timestamp.js | 2 +- .../pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js | 2 +- handwritten/pubsub/src/v1/doc/google/type/doc_expr.js | 2 +- handwritten/pubsub/src/v1/index.js | 2 +- handwritten/pubsub/src/v1/publisher_client.js | 2 +- handwritten/pubsub/src/v1/subscriber_client.js | 2 +- handwritten/pubsub/synth.metadata | 10 +++++----- handwritten/pubsub/test/gapic-v1.js | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js index 39c5f14e0c1..04b5a84c14e 100644 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ b/handwritten/pubsub/smoke-test/publisher_smoke_test.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js index f26716efea0..32288959104 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js index f26716efea0..32288959104 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js index f26716efea0..32288959104 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js +++ b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js index 1275f8f4d13..bd4b4ee6067 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js index 0b446dd9ce4..1e3961d6609 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js index 011207b8626..59e745f36c2 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js index c457acc0c7d..ad801cc9a10 100644 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js +++ b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index 28609238a96..f770ec01893 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js b/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js index f26716efea0..32288959104 100644 --- a/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js +++ b/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js index cdcdc5c67ad..d27ad5a6214 100644 --- a/handwritten/pubsub/src/v1/index.js +++ b/handwritten/pubsub/src/v1/index.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index d7c06e826f8..2e76501f7a0 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 9749aa62bca..64e37daeee7 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 3a0b6e4a4a8..ac9155518d7 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2020-01-10T00:57:56.692747Z", + "updateTime": "2020-01-15T12:27:23.480897Z", "sources": [ { "generator": { "name": "artman", - "version": "0.43.0", - "dockerImage": "googleapis/artman@sha256:264654a37596a44b0668b8ce6ac41082d713f6ee150b3fc6425fa78cc64e4f20" + "version": "0.44.0", + "dockerImage": "googleapis/artman@sha256:10a6d0342b8d62544810ac5ad86c3b21049ec0696608ac60175da8e513234344" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a79211c20c4f2807eec524d00123bf7c06ad3d6e", - "internalRef": "288999068" + "sha": "d99df0d67057a233c711187e0689baa4f8e6333d", + "internalRef": "289709813" } }, { diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js index f4fa13ecded..7a867977873 100644 --- a/handwritten/pubsub/test/gapic-v1.js +++ b/handwritten/pubsub/test/gapic-v1.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From da5e76ad44589928bd971970691186b177b500b5 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Tue, 21 Jan 2020 15:41:06 -0800 Subject: [PATCH 0560/1115] build: update windows configuration to match new vm --- handwritten/pubsub/.kokoro/test.bat | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat index fddff757050..ae59e59be3e 100644 --- a/handwritten/pubsub/.kokoro/test.bat +++ b/handwritten/pubsub/.kokoro/test.bat @@ -17,14 +17,12 @@ cd /d %~dp0 cd .. -@rem The image we're currently running has a broken version of Node.js enabled -@rem by nvm (v10.15.3), which has no npm bin. This hack uses the functional -@rem Node v8.9.1 to install npm@latest, it then uses this version of npm to -@rem install npm for v10.15.3. -call nvm use v8.9.1 || goto :error -call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm-bootstrap\bin\npm-cli.js i npm -g || goto :error -call nvm use v10.15.3 || goto :error -call node C:\Users\kbuilder\AppData\Roaming\nvm-ps\versions\v8.9.1\node_modules\npm\bin\npm-cli.js i npm -g || goto :error +@rem npm path is not currently set in our image, we should fix this next time +@rem we upgrade Node.js in the image: +SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm + +call nvm use v12.14.1 +call which node call npm install || goto :error call npm run test || goto :error From 5c63754f1490b4620b811607f3177697cafffbfd Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 21 Jan 2020 17:09:39 -0800 Subject: [PATCH 0561/1115] docs(samples): split synchronous pull sample into one with and one without lease management (#856) * fix: synchronous pull example was actually synchronous pull with lease management; add a new plain synchronous pull sample snippet * style(samples): switch two tests from execPromise to execSync * chore(metadata): re-run synthtool to update the READMEs and metadata * chore: temporarily patch linkinator config so kokoro checks pass with new files --- handwritten/pubsub/README.md | 1 + handwritten/pubsub/linkinator.config.json | 3 ++- handwritten/pubsub/synth.metadata | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 90b9b0e9e76..467e0b4ab39 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -128,6 +128,7 @@ has instructions for running the samples. | Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | | Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | | Synchronous Pull | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPull.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/synchronousPull.js,samples/README.md) | +| Synchronous Pull With Lease Management | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPullWithLeaseManagement.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/synchronousPullWithLeaseManagement.js,samples/README.md) | | Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | | Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json index d780d6bfff5..8daa69c841c 100644 --- a/handwritten/pubsub/linkinator.config.json +++ b/handwritten/pubsub/linkinator.config.json @@ -2,6 +2,7 @@ "recurse": true, "skip": [ "https://codecov.io/gh/googleapis/", - "www.googleapis.com" + "www.googleapis.com", + "https://github.com/googleapis/nodejs-pubsub/" ] } diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index ac9155518d7..0ae727d2535 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2020-01-15T12:27:23.480897Z", + "updateTime": "2020-01-21T21:05:44.729996Z", "sources": [ { "generator": { "name": "artman", - "version": "0.44.0", - "dockerImage": "googleapis/artman@sha256:10a6d0342b8d62544810ac5ad86c3b21049ec0696608ac60175da8e513234344" + "version": "0.44.1", + "dockerImage": "googleapis/artman@sha256:5599b61e56a372d21b671969ee915fbca0f6c3a0daaeb898d01f8f685f1bbc8b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "d99df0d67057a233c711187e0689baa4f8e6333d", - "internalRef": "289709813" + "sha": "cda99c1f7dc5e4ca9b1caeae1dc330838cbc1461", + "internalRef": "290800639" } }, { From bd8a9eb7bef8bd02f0086183447cc1b3892edd46 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 23 Jan 2020 16:26:14 -0800 Subject: [PATCH 0562/1115] chore: clear synth.metadata --- handwritten/pubsub/synth.metadata | 39 ------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 handwritten/pubsub/synth.metadata diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata deleted file mode 100644 index 0ae727d2535..00000000000 --- a/handwritten/pubsub/synth.metadata +++ /dev/null @@ -1,39 +0,0 @@ -{ - "updateTime": "2020-01-21T21:05:44.729996Z", - "sources": [ - { - "generator": { - "name": "artman", - "version": "0.44.1", - "dockerImage": "googleapis/artman@sha256:5599b61e56a372d21b671969ee915fbca0f6c3a0daaeb898d01f8f685f1bbc8b" - } - }, - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "cda99c1f7dc5e4ca9b1caeae1dc330838cbc1461", - "internalRef": "290800639" - } - }, - { - "template": { - "name": "node_library", - "origin": "synthtool.gcp", - "version": "2019.10.17" - } - } - ], - "destinations": [ - { - "client": { - "source": "googleapis", - "apiName": "pubsub", - "apiVersion": "v1", - "language": "nodejs", - "generator": "gapic", - "config": "google/pubsub/artman_pubsub.yaml" - } - } - ] -} \ No newline at end of file From 3ef80bd32251d39c5ba05cdbeeeed73de9aed33c Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 24 Jan 2020 10:44:58 -0800 Subject: [PATCH 0563/1115] feat(defaults): update defaults for the node client library to match other pub/sub libraries (#859) * feat(defaults): update defaults for the node client library to match other pub/sub libraries * fix(defaults): set library-wide defaults for message queueing and streams * chore: remove accidentally committed test file * chore: run lint fix on updated files * chore: remove extra comma in default-options.ts so header checker is happy * fix: also use defaultOptions in the setOptions default parameters * fix: one more lint fix for lease-manager.ts --- handwritten/pubsub/src/default-options.ts | 33 +++++++++++++++++++++++ handwritten/pubsub/src/lease-manager.ts | 17 ++++++------ handwritten/pubsub/src/message-stream.ts | 3 ++- handwritten/pubsub/src/subscriber.ts | 13 +++++---- handwritten/pubsub/test/lease-manager.ts | 9 ++++--- handwritten/pubsub/test/message-stream.ts | 10 ++++--- 6 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 handwritten/pubsub/src/default-options.ts diff --git a/handwritten/pubsub/src/default-options.ts b/handwritten/pubsub/src/default-options.ts new file mode 100644 index 00000000000..a8b9531e456 --- /dev/null +++ b/handwritten/pubsub/src/default-options.ts @@ -0,0 +1,33 @@ +/*! + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// These options will be used library-wide. They're specified here so that +// they can be changed easily in the future. +export const defaultOptions = { + // The maximum number of messages that may be queued for sending. + maxOutstandingMessages: 1000, + + // The maximum amount of message data that may be queued for sending, + // in bytes. + maxOutstandingBytes: 100 * 1024 * 1024, + + // The maximum number of minutes that a message's lease will ever + // be extended. + maxExtensionMinutes: 60, + + // The maximum number of streams/threads that will ever be opened. + maxStreams: 5, +}; diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index f704919fc31..1c9743e69b7 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -18,6 +18,7 @@ import {EventEmitter} from 'events'; import {freemem} from 'os'; import {Message, Subscriber} from './subscriber'; +import {defaultOptions} from './default-options'; export interface FlowControlOptions { allowExcessMessages?: boolean; @@ -34,12 +35,12 @@ export interface FlowControlOptions { * Setting this option to false will make the client manage any excess * messages until you're ready for them. This will prevent them from being * redelivered and make the maxMessages option behave more predictably. - * @property {number} [maxBytes] The desired amount of memory to allow message - * data to consume, defaults to 20% of available memory. Its possible that - * this value will be exceeded since messages are received in batches. - * @property {number} [maxExtension=Infinity] The maximum duration (in seconds) + * @property {number} [maxBytes=104857600] The desired amount of memory to + * allow message data to consume. (Default: 100MB) It's possible that this + * value will be exceeded, since messages are received in batches. + * @property {number} [maxExtension=60] The maximum duration (in seconds) * to extend the message deadline before redelivering. - * @property {number} [maxMessages=100] The desired number of messages to allow + * @property {number} [maxMessages=1000] The desired number of messages to allow * in memory before pausing the message stream. Unless allowExcessMessages * is set to false, it is very likely that this value will be exceeded since * any given message batch could contain a greater number of messages than @@ -185,9 +186,9 @@ export class LeaseManager extends EventEmitter { setOptions(options: FlowControlOptions): void { const defaults: FlowControlOptions = { allowExcessMessages: true, - maxBytes: freemem() * 0.2, - maxExtension: Infinity, - maxMessages: 100, + maxBytes: defaultOptions.maxOutstandingBytes, + maxExtension: defaultOptions.maxExtensionMinutes, + maxMessages: defaultOptions.maxOutstandingMessages, }; this._options = Object.assign(defaults, options); diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 9ef6016961b..52785f90329 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -29,6 +29,7 @@ import {PassThrough} from 'stream'; import {PullRetry} from './pull-retry'; import {Subscriber} from './subscriber'; import {google} from '../proto/pubsub'; +import {defaultOptions} from './default-options'; /*! * Frequency to ping streams. @@ -47,7 +48,7 @@ const PULL_TIMEOUT = require('./v1/subscriber_client_config.json').interfaces[ */ const DEFAULT_OPTIONS: MessageStreamOptions = { highWaterMark: 0, - maxStreams: 5, + maxStreams: defaultOptions.maxStreams, timeout: 300000, }; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 20aa8bd6204..2d28338eda6 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -28,6 +28,7 @@ import {FlowControlOptions, LeaseManager} from './lease-manager'; import {AckQueue, BatchOptions, ModAckQueue} from './message-queues'; import {MessageStream, MessageStreamOptions} from './message-stream'; import {Subscription} from './subscription'; +import {defaultOptions} from './default-options'; export type PullResponse = google.pubsub.v1.IPullResponse; @@ -396,18 +397,20 @@ export class Subscriber extends EventEmitter { this._isUserSetDeadline = true; } - // in the event that the user has specified the maxMessages option, we want - // to make sure that the maxStreams option isn't higher - // it doesn't really make sense to open 5 streams if the user only wants + // In the event that the user has specified the maxMessages option, we want + // to make sure that the maxStreams option isn't higher. + // It doesn't really make sense to open 5 streams if the user only wants // 1 message at a time. if (options.flowControl) { - const {maxMessages = 100} = options.flowControl; + const { + maxMessages = defaultOptions.maxOutstandingMessages, + } = options.flowControl; if (!options.streamingOptions) { options.streamingOptions = {} as MessageStreamOptions; } - const {maxStreams = 5} = options.streamingOptions; + const {maxStreams = defaultOptions.maxStreams} = options.streamingOptions; options.streamingOptions.maxStreams = Math.min(maxStreams, maxMessages); } } diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 7f2570a0603..6436be92615 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -22,6 +22,7 @@ import * as sinon from 'sinon'; import * as leaseTypes from '../src/lease-manager'; import {Message, Subscriber} from '../src/subscriber'; +import {defaultOptions} from '../src/default-options'; const FREE_MEM = 9376387072; const fakeos = { @@ -424,7 +425,7 @@ describe('LeaseManager', () => { describe('setOptions', () => { it('should allow excess messages by default', () => {}); - it('should default maxBytes to 20% of free memory', () => { + it('should default maxBytes', () => { const littleMessage = new FakeMessage() as Message; const bigMessage = new FakeMessage(); @@ -432,13 +433,13 @@ describe('LeaseManager', () => { assert.strictEqual(leaseManager.isFull(), false); leaseManager.remove(littleMessage); - bigMessage.length = FREE_MEM * 0.21; + bigMessage.length = defaultOptions.maxOutstandingBytes * 2; leaseManager.add(bigMessage as Message); assert.strictEqual(leaseManager.isFull(), true); }); - it('should cap maxMessages at 100', () => { - for (let i = 0; i < 100; i++) { + it('should cap maxMessages', () => { + for (let i = 0; i < defaultOptions.maxOutstandingMessages; i++) { assert.strictEqual(leaseManager.isFull(), false); leaseManager.add(new FakeMessage() as Message); } diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 4931b3380ab..336db69dca5 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -23,6 +23,7 @@ import {Duplex, PassThrough} from 'stream'; import * as uuid from 'uuid'; import * as messageTypes from '../src/message-stream'; import {Subscriber} from '../src/subscriber'; +import {defaultOptions} from '../src/default-options'; const FAKE_STREAMING_PULL_TIMEOUT = 123456789; const FAKE_CLIENT_CONFIG = { @@ -217,8 +218,8 @@ describe('MessageStream', () => { }); }); - it('should default maxStreams to 5', () => { - assert.strictEqual(client.streams.length, 5); + it('should default maxStreams', () => { + assert.strictEqual(client.streams.length, defaultOptions.maxStreams); }); it('should pull pullTimeouts default from config file', () => { @@ -249,7 +250,10 @@ describe('MessageStream', () => { messageStream = new MessageStream(subscriber, {highWaterMark}); setImmediate(() => { - assert.strictEqual(client.streams.length, 5); + assert.strictEqual( + client.streams.length, + defaultOptions.maxStreams + ); client.streams.forEach(stream => { assert.strictEqual( stream._readableState.highWaterMark, From 05342b73a6553d2f9246af222d0f5b377057c0bd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 24 Jan 2020 13:08:32 -0800 Subject: [PATCH 0564/1115] chore: regenerate synth.metadata (#861) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/synth.metadata | 698 ++++++++++++++++++++++++++++++ 1 file changed, 698 insertions(+) create mode 100644 handwritten/pubsub/synth.metadata diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata new file mode 100644 index 00000000000..4080275b617 --- /dev/null +++ b/handwritten/pubsub/synth.metadata @@ -0,0 +1,698 @@ +{ + "updateTime": "2020-01-24T12:28:15.593056Z", + "sources": [ + { + "generator": { + "name": "artman", + "version": "0.44.1", + "dockerImage": "googleapis/artman@sha256:5599b61e56a372d21b671969ee915fbca0f6c3a0daaeb898d01f8f685f1bbc8b" + } + }, + { + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "e26cab8afd19d396b929039dac5d874cf0b5336c", + "internalRef": "291240093" + } + }, + { + "template": { + "name": "node_library", + "origin": "synthtool.gcp", + "version": "2019.10.17" + } + } + ], + "destinations": [ + { + "client": { + "source": "googleapis", + "apiName": "pubsub", + "apiVersion": "v1", + "language": "nodejs", + "generator": "gapic", + "config": "google/pubsub/artman_pubsub.yaml" + } + } + ], + "newFiles": [ + { + "path": ".eslintignore" + }, + { + "path": ".eslintrc.yml" + }, + { + "path": ".github/ISSUE_TEMPLATE/bug_report.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/feature_request.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/support_request.md" + }, + { + "path": ".github/PULL_REQUEST_TEMPLATE.md" + }, + { + "path": ".github/release-please.yml" + }, + { + "path": ".gitignore" + }, + { + "path": ".jsdoc.js" + }, + { + "path": ".kokoro/.gitattributes" + }, + { + "path": ".kokoro/common.cfg" + }, + { + "path": ".kokoro/continuous/node10/common.cfg" + }, + { + "path": ".kokoro/continuous/node10/docs.cfg" + }, + { + "path": ".kokoro/continuous/node10/lint.cfg" + }, + { + "path": ".kokoro/continuous/node10/samples-test.cfg" + }, + { + "path": ".kokoro/continuous/node10/system-test.cfg" + }, + { + "path": ".kokoro/continuous/node10/test.cfg" + }, + { + "path": ".kokoro/continuous/node12/common.cfg" + }, + { + "path": ".kokoro/continuous/node12/test.cfg" + }, + { + "path": ".kokoro/continuous/node8/common.cfg" + }, + { + "path": ".kokoro/continuous/node8/test.cfg" + }, + { + "path": ".kokoro/docs.sh" + }, + { + "path": ".kokoro/lint.sh" + }, + { + "path": ".kokoro/presubmit/node10/common.cfg" + }, + { + "path": ".kokoro/presubmit/node10/docs.cfg" + }, + { + "path": ".kokoro/presubmit/node10/lint.cfg" + }, + { + "path": ".kokoro/presubmit/node10/samples-test.cfg" + }, + { + "path": ".kokoro/presubmit/node10/system-test.cfg" + }, + { + "path": ".kokoro/presubmit/node10/test.cfg" + }, + { + "path": ".kokoro/presubmit/node12/common.cfg" + }, + { + "path": ".kokoro/presubmit/node12/test.cfg" + }, + { + "path": ".kokoro/presubmit/node8/common.cfg" + }, + { + "path": ".kokoro/presubmit/node8/test.cfg" + }, + { + "path": ".kokoro/presubmit/windows/common.cfg" + }, + { + "path": ".kokoro/presubmit/windows/test.cfg" + }, + { + "path": ".kokoro/publish.sh" + }, + { + "path": ".kokoro/release/common.cfg" + }, + { + "path": ".kokoro/release/docs.cfg" + }, + { + "path": ".kokoro/release/docs.sh" + }, + { + "path": ".kokoro/release/publish.cfg" + }, + { + "path": ".kokoro/samples-test.sh" + }, + { + "path": ".kokoro/system-test.sh" + }, + { + "path": ".kokoro/test.bat" + }, + { + "path": ".kokoro/test.sh" + }, + { + "path": ".kokoro/trampoline.sh" + }, + { + "path": ".nycrc" + }, + { + "path": ".prettierignore" + }, + { + "path": ".prettierrc" + }, + { + "path": ".readme-partials.yml" + }, + { + "path": ".repo-metadata.json" + }, + { + "path": "CHANGELOG.md" + }, + { + "path": "CODE_OF_CONDUCT.md" + }, + { + "path": "CONTRIBUTING.md" + }, + { + "path": "LICENSE" + }, + { + "path": "README.md" + }, + { + "path": "bin/README.md" + }, + { + "path": "bin/benchwrapper.js" + }, + { + "path": "bin/pubsub.proto" + }, + { + "path": "codecov.yaml" + }, + { + "path": "linkinator.config.json" + }, + { + "path": "package.json" + }, + { + "path": "proto/iam.d.ts" + }, + { + "path": "proto/pubsub.d.ts" + }, + { + "path": "protos/google/api/annotations.proto" + }, + { + "path": "protos/google/api/auth.proto" + }, + { + "path": "protos/google/api/backend.proto" + }, + { + "path": "protos/google/api/billing.proto" + }, + { + "path": "protos/google/api/config_change.proto" + }, + { + "path": "protos/google/api/consumer.proto" + }, + { + "path": "protos/google/api/context.proto" + }, + { + "path": "protos/google/api/control.proto" + }, + { + "path": "protos/google/api/distribution.proto" + }, + { + "path": "protos/google/api/documentation.proto" + }, + { + "path": "protos/google/api/endpoint.proto" + }, + { + "path": "protos/google/api/experimental/authorization_config.proto" + }, + { + "path": "protos/google/api/experimental/experimental.proto" + }, + { + "path": "protos/google/api/http.proto" + }, + { + "path": "protos/google/api/httpbody.proto" + }, + { + "path": "protos/google/api/label.proto" + }, + { + "path": "protos/google/api/log.proto" + }, + { + "path": "protos/google/api/logging.proto" + }, + { + "path": "protos/google/api/metric.proto" + }, + { + "path": "protos/google/api/monitored_resource.proto" + }, + { + "path": "protos/google/api/monitoring.proto" + }, + { + "path": "protos/google/api/quota.proto" + }, + { + "path": "protos/google/api/service.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/check_error.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/distribution.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/log_entry.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/metric_value.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/operation.proto" + }, + { + "path": "protos/google/api/servicecontrol/v1/service_controller.proto" + }, + { + "path": "protos/google/api/servicemanagement/v1/resources.proto" + }, + { + "path": "protos/google/api/servicemanagement/v1/servicemanager.proto" + }, + { + "path": "protos/google/api/source_info.proto" + }, + { + "path": "protos/google/api/system_parameter.proto" + }, + { + "path": "protos/google/api/usage.proto" + }, + { + "path": "protos/google/iam/admin/v1/iam.proto" + }, + { + "path": "protos/google/iam/v1/iam_policy.proto" + }, + { + "path": "protos/google/iam/v1/options.proto" + }, + { + "path": "protos/google/iam/v1/policy.proto" + }, + { + "path": "protos/google/protobuf/any.proto" + }, + { + "path": "protos/google/protobuf/api.proto" + }, + { + "path": "protos/google/protobuf/descriptor.proto" + }, + { + "path": "protos/google/protobuf/duration.proto" + }, + { + "path": "protos/google/protobuf/empty.proto" + }, + { + "path": "protos/google/protobuf/field_mask.proto" + }, + { + "path": "protos/google/protobuf/source_context.proto" + }, + { + "path": "protos/google/protobuf/struct.proto" + }, + { + "path": "protos/google/protobuf/timestamp.proto" + }, + { + "path": "protos/google/protobuf/type.proto" + }, + { + "path": "protos/google/protobuf/util/json_format_proto3.proto" + }, + { + "path": "protos/google/protobuf/wrappers.proto" + }, + { + "path": "protos/google/pubsub/v1/pubsub.proto" + }, + { + "path": "protos/google/type/expr.proto" + }, + { + "path": "protos/protos.d.ts" + }, + { + "path": "protos/protos.js" + }, + { + "path": "protos/protos.json" + }, + { + "path": "renovate.json" + }, + { + "path": "samples/.eslintrc.yml" + }, + { + "path": "samples/README.md" + }, + { + "path": "samples/createPushSubscription.js" + }, + { + "path": "samples/createSubscription.js" + }, + { + "path": "samples/createTopic.js" + }, + { + "path": "samples/deleteSubscription.js" + }, + { + "path": "samples/deleteTopic.js" + }, + { + "path": "samples/getSubscription.js" + }, + { + "path": "samples/getSubscriptionPolicy.js" + }, + { + "path": "samples/getTopicPolicy.js" + }, + { + "path": "samples/listAllTopics.js" + }, + { + "path": "samples/listSubscriptions.js" + }, + { + "path": "samples/listTopicSubscriptions.js" + }, + { + "path": "samples/listenForErrors.js" + }, + { + "path": "samples/listenForMessages.js" + }, + { + "path": "samples/listenForOrderedMessages.js" + }, + { + "path": "samples/modifyPushConfig.js" + }, + { + "path": "samples/package.json" + }, + { + "path": "samples/publishBatchedMessages.js" + }, + { + "path": "samples/publishMessage.js" + }, + { + "path": "samples/publishMessageWithCustomAttributes.js" + }, + { + "path": "samples/publishOrderedMessage.js" + }, + { + "path": "samples/publishWithRetrySettings.js" + }, + { + "path": "samples/quickstart.js" + }, + { + "path": "samples/setSubscriptionPolicy.js" + }, + { + "path": "samples/setTopicPolicy.js" + }, + { + "path": "samples/setup_for_tests.sh" + }, + { + "path": "samples/subscribeWithFlowControlSettings.js" + }, + { + "path": "samples/synchronousPull.js" + }, + { + "path": "samples/synchronousPullWithLeaseManagement.js" + }, + { + "path": "samples/system-test/quickstart.test.js" + }, + { + "path": "samples/system-test/subscriptions.test.js" + }, + { + "path": "samples/system-test/topics.test.js" + }, + { + "path": "samples/testSubscriptionPermissions.js" + }, + { + "path": "samples/testTopicPermissions.js" + }, + { + "path": "smoke-test/.eslintrc.yml" + }, + { + "path": "smoke-test/publisher_smoke_test.js" + }, + { + "path": "src/.eslintrc.yml" + }, + { + "path": "src/histogram.ts" + }, + { + "path": "src/iam.ts" + }, + { + "path": "src/index.ts" + }, + { + "path": "src/lease-manager.ts" + }, + { + "path": "src/message-queues.ts" + }, + { + "path": "src/message-stream.ts" + }, + { + "path": "src/publisher/index.ts" + }, + { + "path": "src/publisher/message-batch.ts" + }, + { + "path": "src/publisher/message-queues.ts" + }, + { + "path": "src/publisher/publish-error.ts" + }, + { + "path": "src/pubsub.ts" + }, + { + "path": "src/pull-retry.ts" + }, + { + "path": "src/service_proto_list.json" + }, + { + "path": "src/snapshot.ts" + }, + { + "path": "src/subscriber.ts" + }, + { + "path": "src/subscription.ts" + }, + { + "path": "src/topic.ts" + }, + { + "path": "src/util.ts" + }, + { + "path": "src/v1/doc/google/iam/v1/doc_iam_policy.js" + }, + { + "path": "src/v1/doc/google/iam/v1/doc_options.js" + }, + { + "path": "src/v1/doc/google/iam/v1/doc_policy.js" + }, + { + "path": "src/v1/doc/google/protobuf/doc_duration.js" + }, + { + "path": "src/v1/doc/google/protobuf/doc_empty.js" + }, + { + "path": "src/v1/doc/google/protobuf/doc_field_mask.js" + }, + { + "path": "src/v1/doc/google/protobuf/doc_timestamp.js" + }, + { + "path": "src/v1/doc/google/pubsub/v1/doc_pubsub.js" + }, + { + "path": "src/v1/doc/google/type/doc_expr.js" + }, + { + "path": "src/v1/index.js" + }, + { + "path": "src/v1/publisher_client.js" + }, + { + "path": "src/v1/publisher_client_config.json" + }, + { + "path": "src/v1/publisher_proto_list.json" + }, + { + "path": "src/v1/subscriber_client.js" + }, + { + "path": "src/v1/subscriber_client_config.json" + }, + { + "path": "src/v1/subscriber_proto_list.json" + }, + { + "path": "synth.py" + }, + { + "path": "system-test/fixtures/ordered-messages.json" + }, + { + "path": "system-test/fixtures/sample/package.json" + }, + { + "path": "system-test/fixtures/sample/src/index.ts" + }, + { + "path": "system-test/fixtures/sample/tsconfig.json" + }, + { + "path": "system-test/install.ts" + }, + { + "path": "system-test/pubsub.ts" + }, + { + "path": "test/.eslintrc.yml" + }, + { + "path": "test/gapic-v1.js" + }, + { + "path": "test/histogram.ts" + }, + { + "path": "test/iam.ts" + }, + { + "path": "test/index.ts" + }, + { + "path": "test/lease-manager.ts" + }, + { + "path": "test/message-queues.ts" + }, + { + "path": "test/message-stream.ts" + }, + { + "path": "test/mocha.opts" + }, + { + "path": "test/publisher/index.ts" + }, + { + "path": "test/publisher/message-batch.ts" + }, + { + "path": "test/publisher/message-queues.ts" + }, + { + "path": "test/publisher/publish-error.ts" + }, + { + "path": "test/pubsub.ts" + }, + { + "path": "test/pull-retry.ts" + }, + { + "path": "test/snapshot.ts" + }, + { + "path": "test/subscriber.ts" + }, + { + "path": "test/subscription.ts" + }, + { + "path": "test/topic.ts" + }, + { + "path": "tsconfig.json" + }, + { + "path": "tslint.json" + } + ] +} \ No newline at end of file From 4448da760d354d7316c514609cd4388e2f03b87a Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 24 Jan 2020 15:31:37 -0800 Subject: [PATCH 0565/1115] chore: remove temporary linkinator exception from PR #856 (#863) --- handwritten/pubsub/linkinator.config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json index 8daa69c841c..d780d6bfff5 100644 --- a/handwritten/pubsub/linkinator.config.json +++ b/handwritten/pubsub/linkinator.config.json @@ -2,7 +2,6 @@ "recurse": true, "skip": [ "https://codecov.io/gh/googleapis/", - "www.googleapis.com", - "https://github.com/googleapis/nodejs-pubsub/" + "www.googleapis.com" ] } From 2989f6488aaa77236cd32e982a4205a517ca6927 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2020 13:21:01 -0800 Subject: [PATCH 0566/1115] chore: release 1.4.0 (#862) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 8e14319f15d..c73121cff0f 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [1.4.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.3.0...v1.4.0) (2020-01-24) + + +### Features + +* **defaults:** update defaults for the node client library to match other pub/sub libraries ([#859](https://www.github.com/googleapis/nodejs-pubsub/issues/859)) ([8d6c3f7](https://www.github.com/googleapis/nodejs-pubsub/commit/8d6c3f778cbe00cde8b273b25bc50b491687396b)) + ## [1.3.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.2.0...v1.3.0) (2020-01-14) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 99947a5ab7e..59fab0b7e5c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.3.0", + "version": "1.4.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From befd3bc859f117b7318fbc28dfd86899e89ecbca Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 28 Jan 2020 14:38:32 -0800 Subject: [PATCH 0567/1115] fix: enum, bytes, and Long types now accept strings --- handwritten/pubsub/protos/protos.d.ts | 60 +++++++++++++-------------- handwritten/pubsub/synth.metadata | 20 +++++---- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index dae4bff7733..5bb1779877c 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -417,7 +417,7 @@ export namespace google { interface IPubsubMessage { /** PubsubMessage data */ - data?: (Uint8Array|null); + data?: (Uint8Array|string|null); /** PubsubMessage attributes */ attributes?: ({ [k: string]: string }|null); @@ -442,7 +442,7 @@ export namespace google { constructor(properties?: google.pubsub.v1.IPubsubMessage); /** PubsubMessage data. */ - public data: Uint8Array; + public data: (Uint8Array|string); /** PubsubMessage attributes. */ public attributes: { [k: string]: string }; @@ -5655,10 +5655,10 @@ export namespace google { number?: (number|null); /** FieldDescriptorProto label */ - label?: (google.protobuf.FieldDescriptorProto.Label|null); + label?: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label|null); /** FieldDescriptorProto type */ - type?: (google.protobuf.FieldDescriptorProto.Type|null); + type?: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type|null); /** FieldDescriptorProto typeName */ typeName?: (string|null); @@ -5695,10 +5695,10 @@ export namespace google { public number: number; /** FieldDescriptorProto label. */ - public label: google.protobuf.FieldDescriptorProto.Label; + public label: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label); /** FieldDescriptorProto type. */ - public type: google.protobuf.FieldDescriptorProto.Type; + public type: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type); /** FieldDescriptorProto typeName. */ public typeName: string; @@ -6473,7 +6473,7 @@ export namespace google { javaStringCheckUtf8?: (boolean|null); /** FileOptions optimizeFor */ - optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|null); + optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode|null); /** FileOptions goPackage */ goPackage?: (string|null); @@ -6546,7 +6546,7 @@ export namespace google { public javaStringCheckUtf8: boolean; /** FileOptions optimizeFor. */ - public optimizeFor: google.protobuf.FileOptions.OptimizeMode; + public optimizeFor: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode); /** FileOptions goPackage. */ public goPackage: string; @@ -6792,13 +6792,13 @@ export namespace google { interface IFieldOptions { /** FieldOptions ctype */ - ctype?: (google.protobuf.FieldOptions.CType|null); + ctype?: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType|null); /** FieldOptions packed */ packed?: (boolean|null); /** FieldOptions jstype */ - jstype?: (google.protobuf.FieldOptions.JSType|null); + jstype?: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType|null); /** FieldOptions lazy */ lazy?: (boolean|null); @@ -6823,13 +6823,13 @@ export namespace google { constructor(properties?: google.protobuf.IFieldOptions); /** FieldOptions ctype. */ - public ctype: google.protobuf.FieldOptions.CType; + public ctype: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType); /** FieldOptions packed. */ public packed: boolean; /** FieldOptions jstype. */ - public jstype: google.protobuf.FieldOptions.JSType; + public jstype: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType); /** FieldOptions lazy. */ public lazy: boolean; @@ -7328,7 +7328,7 @@ export namespace google { deprecated?: (boolean|null); /** MethodOptions idempotencyLevel */ - idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|null); + idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel|null); /** MethodOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -7353,7 +7353,7 @@ export namespace google { public deprecated: boolean; /** MethodOptions idempotencyLevel. */ - public idempotencyLevel: google.protobuf.MethodOptions.IdempotencyLevel; + public idempotencyLevel: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel); /** MethodOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -7449,16 +7449,16 @@ export namespace google { identifierValue?: (string|null); /** UninterpretedOption positiveIntValue */ - positiveIntValue?: (number|Long|null); + positiveIntValue?: (number|Long|string|null); /** UninterpretedOption negativeIntValue */ - negativeIntValue?: (number|Long|null); + negativeIntValue?: (number|Long|string|null); /** UninterpretedOption doubleValue */ doubleValue?: (number|null); /** UninterpretedOption stringValue */ - stringValue?: (Uint8Array|null); + stringValue?: (Uint8Array|string|null); /** UninterpretedOption aggregateValue */ aggregateValue?: (string|null); @@ -7480,16 +7480,16 @@ export namespace google { public identifierValue: string; /** UninterpretedOption positiveIntValue. */ - public positiveIntValue: (number|Long); + public positiveIntValue: (number|Long|string); /** UninterpretedOption negativeIntValue. */ - public negativeIntValue: (number|Long); + public negativeIntValue: (number|Long|string); /** UninterpretedOption doubleValue. */ public doubleValue: number; /** UninterpretedOption stringValue. */ - public stringValue: Uint8Array; + public stringValue: (Uint8Array|string); /** UninterpretedOption aggregateValue. */ public aggregateValue: string; @@ -8076,7 +8076,7 @@ export namespace google { interface IDuration { /** Duration seconds */ - seconds?: (number|Long|null); + seconds?: (number|Long|string|null); /** Duration nanos */ nanos?: (number|null); @@ -8092,7 +8092,7 @@ export namespace google { constructor(properties?: google.protobuf.IDuration); /** Duration seconds. */ - public seconds: (number|Long); + public seconds: (number|Long|string); /** Duration nanos. */ public nanos: number; @@ -8346,7 +8346,7 @@ export namespace google { interface ITimestamp { /** Timestamp seconds */ - seconds?: (number|Long|null); + seconds?: (number|Long|string|null); /** Timestamp nanos */ nanos?: (number|null); @@ -8362,7 +8362,7 @@ export namespace google { constructor(properties?: google.protobuf.ITimestamp); /** Timestamp seconds. */ - public seconds: (number|Long); + public seconds: (number|Long|string); /** Timestamp nanos. */ public nanos: number; @@ -9010,7 +9010,7 @@ export namespace google { bindings?: (google.iam.v1.IBinding[]|null); /** Policy etag */ - etag?: (Uint8Array|null); + etag?: (Uint8Array|string|null); } /** Represents a Policy. */ @@ -9029,7 +9029,7 @@ export namespace google { public bindings: google.iam.v1.IBinding[]; /** Policy etag. */ - public etag: Uint8Array; + public etag: (Uint8Array|string); /** * Creates a new Policy instance using the specified properties. @@ -9304,7 +9304,7 @@ export namespace google { interface IBindingDelta { /** BindingDelta action */ - action?: (google.iam.v1.BindingDelta.Action|null); + action?: (google.iam.v1.BindingDelta.Action|keyof typeof google.iam.v1.BindingDelta.Action|null); /** BindingDelta role */ role?: (string|null); @@ -9326,7 +9326,7 @@ export namespace google { constructor(properties?: google.iam.v1.IBindingDelta); /** BindingDelta action. */ - public action: google.iam.v1.BindingDelta.Action; + public action: (google.iam.v1.BindingDelta.Action|keyof typeof google.iam.v1.BindingDelta.Action); /** BindingDelta role. */ public role: string; @@ -9422,7 +9422,7 @@ export namespace google { interface IAuditConfigDelta { /** AuditConfigDelta action */ - action?: (google.iam.v1.AuditConfigDelta.Action|null); + action?: (google.iam.v1.AuditConfigDelta.Action|keyof typeof google.iam.v1.AuditConfigDelta.Action|null); /** AuditConfigDelta service */ service?: (string|null); @@ -9444,7 +9444,7 @@ export namespace google { constructor(properties?: google.iam.v1.IAuditConfigDelta); /** AuditConfigDelta action. */ - public action: google.iam.v1.AuditConfigDelta.Action; + public action: (google.iam.v1.AuditConfigDelta.Action|keyof typeof google.iam.v1.AuditConfigDelta.Action); /** AuditConfigDelta service. */ public service: string; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 4080275b617..feee1ea5aa1 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,20 @@ { - "updateTime": "2020-01-24T12:28:15.593056Z", + "updateTime": "2020-01-28T12:29:06.603478Z", "sources": [ { "generator": { "name": "artman", - "version": "0.44.1", - "dockerImage": "googleapis/artman@sha256:5599b61e56a372d21b671969ee915fbca0f6c3a0daaeb898d01f8f685f1bbc8b" + "version": "0.44.3", + "dockerImage": "googleapis/artman@sha256:62b8b29acaae54b06a4183aa772e65b106e92d4bc466eb4db07953ab78bdb90c" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "e26cab8afd19d396b929039dac5d874cf0b5336c", - "internalRef": "291240093" + "sha": "8e981acfd9b97ea2f312f11bbaa7b6c16e412dea", + "internalRef": "291821782", + "log": "8e981acfd9b97ea2f312f11bbaa7b6c16e412dea\nBeta launch for PersonDetection and FaceDetection features.\n\nPiperOrigin-RevId: 291821782\n\n994e067fae3b21e195f7da932b08fff806d70b5d\nasset: add annotations to v1p2beta1\n\nPiperOrigin-RevId: 291815259\n\n244e1d2c89346ca2e0701b39e65552330d68545a\nAdd Playable Locations service\n\nPiperOrigin-RevId: 291806349\n\n909f8f67963daf45dd88d020877fb9029b76788d\nasset: add annotations to v1beta2\n\nPiperOrigin-RevId: 291805301\n\n3c39a1d6e23c1ef63c7fba4019c25e76c40dfe19\nKMS: add file-level message for CryptoKeyPath, it is defined in gapic yaml but not\nin proto files.\n\nPiperOrigin-RevId: 291420695\n\nc6f3f350b8387f8d1b85ed4506f30187ebaaddc3\ncontaineranalysis: update v1beta1 and bazel build with annotations\n\nPiperOrigin-RevId: 291401900\n\n92887d74b44e4e636252b7b8477d0d2570cd82db\nfix: fix the location of grpc config file.\n\nPiperOrigin-RevId: 291396015\n\n" } }, { @@ -472,9 +473,6 @@ { "path": "samples/setTopicPolicy.js" }, - { - "path": "samples/setup_for_tests.sh" - }, { "path": "samples/subscribeWithFlowControlSettings.js" }, @@ -508,6 +506,9 @@ { "path": "src/.eslintrc.yml" }, + { + "path": "src/default-options.ts" + }, { "path": "src/histogram.ts" }, @@ -610,6 +611,9 @@ { "path": "src/v1/subscriber_proto_list.json" }, + { + "path": "synth.metadata" + }, { "path": "synth.py" }, From d965ef1975b2fc6b79d7d4bf2a47ac53c95f0a46 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2020 14:59:06 -0800 Subject: [PATCH 0568/1115] chore: release 1.4.1 (#871) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c73121cff0f..6c6907c821e 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [1.4.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.4.0...v1.4.1) (2020-01-28) + + +### Bug Fixes + +* enum, bytes, and Long types now accept strings ([186778f](https://www.github.com/googleapis/nodejs-pubsub/commit/186778f627e0252f25508a80165f253b9dedcb83)) + ## [1.4.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.3.0...v1.4.0) (2020-01-24) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 59fab0b7e5c..b8ce31ef871 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.4.0", + "version": "1.4.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From eae81829b966e9b89756fdbd73d8a5acc09ef7f4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 30 Jan 2020 16:34:23 +0100 Subject: [PATCH 0569/1115] chore(deps): update dependency @types/mocha to v7 --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b8ce31ef871..86f1e654a8e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -69,7 +69,7 @@ "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", - "@types/mocha": "^5.2.5", + "@types/mocha": "^7.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", "@types/proxyquire": "^1.3.28", From 91bfc5186d0782a09ee64754e1711161cd07d2d1 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 31 Jan 2020 09:00:37 -0800 Subject: [PATCH 0570/1115] feat: added clientId to StreamingPullRequest --- .../protos/google/pubsub/v1/pubsub.proto | 34 +- handwritten/pubsub/protos/protos.d.ts | 6 + handwritten/pubsub/protos/protos.js | 22 + handwritten/pubsub/protos/protos.json | 4 + .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 34 +- .../pubsub/src/v1/subscriber_client.js | 13 +- handwritten/pubsub/synth.metadata | 674 +----------------- 7 files changed, 88 insertions(+), 699 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 3ad6355a8bf..da3801dfecb 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -164,7 +164,8 @@ message PubsubMessage { // at least one attribute. bytes data = 1; - // Optional attributes for this message. + // Attributes for this message. If this field is empty, the message must + // contain non-empty data. map attributes = 2; // ID of this message, assigned by the server when the message is published. @@ -178,10 +179,12 @@ message PubsubMessage { // publisher in a `Publish` call. google.protobuf.Timestamp publish_time = 4; - // Identifies related messages for which publish order should be respected. - // If a `Subscription` has `enable_message_ordering` set to `true`, messages - // published with the same `ordering_key` value will be delivered to - // subscribers in the order in which they are received by the Pub/Sub system. + // If non-empty, identifies related messages for which publish order should be + // respected. If a `Subscription` has `enable_message_ordering` set to `true`, + // messages published with the same non-empty `ordering_key` value will be + // delivered to subscribers in the order in which they are received by the + // Pub/Sub system. All `PubsubMessage`s published in a given `PublishRequest` + // must specify the same `ordering_key` value. // EXPERIMENTAL: This feature is part of a closed alpha release. This // API might be changed in backward-incompatible ways and is not recommended // for production use. It is not subject to any SLA or deprecation policy. @@ -922,6 +925,14 @@ message StreamingPullRequest { // requests from client to server. The minimum deadline you can specify is 10 // seconds. The maximum deadline you can specify is 600 seconds (10 minutes). int32 stream_ack_deadline_seconds = 5; + + // A unique identifier that is used to distinguish client instances from each + // other. Only needs to be provided on the initial request. When a stream + // disconnects and reconnects for the same stream, the client_id should be set + // to the same value so that state associated with the old stream can be + // transferred to the new stream. The same client_id should not be used for + // different client instances. + string client_id = 6; } // Response for the `StreamingPull` method. This response is used to stream @@ -933,13 +944,12 @@ message StreamingPullResponse { // Request for the `CreateSnapshot` method. message CreateSnapshotRequest { - // Optional user-provided name for this snapshot. - // If the name is not provided in the request, the server will assign a random - // name for this snapshot on the same project as the subscription. - // Note that for REST API requests, you must specify a name. See the - // - // resource name rules. - // Format is `projects/{project}/snapshots/{snap}`. + // User-provided name for this snapshot. If the name is not provided in the + // request, the server will assign a random name for this snapshot on the same + // project as the subscription. Note that for REST API requests, you must + // specify a name. See the resource + // name rules. Format is `projects/{project}/snapshots/{snap}`. string name = 1; // The subscription whose backlog the snapshot retains. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 5bb1779877c..4261a69fa7a 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -3556,6 +3556,9 @@ export namespace google { /** StreamingPullRequest streamAckDeadlineSeconds */ streamAckDeadlineSeconds?: (number|null); + + /** StreamingPullRequest clientId */ + clientId?: (string|null); } /** Represents a StreamingPullRequest. */ @@ -3582,6 +3585,9 @@ export namespace google { /** StreamingPullRequest streamAckDeadlineSeconds. */ public streamAckDeadlineSeconds: number; + /** StreamingPullRequest clientId. */ + public clientId: string; + /** * Creates a new StreamingPullRequest instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index d5e1631e41e..8a3dadcf53f 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -7875,6 +7875,7 @@ * @property {Array.|null} [modifyDeadlineSeconds] StreamingPullRequest modifyDeadlineSeconds * @property {Array.|null} [modifyDeadlineAckIds] StreamingPullRequest modifyDeadlineAckIds * @property {number|null} [streamAckDeadlineSeconds] StreamingPullRequest streamAckDeadlineSeconds + * @property {string|null} [clientId] StreamingPullRequest clientId */ /** @@ -7935,6 +7936,14 @@ */ StreamingPullRequest.prototype.streamAckDeadlineSeconds = 0; + /** + * StreamingPullRequest clientId. + * @member {string} clientId + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.clientId = ""; + /** * Creates a new StreamingPullRequest instance using the specified properties. * @function create @@ -7975,6 +7984,8 @@ writer.uint32(/* id 4, wireType 2 =*/34).string(message.modifyDeadlineAckIds[i]); if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) writer.uint32(/* id 5, wireType 0 =*/40).int32(message.streamAckDeadlineSeconds); + if (message.clientId != null && message.hasOwnProperty("clientId")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.clientId); return writer; }; @@ -8035,6 +8046,9 @@ case 5: message.streamAckDeadlineSeconds = reader.int32(); break; + case 6: + message.clientId = reader.string(); + break; default: reader.skipType(tag & 7); break; @@ -8097,6 +8111,9 @@ if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) if (!$util.isInteger(message.streamAckDeadlineSeconds)) return "streamAckDeadlineSeconds: integer expected"; + if (message.clientId != null && message.hasOwnProperty("clientId")) + if (!$util.isString(message.clientId)) + return "clientId: string expected"; return null; }; @@ -8137,6 +8154,8 @@ } if (object.streamAckDeadlineSeconds != null) message.streamAckDeadlineSeconds = object.streamAckDeadlineSeconds | 0; + if (object.clientId != null) + message.clientId = String(object.clientId); return message; }; @@ -8161,6 +8180,7 @@ if (options.defaults) { object.subscription = ""; object.streamAckDeadlineSeconds = 0; + object.clientId = ""; } if (message.subscription != null && message.hasOwnProperty("subscription")) object.subscription = message.subscription; @@ -8181,6 +8201,8 @@ } if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) object.streamAckDeadlineSeconds = message.streamAckDeadlineSeconds; + if (message.clientId != null && message.hasOwnProperty("clientId")) + object.clientId = message.clientId; return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index dd95be73804..4ee8c78f451 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -670,6 +670,10 @@ "streamAckDeadlineSeconds": { "type": "int32", "id": 5 + }, + "clientId": { + "type": "string", + "id": 6 } } }, diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index f770ec01893..863e5f253d1 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -82,7 +82,8 @@ const Topic = { * at least one attribute. * * @property {Object.} attributes - * Optional attributes for this message. + * Attributes for this message. If this field is empty, the message must + * contain non-empty data. * * @property {string} messageId * ID of this message, assigned by the server when the message is published. @@ -98,10 +99,12 @@ const Topic = { * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} * * @property {string} orderingKey - * Identifies related messages for which publish order should be respected. - * If a `Subscription` has `enable_message_ordering` set to `true`, messages - * published with the same `ordering_key` value will be delivered to - * subscribers in the order in which they are received by the Pub/Sub system. + * If non-empty, identifies related messages for which publish order should be + * respected. If a `Subscription` has `enable_message_ordering` set to `true`, + * messages published with the same non-empty `ordering_key` value will be + * delivered to subscribers in the order in which they are received by the + * Pub/Sub system. All `PubsubMessage`s published in a given `PublishRequest` + * must specify the same `ordering_key` value. * EXPERIMENTAL: This feature is part of a closed alpha release. This * API might be changed in backward-incompatible ways and is not recommended * for production use. It is not subject to any SLA or deprecation policy. @@ -872,6 +875,14 @@ const AcknowledgeRequest = { * requests from client to server. The minimum deadline you can specify is 10 * seconds. The maximum deadline you can specify is 600 seconds (10 minutes). * + * @property {string} clientId + * A unique identifier that is used to distinguish client instances from each + * other. Only needs to be provided on the initial request. When a stream + * disconnects and reconnects for the same stream, the client_id should be set + * to the same value so that state associated with the old stream can be + * transferred to the new stream. The same client_id should not be used for + * different client instances. + * * @typedef StreamingPullRequest * @memberof google.pubsub.v1 * @see [google.pubsub.v1.StreamingPullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} @@ -901,13 +912,12 @@ const StreamingPullResponse = { * Request for the `CreateSnapshot` method. * * @property {string} name - * Optional user-provided name for this snapshot. - * If the name is not provided in the request, the server will assign a random - * name for this snapshot on the same project as the subscription. - * Note that for REST API requests, you must specify a name. See the - * - * resource name rules. - * Format is `projects/{project}/snapshots/{snap}`. + * User-provided name for this snapshot. If the name is not provided in the + * request, the server will assign a random name for this snapshot on the same + * project as the subscription. Note that for REST API requests, you must + * specify a name. See the resource + * name rules. Format is `projects/{project}/snapshots/{snap}`. * * @property {string} subscription * The subscription whose backlog the snapshot retains. diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index 64e37daeee7..c99502f928c 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -1307,13 +1307,12 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.name - * Optional user-provided name for this snapshot. - * If the name is not provided in the request, the server will assign a random - * name for this snapshot on the same project as the subscription. - * Note that for REST API requests, you must specify a name. See the - * - * resource name rules. - * Format is `projects/{project}/snapshots/{snap}`. + * User-provided name for this snapshot. If the name is not provided in the + * request, the server will assign a random name for this snapshot on the same + * project as the subscription. Note that for REST API requests, you must + * specify a name. See the resource + * name rules. Format is `projects/{project}/snapshots/{snap}`. * @param {string} request.subscription * The subscription whose backlog the snapshot retains. * Specifically, the created snapshot is guaranteed to retain: diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index feee1ea5aa1..e5901df0580 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,20 +1,20 @@ { - "updateTime": "2020-01-28T12:29:06.603478Z", + "updateTime": "2020-01-31T12:29:13.791240Z", "sources": [ { "generator": { "name": "artman", - "version": "0.44.3", - "dockerImage": "googleapis/artman@sha256:62b8b29acaae54b06a4183aa772e65b106e92d4bc466eb4db07953ab78bdb90c" + "version": "0.44.4", + "dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "8e981acfd9b97ea2f312f11bbaa7b6c16e412dea", - "internalRef": "291821782", - "log": "8e981acfd9b97ea2f312f11bbaa7b6c16e412dea\nBeta launch for PersonDetection and FaceDetection features.\n\nPiperOrigin-RevId: 291821782\n\n994e067fae3b21e195f7da932b08fff806d70b5d\nasset: add annotations to v1p2beta1\n\nPiperOrigin-RevId: 291815259\n\n244e1d2c89346ca2e0701b39e65552330d68545a\nAdd Playable Locations service\n\nPiperOrigin-RevId: 291806349\n\n909f8f67963daf45dd88d020877fb9029b76788d\nasset: add annotations to v1beta2\n\nPiperOrigin-RevId: 291805301\n\n3c39a1d6e23c1ef63c7fba4019c25e76c40dfe19\nKMS: add file-level message for CryptoKeyPath, it is defined in gapic yaml but not\nin proto files.\n\nPiperOrigin-RevId: 291420695\n\nc6f3f350b8387f8d1b85ed4506f30187ebaaddc3\ncontaineranalysis: update v1beta1 and bazel build with annotations\n\nPiperOrigin-RevId: 291401900\n\n92887d74b44e4e636252b7b8477d0d2570cd82db\nfix: fix the location of grpc config file.\n\nPiperOrigin-RevId: 291396015\n\n" + "sha": "7ac66d9be8a7d7de4f13566d8663978c9ee9dcd7", + "internalRef": "292450564", + "log": "7ac66d9be8a7d7de4f13566d8663978c9ee9dcd7\nAdd Dataproc Autoscaling API to V1.\n\nPiperOrigin-RevId: 292450564\n\n5d932b2c1be3a6ef487d094e3cf5c0673d0241dd\n- Improve documentation\n- Add a client_id field to StreamingPullRequest\n\nPiperOrigin-RevId: 292434036\n\neaff9fa8edec3e914995ce832b087039c5417ea7\nmonitoring: v3 publish annotations and client retry config\n\nPiperOrigin-RevId: 292425288\n\n70958bab8c5353870d31a23fb2c40305b050d3fe\nBigQuery Storage Read API v1 clients.\n\nPiperOrigin-RevId: 292407644\n\n7a15e7fe78ff4b6d5c9606a3264559e5bde341d1\nUpdate backend proto for Google Cloud Endpoints\n\nPiperOrigin-RevId: 292391607\n\n3ca2c014e24eb5111c8e7248b1e1eb833977c83d\nbazel: Add --flaky_test_attempts=3 argument to prevent CI failures caused by flaky tests\n\nPiperOrigin-RevId: 292382559\n\n9933347c1f677e81e19a844c2ef95bfceaf694fe\nbazel:Integrate latest protoc-java-resource-names-plugin changes (fix for PyYAML dependency in bazel rules)\n\nPiperOrigin-RevId: 292376626\n\nb835ab9d2f62c88561392aa26074c0b849fb0bd3\nasset: v1p2beta1 add client config annotations\n\n* remove unintentionally exposed RPCs\n* remove messages relevant to removed RPCs\n\nPiperOrigin-RevId: 292369593\n\nc1246a29e22b0f98e800a536b5b0da2d933a55f2\nUpdating v1 protos with the latest inline documentation (in comments) and config options. Also adding a per-service .yaml file.\n\nPiperOrigin-RevId: 292310790\n\nb491d07cadaae7cde5608321f913e5ca1459b32d\nRevert accidental local_repository change\n\nPiperOrigin-RevId: 292245373\n\naf3400a8cb6110025198b59a0f7d018ae3cda700\nUpdate gapic-generator dependency (prebuilt PHP binary support).\n\nPiperOrigin-RevId: 292243997\n\n341fd5690fae36f36cf626ef048fbcf4bbe7cee6\ngrafeas: v1 add resource_definition for the grafeas.io/Project and change references for Project.\n\nPiperOrigin-RevId: 292221998\n\n42e915ec2ece1cd37a590fbcd10aa2c0fb0e5b06\nUpdate the gapic-generator, protoc-java-resource-name-plugin and protoc-docs-plugin to the latest commit.\n\nPiperOrigin-RevId: 292182368\n\nf035f47250675d31492a09f4a7586cfa395520a7\nFix grafeas build and update build.sh script to include gerafeas.\n\nPiperOrigin-RevId: 292168753\n\n26ccb214b7bc4a716032a6266bcb0a9ca55d6dbb\nasset: v1p1beta1 add client config annotations and retry config\n\nPiperOrigin-RevId: 292154210\n\n974ee5c0b5d03e81a50dafcedf41e0efebb5b749\nasset: v1beta1 add client config annotations\n\nPiperOrigin-RevId: 292152573\n\ncf3b61102ed5f36b827bc82ec39be09525f018c8\n Fix to protos for v1p1beta1 release of Cloud Security Command Center\n\nPiperOrigin-RevId: 292034635\n\n4e1cfaa7c0fede9e65d64213ca3da1b1255816c0\nUpdate the public proto to support UTF-8 encoded id for CatalogService API, increase the ListCatalogItems deadline to 300s and some minor documentation change\n\nPiperOrigin-RevId: 292030970\n\n9c483584f8fd5a1b862ae07973f4cc7bb3e46648\nasset: add annotations to v1p1beta1\n\nPiperOrigin-RevId: 292009868\n\ne19209fac29731d0baf6d9ac23da1164f7bdca24\nAdd the google.rpc.context.AttributeContext message to the open source\ndirectories.\n\nPiperOrigin-RevId: 291999930\n\nae5662960573f279502bf98a108a35ba1175e782\noslogin API: move file level option on top of the file to avoid protobuf.js bug.\n\nPiperOrigin-RevId: 291990506\n\neba3897fff7c49ed85d3c47fc96fe96e47f6f684\nAdd cc_proto_library and cc_grpc_library targets for Spanner and IAM protos.\n\nPiperOrigin-RevId: 291988651\n\n" } }, { @@ -36,667 +36,5 @@ "config": "google/pubsub/artman_pubsub.yaml" } } - ], - "newFiles": [ - { - "path": ".eslintignore" - }, - { - "path": ".eslintrc.yml" - }, - { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/support_request.md" - }, - { - "path": ".github/PULL_REQUEST_TEMPLATE.md" - }, - { - "path": ".github/release-please.yml" - }, - { - "path": ".gitignore" - }, - { - "path": ".jsdoc.js" - }, - { - "path": ".kokoro/.gitattributes" - }, - { - "path": ".kokoro/common.cfg" - }, - { - "path": ".kokoro/continuous/node10/common.cfg" - }, - { - "path": ".kokoro/continuous/node10/docs.cfg" - }, - { - "path": ".kokoro/continuous/node10/lint.cfg" - }, - { - "path": ".kokoro/continuous/node10/samples-test.cfg" - }, - { - "path": ".kokoro/continuous/node10/system-test.cfg" - }, - { - "path": ".kokoro/continuous/node10/test.cfg" - }, - { - "path": ".kokoro/continuous/node12/common.cfg" - }, - { - "path": ".kokoro/continuous/node12/test.cfg" - }, - { - "path": ".kokoro/continuous/node8/common.cfg" - }, - { - "path": ".kokoro/continuous/node8/test.cfg" - }, - { - "path": ".kokoro/docs.sh" - }, - { - "path": ".kokoro/lint.sh" - }, - { - "path": ".kokoro/presubmit/node10/common.cfg" - }, - { - "path": ".kokoro/presubmit/node10/docs.cfg" - }, - { - "path": ".kokoro/presubmit/node10/lint.cfg" - }, - { - "path": ".kokoro/presubmit/node10/samples-test.cfg" - }, - { - "path": ".kokoro/presubmit/node10/system-test.cfg" - }, - { - "path": ".kokoro/presubmit/node10/test.cfg" - }, - { - "path": ".kokoro/presubmit/node12/common.cfg" - }, - { - "path": ".kokoro/presubmit/node12/test.cfg" - }, - { - "path": ".kokoro/presubmit/node8/common.cfg" - }, - { - "path": ".kokoro/presubmit/node8/test.cfg" - }, - { - "path": ".kokoro/presubmit/windows/common.cfg" - }, - { - "path": ".kokoro/presubmit/windows/test.cfg" - }, - { - "path": ".kokoro/publish.sh" - }, - { - "path": ".kokoro/release/common.cfg" - }, - { - "path": ".kokoro/release/docs.cfg" - }, - { - "path": ".kokoro/release/docs.sh" - }, - { - "path": ".kokoro/release/publish.cfg" - }, - { - "path": ".kokoro/samples-test.sh" - }, - { - "path": ".kokoro/system-test.sh" - }, - { - "path": ".kokoro/test.bat" - }, - { - "path": ".kokoro/test.sh" - }, - { - "path": ".kokoro/trampoline.sh" - }, - { - "path": ".nycrc" - }, - { - "path": ".prettierignore" - }, - { - "path": ".prettierrc" - }, - { - "path": ".readme-partials.yml" - }, - { - "path": ".repo-metadata.json" - }, - { - "path": "CHANGELOG.md" - }, - { - "path": "CODE_OF_CONDUCT.md" - }, - { - "path": "CONTRIBUTING.md" - }, - { - "path": "LICENSE" - }, - { - "path": "README.md" - }, - { - "path": "bin/README.md" - }, - { - "path": "bin/benchwrapper.js" - }, - { - "path": "bin/pubsub.proto" - }, - { - "path": "codecov.yaml" - }, - { - "path": "linkinator.config.json" - }, - { - "path": "package.json" - }, - { - "path": "proto/iam.d.ts" - }, - { - "path": "proto/pubsub.d.ts" - }, - { - "path": "protos/google/api/annotations.proto" - }, - { - "path": "protos/google/api/auth.proto" - }, - { - "path": "protos/google/api/backend.proto" - }, - { - "path": "protos/google/api/billing.proto" - }, - { - "path": "protos/google/api/config_change.proto" - }, - { - "path": "protos/google/api/consumer.proto" - }, - { - "path": "protos/google/api/context.proto" - }, - { - "path": "protos/google/api/control.proto" - }, - { - "path": "protos/google/api/distribution.proto" - }, - { - "path": "protos/google/api/documentation.proto" - }, - { - "path": "protos/google/api/endpoint.proto" - }, - { - "path": "protos/google/api/experimental/authorization_config.proto" - }, - { - "path": "protos/google/api/experimental/experimental.proto" - }, - { - "path": "protos/google/api/http.proto" - }, - { - "path": "protos/google/api/httpbody.proto" - }, - { - "path": "protos/google/api/label.proto" - }, - { - "path": "protos/google/api/log.proto" - }, - { - "path": "protos/google/api/logging.proto" - }, - { - "path": "protos/google/api/metric.proto" - }, - { - "path": "protos/google/api/monitored_resource.proto" - }, - { - "path": "protos/google/api/monitoring.proto" - }, - { - "path": "protos/google/api/quota.proto" - }, - { - "path": "protos/google/api/service.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/check_error.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/distribution.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/log_entry.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/metric_value.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/operation.proto" - }, - { - "path": "protos/google/api/servicecontrol/v1/service_controller.proto" - }, - { - "path": "protos/google/api/servicemanagement/v1/resources.proto" - }, - { - "path": "protos/google/api/servicemanagement/v1/servicemanager.proto" - }, - { - "path": "protos/google/api/source_info.proto" - }, - { - "path": "protos/google/api/system_parameter.proto" - }, - { - "path": "protos/google/api/usage.proto" - }, - { - "path": "protos/google/iam/admin/v1/iam.proto" - }, - { - "path": "protos/google/iam/v1/iam_policy.proto" - }, - { - "path": "protos/google/iam/v1/options.proto" - }, - { - "path": "protos/google/iam/v1/policy.proto" - }, - { - "path": "protos/google/protobuf/any.proto" - }, - { - "path": "protos/google/protobuf/api.proto" - }, - { - "path": "protos/google/protobuf/descriptor.proto" - }, - { - "path": "protos/google/protobuf/duration.proto" - }, - { - "path": "protos/google/protobuf/empty.proto" - }, - { - "path": "protos/google/protobuf/field_mask.proto" - }, - { - "path": "protos/google/protobuf/source_context.proto" - }, - { - "path": "protos/google/protobuf/struct.proto" - }, - { - "path": "protos/google/protobuf/timestamp.proto" - }, - { - "path": "protos/google/protobuf/type.proto" - }, - { - "path": "protos/google/protobuf/util/json_format_proto3.proto" - }, - { - "path": "protos/google/protobuf/wrappers.proto" - }, - { - "path": "protos/google/pubsub/v1/pubsub.proto" - }, - { - "path": "protos/google/type/expr.proto" - }, - { - "path": "protos/protos.d.ts" - }, - { - "path": "protos/protos.js" - }, - { - "path": "protos/protos.json" - }, - { - "path": "renovate.json" - }, - { - "path": "samples/.eslintrc.yml" - }, - { - "path": "samples/README.md" - }, - { - "path": "samples/createPushSubscription.js" - }, - { - "path": "samples/createSubscription.js" - }, - { - "path": "samples/createTopic.js" - }, - { - "path": "samples/deleteSubscription.js" - }, - { - "path": "samples/deleteTopic.js" - }, - { - "path": "samples/getSubscription.js" - }, - { - "path": "samples/getSubscriptionPolicy.js" - }, - { - "path": "samples/getTopicPolicy.js" - }, - { - "path": "samples/listAllTopics.js" - }, - { - "path": "samples/listSubscriptions.js" - }, - { - "path": "samples/listTopicSubscriptions.js" - }, - { - "path": "samples/listenForErrors.js" - }, - { - "path": "samples/listenForMessages.js" - }, - { - "path": "samples/listenForOrderedMessages.js" - }, - { - "path": "samples/modifyPushConfig.js" - }, - { - "path": "samples/package.json" - }, - { - "path": "samples/publishBatchedMessages.js" - }, - { - "path": "samples/publishMessage.js" - }, - { - "path": "samples/publishMessageWithCustomAttributes.js" - }, - { - "path": "samples/publishOrderedMessage.js" - }, - { - "path": "samples/publishWithRetrySettings.js" - }, - { - "path": "samples/quickstart.js" - }, - { - "path": "samples/setSubscriptionPolicy.js" - }, - { - "path": "samples/setTopicPolicy.js" - }, - { - "path": "samples/subscribeWithFlowControlSettings.js" - }, - { - "path": "samples/synchronousPull.js" - }, - { - "path": "samples/synchronousPullWithLeaseManagement.js" - }, - { - "path": "samples/system-test/quickstart.test.js" - }, - { - "path": "samples/system-test/subscriptions.test.js" - }, - { - "path": "samples/system-test/topics.test.js" - }, - { - "path": "samples/testSubscriptionPermissions.js" - }, - { - "path": "samples/testTopicPermissions.js" - }, - { - "path": "smoke-test/.eslintrc.yml" - }, - { - "path": "smoke-test/publisher_smoke_test.js" - }, - { - "path": "src/.eslintrc.yml" - }, - { - "path": "src/default-options.ts" - }, - { - "path": "src/histogram.ts" - }, - { - "path": "src/iam.ts" - }, - { - "path": "src/index.ts" - }, - { - "path": "src/lease-manager.ts" - }, - { - "path": "src/message-queues.ts" - }, - { - "path": "src/message-stream.ts" - }, - { - "path": "src/publisher/index.ts" - }, - { - "path": "src/publisher/message-batch.ts" - }, - { - "path": "src/publisher/message-queues.ts" - }, - { - "path": "src/publisher/publish-error.ts" - }, - { - "path": "src/pubsub.ts" - }, - { - "path": "src/pull-retry.ts" - }, - { - "path": "src/service_proto_list.json" - }, - { - "path": "src/snapshot.ts" - }, - { - "path": "src/subscriber.ts" - }, - { - "path": "src/subscription.ts" - }, - { - "path": "src/topic.ts" - }, - { - "path": "src/util.ts" - }, - { - "path": "src/v1/doc/google/iam/v1/doc_iam_policy.js" - }, - { - "path": "src/v1/doc/google/iam/v1/doc_options.js" - }, - { - "path": "src/v1/doc/google/iam/v1/doc_policy.js" - }, - { - "path": "src/v1/doc/google/protobuf/doc_duration.js" - }, - { - "path": "src/v1/doc/google/protobuf/doc_empty.js" - }, - { - "path": "src/v1/doc/google/protobuf/doc_field_mask.js" - }, - { - "path": "src/v1/doc/google/protobuf/doc_timestamp.js" - }, - { - "path": "src/v1/doc/google/pubsub/v1/doc_pubsub.js" - }, - { - "path": "src/v1/doc/google/type/doc_expr.js" - }, - { - "path": "src/v1/index.js" - }, - { - "path": "src/v1/publisher_client.js" - }, - { - "path": "src/v1/publisher_client_config.json" - }, - { - "path": "src/v1/publisher_proto_list.json" - }, - { - "path": "src/v1/subscriber_client.js" - }, - { - "path": "src/v1/subscriber_client_config.json" - }, - { - "path": "src/v1/subscriber_proto_list.json" - }, - { - "path": "synth.metadata" - }, - { - "path": "synth.py" - }, - { - "path": "system-test/fixtures/ordered-messages.json" - }, - { - "path": "system-test/fixtures/sample/package.json" - }, - { - "path": "system-test/fixtures/sample/src/index.ts" - }, - { - "path": "system-test/fixtures/sample/tsconfig.json" - }, - { - "path": "system-test/install.ts" - }, - { - "path": "system-test/pubsub.ts" - }, - { - "path": "test/.eslintrc.yml" - }, - { - "path": "test/gapic-v1.js" - }, - { - "path": "test/histogram.ts" - }, - { - "path": "test/iam.ts" - }, - { - "path": "test/index.ts" - }, - { - "path": "test/lease-manager.ts" - }, - { - "path": "test/message-queues.ts" - }, - { - "path": "test/message-stream.ts" - }, - { - "path": "test/mocha.opts" - }, - { - "path": "test/publisher/index.ts" - }, - { - "path": "test/publisher/message-batch.ts" - }, - { - "path": "test/publisher/message-queues.ts" - }, - { - "path": "test/publisher/publish-error.ts" - }, - { - "path": "test/pubsub.ts" - }, - { - "path": "test/pull-retry.ts" - }, - { - "path": "test/snapshot.ts" - }, - { - "path": "test/subscriber.ts" - }, - { - "path": "test/subscription.ts" - }, - { - "path": "test/topic.ts" - }, - { - "path": "tsconfig.json" - }, - { - "path": "tslint.json" - } ] } \ No newline at end of file From ed9c8c78ad1a03327622ba37e1aaf0e01f459ab8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 31 Jan 2020 20:04:26 +0100 Subject: [PATCH 0571/1115] chore(deps): update dependency mkdirp to v1 (#864) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 86f1e654a8e..709cbaf58d4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -89,7 +89,7 @@ "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", "linkinator": "^1.5.0", - "mkdirp": "^0.5.1", + "mkdirp": "^1.0.0", "mocha": "^7.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", From 892a9244f367372df5cf99c479dbb20d037ccfdc Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Fri, 31 Jan 2020 17:22:48 -0800 Subject: [PATCH 0572/1115] chore: skip img.shields.io in docs test --- handwritten/pubsub/linkinator.config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json index d780d6bfff5..b555215ca02 100644 --- a/handwritten/pubsub/linkinator.config.json +++ b/handwritten/pubsub/linkinator.config.json @@ -2,6 +2,7 @@ "recurse": true, "skip": [ "https://codecov.io/gh/googleapis/", - "www.googleapis.com" + "www.googleapis.com", + "img.shields.io" ] } From a79588d05fa2bb09e2f0c55faf619d81861b177d Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 3 Feb 2020 15:59:18 -0800 Subject: [PATCH 0573/1115] feat: update defaults for batch settings also, and update which result codes will cause a retry (#877) * fix(defaults): update batch setting defaults to match other language libraries * fix(retries): update codes we'll retry on, and add a special check for server shutdown * fix: clear up a few member names, and fix some issues from unit tests * chore: run lint fixer --- handwritten/pubsub/src/default-options.ts | 35 +++++++++++++++------- handwritten/pubsub/src/lease-manager.ts | 6 ++-- handwritten/pubsub/src/message-stream.ts | 2 +- handwritten/pubsub/src/publisher/index.ts | 7 +++-- handwritten/pubsub/src/pull-retry.ts | 12 +++++--- handwritten/pubsub/src/subscriber.ts | 6 ++-- handwritten/pubsub/test/lease-manager.ts | 8 +++-- handwritten/pubsub/test/message-stream.ts | 7 +++-- handwritten/pubsub/test/publisher/index.ts | 8 +++-- handwritten/pubsub/test/pull-retry.ts | 10 ++++--- 10 files changed, 67 insertions(+), 34 deletions(-) diff --git a/handwritten/pubsub/src/default-options.ts b/handwritten/pubsub/src/default-options.ts index a8b9531e456..1302d5c9daf 100644 --- a/handwritten/pubsub/src/default-options.ts +++ b/handwritten/pubsub/src/default-options.ts @@ -17,17 +17,32 @@ // These options will be used library-wide. They're specified here so that // they can be changed easily in the future. export const defaultOptions = { - // The maximum number of messages that may be queued for sending. - maxOutstandingMessages: 1000, + subscription: { + // The maximum number of messages that may be queued for receiving, + // with the default lease manager. + maxOutstandingMessages: 1000, - // The maximum amount of message data that may be queued for sending, - // in bytes. - maxOutstandingBytes: 100 * 1024 * 1024, + // The maximum amount of message data that may be queued for receiving, + // in bytes, with the default lease manager. + maxOutstandingBytes: 100 * 1024 * 1024, - // The maximum number of minutes that a message's lease will ever - // be extended. - maxExtensionMinutes: 60, + // The maximum number of minutes that a message's lease will ever + // be extended. + maxExtensionMinutes: 60, - // The maximum number of streams/threads that will ever be opened. - maxStreams: 5, + // The maximum number of subscription streams/threads that will ever + // be opened. + maxStreams: 5, + }, + + publish: { + // The maximum number of messages we'll batch up for publish(). + maxOutstandingMessages: 100, + + // The maximum size of the total batched up messages for publish(). + maxOutstandingBytes: 1 * 1024 * 1024, + + // The maximum time we'll wait to send batched messages, in milliseconds. + maxDelayMillis: 10, + }, }; diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index 1c9743e69b7..518a986880a 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -186,9 +186,9 @@ export class LeaseManager extends EventEmitter { setOptions(options: FlowControlOptions): void { const defaults: FlowControlOptions = { allowExcessMessages: true, - maxBytes: defaultOptions.maxOutstandingBytes, - maxExtension: defaultOptions.maxExtensionMinutes, - maxMessages: defaultOptions.maxOutstandingMessages, + maxBytes: defaultOptions.subscription.maxOutstandingBytes, + maxExtension: defaultOptions.subscription.maxExtensionMinutes, + maxMessages: defaultOptions.subscription.maxOutstandingMessages, }; this._options = Object.assign(defaults, options); diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 52785f90329..3d31ac3cd07 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -48,7 +48,7 @@ const PULL_TIMEOUT = require('./v1/subscriber_client_config.json').interfaces[ */ const DEFAULT_OPTIONS: MessageStreamOptions = { highWaterMark: 0, - maxStreams: defaultOptions.maxStreams, + maxStreams: defaultOptions.subscription.maxStreams, timeout: 300000, }; diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 26c3704cb38..fee6811e17e 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -23,6 +23,7 @@ import {Queue, OrderedQueue} from './message-queues'; import {Topic} from '../topic'; import {RequestCallback} from '../pubsub'; import {google} from '../../proto/pubsub'; +import {defaultOptions} from '../default-options'; export type PubsubMessage = google.pubsub.v1.IPubsubMessage; @@ -168,9 +169,9 @@ export class Publisher { setOptions(options = {} as PublishOptions): void { const defaults = { batching: { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 100, + maxBytes: defaultOptions.publish.maxOutstandingBytes, + maxMessages: defaultOptions.publish.maxOutstandingMessages, + maxMilliseconds: defaultOptions.publish.maxDelayMillis, }, messageOrdering: false, gaxOpts: { diff --git a/handwritten/pubsub/src/pull-retry.ts b/handwritten/pubsub/src/pull-retry.ts index 462721c3eb0..f55679e128d 100644 --- a/handwritten/pubsub/src/pull-retry.ts +++ b/handwritten/pubsub/src/pull-retry.ts @@ -19,15 +19,11 @@ import {StatusObject, status} from '@grpc/grpc-js'; * retryable status codes */ export const RETRY_CODES: status[] = [ - status.OK, - status.CANCELLED, - status.UNKNOWN, status.DEADLINE_EXCEEDED, status.RESOURCE_EXHAUSTED, status.ABORTED, status.INTERNAL, status.UNAVAILABLE, - status.DATA_LOSS, ]; /** @@ -73,6 +69,14 @@ export class PullRetry { this.failures += 1; } + if ( + err.code === status.UNAVAILABLE && + err.details && + err.details.match(/Server shutdownNow invoked/) + ) { + return true; + } + return RETRY_CODES.includes(err.code); } } diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 2d28338eda6..03febd6b357 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -403,14 +403,16 @@ export class Subscriber extends EventEmitter { // 1 message at a time. if (options.flowControl) { const { - maxMessages = defaultOptions.maxOutstandingMessages, + maxMessages = defaultOptions.subscription.maxOutstandingMessages, } = options.flowControl; if (!options.streamingOptions) { options.streamingOptions = {} as MessageStreamOptions; } - const {maxStreams = defaultOptions.maxStreams} = options.streamingOptions; + const { + maxStreams = defaultOptions.subscription.maxStreams, + } = options.streamingOptions; options.streamingOptions.maxStreams = Math.min(maxStreams, maxMessages); } } diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 6436be92615..8a37595fc3d 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -433,13 +433,17 @@ describe('LeaseManager', () => { assert.strictEqual(leaseManager.isFull(), false); leaseManager.remove(littleMessage); - bigMessage.length = defaultOptions.maxOutstandingBytes * 2; + bigMessage.length = defaultOptions.subscription.maxOutstandingBytes * 2; leaseManager.add(bigMessage as Message); assert.strictEqual(leaseManager.isFull(), true); }); it('should cap maxMessages', () => { - for (let i = 0; i < defaultOptions.maxOutstandingMessages; i++) { + for ( + let i = 0; + i < defaultOptions.subscription.maxOutstandingMessages; + i++ + ) { assert.strictEqual(leaseManager.isFull(), false); leaseManager.add(new FakeMessage() as Message); } diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 336db69dca5..3b32bb10922 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -219,7 +219,10 @@ describe('MessageStream', () => { }); it('should default maxStreams', () => { - assert.strictEqual(client.streams.length, defaultOptions.maxStreams); + assert.strictEqual( + client.streams.length, + defaultOptions.subscription.maxStreams + ); }); it('should pull pullTimeouts default from config file', () => { @@ -252,7 +255,7 @@ describe('MessageStream', () => { setImmediate(() => { assert.strictEqual( client.streams.length, - defaultOptions.maxStreams + defaultOptions.subscription.maxStreams ); client.streams.forEach(stream => { assert.strictEqual( diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index c545f2afb00..dd90fe301ae 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -26,6 +26,8 @@ import * as p from '../../src/publisher'; import * as q from '../../src/publisher/message-queues'; import {PublishError} from '../../src/publisher/publish-error'; +import {defaultOptions} from '../../src/default-options'; + let promisified = false; const fakePromisify = Object.assign({}, pfy, { promisifyAll: (ctor: Function, options: pfy.PromisifyAllOptions) => { @@ -262,9 +264,9 @@ describe('Publisher', () => { assert.deepStrictEqual(publisher.settings, { batching: { - maxBytes: Math.pow(1024, 2) * 5, - maxMessages: 1000, - maxMilliseconds: 100, + maxBytes: defaultOptions.publish.maxOutstandingBytes, + maxMessages: defaultOptions.publish.maxOutstandingMessages, + maxMilliseconds: defaultOptions.publish.maxDelayMillis, }, messageOrdering: false, gaxOpts: { diff --git a/handwritten/pubsub/test/pull-retry.ts b/handwritten/pubsub/test/pull-retry.ts index d272566d3d7..3c1c88efbf5 100644 --- a/handwritten/pubsub/test/pull-retry.ts +++ b/handwritten/pubsub/test/pull-retry.ts @@ -49,19 +49,21 @@ describe('PullRetry', () => { describe('retry', () => { it('should return true for retryable errors', () => { [ - status.OK, - status.CANCELLED, - status.UNKNOWN, status.DEADLINE_EXCEEDED, status.RESOURCE_EXHAUSTED, status.ABORTED, status.INTERNAL, status.UNAVAILABLE, - status.DATA_LOSS, ].forEach((code: status) => { const shouldRetry = retrier.retry({code} as StatusObject); assert.strictEqual(shouldRetry, true); }); + + const serverShutdown = retrier.retry({ + code: status.UNAVAILABLE, + details: 'Server shutdownNow invoked', + } as StatusObject); + assert.strictEqual(serverShutdown, true); }); it('should return false for non-retryable errors', () => { From be4770b96bed67020978b95bd2ecff129226a297 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2020 11:15:30 -0800 Subject: [PATCH 0574/1115] chore: release 1.5.0 (#874) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 6c6907c821e..f97e0874455 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [1.5.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.4.1...v1.5.0) (2020-02-03) + + +### Features + +* added clientId to StreamingPullRequest ([b566ab3](https://www.github.com/googleapis/nodejs-pubsub/commit/b566ab3187efe08d19c29afc8a506a94ed2760b3)) +* update defaults for batch settings also, and update which result codes will cause a retry ([#877](https://www.github.com/googleapis/nodejs-pubsub/issues/877)) ([32ae411](https://www.github.com/googleapis/nodejs-pubsub/commit/32ae4114fb7b42722a6c5100e9d494e470a5cae2)) + ### [1.4.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.4.0...v1.4.1) (2020-01-28) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 709cbaf58d4..05783676cfc 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.4.1", + "version": "1.5.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From a9fa27fab6110cadfcda55b4895d904e77a16b18 Mon Sep 17 00:00:00 2001 From: George Czabania <1140167+stayradiated@users.noreply.github.com> Date: Fri, 7 Feb 2020 20:32:46 +0100 Subject: [PATCH 0575/1115] feat(subscription): support oidcToken (#865) Co-authored-by: Benjamin E. Coe Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/pubsub.ts | 6 +++- handwritten/pubsub/src/subscription.ts | 19 ++++++++++ handwritten/pubsub/test/subscription.ts | 47 +++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 5f55f210e36..cb792bd62d1 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -334,11 +334,15 @@ export class PubSub { * days. * @property {string} [pushEndpoint] A URL to a custom endpoint that * messages should be pushed to. + * @property {object} [oidcToken] If specified, Pub/Sub will generate and + * attach an OIDC JWT token as an `Authorization` header in the HTTP + * request for every pushed message. This object should have the same + * structure as [OidcToken]{@link google.pubsub.v1.OidcToken} * @property {boolean} [retainAckedMessages=false] If set, acked messages * are retained in the subscription's backlog for the length of time * specified by `options.messageRetentionDuration`. * @property {ExpirationPolicy} [expirationPolicy] A policy that specifies - * the conditions for this subscription's expiration. + * the conditions for this subscription's expiration. */ /** * Create a subscription to a topic. diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index f90436e01bc..70bb1576d8b 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -47,9 +47,12 @@ import {noop} from './util'; export type PushConfig = google.pubsub.v1.IPushConfig; +export type OidcToken = google.pubsub.v1.PushConfig.IOidcToken; + export type SubscriptionMetadata = { messageRetentionDuration?: google.protobuf.IDuration | number; pushEndpoint?: string; + oidcToken?: OidcToken; } & Omit; export type SubscriptionOptions = SubscriberOptions & {topic?: Topic}; @@ -739,6 +742,10 @@ export class Subscription extends EventEmitter { * @param {string} config.pushEndpoint A URL locating the endpoint to which * messages should be published. * @param {object} config.attributes [PushConfig attributes](https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#google.pubsub.v1.PushConfig). + * @param {object} config.oidcToken If specified, Pub/Sub will generate and + * attach an OIDC JWT token as an `Authorization` header in the HTTP + * request for every pushed message. This object should have the same + * structure as [OidcToken]{@link google.pubsub.v1.OidcToken} * @param {object} [gaxOpts] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. * @param {ModifyPushConfigCallback} [callback] Callback function. @@ -755,6 +762,10 @@ export class Subscription extends EventEmitter { * pushEndpoint: 'https://mydomain.com/push', * attributes: { * key: 'value' + * }, + * oidcToken: { + * serviceAccountEmail: 'myproject@appspot.gserviceaccount.com', + * audience: 'myaudience' * } * }; * @@ -1039,6 +1050,14 @@ export class Subscription extends EventEmitter { delete formatted.pushEndpoint; } + if (metadata.oidcToken) { + formatted.pushConfig = { + ...formatted.pushConfig, + oidcToken: metadata.oidcToken, + }; + delete formatted.oidcToken; + } + return formatted as google.pubsub.v1.ISubscription; } /*! diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index dd96bb39926..bf1a6c26473 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -249,6 +249,53 @@ describe('Subscription', () => { undefined ); }); + + it('should format oidcToken', () => { + const oidcToken = { + serviceAccount: 'pubsub-test@appspot.gserviceaccount.com', + audience: 'audience', + }; + + const metadata = { + oidcToken, + }; + + const formatted = Subscription.formatMetadata_(metadata); + + assert.strictEqual(formatted.pushConfig!.oidcToken, oidcToken); + assert.strictEqual( + (formatted as subby.SubscriptionMetadata).oidcToken, + undefined + ); + }); + + it('should format both pushEndpoint and oidcToken', () => { + const pushEndpoint = 'http://noop.com/push'; + + const oidcToken = { + serviceAccount: 'pubsub-test@appspot.gserviceaccount.com', + audience: 'audience', + }; + + const metadata = { + pushEndpoint, + oidcToken, + }; + + const formatted = Subscription.formatMetadata_(metadata); + + assert.strictEqual(formatted.pushConfig!.pushEndpoint, pushEndpoint); + assert.strictEqual( + (formatted as subby.SubscriptionMetadata).pushEndpoint, + undefined + ); + + assert.strictEqual(formatted.pushConfig!.oidcToken, oidcToken); + assert.strictEqual( + (formatted as subby.SubscriptionMetadata).oidcToken, + undefined + ); + }); }); describe('formatName_', () => { From 7598e013815e637ca64e69376a2e9c399d4c1088 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 11 Feb 2020 19:38:06 +0100 Subject: [PATCH 0576/1115] chore(deps): update dependency linkinator to v2 (#883) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 05783676cfc..e05fca86767 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -88,7 +88,7 @@ "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", - "linkinator": "^1.5.0", + "linkinator": "^2.0.0", "mkdirp": "^1.0.0", "mocha": "^7.0.0", "mv": "^2.1.1", From 740fe4002d8b3047ad0ee3095efb2ca171c29729 Mon Sep 17 00:00:00 2001 From: Alex Hong <9397363+hongalex@users.noreply.github.com> Date: Mon, 24 Feb 2020 14:36:29 -0800 Subject: [PATCH 0577/1115] chore: add benchmarking cfg for benchwrapper (#895) --- .../pubsub/.kokoro/continuous/node12/pubsub_perf_bench.cfg | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 handwritten/pubsub/.kokoro/continuous/node12/pubsub_perf_bench.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node12/pubsub_perf_bench.cfg b/handwritten/pubsub/.kokoro/continuous/node12/pubsub_perf_bench.cfg new file mode 100644 index 00000000000..e69de29bb2d From 6339d5bcefa3f61ff8dd959dbbf99132f4018d8b Mon Sep 17 00:00:00 2001 From: Xiaozhen Liu Date: Wed, 26 Feb 2020 15:41:13 -0800 Subject: [PATCH 0578/1115] feat: export protos in src/index.ts --- handwritten/pubsub/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index c6c943174eb..f6bfd2789ed 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -154,3 +154,5 @@ if (process.env.DEBUG_GRPC) { setLogger(console); setLogVerbosity(logVerbosity.DEBUG); } +import * as protos from '../protos/protos'; +export {protos}; From e85511d3cadb22d96386679a2f1e514f4410780e Mon Sep 17 00:00:00 2001 From: Summer Ji Date: Thu, 27 Feb 2020 11:56:21 -0800 Subject: [PATCH 0579/1115] chore: update jsdoc.js (#901) --- handwritten/pubsub/.jsdoc.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index 5e602eaff24..f92f90c21d7 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -36,11 +36,14 @@ module.exports = { includePattern: '\\.js$' }, templates: { - copyright: 'Copyright 2018 Google, LLC.', + copyright: 'Copyright 2019 Google, LLC.', includeDate: false, sourceFiles: false, systemName: '@google-cloud/pubsub', - theme: 'lumen' + theme: 'lumen', + default: { + "outputSourceFiles": false + } }, markdown: { idInHeadings: true From 72cdcf6c03095297f6b5dad44795f90c372ead71 Mon Sep 17 00:00:00 2001 From: Summer Ji Date: Thu, 27 Feb 2020 21:42:34 -0800 Subject: [PATCH 0580/1115] chore: correct .jsdoc.js protos and double quotes (#904) --- handwritten/pubsub/.jsdoc.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index f92f90c21d7..223ff94b1e8 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -31,7 +31,8 @@ module.exports = { source: { excludePattern: '(^|\\/|\\\\)[._]', include: [ - 'build/src' + 'build/src', + 'protos' ], includePattern: '\\.js$' }, @@ -42,7 +43,7 @@ module.exports = { systemName: '@google-cloud/pubsub', theme: 'lumen', default: { - "outputSourceFiles": false + outputSourceFiles: false } }, markdown: { From 57a0048eb968fc4b6fe70a03353e2708e1ff86a8 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sat, 29 Feb 2020 10:55:32 -0800 Subject: [PATCH 0581/1115] chore: updated proto annotations --- handwritten/pubsub/.github/publish.yml | 0 .../protos/google/pubsub/v1/pubsub.proto | 326 ++++--- handwritten/pubsub/protos/protos.d.ts | 254 +++++- handwritten/pubsub/protos/protos.js | 805 +++++++++++++++++- handwritten/pubsub/protos/protos.json | 389 +++++++-- .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 72 +- handwritten/pubsub/src/v1/publisher_client.js | 44 +- .../src/v1/publisher_client_config.json | 2 +- .../pubsub/src/v1/subscriber_client.js | 74 +- .../src/v1/subscriber_client_config.json | 6 +- handwritten/pubsub/synth.metadata | 14 +- 11 files changed, 1690 insertions(+), 296 deletions(-) create mode 100644 handwritten/pubsub/.github/publish.yml diff --git a/handwritten/pubsub/.github/publish.yml b/handwritten/pubsub/.github/publish.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index da3801dfecb..adaf8c6fc3b 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC. +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,18 +11,19 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// syntax = "proto3"; package google.pubsub.v1; -import "google/api/annotations.proto"; import "google/api/client.proto"; +import "google/api/field_behavior.proto"; +import "google/api/resource.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; +import "google/api/annotations.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.PubSub.V1"; @@ -49,6 +50,7 @@ service Publisher { put: "/v1/{name=projects/*/topics/*}" body: "*" }; + option (google.api.method_signature) = "name"; } // Updates an existing topic. Note that certain properties of a @@ -67,6 +69,7 @@ service Publisher { post: "/v1/{topic=projects/*/topics/*}:publish" body: "*" }; + option (google.api.method_signature) = "topic,messages"; } // Gets the configuration of a topic. @@ -74,6 +77,7 @@ service Publisher { option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}" }; + option (google.api.method_signature) = "topic"; } // Lists matching topics. @@ -81,14 +85,15 @@ service Publisher { option (google.api.http) = { get: "/v1/{project=projects/*}/topics" }; + option (google.api.method_signature) = "project"; } // Lists the names of the subscriptions on this topic. - rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) - returns (ListTopicSubscriptionsResponse) { + rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) returns (ListTopicSubscriptionsResponse) { option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}/subscriptions" }; + option (google.api.method_signature) = "topic"; } // Lists the names of the snapshots on this topic. Snapshots are used in @@ -97,8 +102,7 @@ service Publisher { // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state // captured by a snapshot. - rpc ListTopicSnapshots(ListTopicSnapshotsRequest) - returns (ListTopicSnapshotsResponse) { + rpc ListTopicSnapshots(ListTopicSnapshotsRequest) returns (ListTopicSnapshotsResponse) { option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}/snapshots" }; @@ -113,6 +117,7 @@ service Publisher { option (google.api.http) = { delete: "/v1/{topic=projects/*/topics/*}" }; + option (google.api.method_signature) = "topic"; } } @@ -127,13 +132,19 @@ message MessageStoragePolicy { // A topic resource. message Topic { - // The name of the topic. It must have the format + option (google.api.resource) = { + type: "pubsub.googleapis.com/Topic" + pattern: "projects/{project}/topics/{topic}" + pattern: "_deleted-topic_" + }; + + // Required. The name of the topic. It must have the format // `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, // and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), // underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent // signs (`%`). It must be between 3 and 255 characters in length, and it // must not start with `"goog"`. - string name = 1; + string name = 1 [(google.api.field_behavior) = REQUIRED]; // See Creating and // managing labels. @@ -193,32 +204,42 @@ message PubsubMessage { // Request for the GetTopic method. message GetTopicRequest { - // The name of the topic to get. + // Required. The name of the topic to get. // Format is `projects/{project}/topics/{topic}`. - string topic = 1; + string topic = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Topic" + } + ]; } // Request for the UpdateTopic method. message UpdateTopicRequest { - // The updated topic object. - Topic topic = 1; + // Required. The updated topic object. + Topic topic = 1 [(google.api.field_behavior) = REQUIRED]; - // Indicates which fields in the provided topic to update. Must be specified + // Required. Indicates which fields in the provided topic to update. Must be specified // and non-empty. Note that if `update_mask` contains // "message_storage_policy" then the new value will be determined based on the // policy configured at the project or organization level. The // `message_storage_policy` must not be set in the `topic` provided above. - google.protobuf.FieldMask update_mask = 2; + google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED]; } // Request for the Publish method. message PublishRequest { - // The messages in the request will be published on this topic. + // Required. The messages in the request will be published on this topic. // Format is `projects/{project}/topics/{topic}`. - string topic = 1; - - // The messages to publish. - repeated PubsubMessage messages = 2; + string topic = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Topic" + } + ]; + + // Required. The messages to publish. + repeated PubsubMessage messages = 2 [(google.api.field_behavior) = REQUIRED]; } // Response for the `Publish` method. @@ -231,9 +252,14 @@ message PublishResponse { // Request for the `ListTopics` method. message ListTopicsRequest { - // The name of the project in which to list topics. + // Required. The name of the project in which to list topics. // Format is `projects/{project-id}`. - string project = 1; + string project = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "cloudresourcemanager.googleapis.com/Project" + } + ]; // Maximum number of topics to return. int32 page_size = 2; @@ -256,9 +282,14 @@ message ListTopicsResponse { // Request for the `ListTopicSubscriptions` method. message ListTopicSubscriptionsRequest { - // The name of the topic that subscriptions are attached to. + // Required. The name of the topic that subscriptions are attached to. // Format is `projects/{project}/topics/{topic}`. - string topic = 1; + string topic = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Topic" + } + ]; // Maximum number of subscription names to return. int32 page_size = 2; @@ -272,7 +303,9 @@ message ListTopicSubscriptionsRequest { // Response for the `ListTopicSubscriptions` method. message ListTopicSubscriptionsResponse { // The names of the subscriptions that match the request. - repeated string subscriptions = 1; + repeated string subscriptions = 1 [(google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + }]; // If not empty, indicates that there may be more subscriptions that match // the request; this value should be passed in a new @@ -308,9 +341,14 @@ message ListTopicSnapshotsResponse { // Request for the `DeleteTopic` method. message DeleteTopicRequest { - // Name of the topic to delete. + // Required. Name of the topic to delete. // Format is `projects/{project}/topics/{topic}`. - string topic = 1; + string topic = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Topic" + } + ]; } // The service that an application uses to manipulate subscriptions and to @@ -340,6 +378,7 @@ service Subscriber { put: "/v1/{name=projects/*/subscriptions/*}" body: "*" }; + option (google.api.method_signature) = "name,topic,push_config,ack_deadline_seconds"; } // Gets the configuration details of a subscription. @@ -347,6 +386,7 @@ service Subscriber { option (google.api.http) = { get: "/v1/{subscription=projects/*/subscriptions/*}" }; + option (google.api.method_signature) = "subscription"; } // Updates an existing subscription. Note that certain properties of a @@ -359,11 +399,11 @@ service Subscriber { } // Lists matching subscriptions. - rpc ListSubscriptions(ListSubscriptionsRequest) - returns (ListSubscriptionsResponse) { + rpc ListSubscriptions(ListSubscriptionsRequest) returns (ListSubscriptionsResponse) { option (google.api.http) = { get: "/v1/{project=projects/*}/subscriptions" }; + option (google.api.method_signature) = "project"; } // Deletes an existing subscription. All messages retained in the subscription @@ -371,11 +411,11 @@ service Subscriber { // `NOT_FOUND`. After a subscription is deleted, a new one may be created with // the same name, but the new one has no association with the old // subscription or its topic unless the same topic is specified. - rpc DeleteSubscription(DeleteSubscriptionRequest) - returns (google.protobuf.Empty) { + rpc DeleteSubscription(DeleteSubscriptionRequest) returns (google.protobuf.Empty) { option (google.api.http) = { delete: "/v1/{subscription=projects/*/subscriptions/*}" }; + option (google.api.method_signature) = "subscription"; } // Modifies the ack deadline for a specific message. This method is useful @@ -383,12 +423,12 @@ service Subscriber { // subscriber, or to make the message available for redelivery if the // processing was interrupted. Note that this does not modify the // subscription-level `ackDeadlineSeconds` used for subsequent messages. - rpc ModifyAckDeadline(ModifyAckDeadlineRequest) - returns (google.protobuf.Empty) { + rpc ModifyAckDeadline(ModifyAckDeadlineRequest) returns (google.protobuf.Empty) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline" body: "*" }; + option (google.api.method_signature) = "subscription,ack_ids,ack_deadline_seconds"; } // Acknowledges the messages associated with the `ack_ids` in the @@ -403,6 +443,7 @@ service Subscriber { post: "/v1/{subscription=projects/*/subscriptions/*}:acknowledge" body: "*" }; + option (google.api.method_signature) = "subscription,ack_ids"; } // Pulls messages from the server. The server may return `UNAVAILABLE` if @@ -413,6 +454,7 @@ service Subscriber { post: "/v1/{subscription=projects/*/subscriptions/*}:pull" body: "*" }; + option (google.api.method_signature) = "subscription,return_immediately,max_messages"; } // Establishes a stream with the server, which sends messages down to the @@ -422,8 +464,8 @@ service Subscriber { // reassign server-side resources, in which case, the client should // re-establish the stream. Flow control can be achieved by configuring the // underlying RPC channel. - rpc StreamingPull(stream StreamingPullRequest) - returns (stream StreamingPullResponse) {} + rpc StreamingPull(stream StreamingPullRequest) returns (stream StreamingPullResponse) { + } // Modifies the `PushConfig` for a specified subscription. // @@ -431,12 +473,12 @@ service Subscriber { // an empty `PushConfig`) or vice versa, or change the endpoint URL and other // attributes of a push subscription. Messages will accumulate for delivery // continuously through the call regardless of changes to the `PushConfig`. - rpc ModifyPushConfig(ModifyPushConfigRequest) - returns (google.protobuf.Empty) { + rpc ModifyPushConfig(ModifyPushConfigRequest) returns (google.protobuf.Empty) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig" body: "*" }; + option (google.api.method_signature) = "subscription,push_config"; } // Gets the configuration details of a snapshot. Snapshots are used in @@ -460,6 +502,7 @@ service Subscriber { option (google.api.http) = { get: "/v1/{project=projects/*}/snapshots" }; + option (google.api.method_signature) = "project"; } // Creates a snapshot from the requested subscription. Snapshots are used in @@ -485,6 +528,7 @@ service Subscriber { put: "/v1/{name=projects/*/snapshots/*}" body: "*" }; + option (google.api.method_signature) = "name,subscription"; } // Updates an existing snapshot. Snapshots are used in @@ -514,6 +558,7 @@ service Subscriber { option (google.api.http) = { delete: "/v1/{snapshot=projects/*/snapshots/*}" }; + option (google.api.method_signature) = "snapshot"; } // Seeks an existing subscription to a point in time or to a given snapshot, @@ -534,19 +579,29 @@ service Subscriber { // A subscription resource. message Subscription { - // The name of the subscription. It must have the format + option (google.api.resource) = { + type: "pubsub.googleapis.com/Subscription" + pattern: "projects/{project}/subscriptions/{subscription}" + }; + + // Required. The name of the subscription. It must have the format // `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must // start with a letter, and contain only letters (`[A-Za-z]`), numbers // (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), // plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters // in length, and it must not start with `"goog"`. - string name = 1; + string name = 1 [(google.api.field_behavior) = REQUIRED]; - // The name of the topic from which this subscription is receiving messages. + // Required. The name of the topic from which this subscription is receiving messages. // Format is `projects/{project}/topics/{topic}`. // The value of this field will be `_deleted-topic_` if the topic has been // deleted. - string topic = 2; + string topic = 2 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Topic" + } + ]; // If push delivery is used with this subscription, this field is // used to configure it. An empty `pushConfig` signifies that the subscriber @@ -762,26 +817,36 @@ message ReceivedMessage { // Request for the GetSubscription method. message GetSubscriptionRequest { - // The name of the subscription to get. + // Required. The name of the subscription to get. // Format is `projects/{project}/subscriptions/{sub}`. - string subscription = 1; + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; } // Request for the UpdateSubscription method. message UpdateSubscriptionRequest { - // The updated subscription object. - Subscription subscription = 1; + // Required. The updated subscription object. + Subscription subscription = 1 [(google.api.field_behavior) = REQUIRED]; - // Indicates which fields in the provided subscription to update. + // Required. Indicates which fields in the provided subscription to update. // Must be specified and non-empty. - google.protobuf.FieldMask update_mask = 2; + google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED]; } // Request for the `ListSubscriptions` method. message ListSubscriptionsRequest { - // The name of the project in which to list subscriptions. + // Required. The name of the project in which to list subscriptions. // Format is `projects/{project-id}`. - string project = 1; + string project = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "cloudresourcemanager.googleapis.com/Project" + } + ]; // Maximum number of subscriptions to return. int32 page_size = 2; @@ -805,31 +870,46 @@ message ListSubscriptionsResponse { // Request for the DeleteSubscription method. message DeleteSubscriptionRequest { - // The subscription to delete. + // Required. The subscription to delete. // Format is `projects/{project}/subscriptions/{sub}`. - string subscription = 1; + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; } // Request for the ModifyPushConfig method. message ModifyPushConfigRequest { - // The name of the subscription. + // Required. The name of the subscription. // Format is `projects/{project}/subscriptions/{sub}`. - string subscription = 1; - - // The push configuration for future deliveries. + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; + + // Required. The push configuration for future deliveries. // // An empty `pushConfig` indicates that the Pub/Sub system should // stop pushing messages from the given subscription and allow // messages to be pulled and acknowledged - effectively pausing // the subscription if `Pull` or `StreamingPull` is not called. - PushConfig push_config = 2; + PushConfig push_config = 2 [(google.api.field_behavior) = REQUIRED]; } // Request for the `Pull` method. message PullRequest { - // The subscription from which messages should be pulled. + // Required. The subscription from which messages should be pulled. // Format is `projects/{project}/subscriptions/{sub}`. - string subscription = 1; + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; // If this field set to true, the system will respond immediately even if // it there are no messages available to return in the `Pull` response. @@ -837,10 +917,10 @@ message PullRequest { // least one message is available, rather than returning no messages. bool return_immediately = 2; - // The maximum number of messages to return for this request. Must be a + // Required. The maximum number of messages to return for this request. Must be a // positive integer. The Pub/Sub system may return fewer than the number // specified. - int32 max_messages = 3; + int32 max_messages = 3 [(google.api.field_behavior) = REQUIRED]; } // Response for the `Pull` method. @@ -854,14 +934,19 @@ message PullResponse { // Request for the ModifyAckDeadline method. message ModifyAckDeadlineRequest { - // The name of the subscription. + // Required. The name of the subscription. // Format is `projects/{project}/subscriptions/{sub}`. - string subscription = 1; + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; - // List of acknowledgment IDs. - repeated string ack_ids = 4; + // Required. List of acknowledgment IDs. + repeated string ack_ids = 4 [(google.api.field_behavior) = REQUIRED]; - // The new ack deadline with respect to the time this request was sent to + // Required. The new ack deadline with respect to the time this request was sent to // the Pub/Sub system. For example, if the value is 10, the new // ack deadline will expire 10 seconds after the `ModifyAckDeadline` call // was made. Specifying zero might immediately make the message available for @@ -869,29 +954,39 @@ message ModifyAckDeadlineRequest { // increase in the rate of message redeliveries (that is, duplicates). // The minimum deadline you can specify is 0 seconds. // The maximum deadline you can specify is 600 seconds (10 minutes). - int32 ack_deadline_seconds = 3; + int32 ack_deadline_seconds = 3 [(google.api.field_behavior) = REQUIRED]; } // Request for the Acknowledge method. message AcknowledgeRequest { - // The subscription whose message is being acknowledged. + // Required. The subscription whose message is being acknowledged. // Format is `projects/{project}/subscriptions/{sub}`. - string subscription = 1; - - // The acknowledgment ID for the messages being acknowledged that was returned + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; + + // Required. The acknowledgment ID for the messages being acknowledged that was returned // by the Pub/Sub system in the `Pull` response. Must not be empty. - repeated string ack_ids = 2; + repeated string ack_ids = 2 [(google.api.field_behavior) = REQUIRED]; } // Request for the `StreamingPull` streaming RPC method. This request is used to // establish the initial stream as well as to stream acknowledgements and ack // deadline modifications from the client to the server. message StreamingPullRequest { - // The subscription for which to initialize the new stream. This must be + // Required. The subscription for which to initialize the new stream. This must be // provided in the first request on the stream, and must not be set in // subsequent requests from client to server. // Format is `projects/{project}/subscriptions/{sub}`. - string subscription = 1; + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; // List of acknowledgement IDs for acknowledging previously received messages // (received on this stream or a different stream). If an ack ID has expired, @@ -920,11 +1015,11 @@ message StreamingPullRequest { // processing was interrupted. repeated string modify_deadline_ack_ids = 4; - // The ack deadline to use for the stream. This must be provided in the + // Required. The ack deadline to use for the stream. This must be provided in the // first request on the stream, but it can also be updated on subsequent // requests from client to server. The minimum deadline you can specify is 10 // seconds. The maximum deadline you can specify is 600 seconds (10 minutes). - int32 stream_ack_deadline_seconds = 5; + int32 stream_ack_deadline_seconds = 5 [(google.api.field_behavior) = REQUIRED]; // A unique identifier that is used to distinguish client instances from each // other. Only needs to be provided on the initial request. When a stream @@ -944,15 +1039,20 @@ message StreamingPullResponse { // Request for the `CreateSnapshot` method. message CreateSnapshotRequest { - // User-provided name for this snapshot. If the name is not provided in the + // Required. User-provided name for this snapshot. If the name is not provided in the // request, the server will assign a random name for this snapshot on the same // project as the subscription. Note that for REST API requests, you must // specify a name. See the resource // name rules. Format is `projects/{project}/snapshots/{snap}`. - string name = 1; - - // The subscription whose backlog the snapshot retains. + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Snapshot" + } + ]; + + // Required. The subscription whose backlog the snapshot retains. // Specifically, the created snapshot is guaranteed to retain: // (a) The existing backlog on the subscription. More precisely, this is // defined as the messages in the subscription's backlog that are @@ -961,7 +1061,12 @@ message CreateSnapshotRequest { // (b) Any messages published to the subscription's topic following the // successful completion of the CreateSnapshot request. // Format is `projects/{project}/subscriptions/{sub}`. - string subscription = 2; + string subscription = 2 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; // See Creating and // managing labels. @@ -970,12 +1075,12 @@ message CreateSnapshotRequest { // Request for the UpdateSnapshot method. message UpdateSnapshotRequest { - // The updated snapshot object. - Snapshot snapshot = 1; + // Required. The updated snapshot object. + Snapshot snapshot = 1 [(google.api.field_behavior) = REQUIRED]; - // Indicates which fields in the provided snapshot to update. + // Required. Indicates which fields in the provided snapshot to update. // Must be specified and non-empty. - google.protobuf.FieldMask update_mask = 2; + google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED]; } // A snapshot resource. Snapshots are used in @@ -985,11 +1090,18 @@ message UpdateSnapshotRequest { // acknowledgment state of messages in an existing subscription to the state // captured by a snapshot. message Snapshot { + option (google.api.resource) = { + type: "pubsub.googleapis.com/Snapshot" + pattern: "projects/{project}/snapshots/{snapshot}" + }; + // The name of the snapshot. string name = 1; // The name of the topic from which this snapshot is retaining messages. - string topic = 2; + string topic = 2 [(google.api.resource_reference) = { + type: "pubsub.googleapis.com/Topic" + }]; // The snapshot is guaranteed to exist up until this time. // A newly-created snapshot expires no later than 7 days from the time of its @@ -1010,16 +1122,26 @@ message Snapshot { // Request for the GetSnapshot method. message GetSnapshotRequest { - // The name of the snapshot to get. + // Required. The name of the snapshot to get. // Format is `projects/{project}/snapshots/{snap}`. - string snapshot = 1; + string snapshot = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Snapshot" + } + ]; } // Request for the `ListSnapshots` method. message ListSnapshotsRequest { - // The name of the project in which to list snapshots. + // Required. The name of the project in which to list snapshots. // Format is `projects/{project-id}`. - string project = 1; + string project = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "cloudresourcemanager.googleapis.com/Project" + } + ]; // Maximum number of snapshots to return. int32 page_size = 2; @@ -1042,15 +1164,25 @@ message ListSnapshotsResponse { // Request for the `DeleteSnapshot` method. message DeleteSnapshotRequest { - // The name of the snapshot to delete. + // Required. The name of the snapshot to delete. // Format is `projects/{project}/snapshots/{snap}`. - string snapshot = 1; + string snapshot = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Snapshot" + } + ]; } // Request for the `Seek` method. message SeekRequest { - // The subscription to affect. - string subscription = 1; + // Required. The subscription to affect. + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; oneof target { // The time to seek to. @@ -1069,9 +1201,13 @@ message SeekRequest { // The snapshot to seek to. The snapshot's topic must be the same as that of // the provided subscription. // Format is `projects/{project}/snapshots/{snap}`. - string snapshot = 3; + string snapshot = 3 [(google.api.resource_reference) = { + type: "pubsub.googleapis.com/Snapshot" + }]; } } // Response for the `Seek` method (this response is empty). -message SeekResponse {} +message SeekResponse { + +} diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 4261a69fa7a..d3389fbf465 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -4627,6 +4627,242 @@ export namespace google { /** Namespace api. */ namespace api { + /** FieldBehavior enum. */ + enum FieldBehavior { + FIELD_BEHAVIOR_UNSPECIFIED = 0, + OPTIONAL = 1, + REQUIRED = 2, + OUTPUT_ONLY = 3, + INPUT_ONLY = 4, + IMMUTABLE = 5 + } + + /** Properties of a ResourceDescriptor. */ + interface IResourceDescriptor { + + /** ResourceDescriptor type */ + type?: (string|null); + + /** ResourceDescriptor pattern */ + pattern?: (string[]|null); + + /** ResourceDescriptor nameField */ + nameField?: (string|null); + + /** ResourceDescriptor history */ + history?: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History|null); + + /** ResourceDescriptor plural */ + plural?: (string|null); + + /** ResourceDescriptor singular */ + singular?: (string|null); + } + + /** Represents a ResourceDescriptor. */ + class ResourceDescriptor implements IResourceDescriptor { + + /** + * Constructs a new ResourceDescriptor. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IResourceDescriptor); + + /** ResourceDescriptor type. */ + public type: string; + + /** ResourceDescriptor pattern. */ + public pattern: string[]; + + /** ResourceDescriptor nameField. */ + public nameField: string; + + /** ResourceDescriptor history. */ + public history: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History); + + /** ResourceDescriptor plural. */ + public plural: string; + + /** ResourceDescriptor singular. */ + public singular: string; + + /** + * Creates a new ResourceDescriptor instance using the specified properties. + * @param [properties] Properties to set + * @returns ResourceDescriptor instance + */ + public static create(properties?: google.api.IResourceDescriptor): google.api.ResourceDescriptor; + + /** + * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @param message ResourceDescriptor message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @param message ResourceDescriptor message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceDescriptor; + + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceDescriptor; + + /** + * Verifies a ResourceDescriptor message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ResourceDescriptor + */ + public static fromObject(object: { [k: string]: any }): google.api.ResourceDescriptor; + + /** + * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. + * @param message ResourceDescriptor + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ResourceDescriptor, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ResourceDescriptor to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace ResourceDescriptor { + + /** History enum. */ + enum History { + HISTORY_UNSPECIFIED = 0, + ORIGINALLY_SINGLE_PATTERN = 1, + FUTURE_MULTI_PATTERN = 2 + } + } + + /** Properties of a ResourceReference. */ + interface IResourceReference { + + /** ResourceReference type */ + type?: (string|null); + + /** ResourceReference childType */ + childType?: (string|null); + } + + /** Represents a ResourceReference. */ + class ResourceReference implements IResourceReference { + + /** + * Constructs a new ResourceReference. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IResourceReference); + + /** ResourceReference type. */ + public type: string; + + /** ResourceReference childType. */ + public childType: string; + + /** + * Creates a new ResourceReference instance using the specified properties. + * @param [properties] Properties to set + * @returns ResourceReference instance + */ + public static create(properties?: google.api.IResourceReference): google.api.ResourceReference; + + /** + * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @param message ResourceReference message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @param message ResourceReference message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ResourceReference message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceReference; + + /** + * Decodes a ResourceReference message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceReference; + + /** + * Verifies a ResourceReference message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ResourceReference + */ + public static fromObject(object: { [k: string]: any }): google.api.ResourceReference; + + /** + * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. + * @param message ResourceReference + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ResourceReference, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ResourceReference to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + /** Properties of a Http. */ interface IHttp { @@ -6525,6 +6761,9 @@ export namespace google { /** FileOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** FileOptions .google.api.resourceDefinition */ + ".google.api.resourceDefinition"?: (google.api.IResourceDescriptor[]|null); } /** Represents a FileOptions. */ @@ -6697,6 +6936,9 @@ export namespace google { /** MessageOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** MessageOptions .google.api.resource */ + ".google.api.resource"?: (google.api.IResourceDescriptor|null); } /** Represents a MessageOptions. */ @@ -6817,6 +7059,12 @@ export namespace google { /** FieldOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** FieldOptions .google.api.fieldBehavior */ + ".google.api.fieldBehavior"?: (google.api.FieldBehavior[]|null); + + /** FieldOptions .google.api.resourceReference */ + ".google.api.resourceReference"?: (google.api.IResourceReference|null); } /** Represents a FieldOptions. */ @@ -7339,11 +7587,11 @@ export namespace google { /** MethodOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** MethodOptions .google.api.http */ - ".google.api.http"?: (google.api.IHttpRule|null); - /** MethodOptions .google.api.methodSignature */ ".google.api.methodSignature"?: (string[]|null); + + /** MethodOptions .google.api.http */ + ".google.api.http"?: (google.api.IHttpRule|null); } /** Represents a MethodOptions. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 8a3dadcf53f..a69d2d1b4af 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -10457,6 +10457,587 @@ */ var api = {}; + /** + * FieldBehavior enum. + * @name google.api.FieldBehavior + * @enum {string} + * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value + * @property {number} OPTIONAL=1 OPTIONAL value + * @property {number} REQUIRED=2 REQUIRED value + * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value + * @property {number} INPUT_ONLY=4 INPUT_ONLY value + * @property {number} IMMUTABLE=5 IMMUTABLE value + */ + api.FieldBehavior = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0; + values[valuesById[1] = "OPTIONAL"] = 1; + values[valuesById[2] = "REQUIRED"] = 2; + values[valuesById[3] = "OUTPUT_ONLY"] = 3; + values[valuesById[4] = "INPUT_ONLY"] = 4; + values[valuesById[5] = "IMMUTABLE"] = 5; + return values; + })(); + + api.ResourceDescriptor = (function() { + + /** + * Properties of a ResourceDescriptor. + * @memberof google.api + * @interface IResourceDescriptor + * @property {string|null} [type] ResourceDescriptor type + * @property {Array.|null} [pattern] ResourceDescriptor pattern + * @property {string|null} [nameField] ResourceDescriptor nameField + * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history + * @property {string|null} [plural] ResourceDescriptor plural + * @property {string|null} [singular] ResourceDescriptor singular + */ + + /** + * Constructs a new ResourceDescriptor. + * @memberof google.api + * @classdesc Represents a ResourceDescriptor. + * @implements IResourceDescriptor + * @constructor + * @param {google.api.IResourceDescriptor=} [properties] Properties to set + */ + function ResourceDescriptor(properties) { + this.pattern = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ResourceDescriptor type. + * @member {string} type + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.type = ""; + + /** + * ResourceDescriptor pattern. + * @member {Array.} pattern + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.pattern = $util.emptyArray; + + /** + * ResourceDescriptor nameField. + * @member {string} nameField + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.nameField = ""; + + /** + * ResourceDescriptor history. + * @member {google.api.ResourceDescriptor.History} history + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.history = 0; + + /** + * ResourceDescriptor plural. + * @member {string} plural + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.plural = ""; + + /** + * ResourceDescriptor singular. + * @member {string} singular + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.singular = ""; + + /** + * Creates a new ResourceDescriptor instance using the specified properties. + * @function create + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor=} [properties] Properties to set + * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance + */ + ResourceDescriptor.create = function create(properties) { + return new ResourceDescriptor(properties); + }; + + /** + * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @function encode + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceDescriptor.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); + if (message.pattern != null && message.pattern.length) + for (var i = 0; i < message.pattern.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]); + if (message.nameField != null && message.hasOwnProperty("nameField")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField); + if (message.history != null && message.hasOwnProperty("history")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history); + if (message.plural != null && message.hasOwnProperty("plural")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); + if (message.singular != null && message.hasOwnProperty("singular")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); + return writer; + }; + + /** + * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer. + * @function decode + * @memberof google.api.ResourceDescriptor + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceDescriptor.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.type = reader.string(); + break; + case 2: + if (!(message.pattern && message.pattern.length)) + message.pattern = []; + message.pattern.push(reader.string()); + break; + case 3: + message.nameField = reader.string(); + break; + case 4: + message.history = reader.int32(); + break; + case 5: + message.plural = reader.string(); + break; + case 6: + message.singular = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.ResourceDescriptor + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ResourceDescriptor message. + * @function verify + * @memberof google.api.ResourceDescriptor + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ResourceDescriptor.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.pattern != null && message.hasOwnProperty("pattern")) { + if (!Array.isArray(message.pattern)) + return "pattern: array expected"; + for (var i = 0; i < message.pattern.length; ++i) + if (!$util.isString(message.pattern[i])) + return "pattern: string[] expected"; + } + if (message.nameField != null && message.hasOwnProperty("nameField")) + if (!$util.isString(message.nameField)) + return "nameField: string expected"; + if (message.history != null && message.hasOwnProperty("history")) + switch (message.history) { + default: + return "history: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.plural != null && message.hasOwnProperty("plural")) + if (!$util.isString(message.plural)) + return "plural: string expected"; + if (message.singular != null && message.hasOwnProperty("singular")) + if (!$util.isString(message.singular)) + return "singular: string expected"; + return null; + }; + + /** + * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.ResourceDescriptor + * @static + * @param {Object.} object Plain object + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + */ + ResourceDescriptor.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ResourceDescriptor) + return object; + var message = new $root.google.api.ResourceDescriptor(); + if (object.type != null) + message.type = String(object.type); + if (object.pattern) { + if (!Array.isArray(object.pattern)) + throw TypeError(".google.api.ResourceDescriptor.pattern: array expected"); + message.pattern = []; + for (var i = 0; i < object.pattern.length; ++i) + message.pattern[i] = String(object.pattern[i]); + } + if (object.nameField != null) + message.nameField = String(object.nameField); + switch (object.history) { + case "HISTORY_UNSPECIFIED": + case 0: + message.history = 0; + break; + case "ORIGINALLY_SINGLE_PATTERN": + case 1: + message.history = 1; + break; + case "FUTURE_MULTI_PATTERN": + case 2: + message.history = 2; + break; + } + if (object.plural != null) + message.plural = String(object.plural); + if (object.singular != null) + message.singular = String(object.singular); + return message; + }; + + /** + * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.ResourceDescriptor} message ResourceDescriptor + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ResourceDescriptor.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.pattern = []; + if (options.defaults) { + object.type = ""; + object.nameField = ""; + object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0; + object.plural = ""; + object.singular = ""; + } + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.pattern && message.pattern.length) { + object.pattern = []; + for (var j = 0; j < message.pattern.length; ++j) + object.pattern[j] = message.pattern[j]; + } + if (message.nameField != null && message.hasOwnProperty("nameField")) + object.nameField = message.nameField; + if (message.history != null && message.hasOwnProperty("history")) + object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history; + if (message.plural != null && message.hasOwnProperty("plural")) + object.plural = message.plural; + if (message.singular != null && message.hasOwnProperty("singular")) + object.singular = message.singular; + return object; + }; + + /** + * Converts this ResourceDescriptor to JSON. + * @function toJSON + * @memberof google.api.ResourceDescriptor + * @instance + * @returns {Object.} JSON object + */ + ResourceDescriptor.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * History enum. + * @name google.api.ResourceDescriptor.History + * @enum {string} + * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value + * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value + * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value + */ + ResourceDescriptor.History = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0; + values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1; + values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2; + return values; + })(); + + return ResourceDescriptor; + })(); + + api.ResourceReference = (function() { + + /** + * Properties of a ResourceReference. + * @memberof google.api + * @interface IResourceReference + * @property {string|null} [type] ResourceReference type + * @property {string|null} [childType] ResourceReference childType + */ + + /** + * Constructs a new ResourceReference. + * @memberof google.api + * @classdesc Represents a ResourceReference. + * @implements IResourceReference + * @constructor + * @param {google.api.IResourceReference=} [properties] Properties to set + */ + function ResourceReference(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ResourceReference type. + * @member {string} type + * @memberof google.api.ResourceReference + * @instance + */ + ResourceReference.prototype.type = ""; + + /** + * ResourceReference childType. + * @member {string} childType + * @memberof google.api.ResourceReference + * @instance + */ + ResourceReference.prototype.childType = ""; + + /** + * Creates a new ResourceReference instance using the specified properties. + * @function create + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference=} [properties] Properties to set + * @returns {google.api.ResourceReference} ResourceReference instance + */ + ResourceReference.create = function create(properties) { + return new ResourceReference(properties); + }; + + /** + * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @function encode + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceReference.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); + if (message.childType != null && message.hasOwnProperty("childType")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType); + return writer; + }; + + /** + * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceReference.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ResourceReference message from the specified reader or buffer. + * @function decode + * @memberof google.api.ResourceReference + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.ResourceReference} ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceReference.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.type = reader.string(); + break; + case 2: + message.childType = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ResourceReference message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.ResourceReference + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.ResourceReference} ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceReference.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ResourceReference message. + * @function verify + * @memberof google.api.ResourceReference + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ResourceReference.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.childType != null && message.hasOwnProperty("childType")) + if (!$util.isString(message.childType)) + return "childType: string expected"; + return null; + }; + + /** + * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.ResourceReference + * @static + * @param {Object.} object Plain object + * @returns {google.api.ResourceReference} ResourceReference + */ + ResourceReference.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ResourceReference) + return object; + var message = new $root.google.api.ResourceReference(); + if (object.type != null) + message.type = String(object.type); + if (object.childType != null) + message.childType = String(object.childType); + return message; + }; + + /** + * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.ResourceReference + * @static + * @param {google.api.ResourceReference} message ResourceReference + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ResourceReference.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.type = ""; + object.childType = ""; + } + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.childType != null && message.hasOwnProperty("childType")) + object.childType = message.childType; + return object; + }; + + /** + * Converts this ResourceReference to JSON. + * @function toJSON + * @memberof google.api.ResourceReference + * @instance + * @returns {Object.} JSON object + */ + ResourceReference.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ResourceReference; + })(); + api.Http = (function() { /** @@ -15532,6 +16113,7 @@ * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace * @property {string|null} [rubyPackage] FileOptions rubyPackage * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption + * @property {Array.|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition */ /** @@ -15544,6 +16126,7 @@ */ function FileOptions(properties) { this.uninterpretedOption = []; + this[".google.api.resourceDefinition"] = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -15718,6 +16301,14 @@ */ FileOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * FileOptions .google.api.resourceDefinition. + * @member {Array.} .google.api.resourceDefinition + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype[".google.api.resourceDefinition"] = $util.emptyArray; + /** * Creates a new FileOptions instance using the specified properties. * @function create @@ -15785,6 +16376,9 @@ if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.resourceDefinition"] != null && message[".google.api.resourceDefinition"].length) + for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) + $root.google.api.ResourceDescriptor.encode(message[".google.api.resourceDefinition"][i], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); return writer; }; @@ -15884,6 +16478,11 @@ message.uninterpretedOption = []; message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); break; + case 1053: + if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length)) + message[".google.api.resourceDefinition"] = []; + message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32())); + break; default: reader.skipType(tag & 7); break; @@ -15994,6 +16593,15 @@ return "uninterpretedOption." + error; } } + if (message[".google.api.resourceDefinition"] != null && message.hasOwnProperty(".google.api.resourceDefinition")) { + if (!Array.isArray(message[".google.api.resourceDefinition"])) + return ".google.api.resourceDefinition: array expected"; + for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) { + var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resourceDefinition"][i]); + if (error) + return ".google.api.resourceDefinition." + error; + } + } return null; }; @@ -16071,6 +16679,16 @@ message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } } + if (object[".google.api.resourceDefinition"]) { + if (!Array.isArray(object[".google.api.resourceDefinition"])) + throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: array expected"); + message[".google.api.resourceDefinition"] = []; + for (var i = 0; i < object[".google.api.resourceDefinition"].length; ++i) { + if (typeof object[".google.api.resourceDefinition"][i] !== "object") + throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: object expected"); + message[".google.api.resourceDefinition"][i] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resourceDefinition"][i]); + } + } return message; }; @@ -16087,8 +16705,10 @@ if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) + if (options.arrays || options.defaults) { object.uninterpretedOption = []; + object[".google.api.resourceDefinition"] = []; + } if (options.defaults) { object.javaPackage = ""; object.javaOuterClassname = ""; @@ -16156,6 +16776,11 @@ for (var j = 0; j < message.uninterpretedOption.length; ++j) object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); } + if (message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length) { + object[".google.api.resourceDefinition"] = []; + for (var j = 0; j < message[".google.api.resourceDefinition"].length; ++j) + object[".google.api.resourceDefinition"][j] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resourceDefinition"][j], options); + } return object; }; @@ -16200,6 +16825,7 @@ * @property {boolean|null} [deprecated] MessageOptions deprecated * @property {boolean|null} [mapEntry] MessageOptions mapEntry * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption + * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource */ /** @@ -16258,6 +16884,14 @@ */ MessageOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * MessageOptions .google.api.resource. + * @member {google.api.IResourceDescriptor|null|undefined} .google.api.resource + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype[".google.api.resource"] = null; + /** * Creates a new MessageOptions instance using the specified properties. * @function create @@ -16293,6 +16927,8 @@ if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) + $root.google.api.ResourceDescriptor.encode(message[".google.api.resource"], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); return writer; }; @@ -16344,6 +16980,9 @@ message.uninterpretedOption = []; message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); break; + case 1053: + message[".google.api.resource"] = $root.google.api.ResourceDescriptor.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -16400,6 +17039,11 @@ return "uninterpretedOption." + error; } } + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) { + var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resource"]); + if (error) + return ".google.api.resource." + error; + } return null; }; @@ -16433,6 +17077,11 @@ message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } } + if (object[".google.api.resource"] != null) { + if (typeof object[".google.api.resource"] !== "object") + throw TypeError(".google.protobuf.MessageOptions..google.api.resource: object expected"); + message[".google.api.resource"] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resource"]); + } return message; }; @@ -16456,6 +17105,7 @@ object.noStandardDescriptorAccessor = false; object.deprecated = false; object.mapEntry = false; + object[".google.api.resource"] = null; } if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) object.messageSetWireFormat = message.messageSetWireFormat; @@ -16470,6 +17120,8 @@ for (var j = 0; j < message.uninterpretedOption.length; ++j) object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); } + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) + object[".google.api.resource"] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resource"], options); return object; }; @@ -16500,6 +17152,8 @@ * @property {boolean|null} [deprecated] FieldOptions deprecated * @property {boolean|null} [weak] FieldOptions weak * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption + * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior + * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference */ /** @@ -16512,6 +17166,7 @@ */ function FieldOptions(properties) { this.uninterpretedOption = []; + this[".google.api.fieldBehavior"] = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -16574,6 +17229,22 @@ */ FieldOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * FieldOptions .google.api.fieldBehavior. + * @member {Array.} .google.api.fieldBehavior + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype[".google.api.fieldBehavior"] = $util.emptyArray; + + /** + * FieldOptions .google.api.resourceReference. + * @member {google.api.IResourceReference|null|undefined} .google.api.resourceReference + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype[".google.api.resourceReference"] = null; + /** * Creates a new FieldOptions instance using the specified properties. * @function create @@ -16613,6 +17284,14 @@ if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.fieldBehavior"] != null && message[".google.api.fieldBehavior"].length) { + writer.uint32(/* id 1052, wireType 2 =*/8418).fork(); + for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) + writer.int32(message[".google.api.fieldBehavior"][i]); + writer.ldelim(); + } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) + $root.google.api.ResourceReference.encode(message[".google.api.resourceReference"], writer.uint32(/* id 1055, wireType 2 =*/8442).fork()).ldelim(); return writer; }; @@ -16670,6 +17349,19 @@ message.uninterpretedOption = []; message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); break; + case 1052: + if (!(message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length)) + message[".google.api.fieldBehavior"] = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message[".google.api.fieldBehavior"].push(reader.int32()); + } else + message[".google.api.fieldBehavior"].push(reader.int32()); + break; + case 1055: + message[".google.api.resourceReference"] = $root.google.api.ResourceReference.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -16744,6 +17436,27 @@ return "uninterpretedOption." + error; } } + if (message[".google.api.fieldBehavior"] != null && message.hasOwnProperty(".google.api.fieldBehavior")) { + if (!Array.isArray(message[".google.api.fieldBehavior"])) + return ".google.api.fieldBehavior: array expected"; + for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) + switch (message[".google.api.fieldBehavior"][i]) { + default: + return ".google.api.fieldBehavior: enum value[] expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) { + var error = $root.google.api.ResourceReference.verify(message[".google.api.resourceReference"]); + if (error) + return ".google.api.resourceReference." + error; + } return null; }; @@ -16805,6 +17518,44 @@ message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } } + if (object[".google.api.fieldBehavior"]) { + if (!Array.isArray(object[".google.api.fieldBehavior"])) + throw TypeError(".google.protobuf.FieldOptions..google.api.fieldBehavior: array expected"); + message[".google.api.fieldBehavior"] = []; + for (var i = 0; i < object[".google.api.fieldBehavior"].length; ++i) + switch (object[".google.api.fieldBehavior"][i]) { + default: + case "FIELD_BEHAVIOR_UNSPECIFIED": + case 0: + message[".google.api.fieldBehavior"][i] = 0; + break; + case "OPTIONAL": + case 1: + message[".google.api.fieldBehavior"][i] = 1; + break; + case "REQUIRED": + case 2: + message[".google.api.fieldBehavior"][i] = 2; + break; + case "OUTPUT_ONLY": + case 3: + message[".google.api.fieldBehavior"][i] = 3; + break; + case "INPUT_ONLY": + case 4: + message[".google.api.fieldBehavior"][i] = 4; + break; + case "IMMUTABLE": + case 5: + message[".google.api.fieldBehavior"][i] = 5; + break; + } + } + if (object[".google.api.resourceReference"] != null) { + if (typeof object[".google.api.resourceReference"] !== "object") + throw TypeError(".google.protobuf.FieldOptions..google.api.resourceReference: object expected"); + message[".google.api.resourceReference"] = $root.google.api.ResourceReference.fromObject(object[".google.api.resourceReference"]); + } return message; }; @@ -16821,8 +17572,10 @@ if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) + if (options.arrays || options.defaults) { object.uninterpretedOption = []; + object[".google.api.fieldBehavior"] = []; + } if (options.defaults) { object.ctype = options.enums === String ? "STRING" : 0; object.packed = false; @@ -16830,6 +17583,7 @@ object.lazy = false; object.jstype = options.enums === String ? "JS_NORMAL" : 0; object.weak = false; + object[".google.api.resourceReference"] = null; } if (message.ctype != null && message.hasOwnProperty("ctype")) object.ctype = options.enums === String ? $root.google.protobuf.FieldOptions.CType[message.ctype] : message.ctype; @@ -16848,6 +17602,13 @@ for (var j = 0; j < message.uninterpretedOption.length; ++j) object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); } + if (message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length) { + object[".google.api.fieldBehavior"] = []; + for (var j = 0; j < message[".google.api.fieldBehavior"].length; ++j) + object[".google.api.fieldBehavior"][j] = options.enums === String ? $root.google.api.FieldBehavior[message[".google.api.fieldBehavior"][j]] : message[".google.api.fieldBehavior"][j]; + } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) + object[".google.api.resourceReference"] = $root.google.api.ResourceReference.toObject(message[".google.api.resourceReference"], options); return object; }; @@ -17875,8 +18636,8 @@ * @property {boolean|null} [deprecated] MethodOptions deprecated * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel * @property {Array.|null} [uninterpretedOption] MethodOptions uninterpretedOption - * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature + * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http */ /** @@ -17921,20 +18682,20 @@ MethodOptions.prototype.uninterpretedOption = $util.emptyArray; /** - * MethodOptions .google.api.http. - * @member {google.api.IHttpRule|null|undefined} .google.api.http + * MethodOptions .google.api.methodSignature. + * @member {Array.} .google.api.methodSignature * @memberof google.protobuf.MethodOptions * @instance */ - MethodOptions.prototype[".google.api.http"] = null; + MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; /** - * MethodOptions .google.api.methodSignature. - * @member {Array.} .google.api.methodSignature + * MethodOptions .google.api.http. + * @member {google.api.IHttpRule|null|undefined} .google.api.http * @memberof google.protobuf.MethodOptions * @instance */ - MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; + MethodOptions.prototype[".google.api.http"] = null; /** * Creates a new MethodOptions instance using the specified properties. @@ -18017,14 +18778,14 @@ message.uninterpretedOption = []; message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); break; - case 72295728: - message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); - break; case 1051: if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) message[".google.api.methodSignature"] = []; message[".google.api.methodSignature"].push(reader.string()); break; + case 72295728: + message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -18081,11 +18842,6 @@ return "uninterpretedOption." + error; } } - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { - var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); - if (error) - return ".google.api.http." + error; - } if (message[".google.api.methodSignature"] != null && message.hasOwnProperty(".google.api.methodSignature")) { if (!Array.isArray(message[".google.api.methodSignature"])) return ".google.api.methodSignature: array expected"; @@ -18093,6 +18849,11 @@ if (!$util.isString(message[".google.api.methodSignature"][i])) return ".google.api.methodSignature: string[] expected"; } + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { + var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); + if (error) + return ".google.api.http." + error; + } return null; }; @@ -18134,11 +18895,6 @@ message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } } - if (object[".google.api.http"] != null) { - if (typeof object[".google.api.http"] !== "object") - throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); - message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); - } if (object[".google.api.methodSignature"]) { if (!Array.isArray(object[".google.api.methodSignature"])) throw TypeError(".google.protobuf.MethodOptions..google.api.methodSignature: array expected"); @@ -18146,6 +18902,11 @@ for (var i = 0; i < object[".google.api.methodSignature"].length; ++i) message[".google.api.methodSignature"][i] = String(object[".google.api.methodSignature"][i]); } + if (object[".google.api.http"] != null) { + if (typeof object[".google.api.http"] !== "object") + throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); + message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); + } return message; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 4ee8c78f451..e37dfffc062 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -27,7 +27,8 @@ "responseType": "Topic", "options": { "(google.api.http).put": "/v1/{name=projects/*/topics/*}", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "name" } }, "UpdateTopic": { @@ -43,28 +44,32 @@ "responseType": "PublishResponse", "options": { "(google.api.http).post": "/v1/{topic=projects/*/topics/*}:publish", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "topic,messages" } }, "GetTopic": { "requestType": "GetTopicRequest", "responseType": "Topic", "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}" + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}", + "(google.api.method_signature)": "topic" } }, "ListTopics": { "requestType": "ListTopicsRequest", "responseType": "ListTopicsResponse", "options": { - "(google.api.http).get": "/v1/{project=projects/*}/topics" + "(google.api.http).get": "/v1/{project=projects/*}/topics", + "(google.api.method_signature)": "project" } }, "ListTopicSubscriptions": { "requestType": "ListTopicSubscriptionsRequest", "responseType": "ListTopicSubscriptionsResponse", "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/subscriptions" + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/subscriptions", + "(google.api.method_signature)": "topic" } }, "ListTopicSnapshots": { @@ -78,7 +83,8 @@ "requestType": "DeleteTopicRequest", "responseType": "google.protobuf.Empty", "options": { - "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}" + "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}", + "(google.api.method_signature)": "topic" } } } @@ -93,10 +99,17 @@ } }, "Topic": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Topic", + "(google.api.resource).pattern": "_deleted-topic_" + }, "fields": { "name": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, "labels": { "keyType": "string", @@ -142,7 +155,11 @@ "fields": { "topic": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } } } }, @@ -150,11 +167,17 @@ "fields": { "topic": { "type": "Topic", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, "updateMask": { "type": "google.protobuf.FieldMask", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, @@ -162,12 +185,19 @@ "fields": { "topic": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } }, "messages": { "rule": "repeated", "type": "PubsubMessage", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, @@ -184,7 +214,11 @@ "fields": { "project": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } }, "pageSize": { "type": "int32", @@ -213,7 +247,11 @@ "fields": { "topic": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } }, "pageSize": { "type": "int32", @@ -230,7 +268,10 @@ "subscriptions": { "rule": "repeated", "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, "nextPageToken": { "type": "string", @@ -271,7 +312,11 @@ "fields": { "topic": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } } } }, @@ -286,14 +331,16 @@ "responseType": "Subscription", "options": { "(google.api.http).put": "/v1/{name=projects/*/subscriptions/*}", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "name,topic,push_config,ack_deadline_seconds" } }, "GetSubscription": { "requestType": "GetSubscriptionRequest", "responseType": "Subscription", "options": { - "(google.api.http).get": "/v1/{subscription=projects/*/subscriptions/*}" + "(google.api.http).get": "/v1/{subscription=projects/*/subscriptions/*}", + "(google.api.method_signature)": "subscription" } }, "UpdateSubscription": { @@ -308,14 +355,16 @@ "requestType": "ListSubscriptionsRequest", "responseType": "ListSubscriptionsResponse", "options": { - "(google.api.http).get": "/v1/{project=projects/*}/subscriptions" + "(google.api.http).get": "/v1/{project=projects/*}/subscriptions", + "(google.api.method_signature)": "project" } }, "DeleteSubscription": { "requestType": "DeleteSubscriptionRequest", "responseType": "google.protobuf.Empty", "options": { - "(google.api.http).delete": "/v1/{subscription=projects/*/subscriptions/*}" + "(google.api.http).delete": "/v1/{subscription=projects/*/subscriptions/*}", + "(google.api.method_signature)": "subscription" } }, "ModifyAckDeadline": { @@ -323,7 +372,8 @@ "responseType": "google.protobuf.Empty", "options": { "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,ack_ids,ack_deadline_seconds" } }, "Acknowledge": { @@ -331,7 +381,8 @@ "responseType": "google.protobuf.Empty", "options": { "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:acknowledge", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,ack_ids" } }, "Pull": { @@ -339,7 +390,8 @@ "responseType": "PullResponse", "options": { "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:pull", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,return_immediately,max_messages" } }, "StreamingPull": { @@ -353,7 +405,8 @@ "responseType": "google.protobuf.Empty", "options": { "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,push_config" } }, "GetSnapshot": { @@ -367,7 +420,8 @@ "requestType": "ListSnapshotsRequest", "responseType": "ListSnapshotsResponse", "options": { - "(google.api.http).get": "/v1/{project=projects/*}/snapshots" + "(google.api.http).get": "/v1/{project=projects/*}/snapshots", + "(google.api.method_signature)": "project" } }, "CreateSnapshot": { @@ -375,7 +429,8 @@ "responseType": "Snapshot", "options": { "(google.api.http).put": "/v1/{name=projects/*/snapshots/*}", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "name,subscription" } }, "UpdateSnapshot": { @@ -390,7 +445,8 @@ "requestType": "DeleteSnapshotRequest", "responseType": "google.protobuf.Empty", "options": { - "(google.api.http).delete": "/v1/{snapshot=projects/*/snapshots/*}" + "(google.api.http).delete": "/v1/{snapshot=projects/*/snapshots/*}", + "(google.api.method_signature)": "snapshot" } }, "Seek": { @@ -404,14 +460,25 @@ } }, "Subscription": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Subscription", + "(google.api.resource).pattern": "projects/{project}/subscriptions/{subscription}" + }, "fields": { "name": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, "topic": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } }, "pushConfig": { "type": "PushConfig", @@ -526,7 +593,11 @@ "fields": { "subscription": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } } } }, @@ -534,11 +605,17 @@ "fields": { "subscription": { "type": "Subscription", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, "updateMask": { "type": "google.protobuf.FieldMask", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, @@ -546,7 +623,11 @@ "fields": { "project": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } }, "pageSize": { "type": "int32", @@ -575,7 +656,11 @@ "fields": { "subscription": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } } } }, @@ -583,11 +668,18 @@ "fields": { "subscription": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, "pushConfig": { "type": "PushConfig", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, @@ -595,7 +687,11 @@ "fields": { "subscription": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, "returnImmediately": { "type": "bool", @@ -603,7 +699,10 @@ }, "maxMessages": { "type": "int32", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, @@ -620,16 +719,26 @@ "fields": { "subscription": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, "ackIds": { "rule": "repeated", "type": "string", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, "ackDeadlineSeconds": { "type": "int32", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, @@ -637,12 +746,19 @@ "fields": { "subscription": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, "ackIds": { "rule": "repeated", "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, @@ -650,7 +766,11 @@ "fields": { "subscription": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, "ackIds": { "rule": "repeated", @@ -669,7 +789,10 @@ }, "streamAckDeadlineSeconds": { "type": "int32", - "id": 5 + "id": 5, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, "clientId": { "type": "string", @@ -690,11 +813,19 @@ "fields": { "name": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" + } }, "subscription": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, "labels": { "keyType": "string", @@ -707,15 +838,25 @@ "fields": { "snapshot": { "type": "Snapshot", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, "updateMask": { "type": "google.protobuf.FieldMask", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, "Snapshot": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Snapshot", + "(google.api.resource).pattern": "projects/{project}/snapshots/{snapshot}" + }, "fields": { "name": { "type": "string", @@ -723,7 +864,10 @@ }, "topic": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } }, "expireTime": { "type": "google.protobuf.Timestamp", @@ -740,7 +884,11 @@ "fields": { "snapshot": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" + } } } }, @@ -748,7 +896,11 @@ "fields": { "project": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } }, "pageSize": { "type": "int32", @@ -777,7 +929,11 @@ "fields": { "snapshot": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" + } } } }, @@ -793,7 +949,11 @@ "fields": { "subscription": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, "time": { "type": "google.protobuf.Timestamp", @@ -801,7 +961,10 @@ }, "snapshot": { "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" + } } } }, @@ -816,12 +979,110 @@ "options": { "go_package": "google.golang.org/genproto/googleapis/api/annotations;annotations", "java_multiple_files": true, - "java_outer_classname": "ClientProto", + "java_outer_classname": "HttpProto", "java_package": "com.google.api", "objc_class_prefix": "GAPI", "cc_enable_arenas": true }, "nested": { + "methodSignature": { + "rule": "repeated", + "type": "string", + "id": 1051, + "extend": "google.protobuf.MethodOptions" + }, + "defaultHost": { + "type": "string", + "id": 1049, + "extend": "google.protobuf.ServiceOptions" + }, + "oauthScopes": { + "type": "string", + "id": 1050, + "extend": "google.protobuf.ServiceOptions" + }, + "fieldBehavior": { + "rule": "repeated", + "type": "google.api.FieldBehavior", + "id": 1052, + "extend": "google.protobuf.FieldOptions" + }, + "FieldBehavior": { + "values": { + "FIELD_BEHAVIOR_UNSPECIFIED": 0, + "OPTIONAL": 1, + "REQUIRED": 2, + "OUTPUT_ONLY": 3, + "INPUT_ONLY": 4, + "IMMUTABLE": 5 + } + }, + "resourceReference": { + "type": "google.api.ResourceReference", + "id": 1055, + "extend": "google.protobuf.FieldOptions" + }, + "resourceDefinition": { + "rule": "repeated", + "type": "google.api.ResourceDescriptor", + "id": 1053, + "extend": "google.protobuf.FileOptions" + }, + "resource": { + "type": "google.api.ResourceDescriptor", + "id": 1053, + "extend": "google.protobuf.MessageOptions" + }, + "ResourceDescriptor": { + "fields": { + "type": { + "type": "string", + "id": 1 + }, + "pattern": { + "rule": "repeated", + "type": "string", + "id": 2 + }, + "nameField": { + "type": "string", + "id": 3 + }, + "history": { + "type": "History", + "id": 4 + }, + "plural": { + "type": "string", + "id": 5 + }, + "singular": { + "type": "string", + "id": 6 + } + }, + "nested": { + "History": { + "values": { + "HISTORY_UNSPECIFIED": 0, + "ORIGINALLY_SINGLE_PATTERN": 1, + "FUTURE_MULTI_PATTERN": 2 + } + } + } + }, + "ResourceReference": { + "fields": { + "type": { + "type": "string", + "id": 1 + }, + "childType": { + "type": "string", + "id": 2 + } + } + }, "http": { "type": "HttpRule", "id": 72295728, @@ -908,22 +1169,6 @@ "id": 2 } } - }, - "methodSignature": { - "rule": "repeated", - "type": "string", - "id": 1051, - "extend": "google.protobuf.MethodOptions" - }, - "defaultHost": { - "type": "string", - "id": 1049, - "extend": "google.protobuf.ServiceOptions" - }, - "oauthScopes": { - "type": "string", - "id": 1050, - "extend": "google.protobuf.ServiceOptions" } } }, diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index 863e5f253d1..b1cd27b3f46 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -35,7 +35,7 @@ const MessageStoragePolicy = { * A topic resource. * * @property {string} name - * The name of the topic. It must have the format + * Required. The name of the topic. It must have the format * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent @@ -121,7 +121,7 @@ const PubsubMessage = { * Request for the GetTopic method. * * @property {string} topic - * The name of the topic to get. + * Required. The name of the topic to get. * Format is `projects/{project}/topics/{topic}`. * * @typedef GetTopicRequest @@ -136,12 +136,12 @@ const GetTopicRequest = { * Request for the UpdateTopic method. * * @property {Object} topic - * The updated topic object. + * Required. The updated topic object. * * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} * * @property {Object} updateMask - * Indicates which fields in the provided topic to update. Must be specified + * Required. Indicates which fields in the provided topic to update. Must be specified * and non-empty. Note that if `update_mask` contains * "message_storage_policy" then the new value will be determined based on the * policy configured at the project or organization level. The @@ -161,11 +161,11 @@ const UpdateTopicRequest = { * Request for the Publish method. * * @property {string} topic - * The messages in the request will be published on this topic. + * Required. The messages in the request will be published on this topic. * Format is `projects/{project}/topics/{topic}`. * * @property {Object[]} messages - * The messages to publish. + * Required. The messages to publish. * * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} * @@ -197,7 +197,7 @@ const PublishResponse = { * Request for the `ListTopics` method. * * @property {string} project - * The name of the project in which to list topics. + * Required. The name of the project in which to list topics. * Format is `projects/{project-id}`. * * @property {number} pageSize @@ -240,7 +240,7 @@ const ListTopicsResponse = { * Request for the `ListTopicSubscriptions` method. * * @property {string} topic - * The name of the topic that subscriptions are attached to. + * Required. The name of the topic that subscriptions are attached to. * Format is `projects/{project}/topics/{topic}`. * * @property {number} pageSize @@ -324,7 +324,7 @@ const ListTopicSnapshotsResponse = { * Request for the `DeleteTopic` method. * * @property {string} topic - * Name of the topic to delete. + * Required. Name of the topic to delete. * Format is `projects/{project}/topics/{topic}`. * * @typedef DeleteTopicRequest @@ -339,15 +339,15 @@ const DeleteTopicRequest = { * A subscription resource. * * @property {string} name - * The name of the subscription. It must have the format + * Required. The name of the subscription. It must have the format * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must * start with a letter, and contain only letters (`[A-Za-z]`), numbers * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters - * in length, and it must not start with `"goog"` + * in length, and it must not start with `"goog"`. * * @property {string} topic - * The name of the topic from which this subscription is receiving messages. + * Required. The name of the topic from which this subscription is receiving messages. * Format is `projects/{project}/topics/{topic}`. * The value of this field will be `_deleted-topic_` if the topic has been * deleted. @@ -622,7 +622,7 @@ const ReceivedMessage = { * Request for the GetSubscription method. * * @property {string} subscription - * The name of the subscription to get. + * Required. The name of the subscription to get. * Format is `projects/{project}/subscriptions/{sub}`. * * @typedef GetSubscriptionRequest @@ -637,12 +637,12 @@ const GetSubscriptionRequest = { * Request for the UpdateSubscription method. * * @property {Object} subscription - * The updated subscription object. + * Required. The updated subscription object. * * This object should have the same structure as [Subscription]{@link google.pubsub.v1.Subscription} * * @property {Object} updateMask - * Indicates which fields in the provided subscription to update. + * Required. Indicates which fields in the provided subscription to update. * Must be specified and non-empty. * * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} @@ -659,7 +659,7 @@ const UpdateSubscriptionRequest = { * Request for the `ListSubscriptions` method. * * @property {string} project - * The name of the project in which to list subscriptions. + * Required. The name of the project in which to list subscriptions. * Format is `projects/{project-id}`. * * @property {number} pageSize @@ -703,7 +703,7 @@ const ListSubscriptionsResponse = { * Request for the DeleteSubscription method. * * @property {string} subscription - * The subscription to delete. + * Required. The subscription to delete. * Format is `projects/{project}/subscriptions/{sub}`. * * @typedef DeleteSubscriptionRequest @@ -718,11 +718,11 @@ const DeleteSubscriptionRequest = { * Request for the ModifyPushConfig method. * * @property {string} subscription - * The name of the subscription. + * Required. The name of the subscription. * Format is `projects/{project}/subscriptions/{sub}`. * * @property {Object} pushConfig - * The push configuration for future deliveries. + * Required. The push configuration for future deliveries. * * An empty `pushConfig` indicates that the Pub/Sub system should * stop pushing messages from the given subscription and allow @@ -743,7 +743,7 @@ const ModifyPushConfigRequest = { * Request for the `Pull` method. * * @property {string} subscription - * The subscription from which messages should be pulled. + * Required. The subscription from which messages should be pulled. * Format is `projects/{project}/subscriptions/{sub}`. * * @property {boolean} returnImmediately @@ -753,7 +753,7 @@ const ModifyPushConfigRequest = { * least one message is available, rather than returning no messages. * * @property {number} maxMessages - * The maximum number of messages to return for this request. Must be a + * Required. The maximum number of messages to return for this request. Must be a * positive integer. The Pub/Sub system may return fewer than the number * specified. * @@ -788,14 +788,14 @@ const PullResponse = { * Request for the ModifyAckDeadline method. * * @property {string} subscription - * The name of the subscription. + * Required. The name of the subscription. * Format is `projects/{project}/subscriptions/{sub}`. * * @property {string[]} ackIds - * List of acknowledgment IDs. + * Required. List of acknowledgment IDs. * * @property {number} ackDeadlineSeconds - * The new ack deadline with respect to the time this request was sent to + * Required. The new ack deadline with respect to the time this request was sent to * the Pub/Sub system. For example, if the value is 10, the new * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call * was made. Specifying zero might immediately make the message available for @@ -816,11 +816,11 @@ const ModifyAckDeadlineRequest = { * Request for the Acknowledge method. * * @property {string} subscription - * The subscription whose message is being acknowledged. + * Required. The subscription whose message is being acknowledged. * Format is `projects/{project}/subscriptions/{sub}`. * * @property {string[]} ackIds - * The acknowledgment ID for the messages being acknowledged that was returned + * Required. The acknowledgment ID for the messages being acknowledged that was returned * by the Pub/Sub system in the `Pull` response. Must not be empty. * * @typedef AcknowledgeRequest @@ -837,7 +837,7 @@ const AcknowledgeRequest = { * deadline modifications from the client to the server. * * @property {string} subscription - * The subscription for which to initialize the new stream. This must be + * Required. The subscription for which to initialize the new stream. This must be * provided in the first request on the stream, and must not be set in * subsequent requests from client to server. * Format is `projects/{project}/subscriptions/{sub}`. @@ -870,7 +870,7 @@ const AcknowledgeRequest = { * processing was interrupted. * * @property {number} streamAckDeadlineSeconds - * The ack deadline to use for the stream. This must be provided in the + * Required. The ack deadline to use for the stream. This must be provided in the * first request on the stream, but it can also be updated on subsequent * requests from client to server. The minimum deadline you can specify is 10 * seconds. The maximum deadline you can specify is 600 seconds (10 minutes). @@ -912,7 +912,7 @@ const StreamingPullResponse = { * Request for the `CreateSnapshot` method. * * @property {string} name - * User-provided name for this snapshot. If the name is not provided in the + * Required. User-provided name for this snapshot. If the name is not provided in the * request, the server will assign a random name for this snapshot on the same * project as the subscription. Note that for REST API requests, you must * specify a name. See the . Format is `projects/{project}/snapshots/{snap}`. * * @property {string} subscription - * The subscription whose backlog the snapshot retains. + * Required. The subscription whose backlog the snapshot retains. * Specifically, the created snapshot is guaranteed to retain: * (a) The existing backlog on the subscription. More precisely, this is * defined as the messages in the subscription's backlog that are @@ -946,12 +946,12 @@ const CreateSnapshotRequest = { * Request for the UpdateSnapshot method. * * @property {Object} snapshot - * The updated snapshot object. + * Required. The updated snapshot object. * * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} * * @property {Object} updateMask - * Indicates which fields in the provided snapshot to update. + * Required. Indicates which fields in the provided snapshot to update. * Must be specified and non-empty. * * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} @@ -1008,7 +1008,7 @@ const Snapshot = { * Request for the GetSnapshot method. * * @property {string} snapshot - * The name of the snapshot to get. + * Required. The name of the snapshot to get. * Format is `projects/{project}/snapshots/{snap}`. * * @typedef GetSnapshotRequest @@ -1023,7 +1023,7 @@ const GetSnapshotRequest = { * Request for the `ListSnapshots` method. * * @property {string} project - * The name of the project in which to list snapshots. + * Required. The name of the project in which to list snapshots. * Format is `projects/{project-id}`. * * @property {number} pageSize @@ -1066,7 +1066,7 @@ const ListSnapshotsResponse = { * Request for the `DeleteSnapshot` method. * * @property {string} snapshot - * The name of the snapshot to delete. + * Required. The name of the snapshot to delete. * Format is `projects/{project}/snapshots/{snap}`. * * @typedef DeleteSnapshotRequest @@ -1081,7 +1081,7 @@ const DeleteSnapshotRequest = { * Request for the `Seek` method. * * @property {string} subscription - * The subscription to affect. + * Required. The subscription to affect. * * @property {Object} time * The time to seek to. diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 2e76501f7a0..9beb2089233 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -303,7 +303,7 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.name - * The name of the topic. It must have the format + * Required. The name of the topic. It must have the format * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent @@ -377,11 +377,11 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {Object} request.topic - * The updated topic object. + * Required. The updated topic object. * * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} * @param {Object} request.updateMask - * Indicates which fields in the provided topic to update. Must be specified + * Required. Indicates which fields in the provided topic to update. Must be specified * and non-empty. Note that if `update_mask` contains * "message_storage_policy" then the new value will be determined based on the * policy configured at the project or organization level. The @@ -447,10 +447,10 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.topic - * The messages in the request will be published on this topic. + * Required. The messages in the request will be published on this topic. * Format is `projects/{project}/topics/{topic}`. * @param {Object[]} request.messages - * The messages to publish. + * Required. The messages to publish. * * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} * @param {Object} [options] @@ -515,7 +515,7 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.topic - * The name of the topic to get. + * Required. The name of the topic to get. * Format is `projects/{project}/topics/{topic}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -570,7 +570,7 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the project in which to list topics. + * Required. The name of the project in which to list topics. * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API @@ -683,7 +683,7 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the project in which to list topics. + * Required. The name of the project in which to list topics. * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API @@ -729,7 +729,7 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.topic - * The name of the topic that subscriptions are attached to. + * Required. The name of the topic that subscriptions are attached to. * Format is `projects/{project}/topics/{topic}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API @@ -846,7 +846,7 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.topic - * The name of the topic that subscriptions are attached to. + * Required. The name of the topic that subscriptions are attached to. * Format is `projects/{project}/topics/{topic}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API @@ -896,7 +896,7 @@ class PublisherClient { * @param {Object} request * The request object that will be sent. * @param {string} request.topic - * Name of the topic to delete. + * Required. Name of the topic to delete. * Format is `projects/{project}/topics/{topic}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -938,8 +938,11 @@ class PublisherClient { } /** - * Sets the access control policy on the specified resource. Replaces any - * existing policy. + * Sets the access control policy on the specified resource. Replaces + * any existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and + * PERMISSION_DENIED * * @param {Object} request * The request object that will be sent. @@ -1006,9 +1009,8 @@ class PublisherClient { } /** - * Gets the access control policy for a resource. - * Returns an empty policy if the resource exists and does not have a policy - * set. + * Gets the access control policy for a resource. Returns an empty policy + * if the resource exists and does not have a policy set. * * @param {Object} request * The request object that will be sent. @@ -1068,13 +1070,13 @@ class PublisherClient { } /** - * Returns permissions that a caller has on the specified resource. - * If the resource does not exist, this will return an empty set of + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of * permissions, not a NOT_FOUND error. * - * Note: This operation is designed to be used for building permission-aware - * UIs and command-line tools, not for authorization checking. This operation - * may "fail open" without warning. + * Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization + * checking. This operation may "fail open" without warning. * * @param {Object} request * The request object that will be sent. diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 71406059d6b..9b6be06081b 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -53,7 +53,7 @@ "retry_params_name": "default" }, "Publish": { - "timeout_millis": 60000, + "timeout_millis": 20000, "retry_codes_name": "publish", "retry_params_name": "messaging", "bundling": { diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index c99502f928c..b75a1e25d05 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -330,14 +330,14 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.name - * The name of the subscription. It must have the format + * Required. The name of the subscription. It must have the format * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must * start with a letter, and contain only letters (`[A-Za-z]`), numbers * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters - * in length, and it must not start with `"goog"` + * in length, and it must not start with `"goog"`. * @param {string} request.topic - * The name of the topic from which this subscription is receiving messages. + * Required. The name of the topic from which this subscription is receiving messages. * Format is `projects/{project}/topics/{topic}`. * The value of this field will be `_deleted-topic_` if the topic has been * deleted. @@ -477,7 +477,7 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.subscription - * The name of the subscription to get. + * Required. The name of the subscription to get. * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -533,11 +533,11 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {Object} request.subscription - * The updated subscription object. + * Required. The updated subscription object. * * This object should have the same structure as [Subscription]{@link google.pubsub.v1.Subscription} * @param {Object} request.updateMask - * Indicates which fields in the provided subscription to update. + * Required. Indicates which fields in the provided subscription to update. * Must be specified and non-empty. * * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} @@ -606,7 +606,7 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the project in which to list subscriptions. + * Required. The name of the project in which to list subscriptions. * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API @@ -719,7 +719,7 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the project in which to list subscriptions. + * Required. The name of the project in which to list subscriptions. * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API @@ -769,7 +769,7 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.subscription - * The subscription to delete. + * Required. The subscription to delete. * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -820,12 +820,12 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.subscription - * The name of the subscription. + * Required. The name of the subscription. * Format is `projects/{project}/subscriptions/{sub}`. * @param {string[]} request.ackIds - * List of acknowledgment IDs. + * Required. List of acknowledgment IDs. * @param {number} request.ackDeadlineSeconds - * The new ack deadline with respect to the time this request was sent to + * Required. The new ack deadline with respect to the time this request was sent to * the Pub/Sub system. For example, if the value is 10, the new * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call * was made. Specifying zero might immediately make the message available for @@ -891,10 +891,10 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.subscription - * The subscription whose message is being acknowledged. + * Required. The subscription whose message is being acknowledged. * Format is `projects/{project}/subscriptions/{sub}`. * @param {string[]} request.ackIds - * The acknowledgment ID for the messages being acknowledged that was returned + * Required. The acknowledgment ID for the messages being acknowledged that was returned * by the Pub/Sub system in the `Pull` response. Must not be empty. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -948,10 +948,10 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.subscription - * The subscription from which messages should be pulled. + * Required. The subscription from which messages should be pulled. * Format is `projects/{project}/subscriptions/{sub}`. * @param {number} request.maxMessages - * The maximum number of messages to return for this request. Must be a + * Required. The maximum number of messages to return for this request. Must be a * positive integer. The Pub/Sub system may return fewer than the number * specified. * @param {boolean} [request.returnImmediately] @@ -1065,10 +1065,10 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.subscription - * The name of the subscription. + * Required. The name of the subscription. * Format is `projects/{project}/subscriptions/{sub}`. * @param {Object} request.pushConfig - * The push configuration for future deliveries. + * Required. The push configuration for future deliveries. * * An empty `pushConfig` indicates that the Pub/Sub system should * stop pushing messages from the given subscription and allow @@ -1131,7 +1131,7 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the project in which to list snapshots. + * Required. The name of the project in which to list snapshots. * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API @@ -1244,7 +1244,7 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.project - * The name of the project in which to list snapshots. + * Required. The name of the project in which to list snapshots. * Format is `projects/{project-id}`. * @param {number} [request.pageSize] * The maximum number of resources contained in the underlying API @@ -1307,14 +1307,14 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.name - * User-provided name for this snapshot. If the name is not provided in the + * Required. User-provided name for this snapshot. If the name is not provided in the * request, the server will assign a random name for this snapshot on the same * project as the subscription. Note that for REST API requests, you must * specify a name. See the resource * name rules. Format is `projects/{project}/snapshots/{snap}`. * @param {string} request.subscription - * The subscription whose backlog the snapshot retains. + * Required. The subscription whose backlog the snapshot retains. * Specifically, the created snapshot is guaranteed to retain: * (a) The existing backlog on the subscription. More precisely, this is * defined as the messages in the subscription's backlog that are @@ -1389,11 +1389,11 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {Object} request.snapshot - * The updated snapshot object. + * Required. The updated snapshot object. * * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} * @param {Object} request.updateMask - * Indicates which fields in the provided snapshot to update. + * Required. Indicates which fields in the provided snapshot to update. * Must be specified and non-empty. * * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} @@ -1474,7 +1474,7 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.snapshot - * The name of the snapshot to delete. + * Required. The name of the snapshot to delete. * Format is `projects/{project}/snapshots/{snap}`. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, @@ -1528,7 +1528,7 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.subscription - * The subscription to affect. + * Required. The subscription to affect. * @param {Object} [request.time] * The time to seek to. * Messages retained in the subscription that were published before this @@ -1595,8 +1595,11 @@ class SubscriberClient { } /** - * Sets the access control policy on the specified resource. Replaces any - * existing policy. + * Sets the access control policy on the specified resource. Replaces + * any existing policy. + * + * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and + * PERMISSION_DENIED * * @param {Object} request * The request object that will be sent. @@ -1663,9 +1666,8 @@ class SubscriberClient { } /** - * Gets the access control policy for a resource. - * Returns an empty policy if the resource exists and does not have a policy - * set. + * Gets the access control policy for a resource. Returns an empty policy + * if the resource exists and does not have a policy set. * * @param {Object} request * The request object that will be sent. @@ -1725,13 +1727,13 @@ class SubscriberClient { } /** - * Returns permissions that a caller has on the specified resource. - * If the resource does not exist, this will return an empty set of + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of * permissions, not a NOT_FOUND error. * - * Note: This operation is designed to be used for building permission-aware - * UIs and command-line tools, not for authorization checking. This operation - * may "fail open" without warning. + * Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization + * checking. This operation may "fail open" without warning. * * @param {Object} request * The request object that will be sent. diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index e4f432d090a..c8546687455 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -32,9 +32,9 @@ "initial_retry_delay_millis": 100, "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 5000, - "rpc_timeout_multiplier": 1.3, - "max_rpc_timeout_millis": 600000, + "initial_rpc_timeout_millis": 25000, + "rpc_timeout_multiplier": 1.0, + "max_rpc_timeout_millis": 25000, "total_timeout_millis": 600000 }, "streaming_messaging": { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index e5901df0580..1f49494c9b9 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,27 +1,27 @@ { - "updateTime": "2020-01-31T12:29:13.791240Z", + "updateTime": "2020-02-29T12:36:40.247233Z", "sources": [ { "generator": { "name": "artman", - "version": "0.44.4", - "dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8" + "version": "0.47.0", + "dockerImage": "googleapis/artman@sha256:b3e50d6b8de03920b9f065bbc3d210e2ca93a043446f1fa16cdf567393c09678" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "7ac66d9be8a7d7de4f13566d8663978c9ee9dcd7", - "internalRef": "292450564", - "log": "7ac66d9be8a7d7de4f13566d8663978c9ee9dcd7\nAdd Dataproc Autoscaling API to V1.\n\nPiperOrigin-RevId: 292450564\n\n5d932b2c1be3a6ef487d094e3cf5c0673d0241dd\n- Improve documentation\n- Add a client_id field to StreamingPullRequest\n\nPiperOrigin-RevId: 292434036\n\neaff9fa8edec3e914995ce832b087039c5417ea7\nmonitoring: v3 publish annotations and client retry config\n\nPiperOrigin-RevId: 292425288\n\n70958bab8c5353870d31a23fb2c40305b050d3fe\nBigQuery Storage Read API v1 clients.\n\nPiperOrigin-RevId: 292407644\n\n7a15e7fe78ff4b6d5c9606a3264559e5bde341d1\nUpdate backend proto for Google Cloud Endpoints\n\nPiperOrigin-RevId: 292391607\n\n3ca2c014e24eb5111c8e7248b1e1eb833977c83d\nbazel: Add --flaky_test_attempts=3 argument to prevent CI failures caused by flaky tests\n\nPiperOrigin-RevId: 292382559\n\n9933347c1f677e81e19a844c2ef95bfceaf694fe\nbazel:Integrate latest protoc-java-resource-names-plugin changes (fix for PyYAML dependency in bazel rules)\n\nPiperOrigin-RevId: 292376626\n\nb835ab9d2f62c88561392aa26074c0b849fb0bd3\nasset: v1p2beta1 add client config annotations\n\n* remove unintentionally exposed RPCs\n* remove messages relevant to removed RPCs\n\nPiperOrigin-RevId: 292369593\n\nc1246a29e22b0f98e800a536b5b0da2d933a55f2\nUpdating v1 protos with the latest inline documentation (in comments) and config options. Also adding a per-service .yaml file.\n\nPiperOrigin-RevId: 292310790\n\nb491d07cadaae7cde5608321f913e5ca1459b32d\nRevert accidental local_repository change\n\nPiperOrigin-RevId: 292245373\n\naf3400a8cb6110025198b59a0f7d018ae3cda700\nUpdate gapic-generator dependency (prebuilt PHP binary support).\n\nPiperOrigin-RevId: 292243997\n\n341fd5690fae36f36cf626ef048fbcf4bbe7cee6\ngrafeas: v1 add resource_definition for the grafeas.io/Project and change references for Project.\n\nPiperOrigin-RevId: 292221998\n\n42e915ec2ece1cd37a590fbcd10aa2c0fb0e5b06\nUpdate the gapic-generator, protoc-java-resource-name-plugin and protoc-docs-plugin to the latest commit.\n\nPiperOrigin-RevId: 292182368\n\nf035f47250675d31492a09f4a7586cfa395520a7\nFix grafeas build and update build.sh script to include gerafeas.\n\nPiperOrigin-RevId: 292168753\n\n26ccb214b7bc4a716032a6266bcb0a9ca55d6dbb\nasset: v1p1beta1 add client config annotations and retry config\n\nPiperOrigin-RevId: 292154210\n\n974ee5c0b5d03e81a50dafcedf41e0efebb5b749\nasset: v1beta1 add client config annotations\n\nPiperOrigin-RevId: 292152573\n\ncf3b61102ed5f36b827bc82ec39be09525f018c8\n Fix to protos for v1p1beta1 release of Cloud Security Command Center\n\nPiperOrigin-RevId: 292034635\n\n4e1cfaa7c0fede9e65d64213ca3da1b1255816c0\nUpdate the public proto to support UTF-8 encoded id for CatalogService API, increase the ListCatalogItems deadline to 300s and some minor documentation change\n\nPiperOrigin-RevId: 292030970\n\n9c483584f8fd5a1b862ae07973f4cc7bb3e46648\nasset: add annotations to v1p1beta1\n\nPiperOrigin-RevId: 292009868\n\ne19209fac29731d0baf6d9ac23da1164f7bdca24\nAdd the google.rpc.context.AttributeContext message to the open source\ndirectories.\n\nPiperOrigin-RevId: 291999930\n\nae5662960573f279502bf98a108a35ba1175e782\noslogin API: move file level option on top of the file to avoid protobuf.js bug.\n\nPiperOrigin-RevId: 291990506\n\neba3897fff7c49ed85d3c47fc96fe96e47f6f684\nAdd cc_proto_library and cc_grpc_library targets for Spanner and IAM protos.\n\nPiperOrigin-RevId: 291988651\n\n" + "sha": "83c6f84035ee0f80eaa44d8b688a010461cc4080", + "internalRef": "297918498", + "log": "83c6f84035ee0f80eaa44d8b688a010461cc4080\nUpdate google/api/auth.proto to make AuthProvider to have JwtLocation\n\nPiperOrigin-RevId: 297918498\n\ne9e90a787703ec5d388902e2cb796aaed3a385b4\nDialogflow weekly v2/v2beta1 library update:\n - adding get validation result\n - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297671458\n\n1a2b05cc3541a5f7714529c665aecc3ea042c646\nAdding .yaml and .json config files.\n\nPiperOrigin-RevId: 297570622\n\ndfe1cf7be44dee31d78f78e485d8c95430981d6e\nPublish `QueryOptions` proto.\n\nIntroduced a `query_options` input in `ExecuteSqlRequest`.\n\nPiperOrigin-RevId: 297497710\n\ndafc905f71e5d46f500b41ed715aad585be062c3\npubsub: revert pull init_rpc_timeout & max_rpc_timeout back to 25 seconds and reset multiplier to 1.0\n\nPiperOrigin-RevId: 297486523\n\nf077632ba7fee588922d9e8717ee272039be126d\nfirestore: add update_transform\n\nPiperOrigin-RevId: 297405063\n\n0aba1900ffef672ec5f0da677cf590ee5686e13b\ncluster: use square brace for cross-reference\n\nPiperOrigin-RevId: 297204568\n\n5dac2da18f6325cbaed54603c43f0667ecd50247\nRestore retry params in gapic config because securitycenter has non-standard default retry params.\nRestore a few retry codes for some idempotent methods.\n\nPiperOrigin-RevId: 297196720\n\n1eb61455530252bba8b2c8d4bc9832960e5a56f6\npubsub: v1 replace IAM HTTP rules\n\nPiperOrigin-RevId: 297188590\n\n80b2d25f8d43d9d47024ff06ead7f7166548a7ba\nDialogflow weekly v2/v2beta1 library update:\n - updates to mega agent api\n - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297187629\n\n0b1876b35e98f560f9c9ca9797955f020238a092\nUse an older version of protoc-docs-plugin that is compatible with the specified gapic-generator and protobuf versions.\n\nprotoc-docs-plugin >=0.4.0 (see commit https://github.com/googleapis/protoc-docs-plugin/commit/979f03ede6678c487337f3d7e88bae58df5207af) is incompatible with protobuf 3.9.1.\n\nPiperOrigin-RevId: 296986742\n\n1e47e676cddbbd8d93f19ba0665af15b5532417e\nFix: Restore a method signature for UpdateCluster\n\nPiperOrigin-RevId: 296901854\n\n7f910bcc4fc4704947ccfd3ceed015d16b9e00c2\nUpdate Dataproc v1beta2 client.\n\nPiperOrigin-RevId: 296451205\n\nde287524405a3dce124d301634731584fc0432d7\nFix: Reinstate method signatures that had been missed off some RPCs\nFix: Correct resource types for two fields\n\nPiperOrigin-RevId: 296435091\n\ne5bc9566ae057fb4c92f8b7e047f1c8958235b53\nDeprecate the endpoint_uris field, as it is unused.\n\nPiperOrigin-RevId: 296357191\n\n8c12e2b4dca94e12bff9f538bdac29524ff7ef7a\nUpdate Dataproc v1 client.\n\nPiperOrigin-RevId: 296336662\n\n17567c4a1ef0a9b50faa87024d66f8acbb561089\nRemoving erroneous comment, a la https://github.com/googleapis/java-speech/pull/103\n\nPiperOrigin-RevId: 296332968\n\n3eaaaf8626ce5b0c0bc7eee05e143beffa373b01\nAdd BUILD.bazel for v1 secretmanager.googleapis.com\n\nPiperOrigin-RevId: 296274723\n\ne76149c3d992337f85eeb45643106aacae7ede82\nMove securitycenter v1 to use generate from annotations.\n\nPiperOrigin-RevId: 296266862\n\n203740c78ac69ee07c3bf6be7408048751f618f8\nAdd StackdriverLoggingConfig field to Cloud Tasks v2 API.\n\nPiperOrigin-RevId: 296256388\n\ne4117d5e9ed8bbca28da4a60a94947ca51cb2083\nCreate a Bazel BUILD file for the google.actions.type export.\n\nPiperOrigin-RevId: 296212567\n\na9639a0a9854fd6e1be08bba1ac3897f4f16cb2f\nAdd secretmanager.googleapis.com v1 protos\n\nPiperOrigin-RevId: 295983266\n\nce4f4c21d9dd2bfab18873a80449b9d9851efde8\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295861722\n\ncb61d6c2d070b589980c779b68ffca617f789116\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295855449\n\nab2685d8d3a0e191dc8aef83df36773c07cb3d06\nfix: Dataproc v1 - AutoscalingPolicy annotation\n\nThis adds the second resource name pattern to the\nAutoscalingPolicy resource.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 295738415\n\n8a1020bf6828f6e3c84c3014f2c51cb62b739140\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295286165\n\n5cfa105206e77670369e4b2225597386aba32985\nAdd service control related proto build rule.\n\nPiperOrigin-RevId: 295262088\n\nee4dddf805072004ab19ac94df2ce669046eec26\nmonitoring v3: Add prefix \"https://cloud.google.com/\" into the link for global access\ncl 295167522, get ride of synth.py hacks\n\nPiperOrigin-RevId: 295238095\n\nd9835e922ea79eed8497db270d2f9f85099a519c\nUpdate some minor docs changes about user event proto\n\nPiperOrigin-RevId: 295185610\n\n5f311e416e69c170243de722023b22f3df89ec1c\nfix: use correct PHP package name in gapic configuration\n\nPiperOrigin-RevId: 295161330\n\n6cdd74dcdb071694da6a6b5a206e3a320b62dd11\npubsub: v1 add client config annotations and retry config\n\nPiperOrigin-RevId: 295158776\n\n5169f46d9f792e2934d9fa25c36d0515b4fd0024\nAdded cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295026522\n\n56b55aa8818cd0a532a7d779f6ef337ba809ccbd\nFix: Resource annotations for CreateTimeSeriesRequest and ListTimeSeriesRequest should refer to valid resources. TimeSeries is not a named resource.\n\nPiperOrigin-RevId: 294931650\n\n0646bc775203077226c2c34d3e4d50cc4ec53660\nRemove unnecessary languages from bigquery-related artman configuration files.\n\nPiperOrigin-RevId: 294809380\n\n8b78aa04382e3d4147112ad6d344666771bb1909\nUpdate backend.proto for schemes and protocol\n\nPiperOrigin-RevId: 294788800\n\n80b8f8b3de2359831295e24e5238641a38d8488f\nAdds artman config files for bigquerystorage endpoints v1beta2, v1alpha2, v1\n\nPiperOrigin-RevId: 294763931\n\n2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\nd5e8a8953f2acdfe96fb15e85eb2f33739623957\nMove bigquery datatransfer to gapic v2.\n\nPiperOrigin-RevId: 294703703\n\nefd36705972cfcd7d00ab4c6dfa1135bafacd4ae\nfix: Add two annotations that we missed.\n\nPiperOrigin-RevId: 294664231\n\n8a36b928873ff9c05b43859b9d4ea14cd205df57\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1beta2).\n\nPiperOrigin-RevId: 294459768\n\nc7a3caa2c40c49f034a3c11079dd90eb24987047\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1).\n\nPiperOrigin-RevId: 294456889\n\n5006247aa157e59118833658084345ee59af7c09\nFix: Make deprecated fields optional\nFix: Deprecate SetLoggingServiceRequest.zone in line with the comments\nFeature: Add resource name method signatures where appropriate\n\nPiperOrigin-RevId: 294383128\n\neabba40dac05c5cbe0fca3a35761b17e372036c4\nFix: C# and PHP package/namespace capitalization for BigQuery Storage v1.\n\nPiperOrigin-RevId: 294382444\n\nf8d9a858a7a55eba8009a23aa3f5cc5fe5e88dde\nfix: artman configuration file for bigtable-admin\n\nPiperOrigin-RevId: 294322616\n\n0f29555d1cfcf96add5c0b16b089235afbe9b1a9\nAPI definition for (not-yet-launched) GCS gRPC.\n\nPiperOrigin-RevId: 294321472\n\nfcc86bee0e84dc11e9abbff8d7c3529c0626f390\nfix: Bigtable Admin v2\n\nChange LRO metadata from PartialUpdateInstanceMetadata\nto UpdateInstanceMetadata. (Otherwise, it will not build.)\n\nPiperOrigin-RevId: 294264582\n\n6d9361eae2ebb3f42d8c7ce5baf4bab966fee7c0\nrefactor: Add annotations to Bigtable Admin v2.\n\nPiperOrigin-RevId: 294243406\n\nad7616f3fc8e123451c8b3a7987bc91cea9e6913\nFix: Resource type in CreateLogMetricRequest should use logging.googleapis.com.\nFix: ListLogEntries should have a method signature for convenience of calling it.\n\nPiperOrigin-RevId: 294222165\n\n63796fcbb08712676069e20a3e455c9f7aa21026\nFix: Remove extraneous resource definition for cloudkms.googleapis.com/CryptoKey.\n\nPiperOrigin-RevId: 294176658\n\ne7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\nb5cbe4a4ba64ab19e6627573ff52057a1657773d\nSecurityCenter v1p1beta1: move file-level option on top to workaround protobuf.js bug.\n\nPiperOrigin-RevId: 292647187\n\nb224b317bf20c6a4fbc5030b4a969c3147f27ad3\nAdds API definitions for bigqueryreservation v1beta1.\n\nPiperOrigin-RevId: 292634722\n\nc1468702f9b17e20dd59007c0804a089b83197d2\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 292626173\n\nffdfa4f55ab2f0afc11d0eb68f125ccbd5e404bd\nvision: v1p3beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605599\n\n78f61482cd028fc1d9892aa5d89d768666a954cd\nvision: v1p1beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605125\n\n60bb5a294a604fd1778c7ec87b265d13a7106171\nvision: v1p2beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604980\n\n3bcf7aa79d45eb9ec29ab9036e9359ea325a7fc3\nvision: v1p4beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604656\n\n2717b8a1c762b26911b45ecc2e4ee01d98401b28\nFix dataproc artman client library generation.\n\nPiperOrigin-RevId: 292555664\n\n" } }, { "template": { "name": "node_library", "origin": "synthtool.gcp", - "version": "2019.10.17" + "version": "2020.2.4" } } ], From 649b108aa1eeb309725a29d14805d16c4123a920 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 4 Mar 2020 01:31:35 +0100 Subject: [PATCH 0582/1115] chore(deps): update dependency sinon to v9 (#889) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e05fca86767..63d9d7cdc8d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -96,7 +96,7 @@ "power-assert": "^1.4.4", "prettier": "^1.18.2", "proxyquire": "^2.0.0", - "sinon": "^8.0.0", + "sinon": "^9.0.0", "source-map-support": "^0.5.9", "typescript": "3.6.4", "uuid": "^3.1.0", From df6f29f75ce7bc102cb2b2eb88023f238e38234a Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 3 Mar 2020 16:45:37 -0800 Subject: [PATCH 0583/1115] fix(deps): update to the latest google-gax to pull in grpc-js 0.6.18 (#903) Co-authored-by: Justin Beckwith --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 63d9d7cdc8d..97e48488c90 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "async-each": "^1.0.1", "extend": "^3.0.2", "google-auth-library": "^5.5.0", - "google-gax": "^1.7.5", + "google-gax": "^1.14.2", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0", From 70588badf40f8211e9fabbb8110636668fd08da1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 4 Mar 2020 17:22:20 +0100 Subject: [PATCH 0584/1115] chore(deps): update dependency @types/uuid (#894) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 97e48488c90..559ab060576 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -75,7 +75,7 @@ "@types/proxyquire": "^1.3.28", "@types/sinon": "^7.0.0", "@types/tmp": "^0.1.0", - "@types/uuid": "^3.4.4", + "@types/uuid": "^7.0.0", "c8": "^7.0.0", "codecov": "^3.0.0", "eslint": "^6.0.0", @@ -99,7 +99,7 @@ "sinon": "^9.0.0", "source-map-support": "^0.5.9", "typescript": "3.6.4", - "uuid": "^3.1.0", + "uuid": "^7.0.0", "yargs": "^15.0.0" } } From 26c58d2ebc97a030c4e3c2484ceda9099b820cc3 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 4 Mar 2020 10:56:35 -0800 Subject: [PATCH 0585/1115] fix: send the ITimestamp protobuf to Pub/Sub for seeking, not JavaScript Date() (#908) * fix: send the ITimestamp protobuf to Pub/Sub for seeking, not JavaScript Date() * chore: fix linter errors Co-authored-by: Justin Beckwith --- handwritten/pubsub/src/subscription.ts | 6 +++++- handwritten/pubsub/system-test/pubsub.ts | 24 ++++++++++++++++++++++++ handwritten/pubsub/test/subscription.ts | 8 +++++++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 70bb1576d8b..9995821b133 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -892,7 +892,11 @@ export class Subscription extends EventEmitter { if (typeof snapshot === 'string') { reqOpts.snapshot = Snapshot.formatName_(this.pubsub.projectId, snapshot); } else if (Object.prototype.toString.call(snapshot) === '[object Date]') { - reqOpts.time = snapshot as google.protobuf.ITimestamp; + const dateMillis = (snapshot as Date).getTime(); + reqOpts.time = { + seconds: Math.floor(dateMillis / 1000), + nanos: Math.floor(dateMillis % 1000) * 1000, + }; } else { throw new Error('Either a snapshot name or Date is needed to seek to.'); } diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 84a67e53b4a..ac79049a14f 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -862,6 +862,30 @@ describe('pubsub', () => { subscription.close(done); }); }); + + it('should seek to a future date (purge)', done => { + const testText = 'Oh no!'; + + // Forward-seek to remove any messages from the queue (those were + // placed there in before()). + // + // We... probably won't be using this in 3000? + subscription + .seek(new Date('3000-01-01')) + .then(() => { + // Drop a second message and make sure it's the right ID. + return topic.publish(Buffer.from(testText)); + }) + .then(() => { + subscription.on('error', done); + subscription.on('message', message => { + // If we get the default message from before() then this fails. + assert.equal(message.data.toString(), testText); + message.ack(); + subscription.close(done); + }); + }); + }); }); }); }); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index bf1a6c26473..9b751ae0528 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -884,7 +884,13 @@ describe('Subscription', () => { it('should optionally accept a Date object', done => { const date = new Date(); - const reqOpts = {subscription: SUB_FULL_NAME, time: date}; + const reqOpts = { + subscription: SUB_FULL_NAME, + time: { + seconds: Math.floor(date.getTime() / 1000), + nanos: Math.floor(date.getTime() % 1000) * 1000, + }, + }; subscription.request = (config: RequestConfig) => { assert.deepStrictEqual(config.reqOpts, reqOpts); done(); From f88188c4a27d32c470ad77714cc5f16bc9cd009a Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 4 Mar 2020 12:24:54 -0800 Subject: [PATCH 0586/1115] tests: lease manager maxExtension test was flaky; remove random number generation and increase the buffer to avoid possible float errors (#909) --- handwritten/pubsub/test/lease-manager.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 8a37595fc3d..2f535ac1f26 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -186,7 +186,8 @@ describe('LeaseManager', () => { let halfway: number; beforeEach(() => { - random = Math.random(); + // This random number was generated once to keep the test results stable. + random = 0.5756015072052962; sandbox.stub(global.Math, 'random').returns(random); clock = sandbox.useFakeTimers(); expectedTimeout = @@ -226,7 +227,7 @@ describe('LeaseManager', () => { }); it('should remove any messages that pass the maxExtension value', () => { - const maxExtension = (expectedTimeout - 1) / 1000; + const maxExtension = (expectedTimeout - 100) / 1000; const badMessages = [new FakeMessage(), new FakeMessage()]; leaseManager.setOptions({maxExtension}); From 32319f4740b63900d6f4e33e01783f938be3d896 Mon Sep 17 00:00:00 2001 From: "gcf-merge-on-green[bot]" <60162190+gcf-merge-on-green[bot]@users.noreply.github.com> Date: Wed, 4 Mar 2020 20:36:05 +0000 Subject: [PATCH 0587/1115] chore: release 1.6.0 (#880) :robot: I have created a release \*beep\* \*boop\* --- ## [1.6.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.5.0...v1.6.0) (2020-03-04) ### Features * **subscription:** support oidcToken ([#865](https://www.github.com/googleapis/nodejs-pubsub/issues/865)) ([a786ca0](https://www.github.com/googleapis/nodejs-pubsub/commit/a786ca00bd27a6e098125d6b7b87edb11ea6ea0f)) * export protos in src/index.ts ([f32910c](https://www.github.com/googleapis/nodejs-pubsub/commit/f32910c3a7da5ce268084d7294094912ab696034)) ### Bug Fixes * **deps:** update to the latest google-gax to pull in grpc-js 0.6.18 ([#903](https://www.github.com/googleapis/nodejs-pubsub/issues/903)) ([78bd9e9](https://www.github.com/googleapis/nodejs-pubsub/commit/78bd9e97a913b5e2aa457c2a28fd849f67bf225e)) * send the ITimestamp protobuf to Pub/Sub for seeking, not JavaScript Date() ([#908](https://www.github.com/googleapis/nodejs-pubsub/issues/908)) ([0c1d711](https://www.github.com/googleapis/nodejs-pubsub/commit/0c1d711854d7397a0fc4d6e84ed090984a6e05dc)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- handwritten/pubsub/CHANGELOG.md | 14 ++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index f97e0874455..7d87cfd75eb 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,20 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [1.6.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.5.0...v1.6.0) (2020-03-04) + + +### Features + +* **subscription:** support oidcToken ([#865](https://www.github.com/googleapis/nodejs-pubsub/issues/865)) ([a786ca0](https://www.github.com/googleapis/nodejs-pubsub/commit/a786ca00bd27a6e098125d6b7b87edb11ea6ea0f)) +* export protos in src/index.ts ([f32910c](https://www.github.com/googleapis/nodejs-pubsub/commit/f32910c3a7da5ce268084d7294094912ab696034)) + + +### Bug Fixes + +* **deps:** update to the latest google-gax to pull in grpc-js 0.6.18 ([#903](https://www.github.com/googleapis/nodejs-pubsub/issues/903)) ([78bd9e9](https://www.github.com/googleapis/nodejs-pubsub/commit/78bd9e97a913b5e2aa457c2a28fd849f67bf225e)) +* send the ITimestamp protobuf to Pub/Sub for seeking, not JavaScript Date() ([#908](https://www.github.com/googleapis/nodejs-pubsub/issues/908)) ([0c1d711](https://www.github.com/googleapis/nodejs-pubsub/commit/0c1d711854d7397a0fc4d6e84ed090984a6e05dc)) + ## [1.5.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.4.1...v1.5.0) (2020-02-03) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 559ab060576..6984619ac43 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.5.0", + "version": "1.6.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 7186ed0ea1c9a7214b16efcd99771f4f9a3a9eee Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 5 Mar 2020 07:49:13 -0800 Subject: [PATCH 0588/1115] chore: updated proto annotations --- .../protos/google/pubsub/v1/pubsub.proto | 164 +- handwritten/pubsub/protos/protos.d.ts | 478 ++--- handwritten/pubsub/protos/protos.js | 1664 ++++++++--------- handwritten/pubsub/protos/protos.json | 194 +- .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 57 +- handwritten/pubsub/src/v1/publisher_client.js | 4 +- .../pubsub/src/v1/subscriber_client.js | 43 +- handwritten/pubsub/synth.metadata | 12 +- 8 files changed, 1318 insertions(+), 1298 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index adaf8c6fc3b..55cfa531ff3 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -16,6 +16,7 @@ syntax = "proto3"; package google.pubsub.v1; +import "google/api/annotations.proto"; import "google/api/client.proto"; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; @@ -23,7 +24,6 @@ import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; -import "google/api/annotations.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.PubSub.V1"; @@ -89,7 +89,8 @@ service Publisher { } // Lists the names of the subscriptions on this topic. - rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) returns (ListTopicSubscriptionsResponse) { + rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) + returns (ListTopicSubscriptionsResponse) { option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}/subscriptions" }; @@ -102,10 +103,12 @@ service Publisher { // you to manage message acknowledgments in bulk. That is, you can set the // acknowledgment state of messages in an existing subscription to the state // captured by a snapshot. - rpc ListTopicSnapshots(ListTopicSnapshotsRequest) returns (ListTopicSnapshotsResponse) { + rpc ListTopicSnapshots(ListTopicSnapshotsRequest) + returns (ListTopicSnapshotsResponse) { option (google.api.http) = { get: "/v1/{topic=projects/*/topics/*}/snapshots" }; + option (google.api.method_signature) = "topic"; } // Deletes the topic with the given name. Returns `NOT_FOUND` if the topic @@ -208,9 +211,7 @@ message GetTopicRequest { // Format is `projects/{project}/topics/{topic}`. string topic = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - type: "pubsub.googleapis.com/Topic" - } + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; } @@ -219,12 +220,13 @@ message UpdateTopicRequest { // Required. The updated topic object. Topic topic = 1 [(google.api.field_behavior) = REQUIRED]; - // Required. Indicates which fields in the provided topic to update. Must be specified - // and non-empty. Note that if `update_mask` contains + // Required. Indicates which fields in the provided topic to update. Must be + // specified and non-empty. Note that if `update_mask` contains // "message_storage_policy" then the new value will be determined based on the // policy configured at the project or organization level. The // `message_storage_policy` must not be set in the `topic` provided above. - google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED]; + google.protobuf.FieldMask update_mask = 2 + [(google.api.field_behavior) = REQUIRED]; } // Request for the Publish method. @@ -233,9 +235,7 @@ message PublishRequest { // Format is `projects/{project}/topics/{topic}`. string topic = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - type: "pubsub.googleapis.com/Topic" - } + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; // Required. The messages to publish. @@ -286,9 +286,7 @@ message ListTopicSubscriptionsRequest { // Format is `projects/{project}/topics/{topic}`. string topic = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - type: "pubsub.googleapis.com/Topic" - } + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; // Maximum number of subscription names to return. @@ -304,8 +302,8 @@ message ListTopicSubscriptionsRequest { message ListTopicSubscriptionsResponse { // The names of the subscriptions that match the request. repeated string subscriptions = 1 [(google.api.resource_reference) = { - type: "pubsub.googleapis.com/Subscription" - }]; + type: "pubsub.googleapis.com/Subscription" + }]; // If not empty, indicates that there may be more subscriptions that match // the request; this value should be passed in a new @@ -315,9 +313,12 @@ message ListTopicSubscriptionsResponse { // Request for the `ListTopicSnapshots` method. message ListTopicSnapshotsRequest { - // The name of the topic that snapshots are attached to. + // Required. The name of the topic that snapshots are attached to. // Format is `projects/{project}/topics/{topic}`. - string topic = 1; + string topic = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } + ]; // Maximum number of snapshot names to return. int32 page_size = 2; @@ -345,9 +346,7 @@ message DeleteTopicRequest { // Format is `projects/{project}/topics/{topic}`. string topic = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - type: "pubsub.googleapis.com/Topic" - } + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; } @@ -378,7 +377,8 @@ service Subscriber { put: "/v1/{name=projects/*/subscriptions/*}" body: "*" }; - option (google.api.method_signature) = "name,topic,push_config,ack_deadline_seconds"; + option (google.api.method_signature) = + "name,topic,push_config,ack_deadline_seconds"; } // Gets the configuration details of a subscription. @@ -399,7 +399,8 @@ service Subscriber { } // Lists matching subscriptions. - rpc ListSubscriptions(ListSubscriptionsRequest) returns (ListSubscriptionsResponse) { + rpc ListSubscriptions(ListSubscriptionsRequest) + returns (ListSubscriptionsResponse) { option (google.api.http) = { get: "/v1/{project=projects/*}/subscriptions" }; @@ -411,7 +412,8 @@ service Subscriber { // `NOT_FOUND`. After a subscription is deleted, a new one may be created with // the same name, but the new one has no association with the old // subscription or its topic unless the same topic is specified. - rpc DeleteSubscription(DeleteSubscriptionRequest) returns (google.protobuf.Empty) { + rpc DeleteSubscription(DeleteSubscriptionRequest) + returns (google.protobuf.Empty) { option (google.api.http) = { delete: "/v1/{subscription=projects/*/subscriptions/*}" }; @@ -423,12 +425,14 @@ service Subscriber { // subscriber, or to make the message available for redelivery if the // processing was interrupted. Note that this does not modify the // subscription-level `ackDeadlineSeconds` used for subsequent messages. - rpc ModifyAckDeadline(ModifyAckDeadlineRequest) returns (google.protobuf.Empty) { + rpc ModifyAckDeadline(ModifyAckDeadlineRequest) + returns (google.protobuf.Empty) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline" body: "*" }; - option (google.api.method_signature) = "subscription,ack_ids,ack_deadline_seconds"; + option (google.api.method_signature) = + "subscription,ack_ids,ack_deadline_seconds"; } // Acknowledges the messages associated with the `ack_ids` in the @@ -454,7 +458,8 @@ service Subscriber { post: "/v1/{subscription=projects/*/subscriptions/*}:pull" body: "*" }; - option (google.api.method_signature) = "subscription,return_immediately,max_messages"; + option (google.api.method_signature) = + "subscription,return_immediately,max_messages"; } // Establishes a stream with the server, which sends messages down to the @@ -464,8 +469,8 @@ service Subscriber { // reassign server-side resources, in which case, the client should // re-establish the stream. Flow control can be achieved by configuring the // underlying RPC channel. - rpc StreamingPull(stream StreamingPullRequest) returns (stream StreamingPullResponse) { - } + rpc StreamingPull(stream StreamingPullRequest) + returns (stream StreamingPullResponse) {} // Modifies the `PushConfig` for a specified subscription. // @@ -473,7 +478,8 @@ service Subscriber { // an empty `PushConfig`) or vice versa, or change the endpoint URL and other // attributes of a push subscription. Messages will accumulate for delivery // continuously through the call regardless of changes to the `PushConfig`. - rpc ModifyPushConfig(ModifyPushConfigRequest) returns (google.protobuf.Empty) { + rpc ModifyPushConfig(ModifyPushConfigRequest) + returns (google.protobuf.Empty) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig" body: "*" @@ -490,6 +496,7 @@ service Subscriber { option (google.api.http) = { get: "/v1/{snapshot=projects/*/snapshots/*}" }; + option (google.api.method_signature) = "snapshot"; } // Lists the existing snapshots. Snapshots are used in @@ -592,15 +599,12 @@ message Subscription { // in length, and it must not start with `"goog"`. string name = 1 [(google.api.field_behavior) = REQUIRED]; - // Required. The name of the topic from which this subscription is receiving messages. - // Format is `projects/{project}/topics/{topic}`. - // The value of this field will be `_deleted-topic_` if the topic has been - // deleted. + // Required. The name of the topic from which this subscription is receiving + // messages. Format is `projects/{project}/topics/{topic}`. The value of this + // field will be `_deleted-topic_` if the topic has been deleted. string topic = 2 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - type: "pubsub.googleapis.com/Topic" - } + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; // If push delivery is used with this subscription, this field is @@ -834,7 +838,8 @@ message UpdateSubscriptionRequest { // Required. Indicates which fields in the provided subscription to update. // Must be specified and non-empty. - google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED]; + google.protobuf.FieldMask update_mask = 2 + [(google.api.field_behavior) = REQUIRED]; } // Request for the `ListSubscriptions` method. @@ -911,14 +916,18 @@ message PullRequest { } ]; - // If this field set to true, the system will respond immediately even if - // it there are no messages available to return in the `Pull` response. - // Otherwise, the system may wait (for a bounded amount of time) until at - // least one message is available, rather than returning no messages. - bool return_immediately = 2; - - // Required. The maximum number of messages to return for this request. Must be a - // positive integer. The Pub/Sub system may return fewer than the number + // Optional. If this field set to true, the system will respond immediately + // even if it there are no messages available to return in the `Pull` + // response. Otherwise, the system may wait (for a bounded amount of time) + // until at least one message is available, rather than returning no messages. + // Warning: setting this field to `true` is discouraged because it adversely + // impacts the performance of `Pull` operations. We recommend that users do + // not set this field. + bool return_immediately = 2 + [deprecated = true, (google.api.field_behavior) = OPTIONAL]; + + // Required. The maximum number of messages to return for this request. Must + // be a positive integer. The Pub/Sub system may return fewer than the number // specified. int32 max_messages = 3 [(google.api.field_behavior) = REQUIRED]; } @@ -946,10 +955,10 @@ message ModifyAckDeadlineRequest { // Required. List of acknowledgment IDs. repeated string ack_ids = 4 [(google.api.field_behavior) = REQUIRED]; - // Required. The new ack deadline with respect to the time this request was sent to - // the Pub/Sub system. For example, if the value is 10, the new - // ack deadline will expire 10 seconds after the `ModifyAckDeadline` call - // was made. Specifying zero might immediately make the message available for + // Required. The new ack deadline with respect to the time this request was + // sent to the Pub/Sub system. For example, if the value is 10, the new ack + // deadline will expire 10 seconds after the `ModifyAckDeadline` call was + // made. Specifying zero might immediately make the message available for // delivery to another subscriber client. This typically results in an // increase in the rate of message redeliveries (that is, duplicates). // The minimum deadline you can specify is 0 seconds. @@ -968,8 +977,9 @@ message AcknowledgeRequest { } ]; - // Required. The acknowledgment ID for the messages being acknowledged that was returned - // by the Pub/Sub system in the `Pull` response. Must not be empty. + // Required. The acknowledgment ID for the messages being acknowledged that + // was returned by the Pub/Sub system in the `Pull` response. Must not be + // empty. repeated string ack_ids = 2 [(google.api.field_behavior) = REQUIRED]; } @@ -977,8 +987,8 @@ message AcknowledgeRequest { // establish the initial stream as well as to stream acknowledgements and ack // deadline modifications from the client to the server. message StreamingPullRequest { - // Required. The subscription for which to initialize the new stream. This must be - // provided in the first request on the stream, and must not be set in + // Required. The subscription for which to initialize the new stream. This + // must be provided in the first request on the stream, and must not be set in // subsequent requests from client to server. // Format is `projects/{project}/subscriptions/{sub}`. string subscription = 1 [ @@ -1015,11 +1025,12 @@ message StreamingPullRequest { // processing was interrupted. repeated string modify_deadline_ack_ids = 4; - // Required. The ack deadline to use for the stream. This must be provided in the - // first request on the stream, but it can also be updated on subsequent + // Required. The ack deadline to use for the stream. This must be provided in + // the first request on the stream, but it can also be updated on subsequent // requests from client to server. The minimum deadline you can specify is 10 // seconds. The maximum deadline you can specify is 600 seconds (10 minutes). - int32 stream_ack_deadline_seconds = 5 [(google.api.field_behavior) = REQUIRED]; + int32 stream_ack_deadline_seconds = 5 + [(google.api.field_behavior) = REQUIRED]; // A unique identifier that is used to distinguish client instances from each // other. Only needs to be provided on the initial request. When a stream @@ -1039,17 +1050,15 @@ message StreamingPullResponse { // Request for the `CreateSnapshot` method. message CreateSnapshotRequest { - // Required. User-provided name for this snapshot. If the name is not provided in the - // request, the server will assign a random name for this snapshot on the same - // project as the subscription. Note that for REST API requests, you must - // specify a name. See the resource // name rules. Format is `projects/{project}/snapshots/{snap}`. string name = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - type: "pubsub.googleapis.com/Snapshot" - } + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Snapshot" } ]; // Required. The subscription whose backlog the snapshot retains. @@ -1080,7 +1089,8 @@ message UpdateSnapshotRequest { // Required. Indicates which fields in the provided snapshot to update. // Must be specified and non-empty. - google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED]; + google.protobuf.FieldMask update_mask = 2 + [(google.api.field_behavior) = REQUIRED]; } // A snapshot resource. Snapshots are used in @@ -1099,9 +1109,9 @@ message Snapshot { string name = 1; // The name of the topic from which this snapshot is retaining messages. - string topic = 2 [(google.api.resource_reference) = { - type: "pubsub.googleapis.com/Topic" - }]; + string topic = 2 [ + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } + ]; // The snapshot is guaranteed to exist up until this time. // A newly-created snapshot expires no later than 7 days from the time of its @@ -1126,9 +1136,7 @@ message GetSnapshotRequest { // Format is `projects/{project}/snapshots/{snap}`. string snapshot = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - type: "pubsub.googleapis.com/Snapshot" - } + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Snapshot" } ]; } @@ -1168,9 +1176,7 @@ message DeleteSnapshotRequest { // Format is `projects/{project}/snapshots/{snap}`. string snapshot = 1 [ (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference) = { - type: "pubsub.googleapis.com/Snapshot" - } + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Snapshot" } ]; } @@ -1202,12 +1208,10 @@ message SeekRequest { // the provided subscription. // Format is `projects/{project}/snapshots/{snap}`. string snapshot = 3 [(google.api.resource_reference) = { - type: "pubsub.googleapis.com/Snapshot" - }]; + type: "pubsub.googleapis.com/Snapshot" + }]; } } // Response for the `Seek` method (this response is empty). -message SeekResponse { - -} +message SeekResponse {} diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index d3389fbf465..374eae8115a 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -4627,242 +4627,6 @@ export namespace google { /** Namespace api. */ namespace api { - /** FieldBehavior enum. */ - enum FieldBehavior { - FIELD_BEHAVIOR_UNSPECIFIED = 0, - OPTIONAL = 1, - REQUIRED = 2, - OUTPUT_ONLY = 3, - INPUT_ONLY = 4, - IMMUTABLE = 5 - } - - /** Properties of a ResourceDescriptor. */ - interface IResourceDescriptor { - - /** ResourceDescriptor type */ - type?: (string|null); - - /** ResourceDescriptor pattern */ - pattern?: (string[]|null); - - /** ResourceDescriptor nameField */ - nameField?: (string|null); - - /** ResourceDescriptor history */ - history?: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History|null); - - /** ResourceDescriptor plural */ - plural?: (string|null); - - /** ResourceDescriptor singular */ - singular?: (string|null); - } - - /** Represents a ResourceDescriptor. */ - class ResourceDescriptor implements IResourceDescriptor { - - /** - * Constructs a new ResourceDescriptor. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IResourceDescriptor); - - /** ResourceDescriptor type. */ - public type: string; - - /** ResourceDescriptor pattern. */ - public pattern: string[]; - - /** ResourceDescriptor nameField. */ - public nameField: string; - - /** ResourceDescriptor history. */ - public history: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History); - - /** ResourceDescriptor plural. */ - public plural: string; - - /** ResourceDescriptor singular. */ - public singular: string; - - /** - * Creates a new ResourceDescriptor instance using the specified properties. - * @param [properties] Properties to set - * @returns ResourceDescriptor instance - */ - public static create(properties?: google.api.IResourceDescriptor): google.api.ResourceDescriptor; - - /** - * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @param message ResourceDescriptor message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @param message ResourceDescriptor message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceDescriptor; - - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceDescriptor; - - /** - * Verifies a ResourceDescriptor message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ResourceDescriptor - */ - public static fromObject(object: { [k: string]: any }): google.api.ResourceDescriptor; - - /** - * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. - * @param message ResourceDescriptor - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.ResourceDescriptor, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ResourceDescriptor to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace ResourceDescriptor { - - /** History enum. */ - enum History { - HISTORY_UNSPECIFIED = 0, - ORIGINALLY_SINGLE_PATTERN = 1, - FUTURE_MULTI_PATTERN = 2 - } - } - - /** Properties of a ResourceReference. */ - interface IResourceReference { - - /** ResourceReference type */ - type?: (string|null); - - /** ResourceReference childType */ - childType?: (string|null); - } - - /** Represents a ResourceReference. */ - class ResourceReference implements IResourceReference { - - /** - * Constructs a new ResourceReference. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IResourceReference); - - /** ResourceReference type. */ - public type: string; - - /** ResourceReference childType. */ - public childType: string; - - /** - * Creates a new ResourceReference instance using the specified properties. - * @param [properties] Properties to set - * @returns ResourceReference instance - */ - public static create(properties?: google.api.IResourceReference): google.api.ResourceReference; - - /** - * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. - * @param message ResourceReference message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. - * @param message ResourceReference message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ResourceReference message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceReference; - - /** - * Decodes a ResourceReference message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceReference; - - /** - * Verifies a ResourceReference message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ResourceReference - */ - public static fromObject(object: { [k: string]: any }): google.api.ResourceReference; - - /** - * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. - * @param message ResourceReference - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.ResourceReference, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ResourceReference to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - /** Properties of a Http. */ interface IHttp { @@ -5201,6 +4965,242 @@ export namespace google { */ public toJSON(): { [k: string]: any }; } + + /** FieldBehavior enum. */ + enum FieldBehavior { + FIELD_BEHAVIOR_UNSPECIFIED = 0, + OPTIONAL = 1, + REQUIRED = 2, + OUTPUT_ONLY = 3, + INPUT_ONLY = 4, + IMMUTABLE = 5 + } + + /** Properties of a ResourceDescriptor. */ + interface IResourceDescriptor { + + /** ResourceDescriptor type */ + type?: (string|null); + + /** ResourceDescriptor pattern */ + pattern?: (string[]|null); + + /** ResourceDescriptor nameField */ + nameField?: (string|null); + + /** ResourceDescriptor history */ + history?: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History|null); + + /** ResourceDescriptor plural */ + plural?: (string|null); + + /** ResourceDescriptor singular */ + singular?: (string|null); + } + + /** Represents a ResourceDescriptor. */ + class ResourceDescriptor implements IResourceDescriptor { + + /** + * Constructs a new ResourceDescriptor. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IResourceDescriptor); + + /** ResourceDescriptor type. */ + public type: string; + + /** ResourceDescriptor pattern. */ + public pattern: string[]; + + /** ResourceDescriptor nameField. */ + public nameField: string; + + /** ResourceDescriptor history. */ + public history: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History); + + /** ResourceDescriptor plural. */ + public plural: string; + + /** ResourceDescriptor singular. */ + public singular: string; + + /** + * Creates a new ResourceDescriptor instance using the specified properties. + * @param [properties] Properties to set + * @returns ResourceDescriptor instance + */ + public static create(properties?: google.api.IResourceDescriptor): google.api.ResourceDescriptor; + + /** + * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @param message ResourceDescriptor message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @param message ResourceDescriptor message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceDescriptor; + + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceDescriptor; + + /** + * Verifies a ResourceDescriptor message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ResourceDescriptor + */ + public static fromObject(object: { [k: string]: any }): google.api.ResourceDescriptor; + + /** + * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. + * @param message ResourceDescriptor + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ResourceDescriptor, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ResourceDescriptor to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace ResourceDescriptor { + + /** History enum. */ + enum History { + HISTORY_UNSPECIFIED = 0, + ORIGINALLY_SINGLE_PATTERN = 1, + FUTURE_MULTI_PATTERN = 2 + } + } + + /** Properties of a ResourceReference. */ + interface IResourceReference { + + /** ResourceReference type */ + type?: (string|null); + + /** ResourceReference childType */ + childType?: (string|null); + } + + /** Represents a ResourceReference. */ + class ResourceReference implements IResourceReference { + + /** + * Constructs a new ResourceReference. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IResourceReference); + + /** ResourceReference type. */ + public type: string; + + /** ResourceReference childType. */ + public childType: string; + + /** + * Creates a new ResourceReference instance using the specified properties. + * @param [properties] Properties to set + * @returns ResourceReference instance + */ + public static create(properties?: google.api.IResourceReference): google.api.ResourceReference; + + /** + * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @param message ResourceReference message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @param message ResourceReference message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ResourceReference message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceReference; + + /** + * Decodes a ResourceReference message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceReference; + + /** + * Verifies a ResourceReference message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ResourceReference + */ + public static fromObject(object: { [k: string]: any }): google.api.ResourceReference; + + /** + * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. + * @param message ResourceReference + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ResourceReference, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ResourceReference to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } } /** Namespace protobuf. */ @@ -7587,11 +7587,11 @@ export namespace google { /** MethodOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** MethodOptions .google.api.methodSignature */ - ".google.api.methodSignature"?: (string[]|null); - /** MethodOptions .google.api.http */ ".google.api.http"?: (google.api.IHttpRule|null); + + /** MethodOptions .google.api.methodSignature */ + ".google.api.methodSignature"?: (string[]|null); } /** Represents a MethodOptions. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index a69d2d1b4af..4d983e4a1f5 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -10457,52 +10457,26 @@ */ var api = {}; - /** - * FieldBehavior enum. - * @name google.api.FieldBehavior - * @enum {string} - * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value - * @property {number} OPTIONAL=1 OPTIONAL value - * @property {number} REQUIRED=2 REQUIRED value - * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value - * @property {number} INPUT_ONLY=4 INPUT_ONLY value - * @property {number} IMMUTABLE=5 IMMUTABLE value - */ - api.FieldBehavior = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0; - values[valuesById[1] = "OPTIONAL"] = 1; - values[valuesById[2] = "REQUIRED"] = 2; - values[valuesById[3] = "OUTPUT_ONLY"] = 3; - values[valuesById[4] = "INPUT_ONLY"] = 4; - values[valuesById[5] = "IMMUTABLE"] = 5; - return values; - })(); - - api.ResourceDescriptor = (function() { + api.Http = (function() { /** - * Properties of a ResourceDescriptor. + * Properties of a Http. * @memberof google.api - * @interface IResourceDescriptor - * @property {string|null} [type] ResourceDescriptor type - * @property {Array.|null} [pattern] ResourceDescriptor pattern - * @property {string|null} [nameField] ResourceDescriptor nameField - * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history - * @property {string|null} [plural] ResourceDescriptor plural - * @property {string|null} [singular] ResourceDescriptor singular + * @interface IHttp + * @property {Array.|null} [rules] Http rules + * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion */ /** - * Constructs a new ResourceDescriptor. + * Constructs a new Http. * @memberof google.api - * @classdesc Represents a ResourceDescriptor. - * @implements IResourceDescriptor + * @classdesc Represents a Http. + * @implements IHttp * @constructor - * @param {google.api.IResourceDescriptor=} [properties] Properties to set + * @param {google.api.IHttp=} [properties] Properties to set */ - function ResourceDescriptor(properties) { - this.pattern = []; + function Http(properties) { + this.rules = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -10510,143 +10484,91 @@ } /** - * ResourceDescriptor type. - * @member {string} type - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.type = ""; - - /** - * ResourceDescriptor pattern. - * @member {Array.} pattern - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.pattern = $util.emptyArray; - - /** - * ResourceDescriptor nameField. - * @member {string} nameField - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.nameField = ""; - - /** - * ResourceDescriptor history. - * @member {google.api.ResourceDescriptor.History} history - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.history = 0; - - /** - * ResourceDescriptor plural. - * @member {string} plural - * @memberof google.api.ResourceDescriptor + * Http rules. + * @member {Array.} rules + * @memberof google.api.Http * @instance */ - ResourceDescriptor.prototype.plural = ""; + Http.prototype.rules = $util.emptyArray; /** - * ResourceDescriptor singular. - * @member {string} singular - * @memberof google.api.ResourceDescriptor + * Http fullyDecodeReservedExpansion. + * @member {boolean} fullyDecodeReservedExpansion + * @memberof google.api.Http * @instance */ - ResourceDescriptor.prototype.singular = ""; + Http.prototype.fullyDecodeReservedExpansion = false; /** - * Creates a new ResourceDescriptor instance using the specified properties. + * Creates a new Http instance using the specified properties. * @function create - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @static - * @param {google.api.IResourceDescriptor=} [properties] Properties to set - * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance + * @param {google.api.IHttp=} [properties] Properties to set + * @returns {google.api.Http} Http instance */ - ResourceDescriptor.create = function create(properties) { - return new ResourceDescriptor(properties); + Http.create = function create(properties) { + return new Http(properties); }; /** - * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. * @function encode - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @static - * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode + * @param {google.api.IHttp} message Http message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ResourceDescriptor.encode = function encode(message, writer) { + Http.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.type != null && message.hasOwnProperty("type")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); - if (message.pattern != null && message.pattern.length) - for (var i = 0; i < message.pattern.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]); - if (message.nameField != null && message.hasOwnProperty("nameField")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField); - if (message.history != null && message.hasOwnProperty("history")) - writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history); - if (message.plural != null && message.hasOwnProperty("plural")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); - if (message.singular != null && message.hasOwnProperty("singular")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); + if (message.rules != null && message.rules.length) + for (var i = 0; i < message.rules.length; ++i) + $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); return writer; }; /** - * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @static - * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode + * @param {google.api.IHttp} message Http message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) { + Http.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ResourceDescriptor message from the specified reader or buffer. + * Decodes a Http message from the specified reader or buffer. * @function decode - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @returns {google.api.Http} Http * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ResourceDescriptor.decode = function decode(reader, length) { + Http.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.type = reader.string(); + if (!(message.rules && message.rules.length)) + message.rules = []; + message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); break; case 2: - if (!(message.pattern && message.pattern.length)) - message.pattern = []; - message.pattern.push(reader.string()); - break; - case 3: - message.nameField = reader.string(); - break; - case 4: - message.history = reader.int32(); - break; - case 5: - message.plural = reader.string(); - break; - case 6: - message.singular = reader.string(); + message.fullyDecodeReservedExpansion = reader.bool(); break; default: reader.skipType(tag & 7); @@ -10657,196 +10579,143 @@ }; /** - * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. + * Decodes a Http message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @returns {google.api.Http} Http * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) { + Http.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ResourceDescriptor message. + * Verifies a Http message. * @function verify - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ResourceDescriptor.verify = function verify(message) { + Http.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.type != null && message.hasOwnProperty("type")) - if (!$util.isString(message.type)) - return "type: string expected"; - if (message.pattern != null && message.hasOwnProperty("pattern")) { - if (!Array.isArray(message.pattern)) - return "pattern: array expected"; - for (var i = 0; i < message.pattern.length; ++i) - if (!$util.isString(message.pattern[i])) - return "pattern: string[] expected"; - } - if (message.nameField != null && message.hasOwnProperty("nameField")) - if (!$util.isString(message.nameField)) - return "nameField: string expected"; - if (message.history != null && message.hasOwnProperty("history")) - switch (message.history) { - default: - return "history: enum value expected"; - case 0: - case 1: - case 2: - break; + if (message.rules != null && message.hasOwnProperty("rules")) { + if (!Array.isArray(message.rules)) + return "rules: array expected"; + for (var i = 0; i < message.rules.length; ++i) { + var error = $root.google.api.HttpRule.verify(message.rules[i]); + if (error) + return "rules." + error; } - if (message.plural != null && message.hasOwnProperty("plural")) - if (!$util.isString(message.plural)) - return "plural: string expected"; - if (message.singular != null && message.hasOwnProperty("singular")) - if (!$util.isString(message.singular)) - return "singular: string expected"; + } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + if (typeof message.fullyDecodeReservedExpansion !== "boolean") + return "fullyDecodeReservedExpansion: boolean expected"; return null; }; /** - * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. + * Creates a Http message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @static * @param {Object.} object Plain object - * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @returns {google.api.Http} Http */ - ResourceDescriptor.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.ResourceDescriptor) + Http.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.Http) return object; - var message = new $root.google.api.ResourceDescriptor(); - if (object.type != null) - message.type = String(object.type); - if (object.pattern) { - if (!Array.isArray(object.pattern)) - throw TypeError(".google.api.ResourceDescriptor.pattern: array expected"); - message.pattern = []; - for (var i = 0; i < object.pattern.length; ++i) - message.pattern[i] = String(object.pattern[i]); + var message = new $root.google.api.Http(); + if (object.rules) { + if (!Array.isArray(object.rules)) + throw TypeError(".google.api.Http.rules: array expected"); + message.rules = []; + for (var i = 0; i < object.rules.length; ++i) { + if (typeof object.rules[i] !== "object") + throw TypeError(".google.api.Http.rules: object expected"); + message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); + } } - if (object.nameField != null) - message.nameField = String(object.nameField); - switch (object.history) { - case "HISTORY_UNSPECIFIED": - case 0: - message.history = 0; - break; - case "ORIGINALLY_SINGLE_PATTERN": - case 1: - message.history = 1; - break; - case "FUTURE_MULTI_PATTERN": - case 2: - message.history = 2; - break; - } - if (object.plural != null) - message.plural = String(object.plural); - if (object.singular != null) - message.singular = String(object.singular); + if (object.fullyDecodeReservedExpansion != null) + message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); return message; }; /** - * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. + * Creates a plain object from a Http message. Also converts values to other types if specified. * @function toObject - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @static - * @param {google.api.ResourceDescriptor} message ResourceDescriptor + * @param {google.api.Http} message Http * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ResourceDescriptor.toObject = function toObject(message, options) { + Http.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.arrays || options.defaults) - object.pattern = []; - if (options.defaults) { - object.type = ""; - object.nameField = ""; - object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0; - object.plural = ""; - object.singular = ""; - } - if (message.type != null && message.hasOwnProperty("type")) - object.type = message.type; - if (message.pattern && message.pattern.length) { - object.pattern = []; - for (var j = 0; j < message.pattern.length; ++j) - object.pattern[j] = message.pattern[j]; + object.rules = []; + if (options.defaults) + object.fullyDecodeReservedExpansion = false; + if (message.rules && message.rules.length) { + object.rules = []; + for (var j = 0; j < message.rules.length; ++j) + object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); } - if (message.nameField != null && message.hasOwnProperty("nameField")) - object.nameField = message.nameField; - if (message.history != null && message.hasOwnProperty("history")) - object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history; - if (message.plural != null && message.hasOwnProperty("plural")) - object.plural = message.plural; - if (message.singular != null && message.hasOwnProperty("singular")) - object.singular = message.singular; + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; return object; }; /** - * Converts this ResourceDescriptor to JSON. + * Converts this Http to JSON. * @function toJSON - * @memberof google.api.ResourceDescriptor + * @memberof google.api.Http * @instance * @returns {Object.} JSON object */ - ResourceDescriptor.prototype.toJSON = function toJSON() { + Http.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - /** - * History enum. - * @name google.api.ResourceDescriptor.History - * @enum {string} - * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value - * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value - * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value - */ - ResourceDescriptor.History = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0; - values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1; - values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2; - return values; - })(); - - return ResourceDescriptor; + return Http; })(); - api.ResourceReference = (function() { + api.HttpRule = (function() { /** - * Properties of a ResourceReference. + * Properties of a HttpRule. * @memberof google.api - * @interface IResourceReference - * @property {string|null} [type] ResourceReference type - * @property {string|null} [childType] ResourceReference childType + * @interface IHttpRule + * @property {string|null} [selector] HttpRule selector + * @property {string|null} [get] HttpRule get + * @property {string|null} [put] HttpRule put + * @property {string|null} [post] HttpRule post + * @property {string|null} ["delete"] HttpRule delete + * @property {string|null} [patch] HttpRule patch + * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom + * @property {string|null} [body] HttpRule body + * @property {string|null} [responseBody] HttpRule responseBody + * @property {Array.|null} [additionalBindings] HttpRule additionalBindings */ /** - * Constructs a new ResourceReference. + * Constructs a new HttpRule. * @memberof google.api - * @classdesc Represents a ResourceReference. - * @implements IResourceReference + * @classdesc Represents a HttpRule. + * @implements IHttpRule * @constructor - * @param {google.api.IResourceReference=} [properties] Properties to set + * @param {google.api.IHttpRule=} [properties] Properties to set */ - function ResourceReference(properties) { + function HttpRule(properties) { + this.additionalBindings = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -10854,88 +10723,209 @@ } /** - * ResourceReference type. - * @member {string} type - * @memberof google.api.ResourceReference + * HttpRule selector. + * @member {string} selector + * @memberof google.api.HttpRule * @instance */ - ResourceReference.prototype.type = ""; + HttpRule.prototype.selector = ""; /** - * ResourceReference childType. - * @member {string} childType - * @memberof google.api.ResourceReference + * HttpRule get. + * @member {string} get + * @memberof google.api.HttpRule * @instance */ - ResourceReference.prototype.childType = ""; + HttpRule.prototype.get = ""; /** - * Creates a new ResourceReference instance using the specified properties. + * HttpRule put. + * @member {string} put + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.put = ""; + + /** + * HttpRule post. + * @member {string} post + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.post = ""; + + /** + * HttpRule delete. + * @member {string} delete + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype["delete"] = ""; + + /** + * HttpRule patch. + * @member {string} patch + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.patch = ""; + + /** + * HttpRule custom. + * @member {google.api.ICustomHttpPattern|null|undefined} custom + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.custom = null; + + /** + * HttpRule body. + * @member {string} body + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.body = ""; + + /** + * HttpRule responseBody. + * @member {string} responseBody + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.responseBody = ""; + + /** + * HttpRule additionalBindings. + * @member {Array.} additionalBindings + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.additionalBindings = $util.emptyArray; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * HttpRule pattern. + * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern + * @memberof google.api.HttpRule + * @instance + */ + Object.defineProperty(HttpRule.prototype, "pattern", { + get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new HttpRule instance using the specified properties. * @function create - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @static - * @param {google.api.IResourceReference=} [properties] Properties to set - * @returns {google.api.ResourceReference} ResourceReference instance + * @param {google.api.IHttpRule=} [properties] Properties to set + * @returns {google.api.HttpRule} HttpRule instance */ - ResourceReference.create = function create(properties) { - return new ResourceReference(properties); + HttpRule.create = function create(properties) { + return new HttpRule(properties); }; /** - * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. * @function encode - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @static - * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {google.api.IHttpRule} message HttpRule message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ResourceReference.encode = function encode(message, writer) { + HttpRule.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.type != null && message.hasOwnProperty("type")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); - if (message.childType != null && message.hasOwnProperty("childType")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType); + if (message.selector != null && message.hasOwnProperty("selector")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); + if (message.get != null && message.hasOwnProperty("get")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.get); + if (message.put != null && message.hasOwnProperty("put")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.put); + if (message.post != null && message.hasOwnProperty("post")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.post); + if (message["delete"] != null && message.hasOwnProperty("delete")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]); + if (message.patch != null && message.hasOwnProperty("patch")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch); + if (message.body != null && message.hasOwnProperty("body")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.body); + if (message.custom != null && message.hasOwnProperty("custom")) + $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.additionalBindings != null && message.additionalBindings.length) + for (var i = 0; i < message.additionalBindings.length; ++i) + $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); return writer; }; /** - * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @static - * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {google.api.IHttpRule} message HttpRule message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ResourceReference.encodeDelimited = function encodeDelimited(message, writer) { + HttpRule.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ResourceReference message from the specified reader or buffer. + * Decodes a HttpRule message from the specified reader or buffer. * @function decode - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.ResourceReference} ResourceReference + * @returns {google.api.HttpRule} HttpRule * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ResourceReference.decode = function decode(reader, length) { + HttpRule.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.type = reader.string(); + message.selector = reader.string(); break; case 2: - message.childType = reader.string(); + message.get = reader.string(); + break; + case 3: + message.put = reader.string(); + break; + case 4: + message.post = reader.string(); + break; + case 5: + message["delete"] = reader.string(); + break; + case 6: + message.patch = reader.string(); + break; + case 8: + message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); + break; + case 7: + message.body = reader.string(); + break; + case 12: + message.responseBody = reader.string(); + break; + case 11: + if (!(message.additionalBindings && message.additionalBindings.length)) + message.additionalBindings = []; + message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -10946,118 +10936,240 @@ }; /** - * Decodes a ResourceReference message from the specified reader or buffer, length delimited. + * Decodes a HttpRule message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.ResourceReference} ResourceReference + * @returns {google.api.HttpRule} HttpRule * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ResourceReference.decodeDelimited = function decodeDelimited(reader) { + HttpRule.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ResourceReference message. + * Verifies a HttpRule message. * @function verify - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ResourceReference.verify = function verify(message) { + HttpRule.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.type != null && message.hasOwnProperty("type")) - if (!$util.isString(message.type)) - return "type: string expected"; - if (message.childType != null && message.hasOwnProperty("childType")) - if (!$util.isString(message.childType)) - return "childType: string expected"; + var properties = {}; + if (message.selector != null && message.hasOwnProperty("selector")) + if (!$util.isString(message.selector)) + return "selector: string expected"; + if (message.get != null && message.hasOwnProperty("get")) { + properties.pattern = 1; + if (!$util.isString(message.get)) + return "get: string expected"; + } + if (message.put != null && message.hasOwnProperty("put")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.put)) + return "put: string expected"; + } + if (message.post != null && message.hasOwnProperty("post")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.post)) + return "post: string expected"; + } + if (message["delete"] != null && message.hasOwnProperty("delete")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message["delete"])) + return "delete: string expected"; + } + if (message.patch != null && message.hasOwnProperty("patch")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.patch)) + return "patch: string expected"; + } + if (message.custom != null && message.hasOwnProperty("custom")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + { + var error = $root.google.api.CustomHttpPattern.verify(message.custom); + if (error) + return "custom." + error; + } + } + if (message.body != null && message.hasOwnProperty("body")) + if (!$util.isString(message.body)) + return "body: string expected"; + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + if (!$util.isString(message.responseBody)) + return "responseBody: string expected"; + if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { + if (!Array.isArray(message.additionalBindings)) + return "additionalBindings: array expected"; + for (var i = 0; i < message.additionalBindings.length; ++i) { + var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]); + if (error) + return "additionalBindings." + error; + } + } return null; }; /** - * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @static * @param {Object.} object Plain object - * @returns {google.api.ResourceReference} ResourceReference + * @returns {google.api.HttpRule} HttpRule */ - ResourceReference.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.ResourceReference) + HttpRule.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.HttpRule) return object; - var message = new $root.google.api.ResourceReference(); - if (object.type != null) - message.type = String(object.type); - if (object.childType != null) - message.childType = String(object.childType); + var message = new $root.google.api.HttpRule(); + if (object.selector != null) + message.selector = String(object.selector); + if (object.get != null) + message.get = String(object.get); + if (object.put != null) + message.put = String(object.put); + if (object.post != null) + message.post = String(object.post); + if (object["delete"] != null) + message["delete"] = String(object["delete"]); + if (object.patch != null) + message.patch = String(object.patch); + if (object.custom != null) { + if (typeof object.custom !== "object") + throw TypeError(".google.api.HttpRule.custom: object expected"); + message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom); + } + if (object.body != null) + message.body = String(object.body); + if (object.responseBody != null) + message.responseBody = String(object.responseBody); + if (object.additionalBindings) { + if (!Array.isArray(object.additionalBindings)) + throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); + message.additionalBindings = []; + for (var i = 0; i < object.additionalBindings.length; ++i) { + if (typeof object.additionalBindings[i] !== "object") + throw TypeError(".google.api.HttpRule.additionalBindings: object expected"); + message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]); + } + } return message; }; /** - * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. * @function toObject - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @static - * @param {google.api.ResourceReference} message ResourceReference + * @param {google.api.HttpRule} message HttpRule * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ResourceReference.toObject = function toObject(message, options) { + HttpRule.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; + if (options.arrays || options.defaults) + object.additionalBindings = []; if (options.defaults) { - object.type = ""; - object.childType = ""; + object.selector = ""; + object.body = ""; + object.responseBody = ""; } - if (message.type != null && message.hasOwnProperty("type")) - object.type = message.type; - if (message.childType != null && message.hasOwnProperty("childType")) - object.childType = message.childType; + if (message.selector != null && message.hasOwnProperty("selector")) + object.selector = message.selector; + if (message.get != null && message.hasOwnProperty("get")) { + object.get = message.get; + if (options.oneofs) + object.pattern = "get"; + } + if (message.put != null && message.hasOwnProperty("put")) { + object.put = message.put; + if (options.oneofs) + object.pattern = "put"; + } + if (message.post != null && message.hasOwnProperty("post")) { + object.post = message.post; + if (options.oneofs) + object.pattern = "post"; + } + if (message["delete"] != null && message.hasOwnProperty("delete")) { + object["delete"] = message["delete"]; + if (options.oneofs) + object.pattern = "delete"; + } + if (message.patch != null && message.hasOwnProperty("patch")) { + object.patch = message.patch; + if (options.oneofs) + object.pattern = "patch"; + } + if (message.body != null && message.hasOwnProperty("body")) + object.body = message.body; + if (message.custom != null && message.hasOwnProperty("custom")) { + object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options); + if (options.oneofs) + object.pattern = "custom"; + } + if (message.additionalBindings && message.additionalBindings.length) { + object.additionalBindings = []; + for (var j = 0; j < message.additionalBindings.length; ++j) + object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); + } + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + object.responseBody = message.responseBody; return object; }; /** - * Converts this ResourceReference to JSON. + * Converts this HttpRule to JSON. * @function toJSON - * @memberof google.api.ResourceReference + * @memberof google.api.HttpRule * @instance * @returns {Object.} JSON object */ - ResourceReference.prototype.toJSON = function toJSON() { + HttpRule.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ResourceReference; + return HttpRule; })(); - api.Http = (function() { + api.CustomHttpPattern = (function() { /** - * Properties of a Http. + * Properties of a CustomHttpPattern. * @memberof google.api - * @interface IHttp - * @property {Array.|null} [rules] Http rules - * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion + * @interface ICustomHttpPattern + * @property {string|null} [kind] CustomHttpPattern kind + * @property {string|null} [path] CustomHttpPattern path */ /** - * Constructs a new Http. + * Constructs a new CustomHttpPattern. * @memberof google.api - * @classdesc Represents a Http. - * @implements IHttp + * @classdesc Represents a CustomHttpPattern. + * @implements ICustomHttpPattern * @constructor - * @param {google.api.IHttp=} [properties] Properties to set + * @param {google.api.ICustomHttpPattern=} [properties] Properties to set */ - function Http(properties) { - this.rules = []; + function CustomHttpPattern(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -11065,91 +11177,88 @@ } /** - * Http rules. - * @member {Array.} rules - * @memberof google.api.Http + * CustomHttpPattern kind. + * @member {string} kind + * @memberof google.api.CustomHttpPattern * @instance */ - Http.prototype.rules = $util.emptyArray; + CustomHttpPattern.prototype.kind = ""; /** - * Http fullyDecodeReservedExpansion. - * @member {boolean} fullyDecodeReservedExpansion - * @memberof google.api.Http + * CustomHttpPattern path. + * @member {string} path + * @memberof google.api.CustomHttpPattern * @instance */ - Http.prototype.fullyDecodeReservedExpansion = false; + CustomHttpPattern.prototype.path = ""; /** - * Creates a new Http instance using the specified properties. + * Creates a new CustomHttpPattern instance using the specified properties. * @function create - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @static - * @param {google.api.IHttp=} [properties] Properties to set - * @returns {google.api.Http} Http instance + * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance */ - Http.create = function create(properties) { - return new Http(properties); + CustomHttpPattern.create = function create(properties) { + return new CustomHttpPattern(properties); }; /** - * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. * @function encode - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @static - * @param {google.api.IHttp} message Http message or plain object to encode + * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Http.encode = function encode(message, writer) { + CustomHttpPattern.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.rules != null && message.rules.length) - for (var i = 0; i < message.rules.length; ++i) - $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); + if (message.kind != null && message.hasOwnProperty("kind")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind); + if (message.path != null && message.hasOwnProperty("path")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.path); return writer; }; /** - * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @static - * @param {google.api.IHttp} message Http message or plain object to encode + * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Http.encodeDelimited = function encodeDelimited(message, writer) { + CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a Http message from the specified reader or buffer. + * Decodes a CustomHttpPattern message from the specified reader or buffer. * @function decode - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.Http} Http + * @returns {google.api.CustomHttpPattern} CustomHttpPattern * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Http.decode = function decode(reader, length) { + CustomHttpPattern.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.rules && message.rules.length)) - message.rules = []; - message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + message.kind = reader.string(); break; case 2: - message.fullyDecodeReservedExpansion = reader.bool(); + message.path = reader.string(); break; default: reader.skipType(tag & 7); @@ -11160,143 +11269,144 @@ }; /** - * Decodes a Http message from the specified reader or buffer, length delimited. + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.Http} Http + * @returns {google.api.CustomHttpPattern} CustomHttpPattern * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Http.decodeDelimited = function decodeDelimited(reader) { + CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a Http message. + * Verifies a CustomHttpPattern message. * @function verify - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - Http.verify = function verify(message) { + CustomHttpPattern.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.rules != null && message.hasOwnProperty("rules")) { - if (!Array.isArray(message.rules)) - return "rules: array expected"; - for (var i = 0; i < message.rules.length; ++i) { - var error = $root.google.api.HttpRule.verify(message.rules[i]); - if (error) - return "rules." + error; - } - } - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - if (typeof message.fullyDecodeReservedExpansion !== "boolean") - return "fullyDecodeReservedExpansion: boolean expected"; + if (message.kind != null && message.hasOwnProperty("kind")) + if (!$util.isString(message.kind)) + return "kind: string expected"; + if (message.path != null && message.hasOwnProperty("path")) + if (!$util.isString(message.path)) + return "path: string expected"; return null; }; /** - * Creates a Http message from a plain object. Also converts values to their respective internal types. + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @static - * @param {Object.} object Plain object - * @returns {google.api.Http} Http - */ - Http.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.Http) - return object; - var message = new $root.google.api.Http(); - if (object.rules) { - if (!Array.isArray(object.rules)) - throw TypeError(".google.api.Http.rules: array expected"); - message.rules = []; - for (var i = 0; i < object.rules.length; ++i) { - if (typeof object.rules[i] !== "object") - throw TypeError(".google.api.Http.rules: object expected"); - message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); - } - } - if (object.fullyDecodeReservedExpansion != null) - message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); + * @param {Object.} object Plain object + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + */ + CustomHttpPattern.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.CustomHttpPattern) + return object; + var message = new $root.google.api.CustomHttpPattern(); + if (object.kind != null) + message.kind = String(object.kind); + if (object.path != null) + message.path = String(object.path); return message; }; /** - * Creates a plain object from a Http message. Also converts values to other types if specified. + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. * @function toObject - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @static - * @param {google.api.Http} message Http + * @param {google.api.CustomHttpPattern} message CustomHttpPattern * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - Http.toObject = function toObject(message, options) { + CustomHttpPattern.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.rules = []; - if (options.defaults) - object.fullyDecodeReservedExpansion = false; - if (message.rules && message.rules.length) { - object.rules = []; - for (var j = 0; j < message.rules.length; ++j) - object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); + if (options.defaults) { + object.kind = ""; + object.path = ""; } - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; + if (message.kind != null && message.hasOwnProperty("kind")) + object.kind = message.kind; + if (message.path != null && message.hasOwnProperty("path")) + object.path = message.path; return object; }; /** - * Converts this Http to JSON. + * Converts this CustomHttpPattern to JSON. * @function toJSON - * @memberof google.api.Http + * @memberof google.api.CustomHttpPattern * @instance * @returns {Object.} JSON object */ - Http.prototype.toJSON = function toJSON() { + CustomHttpPattern.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return Http; + return CustomHttpPattern; })(); - api.HttpRule = (function() { + /** + * FieldBehavior enum. + * @name google.api.FieldBehavior + * @enum {string} + * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value + * @property {number} OPTIONAL=1 OPTIONAL value + * @property {number} REQUIRED=2 REQUIRED value + * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value + * @property {number} INPUT_ONLY=4 INPUT_ONLY value + * @property {number} IMMUTABLE=5 IMMUTABLE value + */ + api.FieldBehavior = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0; + values[valuesById[1] = "OPTIONAL"] = 1; + values[valuesById[2] = "REQUIRED"] = 2; + values[valuesById[3] = "OUTPUT_ONLY"] = 3; + values[valuesById[4] = "INPUT_ONLY"] = 4; + values[valuesById[5] = "IMMUTABLE"] = 5; + return values; + })(); + + api.ResourceDescriptor = (function() { /** - * Properties of a HttpRule. + * Properties of a ResourceDescriptor. * @memberof google.api - * @interface IHttpRule - * @property {string|null} [selector] HttpRule selector - * @property {string|null} [get] HttpRule get - * @property {string|null} [put] HttpRule put - * @property {string|null} [post] HttpRule post - * @property {string|null} ["delete"] HttpRule delete - * @property {string|null} [patch] HttpRule patch - * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom - * @property {string|null} [body] HttpRule body - * @property {string|null} [responseBody] HttpRule responseBody - * @property {Array.|null} [additionalBindings] HttpRule additionalBindings + * @interface IResourceDescriptor + * @property {string|null} [type] ResourceDescriptor type + * @property {Array.|null} [pattern] ResourceDescriptor pattern + * @property {string|null} [nameField] ResourceDescriptor nameField + * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history + * @property {string|null} [plural] ResourceDescriptor plural + * @property {string|null} [singular] ResourceDescriptor singular */ /** - * Constructs a new HttpRule. + * Constructs a new ResourceDescriptor. * @memberof google.api - * @classdesc Represents a HttpRule. - * @implements IHttpRule + * @classdesc Represents a ResourceDescriptor. + * @implements IResourceDescriptor * @constructor - * @param {google.api.IHttpRule=} [properties] Properties to set + * @param {google.api.IResourceDescriptor=} [properties] Properties to set */ - function HttpRule(properties) { - this.additionalBindings = []; + function ResourceDescriptor(properties) { + this.pattern = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -11304,209 +11414,143 @@ } /** - * HttpRule selector. - * @member {string} selector - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.selector = ""; - - /** - * HttpRule get. - * @member {string} get - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.get = ""; - - /** - * HttpRule put. - * @member {string} put - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.put = ""; - - /** - * HttpRule post. - * @member {string} post - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.post = ""; - - /** - * HttpRule delete. - * @member {string} delete - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype["delete"] = ""; - - /** - * HttpRule patch. - * @member {string} patch - * @memberof google.api.HttpRule + * ResourceDescriptor type. + * @member {string} type + * @memberof google.api.ResourceDescriptor * @instance */ - HttpRule.prototype.patch = ""; + ResourceDescriptor.prototype.type = ""; /** - * HttpRule custom. - * @member {google.api.ICustomHttpPattern|null|undefined} custom - * @memberof google.api.HttpRule + * ResourceDescriptor pattern. + * @member {Array.} pattern + * @memberof google.api.ResourceDescriptor * @instance */ - HttpRule.prototype.custom = null; + ResourceDescriptor.prototype.pattern = $util.emptyArray; /** - * HttpRule body. - * @member {string} body - * @memberof google.api.HttpRule + * ResourceDescriptor nameField. + * @member {string} nameField + * @memberof google.api.ResourceDescriptor * @instance */ - HttpRule.prototype.body = ""; + ResourceDescriptor.prototype.nameField = ""; /** - * HttpRule responseBody. - * @member {string} responseBody - * @memberof google.api.HttpRule + * ResourceDescriptor history. + * @member {google.api.ResourceDescriptor.History} history + * @memberof google.api.ResourceDescriptor * @instance */ - HttpRule.prototype.responseBody = ""; + ResourceDescriptor.prototype.history = 0; /** - * HttpRule additionalBindings. - * @member {Array.} additionalBindings - * @memberof google.api.HttpRule + * ResourceDescriptor plural. + * @member {string} plural + * @memberof google.api.ResourceDescriptor * @instance */ - HttpRule.prototype.additionalBindings = $util.emptyArray; - - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + ResourceDescriptor.prototype.plural = ""; /** - * HttpRule pattern. - * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern - * @memberof google.api.HttpRule + * ResourceDescriptor singular. + * @member {string} singular + * @memberof google.api.ResourceDescriptor * @instance */ - Object.defineProperty(HttpRule.prototype, "pattern", { - get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]), - set: $util.oneOfSetter($oneOfFields) - }); + ResourceDescriptor.prototype.singular = ""; /** - * Creates a new HttpRule instance using the specified properties. + * Creates a new ResourceDescriptor instance using the specified properties. * @function create - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @static - * @param {google.api.IHttpRule=} [properties] Properties to set - * @returns {google.api.HttpRule} HttpRule instance + * @param {google.api.IResourceDescriptor=} [properties] Properties to set + * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance */ - HttpRule.create = function create(properties) { - return new HttpRule(properties); + ResourceDescriptor.create = function create(properties) { + return new ResourceDescriptor(properties); }; /** - * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. * @function encode - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @static - * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - HttpRule.encode = function encode(message, writer) { + ResourceDescriptor.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.selector != null && message.hasOwnProperty("selector")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); - if (message.get != null && message.hasOwnProperty("get")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.get); - if (message.put != null && message.hasOwnProperty("put")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.put); - if (message.post != null && message.hasOwnProperty("post")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.post); - if (message["delete"] != null && message.hasOwnProperty("delete")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]); - if (message.patch != null && message.hasOwnProperty("patch")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch); - if (message.body != null && message.hasOwnProperty("body")) - writer.uint32(/* id 7, wireType 2 =*/58).string(message.body); - if (message.custom != null && message.hasOwnProperty("custom")) - $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.additionalBindings != null && message.additionalBindings.length) - for (var i = 0; i < message.additionalBindings.length; ++i) - $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); + if (message.pattern != null && message.pattern.length) + for (var i = 0; i < message.pattern.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]); + if (message.nameField != null && message.hasOwnProperty("nameField")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField); + if (message.history != null && message.hasOwnProperty("history")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history); + if (message.plural != null && message.hasOwnProperty("plural")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); + if (message.singular != null && message.hasOwnProperty("singular")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); return writer; }; /** - * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @static - * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - HttpRule.encodeDelimited = function encodeDelimited(message, writer) { + ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a HttpRule message from the specified reader or buffer. + * Decodes a ResourceDescriptor message from the specified reader or buffer. * @function decode - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.HttpRule} HttpRule + * @returns {google.api.ResourceDescriptor} ResourceDescriptor * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - HttpRule.decode = function decode(reader, length) { + ResourceDescriptor.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.selector = reader.string(); + message.type = reader.string(); break; case 2: - message.get = reader.string(); + if (!(message.pattern && message.pattern.length)) + message.pattern = []; + message.pattern.push(reader.string()); break; case 3: - message.put = reader.string(); + message.nameField = reader.string(); break; case 4: - message.post = reader.string(); + message.history = reader.int32(); break; case 5: - message["delete"] = reader.string(); + message.plural = reader.string(); break; case 6: - message.patch = reader.string(); - break; - case 8: - message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); - break; - case 7: - message.body = reader.string(); - break; - case 12: - message.responseBody = reader.string(); - break; - case 11: - if (!(message.additionalBindings && message.additionalBindings.length)) - message.additionalBindings = []; - message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + message.singular = reader.string(); break; default: reader.skipType(tag & 7); @@ -11517,240 +11561,196 @@ }; /** - * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.HttpRule} HttpRule + * @returns {google.api.ResourceDescriptor} ResourceDescriptor * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - HttpRule.decodeDelimited = function decodeDelimited(reader) { + ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a HttpRule message. + * Verifies a ResourceDescriptor message. * @function verify - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - HttpRule.verify = function verify(message) { + ResourceDescriptor.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - var properties = {}; - if (message.selector != null && message.hasOwnProperty("selector")) - if (!$util.isString(message.selector)) - return "selector: string expected"; - if (message.get != null && message.hasOwnProperty("get")) { - properties.pattern = 1; - if (!$util.isString(message.get)) - return "get: string expected"; - } - if (message.put != null && message.hasOwnProperty("put")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.put)) - return "put: string expected"; - } - if (message.post != null && message.hasOwnProperty("post")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.post)) - return "post: string expected"; - } - if (message["delete"] != null && message.hasOwnProperty("delete")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message["delete"])) - return "delete: string expected"; - } - if (message.patch != null && message.hasOwnProperty("patch")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.patch)) - return "patch: string expected"; - } - if (message.custom != null && message.hasOwnProperty("custom")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - { - var error = $root.google.api.CustomHttpPattern.verify(message.custom); - if (error) - return "custom." + error; - } + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.pattern != null && message.hasOwnProperty("pattern")) { + if (!Array.isArray(message.pattern)) + return "pattern: array expected"; + for (var i = 0; i < message.pattern.length; ++i) + if (!$util.isString(message.pattern[i])) + return "pattern: string[] expected"; } - if (message.body != null && message.hasOwnProperty("body")) - if (!$util.isString(message.body)) - return "body: string expected"; - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - if (!$util.isString(message.responseBody)) - return "responseBody: string expected"; - if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { - if (!Array.isArray(message.additionalBindings)) - return "additionalBindings: array expected"; - for (var i = 0; i < message.additionalBindings.length; ++i) { - var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]); - if (error) - return "additionalBindings." + error; + if (message.nameField != null && message.hasOwnProperty("nameField")) + if (!$util.isString(message.nameField)) + return "nameField: string expected"; + if (message.history != null && message.hasOwnProperty("history")) + switch (message.history) { + default: + return "history: enum value expected"; + case 0: + case 1: + case 2: + break; } - } + if (message.plural != null && message.hasOwnProperty("plural")) + if (!$util.isString(message.plural)) + return "plural: string expected"; + if (message.singular != null && message.hasOwnProperty("singular")) + if (!$util.isString(message.singular)) + return "singular: string expected"; return null; }; /** - * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @static * @param {Object.} object Plain object - * @returns {google.api.HttpRule} HttpRule + * @returns {google.api.ResourceDescriptor} ResourceDescriptor */ - HttpRule.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.HttpRule) + ResourceDescriptor.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ResourceDescriptor) return object; - var message = new $root.google.api.HttpRule(); - if (object.selector != null) - message.selector = String(object.selector); - if (object.get != null) - message.get = String(object.get); - if (object.put != null) - message.put = String(object.put); - if (object.post != null) - message.post = String(object.post); - if (object["delete"] != null) - message["delete"] = String(object["delete"]); - if (object.patch != null) - message.patch = String(object.patch); - if (object.custom != null) { - if (typeof object.custom !== "object") - throw TypeError(".google.api.HttpRule.custom: object expected"); - message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom); + var message = new $root.google.api.ResourceDescriptor(); + if (object.type != null) + message.type = String(object.type); + if (object.pattern) { + if (!Array.isArray(object.pattern)) + throw TypeError(".google.api.ResourceDescriptor.pattern: array expected"); + message.pattern = []; + for (var i = 0; i < object.pattern.length; ++i) + message.pattern[i] = String(object.pattern[i]); } - if (object.body != null) - message.body = String(object.body); - if (object.responseBody != null) - message.responseBody = String(object.responseBody); - if (object.additionalBindings) { - if (!Array.isArray(object.additionalBindings)) - throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); - message.additionalBindings = []; - for (var i = 0; i < object.additionalBindings.length; ++i) { - if (typeof object.additionalBindings[i] !== "object") - throw TypeError(".google.api.HttpRule.additionalBindings: object expected"); - message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]); - } + if (object.nameField != null) + message.nameField = String(object.nameField); + switch (object.history) { + case "HISTORY_UNSPECIFIED": + case 0: + message.history = 0; + break; + case "ORIGINALLY_SINGLE_PATTERN": + case 1: + message.history = 1; + break; + case "FUTURE_MULTI_PATTERN": + case 2: + message.history = 2; + break; } + if (object.plural != null) + message.plural = String(object.plural); + if (object.singular != null) + message.singular = String(object.singular); return message; }; /** - * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. * @function toObject - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @static - * @param {google.api.HttpRule} message HttpRule + * @param {google.api.ResourceDescriptor} message ResourceDescriptor * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - HttpRule.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.additionalBindings = []; - if (options.defaults) { - object.selector = ""; - object.body = ""; - object.responseBody = ""; - } - if (message.selector != null && message.hasOwnProperty("selector")) - object.selector = message.selector; - if (message.get != null && message.hasOwnProperty("get")) { - object.get = message.get; - if (options.oneofs) - object.pattern = "get"; - } - if (message.put != null && message.hasOwnProperty("put")) { - object.put = message.put; - if (options.oneofs) - object.pattern = "put"; - } - if (message.post != null && message.hasOwnProperty("post")) { - object.post = message.post; - if (options.oneofs) - object.pattern = "post"; - } - if (message["delete"] != null && message.hasOwnProperty("delete")) { - object["delete"] = message["delete"]; - if (options.oneofs) - object.pattern = "delete"; - } - if (message.patch != null && message.hasOwnProperty("patch")) { - object.patch = message.patch; - if (options.oneofs) - object.pattern = "patch"; - } - if (message.body != null && message.hasOwnProperty("body")) - object.body = message.body; - if (message.custom != null && message.hasOwnProperty("custom")) { - object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options); - if (options.oneofs) - object.pattern = "custom"; + ResourceDescriptor.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.pattern = []; + if (options.defaults) { + object.type = ""; + object.nameField = ""; + object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0; + object.plural = ""; + object.singular = ""; } - if (message.additionalBindings && message.additionalBindings.length) { - object.additionalBindings = []; - for (var j = 0; j < message.additionalBindings.length; ++j) - object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.pattern && message.pattern.length) { + object.pattern = []; + for (var j = 0; j < message.pattern.length; ++j) + object.pattern[j] = message.pattern[j]; } - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - object.responseBody = message.responseBody; + if (message.nameField != null && message.hasOwnProperty("nameField")) + object.nameField = message.nameField; + if (message.history != null && message.hasOwnProperty("history")) + object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history; + if (message.plural != null && message.hasOwnProperty("plural")) + object.plural = message.plural; + if (message.singular != null && message.hasOwnProperty("singular")) + object.singular = message.singular; return object; }; /** - * Converts this HttpRule to JSON. + * Converts this ResourceDescriptor to JSON. * @function toJSON - * @memberof google.api.HttpRule + * @memberof google.api.ResourceDescriptor * @instance * @returns {Object.} JSON object */ - HttpRule.prototype.toJSON = function toJSON() { + ResourceDescriptor.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return HttpRule; + /** + * History enum. + * @name google.api.ResourceDescriptor.History + * @enum {string} + * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value + * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value + * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value + */ + ResourceDescriptor.History = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0; + values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1; + values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2; + return values; + })(); + + return ResourceDescriptor; })(); - api.CustomHttpPattern = (function() { + api.ResourceReference = (function() { /** - * Properties of a CustomHttpPattern. + * Properties of a ResourceReference. * @memberof google.api - * @interface ICustomHttpPattern - * @property {string|null} [kind] CustomHttpPattern kind - * @property {string|null} [path] CustomHttpPattern path + * @interface IResourceReference + * @property {string|null} [type] ResourceReference type + * @property {string|null} [childType] ResourceReference childType */ /** - * Constructs a new CustomHttpPattern. + * Constructs a new ResourceReference. * @memberof google.api - * @classdesc Represents a CustomHttpPattern. - * @implements ICustomHttpPattern + * @classdesc Represents a ResourceReference. + * @implements IResourceReference * @constructor - * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + * @param {google.api.IResourceReference=} [properties] Properties to set */ - function CustomHttpPattern(properties) { + function ResourceReference(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -11758,88 +11758,88 @@ } /** - * CustomHttpPattern kind. - * @member {string} kind - * @memberof google.api.CustomHttpPattern + * ResourceReference type. + * @member {string} type + * @memberof google.api.ResourceReference * @instance */ - CustomHttpPattern.prototype.kind = ""; + ResourceReference.prototype.type = ""; /** - * CustomHttpPattern path. - * @member {string} path - * @memberof google.api.CustomHttpPattern + * ResourceReference childType. + * @member {string} childType + * @memberof google.api.ResourceReference * @instance */ - CustomHttpPattern.prototype.path = ""; + ResourceReference.prototype.childType = ""; /** - * Creates a new CustomHttpPattern instance using the specified properties. + * Creates a new ResourceReference instance using the specified properties. * @function create - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @static - * @param {google.api.ICustomHttpPattern=} [properties] Properties to set - * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance + * @param {google.api.IResourceReference=} [properties] Properties to set + * @returns {google.api.ResourceReference} ResourceReference instance */ - CustomHttpPattern.create = function create(properties) { - return new CustomHttpPattern(properties); + ResourceReference.create = function create(properties) { + return new ResourceReference(properties); }; /** - * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. * @function encode - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @static - * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - CustomHttpPattern.encode = function encode(message, writer) { + ResourceReference.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.kind != null && message.hasOwnProperty("kind")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind); - if (message.path != null && message.hasOwnProperty("path")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.path); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); + if (message.childType != null && message.hasOwnProperty("childType")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType); return writer; }; /** - * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @static - * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) { + ResourceReference.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a CustomHttpPattern message from the specified reader or buffer. + * Decodes a ResourceReference message from the specified reader or buffer. * @function decode - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @returns {google.api.ResourceReference} ResourceReference * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CustomHttpPattern.decode = function decode(reader, length) { + ResourceReference.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.kind = reader.string(); + message.type = reader.string(); break; case 2: - message.path = reader.string(); + message.childType = reader.string(); break; default: reader.skipType(tag & 7); @@ -11850,96 +11850,96 @@ }; /** - * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * Decodes a ResourceReference message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @returns {google.api.ResourceReference} ResourceReference * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) { + ResourceReference.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a CustomHttpPattern message. + * Verifies a ResourceReference message. * @function verify - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - CustomHttpPattern.verify = function verify(message) { + ResourceReference.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.kind != null && message.hasOwnProperty("kind")) - if (!$util.isString(message.kind)) - return "kind: string expected"; - if (message.path != null && message.hasOwnProperty("path")) - if (!$util.isString(message.path)) - return "path: string expected"; + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.childType != null && message.hasOwnProperty("childType")) + if (!$util.isString(message.childType)) + return "childType: string expected"; return null; }; /** - * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @static * @param {Object.} object Plain object - * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @returns {google.api.ResourceReference} ResourceReference */ - CustomHttpPattern.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.CustomHttpPattern) + ResourceReference.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ResourceReference) return object; - var message = new $root.google.api.CustomHttpPattern(); - if (object.kind != null) - message.kind = String(object.kind); - if (object.path != null) - message.path = String(object.path); + var message = new $root.google.api.ResourceReference(); + if (object.type != null) + message.type = String(object.type); + if (object.childType != null) + message.childType = String(object.childType); return message; }; /** - * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. * @function toObject - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @static - * @param {google.api.CustomHttpPattern} message CustomHttpPattern + * @param {google.api.ResourceReference} message ResourceReference * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - CustomHttpPattern.toObject = function toObject(message, options) { + ResourceReference.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.kind = ""; - object.path = ""; + object.type = ""; + object.childType = ""; } - if (message.kind != null && message.hasOwnProperty("kind")) - object.kind = message.kind; - if (message.path != null && message.hasOwnProperty("path")) - object.path = message.path; + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.childType != null && message.hasOwnProperty("childType")) + object.childType = message.childType; return object; }; /** - * Converts this CustomHttpPattern to JSON. + * Converts this ResourceReference to JSON. * @function toJSON - * @memberof google.api.CustomHttpPattern + * @memberof google.api.ResourceReference * @instance * @returns {Object.} JSON object */ - CustomHttpPattern.prototype.toJSON = function toJSON() { + ResourceReference.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return CustomHttpPattern; + return ResourceReference; })(); return api; @@ -18636,8 +18636,8 @@ * @property {boolean|null} [deprecated] MethodOptions deprecated * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel * @property {Array.|null} [uninterpretedOption] MethodOptions uninterpretedOption - * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http + * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature */ /** @@ -18682,20 +18682,20 @@ MethodOptions.prototype.uninterpretedOption = $util.emptyArray; /** - * MethodOptions .google.api.methodSignature. - * @member {Array.} .google.api.methodSignature + * MethodOptions .google.api.http. + * @member {google.api.IHttpRule|null|undefined} .google.api.http * @memberof google.protobuf.MethodOptions * @instance */ - MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; + MethodOptions.prototype[".google.api.http"] = null; /** - * MethodOptions .google.api.http. - * @member {google.api.IHttpRule|null|undefined} .google.api.http + * MethodOptions .google.api.methodSignature. + * @member {Array.} .google.api.methodSignature * @memberof google.protobuf.MethodOptions * @instance */ - MethodOptions.prototype[".google.api.http"] = null; + MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; /** * Creates a new MethodOptions instance using the specified properties. @@ -18778,14 +18778,14 @@ message.uninterpretedOption = []; message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); break; + case 72295728: + message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); + break; case 1051: if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) message[".google.api.methodSignature"] = []; message[".google.api.methodSignature"].push(reader.string()); break; - case 72295728: - message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); - break; default: reader.skipType(tag & 7); break; @@ -18842,6 +18842,11 @@ return "uninterpretedOption." + error; } } + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { + var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); + if (error) + return ".google.api.http." + error; + } if (message[".google.api.methodSignature"] != null && message.hasOwnProperty(".google.api.methodSignature")) { if (!Array.isArray(message[".google.api.methodSignature"])) return ".google.api.methodSignature: array expected"; @@ -18849,11 +18854,6 @@ if (!$util.isString(message[".google.api.methodSignature"][i])) return ".google.api.methodSignature: string[] expected"; } - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { - var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); - if (error) - return ".google.api.http." + error; - } return null; }; @@ -18895,6 +18895,11 @@ message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } } + if (object[".google.api.http"] != null) { + if (typeof object[".google.api.http"] !== "object") + throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); + message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); + } if (object[".google.api.methodSignature"]) { if (!Array.isArray(object[".google.api.methodSignature"])) throw TypeError(".google.protobuf.MethodOptions..google.api.methodSignature: array expected"); @@ -18902,11 +18907,6 @@ for (var i = 0; i < object[".google.api.methodSignature"].length; ++i) message[".google.api.methodSignature"][i] = String(object[".google.api.methodSignature"][i]); } - if (object[".google.api.http"] != null) { - if (typeof object[".google.api.http"] !== "object") - throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); - message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); - } return message; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index e37dfffc062..a42e19cd02b 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -76,7 +76,8 @@ "requestType": "ListTopicSnapshotsRequest", "responseType": "ListTopicSnapshotsResponse", "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/snapshots" + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/snapshots", + "(google.api.method_signature)": "topic" } }, "DeleteTopic": { @@ -283,7 +284,11 @@ "fields": { "topic": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } }, "pageSize": { "type": "int32", @@ -413,7 +418,8 @@ "requestType": "GetSnapshotRequest", "responseType": "Snapshot", "options": { - "(google.api.http).get": "/v1/{snapshot=projects/*/snapshots/*}" + "(google.api.http).get": "/v1/{snapshot=projects/*/snapshots/*}", + "(google.api.method_signature)": "snapshot" } }, "ListSnapshots": { @@ -695,7 +701,11 @@ }, "returnImmediately": { "type": "bool", - "id": 2 + "id": 2, + "options": { + "deprecated": true, + "(google.api.field_behavior)": "OPTIONAL" + } }, "maxMessages": { "type": "int32", @@ -979,12 +989,99 @@ "options": { "go_package": "google.golang.org/genproto/googleapis/api/annotations;annotations", "java_multiple_files": true, - "java_outer_classname": "HttpProto", + "java_outer_classname": "ResourceProto", "java_package": "com.google.api", "objc_class_prefix": "GAPI", "cc_enable_arenas": true }, "nested": { + "http": { + "type": "HttpRule", + "id": 72295728, + "extend": "google.protobuf.MethodOptions" + }, + "Http": { + "fields": { + "rules": { + "rule": "repeated", + "type": "HttpRule", + "id": 1 + }, + "fullyDecodeReservedExpansion": { + "type": "bool", + "id": 2 + } + } + }, + "HttpRule": { + "oneofs": { + "pattern": { + "oneof": [ + "get", + "put", + "post", + "delete", + "patch", + "custom" + ] + } + }, + "fields": { + "selector": { + "type": "string", + "id": 1 + }, + "get": { + "type": "string", + "id": 2 + }, + "put": { + "type": "string", + "id": 3 + }, + "post": { + "type": "string", + "id": 4 + }, + "delete": { + "type": "string", + "id": 5 + }, + "patch": { + "type": "string", + "id": 6 + }, + "custom": { + "type": "CustomHttpPattern", + "id": 8 + }, + "body": { + "type": "string", + "id": 7 + }, + "responseBody": { + "type": "string", + "id": 12 + }, + "additionalBindings": { + "rule": "repeated", + "type": "HttpRule", + "id": 11 + } + } + }, + "CustomHttpPattern": { + "fields": { + "kind": { + "type": "string", + "id": 1 + }, + "path": { + "type": "string", + "id": 2 + } + } + }, "methodSignature": { "rule": "repeated", "type": "string", @@ -1082,93 +1179,6 @@ "id": 2 } } - }, - "http": { - "type": "HttpRule", - "id": 72295728, - "extend": "google.protobuf.MethodOptions" - }, - "Http": { - "fields": { - "rules": { - "rule": "repeated", - "type": "HttpRule", - "id": 1 - }, - "fullyDecodeReservedExpansion": { - "type": "bool", - "id": 2 - } - } - }, - "HttpRule": { - "oneofs": { - "pattern": { - "oneof": [ - "get", - "put", - "post", - "delete", - "patch", - "custom" - ] - } - }, - "fields": { - "selector": { - "type": "string", - "id": 1 - }, - "get": { - "type": "string", - "id": 2 - }, - "put": { - "type": "string", - "id": 3 - }, - "post": { - "type": "string", - "id": 4 - }, - "delete": { - "type": "string", - "id": 5 - }, - "patch": { - "type": "string", - "id": 6 - }, - "custom": { - "type": "CustomHttpPattern", - "id": 8 - }, - "body": { - "type": "string", - "id": 7 - }, - "responseBody": { - "type": "string", - "id": 12 - }, - "additionalBindings": { - "rule": "repeated", - "type": "HttpRule", - "id": 11 - } - } - }, - "CustomHttpPattern": { - "fields": { - "kind": { - "type": "string", - "id": 1 - }, - "path": { - "type": "string", - "id": 2 - } - } } } }, diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js index b1cd27b3f46..ff7d0345b06 100644 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js @@ -141,8 +141,8 @@ const GetTopicRequest = { * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} * * @property {Object} updateMask - * Required. Indicates which fields in the provided topic to update. Must be specified - * and non-empty. Note that if `update_mask` contains + * Required. Indicates which fields in the provided topic to update. Must be + * specified and non-empty. Note that if `update_mask` contains * "message_storage_policy" then the new value will be determined based on the * policy configured at the project or organization level. The * `message_storage_policy` must not be set in the `topic` provided above. @@ -282,7 +282,7 @@ const ListTopicSubscriptionsResponse = { * Request for the `ListTopicSnapshots` method. * * @property {string} topic - * The name of the topic that snapshots are attached to. + * Required. The name of the topic that snapshots are attached to. * Format is `projects/{project}/topics/{topic}`. * * @property {number} pageSize @@ -347,10 +347,9 @@ const DeleteTopicRequest = { * in length, and it must not start with `"goog"`. * * @property {string} topic - * Required. The name of the topic from which this subscription is receiving messages. - * Format is `projects/{project}/topics/{topic}`. - * The value of this field will be `_deleted-topic_` if the topic has been - * deleted. + * Required. The name of the topic from which this subscription is receiving + * messages. Format is `projects/{project}/topics/{topic}`. The value of this + * field will be `_deleted-topic_` if the topic has been deleted. * * @property {Object} pushConfig * If push delivery is used with this subscription, this field is @@ -747,14 +746,17 @@ const ModifyPushConfigRequest = { * Format is `projects/{project}/subscriptions/{sub}`. * * @property {boolean} returnImmediately - * If this field set to true, the system will respond immediately even if - * it there are no messages available to return in the `Pull` response. - * Otherwise, the system may wait (for a bounded amount of time) until at - * least one message is available, rather than returning no messages. + * Optional. If this field set to true, the system will respond immediately + * even if it there are no messages available to return in the `Pull` + * response. Otherwise, the system may wait (for a bounded amount of time) + * until at least one message is available, rather than returning no messages. + * Warning: setting this field to `true` is discouraged because it adversely + * impacts the performance of `Pull` operations. We recommend that users do + * not set this field. * * @property {number} maxMessages - * Required. The maximum number of messages to return for this request. Must be a - * positive integer. The Pub/Sub system may return fewer than the number + * Required. The maximum number of messages to return for this request. Must + * be a positive integer. The Pub/Sub system may return fewer than the number * specified. * * @typedef PullRequest @@ -795,10 +797,10 @@ const PullResponse = { * Required. List of acknowledgment IDs. * * @property {number} ackDeadlineSeconds - * Required. The new ack deadline with respect to the time this request was sent to - * the Pub/Sub system. For example, if the value is 10, the new - * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call - * was made. Specifying zero might immediately make the message available for + * Required. The new ack deadline with respect to the time this request was + * sent to the Pub/Sub system. For example, if the value is 10, the new ack + * deadline will expire 10 seconds after the `ModifyAckDeadline` call was + * made. Specifying zero might immediately make the message available for * delivery to another subscriber client. This typically results in an * increase in the rate of message redeliveries (that is, duplicates). * The minimum deadline you can specify is 0 seconds. @@ -820,8 +822,9 @@ const ModifyAckDeadlineRequest = { * Format is `projects/{project}/subscriptions/{sub}`. * * @property {string[]} ackIds - * Required. The acknowledgment ID for the messages being acknowledged that was returned - * by the Pub/Sub system in the `Pull` response. Must not be empty. + * Required. The acknowledgment ID for the messages being acknowledged that + * was returned by the Pub/Sub system in the `Pull` response. Must not be + * empty. * * @typedef AcknowledgeRequest * @memberof google.pubsub.v1 @@ -837,8 +840,8 @@ const AcknowledgeRequest = { * deadline modifications from the client to the server. * * @property {string} subscription - * Required. The subscription for which to initialize the new stream. This must be - * provided in the first request on the stream, and must not be set in + * Required. The subscription for which to initialize the new stream. This + * must be provided in the first request on the stream, and must not be set in * subsequent requests from client to server. * Format is `projects/{project}/subscriptions/{sub}`. * @@ -870,8 +873,8 @@ const AcknowledgeRequest = { * processing was interrupted. * * @property {number} streamAckDeadlineSeconds - * Required. The ack deadline to use for the stream. This must be provided in the - * first request on the stream, but it can also be updated on subsequent + * Required. The ack deadline to use for the stream. This must be provided in + * the first request on the stream, but it can also be updated on subsequent * requests from client to server. The minimum deadline you can specify is 10 * seconds. The maximum deadline you can specify is 600 seconds (10 minutes). * @@ -912,10 +915,10 @@ const StreamingPullResponse = { * Request for the `CreateSnapshot` method. * * @property {string} name - * Required. User-provided name for this snapshot. If the name is not provided in the - * request, the server will assign a random name for this snapshot on the same - * project as the subscription. Note that for REST API requests, you must - * specify a name. See the resource * name rules. Format is `projects/{project}/snapshots/{snap}`. * diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index 9beb2089233..a92b304faf2 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -381,8 +381,8 @@ class PublisherClient { * * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} * @param {Object} request.updateMask - * Required. Indicates which fields in the provided topic to update. Must be specified - * and non-empty. Note that if `update_mask` contains + * Required. Indicates which fields in the provided topic to update. Must be + * specified and non-empty. Note that if `update_mask` contains * "message_storage_policy" then the new value will be determined based on the * policy configured at the project or organization level. The * `message_storage_policy` must not be set in the `topic` provided above. diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js index b75a1e25d05..9fe4a89d84c 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ b/handwritten/pubsub/src/v1/subscriber_client.js @@ -337,10 +337,9 @@ class SubscriberClient { * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters * in length, and it must not start with `"goog"`. * @param {string} request.topic - * Required. The name of the topic from which this subscription is receiving messages. - * Format is `projects/{project}/topics/{topic}`. - * The value of this field will be `_deleted-topic_` if the topic has been - * deleted. + * Required. The name of the topic from which this subscription is receiving + * messages. Format is `projects/{project}/topics/{topic}`. The value of this + * field will be `_deleted-topic_` if the topic has been deleted. * @param {Object} [request.pushConfig] * If push delivery is used with this subscription, this field is * used to configure it. An empty `pushConfig` signifies that the subscriber @@ -825,10 +824,10 @@ class SubscriberClient { * @param {string[]} request.ackIds * Required. List of acknowledgment IDs. * @param {number} request.ackDeadlineSeconds - * Required. The new ack deadline with respect to the time this request was sent to - * the Pub/Sub system. For example, if the value is 10, the new - * ack deadline will expire 10 seconds after the `ModifyAckDeadline` call - * was made. Specifying zero might immediately make the message available for + * Required. The new ack deadline with respect to the time this request was + * sent to the Pub/Sub system. For example, if the value is 10, the new ack + * deadline will expire 10 seconds after the `ModifyAckDeadline` call was + * made. Specifying zero might immediately make the message available for * delivery to another subscriber client. This typically results in an * increase in the rate of message redeliveries (that is, duplicates). * The minimum deadline you can specify is 0 seconds. @@ -894,8 +893,9 @@ class SubscriberClient { * Required. The subscription whose message is being acknowledged. * Format is `projects/{project}/subscriptions/{sub}`. * @param {string[]} request.ackIds - * Required. The acknowledgment ID for the messages being acknowledged that was returned - * by the Pub/Sub system in the `Pull` response. Must not be empty. + * Required. The acknowledgment ID for the messages being acknowledged that + * was returned by the Pub/Sub system in the `Pull` response. Must not be + * empty. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. @@ -951,14 +951,17 @@ class SubscriberClient { * Required. The subscription from which messages should be pulled. * Format is `projects/{project}/subscriptions/{sub}`. * @param {number} request.maxMessages - * Required. The maximum number of messages to return for this request. Must be a - * positive integer. The Pub/Sub system may return fewer than the number + * Required. The maximum number of messages to return for this request. Must + * be a positive integer. The Pub/Sub system may return fewer than the number * specified. * @param {boolean} [request.returnImmediately] - * If this field set to true, the system will respond immediately even if - * it there are no messages available to return in the `Pull` response. - * Otherwise, the system may wait (for a bounded amount of time) until at - * least one message is available, rather than returning no messages. + * Optional. If this field set to true, the system will respond immediately + * even if it there are no messages available to return in the `Pull` + * response. Otherwise, the system may wait (for a bounded amount of time) + * until at least one message is available, rather than returning no messages. + * Warning: setting this field to `true` is discouraged because it adversely + * impacts the performance of `Pull` operations. We recommend that users do + * not set this field. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. @@ -1307,10 +1310,10 @@ class SubscriberClient { * @param {Object} request * The request object that will be sent. * @param {string} request.name - * Required. User-provided name for this snapshot. If the name is not provided in the - * request, the server will assign a random name for this snapshot on the same - * project as the subscription. Note that for REST API requests, you must - * specify a name. See the resource * name rules. Format is `projects/{project}/snapshots/{snap}`. * @param {string} request.subscription diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 1f49494c9b9..aed09da1373 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,20 +1,20 @@ { - "updateTime": "2020-02-29T12:36:40.247233Z", + "updateTime": "2020-03-05T12:33:04.202496Z", "sources": [ { "generator": { "name": "artman", - "version": "0.47.0", - "dockerImage": "googleapis/artman@sha256:b3e50d6b8de03920b9f065bbc3d210e2ca93a043446f1fa16cdf567393c09678" + "version": "1.0.0", + "dockerImage": "googleapis/artman@sha256:f37f2464788cb551299209b4fcab4eb323533154488c2ef9ec0c75d7c2b4b482" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "83c6f84035ee0f80eaa44d8b688a010461cc4080", - "internalRef": "297918498", - "log": "83c6f84035ee0f80eaa44d8b688a010461cc4080\nUpdate google/api/auth.proto to make AuthProvider to have JwtLocation\n\nPiperOrigin-RevId: 297918498\n\ne9e90a787703ec5d388902e2cb796aaed3a385b4\nDialogflow weekly v2/v2beta1 library update:\n - adding get validation result\n - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297671458\n\n1a2b05cc3541a5f7714529c665aecc3ea042c646\nAdding .yaml and .json config files.\n\nPiperOrigin-RevId: 297570622\n\ndfe1cf7be44dee31d78f78e485d8c95430981d6e\nPublish `QueryOptions` proto.\n\nIntroduced a `query_options` input in `ExecuteSqlRequest`.\n\nPiperOrigin-RevId: 297497710\n\ndafc905f71e5d46f500b41ed715aad585be062c3\npubsub: revert pull init_rpc_timeout & max_rpc_timeout back to 25 seconds and reset multiplier to 1.0\n\nPiperOrigin-RevId: 297486523\n\nf077632ba7fee588922d9e8717ee272039be126d\nfirestore: add update_transform\n\nPiperOrigin-RevId: 297405063\n\n0aba1900ffef672ec5f0da677cf590ee5686e13b\ncluster: use square brace for cross-reference\n\nPiperOrigin-RevId: 297204568\n\n5dac2da18f6325cbaed54603c43f0667ecd50247\nRestore retry params in gapic config because securitycenter has non-standard default retry params.\nRestore a few retry codes for some idempotent methods.\n\nPiperOrigin-RevId: 297196720\n\n1eb61455530252bba8b2c8d4bc9832960e5a56f6\npubsub: v1 replace IAM HTTP rules\n\nPiperOrigin-RevId: 297188590\n\n80b2d25f8d43d9d47024ff06ead7f7166548a7ba\nDialogflow weekly v2/v2beta1 library update:\n - updates to mega agent api\n - adding field mask override control for output audio config\nImportant updates are also posted at:\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 297187629\n\n0b1876b35e98f560f9c9ca9797955f020238a092\nUse an older version of protoc-docs-plugin that is compatible with the specified gapic-generator and protobuf versions.\n\nprotoc-docs-plugin >=0.4.0 (see commit https://github.com/googleapis/protoc-docs-plugin/commit/979f03ede6678c487337f3d7e88bae58df5207af) is incompatible with protobuf 3.9.1.\n\nPiperOrigin-RevId: 296986742\n\n1e47e676cddbbd8d93f19ba0665af15b5532417e\nFix: Restore a method signature for UpdateCluster\n\nPiperOrigin-RevId: 296901854\n\n7f910bcc4fc4704947ccfd3ceed015d16b9e00c2\nUpdate Dataproc v1beta2 client.\n\nPiperOrigin-RevId: 296451205\n\nde287524405a3dce124d301634731584fc0432d7\nFix: Reinstate method signatures that had been missed off some RPCs\nFix: Correct resource types for two fields\n\nPiperOrigin-RevId: 296435091\n\ne5bc9566ae057fb4c92f8b7e047f1c8958235b53\nDeprecate the endpoint_uris field, as it is unused.\n\nPiperOrigin-RevId: 296357191\n\n8c12e2b4dca94e12bff9f538bdac29524ff7ef7a\nUpdate Dataproc v1 client.\n\nPiperOrigin-RevId: 296336662\n\n17567c4a1ef0a9b50faa87024d66f8acbb561089\nRemoving erroneous comment, a la https://github.com/googleapis/java-speech/pull/103\n\nPiperOrigin-RevId: 296332968\n\n3eaaaf8626ce5b0c0bc7eee05e143beffa373b01\nAdd BUILD.bazel for v1 secretmanager.googleapis.com\n\nPiperOrigin-RevId: 296274723\n\ne76149c3d992337f85eeb45643106aacae7ede82\nMove securitycenter v1 to use generate from annotations.\n\nPiperOrigin-RevId: 296266862\n\n203740c78ac69ee07c3bf6be7408048751f618f8\nAdd StackdriverLoggingConfig field to Cloud Tasks v2 API.\n\nPiperOrigin-RevId: 296256388\n\ne4117d5e9ed8bbca28da4a60a94947ca51cb2083\nCreate a Bazel BUILD file for the google.actions.type export.\n\nPiperOrigin-RevId: 296212567\n\na9639a0a9854fd6e1be08bba1ac3897f4f16cb2f\nAdd secretmanager.googleapis.com v1 protos\n\nPiperOrigin-RevId: 295983266\n\nce4f4c21d9dd2bfab18873a80449b9d9851efde8\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295861722\n\ncb61d6c2d070b589980c779b68ffca617f789116\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295855449\n\nab2685d8d3a0e191dc8aef83df36773c07cb3d06\nfix: Dataproc v1 - AutoscalingPolicy annotation\n\nThis adds the second resource name pattern to the\nAutoscalingPolicy resource.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 295738415\n\n8a1020bf6828f6e3c84c3014f2c51cb62b739140\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295286165\n\n5cfa105206e77670369e4b2225597386aba32985\nAdd service control related proto build rule.\n\nPiperOrigin-RevId: 295262088\n\nee4dddf805072004ab19ac94df2ce669046eec26\nmonitoring v3: Add prefix \"https://cloud.google.com/\" into the link for global access\ncl 295167522, get ride of synth.py hacks\n\nPiperOrigin-RevId: 295238095\n\nd9835e922ea79eed8497db270d2f9f85099a519c\nUpdate some minor docs changes about user event proto\n\nPiperOrigin-RevId: 295185610\n\n5f311e416e69c170243de722023b22f3df89ec1c\nfix: use correct PHP package name in gapic configuration\n\nPiperOrigin-RevId: 295161330\n\n6cdd74dcdb071694da6a6b5a206e3a320b62dd11\npubsub: v1 add client config annotations and retry config\n\nPiperOrigin-RevId: 295158776\n\n5169f46d9f792e2934d9fa25c36d0515b4fd0024\nAdded cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295026522\n\n56b55aa8818cd0a532a7d779f6ef337ba809ccbd\nFix: Resource annotations for CreateTimeSeriesRequest and ListTimeSeriesRequest should refer to valid resources. TimeSeries is not a named resource.\n\nPiperOrigin-RevId: 294931650\n\n0646bc775203077226c2c34d3e4d50cc4ec53660\nRemove unnecessary languages from bigquery-related artman configuration files.\n\nPiperOrigin-RevId: 294809380\n\n8b78aa04382e3d4147112ad6d344666771bb1909\nUpdate backend.proto for schemes and protocol\n\nPiperOrigin-RevId: 294788800\n\n80b8f8b3de2359831295e24e5238641a38d8488f\nAdds artman config files for bigquerystorage endpoints v1beta2, v1alpha2, v1\n\nPiperOrigin-RevId: 294763931\n\n2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\nd5e8a8953f2acdfe96fb15e85eb2f33739623957\nMove bigquery datatransfer to gapic v2.\n\nPiperOrigin-RevId: 294703703\n\nefd36705972cfcd7d00ab4c6dfa1135bafacd4ae\nfix: Add two annotations that we missed.\n\nPiperOrigin-RevId: 294664231\n\n8a36b928873ff9c05b43859b9d4ea14cd205df57\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1beta2).\n\nPiperOrigin-RevId: 294459768\n\nc7a3caa2c40c49f034a3c11079dd90eb24987047\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1).\n\nPiperOrigin-RevId: 294456889\n\n5006247aa157e59118833658084345ee59af7c09\nFix: Make deprecated fields optional\nFix: Deprecate SetLoggingServiceRequest.zone in line with the comments\nFeature: Add resource name method signatures where appropriate\n\nPiperOrigin-RevId: 294383128\n\neabba40dac05c5cbe0fca3a35761b17e372036c4\nFix: C# and PHP package/namespace capitalization for BigQuery Storage v1.\n\nPiperOrigin-RevId: 294382444\n\nf8d9a858a7a55eba8009a23aa3f5cc5fe5e88dde\nfix: artman configuration file for bigtable-admin\n\nPiperOrigin-RevId: 294322616\n\n0f29555d1cfcf96add5c0b16b089235afbe9b1a9\nAPI definition for (not-yet-launched) GCS gRPC.\n\nPiperOrigin-RevId: 294321472\n\nfcc86bee0e84dc11e9abbff8d7c3529c0626f390\nfix: Bigtable Admin v2\n\nChange LRO metadata from PartialUpdateInstanceMetadata\nto UpdateInstanceMetadata. (Otherwise, it will not build.)\n\nPiperOrigin-RevId: 294264582\n\n6d9361eae2ebb3f42d8c7ce5baf4bab966fee7c0\nrefactor: Add annotations to Bigtable Admin v2.\n\nPiperOrigin-RevId: 294243406\n\nad7616f3fc8e123451c8b3a7987bc91cea9e6913\nFix: Resource type in CreateLogMetricRequest should use logging.googleapis.com.\nFix: ListLogEntries should have a method signature for convenience of calling it.\n\nPiperOrigin-RevId: 294222165\n\n63796fcbb08712676069e20a3e455c9f7aa21026\nFix: Remove extraneous resource definition for cloudkms.googleapis.com/CryptoKey.\n\nPiperOrigin-RevId: 294176658\n\ne7d8a694f4559201e6913f6610069cb08b39274e\nDepend on the latest gapic-generator and resource names plugin.\n\nThis fixes the very old an very annoying bug: https://github.com/googleapis/gapic-generator/pull/3087\n\nPiperOrigin-RevId: 293903652\n\n806b2854a966d55374ee26bb0cef4e30eda17b58\nfix: correct capitalization of Ruby namespaces in SecurityCenter V1p1beta1\n\nPiperOrigin-RevId: 293903613\n\n1b83c92462b14d67a7644e2980f723112472e03a\nPublish annotations and grpc service config for Logging API.\n\nPiperOrigin-RevId: 293893514\n\ne46f761cd6ec15a9e3d5ed4ff321a4bcba8e8585\nGenerate the Bazel build file for recommendengine public api\n\nPiperOrigin-RevId: 293710856\n\n68477017c4173c98addac0373950c6aa9d7b375f\nMake `language_code` optional for UpdateIntentRequest and BatchUpdateIntentsRequest.\n\nThe comments and proto annotations describe this parameter as optional.\n\nPiperOrigin-RevId: 293703548\n\n16f823f578bca4e845a19b88bb9bc5870ea71ab2\nAdd BUILD.bazel files for managedidentities API\n\nPiperOrigin-RevId: 293698246\n\n2f53fd8178c9a9de4ad10fae8dd17a7ba36133f2\nAdd v1p1beta1 config file\n\nPiperOrigin-RevId: 293696729\n\n052b274138fce2be80f97b6dcb83ab343c7c8812\nAdd source field for user event and add field behavior annotations\n\nPiperOrigin-RevId: 293693115\n\n1e89732b2d69151b1b3418fff3d4cc0434f0dded\ndatacatalog: v1beta1 add three new RPCs to gapic v1beta1 config\n\nPiperOrigin-RevId: 293692823\n\n9c8bd09bbdc7c4160a44f1fbab279b73cd7a2337\nchange the name of AccessApproval service to AccessApprovalAdmin\n\nPiperOrigin-RevId: 293690934\n\n2e23b8fbc45f5d9e200572ca662fe1271bcd6760\nAdd ListEntryGroups method, add http bindings to support entry group tagging, and update some comments.\n\nPiperOrigin-RevId: 293666452\n\n0275e38a4ca03a13d3f47a9613aac8c8b0d3f1f2\nAdd proto_package field to managedidentities API. It is needed for APIs that still depend on artman generation.\n\nPiperOrigin-RevId: 293643323\n\n4cdfe8278cb6f308106580d70648001c9146e759\nRegenerating public protos for Data Catalog to add new Custom Type Entry feature.\n\nPiperOrigin-RevId: 293614782\n\n45d2a569ab526a1fad3720f95eefb1c7330eaada\nEnable client generation for v1 ManagedIdentities API.\n\nPiperOrigin-RevId: 293515675\n\n2c17086b77e6f3bcf04a1f65758dfb0c3da1568f\nAdd the Actions on Google common types (//google/actions/type/*).\n\nPiperOrigin-RevId: 293478245\n\n781aadb932e64a12fb6ead7cd842698d99588433\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293443396\n\ne2602608c9138c2fca24162720e67f9307c30b95\nDialogflow weekly v2/v2beta1 library update:\n- Documentation updates\nImportant updates are also posted at\nhttps://cloud.google.com/dialogflow/docs/release-notes\n\nPiperOrigin-RevId: 293442964\n\nc8aef82028d06b7992278fa9294c18570dc86c3d\nAdd cc_proto_library and cc_grpc_library targets for Bigtable protos.\n\nAlso fix indentation of cc_grpc_library targets in Spanner and IAM protos.\n\nPiperOrigin-RevId: 293440538\n\ne2faab04f4cb7f9755072330866689b1943a16e9\ncloudtasks: v2 replace non-standard retry params in gapic config v2\n\nPiperOrigin-RevId: 293424055\n\ndfb4097ea628a8470292c6590a4313aee0c675bd\nerrorreporting: v1beta1 add legacy artman config for php\n\nPiperOrigin-RevId: 293423790\n\nb18aed55b45bfe5b62476292c72759e6c3e573c6\nasset: v1p1beta1 updated comment for `page_size` limit.\n\nPiperOrigin-RevId: 293421386\n\nc9ef36b7956d9859a2fc86ad35fcaa16958ab44f\nbazel: Refactor CI build scripts\n\nPiperOrigin-RevId: 293387911\n\na8ed9d921fdddc61d8467bfd7c1668f0ad90435c\nfix: set Ruby module name for OrgPolicy\n\nPiperOrigin-RevId: 293257997\n\n6c7d28509bd8315de8af0889688ee20099594269\nredis: v1beta1 add UpgradeInstance and connect_mode field to Instance\n\nPiperOrigin-RevId: 293242878\n\nae0abed4fcb4c21f5cb67a82349a049524c4ef68\nredis: v1 add connect_mode field to Instance\n\nPiperOrigin-RevId: 293241914\n\n3f7a0d29b28ee9365771da2b66edf7fa2b4e9c56\nAdds service config definition for bigqueryreservation v1beta1\n\nPiperOrigin-RevId: 293234418\n\n0c88168d5ed6fe353a8cf8cbdc6bf084f6bb66a5\naddition of BUILD & configuration for accessapproval v1\n\nPiperOrigin-RevId: 293219198\n\n39bedc2e30f4778ce81193f6ba1fec56107bcfc4\naccessapproval: v1 publish protos\n\nPiperOrigin-RevId: 293167048\n\n69d9945330a5721cd679f17331a78850e2618226\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080182\n\nf6a1a6b417f39694275ca286110bc3c1ca4db0dc\nAdd file-level `Session` resource definition\n\nPiperOrigin-RevId: 293080178\n\n29d40b78e3dc1579b0b209463fbcb76e5767f72a\nExpose managedidentities/v1beta1/ API for client library usage.\n\nPiperOrigin-RevId: 292979741\n\na22129a1fb6e18056d576dfb7717aef74b63734a\nExpose managedidentities/v1/ API for client library usage.\n\nPiperOrigin-RevId: 292968186\n\nb5cbe4a4ba64ab19e6627573ff52057a1657773d\nSecurityCenter v1p1beta1: move file-level option on top to workaround protobuf.js bug.\n\nPiperOrigin-RevId: 292647187\n\nb224b317bf20c6a4fbc5030b4a969c3147f27ad3\nAdds API definitions for bigqueryreservation v1beta1.\n\nPiperOrigin-RevId: 292634722\n\nc1468702f9b17e20dd59007c0804a089b83197d2\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 292626173\n\nffdfa4f55ab2f0afc11d0eb68f125ccbd5e404bd\nvision: v1p3beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605599\n\n78f61482cd028fc1d9892aa5d89d768666a954cd\nvision: v1p1beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292605125\n\n60bb5a294a604fd1778c7ec87b265d13a7106171\nvision: v1p2beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604980\n\n3bcf7aa79d45eb9ec29ab9036e9359ea325a7fc3\nvision: v1p4beta1 publish annotations and retry config\n\nPiperOrigin-RevId: 292604656\n\n2717b8a1c762b26911b45ecc2e4ee01d98401b28\nFix dataproc artman client library generation.\n\nPiperOrigin-RevId: 292555664\n\n" + "sha": "638253bf86d1ce1c314108a089b7351440c2f0bf", + "internalRef": "298971070", + "log": "638253bf86d1ce1c314108a089b7351440c2f0bf\nfix: add java_multiple_files option for automl text_sentiment.proto\n\nPiperOrigin-RevId: 298971070\n\n373d655703bf914fb8b0b1cc4071d772bac0e0d1\nUpdate Recs AI Beta public bazel file\n\nPiperOrigin-RevId: 298961623\n\ndcc5d00fc8a8d8b56f16194d7c682027b2c66a3b\nfix: add java_multiple_files option for automl classification.proto\n\nPiperOrigin-RevId: 298953301\n\na3f791827266f3496a6a5201d58adc4bb265c2a3\nchore: automl/v1 publish annotations and retry config\n\nPiperOrigin-RevId: 298942178\n\n01c681586d8d6dbd60155289b587aee678530bd9\nMark return_immediately in PullRequest deprecated.\n\nPiperOrigin-RevId: 298893281\n\nc9f5e9c4bfed54bbd09227e990e7bded5f90f31c\nRemove out of date documentation for predicate support on the Storage API\n\nPiperOrigin-RevId: 298883309\n\nfd5b3b8238d783b04692a113ffe07c0363f5de0f\ngenerate webrisk v1 proto\n\nPiperOrigin-RevId: 298847934\n\n541b1ded4abadcc38e8178680b0677f65594ea6f\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 298686266\n\nc0d171acecb4f5b0bfd2c4ca34fc54716574e300\n Updated to include the Notification v1 API.\n\nPiperOrigin-RevId: 298652775\n\n2346a9186c0bff2c9cc439f2459d558068637e05\nAdd Service Directory v1beta1 protos and configs\n\nPiperOrigin-RevId: 298625638\n\na78ed801b82a5c6d9c5368e24b1412212e541bb7\nPublishing v3 protos and configs.\n\nPiperOrigin-RevId: 298607357\n\n4a180bfff8a21645b3a935c2756e8d6ab18a74e0\nautoml/v1beta1 publish proto updates\n\nPiperOrigin-RevId: 298484782\n\n6de6e938b7df1cd62396563a067334abeedb9676\nchore: use the latest gapic-generator and protoc-java-resource-name-plugin in Bazel workspace.\n\nPiperOrigin-RevId: 298474513\n\n244ab2b83a82076a1fa7be63b7e0671af73f5c02\nAdds service config definition for bigqueryreservation v1\n\nPiperOrigin-RevId: 298455048\n\n" } }, { From 1d1340ec065e8f10a96f80d4cf170aa26a1ee5f5 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 5 Mar 2020 17:25:37 -0800 Subject: [PATCH 0589/1115] build: update linkinator config (#911) --- handwritten/pubsub/linkinator.config.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json index b555215ca02..29a223b6db6 100644 --- a/handwritten/pubsub/linkinator.config.json +++ b/handwritten/pubsub/linkinator.config.json @@ -4,5 +4,7 @@ "https://codecov.io/gh/googleapis/", "www.googleapis.com", "img.shields.io" - ] + ], + "silent": true, + "concurrency": 10 } From 9abd20d3ec7f21c16b49e79da700a65d2cbe0e21 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 23 Mar 2020 16:22:07 -0700 Subject: [PATCH 0590/1115] docs: update site link for UpdateTopicRequest (#926) The old link wasn't valid anymore, I'm guessing due to an update to the docs site. --- handwritten/pubsub/src/topic.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 7f66763fcc1..453b31c0838 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -834,7 +834,7 @@ export class Topic { /** * Updates the topic. * - * @see [UpdateTopicRequest API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/UpdateTopicRequest} + * @see [UpdateTopicRequest API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#google.pubsub.v1.UpdateTopicRequest} * * @param {object} metadata The fields to update. This should be structured * like a {@link From a359b4bc9e52a6b33452c0c79ef9dfd8d6e66e1c Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 23 Mar 2020 18:56:23 -0700 Subject: [PATCH 0591/1115] docs: document version support goals (#927) --- handwritten/pubsub/README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 467e0b4ab39..b26192f5459 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -137,6 +137,27 @@ has instructions for running the samples. The [Google Cloud Pub/Sub Node.js Client API Reference][client-docs] documentation also contains samples. +## Supported Node.js Versions + +Our client libraries follow the [Node.js release schedule](https://nodejs.org/en/about/releases/). +Libraries are compatible with all current _active_ and _maintenance_ versions of +Node.js. + +Client libraries targetting some end-of-life versions of Node.js are available, and +can be installed via npm [dist-tags](https://docs.npmjs.com/cli/dist-tag). +The dist-tags follow the naming convention `legacy-(version)`. + +_Legacy Node.js versions are supported as a best effort:_ + +* Legacy versions will not be tested in continuous integration. +* Some security patches may not be able to be backported. +* Dependencies will not be kept up-to-date, and features will not be backported. + +#### Legacy tags available + +* `legacy-8`: install client libraries from this dist-tag for versions + compatible with Node.js 8. + ## Versioning This library follows [Semantic Versioning](http://semver.org/). @@ -160,6 +181,12 @@ More Information: [Google Cloud Platform Launch Stages][launch_stages] Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-pubsub/blob/master/CONTRIBUTING.md). +Please note that this `README.md`, the `samples/README.md`, +and a variety of configuration files in this repository (including `.nycrc` and `tsconfig.json`) +are generated from a central template. To edit one of these files, make an edit +to its template in this +[directory](https://github.com/googleapis/synthtool/tree/master/synthtool/gcp/templates/node_library). + ## License Apache Version 2.0 From 6defe345dc66c84e4a3e8c5f3d58126b3ec6d35e Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 26 Mar 2020 11:03:26 -0700 Subject: [PATCH 0592/1115] feat: add a close() method to PubSub, and a flush() method to Topic/Publisher (#916) * docs: fix a typo in a comment * feat: allow manually closing the server connections in the PubSub object * feat: add flush() method for Topic objects * tests: add tests for new flush() and close() methods * build: update github checkout action to v2 to fix spurious retry errors * fix: set isOpen to false before trying to close it so that all usage will stop --- handwritten/pubsub/src/publisher/index.ts | 36 +++++++++-- .../pubsub/src/publisher/message-queues.ts | 9 ++- handwritten/pubsub/src/pubsub.ts | 60 ++++++++++++++++++- handwritten/pubsub/src/topic.ts | 16 +++++ handwritten/pubsub/test/publisher/index.ts | 49 +++++++++++++++ handwritten/pubsub/test/pubsub.ts | 49 ++++++++++++++- 6 files changed, 210 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index fee6811e17e..3e3ed9b171f 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import {promisifyAll} from '@google-cloud/promisify'; +import {promisify, promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; -import {MessageBatch, BatchPublishOptions} from './message-batch'; -import {Queue, OrderedQueue} from './message-queues'; +import {BatchPublishOptions} from './message-batch'; +import {Queue, OrderedQueue, PublishDone} from './message-queues'; import {Topic} from '../topic'; -import {RequestCallback} from '../pubsub'; +import {RequestCallback, EmptyCallback, EmptyResponse} from '../pubsub'; import {google} from '../../proto/pubsub'; import {defaultOptions} from '../default-options'; @@ -72,6 +72,34 @@ export class Publisher { this.queue = new Queue(this); this.orderedQueues = new Map(); } + + flush(): Promise; + flush(callback: EmptyCallback): void; + /** + * Immediately sends all remaining queued data. This is mostly useful + * if you are planning to call close() on the PubSub object that holds + * the server connections. + * + * @private + * + * @param {EmptyCallback} [callback] Callback function. + * @returns {Promise} + */ + flush(callback?: EmptyCallback): Promise | void { + const definedCallback = callback ? callback : () => {}; + + const publishes = [promisify(this.queue.publish)()]; + Array.from(this.orderedQueues.values()).forEach(q => + publishes.push(promisify(q.publish)()) + ); + const allPublishes = Promise.all(publishes); + + allPublishes + .then(() => { + definedCallback(null); + }) + .catch(definedCallback); + } publish(data: Buffer, attributes?: Attributes): Promise; publish(data: Buffer, callback: PublishCallback): void; publish( diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 0886d3624f0..2f357e207ee 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -131,7 +131,7 @@ export class Queue extends MessageQueue { /** * Cancels any pending publishes and calls _publish immediately. */ - publish(): void { + publish(callback?: PublishDone): void { const {messages, callbacks} = this.batch; this.batch = new MessageBatch(this.batchOptions); @@ -141,7 +141,7 @@ export class Queue extends MessageQueue { delete this.pending; } - this._publish(messages, callbacks); + this._publish(messages, callbacks, callback); } } @@ -259,7 +259,8 @@ export class OrderedQueue extends MessageQueue { * * @fires OrderedQueue#drain */ - publish(): void { + publish(callback?: PublishDone): void { + const definedCallback = callback || (() => {}); this.inFlight = true; if (this.pending) { @@ -274,10 +275,12 @@ export class OrderedQueue extends MessageQueue { if (err) { this.handlePublishFailure(err); + definedCallback(err); } else if (this.batches.length) { this.beginNextPublish(); } else { this.emit('drain'); + definedCallback(null); } }); } diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index cb792bd62d1..4b81e2a8488 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -247,6 +247,7 @@ export class PubSub { getTopicsStream = paginator.streamify('getTopics') as () => ObjectStream< Topic >; + isOpen = true; constructor(options?: ClientConfig) { options = options || {}; @@ -281,6 +282,33 @@ export class PubSub { } } + close(): Promise; + close(callback: EmptyCallback): void; + /** + * Closes out this object, releasing any server connections. Note that once + * you close a PubSub object, it may not be used again. Any pending operations + * (e.g. queued publish messages) will fail. If you have topic or subscription + * objects that may have pending operations, you should call close() on those + * first if you want any pending messages to be delivered correctly. The + * PubSub class doesn't track those. + * + * @callback EmptyCallback + * @returns {Promise} + */ + close(callback?: EmptyCallback): Promise | void { + const definedCallback = callback || (() => {}); + if (this.isOpen) { + this.isOpen = false; + this.closeAllClients_() + .then(() => { + definedCallback(null); + }) + .catch(definedCallback); + } else { + definedCallback(null); + } + } + createSubscription( topic: Topic | string, name: string, @@ -941,6 +969,23 @@ export class PubSub { return gaxClient; } + /** + * Close all open client objects. + * + * @private + * + * @returns {Promise} + */ + async closeAllClients_(): Promise { + const promises = []; + for (const clientConfig of Object.keys(this.api)) { + const gaxClient = this.api[clientConfig]; + promises.push(gaxClient.close()); + delete this.api[clientConfig]; + } + + await Promise.all(promises); + } /** * Funnel all API requests through this method, to be sure we have a project * ID. @@ -954,6 +999,19 @@ export class PubSub { * @param {function} [callback] The callback function. */ request(config: RequestConfig, callback: RequestCallback) { + // This prevents further requests, in case any publishers were hanging around. + if (!this.isOpen) { + const statusObject = { + code: 0, + details: 'Cannot use a closed PubSub object.', + metadata: null, + }; + const err = new Error(statusObject.details); + Object.assign(err, statusObject); + callback(err as ServiceError); + return; + } + this.getClient_(config, (err, client) => { if (err) { callback(err as ServiceError); @@ -1137,7 +1195,7 @@ export class PubSub { /*! Developer Documentation * - * These methods can be agto-paginated. + * These methods can be auto-paginated. */ paginator.extend(PubSub, ['getSnapshots', 'getSubscriptions', 'getTopics']); diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 453b31c0838..43f9278bd7c 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -181,6 +181,22 @@ export class Topic { this.iam = new IAM(pubsub, this.name); } + flush(): Promise; + flush(callback: EmptyCallback): void; + /** + * Immediately sends all remaining queued data. This is mostly useful + * if you are planning to call close() on the PubSub object that holds + * the server connections. + * + * @param {EmptyCallback} [callback] Callback function. + * @returns {Promise} + */ + flush(callback?: EmptyCallback): Promise | void { + // It doesn't matter here if callback is undefined; the Publisher + // flush() will handle it. + this.publisher.flush(callback!); + } + create(gaxOpts?: CallOptions): Promise; create(callback: CreateTopicCallback): void; create(gaxOpts: CallOptions, callback: CreateTopicCallback): void; diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index dd90fe301ae..59d5ae86b78 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -47,6 +47,7 @@ class FakeQueue extends EventEmitter { this.publisher = publisher; } add(message: p.PubsubMessage, callback: p.PublishCallback): void {} + publish(callback: (err: Error | null) => void) {} } class FakeOrderedQueue extends FakeQueue { @@ -57,6 +58,7 @@ class FakeOrderedQueue extends FakeQueue { this.orderingKey = key; } resumePublishing(): void {} + publish(callback: (err: Error | null) => void) {} } describe('Publisher', () => { @@ -239,6 +241,34 @@ describe('Publisher', () => { assert.strictEqual(publisher.orderedQueues.size, 0); }); + + it('should drain any ordered queues on flush', done => { + // We have to stub out the regular queue as well, so that the flush() operation finishes. + sandbox + .stub(FakeQueue.prototype, 'publish') + .callsFake((callback: (err: Error | null) => void) => { + callback(null); + }); + + sandbox + .stub(FakeOrderedQueue.prototype, 'publish') + .callsFake((callback: (err: Error | null) => void) => { + const queue = (publisher.orderedQueues.get( + orderingKey + ) as unknown) as FakeOrderedQueue; + queue.emit('drain'); + callback(null); + }); + + publisher.orderedQueues.clear(); + publisher.publishMessage(fakeMessage, spy); + + publisher.flush(err => { + assert.strictEqual(err, null); + assert.strictEqual(publisher.orderedQueues.size, 0); + done(); + }); + }); }); }); @@ -315,4 +345,23 @@ describe('Publisher', () => { assert.strictEqual(publisher.settings.batching!.maxMessages, 1000); }); }); + + describe('flush', () => { + // The ordered queue drain test is above with the ordered queue tests. + it('should drain the main publish queue', done => { + sandbox.stub(publisher.queue, 'publish').callsFake(cb => { + if (cb) { + cb(null); + } + }); + publisher.flush(err => { + assert.strictEqual(err, null); + assert.strictEqual( + !publisher.queue.batch || publisher.queue.batch.messages.length === 0, + true + ); + done(); + }); + }); + }); }); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index fd1dd8f2657..78bb05b81cf 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -153,6 +153,14 @@ describe('PubSub', () => { const PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; + interface PostCloseCallback { + (err: Error | null): void; + } + + interface PostCloseTest { + (callback: PostCloseCallback): void; + } + before(() => { delete process.env.PUBSUB_EMULATOR_HOST; PubSub = proxyquire('../src/pubsub', { @@ -243,6 +251,15 @@ describe('PubSub', () => { assert.deepStrictEqual(pubsub.api, {}); }); + it('should default to the opened state', () => { + assert.strictEqual(pubsub.isOpen, true); + }); + + it('should not be in the opened state after close()', async () => { + await pubsub.close(); + assert.strictEqual(pubsub.isOpen, false); + }); + it('should cache a local google-auth-library instance', () => { const fakeGoogleAuthInstance = {}; const options = { @@ -1041,6 +1058,21 @@ describe('PubSub', () => { }; }); + it('should throw if the PubSub is already closed', done => { + pubsub.close((err: Error | null) => { + assert.strictEqual(err, null); + + pubsub.request(CONFIG, (errInner: Error | null) => { + assert.notStrictEqual(errInner, null); + assert.strictEqual( + errInner!.message.indexOf('closed PubSub object') >= 0, + true + ); + done(); + }); + }); + }); + it('should call getClient_ with the correct config', done => { pubsub.getClient_ = config => { assert.strictEqual(config, CONFIG); @@ -1088,7 +1120,9 @@ describe('PubSub', () => { }); describe('getClientAsync_', () => { - const FAKE_CLIENT_INSTANCE = class {}; + const FAKE_CLIENT_INSTANCE = class { + close() {} + }; const CONFIG = ({ client: 'FakeClient', } as {}) as pubsubTypes.GetClientConfig; @@ -1100,6 +1134,19 @@ describe('PubSub', () => { afterEach(() => sandbox.restore()); + describe('closeAllClients_', () => { + it('should close out any open client', async () => { + // Create a client that we'll close. + const client = await pubsub.getClientAsync_(CONFIG); + + // Stub out its close method, and verify it gets called. + const stub = sandbox.stub(client, 'close').resolves(); + await pubsub.closeAllClients_(); + + assert.strictEqual(stub.called, true); + }); + }); + describe('project ID', () => { beforeEach(() => { delete pubsub.projectId; From 378c59a1140ee48f305c074d102768b8e6740f1c Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Sun, 29 Mar 2020 15:09:44 -0700 Subject: [PATCH 0593/1115] test: modernize mocha config (#875) --- handwritten/pubsub/.mocharc.json | 5 +++++ handwritten/pubsub/package.json | 2 -- handwritten/pubsub/test/mocha.opts | 4 ---- 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 handwritten/pubsub/.mocharc.json delete mode 100644 handwritten/pubsub/test/mocha.opts diff --git a/handwritten/pubsub/.mocharc.json b/handwritten/pubsub/.mocharc.json new file mode 100644 index 00000000000..670c5e2c24b --- /dev/null +++ b/handwritten/pubsub/.mocharc.json @@ -0,0 +1,5 @@ +{ + "enable-source-maps": true, + "throw-deprecation": true, + "timeout": 10000 +} diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6984619ac43..ea5849b38d2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -84,7 +84,6 @@ "eslint-plugin-prettier": "^3.0.0", "grpc": "^1.24.0", "gts": "^1.0.0", - "intelli-espower-loader": "^1.0.1", "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", @@ -93,7 +92,6 @@ "mocha": "^7.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", - "power-assert": "^1.4.4", "prettier": "^1.18.2", "proxyquire": "^2.0.0", "sinon": "^9.0.0", diff --git a/handwritten/pubsub/test/mocha.opts b/handwritten/pubsub/test/mocha.opts deleted file mode 100644 index 48bf1c3df18..00000000000 --- a/handwritten/pubsub/test/mocha.opts +++ /dev/null @@ -1,4 +0,0 @@ ---require source-map-support/register ---require intelli-espower-loader ---timeout 10000 ---throw-deprecation From cea7a45300d20c6c9a719ecc293949cfd1ad3d2f Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Sun, 29 Mar 2020 15:22:58 -0700 Subject: [PATCH 0594/1115] build(tests): fix coveralls and enable build cop (#912) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> Co-authored-by: Justin Beckwith --- handwritten/pubsub/.kokoro/samples-test.sh | 11 +++++++++ handwritten/pubsub/.kokoro/system-test.sh | 12 ++++++++++ handwritten/pubsub/.kokoro/test.sh | 11 +++++++++ handwritten/pubsub/.mocharc.js | 28 ++++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 handwritten/pubsub/.mocharc.js diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 20e3241c9e9..86e83c9d3da 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -39,6 +39,17 @@ if [ -f samples/package.json ]; then npm link ../ npm install cd .. + # If tests are running against master, configure Build Cop + # to open issues on failures: + if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then + export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml + export MOCHA_REPORTER=xunit + cleanup() { + chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop + $KOKORO_GFILE_DIR/linux_amd64/buildcop + } + trap cleanup EXIT HUP + fi npm run samples-test fi diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index fc5824e6667..dfae142a231 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -33,6 +33,18 @@ fi npm install +# If tests are running against master, configure Build Cop +# to open issues on failures: +if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then + export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml + export MOCHA_REPORTER=xunit + cleanup() { + chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop + $KOKORO_GFILE_DIR/linux_amd64/buildcop + } + trap cleanup EXIT HUP +fi + npm run system-test # codecov combines coverage across integration and unit tests. Include diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 9db11bb09d6..8d9c2954579 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -21,6 +21,17 @@ export NPM_CONFIG_PREFIX=/home/node/.npm-global cd $(dirname $0)/.. npm install +# If tests are running against master, configure Build Cop +# to open issues on failures: +if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then + export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml + export MOCHA_REPORTER=xunit + cleanup() { + chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop + $KOKORO_GFILE_DIR/linux_amd64/buildcop + } + trap cleanup EXIT HUP +fi npm test # codecov combines coverage across integration and unit tests. Include diff --git a/handwritten/pubsub/.mocharc.js b/handwritten/pubsub/.mocharc.js new file mode 100644 index 00000000000..ff7b34fa5d1 --- /dev/null +++ b/handwritten/pubsub/.mocharc.js @@ -0,0 +1,28 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +const config = { + "enable-source-maps": true, + "throw-deprecation": true, + "timeout": 10000 +} +if (process.env.MOCHA_THROW_DEPRECATION === 'false') { + delete config['throw-deprecation']; +} +if (process.env.MOCHA_REPORTER) { + config.reporter = process.env.MOCHA_REPORTER; +} +if (process.env.MOCHA_REPORTER_OUTPUT) { + config['reporter-option'] = `output=${process.env.MOCHA_REPORTER_OUTPUT}`; +} +module.exports = config From 024cf4863f042d8d561403eb6fab7d231ef7d761 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 21:46:18 +0000 Subject: [PATCH 0595/1115] chore: release 1.7.0 (#933) :robot: I have created a release \*beep\* \*boop\* --- ## [1.7.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.6.0...v1.7.0) (2020-03-29) ### Features * add a close() method to PubSub, and a flush() method to Topic/Publisher ([#916](https://www.github.com/googleapis/nodejs-pubsub/issues/916)) ([4097995](https://www.github.com/googleapis/nodejs-pubsub/commit/4097995a85a8ca3fb73c2c2a8cb0649cdd4274be)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 7d87cfd75eb..875fead26a7 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [1.7.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.6.0...v1.7.0) (2020-03-29) + + +### Features + +* add a close() method to PubSub, and a flush() method to Topic/Publisher ([#916](https://www.github.com/googleapis/nodejs-pubsub/issues/916)) ([4097995](https://www.github.com/googleapis/nodejs-pubsub/commit/4097995a85a8ca3fb73c2c2a8cb0649cdd4274be)) + ## [1.6.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.5.0...v1.6.0) (2020-03-04) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ea5849b38d2..07d4e43e3c9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.6.0", + "version": "1.7.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 52803c91c856ed0701a83914db7213589548970b Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Tue, 31 Mar 2020 19:12:40 -0700 Subject: [PATCH 0596/1115] build: set AUTOSYNTH_MULTIPLE_COMMITS=true for context aware commits (#938) --- handwritten/pubsub/synth.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 3142a3ab26e..f25535a3896 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -6,6 +6,9 @@ logging.basicConfig(level=logging.DEBUG) +AUTOSYNTH_MULTIPLE_COMMITS = True + + gapic = gcp.GAPICGenerator() common_templates = gcp.CommonTemplates() From 257b4bce27eac894c9a00ddc3ea275646c714e5b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 1 Apr 2020 23:36:32 +0200 Subject: [PATCH 0597/1115] chore(deps): update dependency @types/sinon to v9 (#939) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@types/sinon](https://togithub.com/DefinitelyTyped/DefinitelyTyped) | devDependencies | major | [`^7.0.0` -> `^9.0.0`](https://renovatebot.com/diffs/npm/@types%2fsinon/7.5.2/9.0.0) | --- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 07d4e43e3c9..80c37c74e49 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -73,7 +73,7 @@ "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", "@types/proxyquire": "^1.3.28", - "@types/sinon": "^7.0.0", + "@types/sinon": "^9.0.0", "@types/tmp": "^0.1.0", "@types/uuid": "^7.0.0", "c8": "^7.0.0", From 92e3d3cc62166e4bd64b5a034e69ba6bda3e4dbc Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Sun, 5 Apr 2020 12:50:38 -0700 Subject: [PATCH 0598/1115] chore: remove duplicate mocha config (#942) --- handwritten/pubsub/.mocharc.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 handwritten/pubsub/.mocharc.json diff --git a/handwritten/pubsub/.mocharc.json b/handwritten/pubsub/.mocharc.json deleted file mode 100644 index 670c5e2c24b..00000000000 --- a/handwritten/pubsub/.mocharc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "enable-source-maps": true, - "throw-deprecation": true, - "timeout": 10000 -} From a1d2298f5dd31822a4f27d85e0be7d5286289382 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 6 Apr 2020 15:02:15 -0700 Subject: [PATCH 0599/1115] fix: provide missing close() method in the generated gapic client (#941) * fix: backport the close() method to the publisher client from the typescript gapic generator * fix: add the publisher_client.js hack to synth.py and update publisher_client.js to match it * fix: add a system-test to verify that calling close() works Co-authored-by: Justin Beckwith --- handwritten/pubsub/src/v1/publisher_client.js | 14 +++++++++++ handwritten/pubsub/synth.py | 23 +++++++++++++++++++ handwritten/pubsub/system-test/pubsub.ts | 13 +++++++++++ 3 files changed, 50 insertions(+) diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js index a92b304faf2..4410aa5ccc5 100644 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ b/handwritten/pubsub/src/v1/publisher_client.js @@ -222,6 +222,8 @@ class PublisherClient { // Iterate over each of the methods that the service provides // and create an API call method for each. + // note: editing generated code + this.publisherStub = publisherStub; const publisherStubMethods = [ 'createTopic', 'updateTopic', @@ -1170,6 +1172,18 @@ class PublisherClient { }); } + /** + * Terminate the GRPC channel and close the client. + * note: editing generated code + * + * The client will no longer be usable and all future behavior is undefined. + */ + close() { + return this.publisherStub.then(stub => { + stub.close(); + }); + } + /** * Parse the projectName from a project resource. * diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index f25535a3896..34149f0689a 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -40,6 +40,29 @@ " };\n" "\g<0>") +# The JavaScript generator didn't implement close(). TypeScript gapic does, +# so this should be removed when we merge that. +s.replace("src/v1/publisher_client.js", + " \* Parse the projectName from a project resource.\n", + " * Terminate the GRPC channel and close the client.\n" + " * note: editing generated code\n" + " *\n" + " * The client will no longer be usable and all future behavior is undefined.\n" + " */\n" + " close() {\n" + " return this.publisherStub.then(stub => {\n" + " stub.close();\n" + " });\n" + " }\n" + " \n" + " /**\n" + " \g<0>") +s.replace("src/v1/publisher_client.js", + " const publisherStubMethods = \\[\n", + " // note: editing generated code\n" + " this.publisherStub = publisherStub;\n" + " \g<0>") + # Update path discovery due to build/ dir and TypeScript conversion. s.replace("src/v1/publisher_client.js", "../../package.json", "../../../package.json") s.replace("src/v1/subscriber_client.js", "../../package.json", "../../../package.json") diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index ac79049a14f..1aab7783c8c 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -888,4 +888,17 @@ describe('pubsub', () => { }); }); }); + + it('should allow closing of publisher clients', async () => { + // The full call stack of close() is tested in unit tests; this is mostly + // to verify that the close() method is actually there and doesn't error. + const localPubsub = new PubSub(); + + // Just use the client object to make sure it has opened a connection. + await pubsub.getTopics(); + + // Tell it to close, and validate that it's marked closed. + await localPubsub.close(); + assert.strictEqual(localPubsub.isOpen, false); + }); }); From f222ea65225a9c60a87e6bedc451b37cf3376c3f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 23:02:17 +0000 Subject: [PATCH 0600/1115] chore: release 1.7.1 (#943) :robot: I have created a release \*beep\* \*boop\* --- ### [1.7.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.7.0...v1.7.1) (2020-04-06) ### Bug Fixes * provide missing close() method in the generated gapic client ([#941](https://www.github.com/googleapis/nodejs-pubsub/issues/941)) ([6bf8f14](https://www.github.com/googleapis/nodejs-pubsub/commit/6bf8f1481a1dea051c47697488e13b6facf20a26)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 875fead26a7..b00808fd572 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [1.7.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.7.0...v1.7.1) (2020-04-06) + + +### Bug Fixes + +* provide missing close() method in the generated gapic client ([#941](https://www.github.com/googleapis/nodejs-pubsub/issues/941)) ([6bf8f14](https://www.github.com/googleapis/nodejs-pubsub/commit/6bf8f1481a1dea051c47697488e13b6facf20a26)) + ## [1.7.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.6.0...v1.7.0) (2020-03-29) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 80c37c74e49..80ecdfc4675 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.7.0", + "version": "1.7.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 6f145fb1160bd4619011897ec3acad03db76d961 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 01:42:15 +0200 Subject: [PATCH 0601/1115] fix(deps): update dependency google-auth-library to v6 (#935) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 80ecdfc4675..f27b8f82045 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,7 +57,7 @@ "arrify": "^2.0.0", "async-each": "^1.0.1", "extend": "^3.0.2", - "google-auth-library": "^5.5.0", + "google-auth-library": "^6.0.0", "google-gax": "^1.14.2", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From d455db2b7f85d080acb4183b9207957e8cd367d7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 02:26:39 +0200 Subject: [PATCH 0602/1115] fix(deps): update dependency @google-cloud/precise-date to v2 (#934) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@google-cloud/precise-date](https://togithub.com/googleapis/nodejs-precise-date) | dependencies | major | [`^1.0.0` -> `^2.0.0`](https://renovatebot.com/diffs/npm/@google-cloud%2fprecise-date/1.0.3/2.0.0) | --- ### Release Notes
googleapis/nodejs-precise-date ### [`v2.0.0`](https://togithub.com/googleapis/nodejs-precise-date/blob/master/CHANGELOG.md#​200-httpswwwgithubcomgoogleapisnodejs-precise-datecomparev103v200-2020-03-26) [Compare Source](https://togithub.com/googleapis/nodejs-precise-date/compare/v1.0.3...v2.0.0) ##### ⚠ BREAKING CHANGES - **dep:** upgrade typescript/gts ([#​97](https://togithub.com/googleapis/nodejs-precise-date/issues/97)) - **dep:** deprecate Node 8 to 10 ([#​92](https://togithub.com/googleapis/nodejs-precise-date/issues/92)) ##### Miscellaneous Chores - **dep:** deprecate Node 8 to 10 ([#​92](https://www.github.com/googleapis/nodejs-precise-date/issues/92)) ([75ca209](https://www.github.com/googleapis/nodejs-precise-date/commit/75ca209b49abcba8efcbc401b270ac1346874647)) - **dep:** upgrade typescript/gts ([#​97](https://www.github.com/googleapis/nodejs-precise-date/issues/97)) ([59ca2de](https://www.github.com/googleapis/nodejs-precise-date/commit/59ca2de8f6da249808dddebdba3961e59140d06d)) ##### [1.0.3](https://www.github.com/googleapis/nodejs-precise-date/compare/v1.0.2...v1.0.3) (2019-12-05) ##### Bug Fixes - **deps:** pin TypeScript below 3.7.0 ([c4aef9c](https://www.github.com/googleapis/nodejs-precise-date/commit/c4aef9c42cfab91c4701891d12a7b7118e3ba76c)) ##### [1.0.2](https://www.github.com/googleapis/nodejs-precise-date/compare/v1.0.1...v1.0.2) (2019-11-15) ##### Bug Fixes - **docs:** add jsdoc-region-tag plugin ([#​60](https://www.github.com/googleapis/nodejs-precise-date/issues/60)) ([a975b1c](https://www.github.com/googleapis/nodejs-precise-date/commit/a975b1c39b9ad283b48eb8e2cb13d9eb1cb053ba)) ##### [1.0.1](https://www.github.com/googleapis/nodejs-precise-date/compare/v1.0.0...v1.0.1) (2019-06-27) ##### Bug Fixes - **docs:** make anchors work in jsdoc ([#​43](https://www.github.com/googleapis/nodejs-precise-date/issues/43)) ([5828db8](https://www.github.com/googleapis/nodejs-precise-date/commit/5828db8))
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f27b8f82045..5d7f6c44941 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@google-cloud/paginator": "^2.0.0", - "@google-cloud/precise-date": "^1.0.0", + "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^1.0.0", "@types/duplexify": "^3.6.0", From cf0d4ecfefeebc2fead5494ac76ad1fb3ebbce88 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 03:21:05 +0200 Subject: [PATCH 0603/1115] fix(deps): update dependency @google-cloud/promisify to v2 (#928) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@google-cloud/promisify](https://togithub.com/googleapis/nodejs-promisify) | dependencies | major | [`^1.0.0` -> `^2.0.0`](https://renovatebot.com/diffs/npm/@google-cloud%2fpromisify/1.0.4/2.0.0) | --- ### Release Notes
googleapis/nodejs-promisify ### [`v2.0.0`](https://togithub.com/googleapis/nodejs-promisify/blob/master/CHANGELOG.md#​200-httpswwwgithubcomgoogleapisnodejs-promisifycomparev104v200-2020-03-23) [Compare Source](https://togithub.com/googleapis/nodejs-promisify/compare/v1.0.4...v2.0.0) ##### ⚠ BREAKING CHANGES - update to latest version of gts/typescript ([#​183](https://togithub.com/googleapis/nodejs-promisify/issues/183)) - drop Node 8 from engines field ([#​184](https://togithub.com/googleapis/nodejs-promisify/issues/184)) ##### Features - drop Node 8 from engines field ([#​184](https://www.github.com/googleapis/nodejs-promisify/issues/184)) ([7e6d3c5](https://www.github.com/googleapis/nodejs-promisify/commit/7e6d3c54066d89530ed25c7f9722efd252f43fb8)) ##### Build System - update to latest version of gts/typescript ([#​183](https://www.github.com/googleapis/nodejs-promisify/issues/183)) ([9c3ed12](https://www.github.com/googleapis/nodejs-promisify/commit/9c3ed12c12f4bb1e17af7440c6371c4cefddcd59)) ##### [1.0.4](https://www.github.com/googleapis/nodejs-promisify/compare/v1.0.3...v1.0.4) (2019-12-05) ##### Bug Fixes - **deps:** pin TypeScript below 3.7.0 ([e48750e](https://www.github.com/googleapis/nodejs-promisify/commit/e48750ef96aa20eb3a2b73fe2f062d04430468a7)) ##### [1.0.3](https://www.github.com/googleapis/nodejs-promisify/compare/v1.0.2...v1.0.3) (2019-11-13) ##### Bug Fixes - **docs:** add jsdoc-region-tag plugin ([#​146](https://www.github.com/googleapis/nodejs-promisify/issues/146)) ([ff0ee74](https://www.github.com/googleapis/nodejs-promisify/commit/ff0ee7408f50e8f7147b8ccf7e10337aa5920076)) ##### [1.0.2](https://www.github.com/googleapis/nodejs-promisify/compare/v1.0.1...v1.0.2) (2019-06-26) ##### Bug Fixes - **docs:** link to reference docs section on googleapis.dev ([#​128](https://www.github.com/googleapis/nodejs-promisify/issues/128)) ([5a8bd90](https://www.github.com/googleapis/nodejs-promisify/commit/5a8bd90)) ##### [1.0.1](https://www.github.com/googleapis/nodejs-promisify/compare/v1.0.0...v1.0.1) (2019-06-14) ##### Bug Fixes - **docs:** move to new client docs URL ([#​124](https://www.github.com/googleapis/nodejs-promisify/issues/124)) ([34d18cd](https://www.github.com/googleapis/nodejs-promisify/commit/34d18cd))
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5d7f6c44941..04a4c67ce14 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ "@google-cloud/paginator": "^2.0.0", "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^1.0.0", - "@google-cloud/promisify": "^1.0.0", + "@google-cloud/promisify": "^2.0.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From 134bf0f8eedbb63c2fc61dad415cd0d8337bdd05 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 19:47:54 +0200 Subject: [PATCH 0604/1115] fix(deps): update dependency @google-cloud/paginator to v3 (#931) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 04a4c67ce14..80e90263c45 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -48,7 +48,7 @@ "benchwrapper": "node bin/benchwrapper.js" }, "dependencies": { - "@google-cloud/paginator": "^2.0.0", + "@google-cloud/paginator": "^3.0.0", "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^1.0.0", "@google-cloud/promisify": "^2.0.0", From 5b556241c6e2d771c82496c2c27fa36ac2216113 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 20:10:24 +0200 Subject: [PATCH 0605/1115] fix(deps)!: update dependency @google-cloud/projectify to v2 (#929) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@google-cloud/projectify](https://togithub.com/googleapis/nodejs-projectify) | dependencies | major | [`^1.0.0` -> `^2.0.0`](https://renovatebot.com/diffs/npm/@google-cloud%2fprojectify/1.0.4/2.0.0) | --- ### Release Notes
googleapis/nodejs-projectify ### [`v2.0.0`](https://togithub.com/googleapis/nodejs-projectify/blob/master/CHANGELOG.md#​200-httpswwwgithubcomgoogleapisnodejs-projectifycomparev104v200-2020-03-24) [Compare Source](https://togithub.com/googleapis/nodejs-projectify/compare/v1.0.4...v2.0.0) ##### ⚠ BREAKING CHANGES - typescript@3.7 introduced some breaking changes - drop Node 8 from engines field ([#​172](https://togithub.com/googleapis/nodejs-projectify/issues/172)) ##### Features - drop Node 8 from engines field ([#​172](https://www.github.com/googleapis/nodejs-projectify/issues/172)) ([3eac424](https://www.github.com/googleapis/nodejs-projectify/commit/3eac424bfb1ee47144a77888dc68db687988945e)) ##### Build System - update to latest version of gts/typescript ([#​171](https://www.github.com/googleapis/nodejs-projectify/issues/171)) ([30f90cc](https://www.github.com/googleapis/nodejs-projectify/commit/30f90cc172da6ed9394da91869556bf5eef42434)) ##### [1.0.4](https://www.github.com/googleapis/nodejs-projectify/compare/v1.0.3...v1.0.4) (2019-12-05) ##### Bug Fixes - **publish:** publication failed to reach npm ([#​141](https://www.github.com/googleapis/nodejs-projectify/issues/141)) ([5406ba5](https://www.github.com/googleapis/nodejs-projectify/commit/5406ba5e1d43a228a19072023c1baebce34190af)) ##### [1.0.3](https://www.github.com/googleapis/nodejs-projectify/compare/v1.0.2...v1.0.3) (2019-12-05) ##### Bug Fixes - **deps:** pin TypeScript below 3.7.0 ([6c95307](https://www.github.com/googleapis/nodejs-projectify/commit/6c953070139a77d30c4ce5b7dee1443874046906)) ##### [1.0.2](https://www.github.com/googleapis/nodejs-projectify/compare/v1.0.1...v1.0.2) (2019-11-14) ##### Bug Fixes - **docs:** add jsdoc-region-tag plugin ([#​135](https://www.github.com/googleapis/nodejs-projectify/issues/135)) ([59301e7](https://www.github.com/googleapis/nodejs-projectify/commit/59301e7cfa855add4894dd9c46870e61fffa7413)) ##### [1.0.1](https://www.github.com/googleapis/nodejs-projectify/compare/v1.0.0...v1.0.1) (2019-06-26) ##### Bug Fixes - **docs:** link to reference docs section on googleapis.dev ([#​119](https://www.github.com/googleapis/nodejs-projectify/issues/119)) ([90a009f](https://www.github.com/googleapis/nodejs-projectify/commit/90a009f))
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 80e90263c45..698b3121ce7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "dependencies": { "@google-cloud/paginator": "^3.0.0", "@google-cloud/precise-date": "^2.0.0", - "@google-cloud/projectify": "^1.0.0", + "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", From 82ede93706ecb8a03d416a54c0a67264422fab0a Mon Sep 17 00:00:00 2001 From: Summer Ji Date: Thu, 9 Apr 2020 11:19:00 -0700 Subject: [PATCH 0606/1115] build!: convert to typescript (#923) --- handwritten/pubsub/.eslintrc.json | 3 + handwritten/pubsub/.gitignore | 6 +- handwritten/pubsub/.jsdoc.js | 7 +- handwritten/pubsub/.mocharc.json | 5 + .../v1/doc_iam_policy.js => .prettierrc.js} | 7 +- handwritten/pubsub/helperMethods.ts.tmpl | 33 + handwritten/pubsub/package.json | 24 +- handwritten/pubsub/proto/iam.d.ts | 4418 -- handwritten/pubsub/proto/pubsub.d.ts | 9638 ---- .../google/cloud/common_resources.proto | 52 + .../protos/google/iam/admin/v1/iam.proto | 469 - .../protos/google/iam/v1/iam_policy.proto | 20 +- .../google/iam/v1/logging/audit_data.proto | 34 + .../pubsub/protos/google/iam/v1/options.proto | 10 +- .../pubsub/protos/google/iam/v1/policy.proto | 63 +- .../protos/google/pubsub/v1/pubsub.proto | 44 +- handwritten/pubsub/protos/protos.d.ts | 13864 +++--- handwritten/pubsub/protos/protos.js | 38475 ++++++++-------- handwritten/pubsub/protos/protos.json | 3588 +- handwritten/pubsub/smoke-test/.eslintrc.yml | 4 - .../pubsub/smoke-test/publisher_smoke_test.js | 96 - handwritten/pubsub/src/helper.ts | 260 + handwritten/pubsub/src/iam.ts | 2 +- .../src/iam_policy_service_client_config.json | 38 + handwritten/pubsub/src/message-stream.ts | 5 +- handwritten/pubsub/src/publisher/index.ts | 2 +- .../pubsub/src/publisher/message-queues.ts | 2 +- handwritten/pubsub/src/pubsub.ts | 19 +- .../pubsub/src/service_proto_list.json | 6 +- handwritten/pubsub/src/snapshot.ts | 4 +- handwritten/pubsub/src/subscriber.ts | 5 +- handwritten/pubsub/src/subscription.ts | 2 +- handwritten/pubsub/src/topic.ts | 4 +- .../src/v1/doc/google/iam/v1/doc_policy.js | 16 - .../v1/doc/google/protobuf/doc_duration.js | 97 - .../src/v1/doc/google/protobuf/doc_empty.js | 34 - .../v1/doc/google/protobuf/doc_field_mask.js | 228 - .../v1/doc/google/protobuf/doc_timestamp.js | 117 - .../src/v1/doc/google/pubsub/v1/doc_pubsub.js | 1125 - .../pubsub/src/v1/doc/google/type/doc_expr.js | 16 - handwritten/pubsub/src/v1/index.js | 21 - .../google/iam/v1/doc_options.js => index.ts} | 8 +- handwritten/pubsub/src/v1/publisher_client.js | 1221 - handwritten/pubsub/src/v1/publisher_client.ts | 1583 + .../src/v1/publisher_client_config.json | 74 +- .../pubsub/src/v1/publisher_proto_list.json | 1 - .../pubsub/src/v1/subscriber_client.js | 1942 - .../pubsub/src/v1/subscriber_client.ts | 2243 + .../src/v1/subscriber_client_config.json | 93 +- .../pubsub/src/v1/subscriber_proto_list.json | 1 - handwritten/pubsub/synth.metadata | 27 +- handwritten/pubsub/synth.py | 99 +- handwritten/pubsub/system-test/pubsub.ts | 311 +- handwritten/pubsub/test/gapic-v1.js | 1968 - handwritten/pubsub/test/gapic_publisher_v1.ts | 1783 + .../pubsub/test/gapic_subscriber_v1.ts | 2550 + handwritten/pubsub/test/message-stream.ts | 5 + handwritten/pubsub/test/pubsub.ts | 12 +- handwritten/pubsub/test/topic.ts | 2 +- handwritten/pubsub/tsconfig.json | 9 +- handwritten/pubsub/webpack.config.js | 64 + 61 files changed, 37309 insertions(+), 49550 deletions(-) create mode 100644 handwritten/pubsub/.eslintrc.json create mode 100644 handwritten/pubsub/.mocharc.json rename handwritten/pubsub/{src/v1/doc/google/iam/v1/doc_iam_policy.js => .prettierrc.js} (76%) create mode 100644 handwritten/pubsub/helperMethods.ts.tmpl delete mode 100644 handwritten/pubsub/proto/iam.d.ts delete mode 100644 handwritten/pubsub/proto/pubsub.d.ts create mode 100644 handwritten/pubsub/protos/google/cloud/common_resources.proto delete mode 100644 handwritten/pubsub/protos/google/iam/admin/v1/iam.proto create mode 100644 handwritten/pubsub/protos/google/iam/v1/logging/audit_data.proto delete mode 100644 handwritten/pubsub/smoke-test/.eslintrc.yml delete mode 100644 handwritten/pubsub/smoke-test/publisher_smoke_test.js create mode 100644 handwritten/pubsub/src/helper.ts create mode 100644 handwritten/pubsub/src/iam_policy_service_client_config.json delete mode 100644 handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js delete mode 100644 handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js delete mode 100644 handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js delete mode 100644 handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js delete mode 100644 handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js delete mode 100644 handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js delete mode 100644 handwritten/pubsub/src/v1/doc/google/type/doc_expr.js delete mode 100644 handwritten/pubsub/src/v1/index.js rename handwritten/pubsub/src/v1/{doc/google/iam/v1/doc_options.js => index.ts} (65%) delete mode 100644 handwritten/pubsub/src/v1/publisher_client.js create mode 100644 handwritten/pubsub/src/v1/publisher_client.ts delete mode 100644 handwritten/pubsub/src/v1/subscriber_client.js create mode 100644 handwritten/pubsub/src/v1/subscriber_client.ts delete mode 100644 handwritten/pubsub/test/gapic-v1.js create mode 100644 handwritten/pubsub/test/gapic_publisher_v1.ts create mode 100644 handwritten/pubsub/test/gapic_subscriber_v1.ts create mode 100644 handwritten/pubsub/webpack.config.js diff --git a/handwritten/pubsub/.eslintrc.json b/handwritten/pubsub/.eslintrc.json new file mode 100644 index 00000000000..78215349546 --- /dev/null +++ b/handwritten/pubsub/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "./node_modules/gts" +} diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 0bb5e785871..5d32b23782f 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -1,6 +1,7 @@ **/*.log **/node_modules .coverage +coverage .nyc_output docs/ out/ @@ -8,9 +9,6 @@ build/ system-test/secrets.js system-test/*key.json *.lock -.vscode -**/package-lock.json .DS_Store -google-cloud-logging-winston-*.tgz -google-cloud-logging-bunyan-*.tgz +package-lock.json __pycache__ diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index 223ff94b1e8..c3850f8ac41 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** 'use strict'; @@ -37,7 +40,7 @@ module.exports = { includePattern: '\\.js$' }, templates: { - copyright: 'Copyright 2019 Google, LLC.', + copyright: 'Copyright 2020 Google LLC', includeDate: false, sourceFiles: false, systemName: '@google-cloud/pubsub', diff --git a/handwritten/pubsub/.mocharc.json b/handwritten/pubsub/.mocharc.json new file mode 100644 index 00000000000..670c5e2c24b --- /dev/null +++ b/handwritten/pubsub/.mocharc.json @@ -0,0 +1,5 @@ +{ + "enable-source-maps": true, + "throw-deprecation": true, + "timeout": 10000 +} diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js b/handwritten/pubsub/.prettierrc.js similarity index 76% rename from handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js rename to handwritten/pubsub/.prettierrc.js index 32288959104..d1b95106f4c 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_iam_policy.js +++ b/handwritten/pubsub/.prettierrc.js @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// https://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -12,5 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. +module.exports = { + ...require('gts/.prettierrc.json') +} diff --git a/handwritten/pubsub/helperMethods.ts.tmpl b/handwritten/pubsub/helperMethods.ts.tmpl new file mode 100644 index 00000000000..773675cf9f4 --- /dev/null +++ b/handwritten/pubsub/helperMethods.ts.tmpl @@ -0,0 +1,33 @@ + /** + * This part will be added into src/v1/key_management_service_client.ts by synth.py. + * KMS service requires IAM client for [setIamPolicy, getIamPolicy, testIamPerssion] methods. + * But we don't support it now in micro-generators for rerouting one service to another and mix them in. + * New feature request link: [https://github.com/googleapis/gapic-generator-typescript/issues/315] + * + * So this is manually written for providing methods to the KMS client. + * IamClient is created for KMS client in the constructor using src/helper.ts. + * [setIamPolicy, getIamPolicy, testIamPerssion] methods are created which is calling the corresponding methods from IamClient in `helper.ts`. + */ + + getIamPolicy( + request: protos.google.iam.v1.GetIamPolicyRequest, + options: gax.CallOptions, + callback: protos.google.iam.v1.IAMPolicy.GetIamPolicyCallback + ) { + return this._iamClient.getIamPolicy(request, options, callback); + } + setIamPolicy( + request: protos.google.iam.v1.SetIamPolicyRequest, + options: gax.CallOptions, + callback: protos.google.iam.v1.IAMPolicy.SetIamPolicyCallback + ) { + return this._iamClient.setIamPolicy(request, options, callback); + } + testIamPermissions( + request: protos.google.iam.v1.TestIamPermissionsRequest, + options: gax.CallOptions, + callback?: protos.google.iam.v1.IAMPolicy.TestIamPermissionsCallback + ) { + return this._iamClient.testIamPermissions(request, options, callback); + } +} diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 698b3121ce7..f392202fe35 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -11,7 +11,6 @@ "main": "./build/src/index.js", "types": "./build/src/index.d.ts", "files": [ - "build/proto", "build/protos", "build/src" ], @@ -30,19 +29,17 @@ "scripts": { "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", - "samples-test": "cd samples/ && npm link ../ && npm test && cd ../", - "test": "c8 mocha build/test/*{,/*}.js", - "lint": "eslint '**/*.js' && gts check", + "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", + "test": "c8 mocha build/test", + "lint": "gts check", "predocs": "npm run compile", "docs": "jsdoc -c .jsdoc.js", - "fix": "eslint --fix '**/*.js' && gts fix", + "fix": "gts fix", "clean": "gts clean", - "compile": "tsc -p . && cp -r src/v1 build/src/ && cp -r protos build/ && cp -r proto build/ && cp smoke-test/*.js build/system-test && cp test/*.js build/test", - "prepare": "npm run compile", + "compile": "tsc -p . && cp -r protos build/", + "compile-protos": "compileProtos src", + "prepare": "npm run compile-protos && npm run compile", "pretest": "npm run compile", - "proto": "mkdirp proto && npm run proto:pubsub && npm run proto:iam", - "proto:pubsub": "pbjs -t static-module -w commonjs -p protos google/pubsub/v1/pubsub.proto | pbts -o proto/pubsub.d.ts -", - "proto:iam": "pbjs -t static-module -w commonjs -p protos google/iam/v1/iam_policy.proto | pbts -o proto/iam.d.ts -", "docs-test": "linkinator docs", "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js" @@ -58,7 +55,7 @@ "async-each": "^1.0.1", "extend": "^3.0.2", "google-auth-library": "^6.0.0", - "google-gax": "^1.14.2", + "google-gax": "^2.0.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0", @@ -72,6 +69,7 @@ "@types/mocha": "^7.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", + "@types/node": "^12.12.30", "@types/proxyquire": "^1.3.28", "@types/sinon": "^9.0.0", "@types/tmp": "^0.1.0", @@ -92,12 +90,16 @@ "mocha": "^7.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", + "null-loader": "^3.0.0", "prettier": "^1.18.2", "proxyquire": "^2.0.0", "sinon": "^9.0.0", "source-map-support": "^0.5.9", + "ts-loader": "^6.2.1", "typescript": "3.6.4", "uuid": "^7.0.0", + "webpack": "^4.42.0", + "webpack-cli": "^3.3.11", "yargs": "^15.0.0" } } diff --git a/handwritten/pubsub/proto/iam.d.ts b/handwritten/pubsub/proto/iam.d.ts deleted file mode 100644 index 4a149a1a864..00000000000 --- a/handwritten/pubsub/proto/iam.d.ts +++ /dev/null @@ -1,4418 +0,0 @@ -import * as $protobuf from "protobufjs"; -/** Namespace google. */ -export namespace google { - - /** Namespace iam. */ - namespace iam { - - /** Namespace v1. */ - namespace v1 { - - /** Represents a IAMPolicy */ - class IAMPolicy extends $protobuf.rpc.Service { - - /** - * Constructs a new IAMPolicy service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - - /** - * Creates new IAMPolicy service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): IAMPolicy; - - /** - * Calls SetIamPolicy. - * @param request SetIamPolicyRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Policy - */ - public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.SetIamPolicyCallback): void; - - /** - * Calls SetIamPolicy. - * @param request SetIamPolicyRequest message or plain object - * @returns Promise - */ - public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest): Promise; - - /** - * Calls GetIamPolicy. - * @param request GetIamPolicyRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Policy - */ - public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.GetIamPolicyCallback): void; - - /** - * Calls GetIamPolicy. - * @param request GetIamPolicyRequest message or plain object - * @returns Promise - */ - public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest): Promise; - - /** - * Calls TestIamPermissions. - * @param request TestIamPermissionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and TestIamPermissionsResponse - */ - public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest, callback: google.iam.v1.IAMPolicy.TestIamPermissionsCallback): void; - - /** - * Calls TestIamPermissions. - * @param request TestIamPermissionsRequest message or plain object - * @returns Promise - */ - public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest): Promise; - } - - namespace IAMPolicy { - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. - * @param error Error, if any - * @param [response] Policy - */ - type SetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. - * @param error Error, if any - * @param [response] Policy - */ - type GetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. - * @param error Error, if any - * @param [response] TestIamPermissionsResponse - */ - type TestIamPermissionsCallback = (error: (Error|null), response?: google.iam.v1.TestIamPermissionsResponse) => void; - } - - /** Properties of a SetIamPolicyRequest. */ - interface ISetIamPolicyRequest { - - /** SetIamPolicyRequest resource */ - resource?: (string|null); - - /** SetIamPolicyRequest policy */ - policy?: (google.iam.v1.IPolicy|null); - } - - /** Represents a SetIamPolicyRequest. */ - class SetIamPolicyRequest implements ISetIamPolicyRequest { - - /** - * Constructs a new SetIamPolicyRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.ISetIamPolicyRequest); - - /** SetIamPolicyRequest resource. */ - public resource: string; - - /** SetIamPolicyRequest policy. */ - public policy?: (google.iam.v1.IPolicy|null); - - /** - * Creates a new SetIamPolicyRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns SetIamPolicyRequest instance - */ - public static create(properties?: google.iam.v1.ISetIamPolicyRequest): google.iam.v1.SetIamPolicyRequest; - - /** - * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @param message SetIamPolicyRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @param message SetIamPolicyRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SetIamPolicyRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.SetIamPolicyRequest; - - /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SetIamPolicyRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.SetIamPolicyRequest; - - /** - * Verifies a SetIamPolicyRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SetIamPolicyRequest - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.SetIamPolicyRequest; - - /** - * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. - * @param message SetIamPolicyRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.SetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this SetIamPolicyRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a GetIamPolicyRequest. */ - interface IGetIamPolicyRequest { - - /** GetIamPolicyRequest resource */ - resource?: (string|null); - - /** GetIamPolicyRequest options */ - options?: (google.iam.v1.IGetPolicyOptions|null); - } - - /** Represents a GetIamPolicyRequest. */ - class GetIamPolicyRequest implements IGetIamPolicyRequest { - - /** - * Constructs a new GetIamPolicyRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IGetIamPolicyRequest); - - /** GetIamPolicyRequest resource. */ - public resource: string; - - /** GetIamPolicyRequest options. */ - public options?: (google.iam.v1.IGetPolicyOptions|null); - - /** - * Creates a new GetIamPolicyRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns GetIamPolicyRequest instance - */ - public static create(properties?: google.iam.v1.IGetIamPolicyRequest): google.iam.v1.GetIamPolicyRequest; - - /** - * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. - * @param message GetIamPolicyRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. - * @param message GetIamPolicyRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetIamPolicyRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetIamPolicyRequest; - - /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetIamPolicyRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetIamPolicyRequest; - - /** - * Verifies a GetIamPolicyRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetIamPolicyRequest - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.GetIamPolicyRequest; - - /** - * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. - * @param message GetIamPolicyRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.GetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GetIamPolicyRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a TestIamPermissionsRequest. */ - interface ITestIamPermissionsRequest { - - /** TestIamPermissionsRequest resource */ - resource?: (string|null); - - /** TestIamPermissionsRequest permissions */ - permissions?: (string[]|null); - } - - /** Represents a TestIamPermissionsRequest. */ - class TestIamPermissionsRequest implements ITestIamPermissionsRequest { - - /** - * Constructs a new TestIamPermissionsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.ITestIamPermissionsRequest); - - /** TestIamPermissionsRequest resource. */ - public resource: string; - - /** TestIamPermissionsRequest permissions. */ - public permissions: string[]; - - /** - * Creates a new TestIamPermissionsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns TestIamPermissionsRequest instance - */ - public static create(properties?: google.iam.v1.ITestIamPermissionsRequest): google.iam.v1.TestIamPermissionsRequest; - - /** - * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. - * @param message TestIamPermissionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. - * @param message TestIamPermissionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns TestIamPermissionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsRequest; - - /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns TestIamPermissionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsRequest; - - /** - * Verifies a TestIamPermissionsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns TestIamPermissionsRequest - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsRequest; - - /** - * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. - * @param message TestIamPermissionsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.TestIamPermissionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this TestIamPermissionsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a TestIamPermissionsResponse. */ - interface ITestIamPermissionsResponse { - - /** TestIamPermissionsResponse permissions */ - permissions?: (string[]|null); - } - - /** Represents a TestIamPermissionsResponse. */ - class TestIamPermissionsResponse implements ITestIamPermissionsResponse { - - /** - * Constructs a new TestIamPermissionsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.ITestIamPermissionsResponse); - - /** TestIamPermissionsResponse permissions. */ - public permissions: string[]; - - /** - * Creates a new TestIamPermissionsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns TestIamPermissionsResponse instance - */ - public static create(properties?: google.iam.v1.ITestIamPermissionsResponse): google.iam.v1.TestIamPermissionsResponse; - - /** - * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. - * @param message TestIamPermissionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. - * @param message TestIamPermissionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns TestIamPermissionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsResponse; - - /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns TestIamPermissionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsResponse; - - /** - * Verifies a TestIamPermissionsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns TestIamPermissionsResponse - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsResponse; - - /** - * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. - * @param message TestIamPermissionsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.TestIamPermissionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this TestIamPermissionsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a GetPolicyOptions. */ - interface IGetPolicyOptions { - - /** GetPolicyOptions requestedPolicyVersion */ - requestedPolicyVersion?: (number|null); - } - - /** Represents a GetPolicyOptions. */ - class GetPolicyOptions implements IGetPolicyOptions { - - /** - * Constructs a new GetPolicyOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IGetPolicyOptions); - - /** GetPolicyOptions requestedPolicyVersion. */ - public requestedPolicyVersion: number; - - /** - * Creates a new GetPolicyOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns GetPolicyOptions instance - */ - public static create(properties?: google.iam.v1.IGetPolicyOptions): google.iam.v1.GetPolicyOptions; - - /** - * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. - * @param message GetPolicyOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. - * @param message GetPolicyOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GetPolicyOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetPolicyOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetPolicyOptions; - - /** - * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetPolicyOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetPolicyOptions; - - /** - * Verifies a GetPolicyOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetPolicyOptions - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.GetPolicyOptions; - - /** - * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. - * @param message GetPolicyOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.GetPolicyOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GetPolicyOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Policy. */ - interface IPolicy { - - /** Policy version */ - version?: (number|null); - - /** Policy bindings */ - bindings?: (google.iam.v1.IBinding[]|null); - - /** Policy etag */ - etag?: (Uint8Array|null); - } - - /** Represents a Policy. */ - class Policy implements IPolicy { - - /** - * Constructs a new Policy. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IPolicy); - - /** Policy version. */ - public version: number; - - /** Policy bindings. */ - public bindings: google.iam.v1.IBinding[]; - - /** Policy etag. */ - public etag: Uint8Array; - - /** - * Creates a new Policy instance using the specified properties. - * @param [properties] Properties to set - * @returns Policy instance - */ - public static create(properties?: google.iam.v1.IPolicy): google.iam.v1.Policy; - - /** - * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @param message Policy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @param message Policy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Policy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Policy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Policy; - - /** - * Decodes a Policy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Policy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Policy; - - /** - * Verifies a Policy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Policy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Policy - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.Policy; - - /** - * Creates a plain object from a Policy message. Also converts values to other types if specified. - * @param message Policy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.Policy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Policy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Binding. */ - interface IBinding { - - /** Binding role */ - role?: (string|null); - - /** Binding members */ - members?: (string[]|null); - - /** Binding condition */ - condition?: (google.type.IExpr|null); - } - - /** Represents a Binding. */ - class Binding implements IBinding { - - /** - * Constructs a new Binding. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IBinding); - - /** Binding role. */ - public role: string; - - /** Binding members. */ - public members: string[]; - - /** Binding condition. */ - public condition?: (google.type.IExpr|null); - - /** - * Creates a new Binding instance using the specified properties. - * @param [properties] Properties to set - * @returns Binding instance - */ - public static create(properties?: google.iam.v1.IBinding): google.iam.v1.Binding; - - /** - * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @param message Binding message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @param message Binding message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Binding message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Binding - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Binding; - - /** - * Decodes a Binding message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Binding - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Binding; - - /** - * Verifies a Binding message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Binding message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Binding - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.Binding; - - /** - * Creates a plain object from a Binding message. Also converts values to other types if specified. - * @param message Binding - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.Binding, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Binding to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a PolicyDelta. */ - interface IPolicyDelta { - - /** PolicyDelta bindingDeltas */ - bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); - - /** PolicyDelta auditConfigDeltas */ - auditConfigDeltas?: (google.iam.v1.IAuditConfigDelta[]|null); - } - - /** Represents a PolicyDelta. */ - class PolicyDelta implements IPolicyDelta { - - /** - * Constructs a new PolicyDelta. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IPolicyDelta); - - /** PolicyDelta bindingDeltas. */ - public bindingDeltas: google.iam.v1.IBindingDelta[]; - - /** PolicyDelta auditConfigDeltas. */ - public auditConfigDeltas: google.iam.v1.IAuditConfigDelta[]; - - /** - * Creates a new PolicyDelta instance using the specified properties. - * @param [properties] Properties to set - * @returns PolicyDelta instance - */ - public static create(properties?: google.iam.v1.IPolicyDelta): google.iam.v1.PolicyDelta; - - /** - * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. - * @param message PolicyDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. - * @param message PolicyDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PolicyDelta message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PolicyDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.PolicyDelta; - - /** - * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PolicyDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.PolicyDelta; - - /** - * Verifies a PolicyDelta message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PolicyDelta - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.PolicyDelta; - - /** - * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. - * @param message PolicyDelta - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.PolicyDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PolicyDelta to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a BindingDelta. */ - interface IBindingDelta { - - /** BindingDelta action */ - action?: (google.iam.v1.BindingDelta.Action|null); - - /** BindingDelta role */ - role?: (string|null); - - /** BindingDelta member */ - member?: (string|null); - - /** BindingDelta condition */ - condition?: (google.type.IExpr|null); - } - - /** Represents a BindingDelta. */ - class BindingDelta implements IBindingDelta { - - /** - * Constructs a new BindingDelta. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IBindingDelta); - - /** BindingDelta action. */ - public action: google.iam.v1.BindingDelta.Action; - - /** BindingDelta role. */ - public role: string; - - /** BindingDelta member. */ - public member: string; - - /** BindingDelta condition. */ - public condition?: (google.type.IExpr|null); - - /** - * Creates a new BindingDelta instance using the specified properties. - * @param [properties] Properties to set - * @returns BindingDelta instance - */ - public static create(properties?: google.iam.v1.IBindingDelta): google.iam.v1.BindingDelta; - - /** - * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. - * @param message BindingDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. - * @param message BindingDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a BindingDelta message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns BindingDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.BindingDelta; - - /** - * Decodes a BindingDelta message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns BindingDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.BindingDelta; - - /** - * Verifies a BindingDelta message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns BindingDelta - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.BindingDelta; - - /** - * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. - * @param message BindingDelta - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.BindingDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this BindingDelta to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace BindingDelta { - - /** Action enum. */ - enum Action { - ACTION_UNSPECIFIED = 0, - ADD = 1, - REMOVE = 2 - } - } - - /** Properties of an AuditConfigDelta. */ - interface IAuditConfigDelta { - - /** AuditConfigDelta action */ - action?: (google.iam.v1.AuditConfigDelta.Action|null); - - /** AuditConfigDelta service */ - service?: (string|null); - - /** AuditConfigDelta exemptedMember */ - exemptedMember?: (string|null); - - /** AuditConfigDelta logType */ - logType?: (string|null); - } - - /** Represents an AuditConfigDelta. */ - class AuditConfigDelta implements IAuditConfigDelta { - - /** - * Constructs a new AuditConfigDelta. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IAuditConfigDelta); - - /** AuditConfigDelta action. */ - public action: google.iam.v1.AuditConfigDelta.Action; - - /** AuditConfigDelta service. */ - public service: string; - - /** AuditConfigDelta exemptedMember. */ - public exemptedMember: string; - - /** AuditConfigDelta logType. */ - public logType: string; - - /** - * Creates a new AuditConfigDelta instance using the specified properties. - * @param [properties] Properties to set - * @returns AuditConfigDelta instance - */ - public static create(properties?: google.iam.v1.IAuditConfigDelta): google.iam.v1.AuditConfigDelta; - - /** - * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. - * @param message AuditConfigDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. - * @param message AuditConfigDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an AuditConfigDelta message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns AuditConfigDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.AuditConfigDelta; - - /** - * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns AuditConfigDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.AuditConfigDelta; - - /** - * Verifies an AuditConfigDelta message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns AuditConfigDelta - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.AuditConfigDelta; - - /** - * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. - * @param message AuditConfigDelta - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.AuditConfigDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this AuditConfigDelta to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace AuditConfigDelta { - - /** Action enum. */ - enum Action { - ACTION_UNSPECIFIED = 0, - ADD = 1, - REMOVE = 2 - } - } - } - } - - /** Namespace api. */ - namespace api { - - /** Properties of a Http. */ - interface IHttp { - - /** Http rules */ - rules?: (google.api.IHttpRule[]|null); - } - - /** Represents a Http. */ - class Http implements IHttp { - - /** - * Constructs a new Http. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IHttp); - - /** Http rules. */ - public rules: google.api.IHttpRule[]; - - /** - * Creates a new Http instance using the specified properties. - * @param [properties] Properties to set - * @returns Http instance - */ - public static create(properties?: google.api.IHttp): google.api.Http; - - /** - * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @param message Http message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @param message Http message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Http message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Http - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; - - /** - * Decodes a Http message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Http - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; - - /** - * Verifies a Http message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Http message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Http - */ - public static fromObject(object: { [k: string]: any }): google.api.Http; - - /** - * Creates a plain object from a Http message. Also converts values to other types if specified. - * @param message Http - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Http to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a HttpRule. */ - interface IHttpRule { - - /** HttpRule selector */ - selector?: (string|null); - - /** HttpRule get */ - get?: (string|null); - - /** HttpRule put */ - put?: (string|null); - - /** HttpRule post */ - post?: (string|null); - - /** HttpRule delete */ - "delete"?: (string|null); - - /** HttpRule patch */ - patch?: (string|null); - - /** HttpRule custom */ - custom?: (google.api.ICustomHttpPattern|null); - - /** HttpRule body */ - body?: (string|null); - - /** HttpRule additionalBindings */ - additionalBindings?: (google.api.IHttpRule[]|null); - } - - /** Represents a HttpRule. */ - class HttpRule implements IHttpRule { - - /** - * Constructs a new HttpRule. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IHttpRule); - - /** HttpRule selector. */ - public selector: string; - - /** HttpRule get. */ - public get: string; - - /** HttpRule put. */ - public put: string; - - /** HttpRule post. */ - public post: string; - - /** HttpRule delete. */ - public delete: string; - - /** HttpRule patch. */ - public patch: string; - - /** HttpRule custom. */ - public custom?: (google.api.ICustomHttpPattern|null); - - /** HttpRule body. */ - public body: string; - - /** HttpRule additionalBindings. */ - public additionalBindings: google.api.IHttpRule[]; - - /** HttpRule pattern. */ - public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); - - /** - * Creates a new HttpRule instance using the specified properties. - * @param [properties] Properties to set - * @returns HttpRule instance - */ - public static create(properties?: google.api.IHttpRule): google.api.HttpRule; - - /** - * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @param message HttpRule message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @param message HttpRule message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a HttpRule message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns HttpRule - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; - - /** - * Decodes a HttpRule message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns HttpRule - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; - - /** - * Verifies a HttpRule message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns HttpRule - */ - public static fromObject(object: { [k: string]: any }): google.api.HttpRule; - - /** - * Creates a plain object from a HttpRule message. Also converts values to other types if specified. - * @param message HttpRule - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this HttpRule to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a CustomHttpPattern. */ - interface ICustomHttpPattern { - - /** CustomHttpPattern kind */ - kind?: (string|null); - - /** CustomHttpPattern path */ - path?: (string|null); - } - - /** Represents a CustomHttpPattern. */ - class CustomHttpPattern implements ICustomHttpPattern { - - /** - * Constructs a new CustomHttpPattern. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.ICustomHttpPattern); - - /** CustomHttpPattern kind. */ - public kind: string; - - /** CustomHttpPattern path. */ - public path: string; - - /** - * Creates a new CustomHttpPattern instance using the specified properties. - * @param [properties] Properties to set - * @returns CustomHttpPattern instance - */ - public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; - - /** - * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @param message CustomHttpPattern message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @param message CustomHttpPattern message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; - - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; - - /** - * Verifies a CustomHttpPattern message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CustomHttpPattern - */ - public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; - - /** - * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. - * @param message CustomHttpPattern - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this CustomHttpPattern to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Namespace protobuf. */ - namespace protobuf { - - /** Properties of a FileDescriptorSet. */ - interface IFileDescriptorSet { - - /** FileDescriptorSet file */ - file?: (google.protobuf.IFileDescriptorProto[]|null); - } - - /** Represents a FileDescriptorSet. */ - class FileDescriptorSet implements IFileDescriptorSet { - - /** - * Constructs a new FileDescriptorSet. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileDescriptorSet); - - /** FileDescriptorSet file. */ - public file: google.protobuf.IFileDescriptorProto[]; - - /** - * Creates a new FileDescriptorSet instance using the specified properties. - * @param [properties] Properties to set - * @returns FileDescriptorSet instance - */ - public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; - - /** - * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param message FileDescriptorSet message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param message FileDescriptorSet message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; - - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; - - /** - * Verifies a FileDescriptorSet message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileDescriptorSet - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; - - /** - * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. - * @param message FileDescriptorSet - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FileDescriptorSet to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FileDescriptorProto. */ - interface IFileDescriptorProto { - - /** FileDescriptorProto name */ - name?: (string|null); - - /** FileDescriptorProto package */ - "package"?: (string|null); - - /** FileDescriptorProto dependency */ - dependency?: (string[]|null); - - /** FileDescriptorProto publicDependency */ - publicDependency?: (number[]|null); - - /** FileDescriptorProto weakDependency */ - weakDependency?: (number[]|null); - - /** FileDescriptorProto messageType */ - messageType?: (google.protobuf.IDescriptorProto[]|null); - - /** FileDescriptorProto enumType */ - enumType?: (google.protobuf.IEnumDescriptorProto[]|null); - - /** FileDescriptorProto service */ - service?: (google.protobuf.IServiceDescriptorProto[]|null); - - /** FileDescriptorProto extension */ - extension?: (google.protobuf.IFieldDescriptorProto[]|null); - - /** FileDescriptorProto options */ - options?: (google.protobuf.IFileOptions|null); - - /** FileDescriptorProto sourceCodeInfo */ - sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); - - /** FileDescriptorProto syntax */ - syntax?: (string|null); - } - - /** Represents a FileDescriptorProto. */ - class FileDescriptorProto implements IFileDescriptorProto { - - /** - * Constructs a new FileDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileDescriptorProto); - - /** FileDescriptorProto name. */ - public name: string; - - /** FileDescriptorProto package. */ - public package: string; - - /** FileDescriptorProto dependency. */ - public dependency: string[]; - - /** FileDescriptorProto publicDependency. */ - public publicDependency: number[]; - - /** FileDescriptorProto weakDependency. */ - public weakDependency: number[]; - - /** FileDescriptorProto messageType. */ - public messageType: google.protobuf.IDescriptorProto[]; - - /** FileDescriptorProto enumType. */ - public enumType: google.protobuf.IEnumDescriptorProto[]; - - /** FileDescriptorProto service. */ - public service: google.protobuf.IServiceDescriptorProto[]; - - /** FileDescriptorProto extension. */ - public extension: google.protobuf.IFieldDescriptorProto[]; - - /** FileDescriptorProto options. */ - public options?: (google.protobuf.IFileOptions|null); - - /** FileDescriptorProto sourceCodeInfo. */ - public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); - - /** FileDescriptorProto syntax. */ - public syntax: string; - - /** - * Creates a new FileDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns FileDescriptorProto instance - */ - public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; - - /** - * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param message FileDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param message FileDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; - - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; - - /** - * Verifies a FileDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; - - /** - * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. - * @param message FileDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FileDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a DescriptorProto. */ - interface IDescriptorProto { - - /** DescriptorProto name */ - name?: (string|null); - - /** DescriptorProto field */ - field?: (google.protobuf.IFieldDescriptorProto[]|null); - - /** DescriptorProto extension */ - extension?: (google.protobuf.IFieldDescriptorProto[]|null); - - /** DescriptorProto nestedType */ - nestedType?: (google.protobuf.IDescriptorProto[]|null); - - /** DescriptorProto enumType */ - enumType?: (google.protobuf.IEnumDescriptorProto[]|null); - - /** DescriptorProto extensionRange */ - extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); - - /** DescriptorProto oneofDecl */ - oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); - - /** DescriptorProto options */ - options?: (google.protobuf.IMessageOptions|null); - - /** DescriptorProto reservedRange */ - reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); - - /** DescriptorProto reservedName */ - reservedName?: (string[]|null); - } - - /** Represents a DescriptorProto. */ - class DescriptorProto implements IDescriptorProto { - - /** - * Constructs a new DescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IDescriptorProto); - - /** DescriptorProto name. */ - public name: string; - - /** DescriptorProto field. */ - public field: google.protobuf.IFieldDescriptorProto[]; - - /** DescriptorProto extension. */ - public extension: google.protobuf.IFieldDescriptorProto[]; - - /** DescriptorProto nestedType. */ - public nestedType: google.protobuf.IDescriptorProto[]; - - /** DescriptorProto enumType. */ - public enumType: google.protobuf.IEnumDescriptorProto[]; - - /** DescriptorProto extensionRange. */ - public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; - - /** DescriptorProto oneofDecl. */ - public oneofDecl: google.protobuf.IOneofDescriptorProto[]; - - /** DescriptorProto options. */ - public options?: (google.protobuf.IMessageOptions|null); - - /** DescriptorProto reservedRange. */ - public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; - - /** DescriptorProto reservedName. */ - public reservedName: string[]; - - /** - * Creates a new DescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns DescriptorProto instance - */ - public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; - - /** - * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param message DescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param message DescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; - - /** - * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; - - /** - * Verifies a DescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; - - /** - * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. - * @param message DescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace DescriptorProto { - - /** Properties of an ExtensionRange. */ - interface IExtensionRange { - - /** ExtensionRange start */ - start?: (number|null); - - /** ExtensionRange end */ - end?: (number|null); - } - - /** Represents an ExtensionRange. */ - class ExtensionRange implements IExtensionRange { - - /** - * Constructs a new ExtensionRange. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); - - /** ExtensionRange start. */ - public start: number; - - /** ExtensionRange end. */ - public end: number; - - /** - * Creates a new ExtensionRange instance using the specified properties. - * @param [properties] Properties to set - * @returns ExtensionRange instance - */ - public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; - - /** - * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param message ExtensionRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param message ExtensionRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an ExtensionRange message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExtensionRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; - - /** - * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExtensionRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; - - /** - * Verifies an ExtensionRange message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExtensionRange - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; - - /** - * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. - * @param message ExtensionRange - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ExtensionRange to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ReservedRange. */ - interface IReservedRange { - - /** ReservedRange start */ - start?: (number|null); - - /** ReservedRange end */ - end?: (number|null); - } - - /** Represents a ReservedRange. */ - class ReservedRange implements IReservedRange { - - /** - * Constructs a new ReservedRange. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); - - /** ReservedRange start. */ - public start: number; - - /** ReservedRange end. */ - public end: number; - - /** - * Creates a new ReservedRange instance using the specified properties. - * @param [properties] Properties to set - * @returns ReservedRange instance - */ - public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param message ReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param message ReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ReservedRange message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Decodes a ReservedRange message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Verifies a ReservedRange message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ReservedRange - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. - * @param message ReservedRange - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ReservedRange to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of a FieldDescriptorProto. */ - interface IFieldDescriptorProto { - - /** FieldDescriptorProto name */ - name?: (string|null); - - /** FieldDescriptorProto number */ - number?: (number|null); - - /** FieldDescriptorProto label */ - label?: (google.protobuf.FieldDescriptorProto.Label|null); - - /** FieldDescriptorProto type */ - type?: (google.protobuf.FieldDescriptorProto.Type|null); - - /** FieldDescriptorProto typeName */ - typeName?: (string|null); - - /** FieldDescriptorProto extendee */ - extendee?: (string|null); - - /** FieldDescriptorProto defaultValue */ - defaultValue?: (string|null); - - /** FieldDescriptorProto oneofIndex */ - oneofIndex?: (number|null); - - /** FieldDescriptorProto jsonName */ - jsonName?: (string|null); - - /** FieldDescriptorProto options */ - options?: (google.protobuf.IFieldOptions|null); - } - - /** Represents a FieldDescriptorProto. */ - class FieldDescriptorProto implements IFieldDescriptorProto { - - /** - * Constructs a new FieldDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldDescriptorProto); - - /** FieldDescriptorProto name. */ - public name: string; - - /** FieldDescriptorProto number. */ - public number: number; - - /** FieldDescriptorProto label. */ - public label: google.protobuf.FieldDescriptorProto.Label; - - /** FieldDescriptorProto type. */ - public type: google.protobuf.FieldDescriptorProto.Type; - - /** FieldDescriptorProto typeName. */ - public typeName: string; - - /** FieldDescriptorProto extendee. */ - public extendee: string; - - /** FieldDescriptorProto defaultValue. */ - public defaultValue: string; - - /** FieldDescriptorProto oneofIndex. */ - public oneofIndex: number; - - /** FieldDescriptorProto jsonName. */ - public jsonName: string; - - /** FieldDescriptorProto options. */ - public options?: (google.protobuf.IFieldOptions|null); - - /** - * Creates a new FieldDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldDescriptorProto instance - */ - public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; - - /** - * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param message FieldDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param message FieldDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; - - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; - - /** - * Verifies a FieldDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; - - /** - * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. - * @param message FieldDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FieldDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace FieldDescriptorProto { - - /** Type enum. */ - enum Type { - TYPE_DOUBLE = 1, - TYPE_FLOAT = 2, - TYPE_INT64 = 3, - TYPE_UINT64 = 4, - TYPE_INT32 = 5, - TYPE_FIXED64 = 6, - TYPE_FIXED32 = 7, - TYPE_BOOL = 8, - TYPE_STRING = 9, - TYPE_GROUP = 10, - TYPE_MESSAGE = 11, - TYPE_BYTES = 12, - TYPE_UINT32 = 13, - TYPE_ENUM = 14, - TYPE_SFIXED32 = 15, - TYPE_SFIXED64 = 16, - TYPE_SINT32 = 17, - TYPE_SINT64 = 18 - } - - /** Label enum. */ - enum Label { - LABEL_OPTIONAL = 1, - LABEL_REQUIRED = 2, - LABEL_REPEATED = 3 - } - } - - /** Properties of an OneofDescriptorProto. */ - interface IOneofDescriptorProto { - - /** OneofDescriptorProto name */ - name?: (string|null); - - /** OneofDescriptorProto options */ - options?: (google.protobuf.IOneofOptions|null); - } - - /** Represents an OneofDescriptorProto. */ - class OneofDescriptorProto implements IOneofDescriptorProto { - - /** - * Constructs a new OneofDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IOneofDescriptorProto); - - /** OneofDescriptorProto name. */ - public name: string; - - /** OneofDescriptorProto options. */ - public options?: (google.protobuf.IOneofOptions|null); - - /** - * Creates a new OneofDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns OneofDescriptorProto instance - */ - public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; - - /** - * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param message OneofDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param message OneofDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; - - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; - - /** - * Verifies an OneofDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OneofDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; - - /** - * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. - * @param message OneofDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this OneofDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an EnumDescriptorProto. */ - interface IEnumDescriptorProto { - - /** EnumDescriptorProto name */ - name?: (string|null); - - /** EnumDescriptorProto value */ - value?: (google.protobuf.IEnumValueDescriptorProto[]|null); - - /** EnumDescriptorProto options */ - options?: (google.protobuf.IEnumOptions|null); - } - - /** Represents an EnumDescriptorProto. */ - class EnumDescriptorProto implements IEnumDescriptorProto { - - /** - * Constructs a new EnumDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumDescriptorProto); - - /** EnumDescriptorProto name. */ - public name: string; - - /** EnumDescriptorProto value. */ - public value: google.protobuf.IEnumValueDescriptorProto[]; - - /** EnumDescriptorProto options. */ - public options?: (google.protobuf.IEnumOptions|null); - - /** - * Creates a new EnumDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumDescriptorProto instance - */ - public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; - - /** - * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param message EnumDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param message EnumDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; - - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; - - /** - * Verifies an EnumDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; - - /** - * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. - * @param message EnumDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an EnumValueDescriptorProto. */ - interface IEnumValueDescriptorProto { - - /** EnumValueDescriptorProto name */ - name?: (string|null); - - /** EnumValueDescriptorProto number */ - number?: (number|null); - - /** EnumValueDescriptorProto options */ - options?: (google.protobuf.IEnumValueOptions|null); - } - - /** Represents an EnumValueDescriptorProto. */ - class EnumValueDescriptorProto implements IEnumValueDescriptorProto { - - /** - * Constructs a new EnumValueDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumValueDescriptorProto); - - /** EnumValueDescriptorProto name. */ - public name: string; - - /** EnumValueDescriptorProto number. */ - public number: number; - - /** EnumValueDescriptorProto options. */ - public options?: (google.protobuf.IEnumValueOptions|null); - - /** - * Creates a new EnumValueDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumValueDescriptorProto instance - */ - public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; - - /** - * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param message EnumValueDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param message EnumValueDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; - - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; - - /** - * Verifies an EnumValueDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumValueDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; - - /** - * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. - * @param message EnumValueDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumValueDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ServiceDescriptorProto. */ - interface IServiceDescriptorProto { - - /** ServiceDescriptorProto name */ - name?: (string|null); - - /** ServiceDescriptorProto method */ - method?: (google.protobuf.IMethodDescriptorProto[]|null); - - /** ServiceDescriptorProto options */ - options?: (google.protobuf.IServiceOptions|null); - } - - /** Represents a ServiceDescriptorProto. */ - class ServiceDescriptorProto implements IServiceDescriptorProto { - - /** - * Constructs a new ServiceDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IServiceDescriptorProto); - - /** ServiceDescriptorProto name. */ - public name: string; - - /** ServiceDescriptorProto method. */ - public method: google.protobuf.IMethodDescriptorProto[]; - - /** ServiceDescriptorProto options. */ - public options?: (google.protobuf.IServiceOptions|null); - - /** - * Creates a new ServiceDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns ServiceDescriptorProto instance - */ - public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; - - /** - * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param message ServiceDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param message ServiceDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; - - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; - - /** - * Verifies a ServiceDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ServiceDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; - - /** - * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. - * @param message ServiceDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ServiceDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a MethodDescriptorProto. */ - interface IMethodDescriptorProto { - - /** MethodDescriptorProto name */ - name?: (string|null); - - /** MethodDescriptorProto inputType */ - inputType?: (string|null); - - /** MethodDescriptorProto outputType */ - outputType?: (string|null); - - /** MethodDescriptorProto options */ - options?: (google.protobuf.IMethodOptions|null); - - /** MethodDescriptorProto clientStreaming */ - clientStreaming?: (boolean|null); - - /** MethodDescriptorProto serverStreaming */ - serverStreaming?: (boolean|null); - } - - /** Represents a MethodDescriptorProto. */ - class MethodDescriptorProto implements IMethodDescriptorProto { - - /** - * Constructs a new MethodDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMethodDescriptorProto); - - /** MethodDescriptorProto name. */ - public name: string; - - /** MethodDescriptorProto inputType. */ - public inputType: string; - - /** MethodDescriptorProto outputType. */ - public outputType: string; - - /** MethodDescriptorProto options. */ - public options?: (google.protobuf.IMethodOptions|null); - - /** MethodDescriptorProto clientStreaming. */ - public clientStreaming: boolean; - - /** MethodDescriptorProto serverStreaming. */ - public serverStreaming: boolean; - - /** - * Creates a new MethodDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodDescriptorProto instance - */ - public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; - - /** - * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param message MethodDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param message MethodDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; - - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; - - /** - * Verifies a MethodDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; - - /** - * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. - * @param message MethodDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this MethodDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FileOptions. */ - interface IFileOptions { - - /** FileOptions javaPackage */ - javaPackage?: (string|null); - - /** FileOptions javaOuterClassname */ - javaOuterClassname?: (string|null); - - /** FileOptions javaMultipleFiles */ - javaMultipleFiles?: (boolean|null); - - /** FileOptions javaGenerateEqualsAndHash */ - javaGenerateEqualsAndHash?: (boolean|null); - - /** FileOptions javaStringCheckUtf8 */ - javaStringCheckUtf8?: (boolean|null); - - /** FileOptions optimizeFor */ - optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|null); - - /** FileOptions goPackage */ - goPackage?: (string|null); - - /** FileOptions ccGenericServices */ - ccGenericServices?: (boolean|null); - - /** FileOptions javaGenericServices */ - javaGenericServices?: (boolean|null); - - /** FileOptions pyGenericServices */ - pyGenericServices?: (boolean|null); - - /** FileOptions deprecated */ - deprecated?: (boolean|null); - - /** FileOptions ccEnableArenas */ - ccEnableArenas?: (boolean|null); - - /** FileOptions objcClassPrefix */ - objcClassPrefix?: (string|null); - - /** FileOptions csharpNamespace */ - csharpNamespace?: (string|null); - - /** FileOptions swiftPrefix */ - swiftPrefix?: (string|null); - - /** FileOptions phpClassPrefix */ - phpClassPrefix?: (string|null); - - /** FileOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents a FileOptions. */ - class FileOptions implements IFileOptions { - - /** - * Constructs a new FileOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileOptions); - - /** FileOptions javaPackage. */ - public javaPackage: string; - - /** FileOptions javaOuterClassname. */ - public javaOuterClassname: string; - - /** FileOptions javaMultipleFiles. */ - public javaMultipleFiles: boolean; - - /** FileOptions javaGenerateEqualsAndHash. */ - public javaGenerateEqualsAndHash: boolean; - - /** FileOptions javaStringCheckUtf8. */ - public javaStringCheckUtf8: boolean; - - /** FileOptions optimizeFor. */ - public optimizeFor: google.protobuf.FileOptions.OptimizeMode; - - /** FileOptions goPackage. */ - public goPackage: string; - - /** FileOptions ccGenericServices. */ - public ccGenericServices: boolean; - - /** FileOptions javaGenericServices. */ - public javaGenericServices: boolean; - - /** FileOptions pyGenericServices. */ - public pyGenericServices: boolean; - - /** FileOptions deprecated. */ - public deprecated: boolean; - - /** FileOptions ccEnableArenas. */ - public ccEnableArenas: boolean; - - /** FileOptions objcClassPrefix. */ - public objcClassPrefix: string; - - /** FileOptions csharpNamespace. */ - public csharpNamespace: string; - - /** FileOptions swiftPrefix. */ - public swiftPrefix: string; - - /** FileOptions phpClassPrefix. */ - public phpClassPrefix: string; - - /** FileOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new FileOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns FileOptions instance - */ - public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; - - /** - * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param message FileOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param message FileOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FileOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; - - /** - * Decodes a FileOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; - - /** - * Verifies a FileOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; - - /** - * Creates a plain object from a FileOptions message. Also converts values to other types if specified. - * @param message FileOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FileOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace FileOptions { - - /** OptimizeMode enum. */ - enum OptimizeMode { - SPEED = 1, - CODE_SIZE = 2, - LITE_RUNTIME = 3 - } - } - - /** Properties of a MessageOptions. */ - interface IMessageOptions { - - /** MessageOptions messageSetWireFormat */ - messageSetWireFormat?: (boolean|null); - - /** MessageOptions noStandardDescriptorAccessor */ - noStandardDescriptorAccessor?: (boolean|null); - - /** MessageOptions deprecated */ - deprecated?: (boolean|null); - - /** MessageOptions mapEntry */ - mapEntry?: (boolean|null); - - /** MessageOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents a MessageOptions. */ - class MessageOptions implements IMessageOptions { - - /** - * Constructs a new MessageOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMessageOptions); - - /** MessageOptions messageSetWireFormat. */ - public messageSetWireFormat: boolean; - - /** MessageOptions noStandardDescriptorAccessor. */ - public noStandardDescriptorAccessor: boolean; - - /** MessageOptions deprecated. */ - public deprecated: boolean; - - /** MessageOptions mapEntry. */ - public mapEntry: boolean; - - /** MessageOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new MessageOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns MessageOptions instance - */ - public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; - - /** - * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param message MessageOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param message MessageOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a MessageOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; - - /** - * Decodes a MessageOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; - - /** - * Verifies a MessageOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MessageOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; - - /** - * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. - * @param message MessageOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this MessageOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FieldOptions. */ - interface IFieldOptions { - - /** FieldOptions ctype */ - ctype?: (google.protobuf.FieldOptions.CType|null); - - /** FieldOptions packed */ - packed?: (boolean|null); - - /** FieldOptions jstype */ - jstype?: (google.protobuf.FieldOptions.JSType|null); - - /** FieldOptions lazy */ - lazy?: (boolean|null); - - /** FieldOptions deprecated */ - deprecated?: (boolean|null); - - /** FieldOptions weak */ - weak?: (boolean|null); - - /** FieldOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents a FieldOptions. */ - class FieldOptions implements IFieldOptions { - - /** - * Constructs a new FieldOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldOptions); - - /** FieldOptions ctype. */ - public ctype: google.protobuf.FieldOptions.CType; - - /** FieldOptions packed. */ - public packed: boolean; - - /** FieldOptions jstype. */ - public jstype: google.protobuf.FieldOptions.JSType; - - /** FieldOptions lazy. */ - public lazy: boolean; - - /** FieldOptions deprecated. */ - public deprecated: boolean; - - /** FieldOptions weak. */ - public weak: boolean; - - /** FieldOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new FieldOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldOptions instance - */ - public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; - - /** - * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param message FieldOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param message FieldOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FieldOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; - - /** - * Decodes a FieldOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; - - /** - * Verifies a FieldOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; - - /** - * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. - * @param message FieldOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FieldOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace FieldOptions { - - /** CType enum. */ - enum CType { - STRING = 0, - CORD = 1, - STRING_PIECE = 2 - } - - /** JSType enum. */ - enum JSType { - JS_NORMAL = 0, - JS_STRING = 1, - JS_NUMBER = 2 - } - } - - /** Properties of an OneofOptions. */ - interface IOneofOptions { - - /** OneofOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an OneofOptions. */ - class OneofOptions implements IOneofOptions { - - /** - * Constructs a new OneofOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IOneofOptions); - - /** OneofOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new OneofOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns OneofOptions instance - */ - public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; - - /** - * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param message OneofOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param message OneofOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an OneofOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; - - /** - * Decodes an OneofOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; - - /** - * Verifies an OneofOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OneofOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; - - /** - * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. - * @param message OneofOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this OneofOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an EnumOptions. */ - interface IEnumOptions { - - /** EnumOptions allowAlias */ - allowAlias?: (boolean|null); - - /** EnumOptions deprecated */ - deprecated?: (boolean|null); - - /** EnumOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an EnumOptions. */ - class EnumOptions implements IEnumOptions { - - /** - * Constructs a new EnumOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumOptions); - - /** EnumOptions allowAlias. */ - public allowAlias: boolean; - - /** EnumOptions deprecated. */ - public deprecated: boolean; - - /** EnumOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new EnumOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumOptions instance - */ - public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; - - /** - * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param message EnumOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param message EnumOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; - - /** - * Decodes an EnumOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; - - /** - * Verifies an EnumOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; - - /** - * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. - * @param message EnumOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an EnumValueOptions. */ - interface IEnumValueOptions { - - /** EnumValueOptions deprecated */ - deprecated?: (boolean|null); - - /** EnumValueOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an EnumValueOptions. */ - class EnumValueOptions implements IEnumValueOptions { - - /** - * Constructs a new EnumValueOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumValueOptions); - - /** EnumValueOptions deprecated. */ - public deprecated: boolean; - - /** EnumValueOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new EnumValueOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumValueOptions instance - */ - public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; - - /** - * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param message EnumValueOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param message EnumValueOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumValueOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; - - /** - * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; - - /** - * Verifies an EnumValueOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumValueOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; - - /** - * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. - * @param message EnumValueOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumValueOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ServiceOptions. */ - interface IServiceOptions { - - /** ServiceOptions deprecated */ - deprecated?: (boolean|null); - - /** ServiceOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents a ServiceOptions. */ - class ServiceOptions implements IServiceOptions { - - /** - * Constructs a new ServiceOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IServiceOptions); - - /** ServiceOptions deprecated. */ - public deprecated: boolean; - - /** ServiceOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new ServiceOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ServiceOptions instance - */ - public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; - - /** - * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param message ServiceOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param message ServiceOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ServiceOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; - - /** - * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; - - /** - * Verifies a ServiceOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ServiceOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; - - /** - * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. - * @param message ServiceOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ServiceOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a MethodOptions. */ - interface IMethodOptions { - - /** MethodOptions deprecated */ - deprecated?: (boolean|null); - - /** MethodOptions idempotencyLevel */ - idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|null); - - /** MethodOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - - /** MethodOptions .google.api.http */ - ".google.api.http"?: (google.api.IHttpRule|null); - } - - /** Represents a MethodOptions. */ - class MethodOptions implements IMethodOptions { - - /** - * Constructs a new MethodOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMethodOptions); - - /** MethodOptions deprecated. */ - public deprecated: boolean; - - /** MethodOptions idempotencyLevel. */ - public idempotencyLevel: google.protobuf.MethodOptions.IdempotencyLevel; - - /** MethodOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new MethodOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodOptions instance - */ - public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; - - /** - * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param message MethodOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param message MethodOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a MethodOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; - - /** - * Decodes a MethodOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; - - /** - * Verifies a MethodOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; - - /** - * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. - * @param message MethodOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this MethodOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace MethodOptions { - - /** IdempotencyLevel enum. */ - enum IdempotencyLevel { - IDEMPOTENCY_UNKNOWN = 0, - NO_SIDE_EFFECTS = 1, - IDEMPOTENT = 2 - } - } - - /** Properties of an UninterpretedOption. */ - interface IUninterpretedOption { - - /** UninterpretedOption name */ - name?: (google.protobuf.UninterpretedOption.INamePart[]|null); - - /** UninterpretedOption identifierValue */ - identifierValue?: (string|null); - - /** UninterpretedOption positiveIntValue */ - positiveIntValue?: (number|Long|null); - - /** UninterpretedOption negativeIntValue */ - negativeIntValue?: (number|Long|null); - - /** UninterpretedOption doubleValue */ - doubleValue?: (number|null); - - /** UninterpretedOption stringValue */ - stringValue?: (Uint8Array|null); - - /** UninterpretedOption aggregateValue */ - aggregateValue?: (string|null); - } - - /** Represents an UninterpretedOption. */ - class UninterpretedOption implements IUninterpretedOption { - - /** - * Constructs a new UninterpretedOption. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IUninterpretedOption); - - /** UninterpretedOption name. */ - public name: google.protobuf.UninterpretedOption.INamePart[]; - - /** UninterpretedOption identifierValue. */ - public identifierValue: string; - - /** UninterpretedOption positiveIntValue. */ - public positiveIntValue: (number|Long); - - /** UninterpretedOption negativeIntValue. */ - public negativeIntValue: (number|Long); - - /** UninterpretedOption doubleValue. */ - public doubleValue: number; - - /** UninterpretedOption stringValue. */ - public stringValue: Uint8Array; - - /** UninterpretedOption aggregateValue. */ - public aggregateValue: string; - - /** - * Creates a new UninterpretedOption instance using the specified properties. - * @param [properties] Properties to set - * @returns UninterpretedOption instance - */ - public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; - - /** - * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param message UninterpretedOption message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param message UninterpretedOption message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an UninterpretedOption message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; - - /** - * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; - - /** - * Verifies an UninterpretedOption message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UninterpretedOption - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; - - /** - * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. - * @param message UninterpretedOption - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this UninterpretedOption to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace UninterpretedOption { - - /** Properties of a NamePart. */ - interface INamePart { - - /** NamePart namePart */ - namePart: string; - - /** NamePart isExtension */ - isExtension: boolean; - } - - /** Represents a NamePart. */ - class NamePart implements INamePart { - - /** - * Constructs a new NamePart. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.UninterpretedOption.INamePart); - - /** NamePart namePart. */ - public namePart: string; - - /** NamePart isExtension. */ - public isExtension: boolean; - - /** - * Creates a new NamePart instance using the specified properties. - * @param [properties] Properties to set - * @returns NamePart instance - */ - public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; - - /** - * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a NamePart message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns NamePart - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; - - /** - * Decodes a NamePart message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns NamePart - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; - - /** - * Verifies a NamePart message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a NamePart message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns NamePart - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; - - /** - * Creates a plain object from a NamePart message. Also converts values to other types if specified. - * @param message NamePart - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this NamePart to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of a SourceCodeInfo. */ - interface ISourceCodeInfo { - - /** SourceCodeInfo location */ - location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); - } - - /** Represents a SourceCodeInfo. */ - class SourceCodeInfo implements ISourceCodeInfo { - - /** - * Constructs a new SourceCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.ISourceCodeInfo); - - /** SourceCodeInfo location. */ - public location: google.protobuf.SourceCodeInfo.ILocation[]; - - /** - * Creates a new SourceCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns SourceCodeInfo instance - */ - public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; - - /** - * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; - - /** - * Verifies a SourceCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SourceCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; - - /** - * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. - * @param message SourceCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this SourceCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace SourceCodeInfo { - - /** Properties of a Location. */ - interface ILocation { - - /** Location path */ - path?: (number[]|null); - - /** Location span */ - span?: (number[]|null); - - /** Location leadingComments */ - leadingComments?: (string|null); - - /** Location trailingComments */ - trailingComments?: (string|null); - - /** Location leadingDetachedComments */ - leadingDetachedComments?: (string[]|null); - } - - /** Represents a Location. */ - class Location implements ILocation { - - /** - * Constructs a new Location. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); - - /** Location path. */ - public path: number[]; - - /** Location span. */ - public span: number[]; - - /** Location leadingComments. */ - public leadingComments: string; - - /** Location trailingComments. */ - public trailingComments: string; - - /** Location leadingDetachedComments. */ - public leadingDetachedComments: string[]; - - /** - * Creates a new Location instance using the specified properties. - * @param [properties] Properties to set - * @returns Location instance - */ - public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; - - /** - * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Location message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Location - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; - - /** - * Decodes a Location message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Location - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; - - /** - * Verifies a Location message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Location message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Location - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; - - /** - * Creates a plain object from a Location message. Also converts values to other types if specified. - * @param message Location - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Location to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of a GeneratedCodeInfo. */ - interface IGeneratedCodeInfo { - - /** GeneratedCodeInfo annotation */ - annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); - } - - /** Represents a GeneratedCodeInfo. */ - class GeneratedCodeInfo implements IGeneratedCodeInfo { - - /** - * Constructs a new GeneratedCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IGeneratedCodeInfo); - - /** GeneratedCodeInfo annotation. */ - public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; - - /** - * Creates a new GeneratedCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns GeneratedCodeInfo instance - */ - public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; - - /** - * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; - - /** - * Verifies a GeneratedCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GeneratedCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; - - /** - * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. - * @param message GeneratedCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GeneratedCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace GeneratedCodeInfo { - - /** Properties of an Annotation. */ - interface IAnnotation { - - /** Annotation path */ - path?: (number[]|null); - - /** Annotation sourceFile */ - sourceFile?: (string|null); - - /** Annotation begin */ - begin?: (number|null); - - /** Annotation end */ - end?: (number|null); - } - - /** Represents an Annotation. */ - class Annotation implements IAnnotation { - - /** - * Constructs a new Annotation. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); - - /** Annotation path. */ - public path: number[]; - - /** Annotation sourceFile. */ - public sourceFile: string; - - /** Annotation begin. */ - public begin: number; - - /** Annotation end. */ - public end: number; - - /** - * Creates a new Annotation instance using the specified properties. - * @param [properties] Properties to set - * @returns Annotation instance - */ - public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an Annotation message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Annotation - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Decodes an Annotation message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Annotation - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Verifies an Annotation message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an Annotation message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Annotation - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Creates a plain object from an Annotation message. Also converts values to other types if specified. - * @param message Annotation - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Annotation to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - } - - /** Namespace type. */ - namespace type { - - /** Properties of an Expr. */ - interface IExpr { - - /** Expr expression */ - expression?: (string|null); - - /** Expr title */ - title?: (string|null); - - /** Expr description */ - description?: (string|null); - - /** Expr location */ - location?: (string|null); - } - - /** Represents an Expr. */ - class Expr implements IExpr { - - /** - * Constructs a new Expr. - * @param [properties] Properties to set - */ - constructor(properties?: google.type.IExpr); - - /** Expr expression. */ - public expression: string; - - /** Expr title. */ - public title: string; - - /** Expr description. */ - public description: string; - - /** Expr location. */ - public location: string; - - /** - * Creates a new Expr instance using the specified properties. - * @param [properties] Properties to set - * @returns Expr instance - */ - public static create(properties?: google.type.IExpr): google.type.Expr; - - /** - * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @param message Expr message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @param message Expr message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an Expr message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.type.Expr; - - /** - * Decodes an Expr message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.type.Expr; - - /** - * Verifies an Expr message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an Expr message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Expr - */ - public static fromObject(object: { [k: string]: any }): google.type.Expr; - - /** - * Creates a plain object from an Expr message. Also converts values to other types if specified. - * @param message Expr - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.type.Expr, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Expr to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } -} diff --git a/handwritten/pubsub/proto/pubsub.d.ts b/handwritten/pubsub/proto/pubsub.d.ts deleted file mode 100644 index c44e9a6dcf8..00000000000 --- a/handwritten/pubsub/proto/pubsub.d.ts +++ /dev/null @@ -1,9638 +0,0 @@ -import * as $protobuf from "protobufjs"; -import * as Long from "long"; -/** Namespace google. */ -export namespace google { - - /** Namespace pubsub. */ - namespace pubsub { - - /** Namespace v1. */ - namespace v1 { - - /** Represents a Publisher */ - class Publisher extends $protobuf.rpc.Service { - - /** - * Constructs a new Publisher service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - - /** - * Creates new Publisher service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Publisher; - - /** - * Calls CreateTopic. - * @param request Topic message or plain object - * @param callback Node-style callback called with the error, if any, and Topic - */ - public createTopic(request: google.pubsub.v1.ITopic, callback: google.pubsub.v1.Publisher.CreateTopicCallback): void; - - /** - * Calls CreateTopic. - * @param request Topic message or plain object - * @returns Promise - */ - public createTopic(request: google.pubsub.v1.ITopic): Promise; - - /** - * Calls UpdateTopic. - * @param request UpdateTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Topic - */ - public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest, callback: google.pubsub.v1.Publisher.UpdateTopicCallback): void; - - /** - * Calls UpdateTopic. - * @param request UpdateTopicRequest message or plain object - * @returns Promise - */ - public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest): Promise; - - /** - * Calls Publish. - * @param request PublishRequest message or plain object - * @param callback Node-style callback called with the error, if any, and PublishResponse - */ - public publish(request: google.pubsub.v1.IPublishRequest, callback: google.pubsub.v1.Publisher.PublishCallback): void; - - /** - * Calls Publish. - * @param request PublishRequest message or plain object - * @returns Promise - */ - public publish(request: google.pubsub.v1.IPublishRequest): Promise; - - /** - * Calls GetTopic. - * @param request GetTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Topic - */ - public getTopic(request: google.pubsub.v1.IGetTopicRequest, callback: google.pubsub.v1.Publisher.GetTopicCallback): void; - - /** - * Calls GetTopic. - * @param request GetTopicRequest message or plain object - * @returns Promise - */ - public getTopic(request: google.pubsub.v1.IGetTopicRequest): Promise; - - /** - * Calls ListTopics. - * @param request ListTopicsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicsResponse - */ - public listTopics(request: google.pubsub.v1.IListTopicsRequest, callback: google.pubsub.v1.Publisher.ListTopicsCallback): void; - - /** - * Calls ListTopics. - * @param request ListTopicsRequest message or plain object - * @returns Promise - */ - public listTopics(request: google.pubsub.v1.IListTopicsRequest): Promise; - - /** - * Calls ListTopicSubscriptions. - * @param request ListTopicSubscriptionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse - */ - public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest, callback: google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback): void; - - /** - * Calls ListTopicSubscriptions. - * @param request ListTopicSubscriptionsRequest message or plain object - * @returns Promise - */ - public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest): Promise; - - /** - * Calls ListTopicSnapshots. - * @param request ListTopicSnapshotsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse - */ - public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest, callback: google.pubsub.v1.Publisher.ListTopicSnapshotsCallback): void; - - /** - * Calls ListTopicSnapshots. - * @param request ListTopicSnapshotsRequest message or plain object - * @returns Promise - */ - public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest): Promise; - - /** - * Calls DeleteTopic. - * @param request DeleteTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest, callback: google.pubsub.v1.Publisher.DeleteTopicCallback): void; - - /** - * Calls DeleteTopic. - * @param request DeleteTopicRequest message or plain object - * @returns Promise - */ - public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest): Promise; - } - - namespace Publisher { - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. - * @param error Error, if any - * @param [response] Topic - */ - type CreateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. - * @param error Error, if any - * @param [response] Topic - */ - type UpdateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#publish}. - * @param error Error, if any - * @param [response] PublishResponse - */ - type PublishCallback = (error: (Error|null), response?: google.pubsub.v1.PublishResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. - * @param error Error, if any - * @param [response] Topic - */ - type GetTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. - * @param error Error, if any - * @param [response] ListTopicsResponse - */ - type ListTopicsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicsResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. - * @param error Error, if any - * @param [response] ListTopicSubscriptionsResponse - */ - type ListTopicSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSubscriptionsResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. - * @param error Error, if any - * @param [response] ListTopicSnapshotsResponse - */ - type ListTopicSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSnapshotsResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - } - - /** Properties of a MessageStoragePolicy. */ - interface IMessageStoragePolicy { - - /** MessageStoragePolicy allowedPersistenceRegions */ - allowedPersistenceRegions?: (string[]|null); - } - - /** Represents a MessageStoragePolicy. */ - class MessageStoragePolicy implements IMessageStoragePolicy { - - /** - * Constructs a new MessageStoragePolicy. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); - - /** MessageStoragePolicy allowedPersistenceRegions. */ - public allowedPersistenceRegions: string[]; - - /** - * Creates a new MessageStoragePolicy instance using the specified properties. - * @param [properties] Properties to set - * @returns MessageStoragePolicy instance - */ - public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; - - /** - * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @param message MessageStoragePolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @param message MessageStoragePolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MessageStoragePolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; - - /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MessageStoragePolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; - - /** - * Verifies a MessageStoragePolicy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MessageStoragePolicy - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; - - /** - * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. - * @param message MessageStoragePolicy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this MessageStoragePolicy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Topic. */ - interface ITopic { - - /** Topic name */ - name?: (string|null); - - /** Topic labels */ - labels?: ({ [k: string]: string }|null); - - /** Topic messageStoragePolicy */ - messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); - - /** Topic kmsKeyName */ - kmsKeyName?: (string|null); - } - - /** Represents a Topic. */ - class Topic implements ITopic { - - /** - * Constructs a new Topic. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ITopic); - - /** Topic name. */ - public name: string; - - /** Topic labels. */ - public labels: { [k: string]: string }; - - /** Topic messageStoragePolicy. */ - public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); - - /** Topic kmsKeyName. */ - public kmsKeyName: string; - - /** - * Creates a new Topic instance using the specified properties. - * @param [properties] Properties to set - * @returns Topic instance - */ - public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; - - /** - * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. - * @param message Topic message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. - * @param message Topic message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Topic message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Topic - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; - - /** - * Decodes a Topic message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Topic - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; - - /** - * Verifies a Topic message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Topic message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Topic - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; - - /** - * Creates a plain object from a Topic message. Also converts values to other types if specified. - * @param message Topic - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Topic to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a PubsubMessage. */ - interface IPubsubMessage { - - /** PubsubMessage data */ - data?: (Uint8Array|null); - - /** PubsubMessage attributes */ - attributes?: ({ [k: string]: string }|null); - - /** PubsubMessage messageId */ - messageId?: (string|null); - - /** PubsubMessage publishTime */ - publishTime?: (google.protobuf.ITimestamp|null); - - /** PubsubMessage orderingKey */ - orderingKey?: (string|null); - } - - /** Represents a PubsubMessage. */ - class PubsubMessage implements IPubsubMessage { - - /** - * Constructs a new PubsubMessage. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPubsubMessage); - - /** PubsubMessage data. */ - public data: Uint8Array; - - /** PubsubMessage attributes. */ - public attributes: { [k: string]: string }; - - /** PubsubMessage messageId. */ - public messageId: string; - - /** PubsubMessage publishTime. */ - public publishTime?: (google.protobuf.ITimestamp|null); - - /** PubsubMessage orderingKey. */ - public orderingKey: string; - - /** - * Creates a new PubsubMessage instance using the specified properties. - * @param [properties] Properties to set - * @returns PubsubMessage instance - */ - public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; - - /** - * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. - * @param message PubsubMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. - * @param message PubsubMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PubsubMessage message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PubsubMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; - - /** - * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PubsubMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; - - /** - * Verifies a PubsubMessage message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PubsubMessage - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; - - /** - * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. - * @param message PubsubMessage - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PubsubMessage to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a GetTopicRequest. */ - interface IGetTopicRequest { - - /** GetTopicRequest topic */ - topic?: (string|null); - } - - /** Represents a GetTopicRequest. */ - class GetTopicRequest implements IGetTopicRequest { - - /** - * Constructs a new GetTopicRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IGetTopicRequest); - - /** GetTopicRequest topic. */ - public topic: string; - - /** - * Creates a new GetTopicRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns GetTopicRequest instance - */ - public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; - - /** - * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. - * @param message GetTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. - * @param message GetTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GetTopicRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; - - /** - * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; - - /** - * Verifies a GetTopicRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetTopicRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; - - /** - * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. - * @param message GetTopicRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GetTopicRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an UpdateTopicRequest. */ - interface IUpdateTopicRequest { - - /** UpdateTopicRequest topic */ - topic?: (google.pubsub.v1.ITopic|null); - - /** UpdateTopicRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); - } - - /** Represents an UpdateTopicRequest. */ - class UpdateTopicRequest implements IUpdateTopicRequest { - - /** - * Constructs a new UpdateTopicRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); - - /** UpdateTopicRequest topic. */ - public topic?: (google.pubsub.v1.ITopic|null); - - /** UpdateTopicRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); - - /** - * Creates a new UpdateTopicRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns UpdateTopicRequest instance - */ - public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; - - /** - * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. - * @param message UpdateTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. - * @param message UpdateTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UpdateTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; - - /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UpdateTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; - - /** - * Verifies an UpdateTopicRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UpdateTopicRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; - - /** - * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. - * @param message UpdateTopicRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this UpdateTopicRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a PublishRequest. */ - interface IPublishRequest { - - /** PublishRequest topic */ - topic?: (string|null); - - /** PublishRequest messages */ - messages?: (google.pubsub.v1.IPubsubMessage[]|null); - } - - /** Represents a PublishRequest. */ - class PublishRequest implements IPublishRequest { - - /** - * Constructs a new PublishRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPublishRequest); - - /** PublishRequest topic. */ - public topic: string; - - /** PublishRequest messages. */ - public messages: google.pubsub.v1.IPubsubMessage[]; - - /** - * Creates a new PublishRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns PublishRequest instance - */ - public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; - - /** - * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. - * @param message PublishRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. - * @param message PublishRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PublishRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PublishRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; - - /** - * Decodes a PublishRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PublishRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; - - /** - * Verifies a PublishRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PublishRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; - - /** - * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. - * @param message PublishRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PublishRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a PublishResponse. */ - interface IPublishResponse { - - /** PublishResponse messageIds */ - messageIds?: (string[]|null); - } - - /** Represents a PublishResponse. */ - class PublishResponse implements IPublishResponse { - - /** - * Constructs a new PublishResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPublishResponse); - - /** PublishResponse messageIds. */ - public messageIds: string[]; - - /** - * Creates a new PublishResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns PublishResponse instance - */ - public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; - - /** - * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. - * @param message PublishResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. - * @param message PublishResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PublishResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PublishResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; - - /** - * Decodes a PublishResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PublishResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; - - /** - * Verifies a PublishResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PublishResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; - - /** - * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. - * @param message PublishResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PublishResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListTopicsRequest. */ - interface IListTopicsRequest { - - /** ListTopicsRequest project */ - project?: (string|null); - - /** ListTopicsRequest pageSize */ - pageSize?: (number|null); - - /** ListTopicsRequest pageToken */ - pageToken?: (string|null); - } - - /** Represents a ListTopicsRequest. */ - class ListTopicsRequest implements IListTopicsRequest { - - /** - * Constructs a new ListTopicsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicsRequest); - - /** ListTopicsRequest project. */ - public project: string; - - /** ListTopicsRequest pageSize. */ - public pageSize: number; - - /** ListTopicsRequest pageToken. */ - public pageToken: string; - - /** - * Creates a new ListTopicsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; - - /** - * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. - * @param message ListTopicsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. - * @param message ListTopicsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListTopicsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; - - /** - * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; - - /** - * Verifies a ListTopicsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; - - /** - * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. - * @param message ListTopicsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListTopicsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListTopicsResponse. */ - interface IListTopicsResponse { - - /** ListTopicsResponse topics */ - topics?: (google.pubsub.v1.ITopic[]|null); - - /** ListTopicsResponse nextPageToken */ - nextPageToken?: (string|null); - } - - /** Represents a ListTopicsResponse. */ - class ListTopicsResponse implements IListTopicsResponse { - - /** - * Constructs a new ListTopicsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicsResponse); - - /** ListTopicsResponse topics. */ - public topics: google.pubsub.v1.ITopic[]; - - /** ListTopicsResponse nextPageToken. */ - public nextPageToken: string; - - /** - * Creates a new ListTopicsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; - - /** - * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. - * @param message ListTopicsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. - * @param message ListTopicsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListTopicsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; - - /** - * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; - - /** - * Verifies a ListTopicsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; - - /** - * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. - * @param message ListTopicsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListTopicsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListTopicSubscriptionsRequest. */ - interface IListTopicSubscriptionsRequest { - - /** ListTopicSubscriptionsRequest topic */ - topic?: (string|null); - - /** ListTopicSubscriptionsRequest pageSize */ - pageSize?: (number|null); - - /** ListTopicSubscriptionsRequest pageToken */ - pageToken?: (string|null); - } - - /** Represents a ListTopicSubscriptionsRequest. */ - class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { - - /** - * Constructs a new ListTopicSubscriptionsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); - - /** ListTopicSubscriptionsRequest topic. */ - public topic: string; - - /** ListTopicSubscriptionsRequest pageSize. */ - public pageSize: number; - - /** ListTopicSubscriptionsRequest pageToken. */ - public pageToken: string; - - /** - * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSubscriptionsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; - - /** - * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @param message ListTopicSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @param message ListTopicSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; - - /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; - - /** - * Verifies a ListTopicSubscriptionsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSubscriptionsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; - - /** - * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. - * @param message ListTopicSubscriptionsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListTopicSubscriptionsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListTopicSubscriptionsResponse. */ - interface IListTopicSubscriptionsResponse { - - /** ListTopicSubscriptionsResponse subscriptions */ - subscriptions?: (string[]|null); - - /** ListTopicSubscriptionsResponse nextPageToken */ - nextPageToken?: (string|null); - } - - /** Represents a ListTopicSubscriptionsResponse. */ - class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { - - /** - * Constructs a new ListTopicSubscriptionsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); - - /** ListTopicSubscriptionsResponse subscriptions. */ - public subscriptions: string[]; - - /** ListTopicSubscriptionsResponse nextPageToken. */ - public nextPageToken: string; - - /** - * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSubscriptionsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; - - /** - * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @param message ListTopicSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @param message ListTopicSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; - - /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; - - /** - * Verifies a ListTopicSubscriptionsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSubscriptionsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; - - /** - * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. - * @param message ListTopicSubscriptionsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListTopicSubscriptionsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListTopicSnapshotsRequest. */ - interface IListTopicSnapshotsRequest { - - /** ListTopicSnapshotsRequest topic */ - topic?: (string|null); - - /** ListTopicSnapshotsRequest pageSize */ - pageSize?: (number|null); - - /** ListTopicSnapshotsRequest pageToken */ - pageToken?: (string|null); - } - - /** Represents a ListTopicSnapshotsRequest. */ - class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { - - /** - * Constructs a new ListTopicSnapshotsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); - - /** ListTopicSnapshotsRequest topic. */ - public topic: string; - - /** ListTopicSnapshotsRequest pageSize. */ - public pageSize: number; - - /** ListTopicSnapshotsRequest pageToken. */ - public pageToken: string; - - /** - * Creates a new ListTopicSnapshotsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSnapshotsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; - - /** - * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @param message ListTopicSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @param message ListTopicSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; - - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; - - /** - * Verifies a ListTopicSnapshotsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSnapshotsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; - - /** - * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. - * @param message ListTopicSnapshotsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListTopicSnapshotsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListTopicSnapshotsResponse. */ - interface IListTopicSnapshotsResponse { - - /** ListTopicSnapshotsResponse snapshots */ - snapshots?: (string[]|null); - - /** ListTopicSnapshotsResponse nextPageToken */ - nextPageToken?: (string|null); - } - - /** Represents a ListTopicSnapshotsResponse. */ - class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { - - /** - * Constructs a new ListTopicSnapshotsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); - - /** ListTopicSnapshotsResponse snapshots. */ - public snapshots: string[]; - - /** ListTopicSnapshotsResponse nextPageToken. */ - public nextPageToken: string; - - /** - * Creates a new ListTopicSnapshotsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSnapshotsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; - - /** - * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @param message ListTopicSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @param message ListTopicSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; - - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; - - /** - * Verifies a ListTopicSnapshotsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSnapshotsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; - - /** - * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. - * @param message ListTopicSnapshotsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListTopicSnapshotsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a DeleteTopicRequest. */ - interface IDeleteTopicRequest { - - /** DeleteTopicRequest topic */ - topic?: (string|null); - } - - /** Represents a DeleteTopicRequest. */ - class DeleteTopicRequest implements IDeleteTopicRequest { - - /** - * Constructs a new DeleteTopicRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); - - /** DeleteTopicRequest topic. */ - public topic: string; - - /** - * Creates a new DeleteTopicRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteTopicRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; - - /** - * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @param message DeleteTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @param message DeleteTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; - - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; - - /** - * Verifies a DeleteTopicRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteTopicRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; - - /** - * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. - * @param message DeleteTopicRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DeleteTopicRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Represents a Subscriber */ - class Subscriber extends $protobuf.rpc.Service { - - /** - * Constructs a new Subscriber service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - - /** - * Creates new Subscriber service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; - - /** - * Calls CreateSubscription. - * @param request Subscription message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; - - /** - * Calls CreateSubscription. - * @param request Subscription message or plain object - * @returns Promise - */ - public createSubscription(request: google.pubsub.v1.ISubscription): Promise; - - /** - * Calls GetSubscription. - * @param request GetSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; - - /** - * Calls GetSubscription. - * @param request GetSubscriptionRequest message or plain object - * @returns Promise - */ - public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; - - /** - * Calls UpdateSubscription. - * @param request UpdateSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; - - /** - * Calls UpdateSubscription. - * @param request UpdateSubscriptionRequest message or plain object - * @returns Promise - */ - public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; - - /** - * Calls ListSubscriptions. - * @param request ListSubscriptionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse - */ - public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; - - /** - * Calls ListSubscriptions. - * @param request ListSubscriptionsRequest message or plain object - * @returns Promise - */ - public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; - - /** - * Calls DeleteSubscription. - * @param request DeleteSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; - - /** - * Calls DeleteSubscription. - * @param request DeleteSubscriptionRequest message or plain object - * @returns Promise - */ - public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; - - /** - * Calls ModifyAckDeadline. - * @param request ModifyAckDeadlineRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; - - /** - * Calls ModifyAckDeadline. - * @param request ModifyAckDeadlineRequest message or plain object - * @returns Promise - */ - public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; - - /** - * Calls Acknowledge. - * @param request AcknowledgeRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; - - /** - * Calls Acknowledge. - * @param request AcknowledgeRequest message or plain object - * @returns Promise - */ - public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; - - /** - * Calls Pull. - * @param request PullRequest message or plain object - * @param callback Node-style callback called with the error, if any, and PullResponse - */ - public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; - - /** - * Calls Pull. - * @param request PullRequest message or plain object - * @returns Promise - */ - public pull(request: google.pubsub.v1.IPullRequest): Promise; - - /** - * Calls StreamingPull. - * @param request StreamingPullRequest message or plain object - * @param callback Node-style callback called with the error, if any, and StreamingPullResponse - */ - public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; - - /** - * Calls StreamingPull. - * @param request StreamingPullRequest message or plain object - * @returns Promise - */ - public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; - - /** - * Calls ModifyPushConfig. - * @param request ModifyPushConfigRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; - - /** - * Calls ModifyPushConfig. - * @param request ModifyPushConfigRequest message or plain object - * @returns Promise - */ - public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; - - /** - * Calls GetSnapshot. - * @param request GetSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; - - /** - * Calls GetSnapshot. - * @param request GetSnapshotRequest message or plain object - * @returns Promise - */ - public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; - - /** - * Calls ListSnapshots. - * @param request ListSnapshotsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse - */ - public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; - - /** - * Calls ListSnapshots. - * @param request ListSnapshotsRequest message or plain object - * @returns Promise - */ - public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; - - /** - * Calls CreateSnapshot. - * @param request CreateSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; - - /** - * Calls CreateSnapshot. - * @param request CreateSnapshotRequest message or plain object - * @returns Promise - */ - public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; - - /** - * Calls UpdateSnapshot. - * @param request UpdateSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; - - /** - * Calls UpdateSnapshot. - * @param request UpdateSnapshotRequest message or plain object - * @returns Promise - */ - public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; - - /** - * Calls DeleteSnapshot. - * @param request DeleteSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; - - /** - * Calls DeleteSnapshot. - * @param request DeleteSnapshotRequest message or plain object - * @returns Promise - */ - public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; - - /** - * Calls Seek. - * @param request SeekRequest message or plain object - * @param callback Node-style callback called with the error, if any, and SeekResponse - */ - public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; - - /** - * Calls Seek. - * @param request SeekRequest message or plain object - * @returns Promise - */ - public seek(request: google.pubsub.v1.ISeekRequest): Promise; - } - - namespace Subscriber { - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. - * @param error Error, if any - * @param [response] ListSubscriptionsResponse - */ - type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. - * @param error Error, if any - * @param [response] Empty - */ - type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. - * @param error Error, if any - * @param [response] Empty - */ - type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. - * @param error Error, if any - * @param [response] PullResponse - */ - type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. - * @param error Error, if any - * @param [response] StreamingPullResponse - */ - type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. - * @param error Error, if any - * @param [response] Empty - */ - type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. - * @param error Error, if any - * @param [response] ListSnapshotsResponse - */ - type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. - * @param error Error, if any - * @param [response] SeekResponse - */ - type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; - } - - /** Properties of a Subscription. */ - interface ISubscription { - - /** Subscription name */ - name?: (string|null); - - /** Subscription topic */ - topic?: (string|null); - - /** Subscription pushConfig */ - pushConfig?: (google.pubsub.v1.IPushConfig|null); - - /** Subscription ackDeadlineSeconds */ - ackDeadlineSeconds?: (number|null); - - /** Subscription retainAckedMessages */ - retainAckedMessages?: (boolean|null); - - /** Subscription messageRetentionDuration */ - messageRetentionDuration?: (google.protobuf.IDuration|null); - - /** Subscription labels */ - labels?: ({ [k: string]: string }|null); - - /** Subscription enableMessageOrdering */ - enableMessageOrdering?: (boolean|null); - - /** Subscription expirationPolicy */ - expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); - - /** Subscription deadLetterPolicy */ - deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); - } - - /** Represents a Subscription. */ - class Subscription implements ISubscription { - - /** - * Constructs a new Subscription. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISubscription); - - /** Subscription name. */ - public name: string; - - /** Subscription topic. */ - public topic: string; - - /** Subscription pushConfig. */ - public pushConfig?: (google.pubsub.v1.IPushConfig|null); - - /** Subscription ackDeadlineSeconds. */ - public ackDeadlineSeconds: number; - - /** Subscription retainAckedMessages. */ - public retainAckedMessages: boolean; - - /** Subscription messageRetentionDuration. */ - public messageRetentionDuration?: (google.protobuf.IDuration|null); - - /** Subscription labels. */ - public labels: { [k: string]: string }; - - /** Subscription enableMessageOrdering. */ - public enableMessageOrdering: boolean; - - /** Subscription expirationPolicy. */ - public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); - - /** Subscription deadLetterPolicy. */ - public deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); - - /** - * Creates a new Subscription instance using the specified properties. - * @param [properties] Properties to set - * @returns Subscription instance - */ - public static create(properties?: google.pubsub.v1.ISubscription): google.pubsub.v1.Subscription; - - /** - * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @param message Subscription message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @param message Subscription message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Subscription message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Subscription; - - /** - * Decodes a Subscription message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Subscription; - - /** - * Verifies a Subscription message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Subscription message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Subscription - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Subscription; - - /** - * Creates a plain object from a Subscription message. Also converts values to other types if specified. - * @param message Subscription - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.Subscription, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Subscription to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a DeadLetterPolicy. */ - interface IDeadLetterPolicy { - - /** DeadLetterPolicy deadLetterTopic */ - deadLetterTopic?: (string|null); - - /** DeadLetterPolicy maxDeliveryAttempts */ - maxDeliveryAttempts?: (number|null); - } - - /** Represents a DeadLetterPolicy. */ - class DeadLetterPolicy implements IDeadLetterPolicy { - - /** - * Constructs a new DeadLetterPolicy. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeadLetterPolicy); - - /** DeadLetterPolicy deadLetterTopic. */ - public deadLetterTopic: string; - - /** DeadLetterPolicy maxDeliveryAttempts. */ - public maxDeliveryAttempts: number; - - /** - * Creates a new DeadLetterPolicy instance using the specified properties. - * @param [properties] Properties to set - * @returns DeadLetterPolicy instance - */ - public static create(properties?: google.pubsub.v1.IDeadLetterPolicy): google.pubsub.v1.DeadLetterPolicy; - - /** - * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. - * @param message DeadLetterPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. - * @param message DeadLetterPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeadLetterPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeadLetterPolicy; - - /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeadLetterPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeadLetterPolicy; - - /** - * Verifies a DeadLetterPolicy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeadLetterPolicy - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeadLetterPolicy; - - /** - * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. - * @param message DeadLetterPolicy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeadLetterPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DeadLetterPolicy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an ExpirationPolicy. */ - interface IExpirationPolicy { - - /** ExpirationPolicy ttl */ - ttl?: (google.protobuf.IDuration|null); - } - - /** Represents an ExpirationPolicy. */ - class ExpirationPolicy implements IExpirationPolicy { - - /** - * Constructs a new ExpirationPolicy. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IExpirationPolicy); - - /** ExpirationPolicy ttl. */ - public ttl?: (google.protobuf.IDuration|null); - - /** - * Creates a new ExpirationPolicy instance using the specified properties. - * @param [properties] Properties to set - * @returns ExpirationPolicy instance - */ - public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; - - /** - * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @param message ExpirationPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @param message ExpirationPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an ExpirationPolicy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExpirationPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; - - /** - * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExpirationPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; - - /** - * Verifies an ExpirationPolicy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExpirationPolicy - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; - - /** - * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. - * @param message ExpirationPolicy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ExpirationPolicy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a PushConfig. */ - interface IPushConfig { - - /** PushConfig pushEndpoint */ - pushEndpoint?: (string|null); - - /** PushConfig attributes */ - attributes?: ({ [k: string]: string }|null); - - /** PushConfig oidcToken */ - oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); - } - - /** Represents a PushConfig. */ - class PushConfig implements IPushConfig { - - /** - * Constructs a new PushConfig. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPushConfig); - - /** PushConfig pushEndpoint. */ - public pushEndpoint: string; - - /** PushConfig attributes. */ - public attributes: { [k: string]: string }; - - /** PushConfig oidcToken. */ - public oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); - - /** PushConfig authenticationMethod. */ - public authenticationMethod?: "oidcToken"; - - /** - * Creates a new PushConfig instance using the specified properties. - * @param [properties] Properties to set - * @returns PushConfig instance - */ - public static create(properties?: google.pubsub.v1.IPushConfig): google.pubsub.v1.PushConfig; - - /** - * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @param message PushConfig message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @param message PushConfig message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PushConfig message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig; - - /** - * Decodes a PushConfig message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig; - - /** - * Verifies a PushConfig message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PushConfig - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig; - - /** - * Creates a plain object from a PushConfig message. Also converts values to other types if specified. - * @param message PushConfig - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PushConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PushConfig to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace PushConfig { - - /** Properties of an OidcToken. */ - interface IOidcToken { - - /** OidcToken serviceAccountEmail */ - serviceAccountEmail?: (string|null); - - /** OidcToken audience */ - audience?: (string|null); - } - - /** Represents an OidcToken. */ - class OidcToken implements IOidcToken { - - /** - * Constructs a new OidcToken. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.PushConfig.IOidcToken); - - /** OidcToken serviceAccountEmail. */ - public serviceAccountEmail: string; - - /** OidcToken audience. */ - public audience: string; - - /** - * Creates a new OidcToken instance using the specified properties. - * @param [properties] Properties to set - * @returns OidcToken instance - */ - public static create(properties?: google.pubsub.v1.PushConfig.IOidcToken): google.pubsub.v1.PushConfig.OidcToken; - - /** - * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @param message OidcToken message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @param message OidcToken message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an OidcToken message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.OidcToken; - - /** - * Decodes an OidcToken message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.OidcToken; - - /** - * Verifies an OidcToken message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OidcToken - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.OidcToken; - - /** - * Creates a plain object from an OidcToken message. Also converts values to other types if specified. - * @param message OidcToken - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PushConfig.OidcToken, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this OidcToken to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of a ReceivedMessage. */ - interface IReceivedMessage { - - /** ReceivedMessage ackId */ - ackId?: (string|null); - - /** ReceivedMessage message */ - message?: (google.pubsub.v1.IPubsubMessage|null); - - /** ReceivedMessage deliveryAttempt */ - deliveryAttempt?: (number|null); - } - - /** Represents a ReceivedMessage. */ - class ReceivedMessage implements IReceivedMessage { - - /** - * Constructs a new ReceivedMessage. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IReceivedMessage); - - /** ReceivedMessage ackId. */ - public ackId: string; - - /** ReceivedMessage message. */ - public message?: (google.pubsub.v1.IPubsubMessage|null); - - /** ReceivedMessage deliveryAttempt. */ - public deliveryAttempt: number; - - /** - * Creates a new ReceivedMessage instance using the specified properties. - * @param [properties] Properties to set - * @returns ReceivedMessage instance - */ - public static create(properties?: google.pubsub.v1.IReceivedMessage): google.pubsub.v1.ReceivedMessage; - - /** - * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. - * @param message ReceivedMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. - * @param message ReceivedMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ReceivedMessage message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ReceivedMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ReceivedMessage; - - /** - * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ReceivedMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ReceivedMessage; - - /** - * Verifies a ReceivedMessage message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ReceivedMessage - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ReceivedMessage; - - /** - * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. - * @param message ReceivedMessage - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ReceivedMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ReceivedMessage to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a GetSubscriptionRequest. */ - interface IGetSubscriptionRequest { - - /** GetSubscriptionRequest subscription */ - subscription?: (string|null); - } - - /** Represents a GetSubscriptionRequest. */ - class GetSubscriptionRequest implements IGetSubscriptionRequest { - - /** - * Constructs a new GetSubscriptionRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IGetSubscriptionRequest); - - /** GetSubscriptionRequest subscription. */ - public subscription: string; - - /** - * Creates a new GetSubscriptionRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns GetSubscriptionRequest instance - */ - public static create(properties?: google.pubsub.v1.IGetSubscriptionRequest): google.pubsub.v1.GetSubscriptionRequest; - - /** - * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @param message GetSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @param message GetSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSubscriptionRequest; - - /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSubscriptionRequest; - - /** - * Verifies a GetSubscriptionRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetSubscriptionRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSubscriptionRequest; - - /** - * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. - * @param message GetSubscriptionRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.GetSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GetSubscriptionRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an UpdateSubscriptionRequest. */ - interface IUpdateSubscriptionRequest { - - /** UpdateSubscriptionRequest subscription */ - subscription?: (google.pubsub.v1.ISubscription|null); - - /** UpdateSubscriptionRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); - } - - /** Represents an UpdateSubscriptionRequest. */ - class UpdateSubscriptionRequest implements IUpdateSubscriptionRequest { - - /** - * Constructs a new UpdateSubscriptionRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IUpdateSubscriptionRequest); - - /** UpdateSubscriptionRequest subscription. */ - public subscription?: (google.pubsub.v1.ISubscription|null); - - /** UpdateSubscriptionRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); - - /** - * Creates a new UpdateSubscriptionRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns UpdateSubscriptionRequest instance - */ - public static create(properties?: google.pubsub.v1.IUpdateSubscriptionRequest): google.pubsub.v1.UpdateSubscriptionRequest; - - /** - * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @param message UpdateSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @param message UpdateSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSubscriptionRequest; - - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSubscriptionRequest; - - /** - * Verifies an UpdateSubscriptionRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UpdateSubscriptionRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSubscriptionRequest; - - /** - * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. - * @param message UpdateSubscriptionRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.UpdateSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this UpdateSubscriptionRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListSubscriptionsRequest. */ - interface IListSubscriptionsRequest { - - /** ListSubscriptionsRequest project */ - project?: (string|null); - - /** ListSubscriptionsRequest pageSize */ - pageSize?: (number|null); - - /** ListSubscriptionsRequest pageToken */ - pageToken?: (string|null); - } - - /** Represents a ListSubscriptionsRequest. */ - class ListSubscriptionsRequest implements IListSubscriptionsRequest { - - /** - * Constructs a new ListSubscriptionsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSubscriptionsRequest); - - /** ListSubscriptionsRequest project. */ - public project: string; - - /** ListSubscriptionsRequest pageSize. */ - public pageSize: number; - - /** ListSubscriptionsRequest pageToken. */ - public pageToken: string; - - /** - * Creates a new ListSubscriptionsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSubscriptionsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListSubscriptionsRequest): google.pubsub.v1.ListSubscriptionsRequest; - - /** - * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. - * @param message ListSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. - * @param message ListSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsRequest; - - /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsRequest; - - /** - * Verifies a ListSubscriptionsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSubscriptionsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsRequest; - - /** - * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. - * @param message ListSubscriptionsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListSubscriptionsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListSubscriptionsResponse. */ - interface IListSubscriptionsResponse { - - /** ListSubscriptionsResponse subscriptions */ - subscriptions?: (google.pubsub.v1.ISubscription[]|null); - - /** ListSubscriptionsResponse nextPageToken */ - nextPageToken?: (string|null); - } - - /** Represents a ListSubscriptionsResponse. */ - class ListSubscriptionsResponse implements IListSubscriptionsResponse { - - /** - * Constructs a new ListSubscriptionsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSubscriptionsResponse); - - /** ListSubscriptionsResponse subscriptions. */ - public subscriptions: google.pubsub.v1.ISubscription[]; - - /** ListSubscriptionsResponse nextPageToken. */ - public nextPageToken: string; - - /** - * Creates a new ListSubscriptionsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSubscriptionsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListSubscriptionsResponse): google.pubsub.v1.ListSubscriptionsResponse; - - /** - * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. - * @param message ListSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. - * @param message ListSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsResponse; - - /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsResponse; - - /** - * Verifies a ListSubscriptionsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSubscriptionsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsResponse; - - /** - * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. - * @param message ListSubscriptionsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListSubscriptionsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a DeleteSubscriptionRequest. */ - interface IDeleteSubscriptionRequest { - - /** DeleteSubscriptionRequest subscription */ - subscription?: (string|null); - } - - /** Represents a DeleteSubscriptionRequest. */ - class DeleteSubscriptionRequest implements IDeleteSubscriptionRequest { - - /** - * Constructs a new DeleteSubscriptionRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeleteSubscriptionRequest); - - /** DeleteSubscriptionRequest subscription. */ - public subscription: string; - - /** - * Creates a new DeleteSubscriptionRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteSubscriptionRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteSubscriptionRequest): google.pubsub.v1.DeleteSubscriptionRequest; - - /** - * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @param message DeleteSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @param message DeleteSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSubscriptionRequest; - - /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSubscriptionRequest; - - /** - * Verifies a DeleteSubscriptionRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteSubscriptionRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSubscriptionRequest; - - /** - * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. - * @param message DeleteSubscriptionRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeleteSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DeleteSubscriptionRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ModifyPushConfigRequest. */ - interface IModifyPushConfigRequest { - - /** ModifyPushConfigRequest subscription */ - subscription?: (string|null); - - /** ModifyPushConfigRequest pushConfig */ - pushConfig?: (google.pubsub.v1.IPushConfig|null); - } - - /** Represents a ModifyPushConfigRequest. */ - class ModifyPushConfigRequest implements IModifyPushConfigRequest { - - /** - * Constructs a new ModifyPushConfigRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IModifyPushConfigRequest); - - /** ModifyPushConfigRequest subscription. */ - public subscription: string; - - /** ModifyPushConfigRequest pushConfig. */ - public pushConfig?: (google.pubsub.v1.IPushConfig|null); - - /** - * Creates a new ModifyPushConfigRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ModifyPushConfigRequest instance - */ - public static create(properties?: google.pubsub.v1.IModifyPushConfigRequest): google.pubsub.v1.ModifyPushConfigRequest; - - /** - * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @param message ModifyPushConfigRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @param message ModifyPushConfigRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyPushConfigRequest; - - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyPushConfigRequest; - - /** - * Verifies a ModifyPushConfigRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ModifyPushConfigRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyPushConfigRequest; - - /** - * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. - * @param message ModifyPushConfigRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ModifyPushConfigRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ModifyPushConfigRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a PullRequest. */ - interface IPullRequest { - - /** PullRequest subscription */ - subscription?: (string|null); - - /** PullRequest returnImmediately */ - returnImmediately?: (boolean|null); - - /** PullRequest maxMessages */ - maxMessages?: (number|null); - } - - /** Represents a PullRequest. */ - class PullRequest implements IPullRequest { - - /** - * Constructs a new PullRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPullRequest); - - /** PullRequest subscription. */ - public subscription: string; - - /** PullRequest returnImmediately. */ - public returnImmediately: boolean; - - /** PullRequest maxMessages. */ - public maxMessages: number; - - /** - * Creates a new PullRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns PullRequest instance - */ - public static create(properties?: google.pubsub.v1.IPullRequest): google.pubsub.v1.PullRequest; - - /** - * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @param message PullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @param message PullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PullRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullRequest; - - /** - * Decodes a PullRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullRequest; - - /** - * Verifies a PullRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PullRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullRequest; - - /** - * Creates a plain object from a PullRequest message. Also converts values to other types if specified. - * @param message PullRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PullRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a PullResponse. */ - interface IPullResponse { - - /** PullResponse receivedMessages */ - receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); - } - - /** Represents a PullResponse. */ - class PullResponse implements IPullResponse { - - /** - * Constructs a new PullResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPullResponse); - - /** PullResponse receivedMessages. */ - public receivedMessages: google.pubsub.v1.IReceivedMessage[]; - - /** - * Creates a new PullResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns PullResponse instance - */ - public static create(properties?: google.pubsub.v1.IPullResponse): google.pubsub.v1.PullResponse; - - /** - * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @param message PullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @param message PullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PullResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullResponse; - - /** - * Decodes a PullResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullResponse; - - /** - * Verifies a PullResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PullResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullResponse; - - /** - * Creates a plain object from a PullResponse message. Also converts values to other types if specified. - * @param message PullResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PullResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ModifyAckDeadlineRequest. */ - interface IModifyAckDeadlineRequest { - - /** ModifyAckDeadlineRequest subscription */ - subscription?: (string|null); - - /** ModifyAckDeadlineRequest ackIds */ - ackIds?: (string[]|null); - - /** ModifyAckDeadlineRequest ackDeadlineSeconds */ - ackDeadlineSeconds?: (number|null); - } - - /** Represents a ModifyAckDeadlineRequest. */ - class ModifyAckDeadlineRequest implements IModifyAckDeadlineRequest { - - /** - * Constructs a new ModifyAckDeadlineRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IModifyAckDeadlineRequest); - - /** ModifyAckDeadlineRequest subscription. */ - public subscription: string; - - /** ModifyAckDeadlineRequest ackIds. */ - public ackIds: string[]; - - /** ModifyAckDeadlineRequest ackDeadlineSeconds. */ - public ackDeadlineSeconds: number; - - /** - * Creates a new ModifyAckDeadlineRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ModifyAckDeadlineRequest instance - */ - public static create(properties?: google.pubsub.v1.IModifyAckDeadlineRequest): google.pubsub.v1.ModifyAckDeadlineRequest; - - /** - * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @param message ModifyAckDeadlineRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @param message ModifyAckDeadlineRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyAckDeadlineRequest; - - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyAckDeadlineRequest; - - /** - * Verifies a ModifyAckDeadlineRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ModifyAckDeadlineRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyAckDeadlineRequest; - - /** - * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. - * @param message ModifyAckDeadlineRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ModifyAckDeadlineRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ModifyAckDeadlineRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an AcknowledgeRequest. */ - interface IAcknowledgeRequest { - - /** AcknowledgeRequest subscription */ - subscription?: (string|null); - - /** AcknowledgeRequest ackIds */ - ackIds?: (string[]|null); - } - - /** Represents an AcknowledgeRequest. */ - class AcknowledgeRequest implements IAcknowledgeRequest { - - /** - * Constructs a new AcknowledgeRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IAcknowledgeRequest); - - /** AcknowledgeRequest subscription. */ - public subscription: string; - - /** AcknowledgeRequest ackIds. */ - public ackIds: string[]; - - /** - * Creates a new AcknowledgeRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns AcknowledgeRequest instance - */ - public static create(properties?: google.pubsub.v1.IAcknowledgeRequest): google.pubsub.v1.AcknowledgeRequest; - - /** - * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. - * @param message AcknowledgeRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. - * @param message AcknowledgeRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns AcknowledgeRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.AcknowledgeRequest; - - /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns AcknowledgeRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.AcknowledgeRequest; - - /** - * Verifies an AcknowledgeRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns AcknowledgeRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.AcknowledgeRequest; - - /** - * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. - * @param message AcknowledgeRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.AcknowledgeRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this AcknowledgeRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a StreamingPullRequest. */ - interface IStreamingPullRequest { - - /** StreamingPullRequest subscription */ - subscription?: (string|null); - - /** StreamingPullRequest ackIds */ - ackIds?: (string[]|null); - - /** StreamingPullRequest modifyDeadlineSeconds */ - modifyDeadlineSeconds?: (number[]|null); - - /** StreamingPullRequest modifyDeadlineAckIds */ - modifyDeadlineAckIds?: (string[]|null); - - /** StreamingPullRequest streamAckDeadlineSeconds */ - streamAckDeadlineSeconds?: (number|null); - } - - /** Represents a StreamingPullRequest. */ - class StreamingPullRequest implements IStreamingPullRequest { - - /** - * Constructs a new StreamingPullRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IStreamingPullRequest); - - /** StreamingPullRequest subscription. */ - public subscription: string; - - /** StreamingPullRequest ackIds. */ - public ackIds: string[]; - - /** StreamingPullRequest modifyDeadlineSeconds. */ - public modifyDeadlineSeconds: number[]; - - /** StreamingPullRequest modifyDeadlineAckIds. */ - public modifyDeadlineAckIds: string[]; - - /** StreamingPullRequest streamAckDeadlineSeconds. */ - public streamAckDeadlineSeconds: number; - - /** - * Creates a new StreamingPullRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns StreamingPullRequest instance - */ - public static create(properties?: google.pubsub.v1.IStreamingPullRequest): google.pubsub.v1.StreamingPullRequest; - - /** - * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @param message StreamingPullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @param message StreamingPullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullRequest; - - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullRequest; - - /** - * Verifies a StreamingPullRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns StreamingPullRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullRequest; - - /** - * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. - * @param message StreamingPullRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.StreamingPullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this StreamingPullRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a StreamingPullResponse. */ - interface IStreamingPullResponse { - - /** StreamingPullResponse receivedMessages */ - receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); - } - - /** Represents a StreamingPullResponse. */ - class StreamingPullResponse implements IStreamingPullResponse { - - /** - * Constructs a new StreamingPullResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IStreamingPullResponse); - - /** StreamingPullResponse receivedMessages. */ - public receivedMessages: google.pubsub.v1.IReceivedMessage[]; - - /** - * Creates a new StreamingPullResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns StreamingPullResponse instance - */ - public static create(properties?: google.pubsub.v1.IStreamingPullResponse): google.pubsub.v1.StreamingPullResponse; - - /** - * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @param message StreamingPullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @param message StreamingPullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse; - - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse; - - /** - * Verifies a StreamingPullResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns StreamingPullResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse; - - /** - * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. - * @param message StreamingPullResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.StreamingPullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this StreamingPullResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a CreateSnapshotRequest. */ - interface ICreateSnapshotRequest { - - /** CreateSnapshotRequest name */ - name?: (string|null); - - /** CreateSnapshotRequest subscription */ - subscription?: (string|null); - - /** CreateSnapshotRequest labels */ - labels?: ({ [k: string]: string }|null); - } - - /** Represents a CreateSnapshotRequest. */ - class CreateSnapshotRequest implements ICreateSnapshotRequest { - - /** - * Constructs a new CreateSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ICreateSnapshotRequest); - - /** CreateSnapshotRequest name. */ - public name: string; - - /** CreateSnapshotRequest subscription. */ - public subscription: string; - - /** CreateSnapshotRequest labels. */ - public labels: { [k: string]: string }; - - /** - * Creates a new CreateSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns CreateSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.ICreateSnapshotRequest): google.pubsub.v1.CreateSnapshotRequest; - - /** - * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @param message CreateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @param message CreateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CreateSnapshotRequest; - - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CreateSnapshotRequest; - - /** - * Verifies a CreateSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CreateSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CreateSnapshotRequest; - - /** - * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. - * @param message CreateSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.CreateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this CreateSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an UpdateSnapshotRequest. */ - interface IUpdateSnapshotRequest { - - /** UpdateSnapshotRequest snapshot */ - snapshot?: (google.pubsub.v1.ISnapshot|null); - - /** UpdateSnapshotRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); - } - - /** Represents an UpdateSnapshotRequest. */ - class UpdateSnapshotRequest implements IUpdateSnapshotRequest { - - /** - * Constructs a new UpdateSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IUpdateSnapshotRequest); - - /** UpdateSnapshotRequest snapshot. */ - public snapshot?: (google.pubsub.v1.ISnapshot|null); - - /** UpdateSnapshotRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); - - /** - * Creates a new UpdateSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns UpdateSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IUpdateSnapshotRequest): google.pubsub.v1.UpdateSnapshotRequest; - - /** - * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @param message UpdateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @param message UpdateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSnapshotRequest; - - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSnapshotRequest; - - /** - * Verifies an UpdateSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UpdateSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSnapshotRequest; - - /** - * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. - * @param message UpdateSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.UpdateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this UpdateSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Snapshot. */ - interface ISnapshot { - - /** Snapshot name */ - name?: (string|null); - - /** Snapshot topic */ - topic?: (string|null); - - /** Snapshot expireTime */ - expireTime?: (google.protobuf.ITimestamp|null); - - /** Snapshot labels */ - labels?: ({ [k: string]: string }|null); - } - - /** Represents a Snapshot. */ - class Snapshot implements ISnapshot { - - /** - * Constructs a new Snapshot. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISnapshot); - - /** Snapshot name. */ - public name: string; - - /** Snapshot topic. */ - public topic: string; - - /** Snapshot expireTime. */ - public expireTime?: (google.protobuf.ITimestamp|null); - - /** Snapshot labels. */ - public labels: { [k: string]: string }; - - /** - * Creates a new Snapshot instance using the specified properties. - * @param [properties] Properties to set - * @returns Snapshot instance - */ - public static create(properties?: google.pubsub.v1.ISnapshot): google.pubsub.v1.Snapshot; - - /** - * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. - * @param message Snapshot message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. - * @param message Snapshot message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Snapshot message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Snapshot - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Snapshot; - - /** - * Decodes a Snapshot message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Snapshot - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Snapshot; - - /** - * Verifies a Snapshot message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Snapshot - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Snapshot; - - /** - * Creates a plain object from a Snapshot message. Also converts values to other types if specified. - * @param message Snapshot - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.Snapshot, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Snapshot to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a GetSnapshotRequest. */ - interface IGetSnapshotRequest { - - /** GetSnapshotRequest snapshot */ - snapshot?: (string|null); - } - - /** Represents a GetSnapshotRequest. */ - class GetSnapshotRequest implements IGetSnapshotRequest { - - /** - * Constructs a new GetSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IGetSnapshotRequest); - - /** GetSnapshotRequest snapshot. */ - public snapshot: string; - - /** - * Creates a new GetSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns GetSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IGetSnapshotRequest): google.pubsub.v1.GetSnapshotRequest; - - /** - * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @param message GetSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @param message GetSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSnapshotRequest; - - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSnapshotRequest; - - /** - * Verifies a GetSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSnapshotRequest; - - /** - * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. - * @param message GetSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.GetSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GetSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListSnapshotsRequest. */ - interface IListSnapshotsRequest { - - /** ListSnapshotsRequest project */ - project?: (string|null); - - /** ListSnapshotsRequest pageSize */ - pageSize?: (number|null); - - /** ListSnapshotsRequest pageToken */ - pageToken?: (string|null); - } - - /** Represents a ListSnapshotsRequest. */ - class ListSnapshotsRequest implements IListSnapshotsRequest { - - /** - * Constructs a new ListSnapshotsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSnapshotsRequest); - - /** ListSnapshotsRequest project. */ - public project: string; - - /** ListSnapshotsRequest pageSize. */ - public pageSize: number; - - /** ListSnapshotsRequest pageToken. */ - public pageToken: string; - - /** - * Creates a new ListSnapshotsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSnapshotsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListSnapshotsRequest): google.pubsub.v1.ListSnapshotsRequest; - - /** - * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. - * @param message ListSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. - * @param message ListSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsRequest; - - /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsRequest; - - /** - * Verifies a ListSnapshotsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSnapshotsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsRequest; - - /** - * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. - * @param message ListSnapshotsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListSnapshotsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListSnapshotsResponse. */ - interface IListSnapshotsResponse { - - /** ListSnapshotsResponse snapshots */ - snapshots?: (google.pubsub.v1.ISnapshot[]|null); - - /** ListSnapshotsResponse nextPageToken */ - nextPageToken?: (string|null); - } - - /** Represents a ListSnapshotsResponse. */ - class ListSnapshotsResponse implements IListSnapshotsResponse { - - /** - * Constructs a new ListSnapshotsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSnapshotsResponse); - - /** ListSnapshotsResponse snapshots. */ - public snapshots: google.pubsub.v1.ISnapshot[]; - - /** ListSnapshotsResponse nextPageToken. */ - public nextPageToken: string; - - /** - * Creates a new ListSnapshotsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSnapshotsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListSnapshotsResponse): google.pubsub.v1.ListSnapshotsResponse; - - /** - * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. - * @param message ListSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. - * @param message ListSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsResponse; - - /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsResponse; - - /** - * Verifies a ListSnapshotsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSnapshotsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsResponse; - - /** - * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. - * @param message ListSnapshotsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListSnapshotsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a DeleteSnapshotRequest. */ - interface IDeleteSnapshotRequest { - - /** DeleteSnapshotRequest snapshot */ - snapshot?: (string|null); - } - - /** Represents a DeleteSnapshotRequest. */ - class DeleteSnapshotRequest implements IDeleteSnapshotRequest { - - /** - * Constructs a new DeleteSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeleteSnapshotRequest); - - /** DeleteSnapshotRequest snapshot. */ - public snapshot: string; - - /** - * Creates a new DeleteSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteSnapshotRequest): google.pubsub.v1.DeleteSnapshotRequest; - - /** - * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @param message DeleteSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @param message DeleteSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSnapshotRequest; - - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSnapshotRequest; - - /** - * Verifies a DeleteSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSnapshotRequest; - - /** - * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. - * @param message DeleteSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeleteSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DeleteSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a SeekRequest. */ - interface ISeekRequest { - - /** SeekRequest subscription */ - subscription?: (string|null); - - /** SeekRequest time */ - time?: (google.protobuf.ITimestamp|null); - - /** SeekRequest snapshot */ - snapshot?: (string|null); - } - - /** Represents a SeekRequest. */ - class SeekRequest implements ISeekRequest { - - /** - * Constructs a new SeekRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISeekRequest); - - /** SeekRequest subscription. */ - public subscription: string; - - /** SeekRequest time. */ - public time?: (google.protobuf.ITimestamp|null); - - /** SeekRequest snapshot. */ - public snapshot: string; - - /** SeekRequest target. */ - public target?: ("time"|"snapshot"); - - /** - * Creates a new SeekRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns SeekRequest instance - */ - public static create(properties?: google.pubsub.v1.ISeekRequest): google.pubsub.v1.SeekRequest; - - /** - * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @param message SeekRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @param message SeekRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SeekRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SeekRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekRequest; - - /** - * Decodes a SeekRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SeekRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekRequest; - - /** - * Verifies a SeekRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SeekRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekRequest; - - /** - * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. - * @param message SeekRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.SeekRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this SeekRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a SeekResponse. */ - interface ISeekResponse { - } - - /** Represents a SeekResponse. */ - class SeekResponse implements ISeekResponse { - - /** - * Constructs a new SeekResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISeekResponse); - - /** - * Creates a new SeekResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns SeekResponse instance - */ - public static create(properties?: google.pubsub.v1.ISeekResponse): google.pubsub.v1.SeekResponse; - - /** - * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @param message SeekResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @param message SeekResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SeekResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SeekResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekResponse; - - /** - * Decodes a SeekResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SeekResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekResponse; - - /** - * Verifies a SeekResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SeekResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekResponse; - - /** - * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. - * @param message SeekResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.SeekResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this SeekResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - } - - /** Namespace api. */ - namespace api { - - /** Properties of a Http. */ - interface IHttp { - - /** Http rules */ - rules?: (google.api.IHttpRule[]|null); - - /** Http fullyDecodeReservedExpansion */ - fullyDecodeReservedExpansion?: (boolean|null); - } - - /** Represents a Http. */ - class Http implements IHttp { - - /** - * Constructs a new Http. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IHttp); - - /** Http rules. */ - public rules: google.api.IHttpRule[]; - - /** Http fullyDecodeReservedExpansion. */ - public fullyDecodeReservedExpansion: boolean; - - /** - * Creates a new Http instance using the specified properties. - * @param [properties] Properties to set - * @returns Http instance - */ - public static create(properties?: google.api.IHttp): google.api.Http; - - /** - * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @param message Http message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @param message Http message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Http message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Http - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; - - /** - * Decodes a Http message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Http - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; - - /** - * Verifies a Http message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Http message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Http - */ - public static fromObject(object: { [k: string]: any }): google.api.Http; - - /** - * Creates a plain object from a Http message. Also converts values to other types if specified. - * @param message Http - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Http to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a HttpRule. */ - interface IHttpRule { - - /** HttpRule selector */ - selector?: (string|null); - - /** HttpRule get */ - get?: (string|null); - - /** HttpRule put */ - put?: (string|null); - - /** HttpRule post */ - post?: (string|null); - - /** HttpRule delete */ - "delete"?: (string|null); - - /** HttpRule patch */ - patch?: (string|null); - - /** HttpRule custom */ - custom?: (google.api.ICustomHttpPattern|null); - - /** HttpRule body */ - body?: (string|null); - - /** HttpRule responseBody */ - responseBody?: (string|null); - - /** HttpRule additionalBindings */ - additionalBindings?: (google.api.IHttpRule[]|null); - } - - /** Represents a HttpRule. */ - class HttpRule implements IHttpRule { - - /** - * Constructs a new HttpRule. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IHttpRule); - - /** HttpRule selector. */ - public selector: string; - - /** HttpRule get. */ - public get: string; - - /** HttpRule put. */ - public put: string; - - /** HttpRule post. */ - public post: string; - - /** HttpRule delete. */ - public delete: string; - - /** HttpRule patch. */ - public patch: string; - - /** HttpRule custom. */ - public custom?: (google.api.ICustomHttpPattern|null); - - /** HttpRule body. */ - public body: string; - - /** HttpRule responseBody. */ - public responseBody: string; - - /** HttpRule additionalBindings. */ - public additionalBindings: google.api.IHttpRule[]; - - /** HttpRule pattern. */ - public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); - - /** - * Creates a new HttpRule instance using the specified properties. - * @param [properties] Properties to set - * @returns HttpRule instance - */ - public static create(properties?: google.api.IHttpRule): google.api.HttpRule; - - /** - * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @param message HttpRule message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @param message HttpRule message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a HttpRule message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns HttpRule - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; - - /** - * Decodes a HttpRule message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns HttpRule - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; - - /** - * Verifies a HttpRule message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns HttpRule - */ - public static fromObject(object: { [k: string]: any }): google.api.HttpRule; - - /** - * Creates a plain object from a HttpRule message. Also converts values to other types if specified. - * @param message HttpRule - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this HttpRule to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a CustomHttpPattern. */ - interface ICustomHttpPattern { - - /** CustomHttpPattern kind */ - kind?: (string|null); - - /** CustomHttpPattern path */ - path?: (string|null); - } - - /** Represents a CustomHttpPattern. */ - class CustomHttpPattern implements ICustomHttpPattern { - - /** - * Constructs a new CustomHttpPattern. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.ICustomHttpPattern); - - /** CustomHttpPattern kind. */ - public kind: string; - - /** CustomHttpPattern path. */ - public path: string; - - /** - * Creates a new CustomHttpPattern instance using the specified properties. - * @param [properties] Properties to set - * @returns CustomHttpPattern instance - */ - public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; - - /** - * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @param message CustomHttpPattern message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @param message CustomHttpPattern message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; - - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; - - /** - * Verifies a CustomHttpPattern message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CustomHttpPattern - */ - public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; - - /** - * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. - * @param message CustomHttpPattern - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this CustomHttpPattern to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Namespace protobuf. */ - namespace protobuf { - - /** Properties of a FileDescriptorSet. */ - interface IFileDescriptorSet { - - /** FileDescriptorSet file */ - file?: (google.protobuf.IFileDescriptorProto[]|null); - } - - /** Represents a FileDescriptorSet. */ - class FileDescriptorSet implements IFileDescriptorSet { - - /** - * Constructs a new FileDescriptorSet. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileDescriptorSet); - - /** FileDescriptorSet file. */ - public file: google.protobuf.IFileDescriptorProto[]; - - /** - * Creates a new FileDescriptorSet instance using the specified properties. - * @param [properties] Properties to set - * @returns FileDescriptorSet instance - */ - public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; - - /** - * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param message FileDescriptorSet message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param message FileDescriptorSet message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; - - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; - - /** - * Verifies a FileDescriptorSet message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileDescriptorSet - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; - - /** - * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. - * @param message FileDescriptorSet - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FileDescriptorSet to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FileDescriptorProto. */ - interface IFileDescriptorProto { - - /** FileDescriptorProto name */ - name?: (string|null); - - /** FileDescriptorProto package */ - "package"?: (string|null); - - /** FileDescriptorProto dependency */ - dependency?: (string[]|null); - - /** FileDescriptorProto publicDependency */ - publicDependency?: (number[]|null); - - /** FileDescriptorProto weakDependency */ - weakDependency?: (number[]|null); - - /** FileDescriptorProto messageType */ - messageType?: (google.protobuf.IDescriptorProto[]|null); - - /** FileDescriptorProto enumType */ - enumType?: (google.protobuf.IEnumDescriptorProto[]|null); - - /** FileDescriptorProto service */ - service?: (google.protobuf.IServiceDescriptorProto[]|null); - - /** FileDescriptorProto extension */ - extension?: (google.protobuf.IFieldDescriptorProto[]|null); - - /** FileDescriptorProto options */ - options?: (google.protobuf.IFileOptions|null); - - /** FileDescriptorProto sourceCodeInfo */ - sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); - - /** FileDescriptorProto syntax */ - syntax?: (string|null); - } - - /** Represents a FileDescriptorProto. */ - class FileDescriptorProto implements IFileDescriptorProto { - - /** - * Constructs a new FileDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileDescriptorProto); - - /** FileDescriptorProto name. */ - public name: string; - - /** FileDescriptorProto package. */ - public package: string; - - /** FileDescriptorProto dependency. */ - public dependency: string[]; - - /** FileDescriptorProto publicDependency. */ - public publicDependency: number[]; - - /** FileDescriptorProto weakDependency. */ - public weakDependency: number[]; - - /** FileDescriptorProto messageType. */ - public messageType: google.protobuf.IDescriptorProto[]; - - /** FileDescriptorProto enumType. */ - public enumType: google.protobuf.IEnumDescriptorProto[]; - - /** FileDescriptorProto service. */ - public service: google.protobuf.IServiceDescriptorProto[]; - - /** FileDescriptorProto extension. */ - public extension: google.protobuf.IFieldDescriptorProto[]; - - /** FileDescriptorProto options. */ - public options?: (google.protobuf.IFileOptions|null); - - /** FileDescriptorProto sourceCodeInfo. */ - public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); - - /** FileDescriptorProto syntax. */ - public syntax: string; - - /** - * Creates a new FileDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns FileDescriptorProto instance - */ - public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; - - /** - * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param message FileDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param message FileDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; - - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; - - /** - * Verifies a FileDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; - - /** - * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. - * @param message FileDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FileDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a DescriptorProto. */ - interface IDescriptorProto { - - /** DescriptorProto name */ - name?: (string|null); - - /** DescriptorProto field */ - field?: (google.protobuf.IFieldDescriptorProto[]|null); - - /** DescriptorProto extension */ - extension?: (google.protobuf.IFieldDescriptorProto[]|null); - - /** DescriptorProto nestedType */ - nestedType?: (google.protobuf.IDescriptorProto[]|null); - - /** DescriptorProto enumType */ - enumType?: (google.protobuf.IEnumDescriptorProto[]|null); - - /** DescriptorProto extensionRange */ - extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); - - /** DescriptorProto oneofDecl */ - oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); - - /** DescriptorProto options */ - options?: (google.protobuf.IMessageOptions|null); - - /** DescriptorProto reservedRange */ - reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); - - /** DescriptorProto reservedName */ - reservedName?: (string[]|null); - } - - /** Represents a DescriptorProto. */ - class DescriptorProto implements IDescriptorProto { - - /** - * Constructs a new DescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IDescriptorProto); - - /** DescriptorProto name. */ - public name: string; - - /** DescriptorProto field. */ - public field: google.protobuf.IFieldDescriptorProto[]; - - /** DescriptorProto extension. */ - public extension: google.protobuf.IFieldDescriptorProto[]; - - /** DescriptorProto nestedType. */ - public nestedType: google.protobuf.IDescriptorProto[]; - - /** DescriptorProto enumType. */ - public enumType: google.protobuf.IEnumDescriptorProto[]; - - /** DescriptorProto extensionRange. */ - public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; - - /** DescriptorProto oneofDecl. */ - public oneofDecl: google.protobuf.IOneofDescriptorProto[]; - - /** DescriptorProto options. */ - public options?: (google.protobuf.IMessageOptions|null); - - /** DescriptorProto reservedRange. */ - public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; - - /** DescriptorProto reservedName. */ - public reservedName: string[]; - - /** - * Creates a new DescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns DescriptorProto instance - */ - public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; - - /** - * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param message DescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param message DescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; - - /** - * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; - - /** - * Verifies a DescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; - - /** - * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. - * @param message DescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace DescriptorProto { - - /** Properties of an ExtensionRange. */ - interface IExtensionRange { - - /** ExtensionRange start */ - start?: (number|null); - - /** ExtensionRange end */ - end?: (number|null); - - /** ExtensionRange options */ - options?: (google.protobuf.IExtensionRangeOptions|null); - } - - /** Represents an ExtensionRange. */ - class ExtensionRange implements IExtensionRange { - - /** - * Constructs a new ExtensionRange. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); - - /** ExtensionRange start. */ - public start: number; - - /** ExtensionRange end. */ - public end: number; - - /** ExtensionRange options. */ - public options?: (google.protobuf.IExtensionRangeOptions|null); - - /** - * Creates a new ExtensionRange instance using the specified properties. - * @param [properties] Properties to set - * @returns ExtensionRange instance - */ - public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; - - /** - * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param message ExtensionRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param message ExtensionRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an ExtensionRange message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExtensionRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; - - /** - * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExtensionRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; - - /** - * Verifies an ExtensionRange message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExtensionRange - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; - - /** - * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. - * @param message ExtensionRange - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ExtensionRange to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ReservedRange. */ - interface IReservedRange { - - /** ReservedRange start */ - start?: (number|null); - - /** ReservedRange end */ - end?: (number|null); - } - - /** Represents a ReservedRange. */ - class ReservedRange implements IReservedRange { - - /** - * Constructs a new ReservedRange. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); - - /** ReservedRange start. */ - public start: number; - - /** ReservedRange end. */ - public end: number; - - /** - * Creates a new ReservedRange instance using the specified properties. - * @param [properties] Properties to set - * @returns ReservedRange instance - */ - public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param message ReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param message ReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ReservedRange message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Decodes a ReservedRange message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Verifies a ReservedRange message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ReservedRange - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. - * @param message ReservedRange - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ReservedRange to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of an ExtensionRangeOptions. */ - interface IExtensionRangeOptions { - - /** ExtensionRangeOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an ExtensionRangeOptions. */ - class ExtensionRangeOptions implements IExtensionRangeOptions { - - /** - * Constructs a new ExtensionRangeOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IExtensionRangeOptions); - - /** ExtensionRangeOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new ExtensionRangeOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ExtensionRangeOptions instance - */ - public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; - - /** - * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; - - /** - * Verifies an ExtensionRangeOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExtensionRangeOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; - - /** - * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. - * @param message ExtensionRangeOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ExtensionRangeOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FieldDescriptorProto. */ - interface IFieldDescriptorProto { - - /** FieldDescriptorProto name */ - name?: (string|null); - - /** FieldDescriptorProto number */ - number?: (number|null); - - /** FieldDescriptorProto label */ - label?: (google.protobuf.FieldDescriptorProto.Label|null); - - /** FieldDescriptorProto type */ - type?: (google.protobuf.FieldDescriptorProto.Type|null); - - /** FieldDescriptorProto typeName */ - typeName?: (string|null); - - /** FieldDescriptorProto extendee */ - extendee?: (string|null); - - /** FieldDescriptorProto defaultValue */ - defaultValue?: (string|null); - - /** FieldDescriptorProto oneofIndex */ - oneofIndex?: (number|null); - - /** FieldDescriptorProto jsonName */ - jsonName?: (string|null); - - /** FieldDescriptorProto options */ - options?: (google.protobuf.IFieldOptions|null); - } - - /** Represents a FieldDescriptorProto. */ - class FieldDescriptorProto implements IFieldDescriptorProto { - - /** - * Constructs a new FieldDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldDescriptorProto); - - /** FieldDescriptorProto name. */ - public name: string; - - /** FieldDescriptorProto number. */ - public number: number; - - /** FieldDescriptorProto label. */ - public label: google.protobuf.FieldDescriptorProto.Label; - - /** FieldDescriptorProto type. */ - public type: google.protobuf.FieldDescriptorProto.Type; - - /** FieldDescriptorProto typeName. */ - public typeName: string; - - /** FieldDescriptorProto extendee. */ - public extendee: string; - - /** FieldDescriptorProto defaultValue. */ - public defaultValue: string; - - /** FieldDescriptorProto oneofIndex. */ - public oneofIndex: number; - - /** FieldDescriptorProto jsonName. */ - public jsonName: string; - - /** FieldDescriptorProto options. */ - public options?: (google.protobuf.IFieldOptions|null); - - /** - * Creates a new FieldDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldDescriptorProto instance - */ - public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; - - /** - * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param message FieldDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param message FieldDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; - - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; - - /** - * Verifies a FieldDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; - - /** - * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. - * @param message FieldDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FieldDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace FieldDescriptorProto { - - /** Type enum. */ - enum Type { - TYPE_DOUBLE = 1, - TYPE_FLOAT = 2, - TYPE_INT64 = 3, - TYPE_UINT64 = 4, - TYPE_INT32 = 5, - TYPE_FIXED64 = 6, - TYPE_FIXED32 = 7, - TYPE_BOOL = 8, - TYPE_STRING = 9, - TYPE_GROUP = 10, - TYPE_MESSAGE = 11, - TYPE_BYTES = 12, - TYPE_UINT32 = 13, - TYPE_ENUM = 14, - TYPE_SFIXED32 = 15, - TYPE_SFIXED64 = 16, - TYPE_SINT32 = 17, - TYPE_SINT64 = 18 - } - - /** Label enum. */ - enum Label { - LABEL_OPTIONAL = 1, - LABEL_REQUIRED = 2, - LABEL_REPEATED = 3 - } - } - - /** Properties of an OneofDescriptorProto. */ - interface IOneofDescriptorProto { - - /** OneofDescriptorProto name */ - name?: (string|null); - - /** OneofDescriptorProto options */ - options?: (google.protobuf.IOneofOptions|null); - } - - /** Represents an OneofDescriptorProto. */ - class OneofDescriptorProto implements IOneofDescriptorProto { - - /** - * Constructs a new OneofDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IOneofDescriptorProto); - - /** OneofDescriptorProto name. */ - public name: string; - - /** OneofDescriptorProto options. */ - public options?: (google.protobuf.IOneofOptions|null); - - /** - * Creates a new OneofDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns OneofDescriptorProto instance - */ - public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; - - /** - * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param message OneofDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param message OneofDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; - - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; - - /** - * Verifies an OneofDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OneofDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; - - /** - * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. - * @param message OneofDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this OneofDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an EnumDescriptorProto. */ - interface IEnumDescriptorProto { - - /** EnumDescriptorProto name */ - name?: (string|null); - - /** EnumDescriptorProto value */ - value?: (google.protobuf.IEnumValueDescriptorProto[]|null); - - /** EnumDescriptorProto options */ - options?: (google.protobuf.IEnumOptions|null); - - /** EnumDescriptorProto reservedRange */ - reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); - - /** EnumDescriptorProto reservedName */ - reservedName?: (string[]|null); - } - - /** Represents an EnumDescriptorProto. */ - class EnumDescriptorProto implements IEnumDescriptorProto { - - /** - * Constructs a new EnumDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumDescriptorProto); - - /** EnumDescriptorProto name. */ - public name: string; - - /** EnumDescriptorProto value. */ - public value: google.protobuf.IEnumValueDescriptorProto[]; - - /** EnumDescriptorProto options. */ - public options?: (google.protobuf.IEnumOptions|null); - - /** EnumDescriptorProto reservedRange. */ - public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; - - /** EnumDescriptorProto reservedName. */ - public reservedName: string[]; - - /** - * Creates a new EnumDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumDescriptorProto instance - */ - public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; - - /** - * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param message EnumDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param message EnumDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; - - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; - - /** - * Verifies an EnumDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; - - /** - * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. - * @param message EnumDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace EnumDescriptorProto { - - /** Properties of an EnumReservedRange. */ - interface IEnumReservedRange { - - /** EnumReservedRange start */ - start?: (number|null); - - /** EnumReservedRange end */ - end?: (number|null); - } - - /** Represents an EnumReservedRange. */ - class EnumReservedRange implements IEnumReservedRange { - - /** - * Constructs a new EnumReservedRange. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); - - /** EnumReservedRange start. */ - public start: number; - - /** EnumReservedRange end. */ - public end: number; - - /** - * Creates a new EnumReservedRange instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumReservedRange instance - */ - public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumReservedRange message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Verifies an EnumReservedRange message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumReservedRange - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. - * @param message EnumReservedRange - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumReservedRange to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of an EnumValueDescriptorProto. */ - interface IEnumValueDescriptorProto { - - /** EnumValueDescriptorProto name */ - name?: (string|null); - - /** EnumValueDescriptorProto number */ - number?: (number|null); - - /** EnumValueDescriptorProto options */ - options?: (google.protobuf.IEnumValueOptions|null); - } - - /** Represents an EnumValueDescriptorProto. */ - class EnumValueDescriptorProto implements IEnumValueDescriptorProto { - - /** - * Constructs a new EnumValueDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumValueDescriptorProto); - - /** EnumValueDescriptorProto name. */ - public name: string; - - /** EnumValueDescriptorProto number. */ - public number: number; - - /** EnumValueDescriptorProto options. */ - public options?: (google.protobuf.IEnumValueOptions|null); - - /** - * Creates a new EnumValueDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumValueDescriptorProto instance - */ - public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; - - /** - * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param message EnumValueDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param message EnumValueDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; - - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; - - /** - * Verifies an EnumValueDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumValueDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; - - /** - * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. - * @param message EnumValueDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumValueDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ServiceDescriptorProto. */ - interface IServiceDescriptorProto { - - /** ServiceDescriptorProto name */ - name?: (string|null); - - /** ServiceDescriptorProto method */ - method?: (google.protobuf.IMethodDescriptorProto[]|null); - - /** ServiceDescriptorProto options */ - options?: (google.protobuf.IServiceOptions|null); - } - - /** Represents a ServiceDescriptorProto. */ - class ServiceDescriptorProto implements IServiceDescriptorProto { - - /** - * Constructs a new ServiceDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IServiceDescriptorProto); - - /** ServiceDescriptorProto name. */ - public name: string; - - /** ServiceDescriptorProto method. */ - public method: google.protobuf.IMethodDescriptorProto[]; - - /** ServiceDescriptorProto options. */ - public options?: (google.protobuf.IServiceOptions|null); - - /** - * Creates a new ServiceDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns ServiceDescriptorProto instance - */ - public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; - - /** - * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param message ServiceDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param message ServiceDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; - - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; - - /** - * Verifies a ServiceDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ServiceDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; - - /** - * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. - * @param message ServiceDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ServiceDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a MethodDescriptorProto. */ - interface IMethodDescriptorProto { - - /** MethodDescriptorProto name */ - name?: (string|null); - - /** MethodDescriptorProto inputType */ - inputType?: (string|null); - - /** MethodDescriptorProto outputType */ - outputType?: (string|null); - - /** MethodDescriptorProto options */ - options?: (google.protobuf.IMethodOptions|null); - - /** MethodDescriptorProto clientStreaming */ - clientStreaming?: (boolean|null); - - /** MethodDescriptorProto serverStreaming */ - serverStreaming?: (boolean|null); - } - - /** Represents a MethodDescriptorProto. */ - class MethodDescriptorProto implements IMethodDescriptorProto { - - /** - * Constructs a new MethodDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMethodDescriptorProto); - - /** MethodDescriptorProto name. */ - public name: string; - - /** MethodDescriptorProto inputType. */ - public inputType: string; - - /** MethodDescriptorProto outputType. */ - public outputType: string; - - /** MethodDescriptorProto options. */ - public options?: (google.protobuf.IMethodOptions|null); - - /** MethodDescriptorProto clientStreaming. */ - public clientStreaming: boolean; - - /** MethodDescriptorProto serverStreaming. */ - public serverStreaming: boolean; - - /** - * Creates a new MethodDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodDescriptorProto instance - */ - public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; - - /** - * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param message MethodDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param message MethodDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; - - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; - - /** - * Verifies a MethodDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; - - /** - * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. - * @param message MethodDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this MethodDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FileOptions. */ - interface IFileOptions { - - /** FileOptions javaPackage */ - javaPackage?: (string|null); - - /** FileOptions javaOuterClassname */ - javaOuterClassname?: (string|null); - - /** FileOptions javaMultipleFiles */ - javaMultipleFiles?: (boolean|null); - - /** FileOptions javaGenerateEqualsAndHash */ - javaGenerateEqualsAndHash?: (boolean|null); - - /** FileOptions javaStringCheckUtf8 */ - javaStringCheckUtf8?: (boolean|null); - - /** FileOptions optimizeFor */ - optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|null); - - /** FileOptions goPackage */ - goPackage?: (string|null); - - /** FileOptions ccGenericServices */ - ccGenericServices?: (boolean|null); - - /** FileOptions javaGenericServices */ - javaGenericServices?: (boolean|null); - - /** FileOptions pyGenericServices */ - pyGenericServices?: (boolean|null); - - /** FileOptions phpGenericServices */ - phpGenericServices?: (boolean|null); - - /** FileOptions deprecated */ - deprecated?: (boolean|null); - - /** FileOptions ccEnableArenas */ - ccEnableArenas?: (boolean|null); - - /** FileOptions objcClassPrefix */ - objcClassPrefix?: (string|null); - - /** FileOptions csharpNamespace */ - csharpNamespace?: (string|null); - - /** FileOptions swiftPrefix */ - swiftPrefix?: (string|null); - - /** FileOptions phpClassPrefix */ - phpClassPrefix?: (string|null); - - /** FileOptions phpNamespace */ - phpNamespace?: (string|null); - - /** FileOptions phpMetadataNamespace */ - phpMetadataNamespace?: (string|null); - - /** FileOptions rubyPackage */ - rubyPackage?: (string|null); - - /** FileOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents a FileOptions. */ - class FileOptions implements IFileOptions { - - /** - * Constructs a new FileOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileOptions); - - /** FileOptions javaPackage. */ - public javaPackage: string; - - /** FileOptions javaOuterClassname. */ - public javaOuterClassname: string; - - /** FileOptions javaMultipleFiles. */ - public javaMultipleFiles: boolean; - - /** FileOptions javaGenerateEqualsAndHash. */ - public javaGenerateEqualsAndHash: boolean; - - /** FileOptions javaStringCheckUtf8. */ - public javaStringCheckUtf8: boolean; - - /** FileOptions optimizeFor. */ - public optimizeFor: google.protobuf.FileOptions.OptimizeMode; - - /** FileOptions goPackage. */ - public goPackage: string; - - /** FileOptions ccGenericServices. */ - public ccGenericServices: boolean; - - /** FileOptions javaGenericServices. */ - public javaGenericServices: boolean; - - /** FileOptions pyGenericServices. */ - public pyGenericServices: boolean; - - /** FileOptions phpGenericServices. */ - public phpGenericServices: boolean; - - /** FileOptions deprecated. */ - public deprecated: boolean; - - /** FileOptions ccEnableArenas. */ - public ccEnableArenas: boolean; - - /** FileOptions objcClassPrefix. */ - public objcClassPrefix: string; - - /** FileOptions csharpNamespace. */ - public csharpNamespace: string; - - /** FileOptions swiftPrefix. */ - public swiftPrefix: string; - - /** FileOptions phpClassPrefix. */ - public phpClassPrefix: string; - - /** FileOptions phpNamespace. */ - public phpNamespace: string; - - /** FileOptions phpMetadataNamespace. */ - public phpMetadataNamespace: string; - - /** FileOptions rubyPackage. */ - public rubyPackage: string; - - /** FileOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new FileOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns FileOptions instance - */ - public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; - - /** - * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param message FileOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param message FileOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FileOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; - - /** - * Decodes a FileOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; - - /** - * Verifies a FileOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; - - /** - * Creates a plain object from a FileOptions message. Also converts values to other types if specified. - * @param message FileOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FileOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace FileOptions { - - /** OptimizeMode enum. */ - enum OptimizeMode { - SPEED = 1, - CODE_SIZE = 2, - LITE_RUNTIME = 3 - } - } - - /** Properties of a MessageOptions. */ - interface IMessageOptions { - - /** MessageOptions messageSetWireFormat */ - messageSetWireFormat?: (boolean|null); - - /** MessageOptions noStandardDescriptorAccessor */ - noStandardDescriptorAccessor?: (boolean|null); - - /** MessageOptions deprecated */ - deprecated?: (boolean|null); - - /** MessageOptions mapEntry */ - mapEntry?: (boolean|null); - - /** MessageOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents a MessageOptions. */ - class MessageOptions implements IMessageOptions { - - /** - * Constructs a new MessageOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMessageOptions); - - /** MessageOptions messageSetWireFormat. */ - public messageSetWireFormat: boolean; - - /** MessageOptions noStandardDescriptorAccessor. */ - public noStandardDescriptorAccessor: boolean; - - /** MessageOptions deprecated. */ - public deprecated: boolean; - - /** MessageOptions mapEntry. */ - public mapEntry: boolean; - - /** MessageOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new MessageOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns MessageOptions instance - */ - public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; - - /** - * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param message MessageOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param message MessageOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a MessageOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; - - /** - * Decodes a MessageOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; - - /** - * Verifies a MessageOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MessageOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; - - /** - * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. - * @param message MessageOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this MessageOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FieldOptions. */ - interface IFieldOptions { - - /** FieldOptions ctype */ - ctype?: (google.protobuf.FieldOptions.CType|null); - - /** FieldOptions packed */ - packed?: (boolean|null); - - /** FieldOptions jstype */ - jstype?: (google.protobuf.FieldOptions.JSType|null); - - /** FieldOptions lazy */ - lazy?: (boolean|null); - - /** FieldOptions deprecated */ - deprecated?: (boolean|null); - - /** FieldOptions weak */ - weak?: (boolean|null); - - /** FieldOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents a FieldOptions. */ - class FieldOptions implements IFieldOptions { - - /** - * Constructs a new FieldOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldOptions); - - /** FieldOptions ctype. */ - public ctype: google.protobuf.FieldOptions.CType; - - /** FieldOptions packed. */ - public packed: boolean; - - /** FieldOptions jstype. */ - public jstype: google.protobuf.FieldOptions.JSType; - - /** FieldOptions lazy. */ - public lazy: boolean; - - /** FieldOptions deprecated. */ - public deprecated: boolean; - - /** FieldOptions weak. */ - public weak: boolean; - - /** FieldOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new FieldOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldOptions instance - */ - public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; - - /** - * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param message FieldOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param message FieldOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FieldOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; - - /** - * Decodes a FieldOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; - - /** - * Verifies a FieldOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; - - /** - * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. - * @param message FieldOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FieldOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace FieldOptions { - - /** CType enum. */ - enum CType { - STRING = 0, - CORD = 1, - STRING_PIECE = 2 - } - - /** JSType enum. */ - enum JSType { - JS_NORMAL = 0, - JS_STRING = 1, - JS_NUMBER = 2 - } - } - - /** Properties of an OneofOptions. */ - interface IOneofOptions { - - /** OneofOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an OneofOptions. */ - class OneofOptions implements IOneofOptions { - - /** - * Constructs a new OneofOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IOneofOptions); - - /** OneofOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new OneofOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns OneofOptions instance - */ - public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; - - /** - * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param message OneofOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param message OneofOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an OneofOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; - - /** - * Decodes an OneofOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; - - /** - * Verifies an OneofOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OneofOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; - - /** - * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. - * @param message OneofOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this OneofOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an EnumOptions. */ - interface IEnumOptions { - - /** EnumOptions allowAlias */ - allowAlias?: (boolean|null); - - /** EnumOptions deprecated */ - deprecated?: (boolean|null); - - /** EnumOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an EnumOptions. */ - class EnumOptions implements IEnumOptions { - - /** - * Constructs a new EnumOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumOptions); - - /** EnumOptions allowAlias. */ - public allowAlias: boolean; - - /** EnumOptions deprecated. */ - public deprecated: boolean; - - /** EnumOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new EnumOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumOptions instance - */ - public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; - - /** - * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param message EnumOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param message EnumOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; - - /** - * Decodes an EnumOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; - - /** - * Verifies an EnumOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; - - /** - * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. - * @param message EnumOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an EnumValueOptions. */ - interface IEnumValueOptions { - - /** EnumValueOptions deprecated */ - deprecated?: (boolean|null); - - /** EnumValueOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an EnumValueOptions. */ - class EnumValueOptions implements IEnumValueOptions { - - /** - * Constructs a new EnumValueOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumValueOptions); - - /** EnumValueOptions deprecated. */ - public deprecated: boolean; - - /** EnumValueOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new EnumValueOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumValueOptions instance - */ - public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; - - /** - * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param message EnumValueOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param message EnumValueOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumValueOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; - - /** - * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; - - /** - * Verifies an EnumValueOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumValueOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; - - /** - * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. - * @param message EnumValueOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumValueOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ServiceOptions. */ - interface IServiceOptions { - - /** ServiceOptions deprecated */ - deprecated?: (boolean|null); - - /** ServiceOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - - /** ServiceOptions .google.api.defaultHost */ - ".google.api.defaultHost"?: (string|null); - - /** ServiceOptions .google.api.oauthScopes */ - ".google.api.oauthScopes"?: (string|null); - } - - /** Represents a ServiceOptions. */ - class ServiceOptions implements IServiceOptions { - - /** - * Constructs a new ServiceOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IServiceOptions); - - /** ServiceOptions deprecated. */ - public deprecated: boolean; - - /** ServiceOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new ServiceOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ServiceOptions instance - */ - public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; - - /** - * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param message ServiceOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param message ServiceOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ServiceOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; - - /** - * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; - - /** - * Verifies a ServiceOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ServiceOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; - - /** - * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. - * @param message ServiceOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ServiceOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a MethodOptions. */ - interface IMethodOptions { - - /** MethodOptions deprecated */ - deprecated?: (boolean|null); - - /** MethodOptions idempotencyLevel */ - idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|null); - - /** MethodOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - - /** MethodOptions .google.api.http */ - ".google.api.http"?: (google.api.IHttpRule|null); - - /** MethodOptions .google.api.methodSignature */ - ".google.api.methodSignature"?: (string[]|null); - } - - /** Represents a MethodOptions. */ - class MethodOptions implements IMethodOptions { - - /** - * Constructs a new MethodOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMethodOptions); - - /** MethodOptions deprecated. */ - public deprecated: boolean; - - /** MethodOptions idempotencyLevel. */ - public idempotencyLevel: google.protobuf.MethodOptions.IdempotencyLevel; - - /** MethodOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new MethodOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodOptions instance - */ - public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; - - /** - * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param message MethodOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param message MethodOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a MethodOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; - - /** - * Decodes a MethodOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; - - /** - * Verifies a MethodOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; - - /** - * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. - * @param message MethodOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this MethodOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace MethodOptions { - - /** IdempotencyLevel enum. */ - enum IdempotencyLevel { - IDEMPOTENCY_UNKNOWN = 0, - NO_SIDE_EFFECTS = 1, - IDEMPOTENT = 2 - } - } - - /** Properties of an UninterpretedOption. */ - interface IUninterpretedOption { - - /** UninterpretedOption name */ - name?: (google.protobuf.UninterpretedOption.INamePart[]|null); - - /** UninterpretedOption identifierValue */ - identifierValue?: (string|null); - - /** UninterpretedOption positiveIntValue */ - positiveIntValue?: (number|Long|null); - - /** UninterpretedOption negativeIntValue */ - negativeIntValue?: (number|Long|null); - - /** UninterpretedOption doubleValue */ - doubleValue?: (number|null); - - /** UninterpretedOption stringValue */ - stringValue?: (Uint8Array|null); - - /** UninterpretedOption aggregateValue */ - aggregateValue?: (string|null); - } - - /** Represents an UninterpretedOption. */ - class UninterpretedOption implements IUninterpretedOption { - - /** - * Constructs a new UninterpretedOption. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IUninterpretedOption); - - /** UninterpretedOption name. */ - public name: google.protobuf.UninterpretedOption.INamePart[]; - - /** UninterpretedOption identifierValue. */ - public identifierValue: string; - - /** UninterpretedOption positiveIntValue. */ - public positiveIntValue: (number|Long); - - /** UninterpretedOption negativeIntValue. */ - public negativeIntValue: (number|Long); - - /** UninterpretedOption doubleValue. */ - public doubleValue: number; - - /** UninterpretedOption stringValue. */ - public stringValue: Uint8Array; - - /** UninterpretedOption aggregateValue. */ - public aggregateValue: string; - - /** - * Creates a new UninterpretedOption instance using the specified properties. - * @param [properties] Properties to set - * @returns UninterpretedOption instance - */ - public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; - - /** - * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param message UninterpretedOption message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param message UninterpretedOption message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an UninterpretedOption message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; - - /** - * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; - - /** - * Verifies an UninterpretedOption message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UninterpretedOption - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; - - /** - * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. - * @param message UninterpretedOption - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this UninterpretedOption to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace UninterpretedOption { - - /** Properties of a NamePart. */ - interface INamePart { - - /** NamePart namePart */ - namePart: string; - - /** NamePart isExtension */ - isExtension: boolean; - } - - /** Represents a NamePart. */ - class NamePart implements INamePart { - - /** - * Constructs a new NamePart. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.UninterpretedOption.INamePart); - - /** NamePart namePart. */ - public namePart: string; - - /** NamePart isExtension. */ - public isExtension: boolean; - - /** - * Creates a new NamePart instance using the specified properties. - * @param [properties] Properties to set - * @returns NamePart instance - */ - public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; - - /** - * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a NamePart message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns NamePart - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; - - /** - * Decodes a NamePart message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns NamePart - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; - - /** - * Verifies a NamePart message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a NamePart message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns NamePart - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; - - /** - * Creates a plain object from a NamePart message. Also converts values to other types if specified. - * @param message NamePart - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this NamePart to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of a SourceCodeInfo. */ - interface ISourceCodeInfo { - - /** SourceCodeInfo location */ - location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); - } - - /** Represents a SourceCodeInfo. */ - class SourceCodeInfo implements ISourceCodeInfo { - - /** - * Constructs a new SourceCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.ISourceCodeInfo); - - /** SourceCodeInfo location. */ - public location: google.protobuf.SourceCodeInfo.ILocation[]; - - /** - * Creates a new SourceCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns SourceCodeInfo instance - */ - public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; - - /** - * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; - - /** - * Verifies a SourceCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SourceCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; - - /** - * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. - * @param message SourceCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this SourceCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace SourceCodeInfo { - - /** Properties of a Location. */ - interface ILocation { - - /** Location path */ - path?: (number[]|null); - - /** Location span */ - span?: (number[]|null); - - /** Location leadingComments */ - leadingComments?: (string|null); - - /** Location trailingComments */ - trailingComments?: (string|null); - - /** Location leadingDetachedComments */ - leadingDetachedComments?: (string[]|null); - } - - /** Represents a Location. */ - class Location implements ILocation { - - /** - * Constructs a new Location. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); - - /** Location path. */ - public path: number[]; - - /** Location span. */ - public span: number[]; - - /** Location leadingComments. */ - public leadingComments: string; - - /** Location trailingComments. */ - public trailingComments: string; - - /** Location leadingDetachedComments. */ - public leadingDetachedComments: string[]; - - /** - * Creates a new Location instance using the specified properties. - * @param [properties] Properties to set - * @returns Location instance - */ - public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; - - /** - * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Location message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Location - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; - - /** - * Decodes a Location message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Location - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; - - /** - * Verifies a Location message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Location message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Location - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; - - /** - * Creates a plain object from a Location message. Also converts values to other types if specified. - * @param message Location - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Location to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of a GeneratedCodeInfo. */ - interface IGeneratedCodeInfo { - - /** GeneratedCodeInfo annotation */ - annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); - } - - /** Represents a GeneratedCodeInfo. */ - class GeneratedCodeInfo implements IGeneratedCodeInfo { - - /** - * Constructs a new GeneratedCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IGeneratedCodeInfo); - - /** GeneratedCodeInfo annotation. */ - public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; - - /** - * Creates a new GeneratedCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns GeneratedCodeInfo instance - */ - public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; - - /** - * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; - - /** - * Verifies a GeneratedCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GeneratedCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; - - /** - * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. - * @param message GeneratedCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GeneratedCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace GeneratedCodeInfo { - - /** Properties of an Annotation. */ - interface IAnnotation { - - /** Annotation path */ - path?: (number[]|null); - - /** Annotation sourceFile */ - sourceFile?: (string|null); - - /** Annotation begin */ - begin?: (number|null); - - /** Annotation end */ - end?: (number|null); - } - - /** Represents an Annotation. */ - class Annotation implements IAnnotation { - - /** - * Constructs a new Annotation. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); - - /** Annotation path. */ - public path: number[]; - - /** Annotation sourceFile. */ - public sourceFile: string; - - /** Annotation begin. */ - public begin: number; - - /** Annotation end. */ - public end: number; - - /** - * Creates a new Annotation instance using the specified properties. - * @param [properties] Properties to set - * @returns Annotation instance - */ - public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an Annotation message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Annotation - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Decodes an Annotation message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Annotation - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Verifies an Annotation message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an Annotation message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Annotation - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Creates a plain object from an Annotation message. Also converts values to other types if specified. - * @param message Annotation - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Annotation to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of a Duration. */ - interface IDuration { - - /** Duration seconds */ - seconds?: (number|Long|null); - - /** Duration nanos */ - nanos?: (number|null); - } - - /** Represents a Duration. */ - class Duration implements IDuration { - - /** - * Constructs a new Duration. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IDuration); - - /** Duration seconds. */ - public seconds: (number|Long); - - /** Duration nanos. */ - public nanos: number; - - /** - * Creates a new Duration instance using the specified properties. - * @param [properties] Properties to set - * @returns Duration instance - */ - public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; - - /** - * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @param message Duration message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @param message Duration message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Duration message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; - - /** - * Decodes a Duration message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; - - /** - * Verifies a Duration message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Duration message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Duration - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; - - /** - * Creates a plain object from a Duration message. Also converts values to other types if specified. - * @param message Duration - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Duration to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an Empty. */ - interface IEmpty { - } - - /** Represents an Empty. */ - class Empty implements IEmpty { - - /** - * Constructs a new Empty. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEmpty); - - /** - * Creates a new Empty instance using the specified properties. - * @param [properties] Properties to set - * @returns Empty instance - */ - public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; - - /** - * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @param message Empty message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @param message Empty message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an Empty message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; - - /** - * Decodes an Empty message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; - - /** - * Verifies an Empty message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an Empty message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Empty - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; - - /** - * Creates a plain object from an Empty message. Also converts values to other types if specified. - * @param message Empty - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Empty to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FieldMask. */ - interface IFieldMask { - - /** FieldMask paths */ - paths?: (string[]|null); - } - - /** Represents a FieldMask. */ - class FieldMask implements IFieldMask { - - /** - * Constructs a new FieldMask. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldMask); - - /** FieldMask paths. */ - public paths: string[]; - - /** - * Creates a new FieldMask instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldMask instance - */ - public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; - - /** - * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @param message FieldMask message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @param message FieldMask message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a FieldMask message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; - - /** - * Decodes a FieldMask message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; - - /** - * Verifies a FieldMask message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldMask - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; - - /** - * Creates a plain object from a FieldMask message. Also converts values to other types if specified. - * @param message FieldMask - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this FieldMask to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Timestamp. */ - interface ITimestamp { - - /** Timestamp seconds */ - seconds?: (number|Long|null); - - /** Timestamp nanos */ - nanos?: (number|null); - } - - /** Represents a Timestamp. */ - class Timestamp implements ITimestamp { - - /** - * Constructs a new Timestamp. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.ITimestamp); - - /** Timestamp seconds. */ - public seconds: (number|Long); - - /** Timestamp nanos. */ - public nanos: number; - - /** - * Creates a new Timestamp instance using the specified properties. - * @param [properties] Properties to set - * @returns Timestamp instance - */ - public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; - - /** - * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @param message Timestamp message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @param message Timestamp message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Timestamp message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Timestamp - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; - - /** - * Decodes a Timestamp message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Timestamp - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; - - /** - * Verifies a Timestamp message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Timestamp - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; - - /** - * Creates a plain object from a Timestamp message. Also converts values to other types if specified. - * @param message Timestamp - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Timestamp to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Namespace iam. */ - namespace iam { - - /** Namespace v1. */ - namespace v1 { - - /** Represents a IAMPolicy */ - class IAMPolicy extends $protobuf.rpc.Service { - - /** - * Constructs a new IAMPolicy service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - - /** - * Creates new IAMPolicy service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): IAMPolicy; - - /** - * Calls SetIamPolicy. - * @param request SetIamPolicyRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Policy - */ - public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.SetIamPolicyCallback): void; - - /** - * Calls SetIamPolicy. - * @param request SetIamPolicyRequest message or plain object - * @returns Promise - */ - public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest): Promise; - - /** - * Calls GetIamPolicy. - * @param request GetIamPolicyRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Policy - */ - public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.GetIamPolicyCallback): void; - - /** - * Calls GetIamPolicy. - * @param request GetIamPolicyRequest message or plain object - * @returns Promise - */ - public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest): Promise; - - /** - * Calls TestIamPermissions. - * @param request TestIamPermissionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and TestIamPermissionsResponse - */ - public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest, callback: google.iam.v1.IAMPolicy.TestIamPermissionsCallback): void; - - /** - * Calls TestIamPermissions. - * @param request TestIamPermissionsRequest message or plain object - * @returns Promise - */ - public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest): Promise; - } - - namespace IAMPolicy { - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. - * @param error Error, if any - * @param [response] Policy - */ - type SetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. - * @param error Error, if any - * @param [response] Policy - */ - type GetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. - * @param error Error, if any - * @param [response] TestIamPermissionsResponse - */ - type TestIamPermissionsCallback = (error: (Error|null), response?: google.iam.v1.TestIamPermissionsResponse) => void; - } - - /** Properties of a SetIamPolicyRequest. */ - interface ISetIamPolicyRequest { - - /** SetIamPolicyRequest resource */ - resource?: (string|null); - - /** SetIamPolicyRequest policy */ - policy?: (google.iam.v1.IPolicy|null); - } - - /** Represents a SetIamPolicyRequest. */ - class SetIamPolicyRequest implements ISetIamPolicyRequest { - - /** - * Constructs a new SetIamPolicyRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.ISetIamPolicyRequest); - - /** SetIamPolicyRequest resource. */ - public resource: string; - - /** SetIamPolicyRequest policy. */ - public policy?: (google.iam.v1.IPolicy|null); - - /** - * Creates a new SetIamPolicyRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns SetIamPolicyRequest instance - */ - public static create(properties?: google.iam.v1.ISetIamPolicyRequest): google.iam.v1.SetIamPolicyRequest; - - /** - * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @param message SetIamPolicyRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @param message SetIamPolicyRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SetIamPolicyRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.SetIamPolicyRequest; - - /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SetIamPolicyRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.SetIamPolicyRequest; - - /** - * Verifies a SetIamPolicyRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SetIamPolicyRequest - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.SetIamPolicyRequest; - - /** - * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. - * @param message SetIamPolicyRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.SetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this SetIamPolicyRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a GetIamPolicyRequest. */ - interface IGetIamPolicyRequest { - - /** GetIamPolicyRequest resource */ - resource?: (string|null); - - /** GetIamPolicyRequest options */ - options?: (google.iam.v1.IGetPolicyOptions|null); - } - - /** Represents a GetIamPolicyRequest. */ - class GetIamPolicyRequest implements IGetIamPolicyRequest { - - /** - * Constructs a new GetIamPolicyRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IGetIamPolicyRequest); - - /** GetIamPolicyRequest resource. */ - public resource: string; - - /** GetIamPolicyRequest options. */ - public options?: (google.iam.v1.IGetPolicyOptions|null); - - /** - * Creates a new GetIamPolicyRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns GetIamPolicyRequest instance - */ - public static create(properties?: google.iam.v1.IGetIamPolicyRequest): google.iam.v1.GetIamPolicyRequest; - - /** - * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. - * @param message GetIamPolicyRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. - * @param message GetIamPolicyRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetIamPolicyRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetIamPolicyRequest; - - /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetIamPolicyRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetIamPolicyRequest; - - /** - * Verifies a GetIamPolicyRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetIamPolicyRequest - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.GetIamPolicyRequest; - - /** - * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. - * @param message GetIamPolicyRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.GetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GetIamPolicyRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a TestIamPermissionsRequest. */ - interface ITestIamPermissionsRequest { - - /** TestIamPermissionsRequest resource */ - resource?: (string|null); - - /** TestIamPermissionsRequest permissions */ - permissions?: (string[]|null); - } - - /** Represents a TestIamPermissionsRequest. */ - class TestIamPermissionsRequest implements ITestIamPermissionsRequest { - - /** - * Constructs a new TestIamPermissionsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.ITestIamPermissionsRequest); - - /** TestIamPermissionsRequest resource. */ - public resource: string; - - /** TestIamPermissionsRequest permissions. */ - public permissions: string[]; - - /** - * Creates a new TestIamPermissionsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns TestIamPermissionsRequest instance - */ - public static create(properties?: google.iam.v1.ITestIamPermissionsRequest): google.iam.v1.TestIamPermissionsRequest; - - /** - * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. - * @param message TestIamPermissionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. - * @param message TestIamPermissionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns TestIamPermissionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsRequest; - - /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns TestIamPermissionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsRequest; - - /** - * Verifies a TestIamPermissionsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns TestIamPermissionsRequest - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsRequest; - - /** - * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. - * @param message TestIamPermissionsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.TestIamPermissionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this TestIamPermissionsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a TestIamPermissionsResponse. */ - interface ITestIamPermissionsResponse { - - /** TestIamPermissionsResponse permissions */ - permissions?: (string[]|null); - } - - /** Represents a TestIamPermissionsResponse. */ - class TestIamPermissionsResponse implements ITestIamPermissionsResponse { - - /** - * Constructs a new TestIamPermissionsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.ITestIamPermissionsResponse); - - /** TestIamPermissionsResponse permissions. */ - public permissions: string[]; - - /** - * Creates a new TestIamPermissionsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns TestIamPermissionsResponse instance - */ - public static create(properties?: google.iam.v1.ITestIamPermissionsResponse): google.iam.v1.TestIamPermissionsResponse; - - /** - * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. - * @param message TestIamPermissionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. - * @param message TestIamPermissionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns TestIamPermissionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsResponse; - - /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns TestIamPermissionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsResponse; - - /** - * Verifies a TestIamPermissionsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns TestIamPermissionsResponse - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsResponse; - - /** - * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. - * @param message TestIamPermissionsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.TestIamPermissionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this TestIamPermissionsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a GetPolicyOptions. */ - interface IGetPolicyOptions { - - /** GetPolicyOptions requestedPolicyVersion */ - requestedPolicyVersion?: (number|null); - } - - /** Represents a GetPolicyOptions. */ - class GetPolicyOptions implements IGetPolicyOptions { - - /** - * Constructs a new GetPolicyOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IGetPolicyOptions); - - /** GetPolicyOptions requestedPolicyVersion. */ - public requestedPolicyVersion: number; - - /** - * Creates a new GetPolicyOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns GetPolicyOptions instance - */ - public static create(properties?: google.iam.v1.IGetPolicyOptions): google.iam.v1.GetPolicyOptions; - - /** - * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. - * @param message GetPolicyOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. - * @param message GetPolicyOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GetPolicyOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetPolicyOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetPolicyOptions; - - /** - * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetPolicyOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetPolicyOptions; - - /** - * Verifies a GetPolicyOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetPolicyOptions - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.GetPolicyOptions; - - /** - * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. - * @param message GetPolicyOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.GetPolicyOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GetPolicyOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Policy. */ - interface IPolicy { - - /** Policy version */ - version?: (number|null); - - /** Policy bindings */ - bindings?: (google.iam.v1.IBinding[]|null); - - /** Policy etag */ - etag?: (Uint8Array|null); - } - - /** Represents a Policy. */ - class Policy implements IPolicy { - - /** - * Constructs a new Policy. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IPolicy); - - /** Policy version. */ - public version: number; - - /** Policy bindings. */ - public bindings: google.iam.v1.IBinding[]; - - /** Policy etag. */ - public etag: Uint8Array; - - /** - * Creates a new Policy instance using the specified properties. - * @param [properties] Properties to set - * @returns Policy instance - */ - public static create(properties?: google.iam.v1.IPolicy): google.iam.v1.Policy; - - /** - * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @param message Policy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @param message Policy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Policy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Policy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Policy; - - /** - * Decodes a Policy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Policy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Policy; - - /** - * Verifies a Policy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Policy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Policy - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.Policy; - - /** - * Creates a plain object from a Policy message. Also converts values to other types if specified. - * @param message Policy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.Policy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Policy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Binding. */ - interface IBinding { - - /** Binding role */ - role?: (string|null); - - /** Binding members */ - members?: (string[]|null); - - /** Binding condition */ - condition?: (google.type.IExpr|null); - } - - /** Represents a Binding. */ - class Binding implements IBinding { - - /** - * Constructs a new Binding. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IBinding); - - /** Binding role. */ - public role: string; - - /** Binding members. */ - public members: string[]; - - /** Binding condition. */ - public condition?: (google.type.IExpr|null); - - /** - * Creates a new Binding instance using the specified properties. - * @param [properties] Properties to set - * @returns Binding instance - */ - public static create(properties?: google.iam.v1.IBinding): google.iam.v1.Binding; - - /** - * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @param message Binding message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @param message Binding message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Binding message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Binding - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Binding; - - /** - * Decodes a Binding message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Binding - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Binding; - - /** - * Verifies a Binding message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Binding message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Binding - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.Binding; - - /** - * Creates a plain object from a Binding message. Also converts values to other types if specified. - * @param message Binding - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.Binding, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Binding to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a PolicyDelta. */ - interface IPolicyDelta { - - /** PolicyDelta bindingDeltas */ - bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); - - /** PolicyDelta auditConfigDeltas */ - auditConfigDeltas?: (google.iam.v1.IAuditConfigDelta[]|null); - } - - /** Represents a PolicyDelta. */ - class PolicyDelta implements IPolicyDelta { - - /** - * Constructs a new PolicyDelta. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IPolicyDelta); - - /** PolicyDelta bindingDeltas. */ - public bindingDeltas: google.iam.v1.IBindingDelta[]; - - /** PolicyDelta auditConfigDeltas. */ - public auditConfigDeltas: google.iam.v1.IAuditConfigDelta[]; - - /** - * Creates a new PolicyDelta instance using the specified properties. - * @param [properties] Properties to set - * @returns PolicyDelta instance - */ - public static create(properties?: google.iam.v1.IPolicyDelta): google.iam.v1.PolicyDelta; - - /** - * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. - * @param message PolicyDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. - * @param message PolicyDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PolicyDelta message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PolicyDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.PolicyDelta; - - /** - * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PolicyDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.PolicyDelta; - - /** - * Verifies a PolicyDelta message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PolicyDelta - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.PolicyDelta; - - /** - * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. - * @param message PolicyDelta - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.PolicyDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PolicyDelta to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a BindingDelta. */ - interface IBindingDelta { - - /** BindingDelta action */ - action?: (google.iam.v1.BindingDelta.Action|null); - - /** BindingDelta role */ - role?: (string|null); - - /** BindingDelta member */ - member?: (string|null); - - /** BindingDelta condition */ - condition?: (google.type.IExpr|null); - } - - /** Represents a BindingDelta. */ - class BindingDelta implements IBindingDelta { - - /** - * Constructs a new BindingDelta. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IBindingDelta); - - /** BindingDelta action. */ - public action: google.iam.v1.BindingDelta.Action; - - /** BindingDelta role. */ - public role: string; - - /** BindingDelta member. */ - public member: string; - - /** BindingDelta condition. */ - public condition?: (google.type.IExpr|null); - - /** - * Creates a new BindingDelta instance using the specified properties. - * @param [properties] Properties to set - * @returns BindingDelta instance - */ - public static create(properties?: google.iam.v1.IBindingDelta): google.iam.v1.BindingDelta; - - /** - * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. - * @param message BindingDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. - * @param message BindingDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a BindingDelta message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns BindingDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.BindingDelta; - - /** - * Decodes a BindingDelta message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns BindingDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.BindingDelta; - - /** - * Verifies a BindingDelta message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns BindingDelta - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.BindingDelta; - - /** - * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. - * @param message BindingDelta - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.BindingDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this BindingDelta to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace BindingDelta { - - /** Action enum. */ - enum Action { - ACTION_UNSPECIFIED = 0, - ADD = 1, - REMOVE = 2 - } - } - - /** Properties of an AuditConfigDelta. */ - interface IAuditConfigDelta { - - /** AuditConfigDelta action */ - action?: (google.iam.v1.AuditConfigDelta.Action|null); - - /** AuditConfigDelta service */ - service?: (string|null); - - /** AuditConfigDelta exemptedMember */ - exemptedMember?: (string|null); - - /** AuditConfigDelta logType */ - logType?: (string|null); - } - - /** Represents an AuditConfigDelta. */ - class AuditConfigDelta implements IAuditConfigDelta { - - /** - * Constructs a new AuditConfigDelta. - * @param [properties] Properties to set - */ - constructor(properties?: google.iam.v1.IAuditConfigDelta); - - /** AuditConfigDelta action. */ - public action: google.iam.v1.AuditConfigDelta.Action; - - /** AuditConfigDelta service. */ - public service: string; - - /** AuditConfigDelta exemptedMember. */ - public exemptedMember: string; - - /** AuditConfigDelta logType. */ - public logType: string; - - /** - * Creates a new AuditConfigDelta instance using the specified properties. - * @param [properties] Properties to set - * @returns AuditConfigDelta instance - */ - public static create(properties?: google.iam.v1.IAuditConfigDelta): google.iam.v1.AuditConfigDelta; - - /** - * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. - * @param message AuditConfigDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. - * @param message AuditConfigDelta message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an AuditConfigDelta message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns AuditConfigDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.AuditConfigDelta; - - /** - * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns AuditConfigDelta - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.AuditConfigDelta; - - /** - * Verifies an AuditConfigDelta message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns AuditConfigDelta - */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.AuditConfigDelta; - - /** - * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. - * @param message AuditConfigDelta - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.iam.v1.AuditConfigDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this AuditConfigDelta to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace AuditConfigDelta { - - /** Action enum. */ - enum Action { - ACTION_UNSPECIFIED = 0, - ADD = 1, - REMOVE = 2 - } - } - } - } - - /** Namespace type. */ - namespace type { - - /** Properties of an Expr. */ - interface IExpr { - - /** Expr expression */ - expression?: (string|null); - - /** Expr title */ - title?: (string|null); - - /** Expr description */ - description?: (string|null); - - /** Expr location */ - location?: (string|null); - } - - /** Represents an Expr. */ - class Expr implements IExpr { - - /** - * Constructs a new Expr. - * @param [properties] Properties to set - */ - constructor(properties?: google.type.IExpr); - - /** Expr expression. */ - public expression: string; - - /** Expr title. */ - public title: string; - - /** Expr description. */ - public description: string; - - /** Expr location. */ - public location: string; - - /** - * Creates a new Expr instance using the specified properties. - * @param [properties] Properties to set - * @returns Expr instance - */ - public static create(properties?: google.type.IExpr): google.type.Expr; - - /** - * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @param message Expr message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @param message Expr message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an Expr message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.type.Expr; - - /** - * Decodes an Expr message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.type.Expr; - - /** - * Verifies an Expr message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an Expr message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Expr - */ - public static fromObject(object: { [k: string]: any }): google.type.Expr; - - /** - * Creates a plain object from an Expr message. Also converts values to other types if specified. - * @param message Expr - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.type.Expr, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Expr to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } -} diff --git a/handwritten/pubsub/protos/google/cloud/common_resources.proto b/handwritten/pubsub/protos/google/cloud/common_resources.proto new file mode 100644 index 00000000000..56c9f800d5e --- /dev/null +++ b/handwritten/pubsub/protos/google/cloud/common_resources.proto @@ -0,0 +1,52 @@ +// Copyright 2019 Google LLC. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This file contains stub messages for common resources in GCP. +// It is not intended to be directly generated, and is instead used by +// other tooling to be able to match common resource patterns. +syntax = "proto3"; + +package google.cloud; + +import "google/api/resource.proto"; + + +option (google.api.resource_definition) = { + type: "cloudresourcemanager.googleapis.com/Project" + pattern: "projects/{project}" +}; + + +option (google.api.resource_definition) = { + type: "cloudresourcemanager.googleapis.com/Organization" + pattern: "organizations/{organization}" +}; + + +option (google.api.resource_definition) = { + type: "cloudresourcemanager.googleapis.com/Folder" + pattern: "folders/{folder}" +}; + + +option (google.api.resource_definition) = { + type: "cloudbilling.googleapis.com/BillingAccount" + pattern: "billingAccounts/{billing_account}" +}; + +option (google.api.resource_definition) = { + type: "locations.googleapis.com/Location" + pattern: "projects/{project}/locations/{location}" +}; + diff --git a/handwritten/pubsub/protos/google/iam/admin/v1/iam.proto b/handwritten/pubsub/protos/google/iam/admin/v1/iam.proto deleted file mode 100644 index 2e2fe2b72fc..00000000000 --- a/handwritten/pubsub/protos/google/iam/admin/v1/iam.proto +++ /dev/null @@ -1,469 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.iam.admin.v1; - -import "google/api/annotations.proto"; -import "google/iam/v1/iam_policy.proto"; -import "google/iam/v1/policy.proto"; -import "google/protobuf/empty.proto"; -import "google/protobuf/field_mask.proto"; -import "google/protobuf/timestamp.proto"; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/iam/admin/v1;admin"; -option java_multiple_files = true; -option java_outer_classname = "IamProto"; -option java_package = "com.google.iam.admin.v1"; - - -// Creates and manages service account objects. -// -// Service account is an account that belongs to your project instead -// of to an individual end user. It is used to authenticate calls -// to a Google API. -// -// To create a service account, specify the `project_id` and `account_id` -// for the account. The `account_id` is unique within the project, and used -// to generate the service account email address and a stable -// `unique_id`. -// -// All other methods can identify accounts using the format -// `projects/{project}/serviceAccounts/{account}`. -// Using `-` as a wildcard for the project will infer the project from -// the account. The `account` value can be the `email` address or the -// `unique_id` of the service account. -service IAM { - // Lists [ServiceAccounts][google.iam.admin.v1.ServiceAccount] for a project. - rpc ListServiceAccounts(ListServiceAccountsRequest) returns (ListServiceAccountsResponse) { - option (google.api.http) = { get: "/v1/{name=projects/*}/serviceAccounts" }; - } - - // Gets a [ServiceAccount][google.iam.admin.v1.ServiceAccount]. - rpc GetServiceAccount(GetServiceAccountRequest) returns (ServiceAccount) { - option (google.api.http) = { get: "/v1/{name=projects/*/serviceAccounts/*}" }; - } - - // Creates a [ServiceAccount][google.iam.admin.v1.ServiceAccount] - // and returns it. - rpc CreateServiceAccount(CreateServiceAccountRequest) returns (ServiceAccount) { - option (google.api.http) = { post: "/v1/{name=projects/*}/serviceAccounts" body: "*" }; - } - - // Updates a [ServiceAccount][google.iam.admin.v1.ServiceAccount]. - // - // Currently, only the following fields are updatable: - // `display_name` . - // The `etag` is mandatory. - rpc UpdateServiceAccount(ServiceAccount) returns (ServiceAccount) { - option (google.api.http) = { put: "/v1/{name=projects/*/serviceAccounts/*}" body: "*" }; - } - - // Deletes a [ServiceAccount][google.iam.admin.v1.ServiceAccount]. - rpc DeleteServiceAccount(DeleteServiceAccountRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { delete: "/v1/{name=projects/*/serviceAccounts/*}" }; - } - - // Lists [ServiceAccountKeys][google.iam.admin.v1.ServiceAccountKey]. - rpc ListServiceAccountKeys(ListServiceAccountKeysRequest) returns (ListServiceAccountKeysResponse) { - option (google.api.http) = { get: "/v1/{name=projects/*/serviceAccounts/*}/keys" }; - } - - // Gets the [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey] - // by key id. - rpc GetServiceAccountKey(GetServiceAccountKeyRequest) returns (ServiceAccountKey) { - option (google.api.http) = { get: "/v1/{name=projects/*/serviceAccounts/*/keys/*}" }; - } - - // Creates a [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey] - // and returns it. - rpc CreateServiceAccountKey(CreateServiceAccountKeyRequest) returns (ServiceAccountKey) { - option (google.api.http) = { post: "/v1/{name=projects/*/serviceAccounts/*}/keys" body: "*" }; - } - - // Deletes a [ServiceAccountKey][google.iam.admin.v1.ServiceAccountKey]. - rpc DeleteServiceAccountKey(DeleteServiceAccountKeyRequest) returns (google.protobuf.Empty) { - option (google.api.http) = { delete: "/v1/{name=projects/*/serviceAccounts/*/keys/*}" }; - } - - // Signs a blob using a service account's system-managed private key. - rpc SignBlob(SignBlobRequest) returns (SignBlobResponse) { - option (google.api.http) = { post: "/v1/{name=projects/*/serviceAccounts/*}:signBlob" body: "*" }; - } - - // Returns the IAM access control policy for a - // [ServiceAccount][google.iam.admin.v1.ServiceAccount]. - rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest) returns (google.iam.v1.Policy) { - option (google.api.http) = { post: "/v1/{resource=projects/*/serviceAccounts/*}:getIamPolicy" body: "" }; - } - - // Sets the IAM access control policy for a - // [ServiceAccount][google.iam.admin.v1.ServiceAccount]. - rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest) returns (google.iam.v1.Policy) { - option (google.api.http) = { post: "/v1/{resource=projects/*/serviceAccounts/*}:setIamPolicy" body: "*" }; - } - - // Tests the specified permissions against the IAM access control policy - // for a [ServiceAccount][google.iam.admin.v1.ServiceAccount]. - rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest) returns (google.iam.v1.TestIamPermissionsResponse) { - option (google.api.http) = { post: "/v1/{resource=projects/*/serviceAccounts/*}:testIamPermissions" body: "*" }; - } - - // Queries roles that can be granted on a particular resource. - // A role is grantable if it can be used as the role in a binding for a policy - // for that resource. - rpc QueryGrantableRoles(QueryGrantableRolesRequest) returns (QueryGrantableRolesResponse) { - option (google.api.http) = { post: "/v1/roles:queryGrantableRoles" body: "*" }; - } -} - -// A service account in the Identity and Access Management API. -// -// To create a service account, specify the `project_id` and the `account_id` -// for the account. The `account_id` is unique within the project, and is used -// to generate the service account email address and a stable -// `unique_id`. -// -// If the account already exists, the account's resource name is returned -// in util::Status's ResourceInfo.resource_name in the format of -// projects/{project}/serviceAccounts/{email}. The caller can use the name in -// other methods to access the account. -// -// All other methods can identify the service account using the format -// `projects/{project}/serviceAccounts/{account}`. -// Using `-` as a wildcard for the project will infer the project from -// the account. The `account` value can be the `email` address or the -// `unique_id` of the service account. -message ServiceAccount { - // The resource name of the service account in the following format: - // `projects/{project}/serviceAccounts/{account}`. - // - // Requests using `-` as a wildcard for the project will infer the project - // from the `account` and the `account` value can be the `email` address or - // the `unique_id` of the service account. - // - // In responses the resource name will always be in the format - // `projects/{project}/serviceAccounts/{email}`. - string name = 1; - - // @OutputOnly The id of the project that owns the service account. - string project_id = 2; - - // @OutputOnly The unique and stable id of the service account. - string unique_id = 4; - - // @OutputOnly The email address of the service account. - string email = 5; - - // Optional. A user-specified description of the service account. Must be - // fewer than 100 UTF-8 bytes. - string display_name = 6; - - // Used to perform a consistent read-modify-write. - bytes etag = 7; - - // @OutputOnly. The OAuth2 client id for the service account. - // This is used in conjunction with the OAuth2 clientconfig API to make - // three legged OAuth2 (3LO) flows to access the data of Google users. - string oauth2_client_id = 9; -} - -// The service account create request. -message CreateServiceAccountRequest { - // Required. The resource name of the project associated with the service - // accounts, such as `projects/my-project-123`. - string name = 1; - - // Required. The account id that is used to generate the service account - // email address and a stable unique id. It is unique within a project, - // must be 6-30 characters long, and match the regular expression - // `[a-z]([-a-z0-9]*[a-z0-9])` to comply with RFC1035. - string account_id = 2; - - // The [ServiceAccount][google.iam.admin.v1.ServiceAccount] resource to create. - // Currently, only the following values are user assignable: - // `display_name` . - ServiceAccount service_account = 3; -} - -// The service account list request. -message ListServiceAccountsRequest { - // Required. The resource name of the project associated with the service - // accounts, such as `projects/my-project-123`. - string name = 1; - - // Optional limit on the number of service accounts to include in the - // response. Further accounts can subsequently be obtained by including the - // [ListServiceAccountsResponse.next_page_token][google.iam.admin.v1.ListServiceAccountsResponse.next_page_token] - // in a subsequent request. - int32 page_size = 2; - - // Optional pagination token returned in an earlier - // [ListServiceAccountsResponse.next_page_token][google.iam.admin.v1.ListServiceAccountsResponse.next_page_token]. - string page_token = 3; -} - -// The service account list response. -message ListServiceAccountsResponse { - // The list of matching service accounts. - repeated ServiceAccount accounts = 1; - - // To retrieve the next page of results, set - // [ListServiceAccountsRequest.page_token][google.iam.admin.v1.ListServiceAccountsRequest.page_token] - // to this value. - string next_page_token = 2; -} - -// The service account get request. -message GetServiceAccountRequest { - // The resource name of the service account in the following format: - // `projects/{project}/serviceAccounts/{account}`. - // Using `-` as a wildcard for the project will infer the project from - // the account. The `account` value can be the `email` address or the - // `unique_id` of the service account. - string name = 1; -} - -// The service account delete request. -message DeleteServiceAccountRequest { - // The resource name of the service account in the following format: - // `projects/{project}/serviceAccounts/{account}`. - // Using `-` as a wildcard for the project will infer the project from - // the account. The `account` value can be the `email` address or the - // `unique_id` of the service account. - string name = 1; -} - -// The service account keys list request. -message ListServiceAccountKeysRequest { - // `KeyType` filters to selectively retrieve certain varieties - // of keys. - enum KeyType { - // Unspecified key type. The presence of this in the - // message will immediately result in an error. - KEY_TYPE_UNSPECIFIED = 0; - - // User-managed keys (managed and rotated by the user). - USER_MANAGED = 1; - - // System-managed keys (managed and rotated by Google). - SYSTEM_MANAGED = 2; - } - - // The resource name of the service account in the following format: - // `projects/{project}/serviceAccounts/{account}`. - // - // Using `-` as a wildcard for the project, will infer the project from - // the account. The `account` value can be the `email` address or the - // `unique_id` of the service account. - string name = 1; - - // Filters the types of keys the user wants to include in the list - // response. Duplicate key types are not allowed. If no key type - // is provided, all keys are returned. - repeated KeyType key_types = 2; -} - -// The service account keys list response. -message ListServiceAccountKeysResponse { - // The public keys for the service account. - repeated ServiceAccountKey keys = 1; -} - -// The service account key get by id request. -message GetServiceAccountKeyRequest { - // The resource name of the service account key in the following format: - // `projects/{project}/serviceAccounts/{account}/keys/{key}`. - // - // Using `-` as a wildcard for the project will infer the project from - // the account. The `account` value can be the `email` address or the - // `unique_id` of the service account. - string name = 1; - - // The output format of the public key requested. - // X509_PEM is the default output format. - ServiceAccountPublicKeyType public_key_type = 2; -} - -// Represents a service account key. -// -// A service account has two sets of key-pairs: user-managed, and -// system-managed. -// -// User-managed key-pairs can be created and deleted by users. Users are -// responsible for rotating these keys periodically to ensure security of -// their service accounts. Users retain the private key of these key-pairs, -// and Google retains ONLY the public key. -// -// System-managed key-pairs are managed automatically by Google, and rotated -// daily without user intervention. The private key never leaves Google's -// servers to maximize security. -// -// Public keys for all service accounts are also published at the OAuth2 -// Service Account API. -message ServiceAccountKey { - // The resource name of the service account key in the following format - // `projects/{project}/serviceAccounts/{account}/keys/{key}`. - string name = 1; - - // The output format for the private key. - // Only provided in `CreateServiceAccountKey` responses, not - // in `GetServiceAccountKey` or `ListServiceAccountKey` responses. - // - // Google never exposes system-managed private keys, and never retains - // user-managed private keys. - ServiceAccountPrivateKeyType private_key_type = 2; - - // Specifies the algorithm (and possibly key size) for the key. - ServiceAccountKeyAlgorithm key_algorithm = 8; - - // The private key data. Only provided in `CreateServiceAccountKey` - // responses. - bytes private_key_data = 3; - - // The public key data. Only provided in `GetServiceAccountKey` responses. - bytes public_key_data = 7; - - // The key can be used after this timestamp. - google.protobuf.Timestamp valid_after_time = 4; - - // The key can be used before this timestamp. - google.protobuf.Timestamp valid_before_time = 5; -} - -// The service account key create request. -message CreateServiceAccountKeyRequest { - // The resource name of the service account in the following format: - // `projects/{project}/serviceAccounts/{account}`. - // Using `-` as a wildcard for the project will infer the project from - // the account. The `account` value can be the `email` address or the - // `unique_id` of the service account. - string name = 1; - - // The output format of the private key. `GOOGLE_CREDENTIALS_FILE` is the - // default output format. - ServiceAccountPrivateKeyType private_key_type = 2; - - // Which type of key and algorithm to use for the key. - // The default is currently a 4K RSA key. However this may change in the - // future. - ServiceAccountKeyAlgorithm key_algorithm = 3; -} - -// The service account key delete request. -message DeleteServiceAccountKeyRequest { - // The resource name of the service account key in the following format: - // `projects/{project}/serviceAccounts/{account}/keys/{key}`. - // Using `-` as a wildcard for the project will infer the project from - // the account. The `account` value can be the `email` address or the - // `unique_id` of the service account. - string name = 1; -} - -// The service account sign blob request. -message SignBlobRequest { - // The resource name of the service account in the following format: - // `projects/{project}/serviceAccounts/{account}`. - // Using `-` as a wildcard for the project will infer the project from - // the account. The `account` value can be the `email` address or the - // `unique_id` of the service account. - string name = 1; - - // The bytes to sign. - bytes bytes_to_sign = 2; -} - -// The service account sign blob response. -message SignBlobResponse { - // The id of the key used to sign the blob. - string key_id = 1; - - // The signed blob. - bytes signature = 2; -} - -// A role in the Identity and Access Management API. -message Role { - // The name of the role. - // - // When Role is used in CreateRole, the role name must not be set. - // - // When Role is used in output and other input such as UpdateRole, the role - // name is the complete path, e.g., roles/logging.viewer for curated roles - // and organizations/{organization-id}/roles/logging.viewer for custom roles. - string name = 1; - - // Optional. A human-readable title for the role. Typically this - // is limited to 100 UTF-8 bytes. - string title = 2; - - // Optional. A human-readable description for the role. - string description = 3; -} - -// The grantable role query request. -message QueryGrantableRolesRequest { - // Required. The full resource name to query from the list of grantable roles. - // - // The name follows the Google Cloud Platform resource format. - // For example, a Cloud Platform project with id `my-project` will be named - // `//cloudresourcemanager.googleapis.com/projects/my-project`. - string full_resource_name = 1; -} - -// The grantable role query response. -message QueryGrantableRolesResponse { - // The list of matching roles. - repeated Role roles = 1; -} - -// Supported key algorithms. -enum ServiceAccountKeyAlgorithm { - // An unspecified key algorithm. - KEY_ALG_UNSPECIFIED = 0; - - // 1k RSA Key. - KEY_ALG_RSA_1024 = 1; - - // 2k RSA Key. - KEY_ALG_RSA_2048 = 2; -} - -// Supported private key output formats. -enum ServiceAccountPrivateKeyType { - // Unspecified. Equivalent to `TYPE_GOOGLE_CREDENTIALS_FILE`. - TYPE_UNSPECIFIED = 0; - - // PKCS12 format. - // The password for the PKCS12 file is `notasecret`. - // For more information, see https://tools.ietf.org/html/rfc7292. - TYPE_PKCS12_FILE = 1; - - // Google Credentials File format. - TYPE_GOOGLE_CREDENTIALS_FILE = 2; -} - -// Supported public key output formats. -enum ServiceAccountPublicKeyType { - // Unspecified. Returns nothing here. - TYPE_NONE = 0; - - // X509 PEM format. - TYPE_X509_PEM_FILE = 1; - - // Raw public key. - TYPE_RAW_PUBLIC_KEY = 2; -} diff --git a/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto b/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto index 8825cdc7f35..7072854e4c0 100644 --- a/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto +++ b/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto @@ -21,6 +21,8 @@ import "google/iam/v1/options.proto"; import "google/iam/v1/policy.proto"; import "google/api/annotations.proto"; import "google/api/client.proto"; +import "google/api/field_behavior.proto"; +import "google/api/resource.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.Iam.V1"; @@ -96,37 +98,43 @@ service IAMPolicy { message SetIamPolicyRequest { // REQUIRED: The resource for which the policy is being specified. // See the operation documentation for the appropriate value for this field. - string resource = 1; + string resource = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference).type = "*"]; // REQUIRED: The complete policy to be applied to the `resource`. The size of // the policy is limited to a few 10s of KB. An empty policy is a // valid policy but certain Cloud Platform services (such as Projects) // might reject them. - Policy policy = 2; + Policy policy = 2 [(google.api.field_behavior) = REQUIRED]; } // Request message for `GetIamPolicy` method. message GetIamPolicyRequest { // REQUIRED: The resource for which the policy is being requested. // See the operation documentation for the appropriate value for this field. - string resource = 1; + string resource = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference).type = "*"]; // OPTIONAL: A `GetPolicyOptions` object for specifying options to // `GetIamPolicy`. This field is only used by Cloud IAM. - google.iam.v1.GetPolicyOptions options = 2; + GetPolicyOptions options = 2; } // Request message for `TestIamPermissions` method. message TestIamPermissionsRequest { // REQUIRED: The resource for which the policy detail is being requested. // See the operation documentation for the appropriate value for this field. - string resource = 1; + string resource = 1[ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference).type = "*"]; // The set of permissions to check for the `resource`. Permissions with // wildcards (such as '*' or 'storage.*') are not allowed. For more // information see // [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). - repeated string permissions = 2; + repeated string permissions = 2 [(google.api.field_behavior) = REQUIRED]; } // Response message for `TestIamPermissions` method. diff --git a/handwritten/pubsub/protos/google/iam/v1/logging/audit_data.proto b/handwritten/pubsub/protos/google/iam/v1/logging/audit_data.proto new file mode 100644 index 00000000000..dfe441ba663 --- /dev/null +++ b/handwritten/pubsub/protos/google/iam/v1/logging/audit_data.proto @@ -0,0 +1,34 @@ +// Copyright 2017 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.iam.v1.logging; + +import "google/api/annotations.proto"; +import "google/iam/v1/policy.proto"; + +option csharp_namespace = "Google.Cloud.Iam.V1.Logging"; +option go_package = "google.golang.org/genproto/googleapis/iam/v1/logging;logging"; +option java_multiple_files = true; +option java_outer_classname = "AuditDataProto"; +option java_package = "com.google.iam.v1.logging"; + +// Audit log information specific to Cloud IAM. This message is serialized +// as an `Any` type in the `ServiceData` message of an +// `AuditLog` message. +message AuditData { + // Policy delta between the original policy and the newly set policy. + google.iam.v1.PolicyDelta policy_delta = 2; +} diff --git a/handwritten/pubsub/protos/google/iam/v1/options.proto b/handwritten/pubsub/protos/google/iam/v1/options.proto index 24e886366b8..a4e17e588db 100644 --- a/handwritten/pubsub/protos/google/iam/v1/options.proto +++ b/handwritten/pubsub/protos/google/iam/v1/options.proto @@ -30,8 +30,12 @@ option php_namespace = "Google\\Cloud\\Iam\\V1"; // Encapsulates settings provided to GetIamPolicy. message GetPolicyOptions { // Optional. The policy format version to be returned. - // Acceptable values are 0 and 1. - // If the value is 0, or the field is omitted, policy format version 1 will be - // returned. + // + // Valid values are 0, 1, and 3. Requests specifying an invalid value will be + // rejected. + // + // Requests for policies with any conditional bindings must specify version 3. + // Policies without any conditional bindings may specify any valid value or + // leave the field unset. int32 requested_policy_version = 1; } diff --git a/handwritten/pubsub/protos/google/iam/v1/policy.proto b/handwritten/pubsub/protos/google/iam/v1/policy.proto index 4aef8aec4b9..e3aba47e8ea 100644 --- a/handwritten/pubsub/protos/google/iam/v1/policy.proto +++ b/handwritten/pubsub/protos/google/iam/v1/policy.proto @@ -32,27 +32,36 @@ option php_namespace = "Google\\Cloud\\Iam\\V1"; // specify access control policies for Cloud Platform resources. // // -// A `Policy` consists of a list of `bindings`. A `binding` binds a list of -// `members` to a `role`, where the members can be user accounts, Google groups, -// Google domains, and service accounts. A `role` is a named list of permissions -// defined by IAM. +// A `Policy` is a collection of `bindings`. A `binding` binds one or more +// `members` to a single `role`. Members can be user accounts, service accounts, +// Google groups, and domains (such as G Suite). A `role` is a named list of +// permissions (defined by IAM or configured by users). A `binding` can +// optionally specify a `condition`, which is a logic expression that further +// constrains the role binding based on attributes about the request and/or +// target resource. // // **JSON Example** // // { // "bindings": [ // { -// "role": "roles/owner", +// "role": "roles/resourcemanager.organizationAdmin", // "members": [ // "user:mike@example.com", // "group:admins@example.com", // "domain:google.com", -// "serviceAccount:my-other-app@appspot.gserviceaccount.com" +// "serviceAccount:my-project-id@appspot.gserviceaccount.com" // ] // }, // { -// "role": "roles/viewer", -// "members": ["user:sean@example.com"] +// "role": "roles/resourcemanager.organizationViewer", +// "members": ["user:eve@example.com"], +// "condition": { +// "title": "expirable access", +// "description": "Does not grant access after Sep 2020", +// "expression": "request.time < +// timestamp('2020-10-01T00:00:00.000Z')", +// } // } // ] // } @@ -64,20 +73,37 @@ option php_namespace = "Google\\Cloud\\Iam\\V1"; // - user:mike@example.com // - group:admins@example.com // - domain:google.com -// - serviceAccount:my-other-app@appspot.gserviceaccount.com -// role: roles/owner +// - serviceAccount:my-project-id@appspot.gserviceaccount.com +// role: roles/resourcemanager.organizationAdmin // - members: -// - user:sean@example.com -// role: roles/viewer -// +// - user:eve@example.com +// role: roles/resourcemanager.organizationViewer +// condition: +// title: expirable access +// description: Does not grant access after Sep 2020 +// expression: request.time < timestamp('2020-10-01T00:00:00.000Z') // // For a description of IAM and its features, see the // [IAM developer's guide](https://cloud.google.com/iam/docs). message Policy { - // Deprecated. + // Specifies the format of the policy. + // + // Valid values are 0, 1, and 3. Requests specifying an invalid value will be + // rejected. + // + // Operations affecting conditional bindings must specify version 3. This can + // be either setting a conditional policy, modifying a conditional binding, + // or removing a binding (conditional or unconditional) from the stored + // conditional policy. + // Operations on non-conditional policies may specify any valid value or + // leave the field unset. + // + // If no etag is provided in the call to `setIamPolicy`, version compliance + // checks against the stored policy is skipped. int32 version = 1; - // Associates a list of `members` to a `role`. + // Associates a list of `members` to a `role`. Optionally may specify a + // `condition` that determines when binding is in effect. // `bindings` with no members will result in an error. repeated Binding bindings = 4; @@ -90,7 +116,9 @@ message Policy { // ensure that their change will be applied to the same version of the policy. // // If no `etag` is provided in the call to `setIamPolicy`, then the existing - // policy is overwritten. + // policy is overwritten. Due to blind-set semantics of an etag-less policy, + // 'setIamPolicy' will not fail even if the incoming policy version does not + // meet the requirements for modifying the stored policy. bytes etag = 3; } @@ -171,8 +199,7 @@ message BindingDelta { // Required string member = 3; - // The condition that is associated with this binding. This field is logged - // only for Cloud Audit Logging. + // The condition that is associated with this binding. google.type.Expr condition = 4; } diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 55cfa531ff3..abcbcacc517 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -672,6 +672,15 @@ message Subscription { // value for `expiration_policy.ttl` is 1 day. ExpirationPolicy expiration_policy = 11; + // An expression written in the Cloud Pub/Sub filter language. If non-empty, + // then only `PubsubMessage`s whose `attributes` field matches the filter are + // delivered on this subscription. If empty, then no messages are filtered + // out. + // EXPERIMENTAL: This feature is part of a closed alpha release. This + // API might be changed in backward-incompatible ways and is not recommended + // for production use. It is not subject to any SLA or deprecation policy. + string filter = 12; + // A policy that specifies the conditions for dead lettering messages in // this subscription. If dead_letter_policy is not set, dead lettering // is disabled. @@ -684,6 +693,39 @@ message Subscription { // API might be changed in backward-incompatible ways and is not recommended // for production use. It is not subject to any SLA or deprecation policy. DeadLetterPolicy dead_letter_policy = 13; + + // A policy that specifies how Cloud Pub/Sub retries message delivery for this + // subscription. + // + // If not set, the default retry policy is applied. This generally implies + // that messages will be retried as soon as possible for healthy subscribers. + // RetryPolicy will be triggered on NACKs or acknowledgement deadline + // exceeded events for a given message. + // EXPERIMENTAL: This API might be changed in backward-incompatible + // ways and is not recommended for production use. It is not subject to any + // SLA or deprecation policy. + RetryPolicy retry_policy = 14; +} + +// A policy that specifies how Cloud Pub/Sub retries message delivery. +// +// Retry delay will be exponential based on provided minimum and maximum +// backoffs. https://en.wikipedia.org/wiki/Exponential_backoff. +// +// RetryPolicy will be triggered on NACKs or acknowledgement deadline exceeded +// events for a given message. +// +// Retry Policy is implemented on a best effort basis. At times, the delay +// between consecutive deliveries may not match the configuration. That is, +// delay can be more or less than configured backoff. +message RetryPolicy { + // The minimum delay between consecutive deliveries of a given message. + // Value should be between 0 and 600 seconds. Defaults to 10 seconds. + google.protobuf.Duration minimum_backoff = 1; + + // The maximum delay between consecutive deliveries of a given message. + // Value should be between 0 and 600 seconds. Defaults to 600 seconds. + google.protobuf.Duration maximum_backoff = 2; } // Dead lettering is done on a best effort basis. The same message might be @@ -754,7 +796,7 @@ message PushConfig { } // A URL locating the endpoint to which messages should be pushed. - // For example, a Webhook endpoint might use "https://example.com/push". + // For example, a Webhook endpoint might use `https://example.com/push`. string push_endpoint = 1; // Endpoint configuration attributes that can be used to control different diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 374eae8115a..64b6259036d 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -17,9890 +17,9998 @@ import * as $protobuf from "protobufjs"; /** Namespace google. */ export namespace google { - /** Namespace pubsub. */ - namespace pubsub { + /** Namespace iam. */ + namespace iam { /** Namespace v1. */ namespace v1 { - /** Represents a Publisher */ - class Publisher extends $protobuf.rpc.Service { + /** Properties of a Policy. */ + interface IPolicy { - /** - * Constructs a new Publisher service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + /** Policy version */ + version?: (number|null); - /** - * Creates new Publisher service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Publisher; + /** Policy bindings */ + bindings?: (google.iam.v1.IBinding[]|null); - /** - * Calls CreateTopic. - * @param request Topic message or plain object - * @param callback Node-style callback called with the error, if any, and Topic - */ - public createTopic(request: google.pubsub.v1.ITopic, callback: google.pubsub.v1.Publisher.CreateTopicCallback): void; + /** Policy etag */ + etag?: (Uint8Array|string|null); + } - /** - * Calls CreateTopic. - * @param request Topic message or plain object - * @returns Promise - */ - public createTopic(request: google.pubsub.v1.ITopic): Promise; + /** Represents a Policy. */ + class Policy implements IPolicy { /** - * Calls UpdateTopic. - * @param request UpdateTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Topic + * Constructs a new Policy. + * @param [properties] Properties to set */ - public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest, callback: google.pubsub.v1.Publisher.UpdateTopicCallback): void; + constructor(properties?: google.iam.v1.IPolicy); - /** - * Calls UpdateTopic. - * @param request UpdateTopicRequest message or plain object - * @returns Promise - */ - public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest): Promise; + /** Policy version. */ + public version: number; - /** - * Calls Publish. - * @param request PublishRequest message or plain object - * @param callback Node-style callback called with the error, if any, and PublishResponse - */ - public publish(request: google.pubsub.v1.IPublishRequest, callback: google.pubsub.v1.Publisher.PublishCallback): void; + /** Policy bindings. */ + public bindings: google.iam.v1.IBinding[]; - /** - * Calls Publish. - * @param request PublishRequest message or plain object - * @returns Promise - */ - public publish(request: google.pubsub.v1.IPublishRequest): Promise; + /** Policy etag. */ + public etag: (Uint8Array|string); /** - * Calls GetTopic. - * @param request GetTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Topic + * Creates a new Policy instance using the specified properties. + * @param [properties] Properties to set + * @returns Policy instance */ - public getTopic(request: google.pubsub.v1.IGetTopicRequest, callback: google.pubsub.v1.Publisher.GetTopicCallback): void; + public static create(properties?: google.iam.v1.IPolicy): google.iam.v1.Policy; /** - * Calls GetTopic. - * @param request GetTopicRequest message or plain object - * @returns Promise + * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @param message Policy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - public getTopic(request: google.pubsub.v1.IGetTopicRequest): Promise; + public static encode(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Calls ListTopics. - * @param request ListTopicsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicsResponse + * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @param message Policy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - public listTopics(request: google.pubsub.v1.IListTopicsRequest, callback: google.pubsub.v1.Publisher.ListTopicsCallback): void; + public static encodeDelimited(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Calls ListTopics. - * @param request ListTopicsRequest message or plain object - * @returns Promise + * Decodes a Policy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public listTopics(request: google.pubsub.v1.IListTopicsRequest): Promise; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Policy; /** - * Calls ListTopicSubscriptions. - * @param request ListTopicSubscriptionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse + * Decodes a Policy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest, callback: google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback): void; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Policy; /** - * Calls ListTopicSubscriptions. - * @param request ListTopicSubscriptionsRequest message or plain object - * @returns Promise + * Verifies a Policy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not */ - public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest): Promise; + public static verify(message: { [k: string]: any }): (string|null); /** - * Calls ListTopicSnapshots. - * @param request ListTopicSnapshotsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse + * Creates a Policy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Policy */ - public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest, callback: google.pubsub.v1.Publisher.ListTopicSnapshotsCallback): void; + public static fromObject(object: { [k: string]: any }): google.iam.v1.Policy; /** - * Calls ListTopicSnapshots. - * @param request ListTopicSnapshotsRequest message or plain object - * @returns Promise + * Creates a plain object from a Policy message. Also converts values to other types if specified. + * @param message Policy + * @param [options] Conversion options + * @returns Plain object */ - public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest): Promise; + public static toObject(message: google.iam.v1.Policy, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Calls DeleteTopic. - * @param request DeleteTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty + * Converts this Policy to JSON. + * @returns JSON object */ - public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest, callback: google.pubsub.v1.Publisher.DeleteTopicCallback): void; + public toJSON(): { [k: string]: any }; + } - /** - * Calls DeleteTopic. - * @param request DeleteTopicRequest message or plain object - * @returns Promise - */ - public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest): Promise; + /** Properties of a Binding. */ + interface IBinding { + + /** Binding role */ + role?: (string|null); + + /** Binding members */ + members?: (string[]|null); + + /** Binding condition */ + condition?: (google.type.IExpr|null); } - namespace Publisher { + /** Represents a Binding. */ + class Binding implements IBinding { /** - * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. - * @param error Error, if any - * @param [response] Topic + * Constructs a new Binding. + * @param [properties] Properties to set */ - type CreateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + constructor(properties?: google.iam.v1.IBinding); + + /** Binding role. */ + public role: string; + + /** Binding members. */ + public members: string[]; + + /** Binding condition. */ + public condition?: (google.type.IExpr|null); /** - * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. - * @param error Error, if any - * @param [response] Topic + * Creates a new Binding instance using the specified properties. + * @param [properties] Properties to set + * @returns Binding instance */ - type UpdateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + public static create(properties?: google.iam.v1.IBinding): google.iam.v1.Binding; /** - * Callback as used by {@link google.pubsub.v1.Publisher#publish}. - * @param error Error, if any - * @param [response] PublishResponse + * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @param message Binding message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - type PublishCallback = (error: (Error|null), response?: google.pubsub.v1.PublishResponse) => void; + public static encode(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. - * @param error Error, if any - * @param [response] Topic + * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @param message Binding message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - type GetTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + public static encodeDelimited(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. - * @param error Error, if any - * @param [response] ListTopicsResponse + * Decodes a Binding message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Binding + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - type ListTopicsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicsResponse) => void; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Binding; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. - * @param error Error, if any - * @param [response] ListTopicSubscriptionsResponse + * Decodes a Binding message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Binding + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - type ListTopicSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSubscriptionsResponse) => void; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Binding; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. - * @param error Error, if any - * @param [response] ListTopicSnapshotsResponse + * Verifies a Binding message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not */ - type ListTopicSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSnapshotsResponse) => void; + public static verify(message: { [k: string]: any }): (string|null); /** - * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. - * @param error Error, if any - * @param [response] Empty + * Creates a Binding message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Binding */ - type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - } + public static fromObject(object: { [k: string]: any }): google.iam.v1.Binding; - /** Properties of a MessageStoragePolicy. */ - interface IMessageStoragePolicy { + /** + * Creates a plain object from a Binding message. Also converts values to other types if specified. + * @param message Binding + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.iam.v1.Binding, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** MessageStoragePolicy allowedPersistenceRegions */ - allowedPersistenceRegions?: (string[]|null); + /** + * Converts this Binding to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; } - /** Represents a MessageStoragePolicy. */ - class MessageStoragePolicy implements IMessageStoragePolicy { + /** Properties of a PolicyDelta. */ + interface IPolicyDelta { + + /** PolicyDelta bindingDeltas */ + bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); + + /** PolicyDelta auditConfigDeltas */ + auditConfigDeltas?: (google.iam.v1.IAuditConfigDelta[]|null); + } + + /** Represents a PolicyDelta. */ + class PolicyDelta implements IPolicyDelta { /** - * Constructs a new MessageStoragePolicy. + * Constructs a new PolicyDelta. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); + constructor(properties?: google.iam.v1.IPolicyDelta); - /** MessageStoragePolicy allowedPersistenceRegions. */ - public allowedPersistenceRegions: string[]; + /** PolicyDelta bindingDeltas. */ + public bindingDeltas: google.iam.v1.IBindingDelta[]; + + /** PolicyDelta auditConfigDeltas. */ + public auditConfigDeltas: google.iam.v1.IAuditConfigDelta[]; /** - * Creates a new MessageStoragePolicy instance using the specified properties. + * Creates a new PolicyDelta instance using the specified properties. * @param [properties] Properties to set - * @returns MessageStoragePolicy instance + * @returns PolicyDelta instance */ - public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; + public static create(properties?: google.iam.v1.IPolicyDelta): google.iam.v1.PolicyDelta; /** - * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @param message MessageStoragePolicy message or plain object to encode + * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @param message PolicyDelta message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @param message MessageStoragePolicy message or plain object to encode + * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * @param message PolicyDelta message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * Decodes a PolicyDelta message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns MessageStoragePolicy + * @returns PolicyDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.PolicyDelta; /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns MessageStoragePolicy + * @returns PolicyDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.PolicyDelta; /** - * Verifies a MessageStoragePolicy message. + * Verifies a PolicyDelta message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns MessageStoragePolicy + * @returns PolicyDelta */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; + public static fromObject(object: { [k: string]: any }): google.iam.v1.PolicyDelta; /** - * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. - * @param message MessageStoragePolicy + * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. + * @param message PolicyDelta * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.PolicyDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this MessageStoragePolicy to JSON. + * Converts this PolicyDelta to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a Topic. */ - interface ITopic { + /** Properties of a BindingDelta. */ + interface IBindingDelta { - /** Topic name */ - name?: (string|null); + /** BindingDelta action */ + action?: (google.iam.v1.BindingDelta.Action|keyof typeof google.iam.v1.BindingDelta.Action|null); - /** Topic labels */ - labels?: ({ [k: string]: string }|null); + /** BindingDelta role */ + role?: (string|null); - /** Topic messageStoragePolicy */ - messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + /** BindingDelta member */ + member?: (string|null); - /** Topic kmsKeyName */ - kmsKeyName?: (string|null); + /** BindingDelta condition */ + condition?: (google.type.IExpr|null); } - /** Represents a Topic. */ - class Topic implements ITopic { + /** Represents a BindingDelta. */ + class BindingDelta implements IBindingDelta { /** - * Constructs a new Topic. + * Constructs a new BindingDelta. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.ITopic); + constructor(properties?: google.iam.v1.IBindingDelta); - /** Topic name. */ - public name: string; + /** BindingDelta action. */ + public action: (google.iam.v1.BindingDelta.Action|keyof typeof google.iam.v1.BindingDelta.Action); - /** Topic labels. */ - public labels: { [k: string]: string }; + /** BindingDelta role. */ + public role: string; - /** Topic messageStoragePolicy. */ - public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + /** BindingDelta member. */ + public member: string; - /** Topic kmsKeyName. */ - public kmsKeyName: string; + /** BindingDelta condition. */ + public condition?: (google.type.IExpr|null); /** - * Creates a new Topic instance using the specified properties. + * Creates a new BindingDelta instance using the specified properties. * @param [properties] Properties to set - * @returns Topic instance + * @returns BindingDelta instance */ - public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; + public static create(properties?: google.iam.v1.IBindingDelta): google.iam.v1.BindingDelta; /** - * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. - * @param message Topic message or plain object to encode + * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @param message BindingDelta message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. - * @param message Topic message or plain object to encode + * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * @param message BindingDelta message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Topic message from the specified reader or buffer. + * Decodes a BindingDelta message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Topic + * @returns BindingDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.BindingDelta; /** - * Decodes a Topic message from the specified reader or buffer, length delimited. + * Decodes a BindingDelta message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Topic + * @returns BindingDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.BindingDelta; /** - * Verifies a Topic message. + * Verifies a BindingDelta message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Topic + * @returns BindingDelta */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; + public static fromObject(object: { [k: string]: any }): google.iam.v1.BindingDelta; /** - * Creates a plain object from a Topic message. Also converts values to other types if specified. - * @param message Topic + * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. + * @param message BindingDelta * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.BindingDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Topic to JSON. + * Converts this BindingDelta to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a PubsubMessage. */ - interface IPubsubMessage { + namespace BindingDelta { - /** PubsubMessage data */ - data?: (Uint8Array|string|null); + /** Action enum. */ + enum Action { + ACTION_UNSPECIFIED = 0, + ADD = 1, + REMOVE = 2 + } + } - /** PubsubMessage attributes */ - attributes?: ({ [k: string]: string }|null); + /** Properties of an AuditConfigDelta. */ + interface IAuditConfigDelta { - /** PubsubMessage messageId */ - messageId?: (string|null); + /** AuditConfigDelta action */ + action?: (google.iam.v1.AuditConfigDelta.Action|keyof typeof google.iam.v1.AuditConfigDelta.Action|null); - /** PubsubMessage publishTime */ - publishTime?: (google.protobuf.ITimestamp|null); + /** AuditConfigDelta service */ + service?: (string|null); - /** PubsubMessage orderingKey */ - orderingKey?: (string|null); + /** AuditConfigDelta exemptedMember */ + exemptedMember?: (string|null); + + /** AuditConfigDelta logType */ + logType?: (string|null); } - /** Represents a PubsubMessage. */ - class PubsubMessage implements IPubsubMessage { + /** Represents an AuditConfigDelta. */ + class AuditConfigDelta implements IAuditConfigDelta { /** - * Constructs a new PubsubMessage. + * Constructs a new AuditConfigDelta. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IPubsubMessage); - - /** PubsubMessage data. */ - public data: (Uint8Array|string); + constructor(properties?: google.iam.v1.IAuditConfigDelta); - /** PubsubMessage attributes. */ - public attributes: { [k: string]: string }; + /** AuditConfigDelta action. */ + public action: (google.iam.v1.AuditConfigDelta.Action|keyof typeof google.iam.v1.AuditConfigDelta.Action); - /** PubsubMessage messageId. */ - public messageId: string; + /** AuditConfigDelta service. */ + public service: string; - /** PubsubMessage publishTime. */ - public publishTime?: (google.protobuf.ITimestamp|null); + /** AuditConfigDelta exemptedMember. */ + public exemptedMember: string; - /** PubsubMessage orderingKey. */ - public orderingKey: string; + /** AuditConfigDelta logType. */ + public logType: string; /** - * Creates a new PubsubMessage instance using the specified properties. + * Creates a new AuditConfigDelta instance using the specified properties. * @param [properties] Properties to set - * @returns PubsubMessage instance + * @returns AuditConfigDelta instance */ - public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; + public static create(properties?: google.iam.v1.IAuditConfigDelta): google.iam.v1.AuditConfigDelta; /** - * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. - * @param message PubsubMessage message or plain object to encode + * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @param message AuditConfigDelta message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. - * @param message PubsubMessage message or plain object to encode + * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * @param message AuditConfigDelta message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PubsubMessage message from the specified reader or buffer. + * Decodes an AuditConfigDelta message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PubsubMessage + * @returns AuditConfigDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.AuditConfigDelta; /** - * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PubsubMessage + * @returns AuditConfigDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.AuditConfigDelta; /** - * Verifies a PubsubMessage message. + * Verifies an AuditConfigDelta message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PubsubMessage + * @returns AuditConfigDelta */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; + public static fromObject(object: { [k: string]: any }): google.iam.v1.AuditConfigDelta; /** - * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. - * @param message PubsubMessage + * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. + * @param message AuditConfigDelta * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.AuditConfigDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PubsubMessage to JSON. + * Converts this AuditConfigDelta to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a GetTopicRequest. */ - interface IGetTopicRequest { + namespace AuditConfigDelta { - /** GetTopicRequest topic */ - topic?: (string|null); + /** Action enum. */ + enum Action { + ACTION_UNSPECIFIED = 0, + ADD = 1, + REMOVE = 2 + } } - /** Represents a GetTopicRequest. */ - class GetTopicRequest implements IGetTopicRequest { + /** Properties of a GetPolicyOptions. */ + interface IGetPolicyOptions { + + /** GetPolicyOptions requestedPolicyVersion */ + requestedPolicyVersion?: (number|null); + } + + /** Represents a GetPolicyOptions. */ + class GetPolicyOptions implements IGetPolicyOptions { /** - * Constructs a new GetTopicRequest. + * Constructs a new GetPolicyOptions. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IGetTopicRequest); + constructor(properties?: google.iam.v1.IGetPolicyOptions); - /** GetTopicRequest topic. */ - public topic: string; + /** GetPolicyOptions requestedPolicyVersion. */ + public requestedPolicyVersion: number; /** - * Creates a new GetTopicRequest instance using the specified properties. + * Creates a new GetPolicyOptions instance using the specified properties. * @param [properties] Properties to set - * @returns GetTopicRequest instance + * @returns GetPolicyOptions instance */ - public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; + public static create(properties?: google.iam.v1.IGetPolicyOptions): google.iam.v1.GetPolicyOptions; /** - * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. - * @param message GetTopicRequest message or plain object to encode + * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @param message GetPolicyOptions message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. - * @param message GetTopicRequest message or plain object to encode + * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * @param message GetPolicyOptions message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a GetTopicRequest message from the specified reader or buffer. + * Decodes a GetPolicyOptions message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns GetTopicRequest + * @returns GetPolicyOptions * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetPolicyOptions; /** - * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns GetTopicRequest + * @returns GetPolicyOptions * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetPolicyOptions; /** - * Verifies a GetTopicRequest message. + * Verifies a GetPolicyOptions message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns GetTopicRequest + * @returns GetPolicyOptions */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; + public static fromObject(object: { [k: string]: any }): google.iam.v1.GetPolicyOptions; /** - * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. - * @param message GetTopicRequest + * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. + * @param message GetPolicyOptions * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.GetPolicyOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this GetTopicRequest to JSON. + * Converts this GetPolicyOptions to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of an UpdateTopicRequest. */ - interface IUpdateTopicRequest { - - /** UpdateTopicRequest topic */ - topic?: (google.pubsub.v1.ITopic|null); - - /** UpdateTopicRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); - } - - /** Represents an UpdateTopicRequest. */ - class UpdateTopicRequest implements IUpdateTopicRequest { + /** Represents a IAMPolicy */ + class IAMPolicy extends $protobuf.rpc.Service { /** - * Constructs a new UpdateTopicRequest. - * @param [properties] Properties to set + * Constructs a new IAMPolicy service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited */ - constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); - - /** UpdateTopicRequest topic. */ - public topic?: (google.pubsub.v1.ITopic|null); + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - /** UpdateTopicRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); + /** + * Creates new IAMPolicy service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): IAMPolicy; /** - * Creates a new UpdateTopicRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns UpdateTopicRequest instance + * Calls SetIamPolicy. + * @param request SetIamPolicyRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Policy */ - public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; + public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.SetIamPolicyCallback): void; /** - * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. - * @param message UpdateTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls SetIamPolicy. + * @param request SetIamPolicyRequest message or plain object + * @returns Promise */ - public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest): Promise; /** - * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. - * @param message UpdateTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls GetIamPolicy. + * @param request GetIamPolicyRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Policy */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.GetIamPolicyCallback): void; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UpdateTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls GetIamPolicy. + * @param request GetIamPolicyRequest message or plain object + * @returns Promise */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; + public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest): Promise; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UpdateTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls TestIamPermissions. + * @param request TestIamPermissionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and TestIamPermissionsResponse */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; + public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest, callback: google.iam.v1.IAMPolicy.TestIamPermissionsCallback): void; /** - * Verifies an UpdateTopicRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not + * Calls TestIamPermissions. + * @param request TestIamPermissionsRequest message or plain object + * @returns Promise */ - public static verify(message: { [k: string]: any }): (string|null); + public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest): Promise; + } + + namespace IAMPolicy { /** - * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UpdateTopicRequest + * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. + * @param error Error, if any + * @param [response] Policy */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; + type SetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; /** - * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. - * @param message UpdateTopicRequest - * @param [options] Conversion options - * @returns Plain object + * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. + * @param error Error, if any + * @param [response] Policy */ - public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + type GetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; /** - * Converts this UpdateTopicRequest to JSON. - * @returns JSON object + * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. + * @param error Error, if any + * @param [response] TestIamPermissionsResponse */ - public toJSON(): { [k: string]: any }; + type TestIamPermissionsCallback = (error: (Error|null), response?: google.iam.v1.TestIamPermissionsResponse) => void; } - /** Properties of a PublishRequest. */ - interface IPublishRequest { + /** Properties of a SetIamPolicyRequest. */ + interface ISetIamPolicyRequest { - /** PublishRequest topic */ - topic?: (string|null); + /** SetIamPolicyRequest resource */ + resource?: (string|null); - /** PublishRequest messages */ - messages?: (google.pubsub.v1.IPubsubMessage[]|null); + /** SetIamPolicyRequest policy */ + policy?: (google.iam.v1.IPolicy|null); } - /** Represents a PublishRequest. */ - class PublishRequest implements IPublishRequest { + /** Represents a SetIamPolicyRequest. */ + class SetIamPolicyRequest implements ISetIamPolicyRequest { /** - * Constructs a new PublishRequest. + * Constructs a new SetIamPolicyRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IPublishRequest); + constructor(properties?: google.iam.v1.ISetIamPolicyRequest); - /** PublishRequest topic. */ - public topic: string; + /** SetIamPolicyRequest resource. */ + public resource: string; - /** PublishRequest messages. */ - public messages: google.pubsub.v1.IPubsubMessage[]; + /** SetIamPolicyRequest policy. */ + public policy?: (google.iam.v1.IPolicy|null); /** - * Creates a new PublishRequest instance using the specified properties. + * Creates a new SetIamPolicyRequest instance using the specified properties. * @param [properties] Properties to set - * @returns PublishRequest instance + * @returns SetIamPolicyRequest instance */ - public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; + public static create(properties?: google.iam.v1.ISetIamPolicyRequest): google.iam.v1.SetIamPolicyRequest; /** - * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. - * @param message PublishRequest message or plain object to encode + * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @param message SetIamPolicyRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. - * @param message PublishRequest message or plain object to encode + * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * @param message SetIamPolicyRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PublishRequest message from the specified reader or buffer. + * Decodes a SetIamPolicyRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PublishRequest + * @returns SetIamPolicyRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.SetIamPolicyRequest; /** - * Decodes a PublishRequest message from the specified reader or buffer, length delimited. + * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PublishRequest + * @returns SetIamPolicyRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.SetIamPolicyRequest; /** - * Verifies a PublishRequest message. + * Verifies a SetIamPolicyRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. + * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PublishRequest + * @returns SetIamPolicyRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; + public static fromObject(object: { [k: string]: any }): google.iam.v1.SetIamPolicyRequest; /** - * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. - * @param message PublishRequest + * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. + * @param message SetIamPolicyRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.SetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PublishRequest to JSON. + * Converts this SetIamPolicyRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a PublishResponse. */ - interface IPublishResponse { + /** Properties of a GetIamPolicyRequest. */ + interface IGetIamPolicyRequest { - /** PublishResponse messageIds */ - messageIds?: (string[]|null); + /** GetIamPolicyRequest resource */ + resource?: (string|null); + + /** GetIamPolicyRequest options */ + options?: (google.iam.v1.IGetPolicyOptions|null); } - /** Represents a PublishResponse. */ - class PublishResponse implements IPublishResponse { + /** Represents a GetIamPolicyRequest. */ + class GetIamPolicyRequest implements IGetIamPolicyRequest { /** - * Constructs a new PublishResponse. + * Constructs a new GetIamPolicyRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IPublishResponse); + constructor(properties?: google.iam.v1.IGetIamPolicyRequest); - /** PublishResponse messageIds. */ - public messageIds: string[]; + /** GetIamPolicyRequest resource. */ + public resource: string; + + /** GetIamPolicyRequest options. */ + public options?: (google.iam.v1.IGetPolicyOptions|null); /** - * Creates a new PublishResponse instance using the specified properties. + * Creates a new GetIamPolicyRequest instance using the specified properties. * @param [properties] Properties to set - * @returns PublishResponse instance + * @returns GetIamPolicyRequest instance */ - public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; + public static create(properties?: google.iam.v1.IGetIamPolicyRequest): google.iam.v1.GetIamPolicyRequest; /** - * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. - * @param message PublishResponse message or plain object to encode + * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @param message GetIamPolicyRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. - * @param message PublishResponse message or plain object to encode + * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * @param message GetIamPolicyRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PublishResponse message from the specified reader or buffer. + * Decodes a GetIamPolicyRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PublishResponse + * @returns GetIamPolicyRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetIamPolicyRequest; /** - * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PublishResponse + * @returns GetIamPolicyRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetIamPolicyRequest; /** - * Verifies a PublishResponse message. + * Verifies a GetIamPolicyRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PublishResponse + * @returns GetIamPolicyRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; + public static fromObject(object: { [k: string]: any }): google.iam.v1.GetIamPolicyRequest; /** - * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. - * @param message PublishResponse + * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. + * @param message GetIamPolicyRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.GetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PublishResponse to JSON. + * Converts this GetIamPolicyRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ListTopicsRequest. */ - interface IListTopicsRequest { - - /** ListTopicsRequest project */ - project?: (string|null); + /** Properties of a TestIamPermissionsRequest. */ + interface ITestIamPermissionsRequest { - /** ListTopicsRequest pageSize */ - pageSize?: (number|null); + /** TestIamPermissionsRequest resource */ + resource?: (string|null); - /** ListTopicsRequest pageToken */ - pageToken?: (string|null); + /** TestIamPermissionsRequest permissions */ + permissions?: (string[]|null); } - /** Represents a ListTopicsRequest. */ - class ListTopicsRequest implements IListTopicsRequest { + /** Represents a TestIamPermissionsRequest. */ + class TestIamPermissionsRequest implements ITestIamPermissionsRequest { /** - * Constructs a new ListTopicsRequest. + * Constructs a new TestIamPermissionsRequest. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListTopicsRequest); - - /** ListTopicsRequest project. */ - public project: string; + constructor(properties?: google.iam.v1.ITestIamPermissionsRequest); - /** ListTopicsRequest pageSize. */ - public pageSize: number; + /** TestIamPermissionsRequest resource. */ + public resource: string; - /** ListTopicsRequest pageToken. */ - public pageToken: string; + /** TestIamPermissionsRequest permissions. */ + public permissions: string[]; /** - * Creates a new ListTopicsRequest instance using the specified properties. + * Creates a new TestIamPermissionsRequest instance using the specified properties. * @param [properties] Properties to set - * @returns ListTopicsRequest instance + * @returns TestIamPermissionsRequest instance */ - public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; + public static create(properties?: google.iam.v1.ITestIamPermissionsRequest): google.iam.v1.TestIamPermissionsRequest; /** - * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. - * @param message ListTopicsRequest message or plain object to encode + * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @param message TestIamPermissionsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. - * @param message ListTopicsRequest message or plain object to encode + * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * @param message TestIamPermissionsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListTopicsRequest message from the specified reader or buffer. + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListTopicsRequest + * @returns TestIamPermissionsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsRequest; /** - * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListTopicsRequest + * @returns TestIamPermissionsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsRequest; /** - * Verifies a ListTopicsRequest message. + * Verifies a TestIamPermissionsRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListTopicsRequest + * @returns TestIamPermissionsRequest */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; + public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsRequest; /** - * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. - * @param message ListTopicsRequest + * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. + * @param message TestIamPermissionsRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.TestIamPermissionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListTopicsRequest to JSON. + * Converts this TestIamPermissionsRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ListTopicsResponse. */ - interface IListTopicsResponse { - - /** ListTopicsResponse topics */ - topics?: (google.pubsub.v1.ITopic[]|null); + /** Properties of a TestIamPermissionsResponse. */ + interface ITestIamPermissionsResponse { - /** ListTopicsResponse nextPageToken */ - nextPageToken?: (string|null); + /** TestIamPermissionsResponse permissions */ + permissions?: (string[]|null); } - /** Represents a ListTopicsResponse. */ - class ListTopicsResponse implements IListTopicsResponse { + /** Represents a TestIamPermissionsResponse. */ + class TestIamPermissionsResponse implements ITestIamPermissionsResponse { /** - * Constructs a new ListTopicsResponse. + * Constructs a new TestIamPermissionsResponse. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListTopicsResponse); - - /** ListTopicsResponse topics. */ - public topics: google.pubsub.v1.ITopic[]; + constructor(properties?: google.iam.v1.ITestIamPermissionsResponse); - /** ListTopicsResponse nextPageToken. */ - public nextPageToken: string; + /** TestIamPermissionsResponse permissions. */ + public permissions: string[]; /** - * Creates a new ListTopicsResponse instance using the specified properties. + * Creates a new TestIamPermissionsResponse instance using the specified properties. * @param [properties] Properties to set - * @returns ListTopicsResponse instance + * @returns TestIamPermissionsResponse instance */ - public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; + public static create(properties?: google.iam.v1.ITestIamPermissionsResponse): google.iam.v1.TestIamPermissionsResponse; /** - * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. - * @param message ListTopicsResponse message or plain object to encode + * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @param message TestIamPermissionsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. - * @param message ListTopicsResponse message or plain object to encode + * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * @param message TestIamPermissionsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListTopicsResponse message from the specified reader or buffer. + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListTopicsResponse + * @returns TestIamPermissionsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsResponse; /** - * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListTopicsResponse + * @returns TestIamPermissionsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsResponse; /** - * Verifies a ListTopicsResponse message. + * Verifies a TestIamPermissionsResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListTopicsResponse + * @returns TestIamPermissionsResponse */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; + public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsResponse; /** - * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. - * @param message ListTopicsResponse + * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. + * @param message TestIamPermissionsResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.iam.v1.TestIamPermissionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListTopicsResponse to JSON. + * Converts this TestIamPermissionsResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } + } - /** Properties of a ListTopicSubscriptionsRequest. */ - interface IListTopicSubscriptionsRequest { - - /** ListTopicSubscriptionsRequest topic */ - topic?: (string|null); + /** Namespace type. */ + namespace type { - /** ListTopicSubscriptionsRequest pageSize */ - pageSize?: (number|null); + /** Properties of an Expr. */ + interface IExpr { - /** ListTopicSubscriptionsRequest pageToken */ - pageToken?: (string|null); - } + /** Expr expression */ + expression?: (string|null); - /** Represents a ListTopicSubscriptionsRequest. */ - class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { + /** Expr title */ + title?: (string|null); - /** - * Constructs a new ListTopicSubscriptionsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); + /** Expr description */ + description?: (string|null); - /** ListTopicSubscriptionsRequest topic. */ - public topic: string; + /** Expr location */ + location?: (string|null); + } - /** ListTopicSubscriptionsRequest pageSize. */ - public pageSize: number; + /** Represents an Expr. */ + class Expr implements IExpr { - /** ListTopicSubscriptionsRequest pageToken. */ - public pageToken: string; + /** + * Constructs a new Expr. + * @param [properties] Properties to set + */ + constructor(properties?: google.type.IExpr); - /** - * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSubscriptionsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; + /** Expr expression. */ + public expression: string; - /** - * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @param message ListTopicSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** Expr title. */ + public title: string; - /** - * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @param message ListTopicSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** Expr description. */ + public description: string; - /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; + /** Expr location. */ + public location: string; - /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; + /** + * Creates a new Expr instance using the specified properties. + * @param [properties] Properties to set + * @returns Expr instance + */ + public static create(properties?: google.type.IExpr): google.type.Expr; - /** - * Verifies a ListTopicSubscriptionsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @param message Expr message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSubscriptionsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; + /** + * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @param message Expr message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. - * @param message ListTopicSubscriptionsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes an Expr message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.type.Expr; - /** - * Converts this ListTopicSubscriptionsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes an Expr message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.type.Expr; - /** Properties of a ListTopicSubscriptionsResponse. */ - interface IListTopicSubscriptionsResponse { + /** + * Verifies an Expr message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** ListTopicSubscriptionsResponse subscriptions */ - subscriptions?: (string[]|null); + /** + * Creates an Expr message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Expr + */ + public static fromObject(object: { [k: string]: any }): google.type.Expr; - /** ListTopicSubscriptionsResponse nextPageToken */ - nextPageToken?: (string|null); - } + /** + * Creates a plain object from an Expr message. Also converts values to other types if specified. + * @param message Expr + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.type.Expr, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents a ListTopicSubscriptionsResponse. */ - class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { + /** + * Converts this Expr to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } - /** - * Constructs a new ListTopicSubscriptionsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); + /** Namespace api. */ + namespace api { - /** ListTopicSubscriptionsResponse subscriptions. */ - public subscriptions: string[]; + /** Properties of a Http. */ + interface IHttp { - /** ListTopicSubscriptionsResponse nextPageToken. */ - public nextPageToken: string; + /** Http rules */ + rules?: (google.api.IHttpRule[]|null); - /** - * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSubscriptionsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; + /** Http fullyDecodeReservedExpansion */ + fullyDecodeReservedExpansion?: (boolean|null); + } - /** - * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @param message ListTopicSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a Http. */ + class Http implements IHttp { - /** - * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @param message ListTopicSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new Http. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IHttp); - /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; + /** Http rules. */ + public rules: google.api.IHttpRule[]; - /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; + /** Http fullyDecodeReservedExpansion. */ + public fullyDecodeReservedExpansion: boolean; - /** - * Verifies a ListTopicSubscriptionsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a new Http instance using the specified properties. + * @param [properties] Properties to set + * @returns Http instance + */ + public static create(properties?: google.api.IHttp): google.api.Http; - /** - * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSubscriptionsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; + /** + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. - * @param message ListTopicSubscriptionsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this ListTopicSubscriptionsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes a Http message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; - /** Properties of a ListTopicSnapshotsRequest. */ - interface IListTopicSnapshotsRequest { + /** + * Decodes a Http message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; - /** ListTopicSnapshotsRequest topic */ - topic?: (string|null); + /** + * Verifies a Http message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** ListTopicSnapshotsRequest pageSize */ - pageSize?: (number|null); + /** + * Creates a Http message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Http + */ + public static fromObject(object: { [k: string]: any }): google.api.Http; - /** ListTopicSnapshotsRequest pageToken */ - pageToken?: (string|null); - } + /** + * Creates a plain object from a Http message. Also converts values to other types if specified. + * @param message Http + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents a ListTopicSnapshotsRequest. */ - class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { + /** + * Converts this Http to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new ListTopicSnapshotsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); + /** Properties of a HttpRule. */ + interface IHttpRule { - /** ListTopicSnapshotsRequest topic. */ - public topic: string; + /** HttpRule selector */ + selector?: (string|null); - /** ListTopicSnapshotsRequest pageSize. */ - public pageSize: number; + /** HttpRule get */ + get?: (string|null); - /** ListTopicSnapshotsRequest pageToken. */ - public pageToken: string; + /** HttpRule put */ + put?: (string|null); - /** - * Creates a new ListTopicSnapshotsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSnapshotsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; + /** HttpRule post */ + post?: (string|null); - /** - * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @param message ListTopicSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** HttpRule delete */ + "delete"?: (string|null); - /** - * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @param message ListTopicSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** HttpRule patch */ + patch?: (string|null); - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; + /** HttpRule custom */ + custom?: (google.api.ICustomHttpPattern|null); - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; + /** HttpRule body */ + body?: (string|null); - /** - * Verifies a ListTopicSnapshotsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** HttpRule responseBody */ + responseBody?: (string|null); - /** - * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSnapshotsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; + /** HttpRule additionalBindings */ + additionalBindings?: (google.api.IHttpRule[]|null); + } - /** - * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. - * @param message ListTopicSnapshotsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Represents a HttpRule. */ + class HttpRule implements IHttpRule { - /** - * Converts this ListTopicSnapshotsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Constructs a new HttpRule. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IHttpRule); - /** Properties of a ListTopicSnapshotsResponse. */ - interface IListTopicSnapshotsResponse { + /** HttpRule selector. */ + public selector: string; - /** ListTopicSnapshotsResponse snapshots */ - snapshots?: (string[]|null); + /** HttpRule get. */ + public get: string; - /** ListTopicSnapshotsResponse nextPageToken */ - nextPageToken?: (string|null); - } + /** HttpRule put. */ + public put: string; - /** Represents a ListTopicSnapshotsResponse. */ - class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { + /** HttpRule post. */ + public post: string; - /** - * Constructs a new ListTopicSnapshotsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); + /** HttpRule delete. */ + public delete: string; - /** ListTopicSnapshotsResponse snapshots. */ - public snapshots: string[]; + /** HttpRule patch. */ + public patch: string; - /** ListTopicSnapshotsResponse nextPageToken. */ - public nextPageToken: string; + /** HttpRule custom. */ + public custom?: (google.api.ICustomHttpPattern|null); - /** - * Creates a new ListTopicSnapshotsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSnapshotsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; + /** HttpRule body. */ + public body: string; - /** - * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @param message ListTopicSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** HttpRule responseBody. */ + public responseBody: string; - /** - * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @param message ListTopicSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** HttpRule additionalBindings. */ + public additionalBindings: google.api.IHttpRule[]; - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; + /** HttpRule pattern. */ + public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; + /** + * Creates a new HttpRule instance using the specified properties. + * @param [properties] Properties to set + * @returns HttpRule instance + */ + public static create(properties?: google.api.IHttpRule): google.api.HttpRule; - /** - * Verifies a ListTopicSnapshotsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSnapshotsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; + /** + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. - * @param message ListTopicSnapshotsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a HttpRule message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; - /** - * Converts this ListTopicSnapshotsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; - /** Properties of a DeleteTopicRequest. */ - interface IDeleteTopicRequest { + /** + * Verifies a HttpRule message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** DeleteTopicRequest topic */ - topic?: (string|null); - } + /** + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns HttpRule + */ + public static fromObject(object: { [k: string]: any }): google.api.HttpRule; - /** Represents a DeleteTopicRequest. */ - class DeleteTopicRequest implements IDeleteTopicRequest { + /** + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * @param message HttpRule + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Constructs a new DeleteTopicRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); + /** + * Converts this HttpRule to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** DeleteTopicRequest topic. */ - public topic: string; + /** Properties of a CustomHttpPattern. */ + interface ICustomHttpPattern { - /** - * Creates a new DeleteTopicRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteTopicRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; + /** CustomHttpPattern kind */ + kind?: (string|null); - /** - * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @param message DeleteTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** CustomHttpPattern path */ + path?: (string|null); + } - /** - * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @param message DeleteTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a CustomHttpPattern. */ + class CustomHttpPattern implements ICustomHttpPattern { - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; + /** + * Constructs a new CustomHttpPattern. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ICustomHttpPattern); - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; + /** CustomHttpPattern kind. */ + public kind: string; - /** - * Verifies a DeleteTopicRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** CustomHttpPattern path. */ + public path: string; - /** - * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteTopicRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; + /** + * Creates a new CustomHttpPattern instance using the specified properties. + * @param [properties] Properties to set + * @returns CustomHttpPattern instance + */ + public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; - /** - * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. - * @param message DeleteTopicRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this DeleteTopicRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; + /** + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; + + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; + + /** + * Verifies a CustomHttpPattern message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CustomHttpPattern + */ + public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; + + /** + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * @param message CustomHttpPattern + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CustomHttpPattern to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** FieldBehavior enum. */ + enum FieldBehavior { + FIELD_BEHAVIOR_UNSPECIFIED = 0, + OPTIONAL = 1, + REQUIRED = 2, + OUTPUT_ONLY = 3, + INPUT_ONLY = 4, + IMMUTABLE = 5 + } + + /** Properties of a ResourceDescriptor. */ + interface IResourceDescriptor { + + /** ResourceDescriptor type */ + type?: (string|null); + + /** ResourceDescriptor pattern */ + pattern?: (string[]|null); + + /** ResourceDescriptor nameField */ + nameField?: (string|null); + + /** ResourceDescriptor history */ + history?: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History|null); + + /** ResourceDescriptor plural */ + plural?: (string|null); + + /** ResourceDescriptor singular */ + singular?: (string|null); + } + + /** Represents a ResourceDescriptor. */ + class ResourceDescriptor implements IResourceDescriptor { + + /** + * Constructs a new ResourceDescriptor. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IResourceDescriptor); + + /** ResourceDescriptor type. */ + public type: string; + + /** ResourceDescriptor pattern. */ + public pattern: string[]; + + /** ResourceDescriptor nameField. */ + public nameField: string; + + /** ResourceDescriptor history. */ + public history: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History); + + /** ResourceDescriptor plural. */ + public plural: string; + + /** ResourceDescriptor singular. */ + public singular: string; + + /** + * Creates a new ResourceDescriptor instance using the specified properties. + * @param [properties] Properties to set + * @returns ResourceDescriptor instance + */ + public static create(properties?: google.api.IResourceDescriptor): google.api.ResourceDescriptor; + + /** + * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @param message ResourceDescriptor message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @param message ResourceDescriptor message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceDescriptor; + + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceDescriptor; + + /** + * Verifies a ResourceDescriptor message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ResourceDescriptor + */ + public static fromObject(object: { [k: string]: any }): google.api.ResourceDescriptor; + + /** + * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. + * @param message ResourceDescriptor + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ResourceDescriptor, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ResourceDescriptor to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace ResourceDescriptor { + + /** History enum. */ + enum History { + HISTORY_UNSPECIFIED = 0, + ORIGINALLY_SINGLE_PATTERN = 1, + FUTURE_MULTI_PATTERN = 2 } + } + + /** Properties of a ResourceReference. */ + interface IResourceReference { + + /** ResourceReference type */ + type?: (string|null); + + /** ResourceReference childType */ + childType?: (string|null); + } + + /** Represents a ResourceReference. */ + class ResourceReference implements IResourceReference { + + /** + * Constructs a new ResourceReference. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IResourceReference); + + /** ResourceReference type. */ + public type: string; + + /** ResourceReference childType. */ + public childType: string; + + /** + * Creates a new ResourceReference instance using the specified properties. + * @param [properties] Properties to set + * @returns ResourceReference instance + */ + public static create(properties?: google.api.IResourceReference): google.api.ResourceReference; + + /** + * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @param message ResourceReference message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @param message ResourceReference message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ResourceReference message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceReference; + + /** + * Decodes a ResourceReference message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceReference; + + /** + * Verifies a ResourceReference message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ResourceReference + */ + public static fromObject(object: { [k: string]: any }): google.api.ResourceReference; + + /** + * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. + * @param message ResourceReference + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ResourceReference, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ResourceReference to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Namespace protobuf. */ + namespace protobuf { - /** Represents a Subscriber */ - class Subscriber extends $protobuf.rpc.Service { + /** Properties of a FileDescriptorSet. */ + interface IFileDescriptorSet { - /** - * Constructs a new Subscriber service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + /** FileDescriptorSet file */ + file?: (google.protobuf.IFileDescriptorProto[]|null); + } - /** - * Creates new Subscriber service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; + /** Represents a FileDescriptorSet. */ + class FileDescriptorSet implements IFileDescriptorSet { - /** - * Calls CreateSubscription. - * @param request Subscription message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; + /** + * Constructs a new FileDescriptorSet. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorSet); - /** - * Calls CreateSubscription. - * @param request Subscription message or plain object - * @returns Promise - */ - public createSubscription(request: google.pubsub.v1.ISubscription): Promise; + /** FileDescriptorSet file. */ + public file: google.protobuf.IFileDescriptorProto[]; - /** - * Calls GetSubscription. - * @param request GetSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; + /** + * Creates a new FileDescriptorSet instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorSet instance + */ + public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; - /** - * Calls GetSubscription. - * @param request GetSubscriptionRequest message or plain object - * @returns Promise - */ - public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; + /** + * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Calls UpdateSubscription. - * @param request UpdateSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; + /** + * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Calls UpdateSubscription. - * @param request UpdateSubscriptionRequest message or plain object - * @returns Promise - */ - public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; - /** - * Calls ListSubscriptions. - * @param request ListSubscriptionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse - */ - public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; - /** - * Calls ListSubscriptions. - * @param request ListSubscriptionsRequest message or plain object - * @returns Promise - */ - public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; + /** + * Verifies a FileDescriptorSet message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Calls DeleteSubscription. - * @param request DeleteSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; + /** + * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorSet + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; - /** - * Calls DeleteSubscription. - * @param request DeleteSubscriptionRequest message or plain object - * @returns Promise - */ - public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; + /** + * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. + * @param message FileDescriptorSet + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Calls ModifyAckDeadline. - * @param request ModifyAckDeadlineRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; + /** + * Converts this FileDescriptorSet to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Calls ModifyAckDeadline. - * @param request ModifyAckDeadlineRequest message or plain object - * @returns Promise - */ - public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; + /** Properties of a FileDescriptorProto. */ + interface IFileDescriptorProto { - /** - * Calls Acknowledge. - * @param request AcknowledgeRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; + /** FileDescriptorProto name */ + name?: (string|null); - /** - * Calls Acknowledge. - * @param request AcknowledgeRequest message or plain object - * @returns Promise - */ - public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; + /** FileDescriptorProto package */ + "package"?: (string|null); - /** - * Calls Pull. - * @param request PullRequest message or plain object - * @param callback Node-style callback called with the error, if any, and PullResponse - */ - public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; + /** FileDescriptorProto dependency */ + dependency?: (string[]|null); - /** - * Calls Pull. - * @param request PullRequest message or plain object - * @returns Promise - */ - public pull(request: google.pubsub.v1.IPullRequest): Promise; + /** FileDescriptorProto publicDependency */ + publicDependency?: (number[]|null); - /** - * Calls StreamingPull. - * @param request StreamingPullRequest message or plain object - * @param callback Node-style callback called with the error, if any, and StreamingPullResponse - */ - public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; + /** FileDescriptorProto weakDependency */ + weakDependency?: (number[]|null); - /** - * Calls StreamingPull. - * @param request StreamingPullRequest message or plain object - * @returns Promise - */ - public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; + /** FileDescriptorProto messageType */ + messageType?: (google.protobuf.IDescriptorProto[]|null); - /** - * Calls ModifyPushConfig. - * @param request ModifyPushConfigRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; + /** FileDescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); - /** - * Calls ModifyPushConfig. - * @param request ModifyPushConfigRequest message or plain object - * @returns Promise - */ - public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; + /** FileDescriptorProto service */ + service?: (google.protobuf.IServiceDescriptorProto[]|null); - /** - * Calls GetSnapshot. - * @param request GetSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; + /** FileDescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); - /** - * Calls GetSnapshot. - * @param request GetSnapshotRequest message or plain object - * @returns Promise - */ - public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; + /** FileDescriptorProto options */ + options?: (google.protobuf.IFileOptions|null); - /** - * Calls ListSnapshots. - * @param request ListSnapshotsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse - */ - public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; + /** FileDescriptorProto sourceCodeInfo */ + sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); - /** - * Calls ListSnapshots. - * @param request ListSnapshotsRequest message or plain object - * @returns Promise - */ - public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; + /** FileDescriptorProto syntax */ + syntax?: (string|null); + } - /** - * Calls CreateSnapshot. - * @param request CreateSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; + /** Represents a FileDescriptorProto. */ + class FileDescriptorProto implements IFileDescriptorProto { - /** - * Calls CreateSnapshot. - * @param request CreateSnapshotRequest message or plain object - * @returns Promise - */ - public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; + /** + * Constructs a new FileDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorProto); - /** - * Calls UpdateSnapshot. - * @param request UpdateSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; + /** FileDescriptorProto name. */ + public name: string; - /** - * Calls UpdateSnapshot. - * @param request UpdateSnapshotRequest message or plain object - * @returns Promise - */ - public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; + /** FileDescriptorProto package. */ + public package: string; - /** - * Calls DeleteSnapshot. - * @param request DeleteSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; + /** FileDescriptorProto dependency. */ + public dependency: string[]; - /** - * Calls DeleteSnapshot. - * @param request DeleteSnapshotRequest message or plain object - * @returns Promise - */ - public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; + /** FileDescriptorProto publicDependency. */ + public publicDependency: number[]; - /** - * Calls Seek. - * @param request SeekRequest message or plain object - * @param callback Node-style callback called with the error, if any, and SeekResponse - */ - public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; + /** FileDescriptorProto weakDependency. */ + public weakDependency: number[]; - /** - * Calls Seek. - * @param request SeekRequest message or plain object - * @returns Promise - */ - public seek(request: google.pubsub.v1.ISeekRequest): Promise; - } + /** FileDescriptorProto messageType. */ + public messageType: google.protobuf.IDescriptorProto[]; - namespace Subscriber { + /** FileDescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + /** FileDescriptorProto service. */ + public service: google.protobuf.IServiceDescriptorProto[]; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + /** FileDescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + /** FileDescriptorProto options. */ + public options?: (google.protobuf.IFileOptions|null); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. - * @param error Error, if any - * @param [response] ListSubscriptionsResponse - */ - type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; + /** FileDescriptorProto sourceCodeInfo. */ + public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** FileDescriptorProto syntax. */ + public syntax: string; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. - * @param error Error, if any - * @param [response] Empty - */ - type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** + * Creates a new FileDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. - * @param error Error, if any - * @param [response] Empty - */ - type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** + * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. - * @param error Error, if any - * @param [response] PullResponse - */ - type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; + /** + * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. - * @param error Error, if any - * @param [response] StreamingPullResponse - */ - type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. - * @param error Error, if any - * @param [response] Empty - */ - type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + /** + * Verifies a FileDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. - * @param error Error, if any - * @param [response] ListSnapshotsResponse - */ - type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; + /** + * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + /** + * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. + * @param message FileDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + /** + * Converts this FileDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** Properties of a DescriptorProto. */ + interface IDescriptorProto { - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. - * @param error Error, if any - * @param [response] SeekResponse - */ - type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; - } + /** DescriptorProto name */ + name?: (string|null); - /** Properties of a Subscription. */ - interface ISubscription { + /** DescriptorProto field */ + field?: (google.protobuf.IFieldDescriptorProto[]|null); - /** Subscription name */ - name?: (string|null); + /** DescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); - /** Subscription topic */ - topic?: (string|null); + /** DescriptorProto nestedType */ + nestedType?: (google.protobuf.IDescriptorProto[]|null); - /** Subscription pushConfig */ - pushConfig?: (google.pubsub.v1.IPushConfig|null); + /** DescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); - /** Subscription ackDeadlineSeconds */ - ackDeadlineSeconds?: (number|null); + /** DescriptorProto extensionRange */ + extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); - /** Subscription retainAckedMessages */ - retainAckedMessages?: (boolean|null); + /** DescriptorProto oneofDecl */ + oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); - /** Subscription messageRetentionDuration */ - messageRetentionDuration?: (google.protobuf.IDuration|null); + /** DescriptorProto options */ + options?: (google.protobuf.IMessageOptions|null); - /** Subscription labels */ - labels?: ({ [k: string]: string }|null); + /** DescriptorProto reservedRange */ + reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); - /** Subscription enableMessageOrdering */ - enableMessageOrdering?: (boolean|null); + /** DescriptorProto reservedName */ + reservedName?: (string[]|null); + } - /** Subscription expirationPolicy */ - expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + /** Represents a DescriptorProto. */ + class DescriptorProto implements IDescriptorProto { - /** Subscription deadLetterPolicy */ - deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); - } + /** + * Constructs a new DescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDescriptorProto); - /** Represents a Subscription. */ - class Subscription implements ISubscription { + /** DescriptorProto name. */ + public name: string; - /** - * Constructs a new Subscription. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISubscription); + /** DescriptorProto field. */ + public field: google.protobuf.IFieldDescriptorProto[]; - /** Subscription name. */ - public name: string; + /** DescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; - /** Subscription topic. */ - public topic: string; + /** DescriptorProto nestedType. */ + public nestedType: google.protobuf.IDescriptorProto[]; - /** Subscription pushConfig. */ - public pushConfig?: (google.pubsub.v1.IPushConfig|null); + /** DescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; - /** Subscription ackDeadlineSeconds. */ - public ackDeadlineSeconds: number; + /** DescriptorProto extensionRange. */ + public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; - /** Subscription retainAckedMessages. */ - public retainAckedMessages: boolean; + /** DescriptorProto oneofDecl. */ + public oneofDecl: google.protobuf.IOneofDescriptorProto[]; - /** Subscription messageRetentionDuration. */ - public messageRetentionDuration?: (google.protobuf.IDuration|null); + /** DescriptorProto options. */ + public options?: (google.protobuf.IMessageOptions|null); - /** Subscription labels. */ - public labels: { [k: string]: string }; + /** DescriptorProto reservedRange. */ + public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; - /** Subscription enableMessageOrdering. */ - public enableMessageOrdering: boolean; + /** DescriptorProto reservedName. */ + public reservedName: string[]; - /** Subscription expirationPolicy. */ - public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + /** + * Creates a new DescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns DescriptorProto instance + */ + public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; - /** Subscription deadLetterPolicy. */ - public deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); + /** + * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new Subscription instance using the specified properties. - * @param [properties] Properties to set - * @returns Subscription instance - */ - public static create(properties?: google.pubsub.v1.ISubscription): google.pubsub.v1.Subscription; + /** + * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @param message Subscription message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a DescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; - /** - * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @param message Subscription message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; - /** - * Decodes a Subscription message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Subscription; + /** + * Verifies a DescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a Subscription message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Subscription; + /** + * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; - /** - * Verifies a Subscription message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * @param message DescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a Subscription message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Subscription - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Subscription; + /** + * Converts this DescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a plain object from a Subscription message. Also converts values to other types if specified. - * @param message Subscription - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.Subscription, options?: $protobuf.IConversionOptions): { [k: string]: any }; + namespace DescriptorProto { - /** - * Converts this Subscription to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Properties of an ExtensionRange. */ + interface IExtensionRange { - /** Properties of a DeadLetterPolicy. */ - interface IDeadLetterPolicy { + /** ExtensionRange start */ + start?: (number|null); - /** DeadLetterPolicy deadLetterTopic */ - deadLetterTopic?: (string|null); + /** ExtensionRange end */ + end?: (number|null); - /** DeadLetterPolicy maxDeliveryAttempts */ - maxDeliveryAttempts?: (number|null); + /** ExtensionRange options */ + options?: (google.protobuf.IExtensionRangeOptions|null); } - /** Represents a DeadLetterPolicy. */ - class DeadLetterPolicy implements IDeadLetterPolicy { + /** Represents an ExtensionRange. */ + class ExtensionRange implements IExtensionRange { /** - * Constructs a new DeadLetterPolicy. + * Constructs a new ExtensionRange. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IDeadLetterPolicy); + constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); - /** DeadLetterPolicy deadLetterTopic. */ - public deadLetterTopic: string; + /** ExtensionRange start. */ + public start: number; - /** DeadLetterPolicy maxDeliveryAttempts. */ - public maxDeliveryAttempts: number; + /** ExtensionRange end. */ + public end: number; + + /** ExtensionRange options. */ + public options?: (google.protobuf.IExtensionRangeOptions|null); /** - * Creates a new DeadLetterPolicy instance using the specified properties. + * Creates a new ExtensionRange instance using the specified properties. * @param [properties] Properties to set - * @returns DeadLetterPolicy instance + * @returns ExtensionRange instance */ - public static create(properties?: google.pubsub.v1.IDeadLetterPolicy): google.pubsub.v1.DeadLetterPolicy; + public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; /** - * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. - * @param message DeadLetterPolicy message or plain object to encode + * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. - * @param message DeadLetterPolicy message or plain object to encode + * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer. + * Decodes an ExtensionRange message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns DeadLetterPolicy + * @returns ExtensionRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeadLetterPolicy; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. + * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns DeadLetterPolicy + * @returns ExtensionRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeadLetterPolicy; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; /** - * Verifies a DeadLetterPolicy message. + * Verifies an ExtensionRange message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. + * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns DeadLetterPolicy + * @returns ExtensionRange */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeadLetterPolicy; + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; /** - * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. - * @param message DeadLetterPolicy + * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. + * @param message ExtensionRange * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.DeadLetterPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this DeadLetterPolicy to JSON. + * Converts this ExtensionRange to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of an ExpirationPolicy. */ - interface IExpirationPolicy { + /** Properties of a ReservedRange. */ + interface IReservedRange { - /** ExpirationPolicy ttl */ - ttl?: (google.protobuf.IDuration|null); + /** ReservedRange start */ + start?: (number|null); + + /** ReservedRange end */ + end?: (number|null); } - /** Represents an ExpirationPolicy. */ - class ExpirationPolicy implements IExpirationPolicy { + /** Represents a ReservedRange. */ + class ReservedRange implements IReservedRange { /** - * Constructs a new ExpirationPolicy. + * Constructs a new ReservedRange. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IExpirationPolicy); + constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); - /** ExpirationPolicy ttl. */ - public ttl?: (google.protobuf.IDuration|null); + /** ReservedRange start. */ + public start: number; + + /** ReservedRange end. */ + public end: number; /** - * Creates a new ExpirationPolicy instance using the specified properties. + * Creates a new ReservedRange instance using the specified properties. * @param [properties] Properties to set - * @returns ExpirationPolicy instance + * @returns ReservedRange instance */ - public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; + public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; /** - * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @param message ExpirationPolicy message or plain object to encode + * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @param message ExpirationPolicy message or plain object to encode + * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an ExpirationPolicy message from the specified reader or buffer. + * Decodes a ReservedRange message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ExpirationPolicy + * @returns ReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; /** - * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * Decodes a ReservedRange message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ExpirationPolicy + * @returns ReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; /** - * Verifies an ExpirationPolicy message. + * Verifies a ReservedRange message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ExpirationPolicy + * @returns ReservedRange */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; + + /** + * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. + * @param message ReservedRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ReservedRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + + /** Properties of an ExtensionRangeOptions. */ + interface IExtensionRangeOptions { + + /** ExtensionRangeOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an ExtensionRangeOptions. */ + class ExtensionRangeOptions implements IExtensionRangeOptions { + + /** + * Constructs a new ExtensionRangeOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IExtensionRangeOptions); + + /** ExtensionRangeOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRangeOptions instance + */ + public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; + + /** + * Verifies an ExtensionRangeOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRangeOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; + + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @param message ExtensionRangeOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExtensionRangeOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldDescriptorProto. */ + interface IFieldDescriptorProto { + + /** FieldDescriptorProto name */ + name?: (string|null); + + /** FieldDescriptorProto number */ + number?: (number|null); + + /** FieldDescriptorProto label */ + label?: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label|null); + + /** FieldDescriptorProto type */ + type?: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type|null); + + /** FieldDescriptorProto typeName */ + typeName?: (string|null); + + /** FieldDescriptorProto extendee */ + extendee?: (string|null); + + /** FieldDescriptorProto defaultValue */ + defaultValue?: (string|null); + + /** FieldDescriptorProto oneofIndex */ + oneofIndex?: (number|null); + + /** FieldDescriptorProto jsonName */ + jsonName?: (string|null); + + /** FieldDescriptorProto options */ + options?: (google.protobuf.IFieldOptions|null); + } + + /** Represents a FieldDescriptorProto. */ + class FieldDescriptorProto implements IFieldDescriptorProto { + + /** + * Constructs a new FieldDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldDescriptorProto); + + /** FieldDescriptorProto name. */ + public name: string; - /** - * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. - * @param message ExpirationPolicy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** FieldDescriptorProto number. */ + public number: number; - /** - * Converts this ExpirationPolicy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FieldDescriptorProto label. */ + public label: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label); - /** Properties of a PushConfig. */ - interface IPushConfig { + /** FieldDescriptorProto type. */ + public type: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type); - /** PushConfig pushEndpoint */ - pushEndpoint?: (string|null); + /** FieldDescriptorProto typeName. */ + public typeName: string; - /** PushConfig attributes */ - attributes?: ({ [k: string]: string }|null); + /** FieldDescriptorProto extendee. */ + public extendee: string; - /** PushConfig oidcToken */ - oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); - } + /** FieldDescriptorProto defaultValue. */ + public defaultValue: string; - /** Represents a PushConfig. */ - class PushConfig implements IPushConfig { + /** FieldDescriptorProto oneofIndex. */ + public oneofIndex: number; - /** - * Constructs a new PushConfig. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPushConfig); + /** FieldDescriptorProto jsonName. */ + public jsonName: string; - /** PushConfig pushEndpoint. */ - public pushEndpoint: string; + /** FieldDescriptorProto options. */ + public options?: (google.protobuf.IFieldOptions|null); - /** PushConfig attributes. */ - public attributes: { [k: string]: string }; + /** + * Creates a new FieldDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; - /** PushConfig oidcToken. */ - public oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + /** + * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** PushConfig authenticationMethod. */ - public authenticationMethod?: "oidcToken"; + /** + * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new PushConfig instance using the specified properties. - * @param [properties] Properties to set - * @returns PushConfig instance - */ - public static create(properties?: google.pubsub.v1.IPushConfig): google.pubsub.v1.PushConfig; + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; - /** - * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @param message PushConfig message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; - /** - * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @param message PushConfig message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Verifies a FieldDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a PushConfig message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig; + /** + * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; - /** - * Decodes a PushConfig message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig; + /** + * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. + * @param message FieldDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Verifies a PushConfig message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Converts this FieldDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PushConfig - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig; + namespace FieldDescriptorProto { - /** - * Creates a plain object from a PushConfig message. Also converts values to other types if specified. - * @param message PushConfig - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PushConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Type enum. */ + enum Type { + TYPE_DOUBLE = 1, + TYPE_FLOAT = 2, + TYPE_INT64 = 3, + TYPE_UINT64 = 4, + TYPE_INT32 = 5, + TYPE_FIXED64 = 6, + TYPE_FIXED32 = 7, + TYPE_BOOL = 8, + TYPE_STRING = 9, + TYPE_GROUP = 10, + TYPE_MESSAGE = 11, + TYPE_BYTES = 12, + TYPE_UINT32 = 13, + TYPE_ENUM = 14, + TYPE_SFIXED32 = 15, + TYPE_SFIXED64 = 16, + TYPE_SINT32 = 17, + TYPE_SINT64 = 18 + } - /** - * Converts this PushConfig to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; + /** Label enum. */ + enum Label { + LABEL_OPTIONAL = 1, + LABEL_REQUIRED = 2, + LABEL_REPEATED = 3 } + } - namespace PushConfig { + /** Properties of an OneofDescriptorProto. */ + interface IOneofDescriptorProto { - /** Properties of an OidcToken. */ - interface IOidcToken { + /** OneofDescriptorProto name */ + name?: (string|null); - /** OidcToken serviceAccountEmail */ - serviceAccountEmail?: (string|null); + /** OneofDescriptorProto options */ + options?: (google.protobuf.IOneofOptions|null); + } - /** OidcToken audience */ - audience?: (string|null); - } + /** Represents an OneofDescriptorProto. */ + class OneofDescriptorProto implements IOneofDescriptorProto { - /** Represents an OidcToken. */ - class OidcToken implements IOidcToken { + /** + * Constructs a new OneofDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofDescriptorProto); + + /** OneofDescriptorProto name. */ + public name: string; + + /** OneofDescriptorProto options. */ + public options?: (google.protobuf.IOneofOptions|null); + + /** + * Creates a new OneofDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofDescriptorProto instance + */ + public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; + + /** + * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Constructs a new OidcToken. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.PushConfig.IOidcToken); + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; - /** OidcToken serviceAccountEmail. */ - public serviceAccountEmail: string; + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; - /** OidcToken audience. */ - public audience: string; + /** + * Verifies an OneofDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a new OidcToken instance using the specified properties. - * @param [properties] Properties to set - * @returns OidcToken instance - */ - public static create(properties?: google.pubsub.v1.PushConfig.IOidcToken): google.pubsub.v1.PushConfig.OidcToken; + /** + * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; - /** - * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @param message OidcToken message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. + * @param message OneofDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @param message OidcToken message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Converts this OneofDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Decodes an OidcToken message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.OidcToken; + /** Properties of an EnumDescriptorProto. */ + interface IEnumDescriptorProto { - /** - * Decodes an OidcToken message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.OidcToken; + /** EnumDescriptorProto name */ + name?: (string|null); - /** - * Verifies an OidcToken message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** EnumDescriptorProto value */ + value?: (google.protobuf.IEnumValueDescriptorProto[]|null); - /** - * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OidcToken - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.OidcToken; + /** EnumDescriptorProto options */ + options?: (google.protobuf.IEnumOptions|null); - /** - * Creates a plain object from an OidcToken message. Also converts values to other types if specified. - * @param message OidcToken - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PushConfig.OidcToken, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** EnumDescriptorProto reservedRange */ + reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); - /** - * Converts this OidcToken to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } + /** EnumDescriptorProto reservedName */ + reservedName?: (string[]|null); + } - /** Properties of a ReceivedMessage. */ - interface IReceivedMessage { + /** Represents an EnumDescriptorProto. */ + class EnumDescriptorProto implements IEnumDescriptorProto { - /** ReceivedMessage ackId */ - ackId?: (string|null); + /** + * Constructs a new EnumDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumDescriptorProto); - /** ReceivedMessage message */ - message?: (google.pubsub.v1.IPubsubMessage|null); + /** EnumDescriptorProto name. */ + public name: string; - /** ReceivedMessage deliveryAttempt */ - deliveryAttempt?: (number|null); - } + /** EnumDescriptorProto value. */ + public value: google.protobuf.IEnumValueDescriptorProto[]; - /** Represents a ReceivedMessage. */ - class ReceivedMessage implements IReceivedMessage { + /** EnumDescriptorProto options. */ + public options?: (google.protobuf.IEnumOptions|null); - /** - * Constructs a new ReceivedMessage. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IReceivedMessage); + /** EnumDescriptorProto reservedRange. */ + public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; - /** ReceivedMessage ackId. */ - public ackId: string; + /** EnumDescriptorProto reservedName. */ + public reservedName: string[]; - /** ReceivedMessage message. */ - public message?: (google.pubsub.v1.IPubsubMessage|null); + /** + * Creates a new EnumDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; - /** ReceivedMessage deliveryAttempt. */ - public deliveryAttempt: number; + /** + * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new ReceivedMessage instance using the specified properties. - * @param [properties] Properties to set - * @returns ReceivedMessage instance - */ - public static create(properties?: google.pubsub.v1.IReceivedMessage): google.pubsub.v1.ReceivedMessage; + /** + * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. - * @param message ReceivedMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; - /** - * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. - * @param message ReceivedMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; - /** - * Decodes a ReceivedMessage message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ReceivedMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ReceivedMessage; + /** + * Verifies an EnumDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ReceivedMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ReceivedMessage; + /** + * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; - /** - * Verifies a ReceivedMessage message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. + * @param message EnumDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ReceivedMessage - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ReceivedMessage; + /** + * Converts this EnumDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. - * @param message ReceivedMessage - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ReceivedMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + namespace EnumDescriptorProto { - /** - * Converts this ReceivedMessage to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Properties of an EnumReservedRange. */ + interface IEnumReservedRange { - /** Properties of a GetSubscriptionRequest. */ - interface IGetSubscriptionRequest { + /** EnumReservedRange start */ + start?: (number|null); - /** GetSubscriptionRequest subscription */ - subscription?: (string|null); + /** EnumReservedRange end */ + end?: (number|null); } - /** Represents a GetSubscriptionRequest. */ - class GetSubscriptionRequest implements IGetSubscriptionRequest { + /** Represents an EnumReservedRange. */ + class EnumReservedRange implements IEnumReservedRange { /** - * Constructs a new GetSubscriptionRequest. + * Constructs a new EnumReservedRange. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IGetSubscriptionRequest); + constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); - /** GetSubscriptionRequest subscription. */ - public subscription: string; + /** EnumReservedRange start. */ + public start: number; + + /** EnumReservedRange end. */ + public end: number; /** - * Creates a new GetSubscriptionRequest instance using the specified properties. + * Creates a new EnumReservedRange instance using the specified properties. * @param [properties] Properties to set - * @returns GetSubscriptionRequest instance + * @returns EnumReservedRange instance */ - public static create(properties?: google.pubsub.v1.IGetSubscriptionRequest): google.pubsub.v1.GetSubscriptionRequest; + public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; /** - * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @param message GetSubscriptionRequest message or plain object to encode + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @param message GetSubscriptionRequest message or plain object to encode + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer. + * Decodes an EnumReservedRange message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns GetSubscriptionRequest + * @returns EnumReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSubscriptionRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns GetSubscriptionRequest + * @returns EnumReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSubscriptionRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; /** - * Verifies a GetSubscriptionRequest message. + * Verifies an EnumReservedRange message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns GetSubscriptionRequest + * @returns EnumReservedRange */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSubscriptionRequest; + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; /** - * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. - * @param message GetSubscriptionRequest + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * @param message EnumReservedRange * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.GetSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this GetSubscriptionRequest to JSON. + * Converts this EnumReservedRange to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of an UpdateSubscriptionRequest. */ - interface IUpdateSubscriptionRequest { + /** Properties of an EnumValueDescriptorProto. */ + interface IEnumValueDescriptorProto { - /** UpdateSubscriptionRequest subscription */ - subscription?: (google.pubsub.v1.ISubscription|null); + /** EnumValueDescriptorProto name */ + name?: (string|null); - /** UpdateSubscriptionRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); - } + /** EnumValueDescriptorProto number */ + number?: (number|null); - /** Represents an UpdateSubscriptionRequest. */ - class UpdateSubscriptionRequest implements IUpdateSubscriptionRequest { + /** EnumValueDescriptorProto options */ + options?: (google.protobuf.IEnumValueOptions|null); + } - /** - * Constructs a new UpdateSubscriptionRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IUpdateSubscriptionRequest); + /** Represents an EnumValueDescriptorProto. */ + class EnumValueDescriptorProto implements IEnumValueDescriptorProto { - /** UpdateSubscriptionRequest subscription. */ - public subscription?: (google.pubsub.v1.ISubscription|null); + /** + * Constructs a new EnumValueDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueDescriptorProto); - /** UpdateSubscriptionRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); + /** EnumValueDescriptorProto name. */ + public name: string; - /** - * Creates a new UpdateSubscriptionRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns UpdateSubscriptionRequest instance - */ - public static create(properties?: google.pubsub.v1.IUpdateSubscriptionRequest): google.pubsub.v1.UpdateSubscriptionRequest; + /** EnumValueDescriptorProto number. */ + public number: number; - /** - * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @param message UpdateSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** EnumValueDescriptorProto options. */ + public options?: (google.protobuf.IEnumValueOptions|null); - /** - * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @param message UpdateSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new EnumValueDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSubscriptionRequest; + /** + * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; + + /** + * Verifies an EnumValueDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; + + /** + * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. + * @param message EnumValueDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumValueDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ServiceDescriptorProto. */ + interface IServiceDescriptorProto { + + /** ServiceDescriptorProto name */ + name?: (string|null); - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSubscriptionRequest; + /** ServiceDescriptorProto method */ + method?: (google.protobuf.IMethodDescriptorProto[]|null); - /** - * Verifies an UpdateSubscriptionRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** ServiceDescriptorProto options */ + options?: (google.protobuf.IServiceOptions|null); + } - /** - * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UpdateSubscriptionRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSubscriptionRequest; + /** Represents a ServiceDescriptorProto. */ + class ServiceDescriptorProto implements IServiceDescriptorProto { - /** - * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. - * @param message UpdateSubscriptionRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.UpdateSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Constructs a new ServiceDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceDescriptorProto); - /** - * Converts this UpdateSubscriptionRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** ServiceDescriptorProto name. */ + public name: string; - /** Properties of a ListSubscriptionsRequest. */ - interface IListSubscriptionsRequest { + /** ServiceDescriptorProto method. */ + public method: google.protobuf.IMethodDescriptorProto[]; - /** ListSubscriptionsRequest project */ - project?: (string|null); + /** ServiceDescriptorProto options. */ + public options?: (google.protobuf.IServiceOptions|null); - /** ListSubscriptionsRequest pageSize */ - pageSize?: (number|null); + /** + * Creates a new ServiceDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceDescriptorProto instance + */ + public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; - /** ListSubscriptionsRequest pageToken */ - pageToken?: (string|null); - } + /** + * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** Represents a ListSubscriptionsRequest. */ - class ListSubscriptionsRequest implements IListSubscriptionsRequest { + /** + * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Constructs a new ListSubscriptionsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSubscriptionsRequest); + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; - /** ListSubscriptionsRequest project. */ - public project: string; + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; - /** ListSubscriptionsRequest pageSize. */ - public pageSize: number; + /** + * Verifies a ServiceDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** ListSubscriptionsRequest pageToken. */ - public pageToken: string; + /** + * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; - /** - * Creates a new ListSubscriptionsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSubscriptionsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListSubscriptionsRequest): google.pubsub.v1.ListSubscriptionsRequest; + /** + * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. + * @param message ServiceDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. - * @param message ListSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Converts this ServiceDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. - * @param message ListSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** Properties of a MethodDescriptorProto. */ + interface IMethodDescriptorProto { - /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsRequest; + /** MethodDescriptorProto name */ + name?: (string|null); - /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsRequest; + /** MethodDescriptorProto inputType */ + inputType?: (string|null); - /** - * Verifies a ListSubscriptionsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** MethodDescriptorProto outputType */ + outputType?: (string|null); - /** - * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSubscriptionsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsRequest; + /** MethodDescriptorProto options */ + options?: (google.protobuf.IMethodOptions|null); - /** - * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. - * @param message ListSubscriptionsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** MethodDescriptorProto clientStreaming */ + clientStreaming?: (boolean|null); - /** - * Converts this ListSubscriptionsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** MethodDescriptorProto serverStreaming */ + serverStreaming?: (boolean|null); + } - /** Properties of a ListSubscriptionsResponse. */ - interface IListSubscriptionsResponse { + /** Represents a MethodDescriptorProto. */ + class MethodDescriptorProto implements IMethodDescriptorProto { - /** ListSubscriptionsResponse subscriptions */ - subscriptions?: (google.pubsub.v1.ISubscription[]|null); + /** + * Constructs a new MethodDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodDescriptorProto); - /** ListSubscriptionsResponse nextPageToken */ - nextPageToken?: (string|null); - } + /** MethodDescriptorProto name. */ + public name: string; - /** Represents a ListSubscriptionsResponse. */ - class ListSubscriptionsResponse implements IListSubscriptionsResponse { + /** MethodDescriptorProto inputType. */ + public inputType: string; - /** - * Constructs a new ListSubscriptionsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSubscriptionsResponse); + /** MethodDescriptorProto outputType. */ + public outputType: string; - /** ListSubscriptionsResponse subscriptions. */ - public subscriptions: google.pubsub.v1.ISubscription[]; + /** MethodDescriptorProto options. */ + public options?: (google.protobuf.IMethodOptions|null); - /** ListSubscriptionsResponse nextPageToken. */ - public nextPageToken: string; + /** MethodDescriptorProto clientStreaming. */ + public clientStreaming: boolean; + + /** MethodDescriptorProto serverStreaming. */ + public serverStreaming: boolean; + + /** + * Creates a new MethodDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodDescriptorProto instance + */ + public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; - /** - * Creates a new ListSubscriptionsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSubscriptionsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListSubscriptionsResponse): google.pubsub.v1.ListSubscriptionsResponse; + /** + * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. - * @param message ListSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. - * @param message ListSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; - /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsResponse; + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; - /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsResponse; + /** + * Verifies a MethodDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Verifies a ListSubscriptionsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; - /** - * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSubscriptionsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsResponse; + /** + * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. + * @param message MethodDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. - * @param message ListSubscriptionsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Converts this MethodDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Converts this ListSubscriptionsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Properties of a FileOptions. */ + interface IFileOptions { - /** Properties of a DeleteSubscriptionRequest. */ - interface IDeleteSubscriptionRequest { + /** FileOptions javaPackage */ + javaPackage?: (string|null); - /** DeleteSubscriptionRequest subscription */ - subscription?: (string|null); - } + /** FileOptions javaOuterClassname */ + javaOuterClassname?: (string|null); - /** Represents a DeleteSubscriptionRequest. */ - class DeleteSubscriptionRequest implements IDeleteSubscriptionRequest { + /** FileOptions javaMultipleFiles */ + javaMultipleFiles?: (boolean|null); - /** - * Constructs a new DeleteSubscriptionRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeleteSubscriptionRequest); + /** FileOptions javaGenerateEqualsAndHash */ + javaGenerateEqualsAndHash?: (boolean|null); - /** DeleteSubscriptionRequest subscription. */ - public subscription: string; + /** FileOptions javaStringCheckUtf8 */ + javaStringCheckUtf8?: (boolean|null); - /** - * Creates a new DeleteSubscriptionRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteSubscriptionRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteSubscriptionRequest): google.pubsub.v1.DeleteSubscriptionRequest; + /** FileOptions optimizeFor */ + optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode|null); - /** - * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @param message DeleteSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** FileOptions goPackage */ + goPackage?: (string|null); - /** - * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @param message DeleteSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** FileOptions ccGenericServices */ + ccGenericServices?: (boolean|null); - /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSubscriptionRequest; + /** FileOptions javaGenericServices */ + javaGenericServices?: (boolean|null); - /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSubscriptionRequest; + /** FileOptions pyGenericServices */ + pyGenericServices?: (boolean|null); - /** - * Verifies a DeleteSubscriptionRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** FileOptions phpGenericServices */ + phpGenericServices?: (boolean|null); - /** - * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteSubscriptionRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSubscriptionRequest; + /** FileOptions deprecated */ + deprecated?: (boolean|null); - /** - * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. - * @param message DeleteSubscriptionRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeleteSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** FileOptions ccEnableArenas */ + ccEnableArenas?: (boolean|null); - /** - * Converts this DeleteSubscriptionRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FileOptions objcClassPrefix */ + objcClassPrefix?: (string|null); - /** Properties of a ModifyPushConfigRequest. */ - interface IModifyPushConfigRequest { + /** FileOptions csharpNamespace */ + csharpNamespace?: (string|null); - /** ModifyPushConfigRequest subscription */ - subscription?: (string|null); + /** FileOptions swiftPrefix */ + swiftPrefix?: (string|null); - /** ModifyPushConfigRequest pushConfig */ - pushConfig?: (google.pubsub.v1.IPushConfig|null); - } + /** FileOptions phpClassPrefix */ + phpClassPrefix?: (string|null); - /** Represents a ModifyPushConfigRequest. */ - class ModifyPushConfigRequest implements IModifyPushConfigRequest { + /** FileOptions phpNamespace */ + phpNamespace?: (string|null); - /** - * Constructs a new ModifyPushConfigRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IModifyPushConfigRequest); + /** FileOptions phpMetadataNamespace */ + phpMetadataNamespace?: (string|null); - /** ModifyPushConfigRequest subscription. */ - public subscription: string; + /** FileOptions rubyPackage */ + rubyPackage?: (string|null); - /** ModifyPushConfigRequest pushConfig. */ - public pushConfig?: (google.pubsub.v1.IPushConfig|null); + /** FileOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** - * Creates a new ModifyPushConfigRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ModifyPushConfigRequest instance - */ - public static create(properties?: google.pubsub.v1.IModifyPushConfigRequest): google.pubsub.v1.ModifyPushConfigRequest; + /** FileOptions .google.api.resourceDefinition */ + ".google.api.resourceDefinition"?: (google.api.IResourceDescriptor[]|null); + } - /** - * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @param message ModifyPushConfigRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a FileOptions. */ + class FileOptions implements IFileOptions { - /** - * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @param message ModifyPushConfigRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new FileOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileOptions); - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyPushConfigRequest; + /** FileOptions javaPackage. */ + public javaPackage: string; - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyPushConfigRequest; + /** FileOptions javaOuterClassname. */ + public javaOuterClassname: string; - /** - * Verifies a ModifyPushConfigRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** FileOptions javaMultipleFiles. */ + public javaMultipleFiles: boolean; - /** - * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ModifyPushConfigRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyPushConfigRequest; + /** FileOptions javaGenerateEqualsAndHash. */ + public javaGenerateEqualsAndHash: boolean; - /** - * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. - * @param message ModifyPushConfigRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ModifyPushConfigRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** FileOptions javaStringCheckUtf8. */ + public javaStringCheckUtf8: boolean; - /** - * Converts this ModifyPushConfigRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FileOptions optimizeFor. */ + public optimizeFor: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode); - /** Properties of a PullRequest. */ - interface IPullRequest { + /** FileOptions goPackage. */ + public goPackage: string; - /** PullRequest subscription */ - subscription?: (string|null); + /** FileOptions ccGenericServices. */ + public ccGenericServices: boolean; - /** PullRequest returnImmediately */ - returnImmediately?: (boolean|null); + /** FileOptions javaGenericServices. */ + public javaGenericServices: boolean; - /** PullRequest maxMessages */ - maxMessages?: (number|null); - } + /** FileOptions pyGenericServices. */ + public pyGenericServices: boolean; - /** Represents a PullRequest. */ - class PullRequest implements IPullRequest { + /** FileOptions phpGenericServices. */ + public phpGenericServices: boolean; - /** - * Constructs a new PullRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPullRequest); + /** FileOptions deprecated. */ + public deprecated: boolean; - /** PullRequest subscription. */ - public subscription: string; + /** FileOptions ccEnableArenas. */ + public ccEnableArenas: boolean; - /** PullRequest returnImmediately. */ - public returnImmediately: boolean; + /** FileOptions objcClassPrefix. */ + public objcClassPrefix: string; - /** PullRequest maxMessages. */ - public maxMessages: number; + /** FileOptions csharpNamespace. */ + public csharpNamespace: string; - /** - * Creates a new PullRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns PullRequest instance - */ - public static create(properties?: google.pubsub.v1.IPullRequest): google.pubsub.v1.PullRequest; + /** FileOptions swiftPrefix. */ + public swiftPrefix: string; - /** - * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @param message PullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** FileOptions phpClassPrefix. */ + public phpClassPrefix: string; - /** - * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @param message PullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** FileOptions phpNamespace. */ + public phpNamespace: string; - /** - * Decodes a PullRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullRequest; + /** FileOptions phpMetadataNamespace. */ + public phpMetadataNamespace: string; - /** - * Decodes a PullRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullRequest; + /** FileOptions rubyPackage. */ + public rubyPackage: string; - /** - * Verifies a PullRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** FileOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PullRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullRequest; + /** + * Creates a new FileOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FileOptions instance + */ + public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; - /** - * Creates a plain object from a PullRequest message. Also converts values to other types if specified. - * @param message PullRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this PullRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a PullResponse. */ - interface IPullResponse { + /** + * Decodes a FileOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; - /** PullResponse receivedMessages */ - receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); - } + /** + * Decodes a FileOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; - /** Represents a PullResponse. */ - class PullResponse implements IPullResponse { + /** + * Verifies a FileOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Constructs a new PullResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPullResponse); + /** + * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; - /** PullResponse receivedMessages. */ - public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + /** + * Creates a plain object from a FileOptions message. Also converts values to other types if specified. + * @param message FileOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a new PullResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns PullResponse instance - */ - public static create(properties?: google.pubsub.v1.IPullResponse): google.pubsub.v1.PullResponse; + /** + * Converts this FileOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @param message PullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + namespace FileOptions { - /** - * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @param message PullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** OptimizeMode enum. */ + enum OptimizeMode { + SPEED = 1, + CODE_SIZE = 2, + LITE_RUNTIME = 3 + } + } - /** - * Decodes a PullResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullResponse; + /** Properties of a MessageOptions. */ + interface IMessageOptions { - /** - * Decodes a PullResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullResponse; + /** MessageOptions messageSetWireFormat */ + messageSetWireFormat?: (boolean|null); - /** - * Verifies a PullResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** MessageOptions noStandardDescriptorAccessor */ + noStandardDescriptorAccessor?: (boolean|null); - /** - * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PullResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullResponse; + /** MessageOptions deprecated */ + deprecated?: (boolean|null); - /** - * Creates a plain object from a PullResponse message. Also converts values to other types if specified. - * @param message PullResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** MessageOptions mapEntry */ + mapEntry?: (boolean|null); - /** - * Converts this PullResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** MessageOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** Properties of a ModifyAckDeadlineRequest. */ - interface IModifyAckDeadlineRequest { + /** MessageOptions .google.api.resource */ + ".google.api.resource"?: (google.api.IResourceDescriptor|null); + } - /** ModifyAckDeadlineRequest subscription */ - subscription?: (string|null); + /** Represents a MessageOptions. */ + class MessageOptions implements IMessageOptions { - /** ModifyAckDeadlineRequest ackIds */ - ackIds?: (string[]|null); + /** + * Constructs a new MessageOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMessageOptions); - /** ModifyAckDeadlineRequest ackDeadlineSeconds */ - ackDeadlineSeconds?: (number|null); - } + /** MessageOptions messageSetWireFormat. */ + public messageSetWireFormat: boolean; - /** Represents a ModifyAckDeadlineRequest. */ - class ModifyAckDeadlineRequest implements IModifyAckDeadlineRequest { + /** MessageOptions noStandardDescriptorAccessor. */ + public noStandardDescriptorAccessor: boolean; - /** - * Constructs a new ModifyAckDeadlineRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IModifyAckDeadlineRequest); + /** MessageOptions deprecated. */ + public deprecated: boolean; - /** ModifyAckDeadlineRequest subscription. */ - public subscription: string; + /** MessageOptions mapEntry. */ + public mapEntry: boolean; - /** ModifyAckDeadlineRequest ackIds. */ - public ackIds: string[]; + /** MessageOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** ModifyAckDeadlineRequest ackDeadlineSeconds. */ - public ackDeadlineSeconds: number; + /** + * Creates a new MessageOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageOptions instance + */ + public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; - /** - * Creates a new ModifyAckDeadlineRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ModifyAckDeadlineRequest instance - */ - public static create(properties?: google.pubsub.v1.IModifyAckDeadlineRequest): google.pubsub.v1.ModifyAckDeadlineRequest; + /** + * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @param message ModifyAckDeadlineRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @param message ModifyAckDeadlineRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a MessageOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyAckDeadlineRequest; + /** + * Decodes a MessageOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyAckDeadlineRequest; + /** + * Verifies a MessageOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Verifies a ModifyAckDeadlineRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; - /** - * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ModifyAckDeadlineRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyAckDeadlineRequest; + /** + * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. + * @param message MessageOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. - * @param message ModifyAckDeadlineRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ModifyAckDeadlineRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Converts this MessageOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Converts this ModifyAckDeadlineRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Properties of a FieldOptions. */ + interface IFieldOptions { - /** Properties of an AcknowledgeRequest. */ - interface IAcknowledgeRequest { + /** FieldOptions ctype */ + ctype?: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType|null); - /** AcknowledgeRequest subscription */ - subscription?: (string|null); + /** FieldOptions packed */ + packed?: (boolean|null); - /** AcknowledgeRequest ackIds */ - ackIds?: (string[]|null); - } + /** FieldOptions jstype */ + jstype?: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType|null); - /** Represents an AcknowledgeRequest. */ - class AcknowledgeRequest implements IAcknowledgeRequest { + /** FieldOptions lazy */ + lazy?: (boolean|null); - /** - * Constructs a new AcknowledgeRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IAcknowledgeRequest); + /** FieldOptions deprecated */ + deprecated?: (boolean|null); - /** AcknowledgeRequest subscription. */ - public subscription: string; + /** FieldOptions weak */ + weak?: (boolean|null); - /** AcknowledgeRequest ackIds. */ - public ackIds: string[]; + /** FieldOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** - * Creates a new AcknowledgeRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns AcknowledgeRequest instance - */ - public static create(properties?: google.pubsub.v1.IAcknowledgeRequest): google.pubsub.v1.AcknowledgeRequest; + /** FieldOptions .google.api.fieldBehavior */ + ".google.api.fieldBehavior"?: (google.api.FieldBehavior[]|null); - /** - * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. - * @param message AcknowledgeRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** FieldOptions .google.api.resourceReference */ + ".google.api.resourceReference"?: (google.api.IResourceReference|null); + } - /** - * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. - * @param message AcknowledgeRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a FieldOptions. */ + class FieldOptions implements IFieldOptions { - /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns AcknowledgeRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.AcknowledgeRequest; + /** + * Constructs a new FieldOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldOptions); - /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns AcknowledgeRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.AcknowledgeRequest; + /** FieldOptions ctype. */ + public ctype: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType); - /** - * Verifies an AcknowledgeRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** FieldOptions packed. */ + public packed: boolean; - /** - * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns AcknowledgeRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.AcknowledgeRequest; + /** FieldOptions jstype. */ + public jstype: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType); - /** - * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. - * @param message AcknowledgeRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.AcknowledgeRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** FieldOptions lazy. */ + public lazy: boolean; - /** - * Converts this AcknowledgeRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FieldOptions deprecated. */ + public deprecated: boolean; - /** Properties of a StreamingPullRequest. */ - interface IStreamingPullRequest { + /** FieldOptions weak. */ + public weak: boolean; - /** StreamingPullRequest subscription */ - subscription?: (string|null); + /** FieldOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** StreamingPullRequest ackIds */ - ackIds?: (string[]|null); + /** + * Creates a new FieldOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldOptions instance + */ + public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; - /** StreamingPullRequest modifyDeadlineSeconds */ - modifyDeadlineSeconds?: (number[]|null); + /** + * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** StreamingPullRequest modifyDeadlineAckIds */ - modifyDeadlineAckIds?: (string[]|null); + /** + * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** StreamingPullRequest streamAckDeadlineSeconds */ - streamAckDeadlineSeconds?: (number|null); + /** + * Decodes a FieldOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; - /** StreamingPullRequest clientId */ - clientId?: (string|null); - } + /** + * Decodes a FieldOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; - /** Represents a StreamingPullRequest. */ - class StreamingPullRequest implements IStreamingPullRequest { + /** + * Verifies a FieldOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Constructs a new StreamingPullRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IStreamingPullRequest); + /** + * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; - /** StreamingPullRequest subscription. */ - public subscription: string; + /** + * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. + * @param message FieldOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** StreamingPullRequest ackIds. */ - public ackIds: string[]; + /** + * Converts this FieldOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** StreamingPullRequest modifyDeadlineSeconds. */ - public modifyDeadlineSeconds: number[]; + namespace FieldOptions { - /** StreamingPullRequest modifyDeadlineAckIds. */ - public modifyDeadlineAckIds: string[]; + /** CType enum. */ + enum CType { + STRING = 0, + CORD = 1, + STRING_PIECE = 2 + } - /** StreamingPullRequest streamAckDeadlineSeconds. */ - public streamAckDeadlineSeconds: number; + /** JSType enum. */ + enum JSType { + JS_NORMAL = 0, + JS_STRING = 1, + JS_NUMBER = 2 + } + } - /** StreamingPullRequest clientId. */ - public clientId: string; + /** Properties of an OneofOptions. */ + interface IOneofOptions { - /** - * Creates a new StreamingPullRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns StreamingPullRequest instance - */ - public static create(properties?: google.pubsub.v1.IStreamingPullRequest): google.pubsub.v1.StreamingPullRequest; + /** OneofOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an OneofOptions. */ + class OneofOptions implements IOneofOptions { - /** - * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @param message StreamingPullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new OneofOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofOptions); - /** - * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @param message StreamingPullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** OneofOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullRequest; + /** + * Creates a new OneofOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofOptions instance + */ + public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullRequest; + /** + * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a StreamingPullRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns StreamingPullRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullRequest; + /** + * Decodes an OneofOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; - /** - * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. - * @param message StreamingPullRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.StreamingPullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes an OneofOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; - /** - * Converts this StreamingPullRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Verifies an OneofOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Properties of a StreamingPullResponse. */ - interface IStreamingPullResponse { + /** + * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; - /** StreamingPullResponse receivedMessages */ - receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); - } + /** + * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. + * @param message OneofOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents a StreamingPullResponse. */ - class StreamingPullResponse implements IStreamingPullResponse { + /** + * Converts this OneofOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new StreamingPullResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IStreamingPullResponse); + /** Properties of an EnumOptions. */ + interface IEnumOptions { - /** StreamingPullResponse receivedMessages. */ - public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + /** EnumOptions allowAlias */ + allowAlias?: (boolean|null); - /** - * Creates a new StreamingPullResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns StreamingPullResponse instance - */ - public static create(properties?: google.pubsub.v1.IStreamingPullResponse): google.pubsub.v1.StreamingPullResponse; + /** EnumOptions deprecated */ + deprecated?: (boolean|null); - /** - * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @param message StreamingPullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** EnumOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } - /** - * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @param message StreamingPullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents an EnumOptions. */ + class EnumOptions implements IEnumOptions { - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse; + /** + * Constructs a new EnumOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumOptions); - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse; + /** EnumOptions allowAlias. */ + public allowAlias: boolean; - /** - * Verifies a StreamingPullResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** EnumOptions deprecated. */ + public deprecated: boolean; - /** - * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns StreamingPullResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse; + /** EnumOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. - * @param message StreamingPullResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.StreamingPullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a new EnumOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumOptions instance + */ + public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; - /** - * Converts this StreamingPullResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a CreateSnapshotRequest. */ - interface ICreateSnapshotRequest { + /** + * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; - /** CreateSnapshotRequest name */ - name?: (string|null); + /** + * Decodes an EnumOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; - /** CreateSnapshotRequest subscription */ - subscription?: (string|null); + /** + * Verifies an EnumOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** CreateSnapshotRequest labels */ - labels?: ({ [k: string]: string }|null); - } + /** + * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; - /** Represents a CreateSnapshotRequest. */ - class CreateSnapshotRequest implements ICreateSnapshotRequest { + /** + * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. + * @param message EnumOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Constructs a new CreateSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ICreateSnapshotRequest); + /** + * Converts this EnumOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** CreateSnapshotRequest name. */ - public name: string; + /** Properties of an EnumValueOptions. */ + interface IEnumValueOptions { - /** CreateSnapshotRequest subscription. */ - public subscription: string; + /** EnumValueOptions deprecated */ + deprecated?: (boolean|null); - /** CreateSnapshotRequest labels. */ - public labels: { [k: string]: string }; + /** EnumValueOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } - /** - * Creates a new CreateSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns CreateSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.ICreateSnapshotRequest): google.pubsub.v1.CreateSnapshotRequest; + /** Represents an EnumValueOptions. */ + class EnumValueOptions implements IEnumValueOptions { - /** - * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @param message CreateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new EnumValueOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueOptions); - /** - * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @param message CreateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** EnumValueOptions deprecated. */ + public deprecated: boolean; - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CreateSnapshotRequest; + /** EnumValueOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CreateSnapshotRequest; + /** + * Creates a new EnumValueOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueOptions instance + */ + public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; - /** - * Verifies a CreateSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CreateSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CreateSnapshotRequest; + /** + * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. - * @param message CreateSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.CreateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes an EnumValueOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; - /** - * Converts this CreateSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; - /** Properties of an UpdateSnapshotRequest. */ - interface IUpdateSnapshotRequest { + /** + * Verifies an EnumValueOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** UpdateSnapshotRequest snapshot */ - snapshot?: (google.pubsub.v1.ISnapshot|null); + /** + * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; - /** UpdateSnapshotRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); - } + /** + * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. + * @param message EnumValueOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents an UpdateSnapshotRequest. */ - class UpdateSnapshotRequest implements IUpdateSnapshotRequest { + /** + * Converts this EnumValueOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new UpdateSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IUpdateSnapshotRequest); + /** Properties of a ServiceOptions. */ + interface IServiceOptions { - /** UpdateSnapshotRequest snapshot. */ - public snapshot?: (google.pubsub.v1.ISnapshot|null); + /** ServiceOptions deprecated */ + deprecated?: (boolean|null); - /** UpdateSnapshotRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); + /** ServiceOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** - * Creates a new UpdateSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns UpdateSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IUpdateSnapshotRequest): google.pubsub.v1.UpdateSnapshotRequest; + /** ServiceOptions .google.api.defaultHost */ + ".google.api.defaultHost"?: (string|null); - /** - * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @param message UpdateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** ServiceOptions .google.api.oauthScopes */ + ".google.api.oauthScopes"?: (string|null); + } - /** - * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @param message UpdateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a ServiceOptions. */ + class ServiceOptions implements IServiceOptions { - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSnapshotRequest; + /** + * Constructs a new ServiceOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceOptions); - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSnapshotRequest; + /** ServiceOptions deprecated. */ + public deprecated: boolean; - /** - * Verifies an UpdateSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** ServiceOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UpdateSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSnapshotRequest; + /** + * Creates a new ServiceOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceOptions instance + */ + public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; - /** - * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. - * @param message UpdateSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.UpdateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this UpdateSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a Snapshot. */ - interface ISnapshot { + /** + * Decodes a ServiceOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; - /** Snapshot name */ - name?: (string|null); + /** + * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; - /** Snapshot topic */ - topic?: (string|null); + /** + * Verifies a ServiceOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Snapshot expireTime */ - expireTime?: (google.protobuf.ITimestamp|null); + /** + * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; - /** Snapshot labels */ - labels?: ({ [k: string]: string }|null); - } + /** + * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. + * @param message ServiceOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents a Snapshot. */ - class Snapshot implements ISnapshot { + /** + * Converts this ServiceOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new Snapshot. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISnapshot); + /** Properties of a MethodOptions. */ + interface IMethodOptions { - /** Snapshot name. */ - public name: string; + /** MethodOptions deprecated */ + deprecated?: (boolean|null); - /** Snapshot topic. */ - public topic: string; + /** MethodOptions idempotencyLevel */ + idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel|null); - /** Snapshot expireTime. */ - public expireTime?: (google.protobuf.ITimestamp|null); + /** MethodOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** Snapshot labels. */ - public labels: { [k: string]: string }; + /** MethodOptions .google.api.http */ + ".google.api.http"?: (google.api.IHttpRule|null); - /** - * Creates a new Snapshot instance using the specified properties. - * @param [properties] Properties to set - * @returns Snapshot instance - */ - public static create(properties?: google.pubsub.v1.ISnapshot): google.pubsub.v1.Snapshot; + /** MethodOptions .google.api.methodSignature */ + ".google.api.methodSignature"?: (string[]|null); + } - /** - * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. - * @param message Snapshot message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a MethodOptions. */ + class MethodOptions implements IMethodOptions { - /** - * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. - * @param message Snapshot message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new MethodOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodOptions); - /** - * Decodes a Snapshot message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Snapshot - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Snapshot; + /** MethodOptions deprecated. */ + public deprecated: boolean; - /** - * Decodes a Snapshot message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Snapshot - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Snapshot; + /** MethodOptions idempotencyLevel. */ + public idempotencyLevel: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel); - /** - * Verifies a Snapshot message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** MethodOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Snapshot - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Snapshot; + /** + * Creates a new MethodOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodOptions instance + */ + public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; - /** - * Creates a plain object from a Snapshot message. Also converts values to other types if specified. - * @param message Snapshot - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.Snapshot, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this Snapshot to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; + + /** + * Decodes a MethodOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; - /** Properties of a GetSnapshotRequest. */ - interface IGetSnapshotRequest { + /** + * Verifies a MethodOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** GetSnapshotRequest snapshot */ - snapshot?: (string|null); - } + /** + * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; - /** Represents a GetSnapshotRequest. */ - class GetSnapshotRequest implements IGetSnapshotRequest { + /** + * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. + * @param message MethodOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Constructs a new GetSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IGetSnapshotRequest); + /** + * Converts this MethodOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** GetSnapshotRequest snapshot. */ - public snapshot: string; + namespace MethodOptions { - /** - * Creates a new GetSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns GetSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IGetSnapshotRequest): google.pubsub.v1.GetSnapshotRequest; + /** IdempotencyLevel enum. */ + enum IdempotencyLevel { + IDEMPOTENCY_UNKNOWN = 0, + NO_SIDE_EFFECTS = 1, + IDEMPOTENT = 2 + } + } - /** - * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @param message GetSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** Properties of an UninterpretedOption. */ + interface IUninterpretedOption { - /** - * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @param message GetSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** UninterpretedOption name */ + name?: (google.protobuf.UninterpretedOption.INamePart[]|null); - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSnapshotRequest; + /** UninterpretedOption identifierValue */ + identifierValue?: (string|null); - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSnapshotRequest; + /** UninterpretedOption positiveIntValue */ + positiveIntValue?: (number|Long|string|null); - /** - * Verifies a GetSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** UninterpretedOption negativeIntValue */ + negativeIntValue?: (number|Long|string|null); - /** - * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSnapshotRequest; + /** UninterpretedOption doubleValue */ + doubleValue?: (number|null); - /** - * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. - * @param message GetSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.GetSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** UninterpretedOption stringValue */ + stringValue?: (Uint8Array|string|null); - /** - * Converts this GetSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** UninterpretedOption aggregateValue */ + aggregateValue?: (string|null); + } - /** Properties of a ListSnapshotsRequest. */ - interface IListSnapshotsRequest { + /** Represents an UninterpretedOption. */ + class UninterpretedOption implements IUninterpretedOption { - /** ListSnapshotsRequest project */ - project?: (string|null); + /** + * Constructs a new UninterpretedOption. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IUninterpretedOption); - /** ListSnapshotsRequest pageSize */ - pageSize?: (number|null); + /** UninterpretedOption name. */ + public name: google.protobuf.UninterpretedOption.INamePart[]; - /** ListSnapshotsRequest pageToken */ - pageToken?: (string|null); - } + /** UninterpretedOption identifierValue. */ + public identifierValue: string; - /** Represents a ListSnapshotsRequest. */ - class ListSnapshotsRequest implements IListSnapshotsRequest { + /** UninterpretedOption positiveIntValue. */ + public positiveIntValue: (number|Long|string); - /** - * Constructs a new ListSnapshotsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSnapshotsRequest); + /** UninterpretedOption negativeIntValue. */ + public negativeIntValue: (number|Long|string); - /** ListSnapshotsRequest project. */ - public project: string; + /** UninterpretedOption doubleValue. */ + public doubleValue: number; - /** ListSnapshotsRequest pageSize. */ - public pageSize: number; + /** UninterpretedOption stringValue. */ + public stringValue: (Uint8Array|string); - /** ListSnapshotsRequest pageToken. */ - public pageToken: string; + /** UninterpretedOption aggregateValue. */ + public aggregateValue: string; - /** - * Creates a new ListSnapshotsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSnapshotsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListSnapshotsRequest): google.pubsub.v1.ListSnapshotsRequest; + /** + * Creates a new UninterpretedOption instance using the specified properties. + * @param [properties] Properties to set + * @returns UninterpretedOption instance + */ + public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; - /** - * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. - * @param message ListSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. - * @param message ListSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsRequest; + /** + * Decodes an UninterpretedOption message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; - /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsRequest; + /** + * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; - /** - * Verifies a ListSnapshotsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Verifies an UninterpretedOption message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UninterpretedOption + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; - /** - * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSnapshotsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsRequest; + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @param message UninterpretedOption + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. - * @param message ListSnapshotsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Converts this UninterpretedOption to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Converts this ListSnapshotsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + namespace UninterpretedOption { - /** Properties of a ListSnapshotsResponse. */ - interface IListSnapshotsResponse { + /** Properties of a NamePart. */ + interface INamePart { - /** ListSnapshotsResponse snapshots */ - snapshots?: (google.pubsub.v1.ISnapshot[]|null); + /** NamePart namePart */ + namePart: string; - /** ListSnapshotsResponse nextPageToken */ - nextPageToken?: (string|null); + /** NamePart isExtension */ + isExtension: boolean; } - /** Represents a ListSnapshotsResponse. */ - class ListSnapshotsResponse implements IListSnapshotsResponse { + /** Represents a NamePart. */ + class NamePart implements INamePart { /** - * Constructs a new ListSnapshotsResponse. + * Constructs a new NamePart. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListSnapshotsResponse); + constructor(properties?: google.protobuf.UninterpretedOption.INamePart); - /** ListSnapshotsResponse snapshots. */ - public snapshots: google.pubsub.v1.ISnapshot[]; + /** NamePart namePart. */ + public namePart: string; - /** ListSnapshotsResponse nextPageToken. */ - public nextPageToken: string; + /** NamePart isExtension. */ + public isExtension: boolean; /** - * Creates a new ListSnapshotsResponse instance using the specified properties. + * Creates a new NamePart instance using the specified properties. * @param [properties] Properties to set - * @returns ListSnapshotsResponse instance + * @returns NamePart instance */ - public static create(properties?: google.pubsub.v1.IListSnapshotsResponse): google.pubsub.v1.ListSnapshotsResponse; + public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; /** - * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. - * @param message ListSnapshotsResponse message or plain object to encode + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. - * @param message ListSnapshotsResponse message or plain object to encode + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer. + * Decodes a NamePart message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListSnapshotsResponse + * @returns NamePart * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. + * Decodes a NamePart message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListSnapshotsResponse + * @returns NamePart * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; /** - * Verifies a ListSnapshotsResponse message. + * Verifies a NamePart message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListSnapshotsResponse + * @returns NamePart */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsResponse; + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; /** - * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. - * @param message ListSnapshotsResponse + * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * @param message NamePart * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListSnapshotsResponse to JSON. + * Converts this NamePart to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of a DeleteSnapshotRequest. */ - interface IDeleteSnapshotRequest { + /** Properties of a SourceCodeInfo. */ + interface ISourceCodeInfo { - /** DeleteSnapshotRequest snapshot */ - snapshot?: (string|null); - } + /** SourceCodeInfo location */ + location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); + } - /** Represents a DeleteSnapshotRequest. */ - class DeleteSnapshotRequest implements IDeleteSnapshotRequest { + /** Represents a SourceCodeInfo. */ + class SourceCodeInfo implements ISourceCodeInfo { - /** - * Constructs a new DeleteSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeleteSnapshotRequest); + /** + * Constructs a new SourceCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ISourceCodeInfo); - /** DeleteSnapshotRequest snapshot. */ - public snapshot: string; + /** SourceCodeInfo location. */ + public location: google.protobuf.SourceCodeInfo.ILocation[]; - /** - * Creates a new DeleteSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteSnapshotRequest): google.pubsub.v1.DeleteSnapshotRequest; + /** + * Creates a new SourceCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns SourceCodeInfo instance + */ + public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; - /** - * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @param message DeleteSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @param message DeleteSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSnapshotRequest; + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSnapshotRequest; + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; - /** - * Verifies a DeleteSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Verifies a SourceCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSnapshotRequest; + /** + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SourceCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; + + /** + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. + * @param message SourceCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SourceCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace SourceCodeInfo { - /** - * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. - * @param message DeleteSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeleteSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Properties of a Location. */ + interface ILocation { - /** - * Converts this DeleteSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Location path */ + path?: (number[]|null); - /** Properties of a SeekRequest. */ - interface ISeekRequest { + /** Location span */ + span?: (number[]|null); - /** SeekRequest subscription */ - subscription?: (string|null); + /** Location leadingComments */ + leadingComments?: (string|null); - /** SeekRequest time */ - time?: (google.protobuf.ITimestamp|null); + /** Location trailingComments */ + trailingComments?: (string|null); - /** SeekRequest snapshot */ - snapshot?: (string|null); + /** Location leadingDetachedComments */ + leadingDetachedComments?: (string[]|null); } - /** Represents a SeekRequest. */ - class SeekRequest implements ISeekRequest { + /** Represents a Location. */ + class Location implements ILocation { /** - * Constructs a new SeekRequest. + * Constructs a new Location. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.ISeekRequest); + constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); - /** SeekRequest subscription. */ - public subscription: string; + /** Location path. */ + public path: number[]; - /** SeekRequest time. */ - public time?: (google.protobuf.ITimestamp|null); + /** Location span. */ + public span: number[]; - /** SeekRequest snapshot. */ - public snapshot: string; + /** Location leadingComments. */ + public leadingComments: string; - /** SeekRequest target. */ - public target?: ("time"|"snapshot"); + /** Location trailingComments. */ + public trailingComments: string; + + /** Location leadingDetachedComments. */ + public leadingDetachedComments: string[]; /** - * Creates a new SeekRequest instance using the specified properties. + * Creates a new Location instance using the specified properties. * @param [properties] Properties to set - * @returns SeekRequest instance + * @returns Location instance */ - public static create(properties?: google.pubsub.v1.ISeekRequest): google.pubsub.v1.SeekRequest; + public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; /** - * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @param message SeekRequest message or plain object to encode + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @param message SeekRequest message or plain object to encode + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a SeekRequest message from the specified reader or buffer. + * Decodes a Location message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns SeekRequest + * @returns Location * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; /** - * Decodes a SeekRequest message from the specified reader or buffer, length delimited. + * Decodes a Location message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns SeekRequest + * @returns Location * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; /** - * Verifies a SeekRequest message. + * Verifies a Location message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. + * Creates a Location message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns SeekRequest + * @returns Location */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekRequest; + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; /** - * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. - * @param message SeekRequest + * Creates a plain object from a Location message. Also converts values to other types if specified. + * @param message Location * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.SeekRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this SeekRequest to JSON. + * Converts this Location to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of a SeekResponse. */ - interface ISeekResponse { + /** Properties of a GeneratedCodeInfo. */ + interface IGeneratedCodeInfo { + + /** GeneratedCodeInfo annotation */ + annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); + } + + /** Represents a GeneratedCodeInfo. */ + class GeneratedCodeInfo implements IGeneratedCodeInfo { + + /** + * Constructs a new GeneratedCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IGeneratedCodeInfo); + + /** GeneratedCodeInfo annotation. */ + public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; + + /** + * Creates a new GeneratedCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns GeneratedCodeInfo instance + */ + public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; + + /** + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; + + /** + * Verifies a GeneratedCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GeneratedCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; + + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @param message GeneratedCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GeneratedCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace GeneratedCodeInfo { + + /** Properties of an Annotation. */ + interface IAnnotation { + + /** Annotation path */ + path?: (number[]|null); + + /** Annotation sourceFile */ + sourceFile?: (string|null); + + /** Annotation begin */ + begin?: (number|null); + + /** Annotation end */ + end?: (number|null); } - /** Represents a SeekResponse. */ - class SeekResponse implements ISeekResponse { + /** Represents an Annotation. */ + class Annotation implements IAnnotation { /** - * Constructs a new SeekResponse. + * Constructs a new Annotation. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.ISeekResponse); + constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); + + /** Annotation path. */ + public path: number[]; + + /** Annotation sourceFile. */ + public sourceFile: string; + + /** Annotation begin. */ + public begin: number; + + /** Annotation end. */ + public end: number; /** - * Creates a new SeekResponse instance using the specified properties. + * Creates a new Annotation instance using the specified properties. * @param [properties] Properties to set - * @returns SeekResponse instance + * @returns Annotation instance */ - public static create(properties?: google.pubsub.v1.ISeekResponse): google.pubsub.v1.SeekResponse; + public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; /** - * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @param message SeekResponse message or plain object to encode + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @param message SeekResponse message or plain object to encode + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a SeekResponse message from the specified reader or buffer. + * Decodes an Annotation message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns SeekResponse + * @returns Annotation * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; /** - * Decodes a SeekResponse message from the specified reader or buffer, length delimited. + * Decodes an Annotation message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns SeekResponse + * @returns Annotation * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; /** - * Verifies a SeekResponse message. + * Verifies an Annotation message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns SeekResponse + * @returns Annotation */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekResponse; + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; /** - * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. - * @param message SeekResponse + * Creates a plain object from an Annotation message. Also converts values to other types if specified. + * @param message Annotation * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.SeekResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this SeekResponse to JSON. + * Converts this Annotation to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } } - } - /** Namespace api. */ - namespace api { + /** Properties of a Duration. */ + interface IDuration { - /** Properties of a Http. */ - interface IHttp { + /** Duration seconds */ + seconds?: (number|Long|string|null); - /** Http rules */ - rules?: (google.api.IHttpRule[]|null); + /** Duration nanos */ + nanos?: (number|null); + } - /** Http fullyDecodeReservedExpansion */ - fullyDecodeReservedExpansion?: (boolean|null); + /** Represents a Duration. */ + class Duration implements IDuration { + + /** + * Constructs a new Duration. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDuration); + + /** Duration seconds. */ + public seconds: (number|Long|string); + + /** Duration nanos. */ + public nanos: number; + + /** + * Creates a new Duration instance using the specified properties. + * @param [properties] Properties to set + * @returns Duration instance + */ + public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; + + /** + * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Duration message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; + + /** + * Decodes a Duration message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; + + /** + * Verifies a Duration message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Duration + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; + + /** + * Creates a plain object from a Duration message. Also converts values to other types if specified. + * @param message Duration + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Duration to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; } - /** Represents a Http. */ - class Http implements IHttp { + /** Properties of an Empty. */ + interface IEmpty { + } + + /** Represents an Empty. */ + class Empty implements IEmpty { /** - * Constructs a new Http. + * Constructs a new Empty. * @param [properties] Properties to set */ - constructor(properties?: google.api.IHttp); + constructor(properties?: google.protobuf.IEmpty); - /** Http rules. */ - public rules: google.api.IHttpRule[]; + /** + * Creates a new Empty instance using the specified properties. + * @param [properties] Properties to set + * @returns Empty instance + */ + public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; - /** Http fullyDecodeReservedExpansion. */ - public fullyDecodeReservedExpansion: boolean; + /** + * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Creates a new Http instance using the specified properties. + * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an Empty message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; + + /** + * Decodes an Empty message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; + + /** + * Verifies an Empty message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an Empty message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Empty + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; + + /** + * Creates a plain object from an Empty message. Also converts values to other types if specified. + * @param message Empty + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Empty to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a FieldMask. */ + interface IFieldMask { + + /** FieldMask paths */ + paths?: (string[]|null); + } + + /** Represents a FieldMask. */ + class FieldMask implements IFieldMask { + + /** + * Constructs a new FieldMask. * @param [properties] Properties to set - * @returns Http instance */ - public static create(properties?: google.api.IHttp): google.api.Http; + constructor(properties?: google.protobuf.IFieldMask); + + /** FieldMask paths. */ + public paths: string[]; /** - * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @param message Http message or plain object to encode + * Creates a new FieldMask instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldMask instance + */ + public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; + + /** + * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @param message Http message or plain object to encode + * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Http message from the specified reader or buffer. + * Decodes a FieldMask message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Http + * @returns FieldMask * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; /** - * Decodes a Http message from the specified reader or buffer, length delimited. + * Decodes a FieldMask message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Http + * @returns FieldMask * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; /** - * Verifies a Http message. + * Verifies a FieldMask message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Http message from a plain object. Also converts values to their respective internal types. + * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Http + * @returns FieldMask */ - public static fromObject(object: { [k: string]: any }): google.api.Http; + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; /** - * Creates a plain object from a Http message. Also converts values to other types if specified. - * @param message Http + * Creates a plain object from a FieldMask message. Also converts values to other types if specified. + * @param message FieldMask * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Http to JSON. + * Converts this FieldMask to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a HttpRule. */ - interface IHttpRule { - - /** HttpRule selector */ - selector?: (string|null); - - /** HttpRule get */ - get?: (string|null); - - /** HttpRule put */ - put?: (string|null); - - /** HttpRule post */ - post?: (string|null); - - /** HttpRule delete */ - "delete"?: (string|null); - - /** HttpRule patch */ - patch?: (string|null); - - /** HttpRule custom */ - custom?: (google.api.ICustomHttpPattern|null); - - /** HttpRule body */ - body?: (string|null); + /** Properties of a Timestamp. */ + interface ITimestamp { - /** HttpRule responseBody */ - responseBody?: (string|null); + /** Timestamp seconds */ + seconds?: (number|Long|string|null); - /** HttpRule additionalBindings */ - additionalBindings?: (google.api.IHttpRule[]|null); + /** Timestamp nanos */ + nanos?: (number|null); } - /** Represents a HttpRule. */ - class HttpRule implements IHttpRule { + /** Represents a Timestamp. */ + class Timestamp implements ITimestamp { /** - * Constructs a new HttpRule. + * Constructs a new Timestamp. * @param [properties] Properties to set */ - constructor(properties?: google.api.IHttpRule); - - /** HttpRule selector. */ - public selector: string; - - /** HttpRule get. */ - public get: string; - - /** HttpRule put. */ - public put: string; - - /** HttpRule post. */ - public post: string; - - /** HttpRule delete. */ - public delete: string; - - /** HttpRule patch. */ - public patch: string; - - /** HttpRule custom. */ - public custom?: (google.api.ICustomHttpPattern|null); - - /** HttpRule body. */ - public body: string; - - /** HttpRule responseBody. */ - public responseBody: string; + constructor(properties?: google.protobuf.ITimestamp); - /** HttpRule additionalBindings. */ - public additionalBindings: google.api.IHttpRule[]; + /** Timestamp seconds. */ + public seconds: (number|Long|string); - /** HttpRule pattern. */ - public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); + /** Timestamp nanos. */ + public nanos: number; /** - * Creates a new HttpRule instance using the specified properties. + * Creates a new Timestamp instance using the specified properties. * @param [properties] Properties to set - * @returns HttpRule instance + * @returns Timestamp instance */ - public static create(properties?: google.api.IHttpRule): google.api.HttpRule; + public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; /** - * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @param message HttpRule message or plain object to encode + * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @param message HttpRule message or plain object to encode + * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a HttpRule message from the specified reader or buffer. + * Decodes a Timestamp message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns HttpRule + * @returns Timestamp * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; /** - * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * Decodes a Timestamp message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns HttpRule + * @returns Timestamp * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; /** - * Verifies a HttpRule message. + * Verifies a Timestamp message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns HttpRule + * @returns Timestamp */ - public static fromObject(object: { [k: string]: any }): google.api.HttpRule; + public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; /** - * Creates a plain object from a HttpRule message. Also converts values to other types if specified. - * @param message HttpRule + * Creates a plain object from a Timestamp message. Also converts values to other types if specified. + * @param message Timestamp * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this HttpRule to JSON. + * Converts this Timestamp to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of a CustomHttpPattern. */ - interface ICustomHttpPattern { + /** Namespace pubsub. */ + namespace pubsub { - /** CustomHttpPattern kind */ - kind?: (string|null); + /** Namespace v1. */ + namespace v1 { - /** CustomHttpPattern path */ - path?: (string|null); - } + /** Represents a Publisher */ + class Publisher extends $protobuf.rpc.Service { - /** Represents a CustomHttpPattern. */ - class CustomHttpPattern implements ICustomHttpPattern { + /** + * Constructs a new Publisher service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - /** - * Constructs a new CustomHttpPattern. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.ICustomHttpPattern); + /** + * Creates new Publisher service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Publisher; - /** CustomHttpPattern kind. */ - public kind: string; + /** + * Calls CreateTopic. + * @param request Topic message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public createTopic(request: google.pubsub.v1.ITopic, callback: google.pubsub.v1.Publisher.CreateTopicCallback): void; - /** CustomHttpPattern path. */ - public path: string; + /** + * Calls CreateTopic. + * @param request Topic message or plain object + * @returns Promise + */ + public createTopic(request: google.pubsub.v1.ITopic): Promise; - /** - * Creates a new CustomHttpPattern instance using the specified properties. - * @param [properties] Properties to set - * @returns CustomHttpPattern instance - */ - public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; + /** + * Calls UpdateTopic. + * @param request UpdateTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest, callback: google.pubsub.v1.Publisher.UpdateTopicCallback): void; - /** - * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @param message CustomHttpPattern message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Calls UpdateTopic. + * @param request UpdateTopicRequest message or plain object + * @returns Promise + */ + public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest): Promise; - /** - * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @param message CustomHttpPattern message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Calls Publish. + * @param request PublishRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PublishResponse + */ + public publish(request: google.pubsub.v1.IPublishRequest, callback: google.pubsub.v1.Publisher.PublishCallback): void; + + /** + * Calls Publish. + * @param request PublishRequest message or plain object + * @returns Promise + */ + public publish(request: google.pubsub.v1.IPublishRequest): Promise; + + /** + * Calls GetTopic. + * @param request GetTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Topic + */ + public getTopic(request: google.pubsub.v1.IGetTopicRequest, callback: google.pubsub.v1.Publisher.GetTopicCallback): void; + + /** + * Calls GetTopic. + * @param request GetTopicRequest message or plain object + * @returns Promise + */ + public getTopic(request: google.pubsub.v1.IGetTopicRequest): Promise; - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; + /** + * Calls ListTopics. + * @param request ListTopicsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicsResponse + */ + public listTopics(request: google.pubsub.v1.IListTopicsRequest, callback: google.pubsub.v1.Publisher.ListTopicsCallback): void; - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; + /** + * Calls ListTopics. + * @param request ListTopicsRequest message or plain object + * @returns Promise + */ + public listTopics(request: google.pubsub.v1.IListTopicsRequest): Promise; - /** - * Verifies a CustomHttpPattern message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Calls ListTopicSubscriptions. + * @param request ListTopicSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse + */ + public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest, callback: google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback): void; - /** - * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CustomHttpPattern - */ - public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; + /** + * Calls ListTopicSubscriptions. + * @param request ListTopicSubscriptionsRequest message or plain object + * @returns Promise + */ + public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest): Promise; - /** - * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. - * @param message CustomHttpPattern - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Calls ListTopicSnapshots. + * @param request ListTopicSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse + */ + public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest, callback: google.pubsub.v1.Publisher.ListTopicSnapshotsCallback): void; - /** - * Converts this CustomHttpPattern to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Calls ListTopicSnapshots. + * @param request ListTopicSnapshotsRequest message or plain object + * @returns Promise + */ + public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest): Promise; - /** FieldBehavior enum. */ - enum FieldBehavior { - FIELD_BEHAVIOR_UNSPECIFIED = 0, - OPTIONAL = 1, - REQUIRED = 2, - OUTPUT_ONLY = 3, - INPUT_ONLY = 4, - IMMUTABLE = 5 - } + /** + * Calls DeleteTopic. + * @param request DeleteTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest, callback: google.pubsub.v1.Publisher.DeleteTopicCallback): void; - /** Properties of a ResourceDescriptor. */ - interface IResourceDescriptor { + /** + * Calls DeleteTopic. + * @param request DeleteTopicRequest message or plain object + * @returns Promise + */ + public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest): Promise; + } - /** ResourceDescriptor type */ - type?: (string|null); + namespace Publisher { - /** ResourceDescriptor pattern */ - pattern?: (string[]|null); + /** + * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type CreateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; - /** ResourceDescriptor nameField */ - nameField?: (string|null); + /** + * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type UpdateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; - /** ResourceDescriptor history */ - history?: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History|null); + /** + * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * @param error Error, if any + * @param [response] PublishResponse + */ + type PublishCallback = (error: (Error|null), response?: google.pubsub.v1.PublishResponse) => void; - /** ResourceDescriptor plural */ - plural?: (string|null); + /** + * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * @param error Error, if any + * @param [response] Topic + */ + type GetTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; - /** ResourceDescriptor singular */ - singular?: (string|null); - } + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * @param error Error, if any + * @param [response] ListTopicsResponse + */ + type ListTopicsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicsResponse) => void; - /** Represents a ResourceDescriptor. */ - class ResourceDescriptor implements IResourceDescriptor { + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * @param error Error, if any + * @param [response] ListTopicSubscriptionsResponse + */ + type ListTopicSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSubscriptionsResponse) => void; - /** - * Constructs a new ResourceDescriptor. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IResourceDescriptor); + /** + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * @param error Error, if any + * @param [response] ListTopicSnapshotsResponse + */ + type ListTopicSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSnapshotsResponse) => void; - /** ResourceDescriptor type. */ - public type: string; + /** + * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + } - /** ResourceDescriptor pattern. */ - public pattern: string[]; + /** Properties of a MessageStoragePolicy. */ + interface IMessageStoragePolicy { - /** ResourceDescriptor nameField. */ - public nameField: string; + /** MessageStoragePolicy allowedPersistenceRegions */ + allowedPersistenceRegions?: (string[]|null); + } - /** ResourceDescriptor history. */ - public history: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History); + /** Represents a MessageStoragePolicy. */ + class MessageStoragePolicy implements IMessageStoragePolicy { - /** ResourceDescriptor plural. */ - public plural: string; + /** + * Constructs a new MessageStoragePolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); - /** ResourceDescriptor singular. */ - public singular: string; + /** MessageStoragePolicy allowedPersistenceRegions. */ + public allowedPersistenceRegions: string[]; - /** - * Creates a new ResourceDescriptor instance using the specified properties. - * @param [properties] Properties to set - * @returns ResourceDescriptor instance - */ - public static create(properties?: google.api.IResourceDescriptor): google.api.ResourceDescriptor; + /** + * Creates a new MessageStoragePolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageStoragePolicy instance + */ + public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; - /** - * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @param message ResourceDescriptor message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @param message ResourceDescriptor message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceDescriptor; + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceDescriptor; + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; - /** - * Verifies a ResourceDescriptor message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Verifies a MessageStoragePolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ResourceDescriptor - */ - public static fromObject(object: { [k: string]: any }): google.api.ResourceDescriptor; + /** + * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageStoragePolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; - /** - * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. - * @param message ResourceDescriptor - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.ResourceDescriptor, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * @param message MessageStoragePolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Converts this ResourceDescriptor to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Converts this MessageStoragePolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - namespace ResourceDescriptor { + /** Properties of a Topic. */ + interface ITopic { - /** History enum. */ - enum History { - HISTORY_UNSPECIFIED = 0, - ORIGINALLY_SINGLE_PATTERN = 1, - FUTURE_MULTI_PATTERN = 2 - } - } + /** Topic name */ + name?: (string|null); - /** Properties of a ResourceReference. */ - interface IResourceReference { + /** Topic labels */ + labels?: ({ [k: string]: string }|null); - /** ResourceReference type */ - type?: (string|null); + /** Topic messageStoragePolicy */ + messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); - /** ResourceReference childType */ - childType?: (string|null); - } + /** Topic kmsKeyName */ + kmsKeyName?: (string|null); + } - /** Represents a ResourceReference. */ - class ResourceReference implements IResourceReference { + /** Represents a Topic. */ + class Topic implements ITopic { - /** - * Constructs a new ResourceReference. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IResourceReference); + /** + * Constructs a new Topic. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ITopic); - /** ResourceReference type. */ - public type: string; + /** Topic name. */ + public name: string; - /** ResourceReference childType. */ - public childType: string; + /** Topic labels. */ + public labels: { [k: string]: string }; - /** - * Creates a new ResourceReference instance using the specified properties. - * @param [properties] Properties to set - * @returns ResourceReference instance - */ - public static create(properties?: google.api.IResourceReference): google.api.ResourceReference; + /** Topic messageStoragePolicy. */ + public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); - /** - * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. - * @param message ResourceReference message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + /** Topic kmsKeyName. */ + public kmsKeyName: string; - /** - * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. - * @param message ResourceReference message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new Topic instance using the specified properties. + * @param [properties] Properties to set + * @returns Topic instance + */ + public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; - /** - * Decodes a ResourceReference message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceReference; + /** + * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a ResourceReference message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceReference; + /** + * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a ResourceReference message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a Topic message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; - /** - * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ResourceReference - */ - public static fromObject(object: { [k: string]: any }): google.api.ResourceReference; + /** + * Decodes a Topic message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; - /** - * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. - * @param message ResourceReference - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.ResourceReference, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Verifies a Topic message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Converts this ResourceReference to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } + /** + * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Topic + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; - /** Namespace protobuf. */ - namespace protobuf { + /** + * Creates a plain object from a Topic message. Also converts values to other types if specified. + * @param message Topic + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Properties of a FileDescriptorSet. */ - interface IFileDescriptorSet { + /** + * Converts this Topic to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** FileDescriptorSet file */ - file?: (google.protobuf.IFileDescriptorProto[]|null); - } + /** Properties of a PubsubMessage. */ + interface IPubsubMessage { - /** Represents a FileDescriptorSet. */ - class FileDescriptorSet implements IFileDescriptorSet { + /** PubsubMessage data */ + data?: (Uint8Array|string|null); - /** - * Constructs a new FileDescriptorSet. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileDescriptorSet); + /** PubsubMessage attributes */ + attributes?: ({ [k: string]: string }|null); - /** FileDescriptorSet file. */ - public file: google.protobuf.IFileDescriptorProto[]; + /** PubsubMessage messageId */ + messageId?: (string|null); - /** - * Creates a new FileDescriptorSet instance using the specified properties. - * @param [properties] Properties to set - * @returns FileDescriptorSet instance - */ - public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; + /** PubsubMessage publishTime */ + publishTime?: (google.protobuf.ITimestamp|null); - /** - * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param message FileDescriptorSet message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + /** PubsubMessage orderingKey */ + orderingKey?: (string|null); + } - /** - * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param message FileDescriptorSet message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a PubsubMessage. */ + class PubsubMessage implements IPubsubMessage { - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; + /** + * Constructs a new PubsubMessage. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPubsubMessage); - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; + /** PubsubMessage data. */ + public data: (Uint8Array|string); - /** - * Verifies a FileDescriptorSet message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** PubsubMessage attributes. */ + public attributes: { [k: string]: string }; - /** - * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileDescriptorSet - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; + /** PubsubMessage messageId. */ + public messageId: string; - /** - * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. - * @param message FileDescriptorSet - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** PubsubMessage publishTime. */ + public publishTime?: (google.protobuf.ITimestamp|null); - /** - * Converts this FileDescriptorSet to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** PubsubMessage orderingKey. */ + public orderingKey: string; - /** Properties of a FileDescriptorProto. */ - interface IFileDescriptorProto { + /** + * Creates a new PubsubMessage instance using the specified properties. + * @param [properties] Properties to set + * @returns PubsubMessage instance + */ + public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; - /** FileDescriptorProto name */ - name?: (string|null); + /** + * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; - /** FileDescriptorProto package */ - "package"?: (string|null); + /** + * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; - /** FileDescriptorProto dependency */ - dependency?: (string[]|null); + /** + * Decodes a PubsubMessage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; - /** FileDescriptorProto publicDependency */ - publicDependency?: (number[]|null); + /** + * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; - /** FileDescriptorProto weakDependency */ - weakDependency?: (number[]|null); + /** + * Verifies a PubsubMessage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FileDescriptorProto messageType */ - messageType?: (google.protobuf.IDescriptorProto[]|null); + /** + * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PubsubMessage + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; - /** FileDescriptorProto enumType */ - enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + /** + * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * @param message PubsubMessage + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** FileDescriptorProto service */ - service?: (google.protobuf.IServiceDescriptorProto[]|null); + /** + * Converts this PubsubMessage to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** FileDescriptorProto extension */ - extension?: (google.protobuf.IFieldDescriptorProto[]|null); + /** Properties of a GetTopicRequest. */ + interface IGetTopicRequest { - /** FileDescriptorProto options */ - options?: (google.protobuf.IFileOptions|null); + /** GetTopicRequest topic */ + topic?: (string|null); + } - /** FileDescriptorProto sourceCodeInfo */ - sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + /** Represents a GetTopicRequest. */ + class GetTopicRequest implements IGetTopicRequest { - /** FileDescriptorProto syntax */ - syntax?: (string|null); - } + /** + * Constructs a new GetTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetTopicRequest); - /** Represents a FileDescriptorProto. */ - class FileDescriptorProto implements IFileDescriptorProto { + /** GetTopicRequest topic. */ + public topic: string; - /** - * Constructs a new FileDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileDescriptorProto); + /** + * Creates a new GetTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; - /** FileDescriptorProto name. */ - public name: string; + /** + * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** FileDescriptorProto package. */ - public package: string; + /** + * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** FileDescriptorProto dependency. */ - public dependency: string[]; + /** + * Decodes a GetTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; - /** FileDescriptorProto publicDependency. */ - public publicDependency: number[]; + /** + * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; - /** FileDescriptorProto weakDependency. */ - public weakDependency: number[]; + /** + * Verifies a GetTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FileDescriptorProto messageType. */ - public messageType: google.protobuf.IDescriptorProto[]; + /** + * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; - /** FileDescriptorProto enumType. */ - public enumType: google.protobuf.IEnumDescriptorProto[]; + /** + * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * @param message GetTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** FileDescriptorProto service. */ - public service: google.protobuf.IServiceDescriptorProto[]; + /** + * Converts this GetTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** FileDescriptorProto extension. */ - public extension: google.protobuf.IFieldDescriptorProto[]; + /** Properties of an UpdateTopicRequest. */ + interface IUpdateTopicRequest { - /** FileDescriptorProto options. */ - public options?: (google.protobuf.IFileOptions|null); + /** UpdateTopicRequest topic */ + topic?: (google.pubsub.v1.ITopic|null); - /** FileDescriptorProto sourceCodeInfo. */ - public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + /** UpdateTopicRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } - /** FileDescriptorProto syntax. */ - public syntax: string; + /** Represents an UpdateTopicRequest. */ + class UpdateTopicRequest implements IUpdateTopicRequest { - /** - * Creates a new FileDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns FileDescriptorProto instance - */ - public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; + /** + * Constructs a new UpdateTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); - /** - * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param message FileDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** UpdateTopicRequest topic. */ + public topic?: (google.pubsub.v1.ITopic|null); - /** - * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param message FileDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** UpdateTopicRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; + /** + * Creates a new UpdateTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; + /** + * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a FileDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; - /** - * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. - * @param message FileDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; - /** - * Converts this FileDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Verifies an UpdateTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Properties of a DescriptorProto. */ - interface IDescriptorProto { + /** + * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; - /** DescriptorProto name */ - name?: (string|null); + /** + * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * @param message UpdateTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** DescriptorProto field */ - field?: (google.protobuf.IFieldDescriptorProto[]|null); + /** + * Converts this UpdateTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** DescriptorProto extension */ - extension?: (google.protobuf.IFieldDescriptorProto[]|null); + /** Properties of a PublishRequest. */ + interface IPublishRequest { - /** DescriptorProto nestedType */ - nestedType?: (google.protobuf.IDescriptorProto[]|null); + /** PublishRequest topic */ + topic?: (string|null); - /** DescriptorProto enumType */ - enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + /** PublishRequest messages */ + messages?: (google.pubsub.v1.IPubsubMessage[]|null); + } - /** DescriptorProto extensionRange */ - extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); + /** Represents a PublishRequest. */ + class PublishRequest implements IPublishRequest { - /** DescriptorProto oneofDecl */ - oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); + /** + * Constructs a new PublishRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPublishRequest); - /** DescriptorProto options */ - options?: (google.protobuf.IMessageOptions|null); + /** PublishRequest topic. */ + public topic: string; - /** DescriptorProto reservedRange */ - reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); + /** PublishRequest messages. */ + public messages: google.pubsub.v1.IPubsubMessage[]; - /** DescriptorProto reservedName */ - reservedName?: (string[]|null); - } + /** + * Creates a new PublishRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns PublishRequest instance + */ + public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; - /** Represents a DescriptorProto. */ - class DescriptorProto implements IDescriptorProto { + /** + * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Constructs a new DescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IDescriptorProto); + /** + * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** DescriptorProto name. */ - public name: string; + /** + * Decodes a PublishRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PublishRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; - /** DescriptorProto field. */ - public field: google.protobuf.IFieldDescriptorProto[]; + /** + * Decodes a PublishRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PublishRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; - /** DescriptorProto extension. */ - public extension: google.protobuf.IFieldDescriptorProto[]; + /** + * Verifies a PublishRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** DescriptorProto nestedType. */ - public nestedType: google.protobuf.IDescriptorProto[]; + /** + * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PublishRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; - /** DescriptorProto enumType. */ - public enumType: google.protobuf.IEnumDescriptorProto[]; + /** + * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. + * @param message PublishRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** DescriptorProto extensionRange. */ - public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; + /** + * Converts this PublishRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** DescriptorProto oneofDecl. */ - public oneofDecl: google.protobuf.IOneofDescriptorProto[]; + /** Properties of a PublishResponse. */ + interface IPublishResponse { - /** DescriptorProto options. */ - public options?: (google.protobuf.IMessageOptions|null); + /** PublishResponse messageIds */ + messageIds?: (string[]|null); + } - /** DescriptorProto reservedRange. */ - public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; + /** Represents a PublishResponse. */ + class PublishResponse implements IPublishResponse { - /** DescriptorProto reservedName. */ - public reservedName: string[]; + /** + * Constructs a new PublishResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPublishResponse); - /** - * Creates a new DescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns DescriptorProto instance - */ - public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; + /** PublishResponse messageIds. */ + public messageIds: string[]; - /** - * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param message DescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new PublishResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns PublishResponse instance + */ + public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; - /** - * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param message DescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a DescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; + /** + * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; + /** + * Decodes a PublishResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; - /** - * Verifies a DescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; - /** - * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; + /** + * Verifies a PublishResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. - * @param message DescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PublishResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; - /** - * Converts this DescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * @param message PublishResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - namespace DescriptorProto { + /** + * Converts this PublishResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Properties of an ExtensionRange. */ - interface IExtensionRange { + /** Properties of a ListTopicsRequest. */ + interface IListTopicsRequest { - /** ExtensionRange start */ - start?: (number|null); + /** ListTopicsRequest project */ + project?: (string|null); - /** ExtensionRange end */ - end?: (number|null); + /** ListTopicsRequest pageSize */ + pageSize?: (number|null); - /** ExtensionRange options */ - options?: (google.protobuf.IExtensionRangeOptions|null); + /** ListTopicsRequest pageToken */ + pageToken?: (string|null); } - /** Represents an ExtensionRange. */ - class ExtensionRange implements IExtensionRange { + /** Represents a ListTopicsRequest. */ + class ListTopicsRequest implements IListTopicsRequest { /** - * Constructs a new ExtensionRange. + * Constructs a new ListTopicsRequest. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); + constructor(properties?: google.pubsub.v1.IListTopicsRequest); - /** ExtensionRange start. */ - public start: number; + /** ListTopicsRequest project. */ + public project: string; - /** ExtensionRange end. */ - public end: number; + /** ListTopicsRequest pageSize. */ + public pageSize: number; - /** ExtensionRange options. */ - public options?: (google.protobuf.IExtensionRangeOptions|null); + /** ListTopicsRequest pageToken. */ + public pageToken: string; /** - * Creates a new ExtensionRange instance using the specified properties. + * Creates a new ListTopicsRequest instance using the specified properties. * @param [properties] Properties to set - * @returns ExtensionRange instance + * @returns ListTopicsRequest instance */ - public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; + public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; /** - * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param message ExtensionRange message or plain object to encode + * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param message ExtensionRange message or plain object to encode + * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an ExtensionRange message from the specified reader or buffer. + * Decodes a ListTopicsRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ExtensionRange + * @returns ListTopicsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; /** - * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. + * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ExtensionRange + * @returns ListTopicsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; /** - * Verifies an ExtensionRange message. + * Verifies a ListTopicsRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ExtensionRange + * @returns ListTopicsRequest */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; /** - * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. - * @param message ExtensionRange + * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * @param message ListTopicsRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ExtensionRange to JSON. + * Converts this ListTopicsRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ReservedRange. */ - interface IReservedRange { + /** Properties of a ListTopicsResponse. */ + interface IListTopicsResponse { - /** ReservedRange start */ - start?: (number|null); + /** ListTopicsResponse topics */ + topics?: (google.pubsub.v1.ITopic[]|null); - /** ReservedRange end */ - end?: (number|null); + /** ListTopicsResponse nextPageToken */ + nextPageToken?: (string|null); } - /** Represents a ReservedRange. */ - class ReservedRange implements IReservedRange { + /** Represents a ListTopicsResponse. */ + class ListTopicsResponse implements IListTopicsResponse { /** - * Constructs a new ReservedRange. + * Constructs a new ListTopicsResponse. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); + constructor(properties?: google.pubsub.v1.IListTopicsResponse); - /** ReservedRange start. */ - public start: number; + /** ListTopicsResponse topics. */ + public topics: google.pubsub.v1.ITopic[]; - /** ReservedRange end. */ - public end: number; + /** ListTopicsResponse nextPageToken. */ + public nextPageToken: string; /** - * Creates a new ReservedRange instance using the specified properties. + * Creates a new ListTopicsResponse instance using the specified properties. * @param [properties] Properties to set - * @returns ReservedRange instance + * @returns ListTopicsResponse instance */ - public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; + public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; /** - * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param message ReservedRange message or plain object to encode + * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param message ReservedRange message or plain object to encode + * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ReservedRange message from the specified reader or buffer. + * Decodes a ListTopicsResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ReservedRange + * @returns ListTopicsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; /** - * Decodes a ReservedRange message from the specified reader or buffer, length delimited. + * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ReservedRange + * @returns ListTopicsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; /** - * Verifies a ReservedRange message. + * Verifies a ListTopicsResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ReservedRange - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; - - /** - * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. - * @param message ReservedRange - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ReservedRange to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of an ExtensionRangeOptions. */ - interface IExtensionRangeOptions { - - /** ExtensionRangeOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an ExtensionRangeOptions. */ - class ExtensionRangeOptions implements IExtensionRangeOptions { - - /** - * Constructs a new ExtensionRangeOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IExtensionRangeOptions); - - /** ExtensionRangeOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new ExtensionRangeOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ExtensionRangeOptions instance - */ - public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; - - /** - * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; - - /** - * Verifies an ExtensionRangeOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExtensionRangeOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; - - /** - * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. - * @param message ExtensionRangeOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ExtensionRangeOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FieldDescriptorProto. */ - interface IFieldDescriptorProto { - - /** FieldDescriptorProto name */ - name?: (string|null); - - /** FieldDescriptorProto number */ - number?: (number|null); - - /** FieldDescriptorProto label */ - label?: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label|null); - - /** FieldDescriptorProto type */ - type?: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type|null); - - /** FieldDescriptorProto typeName */ - typeName?: (string|null); - - /** FieldDescriptorProto extendee */ - extendee?: (string|null); - - /** FieldDescriptorProto defaultValue */ - defaultValue?: (string|null); - - /** FieldDescriptorProto oneofIndex */ - oneofIndex?: (number|null); - - /** FieldDescriptorProto jsonName */ - jsonName?: (string|null); - - /** FieldDescriptorProto options */ - options?: (google.protobuf.IFieldOptions|null); - } - - /** Represents a FieldDescriptorProto. */ - class FieldDescriptorProto implements IFieldDescriptorProto { - - /** - * Constructs a new FieldDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldDescriptorProto); - - /** FieldDescriptorProto name. */ - public name: string; - - /** FieldDescriptorProto number. */ - public number: number; - - /** FieldDescriptorProto label. */ - public label: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label); - - /** FieldDescriptorProto type. */ - public type: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type); - - /** FieldDescriptorProto typeName. */ - public typeName: string; - - /** FieldDescriptorProto extendee. */ - public extendee: string; - - /** FieldDescriptorProto defaultValue. */ - public defaultValue: string; - - /** FieldDescriptorProto oneofIndex. */ - public oneofIndex: number; - - /** FieldDescriptorProto jsonName. */ - public jsonName: string; + /** + * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; - /** FieldDescriptorProto options. */ - public options?: (google.protobuf.IFieldOptions|null); + /** + * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * @param message ListTopicsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a new FieldDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldDescriptorProto instance - */ - public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; + /** + * Converts this ListTopicsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param message FieldDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** Properties of a ListTopicSubscriptionsRequest. */ + interface IListTopicSubscriptionsRequest { - /** - * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param message FieldDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** ListTopicSubscriptionsRequest topic */ + topic?: (string|null); - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; + /** ListTopicSubscriptionsRequest pageSize */ + pageSize?: (number|null); - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; + /** ListTopicSubscriptionsRequest pageToken */ + pageToken?: (string|null); + } - /** - * Verifies a FieldDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Represents a ListTopicSubscriptionsRequest. */ + class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { - /** - * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; + /** + * Constructs a new ListTopicSubscriptionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); - /** - * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. - * @param message FieldDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** ListTopicSubscriptionsRequest topic. */ + public topic: string; - /** - * Converts this FieldDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** ListTopicSubscriptionsRequest pageSize. */ + public pageSize: number; - namespace FieldDescriptorProto { + /** ListTopicSubscriptionsRequest pageToken. */ + public pageToken: string; - /** Type enum. */ - enum Type { - TYPE_DOUBLE = 1, - TYPE_FLOAT = 2, - TYPE_INT64 = 3, - TYPE_UINT64 = 4, - TYPE_INT32 = 5, - TYPE_FIXED64 = 6, - TYPE_FIXED32 = 7, - TYPE_BOOL = 8, - TYPE_STRING = 9, - TYPE_GROUP = 10, - TYPE_MESSAGE = 11, - TYPE_BYTES = 12, - TYPE_UINT32 = 13, - TYPE_ENUM = 14, - TYPE_SFIXED32 = 15, - TYPE_SFIXED64 = 16, - TYPE_SINT32 = 17, - TYPE_SINT64 = 18 - } + /** + * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSubscriptionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; - /** Label enum. */ - enum Label { - LABEL_OPTIONAL = 1, - LABEL_REQUIRED = 2, - LABEL_REPEATED = 3 - } - } + /** + * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of an OneofDescriptorProto. */ - interface IOneofDescriptorProto { + /** + * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** OneofDescriptorProto name */ - name?: (string|null); + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; - /** OneofDescriptorProto options */ - options?: (google.protobuf.IOneofOptions|null); - } + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; - /** Represents an OneofDescriptorProto. */ - class OneofDescriptorProto implements IOneofDescriptorProto { + /** + * Verifies a ListTopicSubscriptionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Constructs a new OneofDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IOneofDescriptorProto); + /** + * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSubscriptionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; - /** OneofDescriptorProto name. */ - public name: string; + /** + * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** OneofDescriptorProto options. */ - public options?: (google.protobuf.IOneofOptions|null); + /** + * Converts this ListTopicSubscriptionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a new OneofDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns OneofDescriptorProto instance - */ - public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; + /** Properties of a ListTopicSubscriptionsResponse. */ + interface IListTopicSubscriptionsResponse { - /** - * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param message OneofDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** ListTopicSubscriptionsResponse subscriptions */ + subscriptions?: (string[]|null); - /** - * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param message OneofDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** ListTopicSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); + } - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; + /** Represents a ListTopicSubscriptionsResponse. */ + class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { + + /** + * Constructs a new ListTopicSubscriptionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; + /** ListTopicSubscriptionsResponse subscriptions. */ + public subscriptions: string[]; - /** - * Verifies an OneofDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** ListTopicSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; - /** - * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OneofDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; + /** + * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSubscriptionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; - /** - * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. - * @param message OneofDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this OneofDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of an EnumDescriptorProto. */ - interface IEnumDescriptorProto { + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; - /** EnumDescriptorProto name */ - name?: (string|null); + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; - /** EnumDescriptorProto value */ - value?: (google.protobuf.IEnumValueDescriptorProto[]|null); + /** + * Verifies a ListTopicSubscriptionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** EnumDescriptorProto options */ - options?: (google.protobuf.IEnumOptions|null); + /** + * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSubscriptionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; - /** EnumDescriptorProto reservedRange */ - reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); + /** + * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** EnumDescriptorProto reservedName */ - reservedName?: (string[]|null); - } + /** + * Converts this ListTopicSubscriptionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Represents an EnumDescriptorProto. */ - class EnumDescriptorProto implements IEnumDescriptorProto { + /** Properties of a ListTopicSnapshotsRequest. */ + interface IListTopicSnapshotsRequest { - /** - * Constructs a new EnumDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumDescriptorProto); + /** ListTopicSnapshotsRequest topic */ + topic?: (string|null); - /** EnumDescriptorProto name. */ - public name: string; + /** ListTopicSnapshotsRequest pageSize */ + pageSize?: (number|null); - /** EnumDescriptorProto value. */ - public value: google.protobuf.IEnumValueDescriptorProto[]; + /** ListTopicSnapshotsRequest pageToken */ + pageToken?: (string|null); + } - /** EnumDescriptorProto options. */ - public options?: (google.protobuf.IEnumOptions|null); + /** Represents a ListTopicSnapshotsRequest. */ + class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { - /** EnumDescriptorProto reservedRange. */ - public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; + /** + * Constructs a new ListTopicSnapshotsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); - /** EnumDescriptorProto reservedName. */ - public reservedName: string[]; + /** ListTopicSnapshotsRequest topic. */ + public topic: string; - /** - * Creates a new EnumDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumDescriptorProto instance - */ - public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; + /** ListTopicSnapshotsRequest pageSize. */ + public pageSize: number; - /** - * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param message EnumDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** ListTopicSnapshotsRequest pageToken. */ + public pageToken: string; - /** - * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param message EnumDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new ListTopicSnapshotsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSnapshotsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; + /** + * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; + /** + * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies an EnumDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; - /** - * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; - /** - * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. - * @param message EnumDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Verifies a ListTopicSnapshotsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSnapshotsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; - /** - * Converts this EnumDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - namespace EnumDescriptorProto { + /** + * Converts this ListTopicSnapshotsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Properties of an EnumReservedRange. */ - interface IEnumReservedRange { + /** Properties of a ListTopicSnapshotsResponse. */ + interface IListTopicSnapshotsResponse { - /** EnumReservedRange start */ - start?: (number|null); + /** ListTopicSnapshotsResponse snapshots */ + snapshots?: (string[]|null); - /** EnumReservedRange end */ - end?: (number|null); + /** ListTopicSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); } - /** Represents an EnumReservedRange. */ - class EnumReservedRange implements IEnumReservedRange { + /** Represents a ListTopicSnapshotsResponse. */ + class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { /** - * Constructs a new EnumReservedRange. + * Constructs a new ListTopicSnapshotsResponse. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); - /** EnumReservedRange start. */ - public start: number; + /** ListTopicSnapshotsResponse snapshots. */ + public snapshots: string[]; - /** EnumReservedRange end. */ - public end: number; + /** ListTopicSnapshotsResponse nextPageToken. */ + public nextPageToken: string; /** - * Creates a new EnumReservedRange instance using the specified properties. + * Creates a new ListTopicSnapshotsResponse instance using the specified properties. * @param [properties] Properties to set - * @returns EnumReservedRange instance + * @returns ListTopicSnapshotsResponse instance */ - public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; /** - * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode + * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode + * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an EnumReservedRange message from the specified reader or buffer. + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns EnumReservedRange + * @returns ListTopicSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; /** - * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns EnumReservedRange + * @returns ListTopicSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; /** - * Verifies an EnumReservedRange message. + * Verifies a ListTopicSnapshotsResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns EnumReservedRange + * @returns ListTopicSnapshotsResponse */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; /** - * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. - * @param message EnumReservedRange + * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this EnumReservedRange to JSON. + * Converts this ListTopicSnapshotsResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - - /** Properties of an EnumValueDescriptorProto. */ - interface IEnumValueDescriptorProto { - - /** EnumValueDescriptorProto name */ - name?: (string|null); - - /** EnumValueDescriptorProto number */ - number?: (number|null); - - /** EnumValueDescriptorProto options */ - options?: (google.protobuf.IEnumValueOptions|null); - } - - /** Represents an EnumValueDescriptorProto. */ - class EnumValueDescriptorProto implements IEnumValueDescriptorProto { - - /** - * Constructs a new EnumValueDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumValueDescriptorProto); - - /** EnumValueDescriptorProto name. */ - public name: string; - - /** EnumValueDescriptorProto number. */ - public number: number; - /** EnumValueDescriptorProto options. */ - public options?: (google.protobuf.IEnumValueOptions|null); - - /** - * Creates a new EnumValueDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumValueDescriptorProto instance - */ - public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; - - /** - * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param message EnumValueDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param message EnumValueDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; - - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; - - /** - * Verifies an EnumValueDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumValueDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; - - /** - * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. - * @param message EnumValueDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumValueDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ServiceDescriptorProto. */ - interface IServiceDescriptorProto { - - /** ServiceDescriptorProto name */ - name?: (string|null); - - /** ServiceDescriptorProto method */ - method?: (google.protobuf.IMethodDescriptorProto[]|null); - - /** ServiceDescriptorProto options */ - options?: (google.protobuf.IServiceOptions|null); - } - - /** Represents a ServiceDescriptorProto. */ - class ServiceDescriptorProto implements IServiceDescriptorProto { - - /** - * Constructs a new ServiceDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IServiceDescriptorProto); - - /** ServiceDescriptorProto name. */ - public name: string; - - /** ServiceDescriptorProto method. */ - public method: google.protobuf.IMethodDescriptorProto[]; - - /** ServiceDescriptorProto options. */ - public options?: (google.protobuf.IServiceOptions|null); - - /** - * Creates a new ServiceDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns ServiceDescriptorProto instance - */ - public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; - - /** - * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param message ServiceDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** Properties of a DeleteTopicRequest. */ + interface IDeleteTopicRequest { - /** - * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param message ServiceDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** DeleteTopicRequest topic */ + topic?: (string|null); + } - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; + /** Represents a DeleteTopicRequest. */ + class DeleteTopicRequest implements IDeleteTopicRequest { - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; + /** + * Constructs a new DeleteTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); - /** - * Verifies a ServiceDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** DeleteTopicRequest topic. */ + public topic: string; - /** - * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ServiceDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; + /** + * Creates a new DeleteTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; - /** - * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. - * @param message ServiceDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this ServiceDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a MethodDescriptorProto. */ - interface IMethodDescriptorProto { + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; - /** MethodDescriptorProto name */ - name?: (string|null); + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; - /** MethodDescriptorProto inputType */ - inputType?: (string|null); + /** + * Verifies a DeleteTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** MethodDescriptorProto outputType */ - outputType?: (string|null); + /** + * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; - /** MethodDescriptorProto options */ - options?: (google.protobuf.IMethodOptions|null); + /** + * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. + * @param message DeleteTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** MethodDescriptorProto clientStreaming */ - clientStreaming?: (boolean|null); + /** + * Converts this DeleteTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** MethodDescriptorProto serverStreaming */ - serverStreaming?: (boolean|null); - } + /** Represents a Subscriber */ + class Subscriber extends $protobuf.rpc.Service { - /** Represents a MethodDescriptorProto. */ - class MethodDescriptorProto implements IMethodDescriptorProto { + /** + * Constructs a new Subscriber service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - /** - * Constructs a new MethodDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMethodDescriptorProto); + /** + * Creates new Subscriber service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; - /** MethodDescriptorProto name. */ - public name: string; + /** + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; - /** MethodDescriptorProto inputType. */ - public inputType: string; + /** + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @returns Promise + */ + public createSubscription(request: google.pubsub.v1.ISubscription): Promise; - /** MethodDescriptorProto outputType. */ - public outputType: string; + /** + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; - /** MethodDescriptorProto options. */ - public options?: (google.protobuf.IMethodOptions|null); + /** + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @returns Promise + */ + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; - /** MethodDescriptorProto clientStreaming. */ - public clientStreaming: boolean; + /** + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; - /** MethodDescriptorProto serverStreaming. */ - public serverStreaming: boolean; + /** + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @returns Promise + */ + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; - /** - * Creates a new MethodDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodDescriptorProto instance - */ - public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; + /** + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse + */ + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; - /** - * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param message MethodDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @returns Promise + */ + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; - /** - * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param message MethodDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; + /** + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @returns Promise + */ + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; + /** + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; - /** - * Verifies a MethodDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @returns Promise + */ + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; - /** - * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; + /** + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; - /** - * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. - * @param message MethodDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @returns Promise + */ + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; - /** - * Converts this MethodDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Calls Pull. + * @param request PullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PullResponse + */ + public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; - /** Properties of a FileOptions. */ - interface IFileOptions { + /** + * Calls Pull. + * @param request PullRequest message or plain object + * @returns Promise + */ + public pull(request: google.pubsub.v1.IPullRequest): Promise; - /** FileOptions javaPackage */ - javaPackage?: (string|null); + /** + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and StreamingPullResponse + */ + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; - /** FileOptions javaOuterClassname */ - javaOuterClassname?: (string|null); + /** + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @returns Promise + */ + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; - /** FileOptions javaMultipleFiles */ - javaMultipleFiles?: (boolean|null); + /** + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; - /** FileOptions javaGenerateEqualsAndHash */ - javaGenerateEqualsAndHash?: (boolean|null); + /** + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @returns Promise + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; - /** FileOptions javaStringCheckUtf8 */ - javaStringCheckUtf8?: (boolean|null); + /** + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; - /** FileOptions optimizeFor */ - optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode|null); + /** + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @returns Promise + */ + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; - /** FileOptions goPackage */ - goPackage?: (string|null); + /** + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse + */ + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; - /** FileOptions ccGenericServices */ - ccGenericServices?: (boolean|null); + /** + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @returns Promise + */ + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; - /** FileOptions javaGenericServices */ - javaGenericServices?: (boolean|null); + /** + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; - /** FileOptions pyGenericServices */ - pyGenericServices?: (boolean|null); + /** + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @returns Promise + */ + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; - /** FileOptions phpGenericServices */ - phpGenericServices?: (boolean|null); + /** + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; - /** FileOptions deprecated */ - deprecated?: (boolean|null); + /** + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @returns Promise + */ + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; - /** FileOptions ccEnableArenas */ - ccEnableArenas?: (boolean|null); + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; - /** FileOptions objcClassPrefix */ - objcClassPrefix?: (string|null); + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @returns Promise + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; - /** FileOptions csharpNamespace */ - csharpNamespace?: (string|null); + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @param callback Node-style callback called with the error, if any, and SeekResponse + */ + public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; - /** FileOptions swiftPrefix */ - swiftPrefix?: (string|null); + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @returns Promise + */ + public seek(request: google.pubsub.v1.ISeekRequest): Promise; + } - /** FileOptions phpClassPrefix */ - phpClassPrefix?: (string|null); + namespace Subscriber { - /** FileOptions phpNamespace */ - phpNamespace?: (string|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - /** FileOptions phpMetadataNamespace */ - phpMetadataNamespace?: (string|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - /** FileOptions rubyPackage */ - rubyPackage?: (string|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - /** FileOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * @param error Error, if any + * @param [response] ListSubscriptionsResponse + */ + type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; - /** FileOptions .google.api.resourceDefinition */ - ".google.api.resourceDefinition"?: (google.api.IResourceDescriptor[]|null); - } + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * @param error Error, if any + * @param [response] Empty + */ + type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - /** Represents a FileOptions. */ - class FileOptions implements IFileOptions { + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * @param error Error, if any + * @param [response] PullResponse + */ + type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; - /** - * Constructs a new FileOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileOptions); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * @param error Error, if any + * @param [response] StreamingPullResponse + */ + type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; - /** FileOptions javaPackage. */ - public javaPackage: string; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - /** FileOptions javaOuterClassname. */ - public javaOuterClassname: string; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - /** FileOptions javaMultipleFiles. */ - public javaMultipleFiles: boolean; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * @param error Error, if any + * @param [response] ListSnapshotsResponse + */ + type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; - /** FileOptions javaGenerateEqualsAndHash. */ - public javaGenerateEqualsAndHash: boolean; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - /** FileOptions javaStringCheckUtf8. */ - public javaStringCheckUtf8: boolean; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - /** FileOptions optimizeFor. */ - public optimizeFor: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - /** FileOptions goPackage. */ - public goPackage: string; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * @param error Error, if any + * @param [response] SeekResponse + */ + type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; + } - /** FileOptions ccGenericServices. */ - public ccGenericServices: boolean; + /** Properties of a Subscription. */ + interface ISubscription { - /** FileOptions javaGenericServices. */ - public javaGenericServices: boolean; + /** Subscription name */ + name?: (string|null); - /** FileOptions pyGenericServices. */ - public pyGenericServices: boolean; + /** Subscription topic */ + topic?: (string|null); - /** FileOptions phpGenericServices. */ - public phpGenericServices: boolean; + /** Subscription pushConfig */ + pushConfig?: (google.pubsub.v1.IPushConfig|null); - /** FileOptions deprecated. */ - public deprecated: boolean; + /** Subscription ackDeadlineSeconds */ + ackDeadlineSeconds?: (number|null); - /** FileOptions ccEnableArenas. */ - public ccEnableArenas: boolean; + /** Subscription retainAckedMessages */ + retainAckedMessages?: (boolean|null); - /** FileOptions objcClassPrefix. */ - public objcClassPrefix: string; + /** Subscription messageRetentionDuration */ + messageRetentionDuration?: (google.protobuf.IDuration|null); - /** FileOptions csharpNamespace. */ - public csharpNamespace: string; + /** Subscription labels */ + labels?: ({ [k: string]: string }|null); - /** FileOptions swiftPrefix. */ - public swiftPrefix: string; + /** Subscription enableMessageOrdering */ + enableMessageOrdering?: (boolean|null); - /** FileOptions phpClassPrefix. */ - public phpClassPrefix: string; + /** Subscription expirationPolicy */ + expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); - /** FileOptions phpNamespace. */ - public phpNamespace: string; + /** Subscription filter */ + filter?: (string|null); - /** FileOptions phpMetadataNamespace. */ - public phpMetadataNamespace: string; + /** Subscription deadLetterPolicy */ + deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); - /** FileOptions rubyPackage. */ - public rubyPackage: string; + /** Subscription retryPolicy */ + retryPolicy?: (google.pubsub.v1.IRetryPolicy|null); + } - /** FileOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** Represents a Subscription. */ + class Subscription implements ISubscription { - /** - * Creates a new FileOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns FileOptions instance - */ - public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; + /** + * Constructs a new Subscription. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISubscription); - /** - * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param message FileOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** Subscription name. */ + public name: string; - /** - * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param message FileOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** Subscription topic. */ + public topic: string; - /** - * Decodes a FileOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; + /** Subscription pushConfig. */ + public pushConfig?: (google.pubsub.v1.IPushConfig|null); - /** - * Decodes a FileOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; + /** Subscription ackDeadlineSeconds. */ + public ackDeadlineSeconds: number; - /** - * Verifies a FileOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Subscription retainAckedMessages. */ + public retainAckedMessages: boolean; - /** - * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; + /** Subscription messageRetentionDuration. */ + public messageRetentionDuration?: (google.protobuf.IDuration|null); - /** - * Creates a plain object from a FileOptions message. Also converts values to other types if specified. - * @param message FileOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Subscription labels. */ + public labels: { [k: string]: string }; - /** - * Converts this FileOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Subscription enableMessageOrdering. */ + public enableMessageOrdering: boolean; - namespace FileOptions { + /** Subscription expirationPolicy. */ + public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); - /** OptimizeMode enum. */ - enum OptimizeMode { - SPEED = 1, - CODE_SIZE = 2, - LITE_RUNTIME = 3 - } - } + /** Subscription filter. */ + public filter: string; - /** Properties of a MessageOptions. */ - interface IMessageOptions { + /** Subscription deadLetterPolicy. */ + public deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); - /** MessageOptions messageSetWireFormat */ - messageSetWireFormat?: (boolean|null); + /** Subscription retryPolicy. */ + public retryPolicy?: (google.pubsub.v1.IRetryPolicy|null); - /** MessageOptions noStandardDescriptorAccessor */ - noStandardDescriptorAccessor?: (boolean|null); + /** + * Creates a new Subscription instance using the specified properties. + * @param [properties] Properties to set + * @returns Subscription instance + */ + public static create(properties?: google.pubsub.v1.ISubscription): google.pubsub.v1.Subscription; - /** MessageOptions deprecated */ - deprecated?: (boolean|null); + /** + * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @param message Subscription message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; - /** MessageOptions mapEntry */ - mapEntry?: (boolean|null); + /** + * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @param message Subscription message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; - /** MessageOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** + * Decodes a Subscription message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Subscription; - /** MessageOptions .google.api.resource */ - ".google.api.resource"?: (google.api.IResourceDescriptor|null); - } + /** + * Decodes a Subscription message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Subscription; - /** Represents a MessageOptions. */ - class MessageOptions implements IMessageOptions { + /** + * Verifies a Subscription message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Constructs a new MessageOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMessageOptions); + /** + * Creates a Subscription message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Subscription + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Subscription; - /** MessageOptions messageSetWireFormat. */ - public messageSetWireFormat: boolean; + /** + * Creates a plain object from a Subscription message. Also converts values to other types if specified. + * @param message Subscription + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Subscription, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** MessageOptions noStandardDescriptorAccessor. */ - public noStandardDescriptorAccessor: boolean; + /** + * Converts this Subscription to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** MessageOptions deprecated. */ - public deprecated: boolean; + /** Properties of a RetryPolicy. */ + interface IRetryPolicy { - /** MessageOptions mapEntry. */ - public mapEntry: boolean; + /** RetryPolicy minimumBackoff */ + minimumBackoff?: (google.protobuf.IDuration|null); - /** MessageOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** RetryPolicy maximumBackoff */ + maximumBackoff?: (google.protobuf.IDuration|null); + } - /** - * Creates a new MessageOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns MessageOptions instance - */ - public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; + /** Represents a RetryPolicy. */ + class RetryPolicy implements IRetryPolicy { - /** - * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param message MessageOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new RetryPolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IRetryPolicy); - /** - * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param message MessageOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** RetryPolicy minimumBackoff. */ + public minimumBackoff?: (google.protobuf.IDuration|null); - /** - * Decodes a MessageOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; + /** RetryPolicy maximumBackoff. */ + public maximumBackoff?: (google.protobuf.IDuration|null); - /** - * Decodes a MessageOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; + /** + * Creates a new RetryPolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns RetryPolicy instance + */ + public static create(properties?: google.pubsub.v1.IRetryPolicy): google.pubsub.v1.RetryPolicy; - /** - * Verifies a MessageOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified RetryPolicy message. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. + * @param message RetryPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IRetryPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MessageOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; + /** + * Encodes the specified RetryPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. + * @param message RetryPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IRetryPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. - * @param message MessageOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a RetryPolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns RetryPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.RetryPolicy; - /** - * Converts this MessageOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes a RetryPolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns RetryPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.RetryPolicy; - /** Properties of a FieldOptions. */ - interface IFieldOptions { + /** + * Verifies a RetryPolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FieldOptions ctype */ - ctype?: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType|null); + /** + * Creates a RetryPolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns RetryPolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.RetryPolicy; - /** FieldOptions packed */ - packed?: (boolean|null); + /** + * Creates a plain object from a RetryPolicy message. Also converts values to other types if specified. + * @param message RetryPolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.RetryPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** FieldOptions jstype */ - jstype?: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType|null); + /** + * Converts this RetryPolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** FieldOptions lazy */ - lazy?: (boolean|null); + /** Properties of a DeadLetterPolicy. */ + interface IDeadLetterPolicy { - /** FieldOptions deprecated */ - deprecated?: (boolean|null); + /** DeadLetterPolicy deadLetterTopic */ + deadLetterTopic?: (string|null); - /** FieldOptions weak */ - weak?: (boolean|null); + /** DeadLetterPolicy maxDeliveryAttempts */ + maxDeliveryAttempts?: (number|null); + } - /** FieldOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** Represents a DeadLetterPolicy. */ + class DeadLetterPolicy implements IDeadLetterPolicy { - /** FieldOptions .google.api.fieldBehavior */ - ".google.api.fieldBehavior"?: (google.api.FieldBehavior[]|null); + /** + * Constructs a new DeadLetterPolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeadLetterPolicy); - /** FieldOptions .google.api.resourceReference */ - ".google.api.resourceReference"?: (google.api.IResourceReference|null); - } + /** DeadLetterPolicy deadLetterTopic. */ + public deadLetterTopic: string; - /** Represents a FieldOptions. */ - class FieldOptions implements IFieldOptions { + /** DeadLetterPolicy maxDeliveryAttempts. */ + public maxDeliveryAttempts: number; - /** - * Constructs a new FieldOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldOptions); + /** + * Creates a new DeadLetterPolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns DeadLetterPolicy instance + */ + public static create(properties?: google.pubsub.v1.IDeadLetterPolicy): google.pubsub.v1.DeadLetterPolicy; - /** FieldOptions ctype. */ - public ctype: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType); + /** + * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @param message DeadLetterPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** FieldOptions packed. */ - public packed: boolean; + /** + * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @param message DeadLetterPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** FieldOptions jstype. */ - public jstype: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType); + /** + * Decodes a DeadLetterPolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeadLetterPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeadLetterPolicy; - /** FieldOptions lazy. */ - public lazy: boolean; + /** + * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeadLetterPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeadLetterPolicy; - /** FieldOptions deprecated. */ - public deprecated: boolean; + /** + * Verifies a DeadLetterPolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FieldOptions weak. */ - public weak: boolean; + /** + * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeadLetterPolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeadLetterPolicy; - /** FieldOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** + * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. + * @param message DeadLetterPolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeadLetterPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a new FieldOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldOptions instance - */ - public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; + /** + * Converts this DeadLetterPolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param message FieldOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** Properties of an ExpirationPolicy. */ + interface IExpirationPolicy { - /** - * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param message FieldOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** ExpirationPolicy ttl */ + ttl?: (google.protobuf.IDuration|null); + } - /** - * Decodes a FieldOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; + /** Represents an ExpirationPolicy. */ + class ExpirationPolicy implements IExpirationPolicy { - /** - * Decodes a FieldOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; + /** + * Constructs a new ExpirationPolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IExpirationPolicy); - /** - * Verifies a FieldOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** ExpirationPolicy ttl. */ + public ttl?: (google.protobuf.IDuration|null); - /** - * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; + /** + * Creates a new ExpirationPolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns ExpirationPolicy instance + */ + public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; - /** - * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. - * @param message FieldOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this FieldOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - namespace FieldOptions { + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; - /** CType enum. */ - enum CType { - STRING = 0, - CORD = 1, - STRING_PIECE = 2 - } + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; - /** JSType enum. */ - enum JSType { - JS_NORMAL = 0, - JS_STRING = 1, - JS_NUMBER = 2 - } - } + /** + * Verifies an ExpirationPolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Properties of an OneofOptions. */ - interface IOneofOptions { + /** + * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExpirationPolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; - /** OneofOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } + /** + * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. + * @param message ExpirationPolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents an OneofOptions. */ - class OneofOptions implements IOneofOptions { + /** + * Converts this ExpirationPolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new OneofOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IOneofOptions); + /** Properties of a PushConfig. */ + interface IPushConfig { - /** OneofOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** PushConfig pushEndpoint */ + pushEndpoint?: (string|null); - /** - * Creates a new OneofOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns OneofOptions instance - */ - public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; + /** PushConfig attributes */ + attributes?: ({ [k: string]: string }|null); - /** - * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param message OneofOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** PushConfig oidcToken */ + oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + } - /** - * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param message OneofOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a PushConfig. */ + class PushConfig implements IPushConfig { - /** - * Decodes an OneofOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; + /** + * Constructs a new PushConfig. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPushConfig); - /** - * Decodes an OneofOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; + /** PushConfig pushEndpoint. */ + public pushEndpoint: string; - /** - * Verifies an OneofOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** PushConfig attributes. */ + public attributes: { [k: string]: string }; - /** - * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OneofOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; + /** PushConfig oidcToken. */ + public oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); - /** - * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. - * @param message OneofOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** PushConfig authenticationMethod. */ + public authenticationMethod?: "oidcToken"; - /** - * Converts this OneofOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a new PushConfig instance using the specified properties. + * @param [properties] Properties to set + * @returns PushConfig instance + */ + public static create(properties?: google.pubsub.v1.IPushConfig): google.pubsub.v1.PushConfig; - /** Properties of an EnumOptions. */ - interface IEnumOptions { + /** + * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @param message PushConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; - /** EnumOptions allowAlias */ - allowAlias?: (boolean|null); + /** + * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @param message PushConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; - /** EnumOptions deprecated */ - deprecated?: (boolean|null); + /** + * Decodes a PushConfig message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig; - /** EnumOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } + /** + * Decodes a PushConfig message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig; - /** Represents an EnumOptions. */ - class EnumOptions implements IEnumOptions { + /** + * Verifies a PushConfig message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Constructs a new EnumOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumOptions); + /** + * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PushConfig + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig; - /** EnumOptions allowAlias. */ - public allowAlias: boolean; + /** + * Creates a plain object from a PushConfig message. Also converts values to other types if specified. + * @param message PushConfig + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** EnumOptions deprecated. */ - public deprecated: boolean; + /** + * Converts this PushConfig to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** EnumOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + namespace PushConfig { - /** - * Creates a new EnumOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumOptions instance - */ - public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; + /** Properties of an OidcToken. */ + interface IOidcToken { - /** - * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param message EnumOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** OidcToken serviceAccountEmail */ + serviceAccountEmail?: (string|null); - /** - * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param message EnumOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** OidcToken audience */ + audience?: (string|null); + } - /** - * Decodes an EnumOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; + /** Represents an OidcToken. */ + class OidcToken implements IOidcToken { - /** - * Decodes an EnumOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; + /** + * Constructs a new OidcToken. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.PushConfig.IOidcToken); - /** - * Verifies an EnumOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** OidcToken serviceAccountEmail. */ + public serviceAccountEmail: string; - /** - * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; + /** OidcToken audience. */ + public audience: string; - /** - * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. - * @param message EnumOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a new OidcToken instance using the specified properties. + * @param [properties] Properties to set + * @returns OidcToken instance + */ + public static create(properties?: google.pubsub.v1.PushConfig.IOidcToken): google.pubsub.v1.PushConfig.OidcToken; - /** - * Converts this EnumOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @param message OidcToken message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of an EnumValueOptions. */ - interface IEnumValueOptions { + /** + * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @param message OidcToken message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; - /** EnumValueOptions deprecated */ - deprecated?: (boolean|null); + /** + * Decodes an OidcToken message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.OidcToken; - /** EnumValueOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } + /** + * Decodes an OidcToken message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Verifies an OidcToken message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OidcToken + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.OidcToken; + + /** + * Creates a plain object from an OidcToken message. Also converts values to other types if specified. + * @param message OidcToken + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig.OidcToken, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents an EnumValueOptions. */ - class EnumValueOptions implements IEnumValueOptions { + /** + * Converts this OidcToken to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } - /** - * Constructs a new EnumValueOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumValueOptions); + /** Properties of a ReceivedMessage. */ + interface IReceivedMessage { - /** EnumValueOptions deprecated. */ - public deprecated: boolean; + /** ReceivedMessage ackId */ + ackId?: (string|null); - /** EnumValueOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** ReceivedMessage message */ + message?: (google.pubsub.v1.IPubsubMessage|null); - /** - * Creates a new EnumValueOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumValueOptions instance - */ - public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; + /** ReceivedMessage deliveryAttempt */ + deliveryAttempt?: (number|null); + } - /** - * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param message EnumValueOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a ReceivedMessage. */ + class ReceivedMessage implements IReceivedMessage { - /** - * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param message EnumValueOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new ReceivedMessage. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IReceivedMessage); - /** - * Decodes an EnumValueOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; + /** ReceivedMessage ackId. */ + public ackId: string; - /** - * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; + /** ReceivedMessage message. */ + public message?: (google.pubsub.v1.IPubsubMessage|null); - /** - * Verifies an EnumValueOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** ReceivedMessage deliveryAttempt. */ + public deliveryAttempt: number; - /** - * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumValueOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; + /** + * Creates a new ReceivedMessage instance using the specified properties. + * @param [properties] Properties to set + * @returns ReceivedMessage instance + */ + public static create(properties?: google.pubsub.v1.IReceivedMessage): google.pubsub.v1.ReceivedMessage; - /** - * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. - * @param message EnumValueOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @param message ReceivedMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this EnumValueOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @param message ReceivedMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a ServiceOptions. */ - interface IServiceOptions { + /** + * Decodes a ReceivedMessage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ReceivedMessage; - /** ServiceOptions deprecated */ - deprecated?: (boolean|null); + /** + * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ReceivedMessage; - /** ServiceOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** + * Verifies a ReceivedMessage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** ServiceOptions .google.api.defaultHost */ - ".google.api.defaultHost"?: (string|null); + /** + * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ReceivedMessage + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ReceivedMessage; - /** ServiceOptions .google.api.oauthScopes */ - ".google.api.oauthScopes"?: (string|null); - } + /** + * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. + * @param message ReceivedMessage + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ReceivedMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents a ServiceOptions. */ - class ServiceOptions implements IServiceOptions { + /** + * Converts this ReceivedMessage to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new ServiceOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IServiceOptions); + /** Properties of a GetSubscriptionRequest. */ + interface IGetSubscriptionRequest { - /** ServiceOptions deprecated. */ - public deprecated: boolean; + /** GetSubscriptionRequest subscription */ + subscription?: (string|null); + } - /** ServiceOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** Represents a GetSubscriptionRequest. */ + class GetSubscriptionRequest implements IGetSubscriptionRequest { - /** - * Creates a new ServiceOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ServiceOptions instance - */ - public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; + /** + * Constructs a new GetSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetSubscriptionRequest); - /** - * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param message ServiceOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** GetSubscriptionRequest subscription. */ + public subscription: string; - /** - * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param message ServiceOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new GetSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetSubscriptionRequest): google.pubsub.v1.GetSubscriptionRequest; - /** - * Decodes a ServiceOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; + /** + * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @param message GetSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; + /** + * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @param message GetSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a ServiceOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSubscriptionRequest; - /** - * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ServiceOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSubscriptionRequest; - /** - * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. - * @param message ServiceOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Verifies a GetSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Converts this ServiceOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSubscriptionRequest; - /** Properties of a MethodOptions. */ - interface IMethodOptions { + /** + * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. + * @param message GetSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** MethodOptions deprecated */ - deprecated?: (boolean|null); + /** + * Converts this GetSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** MethodOptions idempotencyLevel */ - idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel|null); + /** Properties of an UpdateSubscriptionRequest. */ + interface IUpdateSubscriptionRequest { - /** MethodOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** UpdateSubscriptionRequest subscription */ + subscription?: (google.pubsub.v1.ISubscription|null); - /** MethodOptions .google.api.http */ - ".google.api.http"?: (google.api.IHttpRule|null); + /** UpdateSubscriptionRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } - /** MethodOptions .google.api.methodSignature */ - ".google.api.methodSignature"?: (string[]|null); - } + /** Represents an UpdateSubscriptionRequest. */ + class UpdateSubscriptionRequest implements IUpdateSubscriptionRequest { - /** Represents a MethodOptions. */ - class MethodOptions implements IMethodOptions { + /** + * Constructs a new UpdateSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateSubscriptionRequest); - /** - * Constructs a new MethodOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMethodOptions); + /** UpdateSubscriptionRequest subscription. */ + public subscription?: (google.pubsub.v1.ISubscription|null); - /** MethodOptions deprecated. */ - public deprecated: boolean; + /** UpdateSubscriptionRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); - /** MethodOptions idempotencyLevel. */ - public idempotencyLevel: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel); + /** + * Creates a new UpdateSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateSubscriptionRequest): google.pubsub.v1.UpdateSubscriptionRequest; - /** MethodOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** + * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @param message UpdateSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new MethodOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodOptions instance - */ - public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; + /** + * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @param message UpdateSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param message MethodOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSubscriptionRequest; - /** - * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param message MethodOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSubscriptionRequest; - /** - * Decodes a MethodOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; + /** + * Verifies an UpdateSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a MethodOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; + /** + * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSubscriptionRequest; - /** - * Verifies a MethodOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. + * @param message UpdateSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; + /** + * Converts this UpdateSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. - * @param message MethodOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Properties of a ListSubscriptionsRequest. */ + interface IListSubscriptionsRequest { - /** - * Converts this MethodOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** ListSubscriptionsRequest project */ + project?: (string|null); - namespace MethodOptions { + /** ListSubscriptionsRequest pageSize */ + pageSize?: (number|null); - /** IdempotencyLevel enum. */ - enum IdempotencyLevel { - IDEMPOTENCY_UNKNOWN = 0, - NO_SIDE_EFFECTS = 1, - IDEMPOTENT = 2 + /** ListSubscriptionsRequest pageToken */ + pageToken?: (string|null); } - } - /** Properties of an UninterpretedOption. */ - interface IUninterpretedOption { + /** Represents a ListSubscriptionsRequest. */ + class ListSubscriptionsRequest implements IListSubscriptionsRequest { - /** UninterpretedOption name */ - name?: (google.protobuf.UninterpretedOption.INamePart[]|null); + /** + * Constructs a new ListSubscriptionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSubscriptionsRequest); - /** UninterpretedOption identifierValue */ - identifierValue?: (string|null); + /** ListSubscriptionsRequest project. */ + public project: string; - /** UninterpretedOption positiveIntValue */ - positiveIntValue?: (number|Long|string|null); + /** ListSubscriptionsRequest pageSize. */ + public pageSize: number; - /** UninterpretedOption negativeIntValue */ - negativeIntValue?: (number|Long|string|null); + /** ListSubscriptionsRequest pageToken. */ + public pageToken: string; - /** UninterpretedOption doubleValue */ - doubleValue?: (number|null); + /** + * Creates a new ListSubscriptionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSubscriptionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSubscriptionsRequest): google.pubsub.v1.ListSubscriptionsRequest; - /** UninterpretedOption stringValue */ - stringValue?: (Uint8Array|string|null); + /** + * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @param message ListSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** UninterpretedOption aggregateValue */ - aggregateValue?: (string|null); - } + /** + * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @param message ListSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** Represents an UninterpretedOption. */ - class UninterpretedOption implements IUninterpretedOption { + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsRequest; - /** - * Constructs a new UninterpretedOption. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IUninterpretedOption); + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsRequest; - /** UninterpretedOption name. */ - public name: google.protobuf.UninterpretedOption.INamePart[]; + /** + * Verifies a ListSubscriptionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** UninterpretedOption identifierValue. */ - public identifierValue: string; + /** + * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSubscriptionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsRequest; - /** UninterpretedOption positiveIntValue. */ - public positiveIntValue: (number|Long|string); + /** + * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListSubscriptionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** UninterpretedOption negativeIntValue. */ - public negativeIntValue: (number|Long|string); + /** + * Converts this ListSubscriptionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** UninterpretedOption doubleValue. */ - public doubleValue: number; + /** Properties of a ListSubscriptionsResponse. */ + interface IListSubscriptionsResponse { - /** UninterpretedOption stringValue. */ - public stringValue: (Uint8Array|string); + /** ListSubscriptionsResponse subscriptions */ + subscriptions?: (google.pubsub.v1.ISubscription[]|null); - /** UninterpretedOption aggregateValue. */ - public aggregateValue: string; + /** ListSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); + } - /** - * Creates a new UninterpretedOption instance using the specified properties. - * @param [properties] Properties to set - * @returns UninterpretedOption instance - */ - public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; + /** Represents a ListSubscriptionsResponse. */ + class ListSubscriptionsResponse implements IListSubscriptionsResponse { - /** - * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param message UninterpretedOption message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new ListSubscriptionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSubscriptionsResponse); - /** - * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param message UninterpretedOption message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + /** ListSubscriptionsResponse subscriptions. */ + public subscriptions: google.pubsub.v1.ISubscription[]; - /** - * Decodes an UninterpretedOption message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; + /** ListSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; - /** - * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; + /** + * Creates a new ListSubscriptionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSubscriptionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListSubscriptionsResponse): google.pubsub.v1.ListSubscriptionsResponse; - /** - * Verifies an UninterpretedOption message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @param message ListSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UninterpretedOption - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; + /** + * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @param message ListSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. - * @param message UninterpretedOption - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsResponse; - /** - * Converts this UninterpretedOption to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsResponse; - namespace UninterpretedOption { + /** + * Verifies a ListSubscriptionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Properties of a NamePart. */ - interface INamePart { + /** + * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSubscriptionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsResponse; + + /** + * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListSubscriptionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSubscriptionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** NamePart namePart */ - namePart: string; + /** Properties of a DeleteSubscriptionRequest. */ + interface IDeleteSubscriptionRequest { - /** NamePart isExtension */ - isExtension: boolean; + /** DeleteSubscriptionRequest subscription */ + subscription?: (string|null); } - /** Represents a NamePart. */ - class NamePart implements INamePart { + /** Represents a DeleteSubscriptionRequest. */ + class DeleteSubscriptionRequest implements IDeleteSubscriptionRequest { /** - * Constructs a new NamePart. + * Constructs a new DeleteSubscriptionRequest. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.UninterpretedOption.INamePart); - - /** NamePart namePart. */ - public namePart: string; + constructor(properties?: google.pubsub.v1.IDeleteSubscriptionRequest); - /** NamePart isExtension. */ - public isExtension: boolean; + /** DeleteSubscriptionRequest subscription. */ + public subscription: string; /** - * Creates a new NamePart instance using the specified properties. + * Creates a new DeleteSubscriptionRequest instance using the specified properties. * @param [properties] Properties to set - * @returns NamePart instance + * @returns DeleteSubscriptionRequest instance */ - public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; + public static create(properties?: google.pubsub.v1.IDeleteSubscriptionRequest): google.pubsub.v1.DeleteSubscriptionRequest; /** - * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode + * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @param message DeleteSubscriptionRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode + * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @param message DeleteSubscriptionRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a NamePart message from the specified reader or buffer. + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns NamePart + * @returns DeleteSubscriptionRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSubscriptionRequest; /** - * Decodes a NamePart message from the specified reader or buffer, length delimited. + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns NamePart + * @returns DeleteSubscriptionRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSubscriptionRequest; /** - * Verifies a NamePart message. + * Verifies a DeleteSubscriptionRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns NamePart + * @returns DeleteSubscriptionRequest */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSubscriptionRequest; /** - * Creates a plain object from a NamePart message. Also converts values to other types if specified. - * @param message NamePart + * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. + * @param message DeleteSubscriptionRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.DeleteSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this NamePart to JSON. + * Converts this DeleteSubscriptionRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - - /** Properties of a SourceCodeInfo. */ - interface ISourceCodeInfo { - /** SourceCodeInfo location */ - location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); - } + /** Properties of a ModifyPushConfigRequest. */ + interface IModifyPushConfigRequest { - /** Represents a SourceCodeInfo. */ - class SourceCodeInfo implements ISourceCodeInfo { + /** ModifyPushConfigRequest subscription */ + subscription?: (string|null); - /** - * Constructs a new SourceCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.ISourceCodeInfo); + /** ModifyPushConfigRequest pushConfig */ + pushConfig?: (google.pubsub.v1.IPushConfig|null); + } - /** SourceCodeInfo location. */ - public location: google.protobuf.SourceCodeInfo.ILocation[]; + /** Represents a ModifyPushConfigRequest. */ + class ModifyPushConfigRequest implements IModifyPushConfigRequest { - /** - * Creates a new SourceCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns SourceCodeInfo instance - */ - public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; + /** + * Constructs a new ModifyPushConfigRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IModifyPushConfigRequest); - /** - * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + /** ModifyPushConfigRequest subscription. */ + public subscription: string; - /** - * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + /** ModifyPushConfigRequest pushConfig. */ + public pushConfig?: (google.pubsub.v1.IPushConfig|null); - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; + /** + * Creates a new ModifyPushConfigRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ModifyPushConfigRequest instance + */ + public static create(properties?: google.pubsub.v1.IModifyPushConfigRequest): google.pubsub.v1.ModifyPushConfigRequest; - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; + /** + * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @param message ModifyPushConfigRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a SourceCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @param message ModifyPushConfigRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SourceCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyPushConfigRequest; - /** - * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. - * @param message SourceCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyPushConfigRequest; - /** - * Converts this SourceCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Verifies a ModifyPushConfigRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - namespace SourceCodeInfo { + /** + * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ModifyPushConfigRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyPushConfigRequest; - /** Properties of a Location. */ - interface ILocation { + /** + * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. + * @param message ModifyPushConfigRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ModifyPushConfigRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Location path */ - path?: (number[]|null); + /** + * Converts this ModifyPushConfigRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Location span */ - span?: (number[]|null); + /** Properties of a PullRequest. */ + interface IPullRequest { - /** Location leadingComments */ - leadingComments?: (string|null); + /** PullRequest subscription */ + subscription?: (string|null); - /** Location trailingComments */ - trailingComments?: (string|null); + /** PullRequest returnImmediately */ + returnImmediately?: (boolean|null); - /** Location leadingDetachedComments */ - leadingDetachedComments?: (string[]|null); + /** PullRequest maxMessages */ + maxMessages?: (number|null); } - /** Represents a Location. */ - class Location implements ILocation { + /** Represents a PullRequest. */ + class PullRequest implements IPullRequest { /** - * Constructs a new Location. + * Constructs a new PullRequest. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); - - /** Location path. */ - public path: number[]; - - /** Location span. */ - public span: number[]; + constructor(properties?: google.pubsub.v1.IPullRequest); - /** Location leadingComments. */ - public leadingComments: string; + /** PullRequest subscription. */ + public subscription: string; - /** Location trailingComments. */ - public trailingComments: string; + /** PullRequest returnImmediately. */ + public returnImmediately: boolean; - /** Location leadingDetachedComments. */ - public leadingDetachedComments: string[]; + /** PullRequest maxMessages. */ + public maxMessages: number; /** - * Creates a new Location instance using the specified properties. + * Creates a new PullRequest instance using the specified properties. * @param [properties] Properties to set - * @returns Location instance + * @returns PullRequest instance */ - public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; + public static create(properties?: google.pubsub.v1.IPullRequest): google.pubsub.v1.PullRequest; /** - * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode + * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @param message PullRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode + * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @param message PullRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Location message from the specified reader or buffer. + * Decodes a PullRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Location + * @returns PullRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullRequest; /** - * Decodes a Location message from the specified reader or buffer, length delimited. + * Decodes a PullRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Location + * @returns PullRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullRequest; /** - * Verifies a Location message. + * Verifies a PullRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Location message from a plain object. Also converts values to their respective internal types. + * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Location + * @returns PullRequest */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullRequest; /** - * Creates a plain object from a Location message. Also converts values to other types if specified. - * @param message Location + * Creates a plain object from a PullRequest message. Also converts values to other types if specified. + * @param message PullRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.PullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Location to JSON. + * Converts this PullRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - - /** Properties of a GeneratedCodeInfo. */ - interface IGeneratedCodeInfo { - - /** GeneratedCodeInfo annotation */ - annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); - } - /** Represents a GeneratedCodeInfo. */ - class GeneratedCodeInfo implements IGeneratedCodeInfo { + /** Properties of a PullResponse. */ + interface IPullResponse { - /** - * Constructs a new GeneratedCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IGeneratedCodeInfo); + /** PullResponse receivedMessages */ + receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + } - /** GeneratedCodeInfo annotation. */ - public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; + /** Represents a PullResponse. */ + class PullResponse implements IPullResponse { - /** - * Creates a new GeneratedCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns GeneratedCodeInfo instance - */ - public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; + /** + * Constructs a new PullResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPullResponse); - /** - * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + /** PullResponse receivedMessages. */ + public receivedMessages: google.pubsub.v1.IReceivedMessage[]; - /** - * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new PullResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns PullResponse instance + */ + public static create(properties?: google.pubsub.v1.IPullResponse): google.pubsub.v1.PullResponse; - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; + /** + * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @param message PullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; + /** + * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @param message PullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a GeneratedCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a PullResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullResponse; - /** - * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GeneratedCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; + /** + * Decodes a PullResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullResponse; - /** - * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. - * @param message GeneratedCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Verifies a PullResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Converts this GeneratedCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PullResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullResponse; - namespace GeneratedCodeInfo { + /** + * Creates a plain object from a PullResponse message. Also converts values to other types if specified. + * @param message PullResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Properties of an Annotation. */ - interface IAnnotation { + /** + * Converts this PullResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Annotation path */ - path?: (number[]|null); + /** Properties of a ModifyAckDeadlineRequest. */ + interface IModifyAckDeadlineRequest { - /** Annotation sourceFile */ - sourceFile?: (string|null); + /** ModifyAckDeadlineRequest subscription */ + subscription?: (string|null); - /** Annotation begin */ - begin?: (number|null); + /** ModifyAckDeadlineRequest ackIds */ + ackIds?: (string[]|null); - /** Annotation end */ - end?: (number|null); + /** ModifyAckDeadlineRequest ackDeadlineSeconds */ + ackDeadlineSeconds?: (number|null); } - /** Represents an Annotation. */ - class Annotation implements IAnnotation { + /** Represents a ModifyAckDeadlineRequest. */ + class ModifyAckDeadlineRequest implements IModifyAckDeadlineRequest { /** - * Constructs a new Annotation. + * Constructs a new ModifyAckDeadlineRequest. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); - - /** Annotation path. */ - public path: number[]; + constructor(properties?: google.pubsub.v1.IModifyAckDeadlineRequest); - /** Annotation sourceFile. */ - public sourceFile: string; + /** ModifyAckDeadlineRequest subscription. */ + public subscription: string; - /** Annotation begin. */ - public begin: number; + /** ModifyAckDeadlineRequest ackIds. */ + public ackIds: string[]; - /** Annotation end. */ - public end: number; + /** ModifyAckDeadlineRequest ackDeadlineSeconds. */ + public ackDeadlineSeconds: number; /** - * Creates a new Annotation instance using the specified properties. + * Creates a new ModifyAckDeadlineRequest instance using the specified properties. * @param [properties] Properties to set - * @returns Annotation instance + * @returns ModifyAckDeadlineRequest instance */ - public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; + public static create(properties?: google.pubsub.v1.IModifyAckDeadlineRequest): google.pubsub.v1.ModifyAckDeadlineRequest; /** - * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode + * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @param message ModifyAckDeadlineRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode + * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @param message ModifyAckDeadlineRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an Annotation message from the specified reader or buffer. + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Annotation + * @returns ModifyAckDeadlineRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyAckDeadlineRequest; /** - * Decodes an Annotation message from the specified reader or buffer, length delimited. + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Annotation + * @returns ModifyAckDeadlineRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyAckDeadlineRequest; /** - * Verifies an Annotation message. + * Verifies a ModifyAckDeadlineRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Annotation + * @returns ModifyAckDeadlineRequest */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyAckDeadlineRequest; /** - * Creates a plain object from an Annotation message. Also converts values to other types if specified. - * @param message Annotation + * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. + * @param message ModifyAckDeadlineRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ModifyAckDeadlineRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Annotation to JSON. + * Converts this ModifyAckDeadlineRequest to JSON. * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - - /** Properties of a Duration. */ - interface IDuration { - - /** Duration seconds */ - seconds?: (number|Long|string|null); - - /** Duration nanos */ - nanos?: (number|null); - } - - /** Represents a Duration. */ - class Duration implements IDuration { - - /** - * Constructs a new Duration. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IDuration); - - /** Duration seconds. */ - public seconds: (number|Long|string); - - /** Duration nanos. */ - public nanos: number; - - /** - * Creates a new Duration instance using the specified properties. - * @param [properties] Properties to set - * @returns Duration instance - */ - public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; - - /** - * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @param message Duration message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @param message Duration message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Duration message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; - - /** - * Decodes a Duration message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; - - /** - * Verifies a Duration message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Duration message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Duration - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; - - /** - * Creates a plain object from a Duration message. Also converts values to other types if specified. - * @param message Duration - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Duration to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an Empty. */ - interface IEmpty { - } - - /** Represents an Empty. */ - class Empty implements IEmpty { - - /** - * Constructs a new Empty. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEmpty); - - /** - * Creates a new Empty instance using the specified properties. - * @param [properties] Properties to set - * @returns Empty instance - */ - public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; - - /** - * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @param message Empty message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @param message Empty message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an Empty message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; - - /** - * Decodes an Empty message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; - - /** - * Verifies an Empty message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an Empty message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Empty - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; - - /** - * Creates a plain object from an Empty message. Also converts values to other types if specified. - * @param message Empty - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Empty to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a FieldMask. */ - interface IFieldMask { - - /** FieldMask paths */ - paths?: (string[]|null); - } - - /** Represents a FieldMask. */ - class FieldMask implements IFieldMask { - - /** - * Constructs a new FieldMask. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldMask); + */ + public toJSON(): { [k: string]: any }; + } - /** FieldMask paths. */ - public paths: string[]; + /** Properties of an AcknowledgeRequest. */ + interface IAcknowledgeRequest { - /** - * Creates a new FieldMask instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldMask instance - */ - public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; + /** AcknowledgeRequest subscription */ + subscription?: (string|null); - /** - * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @param message FieldMask message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + /** AcknowledgeRequest ackIds */ + ackIds?: (string[]|null); + } - /** - * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @param message FieldMask message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents an AcknowledgeRequest. */ + class AcknowledgeRequest implements IAcknowledgeRequest { - /** - * Decodes a FieldMask message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; + /** + * Constructs a new AcknowledgeRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IAcknowledgeRequest); - /** - * Decodes a FieldMask message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; + /** AcknowledgeRequest subscription. */ + public subscription: string; - /** - * Verifies a FieldMask message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** AcknowledgeRequest ackIds. */ + public ackIds: string[]; - /** - * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldMask - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; + /** + * Creates a new AcknowledgeRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns AcknowledgeRequest instance + */ + public static create(properties?: google.pubsub.v1.IAcknowledgeRequest): google.pubsub.v1.AcknowledgeRequest; - /** - * Creates a plain object from a FieldMask message. Also converts values to other types if specified. - * @param message FieldMask - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @param message AcknowledgeRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this FieldMask to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @param message AcknowledgeRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a Timestamp. */ - interface ITimestamp { + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.AcknowledgeRequest; - /** Timestamp seconds */ - seconds?: (number|Long|string|null); + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.AcknowledgeRequest; - /** Timestamp nanos */ - nanos?: (number|null); - } + /** + * Verifies an AcknowledgeRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Represents a Timestamp. */ - class Timestamp implements ITimestamp { + /** + * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AcknowledgeRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.AcknowledgeRequest; - /** - * Constructs a new Timestamp. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.ITimestamp); + /** + * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. + * @param message AcknowledgeRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.AcknowledgeRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Timestamp seconds. */ - public seconds: (number|Long|string); + /** + * Converts this AcknowledgeRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Timestamp nanos. */ - public nanos: number; + /** Properties of a StreamingPullRequest. */ + interface IStreamingPullRequest { - /** - * Creates a new Timestamp instance using the specified properties. - * @param [properties] Properties to set - * @returns Timestamp instance - */ - public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; + /** StreamingPullRequest subscription */ + subscription?: (string|null); - /** - * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @param message Timestamp message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + /** StreamingPullRequest ackIds */ + ackIds?: (string[]|null); - /** - * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @param message Timestamp message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + /** StreamingPullRequest modifyDeadlineSeconds */ + modifyDeadlineSeconds?: (number[]|null); - /** - * Decodes a Timestamp message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Timestamp - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; + /** StreamingPullRequest modifyDeadlineAckIds */ + modifyDeadlineAckIds?: (string[]|null); - /** - * Decodes a Timestamp message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Timestamp - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; + /** StreamingPullRequest streamAckDeadlineSeconds */ + streamAckDeadlineSeconds?: (number|null); - /** - * Verifies a Timestamp message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** StreamingPullRequest clientId */ + clientId?: (string|null); + } - /** - * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Timestamp - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; + /** Represents a StreamingPullRequest. */ + class StreamingPullRequest implements IStreamingPullRequest { - /** - * Creates a plain object from a Timestamp message. Also converts values to other types if specified. - * @param message Timestamp - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Constructs a new StreamingPullRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IStreamingPullRequest); - /** - * Converts this Timestamp to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } + /** StreamingPullRequest subscription. */ + public subscription: string; - /** Namespace iam. */ - namespace iam { + /** StreamingPullRequest ackIds. */ + public ackIds: string[]; - /** Namespace v1. */ - namespace v1 { + /** StreamingPullRequest modifyDeadlineSeconds. */ + public modifyDeadlineSeconds: number[]; - /** Represents a IAMPolicy */ - class IAMPolicy extends $protobuf.rpc.Service { + /** StreamingPullRequest modifyDeadlineAckIds. */ + public modifyDeadlineAckIds: string[]; - /** - * Constructs a new IAMPolicy service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + /** StreamingPullRequest streamAckDeadlineSeconds. */ + public streamAckDeadlineSeconds: number; - /** - * Creates new IAMPolicy service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): IAMPolicy; + /** StreamingPullRequest clientId. */ + public clientId: string; /** - * Calls SetIamPolicy. - * @param request SetIamPolicyRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Policy + * Creates a new StreamingPullRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns StreamingPullRequest instance */ - public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.SetIamPolicyCallback): void; + public static create(properties?: google.pubsub.v1.IStreamingPullRequest): google.pubsub.v1.StreamingPullRequest; /** - * Calls SetIamPolicy. - * @param request SetIamPolicyRequest message or plain object - * @returns Promise + * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @param message StreamingPullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest): Promise; + public static encode(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Calls GetIamPolicy. - * @param request GetIamPolicyRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Policy + * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @param message StreamingPullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer */ - public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.GetIamPolicyCallback): void; + public static encodeDelimited(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Calls GetIamPolicy. - * @param request GetIamPolicyRequest message or plain object - * @returns Promise + * Decodes a StreamingPullRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest): Promise; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullRequest; /** - * Calls TestIamPermissions. - * @param request TestIamPermissionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and TestIamPermissionsResponse + * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest, callback: google.iam.v1.IAMPolicy.TestIamPermissionsCallback): void; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullRequest; /** - * Calls TestIamPermissions. - * @param request TestIamPermissionsRequest message or plain object - * @returns Promise + * Verifies a StreamingPullRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not */ - public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest): Promise; - } - - namespace IAMPolicy { + public static verify(message: { [k: string]: any }): (string|null); /** - * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. - * @param error Error, if any - * @param [response] Policy + * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns StreamingPullRequest */ - type SetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullRequest; /** - * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. - * @param error Error, if any - * @param [response] Policy + * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. + * @param message StreamingPullRequest + * @param [options] Conversion options + * @returns Plain object */ - type GetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; + public static toObject(message: google.pubsub.v1.StreamingPullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. - * @param error Error, if any - * @param [response] TestIamPermissionsResponse + * Converts this StreamingPullRequest to JSON. + * @returns JSON object */ - type TestIamPermissionsCallback = (error: (Error|null), response?: google.iam.v1.TestIamPermissionsResponse) => void; + public toJSON(): { [k: string]: any }; } - /** Properties of a SetIamPolicyRequest. */ - interface ISetIamPolicyRequest { - - /** SetIamPolicyRequest resource */ - resource?: (string|null); + /** Properties of a StreamingPullResponse. */ + interface IStreamingPullResponse { - /** SetIamPolicyRequest policy */ - policy?: (google.iam.v1.IPolicy|null); + /** StreamingPullResponse receivedMessages */ + receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); } - /** Represents a SetIamPolicyRequest. */ - class SetIamPolicyRequest implements ISetIamPolicyRequest { + /** Represents a StreamingPullResponse. */ + class StreamingPullResponse implements IStreamingPullResponse { /** - * Constructs a new SetIamPolicyRequest. + * Constructs a new StreamingPullResponse. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.ISetIamPolicyRequest); - - /** SetIamPolicyRequest resource. */ - public resource: string; + constructor(properties?: google.pubsub.v1.IStreamingPullResponse); - /** SetIamPolicyRequest policy. */ - public policy?: (google.iam.v1.IPolicy|null); + /** StreamingPullResponse receivedMessages. */ + public receivedMessages: google.pubsub.v1.IReceivedMessage[]; /** - * Creates a new SetIamPolicyRequest instance using the specified properties. + * Creates a new StreamingPullResponse instance using the specified properties. * @param [properties] Properties to set - * @returns SetIamPolicyRequest instance + * @returns StreamingPullResponse instance */ - public static create(properties?: google.iam.v1.ISetIamPolicyRequest): google.iam.v1.SetIamPolicyRequest; + public static create(properties?: google.pubsub.v1.IStreamingPullResponse): google.pubsub.v1.StreamingPullResponse; /** - * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @param message SetIamPolicyRequest message or plain object to encode + * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @param message StreamingPullResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @param message SetIamPolicyRequest message or plain object to encode + * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @param message StreamingPullResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer. + * Decodes a StreamingPullResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns SetIamPolicyRequest + * @returns StreamingPullResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.SetIamPolicyRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse; /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. + * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns SetIamPolicyRequest + * @returns StreamingPullResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.SetIamPolicyRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse; /** - * Verifies a SetIamPolicyRequest message. + * Verifies a StreamingPullResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns SetIamPolicyRequest + * @returns StreamingPullResponse */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.SetIamPolicyRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse; /** - * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. - * @param message SetIamPolicyRequest + * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. + * @param message StreamingPullResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.SetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.StreamingPullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this SetIamPolicyRequest to JSON. + * Converts this StreamingPullResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a GetIamPolicyRequest. */ - interface IGetIamPolicyRequest { + /** Properties of a CreateSnapshotRequest. */ + interface ICreateSnapshotRequest { - /** GetIamPolicyRequest resource */ - resource?: (string|null); + /** CreateSnapshotRequest name */ + name?: (string|null); - /** GetIamPolicyRequest options */ - options?: (google.iam.v1.IGetPolicyOptions|null); + /** CreateSnapshotRequest subscription */ + subscription?: (string|null); + + /** CreateSnapshotRequest labels */ + labels?: ({ [k: string]: string }|null); } - /** Represents a GetIamPolicyRequest. */ - class GetIamPolicyRequest implements IGetIamPolicyRequest { + /** Represents a CreateSnapshotRequest. */ + class CreateSnapshotRequest implements ICreateSnapshotRequest { /** - * Constructs a new GetIamPolicyRequest. + * Constructs a new CreateSnapshotRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IGetIamPolicyRequest); + constructor(properties?: google.pubsub.v1.ICreateSnapshotRequest); - /** GetIamPolicyRequest resource. */ - public resource: string; + /** CreateSnapshotRequest name. */ + public name: string; - /** GetIamPolicyRequest options. */ - public options?: (google.iam.v1.IGetPolicyOptions|null); + /** CreateSnapshotRequest subscription. */ + public subscription: string; + + /** CreateSnapshotRequest labels. */ + public labels: { [k: string]: string }; /** - * Creates a new GetIamPolicyRequest instance using the specified properties. + * Creates a new CreateSnapshotRequest instance using the specified properties. * @param [properties] Properties to set - * @returns GetIamPolicyRequest instance + * @returns CreateSnapshotRequest instance */ - public static create(properties?: google.iam.v1.IGetIamPolicyRequest): google.iam.v1.GetIamPolicyRequest; + public static create(properties?: google.pubsub.v1.ICreateSnapshotRequest): google.pubsub.v1.CreateSnapshotRequest; /** - * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. - * @param message GetIamPolicyRequest message or plain object to encode + * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @param message CreateSnapshotRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. - * @param message GetIamPolicyRequest message or plain object to encode + * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @param message CreateSnapshotRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer. + * Decodes a CreateSnapshotRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns GetIamPolicyRequest + * @returns CreateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetIamPolicyRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CreateSnapshotRequest; /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. + * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns GetIamPolicyRequest + * @returns CreateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetIamPolicyRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CreateSnapshotRequest; /** - * Verifies a GetIamPolicyRequest message. + * Verifies a CreateSnapshotRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns GetIamPolicyRequest + * @returns CreateSnapshotRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.GetIamPolicyRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CreateSnapshotRequest; /** - * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. - * @param message GetIamPolicyRequest + * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. + * @param message CreateSnapshotRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.GetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.CreateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this GetIamPolicyRequest to JSON. + * Converts this CreateSnapshotRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a TestIamPermissionsRequest. */ - interface ITestIamPermissionsRequest { + /** Properties of an UpdateSnapshotRequest. */ + interface IUpdateSnapshotRequest { - /** TestIamPermissionsRequest resource */ - resource?: (string|null); + /** UpdateSnapshotRequest snapshot */ + snapshot?: (google.pubsub.v1.ISnapshot|null); - /** TestIamPermissionsRequest permissions */ - permissions?: (string[]|null); + /** UpdateSnapshotRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); } - /** Represents a TestIamPermissionsRequest. */ - class TestIamPermissionsRequest implements ITestIamPermissionsRequest { + /** Represents an UpdateSnapshotRequest. */ + class UpdateSnapshotRequest implements IUpdateSnapshotRequest { /** - * Constructs a new TestIamPermissionsRequest. + * Constructs a new UpdateSnapshotRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.ITestIamPermissionsRequest); + constructor(properties?: google.pubsub.v1.IUpdateSnapshotRequest); - /** TestIamPermissionsRequest resource. */ - public resource: string; + /** UpdateSnapshotRequest snapshot. */ + public snapshot?: (google.pubsub.v1.ISnapshot|null); - /** TestIamPermissionsRequest permissions. */ - public permissions: string[]; + /** UpdateSnapshotRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); /** - * Creates a new TestIamPermissionsRequest instance using the specified properties. + * Creates a new UpdateSnapshotRequest instance using the specified properties. * @param [properties] Properties to set - * @returns TestIamPermissionsRequest instance + * @returns UpdateSnapshotRequest instance */ - public static create(properties?: google.iam.v1.ITestIamPermissionsRequest): google.iam.v1.TestIamPermissionsRequest; + public static create(properties?: google.pubsub.v1.IUpdateSnapshotRequest): google.pubsub.v1.UpdateSnapshotRequest; /** - * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. - * @param message TestIamPermissionsRequest message or plain object to encode + * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @param message UpdateSnapshotRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. - * @param message TestIamPermissionsRequest message or plain object to encode + * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @param message UpdateSnapshotRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns TestIamPermissionsRequest + * @returns UpdateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSnapshotRequest; /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns TestIamPermissionsRequest + * @returns UpdateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSnapshotRequest; /** - * Verifies a TestIamPermissionsRequest message. + * Verifies an UpdateSnapshotRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. + * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns TestIamPermissionsRequest + * @returns UpdateSnapshotRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSnapshotRequest; /** - * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. - * @param message TestIamPermissionsRequest + * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. + * @param message UpdateSnapshotRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.TestIamPermissionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.UpdateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this TestIamPermissionsRequest to JSON. + * Converts this UpdateSnapshotRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a TestIamPermissionsResponse. */ - interface ITestIamPermissionsResponse { + /** Properties of a Snapshot. */ + interface ISnapshot { - /** TestIamPermissionsResponse permissions */ - permissions?: (string[]|null); + /** Snapshot name */ + name?: (string|null); + + /** Snapshot topic */ + topic?: (string|null); + + /** Snapshot expireTime */ + expireTime?: (google.protobuf.ITimestamp|null); + + /** Snapshot labels */ + labels?: ({ [k: string]: string }|null); } - /** Represents a TestIamPermissionsResponse. */ - class TestIamPermissionsResponse implements ITestIamPermissionsResponse { + /** Represents a Snapshot. */ + class Snapshot implements ISnapshot { /** - * Constructs a new TestIamPermissionsResponse. + * Constructs a new Snapshot. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.ITestIamPermissionsResponse); + constructor(properties?: google.pubsub.v1.ISnapshot); - /** TestIamPermissionsResponse permissions. */ - public permissions: string[]; + /** Snapshot name. */ + public name: string; + + /** Snapshot topic. */ + public topic: string; + + /** Snapshot expireTime. */ + public expireTime?: (google.protobuf.ITimestamp|null); + + /** Snapshot labels. */ + public labels: { [k: string]: string }; /** - * Creates a new TestIamPermissionsResponse instance using the specified properties. + * Creates a new Snapshot instance using the specified properties. * @param [properties] Properties to set - * @returns TestIamPermissionsResponse instance + * @returns Snapshot instance */ - public static create(properties?: google.iam.v1.ITestIamPermissionsResponse): google.iam.v1.TestIamPermissionsResponse; + public static create(properties?: google.pubsub.v1.ISnapshot): google.pubsub.v1.Snapshot; /** - * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. - * @param message TestIamPermissionsResponse message or plain object to encode + * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @param message Snapshot message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. - * @param message TestIamPermissionsResponse message or plain object to encode + * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @param message Snapshot message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. + * Decodes a Snapshot message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns TestIamPermissionsResponse + * @returns Snapshot * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Snapshot; /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. + * Decodes a Snapshot message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns TestIamPermissionsResponse + * @returns Snapshot * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Snapshot; /** - * Verifies a TestIamPermissionsResponse message. + * Verifies a Snapshot message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns TestIamPermissionsResponse + * @returns Snapshot */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsResponse; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Snapshot; /** - * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. - * @param message TestIamPermissionsResponse + * Creates a plain object from a Snapshot message. Also converts values to other types if specified. + * @param message Snapshot * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.TestIamPermissionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.Snapshot, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this TestIamPermissionsResponse to JSON. + * Converts this Snapshot to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a GetPolicyOptions. */ - interface IGetPolicyOptions { + /** Properties of a GetSnapshotRequest. */ + interface IGetSnapshotRequest { - /** GetPolicyOptions requestedPolicyVersion */ - requestedPolicyVersion?: (number|null); + /** GetSnapshotRequest snapshot */ + snapshot?: (string|null); } - /** Represents a GetPolicyOptions. */ - class GetPolicyOptions implements IGetPolicyOptions { + /** Represents a GetSnapshotRequest. */ + class GetSnapshotRequest implements IGetSnapshotRequest { /** - * Constructs a new GetPolicyOptions. + * Constructs a new GetSnapshotRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IGetPolicyOptions); + constructor(properties?: google.pubsub.v1.IGetSnapshotRequest); - /** GetPolicyOptions requestedPolicyVersion. */ - public requestedPolicyVersion: number; + /** GetSnapshotRequest snapshot. */ + public snapshot: string; /** - * Creates a new GetPolicyOptions instance using the specified properties. + * Creates a new GetSnapshotRequest instance using the specified properties. * @param [properties] Properties to set - * @returns GetPolicyOptions instance + * @returns GetSnapshotRequest instance */ - public static create(properties?: google.iam.v1.IGetPolicyOptions): google.iam.v1.GetPolicyOptions; + public static create(properties?: google.pubsub.v1.IGetSnapshotRequest): google.pubsub.v1.GetSnapshotRequest; /** - * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. - * @param message GetPolicyOptions message or plain object to encode + * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @param message GetSnapshotRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. - * @param message GetPolicyOptions message or plain object to encode + * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @param message GetSnapshotRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a GetPolicyOptions message from the specified reader or buffer. + * Decodes a GetSnapshotRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns GetPolicyOptions + * @returns GetSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetPolicyOptions; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSnapshotRequest; /** - * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. + * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns GetPolicyOptions + * @returns GetSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetPolicyOptions; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSnapshotRequest; /** - * Verifies a GetPolicyOptions message. + * Verifies a GetSnapshotRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. + * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns GetPolicyOptions + * @returns GetSnapshotRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.GetPolicyOptions; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSnapshotRequest; /** - * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. - * @param message GetPolicyOptions + * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. + * @param message GetSnapshotRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.GetPolicyOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.GetSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this GetPolicyOptions to JSON. + * Converts this GetSnapshotRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a Policy. */ - interface IPolicy { + /** Properties of a ListSnapshotsRequest. */ + interface IListSnapshotsRequest { - /** Policy version */ - version?: (number|null); + /** ListSnapshotsRequest project */ + project?: (string|null); - /** Policy bindings */ - bindings?: (google.iam.v1.IBinding[]|null); + /** ListSnapshotsRequest pageSize */ + pageSize?: (number|null); - /** Policy etag */ - etag?: (Uint8Array|string|null); + /** ListSnapshotsRequest pageToken */ + pageToken?: (string|null); } - /** Represents a Policy. */ - class Policy implements IPolicy { + /** Represents a ListSnapshotsRequest. */ + class ListSnapshotsRequest implements IListSnapshotsRequest { /** - * Constructs a new Policy. + * Constructs a new ListSnapshotsRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IPolicy); - - /** Policy version. */ - public version: number; + constructor(properties?: google.pubsub.v1.IListSnapshotsRequest); - /** Policy bindings. */ - public bindings: google.iam.v1.IBinding[]; + /** ListSnapshotsRequest project. */ + public project: string; - /** Policy etag. */ - public etag: (Uint8Array|string); + /** ListSnapshotsRequest pageSize. */ + public pageSize: number; + + /** ListSnapshotsRequest pageToken. */ + public pageToken: string; /** - * Creates a new Policy instance using the specified properties. + * Creates a new ListSnapshotsRequest instance using the specified properties. * @param [properties] Properties to set - * @returns Policy instance + * @returns ListSnapshotsRequest instance */ - public static create(properties?: google.iam.v1.IPolicy): google.iam.v1.Policy; + public static create(properties?: google.pubsub.v1.IListSnapshotsRequest): google.pubsub.v1.ListSnapshotsRequest; /** - * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @param message Policy message or plain object to encode + * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @param message ListSnapshotsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @param message Policy message or plain object to encode + * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @param message ListSnapshotsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Policy message from the specified reader or buffer. + * Decodes a ListSnapshotsRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Policy + * @returns ListSnapshotsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Policy; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsRequest; /** - * Decodes a Policy message from the specified reader or buffer, length delimited. + * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Policy + * @returns ListSnapshotsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Policy; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsRequest; /** - * Verifies a Policy message. + * Verifies a ListSnapshotsRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Policy message from a plain object. Also converts values to their respective internal types. + * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Policy + * @returns ListSnapshotsRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.Policy; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsRequest; /** - * Creates a plain object from a Policy message. Also converts values to other types if specified. - * @param message Policy + * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListSnapshotsRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.Policy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Policy to JSON. + * Converts this ListSnapshotsRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a Binding. */ - interface IBinding { - - /** Binding role */ - role?: (string|null); + /** Properties of a ListSnapshotsResponse. */ + interface IListSnapshotsResponse { - /** Binding members */ - members?: (string[]|null); + /** ListSnapshotsResponse snapshots */ + snapshots?: (google.pubsub.v1.ISnapshot[]|null); - /** Binding condition */ - condition?: (google.type.IExpr|null); + /** ListSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); } - /** Represents a Binding. */ - class Binding implements IBinding { + /** Represents a ListSnapshotsResponse. */ + class ListSnapshotsResponse implements IListSnapshotsResponse { /** - * Constructs a new Binding. + * Constructs a new ListSnapshotsResponse. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IBinding); - - /** Binding role. */ - public role: string; + constructor(properties?: google.pubsub.v1.IListSnapshotsResponse); - /** Binding members. */ - public members: string[]; + /** ListSnapshotsResponse snapshots. */ + public snapshots: google.pubsub.v1.ISnapshot[]; - /** Binding condition. */ - public condition?: (google.type.IExpr|null); + /** ListSnapshotsResponse nextPageToken. */ + public nextPageToken: string; /** - * Creates a new Binding instance using the specified properties. + * Creates a new ListSnapshotsResponse instance using the specified properties. * @param [properties] Properties to set - * @returns Binding instance + * @returns ListSnapshotsResponse instance */ - public static create(properties?: google.iam.v1.IBinding): google.iam.v1.Binding; + public static create(properties?: google.pubsub.v1.IListSnapshotsResponse): google.pubsub.v1.ListSnapshotsResponse; /** - * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @param message Binding message or plain object to encode + * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @param message ListSnapshotsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @param message Binding message or plain object to encode + * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @param message ListSnapshotsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Binding message from the specified reader or buffer. + * Decodes a ListSnapshotsResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Binding + * @returns ListSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Binding; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsResponse; /** - * Decodes a Binding message from the specified reader or buffer, length delimited. + * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Binding + * @returns ListSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Binding; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsResponse; /** - * Verifies a Binding message. + * Verifies a ListSnapshotsResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Binding message from a plain object. Also converts values to their respective internal types. + * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Binding + * @returns ListSnapshotsResponse */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.Binding; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsResponse; /** - * Creates a plain object from a Binding message. Also converts values to other types if specified. - * @param message Binding + * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListSnapshotsResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.Binding, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Binding to JSON. + * Converts this ListSnapshotsResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a PolicyDelta. */ - interface IPolicyDelta { - - /** PolicyDelta bindingDeltas */ - bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); + /** Properties of a DeleteSnapshotRequest. */ + interface IDeleteSnapshotRequest { - /** PolicyDelta auditConfigDeltas */ - auditConfigDeltas?: (google.iam.v1.IAuditConfigDelta[]|null); + /** DeleteSnapshotRequest snapshot */ + snapshot?: (string|null); } - /** Represents a PolicyDelta. */ - class PolicyDelta implements IPolicyDelta { + /** Represents a DeleteSnapshotRequest. */ + class DeleteSnapshotRequest implements IDeleteSnapshotRequest { /** - * Constructs a new PolicyDelta. + * Constructs a new DeleteSnapshotRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IPolicyDelta); - - /** PolicyDelta bindingDeltas. */ - public bindingDeltas: google.iam.v1.IBindingDelta[]; + constructor(properties?: google.pubsub.v1.IDeleteSnapshotRequest); - /** PolicyDelta auditConfigDeltas. */ - public auditConfigDeltas: google.iam.v1.IAuditConfigDelta[]; + /** DeleteSnapshotRequest snapshot. */ + public snapshot: string; /** - * Creates a new PolicyDelta instance using the specified properties. + * Creates a new DeleteSnapshotRequest instance using the specified properties. * @param [properties] Properties to set - * @returns PolicyDelta instance + * @returns DeleteSnapshotRequest instance */ - public static create(properties?: google.iam.v1.IPolicyDelta): google.iam.v1.PolicyDelta; + public static create(properties?: google.pubsub.v1.IDeleteSnapshotRequest): google.pubsub.v1.DeleteSnapshotRequest; /** - * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. - * @param message PolicyDelta message or plain object to encode + * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @param message DeleteSnapshotRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. - * @param message PolicyDelta message or plain object to encode + * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @param message DeleteSnapshotRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PolicyDelta message from the specified reader or buffer. + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PolicyDelta + * @returns DeleteSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.PolicyDelta; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSnapshotRequest; /** - * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PolicyDelta + * @returns DeleteSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.PolicyDelta; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSnapshotRequest; /** - * Verifies a PolicyDelta message. + * Verifies a DeleteSnapshotRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. + * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PolicyDelta + * @returns DeleteSnapshotRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.PolicyDelta; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSnapshotRequest; /** - * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. - * @param message PolicyDelta + * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. + * @param message DeleteSnapshotRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.PolicyDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.DeleteSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PolicyDelta to JSON. + * Converts this DeleteSnapshotRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a BindingDelta. */ - interface IBindingDelta { - - /** BindingDelta action */ - action?: (google.iam.v1.BindingDelta.Action|keyof typeof google.iam.v1.BindingDelta.Action|null); + /** Properties of a SeekRequest. */ + interface ISeekRequest { - /** BindingDelta role */ - role?: (string|null); + /** SeekRequest subscription */ + subscription?: (string|null); - /** BindingDelta member */ - member?: (string|null); + /** SeekRequest time */ + time?: (google.protobuf.ITimestamp|null); - /** BindingDelta condition */ - condition?: (google.type.IExpr|null); + /** SeekRequest snapshot */ + snapshot?: (string|null); } - /** Represents a BindingDelta. */ - class BindingDelta implements IBindingDelta { + /** Represents a SeekRequest. */ + class SeekRequest implements ISeekRequest { /** - * Constructs a new BindingDelta. + * Constructs a new SeekRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IBindingDelta); + constructor(properties?: google.pubsub.v1.ISeekRequest); - /** BindingDelta action. */ - public action: (google.iam.v1.BindingDelta.Action|keyof typeof google.iam.v1.BindingDelta.Action); + /** SeekRequest subscription. */ + public subscription: string; - /** BindingDelta role. */ - public role: string; + /** SeekRequest time. */ + public time?: (google.protobuf.ITimestamp|null); - /** BindingDelta member. */ - public member: string; + /** SeekRequest snapshot. */ + public snapshot: string; - /** BindingDelta condition. */ - public condition?: (google.type.IExpr|null); + /** SeekRequest target. */ + public target?: ("time"|"snapshot"); /** - * Creates a new BindingDelta instance using the specified properties. + * Creates a new SeekRequest instance using the specified properties. * @param [properties] Properties to set - * @returns BindingDelta instance + * @returns SeekRequest instance */ - public static create(properties?: google.iam.v1.IBindingDelta): google.iam.v1.BindingDelta; + public static create(properties?: google.pubsub.v1.ISeekRequest): google.pubsub.v1.SeekRequest; /** - * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. - * @param message BindingDelta message or plain object to encode + * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @param message SeekRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. - * @param message BindingDelta message or plain object to encode + * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @param message SeekRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a BindingDelta message from the specified reader or buffer. + * Decodes a SeekRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns BindingDelta + * @returns SeekRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.BindingDelta; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekRequest; /** - * Decodes a BindingDelta message from the specified reader or buffer, length delimited. + * Decodes a SeekRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns BindingDelta + * @returns SeekRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.BindingDelta; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekRequest; /** - * Verifies a BindingDelta message. + * Verifies a SeekRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. + * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns BindingDelta + * @returns SeekRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.BindingDelta; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekRequest; /** - * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. - * @param message BindingDelta + * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. + * @param message SeekRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.BindingDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.SeekRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this BindingDelta to JSON. + * Converts this SeekRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - namespace BindingDelta { - - /** Action enum. */ - enum Action { - ACTION_UNSPECIFIED = 0, - ADD = 1, - REMOVE = 2 - } - } - - /** Properties of an AuditConfigDelta. */ - interface IAuditConfigDelta { - - /** AuditConfigDelta action */ - action?: (google.iam.v1.AuditConfigDelta.Action|keyof typeof google.iam.v1.AuditConfigDelta.Action|null); - - /** AuditConfigDelta service */ - service?: (string|null); - - /** AuditConfigDelta exemptedMember */ - exemptedMember?: (string|null); - - /** AuditConfigDelta logType */ - logType?: (string|null); + /** Properties of a SeekResponse. */ + interface ISeekResponse { } - /** Represents an AuditConfigDelta. */ - class AuditConfigDelta implements IAuditConfigDelta { + /** Represents a SeekResponse. */ + class SeekResponse implements ISeekResponse { /** - * Constructs a new AuditConfigDelta. + * Constructs a new SeekResponse. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IAuditConfigDelta); - - /** AuditConfigDelta action. */ - public action: (google.iam.v1.AuditConfigDelta.Action|keyof typeof google.iam.v1.AuditConfigDelta.Action); - - /** AuditConfigDelta service. */ - public service: string; - - /** AuditConfigDelta exemptedMember. */ - public exemptedMember: string; - - /** AuditConfigDelta logType. */ - public logType: string; + constructor(properties?: google.pubsub.v1.ISeekResponse); /** - * Creates a new AuditConfigDelta instance using the specified properties. + * Creates a new SeekResponse instance using the specified properties. * @param [properties] Properties to set - * @returns AuditConfigDelta instance + * @returns SeekResponse instance */ - public static create(properties?: google.iam.v1.IAuditConfigDelta): google.iam.v1.AuditConfigDelta; + public static create(properties?: google.pubsub.v1.ISeekResponse): google.pubsub.v1.SeekResponse; /** - * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. - * @param message AuditConfigDelta message or plain object to encode + * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @param message SeekResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. - * @param message AuditConfigDelta message or plain object to encode + * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @param message SeekResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an AuditConfigDelta message from the specified reader or buffer. + * Decodes a SeekResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns AuditConfigDelta + * @returns SeekResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.AuditConfigDelta; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekResponse; /** - * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. + * Decodes a SeekResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns AuditConfigDelta + * @returns SeekResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.AuditConfigDelta; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekResponse; /** - * Verifies an AuditConfigDelta message. + * Verifies a SeekResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. + * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns AuditConfigDelta + * @returns SeekResponse */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.AuditConfigDelta; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekResponse; /** - * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. - * @param message AuditConfigDelta + * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. + * @param message SeekResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.AuditConfigDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.SeekResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this AuditConfigDelta to JSON. + * Converts this SeekResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - - namespace AuditConfigDelta { - - /** Action enum. */ - enum Action { - ACTION_UNSPECIFIED = 0, - ADD = 1, - REMOVE = 2 - } - } - } - } - - /** Namespace type. */ - namespace type { - - /** Properties of an Expr. */ - interface IExpr { - - /** Expr expression */ - expression?: (string|null); - - /** Expr title */ - title?: (string|null); - - /** Expr description */ - description?: (string|null); - - /** Expr location */ - location?: (string|null); - } - - /** Represents an Expr. */ - class Expr implements IExpr { - - /** - * Constructs a new Expr. - * @param [properties] Properties to set - */ - constructor(properties?: google.type.IExpr); - - /** Expr expression. */ - public expression: string; - - /** Expr title. */ - public title: string; - - /** Expr description. */ - public description: string; - - /** Expr location. */ - public location: string; - - /** - * Creates a new Expr instance using the specified properties. - * @param [properties] Properties to set - * @returns Expr instance - */ - public static create(properties?: google.type.IExpr): google.type.Expr; - - /** - * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @param message Expr message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @param message Expr message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an Expr message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.type.Expr; - - /** - * Decodes an Expr message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.type.Expr; - - /** - * Verifies an Expr message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an Expr message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Expr - */ - public static fromObject(object: { [k: string]: any }): google.type.Expr; - - /** - * Creates a plain object from an Expr message. Also converts values to other types if specified. - * @param message Expr - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.type.Expr, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Expr to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; } } } diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 4d983e4a1f5..45f51a30bfd 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -28,7 +28,7 @@ var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; // Exported root namespace - var $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {}); + var $root = $protobuf.roots._google_cloud_pubsub_1_7_1_protos || ($protobuf.roots._google_cloud_pubsub_1_7_1_protos = {}); $root.google = (function() { @@ -39,421 +39,413 @@ */ var google = {}; - google.pubsub = (function() { + google.iam = (function() { /** - * Namespace pubsub. + * Namespace iam. * @memberof google * @namespace */ - var pubsub = {}; + var iam = {}; - pubsub.v1 = (function() { + iam.v1 = (function() { /** * Namespace v1. - * @memberof google.pubsub + * @memberof google.iam * @namespace */ var v1 = {}; - v1.Publisher = (function() { + v1.Policy = (function() { /** - * Constructs a new Publisher service. - * @memberof google.pubsub.v1 - * @classdesc Represents a Publisher - * @extends $protobuf.rpc.Service - * @constructor - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * Properties of a Policy. + * @memberof google.iam.v1 + * @interface IPolicy + * @property {number|null} [version] Policy version + * @property {Array.|null} [bindings] Policy bindings + * @property {Uint8Array|null} [etag] Policy etag */ - function Publisher(rpcImpl, requestDelimited, responseDelimited) { - $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); - } - - (Publisher.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Publisher; /** - * Creates new Publisher service using the specified rpc implementation. - * @function create - * @memberof google.pubsub.v1.Publisher - * @static - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - * @returns {Publisher} RPC service. Useful where requests and/or responses are streamed. + * Constructs a new Policy. + * @memberof google.iam.v1 + * @classdesc Represents a Policy. + * @implements IPolicy + * @constructor + * @param {google.iam.v1.IPolicy=} [properties] Properties to set */ - Publisher.create = function create(rpcImpl, requestDelimited, responseDelimited) { - return new this(rpcImpl, requestDelimited, responseDelimited); - }; + function Policy(properties) { + this.bindings = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. - * @memberof google.pubsub.v1.Publisher - * @typedef CreateTopicCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Topic} [response] Topic + * Policy version. + * @member {number} version + * @memberof google.iam.v1.Policy + * @instance */ + Policy.prototype.version = 0; /** - * Calls CreateTopic. - * @function createTopic - * @memberof google.pubsub.v1.Publisher + * Policy bindings. + * @member {Array.} bindings + * @memberof google.iam.v1.Policy * @instance - * @param {google.pubsub.v1.ITopic} request Topic message or plain object - * @param {google.pubsub.v1.Publisher.CreateTopicCallback} callback Node-style callback called with the error, if any, and Topic - * @returns {undefined} - * @variation 1 */ - Object.defineProperty(Publisher.prototype.createTopic = function createTopic(request, callback) { - return this.rpcCall(createTopic, $root.google.pubsub.v1.Topic, $root.google.pubsub.v1.Topic, request, callback); - }, "name", { value: "CreateTopic" }); + Policy.prototype.bindings = $util.emptyArray; /** - * Calls CreateTopic. - * @function createTopic - * @memberof google.pubsub.v1.Publisher + * Policy etag. + * @member {Uint8Array} etag + * @memberof google.iam.v1.Policy * @instance - * @param {google.pubsub.v1.ITopic} request Topic message or plain object - * @returns {Promise} Promise - * @variation 2 */ + Policy.prototype.etag = $util.newBuffer([]); /** - * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. - * @memberof google.pubsub.v1.Publisher - * @typedef UpdateTopicCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Topic} [response] Topic + * Creates a new Policy instance using the specified properties. + * @function create + * @memberof google.iam.v1.Policy + * @static + * @param {google.iam.v1.IPolicy=} [properties] Properties to set + * @returns {google.iam.v1.Policy} Policy instance */ + Policy.create = function create(properties) { + return new Policy(properties); + }; /** - * Calls UpdateTopic. - * @function updateTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object - * @param {google.pubsub.v1.Publisher.UpdateTopicCallback} callback Node-style callback called with the error, if any, and Topic - * @returns {undefined} - * @variation 1 + * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.Policy + * @static + * @param {google.iam.v1.IPolicy} message Policy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ - Object.defineProperty(Publisher.prototype.updateTopic = function updateTopic(request, callback) { - return this.rpcCall(updateTopic, $root.google.pubsub.v1.UpdateTopicRequest, $root.google.pubsub.v1.Topic, request, callback); - }, "name", { value: "UpdateTopic" }); + Policy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.version != null && message.hasOwnProperty("version")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.version); + if (message.etag != null && message.hasOwnProperty("etag")) + writer.uint32(/* id 3, wireType 2 =*/26).bytes(message.etag); + if (message.bindings != null && message.bindings.length) + for (var i = 0; i < message.bindings.length; ++i) + $root.google.iam.v1.Binding.encode(message.bindings[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + return writer; + }; /** - * Calls UpdateTopic. - * @function updateTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.Policy + * @static + * @param {google.iam.v1.IPolicy} message Policy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ + Policy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; /** - * Callback as used by {@link google.pubsub.v1.Publisher#publish}. - * @memberof google.pubsub.v1.Publisher - * @typedef PublishCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.PublishResponse} [response] PublishResponse + * Decodes a Policy message from the specified reader or buffer. + * @function decode + * @memberof google.iam.v1.Policy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.iam.v1.Policy} Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ + Policy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.Policy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.version = reader.int32(); + break; + case 4: + if (!(message.bindings && message.bindings.length)) + message.bindings = []; + message.bindings.push($root.google.iam.v1.Binding.decode(reader, reader.uint32())); + break; + case 3: + message.etag = reader.bytes(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; /** - * Calls Publish. - * @function publish - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object - * @param {google.pubsub.v1.Publisher.PublishCallback} callback Node-style callback called with the error, if any, and PublishResponse - * @returns {undefined} - * @variation 1 + * Decodes a Policy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.iam.v1.Policy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.iam.v1.Policy} Policy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Object.defineProperty(Publisher.prototype.publish = function publish(request, callback) { - return this.rpcCall(publish, $root.google.pubsub.v1.PublishRequest, $root.google.pubsub.v1.PublishResponse, request, callback); - }, "name", { value: "Publish" }); + Policy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; /** - * Calls Publish. - * @function publish - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Verifies a Policy message. + * @function verify + * @memberof google.iam.v1.Policy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not */ + Policy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.version != null && message.hasOwnProperty("version")) + if (!$util.isInteger(message.version)) + return "version: integer expected"; + if (message.bindings != null && message.hasOwnProperty("bindings")) { + if (!Array.isArray(message.bindings)) + return "bindings: array expected"; + for (var i = 0; i < message.bindings.length; ++i) { + var error = $root.google.iam.v1.Binding.verify(message.bindings[i]); + if (error) + return "bindings." + error; + } + } + if (message.etag != null && message.hasOwnProperty("etag")) + if (!(message.etag && typeof message.etag.length === "number" || $util.isString(message.etag))) + return "etag: buffer expected"; + return null; + }; /** - * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. - * @memberof google.pubsub.v1.Publisher - * @typedef GetTopicCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Topic} [response] Topic - */ + * Creates a Policy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.iam.v1.Policy + * @static + * @param {Object.} object Plain object + * @returns {google.iam.v1.Policy} Policy + */ + Policy.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.Policy) + return object; + var message = new $root.google.iam.v1.Policy(); + if (object.version != null) + message.version = object.version | 0; + if (object.bindings) { + if (!Array.isArray(object.bindings)) + throw TypeError(".google.iam.v1.Policy.bindings: array expected"); + message.bindings = []; + for (var i = 0; i < object.bindings.length; ++i) { + if (typeof object.bindings[i] !== "object") + throw TypeError(".google.iam.v1.Policy.bindings: object expected"); + message.bindings[i] = $root.google.iam.v1.Binding.fromObject(object.bindings[i]); + } + } + if (object.etag != null) + if (typeof object.etag === "string") + $util.base64.decode(object.etag, message.etag = $util.newBuffer($util.base64.length(object.etag)), 0); + else if (object.etag.length) + message.etag = object.etag; + return message; + }; /** - * Calls GetTopic. - * @function getTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object - * @param {google.pubsub.v1.Publisher.GetTopicCallback} callback Node-style callback called with the error, if any, and Topic - * @returns {undefined} - * @variation 1 + * Creates a plain object from a Policy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.iam.v1.Policy + * @static + * @param {google.iam.v1.Policy} message Policy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object */ - Object.defineProperty(Publisher.prototype.getTopic = function getTopic(request, callback) { - return this.rpcCall(getTopic, $root.google.pubsub.v1.GetTopicRequest, $root.google.pubsub.v1.Topic, request, callback); - }, "name", { value: "GetTopic" }); + Policy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.bindings = []; + if (options.defaults) { + object.version = 0; + if (options.bytes === String) + object.etag = ""; + else { + object.etag = []; + if (options.bytes !== Array) + object.etag = $util.newBuffer(object.etag); + } + } + if (message.version != null && message.hasOwnProperty("version")) + object.version = message.version; + if (message.etag != null && message.hasOwnProperty("etag")) + object.etag = options.bytes === String ? $util.base64.encode(message.etag, 0, message.etag.length) : options.bytes === Array ? Array.prototype.slice.call(message.etag) : message.etag; + if (message.bindings && message.bindings.length) { + object.bindings = []; + for (var j = 0; j < message.bindings.length; ++j) + object.bindings[j] = $root.google.iam.v1.Binding.toObject(message.bindings[j], options); + } + return object; + }; /** - * Calls GetTopic. - * @function getTopic - * @memberof google.pubsub.v1.Publisher + * Converts this Policy to JSON. + * @function toJSON + * @memberof google.iam.v1.Policy * @instance - * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * @returns {Object.} JSON object */ + Policy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. - * @memberof google.pubsub.v1.Publisher - * @typedef ListTopicsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListTopicsResponse} [response] ListTopicsResponse - */ + return Policy; + })(); - /** - * Calls ListTopics. - * @function listTopics - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object - * @param {google.pubsub.v1.Publisher.ListTopicsCallback} callback Node-style callback called with the error, if any, and ListTopicsResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Publisher.prototype.listTopics = function listTopics(request, callback) { - return this.rpcCall(listTopics, $root.google.pubsub.v1.ListTopicsRequest, $root.google.pubsub.v1.ListTopicsResponse, request, callback); - }, "name", { value: "ListTopics" }); + v1.Binding = (function() { /** - * Calls ListTopics. - * @function listTopics - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Properties of a Binding. + * @memberof google.iam.v1 + * @interface IBinding + * @property {string|null} [role] Binding role + * @property {Array.|null} [members] Binding members + * @property {google.type.IExpr|null} [condition] Binding condition */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. - * @memberof google.pubsub.v1.Publisher - * @typedef ListTopicSubscriptionsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} [response] ListTopicSubscriptionsResponse + * Constructs a new Binding. + * @memberof google.iam.v1 + * @classdesc Represents a Binding. + * @implements IBinding + * @constructor + * @param {google.iam.v1.IBinding=} [properties] Properties to set */ + function Binding(properties) { + this.members = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * Calls ListTopicSubscriptions. - * @function listTopicSubscriptions - * @memberof google.pubsub.v1.Publisher + * Binding role. + * @member {string} role + * @memberof google.iam.v1.Binding * @instance - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object - * @param {google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse - * @returns {undefined} - * @variation 1 */ - Object.defineProperty(Publisher.prototype.listTopicSubscriptions = function listTopicSubscriptions(request, callback) { - return this.rpcCall(listTopicSubscriptions, $root.google.pubsub.v1.ListTopicSubscriptionsRequest, $root.google.pubsub.v1.ListTopicSubscriptionsResponse, request, callback); - }, "name", { value: "ListTopicSubscriptions" }); + Binding.prototype.role = ""; /** - * Calls ListTopicSubscriptions. - * @function listTopicSubscriptions - * @memberof google.pubsub.v1.Publisher + * Binding members. + * @member {Array.} members + * @memberof google.iam.v1.Binding * @instance - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ - - /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. - * @memberof google.pubsub.v1.Publisher - * @typedef ListTopicSnapshotsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListTopicSnapshotsResponse} [response] ListTopicSnapshotsResponse */ + Binding.prototype.members = $util.emptyArray; /** - * Calls ListTopicSnapshots. - * @function listTopicSnapshots - * @memberof google.pubsub.v1.Publisher + * Binding condition. + * @member {google.type.IExpr|null|undefined} condition + * @memberof google.iam.v1.Binding * @instance - * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object - * @param {google.pubsub.v1.Publisher.ListTopicSnapshotsCallback} callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse - * @returns {undefined} - * @variation 1 */ - Object.defineProperty(Publisher.prototype.listTopicSnapshots = function listTopicSnapshots(request, callback) { - return this.rpcCall(listTopicSnapshots, $root.google.pubsub.v1.ListTopicSnapshotsRequest, $root.google.pubsub.v1.ListTopicSnapshotsResponse, request, callback); - }, "name", { value: "ListTopicSnapshots" }); + Binding.prototype.condition = null; /** - * Calls ListTopicSnapshots. - * @function listTopicSnapshots - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Creates a new Binding instance using the specified properties. + * @function create + * @memberof google.iam.v1.Binding + * @static + * @param {google.iam.v1.IBinding=} [properties] Properties to set + * @returns {google.iam.v1.Binding} Binding instance */ + Binding.create = function create(properties) { + return new Binding(properties); + }; /** - * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. - * @memberof google.pubsub.v1.Publisher - * @typedef DeleteTopicCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty + * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @function encode + * @memberof google.iam.v1.Binding + * @static + * @param {google.iam.v1.IBinding} message Binding message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ + Binding.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.role != null && message.hasOwnProperty("role")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.role); + if (message.members != null && message.members.length) + for (var i = 0; i < message.members.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.members[i]); + if (message.condition != null && message.hasOwnProperty("condition")) + $root.google.type.Expr.encode(message.condition, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; /** - * Calls DeleteTopic. - * @function deleteTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object - * @param {google.pubsub.v1.Publisher.DeleteTopicCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 + * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * @function encodeDelimited + * @memberof google.iam.v1.Binding + * @static + * @param {google.iam.v1.IBinding} message Binding message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ - Object.defineProperty(Publisher.prototype.deleteTopic = function deleteTopic(request, callback) { - return this.rpcCall(deleteTopic, $root.google.pubsub.v1.DeleteTopicRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "DeleteTopic" }); + Binding.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; /** - * Calls DeleteTopic. - * @function deleteTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ - - return Publisher; - })(); - - v1.MessageStoragePolicy = (function() { - - /** - * Properties of a MessageStoragePolicy. - * @memberof google.pubsub.v1 - * @interface IMessageStoragePolicy - * @property {Array.|null} [allowedPersistenceRegions] MessageStoragePolicy allowedPersistenceRegions - */ - - /** - * Constructs a new MessageStoragePolicy. - * @memberof google.pubsub.v1 - * @classdesc Represents a MessageStoragePolicy. - * @implements IMessageStoragePolicy - * @constructor - * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set - */ - function MessageStoragePolicy(properties) { - this.allowedPersistenceRegions = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * MessageStoragePolicy allowedPersistenceRegions. - * @member {Array.} allowedPersistenceRegions - * @memberof google.pubsub.v1.MessageStoragePolicy - * @instance - */ - MessageStoragePolicy.prototype.allowedPersistenceRegions = $util.emptyArray; - - /** - * Creates a new MessageStoragePolicy instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.MessageStoragePolicy - * @static - * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set - * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy instance - */ - MessageStoragePolicy.create = function create(properties) { - return new MessageStoragePolicy(properties); - }; - - /** - * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.MessageStoragePolicy - * @static - * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MessageStoragePolicy.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.allowedPersistenceRegions != null && message.allowedPersistenceRegions.length) - for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.allowedPersistenceRegions[i]); - return writer; - }; - - /** - * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.MessageStoragePolicy - * @static - * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MessageStoragePolicy.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * Decodes a Binding message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.iam.v1.Binding * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @returns {google.iam.v1.Binding} Binding * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MessageStoragePolicy.decode = function decode(reader, length) { + Binding.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.MessageStoragePolicy(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.Binding(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.allowedPersistenceRegions && message.allowedPersistenceRegions.length)) - message.allowedPersistenceRegions = []; - message.allowedPersistenceRegions.push(reader.string()); + message.role = reader.string(); + break; + case 2: + if (!(message.members && message.members.length)) + message.members = []; + message.members.push(reader.string()); + break; + case 3: + message.condition = $root.google.type.Expr.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -464,123 +456,145 @@ }; /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * Decodes a Binding message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.iam.v1.Binding * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @returns {google.iam.v1.Binding} Binding * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MessageStoragePolicy.decodeDelimited = function decodeDelimited(reader) { + Binding.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a MessageStoragePolicy message. + * Verifies a Binding message. * @function verify - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.iam.v1.Binding * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - MessageStoragePolicy.verify = function verify(message) { + Binding.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.allowedPersistenceRegions != null && message.hasOwnProperty("allowedPersistenceRegions")) { - if (!Array.isArray(message.allowedPersistenceRegions)) - return "allowedPersistenceRegions: array expected"; - for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) - if (!$util.isString(message.allowedPersistenceRegions[i])) - return "allowedPersistenceRegions: string[] expected"; + if (message.role != null && message.hasOwnProperty("role")) + if (!$util.isString(message.role)) + return "role: string expected"; + if (message.members != null && message.hasOwnProperty("members")) { + if (!Array.isArray(message.members)) + return "members: array expected"; + for (var i = 0; i < message.members.length; ++i) + if (!$util.isString(message.members[i])) + return "members: string[] expected"; + } + if (message.condition != null && message.hasOwnProperty("condition")) { + var error = $root.google.type.Expr.verify(message.condition); + if (error) + return "condition." + error; } return null; }; /** - * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * Creates a Binding message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.iam.v1.Binding * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @returns {google.iam.v1.Binding} Binding */ - MessageStoragePolicy.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.MessageStoragePolicy) + Binding.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.Binding) return object; - var message = new $root.google.pubsub.v1.MessageStoragePolicy(); - if (object.allowedPersistenceRegions) { - if (!Array.isArray(object.allowedPersistenceRegions)) - throw TypeError(".google.pubsub.v1.MessageStoragePolicy.allowedPersistenceRegions: array expected"); - message.allowedPersistenceRegions = []; - for (var i = 0; i < object.allowedPersistenceRegions.length; ++i) - message.allowedPersistenceRegions[i] = String(object.allowedPersistenceRegions[i]); + var message = new $root.google.iam.v1.Binding(); + if (object.role != null) + message.role = String(object.role); + if (object.members) { + if (!Array.isArray(object.members)) + throw TypeError(".google.iam.v1.Binding.members: array expected"); + message.members = []; + for (var i = 0; i < object.members.length; ++i) + message.members[i] = String(object.members[i]); + } + if (object.condition != null) { + if (typeof object.condition !== "object") + throw TypeError(".google.iam.v1.Binding.condition: object expected"); + message.condition = $root.google.type.Expr.fromObject(object.condition); } return message; }; /** - * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * Creates a plain object from a Binding message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.iam.v1.Binding * @static - * @param {google.pubsub.v1.MessageStoragePolicy} message MessageStoragePolicy + * @param {google.iam.v1.Binding} message Binding * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - MessageStoragePolicy.toObject = function toObject(message, options) { + Binding.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.arrays || options.defaults) - object.allowedPersistenceRegions = []; - if (message.allowedPersistenceRegions && message.allowedPersistenceRegions.length) { - object.allowedPersistenceRegions = []; - for (var j = 0; j < message.allowedPersistenceRegions.length; ++j) - object.allowedPersistenceRegions[j] = message.allowedPersistenceRegions[j]; + object.members = []; + if (options.defaults) { + object.role = ""; + object.condition = null; + } + if (message.role != null && message.hasOwnProperty("role")) + object.role = message.role; + if (message.members && message.members.length) { + object.members = []; + for (var j = 0; j < message.members.length; ++j) + object.members[j] = message.members[j]; } + if (message.condition != null && message.hasOwnProperty("condition")) + object.condition = $root.google.type.Expr.toObject(message.condition, options); return object; }; /** - * Converts this MessageStoragePolicy to JSON. + * Converts this Binding to JSON. * @function toJSON - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.iam.v1.Binding * @instance * @returns {Object.} JSON object */ - MessageStoragePolicy.prototype.toJSON = function toJSON() { + Binding.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return MessageStoragePolicy; + return Binding; })(); - v1.Topic = (function() { + v1.PolicyDelta = (function() { /** - * Properties of a Topic. - * @memberof google.pubsub.v1 - * @interface ITopic - * @property {string|null} [name] Topic name - * @property {Object.|null} [labels] Topic labels - * @property {google.pubsub.v1.IMessageStoragePolicy|null} [messageStoragePolicy] Topic messageStoragePolicy - * @property {string|null} [kmsKeyName] Topic kmsKeyName + * Properties of a PolicyDelta. + * @memberof google.iam.v1 + * @interface IPolicyDelta + * @property {Array.|null} [bindingDeltas] PolicyDelta bindingDeltas + * @property {Array.|null} [auditConfigDeltas] PolicyDelta auditConfigDeltas */ /** - * Constructs a new Topic. - * @memberof google.pubsub.v1 - * @classdesc Represents a Topic. - * @implements ITopic + * Constructs a new PolicyDelta. + * @memberof google.iam.v1 + * @classdesc Represents a PolicyDelta. + * @implements IPolicyDelta * @constructor - * @param {google.pubsub.v1.ITopic=} [properties] Properties to set + * @param {google.iam.v1.IPolicyDelta=} [properties] Properties to set */ - function Topic(properties) { - this.labels = {}; + function PolicyDelta(properties) { + this.bindingDeltas = []; + this.auditConfigDeltas = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -588,120 +602,94 @@ } /** - * Topic name. - * @member {string} name - * @memberof google.pubsub.v1.Topic + * PolicyDelta bindingDeltas. + * @member {Array.} bindingDeltas + * @memberof google.iam.v1.PolicyDelta * @instance */ - Topic.prototype.name = ""; + PolicyDelta.prototype.bindingDeltas = $util.emptyArray; /** - * Topic labels. - * @member {Object.} labels - * @memberof google.pubsub.v1.Topic + * PolicyDelta auditConfigDeltas. + * @member {Array.} auditConfigDeltas + * @memberof google.iam.v1.PolicyDelta * @instance */ - Topic.prototype.labels = $util.emptyObject; + PolicyDelta.prototype.auditConfigDeltas = $util.emptyArray; /** - * Topic messageStoragePolicy. - * @member {google.pubsub.v1.IMessageStoragePolicy|null|undefined} messageStoragePolicy - * @memberof google.pubsub.v1.Topic - * @instance - */ - Topic.prototype.messageStoragePolicy = null; - - /** - * Topic kmsKeyName. - * @member {string} kmsKeyName - * @memberof google.pubsub.v1.Topic - * @instance - */ - Topic.prototype.kmsKeyName = ""; - - /** - * Creates a new Topic instance using the specified properties. + * Creates a new PolicyDelta instance using the specified properties. * @function create - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @static - * @param {google.pubsub.v1.ITopic=} [properties] Properties to set - * @returns {google.pubsub.v1.Topic} Topic instance + * @param {google.iam.v1.IPolicyDelta=} [properties] Properties to set + * @returns {google.iam.v1.PolicyDelta} PolicyDelta instance */ - Topic.create = function create(properties) { - return new Topic(properties); + PolicyDelta.create = function create(properties) { + return new PolicyDelta(properties); }; /** - * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @static - * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode + * @param {google.iam.v1.IPolicyDelta} message PolicyDelta message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Topic.encode = function encode(message, writer) { + PolicyDelta.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.labels != null && message.hasOwnProperty("labels")) - for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) - $root.google.pubsub.v1.MessageStoragePolicy.encode(message.messageStoragePolicy, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.kmsKeyName); + if (message.bindingDeltas != null && message.bindingDeltas.length) + for (var i = 0; i < message.bindingDeltas.length; ++i) + $root.google.iam.v1.BindingDelta.encode(message.bindingDeltas[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.auditConfigDeltas != null && message.auditConfigDeltas.length) + for (var i = 0; i < message.auditConfigDeltas.length; ++i) + $root.google.iam.v1.AuditConfigDelta.encode(message.auditConfigDeltas[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @static - * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode + * @param {google.iam.v1.IPolicyDelta} message PolicyDelta message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Topic.encodeDelimited = function encodeDelimited(message, writer) { + PolicyDelta.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a Topic message from the specified reader or buffer. + * Decodes a PolicyDelta message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.Topic} Topic + * @returns {google.iam.v1.PolicyDelta} PolicyDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Topic.decode = function decode(reader, length) { + PolicyDelta.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.PolicyDelta(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.name = reader.string(); + if (!(message.bindingDeltas && message.bindingDeltas.length)) + message.bindingDeltas = []; + message.bindingDeltas.push($root.google.iam.v1.BindingDelta.decode(reader, reader.uint32())); break; case 2: - reader.skip().pos++; - if (message.labels === $util.emptyObject) - message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); - break; - case 3: - message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); - break; - case 5: - message.kmsKeyName = reader.string(); + if (!(message.auditConfigDeltas && message.auditConfigDeltas.length)) + message.auditConfigDeltas = []; + message.auditConfigDeltas.push($root.google.iam.v1.AuditConfigDelta.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -712,157 +700,153 @@ }; /** - * Decodes a Topic message from the specified reader or buffer, length delimited. + * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.Topic} Topic + * @returns {google.iam.v1.PolicyDelta} PolicyDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Topic.decodeDelimited = function decodeDelimited(reader) { + PolicyDelta.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a Topic message. + * Verifies a PolicyDelta message. * @function verify - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - Topic.verify = function verify(message) { + PolicyDelta.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.labels != null && message.hasOwnProperty("labels")) { - if (!$util.isObject(message.labels)) - return "labels: object expected"; - var key = Object.keys(message.labels); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.labels[key[i]])) - return "labels: string{k:string} expected"; + if (message.bindingDeltas != null && message.hasOwnProperty("bindingDeltas")) { + if (!Array.isArray(message.bindingDeltas)) + return "bindingDeltas: array expected"; + for (var i = 0; i < message.bindingDeltas.length; ++i) { + var error = $root.google.iam.v1.BindingDelta.verify(message.bindingDeltas[i]); + if (error) + return "bindingDeltas." + error; + } } - if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) { - var error = $root.google.pubsub.v1.MessageStoragePolicy.verify(message.messageStoragePolicy); - if (error) - return "messageStoragePolicy." + error; + if (message.auditConfigDeltas != null && message.hasOwnProperty("auditConfigDeltas")) { + if (!Array.isArray(message.auditConfigDeltas)) + return "auditConfigDeltas: array expected"; + for (var i = 0; i < message.auditConfigDeltas.length; ++i) { + var error = $root.google.iam.v1.AuditConfigDelta.verify(message.auditConfigDeltas[i]); + if (error) + return "auditConfigDeltas." + error; + } } - if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) - if (!$util.isString(message.kmsKeyName)) - return "kmsKeyName: string expected"; return null; }; /** - * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.Topic} Topic + * @returns {google.iam.v1.PolicyDelta} PolicyDelta */ - Topic.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.Topic) + PolicyDelta.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.PolicyDelta) return object; - var message = new $root.google.pubsub.v1.Topic(); - if (object.name != null) - message.name = String(object.name); - if (object.labels) { - if (typeof object.labels !== "object") - throw TypeError(".google.pubsub.v1.Topic.labels: object expected"); - message.labels = {}; - for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) - message.labels[keys[i]] = String(object.labels[keys[i]]); + var message = new $root.google.iam.v1.PolicyDelta(); + if (object.bindingDeltas) { + if (!Array.isArray(object.bindingDeltas)) + throw TypeError(".google.iam.v1.PolicyDelta.bindingDeltas: array expected"); + message.bindingDeltas = []; + for (var i = 0; i < object.bindingDeltas.length; ++i) { + if (typeof object.bindingDeltas[i] !== "object") + throw TypeError(".google.iam.v1.PolicyDelta.bindingDeltas: object expected"); + message.bindingDeltas[i] = $root.google.iam.v1.BindingDelta.fromObject(object.bindingDeltas[i]); + } } - if (object.messageStoragePolicy != null) { - if (typeof object.messageStoragePolicy !== "object") - throw TypeError(".google.pubsub.v1.Topic.messageStoragePolicy: object expected"); - message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.fromObject(object.messageStoragePolicy); + if (object.auditConfigDeltas) { + if (!Array.isArray(object.auditConfigDeltas)) + throw TypeError(".google.iam.v1.PolicyDelta.auditConfigDeltas: array expected"); + message.auditConfigDeltas = []; + for (var i = 0; i < object.auditConfigDeltas.length; ++i) { + if (typeof object.auditConfigDeltas[i] !== "object") + throw TypeError(".google.iam.v1.PolicyDelta.auditConfigDeltas: object expected"); + message.auditConfigDeltas[i] = $root.google.iam.v1.AuditConfigDelta.fromObject(object.auditConfigDeltas[i]); + } } - if (object.kmsKeyName != null) - message.kmsKeyName = String(object.kmsKeyName); return message; }; /** - * Creates a plain object from a Topic message. Also converts values to other types if specified. + * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @static - * @param {google.pubsub.v1.Topic} message Topic + * @param {google.iam.v1.PolicyDelta} message PolicyDelta * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - Topic.toObject = function toObject(message, options) { + PolicyDelta.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.objects || options.defaults) - object.labels = {}; - if (options.defaults) { - object.name = ""; - object.messageStoragePolicy = null; - object.kmsKeyName = ""; + if (options.arrays || options.defaults) { + object.bindingDeltas = []; + object.auditConfigDeltas = []; } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - var keys2; - if (message.labels && (keys2 = Object.keys(message.labels)).length) { - object.labels = {}; - for (var j = 0; j < keys2.length; ++j) - object.labels[keys2[j]] = message.labels[keys2[j]]; + if (message.bindingDeltas && message.bindingDeltas.length) { + object.bindingDeltas = []; + for (var j = 0; j < message.bindingDeltas.length; ++j) + object.bindingDeltas[j] = $root.google.iam.v1.BindingDelta.toObject(message.bindingDeltas[j], options); + } + if (message.auditConfigDeltas && message.auditConfigDeltas.length) { + object.auditConfigDeltas = []; + for (var j = 0; j < message.auditConfigDeltas.length; ++j) + object.auditConfigDeltas[j] = $root.google.iam.v1.AuditConfigDelta.toObject(message.auditConfigDeltas[j], options); } - if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) - object.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.toObject(message.messageStoragePolicy, options); - if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) - object.kmsKeyName = message.kmsKeyName; return object; }; /** - * Converts this Topic to JSON. + * Converts this PolicyDelta to JSON. * @function toJSON - * @memberof google.pubsub.v1.Topic + * @memberof google.iam.v1.PolicyDelta * @instance * @returns {Object.} JSON object */ - Topic.prototype.toJSON = function toJSON() { + PolicyDelta.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return Topic; + return PolicyDelta; })(); - v1.PubsubMessage = (function() { + v1.BindingDelta = (function() { /** - * Properties of a PubsubMessage. - * @memberof google.pubsub.v1 - * @interface IPubsubMessage - * @property {Uint8Array|null} [data] PubsubMessage data - * @property {Object.|null} [attributes] PubsubMessage attributes - * @property {string|null} [messageId] PubsubMessage messageId - * @property {google.protobuf.ITimestamp|null} [publishTime] PubsubMessage publishTime - * @property {string|null} [orderingKey] PubsubMessage orderingKey + * Properties of a BindingDelta. + * @memberof google.iam.v1 + * @interface IBindingDelta + * @property {google.iam.v1.BindingDelta.Action|null} [action] BindingDelta action + * @property {string|null} [role] BindingDelta role + * @property {string|null} [member] BindingDelta member + * @property {google.type.IExpr|null} [condition] BindingDelta condition */ /** - * Constructs a new PubsubMessage. - * @memberof google.pubsub.v1 - * @classdesc Represents a PubsubMessage. - * @implements IPubsubMessage + * Constructs a new BindingDelta. + * @memberof google.iam.v1 + * @classdesc Represents a BindingDelta. + * @implements IBindingDelta * @constructor - * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set + * @param {google.iam.v1.IBindingDelta=} [properties] Properties to set */ - function PubsubMessage(properties) { - this.attributes = {}; + function BindingDelta(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -870,133 +854,114 @@ } /** - * PubsubMessage data. - * @member {Uint8Array} data - * @memberof google.pubsub.v1.PubsubMessage + * BindingDelta action. + * @member {google.iam.v1.BindingDelta.Action} action + * @memberof google.iam.v1.BindingDelta * @instance */ - PubsubMessage.prototype.data = $util.newBuffer([]); - - /** - * PubsubMessage attributes. - * @member {Object.} attributes - * @memberof google.pubsub.v1.PubsubMessage - * @instance - */ - PubsubMessage.prototype.attributes = $util.emptyObject; + BindingDelta.prototype.action = 0; /** - * PubsubMessage messageId. - * @member {string} messageId - * @memberof google.pubsub.v1.PubsubMessage + * BindingDelta role. + * @member {string} role + * @memberof google.iam.v1.BindingDelta * @instance */ - PubsubMessage.prototype.messageId = ""; + BindingDelta.prototype.role = ""; /** - * PubsubMessage publishTime. - * @member {google.protobuf.ITimestamp|null|undefined} publishTime - * @memberof google.pubsub.v1.PubsubMessage + * BindingDelta member. + * @member {string} member + * @memberof google.iam.v1.BindingDelta * @instance */ - PubsubMessage.prototype.publishTime = null; + BindingDelta.prototype.member = ""; /** - * PubsubMessage orderingKey. - * @member {string} orderingKey - * @memberof google.pubsub.v1.PubsubMessage + * BindingDelta condition. + * @member {google.type.IExpr|null|undefined} condition + * @memberof google.iam.v1.BindingDelta * @instance */ - PubsubMessage.prototype.orderingKey = ""; + BindingDelta.prototype.condition = null; /** - * Creates a new PubsubMessage instance using the specified properties. + * Creates a new BindingDelta instance using the specified properties. * @function create - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.iam.v1.BindingDelta * @static - * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set - * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage instance + * @param {google.iam.v1.IBindingDelta=} [properties] Properties to set + * @returns {google.iam.v1.BindingDelta} BindingDelta instance */ - PubsubMessage.create = function create(properties) { - return new PubsubMessage(properties); + BindingDelta.create = function create(properties) { + return new BindingDelta(properties); }; /** - * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.iam.v1.BindingDelta * @static - * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode + * @param {google.iam.v1.IBindingDelta} message BindingDelta message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PubsubMessage.encode = function encode(message, writer) { + BindingDelta.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.data != null && message.hasOwnProperty("data")) - writer.uint32(/* id 1, wireType 2 =*/10).bytes(message.data); - if (message.attributes != null && message.hasOwnProperty("attributes")) - for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); - if (message.messageId != null && message.hasOwnProperty("messageId")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.messageId); - if (message.publishTime != null && message.hasOwnProperty("publishTime")) - $root.google.protobuf.Timestamp.encode(message.publishTime, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.orderingKey); + if (message.action != null && message.hasOwnProperty("action")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.action); + if (message.role != null && message.hasOwnProperty("role")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.role); + if (message.member != null && message.hasOwnProperty("member")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.member); + if (message.condition != null && message.hasOwnProperty("condition")) + $root.google.type.Expr.encode(message.condition, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); return writer; }; /** - * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.iam.v1.BindingDelta * @static - * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode + * @param {google.iam.v1.IBindingDelta} message BindingDelta message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PubsubMessage.encodeDelimited = function encodeDelimited(message, writer) { + BindingDelta.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a PubsubMessage message from the specified reader or buffer. + * Decodes a BindingDelta message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.iam.v1.BindingDelta * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @returns {google.iam.v1.BindingDelta} BindingDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PubsubMessage.decode = function decode(reader, length) { + BindingDelta.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.BindingDelta(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.data = reader.bytes(); + message.action = reader.int32(); break; case 2: - reader.skip().pos++; - if (message.attributes === $util.emptyObject) - message.attributes = {}; - key = reader.string(); - reader.pos++; - message.attributes[key] = reader.string(); + message.role = reader.string(); break; case 3: - message.messageId = reader.string(); + message.member = reader.string(); break; case 4: - message.publishTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 5: - message.orderingKey = reader.string(); + message.condition = $root.google.type.Expr.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -1007,169 +972,174 @@ }; /** - * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * Decodes a BindingDelta message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.iam.v1.BindingDelta * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @returns {google.iam.v1.BindingDelta} BindingDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PubsubMessage.decodeDelimited = function decodeDelimited(reader) { + BindingDelta.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a PubsubMessage message. + * Verifies a BindingDelta message. * @function verify - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.iam.v1.BindingDelta * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - PubsubMessage.verify = function verify(message) { + BindingDelta.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.data != null && message.hasOwnProperty("data")) - if (!(message.data && typeof message.data.length === "number" || $util.isString(message.data))) - return "data: buffer expected"; - if (message.attributes != null && message.hasOwnProperty("attributes")) { - if (!$util.isObject(message.attributes)) - return "attributes: object expected"; - var key = Object.keys(message.attributes); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.attributes[key[i]])) - return "attributes: string{k:string} expected"; - } - if (message.messageId != null && message.hasOwnProperty("messageId")) - if (!$util.isString(message.messageId)) - return "messageId: string expected"; - if (message.publishTime != null && message.hasOwnProperty("publishTime")) { - var error = $root.google.protobuf.Timestamp.verify(message.publishTime); + if (message.action != null && message.hasOwnProperty("action")) + switch (message.action) { + default: + return "action: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.role != null && message.hasOwnProperty("role")) + if (!$util.isString(message.role)) + return "role: string expected"; + if (message.member != null && message.hasOwnProperty("member")) + if (!$util.isString(message.member)) + return "member: string expected"; + if (message.condition != null && message.hasOwnProperty("condition")) { + var error = $root.google.type.Expr.verify(message.condition); if (error) - return "publishTime." + error; + return "condition." + error; } - if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) - if (!$util.isString(message.orderingKey)) - return "orderingKey: string expected"; return null; }; /** - * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.iam.v1.BindingDelta * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @returns {google.iam.v1.BindingDelta} BindingDelta */ - PubsubMessage.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PubsubMessage) + BindingDelta.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.BindingDelta) return object; - var message = new $root.google.pubsub.v1.PubsubMessage(); - if (object.data != null) - if (typeof object.data === "string") - $util.base64.decode(object.data, message.data = $util.newBuffer($util.base64.length(object.data)), 0); - else if (object.data.length) - message.data = object.data; - if (object.attributes) { - if (typeof object.attributes !== "object") - throw TypeError(".google.pubsub.v1.PubsubMessage.attributes: object expected"); - message.attributes = {}; - for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) - message.attributes[keys[i]] = String(object.attributes[keys[i]]); + var message = new $root.google.iam.v1.BindingDelta(); + switch (object.action) { + case "ACTION_UNSPECIFIED": + case 0: + message.action = 0; + break; + case "ADD": + case 1: + message.action = 1; + break; + case "REMOVE": + case 2: + message.action = 2; + break; } - if (object.messageId != null) - message.messageId = String(object.messageId); - if (object.publishTime != null) { - if (typeof object.publishTime !== "object") - throw TypeError(".google.pubsub.v1.PubsubMessage.publishTime: object expected"); - message.publishTime = $root.google.protobuf.Timestamp.fromObject(object.publishTime); + if (object.role != null) + message.role = String(object.role); + if (object.member != null) + message.member = String(object.member); + if (object.condition != null) { + if (typeof object.condition !== "object") + throw TypeError(".google.iam.v1.BindingDelta.condition: object expected"); + message.condition = $root.google.type.Expr.fromObject(object.condition); } - if (object.orderingKey != null) - message.orderingKey = String(object.orderingKey); return message; }; /** - * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.iam.v1.BindingDelta * @static - * @param {google.pubsub.v1.PubsubMessage} message PubsubMessage + * @param {google.iam.v1.BindingDelta} message BindingDelta * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - PubsubMessage.toObject = function toObject(message, options) { + BindingDelta.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.objects || options.defaults) - object.attributes = {}; if (options.defaults) { - if (options.bytes === String) - object.data = ""; - else { - object.data = []; - if (options.bytes !== Array) - object.data = $util.newBuffer(object.data); - } - object.messageId = ""; - object.publishTime = null; - object.orderingKey = ""; - } - if (message.data != null && message.hasOwnProperty("data")) - object.data = options.bytes === String ? $util.base64.encode(message.data, 0, message.data.length) : options.bytes === Array ? Array.prototype.slice.call(message.data) : message.data; - var keys2; - if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { - object.attributes = {}; - for (var j = 0; j < keys2.length; ++j) - object.attributes[keys2[j]] = message.attributes[keys2[j]]; + object.action = options.enums === String ? "ACTION_UNSPECIFIED" : 0; + object.role = ""; + object.member = ""; + object.condition = null; } - if (message.messageId != null && message.hasOwnProperty("messageId")) - object.messageId = message.messageId; - if (message.publishTime != null && message.hasOwnProperty("publishTime")) - object.publishTime = $root.google.protobuf.Timestamp.toObject(message.publishTime, options); - if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) - object.orderingKey = message.orderingKey; - return object; - }; - - /** - * Converts this PubsubMessage to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PubsubMessage + if (message.action != null && message.hasOwnProperty("action")) + object.action = options.enums === String ? $root.google.iam.v1.BindingDelta.Action[message.action] : message.action; + if (message.role != null && message.hasOwnProperty("role")) + object.role = message.role; + if (message.member != null && message.hasOwnProperty("member")) + object.member = message.member; + if (message.condition != null && message.hasOwnProperty("condition")) + object.condition = $root.google.type.Expr.toObject(message.condition, options); + return object; + }; + + /** + * Converts this BindingDelta to JSON. + * @function toJSON + * @memberof google.iam.v1.BindingDelta * @instance * @returns {Object.} JSON object */ - PubsubMessage.prototype.toJSON = function toJSON() { + BindingDelta.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return PubsubMessage; + /** + * Action enum. + * @name google.iam.v1.BindingDelta.Action + * @enum {string} + * @property {number} ACTION_UNSPECIFIED=0 ACTION_UNSPECIFIED value + * @property {number} ADD=1 ADD value + * @property {number} REMOVE=2 REMOVE value + */ + BindingDelta.Action = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "ACTION_UNSPECIFIED"] = 0; + values[valuesById[1] = "ADD"] = 1; + values[valuesById[2] = "REMOVE"] = 2; + return values; + })(); + + return BindingDelta; })(); - v1.GetTopicRequest = (function() { + v1.AuditConfigDelta = (function() { /** - * Properties of a GetTopicRequest. - * @memberof google.pubsub.v1 - * @interface IGetTopicRequest - * @property {string|null} [topic] GetTopicRequest topic + * Properties of an AuditConfigDelta. + * @memberof google.iam.v1 + * @interface IAuditConfigDelta + * @property {google.iam.v1.AuditConfigDelta.Action|null} [action] AuditConfigDelta action + * @property {string|null} [service] AuditConfigDelta service + * @property {string|null} [exemptedMember] AuditConfigDelta exemptedMember + * @property {string|null} [logType] AuditConfigDelta logType */ /** - * Constructs a new GetTopicRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a GetTopicRequest. - * @implements IGetTopicRequest + * Constructs a new AuditConfigDelta. + * @memberof google.iam.v1 + * @classdesc Represents an AuditConfigDelta. + * @implements IAuditConfigDelta * @constructor - * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set + * @param {google.iam.v1.IAuditConfigDelta=} [properties] Properties to set */ - function GetTopicRequest(properties) { + function AuditConfigDelta(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -1177,75 +1147,114 @@ } /** - * GetTopicRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.GetTopicRequest + * AuditConfigDelta action. + * @member {google.iam.v1.AuditConfigDelta.Action} action + * @memberof google.iam.v1.AuditConfigDelta * @instance */ - GetTopicRequest.prototype.topic = ""; + AuditConfigDelta.prototype.action = 0; /** - * Creates a new GetTopicRequest instance using the specified properties. + * AuditConfigDelta service. + * @member {string} service + * @memberof google.iam.v1.AuditConfigDelta + * @instance + */ + AuditConfigDelta.prototype.service = ""; + + /** + * AuditConfigDelta exemptedMember. + * @member {string} exemptedMember + * @memberof google.iam.v1.AuditConfigDelta + * @instance + */ + AuditConfigDelta.prototype.exemptedMember = ""; + + /** + * AuditConfigDelta logType. + * @member {string} logType + * @memberof google.iam.v1.AuditConfigDelta + * @instance + */ + AuditConfigDelta.prototype.logType = ""; + + /** + * Creates a new AuditConfigDelta instance using the specified properties. * @function create - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @static - * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest instance + * @param {google.iam.v1.IAuditConfigDelta=} [properties] Properties to set + * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta instance */ - GetTopicRequest.create = function create(properties) { - return new GetTopicRequest(properties); + AuditConfigDelta.create = function create(properties) { + return new AuditConfigDelta(properties); }; /** - * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @static - * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode + * @param {google.iam.v1.IAuditConfigDelta} message AuditConfigDelta message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetTopicRequest.encode = function encode(message, writer) { + AuditConfigDelta.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.action != null && message.hasOwnProperty("action")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.action); + if (message.service != null && message.hasOwnProperty("service")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.service); + if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.exemptedMember); + if (message.logType != null && message.hasOwnProperty("logType")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.logType); return writer; }; /** - * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @static - * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode + * @param {google.iam.v1.IAuditConfigDelta} message AuditConfigDelta message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + AuditConfigDelta.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a GetTopicRequest message from the specified reader or buffer. + * Decodes an AuditConfigDelta message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetTopicRequest.decode = function decode(reader, length) { + AuditConfigDelta.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetTopicRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.AuditConfigDelta(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.topic = reader.string(); + message.action = reader.int32(); + break; + case 2: + message.service = reader.string(); + break; + case 3: + message.exemptedMember = reader.string(); + break; + case 4: + message.logType = reader.string(); break; default: reader.skipType(tag & 7); @@ -1256,108 +1265,166 @@ }; /** - * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetTopicRequest.decodeDelimited = function decodeDelimited(reader) { + AuditConfigDelta.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a GetTopicRequest message. + * Verifies an AuditConfigDelta message. * @function verify - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - GetTopicRequest.verify = function verify(message) { + AuditConfigDelta.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; + if (message.action != null && message.hasOwnProperty("action")) + switch (message.action) { + default: + return "action: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.service != null && message.hasOwnProperty("service")) + if (!$util.isString(message.service)) + return "service: string expected"; + if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) + if (!$util.isString(message.exemptedMember)) + return "exemptedMember: string expected"; + if (message.logType != null && message.hasOwnProperty("logType")) + if (!$util.isString(message.logType)) + return "logType: string expected"; return null; }; /** - * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta */ - GetTopicRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.GetTopicRequest) + AuditConfigDelta.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.AuditConfigDelta) return object; - var message = new $root.google.pubsub.v1.GetTopicRequest(); - if (object.topic != null) - message.topic = String(object.topic); + var message = new $root.google.iam.v1.AuditConfigDelta(); + switch (object.action) { + case "ACTION_UNSPECIFIED": + case 0: + message.action = 0; + break; + case "ADD": + case 1: + message.action = 1; + break; + case "REMOVE": + case 2: + message.action = 2; + break; + } + if (object.service != null) + message.service = String(object.service); + if (object.exemptedMember != null) + message.exemptedMember = String(object.exemptedMember); + if (object.logType != null) + message.logType = String(object.logType); return message; }; /** - * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @static - * @param {google.pubsub.v1.GetTopicRequest} message GetTopicRequest + * @param {google.iam.v1.AuditConfigDelta} message AuditConfigDelta * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - GetTopicRequest.toObject = function toObject(message, options) { + AuditConfigDelta.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) - object.topic = ""; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; + if (options.defaults) { + object.action = options.enums === String ? "ACTION_UNSPECIFIED" : 0; + object.service = ""; + object.exemptedMember = ""; + object.logType = ""; + } + if (message.action != null && message.hasOwnProperty("action")) + object.action = options.enums === String ? $root.google.iam.v1.AuditConfigDelta.Action[message.action] : message.action; + if (message.service != null && message.hasOwnProperty("service")) + object.service = message.service; + if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) + object.exemptedMember = message.exemptedMember; + if (message.logType != null && message.hasOwnProperty("logType")) + object.logType = message.logType; return object; }; /** - * Converts this GetTopicRequest to JSON. + * Converts this AuditConfigDelta to JSON. * @function toJSON - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.iam.v1.AuditConfigDelta * @instance * @returns {Object.} JSON object */ - GetTopicRequest.prototype.toJSON = function toJSON() { + AuditConfigDelta.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return GetTopicRequest; - })(); - - v1.UpdateTopicRequest = (function() { + /** + * Action enum. + * @name google.iam.v1.AuditConfigDelta.Action + * @enum {string} + * @property {number} ACTION_UNSPECIFIED=0 ACTION_UNSPECIFIED value + * @property {number} ADD=1 ADD value + * @property {number} REMOVE=2 REMOVE value + */ + AuditConfigDelta.Action = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "ACTION_UNSPECIFIED"] = 0; + values[valuesById[1] = "ADD"] = 1; + values[valuesById[2] = "REMOVE"] = 2; + return values; + })(); + + return AuditConfigDelta; + })(); + + v1.GetPolicyOptions = (function() { /** - * Properties of an UpdateTopicRequest. - * @memberof google.pubsub.v1 - * @interface IUpdateTopicRequest - * @property {google.pubsub.v1.ITopic|null} [topic] UpdateTopicRequest topic - * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateTopicRequest updateMask + * Properties of a GetPolicyOptions. + * @memberof google.iam.v1 + * @interface IGetPolicyOptions + * @property {number|null} [requestedPolicyVersion] GetPolicyOptions requestedPolicyVersion */ /** - * Constructs a new UpdateTopicRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents an UpdateTopicRequest. - * @implements IUpdateTopicRequest + * Constructs a new GetPolicyOptions. + * @memberof google.iam.v1 + * @classdesc Represents a GetPolicyOptions. + * @implements IGetPolicyOptions * @constructor - * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set + * @param {google.iam.v1.IGetPolicyOptions=} [properties] Properties to set */ - function UpdateTopicRequest(properties) { + function GetPolicyOptions(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -1365,88 +1432,75 @@ } /** - * UpdateTopicRequest topic. - * @member {google.pubsub.v1.ITopic|null|undefined} topic - * @memberof google.pubsub.v1.UpdateTopicRequest - * @instance - */ - UpdateTopicRequest.prototype.topic = null; - - /** - * UpdateTopicRequest updateMask. - * @member {google.protobuf.IFieldMask|null|undefined} updateMask - * @memberof google.pubsub.v1.UpdateTopicRequest + * GetPolicyOptions requestedPolicyVersion. + * @member {number} requestedPolicyVersion + * @memberof google.iam.v1.GetPolicyOptions * @instance */ - UpdateTopicRequest.prototype.updateMask = null; + GetPolicyOptions.prototype.requestedPolicyVersion = 0; /** - * Creates a new UpdateTopicRequest instance using the specified properties. + * Creates a new GetPolicyOptions instance using the specified properties. * @function create - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @static - * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest instance + * @param {google.iam.v1.IGetPolicyOptions=} [properties] Properties to set + * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions instance */ - UpdateTopicRequest.create = function create(properties) { - return new UpdateTopicRequest(properties); + GetPolicyOptions.create = function create(properties) { + return new GetPolicyOptions(properties); }; /** - * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @static - * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {google.iam.v1.IGetPolicyOptions} message GetPolicyOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - UpdateTopicRequest.encode = function encode(message, writer) { + GetPolicyOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - $root.google.pubsub.v1.Topic.encode(message.topic, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.requestedPolicyVersion); return writer; }; /** - * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @static - * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {google.iam.v1.IGetPolicyOptions} message GetPolicyOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - UpdateTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + GetPolicyOptions.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * Decodes a GetPolicyOptions message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UpdateTopicRequest.decode = function decode(reader, length) { + GetPolicyOptions.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateTopicRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.GetPolicyOptions(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.topic = $root.google.pubsub.v1.Topic.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + message.requestedPolicyVersion = reader.int32(); break; default: reader.skipType(tag & 7); @@ -1457,220 +1511,331 @@ }; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UpdateTopicRequest.decodeDelimited = function decodeDelimited(reader) { + GetPolicyOptions.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an UpdateTopicRequest message. + * Verifies a GetPolicyOptions message. * @function verify - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - UpdateTopicRequest.verify = function verify(message) { + GetPolicyOptions.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) { - var error = $root.google.pubsub.v1.Topic.verify(message.topic); - if (error) - return "topic." + error; - } - if (message.updateMask != null && message.hasOwnProperty("updateMask")) { - var error = $root.google.protobuf.FieldMask.verify(message.updateMask); - if (error) - return "updateMask." + error; - } + if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) + if (!$util.isInteger(message.requestedPolicyVersion)) + return "requestedPolicyVersion: integer expected"; return null; }; /** - * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions */ - UpdateTopicRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.UpdateTopicRequest) + GetPolicyOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.GetPolicyOptions) return object; - var message = new $root.google.pubsub.v1.UpdateTopicRequest(); - if (object.topic != null) { - if (typeof object.topic !== "object") - throw TypeError(".google.pubsub.v1.UpdateTopicRequest.topic: object expected"); - message.topic = $root.google.pubsub.v1.Topic.fromObject(object.topic); - } - if (object.updateMask != null) { - if (typeof object.updateMask !== "object") - throw TypeError(".google.pubsub.v1.UpdateTopicRequest.updateMask: object expected"); - message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); - } + var message = new $root.google.iam.v1.GetPolicyOptions(); + if (object.requestedPolicyVersion != null) + message.requestedPolicyVersion = object.requestedPolicyVersion | 0; return message; }; /** - * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @static - * @param {google.pubsub.v1.UpdateTopicRequest} message UpdateTopicRequest + * @param {google.iam.v1.GetPolicyOptions} message GetPolicyOptions * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - UpdateTopicRequest.toObject = function toObject(message, options) { + GetPolicyOptions.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.topic = null; - object.updateMask = null; - } - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = $root.google.pubsub.v1.Topic.toObject(message.topic, options); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); + if (options.defaults) + object.requestedPolicyVersion = 0; + if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) + object.requestedPolicyVersion = message.requestedPolicyVersion; return object; }; /** - * Converts this UpdateTopicRequest to JSON. + * Converts this GetPolicyOptions to JSON. * @function toJSON - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.iam.v1.GetPolicyOptions * @instance * @returns {Object.} JSON object */ - UpdateTopicRequest.prototype.toJSON = function toJSON() { + GetPolicyOptions.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return UpdateTopicRequest; + return GetPolicyOptions; })(); - v1.PublishRequest = (function() { + v1.IAMPolicy = (function() { /** - * Properties of a PublishRequest. - * @memberof google.pubsub.v1 - * @interface IPublishRequest - * @property {string|null} [topic] PublishRequest topic - * @property {Array.|null} [messages] PublishRequest messages + * Constructs a new IAMPolicy service. + * @memberof google.iam.v1 + * @classdesc Represents a IAMPolicy + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited */ + function IAMPolicy(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } + + (IAMPolicy.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = IAMPolicy; /** - * Constructs a new PublishRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a PublishRequest. - * @implements IPublishRequest - * @constructor - * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set + * Creates new IAMPolicy service using the specified rpc implementation. + * @function create + * @memberof google.iam.v1.IAMPolicy + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {IAMPolicy} RPC service. Useful where requests and/or responses are streamed. */ - function PublishRequest(properties) { - this.messages = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + IAMPolicy.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; /** - * PublishRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.PublishRequest - * @instance + * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. + * @memberof google.iam.v1.IAMPolicy + * @typedef SetIamPolicyCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.iam.v1.Policy} [response] Policy */ - PublishRequest.prototype.topic = ""; /** - * PublishRequest messages. - * @member {Array.} messages - * @memberof google.pubsub.v1.PublishRequest + * Calls SetIamPolicy. + * @function setIamPolicy + * @memberof google.iam.v1.IAMPolicy * @instance + * @param {google.iam.v1.ISetIamPolicyRequest} request SetIamPolicyRequest message or plain object + * @param {google.iam.v1.IAMPolicy.SetIamPolicyCallback} callback Node-style callback called with the error, if any, and Policy + * @returns {undefined} + * @variation 1 */ - PublishRequest.prototype.messages = $util.emptyArray; + Object.defineProperty(IAMPolicy.prototype.setIamPolicy = function setIamPolicy(request, callback) { + return this.rpcCall(setIamPolicy, $root.google.iam.v1.SetIamPolicyRequest, $root.google.iam.v1.Policy, request, callback); + }, "name", { value: "SetIamPolicy" }); /** - * Creates a new PublishRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PublishRequest + * Calls SetIamPolicy. + * @function setIamPolicy + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.ISetIamPolicyRequest} request SetIamPolicyRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. + * @memberof google.iam.v1.IAMPolicy + * @typedef GetIamPolicyCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.iam.v1.Policy} [response] Policy + */ + + /** + * Calls GetIamPolicy. + * @function getIamPolicy + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.IGetIamPolicyRequest} request GetIamPolicyRequest message or plain object + * @param {google.iam.v1.IAMPolicy.GetIamPolicyCallback} callback Node-style callback called with the error, if any, and Policy + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(IAMPolicy.prototype.getIamPolicy = function getIamPolicy(request, callback) { + return this.rpcCall(getIamPolicy, $root.google.iam.v1.GetIamPolicyRequest, $root.google.iam.v1.Policy, request, callback); + }, "name", { value: "GetIamPolicy" }); + + /** + * Calls GetIamPolicy. + * @function getIamPolicy + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.IGetIamPolicyRequest} request GetIamPolicyRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. + * @memberof google.iam.v1.IAMPolicy + * @typedef TestIamPermissionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.iam.v1.TestIamPermissionsResponse} [response] TestIamPermissionsResponse + */ + + /** + * Calls TestIamPermissions. + * @function testIamPermissions + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.ITestIamPermissionsRequest} request TestIamPermissionsRequest message or plain object + * @param {google.iam.v1.IAMPolicy.TestIamPermissionsCallback} callback Node-style callback called with the error, if any, and TestIamPermissionsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(IAMPolicy.prototype.testIamPermissions = function testIamPermissions(request, callback) { + return this.rpcCall(testIamPermissions, $root.google.iam.v1.TestIamPermissionsRequest, $root.google.iam.v1.TestIamPermissionsResponse, request, callback); + }, "name", { value: "TestIamPermissions" }); + + /** + * Calls TestIamPermissions. + * @function testIamPermissions + * @memberof google.iam.v1.IAMPolicy + * @instance + * @param {google.iam.v1.ITestIamPermissionsRequest} request TestIamPermissionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return IAMPolicy; + })(); + + v1.SetIamPolicyRequest = (function() { + + /** + * Properties of a SetIamPolicyRequest. + * @memberof google.iam.v1 + * @interface ISetIamPolicyRequest + * @property {string|null} [resource] SetIamPolicyRequest resource + * @property {google.iam.v1.IPolicy|null} [policy] SetIamPolicyRequest policy + */ + + /** + * Constructs a new SetIamPolicyRequest. + * @memberof google.iam.v1 + * @classdesc Represents a SetIamPolicyRequest. + * @implements ISetIamPolicyRequest + * @constructor + * @param {google.iam.v1.ISetIamPolicyRequest=} [properties] Properties to set + */ + function SetIamPolicyRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * SetIamPolicyRequest resource. + * @member {string} resource + * @memberof google.iam.v1.SetIamPolicyRequest + * @instance + */ + SetIamPolicyRequest.prototype.resource = ""; + + /** + * SetIamPolicyRequest policy. + * @member {google.iam.v1.IPolicy|null|undefined} policy + * @memberof google.iam.v1.SetIamPolicyRequest + * @instance + */ + SetIamPolicyRequest.prototype.policy = null; + + /** + * Creates a new SetIamPolicyRequest instance using the specified properties. + * @function create + * @memberof google.iam.v1.SetIamPolicyRequest * @static - * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.PublishRequest} PublishRequest instance + * @param {google.iam.v1.ISetIamPolicyRequest=} [properties] Properties to set + * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest instance */ - PublishRequest.create = function create(properties) { - return new PublishRequest(properties); + SetIamPolicyRequest.create = function create(properties) { + return new SetIamPolicyRequest(properties); }; /** - * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.iam.v1.SetIamPolicyRequest * @static - * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode + * @param {google.iam.v1.ISetIamPolicyRequest} message SetIamPolicyRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PublishRequest.encode = function encode(message, writer) { + SetIamPolicyRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.messages != null && message.messages.length) - for (var i = 0; i < message.messages.length; ++i) - $root.google.pubsub.v1.PubsubMessage.encode(message.messages[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.resource != null && message.hasOwnProperty("resource")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); + if (message.policy != null && message.hasOwnProperty("policy")) + $root.google.iam.v1.Policy.encode(message.policy, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.iam.v1.SetIamPolicyRequest * @static - * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode + * @param {google.iam.v1.ISetIamPolicyRequest} message SetIamPolicyRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PublishRequest.encodeDelimited = function encodeDelimited(message, writer) { + SetIamPolicyRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a PublishRequest message from the specified reader or buffer. + * Decodes a SetIamPolicyRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.iam.v1.SetIamPolicyRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PublishRequest} PublishRequest + * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishRequest.decode = function decode(reader, length) { + SetIamPolicyRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.SetIamPolicyRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.topic = reader.string(); + message.resource = reader.string(); break; case 2: - if (!(message.messages && message.messages.length)) - message.messages = []; - message.messages.push($root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32())); + message.policy = $root.google.iam.v1.Policy.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -1681,134 +1846,122 @@ }; /** - * Decodes a PublishRequest message from the specified reader or buffer, length delimited. + * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.iam.v1.SetIamPolicyRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PublishRequest} PublishRequest + * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishRequest.decodeDelimited = function decodeDelimited(reader) { + SetIamPolicyRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a PublishRequest message. + * Verifies a SetIamPolicyRequest message. * @function verify - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.iam.v1.SetIamPolicyRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - PublishRequest.verify = function verify(message) { + SetIamPolicyRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.messages != null && message.hasOwnProperty("messages")) { - if (!Array.isArray(message.messages)) - return "messages: array expected"; - for (var i = 0; i < message.messages.length; ++i) { - var error = $root.google.pubsub.v1.PubsubMessage.verify(message.messages[i]); - if (error) - return "messages." + error; - } + if (message.resource != null && message.hasOwnProperty("resource")) + if (!$util.isString(message.resource)) + return "resource: string expected"; + if (message.policy != null && message.hasOwnProperty("policy")) { + var error = $root.google.iam.v1.Policy.verify(message.policy); + if (error) + return "policy." + error; } return null; }; /** - * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. + * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.iam.v1.SetIamPolicyRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PublishRequest} PublishRequest + * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest */ - PublishRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PublishRequest) + SetIamPolicyRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.SetIamPolicyRequest) return object; - var message = new $root.google.pubsub.v1.PublishRequest(); - if (object.topic != null) - message.topic = String(object.topic); - if (object.messages) { - if (!Array.isArray(object.messages)) - throw TypeError(".google.pubsub.v1.PublishRequest.messages: array expected"); - message.messages = []; - for (var i = 0; i < object.messages.length; ++i) { - if (typeof object.messages[i] !== "object") - throw TypeError(".google.pubsub.v1.PublishRequest.messages: object expected"); - message.messages[i] = $root.google.pubsub.v1.PubsubMessage.fromObject(object.messages[i]); - } + var message = new $root.google.iam.v1.SetIamPolicyRequest(); + if (object.resource != null) + message.resource = String(object.resource); + if (object.policy != null) { + if (typeof object.policy !== "object") + throw TypeError(".google.iam.v1.SetIamPolicyRequest.policy: object expected"); + message.policy = $root.google.iam.v1.Policy.fromObject(object.policy); } return message; }; /** - * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. + * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.iam.v1.SetIamPolicyRequest * @static - * @param {google.pubsub.v1.PublishRequest} message PublishRequest + * @param {google.iam.v1.SetIamPolicyRequest} message SetIamPolicyRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - PublishRequest.toObject = function toObject(message, options) { + SetIamPolicyRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.messages = []; - if (options.defaults) - object.topic = ""; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.messages && message.messages.length) { - object.messages = []; - for (var j = 0; j < message.messages.length; ++j) - object.messages[j] = $root.google.pubsub.v1.PubsubMessage.toObject(message.messages[j], options); + if (options.defaults) { + object.resource = ""; + object.policy = null; } - return object; + if (message.resource != null && message.hasOwnProperty("resource")) + object.resource = message.resource; + if (message.policy != null && message.hasOwnProperty("policy")) + object.policy = $root.google.iam.v1.Policy.toObject(message.policy, options); + return object; }; /** - * Converts this PublishRequest to JSON. + * Converts this SetIamPolicyRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.iam.v1.SetIamPolicyRequest * @instance * @returns {Object.} JSON object */ - PublishRequest.prototype.toJSON = function toJSON() { + SetIamPolicyRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return PublishRequest; + return SetIamPolicyRequest; })(); - v1.PublishResponse = (function() { + v1.GetIamPolicyRequest = (function() { /** - * Properties of a PublishResponse. - * @memberof google.pubsub.v1 - * @interface IPublishResponse - * @property {Array.|null} [messageIds] PublishResponse messageIds + * Properties of a GetIamPolicyRequest. + * @memberof google.iam.v1 + * @interface IGetIamPolicyRequest + * @property {string|null} [resource] GetIamPolicyRequest resource + * @property {google.iam.v1.IGetPolicyOptions|null} [options] GetIamPolicyRequest options */ /** - * Constructs a new PublishResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a PublishResponse. - * @implements IPublishResponse + * Constructs a new GetIamPolicyRequest. + * @memberof google.iam.v1 + * @classdesc Represents a GetIamPolicyRequest. + * @implements IGetIamPolicyRequest * @constructor - * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set + * @param {google.iam.v1.IGetIamPolicyRequest=} [properties] Properties to set */ - function PublishResponse(properties) { - this.messageIds = []; + function GetIamPolicyRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -1816,78 +1969,88 @@ } /** - * PublishResponse messageIds. - * @member {Array.} messageIds - * @memberof google.pubsub.v1.PublishResponse + * GetIamPolicyRequest resource. + * @member {string} resource + * @memberof google.iam.v1.GetIamPolicyRequest * @instance */ - PublishResponse.prototype.messageIds = $util.emptyArray; + GetIamPolicyRequest.prototype.resource = ""; /** - * Creates a new PublishResponse instance using the specified properties. + * GetIamPolicyRequest options. + * @member {google.iam.v1.IGetPolicyOptions|null|undefined} options + * @memberof google.iam.v1.GetIamPolicyRequest + * @instance + */ + GetIamPolicyRequest.prototype.options = null; + + /** + * Creates a new GetIamPolicyRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @static - * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.PublishResponse} PublishResponse instance + * @param {google.iam.v1.IGetIamPolicyRequest=} [properties] Properties to set + * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest instance */ - PublishResponse.create = function create(properties) { - return new PublishResponse(properties); + GetIamPolicyRequest.create = function create(properties) { + return new GetIamPolicyRequest(properties); }; /** - * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @static - * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode + * @param {google.iam.v1.IGetIamPolicyRequest} message GetIamPolicyRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PublishResponse.encode = function encode(message, writer) { + GetIamPolicyRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.messageIds != null && message.messageIds.length) - for (var i = 0; i < message.messageIds.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.messageIds[i]); + if (message.resource != null && message.hasOwnProperty("resource")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.iam.v1.GetPolicyOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @static - * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode + * @param {google.iam.v1.IGetIamPolicyRequest} message GetIamPolicyRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PublishResponse.encodeDelimited = function encodeDelimited(message, writer) { + GetIamPolicyRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a PublishResponse message from the specified reader or buffer. + * Decodes a GetIamPolicyRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishResponse.decode = function decode(reader, length) { + GetIamPolicyRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishResponse(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.GetIamPolicyRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.messageIds && message.messageIds.length)) - message.messageIds = []; - message.messageIds.push(reader.string()); + message.resource = reader.string(); + break; + case 2: + message.options = $root.google.iam.v1.GetPolicyOptions.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -1898,121 +2061,123 @@ }; /** - * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishResponse.decodeDelimited = function decodeDelimited(reader) { + GetIamPolicyRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a PublishResponse message. + * Verifies a GetIamPolicyRequest message. * @function verify - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - PublishResponse.verify = function verify(message) { + GetIamPolicyRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.messageIds != null && message.hasOwnProperty("messageIds")) { - if (!Array.isArray(message.messageIds)) - return "messageIds: array expected"; - for (var i = 0; i < message.messageIds.length; ++i) - if (!$util.isString(message.messageIds[i])) - return "messageIds: string[] expected"; + if (message.resource != null && message.hasOwnProperty("resource")) + if (!$util.isString(message.resource)) + return "resource: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.iam.v1.GetPolicyOptions.verify(message.options); + if (error) + return "options." + error; } return null; }; /** - * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest */ - PublishResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PublishResponse) + GetIamPolicyRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.GetIamPolicyRequest) return object; - var message = new $root.google.pubsub.v1.PublishResponse(); - if (object.messageIds) { - if (!Array.isArray(object.messageIds)) - throw TypeError(".google.pubsub.v1.PublishResponse.messageIds: array expected"); - message.messageIds = []; - for (var i = 0; i < object.messageIds.length; ++i) - message.messageIds[i] = String(object.messageIds[i]); + var message = new $root.google.iam.v1.GetIamPolicyRequest(); + if (object.resource != null) + message.resource = String(object.resource); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.iam.v1.GetIamPolicyRequest.options: object expected"); + message.options = $root.google.iam.v1.GetPolicyOptions.fromObject(object.options); } return message; }; /** - * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @static - * @param {google.pubsub.v1.PublishResponse} message PublishResponse + * @param {google.iam.v1.GetIamPolicyRequest} message GetIamPolicyRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - PublishResponse.toObject = function toObject(message, options) { + GetIamPolicyRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.messageIds = []; - if (message.messageIds && message.messageIds.length) { - object.messageIds = []; - for (var j = 0; j < message.messageIds.length; ++j) - object.messageIds[j] = message.messageIds[j]; + if (options.defaults) { + object.resource = ""; + object.options = null; } + if (message.resource != null && message.hasOwnProperty("resource")) + object.resource = message.resource; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.iam.v1.GetPolicyOptions.toObject(message.options, options); return object; }; /** - * Converts this PublishResponse to JSON. + * Converts this GetIamPolicyRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.iam.v1.GetIamPolicyRequest * @instance * @returns {Object.} JSON object */ - PublishResponse.prototype.toJSON = function toJSON() { + GetIamPolicyRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return PublishResponse; + return GetIamPolicyRequest; })(); - v1.ListTopicsRequest = (function() { + v1.TestIamPermissionsRequest = (function() { /** - * Properties of a ListTopicsRequest. - * @memberof google.pubsub.v1 - * @interface IListTopicsRequest - * @property {string|null} [project] ListTopicsRequest project - * @property {number|null} [pageSize] ListTopicsRequest pageSize - * @property {string|null} [pageToken] ListTopicsRequest pageToken + * Properties of a TestIamPermissionsRequest. + * @memberof google.iam.v1 + * @interface ITestIamPermissionsRequest + * @property {string|null} [resource] TestIamPermissionsRequest resource + * @property {Array.|null} [permissions] TestIamPermissionsRequest permissions */ /** - * Constructs a new ListTopicsRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicsRequest. - * @implements IListTopicsRequest + * Constructs a new TestIamPermissionsRequest. + * @memberof google.iam.v1 + * @classdesc Represents a TestIamPermissionsRequest. + * @implements ITestIamPermissionsRequest * @constructor - * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set + * @param {google.iam.v1.ITestIamPermissionsRequest=} [properties] Properties to set */ - function ListTopicsRequest(properties) { + function TestIamPermissionsRequest(properties) { + this.permissions = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -2020,101 +2185,91 @@ } /** - * ListTopicsRequest project. - * @member {string} project - * @memberof google.pubsub.v1.ListTopicsRequest - * @instance - */ - ListTopicsRequest.prototype.project = ""; - - /** - * ListTopicsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListTopicsRequest + * TestIamPermissionsRequest resource. + * @member {string} resource + * @memberof google.iam.v1.TestIamPermissionsRequest * @instance */ - ListTopicsRequest.prototype.pageSize = 0; + TestIamPermissionsRequest.prototype.resource = ""; /** - * ListTopicsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListTopicsRequest + * TestIamPermissionsRequest permissions. + * @member {Array.} permissions + * @memberof google.iam.v1.TestIamPermissionsRequest * @instance */ - ListTopicsRequest.prototype.pageToken = ""; + TestIamPermissionsRequest.prototype.permissions = $util.emptyArray; /** - * Creates a new ListTopicsRequest instance using the specified properties. + * Creates a new TestIamPermissionsRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @static - * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest instance + * @param {google.iam.v1.ITestIamPermissionsRequest=} [properties] Properties to set + * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest instance */ - ListTopicsRequest.create = function create(properties) { - return new ListTopicsRequest(properties); + TestIamPermissionsRequest.create = function create(properties) { + return new TestIamPermissionsRequest(properties); }; /** - * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @static - * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode + * @param {google.iam.v1.ITestIamPermissionsRequest} message TestIamPermissionsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicsRequest.encode = function encode(message, writer) { + TestIamPermissionsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + if (message.resource != null && message.hasOwnProperty("resource")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); + if (message.permissions != null && message.permissions.length) + for (var i = 0; i < message.permissions.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.permissions[i]); return writer; }; /** - * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @static - * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode + * @param {google.iam.v1.ITestIamPermissionsRequest} message TestIamPermissionsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicsRequest.encodeDelimited = function encodeDelimited(message, writer) { + TestIamPermissionsRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListTopicsRequest message from the specified reader or buffer. + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsRequest.decode = function decode(reader, length) { + TestIamPermissionsRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.TestIamPermissionsRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.project = reader.string(); + message.resource = reader.string(); break; case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); + if (!(message.permissions && message.permissions.length)) + message.permissions = []; + message.permissions.push(reader.string()); break; default: reader.skipType(tag & 7); @@ -2125,126 +2280,129 @@ }; /** - * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. + * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsRequest.decodeDelimited = function decodeDelimited(reader) { + TestIamPermissionsRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListTopicsRequest message. + * Verifies a TestIamPermissionsRequest message. * @function verify - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListTopicsRequest.verify = function verify(message) { + TestIamPermissionsRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.project != null && message.hasOwnProperty("project")) - if (!$util.isString(message.project)) - return "project: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; + if (message.resource != null && message.hasOwnProperty("resource")) + if (!$util.isString(message.resource)) + return "resource: string expected"; + if (message.permissions != null && message.hasOwnProperty("permissions")) { + if (!Array.isArray(message.permissions)) + return "permissions: array expected"; + for (var i = 0; i < message.permissions.length; ++i) + if (!$util.isString(message.permissions[i])) + return "permissions: string[] expected"; + } return null; }; /** - * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest */ - ListTopicsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicsRequest) + TestIamPermissionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.TestIamPermissionsRequest) return object; - var message = new $root.google.pubsub.v1.ListTopicsRequest(); - if (object.project != null) - message.project = String(object.project); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); + var message = new $root.google.iam.v1.TestIamPermissionsRequest(); + if (object.resource != null) + message.resource = String(object.resource); + if (object.permissions) { + if (!Array.isArray(object.permissions)) + throw TypeError(".google.iam.v1.TestIamPermissionsRequest.permissions: array expected"); + message.permissions = []; + for (var i = 0; i < object.permissions.length; ++i) + message.permissions[i] = String(object.permissions[i]); + } return message; }; /** - * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @static - * @param {google.pubsub.v1.ListTopicsRequest} message ListTopicsRequest + * @param {google.iam.v1.TestIamPermissionsRequest} message TestIamPermissionsRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListTopicsRequest.toObject = function toObject(message, options) { + TestIamPermissionsRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.project = ""; - object.pageSize = 0; - object.pageToken = ""; + if (options.arrays || options.defaults) + object.permissions = []; + if (options.defaults) + object.resource = ""; + if (message.resource != null && message.hasOwnProperty("resource")) + object.resource = message.resource; + if (message.permissions && message.permissions.length) { + object.permissions = []; + for (var j = 0; j < message.permissions.length; ++j) + object.permissions[j] = message.permissions[j]; } - if (message.project != null && message.hasOwnProperty("project")) - object.project = message.project; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; return object; }; /** - * Converts this ListTopicsRequest to JSON. + * Converts this TestIamPermissionsRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.iam.v1.TestIamPermissionsRequest * @instance * @returns {Object.} JSON object */ - ListTopicsRequest.prototype.toJSON = function toJSON() { + TestIamPermissionsRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListTopicsRequest; + return TestIamPermissionsRequest; })(); - v1.ListTopicsResponse = (function() { + v1.TestIamPermissionsResponse = (function() { /** - * Properties of a ListTopicsResponse. - * @memberof google.pubsub.v1 - * @interface IListTopicsResponse - * @property {Array.|null} [topics] ListTopicsResponse topics - * @property {string|null} [nextPageToken] ListTopicsResponse nextPageToken + * Properties of a TestIamPermissionsResponse. + * @memberof google.iam.v1 + * @interface ITestIamPermissionsResponse + * @property {Array.|null} [permissions] TestIamPermissionsResponse permissions */ /** - * Constructs a new ListTopicsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicsResponse. - * @implements IListTopicsResponse + * Constructs a new TestIamPermissionsResponse. + * @memberof google.iam.v1 + * @classdesc Represents a TestIamPermissionsResponse. + * @implements ITestIamPermissionsResponse * @constructor - * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set + * @param {google.iam.v1.ITestIamPermissionsResponse=} [properties] Properties to set */ - function ListTopicsResponse(properties) { - this.topics = []; + function TestIamPermissionsResponse(properties) { + this.permissions = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -2252,91 +2410,78 @@ } /** - * ListTopicsResponse topics. - * @member {Array.} topics - * @memberof google.pubsub.v1.ListTopicsResponse - * @instance - */ - ListTopicsResponse.prototype.topics = $util.emptyArray; - - /** - * ListTopicsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListTopicsResponse + * TestIamPermissionsResponse permissions. + * @member {Array.} permissions + * @memberof google.iam.v1.TestIamPermissionsResponse * @instance */ - ListTopicsResponse.prototype.nextPageToken = ""; + TestIamPermissionsResponse.prototype.permissions = $util.emptyArray; /** - * Creates a new ListTopicsResponse instance using the specified properties. + * Creates a new TestIamPermissionsResponse instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @static - * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse instance + * @param {google.iam.v1.ITestIamPermissionsResponse=} [properties] Properties to set + * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse instance */ - ListTopicsResponse.create = function create(properties) { - return new ListTopicsResponse(properties); + TestIamPermissionsResponse.create = function create(properties) { + return new TestIamPermissionsResponse(properties); }; /** - * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @static - * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {google.iam.v1.ITestIamPermissionsResponse} message TestIamPermissionsResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicsResponse.encode = function encode(message, writer) { + TestIamPermissionsResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topics != null && message.topics.length) - for (var i = 0; i < message.topics.length; ++i) - $root.google.pubsub.v1.Topic.encode(message.topics[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + if (message.permissions != null && message.permissions.length) + for (var i = 0; i < message.permissions.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.permissions[i]); return writer; }; /** - * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @static - * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {google.iam.v1.ITestIamPermissionsResponse} message TestIamPermissionsResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicsResponse.encodeDelimited = function encodeDelimited(message, writer) { + TestIamPermissionsResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListTopicsResponse message from the specified reader or buffer. + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsResponse.decode = function decode(reader, length) { + TestIamPermissionsResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsResponse(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.TestIamPermissionsResponse(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.topics && message.topics.length)) - message.topics = []; - message.topics.push($root.google.pubsub.v1.Topic.decode(reader, reader.uint32())); - break; - case 2: - message.nextPageToken = reader.string(); + if (!(message.permissions && message.permissions.length)) + message.permissions = []; + message.permissions.push(reader.string()); break; default: reader.skipType(tag & 7); @@ -2347,3763 +2492,3244 @@ }; /** - * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsResponse.decodeDelimited = function decodeDelimited(reader) { + TestIamPermissionsResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListTopicsResponse message. + * Verifies a TestIamPermissionsResponse message. * @function verify - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListTopicsResponse.verify = function verify(message) { + TestIamPermissionsResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.topics != null && message.hasOwnProperty("topics")) { - if (!Array.isArray(message.topics)) - return "topics: array expected"; - for (var i = 0; i < message.topics.length; ++i) { - var error = $root.google.pubsub.v1.Topic.verify(message.topics[i]); - if (error) - return "topics." + error; - } - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; - return null; + if (message.permissions != null && message.hasOwnProperty("permissions")) { + if (!Array.isArray(message.permissions)) + return "permissions: array expected"; + for (var i = 0; i < message.permissions.length; ++i) + if (!$util.isString(message.permissions[i])) + return "permissions: string[] expected"; + } + return null; }; /** - * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse */ - ListTopicsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicsResponse) + TestIamPermissionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.iam.v1.TestIamPermissionsResponse) return object; - var message = new $root.google.pubsub.v1.ListTopicsResponse(); - if (object.topics) { - if (!Array.isArray(object.topics)) - throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: array expected"); - message.topics = []; - for (var i = 0; i < object.topics.length; ++i) { - if (typeof object.topics[i] !== "object") - throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: object expected"); - message.topics[i] = $root.google.pubsub.v1.Topic.fromObject(object.topics[i]); - } + var message = new $root.google.iam.v1.TestIamPermissionsResponse(); + if (object.permissions) { + if (!Array.isArray(object.permissions)) + throw TypeError(".google.iam.v1.TestIamPermissionsResponse.permissions: array expected"); + message.permissions = []; + for (var i = 0; i < object.permissions.length; ++i) + message.permissions[i] = String(object.permissions[i]); } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); return message; }; /** - * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @static - * @param {google.pubsub.v1.ListTopicsResponse} message ListTopicsResponse + * @param {google.iam.v1.TestIamPermissionsResponse} message TestIamPermissionsResponse * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListTopicsResponse.toObject = function toObject(message, options) { + TestIamPermissionsResponse.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.arrays || options.defaults) - object.topics = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.topics && message.topics.length) { - object.topics = []; - for (var j = 0; j < message.topics.length; ++j) - object.topics[j] = $root.google.pubsub.v1.Topic.toObject(message.topics[j], options); + object.permissions = []; + if (message.permissions && message.permissions.length) { + object.permissions = []; + for (var j = 0; j < message.permissions.length; ++j) + object.permissions[j] = message.permissions[j]; } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; return object; }; /** - * Converts this ListTopicsResponse to JSON. + * Converts this TestIamPermissionsResponse to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.iam.v1.TestIamPermissionsResponse * @instance * @returns {Object.} JSON object */ - ListTopicsResponse.prototype.toJSON = function toJSON() { + TestIamPermissionsResponse.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListTopicsResponse; + return TestIamPermissionsResponse; })(); - v1.ListTopicSubscriptionsRequest = (function() { + return v1; + })(); - /** - * Properties of a ListTopicSubscriptionsRequest. - * @memberof google.pubsub.v1 - * @interface IListTopicSubscriptionsRequest - * @property {string|null} [topic] ListTopicSubscriptionsRequest topic - * @property {number|null} [pageSize] ListTopicSubscriptionsRequest pageSize - * @property {string|null} [pageToken] ListTopicSubscriptionsRequest pageToken - */ + return iam; + })(); - /** - * Constructs a new ListTopicSubscriptionsRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicSubscriptionsRequest. - * @implements IListTopicSubscriptionsRequest - * @constructor - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set - */ - function ListTopicSubscriptionsRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + google.type = (function() { - /** - * ListTopicSubscriptionsRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @instance - */ - ListTopicSubscriptionsRequest.prototype.topic = ""; + /** + * Namespace type. + * @memberof google + * @namespace + */ + var type = {}; - /** - * ListTopicSubscriptionsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @instance - */ - ListTopicSubscriptionsRequest.prototype.pageSize = 0; + type.Expr = (function() { - /** - * ListTopicSubscriptionsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @instance - */ - ListTopicSubscriptionsRequest.prototype.pageToken = ""; + /** + * Properties of an Expr. + * @memberof google.type + * @interface IExpr + * @property {string|null} [expression] Expr expression + * @property {string|null} [title] Expr title + * @property {string|null} [description] Expr description + * @property {string|null} [location] Expr location + */ - /** - * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest instance - */ - ListTopicSubscriptionsRequest.create = function create(properties) { - return new ListTopicSubscriptionsRequest(properties); - }; + /** + * Constructs a new Expr. + * @memberof google.type + * @classdesc Represents an Expr. + * @implements IExpr + * @constructor + * @param {google.type.IExpr=} [properties] Properties to set + */ + function Expr(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSubscriptionsRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); - return writer; - }; + /** + * Expr expression. + * @member {string} expression + * @memberof google.type.Expr + * @instance + */ + Expr.prototype.expression = ""; - /** - * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Expr title. + * @member {string} title + * @memberof google.type.Expr + * @instance + */ + Expr.prototype.title = ""; - /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSubscriptionsRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Expr description. + * @member {string} description + * @memberof google.type.Expr + * @instance + */ + Expr.prototype.description = ""; - /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a ListTopicSubscriptionsRequest message. - * @function verify - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListTopicSubscriptionsRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; - return null; - }; - - /** - * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest - */ - ListTopicSubscriptionsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsRequest) - return object; - var message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); - if (object.topic != null) - message.topic = String(object.topic); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); - return message; - }; - - /** - * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @static - * @param {google.pubsub.v1.ListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListTopicSubscriptionsRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.topic = ""; - object.pageSize = 0; - object.pageToken = ""; - } - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; - return object; - }; - - /** - * Converts this ListTopicSubscriptionsRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @instance - * @returns {Object.} JSON object - */ - ListTopicSubscriptionsRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Expr location. + * @member {string} location + * @memberof google.type.Expr + * @instance + */ + Expr.prototype.location = ""; - return ListTopicSubscriptionsRequest; - })(); + /** + * Creates a new Expr instance using the specified properties. + * @function create + * @memberof google.type.Expr + * @static + * @param {google.type.IExpr=} [properties] Properties to set + * @returns {google.type.Expr} Expr instance + */ + Expr.create = function create(properties) { + return new Expr(properties); + }; - v1.ListTopicSubscriptionsResponse = (function() { + /** + * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @function encode + * @memberof google.type.Expr + * @static + * @param {google.type.IExpr} message Expr message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Expr.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.expression != null && message.hasOwnProperty("expression")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.expression); + if (message.title != null && message.hasOwnProperty("title")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.title); + if (message.description != null && message.hasOwnProperty("description")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.description); + if (message.location != null && message.hasOwnProperty("location")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.location); + return writer; + }; - /** - * Properties of a ListTopicSubscriptionsResponse. - * @memberof google.pubsub.v1 - * @interface IListTopicSubscriptionsResponse - * @property {Array.|null} [subscriptions] ListTopicSubscriptionsResponse subscriptions - * @property {string|null} [nextPageToken] ListTopicSubscriptionsResponse nextPageToken - */ + /** + * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. + * @function encodeDelimited + * @memberof google.type.Expr + * @static + * @param {google.type.IExpr} message Expr message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Expr.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Constructs a new ListTopicSubscriptionsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicSubscriptionsResponse. - * @implements IListTopicSubscriptionsResponse - * @constructor - * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set - */ - function ListTopicSubscriptionsResponse(properties) { - this.subscriptions = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Decodes an Expr message from the specified reader or buffer. + * @function decode + * @memberof google.type.Expr + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.type.Expr} Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Expr.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.type.Expr(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.expression = reader.string(); + break; + case 2: + message.title = reader.string(); + break; + case 3: + message.description = reader.string(); + break; + case 4: + message.location = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } } + return message; + }; - /** - * ListTopicSubscriptionsResponse subscriptions. - * @member {Array.} subscriptions - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @instance - */ - ListTopicSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; + /** + * Decodes an Expr message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.type.Expr + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.type.Expr} Expr + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Expr.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * ListTopicSubscriptionsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @instance - */ - ListTopicSubscriptionsResponse.prototype.nextPageToken = ""; + /** + * Verifies an Expr message. + * @function verify + * @memberof google.type.Expr + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Expr.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.expression != null && message.hasOwnProperty("expression")) + if (!$util.isString(message.expression)) + return "expression: string expected"; + if (message.title != null && message.hasOwnProperty("title")) + if (!$util.isString(message.title)) + return "title: string expected"; + if (message.description != null && message.hasOwnProperty("description")) + if (!$util.isString(message.description)) + return "description: string expected"; + if (message.location != null && message.hasOwnProperty("location")) + if (!$util.isString(message.location)) + return "location: string expected"; + return null; + }; - /** - * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse instance - */ - ListTopicSubscriptionsResponse.create = function create(properties) { - return new ListTopicSubscriptionsResponse(properties); - }; - - /** - * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSubscriptionsResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscriptions != null && message.subscriptions.length) - for (var i = 0; i < message.subscriptions.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscriptions[i]); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); - return writer; - }; - - /** - * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates an Expr message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.type.Expr + * @static + * @param {Object.} object Plain object + * @returns {google.type.Expr} Expr + */ + Expr.fromObject = function fromObject(object) { + if (object instanceof $root.google.type.Expr) + return object; + var message = new $root.google.type.Expr(); + if (object.expression != null) + message.expression = String(object.expression); + if (object.title != null) + message.title = String(object.title); + if (object.description != null) + message.description = String(object.description); + if (object.location != null) + message.location = String(object.location); + return message; + }; - /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSubscriptionsResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.subscriptions && message.subscriptions.length)) - message.subscriptions = []; - message.subscriptions.push(reader.string()); - break; - case 2: - message.nextPageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Creates a plain object from an Expr message. Also converts values to other types if specified. + * @function toObject + * @memberof google.type.Expr + * @static + * @param {google.type.Expr} message Expr + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Expr.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.expression = ""; + object.title = ""; + object.description = ""; + object.location = ""; + } + if (message.expression != null && message.hasOwnProperty("expression")) + object.expression = message.expression; + if (message.title != null && message.hasOwnProperty("title")) + object.title = message.title; + if (message.description != null && message.hasOwnProperty("description")) + object.description = message.description; + if (message.location != null && message.hasOwnProperty("location")) + object.location = message.location; + return object; + }; - /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Converts this Expr to JSON. + * @function toJSON + * @memberof google.type.Expr + * @instance + * @returns {Object.} JSON object + */ + Expr.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Verifies a ListTopicSubscriptionsResponse message. - * @function verify - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListTopicSubscriptionsResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { - if (!Array.isArray(message.subscriptions)) - return "subscriptions: array expected"; - for (var i = 0; i < message.subscriptions.length; ++i) - if (!$util.isString(message.subscriptions[i])) - return "subscriptions: string[] expected"; - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; - return null; - }; + return Expr; + })(); - /** - * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse - */ - ListTopicSubscriptionsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsResponse) - return object; - var message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); - if (object.subscriptions) { - if (!Array.isArray(object.subscriptions)) - throw TypeError(".google.pubsub.v1.ListTopicSubscriptionsResponse.subscriptions: array expected"); - message.subscriptions = []; - for (var i = 0; i < object.subscriptions.length; ++i) - message.subscriptions[i] = String(object.subscriptions[i]); - } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); - return message; - }; + return type; + })(); - /** - * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListTopicSubscriptionsResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.subscriptions = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.subscriptions && message.subscriptions.length) { - object.subscriptions = []; - for (var j = 0; j < message.subscriptions.length; ++j) - object.subscriptions[j] = message.subscriptions[j]; - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; - return object; - }; + google.api = (function() { - /** - * Converts this ListTopicSubscriptionsResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @instance - * @returns {Object.} JSON object - */ - ListTopicSubscriptionsResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Namespace api. + * @memberof google + * @namespace + */ + var api = {}; - return ListTopicSubscriptionsResponse; - })(); + api.Http = (function() { - v1.ListTopicSnapshotsRequest = (function() { + /** + * Properties of a Http. + * @memberof google.api + * @interface IHttp + * @property {Array.|null} [rules] Http rules + * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion + */ - /** - * Properties of a ListTopicSnapshotsRequest. - * @memberof google.pubsub.v1 - * @interface IListTopicSnapshotsRequest - * @property {string|null} [topic] ListTopicSnapshotsRequest topic - * @property {number|null} [pageSize] ListTopicSnapshotsRequest pageSize - * @property {string|null} [pageToken] ListTopicSnapshotsRequest pageToken - */ - - /** - * Constructs a new ListTopicSnapshotsRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicSnapshotsRequest. - * @implements IListTopicSnapshotsRequest - * @constructor - * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set - */ - function ListTopicSnapshotsRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ListTopicSnapshotsRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @instance - */ - ListTopicSnapshotsRequest.prototype.topic = ""; + /** + * Constructs a new Http. + * @memberof google.api + * @classdesc Represents a Http. + * @implements IHttp + * @constructor + * @param {google.api.IHttp=} [properties] Properties to set + */ + function Http(properties) { + this.rules = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * ListTopicSnapshotsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @instance - */ - ListTopicSnapshotsRequest.prototype.pageSize = 0; + /** + * Http rules. + * @member {Array.} rules + * @memberof google.api.Http + * @instance + */ + Http.prototype.rules = $util.emptyArray; - /** - * ListTopicSnapshotsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @instance - */ - ListTopicSnapshotsRequest.prototype.pageToken = ""; + /** + * Http fullyDecodeReservedExpansion. + * @member {boolean} fullyDecodeReservedExpansion + * @memberof google.api.Http + * @instance + */ + Http.prototype.fullyDecodeReservedExpansion = false; - /** - * Creates a new ListTopicSnapshotsRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest instance - */ - ListTopicSnapshotsRequest.create = function create(properties) { - return new ListTopicSnapshotsRequest(properties); - }; + /** + * Creates a new Http instance using the specified properties. + * @function create + * @memberof google.api.Http + * @static + * @param {google.api.IHttp=} [properties] Properties to set + * @returns {google.api.Http} Http instance + */ + Http.create = function create(properties) { + return new Http(properties); + }; - /** - * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSnapshotsRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); - return writer; - }; + /** + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @function encode + * @memberof google.api.Http + * @static + * @param {google.api.IHttp} message Http message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Http.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.rules != null && message.rules.length) + for (var i = 0; i < message.rules.length; ++i) + $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); + return writer; + }; - /** - * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.Http + * @static + * @param {google.api.IHttp} message Http message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Http.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSnapshotsRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes a Http message from the specified reader or buffer. + * @function decode + * @memberof google.api.Http + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.Http} Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Http.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.rules && message.rules.length)) + message.rules = []; + message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + break; + case 2: + message.fullyDecodeReservedExpansion = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a Http message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.Http + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.Http} Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Http.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a ListTopicSnapshotsRequest message. - * @function verify - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListTopicSnapshotsRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; - return null; - }; - - /** - * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest - */ - ListTopicSnapshotsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsRequest) - return object; - var message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); - if (object.topic != null) - message.topic = String(object.topic); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); - return message; - }; - - /** - * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {google.pubsub.v1.ListTopicSnapshotsRequest} message ListTopicSnapshotsRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListTopicSnapshotsRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.topic = ""; - object.pageSize = 0; - object.pageToken = ""; + /** + * Verifies a Http message. + * @function verify + * @memberof google.api.Http + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Http.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.rules != null && message.hasOwnProperty("rules")) { + if (!Array.isArray(message.rules)) + return "rules: array expected"; + for (var i = 0; i < message.rules.length; ++i) { + var error = $root.google.api.HttpRule.verify(message.rules[i]); + if (error) + return "rules." + error; } - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; + } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + if (typeof message.fullyDecodeReservedExpansion !== "boolean") + return "fullyDecodeReservedExpansion: boolean expected"; + return null; + }; + + /** + * Creates a Http message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.Http + * @static + * @param {Object.} object Plain object + * @returns {google.api.Http} Http + */ + Http.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.Http) return object; - }; + var message = new $root.google.api.Http(); + if (object.rules) { + if (!Array.isArray(object.rules)) + throw TypeError(".google.api.Http.rules: array expected"); + message.rules = []; + for (var i = 0; i < object.rules.length; ++i) { + if (typeof object.rules[i] !== "object") + throw TypeError(".google.api.Http.rules: object expected"); + message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); + } + } + if (object.fullyDecodeReservedExpansion != null) + message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); + return message; + }; - /** - * Converts this ListTopicSnapshotsRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @instance - * @returns {Object.} JSON object - */ - ListTopicSnapshotsRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a Http message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.Http + * @static + * @param {google.api.Http} message Http + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Http.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.rules = []; + if (options.defaults) + object.fullyDecodeReservedExpansion = false; + if (message.rules && message.rules.length) { + object.rules = []; + for (var j = 0; j < message.rules.length; ++j) + object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); + } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; + return object; + }; - return ListTopicSnapshotsRequest; - })(); + /** + * Converts this Http to JSON. + * @function toJSON + * @memberof google.api.Http + * @instance + * @returns {Object.} JSON object + */ + Http.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.ListTopicSnapshotsResponse = (function() { + return Http; + })(); - /** - * Properties of a ListTopicSnapshotsResponse. - * @memberof google.pubsub.v1 - * @interface IListTopicSnapshotsResponse - * @property {Array.|null} [snapshots] ListTopicSnapshotsResponse snapshots - * @property {string|null} [nextPageToken] ListTopicSnapshotsResponse nextPageToken - */ + api.HttpRule = (function() { - /** - * Constructs a new ListTopicSnapshotsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicSnapshotsResponse. - * @implements IListTopicSnapshotsResponse - * @constructor - * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set - */ - function ListTopicSnapshotsResponse(properties) { - this.snapshots = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of a HttpRule. + * @memberof google.api + * @interface IHttpRule + * @property {string|null} [selector] HttpRule selector + * @property {string|null} [get] HttpRule get + * @property {string|null} [put] HttpRule put + * @property {string|null} [post] HttpRule post + * @property {string|null} ["delete"] HttpRule delete + * @property {string|null} [patch] HttpRule patch + * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom + * @property {string|null} [body] HttpRule body + * @property {string|null} [responseBody] HttpRule responseBody + * @property {Array.|null} [additionalBindings] HttpRule additionalBindings + */ - /** - * ListTopicSnapshotsResponse snapshots. - * @member {Array.} snapshots - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @instance - */ - ListTopicSnapshotsResponse.prototype.snapshots = $util.emptyArray; + /** + * Constructs a new HttpRule. + * @memberof google.api + * @classdesc Represents a HttpRule. + * @implements IHttpRule + * @constructor + * @param {google.api.IHttpRule=} [properties] Properties to set + */ + function HttpRule(properties) { + this.additionalBindings = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * ListTopicSnapshotsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @instance - */ - ListTopicSnapshotsResponse.prototype.nextPageToken = ""; + /** + * HttpRule selector. + * @member {string} selector + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.selector = ""; - /** - * Creates a new ListTopicSnapshotsResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse instance - */ - ListTopicSnapshotsResponse.create = function create(properties) { - return new ListTopicSnapshotsResponse(properties); - }; + /** + * HttpRule get. + * @member {string} get + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.get = ""; - /** - * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSnapshotsResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshots != null && message.snapshots.length) - for (var i = 0; i < message.snapshots.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshots[i]); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); - return writer; - }; + /** + * HttpRule put. + * @member {string} put + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.put = ""; - /** - * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * HttpRule post. + * @member {string} post + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.post = ""; - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSnapshotsResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.snapshots && message.snapshots.length)) - message.snapshots = []; - message.snapshots.push(reader.string()); - break; - case 2: - message.nextPageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * HttpRule delete. + * @member {string} delete + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype["delete"] = ""; - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * HttpRule patch. + * @member {string} patch + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.patch = ""; - /** - * Verifies a ListTopicSnapshotsResponse message. - * @function verify - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListTopicSnapshotsResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshots != null && message.hasOwnProperty("snapshots")) { - if (!Array.isArray(message.snapshots)) - return "snapshots: array expected"; - for (var i = 0; i < message.snapshots.length; ++i) - if (!$util.isString(message.snapshots[i])) - return "snapshots: string[] expected"; - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; - return null; - }; + /** + * HttpRule custom. + * @member {google.api.ICustomHttpPattern|null|undefined} custom + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.custom = null; - /** - * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse - */ - ListTopicSnapshotsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsResponse) - return object; - var message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); - if (object.snapshots) { - if (!Array.isArray(object.snapshots)) - throw TypeError(".google.pubsub.v1.ListTopicSnapshotsResponse.snapshots: array expected"); - message.snapshots = []; - for (var i = 0; i < object.snapshots.length; ++i) - message.snapshots[i] = String(object.snapshots[i]); - } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); - return message; - }; + /** + * HttpRule body. + * @member {string} body + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.body = ""; - /** - * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {google.pubsub.v1.ListTopicSnapshotsResponse} message ListTopicSnapshotsResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListTopicSnapshotsResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.snapshots = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.snapshots && message.snapshots.length) { - object.snapshots = []; - for (var j = 0; j < message.snapshots.length; ++j) - object.snapshots[j] = message.snapshots[j]; - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; - return object; - }; + /** + * HttpRule responseBody. + * @member {string} responseBody + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.responseBody = ""; - /** - * Converts this ListTopicSnapshotsResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @instance - * @returns {Object.} JSON object - */ - ListTopicSnapshotsResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * HttpRule additionalBindings. + * @member {Array.} additionalBindings + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.additionalBindings = $util.emptyArray; - return ListTopicSnapshotsResponse; - })(); + // OneOf field names bound to virtual getters and setters + var $oneOfFields; - v1.DeleteTopicRequest = (function() { + /** + * HttpRule pattern. + * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern + * @memberof google.api.HttpRule + * @instance + */ + Object.defineProperty(HttpRule.prototype, "pattern", { + get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]), + set: $util.oneOfSetter($oneOfFields) + }); - /** - * Properties of a DeleteTopicRequest. - * @memberof google.pubsub.v1 - * @interface IDeleteTopicRequest - * @property {string|null} [topic] DeleteTopicRequest topic - */ + /** + * Creates a new HttpRule instance using the specified properties. + * @function create + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule=} [properties] Properties to set + * @returns {google.api.HttpRule} HttpRule instance + */ + HttpRule.create = function create(properties) { + return new HttpRule(properties); + }; - /** - * Constructs a new DeleteTopicRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a DeleteTopicRequest. - * @implements IDeleteTopicRequest - * @constructor - * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set - */ - function DeleteTopicRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * DeleteTopicRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.DeleteTopicRequest - * @instance - */ - DeleteTopicRequest.prototype.topic = ""; - - /** - * Creates a new DeleteTopicRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest instance - */ - DeleteTopicRequest.create = function create(properties) { - return new DeleteTopicRequest(properties); - }; - - /** - * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteTopicRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - return writer; - }; + /** + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @function encode + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + HttpRule.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.selector != null && message.hasOwnProperty("selector")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); + if (message.get != null && message.hasOwnProperty("get")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.get); + if (message.put != null && message.hasOwnProperty("put")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.put); + if (message.post != null && message.hasOwnProperty("post")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.post); + if (message["delete"] != null && message.hasOwnProperty("delete")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]); + if (message.patch != null && message.hasOwnProperty("patch")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch); + if (message.body != null && message.hasOwnProperty("body")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.body); + if (message.custom != null && message.hasOwnProperty("custom")) + $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.additionalBindings != null && message.additionalBindings.length) + for (var i = 0; i < message.additionalBindings.length; ++i) + $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); + return writer; + }; - /** - * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + HttpRule.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteTopicRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteTopicRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes a HttpRule message from the specified reader or buffer. + * @function decode + * @memberof google.api.HttpRule + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.HttpRule} HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + HttpRule.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.selector = reader.string(); + break; + case 2: + message.get = reader.string(); + break; + case 3: + message.put = reader.string(); + break; + case 4: + message.post = reader.string(); + break; + case 5: + message["delete"] = reader.string(); + break; + case 6: + message.patch = reader.string(); + break; + case 8: + message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); + break; + case 7: + message.body = reader.string(); + break; + case 12: + message.responseBody = reader.string(); + break; + case 11: + if (!(message.additionalBindings && message.additionalBindings.length)) + message.additionalBindings = []; + message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; - - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteTopicRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a DeleteTopicRequest message. - * @function verify - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DeleteTopicRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - return null; - }; + } + return message; + }; - /** - * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest - */ - DeleteTopicRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.DeleteTopicRequest) - return object; - var message = new $root.google.pubsub.v1.DeleteTopicRequest(); - if (object.topic != null) - message.topic = String(object.topic); - return message; - }; + /** + * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.HttpRule + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.HttpRule} HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + HttpRule.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {google.pubsub.v1.DeleteTopicRequest} message DeleteTopicRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DeleteTopicRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.topic = ""; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - return object; - }; - - /** - * Converts this DeleteTopicRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.DeleteTopicRequest - * @instance - * @returns {Object.} JSON object - */ - DeleteTopicRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return DeleteTopicRequest; - })(); + /** + * Verifies a HttpRule message. + * @function verify + * @memberof google.api.HttpRule + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + HttpRule.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.selector != null && message.hasOwnProperty("selector")) + if (!$util.isString(message.selector)) + return "selector: string expected"; + if (message.get != null && message.hasOwnProperty("get")) { + properties.pattern = 1; + if (!$util.isString(message.get)) + return "get: string expected"; + } + if (message.put != null && message.hasOwnProperty("put")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.put)) + return "put: string expected"; + } + if (message.post != null && message.hasOwnProperty("post")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.post)) + return "post: string expected"; + } + if (message["delete"] != null && message.hasOwnProperty("delete")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message["delete"])) + return "delete: string expected"; + } + if (message.patch != null && message.hasOwnProperty("patch")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.patch)) + return "patch: string expected"; + } + if (message.custom != null && message.hasOwnProperty("custom")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + { + var error = $root.google.api.CustomHttpPattern.verify(message.custom); + if (error) + return "custom." + error; + } + } + if (message.body != null && message.hasOwnProperty("body")) + if (!$util.isString(message.body)) + return "body: string expected"; + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + if (!$util.isString(message.responseBody)) + return "responseBody: string expected"; + if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { + if (!Array.isArray(message.additionalBindings)) + return "additionalBindings: array expected"; + for (var i = 0; i < message.additionalBindings.length; ++i) { + var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]); + if (error) + return "additionalBindings." + error; + } + } + return null; + }; - v1.Subscriber = (function() { + /** + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.HttpRule + * @static + * @param {Object.} object Plain object + * @returns {google.api.HttpRule} HttpRule + */ + HttpRule.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.HttpRule) + return object; + var message = new $root.google.api.HttpRule(); + if (object.selector != null) + message.selector = String(object.selector); + if (object.get != null) + message.get = String(object.get); + if (object.put != null) + message.put = String(object.put); + if (object.post != null) + message.post = String(object.post); + if (object["delete"] != null) + message["delete"] = String(object["delete"]); + if (object.patch != null) + message.patch = String(object.patch); + if (object.custom != null) { + if (typeof object.custom !== "object") + throw TypeError(".google.api.HttpRule.custom: object expected"); + message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom); + } + if (object.body != null) + message.body = String(object.body); + if (object.responseBody != null) + message.responseBody = String(object.responseBody); + if (object.additionalBindings) { + if (!Array.isArray(object.additionalBindings)) + throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); + message.additionalBindings = []; + for (var i = 0; i < object.additionalBindings.length; ++i) { + if (typeof object.additionalBindings[i] !== "object") + throw TypeError(".google.api.HttpRule.additionalBindings: object expected"); + message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]); + } + } + return message; + }; - /** - * Constructs a new Subscriber service. - * @memberof google.pubsub.v1 - * @classdesc Represents a Subscriber - * @extends $protobuf.rpc.Service - * @constructor - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - */ - function Subscriber(rpcImpl, requestDelimited, responseDelimited) { - $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + /** + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.HttpRule + * @static + * @param {google.api.HttpRule} message HttpRule + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + HttpRule.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.additionalBindings = []; + if (options.defaults) { + object.selector = ""; + object.body = ""; + object.responseBody = ""; + } + if (message.selector != null && message.hasOwnProperty("selector")) + object.selector = message.selector; + if (message.get != null && message.hasOwnProperty("get")) { + object.get = message.get; + if (options.oneofs) + object.pattern = "get"; + } + if (message.put != null && message.hasOwnProperty("put")) { + object.put = message.put; + if (options.oneofs) + object.pattern = "put"; + } + if (message.post != null && message.hasOwnProperty("post")) { + object.post = message.post; + if (options.oneofs) + object.pattern = "post"; + } + if (message["delete"] != null && message.hasOwnProperty("delete")) { + object["delete"] = message["delete"]; + if (options.oneofs) + object.pattern = "delete"; + } + if (message.patch != null && message.hasOwnProperty("patch")) { + object.patch = message.patch; + if (options.oneofs) + object.pattern = "patch"; + } + if (message.body != null && message.hasOwnProperty("body")) + object.body = message.body; + if (message.custom != null && message.hasOwnProperty("custom")) { + object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options); + if (options.oneofs) + object.pattern = "custom"; + } + if (message.additionalBindings && message.additionalBindings.length) { + object.additionalBindings = []; + for (var j = 0; j < message.additionalBindings.length; ++j) + object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); } + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + object.responseBody = message.responseBody; + return object; + }; - (Subscriber.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Subscriber; + /** + * Converts this HttpRule to JSON. + * @function toJSON + * @memberof google.api.HttpRule + * @instance + * @returns {Object.} JSON object + */ + HttpRule.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates new Subscriber service using the specified rpc implementation. - * @function create - * @memberof google.pubsub.v1.Subscriber - * @static - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - * @returns {Subscriber} RPC service. Useful where requests and/or responses are streamed. - */ - Subscriber.create = function create(rpcImpl, requestDelimited, responseDelimited) { - return new this(rpcImpl, requestDelimited, responseDelimited); - }; + return HttpRule; + })(); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. - * @memberof google.pubsub.v1.Subscriber - * @typedef CreateSubscriptionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Subscription} [response] Subscription - */ + api.CustomHttpPattern = (function() { - /** - * Calls CreateSubscription. - * @function createSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object - * @param {google.pubsub.v1.Subscriber.CreateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.createSubscription = function createSubscription(request, callback) { - return this.rpcCall(createSubscription, $root.google.pubsub.v1.Subscription, $root.google.pubsub.v1.Subscription, request, callback); - }, "name", { value: "CreateSubscription" }); - - /** - * Calls CreateSubscription. - * @function createSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Properties of a CustomHttpPattern. + * @memberof google.api + * @interface ICustomHttpPattern + * @property {string|null} [kind] CustomHttpPattern kind + * @property {string|null} [path] CustomHttpPattern path + */ - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. - * @memberof google.pubsub.v1.Subscriber - * @typedef GetSubscriptionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Subscription} [response] Subscription - */ + /** + * Constructs a new CustomHttpPattern. + * @memberof google.api + * @classdesc Represents a CustomHttpPattern. + * @implements ICustomHttpPattern + * @constructor + * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + */ + function CustomHttpPattern(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Calls GetSubscription. - * @function getSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object - * @param {google.pubsub.v1.Subscriber.GetSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.getSubscription = function getSubscription(request, callback) { - return this.rpcCall(getSubscription, $root.google.pubsub.v1.GetSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); - }, "name", { value: "GetSubscription" }); + /** + * CustomHttpPattern kind. + * @member {string} kind + * @memberof google.api.CustomHttpPattern + * @instance + */ + CustomHttpPattern.prototype.kind = ""; - /** - * Calls GetSubscription. - * @function getSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * CustomHttpPattern path. + * @member {string} path + * @memberof google.api.CustomHttpPattern + * @instance + */ + CustomHttpPattern.prototype.path = ""; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. - * @memberof google.pubsub.v1.Subscriber - * @typedef UpdateSubscriptionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Subscription} [response] Subscription - */ + /** + * Creates a new CustomHttpPattern instance using the specified properties. + * @function create + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance + */ + CustomHttpPattern.create = function create(properties) { + return new CustomHttpPattern(properties); + }; - /** - * Calls UpdateSubscription. - * @function updateSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object - * @param {google.pubsub.v1.Subscriber.UpdateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.updateSubscription = function updateSubscription(request, callback) { - return this.rpcCall(updateSubscription, $root.google.pubsub.v1.UpdateSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); - }, "name", { value: "UpdateSubscription" }); + /** + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @function encode + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CustomHttpPattern.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.kind != null && message.hasOwnProperty("kind")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind); + if (message.path != null && message.hasOwnProperty("path")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.path); + return writer; + }; - /** - * Calls UpdateSubscription. - * @function updateSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. - * @memberof google.pubsub.v1.Subscriber - * @typedef ListSubscriptionsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListSubscriptionsResponse} [response] ListSubscriptionsResponse - */ + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer. + * @function decode + * @memberof google.api.CustomHttpPattern + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CustomHttpPattern.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.kind = reader.string(); + break; + case 2: + message.path = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Calls ListSubscriptions. - * @function listSubscriptions - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object - * @param {google.pubsub.v1.Subscriber.ListSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListSubscriptionsResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.listSubscriptions = function listSubscriptions(request, callback) { - return this.rpcCall(listSubscriptions, $root.google.pubsub.v1.ListSubscriptionsRequest, $root.google.pubsub.v1.ListSubscriptionsResponse, request, callback); - }, "name", { value: "ListSubscriptions" }); + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.CustomHttpPattern + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Calls ListSubscriptions. - * @function listSubscriptions - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Verifies a CustomHttpPattern message. + * @function verify + * @memberof google.api.CustomHttpPattern + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CustomHttpPattern.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.kind != null && message.hasOwnProperty("kind")) + if (!$util.isString(message.kind)) + return "kind: string expected"; + if (message.path != null && message.hasOwnProperty("path")) + if (!$util.isString(message.path)) + return "path: string expected"; + return null; + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. - * @memberof google.pubsub.v1.Subscriber - * @typedef DeleteSubscriptionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ - - /** - * Calls DeleteSubscription. - * @function deleteSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object - * @param {google.pubsub.v1.Subscriber.DeleteSubscriptionCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.deleteSubscription = function deleteSubscription(request, callback) { - return this.rpcCall(deleteSubscription, $root.google.pubsub.v1.DeleteSubscriptionRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "DeleteSubscription" }); + /** + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.CustomHttpPattern + * @static + * @param {Object.} object Plain object + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + */ + CustomHttpPattern.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.CustomHttpPattern) + return object; + var message = new $root.google.api.CustomHttpPattern(); + if (object.kind != null) + message.kind = String(object.kind); + if (object.path != null) + message.path = String(object.path); + return message; + }; - /** - * Calls DeleteSubscription. - * @function deleteSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.CustomHttpPattern} message CustomHttpPattern + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CustomHttpPattern.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.kind = ""; + object.path = ""; + } + if (message.kind != null && message.hasOwnProperty("kind")) + object.kind = message.kind; + if (message.path != null && message.hasOwnProperty("path")) + object.path = message.path; + return object; + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. - * @memberof google.pubsub.v1.Subscriber - * @typedef ModifyAckDeadlineCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + /** + * Converts this CustomHttpPattern to JSON. + * @function toJSON + * @memberof google.api.CustomHttpPattern + * @instance + * @returns {Object.} JSON object + */ + CustomHttpPattern.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Calls ModifyAckDeadline. - * @function modifyAckDeadline - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object - * @param {google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.modifyAckDeadline = function modifyAckDeadline(request, callback) { - return this.rpcCall(modifyAckDeadline, $root.google.pubsub.v1.ModifyAckDeadlineRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "ModifyAckDeadline" }); + return CustomHttpPattern; + })(); - /** - * Calls ModifyAckDeadline. - * @function modifyAckDeadline - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * FieldBehavior enum. + * @name google.api.FieldBehavior + * @enum {string} + * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value + * @property {number} OPTIONAL=1 OPTIONAL value + * @property {number} REQUIRED=2 REQUIRED value + * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value + * @property {number} INPUT_ONLY=4 INPUT_ONLY value + * @property {number} IMMUTABLE=5 IMMUTABLE value + */ + api.FieldBehavior = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0; + values[valuesById[1] = "OPTIONAL"] = 1; + values[valuesById[2] = "REQUIRED"] = 2; + values[valuesById[3] = "OUTPUT_ONLY"] = 3; + values[valuesById[4] = "INPUT_ONLY"] = 4; + values[valuesById[5] = "IMMUTABLE"] = 5; + return values; + })(); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. - * @memberof google.pubsub.v1.Subscriber - * @typedef AcknowledgeCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + api.ResourceDescriptor = (function() { - /** - * Calls Acknowledge. - * @function acknowledge - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object - * @param {google.pubsub.v1.Subscriber.AcknowledgeCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.acknowledge = function acknowledge(request, callback) { - return this.rpcCall(acknowledge, $root.google.pubsub.v1.AcknowledgeRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "Acknowledge" }); + /** + * Properties of a ResourceDescriptor. + * @memberof google.api + * @interface IResourceDescriptor + * @property {string|null} [type] ResourceDescriptor type + * @property {Array.|null} [pattern] ResourceDescriptor pattern + * @property {string|null} [nameField] ResourceDescriptor nameField + * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history + * @property {string|null} [plural] ResourceDescriptor plural + * @property {string|null} [singular] ResourceDescriptor singular + */ - /** - * Calls Acknowledge. - * @function acknowledge - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Constructs a new ResourceDescriptor. + * @memberof google.api + * @classdesc Represents a ResourceDescriptor. + * @implements IResourceDescriptor + * @constructor + * @param {google.api.IResourceDescriptor=} [properties] Properties to set + */ + function ResourceDescriptor(properties) { + this.pattern = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. - * @memberof google.pubsub.v1.Subscriber - * @typedef PullCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.PullResponse} [response] PullResponse - */ + /** + * ResourceDescriptor type. + * @member {string} type + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.type = ""; - /** - * Calls Pull. - * @function pull - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object - * @param {google.pubsub.v1.Subscriber.PullCallback} callback Node-style callback called with the error, if any, and PullResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.pull = function pull(request, callback) { - return this.rpcCall(pull, $root.google.pubsub.v1.PullRequest, $root.google.pubsub.v1.PullResponse, request, callback); - }, "name", { value: "Pull" }); + /** + * ResourceDescriptor pattern. + * @member {Array.} pattern + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.pattern = $util.emptyArray; - /** - * Calls Pull. - * @function pull - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * ResourceDescriptor nameField. + * @member {string} nameField + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.nameField = ""; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. - * @memberof google.pubsub.v1.Subscriber - * @typedef StreamingPullCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.StreamingPullResponse} [response] StreamingPullResponse - */ + /** + * ResourceDescriptor history. + * @member {google.api.ResourceDescriptor.History} history + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.history = 0; - /** - * Calls StreamingPull. - * @function streamingPull - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object - * @param {google.pubsub.v1.Subscriber.StreamingPullCallback} callback Node-style callback called with the error, if any, and StreamingPullResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.streamingPull = function streamingPull(request, callback) { - return this.rpcCall(streamingPull, $root.google.pubsub.v1.StreamingPullRequest, $root.google.pubsub.v1.StreamingPullResponse, request, callback); - }, "name", { value: "StreamingPull" }); - - /** - * Calls StreamingPull. - * @function streamingPull - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * ResourceDescriptor plural. + * @member {string} plural + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.plural = ""; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. - * @memberof google.pubsub.v1.Subscriber - * @typedef ModifyPushConfigCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + /** + * ResourceDescriptor singular. + * @member {string} singular + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.singular = ""; - /** - * Calls ModifyPushConfig. - * @function modifyPushConfig - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object - * @param {google.pubsub.v1.Subscriber.ModifyPushConfigCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.modifyPushConfig = function modifyPushConfig(request, callback) { - return this.rpcCall(modifyPushConfig, $root.google.pubsub.v1.ModifyPushConfigRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "ModifyPushConfig" }); + /** + * Creates a new ResourceDescriptor instance using the specified properties. + * @function create + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor=} [properties] Properties to set + * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance + */ + ResourceDescriptor.create = function create(properties) { + return new ResourceDescriptor(properties); + }; - /** - * Calls ModifyPushConfig. - * @function modifyPushConfig - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @function encode + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceDescriptor.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); + if (message.pattern != null && message.pattern.length) + for (var i = 0; i < message.pattern.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]); + if (message.nameField != null && message.hasOwnProperty("nameField")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField); + if (message.history != null && message.hasOwnProperty("history")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history); + if (message.plural != null && message.hasOwnProperty("plural")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); + if (message.singular != null && message.hasOwnProperty("singular")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); + return writer; + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. - * @memberof google.pubsub.v1.Subscriber - * @typedef GetSnapshotCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Snapshot} [response] Snapshot - */ + /** + * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Calls GetSnapshot. - * @function getSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object - * @param {google.pubsub.v1.Subscriber.GetSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.getSnapshot = function getSnapshot(request, callback) { - return this.rpcCall(getSnapshot, $root.google.pubsub.v1.GetSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); - }, "name", { value: "GetSnapshot" }); + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer. + * @function decode + * @memberof google.api.ResourceDescriptor + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceDescriptor.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.type = reader.string(); + break; + case 2: + if (!(message.pattern && message.pattern.length)) + message.pattern = []; + message.pattern.push(reader.string()); + break; + case 3: + message.nameField = reader.string(); + break; + case 4: + message.history = reader.int32(); + break; + case 5: + message.plural = reader.string(); + break; + case 6: + message.singular = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Calls GetSnapshot. - * @function getSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.ResourceDescriptor + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. - * @memberof google.pubsub.v1.Subscriber - * @typedef ListSnapshotsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListSnapshotsResponse} [response] ListSnapshotsResponse - */ + /** + * Verifies a ResourceDescriptor message. + * @function verify + * @memberof google.api.ResourceDescriptor + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ResourceDescriptor.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.pattern != null && message.hasOwnProperty("pattern")) { + if (!Array.isArray(message.pattern)) + return "pattern: array expected"; + for (var i = 0; i < message.pattern.length; ++i) + if (!$util.isString(message.pattern[i])) + return "pattern: string[] expected"; + } + if (message.nameField != null && message.hasOwnProperty("nameField")) + if (!$util.isString(message.nameField)) + return "nameField: string expected"; + if (message.history != null && message.hasOwnProperty("history")) + switch (message.history) { + default: + return "history: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.plural != null && message.hasOwnProperty("plural")) + if (!$util.isString(message.plural)) + return "plural: string expected"; + if (message.singular != null && message.hasOwnProperty("singular")) + if (!$util.isString(message.singular)) + return "singular: string expected"; + return null; + }; - /** - * Calls ListSnapshots. - * @function listSnapshots - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object - * @param {google.pubsub.v1.Subscriber.ListSnapshotsCallback} callback Node-style callback called with the error, if any, and ListSnapshotsResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.listSnapshots = function listSnapshots(request, callback) { - return this.rpcCall(listSnapshots, $root.google.pubsub.v1.ListSnapshotsRequest, $root.google.pubsub.v1.ListSnapshotsResponse, request, callback); - }, "name", { value: "ListSnapshots" }); + /** + * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.ResourceDescriptor + * @static + * @param {Object.} object Plain object + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + */ + ResourceDescriptor.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ResourceDescriptor) + return object; + var message = new $root.google.api.ResourceDescriptor(); + if (object.type != null) + message.type = String(object.type); + if (object.pattern) { + if (!Array.isArray(object.pattern)) + throw TypeError(".google.api.ResourceDescriptor.pattern: array expected"); + message.pattern = []; + for (var i = 0; i < object.pattern.length; ++i) + message.pattern[i] = String(object.pattern[i]); + } + if (object.nameField != null) + message.nameField = String(object.nameField); + switch (object.history) { + case "HISTORY_UNSPECIFIED": + case 0: + message.history = 0; + break; + case "ORIGINALLY_SINGLE_PATTERN": + case 1: + message.history = 1; + break; + case "FUTURE_MULTI_PATTERN": + case 2: + message.history = 2; + break; + } + if (object.plural != null) + message.plural = String(object.plural); + if (object.singular != null) + message.singular = String(object.singular); + return message; + }; - /** - * Calls ListSnapshots. - * @function listSnapshots - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.ResourceDescriptor} message ResourceDescriptor + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ResourceDescriptor.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.pattern = []; + if (options.defaults) { + object.type = ""; + object.nameField = ""; + object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0; + object.plural = ""; + object.singular = ""; + } + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.pattern && message.pattern.length) { + object.pattern = []; + for (var j = 0; j < message.pattern.length; ++j) + object.pattern[j] = message.pattern[j]; + } + if (message.nameField != null && message.hasOwnProperty("nameField")) + object.nameField = message.nameField; + if (message.history != null && message.hasOwnProperty("history")) + object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history; + if (message.plural != null && message.hasOwnProperty("plural")) + object.plural = message.plural; + if (message.singular != null && message.hasOwnProperty("singular")) + object.singular = message.singular; + return object; + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. - * @memberof google.pubsub.v1.Subscriber - * @typedef CreateSnapshotCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Snapshot} [response] Snapshot - */ + /** + * Converts this ResourceDescriptor to JSON. + * @function toJSON + * @memberof google.api.ResourceDescriptor + * @instance + * @returns {Object.} JSON object + */ + ResourceDescriptor.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Calls CreateSnapshot. - * @function createSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object - * @param {google.pubsub.v1.Subscriber.CreateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.createSnapshot = function createSnapshot(request, callback) { - return this.rpcCall(createSnapshot, $root.google.pubsub.v1.CreateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); - }, "name", { value: "CreateSnapshot" }); + /** + * History enum. + * @name google.api.ResourceDescriptor.History + * @enum {string} + * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value + * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value + * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value + */ + ResourceDescriptor.History = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0; + values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1; + values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2; + return values; + })(); - /** - * Calls CreateSnapshot. - * @function createSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + return ResourceDescriptor; + })(); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. - * @memberof google.pubsub.v1.Subscriber - * @typedef UpdateSnapshotCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Snapshot} [response] Snapshot - */ + api.ResourceReference = (function() { - /** - * Calls UpdateSnapshot. - * @function updateSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object - * @param {google.pubsub.v1.Subscriber.UpdateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.updateSnapshot = function updateSnapshot(request, callback) { - return this.rpcCall(updateSnapshot, $root.google.pubsub.v1.UpdateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); - }, "name", { value: "UpdateSnapshot" }); + /** + * Properties of a ResourceReference. + * @memberof google.api + * @interface IResourceReference + * @property {string|null} [type] ResourceReference type + * @property {string|null} [childType] ResourceReference childType + */ - /** - * Calls UpdateSnapshot. - * @function updateSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Constructs a new ResourceReference. + * @memberof google.api + * @classdesc Represents a ResourceReference. + * @implements IResourceReference + * @constructor + * @param {google.api.IResourceReference=} [properties] Properties to set + */ + function ResourceReference(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. - * @memberof google.pubsub.v1.Subscriber - * @typedef DeleteSnapshotCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + /** + * ResourceReference type. + * @member {string} type + * @memberof google.api.ResourceReference + * @instance + */ + ResourceReference.prototype.type = ""; - /** - * Calls DeleteSnapshot. - * @function deleteSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object - * @param {google.pubsub.v1.Subscriber.DeleteSnapshotCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.deleteSnapshot = function deleteSnapshot(request, callback) { - return this.rpcCall(deleteSnapshot, $root.google.pubsub.v1.DeleteSnapshotRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "DeleteSnapshot" }); + /** + * ResourceReference childType. + * @member {string} childType + * @memberof google.api.ResourceReference + * @instance + */ + ResourceReference.prototype.childType = ""; - /** - * Calls DeleteSnapshot. - * @function deleteSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Creates a new ResourceReference instance using the specified properties. + * @function create + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference=} [properties] Properties to set + * @returns {google.api.ResourceReference} ResourceReference instance + */ + ResourceReference.create = function create(properties) { + return new ResourceReference(properties); + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. - * @memberof google.pubsub.v1.Subscriber - * @typedef SeekCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.SeekResponse} [response] SeekResponse - */ + /** + * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @function encode + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceReference.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); + if (message.childType != null && message.hasOwnProperty("childType")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType); + return writer; + }; - /** - * Calls Seek. - * @function seek - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object - * @param {google.pubsub.v1.Subscriber.SeekCallback} callback Node-style callback called with the error, if any, and SeekResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.seek = function seek(request, callback) { - return this.rpcCall(seek, $root.google.pubsub.v1.SeekRequest, $root.google.pubsub.v1.SeekResponse, request, callback); - }, "name", { value: "Seek" }); + /** + * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceReference.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Calls Seek. - * @function seek - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Decodes a ResourceReference message from the specified reader or buffer. + * @function decode + * @memberof google.api.ResourceReference + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.ResourceReference} ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceReference.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.type = reader.string(); + break; + case 2: + message.childType = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - return Subscriber; - })(); + /** + * Decodes a ResourceReference message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.ResourceReference + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.ResourceReference} ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceReference.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - v1.Subscription = (function() { + /** + * Verifies a ResourceReference message. + * @function verify + * @memberof google.api.ResourceReference + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ResourceReference.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.childType != null && message.hasOwnProperty("childType")) + if (!$util.isString(message.childType)) + return "childType: string expected"; + return null; + }; - /** - * Properties of a Subscription. - * @memberof google.pubsub.v1 - * @interface ISubscription - * @property {string|null} [name] Subscription name - * @property {string|null} [topic] Subscription topic - * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] Subscription pushConfig - * @property {number|null} [ackDeadlineSeconds] Subscription ackDeadlineSeconds - * @property {boolean|null} [retainAckedMessages] Subscription retainAckedMessages - * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Subscription messageRetentionDuration - * @property {Object.|null} [labels] Subscription labels - * @property {boolean|null} [enableMessageOrdering] Subscription enableMessageOrdering - * @property {google.pubsub.v1.IExpirationPolicy|null} [expirationPolicy] Subscription expirationPolicy - * @property {google.pubsub.v1.IDeadLetterPolicy|null} [deadLetterPolicy] Subscription deadLetterPolicy - */ + /** + * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.ResourceReference + * @static + * @param {Object.} object Plain object + * @returns {google.api.ResourceReference} ResourceReference + */ + ResourceReference.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ResourceReference) + return object; + var message = new $root.google.api.ResourceReference(); + if (object.type != null) + message.type = String(object.type); + if (object.childType != null) + message.childType = String(object.childType); + return message; + }; - /** - * Constructs a new Subscription. - * @memberof google.pubsub.v1 - * @classdesc Represents a Subscription. - * @implements ISubscription - * @constructor - * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set - */ - function Subscription(properties) { - this.labels = {}; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.ResourceReference + * @static + * @param {google.api.ResourceReference} message ResourceReference + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ResourceReference.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.type = ""; + object.childType = ""; } + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.childType != null && message.hasOwnProperty("childType")) + object.childType = message.childType; + return object; + }; - /** - * Subscription name. - * @member {string} name - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.name = ""; + /** + * Converts this ResourceReference to JSON. + * @function toJSON + * @memberof google.api.ResourceReference + * @instance + * @returns {Object.} JSON object + */ + ResourceReference.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Subscription topic. - * @member {string} topic - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.topic = ""; + return ResourceReference; + })(); - /** - * Subscription pushConfig. - * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.pushConfig = null; + return api; + })(); - /** - * Subscription ackDeadlineSeconds. - * @member {number} ackDeadlineSeconds - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.ackDeadlineSeconds = 0; + google.protobuf = (function() { - /** - * Subscription retainAckedMessages. - * @member {boolean} retainAckedMessages - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.retainAckedMessages = false; - - /** - * Subscription messageRetentionDuration. - * @member {google.protobuf.IDuration|null|undefined} messageRetentionDuration - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.messageRetentionDuration = null; + /** + * Namespace protobuf. + * @memberof google + * @namespace + */ + var protobuf = {}; - /** - * Subscription labels. - * @member {Object.} labels - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.labels = $util.emptyObject; + protobuf.FileDescriptorSet = (function() { - /** - * Subscription enableMessageOrdering. - * @member {boolean} enableMessageOrdering - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.enableMessageOrdering = false; + /** + * Properties of a FileDescriptorSet. + * @memberof google.protobuf + * @interface IFileDescriptorSet + * @property {Array.|null} [file] FileDescriptorSet file + */ - /** - * Subscription expirationPolicy. - * @member {google.pubsub.v1.IExpirationPolicy|null|undefined} expirationPolicy - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.expirationPolicy = null; + /** + * Constructs a new FileDescriptorSet. + * @memberof google.protobuf + * @classdesc Represents a FileDescriptorSet. + * @implements IFileDescriptorSet + * @constructor + * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set + */ + function FileDescriptorSet(properties) { + this.file = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Subscription deadLetterPolicy. - * @member {google.pubsub.v1.IDeadLetterPolicy|null|undefined} deadLetterPolicy - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.deadLetterPolicy = null; + /** + * FileDescriptorSet file. + * @member {Array.} file + * @memberof google.protobuf.FileDescriptorSet + * @instance + */ + FileDescriptorSet.prototype.file = $util.emptyArray; - /** - * Creates a new Subscription instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.Subscription - * @static - * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set - * @returns {google.pubsub.v1.Subscription} Subscription instance - */ - Subscription.create = function create(properties) { - return new Subscription(properties); - }; + /** + * Creates a new FileDescriptorSet instance using the specified properties. + * @function create + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet instance + */ + FileDescriptorSet.create = function create(properties) { + return new FileDescriptorSet(properties); + }; - /** - * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.Subscription - * @static - * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Subscription.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) - $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - writer.uint32(/* id 5, wireType 0 =*/40).int32(message.ackDeadlineSeconds); - if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) - writer.uint32(/* id 7, wireType 0 =*/56).bool(message.retainAckedMessages); - if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) - $root.google.protobuf.Duration.encode(message.messageRetentionDuration, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.labels != null && message.hasOwnProperty("labels")) - for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) - writer.uint32(/* id 9, wireType 2 =*/74).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) - writer.uint32(/* id 10, wireType 0 =*/80).bool(message.enableMessageOrdering); - if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) - $root.google.pubsub.v1.ExpirationPolicy.encode(message.expirationPolicy, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) - $root.google.pubsub.v1.DeadLetterPolicy.encode(message.deadLetterPolicy, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); - return writer; - }; + /** + * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorSet.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.file != null && message.file.length) + for (var i = 0; i < message.file.length; ++i) + $root.google.protobuf.FileDescriptorProto.encode(message.file[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.Subscription - * @static - * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Subscription.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorSet.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a Subscription message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.Subscription - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.Subscription} Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Subscription.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key; - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.topic = reader.string(); - break; - case 4: - message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); - break; - case 5: - message.ackDeadlineSeconds = reader.int32(); - break; - case 7: - message.retainAckedMessages = reader.bool(); - break; - case 8: - message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - case 9: - reader.skip().pos++; - if (message.labels === $util.emptyObject) - message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); - break; - case 10: - message.enableMessageOrdering = reader.bool(); - break; - case 11: - message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.decode(reader, reader.uint32()); - break; - case 13: - message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorSet.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorSet(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.file && message.file.length)) + message.file = []; + message.file.push($root.google.protobuf.FileDescriptorProto.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a Subscription message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.Subscription - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.Subscription} Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Subscription.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorSet.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a Subscription message. - * @function verify - * @memberof google.pubsub.v1.Subscription - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Subscription.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { - var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); - if (error) - return "pushConfig." + error; - } - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - if (!$util.isInteger(message.ackDeadlineSeconds)) - return "ackDeadlineSeconds: integer expected"; - if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) - if (typeof message.retainAckedMessages !== "boolean") - return "retainAckedMessages: boolean expected"; - if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) { - var error = $root.google.protobuf.Duration.verify(message.messageRetentionDuration); - if (error) - return "messageRetentionDuration." + error; - } - if (message.labels != null && message.hasOwnProperty("labels")) { - if (!$util.isObject(message.labels)) - return "labels: object expected"; - var key = Object.keys(message.labels); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.labels[key[i]])) - return "labels: string{k:string} expected"; - } - if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) - if (typeof message.enableMessageOrdering !== "boolean") - return "enableMessageOrdering: boolean expected"; - if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) { - var error = $root.google.pubsub.v1.ExpirationPolicy.verify(message.expirationPolicy); - if (error) - return "expirationPolicy." + error; - } - if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) { - var error = $root.google.pubsub.v1.DeadLetterPolicy.verify(message.deadLetterPolicy); + /** + * Verifies a FileDescriptorSet message. + * @function verify + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileDescriptorSet.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.file != null && message.hasOwnProperty("file")) { + if (!Array.isArray(message.file)) + return "file: array expected"; + for (var i = 0; i < message.file.length; ++i) { + var error = $root.google.protobuf.FileDescriptorProto.verify(message.file[i]); if (error) - return "deadLetterPolicy." + error; + return "file." + error; } - return null; - }; + } + return null; + }; - /** - * Creates a Subscription message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.Subscription - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.Subscription} Subscription - */ - Subscription.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.Subscription) - return object; - var message = new $root.google.pubsub.v1.Subscription(); - if (object.name != null) - message.name = String(object.name); - if (object.topic != null) - message.topic = String(object.topic); - if (object.pushConfig != null) { - if (typeof object.pushConfig !== "object") - throw TypeError(".google.pubsub.v1.Subscription.pushConfig: object expected"); - message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); - } - if (object.ackDeadlineSeconds != null) - message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; - if (object.retainAckedMessages != null) - message.retainAckedMessages = Boolean(object.retainAckedMessages); - if (object.messageRetentionDuration != null) { - if (typeof object.messageRetentionDuration !== "object") - throw TypeError(".google.pubsub.v1.Subscription.messageRetentionDuration: object expected"); - message.messageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.messageRetentionDuration); - } - if (object.labels) { - if (typeof object.labels !== "object") - throw TypeError(".google.pubsub.v1.Subscription.labels: object expected"); - message.labels = {}; - for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) - message.labels[keys[i]] = String(object.labels[keys[i]]); - } - if (object.enableMessageOrdering != null) - message.enableMessageOrdering = Boolean(object.enableMessageOrdering); - if (object.expirationPolicy != null) { - if (typeof object.expirationPolicy !== "object") - throw TypeError(".google.pubsub.v1.Subscription.expirationPolicy: object expected"); - message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.fromObject(object.expirationPolicy); - } - if (object.deadLetterPolicy != null) { - if (typeof object.deadLetterPolicy !== "object") - throw TypeError(".google.pubsub.v1.Subscription.deadLetterPolicy: object expected"); - message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.fromObject(object.deadLetterPolicy); + /** + * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + */ + FileDescriptorSet.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileDescriptorSet) + return object; + var message = new $root.google.protobuf.FileDescriptorSet(); + if (object.file) { + if (!Array.isArray(object.file)) + throw TypeError(".google.protobuf.FileDescriptorSet.file: array expected"); + message.file = []; + for (var i = 0; i < object.file.length; ++i) { + if (typeof object.file[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorSet.file: object expected"); + message.file[i] = $root.google.protobuf.FileDescriptorProto.fromObject(object.file[i]); } - return message; - }; + } + return message; + }; - /** - * Creates a plain object from a Subscription message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.Subscription - * @static - * @param {google.pubsub.v1.Subscription} message Subscription - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Subscription.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.objects || options.defaults) - object.labels = {}; - if (options.defaults) { - object.name = ""; - object.topic = ""; - object.pushConfig = null; - object.ackDeadlineSeconds = 0; - object.retainAckedMessages = false; - object.messageRetentionDuration = null; - object.enableMessageOrdering = false; - object.expirationPolicy = null; - object.deadLetterPolicy = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) - object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - object.ackDeadlineSeconds = message.ackDeadlineSeconds; - if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) - object.retainAckedMessages = message.retainAckedMessages; - if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) - object.messageRetentionDuration = $root.google.protobuf.Duration.toObject(message.messageRetentionDuration, options); - var keys2; - if (message.labels && (keys2 = Object.keys(message.labels)).length) { - object.labels = {}; - for (var j = 0; j < keys2.length; ++j) - object.labels[keys2[j]] = message.labels[keys2[j]]; - } - if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) - object.enableMessageOrdering = message.enableMessageOrdering; - if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) - object.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.toObject(message.expirationPolicy, options); - if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) - object.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.toObject(message.deadLetterPolicy, options); - return object; - }; + /** + * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.FileDescriptorSet} message FileDescriptorSet + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileDescriptorSet.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.file = []; + if (message.file && message.file.length) { + object.file = []; + for (var j = 0; j < message.file.length; ++j) + object.file[j] = $root.google.protobuf.FileDescriptorProto.toObject(message.file[j], options); + } + return object; + }; - /** - * Converts this Subscription to JSON. - * @function toJSON - * @memberof google.pubsub.v1.Subscription - * @instance - * @returns {Object.} JSON object - */ - Subscription.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return Subscription; - })(); + /** + * Converts this FileDescriptorSet to JSON. + * @function toJSON + * @memberof google.protobuf.FileDescriptorSet + * @instance + * @returns {Object.} JSON object + */ + FileDescriptorSet.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.DeadLetterPolicy = (function() { + return FileDescriptorSet; + })(); - /** - * Properties of a DeadLetterPolicy. - * @memberof google.pubsub.v1 - * @interface IDeadLetterPolicy - * @property {string|null} [deadLetterTopic] DeadLetterPolicy deadLetterTopic - * @property {number|null} [maxDeliveryAttempts] DeadLetterPolicy maxDeliveryAttempts - */ + protobuf.FileDescriptorProto = (function() { - /** - * Constructs a new DeadLetterPolicy. - * @memberof google.pubsub.v1 - * @classdesc Represents a DeadLetterPolicy. - * @implements IDeadLetterPolicy - * @constructor - * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set - */ - function DeadLetterPolicy(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of a FileDescriptorProto. + * @memberof google.protobuf + * @interface IFileDescriptorProto + * @property {string|null} [name] FileDescriptorProto name + * @property {string|null} ["package"] FileDescriptorProto package + * @property {Array.|null} [dependency] FileDescriptorProto dependency + * @property {Array.|null} [publicDependency] FileDescriptorProto publicDependency + * @property {Array.|null} [weakDependency] FileDescriptorProto weakDependency + * @property {Array.|null} [messageType] FileDescriptorProto messageType + * @property {Array.|null} [enumType] FileDescriptorProto enumType + * @property {Array.|null} [service] FileDescriptorProto service + * @property {Array.|null} [extension] FileDescriptorProto extension + * @property {google.protobuf.IFileOptions|null} [options] FileDescriptorProto options + * @property {google.protobuf.ISourceCodeInfo|null} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo + * @property {string|null} [syntax] FileDescriptorProto syntax + */ - /** - * DeadLetterPolicy deadLetterTopic. - * @member {string} deadLetterTopic - * @memberof google.pubsub.v1.DeadLetterPolicy - * @instance - */ - DeadLetterPolicy.prototype.deadLetterTopic = ""; + /** + * Constructs a new FileDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a FileDescriptorProto. + * @implements IFileDescriptorProto + * @constructor + * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set + */ + function FileDescriptorProto(properties) { + this.dependency = []; + this.publicDependency = []; + this.weakDependency = []; + this.messageType = []; + this.enumType = []; + this.service = []; + this.extension = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * DeadLetterPolicy maxDeliveryAttempts. - * @member {number} maxDeliveryAttempts - * @memberof google.pubsub.v1.DeadLetterPolicy - * @instance - */ - DeadLetterPolicy.prototype.maxDeliveryAttempts = 0; + /** + * FileDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.name = ""; - /** - * Creates a new DeadLetterPolicy instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.DeadLetterPolicy - * @static - * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set - * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy instance - */ - DeadLetterPolicy.create = function create(properties) { - return new DeadLetterPolicy(properties); - }; + /** + * FileDescriptorProto package. + * @member {string} package + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype["package"] = ""; - /** - * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.DeadLetterPolicy - * @static - * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeadLetterPolicy.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.deadLetterTopic); - if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.maxDeliveryAttempts); - return writer; - }; + /** + * FileDescriptorProto dependency. + * @member {Array.} dependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.dependency = $util.emptyArray; - /** - * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.DeadLetterPolicy - * @static - * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeadLetterPolicy.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * FileDescriptorProto publicDependency. + * @member {Array.} publicDependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.publicDependency = $util.emptyArray; - /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.DeadLetterPolicy - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeadLetterPolicy.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeadLetterPolicy(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.deadLetterTopic = reader.string(); - break; - case 2: - message.maxDeliveryAttempts = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * FileDescriptorProto weakDependency. + * @member {Array.} weakDependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.weakDependency = $util.emptyArray; - /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.DeadLetterPolicy - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeadLetterPolicy.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * FileDescriptorProto messageType. + * @member {Array.} messageType + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.messageType = $util.emptyArray; - /** - * Verifies a DeadLetterPolicy message. - * @function verify - * @memberof google.pubsub.v1.DeadLetterPolicy - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DeadLetterPolicy.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) - if (!$util.isString(message.deadLetterTopic)) - return "deadLetterTopic: string expected"; - if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) - if (!$util.isInteger(message.maxDeliveryAttempts)) - return "maxDeliveryAttempts: integer expected"; - return null; - }; + /** + * FileDescriptorProto enumType. + * @member {Array.} enumType + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.enumType = $util.emptyArray; - /** - * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.DeadLetterPolicy - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy - */ - DeadLetterPolicy.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.DeadLetterPolicy) - return object; - var message = new $root.google.pubsub.v1.DeadLetterPolicy(); - if (object.deadLetterTopic != null) - message.deadLetterTopic = String(object.deadLetterTopic); - if (object.maxDeliveryAttempts != null) - message.maxDeliveryAttempts = object.maxDeliveryAttempts | 0; - return message; - }; - - /** - * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.DeadLetterPolicy - * @static - * @param {google.pubsub.v1.DeadLetterPolicy} message DeadLetterPolicy - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DeadLetterPolicy.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.deadLetterTopic = ""; - object.maxDeliveryAttempts = 0; - } - if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) - object.deadLetterTopic = message.deadLetterTopic; - if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) - object.maxDeliveryAttempts = message.maxDeliveryAttempts; - return object; - }; - - /** - * Converts this DeadLetterPolicy to JSON. - * @function toJSON - * @memberof google.pubsub.v1.DeadLetterPolicy - * @instance - * @returns {Object.} JSON object - */ - DeadLetterPolicy.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return DeadLetterPolicy; - })(); - - v1.ExpirationPolicy = (function() { + /** + * FileDescriptorProto service. + * @member {Array.} service + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.service = $util.emptyArray; - /** - * Properties of an ExpirationPolicy. - * @memberof google.pubsub.v1 - * @interface IExpirationPolicy - * @property {google.protobuf.IDuration|null} [ttl] ExpirationPolicy ttl - */ + /** + * FileDescriptorProto extension. + * @member {Array.} extension + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.extension = $util.emptyArray; - /** - * Constructs a new ExpirationPolicy. - * @memberof google.pubsub.v1 - * @classdesc Represents an ExpirationPolicy. - * @implements IExpirationPolicy - * @constructor - * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set - */ - function ExpirationPolicy(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * FileDescriptorProto options. + * @member {google.protobuf.IFileOptions|null|undefined} options + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.options = null; - /** - * ExpirationPolicy ttl. - * @member {google.protobuf.IDuration|null|undefined} ttl - * @memberof google.pubsub.v1.ExpirationPolicy - * @instance - */ - ExpirationPolicy.prototype.ttl = null; + /** + * FileDescriptorProto sourceCodeInfo. + * @member {google.protobuf.ISourceCodeInfo|null|undefined} sourceCodeInfo + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.sourceCodeInfo = null; - /** - * Creates a new ExpirationPolicy instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set - * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy instance - */ - ExpirationPolicy.create = function create(properties) { - return new ExpirationPolicy(properties); - }; + /** + * FileDescriptorProto syntax. + * @member {string} syntax + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.syntax = ""; - /** - * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExpirationPolicy.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.ttl != null && message.hasOwnProperty("ttl")) - $root.google.protobuf.Duration.encode(message.ttl, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + /** + * Creates a new FileDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto instance + */ + FileDescriptorProto.create = function create(properties) { + return new FileDescriptorProto(properties); + }; - /** - * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExpirationPolicy.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message["package"] != null && message.hasOwnProperty("package")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message["package"]); + if (message.dependency != null && message.dependency.length) + for (var i = 0; i < message.dependency.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.dependency[i]); + if (message.messageType != null && message.messageType.length) + for (var i = 0; i < message.messageType.length; ++i) + $root.google.protobuf.DescriptorProto.encode(message.messageType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.enumType != null && message.enumType.length) + for (var i = 0; i < message.enumType.length; ++i) + $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.service != null && message.service.length) + for (var i = 0; i < message.service.length; ++i) + $root.google.protobuf.ServiceDescriptorProto.encode(message.service[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.extension != null && message.extension.length) + for (var i = 0; i < message.extension.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.FileOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) + $root.google.protobuf.SourceCodeInfo.encode(message.sourceCodeInfo, writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); + if (message.publicDependency != null && message.publicDependency.length) + for (var i = 0; i < message.publicDependency.length; ++i) + writer.uint32(/* id 10, wireType 0 =*/80).int32(message.publicDependency[i]); + if (message.weakDependency != null && message.weakDependency.length) + for (var i = 0; i < message.weakDependency.length; ++i) + writer.uint32(/* id 11, wireType 0 =*/88).int32(message.weakDependency[i]); + if (message.syntax != null && message.hasOwnProperty("syntax")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); + return writer; + }; - /** - * Decodes an ExpirationPolicy message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExpirationPolicy.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ExpirationPolicy(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.ttl = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExpirationPolicy.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message["package"] = reader.string(); + break; + case 3: + if (!(message.dependency && message.dependency.length)) + message.dependency = []; + message.dependency.push(reader.string()); + break; + case 10: + if (!(message.publicDependency && message.publicDependency.length)) + message.publicDependency = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.publicDependency.push(reader.int32()); + } else + message.publicDependency.push(reader.int32()); + break; + case 11: + if (!(message.weakDependency && message.weakDependency.length)) + message.weakDependency = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.weakDependency.push(reader.int32()); + } else + message.weakDependency.push(reader.int32()); + break; + case 4: + if (!(message.messageType && message.messageType.length)) + message.messageType = []; + message.messageType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.enumType && message.enumType.length)) + message.enumType = []; + message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); + break; + case 6: + if (!(message.service && message.service.length)) + message.service = []; + message.service.push($root.google.protobuf.ServiceDescriptorProto.decode(reader, reader.uint32())); + break; + case 7: + if (!(message.extension && message.extension.length)) + message.extension = []; + message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 8: + message.options = $root.google.protobuf.FileOptions.decode(reader, reader.uint32()); + break; + case 9: + message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.decode(reader, reader.uint32()); + break; + case 12: + message.syntax = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Verifies an ExpirationPolicy message. - * @function verify - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ExpirationPolicy.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.ttl != null && message.hasOwnProperty("ttl")) { - var error = $root.google.protobuf.Duration.verify(message.ttl); + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FileDescriptorProto message. + * @function verify + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message["package"] != null && message.hasOwnProperty("package")) + if (!$util.isString(message["package"])) + return "package: string expected"; + if (message.dependency != null && message.hasOwnProperty("dependency")) { + if (!Array.isArray(message.dependency)) + return "dependency: array expected"; + for (var i = 0; i < message.dependency.length; ++i) + if (!$util.isString(message.dependency[i])) + return "dependency: string[] expected"; + } + if (message.publicDependency != null && message.hasOwnProperty("publicDependency")) { + if (!Array.isArray(message.publicDependency)) + return "publicDependency: array expected"; + for (var i = 0; i < message.publicDependency.length; ++i) + if (!$util.isInteger(message.publicDependency[i])) + return "publicDependency: integer[] expected"; + } + if (message.weakDependency != null && message.hasOwnProperty("weakDependency")) { + if (!Array.isArray(message.weakDependency)) + return "weakDependency: array expected"; + for (var i = 0; i < message.weakDependency.length; ++i) + if (!$util.isInteger(message.weakDependency[i])) + return "weakDependency: integer[] expected"; + } + if (message.messageType != null && message.hasOwnProperty("messageType")) { + if (!Array.isArray(message.messageType)) + return "messageType: array expected"; + for (var i = 0; i < message.messageType.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.verify(message.messageType[i]); if (error) - return "ttl." + error; + return "messageType." + error; } - return null; - }; - - /** - * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy - */ - ExpirationPolicy.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ExpirationPolicy) - return object; - var message = new $root.google.pubsub.v1.ExpirationPolicy(); - if (object.ttl != null) { - if (typeof object.ttl !== "object") - throw TypeError(".google.pubsub.v1.ExpirationPolicy.ttl: object expected"); - message.ttl = $root.google.protobuf.Duration.fromObject(object.ttl); + } + if (message.enumType != null && message.hasOwnProperty("enumType")) { + if (!Array.isArray(message.enumType)) + return "enumType: array expected"; + for (var i = 0; i < message.enumType.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); + if (error) + return "enumType." + error; } - return message; - }; - - /** - * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {google.pubsub.v1.ExpirationPolicy} message ExpirationPolicy - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ExpirationPolicy.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.ttl = null; - if (message.ttl != null && message.hasOwnProperty("ttl")) - object.ttl = $root.google.protobuf.Duration.toObject(message.ttl, options); - return object; - }; + } + if (message.service != null && message.hasOwnProperty("service")) { + if (!Array.isArray(message.service)) + return "service: array expected"; + for (var i = 0; i < message.service.length; ++i) { + var error = $root.google.protobuf.ServiceDescriptorProto.verify(message.service[i]); + if (error) + return "service." + error; + } + } + if (message.extension != null && message.hasOwnProperty("extension")) { + if (!Array.isArray(message.extension)) + return "extension: array expected"; + for (var i = 0; i < message.extension.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); + if (error) + return "extension." + error; + } + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.FileOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) { + var error = $root.google.protobuf.SourceCodeInfo.verify(message.sourceCodeInfo); + if (error) + return "sourceCodeInfo." + error; + } + if (message.syntax != null && message.hasOwnProperty("syntax")) + if (!$util.isString(message.syntax)) + return "syntax: string expected"; + return null; + }; - /** - * Converts this ExpirationPolicy to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ExpirationPolicy - * @instance - * @returns {Object.} JSON object - */ - ExpirationPolicy.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return ExpirationPolicy; - })(); - - v1.PushConfig = (function() { - - /** - * Properties of a PushConfig. - * @memberof google.pubsub.v1 - * @interface IPushConfig - * @property {string|null} [pushEndpoint] PushConfig pushEndpoint - * @property {Object.|null} [attributes] PushConfig attributes - * @property {google.pubsub.v1.PushConfig.IOidcToken|null} [oidcToken] PushConfig oidcToken - */ + /** + * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + */ + FileDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileDescriptorProto) + return object; + var message = new $root.google.protobuf.FileDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object["package"] != null) + message["package"] = String(object["package"]); + if (object.dependency) { + if (!Array.isArray(object.dependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.dependency: array expected"); + message.dependency = []; + for (var i = 0; i < object.dependency.length; ++i) + message.dependency[i] = String(object.dependency[i]); + } + if (object.publicDependency) { + if (!Array.isArray(object.publicDependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.publicDependency: array expected"); + message.publicDependency = []; + for (var i = 0; i < object.publicDependency.length; ++i) + message.publicDependency[i] = object.publicDependency[i] | 0; + } + if (object.weakDependency) { + if (!Array.isArray(object.weakDependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.weakDependency: array expected"); + message.weakDependency = []; + for (var i = 0; i < object.weakDependency.length; ++i) + message.weakDependency[i] = object.weakDependency[i] | 0; + } + if (object.messageType) { + if (!Array.isArray(object.messageType)) + throw TypeError(".google.protobuf.FileDescriptorProto.messageType: array expected"); + message.messageType = []; + for (var i = 0; i < object.messageType.length; ++i) { + if (typeof object.messageType[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.messageType: object expected"); + message.messageType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.messageType[i]); + } + } + if (object.enumType) { + if (!Array.isArray(object.enumType)) + throw TypeError(".google.protobuf.FileDescriptorProto.enumType: array expected"); + message.enumType = []; + for (var i = 0; i < object.enumType.length; ++i) { + if (typeof object.enumType[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.enumType: object expected"); + message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); + } + } + if (object.service) { + if (!Array.isArray(object.service)) + throw TypeError(".google.protobuf.FileDescriptorProto.service: array expected"); + message.service = []; + for (var i = 0; i < object.service.length; ++i) { + if (typeof object.service[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.service: object expected"); + message.service[i] = $root.google.protobuf.ServiceDescriptorProto.fromObject(object.service[i]); + } + } + if (object.extension) { + if (!Array.isArray(object.extension)) + throw TypeError(".google.protobuf.FileDescriptorProto.extension: array expected"); + message.extension = []; + for (var i = 0; i < object.extension.length; ++i) { + if (typeof object.extension[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.extension: object expected"); + message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.FileOptions.fromObject(object.options); + } + if (object.sourceCodeInfo != null) { + if (typeof object.sourceCodeInfo !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.sourceCodeInfo: object expected"); + message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.fromObject(object.sourceCodeInfo); + } + if (object.syntax != null) + message.syntax = String(object.syntax); + return message; + }; - /** - * Constructs a new PushConfig. - * @memberof google.pubsub.v1 - * @classdesc Represents a PushConfig. - * @implements IPushConfig - * @constructor - * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set - */ - function PushConfig(properties) { - this.attributes = {}; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.FileDescriptorProto} message FileDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.dependency = []; + object.messageType = []; + object.enumType = []; + object.service = []; + object.extension = []; + object.publicDependency = []; + object.weakDependency = []; + } + if (options.defaults) { + object.name = ""; + object["package"] = ""; + object.options = null; + object.sourceCodeInfo = null; + object.syntax = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message["package"] != null && message.hasOwnProperty("package")) + object["package"] = message["package"]; + if (message.dependency && message.dependency.length) { + object.dependency = []; + for (var j = 0; j < message.dependency.length; ++j) + object.dependency[j] = message.dependency[j]; + } + if (message.messageType && message.messageType.length) { + object.messageType = []; + for (var j = 0; j < message.messageType.length; ++j) + object.messageType[j] = $root.google.protobuf.DescriptorProto.toObject(message.messageType[j], options); + } + if (message.enumType && message.enumType.length) { + object.enumType = []; + for (var j = 0; j < message.enumType.length; ++j) + object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); + } + if (message.service && message.service.length) { + object.service = []; + for (var j = 0; j < message.service.length; ++j) + object.service[j] = $root.google.protobuf.ServiceDescriptorProto.toObject(message.service[j], options); + } + if (message.extension && message.extension.length) { + object.extension = []; + for (var j = 0; j < message.extension.length; ++j) + object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.FileOptions.toObject(message.options, options); + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) + object.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.toObject(message.sourceCodeInfo, options); + if (message.publicDependency && message.publicDependency.length) { + object.publicDependency = []; + for (var j = 0; j < message.publicDependency.length; ++j) + object.publicDependency[j] = message.publicDependency[j]; + } + if (message.weakDependency && message.weakDependency.length) { + object.weakDependency = []; + for (var j = 0; j < message.weakDependency.length; ++j) + object.weakDependency[j] = message.weakDependency[j]; } + if (message.syntax != null && message.hasOwnProperty("syntax")) + object.syntax = message.syntax; + return object; + }; - /** - * PushConfig pushEndpoint. - * @member {string} pushEndpoint - * @memberof google.pubsub.v1.PushConfig - * @instance - */ - PushConfig.prototype.pushEndpoint = ""; + /** + * Converts this FileDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.FileDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + FileDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * PushConfig attributes. - * @member {Object.} attributes - * @memberof google.pubsub.v1.PushConfig - * @instance - */ - PushConfig.prototype.attributes = $util.emptyObject; + return FileDescriptorProto; + })(); - /** - * PushConfig oidcToken. - * @member {google.pubsub.v1.PushConfig.IOidcToken|null|undefined} oidcToken - * @memberof google.pubsub.v1.PushConfig - * @instance - */ - PushConfig.prototype.oidcToken = null; + protobuf.DescriptorProto = (function() { - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + /** + * Properties of a DescriptorProto. + * @memberof google.protobuf + * @interface IDescriptorProto + * @property {string|null} [name] DescriptorProto name + * @property {Array.|null} [field] DescriptorProto field + * @property {Array.|null} [extension] DescriptorProto extension + * @property {Array.|null} [nestedType] DescriptorProto nestedType + * @property {Array.|null} [enumType] DescriptorProto enumType + * @property {Array.|null} [extensionRange] DescriptorProto extensionRange + * @property {Array.|null} [oneofDecl] DescriptorProto oneofDecl + * @property {google.protobuf.IMessageOptions|null} [options] DescriptorProto options + * @property {Array.|null} [reservedRange] DescriptorProto reservedRange + * @property {Array.|null} [reservedName] DescriptorProto reservedName + */ - /** - * PushConfig authenticationMethod. - * @member {"oidcToken"|undefined} authenticationMethod - * @memberof google.pubsub.v1.PushConfig - * @instance - */ - Object.defineProperty(PushConfig.prototype, "authenticationMethod", { - get: $util.oneOfGetter($oneOfFields = ["oidcToken"]), - set: $util.oneOfSetter($oneOfFields) - }); + /** + * Constructs a new DescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a DescriptorProto. + * @implements IDescriptorProto + * @constructor + * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set + */ + function DescriptorProto(properties) { + this.field = []; + this.extension = []; + this.nestedType = []; + this.enumType = []; + this.extensionRange = []; + this.oneofDecl = []; + this.reservedRange = []; + this.reservedName = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a new PushConfig instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set - * @returns {google.pubsub.v1.PushConfig} PushConfig instance - */ - PushConfig.create = function create(properties) { - return new PushConfig(properties); - }; + /** + * DescriptorProto name. + * @member {string} name + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.name = ""; - /** - * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PushConfig.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.pushEndpoint); - if (message.attributes != null && message.hasOwnProperty("attributes")) - for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); - if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) - $root.google.pubsub.v1.PushConfig.OidcToken.encode(message.oidcToken, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; + /** + * DescriptorProto field. + * @member {Array.} field + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.field = $util.emptyArray; - /** - * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PushConfig.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * DescriptorProto extension. + * @member {Array.} extension + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.extension = $util.emptyArray; - /** - * Decodes a PushConfig message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PushConfig} PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PushConfig.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key; - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.pushEndpoint = reader.string(); - break; - case 2: - reader.skip().pos++; - if (message.attributes === $util.emptyObject) - message.attributes = {}; - key = reader.string(); - reader.pos++; - message.attributes[key] = reader.string(); - break; - case 3: - message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * DescriptorProto nestedType. + * @member {Array.} nestedType + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.nestedType = $util.emptyArray; - /** - * Decodes a PushConfig message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PushConfig} PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PushConfig.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * DescriptorProto enumType. + * @member {Array.} enumType + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.enumType = $util.emptyArray; - /** - * Verifies a PushConfig message. - * @function verify - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PushConfig.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - var properties = {}; - if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) - if (!$util.isString(message.pushEndpoint)) - return "pushEndpoint: string expected"; - if (message.attributes != null && message.hasOwnProperty("attributes")) { - if (!$util.isObject(message.attributes)) - return "attributes: object expected"; - var key = Object.keys(message.attributes); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.attributes[key[i]])) - return "attributes: string{k:string} expected"; - } - if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { - properties.authenticationMethod = 1; - { - var error = $root.google.pubsub.v1.PushConfig.OidcToken.verify(message.oidcToken); - if (error) - return "oidcToken." + error; - } - } - return null; - }; + /** + * DescriptorProto extensionRange. + * @member {Array.} extensionRange + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.extensionRange = $util.emptyArray; - /** - * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PushConfig} PushConfig - */ - PushConfig.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PushConfig) - return object; - var message = new $root.google.pubsub.v1.PushConfig(); - if (object.pushEndpoint != null) - message.pushEndpoint = String(object.pushEndpoint); - if (object.attributes) { - if (typeof object.attributes !== "object") - throw TypeError(".google.pubsub.v1.PushConfig.attributes: object expected"); - message.attributes = {}; - for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) - message.attributes[keys[i]] = String(object.attributes[keys[i]]); - } - if (object.oidcToken != null) { - if (typeof object.oidcToken !== "object") - throw TypeError(".google.pubsub.v1.PushConfig.oidcToken: object expected"); - message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.fromObject(object.oidcToken); - } - return message; - }; + /** + * DescriptorProto oneofDecl. + * @member {Array.} oneofDecl + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.oneofDecl = $util.emptyArray; - /** - * Creates a plain object from a PushConfig message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {google.pubsub.v1.PushConfig} message PushConfig - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PushConfig.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.objects || options.defaults) - object.attributes = {}; - if (options.defaults) - object.pushEndpoint = ""; - if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) - object.pushEndpoint = message.pushEndpoint; - var keys2; - if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { - object.attributes = {}; - for (var j = 0; j < keys2.length; ++j) - object.attributes[keys2[j]] = message.attributes[keys2[j]]; - } - if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { - object.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.toObject(message.oidcToken, options); - if (options.oneofs) - object.authenticationMethod = "oidcToken"; - } - return object; - }; + /** + * DescriptorProto options. + * @member {google.protobuf.IMessageOptions|null|undefined} options + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.options = null; - /** - * Converts this PushConfig to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PushConfig - * @instance - * @returns {Object.} JSON object - */ - PushConfig.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * DescriptorProto reservedRange. + * @member {Array.} reservedRange + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.reservedRange = $util.emptyArray; - PushConfig.OidcToken = (function() { + /** + * DescriptorProto reservedName. + * @member {Array.} reservedName + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.reservedName = $util.emptyArray; - /** - * Properties of an OidcToken. - * @memberof google.pubsub.v1.PushConfig - * @interface IOidcToken - * @property {string|null} [serviceAccountEmail] OidcToken serviceAccountEmail - * @property {string|null} [audience] OidcToken audience - */ + /** + * Creates a new DescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto} DescriptorProto instance + */ + DescriptorProto.create = function create(properties) { + return new DescriptorProto(properties); + }; - /** - * Constructs a new OidcToken. - * @memberof google.pubsub.v1.PushConfig - * @classdesc Represents an OidcToken. - * @implements IOidcToken - * @constructor - * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set - */ - function OidcToken(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.field != null && message.field.length) + for (var i = 0; i < message.field.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.field[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.nestedType != null && message.nestedType.length) + for (var i = 0; i < message.nestedType.length; ++i) + $root.google.protobuf.DescriptorProto.encode(message.nestedType[i], writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.enumType != null && message.enumType.length) + for (var i = 0; i < message.enumType.length; ++i) + $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.extensionRange != null && message.extensionRange.length) + for (var i = 0; i < message.extensionRange.length; ++i) + $root.google.protobuf.DescriptorProto.ExtensionRange.encode(message.extensionRange[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.extension != null && message.extension.length) + for (var i = 0; i < message.extension.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.MessageOptions.encode(message.options, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); + if (message.oneofDecl != null && message.oneofDecl.length) + for (var i = 0; i < message.oneofDecl.length; ++i) + $root.google.protobuf.OneofDescriptorProto.encode(message.oneofDecl[i], writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.reservedRange != null && message.reservedRange.length) + for (var i = 0; i < message.reservedRange.length; ++i) + $root.google.protobuf.DescriptorProto.ReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); + if (message.reservedName != null && message.reservedName.length) + for (var i = 0; i < message.reservedName.length; ++i) + writer.uint32(/* id 10, wireType 2 =*/82).string(message.reservedName[i]); + return writer; + }; - /** - * OidcToken serviceAccountEmail. - * @member {string} serviceAccountEmail - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @instance - */ - OidcToken.prototype.serviceAccountEmail = ""; + /** + * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * OidcToken audience. - * @member {string} audience - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @instance - */ - OidcToken.prototype.audience = ""; + /** + * Decodes a DescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.DescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.field && message.field.length)) + message.field = []; + message.field.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 6: + if (!(message.extension && message.extension.length)) + message.extension = []; + message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + if (!(message.nestedType && message.nestedType.length)) + message.nestedType = []; + message.nestedType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); + break; + case 4: + if (!(message.enumType && message.enumType.length)) + message.enumType = []; + message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.extensionRange && message.extensionRange.length)) + message.extensionRange = []; + message.extensionRange.push($root.google.protobuf.DescriptorProto.ExtensionRange.decode(reader, reader.uint32())); + break; + case 8: + if (!(message.oneofDecl && message.oneofDecl.length)) + message.oneofDecl = []; + message.oneofDecl.push($root.google.protobuf.OneofDescriptorProto.decode(reader, reader.uint32())); + break; + case 7: + message.options = $root.google.protobuf.MessageOptions.decode(reader, reader.uint32()); + break; + case 9: + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.DescriptorProto.ReservedRange.decode(reader, reader.uint32())); + break; + case 10: + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Creates a new OidcToken instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set - * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken instance - */ - OidcToken.create = function create(properties) { - return new OidcToken(properties); - }; + /** + * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.DescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OidcToken.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.serviceAccountEmail); - if (message.audience != null && message.hasOwnProperty("audience")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.audience); - return writer; - }; - - /** - * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OidcToken.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an OidcToken message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OidcToken.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.OidcToken(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.serviceAccountEmail = reader.string(); - break; - case 2: - message.audience = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an OidcToken message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OidcToken.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an OidcToken message. - * @function verify - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - OidcToken.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) - if (!$util.isString(message.serviceAccountEmail)) - return "serviceAccountEmail: string expected"; - if (message.audience != null && message.hasOwnProperty("audience")) - if (!$util.isString(message.audience)) - return "audience: string expected"; - return null; - }; - - /** - * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken - */ - OidcToken.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PushConfig.OidcToken) - return object; - var message = new $root.google.pubsub.v1.PushConfig.OidcToken(); - if (object.serviceAccountEmail != null) - message.serviceAccountEmail = String(object.serviceAccountEmail); - if (object.audience != null) - message.audience = String(object.audience); - return message; - }; - - /** - * Creates a plain object from an OidcToken message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {google.pubsub.v1.PushConfig.OidcToken} message OidcToken - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - OidcToken.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.serviceAccountEmail = ""; - object.audience = ""; - } - if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) - object.serviceAccountEmail = message.serviceAccountEmail; - if (message.audience != null && message.hasOwnProperty("audience")) - object.audience = message.audience; - return object; - }; - - /** - * Converts this OidcToken to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @instance - * @returns {Object.} JSON object - */ - OidcToken.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return OidcToken; - })(); - - return PushConfig; - })(); - - v1.ReceivedMessage = (function() { - - /** - * Properties of a ReceivedMessage. - * @memberof google.pubsub.v1 - * @interface IReceivedMessage - * @property {string|null} [ackId] ReceivedMessage ackId - * @property {google.pubsub.v1.IPubsubMessage|null} [message] ReceivedMessage message - * @property {number|null} [deliveryAttempt] ReceivedMessage deliveryAttempt - */ - - /** - * Constructs a new ReceivedMessage. - * @memberof google.pubsub.v1 - * @classdesc Represents a ReceivedMessage. - * @implements IReceivedMessage - * @constructor - * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set - */ - function ReceivedMessage(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ReceivedMessage ackId. - * @member {string} ackId - * @memberof google.pubsub.v1.ReceivedMessage - * @instance - */ - ReceivedMessage.prototype.ackId = ""; - - /** - * ReceivedMessage message. - * @member {google.pubsub.v1.IPubsubMessage|null|undefined} message - * @memberof google.pubsub.v1.ReceivedMessage - * @instance - */ - ReceivedMessage.prototype.message = null; - - /** - * ReceivedMessage deliveryAttempt. - * @member {number} deliveryAttempt - * @memberof google.pubsub.v1.ReceivedMessage - * @instance - */ - ReceivedMessage.prototype.deliveryAttempt = 0; - - /** - * Creates a new ReceivedMessage instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ReceivedMessage - * @static - * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set - * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage instance - */ - ReceivedMessage.create = function create(properties) { - return new ReceivedMessage(properties); - }; - - /** - * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ReceivedMessage - * @static - * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ReceivedMessage.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.ackId != null && message.hasOwnProperty("ackId")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.ackId); - if (message.message != null && message.hasOwnProperty("message")) - $root.google.pubsub.v1.PubsubMessage.encode(message.message, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.deliveryAttempt); - return writer; - }; - - /** - * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ReceivedMessage - * @static - * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ReceivedMessage.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a ReceivedMessage message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ReceivedMessage - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ReceivedMessage.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ReceivedMessage(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.ackId = reader.string(); - break; - case 2: - message.message = $root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32()); - break; - case 3: - message.deliveryAttempt = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ReceivedMessage - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ReceivedMessage.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a ReceivedMessage message. - * @function verify - * @memberof google.pubsub.v1.ReceivedMessage - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ReceivedMessage.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.ackId != null && message.hasOwnProperty("ackId")) - if (!$util.isString(message.ackId)) - return "ackId: string expected"; - if (message.message != null && message.hasOwnProperty("message")) { - var error = $root.google.pubsub.v1.PubsubMessage.verify(message.message); - if (error) - return "message." + error; - } - if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) - if (!$util.isInteger(message.deliveryAttempt)) - return "deliveryAttempt: integer expected"; - return null; - }; - - /** - * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ReceivedMessage - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage - */ - ReceivedMessage.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ReceivedMessage) - return object; - var message = new $root.google.pubsub.v1.ReceivedMessage(); - if (object.ackId != null) - message.ackId = String(object.ackId); - if (object.message != null) { - if (typeof object.message !== "object") - throw TypeError(".google.pubsub.v1.ReceivedMessage.message: object expected"); - message.message = $root.google.pubsub.v1.PubsubMessage.fromObject(object.message); - } - if (object.deliveryAttempt != null) - message.deliveryAttempt = object.deliveryAttempt | 0; - return message; - }; - - /** - * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ReceivedMessage - * @static - * @param {google.pubsub.v1.ReceivedMessage} message ReceivedMessage - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ReceivedMessage.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.ackId = ""; - object.message = null; - object.deliveryAttempt = 0; - } - if (message.ackId != null && message.hasOwnProperty("ackId")) - object.ackId = message.ackId; - if (message.message != null && message.hasOwnProperty("message")) - object.message = $root.google.pubsub.v1.PubsubMessage.toObject(message.message, options); - if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) - object.deliveryAttempt = message.deliveryAttempt; - return object; - }; - - /** - * Converts this ReceivedMessage to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ReceivedMessage - * @instance - * @returns {Object.} JSON object - */ - ReceivedMessage.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return ReceivedMessage; - })(); - - v1.GetSubscriptionRequest = (function() { - - /** - * Properties of a GetSubscriptionRequest. - * @memberof google.pubsub.v1 - * @interface IGetSubscriptionRequest - * @property {string|null} [subscription] GetSubscriptionRequest subscription - */ - - /** - * Constructs a new GetSubscriptionRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a GetSubscriptionRequest. - * @implements IGetSubscriptionRequest - * @constructor - * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set - */ - function GetSubscriptionRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * GetSubscriptionRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @instance - */ - GetSubscriptionRequest.prototype.subscription = ""; - - /** - * Creates a new GetSubscriptionRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest instance - */ - GetSubscriptionRequest.create = function create(properties) { - return new GetSubscriptionRequest(properties); - }; - - /** - * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSubscriptionRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - return writer; - }; - - /** - * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSubscriptionRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSubscriptionRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Verifies a DescriptorProto message. + * @function verify + * @memberof google.protobuf.DescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.field != null && message.hasOwnProperty("field")) { + if (!Array.isArray(message.field)) + return "field: array expected"; + for (var i = 0; i < message.field.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.field[i]); + if (error) + return "field." + error; } - return message; - }; - - /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a GetSubscriptionRequest message. - * @function verify - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - GetSubscriptionRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - return null; - }; - - /** - * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest - */ - GetSubscriptionRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.GetSubscriptionRequest) - return object; - var message = new $root.google.pubsub.v1.GetSubscriptionRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - return message; - }; - - /** - * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {google.pubsub.v1.GetSubscriptionRequest} message GetSubscriptionRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - GetSubscriptionRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.subscription = ""; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - return object; - }; - - /** - * Converts this GetSubscriptionRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @instance - * @returns {Object.} JSON object - */ - GetSubscriptionRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return GetSubscriptionRequest; - })(); - - v1.UpdateSubscriptionRequest = (function() { - - /** - * Properties of an UpdateSubscriptionRequest. - * @memberof google.pubsub.v1 - * @interface IUpdateSubscriptionRequest - * @property {google.pubsub.v1.ISubscription|null} [subscription] UpdateSubscriptionRequest subscription - * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSubscriptionRequest updateMask - */ - - /** - * Constructs a new UpdateSubscriptionRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents an UpdateSubscriptionRequest. - * @implements IUpdateSubscriptionRequest - * @constructor - * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set - */ - function UpdateSubscriptionRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; } - - /** - * UpdateSubscriptionRequest subscription. - * @member {google.pubsub.v1.ISubscription|null|undefined} subscription - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @instance - */ - UpdateSubscriptionRequest.prototype.subscription = null; - - /** - * UpdateSubscriptionRequest updateMask. - * @member {google.protobuf.IFieldMask|null|undefined} updateMask - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @instance - */ - UpdateSubscriptionRequest.prototype.updateMask = null; - - /** - * Creates a new UpdateSubscriptionRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest instance - */ - UpdateSubscriptionRequest.create = function create(properties) { - return new UpdateSubscriptionRequest(properties); - }; - - /** - * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UpdateSubscriptionRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - $root.google.pubsub.v1.Subscription.encode(message.subscription, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UpdateSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UpdateSubscriptionRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = $root.google.pubsub.v1.Subscription.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } + if (message.extension != null && message.hasOwnProperty("extension")) { + if (!Array.isArray(message.extension)) + return "extension: array expected"; + for (var i = 0; i < message.extension.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); + if (error) + return "extension." + error; + } + } + if (message.nestedType != null && message.hasOwnProperty("nestedType")) { + if (!Array.isArray(message.nestedType)) + return "nestedType: array expected"; + for (var i = 0; i < message.nestedType.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.verify(message.nestedType[i]); + if (error) + return "nestedType." + error; + } + } + if (message.enumType != null && message.hasOwnProperty("enumType")) { + if (!Array.isArray(message.enumType)) + return "enumType: array expected"; + for (var i = 0; i < message.enumType.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); + if (error) + return "enumType." + error; } - return message; - }; - - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UpdateSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an UpdateSubscriptionRequest message. - * @function verify - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - UpdateSubscriptionRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) { - var error = $root.google.pubsub.v1.Subscription.verify(message.subscription); + } + if (message.extensionRange != null && message.hasOwnProperty("extensionRange")) { + if (!Array.isArray(message.extensionRange)) + return "extensionRange: array expected"; + for (var i = 0; i < message.extensionRange.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.ExtensionRange.verify(message.extensionRange[i]); if (error) - return "subscription." + error; + return "extensionRange." + error; } - if (message.updateMask != null && message.hasOwnProperty("updateMask")) { - var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + } + if (message.oneofDecl != null && message.hasOwnProperty("oneofDecl")) { + if (!Array.isArray(message.oneofDecl)) + return "oneofDecl: array expected"; + for (var i = 0; i < message.oneofDecl.length; ++i) { + var error = $root.google.protobuf.OneofDescriptorProto.verify(message.oneofDecl[i]); if (error) - return "updateMask." + error; + return "oneofDecl." + error; } - return null; - }; + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.MessageOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { + if (!Array.isArray(message.reservedRange)) + return "reservedRange: array expected"; + for (var i = 0; i < message.reservedRange.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.ReservedRange.verify(message.reservedRange[i]); + if (error) + return "reservedRange." + error; + } + } + if (message.reservedName != null && message.hasOwnProperty("reservedName")) { + if (!Array.isArray(message.reservedName)) + return "reservedName: array expected"; + for (var i = 0; i < message.reservedName.length; ++i) + if (!$util.isString(message.reservedName[i])) + return "reservedName: string[] expected"; + } + return null; + }; - /** - * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest - */ - UpdateSubscriptionRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.UpdateSubscriptionRequest) - return object; - var message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); - if (object.subscription != null) { - if (typeof object.subscription !== "object") - throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.subscription: object expected"); - message.subscription = $root.google.pubsub.v1.Subscription.fromObject(object.subscription); + /** + * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.DescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.DescriptorProto} DescriptorProto + */ + DescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto) + return object; + var message = new $root.google.protobuf.DescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.field) { + if (!Array.isArray(object.field)) + throw TypeError(".google.protobuf.DescriptorProto.field: array expected"); + message.field = []; + for (var i = 0; i < object.field.length; ++i) { + if (typeof object.field[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.field: object expected"); + message.field[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.field[i]); } - if (object.updateMask != null) { - if (typeof object.updateMask !== "object") - throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.updateMask: object expected"); - message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + } + if (object.extension) { + if (!Array.isArray(object.extension)) + throw TypeError(".google.protobuf.DescriptorProto.extension: array expected"); + message.extension = []; + for (var i = 0; i < object.extension.length; ++i) { + if (typeof object.extension[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.extension: object expected"); + message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); } - return message; - }; - - /** - * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {google.pubsub.v1.UpdateSubscriptionRequest} message UpdateSubscriptionRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - UpdateSubscriptionRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.subscription = null; - object.updateMask = null; + } + if (object.nestedType) { + if (!Array.isArray(object.nestedType)) + throw TypeError(".google.protobuf.DescriptorProto.nestedType: array expected"); + message.nestedType = []; + for (var i = 0; i < object.nestedType.length; ++i) { + if (typeof object.nestedType[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.nestedType: object expected"); + message.nestedType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.nestedType[i]); } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = $root.google.pubsub.v1.Subscription.toObject(message.subscription, options); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); - return object; - }; + } + if (object.enumType) { + if (!Array.isArray(object.enumType)) + throw TypeError(".google.protobuf.DescriptorProto.enumType: array expected"); + message.enumType = []; + for (var i = 0; i < object.enumType.length; ++i) { + if (typeof object.enumType[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.enumType: object expected"); + message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); + } + } + if (object.extensionRange) { + if (!Array.isArray(object.extensionRange)) + throw TypeError(".google.protobuf.DescriptorProto.extensionRange: array expected"); + message.extensionRange = []; + for (var i = 0; i < object.extensionRange.length; ++i) { + if (typeof object.extensionRange[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.extensionRange: object expected"); + message.extensionRange[i] = $root.google.protobuf.DescriptorProto.ExtensionRange.fromObject(object.extensionRange[i]); + } + } + if (object.oneofDecl) { + if (!Array.isArray(object.oneofDecl)) + throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: array expected"); + message.oneofDecl = []; + for (var i = 0; i < object.oneofDecl.length; ++i) { + if (typeof object.oneofDecl[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: object expected"); + message.oneofDecl[i] = $root.google.protobuf.OneofDescriptorProto.fromObject(object.oneofDecl[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.DescriptorProto.options: object expected"); + message.options = $root.google.protobuf.MessageOptions.fromObject(object.options); + } + if (object.reservedRange) { + if (!Array.isArray(object.reservedRange)) + throw TypeError(".google.protobuf.DescriptorProto.reservedRange: array expected"); + message.reservedRange = []; + for (var i = 0; i < object.reservedRange.length; ++i) { + if (typeof object.reservedRange[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.reservedRange: object expected"); + message.reservedRange[i] = $root.google.protobuf.DescriptorProto.ReservedRange.fromObject(object.reservedRange[i]); + } + } + if (object.reservedName) { + if (!Array.isArray(object.reservedName)) + throw TypeError(".google.protobuf.DescriptorProto.reservedName: array expected"); + message.reservedName = []; + for (var i = 0; i < object.reservedName.length; ++i) + message.reservedName[i] = String(object.reservedName[i]); + } + return message; + }; - /** - * Converts this UpdateSubscriptionRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @instance - * @returns {Object.} JSON object - */ - UpdateSubscriptionRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.DescriptorProto} message DescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.field = []; + object.nestedType = []; + object.enumType = []; + object.extensionRange = []; + object.extension = []; + object.oneofDecl = []; + object.reservedRange = []; + object.reservedName = []; + } + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.field && message.field.length) { + object.field = []; + for (var j = 0; j < message.field.length; ++j) + object.field[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.field[j], options); + } + if (message.nestedType && message.nestedType.length) { + object.nestedType = []; + for (var j = 0; j < message.nestedType.length; ++j) + object.nestedType[j] = $root.google.protobuf.DescriptorProto.toObject(message.nestedType[j], options); + } + if (message.enumType && message.enumType.length) { + object.enumType = []; + for (var j = 0; j < message.enumType.length; ++j) + object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); + } + if (message.extensionRange && message.extensionRange.length) { + object.extensionRange = []; + for (var j = 0; j < message.extensionRange.length; ++j) + object.extensionRange[j] = $root.google.protobuf.DescriptorProto.ExtensionRange.toObject(message.extensionRange[j], options); + } + if (message.extension && message.extension.length) { + object.extension = []; + for (var j = 0; j < message.extension.length; ++j) + object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.MessageOptions.toObject(message.options, options); + if (message.oneofDecl && message.oneofDecl.length) { + object.oneofDecl = []; + for (var j = 0; j < message.oneofDecl.length; ++j) + object.oneofDecl[j] = $root.google.protobuf.OneofDescriptorProto.toObject(message.oneofDecl[j], options); + } + if (message.reservedRange && message.reservedRange.length) { + object.reservedRange = []; + for (var j = 0; j < message.reservedRange.length; ++j) + object.reservedRange[j] = $root.google.protobuf.DescriptorProto.ReservedRange.toObject(message.reservedRange[j], options); + } + if (message.reservedName && message.reservedName.length) { + object.reservedName = []; + for (var j = 0; j < message.reservedName.length; ++j) + object.reservedName[j] = message.reservedName[j]; + } + return object; + }; - return UpdateSubscriptionRequest; - })(); + /** + * Converts this DescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.DescriptorProto + * @instance + * @returns {Object.} JSON object + */ + DescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.ListSubscriptionsRequest = (function() { + DescriptorProto.ExtensionRange = (function() { /** - * Properties of a ListSubscriptionsRequest. - * @memberof google.pubsub.v1 - * @interface IListSubscriptionsRequest - * @property {string|null} [project] ListSubscriptionsRequest project - * @property {number|null} [pageSize] ListSubscriptionsRequest pageSize - * @property {string|null} [pageToken] ListSubscriptionsRequest pageToken + * Properties of an ExtensionRange. + * @memberof google.protobuf.DescriptorProto + * @interface IExtensionRange + * @property {number|null} [start] ExtensionRange start + * @property {number|null} [end] ExtensionRange end + * @property {google.protobuf.IExtensionRangeOptions|null} [options] ExtensionRange options */ /** - * Constructs a new ListSubscriptionsRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListSubscriptionsRequest. - * @implements IListSubscriptionsRequest + * Constructs a new ExtensionRange. + * @memberof google.protobuf.DescriptorProto + * @classdesc Represents an ExtensionRange. + * @implements IExtensionRange * @constructor - * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set + * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set */ - function ListSubscriptionsRequest(properties) { + function ExtensionRange(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -6111,101 +5737,101 @@ } /** - * ListSubscriptionsRequest project. - * @member {string} project - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * ExtensionRange start. + * @member {number} start + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @instance */ - ListSubscriptionsRequest.prototype.project = ""; + ExtensionRange.prototype.start = 0; /** - * ListSubscriptionsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * ExtensionRange end. + * @member {number} end + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @instance */ - ListSubscriptionsRequest.prototype.pageSize = 0; + ExtensionRange.prototype.end = 0; /** - * ListSubscriptionsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * ExtensionRange options. + * @member {google.protobuf.IExtensionRangeOptions|null|undefined} options + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @instance */ - ListSubscriptionsRequest.prototype.pageToken = ""; + ExtensionRange.prototype.options = null; /** - * Creates a new ListSubscriptionsRequest instance using the specified properties. + * Creates a new ExtensionRange instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static - * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest instance + * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange instance */ - ListSubscriptionsRequest.create = function create(properties) { - return new ListSubscriptionsRequest(properties); + ExtensionRange.create = function create(properties) { + return new ExtensionRange(properties); }; /** - * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static - * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode + * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListSubscriptionsRequest.encode = function encode(message, writer) { + ExtensionRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.ExtensionRangeOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; /** - * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static - * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode + * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + ExtensionRange.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. + * Decodes an ExtensionRange message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSubscriptionsRequest.decode = function decode(reader, length) { + ExtensionRange.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.project = reader.string(); + message.start = reader.int32(); break; case 2: - message.pageSize = reader.int32(); + message.end = reader.int32(); break; case 3: - message.pageToken = reader.string(); + message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -6216,126 +5842,130 @@ }; /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. + * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { + ExtensionRange.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListSubscriptionsRequest message. + * Verifies an ExtensionRange message. * @function verify - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListSubscriptionsRequest.verify = function verify(message) { + ExtensionRange.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.project != null && message.hasOwnProperty("project")) - if (!$util.isString(message.project)) - return "project: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.ExtensionRangeOptions.verify(message.options); + if (error) + return "options." + error; + } return null; }; /** - * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange */ - ListSubscriptionsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListSubscriptionsRequest) + ExtensionRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto.ExtensionRange) return object; - var message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); - if (object.project != null) - message.project = String(object.project); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); + var message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.DescriptorProto.ExtensionRange.options: object expected"); + message.options = $root.google.protobuf.ExtensionRangeOptions.fromObject(object.options); + } return message; }; /** - * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. + * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static - * @param {google.pubsub.v1.ListSubscriptionsRequest} message ListSubscriptionsRequest + * @param {google.protobuf.DescriptorProto.ExtensionRange} message ExtensionRange * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListSubscriptionsRequest.toObject = function toObject(message, options) { + ExtensionRange.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.project = ""; - object.pageSize = 0; - object.pageToken = ""; + object.start = 0; + object.end = 0; + object.options = null; } - if (message.project != null && message.hasOwnProperty("project")) - object.project = message.project; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.ExtensionRangeOptions.toObject(message.options, options); return object; }; /** - * Converts this ListSubscriptionsRequest to JSON. + * Converts this ExtensionRange to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @instance * @returns {Object.} JSON object */ - ListSubscriptionsRequest.prototype.toJSON = function toJSON() { + ExtensionRange.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListSubscriptionsRequest; + return ExtensionRange; })(); - v1.ListSubscriptionsResponse = (function() { + DescriptorProto.ReservedRange = (function() { /** - * Properties of a ListSubscriptionsResponse. - * @memberof google.pubsub.v1 - * @interface IListSubscriptionsResponse - * @property {Array.|null} [subscriptions] ListSubscriptionsResponse subscriptions - * @property {string|null} [nextPageToken] ListSubscriptionsResponse nextPageToken + * Properties of a ReservedRange. + * @memberof google.protobuf.DescriptorProto + * @interface IReservedRange + * @property {number|null} [start] ReservedRange start + * @property {number|null} [end] ReservedRange end */ /** - * Constructs a new ListSubscriptionsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListSubscriptionsResponse. - * @implements IListSubscriptionsResponse + * Constructs a new ReservedRange. + * @memberof google.protobuf.DescriptorProto + * @classdesc Represents a ReservedRange. + * @implements IReservedRange * @constructor - * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set + * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set */ - function ListSubscriptionsResponse(properties) { - this.subscriptions = []; + function ReservedRange(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -6343,91 +5973,88 @@ } /** - * ListSubscriptionsResponse subscriptions. - * @member {Array.} subscriptions - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * ReservedRange start. + * @member {number} start + * @memberof google.protobuf.DescriptorProto.ReservedRange * @instance */ - ListSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; + ReservedRange.prototype.start = 0; /** - * ListSubscriptionsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * ReservedRange end. + * @member {number} end + * @memberof google.protobuf.DescriptorProto.ReservedRange * @instance */ - ListSubscriptionsResponse.prototype.nextPageToken = ""; + ReservedRange.prototype.end = 0; /** - * Creates a new ListSubscriptionsResponse instance using the specified properties. + * Creates a new ReservedRange instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static - * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse instance + * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange instance */ - ListSubscriptionsResponse.create = function create(properties) { - return new ListSubscriptionsResponse(properties); + ReservedRange.create = function create(properties) { + return new ReservedRange(properties); }; /** - * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static - * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode + * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListSubscriptionsResponse.encode = function encode(message, writer) { + ReservedRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscriptions != null && message.subscriptions.length) - for (var i = 0; i < message.subscriptions.length; ++i) - $root.google.pubsub.v1.Subscription.encode(message.subscriptions[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); return writer; }; /** - * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static - * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode + * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + ReservedRange.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. + * Decodes a ReservedRange message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSubscriptionsResponse.decode = function decode(reader, length) { + ReservedRange.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ReservedRange(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.subscriptions && message.subscriptions.length)) - message.subscriptions = []; - message.subscriptions.push($root.google.pubsub.v1.Subscription.decode(reader, reader.uint32())); + message.start = reader.int32(); break; case 2: - message.nextPageToken = reader.string(); + message.end = reader.int32(); break; default: reader.skipType(tag & 7); @@ -6438,1226 +6065,1445 @@ }; /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. + * Decodes a ReservedRange message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { + ReservedRange.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListSubscriptionsResponse message. + * Verifies a ReservedRange message. * @function verify - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListSubscriptionsResponse.verify = function verify(message) { + ReservedRange.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { - if (!Array.isArray(message.subscriptions)) - return "subscriptions: array expected"; - for (var i = 0; i < message.subscriptions.length; ++i) { - var error = $root.google.pubsub.v1.Subscription.verify(message.subscriptions[i]); - if (error) - return "subscriptions." + error; - } - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; return null; }; /** - * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange */ - ListSubscriptionsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListSubscriptionsResponse) + ReservedRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto.ReservedRange) return object; - var message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); - if (object.subscriptions) { - if (!Array.isArray(object.subscriptions)) - throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: array expected"); - message.subscriptions = []; - for (var i = 0; i < object.subscriptions.length; ++i) { - if (typeof object.subscriptions[i] !== "object") - throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: object expected"); - message.subscriptions[i] = $root.google.pubsub.v1.Subscription.fromObject(object.subscriptions[i]); - } - } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); + var message = new $root.google.protobuf.DescriptorProto.ReservedRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; return message; }; /** - * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. + * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static - * @param {google.pubsub.v1.ListSubscriptionsResponse} message ListSubscriptionsResponse + * @param {google.protobuf.DescriptorProto.ReservedRange} message ReservedRange * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListSubscriptionsResponse.toObject = function toObject(message, options) { + ReservedRange.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.subscriptions = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.subscriptions && message.subscriptions.length) { - object.subscriptions = []; - for (var j = 0; j < message.subscriptions.length; ++j) - object.subscriptions[j] = $root.google.pubsub.v1.Subscription.toObject(message.subscriptions[j], options); + if (options.defaults) { + object.start = 0; + object.end = 0; } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; return object; }; /** - * Converts this ListSubscriptionsResponse to JSON. + * Converts this ReservedRange to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @memberof google.protobuf.DescriptorProto.ReservedRange * @instance * @returns {Object.} JSON object */ - ListSubscriptionsResponse.prototype.toJSON = function toJSON() { + ReservedRange.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListSubscriptionsResponse; - })(); + return ReservedRange; + })(); + + return DescriptorProto; + })(); + + protobuf.ExtensionRangeOptions = (function() { + + /** + * Properties of an ExtensionRangeOptions. + * @memberof google.protobuf + * @interface IExtensionRangeOptions + * @property {Array.|null} [uninterpretedOption] ExtensionRangeOptions uninterpretedOption + */ + + /** + * Constructs a new ExtensionRangeOptions. + * @memberof google.protobuf + * @classdesc Represents an ExtensionRangeOptions. + * @implements IExtensionRangeOptions + * @constructor + * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set + */ + function ExtensionRangeOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ExtensionRangeOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + */ + ExtensionRangeOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions instance + */ + ExtensionRangeOptions.create = function create(properties) { + return new ExtensionRangeOptions(properties); + }; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRangeOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRangeOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - v1.DeleteSubscriptionRequest = (function() { + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRangeOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Properties of a DeleteSubscriptionRequest. - * @memberof google.pubsub.v1 - * @interface IDeleteSubscriptionRequest - * @property {string|null} [subscription] DeleteSubscriptionRequest subscription - */ + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRangeOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Constructs a new DeleteSubscriptionRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a DeleteSubscriptionRequest. - * @implements IDeleteSubscriptionRequest - * @constructor - * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set - */ - function DeleteSubscriptionRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Verifies an ExtensionRangeOptions message. + * @function verify + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExtensionRangeOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } } + return null; + }; - /** - * DeleteSubscriptionRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @instance - */ - DeleteSubscriptionRequest.prototype.subscription = ""; + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + */ + ExtensionRangeOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ExtensionRangeOptions) + return object; + var message = new $root.google.protobuf.ExtensionRangeOptions(); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; - /** - * Creates a new DeleteSubscriptionRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest instance - */ - DeleteSubscriptionRequest.create = function create(properties) { - return new DeleteSubscriptionRequest(properties); - }; + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.ExtensionRangeOptions} message ExtensionRangeOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExtensionRangeOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; - /** - * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteSubscriptionRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - return writer; - }; + /** + * Converts this ExtensionRangeOptions to JSON. + * @function toJSON + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + * @returns {Object.} JSON object + */ + ExtensionRangeOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + return ExtensionRangeOptions; + })(); - /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteSubscriptionRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + protobuf.FieldDescriptorProto = (function() { - /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Properties of a FieldDescriptorProto. + * @memberof google.protobuf + * @interface IFieldDescriptorProto + * @property {string|null} [name] FieldDescriptorProto name + * @property {number|null} [number] FieldDescriptorProto number + * @property {google.protobuf.FieldDescriptorProto.Label|null} [label] FieldDescriptorProto label + * @property {google.protobuf.FieldDescriptorProto.Type|null} [type] FieldDescriptorProto type + * @property {string|null} [typeName] FieldDescriptorProto typeName + * @property {string|null} [extendee] FieldDescriptorProto extendee + * @property {string|null} [defaultValue] FieldDescriptorProto defaultValue + * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex + * @property {string|null} [jsonName] FieldDescriptorProto jsonName + * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options + */ - /** - * Verifies a DeleteSubscriptionRequest message. - * @function verify - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DeleteSubscriptionRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - return null; - }; + /** + * Constructs a new FieldDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a FieldDescriptorProto. + * @implements IFieldDescriptorProto + * @constructor + * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set + */ + function FieldDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest - */ - DeleteSubscriptionRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.DeleteSubscriptionRequest) - return object; - var message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - return message; - }; + /** + * FieldDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.name = ""; - /** - * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {google.pubsub.v1.DeleteSubscriptionRequest} message DeleteSubscriptionRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DeleteSubscriptionRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.subscription = ""; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - return object; - }; + /** + * FieldDescriptorProto number. + * @member {number} number + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.number = 0; - /** - * Converts this DeleteSubscriptionRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @instance - * @returns {Object.} JSON object - */ - DeleteSubscriptionRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * FieldDescriptorProto label. + * @member {google.protobuf.FieldDescriptorProto.Label} label + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.label = 1; - return DeleteSubscriptionRequest; - })(); + /** + * FieldDescriptorProto type. + * @member {google.protobuf.FieldDescriptorProto.Type} type + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.type = 1; - v1.ModifyPushConfigRequest = (function() { + /** + * FieldDescriptorProto typeName. + * @member {string} typeName + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.typeName = ""; - /** - * Properties of a ModifyPushConfigRequest. - * @memberof google.pubsub.v1 - * @interface IModifyPushConfigRequest - * @property {string|null} [subscription] ModifyPushConfigRequest subscription - * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] ModifyPushConfigRequest pushConfig - */ + /** + * FieldDescriptorProto extendee. + * @member {string} extendee + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.extendee = ""; - /** - * Constructs a new ModifyPushConfigRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ModifyPushConfigRequest. - * @implements IModifyPushConfigRequest - * @constructor - * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set - */ - function ModifyPushConfigRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * FieldDescriptorProto defaultValue. + * @member {string} defaultValue + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.defaultValue = ""; - /** - * ModifyPushConfigRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @instance - */ - ModifyPushConfigRequest.prototype.subscription = ""; + /** + * FieldDescriptorProto oneofIndex. + * @member {number} oneofIndex + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.oneofIndex = 0; - /** - * ModifyPushConfigRequest pushConfig. - * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @instance - */ - ModifyPushConfigRequest.prototype.pushConfig = null; + /** + * FieldDescriptorProto jsonName. + * @member {string} jsonName + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.jsonName = ""; - /** - * Creates a new ModifyPushConfigRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest instance - */ - ModifyPushConfigRequest.create = function create(properties) { - return new ModifyPushConfigRequest(properties); - }; + /** + * FieldDescriptorProto options. + * @member {google.protobuf.IFieldOptions|null|undefined} options + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.options = null; - /** - * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ModifyPushConfigRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) - $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; + /** + * Creates a new FieldDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto instance + */ + FieldDescriptorProto.create = function create(properties) { + return new FieldDescriptorProto(properties); + }; + + /** + * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.extendee != null && message.hasOwnProperty("extendee")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.extendee); + if (message.number != null && message.hasOwnProperty("number")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.number); + if (message.label != null && message.hasOwnProperty("label")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.label); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.type); + if (message.typeName != null && message.hasOwnProperty("typeName")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.typeName); + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.defaultValue); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.FieldOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); + return writer; + }; - /** - * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ModifyPushConfigRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ModifyPushConfigRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 3: + message.number = reader.int32(); + break; + case 4: + message.label = reader.int32(); + break; + case 5: + message.type = reader.int32(); + break; + case 6: + message.typeName = reader.string(); + break; + case 2: + message.extendee = reader.string(); + break; + case 7: + message.defaultValue = reader.string(); + break; + case 9: + message.oneofIndex = reader.int32(); + break; + case 10: + message.jsonName = reader.string(); + break; + case 8: + message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ModifyPushConfigRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a ModifyPushConfigRequest message. - * @function verify - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ModifyPushConfigRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { - var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); - if (error) - return "pushConfig." + error; + /** + * Verifies a FieldDescriptorProto message. + * @function verify + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.number != null && message.hasOwnProperty("number")) + if (!$util.isInteger(message.number)) + return "number: integer expected"; + if (message.label != null && message.hasOwnProperty("label")) + switch (message.label) { + default: + return "label: enum value expected"; + case 1: + case 2: + case 3: + break; } - return null; - }; - - /** - * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest - */ - ModifyPushConfigRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ModifyPushConfigRequest) - return object; - var message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.pushConfig != null) { - if (typeof object.pushConfig !== "object") - throw TypeError(".google.pubsub.v1.ModifyPushConfigRequest.pushConfig: object expected"); - message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); + if (message.type != null && message.hasOwnProperty("type")) + switch (message.type) { + default: + return "type: enum value expected"; + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + break; } - return message; - }; + if (message.typeName != null && message.hasOwnProperty("typeName")) + if (!$util.isString(message.typeName)) + return "typeName: string expected"; + if (message.extendee != null && message.hasOwnProperty("extendee")) + if (!$util.isString(message.extendee)) + return "extendee: string expected"; + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + if (!$util.isString(message.defaultValue)) + return "defaultValue: string expected"; + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + if (!$util.isInteger(message.oneofIndex)) + return "oneofIndex: integer expected"; + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + if (!$util.isString(message.jsonName)) + return "jsonName: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.FieldOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; - /** - * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {google.pubsub.v1.ModifyPushConfigRequest} message ModifyPushConfigRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ModifyPushConfigRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.subscription = ""; - object.pushConfig = null; - } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) - object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); + /** + * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + */ + FieldDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldDescriptorProto) return object; - }; - - /** - * Converts this ModifyPushConfigRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @instance - * @returns {Object.} JSON object - */ - ModifyPushConfigRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return ModifyPushConfigRequest; - })(); - - v1.PullRequest = (function() { - - /** - * Properties of a PullRequest. - * @memberof google.pubsub.v1 - * @interface IPullRequest - * @property {string|null} [subscription] PullRequest subscription - * @property {boolean|null} [returnImmediately] PullRequest returnImmediately - * @property {number|null} [maxMessages] PullRequest maxMessages - */ - - /** - * Constructs a new PullRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a PullRequest. - * @implements IPullRequest - * @constructor - * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set - */ - function PullRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + var message = new $root.google.protobuf.FieldDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.number != null) + message.number = object.number | 0; + switch (object.label) { + case "LABEL_OPTIONAL": + case 1: + message.label = 1; + break; + case "LABEL_REQUIRED": + case 2: + message.label = 2; + break; + case "LABEL_REPEATED": + case 3: + message.label = 3; + break; } + switch (object.type) { + case "TYPE_DOUBLE": + case 1: + message.type = 1; + break; + case "TYPE_FLOAT": + case 2: + message.type = 2; + break; + case "TYPE_INT64": + case 3: + message.type = 3; + break; + case "TYPE_UINT64": + case 4: + message.type = 4; + break; + case "TYPE_INT32": + case 5: + message.type = 5; + break; + case "TYPE_FIXED64": + case 6: + message.type = 6; + break; + case "TYPE_FIXED32": + case 7: + message.type = 7; + break; + case "TYPE_BOOL": + case 8: + message.type = 8; + break; + case "TYPE_STRING": + case 9: + message.type = 9; + break; + case "TYPE_GROUP": + case 10: + message.type = 10; + break; + case "TYPE_MESSAGE": + case 11: + message.type = 11; + break; + case "TYPE_BYTES": + case 12: + message.type = 12; + break; + case "TYPE_UINT32": + case 13: + message.type = 13; + break; + case "TYPE_ENUM": + case 14: + message.type = 14; + break; + case "TYPE_SFIXED32": + case 15: + message.type = 15; + break; + case "TYPE_SFIXED64": + case 16: + message.type = 16; + break; + case "TYPE_SINT32": + case 17: + message.type = 17; + break; + case "TYPE_SINT64": + case 18: + message.type = 18; + break; + } + if (object.typeName != null) + message.typeName = String(object.typeName); + if (object.extendee != null) + message.extendee = String(object.extendee); + if (object.defaultValue != null) + message.defaultValue = String(object.defaultValue); + if (object.oneofIndex != null) + message.oneofIndex = object.oneofIndex | 0; + if (object.jsonName != null) + message.jsonName = String(object.jsonName); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.FieldDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.FieldOptions.fromObject(object.options); + } + return message; + }; - /** - * PullRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.PullRequest - * @instance - */ - PullRequest.prototype.subscription = ""; - - /** - * PullRequest returnImmediately. - * @member {boolean} returnImmediately - * @memberof google.pubsub.v1.PullRequest - * @instance - */ - PullRequest.prototype.returnImmediately = false; - - /** - * PullRequest maxMessages. - * @member {number} maxMessages - * @memberof google.pubsub.v1.PullRequest - * @instance - */ - PullRequest.prototype.maxMessages = 0; - - /** - * Creates a new PullRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.PullRequest} PullRequest instance - */ - PullRequest.create = function create(properties) { - return new PullRequest(properties); - }; - - /** - * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PullRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.returnImmediately); - if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.maxMessages); - return writer; - }; - - /** - * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PullRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.FieldDescriptorProto} message FieldDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.extendee = ""; + object.number = 0; + object.label = options.enums === String ? "LABEL_OPTIONAL" : 1; + object.type = options.enums === String ? "TYPE_DOUBLE" : 1; + object.typeName = ""; + object.defaultValue = ""; + object.options = null; + object.oneofIndex = 0; + object.jsonName = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.extendee != null && message.hasOwnProperty("extendee")) + object.extendee = message.extendee; + if (message.number != null && message.hasOwnProperty("number")) + object.number = message.number; + if (message.label != null && message.hasOwnProperty("label")) + object.label = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Label[message.label] : message.label; + if (message.type != null && message.hasOwnProperty("type")) + object.type = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Type[message.type] : message.type; + if (message.typeName != null && message.hasOwnProperty("typeName")) + object.typeName = message.typeName; + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + object.defaultValue = message.defaultValue; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.FieldOptions.toObject(message.options, options); + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + object.oneofIndex = message.oneofIndex; + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + object.jsonName = message.jsonName; + return object; + }; - /** - * Decodes a PullRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PullRequest} PullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PullRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.returnImmediately = reader.bool(); - break; - case 3: - message.maxMessages = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Converts this FieldDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.FieldDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + FieldDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Decodes a PullRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PullRequest} PullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PullRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Type enum. + * @name google.protobuf.FieldDescriptorProto.Type + * @enum {string} + * @property {number} TYPE_DOUBLE=1 TYPE_DOUBLE value + * @property {number} TYPE_FLOAT=2 TYPE_FLOAT value + * @property {number} TYPE_INT64=3 TYPE_INT64 value + * @property {number} TYPE_UINT64=4 TYPE_UINT64 value + * @property {number} TYPE_INT32=5 TYPE_INT32 value + * @property {number} TYPE_FIXED64=6 TYPE_FIXED64 value + * @property {number} TYPE_FIXED32=7 TYPE_FIXED32 value + * @property {number} TYPE_BOOL=8 TYPE_BOOL value + * @property {number} TYPE_STRING=9 TYPE_STRING value + * @property {number} TYPE_GROUP=10 TYPE_GROUP value + * @property {number} TYPE_MESSAGE=11 TYPE_MESSAGE value + * @property {number} TYPE_BYTES=12 TYPE_BYTES value + * @property {number} TYPE_UINT32=13 TYPE_UINT32 value + * @property {number} TYPE_ENUM=14 TYPE_ENUM value + * @property {number} TYPE_SFIXED32=15 TYPE_SFIXED32 value + * @property {number} TYPE_SFIXED64=16 TYPE_SFIXED64 value + * @property {number} TYPE_SINT32=17 TYPE_SINT32 value + * @property {number} TYPE_SINT64=18 TYPE_SINT64 value + */ + FieldDescriptorProto.Type = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "TYPE_DOUBLE"] = 1; + values[valuesById[2] = "TYPE_FLOAT"] = 2; + values[valuesById[3] = "TYPE_INT64"] = 3; + values[valuesById[4] = "TYPE_UINT64"] = 4; + values[valuesById[5] = "TYPE_INT32"] = 5; + values[valuesById[6] = "TYPE_FIXED64"] = 6; + values[valuesById[7] = "TYPE_FIXED32"] = 7; + values[valuesById[8] = "TYPE_BOOL"] = 8; + values[valuesById[9] = "TYPE_STRING"] = 9; + values[valuesById[10] = "TYPE_GROUP"] = 10; + values[valuesById[11] = "TYPE_MESSAGE"] = 11; + values[valuesById[12] = "TYPE_BYTES"] = 12; + values[valuesById[13] = "TYPE_UINT32"] = 13; + values[valuesById[14] = "TYPE_ENUM"] = 14; + values[valuesById[15] = "TYPE_SFIXED32"] = 15; + values[valuesById[16] = "TYPE_SFIXED64"] = 16; + values[valuesById[17] = "TYPE_SINT32"] = 17; + values[valuesById[18] = "TYPE_SINT64"] = 18; + return values; + })(); - /** - * Verifies a PullRequest message. - * @function verify - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PullRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) - if (typeof message.returnImmediately !== "boolean") - return "returnImmediately: boolean expected"; - if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) - if (!$util.isInteger(message.maxMessages)) - return "maxMessages: integer expected"; - return null; - }; + /** + * Label enum. + * @name google.protobuf.FieldDescriptorProto.Label + * @enum {string} + * @property {number} LABEL_OPTIONAL=1 LABEL_OPTIONAL value + * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value + * @property {number} LABEL_REPEATED=3 LABEL_REPEATED value + */ + FieldDescriptorProto.Label = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "LABEL_OPTIONAL"] = 1; + values[valuesById[2] = "LABEL_REQUIRED"] = 2; + values[valuesById[3] = "LABEL_REPEATED"] = 3; + return values; + })(); - /** - * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PullRequest} PullRequest - */ - PullRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PullRequest) - return object; - var message = new $root.google.pubsub.v1.PullRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.returnImmediately != null) - message.returnImmediately = Boolean(object.returnImmediately); - if (object.maxMessages != null) - message.maxMessages = object.maxMessages | 0; - return message; - }; + return FieldDescriptorProto; + })(); - /** - * Creates a plain object from a PullRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {google.pubsub.v1.PullRequest} message PullRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PullRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.subscription = ""; - object.returnImmediately = false; - object.maxMessages = 0; - } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) - object.returnImmediately = message.returnImmediately; - if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) - object.maxMessages = message.maxMessages; - return object; - }; + protobuf.OneofDescriptorProto = (function() { - /** - * Converts this PullRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PullRequest - * @instance - * @returns {Object.} JSON object - */ - PullRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Properties of an OneofDescriptorProto. + * @memberof google.protobuf + * @interface IOneofDescriptorProto + * @property {string|null} [name] OneofDescriptorProto name + * @property {google.protobuf.IOneofOptions|null} [options] OneofDescriptorProto options + */ - return PullRequest; - })(); + /** + * Constructs a new OneofDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an OneofDescriptorProto. + * @implements IOneofDescriptorProto + * @constructor + * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set + */ + function OneofDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - v1.PullResponse = (function() { + /** + * OneofDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.OneofDescriptorProto + * @instance + */ + OneofDescriptorProto.prototype.name = ""; - /** - * Properties of a PullResponse. - * @memberof google.pubsub.v1 - * @interface IPullResponse - * @property {Array.|null} [receivedMessages] PullResponse receivedMessages - */ + /** + * OneofDescriptorProto options. + * @member {google.protobuf.IOneofOptions|null|undefined} options + * @memberof google.protobuf.OneofDescriptorProto + * @instance + */ + OneofDescriptorProto.prototype.options = null; - /** - * Constructs a new PullResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a PullResponse. - * @implements IPullResponse - * @constructor - * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set - */ - function PullResponse(properties) { - this.receivedMessages = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Creates a new OneofDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto instance + */ + OneofDescriptorProto.create = function create(properties) { + return new OneofDescriptorProto(properties); + }; - /** - * PullResponse receivedMessages. - * @member {Array.} receivedMessages - * @memberof google.pubsub.v1.PullResponse - * @instance - */ - PullResponse.prototype.receivedMessages = $util.emptyArray; + /** + * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.OneofOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; - /** - * Creates a new PullResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.PullResponse} PullResponse instance - */ - PullResponse.create = function create(properties) { - return new PullResponse(properties); - }; + /** + * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PullResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.receivedMessages != null && message.receivedMessages.length) - for (var i = 0; i < message.receivedMessages.length; ++i) - $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.options = $root.google.protobuf.OneofOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PullResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Decodes a PullResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PullResponse} PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PullResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.receivedMessages && message.receivedMessages.length)) - message.receivedMessages = []; - message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Verifies an OneofDescriptorProto message. + * @function verify + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OneofDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.OneofOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; - /** - * Decodes a PullResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PullResponse} PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PullResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + */ + OneofDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.OneofDescriptorProto) + return object; + var message = new $root.google.protobuf.OneofDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.OneofDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.OneofOptions.fromObject(object.options); + } + return message; + }; - /** - * Verifies a PullResponse message. - * @function verify - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PullResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { - if (!Array.isArray(message.receivedMessages)) - return "receivedMessages: array expected"; - for (var i = 0; i < message.receivedMessages.length; ++i) { - var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); - if (error) - return "receivedMessages." + error; - } - } - return null; - }; + /** + * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.OneofDescriptorProto} message OneofDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OneofDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.OneofOptions.toObject(message.options, options); + return object; + }; - /** - * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PullResponse} PullResponse - */ - PullResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PullResponse) - return object; - var message = new $root.google.pubsub.v1.PullResponse(); - if (object.receivedMessages) { - if (!Array.isArray(object.receivedMessages)) - throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: array expected"); - message.receivedMessages = []; - for (var i = 0; i < object.receivedMessages.length; ++i) { - if (typeof object.receivedMessages[i] !== "object") - throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: object expected"); - message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); - } - } - return message; - }; + /** + * Converts this OneofDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.OneofDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + OneofDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a plain object from a PullResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {google.pubsub.v1.PullResponse} message PullResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PullResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.receivedMessages = []; - if (message.receivedMessages && message.receivedMessages.length) { - object.receivedMessages = []; - for (var j = 0; j < message.receivedMessages.length; ++j) - object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); - } - return object; - }; + return OneofDescriptorProto; + })(); - /** - * Converts this PullResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PullResponse - * @instance - * @returns {Object.} JSON object - */ - PullResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + protobuf.EnumDescriptorProto = (function() { - return PullResponse; - })(); + /** + * Properties of an EnumDescriptorProto. + * @memberof google.protobuf + * @interface IEnumDescriptorProto + * @property {string|null} [name] EnumDescriptorProto name + * @property {Array.|null} [value] EnumDescriptorProto value + * @property {google.protobuf.IEnumOptions|null} [options] EnumDescriptorProto options + * @property {Array.|null} [reservedRange] EnumDescriptorProto reservedRange + * @property {Array.|null} [reservedName] EnumDescriptorProto reservedName + */ - v1.ModifyAckDeadlineRequest = (function() { + /** + * Constructs a new EnumDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an EnumDescriptorProto. + * @implements IEnumDescriptorProto + * @constructor + * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set + */ + function EnumDescriptorProto(properties) { + this.value = []; + this.reservedRange = []; + this.reservedName = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Properties of a ModifyAckDeadlineRequest. - * @memberof google.pubsub.v1 - * @interface IModifyAckDeadlineRequest - * @property {string|null} [subscription] ModifyAckDeadlineRequest subscription - * @property {Array.|null} [ackIds] ModifyAckDeadlineRequest ackIds - * @property {number|null} [ackDeadlineSeconds] ModifyAckDeadlineRequest ackDeadlineSeconds - */ + /** + * EnumDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.name = ""; - /** - * Constructs a new ModifyAckDeadlineRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ModifyAckDeadlineRequest. - * @implements IModifyAckDeadlineRequest - * @constructor - * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set - */ - function ModifyAckDeadlineRequest(properties) { - this.ackIds = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * EnumDescriptorProto value. + * @member {Array.} value + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.value = $util.emptyArray; - /** - * ModifyAckDeadlineRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @instance - */ - ModifyAckDeadlineRequest.prototype.subscription = ""; + /** + * EnumDescriptorProto options. + * @member {google.protobuf.IEnumOptions|null|undefined} options + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.options = null; - /** - * ModifyAckDeadlineRequest ackIds. - * @member {Array.} ackIds - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @instance - */ - ModifyAckDeadlineRequest.prototype.ackIds = $util.emptyArray; + /** + * EnumDescriptorProto reservedRange. + * @member {Array.} reservedRange + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.reservedRange = $util.emptyArray; - /** - * ModifyAckDeadlineRequest ackDeadlineSeconds. - * @member {number} ackDeadlineSeconds - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @instance - */ - ModifyAckDeadlineRequest.prototype.ackDeadlineSeconds = 0; + /** + * EnumDescriptorProto reservedName. + * @member {Array.} reservedName + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.reservedName = $util.emptyArray; - /** - * Creates a new ModifyAckDeadlineRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest instance - */ - ModifyAckDeadlineRequest.create = function create(properties) { - return new ModifyAckDeadlineRequest(properties); - }; + /** + * Creates a new EnumDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto instance + */ + EnumDescriptorProto.create = function create(properties) { + return new EnumDescriptorProto(properties); + }; - /** - * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ModifyAckDeadlineRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.ackDeadlineSeconds); - if (message.ackIds != null && message.ackIds.length) - for (var i = 0; i < message.ackIds.length; ++i) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.ackIds[i]); - return writer; - }; + /** + * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.value != null && message.value.length) + for (var i = 0; i < message.value.length; ++i) + $root.google.protobuf.EnumValueDescriptorProto.encode(message.value[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.EnumOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.reservedRange != null && message.reservedRange.length) + for (var i = 0; i < message.reservedRange.length; ++i) + $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.reservedName != null && message.reservedName.length) + for (var i = 0; i < message.reservedName.length; ++i) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.reservedName[i]); + return writer; + }; - /** - * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ModifyAckDeadlineRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ModifyAckDeadlineRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 4: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; - case 3: - message.ackDeadlineSeconds = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.value && message.value.length)) + message.value = []; + message.value.push($root.google.protobuf.EnumValueDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); + break; + case 4: + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ModifyAckDeadlineRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a ModifyAckDeadlineRequest message. - * @function verify - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ModifyAckDeadlineRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.ackIds != null && message.hasOwnProperty("ackIds")) { - if (!Array.isArray(message.ackIds)) - return "ackIds: array expected"; - for (var i = 0; i < message.ackIds.length; ++i) - if (!$util.isString(message.ackIds[i])) - return "ackIds: string[] expected"; + /** + * Verifies an EnumDescriptorProto message. + * @function verify + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.value != null && message.hasOwnProperty("value")) { + if (!Array.isArray(message.value)) + return "value: array expected"; + for (var i = 0; i < message.value.length; ++i) { + var error = $root.google.protobuf.EnumValueDescriptorProto.verify(message.value[i]); + if (error) + return "value." + error; } - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - if (!$util.isInteger(message.ackDeadlineSeconds)) - return "ackDeadlineSeconds: integer expected"; - return null; - }; - - /** - * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest - */ - ModifyAckDeadlineRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ModifyAckDeadlineRequest) - return object; - var message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.ackIds) { - if (!Array.isArray(object.ackIds)) - throw TypeError(".google.pubsub.v1.ModifyAckDeadlineRequest.ackIds: array expected"); - message.ackIds = []; - for (var i = 0; i < object.ackIds.length; ++i) - message.ackIds[i] = String(object.ackIds[i]); + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.EnumOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { + if (!Array.isArray(message.reservedRange)) + return "reservedRange: array expected"; + for (var i = 0; i < message.reservedRange.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.verify(message.reservedRange[i]); + if (error) + return "reservedRange." + error; } - if (object.ackDeadlineSeconds != null) - message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; - return message; - }; + } + if (message.reservedName != null && message.hasOwnProperty("reservedName")) { + if (!Array.isArray(message.reservedName)) + return "reservedName: array expected"; + for (var i = 0; i < message.reservedName.length; ++i) + if (!$util.isString(message.reservedName[i])) + return "reservedName: string[] expected"; + } + return null; + }; - /** - * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {google.pubsub.v1.ModifyAckDeadlineRequest} message ModifyAckDeadlineRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ModifyAckDeadlineRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.ackIds = []; - if (options.defaults) { - object.subscription = ""; - object.ackDeadlineSeconds = 0; + /** + * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + */ + EnumDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumDescriptorProto) + return object; + var message = new $root.google.protobuf.EnumDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.value) { + if (!Array.isArray(object.value)) + throw TypeError(".google.protobuf.EnumDescriptorProto.value: array expected"); + message.value = []; + for (var i = 0; i < object.value.length; ++i) { + if (typeof object.value[i] !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.value: object expected"); + message.value[i] = $root.google.protobuf.EnumValueDescriptorProto.fromObject(object.value[i]); } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - object.ackDeadlineSeconds = message.ackDeadlineSeconds; - if (message.ackIds && message.ackIds.length) { - object.ackIds = []; - for (var j = 0; j < message.ackIds.length; ++j) - object.ackIds[j] = message.ackIds[j]; + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.EnumOptions.fromObject(object.options); + } + if (object.reservedRange) { + if (!Array.isArray(object.reservedRange)) + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: array expected"); + message.reservedRange = []; + for (var i = 0; i < object.reservedRange.length; ++i) { + if (typeof object.reservedRange[i] !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: object expected"); + message.reservedRange[i] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.fromObject(object.reservedRange[i]); } - return object; - }; + } + if (object.reservedName) { + if (!Array.isArray(object.reservedName)) + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedName: array expected"); + message.reservedName = []; + for (var i = 0; i < object.reservedName.length; ++i) + message.reservedName[i] = String(object.reservedName[i]); + } + return message; + }; - /** - * Converts this ModifyAckDeadlineRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @instance - * @returns {Object.} JSON object - */ - ModifyAckDeadlineRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.EnumDescriptorProto} message EnumDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.value = []; + object.reservedRange = []; + object.reservedName = []; + } + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.value && message.value.length) { + object.value = []; + for (var j = 0; j < message.value.length; ++j) + object.value[j] = $root.google.protobuf.EnumValueDescriptorProto.toObject(message.value[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.EnumOptions.toObject(message.options, options); + if (message.reservedRange && message.reservedRange.length) { + object.reservedRange = []; + for (var j = 0; j < message.reservedRange.length; ++j) + object.reservedRange[j] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.toObject(message.reservedRange[j], options); + } + if (message.reservedName && message.reservedName.length) { + object.reservedName = []; + for (var j = 0; j < message.reservedName.length; ++j) + object.reservedName[j] = message.reservedName[j]; + } + return object; + }; - return ModifyAckDeadlineRequest; - })(); + /** + * Converts this EnumDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.EnumDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + EnumDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.AcknowledgeRequest = (function() { + EnumDescriptorProto.EnumReservedRange = (function() { /** - * Properties of an AcknowledgeRequest. - * @memberof google.pubsub.v1 - * @interface IAcknowledgeRequest - * @property {string|null} [subscription] AcknowledgeRequest subscription - * @property {Array.|null} [ackIds] AcknowledgeRequest ackIds + * Properties of an EnumReservedRange. + * @memberof google.protobuf.EnumDescriptorProto + * @interface IEnumReservedRange + * @property {number|null} [start] EnumReservedRange start + * @property {number|null} [end] EnumReservedRange end */ /** - * Constructs a new AcknowledgeRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents an AcknowledgeRequest. - * @implements IAcknowledgeRequest + * Constructs a new EnumReservedRange. + * @memberof google.protobuf.EnumDescriptorProto + * @classdesc Represents an EnumReservedRange. + * @implements IEnumReservedRange * @constructor - * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set */ - function AcknowledgeRequest(properties) { - this.ackIds = []; + function EnumReservedRange(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -7665,91 +7511,88 @@ } /** - * AcknowledgeRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.AcknowledgeRequest + * EnumReservedRange start. + * @member {number} start + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @instance */ - AcknowledgeRequest.prototype.subscription = ""; + EnumReservedRange.prototype.start = 0; /** - * AcknowledgeRequest ackIds. - * @member {Array.} ackIds - * @memberof google.pubsub.v1.AcknowledgeRequest + * EnumReservedRange end. + * @member {number} end + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @instance */ - AcknowledgeRequest.prototype.ackIds = $util.emptyArray; + EnumReservedRange.prototype.end = 0; /** - * Creates a new AcknowledgeRequest instance using the specified properties. + * Creates a new EnumReservedRange instance using the specified properties. * @function create - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static - * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest instance + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange instance */ - AcknowledgeRequest.create = function create(properties) { - return new AcknowledgeRequest(properties); + EnumReservedRange.create = function create(properties) { + return new EnumReservedRange(properties); }; /** - * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static - * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - AcknowledgeRequest.encode = function encode(message, writer) { + EnumReservedRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.ackIds != null && message.ackIds.length) - for (var i = 0; i < message.ackIds.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); return writer; }; /** - * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static - * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - AcknowledgeRequest.encodeDelimited = function encodeDelimited(message, writer) { + EnumReservedRange.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer. + * Decodes an EnumReservedRange message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AcknowledgeRequest.decode = function decode(reader, length) { + EnumReservedRange.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.AcknowledgeRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.subscription = reader.string(); + message.start = reader.int32(); break; case 2: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); + message.end = reader.int32(); break; default: reader.skipType(tag & 7); @@ -7760,2723 +7603,3465 @@ }; /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AcknowledgeRequest.decodeDelimited = function decodeDelimited(reader) { + EnumReservedRange.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an AcknowledgeRequest message. + * Verifies an EnumReservedRange message. * @function verify - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - AcknowledgeRequest.verify = function verify(message) { + EnumReservedRange.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.ackIds != null && message.hasOwnProperty("ackIds")) { - if (!Array.isArray(message.ackIds)) - return "ackIds: array expected"; - for (var i = 0; i < message.ackIds.length; ++i) - if (!$util.isString(message.ackIds[i])) - return "ackIds: string[] expected"; - } + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; return null; }; /** - * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange */ - AcknowledgeRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.AcknowledgeRequest) + EnumReservedRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumDescriptorProto.EnumReservedRange) return object; - var message = new $root.google.pubsub.v1.AcknowledgeRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.ackIds) { - if (!Array.isArray(object.ackIds)) - throw TypeError(".google.pubsub.v1.AcknowledgeRequest.ackIds: array expected"); - message.ackIds = []; - for (var i = 0; i < object.ackIds.length; ++i) - message.ackIds[i] = String(object.ackIds[i]); - } + var message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; return message; }; /** - * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static - * @param {google.pubsub.v1.AcknowledgeRequest} message AcknowledgeRequest + * @param {google.protobuf.EnumDescriptorProto.EnumReservedRange} message EnumReservedRange * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - AcknowledgeRequest.toObject = function toObject(message, options) { + EnumReservedRange.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.ackIds = []; - if (options.defaults) - object.subscription = ""; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.ackIds && message.ackIds.length) { - object.ackIds = []; - for (var j = 0; j < message.ackIds.length; ++j) - object.ackIds[j] = message.ackIds[j]; + if (options.defaults) { + object.start = 0; + object.end = 0; } + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; return object; }; /** - * Converts this AcknowledgeRequest to JSON. + * Converts this EnumReservedRange to JSON. * @function toJSON - * @memberof google.pubsub.v1.AcknowledgeRequest + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @instance * @returns {Object.} JSON object */ - AcknowledgeRequest.prototype.toJSON = function toJSON() { + EnumReservedRange.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return AcknowledgeRequest; + return EnumReservedRange; })(); - v1.StreamingPullRequest = (function() { + return EnumDescriptorProto; + })(); - /** - * Properties of a StreamingPullRequest. - * @memberof google.pubsub.v1 - * @interface IStreamingPullRequest - * @property {string|null} [subscription] StreamingPullRequest subscription - * @property {Array.|null} [ackIds] StreamingPullRequest ackIds - * @property {Array.|null} [modifyDeadlineSeconds] StreamingPullRequest modifyDeadlineSeconds - * @property {Array.|null} [modifyDeadlineAckIds] StreamingPullRequest modifyDeadlineAckIds - * @property {number|null} [streamAckDeadlineSeconds] StreamingPullRequest streamAckDeadlineSeconds - * @property {string|null} [clientId] StreamingPullRequest clientId - */ + protobuf.EnumValueDescriptorProto = (function() { - /** - * Constructs a new StreamingPullRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a StreamingPullRequest. - * @implements IStreamingPullRequest - * @constructor - * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set - */ - function StreamingPullRequest(properties) { - this.ackIds = []; - this.modifyDeadlineSeconds = []; - this.modifyDeadlineAckIds = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of an EnumValueDescriptorProto. + * @memberof google.protobuf + * @interface IEnumValueDescriptorProto + * @property {string|null} [name] EnumValueDescriptorProto name + * @property {number|null} [number] EnumValueDescriptorProto number + * @property {google.protobuf.IEnumValueOptions|null} [options] EnumValueDescriptorProto options + */ - /** - * StreamingPullRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.subscription = ""; + /** + * Constructs a new EnumValueDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an EnumValueDescriptorProto. + * @implements IEnumValueDescriptorProto + * @constructor + * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set + */ + function EnumValueDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * StreamingPullRequest ackIds. - * @member {Array.} ackIds - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.ackIds = $util.emptyArray; + /** + * EnumValueDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.name = ""; + + /** + * EnumValueDescriptorProto number. + * @member {number} number + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.number = 0; + + /** + * EnumValueDescriptorProto options. + * @member {google.protobuf.IEnumValueOptions|null|undefined} options + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.options = null; + + /** + * Creates a new EnumValueDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto instance + */ + EnumValueDescriptorProto.create = function create(properties) { + return new EnumValueDescriptorProto(properties); + }; + + /** + * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.number != null && message.hasOwnProperty("number")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.number); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.EnumValueOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.number = reader.int32(); + break; + case 3: + message.options = $root.google.protobuf.EnumValueOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * StreamingPullRequest modifyDeadlineSeconds. - * @member {Array.} modifyDeadlineSeconds - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.modifyDeadlineSeconds = $util.emptyArray; + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * StreamingPullRequest modifyDeadlineAckIds. - * @member {Array.} modifyDeadlineAckIds - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.modifyDeadlineAckIds = $util.emptyArray; + /** + * Verifies an EnumValueDescriptorProto message. + * @function verify + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumValueDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.number != null && message.hasOwnProperty("number")) + if (!$util.isInteger(message.number)) + return "number: integer expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.EnumValueOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; - /** - * StreamingPullRequest streamAckDeadlineSeconds. - * @member {number} streamAckDeadlineSeconds - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.streamAckDeadlineSeconds = 0; + /** + * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + */ + EnumValueDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumValueDescriptorProto) + return object; + var message = new $root.google.protobuf.EnumValueDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.number != null) + message.number = object.number | 0; + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.EnumValueDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.EnumValueOptions.fromObject(object.options); + } + return message; + }; - /** - * StreamingPullRequest clientId. - * @member {string} clientId - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.clientId = ""; + /** + * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.EnumValueDescriptorProto} message EnumValueDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumValueDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.number = 0; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.number != null && message.hasOwnProperty("number")) + object.number = message.number; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.EnumValueOptions.toObject(message.options, options); + return object; + }; - /** - * Creates a new StreamingPullRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest instance - */ - StreamingPullRequest.create = function create(properties) { - return new StreamingPullRequest(properties); - }; + /** + * Converts this EnumValueDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + EnumValueDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - StreamingPullRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.ackIds != null && message.ackIds.length) - for (var i = 0; i < message.ackIds.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); - if (message.modifyDeadlineSeconds != null && message.modifyDeadlineSeconds.length) { - writer.uint32(/* id 3, wireType 2 =*/26).fork(); - for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) - writer.int32(message.modifyDeadlineSeconds[i]); - writer.ldelim(); - } - if (message.modifyDeadlineAckIds != null && message.modifyDeadlineAckIds.length) - for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.modifyDeadlineAckIds[i]); - if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) - writer.uint32(/* id 5, wireType 0 =*/40).int32(message.streamAckDeadlineSeconds); - if (message.clientId != null && message.hasOwnProperty("clientId")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.clientId); - return writer; - }; + return EnumValueDescriptorProto; + })(); - /** - * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - StreamingPullRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + protobuf.ServiceDescriptorProto = (function() { - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - StreamingPullRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; - case 3: - if (!(message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length)) - message.modifyDeadlineSeconds = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.modifyDeadlineSeconds.push(reader.int32()); - } else - message.modifyDeadlineSeconds.push(reader.int32()); - break; - case 4: - if (!(message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length)) - message.modifyDeadlineAckIds = []; - message.modifyDeadlineAckIds.push(reader.string()); - break; - case 5: - message.streamAckDeadlineSeconds = reader.int32(); - break; - case 6: - message.clientId = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Properties of a ServiceDescriptorProto. + * @memberof google.protobuf + * @interface IServiceDescriptorProto + * @property {string|null} [name] ServiceDescriptorProto name + * @property {Array.|null} [method] ServiceDescriptorProto method + * @property {google.protobuf.IServiceOptions|null} [options] ServiceDescriptorProto options + */ + + /** + * Constructs a new ServiceDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a ServiceDescriptorProto. + * @implements IServiceDescriptorProto + * @constructor + * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set + */ + function ServiceDescriptorProto(properties) { + this.method = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - StreamingPullRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * ServiceDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.name = ""; - /** - * Verifies a StreamingPullRequest message. - * @function verify - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - StreamingPullRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.ackIds != null && message.hasOwnProperty("ackIds")) { - if (!Array.isArray(message.ackIds)) - return "ackIds: array expected"; - for (var i = 0; i < message.ackIds.length; ++i) - if (!$util.isString(message.ackIds[i])) - return "ackIds: string[] expected"; - } - if (message.modifyDeadlineSeconds != null && message.hasOwnProperty("modifyDeadlineSeconds")) { - if (!Array.isArray(message.modifyDeadlineSeconds)) - return "modifyDeadlineSeconds: array expected"; - for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) - if (!$util.isInteger(message.modifyDeadlineSeconds[i])) - return "modifyDeadlineSeconds: integer[] expected"; - } - if (message.modifyDeadlineAckIds != null && message.hasOwnProperty("modifyDeadlineAckIds")) { - if (!Array.isArray(message.modifyDeadlineAckIds)) - return "modifyDeadlineAckIds: array expected"; - for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) - if (!$util.isString(message.modifyDeadlineAckIds[i])) - return "modifyDeadlineAckIds: string[] expected"; - } - if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) - if (!$util.isInteger(message.streamAckDeadlineSeconds)) - return "streamAckDeadlineSeconds: integer expected"; - if (message.clientId != null && message.hasOwnProperty("clientId")) - if (!$util.isString(message.clientId)) - return "clientId: string expected"; - return null; - }; + /** + * ServiceDescriptorProto method. + * @member {Array.} method + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.method = $util.emptyArray; - /** - * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest - */ - StreamingPullRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.StreamingPullRequest) - return object; - var message = new $root.google.pubsub.v1.StreamingPullRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.ackIds) { - if (!Array.isArray(object.ackIds)) - throw TypeError(".google.pubsub.v1.StreamingPullRequest.ackIds: array expected"); - message.ackIds = []; - for (var i = 0; i < object.ackIds.length; ++i) - message.ackIds[i] = String(object.ackIds[i]); - } - if (object.modifyDeadlineSeconds) { - if (!Array.isArray(object.modifyDeadlineSeconds)) - throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineSeconds: array expected"); - message.modifyDeadlineSeconds = []; - for (var i = 0; i < object.modifyDeadlineSeconds.length; ++i) - message.modifyDeadlineSeconds[i] = object.modifyDeadlineSeconds[i] | 0; - } - if (object.modifyDeadlineAckIds) { - if (!Array.isArray(object.modifyDeadlineAckIds)) - throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineAckIds: array expected"); - message.modifyDeadlineAckIds = []; - for (var i = 0; i < object.modifyDeadlineAckIds.length; ++i) - message.modifyDeadlineAckIds[i] = String(object.modifyDeadlineAckIds[i]); - } - if (object.streamAckDeadlineSeconds != null) - message.streamAckDeadlineSeconds = object.streamAckDeadlineSeconds | 0; - if (object.clientId != null) - message.clientId = String(object.clientId); - return message; - }; + /** + * ServiceDescriptorProto options. + * @member {google.protobuf.IServiceOptions|null|undefined} options + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.options = null; - /** - * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {google.pubsub.v1.StreamingPullRequest} message StreamingPullRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - StreamingPullRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.ackIds = []; - object.modifyDeadlineSeconds = []; - object.modifyDeadlineAckIds = []; - } - if (options.defaults) { - object.subscription = ""; - object.streamAckDeadlineSeconds = 0; - object.clientId = ""; - } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.ackIds && message.ackIds.length) { - object.ackIds = []; - for (var j = 0; j < message.ackIds.length; ++j) - object.ackIds[j] = message.ackIds[j]; - } - if (message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length) { - object.modifyDeadlineSeconds = []; - for (var j = 0; j < message.modifyDeadlineSeconds.length; ++j) - object.modifyDeadlineSeconds[j] = message.modifyDeadlineSeconds[j]; + /** + * Creates a new ServiceDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto instance + */ + ServiceDescriptorProto.create = function create(properties) { + return new ServiceDescriptorProto(properties); + }; + + /** + * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.method != null && message.method.length) + for (var i = 0; i < message.method.length; ++i) + $root.google.protobuf.MethodDescriptorProto.encode(message.method[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.ServiceOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.method && message.method.length)) + message.method = []; + message.method.push($root.google.protobuf.MethodDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + message.options = $root.google.protobuf.ServiceOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; } - if (message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length) { - object.modifyDeadlineAckIds = []; - for (var j = 0; j < message.modifyDeadlineAckIds.length; ++j) - object.modifyDeadlineAckIds[j] = message.modifyDeadlineAckIds[j]; + } + return message; + }; + + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ServiceDescriptorProto message. + * @function verify + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ServiceDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.method != null && message.hasOwnProperty("method")) { + if (!Array.isArray(message.method)) + return "method: array expected"; + for (var i = 0; i < message.method.length; ++i) { + var error = $root.google.protobuf.MethodDescriptorProto.verify(message.method[i]); + if (error) + return "method." + error; } - if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) - object.streamAckDeadlineSeconds = message.streamAckDeadlineSeconds; - if (message.clientId != null && message.hasOwnProperty("clientId")) - object.clientId = message.clientId; + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.ServiceOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; + + /** + * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + */ + ServiceDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ServiceDescriptorProto) return object; - }; + var message = new $root.google.protobuf.ServiceDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.method) { + if (!Array.isArray(object.method)) + throw TypeError(".google.protobuf.ServiceDescriptorProto.method: array expected"); + message.method = []; + for (var i = 0; i < object.method.length; ++i) { + if (typeof object.method[i] !== "object") + throw TypeError(".google.protobuf.ServiceDescriptorProto.method: object expected"); + message.method[i] = $root.google.protobuf.MethodDescriptorProto.fromObject(object.method[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.ServiceDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.ServiceOptions.fromObject(object.options); + } + return message; + }; - /** - * Converts this StreamingPullRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - * @returns {Object.} JSON object - */ - StreamingPullRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.ServiceDescriptorProto} message ServiceDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ServiceDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.method = []; + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.method && message.method.length) { + object.method = []; + for (var j = 0; j < message.method.length; ++j) + object.method[j] = $root.google.protobuf.MethodDescriptorProto.toObject(message.method[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.ServiceOptions.toObject(message.options, options); + return object; + }; - return StreamingPullRequest; - })(); + /** + * Converts this ServiceDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + ServiceDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.StreamingPullResponse = (function() { + return ServiceDescriptorProto; + })(); - /** - * Properties of a StreamingPullResponse. - * @memberof google.pubsub.v1 - * @interface IStreamingPullResponse - * @property {Array.|null} [receivedMessages] StreamingPullResponse receivedMessages - */ + protobuf.MethodDescriptorProto = (function() { - /** - * Constructs a new StreamingPullResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a StreamingPullResponse. - * @implements IStreamingPullResponse - * @constructor - * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set - */ - function StreamingPullResponse(properties) { - this.receivedMessages = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of a MethodDescriptorProto. + * @memberof google.protobuf + * @interface IMethodDescriptorProto + * @property {string|null} [name] MethodDescriptorProto name + * @property {string|null} [inputType] MethodDescriptorProto inputType + * @property {string|null} [outputType] MethodDescriptorProto outputType + * @property {google.protobuf.IMethodOptions|null} [options] MethodDescriptorProto options + * @property {boolean|null} [clientStreaming] MethodDescriptorProto clientStreaming + * @property {boolean|null} [serverStreaming] MethodDescriptorProto serverStreaming + */ - /** - * StreamingPullResponse receivedMessages. - * @member {Array.} receivedMessages - * @memberof google.pubsub.v1.StreamingPullResponse - * @instance - */ - StreamingPullResponse.prototype.receivedMessages = $util.emptyArray; + /** + * Constructs a new MethodDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a MethodDescriptorProto. + * @implements IMethodDescriptorProto + * @constructor + * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set + */ + function MethodDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a new StreamingPullResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse instance - */ - StreamingPullResponse.create = function create(properties) { - return new StreamingPullResponse(properties); - }; + /** + * MethodDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.name = ""; - /** - * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - StreamingPullResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.receivedMessages != null && message.receivedMessages.length) - for (var i = 0; i < message.receivedMessages.length; ++i) - $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + /** + * MethodDescriptorProto inputType. + * @member {string} inputType + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.inputType = ""; + + /** + * MethodDescriptorProto outputType. + * @member {string} outputType + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.outputType = ""; + + /** + * MethodDescriptorProto options. + * @member {google.protobuf.IMethodOptions|null|undefined} options + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.options = null; + + /** + * MethodDescriptorProto clientStreaming. + * @member {boolean} clientStreaming + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.clientStreaming = false; + + /** + * MethodDescriptorProto serverStreaming. + * @member {boolean} serverStreaming + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.serverStreaming = false; - /** - * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - StreamingPullResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates a new MethodDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto instance + */ + MethodDescriptorProto.create = function create(properties) { + return new MethodDescriptorProto(properties); + }; - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - StreamingPullResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.receivedMessages && message.receivedMessages.length)) - message.receivedMessages = []; - message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.inputType != null && message.hasOwnProperty("inputType")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.inputType); + if (message.outputType != null && message.hasOwnProperty("outputType")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputType); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.MethodOptions.encode(message.options, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + writer.uint32(/* id 5, wireType 0 =*/40).bool(message.clientStreaming); + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + writer.uint32(/* id 6, wireType 0 =*/48).bool(message.serverStreaming); + return writer; + }; - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - StreamingPullResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Verifies a StreamingPullResponse message. - * @function verify - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - StreamingPullResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { - if (!Array.isArray(message.receivedMessages)) - return "receivedMessages: array expected"; - for (var i = 0; i < message.receivedMessages.length; ++i) { - var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); - if (error) - return "receivedMessages." + error; - } + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.inputType = reader.string(); + break; + case 3: + message.outputType = reader.string(); + break; + case 4: + message.options = $root.google.protobuf.MethodOptions.decode(reader, reader.uint32()); + break; + case 5: + message.clientStreaming = reader.bool(); + break; + case 6: + message.serverStreaming = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; } - return null; - }; + } + return message; + }; - /** - * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse - */ - StreamingPullResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.StreamingPullResponse) - return object; - var message = new $root.google.pubsub.v1.StreamingPullResponse(); - if (object.receivedMessages) { - if (!Array.isArray(object.receivedMessages)) - throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: array expected"); - message.receivedMessages = []; - for (var i = 0; i < object.receivedMessages.length; ++i) { - if (typeof object.receivedMessages[i] !== "object") - throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: object expected"); - message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); - } - } - return message; - }; + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {google.pubsub.v1.StreamingPullResponse} message StreamingPullResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - StreamingPullResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.receivedMessages = []; - if (message.receivedMessages && message.receivedMessages.length) { - object.receivedMessages = []; - for (var j = 0; j < message.receivedMessages.length; ++j) - object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); - } + /** + * Verifies a MethodDescriptorProto message. + * @function verify + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MethodDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.inputType != null && message.hasOwnProperty("inputType")) + if (!$util.isString(message.inputType)) + return "inputType: string expected"; + if (message.outputType != null && message.hasOwnProperty("outputType")) + if (!$util.isString(message.outputType)) + return "outputType: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.MethodOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + if (typeof message.clientStreaming !== "boolean") + return "clientStreaming: boolean expected"; + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + if (typeof message.serverStreaming !== "boolean") + return "serverStreaming: boolean expected"; + return null; + }; + + /** + * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + */ + MethodDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MethodDescriptorProto) return object; - }; + var message = new $root.google.protobuf.MethodDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.inputType != null) + message.inputType = String(object.inputType); + if (object.outputType != null) + message.outputType = String(object.outputType); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.MethodDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.MethodOptions.fromObject(object.options); + } + if (object.clientStreaming != null) + message.clientStreaming = Boolean(object.clientStreaming); + if (object.serverStreaming != null) + message.serverStreaming = Boolean(object.serverStreaming); + return message; + }; - /** - * Converts this StreamingPullResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.StreamingPullResponse - * @instance - * @returns {Object.} JSON object - */ - StreamingPullResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.MethodDescriptorProto} message MethodDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MethodDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.inputType = ""; + object.outputType = ""; + object.options = null; + object.clientStreaming = false; + object.serverStreaming = false; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.inputType != null && message.hasOwnProperty("inputType")) + object.inputType = message.inputType; + if (message.outputType != null && message.hasOwnProperty("outputType")) + object.outputType = message.outputType; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.MethodOptions.toObject(message.options, options); + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + object.clientStreaming = message.clientStreaming; + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + object.serverStreaming = message.serverStreaming; + return object; + }; - return StreamingPullResponse; - })(); + /** + * Converts this MethodDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.MethodDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + MethodDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.CreateSnapshotRequest = (function() { + return MethodDescriptorProto; + })(); - /** - * Properties of a CreateSnapshotRequest. - * @memberof google.pubsub.v1 - * @interface ICreateSnapshotRequest - * @property {string|null} [name] CreateSnapshotRequest name - * @property {string|null} [subscription] CreateSnapshotRequest subscription - * @property {Object.|null} [labels] CreateSnapshotRequest labels - */ + protobuf.FileOptions = (function() { - /** - * Constructs a new CreateSnapshotRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a CreateSnapshotRequest. - * @implements ICreateSnapshotRequest - * @constructor - * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set - */ - function CreateSnapshotRequest(properties) { - this.labels = {}; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of a FileOptions. + * @memberof google.protobuf + * @interface IFileOptions + * @property {string|null} [javaPackage] FileOptions javaPackage + * @property {string|null} [javaOuterClassname] FileOptions javaOuterClassname + * @property {boolean|null} [javaMultipleFiles] FileOptions javaMultipleFiles + * @property {boolean|null} [javaGenerateEqualsAndHash] FileOptions javaGenerateEqualsAndHash + * @property {boolean|null} [javaStringCheckUtf8] FileOptions javaStringCheckUtf8 + * @property {google.protobuf.FileOptions.OptimizeMode|null} [optimizeFor] FileOptions optimizeFor + * @property {string|null} [goPackage] FileOptions goPackage + * @property {boolean|null} [ccGenericServices] FileOptions ccGenericServices + * @property {boolean|null} [javaGenericServices] FileOptions javaGenericServices + * @property {boolean|null} [pyGenericServices] FileOptions pyGenericServices + * @property {boolean|null} [phpGenericServices] FileOptions phpGenericServices + * @property {boolean|null} [deprecated] FileOptions deprecated + * @property {boolean|null} [ccEnableArenas] FileOptions ccEnableArenas + * @property {string|null} [objcClassPrefix] FileOptions objcClassPrefix + * @property {string|null} [csharpNamespace] FileOptions csharpNamespace + * @property {string|null} [swiftPrefix] FileOptions swiftPrefix + * @property {string|null} [phpClassPrefix] FileOptions phpClassPrefix + * @property {string|null} [phpNamespace] FileOptions phpNamespace + * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace + * @property {string|null} [rubyPackage] FileOptions rubyPackage + * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption + * @property {Array.|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition + */ - /** - * CreateSnapshotRequest name. - * @member {string} name - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @instance - */ - CreateSnapshotRequest.prototype.name = ""; + /** + * Constructs a new FileOptions. + * @memberof google.protobuf + * @classdesc Represents a FileOptions. + * @implements IFileOptions + * @constructor + * @param {google.protobuf.IFileOptions=} [properties] Properties to set + */ + function FileOptions(properties) { + this.uninterpretedOption = []; + this[".google.api.resourceDefinition"] = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * CreateSnapshotRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @instance - */ - CreateSnapshotRequest.prototype.subscription = ""; + /** + * FileOptions javaPackage. + * @member {string} javaPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaPackage = ""; - /** - * CreateSnapshotRequest labels. - * @member {Object.} labels - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @instance - */ - CreateSnapshotRequest.prototype.labels = $util.emptyObject; + /** + * FileOptions javaOuterClassname. + * @member {string} javaOuterClassname + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaOuterClassname = ""; - /** - * Creates a new CreateSnapshotRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest instance - */ - CreateSnapshotRequest.create = function create(properties) { - return new CreateSnapshotRequest(properties); - }; + /** + * FileOptions javaMultipleFiles. + * @member {boolean} javaMultipleFiles + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaMultipleFiles = false; - /** - * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CreateSnapshotRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.subscription); - if (message.labels != null && message.hasOwnProperty("labels")) - for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) - writer.uint32(/* id 3, wireType 2 =*/26).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - return writer; - }; + /** + * FileOptions javaGenerateEqualsAndHash. + * @member {boolean} javaGenerateEqualsAndHash + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaGenerateEqualsAndHash = false; + + /** + * FileOptions javaStringCheckUtf8. + * @member {boolean} javaStringCheckUtf8 + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaStringCheckUtf8 = false; + + /** + * FileOptions optimizeFor. + * @member {google.protobuf.FileOptions.OptimizeMode} optimizeFor + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.optimizeFor = 1; - /** - * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CreateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * FileOptions goPackage. + * @member {string} goPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.goPackage = ""; - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CreateSnapshotRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key; - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.subscription = reader.string(); - break; - case 3: - reader.skip().pos++; - if (message.labels === $util.emptyObject) - message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * FileOptions ccGenericServices. + * @member {boolean} ccGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.ccGenericServices = false; - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CreateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * FileOptions javaGenericServices. + * @member {boolean} javaGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaGenericServices = false; - /** - * Verifies a CreateSnapshotRequest message. - * @function verify - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - CreateSnapshotRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.labels != null && message.hasOwnProperty("labels")) { - if (!$util.isObject(message.labels)) - return "labels: object expected"; - var key = Object.keys(message.labels); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.labels[key[i]])) - return "labels: string{k:string} expected"; - } - return null; - }; + /** + * FileOptions pyGenericServices. + * @member {boolean} pyGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.pyGenericServices = false; - /** - * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest - */ - CreateSnapshotRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.CreateSnapshotRequest) - return object; - var message = new $root.google.pubsub.v1.CreateSnapshotRequest(); - if (object.name != null) - message.name = String(object.name); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.labels) { - if (typeof object.labels !== "object") - throw TypeError(".google.pubsub.v1.CreateSnapshotRequest.labels: object expected"); - message.labels = {}; - for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) - message.labels[keys[i]] = String(object.labels[keys[i]]); - } - return message; - }; + /** + * FileOptions phpGenericServices. + * @member {boolean} phpGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpGenericServices = false; - /** - * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {google.pubsub.v1.CreateSnapshotRequest} message CreateSnapshotRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - CreateSnapshotRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.objects || options.defaults) - object.labels = {}; - if (options.defaults) { - object.name = ""; - object.subscription = ""; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - var keys2; - if (message.labels && (keys2 = Object.keys(message.labels)).length) { - object.labels = {}; - for (var j = 0; j < keys2.length; ++j) - object.labels[keys2[j]] = message.labels[keys2[j]]; - } - return object; - }; + /** + * FileOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.deprecated = false; - /** - * Converts this CreateSnapshotRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @instance - * @returns {Object.} JSON object - */ - CreateSnapshotRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * FileOptions ccEnableArenas. + * @member {boolean} ccEnableArenas + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.ccEnableArenas = false; - return CreateSnapshotRequest; - })(); + /** + * FileOptions objcClassPrefix. + * @member {string} objcClassPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.objcClassPrefix = ""; - v1.UpdateSnapshotRequest = (function() { + /** + * FileOptions csharpNamespace. + * @member {string} csharpNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.csharpNamespace = ""; - /** - * Properties of an UpdateSnapshotRequest. - * @memberof google.pubsub.v1 - * @interface IUpdateSnapshotRequest - * @property {google.pubsub.v1.ISnapshot|null} [snapshot] UpdateSnapshotRequest snapshot - * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSnapshotRequest updateMask - */ + /** + * FileOptions swiftPrefix. + * @member {string} swiftPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.swiftPrefix = ""; + + /** + * FileOptions phpClassPrefix. + * @member {string} phpClassPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpClassPrefix = ""; + + /** + * FileOptions phpNamespace. + * @member {string} phpNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpNamespace = ""; - /** - * Constructs a new UpdateSnapshotRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents an UpdateSnapshotRequest. - * @implements IUpdateSnapshotRequest - * @constructor - * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set - */ - function UpdateSnapshotRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * FileOptions phpMetadataNamespace. + * @member {string} phpMetadataNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpMetadataNamespace = ""; - /** - * UpdateSnapshotRequest snapshot. - * @member {google.pubsub.v1.ISnapshot|null|undefined} snapshot - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @instance - */ - UpdateSnapshotRequest.prototype.snapshot = null; + /** + * FileOptions rubyPackage. + * @member {string} rubyPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.rubyPackage = ""; - /** - * UpdateSnapshotRequest updateMask. - * @member {google.protobuf.IFieldMask|null|undefined} updateMask - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @instance - */ - UpdateSnapshotRequest.prototype.updateMask = null; + /** + * FileOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Creates a new UpdateSnapshotRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest instance - */ - UpdateSnapshotRequest.create = function create(properties) { - return new UpdateSnapshotRequest(properties); - }; + /** + * FileOptions .google.api.resourceDefinition. + * @member {Array.} .google.api.resourceDefinition + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype[".google.api.resourceDefinition"] = $util.emptyArray; - /** - * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UpdateSnapshotRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - $root.google.pubsub.v1.Snapshot.encode(message.snapshot, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; + /** + * Creates a new FileOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions=} [properties] Properties to set + * @returns {google.protobuf.FileOptions} FileOptions instance + */ + FileOptions.create = function create(properties) { + return new FileOptions(properties); + }; - /** - * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UpdateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.javaPackage); + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + writer.uint32(/* id 8, wireType 2 =*/66).string(message.javaOuterClassname); + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + writer.uint32(/* id 9, wireType 0 =*/72).int32(message.optimizeFor); + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.javaMultipleFiles); + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + writer.uint32(/* id 11, wireType 2 =*/90).string(message.goPackage); + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + writer.uint32(/* id 16, wireType 0 =*/128).bool(message.ccGenericServices); + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + writer.uint32(/* id 17, wireType 0 =*/136).bool(message.javaGenericServices); + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + writer.uint32(/* id 18, wireType 0 =*/144).bool(message.pyGenericServices); + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + writer.uint32(/* id 20, wireType 0 =*/160).bool(message.javaGenerateEqualsAndHash); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 23, wireType 0 =*/184).bool(message.deprecated); + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + writer.uint32(/* id 27, wireType 0 =*/216).bool(message.javaStringCheckUtf8); + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + writer.uint32(/* id 31, wireType 0 =*/248).bool(message.ccEnableArenas); + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + writer.uint32(/* id 36, wireType 2 =*/290).string(message.objcClassPrefix); + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + writer.uint32(/* id 37, wireType 2 =*/298).string(message.csharpNamespace); + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + writer.uint32(/* id 39, wireType 2 =*/314).string(message.swiftPrefix); + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.resourceDefinition"] != null && message[".google.api.resourceDefinition"].length) + for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) + $root.google.api.ResourceDescriptor.encode(message[".google.api.resourceDefinition"][i], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); + return writer; + }; - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UpdateSnapshotRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.snapshot = $root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FileOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileOptions} FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.javaPackage = reader.string(); + break; + case 8: + message.javaOuterClassname = reader.string(); + break; + case 10: + message.javaMultipleFiles = reader.bool(); + break; + case 20: + message.javaGenerateEqualsAndHash = reader.bool(); + break; + case 27: + message.javaStringCheckUtf8 = reader.bool(); + break; + case 9: + message.optimizeFor = reader.int32(); + break; + case 11: + message.goPackage = reader.string(); + break; + case 16: + message.ccGenericServices = reader.bool(); + break; + case 17: + message.javaGenericServices = reader.bool(); + break; + case 18: + message.pyGenericServices = reader.bool(); + break; + case 42: + message.phpGenericServices = reader.bool(); + break; + case 23: + message.deprecated = reader.bool(); + break; + case 31: + message.ccEnableArenas = reader.bool(); + break; + case 36: + message.objcClassPrefix = reader.string(); + break; + case 37: + message.csharpNamespace = reader.string(); + break; + case 39: + message.swiftPrefix = reader.string(); + break; + case 40: + message.phpClassPrefix = reader.string(); + break; + case 41: + message.phpNamespace = reader.string(); + break; + case 44: + message.phpMetadataNamespace = reader.string(); + break; + case 45: + message.rubyPackage = reader.string(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1053: + if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length)) + message[".google.api.resourceDefinition"] = []; + message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UpdateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a FileOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileOptions} FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies an UpdateSnapshotRequest message. - * @function verify - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - UpdateSnapshotRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) { - var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshot); + /** + * Verifies a FileOptions message. + * @function verify + * @memberof google.protobuf.FileOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + if (!$util.isString(message.javaPackage)) + return "javaPackage: string expected"; + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + if (!$util.isString(message.javaOuterClassname)) + return "javaOuterClassname: string expected"; + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + if (typeof message.javaMultipleFiles !== "boolean") + return "javaMultipleFiles: boolean expected"; + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + if (typeof message.javaGenerateEqualsAndHash !== "boolean") + return "javaGenerateEqualsAndHash: boolean expected"; + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + if (typeof message.javaStringCheckUtf8 !== "boolean") + return "javaStringCheckUtf8: boolean expected"; + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + switch (message.optimizeFor) { + default: + return "optimizeFor: enum value expected"; + case 1: + case 2: + case 3: + break; + } + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + if (!$util.isString(message.goPackage)) + return "goPackage: string expected"; + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + if (typeof message.ccGenericServices !== "boolean") + return "ccGenericServices: boolean expected"; + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + if (typeof message.javaGenericServices !== "boolean") + return "javaGenericServices: boolean expected"; + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + if (typeof message.pyGenericServices !== "boolean") + return "pyGenericServices: boolean expected"; + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + if (typeof message.phpGenericServices !== "boolean") + return "phpGenericServices: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + if (typeof message.ccEnableArenas !== "boolean") + return "ccEnableArenas: boolean expected"; + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + if (!$util.isString(message.objcClassPrefix)) + return "objcClassPrefix: string expected"; + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + if (!$util.isString(message.csharpNamespace)) + return "csharpNamespace: string expected"; + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + if (!$util.isString(message.swiftPrefix)) + return "swiftPrefix: string expected"; + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + if (!$util.isString(message.phpClassPrefix)) + return "phpClassPrefix: string expected"; + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + if (!$util.isString(message.phpNamespace)) + return "phpNamespace: string expected"; + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + if (!$util.isString(message.phpMetadataNamespace)) + return "phpMetadataNamespace: string expected"; + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + if (!$util.isString(message.rubyPackage)) + return "rubyPackage: string expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); if (error) - return "snapshot." + error; + return "uninterpretedOption." + error; } - if (message.updateMask != null && message.hasOwnProperty("updateMask")) { - var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + } + if (message[".google.api.resourceDefinition"] != null && message.hasOwnProperty(".google.api.resourceDefinition")) { + if (!Array.isArray(message[".google.api.resourceDefinition"])) + return ".google.api.resourceDefinition: array expected"; + for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) { + var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resourceDefinition"][i]); if (error) - return "updateMask." + error; + return ".google.api.resourceDefinition." + error; } - return null; - }; + } + return null; + }; - /** - * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest - */ - UpdateSnapshotRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.UpdateSnapshotRequest) - return object; - var message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); - if (object.snapshot != null) { - if (typeof object.snapshot !== "object") - throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.snapshot: object expected"); - message.snapshot = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshot); + /** + * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileOptions} FileOptions + */ + FileOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileOptions) + return object; + var message = new $root.google.protobuf.FileOptions(); + if (object.javaPackage != null) + message.javaPackage = String(object.javaPackage); + if (object.javaOuterClassname != null) + message.javaOuterClassname = String(object.javaOuterClassname); + if (object.javaMultipleFiles != null) + message.javaMultipleFiles = Boolean(object.javaMultipleFiles); + if (object.javaGenerateEqualsAndHash != null) + message.javaGenerateEqualsAndHash = Boolean(object.javaGenerateEqualsAndHash); + if (object.javaStringCheckUtf8 != null) + message.javaStringCheckUtf8 = Boolean(object.javaStringCheckUtf8); + switch (object.optimizeFor) { + case "SPEED": + case 1: + message.optimizeFor = 1; + break; + case "CODE_SIZE": + case 2: + message.optimizeFor = 2; + break; + case "LITE_RUNTIME": + case 3: + message.optimizeFor = 3; + break; + } + if (object.goPackage != null) + message.goPackage = String(object.goPackage); + if (object.ccGenericServices != null) + message.ccGenericServices = Boolean(object.ccGenericServices); + if (object.javaGenericServices != null) + message.javaGenericServices = Boolean(object.javaGenericServices); + if (object.pyGenericServices != null) + message.pyGenericServices = Boolean(object.pyGenericServices); + if (object.phpGenericServices != null) + message.phpGenericServices = Boolean(object.phpGenericServices); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.ccEnableArenas != null) + message.ccEnableArenas = Boolean(object.ccEnableArenas); + if (object.objcClassPrefix != null) + message.objcClassPrefix = String(object.objcClassPrefix); + if (object.csharpNamespace != null) + message.csharpNamespace = String(object.csharpNamespace); + if (object.swiftPrefix != null) + message.swiftPrefix = String(object.swiftPrefix); + if (object.phpClassPrefix != null) + message.phpClassPrefix = String(object.phpClassPrefix); + if (object.phpNamespace != null) + message.phpNamespace = String(object.phpNamespace); + if (object.phpMetadataNamespace != null) + message.phpMetadataNamespace = String(object.phpMetadataNamespace); + if (object.rubyPackage != null) + message.rubyPackage = String(object.rubyPackage); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } - if (object.updateMask != null) { - if (typeof object.updateMask !== "object") - throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.updateMask: object expected"); - message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + } + if (object[".google.api.resourceDefinition"]) { + if (!Array.isArray(object[".google.api.resourceDefinition"])) + throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: array expected"); + message[".google.api.resourceDefinition"] = []; + for (var i = 0; i < object[".google.api.resourceDefinition"].length; ++i) { + if (typeof object[".google.api.resourceDefinition"][i] !== "object") + throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: object expected"); + message[".google.api.resourceDefinition"][i] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resourceDefinition"][i]); } - return message; - }; + } + return message; + }; - /** - * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {google.pubsub.v1.UpdateSnapshotRequest} message UpdateSnapshotRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - UpdateSnapshotRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.snapshot = null; - object.updateMask = null; - } - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - object.snapshot = $root.google.pubsub.v1.Snapshot.toObject(message.snapshot, options); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); - return object; - }; + /** + * Creates a plain object from a FileOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.FileOptions} message FileOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.uninterpretedOption = []; + object[".google.api.resourceDefinition"] = []; + } + if (options.defaults) { + object.javaPackage = ""; + object.javaOuterClassname = ""; + object.optimizeFor = options.enums === String ? "SPEED" : 1; + object.javaMultipleFiles = false; + object.goPackage = ""; + object.ccGenericServices = false; + object.javaGenericServices = false; + object.pyGenericServices = false; + object.javaGenerateEqualsAndHash = false; + object.deprecated = false; + object.javaStringCheckUtf8 = false; + object.ccEnableArenas = false; + object.objcClassPrefix = ""; + object.csharpNamespace = ""; + object.swiftPrefix = ""; + object.phpClassPrefix = ""; + object.phpNamespace = ""; + object.phpGenericServices = false; + object.phpMetadataNamespace = ""; + object.rubyPackage = ""; + } + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + object.javaPackage = message.javaPackage; + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + object.javaOuterClassname = message.javaOuterClassname; + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + object.optimizeFor = options.enums === String ? $root.google.protobuf.FileOptions.OptimizeMode[message.optimizeFor] : message.optimizeFor; + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + object.javaMultipleFiles = message.javaMultipleFiles; + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + object.goPackage = message.goPackage; + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + object.ccGenericServices = message.ccGenericServices; + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + object.javaGenericServices = message.javaGenericServices; + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + object.pyGenericServices = message.pyGenericServices; + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + object.javaGenerateEqualsAndHash = message.javaGenerateEqualsAndHash; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + object.javaStringCheckUtf8 = message.javaStringCheckUtf8; + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + object.ccEnableArenas = message.ccEnableArenas; + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + object.objcClassPrefix = message.objcClassPrefix; + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + object.csharpNamespace = message.csharpNamespace; + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + object.swiftPrefix = message.swiftPrefix; + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + object.phpClassPrefix = message.phpClassPrefix; + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + object.phpNamespace = message.phpNamespace; + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + object.phpGenericServices = message.phpGenericServices; + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + object.phpMetadataNamespace = message.phpMetadataNamespace; + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + object.rubyPackage = message.rubyPackage; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length) { + object[".google.api.resourceDefinition"] = []; + for (var j = 0; j < message[".google.api.resourceDefinition"].length; ++j) + object[".google.api.resourceDefinition"][j] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resourceDefinition"][j], options); + } + return object; + }; - /** - * Converts this UpdateSnapshotRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @instance - * @returns {Object.} JSON object - */ - UpdateSnapshotRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this FileOptions to JSON. + * @function toJSON + * @memberof google.protobuf.FileOptions + * @instance + * @returns {Object.} JSON object + */ + FileOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return UpdateSnapshotRequest; + /** + * OptimizeMode enum. + * @name google.protobuf.FileOptions.OptimizeMode + * @enum {string} + * @property {number} SPEED=1 SPEED value + * @property {number} CODE_SIZE=2 CODE_SIZE value + * @property {number} LITE_RUNTIME=3 LITE_RUNTIME value + */ + FileOptions.OptimizeMode = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "SPEED"] = 1; + values[valuesById[2] = "CODE_SIZE"] = 2; + values[valuesById[3] = "LITE_RUNTIME"] = 3; + return values; })(); - v1.Snapshot = (function() { - - /** - * Properties of a Snapshot. - * @memberof google.pubsub.v1 - * @interface ISnapshot - * @property {string|null} [name] Snapshot name - * @property {string|null} [topic] Snapshot topic - * @property {google.protobuf.ITimestamp|null} [expireTime] Snapshot expireTime - * @property {Object.|null} [labels] Snapshot labels - */ - - /** - * Constructs a new Snapshot. - * @memberof google.pubsub.v1 - * @classdesc Represents a Snapshot. - * @implements ISnapshot - * @constructor - * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set - */ - function Snapshot(properties) { - this.labels = {}; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + return FileOptions; + })(); - /** - * Snapshot name. - * @member {string} name - * @memberof google.pubsub.v1.Snapshot - * @instance - */ - Snapshot.prototype.name = ""; + protobuf.MessageOptions = (function() { - /** - * Snapshot topic. - * @member {string} topic - * @memberof google.pubsub.v1.Snapshot - * @instance - */ - Snapshot.prototype.topic = ""; + /** + * Properties of a MessageOptions. + * @memberof google.protobuf + * @interface IMessageOptions + * @property {boolean|null} [messageSetWireFormat] MessageOptions messageSetWireFormat + * @property {boolean|null} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor + * @property {boolean|null} [deprecated] MessageOptions deprecated + * @property {boolean|null} [mapEntry] MessageOptions mapEntry + * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption + * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource + */ - /** - * Snapshot expireTime. - * @member {google.protobuf.ITimestamp|null|undefined} expireTime - * @memberof google.pubsub.v1.Snapshot - * @instance - */ - Snapshot.prototype.expireTime = null; + /** + * Constructs a new MessageOptions. + * @memberof google.protobuf + * @classdesc Represents a MessageOptions. + * @implements IMessageOptions + * @constructor + * @param {google.protobuf.IMessageOptions=} [properties] Properties to set + */ + function MessageOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Snapshot labels. - * @member {Object.} labels - * @memberof google.pubsub.v1.Snapshot - * @instance - */ - Snapshot.prototype.labels = $util.emptyObject; + /** + * MessageOptions messageSetWireFormat. + * @member {boolean} messageSetWireFormat + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.messageSetWireFormat = false; - /** - * Creates a new Snapshot instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set - * @returns {google.pubsub.v1.Snapshot} Snapshot instance - */ - Snapshot.create = function create(properties) { - return new Snapshot(properties); - }; + /** + * MessageOptions noStandardDescriptorAccessor. + * @member {boolean} noStandardDescriptorAccessor + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.noStandardDescriptorAccessor = false; - /** - * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Snapshot.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); - if (message.expireTime != null && message.hasOwnProperty("expireTime")) - $root.google.protobuf.Timestamp.encode(message.expireTime, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.labels != null && message.hasOwnProperty("labels")) - for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) - writer.uint32(/* id 4, wireType 2 =*/34).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - return writer; - }; + /** + * MessageOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.deprecated = false; - /** - * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Snapshot.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * MessageOptions mapEntry. + * @member {boolean} mapEntry + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.mapEntry = false; - /** - * Decodes a Snapshot message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.Snapshot} Snapshot - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Snapshot.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key; - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.topic = reader.string(); - break; - case 3: - message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 4: - reader.skip().pos++; - if (message.labels === $util.emptyObject) - message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * MessageOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Decodes a Snapshot message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.Snapshot} Snapshot - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Snapshot.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * MessageOptions .google.api.resource. + * @member {google.api.IResourceDescriptor|null|undefined} .google.api.resource + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype[".google.api.resource"] = null; - /** - * Verifies a Snapshot message. - * @function verify - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Snapshot.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.expireTime != null && message.hasOwnProperty("expireTime")) { - var error = $root.google.protobuf.Timestamp.verify(message.expireTime); - if (error) - return "expireTime." + error; - } - if (message.labels != null && message.hasOwnProperty("labels")) { - if (!$util.isObject(message.labels)) - return "labels: object expected"; - var key = Object.keys(message.labels); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.labels[key[i]])) - return "labels: string{k:string} expected"; - } - return null; - }; + /** + * Creates a new MessageOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions=} [properties] Properties to set + * @returns {google.protobuf.MessageOptions} MessageOptions instance + */ + MessageOptions.create = function create(properties) { + return new MessageOptions(properties); + }; - /** - * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.Snapshot} Snapshot - */ - Snapshot.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.Snapshot) - return object; - var message = new $root.google.pubsub.v1.Snapshot(); - if (object.name != null) - message.name = String(object.name); - if (object.topic != null) - message.topic = String(object.topic); - if (object.expireTime != null) { - if (typeof object.expireTime !== "object") - throw TypeError(".google.pubsub.v1.Snapshot.expireTime: object expected"); - message.expireTime = $root.google.protobuf.Timestamp.fromObject(object.expireTime); - } - if (object.labels) { - if (typeof object.labels !== "object") - throw TypeError(".google.pubsub.v1.Snapshot.labels: object expected"); - message.labels = {}; - for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) - message.labels[keys[i]] = String(object.labels[keys[i]]); - } - return message; - }; + /** + * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.messageSetWireFormat); + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.noStandardDescriptorAccessor); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) + $root.google.api.ResourceDescriptor.encode(message[".google.api.resource"], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); + return writer; + }; - /** - * Creates a plain object from a Snapshot message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {google.pubsub.v1.Snapshot} message Snapshot - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Snapshot.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.objects || options.defaults) - object.labels = {}; - if (options.defaults) { - object.name = ""; - object.topic = ""; - object.expireTime = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.expireTime != null && message.hasOwnProperty("expireTime")) - object.expireTime = $root.google.protobuf.Timestamp.toObject(message.expireTime, options); - var keys2; - if (message.labels && (keys2 = Object.keys(message.labels)).length) { - object.labels = {}; - for (var j = 0; j < keys2.length; ++j) - object.labels[keys2[j]] = message.labels[keys2[j]]; - } - return object; - }; + /** + * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Converts this Snapshot to JSON. - * @function toJSON - * @memberof google.pubsub.v1.Snapshot - * @instance - * @returns {Object.} JSON object - */ - Snapshot.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Decodes a MessageOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.MessageOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.MessageOptions} MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MessageOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.messageSetWireFormat = reader.bool(); + break; + case 2: + message.noStandardDescriptorAccessor = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 7: + message.mapEntry = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1053: + message[".google.api.resource"] = $root.google.api.ResourceDescriptor.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - return Snapshot; - })(); + /** + * Decodes a MessageOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.MessageOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.MessageOptions} MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - v1.GetSnapshotRequest = (function() { + /** + * Verifies a MessageOptions message. + * @function verify + * @memberof google.protobuf.MessageOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MessageOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + if (typeof message.messageSetWireFormat !== "boolean") + return "messageSetWireFormat: boolean expected"; + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + if (typeof message.noStandardDescriptorAccessor !== "boolean") + return "noStandardDescriptorAccessor: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + if (typeof message.mapEntry !== "boolean") + return "mapEntry: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) { + var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resource"]); + if (error) + return ".google.api.resource." + error; + } + return null; + }; - /** - * Properties of a GetSnapshotRequest. - * @memberof google.pubsub.v1 - * @interface IGetSnapshotRequest - * @property {string|null} [snapshot] GetSnapshotRequest snapshot - */ + /** + * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.MessageOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.MessageOptions} MessageOptions + */ + MessageOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MessageOptions) + return object; + var message = new $root.google.protobuf.MessageOptions(); + if (object.messageSetWireFormat != null) + message.messageSetWireFormat = Boolean(object.messageSetWireFormat); + if (object.noStandardDescriptorAccessor != null) + message.noStandardDescriptorAccessor = Boolean(object.noStandardDescriptorAccessor); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.mapEntry != null) + message.mapEntry = Boolean(object.mapEntry); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + if (object[".google.api.resource"] != null) { + if (typeof object[".google.api.resource"] !== "object") + throw TypeError(".google.protobuf.MessageOptions..google.api.resource: object expected"); + message[".google.api.resource"] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resource"]); + } + return message; + }; - /** - * Constructs a new GetSnapshotRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a GetSnapshotRequest. - * @implements IGetSnapshotRequest - * @constructor - * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set - */ - function GetSnapshotRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.MessageOptions} message MessageOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MessageOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.messageSetWireFormat = false; + object.noStandardDescriptorAccessor = false; + object.deprecated = false; + object.mapEntry = false; + object[".google.api.resource"] = null; + } + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + object.messageSetWireFormat = message.messageSetWireFormat; + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + object.noStandardDescriptorAccessor = message.noStandardDescriptorAccessor; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + object.mapEntry = message.mapEntry; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); } + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) + object[".google.api.resource"] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resource"], options); + return object; + }; - /** - * GetSnapshotRequest snapshot. - * @member {string} snapshot - * @memberof google.pubsub.v1.GetSnapshotRequest - * @instance - */ - GetSnapshotRequest.prototype.snapshot = ""; - - /** - * Creates a new GetSnapshotRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest instance - */ - GetSnapshotRequest.create = function create(properties) { - return new GetSnapshotRequest(properties); - }; + /** + * Converts this MessageOptions to JSON. + * @function toJSON + * @memberof google.protobuf.MessageOptions + * @instance + * @returns {Object.} JSON object + */ + MessageOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSnapshotRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); - return writer; - }; + return MessageOptions; + })(); - /** - * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + protobuf.FieldOptions = (function() { - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSnapshotRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSnapshotRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.snapshot = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Properties of a FieldOptions. + * @memberof google.protobuf + * @interface IFieldOptions + * @property {google.protobuf.FieldOptions.CType|null} [ctype] FieldOptions ctype + * @property {boolean|null} [packed] FieldOptions packed + * @property {google.protobuf.FieldOptions.JSType|null} [jstype] FieldOptions jstype + * @property {boolean|null} [lazy] FieldOptions lazy + * @property {boolean|null} [deprecated] FieldOptions deprecated + * @property {boolean|null} [weak] FieldOptions weak + * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption + * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior + * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference + */ - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Constructs a new FieldOptions. + * @memberof google.protobuf + * @classdesc Represents a FieldOptions. + * @implements IFieldOptions + * @constructor + * @param {google.protobuf.IFieldOptions=} [properties] Properties to set + */ + function FieldOptions(properties) { + this.uninterpretedOption = []; + this[".google.api.fieldBehavior"] = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Verifies a GetSnapshotRequest message. - * @function verify - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - GetSnapshotRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - if (!$util.isString(message.snapshot)) - return "snapshot: string expected"; - return null; - }; + /** + * FieldOptions ctype. + * @member {google.protobuf.FieldOptions.CType} ctype + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.ctype = 0; - /** - * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest - */ - GetSnapshotRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.GetSnapshotRequest) - return object; - var message = new $root.google.pubsub.v1.GetSnapshotRequest(); - if (object.snapshot != null) - message.snapshot = String(object.snapshot); - return message; - }; + /** + * FieldOptions packed. + * @member {boolean} packed + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.packed = false; - /** - * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {google.pubsub.v1.GetSnapshotRequest} message GetSnapshotRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - GetSnapshotRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.snapshot = ""; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - object.snapshot = message.snapshot; - return object; - }; + /** + * FieldOptions jstype. + * @member {google.protobuf.FieldOptions.JSType} jstype + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.jstype = 0; - /** - * Converts this GetSnapshotRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.GetSnapshotRequest - * @instance - * @returns {Object.} JSON object - */ - GetSnapshotRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * FieldOptions lazy. + * @member {boolean} lazy + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.lazy = false; - return GetSnapshotRequest; - })(); + /** + * FieldOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.deprecated = false; - v1.ListSnapshotsRequest = (function() { + /** + * FieldOptions weak. + * @member {boolean} weak + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.weak = false; - /** - * Properties of a ListSnapshotsRequest. - * @memberof google.pubsub.v1 - * @interface IListSnapshotsRequest - * @property {string|null} [project] ListSnapshotsRequest project - * @property {number|null} [pageSize] ListSnapshotsRequest pageSize - * @property {string|null} [pageToken] ListSnapshotsRequest pageToken - */ + /** + * FieldOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Constructs a new ListSnapshotsRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListSnapshotsRequest. - * @implements IListSnapshotsRequest - * @constructor - * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set - */ - function ListSnapshotsRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * FieldOptions .google.api.fieldBehavior. + * @member {Array.} .google.api.fieldBehavior + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype[".google.api.fieldBehavior"] = $util.emptyArray; - /** - * ListSnapshotsRequest project. - * @member {string} project - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @instance - */ - ListSnapshotsRequest.prototype.project = ""; + /** + * FieldOptions .google.api.resourceReference. + * @member {google.api.IResourceReference|null|undefined} .google.api.resourceReference + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype[".google.api.resourceReference"] = null; - /** - * ListSnapshotsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @instance - */ - ListSnapshotsRequest.prototype.pageSize = 0; + /** + * Creates a new FieldOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions=} [properties] Properties to set + * @returns {google.protobuf.FieldOptions} FieldOptions instance + */ + FieldOptions.create = function create(properties) { + return new FieldOptions(properties); + }; - /** - * ListSnapshotsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @instance - */ - ListSnapshotsRequest.prototype.pageToken = ""; + /** + * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ctype != null && message.hasOwnProperty("ctype")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.ctype); + if (message.packed != null && message.hasOwnProperty("packed")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.packed); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.lazy != null && message.hasOwnProperty("lazy")) + writer.uint32(/* id 5, wireType 0 =*/40).bool(message.lazy); + if (message.jstype != null && message.hasOwnProperty("jstype")) + writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jstype); + if (message.weak != null && message.hasOwnProperty("weak")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.fieldBehavior"] != null && message[".google.api.fieldBehavior"].length) { + writer.uint32(/* id 1052, wireType 2 =*/8418).fork(); + for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) + writer.int32(message[".google.api.fieldBehavior"][i]); + writer.ldelim(); + } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) + $root.google.api.ResourceReference.encode(message[".google.api.resourceReference"], writer.uint32(/* id 1055, wireType 2 =*/8442).fork()).ldelim(); + return writer; + }; - /** - * Creates a new ListSnapshotsRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest instance - */ - ListSnapshotsRequest.create = function create(properties) { - return new ListSnapshotsRequest(properties); - }; + /** + * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListSnapshotsRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); - return writer; - }; + /** + * Decodes a FieldOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldOptions} FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ctype = reader.int32(); + break; + case 2: + message.packed = reader.bool(); + break; + case 6: + message.jstype = reader.int32(); + break; + case 5: + message.lazy = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 10: + message.weak = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1052: + if (!(message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length)) + message[".google.api.fieldBehavior"] = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message[".google.api.fieldBehavior"].push(reader.int32()); + } else + message[".google.api.fieldBehavior"].push(reader.int32()); + break; + case 1055: + message[".google.api.resourceReference"] = $root.google.api.ResourceReference.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Decodes a FieldOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldOptions} FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListSnapshotsRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { + /** + * Verifies a FieldOptions message. + * @function verify + * @memberof google.protobuf.FieldOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ctype != null && message.hasOwnProperty("ctype")) + switch (message.ctype) { + default: + return "ctype: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.packed != null && message.hasOwnProperty("packed")) + if (typeof message.packed !== "boolean") + return "packed: boolean expected"; + if (message.jstype != null && message.hasOwnProperty("jstype")) + switch (message.jstype) { + default: + return "jstype: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.lazy != null && message.hasOwnProperty("lazy")) + if (typeof message.lazy !== "boolean") + return "lazy: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.weak != null && message.hasOwnProperty("weak")) + if (typeof message.weak !== "boolean") + return "weak: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + if (message[".google.api.fieldBehavior"] != null && message.hasOwnProperty(".google.api.fieldBehavior")) { + if (!Array.isArray(message[".google.api.fieldBehavior"])) + return ".google.api.fieldBehavior: array expected"; + for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) + switch (message[".google.api.fieldBehavior"][i]) { + default: + return ".google.api.fieldBehavior: enum value[] expected"; + case 0: case 1: - message.project = reader.string(); - break; case 2: - message.pageSize = reader.int32(); - break; case 3: - message.pageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); + case 4: + case 5: break; } - } - return message; - }; - - /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a ListSnapshotsRequest message. - * @function verify - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListSnapshotsRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.project != null && message.hasOwnProperty("project")) - if (!$util.isString(message.project)) - return "project: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; - return null; - }; - - /** - * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest - */ - ListSnapshotsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListSnapshotsRequest) - return object; - var message = new $root.google.pubsub.v1.ListSnapshotsRequest(); - if (object.project != null) - message.project = String(object.project); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); - return message; - }; + } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) { + var error = $root.google.api.ResourceReference.verify(message[".google.api.resourceReference"]); + if (error) + return ".google.api.resourceReference." + error; + } + return null; + }; - /** - * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @static - * @param {google.pubsub.v1.ListSnapshotsRequest} message ListSnapshotsRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListSnapshotsRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.project = ""; - object.pageSize = 0; - object.pageToken = ""; - } - if (message.project != null && message.hasOwnProperty("project")) - object.project = message.project; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; + /** + * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldOptions} FieldOptions + */ + FieldOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldOptions) return object; - }; - - /** - * Converts this ListSnapshotsRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListSnapshotsRequest - * @instance - * @returns {Object.} JSON object - */ - ListSnapshotsRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return ListSnapshotsRequest; - })(); - - v1.ListSnapshotsResponse = (function() { - - /** - * Properties of a ListSnapshotsResponse. - * @memberof google.pubsub.v1 - * @interface IListSnapshotsResponse - * @property {Array.|null} [snapshots] ListSnapshotsResponse snapshots - * @property {string|null} [nextPageToken] ListSnapshotsResponse nextPageToken - */ + var message = new $root.google.protobuf.FieldOptions(); + switch (object.ctype) { + case "STRING": + case 0: + message.ctype = 0; + break; + case "CORD": + case 1: + message.ctype = 1; + break; + case "STRING_PIECE": + case 2: + message.ctype = 2; + break; + } + if (object.packed != null) + message.packed = Boolean(object.packed); + switch (object.jstype) { + case "JS_NORMAL": + case 0: + message.jstype = 0; + break; + case "JS_STRING": + case 1: + message.jstype = 1; + break; + case "JS_NUMBER": + case 2: + message.jstype = 2; + break; + } + if (object.lazy != null) + message.lazy = Boolean(object.lazy); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.weak != null) + message.weak = Boolean(object.weak); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + if (object[".google.api.fieldBehavior"]) { + if (!Array.isArray(object[".google.api.fieldBehavior"])) + throw TypeError(".google.protobuf.FieldOptions..google.api.fieldBehavior: array expected"); + message[".google.api.fieldBehavior"] = []; + for (var i = 0; i < object[".google.api.fieldBehavior"].length; ++i) + switch (object[".google.api.fieldBehavior"][i]) { + default: + case "FIELD_BEHAVIOR_UNSPECIFIED": + case 0: + message[".google.api.fieldBehavior"][i] = 0; + break; + case "OPTIONAL": + case 1: + message[".google.api.fieldBehavior"][i] = 1; + break; + case "REQUIRED": + case 2: + message[".google.api.fieldBehavior"][i] = 2; + break; + case "OUTPUT_ONLY": + case 3: + message[".google.api.fieldBehavior"][i] = 3; + break; + case "INPUT_ONLY": + case 4: + message[".google.api.fieldBehavior"][i] = 4; + break; + case "IMMUTABLE": + case 5: + message[".google.api.fieldBehavior"][i] = 5; + break; + } + } + if (object[".google.api.resourceReference"] != null) { + if (typeof object[".google.api.resourceReference"] !== "object") + throw TypeError(".google.protobuf.FieldOptions..google.api.resourceReference: object expected"); + message[".google.api.resourceReference"] = $root.google.api.ResourceReference.fromObject(object[".google.api.resourceReference"]); + } + return message; + }; - /** - * Constructs a new ListSnapshotsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListSnapshotsResponse. - * @implements IListSnapshotsResponse - * @constructor - * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set - */ - function ListSnapshotsResponse(properties) { - this.snapshots = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.FieldOptions} message FieldOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.uninterpretedOption = []; + object[".google.api.fieldBehavior"] = []; + } + if (options.defaults) { + object.ctype = options.enums === String ? "STRING" : 0; + object.packed = false; + object.deprecated = false; + object.lazy = false; + object.jstype = options.enums === String ? "JS_NORMAL" : 0; + object.weak = false; + object[".google.api.resourceReference"] = null; + } + if (message.ctype != null && message.hasOwnProperty("ctype")) + object.ctype = options.enums === String ? $root.google.protobuf.FieldOptions.CType[message.ctype] : message.ctype; + if (message.packed != null && message.hasOwnProperty("packed")) + object.packed = message.packed; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.lazy != null && message.hasOwnProperty("lazy")) + object.lazy = message.lazy; + if (message.jstype != null && message.hasOwnProperty("jstype")) + object.jstype = options.enums === String ? $root.google.protobuf.FieldOptions.JSType[message.jstype] : message.jstype; + if (message.weak != null && message.hasOwnProperty("weak")) + object.weak = message.weak; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length) { + object[".google.api.fieldBehavior"] = []; + for (var j = 0; j < message[".google.api.fieldBehavior"].length; ++j) + object[".google.api.fieldBehavior"][j] = options.enums === String ? $root.google.api.FieldBehavior[message[".google.api.fieldBehavior"][j]] : message[".google.api.fieldBehavior"][j]; } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) + object[".google.api.resourceReference"] = $root.google.api.ResourceReference.toObject(message[".google.api.resourceReference"], options); + return object; + }; - /** - * ListSnapshotsResponse snapshots. - * @member {Array.} snapshots - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @instance - */ - ListSnapshotsResponse.prototype.snapshots = $util.emptyArray; + /** + * Converts this FieldOptions to JSON. + * @function toJSON + * @memberof google.protobuf.FieldOptions + * @instance + * @returns {Object.} JSON object + */ + FieldOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * ListSnapshotsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @instance - */ - ListSnapshotsResponse.prototype.nextPageToken = ""; + /** + * CType enum. + * @name google.protobuf.FieldOptions.CType + * @enum {string} + * @property {number} STRING=0 STRING value + * @property {number} CORD=1 CORD value + * @property {number} STRING_PIECE=2 STRING_PIECE value + */ + FieldOptions.CType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STRING"] = 0; + values[valuesById[1] = "CORD"] = 1; + values[valuesById[2] = "STRING_PIECE"] = 2; + return values; + })(); - /** - * Creates a new ListSnapshotsResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse instance - */ - ListSnapshotsResponse.create = function create(properties) { - return new ListSnapshotsResponse(properties); - }; + /** + * JSType enum. + * @name google.protobuf.FieldOptions.JSType + * @enum {string} + * @property {number} JS_NORMAL=0 JS_NORMAL value + * @property {number} JS_STRING=1 JS_STRING value + * @property {number} JS_NUMBER=2 JS_NUMBER value + */ + FieldOptions.JSType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "JS_NORMAL"] = 0; + values[valuesById[1] = "JS_STRING"] = 1; + values[valuesById[2] = "JS_NUMBER"] = 2; + return values; + })(); - /** - * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListSnapshotsResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshots != null && message.snapshots.length) - for (var i = 0; i < message.snapshots.length; ++i) - $root.google.pubsub.v1.Snapshot.encode(message.snapshots[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); - return writer; - }; + return FieldOptions; + })(); - /** - * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + protobuf.OneofOptions = (function() { - /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListSnapshotsResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.snapshots && message.snapshots.length)) - message.snapshots = []; - message.snapshots.push($root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32())); - break; - case 2: - message.nextPageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Properties of an OneofOptions. + * @memberof google.protobuf + * @interface IOneofOptions + * @property {Array.|null} [uninterpretedOption] OneofOptions uninterpretedOption + */ - /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Constructs a new OneofOptions. + * @memberof google.protobuf + * @classdesc Represents an OneofOptions. + * @implements IOneofOptions + * @constructor + * @param {google.protobuf.IOneofOptions=} [properties] Properties to set + */ + function OneofOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Verifies a ListSnapshotsResponse message. - * @function verify - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListSnapshotsResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshots != null && message.hasOwnProperty("snapshots")) { - if (!Array.isArray(message.snapshots)) - return "snapshots: array expected"; - for (var i = 0; i < message.snapshots.length; ++i) { - var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshots[i]); - if (error) - return "snapshots." + error; - } - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; - return null; - }; + /** + * OneofOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.OneofOptions + * @instance + */ + OneofOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse - */ - ListSnapshotsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListSnapshotsResponse) - return object; - var message = new $root.google.pubsub.v1.ListSnapshotsResponse(); - if (object.snapshots) { - if (!Array.isArray(object.snapshots)) - throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: array expected"); - message.snapshots = []; - for (var i = 0; i < object.snapshots.length; ++i) { - if (typeof object.snapshots[i] !== "object") - throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: object expected"); - message.snapshots[i] = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshots[i]); - } - } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); - return message; - }; + /** + * Creates a new OneofOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions=} [properties] Properties to set + * @returns {google.protobuf.OneofOptions} OneofOptions instance + */ + OneofOptions.create = function create(properties) { + return new OneofOptions(properties); + }; - /** - * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @static - * @param {google.pubsub.v1.ListSnapshotsResponse} message ListSnapshotsResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListSnapshotsResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.snapshots = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.snapshots && message.snapshots.length) { - object.snapshots = []; - for (var j = 0; j < message.snapshots.length; ++j) - object.snapshots[j] = $root.google.pubsub.v1.Snapshot.toObject(message.snapshots[j], options); - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; - return object; - }; + /** + * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; - /** - * Converts this ListSnapshotsResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListSnapshotsResponse - * @instance - * @returns {Object.} JSON object - */ - ListSnapshotsResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - return ListSnapshotsResponse; - })(); + /** + * Decodes an OneofOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.OneofOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.OneofOptions} OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - v1.DeleteSnapshotRequest = (function() { + /** + * Decodes an OneofOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.OneofOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.OneofOptions} OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Properties of a DeleteSnapshotRequest. - * @memberof google.pubsub.v1 - * @interface IDeleteSnapshotRequest - * @property {string|null} [snapshot] DeleteSnapshotRequest snapshot - */ + /** + * Verifies an OneofOptions message. + * @function verify + * @memberof google.protobuf.OneofOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OneofOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; - /** - * Constructs a new DeleteSnapshotRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a DeleteSnapshotRequest. - * @implements IDeleteSnapshotRequest - * @constructor - * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set - */ - function DeleteSnapshotRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.OneofOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.OneofOptions} OneofOptions + */ + OneofOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.OneofOptions) + return object; + var message = new $root.google.protobuf.OneofOptions(); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.OneofOptions} message OneofOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OneofOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); } + return object; + }; - /** - * DeleteSnapshotRequest snapshot. - * @member {string} snapshot - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @instance - */ - DeleteSnapshotRequest.prototype.snapshot = ""; + /** + * Converts this OneofOptions to JSON. + * @function toJSON + * @memberof google.protobuf.OneofOptions + * @instance + * @returns {Object.} JSON object + */ + OneofOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a new DeleteSnapshotRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest instance - */ - DeleteSnapshotRequest.create = function create(properties) { - return new DeleteSnapshotRequest(properties); - }; + return OneofOptions; + })(); - /** - * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteSnapshotRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); - return writer; - }; + protobuf.EnumOptions = (function() { - /** - * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Properties of an EnumOptions. + * @memberof google.protobuf + * @interface IEnumOptions + * @property {boolean|null} [allowAlias] EnumOptions allowAlias + * @property {boolean|null} [deprecated] EnumOptions deprecated + * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption + */ - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteSnapshotRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.snapshot = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Constructs a new EnumOptions. + * @memberof google.protobuf + * @classdesc Represents an EnumOptions. + * @implements IEnumOptions + * @constructor + * @param {google.protobuf.IEnumOptions=} [properties] Properties to set + */ + function EnumOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * EnumOptions allowAlias. + * @member {boolean} allowAlias + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.allowAlias = false; - /** - * Verifies a DeleteSnapshotRequest message. - * @function verify - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DeleteSnapshotRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - if (!$util.isString(message.snapshot)) - return "snapshot: string expected"; - return null; - }; + /** + * EnumOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.deprecated = false; - /** - * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest - */ - DeleteSnapshotRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.DeleteSnapshotRequest) - return object; - var message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); - if (object.snapshot != null) - message.snapshot = String(object.snapshot); - return message; - }; + /** + * EnumOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {google.pubsub.v1.DeleteSnapshotRequest} message DeleteSnapshotRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DeleteSnapshotRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.snapshot = ""; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - object.snapshot = message.snapshot; - return object; - }; + /** + * Creates a new EnumOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions=} [properties] Properties to set + * @returns {google.protobuf.EnumOptions} EnumOptions instance + */ + EnumOptions.create = function create(properties) { + return new EnumOptions(properties); + }; - /** - * Converts this DeleteSnapshotRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @instance - * @returns {Object.} JSON object - */ - DeleteSnapshotRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; - return DeleteSnapshotRequest; - })(); + /** + * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - v1.SeekRequest = (function() { + /** + * Decodes an EnumOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumOptions} EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 2: + message.allowAlias = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Properties of a SeekRequest. - * @memberof google.pubsub.v1 - * @interface ISeekRequest - * @property {string|null} [subscription] SeekRequest subscription - * @property {google.protobuf.ITimestamp|null} [time] SeekRequest time - * @property {string|null} [snapshot] SeekRequest snapshot - */ + /** + * Decodes an EnumOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumOptions} EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Constructs a new SeekRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a SeekRequest. - * @implements ISeekRequest - * @constructor - * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set - */ - function SeekRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Verifies an EnumOptions message. + * @function verify + * @memberof google.protobuf.EnumOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + if (typeof message.allowAlias !== "boolean") + return "allowAlias: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } } + return null; + }; - /** - * SeekRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.SeekRequest - * @instance - */ - SeekRequest.prototype.subscription = ""; + /** + * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumOptions} EnumOptions + */ + EnumOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumOptions) + return object; + var message = new $root.google.protobuf.EnumOptions(); + if (object.allowAlias != null) + message.allowAlias = Boolean(object.allowAlias); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; - /** - * SeekRequest time. - * @member {google.protobuf.ITimestamp|null|undefined} time - * @memberof google.pubsub.v1.SeekRequest - * @instance - */ - SeekRequest.prototype.time = null; + /** + * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.EnumOptions} message EnumOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.allowAlias = false; + object.deprecated = false; + } + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + object.allowAlias = message.allowAlias; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; - /** - * SeekRequest snapshot. - * @member {string} snapshot - * @memberof google.pubsub.v1.SeekRequest - * @instance - */ - SeekRequest.prototype.snapshot = ""; + /** + * Converts this EnumOptions to JSON. + * @function toJSON + * @memberof google.protobuf.EnumOptions + * @instance + * @returns {Object.} JSON object + */ + EnumOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + return EnumOptions; + })(); - /** - * SeekRequest target. - * @member {"time"|"snapshot"|undefined} target - * @memberof google.pubsub.v1.SeekRequest - * @instance - */ - Object.defineProperty(SeekRequest.prototype, "target", { - get: $util.oneOfGetter($oneOfFields = ["time", "snapshot"]), - set: $util.oneOfSetter($oneOfFields) - }); + protobuf.EnumValueOptions = (function() { - /** - * Creates a new SeekRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.SeekRequest} SeekRequest instance - */ - SeekRequest.create = function create(properties) { - return new SeekRequest(properties); - }; + /** + * Properties of an EnumValueOptions. + * @memberof google.protobuf + * @interface IEnumValueOptions + * @property {boolean|null} [deprecated] EnumValueOptions deprecated + * @property {Array.|null} [uninterpretedOption] EnumValueOptions uninterpretedOption + */ - /** - * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SeekRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.time != null && message.hasOwnProperty("time")) - $root.google.protobuf.Timestamp.encode(message.time, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.snapshot); - return writer; - }; + /** + * Constructs a new EnumValueOptions. + * @memberof google.protobuf + * @classdesc Represents an EnumValueOptions. + * @implements IEnumValueOptions + * @constructor + * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set + */ + function EnumValueOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SeekRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * EnumValueOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.deprecated = false; - /** - * Decodes a SeekRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.SeekRequest} SeekRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SeekRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.time = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 3: - message.snapshot = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * EnumValueOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Decodes a SeekRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.SeekRequest} SeekRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SeekRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a new EnumValueOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions instance + */ + EnumValueOptions.create = function create(properties) { + return new EnumValueOptions(properties); + }; - /** - * Verifies a SeekRequest message. - * @function verify - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - SeekRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - var properties = {}; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.time != null && message.hasOwnProperty("time")) { - properties.target = 1; - { - var error = $root.google.protobuf.Timestamp.verify(message.time); - if (error) - return "time." + error; - } - } - if (message.snapshot != null && message.hasOwnProperty("snapshot")) { - if (properties.target === 1) - return "target: multiple values"; - properties.target = 1; - if (!$util.isString(message.snapshot)) - return "snapshot: string expected"; - } - return null; - }; + /** + * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; - /** - * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.SeekRequest} SeekRequest - */ - SeekRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.SeekRequest) - return object; - var message = new $root.google.pubsub.v1.SeekRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.time != null) { - if (typeof object.time !== "object") - throw TypeError(".google.pubsub.v1.SeekRequest.time: object expected"); - message.time = $root.google.protobuf.Timestamp.fromObject(object.time); - } - if (object.snapshot != null) - message.snapshot = String(object.snapshot); - return message; - }; + /** + * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {google.pubsub.v1.SeekRequest} message SeekRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - SeekRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.subscription = ""; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.time != null && message.hasOwnProperty("time")) { - object.time = $root.google.protobuf.Timestamp.toObject(message.time, options); - if (options.oneofs) - object.target = "time"; + /** + * Decodes an EnumValueOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; } - if (message.snapshot != null && message.hasOwnProperty("snapshot")) { - object.snapshot = message.snapshot; - if (options.oneofs) - object.target = "snapshot"; + } + return message; + }; + + /** + * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EnumValueOptions message. + * @function verify + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumValueOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; } + } + return null; + }; + + /** + * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + */ + EnumValueOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumValueOptions) return object; - }; + var message = new $root.google.protobuf.EnumValueOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; - /** - * Converts this SeekRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.SeekRequest - * @instance - * @returns {Object.} JSON object - */ - SeekRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.EnumValueOptions} message EnumValueOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumValueOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) + object.deprecated = false; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; - return SeekRequest; - })(); + /** + * Converts this EnumValueOptions to JSON. + * @function toJSON + * @memberof google.protobuf.EnumValueOptions + * @instance + * @returns {Object.} JSON object + */ + EnumValueOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.SeekResponse = (function() { + return EnumValueOptions; + })(); - /** - * Properties of a SeekResponse. - * @memberof google.pubsub.v1 - * @interface ISeekResponse - */ + protobuf.ServiceOptions = (function() { - /** - * Constructs a new SeekResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a SeekResponse. - * @implements ISeekResponse - * @constructor - * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set - */ - function SeekResponse(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of a ServiceOptions. + * @memberof google.protobuf + * @interface IServiceOptions + * @property {boolean|null} [deprecated] ServiceOptions deprecated + * @property {Array.|null} [uninterpretedOption] ServiceOptions uninterpretedOption + * @property {string|null} [".google.api.defaultHost"] ServiceOptions .google.api.defaultHost + * @property {string|null} [".google.api.oauthScopes"] ServiceOptions .google.api.oauthScopes + */ - /** - * Creates a new SeekResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.SeekResponse} SeekResponse instance - */ - SeekResponse.create = function create(properties) { - return new SeekResponse(properties); - }; + /** + * Constructs a new ServiceOptions. + * @memberof google.protobuf + * @classdesc Represents a ServiceOptions. + * @implements IServiceOptions + * @constructor + * @param {google.protobuf.IServiceOptions=} [properties] Properties to set + */ + function ServiceOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SeekResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - return writer; - }; + /** + * ServiceOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype.deprecated = false; - /** - * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SeekResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * ServiceOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Decodes a SeekResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.SeekResponse} SeekResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SeekResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * ServiceOptions .google.api.defaultHost. + * @member {string} .google.api.defaultHost + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype[".google.api.defaultHost"] = ""; - /** - * Decodes a SeekResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.SeekResponse} SeekResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SeekResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * ServiceOptions .google.api.oauthScopes. + * @member {string} .google.api.oauthScopes + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype[".google.api.oauthScopes"] = ""; + + /** + * Creates a new ServiceOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions=} [properties] Properties to set + * @returns {google.protobuf.ServiceOptions} ServiceOptions instance + */ + ServiceOptions.create = function create(properties) { + return new ServiceOptions(properties); + }; - /** - * Verifies a SeekResponse message. - * @function verify - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - SeekResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - return null; - }; + /** + * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + writer.uint32(/* id 1049, wireType 2 =*/8394).string(message[".google.api.defaultHost"]); + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + writer.uint32(/* id 1050, wireType 2 =*/8402).string(message[".google.api.oauthScopes"]); + return writer; + }; - /** - * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.SeekResponse} SeekResponse - */ - SeekResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.SeekResponse) - return object; - return new $root.google.pubsub.v1.SeekResponse(); - }; + /** + * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {google.pubsub.v1.SeekResponse} message SeekResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - SeekResponse.toObject = function toObject() { - return {}; - }; + /** + * Decodes a ServiceOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ServiceOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ServiceOptions} ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 33: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1049: + message[".google.api.defaultHost"] = reader.string(); + break; + case 1050: + message[".google.api.oauthScopes"] = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Converts this SeekResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.SeekResponse - * @instance - * @returns {Object.} JSON object - */ - SeekResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ServiceOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ServiceOptions} ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - return SeekResponse; - })(); + /** + * Verifies a ServiceOptions message. + * @function verify + * @memberof google.protobuf.ServiceOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ServiceOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + if (!$util.isString(message[".google.api.defaultHost"])) + return ".google.api.defaultHost: string expected"; + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + if (!$util.isString(message[".google.api.oauthScopes"])) + return ".google.api.oauthScopes: string expected"; + return null; + }; - return v1; - })(); + /** + * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ServiceOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ServiceOptions} ServiceOptions + */ + ServiceOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ServiceOptions) + return object; + var message = new $root.google.protobuf.ServiceOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + if (object[".google.api.defaultHost"] != null) + message[".google.api.defaultHost"] = String(object[".google.api.defaultHost"]); + if (object[".google.api.oauthScopes"] != null) + message[".google.api.oauthScopes"] = String(object[".google.api.oauthScopes"]); + return message; + }; - return pubsub; - })(); + /** + * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.ServiceOptions} message ServiceOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ServiceOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.deprecated = false; + object[".google.api.defaultHost"] = ""; + object[".google.api.oauthScopes"] = ""; + } + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + object[".google.api.defaultHost"] = message[".google.api.defaultHost"]; + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + object[".google.api.oauthScopes"] = message[".google.api.oauthScopes"]; + return object; + }; - google.api = (function() { + /** + * Converts this ServiceOptions to JSON. + * @function toJSON + * @memberof google.protobuf.ServiceOptions + * @instance + * @returns {Object.} JSON object + */ + ServiceOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Namespace api. - * @memberof google - * @namespace - */ - var api = {}; + return ServiceOptions; + })(); - api.Http = (function() { + protobuf.MethodOptions = (function() { /** - * Properties of a Http. - * @memberof google.api - * @interface IHttp - * @property {Array.|null} [rules] Http rules - * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion + * Properties of a MethodOptions. + * @memberof google.protobuf + * @interface IMethodOptions + * @property {boolean|null} [deprecated] MethodOptions deprecated + * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel + * @property {Array.|null} [uninterpretedOption] MethodOptions uninterpretedOption + * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http + * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature */ /** - * Constructs a new Http. - * @memberof google.api - * @classdesc Represents a Http. - * @implements IHttp + * Constructs a new MethodOptions. + * @memberof google.protobuf + * @classdesc Represents a MethodOptions. + * @implements IMethodOptions * @constructor - * @param {google.api.IHttp=} [properties] Properties to set + * @param {google.protobuf.IMethodOptions=} [properties] Properties to set */ - function Http(properties) { - this.rules = []; + function MethodOptions(properties) { + this.uninterpretedOption = []; + this[".google.api.methodSignature"] = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -10484,91 +11069,133 @@ } /** - * Http rules. - * @member {Array.} rules - * @memberof google.api.Http + * MethodOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.MethodOptions * @instance */ - Http.prototype.rules = $util.emptyArray; + MethodOptions.prototype.deprecated = false; /** - * Http fullyDecodeReservedExpansion. - * @member {boolean} fullyDecodeReservedExpansion - * @memberof google.api.Http + * MethodOptions idempotencyLevel. + * @member {google.protobuf.MethodOptions.IdempotencyLevel} idempotencyLevel + * @memberof google.protobuf.MethodOptions * @instance */ - Http.prototype.fullyDecodeReservedExpansion = false; + MethodOptions.prototype.idempotencyLevel = 0; /** - * Creates a new Http instance using the specified properties. + * MethodOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * MethodOptions .google.api.http. + * @member {google.api.IHttpRule|null|undefined} .google.api.http + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype[".google.api.http"] = null; + + /** + * MethodOptions .google.api.methodSignature. + * @member {Array.} .google.api.methodSignature + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; + + /** + * Creates a new MethodOptions instance using the specified properties. * @function create - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @static - * @param {google.api.IHttp=} [properties] Properties to set - * @returns {google.api.Http} Http instance + * @param {google.protobuf.IMethodOptions=} [properties] Properties to set + * @returns {google.protobuf.MethodOptions} MethodOptions instance */ - Http.create = function create(properties) { - return new Http(properties); + MethodOptions.create = function create(properties) { + return new MethodOptions(properties); }; /** - * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. * @function encode - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @static - * @param {google.api.IHttp} message Http message or plain object to encode + * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Http.encode = function encode(message, writer) { + MethodOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.rules != null && message.rules.length) - for (var i = 0; i < message.rules.length; ++i) - $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + writer.uint32(/* id 34, wireType 0 =*/272).int32(message.idempotencyLevel); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.methodSignature"] != null && message[".google.api.methodSignature"].length) + for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) + writer.uint32(/* id 1051, wireType 2 =*/8410).string(message[".google.api.methodSignature"][i]); + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) + $root.google.api.HttpRule.encode(message[".google.api.http"], writer.uint32(/* id 72295728, wireType 2 =*/578365826).fork()).ldelim(); return writer; }; /** - * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @static - * @param {google.api.IHttp} message Http message or plain object to encode + * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Http.encodeDelimited = function encodeDelimited(message, writer) { + MethodOptions.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a Http message from the specified reader or buffer. + * Decodes a MethodOptions message from the specified reader or buffer. * @function decode - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.Http} Http + * @returns {google.protobuf.MethodOptions} MethodOptions * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Http.decode = function decode(reader, length) { + MethodOptions.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodOptions(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.rules && message.rules.length)) - message.rules = []; - message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + case 33: + message.deprecated = reader.bool(); break; - case 2: - message.fullyDecodeReservedExpansion = reader.bool(); + case 34: + message.idempotencyLevel = reader.int32(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 72295728: + message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); + break; + case 1051: + if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) + message[".google.api.methodSignature"] = []; + message[".google.api.methodSignature"].push(reader.string()); break; default: reader.skipType(tag & 7); @@ -10579,143 +11206,217 @@ }; /** - * Decodes a Http message from the specified reader or buffer, length delimited. + * Decodes a MethodOptions message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.Http} Http + * @returns {google.protobuf.MethodOptions} MethodOptions * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Http.decodeDelimited = function decodeDelimited(reader) { + MethodOptions.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a Http message. + * Verifies a MethodOptions message. * @function verify - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - Http.verify = function verify(message) { + MethodOptions.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.rules != null && message.hasOwnProperty("rules")) { - if (!Array.isArray(message.rules)) - return "rules: array expected"; - for (var i = 0; i < message.rules.length; ++i) { - var error = $root.google.api.HttpRule.verify(message.rules[i]); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + switch (message.idempotencyLevel) { + default: + return "idempotencyLevel: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); if (error) - return "rules." + error; + return "uninterpretedOption." + error; } } - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - if (typeof message.fullyDecodeReservedExpansion !== "boolean") - return "fullyDecodeReservedExpansion: boolean expected"; + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { + var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); + if (error) + return ".google.api.http." + error; + } + if (message[".google.api.methodSignature"] != null && message.hasOwnProperty(".google.api.methodSignature")) { + if (!Array.isArray(message[".google.api.methodSignature"])) + return ".google.api.methodSignature: array expected"; + for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) + if (!$util.isString(message[".google.api.methodSignature"][i])) + return ".google.api.methodSignature: string[] expected"; + } return null; }; /** - * Creates a Http message from a plain object. Also converts values to their respective internal types. + * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @static * @param {Object.} object Plain object - * @returns {google.api.Http} Http + * @returns {google.protobuf.MethodOptions} MethodOptions */ - Http.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.Http) + MethodOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MethodOptions) return object; - var message = new $root.google.api.Http(); - if (object.rules) { - if (!Array.isArray(object.rules)) - throw TypeError(".google.api.Http.rules: array expected"); - message.rules = []; - for (var i = 0; i < object.rules.length; ++i) { - if (typeof object.rules[i] !== "object") - throw TypeError(".google.api.Http.rules: object expected"); - message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); + var message = new $root.google.protobuf.MethodOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + switch (object.idempotencyLevel) { + case "IDEMPOTENCY_UNKNOWN": + case 0: + message.idempotencyLevel = 0; + break; + case "NO_SIDE_EFFECTS": + case 1: + message.idempotencyLevel = 1; + break; + case "IDEMPOTENT": + case 2: + message.idempotencyLevel = 2; + break; + } + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } } - if (object.fullyDecodeReservedExpansion != null) - message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); + if (object[".google.api.http"] != null) { + if (typeof object[".google.api.http"] !== "object") + throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); + message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); + } + if (object[".google.api.methodSignature"]) { + if (!Array.isArray(object[".google.api.methodSignature"])) + throw TypeError(".google.protobuf.MethodOptions..google.api.methodSignature: array expected"); + message[".google.api.methodSignature"] = []; + for (var i = 0; i < object[".google.api.methodSignature"].length; ++i) + message[".google.api.methodSignature"][i] = String(object[".google.api.methodSignature"][i]); + } return message; }; /** - * Creates a plain object from a Http message. Also converts values to other types if specified. + * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. * @function toObject - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @static - * @param {google.api.Http} message Http + * @param {google.protobuf.MethodOptions} message MethodOptions * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - Http.toObject = function toObject(message, options) { + MethodOptions.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.rules = []; - if (options.defaults) - object.fullyDecodeReservedExpansion = false; - if (message.rules && message.rules.length) { - object.rules = []; - for (var j = 0; j < message.rules.length; ++j) - object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); + if (options.arrays || options.defaults) { + object.uninterpretedOption = []; + object[".google.api.methodSignature"] = []; } - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; + if (options.defaults) { + object.deprecated = false; + object.idempotencyLevel = options.enums === String ? "IDEMPOTENCY_UNKNOWN" : 0; + object[".google.api.http"] = null; + } + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + object.idempotencyLevel = options.enums === String ? $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] : message.idempotencyLevel; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length) { + object[".google.api.methodSignature"] = []; + for (var j = 0; j < message[".google.api.methodSignature"].length; ++j) + object[".google.api.methodSignature"][j] = message[".google.api.methodSignature"][j]; + } + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) + object[".google.api.http"] = $root.google.api.HttpRule.toObject(message[".google.api.http"], options); return object; }; /** - * Converts this Http to JSON. + * Converts this MethodOptions to JSON. * @function toJSON - * @memberof google.api.Http + * @memberof google.protobuf.MethodOptions * @instance * @returns {Object.} JSON object */ - Http.prototype.toJSON = function toJSON() { + MethodOptions.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return Http; + /** + * IdempotencyLevel enum. + * @name google.protobuf.MethodOptions.IdempotencyLevel + * @enum {string} + * @property {number} IDEMPOTENCY_UNKNOWN=0 IDEMPOTENCY_UNKNOWN value + * @property {number} NO_SIDE_EFFECTS=1 NO_SIDE_EFFECTS value + * @property {number} IDEMPOTENT=2 IDEMPOTENT value + */ + MethodOptions.IdempotencyLevel = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "IDEMPOTENCY_UNKNOWN"] = 0; + values[valuesById[1] = "NO_SIDE_EFFECTS"] = 1; + values[valuesById[2] = "IDEMPOTENT"] = 2; + return values; + })(); + + return MethodOptions; })(); - api.HttpRule = (function() { + protobuf.UninterpretedOption = (function() { /** - * Properties of a HttpRule. - * @memberof google.api - * @interface IHttpRule - * @property {string|null} [selector] HttpRule selector - * @property {string|null} [get] HttpRule get - * @property {string|null} [put] HttpRule put - * @property {string|null} [post] HttpRule post - * @property {string|null} ["delete"] HttpRule delete - * @property {string|null} [patch] HttpRule patch - * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom - * @property {string|null} [body] HttpRule body - * @property {string|null} [responseBody] HttpRule responseBody - * @property {Array.|null} [additionalBindings] HttpRule additionalBindings + * Properties of an UninterpretedOption. + * @memberof google.protobuf + * @interface IUninterpretedOption + * @property {Array.|null} [name] UninterpretedOption name + * @property {string|null} [identifierValue] UninterpretedOption identifierValue + * @property {number|Long|null} [positiveIntValue] UninterpretedOption positiveIntValue + * @property {number|Long|null} [negativeIntValue] UninterpretedOption negativeIntValue + * @property {number|null} [doubleValue] UninterpretedOption doubleValue + * @property {Uint8Array|null} [stringValue] UninterpretedOption stringValue + * @property {string|null} [aggregateValue] UninterpretedOption aggregateValue */ /** - * Constructs a new HttpRule. - * @memberof google.api - * @classdesc Represents a HttpRule. - * @implements IHttpRule + * Constructs a new UninterpretedOption. + * @memberof google.protobuf + * @classdesc Represents an UninterpretedOption. + * @implements IUninterpretedOption * @constructor - * @param {google.api.IHttpRule=} [properties] Properties to set + * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set */ - function HttpRule(properties) { - this.additionalBindings = []; + function UninterpretedOption(properties) { + this.name = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -10723,209 +11424,156 @@ } /** - * HttpRule selector. - * @member {string} selector - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.selector = ""; - - /** - * HttpRule get. - * @member {string} get - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.get = ""; - - /** - * HttpRule put. - * @member {string} put - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.put = ""; - - /** - * HttpRule post. - * @member {string} post - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.post = ""; - - /** - * HttpRule delete. - * @member {string} delete - * @memberof google.api.HttpRule + * UninterpretedOption name. + * @member {Array.} name + * @memberof google.protobuf.UninterpretedOption * @instance */ - HttpRule.prototype["delete"] = ""; + UninterpretedOption.prototype.name = $util.emptyArray; /** - * HttpRule patch. - * @member {string} patch - * @memberof google.api.HttpRule + * UninterpretedOption identifierValue. + * @member {string} identifierValue + * @memberof google.protobuf.UninterpretedOption * @instance */ - HttpRule.prototype.patch = ""; + UninterpretedOption.prototype.identifierValue = ""; /** - * HttpRule custom. - * @member {google.api.ICustomHttpPattern|null|undefined} custom - * @memberof google.api.HttpRule + * UninterpretedOption positiveIntValue. + * @member {number|Long} positiveIntValue + * @memberof google.protobuf.UninterpretedOption * @instance */ - HttpRule.prototype.custom = null; + UninterpretedOption.prototype.positiveIntValue = $util.Long ? $util.Long.fromBits(0,0,true) : 0; /** - * HttpRule body. - * @member {string} body - * @memberof google.api.HttpRule + * UninterpretedOption negativeIntValue. + * @member {number|Long} negativeIntValue + * @memberof google.protobuf.UninterpretedOption * @instance */ - HttpRule.prototype.body = ""; + UninterpretedOption.prototype.negativeIntValue = $util.Long ? $util.Long.fromBits(0,0,false) : 0; /** - * HttpRule responseBody. - * @member {string} responseBody - * @memberof google.api.HttpRule + * UninterpretedOption doubleValue. + * @member {number} doubleValue + * @memberof google.protobuf.UninterpretedOption * @instance */ - HttpRule.prototype.responseBody = ""; + UninterpretedOption.prototype.doubleValue = 0; /** - * HttpRule additionalBindings. - * @member {Array.} additionalBindings - * @memberof google.api.HttpRule + * UninterpretedOption stringValue. + * @member {Uint8Array} stringValue + * @memberof google.protobuf.UninterpretedOption * @instance */ - HttpRule.prototype.additionalBindings = $util.emptyArray; - - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + UninterpretedOption.prototype.stringValue = $util.newBuffer([]); /** - * HttpRule pattern. - * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern - * @memberof google.api.HttpRule + * UninterpretedOption aggregateValue. + * @member {string} aggregateValue + * @memberof google.protobuf.UninterpretedOption * @instance */ - Object.defineProperty(HttpRule.prototype, "pattern", { - get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]), - set: $util.oneOfSetter($oneOfFields) - }); + UninterpretedOption.prototype.aggregateValue = ""; /** - * Creates a new HttpRule instance using the specified properties. + * Creates a new UninterpretedOption instance using the specified properties. * @function create - * @memberof google.api.HttpRule - * @static - * @param {google.api.IHttpRule=} [properties] Properties to set - * @returns {google.api.HttpRule} HttpRule instance - */ - HttpRule.create = function create(properties) { - return new HttpRule(properties); - }; - - /** - * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @function encode - * @memberof google.api.HttpRule + * @memberof google.protobuf.UninterpretedOption * @static - * @param {google.api.IHttpRule} message HttpRule message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption instance */ - HttpRule.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.selector != null && message.hasOwnProperty("selector")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); - if (message.get != null && message.hasOwnProperty("get")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.get); - if (message.put != null && message.hasOwnProperty("put")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.put); - if (message.post != null && message.hasOwnProperty("post")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.post); - if (message["delete"] != null && message.hasOwnProperty("delete")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]); - if (message.patch != null && message.hasOwnProperty("patch")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch); - if (message.body != null && message.hasOwnProperty("body")) - writer.uint32(/* id 7, wireType 2 =*/58).string(message.body); - if (message.custom != null && message.hasOwnProperty("custom")) - $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.additionalBindings != null && message.additionalBindings.length) - for (var i = 0; i < message.additionalBindings.length; ++i) - $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); + UninterpretedOption.create = function create(properties) { + return new UninterpretedOption(properties); + }; + + /** + * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @function encode + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UninterpretedOption.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.name.length) + for (var i = 0; i < message.name.length; ++i) + $root.google.protobuf.UninterpretedOption.NamePart.encode(message.name[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.identifierValue); + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + writer.uint32(/* id 4, wireType 0 =*/32).uint64(message.positiveIntValue); + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + writer.uint32(/* id 5, wireType 0 =*/40).int64(message.negativeIntValue); + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + writer.uint32(/* id 6, wireType 1 =*/49).double(message.doubleValue); + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + writer.uint32(/* id 7, wireType 2 =*/58).bytes(message.stringValue); + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + writer.uint32(/* id 8, wireType 2 =*/66).string(message.aggregateValue); return writer; }; /** - * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.HttpRule + * @memberof google.protobuf.UninterpretedOption * @static - * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - HttpRule.encodeDelimited = function encodeDelimited(message, writer) { + UninterpretedOption.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a HttpRule message from the specified reader or buffer. + * Decodes an UninterpretedOption message from the specified reader or buffer. * @function decode - * @memberof google.api.HttpRule + * @memberof google.protobuf.UninterpretedOption * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.HttpRule} HttpRule + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - HttpRule.decode = function decode(reader, length) { + UninterpretedOption.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.selector = reader.string(); - break; case 2: - message.get = reader.string(); + if (!(message.name && message.name.length)) + message.name = []; + message.name.push($root.google.protobuf.UninterpretedOption.NamePart.decode(reader, reader.uint32())); break; case 3: - message.put = reader.string(); + message.identifierValue = reader.string(); break; case 4: - message.post = reader.string(); + message.positiveIntValue = reader.uint64(); break; case 5: - message["delete"] = reader.string(); + message.negativeIntValue = reader.int64(); break; case 6: - message.patch = reader.string(); - break; - case 8: - message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); + message.doubleValue = reader.double(); break; case 7: - message.body = reader.string(); - break; - case 12: - message.responseBody = reader.string(); + message.stringValue = reader.bytes(); break; - case 11: - if (!(message.additionalBindings && message.additionalBindings.length)) - message.additionalBindings = []; - message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + case 8: + message.aggregateValue = reader.string(); break; default: reader.skipType(tag & 7); @@ -10936,240 +11584,422 @@ }; /** - * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.api.HttpRule + * @memberof google.protobuf.UninterpretedOption * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.HttpRule} HttpRule + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - HttpRule.decodeDelimited = function decodeDelimited(reader) { + UninterpretedOption.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a HttpRule message. + * Verifies an UninterpretedOption message. * @function verify - * @memberof google.api.HttpRule + * @memberof google.protobuf.UninterpretedOption * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - HttpRule.verify = function verify(message) { + UninterpretedOption.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - var properties = {}; - if (message.selector != null && message.hasOwnProperty("selector")) - if (!$util.isString(message.selector)) - return "selector: string expected"; - if (message.get != null && message.hasOwnProperty("get")) { - properties.pattern = 1; - if (!$util.isString(message.get)) - return "get: string expected"; - } - if (message.put != null && message.hasOwnProperty("put")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.put)) - return "put: string expected"; - } - if (message.post != null && message.hasOwnProperty("post")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.post)) - return "post: string expected"; - } - if (message["delete"] != null && message.hasOwnProperty("delete")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message["delete"])) - return "delete: string expected"; - } - if (message.patch != null && message.hasOwnProperty("patch")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.patch)) - return "patch: string expected"; - } - if (message.custom != null && message.hasOwnProperty("custom")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - { - var error = $root.google.api.CustomHttpPattern.verify(message.custom); + if (message.name != null && message.hasOwnProperty("name")) { + if (!Array.isArray(message.name)) + return "name: array expected"; + for (var i = 0; i < message.name.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.NamePart.verify(message.name[i]); if (error) - return "custom." + error; + return "name." + error; } } - if (message.body != null && message.hasOwnProperty("body")) - if (!$util.isString(message.body)) - return "body: string expected"; - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - if (!$util.isString(message.responseBody)) - return "responseBody: string expected"; - if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { - if (!Array.isArray(message.additionalBindings)) - return "additionalBindings: array expected"; - for (var i = 0; i < message.additionalBindings.length; ++i) { - var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]); - if (error) - return "additionalBindings." + error; + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + if (!$util.isString(message.identifierValue)) + return "identifierValue: string expected"; + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + if (!$util.isInteger(message.positiveIntValue) && !(message.positiveIntValue && $util.isInteger(message.positiveIntValue.low) && $util.isInteger(message.positiveIntValue.high))) + return "positiveIntValue: integer|Long expected"; + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + if (!$util.isInteger(message.negativeIntValue) && !(message.negativeIntValue && $util.isInteger(message.negativeIntValue.low) && $util.isInteger(message.negativeIntValue.high))) + return "negativeIntValue: integer|Long expected"; + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + if (typeof message.doubleValue !== "number") + return "doubleValue: number expected"; + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + if (!(message.stringValue && typeof message.stringValue.length === "number" || $util.isString(message.stringValue))) + return "stringValue: buffer expected"; + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + if (!$util.isString(message.aggregateValue)) + return "aggregateValue: string expected"; + return null; + }; + + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption + */ + UninterpretedOption.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.UninterpretedOption) + return object; + var message = new $root.google.protobuf.UninterpretedOption(); + if (object.name) { + if (!Array.isArray(object.name)) + throw TypeError(".google.protobuf.UninterpretedOption.name: array expected"); + message.name = []; + for (var i = 0; i < object.name.length; ++i) { + if (typeof object.name[i] !== "object") + throw TypeError(".google.protobuf.UninterpretedOption.name: object expected"); + message.name[i] = $root.google.protobuf.UninterpretedOption.NamePart.fromObject(object.name[i]); + } + } + if (object.identifierValue != null) + message.identifierValue = String(object.identifierValue); + if (object.positiveIntValue != null) + if ($util.Long) + (message.positiveIntValue = $util.Long.fromValue(object.positiveIntValue)).unsigned = true; + else if (typeof object.positiveIntValue === "string") + message.positiveIntValue = parseInt(object.positiveIntValue, 10); + else if (typeof object.positiveIntValue === "number") + message.positiveIntValue = object.positiveIntValue; + else if (typeof object.positiveIntValue === "object") + message.positiveIntValue = new $util.LongBits(object.positiveIntValue.low >>> 0, object.positiveIntValue.high >>> 0).toNumber(true); + if (object.negativeIntValue != null) + if ($util.Long) + (message.negativeIntValue = $util.Long.fromValue(object.negativeIntValue)).unsigned = false; + else if (typeof object.negativeIntValue === "string") + message.negativeIntValue = parseInt(object.negativeIntValue, 10); + else if (typeof object.negativeIntValue === "number") + message.negativeIntValue = object.negativeIntValue; + else if (typeof object.negativeIntValue === "object") + message.negativeIntValue = new $util.LongBits(object.negativeIntValue.low >>> 0, object.negativeIntValue.high >>> 0).toNumber(); + if (object.doubleValue != null) + message.doubleValue = Number(object.doubleValue); + if (object.stringValue != null) + if (typeof object.stringValue === "string") + $util.base64.decode(object.stringValue, message.stringValue = $util.newBuffer($util.base64.length(object.stringValue)), 0); + else if (object.stringValue.length) + message.stringValue = object.stringValue; + if (object.aggregateValue != null) + message.aggregateValue = String(object.aggregateValue); + return message; + }; + + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.UninterpretedOption} message UninterpretedOption + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UninterpretedOption.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.name = []; + if (options.defaults) { + object.identifierValue = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, true); + object.positiveIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.positiveIntValue = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.negativeIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.negativeIntValue = options.longs === String ? "0" : 0; + object.doubleValue = 0; + if (options.bytes === String) + object.stringValue = ""; + else { + object.stringValue = []; + if (options.bytes !== Array) + object.stringValue = $util.newBuffer(object.stringValue); } + object.aggregateValue = ""; } - return null; + if (message.name && message.name.length) { + object.name = []; + for (var j = 0; j < message.name.length; ++j) + object.name[j] = $root.google.protobuf.UninterpretedOption.NamePart.toObject(message.name[j], options); + } + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + object.identifierValue = message.identifierValue; + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + if (typeof message.positiveIntValue === "number") + object.positiveIntValue = options.longs === String ? String(message.positiveIntValue) : message.positiveIntValue; + else + object.positiveIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.positiveIntValue) : options.longs === Number ? new $util.LongBits(message.positiveIntValue.low >>> 0, message.positiveIntValue.high >>> 0).toNumber(true) : message.positiveIntValue; + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + if (typeof message.negativeIntValue === "number") + object.negativeIntValue = options.longs === String ? String(message.negativeIntValue) : message.negativeIntValue; + else + object.negativeIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.negativeIntValue) : options.longs === Number ? new $util.LongBits(message.negativeIntValue.low >>> 0, message.negativeIntValue.high >>> 0).toNumber() : message.negativeIntValue; + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + object.doubleValue = options.json && !isFinite(message.doubleValue) ? String(message.doubleValue) : message.doubleValue; + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + object.stringValue = options.bytes === String ? $util.base64.encode(message.stringValue, 0, message.stringValue.length) : options.bytes === Array ? Array.prototype.slice.call(message.stringValue) : message.stringValue; + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + object.aggregateValue = message.aggregateValue; + return object; }; /** - * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.HttpRule - * @static - * @param {Object.} object Plain object - * @returns {google.api.HttpRule} HttpRule + * Converts this UninterpretedOption to JSON. + * @function toJSON + * @memberof google.protobuf.UninterpretedOption + * @instance + * @returns {Object.} JSON object */ - HttpRule.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.HttpRule) - return object; - var message = new $root.google.api.HttpRule(); - if (object.selector != null) - message.selector = String(object.selector); - if (object.get != null) - message.get = String(object.get); - if (object.put != null) - message.put = String(object.put); - if (object.post != null) - message.post = String(object.post); - if (object["delete"] != null) - message["delete"] = String(object["delete"]); - if (object.patch != null) - message.patch = String(object.patch); - if (object.custom != null) { - if (typeof object.custom !== "object") - throw TypeError(".google.api.HttpRule.custom: object expected"); - message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom); + UninterpretedOption.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + UninterpretedOption.NamePart = (function() { + + /** + * Properties of a NamePart. + * @memberof google.protobuf.UninterpretedOption + * @interface INamePart + * @property {string} namePart NamePart namePart + * @property {boolean} isExtension NamePart isExtension + */ + + /** + * Constructs a new NamePart. + * @memberof google.protobuf.UninterpretedOption + * @classdesc Represents a NamePart. + * @implements INamePart + * @constructor + * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set + */ + function NamePart(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - if (object.body != null) - message.body = String(object.body); - if (object.responseBody != null) - message.responseBody = String(object.responseBody); - if (object.additionalBindings) { - if (!Array.isArray(object.additionalBindings)) - throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); - message.additionalBindings = []; - for (var i = 0; i < object.additionalBindings.length; ++i) { - if (typeof object.additionalBindings[i] !== "object") - throw TypeError(".google.api.HttpRule.additionalBindings: object expected"); - message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]); + + /** + * NamePart namePart. + * @member {string} namePart + * @memberof google.protobuf.UninterpretedOption.NamePart + * @instance + */ + NamePart.prototype.namePart = ""; + + /** + * NamePart isExtension. + * @member {boolean} isExtension + * @memberof google.protobuf.UninterpretedOption.NamePart + * @instance + */ + NamePart.prototype.isExtension = false; + + /** + * Creates a new NamePart instance using the specified properties. + * @function create + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart instance + */ + NamePart.create = function create(properties) { + return new NamePart(properties); + }; + + /** + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @function encode + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NamePart.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + writer.uint32(/* id 1, wireType 2 =*/10).string(message.namePart); + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.isExtension); + return writer; + }; + + /** + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NamePart.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a NamePart message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NamePart.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption.NamePart(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.namePart = reader.string(); + break; + case 2: + message.isExtension = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + if (!message.hasOwnProperty("namePart")) + throw $util.ProtocolError("missing required 'namePart'", { instance: message }); + if (!message.hasOwnProperty("isExtension")) + throw $util.ProtocolError("missing required 'isExtension'", { instance: message }); + return message; + }; + + /** + * Decodes a NamePart message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NamePart.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a NamePart message. + * @function verify + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + NamePart.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (!$util.isString(message.namePart)) + return "namePart: string expected"; + if (typeof message.isExtension !== "boolean") + return "isExtension: boolean expected"; + return null; + }; + + /** + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + */ + NamePart.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.UninterpretedOption.NamePart) + return object; + var message = new $root.google.protobuf.UninterpretedOption.NamePart(); + if (object.namePart != null) + message.namePart = String(object.namePart); + if (object.isExtension != null) + message.isExtension = Boolean(object.isExtension); + return message; + }; + + /** + * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {google.protobuf.UninterpretedOption.NamePart} message NamePart + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + NamePart.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.namePart = ""; + object.isExtension = false; } - } - return message; - }; + if (message.namePart != null && message.hasOwnProperty("namePart")) + object.namePart = message.namePart; + if (message.isExtension != null && message.hasOwnProperty("isExtension")) + object.isExtension = message.isExtension; + return object; + }; - /** - * Creates a plain object from a HttpRule message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.HttpRule - * @static - * @param {google.api.HttpRule} message HttpRule - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - HttpRule.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.additionalBindings = []; - if (options.defaults) { - object.selector = ""; - object.body = ""; - object.responseBody = ""; - } - if (message.selector != null && message.hasOwnProperty("selector")) - object.selector = message.selector; - if (message.get != null && message.hasOwnProperty("get")) { - object.get = message.get; - if (options.oneofs) - object.pattern = "get"; - } - if (message.put != null && message.hasOwnProperty("put")) { - object.put = message.put; - if (options.oneofs) - object.pattern = "put"; - } - if (message.post != null && message.hasOwnProperty("post")) { - object.post = message.post; - if (options.oneofs) - object.pattern = "post"; - } - if (message["delete"] != null && message.hasOwnProperty("delete")) { - object["delete"] = message["delete"]; - if (options.oneofs) - object.pattern = "delete"; - } - if (message.patch != null && message.hasOwnProperty("patch")) { - object.patch = message.patch; - if (options.oneofs) - object.pattern = "patch"; - } - if (message.body != null && message.hasOwnProperty("body")) - object.body = message.body; - if (message.custom != null && message.hasOwnProperty("custom")) { - object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options); - if (options.oneofs) - object.pattern = "custom"; - } - if (message.additionalBindings && message.additionalBindings.length) { - object.additionalBindings = []; - for (var j = 0; j < message.additionalBindings.length; ++j) - object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); - } - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - object.responseBody = message.responseBody; - return object; - }; + /** + * Converts this NamePart to JSON. + * @function toJSON + * @memberof google.protobuf.UninterpretedOption.NamePart + * @instance + * @returns {Object.} JSON object + */ + NamePart.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this HttpRule to JSON. - * @function toJSON - * @memberof google.api.HttpRule - * @instance - * @returns {Object.} JSON object - */ - HttpRule.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return NamePart; + })(); - return HttpRule; + return UninterpretedOption; })(); - api.CustomHttpPattern = (function() { + protobuf.SourceCodeInfo = (function() { /** - * Properties of a CustomHttpPattern. - * @memberof google.api - * @interface ICustomHttpPattern - * @property {string|null} [kind] CustomHttpPattern kind - * @property {string|null} [path] CustomHttpPattern path + * Properties of a SourceCodeInfo. + * @memberof google.protobuf + * @interface ISourceCodeInfo + * @property {Array.|null} [location] SourceCodeInfo location */ /** - * Constructs a new CustomHttpPattern. - * @memberof google.api - * @classdesc Represents a CustomHttpPattern. - * @implements ICustomHttpPattern + * Constructs a new SourceCodeInfo. + * @memberof google.protobuf + * @classdesc Represents a SourceCodeInfo. + * @implements ISourceCodeInfo * @constructor - * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set */ - function CustomHttpPattern(properties) { + function SourceCodeInfo(properties) { + this.location = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -11177,88 +12007,78 @@ } /** - * CustomHttpPattern kind. - * @member {string} kind - * @memberof google.api.CustomHttpPattern - * @instance - */ - CustomHttpPattern.prototype.kind = ""; - - /** - * CustomHttpPattern path. - * @member {string} path - * @memberof google.api.CustomHttpPattern + * SourceCodeInfo location. + * @member {Array.} location + * @memberof google.protobuf.SourceCodeInfo * @instance */ - CustomHttpPattern.prototype.path = ""; + SourceCodeInfo.prototype.location = $util.emptyArray; /** - * Creates a new CustomHttpPattern instance using the specified properties. + * Creates a new SourceCodeInfo instance using the specified properties. * @function create - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @static - * @param {google.api.ICustomHttpPattern=} [properties] Properties to set - * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance + * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo instance */ - CustomHttpPattern.create = function create(properties) { - return new CustomHttpPattern(properties); + SourceCodeInfo.create = function create(properties) { + return new SourceCodeInfo(properties); }; /** - * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. * @function encode - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @static - * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - CustomHttpPattern.encode = function encode(message, writer) { + SourceCodeInfo.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.kind != null && message.hasOwnProperty("kind")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind); - if (message.path != null && message.hasOwnProperty("path")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.path); + if (message.location != null && message.location.length) + for (var i = 0; i < message.location.length; ++i) + $root.google.protobuf.SourceCodeInfo.Location.encode(message.location[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; /** - * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @static - * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) { + SourceCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a CustomHttpPattern message from the specified reader or buffer. + * Decodes a SourceCodeInfo message from the specified reader or buffer. * @function decode - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CustomHttpPattern.decode = function decode(reader, length) { + SourceCodeInfo.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.kind = reader.string(); - break; - case 2: - message.path = reader.string(); + if (!(message.location && message.location.length)) + message.location = []; + message.location.push($root.google.protobuf.SourceCodeInfo.Location.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -11269,488 +12089,467 @@ }; /** - * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) { + SourceCodeInfo.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a CustomHttpPattern message. + * Verifies a SourceCodeInfo message. * @function verify - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - CustomHttpPattern.verify = function verify(message) { + SourceCodeInfo.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.kind != null && message.hasOwnProperty("kind")) - if (!$util.isString(message.kind)) - return "kind: string expected"; - if (message.path != null && message.hasOwnProperty("path")) - if (!$util.isString(message.path)) - return "path: string expected"; + if (message.location != null && message.hasOwnProperty("location")) { + if (!Array.isArray(message.location)) + return "location: array expected"; + for (var i = 0; i < message.location.length; ++i) { + var error = $root.google.protobuf.SourceCodeInfo.Location.verify(message.location[i]); + if (error) + return "location." + error; + } + } return null; }; /** - * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @static * @param {Object.} object Plain object - * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo */ - CustomHttpPattern.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.CustomHttpPattern) + SourceCodeInfo.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.SourceCodeInfo) return object; - var message = new $root.google.api.CustomHttpPattern(); - if (object.kind != null) - message.kind = String(object.kind); - if (object.path != null) - message.path = String(object.path); + var message = new $root.google.protobuf.SourceCodeInfo(); + if (object.location) { + if (!Array.isArray(object.location)) + throw TypeError(".google.protobuf.SourceCodeInfo.location: array expected"); + message.location = []; + for (var i = 0; i < object.location.length; ++i) { + if (typeof object.location[i] !== "object") + throw TypeError(".google.protobuf.SourceCodeInfo.location: object expected"); + message.location[i] = $root.google.protobuf.SourceCodeInfo.Location.fromObject(object.location[i]); + } + } return message; }; /** - * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. * @function toObject - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @static - * @param {google.api.CustomHttpPattern} message CustomHttpPattern + * @param {google.protobuf.SourceCodeInfo} message SourceCodeInfo * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - CustomHttpPattern.toObject = function toObject(message, options) { + SourceCodeInfo.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.kind = ""; - object.path = ""; + if (options.arrays || options.defaults) + object.location = []; + if (message.location && message.location.length) { + object.location = []; + for (var j = 0; j < message.location.length; ++j) + object.location[j] = $root.google.protobuf.SourceCodeInfo.Location.toObject(message.location[j], options); } - if (message.kind != null && message.hasOwnProperty("kind")) - object.kind = message.kind; - if (message.path != null && message.hasOwnProperty("path")) - object.path = message.path; return object; }; /** - * Converts this CustomHttpPattern to JSON. + * Converts this SourceCodeInfo to JSON. * @function toJSON - * @memberof google.api.CustomHttpPattern + * @memberof google.protobuf.SourceCodeInfo * @instance * @returns {Object.} JSON object */ - CustomHttpPattern.prototype.toJSON = function toJSON() { + SourceCodeInfo.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return CustomHttpPattern; - })(); - - /** - * FieldBehavior enum. - * @name google.api.FieldBehavior - * @enum {string} - * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value - * @property {number} OPTIONAL=1 OPTIONAL value - * @property {number} REQUIRED=2 REQUIRED value - * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value - * @property {number} INPUT_ONLY=4 INPUT_ONLY value - * @property {number} IMMUTABLE=5 IMMUTABLE value - */ - api.FieldBehavior = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0; - values[valuesById[1] = "OPTIONAL"] = 1; - values[valuesById[2] = "REQUIRED"] = 2; - values[valuesById[3] = "OUTPUT_ONLY"] = 3; - values[valuesById[4] = "INPUT_ONLY"] = 4; - values[valuesById[5] = "IMMUTABLE"] = 5; - return values; - })(); - - api.ResourceDescriptor = (function() { - - /** - * Properties of a ResourceDescriptor. - * @memberof google.api - * @interface IResourceDescriptor - * @property {string|null} [type] ResourceDescriptor type - * @property {Array.|null} [pattern] ResourceDescriptor pattern - * @property {string|null} [nameField] ResourceDescriptor nameField - * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history - * @property {string|null} [plural] ResourceDescriptor plural - * @property {string|null} [singular] ResourceDescriptor singular - */ + SourceCodeInfo.Location = (function() { - /** - * Constructs a new ResourceDescriptor. - * @memberof google.api - * @classdesc Represents a ResourceDescriptor. - * @implements IResourceDescriptor - * @constructor - * @param {google.api.IResourceDescriptor=} [properties] Properties to set - */ - function ResourceDescriptor(properties) { - this.pattern = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of a Location. + * @memberof google.protobuf.SourceCodeInfo + * @interface ILocation + * @property {Array.|null} [path] Location path + * @property {Array.|null} [span] Location span + * @property {string|null} [leadingComments] Location leadingComments + * @property {string|null} [trailingComments] Location trailingComments + * @property {Array.|null} [leadingDetachedComments] Location leadingDetachedComments + */ - /** - * ResourceDescriptor type. - * @member {string} type - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.type = ""; + /** + * Constructs a new Location. + * @memberof google.protobuf.SourceCodeInfo + * @classdesc Represents a Location. + * @implements ILocation + * @constructor + * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set + */ + function Location(properties) { + this.path = []; + this.span = []; + this.leadingDetachedComments = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * ResourceDescriptor pattern. - * @member {Array.} pattern - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.pattern = $util.emptyArray; + /** + * Location path. + * @member {Array.} path + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.path = $util.emptyArray; - /** - * ResourceDescriptor nameField. - * @member {string} nameField - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.nameField = ""; + /** + * Location span. + * @member {Array.} span + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.span = $util.emptyArray; - /** - * ResourceDescriptor history. - * @member {google.api.ResourceDescriptor.History} history - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.history = 0; + /** + * Location leadingComments. + * @member {string} leadingComments + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.leadingComments = ""; - /** - * ResourceDescriptor plural. - * @member {string} plural - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.plural = ""; + /** + * Location trailingComments. + * @member {string} trailingComments + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.trailingComments = ""; - /** - * ResourceDescriptor singular. - * @member {string} singular - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.singular = ""; + /** + * Location leadingDetachedComments. + * @member {Array.} leadingDetachedComments + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + */ + Location.prototype.leadingDetachedComments = $util.emptyArray; - /** - * Creates a new ResourceDescriptor instance using the specified properties. - * @function create - * @memberof google.api.ResourceDescriptor - * @static - * @param {google.api.IResourceDescriptor=} [properties] Properties to set - * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance - */ - ResourceDescriptor.create = function create(properties) { - return new ResourceDescriptor(properties); - }; + /** + * Creates a new Location instance using the specified properties. + * @function create + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set + * @returns {google.protobuf.SourceCodeInfo.Location} Location instance + */ + Location.create = function create(properties) { + return new Location(properties); + }; - /** - * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @function encode - * @memberof google.api.ResourceDescriptor - * @static - * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ResourceDescriptor.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.type != null && message.hasOwnProperty("type")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); - if (message.pattern != null && message.pattern.length) - for (var i = 0; i < message.pattern.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]); - if (message.nameField != null && message.hasOwnProperty("nameField")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField); - if (message.history != null && message.hasOwnProperty("history")) - writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history); - if (message.plural != null && message.hasOwnProperty("plural")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); - if (message.singular != null && message.hasOwnProperty("singular")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); - return writer; - }; + /** + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @function encode + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Location.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.path != null && message.path.length) { + writer.uint32(/* id 1, wireType 2 =*/10).fork(); + for (var i = 0; i < message.path.length; ++i) + writer.int32(message.path[i]); + writer.ldelim(); + } + if (message.span != null && message.span.length) { + writer.uint32(/* id 2, wireType 2 =*/18).fork(); + for (var i = 0; i < message.span.length; ++i) + writer.int32(message.span[i]); + writer.ldelim(); + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.leadingComments); + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.trailingComments); + if (message.leadingDetachedComments != null && message.leadingDetachedComments.length) + for (var i = 0; i < message.leadingDetachedComments.length; ++i) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.leadingDetachedComments[i]); + return writer; + }; - /** - * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.ResourceDescriptor - * @static - * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Location.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer. - * @function decode - * @memberof google.api.ResourceDescriptor - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.ResourceDescriptor} ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ResourceDescriptor.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.type = reader.string(); - break; - case 2: - if (!(message.pattern && message.pattern.length)) - message.pattern = []; - message.pattern.push(reader.string()); - break; - case 3: - message.nameField = reader.string(); - break; - case 4: - message.history = reader.int32(); - break; - case 5: - message.plural = reader.string(); - break; - case 6: - message.singular = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a Location message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.SourceCodeInfo.Location} Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Location.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo.Location(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.path && message.path.length)) + message.path = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.path.push(reader.int32()); + } else + message.path.push(reader.int32()); + break; + case 2: + if (!(message.span && message.span.length)) + message.span = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.span.push(reader.int32()); + } else + message.span.push(reader.int32()); + break; + case 3: + message.leadingComments = reader.string(); + break; + case 4: + message.trailingComments = reader.string(); + break; + case 6: + if (!(message.leadingDetachedComments && message.leadingDetachedComments.length)) + message.leadingDetachedComments = []; + message.leadingDetachedComments.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.ResourceDescriptor - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.ResourceDescriptor} ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a Location message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.SourceCodeInfo.Location} Location + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Location.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a ResourceDescriptor message. - * @function verify - * @memberof google.api.ResourceDescriptor - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ResourceDescriptor.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.type != null && message.hasOwnProperty("type")) - if (!$util.isString(message.type)) - return "type: string expected"; - if (message.pattern != null && message.hasOwnProperty("pattern")) { - if (!Array.isArray(message.pattern)) - return "pattern: array expected"; - for (var i = 0; i < message.pattern.length; ++i) - if (!$util.isString(message.pattern[i])) - return "pattern: string[] expected"; - } - if (message.nameField != null && message.hasOwnProperty("nameField")) - if (!$util.isString(message.nameField)) - return "nameField: string expected"; - if (message.history != null && message.hasOwnProperty("history")) - switch (message.history) { - default: - return "history: enum value expected"; - case 0: - case 1: - case 2: - break; + /** + * Verifies a Location message. + * @function verify + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Location.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.path != null && message.hasOwnProperty("path")) { + if (!Array.isArray(message.path)) + return "path: array expected"; + for (var i = 0; i < message.path.length; ++i) + if (!$util.isInteger(message.path[i])) + return "path: integer[] expected"; + } + if (message.span != null && message.hasOwnProperty("span")) { + if (!Array.isArray(message.span)) + return "span: array expected"; + for (var i = 0; i < message.span.length; ++i) + if (!$util.isInteger(message.span[i])) + return "span: integer[] expected"; + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + if (!$util.isString(message.leadingComments)) + return "leadingComments: string expected"; + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + if (!$util.isString(message.trailingComments)) + return "trailingComments: string expected"; + if (message.leadingDetachedComments != null && message.hasOwnProperty("leadingDetachedComments")) { + if (!Array.isArray(message.leadingDetachedComments)) + return "leadingDetachedComments: array expected"; + for (var i = 0; i < message.leadingDetachedComments.length; ++i) + if (!$util.isString(message.leadingDetachedComments[i])) + return "leadingDetachedComments: string[] expected"; + } + return null; + }; + + /** + * Creates a Location message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.SourceCodeInfo.Location} Location + */ + Location.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.SourceCodeInfo.Location) + return object; + var message = new $root.google.protobuf.SourceCodeInfo.Location(); + if (object.path) { + if (!Array.isArray(object.path)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.path: array expected"); + message.path = []; + for (var i = 0; i < object.path.length; ++i) + message.path[i] = object.path[i] | 0; + } + if (object.span) { + if (!Array.isArray(object.span)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.span: array expected"); + message.span = []; + for (var i = 0; i < object.span.length; ++i) + message.span[i] = object.span[i] | 0; } - if (message.plural != null && message.hasOwnProperty("plural")) - if (!$util.isString(message.plural)) - return "plural: string expected"; - if (message.singular != null && message.hasOwnProperty("singular")) - if (!$util.isString(message.singular)) - return "singular: string expected"; - return null; - }; + if (object.leadingComments != null) + message.leadingComments = String(object.leadingComments); + if (object.trailingComments != null) + message.trailingComments = String(object.trailingComments); + if (object.leadingDetachedComments) { + if (!Array.isArray(object.leadingDetachedComments)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.leadingDetachedComments: array expected"); + message.leadingDetachedComments = []; + for (var i = 0; i < object.leadingDetachedComments.length; ++i) + message.leadingDetachedComments[i] = String(object.leadingDetachedComments[i]); + } + return message; + }; - /** - * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.ResourceDescriptor - * @static - * @param {Object.} object Plain object - * @returns {google.api.ResourceDescriptor} ResourceDescriptor - */ - ResourceDescriptor.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.ResourceDescriptor) + /** + * Creates a plain object from a Location message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {google.protobuf.SourceCodeInfo.Location} message Location + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Location.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.path = []; + object.span = []; + object.leadingDetachedComments = []; + } + if (options.defaults) { + object.leadingComments = ""; + object.trailingComments = ""; + } + if (message.path && message.path.length) { + object.path = []; + for (var j = 0; j < message.path.length; ++j) + object.path[j] = message.path[j]; + } + if (message.span && message.span.length) { + object.span = []; + for (var j = 0; j < message.span.length; ++j) + object.span[j] = message.span[j]; + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + object.leadingComments = message.leadingComments; + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + object.trailingComments = message.trailingComments; + if (message.leadingDetachedComments && message.leadingDetachedComments.length) { + object.leadingDetachedComments = []; + for (var j = 0; j < message.leadingDetachedComments.length; ++j) + object.leadingDetachedComments[j] = message.leadingDetachedComments[j]; + } return object; - var message = new $root.google.api.ResourceDescriptor(); - if (object.type != null) - message.type = String(object.type); - if (object.pattern) { - if (!Array.isArray(object.pattern)) - throw TypeError(".google.api.ResourceDescriptor.pattern: array expected"); - message.pattern = []; - for (var i = 0; i < object.pattern.length; ++i) - message.pattern[i] = String(object.pattern[i]); - } - if (object.nameField != null) - message.nameField = String(object.nameField); - switch (object.history) { - case "HISTORY_UNSPECIFIED": - case 0: - message.history = 0; - break; - case "ORIGINALLY_SINGLE_PATTERN": - case 1: - message.history = 1; - break; - case "FUTURE_MULTI_PATTERN": - case 2: - message.history = 2; - break; - } - if (object.plural != null) - message.plural = String(object.plural); - if (object.singular != null) - message.singular = String(object.singular); - return message; - }; - - /** - * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.ResourceDescriptor - * @static - * @param {google.api.ResourceDescriptor} message ResourceDescriptor - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ResourceDescriptor.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.pattern = []; - if (options.defaults) { - object.type = ""; - object.nameField = ""; - object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0; - object.plural = ""; - object.singular = ""; - } - if (message.type != null && message.hasOwnProperty("type")) - object.type = message.type; - if (message.pattern && message.pattern.length) { - object.pattern = []; - for (var j = 0; j < message.pattern.length; ++j) - object.pattern[j] = message.pattern[j]; - } - if (message.nameField != null && message.hasOwnProperty("nameField")) - object.nameField = message.nameField; - if (message.history != null && message.hasOwnProperty("history")) - object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history; - if (message.plural != null && message.hasOwnProperty("plural")) - object.plural = message.plural; - if (message.singular != null && message.hasOwnProperty("singular")) - object.singular = message.singular; - return object; - }; + }; - /** - * Converts this ResourceDescriptor to JSON. - * @function toJSON - * @memberof google.api.ResourceDescriptor - * @instance - * @returns {Object.} JSON object - */ - ResourceDescriptor.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this Location to JSON. + * @function toJSON + * @memberof google.protobuf.SourceCodeInfo.Location + * @instance + * @returns {Object.} JSON object + */ + Location.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * History enum. - * @name google.api.ResourceDescriptor.History - * @enum {string} - * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value - * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value - * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value - */ - ResourceDescriptor.History = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0; - values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1; - values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2; - return values; + return Location; })(); - return ResourceDescriptor; + return SourceCodeInfo; })(); - api.ResourceReference = (function() { + protobuf.GeneratedCodeInfo = (function() { /** - * Properties of a ResourceReference. - * @memberof google.api - * @interface IResourceReference - * @property {string|null} [type] ResourceReference type - * @property {string|null} [childType] ResourceReference childType + * Properties of a GeneratedCodeInfo. + * @memberof google.protobuf + * @interface IGeneratedCodeInfo + * @property {Array.|null} [annotation] GeneratedCodeInfo annotation */ /** - * Constructs a new ResourceReference. - * @memberof google.api - * @classdesc Represents a ResourceReference. - * @implements IResourceReference + * Constructs a new GeneratedCodeInfo. + * @memberof google.protobuf + * @classdesc Represents a GeneratedCodeInfo. + * @implements IGeneratedCodeInfo * @constructor - * @param {google.api.IResourceReference=} [properties] Properties to set + * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set */ - function ResourceReference(properties) { + function GeneratedCodeInfo(properties) { + this.annotation = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -11758,221 +12557,486 @@ } /** - * ResourceReference type. - * @member {string} type - * @memberof google.api.ResourceReference - * @instance - */ - ResourceReference.prototype.type = ""; - - /** - * ResourceReference childType. - * @member {string} childType - * @memberof google.api.ResourceReference + * GeneratedCodeInfo annotation. + * @member {Array.} annotation + * @memberof google.protobuf.GeneratedCodeInfo * @instance */ - ResourceReference.prototype.childType = ""; + GeneratedCodeInfo.prototype.annotation = $util.emptyArray; /** - * Creates a new ResourceReference instance using the specified properties. + * Creates a new GeneratedCodeInfo instance using the specified properties. * @function create - * @memberof google.api.ResourceReference + * @memberof google.protobuf.GeneratedCodeInfo * @static - * @param {google.api.IResourceReference=} [properties] Properties to set - * @returns {google.api.ResourceReference} ResourceReference instance + * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo instance */ - ResourceReference.create = function create(properties) { - return new ResourceReference(properties); + GeneratedCodeInfo.create = function create(properties) { + return new GeneratedCodeInfo(properties); }; /** - * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. * @function encode - * @memberof google.api.ResourceReference + * @memberof google.protobuf.GeneratedCodeInfo * @static - * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ResourceReference.encode = function encode(message, writer) { + GeneratedCodeInfo.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.type != null && message.hasOwnProperty("type")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); - if (message.childType != null && message.hasOwnProperty("childType")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType); + if (message.annotation != null && message.annotation.length) + for (var i = 0; i < message.annotation.length; ++i) + $root.google.protobuf.GeneratedCodeInfo.Annotation.encode(message.annotation[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; /** - * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. * @function encodeDelimited - * @memberof google.api.ResourceReference + * @memberof google.protobuf.GeneratedCodeInfo * @static - * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ResourceReference.encodeDelimited = function encodeDelimited(message, writer) { + GeneratedCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ResourceReference message from the specified reader or buffer. + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. * @function decode - * @memberof google.api.ResourceReference + * @memberof google.protobuf.GeneratedCodeInfo * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.api.ResourceReference} ResourceReference + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ResourceReference.decode = function decode(reader, length) { + GeneratedCodeInfo.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.type = reader.string(); - break; - case 2: - message.childType = reader.string(); + if (!(message.annotation && message.annotation.length)) + message.annotation = []; + message.annotation.push($root.google.protobuf.GeneratedCodeInfo.Annotation.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); break; } - } - return message; - }; + } + return message; + }; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GeneratedCodeInfo.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GeneratedCodeInfo message. + * @function verify + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GeneratedCodeInfo.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.annotation != null && message.hasOwnProperty("annotation")) { + if (!Array.isArray(message.annotation)) + return "annotation: array expected"; + for (var i = 0; i < message.annotation.length; ++i) { + var error = $root.google.protobuf.GeneratedCodeInfo.Annotation.verify(message.annotation[i]); + if (error) + return "annotation." + error; + } + } + return null; + }; + + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo + */ + GeneratedCodeInfo.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.GeneratedCodeInfo) + return object; + var message = new $root.google.protobuf.GeneratedCodeInfo(); + if (object.annotation) { + if (!Array.isArray(object.annotation)) + throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: array expected"); + message.annotation = []; + for (var i = 0; i < object.annotation.length; ++i) { + if (typeof object.annotation[i] !== "object") + throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: object expected"); + message.annotation[i] = $root.google.protobuf.GeneratedCodeInfo.Annotation.fromObject(object.annotation[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.GeneratedCodeInfo} message GeneratedCodeInfo + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GeneratedCodeInfo.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.annotation = []; + if (message.annotation && message.annotation.length) { + object.annotation = []; + for (var j = 0; j < message.annotation.length; ++j) + object.annotation[j] = $root.google.protobuf.GeneratedCodeInfo.Annotation.toObject(message.annotation[j], options); + } + return object; + }; + + /** + * Converts this GeneratedCodeInfo to JSON. + * @function toJSON + * @memberof google.protobuf.GeneratedCodeInfo + * @instance + * @returns {Object.} JSON object + */ + GeneratedCodeInfo.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + GeneratedCodeInfo.Annotation = (function() { + + /** + * Properties of an Annotation. + * @memberof google.protobuf.GeneratedCodeInfo + * @interface IAnnotation + * @property {Array.|null} [path] Annotation path + * @property {string|null} [sourceFile] Annotation sourceFile + * @property {number|null} [begin] Annotation begin + * @property {number|null} [end] Annotation end + */ + + /** + * Constructs a new Annotation. + * @memberof google.protobuf.GeneratedCodeInfo + * @classdesc Represents an Annotation. + * @implements IAnnotation + * @constructor + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set + */ + function Annotation(properties) { + this.path = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Annotation path. + * @member {Array.} path + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.path = $util.emptyArray; + + /** + * Annotation sourceFile. + * @member {string} sourceFile + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.sourceFile = ""; + + /** + * Annotation begin. + * @member {number} begin + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.begin = 0; + + /** + * Annotation end. + * @member {number} end + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.end = 0; + + /** + * Creates a new Annotation instance using the specified properties. + * @function create + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation instance + */ + Annotation.create = function create(properties) { + return new Annotation(properties); + }; + + /** + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @function encode + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Annotation.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.path != null && message.path.length) { + writer.uint32(/* id 1, wireType 2 =*/10).fork(); + for (var i = 0; i < message.path.length; ++i) + writer.int32(message.path[i]); + writer.ldelim(); + } + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.sourceFile); + if (message.begin != null && message.hasOwnProperty("begin")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.begin); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.end); + return writer; + }; + + /** + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Annotation.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an Annotation message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Annotation.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.path && message.path.length)) + message.path = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.path.push(reader.int32()); + } else + message.path.push(reader.int32()); + break; + case 2: + message.sourceFile = reader.string(); + break; + case 3: + message.begin = reader.int32(); + break; + case 4: + message.end = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Decodes a ResourceReference message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.ResourceReference - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.ResourceReference} ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ResourceReference.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes an Annotation message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Annotation.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a ResourceReference message. - * @function verify - * @memberof google.api.ResourceReference - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ResourceReference.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.type != null && message.hasOwnProperty("type")) - if (!$util.isString(message.type)) - return "type: string expected"; - if (message.childType != null && message.hasOwnProperty("childType")) - if (!$util.isString(message.childType)) - return "childType: string expected"; - return null; - }; + /** + * Verifies an Annotation message. + * @function verify + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Annotation.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.path != null && message.hasOwnProperty("path")) { + if (!Array.isArray(message.path)) + return "path: array expected"; + for (var i = 0; i < message.path.length; ++i) + if (!$util.isInteger(message.path[i])) + return "path: integer[] expected"; + } + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + if (!$util.isString(message.sourceFile)) + return "sourceFile: string expected"; + if (message.begin != null && message.hasOwnProperty("begin")) + if (!$util.isInteger(message.begin)) + return "begin: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; + return null; + }; - /** - * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.ResourceReference - * @static - * @param {Object.} object Plain object - * @returns {google.api.ResourceReference} ResourceReference - */ - ResourceReference.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.ResourceReference) + /** + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation + */ + Annotation.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.GeneratedCodeInfo.Annotation) + return object; + var message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); + if (object.path) { + if (!Array.isArray(object.path)) + throw TypeError(".google.protobuf.GeneratedCodeInfo.Annotation.path: array expected"); + message.path = []; + for (var i = 0; i < object.path.length; ++i) + message.path[i] = object.path[i] | 0; + } + if (object.sourceFile != null) + message.sourceFile = String(object.sourceFile); + if (object.begin != null) + message.begin = object.begin | 0; + if (object.end != null) + message.end = object.end | 0; + return message; + }; + + /** + * Creates a plain object from an Annotation message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {google.protobuf.GeneratedCodeInfo.Annotation} message Annotation + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Annotation.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.path = []; + if (options.defaults) { + object.sourceFile = ""; + object.begin = 0; + object.end = 0; + } + if (message.path && message.path.length) { + object.path = []; + for (var j = 0; j < message.path.length; ++j) + object.path[j] = message.path[j]; + } + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + object.sourceFile = message.sourceFile; + if (message.begin != null && message.hasOwnProperty("begin")) + object.begin = message.begin; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; return object; - var message = new $root.google.api.ResourceReference(); - if (object.type != null) - message.type = String(object.type); - if (object.childType != null) - message.childType = String(object.childType); - return message; - }; + }; - /** - * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.ResourceReference - * @static - * @param {google.api.ResourceReference} message ResourceReference - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ResourceReference.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.type = ""; - object.childType = ""; - } - if (message.type != null && message.hasOwnProperty("type")) - object.type = message.type; - if (message.childType != null && message.hasOwnProperty("childType")) - object.childType = message.childType; - return object; - }; + /** + * Converts this Annotation to JSON. + * @function toJSON + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + * @returns {Object.} JSON object + */ + Annotation.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this ResourceReference to JSON. - * @function toJSON - * @memberof google.api.ResourceReference - * @instance - * @returns {Object.} JSON object - */ - ResourceReference.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return Annotation; + })(); - return ResourceReference; + return GeneratedCodeInfo; })(); - return api; - })(); - - google.protobuf = (function() { - - /** - * Namespace protobuf. - * @memberof google - * @namespace - */ - var protobuf = {}; - - protobuf.FileDescriptorSet = (function() { + protobuf.Duration = (function() { /** - * Properties of a FileDescriptorSet. + * Properties of a Duration. * @memberof google.protobuf - * @interface IFileDescriptorSet - * @property {Array.|null} [file] FileDescriptorSet file + * @interface IDuration + * @property {number|Long|null} [seconds] Duration seconds + * @property {number|null} [nanos] Duration nanos */ /** - * Constructs a new FileDescriptorSet. + * Constructs a new Duration. * @memberof google.protobuf - * @classdesc Represents a FileDescriptorSet. - * @implements IFileDescriptorSet + * @classdesc Represents a Duration. + * @implements IDuration * @constructor - * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set + * @param {google.protobuf.IDuration=} [properties] Properties to set */ - function FileDescriptorSet(properties) { - this.file = []; + function Duration(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -11980,78 +13044,88 @@ } /** - * FileDescriptorSet file. - * @member {Array.} file - * @memberof google.protobuf.FileDescriptorSet + * Duration seconds. + * @member {number|Long} seconds + * @memberof google.protobuf.Duration * @instance */ - FileDescriptorSet.prototype.file = $util.emptyArray; + Duration.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; /** - * Creates a new FileDescriptorSet instance using the specified properties. + * Duration nanos. + * @member {number} nanos + * @memberof google.protobuf.Duration + * @instance + */ + Duration.prototype.nanos = 0; + + /** + * Creates a new Duration instance using the specified properties. * @function create - * @memberof google.protobuf.FileDescriptorSet + * @memberof google.protobuf.Duration * @static - * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set - * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet instance + * @param {google.protobuf.IDuration=} [properties] Properties to set + * @returns {google.protobuf.Duration} Duration instance */ - FileDescriptorSet.create = function create(properties) { - return new FileDescriptorSet(properties); + Duration.create = function create(properties) { + return new Duration(properties); }; /** - * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. * @function encode - * @memberof google.protobuf.FileDescriptorSet + * @memberof google.protobuf.Duration * @static - * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode + * @param {google.protobuf.IDuration} message Duration message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - FileDescriptorSet.encode = function encode(message, writer) { + Duration.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.file != null && message.file.length) - for (var i = 0; i < message.file.length; ++i) - $root.google.protobuf.FileDescriptorProto.encode(message.file[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.seconds != null && message.hasOwnProperty("seconds")) + writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); + if (message.nanos != null && message.hasOwnProperty("nanos")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); return writer; }; /** - * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.FileDescriptorSet + * @memberof google.protobuf.Duration * @static - * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode + * @param {google.protobuf.IDuration} message Duration message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - FileDescriptorSet.encodeDelimited = function encodeDelimited(message, writer) { + Duration.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a FileDescriptorSet message from the specified reader or buffer. + * Decodes a Duration message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.FileDescriptorSet + * @memberof google.protobuf.Duration * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + * @returns {google.protobuf.Duration} Duration * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FileDescriptorSet.decode = function decode(reader, length) { + Duration.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorSet(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Duration(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.file && message.file.length)) - message.file = []; - message.file.push($root.google.protobuf.FileDescriptorProto.decode(reader, reader.uint32())); + message.seconds = reader.int64(); + break; + case 2: + message.nanos = reader.int32(); break; default: reader.skipType(tag & 7); @@ -12062,393 +13136,193 @@ }; /** - * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * Decodes a Duration message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.FileDescriptorSet + * @memberof google.protobuf.Duration * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + * @returns {google.protobuf.Duration} Duration * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FileDescriptorSet.decodeDelimited = function decodeDelimited(reader) { + Duration.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a FileDescriptorSet message. - * @function verify - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FileDescriptorSet.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.file != null && message.hasOwnProperty("file")) { - if (!Array.isArray(message.file)) - return "file: array expected"; - for (var i = 0; i < message.file.length; ++i) { - var error = $root.google.protobuf.FileDescriptorProto.verify(message.file[i]); - if (error) - return "file." + error; - } - } - return null; - }; - - /** - * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet - */ - FileDescriptorSet.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FileDescriptorSet) - return object; - var message = new $root.google.protobuf.FileDescriptorSet(); - if (object.file) { - if (!Array.isArray(object.file)) - throw TypeError(".google.protobuf.FileDescriptorSet.file: array expected"); - message.file = []; - for (var i = 0; i < object.file.length; ++i) { - if (typeof object.file[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorSet.file: object expected"); - message.file[i] = $root.google.protobuf.FileDescriptorProto.fromObject(object.file[i]); - } - } - return message; - }; - - /** - * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {google.protobuf.FileDescriptorSet} message FileDescriptorSet - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FileDescriptorSet.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.file = []; - if (message.file && message.file.length) { - object.file = []; - for (var j = 0; j < message.file.length; ++j) - object.file[j] = $root.google.protobuf.FileDescriptorProto.toObject(message.file[j], options); - } - return object; - }; - - /** - * Converts this FileDescriptorSet to JSON. - * @function toJSON - * @memberof google.protobuf.FileDescriptorSet - * @instance - * @returns {Object.} JSON object - */ - FileDescriptorSet.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return FileDescriptorSet; - })(); - - protobuf.FileDescriptorProto = (function() { - - /** - * Properties of a FileDescriptorProto. - * @memberof google.protobuf - * @interface IFileDescriptorProto - * @property {string|null} [name] FileDescriptorProto name - * @property {string|null} ["package"] FileDescriptorProto package - * @property {Array.|null} [dependency] FileDescriptorProto dependency - * @property {Array.|null} [publicDependency] FileDescriptorProto publicDependency - * @property {Array.|null} [weakDependency] FileDescriptorProto weakDependency - * @property {Array.|null} [messageType] FileDescriptorProto messageType - * @property {Array.|null} [enumType] FileDescriptorProto enumType - * @property {Array.|null} [service] FileDescriptorProto service - * @property {Array.|null} [extension] FileDescriptorProto extension - * @property {google.protobuf.IFileOptions|null} [options] FileDescriptorProto options - * @property {google.protobuf.ISourceCodeInfo|null} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo - * @property {string|null} [syntax] FileDescriptorProto syntax - */ - - /** - * Constructs a new FileDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a FileDescriptorProto. - * @implements IFileDescriptorProto - * @constructor - * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set - */ - function FileDescriptorProto(properties) { - this.dependency = []; - this.publicDependency = []; - this.weakDependency = []; - this.messageType = []; - this.enumType = []; - this.service = []; - this.extension = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * FileDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.name = ""; - - /** - * FileDescriptorProto package. - * @member {string} package - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype["package"] = ""; - - /** - * FileDescriptorProto dependency. - * @member {Array.} dependency - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.dependency = $util.emptyArray; - - /** - * FileDescriptorProto publicDependency. - * @member {Array.} publicDependency - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.publicDependency = $util.emptyArray; - - /** - * FileDescriptorProto weakDependency. - * @member {Array.} weakDependency - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.weakDependency = $util.emptyArray; - - /** - * FileDescriptorProto messageType. - * @member {Array.} messageType - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.messageType = $util.emptyArray; - - /** - * FileDescriptorProto enumType. - * @member {Array.} enumType - * @memberof google.protobuf.FileDescriptorProto - * @instance + * Verifies a Duration message. + * @function verify + * @memberof google.protobuf.Duration + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - FileDescriptorProto.prototype.enumType = $util.emptyArray; + Duration.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) + return "seconds: integer|Long expected"; + if (message.nanos != null && message.hasOwnProperty("nanos")) + if (!$util.isInteger(message.nanos)) + return "nanos: integer expected"; + return null; + }; /** - * FileDescriptorProto service. - * @member {Array.} service - * @memberof google.protobuf.FileDescriptorProto - * @instance + * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.Duration + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.Duration} Duration */ - FileDescriptorProto.prototype.service = $util.emptyArray; + Duration.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Duration) + return object; + var message = new $root.google.protobuf.Duration(); + if (object.seconds != null) + if ($util.Long) + (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; + else if (typeof object.seconds === "string") + message.seconds = parseInt(object.seconds, 10); + else if (typeof object.seconds === "number") + message.seconds = object.seconds; + else if (typeof object.seconds === "object") + message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); + if (object.nanos != null) + message.nanos = object.nanos | 0; + return message; + }; /** - * FileDescriptorProto extension. - * @member {Array.} extension - * @memberof google.protobuf.FileDescriptorProto - * @instance + * Creates a plain object from a Duration message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.Duration} message Duration + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object */ - FileDescriptorProto.prototype.extension = $util.emptyArray; + Duration.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.seconds = options.longs === String ? "0" : 0; + object.nanos = 0; + } + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (typeof message.seconds === "number") + object.seconds = options.longs === String ? String(message.seconds) : message.seconds; + else + object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; + if (message.nanos != null && message.hasOwnProperty("nanos")) + object.nanos = message.nanos; + return object; + }; /** - * FileDescriptorProto options. - * @member {google.protobuf.IFileOptions|null|undefined} options - * @memberof google.protobuf.FileDescriptorProto + * Converts this Duration to JSON. + * @function toJSON + * @memberof google.protobuf.Duration * @instance + * @returns {Object.} JSON object */ - FileDescriptorProto.prototype.options = null; + Duration.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Duration; + })(); + + protobuf.Empty = (function() { /** - * FileDescriptorProto sourceCodeInfo. - * @member {google.protobuf.ISourceCodeInfo|null|undefined} sourceCodeInfo - * @memberof google.protobuf.FileDescriptorProto - * @instance + * Properties of an Empty. + * @memberof google.protobuf + * @interface IEmpty */ - FileDescriptorProto.prototype.sourceCodeInfo = null; /** - * FileDescriptorProto syntax. - * @member {string} syntax - * @memberof google.protobuf.FileDescriptorProto - * @instance + * Constructs a new Empty. + * @memberof google.protobuf + * @classdesc Represents an Empty. + * @implements IEmpty + * @constructor + * @param {google.protobuf.IEmpty=} [properties] Properties to set */ - FileDescriptorProto.prototype.syntax = ""; + function Empty(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * Creates a new FileDescriptorProto instance using the specified properties. + * Creates a new Empty instance using the specified properties. * @function create - * @memberof google.protobuf.FileDescriptorProto + * @memberof google.protobuf.Empty * @static - * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto instance + * @param {google.protobuf.IEmpty=} [properties] Properties to set + * @returns {google.protobuf.Empty} Empty instance */ - FileDescriptorProto.create = function create(properties) { - return new FileDescriptorProto(properties); + Empty.create = function create(properties) { + return new Empty(properties); }; /** - * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. * @function encode - * @memberof google.protobuf.FileDescriptorProto + * @memberof google.protobuf.Empty * @static - * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode + * @param {google.protobuf.IEmpty} message Empty message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - FileDescriptorProto.encode = function encode(message, writer) { + Empty.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message["package"] != null && message.hasOwnProperty("package")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message["package"]); - if (message.dependency != null && message.dependency.length) - for (var i = 0; i < message.dependency.length; ++i) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.dependency[i]); - if (message.messageType != null && message.messageType.length) - for (var i = 0; i < message.messageType.length; ++i) - $root.google.protobuf.DescriptorProto.encode(message.messageType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.enumType != null && message.enumType.length) - for (var i = 0; i < message.enumType.length; ++i) - $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); - if (message.service != null && message.service.length) - for (var i = 0; i < message.service.length; ++i) - $root.google.protobuf.ServiceDescriptorProto.encode(message.service[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); - if (message.extension != null && message.extension.length) - for (var i = 0; i < message.extension.length; ++i) - $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.FileOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) - $root.google.protobuf.SourceCodeInfo.encode(message.sourceCodeInfo, writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); - if (message.publicDependency != null && message.publicDependency.length) - for (var i = 0; i < message.publicDependency.length; ++i) - writer.uint32(/* id 10, wireType 0 =*/80).int32(message.publicDependency[i]); - if (message.weakDependency != null && message.weakDependency.length) - for (var i = 0; i < message.weakDependency.length; ++i) - writer.uint32(/* id 11, wireType 0 =*/88).int32(message.weakDependency[i]); - if (message.syntax != null && message.hasOwnProperty("syntax")) - writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); return writer; }; /** - * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.FileDescriptorProto + * @memberof google.protobuf.Empty * @static - * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode + * @param {google.protobuf.IEmpty} message Empty message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - FileDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + Empty.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a FileDescriptorProto message from the specified reader or buffer. + * Decodes an Empty message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.FileDescriptorProto + * @memberof google.protobuf.Empty * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + * @returns {google.protobuf.Empty} Empty * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FileDescriptorProto.decode = function decode(reader, length) { + Empty.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorProto(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Empty(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message["package"] = reader.string(); - break; - case 3: - if (!(message.dependency && message.dependency.length)) - message.dependency = []; - message.dependency.push(reader.string()); - break; - case 10: - if (!(message.publicDependency && message.publicDependency.length)) - message.publicDependency = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.publicDependency.push(reader.int32()); - } else - message.publicDependency.push(reader.int32()); - break; - case 11: - if (!(message.weakDependency && message.weakDependency.length)) - message.weakDependency = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.weakDependency.push(reader.int32()); - } else - message.weakDependency.push(reader.int32()); - break; - case 4: - if (!(message.messageType && message.messageType.length)) - message.messageType = []; - message.messageType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.enumType && message.enumType.length)) - message.enumType = []; - message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); - break; - case 6: - if (!(message.service && message.service.length)) - message.service = []; - message.service.push($root.google.protobuf.ServiceDescriptorProto.decode(reader, reader.uint32())); - break; - case 7: - if (!(message.extension && message.extension.length)) - message.extension = []; - message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 8: - message.options = $root.google.protobuf.FileOptions.decode(reader, reader.uint32()); - break; - case 9: - message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.decode(reader, reader.uint32()); - break; - case 12: - message.syntax = reader.string(); - break; default: reader.skipType(tag & 7); break; @@ -12458,329 +13332,95 @@ }; /** - * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * Decodes an Empty message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.FileDescriptorProto + * @memberof google.protobuf.Empty * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + * @returns {google.protobuf.Empty} Empty * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FileDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + Empty.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a FileDescriptorProto message. + * Verifies an Empty message. * @function verify - * @memberof google.protobuf.FileDescriptorProto + * @memberof google.protobuf.Empty * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - FileDescriptorProto.verify = function verify(message) { + Empty.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message["package"] != null && message.hasOwnProperty("package")) - if (!$util.isString(message["package"])) - return "package: string expected"; - if (message.dependency != null && message.hasOwnProperty("dependency")) { - if (!Array.isArray(message.dependency)) - return "dependency: array expected"; - for (var i = 0; i < message.dependency.length; ++i) - if (!$util.isString(message.dependency[i])) - return "dependency: string[] expected"; - } - if (message.publicDependency != null && message.hasOwnProperty("publicDependency")) { - if (!Array.isArray(message.publicDependency)) - return "publicDependency: array expected"; - for (var i = 0; i < message.publicDependency.length; ++i) - if (!$util.isInteger(message.publicDependency[i])) - return "publicDependency: integer[] expected"; - } - if (message.weakDependency != null && message.hasOwnProperty("weakDependency")) { - if (!Array.isArray(message.weakDependency)) - return "weakDependency: array expected"; - for (var i = 0; i < message.weakDependency.length; ++i) - if (!$util.isInteger(message.weakDependency[i])) - return "weakDependency: integer[] expected"; - } - if (message.messageType != null && message.hasOwnProperty("messageType")) { - if (!Array.isArray(message.messageType)) - return "messageType: array expected"; - for (var i = 0; i < message.messageType.length; ++i) { - var error = $root.google.protobuf.DescriptorProto.verify(message.messageType[i]); - if (error) - return "messageType." + error; - } - } - if (message.enumType != null && message.hasOwnProperty("enumType")) { - if (!Array.isArray(message.enumType)) - return "enumType: array expected"; - for (var i = 0; i < message.enumType.length; ++i) { - var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); - if (error) - return "enumType." + error; - } - } - if (message.service != null && message.hasOwnProperty("service")) { - if (!Array.isArray(message.service)) - return "service: array expected"; - for (var i = 0; i < message.service.length; ++i) { - var error = $root.google.protobuf.ServiceDescriptorProto.verify(message.service[i]); - if (error) - return "service." + error; - } - } - if (message.extension != null && message.hasOwnProperty("extension")) { - if (!Array.isArray(message.extension)) - return "extension: array expected"; - for (var i = 0; i < message.extension.length; ++i) { - var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); - if (error) - return "extension." + error; - } - } - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.FileOptions.verify(message.options); - if (error) - return "options." + error; - } - if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) { - var error = $root.google.protobuf.SourceCodeInfo.verify(message.sourceCodeInfo); - if (error) - return "sourceCodeInfo." + error; - } - if (message.syntax != null && message.hasOwnProperty("syntax")) - if (!$util.isString(message.syntax)) - return "syntax: string expected"; return null; }; /** - * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto - */ - FileDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FileDescriptorProto) - return object; - var message = new $root.google.protobuf.FileDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object["package"] != null) - message["package"] = String(object["package"]); - if (object.dependency) { - if (!Array.isArray(object.dependency)) - throw TypeError(".google.protobuf.FileDescriptorProto.dependency: array expected"); - message.dependency = []; - for (var i = 0; i < object.dependency.length; ++i) - message.dependency[i] = String(object.dependency[i]); - } - if (object.publicDependency) { - if (!Array.isArray(object.publicDependency)) - throw TypeError(".google.protobuf.FileDescriptorProto.publicDependency: array expected"); - message.publicDependency = []; - for (var i = 0; i < object.publicDependency.length; ++i) - message.publicDependency[i] = object.publicDependency[i] | 0; - } - if (object.weakDependency) { - if (!Array.isArray(object.weakDependency)) - throw TypeError(".google.protobuf.FileDescriptorProto.weakDependency: array expected"); - message.weakDependency = []; - for (var i = 0; i < object.weakDependency.length; ++i) - message.weakDependency[i] = object.weakDependency[i] | 0; - } - if (object.messageType) { - if (!Array.isArray(object.messageType)) - throw TypeError(".google.protobuf.FileDescriptorProto.messageType: array expected"); - message.messageType = []; - for (var i = 0; i < object.messageType.length; ++i) { - if (typeof object.messageType[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.messageType: object expected"); - message.messageType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.messageType[i]); - } - } - if (object.enumType) { - if (!Array.isArray(object.enumType)) - throw TypeError(".google.protobuf.FileDescriptorProto.enumType: array expected"); - message.enumType = []; - for (var i = 0; i < object.enumType.length; ++i) { - if (typeof object.enumType[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.enumType: object expected"); - message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); - } - } - if (object.service) { - if (!Array.isArray(object.service)) - throw TypeError(".google.protobuf.FileDescriptorProto.service: array expected"); - message.service = []; - for (var i = 0; i < object.service.length; ++i) { - if (typeof object.service[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.service: object expected"); - message.service[i] = $root.google.protobuf.ServiceDescriptorProto.fromObject(object.service[i]); - } - } - if (object.extension) { - if (!Array.isArray(object.extension)) - throw TypeError(".google.protobuf.FileDescriptorProto.extension: array expected"); - message.extension = []; - for (var i = 0; i < object.extension.length; ++i) { - if (typeof object.extension[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.extension: object expected"); - message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); - } - } - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.FileOptions.fromObject(object.options); - } - if (object.sourceCodeInfo != null) { - if (typeof object.sourceCodeInfo !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.sourceCodeInfo: object expected"); - message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.fromObject(object.sourceCodeInfo); - } - if (object.syntax != null) - message.syntax = String(object.syntax); - return message; - }; - - /** - * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {google.protobuf.FileDescriptorProto} message FileDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FileDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.dependency = []; - object.messageType = []; - object.enumType = []; - object.service = []; - object.extension = []; - object.publicDependency = []; - object.weakDependency = []; - } - if (options.defaults) { - object.name = ""; - object["package"] = ""; - object.options = null; - object.sourceCodeInfo = null; - object.syntax = ""; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message["package"] != null && message.hasOwnProperty("package")) - object["package"] = message["package"]; - if (message.dependency && message.dependency.length) { - object.dependency = []; - for (var j = 0; j < message.dependency.length; ++j) - object.dependency[j] = message.dependency[j]; - } - if (message.messageType && message.messageType.length) { - object.messageType = []; - for (var j = 0; j < message.messageType.length; ++j) - object.messageType[j] = $root.google.protobuf.DescriptorProto.toObject(message.messageType[j], options); - } - if (message.enumType && message.enumType.length) { - object.enumType = []; - for (var j = 0; j < message.enumType.length; ++j) - object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); - } - if (message.service && message.service.length) { - object.service = []; - for (var j = 0; j < message.service.length; ++j) - object.service[j] = $root.google.protobuf.ServiceDescriptorProto.toObject(message.service[j], options); - } - if (message.extension && message.extension.length) { - object.extension = []; - for (var j = 0; j < message.extension.length; ++j) - object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); - } - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.FileOptions.toObject(message.options, options); - if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) - object.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.toObject(message.sourceCodeInfo, options); - if (message.publicDependency && message.publicDependency.length) { - object.publicDependency = []; - for (var j = 0; j < message.publicDependency.length; ++j) - object.publicDependency[j] = message.publicDependency[j]; - } - if (message.weakDependency && message.weakDependency.length) { - object.weakDependency = []; - for (var j = 0; j < message.weakDependency.length; ++j) - object.weakDependency[j] = message.weakDependency[j]; - } - if (message.syntax != null && message.hasOwnProperty("syntax")) - object.syntax = message.syntax; - return object; - }; - - /** - * Converts this FileDescriptorProto to JSON. + * Creates an Empty message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.Empty + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.Empty} Empty + */ + Empty.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Empty) + return object; + return new $root.google.protobuf.Empty(); + }; + + /** + * Creates a plain object from an Empty message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.Empty} message Empty + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Empty.toObject = function toObject() { + return {}; + }; + + /** + * Converts this Empty to JSON. * @function toJSON - * @memberof google.protobuf.FileDescriptorProto + * @memberof google.protobuf.Empty * @instance * @returns {Object.} JSON object */ - FileDescriptorProto.prototype.toJSON = function toJSON() { + Empty.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return FileDescriptorProto; + return Empty; })(); - protobuf.DescriptorProto = (function() { + protobuf.FieldMask = (function() { /** - * Properties of a DescriptorProto. + * Properties of a FieldMask. * @memberof google.protobuf - * @interface IDescriptorProto - * @property {string|null} [name] DescriptorProto name - * @property {Array.|null} [field] DescriptorProto field - * @property {Array.|null} [extension] DescriptorProto extension - * @property {Array.|null} [nestedType] DescriptorProto nestedType - * @property {Array.|null} [enumType] DescriptorProto enumType - * @property {Array.|null} [extensionRange] DescriptorProto extensionRange - * @property {Array.|null} [oneofDecl] DescriptorProto oneofDecl - * @property {google.protobuf.IMessageOptions|null} [options] DescriptorProto options - * @property {Array.|null} [reservedRange] DescriptorProto reservedRange - * @property {Array.|null} [reservedName] DescriptorProto reservedName + * @interface IFieldMask + * @property {Array.|null} [paths] FieldMask paths */ /** - * Constructs a new DescriptorProto. + * Constructs a new FieldMask. * @memberof google.protobuf - * @classdesc Represents a DescriptorProto. - * @implements IDescriptorProto + * @classdesc Represents a FieldMask. + * @implements IFieldMask * @constructor - * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set + * @param {google.protobuf.IFieldMask=} [properties] Properties to set */ - function DescriptorProto(properties) { - this.field = []; - this.extension = []; - this.nestedType = []; - this.enumType = []; - this.extensionRange = []; - this.oneofDecl = []; - this.reservedRange = []; - this.reservedName = []; + function FieldMask(properties) { + this.paths = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -12788,216 +13428,291 @@ } /** - * DescriptorProto name. - * @member {string} name - * @memberof google.protobuf.DescriptorProto + * FieldMask paths. + * @member {Array.} paths + * @memberof google.protobuf.FieldMask * @instance */ - DescriptorProto.prototype.name = ""; + FieldMask.prototype.paths = $util.emptyArray; /** - * DescriptorProto field. - * @member {Array.} field - * @memberof google.protobuf.DescriptorProto - * @instance + * Creates a new FieldMask instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask=} [properties] Properties to set + * @returns {google.protobuf.FieldMask} FieldMask instance */ - DescriptorProto.prototype.field = $util.emptyArray; + FieldMask.create = function create(properties) { + return new FieldMask(properties); + }; /** - * DescriptorProto extension. - * @member {Array.} extension - * @memberof google.protobuf.DescriptorProto - * @instance + * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ - DescriptorProto.prototype.extension = $util.emptyArray; + FieldMask.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.paths != null && message.paths.length) + for (var i = 0; i < message.paths.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.paths[i]); + return writer; + }; /** - * DescriptorProto nestedType. - * @member {Array.} nestedType - * @memberof google.protobuf.DescriptorProto - * @instance + * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ - DescriptorProto.prototype.nestedType = $util.emptyArray; + FieldMask.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; /** - * DescriptorProto enumType. - * @member {Array.} enumType - * @memberof google.protobuf.DescriptorProto - * @instance + * Decodes a FieldMask message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldMask + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldMask} FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DescriptorProto.prototype.enumType = $util.emptyArray; + FieldMask.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldMask(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.paths && message.paths.length)) + message.paths = []; + message.paths.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; /** - * DescriptorProto extensionRange. - * @member {Array.} extensionRange - * @memberof google.protobuf.DescriptorProto + * Decodes a FieldMask message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldMask + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldMask} FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldMask.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FieldMask message. + * @function verify + * @memberof google.protobuf.FieldMask + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldMask.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.paths != null && message.hasOwnProperty("paths")) { + if (!Array.isArray(message.paths)) + return "paths: array expected"; + for (var i = 0; i < message.paths.length; ++i) + if (!$util.isString(message.paths[i])) + return "paths: string[] expected"; + } + return null; + }; + + /** + * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldMask + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldMask} FieldMask + */ + FieldMask.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldMask) + return object; + var message = new $root.google.protobuf.FieldMask(); + if (object.paths) { + if (!Array.isArray(object.paths)) + throw TypeError(".google.protobuf.FieldMask.paths: array expected"); + message.paths = []; + for (var i = 0; i < object.paths.length; ++i) + message.paths[i] = String(object.paths[i]); + } + return message; + }; + + /** + * Creates a plain object from a FieldMask message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.FieldMask} message FieldMask + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldMask.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.paths = []; + if (message.paths && message.paths.length) { + object.paths = []; + for (var j = 0; j < message.paths.length; ++j) + object.paths[j] = message.paths[j]; + } + return object; + }; + + /** + * Converts this FieldMask to JSON. + * @function toJSON + * @memberof google.protobuf.FieldMask * @instance + * @returns {Object.} JSON object */ - DescriptorProto.prototype.extensionRange = $util.emptyArray; + FieldMask.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return FieldMask; + })(); + + protobuf.Timestamp = (function() { /** - * DescriptorProto oneofDecl. - * @member {Array.} oneofDecl - * @memberof google.protobuf.DescriptorProto - * @instance + * Properties of a Timestamp. + * @memberof google.protobuf + * @interface ITimestamp + * @property {number|Long|null} [seconds] Timestamp seconds + * @property {number|null} [nanos] Timestamp nanos */ - DescriptorProto.prototype.oneofDecl = $util.emptyArray; /** - * DescriptorProto options. - * @member {google.protobuf.IMessageOptions|null|undefined} options - * @memberof google.protobuf.DescriptorProto - * @instance + * Constructs a new Timestamp. + * @memberof google.protobuf + * @classdesc Represents a Timestamp. + * @implements ITimestamp + * @constructor + * @param {google.protobuf.ITimestamp=} [properties] Properties to set */ - DescriptorProto.prototype.options = null; + function Timestamp(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * DescriptorProto reservedRange. - * @member {Array.} reservedRange - * @memberof google.protobuf.DescriptorProto + * Timestamp seconds. + * @member {number|Long} seconds + * @memberof google.protobuf.Timestamp * @instance */ - DescriptorProto.prototype.reservedRange = $util.emptyArray; + Timestamp.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; /** - * DescriptorProto reservedName. - * @member {Array.} reservedName - * @memberof google.protobuf.DescriptorProto + * Timestamp nanos. + * @member {number} nanos + * @memberof google.protobuf.Timestamp * @instance */ - DescriptorProto.prototype.reservedName = $util.emptyArray; + Timestamp.prototype.nanos = 0; /** - * Creates a new DescriptorProto instance using the specified properties. + * Creates a new Timestamp instance using the specified properties. * @function create - * @memberof google.protobuf.DescriptorProto + * @memberof google.protobuf.Timestamp * @static - * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.DescriptorProto} DescriptorProto instance + * @param {google.protobuf.ITimestamp=} [properties] Properties to set + * @returns {google.protobuf.Timestamp} Timestamp instance */ - DescriptorProto.create = function create(properties) { - return new DescriptorProto(properties); + Timestamp.create = function create(properties) { + return new Timestamp(properties); }; /** - * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. * @function encode - * @memberof google.protobuf.DescriptorProto + * @memberof google.protobuf.Timestamp * @static - * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode + * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - DescriptorProto.encode = function encode(message, writer) { + Timestamp.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.field != null && message.field.length) - for (var i = 0; i < message.field.length; ++i) - $root.google.protobuf.FieldDescriptorProto.encode(message.field[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.nestedType != null && message.nestedType.length) - for (var i = 0; i < message.nestedType.length; ++i) - $root.google.protobuf.DescriptorProto.encode(message.nestedType[i], writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.enumType != null && message.enumType.length) - for (var i = 0; i < message.enumType.length; ++i) - $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.extensionRange != null && message.extensionRange.length) - for (var i = 0; i < message.extensionRange.length; ++i) - $root.google.protobuf.DescriptorProto.ExtensionRange.encode(message.extensionRange[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); - if (message.extension != null && message.extension.length) - for (var i = 0; i < message.extension.length; ++i) - $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.MessageOptions.encode(message.options, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); - if (message.oneofDecl != null && message.oneofDecl.length) - for (var i = 0; i < message.oneofDecl.length; ++i) - $root.google.protobuf.OneofDescriptorProto.encode(message.oneofDecl[i], writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.reservedRange != null && message.reservedRange.length) - for (var i = 0; i < message.reservedRange.length; ++i) - $root.google.protobuf.DescriptorProto.ReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); - if (message.reservedName != null && message.reservedName.length) - for (var i = 0; i < message.reservedName.length; ++i) - writer.uint32(/* id 10, wireType 2 =*/82).string(message.reservedName[i]); + if (message.seconds != null && message.hasOwnProperty("seconds")) + writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); + if (message.nanos != null && message.hasOwnProperty("nanos")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); return writer; }; /** - * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.DescriptorProto + * @memberof google.protobuf.Timestamp * @static - * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode + * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - DescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + Timestamp.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a DescriptorProto message from the specified reader or buffer. + * Decodes a Timestamp message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.DescriptorProto + * @memberof google.protobuf.Timestamp * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @returns {google.protobuf.Timestamp} Timestamp * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DescriptorProto.decode = function decode(reader, length) { + Timestamp.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Timestamp(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.name = reader.string(); + message.seconds = reader.int64(); break; case 2: - if (!(message.field && message.field.length)) - message.field = []; - message.field.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 6: - if (!(message.extension && message.extension.length)) - message.extension = []; - message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - if (!(message.nestedType && message.nestedType.length)) - message.nestedType = []; - message.nestedType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); - break; - case 4: - if (!(message.enumType && message.enumType.length)) - message.enumType = []; - message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.extensionRange && message.extensionRange.length)) - message.extensionRange = []; - message.extensionRange.push($root.google.protobuf.DescriptorProto.ExtensionRange.decode(reader, reader.uint32())); - break; - case 8: - if (!(message.oneofDecl && message.oneofDecl.length)) - message.oneofDecl = []; - message.oneofDecl.push($root.google.protobuf.OneofDescriptorProto.decode(reader, reader.uint32())); - break; - case 7: - message.options = $root.google.protobuf.MessageOptions.decode(reader, reader.uint32()); - break; - case 9: - if (!(message.reservedRange && message.reservedRange.length)) - message.reservedRange = []; - message.reservedRange.push($root.google.protobuf.DescriptorProto.ReservedRange.decode(reader, reader.uint32())); - break; - case 10: - if (!(message.reservedName && message.reservedName.length)) - message.reservedName = []; - message.reservedName.push(reader.string()); + message.nanos = reader.int32(); break; default: reader.skipType(tag & 7); @@ -13008,2091 +13723,1655 @@ }; /** - * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * Decodes a Timestamp message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.DescriptorProto + * @memberof google.protobuf.Timestamp * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @returns {google.protobuf.Timestamp} Timestamp * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DescriptorProto.decodeDelimited = function decodeDelimited(reader) { + Timestamp.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a DescriptorProto message. - * @function verify - * @memberof google.protobuf.DescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.field != null && message.hasOwnProperty("field")) { - if (!Array.isArray(message.field)) - return "field: array expected"; - for (var i = 0; i < message.field.length; ++i) { - var error = $root.google.protobuf.FieldDescriptorProto.verify(message.field[i]); - if (error) - return "field." + error; - } - } - if (message.extension != null && message.hasOwnProperty("extension")) { - if (!Array.isArray(message.extension)) - return "extension: array expected"; - for (var i = 0; i < message.extension.length; ++i) { - var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); - if (error) - return "extension." + error; - } - } - if (message.nestedType != null && message.hasOwnProperty("nestedType")) { - if (!Array.isArray(message.nestedType)) - return "nestedType: array expected"; - for (var i = 0; i < message.nestedType.length; ++i) { - var error = $root.google.protobuf.DescriptorProto.verify(message.nestedType[i]); - if (error) - return "nestedType." + error; - } - } - if (message.enumType != null && message.hasOwnProperty("enumType")) { - if (!Array.isArray(message.enumType)) - return "enumType: array expected"; - for (var i = 0; i < message.enumType.length; ++i) { - var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); - if (error) - return "enumType." + error; - } - } - if (message.extensionRange != null && message.hasOwnProperty("extensionRange")) { - if (!Array.isArray(message.extensionRange)) - return "extensionRange: array expected"; - for (var i = 0; i < message.extensionRange.length; ++i) { - var error = $root.google.protobuf.DescriptorProto.ExtensionRange.verify(message.extensionRange[i]); - if (error) - return "extensionRange." + error; - } - } - if (message.oneofDecl != null && message.hasOwnProperty("oneofDecl")) { - if (!Array.isArray(message.oneofDecl)) - return "oneofDecl: array expected"; - for (var i = 0; i < message.oneofDecl.length; ++i) { - var error = $root.google.protobuf.OneofDescriptorProto.verify(message.oneofDecl[i]); - if (error) - return "oneofDecl." + error; - } - } - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.MessageOptions.verify(message.options); - if (error) - return "options." + error; - } - if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { - if (!Array.isArray(message.reservedRange)) - return "reservedRange: array expected"; - for (var i = 0; i < message.reservedRange.length; ++i) { - var error = $root.google.protobuf.DescriptorProto.ReservedRange.verify(message.reservedRange[i]); - if (error) - return "reservedRange." + error; - } - } - if (message.reservedName != null && message.hasOwnProperty("reservedName")) { - if (!Array.isArray(message.reservedName)) - return "reservedName: array expected"; - for (var i = 0; i < message.reservedName.length; ++i) - if (!$util.isString(message.reservedName[i])) - return "reservedName: string[] expected"; - } + * Verifies a Timestamp message. + * @function verify + * @memberof google.protobuf.Timestamp + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Timestamp.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) + return "seconds: integer|Long expected"; + if (message.nanos != null && message.hasOwnProperty("nanos")) + if (!$util.isInteger(message.nanos)) + return "nanos: integer expected"; return null; }; /** - * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.protobuf.DescriptorProto + * @memberof google.protobuf.Timestamp * @static * @param {Object.} object Plain object - * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @returns {google.protobuf.Timestamp} Timestamp */ - DescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.DescriptorProto) + Timestamp.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Timestamp) return object; - var message = new $root.google.protobuf.DescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.field) { - if (!Array.isArray(object.field)) - throw TypeError(".google.protobuf.DescriptorProto.field: array expected"); - message.field = []; - for (var i = 0; i < object.field.length; ++i) { - if (typeof object.field[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.field: object expected"); - message.field[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.field[i]); - } - } - if (object.extension) { - if (!Array.isArray(object.extension)) - throw TypeError(".google.protobuf.DescriptorProto.extension: array expected"); - message.extension = []; - for (var i = 0; i < object.extension.length; ++i) { - if (typeof object.extension[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.extension: object expected"); - message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); - } - } - if (object.nestedType) { - if (!Array.isArray(object.nestedType)) - throw TypeError(".google.protobuf.DescriptorProto.nestedType: array expected"); - message.nestedType = []; - for (var i = 0; i < object.nestedType.length; ++i) { - if (typeof object.nestedType[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.nestedType: object expected"); - message.nestedType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.nestedType[i]); - } - } - if (object.enumType) { - if (!Array.isArray(object.enumType)) - throw TypeError(".google.protobuf.DescriptorProto.enumType: array expected"); - message.enumType = []; - for (var i = 0; i < object.enumType.length; ++i) { - if (typeof object.enumType[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.enumType: object expected"); - message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); - } - } - if (object.extensionRange) { - if (!Array.isArray(object.extensionRange)) - throw TypeError(".google.protobuf.DescriptorProto.extensionRange: array expected"); - message.extensionRange = []; - for (var i = 0; i < object.extensionRange.length; ++i) { - if (typeof object.extensionRange[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.extensionRange: object expected"); - message.extensionRange[i] = $root.google.protobuf.DescriptorProto.ExtensionRange.fromObject(object.extensionRange[i]); - } - } - if (object.oneofDecl) { - if (!Array.isArray(object.oneofDecl)) - throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: array expected"); - message.oneofDecl = []; - for (var i = 0; i < object.oneofDecl.length; ++i) { - if (typeof object.oneofDecl[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: object expected"); - message.oneofDecl[i] = $root.google.protobuf.OneofDescriptorProto.fromObject(object.oneofDecl[i]); - } - } - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.DescriptorProto.options: object expected"); - message.options = $root.google.protobuf.MessageOptions.fromObject(object.options); - } - if (object.reservedRange) { - if (!Array.isArray(object.reservedRange)) - throw TypeError(".google.protobuf.DescriptorProto.reservedRange: array expected"); - message.reservedRange = []; - for (var i = 0; i < object.reservedRange.length; ++i) { - if (typeof object.reservedRange[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.reservedRange: object expected"); - message.reservedRange[i] = $root.google.protobuf.DescriptorProto.ReservedRange.fromObject(object.reservedRange[i]); - } - } - if (object.reservedName) { - if (!Array.isArray(object.reservedName)) - throw TypeError(".google.protobuf.DescriptorProto.reservedName: array expected"); - message.reservedName = []; - for (var i = 0; i < object.reservedName.length; ++i) - message.reservedName[i] = String(object.reservedName[i]); - } + var message = new $root.google.protobuf.Timestamp(); + if (object.seconds != null) + if ($util.Long) + (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; + else if (typeof object.seconds === "string") + message.seconds = parseInt(object.seconds, 10); + else if (typeof object.seconds === "number") + message.seconds = object.seconds; + else if (typeof object.seconds === "object") + message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); + if (object.nanos != null) + message.nanos = object.nanos | 0; return message; }; /** - * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * Creates a plain object from a Timestamp message. Also converts values to other types if specified. * @function toObject - * @memberof google.protobuf.DescriptorProto + * @memberof google.protobuf.Timestamp * @static - * @param {google.protobuf.DescriptorProto} message DescriptorProto + * @param {google.protobuf.Timestamp} message Timestamp * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - DescriptorProto.toObject = function toObject(message, options) { + Timestamp.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) { - object.field = []; - object.nestedType = []; - object.enumType = []; - object.extensionRange = []; - object.extension = []; - object.oneofDecl = []; - object.reservedRange = []; - object.reservedName = []; - } if (options.defaults) { - object.name = ""; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.field && message.field.length) { - object.field = []; - for (var j = 0; j < message.field.length; ++j) - object.field[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.field[j], options); - } - if (message.nestedType && message.nestedType.length) { - object.nestedType = []; - for (var j = 0; j < message.nestedType.length; ++j) - object.nestedType[j] = $root.google.protobuf.DescriptorProto.toObject(message.nestedType[j], options); - } - if (message.enumType && message.enumType.length) { - object.enumType = []; - for (var j = 0; j < message.enumType.length; ++j) - object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); - } - if (message.extensionRange && message.extensionRange.length) { - object.extensionRange = []; - for (var j = 0; j < message.extensionRange.length; ++j) - object.extensionRange[j] = $root.google.protobuf.DescriptorProto.ExtensionRange.toObject(message.extensionRange[j], options); - } - if (message.extension && message.extension.length) { - object.extension = []; - for (var j = 0; j < message.extension.length; ++j) - object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); - } - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.MessageOptions.toObject(message.options, options); - if (message.oneofDecl && message.oneofDecl.length) { - object.oneofDecl = []; - for (var j = 0; j < message.oneofDecl.length; ++j) - object.oneofDecl[j] = $root.google.protobuf.OneofDescriptorProto.toObject(message.oneofDecl[j], options); - } - if (message.reservedRange && message.reservedRange.length) { - object.reservedRange = []; - for (var j = 0; j < message.reservedRange.length; ++j) - object.reservedRange[j] = $root.google.protobuf.DescriptorProto.ReservedRange.toObject(message.reservedRange[j], options); - } - if (message.reservedName && message.reservedName.length) { - object.reservedName = []; - for (var j = 0; j < message.reservedName.length; ++j) - object.reservedName[j] = message.reservedName[j]; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.seconds = options.longs === String ? "0" : 0; + object.nanos = 0; } + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (typeof message.seconds === "number") + object.seconds = options.longs === String ? String(message.seconds) : message.seconds; + else + object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; + if (message.nanos != null && message.hasOwnProperty("nanos")) + object.nanos = message.nanos; return object; }; /** - * Converts this DescriptorProto to JSON. + * Converts this Timestamp to JSON. * @function toJSON - * @memberof google.protobuf.DescriptorProto + * @memberof google.protobuf.Timestamp * @instance * @returns {Object.} JSON object */ - DescriptorProto.prototype.toJSON = function toJSON() { + Timestamp.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - DescriptorProto.ExtensionRange = (function() { + return Timestamp; + })(); - /** - * Properties of an ExtensionRange. - * @memberof google.protobuf.DescriptorProto - * @interface IExtensionRange - * @property {number|null} [start] ExtensionRange start - * @property {number|null} [end] ExtensionRange end - * @property {google.protobuf.IExtensionRangeOptions|null} [options] ExtensionRange options - */ + return protobuf; + })(); + + google.pubsub = (function() { + + /** + * Namespace pubsub. + * @memberof google + * @namespace + */ + var pubsub = {}; + + pubsub.v1 = (function() { + + /** + * Namespace v1. + * @memberof google.pubsub + * @namespace + */ + var v1 = {}; + + v1.Publisher = (function() { /** - * Constructs a new ExtensionRange. - * @memberof google.protobuf.DescriptorProto - * @classdesc Represents an ExtensionRange. - * @implements IExtensionRange + * Constructs a new Publisher service. + * @memberof google.pubsub.v1 + * @classdesc Represents a Publisher + * @extends $protobuf.rpc.Service * @constructor - * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set - */ - function ExtensionRange(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function Publisher(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); } + (Publisher.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Publisher; + /** - * ExtensionRange start. - * @member {number} start - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @instance + * Creates new Publisher service using the specified rpc implementation. + * @function create + * @memberof google.pubsub.v1.Publisher + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {Publisher} RPC service. Useful where requests and/or responses are streamed. */ - ExtensionRange.prototype.start = 0; + Publisher.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; /** - * ExtensionRange end. - * @member {number} end - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @instance + * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef CreateTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic */ - ExtensionRange.prototype.end = 0; /** - * ExtensionRange options. - * @member {google.protobuf.IExtensionRangeOptions|null|undefined} options - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * Calls CreateTopic. + * @function createTopic + * @memberof google.pubsub.v1.Publisher * @instance + * @param {google.pubsub.v1.ITopic} request Topic message or plain object + * @param {google.pubsub.v1.Publisher.CreateTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 */ - ExtensionRange.prototype.options = null; + Object.defineProperty(Publisher.prototype.createTopic = function createTopic(request, callback) { + return this.rpcCall(createTopic, $root.google.pubsub.v1.Topic, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "CreateTopic" }); /** - * Creates a new ExtensionRange instance using the specified properties. - * @function create - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @static - * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set - * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange instance + * Calls CreateTopic. + * @function createTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.ITopic} request Topic message or plain object + * @returns {Promise} Promise + * @variation 2 */ - ExtensionRange.create = function create(properties) { - return new ExtensionRange(properties); - }; /** - * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @function encode - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @static - * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef UpdateTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic */ - ExtensionRange.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.ExtensionRangeOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; /** - * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @static - * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * Calls UpdateTopic. + * @function updateTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.UpdateTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 */ - ExtensionRange.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + Object.defineProperty(Publisher.prototype.updateTopic = function updateTopic(request, callback) { + return this.rpcCall(updateTopic, $root.google.pubsub.v1.UpdateTopicRequest, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "UpdateTopic" }); /** - * Decodes an ExtensionRange message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls UpdateTopic. + * @function updateTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - ExtensionRange.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.start = reader.int32(); - break; - case 2: - message.end = reader.int32(); - break; - case 3: - message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; /** - * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * @memberof google.pubsub.v1.Publisher + * @typedef PublishCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.PublishResponse} [response] PublishResponse */ - ExtensionRange.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; /** - * Verifies an ExtensionRange message. - * @function verify - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not + * Calls Publish. + * @function publish + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object + * @param {google.pubsub.v1.Publisher.PublishCallback} callback Node-style callback called with the error, if any, and PublishResponse + * @returns {undefined} + * @variation 1 */ - ExtensionRange.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.start != null && message.hasOwnProperty("start")) - if (!$util.isInteger(message.start)) - return "start: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.ExtensionRangeOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; + Object.defineProperty(Publisher.prototype.publish = function publish(request, callback) { + return this.rpcCall(publish, $root.google.pubsub.v1.PublishRequest, $root.google.pubsub.v1.PublishResponse, request, callback); + }, "name", { value: "Publish" }); /** - * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange + * Calls Publish. + * @function publish + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - ExtensionRange.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.DescriptorProto.ExtensionRange) - return object; - var message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); - if (object.start != null) - message.start = object.start | 0; - if (object.end != null) - message.end = object.end | 0; - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.DescriptorProto.ExtensionRange.options: object expected"); - message.options = $root.google.protobuf.ExtensionRangeOptions.fromObject(object.options); - } - return message; - }; /** - * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @static - * @param {google.protobuf.DescriptorProto.ExtensionRange} message ExtensionRange - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ExtensionRange.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.start = 0; - object.end = 0; - object.options = null; - } - if (message.start != null && message.hasOwnProperty("start")) - object.start = message.start; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.ExtensionRangeOptions.toObject(message.options, options); - return object; - }; + * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef GetTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic + */ /** - * Converts this ExtensionRange to JSON. - * @function toJSON - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * Calls GetTopic. + * @function getTopic + * @memberof google.pubsub.v1.Publisher * @instance - * @returns {Object.} JSON object + * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.GetTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 */ - ExtensionRange.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return ExtensionRange; - })(); - - DescriptorProto.ReservedRange = (function() { + Object.defineProperty(Publisher.prototype.getTopic = function getTopic(request, callback) { + return this.rpcCall(getTopic, $root.google.pubsub.v1.GetTopicRequest, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "GetTopic" }); /** - * Properties of a ReservedRange. - * @memberof google.protobuf.DescriptorProto - * @interface IReservedRange - * @property {number|null} [start] ReservedRange start - * @property {number|null} [end] ReservedRange end + * Calls GetTopic. + * @function getTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ /** - * Constructs a new ReservedRange. - * @memberof google.protobuf.DescriptorProto - * @classdesc Represents a ReservedRange. - * @implements IReservedRange - * @constructor - * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set + * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicsResponse} [response] ListTopicsResponse */ - function ReservedRange(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } /** - * ReservedRange start. - * @member {number} start - * @memberof google.protobuf.DescriptorProto.ReservedRange + * Calls ListTopics. + * @function listTopics + * @memberof google.pubsub.v1.Publisher * @instance + * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicsCallback} callback Node-style callback called with the error, if any, and ListTopicsResponse + * @returns {undefined} + * @variation 1 */ - ReservedRange.prototype.start = 0; + Object.defineProperty(Publisher.prototype.listTopics = function listTopics(request, callback) { + return this.rpcCall(listTopics, $root.google.pubsub.v1.ListTopicsRequest, $root.google.pubsub.v1.ListTopicsResponse, request, callback); + }, "name", { value: "ListTopics" }); /** - * ReservedRange end. - * @member {number} end - * @memberof google.protobuf.DescriptorProto.ReservedRange + * Calls ListTopics. + * @function listTopics + * @memberof google.pubsub.v1.Publisher * @instance + * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - ReservedRange.prototype.end = 0; /** - * Creates a new ReservedRange instance using the specified properties. - * @function create - * @memberof google.protobuf.DescriptorProto.ReservedRange - * @static - * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set - * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange instance + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicSubscriptionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} [response] ListTopicSubscriptionsResponse */ - ReservedRange.create = function create(properties) { - return new ReservedRange(properties); - }; /** - * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @function encode - * @memberof google.protobuf.DescriptorProto.ReservedRange - * @static - * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * Calls ListTopicSubscriptions. + * @function listTopicSubscriptions + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse + * @returns {undefined} + * @variation 1 */ - ReservedRange.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); - return writer; - }; + Object.defineProperty(Publisher.prototype.listTopicSubscriptions = function listTopicSubscriptions(request, callback) { + return this.rpcCall(listTopicSubscriptions, $root.google.pubsub.v1.ListTopicSubscriptionsRequest, $root.google.pubsub.v1.ListTopicSubscriptionsResponse, request, callback); + }, "name", { value: "ListTopicSubscriptions" }); /** - * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.DescriptorProto.ReservedRange - * @static - * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * Calls ListTopicSubscriptions. + * @function listTopicSubscriptions + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - ReservedRange.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; /** - * Decodes a ReservedRange message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.DescriptorProto.ReservedRange - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicSnapshotsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicSnapshotsResponse} [response] ListTopicSnapshotsResponse */ - ReservedRange.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ReservedRange(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.start = reader.int32(); - break; - case 2: - message.end = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; /** - * Decodes a ReservedRange message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.DescriptorProto.ReservedRange - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls ListTopicSnapshots. + * @function listTopicSnapshots + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicSnapshotsCallback} callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse + * @returns {undefined} + * @variation 1 */ - ReservedRange.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + Object.defineProperty(Publisher.prototype.listTopicSnapshots = function listTopicSnapshots(request, callback) { + return this.rpcCall(listTopicSnapshots, $root.google.pubsub.v1.ListTopicSnapshotsRequest, $root.google.pubsub.v1.ListTopicSnapshotsResponse, request, callback); + }, "name", { value: "ListTopicSnapshots" }); /** - * Verifies a ReservedRange message. - * @function verify - * @memberof google.protobuf.DescriptorProto.ReservedRange - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not + * Calls ListTopicSnapshots. + * @function listTopicSnapshots + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - ReservedRange.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.start != null && message.hasOwnProperty("start")) - if (!$util.isInteger(message.start)) - return "start: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; - return null; - }; /** - * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.DescriptorProto.ReservedRange - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange + * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef DeleteTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty */ - ReservedRange.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.DescriptorProto.ReservedRange) - return object; - var message = new $root.google.protobuf.DescriptorProto.ReservedRange(); - if (object.start != null) - message.start = object.start | 0; - if (object.end != null) - message.end = object.end | 0; - return message; - }; /** - * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.DescriptorProto.ReservedRange - * @static - * @param {google.protobuf.DescriptorProto.ReservedRange} message ReservedRange - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object + * Calls DeleteTopic. + * @function deleteTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.DeleteTopicCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 */ - ReservedRange.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.start = 0; - object.end = 0; - } - if (message.start != null && message.hasOwnProperty("start")) - object.start = message.start; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; - return object; - }; + Object.defineProperty(Publisher.prototype.deleteTopic = function deleteTopic(request, callback) { + return this.rpcCall(deleteTopic, $root.google.pubsub.v1.DeleteTopicRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteTopic" }); /** - * Converts this ReservedRange to JSON. - * @function toJSON - * @memberof google.protobuf.DescriptorProto.ReservedRange + * Calls DeleteTopic. + * @function deleteTopic + * @memberof google.pubsub.v1.Publisher * @instance - * @returns {Object.} JSON object + * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - ReservedRange.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - return ReservedRange; + return Publisher; })(); - return DescriptorProto; - })(); - - protobuf.ExtensionRangeOptions = (function() { - - /** - * Properties of an ExtensionRangeOptions. - * @memberof google.protobuf - * @interface IExtensionRangeOptions - * @property {Array.|null} [uninterpretedOption] ExtensionRangeOptions uninterpretedOption - */ - - /** - * Constructs a new ExtensionRangeOptions. - * @memberof google.protobuf - * @classdesc Represents an ExtensionRangeOptions. - * @implements IExtensionRangeOptions - * @constructor - * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set - */ - function ExtensionRangeOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ExtensionRangeOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.ExtensionRangeOptions - * @instance - */ - ExtensionRangeOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * Creates a new ExtensionRangeOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions instance - */ - ExtensionRangeOptions.create = function create(properties) { - return new ExtensionRangeOptions(properties); - }; - - /** - * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExtensionRangeOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExtensionRangeOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExtensionRangeOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + v1.MessageStoragePolicy = (function() { - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExtensionRangeOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Properties of a MessageStoragePolicy. + * @memberof google.pubsub.v1 + * @interface IMessageStoragePolicy + * @property {Array.|null} [allowedPersistenceRegions] MessageStoragePolicy allowedPersistenceRegions + */ - /** - * Verifies an ExtensionRangeOptions message. - * @function verify - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ExtensionRangeOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } + /** + * Constructs a new MessageStoragePolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents a MessageStoragePolicy. + * @implements IMessageStoragePolicy + * @constructor + * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set + */ + function MessageStoragePolicy(properties) { + this.allowedPersistenceRegions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return null; - }; - /** - * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - */ - ExtensionRangeOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.ExtensionRangeOptions) - return object; - var message = new $root.google.protobuf.ExtensionRangeOptions(); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - return message; - }; + /** + * MessageStoragePolicy allowedPersistenceRegions. + * @member {Array.} allowedPersistenceRegions + * @memberof google.pubsub.v1.MessageStoragePolicy + * @instance + */ + MessageStoragePolicy.prototype.allowedPersistenceRegions = $util.emptyArray; - /** - * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.ExtensionRangeOptions} message ExtensionRangeOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ExtensionRangeOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; + /** + * Creates a new MessageStoragePolicy instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy instance + */ + MessageStoragePolicy.create = function create(properties) { + return new MessageStoragePolicy(properties); + }; - /** - * Converts this ExtensionRangeOptions to JSON. - * @function toJSON - * @memberof google.protobuf.ExtensionRangeOptions - * @instance - * @returns {Object.} JSON object - */ - ExtensionRangeOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageStoragePolicy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.allowedPersistenceRegions != null && message.allowedPersistenceRegions.length) + for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.allowedPersistenceRegions[i]); + return writer; + }; - return ExtensionRangeOptions; - })(); + /** + * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageStoragePolicy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - protobuf.FieldDescriptorProto = (function() { + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageStoragePolicy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.MessageStoragePolicy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.allowedPersistenceRegions && message.allowedPersistenceRegions.length)) + message.allowedPersistenceRegions = []; + message.allowedPersistenceRegions.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Properties of a FieldDescriptorProto. - * @memberof google.protobuf - * @interface IFieldDescriptorProto - * @property {string|null} [name] FieldDescriptorProto name - * @property {number|null} [number] FieldDescriptorProto number - * @property {google.protobuf.FieldDescriptorProto.Label|null} [label] FieldDescriptorProto label - * @property {google.protobuf.FieldDescriptorProto.Type|null} [type] FieldDescriptorProto type - * @property {string|null} [typeName] FieldDescriptorProto typeName - * @property {string|null} [extendee] FieldDescriptorProto extendee - * @property {string|null} [defaultValue] FieldDescriptorProto defaultValue - * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex - * @property {string|null} [jsonName] FieldDescriptorProto jsonName - * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options - */ + /** + * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageStoragePolicy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Constructs a new FieldDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a FieldDescriptorProto. - * @implements IFieldDescriptorProto - * @constructor - * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set - */ - function FieldDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Verifies a MessageStoragePolicy message. + * @function verify + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MessageStoragePolicy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.allowedPersistenceRegions != null && message.hasOwnProperty("allowedPersistenceRegions")) { + if (!Array.isArray(message.allowedPersistenceRegions)) + return "allowedPersistenceRegions: array expected"; + for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) + if (!$util.isString(message.allowedPersistenceRegions[i])) + return "allowedPersistenceRegions: string[] expected"; + } + return null; + }; - /** - * FieldDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.name = ""; + /** + * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + */ + MessageStoragePolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.MessageStoragePolicy) + return object; + var message = new $root.google.pubsub.v1.MessageStoragePolicy(); + if (object.allowedPersistenceRegions) { + if (!Array.isArray(object.allowedPersistenceRegions)) + throw TypeError(".google.pubsub.v1.MessageStoragePolicy.allowedPersistenceRegions: array expected"); + message.allowedPersistenceRegions = []; + for (var i = 0; i < object.allowedPersistenceRegions.length; ++i) + message.allowedPersistenceRegions[i] = String(object.allowedPersistenceRegions[i]); + } + return message; + }; - /** - * FieldDescriptorProto number. - * @member {number} number - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.number = 0; + /** + * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {google.pubsub.v1.MessageStoragePolicy} message MessageStoragePolicy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MessageStoragePolicy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.allowedPersistenceRegions = []; + if (message.allowedPersistenceRegions && message.allowedPersistenceRegions.length) { + object.allowedPersistenceRegions = []; + for (var j = 0; j < message.allowedPersistenceRegions.length; ++j) + object.allowedPersistenceRegions[j] = message.allowedPersistenceRegions[j]; + } + return object; + }; - /** - * FieldDescriptorProto label. - * @member {google.protobuf.FieldDescriptorProto.Label} label - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.label = 1; + /** + * Converts this MessageStoragePolicy to JSON. + * @function toJSON + * @memberof google.pubsub.v1.MessageStoragePolicy + * @instance + * @returns {Object.} JSON object + */ + MessageStoragePolicy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * FieldDescriptorProto type. - * @member {google.protobuf.FieldDescriptorProto.Type} type - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.type = 1; + return MessageStoragePolicy; + })(); - /** - * FieldDescriptorProto typeName. - * @member {string} typeName - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.typeName = ""; + v1.Topic = (function() { - /** - * FieldDescriptorProto extendee. - * @member {string} extendee - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.extendee = ""; + /** + * Properties of a Topic. + * @memberof google.pubsub.v1 + * @interface ITopic + * @property {string|null} [name] Topic name + * @property {Object.|null} [labels] Topic labels + * @property {google.pubsub.v1.IMessageStoragePolicy|null} [messageStoragePolicy] Topic messageStoragePolicy + * @property {string|null} [kmsKeyName] Topic kmsKeyName + */ + + /** + * Constructs a new Topic. + * @memberof google.pubsub.v1 + * @classdesc Represents a Topic. + * @implements ITopic + * @constructor + * @param {google.pubsub.v1.ITopic=} [properties] Properties to set + */ + function Topic(properties) { + this.labels = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * FieldDescriptorProto defaultValue. - * @member {string} defaultValue - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.defaultValue = ""; + /** + * Topic name. + * @member {string} name + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.name = ""; - /** - * FieldDescriptorProto oneofIndex. - * @member {number} oneofIndex - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.oneofIndex = 0; + /** + * Topic labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.labels = $util.emptyObject; - /** - * FieldDescriptorProto jsonName. - * @member {string} jsonName - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.jsonName = ""; + /** + * Topic messageStoragePolicy. + * @member {google.pubsub.v1.IMessageStoragePolicy|null|undefined} messageStoragePolicy + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.messageStoragePolicy = null; - /** - * FieldDescriptorProto options. - * @member {google.protobuf.IFieldOptions|null|undefined} options - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.options = null; + /** + * Topic kmsKeyName. + * @member {string} kmsKeyName + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.kmsKeyName = ""; - /** - * Creates a new FieldDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto instance - */ - FieldDescriptorProto.create = function create(properties) { - return new FieldDescriptorProto(properties); - }; + /** + * Creates a new Topic instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.Topic + * @static + * @param {google.pubsub.v1.ITopic=} [properties] Properties to set + * @returns {google.pubsub.v1.Topic} Topic instance + */ + Topic.create = function create(properties) { + return new Topic(properties); + }; - /** - * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.extendee != null && message.hasOwnProperty("extendee")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.extendee); - if (message.number != null && message.hasOwnProperty("number")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.number); - if (message.label != null && message.hasOwnProperty("label")) - writer.uint32(/* id 4, wireType 0 =*/32).int32(message.label); - if (message.type != null && message.hasOwnProperty("type")) - writer.uint32(/* id 5, wireType 0 =*/40).int32(message.type); - if (message.typeName != null && message.hasOwnProperty("typeName")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.typeName); - if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) - writer.uint32(/* id 7, wireType 2 =*/58).string(message.defaultValue); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.FieldOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) - writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); - if (message.jsonName != null && message.hasOwnProperty("jsonName")) - writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); - return writer; - }; + /** + * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.Topic + * @static + * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Topic.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) + $root.google.pubsub.v1.MessageStoragePolicy.encode(message.messageStoragePolicy, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.kmsKeyName); + return writer; + }; - /** - * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.Topic + * @static + * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Topic.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 3: - message.number = reader.int32(); - break; - case 4: - message.label = reader.int32(); - break; - case 5: - message.type = reader.int32(); - break; - case 6: - message.typeName = reader.string(); - break; - case 2: - message.extendee = reader.string(); - break; - case 7: - message.defaultValue = reader.string(); - break; - case 9: - message.oneofIndex = reader.int32(); - break; - case 10: - message.jsonName = reader.string(); - break; - case 8: - message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a Topic message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.Topic + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.Topic} Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Topic.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); + break; + case 3: + message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); + break; + case 5: + message.kmsKeyName = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a Topic message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.Topic + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.Topic} Topic + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Topic.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a FieldDescriptorProto message. - * @function verify - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FieldDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.number != null && message.hasOwnProperty("number")) - if (!$util.isInteger(message.number)) - return "number: integer expected"; - if (message.label != null && message.hasOwnProperty("label")) - switch (message.label) { - default: - return "label: enum value expected"; - case 1: - case 2: - case 3: - break; + /** + * Verifies a Topic message. + * @function verify + * @memberof google.pubsub.v1.Topic + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Topic.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; } - if (message.type != null && message.hasOwnProperty("type")) - switch (message.type) { - default: - return "type: enum value expected"; - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - case 18: - break; + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) { + var error = $root.google.pubsub.v1.MessageStoragePolicy.verify(message.messageStoragePolicy); + if (error) + return "messageStoragePolicy." + error; } - if (message.typeName != null && message.hasOwnProperty("typeName")) - if (!$util.isString(message.typeName)) - return "typeName: string expected"; - if (message.extendee != null && message.hasOwnProperty("extendee")) - if (!$util.isString(message.extendee)) - return "extendee: string expected"; - if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) - if (!$util.isString(message.defaultValue)) - return "defaultValue: string expected"; - if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) - if (!$util.isInteger(message.oneofIndex)) - return "oneofIndex: integer expected"; - if (message.jsonName != null && message.hasOwnProperty("jsonName")) - if (!$util.isString(message.jsonName)) - return "jsonName: string expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.FieldOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; - - /** - * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto - */ - FieldDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FieldDescriptorProto) - return object; - var message = new $root.google.protobuf.FieldDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.number != null) - message.number = object.number | 0; - switch (object.label) { - case "LABEL_OPTIONAL": - case 1: - message.label = 1; - break; - case "LABEL_REQUIRED": - case 2: - message.label = 2; - break; - case "LABEL_REPEATED": - case 3: - message.label = 3; - break; - } - switch (object.type) { - case "TYPE_DOUBLE": - case 1: - message.type = 1; - break; - case "TYPE_FLOAT": - case 2: - message.type = 2; - break; - case "TYPE_INT64": - case 3: - message.type = 3; - break; - case "TYPE_UINT64": - case 4: - message.type = 4; - break; - case "TYPE_INT32": - case 5: - message.type = 5; - break; - case "TYPE_FIXED64": - case 6: - message.type = 6; - break; - case "TYPE_FIXED32": - case 7: - message.type = 7; - break; - case "TYPE_BOOL": - case 8: - message.type = 8; - break; - case "TYPE_STRING": - case 9: - message.type = 9; - break; - case "TYPE_GROUP": - case 10: - message.type = 10; - break; - case "TYPE_MESSAGE": - case 11: - message.type = 11; - break; - case "TYPE_BYTES": - case 12: - message.type = 12; - break; - case "TYPE_UINT32": - case 13: - message.type = 13; - break; - case "TYPE_ENUM": - case 14: - message.type = 14; - break; - case "TYPE_SFIXED32": - case 15: - message.type = 15; - break; - case "TYPE_SFIXED64": - case 16: - message.type = 16; - break; - case "TYPE_SINT32": - case 17: - message.type = 17; - break; - case "TYPE_SINT64": - case 18: - message.type = 18; - break; - } - if (object.typeName != null) - message.typeName = String(object.typeName); - if (object.extendee != null) - message.extendee = String(object.extendee); - if (object.defaultValue != null) - message.defaultValue = String(object.defaultValue); - if (object.oneofIndex != null) - message.oneofIndex = object.oneofIndex | 0; - if (object.jsonName != null) - message.jsonName = String(object.jsonName); - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.FieldDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.FieldOptions.fromObject(object.options); - } - return message; - }; + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + if (!$util.isString(message.kmsKeyName)) + return "kmsKeyName: string expected"; + return null; + }; - /** - * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {google.protobuf.FieldDescriptorProto} message FieldDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FieldDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.name = ""; - object.extendee = ""; - object.number = 0; - object.label = options.enums === String ? "LABEL_OPTIONAL" : 1; - object.type = options.enums === String ? "TYPE_DOUBLE" : 1; - object.typeName = ""; - object.defaultValue = ""; - object.options = null; - object.oneofIndex = 0; - object.jsonName = ""; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.extendee != null && message.hasOwnProperty("extendee")) - object.extendee = message.extendee; - if (message.number != null && message.hasOwnProperty("number")) - object.number = message.number; - if (message.label != null && message.hasOwnProperty("label")) - object.label = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Label[message.label] : message.label; - if (message.type != null && message.hasOwnProperty("type")) - object.type = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Type[message.type] : message.type; - if (message.typeName != null && message.hasOwnProperty("typeName")) - object.typeName = message.typeName; - if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) - object.defaultValue = message.defaultValue; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.FieldOptions.toObject(message.options, options); - if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) - object.oneofIndex = message.oneofIndex; - if (message.jsonName != null && message.hasOwnProperty("jsonName")) - object.jsonName = message.jsonName; - return object; - }; + /** + * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.Topic + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.Topic} Topic + */ + Topic.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Topic) + return object; + var message = new $root.google.pubsub.v1.Topic(); + if (object.name != null) + message.name = String(object.name); + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Topic.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); + } + if (object.messageStoragePolicy != null) { + if (typeof object.messageStoragePolicy !== "object") + throw TypeError(".google.pubsub.v1.Topic.messageStoragePolicy: object expected"); + message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.fromObject(object.messageStoragePolicy); + } + if (object.kmsKeyName != null) + message.kmsKeyName = String(object.kmsKeyName); + return message; + }; - /** - * Converts this FieldDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.FieldDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - FieldDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a Topic message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.Topic + * @static + * @param {google.pubsub.v1.Topic} message Topic + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Topic.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.messageStoragePolicy = null; + object.kmsKeyName = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) + object.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.toObject(message.messageStoragePolicy, options); + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + object.kmsKeyName = message.kmsKeyName; + return object; + }; - /** - * Type enum. - * @name google.protobuf.FieldDescriptorProto.Type - * @enum {string} - * @property {number} TYPE_DOUBLE=1 TYPE_DOUBLE value - * @property {number} TYPE_FLOAT=2 TYPE_FLOAT value - * @property {number} TYPE_INT64=3 TYPE_INT64 value - * @property {number} TYPE_UINT64=4 TYPE_UINT64 value - * @property {number} TYPE_INT32=5 TYPE_INT32 value - * @property {number} TYPE_FIXED64=6 TYPE_FIXED64 value - * @property {number} TYPE_FIXED32=7 TYPE_FIXED32 value - * @property {number} TYPE_BOOL=8 TYPE_BOOL value - * @property {number} TYPE_STRING=9 TYPE_STRING value - * @property {number} TYPE_GROUP=10 TYPE_GROUP value - * @property {number} TYPE_MESSAGE=11 TYPE_MESSAGE value - * @property {number} TYPE_BYTES=12 TYPE_BYTES value - * @property {number} TYPE_UINT32=13 TYPE_UINT32 value - * @property {number} TYPE_ENUM=14 TYPE_ENUM value - * @property {number} TYPE_SFIXED32=15 TYPE_SFIXED32 value - * @property {number} TYPE_SFIXED64=16 TYPE_SFIXED64 value - * @property {number} TYPE_SINT32=17 TYPE_SINT32 value - * @property {number} TYPE_SINT64=18 TYPE_SINT64 value - */ - FieldDescriptorProto.Type = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[1] = "TYPE_DOUBLE"] = 1; - values[valuesById[2] = "TYPE_FLOAT"] = 2; - values[valuesById[3] = "TYPE_INT64"] = 3; - values[valuesById[4] = "TYPE_UINT64"] = 4; - values[valuesById[5] = "TYPE_INT32"] = 5; - values[valuesById[6] = "TYPE_FIXED64"] = 6; - values[valuesById[7] = "TYPE_FIXED32"] = 7; - values[valuesById[8] = "TYPE_BOOL"] = 8; - values[valuesById[9] = "TYPE_STRING"] = 9; - values[valuesById[10] = "TYPE_GROUP"] = 10; - values[valuesById[11] = "TYPE_MESSAGE"] = 11; - values[valuesById[12] = "TYPE_BYTES"] = 12; - values[valuesById[13] = "TYPE_UINT32"] = 13; - values[valuesById[14] = "TYPE_ENUM"] = 14; - values[valuesById[15] = "TYPE_SFIXED32"] = 15; - values[valuesById[16] = "TYPE_SFIXED64"] = 16; - values[valuesById[17] = "TYPE_SINT32"] = 17; - values[valuesById[18] = "TYPE_SINT64"] = 18; - return values; + /** + * Converts this Topic to JSON. + * @function toJSON + * @memberof google.pubsub.v1.Topic + * @instance + * @returns {Object.} JSON object + */ + Topic.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Topic; })(); - /** - * Label enum. - * @name google.protobuf.FieldDescriptorProto.Label - * @enum {string} - * @property {number} LABEL_OPTIONAL=1 LABEL_OPTIONAL value - * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value - * @property {number} LABEL_REPEATED=3 LABEL_REPEATED value - */ - FieldDescriptorProto.Label = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[1] = "LABEL_OPTIONAL"] = 1; - values[valuesById[2] = "LABEL_REQUIRED"] = 2; - values[valuesById[3] = "LABEL_REPEATED"] = 3; - return values; - })(); + v1.PubsubMessage = (function() { + + /** + * Properties of a PubsubMessage. + * @memberof google.pubsub.v1 + * @interface IPubsubMessage + * @property {Uint8Array|null} [data] PubsubMessage data + * @property {Object.|null} [attributes] PubsubMessage attributes + * @property {string|null} [messageId] PubsubMessage messageId + * @property {google.protobuf.ITimestamp|null} [publishTime] PubsubMessage publishTime + * @property {string|null} [orderingKey] PubsubMessage orderingKey + */ + + /** + * Constructs a new PubsubMessage. + * @memberof google.pubsub.v1 + * @classdesc Represents a PubsubMessage. + * @implements IPubsubMessage + * @constructor + * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set + */ + function PubsubMessage(properties) { + this.attributes = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PubsubMessage data. + * @member {Uint8Array} data + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.data = $util.newBuffer([]); + + /** + * PubsubMessage attributes. + * @member {Object.} attributes + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.attributes = $util.emptyObject; + + /** + * PubsubMessage messageId. + * @member {string} messageId + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.messageId = ""; + + /** + * PubsubMessage publishTime. + * @member {google.protobuf.ITimestamp|null|undefined} publishTime + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.publishTime = null; + + /** + * PubsubMessage orderingKey. + * @member {string} orderingKey + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.orderingKey = ""; + + /** + * Creates a new PubsubMessage instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage instance + */ + PubsubMessage.create = function create(properties) { + return new PubsubMessage(properties); + }; + + /** + * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PubsubMessage.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.data != null && message.hasOwnProperty("data")) + writer.uint32(/* id 1, wireType 2 =*/10).bytes(message.data); + if (message.attributes != null && message.hasOwnProperty("attributes")) + for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); + if (message.messageId != null && message.hasOwnProperty("messageId")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.messageId); + if (message.publishTime != null && message.hasOwnProperty("publishTime")) + $root.google.protobuf.Timestamp.encode(message.publishTime, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.orderingKey); + return writer; + }; - return FieldDescriptorProto; - })(); + /** + * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PubsubMessage.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - protobuf.OneofDescriptorProto = (function() { + /** + * Decodes a PubsubMessage message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PubsubMessage.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.data = reader.bytes(); + break; + case 2: + reader.skip().pos++; + if (message.attributes === $util.emptyObject) + message.attributes = {}; + key = reader.string(); + reader.pos++; + message.attributes[key] = reader.string(); + break; + case 3: + message.messageId = reader.string(); + break; + case 4: + message.publishTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + case 5: + message.orderingKey = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Properties of an OneofDescriptorProto. - * @memberof google.protobuf - * @interface IOneofDescriptorProto - * @property {string|null} [name] OneofDescriptorProto name - * @property {google.protobuf.IOneofOptions|null} [options] OneofDescriptorProto options - */ + /** + * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PubsubMessage.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Constructs a new OneofDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents an OneofDescriptorProto. - * @implements IOneofDescriptorProto - * @constructor - * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set - */ - function OneofDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Verifies a PubsubMessage message. + * @function verify + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PubsubMessage.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.data != null && message.hasOwnProperty("data")) + if (!(message.data && typeof message.data.length === "number" || $util.isString(message.data))) + return "data: buffer expected"; + if (message.attributes != null && message.hasOwnProperty("attributes")) { + if (!$util.isObject(message.attributes)) + return "attributes: object expected"; + var key = Object.keys(message.attributes); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.attributes[key[i]])) + return "attributes: string{k:string} expected"; + } + if (message.messageId != null && message.hasOwnProperty("messageId")) + if (!$util.isString(message.messageId)) + return "messageId: string expected"; + if (message.publishTime != null && message.hasOwnProperty("publishTime")) { + var error = $root.google.protobuf.Timestamp.verify(message.publishTime); + if (error) + return "publishTime." + error; + } + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + if (!$util.isString(message.orderingKey)) + return "orderingKey: string expected"; + return null; + }; - /** - * OneofDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.OneofDescriptorProto - * @instance - */ - OneofDescriptorProto.prototype.name = ""; + /** + * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + */ + PubsubMessage.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PubsubMessage) + return object; + var message = new $root.google.pubsub.v1.PubsubMessage(); + if (object.data != null) + if (typeof object.data === "string") + $util.base64.decode(object.data, message.data = $util.newBuffer($util.base64.length(object.data)), 0); + else if (object.data.length) + message.data = object.data; + if (object.attributes) { + if (typeof object.attributes !== "object") + throw TypeError(".google.pubsub.v1.PubsubMessage.attributes: object expected"); + message.attributes = {}; + for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) + message.attributes[keys[i]] = String(object.attributes[keys[i]]); + } + if (object.messageId != null) + message.messageId = String(object.messageId); + if (object.publishTime != null) { + if (typeof object.publishTime !== "object") + throw TypeError(".google.pubsub.v1.PubsubMessage.publishTime: object expected"); + message.publishTime = $root.google.protobuf.Timestamp.fromObject(object.publishTime); + } + if (object.orderingKey != null) + message.orderingKey = String(object.orderingKey); + return message; + }; + + /** + * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {google.pubsub.v1.PubsubMessage} message PubsubMessage + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PubsubMessage.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.attributes = {}; + if (options.defaults) { + if (options.bytes === String) + object.data = ""; + else { + object.data = []; + if (options.bytes !== Array) + object.data = $util.newBuffer(object.data); + } + object.messageId = ""; + object.publishTime = null; + object.orderingKey = ""; + } + if (message.data != null && message.hasOwnProperty("data")) + object.data = options.bytes === String ? $util.base64.encode(message.data, 0, message.data.length) : options.bytes === Array ? Array.prototype.slice.call(message.data) : message.data; + var keys2; + if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { + object.attributes = {}; + for (var j = 0; j < keys2.length; ++j) + object.attributes[keys2[j]] = message.attributes[keys2[j]]; + } + if (message.messageId != null && message.hasOwnProperty("messageId")) + object.messageId = message.messageId; + if (message.publishTime != null && message.hasOwnProperty("publishTime")) + object.publishTime = $root.google.protobuf.Timestamp.toObject(message.publishTime, options); + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + object.orderingKey = message.orderingKey; + return object; + }; - /** - * OneofDescriptorProto options. - * @member {google.protobuf.IOneofOptions|null|undefined} options - * @memberof google.protobuf.OneofDescriptorProto - * @instance - */ - OneofDescriptorProto.prototype.options = null; + /** + * Converts this PubsubMessage to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PubsubMessage + * @instance + * @returns {Object.} JSON object + */ + PubsubMessage.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a new OneofDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto instance - */ - OneofDescriptorProto.create = function create(properties) { - return new OneofDescriptorProto(properties); - }; + return PubsubMessage; + })(); - /** - * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OneofDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.OneofOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; + v1.GetTopicRequest = (function() { - /** - * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OneofDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Properties of a GetTopicRequest. + * @memberof google.pubsub.v1 + * @interface IGetTopicRequest + * @property {string|null} [topic] GetTopicRequest topic + */ - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OneofDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.options = $root.google.protobuf.OneofOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Constructs a new GetTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetTopicRequest. + * @implements IGetTopicRequest + * @constructor + * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set + */ + function GetTopicRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return message; - }; - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OneofDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * GetTopicRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.GetTopicRequest + * @instance + */ + GetTopicRequest.prototype.topic = ""; - /** - * Verifies an OneofDescriptorProto message. - * @function verify - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - OneofDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.OneofOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; + /** + * Creates a new GetTopicRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest instance + */ + GetTopicRequest.create = function create(properties) { + return new GetTopicRequest(properties); + }; - /** - * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto - */ - OneofDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.OneofDescriptorProto) - return object; - var message = new $root.google.protobuf.OneofDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.OneofDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.OneofOptions.fromObject(object.options); - } - return message; - }; + /** + * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetTopicRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + return writer; + }; - /** - * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {google.protobuf.OneofDescriptorProto} message OneofDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - OneofDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.name = ""; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.OneofOptions.toObject(message.options, options); - return object; - }; + /** + * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GetTopicRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetTopicRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetTopicRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Converts this OneofDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.OneofDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - OneofDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetTopicRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - return OneofDescriptorProto; - })(); + /** + * Verifies a GetTopicRequest message. + * @function verify + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetTopicRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + return null; + }; - protobuf.EnumDescriptorProto = (function() { + /** + * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + */ + GetTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetTopicRequest) + return object; + var message = new $root.google.pubsub.v1.GetTopicRequest(); + if (object.topic != null) + message.topic = String(object.topic); + return message; + }; - /** - * Properties of an EnumDescriptorProto. - * @memberof google.protobuf - * @interface IEnumDescriptorProto - * @property {string|null} [name] EnumDescriptorProto name - * @property {Array.|null} [value] EnumDescriptorProto value - * @property {google.protobuf.IEnumOptions|null} [options] EnumDescriptorProto options - * @property {Array.|null} [reservedRange] EnumDescriptorProto reservedRange - * @property {Array.|null} [reservedName] EnumDescriptorProto reservedName - */ + /** + * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {google.pubsub.v1.GetTopicRequest} message GetTopicRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GetTopicRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + return object; + }; - /** - * Constructs a new EnumDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents an EnumDescriptorProto. - * @implements IEnumDescriptorProto - * @constructor - * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set - */ - function EnumDescriptorProto(properties) { - this.value = []; - this.reservedRange = []; - this.reservedName = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Converts this GetTopicRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.GetTopicRequest + * @instance + * @returns {Object.} JSON object + */ + GetTopicRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * EnumDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.name = ""; + return GetTopicRequest; + })(); - /** - * EnumDescriptorProto value. - * @member {Array.} value - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.value = $util.emptyArray; + v1.UpdateTopicRequest = (function() { - /** - * EnumDescriptorProto options. - * @member {google.protobuf.IEnumOptions|null|undefined} options - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.options = null; + /** + * Properties of an UpdateTopicRequest. + * @memberof google.pubsub.v1 + * @interface IUpdateTopicRequest + * @property {google.pubsub.v1.ITopic|null} [topic] UpdateTopicRequest topic + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateTopicRequest updateMask + */ - /** - * EnumDescriptorProto reservedRange. - * @member {Array.} reservedRange - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.reservedRange = $util.emptyArray; + /** + * Constructs a new UpdateTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an UpdateTopicRequest. + * @implements IUpdateTopicRequest + * @constructor + * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set + */ + function UpdateTopicRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * EnumDescriptorProto reservedName. - * @member {Array.} reservedName - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.reservedName = $util.emptyArray; + /** + * UpdateTopicRequest topic. + * @member {google.pubsub.v1.ITopic|null|undefined} topic + * @memberof google.pubsub.v1.UpdateTopicRequest + * @instance + */ + UpdateTopicRequest.prototype.topic = null; - /** - * Creates a new EnumDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto instance - */ - EnumDescriptorProto.create = function create(properties) { - return new EnumDescriptorProto(properties); - }; + /** + * UpdateTopicRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateTopicRequest + * @instance + */ + UpdateTopicRequest.prototype.updateMask = null; - /** - * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.value != null && message.value.length) - for (var i = 0; i < message.value.length; ++i) - $root.google.protobuf.EnumValueDescriptorProto.encode(message.value[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.EnumOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.reservedRange != null && message.reservedRange.length) - for (var i = 0; i < message.reservedRange.length; ++i) - $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.reservedName != null && message.reservedName.length) - for (var i = 0; i < message.reservedName.length; ++i) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.reservedName[i]); - return writer; - }; + /** + * Creates a new UpdateTopicRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest instance + */ + UpdateTopicRequest.create = function create(properties) { + return new UpdateTopicRequest(properties); + }; + + /** + * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateTopicRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + $root.google.pubsub.v1.Topic.encode(message.topic, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (!(message.value && message.value.length)) - message.value = []; - message.value.push($root.google.protobuf.EnumValueDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); - break; - case 4: - if (!(message.reservedRange && message.reservedRange.length)) - message.reservedRange = []; - message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.reservedName && message.reservedName.length)) - message.reservedName = []; - message.reservedName.push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateTopicRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateTopicRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = $root.google.pubsub.v1.Topic.decode(reader, reader.uint32()); + break; + case 2: + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateTopicRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies an EnumDescriptorProto message. - * @function verify - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.value != null && message.hasOwnProperty("value")) { - if (!Array.isArray(message.value)) - return "value: array expected"; - for (var i = 0; i < message.value.length; ++i) { - var error = $root.google.protobuf.EnumValueDescriptorProto.verify(message.value[i]); + /** + * Verifies an UpdateTopicRequest message. + * @function verify + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + UpdateTopicRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) { + var error = $root.google.pubsub.v1.Topic.verify(message.topic); if (error) - return "value." + error; + return "topic." + error; } - } - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.EnumOptions.verify(message.options); - if (error) - return "options." + error; - } - if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { - if (!Array.isArray(message.reservedRange)) - return "reservedRange: array expected"; - for (var i = 0; i < message.reservedRange.length; ++i) { - var error = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.verify(message.reservedRange[i]); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); if (error) - return "reservedRange." + error; + return "updateMask." + error; } - } - if (message.reservedName != null && message.hasOwnProperty("reservedName")) { - if (!Array.isArray(message.reservedName)) - return "reservedName: array expected"; - for (var i = 0; i < message.reservedName.length; ++i) - if (!$util.isString(message.reservedName[i])) - return "reservedName: string[] expected"; - } - return null; - }; + return null; + }; - /** - * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto - */ - EnumDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumDescriptorProto) - return object; - var message = new $root.google.protobuf.EnumDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.value) { - if (!Array.isArray(object.value)) - throw TypeError(".google.protobuf.EnumDescriptorProto.value: array expected"); - message.value = []; - for (var i = 0; i < object.value.length; ++i) { - if (typeof object.value[i] !== "object") - throw TypeError(".google.protobuf.EnumDescriptorProto.value: object expected"); - message.value[i] = $root.google.protobuf.EnumValueDescriptorProto.fromObject(object.value[i]); - } - } - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.EnumDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.EnumOptions.fromObject(object.options); - } - if (object.reservedRange) { - if (!Array.isArray(object.reservedRange)) - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: array expected"); - message.reservedRange = []; - for (var i = 0; i < object.reservedRange.length; ++i) { - if (typeof object.reservedRange[i] !== "object") - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: object expected"); - message.reservedRange[i] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.fromObject(object.reservedRange[i]); + /** + * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + */ + UpdateTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateTopicRequest) + return object; + var message = new $root.google.pubsub.v1.UpdateTopicRequest(); + if (object.topic != null) { + if (typeof object.topic !== "object") + throw TypeError(".google.pubsub.v1.UpdateTopicRequest.topic: object expected"); + message.topic = $root.google.pubsub.v1.Topic.fromObject(object.topic); } - } - if (object.reservedName) { - if (!Array.isArray(object.reservedName)) - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedName: array expected"); - message.reservedName = []; - for (var i = 0; i < object.reservedName.length; ++i) - message.reservedName[i] = String(object.reservedName[i]); - } - return message; - }; + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateTopicRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + } + return message; + }; - /** - * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {google.protobuf.EnumDescriptorProto} message EnumDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.value = []; - object.reservedRange = []; - object.reservedName = []; - } - if (options.defaults) { - object.name = ""; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.value && message.value.length) { - object.value = []; - for (var j = 0; j < message.value.length; ++j) - object.value[j] = $root.google.protobuf.EnumValueDescriptorProto.toObject(message.value[j], options); - } - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.EnumOptions.toObject(message.options, options); - if (message.reservedRange && message.reservedRange.length) { - object.reservedRange = []; - for (var j = 0; j < message.reservedRange.length; ++j) - object.reservedRange[j] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.toObject(message.reservedRange[j], options); - } - if (message.reservedName && message.reservedName.length) { - object.reservedName = []; - for (var j = 0; j < message.reservedName.length; ++j) - object.reservedName[j] = message.reservedName[j]; - } - return object; - }; + /** + * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.UpdateTopicRequest} message UpdateTopicRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UpdateTopicRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = null; + object.updateMask = null; + } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = $root.google.pubsub.v1.Topic.toObject(message.topic, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); + return object; + }; - /** - * Converts this EnumDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.EnumDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - EnumDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this UpdateTopicRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.UpdateTopicRequest + * @instance + * @returns {Object.} JSON object + */ + UpdateTopicRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - EnumDescriptorProto.EnumReservedRange = (function() { + return UpdateTopicRequest; + })(); + + v1.PublishRequest = (function() { /** - * Properties of an EnumReservedRange. - * @memberof google.protobuf.EnumDescriptorProto - * @interface IEnumReservedRange - * @property {number|null} [start] EnumReservedRange start - * @property {number|null} [end] EnumReservedRange end + * Properties of a PublishRequest. + * @memberof google.pubsub.v1 + * @interface IPublishRequest + * @property {string|null} [topic] PublishRequest topic + * @property {Array.|null} [messages] PublishRequest messages */ /** - * Constructs a new EnumReservedRange. - * @memberof google.protobuf.EnumDescriptorProto - * @classdesc Represents an EnumReservedRange. - * @implements IEnumReservedRange + * Constructs a new PublishRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a PublishRequest. + * @implements IPublishRequest * @constructor - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set + * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set */ - function EnumReservedRange(properties) { + function PublishRequest(properties) { + this.messages = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -15100,88 +15379,91 @@ } /** - * EnumReservedRange start. - * @member {number} start - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * PublishRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.PublishRequest * @instance */ - EnumReservedRange.prototype.start = 0; + PublishRequest.prototype.topic = ""; /** - * EnumReservedRange end. - * @member {number} end - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * PublishRequest messages. + * @member {Array.} messages + * @memberof google.pubsub.v1.PublishRequest * @instance */ - EnumReservedRange.prototype.end = 0; + PublishRequest.prototype.messages = $util.emptyArray; /** - * Creates a new EnumReservedRange instance using the specified properties. + * Creates a new PublishRequest instance using the specified properties. * @function create - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange instance + * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.PublishRequest} PublishRequest instance */ - EnumReservedRange.create = function create(properties) { - return new EnumReservedRange(properties); + PublishRequest.create = function create(properties) { + return new PublishRequest(properties); }; /** - * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. * @function encode - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode + * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - EnumReservedRange.encode = function encode(message, writer) { + PublishRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.messages != null && message.messages.length) + for (var i = 0; i < message.messages.length; ++i) + $root.google.pubsub.v1.PubsubMessage.encode(message.messages[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode + * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - EnumReservedRange.encodeDelimited = function encodeDelimited(message, writer) { + PublishRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an EnumReservedRange message from the specified reader or buffer. + * Decodes a PublishRequest message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @returns {google.pubsub.v1.PublishRequest} PublishRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumReservedRange.decode = function decode(reader, length) { + PublishRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.start = reader.int32(); + message.topic = reader.string(); break; case 2: - message.end = reader.int32(); + if (!(message.messages && message.messages.length)) + message.messages = []; + message.messages.push($root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -15192,4190 +15474,4698 @@ }; /** - * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * Decodes a PublishRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @returns {google.pubsub.v1.PublishRequest} PublishRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumReservedRange.decodeDelimited = function decodeDelimited(reader) { + PublishRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an EnumReservedRange message. + * Verifies a PublishRequest message. * @function verify - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - EnumReservedRange.verify = function verify(message) { + PublishRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.start != null && message.hasOwnProperty("start")) - if (!$util.isInteger(message.start)) - return "start: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.messages != null && message.hasOwnProperty("messages")) { + if (!Array.isArray(message.messages)) + return "messages: array expected"; + for (var i = 0; i < message.messages.length; ++i) { + var error = $root.google.pubsub.v1.PubsubMessage.verify(message.messages[i]); + if (error) + return "messages." + error; + } + } return null; }; /** - * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @static * @param {Object.} object Plain object - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @returns {google.pubsub.v1.PublishRequest} PublishRequest */ - EnumReservedRange.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumDescriptorProto.EnumReservedRange) + PublishRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PublishRequest) return object; - var message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); - if (object.start != null) - message.start = object.start | 0; - if (object.end != null) - message.end = object.end | 0; + var message = new $root.google.pubsub.v1.PublishRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.messages) { + if (!Array.isArray(object.messages)) + throw TypeError(".google.pubsub.v1.PublishRequest.messages: array expected"); + message.messages = []; + for (var i = 0; i < object.messages.length; ++i) { + if (typeof object.messages[i] !== "object") + throw TypeError(".google.pubsub.v1.PublishRequest.messages: object expected"); + message.messages[i] = $root.google.pubsub.v1.PubsubMessage.fromObject(object.messages[i]); + } + } return message; }; /** - * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @static - * @param {google.protobuf.EnumDescriptorProto.EnumReservedRange} message EnumReservedRange + * @param {google.pubsub.v1.PublishRequest} message PublishRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - EnumReservedRange.toObject = function toObject(message, options) { + PublishRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.start = 0; - object.end = 0; + if (options.arrays || options.defaults) + object.messages = []; + if (options.defaults) + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.messages && message.messages.length) { + object.messages = []; + for (var j = 0; j < message.messages.length; ++j) + object.messages[j] = $root.google.pubsub.v1.PubsubMessage.toObject(message.messages[j], options); } - if (message.start != null && message.hasOwnProperty("start")) - object.start = message.start; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; return object; }; /** - * Converts this EnumReservedRange to JSON. + * Converts this PublishRequest to JSON. * @function toJSON - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.PublishRequest * @instance * @returns {Object.} JSON object */ - EnumReservedRange.prototype.toJSON = function toJSON() { + PublishRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return EnumReservedRange; + return PublishRequest; })(); - return EnumDescriptorProto; - })(); - - protobuf.EnumValueDescriptorProto = (function() { - - /** - * Properties of an EnumValueDescriptorProto. - * @memberof google.protobuf - * @interface IEnumValueDescriptorProto - * @property {string|null} [name] EnumValueDescriptorProto name - * @property {number|null} [number] EnumValueDescriptorProto number - * @property {google.protobuf.IEnumValueOptions|null} [options] EnumValueDescriptorProto options - */ - - /** - * Constructs a new EnumValueDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents an EnumValueDescriptorProto. - * @implements IEnumValueDescriptorProto - * @constructor - * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set - */ - function EnumValueDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + v1.PublishResponse = (function() { - /** - * EnumValueDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.EnumValueDescriptorProto - * @instance - */ - EnumValueDescriptorProto.prototype.name = ""; + /** + * Properties of a PublishResponse. + * @memberof google.pubsub.v1 + * @interface IPublishResponse + * @property {Array.|null} [messageIds] PublishResponse messageIds + */ - /** - * EnumValueDescriptorProto number. - * @member {number} number - * @memberof google.protobuf.EnumValueDescriptorProto - * @instance - */ - EnumValueDescriptorProto.prototype.number = 0; + /** + * Constructs a new PublishResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a PublishResponse. + * @implements IPublishResponse + * @constructor + * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set + */ + function PublishResponse(properties) { + this.messageIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * EnumValueDescriptorProto options. - * @member {google.protobuf.IEnumValueOptions|null|undefined} options - * @memberof google.protobuf.EnumValueDescriptorProto - * @instance - */ - EnumValueDescriptorProto.prototype.options = null; + /** + * PublishResponse messageIds. + * @member {Array.} messageIds + * @memberof google.pubsub.v1.PublishResponse + * @instance + */ + PublishResponse.prototype.messageIds = $util.emptyArray; - /** - * Creates a new EnumValueDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto instance - */ - EnumValueDescriptorProto.create = function create(properties) { - return new EnumValueDescriptorProto(properties); - }; + /** + * Creates a new PublishResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.PublishResponse} PublishResponse instance + */ + PublishResponse.create = function create(properties) { + return new PublishResponse(properties); + }; - /** - * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumValueDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.number != null && message.hasOwnProperty("number")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.number); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.EnumValueOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; + /** + * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PublishResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.messageIds != null && message.messageIds.length) + for (var i = 0; i < message.messageIds.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.messageIds[i]); + return writer; + }; - /** - * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumValueDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PublishResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumValueDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.number = reader.int32(); - break; - case 3: - message.options = $root.google.protobuf.EnumValueOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a PublishResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PublishResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.messageIds && message.messageIds.length)) + message.messageIds = []; + message.messageIds.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumValueDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PublishResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies an EnumValueDescriptorProto message. - * @function verify - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumValueDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.number != null && message.hasOwnProperty("number")) - if (!$util.isInteger(message.number)) - return "number: integer expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.EnumValueOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; + /** + * Verifies a PublishResponse message. + * @function verify + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PublishResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.messageIds != null && message.hasOwnProperty("messageIds")) { + if (!Array.isArray(message.messageIds)) + return "messageIds: array expected"; + for (var i = 0; i < message.messageIds.length; ++i) + if (!$util.isString(message.messageIds[i])) + return "messageIds: string[] expected"; + } + return null; + }; - /** - * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto - */ - EnumValueDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumValueDescriptorProto) - return object; - var message = new $root.google.protobuf.EnumValueDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.number != null) - message.number = object.number | 0; - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.EnumValueDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.EnumValueOptions.fromObject(object.options); - } - return message; - }; + /** + * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PublishResponse} PublishResponse + */ + PublishResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PublishResponse) + return object; + var message = new $root.google.pubsub.v1.PublishResponse(); + if (object.messageIds) { + if (!Array.isArray(object.messageIds)) + throw TypeError(".google.pubsub.v1.PublishResponse.messageIds: array expected"); + message.messageIds = []; + for (var i = 0; i < object.messageIds.length; ++i) + message.messageIds[i] = String(object.messageIds[i]); + } + return message; + }; - /** - * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {google.protobuf.EnumValueDescriptorProto} message EnumValueDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumValueDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.name = ""; - object.number = 0; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.number != null && message.hasOwnProperty("number")) - object.number = message.number; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.EnumValueOptions.toObject(message.options, options); - return object; - }; + /** + * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {google.pubsub.v1.PublishResponse} message PublishResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PublishResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.messageIds = []; + if (message.messageIds && message.messageIds.length) { + object.messageIds = []; + for (var j = 0; j < message.messageIds.length; ++j) + object.messageIds[j] = message.messageIds[j]; + } + return object; + }; - /** - * Converts this EnumValueDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.EnumValueDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - EnumValueDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this PublishResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PublishResponse + * @instance + * @returns {Object.} JSON object + */ + PublishResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return EnumValueDescriptorProto; - })(); + return PublishResponse; + })(); - protobuf.ServiceDescriptorProto = (function() { + v1.ListTopicsRequest = (function() { - /** - * Properties of a ServiceDescriptorProto. - * @memberof google.protobuf - * @interface IServiceDescriptorProto - * @property {string|null} [name] ServiceDescriptorProto name - * @property {Array.|null} [method] ServiceDescriptorProto method - * @property {google.protobuf.IServiceOptions|null} [options] ServiceDescriptorProto options - */ + /** + * Properties of a ListTopicsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicsRequest + * @property {string|null} [project] ListTopicsRequest project + * @property {number|null} [pageSize] ListTopicsRequest pageSize + * @property {string|null} [pageToken] ListTopicsRequest pageToken + */ - /** - * Constructs a new ServiceDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a ServiceDescriptorProto. - * @implements IServiceDescriptorProto - * @constructor - * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set - */ - function ServiceDescriptorProto(properties) { - this.method = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Constructs a new ListTopicsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicsRequest. + * @implements IListTopicsRequest + * @constructor + * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set + */ + function ListTopicsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * ServiceDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.ServiceDescriptorProto - * @instance - */ - ServiceDescriptorProto.prototype.name = ""; + /** + * ListTopicsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + */ + ListTopicsRequest.prototype.project = ""; - /** - * ServiceDescriptorProto method. - * @member {Array.} method - * @memberof google.protobuf.ServiceDescriptorProto - * @instance - */ - ServiceDescriptorProto.prototype.method = $util.emptyArray; + /** + * ListTopicsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + */ + ListTopicsRequest.prototype.pageSize = 0; - /** - * ServiceDescriptorProto options. - * @member {google.protobuf.IServiceOptions|null|undefined} options - * @memberof google.protobuf.ServiceDescriptorProto - * @instance - */ - ServiceDescriptorProto.prototype.options = null; + /** + * ListTopicsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + */ + ListTopicsRequest.prototype.pageToken = ""; - /** - * Creates a new ServiceDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto instance - */ - ServiceDescriptorProto.create = function create(properties) { - return new ServiceDescriptorProto(properties); - }; + /** + * Creates a new ListTopicsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest instance + */ + ListTopicsRequest.create = function create(properties) { + return new ListTopicsRequest(properties); + }; - /** - * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ServiceDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.method != null && message.method.length) - for (var i = 0; i < message.method.length; ++i) - $root.google.protobuf.MethodDescriptorProto.encode(message.method[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.ServiceOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; + /** + * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; - /** - * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ServiceDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ServiceDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (!(message.method && message.method.length)) - message.method = []; - message.method.push($root.google.protobuf.MethodDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - message.options = $root.google.protobuf.ServiceOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a ListTopicsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.project = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ServiceDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + */ + ListTopicsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicsRequest) + return object; + var message = new $root.google.pubsub.v1.ListTopicsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; - /** - * Verifies a ServiceDescriptorProto message. - * @function verify - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ServiceDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.method != null && message.hasOwnProperty("method")) { - if (!Array.isArray(message.method)) - return "method: array expected"; - for (var i = 0; i < message.method.length; ++i) { - var error = $root.google.protobuf.MethodDescriptorProto.verify(message.method[i]); - if (error) - return "method." + error; + /** + * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {google.pubsub.v1.ListTopicsRequest} message ListTopicsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; } - } - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.ServiceOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; - - /** - * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto - */ - ServiceDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.ServiceDescriptorProto) + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; return object; - var message = new $root.google.protobuf.ServiceDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.method) { - if (!Array.isArray(object.method)) - throw TypeError(".google.protobuf.ServiceDescriptorProto.method: array expected"); - message.method = []; - for (var i = 0; i < object.method.length; ++i) { - if (typeof object.method[i] !== "object") - throw TypeError(".google.protobuf.ServiceDescriptorProto.method: object expected"); - message.method[i] = $root.google.protobuf.MethodDescriptorProto.fromObject(object.method[i]); - } - } - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.ServiceDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.ServiceOptions.fromObject(object.options); - } - return message; - }; - - /** - * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {google.protobuf.ServiceDescriptorProto} message ServiceDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ServiceDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.method = []; - if (options.defaults) { - object.name = ""; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.method && message.method.length) { - object.method = []; - for (var j = 0; j < message.method.length; ++j) - object.method[j] = $root.google.protobuf.MethodDescriptorProto.toObject(message.method[j], options); - } - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.ServiceOptions.toObject(message.options, options); - return object; - }; + }; - /** - * Converts this ServiceDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.ServiceDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - ServiceDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this ListTopicsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + * @returns {Object.} JSON object + */ + ListTopicsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return ServiceDescriptorProto; - })(); + return ListTopicsRequest; + })(); - protobuf.MethodDescriptorProto = (function() { + v1.ListTopicsResponse = (function() { - /** - * Properties of a MethodDescriptorProto. - * @memberof google.protobuf - * @interface IMethodDescriptorProto - * @property {string|null} [name] MethodDescriptorProto name - * @property {string|null} [inputType] MethodDescriptorProto inputType - * @property {string|null} [outputType] MethodDescriptorProto outputType - * @property {google.protobuf.IMethodOptions|null} [options] MethodDescriptorProto options - * @property {boolean|null} [clientStreaming] MethodDescriptorProto clientStreaming - * @property {boolean|null} [serverStreaming] MethodDescriptorProto serverStreaming - */ + /** + * Properties of a ListTopicsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicsResponse + * @property {Array.|null} [topics] ListTopicsResponse topics + * @property {string|null} [nextPageToken] ListTopicsResponse nextPageToken + */ - /** - * Constructs a new MethodDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a MethodDescriptorProto. - * @implements IMethodDescriptorProto - * @constructor - * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set - */ - function MethodDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Constructs a new ListTopicsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicsResponse. + * @implements IListTopicsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set + */ + function ListTopicsResponse(properties) { + this.topics = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * MethodDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.name = ""; + /** + * ListTopicsResponse topics. + * @member {Array.} topics + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + */ + ListTopicsResponse.prototype.topics = $util.emptyArray; - /** - * MethodDescriptorProto inputType. - * @member {string} inputType - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.inputType = ""; + /** + * ListTopicsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + */ + ListTopicsResponse.prototype.nextPageToken = ""; - /** - * MethodDescriptorProto outputType. - * @member {string} outputType - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.outputType = ""; + /** + * Creates a new ListTopicsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse instance + */ + ListTopicsResponse.create = function create(properties) { + return new ListTopicsResponse(properties); + }; - /** - * MethodDescriptorProto options. - * @member {google.protobuf.IMethodOptions|null|undefined} options - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.options = null; + /** + * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topics != null && message.topics.length) + for (var i = 0; i < message.topics.length; ++i) + $root.google.pubsub.v1.Topic.encode(message.topics[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; - /** - * MethodDescriptorProto clientStreaming. - * @member {boolean} clientStreaming - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.clientStreaming = false; + /** + * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * MethodDescriptorProto serverStreaming. - * @member {boolean} serverStreaming - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.serverStreaming = false; + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.topics && message.topics.length)) + message.topics = []; + message.topics.push($root.google.pubsub.v1.Topic.decode(reader, reader.uint32())); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Creates a new MethodDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto instance - */ - MethodDescriptorProto.create = function create(properties) { - return new MethodDescriptorProto(properties); - }; + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.inputType != null && message.hasOwnProperty("inputType")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.inputType); - if (message.outputType != null && message.hasOwnProperty("outputType")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputType); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.MethodOptions.encode(message.options, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) - writer.uint32(/* id 5, wireType 0 =*/40).bool(message.clientStreaming); - if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) - writer.uint32(/* id 6, wireType 0 =*/48).bool(message.serverStreaming); - return writer; - }; + /** + * Verifies a ListTopicsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topics != null && message.hasOwnProperty("topics")) { + if (!Array.isArray(message.topics)) + return "topics: array expected"; + for (var i = 0; i < message.topics.length; ++i) { + var error = $root.google.pubsub.v1.Topic.verify(message.topics[i]); + if (error) + return "topics." + error; + } + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; - /** - * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + */ + ListTopicsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicsResponse(); + if (object.topics) { + if (!Array.isArray(object.topics)) + throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: array expected"); + message.topics = []; + for (var i = 0; i < object.topics.length; ++i) { + if (typeof object.topics[i] !== "object") + throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: object expected"); + message.topics[i] = $root.google.pubsub.v1.Topic.fromObject(object.topics[i]); + } + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.inputType = reader.string(); - break; - case 3: - message.outputType = reader.string(); - break; - case 4: - message.options = $root.google.protobuf.MethodOptions.decode(reader, reader.uint32()); - break; - case 5: - message.clientStreaming = reader.bool(); - break; - case 6: - message.serverStreaming = reader.bool(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.ListTopicsResponse} message ListTopicsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.topics = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.topics && message.topics.length) { + object.topics = []; + for (var j = 0; j < message.topics.length; ++j) + object.topics[j] = $root.google.pubsub.v1.Topic.toObject(message.topics[j], options); } - } - return message; - }; + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListTopicsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + return ListTopicsResponse; + })(); - /** - * Verifies a MethodDescriptorProto message. - * @function verify - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - MethodDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.inputType != null && message.hasOwnProperty("inputType")) - if (!$util.isString(message.inputType)) - return "inputType: string expected"; - if (message.outputType != null && message.hasOwnProperty("outputType")) - if (!$util.isString(message.outputType)) - return "outputType: string expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.MethodOptions.verify(message.options); - if (error) - return "options." + error; - } - if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) - if (typeof message.clientStreaming !== "boolean") - return "clientStreaming: boolean expected"; - if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) - if (typeof message.serverStreaming !== "boolean") - return "serverStreaming: boolean expected"; - return null; - }; + v1.ListTopicSubscriptionsRequest = (function() { - /** - * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto - */ - MethodDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.MethodDescriptorProto) - return object; - var message = new $root.google.protobuf.MethodDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.inputType != null) - message.inputType = String(object.inputType); - if (object.outputType != null) - message.outputType = String(object.outputType); - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.MethodDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.MethodOptions.fromObject(object.options); - } - if (object.clientStreaming != null) - message.clientStreaming = Boolean(object.clientStreaming); - if (object.serverStreaming != null) - message.serverStreaming = Boolean(object.serverStreaming); - return message; - }; + /** + * Properties of a ListTopicSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicSubscriptionsRequest + * @property {string|null} [topic] ListTopicSubscriptionsRequest topic + * @property {number|null} [pageSize] ListTopicSubscriptionsRequest pageSize + * @property {string|null} [pageToken] ListTopicSubscriptionsRequest pageToken + */ - /** - * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {google.protobuf.MethodDescriptorProto} message MethodDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - MethodDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.name = ""; - object.inputType = ""; - object.outputType = ""; - object.options = null; - object.clientStreaming = false; - object.serverStreaming = false; + /** + * Constructs a new ListTopicSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSubscriptionsRequest. + * @implements IListTopicSubscriptionsRequest + * @constructor + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set + */ + function ListTopicSubscriptionsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.inputType != null && message.hasOwnProperty("inputType")) - object.inputType = message.inputType; - if (message.outputType != null && message.hasOwnProperty("outputType")) - object.outputType = message.outputType; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.MethodOptions.toObject(message.options, options); - if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) - object.clientStreaming = message.clientStreaming; - if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) - object.serverStreaming = message.serverStreaming; - return object; - }; - /** - * Converts this MethodDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.MethodDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - MethodDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * ListTopicSubscriptionsRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.topic = ""; + + /** + * ListTopicSubscriptionsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.pageSize = 0; + + /** + * ListTopicSubscriptionsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest instance + */ + ListTopicSubscriptionsRequest.create = function create(properties) { + return new ListTopicSubscriptionsRequest(properties); + }; + + /** + * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicSubscriptionsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSubscriptionsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; - return MethodDescriptorProto; - })(); + /** + * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + */ + ListTopicSubscriptionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsRequest) + return object; + var message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; - protobuf.FileOptions = (function() { + /** + * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.ListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSubscriptionsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = ""; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; - /** - * Properties of a FileOptions. - * @memberof google.protobuf - * @interface IFileOptions - * @property {string|null} [javaPackage] FileOptions javaPackage - * @property {string|null} [javaOuterClassname] FileOptions javaOuterClassname - * @property {boolean|null} [javaMultipleFiles] FileOptions javaMultipleFiles - * @property {boolean|null} [javaGenerateEqualsAndHash] FileOptions javaGenerateEqualsAndHash - * @property {boolean|null} [javaStringCheckUtf8] FileOptions javaStringCheckUtf8 - * @property {google.protobuf.FileOptions.OptimizeMode|null} [optimizeFor] FileOptions optimizeFor - * @property {string|null} [goPackage] FileOptions goPackage - * @property {boolean|null} [ccGenericServices] FileOptions ccGenericServices - * @property {boolean|null} [javaGenericServices] FileOptions javaGenericServices - * @property {boolean|null} [pyGenericServices] FileOptions pyGenericServices - * @property {boolean|null} [phpGenericServices] FileOptions phpGenericServices - * @property {boolean|null} [deprecated] FileOptions deprecated - * @property {boolean|null} [ccEnableArenas] FileOptions ccEnableArenas - * @property {string|null} [objcClassPrefix] FileOptions objcClassPrefix - * @property {string|null} [csharpNamespace] FileOptions csharpNamespace - * @property {string|null} [swiftPrefix] FileOptions swiftPrefix - * @property {string|null} [phpClassPrefix] FileOptions phpClassPrefix - * @property {string|null} [phpNamespace] FileOptions phpNamespace - * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace - * @property {string|null} [rubyPackage] FileOptions rubyPackage - * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption - * @property {Array.|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition - */ + /** + * Converts this ListTopicSubscriptionsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + * @returns {Object.} JSON object + */ + ListTopicSubscriptionsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Constructs a new FileOptions. - * @memberof google.protobuf - * @classdesc Represents a FileOptions. - * @implements IFileOptions - * @constructor - * @param {google.protobuf.IFileOptions=} [properties] Properties to set - */ - function FileOptions(properties) { - this.uninterpretedOption = []; - this[".google.api.resourceDefinition"] = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + return ListTopicSubscriptionsRequest; + })(); - /** - * FileOptions javaPackage. - * @member {string} javaPackage - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaPackage = ""; + v1.ListTopicSubscriptionsResponse = (function() { - /** - * FileOptions javaOuterClassname. - * @member {string} javaOuterClassname - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaOuterClassname = ""; + /** + * Properties of a ListTopicSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicSubscriptionsResponse + * @property {Array.|null} [subscriptions] ListTopicSubscriptionsResponse subscriptions + * @property {string|null} [nextPageToken] ListTopicSubscriptionsResponse nextPageToken + */ - /** - * FileOptions javaMultipleFiles. - * @member {boolean} javaMultipleFiles - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaMultipleFiles = false; + /** + * Constructs a new ListTopicSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSubscriptionsResponse. + * @implements IListTopicSubscriptionsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set + */ + function ListTopicSubscriptionsResponse(properties) { + this.subscriptions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * FileOptions javaGenerateEqualsAndHash. - * @member {boolean} javaGenerateEqualsAndHash - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaGenerateEqualsAndHash = false; + /** + * ListTopicSubscriptionsResponse subscriptions. + * @member {Array.} subscriptions + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + */ + ListTopicSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; - /** - * FileOptions javaStringCheckUtf8. - * @member {boolean} javaStringCheckUtf8 - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaStringCheckUtf8 = false; + /** + * ListTopicSubscriptionsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + */ + ListTopicSubscriptionsResponse.prototype.nextPageToken = ""; - /** - * FileOptions optimizeFor. - * @member {google.protobuf.FileOptions.OptimizeMode} optimizeFor - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.optimizeFor = 1; + /** + * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse instance + */ + ListTopicSubscriptionsResponse.create = function create(properties) { + return new ListTopicSubscriptionsResponse(properties); + }; + + /** + * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscriptions != null && message.subscriptions.length) + for (var i = 0; i < message.subscriptions.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscriptions[i]); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * FileOptions goPackage. - * @member {string} goPackage - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.goPackage = ""; + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.subscriptions && message.subscriptions.length)) + message.subscriptions = []; + message.subscriptions.push(reader.string()); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * FileOptions ccGenericServices. - * @member {boolean} ccGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.ccGenericServices = false; + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * FileOptions javaGenericServices. - * @member {boolean} javaGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaGenericServices = false; + /** + * Verifies a ListTopicSubscriptionsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSubscriptionsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { + if (!Array.isArray(message.subscriptions)) + return "subscriptions: array expected"; + for (var i = 0; i < message.subscriptions.length; ++i) + if (!$util.isString(message.subscriptions[i])) + return "subscriptions: string[] expected"; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; - /** - * FileOptions pyGenericServices. - * @member {boolean} pyGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.pyGenericServices = false; + /** + * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + */ + ListTopicSubscriptionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); + if (object.subscriptions) { + if (!Array.isArray(object.subscriptions)) + throw TypeError(".google.pubsub.v1.ListTopicSubscriptionsResponse.subscriptions: array expected"); + message.subscriptions = []; + for (var i = 0; i < object.subscriptions.length; ++i) + message.subscriptions[i] = String(object.subscriptions[i]); + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; - /** - * FileOptions phpGenericServices. - * @member {boolean} phpGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpGenericServices = false; + /** + * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSubscriptionsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.subscriptions = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.subscriptions && message.subscriptions.length) { + object.subscriptions = []; + for (var j = 0; j < message.subscriptions.length; ++j) + object.subscriptions[j] = message.subscriptions[j]; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; - /** - * FileOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.deprecated = false; + /** + * Converts this ListTopicSubscriptionsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicSubscriptionsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * FileOptions ccEnableArenas. - * @member {boolean} ccEnableArenas - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.ccEnableArenas = false; + return ListTopicSubscriptionsResponse; + })(); - /** - * FileOptions objcClassPrefix. - * @member {string} objcClassPrefix - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.objcClassPrefix = ""; + v1.ListTopicSnapshotsRequest = (function() { - /** - * FileOptions csharpNamespace. - * @member {string} csharpNamespace - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.csharpNamespace = ""; + /** + * Properties of a ListTopicSnapshotsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicSnapshotsRequest + * @property {string|null} [topic] ListTopicSnapshotsRequest topic + * @property {number|null} [pageSize] ListTopicSnapshotsRequest pageSize + * @property {string|null} [pageToken] ListTopicSnapshotsRequest pageToken + */ - /** - * FileOptions swiftPrefix. - * @member {string} swiftPrefix - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.swiftPrefix = ""; + /** + * Constructs a new ListTopicSnapshotsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSnapshotsRequest. + * @implements IListTopicSnapshotsRequest + * @constructor + * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set + */ + function ListTopicSnapshotsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * FileOptions phpClassPrefix. - * @member {string} phpClassPrefix - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpClassPrefix = ""; + /** + * ListTopicSnapshotsRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.topic = ""; - /** - * FileOptions phpNamespace. - * @member {string} phpNamespace - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpNamespace = ""; + /** + * ListTopicSnapshotsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.pageSize = 0; - /** - * FileOptions phpMetadataNamespace. - * @member {string} phpMetadataNamespace - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpMetadataNamespace = ""; + /** + * ListTopicSnapshotsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.pageToken = ""; - /** - * FileOptions rubyPackage. - * @member {string} rubyPackage - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.rubyPackage = ""; + /** + * Creates a new ListTopicSnapshotsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest instance + */ + ListTopicSnapshotsRequest.create = function create(properties) { + return new ListTopicSnapshotsRequest(properties); + }; - /** - * FileOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; - /** - * FileOptions .google.api.resourceDefinition. - * @member {Array.} .google.api.resourceDefinition - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype[".google.api.resourceDefinition"] = $util.emptyArray; + /** + * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a new FileOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.FileOptions - * @static - * @param {google.protobuf.IFileOptions=} [properties] Properties to set - * @returns {google.protobuf.FileOptions} FileOptions instance - */ - FileOptions.create = function create(properties) { - return new FileOptions(properties); - }; + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FileOptions - * @static - * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FileOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.javaPackage); - if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) - writer.uint32(/* id 8, wireType 2 =*/66).string(message.javaOuterClassname); - if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) - writer.uint32(/* id 9, wireType 0 =*/72).int32(message.optimizeFor); - if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) - writer.uint32(/* id 10, wireType 0 =*/80).bool(message.javaMultipleFiles); - if (message.goPackage != null && message.hasOwnProperty("goPackage")) - writer.uint32(/* id 11, wireType 2 =*/90).string(message.goPackage); - if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) - writer.uint32(/* id 16, wireType 0 =*/128).bool(message.ccGenericServices); - if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) - writer.uint32(/* id 17, wireType 0 =*/136).bool(message.javaGenericServices); - if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) - writer.uint32(/* id 18, wireType 0 =*/144).bool(message.pyGenericServices); - if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) - writer.uint32(/* id 20, wireType 0 =*/160).bool(message.javaGenerateEqualsAndHash); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 23, wireType 0 =*/184).bool(message.deprecated); - if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) - writer.uint32(/* id 27, wireType 0 =*/216).bool(message.javaStringCheckUtf8); - if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) - writer.uint32(/* id 31, wireType 0 =*/248).bool(message.ccEnableArenas); - if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) - writer.uint32(/* id 36, wireType 2 =*/290).string(message.objcClassPrefix); - if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) - writer.uint32(/* id 37, wireType 2 =*/298).string(message.csharpNamespace); - if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) - writer.uint32(/* id 39, wireType 2 =*/314).string(message.swiftPrefix); - if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) - writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) - writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) - writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) - writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.resourceDefinition"] != null && message[".google.api.resourceDefinition"].length) - for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) - $root.google.api.ResourceDescriptor.encode(message[".google.api.resourceDefinition"][i], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); - return writer; - }; + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FileOptions - * @static - * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FileOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Verifies a ListTopicSnapshotsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSnapshotsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + */ + ListTopicSnapshotsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsRequest) + return object; + var message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; - /** - * Decodes a FileOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FileOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FileOptions} FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FileOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.javaPackage = reader.string(); - break; - case 8: - message.javaOuterClassname = reader.string(); - break; - case 10: - message.javaMultipleFiles = reader.bool(); - break; - case 20: - message.javaGenerateEqualsAndHash = reader.bool(); - break; - case 27: - message.javaStringCheckUtf8 = reader.bool(); - break; - case 9: - message.optimizeFor = reader.int32(); - break; - case 11: - message.goPackage = reader.string(); - break; - case 16: - message.ccGenericServices = reader.bool(); - break; - case 17: - message.javaGenericServices = reader.bool(); - break; - case 18: - message.pyGenericServices = reader.bool(); - break; - case 42: - message.phpGenericServices = reader.bool(); - break; - case 23: - message.deprecated = reader.bool(); - break; - case 31: - message.ccEnableArenas = reader.bool(); - break; - case 36: - message.objcClassPrefix = reader.string(); - break; - case 37: - message.csharpNamespace = reader.string(); - break; - case 39: - message.swiftPrefix = reader.string(); - break; - case 40: - message.phpClassPrefix = reader.string(); - break; - case 41: - message.phpNamespace = reader.string(); - break; - case 44: - message.phpMetadataNamespace = reader.string(); - break; - case 45: - message.rubyPackage = reader.string(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1053: - if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length)) - message[".google.api.resourceDefinition"] = []; - message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.ListTopicSnapshotsRequest} message ListTopicSnapshotsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSnapshotsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = ""; + object.pageSize = 0; + object.pageToken = ""; } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; + + /** + * Converts this ListTopicSnapshotsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + * @returns {Object.} JSON object + */ + ListTopicSnapshotsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListTopicSnapshotsRequest; + })(); + + v1.ListTopicSnapshotsResponse = (function() { + + /** + * Properties of a ListTopicSnapshotsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicSnapshotsResponse + * @property {Array.|null} [snapshots] ListTopicSnapshotsResponse snapshots + * @property {string|null} [nextPageToken] ListTopicSnapshotsResponse nextPageToken + */ + + /** + * Constructs a new ListTopicSnapshotsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSnapshotsResponse. + * @implements IListTopicSnapshotsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set + */ + function ListTopicSnapshotsResponse(properties) { + this.snapshots = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return message; - }; - /** - * Decodes a FileOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FileOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FileOptions} FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FileOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * ListTopicSnapshotsResponse snapshots. + * @member {Array.} snapshots + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + */ + ListTopicSnapshotsResponse.prototype.snapshots = $util.emptyArray; - /** - * Verifies a FileOptions message. - * @function verify - * @memberof google.protobuf.FileOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FileOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) - if (!$util.isString(message.javaPackage)) - return "javaPackage: string expected"; - if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) - if (!$util.isString(message.javaOuterClassname)) - return "javaOuterClassname: string expected"; - if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) - if (typeof message.javaMultipleFiles !== "boolean") - return "javaMultipleFiles: boolean expected"; - if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) - if (typeof message.javaGenerateEqualsAndHash !== "boolean") - return "javaGenerateEqualsAndHash: boolean expected"; - if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) - if (typeof message.javaStringCheckUtf8 !== "boolean") - return "javaStringCheckUtf8: boolean expected"; - if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) - switch (message.optimizeFor) { - default: - return "optimizeFor: enum value expected"; - case 1: - case 2: - case 3: - break; + /** + * ListTopicSnapshotsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + */ + ListTopicSnapshotsResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListTopicSnapshotsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse instance + */ + ListTopicSnapshotsResponse.create = function create(properties) { + return new ListTopicSnapshotsResponse(properties); + }; + + /** + * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.snapshots != null && message.snapshots.length) + for (var i = 0; i < message.snapshots.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshots[i]); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.snapshots && message.snapshots.length)) + message.snapshots = []; + message.snapshots.push(reader.string()); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } } - if (message.goPackage != null && message.hasOwnProperty("goPackage")) - if (!$util.isString(message.goPackage)) - return "goPackage: string expected"; - if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) - if (typeof message.ccGenericServices !== "boolean") - return "ccGenericServices: boolean expected"; - if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) - if (typeof message.javaGenericServices !== "boolean") - return "javaGenericServices: boolean expected"; - if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) - if (typeof message.pyGenericServices !== "boolean") - return "pyGenericServices: boolean expected"; - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - if (typeof message.phpGenericServices !== "boolean") - return "phpGenericServices: boolean expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) - if (typeof message.ccEnableArenas !== "boolean") - return "ccEnableArenas: boolean expected"; - if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) - if (!$util.isString(message.objcClassPrefix)) - return "objcClassPrefix: string expected"; - if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) - if (!$util.isString(message.csharpNamespace)) - return "csharpNamespace: string expected"; - if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) - if (!$util.isString(message.swiftPrefix)) - return "swiftPrefix: string expected"; - if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) - if (!$util.isString(message.phpClassPrefix)) - return "phpClassPrefix: string expected"; - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) - if (!$util.isString(message.phpNamespace)) - return "phpNamespace: string expected"; - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) - if (!$util.isString(message.phpMetadataNamespace)) - return "phpMetadataNamespace: string expected"; - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) - if (!$util.isString(message.rubyPackage)) - return "rubyPackage: string expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; + return message; + }; + + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListTopicSnapshotsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSnapshotsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.snapshots != null && message.hasOwnProperty("snapshots")) { + if (!Array.isArray(message.snapshots)) + return "snapshots: array expected"; + for (var i = 0; i < message.snapshots.length; ++i) + if (!$util.isString(message.snapshots[i])) + return "snapshots: string[] expected"; } - } - if (message[".google.api.resourceDefinition"] != null && message.hasOwnProperty(".google.api.resourceDefinition")) { - if (!Array.isArray(message[".google.api.resourceDefinition"])) - return ".google.api.resourceDefinition: array expected"; - for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) { - var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resourceDefinition"][i]); - if (error) - return ".google.api.resourceDefinition." + error; + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; + + /** + * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + */ + ListTopicSnapshotsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); + if (object.snapshots) { + if (!Array.isArray(object.snapshots)) + throw TypeError(".google.pubsub.v1.ListTopicSnapshotsResponse.snapshots: array expected"); + message.snapshots = []; + for (var i = 0; i < object.snapshots.length; ++i) + message.snapshots[i] = String(object.snapshots[i]); } - } - return null; - }; + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; - /** - * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FileOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FileOptions} FileOptions - */ - FileOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FileOptions) - return object; - var message = new $root.google.protobuf.FileOptions(); - if (object.javaPackage != null) - message.javaPackage = String(object.javaPackage); - if (object.javaOuterClassname != null) - message.javaOuterClassname = String(object.javaOuterClassname); - if (object.javaMultipleFiles != null) - message.javaMultipleFiles = Boolean(object.javaMultipleFiles); - if (object.javaGenerateEqualsAndHash != null) - message.javaGenerateEqualsAndHash = Boolean(object.javaGenerateEqualsAndHash); - if (object.javaStringCheckUtf8 != null) - message.javaStringCheckUtf8 = Boolean(object.javaStringCheckUtf8); - switch (object.optimizeFor) { - case "SPEED": - case 1: - message.optimizeFor = 1; - break; - case "CODE_SIZE": - case 2: - message.optimizeFor = 2; - break; - case "LITE_RUNTIME": - case 3: - message.optimizeFor = 3; - break; - } - if (object.goPackage != null) - message.goPackage = String(object.goPackage); - if (object.ccGenericServices != null) - message.ccGenericServices = Boolean(object.ccGenericServices); - if (object.javaGenericServices != null) - message.javaGenericServices = Boolean(object.javaGenericServices); - if (object.pyGenericServices != null) - message.pyGenericServices = Boolean(object.pyGenericServices); - if (object.phpGenericServices != null) - message.phpGenericServices = Boolean(object.phpGenericServices); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.ccEnableArenas != null) - message.ccEnableArenas = Boolean(object.ccEnableArenas); - if (object.objcClassPrefix != null) - message.objcClassPrefix = String(object.objcClassPrefix); - if (object.csharpNamespace != null) - message.csharpNamespace = String(object.csharpNamespace); - if (object.swiftPrefix != null) - message.swiftPrefix = String(object.swiftPrefix); - if (object.phpClassPrefix != null) - message.phpClassPrefix = String(object.phpClassPrefix); - if (object.phpNamespace != null) - message.phpNamespace = String(object.phpNamespace); - if (object.phpMetadataNamespace != null) - message.phpMetadataNamespace = String(object.phpMetadataNamespace); - if (object.rubyPackage != null) - message.rubyPackage = String(object.rubyPackage); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + /** + * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.ListTopicSnapshotsResponse} message ListTopicSnapshotsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSnapshotsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.snapshots = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.snapshots && message.snapshots.length) { + object.snapshots = []; + for (var j = 0; j < message.snapshots.length; ++j) + object.snapshots[j] = message.snapshots[j]; } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListTopicSnapshotsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicSnapshotsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListTopicSnapshotsResponse; + })(); + + v1.DeleteTopicRequest = (function() { + + /** + * Properties of a DeleteTopicRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteTopicRequest + * @property {string|null} [topic] DeleteTopicRequest topic + */ + + /** + * Constructs a new DeleteTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteTopicRequest. + * @implements IDeleteTopicRequest + * @constructor + * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set + */ + function DeleteTopicRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - if (object[".google.api.resourceDefinition"]) { - if (!Array.isArray(object[".google.api.resourceDefinition"])) - throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: array expected"); - message[".google.api.resourceDefinition"] = []; - for (var i = 0; i < object[".google.api.resourceDefinition"].length; ++i) { - if (typeof object[".google.api.resourceDefinition"][i] !== "object") - throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: object expected"); - message[".google.api.resourceDefinition"][i] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resourceDefinition"][i]); + + /** + * DeleteTopicRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.DeleteTopicRequest + * @instance + */ + DeleteTopicRequest.prototype.topic = ""; + + /** + * Creates a new DeleteTopicRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest instance + */ + DeleteTopicRequest.create = function create(properties) { + return new DeleteTopicRequest(properties); + }; + + /** + * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteTopicRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + return writer; + }; + + /** + * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteTopicRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteTopicRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Creates a plain object from a FileOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FileOptions - * @static - * @param {google.protobuf.FileOptions} message FileOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FileOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.uninterpretedOption = []; - object[".google.api.resourceDefinition"] = []; - } - if (options.defaults) { - object.javaPackage = ""; - object.javaOuterClassname = ""; - object.optimizeFor = options.enums === String ? "SPEED" : 1; - object.javaMultipleFiles = false; - object.goPackage = ""; - object.ccGenericServices = false; - object.javaGenericServices = false; - object.pyGenericServices = false; - object.javaGenerateEqualsAndHash = false; - object.deprecated = false; - object.javaStringCheckUtf8 = false; - object.ccEnableArenas = false; - object.objcClassPrefix = ""; - object.csharpNamespace = ""; - object.swiftPrefix = ""; - object.phpClassPrefix = ""; - object.phpNamespace = ""; - object.phpGenericServices = false; - object.phpMetadataNamespace = ""; - object.rubyPackage = ""; - } - if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) - object.javaPackage = message.javaPackage; - if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) - object.javaOuterClassname = message.javaOuterClassname; - if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) - object.optimizeFor = options.enums === String ? $root.google.protobuf.FileOptions.OptimizeMode[message.optimizeFor] : message.optimizeFor; - if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) - object.javaMultipleFiles = message.javaMultipleFiles; - if (message.goPackage != null && message.hasOwnProperty("goPackage")) - object.goPackage = message.goPackage; - if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) - object.ccGenericServices = message.ccGenericServices; - if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) - object.javaGenericServices = message.javaGenericServices; - if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) - object.pyGenericServices = message.pyGenericServices; - if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) - object.javaGenerateEqualsAndHash = message.javaGenerateEqualsAndHash; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) - object.javaStringCheckUtf8 = message.javaStringCheckUtf8; - if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) - object.ccEnableArenas = message.ccEnableArenas; - if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) - object.objcClassPrefix = message.objcClassPrefix; - if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) - object.csharpNamespace = message.csharpNamespace; - if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) - object.swiftPrefix = message.swiftPrefix; - if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) - object.phpClassPrefix = message.phpClassPrefix; - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) - object.phpNamespace = message.phpNamespace; - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - object.phpGenericServices = message.phpGenericServices; - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) - object.phpMetadataNamespace = message.phpMetadataNamespace; - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) - object.rubyPackage = message.rubyPackage; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length) { - object[".google.api.resourceDefinition"] = []; - for (var j = 0; j < message[".google.api.resourceDefinition"].length; ++j) - object[".google.api.resourceDefinition"][j] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resourceDefinition"][j], options); - } - return object; - }; + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteTopicRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DeleteTopicRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteTopicRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + return null; + }; - /** - * Converts this FileOptions to JSON. - * @function toJSON - * @memberof google.protobuf.FileOptions - * @instance - * @returns {Object.} JSON object - */ - FileOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + */ + DeleteTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteTopicRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteTopicRequest(); + if (object.topic != null) + message.topic = String(object.topic); + return message; + }; - /** - * OptimizeMode enum. - * @name google.protobuf.FileOptions.OptimizeMode - * @enum {string} - * @property {number} SPEED=1 SPEED value - * @property {number} CODE_SIZE=2 CODE_SIZE value - * @property {number} LITE_RUNTIME=3 LITE_RUNTIME value - */ - FileOptions.OptimizeMode = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[1] = "SPEED"] = 1; - values[valuesById[2] = "CODE_SIZE"] = 2; - values[valuesById[3] = "LITE_RUNTIME"] = 3; - return values; + /** + * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.DeleteTopicRequest} message DeleteTopicRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteTopicRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + return object; + }; + + /** + * Converts this DeleteTopicRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteTopicRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteTopicRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return DeleteTopicRequest; })(); - return FileOptions; - })(); + v1.Subscriber = (function() { - protobuf.MessageOptions = (function() { + /** + * Constructs a new Subscriber service. + * @memberof google.pubsub.v1 + * @classdesc Represents a Subscriber + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function Subscriber(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } - /** - * Properties of a MessageOptions. - * @memberof google.protobuf - * @interface IMessageOptions - * @property {boolean|null} [messageSetWireFormat] MessageOptions messageSetWireFormat - * @property {boolean|null} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor - * @property {boolean|null} [deprecated] MessageOptions deprecated - * @property {boolean|null} [mapEntry] MessageOptions mapEntry - * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption - * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource - */ + (Subscriber.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Subscriber; - /** - * Constructs a new MessageOptions. - * @memberof google.protobuf - * @classdesc Represents a MessageOptions. - * @implements IMessageOptions - * @constructor - * @param {google.protobuf.IMessageOptions=} [properties] Properties to set - */ - function MessageOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Creates new Subscriber service using the specified rpc implementation. + * @function create + * @memberof google.pubsub.v1.Subscriber + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {Subscriber} RPC service. Useful where requests and/or responses are streamed. + */ + Subscriber.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; - /** - * MessageOptions messageSetWireFormat. - * @member {boolean} messageSetWireFormat - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.messageSetWireFormat = false; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef CreateSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ - /** - * MessageOptions noStandardDescriptorAccessor. - * @member {boolean} noStandardDescriptorAccessor - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.noStandardDescriptorAccessor = false; + /** + * Calls CreateSubscription. + * @function createSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object + * @param {google.pubsub.v1.Subscriber.CreateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.createSubscription = function createSubscription(request, callback) { + return this.rpcCall(createSubscription, $root.google.pubsub.v1.Subscription, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "CreateSubscription" }); - /** - * MessageOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.deprecated = false; + /** + * Calls CreateSubscription. + * @function createSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * MessageOptions mapEntry. - * @member {boolean} mapEntry - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.mapEntry = false; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef GetSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ + + /** + * Calls GetSubscription. + * @function getSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.GetSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.getSubscription = function getSubscription(request, callback) { + return this.rpcCall(getSubscription, $root.google.pubsub.v1.GetSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "GetSubscription" }); + + /** + * Calls GetSubscription. + * @function getSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef UpdateSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ + + /** + * Calls UpdateSubscription. + * @function updateSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.UpdateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.updateSubscription = function updateSubscription(request, callback) { + return this.rpcCall(updateSubscription, $root.google.pubsub.v1.UpdateSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "UpdateSubscription" }); + + /** + * Calls UpdateSubscription. + * @function updateSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ListSubscriptionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListSubscriptionsResponse} [response] ListSubscriptionsResponse + */ - /** - * MessageOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * Calls ListSubscriptions. + * @function listSubscriptions + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ListSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListSubscriptionsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.listSubscriptions = function listSubscriptions(request, callback) { + return this.rpcCall(listSubscriptions, $root.google.pubsub.v1.ListSubscriptionsRequest, $root.google.pubsub.v1.ListSubscriptionsResponse, request, callback); + }, "name", { value: "ListSubscriptions" }); - /** - * MessageOptions .google.api.resource. - * @member {google.api.IResourceDescriptor|null|undefined} .google.api.resource - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype[".google.api.resource"] = null; + /** + * Calls ListSubscriptions. + * @function listSubscriptions + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Creates a new MessageOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.MessageOptions - * @static - * @param {google.protobuf.IMessageOptions=} [properties] Properties to set - * @returns {google.protobuf.MessageOptions} MessageOptions instance - */ - MessageOptions.create = function create(properties) { - return new MessageOptions(properties); - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef DeleteSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.MessageOptions - * @static - * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MessageOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) - writer.uint32(/* id 1, wireType 0 =*/8).bool(message.messageSetWireFormat); - if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.noStandardDescriptorAccessor); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) - writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) - $root.google.api.ResourceDescriptor.encode(message[".google.api.resource"], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); - return writer; - }; + /** + * Calls DeleteSubscription. + * @function deleteSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.DeleteSubscriptionCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.deleteSubscription = function deleteSubscription(request, callback) { + return this.rpcCall(deleteSubscription, $root.google.pubsub.v1.DeleteSubscriptionRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteSubscription" }); - /** - * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.MessageOptions - * @static - * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MessageOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Calls DeleteSubscription. + * @function deleteSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Decodes a MessageOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.MessageOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.MessageOptions} MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MessageOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MessageOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.messageSetWireFormat = reader.bool(); - break; - case 2: - message.noStandardDescriptorAccessor = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 7: - message.mapEntry = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1053: - message[".google.api.resource"] = $root.google.api.ResourceDescriptor.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ModifyAckDeadlineCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * Decodes a MessageOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.MessageOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.MessageOptions} MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MessageOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Calls ModifyAckDeadline. + * @function modifyAckDeadline + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.modifyAckDeadline = function modifyAckDeadline(request, callback) { + return this.rpcCall(modifyAckDeadline, $root.google.pubsub.v1.ModifyAckDeadlineRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "ModifyAckDeadline" }); - /** - * Verifies a MessageOptions message. - * @function verify - * @memberof google.protobuf.MessageOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - MessageOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) - if (typeof message.messageSetWireFormat !== "boolean") - return "messageSetWireFormat: boolean expected"; - if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) - if (typeof message.noStandardDescriptorAccessor !== "boolean") - return "noStandardDescriptorAccessor: boolean expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) - if (typeof message.mapEntry !== "boolean") - return "mapEntry: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) { - var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resource"]); - if (error) - return ".google.api.resource." + error; - } - return null; - }; + /** + * Calls ModifyAckDeadline. + * @function modifyAckDeadline + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * @memberof google.pubsub.v1.Subscriber + * @typedef AcknowledgeCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.MessageOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.MessageOptions} MessageOptions - */ - MessageOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.MessageOptions) - return object; - var message = new $root.google.protobuf.MessageOptions(); - if (object.messageSetWireFormat != null) - message.messageSetWireFormat = Boolean(object.messageSetWireFormat); - if (object.noStandardDescriptorAccessor != null) - message.noStandardDescriptorAccessor = Boolean(object.noStandardDescriptorAccessor); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.mapEntry != null) - message.mapEntry = Boolean(object.mapEntry); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - if (object[".google.api.resource"] != null) { - if (typeof object[".google.api.resource"] !== "object") - throw TypeError(".google.protobuf.MessageOptions..google.api.resource: object expected"); - message[".google.api.resource"] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resource"]); - } - return message; - }; + /** + * Calls Acknowledge. + * @function acknowledge + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object + * @param {google.pubsub.v1.Subscriber.AcknowledgeCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.acknowledge = function acknowledge(request, callback) { + return this.rpcCall(acknowledge, $root.google.pubsub.v1.AcknowledgeRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "Acknowledge" }); - /** - * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.MessageOptions - * @static - * @param {google.protobuf.MessageOptions} message MessageOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - MessageOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (options.defaults) { - object.messageSetWireFormat = false; - object.noStandardDescriptorAccessor = false; - object.deprecated = false; - object.mapEntry = false; - object[".google.api.resource"] = null; - } - if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) - object.messageSetWireFormat = message.messageSetWireFormat; - if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) - object.noStandardDescriptorAccessor = message.noStandardDescriptorAccessor; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) - object.mapEntry = message.mapEntry; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) - object[".google.api.resource"] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resource"], options); - return object; - }; + /** + * Calls Acknowledge. + * @function acknowledge + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Converts this MessageOptions to JSON. - * @function toJSON - * @memberof google.protobuf.MessageOptions - * @instance - * @returns {Object.} JSON object - */ - MessageOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * @memberof google.pubsub.v1.Subscriber + * @typedef PullCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.PullResponse} [response] PullResponse + */ - return MessageOptions; - })(); + /** + * Calls Pull. + * @function pull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object + * @param {google.pubsub.v1.Subscriber.PullCallback} callback Node-style callback called with the error, if any, and PullResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.pull = function pull(request, callback) { + return this.rpcCall(pull, $root.google.pubsub.v1.PullRequest, $root.google.pubsub.v1.PullResponse, request, callback); + }, "name", { value: "Pull" }); - protobuf.FieldOptions = (function() { + /** + * Calls Pull. + * @function pull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Properties of a FieldOptions. - * @memberof google.protobuf - * @interface IFieldOptions - * @property {google.protobuf.FieldOptions.CType|null} [ctype] FieldOptions ctype - * @property {boolean|null} [packed] FieldOptions packed - * @property {google.protobuf.FieldOptions.JSType|null} [jstype] FieldOptions jstype - * @property {boolean|null} [lazy] FieldOptions lazy - * @property {boolean|null} [deprecated] FieldOptions deprecated - * @property {boolean|null} [weak] FieldOptions weak - * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption - * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior - * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference - */ + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * @memberof google.pubsub.v1.Subscriber + * @typedef StreamingPullCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.StreamingPullResponse} [response] StreamingPullResponse + */ - /** - * Constructs a new FieldOptions. - * @memberof google.protobuf - * @classdesc Represents a FieldOptions. - * @implements IFieldOptions - * @constructor - * @param {google.protobuf.IFieldOptions=} [properties] Properties to set - */ - function FieldOptions(properties) { - this.uninterpretedOption = []; - this[".google.api.fieldBehavior"] = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Calls StreamingPull. + * @function streamingPull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object + * @param {google.pubsub.v1.Subscriber.StreamingPullCallback} callback Node-style callback called with the error, if any, and StreamingPullResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.streamingPull = function streamingPull(request, callback) { + return this.rpcCall(streamingPull, $root.google.pubsub.v1.StreamingPullRequest, $root.google.pubsub.v1.StreamingPullResponse, request, callback); + }, "name", { value: "StreamingPull" }); - /** - * FieldOptions ctype. - * @member {google.protobuf.FieldOptions.CType} ctype - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.ctype = 0; + /** + * Calls StreamingPull. + * @function streamingPull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * FieldOptions packed. - * @member {boolean} packed - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.packed = false; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ModifyPushConfigCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * FieldOptions jstype. - * @member {google.protobuf.FieldOptions.JSType} jstype - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.jstype = 0; + /** + * Calls ModifyPushConfig. + * @function modifyPushConfig + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ModifyPushConfigCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.modifyPushConfig = function modifyPushConfig(request, callback) { + return this.rpcCall(modifyPushConfig, $root.google.pubsub.v1.ModifyPushConfigRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "ModifyPushConfig" }); + + /** + * Calls ModifyPushConfig. + * @function modifyPushConfig + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * FieldOptions lazy. - * @member {boolean} lazy - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.lazy = false; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef GetSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ - /** - * FieldOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.deprecated = false; + /** + * Calls GetSnapshot. + * @function getSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.GetSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.getSnapshot = function getSnapshot(request, callback) { + return this.rpcCall(getSnapshot, $root.google.pubsub.v1.GetSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "GetSnapshot" }); - /** - * FieldOptions weak. - * @member {boolean} weak - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.weak = false; + /** + * Calls GetSnapshot. + * @function getSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * FieldOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ListSnapshotsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListSnapshotsResponse} [response] ListSnapshotsResponse + */ - /** - * FieldOptions .google.api.fieldBehavior. - * @member {Array.} .google.api.fieldBehavior - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype[".google.api.fieldBehavior"] = $util.emptyArray; + /** + * Calls ListSnapshots. + * @function listSnapshots + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ListSnapshotsCallback} callback Node-style callback called with the error, if any, and ListSnapshotsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.listSnapshots = function listSnapshots(request, callback) { + return this.rpcCall(listSnapshots, $root.google.pubsub.v1.ListSnapshotsRequest, $root.google.pubsub.v1.ListSnapshotsResponse, request, callback); + }, "name", { value: "ListSnapshots" }); - /** - * FieldOptions .google.api.resourceReference. - * @member {google.api.IResourceReference|null|undefined} .google.api.resourceReference - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype[".google.api.resourceReference"] = null; + /** + * Calls ListSnapshots. + * @function listSnapshots + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Creates a new FieldOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.FieldOptions - * @static - * @param {google.protobuf.IFieldOptions=} [properties] Properties to set - * @returns {google.protobuf.FieldOptions} FieldOptions instance - */ - FieldOptions.create = function create(properties) { - return new FieldOptions(properties); - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef CreateSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ - /** - * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FieldOptions - * @static - * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.ctype != null && message.hasOwnProperty("ctype")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.ctype); - if (message.packed != null && message.hasOwnProperty("packed")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.packed); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.lazy != null && message.hasOwnProperty("lazy")) - writer.uint32(/* id 5, wireType 0 =*/40).bool(message.lazy); - if (message.jstype != null && message.hasOwnProperty("jstype")) - writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jstype); - if (message.weak != null && message.hasOwnProperty("weak")) - writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.fieldBehavior"] != null && message[".google.api.fieldBehavior"].length) { - writer.uint32(/* id 1052, wireType 2 =*/8418).fork(); - for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) - writer.int32(message[".google.api.fieldBehavior"][i]); - writer.ldelim(); - } - if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) - $root.google.api.ResourceReference.encode(message[".google.api.resourceReference"], writer.uint32(/* id 1055, wireType 2 =*/8442).fork()).ldelim(); - return writer; - }; + /** + * Calls CreateSnapshot. + * @function createSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.CreateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.createSnapshot = function createSnapshot(request, callback) { + return this.rpcCall(createSnapshot, $root.google.pubsub.v1.CreateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "CreateSnapshot" }); - /** - * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FieldOptions - * @static - * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Calls CreateSnapshot. + * @function createSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Decodes a FieldOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FieldOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FieldOptions} FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.ctype = reader.int32(); - break; - case 2: - message.packed = reader.bool(); - break; - case 6: - message.jstype = reader.int32(); - break; - case 5: - message.lazy = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 10: - message.weak = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1052: - if (!(message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length)) - message[".google.api.fieldBehavior"] = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message[".google.api.fieldBehavior"].push(reader.int32()); - } else - message[".google.api.fieldBehavior"].push(reader.int32()); - break; - case 1055: - message[".google.api.resourceReference"] = $root.google.api.ResourceReference.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef UpdateSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ - /** - * Decodes a FieldOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FieldOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FieldOptions} FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Calls UpdateSnapshot. + * @function updateSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.UpdateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.updateSnapshot = function updateSnapshot(request, callback) { + return this.rpcCall(updateSnapshot, $root.google.pubsub.v1.UpdateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "UpdateSnapshot" }); - /** - * Verifies a FieldOptions message. - * @function verify - * @memberof google.protobuf.FieldOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FieldOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.ctype != null && message.hasOwnProperty("ctype")) - switch (message.ctype) { - default: - return "ctype: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.packed != null && message.hasOwnProperty("packed")) - if (typeof message.packed !== "boolean") - return "packed: boolean expected"; - if (message.jstype != null && message.hasOwnProperty("jstype")) - switch (message.jstype) { - default: - return "jstype: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.lazy != null && message.hasOwnProperty("lazy")) - if (typeof message.lazy !== "boolean") - return "lazy: boolean expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.weak != null && message.hasOwnProperty("weak")) - if (typeof message.weak !== "boolean") - return "weak: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - if (message[".google.api.fieldBehavior"] != null && message.hasOwnProperty(".google.api.fieldBehavior")) { - if (!Array.isArray(message[".google.api.fieldBehavior"])) - return ".google.api.fieldBehavior: array expected"; - for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) - switch (message[".google.api.fieldBehavior"][i]) { - default: - return ".google.api.fieldBehavior: enum value[] expected"; - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - break; - } - } - if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) { - var error = $root.google.api.ResourceReference.verify(message[".google.api.resourceReference"]); - if (error) - return ".google.api.resourceReference." + error; - } - return null; - }; + /** + * Calls UpdateSnapshot. + * @function updateSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FieldOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FieldOptions} FieldOptions - */ - FieldOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FieldOptions) - return object; - var message = new $root.google.protobuf.FieldOptions(); - switch (object.ctype) { - case "STRING": - case 0: - message.ctype = 0; - break; - case "CORD": - case 1: - message.ctype = 1; - break; - case "STRING_PIECE": - case 2: - message.ctype = 2; - break; - } - if (object.packed != null) - message.packed = Boolean(object.packed); - switch (object.jstype) { - case "JS_NORMAL": - case 0: - message.jstype = 0; - break; - case "JS_STRING": - case 1: - message.jstype = 1; - break; - case "JS_NUMBER": - case 2: - message.jstype = 2; - break; - } - if (object.lazy != null) - message.lazy = Boolean(object.lazy); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.weak != null) - message.weak = Boolean(object.weak); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - if (object[".google.api.fieldBehavior"]) { - if (!Array.isArray(object[".google.api.fieldBehavior"])) - throw TypeError(".google.protobuf.FieldOptions..google.api.fieldBehavior: array expected"); - message[".google.api.fieldBehavior"] = []; - for (var i = 0; i < object[".google.api.fieldBehavior"].length; ++i) - switch (object[".google.api.fieldBehavior"][i]) { - default: - case "FIELD_BEHAVIOR_UNSPECIFIED": - case 0: - message[".google.api.fieldBehavior"][i] = 0; - break; - case "OPTIONAL": - case 1: - message[".google.api.fieldBehavior"][i] = 1; - break; - case "REQUIRED": - case 2: - message[".google.api.fieldBehavior"][i] = 2; - break; - case "OUTPUT_ONLY": - case 3: - message[".google.api.fieldBehavior"][i] = 3; - break; - case "INPUT_ONLY": - case 4: - message[".google.api.fieldBehavior"][i] = 4; - break; - case "IMMUTABLE": - case 5: - message[".google.api.fieldBehavior"][i] = 5; - break; - } - } - if (object[".google.api.resourceReference"] != null) { - if (typeof object[".google.api.resourceReference"] !== "object") - throw TypeError(".google.protobuf.FieldOptions..google.api.resourceReference: object expected"); - message[".google.api.resourceReference"] = $root.google.api.ResourceReference.fromObject(object[".google.api.resourceReference"]); - } - return message; - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef DeleteSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls DeleteSnapshot. + * @function deleteSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.DeleteSnapshotCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.deleteSnapshot = function deleteSnapshot(request, callback) { + return this.rpcCall(deleteSnapshot, $root.google.pubsub.v1.DeleteSnapshotRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteSnapshot" }); + + /** + * Calls DeleteSnapshot. + * @function deleteSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * @memberof google.pubsub.v1.Subscriber + * @typedef SeekCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.SeekResponse} [response] SeekResponse + */ + + /** + * Calls Seek. + * @function seek + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object + * @param {google.pubsub.v1.Subscriber.SeekCallback} callback Node-style callback called with the error, if any, and SeekResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.seek = function seek(request, callback) { + return this.rpcCall(seek, $root.google.pubsub.v1.SeekRequest, $root.google.pubsub.v1.SeekResponse, request, callback); + }, "name", { value: "Seek" }); - /** - * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FieldOptions - * @static - * @param {google.protobuf.FieldOptions} message FieldOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FieldOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.uninterpretedOption = []; - object[".google.api.fieldBehavior"] = []; - } - if (options.defaults) { - object.ctype = options.enums === String ? "STRING" : 0; - object.packed = false; - object.deprecated = false; - object.lazy = false; - object.jstype = options.enums === String ? "JS_NORMAL" : 0; - object.weak = false; - object[".google.api.resourceReference"] = null; - } - if (message.ctype != null && message.hasOwnProperty("ctype")) - object.ctype = options.enums === String ? $root.google.protobuf.FieldOptions.CType[message.ctype] : message.ctype; - if (message.packed != null && message.hasOwnProperty("packed")) - object.packed = message.packed; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.lazy != null && message.hasOwnProperty("lazy")) - object.lazy = message.lazy; - if (message.jstype != null && message.hasOwnProperty("jstype")) - object.jstype = options.enums === String ? $root.google.protobuf.FieldOptions.JSType[message.jstype] : message.jstype; - if (message.weak != null && message.hasOwnProperty("weak")) - object.weak = message.weak; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length) { - object[".google.api.fieldBehavior"] = []; - for (var j = 0; j < message[".google.api.fieldBehavior"].length; ++j) - object[".google.api.fieldBehavior"][j] = options.enums === String ? $root.google.api.FieldBehavior[message[".google.api.fieldBehavior"][j]] : message[".google.api.fieldBehavior"][j]; + /** + * Calls Seek. + * @function seek + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return Subscriber; + })(); + + v1.Subscription = (function() { + + /** + * Properties of a Subscription. + * @memberof google.pubsub.v1 + * @interface ISubscription + * @property {string|null} [name] Subscription name + * @property {string|null} [topic] Subscription topic + * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] Subscription pushConfig + * @property {number|null} [ackDeadlineSeconds] Subscription ackDeadlineSeconds + * @property {boolean|null} [retainAckedMessages] Subscription retainAckedMessages + * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Subscription messageRetentionDuration + * @property {Object.|null} [labels] Subscription labels + * @property {boolean|null} [enableMessageOrdering] Subscription enableMessageOrdering + * @property {google.pubsub.v1.IExpirationPolicy|null} [expirationPolicy] Subscription expirationPolicy + * @property {string|null} [filter] Subscription filter + * @property {google.pubsub.v1.IDeadLetterPolicy|null} [deadLetterPolicy] Subscription deadLetterPolicy + * @property {google.pubsub.v1.IRetryPolicy|null} [retryPolicy] Subscription retryPolicy + */ + + /** + * Constructs a new Subscription. + * @memberof google.pubsub.v1 + * @classdesc Represents a Subscription. + * @implements ISubscription + * @constructor + * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set + */ + function Subscription(properties) { + this.labels = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) - object[".google.api.resourceReference"] = $root.google.api.ResourceReference.toObject(message[".google.api.resourceReference"], options); - return object; - }; - /** - * Converts this FieldOptions to JSON. - * @function toJSON - * @memberof google.protobuf.FieldOptions - * @instance - * @returns {Object.} JSON object - */ - FieldOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Subscription name. + * @member {string} name + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.name = ""; - /** - * CType enum. - * @name google.protobuf.FieldOptions.CType - * @enum {string} - * @property {number} STRING=0 STRING value - * @property {number} CORD=1 CORD value - * @property {number} STRING_PIECE=2 STRING_PIECE value - */ - FieldOptions.CType = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "STRING"] = 0; - values[valuesById[1] = "CORD"] = 1; - values[valuesById[2] = "STRING_PIECE"] = 2; - return values; - })(); + /** + * Subscription topic. + * @member {string} topic + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.topic = ""; - /** - * JSType enum. - * @name google.protobuf.FieldOptions.JSType - * @enum {string} - * @property {number} JS_NORMAL=0 JS_NORMAL value - * @property {number} JS_STRING=1 JS_STRING value - * @property {number} JS_NUMBER=2 JS_NUMBER value - */ - FieldOptions.JSType = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "JS_NORMAL"] = 0; - values[valuesById[1] = "JS_STRING"] = 1; - values[valuesById[2] = "JS_NUMBER"] = 2; - return values; - })(); + /** + * Subscription pushConfig. + * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.pushConfig = null; + + /** + * Subscription ackDeadlineSeconds. + * @member {number} ackDeadlineSeconds + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.ackDeadlineSeconds = 0; + + /** + * Subscription retainAckedMessages. + * @member {boolean} retainAckedMessages + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.retainAckedMessages = false; + + /** + * Subscription messageRetentionDuration. + * @member {google.protobuf.IDuration|null|undefined} messageRetentionDuration + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.messageRetentionDuration = null; + + /** + * Subscription labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.labels = $util.emptyObject; + + /** + * Subscription enableMessageOrdering. + * @member {boolean} enableMessageOrdering + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.enableMessageOrdering = false; + + /** + * Subscription expirationPolicy. + * @member {google.pubsub.v1.IExpirationPolicy|null|undefined} expirationPolicy + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.expirationPolicy = null; + + /** + * Subscription filter. + * @member {string} filter + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.filter = ""; + + /** + * Subscription deadLetterPolicy. + * @member {google.pubsub.v1.IDeadLetterPolicy|null|undefined} deadLetterPolicy + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.deadLetterPolicy = null; + + /** + * Subscription retryPolicy. + * @member {google.pubsub.v1.IRetryPolicy|null|undefined} retryPolicy + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.retryPolicy = null; + + /** + * Creates a new Subscription instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set + * @returns {google.pubsub.v1.Subscription} Subscription instance + */ + Subscription.create = function create(properties) { + return new Subscription(properties); + }; + + /** + * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Subscription.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.ackDeadlineSeconds); + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + writer.uint32(/* id 7, wireType 0 =*/56).bool(message.retainAckedMessages); + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) + $root.google.protobuf.Duration.encode(message.messageRetentionDuration, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 9, wireType 2 =*/74).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.enableMessageOrdering); + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) + $root.google.pubsub.v1.ExpirationPolicy.encode(message.expirationPolicy, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.filter != null && message.hasOwnProperty("filter")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.filter); + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) + $root.google.pubsub.v1.DeadLetterPolicy.encode(message.deadLetterPolicy, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); + if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) + $root.google.pubsub.v1.RetryPolicy.encode(message.retryPolicy, writer.uint32(/* id 14, wireType 2 =*/114).fork()).ldelim(); + return writer; + }; - return FieldOptions; - })(); + /** + * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Subscription.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - protobuf.OneofOptions = (function() { + /** + * Decodes a Subscription message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.Subscription + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.Subscription} Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Subscription.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.topic = reader.string(); + break; + case 4: + message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); + break; + case 5: + message.ackDeadlineSeconds = reader.int32(); + break; + case 7: + message.retainAckedMessages = reader.bool(); + break; + case 8: + message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + case 9: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); + break; + case 10: + message.enableMessageOrdering = reader.bool(); + break; + case 11: + message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.decode(reader, reader.uint32()); + break; + case 12: + message.filter = reader.string(); + break; + case 13: + message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.decode(reader, reader.uint32()); + break; + case 14: + message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Properties of an OneofOptions. - * @memberof google.protobuf - * @interface IOneofOptions - * @property {Array.|null} [uninterpretedOption] OneofOptions uninterpretedOption - */ + /** + * Decodes a Subscription message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.Subscription + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.Subscription} Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Subscription.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Constructs a new OneofOptions. - * @memberof google.protobuf - * @classdesc Represents an OneofOptions. - * @implements IOneofOptions - * @constructor - * @param {google.protobuf.IOneofOptions=} [properties] Properties to set - */ - function OneofOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Verifies a Subscription message. + * @function verify + * @memberof google.pubsub.v1.Subscription + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Subscription.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { + var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); + if (error) + return "pushConfig." + error; + } + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + if (!$util.isInteger(message.ackDeadlineSeconds)) + return "ackDeadlineSeconds: integer expected"; + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + if (typeof message.retainAckedMessages !== "boolean") + return "retainAckedMessages: boolean expected"; + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) { + var error = $root.google.protobuf.Duration.verify(message.messageRetentionDuration); + if (error) + return "messageRetentionDuration." + error; + } + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; + } + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + if (typeof message.enableMessageOrdering !== "boolean") + return "enableMessageOrdering: boolean expected"; + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) { + var error = $root.google.pubsub.v1.ExpirationPolicy.verify(message.expirationPolicy); + if (error) + return "expirationPolicy." + error; + } + if (message.filter != null && message.hasOwnProperty("filter")) + if (!$util.isString(message.filter)) + return "filter: string expected"; + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) { + var error = $root.google.pubsub.v1.DeadLetterPolicy.verify(message.deadLetterPolicy); + if (error) + return "deadLetterPolicy." + error; + } + if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) { + var error = $root.google.pubsub.v1.RetryPolicy.verify(message.retryPolicy); + if (error) + return "retryPolicy." + error; + } + return null; + }; - /** - * OneofOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.OneofOptions - * @instance - */ - OneofOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * Creates a Subscription message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.Subscription + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.Subscription} Subscription + */ + Subscription.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Subscription) + return object; + var message = new $root.google.pubsub.v1.Subscription(); + if (object.name != null) + message.name = String(object.name); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pushConfig != null) { + if (typeof object.pushConfig !== "object") + throw TypeError(".google.pubsub.v1.Subscription.pushConfig: object expected"); + message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); + } + if (object.ackDeadlineSeconds != null) + message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; + if (object.retainAckedMessages != null) + message.retainAckedMessages = Boolean(object.retainAckedMessages); + if (object.messageRetentionDuration != null) { + if (typeof object.messageRetentionDuration !== "object") + throw TypeError(".google.pubsub.v1.Subscription.messageRetentionDuration: object expected"); + message.messageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.messageRetentionDuration); + } + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Subscription.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); + } + if (object.enableMessageOrdering != null) + message.enableMessageOrdering = Boolean(object.enableMessageOrdering); + if (object.expirationPolicy != null) { + if (typeof object.expirationPolicy !== "object") + throw TypeError(".google.pubsub.v1.Subscription.expirationPolicy: object expected"); + message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.fromObject(object.expirationPolicy); + } + if (object.filter != null) + message.filter = String(object.filter); + if (object.deadLetterPolicy != null) { + if (typeof object.deadLetterPolicy !== "object") + throw TypeError(".google.pubsub.v1.Subscription.deadLetterPolicy: object expected"); + message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.fromObject(object.deadLetterPolicy); + } + if (object.retryPolicy != null) { + if (typeof object.retryPolicy !== "object") + throw TypeError(".google.pubsub.v1.Subscription.retryPolicy: object expected"); + message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.fromObject(object.retryPolicy); + } + return message; + }; - /** - * Creates a new OneofOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.OneofOptions - * @static - * @param {google.protobuf.IOneofOptions=} [properties] Properties to set - * @returns {google.protobuf.OneofOptions} OneofOptions instance - */ - OneofOptions.create = function create(properties) { - return new OneofOptions(properties); - }; + /** + * Creates a plain object from a Subscription message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.Subscription} message Subscription + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Subscription.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.topic = ""; + object.pushConfig = null; + object.ackDeadlineSeconds = 0; + object.retainAckedMessages = false; + object.messageRetentionDuration = null; + object.enableMessageOrdering = false; + object.expirationPolicy = null; + object.filter = ""; + object.deadLetterPolicy = null; + object.retryPolicy = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + object.ackDeadlineSeconds = message.ackDeadlineSeconds; + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + object.retainAckedMessages = message.retainAckedMessages; + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) + object.messageRetentionDuration = $root.google.protobuf.Duration.toObject(message.messageRetentionDuration, options); + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + object.enableMessageOrdering = message.enableMessageOrdering; + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) + object.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.toObject(message.expirationPolicy, options); + if (message.filter != null && message.hasOwnProperty("filter")) + object.filter = message.filter; + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) + object.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.toObject(message.deadLetterPolicy, options); + if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) + object.retryPolicy = $root.google.pubsub.v1.RetryPolicy.toObject(message.retryPolicy, options); + return object; + }; - /** - * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.OneofOptions - * @static - * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OneofOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; + /** + * Converts this Subscription to JSON. + * @function toJSON + * @memberof google.pubsub.v1.Subscription + * @instance + * @returns {Object.} JSON object + */ + Subscription.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.OneofOptions - * @static - * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OneofOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + return Subscription; + })(); - /** - * Decodes an OneofOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.OneofOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.OneofOptions} OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OneofOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + v1.RetryPolicy = (function() { - /** - * Decodes an OneofOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.OneofOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.OneofOptions} OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OneofOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Properties of a RetryPolicy. + * @memberof google.pubsub.v1 + * @interface IRetryPolicy + * @property {google.protobuf.IDuration|null} [minimumBackoff] RetryPolicy minimumBackoff + * @property {google.protobuf.IDuration|null} [maximumBackoff] RetryPolicy maximumBackoff + */ - /** - * Verifies an OneofOptions message. - * @function verify - * @memberof google.protobuf.OneofOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - OneofOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } + /** + * Constructs a new RetryPolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents a RetryPolicy. + * @implements IRetryPolicy + * @constructor + * @param {google.pubsub.v1.IRetryPolicy=} [properties] Properties to set + */ + function RetryPolicy(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return null; - }; - /** - * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.OneofOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.OneofOptions} OneofOptions - */ - OneofOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.OneofOptions) - return object; - var message = new $root.google.protobuf.OneofOptions(); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - return message; - }; + /** + * RetryPolicy minimumBackoff. + * @member {google.protobuf.IDuration|null|undefined} minimumBackoff + * @memberof google.pubsub.v1.RetryPolicy + * @instance + */ + RetryPolicy.prototype.minimumBackoff = null; - /** - * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.OneofOptions - * @static - * @param {google.protobuf.OneofOptions} message OneofOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - OneofOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; + /** + * RetryPolicy maximumBackoff. + * @member {google.protobuf.IDuration|null|undefined} maximumBackoff + * @memberof google.pubsub.v1.RetryPolicy + * @instance + */ + RetryPolicy.prototype.maximumBackoff = null; - /** - * Converts this OneofOptions to JSON. - * @function toJSON - * @memberof google.protobuf.OneofOptions - * @instance - * @returns {Object.} JSON object - */ - OneofOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a new RetryPolicy instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {google.pubsub.v1.IRetryPolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy instance + */ + RetryPolicy.create = function create(properties) { + return new RetryPolicy(properties); + }; + + /** + * Encodes the specified RetryPolicy message. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {google.pubsub.v1.IRetryPolicy} message RetryPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + RetryPolicy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) + $root.google.protobuf.Duration.encode(message.minimumBackoff, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) + $root.google.protobuf.Duration.encode(message.maximumBackoff, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; - return OneofOptions; - })(); + /** + * Encodes the specified RetryPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {google.pubsub.v1.IRetryPolicy} message RetryPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + RetryPolicy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - protobuf.EnumOptions = (function() { + /** + * Decodes a RetryPolicy message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + RetryPolicy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.RetryPolicy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.minimumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + case 2: + message.maximumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Properties of an EnumOptions. - * @memberof google.protobuf - * @interface IEnumOptions - * @property {boolean|null} [allowAlias] EnumOptions allowAlias - * @property {boolean|null} [deprecated] EnumOptions deprecated - * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption - */ + /** + * Decodes a RetryPolicy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + RetryPolicy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Constructs a new EnumOptions. - * @memberof google.protobuf - * @classdesc Represents an EnumOptions. - * @implements IEnumOptions - * @constructor - * @param {google.protobuf.IEnumOptions=} [properties] Properties to set - */ - function EnumOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Verifies a RetryPolicy message. + * @function verify + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + RetryPolicy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) { + var error = $root.google.protobuf.Duration.verify(message.minimumBackoff); + if (error) + return "minimumBackoff." + error; + } + if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) { + var error = $root.google.protobuf.Duration.verify(message.maximumBackoff); + if (error) + return "maximumBackoff." + error; + } + return null; + }; - /** - * EnumOptions allowAlias. - * @member {boolean} allowAlias - * @memberof google.protobuf.EnumOptions - * @instance - */ - EnumOptions.prototype.allowAlias = false; + /** + * Creates a RetryPolicy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy + */ + RetryPolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.RetryPolicy) + return object; + var message = new $root.google.pubsub.v1.RetryPolicy(); + if (object.minimumBackoff != null) { + if (typeof object.minimumBackoff !== "object") + throw TypeError(".google.pubsub.v1.RetryPolicy.minimumBackoff: object expected"); + message.minimumBackoff = $root.google.protobuf.Duration.fromObject(object.minimumBackoff); + } + if (object.maximumBackoff != null) { + if (typeof object.maximumBackoff !== "object") + throw TypeError(".google.pubsub.v1.RetryPolicy.maximumBackoff: object expected"); + message.maximumBackoff = $root.google.protobuf.Duration.fromObject(object.maximumBackoff); + } + return message; + }; - /** - * EnumOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.EnumOptions - * @instance - */ - EnumOptions.prototype.deprecated = false; + /** + * Creates a plain object from a RetryPolicy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {google.pubsub.v1.RetryPolicy} message RetryPolicy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + RetryPolicy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.minimumBackoff = null; + object.maximumBackoff = null; + } + if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) + object.minimumBackoff = $root.google.protobuf.Duration.toObject(message.minimumBackoff, options); + if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) + object.maximumBackoff = $root.google.protobuf.Duration.toObject(message.maximumBackoff, options); + return object; + }; - /** - * EnumOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.EnumOptions - * @instance - */ - EnumOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * Converts this RetryPolicy to JSON. + * @function toJSON + * @memberof google.pubsub.v1.RetryPolicy + * @instance + * @returns {Object.} JSON object + */ + RetryPolicy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a new EnumOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumOptions - * @static - * @param {google.protobuf.IEnumOptions=} [properties] Properties to set - * @returns {google.protobuf.EnumOptions} EnumOptions instance - */ - EnumOptions.create = function create(properties) { - return new EnumOptions(properties); - }; + return RetryPolicy; + })(); - /** - * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumOptions - * @static - * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; + v1.DeadLetterPolicy = (function() { - /** - * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumOptions - * @static - * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Properties of a DeadLetterPolicy. + * @memberof google.pubsub.v1 + * @interface IDeadLetterPolicy + * @property {string|null} [deadLetterTopic] DeadLetterPolicy deadLetterTopic + * @property {number|null} [maxDeliveryAttempts] DeadLetterPolicy maxDeliveryAttempts + */ - /** - * Decodes an EnumOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumOptions} EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 2: - message.allowAlias = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Constructs a new DeadLetterPolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeadLetterPolicy. + * @implements IDeadLetterPolicy + * @constructor + * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set + */ + function DeadLetterPolicy(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return message; - }; - /** - * Decodes an EnumOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumOptions} EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * DeadLetterPolicy deadLetterTopic. + * @member {string} deadLetterTopic + * @memberof google.pubsub.v1.DeadLetterPolicy + * @instance + */ + DeadLetterPolicy.prototype.deadLetterTopic = ""; + + /** + * DeadLetterPolicy maxDeliveryAttempts. + * @member {number} maxDeliveryAttempts + * @memberof google.pubsub.v1.DeadLetterPolicy + * @instance + */ + DeadLetterPolicy.prototype.maxDeliveryAttempts = 0; + + /** + * Creates a new DeadLetterPolicy instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy instance + */ + DeadLetterPolicy.create = function create(properties) { + return new DeadLetterPolicy(properties); + }; + + /** + * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeadLetterPolicy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.deadLetterTopic); + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.maxDeliveryAttempts); + return writer; + }; - /** - * Verifies an EnumOptions message. - * @function verify - * @memberof google.protobuf.EnumOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) - if (typeof message.allowAlias !== "boolean") - return "allowAlias: boolean expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - return null; - }; + /** + * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeadLetterPolicy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumOptions} EnumOptions - */ - EnumOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumOptions) - return object; - var message = new $root.google.protobuf.EnumOptions(); - if (object.allowAlias != null) - message.allowAlias = Boolean(object.allowAlias); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + /** + * Decodes a DeadLetterPolicy message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeadLetterPolicy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeadLetterPolicy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.deadLetterTopic = reader.string(); + break; + case 2: + message.maxDeliveryAttempts = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumOptions - * @static - * @param {google.protobuf.EnumOptions} message EnumOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (options.defaults) { - object.allowAlias = false; - object.deprecated = false; - } - if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) - object.allowAlias = message.allowAlias; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; + /** + * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeadLetterPolicy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Converts this EnumOptions to JSON. - * @function toJSON - * @memberof google.protobuf.EnumOptions - * @instance - * @returns {Object.} JSON object - */ - EnumOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Verifies a DeadLetterPolicy message. + * @function verify + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeadLetterPolicy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + if (!$util.isString(message.deadLetterTopic)) + return "deadLetterTopic: string expected"; + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + if (!$util.isInteger(message.maxDeliveryAttempts)) + return "maxDeliveryAttempts: integer expected"; + return null; + }; + + /** + * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + */ + DeadLetterPolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeadLetterPolicy) + return object; + var message = new $root.google.pubsub.v1.DeadLetterPolicy(); + if (object.deadLetterTopic != null) + message.deadLetterTopic = String(object.deadLetterTopic); + if (object.maxDeliveryAttempts != null) + message.maxDeliveryAttempts = object.maxDeliveryAttempts | 0; + return message; + }; + + /** + * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {google.pubsub.v1.DeadLetterPolicy} message DeadLetterPolicy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeadLetterPolicy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.deadLetterTopic = ""; + object.maxDeliveryAttempts = 0; + } + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + object.deadLetterTopic = message.deadLetterTopic; + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + object.maxDeliveryAttempts = message.maxDeliveryAttempts; + return object; + }; - return EnumOptions; - })(); + /** + * Converts this DeadLetterPolicy to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeadLetterPolicy + * @instance + * @returns {Object.} JSON object + */ + DeadLetterPolicy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - protobuf.EnumValueOptions = (function() { + return DeadLetterPolicy; + })(); - /** - * Properties of an EnumValueOptions. - * @memberof google.protobuf - * @interface IEnumValueOptions - * @property {boolean|null} [deprecated] EnumValueOptions deprecated - * @property {Array.|null} [uninterpretedOption] EnumValueOptions uninterpretedOption - */ + v1.ExpirationPolicy = (function() { - /** - * Constructs a new EnumValueOptions. - * @memberof google.protobuf - * @classdesc Represents an EnumValueOptions. - * @implements IEnumValueOptions - * @constructor - * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set - */ - function EnumValueOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of an ExpirationPolicy. + * @memberof google.pubsub.v1 + * @interface IExpirationPolicy + * @property {google.protobuf.IDuration|null} [ttl] ExpirationPolicy ttl + */ - /** - * EnumValueOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.EnumValueOptions - * @instance - */ - EnumValueOptions.prototype.deprecated = false; + /** + * Constructs a new ExpirationPolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents an ExpirationPolicy. + * @implements IExpirationPolicy + * @constructor + * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set + */ + function ExpirationPolicy(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * EnumValueOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.EnumValueOptions - * @instance - */ - EnumValueOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * ExpirationPolicy ttl. + * @member {google.protobuf.IDuration|null|undefined} ttl + * @memberof google.pubsub.v1.ExpirationPolicy + * @instance + */ + ExpirationPolicy.prototype.ttl = null; - /** - * Creates a new EnumValueOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set - * @returns {google.protobuf.EnumValueOptions} EnumValueOptions instance - */ - EnumValueOptions.create = function create(properties) { - return new EnumValueOptions(properties); - }; + /** + * Creates a new ExpirationPolicy instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy instance + */ + ExpirationPolicy.create = function create(properties) { + return new ExpirationPolicy(properties); + }; - /** - * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumValueOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 1, wireType 0 =*/8).bool(message.deprecated); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; + /** + * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExpirationPolicy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ttl != null && message.hasOwnProperty("ttl")) + $root.google.protobuf.Duration.encode(message.ttl, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumValueOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExpirationPolicy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes an EnumValueOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumValueOptions} EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumValueOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExpirationPolicy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ExpirationPolicy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ttl = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; - - /** - * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumValueOptions} EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumValueOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an EnumValueOptions message. - * @function verify - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumValueOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + return message; + }; + + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExpirationPolicy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ExpirationPolicy message. + * @function verify + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExpirationPolicy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ttl != null && message.hasOwnProperty("ttl")) { + var error = $root.google.protobuf.Duration.verify(message.ttl); if (error) - return "uninterpretedOption." + error; + return "ttl." + error; } - } - return null; - }; + return null; + }; - /** - * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumValueOptions} EnumValueOptions - */ - EnumValueOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumValueOptions) - return object; - var message = new $root.google.protobuf.EnumValueOptions(); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + /** + * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + */ + ExpirationPolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ExpirationPolicy) + return object; + var message = new $root.google.pubsub.v1.ExpirationPolicy(); + if (object.ttl != null) { + if (typeof object.ttl !== "object") + throw TypeError(".google.pubsub.v1.ExpirationPolicy.ttl: object expected"); + message.ttl = $root.google.protobuf.Duration.fromObject(object.ttl); } - } - return message; - }; + return message; + }; - /** - * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {google.protobuf.EnumValueOptions} message EnumValueOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumValueOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (options.defaults) - object.deprecated = false; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; + /** + * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.ExpirationPolicy} message ExpirationPolicy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExpirationPolicy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.ttl = null; + if (message.ttl != null && message.hasOwnProperty("ttl")) + object.ttl = $root.google.protobuf.Duration.toObject(message.ttl, options); + return object; + }; - /** - * Converts this EnumValueOptions to JSON. - * @function toJSON - * @memberof google.protobuf.EnumValueOptions - * @instance - * @returns {Object.} JSON object - */ - EnumValueOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this ExpirationPolicy to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ExpirationPolicy + * @instance + * @returns {Object.} JSON object + */ + ExpirationPolicy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return EnumValueOptions; - })(); + return ExpirationPolicy; + })(); - protobuf.ServiceOptions = (function() { + v1.PushConfig = (function() { - /** - * Properties of a ServiceOptions. - * @memberof google.protobuf - * @interface IServiceOptions - * @property {boolean|null} [deprecated] ServiceOptions deprecated - * @property {Array.|null} [uninterpretedOption] ServiceOptions uninterpretedOption - * @property {string|null} [".google.api.defaultHost"] ServiceOptions .google.api.defaultHost - * @property {string|null} [".google.api.oauthScopes"] ServiceOptions .google.api.oauthScopes - */ + /** + * Properties of a PushConfig. + * @memberof google.pubsub.v1 + * @interface IPushConfig + * @property {string|null} [pushEndpoint] PushConfig pushEndpoint + * @property {Object.|null} [attributes] PushConfig attributes + * @property {google.pubsub.v1.PushConfig.IOidcToken|null} [oidcToken] PushConfig oidcToken + */ - /** - * Constructs a new ServiceOptions. - * @memberof google.protobuf - * @classdesc Represents a ServiceOptions. - * @implements IServiceOptions - * @constructor - * @param {google.protobuf.IServiceOptions=} [properties] Properties to set - */ - function ServiceOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Constructs a new PushConfig. + * @memberof google.pubsub.v1 + * @classdesc Represents a PushConfig. + * @implements IPushConfig + * @constructor + * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set + */ + function PushConfig(properties) { + this.attributes = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * ServiceOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.ServiceOptions - * @instance - */ - ServiceOptions.prototype.deprecated = false; + /** + * PushConfig pushEndpoint. + * @member {string} pushEndpoint + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.pushEndpoint = ""; - /** - * ServiceOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.ServiceOptions - * @instance - */ - ServiceOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * PushConfig attributes. + * @member {Object.} attributes + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.attributes = $util.emptyObject; + + /** + * PushConfig oidcToken. + * @member {google.pubsub.v1.PushConfig.IOidcToken|null|undefined} oidcToken + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.oidcToken = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * PushConfig authenticationMethod. + * @member {"oidcToken"|undefined} authenticationMethod + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + Object.defineProperty(PushConfig.prototype, "authenticationMethod", { + get: $util.oneOfGetter($oneOfFields = ["oidcToken"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new PushConfig instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set + * @returns {google.pubsub.v1.PushConfig} PushConfig instance + */ + PushConfig.create = function create(properties) { + return new PushConfig(properties); + }; - /** - * ServiceOptions .google.api.defaultHost. - * @member {string} .google.api.defaultHost - * @memberof google.protobuf.ServiceOptions - * @instance - */ - ServiceOptions.prototype[".google.api.defaultHost"] = ""; + /** + * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PushConfig.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.pushEndpoint); + if (message.attributes != null && message.hasOwnProperty("attributes")) + for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) + $root.google.pubsub.v1.PushConfig.OidcToken.encode(message.oidcToken, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; - /** - * ServiceOptions .google.api.oauthScopes. - * @member {string} .google.api.oauthScopes - * @memberof google.protobuf.ServiceOptions - * @instance - */ - ServiceOptions.prototype[".google.api.oauthScopes"] = ""; + /** + * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PushConfig.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a new ServiceOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.ServiceOptions - * @static - * @param {google.protobuf.IServiceOptions=} [properties] Properties to set - * @returns {google.protobuf.ServiceOptions} ServiceOptions instance - */ - ServiceOptions.create = function create(properties) { - return new ServiceOptions(properties); - }; + /** + * Decodes a PushConfig message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PushConfig} PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PushConfig.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.pushEndpoint = reader.string(); + break; + case 2: + reader.skip().pos++; + if (message.attributes === $util.emptyObject) + message.attributes = {}; + key = reader.string(); + reader.pos++; + message.attributes[key] = reader.string(); + break; + case 3: + message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.ServiceOptions - * @static - * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ServiceOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) - writer.uint32(/* id 1049, wireType 2 =*/8394).string(message[".google.api.defaultHost"]); - if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) - writer.uint32(/* id 1050, wireType 2 =*/8402).string(message[".google.api.oauthScopes"]); - return writer; - }; + /** + * Decodes a PushConfig message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PushConfig} PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PushConfig.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.ServiceOptions - * @static - * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ServiceOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Verifies a PushConfig message. + * @function verify + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PushConfig.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + if (!$util.isString(message.pushEndpoint)) + return "pushEndpoint: string expected"; + if (message.attributes != null && message.hasOwnProperty("attributes")) { + if (!$util.isObject(message.attributes)) + return "attributes: object expected"; + var key = Object.keys(message.attributes); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.attributes[key[i]])) + return "attributes: string{k:string} expected"; + } + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { + properties.authenticationMethod = 1; + { + var error = $root.google.pubsub.v1.PushConfig.OidcToken.verify(message.oidcToken); + if (error) + return "oidcToken." + error; + } + } + return null; + }; - /** - * Decodes a ServiceOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.ServiceOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.ServiceOptions} ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ServiceOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 33: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1049: - message[".google.api.defaultHost"] = reader.string(); - break; - case 1050: - message[".google.api.oauthScopes"] = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PushConfig} PushConfig + */ + PushConfig.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PushConfig) + return object; + var message = new $root.google.pubsub.v1.PushConfig(); + if (object.pushEndpoint != null) + message.pushEndpoint = String(object.pushEndpoint); + if (object.attributes) { + if (typeof object.attributes !== "object") + throw TypeError(".google.pubsub.v1.PushConfig.attributes: object expected"); + message.attributes = {}; + for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) + message.attributes[keys[i]] = String(object.attributes[keys[i]]); + } + if (object.oidcToken != null) { + if (typeof object.oidcToken !== "object") + throw TypeError(".google.pubsub.v1.PushConfig.oidcToken: object expected"); + message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.fromObject(object.oidcToken); + } + return message; + }; + + /** + * Creates a plain object from a PushConfig message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.PushConfig} message PushConfig + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PushConfig.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.attributes = {}; + if (options.defaults) + object.pushEndpoint = ""; + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + object.pushEndpoint = message.pushEndpoint; + var keys2; + if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { + object.attributes = {}; + for (var j = 0; j < keys2.length; ++j) + object.attributes[keys2[j]] = message.attributes[keys2[j]]; } - } - return message; - }; + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { + object.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.toObject(message.oidcToken, options); + if (options.oneofs) + object.authenticationMethod = "oidcToken"; + } + return object; + }; - /** - * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.ServiceOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.ServiceOptions} ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ServiceOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Converts this PushConfig to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PushConfig + * @instance + * @returns {Object.} JSON object + */ + PushConfig.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Verifies a ServiceOptions message. - * @function verify - * @memberof google.protobuf.ServiceOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ServiceOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) - if (!$util.isString(message[".google.api.defaultHost"])) - return ".google.api.defaultHost: string expected"; - if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) - if (!$util.isString(message[".google.api.oauthScopes"])) - return ".google.api.oauthScopes: string expected"; - return null; - }; + PushConfig.OidcToken = (function() { - /** - * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.ServiceOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.ServiceOptions} ServiceOptions - */ - ServiceOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.ServiceOptions) - return object; - var message = new $root.google.protobuf.ServiceOptions(); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + /** + * Properties of an OidcToken. + * @memberof google.pubsub.v1.PushConfig + * @interface IOidcToken + * @property {string|null} [serviceAccountEmail] OidcToken serviceAccountEmail + * @property {string|null} [audience] OidcToken audience + */ + + /** + * Constructs a new OidcToken. + * @memberof google.pubsub.v1.PushConfig + * @classdesc Represents an OidcToken. + * @implements IOidcToken + * @constructor + * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set + */ + function OidcToken(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - } - if (object[".google.api.defaultHost"] != null) - message[".google.api.defaultHost"] = String(object[".google.api.defaultHost"]); - if (object[".google.api.oauthScopes"] != null) - message[".google.api.oauthScopes"] = String(object[".google.api.oauthScopes"]); - return message; - }; - /** - * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.ServiceOptions - * @static - * @param {google.protobuf.ServiceOptions} message ServiceOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ServiceOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (options.defaults) { - object.deprecated = false; - object[".google.api.defaultHost"] = ""; - object[".google.api.oauthScopes"] = ""; - } - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) - object[".google.api.defaultHost"] = message[".google.api.defaultHost"]; - if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) - object[".google.api.oauthScopes"] = message[".google.api.oauthScopes"]; - return object; - }; + /** + * OidcToken serviceAccountEmail. + * @member {string} serviceAccountEmail + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + */ + OidcToken.prototype.serviceAccountEmail = ""; + + /** + * OidcToken audience. + * @member {string} audience + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + */ + OidcToken.prototype.audience = ""; + + /** + * Creates a new OidcToken instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken instance + */ + OidcToken.create = function create(properties) { + return new OidcToken(properties); + }; + + /** + * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OidcToken.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.serviceAccountEmail); + if (message.audience != null && message.hasOwnProperty("audience")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.audience); + return writer; + }; + + /** + * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OidcToken.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an OidcToken message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OidcToken.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.OidcToken(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.serviceAccountEmail = reader.string(); + break; + case 2: + message.audience = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Converts this ServiceOptions to JSON. - * @function toJSON - * @memberof google.protobuf.ServiceOptions - * @instance - * @returns {Object.} JSON object - */ - ServiceOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Decodes an OidcToken message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OidcToken.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - return ServiceOptions; - })(); + /** + * Verifies an OidcToken message. + * @function verify + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OidcToken.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + if (!$util.isString(message.serviceAccountEmail)) + return "serviceAccountEmail: string expected"; + if (message.audience != null && message.hasOwnProperty("audience")) + if (!$util.isString(message.audience)) + return "audience: string expected"; + return null; + }; - protobuf.MethodOptions = (function() { + /** + * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + */ + OidcToken.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PushConfig.OidcToken) + return object; + var message = new $root.google.pubsub.v1.PushConfig.OidcToken(); + if (object.serviceAccountEmail != null) + message.serviceAccountEmail = String(object.serviceAccountEmail); + if (object.audience != null) + message.audience = String(object.audience); + return message; + }; - /** - * Properties of a MethodOptions. - * @memberof google.protobuf - * @interface IMethodOptions - * @property {boolean|null} [deprecated] MethodOptions deprecated - * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel - * @property {Array.|null} [uninterpretedOption] MethodOptions uninterpretedOption - * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http - * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature - */ + /** + * Creates a plain object from an OidcToken message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.OidcToken} message OidcToken + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OidcToken.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.serviceAccountEmail = ""; + object.audience = ""; + } + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + object.serviceAccountEmail = message.serviceAccountEmail; + if (message.audience != null && message.hasOwnProperty("audience")) + object.audience = message.audience; + return object; + }; - /** - * Constructs a new MethodOptions. - * @memberof google.protobuf - * @classdesc Represents a MethodOptions. - * @implements IMethodOptions - * @constructor - * @param {google.protobuf.IMethodOptions=} [properties] Properties to set - */ - function MethodOptions(properties) { - this.uninterpretedOption = []; - this[".google.api.methodSignature"] = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Converts this OidcToken to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + * @returns {Object.} JSON object + */ + OidcToken.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * MethodOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype.deprecated = false; + return OidcToken; + })(); - /** - * MethodOptions idempotencyLevel. - * @member {google.protobuf.MethodOptions.IdempotencyLevel} idempotencyLevel - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype.idempotencyLevel = 0; + return PushConfig; + })(); - /** - * MethodOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype.uninterpretedOption = $util.emptyArray; + v1.ReceivedMessage = (function() { - /** - * MethodOptions .google.api.http. - * @member {google.api.IHttpRule|null|undefined} .google.api.http - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype[".google.api.http"] = null; + /** + * Properties of a ReceivedMessage. + * @memberof google.pubsub.v1 + * @interface IReceivedMessage + * @property {string|null} [ackId] ReceivedMessage ackId + * @property {google.pubsub.v1.IPubsubMessage|null} [message] ReceivedMessage message + * @property {number|null} [deliveryAttempt] ReceivedMessage deliveryAttempt + */ - /** - * MethodOptions .google.api.methodSignature. - * @member {Array.} .google.api.methodSignature - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; + /** + * Constructs a new ReceivedMessage. + * @memberof google.pubsub.v1 + * @classdesc Represents a ReceivedMessage. + * @implements IReceivedMessage + * @constructor + * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set + */ + function ReceivedMessage(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a new MethodOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.MethodOptions - * @static - * @param {google.protobuf.IMethodOptions=} [properties] Properties to set - * @returns {google.protobuf.MethodOptions} MethodOptions instance - */ - MethodOptions.create = function create(properties) { - return new MethodOptions(properties); - }; + /** + * ReceivedMessage ackId. + * @member {string} ackId + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.ackId = ""; - /** - * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.MethodOptions - * @static - * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); - if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) - writer.uint32(/* id 34, wireType 0 =*/272).int32(message.idempotencyLevel); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.methodSignature"] != null && message[".google.api.methodSignature"].length) - for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) - writer.uint32(/* id 1051, wireType 2 =*/8410).string(message[".google.api.methodSignature"][i]); - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) - $root.google.api.HttpRule.encode(message[".google.api.http"], writer.uint32(/* id 72295728, wireType 2 =*/578365826).fork()).ldelim(); - return writer; - }; + /** + * ReceivedMessage message. + * @member {google.pubsub.v1.IPubsubMessage|null|undefined} message + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.message = null; + + /** + * ReceivedMessage deliveryAttempt. + * @member {number} deliveryAttempt + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.deliveryAttempt = 0; + + /** + * Creates a new ReceivedMessage instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage instance + */ + ReceivedMessage.create = function create(properties) { + return new ReceivedMessage(properties); + }; - /** - * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.MethodOptions - * @static - * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ReceivedMessage.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ackId != null && message.hasOwnProperty("ackId")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.ackId); + if (message.message != null && message.hasOwnProperty("message")) + $root.google.pubsub.v1.PubsubMessage.encode(message.message, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.deliveryAttempt); + return writer; + }; - /** - * Decodes a MethodOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.MethodOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.MethodOptions} MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 33: - message.deprecated = reader.bool(); - break; - case 34: - message.idempotencyLevel = reader.int32(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 72295728: - message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); - break; - case 1051: - if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) - message[".google.api.methodSignature"] = []; - message[".google.api.methodSignature"].push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ReceivedMessage.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ReceivedMessage message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ReceivedMessage.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ReceivedMessage(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ackId = reader.string(); + break; + case 2: + message.message = $root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32()); + break; + case 3: + message.deliveryAttempt = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a MethodOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.MethodOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.MethodOptions} MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ReceivedMessage.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a MethodOptions message. - * @function verify - * @memberof google.protobuf.MethodOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - MethodOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) - switch (message.idempotencyLevel) { - default: - return "idempotencyLevel: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + /** + * Verifies a ReceivedMessage message. + * @function verify + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ReceivedMessage.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ackId != null && message.hasOwnProperty("ackId")) + if (!$util.isString(message.ackId)) + return "ackId: string expected"; + if (message.message != null && message.hasOwnProperty("message")) { + var error = $root.google.pubsub.v1.PubsubMessage.verify(message.message); if (error) - return "uninterpretedOption." + error; + return "message." + error; } - } - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { - var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); - if (error) - return ".google.api.http." + error; - } - if (message[".google.api.methodSignature"] != null && message.hasOwnProperty(".google.api.methodSignature")) { - if (!Array.isArray(message[".google.api.methodSignature"])) - return ".google.api.methodSignature: array expected"; - for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) - if (!$util.isString(message[".google.api.methodSignature"][i])) - return ".google.api.methodSignature: string[] expected"; - } - return null; - }; + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + if (!$util.isInteger(message.deliveryAttempt)) + return "deliveryAttempt: integer expected"; + return null; + }; - /** - * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.MethodOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.MethodOptions} MethodOptions - */ - MethodOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.MethodOptions) - return object; - var message = new $root.google.protobuf.MethodOptions(); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - switch (object.idempotencyLevel) { - case "IDEMPOTENCY_UNKNOWN": - case 0: - message.idempotencyLevel = 0; - break; - case "NO_SIDE_EFFECTS": - case 1: - message.idempotencyLevel = 1; - break; - case "IDEMPOTENT": - case 2: - message.idempotencyLevel = 2; - break; - } - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + /** + * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + */ + ReceivedMessage.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ReceivedMessage) + return object; + var message = new $root.google.pubsub.v1.ReceivedMessage(); + if (object.ackId != null) + message.ackId = String(object.ackId); + if (object.message != null) { + if (typeof object.message !== "object") + throw TypeError(".google.pubsub.v1.ReceivedMessage.message: object expected"); + message.message = $root.google.pubsub.v1.PubsubMessage.fromObject(object.message); } - } - if (object[".google.api.http"] != null) { - if (typeof object[".google.api.http"] !== "object") - throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); - message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); - } - if (object[".google.api.methodSignature"]) { - if (!Array.isArray(object[".google.api.methodSignature"])) - throw TypeError(".google.protobuf.MethodOptions..google.api.methodSignature: array expected"); - message[".google.api.methodSignature"] = []; - for (var i = 0; i < object[".google.api.methodSignature"].length; ++i) - message[".google.api.methodSignature"][i] = String(object[".google.api.methodSignature"][i]); - } - return message; - }; + if (object.deliveryAttempt != null) + message.deliveryAttempt = object.deliveryAttempt | 0; + return message; + }; - /** - * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.MethodOptions - * @static - * @param {google.protobuf.MethodOptions} message MethodOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - MethodOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.uninterpretedOption = []; - object[".google.api.methodSignature"] = []; - } - if (options.defaults) { - object.deprecated = false; - object.idempotencyLevel = options.enums === String ? "IDEMPOTENCY_UNKNOWN" : 0; - object[".google.api.http"] = null; - } - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) - object.idempotencyLevel = options.enums === String ? $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] : message.idempotencyLevel; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length) { - object[".google.api.methodSignature"] = []; - for (var j = 0; j < message[".google.api.methodSignature"].length; ++j) - object[".google.api.methodSignature"][j] = message[".google.api.methodSignature"][j]; - } - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) - object[".google.api.http"] = $root.google.api.HttpRule.toObject(message[".google.api.http"], options); - return object; - }; + /** + * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.ReceivedMessage} message ReceivedMessage + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ReceivedMessage.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.ackId = ""; + object.message = null; + object.deliveryAttempt = 0; + } + if (message.ackId != null && message.hasOwnProperty("ackId")) + object.ackId = message.ackId; + if (message.message != null && message.hasOwnProperty("message")) + object.message = $root.google.pubsub.v1.PubsubMessage.toObject(message.message, options); + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + object.deliveryAttempt = message.deliveryAttempt; + return object; + }; - /** - * Converts this MethodOptions to JSON. - * @function toJSON - * @memberof google.protobuf.MethodOptions - * @instance - * @returns {Object.} JSON object - */ - MethodOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this ReceivedMessage to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + * @returns {Object.} JSON object + */ + ReceivedMessage.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * IdempotencyLevel enum. - * @name google.protobuf.MethodOptions.IdempotencyLevel - * @enum {string} - * @property {number} IDEMPOTENCY_UNKNOWN=0 IDEMPOTENCY_UNKNOWN value - * @property {number} NO_SIDE_EFFECTS=1 NO_SIDE_EFFECTS value - * @property {number} IDEMPOTENT=2 IDEMPOTENT value - */ - MethodOptions.IdempotencyLevel = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "IDEMPOTENCY_UNKNOWN"] = 0; - values[valuesById[1] = "NO_SIDE_EFFECTS"] = 1; - values[valuesById[2] = "IDEMPOTENT"] = 2; - return values; + return ReceivedMessage; })(); - return MethodOptions; - })(); + v1.GetSubscriptionRequest = (function() { - protobuf.UninterpretedOption = (function() { + /** + * Properties of a GetSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IGetSubscriptionRequest + * @property {string|null} [subscription] GetSubscriptionRequest subscription + */ + + /** + * Constructs a new GetSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetSubscriptionRequest. + * @implements IGetSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set + */ + function GetSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetSubscriptionRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @instance + */ + GetSubscriptionRequest.prototype.subscription = ""; + + /** + * Creates a new GetSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest instance + */ + GetSubscriptionRequest.create = function create(properties) { + return new GetSubscriptionRequest(properties); + }; + + /** + * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + return writer; + }; + + /** + * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Properties of an UninterpretedOption. - * @memberof google.protobuf - * @interface IUninterpretedOption - * @property {Array.|null} [name] UninterpretedOption name - * @property {string|null} [identifierValue] UninterpretedOption identifierValue - * @property {number|Long|null} [positiveIntValue] UninterpretedOption positiveIntValue - * @property {number|Long|null} [negativeIntValue] UninterpretedOption negativeIntValue - * @property {number|null} [doubleValue] UninterpretedOption doubleValue - * @property {Uint8Array|null} [stringValue] UninterpretedOption stringValue - * @property {string|null} [aggregateValue] UninterpretedOption aggregateValue - */ + /** + * Verifies a GetSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + return null; + }; - /** - * Constructs a new UninterpretedOption. - * @memberof google.protobuf - * @classdesc Represents an UninterpretedOption. - * @implements IUninterpretedOption - * @constructor - * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set - */ - function UninterpretedOption(properties) { - this.name = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest + */ + GetSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.GetSubscriptionRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + return message; + }; - /** - * UninterpretedOption name. - * @member {Array.} name - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.name = $util.emptyArray; + /** + * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {google.pubsub.v1.GetSubscriptionRequest} message GetSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GetSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + return object; + }; - /** - * UninterpretedOption identifierValue. - * @member {string} identifierValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.identifierValue = ""; + /** + * Converts this GetSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + GetSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * UninterpretedOption positiveIntValue. - * @member {number|Long} positiveIntValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.positiveIntValue = $util.Long ? $util.Long.fromBits(0,0,true) : 0; + return GetSubscriptionRequest; + })(); - /** - * UninterpretedOption negativeIntValue. - * @member {number|Long} negativeIntValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.negativeIntValue = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + v1.UpdateSubscriptionRequest = (function() { - /** - * UninterpretedOption doubleValue. - * @member {number} doubleValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.doubleValue = 0; + /** + * Properties of an UpdateSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IUpdateSubscriptionRequest + * @property {google.pubsub.v1.ISubscription|null} [subscription] UpdateSubscriptionRequest subscription + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSubscriptionRequest updateMask + */ - /** - * UninterpretedOption stringValue. - * @member {Uint8Array} stringValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.stringValue = $util.newBuffer([]); + /** + * Constructs a new UpdateSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an UpdateSubscriptionRequest. + * @implements IUpdateSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set + */ + function UpdateSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * UninterpretedOption aggregateValue. - * @member {string} aggregateValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.aggregateValue = ""; + /** + * UpdateSubscriptionRequest subscription. + * @member {google.pubsub.v1.ISubscription|null|undefined} subscription + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + */ + UpdateSubscriptionRequest.prototype.subscription = null; - /** - * Creates a new UninterpretedOption instance using the specified properties. - * @function create - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set - * @returns {google.protobuf.UninterpretedOption} UninterpretedOption instance - */ - UninterpretedOption.create = function create(properties) { - return new UninterpretedOption(properties); - }; + /** + * UpdateSubscriptionRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + */ + UpdateSubscriptionRequest.prototype.updateMask = null; - /** - * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @function encode - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UninterpretedOption.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.name.length) - for (var i = 0; i < message.name.length; ++i) - $root.google.protobuf.UninterpretedOption.NamePart.encode(message.name[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.identifierValue); - if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) - writer.uint32(/* id 4, wireType 0 =*/32).uint64(message.positiveIntValue); - if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) - writer.uint32(/* id 5, wireType 0 =*/40).int64(message.negativeIntValue); - if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) - writer.uint32(/* id 6, wireType 1 =*/49).double(message.doubleValue); - if (message.stringValue != null && message.hasOwnProperty("stringValue")) - writer.uint32(/* id 7, wireType 2 =*/58).bytes(message.stringValue); - if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) - writer.uint32(/* id 8, wireType 2 =*/66).string(message.aggregateValue); - return writer; - }; + /** + * Creates a new UpdateSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest instance + */ + UpdateSubscriptionRequest.create = function create(properties) { + return new UpdateSubscriptionRequest(properties); + }; - /** - * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UninterpretedOption.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + $root.google.pubsub.v1.Subscription.encode(message.subscription, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; - /** - * Decodes an UninterpretedOption message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.UninterpretedOption} UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UninterpretedOption.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 2: - if (!(message.name && message.name.length)) - message.name = []; - message.name.push($root.google.protobuf.UninterpretedOption.NamePart.decode(reader, reader.uint32())); - break; - case 3: - message.identifierValue = reader.string(); - break; - case 4: - message.positiveIntValue = reader.uint64(); - break; - case 5: - message.negativeIntValue = reader.int64(); - break; - case 6: - message.doubleValue = reader.double(); - break; - case 7: - message.stringValue = reader.bytes(); - break; - case 8: - message.aggregateValue = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = $root.google.pubsub.v1.Subscription.decode(reader, reader.uint32()); + break; + case 2: + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.UninterpretedOption} UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UninterpretedOption.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies an UninterpretedOption message. - * @function verify - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - UninterpretedOption.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) { - if (!Array.isArray(message.name)) - return "name: array expected"; - for (var i = 0; i < message.name.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.NamePart.verify(message.name[i]); + /** + * Verifies an UpdateSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + UpdateSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) { + var error = $root.google.pubsub.v1.Subscription.verify(message.subscription); if (error) - return "name." + error; + return "subscription." + error; } - } - if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) - if (!$util.isString(message.identifierValue)) - return "identifierValue: string expected"; - if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) - if (!$util.isInteger(message.positiveIntValue) && !(message.positiveIntValue && $util.isInteger(message.positiveIntValue.low) && $util.isInteger(message.positiveIntValue.high))) - return "positiveIntValue: integer|Long expected"; - if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) - if (!$util.isInteger(message.negativeIntValue) && !(message.negativeIntValue && $util.isInteger(message.negativeIntValue.low) && $util.isInteger(message.negativeIntValue.high))) - return "negativeIntValue: integer|Long expected"; - if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) - if (typeof message.doubleValue !== "number") - return "doubleValue: number expected"; - if (message.stringValue != null && message.hasOwnProperty("stringValue")) - if (!(message.stringValue && typeof message.stringValue.length === "number" || $util.isString(message.stringValue))) - return "stringValue: buffer expected"; - if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) - if (!$util.isString(message.aggregateValue)) - return "aggregateValue: string expected"; - return null; - }; + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + if (error) + return "updateMask." + error; + } + return null; + }; - /** - * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.UninterpretedOption} UninterpretedOption - */ - UninterpretedOption.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.UninterpretedOption) - return object; - var message = new $root.google.protobuf.UninterpretedOption(); - if (object.name) { - if (!Array.isArray(object.name)) - throw TypeError(".google.protobuf.UninterpretedOption.name: array expected"); - message.name = []; - for (var i = 0; i < object.name.length; ++i) { - if (typeof object.name[i] !== "object") - throw TypeError(".google.protobuf.UninterpretedOption.name: object expected"); - message.name[i] = $root.google.protobuf.UninterpretedOption.NamePart.fromObject(object.name[i]); + /** + * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + */ + UpdateSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); + if (object.subscription != null) { + if (typeof object.subscription !== "object") + throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.subscription: object expected"); + message.subscription = $root.google.pubsub.v1.Subscription.fromObject(object.subscription); } - } - if (object.identifierValue != null) - message.identifierValue = String(object.identifierValue); - if (object.positiveIntValue != null) - if ($util.Long) - (message.positiveIntValue = $util.Long.fromValue(object.positiveIntValue)).unsigned = true; - else if (typeof object.positiveIntValue === "string") - message.positiveIntValue = parseInt(object.positiveIntValue, 10); - else if (typeof object.positiveIntValue === "number") - message.positiveIntValue = object.positiveIntValue; - else if (typeof object.positiveIntValue === "object") - message.positiveIntValue = new $util.LongBits(object.positiveIntValue.low >>> 0, object.positiveIntValue.high >>> 0).toNumber(true); - if (object.negativeIntValue != null) - if ($util.Long) - (message.negativeIntValue = $util.Long.fromValue(object.negativeIntValue)).unsigned = false; - else if (typeof object.negativeIntValue === "string") - message.negativeIntValue = parseInt(object.negativeIntValue, 10); - else if (typeof object.negativeIntValue === "number") - message.negativeIntValue = object.negativeIntValue; - else if (typeof object.negativeIntValue === "object") - message.negativeIntValue = new $util.LongBits(object.negativeIntValue.low >>> 0, object.negativeIntValue.high >>> 0).toNumber(); - if (object.doubleValue != null) - message.doubleValue = Number(object.doubleValue); - if (object.stringValue != null) - if (typeof object.stringValue === "string") - $util.base64.decode(object.stringValue, message.stringValue = $util.newBuffer($util.base64.length(object.stringValue)), 0); - else if (object.stringValue.length) - message.stringValue = object.stringValue; - if (object.aggregateValue != null) - message.aggregateValue = String(object.aggregateValue); - return message; - }; + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + } + return message; + }; - /** - * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {google.protobuf.UninterpretedOption} message UninterpretedOption - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - UninterpretedOption.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.name = []; - if (options.defaults) { - object.identifierValue = ""; - if ($util.Long) { - var long = new $util.Long(0, 0, true); - object.positiveIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.positiveIntValue = options.longs === String ? "0" : 0; - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.negativeIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.negativeIntValue = options.longs === String ? "0" : 0; - object.doubleValue = 0; - if (options.bytes === String) - object.stringValue = ""; - else { - object.stringValue = []; - if (options.bytes !== Array) - object.stringValue = $util.newBuffer(object.stringValue); + /** + * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.UpdateSubscriptionRequest} message UpdateSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UpdateSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = null; + object.updateMask = null; } - object.aggregateValue = ""; - } - if (message.name && message.name.length) { - object.name = []; - for (var j = 0; j < message.name.length; ++j) - object.name[j] = $root.google.protobuf.UninterpretedOption.NamePart.toObject(message.name[j], options); - } - if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) - object.identifierValue = message.identifierValue; - if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) - if (typeof message.positiveIntValue === "number") - object.positiveIntValue = options.longs === String ? String(message.positiveIntValue) : message.positiveIntValue; - else - object.positiveIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.positiveIntValue) : options.longs === Number ? new $util.LongBits(message.positiveIntValue.low >>> 0, message.positiveIntValue.high >>> 0).toNumber(true) : message.positiveIntValue; - if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) - if (typeof message.negativeIntValue === "number") - object.negativeIntValue = options.longs === String ? String(message.negativeIntValue) : message.negativeIntValue; - else - object.negativeIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.negativeIntValue) : options.longs === Number ? new $util.LongBits(message.negativeIntValue.low >>> 0, message.negativeIntValue.high >>> 0).toNumber() : message.negativeIntValue; - if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) - object.doubleValue = options.json && !isFinite(message.doubleValue) ? String(message.doubleValue) : message.doubleValue; - if (message.stringValue != null && message.hasOwnProperty("stringValue")) - object.stringValue = options.bytes === String ? $util.base64.encode(message.stringValue, 0, message.stringValue.length) : options.bytes === Array ? Array.prototype.slice.call(message.stringValue) : message.stringValue; - if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) - object.aggregateValue = message.aggregateValue; - return object; - }; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = $root.google.pubsub.v1.Subscription.toObject(message.subscription, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); + return object; + }; - /** - * Converts this UninterpretedOption to JSON. - * @function toJSON - * @memberof google.protobuf.UninterpretedOption - * @instance - * @returns {Object.} JSON object - */ - UninterpretedOption.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this UpdateSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + UpdateSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - UninterpretedOption.NamePart = (function() { + return UpdateSubscriptionRequest; + })(); + + v1.ListSubscriptionsRequest = (function() { /** - * Properties of a NamePart. - * @memberof google.protobuf.UninterpretedOption - * @interface INamePart - * @property {string} namePart NamePart namePart - * @property {boolean} isExtension NamePart isExtension + * Properties of a ListSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @interface IListSubscriptionsRequest + * @property {string|null} [project] ListSubscriptionsRequest project + * @property {number|null} [pageSize] ListSubscriptionsRequest pageSize + * @property {string|null} [pageToken] ListSubscriptionsRequest pageToken */ /** - * Constructs a new NamePart. - * @memberof google.protobuf.UninterpretedOption - * @classdesc Represents a NamePart. - * @implements INamePart + * Constructs a new ListSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSubscriptionsRequest. + * @implements IListSubscriptionsRequest * @constructor - * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set + * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set */ - function NamePart(properties) { + function ListSubscriptionsRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -19383,423 +20173,231 @@ } /** - * NamePart namePart. - * @member {string} namePart - * @memberof google.protobuf.UninterpretedOption.NamePart + * ListSubscriptionsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @instance */ - NamePart.prototype.namePart = ""; + ListSubscriptionsRequest.prototype.project = ""; /** - * NamePart isExtension. - * @member {boolean} isExtension - * @memberof google.protobuf.UninterpretedOption.NamePart + * ListSubscriptionsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @instance */ - NamePart.prototype.isExtension = false; + ListSubscriptionsRequest.prototype.pageSize = 0; /** - * Creates a new NamePart instance using the specified properties. + * ListSubscriptionsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + */ + ListSubscriptionsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListSubscriptionsRequest instance using the specified properties. * @function create - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @static - * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set - * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart instance + * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest instance */ - NamePart.create = function create(properties) { - return new NamePart(properties); + ListSubscriptionsRequest.create = function create(properties) { + return new ListSubscriptionsRequest(properties); }; /** - * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. * @function encode - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @static - * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode + * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - NamePart.encode = function encode(message, writer) { + ListSubscriptionsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - writer.uint32(/* id 1, wireType 2 =*/10).string(message.namePart); - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.isExtension); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; /** - * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @static - * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode + * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - NamePart.encodeDelimited = function encodeDelimited(message, writer) { + ListSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a NamePart message from the specified reader or buffer. + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - NamePart.decode = function decode(reader, length) { + ListSubscriptionsRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption.NamePart(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.namePart = reader.string(); + message.project = reader.string(); break; case 2: - message.isExtension = reader.bool(); + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); break; default: reader.skipType(tag & 7); break; } } - if (!message.hasOwnProperty("namePart")) - throw $util.ProtocolError("missing required 'namePart'", { instance: message }); - if (!message.hasOwnProperty("isExtension")) - throw $util.ProtocolError("missing required 'isExtension'", { instance: message }); return message; }; /** - * Decodes a NamePart message from the specified reader or buffer, length delimited. + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - NamePart.decodeDelimited = function decodeDelimited(reader) { + ListSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a NamePart message. + * Verifies a ListSubscriptionsRequest message. * @function verify - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - NamePart.verify = function verify(message) { + ListSubscriptionsRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (!$util.isString(message.namePart)) - return "namePart: string expected"; - if (typeof message.isExtension !== "boolean") - return "isExtension: boolean expected"; + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; return null; }; /** - * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @static * @param {Object.} object Plain object - * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest */ - NamePart.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.UninterpretedOption.NamePart) + ListSubscriptionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSubscriptionsRequest) return object; - var message = new $root.google.protobuf.UninterpretedOption.NamePart(); - if (object.namePart != null) - message.namePart = String(object.namePart); - if (object.isExtension != null) - message.isExtension = Boolean(object.isExtension); + var message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); return message; }; /** - * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @static - * @param {google.protobuf.UninterpretedOption.NamePart} message NamePart + * @param {google.pubsub.v1.ListSubscriptionsRequest} message ListSubscriptionsRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - NamePart.toObject = function toObject(message, options) { + ListSubscriptionsRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.namePart = ""; - object.isExtension = false; + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; } - if (message.namePart != null && message.hasOwnProperty("namePart")) - object.namePart = message.namePart; - if (message.isExtension != null && message.hasOwnProperty("isExtension")) - object.isExtension = message.isExtension; + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; return object; }; /** - * Converts this NamePart to JSON. + * Converts this ListSubscriptionsRequest to JSON. * @function toJSON - * @memberof google.protobuf.UninterpretedOption.NamePart + * @memberof google.pubsub.v1.ListSubscriptionsRequest * @instance * @returns {Object.} JSON object */ - NamePart.prototype.toJSON = function toJSON() { + ListSubscriptionsRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return NamePart; + return ListSubscriptionsRequest; })(); - return UninterpretedOption; - })(); - - protobuf.SourceCodeInfo = (function() { - - /** - * Properties of a SourceCodeInfo. - * @memberof google.protobuf - * @interface ISourceCodeInfo - * @property {Array.|null} [location] SourceCodeInfo location - */ - - /** - * Constructs a new SourceCodeInfo. - * @memberof google.protobuf - * @classdesc Represents a SourceCodeInfo. - * @implements ISourceCodeInfo - * @constructor - * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set - */ - function SourceCodeInfo(properties) { - this.location = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * SourceCodeInfo location. - * @member {Array.} location - * @memberof google.protobuf.SourceCodeInfo - * @instance - */ - SourceCodeInfo.prototype.location = $util.emptyArray; - - /** - * Creates a new SourceCodeInfo instance using the specified properties. - * @function create - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set - * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo instance - */ - SourceCodeInfo.create = function create(properties) { - return new SourceCodeInfo(properties); - }; - - /** - * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @function encode - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SourceCodeInfo.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.location != null && message.location.length) - for (var i = 0; i < message.location.length; ++i) - $root.google.protobuf.SourceCodeInfo.Location.encode(message.location[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SourceCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SourceCodeInfo.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.location && message.location.length)) - message.location = []; - message.location.push($root.google.protobuf.SourceCodeInfo.Location.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SourceCodeInfo.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a SourceCodeInfo message. - * @function verify - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - SourceCodeInfo.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.location != null && message.hasOwnProperty("location")) { - if (!Array.isArray(message.location)) - return "location: array expected"; - for (var i = 0; i < message.location.length; ++i) { - var error = $root.google.protobuf.SourceCodeInfo.Location.verify(message.location[i]); - if (error) - return "location." + error; - } - } - return null; - }; - - /** - * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo - */ - SourceCodeInfo.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.SourceCodeInfo) - return object; - var message = new $root.google.protobuf.SourceCodeInfo(); - if (object.location) { - if (!Array.isArray(object.location)) - throw TypeError(".google.protobuf.SourceCodeInfo.location: array expected"); - message.location = []; - for (var i = 0; i < object.location.length; ++i) { - if (typeof object.location[i] !== "object") - throw TypeError(".google.protobuf.SourceCodeInfo.location: object expected"); - message.location[i] = $root.google.protobuf.SourceCodeInfo.Location.fromObject(object.location[i]); - } - } - return message; - }; - - /** - * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {google.protobuf.SourceCodeInfo} message SourceCodeInfo - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - SourceCodeInfo.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.location = []; - if (message.location && message.location.length) { - object.location = []; - for (var j = 0; j < message.location.length; ++j) - object.location[j] = $root.google.protobuf.SourceCodeInfo.Location.toObject(message.location[j], options); - } - return object; - }; - - /** - * Converts this SourceCodeInfo to JSON. - * @function toJSON - * @memberof google.protobuf.SourceCodeInfo - * @instance - * @returns {Object.} JSON object - */ - SourceCodeInfo.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - SourceCodeInfo.Location = (function() { + v1.ListSubscriptionsResponse = (function() { /** - * Properties of a Location. - * @memberof google.protobuf.SourceCodeInfo - * @interface ILocation - * @property {Array.|null} [path] Location path - * @property {Array.|null} [span] Location span - * @property {string|null} [leadingComments] Location leadingComments - * @property {string|null} [trailingComments] Location trailingComments - * @property {Array.|null} [leadingDetachedComments] Location leadingDetachedComments + * Properties of a ListSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @interface IListSubscriptionsResponse + * @property {Array.|null} [subscriptions] ListSubscriptionsResponse subscriptions + * @property {string|null} [nextPageToken] ListSubscriptionsResponse nextPageToken */ /** - * Constructs a new Location. - * @memberof google.protobuf.SourceCodeInfo - * @classdesc Represents a Location. - * @implements ILocation + * Constructs a new ListSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSubscriptionsResponse. + * @implements IListSubscriptionsResponse * @constructor - * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set + * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set */ - function Location(properties) { - this.path = []; - this.span = []; - this.leadingDetachedComments = []; + function ListSubscriptionsResponse(properties) { + this.subscriptions = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -19807,152 +20405,91 @@ } /** - * Location path. - * @member {Array.} path - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - */ - Location.prototype.path = $util.emptyArray; - - /** - * Location span. - * @member {Array.} span - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - */ - Location.prototype.span = $util.emptyArray; - - /** - * Location leadingComments. - * @member {string} leadingComments - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - */ - Location.prototype.leadingComments = ""; - - /** - * Location trailingComments. - * @member {string} trailingComments - * @memberof google.protobuf.SourceCodeInfo.Location + * ListSubscriptionsResponse subscriptions. + * @member {Array.} subscriptions + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @instance */ - Location.prototype.trailingComments = ""; + ListSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; /** - * Location leadingDetachedComments. - * @member {Array.} leadingDetachedComments - * @memberof google.protobuf.SourceCodeInfo.Location + * ListSubscriptionsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @instance */ - Location.prototype.leadingDetachedComments = $util.emptyArray; + ListSubscriptionsResponse.prototype.nextPageToken = ""; /** - * Creates a new Location instance using the specified properties. + * Creates a new ListSubscriptionsResponse instance using the specified properties. * @function create - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @static - * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set - * @returns {google.protobuf.SourceCodeInfo.Location} Location instance + * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse instance */ - Location.create = function create(properties) { - return new Location(properties); + ListSubscriptionsResponse.create = function create(properties) { + return new ListSubscriptionsResponse(properties); }; /** - * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. * @function encode - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @static - * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode + * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Location.encode = function encode(message, writer) { + ListSubscriptionsResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.path != null && message.path.length) { - writer.uint32(/* id 1, wireType 2 =*/10).fork(); - for (var i = 0; i < message.path.length; ++i) - writer.int32(message.path[i]); - writer.ldelim(); - } - if (message.span != null && message.span.length) { - writer.uint32(/* id 2, wireType 2 =*/18).fork(); - for (var i = 0; i < message.span.length; ++i) - writer.int32(message.span[i]); - writer.ldelim(); - } - if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.leadingComments); - if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.trailingComments); - if (message.leadingDetachedComments != null && message.leadingDetachedComments.length) - for (var i = 0; i < message.leadingDetachedComments.length; ++i) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.leadingDetachedComments[i]); + if (message.subscriptions != null && message.subscriptions.length) + for (var i = 0; i < message.subscriptions.length; ++i) + $root.google.pubsub.v1.Subscription.encode(message.subscriptions[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); return writer; }; /** - * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @static - * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode + * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Location.encodeDelimited = function encodeDelimited(message, writer) { + ListSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a Location message from the specified reader or buffer. + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.SourceCodeInfo.Location} Location + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Location.decode = function decode(reader, length) { + ListSubscriptionsResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo.Location(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.path && message.path.length)) - message.path = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.path.push(reader.int32()); - } else - message.path.push(reader.int32()); + if (!(message.subscriptions && message.subscriptions.length)) + message.subscriptions = []; + message.subscriptions.push($root.google.pubsub.v1.Subscription.decode(reader, reader.uint32())); break; case 2: - if (!(message.span && message.span.length)) - message.span = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.span.push(reader.int32()); - } else - message.span.push(reader.int32()); - break; - case 3: - message.leadingComments = reader.string(); - break; - case 4: - message.trailingComments = reader.string(); - break; - case 6: - if (!(message.leadingDetachedComments && message.leadingDetachedComments.length)) - message.leadingDetachedComments = []; - message.leadingDetachedComments.push(reader.string()); + message.nextPageToken = reader.string(); break; default: reader.skipType(tag & 7); @@ -19963,390 +20500,321 @@ }; /** - * Decodes a Location message from the specified reader or buffer, length delimited. + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.SourceCodeInfo.Location} Location + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Location.decodeDelimited = function decodeDelimited(reader) { + ListSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a Location message. + * Verifies a ListSubscriptionsResponse message. * @function verify - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - Location.verify = function verify(message) { + ListSubscriptionsResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.path != null && message.hasOwnProperty("path")) { - if (!Array.isArray(message.path)) - return "path: array expected"; - for (var i = 0; i < message.path.length; ++i) - if (!$util.isInteger(message.path[i])) - return "path: integer[] expected"; - } - if (message.span != null && message.hasOwnProperty("span")) { - if (!Array.isArray(message.span)) - return "span: array expected"; - for (var i = 0; i < message.span.length; ++i) - if (!$util.isInteger(message.span[i])) - return "span: integer[] expected"; - } - if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) - if (!$util.isString(message.leadingComments)) - return "leadingComments: string expected"; - if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) - if (!$util.isString(message.trailingComments)) - return "trailingComments: string expected"; - if (message.leadingDetachedComments != null && message.hasOwnProperty("leadingDetachedComments")) { - if (!Array.isArray(message.leadingDetachedComments)) - return "leadingDetachedComments: array expected"; - for (var i = 0; i < message.leadingDetachedComments.length; ++i) - if (!$util.isString(message.leadingDetachedComments[i])) - return "leadingDetachedComments: string[] expected"; + if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { + if (!Array.isArray(message.subscriptions)) + return "subscriptions: array expected"; + for (var i = 0; i < message.subscriptions.length; ++i) { + var error = $root.google.pubsub.v1.Subscription.verify(message.subscriptions[i]); + if (error) + return "subscriptions." + error; + } } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; return null; }; /** - * Creates a Location message from a plain object. Also converts values to their respective internal types. + * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @static * @param {Object.} object Plain object - * @returns {google.protobuf.SourceCodeInfo.Location} Location + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse */ - Location.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.SourceCodeInfo.Location) + ListSubscriptionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSubscriptionsResponse) return object; - var message = new $root.google.protobuf.SourceCodeInfo.Location(); - if (object.path) { - if (!Array.isArray(object.path)) - throw TypeError(".google.protobuf.SourceCodeInfo.Location.path: array expected"); - message.path = []; - for (var i = 0; i < object.path.length; ++i) - message.path[i] = object.path[i] | 0; - } - if (object.span) { - if (!Array.isArray(object.span)) - throw TypeError(".google.protobuf.SourceCodeInfo.Location.span: array expected"); - message.span = []; - for (var i = 0; i < object.span.length; ++i) - message.span[i] = object.span[i] | 0; - } - if (object.leadingComments != null) - message.leadingComments = String(object.leadingComments); - if (object.trailingComments != null) - message.trailingComments = String(object.trailingComments); - if (object.leadingDetachedComments) { - if (!Array.isArray(object.leadingDetachedComments)) - throw TypeError(".google.protobuf.SourceCodeInfo.Location.leadingDetachedComments: array expected"); - message.leadingDetachedComments = []; - for (var i = 0; i < object.leadingDetachedComments.length; ++i) - message.leadingDetachedComments[i] = String(object.leadingDetachedComments[i]); + var message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); + if (object.subscriptions) { + if (!Array.isArray(object.subscriptions)) + throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: array expected"); + message.subscriptions = []; + for (var i = 0; i < object.subscriptions.length; ++i) { + if (typeof object.subscriptions[i] !== "object") + throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: object expected"); + message.subscriptions[i] = $root.google.pubsub.v1.Subscription.fromObject(object.subscriptions[i]); + } } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); return message; }; /** - * Creates a plain object from a Location message. Also converts values to other types if specified. + * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. * @function toObject - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @static - * @param {google.protobuf.SourceCodeInfo.Location} message Location + * @param {google.pubsub.v1.ListSubscriptionsResponse} message ListSubscriptionsResponse * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - Location.toObject = function toObject(message, options) { + ListSubscriptionsResponse.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) { - object.path = []; - object.span = []; - object.leadingDetachedComments = []; - } - if (options.defaults) { - object.leadingComments = ""; - object.trailingComments = ""; - } - if (message.path && message.path.length) { - object.path = []; - for (var j = 0; j < message.path.length; ++j) - object.path[j] = message.path[j]; - } - if (message.span && message.span.length) { - object.span = []; - for (var j = 0; j < message.span.length; ++j) - object.span[j] = message.span[j]; - } - if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) - object.leadingComments = message.leadingComments; - if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) - object.trailingComments = message.trailingComments; - if (message.leadingDetachedComments && message.leadingDetachedComments.length) { - object.leadingDetachedComments = []; - for (var j = 0; j < message.leadingDetachedComments.length; ++j) - object.leadingDetachedComments[j] = message.leadingDetachedComments[j]; + if (options.arrays || options.defaults) + object.subscriptions = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.subscriptions && message.subscriptions.length) { + object.subscriptions = []; + for (var j = 0; j < message.subscriptions.length; ++j) + object.subscriptions[j] = $root.google.pubsub.v1.Subscription.toObject(message.subscriptions[j], options); } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; return object; }; /** - * Converts this Location to JSON. + * Converts this ListSubscriptionsResponse to JSON. * @function toJSON - * @memberof google.protobuf.SourceCodeInfo.Location + * @memberof google.pubsub.v1.ListSubscriptionsResponse * @instance * @returns {Object.} JSON object */ - Location.prototype.toJSON = function toJSON() { + ListSubscriptionsResponse.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return Location; + return ListSubscriptionsResponse; })(); - return SourceCodeInfo; - })(); - - protobuf.GeneratedCodeInfo = (function() { + v1.DeleteSubscriptionRequest = (function() { - /** - * Properties of a GeneratedCodeInfo. - * @memberof google.protobuf - * @interface IGeneratedCodeInfo - * @property {Array.|null} [annotation] GeneratedCodeInfo annotation - */ + /** + * Properties of a DeleteSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteSubscriptionRequest + * @property {string|null} [subscription] DeleteSubscriptionRequest subscription + */ - /** - * Constructs a new GeneratedCodeInfo. - * @memberof google.protobuf - * @classdesc Represents a GeneratedCodeInfo. - * @implements IGeneratedCodeInfo - * @constructor - * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set - */ - function GeneratedCodeInfo(properties) { - this.annotation = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Constructs a new DeleteSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteSubscriptionRequest. + * @implements IDeleteSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set + */ + function DeleteSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * GeneratedCodeInfo annotation. - * @member {Array.} annotation - * @memberof google.protobuf.GeneratedCodeInfo - * @instance - */ - GeneratedCodeInfo.prototype.annotation = $util.emptyArray; + /** + * DeleteSubscriptionRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @instance + */ + DeleteSubscriptionRequest.prototype.subscription = ""; - /** - * Creates a new GeneratedCodeInfo instance using the specified properties. - * @function create - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set - * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo instance - */ - GeneratedCodeInfo.create = function create(properties) { - return new GeneratedCodeInfo(properties); - }; + /** + * Creates a new DeleteSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest instance + */ + DeleteSubscriptionRequest.create = function create(properties) { + return new DeleteSubscriptionRequest(properties); + }; - /** - * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @function encode - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GeneratedCodeInfo.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.annotation != null && message.annotation.length) - for (var i = 0; i < message.annotation.length; ++i) - $root.google.protobuf.GeneratedCodeInfo.Annotation.encode(message.annotation[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + /** + * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + return writer; + }; - /** - * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GeneratedCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GeneratedCodeInfo.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.annotation && message.annotation.length)) - message.annotation = []; - message.annotation.push($root.google.protobuf.GeneratedCodeInfo.Annotation.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; + + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GeneratedCodeInfo.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Verifies a DeleteSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + return null; + }; - /** - * Verifies a GeneratedCodeInfo message. - * @function verify - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - GeneratedCodeInfo.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.annotation != null && message.hasOwnProperty("annotation")) { - if (!Array.isArray(message.annotation)) - return "annotation: array expected"; - for (var i = 0; i < message.annotation.length; ++i) { - var error = $root.google.protobuf.GeneratedCodeInfo.Annotation.verify(message.annotation[i]); - if (error) - return "annotation." + error; - } - } - return null; - }; + /** + * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + */ + DeleteSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + return message; + }; - /** - * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo - */ - GeneratedCodeInfo.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.GeneratedCodeInfo) + /** + * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.DeleteSubscriptionRequest} message DeleteSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; return object; - var message = new $root.google.protobuf.GeneratedCodeInfo(); - if (object.annotation) { - if (!Array.isArray(object.annotation)) - throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: array expected"); - message.annotation = []; - for (var i = 0; i < object.annotation.length; ++i) { - if (typeof object.annotation[i] !== "object") - throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: object expected"); - message.annotation[i] = $root.google.protobuf.GeneratedCodeInfo.Annotation.fromObject(object.annotation[i]); - } - } - return message; - }; + }; - /** - * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {google.protobuf.GeneratedCodeInfo} message GeneratedCodeInfo - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - GeneratedCodeInfo.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.annotation = []; - if (message.annotation && message.annotation.length) { - object.annotation = []; - for (var j = 0; j < message.annotation.length; ++j) - object.annotation[j] = $root.google.protobuf.GeneratedCodeInfo.Annotation.toObject(message.annotation[j], options); - } - return object; - }; + /** + * Converts this DeleteSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this GeneratedCodeInfo to JSON. - * @function toJSON - * @memberof google.protobuf.GeneratedCodeInfo - * @instance - * @returns {Object.} JSON object - */ - GeneratedCodeInfo.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return DeleteSubscriptionRequest; + })(); - GeneratedCodeInfo.Annotation = (function() { + v1.ModifyPushConfigRequest = (function() { /** - * Properties of an Annotation. - * @memberof google.protobuf.GeneratedCodeInfo - * @interface IAnnotation - * @property {Array.|null} [path] Annotation path - * @property {string|null} [sourceFile] Annotation sourceFile - * @property {number|null} [begin] Annotation begin - * @property {number|null} [end] Annotation end + * Properties of a ModifyPushConfigRequest. + * @memberof google.pubsub.v1 + * @interface IModifyPushConfigRequest + * @property {string|null} [subscription] ModifyPushConfigRequest subscription + * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] ModifyPushConfigRequest pushConfig */ /** - * Constructs a new Annotation. - * @memberof google.protobuf.GeneratedCodeInfo - * @classdesc Represents an Annotation. - * @implements IAnnotation + * Constructs a new ModifyPushConfigRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ModifyPushConfigRequest. + * @implements IModifyPushConfigRequest * @constructor - * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set + * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set */ - function Annotation(properties) { - this.path = []; + function ModifyPushConfigRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -20354,125 +20822,88 @@ } /** - * Annotation path. - * @member {Array.} path - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @instance - */ - Annotation.prototype.path = $util.emptyArray; - - /** - * Annotation sourceFile. - * @member {string} sourceFile - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @instance - */ - Annotation.prototype.sourceFile = ""; - - /** - * Annotation begin. - * @member {number} begin - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * ModifyPushConfigRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @instance */ - Annotation.prototype.begin = 0; + ModifyPushConfigRequest.prototype.subscription = ""; /** - * Annotation end. - * @member {number} end - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * ModifyPushConfigRequest pushConfig. + * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @instance */ - Annotation.prototype.end = 0; + ModifyPushConfigRequest.prototype.pushConfig = null; /** - * Creates a new Annotation instance using the specified properties. + * Creates a new ModifyPushConfigRequest instance using the specified properties. * @function create - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @static - * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set - * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation instance + * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest instance */ - Annotation.create = function create(properties) { - return new Annotation(properties); + ModifyPushConfigRequest.create = function create(properties) { + return new ModifyPushConfigRequest(properties); }; /** - * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. * @function encode - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @static - * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode + * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Annotation.encode = function encode(message, writer) { + ModifyPushConfigRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.path != null && message.path.length) { - writer.uint32(/* id 1, wireType 2 =*/10).fork(); - for (var i = 0; i < message.path.length; ++i) - writer.int32(message.path[i]); - writer.ldelim(); - } - if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.sourceFile); - if (message.begin != null && message.hasOwnProperty("begin")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.begin); - if (message.end != null && message.hasOwnProperty("end")) - writer.uint32(/* id 4, wireType 0 =*/32).int32(message.end); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @static - * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode + * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Annotation.encodeDelimited = function encodeDelimited(message, writer) { + ModifyPushConfigRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an Annotation message from the specified reader or buffer. + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Annotation.decode = function decode(reader, length) { + ModifyPushConfigRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.path && message.path.length)) - message.path = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.path.push(reader.int32()); - } else - message.path.push(reader.int32()); + message.subscription = reader.string(); break; case 2: - message.sourceFile = reader.string(); - break; - case 3: - message.begin = reader.int32(); - break; - case 4: - message.end = reader.int32(); + message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -20483,1204 +20914,1202 @@ }; /** - * Decodes an Annotation message from the specified reader or buffer, length delimited. + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Annotation.decodeDelimited = function decodeDelimited(reader) { + ModifyPushConfigRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an Annotation message. + * Verifies a ModifyPushConfigRequest message. * @function verify - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - Annotation.verify = function verify(message) { + ModifyPushConfigRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.path != null && message.hasOwnProperty("path")) { - if (!Array.isArray(message.path)) - return "path: array expected"; - for (var i = 0; i < message.path.length; ++i) - if (!$util.isInteger(message.path[i])) - return "path: integer[] expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { + var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); + if (error) + return "pushConfig." + error; } - if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) - if (!$util.isString(message.sourceFile)) - return "sourceFile: string expected"; - if (message.begin != null && message.hasOwnProperty("begin")) - if (!$util.isInteger(message.begin)) - return "begin: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; return null; }; /** - * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @memberof google.pubsub.v1.ModifyPushConfigRequest * @static * @param {Object.} object Plain object - * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation - */ - Annotation.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.GeneratedCodeInfo.Annotation) - return object; - var message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); - if (object.path) { - if (!Array.isArray(object.path)) - throw TypeError(".google.protobuf.GeneratedCodeInfo.Annotation.path: array expected"); - message.path = []; - for (var i = 0; i < object.path.length; ++i) - message.path[i] = object.path[i] | 0; - } - if (object.sourceFile != null) - message.sourceFile = String(object.sourceFile); - if (object.begin != null) - message.begin = object.begin | 0; - if (object.end != null) - message.end = object.end | 0; - return message; - }; - - /** - * Creates a plain object from an Annotation message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {google.protobuf.GeneratedCodeInfo.Annotation} message Annotation - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Annotation.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.path = []; - if (options.defaults) { - object.sourceFile = ""; - object.begin = 0; - object.end = 0; - } - if (message.path && message.path.length) { - object.path = []; - for (var j = 0; j < message.path.length; ++j) - object.path[j] = message.path[j]; - } - if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) - object.sourceFile = message.sourceFile; - if (message.begin != null && message.hasOwnProperty("begin")) - object.begin = message.begin; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; - return object; - }; - - /** - * Converts this Annotation to JSON. - * @function toJSON - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @instance - * @returns {Object.} JSON object - */ - Annotation.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return Annotation; - })(); - - return GeneratedCodeInfo; - })(); - - protobuf.Duration = (function() { - - /** - * Properties of a Duration. - * @memberof google.protobuf - * @interface IDuration - * @property {number|Long|null} [seconds] Duration seconds - * @property {number|null} [nanos] Duration nanos - */ - - /** - * Constructs a new Duration. - * @memberof google.protobuf - * @classdesc Represents a Duration. - * @implements IDuration - * @constructor - * @param {google.protobuf.IDuration=} [properties] Properties to set - */ - function Duration(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Duration seconds. - * @member {number|Long} seconds - * @memberof google.protobuf.Duration - * @instance - */ - Duration.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; - - /** - * Duration nanos. - * @member {number} nanos - * @memberof google.protobuf.Duration - * @instance - */ - Duration.prototype.nanos = 0; - - /** - * Creates a new Duration instance using the specified properties. - * @function create - * @memberof google.protobuf.Duration - * @static - * @param {google.protobuf.IDuration=} [properties] Properties to set - * @returns {google.protobuf.Duration} Duration instance - */ - Duration.create = function create(properties) { - return new Duration(properties); - }; - - /** - * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @function encode - * @memberof google.protobuf.Duration - * @static - * @param {google.protobuf.IDuration} message Duration message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Duration.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.seconds != null && message.hasOwnProperty("seconds")) - writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); - if (message.nanos != null && message.hasOwnProperty("nanos")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); - return writer; - }; - - /** - * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.Duration - * @static - * @param {google.protobuf.IDuration} message Duration message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Duration.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a Duration message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.Duration - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.Duration} Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Duration.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Duration(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.seconds = reader.int64(); - break; - case 2: - message.nanos = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest + */ + ModifyPushConfigRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ModifyPushConfigRequest) + return object; + var message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.pushConfig != null) { + if (typeof object.pushConfig !== "object") + throw TypeError(".google.pubsub.v1.ModifyPushConfigRequest.pushConfig: object expected"); + message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); } - } - return message; - }; + return message; + }; - /** - * Decodes a Duration message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.Duration - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.Duration} Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Duration.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.ModifyPushConfigRequest} message ModifyPushConfigRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ModifyPushConfigRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = ""; + object.pushConfig = null; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); + return object; + }; - /** - * Verifies a Duration message. - * @function verify - * @memberof google.protobuf.Duration - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Duration.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.seconds != null && message.hasOwnProperty("seconds")) - if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) - return "seconds: integer|Long expected"; - if (message.nanos != null && message.hasOwnProperty("nanos")) - if (!$util.isInteger(message.nanos)) - return "nanos: integer expected"; - return null; - }; + /** + * Converts this ModifyPushConfigRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @instance + * @returns {Object.} JSON object + */ + ModifyPushConfigRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a Duration message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.Duration - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.Duration} Duration - */ - Duration.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.Duration) - return object; - var message = new $root.google.protobuf.Duration(); - if (object.seconds != null) - if ($util.Long) - (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; - else if (typeof object.seconds === "string") - message.seconds = parseInt(object.seconds, 10); - else if (typeof object.seconds === "number") - message.seconds = object.seconds; - else if (typeof object.seconds === "object") - message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); - if (object.nanos != null) - message.nanos = object.nanos | 0; - return message; - }; + return ModifyPushConfigRequest; + })(); - /** - * Creates a plain object from a Duration message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.Duration - * @static - * @param {google.protobuf.Duration} message Duration - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Duration.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.seconds = options.longs === String ? "0" : 0; - object.nanos = 0; - } - if (message.seconds != null && message.hasOwnProperty("seconds")) - if (typeof message.seconds === "number") - object.seconds = options.longs === String ? String(message.seconds) : message.seconds; - else - object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; - if (message.nanos != null && message.hasOwnProperty("nanos")) - object.nanos = message.nanos; - return object; - }; + v1.PullRequest = (function() { - /** - * Converts this Duration to JSON. - * @function toJSON - * @memberof google.protobuf.Duration - * @instance - * @returns {Object.} JSON object - */ - Duration.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Properties of a PullRequest. + * @memberof google.pubsub.v1 + * @interface IPullRequest + * @property {string|null} [subscription] PullRequest subscription + * @property {boolean|null} [returnImmediately] PullRequest returnImmediately + * @property {number|null} [maxMessages] PullRequest maxMessages + */ - return Duration; - })(); + /** + * Constructs a new PullRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a PullRequest. + * @implements IPullRequest + * @constructor + * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set + */ + function PullRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - protobuf.Empty = (function() { + /** + * PullRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.subscription = ""; - /** - * Properties of an Empty. - * @memberof google.protobuf - * @interface IEmpty - */ + /** + * PullRequest returnImmediately. + * @member {boolean} returnImmediately + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.returnImmediately = false; - /** - * Constructs a new Empty. - * @memberof google.protobuf - * @classdesc Represents an Empty. - * @implements IEmpty - * @constructor - * @param {google.protobuf.IEmpty=} [properties] Properties to set - */ - function Empty(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * PullRequest maxMessages. + * @member {number} maxMessages + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.maxMessages = 0; - /** - * Creates a new Empty instance using the specified properties. - * @function create - * @memberof google.protobuf.Empty - * @static - * @param {google.protobuf.IEmpty=} [properties] Properties to set - * @returns {google.protobuf.Empty} Empty instance - */ - Empty.create = function create(properties) { - return new Empty(properties); - }; + /** + * Creates a new PullRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.PullRequest} PullRequest instance + */ + PullRequest.create = function create(properties) { + return new PullRequest(properties); + }; - /** - * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @function encode - * @memberof google.protobuf.Empty - * @static - * @param {google.protobuf.IEmpty} message Empty message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Empty.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - return writer; - }; + /** + * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.returnImmediately); + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.maxMessages); + return writer; + }; - /** - * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.Empty - * @static - * @param {google.protobuf.IEmpty} message Empty message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Empty.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes an Empty message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.Empty - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.Empty} Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Empty.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Empty(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a PullRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PullRequest} PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + message.returnImmediately = reader.bool(); + break; + case 3: + message.maxMessages = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes an Empty message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.Empty - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.Empty} Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Empty.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a PullRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PullRequest} PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies an Empty message. - * @function verify - * @memberof google.protobuf.Empty - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Empty.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - return null; - }; + /** + * Verifies a PullRequest message. + * @function verify + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PullRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + if (typeof message.returnImmediately !== "boolean") + return "returnImmediately: boolean expected"; + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + if (!$util.isInteger(message.maxMessages)) + return "maxMessages: integer expected"; + return null; + }; - /** - * Creates an Empty message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.Empty - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.Empty} Empty - */ - Empty.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.Empty) - return object; - return new $root.google.protobuf.Empty(); - }; + /** + * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PullRequest} PullRequest + */ + PullRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PullRequest) + return object; + var message = new $root.google.pubsub.v1.PullRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.returnImmediately != null) + message.returnImmediately = Boolean(object.returnImmediately); + if (object.maxMessages != null) + message.maxMessages = object.maxMessages | 0; + return message; + }; - /** - * Creates a plain object from an Empty message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.Empty - * @static - * @param {google.protobuf.Empty} message Empty - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Empty.toObject = function toObject() { - return {}; - }; + /** + * Creates a plain object from a PullRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.PullRequest} message PullRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PullRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = ""; + object.returnImmediately = false; + object.maxMessages = 0; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + object.returnImmediately = message.returnImmediately; + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + object.maxMessages = message.maxMessages; + return object; + }; - /** - * Converts this Empty to JSON. - * @function toJSON - * @memberof google.protobuf.Empty - * @instance - * @returns {Object.} JSON object - */ - Empty.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this PullRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PullRequest + * @instance + * @returns {Object.} JSON object + */ + PullRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return Empty; - })(); + return PullRequest; + })(); - protobuf.FieldMask = (function() { + v1.PullResponse = (function() { - /** - * Properties of a FieldMask. - * @memberof google.protobuf - * @interface IFieldMask - * @property {Array.|null} [paths] FieldMask paths - */ + /** + * Properties of a PullResponse. + * @memberof google.pubsub.v1 + * @interface IPullResponse + * @property {Array.|null} [receivedMessages] PullResponse receivedMessages + */ - /** - * Constructs a new FieldMask. - * @memberof google.protobuf - * @classdesc Represents a FieldMask. - * @implements IFieldMask - * @constructor - * @param {google.protobuf.IFieldMask=} [properties] Properties to set - */ - function FieldMask(properties) { - this.paths = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Constructs a new PullResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a PullResponse. + * @implements IPullResponse + * @constructor + * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set + */ + function PullResponse(properties) { + this.receivedMessages = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * FieldMask paths. - * @member {Array.} paths - * @memberof google.protobuf.FieldMask - * @instance - */ - FieldMask.prototype.paths = $util.emptyArray; + /** + * PullResponse receivedMessages. + * @member {Array.} receivedMessages + * @memberof google.pubsub.v1.PullResponse + * @instance + */ + PullResponse.prototype.receivedMessages = $util.emptyArray; - /** - * Creates a new FieldMask instance using the specified properties. - * @function create - * @memberof google.protobuf.FieldMask - * @static - * @param {google.protobuf.IFieldMask=} [properties] Properties to set - * @returns {google.protobuf.FieldMask} FieldMask instance - */ - FieldMask.create = function create(properties) { - return new FieldMask(properties); - }; + /** + * Creates a new PullResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.PullResponse} PullResponse instance + */ + PullResponse.create = function create(properties) { + return new PullResponse(properties); + }; - /** - * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FieldMask - * @static - * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldMask.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.paths != null && message.paths.length) - for (var i = 0; i < message.paths.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.paths[i]); - return writer; - }; + /** + * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.receivedMessages != null && message.receivedMessages.length) + for (var i = 0; i < message.receivedMessages.length; ++i) + $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FieldMask - * @static - * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldMask.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a FieldMask message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FieldMask - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FieldMask} FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldMask.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldMask(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.paths && message.paths.length)) - message.paths = []; - message.paths.push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a PullResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PullResponse} PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.receivedMessages && message.receivedMessages.length)) + message.receivedMessages = []; + message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a FieldMask message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FieldMask - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FieldMask} FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldMask.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a PullResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PullResponse} PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a FieldMask message. - * @function verify - * @memberof google.protobuf.FieldMask - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FieldMask.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.paths != null && message.hasOwnProperty("paths")) { - if (!Array.isArray(message.paths)) - return "paths: array expected"; - for (var i = 0; i < message.paths.length; ++i) - if (!$util.isString(message.paths[i])) - return "paths: string[] expected"; - } - return null; - }; + /** + * Verifies a PullResponse message. + * @function verify + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PullResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { + if (!Array.isArray(message.receivedMessages)) + return "receivedMessages: array expected"; + for (var i = 0; i < message.receivedMessages.length; ++i) { + var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); + if (error) + return "receivedMessages." + error; + } + } + return null; + }; - /** - * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FieldMask - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FieldMask} FieldMask - */ - FieldMask.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FieldMask) + /** + * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PullResponse} PullResponse + */ + PullResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PullResponse) + return object; + var message = new $root.google.pubsub.v1.PullResponse(); + if (object.receivedMessages) { + if (!Array.isArray(object.receivedMessages)) + throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: array expected"); + message.receivedMessages = []; + for (var i = 0; i < object.receivedMessages.length; ++i) { + if (typeof object.receivedMessages[i] !== "object") + throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: object expected"); + message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a PullResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.PullResponse} message PullResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PullResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.receivedMessages = []; + if (message.receivedMessages && message.receivedMessages.length) { + object.receivedMessages = []; + for (var j = 0; j < message.receivedMessages.length; ++j) + object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); + } return object; - var message = new $root.google.protobuf.FieldMask(); - if (object.paths) { - if (!Array.isArray(object.paths)) - throw TypeError(".google.protobuf.FieldMask.paths: array expected"); - message.paths = []; - for (var i = 0; i < object.paths.length; ++i) - message.paths[i] = String(object.paths[i]); - } - return message; - }; + }; - /** - * Creates a plain object from a FieldMask message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FieldMask - * @static - * @param {google.protobuf.FieldMask} message FieldMask - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FieldMask.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.paths = []; - if (message.paths && message.paths.length) { - object.paths = []; - for (var j = 0; j < message.paths.length; ++j) - object.paths[j] = message.paths[j]; - } - return object; - }; + /** + * Converts this PullResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PullResponse + * @instance + * @returns {Object.} JSON object + */ + PullResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this FieldMask to JSON. - * @function toJSON - * @memberof google.protobuf.FieldMask - * @instance - * @returns {Object.} JSON object - */ - FieldMask.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return PullResponse; + })(); - return FieldMask; - })(); + v1.ModifyAckDeadlineRequest = (function() { - protobuf.Timestamp = (function() { + /** + * Properties of a ModifyAckDeadlineRequest. + * @memberof google.pubsub.v1 + * @interface IModifyAckDeadlineRequest + * @property {string|null} [subscription] ModifyAckDeadlineRequest subscription + * @property {Array.|null} [ackIds] ModifyAckDeadlineRequest ackIds + * @property {number|null} [ackDeadlineSeconds] ModifyAckDeadlineRequest ackDeadlineSeconds + */ - /** - * Properties of a Timestamp. - * @memberof google.protobuf - * @interface ITimestamp - * @property {number|Long|null} [seconds] Timestamp seconds - * @property {number|null} [nanos] Timestamp nanos - */ + /** + * Constructs a new ModifyAckDeadlineRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ModifyAckDeadlineRequest. + * @implements IModifyAckDeadlineRequest + * @constructor + * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set + */ + function ModifyAckDeadlineRequest(properties) { + this.ackIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new Timestamp. - * @memberof google.protobuf - * @classdesc Represents a Timestamp. - * @implements ITimestamp - * @constructor - * @param {google.protobuf.ITimestamp=} [properties] Properties to set - */ - function Timestamp(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * ModifyAckDeadlineRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.subscription = ""; - /** - * Timestamp seconds. - * @member {number|Long} seconds - * @memberof google.protobuf.Timestamp - * @instance - */ - Timestamp.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + /** + * ModifyAckDeadlineRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.ackIds = $util.emptyArray; - /** - * Timestamp nanos. - * @member {number} nanos - * @memberof google.protobuf.Timestamp - * @instance - */ - Timestamp.prototype.nanos = 0; + /** + * ModifyAckDeadlineRequest ackDeadlineSeconds. + * @member {number} ackDeadlineSeconds + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.ackDeadlineSeconds = 0; - /** - * Creates a new Timestamp instance using the specified properties. - * @function create - * @memberof google.protobuf.Timestamp - * @static - * @param {google.protobuf.ITimestamp=} [properties] Properties to set - * @returns {google.protobuf.Timestamp} Timestamp instance - */ - Timestamp.create = function create(properties) { - return new Timestamp(properties); - }; + /** + * Creates a new ModifyAckDeadlineRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest instance + */ + ModifyAckDeadlineRequest.create = function create(properties) { + return new ModifyAckDeadlineRequest(properties); + }; - /** - * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @function encode - * @memberof google.protobuf.Timestamp - * @static - * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Timestamp.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.seconds != null && message.hasOwnProperty("seconds")) - writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); - if (message.nanos != null && message.hasOwnProperty("nanos")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); - return writer; - }; + /** + * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyAckDeadlineRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.ackDeadlineSeconds); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.ackIds[i]); + return writer; + }; - /** - * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.Timestamp - * @static - * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Timestamp.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyAckDeadlineRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a Timestamp message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.Timestamp - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.Timestamp} Timestamp - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Timestamp.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Timestamp(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.seconds = reader.int64(); - break; - case 2: - message.nanos = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyAckDeadlineRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 4: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + case 3: + message.ackDeadlineSeconds = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a Timestamp message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.Timestamp - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.Timestamp} Timestamp - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Timestamp.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyAckDeadlineRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a Timestamp message. - * @function verify - * @memberof google.protobuf.Timestamp - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Timestamp.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.seconds != null && message.hasOwnProperty("seconds")) - if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) - return "seconds: integer|Long expected"; - if (message.nanos != null && message.hasOwnProperty("nanos")) - if (!$util.isInteger(message.nanos)) - return "nanos: integer expected"; - return null; - }; + /** + * Verifies a ModifyAckDeadlineRequest message. + * @function verify + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ModifyAckDeadlineRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + if (!$util.isInteger(message.ackDeadlineSeconds)) + return "ackDeadlineSeconds: integer expected"; + return null; + }; - /** - * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.Timestamp - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.Timestamp} Timestamp - */ - Timestamp.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.Timestamp) + /** + * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + */ + ModifyAckDeadlineRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ModifyAckDeadlineRequest) + return object; + var message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.ModifyAckDeadlineRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + if (object.ackDeadlineSeconds != null) + message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; + return message; + }; + + /** + * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.ModifyAckDeadlineRequest} message ModifyAckDeadlineRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ModifyAckDeadlineRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.ackIds = []; + if (options.defaults) { + object.subscription = ""; + object.ackDeadlineSeconds = 0; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + object.ackDeadlineSeconds = message.ackDeadlineSeconds; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } return object; - var message = new $root.google.protobuf.Timestamp(); - if (object.seconds != null) - if ($util.Long) - (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; - else if (typeof object.seconds === "string") - message.seconds = parseInt(object.seconds, 10); - else if (typeof object.seconds === "number") - message.seconds = object.seconds; - else if (typeof object.seconds === "object") - message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); - if (object.nanos != null) - message.nanos = object.nanos | 0; - return message; - }; + }; + + /** + * Converts this ModifyAckDeadlineRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + * @returns {Object.} JSON object + */ + ModifyAckDeadlineRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a plain object from a Timestamp message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.Timestamp - * @static - * @param {google.protobuf.Timestamp} message Timestamp - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Timestamp.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.seconds = options.longs === String ? "0" : 0; - object.nanos = 0; - } - if (message.seconds != null && message.hasOwnProperty("seconds")) - if (typeof message.seconds === "number") - object.seconds = options.longs === String ? String(message.seconds) : message.seconds; - else - object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; - if (message.nanos != null && message.hasOwnProperty("nanos")) - object.nanos = message.nanos; - return object; - }; + return ModifyAckDeadlineRequest; + })(); - /** - * Converts this Timestamp to JSON. - * @function toJSON - * @memberof google.protobuf.Timestamp - * @instance - * @returns {Object.} JSON object - */ - Timestamp.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + v1.AcknowledgeRequest = (function() { - return Timestamp; - })(); + /** + * Properties of an AcknowledgeRequest. + * @memberof google.pubsub.v1 + * @interface IAcknowledgeRequest + * @property {string|null} [subscription] AcknowledgeRequest subscription + * @property {Array.|null} [ackIds] AcknowledgeRequest ackIds + */ - return protobuf; - })(); + /** + * Constructs a new AcknowledgeRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an AcknowledgeRequest. + * @implements IAcknowledgeRequest + * @constructor + * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set + */ + function AcknowledgeRequest(properties) { + this.ackIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - google.iam = (function() { + /** + * AcknowledgeRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.AcknowledgeRequest + * @instance + */ + AcknowledgeRequest.prototype.subscription = ""; - /** - * Namespace iam. - * @memberof google - * @namespace - */ - var iam = {}; + /** + * AcknowledgeRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.AcknowledgeRequest + * @instance + */ + AcknowledgeRequest.prototype.ackIds = $util.emptyArray; - iam.v1 = (function() { + /** + * Creates a new AcknowledgeRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest instance + */ + AcknowledgeRequest.create = function create(properties) { + return new AcknowledgeRequest(properties); + }; - /** - * Namespace v1. - * @memberof google.iam - * @namespace - */ - var v1 = {}; + /** + * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AcknowledgeRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); + return writer; + }; - v1.IAMPolicy = (function() { + /** + * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AcknowledgeRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; /** - * Constructs a new IAMPolicy service. - * @memberof google.iam.v1 - * @classdesc Represents a IAMPolicy - * @extends $protobuf.rpc.Service - * @constructor - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * Decodes an AcknowledgeRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - function IAMPolicy(rpcImpl, requestDelimited, responseDelimited) { - $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); - } + AcknowledgeRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.AcknowledgeRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - (IAMPolicy.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = IAMPolicy; + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AcknowledgeRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; /** - * Creates new IAMPolicy service using the specified rpc implementation. - * @function create - * @memberof google.iam.v1.IAMPolicy + * Verifies an AcknowledgeRequest message. + * @function verify + * @memberof google.pubsub.v1.AcknowledgeRequest * @static - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - * @returns {IAMPolicy} RPC service. Useful where requests and/or responses are streamed. + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - IAMPolicy.create = function create(rpcImpl, requestDelimited, responseDelimited) { - return new this(rpcImpl, requestDelimited, responseDelimited); + AcknowledgeRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + return null; }; /** - * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. - * @memberof google.iam.v1.IAMPolicy - * @typedef SetIamPolicyCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.iam.v1.Policy} [response] Policy + * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest */ + AcknowledgeRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.AcknowledgeRequest) + return object; + var message = new $root.google.pubsub.v1.AcknowledgeRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.AcknowledgeRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + return message; + }; /** - * Calls SetIamPolicy. - * @function setIamPolicy - * @memberof google.iam.v1.IAMPolicy - * @instance - * @param {google.iam.v1.ISetIamPolicyRequest} request SetIamPolicyRequest message or plain object - * @param {google.iam.v1.IAMPolicy.SetIamPolicyCallback} callback Node-style callback called with the error, if any, and Policy - * @returns {undefined} - * @variation 1 + * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.AcknowledgeRequest} message AcknowledgeRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object */ - Object.defineProperty(IAMPolicy.prototype.setIamPolicy = function setIamPolicy(request, callback) { - return this.rpcCall(setIamPolicy, $root.google.iam.v1.SetIamPolicyRequest, $root.google.iam.v1.Policy, request, callback); - }, "name", { value: "SetIamPolicy" }); + AcknowledgeRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.ackIds = []; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + return object; + }; /** - * Calls SetIamPolicy. - * @function setIamPolicy - * @memberof google.iam.v1.IAMPolicy + * Converts this AcknowledgeRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.AcknowledgeRequest * @instance - * @param {google.iam.v1.ISetIamPolicyRequest} request SetIamPolicyRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * @returns {Object.} JSON object */ + AcknowledgeRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. - * @memberof google.iam.v1.IAMPolicy - * @typedef GetIamPolicyCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.iam.v1.Policy} [response] Policy - */ + return AcknowledgeRequest; + })(); - /** - * Calls GetIamPolicy. - * @function getIamPolicy - * @memberof google.iam.v1.IAMPolicy - * @instance - * @param {google.iam.v1.IGetIamPolicyRequest} request GetIamPolicyRequest message or plain object - * @param {google.iam.v1.IAMPolicy.GetIamPolicyCallback} callback Node-style callback called with the error, if any, and Policy - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(IAMPolicy.prototype.getIamPolicy = function getIamPolicy(request, callback) { - return this.rpcCall(getIamPolicy, $root.google.iam.v1.GetIamPolicyRequest, $root.google.iam.v1.Policy, request, callback); - }, "name", { value: "GetIamPolicy" }); + v1.StreamingPullRequest = (function() { /** - * Calls GetIamPolicy. - * @function getIamPolicy - * @memberof google.iam.v1.IAMPolicy - * @instance - * @param {google.iam.v1.IGetIamPolicyRequest} request GetIamPolicyRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Properties of a StreamingPullRequest. + * @memberof google.pubsub.v1 + * @interface IStreamingPullRequest + * @property {string|null} [subscription] StreamingPullRequest subscription + * @property {Array.|null} [ackIds] StreamingPullRequest ackIds + * @property {Array.|null} [modifyDeadlineSeconds] StreamingPullRequest modifyDeadlineSeconds + * @property {Array.|null} [modifyDeadlineAckIds] StreamingPullRequest modifyDeadlineAckIds + * @property {number|null} [streamAckDeadlineSeconds] StreamingPullRequest streamAckDeadlineSeconds + * @property {string|null} [clientId] StreamingPullRequest clientId */ /** - * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. - * @memberof google.iam.v1.IAMPolicy - * @typedef TestIamPermissionsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.iam.v1.TestIamPermissionsResponse} [response] TestIamPermissionsResponse + * Constructs a new StreamingPullRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a StreamingPullRequest. + * @implements IStreamingPullRequest + * @constructor + * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set */ + function StreamingPullRequest(properties) { + this.ackIds = []; + this.modifyDeadlineSeconds = []; + this.modifyDeadlineAckIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * Calls TestIamPermissions. - * @function testIamPermissions - * @memberof google.iam.v1.IAMPolicy + * StreamingPullRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.StreamingPullRequest * @instance - * @param {google.iam.v1.ITestIamPermissionsRequest} request TestIamPermissionsRequest message or plain object - * @param {google.iam.v1.IAMPolicy.TestIamPermissionsCallback} callback Node-style callback called with the error, if any, and TestIamPermissionsResponse - * @returns {undefined} - * @variation 1 */ - Object.defineProperty(IAMPolicy.prototype.testIamPermissions = function testIamPermissions(request, callback) { - return this.rpcCall(testIamPermissions, $root.google.iam.v1.TestIamPermissionsRequest, $root.google.iam.v1.TestIamPermissionsResponse, request, callback); - }, "name", { value: "TestIamPermissions" }); + StreamingPullRequest.prototype.subscription = ""; /** - * Calls TestIamPermissions. - * @function testIamPermissions - * @memberof google.iam.v1.IAMPolicy + * StreamingPullRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.StreamingPullRequest * @instance - * @param {google.iam.v1.ITestIamPermissionsRequest} request TestIamPermissionsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 */ - - return IAMPolicy; - })(); - - v1.SetIamPolicyRequest = (function() { + StreamingPullRequest.prototype.ackIds = $util.emptyArray; /** - * Properties of a SetIamPolicyRequest. - * @memberof google.iam.v1 - * @interface ISetIamPolicyRequest - * @property {string|null} [resource] SetIamPolicyRequest resource - * @property {google.iam.v1.IPolicy|null} [policy] SetIamPolicyRequest policy + * StreamingPullRequest modifyDeadlineSeconds. + * @member {Array.} modifyDeadlineSeconds + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance */ + StreamingPullRequest.prototype.modifyDeadlineSeconds = $util.emptyArray; /** - * Constructs a new SetIamPolicyRequest. - * @memberof google.iam.v1 - * @classdesc Represents a SetIamPolicyRequest. - * @implements ISetIamPolicyRequest - * @constructor - * @param {google.iam.v1.ISetIamPolicyRequest=} [properties] Properties to set + * StreamingPullRequest modifyDeadlineAckIds. + * @member {Array.} modifyDeadlineAckIds + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance */ - function SetIamPolicyRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + StreamingPullRequest.prototype.modifyDeadlineAckIds = $util.emptyArray; /** - * SetIamPolicyRequest resource. - * @member {string} resource - * @memberof google.iam.v1.SetIamPolicyRequest + * StreamingPullRequest streamAckDeadlineSeconds. + * @member {number} streamAckDeadlineSeconds + * @memberof google.pubsub.v1.StreamingPullRequest * @instance */ - SetIamPolicyRequest.prototype.resource = ""; + StreamingPullRequest.prototype.streamAckDeadlineSeconds = 0; /** - * SetIamPolicyRequest policy. - * @member {google.iam.v1.IPolicy|null|undefined} policy - * @memberof google.iam.v1.SetIamPolicyRequest + * StreamingPullRequest clientId. + * @member {string} clientId + * @memberof google.pubsub.v1.StreamingPullRequest * @instance */ - SetIamPolicyRequest.prototype.policy = null; + StreamingPullRequest.prototype.clientId = ""; /** - * Creates a new SetIamPolicyRequest instance using the specified properties. + * Creates a new StreamingPullRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @static - * @param {google.iam.v1.ISetIamPolicyRequest=} [properties] Properties to set - * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest instance + * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest instance */ - SetIamPolicyRequest.create = function create(properties) { - return new SetIamPolicyRequest(properties); + StreamingPullRequest.create = function create(properties) { + return new StreamingPullRequest(properties); }; /** - * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @static - * @param {google.iam.v1.ISetIamPolicyRequest} message SetIamPolicyRequest message or plain object to encode + * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - SetIamPolicyRequest.encode = function encode(message, writer) { + StreamingPullRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.resource != null && message.hasOwnProperty("resource")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); - if (message.policy != null && message.hasOwnProperty("policy")) - $root.google.iam.v1.Policy.encode(message.policy, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); + if (message.modifyDeadlineSeconds != null && message.modifyDeadlineSeconds.length) { + writer.uint32(/* id 3, wireType 2 =*/26).fork(); + for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) + writer.int32(message.modifyDeadlineSeconds[i]); + writer.ldelim(); + } + if (message.modifyDeadlineAckIds != null && message.modifyDeadlineAckIds.length) + for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.modifyDeadlineAckIds[i]); + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.streamAckDeadlineSeconds); + if (message.clientId != null && message.hasOwnProperty("clientId")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.clientId); return writer; }; /** - * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. + * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @static - * @param {google.iam.v1.ISetIamPolicyRequest} message SetIamPolicyRequest message or plain object to encode + * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - SetIamPolicyRequest.encodeDelimited = function encodeDelimited(message, writer) { + StreamingPullRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer. + * Decodes a StreamingPullRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SetIamPolicyRequest.decode = function decode(reader, length) { + StreamingPullRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.SetIamPolicyRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.resource = reader.string(); + message.subscription = reader.string(); + break; + case 2: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + case 3: + if (!(message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length)) + message.modifyDeadlineSeconds = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.modifyDeadlineSeconds.push(reader.int32()); + } else + message.modifyDeadlineSeconds.push(reader.int32()); break; - case 2: - message.policy = $root.google.iam.v1.Policy.decode(reader, reader.uint32()); + case 4: + if (!(message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length)) + message.modifyDeadlineAckIds = []; + message.modifyDeadlineAckIds.push(reader.string()); + break; + case 5: + message.streamAckDeadlineSeconds = reader.int32(); + break; + case 6: + message.clientId = reader.string(); break; default: reader.skipType(tag & 7); @@ -21691,122 +22120,187 @@ }; /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. + * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SetIamPolicyRequest.decodeDelimited = function decodeDelimited(reader) { + StreamingPullRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a SetIamPolicyRequest message. + * Verifies a StreamingPullRequest message. * @function verify - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - SetIamPolicyRequest.verify = function verify(message) { + StreamingPullRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.resource != null && message.hasOwnProperty("resource")) - if (!$util.isString(message.resource)) - return "resource: string expected"; - if (message.policy != null && message.hasOwnProperty("policy")) { - var error = $root.google.iam.v1.Policy.verify(message.policy); - if (error) - return "policy." + error; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + if (message.modifyDeadlineSeconds != null && message.hasOwnProperty("modifyDeadlineSeconds")) { + if (!Array.isArray(message.modifyDeadlineSeconds)) + return "modifyDeadlineSeconds: array expected"; + for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) + if (!$util.isInteger(message.modifyDeadlineSeconds[i])) + return "modifyDeadlineSeconds: integer[] expected"; + } + if (message.modifyDeadlineAckIds != null && message.hasOwnProperty("modifyDeadlineAckIds")) { + if (!Array.isArray(message.modifyDeadlineAckIds)) + return "modifyDeadlineAckIds: array expected"; + for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) + if (!$util.isString(message.modifyDeadlineAckIds[i])) + return "modifyDeadlineAckIds: string[] expected"; } + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + if (!$util.isInteger(message.streamAckDeadlineSeconds)) + return "streamAckDeadlineSeconds: integer expected"; + if (message.clientId != null && message.hasOwnProperty("clientId")) + if (!$util.isString(message.clientId)) + return "clientId: string expected"; return null; }; /** - * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest */ - SetIamPolicyRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.SetIamPolicyRequest) + StreamingPullRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullRequest) return object; - var message = new $root.google.iam.v1.SetIamPolicyRequest(); - if (object.resource != null) - message.resource = String(object.resource); - if (object.policy != null) { - if (typeof object.policy !== "object") - throw TypeError(".google.iam.v1.SetIamPolicyRequest.policy: object expected"); - message.policy = $root.google.iam.v1.Policy.fromObject(object.policy); + var message = new $root.google.pubsub.v1.StreamingPullRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); } + if (object.modifyDeadlineSeconds) { + if (!Array.isArray(object.modifyDeadlineSeconds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineSeconds: array expected"); + message.modifyDeadlineSeconds = []; + for (var i = 0; i < object.modifyDeadlineSeconds.length; ++i) + message.modifyDeadlineSeconds[i] = object.modifyDeadlineSeconds[i] | 0; + } + if (object.modifyDeadlineAckIds) { + if (!Array.isArray(object.modifyDeadlineAckIds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineAckIds: array expected"); + message.modifyDeadlineAckIds = []; + for (var i = 0; i < object.modifyDeadlineAckIds.length; ++i) + message.modifyDeadlineAckIds[i] = String(object.modifyDeadlineAckIds[i]); + } + if (object.streamAckDeadlineSeconds != null) + message.streamAckDeadlineSeconds = object.streamAckDeadlineSeconds | 0; + if (object.clientId != null) + message.clientId = String(object.clientId); return message; }; /** - * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. + * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @static - * @param {google.iam.v1.SetIamPolicyRequest} message SetIamPolicyRequest + * @param {google.pubsub.v1.StreamingPullRequest} message StreamingPullRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - SetIamPolicyRequest.toObject = function toObject(message, options) { + StreamingPullRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; + if (options.arrays || options.defaults) { + object.ackIds = []; + object.modifyDeadlineSeconds = []; + object.modifyDeadlineAckIds = []; + } if (options.defaults) { - object.resource = ""; - object.policy = null; + object.subscription = ""; + object.streamAckDeadlineSeconds = 0; + object.clientId = ""; } - if (message.resource != null && message.hasOwnProperty("resource")) - object.resource = message.resource; - if (message.policy != null && message.hasOwnProperty("policy")) - object.policy = $root.google.iam.v1.Policy.toObject(message.policy, options); + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + if (message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length) { + object.modifyDeadlineSeconds = []; + for (var j = 0; j < message.modifyDeadlineSeconds.length; ++j) + object.modifyDeadlineSeconds[j] = message.modifyDeadlineSeconds[j]; + } + if (message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length) { + object.modifyDeadlineAckIds = []; + for (var j = 0; j < message.modifyDeadlineAckIds.length; ++j) + object.modifyDeadlineAckIds[j] = message.modifyDeadlineAckIds[j]; + } + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + object.streamAckDeadlineSeconds = message.streamAckDeadlineSeconds; + if (message.clientId != null && message.hasOwnProperty("clientId")) + object.clientId = message.clientId; return object; }; /** - * Converts this SetIamPolicyRequest to JSON. + * Converts this StreamingPullRequest to JSON. * @function toJSON - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullRequest * @instance * @returns {Object.} JSON object */ - SetIamPolicyRequest.prototype.toJSON = function toJSON() { + StreamingPullRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return SetIamPolicyRequest; + return StreamingPullRequest; })(); - v1.GetIamPolicyRequest = (function() { + v1.StreamingPullResponse = (function() { /** - * Properties of a GetIamPolicyRequest. - * @memberof google.iam.v1 - * @interface IGetIamPolicyRequest - * @property {string|null} [resource] GetIamPolicyRequest resource - * @property {google.iam.v1.IGetPolicyOptions|null} [options] GetIamPolicyRequest options + * Properties of a StreamingPullResponse. + * @memberof google.pubsub.v1 + * @interface IStreamingPullResponse + * @property {Array.|null} [receivedMessages] StreamingPullResponse receivedMessages */ /** - * Constructs a new GetIamPolicyRequest. - * @memberof google.iam.v1 - * @classdesc Represents a GetIamPolicyRequest. - * @implements IGetIamPolicyRequest + * Constructs a new StreamingPullResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a StreamingPullResponse. + * @implements IStreamingPullResponse * @constructor - * @param {google.iam.v1.IGetIamPolicyRequest=} [properties] Properties to set + * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set */ - function GetIamPolicyRequest(properties) { + function StreamingPullResponse(properties) { + this.receivedMessages = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -21814,88 +22308,78 @@ } /** - * GetIamPolicyRequest resource. - * @member {string} resource - * @memberof google.iam.v1.GetIamPolicyRequest - * @instance - */ - GetIamPolicyRequest.prototype.resource = ""; - - /** - * GetIamPolicyRequest options. - * @member {google.iam.v1.IGetPolicyOptions|null|undefined} options - * @memberof google.iam.v1.GetIamPolicyRequest + * StreamingPullResponse receivedMessages. + * @member {Array.} receivedMessages + * @memberof google.pubsub.v1.StreamingPullResponse * @instance */ - GetIamPolicyRequest.prototype.options = null; + StreamingPullResponse.prototype.receivedMessages = $util.emptyArray; /** - * Creates a new GetIamPolicyRequest instance using the specified properties. + * Creates a new StreamingPullResponse instance using the specified properties. * @function create - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @static - * @param {google.iam.v1.IGetIamPolicyRequest=} [properties] Properties to set - * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest instance + * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse instance */ - GetIamPolicyRequest.create = function create(properties) { - return new GetIamPolicyRequest(properties); + StreamingPullResponse.create = function create(properties) { + return new StreamingPullResponse(properties); }; /** - * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. * @function encode - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @static - * @param {google.iam.v1.IGetIamPolicyRequest} message GetIamPolicyRequest message or plain object to encode + * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetIamPolicyRequest.encode = function encode(message, writer) { + StreamingPullResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.resource != null && message.hasOwnProperty("resource")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.iam.v1.GetPolicyOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.receivedMessages != null && message.receivedMessages.length) + for (var i = 0; i < message.receivedMessages.length; ++i) + $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; /** - * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @static - * @param {google.iam.v1.IGetIamPolicyRequest} message GetIamPolicyRequest message or plain object to encode + * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetIamPolicyRequest.encodeDelimited = function encodeDelimited(message, writer) { + StreamingPullResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer. + * Decodes a StreamingPullResponse message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetIamPolicyRequest.decode = function decode(reader, length) { + StreamingPullResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.GetIamPolicyRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.resource = reader.string(); - break; - case 2: - message.options = $root.google.iam.v1.GetPolicyOptions.decode(reader, reader.uint32()); + if (!(message.receivedMessages && message.receivedMessages.length)) + message.receivedMessages = []; + message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -21906,123 +22390,127 @@ }; /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. + * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetIamPolicyRequest.decodeDelimited = function decodeDelimited(reader) { + StreamingPullResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a GetIamPolicyRequest message. + * Verifies a StreamingPullResponse message. * @function verify - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - GetIamPolicyRequest.verify = function verify(message) { + StreamingPullResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.resource != null && message.hasOwnProperty("resource")) - if (!$util.isString(message.resource)) - return "resource: string expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.iam.v1.GetPolicyOptions.verify(message.options); - if (error) - return "options." + error; + if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { + if (!Array.isArray(message.receivedMessages)) + return "receivedMessages: array expected"; + for (var i = 0; i < message.receivedMessages.length; ++i) { + var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); + if (error) + return "receivedMessages." + error; + } } return null; }; /** - * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse */ - GetIamPolicyRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.GetIamPolicyRequest) + StreamingPullResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullResponse) return object; - var message = new $root.google.iam.v1.GetIamPolicyRequest(); - if (object.resource != null) - message.resource = String(object.resource); - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.iam.v1.GetIamPolicyRequest.options: object expected"); - message.options = $root.google.iam.v1.GetPolicyOptions.fromObject(object.options); + var message = new $root.google.pubsub.v1.StreamingPullResponse(); + if (object.receivedMessages) { + if (!Array.isArray(object.receivedMessages)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: array expected"); + message.receivedMessages = []; + for (var i = 0; i < object.receivedMessages.length; ++i) { + if (typeof object.receivedMessages[i] !== "object") + throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: object expected"); + message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); + } } return message; }; /** - * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. + * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @static - * @param {google.iam.v1.GetIamPolicyRequest} message GetIamPolicyRequest + * @param {google.pubsub.v1.StreamingPullResponse} message StreamingPullResponse * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - GetIamPolicyRequest.toObject = function toObject(message, options) { + StreamingPullResponse.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.resource = ""; - object.options = null; + if (options.arrays || options.defaults) + object.receivedMessages = []; + if (message.receivedMessages && message.receivedMessages.length) { + object.receivedMessages = []; + for (var j = 0; j < message.receivedMessages.length; ++j) + object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); } - if (message.resource != null && message.hasOwnProperty("resource")) - object.resource = message.resource; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.iam.v1.GetPolicyOptions.toObject(message.options, options); return object; }; /** - * Converts this GetIamPolicyRequest to JSON. + * Converts this StreamingPullResponse to JSON. * @function toJSON - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.StreamingPullResponse * @instance * @returns {Object.} JSON object */ - GetIamPolicyRequest.prototype.toJSON = function toJSON() { + StreamingPullResponse.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return GetIamPolicyRequest; + return StreamingPullResponse; })(); - v1.TestIamPermissionsRequest = (function() { + v1.CreateSnapshotRequest = (function() { /** - * Properties of a TestIamPermissionsRequest. - * @memberof google.iam.v1 - * @interface ITestIamPermissionsRequest - * @property {string|null} [resource] TestIamPermissionsRequest resource - * @property {Array.|null} [permissions] TestIamPermissionsRequest permissions + * Properties of a CreateSnapshotRequest. + * @memberof google.pubsub.v1 + * @interface ICreateSnapshotRequest + * @property {string|null} [name] CreateSnapshotRequest name + * @property {string|null} [subscription] CreateSnapshotRequest subscription + * @property {Object.|null} [labels] CreateSnapshotRequest labels */ /** - * Constructs a new TestIamPermissionsRequest. - * @memberof google.iam.v1 - * @classdesc Represents a TestIamPermissionsRequest. - * @implements ITestIamPermissionsRequest + * Constructs a new CreateSnapshotRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a CreateSnapshotRequest. + * @implements ICreateSnapshotRequest * @constructor - * @param {google.iam.v1.ITestIamPermissionsRequest=} [properties] Properties to set + * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set */ - function TestIamPermissionsRequest(properties) { - this.permissions = []; + function CreateSnapshotRequest(properties) { + this.labels = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -22030,91 +22518,107 @@ } /** - * TestIamPermissionsRequest resource. - * @member {string} resource - * @memberof google.iam.v1.TestIamPermissionsRequest + * CreateSnapshotRequest name. + * @member {string} name + * @memberof google.pubsub.v1.CreateSnapshotRequest * @instance */ - TestIamPermissionsRequest.prototype.resource = ""; + CreateSnapshotRequest.prototype.name = ""; /** - * TestIamPermissionsRequest permissions. - * @member {Array.} permissions - * @memberof google.iam.v1.TestIamPermissionsRequest + * CreateSnapshotRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.CreateSnapshotRequest * @instance */ - TestIamPermissionsRequest.prototype.permissions = $util.emptyArray; + CreateSnapshotRequest.prototype.subscription = ""; /** - * Creates a new TestIamPermissionsRequest instance using the specified properties. + * CreateSnapshotRequest labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @instance + */ + CreateSnapshotRequest.prototype.labels = $util.emptyObject; + + /** + * Creates a new CreateSnapshotRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static - * @param {google.iam.v1.ITestIamPermissionsRequest=} [properties] Properties to set - * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest instance + * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest instance */ - TestIamPermissionsRequest.create = function create(properties) { - return new TestIamPermissionsRequest(properties); + CreateSnapshotRequest.create = function create(properties) { + return new CreateSnapshotRequest(properties); }; /** - * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static - * @param {google.iam.v1.ITestIamPermissionsRequest} message TestIamPermissionsRequest message or plain object to encode + * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - TestIamPermissionsRequest.encode = function encode(message, writer) { + CreateSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.resource != null && message.hasOwnProperty("resource")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); - if (message.permissions != null && message.permissions.length) - for (var i = 0; i < message.permissions.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.permissions[i]); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.subscription); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); return writer; }; /** - * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static - * @param {google.iam.v1.ITestIamPermissionsRequest} message TestIamPermissionsRequest message or plain object to encode + * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - TestIamPermissionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + CreateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. + * Decodes a CreateSnapshotRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TestIamPermissionsRequest.decode = function decode(reader, length) { + CreateSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.TestIamPermissionsRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.resource = reader.string(); + message.name = reader.string(); break; case 2: - if (!(message.permissions && message.permissions.length)) - message.permissions = []; - message.permissions.push(reader.string()); + message.subscription = reader.string(); + break; + case 3: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); break; default: reader.skipType(tag & 7); @@ -22125,129 +22629,140 @@ }; /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. + * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TestIamPermissionsRequest.decodeDelimited = function decodeDelimited(reader) { + CreateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a TestIamPermissionsRequest message. + * Verifies a CreateSnapshotRequest message. * @function verify - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - TestIamPermissionsRequest.verify = function verify(message) { + CreateSnapshotRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.resource != null && message.hasOwnProperty("resource")) - if (!$util.isString(message.resource)) - return "resource: string expected"; - if (message.permissions != null && message.hasOwnProperty("permissions")) { - if (!Array.isArray(message.permissions)) - return "permissions: array expected"; - for (var i = 0; i < message.permissions.length; ++i) - if (!$util.isString(message.permissions[i])) - return "permissions: string[] expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; } return null; }; /** - * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.TestIamPermissionsRequest - * @static - * @param {Object.} object Plain object - * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest - */ - TestIamPermissionsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.TestIamPermissionsRequest) - return object; - var message = new $root.google.iam.v1.TestIamPermissionsRequest(); - if (object.resource != null) - message.resource = String(object.resource); - if (object.permissions) { - if (!Array.isArray(object.permissions)) - throw TypeError(".google.iam.v1.TestIamPermissionsRequest.permissions: array expected"); - message.permissions = []; - for (var i = 0; i < object.permissions.length; ++i) - message.permissions[i] = String(object.permissions[i]); + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest + */ + CreateSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.CreateSnapshotRequest) + return object; + var message = new $root.google.pubsub.v1.CreateSnapshotRequest(); + if (object.name != null) + message.name = String(object.name); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.CreateSnapshotRequest.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); } return message; }; /** - * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. + * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static - * @param {google.iam.v1.TestIamPermissionsRequest} message TestIamPermissionsRequest + * @param {google.pubsub.v1.CreateSnapshotRequest} message CreateSnapshotRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - TestIamPermissionsRequest.toObject = function toObject(message, options) { + CreateSnapshotRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.permissions = []; - if (options.defaults) - object.resource = ""; - if (message.resource != null && message.hasOwnProperty("resource")) - object.resource = message.resource; - if (message.permissions && message.permissions.length) { - object.permissions = []; - for (var j = 0; j < message.permissions.length; ++j) - object.permissions[j] = message.permissions[j]; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.subscription = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; } return object; }; /** - * Converts this TestIamPermissionsRequest to JSON. + * Converts this CreateSnapshotRequest to JSON. * @function toJSON - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.CreateSnapshotRequest * @instance * @returns {Object.} JSON object */ - TestIamPermissionsRequest.prototype.toJSON = function toJSON() { + CreateSnapshotRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return TestIamPermissionsRequest; + return CreateSnapshotRequest; })(); - v1.TestIamPermissionsResponse = (function() { + v1.UpdateSnapshotRequest = (function() { /** - * Properties of a TestIamPermissionsResponse. - * @memberof google.iam.v1 - * @interface ITestIamPermissionsResponse - * @property {Array.|null} [permissions] TestIamPermissionsResponse permissions + * Properties of an UpdateSnapshotRequest. + * @memberof google.pubsub.v1 + * @interface IUpdateSnapshotRequest + * @property {google.pubsub.v1.ISnapshot|null} [snapshot] UpdateSnapshotRequest snapshot + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSnapshotRequest updateMask */ /** - * Constructs a new TestIamPermissionsResponse. - * @memberof google.iam.v1 - * @classdesc Represents a TestIamPermissionsResponse. - * @implements ITestIamPermissionsResponse + * Constructs a new UpdateSnapshotRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an UpdateSnapshotRequest. + * @implements IUpdateSnapshotRequest * @constructor - * @param {google.iam.v1.ITestIamPermissionsResponse=} [properties] Properties to set + * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set */ - function TestIamPermissionsResponse(properties) { - this.permissions = []; + function UpdateSnapshotRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -22255,78 +22770,88 @@ } /** - * TestIamPermissionsResponse permissions. - * @member {Array.} permissions - * @memberof google.iam.v1.TestIamPermissionsResponse + * UpdateSnapshotRequest snapshot. + * @member {google.pubsub.v1.ISnapshot|null|undefined} snapshot + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @instance */ - TestIamPermissionsResponse.prototype.permissions = $util.emptyArray; + UpdateSnapshotRequest.prototype.snapshot = null; /** - * Creates a new TestIamPermissionsResponse instance using the specified properties. + * UpdateSnapshotRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @instance + */ + UpdateSnapshotRequest.prototype.updateMask = null; + + /** + * Creates a new UpdateSnapshotRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static - * @param {google.iam.v1.ITestIamPermissionsResponse=} [properties] Properties to set - * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse instance + * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest instance */ - TestIamPermissionsResponse.create = function create(properties) { - return new TestIamPermissionsResponse(properties); + UpdateSnapshotRequest.create = function create(properties) { + return new UpdateSnapshotRequest(properties); }; /** - * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static - * @param {google.iam.v1.ITestIamPermissionsResponse} message TestIamPermissionsResponse message or plain object to encode + * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - TestIamPermissionsResponse.encode = function encode(message, writer) { + UpdateSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.permissions != null && message.permissions.length) - for (var i = 0; i < message.permissions.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.permissions[i]); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + $root.google.pubsub.v1.Snapshot.encode(message.snapshot, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static - * @param {google.iam.v1.ITestIamPermissionsResponse} message TestIamPermissionsResponse message or plain object to encode + * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - TestIamPermissionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + UpdateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TestIamPermissionsResponse.decode = function decode(reader, length) { + UpdateSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.TestIamPermissionsResponse(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.permissions && message.permissions.length)) - message.permissions = []; - message.permissions.push(reader.string()); + message.snapshot = $root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32()); + break; + case 2: + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -22337,119 +22862,130 @@ }; /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TestIamPermissionsResponse.decodeDelimited = function decodeDelimited(reader) { + UpdateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a TestIamPermissionsResponse message. + * Verifies an UpdateSnapshotRequest message. * @function verify - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - TestIamPermissionsResponse.verify = function verify(message) { + UpdateSnapshotRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.permissions != null && message.hasOwnProperty("permissions")) { - if (!Array.isArray(message.permissions)) - return "permissions: array expected"; - for (var i = 0; i < message.permissions.length; ++i) - if (!$util.isString(message.permissions[i])) - return "permissions: string[] expected"; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshot); + if (error) + return "snapshot." + error; + } + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + if (error) + return "updateMask." + error; } return null; }; /** - * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. + * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest */ - TestIamPermissionsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.TestIamPermissionsResponse) + UpdateSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateSnapshotRequest) return object; - var message = new $root.google.iam.v1.TestIamPermissionsResponse(); - if (object.permissions) { - if (!Array.isArray(object.permissions)) - throw TypeError(".google.iam.v1.TestIamPermissionsResponse.permissions: array expected"); - message.permissions = []; - for (var i = 0; i < object.permissions.length; ++i) - message.permissions[i] = String(object.permissions[i]); + var message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); + if (object.snapshot != null) { + if (typeof object.snapshot !== "object") + throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.snapshot: object expected"); + message.snapshot = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshot); + } + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); } return message; }; /** - * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. + * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static - * @param {google.iam.v1.TestIamPermissionsResponse} message TestIamPermissionsResponse + * @param {google.pubsub.v1.UpdateSnapshotRequest} message UpdateSnapshotRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - TestIamPermissionsResponse.toObject = function toObject(message, options) { + UpdateSnapshotRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.permissions = []; - if (message.permissions && message.permissions.length) { - object.permissions = []; - for (var j = 0; j < message.permissions.length; ++j) - object.permissions[j] = message.permissions[j]; + if (options.defaults) { + object.snapshot = null; + object.updateMask = null; } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = $root.google.pubsub.v1.Snapshot.toObject(message.snapshot, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); return object; }; /** - * Converts this TestIamPermissionsResponse to JSON. + * Converts this UpdateSnapshotRequest to JSON. * @function toJSON - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @instance * @returns {Object.} JSON object */ - TestIamPermissionsResponse.prototype.toJSON = function toJSON() { + UpdateSnapshotRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return TestIamPermissionsResponse; + return UpdateSnapshotRequest; })(); - v1.GetPolicyOptions = (function() { + v1.Snapshot = (function() { /** - * Properties of a GetPolicyOptions. - * @memberof google.iam.v1 - * @interface IGetPolicyOptions - * @property {number|null} [requestedPolicyVersion] GetPolicyOptions requestedPolicyVersion + * Properties of a Snapshot. + * @memberof google.pubsub.v1 + * @interface ISnapshot + * @property {string|null} [name] Snapshot name + * @property {string|null} [topic] Snapshot topic + * @property {google.protobuf.ITimestamp|null} [expireTime] Snapshot expireTime + * @property {Object.|null} [labels] Snapshot labels */ - - /** - * Constructs a new GetPolicyOptions. - * @memberof google.iam.v1 - * @classdesc Represents a GetPolicyOptions. - * @implements IGetPolicyOptions + + /** + * Constructs a new Snapshot. + * @memberof google.pubsub.v1 + * @classdesc Represents a Snapshot. + * @implements ISnapshot * @constructor - * @param {google.iam.v1.IGetPolicyOptions=} [properties] Properties to set + * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set */ - function GetPolicyOptions(properties) { + function Snapshot(properties) { + this.labels = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -22457,75 +22993,120 @@ } /** - * GetPolicyOptions requestedPolicyVersion. - * @member {number} requestedPolicyVersion - * @memberof google.iam.v1.GetPolicyOptions + * Snapshot name. + * @member {string} name + * @memberof google.pubsub.v1.Snapshot * @instance */ - GetPolicyOptions.prototype.requestedPolicyVersion = 0; + Snapshot.prototype.name = ""; /** - * Creates a new GetPolicyOptions instance using the specified properties. + * Snapshot topic. + * @member {string} topic + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.topic = ""; + + /** + * Snapshot expireTime. + * @member {google.protobuf.ITimestamp|null|undefined} expireTime + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.expireTime = null; + + /** + * Snapshot labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.labels = $util.emptyObject; + + /** + * Creates a new Snapshot instance using the specified properties. * @function create - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @static - * @param {google.iam.v1.IGetPolicyOptions=} [properties] Properties to set - * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions instance + * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set + * @returns {google.pubsub.v1.Snapshot} Snapshot instance */ - GetPolicyOptions.create = function create(properties) { - return new GetPolicyOptions(properties); + Snapshot.create = function create(properties) { + return new Snapshot(properties); }; /** - * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. * @function encode - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @static - * @param {google.iam.v1.IGetPolicyOptions} message GetPolicyOptions message or plain object to encode + * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetPolicyOptions.encode = function encode(message, writer) { + Snapshot.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.requestedPolicyVersion); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); + if (message.expireTime != null && message.hasOwnProperty("expireTime")) + $root.google.protobuf.Timestamp.encode(message.expireTime, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); return writer; }; /** - * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @static - * @param {google.iam.v1.IGetPolicyOptions} message GetPolicyOptions message or plain object to encode + * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetPolicyOptions.encodeDelimited = function encodeDelimited(message, writer) { + Snapshot.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a GetPolicyOptions message from the specified reader or buffer. + * Decodes a Snapshot message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + * @returns {google.pubsub.v1.Snapshot} Snapshot * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetPolicyOptions.decode = function decode(reader, length) { + Snapshot.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.GetPolicyOptions(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.requestedPolicyVersion = reader.int32(); + message.name = reader.string(); + break; + case 2: + message.topic = reader.string(); + break; + case 3: + message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + case 4: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); break; default: reader.skipType(tag & 7); @@ -22536,215 +23117,228 @@ }; /** - * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. + * Decodes a Snapshot message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + * @returns {google.pubsub.v1.Snapshot} Snapshot * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetPolicyOptions.decodeDelimited = function decodeDelimited(reader) { + Snapshot.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a GetPolicyOptions message. + * Verifies a Snapshot message. * @function verify - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - GetPolicyOptions.verify = function verify(message) { + Snapshot.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) - if (!$util.isInteger(message.requestedPolicyVersion)) - return "requestedPolicyVersion: integer expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.expireTime != null && message.hasOwnProperty("expireTime")) { + var error = $root.google.protobuf.Timestamp.verify(message.expireTime); + if (error) + return "expireTime." + error; + } + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; + } return null; }; /** - * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. + * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + * @returns {google.pubsub.v1.Snapshot} Snapshot */ - GetPolicyOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.GetPolicyOptions) + Snapshot.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Snapshot) return object; - var message = new $root.google.iam.v1.GetPolicyOptions(); - if (object.requestedPolicyVersion != null) - message.requestedPolicyVersion = object.requestedPolicyVersion | 0; + var message = new $root.google.pubsub.v1.Snapshot(); + if (object.name != null) + message.name = String(object.name); + if (object.topic != null) + message.topic = String(object.topic); + if (object.expireTime != null) { + if (typeof object.expireTime !== "object") + throw TypeError(".google.pubsub.v1.Snapshot.expireTime: object expected"); + message.expireTime = $root.google.protobuf.Timestamp.fromObject(object.expireTime); + } + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Snapshot.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); + } return message; }; /** - * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. + * Creates a plain object from a Snapshot message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @static - * @param {google.iam.v1.GetPolicyOptions} message GetPolicyOptions + * @param {google.pubsub.v1.Snapshot} message Snapshot * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - GetPolicyOptions.toObject = function toObject(message, options) { + Snapshot.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) - object.requestedPolicyVersion = 0; - if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) - object.requestedPolicyVersion = message.requestedPolicyVersion; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.topic = ""; + object.expireTime = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.expireTime != null && message.hasOwnProperty("expireTime")) + object.expireTime = $root.google.protobuf.Timestamp.toObject(message.expireTime, options); + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } return object; }; /** - * Converts this GetPolicyOptions to JSON. + * Converts this Snapshot to JSON. * @function toJSON - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.Snapshot * @instance * @returns {Object.} JSON object */ - GetPolicyOptions.prototype.toJSON = function toJSON() { + Snapshot.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return GetPolicyOptions; + return Snapshot; })(); - v1.Policy = (function() { + v1.GetSnapshotRequest = (function() { /** - * Properties of a Policy. - * @memberof google.iam.v1 - * @interface IPolicy - * @property {number|null} [version] Policy version - * @property {Array.|null} [bindings] Policy bindings - * @property {Uint8Array|null} [etag] Policy etag + * Properties of a GetSnapshotRequest. + * @memberof google.pubsub.v1 + * @interface IGetSnapshotRequest + * @property {string|null} [snapshot] GetSnapshotRequest snapshot */ /** - * Constructs a new Policy. - * @memberof google.iam.v1 - * @classdesc Represents a Policy. - * @implements IPolicy + * Constructs a new GetSnapshotRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetSnapshotRequest. + * @implements IGetSnapshotRequest * @constructor - * @param {google.iam.v1.IPolicy=} [properties] Properties to set - */ - function Policy(properties) { - this.bindings = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Policy version. - * @member {number} version - * @memberof google.iam.v1.Policy - * @instance - */ - Policy.prototype.version = 0; - - /** - * Policy bindings. - * @member {Array.} bindings - * @memberof google.iam.v1.Policy - * @instance + * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set */ - Policy.prototype.bindings = $util.emptyArray; + function GetSnapshotRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * Policy etag. - * @member {Uint8Array} etag - * @memberof google.iam.v1.Policy + * GetSnapshotRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.GetSnapshotRequest * @instance */ - Policy.prototype.etag = $util.newBuffer([]); + GetSnapshotRequest.prototype.snapshot = ""; /** - * Creates a new Policy instance using the specified properties. + * Creates a new GetSnapshotRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @static - * @param {google.iam.v1.IPolicy=} [properties] Properties to set - * @returns {google.iam.v1.Policy} Policy instance + * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest instance */ - Policy.create = function create(properties) { - return new Policy(properties); + GetSnapshotRequest.create = function create(properties) { + return new GetSnapshotRequest(properties); }; /** - * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @static - * @param {google.iam.v1.IPolicy} message Policy message or plain object to encode + * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Policy.encode = function encode(message, writer) { + GetSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.version != null && message.hasOwnProperty("version")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.version); - if (message.etag != null && message.hasOwnProperty("etag")) - writer.uint32(/* id 3, wireType 2 =*/26).bytes(message.etag); - if (message.bindings != null && message.bindings.length) - for (var i = 0; i < message.bindings.length; ++i) - $root.google.iam.v1.Binding.encode(message.bindings[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); return writer; }; /** - * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. + * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @static - * @param {google.iam.v1.IPolicy} message Policy message or plain object to encode + * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Policy.encodeDelimited = function encodeDelimited(message, writer) { + GetSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a Policy message from the specified reader or buffer. + * Decodes a GetSnapshotRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.Policy} Policy + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Policy.decode = function decode(reader, length) { + GetSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.Policy(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.version = reader.int32(); - break; - case 4: - if (!(message.bindings && message.bindings.length)) - message.bindings = []; - message.bindings.push($root.google.iam.v1.Binding.decode(reader, reader.uint32())); - break; - case 3: - message.etag = reader.bytes(); + message.snapshot = reader.string(); break; default: reader.skipType(tag & 7); @@ -22755,154 +23349,109 @@ }; /** - * Decodes a Policy message from the specified reader or buffer, length delimited. + * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.Policy} Policy + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Policy.decodeDelimited = function decodeDelimited(reader) { + GetSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a Policy message. + * Verifies a GetSnapshotRequest message. * @function verify - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - Policy.verify = function verify(message) { + GetSnapshotRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.version != null && message.hasOwnProperty("version")) - if (!$util.isInteger(message.version)) - return "version: integer expected"; - if (message.bindings != null && message.hasOwnProperty("bindings")) { - if (!Array.isArray(message.bindings)) - return "bindings: array expected"; - for (var i = 0; i < message.bindings.length; ++i) { - var error = $root.google.iam.v1.Binding.verify(message.bindings[i]); - if (error) - return "bindings." + error; - } - } - if (message.etag != null && message.hasOwnProperty("etag")) - if (!(message.etag && typeof message.etag.length === "number" || $util.isString(message.etag))) - return "etag: buffer expected"; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; return null; }; /** - * Creates a Policy message from a plain object. Also converts values to their respective internal types. + * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.Policy} Policy + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest */ - Policy.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.Policy) + GetSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetSnapshotRequest) return object; - var message = new $root.google.iam.v1.Policy(); - if (object.version != null) - message.version = object.version | 0; - if (object.bindings) { - if (!Array.isArray(object.bindings)) - throw TypeError(".google.iam.v1.Policy.bindings: array expected"); - message.bindings = []; - for (var i = 0; i < object.bindings.length; ++i) { - if (typeof object.bindings[i] !== "object") - throw TypeError(".google.iam.v1.Policy.bindings: object expected"); - message.bindings[i] = $root.google.iam.v1.Binding.fromObject(object.bindings[i]); - } - } - if (object.etag != null) - if (typeof object.etag === "string") - $util.base64.decode(object.etag, message.etag = $util.newBuffer($util.base64.length(object.etag)), 0); - else if (object.etag.length) - message.etag = object.etag; + var message = new $root.google.pubsub.v1.GetSnapshotRequest(); + if (object.snapshot != null) + message.snapshot = String(object.snapshot); return message; }; /** - * Creates a plain object from a Policy message. Also converts values to other types if specified. + * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @static - * @param {google.iam.v1.Policy} message Policy + * @param {google.pubsub.v1.GetSnapshotRequest} message GetSnapshotRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - Policy.toObject = function toObject(message, options) { + GetSnapshotRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.bindings = []; - if (options.defaults) { - object.version = 0; - if (options.bytes === String) - object.etag = ""; - else { - object.etag = []; - if (options.bytes !== Array) - object.etag = $util.newBuffer(object.etag); - } - } - if (message.version != null && message.hasOwnProperty("version")) - object.version = message.version; - if (message.etag != null && message.hasOwnProperty("etag")) - object.etag = options.bytes === String ? $util.base64.encode(message.etag, 0, message.etag.length) : options.bytes === Array ? Array.prototype.slice.call(message.etag) : message.etag; - if (message.bindings && message.bindings.length) { - object.bindings = []; - for (var j = 0; j < message.bindings.length; ++j) - object.bindings[j] = $root.google.iam.v1.Binding.toObject(message.bindings[j], options); - } + if (options.defaults) + object.snapshot = ""; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = message.snapshot; return object; }; /** - * Converts this Policy to JSON. + * Converts this GetSnapshotRequest to JSON. * @function toJSON - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.GetSnapshotRequest * @instance * @returns {Object.} JSON object */ - Policy.prototype.toJSON = function toJSON() { + GetSnapshotRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return Policy; + return GetSnapshotRequest; })(); - v1.Binding = (function() { + v1.ListSnapshotsRequest = (function() { /** - * Properties of a Binding. - * @memberof google.iam.v1 - * @interface IBinding - * @property {string|null} [role] Binding role - * @property {Array.|null} [members] Binding members - * @property {google.type.IExpr|null} [condition] Binding condition + * Properties of a ListSnapshotsRequest. + * @memberof google.pubsub.v1 + * @interface IListSnapshotsRequest + * @property {string|null} [project] ListSnapshotsRequest project + * @property {number|null} [pageSize] ListSnapshotsRequest pageSize + * @property {string|null} [pageToken] ListSnapshotsRequest pageToken */ /** - * Constructs a new Binding. - * @memberof google.iam.v1 - * @classdesc Represents a Binding. - * @implements IBinding + * Constructs a new ListSnapshotsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSnapshotsRequest. + * @implements IListSnapshotsRequest * @constructor - * @param {google.iam.v1.IBinding=} [properties] Properties to set + * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set */ - function Binding(properties) { - this.members = []; + function ListSnapshotsRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -22910,104 +23459,101 @@ } /** - * Binding role. - * @member {string} role - * @memberof google.iam.v1.Binding + * ListSnapshotsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListSnapshotsRequest * @instance */ - Binding.prototype.role = ""; + ListSnapshotsRequest.prototype.project = ""; /** - * Binding members. - * @member {Array.} members - * @memberof google.iam.v1.Binding + * ListSnapshotsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListSnapshotsRequest * @instance */ - Binding.prototype.members = $util.emptyArray; + ListSnapshotsRequest.prototype.pageSize = 0; /** - * Binding condition. - * @member {google.type.IExpr|null|undefined} condition - * @memberof google.iam.v1.Binding + * ListSnapshotsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListSnapshotsRequest * @instance */ - Binding.prototype.condition = null; + ListSnapshotsRequest.prototype.pageToken = ""; /** - * Creates a new Binding instance using the specified properties. + * Creates a new ListSnapshotsRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static - * @param {google.iam.v1.IBinding=} [properties] Properties to set - * @returns {google.iam.v1.Binding} Binding instance + * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest instance */ - Binding.create = function create(properties) { - return new Binding(properties); + ListSnapshotsRequest.create = function create(properties) { + return new ListSnapshotsRequest(properties); }; /** - * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static - * @param {google.iam.v1.IBinding} message Binding message or plain object to encode + * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Binding.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.role != null && message.hasOwnProperty("role")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.role); - if (message.members != null && message.members.length) - for (var i = 0; i < message.members.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.members[i]); - if (message.condition != null && message.hasOwnProperty("condition")) - $root.google.type.Expr.encode(message.condition, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + ListSnapshotsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; /** - * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. + * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static - * @param {google.iam.v1.IBinding} message Binding message or plain object to encode + * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Binding.encodeDelimited = function encodeDelimited(message, writer) { + ListSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a Binding message from the specified reader or buffer. + * Decodes a ListSnapshotsRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.Binding} Binding + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Binding.decode = function decode(reader, length) { + ListSnapshotsRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.Binding(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.role = reader.string(); + message.project = reader.string(); break; case 2: - if (!(message.members && message.members.length)) - message.members = []; - message.members.push(reader.string()); + message.pageSize = reader.int32(); break; case 3: - message.condition = $root.google.type.Expr.decode(reader, reader.uint32()); + message.pageToken = reader.string(); break; default: reader.skipType(tag & 7); @@ -23018,145 +23564,126 @@ }; /** - * Decodes a Binding message from the specified reader or buffer, length delimited. + * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.Binding} Binding + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Binding.decodeDelimited = function decodeDelimited(reader) { + ListSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a Binding message. + * Verifies a ListSnapshotsRequest message. * @function verify - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - Binding.verify = function verify(message) { + ListSnapshotsRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.role != null && message.hasOwnProperty("role")) - if (!$util.isString(message.role)) - return "role: string expected"; - if (message.members != null && message.hasOwnProperty("members")) { - if (!Array.isArray(message.members)) - return "members: array expected"; - for (var i = 0; i < message.members.length; ++i) - if (!$util.isString(message.members[i])) - return "members: string[] expected"; - } - if (message.condition != null && message.hasOwnProperty("condition")) { - var error = $root.google.type.Expr.verify(message.condition); - if (error) - return "condition." + error; - } + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; return null; }; /** - * Creates a Binding message from a plain object. Also converts values to their respective internal types. + * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.Binding} Binding + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest */ - Binding.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.Binding) + ListSnapshotsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSnapshotsRequest) return object; - var message = new $root.google.iam.v1.Binding(); - if (object.role != null) - message.role = String(object.role); - if (object.members) { - if (!Array.isArray(object.members)) - throw TypeError(".google.iam.v1.Binding.members: array expected"); - message.members = []; - for (var i = 0; i < object.members.length; ++i) - message.members[i] = String(object.members[i]); - } - if (object.condition != null) { - if (typeof object.condition !== "object") - throw TypeError(".google.iam.v1.Binding.condition: object expected"); - message.condition = $root.google.type.Expr.fromObject(object.condition); - } + var message = new $root.google.pubsub.v1.ListSnapshotsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); return message; }; /** - * Creates a plain object from a Binding message. Also converts values to other types if specified. + * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static - * @param {google.iam.v1.Binding} message Binding + * @param {google.pubsub.v1.ListSnapshotsRequest} message ListSnapshotsRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - Binding.toObject = function toObject(message, options) { + ListSnapshotsRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.members = []; if (options.defaults) { - object.role = ""; - object.condition = null; - } - if (message.role != null && message.hasOwnProperty("role")) - object.role = message.role; - if (message.members && message.members.length) { - object.members = []; - for (var j = 0; j < message.members.length; ++j) - object.members[j] = message.members[j]; + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; } - if (message.condition != null && message.hasOwnProperty("condition")) - object.condition = $root.google.type.Expr.toObject(message.condition, options); + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; return object; }; /** - * Converts this Binding to JSON. + * Converts this ListSnapshotsRequest to JSON. * @function toJSON - * @memberof google.iam.v1.Binding + * @memberof google.pubsub.v1.ListSnapshotsRequest * @instance * @returns {Object.} JSON object */ - Binding.prototype.toJSON = function toJSON() { + ListSnapshotsRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return Binding; + return ListSnapshotsRequest; })(); - v1.PolicyDelta = (function() { + v1.ListSnapshotsResponse = (function() { /** - * Properties of a PolicyDelta. - * @memberof google.iam.v1 - * @interface IPolicyDelta - * @property {Array.|null} [bindingDeltas] PolicyDelta bindingDeltas - * @property {Array.|null} [auditConfigDeltas] PolicyDelta auditConfigDeltas + * Properties of a ListSnapshotsResponse. + * @memberof google.pubsub.v1 + * @interface IListSnapshotsResponse + * @property {Array.|null} [snapshots] ListSnapshotsResponse snapshots + * @property {string|null} [nextPageToken] ListSnapshotsResponse nextPageToken */ /** - * Constructs a new PolicyDelta. - * @memberof google.iam.v1 - * @classdesc Represents a PolicyDelta. - * @implements IPolicyDelta + * Constructs a new ListSnapshotsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSnapshotsResponse. + * @implements IListSnapshotsResponse * @constructor - * @param {google.iam.v1.IPolicyDelta=} [properties] Properties to set + * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set */ - function PolicyDelta(properties) { - this.bindingDeltas = []; - this.auditConfigDeltas = []; + function ListSnapshotsResponse(properties) { + this.snapshots = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -23164,94 +23691,91 @@ } /** - * PolicyDelta bindingDeltas. - * @member {Array.} bindingDeltas - * @memberof google.iam.v1.PolicyDelta + * ListSnapshotsResponse snapshots. + * @member {Array.} snapshots + * @memberof google.pubsub.v1.ListSnapshotsResponse * @instance */ - PolicyDelta.prototype.bindingDeltas = $util.emptyArray; + ListSnapshotsResponse.prototype.snapshots = $util.emptyArray; /** - * PolicyDelta auditConfigDeltas. - * @member {Array.} auditConfigDeltas - * @memberof google.iam.v1.PolicyDelta + * ListSnapshotsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListSnapshotsResponse * @instance */ - PolicyDelta.prototype.auditConfigDeltas = $util.emptyArray; + ListSnapshotsResponse.prototype.nextPageToken = ""; /** - * Creates a new PolicyDelta instance using the specified properties. + * Creates a new ListSnapshotsResponse instance using the specified properties. * @function create - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static - * @param {google.iam.v1.IPolicyDelta=} [properties] Properties to set - * @returns {google.iam.v1.PolicyDelta} PolicyDelta instance + * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse instance */ - PolicyDelta.create = function create(properties) { - return new PolicyDelta(properties); + ListSnapshotsResponse.create = function create(properties) { + return new ListSnapshotsResponse(properties); }; /** - * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. * @function encode - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static - * @param {google.iam.v1.IPolicyDelta} message PolicyDelta message or plain object to encode + * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PolicyDelta.encode = function encode(message, writer) { + ListSnapshotsResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.bindingDeltas != null && message.bindingDeltas.length) - for (var i = 0; i < message.bindingDeltas.length; ++i) - $root.google.iam.v1.BindingDelta.encode(message.bindingDeltas[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.auditConfigDeltas != null && message.auditConfigDeltas.length) - for (var i = 0; i < message.auditConfigDeltas.length; ++i) - $root.google.iam.v1.AuditConfigDelta.encode(message.auditConfigDeltas[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.snapshots != null && message.snapshots.length) + for (var i = 0; i < message.snapshots.length; ++i) + $root.google.pubsub.v1.Snapshot.encode(message.snapshots[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); return writer; }; /** - * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static - * @param {google.iam.v1.IPolicyDelta} message PolicyDelta message or plain object to encode + * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PolicyDelta.encodeDelimited = function encodeDelimited(message, writer) { + ListSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a PolicyDelta message from the specified reader or buffer. + * Decodes a ListSnapshotsResponse message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.PolicyDelta} PolicyDelta + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PolicyDelta.decode = function decode(reader, length) { + ListSnapshotsResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.PolicyDelta(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsResponse(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.bindingDeltas && message.bindingDeltas.length)) - message.bindingDeltas = []; - message.bindingDeltas.push($root.google.iam.v1.BindingDelta.decode(reader, reader.uint32())); + if (!(message.snapshots && message.snapshots.length)) + message.snapshots = []; + message.snapshots.push($root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32())); break; case 2: - if (!(message.auditConfigDeltas && message.auditConfigDeltas.length)) - message.auditConfigDeltas = []; - message.auditConfigDeltas.push($root.google.iam.v1.AuditConfigDelta.decode(reader, reader.uint32())); + message.nextPageToken = reader.string(); break; default: reader.skipType(tag & 7); @@ -23262,153 +23786,133 @@ }; /** - * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. + * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.PolicyDelta} PolicyDelta + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PolicyDelta.decodeDelimited = function decodeDelimited(reader) { + ListSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a PolicyDelta message. + * Verifies a ListSnapshotsResponse message. * @function verify - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - PolicyDelta.verify = function verify(message) { + ListSnapshotsResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.bindingDeltas != null && message.hasOwnProperty("bindingDeltas")) { - if (!Array.isArray(message.bindingDeltas)) - return "bindingDeltas: array expected"; - for (var i = 0; i < message.bindingDeltas.length; ++i) { - var error = $root.google.iam.v1.BindingDelta.verify(message.bindingDeltas[i]); - if (error) - return "bindingDeltas." + error; - } - } - if (message.auditConfigDeltas != null && message.hasOwnProperty("auditConfigDeltas")) { - if (!Array.isArray(message.auditConfigDeltas)) - return "auditConfigDeltas: array expected"; - for (var i = 0; i < message.auditConfigDeltas.length; ++i) { - var error = $root.google.iam.v1.AuditConfigDelta.verify(message.auditConfigDeltas[i]); + if (message.snapshots != null && message.hasOwnProperty("snapshots")) { + if (!Array.isArray(message.snapshots)) + return "snapshots: array expected"; + for (var i = 0; i < message.snapshots.length; ++i) { + var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshots[i]); if (error) - return "auditConfigDeltas." + error; + return "snapshots." + error; } } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; return null; }; /** - * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. + * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.PolicyDelta} PolicyDelta + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse */ - PolicyDelta.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.PolicyDelta) + ListSnapshotsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSnapshotsResponse) return object; - var message = new $root.google.iam.v1.PolicyDelta(); - if (object.bindingDeltas) { - if (!Array.isArray(object.bindingDeltas)) - throw TypeError(".google.iam.v1.PolicyDelta.bindingDeltas: array expected"); - message.bindingDeltas = []; - for (var i = 0; i < object.bindingDeltas.length; ++i) { - if (typeof object.bindingDeltas[i] !== "object") - throw TypeError(".google.iam.v1.PolicyDelta.bindingDeltas: object expected"); - message.bindingDeltas[i] = $root.google.iam.v1.BindingDelta.fromObject(object.bindingDeltas[i]); - } - } - if (object.auditConfigDeltas) { - if (!Array.isArray(object.auditConfigDeltas)) - throw TypeError(".google.iam.v1.PolicyDelta.auditConfigDeltas: array expected"); - message.auditConfigDeltas = []; - for (var i = 0; i < object.auditConfigDeltas.length; ++i) { - if (typeof object.auditConfigDeltas[i] !== "object") - throw TypeError(".google.iam.v1.PolicyDelta.auditConfigDeltas: object expected"); - message.auditConfigDeltas[i] = $root.google.iam.v1.AuditConfigDelta.fromObject(object.auditConfigDeltas[i]); + var message = new $root.google.pubsub.v1.ListSnapshotsResponse(); + if (object.snapshots) { + if (!Array.isArray(object.snapshots)) + throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: array expected"); + message.snapshots = []; + for (var i = 0; i < object.snapshots.length; ++i) { + if (typeof object.snapshots[i] !== "object") + throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: object expected"); + message.snapshots[i] = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshots[i]); } } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); return message; }; /** - * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. + * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static - * @param {google.iam.v1.PolicyDelta} message PolicyDelta + * @param {google.pubsub.v1.ListSnapshotsResponse} message ListSnapshotsResponse * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - PolicyDelta.toObject = function toObject(message, options) { + ListSnapshotsResponse.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) { - object.bindingDeltas = []; - object.auditConfigDeltas = []; - } - if (message.bindingDeltas && message.bindingDeltas.length) { - object.bindingDeltas = []; - for (var j = 0; j < message.bindingDeltas.length; ++j) - object.bindingDeltas[j] = $root.google.iam.v1.BindingDelta.toObject(message.bindingDeltas[j], options); - } - if (message.auditConfigDeltas && message.auditConfigDeltas.length) { - object.auditConfigDeltas = []; - for (var j = 0; j < message.auditConfigDeltas.length; ++j) - object.auditConfigDeltas[j] = $root.google.iam.v1.AuditConfigDelta.toObject(message.auditConfigDeltas[j], options); + if (options.arrays || options.defaults) + object.snapshots = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.snapshots && message.snapshots.length) { + object.snapshots = []; + for (var j = 0; j < message.snapshots.length; ++j) + object.snapshots[j] = $root.google.pubsub.v1.Snapshot.toObject(message.snapshots[j], options); } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; return object; }; /** - * Converts this PolicyDelta to JSON. + * Converts this ListSnapshotsResponse to JSON. * @function toJSON - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.ListSnapshotsResponse * @instance * @returns {Object.} JSON object */ - PolicyDelta.prototype.toJSON = function toJSON() { + ListSnapshotsResponse.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return PolicyDelta; + return ListSnapshotsResponse; })(); - v1.BindingDelta = (function() { + v1.DeleteSnapshotRequest = (function() { /** - * Properties of a BindingDelta. - * @memberof google.iam.v1 - * @interface IBindingDelta - * @property {google.iam.v1.BindingDelta.Action|null} [action] BindingDelta action - * @property {string|null} [role] BindingDelta role - * @property {string|null} [member] BindingDelta member - * @property {google.type.IExpr|null} [condition] BindingDelta condition + * Properties of a DeleteSnapshotRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteSnapshotRequest + * @property {string|null} [snapshot] DeleteSnapshotRequest snapshot */ /** - * Constructs a new BindingDelta. - * @memberof google.iam.v1 - * @classdesc Represents a BindingDelta. - * @implements IBindingDelta + * Constructs a new DeleteSnapshotRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteSnapshotRequest. + * @implements IDeleteSnapshotRequest * @constructor - * @param {google.iam.v1.IBindingDelta=} [properties] Properties to set + * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set */ - function BindingDelta(properties) { + function DeleteSnapshotRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -23416,114 +23920,75 @@ } /** - * BindingDelta action. - * @member {google.iam.v1.BindingDelta.Action} action - * @memberof google.iam.v1.BindingDelta - * @instance - */ - BindingDelta.prototype.action = 0; - - /** - * BindingDelta role. - * @member {string} role - * @memberof google.iam.v1.BindingDelta - * @instance - */ - BindingDelta.prototype.role = ""; - - /** - * BindingDelta member. - * @member {string} member - * @memberof google.iam.v1.BindingDelta - * @instance - */ - BindingDelta.prototype.member = ""; - - /** - * BindingDelta condition. - * @member {google.type.IExpr|null|undefined} condition - * @memberof google.iam.v1.BindingDelta + * DeleteSnapshotRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @instance */ - BindingDelta.prototype.condition = null; + DeleteSnapshotRequest.prototype.snapshot = ""; /** - * Creates a new BindingDelta instance using the specified properties. + * Creates a new DeleteSnapshotRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static - * @param {google.iam.v1.IBindingDelta=} [properties] Properties to set - * @returns {google.iam.v1.BindingDelta} BindingDelta instance + * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest instance */ - BindingDelta.create = function create(properties) { - return new BindingDelta(properties); + DeleteSnapshotRequest.create = function create(properties) { + return new DeleteSnapshotRequest(properties); }; /** - * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static - * @param {google.iam.v1.IBindingDelta} message BindingDelta message or plain object to encode + * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - BindingDelta.encode = function encode(message, writer) { + DeleteSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.action != null && message.hasOwnProperty("action")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.action); - if (message.role != null && message.hasOwnProperty("role")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.role); - if (message.member != null && message.hasOwnProperty("member")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.member); - if (message.condition != null && message.hasOwnProperty("condition")) - $root.google.type.Expr.encode(message.condition, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); return writer; }; /** - * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static - * @param {google.iam.v1.IBindingDelta} message BindingDelta message or plain object to encode + * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - BindingDelta.encodeDelimited = function encodeDelimited(message, writer) { + DeleteSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a BindingDelta message from the specified reader or buffer. + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.BindingDelta} BindingDelta + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - BindingDelta.decode = function decode(reader, length) { + DeleteSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.BindingDelta(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.action = reader.int32(); - break; - case 2: - message.role = reader.string(); - break; - case 3: - message.member = reader.string(); - break; - case 4: - message.condition = $root.google.type.Expr.decode(reader, reader.uint32()); + message.snapshot = reader.string(); break; default: reader.skipType(tag & 7); @@ -23534,174 +23999,109 @@ }; /** - * Decodes a BindingDelta message from the specified reader or buffer, length delimited. + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.BindingDelta} BindingDelta + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - BindingDelta.decodeDelimited = function decodeDelimited(reader) { + DeleteSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a BindingDelta message. + * Verifies a DeleteSnapshotRequest message. * @function verify - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - BindingDelta.verify = function verify(message) { + DeleteSnapshotRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.action != null && message.hasOwnProperty("action")) - switch (message.action) { - default: - return "action: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.role != null && message.hasOwnProperty("role")) - if (!$util.isString(message.role)) - return "role: string expected"; - if (message.member != null && message.hasOwnProperty("member")) - if (!$util.isString(message.member)) - return "member: string expected"; - if (message.condition != null && message.hasOwnProperty("condition")) { - var error = $root.google.type.Expr.verify(message.condition); - if (error) - return "condition." + error; - } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; return null; }; /** - * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. + * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.BindingDelta} BindingDelta + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest */ - BindingDelta.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.BindingDelta) + DeleteSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteSnapshotRequest) return object; - var message = new $root.google.iam.v1.BindingDelta(); - switch (object.action) { - case "ACTION_UNSPECIFIED": - case 0: - message.action = 0; - break; - case "ADD": - case 1: - message.action = 1; - break; - case "REMOVE": - case 2: - message.action = 2; - break; - } - if (object.role != null) - message.role = String(object.role); - if (object.member != null) - message.member = String(object.member); - if (object.condition != null) { - if (typeof object.condition !== "object") - throw TypeError(".google.iam.v1.BindingDelta.condition: object expected"); - message.condition = $root.google.type.Expr.fromObject(object.condition); - } + var message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); + if (object.snapshot != null) + message.snapshot = String(object.snapshot); return message; }; /** - * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. + * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static - * @param {google.iam.v1.BindingDelta} message BindingDelta + * @param {google.pubsub.v1.DeleteSnapshotRequest} message DeleteSnapshotRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - BindingDelta.toObject = function toObject(message, options) { + DeleteSnapshotRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.action = options.enums === String ? "ACTION_UNSPECIFIED" : 0; - object.role = ""; - object.member = ""; - object.condition = null; - } - if (message.action != null && message.hasOwnProperty("action")) - object.action = options.enums === String ? $root.google.iam.v1.BindingDelta.Action[message.action] : message.action; - if (message.role != null && message.hasOwnProperty("role")) - object.role = message.role; - if (message.member != null && message.hasOwnProperty("member")) - object.member = message.member; - if (message.condition != null && message.hasOwnProperty("condition")) - object.condition = $root.google.type.Expr.toObject(message.condition, options); + if (options.defaults) + object.snapshot = ""; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = message.snapshot; return object; }; /** - * Converts this BindingDelta to JSON. + * Converts this DeleteSnapshotRequest to JSON. * @function toJSON - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @instance * @returns {Object.} JSON object */ - BindingDelta.prototype.toJSON = function toJSON() { + DeleteSnapshotRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - /** - * Action enum. - * @name google.iam.v1.BindingDelta.Action - * @enum {string} - * @property {number} ACTION_UNSPECIFIED=0 ACTION_UNSPECIFIED value - * @property {number} ADD=1 ADD value - * @property {number} REMOVE=2 REMOVE value - */ - BindingDelta.Action = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "ACTION_UNSPECIFIED"] = 0; - values[valuesById[1] = "ADD"] = 1; - values[valuesById[2] = "REMOVE"] = 2; - return values; - })(); - - return BindingDelta; + return DeleteSnapshotRequest; })(); - v1.AuditConfigDelta = (function() { + v1.SeekRequest = (function() { /** - * Properties of an AuditConfigDelta. - * @memberof google.iam.v1 - * @interface IAuditConfigDelta - * @property {google.iam.v1.AuditConfigDelta.Action|null} [action] AuditConfigDelta action - * @property {string|null} [service] AuditConfigDelta service - * @property {string|null} [exemptedMember] AuditConfigDelta exemptedMember - * @property {string|null} [logType] AuditConfigDelta logType + * Properties of a SeekRequest. + * @memberof google.pubsub.v1 + * @interface ISeekRequest + * @property {string|null} [subscription] SeekRequest subscription + * @property {google.protobuf.ITimestamp|null} [time] SeekRequest time + * @property {string|null} [snapshot] SeekRequest snapshot */ /** - * Constructs a new AuditConfigDelta. - * @memberof google.iam.v1 - * @classdesc Represents an AuditConfigDelta. - * @implements IAuditConfigDelta + * Constructs a new SeekRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a SeekRequest. + * @implements ISeekRequest * @constructor - * @param {google.iam.v1.IAuditConfigDelta=} [properties] Properties to set + * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set */ - function AuditConfigDelta(properties) { + function SeekRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -23709,114 +24109,115 @@ } /** - * AuditConfigDelta action. - * @member {google.iam.v1.AuditConfigDelta.Action} action - * @memberof google.iam.v1.AuditConfigDelta + * SeekRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.SeekRequest * @instance */ - AuditConfigDelta.prototype.action = 0; + SeekRequest.prototype.subscription = ""; /** - * AuditConfigDelta service. - * @member {string} service - * @memberof google.iam.v1.AuditConfigDelta + * SeekRequest time. + * @member {google.protobuf.ITimestamp|null|undefined} time + * @memberof google.pubsub.v1.SeekRequest * @instance */ - AuditConfigDelta.prototype.service = ""; + SeekRequest.prototype.time = null; /** - * AuditConfigDelta exemptedMember. - * @member {string} exemptedMember - * @memberof google.iam.v1.AuditConfigDelta + * SeekRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.SeekRequest * @instance */ - AuditConfigDelta.prototype.exemptedMember = ""; + SeekRequest.prototype.snapshot = ""; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; /** - * AuditConfigDelta logType. - * @member {string} logType - * @memberof google.iam.v1.AuditConfigDelta + * SeekRequest target. + * @member {"time"|"snapshot"|undefined} target + * @memberof google.pubsub.v1.SeekRequest * @instance */ - AuditConfigDelta.prototype.logType = ""; + Object.defineProperty(SeekRequest.prototype, "target", { + get: $util.oneOfGetter($oneOfFields = ["time", "snapshot"]), + set: $util.oneOfSetter($oneOfFields) + }); /** - * Creates a new AuditConfigDelta instance using the specified properties. + * Creates a new SeekRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @static - * @param {google.iam.v1.IAuditConfigDelta=} [properties] Properties to set - * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta instance + * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.SeekRequest} SeekRequest instance */ - AuditConfigDelta.create = function create(properties) { - return new AuditConfigDelta(properties); + SeekRequest.create = function create(properties) { + return new SeekRequest(properties); }; /** - * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @static - * @param {google.iam.v1.IAuditConfigDelta} message AuditConfigDelta message or plain object to encode + * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - AuditConfigDelta.encode = function encode(message, writer) { + SeekRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.action != null && message.hasOwnProperty("action")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.action); - if (message.service != null && message.hasOwnProperty("service")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.service); - if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.exemptedMember); - if (message.logType != null && message.hasOwnProperty("logType")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.logType); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.time != null && message.hasOwnProperty("time")) + $root.google.protobuf.Timestamp.encode(message.time, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.snapshot); return writer; }; /** - * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @static - * @param {google.iam.v1.IAuditConfigDelta} message AuditConfigDelta message or plain object to encode + * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - AuditConfigDelta.encodeDelimited = function encodeDelimited(message, writer) { + SeekRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an AuditConfigDelta message from the specified reader or buffer. + * Decodes a SeekRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + * @returns {google.pubsub.v1.SeekRequest} SeekRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AuditConfigDelta.decode = function decode(reader, length) { + SeekRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.AuditConfigDelta(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.action = reader.int32(); + message.subscription = reader.string(); break; case 2: - message.service = reader.string(); + message.time = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); break; case 3: - message.exemptedMember = reader.string(); - break; - case 4: - message.logType = reader.string(); + message.snapshot = reader.string(); break; default: reader.skipType(tag & 7); @@ -23827,418 +24228,286 @@ }; /** - * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. + * Decodes a SeekRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + * @returns {google.pubsub.v1.SeekRequest} SeekRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AuditConfigDelta.decodeDelimited = function decodeDelimited(reader) { + SeekRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an AuditConfigDelta message. + * Verifies a SeekRequest message. * @function verify - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - AuditConfigDelta.verify = function verify(message) { + SeekRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.action != null && message.hasOwnProperty("action")) - switch (message.action) { - default: - return "action: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.service != null && message.hasOwnProperty("service")) - if (!$util.isString(message.service)) - return "service: string expected"; - if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) - if (!$util.isString(message.exemptedMember)) - return "exemptedMember: string expected"; - if (message.logType != null && message.hasOwnProperty("logType")) - if (!$util.isString(message.logType)) - return "logType: string expected"; + var properties = {}; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.time != null && message.hasOwnProperty("time")) { + properties.target = 1; + { + var error = $root.google.protobuf.Timestamp.verify(message.time); + if (error) + return "time." + error; + } + } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + if (properties.target === 1) + return "target: multiple values"; + properties.target = 1; + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; + } return null; }; /** - * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. + * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + * @returns {google.pubsub.v1.SeekRequest} SeekRequest */ - AuditConfigDelta.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.AuditConfigDelta) + SeekRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.SeekRequest) return object; - var message = new $root.google.iam.v1.AuditConfigDelta(); - switch (object.action) { - case "ACTION_UNSPECIFIED": - case 0: - message.action = 0; - break; - case "ADD": - case 1: - message.action = 1; - break; - case "REMOVE": - case 2: - message.action = 2; - break; + var message = new $root.google.pubsub.v1.SeekRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.time != null) { + if (typeof object.time !== "object") + throw TypeError(".google.pubsub.v1.SeekRequest.time: object expected"); + message.time = $root.google.protobuf.Timestamp.fromObject(object.time); } - if (object.service != null) - message.service = String(object.service); - if (object.exemptedMember != null) - message.exemptedMember = String(object.exemptedMember); - if (object.logType != null) - message.logType = String(object.logType); + if (object.snapshot != null) + message.snapshot = String(object.snapshot); return message; }; /** - * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. + * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @static - * @param {google.iam.v1.AuditConfigDelta} message AuditConfigDelta + * @param {google.pubsub.v1.SeekRequest} message SeekRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - AuditConfigDelta.toObject = function toObject(message, options) { + SeekRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.action = options.enums === String ? "ACTION_UNSPECIFIED" : 0; - object.service = ""; - object.exemptedMember = ""; - object.logType = ""; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.time != null && message.hasOwnProperty("time")) { + object.time = $root.google.protobuf.Timestamp.toObject(message.time, options); + if (options.oneofs) + object.target = "time"; + } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + object.snapshot = message.snapshot; + if (options.oneofs) + object.target = "snapshot"; } - if (message.action != null && message.hasOwnProperty("action")) - object.action = options.enums === String ? $root.google.iam.v1.AuditConfigDelta.Action[message.action] : message.action; - if (message.service != null && message.hasOwnProperty("service")) - object.service = message.service; - if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) - object.exemptedMember = message.exemptedMember; - if (message.logType != null && message.hasOwnProperty("logType")) - object.logType = message.logType; return object; }; /** - * Converts this AuditConfigDelta to JSON. + * Converts this SeekRequest to JSON. * @function toJSON - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.SeekRequest * @instance * @returns {Object.} JSON object */ - AuditConfigDelta.prototype.toJSON = function toJSON() { + SeekRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - /** - * Action enum. - * @name google.iam.v1.AuditConfigDelta.Action - * @enum {string} - * @property {number} ACTION_UNSPECIFIED=0 ACTION_UNSPECIFIED value - * @property {number} ADD=1 ADD value - * @property {number} REMOVE=2 REMOVE value - */ - AuditConfigDelta.Action = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "ACTION_UNSPECIFIED"] = 0; - values[valuesById[1] = "ADD"] = 1; - values[valuesById[2] = "REMOVE"] = 2; - return values; - })(); - - return AuditConfigDelta; + return SeekRequest; })(); - return v1; - })(); - - return iam; - })(); - - google.type = (function() { - - /** - * Namespace type. - * @memberof google - * @namespace - */ - var type = {}; - - type.Expr = (function() { - - /** - * Properties of an Expr. - * @memberof google.type - * @interface IExpr - * @property {string|null} [expression] Expr expression - * @property {string|null} [title] Expr title - * @property {string|null} [description] Expr description - * @property {string|null} [location] Expr location - */ - - /** - * Constructs a new Expr. - * @memberof google.type - * @classdesc Represents an Expr. - * @implements IExpr - * @constructor - * @param {google.type.IExpr=} [properties] Properties to set - */ - function Expr(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Expr expression. - * @member {string} expression - * @memberof google.type.Expr - * @instance - */ - Expr.prototype.expression = ""; - - /** - * Expr title. - * @member {string} title - * @memberof google.type.Expr - * @instance - */ - Expr.prototype.title = ""; + v1.SeekResponse = (function() { - /** - * Expr description. - * @member {string} description - * @memberof google.type.Expr - * @instance - */ - Expr.prototype.description = ""; + /** + * Properties of a SeekResponse. + * @memberof google.pubsub.v1 + * @interface ISeekResponse + */ - /** - * Expr location. - * @member {string} location - * @memberof google.type.Expr - * @instance - */ - Expr.prototype.location = ""; + /** + * Constructs a new SeekResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a SeekResponse. + * @implements ISeekResponse + * @constructor + * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set + */ + function SeekResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a new Expr instance using the specified properties. - * @function create - * @memberof google.type.Expr - * @static - * @param {google.type.IExpr=} [properties] Properties to set - * @returns {google.type.Expr} Expr instance - */ - Expr.create = function create(properties) { - return new Expr(properties); - }; + /** + * Creates a new SeekResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.SeekResponse} SeekResponse instance + */ + SeekResponse.create = function create(properties) { + return new SeekResponse(properties); + }; - /** - * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @function encode - * @memberof google.type.Expr - * @static - * @param {google.type.IExpr} message Expr message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Expr.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.expression != null && message.hasOwnProperty("expression")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.expression); - if (message.title != null && message.hasOwnProperty("title")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.title); - if (message.description != null && message.hasOwnProperty("description")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.description); - if (message.location != null && message.hasOwnProperty("location")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.location); - return writer; - }; + /** + * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SeekResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; - /** - * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @function encodeDelimited - * @memberof google.type.Expr - * @static - * @param {google.type.IExpr} message Expr message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Expr.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SeekResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes an Expr message from the specified reader or buffer. - * @function decode - * @memberof google.type.Expr - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.type.Expr} Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Expr.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.type.Expr(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.expression = reader.string(); - break; - case 2: - message.title = reader.string(); - break; - case 3: - message.description = reader.string(); - break; - case 4: - message.location = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a SeekResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.SeekResponse} SeekResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SeekResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes an Expr message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.type.Expr - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.type.Expr} Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Expr.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a SeekResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.SeekResponse} SeekResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SeekResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies an Expr message. - * @function verify - * @memberof google.type.Expr - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Expr.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.expression != null && message.hasOwnProperty("expression")) - if (!$util.isString(message.expression)) - return "expression: string expected"; - if (message.title != null && message.hasOwnProperty("title")) - if (!$util.isString(message.title)) - return "title: string expected"; - if (message.description != null && message.hasOwnProperty("description")) - if (!$util.isString(message.description)) - return "description: string expected"; - if (message.location != null && message.hasOwnProperty("location")) - if (!$util.isString(message.location)) - return "location: string expected"; - return null; - }; + /** + * Verifies a SeekResponse message. + * @function verify + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SeekResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; - /** - * Creates an Expr message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.type.Expr - * @static - * @param {Object.} object Plain object - * @returns {google.type.Expr} Expr - */ - Expr.fromObject = function fromObject(object) { - if (object instanceof $root.google.type.Expr) - return object; - var message = new $root.google.type.Expr(); - if (object.expression != null) - message.expression = String(object.expression); - if (object.title != null) - message.title = String(object.title); - if (object.description != null) - message.description = String(object.description); - if (object.location != null) - message.location = String(object.location); - return message; - }; + /** + * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.SeekResponse} SeekResponse + */ + SeekResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.SeekResponse) + return object; + return new $root.google.pubsub.v1.SeekResponse(); + }; - /** - * Creates a plain object from an Expr message. Also converts values to other types if specified. - * @function toObject - * @memberof google.type.Expr - * @static - * @param {google.type.Expr} message Expr - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Expr.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.expression = ""; - object.title = ""; - object.description = ""; - object.location = ""; - } - if (message.expression != null && message.hasOwnProperty("expression")) - object.expression = message.expression; - if (message.title != null && message.hasOwnProperty("title")) - object.title = message.title; - if (message.description != null && message.hasOwnProperty("description")) - object.description = message.description; - if (message.location != null && message.hasOwnProperty("location")) - object.location = message.location; - return object; - }; + /** + * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {google.pubsub.v1.SeekResponse} message SeekResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SeekResponse.toObject = function toObject() { + return {}; + }; - /** - * Converts this Expr to JSON. - * @function toJSON - * @memberof google.type.Expr - * @instance - * @returns {Object.} JSON object - */ - Expr.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this SeekResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.SeekResponse + * @instance + * @returns {Object.} JSON object + */ + SeekResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return Expr; + return SeekResponse; + })(); + + return v1; })(); - return type; + return pubsub; })(); return google; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index a42e19cd02b..1edead9dd67 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2,199 +2,176 @@ "nested": { "google": { "nested": { - "pubsub": { + "iam": { "nested": { "v1": { "options": { "cc_enable_arenas": true, - "csharp_namespace": "Google.Cloud.PubSub.V1", - "go_package": "google.golang.org/genproto/googleapis/pubsub/v1;pubsub", + "csharp_namespace": "Google.Cloud.Iam.V1", + "go_package": "google.golang.org/genproto/googleapis/iam/v1;iam", "java_multiple_files": true, - "java_outer_classname": "PubsubProto", - "java_package": "com.google.pubsub.v1", - "php_namespace": "Google\\Cloud\\PubSub\\V1", - "ruby_package": "Google::Cloud::PubSub::V1" + "java_outer_classname": "IamPolicyProto", + "java_package": "com.google.iam.v1", + "php_namespace": "Google\\Cloud\\Iam\\V1" }, "nested": { - "Publisher": { - "options": { - "(google.api.default_host)": "pubsub.googleapis.com", - "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" - }, - "methods": { - "CreateTopic": { - "requestType": "Topic", - "responseType": "Topic", - "options": { - "(google.api.http).put": "/v1/{name=projects/*/topics/*}", - "(google.api.http).body": "*", - "(google.api.method_signature)": "name" - } - }, - "UpdateTopic": { - "requestType": "UpdateTopicRequest", - "responseType": "Topic", - "options": { - "(google.api.http).patch": "/v1/{topic.name=projects/*/topics/*}", - "(google.api.http).body": "*" - } - }, - "Publish": { - "requestType": "PublishRequest", - "responseType": "PublishResponse", - "options": { - "(google.api.http).post": "/v1/{topic=projects/*/topics/*}:publish", - "(google.api.http).body": "*", - "(google.api.method_signature)": "topic,messages" - } - }, - "GetTopic": { - "requestType": "GetTopicRequest", - "responseType": "Topic", - "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}", - "(google.api.method_signature)": "topic" - } + "Policy": { + "fields": { + "version": { + "type": "int32", + "id": 1 }, - "ListTopics": { - "requestType": "ListTopicsRequest", - "responseType": "ListTopicsResponse", - "options": { - "(google.api.http).get": "/v1/{project=projects/*}/topics", - "(google.api.method_signature)": "project" - } + "bindings": { + "rule": "repeated", + "type": "Binding", + "id": 4 }, - "ListTopicSubscriptions": { - "requestType": "ListTopicSubscriptionsRequest", - "responseType": "ListTopicSubscriptionsResponse", - "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/subscriptions", - "(google.api.method_signature)": "topic" - } + "etag": { + "type": "bytes", + "id": 3 + } + } + }, + "Binding": { + "fields": { + "role": { + "type": "string", + "id": 1 }, - "ListTopicSnapshots": { - "requestType": "ListTopicSnapshotsRequest", - "responseType": "ListTopicSnapshotsResponse", - "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/snapshots", - "(google.api.method_signature)": "topic" - } + "members": { + "rule": "repeated", + "type": "string", + "id": 2 }, - "DeleteTopic": { - "requestType": "DeleteTopicRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}", - "(google.api.method_signature)": "topic" - } + "condition": { + "type": "google.type.Expr", + "id": 3 } } }, - "MessageStoragePolicy": { + "PolicyDelta": { "fields": { - "allowedPersistenceRegions": { + "bindingDeltas": { "rule": "repeated", - "type": "string", + "type": "BindingDelta", "id": 1 + }, + "auditConfigDeltas": { + "rule": "repeated", + "type": "AuditConfigDelta", + "id": 2 } } }, - "Topic": { - "options": { - "(google.api.resource).type": "pubsub.googleapis.com/Topic", - "(google.api.resource).pattern": "_deleted-topic_" - }, + "BindingDelta": { "fields": { - "name": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } + "action": { + "type": "Action", + "id": 1 }, - "labels": { - "keyType": "string", + "role": { "type": "string", "id": 2 }, - "messageStoragePolicy": { - "type": "MessageStoragePolicy", + "member": { + "type": "string", "id": 3 }, - "kmsKeyName": { - "type": "string", - "id": 5 + "condition": { + "type": "google.type.Expr", + "id": 4 + } + }, + "nested": { + "Action": { + "values": { + "ACTION_UNSPECIFIED": 0, + "ADD": 1, + "REMOVE": 2 + } } } }, - "PubsubMessage": { + "AuditConfigDelta": { "fields": { - "data": { - "type": "bytes", + "action": { + "type": "Action", "id": 1 }, - "attributes": { - "keyType": "string", + "service": { "type": "string", "id": 2 }, - "messageId": { + "exemptedMember": { "type": "string", "id": 3 }, - "publishTime": { - "type": "google.protobuf.Timestamp", - "id": 4 - }, - "orderingKey": { + "logType": { "type": "string", - "id": 5 + "id": 4 + } + }, + "nested": { + "Action": { + "values": { + "ACTION_UNSPECIFIED": 0, + "ADD": 1, + "REMOVE": 2 + } } } }, - "GetTopicRequest": { + "GetPolicyOptions": { "fields": { - "topic": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" - } + "requestedPolicyVersion": { + "type": "int32", + "id": 1 } } }, - "UpdateTopicRequest": { - "fields": { - "topic": { - "type": "Topic", - "id": 1, + "IAMPolicy": { + "options": { + "(google.api.default_host)": "iam-meta-api.googleapis.com" + }, + "methods": { + "SetIamPolicy": { + "requestType": "SetIamPolicyRequest", + "responseType": "Policy", "options": { - "(google.api.field_behavior)": "REQUIRED" + "(google.api.http).post": "/v1/{resource=**}:setIamPolicy", + "(google.api.http).body": "*" } }, - "updateMask": { - "type": "google.protobuf.FieldMask", - "id": 2, + "GetIamPolicy": { + "requestType": "GetIamPolicyRequest", + "responseType": "Policy", "options": { - "(google.api.field_behavior)": "REQUIRED" + "(google.api.http).post": "/v1/{resource=**}:getIamPolicy", + "(google.api.http).body": "*" + } + }, + "TestIamPermissions": { + "requestType": "TestIamPermissionsRequest", + "responseType": "TestIamPermissionsResponse", + "options": { + "(google.api.http).post": "/v1/{resource=**}:testIamPermissions", + "(google.api.http).body": "*" } } } }, - "PublishRequest": { + "SetIamPolicyRequest": { "fields": { - "topic": { + "resource": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + "(google.api.resource_reference).type": "*" } }, - "messages": { - "rule": "repeated", - "type": "PubsubMessage", + "policy": { + "type": "Policy", "id": 2, "options": { "(google.api.field_behavior)": "REQUIRED" @@ -202,1404 +179,701 @@ } } }, - "PublishResponse": { + "GetIamPolicyRequest": { "fields": { - "messageIds": { - "rule": "repeated", + "resource": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "*" + } + }, + "options": { + "type": "GetPolicyOptions", + "id": 2 } } }, - "ListTopicsRequest": { + "TestIamPermissionsRequest": { "fields": { - "project": { + "resource": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + "(google.api.resource_reference).type": "*" } }, - "pageSize": { - "type": "int32", - "id": 2 - }, - "pageToken": { - "type": "string", - "id": 3 - } - } - }, - "ListTopicsResponse": { - "fields": { - "topics": { + "permissions": { "rule": "repeated", - "type": "Topic", - "id": 1 - }, - "nextPageToken": { - "type": "string", - "id": 2 - } - } - }, - "ListTopicSubscriptionsRequest": { - "fields": { - "topic": { "type": "string", - "id": 1, + "id": 2, "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + "(google.api.field_behavior)": "REQUIRED" } - }, - "pageSize": { - "type": "int32", - "id": 2 - }, - "pageToken": { - "type": "string", - "id": 3 } } }, - "ListTopicSubscriptionsResponse": { + "TestIamPermissionsResponse": { "fields": { - "subscriptions": { + "permissions": { "rule": "repeated", "type": "string", - "id": 1, - "options": { - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "nextPageToken": { - "type": "string", - "id": 2 + "id": 1 } } + } + } + } + } + }, + "type": { + "options": { + "go_package": "google.golang.org/genproto/googleapis/type/expr;expr", + "java_multiple_files": true, + "java_outer_classname": "ExprProto", + "java_package": "com.google.type", + "objc_class_prefix": "GTP" + }, + "nested": { + "Expr": { + "fields": { + "expression": { + "type": "string", + "id": 1 }, - "ListTopicSnapshotsRequest": { - "fields": { - "topic": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" - } - }, - "pageSize": { - "type": "int32", - "id": 2 - }, - "pageToken": { - "type": "string", - "id": 3 - } - } + "title": { + "type": "string", + "id": 2 }, - "ListTopicSnapshotsResponse": { - "fields": { - "snapshots": { - "rule": "repeated", - "type": "string", - "id": 1 - }, - "nextPageToken": { - "type": "string", - "id": 2 - } - } + "description": { + "type": "string", + "id": 3 }, - "DeleteTopicRequest": { - "fields": { - "topic": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" - } - } - } + "location": { + "type": "string", + "id": 4 + } + } + } + } + }, + "api": { + "options": { + "go_package": "google.golang.org/genproto/googleapis/api/annotations;annotations", + "java_multiple_files": true, + "java_outer_classname": "ResourceProto", + "java_package": "com.google.api", + "objc_class_prefix": "GAPI", + "cc_enable_arenas": true + }, + "nested": { + "http": { + "type": "HttpRule", + "id": 72295728, + "extend": "google.protobuf.MethodOptions" + }, + "Http": { + "fields": { + "rules": { + "rule": "repeated", + "type": "HttpRule", + "id": 1 }, - "Subscriber": { - "options": { - "(google.api.default_host)": "pubsub.googleapis.com", - "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" - }, - "methods": { - "CreateSubscription": { - "requestType": "Subscription", - "responseType": "Subscription", - "options": { - "(google.api.http).put": "/v1/{name=projects/*/subscriptions/*}", - "(google.api.http).body": "*", - "(google.api.method_signature)": "name,topic,push_config,ack_deadline_seconds" - } - }, - "GetSubscription": { - "requestType": "GetSubscriptionRequest", - "responseType": "Subscription", - "options": { - "(google.api.http).get": "/v1/{subscription=projects/*/subscriptions/*}", - "(google.api.method_signature)": "subscription" - } - }, - "UpdateSubscription": { - "requestType": "UpdateSubscriptionRequest", - "responseType": "Subscription", - "options": { - "(google.api.http).patch": "/v1/{subscription.name=projects/*/subscriptions/*}", - "(google.api.http).body": "*" - } - }, - "ListSubscriptions": { - "requestType": "ListSubscriptionsRequest", - "responseType": "ListSubscriptionsResponse", - "options": { - "(google.api.http).get": "/v1/{project=projects/*}/subscriptions", - "(google.api.method_signature)": "project" - } - }, - "DeleteSubscription": { - "requestType": "DeleteSubscriptionRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).delete": "/v1/{subscription=projects/*/subscriptions/*}", - "(google.api.method_signature)": "subscription" - } - }, - "ModifyAckDeadline": { - "requestType": "ModifyAckDeadlineRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline", - "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,ack_ids,ack_deadline_seconds" - } - }, - "Acknowledge": { - "requestType": "AcknowledgeRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:acknowledge", - "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,ack_ids" - } - }, - "Pull": { - "requestType": "PullRequest", - "responseType": "PullResponse", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:pull", - "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,return_immediately,max_messages" - } - }, - "StreamingPull": { - "requestType": "StreamingPullRequest", - "requestStream": true, - "responseType": "StreamingPullResponse", - "responseStream": true - }, - "ModifyPushConfig": { - "requestType": "ModifyPushConfigRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig", - "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,push_config" - } - }, - "GetSnapshot": { - "requestType": "GetSnapshotRequest", - "responseType": "Snapshot", - "options": { - "(google.api.http).get": "/v1/{snapshot=projects/*/snapshots/*}", - "(google.api.method_signature)": "snapshot" - } - }, - "ListSnapshots": { - "requestType": "ListSnapshotsRequest", - "responseType": "ListSnapshotsResponse", - "options": { - "(google.api.http).get": "/v1/{project=projects/*}/snapshots", - "(google.api.method_signature)": "project" - } - }, - "CreateSnapshot": { - "requestType": "CreateSnapshotRequest", - "responseType": "Snapshot", - "options": { - "(google.api.http).put": "/v1/{name=projects/*/snapshots/*}", - "(google.api.http).body": "*", - "(google.api.method_signature)": "name,subscription" - } - }, - "UpdateSnapshot": { - "requestType": "UpdateSnapshotRequest", - "responseType": "Snapshot", - "options": { - "(google.api.http).patch": "/v1/{snapshot.name=projects/*/snapshots/*}", - "(google.api.http).body": "*" - } - }, - "DeleteSnapshot": { - "requestType": "DeleteSnapshotRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).delete": "/v1/{snapshot=projects/*/snapshots/*}", - "(google.api.method_signature)": "snapshot" - } - }, - "Seek": { - "requestType": "SeekRequest", - "responseType": "SeekResponse", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:seek", - "(google.api.http).body": "*" - } - } - } + "fullyDecodeReservedExpansion": { + "type": "bool", + "id": 2 + } + } + }, + "HttpRule": { + "oneofs": { + "pattern": { + "oneof": [ + "get", + "put", + "post", + "delete", + "patch", + "custom" + ] + } + }, + "fields": { + "selector": { + "type": "string", + "id": 1 }, - "Subscription": { - "options": { - "(google.api.resource).type": "pubsub.googleapis.com/Subscription", - "(google.api.resource).pattern": "projects/{project}/subscriptions/{subscription}" - }, - "fields": { - "name": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "topic": { - "type": "string", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" - } - }, - "pushConfig": { - "type": "PushConfig", - "id": 4 - }, - "ackDeadlineSeconds": { - "type": "int32", - "id": 5 - }, - "retainAckedMessages": { - "type": "bool", - "id": 7 - }, - "messageRetentionDuration": { - "type": "google.protobuf.Duration", - "id": 8 - }, - "labels": { - "keyType": "string", - "type": "string", - "id": 9 - }, - "enableMessageOrdering": { - "type": "bool", - "id": 10 - }, - "expirationPolicy": { - "type": "ExpirationPolicy", - "id": 11 - }, - "deadLetterPolicy": { - "type": "DeadLetterPolicy", - "id": 13 - } - } + "get": { + "type": "string", + "id": 2 }, - "DeadLetterPolicy": { - "fields": { - "deadLetterTopic": { - "type": "string", - "id": 1 - }, - "maxDeliveryAttempts": { - "type": "int32", - "id": 2 - } - } + "put": { + "type": "string", + "id": 3 }, - "ExpirationPolicy": { - "fields": { - "ttl": { - "type": "google.protobuf.Duration", - "id": 1 - } - } + "post": { + "type": "string", + "id": 4 }, - "PushConfig": { - "oneofs": { - "authenticationMethod": { - "oneof": [ - "oidcToken" - ] - } - }, - "fields": { - "pushEndpoint": { - "type": "string", - "id": 1 - }, - "attributes": { - "keyType": "string", - "type": "string", - "id": 2 - }, - "oidcToken": { - "type": "OidcToken", - "id": 3 - } - }, - "nested": { - "OidcToken": { - "fields": { - "serviceAccountEmail": { - "type": "string", - "id": 1 - }, - "audience": { - "type": "string", - "id": 2 - } - } - } - } + "delete": { + "type": "string", + "id": 5 }, - "ReceivedMessage": { - "fields": { - "ackId": { - "type": "string", - "id": 1 - }, - "message": { - "type": "PubsubMessage", - "id": 2 - }, - "deliveryAttempt": { - "type": "int32", - "id": 3 - } - } + "patch": { + "type": "string", + "id": 6 }, - "GetSubscriptionRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - } - } + "custom": { + "type": "CustomHttpPattern", + "id": 8 }, - "UpdateSubscriptionRequest": { - "fields": { - "subscription": { - "type": "Subscription", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "updateMask": { - "type": "google.protobuf.FieldMask", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } - } + "body": { + "type": "string", + "id": 7 }, - "ListSubscriptionsRequest": { - "fields": { - "project": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" - } - }, - "pageSize": { - "type": "int32", - "id": 2 - }, - "pageToken": { - "type": "string", - "id": 3 - } - } + "responseBody": { + "type": "string", + "id": 12 }, - "ListSubscriptionsResponse": { - "fields": { - "subscriptions": { - "rule": "repeated", - "type": "Subscription", - "id": 1 - }, - "nextPageToken": { - "type": "string", - "id": 2 - } - } + "additionalBindings": { + "rule": "repeated", + "type": "HttpRule", + "id": 11 + } + } + }, + "CustomHttpPattern": { + "fields": { + "kind": { + "type": "string", + "id": 1 }, - "DeleteSubscriptionRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - } - } + "path": { + "type": "string", + "id": 2 + } + } + }, + "methodSignature": { + "rule": "repeated", + "type": "string", + "id": 1051, + "extend": "google.protobuf.MethodOptions" + }, + "defaultHost": { + "type": "string", + "id": 1049, + "extend": "google.protobuf.ServiceOptions" + }, + "oauthScopes": { + "type": "string", + "id": 1050, + "extend": "google.protobuf.ServiceOptions" + }, + "fieldBehavior": { + "rule": "repeated", + "type": "google.api.FieldBehavior", + "id": 1052, + "extend": "google.protobuf.FieldOptions" + }, + "FieldBehavior": { + "values": { + "FIELD_BEHAVIOR_UNSPECIFIED": 0, + "OPTIONAL": 1, + "REQUIRED": 2, + "OUTPUT_ONLY": 3, + "INPUT_ONLY": 4, + "IMMUTABLE": 5 + } + }, + "resourceReference": { + "type": "google.api.ResourceReference", + "id": 1055, + "extend": "google.protobuf.FieldOptions" + }, + "resourceDefinition": { + "rule": "repeated", + "type": "google.api.ResourceDescriptor", + "id": 1053, + "extend": "google.protobuf.FileOptions" + }, + "resource": { + "type": "google.api.ResourceDescriptor", + "id": 1053, + "extend": "google.protobuf.MessageOptions" + }, + "ResourceDescriptor": { + "fields": { + "type": { + "type": "string", + "id": 1 }, - "ModifyPushConfigRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "pushConfig": { - "type": "PushConfig", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } - } + "pattern": { + "rule": "repeated", + "type": "string", + "id": 2 }, - "PullRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "returnImmediately": { - "type": "bool", - "id": 2, - "options": { - "deprecated": true, - "(google.api.field_behavior)": "OPTIONAL" - } - }, - "maxMessages": { - "type": "int32", - "id": 3, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } + "nameField": { + "type": "string", + "id": 3 + }, + "history": { + "type": "History", + "id": 4 + }, + "plural": { + "type": "string", + "id": 5 + }, + "singular": { + "type": "string", + "id": 6 + } + }, + "nested": { + "History": { + "values": { + "HISTORY_UNSPECIFIED": 0, + "ORIGINALLY_SINGLE_PATTERN": 1, + "FUTURE_MULTI_PATTERN": 2 } + } + } + }, + "ResourceReference": { + "fields": { + "type": { + "type": "string", + "id": 1 }, - "PullResponse": { - "fields": { - "receivedMessages": { - "rule": "repeated", - "type": "ReceivedMessage", - "id": 1 - } + "childType": { + "type": "string", + "id": 2 + } + } + } + } + }, + "protobuf": { + "options": { + "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", + "java_package": "com.google.protobuf", + "java_outer_classname": "DescriptorProtos", + "csharp_namespace": "Google.Protobuf.Reflection", + "objc_class_prefix": "GPB", + "cc_enable_arenas": true, + "optimize_for": "SPEED" + }, + "nested": { + "FileDescriptorSet": { + "fields": { + "file": { + "rule": "repeated", + "type": "FileDescriptorProto", + "id": 1 + } + } + }, + "FileDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "package": { + "type": "string", + "id": 2 + }, + "dependency": { + "rule": "repeated", + "type": "string", + "id": 3 + }, + "publicDependency": { + "rule": "repeated", + "type": "int32", + "id": 10, + "options": { + "packed": false } }, - "ModifyAckDeadlineRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "ackIds": { - "rule": "repeated", - "type": "string", - "id": 4, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "ackDeadlineSeconds": { - "type": "int32", - "id": 3, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } + "weakDependency": { + "rule": "repeated", + "type": "int32", + "id": 11, + "options": { + "packed": false } }, - "AcknowledgeRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "ackIds": { - "rule": "repeated", - "type": "string", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } - } + "messageType": { + "rule": "repeated", + "type": "DescriptorProto", + "id": 4 }, - "StreamingPullRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "ackIds": { - "rule": "repeated", - "type": "string", - "id": 2 - }, - "modifyDeadlineSeconds": { - "rule": "repeated", - "type": "int32", - "id": 3 - }, - "modifyDeadlineAckIds": { - "rule": "repeated", - "type": "string", - "id": 4 - }, - "streamAckDeadlineSeconds": { - "type": "int32", - "id": 5, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "clientId": { - "type": "string", - "id": 6 - } - } + "enumType": { + "rule": "repeated", + "type": "EnumDescriptorProto", + "id": 5 }, - "StreamingPullResponse": { - "fields": { - "receivedMessages": { - "rule": "repeated", - "type": "ReceivedMessage", - "id": 1 - } - } + "service": { + "rule": "repeated", + "type": "ServiceDescriptorProto", + "id": 6 }, - "CreateSnapshotRequest": { - "fields": { - "name": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" - } - }, - "subscription": { - "type": "string", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "labels": { - "keyType": "string", - "type": "string", - "id": 3 - } - } + "extension": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 7 }, - "UpdateSnapshotRequest": { - "fields": { - "snapshot": { - "type": "Snapshot", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "updateMask": { - "type": "google.protobuf.FieldMask", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } - } + "options": { + "type": "FileOptions", + "id": 8 }, - "Snapshot": { - "options": { - "(google.api.resource).type": "pubsub.googleapis.com/Snapshot", - "(google.api.resource).pattern": "projects/{project}/snapshots/{snapshot}" - }, - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "topic": { - "type": "string", - "id": 2, - "options": { - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" - } - }, - "expireTime": { - "type": "google.protobuf.Timestamp", - "id": 3 - }, - "labels": { - "keyType": "string", - "type": "string", - "id": 4 - } - } + "sourceCodeInfo": { + "type": "SourceCodeInfo", + "id": 9 }, - "GetSnapshotRequest": { - "fields": { - "snapshot": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" - } - } - } + "syntax": { + "type": "string", + "id": 12 + } + } + }, + "DescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 }, - "ListSnapshotsRequest": { + "field": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 2 + }, + "extension": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 6 + }, + "nestedType": { + "rule": "repeated", + "type": "DescriptorProto", + "id": 3 + }, + "enumType": { + "rule": "repeated", + "type": "EnumDescriptorProto", + "id": 4 + }, + "extensionRange": { + "rule": "repeated", + "type": "ExtensionRange", + "id": 5 + }, + "oneofDecl": { + "rule": "repeated", + "type": "OneofDescriptorProto", + "id": 8 + }, + "options": { + "type": "MessageOptions", + "id": 7 + }, + "reservedRange": { + "rule": "repeated", + "type": "ReservedRange", + "id": 9 + }, + "reservedName": { + "rule": "repeated", + "type": "string", + "id": 10 + } + }, + "nested": { + "ExtensionRange": { "fields": { - "project": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" - } + "start": { + "type": "int32", + "id": 1 }, - "pageSize": { + "end": { "type": "int32", "id": 2 }, - "pageToken": { - "type": "string", + "options": { + "type": "ExtensionRangeOptions", "id": 3 } } }, - "ListSnapshotsResponse": { + "ReservedRange": { "fields": { - "snapshots": { - "rule": "repeated", - "type": "Snapshot", + "start": { + "type": "int32", "id": 1 }, - "nextPageToken": { - "type": "string", + "end": { + "type": "int32", "id": 2 } } - }, - "DeleteSnapshotRequest": { - "fields": { - "snapshot": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" - } - } - } - }, - "SeekRequest": { - "oneofs": { - "target": { - "oneof": [ - "time", - "snapshot" - ] - } - }, - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "time": { - "type": "google.protobuf.Timestamp", - "id": 2 - }, - "snapshot": { - "type": "string", - "id": 3, - "options": { - "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" - } - } - } - }, - "SeekResponse": { - "fields": {} } } - } - } - }, - "api": { - "options": { - "go_package": "google.golang.org/genproto/googleapis/api/annotations;annotations", - "java_multiple_files": true, - "java_outer_classname": "ResourceProto", - "java_package": "com.google.api", - "objc_class_prefix": "GAPI", - "cc_enable_arenas": true - }, - "nested": { - "http": { - "type": "HttpRule", - "id": 72295728, - "extend": "google.protobuf.MethodOptions" }, - "Http": { + "ExtensionRangeOptions": { "fields": { - "rules": { + "uninterpretedOption": { "rule": "repeated", - "type": "HttpRule", - "id": 1 - }, - "fullyDecodeReservedExpansion": { - "type": "bool", - "id": 2 - } - } - }, - "HttpRule": { - "oneofs": { - "pattern": { - "oneof": [ - "get", - "put", - "post", - "delete", - "patch", - "custom" - ] + "type": "UninterpretedOption", + "id": 999 } }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "FieldDescriptorProto": { "fields": { - "selector": { + "name": { "type": "string", "id": 1 }, - "get": { - "type": "string", - "id": 2 - }, - "put": { - "type": "string", + "number": { + "type": "int32", "id": 3 }, - "post": { - "type": "string", + "label": { + "type": "Label", "id": 4 }, - "delete": { - "type": "string", + "type": { + "type": "Type", "id": 5 }, - "patch": { + "typeName": { "type": "string", "id": 6 }, - "custom": { - "type": "CustomHttpPattern", - "id": 8 + "extendee": { + "type": "string", + "id": 2 }, - "body": { + "defaultValue": { "type": "string", "id": 7 }, - "responseBody": { + "oneofIndex": { + "type": "int32", + "id": 9 + }, + "jsonName": { "type": "string", - "id": 12 + "id": 10 }, - "additionalBindings": { - "rule": "repeated", - "type": "HttpRule", - "id": 11 + "options": { + "type": "FieldOptions", + "id": 8 + } + }, + "nested": { + "Type": { + "values": { + "TYPE_DOUBLE": 1, + "TYPE_FLOAT": 2, + "TYPE_INT64": 3, + "TYPE_UINT64": 4, + "TYPE_INT32": 5, + "TYPE_FIXED64": 6, + "TYPE_FIXED32": 7, + "TYPE_BOOL": 8, + "TYPE_STRING": 9, + "TYPE_GROUP": 10, + "TYPE_MESSAGE": 11, + "TYPE_BYTES": 12, + "TYPE_UINT32": 13, + "TYPE_ENUM": 14, + "TYPE_SFIXED32": 15, + "TYPE_SFIXED64": 16, + "TYPE_SINT32": 17, + "TYPE_SINT64": 18 + } + }, + "Label": { + "values": { + "LABEL_OPTIONAL": 1, + "LABEL_REQUIRED": 2, + "LABEL_REPEATED": 3 + } } } }, - "CustomHttpPattern": { + "OneofDescriptorProto": { "fields": { - "kind": { + "name": { "type": "string", "id": 1 }, - "path": { - "type": "string", + "options": { + "type": "OneofOptions", "id": 2 } } }, - "methodSignature": { - "rule": "repeated", - "type": "string", - "id": 1051, - "extend": "google.protobuf.MethodOptions" - }, - "defaultHost": { - "type": "string", - "id": 1049, - "extend": "google.protobuf.ServiceOptions" - }, - "oauthScopes": { - "type": "string", - "id": 1050, - "extend": "google.protobuf.ServiceOptions" - }, - "fieldBehavior": { - "rule": "repeated", - "type": "google.api.FieldBehavior", - "id": 1052, - "extend": "google.protobuf.FieldOptions" - }, - "FieldBehavior": { - "values": { - "FIELD_BEHAVIOR_UNSPECIFIED": 0, - "OPTIONAL": 1, - "REQUIRED": 2, - "OUTPUT_ONLY": 3, - "INPUT_ONLY": 4, - "IMMUTABLE": 5 - } - }, - "resourceReference": { - "type": "google.api.ResourceReference", - "id": 1055, - "extend": "google.protobuf.FieldOptions" - }, - "resourceDefinition": { - "rule": "repeated", - "type": "google.api.ResourceDescriptor", - "id": 1053, - "extend": "google.protobuf.FileOptions" - }, - "resource": { - "type": "google.api.ResourceDescriptor", - "id": 1053, - "extend": "google.protobuf.MessageOptions" - }, - "ResourceDescriptor": { + "EnumDescriptorProto": { "fields": { - "type": { + "name": { "type": "string", "id": 1 }, - "pattern": { + "value": { "rule": "repeated", - "type": "string", + "type": "EnumValueDescriptorProto", "id": 2 }, - "nameField": { - "type": "string", + "options": { + "type": "EnumOptions", "id": 3 }, - "history": { - "type": "History", + "reservedRange": { + "rule": "repeated", + "type": "EnumReservedRange", "id": 4 }, - "plural": { + "reservedName": { + "rule": "repeated", "type": "string", "id": 5 - }, - "singular": { - "type": "string", - "id": 6 } }, "nested": { - "History": { - "values": { - "HISTORY_UNSPECIFIED": 0, - "ORIGINALLY_SINGLE_PATTERN": 1, - "FUTURE_MULTI_PATTERN": 2 - } - } - } - }, - "ResourceReference": { - "fields": { - "type": { - "type": "string", - "id": 1 - }, - "childType": { - "type": "string", - "id": 2 - } - } - } - } - }, - "protobuf": { - "options": { - "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", - "java_package": "com.google.protobuf", - "java_outer_classname": "DescriptorProtos", - "csharp_namespace": "Google.Protobuf.Reflection", - "objc_class_prefix": "GPB", - "cc_enable_arenas": true, - "optimize_for": "SPEED" - }, - "nested": { - "FileDescriptorSet": { - "fields": { - "file": { - "rule": "repeated", - "type": "FileDescriptorProto", - "id": 1 + "EnumReservedRange": { + "fields": { + "start": { + "type": "int32", + "id": 1 + }, + "end": { + "type": "int32", + "id": 2 + } + } } } }, - "FileDescriptorProto": { + "EnumValueDescriptorProto": { "fields": { "name": { "type": "string", "id": 1 }, - "package": { - "type": "string", + "number": { + "type": "int32", "id": 2 }, - "dependency": { - "rule": "repeated", - "type": "string", + "options": { + "type": "EnumValueOptions", "id": 3 + } + } + }, + "ServiceDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 }, - "publicDependency": { - "rule": "repeated", - "type": "int32", - "id": 10, - "options": { - "packed": false - } - }, - "weakDependency": { - "rule": "repeated", - "type": "int32", - "id": 11, - "options": { - "packed": false - } - }, - "messageType": { - "rule": "repeated", - "type": "DescriptorProto", - "id": 4 - }, - "enumType": { - "rule": "repeated", - "type": "EnumDescriptorProto", - "id": 5 - }, - "service": { - "rule": "repeated", - "type": "ServiceDescriptorProto", - "id": 6 - }, - "extension": { + "method": { "rule": "repeated", - "type": "FieldDescriptorProto", - "id": 7 + "type": "MethodDescriptorProto", + "id": 2 }, "options": { - "type": "FileOptions", - "id": 8 - }, - "sourceCodeInfo": { - "type": "SourceCodeInfo", - "id": 9 - }, - "syntax": { - "type": "string", - "id": 12 + "type": "ServiceOptions", + "id": 3 } } }, - "DescriptorProto": { + "MethodDescriptorProto": { "fields": { "name": { "type": "string", "id": 1 }, - "field": { - "rule": "repeated", - "type": "FieldDescriptorProto", + "inputType": { + "type": "string", "id": 2 }, - "extension": { - "rule": "repeated", - "type": "FieldDescriptorProto", - "id": 6 - }, - "nestedType": { - "rule": "repeated", - "type": "DescriptorProto", + "outputType": { + "type": "string", "id": 3 }, - "enumType": { - "rule": "repeated", - "type": "EnumDescriptorProto", - "id": 4 - }, - "extensionRange": { - "rule": "repeated", - "type": "ExtensionRange", - "id": 5 - }, - "oneofDecl": { - "rule": "repeated", - "type": "OneofDescriptorProto", - "id": 8 - }, "options": { - "type": "MessageOptions", - "id": 7 - }, - "reservedRange": { - "rule": "repeated", - "type": "ReservedRange", - "id": 9 + "type": "MethodOptions", + "id": 4 }, - "reservedName": { - "rule": "repeated", - "type": "string", - "id": 10 - } - }, - "nested": { - "ExtensionRange": { - "fields": { - "start": { - "type": "int32", - "id": 1 - }, - "end": { - "type": "int32", - "id": 2 - }, - "options": { - "type": "ExtensionRangeOptions", - "id": 3 - } + "clientStreaming": { + "type": "bool", + "id": 5, + "options": { + "default": false } }, - "ReservedRange": { - "fields": { - "start": { - "type": "int32", - "id": 1 - }, - "end": { - "type": "int32", - "id": 2 - } + "serverStreaming": { + "type": "bool", + "id": 6, + "options": { + "default": false } } } }, - "ExtensionRangeOptions": { - "fields": { - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, - "FieldDescriptorProto": { + "FileOptions": { "fields": { - "name": { + "javaPackage": { "type": "string", "id": 1 }, - "number": { - "type": "int32", - "id": 3 + "javaOuterClassname": { + "type": "string", + "id": 8 }, - "label": { - "type": "Label", - "id": 4 + "javaMultipleFiles": { + "type": "bool", + "id": 10, + "options": { + "default": false + } }, - "type": { - "type": "Type", - "id": 5 + "javaGenerateEqualsAndHash": { + "type": "bool", + "id": 20, + "options": { + "deprecated": true + } }, - "typeName": { - "type": "string", - "id": 6 + "javaStringCheckUtf8": { + "type": "bool", + "id": 27, + "options": { + "default": false + } }, - "extendee": { - "type": "string", - "id": 2 + "optimizeFor": { + "type": "OptimizeMode", + "id": 9, + "options": { + "default": "SPEED" + } }, - "defaultValue": { + "goPackage": { "type": "string", - "id": 7 - }, - "oneofIndex": { - "type": "int32", - "id": 9 - }, - "jsonName": { - "type": "string", - "id": 10 - }, - "options": { - "type": "FieldOptions", - "id": 8 - } - }, - "nested": { - "Type": { - "values": { - "TYPE_DOUBLE": 1, - "TYPE_FLOAT": 2, - "TYPE_INT64": 3, - "TYPE_UINT64": 4, - "TYPE_INT32": 5, - "TYPE_FIXED64": 6, - "TYPE_FIXED32": 7, - "TYPE_BOOL": 8, - "TYPE_STRING": 9, - "TYPE_GROUP": 10, - "TYPE_MESSAGE": 11, - "TYPE_BYTES": 12, - "TYPE_UINT32": 13, - "TYPE_ENUM": 14, - "TYPE_SFIXED32": 15, - "TYPE_SFIXED64": 16, - "TYPE_SINT32": 17, - "TYPE_SINT64": 18 - } - }, - "Label": { - "values": { - "LABEL_OPTIONAL": 1, - "LABEL_REQUIRED": 2, - "LABEL_REPEATED": 3 - } - } - } - }, - "OneofDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "options": { - "type": "OneofOptions", - "id": 2 - } - } - }, - "EnumDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "value": { - "rule": "repeated", - "type": "EnumValueDescriptorProto", - "id": 2 - }, - "options": { - "type": "EnumOptions", - "id": 3 - }, - "reservedRange": { - "rule": "repeated", - "type": "EnumReservedRange", - "id": 4 - }, - "reservedName": { - "rule": "repeated", - "type": "string", - "id": 5 - } - }, - "nested": { - "EnumReservedRange": { - "fields": { - "start": { - "type": "int32", - "id": 1 - }, - "end": { - "type": "int32", - "id": 2 - } - } - } - } - }, - "EnumValueDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "number": { - "type": "int32", - "id": 2 - }, - "options": { - "type": "EnumValueOptions", - "id": 3 - } - } - }, - "ServiceDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "method": { - "rule": "repeated", - "type": "MethodDescriptorProto", - "id": 2 - }, - "options": { - "type": "ServiceOptions", - "id": 3 - } - } - }, - "MethodDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "inputType": { - "type": "string", - "id": 2 - }, - "outputType": { - "type": "string", - "id": 3 - }, - "options": { - "type": "MethodOptions", - "id": 4 - }, - "clientStreaming": { - "type": "bool", - "id": 5, - "options": { - "default": false - } - }, - "serverStreaming": { - "type": "bool", - "id": 6, - "options": { - "default": false - } - } - } - }, - "FileOptions": { - "fields": { - "javaPackage": { - "type": "string", - "id": 1 - }, - "javaOuterClassname": { - "type": "string", - "id": 8 - }, - "javaMultipleFiles": { - "type": "bool", - "id": 10, - "options": { - "default": false - } - }, - "javaGenerateEqualsAndHash": { - "type": "bool", - "id": 20, - "options": { - "deprecated": true - } - }, - "javaStringCheckUtf8": { - "type": "bool", - "id": 27, - "options": { - "default": false - } - }, - "optimizeFor": { - "type": "OptimizeMode", - "id": 9, - "options": { - "default": "SPEED" - } - }, - "goPackage": { - "type": "string", - "id": 11 + "id": 11 }, "ccGenericServices": { "type": "bool", @@ -1822,529 +1096,1293 @@ "JS_STRING": 1, "JS_NUMBER": 2 } - } - } - }, - "OneofOptions": { - "fields": { - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, - "EnumOptions": { - "fields": { - "allowAlias": { - "type": "bool", - "id": 2 + } + } + }, + "OneofOptions": { + "fields": { + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "EnumOptions": { + "fields": { + "allowAlias": { + "type": "bool", + "id": 2 + }, + "deprecated": { + "type": "bool", + "id": 3, + "options": { + "default": false + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 5, + 5 + ] + ] + }, + "EnumValueOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 1, + "options": { + "default": false + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "ServiceOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 33, + "options": { + "default": false + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "MethodOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 33, + "options": { + "default": false + } + }, + "idempotencyLevel": { + "type": "IdempotencyLevel", + "id": 34, + "options": { + "default": "IDEMPOTENCY_UNKNOWN" + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "nested": { + "IdempotencyLevel": { + "values": { + "IDEMPOTENCY_UNKNOWN": 0, + "NO_SIDE_EFFECTS": 1, + "IDEMPOTENT": 2 + } + } + } + }, + "UninterpretedOption": { + "fields": { + "name": { + "rule": "repeated", + "type": "NamePart", + "id": 2 + }, + "identifierValue": { + "type": "string", + "id": 3 + }, + "positiveIntValue": { + "type": "uint64", + "id": 4 + }, + "negativeIntValue": { + "type": "int64", + "id": 5 + }, + "doubleValue": { + "type": "double", + "id": 6 + }, + "stringValue": { + "type": "bytes", + "id": 7 + }, + "aggregateValue": { + "type": "string", + "id": 8 + } + }, + "nested": { + "NamePart": { + "fields": { + "namePart": { + "rule": "required", + "type": "string", + "id": 1 + }, + "isExtension": { + "rule": "required", + "type": "bool", + "id": 2 + } + } + } + } + }, + "SourceCodeInfo": { + "fields": { + "location": { + "rule": "repeated", + "type": "Location", + "id": 1 + } + }, + "nested": { + "Location": { + "fields": { + "path": { + "rule": "repeated", + "type": "int32", + "id": 1 + }, + "span": { + "rule": "repeated", + "type": "int32", + "id": 2 + }, + "leadingComments": { + "type": "string", + "id": 3 + }, + "trailingComments": { + "type": "string", + "id": 4 + }, + "leadingDetachedComments": { + "rule": "repeated", + "type": "string", + "id": 6 + } + } + } + } + }, + "GeneratedCodeInfo": { + "fields": { + "annotation": { + "rule": "repeated", + "type": "Annotation", + "id": 1 + } + }, + "nested": { + "Annotation": { + "fields": { + "path": { + "rule": "repeated", + "type": "int32", + "id": 1 + }, + "sourceFile": { + "type": "string", + "id": 2 + }, + "begin": { + "type": "int32", + "id": 3 + }, + "end": { + "type": "int32", + "id": 4 + } + } + } + } + }, + "Duration": { + "fields": { + "seconds": { + "type": "int64", + "id": 1 + }, + "nanos": { + "type": "int32", + "id": 2 + } + } + }, + "Empty": { + "fields": {} + }, + "FieldMask": { + "fields": { + "paths": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "Timestamp": { + "fields": { + "seconds": { + "type": "int64", + "id": 1 + }, + "nanos": { + "type": "int32", + "id": 2 + } + } + } + } + }, + "pubsub": { + "nested": { + "v1": { + "options": { + "cc_enable_arenas": true, + "csharp_namespace": "Google.Cloud.PubSub.V1", + "go_package": "google.golang.org/genproto/googleapis/pubsub/v1;pubsub", + "java_multiple_files": true, + "java_outer_classname": "PubsubProto", + "java_package": "com.google.pubsub.v1", + "php_namespace": "Google\\Cloud\\PubSub\\V1", + "ruby_package": "Google::Cloud::PubSub::V1" + }, + "nested": { + "Publisher": { + "options": { + "(google.api.default_host)": "pubsub.googleapis.com", + "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" + }, + "methods": { + "CreateTopic": { + "requestType": "Topic", + "responseType": "Topic", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/topics/*}", + "(google.api.http).body": "*", + "(google.api.method_signature)": "name" + } + }, + "UpdateTopic": { + "requestType": "UpdateTopicRequest", + "responseType": "Topic", + "options": { + "(google.api.http).patch": "/v1/{topic.name=projects/*/topics/*}", + "(google.api.http).body": "*" + } + }, + "Publish": { + "requestType": "PublishRequest", + "responseType": "PublishResponse", + "options": { + "(google.api.http).post": "/v1/{topic=projects/*/topics/*}:publish", + "(google.api.http).body": "*", + "(google.api.method_signature)": "topic,messages" + } + }, + "GetTopic": { + "requestType": "GetTopicRequest", + "responseType": "Topic", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}", + "(google.api.method_signature)": "topic" + } + }, + "ListTopics": { + "requestType": "ListTopicsRequest", + "responseType": "ListTopicsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/topics", + "(google.api.method_signature)": "project" + } + }, + "ListTopicSubscriptions": { + "requestType": "ListTopicSubscriptionsRequest", + "responseType": "ListTopicSubscriptionsResponse", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/subscriptions", + "(google.api.method_signature)": "topic" + } + }, + "ListTopicSnapshots": { + "requestType": "ListTopicSnapshotsRequest", + "responseType": "ListTopicSnapshotsResponse", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/snapshots", + "(google.api.method_signature)": "topic" + } + }, + "DeleteTopic": { + "requestType": "DeleteTopicRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}", + "(google.api.method_signature)": "topic" + } + } + } + }, + "MessageStoragePolicy": { + "fields": { + "allowedPersistenceRegions": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "Topic": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Topic", + "(google.api.resource).pattern": "_deleted-topic_" + }, + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "labels": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "messageStoragePolicy": { + "type": "MessageStoragePolicy", + "id": 3 + }, + "kmsKeyName": { + "type": "string", + "id": 5 + } + } + }, + "PubsubMessage": { + "fields": { + "data": { + "type": "bytes", + "id": 1 + }, + "attributes": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "messageId": { + "type": "string", + "id": 3 + }, + "publishTime": { + "type": "google.protobuf.Timestamp", + "id": 4 + }, + "orderingKey": { + "type": "string", + "id": 5 + } + } + }, + "GetTopicRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } + } + } + }, + "UpdateTopicRequest": { + "fields": { + "topic": { + "type": "Topic", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "PublishRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } + }, + "messages": { + "rule": "repeated", + "type": "PubsubMessage", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "PublishResponse": { + "fields": { + "messageIds": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "ListTopicsRequest": { + "fields": { + "project": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListTopicsResponse": { + "fields": { + "topics": { + "rule": "repeated", + "type": "Topic", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "ListTopicSubscriptionsRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListTopicSubscriptionsResponse": { + "fields": { + "subscriptions": { + "rule": "repeated", + "type": "string", + "id": 1, + "options": { + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "ListTopicSnapshotsRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListTopicSnapshotsResponse": { + "fields": { + "snapshots": { + "rule": "repeated", + "type": "string", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "DeleteTopicRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } + } + } + }, + "Subscriber": { + "options": { + "(google.api.default_host)": "pubsub.googleapis.com", + "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" + }, + "methods": { + "CreateSubscription": { + "requestType": "Subscription", + "responseType": "Subscription", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/subscriptions/*}", + "(google.api.http).body": "*", + "(google.api.method_signature)": "name,topic,push_config,ack_deadline_seconds" + } + }, + "GetSubscription": { + "requestType": "GetSubscriptionRequest", + "responseType": "Subscription", + "options": { + "(google.api.http).get": "/v1/{subscription=projects/*/subscriptions/*}", + "(google.api.method_signature)": "subscription" + } + }, + "UpdateSubscription": { + "requestType": "UpdateSubscriptionRequest", + "responseType": "Subscription", + "options": { + "(google.api.http).patch": "/v1/{subscription.name=projects/*/subscriptions/*}", + "(google.api.http).body": "*" + } + }, + "ListSubscriptions": { + "requestType": "ListSubscriptionsRequest", + "responseType": "ListSubscriptionsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/subscriptions", + "(google.api.method_signature)": "project" + } + }, + "DeleteSubscription": { + "requestType": "DeleteSubscriptionRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{subscription=projects/*/subscriptions/*}", + "(google.api.method_signature)": "subscription" + } + }, + "ModifyAckDeadline": { + "requestType": "ModifyAckDeadlineRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline", + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,ack_ids,ack_deadline_seconds" + } + }, + "Acknowledge": { + "requestType": "AcknowledgeRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:acknowledge", + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,ack_ids" + } + }, + "Pull": { + "requestType": "PullRequest", + "responseType": "PullResponse", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:pull", + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,return_immediately,max_messages" + } + }, + "StreamingPull": { + "requestType": "StreamingPullRequest", + "requestStream": true, + "responseType": "StreamingPullResponse", + "responseStream": true + }, + "ModifyPushConfig": { + "requestType": "ModifyPushConfigRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig", + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,push_config" + } + }, + "GetSnapshot": { + "requestType": "GetSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).get": "/v1/{snapshot=projects/*/snapshots/*}", + "(google.api.method_signature)": "snapshot" + } + }, + "ListSnapshots": { + "requestType": "ListSnapshotsRequest", + "responseType": "ListSnapshotsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/snapshots", + "(google.api.method_signature)": "project" + } + }, + "CreateSnapshot": { + "requestType": "CreateSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/snapshots/*}", + "(google.api.http).body": "*", + "(google.api.method_signature)": "name,subscription" + } + }, + "UpdateSnapshot": { + "requestType": "UpdateSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).patch": "/v1/{snapshot.name=projects/*/snapshots/*}", + "(google.api.http).body": "*" + } + }, + "DeleteSnapshot": { + "requestType": "DeleteSnapshotRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{snapshot=projects/*/snapshots/*}", + "(google.api.method_signature)": "snapshot" + } + }, + "Seek": { + "requestType": "SeekRequest", + "responseType": "SeekResponse", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:seek", + "(google.api.http).body": "*" + } + } + } + }, + "Subscription": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Subscription", + "(google.api.resource).pattern": "projects/{project}/subscriptions/{subscription}" + }, + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "topic": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } + }, + "pushConfig": { + "type": "PushConfig", + "id": 4 + }, + "ackDeadlineSeconds": { + "type": "int32", + "id": 5 + }, + "retainAckedMessages": { + "type": "bool", + "id": 7 + }, + "messageRetentionDuration": { + "type": "google.protobuf.Duration", + "id": 8 + }, + "labels": { + "keyType": "string", + "type": "string", + "id": 9 + }, + "enableMessageOrdering": { + "type": "bool", + "id": 10 + }, + "expirationPolicy": { + "type": "ExpirationPolicy", + "id": 11 + }, + "filter": { + "type": "string", + "id": 12 + }, + "deadLetterPolicy": { + "type": "DeadLetterPolicy", + "id": 13 + }, + "retryPolicy": { + "type": "RetryPolicy", + "id": 14 + } + } }, - "deprecated": { - "type": "bool", - "id": 3, - "options": { - "default": false + "RetryPolicy": { + "fields": { + "minimumBackoff": { + "type": "google.protobuf.Duration", + "id": 1 + }, + "maximumBackoff": { + "type": "google.protobuf.Duration", + "id": 2 + } } }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ], - "reserved": [ - [ - 5, - 5 - ] - ] - }, - "EnumValueOptions": { - "fields": { - "deprecated": { - "type": "bool", - "id": 1, - "options": { - "default": false + "DeadLetterPolicy": { + "fields": { + "deadLetterTopic": { + "type": "string", + "id": 1 + }, + "maxDeliveryAttempts": { + "type": "int32", + "id": 2 + } } }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, - "ServiceOptions": { - "fields": { - "deprecated": { - "type": "bool", - "id": 33, - "options": { - "default": false + "ExpirationPolicy": { + "fields": { + "ttl": { + "type": "google.protobuf.Duration", + "id": 1 + } } }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, - "MethodOptions": { - "fields": { - "deprecated": { - "type": "bool", - "id": 33, - "options": { - "default": false + "PushConfig": { + "oneofs": { + "authenticationMethod": { + "oneof": [ + "oidcToken" + ] + } + }, + "fields": { + "pushEndpoint": { + "type": "string", + "id": 1 + }, + "attributes": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "oidcToken": { + "type": "OidcToken", + "id": 3 + } + }, + "nested": { + "OidcToken": { + "fields": { + "serviceAccountEmail": { + "type": "string", + "id": 1 + }, + "audience": { + "type": "string", + "id": 2 + } + } + } } }, - "idempotencyLevel": { - "type": "IdempotencyLevel", - "id": 34, - "options": { - "default": "IDEMPOTENCY_UNKNOWN" + "ReceivedMessage": { + "fields": { + "ackId": { + "type": "string", + "id": 1 + }, + "message": { + "type": "PubsubMessage", + "id": 2 + }, + "deliveryAttempt": { + "type": "int32", + "id": 3 + } } }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ], - "nested": { - "IdempotencyLevel": { - "values": { - "IDEMPOTENCY_UNKNOWN": 0, - "NO_SIDE_EFFECTS": 1, - "IDEMPOTENT": 2 + "GetSubscriptionRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } + } } - } - } - }, - "UninterpretedOption": { - "fields": { - "name": { - "rule": "repeated", - "type": "NamePart", - "id": 2 - }, - "identifierValue": { - "type": "string", - "id": 3 - }, - "positiveIntValue": { - "type": "uint64", - "id": 4 - }, - "negativeIntValue": { - "type": "int64", - "id": 5 - }, - "doubleValue": { - "type": "double", - "id": 6 }, - "stringValue": { - "type": "bytes", - "id": 7 + "UpdateSubscriptionRequest": { + "fields": { + "subscription": { + "type": "Subscription", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } }, - "aggregateValue": { - "type": "string", - "id": 8 - } - }, - "nested": { - "NamePart": { + "ListSubscriptionsRequest": { "fields": { - "namePart": { - "rule": "required", + "project": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } }, - "isExtension": { - "rule": "required", - "type": "bool", + "pageSize": { + "type": "int32", "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 } } - } - } - }, - "SourceCodeInfo": { - "fields": { - "location": { - "rule": "repeated", - "type": "Location", - "id": 1 - } - }, - "nested": { - "Location": { + }, + "ListSubscriptionsResponse": { "fields": { - "path": { + "subscriptions": { "rule": "repeated", - "type": "int32", + "type": "Subscription", "id": 1 }, - "span": { - "rule": "repeated", - "type": "int32", + "nextPageToken": { + "type": "string", "id": 2 - }, - "leadingComments": { + } + } + }, + "DeleteSubscriptionRequest": { + "fields": { + "subscription": { "type": "string", - "id": 3 - }, - "trailingComments": { + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } + } + } + }, + "ModifyPushConfigRequest": { + "fields": { + "subscription": { "type": "string", - "id": 4 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, - "leadingDetachedComments": { - "rule": "repeated", + "pushConfig": { + "type": "PushConfig", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "PullRequest": { + "fields": { + "subscription": { "type": "string", - "id": 6 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } + }, + "returnImmediately": { + "type": "bool", + "id": 2, + "options": { + "deprecated": true, + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "maxMessages": { + "type": "int32", + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } - } - } - }, - "GeneratedCodeInfo": { - "fields": { - "annotation": { - "rule": "repeated", - "type": "Annotation", - "id": 1 - } - }, - "nested": { - "Annotation": { + }, + "PullResponse": { "fields": { - "path": { + "receivedMessages": { "rule": "repeated", - "type": "int32", + "type": "ReceivedMessage", "id": 1 - }, - "sourceFile": { + } + } + }, + "ModifyAckDeadlineRequest": { + "fields": { + "subscription": { "type": "string", - "id": 2 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, - "begin": { - "type": "int32", - "id": 3 + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 4, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, - "end": { + "ackDeadlineSeconds": { "type": "int32", - "id": 4 + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } - } - } - }, - "Duration": { - "fields": { - "seconds": { - "type": "int64", - "id": 1 }, - "nanos": { - "type": "int32", - "id": 2 - } - } - }, - "Empty": { - "fields": {} - }, - "FieldMask": { - "fields": { - "paths": { - "rule": "repeated", - "type": "string", - "id": 1 - } - } - }, - "Timestamp": { - "fields": { - "seconds": { - "type": "int64", - "id": 1 - }, - "nanos": { - "type": "int32", - "id": 2 - } - } - } - } - }, - "iam": { - "nested": { - "v1": { - "options": { - "cc_enable_arenas": true, - "csharp_namespace": "Google.Cloud.Iam.V1", - "go_package": "google.golang.org/genproto/googleapis/iam/v1;iam", - "java_multiple_files": true, - "java_outer_classname": "PolicyProto", - "java_package": "com.google.iam.v1", - "php_namespace": "Google\\Cloud\\Iam\\V1" - }, - "nested": { - "IAMPolicy": { - "options": { - "(google.api.default_host)": "iam-meta-api.googleapis.com" - }, - "methods": { - "SetIamPolicy": { - "requestType": "SetIamPolicyRequest", - "responseType": "Policy", + "AcknowledgeRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1, "options": { - "(google.api.http).post": "/v1/{resource=**}:setIamPolicy", - "(google.api.http).body": "*" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" } }, - "GetIamPolicy": { - "requestType": "GetIamPolicyRequest", - "responseType": "Policy", + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 2, "options": { - "(google.api.http).post": "/v1/{resource=**}:getIamPolicy", - "(google.api.http).body": "*" + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "StreamingPullRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" } }, - "TestIamPermissions": { - "requestType": "TestIamPermissionsRequest", - "responseType": "TestIamPermissionsResponse", + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 2 + }, + "modifyDeadlineSeconds": { + "rule": "repeated", + "type": "int32", + "id": 3 + }, + "modifyDeadlineAckIds": { + "rule": "repeated", + "type": "string", + "id": 4 + }, + "streamAckDeadlineSeconds": { + "type": "int32", + "id": 5, "options": { - "(google.api.http).post": "/v1/{resource=**}:testIamPermissions", - "(google.api.http).body": "*" + "(google.api.field_behavior)": "REQUIRED" } + }, + "clientId": { + "type": "string", + "id": 6 } } }, - "SetIamPolicyRequest": { + "StreamingPullResponse": { "fields": { - "resource": { - "type": "string", + "receivedMessages": { + "rule": "repeated", + "type": "ReceivedMessage", "id": 1 - }, - "policy": { - "type": "Policy", - "id": 2 } } }, - "GetIamPolicyRequest": { + "CreateSnapshotRequest": { "fields": { - "resource": { + "name": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" + } }, - "options": { - "type": "google.iam.v1.GetPolicyOptions", - "id": 2 - } - } - }, - "TestIamPermissionsRequest": { - "fields": { - "resource": { + "subscription": { "type": "string", - "id": 1 + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, - "permissions": { - "rule": "repeated", + "labels": { + "keyType": "string", "type": "string", - "id": 2 + "id": 3 } } }, - "TestIamPermissionsResponse": { + "UpdateSnapshotRequest": { "fields": { - "permissions": { - "rule": "repeated", - "type": "string", - "id": 1 + "snapshot": { + "type": "Snapshot", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, - "GetPolicyOptions": { + "Snapshot": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Snapshot", + "(google.api.resource).pattern": "projects/{project}/snapshots/{snapshot}" + }, "fields": { - "requestedPolicyVersion": { - "type": "int32", + "name": { + "type": "string", "id": 1 + }, + "topic": { + "type": "string", + "id": 2, + "options": { + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } + }, + "expireTime": { + "type": "google.protobuf.Timestamp", + "id": 3 + }, + "labels": { + "keyType": "string", + "type": "string", + "id": 4 } } }, - "Policy": { + "GetSnapshotRequest": { "fields": { - "version": { - "type": "int32", - "id": 1 - }, - "bindings": { - "rule": "repeated", - "type": "Binding", - "id": 4 - }, - "etag": { - "type": "bytes", - "id": 3 + "snapshot": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" + } } } }, - "Binding": { + "ListSnapshotsRequest": { "fields": { - "role": { + "project": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } }, - "members": { - "rule": "repeated", - "type": "string", + "pageSize": { + "type": "int32", "id": 2 }, - "condition": { - "type": "google.type.Expr", + "pageToken": { + "type": "string", "id": 3 } } }, - "PolicyDelta": { + "ListSnapshotsResponse": { "fields": { - "bindingDeltas": { + "snapshots": { "rule": "repeated", - "type": "BindingDelta", + "type": "Snapshot", "id": 1 }, - "auditConfigDeltas": { - "rule": "repeated", - "type": "AuditConfigDelta", + "nextPageToken": { + "type": "string", "id": 2 } } }, - "BindingDelta": { + "DeleteSnapshotRequest": { "fields": { - "action": { - "type": "Action", - "id": 1 - }, - "role": { - "type": "string", - "id": 2 - }, - "member": { + "snapshot": { "type": "string", - "id": 3 - }, - "condition": { - "type": "google.type.Expr", - "id": 4 - } - }, - "nested": { - "Action": { - "values": { - "ACTION_UNSPECIFIED": 0, - "ADD": 1, - "REMOVE": 2 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" } } } }, - "AuditConfigDelta": { + "SeekRequest": { + "oneofs": { + "target": { + "oneof": [ + "time", + "snapshot" + ] + } + }, "fields": { - "action": { - "type": "Action", - "id": 1 - }, - "service": { + "subscription": { "type": "string", - "id": 2 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, - "exemptedMember": { - "type": "string", - "id": 3 + "time": { + "type": "google.protobuf.Timestamp", + "id": 2 }, - "logType": { + "snapshot": { "type": "string", - "id": 4 - } - }, - "nested": { - "Action": { - "values": { - "ACTION_UNSPECIFIED": 0, - "ADD": 1, - "REMOVE": 2 + "id": 3, + "options": { + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" } } } - } - } - } - } - }, - "type": { - "options": { - "go_package": "google.golang.org/genproto/googleapis/type/expr;expr", - "java_multiple_files": true, - "java_outer_classname": "ExprProto", - "java_package": "com.google.type", - "objc_class_prefix": "GTP" - }, - "nested": { - "Expr": { - "fields": { - "expression": { - "type": "string", - "id": 1 - }, - "title": { - "type": "string", - "id": 2 - }, - "description": { - "type": "string", - "id": 3 }, - "location": { - "type": "string", - "id": 4 + "SeekResponse": { + "fields": {} } } } diff --git a/handwritten/pubsub/smoke-test/.eslintrc.yml b/handwritten/pubsub/smoke-test/.eslintrc.yml deleted file mode 100644 index 0d3d77f79f5..00000000000 --- a/handwritten/pubsub/smoke-test/.eslintrc.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -rules: - node/no-missing-require: off - no-console: off diff --git a/handwritten/pubsub/smoke-test/publisher_smoke_test.js b/handwritten/pubsub/smoke-test/publisher_smoke_test.js deleted file mode 100644 index 04b5a84c14e..00000000000 --- a/handwritten/pubsub/smoke-test/publisher_smoke_test.js +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -'use strict'; - -const {describe, it} = require('mocha'); - -describe('PublisherSmokeTest', () => { - if (!process.env.GCLOUD_PROJECT) { - throw new Error('Usage: GCLOUD_PROJECT= node #{$0}'); - } - const projectId = process.env.GCLOUD_PROJECT; - - it('successfully makes a call to the service using promises', done => { - const pubsub = require('../src'); - - const client = new pubsub.v1.PublisherClient({ - // optional auth parameters. - }); - - // Iterate over all elements. - const formattedProject = client.projectPath(projectId); - - client - .listTopics({project: formattedProject}) - .then(responses => { - const resources = responses[0]; - for (const resource of resources) { - console.log(resource); - } - }) - .then(done) - .catch(done); - }); - - it('successfully makes a call to the service using callbacks', done => { - const pubsub = require('../src'); - - const client = new pubsub.v1.PublisherClient({ - // optional auth parameters. - }); - - // Or obtain the paged response. - const formattedProject = client.projectPath(projectId); - - const options = {autoPaginate: false}; - const callback = responses => { - // The actual resources in a response. - const resources = responses[0]; - // The next request if the response shows that there are more responses. - const nextRequest = responses[1]; - // The actual response object, if necessary. - // const rawResponse = responses[2]; - for (const resource of resources) { - console.log(resource); - } - if (nextRequest) { - // Fetch the next page. - return client.listTopics(nextRequest, options).then(callback); - } - }; - client - .listTopics({project: formattedProject}, options) - .then(callback) - .then(done) - .catch(done); - }); - - it('successfully makes a call to the service using streaming', done => { - const pubsub = require('../src'); - - const client = new pubsub.v1.PublisherClient({ - // optional auth parameters. - }); - - const formattedProject = client.projectPath(projectId); - client - .listTopicsStream({project: formattedProject}) - .on('data', element => { - console.log(element); - }) - .on('error', done) - .on('end', done); - }); -}); diff --git a/handwritten/pubsub/src/helper.ts b/handwritten/pubsub/src/helper.ts new file mode 100644 index 00000000000..3c90ff06f01 --- /dev/null +++ b/handwritten/pubsub/src/helper.ts @@ -0,0 +1,260 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** + +import * as gax from 'google-gax'; +import {Descriptors, ClientOptions} from 'google-gax'; +import * as path from 'path'; +import * as gapicConfig from './iam_policy_service_client_config.json'; +import {ProjectIdCallback} from 'google-auth-library'; +import * as protosTypes from '../protos/protos'; +const {version} = require('../../package.json'); +/** + * Google Cloud IAM Client. + * This is manually written for providing methods [setIamPolicy, getIamPolicy, testIamPerssion] to the KMS client. + * We don't support it now in micro-generators. + * New feature request link: [https://github.com/googleapis/gapic-generator-typescript/issues/315] + */ +export class IamClient { + private _descriptors: Descriptors = {page: {}, stream: {}, longrunning: {}}; + private _innerApiCalls: {[name: string]: Function} = {}; + private _terminated = false; + auth: gax.GoogleAuth; + + constructor(opts?: ClientOptions) { + // Ensure that options include the service address and port. + const staticMembers = this.constructor as typeof IamClient; + const servicePath = + opts && opts.servicePath + ? opts.servicePath + : opts && opts.apiEndpoint + ? opts.apiEndpoint + : staticMembers.servicePath; + const port = opts && opts.port ? opts.port : staticMembers.port; + + if (!opts) { + opts = {servicePath, port}; + } + opts.servicePath = opts.servicePath || servicePath; + opts.port = opts.port || port; + opts.clientConfig = opts.clientConfig || {}; + + const isBrowser = typeof window !== 'undefined'; + if (isBrowser) { + opts.fallback = true; + } + const gaxModule = !isBrowser && opts.fallback ? gax.fallback : gax; + + // Create a `gaxGrpc` object, with any grpc-specific options + // sent to the client. + opts.scopes = (this.constructor as typeof IamClient).scopes; + const gaxGrpc = new gaxModule.GrpcClient(opts); + + // Save the auth object to the client, for use by other methods. + this.auth = gaxGrpc.auth as gax.GoogleAuth; + const clientHeader = [`gax/${gaxModule.version}`, `gapic/${version}`]; + if (typeof process !== 'undefined' && 'versions' in process) { + clientHeader.push(`gl-node/${process.versions.node}`); + } else { + clientHeader.push(`gl-web/${gaxModule.version}`); + } + if (!opts.fallback) { + clientHeader.push(`grpc/${gaxGrpc.grpcVersion}`); + } + if (opts.libName && opts.libVersion) { + clientHeader.push(`${opts.libName}/${opts.libVersion}`); + } + const nodejsProtoPath = path.join(__dirname, '..', 'protos', 'protos.json'); + + const protos = gaxGrpc.loadProto( + opts.fallback ? require('../protos/protos.json') : nodejsProtoPath + ); + // Put together the default options sent with requests. + const defaults = gaxGrpc.constructSettings( + 'google.iam.v1.IAMPolicy', + gapicConfig as gax.ClientConfig, + opts!.clientConfig || {}, + {'x-goog-api-client': clientHeader.join(' ')} + ); + // Put together the "service stub" for + // google.iam.v1.IAMPolicy. + const iamPolicyStub = gaxGrpc.createStub( + opts.fallback + ? (protos as protobuf.Root).lookupService('google.iam.v1.IAMPolicy') + : // tslint:disable-next-line no-any + (protos as any).google.iam.v1.IAMPolicy, + opts + ) as Promise<{[method: string]: Function}>; + this._innerApiCalls = {}; + // Iterate over each of the methods that the service provides + // and create an API call method for each. + const iamPolicyStubMethods = [ + 'getIamPolicy', + 'setIamPolicy', + 'testIamPermissions', + ]; + + for (const methodName of iamPolicyStubMethods) { + const innerCallPromise = iamPolicyStub.then( + stub => (...args: Array<{}>) => { + if (this._terminated) { + return Promise.reject('The client has already been closed.'); + } + return stub[methodName].apply(stub, args); + }, + (err: Error | null | undefined) => () => { + throw err; + } + ); + this._innerApiCalls[methodName] = gaxModule.createApiCall( + innerCallPromise, + defaults[methodName], + this._descriptors.page[methodName] + ); + } + } + + /** + * The DNS address for this API service. + */ + static get servicePath() { + return 'cloudkms.googleapis.com'; + } + + /** + * The DNS address for this API service - same as servicePath(), + * exists for compatibility reasons. + */ + static get apiEndpoint() { + return 'cloudkms.googleapis.com'; + } + + /** + * The port for this API service. + */ + static get port() { + return 443; + } + /** + * The scopes needed to make gRPC calls for every method defined + * in this service. + */ + static get scopes() { + return [ + 'https://www.googleapis.com/auth/cloud-platform', + 'https://www.googleapis.com/auth/cloudkms', + ]; + } + /** + * Return the project ID used by this class. + * @param {function(Error, string)} callback - the callback to + * be called with the current project Id. + */ + getProjectId(callback: ProjectIdCallback) { + return this.auth.getProjectId(callback); + } + + getIamPolicy(request: protosTypes.google.iam.v1.GetIamPolicyRequest): void; + getIamPolicy( + request: protosTypes.google.iam.v1.GetIamPolicyRequest, + options?: gax.CallOptions, + callback?: protosTypes.google.iam.v1.IAMPolicy.GetIamPolicyCallback + ): Promise { + if (options instanceof Function && callback === undefined) { + callback = (options as unknown) as protosTypes.google.iam.v1.IAMPolicy.GetIamPolicyCallback; + options = {}; + } + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); + return this._innerApiCalls.getIamPolicy(request, options, callback); + } + setIamPolicy(request: protosTypes.google.iam.v1.SetIamPolicyRequest): void; + setIamPolicy( + request: protosTypes.google.iam.v1.SetIamPolicyRequest, + options?: gax.CallOptions, + callback?: protosTypes.google.iam.v1.IAMPolicy.SetIamPolicyCallback + ): Promise { + if (options instanceof Function && callback === undefined) { + callback = (options as unknown) as protosTypes.google.iam.v1.IAMPolicy.SetIamPolicyCallback; + options = {}; + } + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); + + return this._innerApiCalls.setIamPolicy(request, options, callback); + } + testIamPermissions( + request: protosTypes.google.iam.v1.TestIamPermissionsRequest + ): void; + testIamPermissions( + request: protosTypes.google.iam.v1.TestIamPermissionsRequest, + options?: gax.CallOptions, + callback?: protosTypes.google.iam.v1.IAMPolicy.TestIamPermissionsCallback + ): Promise { + if (options instanceof Function && callback === undefined) { + callback = (options as unknown) as protosTypes.google.iam.v1.IAMPolicy.TestIamPermissionsCallback; + options = {}; + } + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + resource: request.resource, + }); + + return this._innerApiCalls.testIamPermissions(request, options, callback); + } +} +export interface IamClient { + getIamPolicy(request: protosTypes.google.iam.v1.GetIamPolicyRequest): void; + getIamPolicy( + request: protosTypes.google.iam.v1.GetIamPolicyRequest, + options?: gax.CallOptions, + callback?: protosTypes.google.iam.v1.IAMPolicy.GetIamPolicyCallback + ): Promise; + setIamPolicy(request: protosTypes.google.iam.v1.SetIamPolicyRequest): void; + setIamPolicy( + request: protosTypes.google.iam.v1.SetIamPolicyRequest, + options?: gax.CallOptions, + callback?: protosTypes.google.iam.v1.IAMPolicy.SetIamPolicyCallback + ): Promise; + testIamPermissions( + request: protosTypes.google.iam.v1.TestIamPermissionsRequest + ): void; + testIamPermissions( + request: protosTypes.google.iam.v1.TestIamPermissionsRequest, + options?: gax.CallOptions, + callback?: protosTypes.google.iam.v1.IAMPolicy.TestIamPermissionsCallback + ): Promise; +} diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index b980140042e..a3096bdbf2c 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -22,7 +22,7 @@ import {promisifyAll} from '@google-cloud/promisify'; import arrify = require('arrify'); import {CallOptions} from 'google-gax'; -import {google} from '../proto/iam'; +import {google} from '../protos/protos'; import {Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; diff --git a/handwritten/pubsub/src/iam_policy_service_client_config.json b/handwritten/pubsub/src/iam_policy_service_client_config.json new file mode 100644 index 00000000000..a63e357559b --- /dev/null +++ b/handwritten/pubsub/src/iam_policy_service_client_config.json @@ -0,0 +1,38 @@ +{ + "interfaces": { + "google.iam.v1.IAMPolicy": { + "retry_codes": { + "non_idempotent": [], + "idempotent": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ] + }, + "retry_params": { + "default": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 1.3, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 20000, + "rpc_timeout_multiplier": 1, + "max_rpc_timeout_millis": 20000, + "total_timeout_millis": 600000 + } + }, + "methods": { + "GetIamPolicy": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "SetIamPolicy": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "TestIamPermissions": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + } + } + } + } +} diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 3d31ac3cd07..ddac12de71e 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -28,7 +28,7 @@ import {PassThrough} from 'stream'; import {PullRetry} from './pull-retry'; import {Subscriber} from './subscriber'; -import {google} from '../proto/pubsub'; +import {google} from '../protos/protos'; import {defaultOptions} from './default-options'; /*! @@ -258,7 +258,8 @@ export class MessageStream extends PassThrough { */ private async _getClient(): Promise { const client = await this._subscriber.getClient(); - return client.getSubscriberStub(); + client.initialize(); + return client.subscriberStub as Promise; } /** * Since we do not use the streams to ack/modAck messages, they will close diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 3e3ed9b171f..7386dba5e53 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -22,7 +22,7 @@ import {BatchPublishOptions} from './message-batch'; import {Queue, OrderedQueue, PublishDone} from './message-queues'; import {Topic} from '../topic'; import {RequestCallback, EmptyCallback, EmptyResponse} from '../pubsub'; -import {google} from '../../proto/pubsub'; +import {google} from '../../protos/protos'; import {defaultOptions} from '../default-options'; export type PubsubMessage = google.pubsub.v1.IPubsubMessage; diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 2f357e207ee..c7365ac7a2e 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -20,7 +20,7 @@ import {EventEmitter} from 'events'; import {BatchPublishOptions, MessageBatch} from './message-batch'; import {PublishError} from './publish-error'; import {Publisher, PubsubMessage, PublishCallback, BATCH_LIMITS} from './'; -import {google} from '../../proto/pubsub'; +import {google} from '../../protos/protos'; export interface PublishDone { (err: ServiceError | null): void; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 4b81e2a8488..bc700fb505a 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -45,7 +45,7 @@ import { import {PublishOptions} from './publisher'; import {CallOptions} from 'google-gax'; import {Transform} from 'stream'; -import {google} from '../proto/pubsub'; +import {google} from '../protos/protos'; const opts = {} as gax.GrpcClientOptions; @@ -277,9 +277,6 @@ export class PubSub { this.api = {}; this.auth = new GoogleAuth(this.options); this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; - if (this.options.promise) { - this.Promise = this.options.promise; - } } close(): Promise; @@ -665,11 +662,13 @@ export class PubSub { let snapshots: Snapshot[]; if (rawSnapshots) { - snapshots = rawSnapshots.map(snapshot => { - const snapshotInstance = this.snapshot(snapshot.name!); - snapshotInstance.metadata = snapshot; - return snapshotInstance; - }); + snapshots = rawSnapshots.map( + (snapshot: google.pubsub.v1.ISnapshot) => { + const snapshotInstance = this.snapshot(snapshot.name!); + snapshotInstance.metadata = snapshot; + return snapshotInstance; + } + ); } callback!(err, snapshots!, ...args); @@ -789,7 +788,7 @@ export class PubSub { let subscriptions: Subscription[]; if (rawSubs) { - subscriptions = rawSubs.map(sub => { + subscriptions = rawSubs.map((sub: google.pubsub.v1.ISubscription) => { const subscriptionInstance = this.subscription(sub.name!); subscriptionInstance.metadata = sub; return subscriptionInstance; diff --git a/handwritten/pubsub/src/service_proto_list.json b/handwritten/pubsub/src/service_proto_list.json index 4b20fe08d9d..03bfe23c6c1 100644 --- a/handwritten/pubsub/src/service_proto_list.json +++ b/handwritten/pubsub/src/service_proto_list.json @@ -1 +1,5 @@ -["../protos/google/pubsub/v1/pubsub.proto"] \ No newline at end of file +[ + "../../protos/google/iam/v1/policy.proto", + "../../protos/google/iam/v1/options.proto", + "../../protos/google/iam/v1/iam_policy.proto" +] diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index d2070c9c62b..68339c44df4 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -17,9 +17,9 @@ import {promisifyAll} from '@google-cloud/promisify'; import {CallOptions} from 'google-gax'; -import {google} from '../proto/pubsub'; +import {google} from '../protos/protos'; -import {PubSub} from './index'; +import {PubSub} from './pubsub'; import { EmptyCallback, EmptyResponse, diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 03febd6b357..145ef137524 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -21,7 +21,7 @@ import {EventEmitter} from 'events'; import {ClientStub} from 'google-gax'; import {common as protobuf} from 'protobufjs'; -import {google} from '../proto/pubsub'; +import {google} from '../protos/protos'; import {Histogram} from './histogram'; import {FlowControlOptions, LeaseManager} from './lease-manager'; @@ -29,6 +29,7 @@ import {AckQueue, BatchOptions, ModAckQueue} from './message-queues'; import {MessageStream, MessageStreamOptions} from './message-stream'; import {Subscription} from './subscription'; import {defaultOptions} from './default-options'; +import {SubscriberClient} from './v1'; export type PullResponse = google.pubsub.v1.IPullResponse; @@ -323,7 +324,7 @@ export class Subscriber extends EventEmitter { * @returns {Promise} * @private */ - async getClient(): Promise { + async getClient(): Promise { const pubsub = this._subscription.pubsub; const [client] = await promisify(pubsub.getClient_).call(pubsub, { client: 'SubscriberClient', diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 9995821b133..d83859dabae 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -20,7 +20,7 @@ import * as extend from 'extend'; import {CallOptions} from 'google-gax'; import snakeCase = require('lodash.snakecase'); -import {google} from '../proto/pubsub'; +import {google} from '../protos/protos'; import {IAM} from './iam'; import {FlowControlOptions} from './lease-manager'; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 43f9278bd7c..526209f8ed4 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -18,7 +18,7 @@ import {paginator} from '@google-cloud/paginator'; import {promisifyAll} from '@google-cloud/promisify'; import {CallOptions} from 'google-gax'; -import {google} from '../proto/pubsub'; +import {google} from '../protos/protos'; import {IAM} from './iam'; import { @@ -607,7 +607,7 @@ export class Topic { let subscriptions: Subscription[]; if (subNames) { - subscriptions = subNames.map(sub => this.subscription(sub)); + subscriptions = subNames.map((sub: string) => this.subscription(sub)); } callback!(err, subscriptions!, ...args); diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js b/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js deleted file mode 100644 index 32288959104..00000000000 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_policy.js +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js deleted file mode 100644 index bd4b4ee6067..00000000000 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_duration.js +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. - -/** - * A Duration represents a signed, fixed-length span of time represented - * as a count of seconds and fractions of seconds at nanosecond - * resolution. It is independent of any calendar and concepts like "day" - * or "month". It is related to Timestamp in that the difference between - * two Timestamp values is a Duration and it can be added or subtracted - * from a Timestamp. Range is approximately +-10,000 years. - * - * # Examples - * - * Example 1: Compute Duration from two Timestamps in pseudo code. - * - * Timestamp start = ...; - * Timestamp end = ...; - * Duration duration = ...; - * - * duration.seconds = end.seconds - start.seconds; - * duration.nanos = end.nanos - start.nanos; - * - * if (duration.seconds < 0 && duration.nanos > 0) { - * duration.seconds += 1; - * duration.nanos -= 1000000000; - * } else if (durations.seconds > 0 && duration.nanos < 0) { - * duration.seconds -= 1; - * duration.nanos += 1000000000; - * } - * - * Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. - * - * Timestamp start = ...; - * Duration duration = ...; - * Timestamp end = ...; - * - * end.seconds = start.seconds + duration.seconds; - * end.nanos = start.nanos + duration.nanos; - * - * if (end.nanos < 0) { - * end.seconds -= 1; - * end.nanos += 1000000000; - * } else if (end.nanos >= 1000000000) { - * end.seconds += 1; - * end.nanos -= 1000000000; - * } - * - * Example 3: Compute Duration from datetime.timedelta in Python. - * - * td = datetime.timedelta(days=3, minutes=10) - * duration = Duration() - * duration.FromTimedelta(td) - * - * # JSON Mapping - * - * In JSON format, the Duration type is encoded as a string rather than an - * object, where the string ends in the suffix "s" (indicating seconds) and - * is preceded by the number of seconds, with nanoseconds expressed as - * fractional seconds. For example, 3 seconds with 0 nanoseconds should be - * encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should - * be expressed in JSON format as "3.000000001s", and 3 seconds and 1 - * microsecond should be expressed in JSON format as "3.000001s". - * - * @property {number} seconds - * Signed seconds of the span of time. Must be from -315,576,000,000 - * to +315,576,000,000 inclusive. Note: these bounds are computed from: - * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years - * - * @property {number} nanos - * Signed fractions of a second at nanosecond resolution of the span - * of time. Durations less than one second are represented with a 0 - * `seconds` field and a positive or negative `nanos` field. For durations - * of one second or more, a non-zero value for the `nanos` field must be - * of the same sign as the `seconds` field. Must be from -999,999,999 - * to +999,999,999 inclusive. - * - * @typedef Duration - * @memberof google.protobuf - * @see [google.protobuf.Duration definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/duration.proto} - */ -const Duration = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js deleted file mode 100644 index 1e3961d6609..00000000000 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_empty.js +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. - -/** - * A generic empty message that you can re-use to avoid defining duplicated - * empty messages in your APIs. A typical example is to use it as the request - * or the response type of an API method. For instance: - * - * service Foo { - * rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty); - * } - * - * The JSON representation for `Empty` is empty JSON object `{}`. - * @typedef Empty - * @memberof google.protobuf - * @see [google.protobuf.Empty definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/empty.proto} - */ -const Empty = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js deleted file mode 100644 index 59e745f36c2..00000000000 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_field_mask.js +++ /dev/null @@ -1,228 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. - -/** - * `FieldMask` represents a set of symbolic field paths, for example: - * - * paths: "f.a" - * paths: "f.b.d" - * - * Here `f` represents a field in some root message, `a` and `b` - * fields in the message found in `f`, and `d` a field found in the - * message in `f.b`. - * - * Field masks are used to specify a subset of fields that should be - * returned by a get operation or modified by an update operation. - * Field masks also have a custom JSON encoding (see below). - * - * # Field Masks in Projections - * - * When used in the context of a projection, a response message or - * sub-message is filtered by the API to only contain those fields as - * specified in the mask. For example, if the mask in the previous - * example is applied to a response message as follows: - * - * f { - * a : 22 - * b { - * d : 1 - * x : 2 - * } - * y : 13 - * } - * z: 8 - * - * The result will not contain specific values for fields x,y and z - * (their value will be set to the default, and omitted in proto text - * output): - * - * - * f { - * a : 22 - * b { - * d : 1 - * } - * } - * - * A repeated field is not allowed except at the last position of a - * paths string. - * - * If a FieldMask object is not present in a get operation, the - * operation applies to all fields (as if a FieldMask of all fields - * had been specified). - * - * Note that a field mask does not necessarily apply to the - * top-level response message. In case of a REST get operation, the - * field mask applies directly to the response, but in case of a REST - * list operation, the mask instead applies to each individual message - * in the returned resource list. In case of a REST custom method, - * other definitions may be used. Where the mask applies will be - * clearly documented together with its declaration in the API. In - * any case, the effect on the returned resource/resources is required - * behavior for APIs. - * - * # Field Masks in Update Operations - * - * A field mask in update operations specifies which fields of the - * targeted resource are going to be updated. The API is required - * to only change the values of the fields as specified in the mask - * and leave the others untouched. If a resource is passed in to - * describe the updated values, the API ignores the values of all - * fields not covered by the mask. - * - * If a repeated field is specified for an update operation, new values will - * be appended to the existing repeated field in the target resource. Note that - * a repeated field is only allowed in the last position of a `paths` string. - * - * If a sub-message is specified in the last position of the field mask for an - * update operation, then new value will be merged into the existing sub-message - * in the target resource. - * - * For example, given the target message: - * - * f { - * b { - * d: 1 - * x: 2 - * } - * c: [1] - * } - * - * And an update message: - * - * f { - * b { - * d: 10 - * } - * c: [2] - * } - * - * then if the field mask is: - * - * paths: ["f.b", "f.c"] - * - * then the result will be: - * - * f { - * b { - * d: 10 - * x: 2 - * } - * c: [1, 2] - * } - * - * An implementation may provide options to override this default behavior for - * repeated and message fields. - * - * In order to reset a field's value to the default, the field must - * be in the mask and set to the default value in the provided resource. - * Hence, in order to reset all fields of a resource, provide a default - * instance of the resource and set all fields in the mask, or do - * not provide a mask as described below. - * - * If a field mask is not present on update, the operation applies to - * all fields (as if a field mask of all fields has been specified). - * Note that in the presence of schema evolution, this may mean that - * fields the client does not know and has therefore not filled into - * the request will be reset to their default. If this is unwanted - * behavior, a specific service may require a client to always specify - * a field mask, producing an error if not. - * - * As with get operations, the location of the resource which - * describes the updated values in the request message depends on the - * operation kind. In any case, the effect of the field mask is - * required to be honored by the API. - * - * ## Considerations for HTTP REST - * - * The HTTP kind of an update operation which uses a field mask must - * be set to PATCH instead of PUT in order to satisfy HTTP semantics - * (PUT must only be used for full updates). - * - * # JSON Encoding of Field Masks - * - * In JSON, a field mask is encoded as a single string where paths are - * separated by a comma. Fields name in each path are converted - * to/from lower-camel naming conventions. - * - * As an example, consider the following message declarations: - * - * message Profile { - * User user = 1; - * Photo photo = 2; - * } - * message User { - * string display_name = 1; - * string address = 2; - * } - * - * In proto a field mask for `Profile` may look as such: - * - * mask { - * paths: "user.display_name" - * paths: "photo" - * } - * - * In JSON, the same mask is represented as below: - * - * { - * mask: "user.displayName,photo" - * } - * - * # Field Masks and Oneof Fields - * - * Field masks treat fields in oneofs just as regular fields. Consider the - * following message: - * - * message SampleMessage { - * oneof test_oneof { - * string name = 4; - * SubMessage sub_message = 9; - * } - * } - * - * The field mask can be: - * - * mask { - * paths: "name" - * } - * - * Or: - * - * mask { - * paths: "sub_message" - * } - * - * Note that oneof type names ("test_oneof" in this case) cannot be used in - * paths. - * - * ## Field Mask Verification - * - * The implementation of any API method which has a FieldMask type field in the - * request should verify the included field paths, and return an - * `INVALID_ARGUMENT` error if any path is duplicated or unmappable. - * - * @property {string[]} paths - * The set of field mask paths. - * - * @typedef FieldMask - * @memberof google.protobuf - * @see [google.protobuf.FieldMask definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/field_mask.proto} - */ -const FieldMask = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js b/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js deleted file mode 100644 index ad801cc9a10..00000000000 --- a/handwritten/pubsub/src/v1/doc/google/protobuf/doc_timestamp.js +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. - -/** - * A Timestamp represents a point in time independent of any time zone or local - * calendar, encoded as a count of seconds and fractions of seconds at - * nanosecond resolution. The count is relative to an epoch at UTC midnight on - * January 1, 1970, in the proleptic Gregorian calendar which extends the - * Gregorian calendar backwards to year one. - * - * All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap - * second table is needed for interpretation, using a [24-hour linear - * smear](https://developers.google.com/time/smear). - * - * The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By - * restricting to that range, we ensure that we can convert to and from [RFC - * 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings. - * - * # Examples - * - * Example 1: Compute Timestamp from POSIX `time()`. - * - * Timestamp timestamp; - * timestamp.set_seconds(time(NULL)); - * timestamp.set_nanos(0); - * - * Example 2: Compute Timestamp from POSIX `gettimeofday()`. - * - * struct timeval tv; - * gettimeofday(&tv, NULL); - * - * Timestamp timestamp; - * timestamp.set_seconds(tv.tv_sec); - * timestamp.set_nanos(tv.tv_usec * 1000); - * - * Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. - * - * FILETIME ft; - * GetSystemTimeAsFileTime(&ft); - * UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; - * - * // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z - * // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. - * Timestamp timestamp; - * timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); - * timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); - * - * Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. - * - * long millis = System.currentTimeMillis(); - * - * Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) - * .setNanos((int) ((millis % 1000) * 1000000)).build(); - * - * - * Example 5: Compute Timestamp from current time in Python. - * - * timestamp = Timestamp() - * timestamp.GetCurrentTime() - * - * # JSON Mapping - * - * In JSON format, the Timestamp type is encoded as a string in the - * [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the - * format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z" - * where {year} is always expressed using four digits while {month}, {day}, - * {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional - * seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), - * are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone - * is required. A proto3 JSON serializer should always use UTC (as indicated by - * "Z") when printing the Timestamp type and a proto3 JSON parser should be - * able to accept both UTC and other timezones (as indicated by an offset). - * - * For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past - * 01:30 UTC on January 15, 2017. - * - * In JavaScript, one can convert a Date object to this format using the - * standard - * [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) - * method. In Python, a standard `datetime.datetime` object can be converted - * to this format using - * [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with - * the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use - * the Joda Time's [`ISODateTimeFormat.dateTime()`](https://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D) to obtain a formatter capable of generating timestamps in this format. - * - * @property {number} seconds - * Represents seconds of UTC time since Unix epoch - * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to - * 9999-12-31T23:59:59Z inclusive. - * - * @property {number} nanos - * Non-negative fractions of a second at nanosecond resolution. Negative - * second values with fractions must still have non-negative nanos values - * that count forward in time. Must be from 0 to 999,999,999 - * inclusive. - * - * @typedef Timestamp - * @memberof google.protobuf - * @see [google.protobuf.Timestamp definition in proto format]{@link https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto} - */ -const Timestamp = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js b/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js deleted file mode 100644 index ff7d0345b06..00000000000 --- a/handwritten/pubsub/src/v1/doc/google/pubsub/v1/doc_pubsub.js +++ /dev/null @@ -1,1125 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. - -/** - * @property {string[]} allowedPersistenceRegions - * A list of IDs of GCP regions where messages that are published to the topic - * may be persisted in storage. Messages published by publishers running in - * non-allowed GCP regions (or running outside of GCP altogether) will be - * routed for storage in one of the allowed regions. An empty list means that - * no regions are allowed, and is not a valid configuration. - * - * @typedef MessageStoragePolicy - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.MessageStoragePolicy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const MessageStoragePolicy = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A topic resource. - * - * @property {string} name - * Required. The name of the topic. It must have the format - * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, - * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), - * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent - * signs (`%`). It must be between 3 and 255 characters in length, and it - * must not start with `"goog"`. - * - * @property {Object.} labels - * See Creating and - * managing labels. - * - * @property {Object} messageStoragePolicy - * Policy constraining the set of Google Cloud Platform regions where messages - * published to the topic may be stored. If not present, then no constraints - * are in effect. - * - * This object should have the same structure as [MessageStoragePolicy]{@link google.pubsub.v1.MessageStoragePolicy} - * - * @property {string} kmsKeyName - * The resource name of the Cloud KMS CryptoKey to be used to protect access - * to messages published on this topic. - * - * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. - * - * @typedef Topic - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.Topic definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const Topic = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A message that is published by publishers and consumed by subscribers. The - * message must contain either a non-empty data field or at least one attribute. - * Note that client libraries represent this object differently - * depending on the language. See the corresponding - * client - * library documentation for more information. See - * Quotas and limits - * for more information about message limits. - * - * @property {Buffer} data - * The message data field. If this field is empty, the message must contain - * at least one attribute. - * - * @property {Object.} attributes - * Attributes for this message. If this field is empty, the message must - * contain non-empty data. - * - * @property {string} messageId - * ID of this message, assigned by the server when the message is published. - * Guaranteed to be unique within the topic. This value may be read by a - * subscriber that receives a `PubsubMessage` via a `Pull` call or a push - * delivery. It must not be populated by the publisher in a `Publish` call. - * - * @property {Object} publishTime - * The time at which the message was published, populated by the server when - * it receives the `Publish` call. It must not be populated by the - * publisher in a `Publish` call. - * - * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} - * - * @property {string} orderingKey - * If non-empty, identifies related messages for which publish order should be - * respected. If a `Subscription` has `enable_message_ordering` set to `true`, - * messages published with the same non-empty `ordering_key` value will be - * delivered to subscribers in the order in which they are received by the - * Pub/Sub system. All `PubsubMessage`s published in a given `PublishRequest` - * must specify the same `ordering_key` value. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. - * - * @typedef PubsubMessage - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.PubsubMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const PubsubMessage = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the GetTopic method. - * - * @property {string} topic - * Required. The name of the topic to get. - * Format is `projects/{project}/topics/{topic}`. - * - * @typedef GetTopicRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.GetTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const GetTopicRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the UpdateTopic method. - * - * @property {Object} topic - * Required. The updated topic object. - * - * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} - * - * @property {Object} updateMask - * Required. Indicates which fields in the provided topic to update. Must be - * specified and non-empty. Note that if `update_mask` contains - * "message_storage_policy" then the new value will be determined based on the - * policy configured at the project or organization level. The - * `message_storage_policy` must not be set in the `topic` provided above. - * - * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} - * - * @typedef UpdateTopicRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.UpdateTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const UpdateTopicRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the Publish method. - * - * @property {string} topic - * Required. The messages in the request will be published on this topic. - * Format is `projects/{project}/topics/{topic}`. - * - * @property {Object[]} messages - * Required. The messages to publish. - * - * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} - * - * @typedef PublishRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.PublishRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const PublishRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `Publish` method. - * - * @property {string[]} messageIds - * The server-assigned ID of each published message, in the same order as - * the messages in the request. IDs are guaranteed to be unique within - * the topic. - * - * @typedef PublishResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.PublishResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const PublishResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListTopics` method. - * - * @property {string} project - * Required. The name of the project in which to list topics. - * Format is `projects/{project-id}`. - * - * @property {number} pageSize - * Maximum number of topics to return. - * - * @property {string} pageToken - * The value returned by the last `ListTopicsResponse`; indicates that this is - * a continuation of a prior `ListTopics` call, and that the system should - * return the next page of data. - * - * @typedef ListTopicsRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListTopicsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListTopicsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListTopics` method. - * - * @property {Object[]} topics - * The resulting topics. - * - * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more topics that match the - * request; this value should be passed in a new `ListTopicsRequest`. - * - * @typedef ListTopicsResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListTopicsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListTopicsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListTopicSubscriptions` method. - * - * @property {string} topic - * Required. The name of the topic that subscriptions are attached to. - * Format is `projects/{project}/topics/{topic}`. - * - * @property {number} pageSize - * Maximum number of subscription names to return. - * - * @property {string} pageToken - * The value returned by the last `ListTopicSubscriptionsResponse`; indicates - * that this is a continuation of a prior `ListTopicSubscriptions` call, and - * that the system should return the next page of data. - * - * @typedef ListTopicSubscriptionsRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListTopicSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListTopicSubscriptionsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListTopicSubscriptions` method. - * - * @property {string[]} subscriptions - * The names of the subscriptions that match the request. - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more subscriptions that match - * the request; this value should be passed in a new - * `ListTopicSubscriptionsRequest` to get more subscriptions. - * - * @typedef ListTopicSubscriptionsResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListTopicSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListTopicSubscriptionsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListTopicSnapshots` method. - * - * @property {string} topic - * Required. The name of the topic that snapshots are attached to. - * Format is `projects/{project}/topics/{topic}`. - * - * @property {number} pageSize - * Maximum number of snapshot names to return. - * - * @property {string} pageToken - * The value returned by the last `ListTopicSnapshotsResponse`; indicates - * that this is a continuation of a prior `ListTopicSnapshots` call, and - * that the system should return the next page of data. - * - * @typedef ListTopicSnapshotsRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListTopicSnapshotsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListTopicSnapshotsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListTopicSnapshots` method. - * - * @property {string[]} snapshots - * The names of the snapshots that match the request. - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more snapshots that match - * the request; this value should be passed in a new - * `ListTopicSnapshotsRequest` to get more snapshots. - * - * @typedef ListTopicSnapshotsResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListTopicSnapshotsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListTopicSnapshotsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `DeleteTopic` method. - * - * @property {string} topic - * Required. Name of the topic to delete. - * Format is `projects/{project}/topics/{topic}`. - * - * @typedef DeleteTopicRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.DeleteTopicRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const DeleteTopicRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A subscription resource. - * - * @property {string} name - * Required. The name of the subscription. It must have the format - * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must - * start with a letter, and contain only letters (`[A-Za-z]`), numbers - * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), - * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters - * in length, and it must not start with `"goog"`. - * - * @property {string} topic - * Required. The name of the topic from which this subscription is receiving - * messages. Format is `projects/{project}/topics/{topic}`. The value of this - * field will be `_deleted-topic_` if the topic has been deleted. - * - * @property {Object} pushConfig - * If push delivery is used with this subscription, this field is - * used to configure it. An empty `pushConfig` signifies that the subscriber - * will pull and ack messages using API methods. - * - * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} - * - * @property {number} ackDeadlineSeconds - * The approximate amount of time (on a best-effort basis) Pub/Sub waits for - * the subscriber to acknowledge receipt before resending the message. In the - * interval after the message is delivered and before it is acknowledged, it - * is considered to be outstanding. During that time period, the - * message will not be redelivered (on a best-effort basis). - * - * For pull subscriptions, this value is used as the initial value for the ack - * deadline. To override this value for a given message, call - * `ModifyAckDeadline` with the corresponding `ack_id` if using - * non-streaming pull or send the `ack_id` in a - * `StreamingModifyAckDeadlineRequest` if using streaming pull. - * The minimum custom deadline you can specify is 10 seconds. - * The maximum custom deadline you can specify is 600 seconds (10 minutes). - * If this parameter is 0, a default value of 10 seconds is used. - * - * For push delivery, this value is also used to set the request timeout for - * the call to the push endpoint. - * - * If the subscriber never acknowledges the message, the Pub/Sub - * system will eventually redeliver the message. - * - * @property {boolean} retainAckedMessages - * Indicates whether to retain acknowledged messages. If true, then - * messages are not expunged from the subscription's backlog, even if they are - * acknowledged, until they fall out of the `message_retention_duration` - * window. This must be true if you would like to - * - * Seek to a timestamp. - * - * @property {Object} messageRetentionDuration - * How long to retain unacknowledged messages in the subscription's backlog, - * from the moment a message is published. - * If `retain_acked_messages` is true, then this also configures the retention - * of acknowledged messages, and thus configures how far back in time a `Seek` - * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - * minutes. - * - * This object should have the same structure as [Duration]{@link google.protobuf.Duration} - * - * @property {Object.} labels - * See Creating and - * managing labels. - * - * @property {boolean} enableMessageOrdering - * If true, messages published with the same `ordering_key` in `PubsubMessage` - * will be delivered to the subscribers in the order in which they - * are received by the Pub/Sub system. Otherwise, they may be delivered in - * any order. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. - * - * @property {Object} expirationPolicy - * A policy that specifies the conditions for this subscription's expiration. - * A subscription is considered active as long as any connected subscriber is - * successfully consuming messages from the subscription or is issuing - * operations on the subscription. If `expiration_policy` is not set, a - * *default policy* with `ttl` of 31 days will be used. The minimum allowed - * value for `expiration_policy.ttl` is 1 day. - * - * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} - * - * @property {Object} deadLetterPolicy - * A policy that specifies the conditions for dead lettering messages in - * this subscription. If dead_letter_policy is not set, dead lettering - * is disabled. - * - * The Cloud Pub/Sub service account associated with this subscriptions's - * parent project (i.e., - * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have - * permission to Acknowledge() messages on this subscription. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. - * - * This object should have the same structure as [DeadLetterPolicy]{@link google.pubsub.v1.DeadLetterPolicy} - * - * @typedef Subscription - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.Subscription definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const Subscription = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Dead lettering is done on a best effort basis. The same message might be - * dead lettered multiple times. - * - * If validation on any of the fields fails at subscription creation/updation, - * the create/update subscription request will fail. - * - * @property {string} deadLetterTopic - * The name of the topic to which dead letter messages should be published. - * Format is `projects/{project}/topics/{topic}`.The Cloud Pub/Sub service - * account associated with the enclosing subscription's parent project (i.e., - * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have - * permission to Publish() to this topic. - * - * The operation will fail if the topic does not exist. - * Users should ensure that there is a subscription attached to this topic - * since messages published to a topic with no subscriptions are lost. - * - * @property {number} maxDeliveryAttempts - * The maximum number of delivery attempts for any message. The value must be - * between 5 and 100. - * - * The number of delivery attempts is defined as 1 + (the sum of number of - * NACKs and number of times the acknowledgement deadline has been exceeded - * for the message). - * - * A NACK is any call to ModifyAckDeadline with a 0 deadline. Note that - * client libraries may automatically extend ack_deadlines. - * - * This field will be honored on a best effort basis. - * - * If this parameter is 0, a default value of 5 is used. - * - * @typedef DeadLetterPolicy - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.DeadLetterPolicy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const DeadLetterPolicy = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A policy that specifies the conditions for resource expiration (i.e., - * automatic resource deletion). - * - * @property {Object} ttl - * Specifies the "time-to-live" duration for an associated resource. The - * resource expires if it is not active for a period of `ttl`. The definition - * of "activity" depends on the type of the associated resource. The minimum - * and maximum allowed values for `ttl` depend on the type of the associated - * resource, as well. If `ttl` is not set, the associated resource never - * expires. - * - * This object should have the same structure as [Duration]{@link google.protobuf.Duration} - * - * @typedef ExpirationPolicy - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ExpirationPolicy definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ExpirationPolicy = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Configuration for a push delivery endpoint. - * - * @property {string} pushEndpoint - * A URL locating the endpoint to which messages should be pushed. - * For example, a Webhook endpoint might use "https://example.com/push". - * - * @property {Object.} attributes - * Endpoint configuration attributes that can be used to control different - * aspects of the message delivery. - * - * The only currently supported attribute is `x-goog-version`, which you can - * use to change the format of the pushed message. This attribute - * indicates the version of the data expected by the endpoint. This - * controls the shape of the pushed message (i.e., its fields and metadata). - * - * If not present during the `CreateSubscription` call, it will default to - * the version of the Pub/Sub API used to make such call. If not present in a - * `ModifyPushConfig` call, its value will not be changed. `GetSubscription` - * calls will always return a valid version, even if the subscription was - * created without this attribute. - * - * The only supported values for the `x-goog-version` attribute are: - * - * * `v1beta1`: uses the push format defined in the v1beta1 Pub/Sub API. - * * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. - * - * For example: - * 
attributes { "x-goog-version": "v1" }
- * - * @property {Object} oidcToken - * If specified, Pub/Sub will generate and attach an OIDC JWT token as an - * `Authorization` header in the HTTP request for every pushed message. - * - * This object should have the same structure as [OidcToken]{@link google.pubsub.v1.OidcToken} - * - * @typedef PushConfig - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.PushConfig definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const PushConfig = { - // This is for documentation. Actual contents will be loaded by gRPC. - - /** - * Contains information needed for generating an - * [OpenID Connect - * token](https://developers.google.com/identity/protocols/OpenIDConnect). - * - * @property {string} serviceAccountEmail - * [Service account - * email](https://cloud.google.com/iam/docs/service-accounts) - * to be used for generating the OIDC token. The caller (for - * CreateSubscription, UpdateSubscription, and ModifyPushConfig RPCs) must - * have the iam.serviceAccounts.actAs permission for the service account. - * - * @property {string} audience - * Audience to be used when generating OIDC token. The audience claim - * identifies the recipients that the JWT is intended for. The audience - * value is a single case-sensitive string. Having multiple values (array) - * for the audience field is not supported. More info about the OIDC JWT - * token audience here: https://tools.ietf.org/html/rfc7519#section-4.1.3 - * Note: if not specified, the Push endpoint URL will be used. - * - * @typedef OidcToken - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.PushConfig.OidcToken definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ - OidcToken: { - // This is for documentation. Actual contents will be loaded by gRPC. - } -}; - -/** - * A message and its corresponding acknowledgment ID. - * - * @property {string} ackId - * This ID can be used to acknowledge the received message. - * - * @property {Object} message - * The message. - * - * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} - * - * @property {number} deliveryAttempt - * Delivery attempt counter is 1 + (the sum of number of NACKs and number of - * ack_deadline exceeds) for this message. - * - * A NACK is any call to ModifyAckDeadline with a 0 deadline. An ack_deadline - * exceeds event is whenever a message is not acknowledged within - * ack_deadline. Note that ack_deadline is initially - * Subscription.ackDeadlineSeconds, but may get extended automatically by - * the client library. - * - * The first delivery of a given message will have this value as 1. The value - * is calculated at best effort and is approximate. - * - * If a DeadLetterPolicy is not set on the subscription, this will be 0. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. - * - * @typedef ReceivedMessage - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ReceivedMessage definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ReceivedMessage = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the GetSubscription method. - * - * @property {string} subscription - * Required. The name of the subscription to get. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @typedef GetSubscriptionRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.GetSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const GetSubscriptionRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the UpdateSubscription method. - * - * @property {Object} subscription - * Required. The updated subscription object. - * - * This object should have the same structure as [Subscription]{@link google.pubsub.v1.Subscription} - * - * @property {Object} updateMask - * Required. Indicates which fields in the provided subscription to update. - * Must be specified and non-empty. - * - * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} - * - * @typedef UpdateSubscriptionRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.UpdateSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const UpdateSubscriptionRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListSubscriptions` method. - * - * @property {string} project - * Required. The name of the project in which to list subscriptions. - * Format is `projects/{project-id}`. - * - * @property {number} pageSize - * Maximum number of subscriptions to return. - * - * @property {string} pageToken - * The value returned by the last `ListSubscriptionsResponse`; indicates that - * this is a continuation of a prior `ListSubscriptions` call, and that the - * system should return the next page of data. - * - * @typedef ListSubscriptionsRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListSubscriptionsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListSubscriptionsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListSubscriptions` method. - * - * @property {Object[]} subscriptions - * The subscriptions that match the request. - * - * This object should have the same structure as [Subscription]{@link google.pubsub.v1.Subscription} - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more subscriptions that match - * the request; this value should be passed in a new - * `ListSubscriptionsRequest` to get more subscriptions. - * - * @typedef ListSubscriptionsResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListSubscriptionsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListSubscriptionsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the DeleteSubscription method. - * - * @property {string} subscription - * Required. The subscription to delete. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @typedef DeleteSubscriptionRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.DeleteSubscriptionRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const DeleteSubscriptionRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the ModifyPushConfig method. - * - * @property {string} subscription - * Required. The name of the subscription. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {Object} pushConfig - * Required. The push configuration for future deliveries. - * - * An empty `pushConfig` indicates that the Pub/Sub system should - * stop pushing messages from the given subscription and allow - * messages to be pulled and acknowledged - effectively pausing - * the subscription if `Pull` or `StreamingPull` is not called. - * - * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} - * - * @typedef ModifyPushConfigRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ModifyPushConfigRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ModifyPushConfigRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `Pull` method. - * - * @property {string} subscription - * Required. The subscription from which messages should be pulled. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {boolean} returnImmediately - * Optional. If this field set to true, the system will respond immediately - * even if it there are no messages available to return in the `Pull` - * response. Otherwise, the system may wait (for a bounded amount of time) - * until at least one message is available, rather than returning no messages. - * Warning: setting this field to `true` is discouraged because it adversely - * impacts the performance of `Pull` operations. We recommend that users do - * not set this field. - * - * @property {number} maxMessages - * Required. The maximum number of messages to return for this request. Must - * be a positive integer. The Pub/Sub system may return fewer than the number - * specified. - * - * @typedef PullRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.PullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const PullRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `Pull` method. - * - * @property {Object[]} receivedMessages - * Received Pub/Sub messages. The list will be empty if there are no more - * messages available in the backlog. For JSON, the response can be entirely - * empty. The Pub/Sub system may return fewer than the `maxMessages` requested - * even if there are more messages available in the backlog. - * - * This object should have the same structure as [ReceivedMessage]{@link google.pubsub.v1.ReceivedMessage} - * - * @typedef PullResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.PullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const PullResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the ModifyAckDeadline method. - * - * @property {string} subscription - * Required. The name of the subscription. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {string[]} ackIds - * Required. List of acknowledgment IDs. - * - * @property {number} ackDeadlineSeconds - * Required. The new ack deadline with respect to the time this request was - * sent to the Pub/Sub system. For example, if the value is 10, the new ack - * deadline will expire 10 seconds after the `ModifyAckDeadline` call was - * made. Specifying zero might immediately make the message available for - * delivery to another subscriber client. This typically results in an - * increase in the rate of message redeliveries (that is, duplicates). - * The minimum deadline you can specify is 0 seconds. - * The maximum deadline you can specify is 600 seconds (10 minutes). - * - * @typedef ModifyAckDeadlineRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ModifyAckDeadlineRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ModifyAckDeadlineRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the Acknowledge method. - * - * @property {string} subscription - * Required. The subscription whose message is being acknowledged. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {string[]} ackIds - * Required. The acknowledgment ID for the messages being acknowledged that - * was returned by the Pub/Sub system in the `Pull` response. Must not be - * empty. - * - * @typedef AcknowledgeRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.AcknowledgeRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const AcknowledgeRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `StreamingPull` streaming RPC method. This request is used to - * establish the initial stream as well as to stream acknowledgements and ack - * deadline modifications from the client to the server. - * - * @property {string} subscription - * Required. The subscription for which to initialize the new stream. This - * must be provided in the first request on the stream, and must not be set in - * subsequent requests from client to server. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {string[]} ackIds - * List of acknowledgement IDs for acknowledging previously received messages - * (received on this stream or a different stream). If an ack ID has expired, - * the corresponding message may be redelivered later. Acknowledging a message - * more than once will not result in an error. If the acknowledgement ID is - * malformed, the stream will be aborted with status `INVALID_ARGUMENT`. - * - * @property {number[]} modifyDeadlineSeconds - * The list of new ack deadlines for the IDs listed in - * `modify_deadline_ack_ids`. The size of this list must be the same as the - * size of `modify_deadline_ack_ids`. If it differs the stream will be aborted - * with `INVALID_ARGUMENT`. Each element in this list is applied to the - * element in the same position in `modify_deadline_ack_ids`. The new ack - * deadline is with respect to the time this request was sent to the Pub/Sub - * system. Must be >= 0. For example, if the value is 10, the new ack deadline - * will expire 10 seconds after this request is received. If the value is 0, - * the message is immediately made available for another streaming or - * non-streaming pull request. If the value is < 0 (an error), the stream will - * be aborted with status `INVALID_ARGUMENT`. - * - * @property {string[]} modifyDeadlineAckIds - * List of acknowledgement IDs whose deadline will be modified based on the - * corresponding element in `modify_deadline_seconds`. This field can be used - * to indicate that more time is needed to process a message by the - * subscriber, or to make the message available for redelivery if the - * processing was interrupted. - * - * @property {number} streamAckDeadlineSeconds - * Required. The ack deadline to use for the stream. This must be provided in - * the first request on the stream, but it can also be updated on subsequent - * requests from client to server. The minimum deadline you can specify is 10 - * seconds. The maximum deadline you can specify is 600 seconds (10 minutes). - * - * @property {string} clientId - * A unique identifier that is used to distinguish client instances from each - * other. Only needs to be provided on the initial request. When a stream - * disconnects and reconnects for the same stream, the client_id should be set - * to the same value so that state associated with the old stream can be - * transferred to the new stream. The same client_id should not be used for - * different client instances. - * - * @typedef StreamingPullRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.StreamingPullRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const StreamingPullRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `StreamingPull` method. This response is used to stream - * messages from the server to the client. - * - * @property {Object[]} receivedMessages - * Received Pub/Sub messages. This will not be empty. - * - * This object should have the same structure as [ReceivedMessage]{@link google.pubsub.v1.ReceivedMessage} - * - * @typedef StreamingPullResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.StreamingPullResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const StreamingPullResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `CreateSnapshot` method. - * - * @property {string} name - * Required. User-provided name for this snapshot. If the name is not provided - * in the request, the server will assign a random name for this snapshot on - * the same project as the subscription. Note that for REST API requests, you - * must specify a name. See the resource - * name rules. Format is `projects/{project}/snapshots/{snap}`. - * - * @property {string} subscription - * Required. The subscription whose backlog the snapshot retains. - * Specifically, the created snapshot is guaranteed to retain: - * (a) The existing backlog on the subscription. More precisely, this is - * defined as the messages in the subscription's backlog that are - * unacknowledged upon the successful completion of the - * `CreateSnapshot` request; as well as: - * (b) Any messages published to the subscription's topic following the - * successful completion of the CreateSnapshot request. - * Format is `projects/{project}/subscriptions/{sub}`. - * - * @property {Object.} labels - * See Creating and - * managing labels. - * - * @typedef CreateSnapshotRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.CreateSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const CreateSnapshotRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the UpdateSnapshot method. - * - * @property {Object} snapshot - * Required. The updated snapshot object. - * - * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} - * - * @property {Object} updateMask - * Required. Indicates which fields in the provided snapshot to update. - * Must be specified and non-empty. - * - * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} - * - * @typedef UpdateSnapshotRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.UpdateSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const UpdateSnapshotRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * A snapshot resource. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. - * - * @property {string} name - * The name of the snapshot. - * - * @property {string} topic - * The name of the topic from which this snapshot is retaining messages. - * - * @property {Object} expireTime - * The snapshot is guaranteed to exist up until this time. - * A newly-created snapshot expires no later than 7 days from the time of its - * creation. Its exact lifetime is determined at creation by the existing - * backlog in the source subscription. Specifically, the lifetime of the - * snapshot is `7 days - (age of oldest unacked message in the subscription)`. - * For example, consider a subscription whose oldest unacked message is 3 days - * old. If a snapshot is created from this subscription, the snapshot -- which - * will always capture this 3-day-old backlog as long as the snapshot - * exists -- will expire in 4 days. The service will refuse to create a - * snapshot that would expire in less than 1 hour after creation. - * - * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} - * - * @property {Object.} labels - * See Creating and - * managing labels. - * - * @typedef Snapshot - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.Snapshot definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const Snapshot = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the GetSnapshot method. - * - * @property {string} snapshot - * Required. The name of the snapshot to get. - * Format is `projects/{project}/snapshots/{snap}`. - * - * @typedef GetSnapshotRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.GetSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const GetSnapshotRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `ListSnapshots` method. - * - * @property {string} project - * Required. The name of the project in which to list snapshots. - * Format is `projects/{project-id}`. - * - * @property {number} pageSize - * Maximum number of snapshots to return. - * - * @property {string} pageToken - * The value returned by the last `ListSnapshotsResponse`; indicates that this - * is a continuation of a prior `ListSnapshots` call, and that the system - * should return the next page of data. - * - * @typedef ListSnapshotsRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListSnapshotsRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListSnapshotsRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `ListSnapshots` method. - * - * @property {Object[]} snapshots - * The resulting snapshots. - * - * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} - * - * @property {string} nextPageToken - * If not empty, indicates that there may be more snapshot that match the - * request; this value should be passed in a new `ListSnapshotsRequest`. - * - * @typedef ListSnapshotsResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.ListSnapshotsResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const ListSnapshotsResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `DeleteSnapshot` method. - * - * @property {string} snapshot - * Required. The name of the snapshot to delete. - * Format is `projects/{project}/snapshots/{snap}`. - * - * @typedef DeleteSnapshotRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.DeleteSnapshotRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const DeleteSnapshotRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Request for the `Seek` method. - * - * @property {string} subscription - * Required. The subscription to affect. - * - * @property {Object} time - * The time to seek to. - * Messages retained in the subscription that were published before this - * time are marked as acknowledged, and messages retained in the - * subscription that were published after this time are marked as - * unacknowledged. Note that this operation affects only those messages - * retained in the subscription (configured by the combination of - * `message_retention_duration` and `retain_acked_messages`). For example, - * if `time` corresponds to a point before the message retention - * window (or to a point before the system's notion of the subscription - * creation time), only retained messages will be marked as unacknowledged, - * and already-expunged messages will not be restored. - * - * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} - * - * @property {string} snapshot - * The snapshot to seek to. The snapshot's topic must be the same as that of - * the provided subscription. - * Format is `projects/{project}/snapshots/{snap}`. - * - * @typedef SeekRequest - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.SeekRequest definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const SeekRequest = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; - -/** - * Response for the `Seek` method (this response is empty). - * @typedef SeekResponse - * @memberof google.pubsub.v1 - * @see [google.pubsub.v1.SeekResponse definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/pubsub/v1/pubsub.proto} - */ -const SeekResponse = { - // This is for documentation. Actual contents will be loaded by gRPC. -}; \ No newline at end of file diff --git a/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js b/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js deleted file mode 100644 index 32288959104..00000000000 --- a/handwritten/pubsub/src/v1/doc/google/type/doc_expr.js +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. diff --git a/handwritten/pubsub/src/v1/index.js b/handwritten/pubsub/src/v1/index.js deleted file mode 100644 index d27ad5a6214..00000000000 --- a/handwritten/pubsub/src/v1/index.js +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -'use strict'; - -const PublisherClient = require('./publisher_client'); -const SubscriberClient = require('./subscriber_client'); - -module.exports.PublisherClient = PublisherClient; -module.exports.SubscriberClient = SubscriberClient; diff --git a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js b/handwritten/pubsub/src/v1/index.ts similarity index 65% rename from handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js rename to handwritten/pubsub/src/v1/index.ts index 32288959104..e2984775c7b 100644 --- a/handwritten/pubsub/src/v1/doc/google/iam/v1/doc_options.js +++ b/handwritten/pubsub/src/v1/index.ts @@ -11,6 +11,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** -// Note: this file is purely for documentation. Any contents are not expected -// to be loaded as the JS file. +export {PublisherClient} from './publisher_client'; +export {SubscriberClient} from './subscriber_client'; diff --git a/handwritten/pubsub/src/v1/publisher_client.js b/handwritten/pubsub/src/v1/publisher_client.js deleted file mode 100644 index 4410aa5ccc5..00000000000 --- a/handwritten/pubsub/src/v1/publisher_client.js +++ /dev/null @@ -1,1221 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -'use strict'; - -const gapicConfig = require('./publisher_client_config.json'); -const gax = require('google-gax'); -const path = require('path'); - -const VERSION = require('../../../package.json').version; - -/** - * The service that an application uses to manipulate topics, and to send - * messages to a topic. - * - * @class - * @memberof v1 - */ -class PublisherClient { - /** - * Construct an instance of PublisherClient. - * - * @param {object} [options] - The configuration object. See the subsequent - * parameters for more details. - * @param {object} [options.credentials] - Credentials object. - * @param {string} [options.credentials.client_email] - * @param {string} [options.credentials.private_key] - * @param {string} [options.email] - Account email address. Required when - * using a .pem or .p12 keyFilename. - * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or - * .p12 key downloaded from the Google Developers Console. If you provide - * a path to a JSON file, the projectId option below is not necessary. - * NOTE: .pem and .p12 require you to specify options.email as well. - * @param {number} [options.port] - The port on which to connect to - * the remote host. - * @param {string} [options.projectId] - The project ID from the Google - * Developer's Console, e.g. 'grape-spaceship-123'. We will also check - * the environment variable GCLOUD_PROJECT for your project ID. If your - * app is running in an environment which supports - * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, - * your project ID will be detected automatically. - * @param {function} [options.promise] - Custom promise module to use instead - * of native Promises. - * @param {string} [options.apiEndpoint] - The domain name of the - * API remote host. - */ - constructor(opts) { - opts = opts || {}; - this._descriptors = {}; - - if (global.isBrowser) { - // If we're in browser, we use gRPC fallback. - opts.fallback = true; - } - - // If we are in browser, we are already using fallback because of the - // "browser" field in package.json. - // But if we were explicitly requested to use fallback, let's do it now. - const gaxModule = !global.isBrowser && opts.fallback ? gax.fallback : gax; - - const servicePath = - opts.servicePath || opts.apiEndpoint || this.constructor.servicePath; - - // Ensure that options include the service address and port. - opts = Object.assign( - { - clientConfig: {}, - port: this.constructor.port, - servicePath, - }, - opts - ); - - // Create a `gaxGrpc` object, with any grpc-specific options - // sent to the client. - opts.scopes = this.constructor.scopes; - const gaxGrpc = new gaxModule.GrpcClient(opts); - - // Save the auth object to the client, for use by other methods. - this.auth = gaxGrpc.auth; - - // Determine the client header string. - const clientHeader = []; - - if (typeof process !== 'undefined' && 'versions' in process) { - clientHeader.push(`gl-node/${process.versions.node}`); - } - clientHeader.push(`gax/${gaxModule.version}`); - if (opts.fallback) { - clientHeader.push(`gl-web/${gaxModule.version}`); - } else { - clientHeader.push(`grpc/${gaxGrpc.grpcVersion}`); - } - clientHeader.push(`gapic/${VERSION}`); - if (opts.libName && opts.libVersion) { - clientHeader.push(`${opts.libName}/${opts.libVersion}`); - } - - // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - const protos = gaxGrpc.loadProto( - opts.fallback ? require('../../protos/protos.json') : nodejsProtoPath - ); - - // This API contains "path templates"; forward-slash-separated - // identifiers to uniquely identify resources within the API. - // Create useful helper objects for these. - this._pathTemplates = { - projectPathTemplate: new gaxModule.PathTemplate('projects/{project}'), - topicPathTemplate: new gaxModule.PathTemplate( - 'projects/{project}/topics/{topic}' - ), - }; - - // Some of the methods on this service return "paged" results, - // (e.g. 50 results at a time, with tokens to get subsequent - // pages). Denote the keys used for pagination and results. - this._descriptors.page = { - listTopics: new gaxModule.PageDescriptor( - 'pageToken', - 'nextPageToken', - 'topics' - ), - listTopicSubscriptions: new gaxModule.PageDescriptor( - 'pageToken', - 'nextPageToken', - 'subscriptions' - ), - }; - - const protoFilesRoot = opts.fallback - ? gaxModule.protobuf.Root.fromJSON(require('../../protos/protos.json')) - : gaxModule.protobuf.loadSync(nodejsProtoPath); - - // Some methods on this API support automatically batching - // requests; denote this. - this._descriptors.batching = { - publish: new gaxModule.BundleDescriptor( - 'messages', - ['topic'], - 'messageIds', - gax.createByteLengthFunction( - protoFilesRoot.lookup('google.pubsub.v1.PubsubMessage') - ) - ), - }; - - // Put together the default options sent with requests. - const defaults = gaxGrpc.constructSettings( - 'google.pubsub.v1.Publisher', - gapicConfig, - opts.clientConfig, - {'x-goog-api-client': clientHeader.join(' ')} - ); - - // Set up a dictionary of "inner API calls"; the core implementation - // of calling the API is handled in `google-gax`, with this code - // merely providing the destination and request information. - this._innerApiCalls = {}; - - // Put together the "service stub" for - // google.iam.v1.IAMPolicy. - const iamPolicyStub = gaxGrpc.createStub( - opts.fallback - ? protos.lookupService('google.iam.v1.IAMPolicy') - : protos.google.iam.v1.IAMPolicy, - opts - ); - - // Iterate over each of the methods that the service provides - // and create an API call method for each. - const iamPolicyStubMethods = [ - 'setIamPolicy', - 'getIamPolicy', - 'testIamPermissions', - ]; - for (const methodName of iamPolicyStubMethods) { - const innerCallPromise = iamPolicyStub.then( - stub => (...args) => { - return stub[methodName].apply(stub, args); - }, - err => () => { - throw err; - } - ); - this._innerApiCalls[methodName] = gaxModule.createApiCall( - innerCallPromise, - defaults[methodName], - this._descriptors.page[methodName] || - this._descriptors.batching[methodName] - ); - } - - // Put together the "service stub" for - // google.pubsub.v1.Publisher. - const publisherStub = gaxGrpc.createStub( - opts.fallback - ? protos.lookupService('google.pubsub.v1.Publisher') - : protos.google.pubsub.v1.Publisher, - opts - ); - - // Iterate over each of the methods that the service provides - // and create an API call method for each. - // note: editing generated code - this.publisherStub = publisherStub; - const publisherStubMethods = [ - 'createTopic', - 'updateTopic', - 'publish', - 'getTopic', - 'listTopics', - 'listTopicSubscriptions', - 'deleteTopic', - ]; - for (const methodName of publisherStubMethods) { - const innerCallPromise = publisherStub.then( - stub => (...args) => { - return stub[methodName].apply(stub, args); - }, - err => () => { - throw err; - } - ); - this._innerApiCalls[methodName] = gaxModule.createApiCall( - innerCallPromise, - defaults[methodName], - this._descriptors.page[methodName] || - this._descriptors.batching[methodName] - ); - } - } - - /** - * The DNS address for this API service. - */ - static get servicePath() { - return 'pubsub.googleapis.com'; - } - - /** - * The DNS address for this API service - same as servicePath(), - * exists for compatibility reasons. - */ - static get apiEndpoint() { - return 'pubsub.googleapis.com'; - } - - /** - * The port for this API service. - */ - static get port() { - return 443; - } - - /** - * The scopes needed to make gRPC calls for every method defined - * in this service. - */ - static get scopes() { - return [ - 'https://www.googleapis.com/auth/cloud-platform', - 'https://www.googleapis.com/auth/pubsub', - ]; - } - - /** - * Return the project ID used by this class. - * @param {function(Error, string)} callback - the callback to - * be called with the current project Id. - */ - getProjectId(callback) { - return this.auth.getProjectId(callback); - } - - // ------------------- - // -- Service calls -- - // ------------------- - - /** - * Creates the given topic with the given name. See the - * - * resource name rules. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.name - * Required. The name of the topic. It must have the format - * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, - * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), - * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent - * signs (`%`). It must be between 3 and 255 characters in length, and it - * must not start with `"goog"`. - * @param {Object.} [request.labels] - * See Creating and - * managing labels. - * @param {Object} [request.messageStoragePolicy] - * Policy constraining the set of Google Cloud Platform regions where messages - * published to the topic may be stored. If not present, then no constraints - * are in effect. - * - * This object should have the same structure as [MessageStoragePolicy]{@link google.pubsub.v1.MessageStoragePolicy} - * @param {string} [request.kmsKeyName] - * The resource name of the Cloud KMS CryptoKey to be used to protect access - * to messages published on this topic. - * - * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - * client.createTopic({name: formattedName}) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - createTopic(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - name: request.name, - }); - - return this._innerApiCalls.createTopic(request, options, callback); - } - - /** - * Updates an existing topic. Note that certain properties of a - * topic are not modifiable. - * - * @param {Object} request - * The request object that will be sent. - * @param {Object} request.topic - * Required. The updated topic object. - * - * This object should have the same structure as [Topic]{@link google.pubsub.v1.Topic} - * @param {Object} request.updateMask - * Required. Indicates which fields in the provided topic to update. Must be - * specified and non-empty. Note that if `update_mask` contains - * "message_storage_policy" then the new value will be determined based on the - * policy configured at the project or organization level. The - * `message_storage_policy` must not be set in the `topic` provided above. - * - * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const topic = {}; - * const updateMask = {}; - * const request = { - * topic: topic, - * updateMask: updateMask, - * }; - * client.updateTopic(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - updateTopic(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - 'topic.name': request.topic.name, - }); - - return this._innerApiCalls.updateTopic(request, options, callback); - } - - /** - * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic - * does not exist. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. The messages in the request will be published on this topic. - * Format is `projects/{project}/topics/{topic}`. - * @param {Object[]} request.messages - * Required. The messages to publish. - * - * This object should have the same structure as [PubsubMessage]{@link google.pubsub.v1.PubsubMessage} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * const data = Buffer.from(''); - * const messagesElement = { - * data: data, - * }; - * const messages = [messagesElement]; - * const request = { - * topic: formattedTopic, - * messages: messages, - * }; - * client.publish(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - publish(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic, - }); - - return this._innerApiCalls.publish(request, options, callback); - } - - /** - * Gets the configuration of a topic. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. The name of the topic to get. - * Format is `projects/{project}/topics/{topic}`. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * client.getTopic({topic: formattedTopic}) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - getTopic(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic, - }); - - return this._innerApiCalls.getTopic(request, options, callback); - } - - /** - * Lists matching topics. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * Required. The name of the project in which to list topics. - * Format is `projects/{project-id}`. - * @param {number} [request.pageSize] - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is Array of [Topic]{@link google.pubsub.v1.Topic}. - * - * When autoPaginate: false is specified through options, it contains the result - * in a single response. If the response indicates the next page exists, the third - * parameter is set to be used for the next request object. The fourth parameter keeps - * the raw response object of an object representing [ListTopicsResponse]{@link google.pubsub.v1.ListTopicsResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Topic]{@link google.pubsub.v1.Topic}. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Topic]{@link google.pubsub.v1.Topic} in a single response. - * The second element is the next request object if the response - * indicates the next page exists, or null. The third element is - * an object representing [ListTopicsResponse]{@link google.pubsub.v1.ListTopicsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * // Iterate over all elements. - * const formattedProject = client.projectPath('[PROJECT]'); - * - * client.listTopics({project: formattedProject}) - * .then(responses => { - * const resources = responses[0]; - * for (const resource of resources) { - * // doThingsWith(resource) - * } - * }) - * .catch(err => { - * console.error(err); - * }); - * - * // Or obtain the paged response. - * const formattedProject = client.projectPath('[PROJECT]'); - * - * - * const options = {autoPaginate: false}; - * const callback = responses => { - * // The actual resources in a response. - * const resources = responses[0]; - * // The next request if the response shows that there are more responses. - * const nextRequest = responses[1]; - * // The actual response object, if necessary. - * // const rawResponse = responses[2]; - * for (const resource of resources) { - * // doThingsWith(resource); - * } - * if (nextRequest) { - * // Fetch the next page. - * return client.listTopics(nextRequest, options).then(callback); - * } - * } - * client.listTopics({project: formattedProject}, options) - * .then(callback) - * .catch(err => { - * console.error(err); - * }); - */ - listTopics(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project, - }); - - return this._innerApiCalls.listTopics(request, options, callback); - } - - /** - * Equivalent to {@link listTopics}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopics} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * Required. The name of the project in which to list topics. - * Format is `projects/{project-id}`. - * @param {number} [request.pageSize] - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @returns {Stream} - * An object stream which emits an object representing [Topic]{@link google.pubsub.v1.Topic} on 'data' event. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedProject = client.projectPath('[PROJECT]'); - * client.listTopicsStream({project: formattedProject}) - * .on('data', element => { - * // doThingsWith(element) - * }).on('error', err => { - * console.log(err); - * }); - */ - listTopicsStream(request, options) { - options = options || {}; - - return this._descriptors.page.listTopics.createStream( - this._innerApiCalls.listTopics, - request, - options - ); - } - - /** - * Lists the names of the subscriptions on this topic. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. The name of the topic that subscriptions are attached to. - * Format is `projects/{project}/topics/{topic}`. - * @param {number} [request.pageSize] - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is Array of string. - * - * When autoPaginate: false is specified through options, it contains the result - * in a single response. If the response indicates the next page exists, the third - * parameter is set to be used for the next request object. The fourth parameter keeps - * the raw response object of an object representing [ListTopicSubscriptionsResponse]{@link google.pubsub.v1.ListTopicSubscriptionsResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of string. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of string in a single response. - * The second element is the next request object if the response - * indicates the next page exists, or null. The third element is - * an object representing [ListTopicSubscriptionsResponse]{@link google.pubsub.v1.ListTopicSubscriptionsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * // Iterate over all elements. - * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * - * client.listTopicSubscriptions({topic: formattedTopic}) - * .then(responses => { - * const resources = responses[0]; - * for (const resource of resources) { - * // doThingsWith(resource) - * } - * }) - * .catch(err => { - * console.error(err); - * }); - * - * // Or obtain the paged response. - * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * - * - * const options = {autoPaginate: false}; - * const callback = responses => { - * // The actual resources in a response. - * const resources = responses[0]; - * // The next request if the response shows that there are more responses. - * const nextRequest = responses[1]; - * // The actual response object, if necessary. - * // const rawResponse = responses[2]; - * for (const resource of resources) { - * // doThingsWith(resource); - * } - * if (nextRequest) { - * // Fetch the next page. - * return client.listTopicSubscriptions(nextRequest, options).then(callback); - * } - * } - * client.listTopicSubscriptions({topic: formattedTopic}, options) - * .then(callback) - * .catch(err => { - * console.error(err); - * }); - */ - listTopicSubscriptions(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic, - }); - - return this._innerApiCalls.listTopicSubscriptions( - request, - options, - callback - ); - } - - /** - * Equivalent to {@link listTopicSubscriptions}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopicSubscriptions} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. The name of the topic that subscriptions are attached to. - * Format is `projects/{project}/topics/{topic}`. - * @param {number} [request.pageSize] - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @returns {Stream} - * An object stream which emits a string on 'data' event. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * client.listTopicSubscriptionsStream({topic: formattedTopic}) - * .on('data', element => { - * // doThingsWith(element) - * }).on('error', err => { - * console.log(err); - * }); - */ - listTopicSubscriptionsStream(request, options) { - options = options || {}; - - return this._descriptors.page.listTopicSubscriptions.createStream( - this._innerApiCalls.listTopicSubscriptions, - request, - options - ); - } - - /** - * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic - * does not exist. After a topic is deleted, a new topic may be created with - * the same name; this is an entirely new topic with none of the old - * configuration or subscriptions. Existing subscriptions to this topic are - * not deleted, but their `topic` field is set to `_deleted-topic_`. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. Name of the topic to delete. - * Format is `projects/{project}/topics/{topic}`. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error)} [callback] - * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * client.deleteTopic({topic: formattedTopic}).catch(err => { - * console.error(err); - * }); - */ - deleteTopic(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic, - }); - - return this._innerApiCalls.deleteTopic(request, options, callback); - } - - /** - * Sets the access control policy on the specified resource. Replaces - * any existing policy. - * - * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and - * PERMISSION_DENIED - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy is being specified. - * See the operation documentation for the appropriate value for this field. - * @param {Object} request.policy - * REQUIRED: The complete policy to be applied to the `resource`. The size of - * the policy is limited to a few 10s of KB. An empty policy is a - * valid policy but certain Cloud Platform services (such as Projects) - * might reject them. - * - * This object should have the same structure as [Policy]{@link google.iam.v1.Policy} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - * const policy = {}; - * const request = { - * resource: formattedResource, - * policy: policy, - * }; - * client.setIamPolicy(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - setIamPolicy(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - - return this._innerApiCalls.setIamPolicy(request, options, callback); - } - - /** - * Gets the access control policy for a resource. Returns an empty policy - * if the resource exists and does not have a policy set. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy is being requested. - * See the operation documentation for the appropriate value for this field. - * @param {Object} [request.options] - * OPTIONAL: A `GetPolicyOptions` object for specifying options to - * `GetIamPolicy`. This field is only used by Cloud IAM. - * - * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - * client.getIamPolicy({resource: formattedResource}) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - getIamPolicy(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - - return this._innerApiCalls.getIamPolicy(request, options, callback); - } - - /** - * Returns permissions that a caller has on the specified resource. If the - * resource does not exist, this will return an empty set of - * permissions, not a NOT_FOUND error. - * - * Note: This operation is designed to be used for building - * permission-aware UIs and command-line tools, not for authorization - * checking. This operation may "fail open" without warning. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy detail is being requested. - * See the operation documentation for the appropriate value for this field. - * @param {string[]} request.permissions - * The set of permissions to check for the `resource`. Permissions with - * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.PublisherClient({ - * // optional auth parameters. - * }); - * - * const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - * const permissions = []; - * const request = { - * resource: formattedResource, - * permissions: permissions, - * }; - * client.testIamPermissions(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - testIamPermissions(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - - return this._innerApiCalls.testIamPermissions(request, options, callback); - } - - // -------------------- - // -- Path templates -- - // -------------------- - - /** - * Return a fully-qualified project resource name string. - * - * @param {String} project - * @returns {String} - */ - projectPath(project) { - return this._pathTemplates.projectPathTemplate.render({ - project: project, - }); - } - - /** - * Return a fully-qualified topic resource name string. - * - * @param {String} project - * @param {String} topic - * @returns {String} - */ - topicPath(project, topic) { - return this._pathTemplates.topicPathTemplate.render({ - project: project, - topic: topic, - }); - } - - /** - * Terminate the GRPC channel and close the client. - * note: editing generated code - * - * The client will no longer be usable and all future behavior is undefined. - */ - close() { - return this.publisherStub.then(stub => { - stub.close(); - }); - } - - /** - * Parse the projectName from a project resource. - * - * @param {String} projectName - * A fully-qualified path representing a project resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromProjectName(projectName) { - return this._pathTemplates.projectPathTemplate.match(projectName).project; - } - - /** - * Parse the topicName from a topic resource. - * - * @param {String} topicName - * A fully-qualified path representing a topic resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromTopicName(topicName) { - return this._pathTemplates.topicPathTemplate.match(topicName).project; - } - - /** - * Parse the topicName from a topic resource. - * - * @param {String} topicName - * A fully-qualified path representing a topic resources. - * @returns {String} - A string representing the topic. - */ - matchTopicFromTopicName(topicName) { - return this._pathTemplates.topicPathTemplate.match(topicName).topic; - } -} - -module.exports = PublisherClient; diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts new file mode 100644 index 00000000000..ac9132508cf --- /dev/null +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -0,0 +1,1583 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** + +import * as gax from 'google-gax'; +import { + Callback, + CallOptions, + Descriptors, + ClientOptions, + PaginationCallback, + GaxCall, +} from 'google-gax'; +import * as path from 'path'; + +import {Transform} from 'stream'; +import {RequestType} from 'google-gax/build/src/apitypes'; +import * as protos from '../../protos/protos'; +import * as gapicConfig from './publisher_client_config.json'; +import {IamClient} from '../helper'; + +const version = require('../../../package.json').version; + +/** + * The service that an application uses to manipulate topics, and to send + * messages to a topic. + * @class + * @memberof v1 + */ +export class PublisherClient { + private _terminated = false; + private _iamClient: IamClient; + private _opts: ClientOptions; + private _gaxModule: typeof gax | typeof gax.fallback; + private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; + private _protos: {}; + private _defaults: {[method: string]: gax.CallSettings}; + auth: gax.GoogleAuth; + descriptors: Descriptors = { + page: {}, + stream: {}, + longrunning: {}, + batching: {}, + }; + innerApiCalls: {[name: string]: Function}; + pathTemplates: {[name: string]: gax.PathTemplate}; + publisherStub?: Promise<{[name: string]: Function}>; + + /** + * Construct an instance of PublisherClient. + * + * @param {object} [options] - The configuration object. See the subsequent + * parameters for more details. + * @param {object} [options.credentials] - Credentials object. + * @param {string} [options.credentials.client_email] + * @param {string} [options.credentials.private_key] + * @param {string} [options.email] - Account email address. Required when + * using a .pem or .p12 keyFilename. + * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or + * .p12 key downloaded from the Google Developers Console. If you provide + * a path to a JSON file, the projectId option below is not necessary. + * NOTE: .pem and .p12 require you to specify options.email as well. + * @param {number} [options.port] - The port on which to connect to + * the remote host. + * @param {string} [options.projectId] - The project ID from the Google + * Developer's Console, e.g. 'grape-spaceship-123'. We will also check + * the environment variable GCLOUD_PROJECT for your project ID. If your + * app is running in an environment which supports + * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, + * your project ID will be detected automatically. + * @param {string} [options.apiEndpoint] - The domain name of the + * API remote host. + */ + + constructor(opts?: ClientOptions) { + // Ensure that options include the service address and port. + const staticMembers = this.constructor as typeof PublisherClient; + const servicePath = + opts && opts.servicePath + ? opts.servicePath + : opts && opts.apiEndpoint + ? opts.apiEndpoint + : staticMembers.servicePath; + const port = opts && opts.port ? opts.port : staticMembers.port; + + if (!opts) { + opts = {servicePath, port}; + } + opts.servicePath = opts.servicePath || servicePath; + opts.port = opts.port || port; + opts.clientConfig = opts.clientConfig || {}; + + const isBrowser = typeof window !== 'undefined'; + if (isBrowser) { + opts.fallback = true; + } + // If we are in browser, we are already using fallback because of the + // "browser" field in package.json. + // But if we were explicitly requested to use fallback, let's do it now. + this._gaxModule = !isBrowser && opts.fallback ? gax.fallback : gax; + + // Create a `gaxGrpc` object, with any grpc-specific options + // sent to the client. + opts.scopes = (this.constructor as typeof PublisherClient).scopes; + this._gaxGrpc = new this._gaxModule.GrpcClient(opts); + + // Save options to use in initialize() method. + this._opts = opts; + + // Save the auth object to the client, for use by other methods. + this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + + this._iamClient = new IamClient(opts); + // Determine the client header string. + const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; + if (typeof process !== 'undefined' && 'versions' in process) { + clientHeader.push(`gl-node/${process.versions.node}`); + } else { + clientHeader.push(`gl-web/${this._gaxModule.version}`); + } + if (!opts.fallback) { + clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } + if (opts.libName && opts.libVersion) { + clientHeader.push(`${opts.libName}/${opts.libVersion}`); + } + // Load the applicable protos. + // For Node.js, pass the path to JSON proto file. + // For browsers, pass the JSON content. + + const nodejsProtoPath = path.join( + __dirname, + '..', + '..', + 'protos', + 'protos.json' + ); + this._protos = this._gaxGrpc.loadProto( + opts.fallback + ? // eslint-disable-next-line @typescript-eslint/no-var-requires + require('../../protos/protos.json') + : nodejsProtoPath + ); + + // This API contains "path templates"; forward-slash-separated + // identifiers to uniquely identify resources within the API. + // Create useful helper objects for these. + this.pathTemplates = { + projectPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}' + ), + projectTopicPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/topics/{topic}' + ), + snapshotPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/snapshots/{snapshot}' + ), + subscriptionPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/subscriptions/{subscription}' + ), + }; + + // Some of the methods on this service return "paged" results, + // (e.g. 50 results at a time, with tokens to get subsequent + // pages). Denote the keys used for pagination and results. + this.descriptors.page = { + listTopics: new this._gaxModule.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'topics' + ), + listTopicSubscriptions: new this._gaxModule.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'subscriptions' + ), + listTopicSnapshots: new this._gaxModule.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'snapshots' + ), + }; + + // This API contains "long-running operations", which return a + // an Operation object that allows for tracking of the operation, + // rather than holding a request open. + const protoFilesRoot = opts.fallback + ? this._gaxModule.protobuf.Root.fromJSON( + // eslint-disable-next-line @typescript-eslint/no-var-requires + require('../../protos/protos.json') + ) + : this._gaxModule.protobuf.loadSync(nodejsProtoPath); + + // Some methods on this API support automatically batching + // requests; denote this. + + this.descriptors.batching = { + Publish: new this._gaxModule.BundleDescriptor( + 'messages', + ['topic'], + 'message_ids', + gax.createByteLengthFunction( + // tslint:disable-next-line no-any + protoFilesRoot.lookupType('google.pubsub.v1.PubsubMessage') as any + ) + ), + }; + + // Put together the default options sent with requests. + this._defaults = this._gaxGrpc.constructSettings( + 'google.pubsub.v1.Publisher', + gapicConfig as gax.ClientConfig, + opts.clientConfig || {}, + {'x-goog-api-client': clientHeader.join(' ')} + ); + + // Set up a dictionary of "inner API calls"; the core implementation + // of calling the API is handled in `google-gax`, with this code + // merely providing the destination and request information. + this.innerApiCalls = {}; + } + + /** + * Initialize the client. + * Performs asynchronous operations (such as authentication) and prepares the client. + * This function will be called automatically when any class method is called for the + * first time, but if you need to initialize it before calling an actual method, + * feel free to call initialize() directly. + * + * You can await on this method if you want to make sure the client is initialized. + * + * @returns {Promise} A promise that resolves to an authenticated service stub. + */ + initialize() { + // If the client stub promise is already initialized, return immediately. + if (this.publisherStub) { + return this.publisherStub; + } + + // Put together the "service stub" for + // google.pubsub.v1.Publisher. + this.publisherStub = this._gaxGrpc.createStub( + this._opts.fallback + ? (this._protos as protobuf.Root).lookupService( + 'google.pubsub.v1.Publisher' + ) + : // tslint:disable-next-line no-any + (this._protos as any).google.pubsub.v1.Publisher, + this._opts + ) as Promise<{[method: string]: Function}>; + + // Iterate over each of the methods that the service provides + // and create an API call method for each. + const publisherStubMethods = [ + 'createTopic', + 'updateTopic', + 'publish', + 'getTopic', + 'listTopics', + 'listTopicSubscriptions', + 'listTopicSnapshots', + 'deleteTopic', + ]; + for (const methodName of publisherStubMethods) { + const callPromise = this.publisherStub.then( + stub => (...args: Array<{}>) => { + if (this._terminated) { + return Promise.reject('The client has already been closed.'); + } + const func = stub[methodName]; + return func.apply(stub, args); + }, + (err: Error | null | undefined) => () => { + throw err; + } + ); + + const apiCall = this._gaxModule.createApiCall( + callPromise, + this._defaults[methodName], + this.descriptors.page[methodName] || + this.descriptors.stream[methodName] || + this.descriptors.longrunning[methodName] + ); + + this.innerApiCalls[methodName] = apiCall; + } + + return this.publisherStub; + } + + /** + * The DNS address for this API service. + */ + static get servicePath() { + return 'pubsub.googleapis.com'; + } + + /** + * The DNS address for this API service - same as servicePath(), + * exists for compatibility reasons. + */ + static get apiEndpoint() { + return 'pubsub.googleapis.com'; + } + + /** + * The port for this API service. + */ + static get port() { + return 443; + } + + /** + * The scopes needed to make gRPC calls for every method defined + * in this service. + */ + static get scopes() { + return [ + 'https://www.googleapis.com/auth/cloud-platform', + 'https://www.googleapis.com/auth/pubsub', + ]; + } + + getProjectId(): Promise; + getProjectId(callback: Callback): void; + /** + * Return the project ID used by this class. + * @param {function(Error, string)} callback - the callback to + * be called with the current project Id. + */ + getProjectId( + callback?: Callback + ): Promise | void { + if (callback) { + this.auth.getProjectId(callback); + return; + } + return this.auth.getProjectId(); + } + + // ------------------- + // -- Service calls -- + // ------------------- + createTopic( + request: protos.google.pubsub.v1.ITopic, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | undefined, + {} | undefined + ] + >; + createTopic( + request: protos.google.pubsub.v1.ITopic, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | null | undefined, + {} | null | undefined + > + ): void; + createTopic( + request: protos.google.pubsub.v1.ITopic, + callback: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | null | undefined, + {} | null | undefined + > + ): void; + /** + * Creates the given topic with the given name. See the + * + * resource name rules. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the topic. It must have the format + * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, + * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), + * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent + * signs (`%`). It must be between 3 and 255 characters in length, and it + * must not start with `"goog"`. + * @param {number[]} request.labels + * See Creating and + * managing labels. + * @param {google.pubsub.v1.MessageStoragePolicy} request.messageStoragePolicy + * Policy constraining the set of Google Cloud Platform regions where messages + * published to the topic may be stored. If not present, then no constraints + * are in effect. + * @param {string} request.kmsKeyName + * The resource name of the Cloud KMS CryptoKey to be used to protect access + * to messages published on this topic. + * + * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + createTopic( + request: protos.google.pubsub.v1.ITopic, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + name: request.name || '', + }); + this.initialize(); + return this.innerApiCalls.createTopic(request, options, callback); + } + updateTopic( + request: protos.google.pubsub.v1.IUpdateTopicRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IUpdateTopicRequest | undefined, + {} | undefined + ] + >; + updateTopic( + request: protos.google.pubsub.v1.IUpdateTopicRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, + {} | null | undefined + > + ): void; + updateTopic( + request: protos.google.pubsub.v1.IUpdateTopicRequest, + callback: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Updates an existing topic. Note that certain properties of a + * topic are not modifiable. + * + * @param {Object} request + * The request object that will be sent. + * @param {google.pubsub.v1.Topic} request.topic + * Required. The updated topic object. + * @param {google.protobuf.FieldMask} request.updateMask + * Required. Indicates which fields in the provided topic to update. Must be + * specified and non-empty. Note that if `update_mask` contains + * "message_storage_policy" then the new value will be determined based on the + * policy configured at the project or organization level. The + * `message_storage_policy` must not be set in the `topic` provided above. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + updateTopic( + request: protos.google.pubsub.v1.IUpdateTopicRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IUpdateTopicRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + 'topic.name': request.topic!.name || '', + }); + this.initialize(); + return this.innerApiCalls.updateTopic(request, options, callback); + } + publish( + request: protos.google.pubsub.v1.IPublishRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.IPublishResponse, + protos.google.pubsub.v1.IPublishRequest | undefined, + {} | undefined + ] + >; + publish( + request: protos.google.pubsub.v1.IPublishRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.IPublishResponse, + protos.google.pubsub.v1.IPublishRequest | null | undefined, + {} | null | undefined + > + ): void; + publish( + request: protos.google.pubsub.v1.IPublishRequest, + callback: Callback< + protos.google.pubsub.v1.IPublishResponse, + protos.google.pubsub.v1.IPublishRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic + * does not exist. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The messages in the request will be published on this topic. + * Format is `projects/{project}/topics/{topic}`. + * @param {number[]} request.messages + * Required. The messages to publish. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + publish( + request: protos.google.pubsub.v1.IPublishRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.IPublishResponse, + protos.google.pubsub.v1.IPublishRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.IPublishResponse, + protos.google.pubsub.v1.IPublishRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.IPublishResponse, + protos.google.pubsub.v1.IPublishRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + this.initialize(); + return this.innerApiCalls.publish(request, options, callback); + } + getTopic( + request: protos.google.pubsub.v1.IGetTopicRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IGetTopicRequest | undefined, + {} | undefined + ] + >; + getTopic( + request: protos.google.pubsub.v1.IGetTopicRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IGetTopicRequest | null | undefined, + {} | null | undefined + > + ): void; + getTopic( + request: protos.google.pubsub.v1.IGetTopicRequest, + callback: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IGetTopicRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Gets the configuration of a topic. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic to get. + * Format is `projects/{project}/topics/{topic}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + getTopic( + request: protos.google.pubsub.v1.IGetTopicRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IGetTopicRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IGetTopicRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IGetTopicRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + this.initialize(); + return this.innerApiCalls.getTopic(request, options, callback); + } + deleteTopic( + request: protos.google.pubsub.v1.IDeleteTopicRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteTopicRequest | undefined, + {} | undefined + ] + >; + deleteTopic( + request: protos.google.pubsub.v1.IDeleteTopicRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, + {} | null | undefined + > + ): void; + deleteTopic( + request: protos.google.pubsub.v1.IDeleteTopicRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic + * does not exist. After a topic is deleted, a new topic may be created with + * the same name; this is an entirely new topic with none of the old + * configuration or subscriptions. Existing subscriptions to this topic are + * not deleted, but their `topic` field is set to `_deleted-topic_`. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. Name of the topic to delete. + * Format is `projects/{project}/topics/{topic}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + deleteTopic( + request: protos.google.pubsub.v1.IDeleteTopicRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteTopicRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + this.initialize(); + return this.innerApiCalls.deleteTopic(request, options, callback); + } + + listTopics( + request: protos.google.pubsub.v1.IListTopicsRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ITopic[], + protos.google.pubsub.v1.IListTopicsRequest | null, + protos.google.pubsub.v1.IListTopicsResponse + ] + >; + listTopics( + request: protos.google.pubsub.v1.IListTopicsRequest, + options: gax.CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicsRequest, + protos.google.pubsub.v1.IListTopicsResponse | null | undefined, + protos.google.pubsub.v1.ITopic + > + ): void; + listTopics( + request: protos.google.pubsub.v1.IListTopicsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicsRequest, + protos.google.pubsub.v1.IListTopicsResponse | null | undefined, + protos.google.pubsub.v1.ITopic + > + ): void; + /** + * Lists matching topics. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list topics. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of topics to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicsResponse`; indicates that this is + * a continuation of a prior `ListTopics` call, and that the system should + * return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Topic]{@link google.pubsub.v1.Topic}. + * The client library support auto-pagination by default: it will call the API as many + * times as needed and will merge results from all the pages into this array. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Topic]{@link google.pubsub.v1.Topic} that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListTopicsRequest]{@link google.pubsub.v1.ListTopicsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListTopicsResponse]{@link google.pubsub.v1.ListTopicsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + listTopics( + request: protos.google.pubsub.v1.IListTopicsRequest, + optionsOrCallback?: + | gax.CallOptions + | PaginationCallback< + protos.google.pubsub.v1.IListTopicsRequest, + protos.google.pubsub.v1.IListTopicsResponse | null | undefined, + protos.google.pubsub.v1.ITopic + >, + callback?: PaginationCallback< + protos.google.pubsub.v1.IListTopicsRequest, + protos.google.pubsub.v1.IListTopicsResponse | null | undefined, + protos.google.pubsub.v1.ITopic + > + ): Promise< + [ + protos.google.pubsub.v1.ITopic[], + protos.google.pubsub.v1.IListTopicsRequest | null, + protos.google.pubsub.v1.IListTopicsResponse + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + this.initialize(); + return this.innerApiCalls.listTopics(request, options, callback); + } + + /** + * Equivalent to {@link listTopics}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopics} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list topics. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of topics to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicsResponse`; indicates that this is + * a continuation of a prior `ListTopics` call, and that the system should + * return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Stream} + * An object stream which emits an object representing [Topic]{@link google.pubsub.v1.Topic} on 'data' event. + */ + listTopicsStream( + request?: protos.google.pubsub.v1.IListTopicsRequest, + options?: gax.CallOptions + ): Transform { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listTopics.createStream( + this.innerApiCalls.listTopics as gax.GaxCall, + request, + callSettings + ); + } + + /** + * Equivalent to {@link listTopics}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list topics. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of topics to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicsResponse`; indicates that this is + * a continuation of a prior `ListTopics` call, and that the system should + * return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Object} + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + */ + listTopicsAsync( + request?: protos.google.pubsub.v1.IListTopicsRequest, + options?: gax.CallOptions + ): AsyncIterable { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + options = options || {}; + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listTopics.asyncIterate( + this.innerApiCalls['listTopics'] as GaxCall, + (request as unknown) as RequestType, + callSettings + ) as AsyncIterable; + } + listTopicSubscriptions( + request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + options?: gax.CallOptions + ): Promise< + [ + string[], + protos.google.pubsub.v1.IListTopicSubscriptionsRequest | null, + protos.google.pubsub.v1.IListTopicSubscriptionsResponse + ] + >; + listTopicSubscriptions( + request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + options: gax.CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + | protos.google.pubsub.v1.IListTopicSubscriptionsResponse + | null + | undefined, + string + > + ): void; + listTopicSubscriptions( + request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + | protos.google.pubsub.v1.IListTopicSubscriptionsResponse + | null + | undefined, + string + > + ): void; + /** + * Lists the names of the subscriptions on this topic. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} request.pageSize + * Maximum number of subscription names to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicSubscriptionsResponse`; indicates + * that this is a continuation of a prior `ListTopicSubscriptions` call, and + * that the system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of string. + * The client library support auto-pagination by default: it will call the API as many + * times as needed and will merge results from all the pages into this array. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of string that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListTopicSubscriptionsRequest]{@link google.pubsub.v1.ListTopicSubscriptionsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListTopicSubscriptionsResponse]{@link google.pubsub.v1.ListTopicSubscriptionsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + listTopicSubscriptions( + request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + optionsOrCallback?: + | gax.CallOptions + | PaginationCallback< + protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + | protos.google.pubsub.v1.IListTopicSubscriptionsResponse + | null + | undefined, + string + >, + callback?: PaginationCallback< + protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + | protos.google.pubsub.v1.IListTopicSubscriptionsResponse + | null + | undefined, + string + > + ): Promise< + [ + string[], + protos.google.pubsub.v1.IListTopicSubscriptionsRequest | null, + protos.google.pubsub.v1.IListTopicSubscriptionsResponse + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + this.initialize(); + return this.innerApiCalls.listTopicSubscriptions( + request, + options, + callback + ); + } + + /** + * Equivalent to {@link listTopicSubscriptions}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopicSubscriptions} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} request.pageSize + * Maximum number of subscription names to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicSubscriptionsResponse`; indicates + * that this is a continuation of a prior `ListTopicSubscriptions` call, and + * that the system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Stream} + * An object stream which emits an object representing string on 'data' event. + */ + listTopicSubscriptionsStream( + request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + options?: gax.CallOptions + ): Transform { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listTopicSubscriptions.createStream( + this.innerApiCalls.listTopicSubscriptions as gax.GaxCall, + request, + callSettings + ); + } + + /** + * Equivalent to {@link listTopicSubscriptions}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} request.pageSize + * Maximum number of subscription names to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicSubscriptionsResponse`; indicates + * that this is a continuation of a prior `ListTopicSubscriptions` call, and + * that the system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Object} + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + */ + listTopicSubscriptionsAsync( + request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + options?: gax.CallOptions + ): AsyncIterable { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + options = options || {}; + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listTopicSubscriptions.asyncIterate( + this.innerApiCalls['listTopicSubscriptions'] as GaxCall, + (request as unknown) as RequestType, + callSettings + ) as AsyncIterable; + } + listTopicSnapshots( + request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + options?: gax.CallOptions + ): Promise< + [ + string[], + protos.google.pubsub.v1.IListTopicSnapshotsRequest | null, + protos.google.pubsub.v1.IListTopicSnapshotsResponse + ] + >; + listTopicSnapshots( + request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + options: gax.CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicSnapshotsRequest, + protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, + string + > + ): void; + listTopicSnapshots( + request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicSnapshotsRequest, + protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, + string + > + ): void; + /** + * Lists the names of the snapshots on this topic. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic that snapshots are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} request.pageSize + * Maximum number of snapshot names to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicSnapshotsResponse`; indicates + * that this is a continuation of a prior `ListTopicSnapshots` call, and + * that the system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of string. + * The client library support auto-pagination by default: it will call the API as many + * times as needed and will merge results from all the pages into this array. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of string that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListTopicSnapshotsRequest]{@link google.pubsub.v1.ListTopicSnapshotsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListTopicSnapshotsResponse]{@link google.pubsub.v1.ListTopicSnapshotsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + listTopicSnapshots( + request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + optionsOrCallback?: + | gax.CallOptions + | PaginationCallback< + protos.google.pubsub.v1.IListTopicSnapshotsRequest, + | protos.google.pubsub.v1.IListTopicSnapshotsResponse + | null + | undefined, + string + >, + callback?: PaginationCallback< + protos.google.pubsub.v1.IListTopicSnapshotsRequest, + protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, + string + > + ): Promise< + [ + string[], + protos.google.pubsub.v1.IListTopicSnapshotsRequest | null, + protos.google.pubsub.v1.IListTopicSnapshotsResponse + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + this.initialize(); + return this.innerApiCalls.listTopicSnapshots(request, options, callback); + } + + /** + * Equivalent to {@link listTopicSnapshots}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopicSnapshots} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic that snapshots are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} request.pageSize + * Maximum number of snapshot names to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicSnapshotsResponse`; indicates + * that this is a continuation of a prior `ListTopicSnapshots` call, and + * that the system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Stream} + * An object stream which emits an object representing string on 'data' event. + */ + listTopicSnapshotsStream( + request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + options?: gax.CallOptions + ): Transform { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listTopicSnapshots.createStream( + this.innerApiCalls.listTopicSnapshots as gax.GaxCall, + request, + callSettings + ); + } + + /** + * Equivalent to {@link listTopicSnapshots}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic that snapshots are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} request.pageSize + * Maximum number of snapshot names to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicSnapshotsResponse`; indicates + * that this is a continuation of a prior `ListTopicSnapshots` call, and + * that the system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Object} + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + */ + listTopicSnapshotsAsync( + request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + options?: gax.CallOptions + ): AsyncIterable { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + topic: request.topic || '', + }); + options = options || {}; + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listTopicSnapshots.asyncIterate( + this.innerApiCalls['listTopicSnapshots'] as GaxCall, + (request as unknown) as RequestType, + callSettings + ) as AsyncIterable; + } + // -------------------- + // -- Path templates -- + // -------------------- + + /** + * Return a fully-qualified project resource name string. + * + * @param {string} project + * @returns {string} Resource name string. + */ + projectPath(project: string) { + return this.pathTemplates.projectPathTemplate.render({ + project, + }); + } + + /** + * Parse the project from Project resource. + * + * @param {string} projectName + * A fully-qualified path representing Project resource. + * @returns {string} A string representing the project. + */ + matchProjectFromProjectName(projectName: string) { + return this.pathTemplates.projectPathTemplate.match(projectName).project; + } + + /** + * Return a fully-qualified projectTopic resource name string. + * + * @param {string} project + * @param {string} topic + * @returns {string} Resource name string. + */ + projectTopicPath(project: string, topic: string) { + return this.pathTemplates.projectTopicPathTemplate.render({ + project, + topic, + }); + } + + /** + * Parse the project from ProjectTopic resource. + * + * @param {string} projectTopicName + * A fully-qualified path representing project_topic resource. + * @returns {string} A string representing the project. + */ + matchProjectFromProjectTopicName(projectTopicName: string) { + return this.pathTemplates.projectTopicPathTemplate.match(projectTopicName) + .project; + } + + /** + * Parse the topic from ProjectTopic resource. + * + * @param {string} projectTopicName + * A fully-qualified path representing project_topic resource. + * @returns {string} A string representing the topic. + */ + matchTopicFromProjectTopicName(projectTopicName: string) { + return this.pathTemplates.projectTopicPathTemplate.match(projectTopicName) + .topic; + } + + /** + * Return a fully-qualified snapshot resource name string. + * + * @param {string} project + * @param {string} snapshot + * @returns {string} Resource name string. + */ + snapshotPath(project: string, snapshot: string) { + return this.pathTemplates.snapshotPathTemplate.render({ + project, + snapshot, + }); + } + + /** + * Parse the project from Snapshot resource. + * + * @param {string} snapshotName + * A fully-qualified path representing Snapshot resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSnapshotName(snapshotName: string) { + return this.pathTemplates.snapshotPathTemplate.match(snapshotName).project; + } + + /** + * Parse the snapshot from Snapshot resource. + * + * @param {string} snapshotName + * A fully-qualified path representing Snapshot resource. + * @returns {string} A string representing the snapshot. + */ + matchSnapshotFromSnapshotName(snapshotName: string) { + return this.pathTemplates.snapshotPathTemplate.match(snapshotName).snapshot; + } + + /** + * Return a fully-qualified subscription resource name string. + * + * @param {string} project + * @param {string} subscription + * @returns {string} Resource name string. + */ + subscriptionPath(project: string, subscription: string) { + return this.pathTemplates.subscriptionPathTemplate.render({ + project, + subscription, + }); + } + + /** + * Parse the project from Subscription resource. + * + * @param {string} subscriptionName + * A fully-qualified path representing Subscription resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSubscriptionName(subscriptionName: string) { + return this.pathTemplates.subscriptionPathTemplate.match(subscriptionName) + .project; + } + + /** + * Parse the subscription from Subscription resource. + * + * @param {string} subscriptionName + * A fully-qualified path representing Subscription resource. + * @returns {string} A string representing the subscription. + */ + matchSubscriptionFromSubscriptionName(subscriptionName: string) { + return this.pathTemplates.subscriptionPathTemplate.match(subscriptionName) + .subscription; + } + + /** + * Terminate the GRPC channel and close the client. + * + * The client will no longer be usable and all future behavior is undefined. + */ + close(): Promise { + this.initialize(); + if (!this._terminated) { + return this.publisherStub!.then(stub => { + this._terminated = true; + stub.close(); + }); + } + return Promise.resolve(); + } + /** + * This part will be added into src/v1/key_management_service_client.ts by synth.py. + * KMS service requires IAM client for [setIamPolicy, getIamPolicy, testIamPerssion] methods. + * But we don't support it now in micro-generators for rerouting one service to another and mix them in. + * New feature request link: [https://github.com/googleapis/gapic-generator-typescript/issues/315] + * + * So this is manually written for providing methods to the KMS client. + * IamClient is created for KMS client in the constructor using src/helper.ts. + * [setIamPolicy, getIamPolicy, testIamPerssion] methods are created which is calling the corresponding methods from IamClient in `helper.ts`. + */ + + getIamPolicy( + request: protos.google.iam.v1.GetIamPolicyRequest, + options: gax.CallOptions, + callback: protos.google.iam.v1.IAMPolicy.GetIamPolicyCallback + ) { + return this._iamClient.getIamPolicy(request, options, callback); + } + setIamPolicy( + request: protos.google.iam.v1.SetIamPolicyRequest, + options: gax.CallOptions, + callback: protos.google.iam.v1.IAMPolicy.SetIamPolicyCallback + ) { + return this._iamClient.setIamPolicy(request, options, callback); + } + testIamPermissions( + request: protos.google.iam.v1.TestIamPermissionsRequest, + options: gax.CallOptions, + callback?: protos.google.iam.v1.IAMPolicy.TestIamPermissionsCallback + ) { + return this._iamClient.testIamPermissions(request, options, callback); + } +} diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 9b6be06081b..57cd432354c 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -2,23 +2,27 @@ "interfaces": { "google.pubsub.v1.Publisher": { "retry_codes": { + "non_idempotent": [], "idempotent": [ - "ABORTED", - "UNAVAILABLE", - "UNKNOWN" + "DEADLINE_EXCEEDED", + "UNAVAILABLE" ], - "non_idempotent": [ + "unavailable": [ "UNAVAILABLE" ], - "none": [], - "publish": [ - "ABORTED", + "cancelled_unknown_deadline_exceeded_resource_exhausted_aborted_internal_unavailable": [ "CANCELLED", + "UNKNOWN", "DEADLINE_EXCEEDED", - "INTERNAL", "RESOURCE_EXHAUSTED", - "UNAVAILABLE", - "UNKNOWN" + "ABORTED", + "INTERNAL", + "UNAVAILABLE" + ], + "unknown_aborted_unavailable": [ + "UNKNOWN", + "ABORTED", + "UNAVAILABLE" ] }, "retry_params": { @@ -27,76 +31,56 @@ "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, "initial_rpc_timeout_millis": 60000, - "rpc_timeout_multiplier": 1.0, + "rpc_timeout_multiplier": 1, "max_rpc_timeout_millis": 60000, "total_timeout_millis": 600000 - }, - "messaging": { - "initial_retry_delay_millis": 100, - "retry_delay_multiplier": 1.3, - "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 5000, - "rpc_timeout_multiplier": 1.3, - "max_rpc_timeout_millis": 60000, - "total_timeout_millis": 60000 } }, "methods": { "CreateTopic": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "UpdateTopic": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "Publish": { - "timeout_millis": 20000, - "retry_codes_name": "publish", - "retry_params_name": "messaging", + "timeout_millis": 60000, + "retry_codes_name": "cancelled_unknown_deadline_exceeded_resource_exhausted_aborted_internal_unavailable", + "retry_params_name": "default", "bundling": { "element_count_threshold": 100, - "element_count_limit": 1000, "request_byte_threshold": 1048576, - "request_byte_limit": 10485760, - "delay_threshold_millis": 10 + "delay_threshold_millis": 10, + "element_count_limit": 1000 } }, "GetTopic": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, "ListTopics": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, "ListTopicSubscriptions": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", - "retry_params_name": "default" - }, - "DeleteTopic": { - "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", - "retry_params_name": "default" - }, - "SetIamPolicy": { - "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, - "GetIamPolicy": { + "ListTopicSnapshots": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, - "TestIamPermissions": { + "DeleteTopic": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" } } diff --git a/handwritten/pubsub/src/v1/publisher_proto_list.json b/handwritten/pubsub/src/v1/publisher_proto_list.json index 6e307cc9fa8..23484bf6695 100644 --- a/handwritten/pubsub/src/v1/publisher_proto_list.json +++ b/handwritten/pubsub/src/v1/publisher_proto_list.json @@ -1,4 +1,3 @@ [ - "../../protos/google/iam/v1/iam_policy.proto", "../../protos/google/pubsub/v1/pubsub.proto" ] diff --git a/handwritten/pubsub/src/v1/subscriber_client.js b/handwritten/pubsub/src/v1/subscriber_client.js deleted file mode 100644 index 9fe4a89d84c..00000000000 --- a/handwritten/pubsub/src/v1/subscriber_client.js +++ /dev/null @@ -1,1942 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -'use strict'; - -const gapicConfig = require('./subscriber_client_config.json'); -const gax = require('google-gax'); -const path = require('path'); - -const VERSION = require('../../../package.json').version; - -/** - * The service that an application uses to manipulate subscriptions and to - * consume messages from a subscription via the `Pull` method or by - * establishing a bi-directional stream using the `StreamingPull` method. - * - * @class - * @memberof v1 - */ -class SubscriberClient { - /** - * Construct an instance of SubscriberClient. - * - * @param {object} [options] - The configuration object. See the subsequent - * parameters for more details. - * @param {object} [options.credentials] - Credentials object. - * @param {string} [options.credentials.client_email] - * @param {string} [options.credentials.private_key] - * @param {string} [options.email] - Account email address. Required when - * using a .pem or .p12 keyFilename. - * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or - * .p12 key downloaded from the Google Developers Console. If you provide - * a path to a JSON file, the projectId option below is not necessary. - * NOTE: .pem and .p12 require you to specify options.email as well. - * @param {number} [options.port] - The port on which to connect to - * the remote host. - * @param {string} [options.projectId] - The project ID from the Google - * Developer's Console, e.g. 'grape-spaceship-123'. We will also check - * the environment variable GCLOUD_PROJECT for your project ID. If your - * app is running in an environment which supports - * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, - * your project ID will be detected automatically. - * @param {function} [options.promise] - Custom promise module to use instead - * of native Promises. - * @param {string} [options.apiEndpoint] - The domain name of the - * API remote host. - */ - constructor(opts) { - opts = opts || {}; - this._descriptors = {}; - - if (global.isBrowser) { - // If we're in browser, we use gRPC fallback. - opts.fallback = true; - } - - // If we are in browser, we are already using fallback because of the - // "browser" field in package.json. - // But if we were explicitly requested to use fallback, let's do it now. - const gaxModule = !global.isBrowser && opts.fallback ? gax.fallback : gax; - - const servicePath = - opts.servicePath || opts.apiEndpoint || this.constructor.servicePath; - - // Ensure that options include the service address and port. - opts = Object.assign( - { - clientConfig: {}, - port: this.constructor.port, - servicePath, - }, - opts - ); - - // Create a `gaxGrpc` object, with any grpc-specific options - // sent to the client. - opts.scopes = this.constructor.scopes; - const gaxGrpc = new gaxModule.GrpcClient(opts); - - // Save the auth object to the client, for use by other methods. - this.auth = gaxGrpc.auth; - - // Determine the client header string. - const clientHeader = []; - - if (typeof process !== 'undefined' && 'versions' in process) { - clientHeader.push(`gl-node/${process.versions.node}`); - } - clientHeader.push(`gax/${gaxModule.version}`); - if (opts.fallback) { - clientHeader.push(`gl-web/${gaxModule.version}`); - } else { - clientHeader.push(`grpc/${gaxGrpc.grpcVersion}`); - } - clientHeader.push(`gapic/${VERSION}`); - if (opts.libName && opts.libVersion) { - clientHeader.push(`${opts.libName}/${opts.libVersion}`); - } - - // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - const protos = gaxGrpc.loadProto( - opts.fallback ? require('../../protos/protos.json') : nodejsProtoPath - ); - - // This API contains "path templates"; forward-slash-separated - // identifiers to uniquely identify resources within the API. - // Create useful helper objects for these. - this._pathTemplates = { - projectPathTemplate: new gaxModule.PathTemplate('projects/{project}'), - snapshotPathTemplate: new gaxModule.PathTemplate( - 'projects/{project}/snapshots/{snapshot}' - ), - subscriptionPathTemplate: new gaxModule.PathTemplate( - 'projects/{project}/subscriptions/{subscription}' - ), - topicPathTemplate: new gaxModule.PathTemplate( - 'projects/{project}/topics/{topic}' - ), - }; - - // Some of the methods on this service return "paged" results, - // (e.g. 50 results at a time, with tokens to get subsequent - // pages). Denote the keys used for pagination and results. - this._descriptors.page = { - listSubscriptions: new gaxModule.PageDescriptor( - 'pageToken', - 'nextPageToken', - 'subscriptions' - ), - listSnapshots: new gaxModule.PageDescriptor( - 'pageToken', - 'nextPageToken', - 'snapshots' - ), - }; - - // Some of the methods on this service provide streaming responses. - // Provide descriptors for these. - this._descriptors.stream = { - streamingPull: new gaxModule.StreamDescriptor( - gax.StreamType.BIDI_STREAMING - ), - }; - - // Put together the default options sent with requests. - const defaults = gaxGrpc.constructSettings( - 'google.pubsub.v1.Subscriber', - gapicConfig, - opts.clientConfig, - {'x-goog-api-client': clientHeader.join(' ')} - ); - - // Set up a dictionary of "inner API calls"; the core implementation - // of calling the API is handled in `google-gax`, with this code - // merely providing the destination and request information. - this._innerApiCalls = {}; - - // Put together the "service stub" for - // google.iam.v1.IAMPolicy. - const iamPolicyStub = gaxGrpc.createStub( - opts.fallback - ? protos.lookupService('google.iam.v1.IAMPolicy') - : protos.google.iam.v1.IAMPolicy, - opts - ); - - // Iterate over each of the methods that the service provides - // and create an API call method for each. - const iamPolicyStubMethods = [ - 'setIamPolicy', - 'getIamPolicy', - 'testIamPermissions', - ]; - for (const methodName of iamPolicyStubMethods) { - const innerCallPromise = iamPolicyStub.then( - stub => (...args) => { - return stub[methodName].apply(stub, args); - }, - err => () => { - throw err; - } - ); - this._innerApiCalls[methodName] = gaxModule.createApiCall( - innerCallPromise, - defaults[methodName], - this._descriptors.page[methodName] || - this._descriptors.stream[methodName] - ); - } - - // Put together the "service stub" for - // google.pubsub.v1.Subscriber. - const subscriberStub = gaxGrpc.createStub( - opts.fallback - ? protos.lookupService('google.pubsub.v1.Subscriber') - : protos.google.pubsub.v1.Subscriber, - opts - ); - - // Iterate over each of the methods that the service provides - // and create an API call method for each. - const subscriberStubMethods = [ - 'createSubscription', - 'getSubscription', - 'updateSubscription', - 'listSubscriptions', - 'deleteSubscription', - 'modifyAckDeadline', - 'acknowledge', - 'pull', - 'streamingPull', - 'modifyPushConfig', - 'listSnapshots', - 'createSnapshot', - 'updateSnapshot', - 'deleteSnapshot', - 'seek', - ]; - for (const methodName of subscriberStubMethods) { - const innerCallPromise = subscriberStub.then( - stub => (...args) => { - return stub[methodName].apply(stub, args); - }, - err => () => { - throw err; - } - ); - this._innerApiCalls[methodName] = gaxModule.createApiCall( - innerCallPromise, - defaults[methodName], - this._descriptors.page[methodName] || - this._descriptors.stream[methodName] - ); - } - - // note: editing generated code - this.waitForReady = function(deadline, callback) { - return subscriberStub.then( - stub => stub.waitForReady(deadline, callback), - callback - ); - }; - this.getSubscriberStub = function() { - return subscriberStub; - }; - } - - /** - * The DNS address for this API service. - */ - static get servicePath() { - return 'pubsub.googleapis.com'; - } - - /** - * The DNS address for this API service - same as servicePath(), - * exists for compatibility reasons. - */ - static get apiEndpoint() { - return 'pubsub.googleapis.com'; - } - - /** - * The port for this API service. - */ - static get port() { - return 443; - } - - /** - * The scopes needed to make gRPC calls for every method defined - * in this service. - */ - static get scopes() { - return [ - 'https://www.googleapis.com/auth/cloud-platform', - 'https://www.googleapis.com/auth/pubsub', - ]; - } - - /** - * Return the project ID used by this class. - * @param {function(Error, string)} callback - the callback to - * be called with the current project Id. - */ - getProjectId(callback) { - return this.auth.getProjectId(callback); - } - - // ------------------- - // -- Service calls -- - // ------------------- - - /** - * Creates a subscription to a given topic. See the - * - * resource name rules. - * If the subscription already exists, returns `ALREADY_EXISTS`. - * If the corresponding topic doesn't exist, returns `NOT_FOUND`. - * - * If the name is not provided in the request, the server will assign a random - * name for this subscription on the same project as the topic, conforming - * to the - * [resource name - * format](https://cloud.google.com/pubsub/docs/admin#resource_names). The - * generated name is populated in the returned Subscription object. Note that - * for REST API requests, you must specify a name in the request. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.name - * Required. The name of the subscription. It must have the format - * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must - * start with a letter, and contain only letters (`[A-Za-z]`), numbers - * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), - * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters - * in length, and it must not start with `"goog"`. - * @param {string} request.topic - * Required. The name of the topic from which this subscription is receiving - * messages. Format is `projects/{project}/topics/{topic}`. The value of this - * field will be `_deleted-topic_` if the topic has been deleted. - * @param {Object} [request.pushConfig] - * If push delivery is used with this subscription, this field is - * used to configure it. An empty `pushConfig` signifies that the subscriber - * will pull and ack messages using API methods. - * - * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} - * @param {number} [request.ackDeadlineSeconds] - * The approximate amount of time (on a best-effort basis) Pub/Sub waits for - * the subscriber to acknowledge receipt before resending the message. In the - * interval after the message is delivered and before it is acknowledged, it - * is considered to be outstanding. During that time period, the - * message will not be redelivered (on a best-effort basis). - * - * For pull subscriptions, this value is used as the initial value for the ack - * deadline. To override this value for a given message, call - * `ModifyAckDeadline` with the corresponding `ack_id` if using - * non-streaming pull or send the `ack_id` in a - * `StreamingModifyAckDeadlineRequest` if using streaming pull. - * The minimum custom deadline you can specify is 10 seconds. - * The maximum custom deadline you can specify is 600 seconds (10 minutes). - * If this parameter is 0, a default value of 10 seconds is used. - * - * For push delivery, this value is also used to set the request timeout for - * the call to the push endpoint. - * - * If the subscriber never acknowledges the message, the Pub/Sub - * system will eventually redeliver the message. - * @param {boolean} [request.retainAckedMessages] - * Indicates whether to retain acknowledged messages. If true, then - * messages are not expunged from the subscription's backlog, even if they are - * acknowledged, until they fall out of the `message_retention_duration` - * window. This must be true if you would like to - * - * Seek to a timestamp. - * @param {Object} [request.messageRetentionDuration] - * How long to retain unacknowledged messages in the subscription's backlog, - * from the moment a message is published. - * If `retain_acked_messages` is true, then this also configures the retention - * of acknowledged messages, and thus configures how far back in time a `Seek` - * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - * minutes. - * - * This object should have the same structure as [Duration]{@link google.protobuf.Duration} - * @param {Object.} [request.labels] - * See Creating and - * managing labels. - * @param {boolean} [request.enableMessageOrdering] - * If true, messages published with the same `ordering_key` in `PubsubMessage` - * will be delivered to the subscribers in the order in which they - * are received by the Pub/Sub system. Otherwise, they may be delivered in - * any order. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. - * @param {Object} [request.expirationPolicy] - * A policy that specifies the conditions for this subscription's expiration. - * A subscription is considered active as long as any connected subscriber is - * successfully consuming messages from the subscription or is issuing - * operations on the subscription. If `expiration_policy` is not set, a - * *default policy* with `ttl` of 31 days will be used. The minimum allowed - * value for `expiration_policy.ttl` is 1 day. - * - * This object should have the same structure as [ExpirationPolicy]{@link google.pubsub.v1.ExpirationPolicy} - * @param {Object} [request.deadLetterPolicy] - * A policy that specifies the conditions for dead lettering messages in - * this subscription. If dead_letter_policy is not set, dead lettering - * is disabled. - * - * The Cloud Pub/Sub service account associated with this subscriptions's - * parent project (i.e., - * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have - * permission to Acknowledge() messages on this subscription. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. - * - * This object should have the same structure as [DeadLetterPolicy]{@link google.pubsub.v1.DeadLetterPolicy} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedName = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - * const request = { - * name: formattedName, - * topic: formattedTopic, - * }; - * client.createSubscription(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - createSubscription(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - name: request.name, - }); - - return this._innerApiCalls.createSubscription(request, options, callback); - } - - /** - * Gets the configuration details of a subscription. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The name of the subscription to get. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * client.getSubscription({subscription: formattedSubscription}) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - getSubscription(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription, - }); - - return this._innerApiCalls.getSubscription(request, options, callback); - } - - /** - * Updates an existing subscription. Note that certain properties of a - * subscription, such as its topic, are not modifiable. - * - * @param {Object} request - * The request object that will be sent. - * @param {Object} request.subscription - * Required. The updated subscription object. - * - * This object should have the same structure as [Subscription]{@link google.pubsub.v1.Subscription} - * @param {Object} request.updateMask - * Required. Indicates which fields in the provided subscription to update. - * Must be specified and non-empty. - * - * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const ackDeadlineSeconds = 42; - * const subscription = { - * ackDeadlineSeconds: ackDeadlineSeconds, - * }; - * const pathsElement = 'ack_deadline_seconds'; - * const paths = [pathsElement]; - * const updateMask = { - * paths: paths, - * }; - * const request = { - * subscription: subscription, - * updateMask: updateMask, - * }; - * client.updateSubscription(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - updateSubscription(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - 'subscription.name': request.subscription.name, - }); - - return this._innerApiCalls.updateSubscription(request, options, callback); - } - - /** - * Lists matching subscriptions. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * Required. The name of the project in which to list subscriptions. - * Format is `projects/{project-id}`. - * @param {number} [request.pageSize] - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is Array of [Subscription]{@link google.pubsub.v1.Subscription}. - * - * When autoPaginate: false is specified through options, it contains the result - * in a single response. If the response indicates the next page exists, the third - * parameter is set to be used for the next request object. The fourth parameter keeps - * the raw response object of an object representing [ListSubscriptionsResponse]{@link google.pubsub.v1.ListSubscriptionsResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Subscription]{@link google.pubsub.v1.Subscription}. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Subscription]{@link google.pubsub.v1.Subscription} in a single response. - * The second element is the next request object if the response - * indicates the next page exists, or null. The third element is - * an object representing [ListSubscriptionsResponse]{@link google.pubsub.v1.ListSubscriptionsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * // Iterate over all elements. - * const formattedProject = client.projectPath('[PROJECT]'); - * - * client.listSubscriptions({project: formattedProject}) - * .then(responses => { - * const resources = responses[0]; - * for (const resource of resources) { - * // doThingsWith(resource) - * } - * }) - * .catch(err => { - * console.error(err); - * }); - * - * // Or obtain the paged response. - * const formattedProject = client.projectPath('[PROJECT]'); - * - * - * const options = {autoPaginate: false}; - * const callback = responses => { - * // The actual resources in a response. - * const resources = responses[0]; - * // The next request if the response shows that there are more responses. - * const nextRequest = responses[1]; - * // The actual response object, if necessary. - * // const rawResponse = responses[2]; - * for (const resource of resources) { - * // doThingsWith(resource); - * } - * if (nextRequest) { - * // Fetch the next page. - * return client.listSubscriptions(nextRequest, options).then(callback); - * } - * } - * client.listSubscriptions({project: formattedProject}, options) - * .then(callback) - * .catch(err => { - * console.error(err); - * }); - */ - listSubscriptions(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project, - }); - - return this._innerApiCalls.listSubscriptions(request, options, callback); - } - - /** - * Equivalent to {@link listSubscriptions}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listSubscriptions} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * Required. The name of the project in which to list subscriptions. - * Format is `projects/{project-id}`. - * @param {number} [request.pageSize] - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @returns {Stream} - * An object stream which emits an object representing [Subscription]{@link google.pubsub.v1.Subscription} on 'data' event. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedProject = client.projectPath('[PROJECT]'); - * client.listSubscriptionsStream({project: formattedProject}) - * .on('data', element => { - * // doThingsWith(element) - * }).on('error', err => { - * console.log(err); - * }); - */ - listSubscriptionsStream(request, options) { - options = options || {}; - - return this._descriptors.page.listSubscriptions.createStream( - this._innerApiCalls.listSubscriptions, - request, - options - ); - } - - /** - * Deletes an existing subscription. All messages retained in the subscription - * are immediately dropped. Calls to `Pull` after deletion will return - * `NOT_FOUND`. After a subscription is deleted, a new one may be created with - * the same name, but the new one has no association with the old - * subscription or its topic unless the same topic is specified. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The subscription to delete. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error)} [callback] - * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * client.deleteSubscription({subscription: formattedSubscription}).catch(err => { - * console.error(err); - * }); - */ - deleteSubscription(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription, - }); - - return this._innerApiCalls.deleteSubscription(request, options, callback); - } - - /** - * Modifies the ack deadline for a specific message. This method is useful - * to indicate that more time is needed to process a message by the - * subscriber, or to make the message available for redelivery if the - * processing was interrupted. Note that this does not modify the - * subscription-level `ackDeadlineSeconds` used for subsequent messages. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The name of the subscription. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {string[]} request.ackIds - * Required. List of acknowledgment IDs. - * @param {number} request.ackDeadlineSeconds - * Required. The new ack deadline with respect to the time this request was - * sent to the Pub/Sub system. For example, if the value is 10, the new ack - * deadline will expire 10 seconds after the `ModifyAckDeadline` call was - * made. Specifying zero might immediately make the message available for - * delivery to another subscriber client. This typically results in an - * increase in the rate of message redeliveries (that is, duplicates). - * The minimum deadline you can specify is 0 seconds. - * The maximum deadline you can specify is 600 seconds (10 minutes). - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error)} [callback] - * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const ackIds = []; - * const ackDeadlineSeconds = 0; - * const request = { - * subscription: formattedSubscription, - * ackIds: ackIds, - * ackDeadlineSeconds: ackDeadlineSeconds, - * }; - * client.modifyAckDeadline(request).catch(err => { - * console.error(err); - * }); - */ - modifyAckDeadline(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription, - }); - - return this._innerApiCalls.modifyAckDeadline(request, options, callback); - } - - /** - * Acknowledges the messages associated with the `ack_ids` in the - * `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages - * from the subscription. - * - * Acknowledging a message whose ack deadline has expired may succeed, - * but such a message may be redelivered later. Acknowledging a message more - * than once will not result in an error. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The subscription whose message is being acknowledged. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {string[]} request.ackIds - * Required. The acknowledgment ID for the messages being acknowledged that - * was returned by the Pub/Sub system in the `Pull` response. Must not be - * empty. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error)} [callback] - * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const ackIds = []; - * const request = { - * subscription: formattedSubscription, - * ackIds: ackIds, - * }; - * client.acknowledge(request).catch(err => { - * console.error(err); - * }); - */ - acknowledge(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription, - }); - - return this._innerApiCalls.acknowledge(request, options, callback); - } - - /** - * Pulls messages from the server. The server may return `UNAVAILABLE` if - * there are too many concurrent pull requests pending for the given - * subscription. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The subscription from which messages should be pulled. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {number} request.maxMessages - * Required. The maximum number of messages to return for this request. Must - * be a positive integer. The Pub/Sub system may return fewer than the number - * specified. - * @param {boolean} [request.returnImmediately] - * Optional. If this field set to true, the system will respond immediately - * even if it there are no messages available to return in the `Pull` - * response. Otherwise, the system may wait (for a bounded amount of time) - * until at least one message is available, rather than returning no messages. - * Warning: setting this field to `true` is discouraged because it adversely - * impacts the performance of `Pull` operations. We recommend that users do - * not set this field. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const maxMessages = 0; - * const request = { - * subscription: formattedSubscription, - * maxMessages: maxMessages, - * }; - * client.pull(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - pull(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription, - }); - - return this._innerApiCalls.pull(request, options, callback); - } - - /** - * Establishes a stream with the server, which sends messages down to the - * client. The client streams acknowledgements and ack deadline modifications - * back to the server. The server will close the stream and return the status - * on any error. The server may close the stream with status `UNAVAILABLE` to - * reassign server-side resources, in which case, the client should - * re-establish the stream. Flow control can be achieved by configuring the - * underlying RPC channel. - * - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @returns {Stream} - * An object stream which is both readable and writable. It accepts objects - * representing [StreamingPullRequest]{@link google.pubsub.v1.StreamingPullRequest} for write() method, and - * will emit objects representing [StreamingPullResponse]{@link google.pubsub.v1.StreamingPullResponse} on 'data' event asynchronously. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const stream = client.streamingPull().on('data', response => { - * // doThingsWith(response) - * }); - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const streamAckDeadlineSeconds = 0; - * const request = { - * subscription: formattedSubscription, - * streamAckDeadlineSeconds: streamAckDeadlineSeconds, - * }; - * // Write request objects. - * stream.write(request); - */ - streamingPull(options) { - options = options || {}; - - return this._innerApiCalls.streamingPull(options); - } - - /** - * Modifies the `PushConfig` for a specified subscription. - * - * This may be used to change a push subscription to a pull one (signified by - * an empty `PushConfig`) or vice versa, or change the endpoint URL and other - * attributes of a push subscription. Messages will accumulate for delivery - * continuously through the call regardless of changes to the `PushConfig`. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The name of the subscription. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {Object} request.pushConfig - * Required. The push configuration for future deliveries. - * - * An empty `pushConfig` indicates that the Pub/Sub system should - * stop pushing messages from the given subscription and allow - * messages to be pulled and acknowledged - effectively pausing - * the subscription if `Pull` or `StreamingPull` is not called. - * - * This object should have the same structure as [PushConfig]{@link google.pubsub.v1.PushConfig} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error)} [callback] - * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const pushConfig = {}; - * const request = { - * subscription: formattedSubscription, - * pushConfig: pushConfig, - * }; - * client.modifyPushConfig(request).catch(err => { - * console.error(err); - * }); - */ - modifyPushConfig(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription, - }); - - return this._innerApiCalls.modifyPushConfig(request, options, callback); - } - - /** - * Lists the existing snapshots. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * Required. The name of the project in which to list snapshots. - * Format is `projects/{project-id}`. - * @param {number} [request.pageSize] - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Array, ?Object, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. - * - * When autoPaginate: false is specified through options, it contains the result - * in a single response. If the response indicates the next page exists, the third - * parameter is set to be used for the next request object. The fourth parameter keeps - * the raw response object of an object representing [ListSnapshotsResponse]{@link google.pubsub.v1.ListSnapshotsResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Snapshot]{@link google.pubsub.v1.Snapshot} in a single response. - * The second element is the next request object if the response - * indicates the next page exists, or null. The third element is - * an object representing [ListSnapshotsResponse]{@link google.pubsub.v1.ListSnapshotsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * // Iterate over all elements. - * const formattedProject = client.projectPath('[PROJECT]'); - * - * client.listSnapshots({project: formattedProject}) - * .then(responses => { - * const resources = responses[0]; - * for (const resource of resources) { - * // doThingsWith(resource) - * } - * }) - * .catch(err => { - * console.error(err); - * }); - * - * // Or obtain the paged response. - * const formattedProject = client.projectPath('[PROJECT]'); - * - * - * const options = {autoPaginate: false}; - * const callback = responses => { - * // The actual resources in a response. - * const resources = responses[0]; - * // The next request if the response shows that there are more responses. - * const nextRequest = responses[1]; - * // The actual response object, if necessary. - * // const rawResponse = responses[2]; - * for (const resource of resources) { - * // doThingsWith(resource); - * } - * if (nextRequest) { - * // Fetch the next page. - * return client.listSnapshots(nextRequest, options).then(callback); - * } - * } - * client.listSnapshots({project: formattedProject}, options) - * .then(callback) - * .catch(err => { - * console.error(err); - * }); - */ - listSnapshots(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project, - }); - - return this._innerApiCalls.listSnapshots(request, options, callback); - } - - /** - * Equivalent to {@link listSnapshots}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listSnapshots} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.project - * Required. The name of the project in which to list snapshots. - * Format is `projects/{project-id}`. - * @param {number} [request.pageSize] - * The maximum number of resources contained in the underlying API - * response. If page streaming is performed per-resource, this - * parameter does not affect the return value. If page streaming is - * performed per-page, this determines the maximum number of - * resources in a page. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @returns {Stream} - * An object stream which emits an object representing [Snapshot]{@link google.pubsub.v1.Snapshot} on 'data' event. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedProject = client.projectPath('[PROJECT]'); - * client.listSnapshotsStream({project: formattedProject}) - * .on('data', element => { - * // doThingsWith(element) - * }).on('error', err => { - * console.log(err); - * }); - */ - listSnapshotsStream(request, options) { - options = options || {}; - - return this._descriptors.page.listSnapshots.createStream( - this._innerApiCalls.listSnapshots, - request, - options - ); - } - - /** - * Creates a snapshot from the requested subscription. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. - *

If the snapshot already exists, returns `ALREADY_EXISTS`. - * If the requested subscription doesn't exist, returns `NOT_FOUND`. - * If the backlog in the subscription is too old -- and the resulting snapshot - * would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. - * See also the `Snapshot.expire_time` field. If the name is not provided in - * the request, the server will assign a random - * name for this snapshot on the same project as the subscription, conforming - * to the - * [resource name - * format](https://cloud.google.com/pubsub/docs/admin#resource_names). The - * generated name is populated in the returned Snapshot object. Note that for - * REST API requests, you must specify a name in the request. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.name - * Required. User-provided name for this snapshot. If the name is not provided - * in the request, the server will assign a random name for this snapshot on - * the same project as the subscription. Note that for REST API requests, you - * must specify a name. See the resource - * name rules. Format is `projects/{project}/snapshots/{snap}`. - * @param {string} request.subscription - * Required. The subscription whose backlog the snapshot retains. - * Specifically, the created snapshot is guaranteed to retain: - * (a) The existing backlog on the subscription. More precisely, this is - * defined as the messages in the subscription's backlog that are - * unacknowledged upon the successful completion of the - * `CreateSnapshot` request; as well as: - * (b) Any messages published to the subscription's topic following the - * successful completion of the CreateSnapshot request. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {Object.} [request.labels] - * See Creating and - * managing labels. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const request = { - * name: formattedName, - * subscription: formattedSubscription, - * }; - * client.createSnapshot(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - createSnapshot(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - name: request.name, - }); - - return this._innerApiCalls.createSnapshot(request, options, callback); - } - - /** - * Updates an existing snapshot. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. - * - * @param {Object} request - * The request object that will be sent. - * @param {Object} request.snapshot - * Required. The updated snapshot object. - * - * This object should have the same structure as [Snapshot]{@link google.pubsub.v1.Snapshot} - * @param {Object} request.updateMask - * Required. Indicates which fields in the provided snapshot to update. - * Must be specified and non-empty. - * - * This object should have the same structure as [FieldMask]{@link google.protobuf.FieldMask} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const seconds = 123456; - * const expireTime = { - * seconds: seconds, - * }; - * const snapshot = { - * expireTime: expireTime, - * }; - * const pathsElement = 'expire_time'; - * const paths = [pathsElement]; - * const updateMask = { - * paths: paths, - * }; - * const request = { - * snapshot: snapshot, - * updateMask: updateMask, - * }; - * client.updateSnapshot(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - updateSnapshot(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - 'snapshot.name': request.snapshot.name, - }); - - return this._innerApiCalls.updateSnapshot(request, options, callback); - } - - /** - * Removes an existing snapshot. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot.

- * When the snapshot is deleted, all messages retained in the snapshot - * are immediately dropped. After a snapshot is deleted, a new one may be - * created with the same name, but the new one has no association with the old - * snapshot or its subscription, unless the same subscription is specified. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.snapshot - * Required. The name of the snapshot to delete. - * Format is `projects/{project}/snapshots/{snap}`. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error)} [callback] - * The function which will be called with the result of the API call. - * @returns {Promise} - The promise which resolves when API call finishes. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - * client.deleteSnapshot({snapshot: formattedSnapshot}).catch(err => { - * console.error(err); - * }); - */ - deleteSnapshot(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - snapshot: request.snapshot, - }); - - return this._innerApiCalls.deleteSnapshot(request, options, callback); - } - - /** - * Seeks an existing subscription to a point in time or to a given snapshot, - * whichever is provided in the request. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. Note that both the subscription and the snapshot - * must be on the same topic. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The subscription to affect. - * @param {Object} [request.time] - * The time to seek to. - * Messages retained in the subscription that were published before this - * time are marked as acknowledged, and messages retained in the - * subscription that were published after this time are marked as - * unacknowledged. Note that this operation affects only those messages - * retained in the subscription (configured by the combination of - * `message_retention_duration` and `retain_acked_messages`). For example, - * if `time` corresponds to a point before the message retention - * window (or to a point before the system's notion of the subscription - * creation time), only retained messages will be marked as unacknowledged, - * and already-expunged messages will not be restored. - * - * This object should have the same structure as [Timestamp]{@link google.protobuf.Timestamp} - * @param {string} [request.snapshot] - * The snapshot to seek to. The snapshot's topic must be the same as that of - * the provided subscription. - * Format is `projects/{project}/snapshots/{snap}`. - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedSubscription = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * client.seek({subscription: formattedSubscription}) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - seek(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription, - }); - - return this._innerApiCalls.seek(request, options, callback); - } - - /** - * Sets the access control policy on the specified resource. Replaces - * any existing policy. - * - * Can return Public Errors: NOT_FOUND, INVALID_ARGUMENT and - * PERMISSION_DENIED - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy is being specified. - * See the operation documentation for the appropriate value for this field. - * @param {Object} request.policy - * REQUIRED: The complete policy to be applied to the `resource`. The size of - * the policy is limited to a few 10s of KB. An empty policy is a - * valid policy but certain Cloud Platform services (such as Projects) - * might reject them. - * - * This object should have the same structure as [Policy]{@link google.iam.v1.Policy} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const policy = {}; - * const request = { - * resource: formattedResource, - * policy: policy, - * }; - * client.setIamPolicy(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - setIamPolicy(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - - return this._innerApiCalls.setIamPolicy(request, options, callback); - } - - /** - * Gets the access control policy for a resource. Returns an empty policy - * if the resource exists and does not have a policy set. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy is being requested. - * See the operation documentation for the appropriate value for this field. - * @param {Object} [request.options] - * OPTIONAL: A `GetPolicyOptions` object for specifying options to - * `GetIamPolicy`. This field is only used by Cloud IAM. - * - * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * client.getIamPolicy({resource: formattedResource}) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - getIamPolicy(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - - return this._innerApiCalls.getIamPolicy(request, options, callback); - } - - /** - * Returns permissions that a caller has on the specified resource. If the - * resource does not exist, this will return an empty set of - * permissions, not a NOT_FOUND error. - * - * Note: This operation is designed to be used for building - * permission-aware UIs and command-line tools, not for authorization - * checking. This operation may "fail open" without warning. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.resource - * REQUIRED: The resource for which the policy detail is being requested. - * See the operation documentation for the appropriate value for this field. - * @param {string[]} request.permissions - * The set of permissions to check for the `resource`. Permissions with - * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). - * @param {Object} [options] - * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. - * @param {function(?Error, ?Object)} [callback] - * The function which will be called with the result of the API call. - * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. - * - * @example - * - * const pubsub = require('@google-cloud/pubsub'); - * - * const client = new pubsub.v1.SubscriberClient({ - * // optional auth parameters. - * }); - * - * const formattedResource = client.subscriptionPath('[PROJECT]', '[SUBSCRIPTION]'); - * const permissions = []; - * const request = { - * resource: formattedResource, - * permissions: permissions, - * }; - * client.testIamPermissions(request) - * .then(responses => { - * const response = responses[0]; - * // doThingsWith(response) - * }) - * .catch(err => { - * console.error(err); - * }); - */ - testIamPermissions(request, options, callback) { - if (options instanceof Function && callback === undefined) { - callback = options; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - - return this._innerApiCalls.testIamPermissions(request, options, callback); - } - - // -------------------- - // -- Path templates -- - // -------------------- - - /** - * Return a fully-qualified project resource name string. - * - * @param {String} project - * @returns {String} - */ - projectPath(project) { - return this._pathTemplates.projectPathTemplate.render({ - project: project, - }); - } - - /** - * Return a fully-qualified snapshot resource name string. - * - * @param {String} project - * @param {String} snapshot - * @returns {String} - */ - snapshotPath(project, snapshot) { - return this._pathTemplates.snapshotPathTemplate.render({ - project: project, - snapshot: snapshot, - }); - } - - /** - * Return a fully-qualified subscription resource name string. - * - * @param {String} project - * @param {String} subscription - * @returns {String} - */ - subscriptionPath(project, subscription) { - return this._pathTemplates.subscriptionPathTemplate.render({ - project: project, - subscription: subscription, - }); - } - - /** - * Return a fully-qualified topic resource name string. - * - * @param {String} project - * @param {String} topic - * @returns {String} - */ - topicPath(project, topic) { - return this._pathTemplates.topicPathTemplate.render({ - project: project, - topic: topic, - }); - } - - /** - * Parse the projectName from a project resource. - * - * @param {String} projectName - * A fully-qualified path representing a project resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromProjectName(projectName) { - return this._pathTemplates.projectPathTemplate.match(projectName).project; - } - - /** - * Parse the snapshotName from a snapshot resource. - * - * @param {String} snapshotName - * A fully-qualified path representing a snapshot resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromSnapshotName(snapshotName) { - return this._pathTemplates.snapshotPathTemplate.match(snapshotName).project; - } - - /** - * Parse the snapshotName from a snapshot resource. - * - * @param {String} snapshotName - * A fully-qualified path representing a snapshot resources. - * @returns {String} - A string representing the snapshot. - */ - matchSnapshotFromSnapshotName(snapshotName) { - return this._pathTemplates.snapshotPathTemplate.match(snapshotName) - .snapshot; - } - - /** - * Parse the subscriptionName from a subscription resource. - * - * @param {String} subscriptionName - * A fully-qualified path representing a subscription resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromSubscriptionName(subscriptionName) { - return this._pathTemplates.subscriptionPathTemplate.match(subscriptionName) - .project; - } - - /** - * Parse the subscriptionName from a subscription resource. - * - * @param {String} subscriptionName - * A fully-qualified path representing a subscription resources. - * @returns {String} - A string representing the subscription. - */ - matchSubscriptionFromSubscriptionName(subscriptionName) { - return this._pathTemplates.subscriptionPathTemplate.match(subscriptionName) - .subscription; - } - - /** - * Parse the topicName from a topic resource. - * - * @param {String} topicName - * A fully-qualified path representing a topic resources. - * @returns {String} - A string representing the project. - */ - matchProjectFromTopicName(topicName) { - return this._pathTemplates.topicPathTemplate.match(topicName).project; - } - - /** - * Parse the topicName from a topic resource. - * - * @param {String} topicName - * A fully-qualified path representing a topic resources. - * @returns {String} - A string representing the topic. - */ - matchTopicFromTopicName(topicName) { - return this._pathTemplates.topicPathTemplate.match(topicName).topic; - } -} - -module.exports = SubscriberClient; diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts new file mode 100644 index 00000000000..097a264c4c0 --- /dev/null +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -0,0 +1,2243 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** + +import * as gax from 'google-gax'; +import { + Callback, + CallOptions, + Descriptors, + ClientOptions, + PaginationCallback, + GaxCall, +} from 'google-gax'; +import * as path from 'path'; + +import {Transform} from 'stream'; +import {RequestType} from 'google-gax/build/src/apitypes'; +import * as protos from '../../protos/protos'; +import * as gapicConfig from './subscriber_client_config.json'; +import {IamClient} from '../helper'; + +const version = require('../../../package.json').version; + +/** + * The service that an application uses to manipulate subscriptions and to + * consume messages from a subscription via the `Pull` method or by + * establishing a bi-directional stream using the `StreamingPull` method. + * @class + * @memberof v1 + */ +export class SubscriberClient { + private _terminated = false; + private _iamClient: IamClient; + private _opts: ClientOptions; + private _gaxModule: typeof gax | typeof gax.fallback; + private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; + private _protos: {}; + private _defaults: {[method: string]: gax.CallSettings}; + auth: gax.GoogleAuth; + descriptors: Descriptors = { + page: {}, + stream: {}, + longrunning: {}, + batching: {}, + }; + innerApiCalls: {[name: string]: Function}; + pathTemplates: {[name: string]: gax.PathTemplate}; + subscriberStub?: Promise<{[name: string]: Function}>; + + /** + * Construct an instance of SubscriberClient. + * + * @param {object} [options] - The configuration object. See the subsequent + * parameters for more details. + * @param {object} [options.credentials] - Credentials object. + * @param {string} [options.credentials.client_email] + * @param {string} [options.credentials.private_key] + * @param {string} [options.email] - Account email address. Required when + * using a .pem or .p12 keyFilename. + * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or + * .p12 key downloaded from the Google Developers Console. If you provide + * a path to a JSON file, the projectId option below is not necessary. + * NOTE: .pem and .p12 require you to specify options.email as well. + * @param {number} [options.port] - The port on which to connect to + * the remote host. + * @param {string} [options.projectId] - The project ID from the Google + * Developer's Console, e.g. 'grape-spaceship-123'. We will also check + * the environment variable GCLOUD_PROJECT for your project ID. If your + * app is running in an environment which supports + * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, + * your project ID will be detected automatically. + * @param {string} [options.apiEndpoint] - The domain name of the + * API remote host. + */ + + constructor(opts?: ClientOptions) { + // Ensure that options include the service address and port. + const staticMembers = this.constructor as typeof SubscriberClient; + const servicePath = + opts && opts.servicePath + ? opts.servicePath + : opts && opts.apiEndpoint + ? opts.apiEndpoint + : staticMembers.servicePath; + const port = opts && opts.port ? opts.port : staticMembers.port; + + if (!opts) { + opts = {servicePath, port}; + } + opts.servicePath = opts.servicePath || servicePath; + opts.port = opts.port || port; + opts.clientConfig = opts.clientConfig || {}; + + const isBrowser = typeof window !== 'undefined'; + if (isBrowser) { + opts.fallback = true; + } + // If we are in browser, we are already using fallback because of the + // "browser" field in package.json. + // But if we were explicitly requested to use fallback, let's do it now. + this._gaxModule = !isBrowser && opts.fallback ? gax.fallback : gax; + + // Create a `gaxGrpc` object, with any grpc-specific options + // sent to the client. + opts.scopes = (this.constructor as typeof SubscriberClient).scopes; + this._gaxGrpc = new this._gaxModule.GrpcClient(opts); + + // Save options to use in initialize() method. + this._opts = opts; + + // Save the auth object to the client, for use by other methods. + this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + + this._iamClient = new IamClient(opts); + // Determine the client header string. + const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; + if (typeof process !== 'undefined' && 'versions' in process) { + clientHeader.push(`gl-node/${process.versions.node}`); + } else { + clientHeader.push(`gl-web/${this._gaxModule.version}`); + } + if (!opts.fallback) { + clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } + if (opts.libName && opts.libVersion) { + clientHeader.push(`${opts.libName}/${opts.libVersion}`); + } + // Load the applicable protos. + // For Node.js, pass the path to JSON proto file. + // For browsers, pass the JSON content. + + const nodejsProtoPath = path.join( + __dirname, + '..', + '..', + 'protos', + 'protos.json' + ); + this._protos = this._gaxGrpc.loadProto( + opts.fallback + ? // eslint-disable-next-line @typescript-eslint/no-var-requires + require('../../protos/protos.json') + : nodejsProtoPath + ); + + // This API contains "path templates"; forward-slash-separated + // identifiers to uniquely identify resources within the API. + // Create useful helper objects for these. + this.pathTemplates = { + projectPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}' + ), + projectTopicPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/topics/{topic}' + ), + snapshotPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/snapshots/{snapshot}' + ), + subscriptionPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/subscriptions/{subscription}' + ), + }; + + // Some of the methods on this service return "paged" results, + // (e.g. 50 results at a time, with tokens to get subsequent + // pages). Denote the keys used for pagination and results. + this.descriptors.page = { + listSubscriptions: new this._gaxModule.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'subscriptions' + ), + listSnapshots: new this._gaxModule.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'snapshots' + ), + }; + + // Some of the methods on this service provide streaming responses. + // Provide descriptors for these. + this.descriptors.stream = { + streamingPull: new this._gaxModule.StreamDescriptor( + gax.StreamType.BIDI_STREAMING + ), + }; + + // Put together the default options sent with requests. + this._defaults = this._gaxGrpc.constructSettings( + 'google.pubsub.v1.Subscriber', + gapicConfig as gax.ClientConfig, + opts.clientConfig || {}, + {'x-goog-api-client': clientHeader.join(' ')} + ); + + // Set up a dictionary of "inner API calls"; the core implementation + // of calling the API is handled in `google-gax`, with this code + // merely providing the destination and request information. + this.innerApiCalls = {}; + } + + /** + * Initialize the client. + * Performs asynchronous operations (such as authentication) and prepares the client. + * This function will be called automatically when any class method is called for the + * first time, but if you need to initialize it before calling an actual method, + * feel free to call initialize() directly. + * + * You can await on this method if you want to make sure the client is initialized. + * + * @returns {Promise} A promise that resolves to an authenticated service stub. + */ + initialize() { + // If the client stub promise is already initialized, return immediately. + if (this.subscriberStub) { + return this.subscriberStub; + } + + // Put together the "service stub" for + // google.pubsub.v1.Subscriber. + this.subscriberStub = this._gaxGrpc.createStub( + this._opts.fallback + ? (this._protos as protobuf.Root).lookupService( + 'google.pubsub.v1.Subscriber' + ) + : // tslint:disable-next-line no-any + (this._protos as any).google.pubsub.v1.Subscriber, + this._opts + ) as Promise<{[method: string]: Function}>; + + // Iterate over each of the methods that the service provides + // and create an API call method for each. + const subscriberStubMethods = [ + 'createSubscription', + 'getSubscription', + 'updateSubscription', + 'listSubscriptions', + 'deleteSubscription', + 'modifyAckDeadline', + 'acknowledge', + 'pull', + 'streamingPull', + 'modifyPushConfig', + 'getSnapshot', + 'listSnapshots', + 'createSnapshot', + 'updateSnapshot', + 'deleteSnapshot', + 'seek', + ]; + for (const methodName of subscriberStubMethods) { + const callPromise = this.subscriberStub.then( + stub => (...args: Array<{}>) => { + if (this._terminated) { + return Promise.reject('The client has already been closed.'); + } + const func = stub[methodName]; + return func.apply(stub, args); + }, + (err: Error | null | undefined) => () => { + throw err; + } + ); + + const apiCall = this._gaxModule.createApiCall( + callPromise, + this._defaults[methodName], + this.descriptors.page[methodName] || + this.descriptors.stream[methodName] || + this.descriptors.longrunning[methodName] + ); + + this.innerApiCalls[methodName] = apiCall; + } + + return this.subscriberStub; + } + + /** + * The DNS address for this API service. + */ + static get servicePath() { + return 'pubsub.googleapis.com'; + } + + /** + * The DNS address for this API service - same as servicePath(), + * exists for compatibility reasons. + */ + static get apiEndpoint() { + return 'pubsub.googleapis.com'; + } + + /** + * The port for this API service. + */ + static get port() { + return 443; + } + + /** + * The scopes needed to make gRPC calls for every method defined + * in this service. + */ + static get scopes() { + return [ + 'https://www.googleapis.com/auth/cloud-platform', + 'https://www.googleapis.com/auth/pubsub', + ]; + } + + getProjectId(): Promise; + getProjectId(callback: Callback): void; + /** + * Return the project ID used by this class. + * @param {function(Error, string)} callback - the callback to + * be called with the current project Id. + */ + getProjectId( + callback?: Callback + ): Promise | void { + if (callback) { + this.auth.getProjectId(callback); + return; + } + return this.auth.getProjectId(); + } + + // ------------------- + // -- Service calls -- + // ------------------- + createSubscription( + request: protos.google.pubsub.v1.ISubscription, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | undefined, + {} | undefined + ] + >; + createSubscription( + request: protos.google.pubsub.v1.ISubscription, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | null | undefined, + {} | null | undefined + > + ): void; + createSubscription( + request: protos.google.pubsub.v1.ISubscription, + callback: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | null | undefined, + {} | null | undefined + > + ): void; + /** + * Creates a subscription to a given topic. See the + * + * resource name rules. + * If the subscription already exists, returns `ALREADY_EXISTS`. + * If the corresponding topic doesn't exist, returns `NOT_FOUND`. + * + * If the name is not provided in the request, the server will assign a random + * name for this subscription on the same project as the topic, conforming + * to the + * [resource name + * format](https://cloud.google.com/pubsub/docs/admin#resource_names). The + * generated name is populated in the returned Subscription object. Note that + * for REST API requests, you must specify a name in the request. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the subscription. It must have the format + * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must + * start with a letter, and contain only letters (`[A-Za-z]`), numbers + * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), + * plus (`+`) or percent signs (`%`). It must be between 3 and 255 characters + * in length, and it must not start with `"goog"`. + * @param {string} request.topic + * Required. The name of the topic from which this subscription is receiving + * messages. Format is `projects/{project}/topics/{topic}`. The value of this + * field will be `_deleted-topic_` if the topic has been deleted. + * @param {google.pubsub.v1.PushConfig} request.pushConfig + * If push delivery is used with this subscription, this field is + * used to configure it. An empty `pushConfig` signifies that the subscriber + * will pull and ack messages using API methods. + * @param {number} request.ackDeadlineSeconds + * The approximate amount of time (on a best-effort basis) Pub/Sub waits for + * the subscriber to acknowledge receipt before resending the message. In the + * interval after the message is delivered and before it is acknowledged, it + * is considered to be outstanding. During that time period, the + * message will not be redelivered (on a best-effort basis). + * + * For pull subscriptions, this value is used as the initial value for the ack + * deadline. To override this value for a given message, call + * `ModifyAckDeadline` with the corresponding `ack_id` if using + * non-streaming pull or send the `ack_id` in a + * `StreamingModifyAckDeadlineRequest` if using streaming pull. + * The minimum custom deadline you can specify is 10 seconds. + * The maximum custom deadline you can specify is 600 seconds (10 minutes). + * If this parameter is 0, a default value of 10 seconds is used. + * + * For push delivery, this value is also used to set the request timeout for + * the call to the push endpoint. + * + * If the subscriber never acknowledges the message, the Pub/Sub + * system will eventually redeliver the message. + * @param {boolean} request.retainAckedMessages + * Indicates whether to retain acknowledged messages. If true, then + * messages are not expunged from the subscription's backlog, even if they are + * acknowledged, until they fall out of the `message_retention_duration` + * window. This must be true if you would like to + * + * Seek to a timestamp. + * @param {google.protobuf.Duration} request.messageRetentionDuration + * How long to retain unacknowledged messages in the subscription's backlog, + * from the moment a message is published. + * If `retain_acked_messages` is true, then this also configures the retention + * of acknowledged messages, and thus configures how far back in time a `Seek` + * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 + * minutes. + * @param {number[]} request.labels + * See Creating and + * managing labels. + * @param {boolean} request.enableMessageOrdering + * If true, messages published with the same `ordering_key` in `PubsubMessage` + * will be delivered to the subscribers in the order in which they + * are received by the Pub/Sub system. Otherwise, they may be delivered in + * any order. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * @param {google.pubsub.v1.ExpirationPolicy} request.expirationPolicy + * A policy that specifies the conditions for this subscription's expiration. + * A subscription is considered active as long as any connected subscriber is + * successfully consuming messages from the subscription or is issuing + * operations on the subscription. If `expiration_policy` is not set, a + * *default policy* with `ttl` of 31 days will be used. The minimum allowed + * value for `expiration_policy.ttl` is 1 day. + * @param {string} request.filter + * An expression written in the Cloud Pub/Sub filter language. If non-empty, + * then only `PubsubMessage`s whose `attributes` field matches the filter are + * delivered on this subscription. If empty, then no messages are filtered + * out. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * @param {google.pubsub.v1.DeadLetterPolicy} request.deadLetterPolicy + * A policy that specifies the conditions for dead lettering messages in + * this subscription. If dead_letter_policy is not set, dead lettering + * is disabled. + * + * The Cloud Pub/Sub service account associated with this subscriptions's + * parent project (i.e., + * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have + * permission to Acknowledge() messages on this subscription. + * EXPERIMENTAL: This feature is part of a closed alpha release. This + * API might be changed in backward-incompatible ways and is not recommended + * for production use. It is not subject to any SLA or deprecation policy. + * @param {google.pubsub.v1.RetryPolicy} request.retryPolicy + * A policy that specifies how Cloud Pub/Sub retries message delivery for this + * subscription. + * + * If not set, the default retry policy is applied. This generally implies + * that messages will be retried as soon as possible for healthy subscribers. + * RetryPolicy will be triggered on NACKs or acknowledgement deadline + * exceeded events for a given message. + * EXPERIMENTAL: This API might be changed in backward-incompatible + * ways and is not recommended for production use. It is not subject to any + * SLA or deprecation policy. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + createSubscription( + request: protos.google.pubsub.v1.ISubscription, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + name: request.name || '', + }); + this.initialize(); + return this.innerApiCalls.createSubscription(request, options, callback); + } + getSubscription( + request: protos.google.pubsub.v1.IGetSubscriptionRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IGetSubscriptionRequest | undefined, + {} | undefined + ] + >; + getSubscription( + request: protos.google.pubsub.v1.IGetSubscriptionRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): void; + getSubscription( + request: protos.google.pubsub.v1.IGetSubscriptionRequest, + callback: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Gets the configuration details of a subscription. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The name of the subscription to get. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + getSubscription( + request: protos.google.pubsub.v1.IGetSubscriptionRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IGetSubscriptionRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); + this.initialize(); + return this.innerApiCalls.getSubscription(request, options, callback); + } + updateSubscription( + request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IUpdateSubscriptionRequest | undefined, + {} | undefined + ] + >; + updateSubscription( + request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): void; + updateSubscription( + request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, + callback: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Updates an existing subscription. Note that certain properties of a + * subscription, such as its topic, are not modifiable. + * + * @param {Object} request + * The request object that will be sent. + * @param {google.pubsub.v1.Subscription} request.subscription + * Required. The updated subscription object. + * @param {google.protobuf.FieldMask} request.updateMask + * Required. Indicates which fields in the provided subscription to update. + * Must be specified and non-empty. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + updateSubscription( + request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IUpdateSubscriptionRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + 'subscription.name': request.subscription!.name || '', + }); + this.initialize(); + return this.innerApiCalls.updateSubscription(request, options, callback); + } + deleteSubscription( + request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSubscriptionRequest | undefined, + {} | undefined + ] + >; + deleteSubscription( + request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): void; + deleteSubscription( + request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Deletes an existing subscription. All messages retained in the subscription + * are immediately dropped. Calls to `Pull` after deletion will return + * `NOT_FOUND`. After a subscription is deleted, a new one may be created with + * the same name, but the new one has no association with the old + * subscription or its topic unless the same topic is specified. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The subscription to delete. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + deleteSubscription( + request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSubscriptionRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); + this.initialize(); + return this.innerApiCalls.deleteSubscription(request, options, callback); + } + modifyAckDeadline( + request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | undefined, + {} | undefined + ] + >; + modifyAckDeadline( + request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, + {} | null | undefined + > + ): void; + modifyAckDeadline( + request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Modifies the ack deadline for a specific message. This method is useful + * to indicate that more time is needed to process a message by the + * subscriber, or to make the message available for redelivery if the + * processing was interrupted. Note that this does not modify the + * subscription-level `ackDeadlineSeconds` used for subsequent messages. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {string[]} request.ackIds + * Required. List of acknowledgment IDs. + * @param {number} request.ackDeadlineSeconds + * Required. The new ack deadline with respect to the time this request was + * sent to the Pub/Sub system. For example, if the value is 10, the new ack + * deadline will expire 10 seconds after the `ModifyAckDeadline` call was + * made. Specifying zero might immediately make the message available for + * delivery to another subscriber client. This typically results in an + * increase in the rate of message redeliveries (that is, duplicates). + * The minimum deadline you can specify is 0 seconds. + * The maximum deadline you can specify is 600 seconds (10 minutes). + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + modifyAckDeadline( + request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); + this.initialize(); + return this.innerApiCalls.modifyAckDeadline(request, options, callback); + } + acknowledge( + request: protos.google.pubsub.v1.IAcknowledgeRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | undefined, + {} | undefined + ] + >; + acknowledge( + request: protos.google.pubsub.v1.IAcknowledgeRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, + {} | null | undefined + > + ): void; + acknowledge( + request: protos.google.pubsub.v1.IAcknowledgeRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Acknowledges the messages associated with the `ack_ids` in the + * `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages + * from the subscription. + * + * Acknowledging a message whose ack deadline has expired may succeed, + * but such a message may be redelivered later. Acknowledging a message more + * than once will not result in an error. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The subscription whose message is being acknowledged. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {string[]} request.ackIds + * Required. The acknowledgment ID for the messages being acknowledged that + * was returned by the Pub/Sub system in the `Pull` response. Must not be + * empty. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + acknowledge( + request: protos.google.pubsub.v1.IAcknowledgeRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); + this.initialize(); + return this.innerApiCalls.acknowledge(request, options, callback); + } + pull( + request: protos.google.pubsub.v1.IPullRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | undefined, + {} | undefined + ] + >; + pull( + request: protos.google.pubsub.v1.IPullRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | null | undefined, + {} | null | undefined + > + ): void; + pull( + request: protos.google.pubsub.v1.IPullRequest, + callback: Callback< + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Pulls messages from the server. The server may return `UNAVAILABLE` if + * there are too many concurrent pull requests pending for the given + * subscription. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The subscription from which messages should be pulled. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {boolean} [request.returnImmediately] + * Optional. If this field set to true, the system will respond immediately + * even if it there are no messages available to return in the `Pull` + * response. Otherwise, the system may wait (for a bounded amount of time) + * until at least one message is available, rather than returning no messages. + * Warning: setting this field to `true` is discouraged because it adversely + * impacts the performance of `Pull` operations. We recommend that users do + * not set this field. + * @param {number} request.maxMessages + * Required. The maximum number of messages to return for this request. Must + * be a positive integer. The Pub/Sub system may return fewer than the number + * specified. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + pull( + request: protos.google.pubsub.v1.IPullRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); + this.initialize(); + return this.innerApiCalls.pull(request, options, callback); + } + modifyPushConfig( + request: protos.google.pubsub.v1.IModifyPushConfigRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | undefined, + {} | undefined + ] + >; + modifyPushConfig( + request: protos.google.pubsub.v1.IModifyPushConfigRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, + {} | null | undefined + > + ): void; + modifyPushConfig( + request: protos.google.pubsub.v1.IModifyPushConfigRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Modifies the `PushConfig` for a specified subscription. + * + * This may be used to change a push subscription to a pull one (signified by + * an empty `PushConfig`) or vice versa, or change the endpoint URL and other + * attributes of a push subscription. Messages will accumulate for delivery + * continuously through the call regardless of changes to the `PushConfig`. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The name of the subscription. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {google.pubsub.v1.PushConfig} request.pushConfig + * Required. The push configuration for future deliveries. + * + * An empty `pushConfig` indicates that the Pub/Sub system should + * stop pushing messages from the given subscription and allow + * messages to be pulled and acknowledged - effectively pausing + * the subscription if `Pull` or `StreamingPull` is not called. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + modifyPushConfig( + request: protos.google.pubsub.v1.IModifyPushConfigRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); + this.initialize(); + return this.innerApiCalls.modifyPushConfig(request, options, callback); + } + getSnapshot( + request: protos.google.pubsub.v1.IGetSnapshotRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IGetSnapshotRequest | undefined, + {} | undefined + ] + >; + getSnapshot( + request: protos.google.pubsub.v1.IGetSnapshotRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + getSnapshot( + request: protos.google.pubsub.v1.IGetSnapshotRequest, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Gets the configuration details of a snapshot. Snapshots are used in + * Seek + * operations, which allow you to manage message acknowledgments in bulk. That + * is, you can set the acknowledgment state of messages in an existing + * subscription to the state captured by a snapshot. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.snapshot + * Required. The name of the snapshot to get. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + getSnapshot( + request: protos.google.pubsub.v1.IGetSnapshotRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IGetSnapshotRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + snapshot: request.snapshot || '', + }); + this.initialize(); + return this.innerApiCalls.getSnapshot(request, options, callback); + } + createSnapshot( + request: protos.google.pubsub.v1.ICreateSnapshotRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | undefined, + {} | undefined + ] + >; + createSnapshot( + request: protos.google.pubsub.v1.ICreateSnapshotRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + createSnapshot( + request: protos.google.pubsub.v1.ICreateSnapshotRequest, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Creates a snapshot from the requested subscription. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot. + *

If the snapshot already exists, returns `ALREADY_EXISTS`. + * If the requested subscription doesn't exist, returns `NOT_FOUND`. + * If the backlog in the subscription is too old -- and the resulting snapshot + * would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. + * See also the `Snapshot.expire_time` field. If the name is not provided in + * the request, the server will assign a random + * name for this snapshot on the same project as the subscription, conforming + * to the + * [resource name + * format](https://cloud.google.com/pubsub/docs/admin#resource_names). The + * generated name is populated in the returned Snapshot object. Note that for + * REST API requests, you must specify a name in the request. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. User-provided name for this snapshot. If the name is not provided + * in the request, the server will assign a random name for this snapshot on + * the same project as the subscription. Note that for REST API requests, you + * must specify a name. See the resource + * name rules. Format is `projects/{project}/snapshots/{snap}`. + * @param {string} request.subscription + * Required. The subscription whose backlog the snapshot retains. + * Specifically, the created snapshot is guaranteed to retain: + * (a) The existing backlog on the subscription. More precisely, this is + * defined as the messages in the subscription's backlog that are + * unacknowledged upon the successful completion of the + * `CreateSnapshot` request; as well as: + * (b) Any messages published to the subscription's topic following the + * successful completion of the CreateSnapshot request. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {number[]} request.labels + * See Creating and + * managing labels. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + createSnapshot( + request: protos.google.pubsub.v1.ICreateSnapshotRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + name: request.name || '', + }); + this.initialize(); + return this.innerApiCalls.createSnapshot(request, options, callback); + } + updateSnapshot( + request: protos.google.pubsub.v1.IUpdateSnapshotRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | undefined, + {} | undefined + ] + >; + updateSnapshot( + request: protos.google.pubsub.v1.IUpdateSnapshotRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + updateSnapshot( + request: protos.google.pubsub.v1.IUpdateSnapshotRequest, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Updates an existing snapshot. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot. + * + * @param {Object} request + * The request object that will be sent. + * @param {google.pubsub.v1.Snapshot} request.snapshot + * Required. The updated snapshot object. + * @param {google.protobuf.FieldMask} request.updateMask + * Required. Indicates which fields in the provided snapshot to update. + * Must be specified and non-empty. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + updateSnapshot( + request: protos.google.pubsub.v1.IUpdateSnapshotRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + 'snapshot.name': request.snapshot!.name || '', + }); + this.initialize(); + return this.innerApiCalls.updateSnapshot(request, options, callback); + } + deleteSnapshot( + request: protos.google.pubsub.v1.IDeleteSnapshotRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | undefined, + {} | undefined + ] + >; + deleteSnapshot( + request: protos.google.pubsub.v1.IDeleteSnapshotRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + deleteSnapshot( + request: protos.google.pubsub.v1.IDeleteSnapshotRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Removes an existing snapshot. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot.

+ * When the snapshot is deleted, all messages retained in the snapshot + * are immediately dropped. After a snapshot is deleted, a new one may be + * created with the same name, but the new one has no association with the old + * snapshot or its subscription, unless the same subscription is specified. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.snapshot + * Required. The name of the snapshot to delete. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + deleteSnapshot( + request: protos.google.pubsub.v1.IDeleteSnapshotRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + snapshot: request.snapshot || '', + }); + this.initialize(); + return this.innerApiCalls.deleteSnapshot(request, options, callback); + } + seek( + request: protos.google.pubsub.v1.ISeekRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | undefined, + {} | undefined + ] + >; + seek( + request: protos.google.pubsub.v1.ISeekRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | null | undefined, + {} | null | undefined + > + ): void; + seek( + request: protos.google.pubsub.v1.ISeekRequest, + callback: Callback< + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Seeks an existing subscription to a point in time or to a given snapshot, + * whichever is provided in the request. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot. Note that both the subscription and the snapshot + * must be on the same topic. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The subscription to affect. + * @param {google.protobuf.Timestamp} request.time + * The time to seek to. + * Messages retained in the subscription that were published before this + * time are marked as acknowledged, and messages retained in the + * subscription that were published after this time are marked as + * unacknowledged. Note that this operation affects only those messages + * retained in the subscription (configured by the combination of + * `message_retention_duration` and `retain_acked_messages`). For example, + * if `time` corresponds to a point before the message retention + * window (or to a point before the system's notion of the subscription + * creation time), only retained messages will be marked as unacknowledged, + * and already-expunged messages will not be restored. + * @param {string} request.snapshot + * The snapshot to seek to. The snapshot's topic must be the same as that of + * the provided subscription. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + seek( + request: protos.google.pubsub.v1.ISeekRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); + this.initialize(); + return this.innerApiCalls.seek(request, options, callback); + } + + /** + * Establishes a stream with the server, which sends messages down to the + * client. The client streams acknowledgements and ack deadline modifications + * back to the server. The server will close the stream and return the status + * on any error. The server may close the stream with status `UNAVAILABLE` to + * reassign server-side resources, in which case, the client should + * re-establish the stream. Flow control can be achieved by configuring the + * underlying RPC channel. + * + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Stream} + * An object stream which is both readable and writable. It accepts objects + * representing [StreamingPullRequest]{@link google.pubsub.v1.StreamingPullRequest} for write() method, and + * will emit objects representing [StreamingPullResponse]{@link google.pubsub.v1.StreamingPullResponse} on 'data' event asynchronously. + */ + streamingPull(options?: gax.CallOptions): gax.CancellableStream { + this.initialize(); + return this.innerApiCalls.streamingPull(options); + } + + listSubscriptions( + request: protos.google.pubsub.v1.IListSubscriptionsRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISubscription[], + protos.google.pubsub.v1.IListSubscriptionsRequest | null, + protos.google.pubsub.v1.IListSubscriptionsResponse + ] + >; + listSubscriptions( + request: protos.google.pubsub.v1.IListSubscriptionsRequest, + options: gax.CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSubscriptionsRequest, + protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, + protos.google.pubsub.v1.ISubscription + > + ): void; + listSubscriptions( + request: protos.google.pubsub.v1.IListSubscriptionsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSubscriptionsRequest, + protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, + protos.google.pubsub.v1.ISubscription + > + ): void; + /** + * Lists matching subscriptions. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list subscriptions. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of subscriptions to return. + * @param {string} request.pageToken + * The value returned by the last `ListSubscriptionsResponse`; indicates that + * this is a continuation of a prior `ListSubscriptions` call, and that the + * system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Subscription]{@link google.pubsub.v1.Subscription}. + * The client library support auto-pagination by default: it will call the API as many + * times as needed and will merge results from all the pages into this array. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Subscription]{@link google.pubsub.v1.Subscription} that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListSubscriptionsRequest]{@link google.pubsub.v1.ListSubscriptionsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListSubscriptionsResponse]{@link google.pubsub.v1.ListSubscriptionsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + listSubscriptions( + request: protos.google.pubsub.v1.IListSubscriptionsRequest, + optionsOrCallback?: + | gax.CallOptions + | PaginationCallback< + protos.google.pubsub.v1.IListSubscriptionsRequest, + protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, + protos.google.pubsub.v1.ISubscription + >, + callback?: PaginationCallback< + protos.google.pubsub.v1.IListSubscriptionsRequest, + protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, + protos.google.pubsub.v1.ISubscription + > + ): Promise< + [ + protos.google.pubsub.v1.ISubscription[], + protos.google.pubsub.v1.IListSubscriptionsRequest | null, + protos.google.pubsub.v1.IListSubscriptionsResponse + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + this.initialize(); + return this.innerApiCalls.listSubscriptions(request, options, callback); + } + + /** + * Equivalent to {@link listSubscriptions}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listSubscriptions} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list subscriptions. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of subscriptions to return. + * @param {string} request.pageToken + * The value returned by the last `ListSubscriptionsResponse`; indicates that + * this is a continuation of a prior `ListSubscriptions` call, and that the + * system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Stream} + * An object stream which emits an object representing [Subscription]{@link google.pubsub.v1.Subscription} on 'data' event. + */ + listSubscriptionsStream( + request?: protos.google.pubsub.v1.IListSubscriptionsRequest, + options?: gax.CallOptions + ): Transform { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listSubscriptions.createStream( + this.innerApiCalls.listSubscriptions as gax.GaxCall, + request, + callSettings + ); + } + + /** + * Equivalent to {@link listSubscriptions}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list subscriptions. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of subscriptions to return. + * @param {string} request.pageToken + * The value returned by the last `ListSubscriptionsResponse`; indicates that + * this is a continuation of a prior `ListSubscriptions` call, and that the + * system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Object} + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + */ + listSubscriptionsAsync( + request?: protos.google.pubsub.v1.IListSubscriptionsRequest, + options?: gax.CallOptions + ): AsyncIterable { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + options = options || {}; + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listSubscriptions.asyncIterate( + this.innerApiCalls['listSubscriptions'] as GaxCall, + (request as unknown) as RequestType, + callSettings + ) as AsyncIterable; + } + listSnapshots( + request: protos.google.pubsub.v1.IListSnapshotsRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot[], + protos.google.pubsub.v1.IListSnapshotsRequest | null, + protos.google.pubsub.v1.IListSnapshotsResponse + ] + >; + listSnapshots( + request: protos.google.pubsub.v1.IListSnapshotsRequest, + options: gax.CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSnapshotsRequest, + protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, + protos.google.pubsub.v1.ISnapshot + > + ): void; + listSnapshots( + request: protos.google.pubsub.v1.IListSnapshotsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSnapshotsRequest, + protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, + protos.google.pubsub.v1.ISnapshot + > + ): void; + /** + * Lists the existing snapshots. Snapshots are used in + * Seek + * operations, which allow + * you to manage message acknowledgments in bulk. That is, you can set the + * acknowledgment state of messages in an existing subscription to the state + * captured by a snapshot. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list snapshots. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of snapshots to return. + * @param {string} request.pageToken + * The value returned by the last `ListSnapshotsResponse`; indicates that this + * is a continuation of a prior `ListSnapshots` call, and that the system + * should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The client library support auto-pagination by default: it will call the API as many + * times as needed and will merge results from all the pages into this array. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Snapshot]{@link google.pubsub.v1.Snapshot} that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListSnapshotsRequest]{@link google.pubsub.v1.ListSnapshotsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListSnapshotsResponse]{@link google.pubsub.v1.ListSnapshotsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + listSnapshots( + request: protos.google.pubsub.v1.IListSnapshotsRequest, + optionsOrCallback?: + | gax.CallOptions + | PaginationCallback< + protos.google.pubsub.v1.IListSnapshotsRequest, + protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, + protos.google.pubsub.v1.ISnapshot + >, + callback?: PaginationCallback< + protos.google.pubsub.v1.IListSnapshotsRequest, + protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, + protos.google.pubsub.v1.ISnapshot + > + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot[], + protos.google.pubsub.v1.IListSnapshotsRequest | null, + protos.google.pubsub.v1.IListSnapshotsResponse + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + this.initialize(); + return this.innerApiCalls.listSnapshots(request, options, callback); + } + + /** + * Equivalent to {@link listSnapshots}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listSnapshots} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list snapshots. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of snapshots to return. + * @param {string} request.pageToken + * The value returned by the last `ListSnapshotsResponse`; indicates that this + * is a continuation of a prior `ListSnapshots` call, and that the system + * should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Stream} + * An object stream which emits an object representing [Snapshot]{@link google.pubsub.v1.Snapshot} on 'data' event. + */ + listSnapshotsStream( + request?: protos.google.pubsub.v1.IListSnapshotsRequest, + options?: gax.CallOptions + ): Transform { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listSnapshots.createStream( + this.innerApiCalls.listSnapshots as gax.GaxCall, + request, + callSettings + ); + } + + /** + * Equivalent to {@link listSnapshots}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.project + * Required. The name of the project in which to list snapshots. + * Format is `projects/{project-id}`. + * @param {number} request.pageSize + * Maximum number of snapshots to return. + * @param {string} request.pageToken + * The value returned by the last `ListSnapshotsResponse`; indicates that this + * is a continuation of a prior `ListSnapshots` call, and that the system + * should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Object} + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + */ + listSnapshotsAsync( + request?: protos.google.pubsub.v1.IListSnapshotsRequest, + options?: gax.CallOptions + ): AsyncIterable { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + project: request.project || '', + }); + options = options || {}; + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listSnapshots.asyncIterate( + this.innerApiCalls['listSnapshots'] as GaxCall, + (request as unknown) as RequestType, + callSettings + ) as AsyncIterable; + } + // -------------------- + // -- Path templates -- + // -------------------- + + /** + * Return a fully-qualified project resource name string. + * + * @param {string} project + * @returns {string} Resource name string. + */ + projectPath(project: string) { + return this.pathTemplates.projectPathTemplate.render({ + project, + }); + } + + /** + * Parse the project from Project resource. + * + * @param {string} projectName + * A fully-qualified path representing Project resource. + * @returns {string} A string representing the project. + */ + matchProjectFromProjectName(projectName: string) { + return this.pathTemplates.projectPathTemplate.match(projectName).project; + } + + /** + * Return a fully-qualified projectTopic resource name string. + * + * @param {string} project + * @param {string} topic + * @returns {string} Resource name string. + */ + projectTopicPath(project: string, topic: string) { + return this.pathTemplates.projectTopicPathTemplate.render({ + project, + topic, + }); + } + + /** + * Parse the project from ProjectTopic resource. + * + * @param {string} projectTopicName + * A fully-qualified path representing project_topic resource. + * @returns {string} A string representing the project. + */ + matchProjectFromProjectTopicName(projectTopicName: string) { + return this.pathTemplates.projectTopicPathTemplate.match(projectTopicName) + .project; + } + + /** + * Parse the topic from ProjectTopic resource. + * + * @param {string} projectTopicName + * A fully-qualified path representing project_topic resource. + * @returns {string} A string representing the topic. + */ + matchTopicFromProjectTopicName(projectTopicName: string) { + return this.pathTemplates.projectTopicPathTemplate.match(projectTopicName) + .topic; + } + + /** + * Return a fully-qualified snapshot resource name string. + * + * @param {string} project + * @param {string} snapshot + * @returns {string} Resource name string. + */ + snapshotPath(project: string, snapshot: string) { + return this.pathTemplates.snapshotPathTemplate.render({ + project, + snapshot, + }); + } + + /** + * Parse the project from Snapshot resource. + * + * @param {string} snapshotName + * A fully-qualified path representing Snapshot resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSnapshotName(snapshotName: string) { + return this.pathTemplates.snapshotPathTemplate.match(snapshotName).project; + } + + /** + * Parse the snapshot from Snapshot resource. + * + * @param {string} snapshotName + * A fully-qualified path representing Snapshot resource. + * @returns {string} A string representing the snapshot. + */ + matchSnapshotFromSnapshotName(snapshotName: string) { + return this.pathTemplates.snapshotPathTemplate.match(snapshotName).snapshot; + } + + /** + * Return a fully-qualified subscription resource name string. + * + * @param {string} project + * @param {string} subscription + * @returns {string} Resource name string. + */ + subscriptionPath(project: string, subscription: string) { + return this.pathTemplates.subscriptionPathTemplate.render({ + project, + subscription, + }); + } + + /** + * Parse the project from Subscription resource. + * + * @param {string} subscriptionName + * A fully-qualified path representing Subscription resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSubscriptionName(subscriptionName: string) { + return this.pathTemplates.subscriptionPathTemplate.match(subscriptionName) + .project; + } + + /** + * Parse the subscription from Subscription resource. + * + * @param {string} subscriptionName + * A fully-qualified path representing Subscription resource. + * @returns {string} A string representing the subscription. + */ + matchSubscriptionFromSubscriptionName(subscriptionName: string) { + return this.pathTemplates.subscriptionPathTemplate.match(subscriptionName) + .subscription; + } + + /** + * Terminate the GRPC channel and close the client. + * + * The client will no longer be usable and all future behavior is undefined. + */ + close(): Promise { + this.initialize(); + if (!this._terminated) { + return this.subscriberStub!.then(stub => { + this._terminated = true; + stub.close(); + }); + } + return Promise.resolve(); + } + /** + * This part will be added into src/v1/key_management_service_client.ts by synth.py. + * KMS service requires IAM client for [setIamPolicy, getIamPolicy, testIamPerssion] methods. + * But we don't support it now in micro-generators for rerouting one service to another and mix them in. + * New feature request link: [https://github.com/googleapis/gapic-generator-typescript/issues/315] + * + * So this is manually written for providing methods to the KMS client. + * IamClient is created for KMS client in the constructor using src/helper.ts. + * [setIamPolicy, getIamPolicy, testIamPerssion] methods are created which is calling the corresponding methods from IamClient in `helper.ts`. + */ + + getIamPolicy( + request: protos.google.iam.v1.GetIamPolicyRequest, + options: gax.CallOptions, + callback: protos.google.iam.v1.IAMPolicy.GetIamPolicyCallback + ) { + return this._iamClient.getIamPolicy(request, options, callback); + } + setIamPolicy( + request: protos.google.iam.v1.SetIamPolicyRequest, + options: gax.CallOptions, + callback: protos.google.iam.v1.IAMPolicy.SetIamPolicyCallback + ) { + return this._iamClient.setIamPolicy(request, options, callback); + } + testIamPermissions( + request: protos.google.iam.v1.TestIamPermissionsRequest, + options: gax.CallOptions, + callback?: protos.google.iam.v1.IAMPolicy.TestIamPermissionsCallback + ) { + return this._iamClient.testIamPermissions(request, options, callback); + } +} diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index c8546687455..aad28643de1 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -2,19 +2,24 @@ "interfaces": { "google.pubsub.v1.Subscriber": { "retry_codes": { + "non_idempotent": [], "idempotent": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ], + "unknown_aborted_unavailable": [ + "UNKNOWN", "ABORTED", - "UNAVAILABLE", - "UNKNOWN" + "UNAVAILABLE" ], - "non_idempotent": [ + "unavailable": [ "UNAVAILABLE" ], - "streaming_pull": [ - "ABORTED", + "deadline_exceeded_resource_exhausted_aborted_internal_unavailable": [ "DEADLINE_EXCEEDED", - "INTERNAL", "RESOURCE_EXHAUSTED", + "ABORTED", + "INTERNAL", "UNAVAILABLE" ] }, @@ -24,118 +29,90 @@ "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, "initial_rpc_timeout_millis": 60000, - "rpc_timeout_multiplier": 1.0, + "rpc_timeout_multiplier": 1, "max_rpc_timeout_millis": 60000, "total_timeout_millis": 600000 - }, - "messaging": { - "initial_retry_delay_millis": 100, - "retry_delay_multiplier": 1.3, - "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 25000, - "rpc_timeout_multiplier": 1.0, - "max_rpc_timeout_millis": 25000, - "total_timeout_millis": 600000 - }, - "streaming_messaging": { - "initial_retry_delay_millis": 100, - "retry_delay_multiplier": 1.3, - "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 600000, - "rpc_timeout_multiplier": 1.0, - "max_rpc_timeout_millis": 600000, - "total_timeout_millis": 600000 } }, "methods": { "CreateSubscription": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, "GetSubscription": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, "UpdateSubscription": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "ListSubscriptions": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, "DeleteSubscription": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "ModifyAckDeadline": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "Acknowledge": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", - "retry_params_name": "messaging" + "retry_codes_name": "unavailable", + "retry_params_name": "default" }, "Pull": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", - "retry_params_name": "messaging" + "retry_codes_name": "unknown_aborted_unavailable", + "retry_params_name": "default" }, "StreamingPull": { "timeout_millis": 900000, - "retry_codes_name": "streaming_pull", - "retry_params_name": "streaming_messaging" + "retry_codes_name": "deadline_exceeded_resource_exhausted_aborted_internal_unavailable", + "retry_params_name": "default" }, "ModifyPushConfig": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", + "retry_params_name": "default" + }, + "GetSnapshot": { + "timeout_millis": 60000, + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, "ListSnapshots": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" }, "CreateSnapshot": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "UpdateSnapshot": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "DeleteSnapshot": { "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "Seek": { "timeout_millis": 60000, - "retry_codes_name": "idempotent", - "retry_params_name": "default" - }, - "SetIamPolicy": { - "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", - "retry_params_name": "default" - }, - "GetIamPolicy": { - "timeout_millis": 60000, - "retry_codes_name": "idempotent", - "retry_params_name": "default" - }, - "TestIamPermissions": { - "timeout_millis": 60000, - "retry_codes_name": "non_idempotent", + "retry_codes_name": "unknown_aborted_unavailable", "retry_params_name": "default" } } diff --git a/handwritten/pubsub/src/v1/subscriber_proto_list.json b/handwritten/pubsub/src/v1/subscriber_proto_list.json index 6e307cc9fa8..23484bf6695 100644 --- a/handwritten/pubsub/src/v1/subscriber_proto_list.json +++ b/handwritten/pubsub/src/v1/subscriber_proto_list.json @@ -1,4 +1,3 @@ [ - "../../protos/google/iam/v1/iam_policy.proto", "../../protos/google/pubsub/v1/pubsub.proto" ] diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index aed09da1373..bfd981203da 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,27 +1,19 @@ { - "updateTime": "2020-03-05T12:33:04.202496Z", + "updateTime": "2020-04-08T18:29:29.306214Z", "sources": [ - { - "generator": { - "name": "artman", - "version": "1.0.0", - "dockerImage": "googleapis/artman@sha256:f37f2464788cb551299209b4fcab4eb323533154488c2ef9ec0c75d7c2b4b482" - } - }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "638253bf86d1ce1c314108a089b7351440c2f0bf", - "internalRef": "298971070", - "log": "638253bf86d1ce1c314108a089b7351440c2f0bf\nfix: add java_multiple_files option for automl text_sentiment.proto\n\nPiperOrigin-RevId: 298971070\n\n373d655703bf914fb8b0b1cc4071d772bac0e0d1\nUpdate Recs AI Beta public bazel file\n\nPiperOrigin-RevId: 298961623\n\ndcc5d00fc8a8d8b56f16194d7c682027b2c66a3b\nfix: add java_multiple_files option for automl classification.proto\n\nPiperOrigin-RevId: 298953301\n\na3f791827266f3496a6a5201d58adc4bb265c2a3\nchore: automl/v1 publish annotations and retry config\n\nPiperOrigin-RevId: 298942178\n\n01c681586d8d6dbd60155289b587aee678530bd9\nMark return_immediately in PullRequest deprecated.\n\nPiperOrigin-RevId: 298893281\n\nc9f5e9c4bfed54bbd09227e990e7bded5f90f31c\nRemove out of date documentation for predicate support on the Storage API\n\nPiperOrigin-RevId: 298883309\n\nfd5b3b8238d783b04692a113ffe07c0363f5de0f\ngenerate webrisk v1 proto\n\nPiperOrigin-RevId: 298847934\n\n541b1ded4abadcc38e8178680b0677f65594ea6f\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 298686266\n\nc0d171acecb4f5b0bfd2c4ca34fc54716574e300\n Updated to include the Notification v1 API.\n\nPiperOrigin-RevId: 298652775\n\n2346a9186c0bff2c9cc439f2459d558068637e05\nAdd Service Directory v1beta1 protos and configs\n\nPiperOrigin-RevId: 298625638\n\na78ed801b82a5c6d9c5368e24b1412212e541bb7\nPublishing v3 protos and configs.\n\nPiperOrigin-RevId: 298607357\n\n4a180bfff8a21645b3a935c2756e8d6ab18a74e0\nautoml/v1beta1 publish proto updates\n\nPiperOrigin-RevId: 298484782\n\n6de6e938b7df1cd62396563a067334abeedb9676\nchore: use the latest gapic-generator and protoc-java-resource-name-plugin in Bazel workspace.\n\nPiperOrigin-RevId: 298474513\n\n244ab2b83a82076a1fa7be63b7e0671af73f5c02\nAdds service config definition for bigqueryreservation v1\n\nPiperOrigin-RevId: 298455048\n\n" + "sha": "d398d687aad9eab4c6ceee9cd5e012fa61f7e28c", + "internalRef": "305496764" } }, { - "template": { - "name": "node_library", - "origin": "synthtool.gcp", - "version": "2020.2.4" + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "8cf0f5d93a70c3dcb0b4999d3152c46d4d9264bf" } } ], @@ -31,9 +23,8 @@ "source": "googleapis", "apiName": "pubsub", "apiVersion": "v1", - "language": "nodejs", - "generator": "gapic", - "config": "google/pubsub/artman_pubsub.yaml" + "language": "typescript", + "generator": "gapic-generator-typescript" } } ] diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 34149f0689a..1fb6841f5bd 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -2,84 +2,69 @@ import synthtool.gcp as gcp import logging import subprocess +import json import os logging.basicConfig(level=logging.DEBUG) -AUTOSYNTH_MULTIPLE_COMMITS = True - - -gapic = gcp.GAPICGenerator() +gapic = gcp.GAPICMicrogenerator() common_templates = gcp.CommonTemplates() # tasks has two product names, and a poorly named artman yaml version = 'v1' -library = gapic.node_library( - 'pubsub', version, config_path="/google/pubsub/artman_pubsub.yaml") +library = gapic.typescript_library( + 'pubsub', + version, + generator_args={ + 'grpc-service-config': f'google/pubsub/{version}/pubsub_grpc_service_config.json', + 'package-name': f'@google-cloud/pubsub', + 'main-service': f'pubsub', + 'bundle-config': f'google/pubsub/{version}/pubsub_gapic.yaml', + 'template': f'typescript_gapic' + }, + proto_path=f'/google/pubsub/{version}', + extra_proto_files=['google/cloud/common_resources.proto'] +) # skip index, protos, package.json, and README.md s.copy( library, - excludes=['package.json', 'README.md', 'src/index.js']) + excludes=['package.json', 'README.md', 'src/index.ts']) templates = common_templates.node_library(source_location='build/src') s.copy(templates) -# https://github.com/googleapis/gapic-generator/issues/2127 -s.replace("src/v1/subscriber_client.js", - " }\n\s*/\*\*\n\s+\* The DNS address for this API service\.", - "\n // note: editing generated code\n" - " this.waitForReady = function(deadline, callback) {\n" - " return subscriberStub.then(\n" - " stub => stub.waitForReady(deadline, callback),\n" - " callback\n" - " );\n" - " };\n" - " this.getSubscriberStub = function() {\n" - " return subscriberStub;\n" - " };\n" - "\g<0>") +# TODO: remove this surgery once IAM service injected in nodejs-gax https://github.com/googleapis/gax-nodejs/pull/762/ +# surgery in client.ts file to call IAM service +clients = ['publisher', 'subscriber'] +for client_name in clients: + client_file = f'src/v1/{client_name}_client.ts' + s.replace(client_file, + f'import \* as gapicConfig from \'\.\/{client_name}_client_config\.json\';', + f'import * as gapicConfig from \'./%s_client_config.json\';\nimport {{IamClient}} from \'../helper\';' % client_name, + ) -# The JavaScript generator didn't implement close(). TypeScript gapic does, -# so this should be removed when we merge that. -s.replace("src/v1/publisher_client.js", - " \* Parse the projectName from a project resource.\n", - " * Terminate the GRPC channel and close the client.\n" - " * note: editing generated code\n" - " *\n" - " * The client will no longer be usable and all future behavior is undefined.\n" - " */\n" - " close() {\n" - " return this.publisherStub.then(stub => {\n" - " stub.close();\n" - " });\n" - " }\n" - " \n" - " /**\n" - " \g<0>") -s.replace("src/v1/publisher_client.js", - " const publisherStubMethods = \\[\n", - " // note: editing generated code\n" - " this.publisherStub = publisherStub;\n" - " \g<0>") + s.replace(client_file, + 'private \_terminated = false;', + 'private _terminated = false; \n private _iamClient: IamClient;') -# Update path discovery due to build/ dir and TypeScript conversion. -s.replace("src/v1/publisher_client.js", "../../package.json", "../../../package.json") -s.replace("src/v1/subscriber_client.js", "../../package.json", "../../../package.json") + s.replace(client_file, + '\/\/ Determine the client header string.', + 'this._iamClient = new IamClient(opts); \n // Determine the client header string.') -# [START fix-dead-link] -s.replace('src/**/doc/google/protobuf/doc_timestamp.js', - 'https:\/\/cloud\.google\.com[\s\*]*http:\/\/(.*)[\s\*]*\)', - r"https://\1)") + # TODO: it should be removed once pubsub upgrade gts 2.0.0 + # fix tslint issue due to mismatch gts version with gapic-generator-typescript + s.replace(client_file, '\/\/ eslint\-disable\-next\-line\ \@typescript\-eslint\/no\-explicit\-any', + '// tslint:disable-next-line no-any') -s.replace('src/**/doc/google/protobuf/doc_timestamp.js', - 'toISOString\]', - 'toISOString)') -# [END fix-dead-link] + with open('helperMethods.ts.tmpl', 'r') as helper_file: + content = helper_file.read() + s.replace(client_file, '^}', content) -# No browser support for TypeScript libraries yet -os.unlink('webpack.config.js') -os.unlink('src/browser.js') +# TODO: it should be removed once pubsub upgrade gts 2.0.0 +# fix tslint issue due to mismatch gts version with gapic-generator-typescript +s.replace('test/gapic_publisher_v1.ts', + 'const\ expectedResponse\ \=\ \[new\ String\(\)\,\ new\ String\(\)\,\ new\ String\(\)\];', 'const expectedResponse: string[] | undefined = [];') # Node.js specific cleanup subprocess.run(['npm', 'install']) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 1aab7783c8c..09447865e84 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -26,8 +26,10 @@ import { Subscription, Topic, } from '../src'; -import {Policy} from '../src/iam'; +import {Policy, IamPermissionsMap} from '../src/iam'; import {MessageOptions} from '../src/topic'; +import {Metadata, MetadataValue} from 'google-gax'; +import {google} from '../protos/protos'; type Resource = Topic | Subscription | Snapshot; @@ -161,7 +163,7 @@ describe('pubsub', () => { pubsub .getTopicsStream() .on('error', done) - .on('data', topic => { + .on('data', (topic: Topic) => { topicsEmitted.push(topic); }) .on('end', () => { @@ -200,21 +202,25 @@ describe('pubsub', () => { it('should confirm if a topic exists', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); - topic.exists((err, exists) => { - assert.ifError(err); - assert.strictEqual(exists, true); - done(); - }); + topic.exists( + (err: Error | null | undefined, exists: boolean | null | undefined) => { + assert.ifError(err); + assert.strictEqual(exists, true); + done(); + } + ); }); it('should confirm if a topic does not exist', done => { const topic = pubsub.topic('should-not-exist'); - topic.exists((err, exists) => { - assert.ifError(err); - assert.strictEqual(exists, false); - done(); - }); + topic.exists( + (err: Error | null | undefined, exists: boolean | null | undefined) => { + assert.ifError(err); + assert.strictEqual(exists, false); + done(); + } + ); }); it('should publish a message', done => { @@ -224,11 +230,17 @@ describe('pubsub', () => { orderingKey: 'a', }; - topic.publishMessage(message, (err, messageId) => { - assert.ifError(err); - assert.strictEqual(typeof messageId, 'string'); - done(); - }); + topic.publishMessage( + message, + ( + err: Error | null | undefined, + messageId: string | null | undefined + ) => { + assert.ifError(err); + assert.strictEqual(typeof messageId, 'string'); + done(); + } + ); }); it('should publish a message with attributes', async () => { @@ -243,11 +255,16 @@ describe('pubsub', () => { it('should get the metadata of a topic', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); - topic.getMetadata((err, metadata) => { - assert.ifError(err); - assert.strictEqual(metadata!.name, topic.name); - done(); - }); + topic.getMetadata( + ( + err: ServiceError | null | undefined, + metadata: google.pubsub.v1.ITopic | null | undefined + ) => { + assert.ifError(err); + assert.strictEqual(metadata!.name, topic.name); + done(); + } + ); }); describe('ordered messages', () => { @@ -377,23 +394,27 @@ describe('pubsub', () => { subscription.create(err => { if (!err) { assert.fail('Should not have created subscription successfully.'); - return; } // ...and it should fail, because the subscription name is unique to the // project, and not the topic. - assert.strictEqual(err.code, 6); + assert.strictEqual(err!.code, 6); done(); }); }); it('should list all subscriptions registered to the topic', done => { - topic.getSubscriptions((err, subs) => { - assert.ifError(err); - assert.strictEqual(subs!.length, SUBSCRIPTIONS.length); - assert(subs![0] instanceof Subscription); - done(); - }); + topic.getSubscriptions( + ( + err: Error | null | undefined, + subs: Subscription[] | null | undefined + ) => { + assert.ifError(err); + assert.strictEqual(subs!.length, SUBSCRIPTIONS.length); + assert(subs![0] instanceof Subscription); + done(); + } + ); }); it('should list all topic subscriptions as a stream', done => { @@ -401,7 +422,7 @@ describe('pubsub', () => { topic .getSubscriptionsStream() .on('error', done) - .on('data', subscription => { + .on('data', (subscription: {}) => { subscriptionsEmitted.push(subscription); }) .on('end', () => { @@ -426,7 +447,7 @@ describe('pubsub', () => { pubsub .getSubscriptionsStream() .on('error', done) - .on('data', subscription => { + .on('data', (subscription: Subscription) => { subscriptionEmitted = subscription instanceof Subscription; }) .on('end', () => { @@ -437,11 +458,17 @@ describe('pubsub', () => { it('should allow creation and deletion of a subscription', done => { const subName = generateSubName(); - topic.createSubscription(subName, (err, sub) => { - assert.ifError(err); - assert(sub instanceof Subscription); - sub!.delete(done); - }); + topic.createSubscription( + subName, + ( + err: Error | null | undefined, + sub: Subscription | null | undefined + ) => { + assert.ifError(err); + assert(sub instanceof Subscription); + sub!.delete(done); + } + ); }); it('should honor the autoCreate option', done => { @@ -453,21 +480,25 @@ describe('pubsub', () => { it('should confirm if a sub exists', done => { const sub = topic.subscription(SUB_NAMES[0]); - sub.exists((err, exists) => { - assert.ifError(err); - assert.strictEqual(exists, true); - done(); - }); + sub.exists( + (err: Error | null | undefined, exists: boolean | null | undefined) => { + assert.ifError(err); + assert.strictEqual(exists, true); + done(); + } + ); }); it('should confirm if a sub does not exist', done => { const sub = topic.subscription('should-not-exist'); - sub.exists((err, exists) => { - assert.ifError(err); - assert.strictEqual(exists, false); - done(); - }); + sub.exists( + (err: Error | null | undefined, exists: boolean | null | undefined) => { + assert.ifError(err); + assert.strictEqual(exists, false); + done(); + } + ); }); it('should create a subscription with message retention', done => { @@ -479,24 +510,36 @@ describe('pubsub', () => { name: '', }; - topic.createSubscription(subName, callOptions, (err, sub) => { - assert.ifError(err); - - sub!.getMetadata((err, metadata) => { + topic.createSubscription( + subName, + callOptions, + ( + err: Error | null | undefined, + sub: Subscription | null | undefined + ) => { assert.ifError(err); - assert.strictEqual( - Number(metadata!.messageRetentionDuration!.seconds), - threeDaysInSeconds - ); - assert.strictEqual( - Number(metadata!.messageRetentionDuration!.nanos), - 0 - ); + sub!.getMetadata( + ( + err: Error | null | undefined, + metadata: google.pubsub.v1.ISubscription | null | undefined + ) => { + assert.ifError(err); - sub!.delete(done); - }); - }); + assert.strictEqual( + Number(metadata!.messageRetentionDuration!.seconds), + threeDaysInSeconds + ); + assert.strictEqual( + Number(metadata!.messageRetentionDuration!.nanos), + 0 + ); + + sub!.delete(done); + } + ); + } + ); }); it('should set metadata for a subscription', () => { @@ -524,7 +567,7 @@ describe('pubsub', () => { it('should error when using a non-existent subscription', done => { const subscription = topic.subscription(generateSubName()); - subscription.on('error', err => { + subscription.on('error', (err: {code: number}) => { assert.strictEqual(err.code, 5); subscription.close(done); }); @@ -540,7 +583,8 @@ describe('pubsub', () => { subscription.on('error', done); - subscription.on('message', message => { + // tslint:disable-next-line: no-any + subscription.on('message', (message: {data: any}) => { assert.deepStrictEqual(message.data, Buffer.from('hello')); if (++messageCount === 10) { @@ -597,18 +641,21 @@ describe('pubsub', () => { const subscription = topic.subscription(SUB_NAMES[0]); const data = crypto.randomBytes(9000000); // 9mb - topic.publishMessage({data}, (err, messageId) => { - assert.ifError(err); + topic.publishMessage( + {data}, + (err: ServiceError | null, messageId: string | null | undefined) => { + assert.ifError(err); - subscription.on('error', done).on('message', (message: Message) => { - if (message.id !== messageId) { - return; - } + subscription.on('error', done).on('message', (message: Message) => { + if (message.id !== messageId) { + return; + } - assert.deepStrictEqual(data, message.data); - subscription.close(done); - }); - }); + assert.deepStrictEqual(data, message.data); + subscription.close(done); + }); + } + ); }); // can be ran manually to test options/memory usage/etc. @@ -661,7 +708,7 @@ describe('pubsub', () => { console.log(`${duplicates} messages redelivered.`); console.log(`${acksPerMin} acks/m on average.`); - subscription.close(err => { + subscription.close((err: unknown) => { if (err) { deferred.reject(err); } else { @@ -692,14 +739,16 @@ describe('pubsub', () => { it('should get a policy', done => { const topic = pubsub.topic(TOPIC_NAMES[0]); - topic.iam.getPolicy((err, policy) => { - assert.ifError(err); + topic.iam.getPolicy( + (err: ServiceError | null, policy: Policy | null | undefined) => { + assert.ifError(err); - assert.deepStrictEqual(policy!.bindings, []); - assert.strictEqual(policy!.version, 0); + assert.deepStrictEqual(policy!.bindings, []); + assert.strictEqual(policy!.version, 0); - done(); - }); + done(); + } + ); }); it('should set a policy', done => { @@ -732,14 +781,20 @@ describe('pubsub', () => { const topic = pubsub.topic(TOPIC_NAMES[0]); const testPermissions = ['pubsub.topics.get', 'pubsub.topics.update']; - topic.iam.testPermissions(testPermissions, (err, permissions) => { - assert.ifError(err); - assert.deepStrictEqual(permissions, { - 'pubsub.topics.get': true, - 'pubsub.topics.update': true, - }); - done(); - }); + topic.iam.testPermissions( + testPermissions, + ( + err: ServiceError | null, + permissions: IamPermissionsMap | null | undefined + ) => { + assert.ifError(err); + assert.deepStrictEqual(permissions, { + 'pubsub.topics.get': true, + 'pubsub.topics.update': true, + }); + done(); + } + ); }); }); @@ -771,13 +826,18 @@ describe('pubsub', () => { }); it('should get a list of snapshots', done => { - pubsub.getSnapshots((err, snapshots) => { - assert.ifError(err); - assert(snapshots!.length > 0); - const names = snapshots!.map(getSnapshotName); - assert(names.includes(SNAPSHOT_NAME)); - done(); - }); + pubsub.getSnapshots( + ( + err: Error | null | undefined, + snapshots: Snapshot[] | null | undefined + ) => { + assert.ifError(err); + assert(snapshots!.length > 0); + const names = snapshots!.map(getSnapshotName); + assert(names.includes(SNAPSHOT_NAME)); + done(); + } + ); }); it('should get a list of snapshots as a stream', done => { @@ -785,7 +845,7 @@ describe('pubsub', () => { pubsub .getSnapshotsStream() .on('error', done) - .on('data', snapshot => snapshots.push(snapshot)) + .on('data', (snapshot: Snapshot) => snapshots.push(snapshot)) .on('end', () => { assert(snapshots.length > 0); const names = snapshots.map(getSnapshotName); @@ -812,7 +872,7 @@ describe('pubsub', () => { .then(() => { return topic.publish(Buffer.from('Hello, world!')); }) - .then(_messageId => { + .then((_messageId: string) => { messageId = _messageId; }); }); @@ -821,7 +881,7 @@ describe('pubsub', () => { let messageCount = 0; subscription.on('error', done); - subscription.on('message', message => { + subscription.on('message', (message: {id: string; ack: () => void}) => { if (message.id !== messageId) { return; } @@ -841,26 +901,30 @@ describe('pubsub', () => { let messageCount = 0; subscription.on('error', done); - subscription.on('message', message => { - if (message.id !== messageId) { - return; - } + subscription.on( + 'message', + // tslint:disable-next-line: no-any + (message: {id: string; ack: () => void; publishTime: any}) => { + if (message.id !== messageId) { + return; + } - message.ack(); + message.ack(); - if (++messageCount === 1) { - subscription.seek( - message.publishTime, - (err: ServiceError | null) => { - assert.ifError(err); - } - ); - return; - } + if (++messageCount === 1) { + subscription.seek( + message.publishTime, + (err: ServiceError | null) => { + assert.ifError(err); + } + ); + return; + } - assert.strictEqual(messageCount, 2); - subscription.close(done); - }); + assert.strictEqual(messageCount, 2); + subscription.close(done); + } + ); }); it('should seek to a future date (purge)', done => { @@ -878,12 +942,15 @@ describe('pubsub', () => { }) .then(() => { subscription.on('error', done); - subscription.on('message', message => { - // If we get the default message from before() then this fails. - assert.equal(message.data.toString(), testText); - message.ack(); - subscription.close(done); - }); + subscription.on( + 'message', + (message: {data: {toString: () => string}; ack: () => void}) => { + // If we get the default message from before() then this fails. + assert.equal(message.data.toString(), testText); + message.ack(); + subscription.close(done); + } + ); }); }); }); diff --git a/handwritten/pubsub/test/gapic-v1.js b/handwritten/pubsub/test/gapic-v1.js deleted file mode 100644 index 7a867977873..00000000000 --- a/handwritten/pubsub/test/gapic-v1.js +++ /dev/null @@ -1,1968 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -'use strict'; - -const assert = require('assert'); -const {describe, it} = require('mocha'); -const {PassThrough} = require('stream'); - -const pubsubModule = require('../src'); - -const FAKE_STATUS_CODE = 1; -const error = new Error(); -error.code = FAKE_STATUS_CODE; - -describe('PublisherClient', () => { - it('has servicePath', () => { - const servicePath = pubsubModule.v1.PublisherClient.servicePath; - assert(servicePath); - }); - - it('has apiEndpoint', () => { - const apiEndpoint = pubsubModule.v1.PublisherClient.apiEndpoint; - assert(apiEndpoint); - }); - - it('has port', () => { - const port = pubsubModule.v1.PublisherClient.port; - assert(port); - assert(typeof port === 'number'); - }); - - it('should create a client with no options', () => { - const client = new pubsubModule.v1.PublisherClient(); - assert(client); - }); - - it('should create a client with gRPC fallback', () => { - const client = new pubsubModule.v1.PublisherClient({fallback: true}); - assert(client); - }); - - describe('createTopic', () => { - it('invokes createTopic without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - name: formattedName, - }; - - // Mock response - const name2 = 'name2-1052831874'; - const kmsKeyName = 'kmsKeyName2094986649'; - const expectedResponse = { - name: name2, - kmsKeyName: kmsKeyName, - }; - - // Mock Grpc layer - client._innerApiCalls.createTopic = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.createTopic(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes createTopic with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedName = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - name: formattedName, - }; - - // Mock Grpc layer - client._innerApiCalls.createTopic = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.createTopic(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('updateTopic', () => { - it('invokes updateTopic without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const topic = {}; - const updateMask = {}; - const request = { - topic: topic, - updateMask: updateMask, - }; - - // Mock response - const name = 'name3373707'; - const kmsKeyName = 'kmsKeyName2094986649'; - const expectedResponse = { - name: name, - kmsKeyName: kmsKeyName, - }; - - // Mock Grpc layer - client._innerApiCalls.updateTopic = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.updateTopic(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes updateTopic with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const topic = {}; - const updateMask = {}; - const request = { - topic: topic, - updateMask: updateMask, - }; - - // Mock Grpc layer - client._innerApiCalls.updateTopic = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.updateTopic(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('publish', () => { - it('invokes publish without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const data = '-86'; - const messagesElement = { - data: data, - }; - const messages = [messagesElement]; - const request = { - topic: formattedTopic, - messages: messages, - }; - - // Mock response - const messageIdsElement = 'messageIdsElement-744837059'; - const messageIds = [messageIdsElement]; - const expectedResponse = { - messageIds: messageIds, - }; - - // Mock Grpc layer - client._innerApiCalls.publish = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.publish(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes publish with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const data = '-86'; - const messagesElement = { - data: data, - }; - const messages = [messagesElement]; - const request = { - topic: formattedTopic, - messages: messages, - }; - - // Mock Grpc layer - client._innerApiCalls.publish = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.publish(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('getTopic', () => { - it('invokes getTopic without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - topic: formattedTopic, - }; - - // Mock response - const name = 'name3373707'; - const kmsKeyName = 'kmsKeyName2094986649'; - const expectedResponse = { - name: name, - kmsKeyName: kmsKeyName, - }; - - // Mock Grpc layer - client._innerApiCalls.getTopic = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.getTopic(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes getTopic with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - topic: formattedTopic, - }; - - // Mock Grpc layer - client._innerApiCalls.getTopic = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.getTopic(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('listTopics', () => { - it('invokes listTopics without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { - project: formattedProject, - }; - - // Mock response - const nextPageToken = ''; - const topicsElement = {}; - const topics = [topicsElement]; - const expectedResponse = { - nextPageToken: nextPageToken, - topics: topics, - }; - - // Mock Grpc layer - client._innerApiCalls.listTopics = (actualRequest, options, callback) => { - assert.deepStrictEqual(actualRequest, request); - callback(null, expectedResponse.topics); - }; - - client.listTopics(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse.topics); - done(); - }); - }); - - it('invokes listTopics with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { - project: formattedProject, - }; - - // Mock Grpc layer - client._innerApiCalls.listTopics = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.listTopics(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('listTopicSubscriptions', () => { - it('invokes listTopicSubscriptions without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - topic: formattedTopic, - }; - - // Mock response - const nextPageToken = ''; - const subscriptionsElement = 'subscriptionsElement1698708147'; - const subscriptions = [subscriptionsElement]; - const expectedResponse = { - nextPageToken: nextPageToken, - subscriptions: subscriptions, - }; - - // Mock Grpc layer - client._innerApiCalls.listTopicSubscriptions = ( - actualRequest, - options, - callback - ) => { - assert.deepStrictEqual(actualRequest, request); - callback(null, expectedResponse.subscriptions); - }; - - client.listTopicSubscriptions(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse.subscriptions); - done(); - }); - }); - - it('invokes listTopicSubscriptions with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - topic: formattedTopic, - }; - - // Mock Grpc layer - client._innerApiCalls.listTopicSubscriptions = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.listTopicSubscriptions(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('deleteTopic', () => { - it('invokes deleteTopic without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - topic: formattedTopic, - }; - - // Mock Grpc layer - client._innerApiCalls.deleteTopic = mockSimpleGrpcMethod(request); - - client.deleteTopic(request, err => { - assert.ifError(err); - done(); - }); - }); - - it('invokes deleteTopic with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - topic: formattedTopic, - }; - - // Mock Grpc layer - client._innerApiCalls.deleteTopic = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.deleteTopic(request, err => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - done(); - }); - }); - }); - - describe('setIamPolicy', () => { - it('invokes setIamPolicy without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const policy = {}; - const request = { - resource: formattedResource, - policy: policy, - }; - - // Mock response - const version = 351608024; - const etag = '21'; - const expectedResponse = { - version: version, - etag: etag, - }; - - // Mock Grpc layer - client._innerApiCalls.setIamPolicy = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.setIamPolicy(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes setIamPolicy with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const policy = {}; - const request = { - resource: formattedResource, - policy: policy, - }; - - // Mock Grpc layer - client._innerApiCalls.setIamPolicy = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.setIamPolicy(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('getIamPolicy', () => { - it('invokes getIamPolicy without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - resource: formattedResource, - }; - - // Mock response - const version = 351608024; - const etag = '21'; - const expectedResponse = { - version: version, - etag: etag, - }; - - // Mock Grpc layer - client._innerApiCalls.getIamPolicy = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.getIamPolicy(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes getIamPolicy with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - resource: formattedResource, - }; - - // Mock Grpc layer - client._innerApiCalls.getIamPolicy = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.getIamPolicy(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('testIamPermissions', () => { - it('invokes testIamPermissions without error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const permissions = []; - const request = { - resource: formattedResource, - permissions: permissions, - }; - - // Mock response - const expectedResponse = {}; - - // Mock Grpc layer - client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.testIamPermissions(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes testIamPermissions with error', done => { - const client = new pubsubModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.topicPath('[PROJECT]', '[TOPIC]'); - const permissions = []; - const request = { - resource: formattedResource, - permissions: permissions, - }; - - // Mock Grpc layer - client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.testIamPermissions(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); -}); -describe('SubscriberClient', () => { - it('has servicePath', () => { - const servicePath = pubsubModule.v1.SubscriberClient.servicePath; - assert(servicePath); - }); - - it('has apiEndpoint', () => { - const apiEndpoint = pubsubModule.v1.SubscriberClient.apiEndpoint; - assert(apiEndpoint); - }); - - it('has port', () => { - const port = pubsubModule.v1.SubscriberClient.port; - assert(port); - assert(typeof port === 'number'); - }); - - it('should create a client with no options', () => { - const client = new pubsubModule.v1.SubscriberClient(); - assert(client); - }); - - it('should create a client with gRPC fallback', () => { - const client = new pubsubModule.v1.SubscriberClient({fallback: true}); - assert(client); - }); - - describe('createSubscription', () => { - it('invokes createSubscription without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedName = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - name: formattedName, - topic: formattedTopic, - }; - - // Mock response - const name2 = 'name2-1052831874'; - const topic2 = 'topic2-1139259102'; - const ackDeadlineSeconds = 2135351438; - const retainAckedMessages = false; - const enableMessageOrdering = true; - const expectedResponse = { - name: name2, - topic: topic2, - ackDeadlineSeconds: ackDeadlineSeconds, - retainAckedMessages: retainAckedMessages, - enableMessageOrdering: enableMessageOrdering, - }; - - // Mock Grpc layer - client._innerApiCalls.createSubscription = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.createSubscription(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes createSubscription with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedName = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const formattedTopic = client.topicPath('[PROJECT]', '[TOPIC]'); - const request = { - name: formattedName, - topic: formattedTopic, - }; - - // Mock Grpc layer - client._innerApiCalls.createSubscription = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.createSubscription(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('getSubscription', () => { - it('invokes getSubscription without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - subscription: formattedSubscription, - }; - - // Mock response - const name = 'name3373707'; - const topic = 'topic110546223'; - const ackDeadlineSeconds = 2135351438; - const retainAckedMessages = false; - const enableMessageOrdering = true; - const expectedResponse = { - name: name, - topic: topic, - ackDeadlineSeconds: ackDeadlineSeconds, - retainAckedMessages: retainAckedMessages, - enableMessageOrdering: enableMessageOrdering, - }; - - // Mock Grpc layer - client._innerApiCalls.getSubscription = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.getSubscription(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes getSubscription with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - subscription: formattedSubscription, - }; - - // Mock Grpc layer - client._innerApiCalls.getSubscription = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.getSubscription(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('updateSubscription', () => { - it('invokes updateSubscription without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const ackDeadlineSeconds = 42; - const subscription = { - ackDeadlineSeconds: ackDeadlineSeconds, - }; - const pathsElement = 'ack_deadline_seconds'; - const paths = [pathsElement]; - const updateMask = { - paths: paths, - }; - const request = { - subscription: subscription, - updateMask: updateMask, - }; - - // Mock response - const name = 'name3373707'; - const topic = 'topic110546223'; - const ackDeadlineSeconds2 = 921632575; - const retainAckedMessages = false; - const enableMessageOrdering = true; - const expectedResponse = { - name: name, - topic: topic, - ackDeadlineSeconds: ackDeadlineSeconds2, - retainAckedMessages: retainAckedMessages, - enableMessageOrdering: enableMessageOrdering, - }; - - // Mock Grpc layer - client._innerApiCalls.updateSubscription = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.updateSubscription(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes updateSubscription with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const ackDeadlineSeconds = 42; - const subscription = { - ackDeadlineSeconds: ackDeadlineSeconds, - }; - const pathsElement = 'ack_deadline_seconds'; - const paths = [pathsElement]; - const updateMask = { - paths: paths, - }; - const request = { - subscription: subscription, - updateMask: updateMask, - }; - - // Mock Grpc layer - client._innerApiCalls.updateSubscription = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.updateSubscription(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('listSubscriptions', () => { - it('invokes listSubscriptions without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { - project: formattedProject, - }; - - // Mock response - const nextPageToken = ''; - const subscriptionsElement = {}; - const subscriptions = [subscriptionsElement]; - const expectedResponse = { - nextPageToken: nextPageToken, - subscriptions: subscriptions, - }; - - // Mock Grpc layer - client._innerApiCalls.listSubscriptions = ( - actualRequest, - options, - callback - ) => { - assert.deepStrictEqual(actualRequest, request); - callback(null, expectedResponse.subscriptions); - }; - - client.listSubscriptions(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse.subscriptions); - done(); - }); - }); - - it('invokes listSubscriptions with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { - project: formattedProject, - }; - - // Mock Grpc layer - client._innerApiCalls.listSubscriptions = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.listSubscriptions(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('deleteSubscription', () => { - it('invokes deleteSubscription without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - subscription: formattedSubscription, - }; - - // Mock Grpc layer - client._innerApiCalls.deleteSubscription = mockSimpleGrpcMethod(request); - - client.deleteSubscription(request, err => { - assert.ifError(err); - done(); - }); - }); - - it('invokes deleteSubscription with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - subscription: formattedSubscription, - }; - - // Mock Grpc layer - client._innerApiCalls.deleteSubscription = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.deleteSubscription(request, err => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - done(); - }); - }); - }); - - describe('modifyAckDeadline', () => { - it('invokes modifyAckDeadline without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const ackIds = []; - const ackDeadlineSeconds = 2135351438; - const request = { - subscription: formattedSubscription, - ackIds: ackIds, - ackDeadlineSeconds: ackDeadlineSeconds, - }; - - // Mock Grpc layer - client._innerApiCalls.modifyAckDeadline = mockSimpleGrpcMethod(request); - - client.modifyAckDeadline(request, err => { - assert.ifError(err); - done(); - }); - }); - - it('invokes modifyAckDeadline with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const ackIds = []; - const ackDeadlineSeconds = 2135351438; - const request = { - subscription: formattedSubscription, - ackIds: ackIds, - ackDeadlineSeconds: ackDeadlineSeconds, - }; - - // Mock Grpc layer - client._innerApiCalls.modifyAckDeadline = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.modifyAckDeadline(request, err => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - done(); - }); - }); - }); - - describe('acknowledge', () => { - it('invokes acknowledge without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const ackIds = []; - const request = { - subscription: formattedSubscription, - ackIds: ackIds, - }; - - // Mock Grpc layer - client._innerApiCalls.acknowledge = mockSimpleGrpcMethod(request); - - client.acknowledge(request, err => { - assert.ifError(err); - done(); - }); - }); - - it('invokes acknowledge with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const ackIds = []; - const request = { - subscription: formattedSubscription, - ackIds: ackIds, - }; - - // Mock Grpc layer - client._innerApiCalls.acknowledge = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.acknowledge(request, err => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - done(); - }); - }); - }); - - describe('pull', () => { - it('invokes pull without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const maxMessages = 496131527; - const request = { - subscription: formattedSubscription, - maxMessages: maxMessages, - }; - - // Mock response - const expectedResponse = {}; - - // Mock Grpc layer - client._innerApiCalls.pull = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.pull(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes pull with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const maxMessages = 496131527; - const request = { - subscription: formattedSubscription, - maxMessages: maxMessages, - }; - - // Mock Grpc layer - client._innerApiCalls.pull = mockSimpleGrpcMethod(request, null, error); - - client.pull(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('streamingPull', () => { - it('invokes streamingPull without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const streamAckDeadlineSeconds = 1875467245; - const request = { - subscription: formattedSubscription, - streamAckDeadlineSeconds: streamAckDeadlineSeconds, - }; - - // Mock response - const receivedMessagesElement = {}; - const receivedMessages = [receivedMessagesElement]; - const expectedResponse = { - receivedMessages: receivedMessages, - }; - - // Mock Grpc layer - client._innerApiCalls.streamingPull = mockBidiStreamingGrpcMethod( - request, - expectedResponse - ); - - const stream = client - .streamingPull() - .on('data', response => { - assert.deepStrictEqual(response, expectedResponse); - done(); - }) - .on('error', err => { - done(err); - }); - - stream.write(request); - }); - - it('invokes streamingPull with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const streamAckDeadlineSeconds = 1875467245; - const request = { - subscription: formattedSubscription, - streamAckDeadlineSeconds: streamAckDeadlineSeconds, - }; - - // Mock Grpc layer - client._innerApiCalls.streamingPull = mockBidiStreamingGrpcMethod( - request, - null, - error - ); - - const stream = client - .streamingPull() - .on('data', () => { - assert.fail(); - }) - .on('error', err => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - done(); - }); - - stream.write(request); - }); - }); - - describe('modifyPushConfig', () => { - it('invokes modifyPushConfig without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const pushConfig = {}; - const request = { - subscription: formattedSubscription, - pushConfig: pushConfig, - }; - - // Mock Grpc layer - client._innerApiCalls.modifyPushConfig = mockSimpleGrpcMethod(request); - - client.modifyPushConfig(request, err => { - assert.ifError(err); - done(); - }); - }); - - it('invokes modifyPushConfig with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const pushConfig = {}; - const request = { - subscription: formattedSubscription, - pushConfig: pushConfig, - }; - - // Mock Grpc layer - client._innerApiCalls.modifyPushConfig = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.modifyPushConfig(request, err => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - done(); - }); - }); - }); - - describe('listSnapshots', () => { - it('invokes listSnapshots without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { - project: formattedProject, - }; - - // Mock response - const nextPageToken = ''; - const snapshotsElement = {}; - const snapshots = [snapshotsElement]; - const expectedResponse = { - nextPageToken: nextPageToken, - snapshots: snapshots, - }; - - // Mock Grpc layer - client._innerApiCalls.listSnapshots = ( - actualRequest, - options, - callback - ) => { - assert.deepStrictEqual(actualRequest, request); - callback(null, expectedResponse.snapshots); - }; - - client.listSnapshots(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse.snapshots); - done(); - }); - }); - - it('invokes listSnapshots with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedProject = client.projectPath('[PROJECT]'); - const request = { - project: formattedProject, - }; - - // Mock Grpc layer - client._innerApiCalls.listSnapshots = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.listSnapshots(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('createSnapshot', () => { - it('invokes createSnapshot without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - name: formattedName, - subscription: formattedSubscription, - }; - - // Mock response - const name2 = 'name2-1052831874'; - const topic = 'topic110546223'; - const expectedResponse = { - name: name2, - topic: topic, - }; - - // Mock Grpc layer - client._innerApiCalls.createSnapshot = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.createSnapshot(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes createSnapshot with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedName = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - name: formattedName, - subscription: formattedSubscription, - }; - - // Mock Grpc layer - client._innerApiCalls.createSnapshot = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.createSnapshot(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('updateSnapshot', () => { - it('invokes updateSnapshot without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const seconds = 123456; - const expireTime = { - seconds: seconds, - }; - const snapshot = { - expireTime: expireTime, - }; - const pathsElement = 'expire_time'; - const paths = [pathsElement]; - const updateMask = { - paths: paths, - }; - const request = { - snapshot: snapshot, - updateMask: updateMask, - }; - - // Mock response - const name = 'name3373707'; - const topic = 'topic110546223'; - const expectedResponse = { - name: name, - topic: topic, - }; - - // Mock Grpc layer - client._innerApiCalls.updateSnapshot = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.updateSnapshot(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes updateSnapshot with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const seconds = 123456; - const expireTime = { - seconds: seconds, - }; - const snapshot = { - expireTime: expireTime, - }; - const pathsElement = 'expire_time'; - const paths = [pathsElement]; - const updateMask = { - paths: paths, - }; - const request = { - snapshot: snapshot, - updateMask: updateMask, - }; - - // Mock Grpc layer - client._innerApiCalls.updateSnapshot = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.updateSnapshot(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('deleteSnapshot', () => { - it('invokes deleteSnapshot without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - const request = { - snapshot: formattedSnapshot, - }; - - // Mock Grpc layer - client._innerApiCalls.deleteSnapshot = mockSimpleGrpcMethod(request); - - client.deleteSnapshot(request, err => { - assert.ifError(err); - done(); - }); - }); - - it('invokes deleteSnapshot with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSnapshot = client.snapshotPath('[PROJECT]', '[SNAPSHOT]'); - const request = { - snapshot: formattedSnapshot, - }; - - // Mock Grpc layer - client._innerApiCalls.deleteSnapshot = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.deleteSnapshot(request, err => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - done(); - }); - }); - }); - - describe('seek', () => { - it('invokes seek without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - subscription: formattedSubscription, - }; - - // Mock response - const expectedResponse = {}; - - // Mock Grpc layer - client._innerApiCalls.seek = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.seek(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes seek with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedSubscription = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - subscription: formattedSubscription, - }; - - // Mock Grpc layer - client._innerApiCalls.seek = mockSimpleGrpcMethod(request, null, error); - - client.seek(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('setIamPolicy', () => { - it('invokes setIamPolicy without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const policy = {}; - const request = { - resource: formattedResource, - policy: policy, - }; - - // Mock response - const version = 351608024; - const etag = '21'; - const expectedResponse = { - version: version, - etag: etag, - }; - - // Mock Grpc layer - client._innerApiCalls.setIamPolicy = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.setIamPolicy(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes setIamPolicy with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const policy = {}; - const request = { - resource: formattedResource, - policy: policy, - }; - - // Mock Grpc layer - client._innerApiCalls.setIamPolicy = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.setIamPolicy(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('getIamPolicy', () => { - it('invokes getIamPolicy without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - resource: formattedResource, - }; - - // Mock response - const version = 351608024; - const etag = '21'; - const expectedResponse = { - version: version, - etag: etag, - }; - - // Mock Grpc layer - client._innerApiCalls.getIamPolicy = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.getIamPolicy(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes getIamPolicy with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const request = { - resource: formattedResource, - }; - - // Mock Grpc layer - client._innerApiCalls.getIamPolicy = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.getIamPolicy(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); - - describe('testIamPermissions', () => { - it('invokes testIamPermissions without error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const permissions = []; - const request = { - resource: formattedResource, - permissions: permissions, - }; - - // Mock response - const expectedResponse = {}; - - // Mock Grpc layer - client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( - request, - expectedResponse - ); - - client.testIamPermissions(request, (err, response) => { - assert.ifError(err); - assert.deepStrictEqual(response, expectedResponse); - done(); - }); - }); - - it('invokes testIamPermissions with error', done => { - const client = new pubsubModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - - // Mock request - const formattedResource = client.subscriptionPath( - '[PROJECT]', - '[SUBSCRIPTION]' - ); - const permissions = []; - const request = { - resource: formattedResource, - permissions: permissions, - }; - - // Mock Grpc layer - client._innerApiCalls.testIamPermissions = mockSimpleGrpcMethod( - request, - null, - error - ); - - client.testIamPermissions(request, (err, response) => { - assert(err instanceof Error); - assert.strictEqual(err.code, FAKE_STATUS_CODE); - assert(typeof response === 'undefined'); - done(); - }); - }); - }); -}); - -function mockSimpleGrpcMethod(expectedRequest, response, error) { - return function(actualRequest, options, callback) { - assert.deepStrictEqual(actualRequest, expectedRequest); - if (error) { - callback(error); - } else if (response) { - callback(null, response); - } else { - callback(null); - } - }; -} - -function mockBidiStreamingGrpcMethod(expectedRequest, response, error) { - return () => { - const mockStream = new PassThrough({ - objectMode: true, - transform: (chunk, enc, callback) => { - assert.deepStrictEqual(chunk, expectedRequest); - if (error) { - callback(error); - } else { - callback(null, response); - } - }, - }); - return mockStream; - }; -} diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts new file mode 100644 index 00000000000..8f0d1682c3e --- /dev/null +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -0,0 +1,1783 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** + +import * as protos from '../protos/protos'; +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import {SinonStub} from 'sinon'; +import {describe, it} from 'mocha'; +import * as publisherModule from '../src'; + +import {PassThrough} from 'stream'; + +import {protobuf} from 'google-gax'; + +function generateSampleMessage(instance: T) { + const filledObject = (instance.constructor as typeof protobuf.Message).toObject( + instance as protobuf.Message, + {defaults: true} + ); + return (instance.constructor as typeof protobuf.Message).fromObject( + filledObject + ) as T; +} + +function stubSimpleCall(response?: ResponseType, error?: Error) { + return error + ? sinon.stub().rejects(error) + : sinon.stub().resolves([response]); +} + +function stubSimpleCallWithCallback( + response?: ResponseType, + error?: Error +) { + return error + ? sinon.stub().callsArgWith(2, error) + : sinon.stub().callsArgWith(2, null, response); +} + +function stubPageStreamingCall( + responses?: ResponseType[], + error?: Error +) { + const pagingStub = sinon.stub(); + if (responses) { + for (let i = 0; i < responses.length; ++i) { + pagingStub.onCall(i).callsArgWith(2, null, responses[i]); + } + } + const transformStub = error + ? sinon.stub().callsArgWith(2, error) + : pagingStub; + const mockStream = new PassThrough({ + objectMode: true, + transform: transformStub, + }); + // trigger as many responses as needed + if (responses) { + for (let i = 0; i < responses.length; ++i) { + setImmediate(() => { + mockStream.write({}); + }); + } + setImmediate(() => { + mockStream.end(); + }); + } else { + setImmediate(() => { + mockStream.write({}); + }); + setImmediate(() => { + mockStream.end(); + }); + } + return sinon.stub().returns(mockStream); +} + +function stubAsyncIterationCall( + responses?: ResponseType[], + error?: Error +) { + let counter = 0; + const asyncIterable = { + [Symbol.asyncIterator]() { + return { + async next() { + if (error) { + return Promise.reject(error); + } + if (counter >= responses!.length) { + return Promise.resolve({done: true, value: undefined}); + } + return Promise.resolve({done: false, value: responses![counter++]}); + }, + }; + }, + }; + return sinon.stub().returns(asyncIterable); +} + +describe('v1.PublisherClient', () => { + it('has servicePath', () => { + const servicePath = publisherModule.v1.PublisherClient.servicePath; + assert(servicePath); + }); + + it('has apiEndpoint', () => { + const apiEndpoint = publisherModule.v1.PublisherClient.apiEndpoint; + assert(apiEndpoint); + }); + + it('has port', () => { + const port = publisherModule.v1.PublisherClient.port; + assert(port); + assert(typeof port === 'number'); + }); + + it('should create a client with no option', () => { + const client = new publisherModule.v1.PublisherClient(); + assert(client); + }); + + it('should create a client with gRPC fallback', () => { + const client = new publisherModule.v1.PublisherClient({ + fallback: true, + }); + assert(client); + }); + + it('has initialize method and supports deferred initialization', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.publisherStub, undefined); + await client.initialize(); + assert(client.publisherStub); + }); + + it('has close method', () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.close(); + }); + + it('has getProjectId method', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); + const result = await client.getProjectId(); + assert.strictEqual(result, fakeProjectId); + assert((client.auth.getProjectId as SinonStub).calledWithExactly()); + }); + + it('has getProjectId method with callback', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon + .stub() + .callsArgWith(0, null, fakeProjectId); + const promise = new Promise((resolve, reject) => { + client.getProjectId((err?: Error | null, projectId?: string | null) => { + if (err) { + reject(err); + } else { + resolve(projectId); + } + }); + }); + const result = await promise; + assert.strictEqual(result, fakeProjectId); + }); + + describe('createTopic', () => { + it('invokes createTopic without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + client.innerApiCalls.createTopic = stubSimpleCall(expectedResponse); + const [response] = await client.createTopic(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.createTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes createTopic without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + client.innerApiCalls.createTopic = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.createTopic( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ITopic | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.createTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes createTopic with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.createTopic = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.createTopic(request); + }, expectedError); + assert( + (client.innerApiCalls.createTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('updateTopic', () => { + it('invokes updateTopic without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateTopicRequest() + ); + request.topic = {}; + request.topic.name = ''; + const expectedHeaderRequestParams = 'topic.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + client.innerApiCalls.updateTopic = stubSimpleCall(expectedResponse); + const [response] = await client.updateTopic(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.updateTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes updateTopic without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateTopicRequest() + ); + request.topic = {}; + request.topic.name = ''; + const expectedHeaderRequestParams = 'topic.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + client.innerApiCalls.updateTopic = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.updateTopic( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ITopic | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.updateTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes updateTopic with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateTopicRequest() + ); + request.topic = {}; + request.topic.name = ''; + const expectedHeaderRequestParams = 'topic.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.updateTopic = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.updateTopic(request); + }, expectedError); + assert( + (client.innerApiCalls.updateTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('publish', () => { + it('invokes publish without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.PublishRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.PublishResponse() + ); + client.innerApiCalls.publish = stubSimpleCall(expectedResponse); + const [response] = await client.publish(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.publish as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes publish without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.PublishRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.PublishResponse() + ); + client.innerApiCalls.publish = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.publish( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.IPublishResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.publish as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes publish with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.PublishRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.publish = stubSimpleCall(undefined, expectedError); + await assert.rejects(async () => { + await client.publish(request); + }, expectedError); + assert( + (client.innerApiCalls.publish as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('getTopic', () => { + it('invokes getTopic without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetTopicRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + client.innerApiCalls.getTopic = stubSimpleCall(expectedResponse); + const [response] = await client.getTopic(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.getTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes getTopic without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetTopicRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + client.innerApiCalls.getTopic = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.getTopic( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ITopic | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.getTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes getTopic with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetTopicRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.getTopic = stubSimpleCall(undefined, expectedError); + await assert.rejects(async () => { + await client.getTopic(request); + }, expectedError); + assert( + (client.innerApiCalls.getTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('deleteTopic', () => { + it('invokes deleteTopic without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteTopicRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.deleteTopic = stubSimpleCall(expectedResponse); + const [response] = await client.deleteTopic(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.deleteTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes deleteTopic without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteTopicRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.deleteTopic = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.deleteTopic( + request, + ( + err?: Error | null, + result?: protos.google.protobuf.IEmpty | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.deleteTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes deleteTopic with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteTopicRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.deleteTopic = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.deleteTopic(request); + }, expectedError); + assert( + (client.innerApiCalls.deleteTopic as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('listTopics', () => { + it('invokes listTopics without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + ]; + client.innerApiCalls.listTopics = stubSimpleCall(expectedResponse); + const [response] = await client.listTopics(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listTopics as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listTopics without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + ]; + client.innerApiCalls.listTopics = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.listTopics( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ITopic[] | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listTopics as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes listTopics with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.listTopics = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.listTopics(request); + }, expectedError); + assert( + (client.innerApiCalls.listTopics as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listTopicsStream without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + ]; + client.descriptors.page.listTopics.createStream = stubPageStreamingCall( + expectedResponse + ); + const stream = client.listTopicsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Topic[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Topic) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + const responses = await promise; + assert.deepStrictEqual(responses, expectedResponse); + assert( + (client.descriptors.page.listTopics.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listTopics, request) + ); + assert.strictEqual( + (client.descriptors.page.listTopics.createStream as SinonStub).getCall( + 0 + ).args[2].otherArgs.headers['x-goog-request-params'], + expectedHeaderRequestParams + ); + }); + + it('invokes listTopicsStream with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedError = new Error('expected'); + client.descriptors.page.listTopics.createStream = stubPageStreamingCall( + undefined, + expectedError + ); + const stream = client.listTopicsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Topic[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Topic) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + await assert.rejects(async () => { + await promise; + }, expectedError); + assert( + (client.descriptors.page.listTopics.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listTopics, request) + ); + assert.strictEqual( + (client.descriptors.page.listTopics.createStream as SinonStub).getCall( + 0 + ).args[2].otherArgs.headers['x-goog-request-params'], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listTopics without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + generateSampleMessage(new protos.google.pubsub.v1.Topic()), + ]; + client.descriptors.page.listTopics.asyncIterate = stubAsyncIterationCall( + expectedResponse + ); + const responses: protos.google.pubsub.v1.ITopic[] = []; + const iterable = client.listTopicsAsync(request); + for await (const resource of iterable) { + responses.push(resource!); + } + assert.deepStrictEqual(responses, expectedResponse); + assert.deepStrictEqual( + (client.descriptors.page.listTopics.asyncIterate as SinonStub).getCall( + 0 + ).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listTopics.asyncIterate as SinonStub).getCall( + 0 + ).args[2].otherArgs.headers['x-goog-request-params'], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listTopics with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedError = new Error('expected'); + client.descriptors.page.listTopics.asyncIterate = stubAsyncIterationCall( + undefined, + expectedError + ); + const iterable = client.listTopicsAsync(request); + await assert.rejects(async () => { + const responses: protos.google.pubsub.v1.ITopic[] = []; + for await (const resource of iterable) { + responses.push(resource!); + } + }); + assert.deepStrictEqual( + (client.descriptors.page.listTopics.asyncIterate as SinonStub).getCall( + 0 + ).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listTopics.asyncIterate as SinonStub).getCall( + 0 + ).args[2].otherArgs.headers['x-goog-request-params'], + expectedHeaderRequestParams + ); + }); + }); + + describe('listTopicSubscriptions', () => { + it('invokes listTopicSubscriptions without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse: string[] | undefined = []; + client.innerApiCalls.listTopicSubscriptions = stubSimpleCall( + expectedResponse + ); + const [response] = await client.listTopicSubscriptions(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listTopicSubscriptions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listTopicSubscriptions without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse: string[] | undefined = []; + client.innerApiCalls.listTopicSubscriptions = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.listTopicSubscriptions( + request, + (err?: Error | null, result?: string[] | null) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listTopicSubscriptions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes listTopicSubscriptions with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.listTopicSubscriptions = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.listTopicSubscriptions(request); + }, expectedError); + assert( + (client.innerApiCalls.listTopicSubscriptions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listTopicSubscriptionsStream without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedResponse: string[] | undefined = []; + client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall( + expectedResponse + ); + const stream = client.listTopicSubscriptionsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: string[] = []; + stream.on('data', (response: string) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + const responses = await promise; + assert.deepStrictEqual(responses, expectedResponse); + assert( + (client.descriptors.page.listTopicSubscriptions + .createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listTopicSubscriptions, request) + ); + assert.strictEqual( + (client.descriptors.page.listTopicSubscriptions + .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('invokes listTopicSubscriptionsStream with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedError = new Error('expected'); + client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall( + undefined, + expectedError + ); + const stream = client.listTopicSubscriptionsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: string[] = []; + stream.on('data', (response: string) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + await assert.rejects(async () => { + await promise; + }, expectedError); + assert( + (client.descriptors.page.listTopicSubscriptions + .createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listTopicSubscriptions, request) + ); + assert.strictEqual( + (client.descriptors.page.listTopicSubscriptions + .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listTopicSubscriptions without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedResponse: string[] | undefined = []; + client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall( + expectedResponse + ); + const responses: string[] = []; + const iterable = client.listTopicSubscriptionsAsync(request); + for await (const resource of iterable) { + responses.push(resource!); + } + assert.deepStrictEqual(responses, expectedResponse); + assert.deepStrictEqual( + (client.descriptors.page.listTopicSubscriptions + .asyncIterate as SinonStub).getCall(0).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listTopicSubscriptions + .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listTopicSubscriptions with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedError = new Error('expected'); + client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall( + undefined, + expectedError + ); + const iterable = client.listTopicSubscriptionsAsync(request); + await assert.rejects(async () => { + const responses: string[] = []; + for await (const resource of iterable) { + responses.push(resource!); + } + }); + assert.deepStrictEqual( + (client.descriptors.page.listTopicSubscriptions + .asyncIterate as SinonStub).getCall(0).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listTopicSubscriptions + .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + }); + + describe('listTopicSnapshots', () => { + it('invokes listTopicSnapshots without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse: string[] | undefined = []; + client.innerApiCalls.listTopicSnapshots = stubSimpleCall( + expectedResponse + ); + const [response] = await client.listTopicSnapshots(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listTopicSnapshots as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listTopicSnapshots without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse: string[] | undefined = []; + client.innerApiCalls.listTopicSnapshots = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.listTopicSnapshots( + request, + (err?: Error | null, result?: string[] | null) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listTopicSnapshots as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes listTopicSnapshots with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.listTopicSnapshots = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.listTopicSnapshots(request); + }, expectedError); + assert( + (client.innerApiCalls.listTopicSnapshots as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listTopicSnapshotsStream without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedResponse: string[] | undefined = []; + client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall( + expectedResponse + ); + const stream = client.listTopicSnapshotsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: string[] = []; + stream.on('data', (response: string) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + const responses = await promise; + assert.deepStrictEqual(responses, expectedResponse); + assert( + (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listTopicSnapshots, request) + ); + assert.strictEqual( + (client.descriptors.page.listTopicSnapshots + .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('invokes listTopicSnapshotsStream with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedError = new Error('expected'); + client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall( + undefined, + expectedError + ); + const stream = client.listTopicSnapshotsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: string[] = []; + stream.on('data', (response: string) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + await assert.rejects(async () => { + await promise; + }, expectedError); + assert( + (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listTopicSnapshots, request) + ); + assert.strictEqual( + (client.descriptors.page.listTopicSnapshots + .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listTopicSnapshots without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedResponse: string[] | undefined = []; + client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall( + expectedResponse + ); + const responses: string[] = []; + const iterable = client.listTopicSnapshotsAsync(request); + for await (const resource of iterable) { + responses.push(resource!); + } + assert.deepStrictEqual(responses, expectedResponse); + assert.deepStrictEqual( + (client.descriptors.page.listTopicSnapshots + .asyncIterate as SinonStub).getCall(0).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listTopicSnapshots + .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listTopicSnapshots with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedError = new Error('expected'); + client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall( + undefined, + expectedError + ); + const iterable = client.listTopicSnapshotsAsync(request); + await assert.rejects(async () => { + const responses: string[] = []; + for await (const resource of iterable) { + responses.push(resource!); + } + }); + assert.deepStrictEqual( + (client.descriptors.page.listTopicSnapshots + .asyncIterate as SinonStub).getCall(0).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listTopicSnapshots + .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + }); + + describe('Path templates', () => { + describe('project', () => { + const fakePath = '/rendered/path/project'; + const expectedParameters = { + project: 'projectValue', + }; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.projectPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.projectPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('projectPath', () => { + const result = client.projectPath('projectValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.projectPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromProjectName', () => { + const result = client.matchProjectFromProjectName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.projectPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('projectTopic', () => { + const fakePath = '/rendered/path/projectTopic'; + const expectedParameters = { + project: 'projectValue', + topic: 'topicValue', + }; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.projectTopicPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.projectTopicPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('projectTopicPath', () => { + const result = client.projectTopicPath('projectValue', 'topicValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.projectTopicPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromProjectTopicName', () => { + const result = client.matchProjectFromProjectTopicName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchTopicFromProjectTopicName', () => { + const result = client.matchTopicFromProjectTopicName(fakePath); + assert.strictEqual(result, 'topicValue'); + assert( + (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('snapshot', () => { + const fakePath = '/rendered/path/snapshot'; + const expectedParameters = { + project: 'projectValue', + snapshot: 'snapshotValue', + }; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.snapshotPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.snapshotPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('snapshotPath', () => { + const result = client.snapshotPath('projectValue', 'snapshotValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.snapshotPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSnapshotName', () => { + const result = client.matchProjectFromSnapshotName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.snapshotPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSnapshotFromSnapshotName', () => { + const result = client.matchSnapshotFromSnapshotName(fakePath); + assert.strictEqual(result, 'snapshotValue'); + assert( + (client.pathTemplates.snapshotPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('subscription', () => { + const fakePath = '/rendered/path/subscription'; + const expectedParameters = { + project: 'projectValue', + subscription: 'subscriptionValue', + }; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.subscriptionPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.subscriptionPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('subscriptionPath', () => { + const result = client.subscriptionPath( + 'projectValue', + 'subscriptionValue' + ); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.subscriptionPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSubscriptionName', () => { + const result = client.matchProjectFromSubscriptionName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSubscriptionFromSubscriptionName', () => { + const result = client.matchSubscriptionFromSubscriptionName(fakePath); + assert.strictEqual(result, 'subscriptionValue'); + assert( + (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts new file mode 100644 index 00000000000..f5ef3f95266 --- /dev/null +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -0,0 +1,2550 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** + +import * as protos from '../protos/protos'; +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import {SinonStub} from 'sinon'; +import {describe, it} from 'mocha'; +import * as subscriberModule from '../src'; + +import {PassThrough} from 'stream'; + +import {protobuf} from 'google-gax'; + +function generateSampleMessage(instance: T) { + const filledObject = (instance.constructor as typeof protobuf.Message).toObject( + instance as protobuf.Message, + {defaults: true} + ); + return (instance.constructor as typeof protobuf.Message).fromObject( + filledObject + ) as T; +} + +function stubSimpleCall(response?: ResponseType, error?: Error) { + return error + ? sinon.stub().rejects(error) + : sinon.stub().resolves([response]); +} + +function stubSimpleCallWithCallback( + response?: ResponseType, + error?: Error +) { + return error + ? sinon.stub().callsArgWith(2, error) + : sinon.stub().callsArgWith(2, null, response); +} + +function stubBidiStreamingCall( + response?: ResponseType, + error?: Error +) { + const transformStub = error + ? sinon.stub().callsArgWith(2, error) + : sinon.stub().callsArgWith(2, null, response); + const mockStream = new PassThrough({ + objectMode: true, + transform: transformStub, + }); + return sinon.stub().returns(mockStream); +} + +function stubPageStreamingCall( + responses?: ResponseType[], + error?: Error +) { + const pagingStub = sinon.stub(); + if (responses) { + for (let i = 0; i < responses.length; ++i) { + pagingStub.onCall(i).callsArgWith(2, null, responses[i]); + } + } + const transformStub = error + ? sinon.stub().callsArgWith(2, error) + : pagingStub; + const mockStream = new PassThrough({ + objectMode: true, + transform: transformStub, + }); + // trigger as many responses as needed + if (responses) { + for (let i = 0; i < responses.length; ++i) { + setImmediate(() => { + mockStream.write({}); + }); + } + setImmediate(() => { + mockStream.end(); + }); + } else { + setImmediate(() => { + mockStream.write({}); + }); + setImmediate(() => { + mockStream.end(); + }); + } + return sinon.stub().returns(mockStream); +} + +function stubAsyncIterationCall( + responses?: ResponseType[], + error?: Error +) { + let counter = 0; + const asyncIterable = { + [Symbol.asyncIterator]() { + return { + async next() { + if (error) { + return Promise.reject(error); + } + if (counter >= responses!.length) { + return Promise.resolve({done: true, value: undefined}); + } + return Promise.resolve({done: false, value: responses![counter++]}); + }, + }; + }, + }; + return sinon.stub().returns(asyncIterable); +} + +describe('v1.SubscriberClient', () => { + it('has servicePath', () => { + const servicePath = subscriberModule.v1.SubscriberClient.servicePath; + assert(servicePath); + }); + + it('has apiEndpoint', () => { + const apiEndpoint = subscriberModule.v1.SubscriberClient.apiEndpoint; + assert(apiEndpoint); + }); + + it('has port', () => { + const port = subscriberModule.v1.SubscriberClient.port; + assert(port); + assert(typeof port === 'number'); + }); + + it('should create a client with no option', () => { + const client = new subscriberModule.v1.SubscriberClient(); + assert(client); + }); + + it('should create a client with gRPC fallback', () => { + const client = new subscriberModule.v1.SubscriberClient({ + fallback: true, + }); + assert(client); + }); + + it('has initialize method and supports deferred initialization', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.subscriberStub, undefined); + await client.initialize(); + assert(client.subscriberStub); + }); + + it('has close method', () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.close(); + }); + + it('has getProjectId method', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); + const result = await client.getProjectId(); + assert.strictEqual(result, fakeProjectId); + assert((client.auth.getProjectId as SinonStub).calledWithExactly()); + }); + + it('has getProjectId method with callback', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon + .stub() + .callsArgWith(0, null, fakeProjectId); + const promise = new Promise((resolve, reject) => { + client.getProjectId((err?: Error | null, projectId?: string | null) => { + if (err) { + reject(err); + } else { + resolve(projectId); + } + }); + }); + const result = await promise; + assert.strictEqual(result, fakeProjectId); + }); + + describe('createSubscription', () => { + it('invokes createSubscription without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + client.innerApiCalls.createSubscription = stubSimpleCall( + expectedResponse + ); + const [response] = await client.createSubscription(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.createSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes createSubscription without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + client.innerApiCalls.createSubscription = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.createSubscription( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISubscription | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.createSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes createSubscription with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.createSubscription = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.createSubscription(request); + }, expectedError); + assert( + (client.innerApiCalls.createSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('getSubscription', () => { + it('invokes getSubscription without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + client.innerApiCalls.getSubscription = stubSimpleCall(expectedResponse); + const [response] = await client.getSubscription(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.getSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes getSubscription without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + client.innerApiCalls.getSubscription = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.getSubscription( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISubscription | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.getSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes getSubscription with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.getSubscription = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.getSubscription(request); + }, expectedError); + assert( + (client.innerApiCalls.getSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('updateSubscription', () => { + it('invokes updateSubscription without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateSubscriptionRequest() + ); + request.subscription = {}; + request.subscription.name = ''; + const expectedHeaderRequestParams = 'subscription.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + client.innerApiCalls.updateSubscription = stubSimpleCall( + expectedResponse + ); + const [response] = await client.updateSubscription(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.updateSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes updateSubscription without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateSubscriptionRequest() + ); + request.subscription = {}; + request.subscription.name = ''; + const expectedHeaderRequestParams = 'subscription.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + client.innerApiCalls.updateSubscription = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.updateSubscription( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISubscription | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.updateSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes updateSubscription with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateSubscriptionRequest() + ); + request.subscription = {}; + request.subscription.name = ''; + const expectedHeaderRequestParams = 'subscription.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.updateSubscription = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.updateSubscription(request); + }, expectedError); + assert( + (client.innerApiCalls.updateSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('deleteSubscription', () => { + it('invokes deleteSubscription without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.deleteSubscription = stubSimpleCall( + expectedResponse + ); + const [response] = await client.deleteSubscription(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.deleteSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes deleteSubscription without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.deleteSubscription = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.deleteSubscription( + request, + ( + err?: Error | null, + result?: protos.google.protobuf.IEmpty | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.deleteSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes deleteSubscription with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.deleteSubscription = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.deleteSubscription(request); + }, expectedError); + assert( + (client.innerApiCalls.deleteSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('modifyAckDeadline', () => { + it('invokes modifyAckDeadline without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ModifyAckDeadlineRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.modifyAckDeadline = stubSimpleCall(expectedResponse); + const [response] = await client.modifyAckDeadline(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.modifyAckDeadline as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes modifyAckDeadline without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ModifyAckDeadlineRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.modifyAckDeadline = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.modifyAckDeadline( + request, + ( + err?: Error | null, + result?: protos.google.protobuf.IEmpty | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.modifyAckDeadline as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes modifyAckDeadline with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ModifyAckDeadlineRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.modifyAckDeadline = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.modifyAckDeadline(request); + }, expectedError); + assert( + (client.innerApiCalls.modifyAckDeadline as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('acknowledge', () => { + it('invokes acknowledge without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.AcknowledgeRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.acknowledge = stubSimpleCall(expectedResponse); + const [response] = await client.acknowledge(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.acknowledge as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes acknowledge without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.AcknowledgeRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.acknowledge = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.acknowledge( + request, + ( + err?: Error | null, + result?: protos.google.protobuf.IEmpty | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.acknowledge as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes acknowledge with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.AcknowledgeRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.acknowledge = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.acknowledge(request); + }, expectedError); + assert( + (client.innerApiCalls.acknowledge as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('pull', () => { + it('invokes pull without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.PullRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.PullResponse() + ); + client.innerApiCalls.pull = stubSimpleCall(expectedResponse); + const [response] = await client.pull(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.pull as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes pull without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.PullRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.PullResponse() + ); + client.innerApiCalls.pull = stubSimpleCallWithCallback(expectedResponse); + const promise = new Promise((resolve, reject) => { + client.pull( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.IPullResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.pull as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes pull with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.PullRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.pull = stubSimpleCall(undefined, expectedError); + await assert.rejects(async () => { + await client.pull(request); + }, expectedError); + assert( + (client.innerApiCalls.pull as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('modifyPushConfig', () => { + it('invokes modifyPushConfig without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ModifyPushConfigRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.modifyPushConfig = stubSimpleCall(expectedResponse); + const [response] = await client.modifyPushConfig(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.modifyPushConfig as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes modifyPushConfig without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ModifyPushConfigRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.modifyPushConfig = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.modifyPushConfig( + request, + ( + err?: Error | null, + result?: protos.google.protobuf.IEmpty | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.modifyPushConfig as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes modifyPushConfig with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ModifyPushConfigRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.modifyPushConfig = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.modifyPushConfig(request); + }, expectedError); + assert( + (client.innerApiCalls.modifyPushConfig as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('getSnapshot', () => { + it('invokes getSnapshot without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSnapshotRequest() + ); + request.snapshot = ''; + const expectedHeaderRequestParams = 'snapshot='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Snapshot() + ); + client.innerApiCalls.getSnapshot = stubSimpleCall(expectedResponse); + const [response] = await client.getSnapshot(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.getSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes getSnapshot without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSnapshotRequest() + ); + request.snapshot = ''; + const expectedHeaderRequestParams = 'snapshot='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Snapshot() + ); + client.innerApiCalls.getSnapshot = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.getSnapshot( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISnapshot | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.getSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes getSnapshot with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSnapshotRequest() + ); + request.snapshot = ''; + const expectedHeaderRequestParams = 'snapshot='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.getSnapshot = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.getSnapshot(request); + }, expectedError); + assert( + (client.innerApiCalls.getSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('createSnapshot', () => { + it('invokes createSnapshot without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CreateSnapshotRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Snapshot() + ); + client.innerApiCalls.createSnapshot = stubSimpleCall(expectedResponse); + const [response] = await client.createSnapshot(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.createSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes createSnapshot without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CreateSnapshotRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Snapshot() + ); + client.innerApiCalls.createSnapshot = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.createSnapshot( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISnapshot | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.createSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes createSnapshot with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CreateSnapshotRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.createSnapshot = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.createSnapshot(request); + }, expectedError); + assert( + (client.innerApiCalls.createSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('updateSnapshot', () => { + it('invokes updateSnapshot without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateSnapshotRequest() + ); + request.snapshot = {}; + request.snapshot.name = ''; + const expectedHeaderRequestParams = 'snapshot.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Snapshot() + ); + client.innerApiCalls.updateSnapshot = stubSimpleCall(expectedResponse); + const [response] = await client.updateSnapshot(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.updateSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes updateSnapshot without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateSnapshotRequest() + ); + request.snapshot = {}; + request.snapshot.name = ''; + const expectedHeaderRequestParams = 'snapshot.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Snapshot() + ); + client.innerApiCalls.updateSnapshot = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.updateSnapshot( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISnapshot | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.updateSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes updateSnapshot with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateSnapshotRequest() + ); + request.snapshot = {}; + request.snapshot.name = ''; + const expectedHeaderRequestParams = 'snapshot.name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.updateSnapshot = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.updateSnapshot(request); + }, expectedError); + assert( + (client.innerApiCalls.updateSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('deleteSnapshot', () => { + it('invokes deleteSnapshot without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSnapshotRequest() + ); + request.snapshot = ''; + const expectedHeaderRequestParams = 'snapshot='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.deleteSnapshot = stubSimpleCall(expectedResponse); + const [response] = await client.deleteSnapshot(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.deleteSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes deleteSnapshot without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSnapshotRequest() + ); + request.snapshot = ''; + const expectedHeaderRequestParams = 'snapshot='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.deleteSnapshot = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.deleteSnapshot( + request, + ( + err?: Error | null, + result?: protos.google.protobuf.IEmpty | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.deleteSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes deleteSnapshot with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSnapshotRequest() + ); + request.snapshot = ''; + const expectedHeaderRequestParams = 'snapshot='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.deleteSnapshot = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.deleteSnapshot(request); + }, expectedError); + assert( + (client.innerApiCalls.deleteSnapshot as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('seek', () => { + it('invokes seek without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.SeekRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.SeekResponse() + ); + client.innerApiCalls.seek = stubSimpleCall(expectedResponse); + const [response] = await client.seek(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.seek as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes seek without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.SeekRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.SeekResponse() + ); + client.innerApiCalls.seek = stubSimpleCallWithCallback(expectedResponse); + const promise = new Promise((resolve, reject) => { + client.seek( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISeekResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.seek as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes seek with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.SeekRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.seek = stubSimpleCall(undefined, expectedError); + await assert.rejects(async () => { + await client.seek(request); + }, expectedError); + assert( + (client.innerApiCalls.seek as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('streamingPull', () => { + it('invokes streamingPull without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.StreamingPullRequest() + ); + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.StreamingPullResponse() + ); + client.innerApiCalls.streamingPull = stubBidiStreamingCall( + expectedResponse + ); + const stream = client.streamingPull(); + const promise = new Promise((resolve, reject) => { + stream.on( + 'data', + (response: protos.google.pubsub.v1.StreamingPullResponse) => { + resolve(response); + } + ); + stream.on('error', (err: Error) => { + reject(err); + }); + stream.write(request); + stream.end(); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.streamingPull as SinonStub) + .getCall(0) + .calledWithExactly(undefined) + ); + assert.deepStrictEqual( + (((stream as unknown) as PassThrough)._transform as SinonStub).getCall( + 0 + ).args[0], + request + ); + }); + + it('invokes streamingPull with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.StreamingPullRequest() + ); + const expectedError = new Error('expected'); + client.innerApiCalls.streamingPull = stubBidiStreamingCall( + undefined, + expectedError + ); + const stream = client.streamingPull(); + const promise = new Promise((resolve, reject) => { + stream.on( + 'data', + (response: protos.google.pubsub.v1.StreamingPullResponse) => { + resolve(response); + } + ); + stream.on('error', (err: Error) => { + reject(err); + }); + stream.write(request); + stream.end(); + }); + await assert.rejects(async () => { + await promise; + }, expectedError); + assert( + (client.innerApiCalls.streamingPull as SinonStub) + .getCall(0) + .calledWithExactly(undefined) + ); + assert.deepStrictEqual( + (((stream as unknown) as PassThrough)._transform as SinonStub).getCall( + 0 + ).args[0], + request + ); + }); + }); + + describe('listSubscriptions', () => { + it('invokes listSubscriptions without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSubscriptionsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + ]; + client.innerApiCalls.listSubscriptions = stubSimpleCall(expectedResponse); + const [response] = await client.listSubscriptions(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listSubscriptions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listSubscriptions without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSubscriptionsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + ]; + client.innerApiCalls.listSubscriptions = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.listSubscriptions( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISubscription[] | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listSubscriptions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes listSubscriptions with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSubscriptionsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.listSubscriptions = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.listSubscriptions(request); + }, expectedError); + assert( + (client.innerApiCalls.listSubscriptions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listSubscriptionsStream without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSubscriptionsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + ]; + client.descriptors.page.listSubscriptions.createStream = stubPageStreamingCall( + expectedResponse + ); + const stream = client.listSubscriptionsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Subscription[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Subscription) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + const responses = await promise; + assert.deepStrictEqual(responses, expectedResponse); + assert( + (client.descriptors.page.listSubscriptions.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listSubscriptions, request) + ); + assert.strictEqual( + (client.descriptors.page.listSubscriptions + .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('invokes listSubscriptionsStream with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSubscriptionsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedError = new Error('expected'); + client.descriptors.page.listSubscriptions.createStream = stubPageStreamingCall( + undefined, + expectedError + ); + const stream = client.listSubscriptionsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Subscription[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Subscription) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + await assert.rejects(async () => { + await promise; + }, expectedError); + assert( + (client.descriptors.page.listSubscriptions.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listSubscriptions, request) + ); + assert.strictEqual( + (client.descriptors.page.listSubscriptions + .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listSubscriptions without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSubscriptionsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + generateSampleMessage(new protos.google.pubsub.v1.Subscription()), + ]; + client.descriptors.page.listSubscriptions.asyncIterate = stubAsyncIterationCall( + expectedResponse + ); + const responses: protos.google.pubsub.v1.ISubscription[] = []; + const iterable = client.listSubscriptionsAsync(request); + for await (const resource of iterable) { + responses.push(resource!); + } + assert.deepStrictEqual(responses, expectedResponse); + assert.deepStrictEqual( + (client.descriptors.page.listSubscriptions + .asyncIterate as SinonStub).getCall(0).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listSubscriptions + .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listSubscriptions with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSubscriptionsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedError = new Error('expected'); + client.descriptors.page.listSubscriptions.asyncIterate = stubAsyncIterationCall( + undefined, + expectedError + ); + const iterable = client.listSubscriptionsAsync(request); + await assert.rejects(async () => { + const responses: protos.google.pubsub.v1.ISubscription[] = []; + for await (const resource of iterable) { + responses.push(resource!); + } + }); + assert.deepStrictEqual( + (client.descriptors.page.listSubscriptions + .asyncIterate as SinonStub).getCall(0).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listSubscriptions + .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + }); + + describe('listSnapshots', () => { + it('invokes listSnapshots without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSnapshotsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + ]; + client.innerApiCalls.listSnapshots = stubSimpleCall(expectedResponse); + const [response] = await client.listSnapshots(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listSnapshots as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listSnapshots without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSnapshotsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + ]; + client.innerApiCalls.listSnapshots = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.listSnapshots( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISnapshot[] | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listSnapshots as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes listSnapshots with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSnapshotsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.listSnapshots = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.listSnapshots(request); + }, expectedError); + assert( + (client.innerApiCalls.listSnapshots as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listSnapshotsStream without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSnapshotsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + ]; + client.descriptors.page.listSnapshots.createStream = stubPageStreamingCall( + expectedResponse + ); + const stream = client.listSnapshotsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Snapshot[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Snapshot) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + const responses = await promise; + assert.deepStrictEqual(responses, expectedResponse); + assert( + (client.descriptors.page.listSnapshots.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listSnapshots, request) + ); + assert.strictEqual( + (client.descriptors.page.listSnapshots + .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('invokes listSnapshotsStream with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSnapshotsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedError = new Error('expected'); + client.descriptors.page.listSnapshots.createStream = stubPageStreamingCall( + undefined, + expectedError + ); + const stream = client.listSnapshotsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Snapshot[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Snapshot) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + await assert.rejects(async () => { + await promise; + }, expectedError); + assert( + (client.descriptors.page.listSnapshots.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listSnapshots, request) + ); + assert.strictEqual( + (client.descriptors.page.listSnapshots + .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listSnapshots without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSnapshotsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), + ]; + client.descriptors.page.listSnapshots.asyncIterate = stubAsyncIterationCall( + expectedResponse + ); + const responses: protos.google.pubsub.v1.ISnapshot[] = []; + const iterable = client.listSnapshotsAsync(request); + for await (const resource of iterable) { + responses.push(resource!); + } + assert.deepStrictEqual(responses, expectedResponse); + assert.deepStrictEqual( + (client.descriptors.page.listSnapshots + .asyncIterate as SinonStub).getCall(0).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listSnapshots + .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listSnapshots with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSnapshotsRequest() + ); + request.project = ''; + const expectedHeaderRequestParams = 'project='; + const expectedError = new Error('expected'); + client.descriptors.page.listSnapshots.asyncIterate = stubAsyncIterationCall( + undefined, + expectedError + ); + const iterable = client.listSnapshotsAsync(request); + await assert.rejects(async () => { + const responses: protos.google.pubsub.v1.ISnapshot[] = []; + for await (const resource of iterable) { + responses.push(resource!); + } + }); + assert.deepStrictEqual( + (client.descriptors.page.listSnapshots + .asyncIterate as SinonStub).getCall(0).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listSnapshots + .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ + 'x-goog-request-params' + ], + expectedHeaderRequestParams + ); + }); + }); + + describe('Path templates', () => { + describe('project', () => { + const fakePath = '/rendered/path/project'; + const expectedParameters = { + project: 'projectValue', + }; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.projectPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.projectPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('projectPath', () => { + const result = client.projectPath('projectValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.projectPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromProjectName', () => { + const result = client.matchProjectFromProjectName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.projectPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('projectTopic', () => { + const fakePath = '/rendered/path/projectTopic'; + const expectedParameters = { + project: 'projectValue', + topic: 'topicValue', + }; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.projectTopicPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.projectTopicPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('projectTopicPath', () => { + const result = client.projectTopicPath('projectValue', 'topicValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.projectTopicPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromProjectTopicName', () => { + const result = client.matchProjectFromProjectTopicName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchTopicFromProjectTopicName', () => { + const result = client.matchTopicFromProjectTopicName(fakePath); + assert.strictEqual(result, 'topicValue'); + assert( + (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('snapshot', () => { + const fakePath = '/rendered/path/snapshot'; + const expectedParameters = { + project: 'projectValue', + snapshot: 'snapshotValue', + }; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.snapshotPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.snapshotPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('snapshotPath', () => { + const result = client.snapshotPath('projectValue', 'snapshotValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.snapshotPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSnapshotName', () => { + const result = client.matchProjectFromSnapshotName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.snapshotPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSnapshotFromSnapshotName', () => { + const result = client.matchSnapshotFromSnapshotName(fakePath); + assert.strictEqual(result, 'snapshotValue'); + assert( + (client.pathTemplates.snapshotPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('subscription', () => { + const fakePath = '/rendered/path/subscription'; + const expectedParameters = { + project: 'projectValue', + subscription: 'subscriptionValue', + }; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.subscriptionPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.subscriptionPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('subscriptionPath', () => { + const result = client.subscriptionPath( + 'projectValue', + 'subscriptionValue' + ); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.subscriptionPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSubscriptionName', () => { + const result = client.matchProjectFromSubscriptionName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSubscriptionFromSubscriptionName', () => { + const result = client.matchSubscriptionFromSubscriptionName(fakePath); + assert.strictEqual(result, 'subscriptionValue'); + assert( + (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 3b32bb10922..6783aa78ed2 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -109,8 +109,13 @@ class FakeGrpcStream extends Duplex { class FakeGaxClient { client: FakeGrpcClient; + subscriberStub: Promise; constructor() { this.client = new FakeGrpcClient(); + this.subscriberStub = this.getSubscriberStub(); + } + initialize() { + return this.subscriberStub; } async getSubscriberStub(): Promise { return this.client; diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 78bb05b81cf..0d5fa3cf1d4 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -23,7 +23,7 @@ import {CallOptions, ChannelCredentials, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; -import {google} from '../proto/pubsub'; +import {google} from '../protos/protos'; import * as pubsubTypes from '../src/pubsub'; import {Snapshot} from '../src/snapshot'; import * as subby from '../src/subscription'; @@ -295,10 +295,6 @@ describe('PubSub', () => { it('should set isEmulator to false by default', () => { assert.strictEqual(pubsub.isEmulator, false); }); - - it('should localize a Promise override', () => { - assert.strictEqual(pubsub.Promise, OPTIONS.promise); - }); }); describe('createSubscription', () => { @@ -784,7 +780,8 @@ describe('PubSub', () => { return snapshot as Snapshot; }); - pubsub.getSnapshots((err, snapshots) => { + // tslint:disable-next-line: no-any + pubsub.getSnapshots((err: any, snapshots: any) => { assert.ifError(err); assert.strictEqual(snapshots![0], snapshot); assert.strictEqual(snapshots![0].metadata, apiResponse.snapshots[0]); @@ -1009,7 +1006,8 @@ describe('PubSub', () => { return topic as Topic; }; - pubsub.getTopics((err, topics) => { + // tslint:disable-next-line: no-any + pubsub.getTopics((err: any, topics: any) => { assert.ifError(err); assert.strictEqual(topics![0], topic); assert.strictEqual(topics![0].metadata, apiResponse.topics[0]); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 6303c34e36c..07fd5363a52 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -20,7 +20,7 @@ import {ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; -import {google} from '../proto/pubsub'; +import {google} from '../protos/protos'; import {ExistsCallback, RequestCallback, RequestConfig} from '../src/pubsub'; import { CreateSubscriptionOptions, diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index 31be13957ed..c78f1c884ef 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -2,10 +2,17 @@ "extends": "./node_modules/gts/tsconfig-google.json", "compilerOptions": { "rootDir": ".", - "outDir": "build" + "outDir": "build", + "resolveJsonModule": true, + "lib": [ + "es2018", + "dom" + ] }, "include": [ + "src/*.ts", "src/**/*.ts", + "test/*.ts", "test/**/*.ts", "system-test/*.ts" ] diff --git a/handwritten/pubsub/webpack.config.js b/handwritten/pubsub/webpack.config.js new file mode 100644 index 00000000000..c53b4c466cd --- /dev/null +++ b/handwritten/pubsub/webpack.config.js @@ -0,0 +1,64 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +const path = require('path'); + +module.exports = { + entry: './src/index.ts', + output: { + library: 'pubsub', + filename: './pubsub.js', + }, + node: { + child_process: 'empty', + fs: 'empty', + crypto: 'empty', + }, + resolve: { + alias: { + '../../../package.json': path.resolve(__dirname, 'package.json'), + }, + extensions: ['.js', '.json', '.ts'], + }, + module: { + rules: [ + { + test: /\.tsx?$/, + use: 'ts-loader', + exclude: /node_modules/ + }, + { + test: /node_modules[\\/]@grpc[\\/]grpc-js/, + use: 'null-loader' + }, + { + test: /node_modules[\\/]grpc/, + use: 'null-loader' + }, + { + test: /node_modules[\\/]retry-request/, + use: 'null-loader' + }, + { + test: /node_modules[\\/]https?-proxy-agent/, + use: 'null-loader' + }, + { + test: /node_modules[\\/]gtoken/, + use: 'null-loader' + }, + ], + }, + mode: 'production', +}; From a454827d5e07ab4569b48403110c56a6f1473738 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Fri, 10 Apr 2020 23:26:07 -0700 Subject: [PATCH 0607/1115] fix: remove eslint, update gax, fix generated protos, run the generator (#955) Run the latest version of the generator, update google-gax, update gts, and remove direct dependencies on eslint. --- handwritten/pubsub/.eslintignore | 1 - handwritten/pubsub/.eslintrc.yml | 15 ---- handwritten/pubsub/.gitignore | 1 + handwritten/pubsub/.prettierignore | 8 +- handwritten/pubsub/.prettierrc | 8 -- handwritten/pubsub/codecov.yaml | 4 - handwritten/pubsub/package.json | 19 ++-- handwritten/pubsub/src/.eslintrc.yml | 3 - handwritten/pubsub/src/helper.ts | 4 +- handwritten/pubsub/src/index.ts | 7 +- handwritten/pubsub/src/lease-manager.ts | 2 - handwritten/pubsub/src/message-queues.ts | 1 + handwritten/pubsub/src/message-stream.ts | 1 + handwritten/pubsub/src/publisher/index.ts | 4 +- .../pubsub/src/publisher/message-queues.ts | 4 +- .../pubsub/src/publisher/publish-error.ts | 1 + handwritten/pubsub/src/pubsub.ts | 6 +- handwritten/pubsub/src/pull-retry.ts | 1 + handwritten/pubsub/src/snapshot.ts | 6 +- handwritten/pubsub/src/subscriber.ts | 3 - handwritten/pubsub/src/subscription.ts | 4 +- handwritten/pubsub/src/topic.ts | 3 +- handwritten/pubsub/src/v1/publisher_client.ts | 18 ++-- .../pubsub/src/v1/subscriber_client.ts | 16 ++-- handwritten/pubsub/synth.metadata | 13 +-- handwritten/pubsub/synth.py | 4 +- handwritten/pubsub/system-test/install.ts | 2 + handwritten/pubsub/system-test/pubsub.ts | 18 ++-- handwritten/pubsub/test/.eslintrc.yml | 3 - handwritten/pubsub/test/histogram.ts | 2 +- handwritten/pubsub/test/iam.ts | 6 +- handwritten/pubsub/test/lease-manager.ts | 89 ++++++++++--------- handwritten/pubsub/test/message-queues.ts | 13 +-- handwritten/pubsub/test/message-stream.ts | 15 ++-- handwritten/pubsub/test/publisher/index.ts | 4 +- .../pubsub/test/publisher/message-batch.ts | 2 +- .../pubsub/test/publisher/message-queues.ts | 16 ++-- .../pubsub/test/publisher/publish-error.ts | 3 +- handwritten/pubsub/test/pubsub.ts | 72 +++++++-------- handwritten/pubsub/test/pull-retry.ts | 6 +- handwritten/pubsub/test/snapshot.ts | 3 +- handwritten/pubsub/test/subscriber.ts | 14 +-- handwritten/pubsub/test/subscription.ts | 25 +++--- handwritten/pubsub/test/topic.ts | 17 ++-- handwritten/pubsub/tsconfig.json | 2 +- handwritten/pubsub/tslint.json | 3 - handwritten/pubsub/webpack.config.js | 12 +-- 47 files changed, 215 insertions(+), 269 deletions(-) delete mode 100644 handwritten/pubsub/.eslintrc.yml delete mode 100644 handwritten/pubsub/.prettierrc delete mode 100644 handwritten/pubsub/codecov.yaml delete mode 100644 handwritten/pubsub/src/.eslintrc.yml delete mode 100644 handwritten/pubsub/test/.eslintrc.yml delete mode 100644 handwritten/pubsub/tslint.json diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index 09b31fe735a..37f7a7343e7 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -1,5 +1,4 @@ **/node_modules -src/**/doc/* build/ docs/ protos/ diff --git a/handwritten/pubsub/.eslintrc.yml b/handwritten/pubsub/.eslintrc.yml deleted file mode 100644 index 73eeec27612..00000000000 --- a/handwritten/pubsub/.eslintrc.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -extends: - - 'eslint:recommended' - - 'plugin:node/recommended' - - prettier -plugins: - - node - - prettier -rules: - prettier/prettier: error - block-scoped-var: error - eqeqeq: error - no-warning-comments: warn - no-var: error - prefer-const: error diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 5d32b23782f..783162def96 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -12,3 +12,4 @@ system-test/*key.json .DS_Store package-lock.json __pycache__ +.vscode diff --git a/handwritten/pubsub/.prettierignore b/handwritten/pubsub/.prettierignore index f6fac98b0a8..910e984a175 100644 --- a/handwritten/pubsub/.prettierignore +++ b/handwritten/pubsub/.prettierignore @@ -1,3 +1,5 @@ -node_modules/* -samples/node_modules/* -src/**/doc/* +**/node_modules +build/ +docs/ +.coverage/ +protos/ diff --git a/handwritten/pubsub/.prettierrc b/handwritten/pubsub/.prettierrc deleted file mode 100644 index df6eac07446..00000000000 --- a/handwritten/pubsub/.prettierrc +++ /dev/null @@ -1,8 +0,0 @@ ---- -bracketSpacing: false -printWidth: 80 -semi: true -singleQuote: true -tabWidth: 2 -trailingComma: es5 -useTabs: false diff --git a/handwritten/pubsub/codecov.yaml b/handwritten/pubsub/codecov.yaml deleted file mode 100644 index 5724ea9478d..00000000000 --- a/handwritten/pubsub/codecov.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -codecov: - ci: - - source.cloud.google.com diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f392202fe35..c6b4c6c3ba7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "author": "Google Inc.", "engines": { - "node": ">=8.10.0" + "node": ">=10" }, "repository": "googleapis/nodejs-pubsub", "main": "./build/src/index.js", @@ -31,7 +31,7 @@ "system-test": "mocha build/system-test --timeout 600000", "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", "test": "c8 mocha build/test", - "lint": "gts check", + "lint": "gts fix", "predocs": "npm run compile", "docs": "jsdoc -c .jsdoc.js", "fix": "gts fix", @@ -42,7 +42,8 @@ "pretest": "npm run compile", "docs-test": "linkinator docs", "predocs-test": "npm run docs", - "benchwrapper": "node bin/benchwrapper.js" + "benchwrapper": "node bin/benchwrapper.js", + "prelint": "cd samples; npm link ../; npm install" }, "dependencies": { "@google-cloud/paginator": "^3.0.0", @@ -55,7 +56,7 @@ "async-each": "^1.0.1", "extend": "^3.0.2", "google-auth-library": "^6.0.0", - "google-gax": "^2.0.0", + "google-gax": "^2.1.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0", @@ -76,12 +77,9 @@ "@types/uuid": "^7.0.0", "c8": "^7.0.0", "codecov": "^3.0.0", - "eslint": "^6.0.0", - "eslint-config-prettier": "^6.0.0", - "eslint-plugin-node": "^11.0.0", - "eslint-plugin-prettier": "^3.0.0", + "execa": "^4.0.0", "grpc": "^1.24.0", - "gts": "^1.0.0", + "gts": "^2.0.0", "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", @@ -91,10 +89,9 @@ "mv": "^2.1.1", "ncp": "^2.0.0", "null-loader": "^3.0.0", - "prettier": "^1.18.2", "proxyquire": "^2.0.0", "sinon": "^9.0.0", - "source-map-support": "^0.5.9", + "tmp": "^0.1.0", "ts-loader": "^6.2.1", "typescript": "3.6.4", "uuid": "^7.0.0", diff --git a/handwritten/pubsub/src/.eslintrc.yml b/handwritten/pubsub/src/.eslintrc.yml deleted file mode 100644 index 46afd952546..00000000000 --- a/handwritten/pubsub/src/.eslintrc.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -rules: - node/no-missing-require: off diff --git a/handwritten/pubsub/src/helper.ts b/handwritten/pubsub/src/helper.ts index 3c90ff06f01..c81bffa7b77 100644 --- a/handwritten/pubsub/src/helper.ts +++ b/handwritten/pubsub/src/helper.ts @@ -22,6 +22,7 @@ import * as path from 'path'; import * as gapicConfig from './iam_policy_service_client_config.json'; import {ProjectIdCallback} from 'google-auth-library'; import * as protosTypes from '../protos/protos'; +// eslint-disable-next-line @typescript-eslint/no-var-requires const {version} = require('../../package.json'); /** * Google Cloud IAM Client. @@ -95,7 +96,7 @@ export class IamClient { const iamPolicyStub = gaxGrpc.createStub( opts.fallback ? (protos as protobuf.Root).lookupService('google.iam.v1.IAMPolicy') - : // tslint:disable-next-line no-any + : // eslint-disable-next-line @typescript-eslint/no-explicit-any (protos as any).google.iam.v1.IAMPolicy, opts ) as Promise<{[method: string]: Function}>; @@ -114,6 +115,7 @@ export class IamClient { if (this._terminated) { return Promise.reject('The client has already been closed.'); } + // eslint-disable-next-line prefer-spread return stub[methodName].apply(stub, args); }, (err: Error | null | undefined) => () => { diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index f6bfd2789ed..5aa45083735 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -76,11 +76,9 @@ * @property {constructor} SubscriberClient * Reference to {@link v1.SubscriberClient}. */ -const v1 = require('./v1'); +import * as v1 from './v1'; export {v1}; - -export {ServiceError} from '@grpc/grpc-js'; -export {CallOptions} from 'google-gax'; +export {ServiceError, CallOptions} from 'google-gax'; export { Policy, GetPolicyCallback, @@ -150,6 +148,7 @@ export { if (process.env.DEBUG_GRPC) { console.info('gRPC logging set to verbose'); + // eslint-disable-next-line const {setLogger, setLogVerbosity, logVerbosity} = require('@grpc/grpc-js'); setLogger(console); setLogVerbosity(logVerbosity.DEBUG); diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index 518a986880a..716a481020a 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -15,8 +15,6 @@ */ import {EventEmitter} from 'events'; -import {freemem} from 'os'; - import {Message, Subscriber} from './subscriber'; import {defaultOptions} from './default-options'; diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 455c33eac9f..9d3c003741d 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -15,6 +15,7 @@ */ import {CallOptions} from 'google-gax'; +// eslint-disable-next-line node/no-extraneous-import import {Metadata, ServiceError, status} from '@grpc/grpc-js'; import defer = require('p-defer'); diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index ddac12de71e..87c95a1ce05 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -22,6 +22,7 @@ import { ServiceError, status, StatusObject, + // eslint-disable-next-line node/no-extraneous-import } from '@grpc/grpc-js'; import * as isStreamEnded from 'is-stream-ended'; import {PassThrough} from 'stream'; diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 7386dba5e53..4e9ca41ba01 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -19,9 +19,9 @@ import * as extend from 'extend'; import {CallOptions} from 'google-gax'; import {BatchPublishOptions} from './message-batch'; -import {Queue, OrderedQueue, PublishDone} from './message-queues'; +import {Queue, OrderedQueue} from './message-queues'; import {Topic} from '../topic'; -import {RequestCallback, EmptyCallback, EmptyResponse} from '../pubsub'; +import {RequestCallback, EmptyCallback} from '../pubsub'; import {google} from '../../protos/protos'; import {defaultOptions} from '../default-options'; diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index c7365ac7a2e..1b372d1c9f4 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import {ServiceError} from '@grpc/grpc-js'; +import {ServiceError} from 'google-gax'; import {EventEmitter} from 'events'; import {BatchPublishOptions, MessageBatch} from './message-batch'; import {PublishError} from './publish-error'; -import {Publisher, PubsubMessage, PublishCallback, BATCH_LIMITS} from './'; +import {Publisher, PubsubMessage, PublishCallback} from './'; import {google} from '../../protos/protos'; export interface PublishDone { diff --git a/handwritten/pubsub/src/publisher/publish-error.ts b/handwritten/pubsub/src/publisher/publish-error.ts index 6a2bd650793..d59d1d27e6b 100644 --- a/handwritten/pubsub/src/publisher/publish-error.ts +++ b/handwritten/pubsub/src/publisher/publish-error.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +// eslint-disable-next-line node/no-extraneous-import import {ServiceError, Metadata, status} from '@grpc/grpc-js'; /** diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index bc700fb505a..5e2cbc0d5b1 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -20,10 +20,14 @@ import {promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; import * as gax from 'google-gax'; +// eslint-disable-next-line node/no-extraneous-import import * as grpc from '@grpc/grpc-js'; +// eslint-disable-next-line node/no-extraneous-import import {ServiceError, ChannelCredentials} from '@grpc/grpc-js'; +// eslint-disable-next-line @typescript-eslint/no-var-requires const PKG = require('../../package.json'); +// eslint-disable-next-line @typescript-eslint/no-var-requires const v1 = require('./v1'); import {Snapshot} from './snapshot'; @@ -47,8 +51,6 @@ import {CallOptions} from 'google-gax'; import {Transform} from 'stream'; import {google} from '../protos/protos'; -const opts = {} as gax.GrpcClientOptions; - /** * Project ID placeholder. * @type {string} diff --git a/handwritten/pubsub/src/pull-retry.ts b/handwritten/pubsub/src/pull-retry.ts index f55679e128d..cd4d77842ac 100644 --- a/handwritten/pubsub/src/pull-retry.ts +++ b/handwritten/pubsub/src/pull-retry.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +// eslint-disable-next-line node/no-extraneous-import import {StatusObject, status} from '@grpc/grpc-js'; /*! diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 68339c44df4..f6e62814318 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -18,7 +18,6 @@ import {promisifyAll} from '@google-cloud/promisify'; import {CallOptions} from 'google-gax'; import {google} from '../protos/protos'; - import {PubSub} from './pubsub'; import { EmptyCallback, @@ -27,7 +26,6 @@ import { ResourceCallback, } from './pubsub'; import {Subscription} from './subscription'; -import * as util from './util'; export type CreateSnapshotCallback = ResourceCallback< Snapshot, @@ -206,7 +204,7 @@ export class Snapshot { ): void | Promise { if (!(this.parent instanceof Subscription)) { throw new Error( - `This is only available if you accessed this object through Subscription#snapshot` + 'This is only available if you accessed this object through Subscription#snapshot' ); } @@ -261,7 +259,7 @@ export class Snapshot { ): void | Promise { if (!(this.parent instanceof Subscription)) { throw new Error( - `This is only available if you accessed this object through Subscription#snapshot` + 'This is only available if you accessed this object through Subscription#snapshot' ); } return this.parent.seek(this.name, gaxOpts! as CallOptions, callback!); diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 145ef137524..deea9fc9731 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -18,11 +18,8 @@ import {DateStruct, PreciseDate} from '@google-cloud/precise-date'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisify} from '@google-cloud/promisify'; import {EventEmitter} from 'events'; -import {ClientStub} from 'google-gax'; -import {common as protobuf} from 'protobufjs'; import {google} from '../protos/protos'; - import {Histogram} from './histogram'; import {FlowControlOptions, LeaseManager} from './lease-manager'; import {AckQueue, BatchOptions, ModAckQueue} from './message-queues'; diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index d83859dabae..5fe5851beb4 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -43,10 +43,8 @@ import { } from './snapshot'; import {Subscriber, SubscriberOptions} from './subscriber'; import {Topic} from './topic'; -import {noop} from './util'; export type PushConfig = google.pubsub.v1.IPushConfig; - export type OidcToken = google.pubsub.v1.PushConfig.IOidcToken; export type SubscriptionMetadata = { @@ -1024,7 +1022,7 @@ export class Subscription extends EventEmitter { } }); - this.on('removeListener', event => { + this.on('removeListener', () => { if (this.isOpen && this.listenerCount('message') === 0) { this._subscriber.close(); } diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 526209f8ed4..3cc761240c6 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -47,7 +47,6 @@ import { Subscription, SubscriptionOptions, } from './subscription'; -import * as util from './util'; export type TopicMetadata = google.pubsub.v1.ITopic; @@ -80,7 +79,7 @@ export type GetTopicSubscriptionsResponse = PagedResponse< google.pubsub.v1.IListTopicSubscriptionsResponse >; -// tslint:disable-next-line no-any +// eslint-disable-next-line @typescript-eslint/no-explicit-any export type MessageOptions = PubsubMessage & {json?: any}; /** diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index ac9132508cf..257b403fae7 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -214,7 +214,7 @@ export class PublisherClient { ['topic'], 'message_ids', gax.createByteLengthFunction( - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any protoFilesRoot.lookupType('google.pubsub.v1.PubsubMessage') as any ) ), @@ -258,7 +258,7 @@ export class PublisherClient { ? (this._protos as protobuf.Root).lookupService( 'google.pubsub.v1.Publisher' ) - : // tslint:disable-next-line no-any + : // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._protos as any).google.pubsub.v1.Publisher, this._opts ) as Promise<{[method: string]: Function}>; @@ -1406,7 +1406,7 @@ export class PublisherClient { */ projectPath(project: string) { return this.pathTemplates.projectPathTemplate.render({ - project, + project: project, }); } @@ -1430,8 +1430,8 @@ export class PublisherClient { */ projectTopicPath(project: string, topic: string) { return this.pathTemplates.projectTopicPathTemplate.render({ - project, - topic, + project: project, + topic: topic, }); } @@ -1468,8 +1468,8 @@ export class PublisherClient { */ snapshotPath(project: string, snapshot: string) { return this.pathTemplates.snapshotPathTemplate.render({ - project, - snapshot, + project: project, + snapshot: snapshot, }); } @@ -1504,8 +1504,8 @@ export class PublisherClient { */ subscriptionPath(project: string, subscription: string) { return this.pathTemplates.subscriptionPathTemplate.render({ - project, - subscription, + project: project, + subscription: subscription, }); } diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 097a264c4c0..9a0801050a3 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -237,7 +237,7 @@ export class SubscriberClient { ? (this._protos as protobuf.Root).lookupService( 'google.pubsub.v1.Subscriber' ) - : // tslint:disable-next-line no-any + : // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._protos as any).google.pubsub.v1.Subscriber, this._opts ) as Promise<{[method: string]: Function}>; @@ -2066,7 +2066,7 @@ export class SubscriberClient { */ projectPath(project: string) { return this.pathTemplates.projectPathTemplate.render({ - project, + project: project, }); } @@ -2090,8 +2090,8 @@ export class SubscriberClient { */ projectTopicPath(project: string, topic: string) { return this.pathTemplates.projectTopicPathTemplate.render({ - project, - topic, + project: project, + topic: topic, }); } @@ -2128,8 +2128,8 @@ export class SubscriberClient { */ snapshotPath(project: string, snapshot: string) { return this.pathTemplates.snapshotPathTemplate.render({ - project, - snapshot, + project: project, + snapshot: snapshot, }); } @@ -2164,8 +2164,8 @@ export class SubscriberClient { */ subscriptionPath(project: string, subscription: string) { return this.pathTemplates.subscriptionPathTemplate.render({ - project, - subscription, + project: project, + subscription: subscription, }); } diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index bfd981203da..8a36b9dba94 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,19 +1,12 @@ { - "updateTime": "2020-04-08T18:29:29.306214Z", + "updateTime": "2020-04-11T00:41:23.034720Z", "sources": [ - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "d398d687aad9eab4c6ceee9cd5e012fa61f7e28c", - "internalRef": "305496764" - } - }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8cf0f5d93a70c3dcb0b4999d3152c46d4d9264bf" + "sha": "6f32150677c9784f3c3a7e1949472bd29c9d72c5", + "log": "6f32150677c9784f3c3a7e1949472bd29c9d72c5\nfix: installs test_utils from its common repo (#480)\n\n\n74ce986d3b5431eb66985e9a00c4eb45295a4020\nfix: stop recording update_time in synth.metadata (#478)\n\n\n7f8e62aa3edd225f76347a16f92e400661fdfb52\nchore(java): release-please only updates non maven versions in README (#476)\n\nPrevent release-please and synthtool from fighting over the released library version. Synthtool updates the install snippets from the samples pom.xml files so the bots fight if they are temporarily out of sync after a release.\nc7e0e517d7f46f77bebd27da2e5afcaa6eee7e25\nbuild(java): fix nightly integration test config to run integrations (#465)\n\nThis was only running the units.\nbd69a2aa7b70875f3c988e269706b22fefbef40e\nbuild(java): fix retry_with_backoff when -e option set (#475)\n\n\nd9b173c427bfa0c6cca818233562e7e8841a357c\nfix: record version of working repo in synth.metadata (#473)\n\nPartial revert of b37cf74d12e9a42b9de9e61a4f26133d7cd9c168.\nf73a541770d95a609e5be6bf6b3b220d17cefcbe\nfeat(discogapic): allow local discovery-artifact-manager (#474)\n\n\n" } } ], diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 1fb6841f5bd..02503cefa73 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -55,7 +55,7 @@ # TODO: it should be removed once pubsub upgrade gts 2.0.0 # fix tslint issue due to mismatch gts version with gapic-generator-typescript s.replace(client_file, '\/\/ eslint\-disable\-next\-line\ \@typescript\-eslint\/no\-explicit\-any', - '// tslint:disable-next-line no-any') + '// eslint-disable-next-line @typescript-eslint/no-explicit-any') with open('helperMethods.ts.tmpl', 'r') as helper_file: content = helper_file.read() @@ -68,5 +68,5 @@ # Node.js specific cleanup subprocess.run(['npm', 'install']) -subprocess.run(['npm', 'run', 'fix']) +subprocess.run(['npm', 'run', 'lint']) subprocess.run(['npx', 'compileProtos', 'src']) diff --git a/handwritten/pubsub/system-test/install.ts b/handwritten/pubsub/system-test/install.ts index 58495a7467b..d1b9705ced1 100644 --- a/handwritten/pubsub/system-test/install.ts +++ b/handwritten/pubsub/system-test/install.ts @@ -17,12 +17,14 @@ import * as mv from 'mv'; import {ncp} from 'ncp'; import * as tmp from 'tmp'; import {promisify} from 'util'; +import {describe, it, after} from 'mocha'; const keep = false; const mvp = (promisify(mv) as {}) as (...args: string[]) => Promise; const ncpp = promisify(ncp); const stagingDir = tmp.dirSync({keep, unsafeCleanup: true}); const stagingPath = stagingDir.name; +// eslint-disable-next-line @typescript-eslint/no-var-requires const pkg = require('../../package.json'); describe('📦 pack and install', () => { diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 09447865e84..d5a5fe941c5 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -13,7 +13,7 @@ // limitations under the License. import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, after, beforeEach} from 'mocha'; import * as crypto from 'crypto'; import defer = require('p-defer'); import * as uuid from 'uuid'; @@ -28,7 +28,6 @@ import { } from '../src'; import {Policy, IamPermissionsMap} from '../src/iam'; import {MessageOptions} from '../src/topic'; -import {Metadata, MetadataValue} from 'google-gax'; import {google} from '../protos/protos'; type Resource = Topic | Subscription | Snapshot; @@ -39,10 +38,7 @@ const CURRENT_TIME = Date.now(); const pubsub = new PubSub(); function shortUUID() { - return uuid - .v1() - .split('-') - .shift(); + return uuid.v1().split('-').shift(); } describe('pubsub', () => { @@ -293,6 +289,7 @@ describe('pubsub', () => { const { input, expected, + // eslint-disable-next-line @typescript-eslint/no-var-requires } = require('../../system-test/fixtures/ordered-messages.json'); const publishes = input.map(({key, message}: Input) => { @@ -583,7 +580,7 @@ describe('pubsub', () => { subscription.on('error', done); - // tslint:disable-next-line: no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any subscription.on('message', (message: {data: any}) => { assert.deepStrictEqual(message.data, Buffer.from('hello')); @@ -660,7 +657,7 @@ describe('pubsub', () => { // can be ran manually to test options/memory usage/etc. // tslint:disable-next-line ban - it.skip('should handle a large volume of messages', async function() { + it.skip('should handle a large volume of messages', async function () { const MESSAGES = 200000; const deferred = defer(); @@ -681,7 +678,7 @@ describe('pubsub', () => { return deferred.promise; function onmessage(message: Message) { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any const testid = (message.attributes as any).testid; if (!testid) { @@ -858,7 +855,6 @@ describe('pubsub', () => { let subscription: Subscription; let snapshot: Snapshot; let messageId: string; - const snapshotName = generateSnapshotName(); beforeEach(async () => { subscription = topic.subscription(generateSubName()); @@ -903,7 +899,7 @@ describe('pubsub', () => { subscription.on('error', done); subscription.on( 'message', - // tslint:disable-next-line: no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (message: {id: string; ack: () => void; publishTime: any}) => { if (message.id !== messageId) { return; diff --git a/handwritten/pubsub/test/.eslintrc.yml b/handwritten/pubsub/test/.eslintrc.yml deleted file mode 100644 index 46afd952546..00000000000 --- a/handwritten/pubsub/test/.eslintrc.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -rules: - node/no-missing-require: off diff --git a/handwritten/pubsub/test/histogram.ts b/handwritten/pubsub/test/histogram.ts index fdd31d36744..8a32be791a6 100644 --- a/handwritten/pubsub/test/histogram.ts +++ b/handwritten/pubsub/test/histogram.ts @@ -13,7 +13,7 @@ // limitations under the License. import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, beforeEach} from 'mocha'; import {Histogram} from '../src/histogram.js'; describe('Histogram', () => { diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index 183634c19f3..0bc0dfa8740 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -14,7 +14,7 @@ import * as promisify from '@google-cloud/promisify'; import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach} from 'mocha'; import * as proxyquire from 'proxyquire'; import * as iamTypes from '../src/iam'; @@ -116,7 +116,7 @@ describe('IAM', () => { it('should throw an error if a policy is not supplied', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (iam as any).setPolicy(util.noop); }, /A policy object is required\./); }); @@ -149,7 +149,7 @@ describe('IAM', () => { describe('testPermissions', () => { it('should throw an error if permissions are missing', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (iam as any).testPermissions(util.noop); }, /Permissions are required\./); }); diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 2f535ac1f26..93d210595dd 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -33,7 +33,7 @@ class FakeSubscriber extends EventEmitter { ackDeadline = 10; isOpen = true; modAckLatency = 2000; - async modAck(message: FakeMessage, deadline: number): Promise {} + async modAck(): Promise {} } class FakeMessage { @@ -42,7 +42,7 @@ class FakeMessage { constructor() { this.received = Date.now(); } - modAck(deadline: number): void {} + modAck(): void {} } describe('LeaseManager', () => { @@ -79,8 +79,7 @@ describe('LeaseManager', () => { it('should capture any options passed in', () => { const fakeOptions = {}; const stub = sandbox.stub(LeaseManager.prototype, 'setOptions'); - const manager = new LeaseManager(subscriber, fakeOptions); - + new LeaseManager(subscriber, fakeOptions); const [options] = stub.lastCall.args; assert.strictEqual(options, fakeOptions); }); @@ -90,8 +89,8 @@ describe('LeaseManager', () => { it('should return the number of pending messages', () => { leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); - leaseManager.add(new FakeMessage() as Message); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add((new FakeMessage() as {}) as Message); assert.strictEqual(leaseManager.pending, 1); }); @@ -99,8 +98,8 @@ describe('LeaseManager', () => { describe('size', () => { it('should return the number of messages', () => { - leaseManager.add(new FakeMessage() as Message); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add((new FakeMessage() as {}) as Message); assert.strictEqual(leaseManager.size, 2); }); @@ -108,7 +107,7 @@ describe('LeaseManager', () => { describe('add', () => { it('should update the bytes/size values', () => { - const message = new FakeMessage() as Message; + const message = (new FakeMessage() as {}) as Message; leaseManager.add(message); @@ -117,7 +116,7 @@ describe('LeaseManager', () => { }); it('should dispatch the message if allowExcessMessages is true', done => { - const fakeMessage = new FakeMessage() as Message; + const fakeMessage = (new FakeMessage() as {}) as Message; leaseManager.isFull = () => true; leaseManager.setOptions({allowExcessMessages: true}); @@ -131,7 +130,7 @@ describe('LeaseManager', () => { }); it('should dispatch the message if the inventory is not full', done => { - const fakeMessage = new FakeMessage() as Message; + const fakeMessage = (new FakeMessage() as {}) as Message; leaseManager.isFull = () => false; leaseManager.setOptions({allowExcessMessages: false}); @@ -145,7 +144,7 @@ describe('LeaseManager', () => { }); it('should not dispatch the message if the inventory is full', done => { - const fakeMessage = new FakeMessage() as Message; + const fakeMessage = (new FakeMessage() as {}) as Message; leaseManager.isFull = () => true; leaseManager.setOptions({allowExcessMessages: false}); @@ -159,7 +158,7 @@ describe('LeaseManager', () => { }); it('should not dispatch the message if the sub closes', done => { - const fakeMessage = new FakeMessage() as Message; + const fakeMessage = (new FakeMessage() as {}) as Message; leaseManager.isFull = () => false; @@ -176,7 +175,7 @@ describe('LeaseManager', () => { leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); leaseManager.on('full', done); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); }); describe('extending deadlines', () => { @@ -197,7 +196,7 @@ describe('LeaseManager', () => { }); it('should schedule a lease extension', () => { - const message = new FakeMessage() as Message; + const message = (new FakeMessage() as {}) as Message; const stub = sandbox .stub(message, 'modAck') .withArgs(subscriber.ackDeadline); @@ -215,13 +214,12 @@ describe('LeaseManager', () => { // since only 1 timeout should be set, even if add messages at different // times, they should all get extended at the same time messages.forEach(message => { - leaseManager.add(message as Message); + leaseManager.add((message as {}) as Message); clock.tick(halfway); }); messages.forEach((fakeMessage, i) => { - const [deadline] = stubs[i].lastCall.args; - + const [deadline] = (stubs[i].lastCall.args as {}) as [number]; assert.strictEqual(deadline, subscriber.ackDeadline); }); }); @@ -231,7 +229,9 @@ describe('LeaseManager', () => { const badMessages = [new FakeMessage(), new FakeMessage()]; leaseManager.setOptions({maxExtension}); - badMessages.forEach(message => leaseManager.add(message as Message)); + badMessages.forEach(message => + leaseManager.add((message as {}) as Message) + ); clock.tick(halfway); // only message that shouldn't be forgotten @@ -239,7 +239,7 @@ describe('LeaseManager', () => { const removeStub = sandbox.stub(leaseManager, 'remove'); const modAckStub = sandbox.stub(goodMessage, 'modAck'); - leaseManager.add(goodMessage as Message); + leaseManager.add((goodMessage as {}) as Message); clock.tick(halfway); // make sure the expired messages were forgotten @@ -250,17 +250,18 @@ describe('LeaseManager', () => { assert.strictEqual(message, fakeMessage); }); - const [deadline] = modAckStub.lastCall.args; + const [deadline] = (modAckStub.lastCall.args as {}) as [number]; assert.strictEqual(deadline, subscriber.ackDeadline); }); it('should continuously extend the deadlines', () => { const message = new FakeMessage(); - const stub = sandbox + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const stub = (sandbox as any) .stub(message, 'modAck') .withArgs(subscriber.ackDeadline); - leaseManager.add(message as Message); + leaseManager.add((message as {}) as Message); clock.tick(expectedTimeout); assert.strictEqual(stub.callCount, 1); @@ -272,8 +273,8 @@ describe('LeaseManager', () => { describe('clear', () => { it('should completely clear out the inventory', () => { - leaseManager.add(new FakeMessage() as Message); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add((new FakeMessage() as {}) as Message); leaseManager.clear(); assert.strictEqual(leaseManager.bytes, 0); @@ -282,7 +283,7 @@ describe('LeaseManager', () => { it('should emit the free event if it was full', done => { leaseManager.setOptions({maxMessages: 1}); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); leaseManager.on('free', done); setImmediate(() => leaseManager.clear()); @@ -292,7 +293,7 @@ describe('LeaseManager', () => { const clock = sandbox.useFakeTimers(); const stub = sandbox.stub(subscriber, 'modAck').resolves(); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); leaseManager.clear(); // this would otherwise trigger a minimum of 2 modAcks @@ -307,8 +308,8 @@ describe('LeaseManager', () => { const maxMessages = 1; leaseManager.setOptions({maxMessages}); - leaseManager.add(new FakeMessage() as Message); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add((new FakeMessage() as {}) as Message); assert.strictEqual(leaseManager.isFull(), true); }); @@ -318,7 +319,7 @@ describe('LeaseManager', () => { const maxBytes = message.length - 1; leaseManager.setOptions({maxBytes}); - leaseManager.add(message as Message); + leaseManager.add((message as {}) as Message); assert.strictEqual(leaseManager.isFull(), true); }); @@ -329,7 +330,7 @@ describe('LeaseManager', () => { const maxBytes = message.length + 1; leaseManager.setOptions({maxMessages, maxBytes}); - leaseManager.add(message as Message); + leaseManager.add((message as {}) as Message); assert.strictEqual(leaseManager.isFull(), false); }); @@ -339,15 +340,15 @@ describe('LeaseManager', () => { it('should noop for unknown messages', () => { const message = new FakeMessage(); - leaseManager.add(message as Message); - leaseManager.remove(new FakeMessage() as Message); + leaseManager.add((message as {}) as Message); + leaseManager.remove((new FakeMessage() as {}) as Message); assert.strictEqual(leaseManager.size, 1); assert.strictEqual(leaseManager.bytes, message.length); }); it('should update the bytes/size values', () => { - const message = new FakeMessage() as Message; + const message = (new FakeMessage() as {}) as Message; leaseManager.add(message); leaseManager.remove(message); @@ -357,7 +358,7 @@ describe('LeaseManager', () => { }); it('should emit the free event if there is free space', done => { - const message = new FakeMessage() as Message; + const message = (new FakeMessage() as {}) as Message; leaseManager.setOptions({maxMessages: 1}); leaseManager.add(message); @@ -370,7 +371,7 @@ describe('LeaseManager', () => { }); it('should remove a message from the pending state', done => { - const pending = new FakeMessage() as Message; + const pending = (new FakeMessage() as {}) as Message; leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); @@ -380,7 +381,7 @@ describe('LeaseManager', () => { } }); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); leaseManager.add(pending); leaseManager.remove(pending); @@ -389,8 +390,8 @@ describe('LeaseManager', () => { }); it('should dispense a pending messages', done => { - const temp = new FakeMessage() as Message; - const pending = new FakeMessage() as Message; + const temp = (new FakeMessage() as {}) as Message; + const pending = (new FakeMessage() as {}) as Message; leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); @@ -411,7 +412,7 @@ describe('LeaseManager', () => { it('should cancel any extensions if no messages are left', () => { const clock = sandbox.useFakeTimers(); - const message = new FakeMessage() as Message; + const message = (new FakeMessage() as {}) as Message; const stub = sandbox.stub(subscriber, 'modAck').resolves(); leaseManager.add(message); @@ -427,7 +428,7 @@ describe('LeaseManager', () => { it('should allow excess messages by default', () => {}); it('should default maxBytes', () => { - const littleMessage = new FakeMessage() as Message; + const littleMessage = (new FakeMessage() as {}) as Message; const bigMessage = new FakeMessage(); leaseManager.add(littleMessage); @@ -435,7 +436,7 @@ describe('LeaseManager', () => { leaseManager.remove(littleMessage); bigMessage.length = defaultOptions.subscription.maxOutstandingBytes * 2; - leaseManager.add(bigMessage as Message); + leaseManager.add((bigMessage as {}) as Message); assert.strictEqual(leaseManager.isFull(), true); }); @@ -446,7 +447,7 @@ describe('LeaseManager', () => { i++ ) { assert.strictEqual(leaseManager.isFull(), false); - leaseManager.add(new FakeMessage() as Message); + leaseManager.add((new FakeMessage() as {}) as Message); } assert.strictEqual(leaseManager.isFull(), true); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index bb6cb41391d..ebb9dfcf539 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -15,9 +15,10 @@ */ import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import {CallOptions} from 'google-gax'; +// eslint-disable-next-line node/no-extraneous-import import {Metadata, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -68,7 +69,7 @@ describe('MessageQueues', () => { let subscriber: FakeSubscriber; - // tslint:disable-next-line variable-name no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any let MessageQueue: any; // tslint:disable-next-line variable-name let AckQueue: typeof messageTypes.AckQueue; @@ -112,7 +113,7 @@ describe('MessageQueues', () => { it('should set any provided options', () => { const fakeOptions = {}; const stub = sandbox.stub(MessageQueue.prototype, 'setOptions'); - const mq = new MessageQueue(subscriber, fakeOptions); + new MessageQueue(subscriber, fakeOptions); const [options] = stub.lastCall.args; assert.strictEqual(options, fakeOptions); @@ -327,7 +328,8 @@ describe('MessageQueues', () => { fakeError.code = 2; fakeError.metadata = new Metadata(); - const expectedMessage = `Failed to "acknowledge" for 3 message(s). Reason: Err.`; + const expectedMessage = + 'Failed to "acknowledge" for 3 message(s). Reason: Err.'; sandbox.stub(subscriber.client, 'acknowledge').rejects(fakeError); @@ -451,7 +453,8 @@ describe('MessageQueues', () => { fakeError.code = 2; fakeError.metadata = new Metadata(); - const expectedMessage = `Failed to "modifyAckDeadline" for 3 message(s). Reason: Err.`; + const expectedMessage = + 'Failed to "modifyAckDeadline" for 3 message(s). Reason: Err.'; sandbox.stub(subscriber.client, 'modifyAckDeadline').rejects(fakeError); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 6783aa78ed2..4bc71b22bba 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -15,7 +15,8 @@ */ import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach, afterEach, after} from 'mocha'; +// eslint-disable-next-line node/no-extraneous-import import {Metadata, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -104,6 +105,7 @@ class FakeGrpcStream extends Duplex { _write(chunk: object, encoding: string, callback: Function): void { callback(); } + // eslint-disable-next-line @typescript-eslint/no-unused-vars _read(size: number): void {} } @@ -285,10 +287,7 @@ describe('MessageStream', () => { it('should respect the timeout option', done => { const timeout = 12345; - const expectedDeadline = now + timeout; - messageStream = new MessageStream(subscriber, {timeout}); - setImmediate(() => { assert.strictEqual(client.deadline, now + timeout); done(); @@ -300,9 +299,9 @@ describe('MessageStream', () => { describe('destroy', () => { it('should noop if already destroyed', done => { - const stub = sandbox + sandbox .stub(FakePassThrough.prototype, 'destroy') - .callsFake(function(this: Duplex) { + .callsFake(function (this: Duplex) { if (this === messageStream) { done(); } @@ -354,7 +353,7 @@ describe('MessageStream', () => { before(() => { destroy = FakePassThrough.prototype.destroy; - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any FakePassThrough.prototype.destroy = false as any; }); @@ -428,7 +427,7 @@ describe('MessageStream', () => { const stub = sandbox.stub(client, 'waitForReady'); const ms = new MessageStream(subscriber); const fakeError = new Error('err'); - const expectedMessage = `Failed to connect to channel. Reason: err`; + const expectedMessage = 'Failed to connect to channel. Reason: err'; ms.on('error', (err: ServiceError) => { assert.strictEqual(err.code, 2); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 59d5ae86b78..df1208ec56d 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -16,7 +16,7 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -340,8 +340,6 @@ describe('Publisher', () => { maxMessages: 1001, }, }); - - const expected = 1000; assert.strictEqual(publisher.settings.batching!.maxMessages, 1000); }); }); diff --git a/handwritten/pubsub/test/publisher/message-batch.ts b/handwritten/pubsub/test/publisher/message-batch.ts index af83498430e..402dc39fbae 100644 --- a/handwritten/pubsub/test/publisher/message-batch.ts +++ b/handwritten/pubsub/test/publisher/message-batch.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, beforeEach, afterEach} from 'mocha'; import {randomBytes} from 'crypto'; import * as sinon from 'sinon'; diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index d889bae80c4..40581a0d31e 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {ServiceError} from '@grpc/grpc-js'; +import {ServiceError} from 'google-gax'; import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -29,6 +29,7 @@ import {PublishError} from '../../src/publisher/publish-error'; class FakeTopic { name = 'fake-topic'; + // eslint-disable-next-line @typescript-eslint/no-unused-vars request(config: RequestConfig, callback: RequestCallback): void {} } @@ -54,7 +55,9 @@ class FakeMessageBatch { this.messages = []; this.options = options; } + // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: p.PubsubMessage, callback: p.PublishCallback): void {} + // eslint-disable-next-line @typescript-eslint/no-unused-vars canFit(message: p.PubsubMessage): boolean { return true; } @@ -78,11 +81,9 @@ class FakePublishError { describe('Message Queues', () => { const sandbox = sinon.createSandbox(); - // tslint:disable-next-line no-any variable-name + // eslint-disable-next-line @typescript-eslint/no-explicit-any let MessageQueue: any; - // tslint:disable-next-line variable-name let Queue: typeof q.Queue; - // tslint:disable-next-line variable-name let OrderedQueue: typeof q.OrderedQueue; let topic: FakeTopic; @@ -401,10 +402,7 @@ describe('Message Queues', () => { it('should publish immediately if it cannot fit the message', done => { const addStub = sandbox.stub(batch, 'add'); - sandbox - .stub(batch, 'canFit') - .withArgs(fakeMessage) - .returns(false); + sandbox.stub(batch, 'canFit').withArgs(fakeMessage).returns(false); sandbox .stub(queue, 'publish') .onCall(0) diff --git a/handwritten/pubsub/test/publisher/publish-error.ts b/handwritten/pubsub/test/publisher/publish-error.ts index 4b31cb7b2ad..9646feec1f3 100644 --- a/handwritten/pubsub/test/publisher/publish-error.ts +++ b/handwritten/pubsub/test/publisher/publish-error.ts @@ -15,7 +15,8 @@ */ import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, beforeEach} from 'mocha'; +// eslint-disable-next-line node/no-extraneous-import import {ServiceError, Metadata} from '@grpc/grpc-js'; import {PublishError} from '../../src/publisher/publish-error'; diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 0d5fa3cf1d4..fae1212aa23 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -16,9 +16,11 @@ import * as pjy from '@google-cloud/projectify'; import * as promisify from '@google-cloud/promisify'; import arrify = require('arrify'); import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach, after, afterEach} from 'mocha'; import * as gax from 'google-gax'; +// eslint-disable-next-line node/no-extraneous-import import * as grpc from '@grpc/grpc-js'; +// eslint-disable-next-line node/no-extraneous-import import {CallOptions, ChannelCredentials, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -30,6 +32,7 @@ import * as subby from '../src/subscription'; import {Topic} from '../src/topic'; import * as util from '../src/util'; +// eslint-disable-next-line @typescript-eslint/no-var-requires const PKG = require('../../package.json'); const sandbox = sinon.createSandbox(); @@ -38,7 +41,7 @@ sandbox.stub(grpc.credentials, 'createInsecure').returns(fakeCreds); const subscriptionCached = subby.Subscription; -// tslint:disable-next-line no-any +// eslint-disable-next-line @typescript-eslint/no-explicit-any let subscriptionOverride: any; function Subscription( @@ -72,22 +75,22 @@ const fakePromisify = Object.assign({}, promisify, { }); let pjyOverride: Function; -function fakePjy() { - return (pjyOverride || pjy.replaceProjectIdToken).apply(null, arguments); +function fakePjy(...args: Array<{}>) { + return (pjyOverride || pjy.replaceProjectIdToken)(...args); } class FakeSnapshot { - calledWith_: IArguments; - constructor() { - this.calledWith_ = arguments; + calledWith_: Array<{}>; + constructor(...args: Array<{}>) { + this.calledWith_ = args; } } class FakeTopic { - calledWith_: IArguments; + calledWith_: Array<{}>; getSubscriptions?: Function; - constructor() { - this.calledWith_ = arguments; + constructor(...args: Array<{}>) { + this.calledWith_ = args; } } @@ -115,12 +118,12 @@ const fakePaginator = { }; let googleAuthOverride: Function | null; -function fakeGoogleAuth() { - return (googleAuthOverride || util.noop).apply(null, arguments); +function fakeGoogleAuth(...args: Array<{}>) { + return (googleAuthOverride || util.noop)(...args); } const v1Override = {}; -// tslint:disable-next-line no-any +// eslint-disable-next-line @typescript-eslint/no-explicit-any let v1ClientOverrides: any = {}; function defineOverridableClient(clientName: string) { @@ -157,10 +160,6 @@ describe('PubSub', () => { (err: Error | null): void; } - interface PostCloseTest { - (callback: PostCloseCallback): void; - } - before(() => { delete process.env.PUBSUB_EMULATOR_HOST; PubSub = proxyquire('../src/pubsub', { @@ -323,14 +322,14 @@ describe('PubSub', () => { it('should throw if no Topic is provided', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (pubsub as any).createSubscription(); }, /A Topic is required for a new subscription\./); }); it('should throw if no subscription name is provided', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (pubsub as any).createSubscription(TOPIC_NAME); }, /A subscription name is required./); }); @@ -347,7 +346,7 @@ describe('PubSub', () => { pubsub.request = (config, callback: Function) => { callback(null, apiResponse); }; - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (pubsub as any).createSubscription(TOPIC, SUB_NAME, undefined, done); }); @@ -780,7 +779,7 @@ describe('PubSub', () => { return snapshot as Snapshot; }); - // tslint:disable-next-line: no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any pubsub.getSnapshots((err: any, snapshots: any) => { assert.ifError(err); assert.strictEqual(snapshots![0], snapshot); @@ -1006,7 +1005,7 @@ describe('PubSub', () => { return topic as Topic; }; - // tslint:disable-next-line: no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any pubsub.getTopics((err: any, topics: any) => { assert.ifError(err); assert.strictEqual(topics![0], topic); @@ -1050,7 +1049,7 @@ describe('PubSub', () => { getProjectId: () => Promise.resolve(PROJECT_ID), }); - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any pjyOverride = (reqOpts: any) => { return reqOpts; }; @@ -1094,7 +1093,7 @@ describe('PubSub', () => { it('should call client method with correct options', done => { const fakeClient = {}; - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (fakeClient as any).fakeMethod = (reqOpts: any, gaxOpts: CallOptions) => { assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); @@ -1107,7 +1106,7 @@ describe('PubSub', () => { }); it('should replace the project id token on reqOpts', done => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any pjyOverride = (reqOpts: any, projectId: string) => { assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); @@ -1118,6 +1117,7 @@ describe('PubSub', () => { }); describe('getClientAsync_', () => { + // eslint-disable-next-line @typescript-eslint/class-name-casing const FAKE_CLIENT_INSTANCE = class { close() {} }; @@ -1207,7 +1207,7 @@ describe('PubSub', () => { let numTimesFakeClientInstantiated = 0; // tslint:disable-next-line only-arrow-functions - v1ClientOverrides.FakeClient = function() { + v1ClientOverrides.FakeClient = function () { numTimesFakeClientInstantiated++; return FAKE_CLIENT_INSTANCE; }; @@ -1221,7 +1221,7 @@ describe('PubSub', () => { it('should return the correct client', async () => { // tslint:disable-next-line only-arrow-functions no-any - v1ClientOverrides.FakeClient = function( + v1ClientOverrides.FakeClient = function ( options: pubsubTypes.ClientConfig ) { assert.strictEqual(options, pubsub.options); @@ -1276,7 +1276,7 @@ describe('PubSub', () => { }; beforeEach(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any pjyOverride = (reqOpts: any) => { return reqOpts; }; @@ -1309,7 +1309,7 @@ describe('PubSub', () => { }); it('should replace the project id token on reqOpts', done => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any pjyOverride = (reqOpts: any, projectId: string) => { assert.deepStrictEqual(reqOpts, CONFIG.reqOpts); assert.strictEqual(projectId, PROJECT_ID); @@ -1334,7 +1334,7 @@ describe('PubSub', () => { }; const fakeClient = { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any fakeMethod(reqOpts: any, gaxOpts: CallOptions) { assert.strictEqual(reqOpts, replacedReqOpts); assert.strictEqual(gaxOpts, CONFIG.gaxOpts); @@ -1353,7 +1353,7 @@ describe('PubSub', () => { describe('snapshot', () => { it('should throw if a name is not provided', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (pubsub as any).snapshot(); }, /You must supply a valid name for the snapshot\./); }); @@ -1375,14 +1375,14 @@ describe('PubSub', () => { it('should return a Subscription object', () => { // tslint:disable-next-line only-arrow-functions - subscriptionOverride = function() {}; + subscriptionOverride = function () {}; const subscription = pubsub.subscription(SUB_NAME, {}); assert(subscription instanceof subscriptionOverride); }); it('should pass specified name to the Subscription', done => { // tslint:disable-next-line only-arrow-functions - subscriptionOverride = function( + subscriptionOverride = function ( pubsub: pubsubTypes.PubSub, name: string ) { @@ -1394,7 +1394,7 @@ describe('PubSub', () => { it('should honor settings', done => { // tslint:disable-next-line only-arrow-functions - subscriptionOverride = function( + subscriptionOverride = function ( pubsub: pubsubTypes.PubSub, name: string, options: subby.SubscriptionOptions @@ -1407,7 +1407,7 @@ describe('PubSub', () => { it('should throw if a name is not provided', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any return (pubsub as any).subscription(); }, /A name must be specified for a subscription\./); }); @@ -1416,7 +1416,7 @@ describe('PubSub', () => { describe('topic', () => { it('should throw if a name is not provided', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (pubsub as any).topic(); }, /A name must be specified for a topic\./); }); diff --git a/handwritten/pubsub/test/pull-retry.ts b/handwritten/pubsub/test/pull-retry.ts index 3c1c88efbf5..2a1ba3c82a2 100644 --- a/handwritten/pubsub/test/pull-retry.ts +++ b/handwritten/pubsub/test/pull-retry.ts @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -import assert = require('assert'); -import sinon = require('sinon'); +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import {describe, it, beforeEach, afterEach} from 'mocha'; +// eslint-disable-next-line node/no-extraneous-import import {StatusObject, status} from '@grpc/grpc-js'; import {PullRetry} from '../src/pull-retry'; diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index bb6b58a6680..0465a1adff3 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -14,14 +14,13 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, beforeEach, before, after, afterEach} from 'mocha'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {PubSub, RequestConfig} from '../src/pubsub'; import * as snapTypes from '../src/snapshot'; import {Subscription} from '../src/subscription'; -import * as util from '../src/util'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index f4f623d2de9..2c9c64b9a85 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import {common as protobuf} from 'protobufjs'; import * as proxyquire from 'proxyquire'; @@ -191,7 +191,7 @@ describe('Subscriber', () => { it('should set any options passed in', () => { const stub = sandbox.stub(Subscriber.prototype, 'setOptions'); const fakeOptions = {}; - const sub = new Subscriber(subscription, fakeOptions); + new Subscriber(subscription, fakeOptions); const [options] = stub.lastCall.args; assert.strictEqual(options, fakeOptions); @@ -203,10 +203,7 @@ describe('Subscriber', () => { const latencies: FakeHistogram = stubs.get('latencies'); const fakeLatency = 234; - sandbox - .stub(latencies, 'percentile') - .withArgs(99) - .returns(fakeLatency); + sandbox.stub(latencies, 'percentile').withArgs(99).returns(fakeLatency); const maxMilliseconds = stubs.get('modAckQueue').maxMilliseconds; const expectedLatency = fakeLatency * 1000 + maxMilliseconds; @@ -255,10 +252,7 @@ describe('Subscriber', () => { const fakeDeadline = 312123; - sandbox - .stub(histogram, 'percentile') - .withArgs(99) - .returns(fakeDeadline); + sandbox.stub(histogram, 'percentile').withArgs(99).returns(fakeDeadline); subscriber.ack(message); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 9b751ae0528..58247909775 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -14,9 +14,9 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; -import {describe, it} from 'mocha'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; -import {ServiceError} from '@grpc/grpc-js'; +import {ServiceError} from 'google-gax'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -43,6 +43,7 @@ const fakePromisify = Object.assign({}, pfy, { class FakeIAM { calledWith_: IArguments; constructor() { + // eslint-disable-next-line prefer-rest-params this.calledWith_ = arguments; } } @@ -51,6 +52,7 @@ class FakeSnapshot { calledWith_: IArguments; static formatName_?: Function; constructor() { + // eslint-disable-next-line prefer-rest-params this.calledWith_ = arguments; } } @@ -62,6 +64,7 @@ class FakeSubscriber extends EventEmitter { isOpen = false; constructor() { super(); + // eslint-disable-next-line prefer-rest-params this.calledWith_ = arguments; subscriber = this; } @@ -71,6 +74,7 @@ class FakeSubscriber extends EventEmitter { async close(): Promise { this.isOpen = false; } + // eslint-disable-next-line @typescript-eslint/no-unused-vars setOptions(options: SubscriberOptions): void {} } @@ -126,7 +130,7 @@ describe('Subscription', () => { }; const subscription = new Subscription(PUBSUB, SUB_NAME); - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (subscription as any).request(assert.ifError); }); @@ -423,7 +427,7 @@ describe('Subscription', () => { it('should throw an error if a snapshot name is not found', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (subscription as any).createSnapshot(); }, /A name is required to create a snapshot\./); }); @@ -568,7 +572,7 @@ describe('Subscription', () => { }); it('should not remove all the listeners', done => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (subscription as any).removeAllListeners = () => { done(new Error('Should not be called.')); }; @@ -632,7 +636,7 @@ describe('Subscription', () => { }; sandbox.stub(subscription, 'getMetadata').callsFake(gaxOpts => { assert.strictEqual(gaxOpts, options); - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any assert.strictEqual((gaxOpts as typeof options).autoCreate, undefined); done(); }); @@ -857,7 +861,7 @@ describe('Subscription', () => { it('should throw if a name or date is not provided', () => { assert.throws(() => { - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (subscription as any).seek(); }, /Either a snapshot name or Date is needed to seek to\./); }); @@ -965,7 +969,6 @@ describe('Subscription', () => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; - subscription.setMetadata(METADATA, gaxOpts, done); }); }); @@ -974,9 +977,7 @@ describe('Subscription', () => { it('should pass the options to the subscriber', () => { const options = {}; const stub = sandbox.stub(subscriber, 'setOptions').withArgs(options); - subscription.setOptions(options); - assert.strictEqual(stub.callCount, 1); }); }); @@ -985,8 +986,8 @@ describe('Subscription', () => { const SNAPSHOT_NAME = 'a'; it('should call through to pubsub.snapshot', done => { - // tslint:disable-next-line no-any - (PUBSUB as any).snapshot = function(name: string) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (PUBSUB as any).snapshot = function (name: string) { assert.strictEqual(this, subscription); assert.strictEqual(name, SNAPSHOT_NAME); done(); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 07fd5363a52..858ad91041d 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -14,9 +14,8 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; -import {describe, it} from 'mocha'; -import {CallOptions} from 'google-gax'; -import {ServiceError} from '@grpc/grpc-js'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; +import {CallOptions, ServiceError} from 'google-gax'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -84,16 +83,16 @@ const fakePaginator = { }; describe('Topic', () => { - // tslint:disable-next-line no-any variable-name + // eslint-disable-next-line @typescript-eslint/no-explicit-any let Topic: any; - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any let topic: typeof Topic; const PROJECT_ID = 'test-project'; const TOPIC_NAME = 'projects/' + PROJECT_ID + '/topics/test-topic'; const TOPIC_UNFORMATTED_NAME = TOPIC_NAME.split('/').pop(); - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any const PUBSUB: any = { Promise: {}, projectId: PROJECT_ID, @@ -264,7 +263,7 @@ describe('Topic', () => { topic.getMetadata = (gaxOpts: CallOptions) => { assert.strictEqual(gaxOpts, options); - // tslint:disable-next-line no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any assert.strictEqual((gaxOpts as any).autoCreate, undefined); done(); }; @@ -559,13 +558,13 @@ describe('Topic', () => { const apiResponse_ = {}; topic.request = - // tslint:disable-next-line:no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (config: RequestConfig, callback: (...args: any[]) => void) => { callback(err_, subs_, nextQuery_, apiResponse_); }; topic.getSubscriptions( - // tslint:disable-next-line:no-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any (err: Error, subs: boolean, nextQuery: any, apiResponse: any) => { assert.strictEqual(err, err_); assert.deepStrictEqual(subs, subs_); diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index c78f1c884ef..613d35597b5 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "build", "resolveJsonModule": true, "lib": [ - "es2018", + "es2016", "dom" ] }, diff --git a/handwritten/pubsub/tslint.json b/handwritten/pubsub/tslint.json deleted file mode 100644 index 617dc975bae..00000000000 --- a/handwritten/pubsub/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "gts/tslint.json" -} diff --git a/handwritten/pubsub/webpack.config.js b/handwritten/pubsub/webpack.config.js index c53b4c466cd..16a13980c81 100644 --- a/handwritten/pubsub/webpack.config.js +++ b/handwritten/pubsub/webpack.config.js @@ -36,27 +36,27 @@ module.exports = { { test: /\.tsx?$/, use: 'ts-loader', - exclude: /node_modules/ + exclude: /node_modules/, }, { test: /node_modules[\\/]@grpc[\\/]grpc-js/, - use: 'null-loader' + use: 'null-loader', }, { test: /node_modules[\\/]grpc/, - use: 'null-loader' + use: 'null-loader', }, { test: /node_modules[\\/]retry-request/, - use: 'null-loader' + use: 'null-loader', }, { test: /node_modules[\\/]https?-proxy-agent/, - use: 'null-loader' + use: 'null-loader', }, { test: /node_modules[\\/]gtoken/, - use: 'null-loader' + use: 'null-loader', }, ], }, From 49eaec3a13a421dc2b0f73f49989b146d2345bd3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 13 Apr 2020 19:03:59 +0200 Subject: [PATCH 0608/1115] chore(deps): update dependency gts to v2 (#956) --- handwritten/pubsub/system-test/fixtures/sample/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index 14c4a7f7f8f..faad7813bb5 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -18,6 +18,6 @@ "devDependencies": { "@types/node": "^10.3.0", "typescript": "^3.0.0", - "gts": "^1.0.0" + "gts": "^2.0.0" } } From 3f4325bb9b85c63ace8527aa77665de9fffcbbd8 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 13 Apr 2020 14:56:47 -0700 Subject: [PATCH 0609/1115] chore: update lint ignore files (#960) --- handwritten/pubsub/.eslintignore | 2 ++ handwritten/pubsub/.prettierignore | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index 37f7a7343e7..9340ad9b86d 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -1,4 +1,6 @@ **/node_modules +**/coverage +test/fixtures build/ docs/ protos/ diff --git a/handwritten/pubsub/.prettierignore b/handwritten/pubsub/.prettierignore index 910e984a175..9340ad9b86d 100644 --- a/handwritten/pubsub/.prettierignore +++ b/handwritten/pubsub/.prettierignore @@ -1,5 +1,6 @@ **/node_modules +**/coverage +test/fixtures build/ docs/ -.coverage/ protos/ From 96277d09fc0a4ea840eddaf193743bbe72f8528c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 14 Apr 2020 08:39:09 -0700 Subject: [PATCH 0610/1115] chore: update gitignore (#961) --- handwritten/pubsub/.gitignore | 1 - handwritten/pubsub/synth.metadata | 20 +++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 783162def96..5d32b23782f 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -12,4 +12,3 @@ system-test/*key.json .DS_Store package-lock.json __pycache__ -.vscode diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 8a36b9dba94..a1247e01afd 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -1,12 +1,26 @@ { - "updateTime": "2020-04-11T00:41:23.034720Z", "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/nodejs-pubsub.git", + "sha": "7b14efcf4d6ae595c9a987de9258c31ffad493a6" + } + }, + { + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "26523a96798ce1a6caa1b3c912119059cfcc98a7", + "internalRef": "306320014" + } + }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6f32150677c9784f3c3a7e1949472bd29c9d72c5", - "log": "6f32150677c9784f3c3a7e1949472bd29c9d72c5\nfix: installs test_utils from its common repo (#480)\n\n\n74ce986d3b5431eb66985e9a00c4eb45295a4020\nfix: stop recording update_time in synth.metadata (#478)\n\n\n7f8e62aa3edd225f76347a16f92e400661fdfb52\nchore(java): release-please only updates non maven versions in README (#476)\n\nPrevent release-please and synthtool from fighting over the released library version. Synthtool updates the install snippets from the samples pom.xml files so the bots fight if they are temporarily out of sync after a release.\nc7e0e517d7f46f77bebd27da2e5afcaa6eee7e25\nbuild(java): fix nightly integration test config to run integrations (#465)\n\nThis was only running the units.\nbd69a2aa7b70875f3c988e269706b22fefbef40e\nbuild(java): fix retry_with_backoff when -e option set (#475)\n\n\nd9b173c427bfa0c6cca818233562e7e8841a357c\nfix: record version of working repo in synth.metadata (#473)\n\nPartial revert of b37cf74d12e9a42b9de9e61a4f26133d7cd9c168.\nf73a541770d95a609e5be6bf6b3b220d17cefcbe\nfeat(discogapic): allow local discovery-artifact-manager (#474)\n\n\n" + "sha": "52638600f387deb98efb5f9c85fec39e82aa9052", + "log": "52638600f387deb98efb5f9c85fec39e82aa9052\nbuild(java): set GOOGLE_CLOUD_PROJECT env for samples/integration tests (#484)\n\n* build(java): set GOOGLE_CLOUD_PROJECT env variable for samples/integration tests\n\n* ci: use java-docs-samples-testing for sample tests\n3df869dd6eb546ef13beeb7a9efa6ee0226afafd\nci: add dependency list completeness check (#490)\n\n\n682c0c37d1054966ca662a44259e96cc7aea4413\nbuild(nodejs): update lint ignore rules (#488)\n\n\n97c7ccfdceb927db1cbe6f3bb09616aa02bafd89\ndoc: document context-aware commit flags (#481)\n\nAlso, delete obsolete blurb about cleaning up old, dead files.\n\nCo-authored-by: Jeff Ching \n8eff3790f88b50706a0c4b6a20b385f24e9ac4e7\nfeat: common postprocessing for node libraries (#485)\n\nCo-authored-by: Justin Beckwith \n21c3b57ae54ae9db6a3a6b48b31c970c6ab56f19\nbuild(nodejs): remove unused codecov config (#486)\n\n\n" } } ], From 42148088699a93f8ebd049082b6186bed5d82135 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 15 Apr 2020 17:30:24 +0200 Subject: [PATCH 0611/1115] chore(deps): update dependency ts-loader to v7 (#965) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [ts-loader](https://togithub.com/TypeStrong/ts-loader) | devDependencies | major | [`^6.2.1` -> `^7.0.0`](https://renovatebot.com/diffs/npm/ts-loader/6.2.2/7.0.0) | --- ### Release Notes
TypeStrong/ts-loader ### [`v7.0.0`](https://togithub.com/TypeStrong/ts-loader/blob/master/CHANGELOG.md#v700) [Compare Source](https://togithub.com/TypeStrong/ts-loader/compare/v6.2.2...v7.0.0) - [Project reference support enhancements](https://togithub.com/TypeStrong/ts-loader/pull/1076) - thanks [@​sheetalkamat](https://togithub.com/sheetalkamat)! - Following the end of life of Node 8, `ts-loader` no longer supports Node 8 **BREAKING CHANGE**
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c6b4c6c3ba7..1fe634d999e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -92,7 +92,7 @@ "proxyquire": "^2.0.0", "sinon": "^9.0.0", "tmp": "^0.1.0", - "ts-loader": "^6.2.1", + "ts-loader": "^7.0.0", "typescript": "3.6.4", "uuid": "^7.0.0", "webpack": "^4.42.0", From e72607d48140e228e5c3820b72ea1b0c4b23c2ba Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 15 Apr 2020 17:54:06 +0200 Subject: [PATCH 0612/1115] chore(deps): update dependency null-loader to v4 (#966) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [null-loader](https://togithub.com/webpack-contrib/null-loader) | devDependencies | major | [`^3.0.0` -> `^4.0.0`](https://renovatebot.com/diffs/npm/null-loader/3.0.0/4.0.0) | --- ### Release Notes
webpack-contrib/null-loader ### [`v4.0.0`](https://togithub.com/webpack-contrib/null-loader/blob/master/CHANGELOG.md#​400-httpsgithubcomwebpack-contribnull-loadercomparev300v400-2020-04-15) [Compare Source](https://togithub.com/webpack-contrib/null-loader/compare/v3.0.0...v4.0.0) ##### Bug Fixes - support `webpack@5` ##### ⚠ BREAKING CHANGES - minimum required Nodejs version is `10.13`
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1fe634d999e..2d7d0147a6d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -88,7 +88,7 @@ "mocha": "^7.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", - "null-loader": "^3.0.0", + "null-loader": "^4.0.0", "proxyquire": "^2.0.0", "sinon": "^9.0.0", "tmp": "^0.1.0", From 6d61e413b8873b1e08810e473730f47605393452 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Wed, 15 Apr 2020 10:40:31 -0700 Subject: [PATCH 0613/1115] chore: run fix instead of lint in synthfile (#967) --- handwritten/pubsub/synth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 02503cefa73..e2d66b301c0 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -68,5 +68,5 @@ # Node.js specific cleanup subprocess.run(['npm', 'install']) -subprocess.run(['npm', 'run', 'lint']) +subprocess.run(['npm', 'run', 'fix']) subprocess.run(['npx', 'compileProtos', 'src']) From b1f73193467a07d072be47e8a1b6e0869cdc6fd0 Mon Sep 17 00:00:00 2001 From: Jeff Hansen Date: Wed, 15 Apr 2020 14:20:48 -0400 Subject: [PATCH 0614/1115] fix(close): ensure in-flight messages are drained (#952) Track in-flight requests and add an `onDrain`deferred that resolves when all in-flight requests are done. Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> Co-authored-by: Benjamin E. Coe --- handwritten/pubsub/src/message-queues.ts | 19 +++++++++ handwritten/pubsub/src/subscriber.ts | 8 ++++ handwritten/pubsub/test/message-queues.ts | 49 ++++++++++++++++++++++- handwritten/pubsub/test/subscriber.ts | 17 ++++++++ 4 files changed, 91 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 9d3c003741d..62282707ae6 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -77,7 +77,9 @@ export class BatchError extends Error implements ServiceError { */ export abstract class MessageQueue { numPendingRequests: number; + numInFlightRequests: number; protected _onFlush?: defer.DeferredPromise; + protected _onDrain?: defer.DeferredPromise; protected _options!: BatchOptions; protected _requests: QueuedMessages; protected _subscriber: Subscriber; @@ -85,6 +87,7 @@ export abstract class MessageQueue { protected abstract _sendBatch(batch: QueuedMessages): Promise; constructor(sub: Subscriber, options = {} as BatchOptions) { this.numPendingRequests = 0; + this.numInFlightRequests = 0; this._requests = []; this._subscriber = sub; @@ -111,6 +114,7 @@ export abstract class MessageQueue { this._requests.push([ackId, deadline]); this.numPendingRequests += 1; + this.numInFlightRequests += 1; if (this._requests.length >= maxMessages!) { this.flush(); @@ -142,9 +146,15 @@ export abstract class MessageQueue { this._subscriber.emit('error', e); } + this.numInFlightRequests -= batchSize; if (deferred) { deferred.resolve(); } + + if (this.numInFlightRequests <= 0 && this._onDrain) { + this._onDrain.resolve(); + delete this._onDrain; + } } /** * Returns a promise that resolves after the next flush occurs. @@ -158,6 +168,15 @@ export abstract class MessageQueue { } return this._onFlush.promise; } + /** + * Returns a promise that resolves when all in-flight messages have settled. + */ + onDrain(): Promise { + if (!this._onDrain) { + this._onDrain = defer(); + } + return this._onDrain.promise; + } /** * Set the batching options. * diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index deea9fc9731..1bf311bff05 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -464,6 +464,14 @@ export class Subscriber extends EventEmitter { this._modAcks.flush(); } + if (this._acks.numInFlightRequests) { + promises.push(this._acks.onDrain()); + } + + if (this._modAcks.numInFlightRequests) { + promises.push(this._modAcks.onDrain()); + } + await Promise.all(promises); } } diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index ebb9dfcf539..4de26f4e6d2 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -23,6 +23,7 @@ import {Metadata, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import * as uuid from 'uuid'; +import defer = require('p-defer'); import * as messageTypes from '../src/message-queues'; import {BatchError} from '../src/message-queues'; @@ -76,14 +77,14 @@ describe('MessageQueues', () => { // tslint:disable-next-line variable-name let ModAckQueue: typeof messageTypes.ModAckQueue; + type QueuedMessages = Array<[string, number?]>; + before(() => { const queues = proxyquire('../src/message-queues.js', {}); AckQueue = queues.AckQueue; ModAckQueue = queues.ModAckQueue; - type QueuedMessages = Array<[string, number?]>; - MessageQueue = class MessageQueue extends queues.MessageQueue { batches = [] as QueuedMessages[]; protected async _sendBatch(batch: QueuedMessages): Promise { @@ -210,6 +211,35 @@ describe('MessageQueues', () => { setImmediate(() => messageQueue.flush()); return promise; }); + + it('should resolve onDrain only after all in-flight messages have been flushed', async () => { + const log: string[] = []; + const sendDone = defer(); + sandbox.stub(messageQueue, '_sendBatch').callsFake(async () => { + log.push('send:start'); + await sendDone.promise; + log.push('send:end'); + }); + + const message = new FakeMessage(); + const deadline = 10; + const onDrainBeforeFlush = messageQueue + .onDrain() + .then(() => log.push('drain1')); + messageQueue.add(message as Message, deadline); + messageQueue.flush(); + assert.deepStrictEqual(log, ['send:start']); + sendDone.resolve(); + await messageQueue.onDrain().then(() => log.push('drain2')); + await onDrainBeforeFlush; + + assert.deepStrictEqual(log, [ + 'send:start', + 'send:end', + 'drain1', + 'drain2', + ]); + }); }); describe('onFlush', () => { @@ -227,6 +257,21 @@ describe('MessageQueues', () => { }); }); + describe('onDrain', () => { + it('should create a promise', () => { + const promise = messageQueue.onDrain(); + + assert(promise instanceof Promise); + }); + + it('should re-use existing promises', () => { + const promise1 = messageQueue.onDrain(); + const promise2 = messageQueue.onDrain(); + + assert.strictEqual(promise1, promise2); + }); + }); + describe('setOptions', () => { it('should default maxMessages to 3000', () => { const stub = sandbox.stub(messageQueue, 'flush'); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 2c9c64b9a85..9a33f09032e 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -84,6 +84,7 @@ class FakeLeaseManager extends EventEmitter { class FakeQueue { options: BatchOptions; numPendingRequests = 0; + numInFlightRequests = 0; maxMilliseconds = 100; constructor(sub: s.Subscriber, options: BatchOptions) { this.options = options; @@ -91,6 +92,7 @@ class FakeQueue { add(message: s.Message, deadline?: number): void {} async flush(): Promise {} async onFlush(): Promise {} + async onDrain(): Promise {} } class FakeAckQueue extends FakeQueue { @@ -380,6 +382,7 @@ describe('Subscriber', () => { sandbox.stub(ackQueue, 'flush').rejects(); sandbox.stub(ackQueue, 'onFlush').rejects(); + sandbox.stub(ackQueue, 'onDrain').rejects(); const modAckQueue: FakeModAckQueue = stubs.get('modAckQueue'); @@ -388,6 +391,20 @@ describe('Subscriber', () => { return subscriber.close(); }); + + it('should wait for in-flight messages to drain', async () => { + const ackQueue: FakeAckQueue = stubs.get('ackQueue'); + const modAckQueue: FakeModAckQueue = stubs.get('modAckQueue'); + const ackOnDrain = sandbox.stub(ackQueue, 'onDrain').resolves(); + const modAckOnDrain = sandbox.stub(modAckQueue, 'onDrain').resolves(); + + ackQueue.numInFlightRequests = 1; + modAckQueue.numInFlightRequests = 1; + await subscriber.close(); + + assert.strictEqual(ackOnDrain.callCount, 1); + assert.strictEqual(modAckOnDrain.callCount, 1); + }); }); }); From ba7a8b0a9f1f0088cb140e52ce2ca95b8adf1491 Mon Sep 17 00:00:00 2001 From: Summer Ji Date: Wed, 15 Apr 2020 12:24:04 -0700 Subject: [PATCH 0615/1115] chore: clean up synthtool (#964) * chore: clean up synthtool * use single quote in synth Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/protos/protos.d.ts | 13821 +++--- handwritten/pubsub/protos/protos.js | 37128 +++++++--------- handwritten/pubsub/protos/protos.json | 3759 +- handwritten/pubsub/src/helper.ts | 262 - handwritten/pubsub/src/iam.ts | 10 +- .../src/iam_policy_service_client_config.json | 38 - .../pubsub/src/service_proto_list.json | 5 - handwritten/pubsub/src/v1/publisher_client.ts | 179 +- .../pubsub/src/v1/subscriber_client.ts | 179 +- handwritten/pubsub/synth.metadata | 11 +- handwritten/pubsub/synth.py | 39 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 339 +- .../pubsub/test/gapic_subscriber_v1.ts | 323 +- handwritten/pubsub/test/message-queues.ts | 4 + handwritten/pubsub/test/publisher/index.ts | 3 + handwritten/pubsub/test/subscriber.ts | 6 + handwritten/pubsub/test/topic.ts | 1 + 17 files changed, 26178 insertions(+), 29929 deletions(-) delete mode 100644 handwritten/pubsub/src/helper.ts delete mode 100644 handwritten/pubsub/src/iam_policy_service_client_config.json delete mode 100644 handwritten/pubsub/src/service_proto_list.json diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 64b6259036d..2b21f96ccc6 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -17,9998 +17,8787 @@ import * as $protobuf from "protobufjs"; /** Namespace google. */ export namespace google { - /** Namespace iam. */ - namespace iam { + /** Namespace pubsub. */ + namespace pubsub { /** Namespace v1. */ namespace v1 { - /** Properties of a Policy. */ - interface IPolicy { - - /** Policy version */ - version?: (number|null); - - /** Policy bindings */ - bindings?: (google.iam.v1.IBinding[]|null); - - /** Policy etag */ - etag?: (Uint8Array|string|null); - } - - /** Represents a Policy. */ - class Policy implements IPolicy { + /** Represents a Publisher */ + class Publisher extends $protobuf.rpc.Service { /** - * Constructs a new Policy. - * @param [properties] Properties to set + * Constructs a new Publisher service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited */ - constructor(properties?: google.iam.v1.IPolicy); - - /** Policy version. */ - public version: number; - - /** Policy bindings. */ - public bindings: google.iam.v1.IBinding[]; - - /** Policy etag. */ - public etag: (Uint8Array|string); + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); /** - * Creates a new Policy instance using the specified properties. - * @param [properties] Properties to set - * @returns Policy instance + * Creates new Publisher service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. */ - public static create(properties?: google.iam.v1.IPolicy): google.iam.v1.Policy; + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Publisher; /** - * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @param message Policy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls CreateTopic. + * @param request Topic message or plain object + * @param callback Node-style callback called with the error, if any, and Topic */ - public static encode(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public createTopic(request: google.pubsub.v1.ITopic, callback: google.pubsub.v1.Publisher.CreateTopicCallback): void; /** - * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @param message Policy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Calls CreateTopic. + * @param request Topic message or plain object + * @returns Promise */ - public static encodeDelimited(message: google.iam.v1.IPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + public createTopic(request: google.pubsub.v1.ITopic): Promise; /** - * Decodes a Policy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Policy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls UpdateTopic. + * @param request UpdateTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Topic */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Policy; + public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest, callback: google.pubsub.v1.Publisher.UpdateTopicCallback): void; /** - * Decodes a Policy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Policy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls UpdateTopic. + * @param request UpdateTopicRequest message or plain object + * @returns Promise */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Policy; + public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest): Promise; /** - * Verifies a Policy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not + * Calls Publish. + * @param request PublishRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PublishResponse */ - public static verify(message: { [k: string]: any }): (string|null); + public publish(request: google.pubsub.v1.IPublishRequest, callback: google.pubsub.v1.Publisher.PublishCallback): void; /** - * Creates a Policy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Policy + * Calls Publish. + * @param request PublishRequest message or plain object + * @returns Promise */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.Policy; + public publish(request: google.pubsub.v1.IPublishRequest): Promise; /** - * Creates a plain object from a Policy message. Also converts values to other types if specified. - * @param message Policy - * @param [options] Conversion options - * @returns Plain object + * Calls GetTopic. + * @param request GetTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Topic */ - public static toObject(message: google.iam.v1.Policy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public getTopic(request: google.pubsub.v1.IGetTopicRequest, callback: google.pubsub.v1.Publisher.GetTopicCallback): void; /** - * Converts this Policy to JSON. - * @returns JSON object + * Calls GetTopic. + * @param request GetTopicRequest message or plain object + * @returns Promise */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Binding. */ - interface IBinding { - - /** Binding role */ - role?: (string|null); + public getTopic(request: google.pubsub.v1.IGetTopicRequest): Promise; - /** Binding members */ - members?: (string[]|null); + /** + * Calls ListTopics. + * @param request ListTopicsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicsResponse + */ + public listTopics(request: google.pubsub.v1.IListTopicsRequest, callback: google.pubsub.v1.Publisher.ListTopicsCallback): void; - /** Binding condition */ - condition?: (google.type.IExpr|null); - } + /** + * Calls ListTopics. + * @param request ListTopicsRequest message or plain object + * @returns Promise + */ + public listTopics(request: google.pubsub.v1.IListTopicsRequest): Promise; - /** Represents a Binding. */ - class Binding implements IBinding { + /** + * Calls ListTopicSubscriptions. + * @param request ListTopicSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse + */ + public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest, callback: google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback): void; /** - * Constructs a new Binding. - * @param [properties] Properties to set + * Calls ListTopicSubscriptions. + * @param request ListTopicSubscriptionsRequest message or plain object + * @returns Promise */ - constructor(properties?: google.iam.v1.IBinding); + public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest): Promise; - /** Binding role. */ - public role: string; + /** + * Calls ListTopicSnapshots. + * @param request ListTopicSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse + */ + public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest, callback: google.pubsub.v1.Publisher.ListTopicSnapshotsCallback): void; - /** Binding members. */ - public members: string[]; + /** + * Calls ListTopicSnapshots. + * @param request ListTopicSnapshotsRequest message or plain object + * @returns Promise + */ + public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest): Promise; - /** Binding condition. */ - public condition?: (google.type.IExpr|null); + /** + * Calls DeleteTopic. + * @param request DeleteTopicRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest, callback: google.pubsub.v1.Publisher.DeleteTopicCallback): void; /** - * Creates a new Binding instance using the specified properties. - * @param [properties] Properties to set - * @returns Binding instance + * Calls DeleteTopic. + * @param request DeleteTopicRequest message or plain object + * @returns Promise */ - public static create(properties?: google.iam.v1.IBinding): google.iam.v1.Binding; + public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest): Promise; + } + + namespace Publisher { /** - * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @param message Binding message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * @param error Error, if any + * @param [response] Topic */ - public static encode(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; + type CreateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; /** - * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @param message Binding message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer + * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * @param error Error, if any + * @param [response] Topic */ - public static encodeDelimited(message: google.iam.v1.IBinding, writer?: $protobuf.Writer): $protobuf.Writer; + type UpdateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; /** - * Decodes a Binding message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Binding - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * @param error Error, if any + * @param [response] PublishResponse */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.Binding; + type PublishCallback = (error: (Error|null), response?: google.pubsub.v1.PublishResponse) => void; /** - * Decodes a Binding message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Binding - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * @param error Error, if any + * @param [response] Topic */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.Binding; + type GetTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; /** - * Verifies a Binding message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not + * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * @param error Error, if any + * @param [response] ListTopicsResponse */ - public static verify(message: { [k: string]: any }): (string|null); + type ListTopicsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicsResponse) => void; /** - * Creates a Binding message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Binding + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * @param error Error, if any + * @param [response] ListTopicSubscriptionsResponse */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.Binding; + type ListTopicSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSubscriptionsResponse) => void; /** - * Creates a plain object from a Binding message. Also converts values to other types if specified. - * @param message Binding - * @param [options] Conversion options - * @returns Plain object + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * @param error Error, if any + * @param [response] ListTopicSnapshotsResponse */ - public static toObject(message: google.iam.v1.Binding, options?: $protobuf.IConversionOptions): { [k: string]: any }; + type ListTopicSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSnapshotsResponse) => void; /** - * Converts this Binding to JSON. - * @returns JSON object + * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * @param error Error, if any + * @param [response] Empty */ - public toJSON(): { [k: string]: any }; + type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; } - /** Properties of a PolicyDelta. */ - interface IPolicyDelta { - - /** PolicyDelta bindingDeltas */ - bindingDeltas?: (google.iam.v1.IBindingDelta[]|null); + /** Properties of a MessageStoragePolicy. */ + interface IMessageStoragePolicy { - /** PolicyDelta auditConfigDeltas */ - auditConfigDeltas?: (google.iam.v1.IAuditConfigDelta[]|null); + /** MessageStoragePolicy allowedPersistenceRegions */ + allowedPersistenceRegions?: (string[]|null); } - /** Represents a PolicyDelta. */ - class PolicyDelta implements IPolicyDelta { + /** Represents a MessageStoragePolicy. */ + class MessageStoragePolicy implements IMessageStoragePolicy { /** - * Constructs a new PolicyDelta. + * Constructs a new MessageStoragePolicy. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IPolicyDelta); - - /** PolicyDelta bindingDeltas. */ - public bindingDeltas: google.iam.v1.IBindingDelta[]; + constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); - /** PolicyDelta auditConfigDeltas. */ - public auditConfigDeltas: google.iam.v1.IAuditConfigDelta[]; + /** MessageStoragePolicy allowedPersistenceRegions. */ + public allowedPersistenceRegions: string[]; /** - * Creates a new PolicyDelta instance using the specified properties. + * Creates a new MessageStoragePolicy instance using the specified properties. * @param [properties] Properties to set - * @returns PolicyDelta instance + * @returns MessageStoragePolicy instance */ - public static create(properties?: google.iam.v1.IPolicyDelta): google.iam.v1.PolicyDelta; + public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; /** - * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. - * @param message PolicyDelta message or plain object to encode + * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. - * @param message PolicyDelta message or plain object to encode + * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * @param message MessageStoragePolicy message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IPolicyDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PolicyDelta message from the specified reader or buffer. + * Decodes a MessageStoragePolicy message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PolicyDelta + * @returns MessageStoragePolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.PolicyDelta; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; /** - * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. + * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PolicyDelta + * @returns MessageStoragePolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.PolicyDelta; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; /** - * Verifies a PolicyDelta message. + * Verifies a MessageStoragePolicy message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. + * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PolicyDelta + * @returns MessageStoragePolicy */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.PolicyDelta; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; /** - * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. - * @param message PolicyDelta + * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * @param message MessageStoragePolicy * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.PolicyDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PolicyDelta to JSON. + * Converts this MessageStoragePolicy to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a BindingDelta. */ - interface IBindingDelta { + /** Properties of a Topic. */ + interface ITopic { - /** BindingDelta action */ - action?: (google.iam.v1.BindingDelta.Action|keyof typeof google.iam.v1.BindingDelta.Action|null); + /** Topic name */ + name?: (string|null); - /** BindingDelta role */ - role?: (string|null); + /** Topic labels */ + labels?: ({ [k: string]: string }|null); - /** BindingDelta member */ - member?: (string|null); + /** Topic messageStoragePolicy */ + messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); - /** BindingDelta condition */ - condition?: (google.type.IExpr|null); + /** Topic kmsKeyName */ + kmsKeyName?: (string|null); } - /** Represents a BindingDelta. */ - class BindingDelta implements IBindingDelta { + /** Represents a Topic. */ + class Topic implements ITopic { /** - * Constructs a new BindingDelta. + * Constructs a new Topic. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IBindingDelta); + constructor(properties?: google.pubsub.v1.ITopic); - /** BindingDelta action. */ - public action: (google.iam.v1.BindingDelta.Action|keyof typeof google.iam.v1.BindingDelta.Action); + /** Topic name. */ + public name: string; - /** BindingDelta role. */ - public role: string; + /** Topic labels. */ + public labels: { [k: string]: string }; - /** BindingDelta member. */ - public member: string; + /** Topic messageStoragePolicy. */ + public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); - /** BindingDelta condition. */ - public condition?: (google.type.IExpr|null); + /** Topic kmsKeyName. */ + public kmsKeyName: string; /** - * Creates a new BindingDelta instance using the specified properties. + * Creates a new Topic instance using the specified properties. * @param [properties] Properties to set - * @returns BindingDelta instance + * @returns Topic instance */ - public static create(properties?: google.iam.v1.IBindingDelta): google.iam.v1.BindingDelta; + public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; /** - * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. - * @param message BindingDelta message or plain object to encode + * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. - * @param message BindingDelta message or plain object to encode + * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * @param message Topic message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IBindingDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a BindingDelta message from the specified reader or buffer. + * Decodes a Topic message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns BindingDelta + * @returns Topic * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.BindingDelta; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; /** - * Decodes a BindingDelta message from the specified reader or buffer, length delimited. + * Decodes a Topic message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns BindingDelta + * @returns Topic * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.BindingDelta; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; /** - * Verifies a BindingDelta message. + * Verifies a Topic message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. + * Creates a Topic message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns BindingDelta + * @returns Topic */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.BindingDelta; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; /** - * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. - * @param message BindingDelta + * Creates a plain object from a Topic message. Also converts values to other types if specified. + * @param message Topic * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.BindingDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this BindingDelta to JSON. + * Converts this Topic to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - namespace BindingDelta { - - /** Action enum. */ - enum Action { - ACTION_UNSPECIFIED = 0, - ADD = 1, - REMOVE = 2 - } - } + /** Properties of a PubsubMessage. */ + interface IPubsubMessage { - /** Properties of an AuditConfigDelta. */ - interface IAuditConfigDelta { + /** PubsubMessage data */ + data?: (Uint8Array|string|null); - /** AuditConfigDelta action */ - action?: (google.iam.v1.AuditConfigDelta.Action|keyof typeof google.iam.v1.AuditConfigDelta.Action|null); + /** PubsubMessage attributes */ + attributes?: ({ [k: string]: string }|null); - /** AuditConfigDelta service */ - service?: (string|null); + /** PubsubMessage messageId */ + messageId?: (string|null); - /** AuditConfigDelta exemptedMember */ - exemptedMember?: (string|null); + /** PubsubMessage publishTime */ + publishTime?: (google.protobuf.ITimestamp|null); - /** AuditConfigDelta logType */ - logType?: (string|null); + /** PubsubMessage orderingKey */ + orderingKey?: (string|null); } - /** Represents an AuditConfigDelta. */ - class AuditConfigDelta implements IAuditConfigDelta { + /** Represents a PubsubMessage. */ + class PubsubMessage implements IPubsubMessage { /** - * Constructs a new AuditConfigDelta. + * Constructs a new PubsubMessage. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IAuditConfigDelta); + constructor(properties?: google.pubsub.v1.IPubsubMessage); + + /** PubsubMessage data. */ + public data: (Uint8Array|string); - /** AuditConfigDelta action. */ - public action: (google.iam.v1.AuditConfigDelta.Action|keyof typeof google.iam.v1.AuditConfigDelta.Action); + /** PubsubMessage attributes. */ + public attributes: { [k: string]: string }; - /** AuditConfigDelta service. */ - public service: string; + /** PubsubMessage messageId. */ + public messageId: string; - /** AuditConfigDelta exemptedMember. */ - public exemptedMember: string; + /** PubsubMessage publishTime. */ + public publishTime?: (google.protobuf.ITimestamp|null); - /** AuditConfigDelta logType. */ - public logType: string; + /** PubsubMessage orderingKey. */ + public orderingKey: string; /** - * Creates a new AuditConfigDelta instance using the specified properties. + * Creates a new PubsubMessage instance using the specified properties. * @param [properties] Properties to set - * @returns AuditConfigDelta instance + * @returns PubsubMessage instance */ - public static create(properties?: google.iam.v1.IAuditConfigDelta): google.iam.v1.AuditConfigDelta; + public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; /** - * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. - * @param message AuditConfigDelta message or plain object to encode + * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. - * @param message AuditConfigDelta message or plain object to encode + * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * @param message PubsubMessage message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IAuditConfigDelta, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an AuditConfigDelta message from the specified reader or buffer. + * Decodes a PubsubMessage message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns AuditConfigDelta + * @returns PubsubMessage * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.AuditConfigDelta; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; /** - * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. + * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns AuditConfigDelta + * @returns PubsubMessage * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.AuditConfigDelta; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; /** - * Verifies an AuditConfigDelta message. + * Verifies a PubsubMessage message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. + * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns AuditConfigDelta + * @returns PubsubMessage */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.AuditConfigDelta; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; /** - * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. - * @param message AuditConfigDelta + * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * @param message PubsubMessage * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.AuditConfigDelta, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this AuditConfigDelta to JSON. + * Converts this PubsubMessage to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - namespace AuditConfigDelta { - - /** Action enum. */ - enum Action { - ACTION_UNSPECIFIED = 0, - ADD = 1, - REMOVE = 2 - } - } - - /** Properties of a GetPolicyOptions. */ - interface IGetPolicyOptions { + /** Properties of a GetTopicRequest. */ + interface IGetTopicRequest { - /** GetPolicyOptions requestedPolicyVersion */ - requestedPolicyVersion?: (number|null); + /** GetTopicRequest topic */ + topic?: (string|null); } - /** Represents a GetPolicyOptions. */ - class GetPolicyOptions implements IGetPolicyOptions { + /** Represents a GetTopicRequest. */ + class GetTopicRequest implements IGetTopicRequest { /** - * Constructs a new GetPolicyOptions. + * Constructs a new GetTopicRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IGetPolicyOptions); + constructor(properties?: google.pubsub.v1.IGetTopicRequest); - /** GetPolicyOptions requestedPolicyVersion. */ - public requestedPolicyVersion: number; + /** GetTopicRequest topic. */ + public topic: string; /** - * Creates a new GetPolicyOptions instance using the specified properties. + * Creates a new GetTopicRequest instance using the specified properties. * @param [properties] Properties to set - * @returns GetPolicyOptions instance + * @returns GetTopicRequest instance */ - public static create(properties?: google.iam.v1.IGetPolicyOptions): google.iam.v1.GetPolicyOptions; + public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; /** - * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. - * @param message GetPolicyOptions message or plain object to encode + * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. - * @param message GetPolicyOptions message or plain object to encode + * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * @param message GetTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IGetPolicyOptions, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a GetPolicyOptions message from the specified reader or buffer. + * Decodes a GetTopicRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns GetPolicyOptions + * @returns GetTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetPolicyOptions; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; /** - * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. + * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns GetPolicyOptions + * @returns GetTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetPolicyOptions; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; /** - * Verifies a GetPolicyOptions message. + * Verifies a GetTopicRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. + * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns GetPolicyOptions + * @returns GetTopicRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.GetPolicyOptions; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; /** - * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. - * @param message GetPolicyOptions + * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * @param message GetTopicRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.GetPolicyOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this GetPolicyOptions to JSON. + * Converts this GetTopicRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Represents a IAMPolicy */ - class IAMPolicy extends $protobuf.rpc.Service { - - /** - * Constructs a new IAMPolicy service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - - /** - * Creates new IAMPolicy service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): IAMPolicy; - - /** - * Calls SetIamPolicy. - * @param request SetIamPolicyRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Policy - */ - public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.SetIamPolicyCallback): void; - - /** - * Calls SetIamPolicy. - * @param request SetIamPolicyRequest message or plain object - * @returns Promise - */ - public setIamPolicy(request: google.iam.v1.ISetIamPolicyRequest): Promise; - - /** - * Calls GetIamPolicy. - * @param request GetIamPolicyRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Policy - */ - public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest, callback: google.iam.v1.IAMPolicy.GetIamPolicyCallback): void; - - /** - * Calls GetIamPolicy. - * @param request GetIamPolicyRequest message or plain object - * @returns Promise - */ - public getIamPolicy(request: google.iam.v1.IGetIamPolicyRequest): Promise; - - /** - * Calls TestIamPermissions. - * @param request TestIamPermissionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and TestIamPermissionsResponse - */ - public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest, callback: google.iam.v1.IAMPolicy.TestIamPermissionsCallback): void; - - /** - * Calls TestIamPermissions. - * @param request TestIamPermissionsRequest message or plain object - * @returns Promise - */ - public testIamPermissions(request: google.iam.v1.ITestIamPermissionsRequest): Promise; - } - - namespace IAMPolicy { - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. - * @param error Error, if any - * @param [response] Policy - */ - type SetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. - * @param error Error, if any - * @param [response] Policy - */ - type GetIamPolicyCallback = (error: (Error|null), response?: google.iam.v1.Policy) => void; - - /** - * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. - * @param error Error, if any - * @param [response] TestIamPermissionsResponse - */ - type TestIamPermissionsCallback = (error: (Error|null), response?: google.iam.v1.TestIamPermissionsResponse) => void; - } - - /** Properties of a SetIamPolicyRequest. */ - interface ISetIamPolicyRequest { + /** Properties of an UpdateTopicRequest. */ + interface IUpdateTopicRequest { - /** SetIamPolicyRequest resource */ - resource?: (string|null); + /** UpdateTopicRequest topic */ + topic?: (google.pubsub.v1.ITopic|null); - /** SetIamPolicyRequest policy */ - policy?: (google.iam.v1.IPolicy|null); + /** UpdateTopicRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); } - /** Represents a SetIamPolicyRequest. */ - class SetIamPolicyRequest implements ISetIamPolicyRequest { + /** Represents an UpdateTopicRequest. */ + class UpdateTopicRequest implements IUpdateTopicRequest { /** - * Constructs a new SetIamPolicyRequest. + * Constructs a new UpdateTopicRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.ISetIamPolicyRequest); + constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); - /** SetIamPolicyRequest resource. */ - public resource: string; + /** UpdateTopicRequest topic. */ + public topic?: (google.pubsub.v1.ITopic|null); - /** SetIamPolicyRequest policy. */ - public policy?: (google.iam.v1.IPolicy|null); + /** UpdateTopicRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); /** - * Creates a new SetIamPolicyRequest instance using the specified properties. + * Creates a new UpdateTopicRequest instance using the specified properties. * @param [properties] Properties to set - * @returns SetIamPolicyRequest instance + * @returns UpdateTopicRequest instance */ - public static create(properties?: google.iam.v1.ISetIamPolicyRequest): google.iam.v1.SetIamPolicyRequest; + public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; /** - * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @param message SetIamPolicyRequest message or plain object to encode + * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @param message SetIamPolicyRequest message or plain object to encode + * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @param message UpdateTopicRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.ISetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer. + * Decodes an UpdateTopicRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns SetIamPolicyRequest + * @returns UpdateTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.SetIamPolicyRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. + * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns SetIamPolicyRequest + * @returns UpdateTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.SetIamPolicyRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; /** - * Verifies a SetIamPolicyRequest message. + * Verifies an UpdateTopicRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns SetIamPolicyRequest + * @returns UpdateTopicRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.SetIamPolicyRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; /** - * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. - * @param message SetIamPolicyRequest + * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * @param message UpdateTopicRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.SetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this SetIamPolicyRequest to JSON. + * Converts this UpdateTopicRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a GetIamPolicyRequest. */ - interface IGetIamPolicyRequest { + /** Properties of a PublishRequest. */ + interface IPublishRequest { - /** GetIamPolicyRequest resource */ - resource?: (string|null); + /** PublishRequest topic */ + topic?: (string|null); - /** GetIamPolicyRequest options */ - options?: (google.iam.v1.IGetPolicyOptions|null); + /** PublishRequest messages */ + messages?: (google.pubsub.v1.IPubsubMessage[]|null); } - /** Represents a GetIamPolicyRequest. */ - class GetIamPolicyRequest implements IGetIamPolicyRequest { + /** Represents a PublishRequest. */ + class PublishRequest implements IPublishRequest { /** - * Constructs a new GetIamPolicyRequest. + * Constructs a new PublishRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.IGetIamPolicyRequest); + constructor(properties?: google.pubsub.v1.IPublishRequest); - /** GetIamPolicyRequest resource. */ - public resource: string; + /** PublishRequest topic. */ + public topic: string; - /** GetIamPolicyRequest options. */ - public options?: (google.iam.v1.IGetPolicyOptions|null); + /** PublishRequest messages. */ + public messages: google.pubsub.v1.IPubsubMessage[]; /** - * Creates a new GetIamPolicyRequest instance using the specified properties. + * Creates a new PublishRequest instance using the specified properties. * @param [properties] Properties to set - * @returns GetIamPolicyRequest instance + * @returns PublishRequest instance */ - public static create(properties?: google.iam.v1.IGetIamPolicyRequest): google.iam.v1.GetIamPolicyRequest; + public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; /** - * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. - * @param message GetIamPolicyRequest message or plain object to encode + * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. - * @param message GetIamPolicyRequest message or plain object to encode + * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * @param message PublishRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.IGetIamPolicyRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer. + * Decodes a PublishRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns GetIamPolicyRequest + * @returns PublishRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.GetIamPolicyRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. + * Decodes a PublishRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns GetIamPolicyRequest + * @returns PublishRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.GetIamPolicyRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; /** - * Verifies a GetIamPolicyRequest message. + * Verifies a PublishRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns GetIamPolicyRequest + * @returns PublishRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.GetIamPolicyRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; /** - * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. - * @param message GetIamPolicyRequest + * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. + * @param message PublishRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.GetIamPolicyRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this GetIamPolicyRequest to JSON. + * Converts this PublishRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a TestIamPermissionsRequest. */ - interface ITestIamPermissionsRequest { - - /** TestIamPermissionsRequest resource */ - resource?: (string|null); + /** Properties of a PublishResponse. */ + interface IPublishResponse { - /** TestIamPermissionsRequest permissions */ - permissions?: (string[]|null); + /** PublishResponse messageIds */ + messageIds?: (string[]|null); } - /** Represents a TestIamPermissionsRequest. */ - class TestIamPermissionsRequest implements ITestIamPermissionsRequest { + /** Represents a PublishResponse. */ + class PublishResponse implements IPublishResponse { /** - * Constructs a new TestIamPermissionsRequest. + * Constructs a new PublishResponse. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.ITestIamPermissionsRequest); - - /** TestIamPermissionsRequest resource. */ - public resource: string; + constructor(properties?: google.pubsub.v1.IPublishResponse); - /** TestIamPermissionsRequest permissions. */ - public permissions: string[]; + /** PublishResponse messageIds. */ + public messageIds: string[]; /** - * Creates a new TestIamPermissionsRequest instance using the specified properties. + * Creates a new PublishResponse instance using the specified properties. * @param [properties] Properties to set - * @returns TestIamPermissionsRequest instance + * @returns PublishResponse instance */ - public static create(properties?: google.iam.v1.ITestIamPermissionsRequest): google.iam.v1.TestIamPermissionsRequest; + public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; /** - * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. - * @param message TestIamPermissionsRequest message or plain object to encode + * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. - * @param message TestIamPermissionsRequest message or plain object to encode + * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * @param message PublishResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. + * Decodes a PublishResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns TestIamPermissionsRequest + * @returns PublishResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. + * Decodes a PublishResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns TestIamPermissionsRequest + * @returns PublishResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; /** - * Verifies a TestIamPermissionsRequest message. + * Verifies a PublishResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns TestIamPermissionsRequest + * @returns PublishResponse */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsRequest; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; /** - * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. - * @param message TestIamPermissionsRequest + * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * @param message PublishResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.TestIamPermissionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this TestIamPermissionsRequest to JSON. + * Converts this PublishResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a TestIamPermissionsResponse. */ - interface ITestIamPermissionsResponse { + /** Properties of a ListTopicsRequest. */ + interface IListTopicsRequest { - /** TestIamPermissionsResponse permissions */ - permissions?: (string[]|null); + /** ListTopicsRequest project */ + project?: (string|null); + + /** ListTopicsRequest pageSize */ + pageSize?: (number|null); + + /** ListTopicsRequest pageToken */ + pageToken?: (string|null); } - /** Represents a TestIamPermissionsResponse. */ - class TestIamPermissionsResponse implements ITestIamPermissionsResponse { + /** Represents a ListTopicsRequest. */ + class ListTopicsRequest implements IListTopicsRequest { /** - * Constructs a new TestIamPermissionsResponse. + * Constructs a new ListTopicsRequest. * @param [properties] Properties to set */ - constructor(properties?: google.iam.v1.ITestIamPermissionsResponse); + constructor(properties?: google.pubsub.v1.IListTopicsRequest); + + /** ListTopicsRequest project. */ + public project: string; + + /** ListTopicsRequest pageSize. */ + public pageSize: number; - /** TestIamPermissionsResponse permissions. */ - public permissions: string[]; + /** ListTopicsRequest pageToken. */ + public pageToken: string; /** - * Creates a new TestIamPermissionsResponse instance using the specified properties. + * Creates a new ListTopicsRequest instance using the specified properties. * @param [properties] Properties to set - * @returns TestIamPermissionsResponse instance + * @returns ListTopicsRequest instance */ - public static create(properties?: google.iam.v1.ITestIamPermissionsResponse): google.iam.v1.TestIamPermissionsResponse; + public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; /** - * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. - * @param message TestIamPermissionsResponse message or plain object to encode + * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. - * @param message TestIamPermissionsResponse message or plain object to encode + * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * @param message ListTopicsRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.iam.v1.ITestIamPermissionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. + * Decodes a ListTopicsRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns TestIamPermissionsResponse + * @returns ListTopicsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.iam.v1.TestIamPermissionsResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. + * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns TestIamPermissionsResponse + * @returns ListTopicsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.iam.v1.TestIamPermissionsResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; /** - * Verifies a TestIamPermissionsResponse message. + * Verifies a ListTopicsRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns TestIamPermissionsResponse + * @returns ListTopicsRequest */ - public static fromObject(object: { [k: string]: any }): google.iam.v1.TestIamPermissionsResponse; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; /** - * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. - * @param message TestIamPermissionsResponse + * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * @param message ListTopicsRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.iam.v1.TestIamPermissionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this TestIamPermissionsResponse to JSON. + * Converts this ListTopicsRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - } - /** Namespace type. */ - namespace type { + /** Properties of a ListTopicsResponse. */ + interface IListTopicsResponse { - /** Properties of an Expr. */ - interface IExpr { + /** ListTopicsResponse topics */ + topics?: (google.pubsub.v1.ITopic[]|null); - /** Expr expression */ - expression?: (string|null); + /** ListTopicsResponse nextPageToken */ + nextPageToken?: (string|null); + } - /** Expr title */ - title?: (string|null); + /** Represents a ListTopicsResponse. */ + class ListTopicsResponse implements IListTopicsResponse { - /** Expr description */ - description?: (string|null); + /** + * Constructs a new ListTopicsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicsResponse); - /** Expr location */ - location?: (string|null); - } + /** ListTopicsResponse topics. */ + public topics: google.pubsub.v1.ITopic[]; - /** Represents an Expr. */ - class Expr implements IExpr { + /** ListTopicsResponse nextPageToken. */ + public nextPageToken: string; - /** - * Constructs a new Expr. - * @param [properties] Properties to set - */ - constructor(properties?: google.type.IExpr); + /** + * Creates a new ListTopicsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; - /** Expr expression. */ - public expression: string; + /** + * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** Expr title. */ - public title: string; + /** + * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @param message ListTopicsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** Expr description. */ - public description: string; + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; - /** Expr location. */ - public location: string; + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; - /** - * Creates a new Expr instance using the specified properties. - * @param [properties] Properties to set - * @returns Expr instance - */ - public static create(properties?: google.type.IExpr): google.type.Expr; + /** + * Verifies a ListTopicsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @param message Expr message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; - /** - * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @param message Expr message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.type.IExpr, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * @param message ListTopicsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Decodes an Expr message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.type.Expr; + /** + * Converts this ListTopicsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Decodes an Expr message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.type.Expr; + /** Properties of a ListTopicSubscriptionsRequest. */ + interface IListTopicSubscriptionsRequest { - /** - * Verifies an Expr message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** ListTopicSubscriptionsRequest topic */ + topic?: (string|null); - /** - * Creates an Expr message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Expr - */ - public static fromObject(object: { [k: string]: any }): google.type.Expr; + /** ListTopicSubscriptionsRequest pageSize */ + pageSize?: (number|null); - /** - * Creates a plain object from an Expr message. Also converts values to other types if specified. - * @param message Expr - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.type.Expr, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** ListTopicSubscriptionsRequest pageToken */ + pageToken?: (string|null); + } - /** - * Converts this Expr to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } + /** Represents a ListTopicSubscriptionsRequest. */ + class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { - /** Namespace api. */ - namespace api { + /** + * Constructs a new ListTopicSubscriptionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); - /** Properties of a Http. */ - interface IHttp { + /** ListTopicSubscriptionsRequest topic. */ + public topic: string; - /** Http rules */ - rules?: (google.api.IHttpRule[]|null); + /** ListTopicSubscriptionsRequest pageSize. */ + public pageSize: number; - /** Http fullyDecodeReservedExpansion */ - fullyDecodeReservedExpansion?: (boolean|null); - } + /** ListTopicSubscriptionsRequest pageToken. */ + public pageToken: string; - /** Represents a Http. */ - class Http implements IHttp { + /** + * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSubscriptionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; - /** - * Constructs a new Http. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IHttp); + /** + * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** Http rules. */ - public rules: google.api.IHttpRule[]; + /** + * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @param message ListTopicSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** Http fullyDecodeReservedExpansion. */ - public fullyDecodeReservedExpansion: boolean; + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; - /** - * Creates a new Http instance using the specified properties. - * @param [properties] Properties to set - * @returns Http instance - */ - public static create(properties?: google.api.IHttp): google.api.Http; + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; - /** - * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @param message Http message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Verifies a ListTopicSubscriptionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @param message Http message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSubscriptionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; - /** - * Decodes a Http message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Http - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; + /** + * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Decodes a Http message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Http - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; + /** + * Converts this ListTopicSubscriptionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Verifies a Http message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Properties of a ListTopicSubscriptionsResponse. */ + interface IListTopicSubscriptionsResponse { - /** - * Creates a Http message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Http - */ - public static fromObject(object: { [k: string]: any }): google.api.Http; + /** ListTopicSubscriptionsResponse subscriptions */ + subscriptions?: (string[]|null); - /** - * Creates a plain object from a Http message. Also converts values to other types if specified. - * @param message Http - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** ListTopicSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); + } - /** - * Converts this Http to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Represents a ListTopicSubscriptionsResponse. */ + class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { - /** Properties of a HttpRule. */ - interface IHttpRule { + /** + * Constructs a new ListTopicSubscriptionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); - /** HttpRule selector */ - selector?: (string|null); + /** ListTopicSubscriptionsResponse subscriptions. */ + public subscriptions: string[]; - /** HttpRule get */ - get?: (string|null); + /** ListTopicSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; - /** HttpRule put */ - put?: (string|null); + /** + * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSubscriptionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; - /** HttpRule post */ - post?: (string|null); + /** + * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** HttpRule delete */ - "delete"?: (string|null); + /** + * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @param message ListTopicSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** HttpRule patch */ - patch?: (string|null); + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; - /** HttpRule custom */ - custom?: (google.api.ICustomHttpPattern|null); + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; - /** HttpRule body */ - body?: (string|null); + /** + * Verifies a ListTopicSubscriptionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** HttpRule responseBody */ - responseBody?: (string|null); + /** + * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSubscriptionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; - /** HttpRule additionalBindings */ - additionalBindings?: (google.api.IHttpRule[]|null); - } + /** + * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListTopicSubscriptionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents a HttpRule. */ - class HttpRule implements IHttpRule { + /** + * Converts this ListTopicSubscriptionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new HttpRule. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IHttpRule); + /** Properties of a ListTopicSnapshotsRequest. */ + interface IListTopicSnapshotsRequest { - /** HttpRule selector. */ - public selector: string; + /** ListTopicSnapshotsRequest topic */ + topic?: (string|null); - /** HttpRule get. */ - public get: string; + /** ListTopicSnapshotsRequest pageSize */ + pageSize?: (number|null); - /** HttpRule put. */ - public put: string; + /** ListTopicSnapshotsRequest pageToken */ + pageToken?: (string|null); + } - /** HttpRule post. */ - public post: string; + /** Represents a ListTopicSnapshotsRequest. */ + class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { - /** HttpRule delete. */ - public delete: string; + /** + * Constructs a new ListTopicSnapshotsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); - /** HttpRule patch. */ - public patch: string; + /** ListTopicSnapshotsRequest topic. */ + public topic: string; - /** HttpRule custom. */ - public custom?: (google.api.ICustomHttpPattern|null); + /** ListTopicSnapshotsRequest pageSize. */ + public pageSize: number; - /** HttpRule body. */ - public body: string; + /** ListTopicSnapshotsRequest pageToken. */ + public pageToken: string; - /** HttpRule responseBody. */ - public responseBody: string; + /** + * Creates a new ListTopicSnapshotsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSnapshotsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; - /** HttpRule additionalBindings. */ - public additionalBindings: google.api.IHttpRule[]; + /** + * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** HttpRule pattern. */ - public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); + /** + * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @param message ListTopicSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new HttpRule instance using the specified properties. - * @param [properties] Properties to set - * @returns HttpRule instance - */ - public static create(properties?: google.api.IHttpRule): google.api.HttpRule; + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; - /** - * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @param message HttpRule message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; - /** - * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @param message HttpRule message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Verifies a ListTopicSnapshotsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a HttpRule message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns HttpRule - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; + /** + * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSnapshotsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; - /** - * Decodes a HttpRule message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns HttpRule - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; + /** + * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Verifies a HttpRule message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Converts this ListTopicSnapshotsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns HttpRule - */ - public static fromObject(object: { [k: string]: any }): google.api.HttpRule; + /** Properties of a ListTopicSnapshotsResponse. */ + interface IListTopicSnapshotsResponse { - /** - * Creates a plain object from a HttpRule message. Also converts values to other types if specified. - * @param message HttpRule - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** ListTopicSnapshotsResponse snapshots */ + snapshots?: (string[]|null); - /** - * Converts this HttpRule to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** ListTopicSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); + } - /** Properties of a CustomHttpPattern. */ - interface ICustomHttpPattern { + /** Represents a ListTopicSnapshotsResponse. */ + class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { - /** CustomHttpPattern kind */ - kind?: (string|null); + /** + * Constructs a new ListTopicSnapshotsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); - /** CustomHttpPattern path */ - path?: (string|null); - } + /** ListTopicSnapshotsResponse snapshots. */ + public snapshots: string[]; - /** Represents a CustomHttpPattern. */ - class CustomHttpPattern implements ICustomHttpPattern { + /** ListTopicSnapshotsResponse nextPageToken. */ + public nextPageToken: string; - /** - * Constructs a new CustomHttpPattern. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.ICustomHttpPattern); + /** + * Creates a new ListTopicSnapshotsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListTopicSnapshotsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; - /** CustomHttpPattern kind. */ - public kind: string; + /** + * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** CustomHttpPattern path. */ - public path: string; + /** + * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @param message ListTopicSnapshotsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new CustomHttpPattern instance using the specified properties. - * @param [properties] Properties to set - * @returns CustomHttpPattern instance - */ - public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; - /** - * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @param message CustomHttpPattern message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; - /** - * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @param message CustomHttpPattern message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Verifies a ListTopicSnapshotsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; + /** + * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListTopicSnapshotsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; + /** + * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListTopicSnapshotsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Verifies a CustomHttpPattern message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Converts this ListTopicSnapshotsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CustomHttpPattern - */ - public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; + /** Properties of a DeleteTopicRequest. */ + interface IDeleteTopicRequest { - /** - * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. - * @param message CustomHttpPattern - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this CustomHttpPattern to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** DeleteTopicRequest topic */ + topic?: (string|null); + } - /** FieldBehavior enum. */ - enum FieldBehavior { - FIELD_BEHAVIOR_UNSPECIFIED = 0, - OPTIONAL = 1, - REQUIRED = 2, - OUTPUT_ONLY = 3, - INPUT_ONLY = 4, - IMMUTABLE = 5 - } + /** Represents a DeleteTopicRequest. */ + class DeleteTopicRequest implements IDeleteTopicRequest { - /** Properties of a ResourceDescriptor. */ - interface IResourceDescriptor { + /** + * Constructs a new DeleteTopicRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); - /** ResourceDescriptor type */ - type?: (string|null); + /** DeleteTopicRequest topic. */ + public topic: string; - /** ResourceDescriptor pattern */ - pattern?: (string[]|null); + /** + * Creates a new DeleteTopicRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteTopicRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; - /** ResourceDescriptor nameField */ - nameField?: (string|null); + /** + * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** ResourceDescriptor history */ - history?: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History|null); + /** + * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @param message DeleteTopicRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** ResourceDescriptor plural */ - plural?: (string|null); + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; - /** ResourceDescriptor singular */ - singular?: (string|null); - } + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; - /** Represents a ResourceDescriptor. */ - class ResourceDescriptor implements IResourceDescriptor { + /** + * Verifies a DeleteTopicRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Constructs a new ResourceDescriptor. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IResourceDescriptor); + /** + * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteTopicRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; - /** ResourceDescriptor type. */ - public type: string; + /** + * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. + * @param message DeleteTopicRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** ResourceDescriptor pattern. */ - public pattern: string[]; + /** + * Converts this DeleteTopicRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** ResourceDescriptor nameField. */ - public nameField: string; + /** Represents a Subscriber */ + class Subscriber extends $protobuf.rpc.Service { - /** ResourceDescriptor history. */ - public history: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History); + /** + * Constructs a new Subscriber service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); - /** ResourceDescriptor plural. */ - public plural: string; + /** + * Creates new Subscriber service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; - /** ResourceDescriptor singular. */ - public singular: string; + /** + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; - /** - * Creates a new ResourceDescriptor instance using the specified properties. - * @param [properties] Properties to set - * @returns ResourceDescriptor instance - */ - public static create(properties?: google.api.IResourceDescriptor): google.api.ResourceDescriptor; + /** + * Calls CreateSubscription. + * @param request Subscription message or plain object + * @returns Promise + */ + public createSubscription(request: google.pubsub.v1.ISubscription): Promise; - /** - * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @param message ResourceDescriptor message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; - /** - * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @param message ResourceDescriptor message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Calls GetSubscription. + * @param request GetSubscriptionRequest message or plain object + * @returns Promise + */ + public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceDescriptor; + /** + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Subscription + */ + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceDescriptor; + /** + * Calls UpdateSubscription. + * @param request UpdateSubscriptionRequest message or plain object + * @returns Promise + */ + public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; - /** - * Verifies a ResourceDescriptor message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse + */ + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; - /** - * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ResourceDescriptor - */ - public static fromObject(object: { [k: string]: any }): google.api.ResourceDescriptor; + /** + * Calls ListSubscriptions. + * @param request ListSubscriptionsRequest message or plain object + * @returns Promise + */ + public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; - /** - * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. - * @param message ResourceDescriptor - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.ResourceDescriptor, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; - /** - * Converts this ResourceDescriptor to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Calls DeleteSubscription. + * @param request DeleteSubscriptionRequest message or plain object + * @returns Promise + */ + public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; - namespace ResourceDescriptor { + /** + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; - /** History enum. */ - enum History { - HISTORY_UNSPECIFIED = 0, - ORIGINALLY_SINGLE_PATTERN = 1, - FUTURE_MULTI_PATTERN = 2 - } - } + /** + * Calls ModifyAckDeadline. + * @param request ModifyAckDeadlineRequest message or plain object + * @returns Promise + */ + public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; - /** Properties of a ResourceReference. */ - interface IResourceReference { + /** + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; - /** ResourceReference type */ - type?: (string|null); + /** + * Calls Acknowledge. + * @param request AcknowledgeRequest message or plain object + * @returns Promise + */ + public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; - /** ResourceReference childType */ - childType?: (string|null); - } + /** + * Calls Pull. + * @param request PullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and PullResponse + */ + public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; - /** Represents a ResourceReference. */ - class ResourceReference implements IResourceReference { + /** + * Calls Pull. + * @param request PullRequest message or plain object + * @returns Promise + */ + public pull(request: google.pubsub.v1.IPullRequest): Promise; - /** - * Constructs a new ResourceReference. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IResourceReference); + /** + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @param callback Node-style callback called with the error, if any, and StreamingPullResponse + */ + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; - /** ResourceReference type. */ - public type: string; + /** + * Calls StreamingPull. + * @param request StreamingPullRequest message or plain object + * @returns Promise + */ + public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; - /** ResourceReference childType. */ - public childType: string; + /** + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; - /** - * Creates a new ResourceReference instance using the specified properties. - * @param [properties] Properties to set - * @returns ResourceReference instance - */ - public static create(properties?: google.api.IResourceReference): google.api.ResourceReference; + /** + * Calls ModifyPushConfig. + * @param request ModifyPushConfigRequest message or plain object + * @returns Promise + */ + public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; - /** - * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. - * @param message ResourceReference message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; - /** - * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. - * @param message ResourceReference message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Calls GetSnapshot. + * @param request GetSnapshotRequest message or plain object + * @returns Promise + */ + public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; - /** - * Decodes a ResourceReference message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceReference; + /** + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse + */ + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; - /** - * Decodes a ResourceReference message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceReference; + /** + * Calls ListSnapshots. + * @param request ListSnapshotsRequest message or plain object + * @returns Promise + */ + public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; - /** - * Verifies a ResourceReference message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; - /** - * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ResourceReference - */ - public static fromObject(object: { [k: string]: any }): google.api.ResourceReference; + /** + * Calls CreateSnapshot. + * @param request CreateSnapshotRequest message or plain object + * @returns Promise + */ + public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; - /** - * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. - * @param message ResourceReference - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.ResourceReference, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Snapshot + */ + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; - /** - * Converts this ResourceReference to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } + /** + * Calls UpdateSnapshot. + * @param request UpdateSnapshotRequest message or plain object + * @returns Promise + */ + public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; - /** Namespace protobuf. */ - namespace protobuf { + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; - /** Properties of a FileDescriptorSet. */ - interface IFileDescriptorSet { + /** + * Calls DeleteSnapshot. + * @param request DeleteSnapshotRequest message or plain object + * @returns Promise + */ + public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; - /** FileDescriptorSet file */ - file?: (google.protobuf.IFileDescriptorProto[]|null); - } + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @param callback Node-style callback called with the error, if any, and SeekResponse + */ + public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; - /** Represents a FileDescriptorSet. */ - class FileDescriptorSet implements IFileDescriptorSet { + /** + * Calls Seek. + * @param request SeekRequest message or plain object + * @returns Promise + */ + public seek(request: google.pubsub.v1.ISeekRequest): Promise; + } - /** - * Constructs a new FileDescriptorSet. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileDescriptorSet); + namespace Subscriber { - /** FileDescriptorSet file. */ - public file: google.protobuf.IFileDescriptorProto[]; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - /** - * Creates a new FileDescriptorSet instance using the specified properties. - * @param [properties] Properties to set - * @returns FileDescriptorSet instance - */ - public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - /** - * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param message FileDescriptorSet message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * @param error Error, if any + * @param [response] Subscription + */ + type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; - /** - * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param message FileDescriptorSet message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * @param error Error, if any + * @param [response] ListSubscriptionsResponse + */ + type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - /** - * Verifies a FileDescriptorSet message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * @param error Error, if any + * @param [response] Empty + */ + type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - /** - * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileDescriptorSet - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * @param error Error, if any + * @param [response] PullResponse + */ + type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; - /** - * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. - * @param message FileDescriptorSet - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * @param error Error, if any + * @param [response] StreamingPullResponse + */ + type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; - /** - * Converts this FileDescriptorSet to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * @param error Error, if any + * @param [response] Empty + */ + type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - /** Properties of a FileDescriptorProto. */ - interface IFileDescriptorProto { + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - /** FileDescriptorProto name */ - name?: (string|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * @param error Error, if any + * @param [response] ListSnapshotsResponse + */ + type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; - /** FileDescriptorProto package */ - "package"?: (string|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - /** FileDescriptorProto dependency */ - dependency?: (string[]|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * @param error Error, if any + * @param [response] Snapshot + */ + type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; - /** FileDescriptorProto publicDependency */ - publicDependency?: (number[]|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - /** FileDescriptorProto weakDependency */ - weakDependency?: (number[]|null); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * @param error Error, if any + * @param [response] SeekResponse + */ + type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; + } - /** FileDescriptorProto messageType */ - messageType?: (google.protobuf.IDescriptorProto[]|null); + /** Properties of a Subscription. */ + interface ISubscription { - /** FileDescriptorProto enumType */ - enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + /** Subscription name */ + name?: (string|null); - /** FileDescriptorProto service */ - service?: (google.protobuf.IServiceDescriptorProto[]|null); + /** Subscription topic */ + topic?: (string|null); - /** FileDescriptorProto extension */ - extension?: (google.protobuf.IFieldDescriptorProto[]|null); + /** Subscription pushConfig */ + pushConfig?: (google.pubsub.v1.IPushConfig|null); - /** FileDescriptorProto options */ - options?: (google.protobuf.IFileOptions|null); + /** Subscription ackDeadlineSeconds */ + ackDeadlineSeconds?: (number|null); - /** FileDescriptorProto sourceCodeInfo */ - sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + /** Subscription retainAckedMessages */ + retainAckedMessages?: (boolean|null); - /** FileDescriptorProto syntax */ - syntax?: (string|null); - } + /** Subscription messageRetentionDuration */ + messageRetentionDuration?: (google.protobuf.IDuration|null); - /** Represents a FileDescriptorProto. */ - class FileDescriptorProto implements IFileDescriptorProto { + /** Subscription labels */ + labels?: ({ [k: string]: string }|null); - /** - * Constructs a new FileDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileDescriptorProto); + /** Subscription enableMessageOrdering */ + enableMessageOrdering?: (boolean|null); - /** FileDescriptorProto name. */ - public name: string; + /** Subscription expirationPolicy */ + expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); - /** FileDescriptorProto package. */ - public package: string; + /** Subscription filter */ + filter?: (string|null); - /** FileDescriptorProto dependency. */ - public dependency: string[]; + /** Subscription deadLetterPolicy */ + deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); - /** FileDescriptorProto publicDependency. */ - public publicDependency: number[]; + /** Subscription retryPolicy */ + retryPolicy?: (google.pubsub.v1.IRetryPolicy|null); + } - /** FileDescriptorProto weakDependency. */ - public weakDependency: number[]; + /** Represents a Subscription. */ + class Subscription implements ISubscription { - /** FileDescriptorProto messageType. */ - public messageType: google.protobuf.IDescriptorProto[]; + /** + * Constructs a new Subscription. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISubscription); - /** FileDescriptorProto enumType. */ - public enumType: google.protobuf.IEnumDescriptorProto[]; + /** Subscription name. */ + public name: string; - /** FileDescriptorProto service. */ - public service: google.protobuf.IServiceDescriptorProto[]; + /** Subscription topic. */ + public topic: string; - /** FileDescriptorProto extension. */ - public extension: google.protobuf.IFieldDescriptorProto[]; + /** Subscription pushConfig. */ + public pushConfig?: (google.pubsub.v1.IPushConfig|null); - /** FileDescriptorProto options. */ - public options?: (google.protobuf.IFileOptions|null); + /** Subscription ackDeadlineSeconds. */ + public ackDeadlineSeconds: number; - /** FileDescriptorProto sourceCodeInfo. */ - public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); + /** Subscription retainAckedMessages. */ + public retainAckedMessages: boolean; - /** FileDescriptorProto syntax. */ - public syntax: string; + /** Subscription messageRetentionDuration. */ + public messageRetentionDuration?: (google.protobuf.IDuration|null); - /** - * Creates a new FileDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns FileDescriptorProto instance - */ - public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; + /** Subscription labels. */ + public labels: { [k: string]: string }; - /** - * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param message FileDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** Subscription enableMessageOrdering. */ + public enableMessageOrdering: boolean; - /** - * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param message FileDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** Subscription expirationPolicy. */ + public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; + /** Subscription filter. */ + public filter: string; - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; + /** Subscription deadLetterPolicy. */ + public deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); - /** - * Verifies a FileDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Subscription retryPolicy. */ + public retryPolicy?: (google.pubsub.v1.IRetryPolicy|null); - /** - * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; + /** + * Creates a new Subscription instance using the specified properties. + * @param [properties] Properties to set + * @returns Subscription instance + */ + public static create(properties?: google.pubsub.v1.ISubscription): google.pubsub.v1.Subscription; - /** - * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. - * @param message FileDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @param message Subscription message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this FileDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @param message Subscription message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a DescriptorProto. */ - interface IDescriptorProto { + /** + * Decodes a Subscription message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Subscription; - /** DescriptorProto name */ - name?: (string|null); + /** + * Decodes a Subscription message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Subscription; - /** DescriptorProto field */ - field?: (google.protobuf.IFieldDescriptorProto[]|null); + /** + * Verifies a Subscription message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** DescriptorProto extension */ - extension?: (google.protobuf.IFieldDescriptorProto[]|null); + /** + * Creates a Subscription message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Subscription + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Subscription; - /** DescriptorProto nestedType */ - nestedType?: (google.protobuf.IDescriptorProto[]|null); + /** + * Creates a plain object from a Subscription message. Also converts values to other types if specified. + * @param message Subscription + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Subscription, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** DescriptorProto enumType */ - enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + /** + * Converts this Subscription to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** DescriptorProto extensionRange */ - extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); + /** Properties of a RetryPolicy. */ + interface IRetryPolicy { - /** DescriptorProto oneofDecl */ - oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); + /** RetryPolicy minimumBackoff */ + minimumBackoff?: (google.protobuf.IDuration|null); - /** DescriptorProto options */ - options?: (google.protobuf.IMessageOptions|null); + /** RetryPolicy maximumBackoff */ + maximumBackoff?: (google.protobuf.IDuration|null); + } - /** DescriptorProto reservedRange */ - reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); + /** Represents a RetryPolicy. */ + class RetryPolicy implements IRetryPolicy { - /** DescriptorProto reservedName */ - reservedName?: (string[]|null); - } + /** + * Constructs a new RetryPolicy. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IRetryPolicy); - /** Represents a DescriptorProto. */ - class DescriptorProto implements IDescriptorProto { + /** RetryPolicy minimumBackoff. */ + public minimumBackoff?: (google.protobuf.IDuration|null); - /** - * Constructs a new DescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IDescriptorProto); + /** RetryPolicy maximumBackoff. */ + public maximumBackoff?: (google.protobuf.IDuration|null); - /** DescriptorProto name. */ - public name: string; + /** + * Creates a new RetryPolicy instance using the specified properties. + * @param [properties] Properties to set + * @returns RetryPolicy instance + */ + public static create(properties?: google.pubsub.v1.IRetryPolicy): google.pubsub.v1.RetryPolicy; - /** DescriptorProto field. */ - public field: google.protobuf.IFieldDescriptorProto[]; + /** + * Encodes the specified RetryPolicy message. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. + * @param message RetryPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IRetryPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** DescriptorProto extension. */ - public extension: google.protobuf.IFieldDescriptorProto[]; + /** + * Encodes the specified RetryPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. + * @param message RetryPolicy message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IRetryPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - /** DescriptorProto nestedType. */ - public nestedType: google.protobuf.IDescriptorProto[]; + /** + * Decodes a RetryPolicy message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns RetryPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.RetryPolicy; - /** DescriptorProto enumType. */ - public enumType: google.protobuf.IEnumDescriptorProto[]; + /** + * Decodes a RetryPolicy message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns RetryPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.RetryPolicy; - /** DescriptorProto extensionRange. */ - public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; + /** + * Verifies a RetryPolicy message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** DescriptorProto oneofDecl. */ - public oneofDecl: google.protobuf.IOneofDescriptorProto[]; + /** + * Creates a RetryPolicy message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns RetryPolicy + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.RetryPolicy; - /** DescriptorProto options. */ - public options?: (google.protobuf.IMessageOptions|null); + /** + * Creates a plain object from a RetryPolicy message. Also converts values to other types if specified. + * @param message RetryPolicy + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.RetryPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** DescriptorProto reservedRange. */ - public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; - - /** DescriptorProto reservedName. */ - public reservedName: string[]; - - /** - * Creates a new DescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns DescriptorProto instance - */ - public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; - - /** - * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param message DescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param message DescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; - - /** - * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; - - /** - * Verifies a DescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; - - /** - * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. - * @param message DescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace DescriptorProto { - - /** Properties of an ExtensionRange. */ - interface IExtensionRange { + /** + * Converts this RetryPolicy to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** ExtensionRange start */ - start?: (number|null); + /** Properties of a DeadLetterPolicy. */ + interface IDeadLetterPolicy { - /** ExtensionRange end */ - end?: (number|null); + /** DeadLetterPolicy deadLetterTopic */ + deadLetterTopic?: (string|null); - /** ExtensionRange options */ - options?: (google.protobuf.IExtensionRangeOptions|null); + /** DeadLetterPolicy maxDeliveryAttempts */ + maxDeliveryAttempts?: (number|null); } - /** Represents an ExtensionRange. */ - class ExtensionRange implements IExtensionRange { + /** Represents a DeadLetterPolicy. */ + class DeadLetterPolicy implements IDeadLetterPolicy { /** - * Constructs a new ExtensionRange. + * Constructs a new DeadLetterPolicy. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); - - /** ExtensionRange start. */ - public start: number; + constructor(properties?: google.pubsub.v1.IDeadLetterPolicy); - /** ExtensionRange end. */ - public end: number; + /** DeadLetterPolicy deadLetterTopic. */ + public deadLetterTopic: string; - /** ExtensionRange options. */ - public options?: (google.protobuf.IExtensionRangeOptions|null); + /** DeadLetterPolicy maxDeliveryAttempts. */ + public maxDeliveryAttempts: number; /** - * Creates a new ExtensionRange instance using the specified properties. + * Creates a new DeadLetterPolicy instance using the specified properties. * @param [properties] Properties to set - * @returns ExtensionRange instance + * @returns DeadLetterPolicy instance */ - public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; + public static create(properties?: google.pubsub.v1.IDeadLetterPolicy): google.pubsub.v1.DeadLetterPolicy; /** - * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param message ExtensionRange message or plain object to encode + * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @param message DeadLetterPolicy message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param message ExtensionRange message or plain object to encode + * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * @param message DeadLetterPolicy message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an ExtensionRange message from the specified reader or buffer. + * Decodes a DeadLetterPolicy message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ExtensionRange + * @returns DeadLetterPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeadLetterPolicy; /** - * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. + * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ExtensionRange + * @returns DeadLetterPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeadLetterPolicy; /** - * Verifies an ExtensionRange message. + * Verifies a DeadLetterPolicy message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. + * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ExtensionRange + * @returns DeadLetterPolicy */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeadLetterPolicy; /** - * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. - * @param message ExtensionRange + * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. + * @param message DeadLetterPolicy * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.DeadLetterPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ExtensionRange to JSON. + * Converts this DeadLetterPolicy to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a ReservedRange. */ - interface IReservedRange { - - /** ReservedRange start */ - start?: (number|null); + /** Properties of an ExpirationPolicy. */ + interface IExpirationPolicy { - /** ReservedRange end */ - end?: (number|null); + /** ExpirationPolicy ttl */ + ttl?: (google.protobuf.IDuration|null); } - /** Represents a ReservedRange. */ - class ReservedRange implements IReservedRange { + /** Represents an ExpirationPolicy. */ + class ExpirationPolicy implements IExpirationPolicy { /** - * Constructs a new ReservedRange. + * Constructs a new ExpirationPolicy. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); - - /** ReservedRange start. */ - public start: number; + constructor(properties?: google.pubsub.v1.IExpirationPolicy); - /** ReservedRange end. */ - public end: number; + /** ExpirationPolicy ttl. */ + public ttl?: (google.protobuf.IDuration|null); /** - * Creates a new ReservedRange instance using the specified properties. + * Creates a new ExpirationPolicy instance using the specified properties. * @param [properties] Properties to set - * @returns ReservedRange instance + * @returns ExpirationPolicy instance */ - public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; + public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; /** - * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param message ReservedRange message or plain object to encode + * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param message ReservedRange message or plain object to encode + * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @param message ExpirationPolicy message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ReservedRange message from the specified reader or buffer. + * Decodes an ExpirationPolicy message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ReservedRange + * @returns ExpirationPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; /** - * Decodes a ReservedRange message from the specified reader or buffer, length delimited. + * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ReservedRange + * @returns ExpirationPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; /** - * Verifies a ReservedRange message. + * Verifies an ExpirationPolicy message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. + * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ReservedRange + * @returns ExpirationPolicy */ - public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; /** - * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. - * @param message ReservedRange + * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. + * @param message ExpirationPolicy * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ReservedRange to JSON. + * Converts this ExpirationPolicy to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - /** Properties of an ExtensionRangeOptions. */ - interface IExtensionRangeOptions { + /** Properties of a PushConfig. */ + interface IPushConfig { - /** ExtensionRangeOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } + /** PushConfig pushEndpoint */ + pushEndpoint?: (string|null); - /** Represents an ExtensionRangeOptions. */ - class ExtensionRangeOptions implements IExtensionRangeOptions { + /** PushConfig attributes */ + attributes?: ({ [k: string]: string }|null); - /** - * Constructs a new ExtensionRangeOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IExtensionRangeOptions); + /** PushConfig oidcToken */ + oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + } - /** ExtensionRangeOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new ExtensionRangeOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ExtensionRangeOptions instance - */ - public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; + /** Represents a PushConfig. */ + class PushConfig implements IPushConfig { - /** - * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new PushConfig. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPushConfig); - /** - * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** PushConfig pushEndpoint. */ + public pushEndpoint: string; - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; + /** PushConfig attributes. */ + public attributes: { [k: string]: string }; - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; + /** PushConfig oidcToken. */ + public oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); - /** - * Verifies an ExtensionRangeOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** PushConfig authenticationMethod. */ + public authenticationMethod?: "oidcToken"; - /** - * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExtensionRangeOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; + /** + * Creates a new PushConfig instance using the specified properties. + * @param [properties] Properties to set + * @returns PushConfig instance + */ + public static create(properties?: google.pubsub.v1.IPushConfig): google.pubsub.v1.PushConfig; - /** - * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. - * @param message ExtensionRangeOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @param message PushConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this ExtensionRangeOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @param message PushConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a FieldDescriptorProto. */ - interface IFieldDescriptorProto { + /** + * Decodes a PushConfig message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig; - /** FieldDescriptorProto name */ - name?: (string|null); + /** + * Decodes a PushConfig message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig; - /** FieldDescriptorProto number */ - number?: (number|null); + /** + * Verifies a PushConfig message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FieldDescriptorProto label */ - label?: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label|null); + /** + * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PushConfig + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig; - /** FieldDescriptorProto type */ - type?: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type|null); + /** + * Creates a plain object from a PushConfig message. Also converts values to other types if specified. + * @param message PushConfig + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** FieldDescriptorProto typeName */ - typeName?: (string|null); + /** + * Converts this PushConfig to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** FieldDescriptorProto extendee */ - extendee?: (string|null); + namespace PushConfig { - /** FieldDescriptorProto defaultValue */ - defaultValue?: (string|null); + /** Properties of an OidcToken. */ + interface IOidcToken { - /** FieldDescriptorProto oneofIndex */ - oneofIndex?: (number|null); + /** OidcToken serviceAccountEmail */ + serviceAccountEmail?: (string|null); - /** FieldDescriptorProto jsonName */ - jsonName?: (string|null); + /** OidcToken audience */ + audience?: (string|null); + } - /** FieldDescriptorProto options */ - options?: (google.protobuf.IFieldOptions|null); - } + /** Represents an OidcToken. */ + class OidcToken implements IOidcToken { - /** Represents a FieldDescriptorProto. */ - class FieldDescriptorProto implements IFieldDescriptorProto { + /** + * Constructs a new OidcToken. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.PushConfig.IOidcToken); - /** - * Constructs a new FieldDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldDescriptorProto); + /** OidcToken serviceAccountEmail. */ + public serviceAccountEmail: string; - /** FieldDescriptorProto name. */ - public name: string; + /** OidcToken audience. */ + public audience: string; - /** FieldDescriptorProto number. */ - public number: number; + /** + * Creates a new OidcToken instance using the specified properties. + * @param [properties] Properties to set + * @returns OidcToken instance + */ + public static create(properties?: google.pubsub.v1.PushConfig.IOidcToken): google.pubsub.v1.PushConfig.OidcToken; - /** FieldDescriptorProto label. */ - public label: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label); + /** + * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @param message OidcToken message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; - /** FieldDescriptorProto type. */ - public type: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type); + /** + * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @param message OidcToken message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; - /** FieldDescriptorProto typeName. */ - public typeName: string; + /** + * Decodes an OidcToken message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.OidcToken; - /** FieldDescriptorProto extendee. */ - public extendee: string; + /** + * Decodes an OidcToken message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.OidcToken; - /** FieldDescriptorProto defaultValue. */ - public defaultValue: string; + /** + * Verifies an OidcToken message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FieldDescriptorProto oneofIndex. */ - public oneofIndex: number; + /** + * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OidcToken + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.OidcToken; - /** FieldDescriptorProto jsonName. */ - public jsonName: string; + /** + * Creates a plain object from an OidcToken message. Also converts values to other types if specified. + * @param message OidcToken + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig.OidcToken, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** FieldDescriptorProto options. */ - public options?: (google.protobuf.IFieldOptions|null); + /** + * Converts this OidcToken to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } - /** - * Creates a new FieldDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldDescriptorProto instance - */ - public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; + /** Properties of a ReceivedMessage. */ + interface IReceivedMessage { - /** - * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param message FieldDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** ReceivedMessage ackId */ + ackId?: (string|null); - /** - * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param message FieldDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** ReceivedMessage message */ + message?: (google.pubsub.v1.IPubsubMessage|null); - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; + /** ReceivedMessage deliveryAttempt */ + deliveryAttempt?: (number|null); + } - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; + /** Represents a ReceivedMessage. */ + class ReceivedMessage implements IReceivedMessage { - /** - * Verifies a FieldDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Constructs a new ReceivedMessage. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IReceivedMessage); - /** - * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; + /** ReceivedMessage ackId. */ + public ackId: string; - /** - * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. - * @param message FieldDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** ReceivedMessage message. */ + public message?: (google.pubsub.v1.IPubsubMessage|null); - /** - * Converts this FieldDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** ReceivedMessage deliveryAttempt. */ + public deliveryAttempt: number; - namespace FieldDescriptorProto { + /** + * Creates a new ReceivedMessage instance using the specified properties. + * @param [properties] Properties to set + * @returns ReceivedMessage instance + */ + public static create(properties?: google.pubsub.v1.IReceivedMessage): google.pubsub.v1.ReceivedMessage; - /** Type enum. */ - enum Type { - TYPE_DOUBLE = 1, - TYPE_FLOAT = 2, - TYPE_INT64 = 3, - TYPE_UINT64 = 4, - TYPE_INT32 = 5, - TYPE_FIXED64 = 6, - TYPE_FIXED32 = 7, - TYPE_BOOL = 8, - TYPE_STRING = 9, - TYPE_GROUP = 10, - TYPE_MESSAGE = 11, - TYPE_BYTES = 12, - TYPE_UINT32 = 13, - TYPE_ENUM = 14, - TYPE_SFIXED32 = 15, - TYPE_SFIXED64 = 16, - TYPE_SINT32 = 17, - TYPE_SINT64 = 18 - } + /** + * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @param message ReceivedMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; - /** Label enum. */ - enum Label { - LABEL_OPTIONAL = 1, - LABEL_REQUIRED = 2, - LABEL_REPEATED = 3 - } - } + /** + * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @param message ReceivedMessage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of an OneofDescriptorProto. */ - interface IOneofDescriptorProto { + /** + * Decodes a ReceivedMessage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ReceivedMessage; - /** OneofDescriptorProto name */ - name?: (string|null); + /** + * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ReceivedMessage; - /** OneofDescriptorProto options */ - options?: (google.protobuf.IOneofOptions|null); - } + /** + * Verifies a ReceivedMessage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Represents an OneofDescriptorProto. */ - class OneofDescriptorProto implements IOneofDescriptorProto { + /** + * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ReceivedMessage + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ReceivedMessage; - /** - * Constructs a new OneofDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IOneofDescriptorProto); + /** + * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. + * @param message ReceivedMessage + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ReceivedMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** OneofDescriptorProto name. */ - public name: string; + /** + * Converts this ReceivedMessage to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** OneofDescriptorProto options. */ - public options?: (google.protobuf.IOneofOptions|null); + /** Properties of a GetSubscriptionRequest. */ + interface IGetSubscriptionRequest { - /** - * Creates a new OneofDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns OneofDescriptorProto instance - */ - public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; + /** GetSubscriptionRequest subscription */ + subscription?: (string|null); + } - /** - * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param message OneofDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a GetSubscriptionRequest. */ + class GetSubscriptionRequest implements IGetSubscriptionRequest { - /** - * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param message OneofDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new GetSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetSubscriptionRequest); - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; - - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; - - /** - * Verifies an OneofDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OneofDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; - - /** - * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. - * @param message OneofDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this OneofDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an EnumDescriptorProto. */ - interface IEnumDescriptorProto { - - /** EnumDescriptorProto name */ - name?: (string|null); - - /** EnumDescriptorProto value */ - value?: (google.protobuf.IEnumValueDescriptorProto[]|null); - - /** EnumDescriptorProto options */ - options?: (google.protobuf.IEnumOptions|null); - - /** EnumDescriptorProto reservedRange */ - reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); - - /** EnumDescriptorProto reservedName */ - reservedName?: (string[]|null); - } - - /** Represents an EnumDescriptorProto. */ - class EnumDescriptorProto implements IEnumDescriptorProto { - - /** - * Constructs a new EnumDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumDescriptorProto); - - /** EnumDescriptorProto name. */ - public name: string; - - /** EnumDescriptorProto value. */ - public value: google.protobuf.IEnumValueDescriptorProto[]; - - /** EnumDescriptorProto options. */ - public options?: (google.protobuf.IEnumOptions|null); - - /** EnumDescriptorProto reservedRange. */ - public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; - - /** EnumDescriptorProto reservedName. */ - public reservedName: string[]; - - /** - * Creates a new EnumDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumDescriptorProto instance - */ - public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; - - /** - * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param message EnumDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param message EnumDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; - - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; - - /** - * Verifies an EnumDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; - - /** - * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. - * @param message EnumDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace EnumDescriptorProto { - - /** Properties of an EnumReservedRange. */ - interface IEnumReservedRange { - - /** EnumReservedRange start */ - start?: (number|null); - - /** EnumReservedRange end */ - end?: (number|null); - } - - /** Represents an EnumReservedRange. */ - class EnumReservedRange implements IEnumReservedRange { - - /** - * Constructs a new EnumReservedRange. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); - - /** EnumReservedRange start. */ - public start: number; - - /** EnumReservedRange end. */ - public end: number; + /** GetSubscriptionRequest subscription. */ + public subscription: string; /** - * Creates a new EnumReservedRange instance using the specified properties. + * Creates a new GetSubscriptionRequest instance using the specified properties. * @param [properties] Properties to set - * @returns EnumReservedRange instance + * @returns GetSubscriptionRequest instance */ - public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; + public static create(properties?: google.pubsub.v1.IGetSubscriptionRequest): google.pubsub.v1.GetSubscriptionRequest; /** - * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode + * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @param message GetSubscriptionRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode + * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. + * @param message GetSubscriptionRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an EnumReservedRange message from the specified reader or buffer. + * Decodes a GetSubscriptionRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns EnumReservedRange + * @returns GetSubscriptionRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSubscriptionRequest; /** - * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns EnumReservedRange + * @returns GetSubscriptionRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSubscriptionRequest; /** - * Verifies an EnumReservedRange message. + * Verifies a GetSubscriptionRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns EnumReservedRange + * @returns GetSubscriptionRequest */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSubscriptionRequest; /** - * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. - * @param message EnumReservedRange + * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. + * @param message GetSubscriptionRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.GetSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this EnumReservedRange to JSON. + * Converts this GetSubscriptionRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - /** Properties of an EnumValueDescriptorProto. */ - interface IEnumValueDescriptorProto { + /** Properties of an UpdateSubscriptionRequest. */ + interface IUpdateSubscriptionRequest { - /** EnumValueDescriptorProto name */ - name?: (string|null); + /** UpdateSubscriptionRequest subscription */ + subscription?: (google.pubsub.v1.ISubscription|null); - /** EnumValueDescriptorProto number */ - number?: (number|null); + /** UpdateSubscriptionRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } - /** EnumValueDescriptorProto options */ - options?: (google.protobuf.IEnumValueOptions|null); - } + /** Represents an UpdateSubscriptionRequest. */ + class UpdateSubscriptionRequest implements IUpdateSubscriptionRequest { - /** Represents an EnumValueDescriptorProto. */ - class EnumValueDescriptorProto implements IEnumValueDescriptorProto { + /** + * Constructs a new UpdateSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateSubscriptionRequest); - /** - * Constructs a new EnumValueDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumValueDescriptorProto); + /** UpdateSubscriptionRequest subscription. */ + public subscription?: (google.pubsub.v1.ISubscription|null); - /** EnumValueDescriptorProto name. */ - public name: string; + /** UpdateSubscriptionRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); - /** EnumValueDescriptorProto number. */ - public number: number; + /** + * Creates a new UpdateSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateSubscriptionRequest): google.pubsub.v1.UpdateSubscriptionRequest; - /** EnumValueDescriptorProto options. */ - public options?: (google.protobuf.IEnumValueOptions|null); + /** + * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @param message UpdateSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new EnumValueDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumValueDescriptorProto instance - */ - public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; + /** + * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @param message UpdateSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param message EnumValueDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSubscriptionRequest; - /** - * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param message EnumValueDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSubscriptionRequest; - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; + /** + * Verifies an UpdateSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; + /** + * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSubscriptionRequest; - /** - * Verifies an EnumValueDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. + * @param message UpdateSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumValueDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; + /** + * Converts this UpdateSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. - * @param message EnumValueDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Properties of a ListSubscriptionsRequest. */ + interface IListSubscriptionsRequest { - /** - * Converts this EnumValueDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** ListSubscriptionsRequest project */ + project?: (string|null); - /** Properties of a ServiceDescriptorProto. */ - interface IServiceDescriptorProto { + /** ListSubscriptionsRequest pageSize */ + pageSize?: (number|null); - /** ServiceDescriptorProto name */ - name?: (string|null); + /** ListSubscriptionsRequest pageToken */ + pageToken?: (string|null); + } - /** ServiceDescriptorProto method */ - method?: (google.protobuf.IMethodDescriptorProto[]|null); + /** Represents a ListSubscriptionsRequest. */ + class ListSubscriptionsRequest implements IListSubscriptionsRequest { - /** ServiceDescriptorProto options */ - options?: (google.protobuf.IServiceOptions|null); - } + /** + * Constructs a new ListSubscriptionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSubscriptionsRequest); - /** Represents a ServiceDescriptorProto. */ - class ServiceDescriptorProto implements IServiceDescriptorProto { + /** ListSubscriptionsRequest project. */ + public project: string; - /** - * Constructs a new ServiceDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IServiceDescriptorProto); + /** ListSubscriptionsRequest pageSize. */ + public pageSize: number; - /** ServiceDescriptorProto name. */ - public name: string; + /** ListSubscriptionsRequest pageToken. */ + public pageToken: string; - /** ServiceDescriptorProto method. */ - public method: google.protobuf.IMethodDescriptorProto[]; + /** + * Creates a new ListSubscriptionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSubscriptionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSubscriptionsRequest): google.pubsub.v1.ListSubscriptionsRequest; - /** ServiceDescriptorProto options. */ - public options?: (google.protobuf.IServiceOptions|null); + /** + * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @param message ListSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new ServiceDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns ServiceDescriptorProto instance - */ - public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; + /** + * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @param message ListSubscriptionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param message ServiceDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsRequest; - /** - * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param message ServiceDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsRequest; - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; + /** + * Verifies a ListSubscriptionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; - - /** - * Verifies a ServiceDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ServiceDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; + /** + * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSubscriptionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsRequest; - /** - * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. - * @param message ServiceDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. + * @param message ListSubscriptionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Converts this ServiceDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Converts this ListSubscriptionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Properties of a MethodDescriptorProto. */ - interface IMethodDescriptorProto { + /** Properties of a ListSubscriptionsResponse. */ + interface IListSubscriptionsResponse { - /** MethodDescriptorProto name */ - name?: (string|null); + /** ListSubscriptionsResponse subscriptions */ + subscriptions?: (google.pubsub.v1.ISubscription[]|null); - /** MethodDescriptorProto inputType */ - inputType?: (string|null); + /** ListSubscriptionsResponse nextPageToken */ + nextPageToken?: (string|null); + } - /** MethodDescriptorProto outputType */ - outputType?: (string|null); + /** Represents a ListSubscriptionsResponse. */ + class ListSubscriptionsResponse implements IListSubscriptionsResponse { - /** MethodDescriptorProto options */ - options?: (google.protobuf.IMethodOptions|null); + /** + * Constructs a new ListSubscriptionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSubscriptionsResponse); - /** MethodDescriptorProto clientStreaming */ - clientStreaming?: (boolean|null); + /** ListSubscriptionsResponse subscriptions. */ + public subscriptions: google.pubsub.v1.ISubscription[]; - /** MethodDescriptorProto serverStreaming */ - serverStreaming?: (boolean|null); - } + /** ListSubscriptionsResponse nextPageToken. */ + public nextPageToken: string; - /** Represents a MethodDescriptorProto. */ - class MethodDescriptorProto implements IMethodDescriptorProto { + /** + * Creates a new ListSubscriptionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSubscriptionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListSubscriptionsResponse): google.pubsub.v1.ListSubscriptionsResponse; - /** - * Constructs a new MethodDescriptorProto. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMethodDescriptorProto); + /** + * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @param message ListSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** MethodDescriptorProto name. */ - public name: string; + /** + * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @param message ListSubscriptionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** MethodDescriptorProto inputType. */ - public inputType: string; + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsResponse; - /** MethodDescriptorProto outputType. */ - public outputType: string; + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsResponse; - /** MethodDescriptorProto options. */ - public options?: (google.protobuf.IMethodOptions|null); + /** + * Verifies a ListSubscriptionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** MethodDescriptorProto clientStreaming. */ - public clientStreaming: boolean; + /** + * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSubscriptionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsResponse; - /** MethodDescriptorProto serverStreaming. */ - public serverStreaming: boolean; + /** + * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. + * @param message ListSubscriptionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a new MethodDescriptorProto instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodDescriptorProto instance - */ - public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; + /** + * Converts this ListSubscriptionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param message MethodDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** Properties of a DeleteSubscriptionRequest. */ + interface IDeleteSubscriptionRequest { - /** - * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param message MethodDescriptorProto message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + /** DeleteSubscriptionRequest subscription */ + subscription?: (string|null); + } - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; + /** Represents a DeleteSubscriptionRequest. */ + class DeleteSubscriptionRequest implements IDeleteSubscriptionRequest { - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; + /** + * Constructs a new DeleteSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteSubscriptionRequest); - /** - * Verifies a MethodDescriptorProto message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** DeleteSubscriptionRequest subscription. */ + public subscription: string; - /** - * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodDescriptorProto - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; + /** + * Creates a new DeleteSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteSubscriptionRequest): google.pubsub.v1.DeleteSubscriptionRequest; - /** - * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. - * @param message MethodDescriptorProto - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @param message DeleteSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this MethodDescriptorProto to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @param message DeleteSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a FileOptions. */ - interface IFileOptions { - - /** FileOptions javaPackage */ - javaPackage?: (string|null); - - /** FileOptions javaOuterClassname */ - javaOuterClassname?: (string|null); - - /** FileOptions javaMultipleFiles */ - javaMultipleFiles?: (boolean|null); + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSubscriptionRequest; - /** FileOptions javaGenerateEqualsAndHash */ - javaGenerateEqualsAndHash?: (boolean|null); + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSubscriptionRequest; - /** FileOptions javaStringCheckUtf8 */ - javaStringCheckUtf8?: (boolean|null); + /** + * Verifies a DeleteSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FileOptions optimizeFor */ - optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode|null); + /** + * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSubscriptionRequest; - /** FileOptions goPackage */ - goPackage?: (string|null); + /** + * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. + * @param message DeleteSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** FileOptions ccGenericServices */ - ccGenericServices?: (boolean|null); + /** + * Converts this DeleteSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** FileOptions javaGenericServices */ - javaGenericServices?: (boolean|null); + /** Properties of a ModifyPushConfigRequest. */ + interface IModifyPushConfigRequest { - /** FileOptions pyGenericServices */ - pyGenericServices?: (boolean|null); + /** ModifyPushConfigRequest subscription */ + subscription?: (string|null); - /** FileOptions phpGenericServices */ - phpGenericServices?: (boolean|null); + /** ModifyPushConfigRequest pushConfig */ + pushConfig?: (google.pubsub.v1.IPushConfig|null); + } - /** FileOptions deprecated */ - deprecated?: (boolean|null); + /** Represents a ModifyPushConfigRequest. */ + class ModifyPushConfigRequest implements IModifyPushConfigRequest { - /** FileOptions ccEnableArenas */ - ccEnableArenas?: (boolean|null); + /** + * Constructs a new ModifyPushConfigRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IModifyPushConfigRequest); - /** FileOptions objcClassPrefix */ - objcClassPrefix?: (string|null); + /** ModifyPushConfigRequest subscription. */ + public subscription: string; - /** FileOptions csharpNamespace */ - csharpNamespace?: (string|null); + /** ModifyPushConfigRequest pushConfig. */ + public pushConfig?: (google.pubsub.v1.IPushConfig|null); - /** FileOptions swiftPrefix */ - swiftPrefix?: (string|null); + /** + * Creates a new ModifyPushConfigRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ModifyPushConfigRequest instance + */ + public static create(properties?: google.pubsub.v1.IModifyPushConfigRequest): google.pubsub.v1.ModifyPushConfigRequest; - /** FileOptions phpClassPrefix */ - phpClassPrefix?: (string|null); + /** + * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @param message ModifyPushConfigRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** FileOptions phpNamespace */ - phpNamespace?: (string|null); + /** + * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @param message ModifyPushConfigRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** FileOptions phpMetadataNamespace */ - phpMetadataNamespace?: (string|null); + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyPushConfigRequest; - /** FileOptions rubyPackage */ - rubyPackage?: (string|null); + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyPushConfigRequest; - /** FileOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** + * Verifies a ModifyPushConfigRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FileOptions .google.api.resourceDefinition */ - ".google.api.resourceDefinition"?: (google.api.IResourceDescriptor[]|null); - } + /** + * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ModifyPushConfigRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyPushConfigRequest; - /** Represents a FileOptions. */ - class FileOptions implements IFileOptions { + /** + * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. + * @param message ModifyPushConfigRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ModifyPushConfigRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Constructs a new FileOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFileOptions); + /** + * Converts this ModifyPushConfigRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** FileOptions javaPackage. */ - public javaPackage: string; + /** Properties of a PullRequest. */ + interface IPullRequest { - /** FileOptions javaOuterClassname. */ - public javaOuterClassname: string; + /** PullRequest subscription */ + subscription?: (string|null); - /** FileOptions javaMultipleFiles. */ - public javaMultipleFiles: boolean; + /** PullRequest returnImmediately */ + returnImmediately?: (boolean|null); - /** FileOptions javaGenerateEqualsAndHash. */ - public javaGenerateEqualsAndHash: boolean; + /** PullRequest maxMessages */ + maxMessages?: (number|null); + } - /** FileOptions javaStringCheckUtf8. */ - public javaStringCheckUtf8: boolean; + /** Represents a PullRequest. */ + class PullRequest implements IPullRequest { - /** FileOptions optimizeFor. */ - public optimizeFor: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode); + /** + * Constructs a new PullRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPullRequest); - /** FileOptions goPackage. */ - public goPackage: string; + /** PullRequest subscription. */ + public subscription: string; - /** FileOptions ccGenericServices. */ - public ccGenericServices: boolean; + /** PullRequest returnImmediately. */ + public returnImmediately: boolean; - /** FileOptions javaGenericServices. */ - public javaGenericServices: boolean; + /** PullRequest maxMessages. */ + public maxMessages: number; - /** FileOptions pyGenericServices. */ - public pyGenericServices: boolean; + /** + * Creates a new PullRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns PullRequest instance + */ + public static create(properties?: google.pubsub.v1.IPullRequest): google.pubsub.v1.PullRequest; - /** FileOptions phpGenericServices. */ - public phpGenericServices: boolean; + /** + * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @param message PullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** FileOptions deprecated. */ - public deprecated: boolean; + /** + * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @param message PullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** FileOptions ccEnableArenas. */ - public ccEnableArenas: boolean; + /** + * Decodes a PullRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullRequest; - /** FileOptions objcClassPrefix. */ - public objcClassPrefix: string; + /** + * Decodes a PullRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullRequest; - /** FileOptions csharpNamespace. */ - public csharpNamespace: string; + /** + * Verifies a PullRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FileOptions swiftPrefix. */ - public swiftPrefix: string; + /** + * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PullRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullRequest; - /** FileOptions phpClassPrefix. */ - public phpClassPrefix: string; + /** + * Creates a plain object from a PullRequest message. Also converts values to other types if specified. + * @param message PullRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** FileOptions phpNamespace. */ - public phpNamespace: string; + /** + * Converts this PullRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** FileOptions phpMetadataNamespace. */ - public phpMetadataNamespace: string; + /** Properties of a PullResponse. */ + interface IPullResponse { - /** FileOptions rubyPackage. */ - public rubyPackage: string; + /** PullResponse receivedMessages */ + receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + } - /** FileOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** Represents a PullResponse. */ + class PullResponse implements IPullResponse { - /** - * Creates a new FileOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns FileOptions instance - */ - public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; + /** + * Constructs a new PullResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPullResponse); - /** - * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param message FileOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** PullResponse receivedMessages. */ + public receivedMessages: google.pubsub.v1.IReceivedMessage[]; - /** - * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param message FileOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new PullResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns PullResponse instance + */ + public static create(properties?: google.pubsub.v1.IPullResponse): google.pubsub.v1.PullResponse; - /** - * Decodes a FileOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; + /** + * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @param message PullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a FileOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; + /** + * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @param message PullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a FileOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a PullResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullResponse; - /** - * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FileOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; + /** + * Decodes a PullResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullResponse; - /** - * Creates a plain object from a FileOptions message. Also converts values to other types if specified. - * @param message FileOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Verifies a PullResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Converts this FileOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PullResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullResponse; - namespace FileOptions { + /** + * Creates a plain object from a PullResponse message. Also converts values to other types if specified. + * @param message PullResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** OptimizeMode enum. */ - enum OptimizeMode { - SPEED = 1, - CODE_SIZE = 2, - LITE_RUNTIME = 3 + /** + * Converts this PullResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; } - } - /** Properties of a MessageOptions. */ - interface IMessageOptions { + /** Properties of a ModifyAckDeadlineRequest. */ + interface IModifyAckDeadlineRequest { - /** MessageOptions messageSetWireFormat */ - messageSetWireFormat?: (boolean|null); + /** ModifyAckDeadlineRequest subscription */ + subscription?: (string|null); - /** MessageOptions noStandardDescriptorAccessor */ - noStandardDescriptorAccessor?: (boolean|null); + /** ModifyAckDeadlineRequest ackIds */ + ackIds?: (string[]|null); - /** MessageOptions deprecated */ - deprecated?: (boolean|null); + /** ModifyAckDeadlineRequest ackDeadlineSeconds */ + ackDeadlineSeconds?: (number|null); + } - /** MessageOptions mapEntry */ - mapEntry?: (boolean|null); + /** Represents a ModifyAckDeadlineRequest. */ + class ModifyAckDeadlineRequest implements IModifyAckDeadlineRequest { - /** MessageOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** + * Constructs a new ModifyAckDeadlineRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IModifyAckDeadlineRequest); - /** MessageOptions .google.api.resource */ - ".google.api.resource"?: (google.api.IResourceDescriptor|null); - } + /** ModifyAckDeadlineRequest subscription. */ + public subscription: string; - /** Represents a MessageOptions. */ - class MessageOptions implements IMessageOptions { + /** ModifyAckDeadlineRequest ackIds. */ + public ackIds: string[]; - /** - * Constructs a new MessageOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMessageOptions); + /** ModifyAckDeadlineRequest ackDeadlineSeconds. */ + public ackDeadlineSeconds: number; - /** MessageOptions messageSetWireFormat. */ - public messageSetWireFormat: boolean; + /** + * Creates a new ModifyAckDeadlineRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ModifyAckDeadlineRequest instance + */ + public static create(properties?: google.pubsub.v1.IModifyAckDeadlineRequest): google.pubsub.v1.ModifyAckDeadlineRequest; - /** MessageOptions noStandardDescriptorAccessor. */ - public noStandardDescriptorAccessor: boolean; + /** + * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @param message ModifyAckDeadlineRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** MessageOptions deprecated. */ - public deprecated: boolean; + /** + * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @param message ModifyAckDeadlineRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** MessageOptions mapEntry. */ - public mapEntry: boolean; + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyAckDeadlineRequest; - /** MessageOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyAckDeadlineRequest; - /** - * Creates a new MessageOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns MessageOptions instance - */ - public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; + /** + * Verifies a ModifyAckDeadlineRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param message MessageOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ModifyAckDeadlineRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyAckDeadlineRequest; - /** - * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param message MessageOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. + * @param message ModifyAckDeadlineRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ModifyAckDeadlineRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Decodes a MessageOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; + /** + * Converts this ModifyAckDeadlineRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Decodes a MessageOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; + /** Properties of an AcknowledgeRequest. */ + interface IAcknowledgeRequest { - /** - * Verifies a MessageOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** AcknowledgeRequest subscription */ + subscription?: (string|null); - /** - * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MessageOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; + /** AcknowledgeRequest ackIds */ + ackIds?: (string[]|null); + } - /** - * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. - * @param message MessageOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Represents an AcknowledgeRequest. */ + class AcknowledgeRequest implements IAcknowledgeRequest { - /** - * Converts this MessageOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Constructs a new AcknowledgeRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IAcknowledgeRequest); - /** Properties of a FieldOptions. */ - interface IFieldOptions { + /** AcknowledgeRequest subscription. */ + public subscription: string; - /** FieldOptions ctype */ - ctype?: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType|null); + /** AcknowledgeRequest ackIds. */ + public ackIds: string[]; - /** FieldOptions packed */ - packed?: (boolean|null); + /** + * Creates a new AcknowledgeRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns AcknowledgeRequest instance + */ + public static create(properties?: google.pubsub.v1.IAcknowledgeRequest): google.pubsub.v1.AcknowledgeRequest; - /** FieldOptions jstype */ - jstype?: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType|null); + /** + * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @param message AcknowledgeRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** FieldOptions lazy */ - lazy?: (boolean|null); + /** + * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @param message AcknowledgeRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** FieldOptions deprecated */ - deprecated?: (boolean|null); + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.AcknowledgeRequest; - /** FieldOptions weak */ - weak?: (boolean|null); + /** + * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.AcknowledgeRequest; - /** FieldOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** + * Verifies an AcknowledgeRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** FieldOptions .google.api.fieldBehavior */ - ".google.api.fieldBehavior"?: (google.api.FieldBehavior[]|null); + /** + * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AcknowledgeRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.AcknowledgeRequest; - /** FieldOptions .google.api.resourceReference */ - ".google.api.resourceReference"?: (google.api.IResourceReference|null); - } + /** + * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. + * @param message AcknowledgeRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.AcknowledgeRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents a FieldOptions. */ - class FieldOptions implements IFieldOptions { + /** + * Converts this AcknowledgeRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new FieldOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldOptions); + /** Properties of a StreamingPullRequest. */ + interface IStreamingPullRequest { - /** FieldOptions ctype. */ - public ctype: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType); + /** StreamingPullRequest subscription */ + subscription?: (string|null); - /** FieldOptions packed. */ - public packed: boolean; + /** StreamingPullRequest ackIds */ + ackIds?: (string[]|null); - /** FieldOptions jstype. */ - public jstype: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType); + /** StreamingPullRequest modifyDeadlineSeconds */ + modifyDeadlineSeconds?: (number[]|null); - /** FieldOptions lazy. */ - public lazy: boolean; + /** StreamingPullRequest modifyDeadlineAckIds */ + modifyDeadlineAckIds?: (string[]|null); - /** FieldOptions deprecated. */ - public deprecated: boolean; + /** StreamingPullRequest streamAckDeadlineSeconds */ + streamAckDeadlineSeconds?: (number|null); - /** FieldOptions weak. */ - public weak: boolean; + /** StreamingPullRequest clientId */ + clientId?: (string|null); + } - /** FieldOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** Represents a StreamingPullRequest. */ + class StreamingPullRequest implements IStreamingPullRequest { - /** - * Creates a new FieldOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns FieldOptions instance - */ - public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; + /** + * Constructs a new StreamingPullRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IStreamingPullRequest); - /** - * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param message FieldOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** StreamingPullRequest subscription. */ + public subscription: string; - /** - * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param message FieldOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** StreamingPullRequest ackIds. */ + public ackIds: string[]; - /** - * Decodes a FieldOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; + /** StreamingPullRequest modifyDeadlineSeconds. */ + public modifyDeadlineSeconds: number[]; - /** - * Decodes a FieldOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; + /** StreamingPullRequest modifyDeadlineAckIds. */ + public modifyDeadlineAckIds: string[]; - /** - * Verifies a FieldOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** StreamingPullRequest streamAckDeadlineSeconds. */ + public streamAckDeadlineSeconds: number; - /** - * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns FieldOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; + /** StreamingPullRequest clientId. */ + public clientId: string; - /** - * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. - * @param message FieldOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a new StreamingPullRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns StreamingPullRequest instance + */ + public static create(properties?: google.pubsub.v1.IStreamingPullRequest): google.pubsub.v1.StreamingPullRequest; - /** - * Converts this FieldOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @param message StreamingPullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - namespace FieldOptions { + /** + * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @param message StreamingPullRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** CType enum. */ - enum CType { - STRING = 0, - CORD = 1, - STRING_PIECE = 2 - } + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullRequest; - /** JSType enum. */ - enum JSType { - JS_NORMAL = 0, - JS_STRING = 1, - JS_NUMBER = 2 - } - } + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullRequest; - /** Properties of an OneofOptions. */ - interface IOneofOptions { + /** + * Verifies a StreamingPullRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** OneofOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } + /** + * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns StreamingPullRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullRequest; - /** Represents an OneofOptions. */ - class OneofOptions implements IOneofOptions { + /** + * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. + * @param message StreamingPullRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Constructs a new OneofOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IOneofOptions); + /** + * Converts this StreamingPullRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** OneofOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** Properties of a StreamingPullResponse. */ + interface IStreamingPullResponse { - /** - * Creates a new OneofOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns OneofOptions instance - */ - public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; + /** StreamingPullResponse receivedMessages */ + receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + } - /** - * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param message OneofOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a StreamingPullResponse. */ + class StreamingPullResponse implements IStreamingPullResponse { - /** - * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param message OneofOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new StreamingPullResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IStreamingPullResponse); - /** - * Decodes an OneofOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; + /** StreamingPullResponse receivedMessages. */ + public receivedMessages: google.pubsub.v1.IReceivedMessage[]; - /** - * Decodes an OneofOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; + /** + * Creates a new StreamingPullResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns StreamingPullResponse instance + */ + public static create(properties?: google.pubsub.v1.IStreamingPullResponse): google.pubsub.v1.StreamingPullResponse; - /** - * Verifies an OneofOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @param message StreamingPullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OneofOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; + /** + * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. + * @param message StreamingPullResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. - * @param message OneofOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a StreamingPullResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns StreamingPullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse; - /** - * Converts this OneofOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns StreamingPullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse; - /** Properties of an EnumOptions. */ - interface IEnumOptions { + /** + * Verifies a StreamingPullResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** EnumOptions allowAlias */ - allowAlias?: (boolean|null); + /** + * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns StreamingPullResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse; - /** EnumOptions deprecated */ - deprecated?: (boolean|null); + /** + * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. + * @param message StreamingPullResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** EnumOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } + /** + * Converts this StreamingPullResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Represents an EnumOptions. */ - class EnumOptions implements IEnumOptions { + /** Properties of a CreateSnapshotRequest. */ + interface ICreateSnapshotRequest { - /** - * Constructs a new EnumOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumOptions); + /** CreateSnapshotRequest name */ + name?: (string|null); - /** EnumOptions allowAlias. */ - public allowAlias: boolean; + /** CreateSnapshotRequest subscription */ + subscription?: (string|null); - /** EnumOptions deprecated. */ - public deprecated: boolean; + /** CreateSnapshotRequest labels */ + labels?: ({ [k: string]: string }|null); + } - /** EnumOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** Represents a CreateSnapshotRequest. */ + class CreateSnapshotRequest implements ICreateSnapshotRequest { - /** - * Creates a new EnumOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumOptions instance - */ - public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; + /** + * Constructs a new CreateSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ICreateSnapshotRequest); - /** - * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param message EnumOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** CreateSnapshotRequest name. */ + public name: string; - /** - * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param message EnumOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** CreateSnapshotRequest subscription. */ + public subscription: string; - /** - * Decodes an EnumOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; + /** CreateSnapshotRequest labels. */ + public labels: { [k: string]: string }; - /** - * Decodes an EnumOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; + /** + * Creates a new CreateSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns CreateSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.ICreateSnapshotRequest): google.pubsub.v1.CreateSnapshotRequest; - /** - * Verifies an EnumOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @param message CreateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; + /** + * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. + * @param message CreateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. - * @param message EnumOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a CreateSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CreateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CreateSnapshotRequest; - /** - * Converts this EnumOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CreateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CreateSnapshotRequest; - /** Properties of an EnumValueOptions. */ - interface IEnumValueOptions { + /** + * Verifies a CreateSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** EnumValueOptions deprecated */ - deprecated?: (boolean|null); + /** + * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CreateSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CreateSnapshotRequest; - /** EnumValueOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } + /** + * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. + * @param message CreateSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.CreateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents an EnumValueOptions. */ - class EnumValueOptions implements IEnumValueOptions { + /** + * Converts this CreateSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new EnumValueOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEnumValueOptions); + /** Properties of an UpdateSnapshotRequest. */ + interface IUpdateSnapshotRequest { - /** EnumValueOptions deprecated. */ - public deprecated: boolean; + /** UpdateSnapshotRequest snapshot */ + snapshot?: (google.pubsub.v1.ISnapshot|null); - /** EnumValueOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** UpdateSnapshotRequest updateMask */ + updateMask?: (google.protobuf.IFieldMask|null); + } - /** - * Creates a new EnumValueOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumValueOptions instance - */ - public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; + /** Represents an UpdateSnapshotRequest. */ + class UpdateSnapshotRequest implements IUpdateSnapshotRequest { - /** - * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param message EnumValueOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param message EnumValueOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new UpdateSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IUpdateSnapshotRequest); - /** - * Decodes an EnumValueOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; + /** UpdateSnapshotRequest snapshot. */ + public snapshot?: (google.pubsub.v1.ISnapshot|null); - /** - * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; + /** UpdateSnapshotRequest updateMask. */ + public updateMask?: (google.protobuf.IFieldMask|null); - /** - * Verifies an EnumValueOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a new UpdateSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns UpdateSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IUpdateSnapshotRequest): google.pubsub.v1.UpdateSnapshotRequest; - /** - * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumValueOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; + /** + * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @param message UpdateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. - * @param message EnumValueOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. + * @param message UpdateSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this EnumValueOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UpdateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSnapshotRequest; - /** Properties of a ServiceOptions. */ - interface IServiceOptions { + /** + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UpdateSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSnapshotRequest; - /** ServiceOptions deprecated */ - deprecated?: (boolean|null); + /** + * Verifies an UpdateSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** ServiceOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** + * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UpdateSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSnapshotRequest; - /** ServiceOptions .google.api.defaultHost */ - ".google.api.defaultHost"?: (string|null); + /** + * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. + * @param message UpdateSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.UpdateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** ServiceOptions .google.api.oauthScopes */ - ".google.api.oauthScopes"?: (string|null); - } + /** + * Converts this UpdateSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Represents a ServiceOptions. */ - class ServiceOptions implements IServiceOptions { + /** Properties of a Snapshot. */ + interface ISnapshot { - /** - * Constructs a new ServiceOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IServiceOptions); + /** Snapshot name */ + name?: (string|null); - /** ServiceOptions deprecated. */ - public deprecated: boolean; + /** Snapshot topic */ + topic?: (string|null); - /** ServiceOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** Snapshot expireTime */ + expireTime?: (google.protobuf.ITimestamp|null); - /** - * Creates a new ServiceOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ServiceOptions instance - */ - public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; + /** Snapshot labels */ + labels?: ({ [k: string]: string }|null); + } - /** - * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param message ServiceOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** Represents a Snapshot. */ + class Snapshot implements ISnapshot { - /** - * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param message ServiceOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new Snapshot. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISnapshot); - /** - * Decodes a ServiceOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; + /** Snapshot name. */ + public name: string; - /** - * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; + /** Snapshot topic. */ + public topic: string; - /** - * Verifies a ServiceOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Snapshot expireTime. */ + public expireTime?: (google.protobuf.ITimestamp|null); - /** - * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ServiceOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; + /** Snapshot labels. */ + public labels: { [k: string]: string }; - /** - * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. - * @param message ServiceOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a new Snapshot instance using the specified properties. + * @param [properties] Properties to set + * @returns Snapshot instance + */ + public static create(properties?: google.pubsub.v1.ISnapshot): google.pubsub.v1.Snapshot; - /** - * Converts this ServiceOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @param message Snapshot message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a MethodOptions. */ - interface IMethodOptions { + /** + * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * @param message Snapshot message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; - /** MethodOptions deprecated */ - deprecated?: (boolean|null); - - /** MethodOptions idempotencyLevel */ - idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel|null); + /** + * Decodes a Snapshot message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Snapshot + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Snapshot; - /** MethodOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + /** + * Decodes a Snapshot message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Snapshot + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Snapshot; - /** MethodOptions .google.api.http */ - ".google.api.http"?: (google.api.IHttpRule|null); + /** + * Verifies a Snapshot message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** MethodOptions .google.api.methodSignature */ - ".google.api.methodSignature"?: (string[]|null); - } + /** + * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Snapshot + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Snapshot; - /** Represents a MethodOptions. */ - class MethodOptions implements IMethodOptions { + /** + * Creates a plain object from a Snapshot message. Also converts values to other types if specified. + * @param message Snapshot + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Snapshot, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Constructs a new MethodOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IMethodOptions); + /** + * Converts this Snapshot to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** MethodOptions deprecated. */ - public deprecated: boolean; + /** Properties of a GetSnapshotRequest. */ + interface IGetSnapshotRequest { - /** MethodOptions idempotencyLevel. */ - public idempotencyLevel: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel); + /** GetSnapshotRequest snapshot */ + snapshot?: (string|null); + } - /** MethodOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** Represents a GetSnapshotRequest. */ + class GetSnapshotRequest implements IGetSnapshotRequest { - /** - * Creates a new MethodOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodOptions instance - */ - public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; + /** + * Constructs a new GetSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetSnapshotRequest); - /** - * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param message MethodOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** GetSnapshotRequest snapshot. */ + public snapshot: string; - /** - * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param message MethodOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new GetSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetSnapshotRequest): google.pubsub.v1.GetSnapshotRequest; - /** - * Decodes a MethodOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; + /** + * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @param message GetSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a MethodOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; + /** + * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. + * @param message GetSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a MethodOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a GetSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSnapshotRequest; - /** - * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; + /** + * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSnapshotRequest; - /** - * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. - * @param message MethodOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Verifies a GetSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Converts this MethodOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSnapshotRequest; - namespace MethodOptions { + /** + * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. + * @param message GetSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** IdempotencyLevel enum. */ - enum IdempotencyLevel { - IDEMPOTENCY_UNKNOWN = 0, - NO_SIDE_EFFECTS = 1, - IDEMPOTENT = 2 + /** + * Converts this GetSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; } - } - - /** Properties of an UninterpretedOption. */ - interface IUninterpretedOption { - /** UninterpretedOption name */ - name?: (google.protobuf.UninterpretedOption.INamePart[]|null); + /** Properties of a ListSnapshotsRequest. */ + interface IListSnapshotsRequest { - /** UninterpretedOption identifierValue */ - identifierValue?: (string|null); + /** ListSnapshotsRequest project */ + project?: (string|null); - /** UninterpretedOption positiveIntValue */ - positiveIntValue?: (number|Long|string|null); + /** ListSnapshotsRequest pageSize */ + pageSize?: (number|null); - /** UninterpretedOption negativeIntValue */ - negativeIntValue?: (number|Long|string|null); + /** ListSnapshotsRequest pageToken */ + pageToken?: (string|null); + } - /** UninterpretedOption doubleValue */ - doubleValue?: (number|null); + /** Represents a ListSnapshotsRequest. */ + class ListSnapshotsRequest implements IListSnapshotsRequest { - /** UninterpretedOption stringValue */ - stringValue?: (Uint8Array|string|null); + /** + * Constructs a new ListSnapshotsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSnapshotsRequest); - /** UninterpretedOption aggregateValue */ - aggregateValue?: (string|null); - } + /** ListSnapshotsRequest project. */ + public project: string; - /** Represents an UninterpretedOption. */ - class UninterpretedOption implements IUninterpretedOption { + /** ListSnapshotsRequest pageSize. */ + public pageSize: number; - /** - * Constructs a new UninterpretedOption. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IUninterpretedOption); + /** ListSnapshotsRequest pageToken. */ + public pageToken: string; - /** UninterpretedOption name. */ - public name: google.protobuf.UninterpretedOption.INamePart[]; - - /** UninterpretedOption identifierValue. */ - public identifierValue: string; - - /** UninterpretedOption positiveIntValue. */ - public positiveIntValue: (number|Long|string); - - /** UninterpretedOption negativeIntValue. */ - public negativeIntValue: (number|Long|string); - - /** UninterpretedOption doubleValue. */ - public doubleValue: number; - - /** UninterpretedOption stringValue. */ - public stringValue: (Uint8Array|string); - - /** UninterpretedOption aggregateValue. */ - public aggregateValue: string; - - /** - * Creates a new UninterpretedOption instance using the specified properties. - * @param [properties] Properties to set - * @returns UninterpretedOption instance - */ - public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; - - /** - * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param message UninterpretedOption message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new ListSnapshotsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSnapshotsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSnapshotsRequest): google.pubsub.v1.ListSnapshotsRequest; - /** - * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param message UninterpretedOption message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @param message ListSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes an UninterpretedOption message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; + /** + * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * @param message ListSnapshotsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; + /** + * Decodes a ListSnapshotsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsRequest; - /** - * Verifies an UninterpretedOption message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsRequest; - /** - * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UninterpretedOption - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; + /** + * Verifies a ListSnapshotsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. - * @param message UninterpretedOption - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSnapshotsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsRequest; - /** - * Converts this UninterpretedOption to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. + * @param message ListSnapshotsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - namespace UninterpretedOption { + /** + * Converts this ListSnapshotsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Properties of a NamePart. */ - interface INamePart { + /** Properties of a ListSnapshotsResponse. */ + interface IListSnapshotsResponse { - /** NamePart namePart */ - namePart: string; + /** ListSnapshotsResponse snapshots */ + snapshots?: (google.pubsub.v1.ISnapshot[]|null); - /** NamePart isExtension */ - isExtension: boolean; + /** ListSnapshotsResponse nextPageToken */ + nextPageToken?: (string|null); } - /** Represents a NamePart. */ - class NamePart implements INamePart { + /** Represents a ListSnapshotsResponse. */ + class ListSnapshotsResponse implements IListSnapshotsResponse { /** - * Constructs a new NamePart. + * Constructs a new ListSnapshotsResponse. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.UninterpretedOption.INamePart); + constructor(properties?: google.pubsub.v1.IListSnapshotsResponse); - /** NamePart namePart. */ - public namePart: string; + /** ListSnapshotsResponse snapshots. */ + public snapshots: google.pubsub.v1.ISnapshot[]; - /** NamePart isExtension. */ - public isExtension: boolean; + /** ListSnapshotsResponse nextPageToken. */ + public nextPageToken: string; /** - * Creates a new NamePart instance using the specified properties. + * Creates a new ListSnapshotsResponse instance using the specified properties. * @param [properties] Properties to set - * @returns NamePart instance + * @returns ListSnapshotsResponse instance */ - public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; + public static create(properties?: google.pubsub.v1.IListSnapshotsResponse): google.pubsub.v1.ListSnapshotsResponse; /** - * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode + * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @param message ListSnapshotsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param message NamePart message or plain object to encode + * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * @param message ListSnapshotsResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a NamePart message from the specified reader or buffer. + * Decodes a ListSnapshotsResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns NamePart + * @returns ListSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsResponse; /** - * Decodes a NamePart message from the specified reader or buffer, length delimited. + * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns NamePart + * @returns ListSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsResponse; /** - * Verifies a NamePart message. + * Verifies a ListSnapshotsResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a NamePart message from a plain object. Also converts values to their respective internal types. + * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns NamePart + * @returns ListSnapshotsResponse */ - public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsResponse; /** - * Creates a plain object from a NamePart message. Also converts values to other types if specified. - * @param message NamePart + * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. + * @param message ListSnapshotsResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.ListSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this NamePart to JSON. + * Converts this ListSnapshotsResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - /** Properties of a SourceCodeInfo. */ - interface ISourceCodeInfo { + /** Properties of a DeleteSnapshotRequest. */ + interface IDeleteSnapshotRequest { - /** SourceCodeInfo location */ - location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); - } + /** DeleteSnapshotRequest snapshot */ + snapshot?: (string|null); + } - /** Represents a SourceCodeInfo. */ - class SourceCodeInfo implements ISourceCodeInfo { + /** Represents a DeleteSnapshotRequest. */ + class DeleteSnapshotRequest implements IDeleteSnapshotRequest { - /** - * Constructs a new SourceCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.ISourceCodeInfo); + /** + * Constructs a new DeleteSnapshotRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteSnapshotRequest); - /** SourceCodeInfo location. */ - public location: google.protobuf.SourceCodeInfo.ILocation[]; + /** DeleteSnapshotRequest snapshot. */ + public snapshot: string; - /** - * Creates a new SourceCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns SourceCodeInfo instance - */ - public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; - - /** - * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param message SourceCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; + /** + * Creates a new DeleteSnapshotRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteSnapshotRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteSnapshotRequest): google.pubsub.v1.DeleteSnapshotRequest; - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; + /** + * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @param message DeleteSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a SourceCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. + * @param message DeleteSnapshotRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SourceCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; + /** + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSnapshotRequest; - /** - * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. - * @param message SourceCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteSnapshotRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSnapshotRequest; - /** - * Converts this SourceCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Verifies a DeleteSnapshotRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - namespace SourceCodeInfo { + /** + * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteSnapshotRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSnapshotRequest; - /** Properties of a Location. */ - interface ILocation { + /** + * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. + * @param message DeleteSnapshotRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Location path */ - path?: (number[]|null); + /** + * Converts this DeleteSnapshotRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Location span */ - span?: (number[]|null); + /** Properties of a SeekRequest. */ + interface ISeekRequest { - /** Location leadingComments */ - leadingComments?: (string|null); + /** SeekRequest subscription */ + subscription?: (string|null); - /** Location trailingComments */ - trailingComments?: (string|null); + /** SeekRequest time */ + time?: (google.protobuf.ITimestamp|null); - /** Location leadingDetachedComments */ - leadingDetachedComments?: (string[]|null); + /** SeekRequest snapshot */ + snapshot?: (string|null); } - /** Represents a Location. */ - class Location implements ILocation { + /** Represents a SeekRequest. */ + class SeekRequest implements ISeekRequest { /** - * Constructs a new Location. + * Constructs a new SeekRequest. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); - - /** Location path. */ - public path: number[]; + constructor(properties?: google.pubsub.v1.ISeekRequest); - /** Location span. */ - public span: number[]; + /** SeekRequest subscription. */ + public subscription: string; - /** Location leadingComments. */ - public leadingComments: string; + /** SeekRequest time. */ + public time?: (google.protobuf.ITimestamp|null); - /** Location trailingComments. */ - public trailingComments: string; + /** SeekRequest snapshot. */ + public snapshot: string; - /** Location leadingDetachedComments. */ - public leadingDetachedComments: string[]; + /** SeekRequest target. */ + public target?: ("time"|"snapshot"); /** - * Creates a new Location instance using the specified properties. + * Creates a new SeekRequest instance using the specified properties. * @param [properties] Properties to set - * @returns Location instance + * @returns SeekRequest instance */ - public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; + public static create(properties?: google.pubsub.v1.ISeekRequest): google.pubsub.v1.SeekRequest; /** - * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode + * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @param message SeekRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param message Location message or plain object to encode + * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. + * @param message SeekRequest message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Location message from the specified reader or buffer. + * Decodes a SeekRequest message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Location + * @returns SeekRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekRequest; /** - * Decodes a Location message from the specified reader or buffer, length delimited. + * Decodes a SeekRequest message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Location + * @returns SeekRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekRequest; /** - * Verifies a Location message. + * Verifies a SeekRequest message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Location message from a plain object. Also converts values to their respective internal types. + * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Location + * @returns SeekRequest */ - public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekRequest; /** - * Creates a plain object from a Location message. Also converts values to other types if specified. - * @param message Location + * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. + * @param message SeekRequest * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.SeekRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Location to JSON. + * Converts this SeekRequest to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - /** Properties of a GeneratedCodeInfo. */ - interface IGeneratedCodeInfo { + /** Properties of a SeekResponse. */ + interface ISeekResponse { + } - /** GeneratedCodeInfo annotation */ - annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); - } + /** Represents a SeekResponse. */ + class SeekResponse implements ISeekResponse { - /** Represents a GeneratedCodeInfo. */ - class GeneratedCodeInfo implements IGeneratedCodeInfo { + /** + * Constructs a new SeekResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISeekResponse); - /** - * Constructs a new GeneratedCodeInfo. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IGeneratedCodeInfo); + /** + * Creates a new SeekResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns SeekResponse instance + */ + public static create(properties?: google.pubsub.v1.ISeekResponse): google.pubsub.v1.SeekResponse; - /** GeneratedCodeInfo annotation. */ - public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; - - /** - * Creates a new GeneratedCodeInfo instance using the specified properties. - * @param [properties] Properties to set - * @returns GeneratedCodeInfo instance - */ - public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; - - /** - * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param message GeneratedCodeInfo message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; - - /** - * Verifies a GeneratedCodeInfo message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GeneratedCodeInfo - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; - - /** - * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. - * @param message GeneratedCodeInfo - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GeneratedCodeInfo to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - namespace GeneratedCodeInfo { - - /** Properties of an Annotation. */ - interface IAnnotation { - - /** Annotation path */ - path?: (number[]|null); - - /** Annotation sourceFile */ - sourceFile?: (string|null); - - /** Annotation begin */ - begin?: (number|null); - - /** Annotation end */ - end?: (number|null); - } - - /** Represents an Annotation. */ - class Annotation implements IAnnotation { - - /** - * Constructs a new Annotation. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); - - /** Annotation path. */ - public path: number[]; - - /** Annotation sourceFile. */ - public sourceFile: string; - - /** Annotation begin. */ - public begin: number; - - /** Annotation end. */ - public end: number; - - /** - * Creates a new Annotation instance using the specified properties. - * @param [properties] Properties to set - * @returns Annotation instance - */ - public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; - - /** - * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @param message SeekResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param message Annotation message or plain object to encode + * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. + * @param message SeekResponse message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an Annotation message from the specified reader or buffer. + * Decodes a SeekResponse message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Annotation + * @returns SeekResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekResponse; /** - * Decodes an Annotation message from the specified reader or buffer, length delimited. + * Decodes a SeekResponse message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Annotation + * @returns SeekResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekResponse; /** - * Verifies an Annotation message. + * Verifies a SeekResponse message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an Annotation message from a plain object. Also converts values to their respective internal types. + * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Annotation + * @returns SeekResponse */ - public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekResponse; /** - * Creates a plain object from an Annotation message. Also converts values to other types if specified. - * @param message Annotation + * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. + * @param message SeekResponse * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.pubsub.v1.SeekResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Annotation to JSON. + * Converts this SeekResponse to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } } + } - /** Properties of a Duration. */ - interface IDuration { + /** Namespace api. */ + namespace api { - /** Duration seconds */ - seconds?: (number|Long|string|null); + /** Properties of a Http. */ + interface IHttp { - /** Duration nanos */ - nanos?: (number|null); + /** Http rules */ + rules?: (google.api.IHttpRule[]|null); + + /** Http fullyDecodeReservedExpansion */ + fullyDecodeReservedExpansion?: (boolean|null); } - /** Represents a Duration. */ - class Duration implements IDuration { + /** Represents a Http. */ + class Http implements IHttp { /** - * Constructs a new Duration. + * Constructs a new Http. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.IDuration); + constructor(properties?: google.api.IHttp); - /** Duration seconds. */ - public seconds: (number|Long|string); + /** Http rules. */ + public rules: google.api.IHttpRule[]; - /** Duration nanos. */ - public nanos: number; + /** Http fullyDecodeReservedExpansion. */ + public fullyDecodeReservedExpansion: boolean; /** - * Creates a new Duration instance using the specified properties. + * Creates a new Http instance using the specified properties. * @param [properties] Properties to set - * @returns Duration instance + * @returns Http instance */ - public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; + public static create(properties?: google.api.IHttp): google.api.Http; /** - * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @param message Duration message or plain object to encode + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @param message Duration message or plain object to encode + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @param message Http message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.api.IHttp, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Duration message from the specified reader or buffer. + * Decodes a Http message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Duration + * @returns Http * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Http; /** - * Decodes a Duration message from the specified reader or buffer, length delimited. + * Decodes a Http message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Duration + * @returns Http * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Http; /** - * Verifies a Duration message. + * Verifies a Http message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * Creates a Http message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Duration + * @returns Http */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; + public static fromObject(object: { [k: string]: any }): google.api.Http; /** - * Creates a plain object from a Duration message. Also converts values to other types if specified. - * @param message Duration + * Creates a plain object from a Http message. Also converts values to other types if specified. + * @param message Http * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.api.Http, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Duration to JSON. + * Converts this Http to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of an Empty. */ - interface IEmpty { - } + /** Properties of a HttpRule. */ + interface IHttpRule { - /** Represents an Empty. */ - class Empty implements IEmpty { + /** HttpRule selector */ + selector?: (string|null); - /** - * Constructs a new Empty. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IEmpty); + /** HttpRule get */ + get?: (string|null); - /** - * Creates a new Empty instance using the specified properties. - * @param [properties] Properties to set - * @returns Empty instance - */ - public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; + /** HttpRule put */ + put?: (string|null); - /** - * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @param message Empty message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + /** HttpRule post */ + post?: (string|null); - /** - * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @param message Empty message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; + /** HttpRule delete */ + "delete"?: (string|null); - /** - * Decodes an Empty message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; + /** HttpRule patch */ + patch?: (string|null); - /** - * Decodes an Empty message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; + /** HttpRule custom */ + custom?: (google.api.ICustomHttpPattern|null); - /** - * Verifies an Empty message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** HttpRule body */ + body?: (string|null); - /** - * Creates an Empty message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Empty - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; + /** HttpRule responseBody */ + responseBody?: (string|null); - /** - * Creates a plain object from an Empty message. Also converts values to other types if specified. - * @param message Empty - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** HttpRule additionalBindings */ + additionalBindings?: (google.api.IHttpRule[]|null); + } + + /** Represents a HttpRule. */ + class HttpRule implements IHttpRule { /** - * Converts this Empty to JSON. - * @returns JSON object + * Constructs a new HttpRule. + * @param [properties] Properties to set */ - public toJSON(): { [k: string]: any }; - } + constructor(properties?: google.api.IHttpRule); - /** Properties of a FieldMask. */ - interface IFieldMask { + /** HttpRule selector. */ + public selector: string; - /** FieldMask paths */ - paths?: (string[]|null); - } + /** HttpRule get. */ + public get: string; - /** Represents a FieldMask. */ - class FieldMask implements IFieldMask { + /** HttpRule put. */ + public put: string; - /** - * Constructs a new FieldMask. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IFieldMask); + /** HttpRule post. */ + public post: string; - /** FieldMask paths. */ - public paths: string[]; + /** HttpRule delete. */ + public delete: string; + + /** HttpRule patch. */ + public patch: string; + + /** HttpRule custom. */ + public custom?: (google.api.ICustomHttpPattern|null); + + /** HttpRule body. */ + public body: string; + + /** HttpRule responseBody. */ + public responseBody: string; + + /** HttpRule additionalBindings. */ + public additionalBindings: google.api.IHttpRule[]; + + /** HttpRule pattern. */ + public pattern?: ("get"|"put"|"post"|"delete"|"patch"|"custom"); /** - * Creates a new FieldMask instance using the specified properties. + * Creates a new HttpRule instance using the specified properties. * @param [properties] Properties to set - * @returns FieldMask instance + * @returns HttpRule instance */ - public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; + public static create(properties?: google.api.IHttpRule): google.api.HttpRule; /** - * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @param message FieldMask message or plain object to encode + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @param message FieldMask message or plain object to encode + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @param message HttpRule message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.api.IHttpRule, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a FieldMask message from the specified reader or buffer. + * Decodes a HttpRule message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns FieldMask + * @returns HttpRule * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.HttpRule; /** - * Decodes a FieldMask message from the specified reader or buffer, length delimited. + * Decodes a HttpRule message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns FieldMask + * @returns HttpRule * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.HttpRule; /** - * Verifies a FieldMask message. + * Verifies a HttpRule message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns FieldMask + * @returns HttpRule */ - public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; + public static fromObject(object: { [k: string]: any }): google.api.HttpRule; /** - * Creates a plain object from a FieldMask message. Also converts values to other types if specified. - * @param message FieldMask + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * @param message HttpRule * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.api.HttpRule, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this FieldMask to JSON. + * Converts this HttpRule to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of a Timestamp. */ - interface ITimestamp { + /** Properties of a CustomHttpPattern. */ + interface ICustomHttpPattern { - /** Timestamp seconds */ - seconds?: (number|Long|string|null); + /** CustomHttpPattern kind */ + kind?: (string|null); - /** Timestamp nanos */ - nanos?: (number|null); + /** CustomHttpPattern path */ + path?: (string|null); } - /** Represents a Timestamp. */ - class Timestamp implements ITimestamp { + /** Represents a CustomHttpPattern. */ + class CustomHttpPattern implements ICustomHttpPattern { /** - * Constructs a new Timestamp. + * Constructs a new CustomHttpPattern. * @param [properties] Properties to set */ - constructor(properties?: google.protobuf.ITimestamp); + constructor(properties?: google.api.ICustomHttpPattern); - /** Timestamp seconds. */ - public seconds: (number|Long|string); + /** CustomHttpPattern kind. */ + public kind: string; - /** Timestamp nanos. */ - public nanos: number; + /** CustomHttpPattern path. */ + public path: string; /** - * Creates a new Timestamp instance using the specified properties. + * Creates a new CustomHttpPattern instance using the specified properties. * @param [properties] Properties to set - * @returns Timestamp instance + * @returns CustomHttpPattern instance */ - public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; + public static create(properties?: google.api.ICustomHttpPattern): google.api.CustomHttpPattern; /** - * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @param message Timestamp message or plain object to encode + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @param message Timestamp message or plain object to encode + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @param message CustomHttpPattern message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.api.ICustomHttpPattern, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a Timestamp message from the specified reader or buffer. + * Decodes a CustomHttpPattern message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns Timestamp + * @returns CustomHttpPattern * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CustomHttpPattern; /** - * Decodes a Timestamp message from the specified reader or buffer, length delimited. + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns Timestamp + * @returns CustomHttpPattern * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CustomHttpPattern; /** - * Verifies a Timestamp message. + * Verifies a CustomHttpPattern message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns Timestamp + * @returns CustomHttpPattern */ - public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; + public static fromObject(object: { [k: string]: any }): google.api.CustomHttpPattern; /** - * Creates a plain object from a Timestamp message. Also converts values to other types if specified. - * @param message Timestamp + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * @param message CustomHttpPattern * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.api.CustomHttpPattern, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this Timestamp to JSON. + * Converts this CustomHttpPattern to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - } - /** Namespace pubsub. */ - namespace pubsub { + /** FieldBehavior enum. */ + enum FieldBehavior { + FIELD_BEHAVIOR_UNSPECIFIED = 0, + OPTIONAL = 1, + REQUIRED = 2, + OUTPUT_ONLY = 3, + INPUT_ONLY = 4, + IMMUTABLE = 5 + } - /** Namespace v1. */ - namespace v1 { + /** Properties of a ResourceDescriptor. */ + interface IResourceDescriptor { - /** Represents a Publisher */ - class Publisher extends $protobuf.rpc.Service { + /** ResourceDescriptor type */ + type?: (string|null); - /** - * Constructs a new Publisher service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + /** ResourceDescriptor pattern */ + pattern?: (string[]|null); - /** - * Creates new Publisher service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Publisher; + /** ResourceDescriptor nameField */ + nameField?: (string|null); - /** - * Calls CreateTopic. - * @param request Topic message or plain object - * @param callback Node-style callback called with the error, if any, and Topic - */ - public createTopic(request: google.pubsub.v1.ITopic, callback: google.pubsub.v1.Publisher.CreateTopicCallback): void; + /** ResourceDescriptor history */ + history?: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History|null); - /** - * Calls CreateTopic. - * @param request Topic message or plain object - * @returns Promise - */ - public createTopic(request: google.pubsub.v1.ITopic): Promise; + /** ResourceDescriptor plural */ + plural?: (string|null); - /** - * Calls UpdateTopic. - * @param request UpdateTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Topic - */ - public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest, callback: google.pubsub.v1.Publisher.UpdateTopicCallback): void; + /** ResourceDescriptor singular */ + singular?: (string|null); + } - /** - * Calls UpdateTopic. - * @param request UpdateTopicRequest message or plain object - * @returns Promise - */ - public updateTopic(request: google.pubsub.v1.IUpdateTopicRequest): Promise; + /** Represents a ResourceDescriptor. */ + class ResourceDescriptor implements IResourceDescriptor { - /** - * Calls Publish. - * @param request PublishRequest message or plain object - * @param callback Node-style callback called with the error, if any, and PublishResponse - */ - public publish(request: google.pubsub.v1.IPublishRequest, callback: google.pubsub.v1.Publisher.PublishCallback): void; + /** + * Constructs a new ResourceDescriptor. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IResourceDescriptor); - /** - * Calls Publish. - * @param request PublishRequest message or plain object - * @returns Promise - */ - public publish(request: google.pubsub.v1.IPublishRequest): Promise; + /** ResourceDescriptor type. */ + public type: string; - /** - * Calls GetTopic. - * @param request GetTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Topic - */ - public getTopic(request: google.pubsub.v1.IGetTopicRequest, callback: google.pubsub.v1.Publisher.GetTopicCallback): void; + /** ResourceDescriptor pattern. */ + public pattern: string[]; - /** - * Calls GetTopic. - * @param request GetTopicRequest message or plain object - * @returns Promise - */ - public getTopic(request: google.pubsub.v1.IGetTopicRequest): Promise; + /** ResourceDescriptor nameField. */ + public nameField: string; - /** - * Calls ListTopics. - * @param request ListTopicsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicsResponse - */ - public listTopics(request: google.pubsub.v1.IListTopicsRequest, callback: google.pubsub.v1.Publisher.ListTopicsCallback): void; + /** ResourceDescriptor history. */ + public history: (google.api.ResourceDescriptor.History|keyof typeof google.api.ResourceDescriptor.History); - /** - * Calls ListTopics. - * @param request ListTopicsRequest message or plain object - * @returns Promise - */ - public listTopics(request: google.pubsub.v1.IListTopicsRequest): Promise; + /** ResourceDescriptor plural. */ + public plural: string; - /** - * Calls ListTopicSubscriptions. - * @param request ListTopicSubscriptionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse - */ - public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest, callback: google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback): void; + /** ResourceDescriptor singular. */ + public singular: string; - /** - * Calls ListTopicSubscriptions. - * @param request ListTopicSubscriptionsRequest message or plain object - * @returns Promise - */ - public listTopicSubscriptions(request: google.pubsub.v1.IListTopicSubscriptionsRequest): Promise; + /** + * Creates a new ResourceDescriptor instance using the specified properties. + * @param [properties] Properties to set + * @returns ResourceDescriptor instance + */ + public static create(properties?: google.api.IResourceDescriptor): google.api.ResourceDescriptor; - /** - * Calls ListTopicSnapshots. - * @param request ListTopicSnapshotsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse - */ - public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest, callback: google.pubsub.v1.Publisher.ListTopicSnapshotsCallback): void; + /** + * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @param message ResourceDescriptor message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Calls ListTopicSnapshots. - * @param request ListTopicSnapshotsRequest message or plain object - * @returns Promise - */ - public listTopicSnapshots(request: google.pubsub.v1.IListTopicSnapshotsRequest): Promise; + /** + * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @param message ResourceDescriptor message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IResourceDescriptor, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Calls DeleteTopic. - * @param request DeleteTopicRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest, callback: google.pubsub.v1.Publisher.DeleteTopicCallback): void; + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceDescriptor; - /** - * Calls DeleteTopic. - * @param request DeleteTopicRequest message or plain object - * @returns Promise - */ - public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest): Promise; - } + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceDescriptor; - namespace Publisher { + /** + * Verifies a ResourceDescriptor message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. - * @param error Error, if any - * @param [response] Topic - */ - type CreateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + /** + * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ResourceDescriptor + */ + public static fromObject(object: { [k: string]: any }): google.api.ResourceDescriptor; - /** - * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. - * @param error Error, if any - * @param [response] Topic - */ - type UpdateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + /** + * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. + * @param message ResourceDescriptor + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ResourceDescriptor, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Callback as used by {@link google.pubsub.v1.Publisher#publish}. - * @param error Error, if any - * @param [response] PublishResponse - */ - type PublishCallback = (error: (Error|null), response?: google.pubsub.v1.PublishResponse) => void; + /** + * Converts this ResourceDescriptor to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. - * @param error Error, if any - * @param [response] Topic - */ - type GetTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; + namespace ResourceDescriptor { - /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. - * @param error Error, if any - * @param [response] ListTopicsResponse - */ - type ListTopicsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicsResponse) => void; + /** History enum. */ + enum History { + HISTORY_UNSPECIFIED = 0, + ORIGINALLY_SINGLE_PATTERN = 1, + FUTURE_MULTI_PATTERN = 2 + } + } - /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. - * @param error Error, if any - * @param [response] ListTopicSubscriptionsResponse - */ - type ListTopicSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSubscriptionsResponse) => void; + /** Properties of a ResourceReference. */ + interface IResourceReference { - /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. - * @param error Error, if any - * @param [response] ListTopicSnapshotsResponse - */ - type ListTopicSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSnapshotsResponse) => void; + /** ResourceReference type */ + type?: (string|null); - /** - * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; - } + /** ResourceReference childType */ + childType?: (string|null); + } - /** Properties of a MessageStoragePolicy. */ - interface IMessageStoragePolicy { + /** Represents a ResourceReference. */ + class ResourceReference implements IResourceReference { - /** MessageStoragePolicy allowedPersistenceRegions */ - allowedPersistenceRegions?: (string[]|null); - } + /** + * Constructs a new ResourceReference. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IResourceReference); - /** Represents a MessageStoragePolicy. */ - class MessageStoragePolicy implements IMessageStoragePolicy { + /** ResourceReference type. */ + public type: string; - /** - * Constructs a new MessageStoragePolicy. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IMessageStoragePolicy); + /** ResourceReference childType. */ + public childType: string; - /** MessageStoragePolicy allowedPersistenceRegions. */ - public allowedPersistenceRegions: string[]; + /** + * Creates a new ResourceReference instance using the specified properties. + * @param [properties] Properties to set + * @returns ResourceReference instance + */ + public static create(properties?: google.api.IResourceReference): google.api.ResourceReference; - /** - * Creates a new MessageStoragePolicy instance using the specified properties. - * @param [properties] Properties to set - * @returns MessageStoragePolicy instance - */ - public static create(properties?: google.pubsub.v1.IMessageStoragePolicy): google.pubsub.v1.MessageStoragePolicy; + /** + * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @param message ResourceReference message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @param message MessageStoragePolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @param message ResourceReference message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IResourceReference, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. - * @param message MessageStoragePolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IMessageStoragePolicy, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a ResourceReference message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ResourceReference; - /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MessageStoragePolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageStoragePolicy; + /** + * Decodes a ResourceReference message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ResourceReference; - /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MessageStoragePolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageStoragePolicy; + /** + * Verifies a ResourceReference message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Verifies a MessageStoragePolicy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ResourceReference + */ + public static fromObject(object: { [k: string]: any }): google.api.ResourceReference; - /** - * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MessageStoragePolicy - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageStoragePolicy; + /** + * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. + * @param message ResourceReference + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ResourceReference, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. - * @param message MessageStoragePolicy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.MessageStoragePolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Converts this ResourceReference to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } - /** - * Converts this MessageStoragePolicy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Namespace protobuf. */ + namespace protobuf { - /** Properties of a Topic. */ - interface ITopic { + /** Properties of a FileDescriptorSet. */ + interface IFileDescriptorSet { - /** Topic name */ - name?: (string|null); + /** FileDescriptorSet file */ + file?: (google.protobuf.IFileDescriptorProto[]|null); + } - /** Topic labels */ - labels?: ({ [k: string]: string }|null); + /** Represents a FileDescriptorSet. */ + class FileDescriptorSet implements IFileDescriptorSet { - /** Topic messageStoragePolicy */ - messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + /** + * Constructs a new FileDescriptorSet. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorSet); - /** Topic kmsKeyName */ - kmsKeyName?: (string|null); - } + /** FileDescriptorSet file. */ + public file: google.protobuf.IFileDescriptorProto[]; - /** Represents a Topic. */ - class Topic implements ITopic { + /** + * Creates a new FileDescriptorSet instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorSet instance + */ + public static create(properties?: google.protobuf.IFileDescriptorSet): google.protobuf.FileDescriptorSet; - /** - * Constructs a new Topic. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ITopic); + /** + * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; - /** Topic name. */ - public name: string; + /** + * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @param message FileDescriptorSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorSet, writer?: $protobuf.Writer): $protobuf.Writer; - /** Topic labels. */ - public labels: { [k: string]: string }; + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; - /** Topic messageStoragePolicy. */ - public messageStoragePolicy?: (google.pubsub.v1.IMessageStoragePolicy|null); + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; - /** Topic kmsKeyName. */ - public kmsKeyName: string; + /** + * Verifies a FileDescriptorSet message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a new Topic instance using the specified properties. - * @param [properties] Properties to set - * @returns Topic instance - */ - public static create(properties?: google.pubsub.v1.ITopic): google.pubsub.v1.Topic; - - /** - * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. - * @param message Topic message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorSet + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorSet; - /** - * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. - * @param message Topic message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ITopic, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. + * @param message FileDescriptorSet + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Decodes a Topic message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Topic - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Topic; + /** + * Converts this FileDescriptorSet to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Decodes a Topic message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Topic - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Topic; + /** Properties of a FileDescriptorProto. */ + interface IFileDescriptorProto { - /** - * Verifies a Topic message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** FileDescriptorProto name */ + name?: (string|null); - /** - * Creates a Topic message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Topic - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Topic; + /** FileDescriptorProto package */ + "package"?: (string|null); - /** - * Creates a plain object from a Topic message. Also converts values to other types if specified. - * @param message Topic - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.Topic, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** FileDescriptorProto dependency */ + dependency?: (string[]|null); - /** - * Converts this Topic to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FileDescriptorProto publicDependency */ + publicDependency?: (number[]|null); - /** Properties of a PubsubMessage. */ - interface IPubsubMessage { + /** FileDescriptorProto weakDependency */ + weakDependency?: (number[]|null); - /** PubsubMessage data */ - data?: (Uint8Array|string|null); + /** FileDescriptorProto messageType */ + messageType?: (google.protobuf.IDescriptorProto[]|null); - /** PubsubMessage attributes */ - attributes?: ({ [k: string]: string }|null); + /** FileDescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); - /** PubsubMessage messageId */ - messageId?: (string|null); + /** FileDescriptorProto service */ + service?: (google.protobuf.IServiceDescriptorProto[]|null); - /** PubsubMessage publishTime */ - publishTime?: (google.protobuf.ITimestamp|null); + /** FileDescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); - /** PubsubMessage orderingKey */ - orderingKey?: (string|null); - } + /** FileDescriptorProto options */ + options?: (google.protobuf.IFileOptions|null); - /** Represents a PubsubMessage. */ - class PubsubMessage implements IPubsubMessage { + /** FileDescriptorProto sourceCodeInfo */ + sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); - /** - * Constructs a new PubsubMessage. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPubsubMessage); + /** FileDescriptorProto syntax */ + syntax?: (string|null); + } - /** PubsubMessage data. */ - public data: (Uint8Array|string); + /** Represents a FileDescriptorProto. */ + class FileDescriptorProto implements IFileDescriptorProto { - /** PubsubMessage attributes. */ - public attributes: { [k: string]: string }; + /** + * Constructs a new FileDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileDescriptorProto); - /** PubsubMessage messageId. */ - public messageId: string; + /** FileDescriptorProto name. */ + public name: string; - /** PubsubMessage publishTime. */ - public publishTime?: (google.protobuf.ITimestamp|null); + /** FileDescriptorProto package. */ + public package: string; - /** PubsubMessage orderingKey. */ - public orderingKey: string; + /** FileDescriptorProto dependency. */ + public dependency: string[]; - /** - * Creates a new PubsubMessage instance using the specified properties. - * @param [properties] Properties to set - * @returns PubsubMessage instance - */ - public static create(properties?: google.pubsub.v1.IPubsubMessage): google.pubsub.v1.PubsubMessage; + /** FileDescriptorProto publicDependency. */ + public publicDependency: number[]; - /** - * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. - * @param message PubsubMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + /** FileDescriptorProto weakDependency. */ + public weakDependency: number[]; - /** - * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. - * @param message PubsubMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPubsubMessage, writer?: $protobuf.Writer): $protobuf.Writer; + /** FileDescriptorProto messageType. */ + public messageType: google.protobuf.IDescriptorProto[]; - /** - * Decodes a PubsubMessage message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PubsubMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PubsubMessage; + /** FileDescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; - /** - * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PubsubMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PubsubMessage; + /** FileDescriptorProto service. */ + public service: google.protobuf.IServiceDescriptorProto[]; - /** - * Verifies a PubsubMessage message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** FileDescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; - /** - * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PubsubMessage - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PubsubMessage; + /** FileDescriptorProto options. */ + public options?: (google.protobuf.IFileOptions|null); - /** - * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. - * @param message PubsubMessage - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PubsubMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** FileDescriptorProto sourceCodeInfo. */ + public sourceCodeInfo?: (google.protobuf.ISourceCodeInfo|null); - /** - * Converts this PubsubMessage to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FileDescriptorProto syntax. */ + public syntax: string; - /** Properties of a GetTopicRequest. */ - interface IGetTopicRequest { + /** + * Creates a new FileDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FileDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFileDescriptorProto): google.protobuf.FileDescriptorProto; - /** GetTopicRequest topic */ - topic?: (string|null); - } + /** + * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** Represents a GetTopicRequest. */ - class GetTopicRequest implements IGetTopicRequest { + /** + * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @param message FileDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Constructs a new GetTopicRequest. + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; + + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; + + /** + * Verifies a FileDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileDescriptorProto; + + /** + * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. + * @param message FileDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FileDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DescriptorProto. */ + interface IDescriptorProto { + + /** DescriptorProto name */ + name?: (string|null); + + /** DescriptorProto field */ + field?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** DescriptorProto extension */ + extension?: (google.protobuf.IFieldDescriptorProto[]|null); + + /** DescriptorProto nestedType */ + nestedType?: (google.protobuf.IDescriptorProto[]|null); + + /** DescriptorProto enumType */ + enumType?: (google.protobuf.IEnumDescriptorProto[]|null); + + /** DescriptorProto extensionRange */ + extensionRange?: (google.protobuf.DescriptorProto.IExtensionRange[]|null); + + /** DescriptorProto oneofDecl */ + oneofDecl?: (google.protobuf.IOneofDescriptorProto[]|null); + + /** DescriptorProto options */ + options?: (google.protobuf.IMessageOptions|null); + + /** DescriptorProto reservedRange */ + reservedRange?: (google.protobuf.DescriptorProto.IReservedRange[]|null); + + /** DescriptorProto reservedName */ + reservedName?: (string[]|null); + } + + /** Represents a DescriptorProto. */ + class DescriptorProto implements IDescriptorProto { + + /** + * Constructs a new DescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDescriptorProto); + + /** DescriptorProto name. */ + public name: string; + + /** DescriptorProto field. */ + public field: google.protobuf.IFieldDescriptorProto[]; + + /** DescriptorProto extension. */ + public extension: google.protobuf.IFieldDescriptorProto[]; + + /** DescriptorProto nestedType. */ + public nestedType: google.protobuf.IDescriptorProto[]; + + /** DescriptorProto enumType. */ + public enumType: google.protobuf.IEnumDescriptorProto[]; + + /** DescriptorProto extensionRange. */ + public extensionRange: google.protobuf.DescriptorProto.IExtensionRange[]; + + /** DescriptorProto oneofDecl. */ + public oneofDecl: google.protobuf.IOneofDescriptorProto[]; + + /** DescriptorProto options. */ + public options?: (google.protobuf.IMessageOptions|null); + + /** DescriptorProto reservedRange. */ + public reservedRange: google.protobuf.DescriptorProto.IReservedRange[]; + + /** DescriptorProto reservedName. */ + public reservedName: string[]; + + /** + * Creates a new DescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns DescriptorProto instance + */ + public static create(properties?: google.protobuf.IDescriptorProto): google.protobuf.DescriptorProto; + + /** + * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @param message DescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; + + /** + * Verifies a DescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto; + + /** + * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * @param message DescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.DescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace DescriptorProto { + + /** Properties of an ExtensionRange. */ + interface IExtensionRange { + + /** ExtensionRange start */ + start?: (number|null); + + /** ExtensionRange end */ + end?: (number|null); + + /** ExtensionRange options */ + options?: (google.protobuf.IExtensionRangeOptions|null); + } + + /** Represents an ExtensionRange. */ + class ExtensionRange implements IExtensionRange { + + /** + * Constructs a new ExtensionRange. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IGetTopicRequest); + constructor(properties?: google.protobuf.DescriptorProto.IExtensionRange); - /** GetTopicRequest topic. */ - public topic: string; + /** ExtensionRange start. */ + public start: number; + + /** ExtensionRange end. */ + public end: number; + + /** ExtensionRange options. */ + public options?: (google.protobuf.IExtensionRangeOptions|null); /** - * Creates a new GetTopicRequest instance using the specified properties. + * Creates a new ExtensionRange instance using the specified properties. * @param [properties] Properties to set - * @returns GetTopicRequest instance + * @returns ExtensionRange instance */ - public static create(properties?: google.pubsub.v1.IGetTopicRequest): google.pubsub.v1.GetTopicRequest; + public static create(properties?: google.protobuf.DescriptorProto.IExtensionRange): google.protobuf.DescriptorProto.ExtensionRange; /** - * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. - * @param message GetTopicRequest message or plain object to encode + * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. - * @param message GetTopicRequest message or plain object to encode + * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * @param message ExtensionRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IGetTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.DescriptorProto.IExtensionRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a GetTopicRequest message from the specified reader or buffer. + * Decodes an ExtensionRange message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns GetTopicRequest + * @returns ExtensionRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetTopicRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; /** - * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns GetTopicRequest + * @returns ExtensionRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetTopicRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; /** - * Verifies a GetTopicRequest message. + * Verifies an ExtensionRange message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns GetTopicRequest + * @returns ExtensionRange */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetTopicRequest; + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ExtensionRange; /** - * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. - * @param message GetTopicRequest + * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. + * @param message ExtensionRange * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.GetTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.DescriptorProto.ExtensionRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this GetTopicRequest to JSON. + * Converts this ExtensionRange to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } - /** Properties of an UpdateTopicRequest. */ - interface IUpdateTopicRequest { + /** Properties of a ReservedRange. */ + interface IReservedRange { - /** UpdateTopicRequest topic */ - topic?: (google.pubsub.v1.ITopic|null); + /** ReservedRange start */ + start?: (number|null); - /** UpdateTopicRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); + /** ReservedRange end */ + end?: (number|null); } - /** Represents an UpdateTopicRequest. */ - class UpdateTopicRequest implements IUpdateTopicRequest { + /** Represents a ReservedRange. */ + class ReservedRange implements IReservedRange { /** - * Constructs a new UpdateTopicRequest. + * Constructs a new ReservedRange. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IUpdateTopicRequest); + constructor(properties?: google.protobuf.DescriptorProto.IReservedRange); - /** UpdateTopicRequest topic. */ - public topic?: (google.pubsub.v1.ITopic|null); + /** ReservedRange start. */ + public start: number; - /** UpdateTopicRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); + /** ReservedRange end. */ + public end: number; /** - * Creates a new UpdateTopicRequest instance using the specified properties. + * Creates a new ReservedRange instance using the specified properties. * @param [properties] Properties to set - * @returns UpdateTopicRequest instance + * @returns ReservedRange instance */ - public static create(properties?: google.pubsub.v1.IUpdateTopicRequest): google.pubsub.v1.UpdateTopicRequest; + public static create(properties?: google.protobuf.DescriptorProto.IReservedRange): google.protobuf.DescriptorProto.ReservedRange; /** - * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. - * @param message UpdateTopicRequest message or plain object to encode + * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. - * @param message UpdateTopicRequest message or plain object to encode + * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * @param message ReservedRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.DescriptorProto.IReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * Decodes a ReservedRange message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns UpdateTopicRequest + * @returns ReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateTopicRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * Decodes a ReservedRange message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns UpdateTopicRequest + * @returns ReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateTopicRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; /** - * Verifies an UpdateTopicRequest message. + * Verifies a ReservedRange message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns UpdateTopicRequest + * @returns ReservedRange */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateTopicRequest; + public static fromObject(object: { [k: string]: any }): google.protobuf.DescriptorProto.ReservedRange; /** - * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. - * @param message UpdateTopicRequest + * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. + * @param message ReservedRange * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.UpdateTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.DescriptorProto.ReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this UpdateTopicRequest to JSON. + * Converts this ReservedRange to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of a PublishRequest. */ - interface IPublishRequest { + /** Properties of an ExtensionRangeOptions. */ + interface IExtensionRangeOptions { - /** PublishRequest topic */ - topic?: (string|null); + /** ExtensionRangeOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } - /** PublishRequest messages */ - messages?: (google.pubsub.v1.IPubsubMessage[]|null); - } + /** Represents an ExtensionRangeOptions. */ + class ExtensionRangeOptions implements IExtensionRangeOptions { - /** Represents a PublishRequest. */ - class PublishRequest implements IPublishRequest { + /** + * Constructs a new ExtensionRangeOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IExtensionRangeOptions); - /** - * Constructs a new PublishRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPublishRequest); + /** ExtensionRangeOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** PublishRequest topic. */ - public topic: string; + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRangeOptions instance + */ + public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; - /** PublishRequest messages. */ - public messages: google.pubsub.v1.IPubsubMessage[]; + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new PublishRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns PublishRequest instance - */ - public static create(properties?: google.pubsub.v1.IPublishRequest): google.pubsub.v1.PublishRequest; + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. - * @param message PublishRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; - /** - * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. - * @param message PublishRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPublishRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; - /** - * Decodes a PublishRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PublishRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishRequest; + /** + * Verifies an ExtensionRangeOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a PublishRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PublishRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishRequest; + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRangeOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; - /** - * Verifies a PublishRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @param message ExtensionRangeOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PublishRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishRequest; + /** + * Converts this ExtensionRangeOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. - * @param message PublishRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PublishRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Properties of a FieldDescriptorProto. */ + interface IFieldDescriptorProto { - /** - * Converts this PublishRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FieldDescriptorProto name */ + name?: (string|null); - /** Properties of a PublishResponse. */ - interface IPublishResponse { + /** FieldDescriptorProto number */ + number?: (number|null); - /** PublishResponse messageIds */ - messageIds?: (string[]|null); - } + /** FieldDescriptorProto label */ + label?: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label|null); - /** Represents a PublishResponse. */ - class PublishResponse implements IPublishResponse { + /** FieldDescriptorProto type */ + type?: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type|null); - /** - * Constructs a new PublishResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPublishResponse); + /** FieldDescriptorProto typeName */ + typeName?: (string|null); - /** PublishResponse messageIds. */ - public messageIds: string[]; + /** FieldDescriptorProto extendee */ + extendee?: (string|null); - /** - * Creates a new PublishResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns PublishResponse instance - */ - public static create(properties?: google.pubsub.v1.IPublishResponse): google.pubsub.v1.PublishResponse; + /** FieldDescriptorProto defaultValue */ + defaultValue?: (string|null); - /** - * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. - * @param message PublishResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** FieldDescriptorProto oneofIndex */ + oneofIndex?: (number|null); - /** - * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. - * @param message PublishResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPublishResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** FieldDescriptorProto jsonName */ + jsonName?: (string|null); - /** - * Decodes a PublishResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PublishResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PublishResponse; + /** FieldDescriptorProto options */ + options?: (google.protobuf.IFieldOptions|null); + } - /** - * Decodes a PublishResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PublishResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PublishResponse; + /** Represents a FieldDescriptorProto. */ + class FieldDescriptorProto implements IFieldDescriptorProto { - /** - * Verifies a PublishResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Constructs a new FieldDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldDescriptorProto); - /** - * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PublishResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PublishResponse; + /** FieldDescriptorProto name. */ + public name: string; - /** - * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. - * @param message PublishResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PublishResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** FieldDescriptorProto number. */ + public number: number; - /** - * Converts this PublishResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FieldDescriptorProto label. */ + public label: (google.protobuf.FieldDescriptorProto.Label|keyof typeof google.protobuf.FieldDescriptorProto.Label); - /** Properties of a ListTopicsRequest. */ - interface IListTopicsRequest { + /** FieldDescriptorProto type. */ + public type: (google.protobuf.FieldDescriptorProto.Type|keyof typeof google.protobuf.FieldDescriptorProto.Type); - /** ListTopicsRequest project */ - project?: (string|null); + /** FieldDescriptorProto typeName. */ + public typeName: string; - /** ListTopicsRequest pageSize */ - pageSize?: (number|null); + /** FieldDescriptorProto extendee. */ + public extendee: string; - /** ListTopicsRequest pageToken */ - pageToken?: (string|null); - } + /** FieldDescriptorProto defaultValue. */ + public defaultValue: string; - /** Represents a ListTopicsRequest. */ - class ListTopicsRequest implements IListTopicsRequest { + /** FieldDescriptorProto oneofIndex. */ + public oneofIndex: number; - /** - * Constructs a new ListTopicsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicsRequest); + /** FieldDescriptorProto jsonName. */ + public jsonName: string; - /** ListTopicsRequest project. */ - public project: string; + /** FieldDescriptorProto options. */ + public options?: (google.protobuf.IFieldOptions|null); - /** ListTopicsRequest pageSize. */ - public pageSize: number; + /** + * Creates a new FieldDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldDescriptorProto instance + */ + public static create(properties?: google.protobuf.IFieldDescriptorProto): google.protobuf.FieldDescriptorProto; - /** ListTopicsRequest pageToken. */ - public pageToken: string; + /** + * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new ListTopicsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListTopicsRequest): google.pubsub.v1.ListTopicsRequest; + /** + * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @param message FieldDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. - * @param message ListTopicsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; - /** - * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. - * @param message ListTopicsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; - /** - * Decodes a ListTopicsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsRequest; + /** + * Verifies a FieldDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsRequest; + /** + * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldDescriptorProto; - /** - * Verifies a ListTopicsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. + * @param message FieldDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsRequest; + /** + * Converts this FieldDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. - * @param message ListTopicsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + namespace FieldDescriptorProto { - /** - * Converts this ListTopicsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; + /** Type enum. */ + enum Type { + TYPE_DOUBLE = 1, + TYPE_FLOAT = 2, + TYPE_INT64 = 3, + TYPE_UINT64 = 4, + TYPE_INT32 = 5, + TYPE_FIXED64 = 6, + TYPE_FIXED32 = 7, + TYPE_BOOL = 8, + TYPE_STRING = 9, + TYPE_GROUP = 10, + TYPE_MESSAGE = 11, + TYPE_BYTES = 12, + TYPE_UINT32 = 13, + TYPE_ENUM = 14, + TYPE_SFIXED32 = 15, + TYPE_SFIXED64 = 16, + TYPE_SINT32 = 17, + TYPE_SINT64 = 18 } - /** Properties of a ListTopicsResponse. */ - interface IListTopicsResponse { - - /** ListTopicsResponse topics */ - topics?: (google.pubsub.v1.ITopic[]|null); - - /** ListTopicsResponse nextPageToken */ - nextPageToken?: (string|null); + /** Label enum. */ + enum Label { + LABEL_OPTIONAL = 1, + LABEL_REQUIRED = 2, + LABEL_REPEATED = 3 } + } - /** Represents a ListTopicsResponse. */ - class ListTopicsResponse implements IListTopicsResponse { + /** Properties of an OneofDescriptorProto. */ + interface IOneofDescriptorProto { - /** - * Constructs a new ListTopicsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicsResponse); + /** OneofDescriptorProto name */ + name?: (string|null); - /** ListTopicsResponse topics. */ - public topics: google.pubsub.v1.ITopic[]; + /** OneofDescriptorProto options */ + options?: (google.protobuf.IOneofOptions|null); + } - /** ListTopicsResponse nextPageToken. */ - public nextPageToken: string; + /** Represents an OneofDescriptorProto. */ + class OneofDescriptorProto implements IOneofDescriptorProto { - /** - * Creates a new ListTopicsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListTopicsResponse): google.pubsub.v1.ListTopicsResponse; + /** + * Constructs a new OneofDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofDescriptorProto); - /** - * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. - * @param message ListTopicsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** OneofDescriptorProto name. */ + public name: string; - /** - * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. - * @param message ListTopicsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** OneofDescriptorProto options. */ + public options?: (google.protobuf.IOneofOptions|null); - /** - * Decodes a ListTopicsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicsResponse; + /** + * Creates a new OneofDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofDescriptorProto instance + */ + public static create(properties?: google.protobuf.IOneofDescriptorProto): google.protobuf.OneofDescriptorProto; - /** - * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicsResponse; + /** + * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a ListTopicsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @param message OneofDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicsResponse; + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; - /** - * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. - * @param message ListTopicsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; - /** - * Converts this ListTopicsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Verifies an OneofDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Properties of a ListTopicSubscriptionsRequest. */ - interface IListTopicSubscriptionsRequest { + /** + * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofDescriptorProto; - /** ListTopicSubscriptionsRequest topic */ - topic?: (string|null); + /** + * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. + * @param message OneofDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** ListTopicSubscriptionsRequest pageSize */ - pageSize?: (number|null); + /** + * Converts this OneofDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** ListTopicSubscriptionsRequest pageToken */ - pageToken?: (string|null); - } + /** Properties of an EnumDescriptorProto. */ + interface IEnumDescriptorProto { - /** Represents a ListTopicSubscriptionsRequest. */ - class ListTopicSubscriptionsRequest implements IListTopicSubscriptionsRequest { + /** EnumDescriptorProto name */ + name?: (string|null); - /** - * Constructs a new ListTopicSubscriptionsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest); + /** EnumDescriptorProto value */ + value?: (google.protobuf.IEnumValueDescriptorProto[]|null); - /** ListTopicSubscriptionsRequest topic. */ - public topic: string; + /** EnumDescriptorProto options */ + options?: (google.protobuf.IEnumOptions|null); - /** ListTopicSubscriptionsRequest pageSize. */ - public pageSize: number; + /** EnumDescriptorProto reservedRange */ + reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); - /** ListTopicSubscriptionsRequest pageToken. */ - public pageToken: string; + /** EnumDescriptorProto reservedName */ + reservedName?: (string[]|null); + } - /** - * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSubscriptionsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsRequest): google.pubsub.v1.ListTopicSubscriptionsRequest; + /** Represents an EnumDescriptorProto. */ + class EnumDescriptorProto implements IEnumDescriptorProto { - /** - * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @param message ListTopicSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new EnumDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumDescriptorProto); - /** - * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. - * @param message ListTopicSubscriptionsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** EnumDescriptorProto name. */ + public name: string; - /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsRequest; + /** EnumDescriptorProto value. */ + public value: google.protobuf.IEnumValueDescriptorProto[]; - /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsRequest; + /** EnumDescriptorProto options. */ + public options?: (google.protobuf.IEnumOptions|null); - /** - * Verifies a ListTopicSubscriptionsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** EnumDescriptorProto reservedRange. */ + public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; - /** - * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSubscriptionsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsRequest; + /** EnumDescriptorProto reservedName. */ + public reservedName: string[]; - /** - * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. - * @param message ListTopicSubscriptionsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates a new EnumDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumDescriptorProto): google.protobuf.EnumDescriptorProto; - /** - * Converts this ListTopicSubscriptionsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a ListTopicSubscriptionsResponse. */ - interface IListTopicSubscriptionsResponse { + /** + * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @param message EnumDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** ListTopicSubscriptionsResponse subscriptions */ - subscriptions?: (string[]|null); + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; - /** ListTopicSubscriptionsResponse nextPageToken */ - nextPageToken?: (string|null); + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; + + /** + * Verifies an EnumDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto; + + /** + * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. + * @param message EnumDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace EnumDescriptorProto { + + /** Properties of an EnumReservedRange. */ + interface IEnumReservedRange { + + /** EnumReservedRange start */ + start?: (number|null); + + /** EnumReservedRange end */ + end?: (number|null); } - /** Represents a ListTopicSubscriptionsResponse. */ - class ListTopicSubscriptionsResponse implements IListTopicSubscriptionsResponse { + /** Represents an EnumReservedRange. */ + class EnumReservedRange implements IEnumReservedRange { /** - * Constructs a new ListTopicSubscriptionsResponse. + * Constructs a new EnumReservedRange. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse); + constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); - /** ListTopicSubscriptionsResponse subscriptions. */ - public subscriptions: string[]; + /** EnumReservedRange start. */ + public start: number; - /** ListTopicSubscriptionsResponse nextPageToken. */ - public nextPageToken: string; + /** EnumReservedRange end. */ + public end: number; /** - * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * Creates a new EnumReservedRange instance using the specified properties. * @param [properties] Properties to set - * @returns ListTopicSubscriptionsResponse instance + * @returns EnumReservedRange instance */ - public static create(properties?: google.pubsub.v1.IListTopicSubscriptionsResponse): google.pubsub.v1.ListTopicSubscriptionsResponse; + public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; /** - * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @param message ListTopicSubscriptionsResponse message or plain object to encode + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @param message ListTopicSubscriptionsResponse message or plain object to encode + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * Decodes an EnumReservedRange message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListTopicSubscriptionsResponse + * @returns EnumReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSubscriptionsResponse; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListTopicSubscriptionsResponse + * @returns EnumReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSubscriptionsResponse; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; /** - * Verifies a ListTopicSubscriptionsResponse message. + * Verifies an EnumReservedRange message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListTopicSubscriptionsResponse + * @returns EnumReservedRange */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSubscriptionsResponse; + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; /** - * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. - * @param message ListTopicSubscriptionsResponse + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * @param message EnumReservedRange * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListTopicSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListTopicSubscriptionsResponse to JSON. + * Converts this EnumReservedRange to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of a ListTopicSnapshotsRequest. */ - interface IListTopicSnapshotsRequest { + /** Properties of an EnumValueDescriptorProto. */ + interface IEnumValueDescriptorProto { - /** ListTopicSnapshotsRequest topic */ - topic?: (string|null); + /** EnumValueDescriptorProto name */ + name?: (string|null); - /** ListTopicSnapshotsRequest pageSize */ - pageSize?: (number|null); + /** EnumValueDescriptorProto number */ + number?: (number|null); - /** ListTopicSnapshotsRequest pageToken */ - pageToken?: (string|null); - } + /** EnumValueDescriptorProto options */ + options?: (google.protobuf.IEnumValueOptions|null); + } - /** Represents a ListTopicSnapshotsRequest. */ - class ListTopicSnapshotsRequest implements IListTopicSnapshotsRequest { + /** Represents an EnumValueDescriptorProto. */ + class EnumValueDescriptorProto implements IEnumValueDescriptorProto { - /** - * Constructs a new ListTopicSnapshotsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSnapshotsRequest); + /** + * Constructs a new EnumValueDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueDescriptorProto); - /** ListTopicSnapshotsRequest topic. */ - public topic: string; + /** EnumValueDescriptorProto name. */ + public name: string; - /** ListTopicSnapshotsRequest pageSize. */ - public pageSize: number; + /** EnumValueDescriptorProto number. */ + public number: number; - /** ListTopicSnapshotsRequest pageToken. */ - public pageToken: string; + /** EnumValueDescriptorProto options. */ + public options?: (google.protobuf.IEnumValueOptions|null); - /** - * Creates a new ListTopicSnapshotsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSnapshotsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSnapshotsRequest): google.pubsub.v1.ListTopicSnapshotsRequest; + /** + * Creates a new EnumValueDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueDescriptorProto instance + */ + public static create(properties?: google.protobuf.IEnumValueDescriptorProto): google.protobuf.EnumValueDescriptorProto; - /** - * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @param message ListTopicSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @param message ListTopicSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsRequest; + /** + * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @param message EnumValueDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsRequest; + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; - /** - * Verifies a ListTopicSnapshotsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; - /** - * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSnapshotsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsRequest; + /** + * Verifies an EnumValueDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. - * @param message ListTopicSnapshotsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueDescriptorProto; - /** - * Converts this ListTopicSnapshotsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. + * @param message EnumValueDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Properties of a ListTopicSnapshotsResponse. */ - interface IListTopicSnapshotsResponse { + /** + * Converts this EnumValueDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** ListTopicSnapshotsResponse snapshots */ - snapshots?: (string[]|null); + /** Properties of a ServiceDescriptorProto. */ + interface IServiceDescriptorProto { - /** ListTopicSnapshotsResponse nextPageToken */ - nextPageToken?: (string|null); - } + /** ServiceDescriptorProto name */ + name?: (string|null); - /** Represents a ListTopicSnapshotsResponse. */ - class ListTopicSnapshotsResponse implements IListTopicSnapshotsResponse { + /** ServiceDescriptorProto method */ + method?: (google.protobuf.IMethodDescriptorProto[]|null); - /** - * Constructs a new ListTopicSnapshotsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListTopicSnapshotsResponse); + /** ServiceDescriptorProto options */ + options?: (google.protobuf.IServiceOptions|null); + } - /** ListTopicSnapshotsResponse snapshots. */ - public snapshots: string[]; + /** Represents a ServiceDescriptorProto. */ + class ServiceDescriptorProto implements IServiceDescriptorProto { - /** ListTopicSnapshotsResponse nextPageToken. */ - public nextPageToken: string; + /** + * Constructs a new ServiceDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceDescriptorProto); - /** - * Creates a new ListTopicSnapshotsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListTopicSnapshotsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListTopicSnapshotsResponse): google.pubsub.v1.ListTopicSnapshotsResponse; + /** ServiceDescriptorProto name. */ + public name: string; - /** - * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @param message ListTopicSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** ServiceDescriptorProto method. */ + public method: google.protobuf.IMethodDescriptorProto[]; - /** - * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @param message ListTopicSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListTopicSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** ServiceDescriptorProto options. */ + public options?: (google.protobuf.IServiceOptions|null); - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListTopicSnapshotsResponse; + /** + * Creates a new ServiceDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceDescriptorProto instance + */ + public static create(properties?: google.protobuf.IServiceDescriptorProto): google.protobuf.ServiceDescriptorProto; - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListTopicSnapshotsResponse; + /** + * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a ListTopicSnapshotsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @param message ServiceDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListTopicSnapshotsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListTopicSnapshotsResponse; + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; - /** - * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. - * @param message ListTopicSnapshotsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListTopicSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; - /** - * Converts this ListTopicSnapshotsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Verifies a ServiceDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Properties of a DeleteTopicRequest. */ - interface IDeleteTopicRequest { + /** + * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceDescriptorProto; - /** DeleteTopicRequest topic */ - topic?: (string|null); - } + /** + * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. + * @param message ServiceDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents a DeleteTopicRequest. */ - class DeleteTopicRequest implements IDeleteTopicRequest { + /** + * Converts this ServiceDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new DeleteTopicRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeleteTopicRequest); + /** Properties of a MethodDescriptorProto. */ + interface IMethodDescriptorProto { - /** DeleteTopicRequest topic. */ - public topic: string; + /** MethodDescriptorProto name */ + name?: (string|null); - /** - * Creates a new DeleteTopicRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteTopicRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteTopicRequest): google.pubsub.v1.DeleteTopicRequest; + /** MethodDescriptorProto inputType */ + inputType?: (string|null); - /** - * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @param message DeleteTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** MethodDescriptorProto outputType */ + outputType?: (string|null); - /** - * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @param message DeleteTopicRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteTopicRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** MethodDescriptorProto options */ + options?: (google.protobuf.IMethodOptions|null); - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteTopicRequest; + /** MethodDescriptorProto clientStreaming */ + clientStreaming?: (boolean|null); - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteTopicRequest; + /** MethodDescriptorProto serverStreaming */ + serverStreaming?: (boolean|null); + } - /** - * Verifies a DeleteTopicRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Represents a MethodDescriptorProto. */ + class MethodDescriptorProto implements IMethodDescriptorProto { - /** - * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteTopicRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteTopicRequest; + /** + * Constructs a new MethodDescriptorProto. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodDescriptorProto); - /** - * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. - * @param message DeleteTopicRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeleteTopicRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** MethodDescriptorProto name. */ + public name: string; - /** - * Converts this DeleteTopicRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** MethodDescriptorProto inputType. */ + public inputType: string; - /** Represents a Subscriber */ - class Subscriber extends $protobuf.rpc.Service { + /** MethodDescriptorProto outputType. */ + public outputType: string; - /** - * Constructs a new Subscriber service. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - */ - constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + /** MethodDescriptorProto options. */ + public options?: (google.protobuf.IMethodOptions|null); - /** - * Creates new Subscriber service using the specified rpc implementation. - * @param rpcImpl RPC implementation - * @param [requestDelimited=false] Whether requests are length-delimited - * @param [responseDelimited=false] Whether responses are length-delimited - * @returns RPC service. Useful where requests and/or responses are streamed. - */ - public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): Subscriber; + /** MethodDescriptorProto clientStreaming. */ + public clientStreaming: boolean; - /** - * Calls CreateSubscription. - * @param request Subscription message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public createSubscription(request: google.pubsub.v1.ISubscription, callback: google.pubsub.v1.Subscriber.CreateSubscriptionCallback): void; + /** MethodDescriptorProto serverStreaming. */ + public serverStreaming: boolean; - /** - * Calls CreateSubscription. - * @param request Subscription message or plain object - * @returns Promise - */ - public createSubscription(request: google.pubsub.v1.ISubscription): Promise; + /** + * Creates a new MethodDescriptorProto instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodDescriptorProto instance + */ + public static create(properties?: google.protobuf.IMethodDescriptorProto): google.protobuf.MethodDescriptorProto; - /** - * Calls GetSubscription. - * @param request GetSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest, callback: google.pubsub.v1.Subscriber.GetSubscriptionCallback): void; + /** + * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Calls GetSubscription. - * @param request GetSubscriptionRequest message or plain object - * @returns Promise - */ - public getSubscription(request: google.pubsub.v1.IGetSubscriptionRequest): Promise; + /** + * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @param message MethodDescriptorProto message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodDescriptorProto, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Calls UpdateSubscription. - * @param request UpdateSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Subscription - */ - public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest, callback: google.pubsub.v1.Subscriber.UpdateSubscriptionCallback): void; + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; - /** - * Calls UpdateSubscription. - * @param request UpdateSubscriptionRequest message or plain object - * @returns Promise - */ - public updateSubscription(request: google.pubsub.v1.IUpdateSubscriptionRequest): Promise; + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; - /** - * Calls ListSubscriptions. - * @param request ListSubscriptionsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListSubscriptionsResponse - */ - public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest, callback: google.pubsub.v1.Subscriber.ListSubscriptionsCallback): void; + /** + * Verifies a MethodDescriptorProto message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Calls ListSubscriptions. - * @param request ListSubscriptionsRequest message or plain object - * @returns Promise - */ - public listSubscriptions(request: google.pubsub.v1.IListSubscriptionsRequest): Promise; + /** + * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodDescriptorProto + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodDescriptorProto; - /** - * Calls DeleteSubscription. - * @param request DeleteSubscriptionRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest, callback: google.pubsub.v1.Subscriber.DeleteSubscriptionCallback): void; + /** + * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. + * @param message MethodDescriptorProto + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodDescriptorProto, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Calls DeleteSubscription. - * @param request DeleteSubscriptionRequest message or plain object - * @returns Promise - */ - public deleteSubscription(request: google.pubsub.v1.IDeleteSubscriptionRequest): Promise; + /** + * Converts this MethodDescriptorProto to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Calls ModifyAckDeadline. - * @param request ModifyAckDeadlineRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest, callback: google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback): void; + /** Properties of a FileOptions. */ + interface IFileOptions { - /** - * Calls ModifyAckDeadline. - * @param request ModifyAckDeadlineRequest message or plain object - * @returns Promise - */ - public modifyAckDeadline(request: google.pubsub.v1.IModifyAckDeadlineRequest): Promise; + /** FileOptions javaPackage */ + javaPackage?: (string|null); - /** - * Calls Acknowledge. - * @param request AcknowledgeRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest, callback: google.pubsub.v1.Subscriber.AcknowledgeCallback): void; + /** FileOptions javaOuterClassname */ + javaOuterClassname?: (string|null); - /** - * Calls Acknowledge. - * @param request AcknowledgeRequest message or plain object - * @returns Promise - */ - public acknowledge(request: google.pubsub.v1.IAcknowledgeRequest): Promise; + /** FileOptions javaMultipleFiles */ + javaMultipleFiles?: (boolean|null); - /** - * Calls Pull. - * @param request PullRequest message or plain object - * @param callback Node-style callback called with the error, if any, and PullResponse - */ - public pull(request: google.pubsub.v1.IPullRequest, callback: google.pubsub.v1.Subscriber.PullCallback): void; + /** FileOptions javaGenerateEqualsAndHash */ + javaGenerateEqualsAndHash?: (boolean|null); - /** - * Calls Pull. - * @param request PullRequest message or plain object - * @returns Promise - */ - public pull(request: google.pubsub.v1.IPullRequest): Promise; + /** FileOptions javaStringCheckUtf8 */ + javaStringCheckUtf8?: (boolean|null); - /** - * Calls StreamingPull. - * @param request StreamingPullRequest message or plain object - * @param callback Node-style callback called with the error, if any, and StreamingPullResponse - */ - public streamingPull(request: google.pubsub.v1.IStreamingPullRequest, callback: google.pubsub.v1.Subscriber.StreamingPullCallback): void; + /** FileOptions optimizeFor */ + optimizeFor?: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode|null); - /** - * Calls StreamingPull. - * @param request StreamingPullRequest message or plain object - * @returns Promise - */ - public streamingPull(request: google.pubsub.v1.IStreamingPullRequest): Promise; + /** FileOptions goPackage */ + goPackage?: (string|null); - /** - * Calls ModifyPushConfig. - * @param request ModifyPushConfigRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest, callback: google.pubsub.v1.Subscriber.ModifyPushConfigCallback): void; + /** FileOptions ccGenericServices */ + ccGenericServices?: (boolean|null); - /** - * Calls ModifyPushConfig. - * @param request ModifyPushConfigRequest message or plain object - * @returns Promise - */ - public modifyPushConfig(request: google.pubsub.v1.IModifyPushConfigRequest): Promise; + /** FileOptions javaGenericServices */ + javaGenericServices?: (boolean|null); - /** - * Calls GetSnapshot. - * @param request GetSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest, callback: google.pubsub.v1.Subscriber.GetSnapshotCallback): void; + /** FileOptions pyGenericServices */ + pyGenericServices?: (boolean|null); - /** - * Calls GetSnapshot. - * @param request GetSnapshotRequest message or plain object - * @returns Promise - */ - public getSnapshot(request: google.pubsub.v1.IGetSnapshotRequest): Promise; + /** FileOptions phpGenericServices */ + phpGenericServices?: (boolean|null); - /** - * Calls ListSnapshots. - * @param request ListSnapshotsRequest message or plain object - * @param callback Node-style callback called with the error, if any, and ListSnapshotsResponse - */ - public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest, callback: google.pubsub.v1.Subscriber.ListSnapshotsCallback): void; + /** FileOptions deprecated */ + deprecated?: (boolean|null); - /** - * Calls ListSnapshots. - * @param request ListSnapshotsRequest message or plain object - * @returns Promise - */ - public listSnapshots(request: google.pubsub.v1.IListSnapshotsRequest): Promise; + /** FileOptions ccEnableArenas */ + ccEnableArenas?: (boolean|null); - /** - * Calls CreateSnapshot. - * @param request CreateSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest, callback: google.pubsub.v1.Subscriber.CreateSnapshotCallback): void; + /** FileOptions objcClassPrefix */ + objcClassPrefix?: (string|null); - /** - * Calls CreateSnapshot. - * @param request CreateSnapshotRequest message or plain object - * @returns Promise - */ - public createSnapshot(request: google.pubsub.v1.ICreateSnapshotRequest): Promise; + /** FileOptions csharpNamespace */ + csharpNamespace?: (string|null); - /** - * Calls UpdateSnapshot. - * @param request UpdateSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Snapshot - */ - public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest, callback: google.pubsub.v1.Subscriber.UpdateSnapshotCallback): void; + /** FileOptions swiftPrefix */ + swiftPrefix?: (string|null); - /** - * Calls UpdateSnapshot. - * @param request UpdateSnapshotRequest message or plain object - * @returns Promise - */ - public updateSnapshot(request: google.pubsub.v1.IUpdateSnapshotRequest): Promise; + /** FileOptions phpClassPrefix */ + phpClassPrefix?: (string|null); - /** - * Calls DeleteSnapshot. - * @param request DeleteSnapshotRequest message or plain object - * @param callback Node-style callback called with the error, if any, and Empty - */ - public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest, callback: google.pubsub.v1.Subscriber.DeleteSnapshotCallback): void; + /** FileOptions phpNamespace */ + phpNamespace?: (string|null); - /** - * Calls DeleteSnapshot. - * @param request DeleteSnapshotRequest message or plain object - * @returns Promise - */ - public deleteSnapshot(request: google.pubsub.v1.IDeleteSnapshotRequest): Promise; + /** FileOptions phpMetadataNamespace */ + phpMetadataNamespace?: (string|null); - /** - * Calls Seek. - * @param request SeekRequest message or plain object - * @param callback Node-style callback called with the error, if any, and SeekResponse - */ - public seek(request: google.pubsub.v1.ISeekRequest, callback: google.pubsub.v1.Subscriber.SeekCallback): void; + /** FileOptions rubyPackage */ + rubyPackage?: (string|null); - /** - * Calls Seek. - * @param request SeekRequest message or plain object - * @returns Promise - */ - public seek(request: google.pubsub.v1.ISeekRequest): Promise; - } + /** FileOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - namespace Subscriber { + /** FileOptions .google.api.resourceDefinition */ + ".google.api.resourceDefinition"?: (google.api.IResourceDescriptor[]|null); + } - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + /** Represents a FileOptions. */ + class FileOptions implements IFileOptions { - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + /** + * Constructs a new FileOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFileOptions); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. - * @param error Error, if any - * @param [response] Subscription - */ - type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; + /** FileOptions javaPackage. */ + public javaPackage: string; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. - * @param error Error, if any - * @param [response] ListSubscriptionsResponse - */ - type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; + /** FileOptions javaOuterClassname. */ + public javaOuterClassname: string; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** FileOptions javaMultipleFiles. */ + public javaMultipleFiles: boolean; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. - * @param error Error, if any - * @param [response] Empty - */ - type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** FileOptions javaGenerateEqualsAndHash. */ + public javaGenerateEqualsAndHash: boolean; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. - * @param error Error, if any - * @param [response] Empty - */ - type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** FileOptions javaStringCheckUtf8. */ + public javaStringCheckUtf8: boolean; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. - * @param error Error, if any - * @param [response] PullResponse - */ - type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; - - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. - * @param error Error, if any - * @param [response] StreamingPullResponse - */ - type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; + /** FileOptions optimizeFor. */ + public optimizeFor: (google.protobuf.FileOptions.OptimizeMode|keyof typeof google.protobuf.FileOptions.OptimizeMode); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. - * @param error Error, if any - * @param [response] Empty - */ - type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** FileOptions goPackage. */ + public goPackage: string; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + /** FileOptions ccGenericServices. */ + public ccGenericServices: boolean; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. - * @param error Error, if any - * @param [response] ListSnapshotsResponse - */ - type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; + /** FileOptions javaGenericServices. */ + public javaGenericServices: boolean; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + /** FileOptions pyGenericServices. */ + public pyGenericServices: boolean; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. - * @param error Error, if any - * @param [response] Snapshot - */ - type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; + /** FileOptions phpGenericServices. */ + public phpGenericServices: boolean; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. - * @param error Error, if any - * @param [response] Empty - */ - type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + /** FileOptions deprecated. */ + public deprecated: boolean; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. - * @param error Error, if any - * @param [response] SeekResponse - */ - type SeekCallback = (error: (Error|null), response?: google.pubsub.v1.SeekResponse) => void; - } + /** FileOptions ccEnableArenas. */ + public ccEnableArenas: boolean; - /** Properties of a Subscription. */ - interface ISubscription { + /** FileOptions objcClassPrefix. */ + public objcClassPrefix: string; - /** Subscription name */ - name?: (string|null); + /** FileOptions csharpNamespace. */ + public csharpNamespace: string; - /** Subscription topic */ - topic?: (string|null); + /** FileOptions swiftPrefix. */ + public swiftPrefix: string; - /** Subscription pushConfig */ - pushConfig?: (google.pubsub.v1.IPushConfig|null); + /** FileOptions phpClassPrefix. */ + public phpClassPrefix: string; - /** Subscription ackDeadlineSeconds */ - ackDeadlineSeconds?: (number|null); + /** FileOptions phpNamespace. */ + public phpNamespace: string; - /** Subscription retainAckedMessages */ - retainAckedMessages?: (boolean|null); + /** FileOptions phpMetadataNamespace. */ + public phpMetadataNamespace: string; - /** Subscription messageRetentionDuration */ - messageRetentionDuration?: (google.protobuf.IDuration|null); + /** FileOptions rubyPackage. */ + public rubyPackage: string; - /** Subscription labels */ - labels?: ({ [k: string]: string }|null); + /** FileOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** Subscription enableMessageOrdering */ - enableMessageOrdering?: (boolean|null); + /** + * Creates a new FileOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FileOptions instance + */ + public static create(properties?: google.protobuf.IFileOptions): google.protobuf.FileOptions; - /** Subscription expirationPolicy */ - expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + /** + * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** Subscription filter */ - filter?: (string|null); + /** + * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @param message FileOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFileOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** Subscription deadLetterPolicy */ - deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); + /** + * Decodes a FileOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; - /** Subscription retryPolicy */ - retryPolicy?: (google.pubsub.v1.IRetryPolicy|null); - } + /** + * Decodes a FileOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; - /** Represents a Subscription. */ - class Subscription implements ISubscription { + /** + * Verifies a FileOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Constructs a new Subscription. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISubscription); + /** + * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FileOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FileOptions; - /** Subscription name. */ - public name: string; + /** + * Creates a plain object from a FileOptions message. Also converts values to other types if specified. + * @param message FileOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FileOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Subscription topic. */ - public topic: string; + /** + * Converts this FileOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Subscription pushConfig. */ - public pushConfig?: (google.pubsub.v1.IPushConfig|null); + namespace FileOptions { - /** Subscription ackDeadlineSeconds. */ - public ackDeadlineSeconds: number; + /** OptimizeMode enum. */ + enum OptimizeMode { + SPEED = 1, + CODE_SIZE = 2, + LITE_RUNTIME = 3 + } + } - /** Subscription retainAckedMessages. */ - public retainAckedMessages: boolean; + /** Properties of a MessageOptions. */ + interface IMessageOptions { - /** Subscription messageRetentionDuration. */ - public messageRetentionDuration?: (google.protobuf.IDuration|null); + /** MessageOptions messageSetWireFormat */ + messageSetWireFormat?: (boolean|null); - /** Subscription labels. */ - public labels: { [k: string]: string }; + /** MessageOptions noStandardDescriptorAccessor */ + noStandardDescriptorAccessor?: (boolean|null); - /** Subscription enableMessageOrdering. */ - public enableMessageOrdering: boolean; + /** MessageOptions deprecated */ + deprecated?: (boolean|null); - /** Subscription expirationPolicy. */ - public expirationPolicy?: (google.pubsub.v1.IExpirationPolicy|null); + /** MessageOptions mapEntry */ + mapEntry?: (boolean|null); - /** Subscription filter. */ - public filter: string; + /** MessageOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** Subscription deadLetterPolicy. */ - public deadLetterPolicy?: (google.pubsub.v1.IDeadLetterPolicy|null); + /** MessageOptions .google.api.resource */ + ".google.api.resource"?: (google.api.IResourceDescriptor|null); + } - /** Subscription retryPolicy. */ - public retryPolicy?: (google.pubsub.v1.IRetryPolicy|null); + /** Represents a MessageOptions. */ + class MessageOptions implements IMessageOptions { - /** - * Creates a new Subscription instance using the specified properties. - * @param [properties] Properties to set - * @returns Subscription instance - */ - public static create(properties?: google.pubsub.v1.ISubscription): google.pubsub.v1.Subscription; + /** + * Constructs a new MessageOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMessageOptions); - /** - * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @param message Subscription message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; + /** MessageOptions messageSetWireFormat. */ + public messageSetWireFormat: boolean; - /** - * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @param message Subscription message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISubscription, writer?: $protobuf.Writer): $protobuf.Writer; + /** MessageOptions noStandardDescriptorAccessor. */ + public noStandardDescriptorAccessor: boolean; - /** - * Decodes a Subscription message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Subscription; + /** MessageOptions deprecated. */ + public deprecated: boolean; - /** - * Decodes a Subscription message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Subscription; + /** MessageOptions mapEntry. */ + public mapEntry: boolean; - /** - * Verifies a Subscription message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** MessageOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Creates a Subscription message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Subscription - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Subscription; + /** + * Creates a new MessageOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageOptions instance + */ + public static create(properties?: google.protobuf.IMessageOptions): google.protobuf.MessageOptions; - /** - * Creates a plain object from a Subscription message. Also converts values to other types if specified. - * @param message Subscription - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.Subscription, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this Subscription to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @param message MessageOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMessageOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a RetryPolicy. */ - interface IRetryPolicy { + /** + * Decodes a MessageOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; - /** RetryPolicy minimumBackoff */ - minimumBackoff?: (google.protobuf.IDuration|null); + /** + * Decodes a MessageOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; - /** RetryPolicy maximumBackoff */ - maximumBackoff?: (google.protobuf.IDuration|null); - } + /** + * Verifies a MessageOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Represents a RetryPolicy. */ - class RetryPolicy implements IRetryPolicy { + /** + * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MessageOptions; - /** - * Constructs a new RetryPolicy. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IRetryPolicy); + /** + * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. + * @param message MessageOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MessageOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** RetryPolicy minimumBackoff. */ - public minimumBackoff?: (google.protobuf.IDuration|null); + /** + * Converts this MessageOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** RetryPolicy maximumBackoff. */ - public maximumBackoff?: (google.protobuf.IDuration|null); + /** Properties of a FieldOptions. */ + interface IFieldOptions { - /** - * Creates a new RetryPolicy instance using the specified properties. - * @param [properties] Properties to set - * @returns RetryPolicy instance - */ - public static create(properties?: google.pubsub.v1.IRetryPolicy): google.pubsub.v1.RetryPolicy; + /** FieldOptions ctype */ + ctype?: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType|null); - /** - * Encodes the specified RetryPolicy message. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. - * @param message RetryPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IRetryPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + /** FieldOptions packed */ + packed?: (boolean|null); - /** - * Encodes the specified RetryPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. - * @param message RetryPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IRetryPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + /** FieldOptions jstype */ + jstype?: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType|null); - /** - * Decodes a RetryPolicy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns RetryPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.RetryPolicy; + /** FieldOptions lazy */ + lazy?: (boolean|null); - /** - * Decodes a RetryPolicy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns RetryPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.RetryPolicy; + /** FieldOptions deprecated */ + deprecated?: (boolean|null); - /** - * Verifies a RetryPolicy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** FieldOptions weak */ + weak?: (boolean|null); - /** - * Creates a RetryPolicy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns RetryPolicy - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.RetryPolicy; + /** FieldOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** - * Creates a plain object from a RetryPolicy message. Also converts values to other types if specified. - * @param message RetryPolicy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.RetryPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** FieldOptions .google.api.fieldBehavior */ + ".google.api.fieldBehavior"?: (google.api.FieldBehavior[]|null); - /** - * Converts this RetryPolicy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** FieldOptions .google.api.resourceReference */ + ".google.api.resourceReference"?: (google.api.IResourceReference|null); + } - /** Properties of a DeadLetterPolicy. */ - interface IDeadLetterPolicy { + /** Represents a FieldOptions. */ + class FieldOptions implements IFieldOptions { - /** DeadLetterPolicy deadLetterTopic */ - deadLetterTopic?: (string|null); + /** + * Constructs a new FieldOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldOptions); - /** DeadLetterPolicy maxDeliveryAttempts */ - maxDeliveryAttempts?: (number|null); - } + /** FieldOptions ctype. */ + public ctype: (google.protobuf.FieldOptions.CType|keyof typeof google.protobuf.FieldOptions.CType); - /** Represents a DeadLetterPolicy. */ - class DeadLetterPolicy implements IDeadLetterPolicy { + /** FieldOptions packed. */ + public packed: boolean; - /** - * Constructs a new DeadLetterPolicy. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeadLetterPolicy); + /** FieldOptions jstype. */ + public jstype: (google.protobuf.FieldOptions.JSType|keyof typeof google.protobuf.FieldOptions.JSType); - /** DeadLetterPolicy deadLetterTopic. */ - public deadLetterTopic: string; + /** FieldOptions lazy. */ + public lazy: boolean; - /** DeadLetterPolicy maxDeliveryAttempts. */ - public maxDeliveryAttempts: number; + /** FieldOptions deprecated. */ + public deprecated: boolean; - /** - * Creates a new DeadLetterPolicy instance using the specified properties. - * @param [properties] Properties to set - * @returns DeadLetterPolicy instance - */ - public static create(properties?: google.pubsub.v1.IDeadLetterPolicy): google.pubsub.v1.DeadLetterPolicy; + /** FieldOptions weak. */ + public weak: boolean; - /** - * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. - * @param message DeadLetterPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. - * @param message DeadLetterPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeadLetterPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + /** FieldOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeadLetterPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeadLetterPolicy; + /** + * Creates a new FieldOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldOptions instance + */ + public static create(properties?: google.protobuf.IFieldOptions): google.protobuf.FieldOptions; - /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeadLetterPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeadLetterPolicy; + /** + * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a DeadLetterPolicy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @param message FieldOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeadLetterPolicy - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeadLetterPolicy; + /** + * Decodes a FieldOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; - /** - * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. - * @param message DeadLetterPolicy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeadLetterPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a FieldOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; - /** - * Converts this DeadLetterPolicy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Verifies a FieldOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** Properties of an ExpirationPolicy. */ - interface IExpirationPolicy { + /** + * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions; - /** ExpirationPolicy ttl */ - ttl?: (google.protobuf.IDuration|null); - } + /** + * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. + * @param message FieldOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents an ExpirationPolicy. */ - class ExpirationPolicy implements IExpirationPolicy { + /** + * Converts this FieldOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new ExpirationPolicy. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IExpirationPolicy); + namespace FieldOptions { - /** ExpirationPolicy ttl. */ - public ttl?: (google.protobuf.IDuration|null); + /** CType enum. */ + enum CType { + STRING = 0, + CORD = 1, + STRING_PIECE = 2 + } - /** - * Creates a new ExpirationPolicy instance using the specified properties. - * @param [properties] Properties to set - * @returns ExpirationPolicy instance - */ - public static create(properties?: google.pubsub.v1.IExpirationPolicy): google.pubsub.v1.ExpirationPolicy; + /** JSType enum. */ + enum JSType { + JS_NORMAL = 0, + JS_STRING = 1, + JS_NUMBER = 2 + } + } - /** - * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @param message ExpirationPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + /** Properties of an OneofOptions. */ + interface IOneofOptions { - /** - * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @param message ExpirationPolicy message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IExpirationPolicy, writer?: $protobuf.Writer): $protobuf.Writer; + /** OneofOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } - /** - * Decodes an ExpirationPolicy message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExpirationPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ExpirationPolicy; + /** Represents an OneofOptions. */ + class OneofOptions implements IOneofOptions { - /** - * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExpirationPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ExpirationPolicy; + /** + * Constructs a new OneofOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IOneofOptions); - /** - * Verifies an ExpirationPolicy message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** OneofOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExpirationPolicy - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ExpirationPolicy; + /** + * Creates a new OneofOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns OneofOptions instance + */ + public static create(properties?: google.protobuf.IOneofOptions): google.protobuf.OneofOptions; - /** - * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. - * @param message ExpirationPolicy - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ExpirationPolicy, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this ExpirationPolicy to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @param message OneofOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IOneofOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** Properties of a PushConfig. */ - interface IPushConfig { + /** + * Decodes an OneofOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; - /** PushConfig pushEndpoint */ - pushEndpoint?: (string|null); + /** + * Decodes an OneofOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; - /** PushConfig attributes */ - attributes?: ({ [k: string]: string }|null); + /** + * Verifies an OneofOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** PushConfig oidcToken */ - oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); - } + /** + * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns OneofOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.OneofOptions; - /** Represents a PushConfig. */ - class PushConfig implements IPushConfig { + /** + * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. + * @param message OneofOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.OneofOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Constructs a new PushConfig. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPushConfig); + /** + * Converts this OneofOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** PushConfig pushEndpoint. */ - public pushEndpoint: string; + /** Properties of an EnumOptions. */ + interface IEnumOptions { - /** PushConfig attributes. */ - public attributes: { [k: string]: string }; + /** EnumOptions allowAlias */ + allowAlias?: (boolean|null); - /** PushConfig oidcToken. */ - public oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + /** EnumOptions deprecated */ + deprecated?: (boolean|null); - /** PushConfig authenticationMethod. */ - public authenticationMethod?: "oidcToken"; + /** EnumOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } - /** - * Creates a new PushConfig instance using the specified properties. - * @param [properties] Properties to set - * @returns PushConfig instance - */ - public static create(properties?: google.pubsub.v1.IPushConfig): google.pubsub.v1.PushConfig; + /** Represents an EnumOptions. */ + class EnumOptions implements IEnumOptions { - /** - * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @param message PushConfig message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new EnumOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumOptions); - /** - * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @param message PushConfig message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPushConfig, writer?: $protobuf.Writer): $protobuf.Writer; + /** EnumOptions allowAlias. */ + public allowAlias: boolean; - /** - * Decodes a PushConfig message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig; + /** EnumOptions deprecated. */ + public deprecated: boolean; - /** - * Decodes a PushConfig message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig; + /** EnumOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Verifies a PushConfig message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a new EnumOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumOptions instance + */ + public static create(properties?: google.protobuf.IEnumOptions): google.protobuf.EnumOptions; - /** - * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PushConfig - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig; + /** + * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a PushConfig message. Also converts values to other types if specified. - * @param message PushConfig - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PushConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @param message EnumOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Converts this PushConfig to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes an EnumOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; - namespace PushConfig { + /** + * Decodes an EnumOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; - /** Properties of an OidcToken. */ - interface IOidcToken { + /** + * Verifies an EnumOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** OidcToken serviceAccountEmail */ - serviceAccountEmail?: (string|null); + /** + * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumOptions; - /** OidcToken audience */ - audience?: (string|null); - } + /** + * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. + * @param message EnumOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** Represents an OidcToken. */ - class OidcToken implements IOidcToken { + /** + * Converts this EnumOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Constructs a new OidcToken. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.PushConfig.IOidcToken); + /** Properties of an EnumValueOptions. */ + interface IEnumValueOptions { - /** OidcToken serviceAccountEmail. */ - public serviceAccountEmail: string; + /** EnumValueOptions deprecated */ + deprecated?: (boolean|null); - /** OidcToken audience. */ - public audience: string; + /** EnumValueOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } - /** - * Creates a new OidcToken instance using the specified properties. - * @param [properties] Properties to set - * @returns OidcToken instance - */ - public static create(properties?: google.pubsub.v1.PushConfig.IOidcToken): google.pubsub.v1.PushConfig.OidcToken; + /** Represents an EnumValueOptions. */ + class EnumValueOptions implements IEnumValueOptions { - /** - * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @param message OidcToken message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new EnumValueOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEnumValueOptions); - /** - * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @param message OidcToken message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.PushConfig.IOidcToken, writer?: $protobuf.Writer): $protobuf.Writer; + /** EnumValueOptions deprecated. */ + public deprecated: boolean; - /** - * Decodes an OidcToken message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.OidcToken; + /** EnumValueOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Decodes an OidcToken message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.OidcToken; + /** + * Creates a new EnumValueOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumValueOptions instance + */ + public static create(properties?: google.protobuf.IEnumValueOptions): google.protobuf.EnumValueOptions; - /** - * Verifies an OidcToken message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns OidcToken - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.OidcToken; + /** + * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @param message EnumValueOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEnumValueOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from an OidcToken message. Also converts values to other types if specified. - * @param message OidcToken - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PushConfig.OidcToken, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes an EnumValueOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; - /** - * Converts this OidcToken to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } + /** + * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; - /** Properties of a ReceivedMessage. */ - interface IReceivedMessage { + /** + * Verifies an EnumValueOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** ReceivedMessage ackId */ - ackId?: (string|null); + /** + * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumValueOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumValueOptions; - /** ReceivedMessage message */ - message?: (google.pubsub.v1.IPubsubMessage|null); + /** + * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. + * @param message EnumValueOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumValueOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** ReceivedMessage deliveryAttempt */ - deliveryAttempt?: (number|null); - } + /** + * Converts this EnumValueOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** Represents a ReceivedMessage. */ - class ReceivedMessage implements IReceivedMessage { + /** Properties of a ServiceOptions. */ + interface IServiceOptions { - /** - * Constructs a new ReceivedMessage. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IReceivedMessage); + /** ServiceOptions deprecated */ + deprecated?: (boolean|null); - /** ReceivedMessage ackId. */ - public ackId: string; + /** ServiceOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** ReceivedMessage message. */ - public message?: (google.pubsub.v1.IPubsubMessage|null); + /** ServiceOptions .google.api.defaultHost */ + ".google.api.defaultHost"?: (string|null); - /** ReceivedMessage deliveryAttempt. */ - public deliveryAttempt: number; + /** ServiceOptions .google.api.oauthScopes */ + ".google.api.oauthScopes"?: (string|null); + } - /** - * Creates a new ReceivedMessage instance using the specified properties. - * @param [properties] Properties to set - * @returns ReceivedMessage instance - */ - public static create(properties?: google.pubsub.v1.IReceivedMessage): google.pubsub.v1.ReceivedMessage; + /** Represents a ServiceOptions. */ + class ServiceOptions implements IServiceOptions { - /** - * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. - * @param message ReceivedMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Constructs a new ServiceOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IServiceOptions); - /** - * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. - * @param message ReceivedMessage message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IReceivedMessage, writer?: $protobuf.Writer): $protobuf.Writer; + /** ServiceOptions deprecated. */ + public deprecated: boolean; - /** - * Decodes a ReceivedMessage message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ReceivedMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ReceivedMessage; + /** ServiceOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** - * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ReceivedMessage - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ReceivedMessage; + /** + * Creates a new ServiceOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ServiceOptions instance + */ + public static create(properties?: google.protobuf.IServiceOptions): google.protobuf.ServiceOptions; - /** - * Verifies a ReceivedMessage message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ReceivedMessage - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ReceivedMessage; + /** + * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @param message ServiceOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IServiceOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. - * @param message ReceivedMessage - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ReceivedMessage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Decodes a ServiceOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; - /** - * Converts this ReceivedMessage to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; - /** Properties of a GetSubscriptionRequest. */ - interface IGetSubscriptionRequest { + /** + * Verifies a ServiceOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** GetSubscriptionRequest subscription */ - subscription?: (string|null); - } + /** + * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ServiceOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ServiceOptions; - /** Represents a GetSubscriptionRequest. */ - class GetSubscriptionRequest implements IGetSubscriptionRequest { + /** + * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. + * @param message ServiceOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ServiceOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Constructs a new GetSubscriptionRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IGetSubscriptionRequest); + /** + * Converts this ServiceOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** GetSubscriptionRequest subscription. */ - public subscription: string; + /** Properties of a MethodOptions. */ + interface IMethodOptions { - /** - * Creates a new GetSubscriptionRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns GetSubscriptionRequest instance - */ - public static create(properties?: google.pubsub.v1.IGetSubscriptionRequest): google.pubsub.v1.GetSubscriptionRequest; + /** MethodOptions deprecated */ + deprecated?: (boolean|null); - /** - * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @param message GetSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** MethodOptions idempotencyLevel */ + idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel|null); - /** - * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @param message GetSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IGetSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** MethodOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSubscriptionRequest; + /** MethodOptions .google.api.http */ + ".google.api.http"?: (google.api.IHttpRule|null); - /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSubscriptionRequest; + /** MethodOptions .google.api.methodSignature */ + ".google.api.methodSignature"?: (string[]|null); + } - /** - * Verifies a GetSubscriptionRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Represents a MethodOptions. */ + class MethodOptions implements IMethodOptions { - /** - * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetSubscriptionRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSubscriptionRequest; + /** + * Constructs a new MethodOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IMethodOptions); - /** - * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. - * @param message GetSubscriptionRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.GetSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** MethodOptions deprecated. */ + public deprecated: boolean; - /** - * Converts this GetSubscriptionRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** MethodOptions idempotencyLevel. */ + public idempotencyLevel: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel); - /** Properties of an UpdateSubscriptionRequest. */ - interface IUpdateSubscriptionRequest { + /** MethodOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - /** UpdateSubscriptionRequest subscription */ - subscription?: (google.pubsub.v1.ISubscription|null); + /** + * Creates a new MethodOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodOptions instance + */ + public static create(properties?: google.protobuf.IMethodOptions): google.protobuf.MethodOptions; - /** UpdateSubscriptionRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); - } + /** + * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** Represents an UpdateSubscriptionRequest. */ - class UpdateSubscriptionRequest implements IUpdateSubscriptionRequest { + /** + * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @param message MethodOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IMethodOptions, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Constructs a new UpdateSubscriptionRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IUpdateSubscriptionRequest); + /** + * Decodes a MethodOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; - /** UpdateSubscriptionRequest subscription. */ - public subscription?: (google.pubsub.v1.ISubscription|null); + /** + * Decodes a MethodOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; - /** UpdateSubscriptionRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); + /** + * Verifies a MethodOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Creates a new UpdateSubscriptionRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns UpdateSubscriptionRequest instance - */ - public static create(properties?: google.pubsub.v1.IUpdateSubscriptionRequest): google.pubsub.v1.UpdateSubscriptionRequest; + /** + * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.MethodOptions; - /** - * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @param message UpdateSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. + * @param message MethodOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.MethodOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @param message UpdateSubscriptionRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Converts this MethodOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSubscriptionRequest; + namespace MethodOptions { - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSubscriptionRequest; + /** IdempotencyLevel enum. */ + enum IdempotencyLevel { + IDEMPOTENCY_UNKNOWN = 0, + NO_SIDE_EFFECTS = 1, + IDEMPOTENT = 2 + } + } - /** - * Verifies an UpdateSubscriptionRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Properties of an UninterpretedOption. */ + interface IUninterpretedOption { - /** - * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UpdateSubscriptionRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSubscriptionRequest; + /** UninterpretedOption name */ + name?: (google.protobuf.UninterpretedOption.INamePart[]|null); - /** - * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. - * @param message UpdateSubscriptionRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.UpdateSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** UninterpretedOption identifierValue */ + identifierValue?: (string|null); - /** - * Converts this UpdateSubscriptionRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** UninterpretedOption positiveIntValue */ + positiveIntValue?: (number|Long|string|null); - /** Properties of a ListSubscriptionsRequest. */ - interface IListSubscriptionsRequest { + /** UninterpretedOption negativeIntValue */ + negativeIntValue?: (number|Long|string|null); - /** ListSubscriptionsRequest project */ - project?: (string|null); + /** UninterpretedOption doubleValue */ + doubleValue?: (number|null); - /** ListSubscriptionsRequest pageSize */ - pageSize?: (number|null); + /** UninterpretedOption stringValue */ + stringValue?: (Uint8Array|string|null); - /** ListSubscriptionsRequest pageToken */ - pageToken?: (string|null); + /** UninterpretedOption aggregateValue */ + aggregateValue?: (string|null); + } + + /** Represents an UninterpretedOption. */ + class UninterpretedOption implements IUninterpretedOption { + + /** + * Constructs a new UninterpretedOption. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IUninterpretedOption); + + /** UninterpretedOption name. */ + public name: google.protobuf.UninterpretedOption.INamePart[]; + + /** UninterpretedOption identifierValue. */ + public identifierValue: string; + + /** UninterpretedOption positiveIntValue. */ + public positiveIntValue: (number|Long|string); + + /** UninterpretedOption negativeIntValue. */ + public negativeIntValue: (number|Long|string); + + /** UninterpretedOption doubleValue. */ + public doubleValue: number; + + /** UninterpretedOption stringValue. */ + public stringValue: (Uint8Array|string); + + /** UninterpretedOption aggregateValue. */ + public aggregateValue: string; + + /** + * Creates a new UninterpretedOption instance using the specified properties. + * @param [properties] Properties to set + * @returns UninterpretedOption instance + */ + public static create(properties?: google.protobuf.IUninterpretedOption): google.protobuf.UninterpretedOption; + + /** + * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @param message UninterpretedOption message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IUninterpretedOption, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; + + /** + * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; + + /** + * Verifies an UninterpretedOption message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns UninterpretedOption + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption; + + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @param message UninterpretedOption + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.UninterpretedOption, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this UninterpretedOption to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace UninterpretedOption { + + /** Properties of a NamePart. */ + interface INamePart { + + /** NamePart namePart */ + namePart: string; + + /** NamePart isExtension */ + isExtension: boolean; } - /** Represents a ListSubscriptionsRequest. */ - class ListSubscriptionsRequest implements IListSubscriptionsRequest { + /** Represents a NamePart. */ + class NamePart implements INamePart { /** - * Constructs a new ListSubscriptionsRequest. + * Constructs a new NamePart. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IListSubscriptionsRequest); - - /** ListSubscriptionsRequest project. */ - public project: string; + constructor(properties?: google.protobuf.UninterpretedOption.INamePart); - /** ListSubscriptionsRequest pageSize. */ - public pageSize: number; + /** NamePart namePart. */ + public namePart: string; - /** ListSubscriptionsRequest pageToken. */ - public pageToken: string; + /** NamePart isExtension. */ + public isExtension: boolean; /** - * Creates a new ListSubscriptionsRequest instance using the specified properties. + * Creates a new NamePart instance using the specified properties. * @param [properties] Properties to set - * @returns ListSubscriptionsRequest instance + * @returns NamePart instance */ - public static create(properties?: google.pubsub.v1.IListSubscriptionsRequest): google.pubsub.v1.ListSubscriptionsRequest; + public static create(properties?: google.protobuf.UninterpretedOption.INamePart): google.protobuf.UninterpretedOption.NamePart; /** - * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. - * @param message ListSubscriptionsRequest message or plain object to encode + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. - * @param message ListSubscriptionsRequest message or plain object to encode + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. + * @param message NamePart message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.UninterpretedOption.INamePart, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. + * Decodes a NamePart message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns ListSubscriptionsRequest + * @returns NamePart * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. + * Decodes a NamePart message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns ListSubscriptionsRequest + * @returns NamePart * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; /** - * Verifies a ListSubscriptionsRequest message. + * Verifies a NamePart message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns ListSubscriptionsRequest + * @returns NamePart */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsRequest; + public static fromObject(object: { [k: string]: any }): google.protobuf.UninterpretedOption.NamePart; /** - * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. - * @param message ListSubscriptionsRequest + * Creates a plain object from a NamePart message. Also converts values to other types if specified. + * @param message NamePart * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.ListSubscriptionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.UninterpretedOption.NamePart, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this ListSubscriptionsRequest to JSON. + * Converts this NamePart to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of a ListSubscriptionsResponse. */ - interface IListSubscriptionsResponse { - - /** ListSubscriptionsResponse subscriptions */ - subscriptions?: (google.pubsub.v1.ISubscription[]|null); + /** Properties of a SourceCodeInfo. */ + interface ISourceCodeInfo { - /** ListSubscriptionsResponse nextPageToken */ - nextPageToken?: (string|null); - } + /** SourceCodeInfo location */ + location?: (google.protobuf.SourceCodeInfo.ILocation[]|null); + } - /** Represents a ListSubscriptionsResponse. */ - class ListSubscriptionsResponse implements IListSubscriptionsResponse { + /** Represents a SourceCodeInfo. */ + class SourceCodeInfo implements ISourceCodeInfo { - /** - * Constructs a new ListSubscriptionsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSubscriptionsResponse); + /** + * Constructs a new SourceCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ISourceCodeInfo); - /** ListSubscriptionsResponse subscriptions. */ - public subscriptions: google.pubsub.v1.ISubscription[]; + /** SourceCodeInfo location. */ + public location: google.protobuf.SourceCodeInfo.ILocation[]; - /** ListSubscriptionsResponse nextPageToken. */ - public nextPageToken: string; + /** + * Creates a new SourceCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns SourceCodeInfo instance + */ + public static create(properties?: google.protobuf.ISourceCodeInfo): google.protobuf.SourceCodeInfo; - /** - * Creates a new ListSubscriptionsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSubscriptionsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListSubscriptionsResponse): google.pubsub.v1.ListSubscriptionsResponse; + /** + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. - * @param message ListSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @param message SourceCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ISourceCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. - * @param message ListSubscriptionsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSubscriptionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; - /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSubscriptionsResponse; + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; - /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSubscriptionsResponse; + /** + * Verifies a SourceCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Verifies a ListSubscriptionsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SourceCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo; - /** - * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSubscriptionsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSubscriptionsResponse; + /** + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. + * @param message SourceCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.SourceCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. - * @param message ListSubscriptionsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSubscriptionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Converts this SourceCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Converts this ListSubscriptionsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + namespace SourceCodeInfo { - /** Properties of a DeleteSubscriptionRequest. */ - interface IDeleteSubscriptionRequest { + /** Properties of a Location. */ + interface ILocation { - /** DeleteSubscriptionRequest subscription */ - subscription?: (string|null); + /** Location path */ + path?: (number[]|null); + + /** Location span */ + span?: (number[]|null); + + /** Location leadingComments */ + leadingComments?: (string|null); + + /** Location trailingComments */ + trailingComments?: (string|null); + + /** Location leadingDetachedComments */ + leadingDetachedComments?: (string[]|null); } - /** Represents a DeleteSubscriptionRequest. */ - class DeleteSubscriptionRequest implements IDeleteSubscriptionRequest { + /** Represents a Location. */ + class Location implements ILocation { /** - * Constructs a new DeleteSubscriptionRequest. + * Constructs a new Location. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IDeleteSubscriptionRequest); + constructor(properties?: google.protobuf.SourceCodeInfo.ILocation); - /** DeleteSubscriptionRequest subscription. */ - public subscription: string; + /** Location path. */ + public path: number[]; + + /** Location span. */ + public span: number[]; + + /** Location leadingComments. */ + public leadingComments: string; + + /** Location trailingComments. */ + public trailingComments: string; + + /** Location leadingDetachedComments. */ + public leadingDetachedComments: string[]; /** - * Creates a new DeleteSubscriptionRequest instance using the specified properties. + * Creates a new Location instance using the specified properties. * @param [properties] Properties to set - * @returns DeleteSubscriptionRequest instance + * @returns Location instance */ - public static create(properties?: google.pubsub.v1.IDeleteSubscriptionRequest): google.pubsub.v1.DeleteSubscriptionRequest; + public static create(properties?: google.protobuf.SourceCodeInfo.ILocation): google.protobuf.SourceCodeInfo.Location; /** - * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @param message DeleteSubscriptionRequest message or plain object to encode + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @param message DeleteSubscriptionRequest message or plain object to encode + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. + * @param message Location message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.SourceCodeInfo.ILocation, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. + * Decodes a Location message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns DeleteSubscriptionRequest + * @returns Location * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSubscriptionRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. + * Decodes a Location message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns DeleteSubscriptionRequest + * @returns Location * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSubscriptionRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; /** - * Verifies a DeleteSubscriptionRequest message. + * Verifies a Location message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * Creates a Location message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns DeleteSubscriptionRequest + * @returns Location */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSubscriptionRequest; + public static fromObject(object: { [k: string]: any }): google.protobuf.SourceCodeInfo.Location; /** - * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. - * @param message DeleteSubscriptionRequest + * Creates a plain object from a Location message. Also converts values to other types if specified. + * @param message Location * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.DeleteSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.SourceCodeInfo.Location, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this DeleteSubscriptionRequest to JSON. + * Converts this Location to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of a ModifyPushConfigRequest. */ - interface IModifyPushConfigRequest { + /** Properties of a GeneratedCodeInfo. */ + interface IGeneratedCodeInfo { - /** ModifyPushConfigRequest subscription */ - subscription?: (string|null); + /** GeneratedCodeInfo annotation */ + annotation?: (google.protobuf.GeneratedCodeInfo.IAnnotation[]|null); + } - /** ModifyPushConfigRequest pushConfig */ - pushConfig?: (google.pubsub.v1.IPushConfig|null); - } + /** Represents a GeneratedCodeInfo. */ + class GeneratedCodeInfo implements IGeneratedCodeInfo { - /** Represents a ModifyPushConfigRequest. */ - class ModifyPushConfigRequest implements IModifyPushConfigRequest { + /** + * Constructs a new GeneratedCodeInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IGeneratedCodeInfo); - /** - * Constructs a new ModifyPushConfigRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IModifyPushConfigRequest); + /** GeneratedCodeInfo annotation. */ + public annotation: google.protobuf.GeneratedCodeInfo.IAnnotation[]; - /** ModifyPushConfigRequest subscription. */ - public subscription: string; + /** + * Creates a new GeneratedCodeInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns GeneratedCodeInfo instance + */ + public static create(properties?: google.protobuf.IGeneratedCodeInfo): google.protobuf.GeneratedCodeInfo; - /** ModifyPushConfigRequest pushConfig. */ - public pushConfig?: (google.pubsub.v1.IPushConfig|null); + /** + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Creates a new ModifyPushConfigRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ModifyPushConfigRequest instance - */ - public static create(properties?: google.pubsub.v1.IModifyPushConfigRequest): google.pubsub.v1.ModifyPushConfigRequest; + /** + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @param message GeneratedCodeInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IGeneratedCodeInfo, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @param message ModifyPushConfigRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; - /** - * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @param message ModifyPushConfigRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IModifyPushConfigRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyPushConfigRequest; + /** + * Verifies a GeneratedCodeInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyPushConfigRequest; + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GeneratedCodeInfo + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo; - /** - * Verifies a ModifyPushConfigRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @param message GeneratedCodeInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.GeneratedCodeInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ModifyPushConfigRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyPushConfigRequest; + /** + * Converts this GeneratedCodeInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. - * @param message ModifyPushConfigRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ModifyPushConfigRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + namespace GeneratedCodeInfo { - /** - * Converts this ModifyPushConfigRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Properties of an Annotation. */ + interface IAnnotation { - /** Properties of a PullRequest. */ - interface IPullRequest { + /** Annotation path */ + path?: (number[]|null); - /** PullRequest subscription */ - subscription?: (string|null); + /** Annotation sourceFile */ + sourceFile?: (string|null); - /** PullRequest returnImmediately */ - returnImmediately?: (boolean|null); + /** Annotation begin */ + begin?: (number|null); - /** PullRequest maxMessages */ - maxMessages?: (number|null); + /** Annotation end */ + end?: (number|null); } - /** Represents a PullRequest. */ - class PullRequest implements IPullRequest { + /** Represents an Annotation. */ + class Annotation implements IAnnotation { /** - * Constructs a new PullRequest. + * Constructs a new Annotation. * @param [properties] Properties to set */ - constructor(properties?: google.pubsub.v1.IPullRequest); + constructor(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation); - /** PullRequest subscription. */ - public subscription: string; + /** Annotation path. */ + public path: number[]; - /** PullRequest returnImmediately. */ - public returnImmediately: boolean; + /** Annotation sourceFile. */ + public sourceFile: string; - /** PullRequest maxMessages. */ - public maxMessages: number; + /** Annotation begin. */ + public begin: number; + + /** Annotation end. */ + public end: number; /** - * Creates a new PullRequest instance using the specified properties. + * Creates a new Annotation instance using the specified properties. * @param [properties] Properties to set - * @returns PullRequest instance + * @returns Annotation instance */ - public static create(properties?: google.pubsub.v1.IPullRequest): google.pubsub.v1.PullRequest; + public static create(properties?: google.protobuf.GeneratedCodeInfo.IAnnotation): google.protobuf.GeneratedCodeInfo.Annotation; /** - * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @param message PullRequest message or plain object to encode + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encode(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encode(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @param message PullRequest message or plain object to encode + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. + * @param message Annotation message or plain object to encode * @param [writer] Writer to encode to * @returns Writer */ - public static encodeDelimited(message: google.pubsub.v1.IPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.IAnnotation, writer?: $protobuf.Writer): $protobuf.Writer; /** - * Decodes a PullRequest message from the specified reader or buffer. + * Decodes an Annotation message from the specified reader or buffer. * @param reader Reader or buffer to decode from * @param [length] Message length if known beforehand - * @returns PullRequest + * @returns Annotation * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullRequest; + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; /** - * Decodes a PullRequest message from the specified reader or buffer, length delimited. + * Decodes an Annotation message from the specified reader or buffer, length delimited. * @param reader Reader or buffer to decode from - * @returns PullRequest + * @returns Annotation * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullRequest; + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; /** - * Verifies a PullRequest message. + * Verifies an Annotation message. * @param message Plain object to verify * @returns `null` if valid, otherwise the reason why it is not */ public static verify(message: { [k: string]: any }): (string|null); /** - * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. * @param object Plain object - * @returns PullRequest + * @returns Annotation */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullRequest; + public static fromObject(object: { [k: string]: any }): google.protobuf.GeneratedCodeInfo.Annotation; /** - * Creates a plain object from a PullRequest message. Also converts values to other types if specified. - * @param message PullRequest + * Creates a plain object from an Annotation message. Also converts values to other types if specified. + * @param message Annotation * @param [options] Conversion options * @returns Plain object */ - public static toObject(message: google.pubsub.v1.PullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + public static toObject(message: google.protobuf.GeneratedCodeInfo.Annotation, options?: $protobuf.IConversionOptions): { [k: string]: any }; /** - * Converts this PullRequest to JSON. + * Converts this Annotation to JSON. * @returns JSON object */ public toJSON(): { [k: string]: any }; } + } - /** Properties of a PullResponse. */ - interface IPullResponse { + /** Properties of a Duration. */ + interface IDuration { - /** PullResponse receivedMessages */ - receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); - } + /** Duration seconds */ + seconds?: (number|Long|string|null); - /** Represents a PullResponse. */ - class PullResponse implements IPullResponse { + /** Duration nanos */ + nanos?: (number|null); + } - /** - * Constructs a new PullResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IPullResponse); + /** Represents a Duration. */ + class Duration implements IDuration { - /** PullResponse receivedMessages. */ - public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + /** + * Constructs a new Duration. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IDuration); - /** - * Creates a new PullResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns PullResponse instance - */ - public static create(properties?: google.pubsub.v1.IPullResponse): google.pubsub.v1.PullResponse; + /** Duration seconds. */ + public seconds: (number|Long|string); - /** - * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @param message PullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** Duration nanos. */ + public nanos: number; - /** - * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @param message PullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a new Duration instance using the specified properties. + * @param [properties] Properties to set + * @returns Duration instance + */ + public static create(properties?: google.protobuf.IDuration): google.protobuf.Duration; - /** - * Decodes a PullResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PullResponse; + /** + * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Decodes a PullResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PullResponse; + /** + * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @param message Duration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IDuration, writer?: $protobuf.Writer): $protobuf.Writer; - /** - * Verifies a PullResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** + * Decodes a Duration message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Duration; - /** - * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PullResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PullResponse; + /** + * Decodes a Duration message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Duration; - /** - * Creates a plain object from a PullResponse message. Also converts values to other types if specified. - * @param message PullResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.PullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** + * Verifies a Duration message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Converts this PullResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Duration + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Duration; - /** Properties of a ModifyAckDeadlineRequest. */ - interface IModifyAckDeadlineRequest { + /** + * Creates a plain object from a Duration message. Also converts values to other types if specified. + * @param message Duration + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Duration, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** ModifyAckDeadlineRequest subscription */ - subscription?: (string|null); + /** + * Converts this Duration to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** ModifyAckDeadlineRequest ackIds */ - ackIds?: (string[]|null); + /** Properties of an Empty. */ + interface IEmpty { + } - /** ModifyAckDeadlineRequest ackDeadlineSeconds */ - ackDeadlineSeconds?: (number|null); - } + /** Represents an Empty. */ + class Empty implements IEmpty { - /** Represents a ModifyAckDeadlineRequest. */ - class ModifyAckDeadlineRequest implements IModifyAckDeadlineRequest { + /** + * Constructs a new Empty. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IEmpty); - /** - * Constructs a new ModifyAckDeadlineRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IModifyAckDeadlineRequest); + /** + * Creates a new Empty instance using the specified properties. + * @param [properties] Properties to set + * @returns Empty instance + */ + public static create(properties?: google.protobuf.IEmpty): google.protobuf.Empty; - /** ModifyAckDeadlineRequest subscription. */ - public subscription: string; + /** + * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; - /** ModifyAckDeadlineRequest ackIds. */ - public ackIds: string[]; + /** + * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @param message Empty message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IEmpty, writer?: $protobuf.Writer): $protobuf.Writer; - /** ModifyAckDeadlineRequest ackDeadlineSeconds. */ - public ackDeadlineSeconds: number; + /** + * Decodes an Empty message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Empty; - /** - * Creates a new ModifyAckDeadlineRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ModifyAckDeadlineRequest instance - */ - public static create(properties?: google.pubsub.v1.IModifyAckDeadlineRequest): google.pubsub.v1.ModifyAckDeadlineRequest; + /** + * Decodes an Empty message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Empty; - /** - * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @param message ModifyAckDeadlineRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Verifies an Empty message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @param message ModifyAckDeadlineRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IModifyAckDeadlineRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates an Empty message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Empty + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Empty; - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ModifyAckDeadlineRequest; + /** + * Creates a plain object from an Empty message. Also converts values to other types if specified. + * @param message Empty + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Empty, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ModifyAckDeadlineRequest; + /** + * Converts this Empty to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Verifies a ModifyAckDeadlineRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Properties of a FieldMask. */ + interface IFieldMask { - /** - * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ModifyAckDeadlineRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ModifyAckDeadlineRequest; + /** FieldMask paths */ + paths?: (string[]|null); + } - /** - * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. - * @param message ModifyAckDeadlineRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ModifyAckDeadlineRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Represents a FieldMask. */ + class FieldMask implements IFieldMask { - /** - * Converts this ModifyAckDeadlineRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an AcknowledgeRequest. */ - interface IAcknowledgeRequest { - - /** AcknowledgeRequest subscription */ - subscription?: (string|null); + /** + * Constructs a new FieldMask. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFieldMask); - /** AcknowledgeRequest ackIds */ - ackIds?: (string[]|null); - } + /** FieldMask paths. */ + public paths: string[]; - /** Represents an AcknowledgeRequest. */ - class AcknowledgeRequest implements IAcknowledgeRequest { + /** + * Creates a new FieldMask instance using the specified properties. + * @param [properties] Properties to set + * @returns FieldMask instance + */ + public static create(properties?: google.protobuf.IFieldMask): google.protobuf.FieldMask; - /** - * Constructs a new AcknowledgeRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IAcknowledgeRequest); + /** + * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; - /** AcknowledgeRequest subscription. */ - public subscription: string; + /** + * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @param message FieldMask message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFieldMask, writer?: $protobuf.Writer): $protobuf.Writer; - /** AcknowledgeRequest ackIds. */ - public ackIds: string[]; + /** + * Decodes a FieldMask message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldMask; - /** - * Creates a new AcknowledgeRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns AcknowledgeRequest instance - */ - public static create(properties?: google.pubsub.v1.IAcknowledgeRequest): google.pubsub.v1.AcknowledgeRequest; + /** + * Decodes a FieldMask message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldMask; - /** - * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. - * @param message AcknowledgeRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Verifies a FieldMask message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** - * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. - * @param message AcknowledgeRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IAcknowledgeRequest, writer?: $protobuf.Writer): $protobuf.Writer; + /** + * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FieldMask + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldMask; - /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns AcknowledgeRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.AcknowledgeRequest; + /** + * Creates a plain object from a FieldMask message. Also converts values to other types if specified. + * @param message FieldMask + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldMask, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns AcknowledgeRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.AcknowledgeRequest; + /** + * Converts this FieldMask to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } - /** - * Verifies an AcknowledgeRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); + /** Properties of a Timestamp. */ + interface ITimestamp { - /** - * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns AcknowledgeRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.AcknowledgeRequest; + /** Timestamp seconds */ + seconds?: (number|Long|string|null); - /** - * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. - * @param message AcknowledgeRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.AcknowledgeRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + /** Timestamp nanos */ + nanos?: (number|null); + } - /** - * Converts this AcknowledgeRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** Represents a Timestamp. */ + class Timestamp implements ITimestamp { - /** Properties of a StreamingPullRequest. */ - interface IStreamingPullRequest { + /** + * Constructs a new Timestamp. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ITimestamp); - /** StreamingPullRequest subscription */ - subscription?: (string|null); + /** Timestamp seconds. */ + public seconds: (number|Long|string); - /** StreamingPullRequest ackIds */ - ackIds?: (string[]|null); + /** Timestamp nanos. */ + public nanos: number; - /** StreamingPullRequest modifyDeadlineSeconds */ - modifyDeadlineSeconds?: (number[]|null); + /** + * Creates a new Timestamp instance using the specified properties. + * @param [properties] Properties to set + * @returns Timestamp instance + */ + public static create(properties?: google.protobuf.ITimestamp): google.protobuf.Timestamp; - /** StreamingPullRequest modifyDeadlineAckIds */ - modifyDeadlineAckIds?: (string[]|null); + /** + * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; - /** StreamingPullRequest streamAckDeadlineSeconds */ - streamAckDeadlineSeconds?: (number|null); + /** + * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @param message Timestamp message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ITimestamp, writer?: $protobuf.Writer): $protobuf.Writer; - /** StreamingPullRequest clientId */ - clientId?: (string|null); - } + /** + * Decodes a Timestamp message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.Timestamp; - /** Represents a StreamingPullRequest. */ - class StreamingPullRequest implements IStreamingPullRequest { + /** + * Decodes a Timestamp message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.Timestamp; - /** - * Constructs a new StreamingPullRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IStreamingPullRequest); + /** + * Verifies a Timestamp message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); - /** StreamingPullRequest subscription. */ - public subscription: string; + /** + * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Timestamp + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.Timestamp; - /** StreamingPullRequest ackIds. */ - public ackIds: string[]; + /** + * Creates a plain object from a Timestamp message. Also converts values to other types if specified. + * @param message Timestamp + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.Timestamp, options?: $protobuf.IConversionOptions): { [k: string]: any }; - /** StreamingPullRequest modifyDeadlineSeconds. */ - public modifyDeadlineSeconds: number[]; - - /** StreamingPullRequest modifyDeadlineAckIds. */ - public modifyDeadlineAckIds: string[]; - - /** StreamingPullRequest streamAckDeadlineSeconds. */ - public streamAckDeadlineSeconds: number; - - /** StreamingPullRequest clientId. */ - public clientId: string; - - /** - * Creates a new StreamingPullRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns StreamingPullRequest instance - */ - public static create(properties?: google.pubsub.v1.IStreamingPullRequest): google.pubsub.v1.StreamingPullRequest; - - /** - * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @param message StreamingPullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @param message StreamingPullRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IStreamingPullRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullRequest; - - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullRequest; - - /** - * Verifies a StreamingPullRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns StreamingPullRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullRequest; - - /** - * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. - * @param message StreamingPullRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.StreamingPullRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this StreamingPullRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a StreamingPullResponse. */ - interface IStreamingPullResponse { - - /** StreamingPullResponse receivedMessages */ - receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); - } - - /** Represents a StreamingPullResponse. */ - class StreamingPullResponse implements IStreamingPullResponse { - - /** - * Constructs a new StreamingPullResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IStreamingPullResponse); - - /** StreamingPullResponse receivedMessages. */ - public receivedMessages: google.pubsub.v1.IReceivedMessage[]; - - /** - * Creates a new StreamingPullResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns StreamingPullResponse instance - */ - public static create(properties?: google.pubsub.v1.IStreamingPullResponse): google.pubsub.v1.StreamingPullResponse; - - /** - * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @param message StreamingPullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @param message StreamingPullResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IStreamingPullResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse; - - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse; - - /** - * Verifies a StreamingPullResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns StreamingPullResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse; - - /** - * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. - * @param message StreamingPullResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.StreamingPullResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this StreamingPullResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a CreateSnapshotRequest. */ - interface ICreateSnapshotRequest { - - /** CreateSnapshotRequest name */ - name?: (string|null); - - /** CreateSnapshotRequest subscription */ - subscription?: (string|null); - - /** CreateSnapshotRequest labels */ - labels?: ({ [k: string]: string }|null); - } - - /** Represents a CreateSnapshotRequest. */ - class CreateSnapshotRequest implements ICreateSnapshotRequest { - - /** - * Constructs a new CreateSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ICreateSnapshotRequest); - - /** CreateSnapshotRequest name. */ - public name: string; - - /** CreateSnapshotRequest subscription. */ - public subscription: string; - - /** CreateSnapshotRequest labels. */ - public labels: { [k: string]: string }; - - /** - * Creates a new CreateSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns CreateSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.ICreateSnapshotRequest): google.pubsub.v1.CreateSnapshotRequest; - - /** - * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @param message CreateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @param message CreateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ICreateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CreateSnapshotRequest; - - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CreateSnapshotRequest; - - /** - * Verifies a CreateSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CreateSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CreateSnapshotRequest; - - /** - * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. - * @param message CreateSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.CreateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this CreateSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of an UpdateSnapshotRequest. */ - interface IUpdateSnapshotRequest { - - /** UpdateSnapshotRequest snapshot */ - snapshot?: (google.pubsub.v1.ISnapshot|null); - - /** UpdateSnapshotRequest updateMask */ - updateMask?: (google.protobuf.IFieldMask|null); - } - - /** Represents an UpdateSnapshotRequest. */ - class UpdateSnapshotRequest implements IUpdateSnapshotRequest { - - /** - * Constructs a new UpdateSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IUpdateSnapshotRequest); - - /** UpdateSnapshotRequest snapshot. */ - public snapshot?: (google.pubsub.v1.ISnapshot|null); - - /** UpdateSnapshotRequest updateMask. */ - public updateMask?: (google.protobuf.IFieldMask|null); - - /** - * Creates a new UpdateSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns UpdateSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IUpdateSnapshotRequest): google.pubsub.v1.UpdateSnapshotRequest; - - /** - * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @param message UpdateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @param message UpdateSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IUpdateSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.UpdateSnapshotRequest; - - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.UpdateSnapshotRequest; - - /** - * Verifies an UpdateSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns UpdateSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.UpdateSnapshotRequest; - - /** - * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. - * @param message UpdateSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.UpdateSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this UpdateSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a Snapshot. */ - interface ISnapshot { - - /** Snapshot name */ - name?: (string|null); - - /** Snapshot topic */ - topic?: (string|null); - - /** Snapshot expireTime */ - expireTime?: (google.protobuf.ITimestamp|null); - - /** Snapshot labels */ - labels?: ({ [k: string]: string }|null); - } - - /** Represents a Snapshot. */ - class Snapshot implements ISnapshot { - - /** - * Constructs a new Snapshot. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISnapshot); - - /** Snapshot name. */ - public name: string; - - /** Snapshot topic. */ - public topic: string; - - /** Snapshot expireTime. */ - public expireTime?: (google.protobuf.ITimestamp|null); - - /** Snapshot labels. */ - public labels: { [k: string]: string }; - - /** - * Creates a new Snapshot instance using the specified properties. - * @param [properties] Properties to set - * @returns Snapshot instance - */ - public static create(properties?: google.pubsub.v1.ISnapshot): google.pubsub.v1.Snapshot; - - /** - * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. - * @param message Snapshot message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. - * @param message Snapshot message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISnapshot, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Snapshot message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Snapshot - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Snapshot; - - /** - * Decodes a Snapshot message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Snapshot - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Snapshot; - - /** - * Verifies a Snapshot message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Snapshot - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Snapshot; - - /** - * Creates a plain object from a Snapshot message. Also converts values to other types if specified. - * @param message Snapshot - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.Snapshot, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Snapshot to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a GetSnapshotRequest. */ - interface IGetSnapshotRequest { - - /** GetSnapshotRequest snapshot */ - snapshot?: (string|null); - } - - /** Represents a GetSnapshotRequest. */ - class GetSnapshotRequest implements IGetSnapshotRequest { - - /** - * Constructs a new GetSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IGetSnapshotRequest); - - /** GetSnapshotRequest snapshot. */ - public snapshot: string; - - /** - * Creates a new GetSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns GetSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IGetSnapshotRequest): google.pubsub.v1.GetSnapshotRequest; - - /** - * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @param message GetSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @param message GetSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IGetSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSnapshotRequest; - - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSnapshotRequest; - - /** - * Verifies a GetSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GetSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSnapshotRequest; - - /** - * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. - * @param message GetSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.GetSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GetSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListSnapshotsRequest. */ - interface IListSnapshotsRequest { - - /** ListSnapshotsRequest project */ - project?: (string|null); - - /** ListSnapshotsRequest pageSize */ - pageSize?: (number|null); - - /** ListSnapshotsRequest pageToken */ - pageToken?: (string|null); - } - - /** Represents a ListSnapshotsRequest. */ - class ListSnapshotsRequest implements IListSnapshotsRequest { - - /** - * Constructs a new ListSnapshotsRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSnapshotsRequest); - - /** ListSnapshotsRequest project. */ - public project: string; - - /** ListSnapshotsRequest pageSize. */ - public pageSize: number; - - /** ListSnapshotsRequest pageToken. */ - public pageToken: string; - - /** - * Creates a new ListSnapshotsRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSnapshotsRequest instance - */ - public static create(properties?: google.pubsub.v1.IListSnapshotsRequest): google.pubsub.v1.ListSnapshotsRequest; - - /** - * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. - * @param message ListSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. - * @param message ListSnapshotsRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsRequest; - - /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsRequest; - - /** - * Verifies a ListSnapshotsRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSnapshotsRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsRequest; - - /** - * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. - * @param message ListSnapshotsRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSnapshotsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListSnapshotsRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a ListSnapshotsResponse. */ - interface IListSnapshotsResponse { - - /** ListSnapshotsResponse snapshots */ - snapshots?: (google.pubsub.v1.ISnapshot[]|null); - - /** ListSnapshotsResponse nextPageToken */ - nextPageToken?: (string|null); - } - - /** Represents a ListSnapshotsResponse. */ - class ListSnapshotsResponse implements IListSnapshotsResponse { - - /** - * Constructs a new ListSnapshotsResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IListSnapshotsResponse); - - /** ListSnapshotsResponse snapshots. */ - public snapshots: google.pubsub.v1.ISnapshot[]; - - /** ListSnapshotsResponse nextPageToken. */ - public nextPageToken: string; - - /** - * Creates a new ListSnapshotsResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns ListSnapshotsResponse instance - */ - public static create(properties?: google.pubsub.v1.IListSnapshotsResponse): google.pubsub.v1.ListSnapshotsResponse; - - /** - * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. - * @param message ListSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. - * @param message ListSnapshotsResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IListSnapshotsResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ListSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSnapshotsResponse; - - /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ListSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSnapshotsResponse; - - /** - * Verifies a ListSnapshotsResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ListSnapshotsResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSnapshotsResponse; - - /** - * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. - * @param message ListSnapshotsResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.ListSnapshotsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ListSnapshotsResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a DeleteSnapshotRequest. */ - interface IDeleteSnapshotRequest { - - /** DeleteSnapshotRequest snapshot */ - snapshot?: (string|null); - } - - /** Represents a DeleteSnapshotRequest. */ - class DeleteSnapshotRequest implements IDeleteSnapshotRequest { - - /** - * Constructs a new DeleteSnapshotRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.IDeleteSnapshotRequest); - - /** DeleteSnapshotRequest snapshot. */ - public snapshot: string; - - /** - * Creates a new DeleteSnapshotRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns DeleteSnapshotRequest instance - */ - public static create(properties?: google.pubsub.v1.IDeleteSnapshotRequest): google.pubsub.v1.DeleteSnapshotRequest; - - /** - * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @param message DeleteSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @param message DeleteSnapshotRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.IDeleteSnapshotRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSnapshotRequest; - - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSnapshotRequest; - - /** - * Verifies a DeleteSnapshotRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DeleteSnapshotRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSnapshotRequest; - - /** - * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. - * @param message DeleteSnapshotRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.DeleteSnapshotRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DeleteSnapshotRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a SeekRequest. */ - interface ISeekRequest { - - /** SeekRequest subscription */ - subscription?: (string|null); - - /** SeekRequest time */ - time?: (google.protobuf.ITimestamp|null); - - /** SeekRequest snapshot */ - snapshot?: (string|null); - } - - /** Represents a SeekRequest. */ - class SeekRequest implements ISeekRequest { - - /** - * Constructs a new SeekRequest. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISeekRequest); - - /** SeekRequest subscription. */ - public subscription: string; - - /** SeekRequest time. */ - public time?: (google.protobuf.ITimestamp|null); - - /** SeekRequest snapshot. */ - public snapshot: string; - - /** SeekRequest target. */ - public target?: ("time"|"snapshot"); - - /** - * Creates a new SeekRequest instance using the specified properties. - * @param [properties] Properties to set - * @returns SeekRequest instance - */ - public static create(properties?: google.pubsub.v1.ISeekRequest): google.pubsub.v1.SeekRequest; - - /** - * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @param message SeekRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @param message SeekRequest message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISeekRequest, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SeekRequest message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SeekRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekRequest; - - /** - * Decodes a SeekRequest message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SeekRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekRequest; - - /** - * Verifies a SeekRequest message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SeekRequest - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekRequest; - - /** - * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. - * @param message SeekRequest - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.SeekRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this SeekRequest to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - - /** Properties of a SeekResponse. */ - interface ISeekResponse { - } - - /** Represents a SeekResponse. */ - class SeekResponse implements ISeekResponse { - - /** - * Constructs a new SeekResponse. - * @param [properties] Properties to set - */ - constructor(properties?: google.pubsub.v1.ISeekResponse); - - /** - * Creates a new SeekResponse instance using the specified properties. - * @param [properties] Properties to set - * @returns SeekResponse instance - */ - public static create(properties?: google.pubsub.v1.ISeekResponse): google.pubsub.v1.SeekResponse; - - /** - * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @param message SeekResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @param message SeekResponse message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.pubsub.v1.ISeekResponse, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a SeekResponse message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns SeekResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SeekResponse; - - /** - * Decodes a SeekResponse message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns SeekResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SeekResponse; - - /** - * Verifies a SeekResponse message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns SeekResponse - */ - public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SeekResponse; - - /** - * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. - * @param message SeekResponse - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.pubsub.v1.SeekResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this SeekResponse to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } + /** + * Converts this Timestamp to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; } } } diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 45f51a30bfd..95384639c07 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -39,562 +39,342 @@ */ var google = {}; - google.iam = (function() { + google.pubsub = (function() { /** - * Namespace iam. + * Namespace pubsub. * @memberof google * @namespace */ - var iam = {}; + var pubsub = {}; - iam.v1 = (function() { + pubsub.v1 = (function() { /** * Namespace v1. - * @memberof google.iam + * @memberof google.pubsub * @namespace */ var v1 = {}; - v1.Policy = (function() { - - /** - * Properties of a Policy. - * @memberof google.iam.v1 - * @interface IPolicy - * @property {number|null} [version] Policy version - * @property {Array.|null} [bindings] Policy bindings - * @property {Uint8Array|null} [etag] Policy etag - */ + v1.Publisher = (function() { /** - * Constructs a new Policy. - * @memberof google.iam.v1 - * @classdesc Represents a Policy. - * @implements IPolicy + * Constructs a new Publisher service. + * @memberof google.pubsub.v1 + * @classdesc Represents a Publisher + * @extends $protobuf.rpc.Service * @constructor - * @param {google.iam.v1.IPolicy=} [properties] Properties to set + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited */ - function Policy(properties) { - this.bindings = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + function Publisher(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); } - /** - * Policy version. - * @member {number} version - * @memberof google.iam.v1.Policy - * @instance - */ - Policy.prototype.version = 0; - - /** - * Policy bindings. - * @member {Array.} bindings - * @memberof google.iam.v1.Policy - * @instance - */ - Policy.prototype.bindings = $util.emptyArray; - - /** - * Policy etag. - * @member {Uint8Array} etag - * @memberof google.iam.v1.Policy - * @instance - */ - Policy.prototype.etag = $util.newBuffer([]); + (Publisher.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Publisher; /** - * Creates a new Policy instance using the specified properties. + * Creates new Publisher service using the specified rpc implementation. * @function create - * @memberof google.iam.v1.Policy + * @memberof google.pubsub.v1.Publisher * @static - * @param {google.iam.v1.IPolicy=} [properties] Properties to set - * @returns {google.iam.v1.Policy} Policy instance + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {Publisher} RPC service. Useful where requests and/or responses are streamed. */ - Policy.create = function create(properties) { - return new Policy(properties); + Publisher.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); }; /** - * Encodes the specified Policy message. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @function encode - * @memberof google.iam.v1.Policy - * @static - * @param {google.iam.v1.IPolicy} message Policy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef CreateTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic */ - Policy.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.version != null && message.hasOwnProperty("version")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.version); - if (message.etag != null && message.hasOwnProperty("etag")) - writer.uint32(/* id 3, wireType 2 =*/26).bytes(message.etag); - if (message.bindings != null && message.bindings.length) - for (var i = 0; i < message.bindings.length; ++i) - $root.google.iam.v1.Binding.encode(message.bindings[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - return writer; - }; /** - * Encodes the specified Policy message, length delimited. Does not implicitly {@link google.iam.v1.Policy.verify|verify} messages. - * @function encodeDelimited - * @memberof google.iam.v1.Policy - * @static - * @param {google.iam.v1.IPolicy} message Policy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * Calls CreateTopic. + * @function createTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.ITopic} request Topic message or plain object + * @param {google.pubsub.v1.Publisher.CreateTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 */ - Policy.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + Object.defineProperty(Publisher.prototype.createTopic = function createTopic(request, callback) { + return this.rpcCall(createTopic, $root.google.pubsub.v1.Topic, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "CreateTopic" }); /** - * Decodes a Policy message from the specified reader or buffer. - * @function decode - * @memberof google.iam.v1.Policy - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.Policy} Policy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls CreateTopic. + * @function createTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.ITopic} request Topic message or plain object + * @returns {Promise} Promise + * @variation 2 */ - Policy.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.Policy(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.version = reader.int32(); - break; - case 4: - if (!(message.bindings && message.bindings.length)) - message.bindings = []; - message.bindings.push($root.google.iam.v1.Binding.decode(reader, reader.uint32())); - break; - case 3: - message.etag = reader.bytes(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; /** - * Decodes a Policy message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.iam.v1.Policy - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.Policy} Policy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef UpdateTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic */ - Policy.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; /** - * Verifies a Policy message. - * @function verify - * @memberof google.iam.v1.Policy - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not + * Calls UpdateTopic. + * @function updateTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.UpdateTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 */ - Policy.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.version != null && message.hasOwnProperty("version")) - if (!$util.isInteger(message.version)) - return "version: integer expected"; - if (message.bindings != null && message.hasOwnProperty("bindings")) { - if (!Array.isArray(message.bindings)) - return "bindings: array expected"; - for (var i = 0; i < message.bindings.length; ++i) { - var error = $root.google.iam.v1.Binding.verify(message.bindings[i]); - if (error) - return "bindings." + error; - } - } - if (message.etag != null && message.hasOwnProperty("etag")) - if (!(message.etag && typeof message.etag.length === "number" || $util.isString(message.etag))) - return "etag: buffer expected"; - return null; - }; + Object.defineProperty(Publisher.prototype.updateTopic = function updateTopic(request, callback) { + return this.rpcCall(updateTopic, $root.google.pubsub.v1.UpdateTopicRequest, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "UpdateTopic" }); /** - * Creates a Policy message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.iam.v1.Policy - * @static - * @param {Object.} object Plain object - * @returns {google.iam.v1.Policy} Policy + * Calls UpdateTopic. + * @function updateTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - Policy.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.Policy) - return object; - var message = new $root.google.iam.v1.Policy(); - if (object.version != null) - message.version = object.version | 0; - if (object.bindings) { - if (!Array.isArray(object.bindings)) - throw TypeError(".google.iam.v1.Policy.bindings: array expected"); - message.bindings = []; - for (var i = 0; i < object.bindings.length; ++i) { - if (typeof object.bindings[i] !== "object") - throw TypeError(".google.iam.v1.Policy.bindings: object expected"); - message.bindings[i] = $root.google.iam.v1.Binding.fromObject(object.bindings[i]); - } - } - if (object.etag != null) - if (typeof object.etag === "string") - $util.base64.decode(object.etag, message.etag = $util.newBuffer($util.base64.length(object.etag)), 0); - else if (object.etag.length) - message.etag = object.etag; - return message; - }; /** - * Creates a plain object from a Policy message. Also converts values to other types if specified. - * @function toObject - * @memberof google.iam.v1.Policy - * @static - * @param {google.iam.v1.Policy} message Policy - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object + * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * @memberof google.pubsub.v1.Publisher + * @typedef PublishCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.PublishResponse} [response] PublishResponse */ - Policy.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.bindings = []; - if (options.defaults) { - object.version = 0; - if (options.bytes === String) - object.etag = ""; - else { - object.etag = []; - if (options.bytes !== Array) - object.etag = $util.newBuffer(object.etag); - } - } - if (message.version != null && message.hasOwnProperty("version")) - object.version = message.version; - if (message.etag != null && message.hasOwnProperty("etag")) - object.etag = options.bytes === String ? $util.base64.encode(message.etag, 0, message.etag.length) : options.bytes === Array ? Array.prototype.slice.call(message.etag) : message.etag; - if (message.bindings && message.bindings.length) { - object.bindings = []; - for (var j = 0; j < message.bindings.length; ++j) - object.bindings[j] = $root.google.iam.v1.Binding.toObject(message.bindings[j], options); - } - return object; - }; /** - * Converts this Policy to JSON. - * @function toJSON - * @memberof google.iam.v1.Policy + * Calls Publish. + * @function publish + * @memberof google.pubsub.v1.Publisher * @instance - * @returns {Object.} JSON object + * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object + * @param {google.pubsub.v1.Publisher.PublishCallback} callback Node-style callback called with the error, if any, and PublishResponse + * @returns {undefined} + * @variation 1 */ - Policy.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return Policy; - })(); - - v1.Binding = (function() { + Object.defineProperty(Publisher.prototype.publish = function publish(request, callback) { + return this.rpcCall(publish, $root.google.pubsub.v1.PublishRequest, $root.google.pubsub.v1.PublishResponse, request, callback); + }, "name", { value: "Publish" }); /** - * Properties of a Binding. - * @memberof google.iam.v1 - * @interface IBinding - * @property {string|null} [role] Binding role - * @property {Array.|null} [members] Binding members - * @property {google.type.IExpr|null} [condition] Binding condition + * Calls Publish. + * @function publish + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ /** - * Constructs a new Binding. - * @memberof google.iam.v1 - * @classdesc Represents a Binding. - * @implements IBinding - * @constructor - * @param {google.iam.v1.IBinding=} [properties] Properties to set + * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef GetTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Topic} [response] Topic */ - function Binding(properties) { - this.members = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } /** - * Binding role. - * @member {string} role - * @memberof google.iam.v1.Binding + * Calls GetTopic. + * @function getTopic + * @memberof google.pubsub.v1.Publisher * @instance + * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.GetTopicCallback} callback Node-style callback called with the error, if any, and Topic + * @returns {undefined} + * @variation 1 */ - Binding.prototype.role = ""; + Object.defineProperty(Publisher.prototype.getTopic = function getTopic(request, callback) { + return this.rpcCall(getTopic, $root.google.pubsub.v1.GetTopicRequest, $root.google.pubsub.v1.Topic, request, callback); + }, "name", { value: "GetTopic" }); /** - * Binding members. - * @member {Array.} members - * @memberof google.iam.v1.Binding + * Calls GetTopic. + * @function getTopic + * @memberof google.pubsub.v1.Publisher * @instance + * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - Binding.prototype.members = $util.emptyArray; /** - * Binding condition. - * @member {google.type.IExpr|null|undefined} condition - * @memberof google.iam.v1.Binding - * @instance + * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicsResponse} [response] ListTopicsResponse */ - Binding.prototype.condition = null; /** - * Creates a new Binding instance using the specified properties. - * @function create - * @memberof google.iam.v1.Binding - * @static - * @param {google.iam.v1.IBinding=} [properties] Properties to set - * @returns {google.iam.v1.Binding} Binding instance + * Calls ListTopics. + * @function listTopics + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicsCallback} callback Node-style callback called with the error, if any, and ListTopicsResponse + * @returns {undefined} + * @variation 1 */ - Binding.create = function create(properties) { - return new Binding(properties); - }; + Object.defineProperty(Publisher.prototype.listTopics = function listTopics(request, callback) { + return this.rpcCall(listTopics, $root.google.pubsub.v1.ListTopicsRequest, $root.google.pubsub.v1.ListTopicsResponse, request, callback); + }, "name", { value: "ListTopics" }); /** - * Encodes the specified Binding message. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @function encode - * @memberof google.iam.v1.Binding - * @static - * @param {google.iam.v1.IBinding} message Binding message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * Calls ListTopics. + * @function listTopics + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - Binding.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.role != null && message.hasOwnProperty("role")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.role); - if (message.members != null && message.members.length) - for (var i = 0; i < message.members.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.members[i]); - if (message.condition != null && message.hasOwnProperty("condition")) - $root.google.type.Expr.encode(message.condition, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; /** - * Encodes the specified Binding message, length delimited. Does not implicitly {@link google.iam.v1.Binding.verify|verify} messages. - * @function encodeDelimited - * @memberof google.iam.v1.Binding - * @static - * @param {google.iam.v1.IBinding} message Binding message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicSubscriptionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} [response] ListTopicSubscriptionsResponse */ - Binding.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; /** - * Decodes a Binding message from the specified reader or buffer. - * @function decode - * @memberof google.iam.v1.Binding - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.Binding} Binding - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls ListTopicSubscriptions. + * @function listTopicSubscriptions + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse + * @returns {undefined} + * @variation 1 */ - Binding.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.Binding(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.role = reader.string(); - break; - case 2: - if (!(message.members && message.members.length)) - message.members = []; - message.members.push(reader.string()); - break; - case 3: - message.condition = $root.google.type.Expr.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + Object.defineProperty(Publisher.prototype.listTopicSubscriptions = function listTopicSubscriptions(request, callback) { + return this.rpcCall(listTopicSubscriptions, $root.google.pubsub.v1.ListTopicSubscriptionsRequest, $root.google.pubsub.v1.ListTopicSubscriptionsResponse, request, callback); + }, "name", { value: "ListTopicSubscriptions" }); /** - * Decodes a Binding message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.iam.v1.Binding - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.Binding} Binding - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing + * Calls ListTopicSubscriptions. + * @function listTopicSubscriptions + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - Binding.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; /** - * Verifies a Binding message. - * @function verify - * @memberof google.iam.v1.Binding - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not + * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * @memberof google.pubsub.v1.Publisher + * @typedef ListTopicSnapshotsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListTopicSnapshotsResponse} [response] ListTopicSnapshotsResponse */ - Binding.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.role != null && message.hasOwnProperty("role")) - if (!$util.isString(message.role)) - return "role: string expected"; - if (message.members != null && message.hasOwnProperty("members")) { - if (!Array.isArray(message.members)) - return "members: array expected"; - for (var i = 0; i < message.members.length; ++i) - if (!$util.isString(message.members[i])) - return "members: string[] expected"; - } - if (message.condition != null && message.hasOwnProperty("condition")) { - var error = $root.google.type.Expr.verify(message.condition); - if (error) - return "condition." + error; - } - return null; - }; /** - * Creates a Binding message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.iam.v1.Binding - * @static - * @param {Object.} object Plain object - * @returns {google.iam.v1.Binding} Binding + * Calls ListTopicSnapshots. + * @function listTopicSnapshots + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object + * @param {google.pubsub.v1.Publisher.ListTopicSnapshotsCallback} callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse + * @returns {undefined} + * @variation 1 */ - Binding.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.Binding) - return object; - var message = new $root.google.iam.v1.Binding(); - if (object.role != null) - message.role = String(object.role); - if (object.members) { - if (!Array.isArray(object.members)) - throw TypeError(".google.iam.v1.Binding.members: array expected"); - message.members = []; - for (var i = 0; i < object.members.length; ++i) - message.members[i] = String(object.members[i]); - } - if (object.condition != null) { - if (typeof object.condition !== "object") - throw TypeError(".google.iam.v1.Binding.condition: object expected"); - message.condition = $root.google.type.Expr.fromObject(object.condition); - } - return message; - }; + Object.defineProperty(Publisher.prototype.listTopicSnapshots = function listTopicSnapshots(request, callback) { + return this.rpcCall(listTopicSnapshots, $root.google.pubsub.v1.ListTopicSnapshotsRequest, $root.google.pubsub.v1.ListTopicSnapshotsResponse, request, callback); + }, "name", { value: "ListTopicSnapshots" }); /** - * Creates a plain object from a Binding message. Also converts values to other types if specified. - * @function toObject - * @memberof google.iam.v1.Binding - * @static - * @param {google.iam.v1.Binding} message Binding - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object + * Calls ListTopicSnapshots. + * @function listTopicSnapshots + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - Binding.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.members = []; - if (options.defaults) { - object.role = ""; - object.condition = null; - } - if (message.role != null && message.hasOwnProperty("role")) - object.role = message.role; - if (message.members && message.members.length) { - object.members = []; - for (var j = 0; j < message.members.length; ++j) - object.members[j] = message.members[j]; - } - if (message.condition != null && message.hasOwnProperty("condition")) - object.condition = $root.google.type.Expr.toObject(message.condition, options); - return object; - }; /** - * Converts this Binding to JSON. - * @function toJSON - * @memberof google.iam.v1.Binding + * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * @memberof google.pubsub.v1.Publisher + * @typedef DeleteTopicCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls DeleteTopic. + * @function deleteTopic + * @memberof google.pubsub.v1.Publisher * @instance - * @returns {Object.} JSON object + * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object + * @param {google.pubsub.v1.Publisher.DeleteTopicCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.deleteTopic = function deleteTopic(request, callback) { + return this.rpcCall(deleteTopic, $root.google.pubsub.v1.DeleteTopicRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteTopic" }); + + /** + * Calls DeleteTopic. + * @function deleteTopic + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object + * @returns {Promise} Promise + * @variation 2 */ - Binding.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - return Binding; + return Publisher; })(); - v1.PolicyDelta = (function() { + v1.MessageStoragePolicy = (function() { /** - * Properties of a PolicyDelta. - * @memberof google.iam.v1 - * @interface IPolicyDelta - * @property {Array.|null} [bindingDeltas] PolicyDelta bindingDeltas - * @property {Array.|null} [auditConfigDeltas] PolicyDelta auditConfigDeltas + * Properties of a MessageStoragePolicy. + * @memberof google.pubsub.v1 + * @interface IMessageStoragePolicy + * @property {Array.|null} [allowedPersistenceRegions] MessageStoragePolicy allowedPersistenceRegions */ /** - * Constructs a new PolicyDelta. - * @memberof google.iam.v1 - * @classdesc Represents a PolicyDelta. - * @implements IPolicyDelta + * Constructs a new MessageStoragePolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents a MessageStoragePolicy. + * @implements IMessageStoragePolicy * @constructor - * @param {google.iam.v1.IPolicyDelta=} [properties] Properties to set + * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set */ - function PolicyDelta(properties) { - this.bindingDeltas = []; - this.auditConfigDeltas = []; + function MessageStoragePolicy(properties) { + this.allowedPersistenceRegions = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -602,94 +382,78 @@ } /** - * PolicyDelta bindingDeltas. - * @member {Array.} bindingDeltas - * @memberof google.iam.v1.PolicyDelta - * @instance - */ - PolicyDelta.prototype.bindingDeltas = $util.emptyArray; - - /** - * PolicyDelta auditConfigDeltas. - * @member {Array.} auditConfigDeltas - * @memberof google.iam.v1.PolicyDelta + * MessageStoragePolicy allowedPersistenceRegions. + * @member {Array.} allowedPersistenceRegions + * @memberof google.pubsub.v1.MessageStoragePolicy * @instance */ - PolicyDelta.prototype.auditConfigDeltas = $util.emptyArray; + MessageStoragePolicy.prototype.allowedPersistenceRegions = $util.emptyArray; /** - * Creates a new PolicyDelta instance using the specified properties. + * Creates a new MessageStoragePolicy instance using the specified properties. * @function create - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @static - * @param {google.iam.v1.IPolicyDelta=} [properties] Properties to set - * @returns {google.iam.v1.PolicyDelta} PolicyDelta instance + * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy instance */ - PolicyDelta.create = function create(properties) { - return new PolicyDelta(properties); + MessageStoragePolicy.create = function create(properties) { + return new MessageStoragePolicy(properties); }; /** - * Encodes the specified PolicyDelta message. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. * @function encode - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @static - * @param {google.iam.v1.IPolicyDelta} message PolicyDelta message or plain object to encode + * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PolicyDelta.encode = function encode(message, writer) { + MessageStoragePolicy.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.bindingDeltas != null && message.bindingDeltas.length) - for (var i = 0; i < message.bindingDeltas.length; ++i) - $root.google.iam.v1.BindingDelta.encode(message.bindingDeltas[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.auditConfigDeltas != null && message.auditConfigDeltas.length) - for (var i = 0; i < message.auditConfigDeltas.length; ++i) - $root.google.iam.v1.AuditConfigDelta.encode(message.auditConfigDeltas[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.allowedPersistenceRegions != null && message.allowedPersistenceRegions.length) + for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.allowedPersistenceRegions[i]); return writer; }; /** - * Encodes the specified PolicyDelta message, length delimited. Does not implicitly {@link google.iam.v1.PolicyDelta.verify|verify} messages. + * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @static - * @param {google.iam.v1.IPolicyDelta} message PolicyDelta message or plain object to encode + * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PolicyDelta.encodeDelimited = function encodeDelimited(message, writer) { + MessageStoragePolicy.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a PolicyDelta message from the specified reader or buffer. + * Decodes a MessageStoragePolicy message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.PolicyDelta} PolicyDelta + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PolicyDelta.decode = function decode(reader, length) { + MessageStoragePolicy.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.PolicyDelta(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.MessageStoragePolicy(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.bindingDeltas && message.bindingDeltas.length)) - message.bindingDeltas = []; - message.bindingDeltas.push($root.google.iam.v1.BindingDelta.decode(reader, reader.uint32())); - break; - case 2: - if (!(message.auditConfigDeltas && message.auditConfigDeltas.length)) - message.auditConfigDeltas = []; - message.auditConfigDeltas.push($root.google.iam.v1.AuditConfigDelta.decode(reader, reader.uint32())); + if (!(message.allowedPersistenceRegions && message.allowedPersistenceRegions.length)) + message.allowedPersistenceRegions = []; + message.allowedPersistenceRegions.push(reader.string()); break; default: reader.skipType(tag & 7); @@ -700,153 +464,123 @@ }; /** - * Decodes a PolicyDelta message from the specified reader or buffer, length delimited. + * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.PolicyDelta} PolicyDelta + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PolicyDelta.decodeDelimited = function decodeDelimited(reader) { + MessageStoragePolicy.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a PolicyDelta message. + * Verifies a MessageStoragePolicy message. * @function verify - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - PolicyDelta.verify = function verify(message) { + MessageStoragePolicy.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.bindingDeltas != null && message.hasOwnProperty("bindingDeltas")) { - if (!Array.isArray(message.bindingDeltas)) - return "bindingDeltas: array expected"; - for (var i = 0; i < message.bindingDeltas.length; ++i) { - var error = $root.google.iam.v1.BindingDelta.verify(message.bindingDeltas[i]); - if (error) - return "bindingDeltas." + error; - } - } - if (message.auditConfigDeltas != null && message.hasOwnProperty("auditConfigDeltas")) { - if (!Array.isArray(message.auditConfigDeltas)) - return "auditConfigDeltas: array expected"; - for (var i = 0; i < message.auditConfigDeltas.length; ++i) { - var error = $root.google.iam.v1.AuditConfigDelta.verify(message.auditConfigDeltas[i]); - if (error) - return "auditConfigDeltas." + error; - } + if (message.allowedPersistenceRegions != null && message.hasOwnProperty("allowedPersistenceRegions")) { + if (!Array.isArray(message.allowedPersistenceRegions)) + return "allowedPersistenceRegions: array expected"; + for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) + if (!$util.isString(message.allowedPersistenceRegions[i])) + return "allowedPersistenceRegions: string[] expected"; } return null; }; /** - * Creates a PolicyDelta message from a plain object. Also converts values to their respective internal types. + * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.PolicyDelta} PolicyDelta + * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy */ - PolicyDelta.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.PolicyDelta) + MessageStoragePolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.MessageStoragePolicy) return object; - var message = new $root.google.iam.v1.PolicyDelta(); - if (object.bindingDeltas) { - if (!Array.isArray(object.bindingDeltas)) - throw TypeError(".google.iam.v1.PolicyDelta.bindingDeltas: array expected"); - message.bindingDeltas = []; - for (var i = 0; i < object.bindingDeltas.length; ++i) { - if (typeof object.bindingDeltas[i] !== "object") - throw TypeError(".google.iam.v1.PolicyDelta.bindingDeltas: object expected"); - message.bindingDeltas[i] = $root.google.iam.v1.BindingDelta.fromObject(object.bindingDeltas[i]); - } - } - if (object.auditConfigDeltas) { - if (!Array.isArray(object.auditConfigDeltas)) - throw TypeError(".google.iam.v1.PolicyDelta.auditConfigDeltas: array expected"); - message.auditConfigDeltas = []; - for (var i = 0; i < object.auditConfigDeltas.length; ++i) { - if (typeof object.auditConfigDeltas[i] !== "object") - throw TypeError(".google.iam.v1.PolicyDelta.auditConfigDeltas: object expected"); - message.auditConfigDeltas[i] = $root.google.iam.v1.AuditConfigDelta.fromObject(object.auditConfigDeltas[i]); - } + var message = new $root.google.pubsub.v1.MessageStoragePolicy(); + if (object.allowedPersistenceRegions) { + if (!Array.isArray(object.allowedPersistenceRegions)) + throw TypeError(".google.pubsub.v1.MessageStoragePolicy.allowedPersistenceRegions: array expected"); + message.allowedPersistenceRegions = []; + for (var i = 0; i < object.allowedPersistenceRegions.length; ++i) + message.allowedPersistenceRegions[i] = String(object.allowedPersistenceRegions[i]); } return message; }; /** - * Creates a plain object from a PolicyDelta message. Also converts values to other types if specified. + * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @static - * @param {google.iam.v1.PolicyDelta} message PolicyDelta + * @param {google.pubsub.v1.MessageStoragePolicy} message MessageStoragePolicy * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - PolicyDelta.toObject = function toObject(message, options) { + MessageStoragePolicy.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) { - object.bindingDeltas = []; - object.auditConfigDeltas = []; - } - if (message.bindingDeltas && message.bindingDeltas.length) { - object.bindingDeltas = []; - for (var j = 0; j < message.bindingDeltas.length; ++j) - object.bindingDeltas[j] = $root.google.iam.v1.BindingDelta.toObject(message.bindingDeltas[j], options); - } - if (message.auditConfigDeltas && message.auditConfigDeltas.length) { - object.auditConfigDeltas = []; - for (var j = 0; j < message.auditConfigDeltas.length; ++j) - object.auditConfigDeltas[j] = $root.google.iam.v1.AuditConfigDelta.toObject(message.auditConfigDeltas[j], options); + if (options.arrays || options.defaults) + object.allowedPersistenceRegions = []; + if (message.allowedPersistenceRegions && message.allowedPersistenceRegions.length) { + object.allowedPersistenceRegions = []; + for (var j = 0; j < message.allowedPersistenceRegions.length; ++j) + object.allowedPersistenceRegions[j] = message.allowedPersistenceRegions[j]; } return object; }; /** - * Converts this PolicyDelta to JSON. + * Converts this MessageStoragePolicy to JSON. * @function toJSON - * @memberof google.iam.v1.PolicyDelta + * @memberof google.pubsub.v1.MessageStoragePolicy * @instance * @returns {Object.} JSON object */ - PolicyDelta.prototype.toJSON = function toJSON() { + MessageStoragePolicy.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return PolicyDelta; + return MessageStoragePolicy; })(); - v1.BindingDelta = (function() { + v1.Topic = (function() { /** - * Properties of a BindingDelta. - * @memberof google.iam.v1 - * @interface IBindingDelta - * @property {google.iam.v1.BindingDelta.Action|null} [action] BindingDelta action - * @property {string|null} [role] BindingDelta role - * @property {string|null} [member] BindingDelta member - * @property {google.type.IExpr|null} [condition] BindingDelta condition + * Properties of a Topic. + * @memberof google.pubsub.v1 + * @interface ITopic + * @property {string|null} [name] Topic name + * @property {Object.|null} [labels] Topic labels + * @property {google.pubsub.v1.IMessageStoragePolicy|null} [messageStoragePolicy] Topic messageStoragePolicy + * @property {string|null} [kmsKeyName] Topic kmsKeyName */ /** - * Constructs a new BindingDelta. - * @memberof google.iam.v1 - * @classdesc Represents a BindingDelta. - * @implements IBindingDelta + * Constructs a new Topic. + * @memberof google.pubsub.v1 + * @classdesc Represents a Topic. + * @implements ITopic * @constructor - * @param {google.iam.v1.IBindingDelta=} [properties] Properties to set + * @param {google.pubsub.v1.ITopic=} [properties] Properties to set */ - function BindingDelta(properties) { + function Topic(properties) { + this.labels = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -854,114 +588,120 @@ } /** - * BindingDelta action. - * @member {google.iam.v1.BindingDelta.Action} action - * @memberof google.iam.v1.BindingDelta + * Topic name. + * @member {string} name + * @memberof google.pubsub.v1.Topic * @instance */ - BindingDelta.prototype.action = 0; + Topic.prototype.name = ""; /** - * BindingDelta role. - * @member {string} role - * @memberof google.iam.v1.BindingDelta + * Topic labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Topic * @instance */ - BindingDelta.prototype.role = ""; + Topic.prototype.labels = $util.emptyObject; /** - * BindingDelta member. - * @member {string} member - * @memberof google.iam.v1.BindingDelta + * Topic messageStoragePolicy. + * @member {google.pubsub.v1.IMessageStoragePolicy|null|undefined} messageStoragePolicy + * @memberof google.pubsub.v1.Topic * @instance */ - BindingDelta.prototype.member = ""; + Topic.prototype.messageStoragePolicy = null; /** - * BindingDelta condition. - * @member {google.type.IExpr|null|undefined} condition - * @memberof google.iam.v1.BindingDelta + * Topic kmsKeyName. + * @member {string} kmsKeyName + * @memberof google.pubsub.v1.Topic * @instance */ - BindingDelta.prototype.condition = null; + Topic.prototype.kmsKeyName = ""; /** - * Creates a new BindingDelta instance using the specified properties. + * Creates a new Topic instance using the specified properties. * @function create - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @static - * @param {google.iam.v1.IBindingDelta=} [properties] Properties to set - * @returns {google.iam.v1.BindingDelta} BindingDelta instance + * @param {google.pubsub.v1.ITopic=} [properties] Properties to set + * @returns {google.pubsub.v1.Topic} Topic instance */ - BindingDelta.create = function create(properties) { - return new BindingDelta(properties); + Topic.create = function create(properties) { + return new Topic(properties); }; /** - * Encodes the specified BindingDelta message. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. * @function encode - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @static - * @param {google.iam.v1.IBindingDelta} message BindingDelta message or plain object to encode + * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - BindingDelta.encode = function encode(message, writer) { + Topic.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.action != null && message.hasOwnProperty("action")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.action); - if (message.role != null && message.hasOwnProperty("role")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.role); - if (message.member != null && message.hasOwnProperty("member")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.member); - if (message.condition != null && message.hasOwnProperty("condition")) - $root.google.type.Expr.encode(message.condition, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) + $root.google.pubsub.v1.MessageStoragePolicy.encode(message.messageStoragePolicy, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.kmsKeyName); return writer; }; /** - * Encodes the specified BindingDelta message, length delimited. Does not implicitly {@link google.iam.v1.BindingDelta.verify|verify} messages. + * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @static - * @param {google.iam.v1.IBindingDelta} message BindingDelta message or plain object to encode + * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - BindingDelta.encodeDelimited = function encodeDelimited(message, writer) { + Topic.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a BindingDelta message from the specified reader or buffer. + * Decodes a Topic message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.BindingDelta} BindingDelta + * @returns {google.pubsub.v1.Topic} Topic * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - BindingDelta.decode = function decode(reader, length) { + Topic.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.BindingDelta(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.action = reader.int32(); + message.name = reader.string(); break; case 2: - message.role = reader.string(); + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); break; case 3: - message.member = reader.string(); + message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); break; - case 4: - message.condition = $root.google.type.Expr.decode(reader, reader.uint32()); + case 5: + message.kmsKeyName = reader.string(); break; default: reader.skipType(tag & 7); @@ -972,174 +712,157 @@ }; /** - * Decodes a BindingDelta message from the specified reader or buffer, length delimited. + * Decodes a Topic message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.BindingDelta} BindingDelta + * @returns {google.pubsub.v1.Topic} Topic * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - BindingDelta.decodeDelimited = function decodeDelimited(reader) { + Topic.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a BindingDelta message. + * Verifies a Topic message. * @function verify - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - BindingDelta.verify = function verify(message) { + Topic.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.action != null && message.hasOwnProperty("action")) - switch (message.action) { - default: - return "action: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.role != null && message.hasOwnProperty("role")) - if (!$util.isString(message.role)) - return "role: string expected"; - if (message.member != null && message.hasOwnProperty("member")) - if (!$util.isString(message.member)) - return "member: string expected"; - if (message.condition != null && message.hasOwnProperty("condition")) { - var error = $root.google.type.Expr.verify(message.condition); + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; + } + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) { + var error = $root.google.pubsub.v1.MessageStoragePolicy.verify(message.messageStoragePolicy); if (error) - return "condition." + error; + return "messageStoragePolicy." + error; } + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + if (!$util.isString(message.kmsKeyName)) + return "kmsKeyName: string expected"; return null; }; /** - * Creates a BindingDelta message from a plain object. Also converts values to their respective internal types. + * Creates a Topic message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.BindingDelta} BindingDelta + * @returns {google.pubsub.v1.Topic} Topic */ - BindingDelta.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.BindingDelta) + Topic.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Topic) return object; - var message = new $root.google.iam.v1.BindingDelta(); - switch (object.action) { - case "ACTION_UNSPECIFIED": - case 0: - message.action = 0; - break; - case "ADD": - case 1: - message.action = 1; - break; - case "REMOVE": - case 2: - message.action = 2; - break; + var message = new $root.google.pubsub.v1.Topic(); + if (object.name != null) + message.name = String(object.name); + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Topic.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); } - if (object.role != null) - message.role = String(object.role); - if (object.member != null) - message.member = String(object.member); - if (object.condition != null) { - if (typeof object.condition !== "object") - throw TypeError(".google.iam.v1.BindingDelta.condition: object expected"); - message.condition = $root.google.type.Expr.fromObject(object.condition); + if (object.messageStoragePolicy != null) { + if (typeof object.messageStoragePolicy !== "object") + throw TypeError(".google.pubsub.v1.Topic.messageStoragePolicy: object expected"); + message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.fromObject(object.messageStoragePolicy); } + if (object.kmsKeyName != null) + message.kmsKeyName = String(object.kmsKeyName); return message; }; /** - * Creates a plain object from a BindingDelta message. Also converts values to other types if specified. + * Creates a plain object from a Topic message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @static - * @param {google.iam.v1.BindingDelta} message BindingDelta + * @param {google.pubsub.v1.Topic} message Topic * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - BindingDelta.toObject = function toObject(message, options) { + Topic.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; + if (options.objects || options.defaults) + object.labels = {}; if (options.defaults) { - object.action = options.enums === String ? "ACTION_UNSPECIFIED" : 0; - object.role = ""; - object.member = ""; - object.condition = null; - } - if (message.action != null && message.hasOwnProperty("action")) - object.action = options.enums === String ? $root.google.iam.v1.BindingDelta.Action[message.action] : message.action; - if (message.role != null && message.hasOwnProperty("role")) - object.role = message.role; - if (message.member != null && message.hasOwnProperty("member")) - object.member = message.member; - if (message.condition != null && message.hasOwnProperty("condition")) - object.condition = $root.google.type.Expr.toObject(message.condition, options); + object.name = ""; + object.messageStoragePolicy = null; + object.kmsKeyName = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } + if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) + object.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.toObject(message.messageStoragePolicy, options); + if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + object.kmsKeyName = message.kmsKeyName; return object; }; /** - * Converts this BindingDelta to JSON. + * Converts this Topic to JSON. * @function toJSON - * @memberof google.iam.v1.BindingDelta + * @memberof google.pubsub.v1.Topic * @instance * @returns {Object.} JSON object */ - BindingDelta.prototype.toJSON = function toJSON() { + Topic.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - /** - * Action enum. - * @name google.iam.v1.BindingDelta.Action - * @enum {string} - * @property {number} ACTION_UNSPECIFIED=0 ACTION_UNSPECIFIED value - * @property {number} ADD=1 ADD value - * @property {number} REMOVE=2 REMOVE value - */ - BindingDelta.Action = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "ACTION_UNSPECIFIED"] = 0; - values[valuesById[1] = "ADD"] = 1; - values[valuesById[2] = "REMOVE"] = 2; - return values; - })(); - - return BindingDelta; + return Topic; })(); - v1.AuditConfigDelta = (function() { + v1.PubsubMessage = (function() { /** - * Properties of an AuditConfigDelta. - * @memberof google.iam.v1 - * @interface IAuditConfigDelta - * @property {google.iam.v1.AuditConfigDelta.Action|null} [action] AuditConfigDelta action - * @property {string|null} [service] AuditConfigDelta service - * @property {string|null} [exemptedMember] AuditConfigDelta exemptedMember - * @property {string|null} [logType] AuditConfigDelta logType + * Properties of a PubsubMessage. + * @memberof google.pubsub.v1 + * @interface IPubsubMessage + * @property {Uint8Array|null} [data] PubsubMessage data + * @property {Object.|null} [attributes] PubsubMessage attributes + * @property {string|null} [messageId] PubsubMessage messageId + * @property {google.protobuf.ITimestamp|null} [publishTime] PubsubMessage publishTime + * @property {string|null} [orderingKey] PubsubMessage orderingKey */ /** - * Constructs a new AuditConfigDelta. - * @memberof google.iam.v1 - * @classdesc Represents an AuditConfigDelta. - * @implements IAuditConfigDelta + * Constructs a new PubsubMessage. + * @memberof google.pubsub.v1 + * @classdesc Represents a PubsubMessage. + * @implements IPubsubMessage * @constructor - * @param {google.iam.v1.IAuditConfigDelta=} [properties] Properties to set + * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set */ - function AuditConfigDelta(properties) { + function PubsubMessage(properties) { + this.attributes = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -1147,114 +870,133 @@ } /** - * AuditConfigDelta action. - * @member {google.iam.v1.AuditConfigDelta.Action} action - * @memberof google.iam.v1.AuditConfigDelta + * PubsubMessage data. + * @member {Uint8Array} data + * @memberof google.pubsub.v1.PubsubMessage + * @instance + */ + PubsubMessage.prototype.data = $util.newBuffer([]); + + /** + * PubsubMessage attributes. + * @member {Object.} attributes + * @memberof google.pubsub.v1.PubsubMessage * @instance */ - AuditConfigDelta.prototype.action = 0; + PubsubMessage.prototype.attributes = $util.emptyObject; /** - * AuditConfigDelta service. - * @member {string} service - * @memberof google.iam.v1.AuditConfigDelta + * PubsubMessage messageId. + * @member {string} messageId + * @memberof google.pubsub.v1.PubsubMessage * @instance */ - AuditConfigDelta.prototype.service = ""; + PubsubMessage.prototype.messageId = ""; /** - * AuditConfigDelta exemptedMember. - * @member {string} exemptedMember - * @memberof google.iam.v1.AuditConfigDelta + * PubsubMessage publishTime. + * @member {google.protobuf.ITimestamp|null|undefined} publishTime + * @memberof google.pubsub.v1.PubsubMessage * @instance */ - AuditConfigDelta.prototype.exemptedMember = ""; + PubsubMessage.prototype.publishTime = null; /** - * AuditConfigDelta logType. - * @member {string} logType - * @memberof google.iam.v1.AuditConfigDelta + * PubsubMessage orderingKey. + * @member {string} orderingKey + * @memberof google.pubsub.v1.PubsubMessage * @instance */ - AuditConfigDelta.prototype.logType = ""; + PubsubMessage.prototype.orderingKey = ""; /** - * Creates a new AuditConfigDelta instance using the specified properties. + * Creates a new PubsubMessage instance using the specified properties. * @function create - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @static - * @param {google.iam.v1.IAuditConfigDelta=} [properties] Properties to set - * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta instance + * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage instance */ - AuditConfigDelta.create = function create(properties) { - return new AuditConfigDelta(properties); + PubsubMessage.create = function create(properties) { + return new PubsubMessage(properties); }; /** - * Encodes the specified AuditConfigDelta message. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. * @function encode - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @static - * @param {google.iam.v1.IAuditConfigDelta} message AuditConfigDelta message or plain object to encode + * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - AuditConfigDelta.encode = function encode(message, writer) { + PubsubMessage.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.action != null && message.hasOwnProperty("action")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.action); - if (message.service != null && message.hasOwnProperty("service")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.service); - if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.exemptedMember); - if (message.logType != null && message.hasOwnProperty("logType")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.logType); + if (message.data != null && message.hasOwnProperty("data")) + writer.uint32(/* id 1, wireType 2 =*/10).bytes(message.data); + if (message.attributes != null && message.hasOwnProperty("attributes")) + for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); + if (message.messageId != null && message.hasOwnProperty("messageId")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.messageId); + if (message.publishTime != null && message.hasOwnProperty("publishTime")) + $root.google.protobuf.Timestamp.encode(message.publishTime, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.orderingKey); return writer; }; /** - * Encodes the specified AuditConfigDelta message, length delimited. Does not implicitly {@link google.iam.v1.AuditConfigDelta.verify|verify} messages. + * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @static - * @param {google.iam.v1.IAuditConfigDelta} message AuditConfigDelta message or plain object to encode + * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - AuditConfigDelta.encodeDelimited = function encodeDelimited(message, writer) { + PubsubMessage.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an AuditConfigDelta message from the specified reader or buffer. + * Decodes a PubsubMessage message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AuditConfigDelta.decode = function decode(reader, length) { + PubsubMessage.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.AuditConfigDelta(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.action = reader.int32(); + message.data = reader.bytes(); break; case 2: - message.service = reader.string(); + reader.skip().pos++; + if (message.attributes === $util.emptyObject) + message.attributes = {}; + key = reader.string(); + reader.pos++; + message.attributes[key] = reader.string(); break; case 3: - message.exemptedMember = reader.string(); + message.messageId = reader.string(); break; case 4: - message.logType = reader.string(); + message.publishTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + case 5: + message.orderingKey = reader.string(); break; default: reader.skipType(tag & 7); @@ -1265,166 +1007,169 @@ }; /** - * Decodes an AuditConfigDelta message from the specified reader or buffer, length delimited. + * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AuditConfigDelta.decodeDelimited = function decodeDelimited(reader) { + PubsubMessage.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an AuditConfigDelta message. + * Verifies a PubsubMessage message. * @function verify - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - AuditConfigDelta.verify = function verify(message) { + PubsubMessage.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.action != null && message.hasOwnProperty("action")) - switch (message.action) { - default: - return "action: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.service != null && message.hasOwnProperty("service")) - if (!$util.isString(message.service)) - return "service: string expected"; - if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) - if (!$util.isString(message.exemptedMember)) - return "exemptedMember: string expected"; - if (message.logType != null && message.hasOwnProperty("logType")) - if (!$util.isString(message.logType)) - return "logType: string expected"; - return null; - }; - - /** - * Creates an AuditConfigDelta message from a plain object. Also converts values to their respective internal types. + if (message.data != null && message.hasOwnProperty("data")) + if (!(message.data && typeof message.data.length === "number" || $util.isString(message.data))) + return "data: buffer expected"; + if (message.attributes != null && message.hasOwnProperty("attributes")) { + if (!$util.isObject(message.attributes)) + return "attributes: object expected"; + var key = Object.keys(message.attributes); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.attributes[key[i]])) + return "attributes: string{k:string} expected"; + } + if (message.messageId != null && message.hasOwnProperty("messageId")) + if (!$util.isString(message.messageId)) + return "messageId: string expected"; + if (message.publishTime != null && message.hasOwnProperty("publishTime")) { + var error = $root.google.protobuf.Timestamp.verify(message.publishTime); + if (error) + return "publishTime." + error; + } + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + if (!$util.isString(message.orderingKey)) + return "orderingKey: string expected"; + return null; + }; + + /** + * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.AuditConfigDelta} AuditConfigDelta + * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage */ - AuditConfigDelta.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.AuditConfigDelta) + PubsubMessage.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PubsubMessage) return object; - var message = new $root.google.iam.v1.AuditConfigDelta(); - switch (object.action) { - case "ACTION_UNSPECIFIED": - case 0: - message.action = 0; - break; - case "ADD": - case 1: - message.action = 1; - break; - case "REMOVE": - case 2: - message.action = 2; - break; + var message = new $root.google.pubsub.v1.PubsubMessage(); + if (object.data != null) + if (typeof object.data === "string") + $util.base64.decode(object.data, message.data = $util.newBuffer($util.base64.length(object.data)), 0); + else if (object.data.length) + message.data = object.data; + if (object.attributes) { + if (typeof object.attributes !== "object") + throw TypeError(".google.pubsub.v1.PubsubMessage.attributes: object expected"); + message.attributes = {}; + for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) + message.attributes[keys[i]] = String(object.attributes[keys[i]]); + } + if (object.messageId != null) + message.messageId = String(object.messageId); + if (object.publishTime != null) { + if (typeof object.publishTime !== "object") + throw TypeError(".google.pubsub.v1.PubsubMessage.publishTime: object expected"); + message.publishTime = $root.google.protobuf.Timestamp.fromObject(object.publishTime); } - if (object.service != null) - message.service = String(object.service); - if (object.exemptedMember != null) - message.exemptedMember = String(object.exemptedMember); - if (object.logType != null) - message.logType = String(object.logType); + if (object.orderingKey != null) + message.orderingKey = String(object.orderingKey); return message; }; /** - * Creates a plain object from an AuditConfigDelta message. Also converts values to other types if specified. + * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @static - * @param {google.iam.v1.AuditConfigDelta} message AuditConfigDelta + * @param {google.pubsub.v1.PubsubMessage} message PubsubMessage * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - AuditConfigDelta.toObject = function toObject(message, options) { + PubsubMessage.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; + if (options.objects || options.defaults) + object.attributes = {}; if (options.defaults) { - object.action = options.enums === String ? "ACTION_UNSPECIFIED" : 0; - object.service = ""; - object.exemptedMember = ""; - object.logType = ""; - } - if (message.action != null && message.hasOwnProperty("action")) - object.action = options.enums === String ? $root.google.iam.v1.AuditConfigDelta.Action[message.action] : message.action; - if (message.service != null && message.hasOwnProperty("service")) - object.service = message.service; - if (message.exemptedMember != null && message.hasOwnProperty("exemptedMember")) - object.exemptedMember = message.exemptedMember; - if (message.logType != null && message.hasOwnProperty("logType")) - object.logType = message.logType; + if (options.bytes === String) + object.data = ""; + else { + object.data = []; + if (options.bytes !== Array) + object.data = $util.newBuffer(object.data); + } + object.messageId = ""; + object.publishTime = null; + object.orderingKey = ""; + } + if (message.data != null && message.hasOwnProperty("data")) + object.data = options.bytes === String ? $util.base64.encode(message.data, 0, message.data.length) : options.bytes === Array ? Array.prototype.slice.call(message.data) : message.data; + var keys2; + if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { + object.attributes = {}; + for (var j = 0; j < keys2.length; ++j) + object.attributes[keys2[j]] = message.attributes[keys2[j]]; + } + if (message.messageId != null && message.hasOwnProperty("messageId")) + object.messageId = message.messageId; + if (message.publishTime != null && message.hasOwnProperty("publishTime")) + object.publishTime = $root.google.protobuf.Timestamp.toObject(message.publishTime, options); + if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + object.orderingKey = message.orderingKey; return object; }; /** - * Converts this AuditConfigDelta to JSON. + * Converts this PubsubMessage to JSON. * @function toJSON - * @memberof google.iam.v1.AuditConfigDelta + * @memberof google.pubsub.v1.PubsubMessage * @instance * @returns {Object.} JSON object */ - AuditConfigDelta.prototype.toJSON = function toJSON() { + PubsubMessage.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - /** - * Action enum. - * @name google.iam.v1.AuditConfigDelta.Action - * @enum {string} - * @property {number} ACTION_UNSPECIFIED=0 ACTION_UNSPECIFIED value - * @property {number} ADD=1 ADD value - * @property {number} REMOVE=2 REMOVE value - */ - AuditConfigDelta.Action = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "ACTION_UNSPECIFIED"] = 0; - values[valuesById[1] = "ADD"] = 1; - values[valuesById[2] = "REMOVE"] = 2; - return values; - })(); - - return AuditConfigDelta; + return PubsubMessage; })(); - v1.GetPolicyOptions = (function() { + v1.GetTopicRequest = (function() { /** - * Properties of a GetPolicyOptions. - * @memberof google.iam.v1 - * @interface IGetPolicyOptions - * @property {number|null} [requestedPolicyVersion] GetPolicyOptions requestedPolicyVersion + * Properties of a GetTopicRequest. + * @memberof google.pubsub.v1 + * @interface IGetTopicRequest + * @property {string|null} [topic] GetTopicRequest topic */ /** - * Constructs a new GetPolicyOptions. - * @memberof google.iam.v1 - * @classdesc Represents a GetPolicyOptions. - * @implements IGetPolicyOptions + * Constructs a new GetTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetTopicRequest. + * @implements IGetTopicRequest * @constructor - * @param {google.iam.v1.IGetPolicyOptions=} [properties] Properties to set + * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set */ - function GetPolicyOptions(properties) { + function GetTopicRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -1432,75 +1177,75 @@ } /** - * GetPolicyOptions requestedPolicyVersion. - * @member {number} requestedPolicyVersion - * @memberof google.iam.v1.GetPolicyOptions + * GetTopicRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.GetTopicRequest * @instance */ - GetPolicyOptions.prototype.requestedPolicyVersion = 0; + GetTopicRequest.prototype.topic = ""; /** - * Creates a new GetPolicyOptions instance using the specified properties. + * Creates a new GetTopicRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @static - * @param {google.iam.v1.IGetPolicyOptions=} [properties] Properties to set - * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions instance + * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest instance */ - GetPolicyOptions.create = function create(properties) { - return new GetPolicyOptions(properties); + GetTopicRequest.create = function create(properties) { + return new GetTopicRequest(properties); }; /** - * Encodes the specified GetPolicyOptions message. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @static - * @param {google.iam.v1.IGetPolicyOptions} message GetPolicyOptions message or plain object to encode + * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetPolicyOptions.encode = function encode(message, writer) { + GetTopicRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.requestedPolicyVersion); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); return writer; }; /** - * Encodes the specified GetPolicyOptions message, length delimited. Does not implicitly {@link google.iam.v1.GetPolicyOptions.verify|verify} messages. + * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @static - * @param {google.iam.v1.IGetPolicyOptions} message GetPolicyOptions message or plain object to encode + * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetPolicyOptions.encodeDelimited = function encodeDelimited(message, writer) { + GetTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a GetPolicyOptions message from the specified reader or buffer. + * Decodes a GetTopicRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetPolicyOptions.decode = function decode(reader, length) { + GetTopicRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.GetPolicyOptions(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetTopicRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.requestedPolicyVersion = reader.int32(); + message.topic = reader.string(); break; default: reader.skipType(tag & 7); @@ -1511,331 +1256,197 @@ }; /** - * Decodes a GetPolicyOptions message from the specified reader or buffer, length delimited. + * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetPolicyOptions.decodeDelimited = function decodeDelimited(reader) { + GetTopicRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a GetPolicyOptions message. + * Verifies a GetTopicRequest message. * @function verify - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - GetPolicyOptions.verify = function verify(message) { + GetTopicRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) - if (!$util.isInteger(message.requestedPolicyVersion)) - return "requestedPolicyVersion: integer expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; return null; }; /** - * Creates a GetPolicyOptions message from a plain object. Also converts values to their respective internal types. + * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.GetPolicyOptions} GetPolicyOptions + * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest */ - GetPolicyOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.GetPolicyOptions) + GetTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetTopicRequest) return object; - var message = new $root.google.iam.v1.GetPolicyOptions(); - if (object.requestedPolicyVersion != null) - message.requestedPolicyVersion = object.requestedPolicyVersion | 0; + var message = new $root.google.pubsub.v1.GetTopicRequest(); + if (object.topic != null) + message.topic = String(object.topic); return message; }; /** - * Creates a plain object from a GetPolicyOptions message. Also converts values to other types if specified. + * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @static - * @param {google.iam.v1.GetPolicyOptions} message GetPolicyOptions + * @param {google.pubsub.v1.GetTopicRequest} message GetTopicRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - GetPolicyOptions.toObject = function toObject(message, options) { + GetTopicRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) - object.requestedPolicyVersion = 0; - if (message.requestedPolicyVersion != null && message.hasOwnProperty("requestedPolicyVersion")) - object.requestedPolicyVersion = message.requestedPolicyVersion; + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; return object; }; /** - * Converts this GetPolicyOptions to JSON. + * Converts this GetTopicRequest to JSON. * @function toJSON - * @memberof google.iam.v1.GetPolicyOptions + * @memberof google.pubsub.v1.GetTopicRequest * @instance * @returns {Object.} JSON object */ - GetPolicyOptions.prototype.toJSON = function toJSON() { + GetTopicRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return GetPolicyOptions; + return GetTopicRequest; })(); - v1.IAMPolicy = (function() { - - /** - * Constructs a new IAMPolicy service. - * @memberof google.iam.v1 - * @classdesc Represents a IAMPolicy - * @extends $protobuf.rpc.Service - * @constructor - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - */ - function IAMPolicy(rpcImpl, requestDelimited, responseDelimited) { - $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); - } - - (IAMPolicy.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = IAMPolicy; + v1.UpdateTopicRequest = (function() { /** - * Creates new IAMPolicy service using the specified rpc implementation. - * @function create - * @memberof google.iam.v1.IAMPolicy - * @static - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - * @returns {IAMPolicy} RPC service. Useful where requests and/or responses are streamed. + * Properties of an UpdateTopicRequest. + * @memberof google.pubsub.v1 + * @interface IUpdateTopicRequest + * @property {google.pubsub.v1.ITopic|null} [topic] UpdateTopicRequest topic + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateTopicRequest updateMask */ - IAMPolicy.create = function create(rpcImpl, requestDelimited, responseDelimited) { - return new this(rpcImpl, requestDelimited, responseDelimited); - }; /** - * Callback as used by {@link google.iam.v1.IAMPolicy#setIamPolicy}. - * @memberof google.iam.v1.IAMPolicy - * @typedef SetIamPolicyCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.iam.v1.Policy} [response] Policy + * Constructs a new UpdateTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an UpdateTopicRequest. + * @implements IUpdateTopicRequest + * @constructor + * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set */ + function UpdateTopicRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * Calls SetIamPolicy. - * @function setIamPolicy - * @memberof google.iam.v1.IAMPolicy + * UpdateTopicRequest topic. + * @member {google.pubsub.v1.ITopic|null|undefined} topic + * @memberof google.pubsub.v1.UpdateTopicRequest * @instance - * @param {google.iam.v1.ISetIamPolicyRequest} request SetIamPolicyRequest message or plain object - * @param {google.iam.v1.IAMPolicy.SetIamPolicyCallback} callback Node-style callback called with the error, if any, and Policy - * @returns {undefined} - * @variation 1 */ - Object.defineProperty(IAMPolicy.prototype.setIamPolicy = function setIamPolicy(request, callback) { - return this.rpcCall(setIamPolicy, $root.google.iam.v1.SetIamPolicyRequest, $root.google.iam.v1.Policy, request, callback); - }, "name", { value: "SetIamPolicy" }); + UpdateTopicRequest.prototype.topic = null; /** - * Calls SetIamPolicy. - * @function setIamPolicy - * @memberof google.iam.v1.IAMPolicy + * UpdateTopicRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateTopicRequest * @instance - * @param {google.iam.v1.ISetIamPolicyRequest} request SetIamPolicyRequest message or plain object - * @returns {Promise} Promise - * @variation 2 */ + UpdateTopicRequest.prototype.updateMask = null; /** - * Callback as used by {@link google.iam.v1.IAMPolicy#getIamPolicy}. - * @memberof google.iam.v1.IAMPolicy - * @typedef GetIamPolicyCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.iam.v1.Policy} [response] Policy + * Creates a new UpdateTopicRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest instance */ + UpdateTopicRequest.create = function create(properties) { + return new UpdateTopicRequest(properties); + }; /** - * Calls GetIamPolicy. - * @function getIamPolicy - * @memberof google.iam.v1.IAMPolicy - * @instance - * @param {google.iam.v1.IGetIamPolicyRequest} request GetIamPolicyRequest message or plain object - * @param {google.iam.v1.IAMPolicy.GetIamPolicyCallback} callback Node-style callback called with the error, if any, and Policy - * @returns {undefined} - * @variation 1 + * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ - Object.defineProperty(IAMPolicy.prototype.getIamPolicy = function getIamPolicy(request, callback) { - return this.rpcCall(getIamPolicy, $root.google.iam.v1.GetIamPolicyRequest, $root.google.iam.v1.Policy, request, callback); - }, "name", { value: "GetIamPolicy" }); + UpdateTopicRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + $root.google.pubsub.v1.Topic.encode(message.topic, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; /** - * Calls GetIamPolicy. - * @function getIamPolicy - * @memberof google.iam.v1.IAMPolicy - * @instance - * @param {google.iam.v1.IGetIamPolicyRequest} request GetIamPolicyRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ + UpdateTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; /** - * Callback as used by {@link google.iam.v1.IAMPolicy#testIamPermissions}. - * @memberof google.iam.v1.IAMPolicy - * @typedef TestIamPermissionsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.iam.v1.TestIamPermissionsResponse} [response] TestIamPermissionsResponse - */ - - /** - * Calls TestIamPermissions. - * @function testIamPermissions - * @memberof google.iam.v1.IAMPolicy - * @instance - * @param {google.iam.v1.ITestIamPermissionsRequest} request TestIamPermissionsRequest message or plain object - * @param {google.iam.v1.IAMPolicy.TestIamPermissionsCallback} callback Node-style callback called with the error, if any, and TestIamPermissionsResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(IAMPolicy.prototype.testIamPermissions = function testIamPermissions(request, callback) { - return this.rpcCall(testIamPermissions, $root.google.iam.v1.TestIamPermissionsRequest, $root.google.iam.v1.TestIamPermissionsResponse, request, callback); - }, "name", { value: "TestIamPermissions" }); - - /** - * Calls TestIamPermissions. - * @function testIamPermissions - * @memberof google.iam.v1.IAMPolicy - * @instance - * @param {google.iam.v1.ITestIamPermissionsRequest} request TestIamPermissionsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ - - return IAMPolicy; - })(); - - v1.SetIamPolicyRequest = (function() { - - /** - * Properties of a SetIamPolicyRequest. - * @memberof google.iam.v1 - * @interface ISetIamPolicyRequest - * @property {string|null} [resource] SetIamPolicyRequest resource - * @property {google.iam.v1.IPolicy|null} [policy] SetIamPolicyRequest policy - */ - - /** - * Constructs a new SetIamPolicyRequest. - * @memberof google.iam.v1 - * @classdesc Represents a SetIamPolicyRequest. - * @implements ISetIamPolicyRequest - * @constructor - * @param {google.iam.v1.ISetIamPolicyRequest=} [properties] Properties to set - */ - function SetIamPolicyRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * SetIamPolicyRequest resource. - * @member {string} resource - * @memberof google.iam.v1.SetIamPolicyRequest - * @instance - */ - SetIamPolicyRequest.prototype.resource = ""; - - /** - * SetIamPolicyRequest policy. - * @member {google.iam.v1.IPolicy|null|undefined} policy - * @memberof google.iam.v1.SetIamPolicyRequest - * @instance - */ - SetIamPolicyRequest.prototype.policy = null; - - /** - * Creates a new SetIamPolicyRequest instance using the specified properties. - * @function create - * @memberof google.iam.v1.SetIamPolicyRequest - * @static - * @param {google.iam.v1.ISetIamPolicyRequest=} [properties] Properties to set - * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest instance - */ - SetIamPolicyRequest.create = function create(properties) { - return new SetIamPolicyRequest(properties); - }; - - /** - * Encodes the specified SetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @function encode - * @memberof google.iam.v1.SetIamPolicyRequest - * @static - * @param {google.iam.v1.ISetIamPolicyRequest} message SetIamPolicyRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SetIamPolicyRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.resource != null && message.hasOwnProperty("resource")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); - if (message.policy != null && message.hasOwnProperty("policy")) - $root.google.iam.v1.Policy.encode(message.policy, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified SetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.SetIamPolicyRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.iam.v1.SetIamPolicyRequest - * @static - * @param {google.iam.v1.ISetIamPolicyRequest} message SetIamPolicyRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SetIamPolicyRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer. + * Decodes an UpdateTopicRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.UpdateTopicRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SetIamPolicyRequest.decode = function decode(reader, length) { + UpdateTopicRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.SetIamPolicyRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateTopicRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.resource = reader.string(); + message.topic = $root.google.pubsub.v1.Topic.decode(reader, reader.uint32()); break; case 2: - message.policy = $root.google.iam.v1.Policy.decode(reader, reader.uint32()); + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -1846,122 +1457,128 @@ }; /** - * Decodes a SetIamPolicyRequest message from the specified reader or buffer, length delimited. + * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.UpdateTopicRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SetIamPolicyRequest.decodeDelimited = function decodeDelimited(reader) { + UpdateTopicRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a SetIamPolicyRequest message. + * Verifies an UpdateTopicRequest message. * @function verify - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.UpdateTopicRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - SetIamPolicyRequest.verify = function verify(message) { + UpdateTopicRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.resource != null && message.hasOwnProperty("resource")) - if (!$util.isString(message.resource)) - return "resource: string expected"; - if (message.policy != null && message.hasOwnProperty("policy")) { - var error = $root.google.iam.v1.Policy.verify(message.policy); + if (message.topic != null && message.hasOwnProperty("topic")) { + var error = $root.google.pubsub.v1.Topic.verify(message.topic); + if (error) + return "topic." + error; + } + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); if (error) - return "policy." + error; + return "updateMask." + error; } return null; }; /** - * Creates a SetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.UpdateTopicRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.SetIamPolicyRequest} SetIamPolicyRequest + * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest */ - SetIamPolicyRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.SetIamPolicyRequest) + UpdateTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateTopicRequest) return object; - var message = new $root.google.iam.v1.SetIamPolicyRequest(); - if (object.resource != null) - message.resource = String(object.resource); - if (object.policy != null) { - if (typeof object.policy !== "object") - throw TypeError(".google.iam.v1.SetIamPolicyRequest.policy: object expected"); - message.policy = $root.google.iam.v1.Policy.fromObject(object.policy); + var message = new $root.google.pubsub.v1.UpdateTopicRequest(); + if (object.topic != null) { + if (typeof object.topic !== "object") + throw TypeError(".google.pubsub.v1.UpdateTopicRequest.topic: object expected"); + message.topic = $root.google.pubsub.v1.Topic.fromObject(object.topic); + } + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateTopicRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); } return message; }; /** - * Creates a plain object from a SetIamPolicyRequest message. Also converts values to other types if specified. + * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.UpdateTopicRequest * @static - * @param {google.iam.v1.SetIamPolicyRequest} message SetIamPolicyRequest + * @param {google.pubsub.v1.UpdateTopicRequest} message UpdateTopicRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - SetIamPolicyRequest.toObject = function toObject(message, options) { + UpdateTopicRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.resource = ""; - object.policy = null; + object.topic = null; + object.updateMask = null; } - if (message.resource != null && message.hasOwnProperty("resource")) - object.resource = message.resource; - if (message.policy != null && message.hasOwnProperty("policy")) - object.policy = $root.google.iam.v1.Policy.toObject(message.policy, options); + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = $root.google.pubsub.v1.Topic.toObject(message.topic, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); return object; }; /** - * Converts this SetIamPolicyRequest to JSON. + * Converts this UpdateTopicRequest to JSON. * @function toJSON - * @memberof google.iam.v1.SetIamPolicyRequest + * @memberof google.pubsub.v1.UpdateTopicRequest * @instance * @returns {Object.} JSON object */ - SetIamPolicyRequest.prototype.toJSON = function toJSON() { + UpdateTopicRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return SetIamPolicyRequest; + return UpdateTopicRequest; })(); - v1.GetIamPolicyRequest = (function() { + v1.PublishRequest = (function() { /** - * Properties of a GetIamPolicyRequest. - * @memberof google.iam.v1 - * @interface IGetIamPolicyRequest - * @property {string|null} [resource] GetIamPolicyRequest resource - * @property {google.iam.v1.IGetPolicyOptions|null} [options] GetIamPolicyRequest options + * Properties of a PublishRequest. + * @memberof google.pubsub.v1 + * @interface IPublishRequest + * @property {string|null} [topic] PublishRequest topic + * @property {Array.|null} [messages] PublishRequest messages */ /** - * Constructs a new GetIamPolicyRequest. - * @memberof google.iam.v1 - * @classdesc Represents a GetIamPolicyRequest. - * @implements IGetIamPolicyRequest + * Constructs a new PublishRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a PublishRequest. + * @implements IPublishRequest * @constructor - * @param {google.iam.v1.IGetIamPolicyRequest=} [properties] Properties to set + * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set */ - function GetIamPolicyRequest(properties) { + function PublishRequest(properties) { + this.messages = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -1969,88 +1586,91 @@ } /** - * GetIamPolicyRequest resource. - * @member {string} resource - * @memberof google.iam.v1.GetIamPolicyRequest + * PublishRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.PublishRequest * @instance */ - GetIamPolicyRequest.prototype.resource = ""; + PublishRequest.prototype.topic = ""; /** - * GetIamPolicyRequest options. - * @member {google.iam.v1.IGetPolicyOptions|null|undefined} options - * @memberof google.iam.v1.GetIamPolicyRequest + * PublishRequest messages. + * @member {Array.} messages + * @memberof google.pubsub.v1.PublishRequest * @instance */ - GetIamPolicyRequest.prototype.options = null; + PublishRequest.prototype.messages = $util.emptyArray; /** - * Creates a new GetIamPolicyRequest instance using the specified properties. + * Creates a new PublishRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @static - * @param {google.iam.v1.IGetIamPolicyRequest=} [properties] Properties to set - * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest instance + * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.PublishRequest} PublishRequest instance */ - GetIamPolicyRequest.create = function create(properties) { - return new GetIamPolicyRequest(properties); + PublishRequest.create = function create(properties) { + return new PublishRequest(properties); }; /** - * Encodes the specified GetIamPolicyRequest message. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @static - * @param {google.iam.v1.IGetIamPolicyRequest} message GetIamPolicyRequest message or plain object to encode + * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetIamPolicyRequest.encode = function encode(message, writer) { + PublishRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.resource != null && message.hasOwnProperty("resource")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.iam.v1.GetPolicyOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.messages != null && message.messages.length) + for (var i = 0; i < message.messages.length; ++i) + $root.google.pubsub.v1.PubsubMessage.encode(message.messages[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified GetIamPolicyRequest message, length delimited. Does not implicitly {@link google.iam.v1.GetIamPolicyRequest.verify|verify} messages. + * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @static - * @param {google.iam.v1.IGetIamPolicyRequest} message GetIamPolicyRequest message or plain object to encode + * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetIamPolicyRequest.encodeDelimited = function encodeDelimited(message, writer) { + PublishRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer. + * Decodes a PublishRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + * @returns {google.pubsub.v1.PublishRequest} PublishRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetIamPolicyRequest.decode = function decode(reader, length) { + PublishRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.GetIamPolicyRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.resource = reader.string(); + message.topic = reader.string(); break; case 2: - message.options = $root.google.iam.v1.GetPolicyOptions.decode(reader, reader.uint32()); + if (!(message.messages && message.messages.length)) + message.messages = []; + message.messages.push($root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -2061,123 +1681,134 @@ }; /** - * Decodes a GetIamPolicyRequest message from the specified reader or buffer, length delimited. + * Decodes a PublishRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + * @returns {google.pubsub.v1.PublishRequest} PublishRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetIamPolicyRequest.decodeDelimited = function decodeDelimited(reader) { + PublishRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a GetIamPolicyRequest message. + * Verifies a PublishRequest message. * @function verify - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - GetIamPolicyRequest.verify = function verify(message) { + PublishRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.resource != null && message.hasOwnProperty("resource")) - if (!$util.isString(message.resource)) - return "resource: string expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.iam.v1.GetPolicyOptions.verify(message.options); - if (error) - return "options." + error; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.messages != null && message.hasOwnProperty("messages")) { + if (!Array.isArray(message.messages)) + return "messages: array expected"; + for (var i = 0; i < message.messages.length; ++i) { + var error = $root.google.pubsub.v1.PubsubMessage.verify(message.messages[i]); + if (error) + return "messages." + error; + } } return null; }; /** - * Creates a GetIamPolicyRequest message from a plain object. Also converts values to their respective internal types. + * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.GetIamPolicyRequest} GetIamPolicyRequest + * @returns {google.pubsub.v1.PublishRequest} PublishRequest */ - GetIamPolicyRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.GetIamPolicyRequest) + PublishRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PublishRequest) return object; - var message = new $root.google.iam.v1.GetIamPolicyRequest(); - if (object.resource != null) - message.resource = String(object.resource); - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.iam.v1.GetIamPolicyRequest.options: object expected"); - message.options = $root.google.iam.v1.GetPolicyOptions.fromObject(object.options); + var message = new $root.google.pubsub.v1.PublishRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.messages) { + if (!Array.isArray(object.messages)) + throw TypeError(".google.pubsub.v1.PublishRequest.messages: array expected"); + message.messages = []; + for (var i = 0; i < object.messages.length; ++i) { + if (typeof object.messages[i] !== "object") + throw TypeError(".google.pubsub.v1.PublishRequest.messages: object expected"); + message.messages[i] = $root.google.pubsub.v1.PubsubMessage.fromObject(object.messages[i]); + } } return message; }; /** - * Creates a plain object from a GetIamPolicyRequest message. Also converts values to other types if specified. + * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @static - * @param {google.iam.v1.GetIamPolicyRequest} message GetIamPolicyRequest + * @param {google.pubsub.v1.PublishRequest} message PublishRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - GetIamPolicyRequest.toObject = function toObject(message, options) { + PublishRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.resource = ""; - object.options = null; + if (options.arrays || options.defaults) + object.messages = []; + if (options.defaults) + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.messages && message.messages.length) { + object.messages = []; + for (var j = 0; j < message.messages.length; ++j) + object.messages[j] = $root.google.pubsub.v1.PubsubMessage.toObject(message.messages[j], options); } - if (message.resource != null && message.hasOwnProperty("resource")) - object.resource = message.resource; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.iam.v1.GetPolicyOptions.toObject(message.options, options); return object; }; /** - * Converts this GetIamPolicyRequest to JSON. + * Converts this PublishRequest to JSON. * @function toJSON - * @memberof google.iam.v1.GetIamPolicyRequest + * @memberof google.pubsub.v1.PublishRequest * @instance * @returns {Object.} JSON object */ - GetIamPolicyRequest.prototype.toJSON = function toJSON() { + PublishRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return GetIamPolicyRequest; + return PublishRequest; })(); - v1.TestIamPermissionsRequest = (function() { + v1.PublishResponse = (function() { /** - * Properties of a TestIamPermissionsRequest. - * @memberof google.iam.v1 - * @interface ITestIamPermissionsRequest - * @property {string|null} [resource] TestIamPermissionsRequest resource - * @property {Array.|null} [permissions] TestIamPermissionsRequest permissions + * Properties of a PublishResponse. + * @memberof google.pubsub.v1 + * @interface IPublishResponse + * @property {Array.|null} [messageIds] PublishResponse messageIds */ /** - * Constructs a new TestIamPermissionsRequest. - * @memberof google.iam.v1 - * @classdesc Represents a TestIamPermissionsRequest. - * @implements ITestIamPermissionsRequest + * Constructs a new PublishResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a PublishResponse. + * @implements IPublishResponse * @constructor - * @param {google.iam.v1.ITestIamPermissionsRequest=} [properties] Properties to set + * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set */ - function TestIamPermissionsRequest(properties) { - this.permissions = []; + function PublishResponse(properties) { + this.messageIds = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -2185,91 +1816,78 @@ } /** - * TestIamPermissionsRequest resource. - * @member {string} resource - * @memberof google.iam.v1.TestIamPermissionsRequest - * @instance - */ - TestIamPermissionsRequest.prototype.resource = ""; - - /** - * TestIamPermissionsRequest permissions. - * @member {Array.} permissions - * @memberof google.iam.v1.TestIamPermissionsRequest + * PublishResponse messageIds. + * @member {Array.} messageIds + * @memberof google.pubsub.v1.PublishResponse * @instance */ - TestIamPermissionsRequest.prototype.permissions = $util.emptyArray; + PublishResponse.prototype.messageIds = $util.emptyArray; /** - * Creates a new TestIamPermissionsRequest instance using the specified properties. + * Creates a new PublishResponse instance using the specified properties. * @function create - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @static - * @param {google.iam.v1.ITestIamPermissionsRequest=} [properties] Properties to set - * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest instance + * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.PublishResponse} PublishResponse instance */ - TestIamPermissionsRequest.create = function create(properties) { - return new TestIamPermissionsRequest(properties); + PublishResponse.create = function create(properties) { + return new PublishResponse(properties); }; /** - * Encodes the specified TestIamPermissionsRequest message. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. * @function encode - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @static - * @param {google.iam.v1.ITestIamPermissionsRequest} message TestIamPermissionsRequest message or plain object to encode + * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - TestIamPermissionsRequest.encode = function encode(message, writer) { + PublishResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.resource != null && message.hasOwnProperty("resource")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.resource); - if (message.permissions != null && message.permissions.length) - for (var i = 0; i < message.permissions.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.permissions[i]); - return writer; + if (message.messageIds != null && message.messageIds.length) + for (var i = 0; i < message.messageIds.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.messageIds[i]); + return writer; }; /** - * Encodes the specified TestIamPermissionsRequest message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsRequest.verify|verify} messages. + * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @static - * @param {google.iam.v1.ITestIamPermissionsRequest} message TestIamPermissionsRequest message or plain object to encode + * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - TestIamPermissionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + PublishResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer. + * Decodes a PublishResponse message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest + * @returns {google.pubsub.v1.PublishResponse} PublishResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TestIamPermissionsRequest.decode = function decode(reader, length) { + PublishResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.TestIamPermissionsRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishResponse(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.resource = reader.string(); - break; - case 2: - if (!(message.permissions && message.permissions.length)) - message.permissions = []; - message.permissions.push(reader.string()); + if (!(message.messageIds && message.messageIds.length)) + message.messageIds = []; + message.messageIds.push(reader.string()); break; default: reader.skipType(tag & 7); @@ -2280,129 +1898,121 @@ }; /** - * Decodes a TestIamPermissionsRequest message from the specified reader or buffer, length delimited. + * Decodes a PublishResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest + * @returns {google.pubsub.v1.PublishResponse} PublishResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TestIamPermissionsRequest.decodeDelimited = function decodeDelimited(reader) { + PublishResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a TestIamPermissionsRequest message. + * Verifies a PublishResponse message. * @function verify - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - TestIamPermissionsRequest.verify = function verify(message) { + PublishResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.resource != null && message.hasOwnProperty("resource")) - if (!$util.isString(message.resource)) - return "resource: string expected"; - if (message.permissions != null && message.hasOwnProperty("permissions")) { - if (!Array.isArray(message.permissions)) - return "permissions: array expected"; - for (var i = 0; i < message.permissions.length; ++i) - if (!$util.isString(message.permissions[i])) - return "permissions: string[] expected"; + if (message.messageIds != null && message.hasOwnProperty("messageIds")) { + if (!Array.isArray(message.messageIds)) + return "messageIds: array expected"; + for (var i = 0; i < message.messageIds.length; ++i) + if (!$util.isString(message.messageIds[i])) + return "messageIds: string[] expected"; } return null; }; /** - * Creates a TestIamPermissionsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.TestIamPermissionsRequest} TestIamPermissionsRequest + * @returns {google.pubsub.v1.PublishResponse} PublishResponse */ - TestIamPermissionsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.TestIamPermissionsRequest) + PublishResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PublishResponse) return object; - var message = new $root.google.iam.v1.TestIamPermissionsRequest(); - if (object.resource != null) - message.resource = String(object.resource); - if (object.permissions) { - if (!Array.isArray(object.permissions)) - throw TypeError(".google.iam.v1.TestIamPermissionsRequest.permissions: array expected"); - message.permissions = []; - for (var i = 0; i < object.permissions.length; ++i) - message.permissions[i] = String(object.permissions[i]); + var message = new $root.google.pubsub.v1.PublishResponse(); + if (object.messageIds) { + if (!Array.isArray(object.messageIds)) + throw TypeError(".google.pubsub.v1.PublishResponse.messageIds: array expected"); + message.messageIds = []; + for (var i = 0; i < object.messageIds.length; ++i) + message.messageIds[i] = String(object.messageIds[i]); } return message; }; /** - * Creates a plain object from a TestIamPermissionsRequest message. Also converts values to other types if specified. + * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @static - * @param {google.iam.v1.TestIamPermissionsRequest} message TestIamPermissionsRequest + * @param {google.pubsub.v1.PublishResponse} message PublishResponse * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - TestIamPermissionsRequest.toObject = function toObject(message, options) { + PublishResponse.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.arrays || options.defaults) - object.permissions = []; - if (options.defaults) - object.resource = ""; - if (message.resource != null && message.hasOwnProperty("resource")) - object.resource = message.resource; - if (message.permissions && message.permissions.length) { - object.permissions = []; - for (var j = 0; j < message.permissions.length; ++j) - object.permissions[j] = message.permissions[j]; + object.messageIds = []; + if (message.messageIds && message.messageIds.length) { + object.messageIds = []; + for (var j = 0; j < message.messageIds.length; ++j) + object.messageIds[j] = message.messageIds[j]; } return object; }; /** - * Converts this TestIamPermissionsRequest to JSON. + * Converts this PublishResponse to JSON. * @function toJSON - * @memberof google.iam.v1.TestIamPermissionsRequest + * @memberof google.pubsub.v1.PublishResponse * @instance * @returns {Object.} JSON object */ - TestIamPermissionsRequest.prototype.toJSON = function toJSON() { + PublishResponse.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return TestIamPermissionsRequest; + return PublishResponse; })(); - v1.TestIamPermissionsResponse = (function() { + v1.ListTopicsRequest = (function() { /** - * Properties of a TestIamPermissionsResponse. - * @memberof google.iam.v1 - * @interface ITestIamPermissionsResponse - * @property {Array.|null} [permissions] TestIamPermissionsResponse permissions + * Properties of a ListTopicsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicsRequest + * @property {string|null} [project] ListTopicsRequest project + * @property {number|null} [pageSize] ListTopicsRequest pageSize + * @property {string|null} [pageToken] ListTopicsRequest pageToken */ /** - * Constructs a new TestIamPermissionsResponse. - * @memberof google.iam.v1 - * @classdesc Represents a TestIamPermissionsResponse. - * @implements ITestIamPermissionsResponse + * Constructs a new ListTopicsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicsRequest. + * @implements IListTopicsRequest * @constructor - * @param {google.iam.v1.ITestIamPermissionsResponse=} [properties] Properties to set + * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set */ - function TestIamPermissionsResponse(properties) { - this.permissions = []; + function ListTopicsRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -2410,78 +2020,101 @@ } /** - * TestIamPermissionsResponse permissions. - * @member {Array.} permissions - * @memberof google.iam.v1.TestIamPermissionsResponse + * ListTopicsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + */ + ListTopicsRequest.prototype.project = ""; + + /** + * ListTopicsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicsRequest + * @instance + */ + ListTopicsRequest.prototype.pageSize = 0; + + /** + * ListTopicsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicsRequest * @instance */ - TestIamPermissionsResponse.prototype.permissions = $util.emptyArray; + ListTopicsRequest.prototype.pageToken = ""; /** - * Creates a new TestIamPermissionsResponse instance using the specified properties. + * Creates a new ListTopicsRequest instance using the specified properties. * @function create - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @static - * @param {google.iam.v1.ITestIamPermissionsResponse=} [properties] Properties to set - * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse instance + * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest instance */ - TestIamPermissionsResponse.create = function create(properties) { - return new TestIamPermissionsResponse(properties); + ListTopicsRequest.create = function create(properties) { + return new ListTopicsRequest(properties); }; /** - * Encodes the specified TestIamPermissionsResponse message. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. * @function encode - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @static - * @param {google.iam.v1.ITestIamPermissionsResponse} message TestIamPermissionsResponse message or plain object to encode + * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - TestIamPermissionsResponse.encode = function encode(message, writer) { + ListTopicsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.permissions != null && message.permissions.length) - for (var i = 0; i < message.permissions.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.permissions[i]); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; /** - * Encodes the specified TestIamPermissionsResponse message, length delimited. Does not implicitly {@link google.iam.v1.TestIamPermissionsResponse.verify|verify} messages. + * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @static - * @param {google.iam.v1.ITestIamPermissionsResponse} message TestIamPermissionsResponse message or plain object to encode + * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - TestIamPermissionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + ListTopicsRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer. + * Decodes a ListTopicsRequest message from the specified reader or buffer. * @function decode - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TestIamPermissionsResponse.decode = function decode(reader, length) { + ListTopicsRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.iam.v1.TestIamPermissionsResponse(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.permissions && message.permissions.length)) - message.permissions = []; - message.permissions.push(reader.string()); + message.project = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); break; default: reader.skipType(tag & 7); @@ -2492,3346 +2125,2588 @@ }; /** - * Decodes a TestIamPermissionsResponse message from the specified reader or buffer, length delimited. + * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TestIamPermissionsResponse.decodeDelimited = function decodeDelimited(reader) { + ListTopicsRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a TestIamPermissionsResponse message. + * Verifies a ListTopicsRequest message. * @function verify - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - TestIamPermissionsResponse.verify = function verify(message) { + ListTopicsRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.permissions != null && message.hasOwnProperty("permissions")) { - if (!Array.isArray(message.permissions)) - return "permissions: array expected"; - for (var i = 0; i < message.permissions.length; ++i) - if (!$util.isString(message.permissions[i])) - return "permissions: string[] expected"; - } + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; return null; }; /** - * Creates a TestIamPermissionsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @static * @param {Object.} object Plain object - * @returns {google.iam.v1.TestIamPermissionsResponse} TestIamPermissionsResponse + * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest */ - TestIamPermissionsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.iam.v1.TestIamPermissionsResponse) + ListTopicsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicsRequest) return object; - var message = new $root.google.iam.v1.TestIamPermissionsResponse(); - if (object.permissions) { - if (!Array.isArray(object.permissions)) - throw TypeError(".google.iam.v1.TestIamPermissionsResponse.permissions: array expected"); - message.permissions = []; - for (var i = 0; i < object.permissions.length; ++i) - message.permissions[i] = String(object.permissions[i]); - } + var message = new $root.google.pubsub.v1.ListTopicsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); return message; }; /** - * Creates a plain object from a TestIamPermissionsResponse message. Also converts values to other types if specified. + * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @static - * @param {google.iam.v1.TestIamPermissionsResponse} message TestIamPermissionsResponse + * @param {google.pubsub.v1.ListTopicsRequest} message ListTopicsRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - TestIamPermissionsResponse.toObject = function toObject(message, options) { + ListTopicsRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.permissions = []; - if (message.permissions && message.permissions.length) { - object.permissions = []; - for (var j = 0; j < message.permissions.length; ++j) - object.permissions[j] = message.permissions[j]; + if (options.defaults) { + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; } + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; return object; }; /** - * Converts this TestIamPermissionsResponse to JSON. + * Converts this ListTopicsRequest to JSON. * @function toJSON - * @memberof google.iam.v1.TestIamPermissionsResponse + * @memberof google.pubsub.v1.ListTopicsRequest * @instance * @returns {Object.} JSON object */ - TestIamPermissionsResponse.prototype.toJSON = function toJSON() { + ListTopicsRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return TestIamPermissionsResponse; + return ListTopicsRequest; })(); - return v1; - })(); + v1.ListTopicsResponse = (function() { - return iam; - })(); + /** + * Properties of a ListTopicsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicsResponse + * @property {Array.|null} [topics] ListTopicsResponse topics + * @property {string|null} [nextPageToken] ListTopicsResponse nextPageToken + */ - google.type = (function() { + /** + * Constructs a new ListTopicsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicsResponse. + * @implements IListTopicsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set + */ + function ListTopicsResponse(properties) { + this.topics = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Namespace type. - * @memberof google - * @namespace - */ - var type = {}; + /** + * ListTopicsResponse topics. + * @member {Array.} topics + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + */ + ListTopicsResponse.prototype.topics = $util.emptyArray; - type.Expr = (function() { + /** + * ListTopicsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + */ + ListTopicsResponse.prototype.nextPageToken = ""; - /** - * Properties of an Expr. - * @memberof google.type - * @interface IExpr - * @property {string|null} [expression] Expr expression - * @property {string|null} [title] Expr title - * @property {string|null} [description] Expr description - * @property {string|null} [location] Expr location - */ + /** + * Creates a new ListTopicsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse instance + */ + ListTopicsResponse.create = function create(properties) { + return new ListTopicsResponse(properties); + }; - /** - * Constructs a new Expr. - * @memberof google.type - * @classdesc Represents an Expr. - * @implements IExpr - * @constructor - * @param {google.type.IExpr=} [properties] Properties to set - */ - function Expr(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topics != null && message.topics.length) + for (var i = 0; i < message.topics.length; ++i) + $root.google.pubsub.v1.Topic.encode(message.topics[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; - /** - * Expr expression. - * @member {string} expression - * @memberof google.type.Expr - * @instance - */ - Expr.prototype.expression = ""; - - /** - * Expr title. - * @member {string} title - * @memberof google.type.Expr - * @instance - */ - Expr.prototype.title = ""; - - /** - * Expr description. - * @member {string} description - * @memberof google.type.Expr - * @instance - */ - Expr.prototype.description = ""; - - /** - * Expr location. - * @member {string} location - * @memberof google.type.Expr - * @instance - */ - Expr.prototype.location = ""; + /** + * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a new Expr instance using the specified properties. - * @function create - * @memberof google.type.Expr - * @static - * @param {google.type.IExpr=} [properties] Properties to set - * @returns {google.type.Expr} Expr instance - */ - Expr.create = function create(properties) { - return new Expr(properties); - }; + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.topics && message.topics.length)) + message.topics = []; + message.topics.push($root.google.pubsub.v1.Topic.decode(reader, reader.uint32())); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified Expr message. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @function encode - * @memberof google.type.Expr - * @static - * @param {google.type.IExpr} message Expr message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Expr.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.expression != null && message.hasOwnProperty("expression")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.expression); - if (message.title != null && message.hasOwnProperty("title")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.title); - if (message.description != null && message.hasOwnProperty("description")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.description); - if (message.location != null && message.hasOwnProperty("location")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.location); - return writer; - }; + /** + * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified Expr message, length delimited. Does not implicitly {@link google.type.Expr.verify|verify} messages. - * @function encodeDelimited - * @memberof google.type.Expr - * @static - * @param {google.type.IExpr} message Expr message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Expr.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Verifies a ListTopicsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topics != null && message.hasOwnProperty("topics")) { + if (!Array.isArray(message.topics)) + return "topics: array expected"; + for (var i = 0; i < message.topics.length; ++i) { + var error = $root.google.pubsub.v1.Topic.verify(message.topics[i]); + if (error) + return "topics." + error; + } + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; - /** - * Decodes an Expr message from the specified reader or buffer. - * @function decode - * @memberof google.type.Expr - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.type.Expr} Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Expr.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.type.Expr(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.expression = reader.string(); - break; - case 2: - message.title = reader.string(); - break; - case 3: - message.description = reader.string(); - break; - case 4: - message.location = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + */ + ListTopicsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicsResponse(); + if (object.topics) { + if (!Array.isArray(object.topics)) + throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: array expected"); + message.topics = []; + for (var i = 0; i < object.topics.length; ++i) { + if (typeof object.topics[i] !== "object") + throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: object expected"); + message.topics[i] = $root.google.pubsub.v1.Topic.fromObject(object.topics[i]); + } } - } - return message; - }; + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; - /** - * Decodes an Expr message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.type.Expr - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.type.Expr} Expr - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Expr.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {google.pubsub.v1.ListTopicsResponse} message ListTopicsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.topics = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.topics && message.topics.length) { + object.topics = []; + for (var j = 0; j < message.topics.length; ++j) + object.topics[j] = $root.google.pubsub.v1.Topic.toObject(message.topics[j], options); + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; - /** - * Verifies an Expr message. - * @function verify - * @memberof google.type.Expr - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Expr.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.expression != null && message.hasOwnProperty("expression")) - if (!$util.isString(message.expression)) - return "expression: string expected"; - if (message.title != null && message.hasOwnProperty("title")) - if (!$util.isString(message.title)) - return "title: string expected"; - if (message.description != null && message.hasOwnProperty("description")) - if (!$util.isString(message.description)) - return "description: string expected"; - if (message.location != null && message.hasOwnProperty("location")) - if (!$util.isString(message.location)) - return "location: string expected"; - return null; - }; + /** + * Converts this ListTopicsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates an Expr message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.type.Expr - * @static - * @param {Object.} object Plain object - * @returns {google.type.Expr} Expr - */ - Expr.fromObject = function fromObject(object) { - if (object instanceof $root.google.type.Expr) - return object; - var message = new $root.google.type.Expr(); - if (object.expression != null) - message.expression = String(object.expression); - if (object.title != null) - message.title = String(object.title); - if (object.description != null) - message.description = String(object.description); - if (object.location != null) - message.location = String(object.location); - return message; - }; + return ListTopicsResponse; + })(); - /** - * Creates a plain object from an Expr message. Also converts values to other types if specified. - * @function toObject - * @memberof google.type.Expr - * @static - * @param {google.type.Expr} message Expr - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Expr.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.expression = ""; - object.title = ""; - object.description = ""; - object.location = ""; - } - if (message.expression != null && message.hasOwnProperty("expression")) - object.expression = message.expression; - if (message.title != null && message.hasOwnProperty("title")) - object.title = message.title; - if (message.description != null && message.hasOwnProperty("description")) - object.description = message.description; - if (message.location != null && message.hasOwnProperty("location")) - object.location = message.location; - return object; - }; + v1.ListTopicSubscriptionsRequest = (function() { - /** - * Converts this Expr to JSON. - * @function toJSON - * @memberof google.type.Expr - * @instance - * @returns {Object.} JSON object - */ - Expr.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return Expr; - })(); - - return type; - })(); + /** + * Properties of a ListTopicSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicSubscriptionsRequest + * @property {string|null} [topic] ListTopicSubscriptionsRequest topic + * @property {number|null} [pageSize] ListTopicSubscriptionsRequest pageSize + * @property {string|null} [pageToken] ListTopicSubscriptionsRequest pageToken + */ - google.api = (function() { + /** + * Constructs a new ListTopicSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSubscriptionsRequest. + * @implements IListTopicSubscriptionsRequest + * @constructor + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set + */ + function ListTopicSubscriptionsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Namespace api. - * @memberof google - * @namespace - */ - var api = {}; + /** + * ListTopicSubscriptionsRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.topic = ""; - api.Http = (function() { + /** + * ListTopicSubscriptionsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.pageSize = 0; - /** - * Properties of a Http. - * @memberof google.api - * @interface IHttp - * @property {Array.|null} [rules] Http rules - * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion - */ + /** + * ListTopicSubscriptionsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + */ + ListTopicSubscriptionsRequest.prototype.pageToken = ""; - /** - * Constructs a new Http. - * @memberof google.api - * @classdesc Represents a Http. - * @implements IHttp - * @constructor - * @param {google.api.IHttp=} [properties] Properties to set - */ - function Http(properties) { - this.rules = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest instance + */ + ListTopicSubscriptionsRequest.create = function create(properties) { + return new ListTopicSubscriptionsRequest(properties); + }; - /** - * Http rules. - * @member {Array.} rules - * @memberof google.api.Http - * @instance - */ - Http.prototype.rules = $util.emptyArray; + /** + * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; - /** - * Http fullyDecodeReservedExpansion. - * @member {boolean} fullyDecodeReservedExpansion - * @memberof google.api.Http - * @instance - */ - Http.prototype.fullyDecodeReservedExpansion = false; + /** + * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a new Http instance using the specified properties. - * @function create - * @memberof google.api.Http - * @static - * @param {google.api.IHttp=} [properties] Properties to set - * @returns {google.api.Http} Http instance - */ - Http.create = function create(properties) { - return new Http(properties); - }; + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @function encode - * @memberof google.api.Http - * @static - * @param {google.api.IHttp} message Http message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Http.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.rules != null && message.rules.length) - for (var i = 0; i < message.rules.length; ++i) - $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); - return writer; - }; + /** + * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.Http - * @static - * @param {google.api.IHttp} message Http message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Http.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Verifies a ListTopicSubscriptionsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSubscriptionsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; - /** - * Decodes a Http message from the specified reader or buffer. - * @function decode - * @memberof google.api.Http - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.Http} Http - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Http.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.rules && message.rules.length)) - message.rules = []; - message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); - break; - case 2: - message.fullyDecodeReservedExpansion = reader.bool(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a Http message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.Http - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.Http} Http - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Http.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + */ + ListTopicSubscriptionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsRequest) + return object; + var message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; - /** - * Verifies a Http message. - * @function verify - * @memberof google.api.Http - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Http.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.rules != null && message.hasOwnProperty("rules")) { - if (!Array.isArray(message.rules)) - return "rules: array expected"; - for (var i = 0; i < message.rules.length; ++i) { - var error = $root.google.api.HttpRule.verify(message.rules[i]); - if (error) - return "rules." + error; + /** + * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {google.pubsub.v1.ListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSubscriptionsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = ""; + object.pageSize = 0; + object.pageToken = ""; } - } - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - if (typeof message.fullyDecodeReservedExpansion !== "boolean") - return "fullyDecodeReservedExpansion: boolean expected"; - return null; - }; - - /** - * Creates a Http message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.Http - * @static - * @param {Object.} object Plain object - * @returns {google.api.Http} Http - */ - Http.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.Http) + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; return object; - var message = new $root.google.api.Http(); - if (object.rules) { - if (!Array.isArray(object.rules)) - throw TypeError(".google.api.Http.rules: array expected"); - message.rules = []; - for (var i = 0; i < object.rules.length; ++i) { - if (typeof object.rules[i] !== "object") - throw TypeError(".google.api.Http.rules: object expected"); - message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); - } - } - if (object.fullyDecodeReservedExpansion != null) - message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); - return message; - }; + }; - /** - * Creates a plain object from a Http message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.Http - * @static - * @param {google.api.Http} message Http - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Http.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.rules = []; - if (options.defaults) - object.fullyDecodeReservedExpansion = false; - if (message.rules && message.rules.length) { - object.rules = []; - for (var j = 0; j < message.rules.length; ++j) - object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); - } - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; - return object; - }; + /** + * Converts this ListTopicSubscriptionsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @instance + * @returns {Object.} JSON object + */ + ListTopicSubscriptionsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this Http to JSON. - * @function toJSON - * @memberof google.api.Http - * @instance - * @returns {Object.} JSON object - */ - Http.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return ListTopicSubscriptionsRequest; + })(); - return Http; - })(); + v1.ListTopicSubscriptionsResponse = (function() { - api.HttpRule = (function() { + /** + * Properties of a ListTopicSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicSubscriptionsResponse + * @property {Array.|null} [subscriptions] ListTopicSubscriptionsResponse subscriptions + * @property {string|null} [nextPageToken] ListTopicSubscriptionsResponse nextPageToken + */ - /** - * Properties of a HttpRule. - * @memberof google.api - * @interface IHttpRule - * @property {string|null} [selector] HttpRule selector - * @property {string|null} [get] HttpRule get - * @property {string|null} [put] HttpRule put - * @property {string|null} [post] HttpRule post - * @property {string|null} ["delete"] HttpRule delete - * @property {string|null} [patch] HttpRule patch - * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom - * @property {string|null} [body] HttpRule body - * @property {string|null} [responseBody] HttpRule responseBody - * @property {Array.|null} [additionalBindings] HttpRule additionalBindings - */ + /** + * Constructs a new ListTopicSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSubscriptionsResponse. + * @implements IListTopicSubscriptionsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set + */ + function ListTopicSubscriptionsResponse(properties) { + this.subscriptions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new HttpRule. - * @memberof google.api - * @classdesc Represents a HttpRule. - * @implements IHttpRule - * @constructor - * @param {google.api.IHttpRule=} [properties] Properties to set - */ - function HttpRule(properties) { - this.additionalBindings = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * ListTopicSubscriptionsResponse subscriptions. + * @member {Array.} subscriptions + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + */ + ListTopicSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; - /** - * HttpRule selector. - * @member {string} selector - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.selector = ""; + /** + * ListTopicSubscriptionsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + */ + ListTopicSubscriptionsResponse.prototype.nextPageToken = ""; - /** - * HttpRule get. - * @member {string} get - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.get = ""; + /** + * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse instance + */ + ListTopicSubscriptionsResponse.create = function create(properties) { + return new ListTopicSubscriptionsResponse(properties); + }; - /** - * HttpRule put. - * @member {string} put - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.put = ""; + /** + * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscriptions != null && message.subscriptions.length) + for (var i = 0; i < message.subscriptions.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscriptions[i]); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; - /** - * HttpRule post. - * @member {string} post - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.post = ""; + /** + * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * HttpRule delete. - * @member {string} delete - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype["delete"] = ""; + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.subscriptions && message.subscriptions.length)) + message.subscriptions = []; + message.subscriptions.push(reader.string()); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * HttpRule patch. - * @member {string} patch - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.patch = ""; + /** + * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * HttpRule custom. - * @member {google.api.ICustomHttpPattern|null|undefined} custom - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.custom = null; + /** + * Verifies a ListTopicSubscriptionsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSubscriptionsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { + if (!Array.isArray(message.subscriptions)) + return "subscriptions: array expected"; + for (var i = 0; i < message.subscriptions.length; ++i) + if (!$util.isString(message.subscriptions[i])) + return "subscriptions: string[] expected"; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; - /** - * HttpRule body. - * @member {string} body - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.body = ""; + /** + * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse + */ + ListTopicSubscriptionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); + if (object.subscriptions) { + if (!Array.isArray(object.subscriptions)) + throw TypeError(".google.pubsub.v1.ListTopicSubscriptionsResponse.subscriptions: array expected"); + message.subscriptions = []; + for (var i = 0; i < object.subscriptions.length; ++i) + message.subscriptions[i] = String(object.subscriptions[i]); + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; - /** - * HttpRule responseBody. - * @member {string} responseBody - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.responseBody = ""; + /** + * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSubscriptionsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.subscriptions = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.subscriptions && message.subscriptions.length) { + object.subscriptions = []; + for (var j = 0; j < message.subscriptions.length; ++j) + object.subscriptions[j] = message.subscriptions[j]; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; - /** - * HttpRule additionalBindings. - * @member {Array.} additionalBindings - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.additionalBindings = $util.emptyArray; + /** + * Converts this ListTopicSubscriptionsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicSubscriptionsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + return ListTopicSubscriptionsResponse; + })(); - /** - * HttpRule pattern. - * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern - * @memberof google.api.HttpRule - * @instance - */ - Object.defineProperty(HttpRule.prototype, "pattern", { - get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]), - set: $util.oneOfSetter($oneOfFields) - }); - - /** - * Creates a new HttpRule instance using the specified properties. - * @function create - * @memberof google.api.HttpRule - * @static - * @param {google.api.IHttpRule=} [properties] Properties to set - * @returns {google.api.HttpRule} HttpRule instance - */ - HttpRule.create = function create(properties) { - return new HttpRule(properties); - }; - - /** - * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @function encode - * @memberof google.api.HttpRule - * @static - * @param {google.api.IHttpRule} message HttpRule message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - HttpRule.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.selector != null && message.hasOwnProperty("selector")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); - if (message.get != null && message.hasOwnProperty("get")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.get); - if (message.put != null && message.hasOwnProperty("put")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.put); - if (message.post != null && message.hasOwnProperty("post")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.post); - if (message["delete"] != null && message.hasOwnProperty("delete")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]); - if (message.patch != null && message.hasOwnProperty("patch")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch); - if (message.body != null && message.hasOwnProperty("body")) - writer.uint32(/* id 7, wireType 2 =*/58).string(message.body); - if (message.custom != null && message.hasOwnProperty("custom")) - $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.additionalBindings != null && message.additionalBindings.length) - for (var i = 0; i < message.additionalBindings.length; ++i) - $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); - return writer; - }; + v1.ListTopicSnapshotsRequest = (function() { - /** - * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.HttpRule - * @static - * @param {google.api.IHttpRule} message HttpRule message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - HttpRule.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Properties of a ListTopicSnapshotsRequest. + * @memberof google.pubsub.v1 + * @interface IListTopicSnapshotsRequest + * @property {string|null} [topic] ListTopicSnapshotsRequest topic + * @property {number|null} [pageSize] ListTopicSnapshotsRequest pageSize + * @property {string|null} [pageToken] ListTopicSnapshotsRequest pageToken + */ - /** - * Decodes a HttpRule message from the specified reader or buffer. - * @function decode - * @memberof google.api.HttpRule - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.HttpRule} HttpRule - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - HttpRule.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.selector = reader.string(); - break; - case 2: - message.get = reader.string(); - break; - case 3: - message.put = reader.string(); - break; - case 4: - message.post = reader.string(); - break; - case 5: - message["delete"] = reader.string(); - break; - case 6: - message.patch = reader.string(); - break; - case 8: - message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); - break; - case 7: - message.body = reader.string(); - break; - case 12: - message.responseBody = reader.string(); - break; - case 11: - if (!(message.additionalBindings && message.additionalBindings.length)) - message.additionalBindings = []; - message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Constructs a new ListTopicSnapshotsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSnapshotsRequest. + * @implements IListTopicSnapshotsRequest + * @constructor + * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set + */ + function ListTopicSnapshotsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return message; - }; - /** - * Decodes a HttpRule message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.HttpRule - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.HttpRule} HttpRule - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - HttpRule.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * ListTopicSnapshotsRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.topic = ""; - /** - * Verifies a HttpRule message. - * @function verify - * @memberof google.api.HttpRule - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - HttpRule.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - var properties = {}; - if (message.selector != null && message.hasOwnProperty("selector")) - if (!$util.isString(message.selector)) - return "selector: string expected"; - if (message.get != null && message.hasOwnProperty("get")) { - properties.pattern = 1; - if (!$util.isString(message.get)) - return "get: string expected"; - } - if (message.put != null && message.hasOwnProperty("put")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.put)) - return "put: string expected"; - } - if (message.post != null && message.hasOwnProperty("post")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.post)) - return "post: string expected"; - } - if (message["delete"] != null && message.hasOwnProperty("delete")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message["delete"])) - return "delete: string expected"; - } - if (message.patch != null && message.hasOwnProperty("patch")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - if (!$util.isString(message.patch)) - return "patch: string expected"; - } - if (message.custom != null && message.hasOwnProperty("custom")) { - if (properties.pattern === 1) - return "pattern: multiple values"; - properties.pattern = 1; - { - var error = $root.google.api.CustomHttpPattern.verify(message.custom); - if (error) - return "custom." + error; - } - } - if (message.body != null && message.hasOwnProperty("body")) - if (!$util.isString(message.body)) - return "body: string expected"; - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - if (!$util.isString(message.responseBody)) - return "responseBody: string expected"; - if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { - if (!Array.isArray(message.additionalBindings)) - return "additionalBindings: array expected"; - for (var i = 0; i < message.additionalBindings.length; ++i) { - var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]); - if (error) - return "additionalBindings." + error; - } - } - return null; - }; + /** + * ListTopicSnapshotsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.pageSize = 0; - /** - * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.HttpRule - * @static - * @param {Object.} object Plain object - * @returns {google.api.HttpRule} HttpRule - */ - HttpRule.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.HttpRule) - return object; - var message = new $root.google.api.HttpRule(); - if (object.selector != null) - message.selector = String(object.selector); - if (object.get != null) - message.get = String(object.get); - if (object.put != null) - message.put = String(object.put); - if (object.post != null) - message.post = String(object.post); - if (object["delete"] != null) - message["delete"] = String(object["delete"]); - if (object.patch != null) - message.patch = String(object.patch); - if (object.custom != null) { - if (typeof object.custom !== "object") - throw TypeError(".google.api.HttpRule.custom: object expected"); - message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom); - } - if (object.body != null) - message.body = String(object.body); - if (object.responseBody != null) - message.responseBody = String(object.responseBody); - if (object.additionalBindings) { - if (!Array.isArray(object.additionalBindings)) - throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); - message.additionalBindings = []; - for (var i = 0; i < object.additionalBindings.length; ++i) { - if (typeof object.additionalBindings[i] !== "object") - throw TypeError(".google.api.HttpRule.additionalBindings: object expected"); - message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]); - } - } - return message; - }; + /** + * ListTopicSnapshotsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + */ + ListTopicSnapshotsRequest.prototype.pageToken = ""; - /** - * Creates a plain object from a HttpRule message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.HttpRule - * @static - * @param {google.api.HttpRule} message HttpRule - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - HttpRule.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.additionalBindings = []; - if (options.defaults) { - object.selector = ""; - object.body = ""; - object.responseBody = ""; - } - if (message.selector != null && message.hasOwnProperty("selector")) - object.selector = message.selector; - if (message.get != null && message.hasOwnProperty("get")) { - object.get = message.get; - if (options.oneofs) - object.pattern = "get"; - } - if (message.put != null && message.hasOwnProperty("put")) { - object.put = message.put; - if (options.oneofs) - object.pattern = "put"; - } - if (message.post != null && message.hasOwnProperty("post")) { - object.post = message.post; - if (options.oneofs) - object.pattern = "post"; - } - if (message["delete"] != null && message.hasOwnProperty("delete")) { - object["delete"] = message["delete"]; - if (options.oneofs) - object.pattern = "delete"; - } - if (message.patch != null && message.hasOwnProperty("patch")) { - object.patch = message.patch; - if (options.oneofs) - object.pattern = "patch"; - } - if (message.body != null && message.hasOwnProperty("body")) - object.body = message.body; - if (message.custom != null && message.hasOwnProperty("custom")) { - object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options); - if (options.oneofs) - object.pattern = "custom"; - } - if (message.additionalBindings && message.additionalBindings.length) { - object.additionalBindings = []; - for (var j = 0; j < message.additionalBindings.length; ++j) - object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); - } - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - object.responseBody = message.responseBody; - return object; - }; + /** + * Creates a new ListTopicSnapshotsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest instance + */ + ListTopicSnapshotsRequest.create = function create(properties) { + return new ListTopicSnapshotsRequest(properties); + }; - /** - * Converts this HttpRule to JSON. - * @function toJSON - * @memberof google.api.HttpRule - * @instance - * @returns {Object.} JSON object - */ - HttpRule.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; - return HttpRule; - })(); + /** + * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - api.CustomHttpPattern = (function() { + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Properties of a CustomHttpPattern. - * @memberof google.api - * @interface ICustomHttpPattern - * @property {string|null} [kind] CustomHttpPattern kind - * @property {string|null} [path] CustomHttpPattern path - */ + /** + * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Constructs a new CustomHttpPattern. - * @memberof google.api - * @classdesc Represents a CustomHttpPattern. - * @implements ICustomHttpPattern - * @constructor - * @param {google.api.ICustomHttpPattern=} [properties] Properties to set - */ - function CustomHttpPattern(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Verifies a ListTopicSnapshotsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSnapshotsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; - /** - * CustomHttpPattern kind. - * @member {string} kind - * @memberof google.api.CustomHttpPattern - * @instance - */ - CustomHttpPattern.prototype.kind = ""; + /** + * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest + */ + ListTopicSnapshotsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsRequest) + return object; + var message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; - /** - * CustomHttpPattern path. - * @member {string} path - * @memberof google.api.CustomHttpPattern - * @instance - */ - CustomHttpPattern.prototype.path = ""; + /** + * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {google.pubsub.v1.ListTopicSnapshotsRequest} message ListTopicSnapshotsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSnapshotsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = ""; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; - /** - * Creates a new CustomHttpPattern instance using the specified properties. - * @function create - * @memberof google.api.CustomHttpPattern - * @static - * @param {google.api.ICustomHttpPattern=} [properties] Properties to set - * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance - */ - CustomHttpPattern.create = function create(properties) { - return new CustomHttpPattern(properties); - }; + /** + * Converts this ListTopicSnapshotsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @instance + * @returns {Object.} JSON object + */ + ListTopicSnapshotsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @function encode - * @memberof google.api.CustomHttpPattern - * @static - * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CustomHttpPattern.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.kind != null && message.hasOwnProperty("kind")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind); - if (message.path != null && message.hasOwnProperty("path")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.path); - return writer; - }; + return ListTopicSnapshotsRequest; + })(); - /** - * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.CustomHttpPattern - * @static - * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + v1.ListTopicSnapshotsResponse = (function() { - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer. - * @function decode - * @memberof google.api.CustomHttpPattern - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.CustomHttpPattern} CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CustomHttpPattern.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.kind = reader.string(); - break; - case 2: - message.path = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Properties of a ListTopicSnapshotsResponse. + * @memberof google.pubsub.v1 + * @interface IListTopicSnapshotsResponse + * @property {Array.|null} [snapshots] ListTopicSnapshotsResponse snapshots + * @property {string|null} [nextPageToken] ListTopicSnapshotsResponse nextPageToken + */ + + /** + * Constructs a new ListTopicSnapshotsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListTopicSnapshotsResponse. + * @implements IListTopicSnapshotsResponse + * @constructor + * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set + */ + function ListTopicSnapshotsResponse(properties) { + this.snapshots = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return message; - }; - /** - * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.CustomHttpPattern - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.CustomHttpPattern} CustomHttpPattern - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * ListTopicSnapshotsResponse snapshots. + * @member {Array.} snapshots + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + */ + ListTopicSnapshotsResponse.prototype.snapshots = $util.emptyArray; - /** - * Verifies a CustomHttpPattern message. - * @function verify - * @memberof google.api.CustomHttpPattern - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - CustomHttpPattern.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.kind != null && message.hasOwnProperty("kind")) - if (!$util.isString(message.kind)) - return "kind: string expected"; - if (message.path != null && message.hasOwnProperty("path")) - if (!$util.isString(message.path)) - return "path: string expected"; - return null; - }; + /** + * ListTopicSnapshotsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + */ + ListTopicSnapshotsResponse.prototype.nextPageToken = ""; - /** - * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.CustomHttpPattern - * @static - * @param {Object.} object Plain object - * @returns {google.api.CustomHttpPattern} CustomHttpPattern - */ - CustomHttpPattern.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.CustomHttpPattern) - return object; - var message = new $root.google.api.CustomHttpPattern(); - if (object.kind != null) - message.kind = String(object.kind); - if (object.path != null) - message.path = String(object.path); - return message; - }; + /** + * Creates a new ListTopicSnapshotsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse instance + */ + ListTopicSnapshotsResponse.create = function create(properties) { + return new ListTopicSnapshotsResponse(properties); + }; - /** - * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.CustomHttpPattern - * @static - * @param {google.api.CustomHttpPattern} message CustomHttpPattern - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - CustomHttpPattern.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.kind = ""; - object.path = ""; - } - if (message.kind != null && message.hasOwnProperty("kind")) - object.kind = message.kind; - if (message.path != null && message.hasOwnProperty("path")) - object.path = message.path; - return object; - }; + /** + * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.snapshots != null && message.snapshots.length) + for (var i = 0; i < message.snapshots.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshots[i]); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; - /** - * Converts this CustomHttpPattern to JSON. - * @function toJSON - * @memberof google.api.CustomHttpPattern - * @instance - * @returns {Object.} JSON object - */ - CustomHttpPattern.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListTopicSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - return CustomHttpPattern; - })(); + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.snapshots && message.snapshots.length)) + message.snapshots = []; + message.snapshots.push(reader.string()); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * FieldBehavior enum. - * @name google.api.FieldBehavior - * @enum {string} - * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value - * @property {number} OPTIONAL=1 OPTIONAL value - * @property {number} REQUIRED=2 REQUIRED value - * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value - * @property {number} INPUT_ONLY=4 INPUT_ONLY value - * @property {number} IMMUTABLE=5 IMMUTABLE value - */ - api.FieldBehavior = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0; - values[valuesById[1] = "OPTIONAL"] = 1; - values[valuesById[2] = "REQUIRED"] = 2; - values[valuesById[3] = "OUTPUT_ONLY"] = 3; - values[valuesById[4] = "INPUT_ONLY"] = 4; - values[valuesById[5] = "IMMUTABLE"] = 5; - return values; - })(); + /** + * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListTopicSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - api.ResourceDescriptor = (function() { + /** + * Verifies a ListTopicSnapshotsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListTopicSnapshotsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.snapshots != null && message.hasOwnProperty("snapshots")) { + if (!Array.isArray(message.snapshots)) + return "snapshots: array expected"; + for (var i = 0; i < message.snapshots.length; ++i) + if (!$util.isString(message.snapshots[i])) + return "snapshots: string[] expected"; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; - /** - * Properties of a ResourceDescriptor. - * @memberof google.api - * @interface IResourceDescriptor - * @property {string|null} [type] ResourceDescriptor type - * @property {Array.|null} [pattern] ResourceDescriptor pattern - * @property {string|null} [nameField] ResourceDescriptor nameField - * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history - * @property {string|null} [plural] ResourceDescriptor plural - * @property {string|null} [singular] ResourceDescriptor singular - */ + /** + * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse + */ + ListTopicSnapshotsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsResponse) + return object; + var message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); + if (object.snapshots) { + if (!Array.isArray(object.snapshots)) + throw TypeError(".google.pubsub.v1.ListTopicSnapshotsResponse.snapshots: array expected"); + message.snapshots = []; + for (var i = 0; i < object.snapshots.length; ++i) + message.snapshots[i] = String(object.snapshots[i]); + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; - /** - * Constructs a new ResourceDescriptor. - * @memberof google.api - * @classdesc Represents a ResourceDescriptor. - * @implements IResourceDescriptor - * @constructor - * @param {google.api.IResourceDescriptor=} [properties] Properties to set - */ - function ResourceDescriptor(properties) { - this.pattern = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {google.pubsub.v1.ListTopicSnapshotsResponse} message ListTopicSnapshotsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListTopicSnapshotsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.snapshots = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.snapshots && message.snapshots.length) { + object.snapshots = []; + for (var j = 0; j < message.snapshots.length; ++j) + object.snapshots[j] = message.snapshots[j]; + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; - /** - * ResourceDescriptor type. - * @member {string} type - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.type = ""; + /** + * Converts this ListTopicSnapshotsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @instance + * @returns {Object.} JSON object + */ + ListTopicSnapshotsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * ResourceDescriptor pattern. - * @member {Array.} pattern - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.pattern = $util.emptyArray; + return ListTopicSnapshotsResponse; + })(); - /** - * ResourceDescriptor nameField. - * @member {string} nameField - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.nameField = ""; + v1.DeleteTopicRequest = (function() { - /** - * ResourceDescriptor history. - * @member {google.api.ResourceDescriptor.History} history - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.history = 0; + /** + * Properties of a DeleteTopicRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteTopicRequest + * @property {string|null} [topic] DeleteTopicRequest topic + */ - /** - * ResourceDescriptor plural. - * @member {string} plural - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.plural = ""; + /** + * Constructs a new DeleteTopicRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteTopicRequest. + * @implements IDeleteTopicRequest + * @constructor + * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set + */ + function DeleteTopicRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * ResourceDescriptor singular. - * @member {string} singular - * @memberof google.api.ResourceDescriptor - * @instance - */ - ResourceDescriptor.prototype.singular = ""; + /** + * DeleteTopicRequest topic. + * @member {string} topic + * @memberof google.pubsub.v1.DeleteTopicRequest + * @instance + */ + DeleteTopicRequest.prototype.topic = ""; - /** - * Creates a new ResourceDescriptor instance using the specified properties. - * @function create - * @memberof google.api.ResourceDescriptor - * @static - * @param {google.api.IResourceDescriptor=} [properties] Properties to set - * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance - */ - ResourceDescriptor.create = function create(properties) { - return new ResourceDescriptor(properties); - }; + /** + * Creates a new DeleteTopicRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest instance + */ + DeleteTopicRequest.create = function create(properties) { + return new DeleteTopicRequest(properties); + }; - /** - * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @function encode - * @memberof google.api.ResourceDescriptor - * @static - * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ResourceDescriptor.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.type != null && message.hasOwnProperty("type")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); - if (message.pattern != null && message.pattern.length) - for (var i = 0; i < message.pattern.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]); - if (message.nameField != null && message.hasOwnProperty("nameField")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField); - if (message.history != null && message.hasOwnProperty("history")) - writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history); - if (message.plural != null && message.hasOwnProperty("plural")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); - if (message.singular != null && message.hasOwnProperty("singular")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); - return writer; - }; + /** + * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteTopicRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + return writer; + }; - /** - * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.ResourceDescriptor - * @static - * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer. - * @function decode - * @memberof google.api.ResourceDescriptor - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.ResourceDescriptor} ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ResourceDescriptor.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.type = reader.string(); - break; - case 2: - if (!(message.pattern && message.pattern.length)) - message.pattern = []; - message.pattern.push(reader.string()); - break; - case 3: - message.nameField = reader.string(); - break; - case 4: - message.history = reader.int32(); - break; - case 5: - message.plural = reader.string(); - break; - case 6: - message.singular = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteTopicRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteTopicRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.topic = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.ResourceDescriptor - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.ResourceDescriptor} ResourceDescriptor - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteTopicRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a ResourceDescriptor message. - * @function verify - * @memberof google.api.ResourceDescriptor - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ResourceDescriptor.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.type != null && message.hasOwnProperty("type")) - if (!$util.isString(message.type)) - return "type: string expected"; - if (message.pattern != null && message.hasOwnProperty("pattern")) { - if (!Array.isArray(message.pattern)) - return "pattern: array expected"; - for (var i = 0; i < message.pattern.length; ++i) - if (!$util.isString(message.pattern[i])) - return "pattern: string[] expected"; - } - if (message.nameField != null && message.hasOwnProperty("nameField")) - if (!$util.isString(message.nameField)) - return "nameField: string expected"; - if (message.history != null && message.hasOwnProperty("history")) - switch (message.history) { - default: - return "history: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.plural != null && message.hasOwnProperty("plural")) - if (!$util.isString(message.plural)) - return "plural: string expected"; - if (message.singular != null && message.hasOwnProperty("singular")) - if (!$util.isString(message.singular)) - return "singular: string expected"; - return null; - }; + /** + * Verifies a DeleteTopicRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteTopicRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + return null; + }; - /** - * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.ResourceDescriptor - * @static - * @param {Object.} object Plain object - * @returns {google.api.ResourceDescriptor} ResourceDescriptor - */ - ResourceDescriptor.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.ResourceDescriptor) - return object; - var message = new $root.google.api.ResourceDescriptor(); - if (object.type != null) - message.type = String(object.type); - if (object.pattern) { - if (!Array.isArray(object.pattern)) - throw TypeError(".google.api.ResourceDescriptor.pattern: array expected"); - message.pattern = []; - for (var i = 0; i < object.pattern.length; ++i) - message.pattern[i] = String(object.pattern[i]); - } - if (object.nameField != null) - message.nameField = String(object.nameField); - switch (object.history) { - case "HISTORY_UNSPECIFIED": - case 0: - message.history = 0; - break; - case "ORIGINALLY_SINGLE_PATTERN": - case 1: - message.history = 1; - break; - case "FUTURE_MULTI_PATTERN": - case 2: - message.history = 2; - break; - } - if (object.plural != null) - message.plural = String(object.plural); - if (object.singular != null) - message.singular = String(object.singular); - return message; - }; + /** + * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest + */ + DeleteTopicRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteTopicRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteTopicRequest(); + if (object.topic != null) + message.topic = String(object.topic); + return message; + }; - /** - * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.ResourceDescriptor - * @static - * @param {google.api.ResourceDescriptor} message ResourceDescriptor - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ResourceDescriptor.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.pattern = []; - if (options.defaults) { - object.type = ""; - object.nameField = ""; - object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0; - object.plural = ""; - object.singular = ""; - } - if (message.type != null && message.hasOwnProperty("type")) - object.type = message.type; - if (message.pattern && message.pattern.length) { - object.pattern = []; - for (var j = 0; j < message.pattern.length; ++j) - object.pattern[j] = message.pattern[j]; - } - if (message.nameField != null && message.hasOwnProperty("nameField")) - object.nameField = message.nameField; - if (message.history != null && message.hasOwnProperty("history")) - object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history; - if (message.plural != null && message.hasOwnProperty("plural")) - object.plural = message.plural; - if (message.singular != null && message.hasOwnProperty("singular")) - object.singular = message.singular; - return object; - }; + /** + * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {google.pubsub.v1.DeleteTopicRequest} message DeleteTopicRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteTopicRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.topic = ""; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + return object; + }; - /** - * Converts this ResourceDescriptor to JSON. - * @function toJSON - * @memberof google.api.ResourceDescriptor - * @instance - * @returns {Object.} JSON object - */ - ResourceDescriptor.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this DeleteTopicRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteTopicRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteTopicRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * History enum. - * @name google.api.ResourceDescriptor.History - * @enum {string} - * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value - * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value - * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value - */ - ResourceDescriptor.History = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0; - values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1; - values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2; - return values; + return DeleteTopicRequest; })(); - return ResourceDescriptor; - })(); + v1.Subscriber = (function() { - api.ResourceReference = (function() { + /** + * Constructs a new Subscriber service. + * @memberof google.pubsub.v1 + * @classdesc Represents a Subscriber + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function Subscriber(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } - /** - * Properties of a ResourceReference. - * @memberof google.api - * @interface IResourceReference - * @property {string|null} [type] ResourceReference type - * @property {string|null} [childType] ResourceReference childType - */ + (Subscriber.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Subscriber; - /** - * Constructs a new ResourceReference. - * @memberof google.api - * @classdesc Represents a ResourceReference. - * @implements IResourceReference - * @constructor - * @param {google.api.IResourceReference=} [properties] Properties to set - */ - function ResourceReference(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Creates new Subscriber service using the specified rpc implementation. + * @function create + * @memberof google.pubsub.v1.Subscriber + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {Subscriber} RPC service. Useful where requests and/or responses are streamed. + */ + Subscriber.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; - /** - * ResourceReference type. - * @member {string} type - * @memberof google.api.ResourceReference - * @instance - */ - ResourceReference.prototype.type = ""; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef CreateSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ - /** - * ResourceReference childType. - * @member {string} childType - * @memberof google.api.ResourceReference - * @instance - */ - ResourceReference.prototype.childType = ""; - - /** - * Creates a new ResourceReference instance using the specified properties. - * @function create - * @memberof google.api.ResourceReference - * @static - * @param {google.api.IResourceReference=} [properties] Properties to set - * @returns {google.api.ResourceReference} ResourceReference instance - */ - ResourceReference.create = function create(properties) { - return new ResourceReference(properties); - }; - - /** - * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. - * @function encode - * @memberof google.api.ResourceReference - * @static - * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ResourceReference.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.type != null && message.hasOwnProperty("type")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); - if (message.childType != null && message.hasOwnProperty("childType")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType); - return writer; - }; - - /** - * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.ResourceReference - * @static - * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ResourceReference.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Calls CreateSubscription. + * @function createSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object + * @param {google.pubsub.v1.Subscriber.CreateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.createSubscription = function createSubscription(request, callback) { + return this.rpcCall(createSubscription, $root.google.pubsub.v1.Subscription, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "CreateSubscription" }); - /** - * Decodes a ResourceReference message from the specified reader or buffer. - * @function decode - * @memberof google.api.ResourceReference - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.ResourceReference} ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ResourceReference.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.type = reader.string(); - break; - case 2: - message.childType = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Calls CreateSubscription. + * @function createSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Decodes a ResourceReference message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.ResourceReference - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.ResourceReference} ResourceReference - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ResourceReference.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef GetSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ - /** - * Verifies a ResourceReference message. - * @function verify - * @memberof google.api.ResourceReference - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ResourceReference.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.type != null && message.hasOwnProperty("type")) - if (!$util.isString(message.type)) - return "type: string expected"; - if (message.childType != null && message.hasOwnProperty("childType")) - if (!$util.isString(message.childType)) - return "childType: string expected"; - return null; - }; + /** + * Calls GetSubscription. + * @function getSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.GetSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.getSubscription = function getSubscription(request, callback) { + return this.rpcCall(getSubscription, $root.google.pubsub.v1.GetSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "GetSubscription" }); - /** - * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.ResourceReference - * @static - * @param {Object.} object Plain object - * @returns {google.api.ResourceReference} ResourceReference - */ - ResourceReference.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.ResourceReference) - return object; - var message = new $root.google.api.ResourceReference(); - if (object.type != null) - message.type = String(object.type); - if (object.childType != null) - message.childType = String(object.childType); - return message; - }; + /** + * Calls GetSubscription. + * @function getSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.ResourceReference - * @static - * @param {google.api.ResourceReference} message ResourceReference - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ResourceReference.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.type = ""; - object.childType = ""; - } - if (message.type != null && message.hasOwnProperty("type")) - object.type = message.type; - if (message.childType != null && message.hasOwnProperty("childType")) - object.childType = message.childType; - return object; - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef UpdateSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Subscription} [response] Subscription + */ - /** - * Converts this ResourceReference to JSON. - * @function toJSON - * @memberof google.api.ResourceReference - * @instance - * @returns {Object.} JSON object - */ - ResourceReference.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Calls UpdateSubscription. + * @function updateSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.UpdateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.updateSubscription = function updateSubscription(request, callback) { + return this.rpcCall(updateSubscription, $root.google.pubsub.v1.UpdateSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); + }, "name", { value: "UpdateSubscription" }); - return ResourceReference; - })(); + /** + * Calls UpdateSubscription. + * @function updateSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - return api; - })(); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ListSubscriptionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListSubscriptionsResponse} [response] ListSubscriptionsResponse + */ - google.protobuf = (function() { - - /** - * Namespace protobuf. - * @memberof google - * @namespace - */ - var protobuf = {}; + /** + * Calls ListSubscriptions. + * @function listSubscriptions + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ListSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListSubscriptionsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.listSubscriptions = function listSubscriptions(request, callback) { + return this.rpcCall(listSubscriptions, $root.google.pubsub.v1.ListSubscriptionsRequest, $root.google.pubsub.v1.ListSubscriptionsResponse, request, callback); + }, "name", { value: "ListSubscriptions" }); - protobuf.FileDescriptorSet = (function() { + /** + * Calls ListSubscriptions. + * @function listSubscriptions + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Properties of a FileDescriptorSet. - * @memberof google.protobuf - * @interface IFileDescriptorSet - * @property {Array.|null} [file] FileDescriptorSet file - */ + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * @memberof google.pubsub.v1.Subscriber + * @typedef DeleteSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * Constructs a new FileDescriptorSet. - * @memberof google.protobuf - * @classdesc Represents a FileDescriptorSet. - * @implements IFileDescriptorSet - * @constructor - * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set - */ - function FileDescriptorSet(properties) { - this.file = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Calls DeleteSubscription. + * @function deleteSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Subscriber.DeleteSubscriptionCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.deleteSubscription = function deleteSubscription(request, callback) { + return this.rpcCall(deleteSubscription, $root.google.pubsub.v1.DeleteSubscriptionRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteSubscription" }); - /** - * FileDescriptorSet file. - * @member {Array.} file - * @memberof google.protobuf.FileDescriptorSet - * @instance - */ - FileDescriptorSet.prototype.file = $util.emptyArray; + /** + * Calls DeleteSubscription. + * @function deleteSubscription + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Creates a new FileDescriptorSet instance using the specified properties. - * @function create - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set - * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet instance - */ - FileDescriptorSet.create = function create(properties) { - return new FileDescriptorSet(properties); - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ModifyAckDeadlineCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FileDescriptorSet.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.file != null && message.file.length) - for (var i = 0; i < message.file.length; ++i) - $root.google.protobuf.FileDescriptorProto.encode(message.file[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + /** + * Calls ModifyAckDeadline. + * @function modifyAckDeadline + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.modifyAckDeadline = function modifyAckDeadline(request, callback) { + return this.rpcCall(modifyAckDeadline, $root.google.pubsub.v1.ModifyAckDeadlineRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "ModifyAckDeadline" }); - /** - * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FileDescriptorSet.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Calls ModifyAckDeadline. + * @function modifyAckDeadline + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FileDescriptorSet.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorSet(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.file && message.file.length)) - message.file = []; - message.file.push($root.google.protobuf.FileDescriptorProto.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * @memberof google.pubsub.v1.Subscriber + * @typedef AcknowledgeCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FileDescriptorSet.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Calls Acknowledge. + * @function acknowledge + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object + * @param {google.pubsub.v1.Subscriber.AcknowledgeCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.acknowledge = function acknowledge(request, callback) { + return this.rpcCall(acknowledge, $root.google.pubsub.v1.AcknowledgeRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "Acknowledge" }); - /** - * Verifies a FileDescriptorSet message. - * @function verify - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FileDescriptorSet.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.file != null && message.hasOwnProperty("file")) { - if (!Array.isArray(message.file)) - return "file: array expected"; - for (var i = 0; i < message.file.length; ++i) { - var error = $root.google.protobuf.FileDescriptorProto.verify(message.file[i]); - if (error) - return "file." + error; - } - } - return null; - }; + /** + * Calls Acknowledge. + * @function acknowledge + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet - */ - FileDescriptorSet.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FileDescriptorSet) - return object; - var message = new $root.google.protobuf.FileDescriptorSet(); - if (object.file) { - if (!Array.isArray(object.file)) - throw TypeError(".google.protobuf.FileDescriptorSet.file: array expected"); - message.file = []; - for (var i = 0; i < object.file.length; ++i) { - if (typeof object.file[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorSet.file: object expected"); - message.file[i] = $root.google.protobuf.FileDescriptorProto.fromObject(object.file[i]); - } - } - return message; - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * @memberof google.pubsub.v1.Subscriber + * @typedef PullCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.PullResponse} [response] PullResponse + */ - /** - * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FileDescriptorSet - * @static - * @param {google.protobuf.FileDescriptorSet} message FileDescriptorSet - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FileDescriptorSet.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.file = []; - if (message.file && message.file.length) { - object.file = []; - for (var j = 0; j < message.file.length; ++j) - object.file[j] = $root.google.protobuf.FileDescriptorProto.toObject(message.file[j], options); - } - return object; - }; + /** + * Calls Pull. + * @function pull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object + * @param {google.pubsub.v1.Subscriber.PullCallback} callback Node-style callback called with the error, if any, and PullResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.pull = function pull(request, callback) { + return this.rpcCall(pull, $root.google.pubsub.v1.PullRequest, $root.google.pubsub.v1.PullResponse, request, callback); + }, "name", { value: "Pull" }); - /** - * Converts this FileDescriptorSet to JSON. - * @function toJSON - * @memberof google.protobuf.FileDescriptorSet - * @instance - * @returns {Object.} JSON object - */ - FileDescriptorSet.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Calls Pull. + * @function pull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - return FileDescriptorSet; - })(); + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * @memberof google.pubsub.v1.Subscriber + * @typedef StreamingPullCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.StreamingPullResponse} [response] StreamingPullResponse + */ - protobuf.FileDescriptorProto = (function() { + /** + * Calls StreamingPull. + * @function streamingPull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object + * @param {google.pubsub.v1.Subscriber.StreamingPullCallback} callback Node-style callback called with the error, if any, and StreamingPullResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.streamingPull = function streamingPull(request, callback) { + return this.rpcCall(streamingPull, $root.google.pubsub.v1.StreamingPullRequest, $root.google.pubsub.v1.StreamingPullResponse, request, callback); + }, "name", { value: "StreamingPull" }); - /** - * Properties of a FileDescriptorProto. - * @memberof google.protobuf - * @interface IFileDescriptorProto - * @property {string|null} [name] FileDescriptorProto name - * @property {string|null} ["package"] FileDescriptorProto package - * @property {Array.|null} [dependency] FileDescriptorProto dependency - * @property {Array.|null} [publicDependency] FileDescriptorProto publicDependency - * @property {Array.|null} [weakDependency] FileDescriptorProto weakDependency - * @property {Array.|null} [messageType] FileDescriptorProto messageType - * @property {Array.|null} [enumType] FileDescriptorProto enumType - * @property {Array.|null} [service] FileDescriptorProto service - * @property {Array.|null} [extension] FileDescriptorProto extension - * @property {google.protobuf.IFileOptions|null} [options] FileDescriptorProto options - * @property {google.protobuf.ISourceCodeInfo|null} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo - * @property {string|null} [syntax] FileDescriptorProto syntax - */ + /** + * Calls StreamingPull. + * @function streamingPull + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Constructs a new FileDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a FileDescriptorProto. - * @implements IFileDescriptorProto - * @constructor - * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set - */ - function FileDescriptorProto(properties) { - this.dependency = []; - this.publicDependency = []; - this.weakDependency = []; - this.messageType = []; - this.enumType = []; - this.service = []; - this.extension = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ModifyPushConfigCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * FileDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.name = ""; + /** + * Calls ModifyPushConfig. + * @function modifyPushConfig + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ModifyPushConfigCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.modifyPushConfig = function modifyPushConfig(request, callback) { + return this.rpcCall(modifyPushConfig, $root.google.pubsub.v1.ModifyPushConfigRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "ModifyPushConfig" }); - /** - * FileDescriptorProto package. - * @member {string} package - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype["package"] = ""; + /** + * Calls ModifyPushConfig. + * @function modifyPushConfig + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * FileDescriptorProto dependency. - * @member {Array.} dependency - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.dependency = $util.emptyArray; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef GetSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ - /** - * FileDescriptorProto publicDependency. - * @member {Array.} publicDependency - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.publicDependency = $util.emptyArray; + /** + * Calls GetSnapshot. + * @function getSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.GetSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.getSnapshot = function getSnapshot(request, callback) { + return this.rpcCall(getSnapshot, $root.google.pubsub.v1.GetSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "GetSnapshot" }); - /** - * FileDescriptorProto weakDependency. - * @member {Array.} weakDependency - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.weakDependency = $util.emptyArray; + /** + * Calls GetSnapshot. + * @function getSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * FileDescriptorProto messageType. - * @member {Array.} messageType - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.messageType = $util.emptyArray; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * @memberof google.pubsub.v1.Subscriber + * @typedef ListSnapshotsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListSnapshotsResponse} [response] ListSnapshotsResponse + */ - /** - * FileDescriptorProto enumType. - * @member {Array.} enumType - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.enumType = $util.emptyArray; + /** + * Calls ListSnapshots. + * @function listSnapshots + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object + * @param {google.pubsub.v1.Subscriber.ListSnapshotsCallback} callback Node-style callback called with the error, if any, and ListSnapshotsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.listSnapshots = function listSnapshots(request, callback) { + return this.rpcCall(listSnapshots, $root.google.pubsub.v1.ListSnapshotsRequest, $root.google.pubsub.v1.ListSnapshotsResponse, request, callback); + }, "name", { value: "ListSnapshots" }); - /** - * FileDescriptorProto service. - * @member {Array.} service - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.service = $util.emptyArray; + /** + * Calls ListSnapshots. + * @function listSnapshots + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * FileDescriptorProto extension. - * @member {Array.} extension - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.extension = $util.emptyArray; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef CreateSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ - /** - * FileDescriptorProto options. - * @member {google.protobuf.IFileOptions|null|undefined} options - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.options = null; + /** + * Calls CreateSnapshot. + * @function createSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.CreateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.createSnapshot = function createSnapshot(request, callback) { + return this.rpcCall(createSnapshot, $root.google.pubsub.v1.CreateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "CreateSnapshot" }); - /** - * FileDescriptorProto sourceCodeInfo. - * @member {google.protobuf.ISourceCodeInfo|null|undefined} sourceCodeInfo - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.sourceCodeInfo = null; + /** + * Calls CreateSnapshot. + * @function createSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * FileDescriptorProto syntax. - * @member {string} syntax - * @memberof google.protobuf.FileDescriptorProto - * @instance - */ - FileDescriptorProto.prototype.syntax = ""; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef UpdateSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Snapshot} [response] Snapshot + */ - /** - * Creates a new FileDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto instance - */ - FileDescriptorProto.create = function create(properties) { - return new FileDescriptorProto(properties); - }; + /** + * Calls UpdateSnapshot. + * @function updateSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.UpdateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.updateSnapshot = function updateSnapshot(request, callback) { + return this.rpcCall(updateSnapshot, $root.google.pubsub.v1.UpdateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); + }, "name", { value: "UpdateSnapshot" }); - /** - * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FileDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message["package"] != null && message.hasOwnProperty("package")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message["package"]); - if (message.dependency != null && message.dependency.length) - for (var i = 0; i < message.dependency.length; ++i) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.dependency[i]); - if (message.messageType != null && message.messageType.length) - for (var i = 0; i < message.messageType.length; ++i) - $root.google.protobuf.DescriptorProto.encode(message.messageType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.enumType != null && message.enumType.length) - for (var i = 0; i < message.enumType.length; ++i) - $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); - if (message.service != null && message.service.length) - for (var i = 0; i < message.service.length; ++i) - $root.google.protobuf.ServiceDescriptorProto.encode(message.service[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); - if (message.extension != null && message.extension.length) - for (var i = 0; i < message.extension.length; ++i) - $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.FileOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) - $root.google.protobuf.SourceCodeInfo.encode(message.sourceCodeInfo, writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); - if (message.publicDependency != null && message.publicDependency.length) - for (var i = 0; i < message.publicDependency.length; ++i) - writer.uint32(/* id 10, wireType 0 =*/80).int32(message.publicDependency[i]); - if (message.weakDependency != null && message.weakDependency.length) - for (var i = 0; i < message.weakDependency.length; ++i) - writer.uint32(/* id 11, wireType 0 =*/88).int32(message.weakDependency[i]); - if (message.syntax != null && message.hasOwnProperty("syntax")) - writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); - return writer; - }; + /** + * Calls UpdateSnapshot. + * @function updateSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FileDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * @memberof google.pubsub.v1.Subscriber + * @typedef DeleteSnapshotCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FileDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message["package"] = reader.string(); - break; - case 3: - if (!(message.dependency && message.dependency.length)) - message.dependency = []; - message.dependency.push(reader.string()); - break; - case 10: - if (!(message.publicDependency && message.publicDependency.length)) - message.publicDependency = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.publicDependency.push(reader.int32()); - } else - message.publicDependency.push(reader.int32()); - break; - case 11: - if (!(message.weakDependency && message.weakDependency.length)) - message.weakDependency = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.weakDependency.push(reader.int32()); - } else - message.weakDependency.push(reader.int32()); - break; - case 4: - if (!(message.messageType && message.messageType.length)) - message.messageType = []; - message.messageType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.enumType && message.enumType.length)) - message.enumType = []; - message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); - break; - case 6: - if (!(message.service && message.service.length)) - message.service = []; - message.service.push($root.google.protobuf.ServiceDescriptorProto.decode(reader, reader.uint32())); - break; - case 7: - if (!(message.extension && message.extension.length)) - message.extension = []; - message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 8: - message.options = $root.google.protobuf.FileOptions.decode(reader, reader.uint32()); - break; - case 9: - message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.decode(reader, reader.uint32()); - break; - case 12: - message.syntax = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Calls DeleteSnapshot. + * @function deleteSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object + * @param {google.pubsub.v1.Subscriber.DeleteSnapshotCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.deleteSnapshot = function deleteSnapshot(request, callback) { + return this.rpcCall(deleteSnapshot, $root.google.pubsub.v1.DeleteSnapshotRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteSnapshot" }); - /** - * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FileDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Calls DeleteSnapshot. + * @function deleteSnapshot + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ - /** - * Verifies a FileDescriptorProto message. - * @function verify - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FileDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message["package"] != null && message.hasOwnProperty("package")) - if (!$util.isString(message["package"])) - return "package: string expected"; - if (message.dependency != null && message.hasOwnProperty("dependency")) { - if (!Array.isArray(message.dependency)) - return "dependency: array expected"; - for (var i = 0; i < message.dependency.length; ++i) - if (!$util.isString(message.dependency[i])) - return "dependency: string[] expected"; - } - if (message.publicDependency != null && message.hasOwnProperty("publicDependency")) { - if (!Array.isArray(message.publicDependency)) - return "publicDependency: array expected"; - for (var i = 0; i < message.publicDependency.length; ++i) - if (!$util.isInteger(message.publicDependency[i])) - return "publicDependency: integer[] expected"; - } - if (message.weakDependency != null && message.hasOwnProperty("weakDependency")) { - if (!Array.isArray(message.weakDependency)) - return "weakDependency: array expected"; - for (var i = 0; i < message.weakDependency.length; ++i) - if (!$util.isInteger(message.weakDependency[i])) - return "weakDependency: integer[] expected"; - } - if (message.messageType != null && message.hasOwnProperty("messageType")) { - if (!Array.isArray(message.messageType)) - return "messageType: array expected"; - for (var i = 0; i < message.messageType.length; ++i) { - var error = $root.google.protobuf.DescriptorProto.verify(message.messageType[i]); - if (error) - return "messageType." + error; - } - } - if (message.enumType != null && message.hasOwnProperty("enumType")) { - if (!Array.isArray(message.enumType)) - return "enumType: array expected"; - for (var i = 0; i < message.enumType.length; ++i) { - var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); - if (error) - return "enumType." + error; - } - } - if (message.service != null && message.hasOwnProperty("service")) { - if (!Array.isArray(message.service)) - return "service: array expected"; - for (var i = 0; i < message.service.length; ++i) { - var error = $root.google.protobuf.ServiceDescriptorProto.verify(message.service[i]); - if (error) - return "service." + error; - } - } - if (message.extension != null && message.hasOwnProperty("extension")) { - if (!Array.isArray(message.extension)) - return "extension: array expected"; - for (var i = 0; i < message.extension.length; ++i) { - var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); - if (error) - return "extension." + error; - } - } - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.FileOptions.verify(message.options); - if (error) - return "options." + error; - } - if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) { - var error = $root.google.protobuf.SourceCodeInfo.verify(message.sourceCodeInfo); - if (error) - return "sourceCodeInfo." + error; + /** + * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * @memberof google.pubsub.v1.Subscriber + * @typedef SeekCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.SeekResponse} [response] SeekResponse + */ + + /** + * Calls Seek. + * @function seek + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object + * @param {google.pubsub.v1.Subscriber.SeekCallback} callback Node-style callback called with the error, if any, and SeekResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Subscriber.prototype.seek = function seek(request, callback) { + return this.rpcCall(seek, $root.google.pubsub.v1.SeekRequest, $root.google.pubsub.v1.SeekResponse, request, callback); + }, "name", { value: "Seek" }); + + /** + * Calls Seek. + * @function seek + * @memberof google.pubsub.v1.Subscriber + * @instance + * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return Subscriber; + })(); + + v1.Subscription = (function() { + + /** + * Properties of a Subscription. + * @memberof google.pubsub.v1 + * @interface ISubscription + * @property {string|null} [name] Subscription name + * @property {string|null} [topic] Subscription topic + * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] Subscription pushConfig + * @property {number|null} [ackDeadlineSeconds] Subscription ackDeadlineSeconds + * @property {boolean|null} [retainAckedMessages] Subscription retainAckedMessages + * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Subscription messageRetentionDuration + * @property {Object.|null} [labels] Subscription labels + * @property {boolean|null} [enableMessageOrdering] Subscription enableMessageOrdering + * @property {google.pubsub.v1.IExpirationPolicy|null} [expirationPolicy] Subscription expirationPolicy + * @property {string|null} [filter] Subscription filter + * @property {google.pubsub.v1.IDeadLetterPolicy|null} [deadLetterPolicy] Subscription deadLetterPolicy + * @property {google.pubsub.v1.IRetryPolicy|null} [retryPolicy] Subscription retryPolicy + */ + + /** + * Constructs a new Subscription. + * @memberof google.pubsub.v1 + * @classdesc Represents a Subscription. + * @implements ISubscription + * @constructor + * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set + */ + function Subscription(properties) { + this.labels = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - if (message.syntax != null && message.hasOwnProperty("syntax")) - if (!$util.isString(message.syntax)) - return "syntax: string expected"; - return null; - }; - /** - * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto - */ - FileDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FileDescriptorProto) - return object; - var message = new $root.google.protobuf.FileDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object["package"] != null) - message["package"] = String(object["package"]); - if (object.dependency) { - if (!Array.isArray(object.dependency)) - throw TypeError(".google.protobuf.FileDescriptorProto.dependency: array expected"); - message.dependency = []; - for (var i = 0; i < object.dependency.length; ++i) - message.dependency[i] = String(object.dependency[i]); - } - if (object.publicDependency) { - if (!Array.isArray(object.publicDependency)) - throw TypeError(".google.protobuf.FileDescriptorProto.publicDependency: array expected"); - message.publicDependency = []; - for (var i = 0; i < object.publicDependency.length; ++i) - message.publicDependency[i] = object.publicDependency[i] | 0; - } - if (object.weakDependency) { - if (!Array.isArray(object.weakDependency)) - throw TypeError(".google.protobuf.FileDescriptorProto.weakDependency: array expected"); - message.weakDependency = []; - for (var i = 0; i < object.weakDependency.length; ++i) - message.weakDependency[i] = object.weakDependency[i] | 0; - } - if (object.messageType) { - if (!Array.isArray(object.messageType)) - throw TypeError(".google.protobuf.FileDescriptorProto.messageType: array expected"); - message.messageType = []; - for (var i = 0; i < object.messageType.length; ++i) { - if (typeof object.messageType[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.messageType: object expected"); - message.messageType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.messageType[i]); - } - } - if (object.enumType) { - if (!Array.isArray(object.enumType)) - throw TypeError(".google.protobuf.FileDescriptorProto.enumType: array expected"); - message.enumType = []; - for (var i = 0; i < object.enumType.length; ++i) { - if (typeof object.enumType[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.enumType: object expected"); - message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); - } - } - if (object.service) { - if (!Array.isArray(object.service)) - throw TypeError(".google.protobuf.FileDescriptorProto.service: array expected"); - message.service = []; - for (var i = 0; i < object.service.length; ++i) { - if (typeof object.service[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.service: object expected"); - message.service[i] = $root.google.protobuf.ServiceDescriptorProto.fromObject(object.service[i]); - } - } - if (object.extension) { - if (!Array.isArray(object.extension)) - throw TypeError(".google.protobuf.FileDescriptorProto.extension: array expected"); - message.extension = []; - for (var i = 0; i < object.extension.length; ++i) { - if (typeof object.extension[i] !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.extension: object expected"); - message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); - } - } - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.FileOptions.fromObject(object.options); - } - if (object.sourceCodeInfo != null) { - if (typeof object.sourceCodeInfo !== "object") - throw TypeError(".google.protobuf.FileDescriptorProto.sourceCodeInfo: object expected"); - message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.fromObject(object.sourceCodeInfo); - } - if (object.syntax != null) - message.syntax = String(object.syntax); - return message; - }; - - /** - * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FileDescriptorProto - * @static - * @param {google.protobuf.FileDescriptorProto} message FileDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FileDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.dependency = []; - object.messageType = []; - object.enumType = []; - object.service = []; - object.extension = []; - object.publicDependency = []; - object.weakDependency = []; - } - if (options.defaults) { - object.name = ""; - object["package"] = ""; - object.options = null; - object.sourceCodeInfo = null; - object.syntax = ""; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message["package"] != null && message.hasOwnProperty("package")) - object["package"] = message["package"]; - if (message.dependency && message.dependency.length) { - object.dependency = []; - for (var j = 0; j < message.dependency.length; ++j) - object.dependency[j] = message.dependency[j]; - } - if (message.messageType && message.messageType.length) { - object.messageType = []; - for (var j = 0; j < message.messageType.length; ++j) - object.messageType[j] = $root.google.protobuf.DescriptorProto.toObject(message.messageType[j], options); - } - if (message.enumType && message.enumType.length) { - object.enumType = []; - for (var j = 0; j < message.enumType.length; ++j) - object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); - } - if (message.service && message.service.length) { - object.service = []; - for (var j = 0; j < message.service.length; ++j) - object.service[j] = $root.google.protobuf.ServiceDescriptorProto.toObject(message.service[j], options); - } - if (message.extension && message.extension.length) { - object.extension = []; - for (var j = 0; j < message.extension.length; ++j) - object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); - } - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.FileOptions.toObject(message.options, options); - if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) - object.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.toObject(message.sourceCodeInfo, options); - if (message.publicDependency && message.publicDependency.length) { - object.publicDependency = []; - for (var j = 0; j < message.publicDependency.length; ++j) - object.publicDependency[j] = message.publicDependency[j]; - } - if (message.weakDependency && message.weakDependency.length) { - object.weakDependency = []; - for (var j = 0; j < message.weakDependency.length; ++j) - object.weakDependency[j] = message.weakDependency[j]; - } - if (message.syntax != null && message.hasOwnProperty("syntax")) - object.syntax = message.syntax; - return object; - }; + /** + * Subscription name. + * @member {string} name + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.name = ""; - /** - * Converts this FileDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.FileDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - FileDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Subscription topic. + * @member {string} topic + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.topic = ""; - return FileDescriptorProto; - })(); + /** + * Subscription pushConfig. + * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.pushConfig = null; - protobuf.DescriptorProto = (function() { + /** + * Subscription ackDeadlineSeconds. + * @member {number} ackDeadlineSeconds + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.ackDeadlineSeconds = 0; - /** - * Properties of a DescriptorProto. - * @memberof google.protobuf - * @interface IDescriptorProto - * @property {string|null} [name] DescriptorProto name - * @property {Array.|null} [field] DescriptorProto field - * @property {Array.|null} [extension] DescriptorProto extension - * @property {Array.|null} [nestedType] DescriptorProto nestedType - * @property {Array.|null} [enumType] DescriptorProto enumType - * @property {Array.|null} [extensionRange] DescriptorProto extensionRange - * @property {Array.|null} [oneofDecl] DescriptorProto oneofDecl - * @property {google.protobuf.IMessageOptions|null} [options] DescriptorProto options - * @property {Array.|null} [reservedRange] DescriptorProto reservedRange - * @property {Array.|null} [reservedName] DescriptorProto reservedName - */ + /** + * Subscription retainAckedMessages. + * @member {boolean} retainAckedMessages + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.retainAckedMessages = false; - /** - * Constructs a new DescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a DescriptorProto. - * @implements IDescriptorProto - * @constructor - * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set - */ - function DescriptorProto(properties) { - this.field = []; - this.extension = []; - this.nestedType = []; - this.enumType = []; - this.extensionRange = []; - this.oneofDecl = []; - this.reservedRange = []; - this.reservedName = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Subscription messageRetentionDuration. + * @member {google.protobuf.IDuration|null|undefined} messageRetentionDuration + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.messageRetentionDuration = null; - /** - * DescriptorProto name. - * @member {string} name - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.name = ""; + /** + * Subscription labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.labels = $util.emptyObject; - /** - * DescriptorProto field. - * @member {Array.} field - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.field = $util.emptyArray; + /** + * Subscription enableMessageOrdering. + * @member {boolean} enableMessageOrdering + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.enableMessageOrdering = false; - /** - * DescriptorProto extension. - * @member {Array.} extension - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.extension = $util.emptyArray; + /** + * Subscription expirationPolicy. + * @member {google.pubsub.v1.IExpirationPolicy|null|undefined} expirationPolicy + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.expirationPolicy = null; - /** - * DescriptorProto nestedType. - * @member {Array.} nestedType - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.nestedType = $util.emptyArray; + /** + * Subscription filter. + * @member {string} filter + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.filter = ""; - /** - * DescriptorProto enumType. - * @member {Array.} enumType - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.enumType = $util.emptyArray; + /** + * Subscription deadLetterPolicy. + * @member {google.pubsub.v1.IDeadLetterPolicy|null|undefined} deadLetterPolicy + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.deadLetterPolicy = null; - /** - * DescriptorProto extensionRange. - * @member {Array.} extensionRange - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.extensionRange = $util.emptyArray; + /** + * Subscription retryPolicy. + * @member {google.pubsub.v1.IRetryPolicy|null|undefined} retryPolicy + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.retryPolicy = null; - /** - * DescriptorProto oneofDecl. - * @member {Array.} oneofDecl - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.oneofDecl = $util.emptyArray; + /** + * Creates a new Subscription instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set + * @returns {google.pubsub.v1.Subscription} Subscription instance + */ + Subscription.create = function create(properties) { + return new Subscription(properties); + }; - /** - * DescriptorProto options. - * @member {google.protobuf.IMessageOptions|null|undefined} options - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.options = null; + /** + * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Subscription.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.topic != null && message.hasOwnProperty("topic")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.ackDeadlineSeconds); + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + writer.uint32(/* id 7, wireType 0 =*/56).bool(message.retainAckedMessages); + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) + $root.google.protobuf.Duration.encode(message.messageRetentionDuration, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 9, wireType 2 =*/74).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.enableMessageOrdering); + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) + $root.google.pubsub.v1.ExpirationPolicy.encode(message.expirationPolicy, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.filter != null && message.hasOwnProperty("filter")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.filter); + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) + $root.google.pubsub.v1.DeadLetterPolicy.encode(message.deadLetterPolicy, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); + if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) + $root.google.pubsub.v1.RetryPolicy.encode(message.retryPolicy, writer.uint32(/* id 14, wireType 2 =*/114).fork()).ldelim(); + return writer; + }; - /** - * DescriptorProto reservedRange. - * @member {Array.} reservedRange - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.reservedRange = $util.emptyArray; + /** + * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Subscription.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * DescriptorProto reservedName. - * @member {Array.} reservedName - * @memberof google.protobuf.DescriptorProto - * @instance - */ - DescriptorProto.prototype.reservedName = $util.emptyArray; + /** + * Decodes a Subscription message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.Subscription + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.Subscription} Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Subscription.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.topic = reader.string(); + break; + case 4: + message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); + break; + case 5: + message.ackDeadlineSeconds = reader.int32(); + break; + case 7: + message.retainAckedMessages = reader.bool(); + break; + case 8: + message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + case 9: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); + break; + case 10: + message.enableMessageOrdering = reader.bool(); + break; + case 11: + message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.decode(reader, reader.uint32()); + break; + case 12: + message.filter = reader.string(); + break; + case 13: + message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.decode(reader, reader.uint32()); + break; + case 14: + message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Creates a new DescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.DescriptorProto - * @static - * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.DescriptorProto} DescriptorProto instance - */ - DescriptorProto.create = function create(properties) { - return new DescriptorProto(properties); - }; + /** + * Decodes a Subscription message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.Subscription + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.Subscription} Subscription + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Subscription.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.DescriptorProto - * @static - * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.field != null && message.field.length) - for (var i = 0; i < message.field.length; ++i) - $root.google.protobuf.FieldDescriptorProto.encode(message.field[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.nestedType != null && message.nestedType.length) - for (var i = 0; i < message.nestedType.length; ++i) - $root.google.protobuf.DescriptorProto.encode(message.nestedType[i], writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.enumType != null && message.enumType.length) - for (var i = 0; i < message.enumType.length; ++i) - $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.extensionRange != null && message.extensionRange.length) - for (var i = 0; i < message.extensionRange.length; ++i) - $root.google.protobuf.DescriptorProto.ExtensionRange.encode(message.extensionRange[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); - if (message.extension != null && message.extension.length) - for (var i = 0; i < message.extension.length; ++i) - $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.MessageOptions.encode(message.options, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); - if (message.oneofDecl != null && message.oneofDecl.length) - for (var i = 0; i < message.oneofDecl.length; ++i) - $root.google.protobuf.OneofDescriptorProto.encode(message.oneofDecl[i], writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.reservedRange != null && message.reservedRange.length) - for (var i = 0; i < message.reservedRange.length; ++i) - $root.google.protobuf.DescriptorProto.ReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); - if (message.reservedName != null && message.reservedName.length) - for (var i = 0; i < message.reservedName.length; ++i) - writer.uint32(/* id 10, wireType 2 =*/82).string(message.reservedName[i]); - return writer; - }; - - /** - * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.DescriptorProto - * @static - * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a DescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.DescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.DescriptorProto} DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (!(message.field && message.field.length)) - message.field = []; - message.field.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 6: - if (!(message.extension && message.extension.length)) - message.extension = []; - message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - if (!(message.nestedType && message.nestedType.length)) - message.nestedType = []; - message.nestedType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); - break; - case 4: - if (!(message.enumType && message.enumType.length)) - message.enumType = []; - message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.extensionRange && message.extensionRange.length)) - message.extensionRange = []; - message.extensionRange.push($root.google.protobuf.DescriptorProto.ExtensionRange.decode(reader, reader.uint32())); - break; - case 8: - if (!(message.oneofDecl && message.oneofDecl.length)) - message.oneofDecl = []; - message.oneofDecl.push($root.google.protobuf.OneofDescriptorProto.decode(reader, reader.uint32())); - break; - case 7: - message.options = $root.google.protobuf.MessageOptions.decode(reader, reader.uint32()); - break; - case 9: - if (!(message.reservedRange && message.reservedRange.length)) - message.reservedRange = []; - message.reservedRange.push($root.google.protobuf.DescriptorProto.ReservedRange.decode(reader, reader.uint32())); - break; - case 10: - if (!(message.reservedName && message.reservedName.length)) - message.reservedName = []; - message.reservedName.push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.DescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.DescriptorProto} DescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a DescriptorProto message. - * @function verify - * @memberof google.protobuf.DescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.field != null && message.hasOwnProperty("field")) { - if (!Array.isArray(message.field)) - return "field: array expected"; - for (var i = 0; i < message.field.length; ++i) { - var error = $root.google.protobuf.FieldDescriptorProto.verify(message.field[i]); + /** + * Verifies a Subscription message. + * @function verify + * @memberof google.pubsub.v1.Subscription + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Subscription.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { + var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); if (error) - return "field." + error; + return "pushConfig." + error; } - } - if (message.extension != null && message.hasOwnProperty("extension")) { - if (!Array.isArray(message.extension)) - return "extension: array expected"; - for (var i = 0; i < message.extension.length; ++i) { - var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + if (!$util.isInteger(message.ackDeadlineSeconds)) + return "ackDeadlineSeconds: integer expected"; + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + if (typeof message.retainAckedMessages !== "boolean") + return "retainAckedMessages: boolean expected"; + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) { + var error = $root.google.protobuf.Duration.verify(message.messageRetentionDuration); if (error) - return "extension." + error; + return "messageRetentionDuration." + error; } - } - if (message.nestedType != null && message.hasOwnProperty("nestedType")) { - if (!Array.isArray(message.nestedType)) - return "nestedType: array expected"; - for (var i = 0; i < message.nestedType.length; ++i) { - var error = $root.google.protobuf.DescriptorProto.verify(message.nestedType[i]); - if (error) - return "nestedType." + error; + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; } - } - if (message.enumType != null && message.hasOwnProperty("enumType")) { - if (!Array.isArray(message.enumType)) - return "enumType: array expected"; - for (var i = 0; i < message.enumType.length; ++i) { - var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + if (typeof message.enableMessageOrdering !== "boolean") + return "enableMessageOrdering: boolean expected"; + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) { + var error = $root.google.pubsub.v1.ExpirationPolicy.verify(message.expirationPolicy); if (error) - return "enumType." + error; + return "expirationPolicy." + error; } - } - if (message.extensionRange != null && message.hasOwnProperty("extensionRange")) { - if (!Array.isArray(message.extensionRange)) - return "extensionRange: array expected"; - for (var i = 0; i < message.extensionRange.length; ++i) { - var error = $root.google.protobuf.DescriptorProto.ExtensionRange.verify(message.extensionRange[i]); + if (message.filter != null && message.hasOwnProperty("filter")) + if (!$util.isString(message.filter)) + return "filter: string expected"; + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) { + var error = $root.google.pubsub.v1.DeadLetterPolicy.verify(message.deadLetterPolicy); if (error) - return "extensionRange." + error; + return "deadLetterPolicy." + error; } - } - if (message.oneofDecl != null && message.hasOwnProperty("oneofDecl")) { - if (!Array.isArray(message.oneofDecl)) - return "oneofDecl: array expected"; - for (var i = 0; i < message.oneofDecl.length; ++i) { - var error = $root.google.protobuf.OneofDescriptorProto.verify(message.oneofDecl[i]); + if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) { + var error = $root.google.pubsub.v1.RetryPolicy.verify(message.retryPolicy); if (error) - return "oneofDecl." + error; + return "retryPolicy." + error; } - } - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.MessageOptions.verify(message.options); - if (error) - return "options." + error; - } - if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { - if (!Array.isArray(message.reservedRange)) - return "reservedRange: array expected"; - for (var i = 0; i < message.reservedRange.length; ++i) { - var error = $root.google.protobuf.DescriptorProto.ReservedRange.verify(message.reservedRange[i]); - if (error) - return "reservedRange." + error; - } - } - if (message.reservedName != null && message.hasOwnProperty("reservedName")) { - if (!Array.isArray(message.reservedName)) - return "reservedName: array expected"; - for (var i = 0; i < message.reservedName.length; ++i) - if (!$util.isString(message.reservedName[i])) - return "reservedName: string[] expected"; - } - return null; - }; + return null; + }; - /** - * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.DescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.DescriptorProto} DescriptorProto - */ - DescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.DescriptorProto) - return object; - var message = new $root.google.protobuf.DescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.field) { - if (!Array.isArray(object.field)) - throw TypeError(".google.protobuf.DescriptorProto.field: array expected"); - message.field = []; - for (var i = 0; i < object.field.length; ++i) { - if (typeof object.field[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.field: object expected"); - message.field[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.field[i]); + /** + * Creates a Subscription message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.Subscription + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.Subscription} Subscription + */ + Subscription.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Subscription) + return object; + var message = new $root.google.pubsub.v1.Subscription(); + if (object.name != null) + message.name = String(object.name); + if (object.topic != null) + message.topic = String(object.topic); + if (object.pushConfig != null) { + if (typeof object.pushConfig !== "object") + throw TypeError(".google.pubsub.v1.Subscription.pushConfig: object expected"); + message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); } - } - if (object.extension) { - if (!Array.isArray(object.extension)) - throw TypeError(".google.protobuf.DescriptorProto.extension: array expected"); - message.extension = []; - for (var i = 0; i < object.extension.length; ++i) { - if (typeof object.extension[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.extension: object expected"); - message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); + if (object.ackDeadlineSeconds != null) + message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; + if (object.retainAckedMessages != null) + message.retainAckedMessages = Boolean(object.retainAckedMessages); + if (object.messageRetentionDuration != null) { + if (typeof object.messageRetentionDuration !== "object") + throw TypeError(".google.pubsub.v1.Subscription.messageRetentionDuration: object expected"); + message.messageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.messageRetentionDuration); } - } - if (object.nestedType) { - if (!Array.isArray(object.nestedType)) - throw TypeError(".google.protobuf.DescriptorProto.nestedType: array expected"); - message.nestedType = []; - for (var i = 0; i < object.nestedType.length; ++i) { - if (typeof object.nestedType[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.nestedType: object expected"); - message.nestedType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.nestedType[i]); + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Subscription.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); } - } - if (object.enumType) { - if (!Array.isArray(object.enumType)) - throw TypeError(".google.protobuf.DescriptorProto.enumType: array expected"); - message.enumType = []; - for (var i = 0; i < object.enumType.length; ++i) { - if (typeof object.enumType[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.enumType: object expected"); - message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); + if (object.enableMessageOrdering != null) + message.enableMessageOrdering = Boolean(object.enableMessageOrdering); + if (object.expirationPolicy != null) { + if (typeof object.expirationPolicy !== "object") + throw TypeError(".google.pubsub.v1.Subscription.expirationPolicy: object expected"); + message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.fromObject(object.expirationPolicy); } - } - if (object.extensionRange) { - if (!Array.isArray(object.extensionRange)) - throw TypeError(".google.protobuf.DescriptorProto.extensionRange: array expected"); - message.extensionRange = []; - for (var i = 0; i < object.extensionRange.length; ++i) { - if (typeof object.extensionRange[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.extensionRange: object expected"); - message.extensionRange[i] = $root.google.protobuf.DescriptorProto.ExtensionRange.fromObject(object.extensionRange[i]); + if (object.filter != null) + message.filter = String(object.filter); + if (object.deadLetterPolicy != null) { + if (typeof object.deadLetterPolicy !== "object") + throw TypeError(".google.pubsub.v1.Subscription.deadLetterPolicy: object expected"); + message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.fromObject(object.deadLetterPolicy); } - } - if (object.oneofDecl) { - if (!Array.isArray(object.oneofDecl)) - throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: array expected"); - message.oneofDecl = []; - for (var i = 0; i < object.oneofDecl.length; ++i) { - if (typeof object.oneofDecl[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: object expected"); - message.oneofDecl[i] = $root.google.protobuf.OneofDescriptorProto.fromObject(object.oneofDecl[i]); + if (object.retryPolicy != null) { + if (typeof object.retryPolicy !== "object") + throw TypeError(".google.pubsub.v1.Subscription.retryPolicy: object expected"); + message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.fromObject(object.retryPolicy); } - } - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.DescriptorProto.options: object expected"); - message.options = $root.google.protobuf.MessageOptions.fromObject(object.options); - } - if (object.reservedRange) { - if (!Array.isArray(object.reservedRange)) - throw TypeError(".google.protobuf.DescriptorProto.reservedRange: array expected"); - message.reservedRange = []; - for (var i = 0; i < object.reservedRange.length; ++i) { - if (typeof object.reservedRange[i] !== "object") - throw TypeError(".google.protobuf.DescriptorProto.reservedRange: object expected"); - message.reservedRange[i] = $root.google.protobuf.DescriptorProto.ReservedRange.fromObject(object.reservedRange[i]); + return message; + }; + + /** + * Creates a plain object from a Subscription message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.Subscription + * @static + * @param {google.pubsub.v1.Subscription} message Subscription + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Subscription.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; + object.topic = ""; + object.pushConfig = null; + object.ackDeadlineSeconds = 0; + object.retainAckedMessages = false; + object.messageRetentionDuration = null; + object.enableMessageOrdering = false; + object.expirationPolicy = null; + object.filter = ""; + object.deadLetterPolicy = null; + object.retryPolicy = null; } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + object.ackDeadlineSeconds = message.ackDeadlineSeconds; + if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + object.retainAckedMessages = message.retainAckedMessages; + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) + object.messageRetentionDuration = $root.google.protobuf.Duration.toObject(message.messageRetentionDuration, options); + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } + if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + object.enableMessageOrdering = message.enableMessageOrdering; + if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) + object.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.toObject(message.expirationPolicy, options); + if (message.filter != null && message.hasOwnProperty("filter")) + object.filter = message.filter; + if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) + object.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.toObject(message.deadLetterPolicy, options); + if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) + object.retryPolicy = $root.google.pubsub.v1.RetryPolicy.toObject(message.retryPolicy, options); + return object; + }; + + /** + * Converts this Subscription to JSON. + * @function toJSON + * @memberof google.pubsub.v1.Subscription + * @instance + * @returns {Object.} JSON object + */ + Subscription.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return Subscription; + })(); + + v1.RetryPolicy = (function() { + + /** + * Properties of a RetryPolicy. + * @memberof google.pubsub.v1 + * @interface IRetryPolicy + * @property {google.protobuf.IDuration|null} [minimumBackoff] RetryPolicy minimumBackoff + * @property {google.protobuf.IDuration|null} [maximumBackoff] RetryPolicy maximumBackoff + */ + + /** + * Constructs a new RetryPolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents a RetryPolicy. + * @implements IRetryPolicy + * @constructor + * @param {google.pubsub.v1.IRetryPolicy=} [properties] Properties to set + */ + function RetryPolicy(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - if (object.reservedName) { - if (!Array.isArray(object.reservedName)) - throw TypeError(".google.protobuf.DescriptorProto.reservedName: array expected"); - message.reservedName = []; - for (var i = 0; i < object.reservedName.length; ++i) - message.reservedName[i] = String(object.reservedName[i]); - } - return message; - }; - - /** - * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.DescriptorProto - * @static - * @param {google.protobuf.DescriptorProto} message DescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.field = []; - object.nestedType = []; - object.enumType = []; - object.extensionRange = []; - object.extension = []; - object.oneofDecl = []; - object.reservedRange = []; - object.reservedName = []; - } - if (options.defaults) { - object.name = ""; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.field && message.field.length) { - object.field = []; - for (var j = 0; j < message.field.length; ++j) - object.field[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.field[j], options); - } - if (message.nestedType && message.nestedType.length) { - object.nestedType = []; - for (var j = 0; j < message.nestedType.length; ++j) - object.nestedType[j] = $root.google.protobuf.DescriptorProto.toObject(message.nestedType[j], options); - } - if (message.enumType && message.enumType.length) { - object.enumType = []; - for (var j = 0; j < message.enumType.length; ++j) - object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); - } - if (message.extensionRange && message.extensionRange.length) { - object.extensionRange = []; - for (var j = 0; j < message.extensionRange.length; ++j) - object.extensionRange[j] = $root.google.protobuf.DescriptorProto.ExtensionRange.toObject(message.extensionRange[j], options); - } - if (message.extension && message.extension.length) { - object.extension = []; - for (var j = 0; j < message.extension.length; ++j) - object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); - } - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.MessageOptions.toObject(message.options, options); - if (message.oneofDecl && message.oneofDecl.length) { - object.oneofDecl = []; - for (var j = 0; j < message.oneofDecl.length; ++j) - object.oneofDecl[j] = $root.google.protobuf.OneofDescriptorProto.toObject(message.oneofDecl[j], options); - } - if (message.reservedRange && message.reservedRange.length) { - object.reservedRange = []; - for (var j = 0; j < message.reservedRange.length; ++j) - object.reservedRange[j] = $root.google.protobuf.DescriptorProto.ReservedRange.toObject(message.reservedRange[j], options); - } - if (message.reservedName && message.reservedName.length) { - object.reservedName = []; - for (var j = 0; j < message.reservedName.length; ++j) - object.reservedName[j] = message.reservedName[j]; - } - return object; - }; - - /** - * Converts this DescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.DescriptorProto - * @instance - * @returns {Object.} JSON object - */ - DescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - DescriptorProto.ExtensionRange = (function() { - - /** - * Properties of an ExtensionRange. - * @memberof google.protobuf.DescriptorProto - * @interface IExtensionRange - * @property {number|null} [start] ExtensionRange start - * @property {number|null} [end] ExtensionRange end - * @property {google.protobuf.IExtensionRangeOptions|null} [options] ExtensionRange options - */ - - /** - * Constructs a new ExtensionRange. - * @memberof google.protobuf.DescriptorProto - * @classdesc Represents an ExtensionRange. - * @implements IExtensionRange - * @constructor - * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set - */ - function ExtensionRange(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ExtensionRange start. - * @member {number} start - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @instance - */ - ExtensionRange.prototype.start = 0; /** - * ExtensionRange end. - * @member {number} end - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * RetryPolicy minimumBackoff. + * @member {google.protobuf.IDuration|null|undefined} minimumBackoff + * @memberof google.pubsub.v1.RetryPolicy * @instance */ - ExtensionRange.prototype.end = 0; + RetryPolicy.prototype.minimumBackoff = null; /** - * ExtensionRange options. - * @member {google.protobuf.IExtensionRangeOptions|null|undefined} options - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * RetryPolicy maximumBackoff. + * @member {google.protobuf.IDuration|null|undefined} maximumBackoff + * @memberof google.pubsub.v1.RetryPolicy * @instance */ - ExtensionRange.prototype.options = null; + RetryPolicy.prototype.maximumBackoff = null; /** - * Creates a new ExtensionRange instance using the specified properties. + * Creates a new RetryPolicy instance using the specified properties. * @function create - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @static - * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set - * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange instance + * @param {google.pubsub.v1.IRetryPolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy instance */ - ExtensionRange.create = function create(properties) { - return new ExtensionRange(properties); + RetryPolicy.create = function create(properties) { + return new RetryPolicy(properties); }; /** - * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * Encodes the specified RetryPolicy message. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. * @function encode - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @static - * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode + * @param {google.pubsub.v1.IRetryPolicy} message RetryPolicy message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ExtensionRange.encode = function encode(message, writer) { + RetryPolicy.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.ExtensionRangeOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) + $root.google.protobuf.Duration.encode(message.minimumBackoff, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) + $root.google.protobuf.Duration.encode(message.maximumBackoff, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. + * Encodes the specified RetryPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @static - * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode + * @param {google.pubsub.v1.IRetryPolicy} message RetryPolicy message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ExtensionRange.encodeDelimited = function encodeDelimited(message, writer) { + RetryPolicy.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an ExtensionRange message from the specified reader or buffer. + * Decodes a RetryPolicy message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange + * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ExtensionRange.decode = function decode(reader, length) { + RetryPolicy.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.RetryPolicy(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.start = reader.int32(); + message.minimumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); break; case 2: - message.end = reader.int32(); - break; - case 3: - message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); + message.maximumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -5842,130 +4717,127 @@ }; /** - * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. + * Decodes a RetryPolicy message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange + * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ExtensionRange.decodeDelimited = function decodeDelimited(reader) { + RetryPolicy.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an ExtensionRange message. + * Verifies a RetryPolicy message. * @function verify - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ExtensionRange.verify = function verify(message) { + RetryPolicy.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.start != null && message.hasOwnProperty("start")) - if (!$util.isInteger(message.start)) - return "start: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.ExtensionRangeOptions.verify(message.options); + if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) { + var error = $root.google.protobuf.Duration.verify(message.minimumBackoff); if (error) - return "options." + error; + return "minimumBackoff." + error; + } + if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) { + var error = $root.google.protobuf.Duration.verify(message.maximumBackoff); + if (error) + return "maximumBackoff." + error; } return null; }; /** - * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. + * Creates a RetryPolicy message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @static * @param {Object.} object Plain object - * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange + * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy */ - ExtensionRange.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.DescriptorProto.ExtensionRange) + RetryPolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.RetryPolicy) return object; - var message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); - if (object.start != null) - message.start = object.start | 0; - if (object.end != null) - message.end = object.end | 0; - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.DescriptorProto.ExtensionRange.options: object expected"); - message.options = $root.google.protobuf.ExtensionRangeOptions.fromObject(object.options); + var message = new $root.google.pubsub.v1.RetryPolicy(); + if (object.minimumBackoff != null) { + if (typeof object.minimumBackoff !== "object") + throw TypeError(".google.pubsub.v1.RetryPolicy.minimumBackoff: object expected"); + message.minimumBackoff = $root.google.protobuf.Duration.fromObject(object.minimumBackoff); + } + if (object.maximumBackoff != null) { + if (typeof object.maximumBackoff !== "object") + throw TypeError(".google.pubsub.v1.RetryPolicy.maximumBackoff: object expected"); + message.maximumBackoff = $root.google.protobuf.Duration.fromObject(object.maximumBackoff); } return message; }; /** - * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. + * Creates a plain object from a RetryPolicy message. Also converts values to other types if specified. * @function toObject - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @static - * @param {google.protobuf.DescriptorProto.ExtensionRange} message ExtensionRange + * @param {google.pubsub.v1.RetryPolicy} message RetryPolicy * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ExtensionRange.toObject = function toObject(message, options) { + RetryPolicy.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.start = 0; - object.end = 0; - object.options = null; + object.minimumBackoff = null; + object.maximumBackoff = null; } - if (message.start != null && message.hasOwnProperty("start")) - object.start = message.start; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.ExtensionRangeOptions.toObject(message.options, options); + if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) + object.minimumBackoff = $root.google.protobuf.Duration.toObject(message.minimumBackoff, options); + if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) + object.maximumBackoff = $root.google.protobuf.Duration.toObject(message.maximumBackoff, options); return object; }; /** - * Converts this ExtensionRange to JSON. + * Converts this RetryPolicy to JSON. * @function toJSON - * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @memberof google.pubsub.v1.RetryPolicy * @instance * @returns {Object.} JSON object */ - ExtensionRange.prototype.toJSON = function toJSON() { + RetryPolicy.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ExtensionRange; + return RetryPolicy; })(); - DescriptorProto.ReservedRange = (function() { + v1.DeadLetterPolicy = (function() { /** - * Properties of a ReservedRange. - * @memberof google.protobuf.DescriptorProto - * @interface IReservedRange - * @property {number|null} [start] ReservedRange start - * @property {number|null} [end] ReservedRange end + * Properties of a DeadLetterPolicy. + * @memberof google.pubsub.v1 + * @interface IDeadLetterPolicy + * @property {string|null} [deadLetterTopic] DeadLetterPolicy deadLetterTopic + * @property {number|null} [maxDeliveryAttempts] DeadLetterPolicy maxDeliveryAttempts */ /** - * Constructs a new ReservedRange. - * @memberof google.protobuf.DescriptorProto - * @classdesc Represents a ReservedRange. - * @implements IReservedRange + * Constructs a new DeadLetterPolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeadLetterPolicy. + * @implements IDeadLetterPolicy * @constructor - * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set + * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set */ - function ReservedRange(properties) { + function DeadLetterPolicy(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -5973,88 +4845,88 @@ } /** - * ReservedRange start. - * @member {number} start - * @memberof google.protobuf.DescriptorProto.ReservedRange + * DeadLetterPolicy deadLetterTopic. + * @member {string} deadLetterTopic + * @memberof google.pubsub.v1.DeadLetterPolicy * @instance */ - ReservedRange.prototype.start = 0; + DeadLetterPolicy.prototype.deadLetterTopic = ""; /** - * ReservedRange end. - * @member {number} end - * @memberof google.protobuf.DescriptorProto.ReservedRange + * DeadLetterPolicy maxDeliveryAttempts. + * @member {number} maxDeliveryAttempts + * @memberof google.pubsub.v1.DeadLetterPolicy * @instance */ - ReservedRange.prototype.end = 0; + DeadLetterPolicy.prototype.maxDeliveryAttempts = 0; /** - * Creates a new ReservedRange instance using the specified properties. + * Creates a new DeadLetterPolicy instance using the specified properties. * @function create - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @static - * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set - * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange instance + * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy instance */ - ReservedRange.create = function create(properties) { - return new ReservedRange(properties); + DeadLetterPolicy.create = function create(properties) { + return new DeadLetterPolicy(properties); }; /** - * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. * @function encode - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @static - * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode + * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ReservedRange.encode = function encode(message, writer) { + DeadLetterPolicy.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.deadLetterTopic); + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.maxDeliveryAttempts); return writer; }; /** - * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. + * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @static - * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode + * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ReservedRange.encodeDelimited = function encodeDelimited(message, writer) { + DeadLetterPolicy.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ReservedRange message from the specified reader or buffer. + * Decodes a DeadLetterPolicy message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ReservedRange.decode = function decode(reader, length) { + DeadLetterPolicy.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ReservedRange(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeadLetterPolicy(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.start = reader.int32(); + message.deadLetterTopic = reader.string(); break; case 2: - message.end = reader.int32(); + message.maxDeliveryAttempts = reader.int32(); break; default: reader.skipType(tag & 7); @@ -6065,1445 +4937,1033 @@ }; /** - * Decodes a ReservedRange message from the specified reader or buffer, length delimited. + * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ReservedRange.decodeDelimited = function decodeDelimited(reader) { + DeadLetterPolicy.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ReservedRange message. + * Verifies a DeadLetterPolicy message. * @function verify - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ReservedRange.verify = function verify(message) { + DeadLetterPolicy.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.start != null && message.hasOwnProperty("start")) - if (!$util.isInteger(message.start)) - return "start: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + if (!$util.isString(message.deadLetterTopic)) + return "deadLetterTopic: string expected"; + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + if (!$util.isInteger(message.maxDeliveryAttempts)) + return "maxDeliveryAttempts: integer expected"; return null; }; /** - * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. + * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @static * @param {Object.} object Plain object - * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange + * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy */ - ReservedRange.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.DescriptorProto.ReservedRange) + DeadLetterPolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeadLetterPolicy) return object; - var message = new $root.google.protobuf.DescriptorProto.ReservedRange(); - if (object.start != null) - message.start = object.start | 0; - if (object.end != null) - message.end = object.end | 0; + var message = new $root.google.pubsub.v1.DeadLetterPolicy(); + if (object.deadLetterTopic != null) + message.deadLetterTopic = String(object.deadLetterTopic); + if (object.maxDeliveryAttempts != null) + message.maxDeliveryAttempts = object.maxDeliveryAttempts | 0; return message; }; /** - * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. + * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. * @function toObject - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @static - * @param {google.protobuf.DescriptorProto.ReservedRange} message ReservedRange + * @param {google.pubsub.v1.DeadLetterPolicy} message DeadLetterPolicy * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ReservedRange.toObject = function toObject(message, options) { + DeadLetterPolicy.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.start = 0; - object.end = 0; + object.deadLetterTopic = ""; + object.maxDeliveryAttempts = 0; } - if (message.start != null && message.hasOwnProperty("start")) - object.start = message.start; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; + if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + object.deadLetterTopic = message.deadLetterTopic; + if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + object.maxDeliveryAttempts = message.maxDeliveryAttempts; return object; }; /** - * Converts this ReservedRange to JSON. + * Converts this DeadLetterPolicy to JSON. * @function toJSON - * @memberof google.protobuf.DescriptorProto.ReservedRange + * @memberof google.pubsub.v1.DeadLetterPolicy * @instance * @returns {Object.} JSON object */ - ReservedRange.prototype.toJSON = function toJSON() { + DeadLetterPolicy.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ReservedRange; + return DeadLetterPolicy; })(); - return DescriptorProto; - })(); + v1.ExpirationPolicy = (function() { - protobuf.ExtensionRangeOptions = (function() { + /** + * Properties of an ExpirationPolicy. + * @memberof google.pubsub.v1 + * @interface IExpirationPolicy + * @property {google.protobuf.IDuration|null} [ttl] ExpirationPolicy ttl + */ - /** - * Properties of an ExtensionRangeOptions. - * @memberof google.protobuf - * @interface IExtensionRangeOptions - * @property {Array.|null} [uninterpretedOption] ExtensionRangeOptions uninterpretedOption - */ + /** + * Constructs a new ExpirationPolicy. + * @memberof google.pubsub.v1 + * @classdesc Represents an ExpirationPolicy. + * @implements IExpirationPolicy + * @constructor + * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set + */ + function ExpirationPolicy(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new ExtensionRangeOptions. - * @memberof google.protobuf - * @classdesc Represents an ExtensionRangeOptions. - * @implements IExtensionRangeOptions - * @constructor - * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set - */ - function ExtensionRangeOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * ExpirationPolicy ttl. + * @member {google.protobuf.IDuration|null|undefined} ttl + * @memberof google.pubsub.v1.ExpirationPolicy + * @instance + */ + ExpirationPolicy.prototype.ttl = null; - /** - * ExtensionRangeOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.ExtensionRangeOptions - * @instance - */ - ExtensionRangeOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * Creates a new ExpirationPolicy instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy instance + */ + ExpirationPolicy.create = function create(properties) { + return new ExpirationPolicy(properties); + }; - /** - * Creates a new ExtensionRangeOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions instance - */ - ExtensionRangeOptions.create = function create(properties) { - return new ExtensionRangeOptions(properties); - }; - - /** - * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExtensionRangeOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; + /** + * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExpirationPolicy.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ttl != null && message.hasOwnProperty("ttl")) + $root.google.protobuf.Duration.encode(message.ttl, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExtensionRangeOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExpirationPolicy.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExtensionRangeOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExpirationPolicy.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ExpirationPolicy(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ttl = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExtensionRangeOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExpirationPolicy.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies an ExtensionRangeOptions message. - * @function verify - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ExtensionRangeOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + /** + * Verifies an ExpirationPolicy message. + * @function verify + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExpirationPolicy.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ttl != null && message.hasOwnProperty("ttl")) { + var error = $root.google.protobuf.Duration.verify(message.ttl); if (error) - return "uninterpretedOption." + error; + return "ttl." + error; } - } - return null; - }; + return null; + }; - /** - * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - */ - ExtensionRangeOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.ExtensionRangeOptions) - return object; - var message = new $root.google.protobuf.ExtensionRangeOptions(); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + /** + * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy + */ + ExpirationPolicy.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ExpirationPolicy) + return object; + var message = new $root.google.pubsub.v1.ExpirationPolicy(); + if (object.ttl != null) { + if (typeof object.ttl !== "object") + throw TypeError(".google.pubsub.v1.ExpirationPolicy.ttl: object expected"); + message.ttl = $root.google.protobuf.Duration.fromObject(object.ttl); } - } - return message; - }; - - /** - * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.ExtensionRangeOptions} message ExtensionRangeOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ExtensionRangeOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; + return message; + }; - /** - * Converts this ExtensionRangeOptions to JSON. - * @function toJSON - * @memberof google.protobuf.ExtensionRangeOptions - * @instance - * @returns {Object.} JSON object - */ - ExtensionRangeOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return ExtensionRangeOptions; - })(); - - protobuf.FieldDescriptorProto = (function() { + /** + * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {google.pubsub.v1.ExpirationPolicy} message ExpirationPolicy + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExpirationPolicy.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.ttl = null; + if (message.ttl != null && message.hasOwnProperty("ttl")) + object.ttl = $root.google.protobuf.Duration.toObject(message.ttl, options); + return object; + }; - /** - * Properties of a FieldDescriptorProto. - * @memberof google.protobuf - * @interface IFieldDescriptorProto - * @property {string|null} [name] FieldDescriptorProto name - * @property {number|null} [number] FieldDescriptorProto number - * @property {google.protobuf.FieldDescriptorProto.Label|null} [label] FieldDescriptorProto label - * @property {google.protobuf.FieldDescriptorProto.Type|null} [type] FieldDescriptorProto type - * @property {string|null} [typeName] FieldDescriptorProto typeName - * @property {string|null} [extendee] FieldDescriptorProto extendee - * @property {string|null} [defaultValue] FieldDescriptorProto defaultValue - * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex - * @property {string|null} [jsonName] FieldDescriptorProto jsonName - * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options - */ + /** + * Converts this ExpirationPolicy to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ExpirationPolicy + * @instance + * @returns {Object.} JSON object + */ + ExpirationPolicy.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Constructs a new FieldDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a FieldDescriptorProto. - * @implements IFieldDescriptorProto - * @constructor - * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set - */ - function FieldDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + return ExpirationPolicy; + })(); - /** - * FieldDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.name = ""; + v1.PushConfig = (function() { - /** - * FieldDescriptorProto number. - * @member {number} number - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.number = 0; + /** + * Properties of a PushConfig. + * @memberof google.pubsub.v1 + * @interface IPushConfig + * @property {string|null} [pushEndpoint] PushConfig pushEndpoint + * @property {Object.|null} [attributes] PushConfig attributes + * @property {google.pubsub.v1.PushConfig.IOidcToken|null} [oidcToken] PushConfig oidcToken + */ - /** - * FieldDescriptorProto label. - * @member {google.protobuf.FieldDescriptorProto.Label} label - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.label = 1; + /** + * Constructs a new PushConfig. + * @memberof google.pubsub.v1 + * @classdesc Represents a PushConfig. + * @implements IPushConfig + * @constructor + * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set + */ + function PushConfig(properties) { + this.attributes = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * FieldDescriptorProto type. - * @member {google.protobuf.FieldDescriptorProto.Type} type - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.type = 1; + /** + * PushConfig pushEndpoint. + * @member {string} pushEndpoint + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.pushEndpoint = ""; - /** - * FieldDescriptorProto typeName. - * @member {string} typeName - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.typeName = ""; + /** + * PushConfig attributes. + * @member {Object.} attributes + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.attributes = $util.emptyObject; - /** - * FieldDescriptorProto extendee. - * @member {string} extendee - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.extendee = ""; + /** + * PushConfig oidcToken. + * @member {google.pubsub.v1.PushConfig.IOidcToken|null|undefined} oidcToken + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.oidcToken = null; - /** - * FieldDescriptorProto defaultValue. - * @member {string} defaultValue - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.defaultValue = ""; + // OneOf field names bound to virtual getters and setters + var $oneOfFields; - /** - * FieldDescriptorProto oneofIndex. - * @member {number} oneofIndex - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.oneofIndex = 0; + /** + * PushConfig authenticationMethod. + * @member {"oidcToken"|undefined} authenticationMethod + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + Object.defineProperty(PushConfig.prototype, "authenticationMethod", { + get: $util.oneOfGetter($oneOfFields = ["oidcToken"]), + set: $util.oneOfSetter($oneOfFields) + }); - /** - * FieldDescriptorProto jsonName. - * @member {string} jsonName - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.jsonName = ""; + /** + * Creates a new PushConfig instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set + * @returns {google.pubsub.v1.PushConfig} PushConfig instance + */ + PushConfig.create = function create(properties) { + return new PushConfig(properties); + }; - /** - * FieldDescriptorProto options. - * @member {google.protobuf.IFieldOptions|null|undefined} options - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.options = null; + /** + * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PushConfig.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.pushEndpoint); + if (message.attributes != null && message.hasOwnProperty("attributes")) + for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) + $root.google.pubsub.v1.PushConfig.OidcToken.encode(message.oidcToken, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; - /** - * Creates a new FieldDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto instance - */ - FieldDescriptorProto.create = function create(properties) { - return new FieldDescriptorProto(properties); - }; + /** + * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PushConfig.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.extendee != null && message.hasOwnProperty("extendee")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.extendee); - if (message.number != null && message.hasOwnProperty("number")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.number); - if (message.label != null && message.hasOwnProperty("label")) - writer.uint32(/* id 4, wireType 0 =*/32).int32(message.label); - if (message.type != null && message.hasOwnProperty("type")) - writer.uint32(/* id 5, wireType 0 =*/40).int32(message.type); - if (message.typeName != null && message.hasOwnProperty("typeName")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.typeName); - if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) - writer.uint32(/* id 7, wireType 2 =*/58).string(message.defaultValue); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.FieldOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) - writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); - if (message.jsonName != null && message.hasOwnProperty("jsonName")) - writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); - return writer; - }; - - /** - * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 3: - message.number = reader.int32(); - break; - case 4: - message.label = reader.int32(); - break; - case 5: - message.type = reader.int32(); - break; - case 6: - message.typeName = reader.string(); - break; - case 2: - message.extendee = reader.string(); - break; - case 7: - message.defaultValue = reader.string(); - break; - case 9: - message.oneofIndex = reader.int32(); - break; - case 10: - message.jsonName = reader.string(); - break; - case 8: - message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a PushConfig message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PushConfig} PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PushConfig.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.pushEndpoint = reader.string(); + break; + case 2: + reader.skip().pos++; + if (message.attributes === $util.emptyObject) + message.attributes = {}; + key = reader.string(); + reader.pos++; + message.attributes[key] = reader.string(); + break; + case 3: + message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a PushConfig message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PushConfig} PushConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PushConfig.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a FieldDescriptorProto message. - * @function verify - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FieldDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.number != null && message.hasOwnProperty("number")) - if (!$util.isInteger(message.number)) - return "number: integer expected"; - if (message.label != null && message.hasOwnProperty("label")) - switch (message.label) { - default: - return "label: enum value expected"; - case 1: - case 2: - case 3: - break; + /** + * Verifies a PushConfig message. + * @function verify + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PushConfig.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + if (!$util.isString(message.pushEndpoint)) + return "pushEndpoint: string expected"; + if (message.attributes != null && message.hasOwnProperty("attributes")) { + if (!$util.isObject(message.attributes)) + return "attributes: object expected"; + var key = Object.keys(message.attributes); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.attributes[key[i]])) + return "attributes: string{k:string} expected"; } - if (message.type != null && message.hasOwnProperty("type")) - switch (message.type) { - default: - return "type: enum value expected"; - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - case 18: - break; + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { + properties.authenticationMethod = 1; + { + var error = $root.google.pubsub.v1.PushConfig.OidcToken.verify(message.oidcToken); + if (error) + return "oidcToken." + error; + } } - if (message.typeName != null && message.hasOwnProperty("typeName")) - if (!$util.isString(message.typeName)) - return "typeName: string expected"; - if (message.extendee != null && message.hasOwnProperty("extendee")) - if (!$util.isString(message.extendee)) - return "extendee: string expected"; - if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) - if (!$util.isString(message.defaultValue)) - return "defaultValue: string expected"; - if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) - if (!$util.isInteger(message.oneofIndex)) - return "oneofIndex: integer expected"; - if (message.jsonName != null && message.hasOwnProperty("jsonName")) - if (!$util.isString(message.jsonName)) - return "jsonName: string expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.FieldOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; + return null; + }; - /** - * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto - */ - FieldDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FieldDescriptorProto) + /** + * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PushConfig} PushConfig + */ + PushConfig.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PushConfig) + return object; + var message = new $root.google.pubsub.v1.PushConfig(); + if (object.pushEndpoint != null) + message.pushEndpoint = String(object.pushEndpoint); + if (object.attributes) { + if (typeof object.attributes !== "object") + throw TypeError(".google.pubsub.v1.PushConfig.attributes: object expected"); + message.attributes = {}; + for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) + message.attributes[keys[i]] = String(object.attributes[keys[i]]); + } + if (object.oidcToken != null) { + if (typeof object.oidcToken !== "object") + throw TypeError(".google.pubsub.v1.PushConfig.oidcToken: object expected"); + message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.fromObject(object.oidcToken); + } + return message; + }; + + /** + * Creates a plain object from a PushConfig message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {google.pubsub.v1.PushConfig} message PushConfig + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PushConfig.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.attributes = {}; + if (options.defaults) + object.pushEndpoint = ""; + if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + object.pushEndpoint = message.pushEndpoint; + var keys2; + if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { + object.attributes = {}; + for (var j = 0; j < keys2.length; ++j) + object.attributes[keys2[j]] = message.attributes[keys2[j]]; + } + if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { + object.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.toObject(message.oidcToken, options); + if (options.oneofs) + object.authenticationMethod = "oidcToken"; + } return object; - var message = new $root.google.protobuf.FieldDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.number != null) - message.number = object.number | 0; - switch (object.label) { - case "LABEL_OPTIONAL": - case 1: - message.label = 1; - break; - case "LABEL_REQUIRED": - case 2: - message.label = 2; - break; - case "LABEL_REPEATED": - case 3: - message.label = 3; - break; - } - switch (object.type) { - case "TYPE_DOUBLE": - case 1: - message.type = 1; - break; - case "TYPE_FLOAT": - case 2: - message.type = 2; - break; - case "TYPE_INT64": - case 3: - message.type = 3; - break; - case "TYPE_UINT64": - case 4: - message.type = 4; - break; - case "TYPE_INT32": - case 5: - message.type = 5; - break; - case "TYPE_FIXED64": - case 6: - message.type = 6; - break; - case "TYPE_FIXED32": - case 7: - message.type = 7; - break; - case "TYPE_BOOL": - case 8: - message.type = 8; - break; - case "TYPE_STRING": - case 9: - message.type = 9; - break; - case "TYPE_GROUP": - case 10: - message.type = 10; - break; - case "TYPE_MESSAGE": - case 11: - message.type = 11; - break; - case "TYPE_BYTES": - case 12: - message.type = 12; - break; - case "TYPE_UINT32": - case 13: - message.type = 13; - break; - case "TYPE_ENUM": - case 14: - message.type = 14; - break; - case "TYPE_SFIXED32": - case 15: - message.type = 15; - break; - case "TYPE_SFIXED64": - case 16: - message.type = 16; - break; - case "TYPE_SINT32": - case 17: - message.type = 17; - break; - case "TYPE_SINT64": - case 18: - message.type = 18; - break; - } - if (object.typeName != null) - message.typeName = String(object.typeName); - if (object.extendee != null) - message.extendee = String(object.extendee); - if (object.defaultValue != null) - message.defaultValue = String(object.defaultValue); - if (object.oneofIndex != null) - message.oneofIndex = object.oneofIndex | 0; - if (object.jsonName != null) - message.jsonName = String(object.jsonName); - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.FieldDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.FieldOptions.fromObject(object.options); - } - return message; - }; + }; - /** - * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FieldDescriptorProto - * @static - * @param {google.protobuf.FieldDescriptorProto} message FieldDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FieldDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.name = ""; - object.extendee = ""; - object.number = 0; - object.label = options.enums === String ? "LABEL_OPTIONAL" : 1; - object.type = options.enums === String ? "TYPE_DOUBLE" : 1; - object.typeName = ""; - object.defaultValue = ""; - object.options = null; - object.oneofIndex = 0; - object.jsonName = ""; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.extendee != null && message.hasOwnProperty("extendee")) - object.extendee = message.extendee; - if (message.number != null && message.hasOwnProperty("number")) - object.number = message.number; - if (message.label != null && message.hasOwnProperty("label")) - object.label = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Label[message.label] : message.label; - if (message.type != null && message.hasOwnProperty("type")) - object.type = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Type[message.type] : message.type; - if (message.typeName != null && message.hasOwnProperty("typeName")) - object.typeName = message.typeName; - if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) - object.defaultValue = message.defaultValue; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.FieldOptions.toObject(message.options, options); - if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) - object.oneofIndex = message.oneofIndex; - if (message.jsonName != null && message.hasOwnProperty("jsonName")) - object.jsonName = message.jsonName; - return object; - }; + /** + * Converts this PushConfig to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PushConfig + * @instance + * @returns {Object.} JSON object + */ + PushConfig.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this FieldDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.FieldDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - FieldDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Type enum. - * @name google.protobuf.FieldDescriptorProto.Type - * @enum {string} - * @property {number} TYPE_DOUBLE=1 TYPE_DOUBLE value - * @property {number} TYPE_FLOAT=2 TYPE_FLOAT value - * @property {number} TYPE_INT64=3 TYPE_INT64 value - * @property {number} TYPE_UINT64=4 TYPE_UINT64 value - * @property {number} TYPE_INT32=5 TYPE_INT32 value - * @property {number} TYPE_FIXED64=6 TYPE_FIXED64 value - * @property {number} TYPE_FIXED32=7 TYPE_FIXED32 value - * @property {number} TYPE_BOOL=8 TYPE_BOOL value - * @property {number} TYPE_STRING=9 TYPE_STRING value - * @property {number} TYPE_GROUP=10 TYPE_GROUP value - * @property {number} TYPE_MESSAGE=11 TYPE_MESSAGE value - * @property {number} TYPE_BYTES=12 TYPE_BYTES value - * @property {number} TYPE_UINT32=13 TYPE_UINT32 value - * @property {number} TYPE_ENUM=14 TYPE_ENUM value - * @property {number} TYPE_SFIXED32=15 TYPE_SFIXED32 value - * @property {number} TYPE_SFIXED64=16 TYPE_SFIXED64 value - * @property {number} TYPE_SINT32=17 TYPE_SINT32 value - * @property {number} TYPE_SINT64=18 TYPE_SINT64 value - */ - FieldDescriptorProto.Type = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[1] = "TYPE_DOUBLE"] = 1; - values[valuesById[2] = "TYPE_FLOAT"] = 2; - values[valuesById[3] = "TYPE_INT64"] = 3; - values[valuesById[4] = "TYPE_UINT64"] = 4; - values[valuesById[5] = "TYPE_INT32"] = 5; - values[valuesById[6] = "TYPE_FIXED64"] = 6; - values[valuesById[7] = "TYPE_FIXED32"] = 7; - values[valuesById[8] = "TYPE_BOOL"] = 8; - values[valuesById[9] = "TYPE_STRING"] = 9; - values[valuesById[10] = "TYPE_GROUP"] = 10; - values[valuesById[11] = "TYPE_MESSAGE"] = 11; - values[valuesById[12] = "TYPE_BYTES"] = 12; - values[valuesById[13] = "TYPE_UINT32"] = 13; - values[valuesById[14] = "TYPE_ENUM"] = 14; - values[valuesById[15] = "TYPE_SFIXED32"] = 15; - values[valuesById[16] = "TYPE_SFIXED64"] = 16; - values[valuesById[17] = "TYPE_SINT32"] = 17; - values[valuesById[18] = "TYPE_SINT64"] = 18; - return values; - })(); + PushConfig.OidcToken = (function() { - /** - * Label enum. - * @name google.protobuf.FieldDescriptorProto.Label - * @enum {string} - * @property {number} LABEL_OPTIONAL=1 LABEL_OPTIONAL value - * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value - * @property {number} LABEL_REPEATED=3 LABEL_REPEATED value - */ - FieldDescriptorProto.Label = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[1] = "LABEL_OPTIONAL"] = 1; - values[valuesById[2] = "LABEL_REQUIRED"] = 2; - values[valuesById[3] = "LABEL_REPEATED"] = 3; - return values; - })(); + /** + * Properties of an OidcToken. + * @memberof google.pubsub.v1.PushConfig + * @interface IOidcToken + * @property {string|null} [serviceAccountEmail] OidcToken serviceAccountEmail + * @property {string|null} [audience] OidcToken audience + */ - return FieldDescriptorProto; - })(); + /** + * Constructs a new OidcToken. + * @memberof google.pubsub.v1.PushConfig + * @classdesc Represents an OidcToken. + * @implements IOidcToken + * @constructor + * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set + */ + function OidcToken(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - protobuf.OneofDescriptorProto = (function() { + /** + * OidcToken serviceAccountEmail. + * @member {string} serviceAccountEmail + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + */ + OidcToken.prototype.serviceAccountEmail = ""; - /** - * Properties of an OneofDescriptorProto. - * @memberof google.protobuf - * @interface IOneofDescriptorProto - * @property {string|null} [name] OneofDescriptorProto name - * @property {google.protobuf.IOneofOptions|null} [options] OneofDescriptorProto options - */ + /** + * OidcToken audience. + * @member {string} audience + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + */ + OidcToken.prototype.audience = ""; - /** - * Constructs a new OneofDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents an OneofDescriptorProto. - * @implements IOneofDescriptorProto - * @constructor - * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set - */ - function OneofDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Creates a new OidcToken instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken instance + */ + OidcToken.create = function create(properties) { + return new OidcToken(properties); + }; - /** - * OneofDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.OneofDescriptorProto - * @instance - */ - OneofDescriptorProto.prototype.name = ""; + /** + * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OidcToken.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.serviceAccountEmail); + if (message.audience != null && message.hasOwnProperty("audience")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.audience); + return writer; + }; - /** - * OneofDescriptorProto options. - * @member {google.protobuf.IOneofOptions|null|undefined} options - * @memberof google.protobuf.OneofDescriptorProto - * @instance - */ - OneofDescriptorProto.prototype.options = null; + /** + * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OidcToken.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a new OneofDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto instance - */ - OneofDescriptorProto.create = function create(properties) { - return new OneofDescriptorProto(properties); - }; + /** + * Decodes an OidcToken message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OidcToken.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.OidcToken(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.serviceAccountEmail = reader.string(); + break; + case 2: + message.audience = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OneofDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.OneofOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; + /** + * Decodes an OidcToken message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OidcToken.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OneofDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Verifies an OidcToken message. + * @function verify + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OidcToken.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + if (!$util.isString(message.serviceAccountEmail)) + return "serviceAccountEmail: string expected"; + if (message.audience != null && message.hasOwnProperty("audience")) + if (!$util.isString(message.audience)) + return "audience: string expected"; + return null; + }; - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OneofDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.options = $root.google.protobuf.OneofOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken + */ + OidcToken.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PushConfig.OidcToken) + return object; + var message = new $root.google.pubsub.v1.PushConfig.OidcToken(); + if (object.serviceAccountEmail != null) + message.serviceAccountEmail = String(object.serviceAccountEmail); + if (object.audience != null) + message.audience = String(object.audience); + return message; + }; - /** - * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OneofDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a plain object from an OidcToken message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {google.pubsub.v1.PushConfig.OidcToken} message OidcToken + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OidcToken.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.serviceAccountEmail = ""; + object.audience = ""; + } + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + object.serviceAccountEmail = message.serviceAccountEmail; + if (message.audience != null && message.hasOwnProperty("audience")) + object.audience = message.audience; + return object; + }; - /** - * Verifies an OneofDescriptorProto message. - * @function verify - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - OneofDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.OneofOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; + /** + * Converts this OidcToken to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @instance + * @returns {Object.} JSON object + */ + OidcToken.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto - */ - OneofDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.OneofDescriptorProto) - return object; - var message = new $root.google.protobuf.OneofDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.OneofDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.OneofOptions.fromObject(object.options); - } - return message; - }; + return OidcToken; + })(); - /** - * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.OneofDescriptorProto - * @static - * @param {google.protobuf.OneofDescriptorProto} message OneofDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - OneofDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.name = ""; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.OneofOptions.toObject(message.options, options); - return object; - }; + return PushConfig; + })(); - /** - * Converts this OneofDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.OneofDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - OneofDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + v1.ReceivedMessage = (function() { - return OneofDescriptorProto; - })(); + /** + * Properties of a ReceivedMessage. + * @memberof google.pubsub.v1 + * @interface IReceivedMessage + * @property {string|null} [ackId] ReceivedMessage ackId + * @property {google.pubsub.v1.IPubsubMessage|null} [message] ReceivedMessage message + * @property {number|null} [deliveryAttempt] ReceivedMessage deliveryAttempt + */ - protobuf.EnumDescriptorProto = (function() { + /** + * Constructs a new ReceivedMessage. + * @memberof google.pubsub.v1 + * @classdesc Represents a ReceivedMessage. + * @implements IReceivedMessage + * @constructor + * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set + */ + function ReceivedMessage(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Properties of an EnumDescriptorProto. - * @memberof google.protobuf - * @interface IEnumDescriptorProto - * @property {string|null} [name] EnumDescriptorProto name - * @property {Array.|null} [value] EnumDescriptorProto value - * @property {google.protobuf.IEnumOptions|null} [options] EnumDescriptorProto options - * @property {Array.|null} [reservedRange] EnumDescriptorProto reservedRange - * @property {Array.|null} [reservedName] EnumDescriptorProto reservedName - */ + /** + * ReceivedMessage ackId. + * @member {string} ackId + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.ackId = ""; - /** - * Constructs a new EnumDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents an EnumDescriptorProto. - * @implements IEnumDescriptorProto - * @constructor - * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set - */ - function EnumDescriptorProto(properties) { - this.value = []; - this.reservedRange = []; - this.reservedName = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * ReceivedMessage message. + * @member {google.pubsub.v1.IPubsubMessage|null|undefined} message + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.message = null; - /** - * EnumDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.name = ""; + /** + * ReceivedMessage deliveryAttempt. + * @member {number} deliveryAttempt + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + */ + ReceivedMessage.prototype.deliveryAttempt = 0; - /** - * EnumDescriptorProto value. - * @member {Array.} value - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.value = $util.emptyArray; + /** + * Creates a new ReceivedMessage instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage instance + */ + ReceivedMessage.create = function create(properties) { + return new ReceivedMessage(properties); + }; - /** - * EnumDescriptorProto options. - * @member {google.protobuf.IEnumOptions|null|undefined} options - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.options = null; + /** + * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ReceivedMessage.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ackId != null && message.hasOwnProperty("ackId")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.ackId); + if (message.message != null && message.hasOwnProperty("message")) + $root.google.pubsub.v1.PubsubMessage.encode(message.message, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.deliveryAttempt); + return writer; + }; - /** - * EnumDescriptorProto reservedRange. - * @member {Array.} reservedRange - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.reservedRange = $util.emptyArray; + /** + * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ReceivedMessage.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * EnumDescriptorProto reservedName. - * @member {Array.} reservedName - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.reservedName = $util.emptyArray; + /** + * Decodes a ReceivedMessage message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ReceivedMessage.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ReceivedMessage(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ackId = reader.string(); + break; + case 2: + message.message = $root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32()); + break; + case 3: + message.deliveryAttempt = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Creates a new EnumDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto instance - */ - EnumDescriptorProto.create = function create(properties) { - return new EnumDescriptorProto(properties); - }; + /** + * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ReceivedMessage.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.value != null && message.value.length) - for (var i = 0; i < message.value.length; ++i) - $root.google.protobuf.EnumValueDescriptorProto.encode(message.value[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.EnumOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.reservedRange != null && message.reservedRange.length) - for (var i = 0; i < message.reservedRange.length; ++i) - $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.reservedName != null && message.reservedName.length) - for (var i = 0; i < message.reservedName.length; ++i) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.reservedName[i]); - return writer; - }; + /** + * Verifies a ReceivedMessage message. + * @function verify + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ReceivedMessage.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ackId != null && message.hasOwnProperty("ackId")) + if (!$util.isString(message.ackId)) + return "ackId: string expected"; + if (message.message != null && message.hasOwnProperty("message")) { + var error = $root.google.pubsub.v1.PubsubMessage.verify(message.message); + if (error) + return "message." + error; + } + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + if (!$util.isInteger(message.deliveryAttempt)) + return "deliveryAttempt: integer expected"; + return null; + }; - /** - * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + */ + ReceivedMessage.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ReceivedMessage) + return object; + var message = new $root.google.pubsub.v1.ReceivedMessage(); + if (object.ackId != null) + message.ackId = String(object.ackId); + if (object.message != null) { + if (typeof object.message !== "object") + throw TypeError(".google.pubsub.v1.ReceivedMessage.message: object expected"); + message.message = $root.google.pubsub.v1.PubsubMessage.fromObject(object.message); + } + if (object.deliveryAttempt != null) + message.deliveryAttempt = object.deliveryAttempt | 0; + return message; + }; - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (!(message.value && message.value.length)) - message.value = []; - message.value.push($root.google.protobuf.EnumValueDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); - break; - case 4: - if (!(message.reservedRange && message.reservedRange.length)) - message.reservedRange = []; - message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.reservedName && message.reservedName.length)) - message.reservedName = []; - message.reservedName.push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an EnumDescriptorProto message. - * @function verify - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.value != null && message.hasOwnProperty("value")) { - if (!Array.isArray(message.value)) - return "value: array expected"; - for (var i = 0; i < message.value.length; ++i) { - var error = $root.google.protobuf.EnumValueDescriptorProto.verify(message.value[i]); - if (error) - return "value." + error; - } - } - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.EnumOptions.verify(message.options); - if (error) - return "options." + error; - } - if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { - if (!Array.isArray(message.reservedRange)) - return "reservedRange: array expected"; - for (var i = 0; i < message.reservedRange.length; ++i) { - var error = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.verify(message.reservedRange[i]); - if (error) - return "reservedRange." + error; + /** + * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {google.pubsub.v1.ReceivedMessage} message ReceivedMessage + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ReceivedMessage.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.ackId = ""; + object.message = null; + object.deliveryAttempt = 0; } - } - if (message.reservedName != null && message.hasOwnProperty("reservedName")) { - if (!Array.isArray(message.reservedName)) - return "reservedName: array expected"; - for (var i = 0; i < message.reservedName.length; ++i) - if (!$util.isString(message.reservedName[i])) - return "reservedName: string[] expected"; - } - return null; - }; - - /** - * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto - */ - EnumDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumDescriptorProto) + if (message.ackId != null && message.hasOwnProperty("ackId")) + object.ackId = message.ackId; + if (message.message != null && message.hasOwnProperty("message")) + object.message = $root.google.pubsub.v1.PubsubMessage.toObject(message.message, options); + if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + object.deliveryAttempt = message.deliveryAttempt; return object; - var message = new $root.google.protobuf.EnumDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.value) { - if (!Array.isArray(object.value)) - throw TypeError(".google.protobuf.EnumDescriptorProto.value: array expected"); - message.value = []; - for (var i = 0; i < object.value.length; ++i) { - if (typeof object.value[i] !== "object") - throw TypeError(".google.protobuf.EnumDescriptorProto.value: object expected"); - message.value[i] = $root.google.protobuf.EnumValueDescriptorProto.fromObject(object.value[i]); - } - } - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.EnumDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.EnumOptions.fromObject(object.options); - } - if (object.reservedRange) { - if (!Array.isArray(object.reservedRange)) - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: array expected"); - message.reservedRange = []; - for (var i = 0; i < object.reservedRange.length; ++i) { - if (typeof object.reservedRange[i] !== "object") - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: object expected"); - message.reservedRange[i] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.fromObject(object.reservedRange[i]); - } - } - if (object.reservedName) { - if (!Array.isArray(object.reservedName)) - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedName: array expected"); - message.reservedName = []; - for (var i = 0; i < object.reservedName.length; ++i) - message.reservedName[i] = String(object.reservedName[i]); - } - return message; - }; + }; - /** - * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumDescriptorProto - * @static - * @param {google.protobuf.EnumDescriptorProto} message EnumDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.value = []; - object.reservedRange = []; - object.reservedName = []; - } - if (options.defaults) { - object.name = ""; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.value && message.value.length) { - object.value = []; - for (var j = 0; j < message.value.length; ++j) - object.value[j] = $root.google.protobuf.EnumValueDescriptorProto.toObject(message.value[j], options); - } - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.EnumOptions.toObject(message.options, options); - if (message.reservedRange && message.reservedRange.length) { - object.reservedRange = []; - for (var j = 0; j < message.reservedRange.length; ++j) - object.reservedRange[j] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.toObject(message.reservedRange[j], options); - } - if (message.reservedName && message.reservedName.length) { - object.reservedName = []; - for (var j = 0; j < message.reservedName.length; ++j) - object.reservedName[j] = message.reservedName[j]; - } - return object; - }; + /** + * Converts this ReceivedMessage to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ReceivedMessage + * @instance + * @returns {Object.} JSON object + */ + ReceivedMessage.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this EnumDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.EnumDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - EnumDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return ReceivedMessage; + })(); - EnumDescriptorProto.EnumReservedRange = (function() { + v1.GetSubscriptionRequest = (function() { /** - * Properties of an EnumReservedRange. - * @memberof google.protobuf.EnumDescriptorProto - * @interface IEnumReservedRange - * @property {number|null} [start] EnumReservedRange start - * @property {number|null} [end] EnumReservedRange end + * Properties of a GetSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IGetSubscriptionRequest + * @property {string|null} [subscription] GetSubscriptionRequest subscription */ /** - * Constructs a new EnumReservedRange. - * @memberof google.protobuf.EnumDescriptorProto - * @classdesc Represents an EnumReservedRange. - * @implements IEnumReservedRange - * @constructor - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set - */ - function EnumReservedRange(properties) { + * Constructs a new GetSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetSubscriptionRequest. + * @implements IGetSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set + */ + function GetSubscriptionRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -7511,88 +5971,75 @@ } /** - * EnumReservedRange start. - * @member {number} start - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @instance - */ - EnumReservedRange.prototype.start = 0; - - /** - * EnumReservedRange end. - * @member {number} end - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * GetSubscriptionRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.GetSubscriptionRequest * @instance */ - EnumReservedRange.prototype.end = 0; + GetSubscriptionRequest.prototype.subscription = ""; /** - * Creates a new EnumReservedRange instance using the specified properties. + * Creates a new GetSubscriptionRequest instance using the specified properties. * @function create - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange instance + * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest instance */ - EnumReservedRange.create = function create(properties) { - return new EnumReservedRange(properties); + GetSubscriptionRequest.create = function create(properties) { + return new GetSubscriptionRequest(properties); }; /** - * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. * @function encode - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode + * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - EnumReservedRange.encode = function encode(message, writer) { + GetSubscriptionRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); return writer; }; /** - * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode + * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - EnumReservedRange.encodeDelimited = function encodeDelimited(message, writer) { + GetSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an EnumReservedRange message from the specified reader or buffer. + * Decodes a GetSubscriptionRequest message from the specified reader or buffer. * @function decode - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumReservedRange.decode = function decode(reader, length) { + GetSubscriptionRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSubscriptionRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.start = reader.int32(); - break; - case 2: - message.end = reader.int32(); + message.subscription = reader.string(); break; default: reader.skipType(tag & 7); @@ -7603,6571 +6050,2464 @@ }; /** - * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumReservedRange.decodeDelimited = function decodeDelimited(reader) { + GetSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an EnumReservedRange message. + * Verifies a GetSubscriptionRequest message. * @function verify - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - EnumReservedRange.verify = function verify(message) { + GetSubscriptionRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.start != null && message.hasOwnProperty("start")) - if (!$util.isInteger(message.start)) - return "start: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; return null; }; /** - * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @static * @param {Object.} object Plain object - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest */ - EnumReservedRange.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumDescriptorProto.EnumReservedRange) + GetSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetSubscriptionRequest) return object; - var message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); - if (object.start != null) - message.start = object.start | 0; - if (object.end != null) - message.end = object.end | 0; + var message = new $root.google.pubsub.v1.GetSubscriptionRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); return message; }; /** - * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @static - * @param {google.protobuf.EnumDescriptorProto.EnumReservedRange} message EnumReservedRange + * @param {google.pubsub.v1.GetSubscriptionRequest} message GetSubscriptionRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - EnumReservedRange.toObject = function toObject(message, options) { + GetSubscriptionRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.start = 0; - object.end = 0; - } - if (message.start != null && message.hasOwnProperty("start")) - object.start = message.start; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; return object; }; /** - * Converts this EnumReservedRange to JSON. + * Converts this GetSubscriptionRequest to JSON. * @function toJSON - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @memberof google.pubsub.v1.GetSubscriptionRequest * @instance * @returns {Object.} JSON object */ - EnumReservedRange.prototype.toJSON = function toJSON() { + GetSubscriptionRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return EnumReservedRange; + return GetSubscriptionRequest; })(); - return EnumDescriptorProto; - })(); + v1.UpdateSubscriptionRequest = (function() { - protobuf.EnumValueDescriptorProto = (function() { + /** + * Properties of an UpdateSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IUpdateSubscriptionRequest + * @property {google.pubsub.v1.ISubscription|null} [subscription] UpdateSubscriptionRequest subscription + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSubscriptionRequest updateMask + */ - /** - * Properties of an EnumValueDescriptorProto. - * @memberof google.protobuf - * @interface IEnumValueDescriptorProto - * @property {string|null} [name] EnumValueDescriptorProto name - * @property {number|null} [number] EnumValueDescriptorProto number - * @property {google.protobuf.IEnumValueOptions|null} [options] EnumValueDescriptorProto options - */ + /** + * Constructs a new UpdateSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents an UpdateSubscriptionRequest. + * @implements IUpdateSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set + */ + function UpdateSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new EnumValueDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents an EnumValueDescriptorProto. - * @implements IEnumValueDescriptorProto - * @constructor - * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set - */ - function EnumValueDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * UpdateSubscriptionRequest subscription. + * @member {google.pubsub.v1.ISubscription|null|undefined} subscription + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + */ + UpdateSubscriptionRequest.prototype.subscription = null; - /** - * EnumValueDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.EnumValueDescriptorProto - * @instance - */ - EnumValueDescriptorProto.prototype.name = ""; + /** + * UpdateSubscriptionRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + */ + UpdateSubscriptionRequest.prototype.updateMask = null; - /** - * EnumValueDescriptorProto number. - * @member {number} number - * @memberof google.protobuf.EnumValueDescriptorProto - * @instance - */ - EnumValueDescriptorProto.prototype.number = 0; + /** + * Creates a new UpdateSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest instance + */ + UpdateSubscriptionRequest.create = function create(properties) { + return new UpdateSubscriptionRequest(properties); + }; - /** - * EnumValueDescriptorProto options. - * @member {google.protobuf.IEnumValueOptions|null|undefined} options - * @memberof google.protobuf.EnumValueDescriptorProto - * @instance - */ - EnumValueDescriptorProto.prototype.options = null; + /** + * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + $root.google.pubsub.v1.Subscription.encode(message.subscription, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; - /** - * Creates a new EnumValueDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto instance - */ - EnumValueDescriptorProto.create = function create(properties) { - return new EnumValueDescriptorProto(properties); - }; + /** + * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UpdateSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumValueDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.number != null && message.hasOwnProperty("number")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.number); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.EnumValueOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = $root.google.pubsub.v1.Subscription.decode(reader, reader.uint32()); + break; + case 2: + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumValueDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UpdateSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumValueDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.number = reader.int32(); - break; - case 3: - message.options = $root.google.protobuf.EnumValueOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Verifies an UpdateSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + UpdateSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) { + var error = $root.google.pubsub.v1.Subscription.verify(message.subscription); + if (error) + return "subscription." + error; } - } - return message; - }; - - /** - * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumValueDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + if (error) + return "updateMask." + error; + } + return null; + }; - /** - * Verifies an EnumValueDescriptorProto message. - * @function verify - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumValueDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.number != null && message.hasOwnProperty("number")) - if (!$util.isInteger(message.number)) - return "number: integer expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.EnumValueOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; + /** + * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest + */ + UpdateSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); + if (object.subscription != null) { + if (typeof object.subscription !== "object") + throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.subscription: object expected"); + message.subscription = $root.google.pubsub.v1.Subscription.fromObject(object.subscription); + } + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + } + return message; + }; - /** - * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto - */ - EnumValueDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumValueDescriptorProto) + /** + * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {google.pubsub.v1.UpdateSubscriptionRequest} message UpdateSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UpdateSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = null; + object.updateMask = null; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = $root.google.pubsub.v1.Subscription.toObject(message.subscription, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); return object; - var message = new $root.google.protobuf.EnumValueDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.number != null) - message.number = object.number | 0; - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.EnumValueDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.EnumValueOptions.fromObject(object.options); - } - return message; - }; - - /** - * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumValueDescriptorProto - * @static - * @param {google.protobuf.EnumValueDescriptorProto} message EnumValueDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumValueDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.name = ""; - object.number = 0; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.number != null && message.hasOwnProperty("number")) - object.number = message.number; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.EnumValueOptions.toObject(message.options, options); - return object; - }; + }; - /** - * Converts this EnumValueDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.EnumValueDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - EnumValueDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this UpdateSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + UpdateSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return EnumValueDescriptorProto; - })(); + return UpdateSubscriptionRequest; + })(); - protobuf.ServiceDescriptorProto = (function() { + v1.ListSubscriptionsRequest = (function() { - /** - * Properties of a ServiceDescriptorProto. - * @memberof google.protobuf - * @interface IServiceDescriptorProto - * @property {string|null} [name] ServiceDescriptorProto name - * @property {Array.|null} [method] ServiceDescriptorProto method - * @property {google.protobuf.IServiceOptions|null} [options] ServiceDescriptorProto options - */ + /** + * Properties of a ListSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @interface IListSubscriptionsRequest + * @property {string|null} [project] ListSubscriptionsRequest project + * @property {number|null} [pageSize] ListSubscriptionsRequest pageSize + * @property {string|null} [pageToken] ListSubscriptionsRequest pageToken + */ - /** - * Constructs a new ServiceDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a ServiceDescriptorProto. - * @implements IServiceDescriptorProto - * @constructor - * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set - */ - function ServiceDescriptorProto(properties) { - this.method = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Constructs a new ListSubscriptionsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSubscriptionsRequest. + * @implements IListSubscriptionsRequest + * @constructor + * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set + */ + function ListSubscriptionsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * ServiceDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.ServiceDescriptorProto - * @instance - */ - ServiceDescriptorProto.prototype.name = ""; + /** + * ListSubscriptionsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + */ + ListSubscriptionsRequest.prototype.project = ""; - /** - * ServiceDescriptorProto method. - * @member {Array.} method - * @memberof google.protobuf.ServiceDescriptorProto - * @instance - */ - ServiceDescriptorProto.prototype.method = $util.emptyArray; + /** + * ListSubscriptionsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + */ + ListSubscriptionsRequest.prototype.pageSize = 0; - /** - * ServiceDescriptorProto options. - * @member {google.protobuf.IServiceOptions|null|undefined} options - * @memberof google.protobuf.ServiceDescriptorProto - * @instance - */ - ServiceDescriptorProto.prototype.options = null; + /** + * ListSubscriptionsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + */ + ListSubscriptionsRequest.prototype.pageToken = ""; - /** - * Creates a new ServiceDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto instance - */ - ServiceDescriptorProto.create = function create(properties) { - return new ServiceDescriptorProto(properties); - }; + /** + * Creates a new ListSubscriptionsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest instance + */ + ListSubscriptionsRequest.create = function create(properties) { + return new ListSubscriptionsRequest(properties); + }; - /** - * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ServiceDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.method != null && message.method.length) - for (var i = 0; i < message.method.length; ++i) - $root.google.protobuf.MethodDescriptorProto.encode(message.method[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.ServiceOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; + /** + * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSubscriptionsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + return writer; + }; - /** - * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ServiceDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ServiceDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (!(message.method && message.method.length)) - message.method = []; - message.method.push($root.google.protobuf.MethodDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - message.options = $root.google.protobuf.ServiceOptions.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSubscriptionsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.project = reader.string(); + break; + case 2: + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } } - } - return message; - }; + return message; + }; - /** - * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ServiceDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a ServiceDescriptorProto message. - * @function verify - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ServiceDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.method != null && message.hasOwnProperty("method")) { - if (!Array.isArray(message.method)) - return "method: array expected"; - for (var i = 0; i < message.method.length; ++i) { - var error = $root.google.protobuf.MethodDescriptorProto.verify(message.method[i]); - if (error) - return "method." + error; - } - } - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.ServiceOptions.verify(message.options); - if (error) - return "options." + error; - } - return null; - }; + /** + * Verifies a ListSubscriptionsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSubscriptionsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; - /** - * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto - */ - ServiceDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.ServiceDescriptorProto) - return object; - var message = new $root.google.protobuf.ServiceDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.method) { - if (!Array.isArray(object.method)) - throw TypeError(".google.protobuf.ServiceDescriptorProto.method: array expected"); - message.method = []; - for (var i = 0; i < object.method.length; ++i) { - if (typeof object.method[i] !== "object") - throw TypeError(".google.protobuf.ServiceDescriptorProto.method: object expected"); - message.method[i] = $root.google.protobuf.MethodDescriptorProto.fromObject(object.method[i]); + /** + * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest + */ + ListSubscriptionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSubscriptionsRequest) + return object; + var message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; + + /** + * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {google.pubsub.v1.ListSubscriptionsRequest} message ListSubscriptionsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSubscriptionsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; } - } - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.ServiceDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.ServiceOptions.fromObject(object.options); - } - return message; - }; + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; - /** - * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.ServiceDescriptorProto - * @static - * @param {google.protobuf.ServiceDescriptorProto} message ServiceDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ServiceDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.method = []; - if (options.defaults) { - object.name = ""; - object.options = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.method && message.method.length) { - object.method = []; - for (var j = 0; j < message.method.length; ++j) - object.method[j] = $root.google.protobuf.MethodDescriptorProto.toObject(message.method[j], options); - } - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.ServiceOptions.toObject(message.options, options); - return object; - }; + /** + * Converts this ListSubscriptionsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @instance + * @returns {Object.} JSON object + */ + ListSubscriptionsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this ServiceDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.ServiceDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - ServiceDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return ListSubscriptionsRequest; + })(); - return ServiceDescriptorProto; - })(); + v1.ListSubscriptionsResponse = (function() { - protobuf.MethodDescriptorProto = (function() { + /** + * Properties of a ListSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @interface IListSubscriptionsResponse + * @property {Array.|null} [subscriptions] ListSubscriptionsResponse subscriptions + * @property {string|null} [nextPageToken] ListSubscriptionsResponse nextPageToken + */ - /** - * Properties of a MethodDescriptorProto. - * @memberof google.protobuf - * @interface IMethodDescriptorProto - * @property {string|null} [name] MethodDescriptorProto name - * @property {string|null} [inputType] MethodDescriptorProto inputType - * @property {string|null} [outputType] MethodDescriptorProto outputType - * @property {google.protobuf.IMethodOptions|null} [options] MethodDescriptorProto options - * @property {boolean|null} [clientStreaming] MethodDescriptorProto clientStreaming - * @property {boolean|null} [serverStreaming] MethodDescriptorProto serverStreaming - */ + /** + * Constructs a new ListSubscriptionsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSubscriptionsResponse. + * @implements IListSubscriptionsResponse + * @constructor + * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set + */ + function ListSubscriptionsResponse(properties) { + this.subscriptions = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new MethodDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a MethodDescriptorProto. - * @implements IMethodDescriptorProto - * @constructor - * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set - */ - function MethodDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * ListSubscriptionsResponse subscriptions. + * @member {Array.} subscriptions + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @instance + */ + ListSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; - /** - * MethodDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.name = ""; + /** + * ListSubscriptionsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @instance + */ + ListSubscriptionsResponse.prototype.nextPageToken = ""; - /** - * MethodDescriptorProto inputType. - * @member {string} inputType - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.inputType = ""; + /** + * Creates a new ListSubscriptionsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse instance + */ + ListSubscriptionsResponse.create = function create(properties) { + return new ListSubscriptionsResponse(properties); + }; - /** - * MethodDescriptorProto outputType. - * @member {string} outputType - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.outputType = ""; + /** + * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSubscriptionsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscriptions != null && message.subscriptions.length) + for (var i = 0; i < message.subscriptions.length; ++i) + $root.google.pubsub.v1.Subscription.encode(message.subscriptions[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; - /** - * MethodDescriptorProto options. - * @member {google.protobuf.IMethodOptions|null|undefined} options - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.options = null; + /** + * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * MethodDescriptorProto clientStreaming. - * @member {boolean} clientStreaming - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.clientStreaming = false; + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSubscriptionsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.subscriptions && message.subscriptions.length)) + message.subscriptions = []; + message.subscriptions.push($root.google.pubsub.v1.Subscription.decode(reader, reader.uint32())); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * MethodDescriptorProto serverStreaming. - * @member {boolean} serverStreaming - * @memberof google.protobuf.MethodDescriptorProto - * @instance - */ - MethodDescriptorProto.prototype.serverStreaming = false; + /** + * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a new MethodDescriptorProto instance using the specified properties. - * @function create - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set - * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto instance - */ - MethodDescriptorProto.create = function create(properties) { - return new MethodDescriptorProto(properties); - }; + /** + * Verifies a ListSubscriptionsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSubscriptionsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { + if (!Array.isArray(message.subscriptions)) + return "subscriptions: array expected"; + for (var i = 0; i < message.subscriptions.length; ++i) { + var error = $root.google.pubsub.v1.Subscription.verify(message.subscriptions[i]); + if (error) + return "subscriptions." + error; + } + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; - /** - * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @function encode - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodDescriptorProto.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.inputType != null && message.hasOwnProperty("inputType")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.inputType); - if (message.outputType != null && message.hasOwnProperty("outputType")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputType); - if (message.options != null && message.hasOwnProperty("options")) - $root.google.protobuf.MethodOptions.encode(message.options, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) - writer.uint32(/* id 5, wireType 0 =*/40).bool(message.clientStreaming); - if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) - writer.uint32(/* id 6, wireType 0 =*/48).bool(message.serverStreaming); - return writer; - }; - - /** - * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodDescriptorProto.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodDescriptorProto(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.inputType = reader.string(); - break; - case 3: - message.outputType = reader.string(); - break; - case 4: - message.options = $root.google.protobuf.MethodOptions.decode(reader, reader.uint32()); - break; - case 5: - message.clientStreaming = reader.bool(); - break; - case 6: - message.serverStreaming = reader.bool(); - break; - default: - reader.skipType(tag & 7); - break; + /** + * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse + */ + ListSubscriptionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSubscriptionsResponse) + return object; + var message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); + if (object.subscriptions) { + if (!Array.isArray(object.subscriptions)) + throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: array expected"); + message.subscriptions = []; + for (var i = 0; i < object.subscriptions.length; ++i) { + if (typeof object.subscriptions[i] !== "object") + throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: object expected"); + message.subscriptions[i] = $root.google.pubsub.v1.Subscription.fromObject(object.subscriptions[i]); + } } - } - return message; - }; - - /** - * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodDescriptorProto.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a MethodDescriptorProto message. - * @function verify - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - MethodDescriptorProto.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.inputType != null && message.hasOwnProperty("inputType")) - if (!$util.isString(message.inputType)) - return "inputType: string expected"; - if (message.outputType != null && message.hasOwnProperty("outputType")) - if (!$util.isString(message.outputType)) - return "outputType: string expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.MethodOptions.verify(message.options); - if (error) - return "options." + error; - } - if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) - if (typeof message.clientStreaming !== "boolean") - return "clientStreaming: boolean expected"; - if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) - if (typeof message.serverStreaming !== "boolean") - return "serverStreaming: boolean expected"; - return null; - }; + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; - /** - * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto - */ - MethodDescriptorProto.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.MethodDescriptorProto) + /** + * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {google.pubsub.v1.ListSubscriptionsResponse} message ListSubscriptionsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSubscriptionsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.subscriptions = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.subscriptions && message.subscriptions.length) { + object.subscriptions = []; + for (var j = 0; j < message.subscriptions.length; ++j) + object.subscriptions[j] = $root.google.pubsub.v1.Subscription.toObject(message.subscriptions[j], options); + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; return object; - var message = new $root.google.protobuf.MethodDescriptorProto(); - if (object.name != null) - message.name = String(object.name); - if (object.inputType != null) - message.inputType = String(object.inputType); - if (object.outputType != null) - message.outputType = String(object.outputType); - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.MethodDescriptorProto.options: object expected"); - message.options = $root.google.protobuf.MethodOptions.fromObject(object.options); - } - if (object.clientStreaming != null) - message.clientStreaming = Boolean(object.clientStreaming); - if (object.serverStreaming != null) - message.serverStreaming = Boolean(object.serverStreaming); - return message; - }; + }; - /** - * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.MethodDescriptorProto - * @static - * @param {google.protobuf.MethodDescriptorProto} message MethodDescriptorProto - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - MethodDescriptorProto.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.name = ""; - object.inputType = ""; - object.outputType = ""; - object.options = null; - object.clientStreaming = false; - object.serverStreaming = false; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.inputType != null && message.hasOwnProperty("inputType")) - object.inputType = message.inputType; - if (message.outputType != null && message.hasOwnProperty("outputType")) - object.outputType = message.outputType; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.MethodOptions.toObject(message.options, options); - if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) - object.clientStreaming = message.clientStreaming; - if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) - object.serverStreaming = message.serverStreaming; - return object; - }; + /** + * Converts this ListSubscriptionsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @instance + * @returns {Object.} JSON object + */ + ListSubscriptionsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this MethodDescriptorProto to JSON. - * @function toJSON - * @memberof google.protobuf.MethodDescriptorProto - * @instance - * @returns {Object.} JSON object - */ - MethodDescriptorProto.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return ListSubscriptionsResponse; + })(); - return MethodDescriptorProto; - })(); + v1.DeleteSubscriptionRequest = (function() { - protobuf.FileOptions = (function() { + /** + * Properties of a DeleteSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteSubscriptionRequest + * @property {string|null} [subscription] DeleteSubscriptionRequest subscription + */ - /** - * Properties of a FileOptions. - * @memberof google.protobuf - * @interface IFileOptions - * @property {string|null} [javaPackage] FileOptions javaPackage - * @property {string|null} [javaOuterClassname] FileOptions javaOuterClassname - * @property {boolean|null} [javaMultipleFiles] FileOptions javaMultipleFiles - * @property {boolean|null} [javaGenerateEqualsAndHash] FileOptions javaGenerateEqualsAndHash - * @property {boolean|null} [javaStringCheckUtf8] FileOptions javaStringCheckUtf8 - * @property {google.protobuf.FileOptions.OptimizeMode|null} [optimizeFor] FileOptions optimizeFor - * @property {string|null} [goPackage] FileOptions goPackage - * @property {boolean|null} [ccGenericServices] FileOptions ccGenericServices - * @property {boolean|null} [javaGenericServices] FileOptions javaGenericServices - * @property {boolean|null} [pyGenericServices] FileOptions pyGenericServices - * @property {boolean|null} [phpGenericServices] FileOptions phpGenericServices - * @property {boolean|null} [deprecated] FileOptions deprecated - * @property {boolean|null} [ccEnableArenas] FileOptions ccEnableArenas - * @property {string|null} [objcClassPrefix] FileOptions objcClassPrefix - * @property {string|null} [csharpNamespace] FileOptions csharpNamespace - * @property {string|null} [swiftPrefix] FileOptions swiftPrefix - * @property {string|null} [phpClassPrefix] FileOptions phpClassPrefix - * @property {string|null} [phpNamespace] FileOptions phpNamespace - * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace - * @property {string|null} [rubyPackage] FileOptions rubyPackage - * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption - * @property {Array.|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition - */ + /** + * Constructs a new DeleteSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteSubscriptionRequest. + * @implements IDeleteSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set + */ + function DeleteSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new FileOptions. - * @memberof google.protobuf - * @classdesc Represents a FileOptions. - * @implements IFileOptions - * @constructor - * @param {google.protobuf.IFileOptions=} [properties] Properties to set - */ - function FileOptions(properties) { - this.uninterpretedOption = []; - this[".google.api.resourceDefinition"] = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * DeleteSubscriptionRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @instance + */ + DeleteSubscriptionRequest.prototype.subscription = ""; - /** - * FileOptions javaPackage. - * @member {string} javaPackage - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaPackage = ""; + /** + * Creates a new DeleteSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest instance + */ + DeleteSubscriptionRequest.create = function create(properties) { + return new DeleteSubscriptionRequest(properties); + }; - /** - * FileOptions javaOuterClassname. - * @member {string} javaOuterClassname - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaOuterClassname = ""; + /** + * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + return writer; + }; - /** - * FileOptions javaMultipleFiles. - * @member {boolean} javaMultipleFiles - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaMultipleFiles = false; + /** + * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * FileOptions javaGenerateEqualsAndHash. - * @member {boolean} javaGenerateEqualsAndHash - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaGenerateEqualsAndHash = false; + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * FileOptions javaStringCheckUtf8. - * @member {boolean} javaStringCheckUtf8 - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaStringCheckUtf8 = false; + /** + * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * FileOptions optimizeFor. - * @member {google.protobuf.FileOptions.OptimizeMode} optimizeFor - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.optimizeFor = 1; + /** + * Verifies a DeleteSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + return null; + }; - /** - * FileOptions goPackage. - * @member {string} goPackage - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.goPackage = ""; + /** + * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest + */ + DeleteSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + return message; + }; - /** - * FileOptions ccGenericServices. - * @member {boolean} ccGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.ccGenericServices = false; + /** + * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {google.pubsub.v1.DeleteSubscriptionRequest} message DeleteSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + return object; + }; - /** - * FileOptions javaGenericServices. - * @member {boolean} javaGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.javaGenericServices = false; - - /** - * FileOptions pyGenericServices. - * @member {boolean} pyGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.pyGenericServices = false; + /** + * Converts this DeleteSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * FileOptions phpGenericServices. - * @member {boolean} phpGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpGenericServices = false; + return DeleteSubscriptionRequest; + })(); - /** - * FileOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.deprecated = false; + v1.ModifyPushConfigRequest = (function() { - /** - * FileOptions ccEnableArenas. - * @member {boolean} ccEnableArenas - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.ccEnableArenas = false; + /** + * Properties of a ModifyPushConfigRequest. + * @memberof google.pubsub.v1 + * @interface IModifyPushConfigRequest + * @property {string|null} [subscription] ModifyPushConfigRequest subscription + * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] ModifyPushConfigRequest pushConfig + */ - /** - * FileOptions objcClassPrefix. - * @member {string} objcClassPrefix - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.objcClassPrefix = ""; + /** + * Constructs a new ModifyPushConfigRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ModifyPushConfigRequest. + * @implements IModifyPushConfigRequest + * @constructor + * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set + */ + function ModifyPushConfigRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * FileOptions csharpNamespace. - * @member {string} csharpNamespace - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.csharpNamespace = ""; + /** + * ModifyPushConfigRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @instance + */ + ModifyPushConfigRequest.prototype.subscription = ""; - /** - * FileOptions swiftPrefix. - * @member {string} swiftPrefix - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.swiftPrefix = ""; + /** + * ModifyPushConfigRequest pushConfig. + * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @instance + */ + ModifyPushConfigRequest.prototype.pushConfig = null; - /** - * FileOptions phpClassPrefix. - * @member {string} phpClassPrefix - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpClassPrefix = ""; + /** + * Creates a new ModifyPushConfigRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest instance + */ + ModifyPushConfigRequest.create = function create(properties) { + return new ModifyPushConfigRequest(properties); + }; - /** - * FileOptions phpNamespace. - * @member {string} phpNamespace - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpNamespace = ""; + /** + * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyPushConfigRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; - /** - * FileOptions phpMetadataNamespace. - * @member {string} phpMetadataNamespace - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpMetadataNamespace = ""; + /** + * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyPushConfigRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * FileOptions rubyPackage. - * @member {string} rubyPackage - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.rubyPackage = ""; + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyPushConfigRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * FileOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyPushConfigRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * FileOptions .google.api.resourceDefinition. - * @member {Array.} .google.api.resourceDefinition - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype[".google.api.resourceDefinition"] = $util.emptyArray; + /** + * Verifies a ModifyPushConfigRequest message. + * @function verify + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ModifyPushConfigRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { + var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); + if (error) + return "pushConfig." + error; + } + return null; + }; - /** - * Creates a new FileOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.FileOptions - * @static - * @param {google.protobuf.IFileOptions=} [properties] Properties to set - * @returns {google.protobuf.FileOptions} FileOptions instance - */ - FileOptions.create = function create(properties) { - return new FileOptions(properties); - }; + /** + * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest + */ + ModifyPushConfigRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ModifyPushConfigRequest) + return object; + var message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.pushConfig != null) { + if (typeof object.pushConfig !== "object") + throw TypeError(".google.pubsub.v1.ModifyPushConfigRequest.pushConfig: object expected"); + message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); + } + return message; + }; - /** - * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FileOptions - * @static - * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FileOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.javaPackage); - if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) - writer.uint32(/* id 8, wireType 2 =*/66).string(message.javaOuterClassname); - if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) - writer.uint32(/* id 9, wireType 0 =*/72).int32(message.optimizeFor); - if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) - writer.uint32(/* id 10, wireType 0 =*/80).bool(message.javaMultipleFiles); - if (message.goPackage != null && message.hasOwnProperty("goPackage")) - writer.uint32(/* id 11, wireType 2 =*/90).string(message.goPackage); - if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) - writer.uint32(/* id 16, wireType 0 =*/128).bool(message.ccGenericServices); - if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) - writer.uint32(/* id 17, wireType 0 =*/136).bool(message.javaGenericServices); - if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) - writer.uint32(/* id 18, wireType 0 =*/144).bool(message.pyGenericServices); - if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) - writer.uint32(/* id 20, wireType 0 =*/160).bool(message.javaGenerateEqualsAndHash); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 23, wireType 0 =*/184).bool(message.deprecated); - if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) - writer.uint32(/* id 27, wireType 0 =*/216).bool(message.javaStringCheckUtf8); - if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) - writer.uint32(/* id 31, wireType 0 =*/248).bool(message.ccEnableArenas); - if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) - writer.uint32(/* id 36, wireType 2 =*/290).string(message.objcClassPrefix); - if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) - writer.uint32(/* id 37, wireType 2 =*/298).string(message.csharpNamespace); - if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) - writer.uint32(/* id 39, wireType 2 =*/314).string(message.swiftPrefix); - if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) - writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) - writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) - writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) - writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.resourceDefinition"] != null && message[".google.api.resourceDefinition"].length) - for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) - $root.google.api.ResourceDescriptor.encode(message[".google.api.resourceDefinition"][i], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); - return writer; - }; + /** + * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {google.pubsub.v1.ModifyPushConfigRequest} message ModifyPushConfigRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ModifyPushConfigRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = ""; + object.pushConfig = null; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); + return object; + }; - /** - * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FileOptions - * @static - * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FileOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Converts this ModifyPushConfigRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @instance + * @returns {Object.} JSON object + */ + ModifyPushConfigRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Decodes a FileOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FileOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FileOptions} FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FileOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.javaPackage = reader.string(); - break; - case 8: - message.javaOuterClassname = reader.string(); - break; - case 10: - message.javaMultipleFiles = reader.bool(); - break; - case 20: - message.javaGenerateEqualsAndHash = reader.bool(); - break; - case 27: - message.javaStringCheckUtf8 = reader.bool(); - break; - case 9: - message.optimizeFor = reader.int32(); - break; - case 11: - message.goPackage = reader.string(); - break; - case 16: - message.ccGenericServices = reader.bool(); - break; - case 17: - message.javaGenericServices = reader.bool(); - break; - case 18: - message.pyGenericServices = reader.bool(); - break; - case 42: - message.phpGenericServices = reader.bool(); - break; - case 23: - message.deprecated = reader.bool(); - break; - case 31: - message.ccEnableArenas = reader.bool(); - break; - case 36: - message.objcClassPrefix = reader.string(); - break; - case 37: - message.csharpNamespace = reader.string(); - break; - case 39: - message.swiftPrefix = reader.string(); - break; - case 40: - message.phpClassPrefix = reader.string(); - break; - case 41: - message.phpNamespace = reader.string(); - break; - case 44: - message.phpMetadataNamespace = reader.string(); - break; - case 45: - message.rubyPackage = reader.string(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1053: - if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length)) - message[".google.api.resourceDefinition"] = []; - message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + return ModifyPushConfigRequest; + })(); - /** - * Decodes a FileOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FileOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FileOptions} FileOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FileOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + v1.PullRequest = (function() { - /** - * Verifies a FileOptions message. - * @function verify - * @memberof google.protobuf.FileOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FileOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) - if (!$util.isString(message.javaPackage)) - return "javaPackage: string expected"; - if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) - if (!$util.isString(message.javaOuterClassname)) - return "javaOuterClassname: string expected"; - if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) - if (typeof message.javaMultipleFiles !== "boolean") - return "javaMultipleFiles: boolean expected"; - if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) - if (typeof message.javaGenerateEqualsAndHash !== "boolean") - return "javaGenerateEqualsAndHash: boolean expected"; - if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) - if (typeof message.javaStringCheckUtf8 !== "boolean") - return "javaStringCheckUtf8: boolean expected"; - if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) - switch (message.optimizeFor) { - default: - return "optimizeFor: enum value expected"; - case 1: - case 2: - case 3: - break; - } - if (message.goPackage != null && message.hasOwnProperty("goPackage")) - if (!$util.isString(message.goPackage)) - return "goPackage: string expected"; - if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) - if (typeof message.ccGenericServices !== "boolean") - return "ccGenericServices: boolean expected"; - if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) - if (typeof message.javaGenericServices !== "boolean") - return "javaGenericServices: boolean expected"; - if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) - if (typeof message.pyGenericServices !== "boolean") - return "pyGenericServices: boolean expected"; - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - if (typeof message.phpGenericServices !== "boolean") - return "phpGenericServices: boolean expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) - if (typeof message.ccEnableArenas !== "boolean") - return "ccEnableArenas: boolean expected"; - if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) - if (!$util.isString(message.objcClassPrefix)) - return "objcClassPrefix: string expected"; - if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) - if (!$util.isString(message.csharpNamespace)) - return "csharpNamespace: string expected"; - if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) - if (!$util.isString(message.swiftPrefix)) - return "swiftPrefix: string expected"; - if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) - if (!$util.isString(message.phpClassPrefix)) - return "phpClassPrefix: string expected"; - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) - if (!$util.isString(message.phpNamespace)) - return "phpNamespace: string expected"; - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) - if (!$util.isString(message.phpMetadataNamespace)) - return "phpMetadataNamespace: string expected"; - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) - if (!$util.isString(message.rubyPackage)) - return "rubyPackage: string expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - if (message[".google.api.resourceDefinition"] != null && message.hasOwnProperty(".google.api.resourceDefinition")) { - if (!Array.isArray(message[".google.api.resourceDefinition"])) - return ".google.api.resourceDefinition: array expected"; - for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) { - var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resourceDefinition"][i]); - if (error) - return ".google.api.resourceDefinition." + error; - } - } - return null; - }; - - /** - * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FileOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FileOptions} FileOptions - */ - FileOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FileOptions) - return object; - var message = new $root.google.protobuf.FileOptions(); - if (object.javaPackage != null) - message.javaPackage = String(object.javaPackage); - if (object.javaOuterClassname != null) - message.javaOuterClassname = String(object.javaOuterClassname); - if (object.javaMultipleFiles != null) - message.javaMultipleFiles = Boolean(object.javaMultipleFiles); - if (object.javaGenerateEqualsAndHash != null) - message.javaGenerateEqualsAndHash = Boolean(object.javaGenerateEqualsAndHash); - if (object.javaStringCheckUtf8 != null) - message.javaStringCheckUtf8 = Boolean(object.javaStringCheckUtf8); - switch (object.optimizeFor) { - case "SPEED": - case 1: - message.optimizeFor = 1; - break; - case "CODE_SIZE": - case 2: - message.optimizeFor = 2; - break; - case "LITE_RUNTIME": - case 3: - message.optimizeFor = 3; - break; - } - if (object.goPackage != null) - message.goPackage = String(object.goPackage); - if (object.ccGenericServices != null) - message.ccGenericServices = Boolean(object.ccGenericServices); - if (object.javaGenericServices != null) - message.javaGenericServices = Boolean(object.javaGenericServices); - if (object.pyGenericServices != null) - message.pyGenericServices = Boolean(object.pyGenericServices); - if (object.phpGenericServices != null) - message.phpGenericServices = Boolean(object.phpGenericServices); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.ccEnableArenas != null) - message.ccEnableArenas = Boolean(object.ccEnableArenas); - if (object.objcClassPrefix != null) - message.objcClassPrefix = String(object.objcClassPrefix); - if (object.csharpNamespace != null) - message.csharpNamespace = String(object.csharpNamespace); - if (object.swiftPrefix != null) - message.swiftPrefix = String(object.swiftPrefix); - if (object.phpClassPrefix != null) - message.phpClassPrefix = String(object.phpClassPrefix); - if (object.phpNamespace != null) - message.phpNamespace = String(object.phpNamespace); - if (object.phpMetadataNamespace != null) - message.phpMetadataNamespace = String(object.phpMetadataNamespace); - if (object.rubyPackage != null) - message.rubyPackage = String(object.rubyPackage); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - if (object[".google.api.resourceDefinition"]) { - if (!Array.isArray(object[".google.api.resourceDefinition"])) - throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: array expected"); - message[".google.api.resourceDefinition"] = []; - for (var i = 0; i < object[".google.api.resourceDefinition"].length; ++i) { - if (typeof object[".google.api.resourceDefinition"][i] !== "object") - throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: object expected"); - message[".google.api.resourceDefinition"][i] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resourceDefinition"][i]); - } - } - return message; - }; - - /** - * Creates a plain object from a FileOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FileOptions - * @static - * @param {google.protobuf.FileOptions} message FileOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FileOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.uninterpretedOption = []; - object[".google.api.resourceDefinition"] = []; - } - if (options.defaults) { - object.javaPackage = ""; - object.javaOuterClassname = ""; - object.optimizeFor = options.enums === String ? "SPEED" : 1; - object.javaMultipleFiles = false; - object.goPackage = ""; - object.ccGenericServices = false; - object.javaGenericServices = false; - object.pyGenericServices = false; - object.javaGenerateEqualsAndHash = false; - object.deprecated = false; - object.javaStringCheckUtf8 = false; - object.ccEnableArenas = false; - object.objcClassPrefix = ""; - object.csharpNamespace = ""; - object.swiftPrefix = ""; - object.phpClassPrefix = ""; - object.phpNamespace = ""; - object.phpGenericServices = false; - object.phpMetadataNamespace = ""; - object.rubyPackage = ""; - } - if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) - object.javaPackage = message.javaPackage; - if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) - object.javaOuterClassname = message.javaOuterClassname; - if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) - object.optimizeFor = options.enums === String ? $root.google.protobuf.FileOptions.OptimizeMode[message.optimizeFor] : message.optimizeFor; - if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) - object.javaMultipleFiles = message.javaMultipleFiles; - if (message.goPackage != null && message.hasOwnProperty("goPackage")) - object.goPackage = message.goPackage; - if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) - object.ccGenericServices = message.ccGenericServices; - if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) - object.javaGenericServices = message.javaGenericServices; - if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) - object.pyGenericServices = message.pyGenericServices; - if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) - object.javaGenerateEqualsAndHash = message.javaGenerateEqualsAndHash; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) - object.javaStringCheckUtf8 = message.javaStringCheckUtf8; - if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) - object.ccEnableArenas = message.ccEnableArenas; - if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) - object.objcClassPrefix = message.objcClassPrefix; - if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) - object.csharpNamespace = message.csharpNamespace; - if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) - object.swiftPrefix = message.swiftPrefix; - if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) - object.phpClassPrefix = message.phpClassPrefix; - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) - object.phpNamespace = message.phpNamespace; - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - object.phpGenericServices = message.phpGenericServices; - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) - object.phpMetadataNamespace = message.phpMetadataNamespace; - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) - object.rubyPackage = message.rubyPackage; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length) { - object[".google.api.resourceDefinition"] = []; - for (var j = 0; j < message[".google.api.resourceDefinition"].length; ++j) - object[".google.api.resourceDefinition"][j] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resourceDefinition"][j], options); - } - return object; - }; - - /** - * Converts this FileOptions to JSON. - * @function toJSON - * @memberof google.protobuf.FileOptions - * @instance - * @returns {Object.} JSON object - */ - FileOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * OptimizeMode enum. - * @name google.protobuf.FileOptions.OptimizeMode - * @enum {string} - * @property {number} SPEED=1 SPEED value - * @property {number} CODE_SIZE=2 CODE_SIZE value - * @property {number} LITE_RUNTIME=3 LITE_RUNTIME value - */ - FileOptions.OptimizeMode = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[1] = "SPEED"] = 1; - values[valuesById[2] = "CODE_SIZE"] = 2; - values[valuesById[3] = "LITE_RUNTIME"] = 3; - return values; - })(); - - return FileOptions; - })(); - - protobuf.MessageOptions = (function() { - - /** - * Properties of a MessageOptions. - * @memberof google.protobuf - * @interface IMessageOptions - * @property {boolean|null} [messageSetWireFormat] MessageOptions messageSetWireFormat - * @property {boolean|null} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor - * @property {boolean|null} [deprecated] MessageOptions deprecated - * @property {boolean|null} [mapEntry] MessageOptions mapEntry - * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption - * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource - */ - - /** - * Constructs a new MessageOptions. - * @memberof google.protobuf - * @classdesc Represents a MessageOptions. - * @implements IMessageOptions - * @constructor - * @param {google.protobuf.IMessageOptions=} [properties] Properties to set - */ - function MessageOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * MessageOptions messageSetWireFormat. - * @member {boolean} messageSetWireFormat - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.messageSetWireFormat = false; - - /** - * MessageOptions noStandardDescriptorAccessor. - * @member {boolean} noStandardDescriptorAccessor - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.noStandardDescriptorAccessor = false; - - /** - * MessageOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.deprecated = false; - - /** - * MessageOptions mapEntry. - * @member {boolean} mapEntry - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.mapEntry = false; - - /** - * MessageOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * MessageOptions .google.api.resource. - * @member {google.api.IResourceDescriptor|null|undefined} .google.api.resource - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype[".google.api.resource"] = null; - - /** - * Creates a new MessageOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.MessageOptions - * @static - * @param {google.protobuf.IMessageOptions=} [properties] Properties to set - * @returns {google.protobuf.MessageOptions} MessageOptions instance - */ - MessageOptions.create = function create(properties) { - return new MessageOptions(properties); - }; - - /** - * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.MessageOptions - * @static - * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MessageOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) - writer.uint32(/* id 1, wireType 0 =*/8).bool(message.messageSetWireFormat); - if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.noStandardDescriptorAccessor); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) - writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) - $root.google.api.ResourceDescriptor.encode(message[".google.api.resource"], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.MessageOptions - * @static - * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MessageOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a MessageOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.MessageOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.MessageOptions} MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MessageOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MessageOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.messageSetWireFormat = reader.bool(); - break; - case 2: - message.noStandardDescriptorAccessor = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 7: - message.mapEntry = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1053: - message[".google.api.resource"] = $root.google.api.ResourceDescriptor.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a MessageOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.MessageOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.MessageOptions} MessageOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MessageOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a MessageOptions message. - * @function verify - * @memberof google.protobuf.MessageOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - MessageOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) - if (typeof message.messageSetWireFormat !== "boolean") - return "messageSetWireFormat: boolean expected"; - if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) - if (typeof message.noStandardDescriptorAccessor !== "boolean") - return "noStandardDescriptorAccessor: boolean expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) - if (typeof message.mapEntry !== "boolean") - return "mapEntry: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) { - var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resource"]); - if (error) - return ".google.api.resource." + error; - } - return null; - }; - - /** - * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.MessageOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.MessageOptions} MessageOptions - */ - MessageOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.MessageOptions) - return object; - var message = new $root.google.protobuf.MessageOptions(); - if (object.messageSetWireFormat != null) - message.messageSetWireFormat = Boolean(object.messageSetWireFormat); - if (object.noStandardDescriptorAccessor != null) - message.noStandardDescriptorAccessor = Boolean(object.noStandardDescriptorAccessor); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.mapEntry != null) - message.mapEntry = Boolean(object.mapEntry); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - if (object[".google.api.resource"] != null) { - if (typeof object[".google.api.resource"] !== "object") - throw TypeError(".google.protobuf.MessageOptions..google.api.resource: object expected"); - message[".google.api.resource"] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resource"]); - } - return message; - }; - - /** - * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.MessageOptions - * @static - * @param {google.protobuf.MessageOptions} message MessageOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - MessageOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (options.defaults) { - object.messageSetWireFormat = false; - object.noStandardDescriptorAccessor = false; - object.deprecated = false; - object.mapEntry = false; - object[".google.api.resource"] = null; - } - if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) - object.messageSetWireFormat = message.messageSetWireFormat; - if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) - object.noStandardDescriptorAccessor = message.noStandardDescriptorAccessor; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) - object.mapEntry = message.mapEntry; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) - object[".google.api.resource"] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resource"], options); - return object; - }; - - /** - * Converts this MessageOptions to JSON. - * @function toJSON - * @memberof google.protobuf.MessageOptions - * @instance - * @returns {Object.} JSON object - */ - MessageOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return MessageOptions; - })(); - - protobuf.FieldOptions = (function() { - - /** - * Properties of a FieldOptions. - * @memberof google.protobuf - * @interface IFieldOptions - * @property {google.protobuf.FieldOptions.CType|null} [ctype] FieldOptions ctype - * @property {boolean|null} [packed] FieldOptions packed - * @property {google.protobuf.FieldOptions.JSType|null} [jstype] FieldOptions jstype - * @property {boolean|null} [lazy] FieldOptions lazy - * @property {boolean|null} [deprecated] FieldOptions deprecated - * @property {boolean|null} [weak] FieldOptions weak - * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption - * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior - * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference - */ - - /** - * Constructs a new FieldOptions. - * @memberof google.protobuf - * @classdesc Represents a FieldOptions. - * @implements IFieldOptions - * @constructor - * @param {google.protobuf.IFieldOptions=} [properties] Properties to set - */ - function FieldOptions(properties) { - this.uninterpretedOption = []; - this[".google.api.fieldBehavior"] = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * FieldOptions ctype. - * @member {google.protobuf.FieldOptions.CType} ctype - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.ctype = 0; - - /** - * FieldOptions packed. - * @member {boolean} packed - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.packed = false; - - /** - * FieldOptions jstype. - * @member {google.protobuf.FieldOptions.JSType} jstype - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.jstype = 0; - - /** - * FieldOptions lazy. - * @member {boolean} lazy - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.lazy = false; - - /** - * FieldOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.deprecated = false; - - /** - * FieldOptions weak. - * @member {boolean} weak - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.weak = false; - - /** - * FieldOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * FieldOptions .google.api.fieldBehavior. - * @member {Array.} .google.api.fieldBehavior - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype[".google.api.fieldBehavior"] = $util.emptyArray; - - /** - * FieldOptions .google.api.resourceReference. - * @member {google.api.IResourceReference|null|undefined} .google.api.resourceReference - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype[".google.api.resourceReference"] = null; - - /** - * Creates a new FieldOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.FieldOptions - * @static - * @param {google.protobuf.IFieldOptions=} [properties] Properties to set - * @returns {google.protobuf.FieldOptions} FieldOptions instance - */ - FieldOptions.create = function create(properties) { - return new FieldOptions(properties); - }; - - /** - * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FieldOptions - * @static - * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.ctype != null && message.hasOwnProperty("ctype")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.ctype); - if (message.packed != null && message.hasOwnProperty("packed")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.packed); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.lazy != null && message.hasOwnProperty("lazy")) - writer.uint32(/* id 5, wireType 0 =*/40).bool(message.lazy); - if (message.jstype != null && message.hasOwnProperty("jstype")) - writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jstype); - if (message.weak != null && message.hasOwnProperty("weak")) - writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.fieldBehavior"] != null && message[".google.api.fieldBehavior"].length) { - writer.uint32(/* id 1052, wireType 2 =*/8418).fork(); - for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) - writer.int32(message[".google.api.fieldBehavior"][i]); - writer.ldelim(); - } - if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) - $root.google.api.ResourceReference.encode(message[".google.api.resourceReference"], writer.uint32(/* id 1055, wireType 2 =*/8442).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FieldOptions - * @static - * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a FieldOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FieldOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FieldOptions} FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.ctype = reader.int32(); - break; - case 2: - message.packed = reader.bool(); - break; - case 6: - message.jstype = reader.int32(); - break; - case 5: - message.lazy = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 10: - message.weak = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1052: - if (!(message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length)) - message[".google.api.fieldBehavior"] = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message[".google.api.fieldBehavior"].push(reader.int32()); - } else - message[".google.api.fieldBehavior"].push(reader.int32()); - break; - case 1055: - message[".google.api.resourceReference"] = $root.google.api.ResourceReference.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a FieldOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FieldOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FieldOptions} FieldOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a FieldOptions message. - * @function verify - * @memberof google.protobuf.FieldOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FieldOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.ctype != null && message.hasOwnProperty("ctype")) - switch (message.ctype) { - default: - return "ctype: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.packed != null && message.hasOwnProperty("packed")) - if (typeof message.packed !== "boolean") - return "packed: boolean expected"; - if (message.jstype != null && message.hasOwnProperty("jstype")) - switch (message.jstype) { - default: - return "jstype: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.lazy != null && message.hasOwnProperty("lazy")) - if (typeof message.lazy !== "boolean") - return "lazy: boolean expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.weak != null && message.hasOwnProperty("weak")) - if (typeof message.weak !== "boolean") - return "weak: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - if (message[".google.api.fieldBehavior"] != null && message.hasOwnProperty(".google.api.fieldBehavior")) { - if (!Array.isArray(message[".google.api.fieldBehavior"])) - return ".google.api.fieldBehavior: array expected"; - for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) - switch (message[".google.api.fieldBehavior"][i]) { - default: - return ".google.api.fieldBehavior: enum value[] expected"; - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - break; - } - } - if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) { - var error = $root.google.api.ResourceReference.verify(message[".google.api.resourceReference"]); - if (error) - return ".google.api.resourceReference." + error; - } - return null; - }; - - /** - * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FieldOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FieldOptions} FieldOptions - */ - FieldOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FieldOptions) - return object; - var message = new $root.google.protobuf.FieldOptions(); - switch (object.ctype) { - case "STRING": - case 0: - message.ctype = 0; - break; - case "CORD": - case 1: - message.ctype = 1; - break; - case "STRING_PIECE": - case 2: - message.ctype = 2; - break; - } - if (object.packed != null) - message.packed = Boolean(object.packed); - switch (object.jstype) { - case "JS_NORMAL": - case 0: - message.jstype = 0; - break; - case "JS_STRING": - case 1: - message.jstype = 1; - break; - case "JS_NUMBER": - case 2: - message.jstype = 2; - break; - } - if (object.lazy != null) - message.lazy = Boolean(object.lazy); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.weak != null) - message.weak = Boolean(object.weak); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - if (object[".google.api.fieldBehavior"]) { - if (!Array.isArray(object[".google.api.fieldBehavior"])) - throw TypeError(".google.protobuf.FieldOptions..google.api.fieldBehavior: array expected"); - message[".google.api.fieldBehavior"] = []; - for (var i = 0; i < object[".google.api.fieldBehavior"].length; ++i) - switch (object[".google.api.fieldBehavior"][i]) { - default: - case "FIELD_BEHAVIOR_UNSPECIFIED": - case 0: - message[".google.api.fieldBehavior"][i] = 0; - break; - case "OPTIONAL": - case 1: - message[".google.api.fieldBehavior"][i] = 1; - break; - case "REQUIRED": - case 2: - message[".google.api.fieldBehavior"][i] = 2; - break; - case "OUTPUT_ONLY": - case 3: - message[".google.api.fieldBehavior"][i] = 3; - break; - case "INPUT_ONLY": - case 4: - message[".google.api.fieldBehavior"][i] = 4; - break; - case "IMMUTABLE": - case 5: - message[".google.api.fieldBehavior"][i] = 5; - break; - } - } - if (object[".google.api.resourceReference"] != null) { - if (typeof object[".google.api.resourceReference"] !== "object") - throw TypeError(".google.protobuf.FieldOptions..google.api.resourceReference: object expected"); - message[".google.api.resourceReference"] = $root.google.api.ResourceReference.fromObject(object[".google.api.resourceReference"]); - } - return message; - }; - - /** - * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FieldOptions - * @static - * @param {google.protobuf.FieldOptions} message FieldOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FieldOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.uninterpretedOption = []; - object[".google.api.fieldBehavior"] = []; - } - if (options.defaults) { - object.ctype = options.enums === String ? "STRING" : 0; - object.packed = false; - object.deprecated = false; - object.lazy = false; - object.jstype = options.enums === String ? "JS_NORMAL" : 0; - object.weak = false; - object[".google.api.resourceReference"] = null; - } - if (message.ctype != null && message.hasOwnProperty("ctype")) - object.ctype = options.enums === String ? $root.google.protobuf.FieldOptions.CType[message.ctype] : message.ctype; - if (message.packed != null && message.hasOwnProperty("packed")) - object.packed = message.packed; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.lazy != null && message.hasOwnProperty("lazy")) - object.lazy = message.lazy; - if (message.jstype != null && message.hasOwnProperty("jstype")) - object.jstype = options.enums === String ? $root.google.protobuf.FieldOptions.JSType[message.jstype] : message.jstype; - if (message.weak != null && message.hasOwnProperty("weak")) - object.weak = message.weak; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length) { - object[".google.api.fieldBehavior"] = []; - for (var j = 0; j < message[".google.api.fieldBehavior"].length; ++j) - object[".google.api.fieldBehavior"][j] = options.enums === String ? $root.google.api.FieldBehavior[message[".google.api.fieldBehavior"][j]] : message[".google.api.fieldBehavior"][j]; - } - if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) - object[".google.api.resourceReference"] = $root.google.api.ResourceReference.toObject(message[".google.api.resourceReference"], options); - return object; - }; - - /** - * Converts this FieldOptions to JSON. - * @function toJSON - * @memberof google.protobuf.FieldOptions - * @instance - * @returns {Object.} JSON object - */ - FieldOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * CType enum. - * @name google.protobuf.FieldOptions.CType - * @enum {string} - * @property {number} STRING=0 STRING value - * @property {number} CORD=1 CORD value - * @property {number} STRING_PIECE=2 STRING_PIECE value - */ - FieldOptions.CType = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "STRING"] = 0; - values[valuesById[1] = "CORD"] = 1; - values[valuesById[2] = "STRING_PIECE"] = 2; - return values; - })(); - - /** - * JSType enum. - * @name google.protobuf.FieldOptions.JSType - * @enum {string} - * @property {number} JS_NORMAL=0 JS_NORMAL value - * @property {number} JS_STRING=1 JS_STRING value - * @property {number} JS_NUMBER=2 JS_NUMBER value - */ - FieldOptions.JSType = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "JS_NORMAL"] = 0; - values[valuesById[1] = "JS_STRING"] = 1; - values[valuesById[2] = "JS_NUMBER"] = 2; - return values; - })(); - - return FieldOptions; - })(); - - protobuf.OneofOptions = (function() { - - /** - * Properties of an OneofOptions. - * @memberof google.protobuf - * @interface IOneofOptions - * @property {Array.|null} [uninterpretedOption] OneofOptions uninterpretedOption - */ - - /** - * Constructs a new OneofOptions. - * @memberof google.protobuf - * @classdesc Represents an OneofOptions. - * @implements IOneofOptions - * @constructor - * @param {google.protobuf.IOneofOptions=} [properties] Properties to set - */ - function OneofOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * OneofOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.OneofOptions - * @instance - */ - OneofOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * Creates a new OneofOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.OneofOptions - * @static - * @param {google.protobuf.IOneofOptions=} [properties] Properties to set - * @returns {google.protobuf.OneofOptions} OneofOptions instance - */ - OneofOptions.create = function create(properties) { - return new OneofOptions(properties); - }; - - /** - * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.OneofOptions - * @static - * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OneofOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.OneofOptions - * @static - * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OneofOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an OneofOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.OneofOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.OneofOptions} OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OneofOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an OneofOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.OneofOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.OneofOptions} OneofOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OneofOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an OneofOptions message. - * @function verify - * @memberof google.protobuf.OneofOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - OneofOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - return null; - }; - - /** - * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.OneofOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.OneofOptions} OneofOptions - */ - OneofOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.OneofOptions) - return object; - var message = new $root.google.protobuf.OneofOptions(); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - return message; - }; - - /** - * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.OneofOptions - * @static - * @param {google.protobuf.OneofOptions} message OneofOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - OneofOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; - - /** - * Converts this OneofOptions to JSON. - * @function toJSON - * @memberof google.protobuf.OneofOptions - * @instance - * @returns {Object.} JSON object - */ - OneofOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return OneofOptions; - })(); - - protobuf.EnumOptions = (function() { - - /** - * Properties of an EnumOptions. - * @memberof google.protobuf - * @interface IEnumOptions - * @property {boolean|null} [allowAlias] EnumOptions allowAlias - * @property {boolean|null} [deprecated] EnumOptions deprecated - * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption - */ - - /** - * Constructs a new EnumOptions. - * @memberof google.protobuf - * @classdesc Represents an EnumOptions. - * @implements IEnumOptions - * @constructor - * @param {google.protobuf.IEnumOptions=} [properties] Properties to set - */ - function EnumOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * EnumOptions allowAlias. - * @member {boolean} allowAlias - * @memberof google.protobuf.EnumOptions - * @instance - */ - EnumOptions.prototype.allowAlias = false; - - /** - * EnumOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.EnumOptions - * @instance - */ - EnumOptions.prototype.deprecated = false; - - /** - * EnumOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.EnumOptions - * @instance - */ - EnumOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * Creates a new EnumOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumOptions - * @static - * @param {google.protobuf.IEnumOptions=} [properties] Properties to set - * @returns {google.protobuf.EnumOptions} EnumOptions instance - */ - EnumOptions.create = function create(properties) { - return new EnumOptions(properties); - }; - - /** - * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumOptions - * @static - * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumOptions - * @static - * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an EnumOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumOptions} EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 2: - message.allowAlias = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an EnumOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumOptions} EnumOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an EnumOptions message. - * @function verify - * @memberof google.protobuf.EnumOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) - if (typeof message.allowAlias !== "boolean") - return "allowAlias: boolean expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - return null; - }; - - /** - * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumOptions} EnumOptions - */ - EnumOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumOptions) - return object; - var message = new $root.google.protobuf.EnumOptions(); - if (object.allowAlias != null) - message.allowAlias = Boolean(object.allowAlias); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - return message; - }; - - /** - * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumOptions - * @static - * @param {google.protobuf.EnumOptions} message EnumOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (options.defaults) { - object.allowAlias = false; - object.deprecated = false; - } - if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) - object.allowAlias = message.allowAlias; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; - - /** - * Converts this EnumOptions to JSON. - * @function toJSON - * @memberof google.protobuf.EnumOptions - * @instance - * @returns {Object.} JSON object - */ - EnumOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return EnumOptions; - })(); - - protobuf.EnumValueOptions = (function() { - - /** - * Properties of an EnumValueOptions. - * @memberof google.protobuf - * @interface IEnumValueOptions - * @property {boolean|null} [deprecated] EnumValueOptions deprecated - * @property {Array.|null} [uninterpretedOption] EnumValueOptions uninterpretedOption - */ - - /** - * Constructs a new EnumValueOptions. - * @memberof google.protobuf - * @classdesc Represents an EnumValueOptions. - * @implements IEnumValueOptions - * @constructor - * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set - */ - function EnumValueOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * EnumValueOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.EnumValueOptions - * @instance - */ - EnumValueOptions.prototype.deprecated = false; - - /** - * EnumValueOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.EnumValueOptions - * @instance - */ - EnumValueOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * Creates a new EnumValueOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set - * @returns {google.protobuf.EnumValueOptions} EnumValueOptions instance - */ - EnumValueOptions.create = function create(properties) { - return new EnumValueOptions(properties); - }; - - /** - * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumValueOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 1, wireType 0 =*/8).bool(message.deprecated); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumValueOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an EnumValueOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumValueOptions} EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumValueOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumValueOptions} EnumValueOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumValueOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an EnumValueOptions message. - * @function verify - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumValueOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - return null; - }; - - /** - * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumValueOptions} EnumValueOptions - */ - EnumValueOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumValueOptions) - return object; - var message = new $root.google.protobuf.EnumValueOptions(); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - return message; - }; - - /** - * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumValueOptions - * @static - * @param {google.protobuf.EnumValueOptions} message EnumValueOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumValueOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (options.defaults) - object.deprecated = false; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; - - /** - * Converts this EnumValueOptions to JSON. - * @function toJSON - * @memberof google.protobuf.EnumValueOptions - * @instance - * @returns {Object.} JSON object - */ - EnumValueOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return EnumValueOptions; - })(); - - protobuf.ServiceOptions = (function() { - - /** - * Properties of a ServiceOptions. - * @memberof google.protobuf - * @interface IServiceOptions - * @property {boolean|null} [deprecated] ServiceOptions deprecated - * @property {Array.|null} [uninterpretedOption] ServiceOptions uninterpretedOption - * @property {string|null} [".google.api.defaultHost"] ServiceOptions .google.api.defaultHost - * @property {string|null} [".google.api.oauthScopes"] ServiceOptions .google.api.oauthScopes - */ - - /** - * Constructs a new ServiceOptions. - * @memberof google.protobuf - * @classdesc Represents a ServiceOptions. - * @implements IServiceOptions - * @constructor - * @param {google.protobuf.IServiceOptions=} [properties] Properties to set - */ - function ServiceOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ServiceOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.ServiceOptions - * @instance - */ - ServiceOptions.prototype.deprecated = false; - - /** - * ServiceOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.ServiceOptions - * @instance - */ - ServiceOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * ServiceOptions .google.api.defaultHost. - * @member {string} .google.api.defaultHost - * @memberof google.protobuf.ServiceOptions - * @instance - */ - ServiceOptions.prototype[".google.api.defaultHost"] = ""; - - /** - * ServiceOptions .google.api.oauthScopes. - * @member {string} .google.api.oauthScopes - * @memberof google.protobuf.ServiceOptions - * @instance - */ - ServiceOptions.prototype[".google.api.oauthScopes"] = ""; - - /** - * Creates a new ServiceOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.ServiceOptions - * @static - * @param {google.protobuf.IServiceOptions=} [properties] Properties to set - * @returns {google.protobuf.ServiceOptions} ServiceOptions instance - */ - ServiceOptions.create = function create(properties) { - return new ServiceOptions(properties); - }; - - /** - * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.ServiceOptions - * @static - * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ServiceOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) - writer.uint32(/* id 1049, wireType 2 =*/8394).string(message[".google.api.defaultHost"]); - if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) - writer.uint32(/* id 1050, wireType 2 =*/8402).string(message[".google.api.oauthScopes"]); - return writer; - }; - - /** - * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.ServiceOptions - * @static - * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ServiceOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a ServiceOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.ServiceOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.ServiceOptions} ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ServiceOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 33: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1049: - message[".google.api.defaultHost"] = reader.string(); - break; - case 1050: - message[".google.api.oauthScopes"] = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.ServiceOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.ServiceOptions} ServiceOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ServiceOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a ServiceOptions message. - * @function verify - * @memberof google.protobuf.ServiceOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ServiceOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) - if (!$util.isString(message[".google.api.defaultHost"])) - return ".google.api.defaultHost: string expected"; - if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) - if (!$util.isString(message[".google.api.oauthScopes"])) - return ".google.api.oauthScopes: string expected"; - return null; - }; - - /** - * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.ServiceOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.ServiceOptions} ServiceOptions - */ - ServiceOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.ServiceOptions) - return object; - var message = new $root.google.protobuf.ServiceOptions(); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - if (object[".google.api.defaultHost"] != null) - message[".google.api.defaultHost"] = String(object[".google.api.defaultHost"]); - if (object[".google.api.oauthScopes"] != null) - message[".google.api.oauthScopes"] = String(object[".google.api.oauthScopes"]); - return message; - }; - - /** - * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.ServiceOptions - * @static - * @param {google.protobuf.ServiceOptions} message ServiceOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ServiceOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (options.defaults) { - object.deprecated = false; - object[".google.api.defaultHost"] = ""; - object[".google.api.oauthScopes"] = ""; - } - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) - object[".google.api.defaultHost"] = message[".google.api.defaultHost"]; - if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) - object[".google.api.oauthScopes"] = message[".google.api.oauthScopes"]; - return object; - }; - - /** - * Converts this ServiceOptions to JSON. - * @function toJSON - * @memberof google.protobuf.ServiceOptions - * @instance - * @returns {Object.} JSON object - */ - ServiceOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return ServiceOptions; - })(); - - protobuf.MethodOptions = (function() { - - /** - * Properties of a MethodOptions. - * @memberof google.protobuf - * @interface IMethodOptions - * @property {boolean|null} [deprecated] MethodOptions deprecated - * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel - * @property {Array.|null} [uninterpretedOption] MethodOptions uninterpretedOption - * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http - * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature - */ - - /** - * Constructs a new MethodOptions. - * @memberof google.protobuf - * @classdesc Represents a MethodOptions. - * @implements IMethodOptions - * @constructor - * @param {google.protobuf.IMethodOptions=} [properties] Properties to set - */ - function MethodOptions(properties) { - this.uninterpretedOption = []; - this[".google.api.methodSignature"] = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * MethodOptions deprecated. - * @member {boolean} deprecated - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype.deprecated = false; - - /** - * MethodOptions idempotencyLevel. - * @member {google.protobuf.MethodOptions.IdempotencyLevel} idempotencyLevel - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype.idempotencyLevel = 0; - - /** - * MethodOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * MethodOptions .google.api.http. - * @member {google.api.IHttpRule|null|undefined} .google.api.http - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype[".google.api.http"] = null; - - /** - * MethodOptions .google.api.methodSignature. - * @member {Array.} .google.api.methodSignature - * @memberof google.protobuf.MethodOptions - * @instance - */ - MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; - - /** - * Creates a new MethodOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.MethodOptions - * @static - * @param {google.protobuf.IMethodOptions=} [properties] Properties to set - * @returns {google.protobuf.MethodOptions} MethodOptions instance - */ - MethodOptions.create = function create(properties) { - return new MethodOptions(properties); - }; - - /** - * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.MethodOptions - * @static - * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); - if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) - writer.uint32(/* id 34, wireType 0 =*/272).int32(message.idempotencyLevel); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.methodSignature"] != null && message[".google.api.methodSignature"].length) - for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) - writer.uint32(/* id 1051, wireType 2 =*/8410).string(message[".google.api.methodSignature"][i]); - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) - $root.google.api.HttpRule.encode(message[".google.api.http"], writer.uint32(/* id 72295728, wireType 2 =*/578365826).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.MethodOptions - * @static - * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a MethodOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.MethodOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.MethodOptions} MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 33: - message.deprecated = reader.bool(); - break; - case 34: - message.idempotencyLevel = reader.int32(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 72295728: - message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); - break; - case 1051: - if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) - message[".google.api.methodSignature"] = []; - message[".google.api.methodSignature"].push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a MethodOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.MethodOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.MethodOptions} MethodOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a MethodOptions message. - * @function verify - * @memberof google.protobuf.MethodOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - MethodOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - if (typeof message.deprecated !== "boolean") - return "deprecated: boolean expected"; - if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) - switch (message.idempotencyLevel) { - default: - return "idempotencyLevel: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { - var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); - if (error) - return ".google.api.http." + error; - } - if (message[".google.api.methodSignature"] != null && message.hasOwnProperty(".google.api.methodSignature")) { - if (!Array.isArray(message[".google.api.methodSignature"])) - return ".google.api.methodSignature: array expected"; - for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) - if (!$util.isString(message[".google.api.methodSignature"][i])) - return ".google.api.methodSignature: string[] expected"; - } - return null; - }; - - /** - * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.MethodOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.MethodOptions} MethodOptions - */ - MethodOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.MethodOptions) - return object; - var message = new $root.google.protobuf.MethodOptions(); - if (object.deprecated != null) - message.deprecated = Boolean(object.deprecated); - switch (object.idempotencyLevel) { - case "IDEMPOTENCY_UNKNOWN": - case 0: - message.idempotencyLevel = 0; - break; - case "NO_SIDE_EFFECTS": - case 1: - message.idempotencyLevel = 1; - break; - case "IDEMPOTENT": - case 2: - message.idempotencyLevel = 2; - break; - } - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - if (object[".google.api.http"] != null) { - if (typeof object[".google.api.http"] !== "object") - throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); - message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); - } - if (object[".google.api.methodSignature"]) { - if (!Array.isArray(object[".google.api.methodSignature"])) - throw TypeError(".google.protobuf.MethodOptions..google.api.methodSignature: array expected"); - message[".google.api.methodSignature"] = []; - for (var i = 0; i < object[".google.api.methodSignature"].length; ++i) - message[".google.api.methodSignature"][i] = String(object[".google.api.methodSignature"][i]); - } - return message; - }; - - /** - * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.MethodOptions - * @static - * @param {google.protobuf.MethodOptions} message MethodOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - MethodOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.uninterpretedOption = []; - object[".google.api.methodSignature"] = []; - } - if (options.defaults) { - object.deprecated = false; - object.idempotencyLevel = options.enums === String ? "IDEMPOTENCY_UNKNOWN" : 0; - object[".google.api.http"] = null; - } - if (message.deprecated != null && message.hasOwnProperty("deprecated")) - object.deprecated = message.deprecated; - if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) - object.idempotencyLevel = options.enums === String ? $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] : message.idempotencyLevel; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - if (message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length) { - object[".google.api.methodSignature"] = []; - for (var j = 0; j < message[".google.api.methodSignature"].length; ++j) - object[".google.api.methodSignature"][j] = message[".google.api.methodSignature"][j]; - } - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) - object[".google.api.http"] = $root.google.api.HttpRule.toObject(message[".google.api.http"], options); - return object; - }; - - /** - * Converts this MethodOptions to JSON. - * @function toJSON - * @memberof google.protobuf.MethodOptions - * @instance - * @returns {Object.} JSON object - */ - MethodOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * IdempotencyLevel enum. - * @name google.protobuf.MethodOptions.IdempotencyLevel - * @enum {string} - * @property {number} IDEMPOTENCY_UNKNOWN=0 IDEMPOTENCY_UNKNOWN value - * @property {number} NO_SIDE_EFFECTS=1 NO_SIDE_EFFECTS value - * @property {number} IDEMPOTENT=2 IDEMPOTENT value - */ - MethodOptions.IdempotencyLevel = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "IDEMPOTENCY_UNKNOWN"] = 0; - values[valuesById[1] = "NO_SIDE_EFFECTS"] = 1; - values[valuesById[2] = "IDEMPOTENT"] = 2; - return values; - })(); - - return MethodOptions; - })(); - - protobuf.UninterpretedOption = (function() { - - /** - * Properties of an UninterpretedOption. - * @memberof google.protobuf - * @interface IUninterpretedOption - * @property {Array.|null} [name] UninterpretedOption name - * @property {string|null} [identifierValue] UninterpretedOption identifierValue - * @property {number|Long|null} [positiveIntValue] UninterpretedOption positiveIntValue - * @property {number|Long|null} [negativeIntValue] UninterpretedOption negativeIntValue - * @property {number|null} [doubleValue] UninterpretedOption doubleValue - * @property {Uint8Array|null} [stringValue] UninterpretedOption stringValue - * @property {string|null} [aggregateValue] UninterpretedOption aggregateValue - */ - - /** - * Constructs a new UninterpretedOption. - * @memberof google.protobuf - * @classdesc Represents an UninterpretedOption. - * @implements IUninterpretedOption - * @constructor - * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set - */ - function UninterpretedOption(properties) { - this.name = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * UninterpretedOption name. - * @member {Array.} name - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.name = $util.emptyArray; - - /** - * UninterpretedOption identifierValue. - * @member {string} identifierValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.identifierValue = ""; - - /** - * UninterpretedOption positiveIntValue. - * @member {number|Long} positiveIntValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.positiveIntValue = $util.Long ? $util.Long.fromBits(0,0,true) : 0; - - /** - * UninterpretedOption negativeIntValue. - * @member {number|Long} negativeIntValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.negativeIntValue = $util.Long ? $util.Long.fromBits(0,0,false) : 0; - - /** - * UninterpretedOption doubleValue. - * @member {number} doubleValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.doubleValue = 0; - - /** - * UninterpretedOption stringValue. - * @member {Uint8Array} stringValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.stringValue = $util.newBuffer([]); - - /** - * UninterpretedOption aggregateValue. - * @member {string} aggregateValue - * @memberof google.protobuf.UninterpretedOption - * @instance - */ - UninterpretedOption.prototype.aggregateValue = ""; - - /** - * Creates a new UninterpretedOption instance using the specified properties. - * @function create - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set - * @returns {google.protobuf.UninterpretedOption} UninterpretedOption instance - */ - UninterpretedOption.create = function create(properties) { - return new UninterpretedOption(properties); - }; - - /** - * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @function encode - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UninterpretedOption.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.name.length) - for (var i = 0; i < message.name.length; ++i) - $root.google.protobuf.UninterpretedOption.NamePart.encode(message.name[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.identifierValue); - if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) - writer.uint32(/* id 4, wireType 0 =*/32).uint64(message.positiveIntValue); - if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) - writer.uint32(/* id 5, wireType 0 =*/40).int64(message.negativeIntValue); - if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) - writer.uint32(/* id 6, wireType 1 =*/49).double(message.doubleValue); - if (message.stringValue != null && message.hasOwnProperty("stringValue")) - writer.uint32(/* id 7, wireType 2 =*/58).bytes(message.stringValue); - if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) - writer.uint32(/* id 8, wireType 2 =*/66).string(message.aggregateValue); - return writer; - }; - - /** - * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UninterpretedOption.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an UninterpretedOption message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.UninterpretedOption} UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UninterpretedOption.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 2: - if (!(message.name && message.name.length)) - message.name = []; - message.name.push($root.google.protobuf.UninterpretedOption.NamePart.decode(reader, reader.uint32())); - break; - case 3: - message.identifierValue = reader.string(); - break; - case 4: - message.positiveIntValue = reader.uint64(); - break; - case 5: - message.negativeIntValue = reader.int64(); - break; - case 6: - message.doubleValue = reader.double(); - break; - case 7: - message.stringValue = reader.bytes(); - break; - case 8: - message.aggregateValue = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.UninterpretedOption} UninterpretedOption - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UninterpretedOption.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an UninterpretedOption message. - * @function verify - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - UninterpretedOption.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) { - if (!Array.isArray(message.name)) - return "name: array expected"; - for (var i = 0; i < message.name.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.NamePart.verify(message.name[i]); - if (error) - return "name." + error; - } - } - if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) - if (!$util.isString(message.identifierValue)) - return "identifierValue: string expected"; - if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) - if (!$util.isInteger(message.positiveIntValue) && !(message.positiveIntValue && $util.isInteger(message.positiveIntValue.low) && $util.isInteger(message.positiveIntValue.high))) - return "positiveIntValue: integer|Long expected"; - if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) - if (!$util.isInteger(message.negativeIntValue) && !(message.negativeIntValue && $util.isInteger(message.negativeIntValue.low) && $util.isInteger(message.negativeIntValue.high))) - return "negativeIntValue: integer|Long expected"; - if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) - if (typeof message.doubleValue !== "number") - return "doubleValue: number expected"; - if (message.stringValue != null && message.hasOwnProperty("stringValue")) - if (!(message.stringValue && typeof message.stringValue.length === "number" || $util.isString(message.stringValue))) - return "stringValue: buffer expected"; - if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) - if (!$util.isString(message.aggregateValue)) - return "aggregateValue: string expected"; - return null; - }; - - /** - * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.UninterpretedOption} UninterpretedOption - */ - UninterpretedOption.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.UninterpretedOption) - return object; - var message = new $root.google.protobuf.UninterpretedOption(); - if (object.name) { - if (!Array.isArray(object.name)) - throw TypeError(".google.protobuf.UninterpretedOption.name: array expected"); - message.name = []; - for (var i = 0; i < object.name.length; ++i) { - if (typeof object.name[i] !== "object") - throw TypeError(".google.protobuf.UninterpretedOption.name: object expected"); - message.name[i] = $root.google.protobuf.UninterpretedOption.NamePart.fromObject(object.name[i]); - } - } - if (object.identifierValue != null) - message.identifierValue = String(object.identifierValue); - if (object.positiveIntValue != null) - if ($util.Long) - (message.positiveIntValue = $util.Long.fromValue(object.positiveIntValue)).unsigned = true; - else if (typeof object.positiveIntValue === "string") - message.positiveIntValue = parseInt(object.positiveIntValue, 10); - else if (typeof object.positiveIntValue === "number") - message.positiveIntValue = object.positiveIntValue; - else if (typeof object.positiveIntValue === "object") - message.positiveIntValue = new $util.LongBits(object.positiveIntValue.low >>> 0, object.positiveIntValue.high >>> 0).toNumber(true); - if (object.negativeIntValue != null) - if ($util.Long) - (message.negativeIntValue = $util.Long.fromValue(object.negativeIntValue)).unsigned = false; - else if (typeof object.negativeIntValue === "string") - message.negativeIntValue = parseInt(object.negativeIntValue, 10); - else if (typeof object.negativeIntValue === "number") - message.negativeIntValue = object.negativeIntValue; - else if (typeof object.negativeIntValue === "object") - message.negativeIntValue = new $util.LongBits(object.negativeIntValue.low >>> 0, object.negativeIntValue.high >>> 0).toNumber(); - if (object.doubleValue != null) - message.doubleValue = Number(object.doubleValue); - if (object.stringValue != null) - if (typeof object.stringValue === "string") - $util.base64.decode(object.stringValue, message.stringValue = $util.newBuffer($util.base64.length(object.stringValue)), 0); - else if (object.stringValue.length) - message.stringValue = object.stringValue; - if (object.aggregateValue != null) - message.aggregateValue = String(object.aggregateValue); - return message; - }; - - /** - * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.UninterpretedOption - * @static - * @param {google.protobuf.UninterpretedOption} message UninterpretedOption - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - UninterpretedOption.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.name = []; - if (options.defaults) { - object.identifierValue = ""; - if ($util.Long) { - var long = new $util.Long(0, 0, true); - object.positiveIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.positiveIntValue = options.longs === String ? "0" : 0; - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.negativeIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.negativeIntValue = options.longs === String ? "0" : 0; - object.doubleValue = 0; - if (options.bytes === String) - object.stringValue = ""; - else { - object.stringValue = []; - if (options.bytes !== Array) - object.stringValue = $util.newBuffer(object.stringValue); - } - object.aggregateValue = ""; - } - if (message.name && message.name.length) { - object.name = []; - for (var j = 0; j < message.name.length; ++j) - object.name[j] = $root.google.protobuf.UninterpretedOption.NamePart.toObject(message.name[j], options); - } - if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) - object.identifierValue = message.identifierValue; - if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) - if (typeof message.positiveIntValue === "number") - object.positiveIntValue = options.longs === String ? String(message.positiveIntValue) : message.positiveIntValue; - else - object.positiveIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.positiveIntValue) : options.longs === Number ? new $util.LongBits(message.positiveIntValue.low >>> 0, message.positiveIntValue.high >>> 0).toNumber(true) : message.positiveIntValue; - if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) - if (typeof message.negativeIntValue === "number") - object.negativeIntValue = options.longs === String ? String(message.negativeIntValue) : message.negativeIntValue; - else - object.negativeIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.negativeIntValue) : options.longs === Number ? new $util.LongBits(message.negativeIntValue.low >>> 0, message.negativeIntValue.high >>> 0).toNumber() : message.negativeIntValue; - if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) - object.doubleValue = options.json && !isFinite(message.doubleValue) ? String(message.doubleValue) : message.doubleValue; - if (message.stringValue != null && message.hasOwnProperty("stringValue")) - object.stringValue = options.bytes === String ? $util.base64.encode(message.stringValue, 0, message.stringValue.length) : options.bytes === Array ? Array.prototype.slice.call(message.stringValue) : message.stringValue; - if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) - object.aggregateValue = message.aggregateValue; - return object; - }; - - /** - * Converts this UninterpretedOption to JSON. - * @function toJSON - * @memberof google.protobuf.UninterpretedOption - * @instance - * @returns {Object.} JSON object - */ - UninterpretedOption.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - UninterpretedOption.NamePart = (function() { - - /** - * Properties of a NamePart. - * @memberof google.protobuf.UninterpretedOption - * @interface INamePart - * @property {string} namePart NamePart namePart - * @property {boolean} isExtension NamePart isExtension - */ - - /** - * Constructs a new NamePart. - * @memberof google.protobuf.UninterpretedOption - * @classdesc Represents a NamePart. - * @implements INamePart - * @constructor - * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set - */ - function NamePart(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * NamePart namePart. - * @member {string} namePart - * @memberof google.protobuf.UninterpretedOption.NamePart - * @instance - */ - NamePart.prototype.namePart = ""; - - /** - * NamePart isExtension. - * @member {boolean} isExtension - * @memberof google.protobuf.UninterpretedOption.NamePart - * @instance - */ - NamePart.prototype.isExtension = false; - - /** - * Creates a new NamePart instance using the specified properties. - * @function create - * @memberof google.protobuf.UninterpretedOption.NamePart - * @static - * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set - * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart instance - */ - NamePart.create = function create(properties) { - return new NamePart(properties); - }; - - /** - * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @function encode - * @memberof google.protobuf.UninterpretedOption.NamePart - * @static - * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - NamePart.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - writer.uint32(/* id 1, wireType 2 =*/10).string(message.namePart); - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.isExtension); - return writer; - }; - - /** - * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.UninterpretedOption.NamePart - * @static - * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - NamePart.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a NamePart message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.UninterpretedOption.NamePart - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - NamePart.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption.NamePart(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.namePart = reader.string(); - break; - case 2: - message.isExtension = reader.bool(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - if (!message.hasOwnProperty("namePart")) - throw $util.ProtocolError("missing required 'namePart'", { instance: message }); - if (!message.hasOwnProperty("isExtension")) - throw $util.ProtocolError("missing required 'isExtension'", { instance: message }); - return message; - }; - - /** - * Decodes a NamePart message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.UninterpretedOption.NamePart - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - NamePart.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a NamePart message. - * @function verify - * @memberof google.protobuf.UninterpretedOption.NamePart - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - NamePart.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (!$util.isString(message.namePart)) - return "namePart: string expected"; - if (typeof message.isExtension !== "boolean") - return "isExtension: boolean expected"; - return null; - }; - - /** - * Creates a NamePart message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.UninterpretedOption.NamePart - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart - */ - NamePart.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.UninterpretedOption.NamePart) - return object; - var message = new $root.google.protobuf.UninterpretedOption.NamePart(); - if (object.namePart != null) - message.namePart = String(object.namePart); - if (object.isExtension != null) - message.isExtension = Boolean(object.isExtension); - return message; - }; - - /** - * Creates a plain object from a NamePart message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.UninterpretedOption.NamePart - * @static - * @param {google.protobuf.UninterpretedOption.NamePart} message NamePart - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - NamePart.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.namePart = ""; - object.isExtension = false; - } - if (message.namePart != null && message.hasOwnProperty("namePart")) - object.namePart = message.namePart; - if (message.isExtension != null && message.hasOwnProperty("isExtension")) - object.isExtension = message.isExtension; - return object; - }; - - /** - * Converts this NamePart to JSON. - * @function toJSON - * @memberof google.protobuf.UninterpretedOption.NamePart - * @instance - * @returns {Object.} JSON object - */ - NamePart.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return NamePart; - })(); - - return UninterpretedOption; - })(); - - protobuf.SourceCodeInfo = (function() { - - /** - * Properties of a SourceCodeInfo. - * @memberof google.protobuf - * @interface ISourceCodeInfo - * @property {Array.|null} [location] SourceCodeInfo location - */ - - /** - * Constructs a new SourceCodeInfo. - * @memberof google.protobuf - * @classdesc Represents a SourceCodeInfo. - * @implements ISourceCodeInfo - * @constructor - * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set - */ - function SourceCodeInfo(properties) { - this.location = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * SourceCodeInfo location. - * @member {Array.} location - * @memberof google.protobuf.SourceCodeInfo - * @instance - */ - SourceCodeInfo.prototype.location = $util.emptyArray; - - /** - * Creates a new SourceCodeInfo instance using the specified properties. - * @function create - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set - * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo instance - */ - SourceCodeInfo.create = function create(properties) { - return new SourceCodeInfo(properties); - }; - - /** - * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @function encode - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SourceCodeInfo.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.location != null && message.location.length) - for (var i = 0; i < message.location.length; ++i) - $root.google.protobuf.SourceCodeInfo.Location.encode(message.location[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SourceCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SourceCodeInfo.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.location && message.location.length)) - message.location = []; - message.location.push($root.google.protobuf.SourceCodeInfo.Location.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SourceCodeInfo.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a SourceCodeInfo message. - * @function verify - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - SourceCodeInfo.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.location != null && message.hasOwnProperty("location")) { - if (!Array.isArray(message.location)) - return "location: array expected"; - for (var i = 0; i < message.location.length; ++i) { - var error = $root.google.protobuf.SourceCodeInfo.Location.verify(message.location[i]); - if (error) - return "location." + error; - } - } - return null; - }; - - /** - * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo - */ - SourceCodeInfo.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.SourceCodeInfo) - return object; - var message = new $root.google.protobuf.SourceCodeInfo(); - if (object.location) { - if (!Array.isArray(object.location)) - throw TypeError(".google.protobuf.SourceCodeInfo.location: array expected"); - message.location = []; - for (var i = 0; i < object.location.length; ++i) { - if (typeof object.location[i] !== "object") - throw TypeError(".google.protobuf.SourceCodeInfo.location: object expected"); - message.location[i] = $root.google.protobuf.SourceCodeInfo.Location.fromObject(object.location[i]); - } - } - return message; - }; - - /** - * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.SourceCodeInfo - * @static - * @param {google.protobuf.SourceCodeInfo} message SourceCodeInfo - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - SourceCodeInfo.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.location = []; - if (message.location && message.location.length) { - object.location = []; - for (var j = 0; j < message.location.length; ++j) - object.location[j] = $root.google.protobuf.SourceCodeInfo.Location.toObject(message.location[j], options); - } - return object; - }; - - /** - * Converts this SourceCodeInfo to JSON. - * @function toJSON - * @memberof google.protobuf.SourceCodeInfo - * @instance - * @returns {Object.} JSON object - */ - SourceCodeInfo.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - SourceCodeInfo.Location = (function() { - - /** - * Properties of a Location. - * @memberof google.protobuf.SourceCodeInfo - * @interface ILocation - * @property {Array.|null} [path] Location path - * @property {Array.|null} [span] Location span - * @property {string|null} [leadingComments] Location leadingComments - * @property {string|null} [trailingComments] Location trailingComments - * @property {Array.|null} [leadingDetachedComments] Location leadingDetachedComments - */ - - /** - * Constructs a new Location. - * @memberof google.protobuf.SourceCodeInfo - * @classdesc Represents a Location. - * @implements ILocation - * @constructor - * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set - */ - function Location(properties) { - this.path = []; - this.span = []; - this.leadingDetachedComments = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Location path. - * @member {Array.} path - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - */ - Location.prototype.path = $util.emptyArray; - - /** - * Location span. - * @member {Array.} span - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - */ - Location.prototype.span = $util.emptyArray; - - /** - * Location leadingComments. - * @member {string} leadingComments - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - */ - Location.prototype.leadingComments = ""; - - /** - * Location trailingComments. - * @member {string} trailingComments - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - */ - Location.prototype.trailingComments = ""; - - /** - * Location leadingDetachedComments. - * @member {Array.} leadingDetachedComments - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - */ - Location.prototype.leadingDetachedComments = $util.emptyArray; - - /** - * Creates a new Location instance using the specified properties. - * @function create - * @memberof google.protobuf.SourceCodeInfo.Location - * @static - * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set - * @returns {google.protobuf.SourceCodeInfo.Location} Location instance - */ - Location.create = function create(properties) { - return new Location(properties); - }; - - /** - * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @function encode - * @memberof google.protobuf.SourceCodeInfo.Location - * @static - * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Location.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.path != null && message.path.length) { - writer.uint32(/* id 1, wireType 2 =*/10).fork(); - for (var i = 0; i < message.path.length; ++i) - writer.int32(message.path[i]); - writer.ldelim(); - } - if (message.span != null && message.span.length) { - writer.uint32(/* id 2, wireType 2 =*/18).fork(); - for (var i = 0; i < message.span.length; ++i) - writer.int32(message.span[i]); - writer.ldelim(); - } - if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.leadingComments); - if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.trailingComments); - if (message.leadingDetachedComments != null && message.leadingDetachedComments.length) - for (var i = 0; i < message.leadingDetachedComments.length; ++i) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.leadingDetachedComments[i]); - return writer; - }; - - /** - * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.SourceCodeInfo.Location - * @static - * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Location.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a Location message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.SourceCodeInfo.Location - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.SourceCodeInfo.Location} Location - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Location.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo.Location(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.path && message.path.length)) - message.path = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.path.push(reader.int32()); - } else - message.path.push(reader.int32()); - break; - case 2: - if (!(message.span && message.span.length)) - message.span = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.span.push(reader.int32()); - } else - message.span.push(reader.int32()); - break; - case 3: - message.leadingComments = reader.string(); - break; - case 4: - message.trailingComments = reader.string(); - break; - case 6: - if (!(message.leadingDetachedComments && message.leadingDetachedComments.length)) - message.leadingDetachedComments = []; - message.leadingDetachedComments.push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a Location message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.SourceCodeInfo.Location - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.SourceCodeInfo.Location} Location - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Location.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a Location message. - * @function verify - * @memberof google.protobuf.SourceCodeInfo.Location - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Location.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.path != null && message.hasOwnProperty("path")) { - if (!Array.isArray(message.path)) - return "path: array expected"; - for (var i = 0; i < message.path.length; ++i) - if (!$util.isInteger(message.path[i])) - return "path: integer[] expected"; - } - if (message.span != null && message.hasOwnProperty("span")) { - if (!Array.isArray(message.span)) - return "span: array expected"; - for (var i = 0; i < message.span.length; ++i) - if (!$util.isInteger(message.span[i])) - return "span: integer[] expected"; - } - if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) - if (!$util.isString(message.leadingComments)) - return "leadingComments: string expected"; - if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) - if (!$util.isString(message.trailingComments)) - return "trailingComments: string expected"; - if (message.leadingDetachedComments != null && message.hasOwnProperty("leadingDetachedComments")) { - if (!Array.isArray(message.leadingDetachedComments)) - return "leadingDetachedComments: array expected"; - for (var i = 0; i < message.leadingDetachedComments.length; ++i) - if (!$util.isString(message.leadingDetachedComments[i])) - return "leadingDetachedComments: string[] expected"; - } - return null; - }; - - /** - * Creates a Location message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.SourceCodeInfo.Location - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.SourceCodeInfo.Location} Location - */ - Location.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.SourceCodeInfo.Location) - return object; - var message = new $root.google.protobuf.SourceCodeInfo.Location(); - if (object.path) { - if (!Array.isArray(object.path)) - throw TypeError(".google.protobuf.SourceCodeInfo.Location.path: array expected"); - message.path = []; - for (var i = 0; i < object.path.length; ++i) - message.path[i] = object.path[i] | 0; - } - if (object.span) { - if (!Array.isArray(object.span)) - throw TypeError(".google.protobuf.SourceCodeInfo.Location.span: array expected"); - message.span = []; - for (var i = 0; i < object.span.length; ++i) - message.span[i] = object.span[i] | 0; - } - if (object.leadingComments != null) - message.leadingComments = String(object.leadingComments); - if (object.trailingComments != null) - message.trailingComments = String(object.trailingComments); - if (object.leadingDetachedComments) { - if (!Array.isArray(object.leadingDetachedComments)) - throw TypeError(".google.protobuf.SourceCodeInfo.Location.leadingDetachedComments: array expected"); - message.leadingDetachedComments = []; - for (var i = 0; i < object.leadingDetachedComments.length; ++i) - message.leadingDetachedComments[i] = String(object.leadingDetachedComments[i]); - } - return message; - }; - - /** - * Creates a plain object from a Location message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.SourceCodeInfo.Location - * @static - * @param {google.protobuf.SourceCodeInfo.Location} message Location - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Location.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.path = []; - object.span = []; - object.leadingDetachedComments = []; - } - if (options.defaults) { - object.leadingComments = ""; - object.trailingComments = ""; - } - if (message.path && message.path.length) { - object.path = []; - for (var j = 0; j < message.path.length; ++j) - object.path[j] = message.path[j]; - } - if (message.span && message.span.length) { - object.span = []; - for (var j = 0; j < message.span.length; ++j) - object.span[j] = message.span[j]; - } - if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) - object.leadingComments = message.leadingComments; - if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) - object.trailingComments = message.trailingComments; - if (message.leadingDetachedComments && message.leadingDetachedComments.length) { - object.leadingDetachedComments = []; - for (var j = 0; j < message.leadingDetachedComments.length; ++j) - object.leadingDetachedComments[j] = message.leadingDetachedComments[j]; - } - return object; - }; - - /** - * Converts this Location to JSON. - * @function toJSON - * @memberof google.protobuf.SourceCodeInfo.Location - * @instance - * @returns {Object.} JSON object - */ - Location.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return Location; - })(); - - return SourceCodeInfo; - })(); - - protobuf.GeneratedCodeInfo = (function() { - - /** - * Properties of a GeneratedCodeInfo. - * @memberof google.protobuf - * @interface IGeneratedCodeInfo - * @property {Array.|null} [annotation] GeneratedCodeInfo annotation - */ - - /** - * Constructs a new GeneratedCodeInfo. - * @memberof google.protobuf - * @classdesc Represents a GeneratedCodeInfo. - * @implements IGeneratedCodeInfo - * @constructor - * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set - */ - function GeneratedCodeInfo(properties) { - this.annotation = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * GeneratedCodeInfo annotation. - * @member {Array.} annotation - * @memberof google.protobuf.GeneratedCodeInfo - * @instance - */ - GeneratedCodeInfo.prototype.annotation = $util.emptyArray; - - /** - * Creates a new GeneratedCodeInfo instance using the specified properties. - * @function create - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set - * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo instance - */ - GeneratedCodeInfo.create = function create(properties) { - return new GeneratedCodeInfo(properties); - }; - - /** - * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @function encode - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GeneratedCodeInfo.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.annotation != null && message.annotation.length) - for (var i = 0; i < message.annotation.length; ++i) - $root.google.protobuf.GeneratedCodeInfo.Annotation.encode(message.annotation[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GeneratedCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GeneratedCodeInfo.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.annotation && message.annotation.length)) - message.annotation = []; - message.annotation.push($root.google.protobuf.GeneratedCodeInfo.Annotation.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GeneratedCodeInfo.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a GeneratedCodeInfo message. - * @function verify - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - GeneratedCodeInfo.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.annotation != null && message.hasOwnProperty("annotation")) { - if (!Array.isArray(message.annotation)) - return "annotation: array expected"; - for (var i = 0; i < message.annotation.length; ++i) { - var error = $root.google.protobuf.GeneratedCodeInfo.Annotation.verify(message.annotation[i]); - if (error) - return "annotation." + error; - } - } - return null; - }; - - /** - * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo - */ - GeneratedCodeInfo.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.GeneratedCodeInfo) - return object; - var message = new $root.google.protobuf.GeneratedCodeInfo(); - if (object.annotation) { - if (!Array.isArray(object.annotation)) - throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: array expected"); - message.annotation = []; - for (var i = 0; i < object.annotation.length; ++i) { - if (typeof object.annotation[i] !== "object") - throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: object expected"); - message.annotation[i] = $root.google.protobuf.GeneratedCodeInfo.Annotation.fromObject(object.annotation[i]); - } - } - return message; - }; - - /** - * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.GeneratedCodeInfo - * @static - * @param {google.protobuf.GeneratedCodeInfo} message GeneratedCodeInfo - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - GeneratedCodeInfo.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.annotation = []; - if (message.annotation && message.annotation.length) { - object.annotation = []; - for (var j = 0; j < message.annotation.length; ++j) - object.annotation[j] = $root.google.protobuf.GeneratedCodeInfo.Annotation.toObject(message.annotation[j], options); - } - return object; - }; - - /** - * Converts this GeneratedCodeInfo to JSON. - * @function toJSON - * @memberof google.protobuf.GeneratedCodeInfo - * @instance - * @returns {Object.} JSON object - */ - GeneratedCodeInfo.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - GeneratedCodeInfo.Annotation = (function() { - - /** - * Properties of an Annotation. - * @memberof google.protobuf.GeneratedCodeInfo - * @interface IAnnotation - * @property {Array.|null} [path] Annotation path - * @property {string|null} [sourceFile] Annotation sourceFile - * @property {number|null} [begin] Annotation begin - * @property {number|null} [end] Annotation end - */ - - /** - * Constructs a new Annotation. - * @memberof google.protobuf.GeneratedCodeInfo - * @classdesc Represents an Annotation. - * @implements IAnnotation - * @constructor - * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set - */ - function Annotation(properties) { - this.path = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Annotation path. - * @member {Array.} path - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @instance - */ - Annotation.prototype.path = $util.emptyArray; - - /** - * Annotation sourceFile. - * @member {string} sourceFile - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @instance - */ - Annotation.prototype.sourceFile = ""; - - /** - * Annotation begin. - * @member {number} begin - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @instance - */ - Annotation.prototype.begin = 0; - - /** - * Annotation end. - * @member {number} end - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @instance - */ - Annotation.prototype.end = 0; - - /** - * Creates a new Annotation instance using the specified properties. - * @function create - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set - * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation instance - */ - Annotation.create = function create(properties) { - return new Annotation(properties); - }; - - /** - * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @function encode - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Annotation.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.path != null && message.path.length) { - writer.uint32(/* id 1, wireType 2 =*/10).fork(); - for (var i = 0; i < message.path.length; ++i) - writer.int32(message.path[i]); - writer.ldelim(); - } - if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.sourceFile); - if (message.begin != null && message.hasOwnProperty("begin")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.begin); - if (message.end != null && message.hasOwnProperty("end")) - writer.uint32(/* id 4, wireType 0 =*/32).int32(message.end); - return writer; - }; - - /** - * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Annotation.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an Annotation message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Annotation.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.path && message.path.length)) - message.path = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.path.push(reader.int32()); - } else - message.path.push(reader.int32()); - break; - case 2: - message.sourceFile = reader.string(); - break; - case 3: - message.begin = reader.int32(); - break; - case 4: - message.end = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an Annotation message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Annotation.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an Annotation message. - * @function verify - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Annotation.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.path != null && message.hasOwnProperty("path")) { - if (!Array.isArray(message.path)) - return "path: array expected"; - for (var i = 0; i < message.path.length; ++i) - if (!$util.isInteger(message.path[i])) - return "path: integer[] expected"; - } - if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) - if (!$util.isString(message.sourceFile)) - return "sourceFile: string expected"; - if (message.begin != null && message.hasOwnProperty("begin")) - if (!$util.isInteger(message.begin)) - return "begin: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; - return null; - }; - - /** - * Creates an Annotation message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation - */ - Annotation.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.GeneratedCodeInfo.Annotation) - return object; - var message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); - if (object.path) { - if (!Array.isArray(object.path)) - throw TypeError(".google.protobuf.GeneratedCodeInfo.Annotation.path: array expected"); - message.path = []; - for (var i = 0; i < object.path.length; ++i) - message.path[i] = object.path[i] | 0; - } - if (object.sourceFile != null) - message.sourceFile = String(object.sourceFile); - if (object.begin != null) - message.begin = object.begin | 0; - if (object.end != null) - message.end = object.end | 0; - return message; - }; - - /** - * Creates a plain object from an Annotation message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @static - * @param {google.protobuf.GeneratedCodeInfo.Annotation} message Annotation - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Annotation.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.path = []; - if (options.defaults) { - object.sourceFile = ""; - object.begin = 0; - object.end = 0; - } - if (message.path && message.path.length) { - object.path = []; - for (var j = 0; j < message.path.length; ++j) - object.path[j] = message.path[j]; - } - if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) - object.sourceFile = message.sourceFile; - if (message.begin != null && message.hasOwnProperty("begin")) - object.begin = message.begin; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; - return object; - }; - - /** - * Converts this Annotation to JSON. - * @function toJSON - * @memberof google.protobuf.GeneratedCodeInfo.Annotation - * @instance - * @returns {Object.} JSON object - */ - Annotation.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return Annotation; - })(); - - return GeneratedCodeInfo; - })(); - - protobuf.Duration = (function() { - - /** - * Properties of a Duration. - * @memberof google.protobuf - * @interface IDuration - * @property {number|Long|null} [seconds] Duration seconds - * @property {number|null} [nanos] Duration nanos - */ - - /** - * Constructs a new Duration. - * @memberof google.protobuf - * @classdesc Represents a Duration. - * @implements IDuration - * @constructor - * @param {google.protobuf.IDuration=} [properties] Properties to set - */ - function Duration(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Duration seconds. - * @member {number|Long} seconds - * @memberof google.protobuf.Duration - * @instance - */ - Duration.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; - - /** - * Duration nanos. - * @member {number} nanos - * @memberof google.protobuf.Duration - * @instance - */ - Duration.prototype.nanos = 0; - - /** - * Creates a new Duration instance using the specified properties. - * @function create - * @memberof google.protobuf.Duration - * @static - * @param {google.protobuf.IDuration=} [properties] Properties to set - * @returns {google.protobuf.Duration} Duration instance - */ - Duration.create = function create(properties) { - return new Duration(properties); - }; - - /** - * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @function encode - * @memberof google.protobuf.Duration - * @static - * @param {google.protobuf.IDuration} message Duration message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Duration.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.seconds != null && message.hasOwnProperty("seconds")) - writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); - if (message.nanos != null && message.hasOwnProperty("nanos")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); - return writer; - }; - - /** - * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.Duration - * @static - * @param {google.protobuf.IDuration} message Duration message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Duration.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a Duration message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.Duration - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.Duration} Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Duration.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Duration(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.seconds = reader.int64(); - break; - case 2: - message.nanos = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a Duration message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.Duration - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.Duration} Duration - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Duration.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a Duration message. - * @function verify - * @memberof google.protobuf.Duration - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Duration.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.seconds != null && message.hasOwnProperty("seconds")) - if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) - return "seconds: integer|Long expected"; - if (message.nanos != null && message.hasOwnProperty("nanos")) - if (!$util.isInteger(message.nanos)) - return "nanos: integer expected"; - return null; - }; - - /** - * Creates a Duration message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.Duration - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.Duration} Duration - */ - Duration.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.Duration) - return object; - var message = new $root.google.protobuf.Duration(); - if (object.seconds != null) - if ($util.Long) - (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; - else if (typeof object.seconds === "string") - message.seconds = parseInt(object.seconds, 10); - else if (typeof object.seconds === "number") - message.seconds = object.seconds; - else if (typeof object.seconds === "object") - message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); - if (object.nanos != null) - message.nanos = object.nanos | 0; - return message; - }; + /** + * Properties of a PullRequest. + * @memberof google.pubsub.v1 + * @interface IPullRequest + * @property {string|null} [subscription] PullRequest subscription + * @property {boolean|null} [returnImmediately] PullRequest returnImmediately + * @property {number|null} [maxMessages] PullRequest maxMessages + */ - /** - * Creates a plain object from a Duration message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.Duration - * @static - * @param {google.protobuf.Duration} message Duration - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Duration.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.seconds = options.longs === String ? "0" : 0; - object.nanos = 0; + /** + * Constructs a new PullRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a PullRequest. + * @implements IPullRequest + * @constructor + * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set + */ + function PullRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - if (message.seconds != null && message.hasOwnProperty("seconds")) - if (typeof message.seconds === "number") - object.seconds = options.longs === String ? String(message.seconds) : message.seconds; - else - object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; - if (message.nanos != null && message.hasOwnProperty("nanos")) - object.nanos = message.nanos; - return object; - }; - - /** - * Converts this Duration to JSON. - * @function toJSON - * @memberof google.protobuf.Duration - * @instance - * @returns {Object.} JSON object - */ - Duration.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return Duration; - })(); - - protobuf.Empty = (function() { - - /** - * Properties of an Empty. - * @memberof google.protobuf - * @interface IEmpty - */ - - /** - * Constructs a new Empty. - * @memberof google.protobuf - * @classdesc Represents an Empty. - * @implements IEmpty - * @constructor - * @param {google.protobuf.IEmpty=} [properties] Properties to set - */ - function Empty(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Creates a new Empty instance using the specified properties. - * @function create - * @memberof google.protobuf.Empty - * @static - * @param {google.protobuf.IEmpty=} [properties] Properties to set - * @returns {google.protobuf.Empty} Empty instance - */ - Empty.create = function create(properties) { - return new Empty(properties); - }; - - /** - * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @function encode - * @memberof google.protobuf.Empty - * @static - * @param {google.protobuf.IEmpty} message Empty message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Empty.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - return writer; - }; - - /** - * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.Empty - * @static - * @param {google.protobuf.IEmpty} message Empty message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Empty.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - /** - * Decodes an Empty message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.Empty - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.Empty} Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Empty.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Empty(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * PullRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.subscription = ""; - /** - * Decodes an Empty message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.Empty - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.Empty} Empty - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Empty.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * PullRequest returnImmediately. + * @member {boolean} returnImmediately + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.returnImmediately = false; - /** - * Verifies an Empty message. - * @function verify - * @memberof google.protobuf.Empty - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Empty.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - return null; - }; + /** + * PullRequest maxMessages. + * @member {number} maxMessages + * @memberof google.pubsub.v1.PullRequest + * @instance + */ + PullRequest.prototype.maxMessages = 0; - /** - * Creates an Empty message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.Empty - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.Empty} Empty - */ - Empty.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.Empty) - return object; - return new $root.google.protobuf.Empty(); - }; + /** + * Creates a new PullRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.PullRequest} PullRequest instance + */ + PullRequest.create = function create(properties) { + return new PullRequest(properties); + }; - /** - * Creates a plain object from an Empty message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.Empty - * @static - * @param {google.protobuf.Empty} message Empty - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Empty.toObject = function toObject() { - return {}; - }; + /** + * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.returnImmediately); + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.maxMessages); + return writer; + }; - /** - * Converts this Empty to JSON. - * @function toJSON - * @memberof google.protobuf.Empty - * @instance - * @returns {Object.} JSON object - */ - Empty.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - return Empty; - })(); + /** + * Decodes a PullRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PullRequest} PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + message.returnImmediately = reader.bool(); + break; + case 3: + message.maxMessages = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - protobuf.FieldMask = (function() { + /** + * Decodes a PullRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PullRequest} PullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Properties of a FieldMask. - * @memberof google.protobuf - * @interface IFieldMask - * @property {Array.|null} [paths] FieldMask paths - */ + /** + * Verifies a PullRequest message. + * @function verify + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PullRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + if (typeof message.returnImmediately !== "boolean") + return "returnImmediately: boolean expected"; + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + if (!$util.isInteger(message.maxMessages)) + return "maxMessages: integer expected"; + return null; + }; - /** - * Constructs a new FieldMask. - * @memberof google.protobuf - * @classdesc Represents a FieldMask. - * @implements IFieldMask - * @constructor - * @param {google.protobuf.IFieldMask=} [properties] Properties to set - */ - function FieldMask(properties) { - this.paths = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PullRequest} PullRequest + */ + PullRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PullRequest) + return object; + var message = new $root.google.pubsub.v1.PullRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.returnImmediately != null) + message.returnImmediately = Boolean(object.returnImmediately); + if (object.maxMessages != null) + message.maxMessages = object.maxMessages | 0; + return message; + }; - /** - * FieldMask paths. - * @member {Array.} paths - * @memberof google.protobuf.FieldMask - * @instance - */ - FieldMask.prototype.paths = $util.emptyArray; + /** + * Creates a plain object from a PullRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {google.pubsub.v1.PullRequest} message PullRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PullRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.subscription = ""; + object.returnImmediately = false; + object.maxMessages = 0; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + object.returnImmediately = message.returnImmediately; + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + object.maxMessages = message.maxMessages; + return object; + }; + + /** + * Converts this PullRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PullRequest + * @instance + * @returns {Object.} JSON object + */ + PullRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a new FieldMask instance using the specified properties. - * @function create - * @memberof google.protobuf.FieldMask - * @static - * @param {google.protobuf.IFieldMask=} [properties] Properties to set - * @returns {google.protobuf.FieldMask} FieldMask instance - */ - FieldMask.create = function create(properties) { - return new FieldMask(properties); - }; + return PullRequest; + })(); - /** - * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @function encode - * @memberof google.protobuf.FieldMask - * @static - * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldMask.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.paths != null && message.paths.length) - for (var i = 0; i < message.paths.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.paths[i]); - return writer; - }; + v1.PullResponse = (function() { - /** - * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.FieldMask - * @static - * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - FieldMask.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Properties of a PullResponse. + * @memberof google.pubsub.v1 + * @interface IPullResponse + * @property {Array.|null} [receivedMessages] PullResponse receivedMessages + */ - /** - * Decodes a FieldMask message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.FieldMask - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.FieldMask} FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldMask.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldMask(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.paths && message.paths.length)) - message.paths = []; - message.paths.push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Constructs a new PullResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a PullResponse. + * @implements IPullResponse + * @constructor + * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set + */ + function PullResponse(properties) { + this.receivedMessages = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return message; - }; - /** - * Decodes a FieldMask message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.FieldMask - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.FieldMask} FieldMask - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - FieldMask.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * PullResponse receivedMessages. + * @member {Array.} receivedMessages + * @memberof google.pubsub.v1.PullResponse + * @instance + */ + PullResponse.prototype.receivedMessages = $util.emptyArray; - /** - * Verifies a FieldMask message. - * @function verify - * @memberof google.protobuf.FieldMask - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - FieldMask.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.paths != null && message.hasOwnProperty("paths")) { - if (!Array.isArray(message.paths)) - return "paths: array expected"; - for (var i = 0; i < message.paths.length; ++i) - if (!$util.isString(message.paths[i])) - return "paths: string[] expected"; - } - return null; - }; + /** + * Creates a new PullResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.PullResponse} PullResponse instance + */ + PullResponse.create = function create(properties) { + return new PullResponse(properties); + }; - /** - * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.FieldMask - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.FieldMask} FieldMask - */ - FieldMask.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.FieldMask) - return object; - var message = new $root.google.protobuf.FieldMask(); - if (object.paths) { - if (!Array.isArray(object.paths)) - throw TypeError(".google.protobuf.FieldMask.paths: array expected"); - message.paths = []; - for (var i = 0; i < object.paths.length; ++i) - message.paths[i] = String(object.paths[i]); - } - return message; - }; + /** + * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.receivedMessages != null && message.receivedMessages.length) + for (var i = 0; i < message.receivedMessages.length; ++i) + $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; - /** - * Creates a plain object from a FieldMask message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.FieldMask - * @static - * @param {google.protobuf.FieldMask} message FieldMask - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - FieldMask.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.paths = []; - if (message.paths && message.paths.length) { - object.paths = []; - for (var j = 0; j < message.paths.length; ++j) - object.paths[j] = message.paths[j]; - } - return object; - }; + /** + * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PullResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PullResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PullResponse} PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.receivedMessages && message.receivedMessages.length)) + message.receivedMessages = []; + message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Converts this FieldMask to JSON. - * @function toJSON - * @memberof google.protobuf.FieldMask - * @instance - * @returns {Object.} JSON object - */ - FieldMask.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Decodes a PullResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PullResponse} PullResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PullResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - return FieldMask; - })(); + /** + * Verifies a PullResponse message. + * @function verify + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PullResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { + if (!Array.isArray(message.receivedMessages)) + return "receivedMessages: array expected"; + for (var i = 0; i < message.receivedMessages.length; ++i) { + var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); + if (error) + return "receivedMessages." + error; + } + } + return null; + }; - protobuf.Timestamp = (function() { + /** + * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PullResponse} PullResponse + */ + PullResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PullResponse) + return object; + var message = new $root.google.pubsub.v1.PullResponse(); + if (object.receivedMessages) { + if (!Array.isArray(object.receivedMessages)) + throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: array expected"); + message.receivedMessages = []; + for (var i = 0; i < object.receivedMessages.length; ++i) { + if (typeof object.receivedMessages[i] !== "object") + throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: object expected"); + message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); + } + } + return message; + }; - /** - * Properties of a Timestamp. - * @memberof google.protobuf - * @interface ITimestamp - * @property {number|Long|null} [seconds] Timestamp seconds - * @property {number|null} [nanos] Timestamp nanos - */ + /** + * Creates a plain object from a PullResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {google.pubsub.v1.PullResponse} message PullResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PullResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.receivedMessages = []; + if (message.receivedMessages && message.receivedMessages.length) { + object.receivedMessages = []; + for (var j = 0; j < message.receivedMessages.length; ++j) + object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); + } + return object; + }; - /** - * Constructs a new Timestamp. - * @memberof google.protobuf - * @classdesc Represents a Timestamp. - * @implements ITimestamp - * @constructor - * @param {google.protobuf.ITimestamp=} [properties] Properties to set - */ - function Timestamp(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Converts this PullResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PullResponse + * @instance + * @returns {Object.} JSON object + */ + PullResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Timestamp seconds. - * @member {number|Long} seconds - * @memberof google.protobuf.Timestamp - * @instance - */ - Timestamp.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + return PullResponse; + })(); - /** - * Timestamp nanos. - * @member {number} nanos - * @memberof google.protobuf.Timestamp - * @instance - */ - Timestamp.prototype.nanos = 0; + v1.ModifyAckDeadlineRequest = (function() { - /** - * Creates a new Timestamp instance using the specified properties. - * @function create - * @memberof google.protobuf.Timestamp - * @static - * @param {google.protobuf.ITimestamp=} [properties] Properties to set - * @returns {google.protobuf.Timestamp} Timestamp instance - */ - Timestamp.create = function create(properties) { - return new Timestamp(properties); - }; + /** + * Properties of a ModifyAckDeadlineRequest. + * @memberof google.pubsub.v1 + * @interface IModifyAckDeadlineRequest + * @property {string|null} [subscription] ModifyAckDeadlineRequest subscription + * @property {Array.|null} [ackIds] ModifyAckDeadlineRequest ackIds + * @property {number|null} [ackDeadlineSeconds] ModifyAckDeadlineRequest ackDeadlineSeconds + */ - /** - * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @function encode - * @memberof google.protobuf.Timestamp - * @static - * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Timestamp.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.seconds != null && message.hasOwnProperty("seconds")) - writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); - if (message.nanos != null && message.hasOwnProperty("nanos")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); - return writer; - }; + /** + * Constructs a new ModifyAckDeadlineRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ModifyAckDeadlineRequest. + * @implements IModifyAckDeadlineRequest + * @constructor + * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set + */ + function ModifyAckDeadlineRequest(properties) { + this.ackIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.Timestamp - * @static - * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Timestamp.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * ModifyAckDeadlineRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.subscription = ""; - /** - * Decodes a Timestamp message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.Timestamp - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.Timestamp} Timestamp - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Timestamp.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Timestamp(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.seconds = reader.int64(); - break; - case 2: - message.nanos = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * ModifyAckDeadlineRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.ackIds = $util.emptyArray; + + /** + * ModifyAckDeadlineRequest ackDeadlineSeconds. + * @member {number} ackDeadlineSeconds + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + */ + ModifyAckDeadlineRequest.prototype.ackDeadlineSeconds = 0; - /** - * Decodes a Timestamp message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.Timestamp - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.Timestamp} Timestamp - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Timestamp.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a new ModifyAckDeadlineRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest instance + */ + ModifyAckDeadlineRequest.create = function create(properties) { + return new ModifyAckDeadlineRequest(properties); + }; - /** - * Verifies a Timestamp message. - * @function verify - * @memberof google.protobuf.Timestamp - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Timestamp.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.seconds != null && message.hasOwnProperty("seconds")) - if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) - return "seconds: integer|Long expected"; - if (message.nanos != null && message.hasOwnProperty("nanos")) - if (!$util.isInteger(message.nanos)) - return "nanos: integer expected"; - return null; - }; + /** + * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyAckDeadlineRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.ackDeadlineSeconds); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.ackIds[i]); + return writer; + }; - /** - * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.Timestamp - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.Timestamp} Timestamp - */ - Timestamp.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.Timestamp) - return object; - var message = new $root.google.protobuf.Timestamp(); - if (object.seconds != null) - if ($util.Long) - (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; - else if (typeof object.seconds === "string") - message.seconds = parseInt(object.seconds, 10); - else if (typeof object.seconds === "number") - message.seconds = object.seconds; - else if (typeof object.seconds === "object") - message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); - if (object.nanos != null) - message.nanos = object.nanos | 0; - return message; - }; + /** + * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyAckDeadlineRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a plain object from a Timestamp message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.Timestamp - * @static - * @param {google.protobuf.Timestamp} message Timestamp - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Timestamp.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.seconds = options.longs === String ? "0" : 0; - object.nanos = 0; - } - if (message.seconds != null && message.hasOwnProperty("seconds")) - if (typeof message.seconds === "number") - object.seconds = options.longs === String ? String(message.seconds) : message.seconds; - else - object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; - if (message.nanos != null && message.hasOwnProperty("nanos")) - object.nanos = message.nanos; - return object; - }; + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyAckDeadlineRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 4: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + case 3: + message.ackDeadlineSeconds = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Converts this Timestamp to JSON. - * @function toJSON - * @memberof google.protobuf.Timestamp - * @instance - * @returns {Object.} JSON object - */ - Timestamp.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyAckDeadlineRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - return Timestamp; - })(); + /** + * Verifies a ModifyAckDeadlineRequest message. + * @function verify + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ModifyAckDeadlineRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + if (!$util.isInteger(message.ackDeadlineSeconds)) + return "ackDeadlineSeconds: integer expected"; + return null; + }; - return protobuf; - })(); + /** + * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest + */ + ModifyAckDeadlineRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ModifyAckDeadlineRequest) + return object; + var message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.ModifyAckDeadlineRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + if (object.ackDeadlineSeconds != null) + message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; + return message; + }; - google.pubsub = (function() { + /** + * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {google.pubsub.v1.ModifyAckDeadlineRequest} message ModifyAckDeadlineRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ModifyAckDeadlineRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.ackIds = []; + if (options.defaults) { + object.subscription = ""; + object.ackDeadlineSeconds = 0; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + object.ackDeadlineSeconds = message.ackDeadlineSeconds; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + return object; + }; - /** - * Namespace pubsub. - * @memberof google - * @namespace - */ - var pubsub = {}; + /** + * Converts this ModifyAckDeadlineRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @instance + * @returns {Object.} JSON object + */ + ModifyAckDeadlineRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - pubsub.v1 = (function() { + return ModifyAckDeadlineRequest; + })(); - /** - * Namespace v1. - * @memberof google.pubsub - * @namespace - */ - var v1 = {}; + v1.AcknowledgeRequest = (function() { - v1.Publisher = (function() { + /** + * Properties of an AcknowledgeRequest. + * @memberof google.pubsub.v1 + * @interface IAcknowledgeRequest + * @property {string|null} [subscription] AcknowledgeRequest subscription + * @property {Array.|null} [ackIds] AcknowledgeRequest ackIds + */ /** - * Constructs a new Publisher service. + * Constructs a new AcknowledgeRequest. * @memberof google.pubsub.v1 - * @classdesc Represents a Publisher - * @extends $protobuf.rpc.Service + * @classdesc Represents an AcknowledgeRequest. + * @implements IAcknowledgeRequest * @constructor - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set */ - function Publisher(rpcImpl, requestDelimited, responseDelimited) { - $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + function AcknowledgeRequest(properties) { + this.ackIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - (Publisher.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Publisher; + /** + * AcknowledgeRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.AcknowledgeRequest + * @instance + */ + AcknowledgeRequest.prototype.subscription = ""; /** - * Creates new Publisher service using the specified rpc implementation. + * AcknowledgeRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.AcknowledgeRequest + * @instance + */ + AcknowledgeRequest.prototype.ackIds = $util.emptyArray; + + /** + * Creates a new AcknowledgeRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.Publisher + * @memberof google.pubsub.v1.AcknowledgeRequest * @static - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - * @returns {Publisher} RPC service. Useful where requests and/or responses are streamed. + * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest instance */ - Publisher.create = function create(rpcImpl, requestDelimited, responseDelimited) { - return new this(rpcImpl, requestDelimited, responseDelimited); + AcknowledgeRequest.create = function create(properties) { + return new AcknowledgeRequest(properties); }; /** - * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. - * @memberof google.pubsub.v1.Publisher - * @typedef CreateTopicCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Topic} [response] Topic + * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AcknowledgeRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); + return writer; + }; + + /** + * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ + AcknowledgeRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; /** - * Calls CreateTopic. - * @function createTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.ITopic} request Topic message or plain object - * @param {google.pubsub.v1.Publisher.CreateTopicCallback} callback Node-style callback called with the error, if any, and Topic - * @returns {undefined} - * @variation 1 + * Decodes an AcknowledgeRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Object.defineProperty(Publisher.prototype.createTopic = function createTopic(request, callback) { - return this.rpcCall(createTopic, $root.google.pubsub.v1.Topic, $root.google.pubsub.v1.Topic, request, callback); - }, "name", { value: "CreateTopic" }); + AcknowledgeRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.AcknowledgeRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; /** - * Calls CreateTopic. - * @function createTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.ITopic} request Topic message or plain object - * @returns {Promise} Promise - * @variation 2 + * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ + AcknowledgeRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; /** - * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. - * @memberof google.pubsub.v1.Publisher - * @typedef UpdateTopicCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Topic} [response] Topic + * Verifies an AcknowledgeRequest message. + * @function verify + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AcknowledgeRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + return null; + }; + + /** + * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest */ + AcknowledgeRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.AcknowledgeRequest) + return object; + var message = new $root.google.pubsub.v1.AcknowledgeRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.AcknowledgeRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + return message; + }; /** - * Calls UpdateTopic. - * @function updateTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object - * @param {google.pubsub.v1.Publisher.UpdateTopicCallback} callback Node-style callback called with the error, if any, and Topic - * @returns {undefined} - * @variation 1 + * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {google.pubsub.v1.AcknowledgeRequest} message AcknowledgeRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object */ - Object.defineProperty(Publisher.prototype.updateTopic = function updateTopic(request, callback) { - return this.rpcCall(updateTopic, $root.google.pubsub.v1.UpdateTopicRequest, $root.google.pubsub.v1.Topic, request, callback); - }, "name", { value: "UpdateTopic" }); + AcknowledgeRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.ackIds = []; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + return object; + }; /** - * Calls UpdateTopic. - * @function updateTopic - * @memberof google.pubsub.v1.Publisher + * Converts this AcknowledgeRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.AcknowledgeRequest * @instance - * @param {google.pubsub.v1.IUpdateTopicRequest} request UpdateTopicRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * @returns {Object.} JSON object */ + AcknowledgeRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Callback as used by {@link google.pubsub.v1.Publisher#publish}. - * @memberof google.pubsub.v1.Publisher - * @typedef PublishCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.PublishResponse} [response] PublishResponse - */ + return AcknowledgeRequest; + })(); - /** - * Calls Publish. - * @function publish - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object - * @param {google.pubsub.v1.Publisher.PublishCallback} callback Node-style callback called with the error, if any, and PublishResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Publisher.prototype.publish = function publish(request, callback) { - return this.rpcCall(publish, $root.google.pubsub.v1.PublishRequest, $root.google.pubsub.v1.PublishResponse, request, callback); - }, "name", { value: "Publish" }); + v1.StreamingPullRequest = (function() { /** - * Calls Publish. - * @function publish - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IPublishRequest} request PublishRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Properties of a StreamingPullRequest. + * @memberof google.pubsub.v1 + * @interface IStreamingPullRequest + * @property {string|null} [subscription] StreamingPullRequest subscription + * @property {Array.|null} [ackIds] StreamingPullRequest ackIds + * @property {Array.|null} [modifyDeadlineSeconds] StreamingPullRequest modifyDeadlineSeconds + * @property {Array.|null} [modifyDeadlineAckIds] StreamingPullRequest modifyDeadlineAckIds + * @property {number|null} [streamAckDeadlineSeconds] StreamingPullRequest streamAckDeadlineSeconds + * @property {string|null} [clientId] StreamingPullRequest clientId */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. - * @memberof google.pubsub.v1.Publisher - * @typedef GetTopicCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Topic} [response] Topic + * Constructs a new StreamingPullRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a StreamingPullRequest. + * @implements IStreamingPullRequest + * @constructor + * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set */ + function StreamingPullRequest(properties) { + this.ackIds = []; + this.modifyDeadlineSeconds = []; + this.modifyDeadlineAckIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * Calls GetTopic. - * @function getTopic - * @memberof google.pubsub.v1.Publisher + * StreamingPullRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.StreamingPullRequest * @instance - * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object - * @param {google.pubsub.v1.Publisher.GetTopicCallback} callback Node-style callback called with the error, if any, and Topic - * @returns {undefined} - * @variation 1 */ - Object.defineProperty(Publisher.prototype.getTopic = function getTopic(request, callback) { - return this.rpcCall(getTopic, $root.google.pubsub.v1.GetTopicRequest, $root.google.pubsub.v1.Topic, request, callback); - }, "name", { value: "GetTopic" }); + StreamingPullRequest.prototype.subscription = ""; /** - * Calls GetTopic. - * @function getTopic - * @memberof google.pubsub.v1.Publisher + * StreamingPullRequest ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.StreamingPullRequest * @instance - * @param {google.pubsub.v1.IGetTopicRequest} request GetTopicRequest message or plain object - * @returns {Promise} Promise - * @variation 2 */ + StreamingPullRequest.prototype.ackIds = $util.emptyArray; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. - * @memberof google.pubsub.v1.Publisher - * @typedef ListTopicsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListTopicsResponse} [response] ListTopicsResponse + * StreamingPullRequest modifyDeadlineSeconds. + * @member {Array.} modifyDeadlineSeconds + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance */ + StreamingPullRequest.prototype.modifyDeadlineSeconds = $util.emptyArray; /** - * Calls ListTopics. - * @function listTopics - * @memberof google.pubsub.v1.Publisher + * StreamingPullRequest modifyDeadlineAckIds. + * @member {Array.} modifyDeadlineAckIds + * @memberof google.pubsub.v1.StreamingPullRequest * @instance - * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object - * @param {google.pubsub.v1.Publisher.ListTopicsCallback} callback Node-style callback called with the error, if any, and ListTopicsResponse - * @returns {undefined} - * @variation 1 */ - Object.defineProperty(Publisher.prototype.listTopics = function listTopics(request, callback) { - return this.rpcCall(listTopics, $root.google.pubsub.v1.ListTopicsRequest, $root.google.pubsub.v1.ListTopicsResponse, request, callback); - }, "name", { value: "ListTopics" }); + StreamingPullRequest.prototype.modifyDeadlineAckIds = $util.emptyArray; /** - * Calls ListTopics. - * @function listTopics - * @memberof google.pubsub.v1.Publisher + * StreamingPullRequest streamAckDeadlineSeconds. + * @member {number} streamAckDeadlineSeconds + * @memberof google.pubsub.v1.StreamingPullRequest * @instance - * @param {google.pubsub.v1.IListTopicsRequest} request ListTopicsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 */ + StreamingPullRequest.prototype.streamAckDeadlineSeconds = 0; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. - * @memberof google.pubsub.v1.Publisher - * @typedef ListTopicSubscriptionsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} [response] ListTopicSubscriptionsResponse + * StreamingPullRequest clientId. + * @member {string} clientId + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance */ + StreamingPullRequest.prototype.clientId = ""; /** - * Calls ListTopicSubscriptions. - * @function listTopicSubscriptions - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object - * @param {google.pubsub.v1.Publisher.ListTopicSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListTopicSubscriptionsResponse - * @returns {undefined} - * @variation 1 + * Creates a new StreamingPullRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest instance */ - Object.defineProperty(Publisher.prototype.listTopicSubscriptions = function listTopicSubscriptions(request, callback) { - return this.rpcCall(listTopicSubscriptions, $root.google.pubsub.v1.ListTopicSubscriptionsRequest, $root.google.pubsub.v1.ListTopicSubscriptionsResponse, request, callback); - }, "name", { value: "ListTopicSubscriptions" }); + StreamingPullRequest.create = function create(properties) { + return new StreamingPullRequest(properties); + }; /** - * Calls ListTopicSubscriptions. - * @function listTopicSubscriptions - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} request ListTopicSubscriptionsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer */ + StreamingPullRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); + if (message.modifyDeadlineSeconds != null && message.modifyDeadlineSeconds.length) { + writer.uint32(/* id 3, wireType 2 =*/26).fork(); + for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) + writer.int32(message.modifyDeadlineSeconds[i]); + writer.ldelim(); + } + if (message.modifyDeadlineAckIds != null && message.modifyDeadlineAckIds.length) + for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.modifyDeadlineAckIds[i]); + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.streamAckDeadlineSeconds); + if (message.clientId != null && message.hasOwnProperty("clientId")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.clientId); + return writer; + }; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. - * @memberof google.pubsub.v1.Publisher - * @typedef ListTopicSnapshotsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListTopicSnapshotsResponse} [response] ListTopicSnapshotsResponse + * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + StreamingPullRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a StreamingPullRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ + StreamingPullRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + case 2: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + case 3: + if (!(message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length)) + message.modifyDeadlineSeconds = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.modifyDeadlineSeconds.push(reader.int32()); + } else + message.modifyDeadlineSeconds.push(reader.int32()); + break; + case 4: + if (!(message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length)) + message.modifyDeadlineAckIds = []; + message.modifyDeadlineAckIds.push(reader.string()); + break; + case 5: + message.streamAckDeadlineSeconds = reader.int32(); + break; + case 6: + message.clientId = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; /** - * Calls ListTopicSnapshots. - * @function listTopicSnapshots - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object - * @param {google.pubsub.v1.Publisher.ListTopicSnapshotsCallback} callback Node-style callback called with the error, if any, and ListTopicSnapshotsResponse - * @returns {undefined} - * @variation 1 + * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Object.defineProperty(Publisher.prototype.listTopicSnapshots = function listTopicSnapshots(request, callback) { - return this.rpcCall(listTopicSnapshots, $root.google.pubsub.v1.ListTopicSnapshotsRequest, $root.google.pubsub.v1.ListTopicSnapshotsResponse, request, callback); - }, "name", { value: "ListTopicSnapshots" }); + StreamingPullRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; /** - * Calls ListTopicSnapshots. - * @function listTopicSnapshots - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IListTopicSnapshotsRequest} request ListTopicSnapshotsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * Verifies a StreamingPullRequest message. + * @function verify + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not */ + StreamingPullRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + if (message.modifyDeadlineSeconds != null && message.hasOwnProperty("modifyDeadlineSeconds")) { + if (!Array.isArray(message.modifyDeadlineSeconds)) + return "modifyDeadlineSeconds: array expected"; + for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) + if (!$util.isInteger(message.modifyDeadlineSeconds[i])) + return "modifyDeadlineSeconds: integer[] expected"; + } + if (message.modifyDeadlineAckIds != null && message.hasOwnProperty("modifyDeadlineAckIds")) { + if (!Array.isArray(message.modifyDeadlineAckIds)) + return "modifyDeadlineAckIds: array expected"; + for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) + if (!$util.isString(message.modifyDeadlineAckIds[i])) + return "modifyDeadlineAckIds: string[] expected"; + } + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + if (!$util.isInteger(message.streamAckDeadlineSeconds)) + return "streamAckDeadlineSeconds: integer expected"; + if (message.clientId != null && message.hasOwnProperty("clientId")) + if (!$util.isString(message.clientId)) + return "clientId: string expected"; + return null; + }; /** - * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. - * @memberof google.pubsub.v1.Publisher - * @typedef DeleteTopicCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty + * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest */ + StreamingPullRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullRequest) + return object; + var message = new $root.google.pubsub.v1.StreamingPullRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + if (object.modifyDeadlineSeconds) { + if (!Array.isArray(object.modifyDeadlineSeconds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineSeconds: array expected"); + message.modifyDeadlineSeconds = []; + for (var i = 0; i < object.modifyDeadlineSeconds.length; ++i) + message.modifyDeadlineSeconds[i] = object.modifyDeadlineSeconds[i] | 0; + } + if (object.modifyDeadlineAckIds) { + if (!Array.isArray(object.modifyDeadlineAckIds)) + throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineAckIds: array expected"); + message.modifyDeadlineAckIds = []; + for (var i = 0; i < object.modifyDeadlineAckIds.length; ++i) + message.modifyDeadlineAckIds[i] = String(object.modifyDeadlineAckIds[i]); + } + if (object.streamAckDeadlineSeconds != null) + message.streamAckDeadlineSeconds = object.streamAckDeadlineSeconds | 0; + if (object.clientId != null) + message.clientId = String(object.clientId); + return message; + }; /** - * Calls DeleteTopic. - * @function deleteTopic - * @memberof google.pubsub.v1.Publisher - * @instance - * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object - * @param {google.pubsub.v1.Publisher.DeleteTopicCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 + * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {google.pubsub.v1.StreamingPullRequest} message StreamingPullRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object */ - Object.defineProperty(Publisher.prototype.deleteTopic = function deleteTopic(request, callback) { - return this.rpcCall(deleteTopic, $root.google.pubsub.v1.DeleteTopicRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "DeleteTopic" }); + StreamingPullRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.ackIds = []; + object.modifyDeadlineSeconds = []; + object.modifyDeadlineAckIds = []; + } + if (options.defaults) { + object.subscription = ""; + object.streamAckDeadlineSeconds = 0; + object.clientId = ""; + } + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + if (message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length) { + object.modifyDeadlineSeconds = []; + for (var j = 0; j < message.modifyDeadlineSeconds.length; ++j) + object.modifyDeadlineSeconds[j] = message.modifyDeadlineSeconds[j]; + } + if (message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length) { + object.modifyDeadlineAckIds = []; + for (var j = 0; j < message.modifyDeadlineAckIds.length; ++j) + object.modifyDeadlineAckIds[j] = message.modifyDeadlineAckIds[j]; + } + if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + object.streamAckDeadlineSeconds = message.streamAckDeadlineSeconds; + if (message.clientId != null && message.hasOwnProperty("clientId")) + object.clientId = message.clientId; + return object; + }; /** - * Calls DeleteTopic. - * @function deleteTopic - * @memberof google.pubsub.v1.Publisher + * Converts this StreamingPullRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.StreamingPullRequest * @instance - * @param {google.pubsub.v1.IDeleteTopicRequest} request DeleteTopicRequest message or plain object - * @returns {Promise} Promise - * @variation 2 + * @returns {Object.} JSON object */ + StreamingPullRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return Publisher; + return StreamingPullRequest; })(); - v1.MessageStoragePolicy = (function() { + v1.StreamingPullResponse = (function() { /** - * Properties of a MessageStoragePolicy. + * Properties of a StreamingPullResponse. * @memberof google.pubsub.v1 - * @interface IMessageStoragePolicy - * @property {Array.|null} [allowedPersistenceRegions] MessageStoragePolicy allowedPersistenceRegions + * @interface IStreamingPullResponse + * @property {Array.|null} [receivedMessages] StreamingPullResponse receivedMessages */ /** - * Constructs a new MessageStoragePolicy. + * Constructs a new StreamingPullResponse. * @memberof google.pubsub.v1 - * @classdesc Represents a MessageStoragePolicy. - * @implements IMessageStoragePolicy + * @classdesc Represents a StreamingPullResponse. + * @implements IStreamingPullResponse * @constructor - * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set + * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set */ - function MessageStoragePolicy(properties) { - this.allowedPersistenceRegions = []; + function StreamingPullResponse(properties) { + this.receivedMessages = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -14175,78 +8515,78 @@ } /** - * MessageStoragePolicy allowedPersistenceRegions. - * @member {Array.} allowedPersistenceRegions - * @memberof google.pubsub.v1.MessageStoragePolicy + * StreamingPullResponse receivedMessages. + * @member {Array.} receivedMessages + * @memberof google.pubsub.v1.StreamingPullResponse * @instance */ - MessageStoragePolicy.prototype.allowedPersistenceRegions = $util.emptyArray; + StreamingPullResponse.prototype.receivedMessages = $util.emptyArray; /** - * Creates a new MessageStoragePolicy instance using the specified properties. + * Creates a new StreamingPullResponse instance using the specified properties. * @function create - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @static - * @param {google.pubsub.v1.IMessageStoragePolicy=} [properties] Properties to set - * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy instance + * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse instance */ - MessageStoragePolicy.create = function create(properties) { - return new MessageStoragePolicy(properties); + StreamingPullResponse.create = function create(properties) { + return new StreamingPullResponse(properties); }; /** - * Encodes the specified MessageStoragePolicy message. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @static - * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode + * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - MessageStoragePolicy.encode = function encode(message, writer) { + StreamingPullResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.allowedPersistenceRegions != null && message.allowedPersistenceRegions.length) - for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.allowedPersistenceRegions[i]); + if (message.receivedMessages != null && message.receivedMessages.length) + for (var i = 0; i < message.receivedMessages.length; ++i) + $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; /** - * Encodes the specified MessageStoragePolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageStoragePolicy.verify|verify} messages. + * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @static - * @param {google.pubsub.v1.IMessageStoragePolicy} message MessageStoragePolicy message or plain object to encode + * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - MessageStoragePolicy.encodeDelimited = function encodeDelimited(message, writer) { + StreamingPullResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer. + * Decodes a StreamingPullResponse message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MessageStoragePolicy.decode = function decode(reader, length) { + StreamingPullResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.MessageStoragePolicy(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.allowedPersistenceRegions && message.allowedPersistenceRegions.length)) - message.allowedPersistenceRegions = []; - message.allowedPersistenceRegions.push(reader.string()); + if (!(message.receivedMessages && message.receivedMessages.length)) + message.receivedMessages = []; + message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); break; default: reader.skipType(tag & 7); @@ -14257,122 +8597,126 @@ }; /** - * Decodes a MessageStoragePolicy message from the specified reader or buffer, length delimited. + * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MessageStoragePolicy.decodeDelimited = function decodeDelimited(reader) { + StreamingPullResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a MessageStoragePolicy message. + * Verifies a StreamingPullResponse message. * @function verify - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - MessageStoragePolicy.verify = function verify(message) { + StreamingPullResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.allowedPersistenceRegions != null && message.hasOwnProperty("allowedPersistenceRegions")) { - if (!Array.isArray(message.allowedPersistenceRegions)) - return "allowedPersistenceRegions: array expected"; - for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) - if (!$util.isString(message.allowedPersistenceRegions[i])) - return "allowedPersistenceRegions: string[] expected"; + if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { + if (!Array.isArray(message.receivedMessages)) + return "receivedMessages: array expected"; + for (var i = 0; i < message.receivedMessages.length; ++i) { + var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); + if (error) + return "receivedMessages." + error; + } } return null; }; /** - * Creates a MessageStoragePolicy message from a plain object. Also converts values to their respective internal types. + * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.MessageStoragePolicy} MessageStoragePolicy + * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse */ - MessageStoragePolicy.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.MessageStoragePolicy) + StreamingPullResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullResponse) return object; - var message = new $root.google.pubsub.v1.MessageStoragePolicy(); - if (object.allowedPersistenceRegions) { - if (!Array.isArray(object.allowedPersistenceRegions)) - throw TypeError(".google.pubsub.v1.MessageStoragePolicy.allowedPersistenceRegions: array expected"); - message.allowedPersistenceRegions = []; - for (var i = 0; i < object.allowedPersistenceRegions.length; ++i) - message.allowedPersistenceRegions[i] = String(object.allowedPersistenceRegions[i]); + var message = new $root.google.pubsub.v1.StreamingPullResponse(); + if (object.receivedMessages) { + if (!Array.isArray(object.receivedMessages)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: array expected"); + message.receivedMessages = []; + for (var i = 0; i < object.receivedMessages.length; ++i) { + if (typeof object.receivedMessages[i] !== "object") + throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: object expected"); + message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); + } } return message; }; /** - * Creates a plain object from a MessageStoragePolicy message. Also converts values to other types if specified. + * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @static - * @param {google.pubsub.v1.MessageStoragePolicy} message MessageStoragePolicy + * @param {google.pubsub.v1.StreamingPullResponse} message StreamingPullResponse * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - MessageStoragePolicy.toObject = function toObject(message, options) { + StreamingPullResponse.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.arrays || options.defaults) - object.allowedPersistenceRegions = []; - if (message.allowedPersistenceRegions && message.allowedPersistenceRegions.length) { - object.allowedPersistenceRegions = []; - for (var j = 0; j < message.allowedPersistenceRegions.length; ++j) - object.allowedPersistenceRegions[j] = message.allowedPersistenceRegions[j]; + object.receivedMessages = []; + if (message.receivedMessages && message.receivedMessages.length) { + object.receivedMessages = []; + for (var j = 0; j < message.receivedMessages.length; ++j) + object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); } return object; }; /** - * Converts this MessageStoragePolicy to JSON. + * Converts this StreamingPullResponse to JSON. * @function toJSON - * @memberof google.pubsub.v1.MessageStoragePolicy + * @memberof google.pubsub.v1.StreamingPullResponse * @instance * @returns {Object.} JSON object */ - MessageStoragePolicy.prototype.toJSON = function toJSON() { + StreamingPullResponse.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return MessageStoragePolicy; + return StreamingPullResponse; })(); - v1.Topic = (function() { + v1.CreateSnapshotRequest = (function() { /** - * Properties of a Topic. + * Properties of a CreateSnapshotRequest. * @memberof google.pubsub.v1 - * @interface ITopic - * @property {string|null} [name] Topic name - * @property {Object.|null} [labels] Topic labels - * @property {google.pubsub.v1.IMessageStoragePolicy|null} [messageStoragePolicy] Topic messageStoragePolicy - * @property {string|null} [kmsKeyName] Topic kmsKeyName + * @interface ICreateSnapshotRequest + * @property {string|null} [name] CreateSnapshotRequest name + * @property {string|null} [subscription] CreateSnapshotRequest subscription + * @property {Object.|null} [labels] CreateSnapshotRequest labels */ /** - * Constructs a new Topic. + * Constructs a new CreateSnapshotRequest. * @memberof google.pubsub.v1 - * @classdesc Represents a Topic. - * @implements ITopic + * @classdesc Represents a CreateSnapshotRequest. + * @implements ICreateSnapshotRequest * @constructor - * @param {google.pubsub.v1.ITopic=} [properties] Properties to set + * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set */ - function Topic(properties) { + function CreateSnapshotRequest(properties) { this.labels = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) @@ -14381,101 +8725,91 @@ } /** - * Topic name. + * CreateSnapshotRequest name. * @member {string} name - * @memberof google.pubsub.v1.Topic - * @instance - */ - Topic.prototype.name = ""; - - /** - * Topic labels. - * @member {Object.} labels - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @instance */ - Topic.prototype.labels = $util.emptyObject; + CreateSnapshotRequest.prototype.name = ""; /** - * Topic messageStoragePolicy. - * @member {google.pubsub.v1.IMessageStoragePolicy|null|undefined} messageStoragePolicy - * @memberof google.pubsub.v1.Topic + * CreateSnapshotRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.CreateSnapshotRequest * @instance */ - Topic.prototype.messageStoragePolicy = null; + CreateSnapshotRequest.prototype.subscription = ""; /** - * Topic kmsKeyName. - * @member {string} kmsKeyName - * @memberof google.pubsub.v1.Topic + * CreateSnapshotRequest labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.CreateSnapshotRequest * @instance */ - Topic.prototype.kmsKeyName = ""; + CreateSnapshotRequest.prototype.labels = $util.emptyObject; /** - * Creates a new Topic instance using the specified properties. + * Creates a new CreateSnapshotRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static - * @param {google.pubsub.v1.ITopic=} [properties] Properties to set - * @returns {google.pubsub.v1.Topic} Topic instance + * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest instance */ - Topic.create = function create(properties) { - return new Topic(properties); + CreateSnapshotRequest.create = function create(properties) { + return new CreateSnapshotRequest(properties); }; /** - * Encodes the specified Topic message. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static - * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode + * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Topic.encode = function encode(message, writer) { + CreateSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); if (message.name != null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.subscription); if (message.labels != null && message.hasOwnProperty("labels")) for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) - $root.google.pubsub.v1.MessageStoragePolicy.encode(message.messageStoragePolicy, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.kmsKeyName); + writer.uint32(/* id 3, wireType 2 =*/26).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); return writer; }; /** - * Encodes the specified Topic message, length delimited. Does not implicitly {@link google.pubsub.v1.Topic.verify|verify} messages. + * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static - * @param {google.pubsub.v1.ITopic} message Topic message or plain object to encode + * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Topic.encodeDelimited = function encodeDelimited(message, writer) { + CreateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a Topic message from the specified reader or buffer. + * Decodes a CreateSnapshotRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.Topic} Topic + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Topic.decode = function decode(reader, length) { + CreateSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -14483,18 +8817,15 @@ message.name = reader.string(); break; case 2: - reader.skip().pos++; - if (message.labels === $util.emptyObject) - message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + message.subscription = reader.string(); break; case 3: - message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); - break; - case 5: - message.kmsKeyName = reader.string(); + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); break; default: reader.skipType(tag & 7); @@ -14505,35 +8836,38 @@ }; /** - * Decodes a Topic message from the specified reader or buffer, length delimited. + * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.Topic} Topic + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Topic.decodeDelimited = function decodeDelimited(reader) { + CreateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a Topic message. + * Verifies a CreateSnapshotRequest message. * @function verify - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - Topic.verify = function verify(message) { + CreateSnapshotRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; if (message.name != null && message.hasOwnProperty("name")) if (!$util.isString(message.name)) return "name: string expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; if (message.labels != null && message.hasOwnProperty("labels")) { if (!$util.isObject(message.labels)) return "labels: object expected"; @@ -14542,58 +8876,45 @@ if (!$util.isString(message.labels[key[i]])) return "labels: string{k:string} expected"; } - if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) { - var error = $root.google.pubsub.v1.MessageStoragePolicy.verify(message.messageStoragePolicy); - if (error) - return "messageStoragePolicy." + error; - } - if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) - if (!$util.isString(message.kmsKeyName)) - return "kmsKeyName: string expected"; return null; }; /** - * Creates a Topic message from a plain object. Also converts values to their respective internal types. + * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.Topic} Topic + * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest */ - Topic.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.Topic) + CreateSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.CreateSnapshotRequest) return object; - var message = new $root.google.pubsub.v1.Topic(); + var message = new $root.google.pubsub.v1.CreateSnapshotRequest(); if (object.name != null) message.name = String(object.name); + if (object.subscription != null) + message.subscription = String(object.subscription); if (object.labels) { if (typeof object.labels !== "object") - throw TypeError(".google.pubsub.v1.Topic.labels: object expected"); + throw TypeError(".google.pubsub.v1.CreateSnapshotRequest.labels: object expected"); message.labels = {}; for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) message.labels[keys[i]] = String(object.labels[keys[i]]); } - if (object.messageStoragePolicy != null) { - if (typeof object.messageStoragePolicy !== "object") - throw TypeError(".google.pubsub.v1.Topic.messageStoragePolicy: object expected"); - message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.fromObject(object.messageStoragePolicy); - } - if (object.kmsKeyName != null) - message.kmsKeyName = String(object.kmsKeyName); return message; }; /** - * Creates a plain object from a Topic message. Also converts values to other types if specified. + * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @static - * @param {google.pubsub.v1.Topic} message Topic + * @param {google.pubsub.v1.CreateSnapshotRequest} message CreateSnapshotRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - Topic.toObject = function toObject(message, options) { + CreateSnapshotRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; @@ -14601,61 +8922,54 @@ object.labels = {}; if (options.defaults) { object.name = ""; - object.messageStoragePolicy = null; - object.kmsKeyName = ""; + object.subscription = ""; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; var keys2; if (message.labels && (keys2 = Object.keys(message.labels)).length) { object.labels = {}; for (var j = 0; j < keys2.length; ++j) object.labels[keys2[j]] = message.labels[keys2[j]]; } - if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) - object.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.toObject(message.messageStoragePolicy, options); - if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) - object.kmsKeyName = message.kmsKeyName; return object; }; /** - * Converts this Topic to JSON. + * Converts this CreateSnapshotRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.Topic + * @memberof google.pubsub.v1.CreateSnapshotRequest * @instance * @returns {Object.} JSON object */ - Topic.prototype.toJSON = function toJSON() { + CreateSnapshotRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return Topic; + return CreateSnapshotRequest; })(); - v1.PubsubMessage = (function() { + v1.UpdateSnapshotRequest = (function() { /** - * Properties of a PubsubMessage. + * Properties of an UpdateSnapshotRequest. * @memberof google.pubsub.v1 - * @interface IPubsubMessage - * @property {Uint8Array|null} [data] PubsubMessage data - * @property {Object.|null} [attributes] PubsubMessage attributes - * @property {string|null} [messageId] PubsubMessage messageId - * @property {google.protobuf.ITimestamp|null} [publishTime] PubsubMessage publishTime - * @property {string|null} [orderingKey] PubsubMessage orderingKey + * @interface IUpdateSnapshotRequest + * @property {google.pubsub.v1.ISnapshot|null} [snapshot] UpdateSnapshotRequest snapshot + * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSnapshotRequest updateMask */ /** - * Constructs a new PubsubMessage. + * Constructs a new UpdateSnapshotRequest. * @memberof google.pubsub.v1 - * @classdesc Represents a PubsubMessage. - * @implements IPubsubMessage + * @classdesc Represents an UpdateSnapshotRequest. + * @implements IUpdateSnapshotRequest * @constructor - * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set + * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set */ - function PubsubMessage(properties) { - this.attributes = {}; + function UpdateSnapshotRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -14663,133 +8977,88 @@ } /** - * PubsubMessage data. - * @member {Uint8Array} data - * @memberof google.pubsub.v1.PubsubMessage - * @instance - */ - PubsubMessage.prototype.data = $util.newBuffer([]); - - /** - * PubsubMessage attributes. - * @member {Object.} attributes - * @memberof google.pubsub.v1.PubsubMessage - * @instance - */ - PubsubMessage.prototype.attributes = $util.emptyObject; - - /** - * PubsubMessage messageId. - * @member {string} messageId - * @memberof google.pubsub.v1.PubsubMessage - * @instance - */ - PubsubMessage.prototype.messageId = ""; - - /** - * PubsubMessage publishTime. - * @member {google.protobuf.ITimestamp|null|undefined} publishTime - * @memberof google.pubsub.v1.PubsubMessage + * UpdateSnapshotRequest snapshot. + * @member {google.pubsub.v1.ISnapshot|null|undefined} snapshot + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @instance */ - PubsubMessage.prototype.publishTime = null; + UpdateSnapshotRequest.prototype.snapshot = null; /** - * PubsubMessage orderingKey. - * @member {string} orderingKey - * @memberof google.pubsub.v1.PubsubMessage + * UpdateSnapshotRequest updateMask. + * @member {google.protobuf.IFieldMask|null|undefined} updateMask + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @instance */ - PubsubMessage.prototype.orderingKey = ""; + UpdateSnapshotRequest.prototype.updateMask = null; /** - * Creates a new PubsubMessage instance using the specified properties. + * Creates a new UpdateSnapshotRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static - * @param {google.pubsub.v1.IPubsubMessage=} [properties] Properties to set - * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage instance + * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest instance */ - PubsubMessage.create = function create(properties) { - return new PubsubMessage(properties); + UpdateSnapshotRequest.create = function create(properties) { + return new UpdateSnapshotRequest(properties); }; /** - * Encodes the specified PubsubMessage message. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static - * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode + * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PubsubMessage.encode = function encode(message, writer) { + UpdateSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.data != null && message.hasOwnProperty("data")) - writer.uint32(/* id 1, wireType 2 =*/10).bytes(message.data); - if (message.attributes != null && message.hasOwnProperty("attributes")) - for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); - if (message.messageId != null && message.hasOwnProperty("messageId")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.messageId); - if (message.publishTime != null && message.hasOwnProperty("publishTime")) - $root.google.protobuf.Timestamp.encode(message.publishTime, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.orderingKey); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + $root.google.pubsub.v1.Snapshot.encode(message.snapshot, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; /** - * Encodes the specified PubsubMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.PubsubMessage.verify|verify} messages. + * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static - * @param {google.pubsub.v1.IPubsubMessage} message PubsubMessage message or plain object to encode + * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PubsubMessage.encodeDelimited = function encodeDelimited(message, writer) { + UpdateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a PubsubMessage message from the specified reader or buffer. + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PubsubMessage.decode = function decode(reader, length) { + UpdateSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.data = reader.bytes(); + message.snapshot = $root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32()); break; case 2: - reader.skip().pos++; - if (message.attributes === $util.emptyObject) - message.attributes = {}; - key = reader.string(); - reader.pos++; - message.attributes[key] = reader.string(); - break; - case 3: - message.messageId = reader.string(); - break; - case 4: - message.publishTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 5: - message.orderingKey = reader.string(); + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -14800,169 +9069,130 @@ }; /** - * Decodes a PubsubMessage message from the specified reader or buffer, length delimited. + * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PubsubMessage.decodeDelimited = function decodeDelimited(reader) { + UpdateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a PubsubMessage message. + * Verifies an UpdateSnapshotRequest message. * @function verify - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - PubsubMessage.verify = function verify(message) { + UpdateSnapshotRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.data != null && message.hasOwnProperty("data")) - if (!(message.data && typeof message.data.length === "number" || $util.isString(message.data))) - return "data: buffer expected"; - if (message.attributes != null && message.hasOwnProperty("attributes")) { - if (!$util.isObject(message.attributes)) - return "attributes: object expected"; - var key = Object.keys(message.attributes); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.attributes[key[i]])) - return "attributes: string{k:string} expected"; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshot); + if (error) + return "snapshot." + error; } - if (message.messageId != null && message.hasOwnProperty("messageId")) - if (!$util.isString(message.messageId)) - return "messageId: string expected"; - if (message.publishTime != null && message.hasOwnProperty("publishTime")) { - var error = $root.google.protobuf.Timestamp.verify(message.publishTime); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) { + var error = $root.google.protobuf.FieldMask.verify(message.updateMask); if (error) - return "publishTime." + error; + return "updateMask." + error; } - if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) - if (!$util.isString(message.orderingKey)) - return "orderingKey: string expected"; return null; }; /** - * Creates a PubsubMessage message from a plain object. Also converts values to their respective internal types. + * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PubsubMessage} PubsubMessage + * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest */ - PubsubMessage.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PubsubMessage) + UpdateSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.UpdateSnapshotRequest) return object; - var message = new $root.google.pubsub.v1.PubsubMessage(); - if (object.data != null) - if (typeof object.data === "string") - $util.base64.decode(object.data, message.data = $util.newBuffer($util.base64.length(object.data)), 0); - else if (object.data.length) - message.data = object.data; - if (object.attributes) { - if (typeof object.attributes !== "object") - throw TypeError(".google.pubsub.v1.PubsubMessage.attributes: object expected"); - message.attributes = {}; - for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) - message.attributes[keys[i]] = String(object.attributes[keys[i]]); + var message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); + if (object.snapshot != null) { + if (typeof object.snapshot !== "object") + throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.snapshot: object expected"); + message.snapshot = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshot); } - if (object.messageId != null) - message.messageId = String(object.messageId); - if (object.publishTime != null) { - if (typeof object.publishTime !== "object") - throw TypeError(".google.pubsub.v1.PubsubMessage.publishTime: object expected"); - message.publishTime = $root.google.protobuf.Timestamp.fromObject(object.publishTime); + if (object.updateMask != null) { + if (typeof object.updateMask !== "object") + throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.updateMask: object expected"); + message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); } - if (object.orderingKey != null) - message.orderingKey = String(object.orderingKey); return message; }; /** - * Creates a plain object from a PubsubMessage message. Also converts values to other types if specified. + * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @static - * @param {google.pubsub.v1.PubsubMessage} message PubsubMessage + * @param {google.pubsub.v1.UpdateSnapshotRequest} message UpdateSnapshotRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - PubsubMessage.toObject = function toObject(message, options) { + UpdateSnapshotRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.objects || options.defaults) - object.attributes = {}; if (options.defaults) { - if (options.bytes === String) - object.data = ""; - else { - object.data = []; - if (options.bytes !== Array) - object.data = $util.newBuffer(object.data); - } - object.messageId = ""; - object.publishTime = null; - object.orderingKey = ""; - } - if (message.data != null && message.hasOwnProperty("data")) - object.data = options.bytes === String ? $util.base64.encode(message.data, 0, message.data.length) : options.bytes === Array ? Array.prototype.slice.call(message.data) : message.data; - var keys2; - if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { - object.attributes = {}; - for (var j = 0; j < keys2.length; ++j) - object.attributes[keys2[j]] = message.attributes[keys2[j]]; + object.snapshot = null; + object.updateMask = null; } - if (message.messageId != null && message.hasOwnProperty("messageId")) - object.messageId = message.messageId; - if (message.publishTime != null && message.hasOwnProperty("publishTime")) - object.publishTime = $root.google.protobuf.Timestamp.toObject(message.publishTime, options); - if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) - object.orderingKey = message.orderingKey; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = $root.google.pubsub.v1.Snapshot.toObject(message.snapshot, options); + if (message.updateMask != null && message.hasOwnProperty("updateMask")) + object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); return object; }; /** - * Converts this PubsubMessage to JSON. + * Converts this UpdateSnapshotRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.PubsubMessage + * @memberof google.pubsub.v1.UpdateSnapshotRequest * @instance * @returns {Object.} JSON object */ - PubsubMessage.prototype.toJSON = function toJSON() { + UpdateSnapshotRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return PubsubMessage; + return UpdateSnapshotRequest; })(); - v1.GetTopicRequest = (function() { + v1.Snapshot = (function() { /** - * Properties of a GetTopicRequest. + * Properties of a Snapshot. * @memberof google.pubsub.v1 - * @interface IGetTopicRequest - * @property {string|null} [topic] GetTopicRequest topic + * @interface ISnapshot + * @property {string|null} [name] Snapshot name + * @property {string|null} [topic] Snapshot topic + * @property {google.protobuf.ITimestamp|null} [expireTime] Snapshot expireTime + * @property {Object.|null} [labels] Snapshot labels */ /** - * Constructs a new GetTopicRequest. + * Constructs a new Snapshot. * @memberof google.pubsub.v1 - * @classdesc Represents a GetTopicRequest. - * @implements IGetTopicRequest + * @classdesc Represents a Snapshot. + * @implements ISnapshot * @constructor - * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set + * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set */ - function GetTopicRequest(properties) { + function Snapshot(properties) { + this.labels = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -14970,76 +9200,121 @@ } /** - * GetTopicRequest topic. + * Snapshot name. + * @member {string} name + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.name = ""; + + /** + * Snapshot topic. * @member {string} topic - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @instance */ - GetTopicRequest.prototype.topic = ""; + Snapshot.prototype.topic = ""; /** - * Creates a new GetTopicRequest instance using the specified properties. + * Snapshot expireTime. + * @member {google.protobuf.ITimestamp|null|undefined} expireTime + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.expireTime = null; + + /** + * Snapshot labels. + * @member {Object.} labels + * @memberof google.pubsub.v1.Snapshot + * @instance + */ + Snapshot.prototype.labels = $util.emptyObject; + + /** + * Creates a new Snapshot instance using the specified properties. * @function create - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @static - * @param {google.pubsub.v1.IGetTopicRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest instance + * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set + * @returns {google.pubsub.v1.Snapshot} Snapshot instance */ - GetTopicRequest.create = function create(properties) { - return new GetTopicRequest(properties); + Snapshot.create = function create(properties) { + return new Snapshot(properties); }; /** - * Encodes the specified GetTopicRequest message. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @static - * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode + * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetTopicRequest.encode = function encode(message, writer) { + Snapshot.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); + if (message.expireTime != null && message.hasOwnProperty("expireTime")) + $root.google.protobuf.Timestamp.encode(message.expireTime, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.labels != null && message.hasOwnProperty("labels")) + for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); return writer; }; /** - * Encodes the specified GetTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetTopicRequest.verify|verify} messages. + * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @static - * @param {google.pubsub.v1.IGetTopicRequest} message GetTopicRequest message or plain object to encode + * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - GetTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + Snapshot.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a GetTopicRequest message from the specified reader or buffer. + * Decodes a Snapshot message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @returns {google.pubsub.v1.Snapshot} Snapshot * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetTopicRequest.decode = function decode(reader, length) { + Snapshot.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetTopicRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: + message.name = reader.string(); + break; + case 2: message.topic = reader.string(); break; + case 3: + message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + case 4: + reader.skip().pos++; + if (message.labels === $util.emptyObject) + message.labels = {}; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); + break; default: reader.skipType(tag & 7); break; @@ -15049,108 +9324,152 @@ }; /** - * Decodes a GetTopicRequest message from the specified reader or buffer, length delimited. + * Decodes a Snapshot message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @returns {google.pubsub.v1.Snapshot} Snapshot * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetTopicRequest.decodeDelimited = function decodeDelimited(reader) { + Snapshot.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a GetTopicRequest message. + * Verifies a Snapshot message. * @function verify - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - GetTopicRequest.verify = function verify(message) { + Snapshot.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; if (message.topic != null && message.hasOwnProperty("topic")) if (!$util.isString(message.topic)) return "topic: string expected"; + if (message.expireTime != null && message.hasOwnProperty("expireTime")) { + var error = $root.google.protobuf.Timestamp.verify(message.expireTime); + if (error) + return "expireTime." + error; + } + if (message.labels != null && message.hasOwnProperty("labels")) { + if (!$util.isObject(message.labels)) + return "labels: object expected"; + var key = Object.keys(message.labels); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.labels[key[i]])) + return "labels: string{k:string} expected"; + } return null; }; /** - * Creates a GetTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.GetTopicRequest} GetTopicRequest + * @returns {google.pubsub.v1.Snapshot} Snapshot */ - GetTopicRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.GetTopicRequest) + Snapshot.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Snapshot) return object; - var message = new $root.google.pubsub.v1.GetTopicRequest(); + var message = new $root.google.pubsub.v1.Snapshot(); + if (object.name != null) + message.name = String(object.name); if (object.topic != null) message.topic = String(object.topic); + if (object.expireTime != null) { + if (typeof object.expireTime !== "object") + throw TypeError(".google.pubsub.v1.Snapshot.expireTime: object expected"); + message.expireTime = $root.google.protobuf.Timestamp.fromObject(object.expireTime); + } + if (object.labels) { + if (typeof object.labels !== "object") + throw TypeError(".google.pubsub.v1.Snapshot.labels: object expected"); + message.labels = {}; + for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) + message.labels[keys[i]] = String(object.labels[keys[i]]); + } return message; }; /** - * Creates a plain object from a GetTopicRequest message. Also converts values to other types if specified. + * Creates a plain object from a Snapshot message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @static - * @param {google.pubsub.v1.GetTopicRequest} message GetTopicRequest + * @param {google.pubsub.v1.Snapshot} message Snapshot * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - GetTopicRequest.toObject = function toObject(message, options) { + Snapshot.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) + if (options.objects || options.defaults) + object.labels = {}; + if (options.defaults) { + object.name = ""; object.topic = ""; + object.expireTime = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; if (message.topic != null && message.hasOwnProperty("topic")) object.topic = message.topic; + if (message.expireTime != null && message.hasOwnProperty("expireTime")) + object.expireTime = $root.google.protobuf.Timestamp.toObject(message.expireTime, options); + var keys2; + if (message.labels && (keys2 = Object.keys(message.labels)).length) { + object.labels = {}; + for (var j = 0; j < keys2.length; ++j) + object.labels[keys2[j]] = message.labels[keys2[j]]; + } return object; }; /** - * Converts this GetTopicRequest to JSON. + * Converts this Snapshot to JSON. * @function toJSON - * @memberof google.pubsub.v1.GetTopicRequest + * @memberof google.pubsub.v1.Snapshot * @instance * @returns {Object.} JSON object */ - GetTopicRequest.prototype.toJSON = function toJSON() { + Snapshot.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return GetTopicRequest; + return Snapshot; })(); - v1.UpdateTopicRequest = (function() { + v1.GetSnapshotRequest = (function() { /** - * Properties of an UpdateTopicRequest. + * Properties of a GetSnapshotRequest. * @memberof google.pubsub.v1 - * @interface IUpdateTopicRequest - * @property {google.pubsub.v1.ITopic|null} [topic] UpdateTopicRequest topic - * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateTopicRequest updateMask + * @interface IGetSnapshotRequest + * @property {string|null} [snapshot] GetSnapshotRequest snapshot */ /** - * Constructs a new UpdateTopicRequest. + * Constructs a new GetSnapshotRequest. * @memberof google.pubsub.v1 - * @classdesc Represents an UpdateTopicRequest. - * @implements IUpdateTopicRequest + * @classdesc Represents a GetSnapshotRequest. + * @implements IGetSnapshotRequest * @constructor - * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set + * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set */ - function UpdateTopicRequest(properties) { + function GetSnapshotRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -15158,88 +9477,75 @@ } /** - * UpdateTopicRequest topic. - * @member {google.pubsub.v1.ITopic|null|undefined} topic - * @memberof google.pubsub.v1.UpdateTopicRequest - * @instance - */ - UpdateTopicRequest.prototype.topic = null; - - /** - * UpdateTopicRequest updateMask. - * @member {google.protobuf.IFieldMask|null|undefined} updateMask - * @memberof google.pubsub.v1.UpdateTopicRequest + * GetSnapshotRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.GetSnapshotRequest * @instance */ - UpdateTopicRequest.prototype.updateMask = null; + GetSnapshotRequest.prototype.snapshot = ""; /** - * Creates a new UpdateTopicRequest instance using the specified properties. + * Creates a new GetSnapshotRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @static - * @param {google.pubsub.v1.IUpdateTopicRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest instance + * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest instance */ - UpdateTopicRequest.create = function create(properties) { - return new UpdateTopicRequest(properties); + GetSnapshotRequest.create = function create(properties) { + return new GetSnapshotRequest(properties); }; /** - * Encodes the specified UpdateTopicRequest message. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @static - * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - UpdateTopicRequest.encode = function encode(message, writer) { + GetSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - $root.google.pubsub.v1.Topic.encode(message.topic, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); return writer; }; /** - * Encodes the specified UpdateTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateTopicRequest.verify|verify} messages. + * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @static - * @param {google.pubsub.v1.IUpdateTopicRequest} message UpdateTopicRequest message or plain object to encode + * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - UpdateTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { + GetSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer. + * Decodes a GetSnapshotRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UpdateTopicRequest.decode = function decode(reader, length) { + GetSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateTopicRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.topic = $root.google.pubsub.v1.Topic.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + message.snapshot = reader.string(); break; default: reader.skipType(tag & 7); @@ -15250,128 +9556,109 @@ }; /** - * Decodes an UpdateTopicRequest message from the specified reader or buffer, length delimited. + * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UpdateTopicRequest.decodeDelimited = function decodeDelimited(reader) { + GetSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an UpdateTopicRequest message. + * Verifies a GetSnapshotRequest message. * @function verify - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - UpdateTopicRequest.verify = function verify(message) { + GetSnapshotRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) { - var error = $root.google.pubsub.v1.Topic.verify(message.topic); - if (error) - return "topic." + error; - } - if (message.updateMask != null && message.hasOwnProperty("updateMask")) { - var error = $root.google.protobuf.FieldMask.verify(message.updateMask); - if (error) - return "updateMask." + error; - } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; return null; }; /** - * Creates an UpdateTopicRequest message from a plain object. Also converts values to their respective internal types. + * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.UpdateTopicRequest} UpdateTopicRequest + * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest */ - UpdateTopicRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.UpdateTopicRequest) + GetSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetSnapshotRequest) return object; - var message = new $root.google.pubsub.v1.UpdateTopicRequest(); - if (object.topic != null) { - if (typeof object.topic !== "object") - throw TypeError(".google.pubsub.v1.UpdateTopicRequest.topic: object expected"); - message.topic = $root.google.pubsub.v1.Topic.fromObject(object.topic); - } - if (object.updateMask != null) { - if (typeof object.updateMask !== "object") - throw TypeError(".google.pubsub.v1.UpdateTopicRequest.updateMask: object expected"); - message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); - } + var message = new $root.google.pubsub.v1.GetSnapshotRequest(); + if (object.snapshot != null) + message.snapshot = String(object.snapshot); return message; }; /** - * Creates a plain object from an UpdateTopicRequest message. Also converts values to other types if specified. + * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @static - * @param {google.pubsub.v1.UpdateTopicRequest} message UpdateTopicRequest + * @param {google.pubsub.v1.GetSnapshotRequest} message GetSnapshotRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - UpdateTopicRequest.toObject = function toObject(message, options) { + GetSnapshotRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.topic = null; - object.updateMask = null; - } - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = $root.google.pubsub.v1.Topic.toObject(message.topic, options); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); + if (options.defaults) + object.snapshot = ""; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = message.snapshot; return object; }; /** - * Converts this UpdateTopicRequest to JSON. + * Converts this GetSnapshotRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.UpdateTopicRequest + * @memberof google.pubsub.v1.GetSnapshotRequest * @instance * @returns {Object.} JSON object */ - UpdateTopicRequest.prototype.toJSON = function toJSON() { + GetSnapshotRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return UpdateTopicRequest; + return GetSnapshotRequest; })(); - v1.PublishRequest = (function() { + v1.ListSnapshotsRequest = (function() { /** - * Properties of a PublishRequest. + * Properties of a ListSnapshotsRequest. * @memberof google.pubsub.v1 - * @interface IPublishRequest - * @property {string|null} [topic] PublishRequest topic - * @property {Array.|null} [messages] PublishRequest messages + * @interface IListSnapshotsRequest + * @property {string|null} [project] ListSnapshotsRequest project + * @property {number|null} [pageSize] ListSnapshotsRequest pageSize + * @property {string|null} [pageToken] ListSnapshotsRequest pageToken */ /** - * Constructs a new PublishRequest. + * Constructs a new ListSnapshotsRequest. * @memberof google.pubsub.v1 - * @classdesc Represents a PublishRequest. - * @implements IPublishRequest + * @classdesc Represents a ListSnapshotsRequest. + * @implements IListSnapshotsRequest * @constructor - * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set + * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set */ - function PublishRequest(properties) { - this.messages = []; + function ListSnapshotsRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -15379,91 +9666,101 @@ } /** - * PublishRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.PublishRequest + * ListSnapshotsRequest project. + * @member {string} project + * @memberof google.pubsub.v1.ListSnapshotsRequest * @instance */ - PublishRequest.prototype.topic = ""; + ListSnapshotsRequest.prototype.project = ""; /** - * PublishRequest messages. - * @member {Array.} messages - * @memberof google.pubsub.v1.PublishRequest + * ListSnapshotsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListSnapshotsRequest * @instance */ - PublishRequest.prototype.messages = $util.emptyArray; + ListSnapshotsRequest.prototype.pageSize = 0; /** - * Creates a new PublishRequest instance using the specified properties. + * ListSnapshotsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @instance + */ + ListSnapshotsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListSnapshotsRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static - * @param {google.pubsub.v1.IPublishRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.PublishRequest} PublishRequest instance + * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest instance */ - PublishRequest.create = function create(properties) { - return new PublishRequest(properties); + ListSnapshotsRequest.create = function create(properties) { + return new ListSnapshotsRequest(properties); }; /** - * Encodes the specified PublishRequest message. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static - * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode + * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PublishRequest.encode = function encode(message, writer) { + ListSnapshotsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.messages != null && message.messages.length) - for (var i = 0; i < message.messages.length; ++i) - $root.google.pubsub.v1.PubsubMessage.encode(message.messages[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.project != null && message.hasOwnProperty("project")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; /** - * Encodes the specified PublishRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishRequest.verify|verify} messages. + * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static - * @param {google.pubsub.v1.IPublishRequest} message PublishRequest message or plain object to encode + * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PublishRequest.encodeDelimited = function encodeDelimited(message, writer) { + ListSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a PublishRequest message from the specified reader or buffer. + * Decodes a ListSnapshotsRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PublishRequest} PublishRequest + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishRequest.decode = function decode(reader, length) { + ListSnapshotsRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.topic = reader.string(); + message.project = reader.string(); break; case 2: - if (!(message.messages && message.messages.length)) - message.messages = []; - message.messages.push($root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32())); + message.pageSize = reader.int32(); + break; + case 3: + message.pageToken = reader.string(); break; default: reader.skipType(tag & 7); @@ -15474,134 +9771,126 @@ }; /** - * Decodes a PublishRequest message from the specified reader or buffer, length delimited. + * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PublishRequest} PublishRequest + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishRequest.decodeDelimited = function decodeDelimited(reader) { + ListSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a PublishRequest message. + * Verifies a ListSnapshotsRequest message. * @function verify - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - PublishRequest.verify = function verify(message) { + ListSnapshotsRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.messages != null && message.hasOwnProperty("messages")) { - if (!Array.isArray(message.messages)) - return "messages: array expected"; - for (var i = 0; i < message.messages.length; ++i) { - var error = $root.google.pubsub.v1.PubsubMessage.verify(message.messages[i]); - if (error) - return "messages." + error; - } - } + if (message.project != null && message.hasOwnProperty("project")) + if (!$util.isString(message.project)) + return "project: string expected"; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; return null; }; /** - * Creates a PublishRequest message from a plain object. Also converts values to their respective internal types. + * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PublishRequest} PublishRequest + * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest */ - PublishRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PublishRequest) + ListSnapshotsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSnapshotsRequest) return object; - var message = new $root.google.pubsub.v1.PublishRequest(); - if (object.topic != null) - message.topic = String(object.topic); - if (object.messages) { - if (!Array.isArray(object.messages)) - throw TypeError(".google.pubsub.v1.PublishRequest.messages: array expected"); - message.messages = []; - for (var i = 0; i < object.messages.length; ++i) { - if (typeof object.messages[i] !== "object") - throw TypeError(".google.pubsub.v1.PublishRequest.messages: object expected"); - message.messages[i] = $root.google.pubsub.v1.PubsubMessage.fromObject(object.messages[i]); - } - } + var message = new $root.google.pubsub.v1.ListSnapshotsRequest(); + if (object.project != null) + message.project = String(object.project); + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); return message; }; /** - * Creates a plain object from a PublishRequest message. Also converts values to other types if specified. + * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @static - * @param {google.pubsub.v1.PublishRequest} message PublishRequest + * @param {google.pubsub.v1.ListSnapshotsRequest} message ListSnapshotsRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - PublishRequest.toObject = function toObject(message, options) { + ListSnapshotsRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.messages = []; - if (options.defaults) - object.topic = ""; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.messages && message.messages.length) { - object.messages = []; - for (var j = 0; j < message.messages.length; ++j) - object.messages[j] = $root.google.pubsub.v1.PubsubMessage.toObject(message.messages[j], options); + if (options.defaults) { + object.project = ""; + object.pageSize = 0; + object.pageToken = ""; } + if (message.project != null && message.hasOwnProperty("project")) + object.project = message.project; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; return object; }; /** - * Converts this PublishRequest to JSON. + * Converts this ListSnapshotsRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.PublishRequest + * @memberof google.pubsub.v1.ListSnapshotsRequest * @instance * @returns {Object.} JSON object */ - PublishRequest.prototype.toJSON = function toJSON() { + ListSnapshotsRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return PublishRequest; + return ListSnapshotsRequest; })(); - v1.PublishResponse = (function() { + v1.ListSnapshotsResponse = (function() { /** - * Properties of a PublishResponse. + * Properties of a ListSnapshotsResponse. * @memberof google.pubsub.v1 - * @interface IPublishResponse - * @property {Array.|null} [messageIds] PublishResponse messageIds + * @interface IListSnapshotsResponse + * @property {Array.|null} [snapshots] ListSnapshotsResponse snapshots + * @property {string|null} [nextPageToken] ListSnapshotsResponse nextPageToken */ /** - * Constructs a new PublishResponse. + * Constructs a new ListSnapshotsResponse. * @memberof google.pubsub.v1 - * @classdesc Represents a PublishResponse. - * @implements IPublishResponse + * @classdesc Represents a ListSnapshotsResponse. + * @implements IListSnapshotsResponse * @constructor - * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set + * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set */ - function PublishResponse(properties) { - this.messageIds = []; + function ListSnapshotsResponse(properties) { + this.snapshots = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -15609,78 +9898,91 @@ } /** - * PublishResponse messageIds. - * @member {Array.} messageIds - * @memberof google.pubsub.v1.PublishResponse + * ListSnapshotsResponse snapshots. + * @member {Array.} snapshots + * @memberof google.pubsub.v1.ListSnapshotsResponse * @instance */ - PublishResponse.prototype.messageIds = $util.emptyArray; + ListSnapshotsResponse.prototype.snapshots = $util.emptyArray; /** - * Creates a new PublishResponse instance using the specified properties. + * ListSnapshotsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @instance + */ + ListSnapshotsResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListSnapshotsResponse instance using the specified properties. * @function create - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static - * @param {google.pubsub.v1.IPublishResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.PublishResponse} PublishResponse instance + * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse instance */ - PublishResponse.create = function create(properties) { - return new PublishResponse(properties); + ListSnapshotsResponse.create = function create(properties) { + return new ListSnapshotsResponse(properties); }; /** - * Encodes the specified PublishResponse message. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static - * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode + * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PublishResponse.encode = function encode(message, writer) { + ListSnapshotsResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.messageIds != null && message.messageIds.length) - for (var i = 0; i < message.messageIds.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.messageIds[i]); + if (message.snapshots != null && message.snapshots.length) + for (var i = 0; i < message.snapshots.length; ++i) + $root.google.pubsub.v1.Snapshot.encode(message.snapshots[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); return writer; }; /** - * Encodes the specified PublishResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PublishResponse.verify|verify} messages. + * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static - * @param {google.pubsub.v1.IPublishResponse} message PublishResponse message or plain object to encode + * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - PublishResponse.encodeDelimited = function encodeDelimited(message, writer) { + ListSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a PublishResponse message from the specified reader or buffer. + * Decodes a ListSnapshotsResponse message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishResponse.decode = function decode(reader, length) { + ListSnapshotsResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishResponse(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsResponse(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.messageIds && message.messageIds.length)) - message.messageIds = []; - message.messageIds.push(reader.string()); + if (!(message.snapshots && message.snapshots.length)) + message.snapshots = []; + message.snapshots.push($root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32())); + break; + case 2: + message.nextPageToken = reader.string(); break; default: reader.skipType(tag & 7); @@ -15691,121 +9993,133 @@ }; /** - * Decodes a PublishResponse message from the specified reader or buffer, length delimited. + * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishResponse.decodeDelimited = function decodeDelimited(reader) { + ListSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a PublishResponse message. + * Verifies a ListSnapshotsResponse message. * @function verify - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - PublishResponse.verify = function verify(message) { + ListSnapshotsResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.messageIds != null && message.hasOwnProperty("messageIds")) { - if (!Array.isArray(message.messageIds)) - return "messageIds: array expected"; - for (var i = 0; i < message.messageIds.length; ++i) - if (!$util.isString(message.messageIds[i])) - return "messageIds: string[] expected"; + if (message.snapshots != null && message.hasOwnProperty("snapshots")) { + if (!Array.isArray(message.snapshots)) + return "snapshots: array expected"; + for (var i = 0; i < message.snapshots.length; ++i) { + var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshots[i]); + if (error) + return "snapshots." + error; + } } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; return null; }; /** - * Creates a PublishResponse message from a plain object. Also converts values to their respective internal types. + * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PublishResponse} PublishResponse + * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse */ - PublishResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PublishResponse) + ListSnapshotsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSnapshotsResponse) return object; - var message = new $root.google.pubsub.v1.PublishResponse(); - if (object.messageIds) { - if (!Array.isArray(object.messageIds)) - throw TypeError(".google.pubsub.v1.PublishResponse.messageIds: array expected"); - message.messageIds = []; - for (var i = 0; i < object.messageIds.length; ++i) - message.messageIds[i] = String(object.messageIds[i]); + var message = new $root.google.pubsub.v1.ListSnapshotsResponse(); + if (object.snapshots) { + if (!Array.isArray(object.snapshots)) + throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: array expected"); + message.snapshots = []; + for (var i = 0; i < object.snapshots.length; ++i) { + if (typeof object.snapshots[i] !== "object") + throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: object expected"); + message.snapshots[i] = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshots[i]); + } } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); return message; }; /** - * Creates a plain object from a PublishResponse message. Also converts values to other types if specified. + * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @static - * @param {google.pubsub.v1.PublishResponse} message PublishResponse + * @param {google.pubsub.v1.ListSnapshotsResponse} message ListSnapshotsResponse * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - PublishResponse.toObject = function toObject(message, options) { + ListSnapshotsResponse.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.arrays || options.defaults) - object.messageIds = []; - if (message.messageIds && message.messageIds.length) { - object.messageIds = []; - for (var j = 0; j < message.messageIds.length; ++j) - object.messageIds[j] = message.messageIds[j]; + object.snapshots = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.snapshots && message.snapshots.length) { + object.snapshots = []; + for (var j = 0; j < message.snapshots.length; ++j) + object.snapshots[j] = $root.google.pubsub.v1.Snapshot.toObject(message.snapshots[j], options); } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; return object; }; /** - * Converts this PublishResponse to JSON. + * Converts this ListSnapshotsResponse to JSON. * @function toJSON - * @memberof google.pubsub.v1.PublishResponse + * @memberof google.pubsub.v1.ListSnapshotsResponse * @instance * @returns {Object.} JSON object */ - PublishResponse.prototype.toJSON = function toJSON() { + ListSnapshotsResponse.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return PublishResponse; + return ListSnapshotsResponse; })(); - v1.ListTopicsRequest = (function() { + v1.DeleteSnapshotRequest = (function() { /** - * Properties of a ListTopicsRequest. + * Properties of a DeleteSnapshotRequest. * @memberof google.pubsub.v1 - * @interface IListTopicsRequest - * @property {string|null} [project] ListTopicsRequest project - * @property {number|null} [pageSize] ListTopicsRequest pageSize - * @property {string|null} [pageToken] ListTopicsRequest pageToken + * @interface IDeleteSnapshotRequest + * @property {string|null} [snapshot] DeleteSnapshotRequest snapshot */ /** - * Constructs a new ListTopicsRequest. + * Constructs a new DeleteSnapshotRequest. * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicsRequest. - * @implements IListTopicsRequest + * @classdesc Represents a DeleteSnapshotRequest. + * @implements IDeleteSnapshotRequest * @constructor - * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set + * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set */ - function ListTopicsRequest(properties) { + function DeleteSnapshotRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -15813,101 +10127,75 @@ } /** - * ListTopicsRequest project. - * @member {string} project - * @memberof google.pubsub.v1.ListTopicsRequest - * @instance - */ - ListTopicsRequest.prototype.project = ""; - - /** - * ListTopicsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListTopicsRequest - * @instance - */ - ListTopicsRequest.prototype.pageSize = 0; - - /** - * ListTopicsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListTopicsRequest + * DeleteSnapshotRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @instance */ - ListTopicsRequest.prototype.pageToken = ""; + DeleteSnapshotRequest.prototype.snapshot = ""; /** - * Creates a new ListTopicsRequest instance using the specified properties. + * Creates a new DeleteSnapshotRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static - * @param {google.pubsub.v1.IListTopicsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest instance + * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest instance */ - ListTopicsRequest.create = function create(properties) { - return new ListTopicsRequest(properties); + DeleteSnapshotRequest.create = function create(properties) { + return new DeleteSnapshotRequest(properties); }; /** - * Encodes the specified ListTopicsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static - * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode + * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicsRequest.encode = function encode(message, writer) { + DeleteSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); return writer; }; /** - * Encodes the specified ListTopicsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsRequest.verify|verify} messages. + * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static - * @param {google.pubsub.v1.IListTopicsRequest} message ListTopicsRequest message or plain object to encode + * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicsRequest.encodeDelimited = function encodeDelimited(message, writer) { + DeleteSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListTopicsRequest message from the specified reader or buffer. + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsRequest.decode = function decode(reader, length) { + DeleteSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.project = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); + message.snapshot = reader.string(); break; default: reader.skipType(tag & 7); @@ -15918,126 +10206,109 @@ }; /** - * Decodes a ListTopicsRequest message from the specified reader or buffer, length delimited. + * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsRequest.decodeDelimited = function decodeDelimited(reader) { + DeleteSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListTopicsRequest message. + * Verifies a DeleteSnapshotRequest message. * @function verify - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListTopicsRequest.verify = function verify(message) { + DeleteSnapshotRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.project != null && message.hasOwnProperty("project")) - if (!$util.isString(message.project)) - return "project: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; return null; }; /** - * Creates a ListTopicsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicsRequest} ListTopicsRequest + * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest */ - ListTopicsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicsRequest) + DeleteSnapshotRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteSnapshotRequest) return object; - var message = new $root.google.pubsub.v1.ListTopicsRequest(); - if (object.project != null) - message.project = String(object.project); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); + var message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); + if (object.snapshot != null) + message.snapshot = String(object.snapshot); return message; }; /** - * Creates a plain object from a ListTopicsRequest message. Also converts values to other types if specified. + * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @static - * @param {google.pubsub.v1.ListTopicsRequest} message ListTopicsRequest + * @param {google.pubsub.v1.DeleteSnapshotRequest} message DeleteSnapshotRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListTopicsRequest.toObject = function toObject(message, options) { + DeleteSnapshotRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.defaults) { - object.project = ""; - object.pageSize = 0; - object.pageToken = ""; - } - if (message.project != null && message.hasOwnProperty("project")) - object.project = message.project; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; + if (options.defaults) + object.snapshot = ""; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + object.snapshot = message.snapshot; return object; }; /** - * Converts this ListTopicsRequest to JSON. + * Converts this DeleteSnapshotRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListTopicsRequest + * @memberof google.pubsub.v1.DeleteSnapshotRequest * @instance * @returns {Object.} JSON object */ - ListTopicsRequest.prototype.toJSON = function toJSON() { + DeleteSnapshotRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListTopicsRequest; + return DeleteSnapshotRequest; })(); - v1.ListTopicsResponse = (function() { + v1.SeekRequest = (function() { /** - * Properties of a ListTopicsResponse. + * Properties of a SeekRequest. * @memberof google.pubsub.v1 - * @interface IListTopicsResponse - * @property {Array.|null} [topics] ListTopicsResponse topics - * @property {string|null} [nextPageToken] ListTopicsResponse nextPageToken + * @interface ISeekRequest + * @property {string|null} [subscription] SeekRequest subscription + * @property {google.protobuf.ITimestamp|null} [time] SeekRequest time + * @property {string|null} [snapshot] SeekRequest snapshot */ /** - * Constructs a new ListTopicsResponse. + * Constructs a new SeekRequest. * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicsResponse. - * @implements IListTopicsResponse + * @classdesc Represents a SeekRequest. + * @implements ISeekRequest * @constructor - * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set + * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set */ - function ListTopicsResponse(properties) { - this.topics = []; + function SeekRequest(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -16045,91 +10316,115 @@ } /** - * ListTopicsResponse topics. - * @member {Array.} topics - * @memberof google.pubsub.v1.ListTopicsResponse + * SeekRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.SeekRequest * @instance */ - ListTopicsResponse.prototype.topics = $util.emptyArray; + SeekRequest.prototype.subscription = ""; /** - * ListTopicsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListTopicsResponse + * SeekRequest time. + * @member {google.protobuf.ITimestamp|null|undefined} time + * @memberof google.pubsub.v1.SeekRequest * @instance */ - ListTopicsResponse.prototype.nextPageToken = ""; + SeekRequest.prototype.time = null; /** - * Creates a new ListTopicsResponse instance using the specified properties. + * SeekRequest snapshot. + * @member {string} snapshot + * @memberof google.pubsub.v1.SeekRequest + * @instance + */ + SeekRequest.prototype.snapshot = ""; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * SeekRequest target. + * @member {"time"|"snapshot"|undefined} target + * @memberof google.pubsub.v1.SeekRequest + * @instance + */ + Object.defineProperty(SeekRequest.prototype, "target", { + get: $util.oneOfGetter($oneOfFields = ["time", "snapshot"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new SeekRequest instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @static - * @param {google.pubsub.v1.IListTopicsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse instance + * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.SeekRequest} SeekRequest instance */ - ListTopicsResponse.create = function create(properties) { - return new ListTopicsResponse(properties); + SeekRequest.create = function create(properties) { + return new SeekRequest(properties); }; /** - * Encodes the specified ListTopicsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @static - * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicsResponse.encode = function encode(message, writer) { + SeekRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topics != null && message.topics.length) - for (var i = 0; i < message.topics.length; ++i) - $root.google.pubsub.v1.Topic.encode(message.topics[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + if (message.subscription != null && message.hasOwnProperty("subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + if (message.time != null && message.hasOwnProperty("time")) + $root.google.protobuf.Timestamp.encode(message.time, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.snapshot != null && message.hasOwnProperty("snapshot")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.snapshot); return writer; }; /** - * Encodes the specified ListTopicsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicsResponse.verify|verify} messages. + * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @static - * @param {google.pubsub.v1.IListTopicsResponse} message ListTopicsResponse message or plain object to encode + * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicsResponse.encodeDelimited = function encodeDelimited(message, writer) { + SeekRequest.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListTopicsResponse message from the specified reader or buffer. + * Decodes a SeekRequest message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @returns {google.pubsub.v1.SeekRequest} SeekRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsResponse.decode = function decode(reader, length) { + SeekRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsResponse(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekRequest(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.topics && message.topics.length)) - message.topics = []; - message.topics.push($root.google.pubsub.v1.Topic.decode(reader, reader.uint32())); + message.subscription = reader.string(); break; case 2: - message.nextPageToken = reader.string(); + message.time = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + case 3: + message.snapshot = reader.string(); break; default: reader.skipType(tag & 7); @@ -16140,238 +10435,203 @@ }; /** - * Decodes a ListTopicsResponse message from the specified reader or buffer, length delimited. + * Decodes a SeekRequest message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @returns {google.pubsub.v1.SeekRequest} SeekRequest * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsResponse.decodeDelimited = function decodeDelimited(reader) { + SeekRequest.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListTopicsResponse message. + * Verifies a SeekRequest message. * @function verify - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListTopicsResponse.verify = function verify(message) { + SeekRequest.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.topics != null && message.hasOwnProperty("topics")) { - if (!Array.isArray(message.topics)) - return "topics: array expected"; - for (var i = 0; i < message.topics.length; ++i) { - var error = $root.google.pubsub.v1.Topic.verify(message.topics[i]); + var properties = {}; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + if (message.time != null && message.hasOwnProperty("time")) { + properties.target = 1; + { + var error = $root.google.protobuf.Timestamp.verify(message.time); if (error) - return "topics." + error; + return "time." + error; } } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + if (properties.target === 1) + return "target: multiple values"; + properties.target = 1; + if (!$util.isString(message.snapshot)) + return "snapshot: string expected"; + } return null; }; /** - * Creates a ListTopicsResponse message from a plain object. Also converts values to their respective internal types. + * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicsResponse} ListTopicsResponse + * @returns {google.pubsub.v1.SeekRequest} SeekRequest */ - ListTopicsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicsResponse) + SeekRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.SeekRequest) return object; - var message = new $root.google.pubsub.v1.ListTopicsResponse(); - if (object.topics) { - if (!Array.isArray(object.topics)) - throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: array expected"); - message.topics = []; - for (var i = 0; i < object.topics.length; ++i) { - if (typeof object.topics[i] !== "object") - throw TypeError(".google.pubsub.v1.ListTopicsResponse.topics: object expected"); - message.topics[i] = $root.google.pubsub.v1.Topic.fromObject(object.topics[i]); - } + var message = new $root.google.pubsub.v1.SeekRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + if (object.time != null) { + if (typeof object.time !== "object") + throw TypeError(".google.pubsub.v1.SeekRequest.time: object expected"); + message.time = $root.google.protobuf.Timestamp.fromObject(object.time); } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); + if (object.snapshot != null) + message.snapshot = String(object.snapshot); return message; }; /** - * Creates a plain object from a ListTopicsResponse message. Also converts values to other types if specified. + * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @static - * @param {google.pubsub.v1.ListTopicsResponse} message ListTopicsResponse + * @param {google.pubsub.v1.SeekRequest} message SeekRequest * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListTopicsResponse.toObject = function toObject(message, options) { + SeekRequest.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) - object.topics = []; if (options.defaults) - object.nextPageToken = ""; - if (message.topics && message.topics.length) { - object.topics = []; - for (var j = 0; j < message.topics.length; ++j) - object.topics[j] = $root.google.pubsub.v1.Topic.toObject(message.topics[j], options); + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + if (message.time != null && message.hasOwnProperty("time")) { + object.time = $root.google.protobuf.Timestamp.toObject(message.time, options); + if (options.oneofs) + object.target = "time"; + } + if (message.snapshot != null && message.hasOwnProperty("snapshot")) { + object.snapshot = message.snapshot; + if (options.oneofs) + object.target = "snapshot"; } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; return object; }; /** - * Converts this ListTopicsResponse to JSON. + * Converts this SeekRequest to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListTopicsResponse + * @memberof google.pubsub.v1.SeekRequest * @instance * @returns {Object.} JSON object */ - ListTopicsResponse.prototype.toJSON = function toJSON() { + SeekRequest.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListTopicsResponse; + return SeekRequest; })(); - v1.ListTopicSubscriptionsRequest = (function() { - - /** - * Properties of a ListTopicSubscriptionsRequest. - * @memberof google.pubsub.v1 - * @interface IListTopicSubscriptionsRequest - * @property {string|null} [topic] ListTopicSubscriptionsRequest topic - * @property {number|null} [pageSize] ListTopicSubscriptionsRequest pageSize - * @property {string|null} [pageToken] ListTopicSubscriptionsRequest pageToken - */ + v1.SeekResponse = (function() { /** - * Constructs a new ListTopicSubscriptionsRequest. + * Properties of a SeekResponse. * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicSubscriptionsRequest. - * @implements IListTopicSubscriptionsRequest - * @constructor - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set - */ - function ListTopicSubscriptionsRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ListTopicSubscriptionsRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @instance - */ - ListTopicSubscriptionsRequest.prototype.topic = ""; - - /** - * ListTopicSubscriptionsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @instance + * @interface ISeekResponse */ - ListTopicSubscriptionsRequest.prototype.pageSize = 0; /** - * ListTopicSubscriptionsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest - * @instance + * Constructs a new SeekResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a SeekResponse. + * @implements ISeekResponse + * @constructor + * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set */ - ListTopicSubscriptionsRequest.prototype.pageToken = ""; + function SeekResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * Creates a new ListTopicSubscriptionsRequest instance using the specified properties. + * Creates a new SeekResponse instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest instance + * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.SeekResponse} SeekResponse instance */ - ListTopicSubscriptionsRequest.create = function create(properties) { - return new ListTopicSubscriptionsRequest(properties); + SeekResponse.create = function create(properties) { + return new SeekResponse(properties); }; /** - * Encodes the specified ListTopicSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode + * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicSubscriptionsRequest.encode = function encode(message, writer) { + SeekResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; /** - * Encodes the specified ListTopicSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsRequest.verify|verify} messages. + * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest message or plain object to encode + * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListTopicSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + SeekResponse.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer. + * Decodes a SeekResponse message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @returns {google.pubsub.v1.SeekResponse} SeekResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicSubscriptionsRequest.decode = function decode(reader, length) { + SeekResponse.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekResponse(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; default: reader.skipType(tag & 7); break; @@ -16381,2036 +10641,2953 @@ }; /** - * Decodes a ListTopicSubscriptionsRequest message from the specified reader or buffer, length delimited. + * Decodes a SeekResponse message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @returns {google.pubsub.v1.SeekResponse} SeekResponse * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { + SeekResponse.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListTopicSubscriptionsRequest message. + * Verifies a SeekResponse message. * @function verify - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListTopicSubscriptionsRequest.verify = function verify(message) { + SeekResponse.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; return null; }; /** - * Creates a ListTopicSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicSubscriptionsRequest} ListTopicSubscriptionsRequest + * @returns {google.pubsub.v1.SeekResponse} SeekResponse */ - ListTopicSubscriptionsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsRequest) + SeekResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.SeekResponse) return object; - var message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); - if (object.topic != null) - message.topic = String(object.topic); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); - return message; + return new $root.google.pubsub.v1.SeekResponse(); }; /** - * Creates a plain object from a ListTopicSubscriptionsRequest message. Also converts values to other types if specified. + * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @static - * @param {google.pubsub.v1.ListTopicSubscriptionsRequest} message ListTopicSubscriptionsRequest + * @param {google.pubsub.v1.SeekResponse} message SeekResponse * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListTopicSubscriptionsRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.topic = ""; - object.pageSize = 0; - object.pageToken = ""; - } - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; - return object; + SeekResponse.toObject = function toObject() { + return {}; }; /** - * Converts this ListTopicSubscriptionsRequest to JSON. + * Converts this SeekResponse to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @memberof google.pubsub.v1.SeekResponse * @instance * @returns {Object.} JSON object */ - ListTopicSubscriptionsRequest.prototype.toJSON = function toJSON() { + SeekResponse.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListTopicSubscriptionsRequest; + return SeekResponse; })(); - v1.ListTopicSubscriptionsResponse = (function() { + return v1; + })(); + + return pubsub; + })(); + + google.api = (function() { + + /** + * Namespace api. + * @memberof google + * @namespace + */ + var api = {}; + + api.Http = (function() { + + /** + * Properties of a Http. + * @memberof google.api + * @interface IHttp + * @property {Array.|null} [rules] Http rules + * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion + */ + + /** + * Constructs a new Http. + * @memberof google.api + * @classdesc Represents a Http. + * @implements IHttp + * @constructor + * @param {google.api.IHttp=} [properties] Properties to set + */ + function Http(properties) { + this.rules = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Http rules. + * @member {Array.} rules + * @memberof google.api.Http + * @instance + */ + Http.prototype.rules = $util.emptyArray; + + /** + * Http fullyDecodeReservedExpansion. + * @member {boolean} fullyDecodeReservedExpansion + * @memberof google.api.Http + * @instance + */ + Http.prototype.fullyDecodeReservedExpansion = false; + + /** + * Creates a new Http instance using the specified properties. + * @function create + * @memberof google.api.Http + * @static + * @param {google.api.IHttp=} [properties] Properties to set + * @returns {google.api.Http} Http instance + */ + Http.create = function create(properties) { + return new Http(properties); + }; + + /** + * Encodes the specified Http message. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @function encode + * @memberof google.api.Http + * @static + * @param {google.api.IHttp} message Http message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Http.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.rules != null && message.rules.length) + for (var i = 0; i < message.rules.length; ++i) + $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); + return writer; + }; + + /** + * Encodes the specified Http message, length delimited. Does not implicitly {@link google.api.Http.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.Http + * @static + * @param {google.api.IHttp} message Http message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Http.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Http message from the specified reader or buffer. + * @function decode + * @memberof google.api.Http + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.Http} Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Http.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.rules && message.rules.length)) + message.rules = []; + message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + break; + case 2: + message.fullyDecodeReservedExpansion = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Http message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.Http + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.Http} Http + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Http.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Properties of a ListTopicSubscriptionsResponse. - * @memberof google.pubsub.v1 - * @interface IListTopicSubscriptionsResponse - * @property {Array.|null} [subscriptions] ListTopicSubscriptionsResponse subscriptions - * @property {string|null} [nextPageToken] ListTopicSubscriptionsResponse nextPageToken - */ + /** + * Verifies a Http message. + * @function verify + * @memberof google.api.Http + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Http.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.rules != null && message.hasOwnProperty("rules")) { + if (!Array.isArray(message.rules)) + return "rules: array expected"; + for (var i = 0; i < message.rules.length; ++i) { + var error = $root.google.api.HttpRule.verify(message.rules[i]); + if (error) + return "rules." + error; + } + } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + if (typeof message.fullyDecodeReservedExpansion !== "boolean") + return "fullyDecodeReservedExpansion: boolean expected"; + return null; + }; - /** - * Constructs a new ListTopicSubscriptionsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicSubscriptionsResponse. - * @implements IListTopicSubscriptionsResponse - * @constructor - * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set - */ - function ListTopicSubscriptionsResponse(properties) { - this.subscriptions = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Creates a Http message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.Http + * @static + * @param {Object.} object Plain object + * @returns {google.api.Http} Http + */ + Http.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.Http) + return object; + var message = new $root.google.api.Http(); + if (object.rules) { + if (!Array.isArray(object.rules)) + throw TypeError(".google.api.Http.rules: array expected"); + message.rules = []; + for (var i = 0; i < object.rules.length; ++i) { + if (typeof object.rules[i] !== "object") + throw TypeError(".google.api.Http.rules: object expected"); + message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); + } } + if (object.fullyDecodeReservedExpansion != null) + message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); + return message; + }; - /** - * ListTopicSubscriptionsResponse subscriptions. - * @member {Array.} subscriptions - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @instance - */ - ListTopicSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; + /** + * Creates a plain object from a Http message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.Http + * @static + * @param {google.api.Http} message Http + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Http.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.rules = []; + if (options.defaults) + object.fullyDecodeReservedExpansion = false; + if (message.rules && message.rules.length) { + object.rules = []; + for (var j = 0; j < message.rules.length; ++j) + object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); + } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; + return object; + }; - /** - * ListTopicSubscriptionsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @instance - */ - ListTopicSubscriptionsResponse.prototype.nextPageToken = ""; + /** + * Converts this Http to JSON. + * @function toJSON + * @memberof google.api.Http + * @instance + * @returns {Object.} JSON object + */ + Http.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a new ListTopicSubscriptionsResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse instance - */ - ListTopicSubscriptionsResponse.create = function create(properties) { - return new ListTopicSubscriptionsResponse(properties); - }; + return Http; + })(); - /** - * Encodes the specified ListTopicSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSubscriptionsResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscriptions != null && message.subscriptions.length) - for (var i = 0; i < message.subscriptions.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscriptions[i]); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); - return writer; - }; + api.HttpRule = (function() { - /** - * Encodes the specified ListTopicSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSubscriptionsResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Properties of a HttpRule. + * @memberof google.api + * @interface IHttpRule + * @property {string|null} [selector] HttpRule selector + * @property {string|null} [get] HttpRule get + * @property {string|null} [put] HttpRule put + * @property {string|null} [post] HttpRule post + * @property {string|null} ["delete"] HttpRule delete + * @property {string|null} [patch] HttpRule patch + * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom + * @property {string|null} [body] HttpRule body + * @property {string|null} [responseBody] HttpRule responseBody + * @property {Array.|null} [additionalBindings] HttpRule additionalBindings + */ - /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSubscriptionsResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.subscriptions && message.subscriptions.length)) - message.subscriptions = []; - message.subscriptions.push(reader.string()); - break; - case 2: - message.nextPageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Constructs a new HttpRule. + * @memberof google.api + * @classdesc Represents a HttpRule. + * @implements IHttpRule + * @constructor + * @param {google.api.IHttpRule=} [properties] Properties to set + */ + function HttpRule(properties) { + this.additionalBindings = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Decodes a ListTopicSubscriptionsResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * HttpRule selector. + * @member {string} selector + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.selector = ""; - /** - * Verifies a ListTopicSubscriptionsResponse message. - * @function verify - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListTopicSubscriptionsResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { - if (!Array.isArray(message.subscriptions)) - return "subscriptions: array expected"; - for (var i = 0; i < message.subscriptions.length; ++i) - if (!$util.isString(message.subscriptions[i])) - return "subscriptions: string[] expected"; - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; - return null; - }; + /** + * HttpRule get. + * @member {string} get + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.get = ""; - /** - * Creates a ListTopicSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicSubscriptionsResponse} ListTopicSubscriptionsResponse - */ - ListTopicSubscriptionsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicSubscriptionsResponse) - return object; - var message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); - if (object.subscriptions) { - if (!Array.isArray(object.subscriptions)) - throw TypeError(".google.pubsub.v1.ListTopicSubscriptionsResponse.subscriptions: array expected"); - message.subscriptions = []; - for (var i = 0; i < object.subscriptions.length; ++i) - message.subscriptions[i] = String(object.subscriptions[i]); - } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); - return message; - }; + /** + * HttpRule put. + * @member {string} put + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.put = ""; - /** - * Creates a plain object from a ListTopicSubscriptionsResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @static - * @param {google.pubsub.v1.ListTopicSubscriptionsResponse} message ListTopicSubscriptionsResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListTopicSubscriptionsResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.subscriptions = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.subscriptions && message.subscriptions.length) { - object.subscriptions = []; - for (var j = 0; j < message.subscriptions.length; ++j) - object.subscriptions[j] = message.subscriptions[j]; - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; - return object; - }; + /** + * HttpRule post. + * @member {string} post + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.post = ""; - /** - * Converts this ListTopicSubscriptionsResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse - * @instance - * @returns {Object.} JSON object - */ - ListTopicSubscriptionsResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * HttpRule delete. + * @member {string} delete + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype["delete"] = ""; - return ListTopicSubscriptionsResponse; - })(); + /** + * HttpRule patch. + * @member {string} patch + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.patch = ""; - v1.ListTopicSnapshotsRequest = (function() { + /** + * HttpRule custom. + * @member {google.api.ICustomHttpPattern|null|undefined} custom + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.custom = null; - /** - * Properties of a ListTopicSnapshotsRequest. - * @memberof google.pubsub.v1 - * @interface IListTopicSnapshotsRequest - * @property {string|null} [topic] ListTopicSnapshotsRequest topic - * @property {number|null} [pageSize] ListTopicSnapshotsRequest pageSize - * @property {string|null} [pageToken] ListTopicSnapshotsRequest pageToken - */ + /** + * HttpRule body. + * @member {string} body + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.body = ""; - /** - * Constructs a new ListTopicSnapshotsRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicSnapshotsRequest. - * @implements IListTopicSnapshotsRequest - * @constructor - * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set - */ - function ListTopicSnapshotsRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * HttpRule responseBody. + * @member {string} responseBody + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.responseBody = ""; - /** - * ListTopicSnapshotsRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @instance - */ - ListTopicSnapshotsRequest.prototype.topic = ""; + /** + * HttpRule additionalBindings. + * @member {Array.} additionalBindings + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.additionalBindings = $util.emptyArray; - /** - * ListTopicSnapshotsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @instance - */ - ListTopicSnapshotsRequest.prototype.pageSize = 0; + // OneOf field names bound to virtual getters and setters + var $oneOfFields; - /** - * ListTopicSnapshotsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @instance - */ - ListTopicSnapshotsRequest.prototype.pageToken = ""; + /** + * HttpRule pattern. + * @member {"get"|"put"|"post"|"delete"|"patch"|"custom"|undefined} pattern + * @memberof google.api.HttpRule + * @instance + */ + Object.defineProperty(HttpRule.prototype, "pattern", { + get: $util.oneOfGetter($oneOfFields = ["get", "put", "post", "delete", "patch", "custom"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new HttpRule instance using the specified properties. + * @function create + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule=} [properties] Properties to set + * @returns {google.api.HttpRule} HttpRule instance + */ + HttpRule.create = function create(properties) { + return new HttpRule(properties); + }; + + /** + * Encodes the specified HttpRule message. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @function encode + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + HttpRule.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.selector != null && message.hasOwnProperty("selector")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); + if (message.get != null && message.hasOwnProperty("get")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.get); + if (message.put != null && message.hasOwnProperty("put")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.put); + if (message.post != null && message.hasOwnProperty("post")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.post); + if (message["delete"] != null && message.hasOwnProperty("delete")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]); + if (message.patch != null && message.hasOwnProperty("patch")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch); + if (message.body != null && message.hasOwnProperty("body")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.body); + if (message.custom != null && message.hasOwnProperty("custom")) + $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.additionalBindings != null && message.additionalBindings.length) + for (var i = 0; i < message.additionalBindings.length; ++i) + $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); + return writer; + }; - /** - * Creates a new ListTopicSnapshotsRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest instance - */ - ListTopicSnapshotsRequest.create = function create(properties) { - return new ListTopicSnapshotsRequest(properties); - }; + /** + * Encodes the specified HttpRule message, length delimited. Does not implicitly {@link google.api.HttpRule.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.HttpRule + * @static + * @param {google.api.IHttpRule} message HttpRule message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + HttpRule.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Encodes the specified ListTopicSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSnapshotsRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); - return writer; - }; + /** + * Decodes a HttpRule message from the specified reader or buffer. + * @function decode + * @memberof google.api.HttpRule + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.HttpRule} HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + HttpRule.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.selector = reader.string(); + break; + case 2: + message.get = reader.string(); + break; + case 3: + message.put = reader.string(); + break; + case 4: + message.post = reader.string(); + break; + case 5: + message["delete"] = reader.string(); + break; + case 6: + message.patch = reader.string(); + break; + case 8: + message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); + break; + case 7: + message.body = reader.string(); + break; + case 12: + message.responseBody = reader.string(); + break; + case 11: + if (!(message.additionalBindings && message.additionalBindings.length)) + message.additionalBindings = []; + message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified ListTopicSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsRequest} message ListTopicSnapshotsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Decodes a HttpRule message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.HttpRule + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.HttpRule} HttpRule + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + HttpRule.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSnapshotsRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Verifies a HttpRule message. + * @function verify + * @memberof google.api.HttpRule + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + HttpRule.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.selector != null && message.hasOwnProperty("selector")) + if (!$util.isString(message.selector)) + return "selector: string expected"; + if (message.get != null && message.hasOwnProperty("get")) { + properties.pattern = 1; + if (!$util.isString(message.get)) + return "get: string expected"; + } + if (message.put != null && message.hasOwnProperty("put")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.put)) + return "put: string expected"; + } + if (message.post != null && message.hasOwnProperty("post")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.post)) + return "post: string expected"; + } + if (message["delete"] != null && message.hasOwnProperty("delete")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message["delete"])) + return "delete: string expected"; + } + if (message.patch != null && message.hasOwnProperty("patch")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + if (!$util.isString(message.patch)) + return "patch: string expected"; + } + if (message.custom != null && message.hasOwnProperty("custom")) { + if (properties.pattern === 1) + return "pattern: multiple values"; + properties.pattern = 1; + { + var error = $root.google.api.CustomHttpPattern.verify(message.custom); + if (error) + return "custom." + error; + } + } + if (message.body != null && message.hasOwnProperty("body")) + if (!$util.isString(message.body)) + return "body: string expected"; + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + if (!$util.isString(message.responseBody)) + return "responseBody: string expected"; + if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { + if (!Array.isArray(message.additionalBindings)) + return "additionalBindings: array expected"; + for (var i = 0; i < message.additionalBindings.length; ++i) { + var error = $root.google.api.HttpRule.verify(message.additionalBindings[i]); + if (error) + return "additionalBindings." + error; + } + } + return null; + }; + + /** + * Creates a HttpRule message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.HttpRule + * @static + * @param {Object.} object Plain object + * @returns {google.api.HttpRule} HttpRule + */ + HttpRule.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.HttpRule) + return object; + var message = new $root.google.api.HttpRule(); + if (object.selector != null) + message.selector = String(object.selector); + if (object.get != null) + message.get = String(object.get); + if (object.put != null) + message.put = String(object.put); + if (object.post != null) + message.post = String(object.post); + if (object["delete"] != null) + message["delete"] = String(object["delete"]); + if (object.patch != null) + message.patch = String(object.patch); + if (object.custom != null) { + if (typeof object.custom !== "object") + throw TypeError(".google.api.HttpRule.custom: object expected"); + message.custom = $root.google.api.CustomHttpPattern.fromObject(object.custom); + } + if (object.body != null) + message.body = String(object.body); + if (object.responseBody != null) + message.responseBody = String(object.responseBody); + if (object.additionalBindings) { + if (!Array.isArray(object.additionalBindings)) + throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); + message.additionalBindings = []; + for (var i = 0; i < object.additionalBindings.length; ++i) { + if (typeof object.additionalBindings[i] !== "object") + throw TypeError(".google.api.HttpRule.additionalBindings: object expected"); + message.additionalBindings[i] = $root.google.api.HttpRule.fromObject(object.additionalBindings[i]); } - return message; - }; + } + return message; + }; - /** - * Decodes a ListTopicSnapshotsRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a plain object from a HttpRule message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.HttpRule + * @static + * @param {google.api.HttpRule} message HttpRule + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + HttpRule.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.additionalBindings = []; + if (options.defaults) { + object.selector = ""; + object.body = ""; + object.responseBody = ""; + } + if (message.selector != null && message.hasOwnProperty("selector")) + object.selector = message.selector; + if (message.get != null && message.hasOwnProperty("get")) { + object.get = message.get; + if (options.oneofs) + object.pattern = "get"; + } + if (message.put != null && message.hasOwnProperty("put")) { + object.put = message.put; + if (options.oneofs) + object.pattern = "put"; + } + if (message.post != null && message.hasOwnProperty("post")) { + object.post = message.post; + if (options.oneofs) + object.pattern = "post"; + } + if (message["delete"] != null && message.hasOwnProperty("delete")) { + object["delete"] = message["delete"]; + if (options.oneofs) + object.pattern = "delete"; + } + if (message.patch != null && message.hasOwnProperty("patch")) { + object.patch = message.patch; + if (options.oneofs) + object.pattern = "patch"; + } + if (message.body != null && message.hasOwnProperty("body")) + object.body = message.body; + if (message.custom != null && message.hasOwnProperty("custom")) { + object.custom = $root.google.api.CustomHttpPattern.toObject(message.custom, options); + if (options.oneofs) + object.pattern = "custom"; + } + if (message.additionalBindings && message.additionalBindings.length) { + object.additionalBindings = []; + for (var j = 0; j < message.additionalBindings.length; ++j) + object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); + } + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + object.responseBody = message.responseBody; + return object; + }; - /** - * Verifies a ListTopicSnapshotsRequest message. - * @function verify - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListTopicSnapshotsRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; - return null; - }; + /** + * Converts this HttpRule to JSON. + * @function toJSON + * @memberof google.api.HttpRule + * @instance + * @returns {Object.} JSON object + */ + HttpRule.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a ListTopicSnapshotsRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicSnapshotsRequest} ListTopicSnapshotsRequest - */ - ListTopicSnapshotsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsRequest) - return object; - var message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); - if (object.topic != null) - message.topic = String(object.topic); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); - return message; - }; + return HttpRule; + })(); - /** - * Creates a plain object from a ListTopicSnapshotsRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @static - * @param {google.pubsub.v1.ListTopicSnapshotsRequest} message ListTopicSnapshotsRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListTopicSnapshotsRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.topic = ""; - object.pageSize = 0; - object.pageToken = ""; - } - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; - return object; - }; + api.CustomHttpPattern = (function() { - /** - * Converts this ListTopicSnapshotsRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListTopicSnapshotsRequest - * @instance - * @returns {Object.} JSON object - */ - ListTopicSnapshotsRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Properties of a CustomHttpPattern. + * @memberof google.api + * @interface ICustomHttpPattern + * @property {string|null} [kind] CustomHttpPattern kind + * @property {string|null} [path] CustomHttpPattern path + */ - return ListTopicSnapshotsRequest; - })(); + /** + * Constructs a new CustomHttpPattern. + * @memberof google.api + * @classdesc Represents a CustomHttpPattern. + * @implements ICustomHttpPattern + * @constructor + * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + */ + function CustomHttpPattern(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - v1.ListTopicSnapshotsResponse = (function() { + /** + * CustomHttpPattern kind. + * @member {string} kind + * @memberof google.api.CustomHttpPattern + * @instance + */ + CustomHttpPattern.prototype.kind = ""; + + /** + * CustomHttpPattern path. + * @member {string} path + * @memberof google.api.CustomHttpPattern + * @instance + */ + CustomHttpPattern.prototype.path = ""; - /** - * Properties of a ListTopicSnapshotsResponse. - * @memberof google.pubsub.v1 - * @interface IListTopicSnapshotsResponse - * @property {Array.|null} [snapshots] ListTopicSnapshotsResponse snapshots - * @property {string|null} [nextPageToken] ListTopicSnapshotsResponse nextPageToken - */ + /** + * Creates a new CustomHttpPattern instance using the specified properties. + * @function create + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern=} [properties] Properties to set + * @returns {google.api.CustomHttpPattern} CustomHttpPattern instance + */ + CustomHttpPattern.create = function create(properties) { + return new CustomHttpPattern(properties); + }; - /** - * Constructs a new ListTopicSnapshotsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListTopicSnapshotsResponse. - * @implements IListTopicSnapshotsResponse - * @constructor - * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set - */ - function ListTopicSnapshotsResponse(properties) { - this.snapshots = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Encodes the specified CustomHttpPattern message. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @function encode + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CustomHttpPattern.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.kind != null && message.hasOwnProperty("kind")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind); + if (message.path != null && message.hasOwnProperty("path")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.path); + return writer; + }; - /** - * ListTopicSnapshotsResponse snapshots. - * @member {Array.} snapshots - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @instance - */ - ListTopicSnapshotsResponse.prototype.snapshots = $util.emptyArray; + /** + * Encodes the specified CustomHttpPattern message, length delimited. Does not implicitly {@link google.api.CustomHttpPattern.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.ICustomHttpPattern} message CustomHttpPattern message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CustomHttpPattern.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * ListTopicSnapshotsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @instance - */ - ListTopicSnapshotsResponse.prototype.nextPageToken = ""; + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer. + * @function decode + * @memberof google.api.CustomHttpPattern + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CustomHttpPattern.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.kind = reader.string(); + break; + case 2: + message.path = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Creates a new ListTopicSnapshotsResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse instance - */ - ListTopicSnapshotsResponse.create = function create(properties) { - return new ListTopicSnapshotsResponse(properties); - }; + /** + * Decodes a CustomHttpPattern message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.CustomHttpPattern + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CustomHttpPattern.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified ListTopicSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSnapshotsResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshots != null && message.snapshots.length) - for (var i = 0; i < message.snapshots.length; ++i) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshots[i]); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); - return writer; - }; + /** + * Verifies a CustomHttpPattern message. + * @function verify + * @memberof google.api.CustomHttpPattern + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CustomHttpPattern.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.kind != null && message.hasOwnProperty("kind")) + if (!$util.isString(message.kind)) + return "kind: string expected"; + if (message.path != null && message.hasOwnProperty("path")) + if (!$util.isString(message.path)) + return "path: string expected"; + return null; + }; - /** - * Encodes the specified ListTopicSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListTopicSnapshotsResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {google.pubsub.v1.IListTopicSnapshotsResponse} message ListTopicSnapshotsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListTopicSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates a CustomHttpPattern message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.CustomHttpPattern + * @static + * @param {Object.} object Plain object + * @returns {google.api.CustomHttpPattern} CustomHttpPattern + */ + CustomHttpPattern.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.CustomHttpPattern) + return object; + var message = new $root.google.api.CustomHttpPattern(); + if (object.kind != null) + message.kind = String(object.kind); + if (object.path != null) + message.path = String(object.path); + return message; + }; - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSnapshotsResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.snapshots && message.snapshots.length)) - message.snapshots = []; - message.snapshots.push(reader.string()); - break; - case 2: - message.nextPageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Creates a plain object from a CustomHttpPattern message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.CustomHttpPattern + * @static + * @param {google.api.CustomHttpPattern} message CustomHttpPattern + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CustomHttpPattern.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.kind = ""; + object.path = ""; + } + if (message.kind != null && message.hasOwnProperty("kind")) + object.kind = message.kind; + if (message.path != null && message.hasOwnProperty("path")) + object.path = message.path; + return object; + }; - /** - * Decodes a ListTopicSnapshotsResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListTopicSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Converts this CustomHttpPattern to JSON. + * @function toJSON + * @memberof google.api.CustomHttpPattern + * @instance + * @returns {Object.} JSON object + */ + CustomHttpPattern.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Verifies a ListTopicSnapshotsResponse message. - * @function verify - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListTopicSnapshotsResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshots != null && message.hasOwnProperty("snapshots")) { - if (!Array.isArray(message.snapshots)) - return "snapshots: array expected"; - for (var i = 0; i < message.snapshots.length; ++i) - if (!$util.isString(message.snapshots[i])) - return "snapshots: string[] expected"; - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; - return null; - }; + return CustomHttpPattern; + })(); - /** - * Creates a ListTopicSnapshotsResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListTopicSnapshotsResponse} ListTopicSnapshotsResponse - */ - ListTopicSnapshotsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListTopicSnapshotsResponse) - return object; - var message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); - if (object.snapshots) { - if (!Array.isArray(object.snapshots)) - throw TypeError(".google.pubsub.v1.ListTopicSnapshotsResponse.snapshots: array expected"); - message.snapshots = []; - for (var i = 0; i < object.snapshots.length; ++i) - message.snapshots[i] = String(object.snapshots[i]); - } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); - return message; - }; + /** + * FieldBehavior enum. + * @name google.api.FieldBehavior + * @enum {string} + * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value + * @property {number} OPTIONAL=1 OPTIONAL value + * @property {number} REQUIRED=2 REQUIRED value + * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value + * @property {number} INPUT_ONLY=4 INPUT_ONLY value + * @property {number} IMMUTABLE=5 IMMUTABLE value + */ + api.FieldBehavior = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "FIELD_BEHAVIOR_UNSPECIFIED"] = 0; + values[valuesById[1] = "OPTIONAL"] = 1; + values[valuesById[2] = "REQUIRED"] = 2; + values[valuesById[3] = "OUTPUT_ONLY"] = 3; + values[valuesById[4] = "INPUT_ONLY"] = 4; + values[valuesById[5] = "IMMUTABLE"] = 5; + return values; + })(); - /** - * Creates a plain object from a ListTopicSnapshotsResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @static - * @param {google.pubsub.v1.ListTopicSnapshotsResponse} message ListTopicSnapshotsResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListTopicSnapshotsResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.snapshots = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.snapshots && message.snapshots.length) { - object.snapshots = []; - for (var j = 0; j < message.snapshots.length; ++j) - object.snapshots[j] = message.snapshots[j]; - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; - return object; - }; + api.ResourceDescriptor = (function() { - /** - * Converts this ListTopicSnapshotsResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListTopicSnapshotsResponse - * @instance - * @returns {Object.} JSON object - */ - ListTopicSnapshotsResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Properties of a ResourceDescriptor. + * @memberof google.api + * @interface IResourceDescriptor + * @property {string|null} [type] ResourceDescriptor type + * @property {Array.|null} [pattern] ResourceDescriptor pattern + * @property {string|null} [nameField] ResourceDescriptor nameField + * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history + * @property {string|null} [plural] ResourceDescriptor plural + * @property {string|null} [singular] ResourceDescriptor singular + */ - return ListTopicSnapshotsResponse; - })(); + /** + * Constructs a new ResourceDescriptor. + * @memberof google.api + * @classdesc Represents a ResourceDescriptor. + * @implements IResourceDescriptor + * @constructor + * @param {google.api.IResourceDescriptor=} [properties] Properties to set + */ + function ResourceDescriptor(properties) { + this.pattern = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - v1.DeleteTopicRequest = (function() { + /** + * ResourceDescriptor type. + * @member {string} type + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.type = ""; - /** - * Properties of a DeleteTopicRequest. - * @memberof google.pubsub.v1 - * @interface IDeleteTopicRequest - * @property {string|null} [topic] DeleteTopicRequest topic - */ + /** + * ResourceDescriptor pattern. + * @member {Array.} pattern + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.pattern = $util.emptyArray; - /** - * Constructs a new DeleteTopicRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a DeleteTopicRequest. - * @implements IDeleteTopicRequest - * @constructor - * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set - */ - function DeleteTopicRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * ResourceDescriptor nameField. + * @member {string} nameField + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.nameField = ""; - /** - * DeleteTopicRequest topic. - * @member {string} topic - * @memberof google.pubsub.v1.DeleteTopicRequest - * @instance - */ - DeleteTopicRequest.prototype.topic = ""; + /** + * ResourceDescriptor history. + * @member {google.api.ResourceDescriptor.History} history + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.history = 0; - /** - * Creates a new DeleteTopicRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {google.pubsub.v1.IDeleteTopicRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest instance - */ - DeleteTopicRequest.create = function create(properties) { - return new DeleteTopicRequest(properties); - }; + /** + * ResourceDescriptor plural. + * @member {string} plural + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.plural = ""; - /** - * Encodes the specified DeleteTopicRequest message. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteTopicRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - return writer; - }; + /** + * ResourceDescriptor singular. + * @member {string} singular + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.singular = ""; - /** - * Encodes the specified DeleteTopicRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteTopicRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {google.pubsub.v1.IDeleteTopicRequest} message DeleteTopicRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteTopicRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates a new ResourceDescriptor instance using the specified properties. + * @function create + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor=} [properties] Properties to set + * @returns {google.api.ResourceDescriptor} ResourceDescriptor instance + */ + ResourceDescriptor.create = function create(properties) { + return new ResourceDescriptor(properties); + }; - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteTopicRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteTopicRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Encodes the specified ResourceDescriptor message. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @function encode + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceDescriptor.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); + if (message.pattern != null && message.pattern.length) + for (var i = 0; i < message.pattern.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]); + if (message.nameField != null && message.hasOwnProperty("nameField")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField); + if (message.history != null && message.hasOwnProperty("history")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history); + if (message.plural != null && message.hasOwnProperty("plural")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); + if (message.singular != null && message.hasOwnProperty("singular")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); + return writer; + }; - /** - * Decodes a DeleteTopicRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteTopicRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Encodes the specified ResourceDescriptor message, length delimited. Does not implicitly {@link google.api.ResourceDescriptor.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.IResourceDescriptor} message ResourceDescriptor message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceDescriptor.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Verifies a DeleteTopicRequest message. - * @function verify - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DeleteTopicRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - return null; - }; + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer. + * @function decode + * @memberof google.api.ResourceDescriptor + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceDescriptor.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.type = reader.string(); + break; + case 2: + if (!(message.pattern && message.pattern.length)) + message.pattern = []; + message.pattern.push(reader.string()); + break; + case 3: + message.nameField = reader.string(); + break; + case 4: + message.history = reader.int32(); + break; + case 5: + message.plural = reader.string(); + break; + case 6: + message.singular = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Creates a DeleteTopicRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.DeleteTopicRequest} DeleteTopicRequest - */ - DeleteTopicRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.DeleteTopicRequest) - return object; - var message = new $root.google.pubsub.v1.DeleteTopicRequest(); - if (object.topic != null) - message.topic = String(object.topic); - return message; - }; + /** + * Decodes a ResourceDescriptor message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.ResourceDescriptor + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceDescriptor.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a plain object from a DeleteTopicRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.DeleteTopicRequest - * @static - * @param {google.pubsub.v1.DeleteTopicRequest} message DeleteTopicRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DeleteTopicRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.topic = ""; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; + /** + * Verifies a ResourceDescriptor message. + * @function verify + * @memberof google.api.ResourceDescriptor + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ResourceDescriptor.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.pattern != null && message.hasOwnProperty("pattern")) { + if (!Array.isArray(message.pattern)) + return "pattern: array expected"; + for (var i = 0; i < message.pattern.length; ++i) + if (!$util.isString(message.pattern[i])) + return "pattern: string[] expected"; + } + if (message.nameField != null && message.hasOwnProperty("nameField")) + if (!$util.isString(message.nameField)) + return "nameField: string expected"; + if (message.history != null && message.hasOwnProperty("history")) + switch (message.history) { + default: + return "history: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.plural != null && message.hasOwnProperty("plural")) + if (!$util.isString(message.plural)) + return "plural: string expected"; + if (message.singular != null && message.hasOwnProperty("singular")) + if (!$util.isString(message.singular)) + return "singular: string expected"; + return null; + }; + + /** + * Creates a ResourceDescriptor message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.ResourceDescriptor + * @static + * @param {Object.} object Plain object + * @returns {google.api.ResourceDescriptor} ResourceDescriptor + */ + ResourceDescriptor.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ResourceDescriptor) return object; - }; + var message = new $root.google.api.ResourceDescriptor(); + if (object.type != null) + message.type = String(object.type); + if (object.pattern) { + if (!Array.isArray(object.pattern)) + throw TypeError(".google.api.ResourceDescriptor.pattern: array expected"); + message.pattern = []; + for (var i = 0; i < object.pattern.length; ++i) + message.pattern[i] = String(object.pattern[i]); + } + if (object.nameField != null) + message.nameField = String(object.nameField); + switch (object.history) { + case "HISTORY_UNSPECIFIED": + case 0: + message.history = 0; + break; + case "ORIGINALLY_SINGLE_PATTERN": + case 1: + message.history = 1; + break; + case "FUTURE_MULTI_PATTERN": + case 2: + message.history = 2; + break; + } + if (object.plural != null) + message.plural = String(object.plural); + if (object.singular != null) + message.singular = String(object.singular); + return message; + }; - /** - * Converts this DeleteTopicRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.DeleteTopicRequest - * @instance - * @returns {Object.} JSON object - */ - DeleteTopicRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a ResourceDescriptor message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.ResourceDescriptor + * @static + * @param {google.api.ResourceDescriptor} message ResourceDescriptor + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ResourceDescriptor.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.pattern = []; + if (options.defaults) { + object.type = ""; + object.nameField = ""; + object.history = options.enums === String ? "HISTORY_UNSPECIFIED" : 0; + object.plural = ""; + object.singular = ""; + } + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.pattern && message.pattern.length) { + object.pattern = []; + for (var j = 0; j < message.pattern.length; ++j) + object.pattern[j] = message.pattern[j]; + } + if (message.nameField != null && message.hasOwnProperty("nameField")) + object.nameField = message.nameField; + if (message.history != null && message.hasOwnProperty("history")) + object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history; + if (message.plural != null && message.hasOwnProperty("plural")) + object.plural = message.plural; + if (message.singular != null && message.hasOwnProperty("singular")) + object.singular = message.singular; + return object; + }; - return DeleteTopicRequest; + /** + * Converts this ResourceDescriptor to JSON. + * @function toJSON + * @memberof google.api.ResourceDescriptor + * @instance + * @returns {Object.} JSON object + */ + ResourceDescriptor.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * History enum. + * @name google.api.ResourceDescriptor.History + * @enum {string} + * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value + * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value + * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value + */ + ResourceDescriptor.History = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "HISTORY_UNSPECIFIED"] = 0; + values[valuesById[1] = "ORIGINALLY_SINGLE_PATTERN"] = 1; + values[valuesById[2] = "FUTURE_MULTI_PATTERN"] = 2; + return values; })(); - v1.Subscriber = (function() { + return ResourceDescriptor; + })(); - /** - * Constructs a new Subscriber service. - * @memberof google.pubsub.v1 - * @classdesc Represents a Subscriber - * @extends $protobuf.rpc.Service - * @constructor - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - */ - function Subscriber(rpcImpl, requestDelimited, responseDelimited) { - $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); - } + api.ResourceReference = (function() { - (Subscriber.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = Subscriber; + /** + * Properties of a ResourceReference. + * @memberof google.api + * @interface IResourceReference + * @property {string|null} [type] ResourceReference type + * @property {string|null} [childType] ResourceReference childType + */ - /** - * Creates new Subscriber service using the specified rpc implementation. - * @function create - * @memberof google.pubsub.v1.Subscriber - * @static - * @param {$protobuf.RPCImpl} rpcImpl RPC implementation - * @param {boolean} [requestDelimited=false] Whether requests are length-delimited - * @param {boolean} [responseDelimited=false] Whether responses are length-delimited - * @returns {Subscriber} RPC service. Useful where requests and/or responses are streamed. - */ - Subscriber.create = function create(rpcImpl, requestDelimited, responseDelimited) { - return new this(rpcImpl, requestDelimited, responseDelimited); - }; + /** + * Constructs a new ResourceReference. + * @memberof google.api + * @classdesc Represents a ResourceReference. + * @implements IResourceReference + * @constructor + * @param {google.api.IResourceReference=} [properties] Properties to set + */ + function ResourceReference(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. - * @memberof google.pubsub.v1.Subscriber - * @typedef CreateSubscriptionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Subscription} [response] Subscription - */ + /** + * ResourceReference type. + * @member {string} type + * @memberof google.api.ResourceReference + * @instance + */ + ResourceReference.prototype.type = ""; - /** - * Calls CreateSubscription. - * @function createSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object - * @param {google.pubsub.v1.Subscriber.CreateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.createSubscription = function createSubscription(request, callback) { - return this.rpcCall(createSubscription, $root.google.pubsub.v1.Subscription, $root.google.pubsub.v1.Subscription, request, callback); - }, "name", { value: "CreateSubscription" }); + /** + * ResourceReference childType. + * @member {string} childType + * @memberof google.api.ResourceReference + * @instance + */ + ResourceReference.prototype.childType = ""; - /** - * Calls CreateSubscription. - * @function createSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ISubscription} request Subscription message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Creates a new ResourceReference instance using the specified properties. + * @function create + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference=} [properties] Properties to set + * @returns {google.api.ResourceReference} ResourceReference instance + */ + ResourceReference.create = function create(properties) { + return new ResourceReference(properties); + }; + + /** + * Encodes the specified ResourceReference message. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @function encode + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceReference.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); + if (message.childType != null && message.hasOwnProperty("childType")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType); + return writer; + }; + + /** + * Encodes the specified ResourceReference message, length delimited. Does not implicitly {@link google.api.ResourceReference.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.ResourceReference + * @static + * @param {google.api.IResourceReference} message ResourceReference message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ResourceReference.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. - * @memberof google.pubsub.v1.Subscriber - * @typedef GetSubscriptionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Subscription} [response] Subscription - */ + /** + * Decodes a ResourceReference message from the specified reader or buffer. + * @function decode + * @memberof google.api.ResourceReference + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.ResourceReference} ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceReference.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.type = reader.string(); + break; + case 2: + message.childType = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Calls GetSubscription. - * @function getSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object - * @param {google.pubsub.v1.Subscriber.GetSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.getSubscription = function getSubscription(request, callback) { - return this.rpcCall(getSubscription, $root.google.pubsub.v1.GetSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); - }, "name", { value: "GetSubscription" }); + /** + * Decodes a ResourceReference message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.ResourceReference + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.ResourceReference} ResourceReference + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ResourceReference.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Calls GetSubscription. - * @function getSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IGetSubscriptionRequest} request GetSubscriptionRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Verifies a ResourceReference message. + * @function verify + * @memberof google.api.ResourceReference + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ResourceReference.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.childType != null && message.hasOwnProperty("childType")) + if (!$util.isString(message.childType)) + return "childType: string expected"; + return null; + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. - * @memberof google.pubsub.v1.Subscriber - * @typedef UpdateSubscriptionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Subscription} [response] Subscription - */ + /** + * Creates a ResourceReference message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.ResourceReference + * @static + * @param {Object.} object Plain object + * @returns {google.api.ResourceReference} ResourceReference + */ + ResourceReference.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ResourceReference) + return object; + var message = new $root.google.api.ResourceReference(); + if (object.type != null) + message.type = String(object.type); + if (object.childType != null) + message.childType = String(object.childType); + return message; + }; - /** - * Calls UpdateSubscription. - * @function updateSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object - * @param {google.pubsub.v1.Subscriber.UpdateSubscriptionCallback} callback Node-style callback called with the error, if any, and Subscription - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.updateSubscription = function updateSubscription(request, callback) { - return this.rpcCall(updateSubscription, $root.google.pubsub.v1.UpdateSubscriptionRequest, $root.google.pubsub.v1.Subscription, request, callback); - }, "name", { value: "UpdateSubscription" }); + /** + * Creates a plain object from a ResourceReference message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.ResourceReference + * @static + * @param {google.api.ResourceReference} message ResourceReference + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ResourceReference.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.type = ""; + object.childType = ""; + } + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.childType != null && message.hasOwnProperty("childType")) + object.childType = message.childType; + return object; + }; - /** - * Calls UpdateSubscription. - * @function updateSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IUpdateSubscriptionRequest} request UpdateSubscriptionRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Converts this ResourceReference to JSON. + * @function toJSON + * @memberof google.api.ResourceReference + * @instance + * @returns {Object.} JSON object + */ + ResourceReference.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. - * @memberof google.pubsub.v1.Subscriber - * @typedef ListSubscriptionsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListSubscriptionsResponse} [response] ListSubscriptionsResponse - */ + return ResourceReference; + })(); - /** - * Calls ListSubscriptions. - * @function listSubscriptions - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object - * @param {google.pubsub.v1.Subscriber.ListSubscriptionsCallback} callback Node-style callback called with the error, if any, and ListSubscriptionsResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.listSubscriptions = function listSubscriptions(request, callback) { - return this.rpcCall(listSubscriptions, $root.google.pubsub.v1.ListSubscriptionsRequest, $root.google.pubsub.v1.ListSubscriptionsResponse, request, callback); - }, "name", { value: "ListSubscriptions" }); + return api; + })(); - /** - * Calls ListSubscriptions. - * @function listSubscriptions - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IListSubscriptionsRequest} request ListSubscriptionsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + google.protobuf = (function() { - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. - * @memberof google.pubsub.v1.Subscriber - * @typedef DeleteSubscriptionCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + /** + * Namespace protobuf. + * @memberof google + * @namespace + */ + var protobuf = {}; - /** - * Calls DeleteSubscription. - * @function deleteSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object - * @param {google.pubsub.v1.Subscriber.DeleteSubscriptionCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.deleteSubscription = function deleteSubscription(request, callback) { - return this.rpcCall(deleteSubscription, $root.google.pubsub.v1.DeleteSubscriptionRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "DeleteSubscription" }); + protobuf.FileDescriptorSet = (function() { - /** - * Calls DeleteSubscription. - * @function deleteSubscription - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IDeleteSubscriptionRequest} request DeleteSubscriptionRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Properties of a FileDescriptorSet. + * @memberof google.protobuf + * @interface IFileDescriptorSet + * @property {Array.|null} [file] FileDescriptorSet file + */ - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. - * @memberof google.pubsub.v1.Subscriber - * @typedef ModifyAckDeadlineCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + /** + * Constructs a new FileDescriptorSet. + * @memberof google.protobuf + * @classdesc Represents a FileDescriptorSet. + * @implements IFileDescriptorSet + * @constructor + * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set + */ + function FileDescriptorSet(properties) { + this.file = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Calls ModifyAckDeadline. - * @function modifyAckDeadline - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object - * @param {google.pubsub.v1.Subscriber.ModifyAckDeadlineCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.modifyAckDeadline = function modifyAckDeadline(request, callback) { - return this.rpcCall(modifyAckDeadline, $root.google.pubsub.v1.ModifyAckDeadlineRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "ModifyAckDeadline" }); + /** + * FileDescriptorSet file. + * @member {Array.} file + * @memberof google.protobuf.FileDescriptorSet + * @instance + */ + FileDescriptorSet.prototype.file = $util.emptyArray; - /** - * Calls ModifyAckDeadline. - * @function modifyAckDeadline - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IModifyAckDeadlineRequest} request ModifyAckDeadlineRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Creates a new FileDescriptorSet instance using the specified properties. + * @function create + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet=} [properties] Properties to set + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet instance + */ + FileDescriptorSet.create = function create(properties) { + return new FileDescriptorSet(properties); + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. - * @memberof google.pubsub.v1.Subscriber - * @typedef AcknowledgeCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + /** + * Encodes the specified FileDescriptorSet message. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorSet.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.file != null && message.file.length) + for (var i = 0; i < message.file.length; ++i) + $root.google.protobuf.FileDescriptorProto.encode(message.file[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; - /** - * Calls Acknowledge. - * @function acknowledge - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object - * @param {google.pubsub.v1.Subscriber.AcknowledgeCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.acknowledge = function acknowledge(request, callback) { - return this.rpcCall(acknowledge, $root.google.pubsub.v1.AcknowledgeRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "Acknowledge" }); + /** + * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.IFileDescriptorSet} message FileDescriptorSet message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorSet.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Calls Acknowledge. - * @function acknowledge - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IAcknowledgeRequest} request AcknowledgeRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorSet.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorSet(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.file && message.file.length)) + message.file = []; + message.file.push($root.google.protobuf.FileDescriptorProto.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. - * @memberof google.pubsub.v1.Subscriber - * @typedef PullCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.PullResponse} [response] PullResponse - */ + /** + * Decodes a FileDescriptorSet message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorSet.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Calls Pull. - * @function pull - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object - * @param {google.pubsub.v1.Subscriber.PullCallback} callback Node-style callback called with the error, if any, and PullResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.pull = function pull(request, callback) { - return this.rpcCall(pull, $root.google.pubsub.v1.PullRequest, $root.google.pubsub.v1.PullResponse, request, callback); - }, "name", { value: "Pull" }); + /** + * Verifies a FileDescriptorSet message. + * @function verify + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileDescriptorSet.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.file != null && message.hasOwnProperty("file")) { + if (!Array.isArray(message.file)) + return "file: array expected"; + for (var i = 0; i < message.file.length; ++i) { + var error = $root.google.protobuf.FileDescriptorProto.verify(message.file[i]); + if (error) + return "file." + error; + } + } + return null; + }; - /** - * Calls Pull. - * @function pull - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IPullRequest} request PullRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Creates a FileDescriptorSet message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileDescriptorSet} FileDescriptorSet + */ + FileDescriptorSet.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileDescriptorSet) + return object; + var message = new $root.google.protobuf.FileDescriptorSet(); + if (object.file) { + if (!Array.isArray(object.file)) + throw TypeError(".google.protobuf.FileDescriptorSet.file: array expected"); + message.file = []; + for (var i = 0; i < object.file.length; ++i) { + if (typeof object.file[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorSet.file: object expected"); + message.file[i] = $root.google.protobuf.FileDescriptorProto.fromObject(object.file[i]); + } + } + return message; + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. - * @memberof google.pubsub.v1.Subscriber - * @typedef StreamingPullCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.StreamingPullResponse} [response] StreamingPullResponse - */ + /** + * Creates a plain object from a FileDescriptorSet message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {google.protobuf.FileDescriptorSet} message FileDescriptorSet + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileDescriptorSet.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.file = []; + if (message.file && message.file.length) { + object.file = []; + for (var j = 0; j < message.file.length; ++j) + object.file[j] = $root.google.protobuf.FileDescriptorProto.toObject(message.file[j], options); + } + return object; + }; - /** - * Calls StreamingPull. - * @function streamingPull - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object - * @param {google.pubsub.v1.Subscriber.StreamingPullCallback} callback Node-style callback called with the error, if any, and StreamingPullResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.streamingPull = function streamingPull(request, callback) { - return this.rpcCall(streamingPull, $root.google.pubsub.v1.StreamingPullRequest, $root.google.pubsub.v1.StreamingPullResponse, request, callback); - }, "name", { value: "StreamingPull" }); + /** + * Converts this FileDescriptorSet to JSON. + * @function toJSON + * @memberof google.protobuf.FileDescriptorSet + * @instance + * @returns {Object.} JSON object + */ + FileDescriptorSet.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Calls StreamingPull. - * @function streamingPull - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IStreamingPullRequest} request StreamingPullRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + return FileDescriptorSet; + })(); - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. - * @memberof google.pubsub.v1.Subscriber - * @typedef ModifyPushConfigCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + protobuf.FileDescriptorProto = (function() { - /** - * Calls ModifyPushConfig. - * @function modifyPushConfig - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object - * @param {google.pubsub.v1.Subscriber.ModifyPushConfigCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.modifyPushConfig = function modifyPushConfig(request, callback) { - return this.rpcCall(modifyPushConfig, $root.google.pubsub.v1.ModifyPushConfigRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "ModifyPushConfig" }); + /** + * Properties of a FileDescriptorProto. + * @memberof google.protobuf + * @interface IFileDescriptorProto + * @property {string|null} [name] FileDescriptorProto name + * @property {string|null} ["package"] FileDescriptorProto package + * @property {Array.|null} [dependency] FileDescriptorProto dependency + * @property {Array.|null} [publicDependency] FileDescriptorProto publicDependency + * @property {Array.|null} [weakDependency] FileDescriptorProto weakDependency + * @property {Array.|null} [messageType] FileDescriptorProto messageType + * @property {Array.|null} [enumType] FileDescriptorProto enumType + * @property {Array.|null} [service] FileDescriptorProto service + * @property {Array.|null} [extension] FileDescriptorProto extension + * @property {google.protobuf.IFileOptions|null} [options] FileDescriptorProto options + * @property {google.protobuf.ISourceCodeInfo|null} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo + * @property {string|null} [syntax] FileDescriptorProto syntax + */ - /** - * Calls ModifyPushConfig. - * @function modifyPushConfig - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IModifyPushConfigRequest} request ModifyPushConfigRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Constructs a new FileDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a FileDescriptorProto. + * @implements IFileDescriptorProto + * @constructor + * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set + */ + function FileDescriptorProto(properties) { + this.dependency = []; + this.publicDependency = []; + this.weakDependency = []; + this.messageType = []; + this.enumType = []; + this.service = []; + this.extension = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. - * @memberof google.pubsub.v1.Subscriber - * @typedef GetSnapshotCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Snapshot} [response] Snapshot - */ + /** + * FileDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.name = ""; - /** - * Calls GetSnapshot. - * @function getSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object - * @param {google.pubsub.v1.Subscriber.GetSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.getSnapshot = function getSnapshot(request, callback) { - return this.rpcCall(getSnapshot, $root.google.pubsub.v1.GetSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); - }, "name", { value: "GetSnapshot" }); + /** + * FileDescriptorProto package. + * @member {string} package + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype["package"] = ""; - /** - * Calls GetSnapshot. - * @function getSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IGetSnapshotRequest} request GetSnapshotRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * FileDescriptorProto dependency. + * @member {Array.} dependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.dependency = $util.emptyArray; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. - * @memberof google.pubsub.v1.Subscriber - * @typedef ListSnapshotsCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.ListSnapshotsResponse} [response] ListSnapshotsResponse - */ + /** + * FileDescriptorProto publicDependency. + * @member {Array.} publicDependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.publicDependency = $util.emptyArray; - /** - * Calls ListSnapshots. - * @function listSnapshots - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object - * @param {google.pubsub.v1.Subscriber.ListSnapshotsCallback} callback Node-style callback called with the error, if any, and ListSnapshotsResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.listSnapshots = function listSnapshots(request, callback) { - return this.rpcCall(listSnapshots, $root.google.pubsub.v1.ListSnapshotsRequest, $root.google.pubsub.v1.ListSnapshotsResponse, request, callback); - }, "name", { value: "ListSnapshots" }); + /** + * FileDescriptorProto weakDependency. + * @member {Array.} weakDependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.weakDependency = $util.emptyArray; - /** - * Calls ListSnapshots. - * @function listSnapshots - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IListSnapshotsRequest} request ListSnapshotsRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * FileDescriptorProto messageType. + * @member {Array.} messageType + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.messageType = $util.emptyArray; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. - * @memberof google.pubsub.v1.Subscriber - * @typedef CreateSnapshotCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Snapshot} [response] Snapshot - */ + /** + * FileDescriptorProto enumType. + * @member {Array.} enumType + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.enumType = $util.emptyArray; - /** - * Calls CreateSnapshot. - * @function createSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object - * @param {google.pubsub.v1.Subscriber.CreateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.createSnapshot = function createSnapshot(request, callback) { - return this.rpcCall(createSnapshot, $root.google.pubsub.v1.CreateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); - }, "name", { value: "CreateSnapshot" }); + /** + * FileDescriptorProto service. + * @member {Array.} service + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.service = $util.emptyArray; - /** - * Calls CreateSnapshot. - * @function createSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ICreateSnapshotRequest} request CreateSnapshotRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * FileDescriptorProto extension. + * @member {Array.} extension + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.extension = $util.emptyArray; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. - * @memberof google.pubsub.v1.Subscriber - * @typedef UpdateSnapshotCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.Snapshot} [response] Snapshot - */ + /** + * FileDescriptorProto options. + * @member {google.protobuf.IFileOptions|null|undefined} options + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.options = null; - /** - * Calls UpdateSnapshot. - * @function updateSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object - * @param {google.pubsub.v1.Subscriber.UpdateSnapshotCallback} callback Node-style callback called with the error, if any, and Snapshot - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.updateSnapshot = function updateSnapshot(request, callback) { - return this.rpcCall(updateSnapshot, $root.google.pubsub.v1.UpdateSnapshotRequest, $root.google.pubsub.v1.Snapshot, request, callback); - }, "name", { value: "UpdateSnapshot" }); + /** + * FileDescriptorProto sourceCodeInfo. + * @member {google.protobuf.ISourceCodeInfo|null|undefined} sourceCodeInfo + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.sourceCodeInfo = null; - /** - * Calls UpdateSnapshot. - * @function updateSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IUpdateSnapshotRequest} request UpdateSnapshotRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * FileDescriptorProto syntax. + * @member {string} syntax + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.syntax = ""; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. - * @memberof google.pubsub.v1.Subscriber - * @typedef DeleteSnapshotCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.protobuf.Empty} [response] Empty - */ + /** + * Creates a new FileDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto instance + */ + FileDescriptorProto.create = function create(properties) { + return new FileDescriptorProto(properties); + }; - /** - * Calls DeleteSnapshot. - * @function deleteSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object - * @param {google.pubsub.v1.Subscriber.DeleteSnapshotCallback} callback Node-style callback called with the error, if any, and Empty - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.deleteSnapshot = function deleteSnapshot(request, callback) { - return this.rpcCall(deleteSnapshot, $root.google.pubsub.v1.DeleteSnapshotRequest, $root.google.protobuf.Empty, request, callback); - }, "name", { value: "DeleteSnapshot" }); + /** + * Encodes the specified FileDescriptorProto message. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message["package"] != null && message.hasOwnProperty("package")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message["package"]); + if (message.dependency != null && message.dependency.length) + for (var i = 0; i < message.dependency.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.dependency[i]); + if (message.messageType != null && message.messageType.length) + for (var i = 0; i < message.messageType.length; ++i) + $root.google.protobuf.DescriptorProto.encode(message.messageType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.enumType != null && message.enumType.length) + for (var i = 0; i < message.enumType.length; ++i) + $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.service != null && message.service.length) + for (var i = 0; i < message.service.length; ++i) + $root.google.protobuf.ServiceDescriptorProto.encode(message.service[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.extension != null && message.extension.length) + for (var i = 0; i < message.extension.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.FileOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) + $root.google.protobuf.SourceCodeInfo.encode(message.sourceCodeInfo, writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); + if (message.publicDependency != null && message.publicDependency.length) + for (var i = 0; i < message.publicDependency.length; ++i) + writer.uint32(/* id 10, wireType 0 =*/80).int32(message.publicDependency[i]); + if (message.weakDependency != null && message.weakDependency.length) + for (var i = 0; i < message.weakDependency.length; ++i) + writer.uint32(/* id 11, wireType 0 =*/88).int32(message.weakDependency[i]); + if (message.syntax != null && message.hasOwnProperty("syntax")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); + return writer; + }; - /** - * Calls DeleteSnapshot. - * @function deleteSnapshot - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.IDeleteSnapshotRequest} request DeleteSnapshotRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.IFileDescriptorProto} message FileDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. - * @memberof google.pubsub.v1.Subscriber - * @typedef SeekCallback - * @type {function} - * @param {Error|null} error Error, if any - * @param {google.pubsub.v1.SeekResponse} [response] SeekResponse - */ + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message["package"] = reader.string(); + break; + case 3: + if (!(message.dependency && message.dependency.length)) + message.dependency = []; + message.dependency.push(reader.string()); + break; + case 10: + if (!(message.publicDependency && message.publicDependency.length)) + message.publicDependency = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.publicDependency.push(reader.int32()); + } else + message.publicDependency.push(reader.int32()); + break; + case 11: + if (!(message.weakDependency && message.weakDependency.length)) + message.weakDependency = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.weakDependency.push(reader.int32()); + } else + message.weakDependency.push(reader.int32()); + break; + case 4: + if (!(message.messageType && message.messageType.length)) + message.messageType = []; + message.messageType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.enumType && message.enumType.length)) + message.enumType = []; + message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); + break; + case 6: + if (!(message.service && message.service.length)) + message.service = []; + message.service.push($root.google.protobuf.ServiceDescriptorProto.decode(reader, reader.uint32())); + break; + case 7: + if (!(message.extension && message.extension.length)) + message.extension = []; + message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 8: + message.options = $root.google.protobuf.FileOptions.decode(reader, reader.uint32()); + break; + case 9: + message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.decode(reader, reader.uint32()); + break; + case 12: + message.syntax = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Calls Seek. - * @function seek - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object - * @param {google.pubsub.v1.Subscriber.SeekCallback} callback Node-style callback called with the error, if any, and SeekResponse - * @returns {undefined} - * @variation 1 - */ - Object.defineProperty(Subscriber.prototype.seek = function seek(request, callback) { - return this.rpcCall(seek, $root.google.pubsub.v1.SeekRequest, $root.google.pubsub.v1.SeekResponse, request, callback); - }, "name", { value: "Seek" }); + /** + * Decodes a FileDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Calls Seek. - * @function seek - * @memberof google.pubsub.v1.Subscriber - * @instance - * @param {google.pubsub.v1.ISeekRequest} request SeekRequest message or plain object - * @returns {Promise} Promise - * @variation 2 - */ + /** + * Verifies a FileDescriptorProto message. + * @function verify + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message["package"] != null && message.hasOwnProperty("package")) + if (!$util.isString(message["package"])) + return "package: string expected"; + if (message.dependency != null && message.hasOwnProperty("dependency")) { + if (!Array.isArray(message.dependency)) + return "dependency: array expected"; + for (var i = 0; i < message.dependency.length; ++i) + if (!$util.isString(message.dependency[i])) + return "dependency: string[] expected"; + } + if (message.publicDependency != null && message.hasOwnProperty("publicDependency")) { + if (!Array.isArray(message.publicDependency)) + return "publicDependency: array expected"; + for (var i = 0; i < message.publicDependency.length; ++i) + if (!$util.isInteger(message.publicDependency[i])) + return "publicDependency: integer[] expected"; + } + if (message.weakDependency != null && message.hasOwnProperty("weakDependency")) { + if (!Array.isArray(message.weakDependency)) + return "weakDependency: array expected"; + for (var i = 0; i < message.weakDependency.length; ++i) + if (!$util.isInteger(message.weakDependency[i])) + return "weakDependency: integer[] expected"; + } + if (message.messageType != null && message.hasOwnProperty("messageType")) { + if (!Array.isArray(message.messageType)) + return "messageType: array expected"; + for (var i = 0; i < message.messageType.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.verify(message.messageType[i]); + if (error) + return "messageType." + error; + } + } + if (message.enumType != null && message.hasOwnProperty("enumType")) { + if (!Array.isArray(message.enumType)) + return "enumType: array expected"; + for (var i = 0; i < message.enumType.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); + if (error) + return "enumType." + error; + } + } + if (message.service != null && message.hasOwnProperty("service")) { + if (!Array.isArray(message.service)) + return "service: array expected"; + for (var i = 0; i < message.service.length; ++i) { + var error = $root.google.protobuf.ServiceDescriptorProto.verify(message.service[i]); + if (error) + return "service." + error; + } + } + if (message.extension != null && message.hasOwnProperty("extension")) { + if (!Array.isArray(message.extension)) + return "extension: array expected"; + for (var i = 0; i < message.extension.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); + if (error) + return "extension." + error; + } + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.FileOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) { + var error = $root.google.protobuf.SourceCodeInfo.verify(message.sourceCodeInfo); + if (error) + return "sourceCodeInfo." + error; + } + if (message.syntax != null && message.hasOwnProperty("syntax")) + if (!$util.isString(message.syntax)) + return "syntax: string expected"; + return null; + }; - return Subscriber; - })(); + /** + * Creates a FileDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileDescriptorProto} FileDescriptorProto + */ + FileDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileDescriptorProto) + return object; + var message = new $root.google.protobuf.FileDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object["package"] != null) + message["package"] = String(object["package"]); + if (object.dependency) { + if (!Array.isArray(object.dependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.dependency: array expected"); + message.dependency = []; + for (var i = 0; i < object.dependency.length; ++i) + message.dependency[i] = String(object.dependency[i]); + } + if (object.publicDependency) { + if (!Array.isArray(object.publicDependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.publicDependency: array expected"); + message.publicDependency = []; + for (var i = 0; i < object.publicDependency.length; ++i) + message.publicDependency[i] = object.publicDependency[i] | 0; + } + if (object.weakDependency) { + if (!Array.isArray(object.weakDependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.weakDependency: array expected"); + message.weakDependency = []; + for (var i = 0; i < object.weakDependency.length; ++i) + message.weakDependency[i] = object.weakDependency[i] | 0; + } + if (object.messageType) { + if (!Array.isArray(object.messageType)) + throw TypeError(".google.protobuf.FileDescriptorProto.messageType: array expected"); + message.messageType = []; + for (var i = 0; i < object.messageType.length; ++i) { + if (typeof object.messageType[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.messageType: object expected"); + message.messageType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.messageType[i]); + } + } + if (object.enumType) { + if (!Array.isArray(object.enumType)) + throw TypeError(".google.protobuf.FileDescriptorProto.enumType: array expected"); + message.enumType = []; + for (var i = 0; i < object.enumType.length; ++i) { + if (typeof object.enumType[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.enumType: object expected"); + message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); + } + } + if (object.service) { + if (!Array.isArray(object.service)) + throw TypeError(".google.protobuf.FileDescriptorProto.service: array expected"); + message.service = []; + for (var i = 0; i < object.service.length; ++i) { + if (typeof object.service[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.service: object expected"); + message.service[i] = $root.google.protobuf.ServiceDescriptorProto.fromObject(object.service[i]); + } + } + if (object.extension) { + if (!Array.isArray(object.extension)) + throw TypeError(".google.protobuf.FileDescriptorProto.extension: array expected"); + message.extension = []; + for (var i = 0; i < object.extension.length; ++i) { + if (typeof object.extension[i] !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.extension: object expected"); + message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.FileOptions.fromObject(object.options); + } + if (object.sourceCodeInfo != null) { + if (typeof object.sourceCodeInfo !== "object") + throw TypeError(".google.protobuf.FileDescriptorProto.sourceCodeInfo: object expected"); + message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.fromObject(object.sourceCodeInfo); + } + if (object.syntax != null) + message.syntax = String(object.syntax); + return message; + }; - v1.Subscription = (function() { + /** + * Creates a plain object from a FileDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {google.protobuf.FileDescriptorProto} message FileDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.dependency = []; + object.messageType = []; + object.enumType = []; + object.service = []; + object.extension = []; + object.publicDependency = []; + object.weakDependency = []; + } + if (options.defaults) { + object.name = ""; + object["package"] = ""; + object.options = null; + object.sourceCodeInfo = null; + object.syntax = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message["package"] != null && message.hasOwnProperty("package")) + object["package"] = message["package"]; + if (message.dependency && message.dependency.length) { + object.dependency = []; + for (var j = 0; j < message.dependency.length; ++j) + object.dependency[j] = message.dependency[j]; + } + if (message.messageType && message.messageType.length) { + object.messageType = []; + for (var j = 0; j < message.messageType.length; ++j) + object.messageType[j] = $root.google.protobuf.DescriptorProto.toObject(message.messageType[j], options); + } + if (message.enumType && message.enumType.length) { + object.enumType = []; + for (var j = 0; j < message.enumType.length; ++j) + object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); + } + if (message.service && message.service.length) { + object.service = []; + for (var j = 0; j < message.service.length; ++j) + object.service[j] = $root.google.protobuf.ServiceDescriptorProto.toObject(message.service[j], options); + } + if (message.extension && message.extension.length) { + object.extension = []; + for (var j = 0; j < message.extension.length; ++j) + object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.FileOptions.toObject(message.options, options); + if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) + object.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.toObject(message.sourceCodeInfo, options); + if (message.publicDependency && message.publicDependency.length) { + object.publicDependency = []; + for (var j = 0; j < message.publicDependency.length; ++j) + object.publicDependency[j] = message.publicDependency[j]; + } + if (message.weakDependency && message.weakDependency.length) { + object.weakDependency = []; + for (var j = 0; j < message.weakDependency.length; ++j) + object.weakDependency[j] = message.weakDependency[j]; + } + if (message.syntax != null && message.hasOwnProperty("syntax")) + object.syntax = message.syntax; + return object; + }; - /** - * Properties of a Subscription. - * @memberof google.pubsub.v1 - * @interface ISubscription - * @property {string|null} [name] Subscription name - * @property {string|null} [topic] Subscription topic - * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] Subscription pushConfig - * @property {number|null} [ackDeadlineSeconds] Subscription ackDeadlineSeconds - * @property {boolean|null} [retainAckedMessages] Subscription retainAckedMessages - * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Subscription messageRetentionDuration - * @property {Object.|null} [labels] Subscription labels - * @property {boolean|null} [enableMessageOrdering] Subscription enableMessageOrdering - * @property {google.pubsub.v1.IExpirationPolicy|null} [expirationPolicy] Subscription expirationPolicy - * @property {string|null} [filter] Subscription filter - * @property {google.pubsub.v1.IDeadLetterPolicy|null} [deadLetterPolicy] Subscription deadLetterPolicy - * @property {google.pubsub.v1.IRetryPolicy|null} [retryPolicy] Subscription retryPolicy - */ + /** + * Converts this FileDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.FileDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + FileDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Constructs a new Subscription. - * @memberof google.pubsub.v1 - * @classdesc Represents a Subscription. - * @implements ISubscription - * @constructor - * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set - */ - function Subscription(properties) { - this.labels = {}; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + return FileDescriptorProto; + })(); - /** - * Subscription name. - * @member {string} name - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.name = ""; + protobuf.DescriptorProto = (function() { - /** - * Subscription topic. - * @member {string} topic - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.topic = ""; + /** + * Properties of a DescriptorProto. + * @memberof google.protobuf + * @interface IDescriptorProto + * @property {string|null} [name] DescriptorProto name + * @property {Array.|null} [field] DescriptorProto field + * @property {Array.|null} [extension] DescriptorProto extension + * @property {Array.|null} [nestedType] DescriptorProto nestedType + * @property {Array.|null} [enumType] DescriptorProto enumType + * @property {Array.|null} [extensionRange] DescriptorProto extensionRange + * @property {Array.|null} [oneofDecl] DescriptorProto oneofDecl + * @property {google.protobuf.IMessageOptions|null} [options] DescriptorProto options + * @property {Array.|null} [reservedRange] DescriptorProto reservedRange + * @property {Array.|null} [reservedName] DescriptorProto reservedName + */ - /** - * Subscription pushConfig. - * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.pushConfig = null; + /** + * Constructs a new DescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a DescriptorProto. + * @implements IDescriptorProto + * @constructor + * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set + */ + function DescriptorProto(properties) { + this.field = []; + this.extension = []; + this.nestedType = []; + this.enumType = []; + this.extensionRange = []; + this.oneofDecl = []; + this.reservedRange = []; + this.reservedName = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Subscription ackDeadlineSeconds. - * @member {number} ackDeadlineSeconds - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.ackDeadlineSeconds = 0; + /** + * DescriptorProto name. + * @member {string} name + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.name = ""; - /** - * Subscription retainAckedMessages. - * @member {boolean} retainAckedMessages - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.retainAckedMessages = false; + /** + * DescriptorProto field. + * @member {Array.} field + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.field = $util.emptyArray; - /** - * Subscription messageRetentionDuration. - * @member {google.protobuf.IDuration|null|undefined} messageRetentionDuration - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.messageRetentionDuration = null; + /** + * DescriptorProto extension. + * @member {Array.} extension + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.extension = $util.emptyArray; - /** - * Subscription labels. - * @member {Object.} labels - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.labels = $util.emptyObject; + /** + * DescriptorProto nestedType. + * @member {Array.} nestedType + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.nestedType = $util.emptyArray; - /** - * Subscription enableMessageOrdering. - * @member {boolean} enableMessageOrdering - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.enableMessageOrdering = false; + /** + * DescriptorProto enumType. + * @member {Array.} enumType + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.enumType = $util.emptyArray; - /** - * Subscription expirationPolicy. - * @member {google.pubsub.v1.IExpirationPolicy|null|undefined} expirationPolicy - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.expirationPolicy = null; + /** + * DescriptorProto extensionRange. + * @member {Array.} extensionRange + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.extensionRange = $util.emptyArray; - /** - * Subscription filter. - * @member {string} filter - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.filter = ""; + /** + * DescriptorProto oneofDecl. + * @member {Array.} oneofDecl + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.oneofDecl = $util.emptyArray; - /** - * Subscription deadLetterPolicy. - * @member {google.pubsub.v1.IDeadLetterPolicy|null|undefined} deadLetterPolicy - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.deadLetterPolicy = null; + /** + * DescriptorProto options. + * @member {google.protobuf.IMessageOptions|null|undefined} options + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.options = null; - /** - * Subscription retryPolicy. - * @member {google.pubsub.v1.IRetryPolicy|null|undefined} retryPolicy - * @memberof google.pubsub.v1.Subscription - * @instance - */ - Subscription.prototype.retryPolicy = null; + /** + * DescriptorProto reservedRange. + * @member {Array.} reservedRange + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.reservedRange = $util.emptyArray; - /** - * Creates a new Subscription instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.Subscription - * @static - * @param {google.pubsub.v1.ISubscription=} [properties] Properties to set - * @returns {google.pubsub.v1.Subscription} Subscription instance - */ - Subscription.create = function create(properties) { - return new Subscription(properties); - }; + /** + * DescriptorProto reservedName. + * @member {Array.} reservedName + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.reservedName = $util.emptyArray; - /** - * Encodes the specified Subscription message. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.Subscription - * @static - * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Subscription.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) - $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - writer.uint32(/* id 5, wireType 0 =*/40).int32(message.ackDeadlineSeconds); - if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) - writer.uint32(/* id 7, wireType 0 =*/56).bool(message.retainAckedMessages); - if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) - $root.google.protobuf.Duration.encode(message.messageRetentionDuration, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.labels != null && message.hasOwnProperty("labels")) - for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) - writer.uint32(/* id 9, wireType 2 =*/74).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) - writer.uint32(/* id 10, wireType 0 =*/80).bool(message.enableMessageOrdering); - if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) - $root.google.pubsub.v1.ExpirationPolicy.encode(message.expirationPolicy, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.filter != null && message.hasOwnProperty("filter")) - writer.uint32(/* id 12, wireType 2 =*/98).string(message.filter); - if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) - $root.google.pubsub.v1.DeadLetterPolicy.encode(message.deadLetterPolicy, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); - if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) - $root.google.pubsub.v1.RetryPolicy.encode(message.retryPolicy, writer.uint32(/* id 14, wireType 2 =*/114).fork()).ldelim(); - return writer; - }; + /** + * Creates a new DescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto} DescriptorProto instance + */ + DescriptorProto.create = function create(properties) { + return new DescriptorProto(properties); + }; - /** - * Encodes the specified Subscription message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.Subscription - * @static - * @param {google.pubsub.v1.ISubscription} message Subscription message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Subscription.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified DescriptorProto message. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.field != null && message.field.length) + for (var i = 0; i < message.field.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.field[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.nestedType != null && message.nestedType.length) + for (var i = 0; i < message.nestedType.length; ++i) + $root.google.protobuf.DescriptorProto.encode(message.nestedType[i], writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.enumType != null && message.enumType.length) + for (var i = 0; i < message.enumType.length; ++i) + $root.google.protobuf.EnumDescriptorProto.encode(message.enumType[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.extensionRange != null && message.extensionRange.length) + for (var i = 0; i < message.extensionRange.length; ++i) + $root.google.protobuf.DescriptorProto.ExtensionRange.encode(message.extensionRange[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.extension != null && message.extension.length) + for (var i = 0; i < message.extension.length; ++i) + $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.MessageOptions.encode(message.options, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); + if (message.oneofDecl != null && message.oneofDecl.length) + for (var i = 0; i < message.oneofDecl.length; ++i) + $root.google.protobuf.OneofDescriptorProto.encode(message.oneofDecl[i], writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.reservedRange != null && message.reservedRange.length) + for (var i = 0; i < message.reservedRange.length; ++i) + $root.google.protobuf.DescriptorProto.ReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); + if (message.reservedName != null && message.reservedName.length) + for (var i = 0; i < message.reservedName.length; ++i) + writer.uint32(/* id 10, wireType 2 =*/82).string(message.reservedName[i]); + return writer; + }; - /** - * Decodes a Subscription message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.Subscription - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.Subscription} Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Subscription.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key; - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.topic = reader.string(); - break; - case 4: - message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); - break; - case 5: - message.ackDeadlineSeconds = reader.int32(); - break; - case 7: - message.retainAckedMessages = reader.bool(); - break; - case 8: - message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - case 9: - reader.skip().pos++; - if (message.labels === $util.emptyObject) - message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); - break; - case 10: - message.enableMessageOrdering = reader.bool(); - break; - case 11: - message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.decode(reader, reader.uint32()); - break; - case 12: - message.filter = reader.string(); - break; - case 13: - message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.decode(reader, reader.uint32()); - break; - case 14: - message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.IDescriptorProto} message DescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.DescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.field && message.field.length)) + message.field = []; + message.field.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 6: + if (!(message.extension && message.extension.length)) + message.extension = []; + message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + if (!(message.nestedType && message.nestedType.length)) + message.nestedType = []; + message.nestedType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); + break; + case 4: + if (!(message.enumType && message.enumType.length)) + message.enumType = []; + message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.extensionRange && message.extensionRange.length)) + message.extensionRange = []; + message.extensionRange.push($root.google.protobuf.DescriptorProto.ExtensionRange.decode(reader, reader.uint32())); + break; + case 8: + if (!(message.oneofDecl && message.oneofDecl.length)) + message.oneofDecl = []; + message.oneofDecl.push($root.google.protobuf.OneofDescriptorProto.decode(reader, reader.uint32())); + break; + case 7: + message.options = $root.google.protobuf.MessageOptions.decode(reader, reader.uint32()); + break; + case 9: + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.DescriptorProto.ReservedRange.decode(reader, reader.uint32())); + break; + case 10: + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a Subscription message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.Subscription - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.Subscription} Subscription - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Subscription.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a DescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.DescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.DescriptorProto} DescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a Subscription message. - * @function verify - * @memberof google.pubsub.v1.Subscription - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Subscription.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { - var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); + /** + * Verifies a DescriptorProto message. + * @function verify + * @memberof google.protobuf.DescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.field != null && message.hasOwnProperty("field")) { + if (!Array.isArray(message.field)) + return "field: array expected"; + for (var i = 0; i < message.field.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.field[i]); if (error) - return "pushConfig." + error; + return "field." + error; } - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - if (!$util.isInteger(message.ackDeadlineSeconds)) - return "ackDeadlineSeconds: integer expected"; - if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) - if (typeof message.retainAckedMessages !== "boolean") - return "retainAckedMessages: boolean expected"; - if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) { - var error = $root.google.protobuf.Duration.verify(message.messageRetentionDuration); + } + if (message.extension != null && message.hasOwnProperty("extension")) { + if (!Array.isArray(message.extension)) + return "extension: array expected"; + for (var i = 0; i < message.extension.length; ++i) { + var error = $root.google.protobuf.FieldDescriptorProto.verify(message.extension[i]); if (error) - return "messageRetentionDuration." + error; + return "extension." + error; } - if (message.labels != null && message.hasOwnProperty("labels")) { - if (!$util.isObject(message.labels)) - return "labels: object expected"; - var key = Object.keys(message.labels); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.labels[key[i]])) - return "labels: string{k:string} expected"; + } + if (message.nestedType != null && message.hasOwnProperty("nestedType")) { + if (!Array.isArray(message.nestedType)) + return "nestedType: array expected"; + for (var i = 0; i < message.nestedType.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.verify(message.nestedType[i]); + if (error) + return "nestedType." + error; } - if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) - if (typeof message.enableMessageOrdering !== "boolean") - return "enableMessageOrdering: boolean expected"; - if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) { - var error = $root.google.pubsub.v1.ExpirationPolicy.verify(message.expirationPolicy); + } + if (message.enumType != null && message.hasOwnProperty("enumType")) { + if (!Array.isArray(message.enumType)) + return "enumType: array expected"; + for (var i = 0; i < message.enumType.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.verify(message.enumType[i]); if (error) - return "expirationPolicy." + error; + return "enumType." + error; } - if (message.filter != null && message.hasOwnProperty("filter")) - if (!$util.isString(message.filter)) - return "filter: string expected"; - if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) { - var error = $root.google.pubsub.v1.DeadLetterPolicy.verify(message.deadLetterPolicy); + } + if (message.extensionRange != null && message.hasOwnProperty("extensionRange")) { + if (!Array.isArray(message.extensionRange)) + return "extensionRange: array expected"; + for (var i = 0; i < message.extensionRange.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.ExtensionRange.verify(message.extensionRange[i]); if (error) - return "deadLetterPolicy." + error; + return "extensionRange." + error; } - if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) { - var error = $root.google.pubsub.v1.RetryPolicy.verify(message.retryPolicy); + } + if (message.oneofDecl != null && message.hasOwnProperty("oneofDecl")) { + if (!Array.isArray(message.oneofDecl)) + return "oneofDecl: array expected"; + for (var i = 0; i < message.oneofDecl.length; ++i) { + var error = $root.google.protobuf.OneofDescriptorProto.verify(message.oneofDecl[i]); if (error) - return "retryPolicy." + error; + return "oneofDecl." + error; } - return null; - }; - - /** - * Creates a Subscription message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.Subscription - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.Subscription} Subscription - */ - Subscription.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.Subscription) - return object; - var message = new $root.google.pubsub.v1.Subscription(); - if (object.name != null) - message.name = String(object.name); - if (object.topic != null) - message.topic = String(object.topic); - if (object.pushConfig != null) { - if (typeof object.pushConfig !== "object") - throw TypeError(".google.pubsub.v1.Subscription.pushConfig: object expected"); - message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.MessageOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { + if (!Array.isArray(message.reservedRange)) + return "reservedRange: array expected"; + for (var i = 0; i < message.reservedRange.length; ++i) { + var error = $root.google.protobuf.DescriptorProto.ReservedRange.verify(message.reservedRange[i]); + if (error) + return "reservedRange." + error; } - if (object.ackDeadlineSeconds != null) - message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; - if (object.retainAckedMessages != null) - message.retainAckedMessages = Boolean(object.retainAckedMessages); - if (object.messageRetentionDuration != null) { - if (typeof object.messageRetentionDuration !== "object") - throw TypeError(".google.pubsub.v1.Subscription.messageRetentionDuration: object expected"); - message.messageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.messageRetentionDuration); + } + if (message.reservedName != null && message.hasOwnProperty("reservedName")) { + if (!Array.isArray(message.reservedName)) + return "reservedName: array expected"; + for (var i = 0; i < message.reservedName.length; ++i) + if (!$util.isString(message.reservedName[i])) + return "reservedName: string[] expected"; + } + return null; + }; + + /** + * Creates a DescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.DescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.DescriptorProto} DescriptorProto + */ + DescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto) + return object; + var message = new $root.google.protobuf.DescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.field) { + if (!Array.isArray(object.field)) + throw TypeError(".google.protobuf.DescriptorProto.field: array expected"); + message.field = []; + for (var i = 0; i < object.field.length; ++i) { + if (typeof object.field[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.field: object expected"); + message.field[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.field[i]); } - if (object.labels) { - if (typeof object.labels !== "object") - throw TypeError(".google.pubsub.v1.Subscription.labels: object expected"); - message.labels = {}; - for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) - message.labels[keys[i]] = String(object.labels[keys[i]]); + } + if (object.extension) { + if (!Array.isArray(object.extension)) + throw TypeError(".google.protobuf.DescriptorProto.extension: array expected"); + message.extension = []; + for (var i = 0; i < object.extension.length; ++i) { + if (typeof object.extension[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.extension: object expected"); + message.extension[i] = $root.google.protobuf.FieldDescriptorProto.fromObject(object.extension[i]); } - if (object.enableMessageOrdering != null) - message.enableMessageOrdering = Boolean(object.enableMessageOrdering); - if (object.expirationPolicy != null) { - if (typeof object.expirationPolicy !== "object") - throw TypeError(".google.pubsub.v1.Subscription.expirationPolicy: object expected"); - message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.fromObject(object.expirationPolicy); + } + if (object.nestedType) { + if (!Array.isArray(object.nestedType)) + throw TypeError(".google.protobuf.DescriptorProto.nestedType: array expected"); + message.nestedType = []; + for (var i = 0; i < object.nestedType.length; ++i) { + if (typeof object.nestedType[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.nestedType: object expected"); + message.nestedType[i] = $root.google.protobuf.DescriptorProto.fromObject(object.nestedType[i]); } - if (object.filter != null) - message.filter = String(object.filter); - if (object.deadLetterPolicy != null) { - if (typeof object.deadLetterPolicy !== "object") - throw TypeError(".google.pubsub.v1.Subscription.deadLetterPolicy: object expected"); - message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.fromObject(object.deadLetterPolicy); + } + if (object.enumType) { + if (!Array.isArray(object.enumType)) + throw TypeError(".google.protobuf.DescriptorProto.enumType: array expected"); + message.enumType = []; + for (var i = 0; i < object.enumType.length; ++i) { + if (typeof object.enumType[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.enumType: object expected"); + message.enumType[i] = $root.google.protobuf.EnumDescriptorProto.fromObject(object.enumType[i]); } - if (object.retryPolicy != null) { - if (typeof object.retryPolicy !== "object") - throw TypeError(".google.pubsub.v1.Subscription.retryPolicy: object expected"); - message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.fromObject(object.retryPolicy); + } + if (object.extensionRange) { + if (!Array.isArray(object.extensionRange)) + throw TypeError(".google.protobuf.DescriptorProto.extensionRange: array expected"); + message.extensionRange = []; + for (var i = 0; i < object.extensionRange.length; ++i) { + if (typeof object.extensionRange[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.extensionRange: object expected"); + message.extensionRange[i] = $root.google.protobuf.DescriptorProto.ExtensionRange.fromObject(object.extensionRange[i]); } - return message; - }; - - /** - * Creates a plain object from a Subscription message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.Subscription - * @static - * @param {google.pubsub.v1.Subscription} message Subscription - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Subscription.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.objects || options.defaults) - object.labels = {}; - if (options.defaults) { - object.name = ""; - object.topic = ""; - object.pushConfig = null; - object.ackDeadlineSeconds = 0; - object.retainAckedMessages = false; - object.messageRetentionDuration = null; - object.enableMessageOrdering = false; - object.expirationPolicy = null; - object.filter = ""; - object.deadLetterPolicy = null; - object.retryPolicy = null; + } + if (object.oneofDecl) { + if (!Array.isArray(object.oneofDecl)) + throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: array expected"); + message.oneofDecl = []; + for (var i = 0; i < object.oneofDecl.length; ++i) { + if (typeof object.oneofDecl[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.oneofDecl: object expected"); + message.oneofDecl[i] = $root.google.protobuf.OneofDescriptorProto.fromObject(object.oneofDecl[i]); } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) - object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - object.ackDeadlineSeconds = message.ackDeadlineSeconds; - if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) - object.retainAckedMessages = message.retainAckedMessages; - if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) - object.messageRetentionDuration = $root.google.protobuf.Duration.toObject(message.messageRetentionDuration, options); - var keys2; - if (message.labels && (keys2 = Object.keys(message.labels)).length) { - object.labels = {}; - for (var j = 0; j < keys2.length; ++j) - object.labels[keys2[j]] = message.labels[keys2[j]]; + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.DescriptorProto.options: object expected"); + message.options = $root.google.protobuf.MessageOptions.fromObject(object.options); + } + if (object.reservedRange) { + if (!Array.isArray(object.reservedRange)) + throw TypeError(".google.protobuf.DescriptorProto.reservedRange: array expected"); + message.reservedRange = []; + for (var i = 0; i < object.reservedRange.length; ++i) { + if (typeof object.reservedRange[i] !== "object") + throw TypeError(".google.protobuf.DescriptorProto.reservedRange: object expected"); + message.reservedRange[i] = $root.google.protobuf.DescriptorProto.ReservedRange.fromObject(object.reservedRange[i]); } - if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) - object.enableMessageOrdering = message.enableMessageOrdering; - if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) - object.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.toObject(message.expirationPolicy, options); - if (message.filter != null && message.hasOwnProperty("filter")) - object.filter = message.filter; - if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) - object.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.toObject(message.deadLetterPolicy, options); - if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) - object.retryPolicy = $root.google.pubsub.v1.RetryPolicy.toObject(message.retryPolicy, options); - return object; - }; + } + if (object.reservedName) { + if (!Array.isArray(object.reservedName)) + throw TypeError(".google.protobuf.DescriptorProto.reservedName: array expected"); + message.reservedName = []; + for (var i = 0; i < object.reservedName.length; ++i) + message.reservedName[i] = String(object.reservedName[i]); + } + return message; + }; - /** - * Converts this Subscription to JSON. - * @function toJSON - * @memberof google.pubsub.v1.Subscription - * @instance - * @returns {Object.} JSON object - */ - Subscription.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a DescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.DescriptorProto + * @static + * @param {google.protobuf.DescriptorProto} message DescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.field = []; + object.nestedType = []; + object.enumType = []; + object.extensionRange = []; + object.extension = []; + object.oneofDecl = []; + object.reservedRange = []; + object.reservedName = []; + } + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.field && message.field.length) { + object.field = []; + for (var j = 0; j < message.field.length; ++j) + object.field[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.field[j], options); + } + if (message.nestedType && message.nestedType.length) { + object.nestedType = []; + for (var j = 0; j < message.nestedType.length; ++j) + object.nestedType[j] = $root.google.protobuf.DescriptorProto.toObject(message.nestedType[j], options); + } + if (message.enumType && message.enumType.length) { + object.enumType = []; + for (var j = 0; j < message.enumType.length; ++j) + object.enumType[j] = $root.google.protobuf.EnumDescriptorProto.toObject(message.enumType[j], options); + } + if (message.extensionRange && message.extensionRange.length) { + object.extensionRange = []; + for (var j = 0; j < message.extensionRange.length; ++j) + object.extensionRange[j] = $root.google.protobuf.DescriptorProto.ExtensionRange.toObject(message.extensionRange[j], options); + } + if (message.extension && message.extension.length) { + object.extension = []; + for (var j = 0; j < message.extension.length; ++j) + object.extension[j] = $root.google.protobuf.FieldDescriptorProto.toObject(message.extension[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.MessageOptions.toObject(message.options, options); + if (message.oneofDecl && message.oneofDecl.length) { + object.oneofDecl = []; + for (var j = 0; j < message.oneofDecl.length; ++j) + object.oneofDecl[j] = $root.google.protobuf.OneofDescriptorProto.toObject(message.oneofDecl[j], options); + } + if (message.reservedRange && message.reservedRange.length) { + object.reservedRange = []; + for (var j = 0; j < message.reservedRange.length; ++j) + object.reservedRange[j] = $root.google.protobuf.DescriptorProto.ReservedRange.toObject(message.reservedRange[j], options); + } + if (message.reservedName && message.reservedName.length) { + object.reservedName = []; + for (var j = 0; j < message.reservedName.length; ++j) + object.reservedName[j] = message.reservedName[j]; + } + return object; + }; - return Subscription; - })(); + /** + * Converts this DescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.DescriptorProto + * @instance + * @returns {Object.} JSON object + */ + DescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.RetryPolicy = (function() { + DescriptorProto.ExtensionRange = (function() { /** - * Properties of a RetryPolicy. - * @memberof google.pubsub.v1 - * @interface IRetryPolicy - * @property {google.protobuf.IDuration|null} [minimumBackoff] RetryPolicy minimumBackoff - * @property {google.protobuf.IDuration|null} [maximumBackoff] RetryPolicy maximumBackoff + * Properties of an ExtensionRange. + * @memberof google.protobuf.DescriptorProto + * @interface IExtensionRange + * @property {number|null} [start] ExtensionRange start + * @property {number|null} [end] ExtensionRange end + * @property {google.protobuf.IExtensionRangeOptions|null} [options] ExtensionRange options */ /** - * Constructs a new RetryPolicy. - * @memberof google.pubsub.v1 - * @classdesc Represents a RetryPolicy. - * @implements IRetryPolicy + * Constructs a new ExtensionRange. + * @memberof google.protobuf.DescriptorProto + * @classdesc Represents an ExtensionRange. + * @implements IExtensionRange * @constructor - * @param {google.pubsub.v1.IRetryPolicy=} [properties] Properties to set + * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set */ - function RetryPolicy(properties) { + function ExtensionRange(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -18418,88 +13595,101 @@ } /** - * RetryPolicy minimumBackoff. - * @member {google.protobuf.IDuration|null|undefined} minimumBackoff - * @memberof google.pubsub.v1.RetryPolicy + * ExtensionRange start. + * @member {number} start + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @instance */ - RetryPolicy.prototype.minimumBackoff = null; + ExtensionRange.prototype.start = 0; /** - * RetryPolicy maximumBackoff. - * @member {google.protobuf.IDuration|null|undefined} maximumBackoff - * @memberof google.pubsub.v1.RetryPolicy + * ExtensionRange end. + * @member {number} end + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @instance */ - RetryPolicy.prototype.maximumBackoff = null; + ExtensionRange.prototype.end = 0; /** - * Creates a new RetryPolicy instance using the specified properties. + * ExtensionRange options. + * @member {google.protobuf.IExtensionRangeOptions|null|undefined} options + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @instance + */ + ExtensionRange.prototype.options = null; + + /** + * Creates a new ExtensionRange instance using the specified properties. * @function create - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static - * @param {google.pubsub.v1.IRetryPolicy=} [properties] Properties to set - * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy instance + * @param {google.protobuf.DescriptorProto.IExtensionRange=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange instance */ - RetryPolicy.create = function create(properties) { - return new RetryPolicy(properties); + ExtensionRange.create = function create(properties) { + return new ExtensionRange(properties); }; /** - * Encodes the specified RetryPolicy message. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. + * Encodes the specified ExtensionRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static - * @param {google.pubsub.v1.IRetryPolicy} message RetryPolicy message or plain object to encode + * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - RetryPolicy.encode = function encode(message, writer) { + ExtensionRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) - $root.google.protobuf.Duration.encode(message.minimumBackoff, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) - $root.google.protobuf.Duration.encode(message.maximumBackoff, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.ExtensionRangeOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; /** - * Encodes the specified RetryPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.RetryPolicy.verify|verify} messages. + * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static - * @param {google.pubsub.v1.IRetryPolicy} message RetryPolicy message or plain object to encode + * @param {google.protobuf.DescriptorProto.IExtensionRange} message ExtensionRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - RetryPolicy.encodeDelimited = function encodeDelimited(message, writer) { + ExtensionRange.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a RetryPolicy message from the specified reader or buffer. + * Decodes an ExtensionRange message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - RetryPolicy.decode = function decode(reader, length) { + ExtensionRange.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.RetryPolicy(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.minimumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + message.start = reader.int32(); break; case 2: - message.maximumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + message.end = reader.int32(); + break; + case 3: + message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); break; default: reader.skipType(tag & 7); @@ -18510,127 +13700,130 @@ }; /** - * Decodes a RetryPolicy message from the specified reader or buffer, length delimited. + * Decodes an ExtensionRange message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - RetryPolicy.decodeDelimited = function decodeDelimited(reader) { + ExtensionRange.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a RetryPolicy message. + * Verifies an ExtensionRange message. * @function verify - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - RetryPolicy.verify = function verify(message) { + ExtensionRange.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) { - var error = $root.google.protobuf.Duration.verify(message.minimumBackoff); - if (error) - return "minimumBackoff." + error; - } - if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) { - var error = $root.google.protobuf.Duration.verify(message.maximumBackoff); + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.ExtensionRangeOptions.verify(message.options); if (error) - return "maximumBackoff." + error; + return "options." + error; } return null; }; /** - * Creates a RetryPolicy message from a plain object. Also converts values to their respective internal types. + * Creates an ExtensionRange message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.RetryPolicy} RetryPolicy + * @returns {google.protobuf.DescriptorProto.ExtensionRange} ExtensionRange */ - RetryPolicy.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.RetryPolicy) + ExtensionRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto.ExtensionRange) return object; - var message = new $root.google.pubsub.v1.RetryPolicy(); - if (object.minimumBackoff != null) { - if (typeof object.minimumBackoff !== "object") - throw TypeError(".google.pubsub.v1.RetryPolicy.minimumBackoff: object expected"); - message.minimumBackoff = $root.google.protobuf.Duration.fromObject(object.minimumBackoff); - } - if (object.maximumBackoff != null) { - if (typeof object.maximumBackoff !== "object") - throw TypeError(".google.pubsub.v1.RetryPolicy.maximumBackoff: object expected"); - message.maximumBackoff = $root.google.protobuf.Duration.fromObject(object.maximumBackoff); + var message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.DescriptorProto.ExtensionRange.options: object expected"); + message.options = $root.google.protobuf.ExtensionRangeOptions.fromObject(object.options); } return message; }; /** - * Creates a plain object from a RetryPolicy message. Also converts values to other types if specified. + * Creates a plain object from an ExtensionRange message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @static - * @param {google.pubsub.v1.RetryPolicy} message RetryPolicy + * @param {google.protobuf.DescriptorProto.ExtensionRange} message ExtensionRange * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - RetryPolicy.toObject = function toObject(message, options) { + ExtensionRange.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.minimumBackoff = null; - object.maximumBackoff = null; + object.start = 0; + object.end = 0; + object.options = null; } - if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) - object.minimumBackoff = $root.google.protobuf.Duration.toObject(message.minimumBackoff, options); - if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) - object.maximumBackoff = $root.google.protobuf.Duration.toObject(message.maximumBackoff, options); + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.ExtensionRangeOptions.toObject(message.options, options); return object; }; /** - * Converts this RetryPolicy to JSON. + * Converts this ExtensionRange to JSON. * @function toJSON - * @memberof google.pubsub.v1.RetryPolicy + * @memberof google.protobuf.DescriptorProto.ExtensionRange * @instance * @returns {Object.} JSON object */ - RetryPolicy.prototype.toJSON = function toJSON() { + ExtensionRange.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return RetryPolicy; + return ExtensionRange; })(); - v1.DeadLetterPolicy = (function() { + DescriptorProto.ReservedRange = (function() { /** - * Properties of a DeadLetterPolicy. - * @memberof google.pubsub.v1 - * @interface IDeadLetterPolicy - * @property {string|null} [deadLetterTopic] DeadLetterPolicy deadLetterTopic - * @property {number|null} [maxDeliveryAttempts] DeadLetterPolicy maxDeliveryAttempts + * Properties of a ReservedRange. + * @memberof google.protobuf.DescriptorProto + * @interface IReservedRange + * @property {number|null} [start] ReservedRange start + * @property {number|null} [end] ReservedRange end */ /** - * Constructs a new DeadLetterPolicy. - * @memberof google.pubsub.v1 - * @classdesc Represents a DeadLetterPolicy. - * @implements IDeadLetterPolicy + * Constructs a new ReservedRange. + * @memberof google.protobuf.DescriptorProto + * @classdesc Represents a ReservedRange. + * @implements IReservedRange * @constructor - * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set + * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set */ - function DeadLetterPolicy(properties) { + function ReservedRange(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -18638,88 +13831,88 @@ } /** - * DeadLetterPolicy deadLetterTopic. - * @member {string} deadLetterTopic - * @memberof google.pubsub.v1.DeadLetterPolicy + * ReservedRange start. + * @member {number} start + * @memberof google.protobuf.DescriptorProto.ReservedRange * @instance */ - DeadLetterPolicy.prototype.deadLetterTopic = ""; + ReservedRange.prototype.start = 0; /** - * DeadLetterPolicy maxDeliveryAttempts. - * @member {number} maxDeliveryAttempts - * @memberof google.pubsub.v1.DeadLetterPolicy + * ReservedRange end. + * @member {number} end + * @memberof google.protobuf.DescriptorProto.ReservedRange * @instance */ - DeadLetterPolicy.prototype.maxDeliveryAttempts = 0; + ReservedRange.prototype.end = 0; /** - * Creates a new DeadLetterPolicy instance using the specified properties. + * Creates a new ReservedRange instance using the specified properties. * @function create - * @memberof google.pubsub.v1.DeadLetterPolicy + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static - * @param {google.pubsub.v1.IDeadLetterPolicy=} [properties] Properties to set - * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy instance + * @param {google.protobuf.DescriptorProto.IReservedRange=} [properties] Properties to set + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange instance */ - DeadLetterPolicy.create = function create(properties) { - return new DeadLetterPolicy(properties); + ReservedRange.create = function create(properties) { + return new ReservedRange(properties); }; /** - * Encodes the specified DeadLetterPolicy message. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * Encodes the specified ReservedRange message. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.DeadLetterPolicy + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static - * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode + * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - DeadLetterPolicy.encode = function encode(message, writer) { + ReservedRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.deadLetterTopic); - if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.maxDeliveryAttempts); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); return writer; }; /** - * Encodes the specified DeadLetterPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.DeadLetterPolicy.verify|verify} messages. + * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.DeadLetterPolicy + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static - * @param {google.pubsub.v1.IDeadLetterPolicy} message DeadLetterPolicy message or plain object to encode + * @param {google.protobuf.DescriptorProto.IReservedRange} message ReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - DeadLetterPolicy.encodeDelimited = function encodeDelimited(message, writer) { + ReservedRange.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer. + * Decodes a ReservedRange message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.DeadLetterPolicy + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DeadLetterPolicy.decode = function decode(reader, length) { + ReservedRange.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeadLetterPolicy(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ReservedRange(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.deadLetterTopic = reader.string(); + message.start = reader.int32(); break; case 2: - message.maxDeliveryAttempts = reader.int32(); + message.end = reader.int32(); break; default: reader.skipType(tag & 7); @@ -18730,900 +13923,1534 @@ }; /** - * Decodes a DeadLetterPolicy message from the specified reader or buffer, length delimited. + * Decodes a ReservedRange message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.DeadLetterPolicy + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DeadLetterPolicy.decodeDelimited = function decodeDelimited(reader) { + ReservedRange.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a DeadLetterPolicy message. + * Verifies a ReservedRange message. * @function verify - * @memberof google.pubsub.v1.DeadLetterPolicy + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - DeadLetterPolicy.verify = function verify(message) { + ReservedRange.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) - if (!$util.isString(message.deadLetterTopic)) - return "deadLetterTopic: string expected"; - if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) - if (!$util.isInteger(message.maxDeliveryAttempts)) - return "maxDeliveryAttempts: integer expected"; + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; return null; }; /** - * Creates a DeadLetterPolicy message from a plain object. Also converts values to their respective internal types. + * Creates a ReservedRange message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.DeadLetterPolicy + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.DeadLetterPolicy} DeadLetterPolicy + * @returns {google.protobuf.DescriptorProto.ReservedRange} ReservedRange */ - DeadLetterPolicy.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.DeadLetterPolicy) + ReservedRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.DescriptorProto.ReservedRange) return object; - var message = new $root.google.pubsub.v1.DeadLetterPolicy(); - if (object.deadLetterTopic != null) - message.deadLetterTopic = String(object.deadLetterTopic); - if (object.maxDeliveryAttempts != null) - message.maxDeliveryAttempts = object.maxDeliveryAttempts | 0; + var message = new $root.google.protobuf.DescriptorProto.ReservedRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; return message; }; /** - * Creates a plain object from a DeadLetterPolicy message. Also converts values to other types if specified. + * Creates a plain object from a ReservedRange message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.DeadLetterPolicy + * @memberof google.protobuf.DescriptorProto.ReservedRange * @static - * @param {google.pubsub.v1.DeadLetterPolicy} message DeadLetterPolicy + * @param {google.protobuf.DescriptorProto.ReservedRange} message ReservedRange * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - DeadLetterPolicy.toObject = function toObject(message, options) { + ReservedRange.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.deadLetterTopic = ""; - object.maxDeliveryAttempts = 0; + object.start = 0; + object.end = 0; + } + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; + return object; + }; + + /** + * Converts this ReservedRange to JSON. + * @function toJSON + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @instance + * @returns {Object.} JSON object + */ + ReservedRange.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ReservedRange; + })(); + + return DescriptorProto; + })(); + + protobuf.ExtensionRangeOptions = (function() { + + /** + * Properties of an ExtensionRangeOptions. + * @memberof google.protobuf + * @interface IExtensionRangeOptions + * @property {Array.|null} [uninterpretedOption] ExtensionRangeOptions uninterpretedOption + */ + + /** + * Constructs a new ExtensionRangeOptions. + * @memberof google.protobuf + * @classdesc Represents an ExtensionRangeOptions. + * @implements IExtensionRangeOptions + * @constructor + * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set + */ + function ExtensionRangeOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ExtensionRangeOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + */ + ExtensionRangeOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions instance + */ + ExtensionRangeOptions.create = function create(properties) { + return new ExtensionRangeOptions(properties); + }; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRangeOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRangeOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRangeOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRangeOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ExtensionRangeOptions message. + * @function verify + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExtensionRangeOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + */ + ExtensionRangeOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ExtensionRangeOptions) + return object; + var message = new $root.google.protobuf.ExtensionRangeOptions(); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } - if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) - object.deadLetterTopic = message.deadLetterTopic; - if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) - object.maxDeliveryAttempts = message.maxDeliveryAttempts; - return object; - }; + } + return message; + }; - /** - * Converts this DeadLetterPolicy to JSON. - * @function toJSON - * @memberof google.pubsub.v1.DeadLetterPolicy - * @instance - * @returns {Object.} JSON object - */ - DeadLetterPolicy.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.ExtensionRangeOptions} message ExtensionRangeOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExtensionRangeOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; - return DeadLetterPolicy; - })(); + /** + * Converts this ExtensionRangeOptions to JSON. + * @function toJSON + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + * @returns {Object.} JSON object + */ + ExtensionRangeOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.ExpirationPolicy = (function() { + return ExtensionRangeOptions; + })(); - /** - * Properties of an ExpirationPolicy. - * @memberof google.pubsub.v1 - * @interface IExpirationPolicy - * @property {google.protobuf.IDuration|null} [ttl] ExpirationPolicy ttl - */ + protobuf.FieldDescriptorProto = (function() { - /** - * Constructs a new ExpirationPolicy. - * @memberof google.pubsub.v1 - * @classdesc Represents an ExpirationPolicy. - * @implements IExpirationPolicy - * @constructor - * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set - */ - function ExpirationPolicy(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of a FieldDescriptorProto. + * @memberof google.protobuf + * @interface IFieldDescriptorProto + * @property {string|null} [name] FieldDescriptorProto name + * @property {number|null} [number] FieldDescriptorProto number + * @property {google.protobuf.FieldDescriptorProto.Label|null} [label] FieldDescriptorProto label + * @property {google.protobuf.FieldDescriptorProto.Type|null} [type] FieldDescriptorProto type + * @property {string|null} [typeName] FieldDescriptorProto typeName + * @property {string|null} [extendee] FieldDescriptorProto extendee + * @property {string|null} [defaultValue] FieldDescriptorProto defaultValue + * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex + * @property {string|null} [jsonName] FieldDescriptorProto jsonName + * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options + */ - /** - * ExpirationPolicy ttl. - * @member {google.protobuf.IDuration|null|undefined} ttl - * @memberof google.pubsub.v1.ExpirationPolicy - * @instance - */ - ExpirationPolicy.prototype.ttl = null; + /** + * Constructs a new FieldDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a FieldDescriptorProto. + * @implements IFieldDescriptorProto + * @constructor + * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set + */ + function FieldDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a new ExpirationPolicy instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {google.pubsub.v1.IExpirationPolicy=} [properties] Properties to set - * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy instance - */ - ExpirationPolicy.create = function create(properties) { - return new ExpirationPolicy(properties); - }; + /** + * FieldDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.name = ""; - /** - * Encodes the specified ExpirationPolicy message. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExpirationPolicy.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.ttl != null && message.hasOwnProperty("ttl")) - $root.google.protobuf.Duration.encode(message.ttl, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + /** + * FieldDescriptorProto number. + * @member {number} number + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.number = 0; - /** - * Encodes the specified ExpirationPolicy message, length delimited. Does not implicitly {@link google.pubsub.v1.ExpirationPolicy.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {google.pubsub.v1.IExpirationPolicy} message ExpirationPolicy message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExpirationPolicy.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * FieldDescriptorProto label. + * @member {google.protobuf.FieldDescriptorProto.Label} label + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.label = 1; - /** - * Decodes an ExpirationPolicy message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExpirationPolicy.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ExpirationPolicy(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.ttl = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * FieldDescriptorProto type. + * @member {google.protobuf.FieldDescriptorProto.Type} type + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.type = 1; - /** - * Decodes an ExpirationPolicy message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExpirationPolicy.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * FieldDescriptorProto typeName. + * @member {string} typeName + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.typeName = ""; + + /** + * FieldDescriptorProto extendee. + * @member {string} extendee + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.extendee = ""; + + /** + * FieldDescriptorProto defaultValue. + * @member {string} defaultValue + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.defaultValue = ""; + + /** + * FieldDescriptorProto oneofIndex. + * @member {number} oneofIndex + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.oneofIndex = 0; - /** - * Verifies an ExpirationPolicy message. - * @function verify - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ExpirationPolicy.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.ttl != null && message.hasOwnProperty("ttl")) { - var error = $root.google.protobuf.Duration.verify(message.ttl); - if (error) - return "ttl." + error; - } - return null; - }; + /** + * FieldDescriptorProto jsonName. + * @member {string} jsonName + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.jsonName = ""; - /** - * Creates an ExpirationPolicy message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ExpirationPolicy} ExpirationPolicy - */ - ExpirationPolicy.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ExpirationPolicy) - return object; - var message = new $root.google.pubsub.v1.ExpirationPolicy(); - if (object.ttl != null) { - if (typeof object.ttl !== "object") - throw TypeError(".google.pubsub.v1.ExpirationPolicy.ttl: object expected"); - message.ttl = $root.google.protobuf.Duration.fromObject(object.ttl); - } - return message; - }; + /** + * FieldDescriptorProto options. + * @member {google.protobuf.IFieldOptions|null|undefined} options + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.options = null; - /** - * Creates a plain object from an ExpirationPolicy message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ExpirationPolicy - * @static - * @param {google.pubsub.v1.ExpirationPolicy} message ExpirationPolicy - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ExpirationPolicy.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.ttl = null; - if (message.ttl != null && message.hasOwnProperty("ttl")) - object.ttl = $root.google.protobuf.Duration.toObject(message.ttl, options); - return object; - }; + /** + * Creates a new FieldDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto instance + */ + FieldDescriptorProto.create = function create(properties) { + return new FieldDescriptorProto(properties); + }; - /** - * Converts this ExpirationPolicy to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ExpirationPolicy - * @instance - * @returns {Object.} JSON object - */ - ExpirationPolicy.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Encodes the specified FieldDescriptorProto message. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.extendee != null && message.hasOwnProperty("extendee")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.extendee); + if (message.number != null && message.hasOwnProperty("number")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.number); + if (message.label != null && message.hasOwnProperty("label")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.label); + if (message.type != null && message.hasOwnProperty("type")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.type); + if (message.typeName != null && message.hasOwnProperty("typeName")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.typeName); + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.defaultValue); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.FieldOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); + return writer; + }; - return ExpirationPolicy; - })(); + /** + * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.IFieldDescriptorProto} message FieldDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - v1.PushConfig = (function() { + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 3: + message.number = reader.int32(); + break; + case 4: + message.label = reader.int32(); + break; + case 5: + message.type = reader.int32(); + break; + case 6: + message.typeName = reader.string(); + break; + case 2: + message.extendee = reader.string(); + break; + case 7: + message.defaultValue = reader.string(); + break; + case 9: + message.oneofIndex = reader.int32(); + break; + case 10: + message.jsonName = reader.string(); + break; + case 8: + message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FieldDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FieldDescriptorProto message. + * @function verify + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.number != null && message.hasOwnProperty("number")) + if (!$util.isInteger(message.number)) + return "number: integer expected"; + if (message.label != null && message.hasOwnProperty("label")) + switch (message.label) { + default: + return "label: enum value expected"; + case 1: + case 2: + case 3: + break; + } + if (message.type != null && message.hasOwnProperty("type")) + switch (message.type) { + default: + return "type: enum value expected"; + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + break; + } + if (message.typeName != null && message.hasOwnProperty("typeName")) + if (!$util.isString(message.typeName)) + return "typeName: string expected"; + if (message.extendee != null && message.hasOwnProperty("extendee")) + if (!$util.isString(message.extendee)) + return "extendee: string expected"; + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + if (!$util.isString(message.defaultValue)) + return "defaultValue: string expected"; + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + if (!$util.isInteger(message.oneofIndex)) + return "oneofIndex: integer expected"; + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + if (!$util.isString(message.jsonName)) + return "jsonName: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.FieldOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; - /** - * Properties of a PushConfig. - * @memberof google.pubsub.v1 - * @interface IPushConfig - * @property {string|null} [pushEndpoint] PushConfig pushEndpoint - * @property {Object.|null} [attributes] PushConfig attributes - * @property {google.pubsub.v1.PushConfig.IOidcToken|null} [oidcToken] PushConfig oidcToken - */ + /** + * Creates a FieldDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldDescriptorProto} FieldDescriptorProto + */ + FieldDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldDescriptorProto) + return object; + var message = new $root.google.protobuf.FieldDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.number != null) + message.number = object.number | 0; + switch (object.label) { + case "LABEL_OPTIONAL": + case 1: + message.label = 1; + break; + case "LABEL_REQUIRED": + case 2: + message.label = 2; + break; + case "LABEL_REPEATED": + case 3: + message.label = 3; + break; + } + switch (object.type) { + case "TYPE_DOUBLE": + case 1: + message.type = 1; + break; + case "TYPE_FLOAT": + case 2: + message.type = 2; + break; + case "TYPE_INT64": + case 3: + message.type = 3; + break; + case "TYPE_UINT64": + case 4: + message.type = 4; + break; + case "TYPE_INT32": + case 5: + message.type = 5; + break; + case "TYPE_FIXED64": + case 6: + message.type = 6; + break; + case "TYPE_FIXED32": + case 7: + message.type = 7; + break; + case "TYPE_BOOL": + case 8: + message.type = 8; + break; + case "TYPE_STRING": + case 9: + message.type = 9; + break; + case "TYPE_GROUP": + case 10: + message.type = 10; + break; + case "TYPE_MESSAGE": + case 11: + message.type = 11; + break; + case "TYPE_BYTES": + case 12: + message.type = 12; + break; + case "TYPE_UINT32": + case 13: + message.type = 13; + break; + case "TYPE_ENUM": + case 14: + message.type = 14; + break; + case "TYPE_SFIXED32": + case 15: + message.type = 15; + break; + case "TYPE_SFIXED64": + case 16: + message.type = 16; + break; + case "TYPE_SINT32": + case 17: + message.type = 17; + break; + case "TYPE_SINT64": + case 18: + message.type = 18; + break; + } + if (object.typeName != null) + message.typeName = String(object.typeName); + if (object.extendee != null) + message.extendee = String(object.extendee); + if (object.defaultValue != null) + message.defaultValue = String(object.defaultValue); + if (object.oneofIndex != null) + message.oneofIndex = object.oneofIndex | 0; + if (object.jsonName != null) + message.jsonName = String(object.jsonName); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.FieldDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.FieldOptions.fromObject(object.options); + } + return message; + }; - /** - * Constructs a new PushConfig. - * @memberof google.pubsub.v1 - * @classdesc Represents a PushConfig. - * @implements IPushConfig - * @constructor - * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set - */ - function PushConfig(properties) { - this.attributes = {}; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Creates a plain object from a FieldDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {google.protobuf.FieldDescriptorProto} message FieldDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.extendee = ""; + object.number = 0; + object.label = options.enums === String ? "LABEL_OPTIONAL" : 1; + object.type = options.enums === String ? "TYPE_DOUBLE" : 1; + object.typeName = ""; + object.defaultValue = ""; + object.options = null; + object.oneofIndex = 0; + object.jsonName = ""; } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.extendee != null && message.hasOwnProperty("extendee")) + object.extendee = message.extendee; + if (message.number != null && message.hasOwnProperty("number")) + object.number = message.number; + if (message.label != null && message.hasOwnProperty("label")) + object.label = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Label[message.label] : message.label; + if (message.type != null && message.hasOwnProperty("type")) + object.type = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Type[message.type] : message.type; + if (message.typeName != null && message.hasOwnProperty("typeName")) + object.typeName = message.typeName; + if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + object.defaultValue = message.defaultValue; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.FieldOptions.toObject(message.options, options); + if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + object.oneofIndex = message.oneofIndex; + if (message.jsonName != null && message.hasOwnProperty("jsonName")) + object.jsonName = message.jsonName; + return object; + }; - /** - * PushConfig pushEndpoint. - * @member {string} pushEndpoint - * @memberof google.pubsub.v1.PushConfig - * @instance - */ - PushConfig.prototype.pushEndpoint = ""; + /** + * Converts this FieldDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.FieldDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + FieldDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * PushConfig attributes. - * @member {Object.} attributes - * @memberof google.pubsub.v1.PushConfig - * @instance - */ - PushConfig.prototype.attributes = $util.emptyObject; + /** + * Type enum. + * @name google.protobuf.FieldDescriptorProto.Type + * @enum {string} + * @property {number} TYPE_DOUBLE=1 TYPE_DOUBLE value + * @property {number} TYPE_FLOAT=2 TYPE_FLOAT value + * @property {number} TYPE_INT64=3 TYPE_INT64 value + * @property {number} TYPE_UINT64=4 TYPE_UINT64 value + * @property {number} TYPE_INT32=5 TYPE_INT32 value + * @property {number} TYPE_FIXED64=6 TYPE_FIXED64 value + * @property {number} TYPE_FIXED32=7 TYPE_FIXED32 value + * @property {number} TYPE_BOOL=8 TYPE_BOOL value + * @property {number} TYPE_STRING=9 TYPE_STRING value + * @property {number} TYPE_GROUP=10 TYPE_GROUP value + * @property {number} TYPE_MESSAGE=11 TYPE_MESSAGE value + * @property {number} TYPE_BYTES=12 TYPE_BYTES value + * @property {number} TYPE_UINT32=13 TYPE_UINT32 value + * @property {number} TYPE_ENUM=14 TYPE_ENUM value + * @property {number} TYPE_SFIXED32=15 TYPE_SFIXED32 value + * @property {number} TYPE_SFIXED64=16 TYPE_SFIXED64 value + * @property {number} TYPE_SINT32=17 TYPE_SINT32 value + * @property {number} TYPE_SINT64=18 TYPE_SINT64 value + */ + FieldDescriptorProto.Type = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "TYPE_DOUBLE"] = 1; + values[valuesById[2] = "TYPE_FLOAT"] = 2; + values[valuesById[3] = "TYPE_INT64"] = 3; + values[valuesById[4] = "TYPE_UINT64"] = 4; + values[valuesById[5] = "TYPE_INT32"] = 5; + values[valuesById[6] = "TYPE_FIXED64"] = 6; + values[valuesById[7] = "TYPE_FIXED32"] = 7; + values[valuesById[8] = "TYPE_BOOL"] = 8; + values[valuesById[9] = "TYPE_STRING"] = 9; + values[valuesById[10] = "TYPE_GROUP"] = 10; + values[valuesById[11] = "TYPE_MESSAGE"] = 11; + values[valuesById[12] = "TYPE_BYTES"] = 12; + values[valuesById[13] = "TYPE_UINT32"] = 13; + values[valuesById[14] = "TYPE_ENUM"] = 14; + values[valuesById[15] = "TYPE_SFIXED32"] = 15; + values[valuesById[16] = "TYPE_SFIXED64"] = 16; + values[valuesById[17] = "TYPE_SINT32"] = 17; + values[valuesById[18] = "TYPE_SINT64"] = 18; + return values; + })(); - /** - * PushConfig oidcToken. - * @member {google.pubsub.v1.PushConfig.IOidcToken|null|undefined} oidcToken - * @memberof google.pubsub.v1.PushConfig - * @instance - */ - PushConfig.prototype.oidcToken = null; + /** + * Label enum. + * @name google.protobuf.FieldDescriptorProto.Label + * @enum {string} + * @property {number} LABEL_OPTIONAL=1 LABEL_OPTIONAL value + * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value + * @property {number} LABEL_REPEATED=3 LABEL_REPEATED value + */ + FieldDescriptorProto.Label = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "LABEL_OPTIONAL"] = 1; + values[valuesById[2] = "LABEL_REQUIRED"] = 2; + values[valuesById[3] = "LABEL_REPEATED"] = 3; + return values; + })(); - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + return FieldDescriptorProto; + })(); - /** - * PushConfig authenticationMethod. - * @member {"oidcToken"|undefined} authenticationMethod - * @memberof google.pubsub.v1.PushConfig - * @instance - */ - Object.defineProperty(PushConfig.prototype, "authenticationMethod", { - get: $util.oneOfGetter($oneOfFields = ["oidcToken"]), - set: $util.oneOfSetter($oneOfFields) - }); + protobuf.OneofDescriptorProto = (function() { - /** - * Creates a new PushConfig instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {google.pubsub.v1.IPushConfig=} [properties] Properties to set - * @returns {google.pubsub.v1.PushConfig} PushConfig instance - */ - PushConfig.create = function create(properties) { - return new PushConfig(properties); - }; + /** + * Properties of an OneofDescriptorProto. + * @memberof google.protobuf + * @interface IOneofDescriptorProto + * @property {string|null} [name] OneofDescriptorProto name + * @property {google.protobuf.IOneofOptions|null} [options] OneofDescriptorProto options + */ - /** - * Encodes the specified PushConfig message. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PushConfig.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.pushEndpoint); - if (message.attributes != null && message.hasOwnProperty("attributes")) - for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); - if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) - $root.google.pubsub.v1.PushConfig.OidcToken.encode(message.oidcToken, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; + /** + * Constructs a new OneofDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an OneofDescriptorProto. + * @implements IOneofDescriptorProto + * @constructor + * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set + */ + function OneofDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Encodes the specified PushConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {google.pubsub.v1.IPushConfig} message PushConfig message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PushConfig.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * OneofDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.OneofDescriptorProto + * @instance + */ + OneofDescriptorProto.prototype.name = ""; - /** - * Decodes a PushConfig message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PushConfig} PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PushConfig.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key; - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.pushEndpoint = reader.string(); - break; - case 2: - reader.skip().pos++; - if (message.attributes === $util.emptyObject) - message.attributes = {}; - key = reader.string(); - reader.pos++; - message.attributes[key] = reader.string(); - break; - case 3: - message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * OneofDescriptorProto options. + * @member {google.protobuf.IOneofOptions|null|undefined} options + * @memberof google.protobuf.OneofDescriptorProto + * @instance + */ + OneofDescriptorProto.prototype.options = null; - /** - * Decodes a PushConfig message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PushConfig} PushConfig - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PushConfig.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a new OneofDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto instance + */ + OneofDescriptorProto.create = function create(properties) { + return new OneofDescriptorProto(properties); + }; - /** - * Verifies a PushConfig message. - * @function verify - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PushConfig.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - var properties = {}; - if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) - if (!$util.isString(message.pushEndpoint)) - return "pushEndpoint: string expected"; - if (message.attributes != null && message.hasOwnProperty("attributes")) { - if (!$util.isObject(message.attributes)) - return "attributes: object expected"; - var key = Object.keys(message.attributes); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.attributes[key[i]])) - return "attributes: string{k:string} expected"; - } - if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { - properties.authenticationMethod = 1; - { - var error = $root.google.pubsub.v1.PushConfig.OidcToken.verify(message.oidcToken); - if (error) - return "oidcToken." + error; - } - } - return null; - }; + /** + * Encodes the specified OneofDescriptorProto message. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.OneofOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; - /** - * Creates a PushConfig message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PushConfig} PushConfig - */ - PushConfig.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PushConfig) - return object; - var message = new $root.google.pubsub.v1.PushConfig(); - if (object.pushEndpoint != null) - message.pushEndpoint = String(object.pushEndpoint); - if (object.attributes) { - if (typeof object.attributes !== "object") - throw TypeError(".google.pubsub.v1.PushConfig.attributes: object expected"); - message.attributes = {}; - for (var keys = Object.keys(object.attributes), i = 0; i < keys.length; ++i) - message.attributes[keys[i]] = String(object.attributes[keys[i]]); - } - if (object.oidcToken != null) { - if (typeof object.oidcToken !== "object") - throw TypeError(".google.pubsub.v1.PushConfig.oidcToken: object expected"); - message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.fromObject(object.oidcToken); - } - return message; - }; + /** + * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.IOneofDescriptorProto} message OneofDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a plain object from a PushConfig message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PushConfig - * @static - * @param {google.pubsub.v1.PushConfig} message PushConfig - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PushConfig.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.objects || options.defaults) - object.attributes = {}; - if (options.defaults) - object.pushEndpoint = ""; - if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) - object.pushEndpoint = message.pushEndpoint; - var keys2; - if (message.attributes && (keys2 = Object.keys(message.attributes)).length) { - object.attributes = {}; - for (var j = 0; j < keys2.length; ++j) - object.attributes[keys2[j]] = message.attributes[keys2[j]]; - } - if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) { - object.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.toObject(message.oidcToken, options); - if (options.oneofs) - object.authenticationMethod = "oidcToken"; + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.options = $root.google.protobuf.OneofOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; } + } + return message; + }; + + /** + * Decodes an OneofDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an OneofDescriptorProto message. + * @function verify + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OneofDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.OneofOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; + + /** + * Creates an OneofDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.OneofDescriptorProto} OneofDescriptorProto + */ + OneofDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.OneofDescriptorProto) return object; - }; + var message = new $root.google.protobuf.OneofDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.OneofDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.OneofOptions.fromObject(object.options); + } + return message; + }; - /** - * Converts this PushConfig to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PushConfig - * @instance - * @returns {Object.} JSON object - */ - PushConfig.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from an OneofDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {google.protobuf.OneofDescriptorProto} message OneofDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OneofDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.OneofOptions.toObject(message.options, options); + return object; + }; - PushConfig.OidcToken = (function() { + /** + * Converts this OneofDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.OneofDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + OneofDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Properties of an OidcToken. - * @memberof google.pubsub.v1.PushConfig - * @interface IOidcToken - * @property {string|null} [serviceAccountEmail] OidcToken serviceAccountEmail - * @property {string|null} [audience] OidcToken audience - */ + return OneofDescriptorProto; + })(); - /** - * Constructs a new OidcToken. - * @memberof google.pubsub.v1.PushConfig - * @classdesc Represents an OidcToken. - * @implements IOidcToken - * @constructor - * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set - */ - function OidcToken(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + protobuf.EnumDescriptorProto = (function() { + + /** + * Properties of an EnumDescriptorProto. + * @memberof google.protobuf + * @interface IEnumDescriptorProto + * @property {string|null} [name] EnumDescriptorProto name + * @property {Array.|null} [value] EnumDescriptorProto value + * @property {google.protobuf.IEnumOptions|null} [options] EnumDescriptorProto options + * @property {Array.|null} [reservedRange] EnumDescriptorProto reservedRange + * @property {Array.|null} [reservedName] EnumDescriptorProto reservedName + */ + + /** + * Constructs a new EnumDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an EnumDescriptorProto. + * @implements IEnumDescriptorProto + * @constructor + * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set + */ + function EnumDescriptorProto(properties) { + this.value = []; + this.reservedRange = []; + this.reservedName = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * OidcToken serviceAccountEmail. - * @member {string} serviceAccountEmail - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @instance - */ - OidcToken.prototype.serviceAccountEmail = ""; + /** + * EnumDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.name = ""; - /** - * OidcToken audience. - * @member {string} audience - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @instance - */ - OidcToken.prototype.audience = ""; + /** + * EnumDescriptorProto value. + * @member {Array.} value + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.value = $util.emptyArray; - /** - * Creates a new OidcToken instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {google.pubsub.v1.PushConfig.IOidcToken=} [properties] Properties to set - * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken instance - */ - OidcToken.create = function create(properties) { - return new OidcToken(properties); - }; + /** + * EnumDescriptorProto options. + * @member {google.protobuf.IEnumOptions|null|undefined} options + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.options = null; - /** - * Encodes the specified OidcToken message. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OidcToken.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.serviceAccountEmail); - if (message.audience != null && message.hasOwnProperty("audience")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.audience); - return writer; - }; + /** + * EnumDescriptorProto reservedRange. + * @member {Array.} reservedRange + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.reservedRange = $util.emptyArray; - /** - * Encodes the specified OidcToken message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.OidcToken.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {google.pubsub.v1.PushConfig.IOidcToken} message OidcToken message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - OidcToken.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * EnumDescriptorProto reservedName. + * @member {Array.} reservedName + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.reservedName = $util.emptyArray; - /** - * Decodes an OidcToken message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OidcToken.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.OidcToken(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.serviceAccountEmail = reader.string(); - break; - case 2: - message.audience = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Creates a new EnumDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto instance + */ + EnumDescriptorProto.create = function create(properties) { + return new EnumDescriptorProto(properties); + }; - /** - * Decodes an OidcToken message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - OidcToken.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Encodes the specified EnumDescriptorProto message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.value != null && message.value.length) + for (var i = 0; i < message.value.length; ++i) + $root.google.protobuf.EnumValueDescriptorProto.encode(message.value[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.EnumOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.reservedRange != null && message.reservedRange.length) + for (var i = 0; i < message.reservedRange.length; ++i) + $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.reservedName != null && message.reservedName.length) + for (var i = 0; i < message.reservedName.length; ++i) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.reservedName[i]); + return writer; + }; - /** - * Verifies an OidcToken message. - * @function verify - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - OidcToken.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) - if (!$util.isString(message.serviceAccountEmail)) - return "serviceAccountEmail: string expected"; - if (message.audience != null && message.hasOwnProperty("audience")) - if (!$util.isString(message.audience)) - return "audience: string expected"; - return null; - }; + /** + * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.IEnumDescriptorProto} message EnumDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.value && message.value.length)) + message.value = []; + message.value.push($root.google.protobuf.EnumValueDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); + break; + case 4: + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Creates an OidcToken message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PushConfig.OidcToken} OidcToken - */ - OidcToken.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PushConfig.OidcToken) - return object; - var message = new $root.google.pubsub.v1.PushConfig.OidcToken(); - if (object.serviceAccountEmail != null) - message.serviceAccountEmail = String(object.serviceAccountEmail); - if (object.audience != null) - message.audience = String(object.audience); - return message; - }; + /** + * Decodes an EnumDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a plain object from an OidcToken message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @static - * @param {google.pubsub.v1.PushConfig.OidcToken} message OidcToken - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - OidcToken.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.serviceAccountEmail = ""; - object.audience = ""; - } - if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) - object.serviceAccountEmail = message.serviceAccountEmail; - if (message.audience != null && message.hasOwnProperty("audience")) - object.audience = message.audience; - return object; - }; + /** + * Verifies an EnumDescriptorProto message. + * @function verify + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.value != null && message.hasOwnProperty("value")) { + if (!Array.isArray(message.value)) + return "value: array expected"; + for (var i = 0; i < message.value.length; ++i) { + var error = $root.google.protobuf.EnumValueDescriptorProto.verify(message.value[i]); + if (error) + return "value." + error; + } + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.EnumOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { + if (!Array.isArray(message.reservedRange)) + return "reservedRange: array expected"; + for (var i = 0; i < message.reservedRange.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.verify(message.reservedRange[i]); + if (error) + return "reservedRange." + error; + } + } + if (message.reservedName != null && message.hasOwnProperty("reservedName")) { + if (!Array.isArray(message.reservedName)) + return "reservedName: array expected"; + for (var i = 0; i < message.reservedName.length; ++i) + if (!$util.isString(message.reservedName[i])) + return "reservedName: string[] expected"; + } + return null; + }; - /** - * Converts this OidcToken to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PushConfig.OidcToken - * @instance - * @returns {Object.} JSON object - */ - OidcToken.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates an EnumDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumDescriptorProto} EnumDescriptorProto + */ + EnumDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumDescriptorProto) + return object; + var message = new $root.google.protobuf.EnumDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.value) { + if (!Array.isArray(object.value)) + throw TypeError(".google.protobuf.EnumDescriptorProto.value: array expected"); + message.value = []; + for (var i = 0; i < object.value.length; ++i) { + if (typeof object.value[i] !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.value: object expected"); + message.value[i] = $root.google.protobuf.EnumValueDescriptorProto.fromObject(object.value[i]); + } + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.EnumOptions.fromObject(object.options); + } + if (object.reservedRange) { + if (!Array.isArray(object.reservedRange)) + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: array expected"); + message.reservedRange = []; + for (var i = 0; i < object.reservedRange.length; ++i) { + if (typeof object.reservedRange[i] !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: object expected"); + message.reservedRange[i] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.fromObject(object.reservedRange[i]); + } + } + if (object.reservedName) { + if (!Array.isArray(object.reservedName)) + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedName: array expected"); + message.reservedName = []; + for (var i = 0; i < object.reservedName.length; ++i) + message.reservedName[i] = String(object.reservedName[i]); + } + return message; + }; - return OidcToken; - })(); + /** + * Creates a plain object from an EnumDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {google.protobuf.EnumDescriptorProto} message EnumDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.value = []; + object.reservedRange = []; + object.reservedName = []; + } + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.value && message.value.length) { + object.value = []; + for (var j = 0; j < message.value.length; ++j) + object.value[j] = $root.google.protobuf.EnumValueDescriptorProto.toObject(message.value[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.EnumOptions.toObject(message.options, options); + if (message.reservedRange && message.reservedRange.length) { + object.reservedRange = []; + for (var j = 0; j < message.reservedRange.length; ++j) + object.reservedRange[j] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.toObject(message.reservedRange[j], options); + } + if (message.reservedName && message.reservedName.length) { + object.reservedName = []; + for (var j = 0; j < message.reservedName.length; ++j) + object.reservedName[j] = message.reservedName[j]; + } + return object; + }; - return PushConfig; - })(); + /** + * Converts this EnumDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.EnumDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + EnumDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.ReceivedMessage = (function() { + EnumDescriptorProto.EnumReservedRange = (function() { /** - * Properties of a ReceivedMessage. - * @memberof google.pubsub.v1 - * @interface IReceivedMessage - * @property {string|null} [ackId] ReceivedMessage ackId - * @property {google.pubsub.v1.IPubsubMessage|null} [message] ReceivedMessage message - * @property {number|null} [deliveryAttempt] ReceivedMessage deliveryAttempt + * Properties of an EnumReservedRange. + * @memberof google.protobuf.EnumDescriptorProto + * @interface IEnumReservedRange + * @property {number|null} [start] EnumReservedRange start + * @property {number|null} [end] EnumReservedRange end */ /** - * Constructs a new ReceivedMessage. - * @memberof google.pubsub.v1 - * @classdesc Represents a ReceivedMessage. - * @implements IReceivedMessage + * Constructs a new EnumReservedRange. + * @memberof google.protobuf.EnumDescriptorProto + * @classdesc Represents an EnumReservedRange. + * @implements IEnumReservedRange * @constructor - * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set - */ - function ReceivedMessage(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ReceivedMessage ackId. - * @member {string} ackId - * @memberof google.pubsub.v1.ReceivedMessage - * @instance + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set */ - ReceivedMessage.prototype.ackId = ""; + function EnumReservedRange(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } /** - * ReceivedMessage message. - * @member {google.pubsub.v1.IPubsubMessage|null|undefined} message - * @memberof google.pubsub.v1.ReceivedMessage + * EnumReservedRange start. + * @member {number} start + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @instance */ - ReceivedMessage.prototype.message = null; + EnumReservedRange.prototype.start = 0; /** - * ReceivedMessage deliveryAttempt. - * @member {number} deliveryAttempt - * @memberof google.pubsub.v1.ReceivedMessage + * EnumReservedRange end. + * @member {number} end + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @instance */ - ReceivedMessage.prototype.deliveryAttempt = 0; + EnumReservedRange.prototype.end = 0; /** - * Creates a new ReceivedMessage instance using the specified properties. + * Creates a new EnumReservedRange instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static - * @param {google.pubsub.v1.IReceivedMessage=} [properties] Properties to set - * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage instance + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange instance */ - ReceivedMessage.create = function create(properties) { - return new ReceivedMessage(properties); + EnumReservedRange.create = function create(properties) { + return new EnumReservedRange(properties); }; /** - * Encodes the specified ReceivedMessage message. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static - * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ReceivedMessage.encode = function encode(message, writer) { + EnumReservedRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.ackId != null && message.hasOwnProperty("ackId")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.ackId); - if (message.message != null && message.hasOwnProperty("message")) - $root.google.pubsub.v1.PubsubMessage.encode(message.message, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.deliveryAttempt); + if (message.start != null && message.hasOwnProperty("start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); return writer; }; /** - * Encodes the specified ReceivedMessage message, length delimited. Does not implicitly {@link google.pubsub.v1.ReceivedMessage.verify|verify} messages. + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static - * @param {google.pubsub.v1.IReceivedMessage} message ReceivedMessage message or plain object to encode + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ReceivedMessage.encodeDelimited = function encodeDelimited(message, writer) { + EnumReservedRange.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ReceivedMessage message from the specified reader or buffer. + * Decodes an EnumReservedRange message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ReceivedMessage.decode = function decode(reader, length) { + EnumReservedRange.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ReceivedMessage(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.ackId = reader.string(); + message.start = reader.int32(); break; case 2: - message.message = $root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32()); - break; - case 3: - message.deliveryAttempt = reader.int32(); + message.end = reader.int32(); break; default: reader.skipType(tag & 7); @@ -19634,3358 +15461,4190 @@ }; /** - * Decodes a ReceivedMessage message from the specified reader or buffer, length delimited. + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ReceivedMessage.decodeDelimited = function decodeDelimited(reader) { + EnumReservedRange.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ReceivedMessage message. + * Verifies an EnumReservedRange message. * @function verify - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ReceivedMessage.verify = function verify(message) { + EnumReservedRange.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.ackId != null && message.hasOwnProperty("ackId")) - if (!$util.isString(message.ackId)) - return "ackId: string expected"; - if (message.message != null && message.hasOwnProperty("message")) { - var error = $root.google.pubsub.v1.PubsubMessage.verify(message.message); - if (error) - return "message." + error; - } - if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) - if (!$util.isInteger(message.deliveryAttempt)) - return "deliveryAttempt: integer expected"; + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; return null; }; /** - * Creates a ReceivedMessage message from a plain object. Also converts values to their respective internal types. + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ReceivedMessage} ReceivedMessage + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange */ - ReceivedMessage.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ReceivedMessage) + EnumReservedRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumDescriptorProto.EnumReservedRange) return object; - var message = new $root.google.pubsub.v1.ReceivedMessage(); - if (object.ackId != null) - message.ackId = String(object.ackId); - if (object.message != null) { - if (typeof object.message !== "object") - throw TypeError(".google.pubsub.v1.ReceivedMessage.message: object expected"); - message.message = $root.google.pubsub.v1.PubsubMessage.fromObject(object.message); - } - if (object.deliveryAttempt != null) - message.deliveryAttempt = object.deliveryAttempt | 0; + var message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; return message; }; /** - * Creates a plain object from a ReceivedMessage message. Also converts values to other types if specified. + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @static - * @param {google.pubsub.v1.ReceivedMessage} message ReceivedMessage + * @param {google.protobuf.EnumDescriptorProto.EnumReservedRange} message EnumReservedRange * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ReceivedMessage.toObject = function toObject(message, options) { + EnumReservedRange.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.ackId = ""; - object.message = null; - object.deliveryAttempt = 0; + object.start = 0; + object.end = 0; } - if (message.ackId != null && message.hasOwnProperty("ackId")) - object.ackId = message.ackId; - if (message.message != null && message.hasOwnProperty("message")) - object.message = $root.google.pubsub.v1.PubsubMessage.toObject(message.message, options); - if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) - object.deliveryAttempt = message.deliveryAttempt; + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; return object; }; /** - * Converts this ReceivedMessage to JSON. + * Converts this EnumReservedRange to JSON. * @function toJSON - * @memberof google.pubsub.v1.ReceivedMessage + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange * @instance * @returns {Object.} JSON object */ - ReceivedMessage.prototype.toJSON = function toJSON() { + EnumReservedRange.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ReceivedMessage; + return EnumReservedRange; })(); - v1.GetSubscriptionRequest = (function() { + return EnumDescriptorProto; + })(); - /** - * Properties of a GetSubscriptionRequest. - * @memberof google.pubsub.v1 - * @interface IGetSubscriptionRequest - * @property {string|null} [subscription] GetSubscriptionRequest subscription - */ + protobuf.EnumValueDescriptorProto = (function() { - /** - * Constructs a new GetSubscriptionRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a GetSubscriptionRequest. - * @implements IGetSubscriptionRequest - * @constructor - * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set - */ - function GetSubscriptionRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of an EnumValueDescriptorProto. + * @memberof google.protobuf + * @interface IEnumValueDescriptorProto + * @property {string|null} [name] EnumValueDescriptorProto name + * @property {number|null} [number] EnumValueDescriptorProto number + * @property {google.protobuf.IEnumValueOptions|null} [options] EnumValueDescriptorProto options + */ - /** - * GetSubscriptionRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @instance - */ - GetSubscriptionRequest.prototype.subscription = ""; + /** + * Constructs a new EnumValueDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents an EnumValueDescriptorProto. + * @implements IEnumValueDescriptorProto + * @constructor + * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set + */ + function EnumValueDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a new GetSubscriptionRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {google.pubsub.v1.IGetSubscriptionRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest instance - */ - GetSubscriptionRequest.create = function create(properties) { - return new GetSubscriptionRequest(properties); - }; + /** + * EnumValueDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.name = ""; + + /** + * EnumValueDescriptorProto number. + * @member {number} number + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.number = 0; + + /** + * EnumValueDescriptorProto options. + * @member {google.protobuf.IEnumValueOptions|null|undefined} options + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + */ + EnumValueDescriptorProto.prototype.options = null; + + /** + * Creates a new EnumValueDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto instance + */ + EnumValueDescriptorProto.create = function create(properties) { + return new EnumValueDescriptorProto(properties); + }; - /** - * Encodes the specified GetSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSubscriptionRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - return writer; - }; + /** + * Encodes the specified EnumValueDescriptorProto message. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.number != null && message.hasOwnProperty("number")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.number); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.EnumValueOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified GetSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSubscriptionRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {google.pubsub.v1.IGetSubscriptionRequest} message GetSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.IEnumValueDescriptorProto} message EnumValueDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSubscriptionRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSubscriptionRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.number = reader.int32(); + break; + case 3: + message.options = $root.google.protobuf.EnumValueOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a GetSubscriptionRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes an EnumValueDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a GetSubscriptionRequest message. - * @function verify - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - GetSubscriptionRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - return null; - }; + /** + * Verifies an EnumValueDescriptorProto message. + * @function verify + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumValueDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.number != null && message.hasOwnProperty("number")) + if (!$util.isInteger(message.number)) + return "number: integer expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.EnumValueOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; - /** - * Creates a GetSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.GetSubscriptionRequest} GetSubscriptionRequest - */ - GetSubscriptionRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.GetSubscriptionRequest) - return object; - var message = new $root.google.pubsub.v1.GetSubscriptionRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - return message; - }; + /** + * Creates an EnumValueDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumValueDescriptorProto} EnumValueDescriptorProto + */ + EnumValueDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumValueDescriptorProto) + return object; + var message = new $root.google.protobuf.EnumValueDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.number != null) + message.number = object.number | 0; + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.EnumValueDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.EnumValueOptions.fromObject(object.options); + } + return message; + }; + + /** + * Creates a plain object from an EnumValueDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {google.protobuf.EnumValueDescriptorProto} message EnumValueDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumValueDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.number = 0; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.number != null && message.hasOwnProperty("number")) + object.number = message.number; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.EnumValueOptions.toObject(message.options, options); + return object; + }; - /** - * Creates a plain object from a GetSubscriptionRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @static - * @param {google.pubsub.v1.GetSubscriptionRequest} message GetSubscriptionRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - GetSubscriptionRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.subscription = ""; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - return object; - }; + /** + * Converts this EnumValueDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.EnumValueDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + EnumValueDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this GetSubscriptionRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.GetSubscriptionRequest - * @instance - * @returns {Object.} JSON object - */ - GetSubscriptionRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + return EnumValueDescriptorProto; + })(); - return GetSubscriptionRequest; - })(); + protobuf.ServiceDescriptorProto = (function() { - v1.UpdateSubscriptionRequest = (function() { + /** + * Properties of a ServiceDescriptorProto. + * @memberof google.protobuf + * @interface IServiceDescriptorProto + * @property {string|null} [name] ServiceDescriptorProto name + * @property {Array.|null} [method] ServiceDescriptorProto method + * @property {google.protobuf.IServiceOptions|null} [options] ServiceDescriptorProto options + */ - /** - * Properties of an UpdateSubscriptionRequest. - * @memberof google.pubsub.v1 - * @interface IUpdateSubscriptionRequest - * @property {google.pubsub.v1.ISubscription|null} [subscription] UpdateSubscriptionRequest subscription - * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSubscriptionRequest updateMask - */ + /** + * Constructs a new ServiceDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a ServiceDescriptorProto. + * @implements IServiceDescriptorProto + * @constructor + * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set + */ + function ServiceDescriptorProto(properties) { + this.method = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new UpdateSubscriptionRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents an UpdateSubscriptionRequest. - * @implements IUpdateSubscriptionRequest - * @constructor - * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set - */ - function UpdateSubscriptionRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * ServiceDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.name = ""; - /** - * UpdateSubscriptionRequest subscription. - * @member {google.pubsub.v1.ISubscription|null|undefined} subscription - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @instance - */ - UpdateSubscriptionRequest.prototype.subscription = null; + /** + * ServiceDescriptorProto method. + * @member {Array.} method + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.method = $util.emptyArray; - /** - * UpdateSubscriptionRequest updateMask. - * @member {google.protobuf.IFieldMask|null|undefined} updateMask - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @instance - */ - UpdateSubscriptionRequest.prototype.updateMask = null; + /** + * ServiceDescriptorProto options. + * @member {google.protobuf.IServiceOptions|null|undefined} options + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + */ + ServiceDescriptorProto.prototype.options = null; - /** - * Creates a new UpdateSubscriptionRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {google.pubsub.v1.IUpdateSubscriptionRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest instance - */ - UpdateSubscriptionRequest.create = function create(properties) { - return new UpdateSubscriptionRequest(properties); - }; + /** + * Creates a new ServiceDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto instance + */ + ServiceDescriptorProto.create = function create(properties) { + return new ServiceDescriptorProto(properties); + }; - /** - * Encodes the specified UpdateSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UpdateSubscriptionRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - $root.google.pubsub.v1.Subscription.encode(message.subscription, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; + /** + * Encodes the specified ServiceDescriptorProto message. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.method != null && message.method.length) + for (var i = 0; i < message.method.length; ++i) + $root.google.protobuf.MethodDescriptorProto.encode(message.method[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.ServiceOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified UpdateSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSubscriptionRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {google.pubsub.v1.IUpdateSubscriptionRequest} message UpdateSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UpdateSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.IServiceDescriptorProto} message ServiceDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UpdateSubscriptionRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = $root.google.pubsub.v1.Subscription.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + if (!(message.method && message.method.length)) + message.method = []; + message.method.push($root.google.protobuf.MethodDescriptorProto.decode(reader, reader.uint32())); + break; + case 3: + message.options = $root.google.protobuf.ServiceOptions.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes an UpdateSubscriptionRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UpdateSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a ServiceDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies an UpdateSubscriptionRequest message. - * @function verify - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - UpdateSubscriptionRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) { - var error = $root.google.pubsub.v1.Subscription.verify(message.subscription); - if (error) - return "subscription." + error; - } - if (message.updateMask != null && message.hasOwnProperty("updateMask")) { - var error = $root.google.protobuf.FieldMask.verify(message.updateMask); + /** + * Verifies a ServiceDescriptorProto message. + * @function verify + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ServiceDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.method != null && message.hasOwnProperty("method")) { + if (!Array.isArray(message.method)) + return "method: array expected"; + for (var i = 0; i < message.method.length; ++i) { + var error = $root.google.protobuf.MethodDescriptorProto.verify(message.method[i]); if (error) - return "updateMask." + error; + return "method." + error; } - return null; - }; + } + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.ServiceOptions.verify(message.options); + if (error) + return "options." + error; + } + return null; + }; - /** - * Creates an UpdateSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.UpdateSubscriptionRequest} UpdateSubscriptionRequest - */ - UpdateSubscriptionRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.UpdateSubscriptionRequest) - return object; - var message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); - if (object.subscription != null) { - if (typeof object.subscription !== "object") - throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.subscription: object expected"); - message.subscription = $root.google.pubsub.v1.Subscription.fromObject(object.subscription); - } - if (object.updateMask != null) { - if (typeof object.updateMask !== "object") - throw TypeError(".google.pubsub.v1.UpdateSubscriptionRequest.updateMask: object expected"); - message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); + /** + * Creates a ServiceDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ServiceDescriptorProto} ServiceDescriptorProto + */ + ServiceDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ServiceDescriptorProto) + return object; + var message = new $root.google.protobuf.ServiceDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.method) { + if (!Array.isArray(object.method)) + throw TypeError(".google.protobuf.ServiceDescriptorProto.method: array expected"); + message.method = []; + for (var i = 0; i < object.method.length; ++i) { + if (typeof object.method[i] !== "object") + throw TypeError(".google.protobuf.ServiceDescriptorProto.method: object expected"); + message.method[i] = $root.google.protobuf.MethodDescriptorProto.fromObject(object.method[i]); } - return message; - }; + } + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.ServiceDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.ServiceOptions.fromObject(object.options); + } + return message; + }; - /** - * Creates a plain object from an UpdateSubscriptionRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @static - * @param {google.pubsub.v1.UpdateSubscriptionRequest} message UpdateSubscriptionRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - UpdateSubscriptionRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.subscription = null; - object.updateMask = null; - } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = $root.google.pubsub.v1.Subscription.toObject(message.subscription, options); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); - return object; - }; + /** + * Creates a plain object from a ServiceDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {google.protobuf.ServiceDescriptorProto} message ServiceDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ServiceDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.method = []; + if (options.defaults) { + object.name = ""; + object.options = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.method && message.method.length) { + object.method = []; + for (var j = 0; j < message.method.length; ++j) + object.method[j] = $root.google.protobuf.MethodDescriptorProto.toObject(message.method[j], options); + } + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.ServiceOptions.toObject(message.options, options); + return object; + }; + + /** + * Converts this ServiceDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.ServiceDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + ServiceDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ServiceDescriptorProto; + })(); + + protobuf.MethodDescriptorProto = (function() { + + /** + * Properties of a MethodDescriptorProto. + * @memberof google.protobuf + * @interface IMethodDescriptorProto + * @property {string|null} [name] MethodDescriptorProto name + * @property {string|null} [inputType] MethodDescriptorProto inputType + * @property {string|null} [outputType] MethodDescriptorProto outputType + * @property {google.protobuf.IMethodOptions|null} [options] MethodDescriptorProto options + * @property {boolean|null} [clientStreaming] MethodDescriptorProto clientStreaming + * @property {boolean|null} [serverStreaming] MethodDescriptorProto serverStreaming + */ + + /** + * Constructs a new MethodDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a MethodDescriptorProto. + * @implements IMethodDescriptorProto + * @constructor + * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set + */ + function MethodDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * MethodDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.name = ""; - /** - * Converts this UpdateSubscriptionRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.UpdateSubscriptionRequest - * @instance - * @returns {Object.} JSON object - */ - UpdateSubscriptionRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * MethodDescriptorProto inputType. + * @member {string} inputType + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.inputType = ""; - return UpdateSubscriptionRequest; - })(); + /** + * MethodDescriptorProto outputType. + * @member {string} outputType + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.outputType = ""; - v1.ListSubscriptionsRequest = (function() { + /** + * MethodDescriptorProto options. + * @member {google.protobuf.IMethodOptions|null|undefined} options + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.options = null; - /** - * Properties of a ListSubscriptionsRequest. - * @memberof google.pubsub.v1 - * @interface IListSubscriptionsRequest - * @property {string|null} [project] ListSubscriptionsRequest project - * @property {number|null} [pageSize] ListSubscriptionsRequest pageSize - * @property {string|null} [pageToken] ListSubscriptionsRequest pageToken - */ + /** + * MethodDescriptorProto clientStreaming. + * @member {boolean} clientStreaming + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.clientStreaming = false; - /** - * Constructs a new ListSubscriptionsRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListSubscriptionsRequest. - * @implements IListSubscriptionsRequest - * @constructor - * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set - */ - function ListSubscriptionsRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * MethodDescriptorProto serverStreaming. + * @member {boolean} serverStreaming + * @memberof google.protobuf.MethodDescriptorProto + * @instance + */ + MethodDescriptorProto.prototype.serverStreaming = false; - /** - * ListSubscriptionsRequest project. - * @member {string} project - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @instance - */ - ListSubscriptionsRequest.prototype.project = ""; + /** + * Creates a new MethodDescriptorProto instance using the specified properties. + * @function create + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto=} [properties] Properties to set + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto instance + */ + MethodDescriptorProto.create = function create(properties) { + return new MethodDescriptorProto(properties); + }; - /** - * ListSubscriptionsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @instance - */ - ListSubscriptionsRequest.prototype.pageSize = 0; + /** + * Encodes the specified MethodDescriptorProto message. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @function encode + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodDescriptorProto.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.hasOwnProperty("name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.inputType != null && message.hasOwnProperty("inputType")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.inputType); + if (message.outputType != null && message.hasOwnProperty("outputType")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputType); + if (message.options != null && message.hasOwnProperty("options")) + $root.google.protobuf.MethodOptions.encode(message.options, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + writer.uint32(/* id 5, wireType 0 =*/40).bool(message.clientStreaming); + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + writer.uint32(/* id 6, wireType 0 =*/48).bool(message.serverStreaming); + return writer; + }; - /** - * ListSubscriptionsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @instance - */ - ListSubscriptionsRequest.prototype.pageToken = ""; + /** + * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.IMethodDescriptorProto} message MethodDescriptorProto message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodDescriptorProto.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a new ListSubscriptionsRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @static - * @param {google.pubsub.v1.IListSubscriptionsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest instance - */ - ListSubscriptionsRequest.create = function create(properties) { - return new ListSubscriptionsRequest(properties); - }; + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodDescriptorProto.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodDescriptorProto(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.inputType = reader.string(); + break; + case 3: + message.outputType = reader.string(); + break; + case 4: + message.options = $root.google.protobuf.MethodOptions.decode(reader, reader.uint32()); + break; + case 5: + message.clientStreaming = reader.bool(); + break; + case 6: + message.serverStreaming = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified ListSubscriptionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @static - * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListSubscriptionsRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); - return writer; - }; + /** + * Decodes a MethodDescriptorProto message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodDescriptorProto.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a MethodDescriptorProto message. + * @function verify + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MethodDescriptorProto.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.inputType != null && message.hasOwnProperty("inputType")) + if (!$util.isString(message.inputType)) + return "inputType: string expected"; + if (message.outputType != null && message.hasOwnProperty("outputType")) + if (!$util.isString(message.outputType)) + return "outputType: string expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.MethodOptions.verify(message.options); + if (error) + return "options." + error; + } + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + if (typeof message.clientStreaming !== "boolean") + return "clientStreaming: boolean expected"; + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + if (typeof message.serverStreaming !== "boolean") + return "serverStreaming: boolean expected"; + return null; + }; - /** - * Encodes the specified ListSubscriptionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @static - * @param {google.pubsub.v1.IListSubscriptionsRequest} message ListSubscriptionsRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListSubscriptionsRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates a MethodDescriptorProto message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.MethodDescriptorProto} MethodDescriptorProto + */ + MethodDescriptorProto.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MethodDescriptorProto) + return object; + var message = new $root.google.protobuf.MethodDescriptorProto(); + if (object.name != null) + message.name = String(object.name); + if (object.inputType != null) + message.inputType = String(object.inputType); + if (object.outputType != null) + message.outputType = String(object.outputType); + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.MethodDescriptorProto.options: object expected"); + message.options = $root.google.protobuf.MethodOptions.fromObject(object.options); + } + if (object.clientStreaming != null) + message.clientStreaming = Boolean(object.clientStreaming); + if (object.serverStreaming != null) + message.serverStreaming = Boolean(object.serverStreaming); + return message; + }; - /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListSubscriptionsRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.project = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Creates a plain object from a MethodDescriptorProto message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {google.protobuf.MethodDescriptorProto} message MethodDescriptorProto + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MethodDescriptorProto.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.inputType = ""; + object.outputType = ""; + object.options = null; + object.clientStreaming = false; + object.serverStreaming = false; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.inputType != null && message.hasOwnProperty("inputType")) + object.inputType = message.inputType; + if (message.outputType != null && message.hasOwnProperty("outputType")) + object.outputType = message.outputType; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.MethodOptions.toObject(message.options, options); + if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + object.clientStreaming = message.clientStreaming; + if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + object.serverStreaming = message.serverStreaming; + return object; + }; - /** - * Decodes a ListSubscriptionsRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListSubscriptionsRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Converts this MethodDescriptorProto to JSON. + * @function toJSON + * @memberof google.protobuf.MethodDescriptorProto + * @instance + * @returns {Object.} JSON object + */ + MethodDescriptorProto.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Verifies a ListSubscriptionsRequest message. - * @function verify - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListSubscriptionsRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.project != null && message.hasOwnProperty("project")) - if (!$util.isString(message.project)) - return "project: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; - return null; - }; + return MethodDescriptorProto; + })(); - /** - * Creates a ListSubscriptionsRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListSubscriptionsRequest} ListSubscriptionsRequest - */ - ListSubscriptionsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListSubscriptionsRequest) - return object; - var message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); - if (object.project != null) - message.project = String(object.project); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); - return message; - }; + protobuf.FileOptions = (function() { - /** - * Creates a plain object from a ListSubscriptionsRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @static - * @param {google.pubsub.v1.ListSubscriptionsRequest} message ListSubscriptionsRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListSubscriptionsRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.project = ""; - object.pageSize = 0; - object.pageToken = ""; - } - if (message.project != null && message.hasOwnProperty("project")) - object.project = message.project; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; - return object; - }; + /** + * Properties of a FileOptions. + * @memberof google.protobuf + * @interface IFileOptions + * @property {string|null} [javaPackage] FileOptions javaPackage + * @property {string|null} [javaOuterClassname] FileOptions javaOuterClassname + * @property {boolean|null} [javaMultipleFiles] FileOptions javaMultipleFiles + * @property {boolean|null} [javaGenerateEqualsAndHash] FileOptions javaGenerateEqualsAndHash + * @property {boolean|null} [javaStringCheckUtf8] FileOptions javaStringCheckUtf8 + * @property {google.protobuf.FileOptions.OptimizeMode|null} [optimizeFor] FileOptions optimizeFor + * @property {string|null} [goPackage] FileOptions goPackage + * @property {boolean|null} [ccGenericServices] FileOptions ccGenericServices + * @property {boolean|null} [javaGenericServices] FileOptions javaGenericServices + * @property {boolean|null} [pyGenericServices] FileOptions pyGenericServices + * @property {boolean|null} [phpGenericServices] FileOptions phpGenericServices + * @property {boolean|null} [deprecated] FileOptions deprecated + * @property {boolean|null} [ccEnableArenas] FileOptions ccEnableArenas + * @property {string|null} [objcClassPrefix] FileOptions objcClassPrefix + * @property {string|null} [csharpNamespace] FileOptions csharpNamespace + * @property {string|null} [swiftPrefix] FileOptions swiftPrefix + * @property {string|null} [phpClassPrefix] FileOptions phpClassPrefix + * @property {string|null} [phpNamespace] FileOptions phpNamespace + * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace + * @property {string|null} [rubyPackage] FileOptions rubyPackage + * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption + * @property {Array.|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition + */ + + /** + * Constructs a new FileOptions. + * @memberof google.protobuf + * @classdesc Represents a FileOptions. + * @implements IFileOptions + * @constructor + * @param {google.protobuf.IFileOptions=} [properties] Properties to set + */ + function FileOptions(properties) { + this.uninterpretedOption = []; + this[".google.api.resourceDefinition"] = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Converts this ListSubscriptionsRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListSubscriptionsRequest - * @instance - * @returns {Object.} JSON object - */ - ListSubscriptionsRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * FileOptions javaPackage. + * @member {string} javaPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaPackage = ""; - return ListSubscriptionsRequest; - })(); + /** + * FileOptions javaOuterClassname. + * @member {string} javaOuterClassname + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaOuterClassname = ""; - v1.ListSubscriptionsResponse = (function() { + /** + * FileOptions javaMultipleFiles. + * @member {boolean} javaMultipleFiles + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaMultipleFiles = false; - /** - * Properties of a ListSubscriptionsResponse. - * @memberof google.pubsub.v1 - * @interface IListSubscriptionsResponse - * @property {Array.|null} [subscriptions] ListSubscriptionsResponse subscriptions - * @property {string|null} [nextPageToken] ListSubscriptionsResponse nextPageToken - */ + /** + * FileOptions javaGenerateEqualsAndHash. + * @member {boolean} javaGenerateEqualsAndHash + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaGenerateEqualsAndHash = false; - /** - * Constructs a new ListSubscriptionsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListSubscriptionsResponse. - * @implements IListSubscriptionsResponse - * @constructor - * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set - */ - function ListSubscriptionsResponse(properties) { - this.subscriptions = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * FileOptions javaStringCheckUtf8. + * @member {boolean} javaStringCheckUtf8 + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaStringCheckUtf8 = false; - /** - * ListSubscriptionsResponse subscriptions. - * @member {Array.} subscriptions - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @instance - */ - ListSubscriptionsResponse.prototype.subscriptions = $util.emptyArray; + /** + * FileOptions optimizeFor. + * @member {google.protobuf.FileOptions.OptimizeMode} optimizeFor + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.optimizeFor = 1; - /** - * ListSubscriptionsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @instance - */ - ListSubscriptionsResponse.prototype.nextPageToken = ""; + /** + * FileOptions goPackage. + * @member {string} goPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.goPackage = ""; - /** - * Creates a new ListSubscriptionsResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListSubscriptionsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse instance - */ - ListSubscriptionsResponse.create = function create(properties) { - return new ListSubscriptionsResponse(properties); - }; + /** + * FileOptions ccGenericServices. + * @member {boolean} ccGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.ccGenericServices = false; - /** - * Encodes the specified ListSubscriptionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListSubscriptionsResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscriptions != null && message.subscriptions.length) - for (var i = 0; i < message.subscriptions.length; ++i) - $root.google.pubsub.v1.Subscription.encode(message.subscriptions[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); - return writer; - }; + /** + * FileOptions javaGenericServices. + * @member {boolean} javaGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.javaGenericServices = false; - /** - * Encodes the specified ListSubscriptionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSubscriptionsResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @static - * @param {google.pubsub.v1.IListSubscriptionsResponse} message ListSubscriptionsResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ListSubscriptionsResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * FileOptions pyGenericServices. + * @member {boolean} pyGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.pyGenericServices = false; - /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListSubscriptionsResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.subscriptions && message.subscriptions.length)) - message.subscriptions = []; - message.subscriptions.push($root.google.pubsub.v1.Subscription.decode(reader, reader.uint32())); - break; - case 2: - message.nextPageToken = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * FileOptions phpGenericServices. + * @member {boolean} phpGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpGenericServices = false; - /** - * Decodes a ListSubscriptionsResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ListSubscriptionsResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * FileOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.deprecated = false; - /** - * Verifies a ListSubscriptionsResponse message. - * @function verify - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ListSubscriptionsResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscriptions != null && message.hasOwnProperty("subscriptions")) { - if (!Array.isArray(message.subscriptions)) - return "subscriptions: array expected"; - for (var i = 0; i < message.subscriptions.length; ++i) { - var error = $root.google.pubsub.v1.Subscription.verify(message.subscriptions[i]); - if (error) - return "subscriptions." + error; - } - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; - return null; - }; + /** + * FileOptions ccEnableArenas. + * @member {boolean} ccEnableArenas + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.ccEnableArenas = false; - /** - * Creates a ListSubscriptionsResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListSubscriptionsResponse} ListSubscriptionsResponse - */ - ListSubscriptionsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListSubscriptionsResponse) - return object; - var message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); - if (object.subscriptions) { - if (!Array.isArray(object.subscriptions)) - throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: array expected"); - message.subscriptions = []; - for (var i = 0; i < object.subscriptions.length; ++i) { - if (typeof object.subscriptions[i] !== "object") - throw TypeError(".google.pubsub.v1.ListSubscriptionsResponse.subscriptions: object expected"); - message.subscriptions[i] = $root.google.pubsub.v1.Subscription.fromObject(object.subscriptions[i]); - } - } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); - return message; - }; + /** + * FileOptions objcClassPrefix. + * @member {string} objcClassPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.objcClassPrefix = ""; - /** - * Creates a plain object from a ListSubscriptionsResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @static - * @param {google.pubsub.v1.ListSubscriptionsResponse} message ListSubscriptionsResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ListSubscriptionsResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.subscriptions = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.subscriptions && message.subscriptions.length) { - object.subscriptions = []; - for (var j = 0; j < message.subscriptions.length; ++j) - object.subscriptions[j] = $root.google.pubsub.v1.Subscription.toObject(message.subscriptions[j], options); - } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; - return object; - }; + /** + * FileOptions csharpNamespace. + * @member {string} csharpNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.csharpNamespace = ""; - /** - * Converts this ListSubscriptionsResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ListSubscriptionsResponse - * @instance - * @returns {Object.} JSON object - */ - ListSubscriptionsResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * FileOptions swiftPrefix. + * @member {string} swiftPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.swiftPrefix = ""; - return ListSubscriptionsResponse; - })(); + /** + * FileOptions phpClassPrefix. + * @member {string} phpClassPrefix + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpClassPrefix = ""; - v1.DeleteSubscriptionRequest = (function() { + /** + * FileOptions phpNamespace. + * @member {string} phpNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpNamespace = ""; - /** - * Properties of a DeleteSubscriptionRequest. - * @memberof google.pubsub.v1 - * @interface IDeleteSubscriptionRequest - * @property {string|null} [subscription] DeleteSubscriptionRequest subscription - */ + /** + * FileOptions phpMetadataNamespace. + * @member {string} phpMetadataNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpMetadataNamespace = ""; - /** - * Constructs a new DeleteSubscriptionRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a DeleteSubscriptionRequest. - * @implements IDeleteSubscriptionRequest - * @constructor - * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set - */ - function DeleteSubscriptionRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * FileOptions rubyPackage. + * @member {string} rubyPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.rubyPackage = ""; - /** - * DeleteSubscriptionRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @instance - */ - DeleteSubscriptionRequest.prototype.subscription = ""; + /** + * FileOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Creates a new DeleteSubscriptionRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {google.pubsub.v1.IDeleteSubscriptionRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest instance - */ - DeleteSubscriptionRequest.create = function create(properties) { - return new DeleteSubscriptionRequest(properties); - }; + /** + * FileOptions .google.api.resourceDefinition. + * @member {Array.} .google.api.resourceDefinition + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype[".google.api.resourceDefinition"] = $util.emptyArray; - /** - * Encodes the specified DeleteSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteSubscriptionRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - return writer; - }; + /** + * Creates a new FileOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions=} [properties] Properties to set + * @returns {google.protobuf.FileOptions} FileOptions instance + */ + FileOptions.create = function create(properties) { + return new FileOptions(properties); + }; + + /** + * Encodes the specified FileOptions message. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.javaPackage); + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + writer.uint32(/* id 8, wireType 2 =*/66).string(message.javaOuterClassname); + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + writer.uint32(/* id 9, wireType 0 =*/72).int32(message.optimizeFor); + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.javaMultipleFiles); + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + writer.uint32(/* id 11, wireType 2 =*/90).string(message.goPackage); + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + writer.uint32(/* id 16, wireType 0 =*/128).bool(message.ccGenericServices); + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + writer.uint32(/* id 17, wireType 0 =*/136).bool(message.javaGenericServices); + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + writer.uint32(/* id 18, wireType 0 =*/144).bool(message.pyGenericServices); + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + writer.uint32(/* id 20, wireType 0 =*/160).bool(message.javaGenerateEqualsAndHash); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 23, wireType 0 =*/184).bool(message.deprecated); + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + writer.uint32(/* id 27, wireType 0 =*/216).bool(message.javaStringCheckUtf8); + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + writer.uint32(/* id 31, wireType 0 =*/248).bool(message.ccEnableArenas); + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + writer.uint32(/* id 36, wireType 2 =*/290).string(message.objcClassPrefix); + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + writer.uint32(/* id 37, wireType 2 =*/298).string(message.csharpNamespace); + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + writer.uint32(/* id 39, wireType 2 =*/314).string(message.swiftPrefix); + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.resourceDefinition"] != null && message[".google.api.resourceDefinition"].length) + for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) + $root.google.api.ResourceDescriptor.encode(message[".google.api.resourceDefinition"][i], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified DeleteSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSubscriptionRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {google.pubsub.v1.IDeleteSubscriptionRequest} message DeleteSubscriptionRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.IFileOptions} message FileOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FileOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteSubscriptionRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes a FileOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FileOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FileOptions} FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.javaPackage = reader.string(); + break; + case 8: + message.javaOuterClassname = reader.string(); + break; + case 10: + message.javaMultipleFiles = reader.bool(); + break; + case 20: + message.javaGenerateEqualsAndHash = reader.bool(); + break; + case 27: + message.javaStringCheckUtf8 = reader.bool(); + break; + case 9: + message.optimizeFor = reader.int32(); + break; + case 11: + message.goPackage = reader.string(); + break; + case 16: + message.ccGenericServices = reader.bool(); + break; + case 17: + message.javaGenericServices = reader.bool(); + break; + case 18: + message.pyGenericServices = reader.bool(); + break; + case 42: + message.phpGenericServices = reader.bool(); + break; + case 23: + message.deprecated = reader.bool(); + break; + case 31: + message.ccEnableArenas = reader.bool(); + break; + case 36: + message.objcClassPrefix = reader.string(); + break; + case 37: + message.csharpNamespace = reader.string(); + break; + case 39: + message.swiftPrefix = reader.string(); + break; + case 40: + message.phpClassPrefix = reader.string(); + break; + case 41: + message.phpNamespace = reader.string(); + break; + case 44: + message.phpMetadataNamespace = reader.string(); + break; + case 45: + message.rubyPackage = reader.string(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1053: + if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length)) + message[".google.api.resourceDefinition"] = []; + message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; - - /** - * Decodes a DeleteSubscriptionRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + } + return message; + }; - /** - * Verifies a DeleteSubscriptionRequest message. - * @function verify - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DeleteSubscriptionRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - return null; - }; + /** + * Decodes a FileOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FileOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FileOptions} FileOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FileOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a DeleteSubscriptionRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.DeleteSubscriptionRequest} DeleteSubscriptionRequest - */ - DeleteSubscriptionRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.DeleteSubscriptionRequest) - return object; - var message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - return message; - }; + /** + * Verifies a FileOptions message. + * @function verify + * @memberof google.protobuf.FileOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FileOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + if (!$util.isString(message.javaPackage)) + return "javaPackage: string expected"; + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + if (!$util.isString(message.javaOuterClassname)) + return "javaOuterClassname: string expected"; + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + if (typeof message.javaMultipleFiles !== "boolean") + return "javaMultipleFiles: boolean expected"; + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + if (typeof message.javaGenerateEqualsAndHash !== "boolean") + return "javaGenerateEqualsAndHash: boolean expected"; + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + if (typeof message.javaStringCheckUtf8 !== "boolean") + return "javaStringCheckUtf8: boolean expected"; + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + switch (message.optimizeFor) { + default: + return "optimizeFor: enum value expected"; + case 1: + case 2: + case 3: + break; + } + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + if (!$util.isString(message.goPackage)) + return "goPackage: string expected"; + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + if (typeof message.ccGenericServices !== "boolean") + return "ccGenericServices: boolean expected"; + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + if (typeof message.javaGenericServices !== "boolean") + return "javaGenericServices: boolean expected"; + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + if (typeof message.pyGenericServices !== "boolean") + return "pyGenericServices: boolean expected"; + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + if (typeof message.phpGenericServices !== "boolean") + return "phpGenericServices: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + if (typeof message.ccEnableArenas !== "boolean") + return "ccEnableArenas: boolean expected"; + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + if (!$util.isString(message.objcClassPrefix)) + return "objcClassPrefix: string expected"; + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + if (!$util.isString(message.csharpNamespace)) + return "csharpNamespace: string expected"; + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + if (!$util.isString(message.swiftPrefix)) + return "swiftPrefix: string expected"; + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + if (!$util.isString(message.phpClassPrefix)) + return "phpClassPrefix: string expected"; + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + if (!$util.isString(message.phpNamespace)) + return "phpNamespace: string expected"; + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + if (!$util.isString(message.phpMetadataNamespace)) + return "phpMetadataNamespace: string expected"; + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + if (!$util.isString(message.rubyPackage)) + return "rubyPackage: string expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + if (message[".google.api.resourceDefinition"] != null && message.hasOwnProperty(".google.api.resourceDefinition")) { + if (!Array.isArray(message[".google.api.resourceDefinition"])) + return ".google.api.resourceDefinition: array expected"; + for (var i = 0; i < message[".google.api.resourceDefinition"].length; ++i) { + var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resourceDefinition"][i]); + if (error) + return ".google.api.resourceDefinition." + error; + } + } + return null; + }; - /** - * Creates a plain object from a DeleteSubscriptionRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @static - * @param {google.pubsub.v1.DeleteSubscriptionRequest} message DeleteSubscriptionRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DeleteSubscriptionRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.subscription = ""; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; + /** + * Creates a FileOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FileOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FileOptions} FileOptions + */ + FileOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FileOptions) return object; - }; - - /** - * Converts this DeleteSubscriptionRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.DeleteSubscriptionRequest - * @instance - * @returns {Object.} JSON object - */ - DeleteSubscriptionRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return DeleteSubscriptionRequest; - })(); - - v1.ModifyPushConfigRequest = (function() { - - /** - * Properties of a ModifyPushConfigRequest. - * @memberof google.pubsub.v1 - * @interface IModifyPushConfigRequest - * @property {string|null} [subscription] ModifyPushConfigRequest subscription - * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] ModifyPushConfigRequest pushConfig - */ + var message = new $root.google.protobuf.FileOptions(); + if (object.javaPackage != null) + message.javaPackage = String(object.javaPackage); + if (object.javaOuterClassname != null) + message.javaOuterClassname = String(object.javaOuterClassname); + if (object.javaMultipleFiles != null) + message.javaMultipleFiles = Boolean(object.javaMultipleFiles); + if (object.javaGenerateEqualsAndHash != null) + message.javaGenerateEqualsAndHash = Boolean(object.javaGenerateEqualsAndHash); + if (object.javaStringCheckUtf8 != null) + message.javaStringCheckUtf8 = Boolean(object.javaStringCheckUtf8); + switch (object.optimizeFor) { + case "SPEED": + case 1: + message.optimizeFor = 1; + break; + case "CODE_SIZE": + case 2: + message.optimizeFor = 2; + break; + case "LITE_RUNTIME": + case 3: + message.optimizeFor = 3; + break; + } + if (object.goPackage != null) + message.goPackage = String(object.goPackage); + if (object.ccGenericServices != null) + message.ccGenericServices = Boolean(object.ccGenericServices); + if (object.javaGenericServices != null) + message.javaGenericServices = Boolean(object.javaGenericServices); + if (object.pyGenericServices != null) + message.pyGenericServices = Boolean(object.pyGenericServices); + if (object.phpGenericServices != null) + message.phpGenericServices = Boolean(object.phpGenericServices); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.ccEnableArenas != null) + message.ccEnableArenas = Boolean(object.ccEnableArenas); + if (object.objcClassPrefix != null) + message.objcClassPrefix = String(object.objcClassPrefix); + if (object.csharpNamespace != null) + message.csharpNamespace = String(object.csharpNamespace); + if (object.swiftPrefix != null) + message.swiftPrefix = String(object.swiftPrefix); + if (object.phpClassPrefix != null) + message.phpClassPrefix = String(object.phpClassPrefix); + if (object.phpNamespace != null) + message.phpNamespace = String(object.phpNamespace); + if (object.phpMetadataNamespace != null) + message.phpMetadataNamespace = String(object.phpMetadataNamespace); + if (object.rubyPackage != null) + message.rubyPackage = String(object.rubyPackage); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + if (object[".google.api.resourceDefinition"]) { + if (!Array.isArray(object[".google.api.resourceDefinition"])) + throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: array expected"); + message[".google.api.resourceDefinition"] = []; + for (var i = 0; i < object[".google.api.resourceDefinition"].length; ++i) { + if (typeof object[".google.api.resourceDefinition"][i] !== "object") + throw TypeError(".google.protobuf.FileOptions..google.api.resourceDefinition: object expected"); + message[".google.api.resourceDefinition"][i] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resourceDefinition"][i]); + } + } + return message; + }; - /** - * Constructs a new ModifyPushConfigRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ModifyPushConfigRequest. - * @implements IModifyPushConfigRequest - * @constructor - * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set - */ - function ModifyPushConfigRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Creates a plain object from a FileOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FileOptions + * @static + * @param {google.protobuf.FileOptions} message FileOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FileOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.uninterpretedOption = []; + object[".google.api.resourceDefinition"] = []; + } + if (options.defaults) { + object.javaPackage = ""; + object.javaOuterClassname = ""; + object.optimizeFor = options.enums === String ? "SPEED" : 1; + object.javaMultipleFiles = false; + object.goPackage = ""; + object.ccGenericServices = false; + object.javaGenericServices = false; + object.pyGenericServices = false; + object.javaGenerateEqualsAndHash = false; + object.deprecated = false; + object.javaStringCheckUtf8 = false; + object.ccEnableArenas = false; + object.objcClassPrefix = ""; + object.csharpNamespace = ""; + object.swiftPrefix = ""; + object.phpClassPrefix = ""; + object.phpNamespace = ""; + object.phpGenericServices = false; + object.phpMetadataNamespace = ""; + object.rubyPackage = ""; + } + if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + object.javaPackage = message.javaPackage; + if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + object.javaOuterClassname = message.javaOuterClassname; + if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + object.optimizeFor = options.enums === String ? $root.google.protobuf.FileOptions.OptimizeMode[message.optimizeFor] : message.optimizeFor; + if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + object.javaMultipleFiles = message.javaMultipleFiles; + if (message.goPackage != null && message.hasOwnProperty("goPackage")) + object.goPackage = message.goPackage; + if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + object.ccGenericServices = message.ccGenericServices; + if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + object.javaGenericServices = message.javaGenericServices; + if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + object.pyGenericServices = message.pyGenericServices; + if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + object.javaGenerateEqualsAndHash = message.javaGenerateEqualsAndHash; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + object.javaStringCheckUtf8 = message.javaStringCheckUtf8; + if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + object.ccEnableArenas = message.ccEnableArenas; + if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + object.objcClassPrefix = message.objcClassPrefix; + if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + object.csharpNamespace = message.csharpNamespace; + if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + object.swiftPrefix = message.swiftPrefix; + if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + object.phpClassPrefix = message.phpClassPrefix; + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + object.phpNamespace = message.phpNamespace; + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + object.phpGenericServices = message.phpGenericServices; + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + object.phpMetadataNamespace = message.phpMetadataNamespace; + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + object.rubyPackage = message.rubyPackage; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); } + if (message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length) { + object[".google.api.resourceDefinition"] = []; + for (var j = 0; j < message[".google.api.resourceDefinition"].length; ++j) + object[".google.api.resourceDefinition"][j] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resourceDefinition"][j], options); + } + return object; + }; - /** - * ModifyPushConfigRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @instance - */ - ModifyPushConfigRequest.prototype.subscription = ""; - - /** - * ModifyPushConfigRequest pushConfig. - * @member {google.pubsub.v1.IPushConfig|null|undefined} pushConfig - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @instance - */ - ModifyPushConfigRequest.prototype.pushConfig = null; - - /** - * Creates a new ModifyPushConfigRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {google.pubsub.v1.IModifyPushConfigRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest instance - */ - ModifyPushConfigRequest.create = function create(properties) { - return new ModifyPushConfigRequest(properties); - }; - - /** - * Encodes the specified ModifyPushConfigRequest message. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ModifyPushConfigRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) - $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; + /** + * Converts this FileOptions to JSON. + * @function toJSON + * @memberof google.protobuf.FileOptions + * @instance + * @returns {Object.} JSON object + */ + FileOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Encodes the specified ModifyPushConfigRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyPushConfigRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {google.pubsub.v1.IModifyPushConfigRequest} message ModifyPushConfigRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ModifyPushConfigRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * OptimizeMode enum. + * @name google.protobuf.FileOptions.OptimizeMode + * @enum {string} + * @property {number} SPEED=1 SPEED value + * @property {number} CODE_SIZE=2 CODE_SIZE value + * @property {number} LITE_RUNTIME=3 LITE_RUNTIME value + */ + FileOptions.OptimizeMode = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[1] = "SPEED"] = 1; + values[valuesById[2] = "CODE_SIZE"] = 2; + values[valuesById[3] = "LITE_RUNTIME"] = 3; + return values; + })(); - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ModifyPushConfigRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + return FileOptions; + })(); - /** - * Decodes a ModifyPushConfigRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ModifyPushConfigRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + protobuf.MessageOptions = (function() { - /** - * Verifies a ModifyPushConfigRequest message. - * @function verify - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ModifyPushConfigRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) { - var error = $root.google.pubsub.v1.PushConfig.verify(message.pushConfig); - if (error) - return "pushConfig." + error; - } - return null; - }; + /** + * Properties of a MessageOptions. + * @memberof google.protobuf + * @interface IMessageOptions + * @property {boolean|null} [messageSetWireFormat] MessageOptions messageSetWireFormat + * @property {boolean|null} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor + * @property {boolean|null} [deprecated] MessageOptions deprecated + * @property {boolean|null} [mapEntry] MessageOptions mapEntry + * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption + * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource + */ - /** - * Creates a ModifyPushConfigRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ModifyPushConfigRequest} ModifyPushConfigRequest - */ - ModifyPushConfigRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ModifyPushConfigRequest) - return object; - var message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.pushConfig != null) { - if (typeof object.pushConfig !== "object") - throw TypeError(".google.pubsub.v1.ModifyPushConfigRequest.pushConfig: object expected"); - message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); - } - return message; - }; + /** + * Constructs a new MessageOptions. + * @memberof google.protobuf + * @classdesc Represents a MessageOptions. + * @implements IMessageOptions + * @constructor + * @param {google.protobuf.IMessageOptions=} [properties] Properties to set + */ + function MessageOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a plain object from a ModifyPushConfigRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @static - * @param {google.pubsub.v1.ModifyPushConfigRequest} message ModifyPushConfigRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ModifyPushConfigRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.subscription = ""; - object.pushConfig = null; - } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) - object.pushConfig = $root.google.pubsub.v1.PushConfig.toObject(message.pushConfig, options); - return object; - }; + /** + * MessageOptions messageSetWireFormat. + * @member {boolean} messageSetWireFormat + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.messageSetWireFormat = false; - /** - * Converts this ModifyPushConfigRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ModifyPushConfigRequest - * @instance - * @returns {Object.} JSON object - */ - ModifyPushConfigRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * MessageOptions noStandardDescriptorAccessor. + * @member {boolean} noStandardDescriptorAccessor + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.noStandardDescriptorAccessor = false; - return ModifyPushConfigRequest; - })(); + /** + * MessageOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.deprecated = false; - v1.PullRequest = (function() { + /** + * MessageOptions mapEntry. + * @member {boolean} mapEntry + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.mapEntry = false; - /** - * Properties of a PullRequest. - * @memberof google.pubsub.v1 - * @interface IPullRequest - * @property {string|null} [subscription] PullRequest subscription - * @property {boolean|null} [returnImmediately] PullRequest returnImmediately - * @property {number|null} [maxMessages] PullRequest maxMessages - */ + /** + * MessageOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Constructs a new PullRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a PullRequest. - * @implements IPullRequest - * @constructor - * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set - */ - function PullRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * MessageOptions .google.api.resource. + * @member {google.api.IResourceDescriptor|null|undefined} .google.api.resource + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype[".google.api.resource"] = null; - /** - * PullRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.PullRequest - * @instance - */ - PullRequest.prototype.subscription = ""; + /** + * Creates a new MessageOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions=} [properties] Properties to set + * @returns {google.protobuf.MessageOptions} MessageOptions instance + */ + MessageOptions.create = function create(properties) { + return new MessageOptions(properties); + }; - /** - * PullRequest returnImmediately. - * @member {boolean} returnImmediately - * @memberof google.pubsub.v1.PullRequest - * @instance - */ - PullRequest.prototype.returnImmediately = false; + /** + * Encodes the specified MessageOptions message. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.messageSetWireFormat); + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.noStandardDescriptorAccessor); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) + $root.google.api.ResourceDescriptor.encode(message[".google.api.resource"], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); + return writer; + }; - /** - * PullRequest maxMessages. - * @member {number} maxMessages - * @memberof google.pubsub.v1.PullRequest - * @instance - */ - PullRequest.prototype.maxMessages = 0; + /** + * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.IMessageOptions} message MessageOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a new PullRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {google.pubsub.v1.IPullRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.PullRequest} PullRequest instance - */ - PullRequest.create = function create(properties) { - return new PullRequest(properties); - }; + /** + * Decodes a MessageOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.MessageOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.MessageOptions} MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MessageOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.messageSetWireFormat = reader.bool(); + break; + case 2: + message.noStandardDescriptorAccessor = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 7: + message.mapEntry = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1053: + message[".google.api.resource"] = $root.google.api.ResourceDescriptor.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Encodes the specified PullRequest message. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PullRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.returnImmediately); - if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.maxMessages); - return writer; - }; + /** + * Decodes a MessageOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.MessageOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.MessageOptions} MessageOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified PullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.PullRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {google.pubsub.v1.IPullRequest} message PullRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PullRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Verifies a MessageOptions message. + * @function verify + * @memberof google.protobuf.MessageOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MessageOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + if (typeof message.messageSetWireFormat !== "boolean") + return "messageSetWireFormat: boolean expected"; + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + if (typeof message.noStandardDescriptorAccessor !== "boolean") + return "noStandardDescriptorAccessor: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + if (typeof message.mapEntry !== "boolean") + return "mapEntry: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) { + var error = $root.google.api.ResourceDescriptor.verify(message[".google.api.resource"]); + if (error) + return ".google.api.resource." + error; + } + return null; + }; - /** - * Decodes a PullRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PullRequest} PullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PullRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.returnImmediately = reader.bool(); - break; - case 3: - message.maxMessages = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Creates a MessageOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.MessageOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.MessageOptions} MessageOptions + */ + MessageOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MessageOptions) + return object; + var message = new $root.google.protobuf.MessageOptions(); + if (object.messageSetWireFormat != null) + message.messageSetWireFormat = Boolean(object.messageSetWireFormat); + if (object.noStandardDescriptorAccessor != null) + message.noStandardDescriptorAccessor = Boolean(object.noStandardDescriptorAccessor); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.mapEntry != null) + message.mapEntry = Boolean(object.mapEntry); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } - return message; - }; + } + if (object[".google.api.resource"] != null) { + if (typeof object[".google.api.resource"] !== "object") + throw TypeError(".google.protobuf.MessageOptions..google.api.resource: object expected"); + message[".google.api.resource"] = $root.google.api.ResourceDescriptor.fromObject(object[".google.api.resource"]); + } + return message; + }; - /** - * Decodes a PullRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PullRequest} PullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PullRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a plain object from a MessageOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.MessageOptions + * @static + * @param {google.protobuf.MessageOptions} message MessageOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MessageOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.messageSetWireFormat = false; + object.noStandardDescriptorAccessor = false; + object.deprecated = false; + object.mapEntry = false; + object[".google.api.resource"] = null; + } + if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + object.messageSetWireFormat = message.messageSetWireFormat; + if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + object.noStandardDescriptorAccessor = message.noStandardDescriptorAccessor; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + object.mapEntry = message.mapEntry; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) + object[".google.api.resource"] = $root.google.api.ResourceDescriptor.toObject(message[".google.api.resource"], options); + return object; + }; - /** - * Verifies a PullRequest message. - * @function verify - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PullRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) - if (typeof message.returnImmediately !== "boolean") - return "returnImmediately: boolean expected"; - if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) - if (!$util.isInteger(message.maxMessages)) - return "maxMessages: integer expected"; - return null; - }; + /** + * Converts this MessageOptions to JSON. + * @function toJSON + * @memberof google.protobuf.MessageOptions + * @instance + * @returns {Object.} JSON object + */ + MessageOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a PullRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PullRequest} PullRequest - */ - PullRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PullRequest) - return object; - var message = new $root.google.pubsub.v1.PullRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.returnImmediately != null) - message.returnImmediately = Boolean(object.returnImmediately); - if (object.maxMessages != null) - message.maxMessages = object.maxMessages | 0; - return message; - }; + return MessageOptions; + })(); - /** - * Creates a plain object from a PullRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PullRequest - * @static - * @param {google.pubsub.v1.PullRequest} message PullRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PullRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.subscription = ""; - object.returnImmediately = false; - object.maxMessages = 0; - } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) - object.returnImmediately = message.returnImmediately; - if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) - object.maxMessages = message.maxMessages; - return object; - }; + protobuf.FieldOptions = (function() { + + /** + * Properties of a FieldOptions. + * @memberof google.protobuf + * @interface IFieldOptions + * @property {google.protobuf.FieldOptions.CType|null} [ctype] FieldOptions ctype + * @property {boolean|null} [packed] FieldOptions packed + * @property {google.protobuf.FieldOptions.JSType|null} [jstype] FieldOptions jstype + * @property {boolean|null} [lazy] FieldOptions lazy + * @property {boolean|null} [deprecated] FieldOptions deprecated + * @property {boolean|null} [weak] FieldOptions weak + * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption + * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior + * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference + */ + + /** + * Constructs a new FieldOptions. + * @memberof google.protobuf + * @classdesc Represents a FieldOptions. + * @implements IFieldOptions + * @constructor + * @param {google.protobuf.IFieldOptions=} [properties] Properties to set + */ + function FieldOptions(properties) { + this.uninterpretedOption = []; + this[".google.api.fieldBehavior"] = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Converts this PullRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PullRequest - * @instance - * @returns {Object.} JSON object - */ - PullRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * FieldOptions ctype. + * @member {google.protobuf.FieldOptions.CType} ctype + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.ctype = 0; - return PullRequest; - })(); + /** + * FieldOptions packed. + * @member {boolean} packed + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.packed = false; - v1.PullResponse = (function() { + /** + * FieldOptions jstype. + * @member {google.protobuf.FieldOptions.JSType} jstype + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.jstype = 0; - /** - * Properties of a PullResponse. - * @memberof google.pubsub.v1 - * @interface IPullResponse - * @property {Array.|null} [receivedMessages] PullResponse receivedMessages - */ + /** + * FieldOptions lazy. + * @member {boolean} lazy + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.lazy = false; - /** - * Constructs a new PullResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a PullResponse. - * @implements IPullResponse - * @constructor - * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set - */ - function PullResponse(properties) { - this.receivedMessages = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * FieldOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.deprecated = false; - /** - * PullResponse receivedMessages. - * @member {Array.} receivedMessages - * @memberof google.pubsub.v1.PullResponse - * @instance - */ - PullResponse.prototype.receivedMessages = $util.emptyArray; + /** + * FieldOptions weak. + * @member {boolean} weak + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.weak = false; - /** - * Creates a new PullResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {google.pubsub.v1.IPullResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.PullResponse} PullResponse instance - */ - PullResponse.create = function create(properties) { - return new PullResponse(properties); - }; + /** + * FieldOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Encodes the specified PullResponse message. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PullResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.receivedMessages != null && message.receivedMessages.length) - for (var i = 0; i < message.receivedMessages.length; ++i) - $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + /** + * FieldOptions .google.api.fieldBehavior. + * @member {Array.} .google.api.fieldBehavior + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype[".google.api.fieldBehavior"] = $util.emptyArray; - /** - * Encodes the specified PullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.PullResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {google.pubsub.v1.IPullResponse} message PullResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PullResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * FieldOptions .google.api.resourceReference. + * @member {google.api.IResourceReference|null|undefined} .google.api.resourceReference + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype[".google.api.resourceReference"] = null; - /** - * Decodes a PullResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PullResponse} PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PullResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.receivedMessages && message.receivedMessages.length)) - message.receivedMessages = []; - message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Creates a new FieldOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions=} [properties] Properties to set + * @returns {google.protobuf.FieldOptions} FieldOptions instance + */ + FieldOptions.create = function create(properties) { + return new FieldOptions(properties); + }; + + /** + * Encodes the specified FieldOptions message. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ctype != null && message.hasOwnProperty("ctype")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.ctype); + if (message.packed != null && message.hasOwnProperty("packed")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.packed); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.lazy != null && message.hasOwnProperty("lazy")) + writer.uint32(/* id 5, wireType 0 =*/40).bool(message.lazy); + if (message.jstype != null && message.hasOwnProperty("jstype")) + writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jstype); + if (message.weak != null && message.hasOwnProperty("weak")) + writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.fieldBehavior"] != null && message[".google.api.fieldBehavior"].length) { + writer.uint32(/* id 1052, wireType 2 =*/8418).fork(); + for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) + writer.int32(message[".google.api.fieldBehavior"][i]); + writer.ldelim(); + } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) + $root.google.api.ResourceReference.encode(message[".google.api.resourceReference"], writer.uint32(/* id 1055, wireType 2 =*/8442).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.IFieldOptions} message FieldOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FieldOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldOptions} FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.ctype = reader.int32(); + break; + case 2: + message.packed = reader.bool(); + break; + case 6: + message.jstype = reader.int32(); + break; + case 5: + message.lazy = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 10: + message.weak = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1052: + if (!(message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length)) + message[".google.api.fieldBehavior"] = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message[".google.api.fieldBehavior"].push(reader.int32()); + } else + message[".google.api.fieldBehavior"].push(reader.int32()); + break; + case 1055: + message[".google.api.resourceReference"] = $root.google.api.ResourceReference.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a PullResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PullResponse} PullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PullResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a FieldOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldOptions} FieldOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a PullResponse message. - * @function verify - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PullResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { - if (!Array.isArray(message.receivedMessages)) - return "receivedMessages: array expected"; - for (var i = 0; i < message.receivedMessages.length; ++i) { - var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); - if (error) - return "receivedMessages." + error; - } + /** + * Verifies a FieldOptions message. + * @function verify + * @memberof google.protobuf.FieldOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ctype != null && message.hasOwnProperty("ctype")) + switch (message.ctype) { + default: + return "ctype: enum value expected"; + case 0: + case 1: + case 2: + break; } - return null; - }; - - /** - * Creates a PullResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PullResponse} PullResponse - */ - PullResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PullResponse) - return object; - var message = new $root.google.pubsub.v1.PullResponse(); - if (object.receivedMessages) { - if (!Array.isArray(object.receivedMessages)) - throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: array expected"); - message.receivedMessages = []; - for (var i = 0; i < object.receivedMessages.length; ++i) { - if (typeof object.receivedMessages[i] !== "object") - throw TypeError(".google.pubsub.v1.PullResponse.receivedMessages: object expected"); - message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); - } + if (message.packed != null && message.hasOwnProperty("packed")) + if (typeof message.packed !== "boolean") + return "packed: boolean expected"; + if (message.jstype != null && message.hasOwnProperty("jstype")) + switch (message.jstype) { + default: + return "jstype: enum value expected"; + case 0: + case 1: + case 2: + break; } - return message; - }; + if (message.lazy != null && message.hasOwnProperty("lazy")) + if (typeof message.lazy !== "boolean") + return "lazy: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.weak != null && message.hasOwnProperty("weak")) + if (typeof message.weak !== "boolean") + return "weak: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + if (message[".google.api.fieldBehavior"] != null && message.hasOwnProperty(".google.api.fieldBehavior")) { + if (!Array.isArray(message[".google.api.fieldBehavior"])) + return ".google.api.fieldBehavior: array expected"; + for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) + switch (message[".google.api.fieldBehavior"][i]) { + default: + return ".google.api.fieldBehavior: enum value[] expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) { + var error = $root.google.api.ResourceReference.verify(message[".google.api.resourceReference"]); + if (error) + return ".google.api.resourceReference." + error; + } + return null; + }; - /** - * Creates a plain object from a PullResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PullResponse - * @static - * @param {google.pubsub.v1.PullResponse} message PullResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PullResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.receivedMessages = []; - if (message.receivedMessages && message.receivedMessages.length) { - object.receivedMessages = []; - for (var j = 0; j < message.receivedMessages.length; ++j) - object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); + /** + * Creates a FieldOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldOptions} FieldOptions + */ + FieldOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldOptions) + return object; + var message = new $root.google.protobuf.FieldOptions(); + switch (object.ctype) { + case "STRING": + case 0: + message.ctype = 0; + break; + case "CORD": + case 1: + message.ctype = 1; + break; + case "STRING_PIECE": + case 2: + message.ctype = 2; + break; + } + if (object.packed != null) + message.packed = Boolean(object.packed); + switch (object.jstype) { + case "JS_NORMAL": + case 0: + message.jstype = 0; + break; + case "JS_STRING": + case 1: + message.jstype = 1; + break; + case "JS_NUMBER": + case 2: + message.jstype = 2; + break; + } + if (object.lazy != null) + message.lazy = Boolean(object.lazy); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.weak != null) + message.weak = Boolean(object.weak); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } - return object; - }; - - /** - * Converts this PullResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PullResponse - * @instance - * @returns {Object.} JSON object - */ - PullResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return PullResponse; - })(); - - v1.ModifyAckDeadlineRequest = (function() { - - /** - * Properties of a ModifyAckDeadlineRequest. - * @memberof google.pubsub.v1 - * @interface IModifyAckDeadlineRequest - * @property {string|null} [subscription] ModifyAckDeadlineRequest subscription - * @property {Array.|null} [ackIds] ModifyAckDeadlineRequest ackIds - * @property {number|null} [ackDeadlineSeconds] ModifyAckDeadlineRequest ackDeadlineSeconds - */ - - /** - * Constructs a new ModifyAckDeadlineRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ModifyAckDeadlineRequest. - * @implements IModifyAckDeadlineRequest - * @constructor - * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set - */ - function ModifyAckDeadlineRequest(properties) { - this.ackIds = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; } - - /** - * ModifyAckDeadlineRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @instance - */ - ModifyAckDeadlineRequest.prototype.subscription = ""; - - /** - * ModifyAckDeadlineRequest ackIds. - * @member {Array.} ackIds - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @instance - */ - ModifyAckDeadlineRequest.prototype.ackIds = $util.emptyArray; - - /** - * ModifyAckDeadlineRequest ackDeadlineSeconds. - * @member {number} ackDeadlineSeconds - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @instance - */ - ModifyAckDeadlineRequest.prototype.ackDeadlineSeconds = 0; - - /** - * Creates a new ModifyAckDeadlineRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {google.pubsub.v1.IModifyAckDeadlineRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest instance - */ - ModifyAckDeadlineRequest.create = function create(properties) { - return new ModifyAckDeadlineRequest(properties); - }; - - /** - * Encodes the specified ModifyAckDeadlineRequest message. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ModifyAckDeadlineRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - writer.uint32(/* id 3, wireType 0 =*/24).int32(message.ackDeadlineSeconds); - if (message.ackIds != null && message.ackIds.length) - for (var i = 0; i < message.ackIds.length; ++i) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.ackIds[i]); - return writer; - }; - - /** - * Encodes the specified ModifyAckDeadlineRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ModifyAckDeadlineRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {google.pubsub.v1.IModifyAckDeadlineRequest} message ModifyAckDeadlineRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ModifyAckDeadlineRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ModifyAckDeadlineRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { + if (object[".google.api.fieldBehavior"]) { + if (!Array.isArray(object[".google.api.fieldBehavior"])) + throw TypeError(".google.protobuf.FieldOptions..google.api.fieldBehavior: array expected"); + message[".google.api.fieldBehavior"] = []; + for (var i = 0; i < object[".google.api.fieldBehavior"].length; ++i) + switch (object[".google.api.fieldBehavior"][i]) { + default: + case "FIELD_BEHAVIOR_UNSPECIFIED": + case 0: + message[".google.api.fieldBehavior"][i] = 0; + break; + case "OPTIONAL": case 1: - message.subscription = reader.string(); + message[".google.api.fieldBehavior"][i] = 1; break; - case 4: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); + case "REQUIRED": + case 2: + message[".google.api.fieldBehavior"][i] = 2; break; + case "OUTPUT_ONLY": case 3: - message.ackDeadlineSeconds = reader.int32(); + message[".google.api.fieldBehavior"][i] = 3; break; - default: - reader.skipType(tag & 7); + case "INPUT_ONLY": + case 4: + message[".google.api.fieldBehavior"][i] = 4; + break; + case "IMMUTABLE": + case 5: + message[".google.api.fieldBehavior"][i] = 5; break; } - } - return message; - }; + } + if (object[".google.api.resourceReference"] != null) { + if (typeof object[".google.api.resourceReference"] !== "object") + throw TypeError(".google.protobuf.FieldOptions..google.api.resourceReference: object expected"); + message[".google.api.resourceReference"] = $root.google.api.ResourceReference.fromObject(object[".google.api.resourceReference"]); + } + return message; + }; + + /** + * Creates a plain object from a FieldOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldOptions + * @static + * @param {google.protobuf.FieldOptions} message FieldOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.uninterpretedOption = []; + object[".google.api.fieldBehavior"] = []; + } + if (options.defaults) { + object.ctype = options.enums === String ? "STRING" : 0; + object.packed = false; + object.deprecated = false; + object.lazy = false; + object.jstype = options.enums === String ? "JS_NORMAL" : 0; + object.weak = false; + object[".google.api.resourceReference"] = null; + } + if (message.ctype != null && message.hasOwnProperty("ctype")) + object.ctype = options.enums === String ? $root.google.protobuf.FieldOptions.CType[message.ctype] : message.ctype; + if (message.packed != null && message.hasOwnProperty("packed")) + object.packed = message.packed; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.lazy != null && message.hasOwnProperty("lazy")) + object.lazy = message.lazy; + if (message.jstype != null && message.hasOwnProperty("jstype")) + object.jstype = options.enums === String ? $root.google.protobuf.FieldOptions.JSType[message.jstype] : message.jstype; + if (message.weak != null && message.hasOwnProperty("weak")) + object.weak = message.weak; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length) { + object[".google.api.fieldBehavior"] = []; + for (var j = 0; j < message[".google.api.fieldBehavior"].length; ++j) + object[".google.api.fieldBehavior"][j] = options.enums === String ? $root.google.api.FieldBehavior[message[".google.api.fieldBehavior"][j]] : message[".google.api.fieldBehavior"][j]; + } + if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) + object[".google.api.resourceReference"] = $root.google.api.ResourceReference.toObject(message[".google.api.resourceReference"], options); + return object; + }; + + /** + * Converts this FieldOptions to JSON. + * @function toJSON + * @memberof google.protobuf.FieldOptions + * @instance + * @returns {Object.} JSON object + */ + FieldOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * CType enum. + * @name google.protobuf.FieldOptions.CType + * @enum {string} + * @property {number} STRING=0 STRING value + * @property {number} CORD=1 CORD value + * @property {number} STRING_PIECE=2 STRING_PIECE value + */ + FieldOptions.CType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STRING"] = 0; + values[valuesById[1] = "CORD"] = 1; + values[valuesById[2] = "STRING_PIECE"] = 2; + return values; + })(); - /** - * Decodes a ModifyAckDeadlineRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ModifyAckDeadlineRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * JSType enum. + * @name google.protobuf.FieldOptions.JSType + * @enum {string} + * @property {number} JS_NORMAL=0 JS_NORMAL value + * @property {number} JS_STRING=1 JS_STRING value + * @property {number} JS_NUMBER=2 JS_NUMBER value + */ + FieldOptions.JSType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "JS_NORMAL"] = 0; + values[valuesById[1] = "JS_STRING"] = 1; + values[valuesById[2] = "JS_NUMBER"] = 2; + return values; + })(); - /** - * Verifies a ModifyAckDeadlineRequest message. - * @function verify - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ModifyAckDeadlineRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.ackIds != null && message.hasOwnProperty("ackIds")) { - if (!Array.isArray(message.ackIds)) - return "ackIds: array expected"; - for (var i = 0; i < message.ackIds.length; ++i) - if (!$util.isString(message.ackIds[i])) - return "ackIds: string[] expected"; - } - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - if (!$util.isInteger(message.ackDeadlineSeconds)) - return "ackDeadlineSeconds: integer expected"; - return null; - }; + return FieldOptions; + })(); - /** - * Creates a ModifyAckDeadlineRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ModifyAckDeadlineRequest} ModifyAckDeadlineRequest - */ - ModifyAckDeadlineRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ModifyAckDeadlineRequest) - return object; - var message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.ackIds) { - if (!Array.isArray(object.ackIds)) - throw TypeError(".google.pubsub.v1.ModifyAckDeadlineRequest.ackIds: array expected"); - message.ackIds = []; - for (var i = 0; i < object.ackIds.length; ++i) - message.ackIds[i] = String(object.ackIds[i]); - } - if (object.ackDeadlineSeconds != null) - message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; - return message; - }; + protobuf.OneofOptions = (function() { - /** - * Creates a plain object from a ModifyAckDeadlineRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @static - * @param {google.pubsub.v1.ModifyAckDeadlineRequest} message ModifyAckDeadlineRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ModifyAckDeadlineRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.ackIds = []; - if (options.defaults) { - object.subscription = ""; - object.ackDeadlineSeconds = 0; - } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) - object.ackDeadlineSeconds = message.ackDeadlineSeconds; - if (message.ackIds && message.ackIds.length) { - object.ackIds = []; - for (var j = 0; j < message.ackIds.length; ++j) - object.ackIds[j] = message.ackIds[j]; - } - return object; - }; + /** + * Properties of an OneofOptions. + * @memberof google.protobuf + * @interface IOneofOptions + * @property {Array.|null} [uninterpretedOption] OneofOptions uninterpretedOption + */ - /** - * Converts this ModifyAckDeadlineRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.ModifyAckDeadlineRequest - * @instance - * @returns {Object.} JSON object - */ - ModifyAckDeadlineRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Constructs a new OneofOptions. + * @memberof google.protobuf + * @classdesc Represents an OneofOptions. + * @implements IOneofOptions + * @constructor + * @param {google.protobuf.IOneofOptions=} [properties] Properties to set + */ + function OneofOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - return ModifyAckDeadlineRequest; - })(); + /** + * OneofOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.OneofOptions + * @instance + */ + OneofOptions.prototype.uninterpretedOption = $util.emptyArray; - v1.AcknowledgeRequest = (function() { + /** + * Creates a new OneofOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions=} [properties] Properties to set + * @returns {google.protobuf.OneofOptions} OneofOptions instance + */ + OneofOptions.create = function create(properties) { + return new OneofOptions(properties); + }; - /** - * Properties of an AcknowledgeRequest. - * @memberof google.pubsub.v1 - * @interface IAcknowledgeRequest - * @property {string|null} [subscription] AcknowledgeRequest subscription - * @property {Array.|null} [ackIds] AcknowledgeRequest ackIds - */ + /** + * Encodes the specified OneofOptions message. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.IOneofOptions} message OneofOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + OneofOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an OneofOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.OneofOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.OneofOptions} OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an OneofOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.OneofOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.OneofOptions} OneofOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + OneofOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Constructs a new AcknowledgeRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents an AcknowledgeRequest. - * @implements IAcknowledgeRequest - * @constructor - * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set - */ - function AcknowledgeRequest(properties) { - this.ackIds = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Verifies an OneofOptions message. + * @function verify + * @memberof google.protobuf.OneofOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + OneofOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } } + return null; + }; - /** - * AcknowledgeRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.AcknowledgeRequest - * @instance - */ - AcknowledgeRequest.prototype.subscription = ""; + /** + * Creates an OneofOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.OneofOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.OneofOptions} OneofOptions + */ + OneofOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.OneofOptions) + return object; + var message = new $root.google.protobuf.OneofOptions(); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; - /** - * AcknowledgeRequest ackIds. - * @member {Array.} ackIds - * @memberof google.pubsub.v1.AcknowledgeRequest - * @instance - */ - AcknowledgeRequest.prototype.ackIds = $util.emptyArray; + /** + * Creates a plain object from an OneofOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.OneofOptions + * @static + * @param {google.protobuf.OneofOptions} message OneofOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + OneofOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; - /** - * Creates a new AcknowledgeRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.AcknowledgeRequest - * @static - * @param {google.pubsub.v1.IAcknowledgeRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest instance - */ - AcknowledgeRequest.create = function create(properties) { - return new AcknowledgeRequest(properties); - }; + /** + * Converts this OneofOptions to JSON. + * @function toJSON + * @memberof google.protobuf.OneofOptions + * @instance + * @returns {Object.} JSON object + */ + OneofOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Encodes the specified AcknowledgeRequest message. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.AcknowledgeRequest - * @static - * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - AcknowledgeRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.ackIds != null && message.ackIds.length) - for (var i = 0; i < message.ackIds.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); - return writer; - }; + return OneofOptions; + })(); - /** - * Encodes the specified AcknowledgeRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.AcknowledgeRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.AcknowledgeRequest - * @static - * @param {google.pubsub.v1.IAcknowledgeRequest} message AcknowledgeRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - AcknowledgeRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + protobuf.EnumOptions = (function() { - /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.AcknowledgeRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - AcknowledgeRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.AcknowledgeRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Properties of an EnumOptions. + * @memberof google.protobuf + * @interface IEnumOptions + * @property {boolean|null} [allowAlias] EnumOptions allowAlias + * @property {boolean|null} [deprecated] EnumOptions deprecated + * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption + */ - /** - * Decodes an AcknowledgeRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.AcknowledgeRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - AcknowledgeRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Constructs a new EnumOptions. + * @memberof google.protobuf + * @classdesc Represents an EnumOptions. + * @implements IEnumOptions + * @constructor + * @param {google.protobuf.IEnumOptions=} [properties] Properties to set + */ + function EnumOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Verifies an AcknowledgeRequest message. - * @function verify - * @memberof google.pubsub.v1.AcknowledgeRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - AcknowledgeRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.ackIds != null && message.hasOwnProperty("ackIds")) { - if (!Array.isArray(message.ackIds)) - return "ackIds: array expected"; - for (var i = 0; i < message.ackIds.length; ++i) - if (!$util.isString(message.ackIds[i])) - return "ackIds: string[] expected"; - } - return null; - }; + /** + * EnumOptions allowAlias. + * @member {boolean} allowAlias + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.allowAlias = false; - /** - * Creates an AcknowledgeRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.AcknowledgeRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.AcknowledgeRequest} AcknowledgeRequest - */ - AcknowledgeRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.AcknowledgeRequest) - return object; - var message = new $root.google.pubsub.v1.AcknowledgeRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.ackIds) { - if (!Array.isArray(object.ackIds)) - throw TypeError(".google.pubsub.v1.AcknowledgeRequest.ackIds: array expected"); - message.ackIds = []; - for (var i = 0; i < object.ackIds.length; ++i) - message.ackIds[i] = String(object.ackIds[i]); - } - return message; - }; + /** + * EnumOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.deprecated = false; - /** - * Creates a plain object from an AcknowledgeRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.AcknowledgeRequest - * @static - * @param {google.pubsub.v1.AcknowledgeRequest} message AcknowledgeRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - AcknowledgeRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.ackIds = []; - if (options.defaults) - object.subscription = ""; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.ackIds && message.ackIds.length) { - object.ackIds = []; - for (var j = 0; j < message.ackIds.length; ++j) - object.ackIds[j] = message.ackIds[j]; - } - return object; - }; + /** + * EnumOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Converts this AcknowledgeRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.AcknowledgeRequest - * @instance - * @returns {Object.} JSON object - */ - AcknowledgeRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a new EnumOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions=} [properties] Properties to set + * @returns {google.protobuf.EnumOptions} EnumOptions instance + */ + EnumOptions.create = function create(properties) { + return new EnumOptions(properties); + }; - return AcknowledgeRequest; - })(); + /** + * Encodes the specified EnumOptions message. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; - v1.StreamingPullRequest = (function() { + /** + * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.IEnumOptions} message EnumOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Properties of a StreamingPullRequest. - * @memberof google.pubsub.v1 - * @interface IStreamingPullRequest - * @property {string|null} [subscription] StreamingPullRequest subscription - * @property {Array.|null} [ackIds] StreamingPullRequest ackIds - * @property {Array.|null} [modifyDeadlineSeconds] StreamingPullRequest modifyDeadlineSeconds - * @property {Array.|null} [modifyDeadlineAckIds] StreamingPullRequest modifyDeadlineAckIds - * @property {number|null} [streamAckDeadlineSeconds] StreamingPullRequest streamAckDeadlineSeconds - * @property {string|null} [clientId] StreamingPullRequest clientId - */ + /** + * Decodes an EnumOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumOptions} EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 2: + message.allowAlias = reader.bool(); + break; + case 3: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Constructs a new StreamingPullRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a StreamingPullRequest. - * @implements IStreamingPullRequest - * @constructor - * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set - */ - function StreamingPullRequest(properties) { - this.ackIds = []; - this.modifyDeadlineSeconds = []; - this.modifyDeadlineAckIds = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Decodes an EnumOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumOptions} EnumOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EnumOptions message. + * @function verify + * @memberof google.protobuf.EnumOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + if (typeof message.allowAlias !== "boolean") + return "allowAlias: boolean expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates an EnumOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumOptions} EnumOptions + */ + EnumOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumOptions) + return object; + var message = new $root.google.protobuf.EnumOptions(); + if (object.allowAlias != null) + message.allowAlias = Boolean(object.allowAlias); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } } + return message; + }; - /** - * StreamingPullRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.subscription = ""; + /** + * Creates a plain object from an EnumOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumOptions + * @static + * @param {google.protobuf.EnumOptions} message EnumOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.allowAlias = false; + object.deprecated = false; + } + if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + object.allowAlias = message.allowAlias; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; - /** - * StreamingPullRequest ackIds. - * @member {Array.} ackIds - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.ackIds = $util.emptyArray; + /** + * Converts this EnumOptions to JSON. + * @function toJSON + * @memberof google.protobuf.EnumOptions + * @instance + * @returns {Object.} JSON object + */ + EnumOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * StreamingPullRequest modifyDeadlineSeconds. - * @member {Array.} modifyDeadlineSeconds - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.modifyDeadlineSeconds = $util.emptyArray; + return EnumOptions; + })(); - /** - * StreamingPullRequest modifyDeadlineAckIds. - * @member {Array.} modifyDeadlineAckIds - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.modifyDeadlineAckIds = $util.emptyArray; + protobuf.EnumValueOptions = (function() { - /** - * StreamingPullRequest streamAckDeadlineSeconds. - * @member {number} streamAckDeadlineSeconds - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.streamAckDeadlineSeconds = 0; + /** + * Properties of an EnumValueOptions. + * @memberof google.protobuf + * @interface IEnumValueOptions + * @property {boolean|null} [deprecated] EnumValueOptions deprecated + * @property {Array.|null} [uninterpretedOption] EnumValueOptions uninterpretedOption + */ - /** - * StreamingPullRequest clientId. - * @member {string} clientId - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - */ - StreamingPullRequest.prototype.clientId = ""; + /** + * Constructs a new EnumValueOptions. + * @memberof google.protobuf + * @classdesc Represents an EnumValueOptions. + * @implements IEnumValueOptions + * @constructor + * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set + */ + function EnumValueOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Creates a new StreamingPullRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {google.pubsub.v1.IStreamingPullRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest instance - */ - StreamingPullRequest.create = function create(properties) { - return new StreamingPullRequest(properties); - }; + /** + * EnumValueOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.deprecated = false; - /** - * Encodes the specified StreamingPullRequest message. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - StreamingPullRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.ackIds != null && message.ackIds.length) - for (var i = 0; i < message.ackIds.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.ackIds[i]); - if (message.modifyDeadlineSeconds != null && message.modifyDeadlineSeconds.length) { - writer.uint32(/* id 3, wireType 2 =*/26).fork(); - for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) - writer.int32(message.modifyDeadlineSeconds[i]); - writer.ldelim(); - } - if (message.modifyDeadlineAckIds != null && message.modifyDeadlineAckIds.length) - for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) - writer.uint32(/* id 4, wireType 2 =*/34).string(message.modifyDeadlineAckIds[i]); - if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) - writer.uint32(/* id 5, wireType 0 =*/40).int32(message.streamAckDeadlineSeconds); - if (message.clientId != null && message.hasOwnProperty("clientId")) - writer.uint32(/* id 6, wireType 2 =*/50).string(message.clientId); - return writer; - }; + /** + * EnumValueOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Encodes the specified StreamingPullRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {google.pubsub.v1.IStreamingPullRequest} message StreamingPullRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - StreamingPullRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Creates a new EnumValueOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions=} [properties] Properties to set + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions instance + */ + EnumValueOptions.create = function create(properties) { + return new EnumValueOptions(properties); + }; - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - StreamingPullRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; - case 3: - if (!(message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length)) - message.modifyDeadlineSeconds = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.modifyDeadlineSeconds.push(reader.int32()); - } else - message.modifyDeadlineSeconds.push(reader.int32()); - break; - case 4: - if (!(message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length)) - message.modifyDeadlineAckIds = []; - message.modifyDeadlineAckIds.push(reader.string()); - break; - case 5: - message.streamAckDeadlineSeconds = reader.int32(); - break; - case 6: - message.clientId = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Encodes the specified EnumValueOptions message. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; - /** - * Decodes a StreamingPullRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - StreamingPullRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.IEnumValueOptions} message EnumValueOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumValueOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Verifies a StreamingPullRequest message. - * @function verify - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - StreamingPullRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.ackIds != null && message.hasOwnProperty("ackIds")) { - if (!Array.isArray(message.ackIds)) - return "ackIds: array expected"; - for (var i = 0; i < message.ackIds.length; ++i) - if (!$util.isString(message.ackIds[i])) - return "ackIds: string[] expected"; - } - if (message.modifyDeadlineSeconds != null && message.hasOwnProperty("modifyDeadlineSeconds")) { - if (!Array.isArray(message.modifyDeadlineSeconds)) - return "modifyDeadlineSeconds: array expected"; - for (var i = 0; i < message.modifyDeadlineSeconds.length; ++i) - if (!$util.isInteger(message.modifyDeadlineSeconds[i])) - return "modifyDeadlineSeconds: integer[] expected"; - } - if (message.modifyDeadlineAckIds != null && message.hasOwnProperty("modifyDeadlineAckIds")) { - if (!Array.isArray(message.modifyDeadlineAckIds)) - return "modifyDeadlineAckIds: array expected"; - for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) - if (!$util.isString(message.modifyDeadlineAckIds[i])) - return "modifyDeadlineAckIds: string[] expected"; + /** + * Decodes an EnumValueOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; } - if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) - if (!$util.isInteger(message.streamAckDeadlineSeconds)) - return "streamAckDeadlineSeconds: integer expected"; - if (message.clientId != null && message.hasOwnProperty("clientId")) - if (!$util.isString(message.clientId)) - return "clientId: string expected"; - return null; - }; + } + return message; + }; - /** - * Creates a StreamingPullRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.StreamingPullRequest} StreamingPullRequest - */ - StreamingPullRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.StreamingPullRequest) - return object; - var message = new $root.google.pubsub.v1.StreamingPullRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.ackIds) { - if (!Array.isArray(object.ackIds)) - throw TypeError(".google.pubsub.v1.StreamingPullRequest.ackIds: array expected"); - message.ackIds = []; - for (var i = 0; i < object.ackIds.length; ++i) - message.ackIds[i] = String(object.ackIds[i]); - } - if (object.modifyDeadlineSeconds) { - if (!Array.isArray(object.modifyDeadlineSeconds)) - throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineSeconds: array expected"); - message.modifyDeadlineSeconds = []; - for (var i = 0; i < object.modifyDeadlineSeconds.length; ++i) - message.modifyDeadlineSeconds[i] = object.modifyDeadlineSeconds[i] | 0; - } - if (object.modifyDeadlineAckIds) { - if (!Array.isArray(object.modifyDeadlineAckIds)) - throw TypeError(".google.pubsub.v1.StreamingPullRequest.modifyDeadlineAckIds: array expected"); - message.modifyDeadlineAckIds = []; - for (var i = 0; i < object.modifyDeadlineAckIds.length; ++i) - message.modifyDeadlineAckIds[i] = String(object.modifyDeadlineAckIds[i]); - } - if (object.streamAckDeadlineSeconds != null) - message.streamAckDeadlineSeconds = object.streamAckDeadlineSeconds | 0; - if (object.clientId != null) - message.clientId = String(object.clientId); - return message; - }; + /** + * Decodes an EnumValueOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumValueOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a plain object from a StreamingPullRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.StreamingPullRequest - * @static - * @param {google.pubsub.v1.StreamingPullRequest} message StreamingPullRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - StreamingPullRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.ackIds = []; - object.modifyDeadlineSeconds = []; - object.modifyDeadlineAckIds = []; - } - if (options.defaults) { - object.subscription = ""; - object.streamAckDeadlineSeconds = 0; - object.clientId = ""; - } - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.ackIds && message.ackIds.length) { - object.ackIds = []; - for (var j = 0; j < message.ackIds.length; ++j) - object.ackIds[j] = message.ackIds[j]; - } - if (message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length) { - object.modifyDeadlineSeconds = []; - for (var j = 0; j < message.modifyDeadlineSeconds.length; ++j) - object.modifyDeadlineSeconds[j] = message.modifyDeadlineSeconds[j]; - } - if (message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length) { - object.modifyDeadlineAckIds = []; - for (var j = 0; j < message.modifyDeadlineAckIds.length; ++j) - object.modifyDeadlineAckIds[j] = message.modifyDeadlineAckIds[j]; + /** + * Verifies an EnumValueOptions message. + * @function verify + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumValueOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; } - if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) - object.streamAckDeadlineSeconds = message.streamAckDeadlineSeconds; - if (message.clientId != null && message.hasOwnProperty("clientId")) - object.clientId = message.clientId; + } + return null; + }; + + /** + * Creates an EnumValueOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumValueOptions} EnumValueOptions + */ + EnumValueOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumValueOptions) return object; - }; + var message = new $root.google.protobuf.EnumValueOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from an EnumValueOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {google.protobuf.EnumValueOptions} message EnumValueOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumValueOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) + object.deprecated = false; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; - /** - * Converts this StreamingPullRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.StreamingPullRequest - * @instance - * @returns {Object.} JSON object - */ - StreamingPullRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this EnumValueOptions to JSON. + * @function toJSON + * @memberof google.protobuf.EnumValueOptions + * @instance + * @returns {Object.} JSON object + */ + EnumValueOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return StreamingPullRequest; - })(); + return EnumValueOptions; + })(); - v1.StreamingPullResponse = (function() { + protobuf.ServiceOptions = (function() { - /** - * Properties of a StreamingPullResponse. - * @memberof google.pubsub.v1 - * @interface IStreamingPullResponse - * @property {Array.|null} [receivedMessages] StreamingPullResponse receivedMessages - */ + /** + * Properties of a ServiceOptions. + * @memberof google.protobuf + * @interface IServiceOptions + * @property {boolean|null} [deprecated] ServiceOptions deprecated + * @property {Array.|null} [uninterpretedOption] ServiceOptions uninterpretedOption + * @property {string|null} [".google.api.defaultHost"] ServiceOptions .google.api.defaultHost + * @property {string|null} [".google.api.oauthScopes"] ServiceOptions .google.api.oauthScopes + */ - /** - * Constructs a new StreamingPullResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a StreamingPullResponse. - * @implements IStreamingPullResponse - * @constructor - * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set - */ - function StreamingPullResponse(properties) { - this.receivedMessages = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Constructs a new ServiceOptions. + * @memberof google.protobuf + * @classdesc Represents a ServiceOptions. + * @implements IServiceOptions + * @constructor + * @param {google.protobuf.IServiceOptions=} [properties] Properties to set + */ + function ServiceOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * StreamingPullResponse receivedMessages. - * @member {Array.} receivedMessages - * @memberof google.pubsub.v1.StreamingPullResponse - * @instance - */ - StreamingPullResponse.prototype.receivedMessages = $util.emptyArray; + /** + * ServiceOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype.deprecated = false; - /** - * Creates a new StreamingPullResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {google.pubsub.v1.IStreamingPullResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse instance - */ - StreamingPullResponse.create = function create(properties) { - return new StreamingPullResponse(properties); - }; + /** + * ServiceOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * Encodes the specified StreamingPullResponse message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - StreamingPullResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.receivedMessages != null && message.receivedMessages.length) - for (var i = 0; i < message.receivedMessages.length; ++i) - $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; + /** + * ServiceOptions .google.api.defaultHost. + * @member {string} .google.api.defaultHost + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype[".google.api.defaultHost"] = ""; - /** - * Encodes the specified StreamingPullResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {google.pubsub.v1.IStreamingPullResponse} message StreamingPullResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - StreamingPullResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * ServiceOptions .google.api.oauthScopes. + * @member {string} .google.api.oauthScopes + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype[".google.api.oauthScopes"] = ""; - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - StreamingPullResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - if (!(message.receivedMessages && message.receivedMessages.length)) - message.receivedMessages = []; - message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Creates a new ServiceOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions=} [properties] Properties to set + * @returns {google.protobuf.ServiceOptions} ServiceOptions instance + */ + ServiceOptions.create = function create(properties) { + return new ServiceOptions(properties); + }; + + /** + * Encodes the specified ServiceOptions message. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + writer.uint32(/* id 1049, wireType 2 =*/8394).string(message[".google.api.defaultHost"]); + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + writer.uint32(/* id 1050, wireType 2 =*/8402).string(message[".google.api.oauthScopes"]); + return writer; + }; + + /** + * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.IServiceOptions} message ServiceOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ServiceOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ServiceOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ServiceOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ServiceOptions} ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 33: + message.deprecated = reader.bool(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 1049: + message[".google.api.defaultHost"] = reader.string(); + break; + case 1050: + message[".google.api.oauthScopes"] = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a StreamingPullResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - StreamingPullResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a ServiceOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ServiceOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ServiceOptions} ServiceOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ServiceOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a StreamingPullResponse message. - * @function verify - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - StreamingPullResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.receivedMessages != null && message.hasOwnProperty("receivedMessages")) { - if (!Array.isArray(message.receivedMessages)) - return "receivedMessages: array expected"; - for (var i = 0; i < message.receivedMessages.length; ++i) { - var error = $root.google.pubsub.v1.ReceivedMessage.verify(message.receivedMessages[i]); - if (error) - return "receivedMessages." + error; - } + /** + * Verifies a ServiceOptions message. + * @function verify + * @memberof google.protobuf.ServiceOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ServiceOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; } - return null; - }; + } + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + if (!$util.isString(message[".google.api.defaultHost"])) + return ".google.api.defaultHost: string expected"; + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + if (!$util.isString(message[".google.api.oauthScopes"])) + return ".google.api.oauthScopes: string expected"; + return null; + }; - /** - * Creates a StreamingPullResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.StreamingPullResponse} StreamingPullResponse - */ - StreamingPullResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.StreamingPullResponse) - return object; - var message = new $root.google.pubsub.v1.StreamingPullResponse(); - if (object.receivedMessages) { - if (!Array.isArray(object.receivedMessages)) - throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: array expected"); - message.receivedMessages = []; - for (var i = 0; i < object.receivedMessages.length; ++i) { - if (typeof object.receivedMessages[i] !== "object") - throw TypeError(".google.pubsub.v1.StreamingPullResponse.receivedMessages: object expected"); - message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); - } + /** + * Creates a ServiceOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ServiceOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ServiceOptions} ServiceOptions + */ + ServiceOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ServiceOptions) + return object; + var message = new $root.google.protobuf.ServiceOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.ServiceOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } - return message; - }; + } + if (object[".google.api.defaultHost"] != null) + message[".google.api.defaultHost"] = String(object[".google.api.defaultHost"]); + if (object[".google.api.oauthScopes"] != null) + message[".google.api.oauthScopes"] = String(object[".google.api.oauthScopes"]); + return message; + }; - /** - * Creates a plain object from a StreamingPullResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.StreamingPullResponse - * @static - * @param {google.pubsub.v1.StreamingPullResponse} message StreamingPullResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - StreamingPullResponse.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.receivedMessages = []; - if (message.receivedMessages && message.receivedMessages.length) { - object.receivedMessages = []; - for (var j = 0; j < message.receivedMessages.length; ++j) - object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); - } - return object; - }; + /** + * Creates a plain object from a ServiceOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ServiceOptions + * @static + * @param {google.protobuf.ServiceOptions} message ServiceOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ServiceOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (options.defaults) { + object.deprecated = false; + object[".google.api.defaultHost"] = ""; + object[".google.api.oauthScopes"] = ""; + } + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + object[".google.api.defaultHost"] = message[".google.api.defaultHost"]; + if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + object[".google.api.oauthScopes"] = message[".google.api.oauthScopes"]; + return object; + }; - /** - * Converts this StreamingPullResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.StreamingPullResponse - * @instance - * @returns {Object.} JSON object - */ - StreamingPullResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this ServiceOptions to JSON. + * @function toJSON + * @memberof google.protobuf.ServiceOptions + * @instance + * @returns {Object.} JSON object + */ + ServiceOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return StreamingPullResponse; - })(); + return ServiceOptions; + })(); + + protobuf.MethodOptions = (function() { + + /** + * Properties of a MethodOptions. + * @memberof google.protobuf + * @interface IMethodOptions + * @property {boolean|null} [deprecated] MethodOptions deprecated + * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel + * @property {Array.|null} [uninterpretedOption] MethodOptions uninterpretedOption + * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http + * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature + */ - v1.CreateSnapshotRequest = (function() { + /** + * Constructs a new MethodOptions. + * @memberof google.protobuf + * @classdesc Represents a MethodOptions. + * @implements IMethodOptions + * @constructor + * @param {google.protobuf.IMethodOptions=} [properties] Properties to set + */ + function MethodOptions(properties) { + this.uninterpretedOption = []; + this[".google.api.methodSignature"] = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Properties of a CreateSnapshotRequest. - * @memberof google.pubsub.v1 - * @interface ICreateSnapshotRequest - * @property {string|null} [name] CreateSnapshotRequest name - * @property {string|null} [subscription] CreateSnapshotRequest subscription - * @property {Object.|null} [labels] CreateSnapshotRequest labels - */ + /** + * MethodOptions deprecated. + * @member {boolean} deprecated + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype.deprecated = false; - /** - * Constructs a new CreateSnapshotRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a CreateSnapshotRequest. - * @implements ICreateSnapshotRequest - * @constructor - * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set - */ - function CreateSnapshotRequest(properties) { - this.labels = {}; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * MethodOptions idempotencyLevel. + * @member {google.protobuf.MethodOptions.IdempotencyLevel} idempotencyLevel + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype.idempotencyLevel = 0; - /** - * CreateSnapshotRequest name. - * @member {string} name - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @instance - */ - CreateSnapshotRequest.prototype.name = ""; + /** + * MethodOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype.uninterpretedOption = $util.emptyArray; - /** - * CreateSnapshotRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @instance - */ - CreateSnapshotRequest.prototype.subscription = ""; + /** + * MethodOptions .google.api.http. + * @member {google.api.IHttpRule|null|undefined} .google.api.http + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype[".google.api.http"] = null; - /** - * CreateSnapshotRequest labels. - * @member {Object.} labels - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @instance - */ - CreateSnapshotRequest.prototype.labels = $util.emptyObject; + /** + * MethodOptions .google.api.methodSignature. + * @member {Array.} .google.api.methodSignature + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype[".google.api.methodSignature"] = $util.emptyArray; - /** - * Creates a new CreateSnapshotRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {google.pubsub.v1.ICreateSnapshotRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest instance - */ - CreateSnapshotRequest.create = function create(properties) { - return new CreateSnapshotRequest(properties); - }; + /** + * Creates a new MethodOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.MethodOptions + * @static + * @param {google.protobuf.IMethodOptions=} [properties] Properties to set + * @returns {google.protobuf.MethodOptions} MethodOptions instance + */ + MethodOptions.create = function create(properties) { + return new MethodOptions(properties); + }; - /** - * Encodes the specified CreateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CreateSnapshotRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.subscription); - if (message.labels != null && message.hasOwnProperty("labels")) - for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) - writer.uint32(/* id 3, wireType 2 =*/26).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - return writer; - }; + /** + * Encodes the specified MethodOptions message. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.MethodOptions + * @static + * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + writer.uint32(/* id 34, wireType 0 =*/272).int32(message.idempotencyLevel); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + if (message[".google.api.methodSignature"] != null && message[".google.api.methodSignature"].length) + for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) + writer.uint32(/* id 1051, wireType 2 =*/8410).string(message[".google.api.methodSignature"][i]); + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) + $root.google.api.HttpRule.encode(message[".google.api.http"], writer.uint32(/* id 72295728, wireType 2 =*/578365826).fork()).ldelim(); + return writer; + }; - /** - * Encodes the specified CreateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSnapshotRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {google.pubsub.v1.ICreateSnapshotRequest} message CreateSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CreateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.MethodOptions + * @static + * @param {google.protobuf.IMethodOptions} message MethodOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CreateSnapshotRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key; - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.subscription = reader.string(); - break; - case 3: - reader.skip().pos++; - if (message.labels === $util.emptyObject) - message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes a MethodOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.MethodOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.MethodOptions} MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 33: + message.deprecated = reader.bool(); + break; + case 34: + message.idempotencyLevel = reader.int32(); + break; + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + case 72295728: + message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); + break; + case 1051: + if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) + message[".google.api.methodSignature"] = []; + message[".google.api.methodSignature"].push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; + } + return message; + }; - /** - * Decodes a CreateSnapshotRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CreateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Decodes a MethodOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.MethodOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.MethodOptions} MethodOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Verifies a CreateSnapshotRequest message. - * @function verify - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - CreateSnapshotRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.labels != null && message.hasOwnProperty("labels")) { - if (!$util.isObject(message.labels)) - return "labels: object expected"; - var key = Object.keys(message.labels); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.labels[key[i]])) - return "labels: string{k:string} expected"; + /** + * Verifies a MethodOptions message. + * @function verify + * @memberof google.protobuf.MethodOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MethodOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (typeof message.deprecated !== "boolean") + return "deprecated: boolean expected"; + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + switch (message.idempotencyLevel) { + default: + return "idempotencyLevel: enum value expected"; + case 0: + case 1: + case 2: + break; } - return null; - }; - - /** - * Creates a CreateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.CreateSnapshotRequest} CreateSnapshotRequest - */ - CreateSnapshotRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.CreateSnapshotRequest) - return object; - var message = new $root.google.pubsub.v1.CreateSnapshotRequest(); - if (object.name != null) - message.name = String(object.name); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.labels) { - if (typeof object.labels !== "object") - throw TypeError(".google.pubsub.v1.CreateSnapshotRequest.labels: object expected"); - message.labels = {}; - for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) - message.labels[keys[i]] = String(object.labels[keys[i]]); + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; } - return message; - }; + } + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) { + var error = $root.google.api.HttpRule.verify(message[".google.api.http"]); + if (error) + return ".google.api.http." + error; + } + if (message[".google.api.methodSignature"] != null && message.hasOwnProperty(".google.api.methodSignature")) { + if (!Array.isArray(message[".google.api.methodSignature"])) + return ".google.api.methodSignature: array expected"; + for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) + if (!$util.isString(message[".google.api.methodSignature"][i])) + return ".google.api.methodSignature: string[] expected"; + } + return null; + }; - /** - * Creates a plain object from a CreateSnapshotRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @static - * @param {google.pubsub.v1.CreateSnapshotRequest} message CreateSnapshotRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - CreateSnapshotRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.objects || options.defaults) - object.labels = {}; - if (options.defaults) { - object.name = ""; - object.subscription = ""; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - var keys2; - if (message.labels && (keys2 = Object.keys(message.labels)).length) { - object.labels = {}; - for (var j = 0; j < keys2.length; ++j) - object.labels[keys2[j]] = message.labels[keys2[j]]; - } + /** + * Creates a MethodOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.MethodOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.MethodOptions} MethodOptions + */ + MethodOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.MethodOptions) return object; - }; + var message = new $root.google.protobuf.MethodOptions(); + if (object.deprecated != null) + message.deprecated = Boolean(object.deprecated); + switch (object.idempotencyLevel) { + case "IDEMPOTENCY_UNKNOWN": + case 0: + message.idempotencyLevel = 0; + break; + case "NO_SIDE_EFFECTS": + case 1: + message.idempotencyLevel = 1; + break; + case "IDEMPOTENT": + case 2: + message.idempotencyLevel = 2; + break; + } + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + if (object[".google.api.http"] != null) { + if (typeof object[".google.api.http"] !== "object") + throw TypeError(".google.protobuf.MethodOptions..google.api.http: object expected"); + message[".google.api.http"] = $root.google.api.HttpRule.fromObject(object[".google.api.http"]); + } + if (object[".google.api.methodSignature"]) { + if (!Array.isArray(object[".google.api.methodSignature"])) + throw TypeError(".google.protobuf.MethodOptions..google.api.methodSignature: array expected"); + message[".google.api.methodSignature"] = []; + for (var i = 0; i < object[".google.api.methodSignature"].length; ++i) + message[".google.api.methodSignature"][i] = String(object[".google.api.methodSignature"][i]); + } + return message; + }; + + /** + * Creates a plain object from a MethodOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.MethodOptions + * @static + * @param {google.protobuf.MethodOptions} message MethodOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MethodOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.uninterpretedOption = []; + object[".google.api.methodSignature"] = []; + } + if (options.defaults) { + object.deprecated = false; + object.idempotencyLevel = options.enums === String ? "IDEMPOTENCY_UNKNOWN" : 0; + object[".google.api.http"] = null; + } + if (message.deprecated != null && message.hasOwnProperty("deprecated")) + object.deprecated = message.deprecated; + if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + object.idempotencyLevel = options.enums === String ? $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] : message.idempotencyLevel; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + if (message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length) { + object[".google.api.methodSignature"] = []; + for (var j = 0; j < message[".google.api.methodSignature"].length; ++j) + object[".google.api.methodSignature"][j] = message[".google.api.methodSignature"][j]; + } + if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) + object[".google.api.http"] = $root.google.api.HttpRule.toObject(message[".google.api.http"], options); + return object; + }; - /** - * Converts this CreateSnapshotRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.CreateSnapshotRequest - * @instance - * @returns {Object.} JSON object - */ - CreateSnapshotRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this MethodOptions to JSON. + * @function toJSON + * @memberof google.protobuf.MethodOptions + * @instance + * @returns {Object.} JSON object + */ + MethodOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return CreateSnapshotRequest; + /** + * IdempotencyLevel enum. + * @name google.protobuf.MethodOptions.IdempotencyLevel + * @enum {string} + * @property {number} IDEMPOTENCY_UNKNOWN=0 IDEMPOTENCY_UNKNOWN value + * @property {number} NO_SIDE_EFFECTS=1 NO_SIDE_EFFECTS value + * @property {number} IDEMPOTENT=2 IDEMPOTENT value + */ + MethodOptions.IdempotencyLevel = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "IDEMPOTENCY_UNKNOWN"] = 0; + values[valuesById[1] = "NO_SIDE_EFFECTS"] = 1; + values[valuesById[2] = "IDEMPOTENT"] = 2; + return values; })(); - v1.UpdateSnapshotRequest = (function() { + return MethodOptions; + })(); - /** - * Properties of an UpdateSnapshotRequest. - * @memberof google.pubsub.v1 - * @interface IUpdateSnapshotRequest - * @property {google.pubsub.v1.ISnapshot|null} [snapshot] UpdateSnapshotRequest snapshot - * @property {google.protobuf.IFieldMask|null} [updateMask] UpdateSnapshotRequest updateMask - */ + protobuf.UninterpretedOption = (function() { - /** - * Constructs a new UpdateSnapshotRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents an UpdateSnapshotRequest. - * @implements IUpdateSnapshotRequest - * @constructor - * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set - */ - function UpdateSnapshotRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of an UninterpretedOption. + * @memberof google.protobuf + * @interface IUninterpretedOption + * @property {Array.|null} [name] UninterpretedOption name + * @property {string|null} [identifierValue] UninterpretedOption identifierValue + * @property {number|Long|null} [positiveIntValue] UninterpretedOption positiveIntValue + * @property {number|Long|null} [negativeIntValue] UninterpretedOption negativeIntValue + * @property {number|null} [doubleValue] UninterpretedOption doubleValue + * @property {Uint8Array|null} [stringValue] UninterpretedOption stringValue + * @property {string|null} [aggregateValue] UninterpretedOption aggregateValue + */ - /** - * UpdateSnapshotRequest snapshot. - * @member {google.pubsub.v1.ISnapshot|null|undefined} snapshot - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @instance - */ - UpdateSnapshotRequest.prototype.snapshot = null; + /** + * Constructs a new UninterpretedOption. + * @memberof google.protobuf + * @classdesc Represents an UninterpretedOption. + * @implements IUninterpretedOption + * @constructor + * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set + */ + function UninterpretedOption(properties) { + this.name = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * UpdateSnapshotRequest updateMask. - * @member {google.protobuf.IFieldMask|null|undefined} updateMask - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @instance - */ - UpdateSnapshotRequest.prototype.updateMask = null; + /** + * UninterpretedOption name. + * @member {Array.} name + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.name = $util.emptyArray; - /** - * Creates a new UpdateSnapshotRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {google.pubsub.v1.IUpdateSnapshotRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest instance - */ - UpdateSnapshotRequest.create = function create(properties) { - return new UpdateSnapshotRequest(properties); - }; + /** + * UninterpretedOption identifierValue. + * @member {string} identifierValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.identifierValue = ""; - /** - * Encodes the specified UpdateSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UpdateSnapshotRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - $root.google.pubsub.v1.Snapshot.encode(message.snapshot, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; + /** + * UninterpretedOption positiveIntValue. + * @member {number|Long} positiveIntValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.positiveIntValue = $util.Long ? $util.Long.fromBits(0,0,true) : 0; - /** - * Encodes the specified UpdateSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.UpdateSnapshotRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {google.pubsub.v1.IUpdateSnapshotRequest} message UpdateSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - UpdateSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * UninterpretedOption negativeIntValue. + * @member {number|Long} negativeIntValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.negativeIntValue = $util.Long ? $util.Long.fromBits(0,0,false) : 0; - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UpdateSnapshotRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.snapshot = $root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * UninterpretedOption doubleValue. + * @member {number} doubleValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.doubleValue = 0; + + /** + * UninterpretedOption stringValue. + * @member {Uint8Array} stringValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.stringValue = $util.newBuffer([]); + + /** + * UninterpretedOption aggregateValue. + * @member {string} aggregateValue + * @memberof google.protobuf.UninterpretedOption + * @instance + */ + UninterpretedOption.prototype.aggregateValue = ""; + + /** + * Creates a new UninterpretedOption instance using the specified properties. + * @function create + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.IUninterpretedOption=} [properties] Properties to set + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption instance + */ + UninterpretedOption.create = function create(properties) { + return new UninterpretedOption(properties); + }; + + /** + * Encodes the specified UninterpretedOption message. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @function encode + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UninterpretedOption.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && message.name.length) + for (var i = 0; i < message.name.length; ++i) + $root.google.protobuf.UninterpretedOption.NamePart.encode(message.name[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.identifierValue); + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + writer.uint32(/* id 4, wireType 0 =*/32).uint64(message.positiveIntValue); + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + writer.uint32(/* id 5, wireType 0 =*/40).int64(message.negativeIntValue); + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + writer.uint32(/* id 6, wireType 1 =*/49).double(message.doubleValue); + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + writer.uint32(/* id 7, wireType 2 =*/58).bytes(message.stringValue); + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + writer.uint32(/* id 8, wireType 2 =*/66).string(message.aggregateValue); + return writer; + }; - /** - * Decodes an UpdateSnapshotRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - UpdateSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.IUninterpretedOption} message UninterpretedOption message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + UninterpretedOption.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Verifies an UpdateSnapshotRequest message. - * @function verify - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - UpdateSnapshotRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) { - var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshot); - if (error) - return "snapshot." + error; - } - if (message.updateMask != null && message.hasOwnProperty("updateMask")) { - var error = $root.google.protobuf.FieldMask.verify(message.updateMask); - if (error) - return "updateMask." + error; + /** + * Decodes an UninterpretedOption message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UninterpretedOption.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 2: + if (!(message.name && message.name.length)) + message.name = []; + message.name.push($root.google.protobuf.UninterpretedOption.NamePart.decode(reader, reader.uint32())); + break; + case 3: + message.identifierValue = reader.string(); + break; + case 4: + message.positiveIntValue = reader.uint64(); + break; + case 5: + message.negativeIntValue = reader.int64(); + break; + case 6: + message.doubleValue = reader.double(); + break; + case 7: + message.stringValue = reader.bytes(); + break; + case 8: + message.aggregateValue = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; } - return null; - }; + } + return message; + }; - /** - * Creates an UpdateSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.UpdateSnapshotRequest} UpdateSnapshotRequest - */ - UpdateSnapshotRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.UpdateSnapshotRequest) - return object; - var message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); - if (object.snapshot != null) { - if (typeof object.snapshot !== "object") - throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.snapshot: object expected"); - message.snapshot = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshot); - } - if (object.updateMask != null) { - if (typeof object.updateMask !== "object") - throw TypeError(".google.pubsub.v1.UpdateSnapshotRequest.updateMask: object expected"); - message.updateMask = $root.google.protobuf.FieldMask.fromObject(object.updateMask); - } - return message; - }; + /** + * Decodes an UninterpretedOption message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + UninterpretedOption.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a plain object from an UpdateSnapshotRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @static - * @param {google.pubsub.v1.UpdateSnapshotRequest} message UpdateSnapshotRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - UpdateSnapshotRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.snapshot = null; - object.updateMask = null; + /** + * Verifies an UninterpretedOption message. + * @function verify + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + UninterpretedOption.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) { + if (!Array.isArray(message.name)) + return "name: array expected"; + for (var i = 0; i < message.name.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.NamePart.verify(message.name[i]); + if (error) + return "name." + error; } - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - object.snapshot = $root.google.pubsub.v1.Snapshot.toObject(message.snapshot, options); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) - object.updateMask = $root.google.protobuf.FieldMask.toObject(message.updateMask, options); + } + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + if (!$util.isString(message.identifierValue)) + return "identifierValue: string expected"; + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + if (!$util.isInteger(message.positiveIntValue) && !(message.positiveIntValue && $util.isInteger(message.positiveIntValue.low) && $util.isInteger(message.positiveIntValue.high))) + return "positiveIntValue: integer|Long expected"; + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + if (!$util.isInteger(message.negativeIntValue) && !(message.negativeIntValue && $util.isInteger(message.negativeIntValue.low) && $util.isInteger(message.negativeIntValue.high))) + return "negativeIntValue: integer|Long expected"; + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + if (typeof message.doubleValue !== "number") + return "doubleValue: number expected"; + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + if (!(message.stringValue && typeof message.stringValue.length === "number" || $util.isString(message.stringValue))) + return "stringValue: buffer expected"; + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + if (!$util.isString(message.aggregateValue)) + return "aggregateValue: string expected"; + return null; + }; + + /** + * Creates an UninterpretedOption message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.UninterpretedOption} UninterpretedOption + */ + UninterpretedOption.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.UninterpretedOption) return object; - }; + var message = new $root.google.protobuf.UninterpretedOption(); + if (object.name) { + if (!Array.isArray(object.name)) + throw TypeError(".google.protobuf.UninterpretedOption.name: array expected"); + message.name = []; + for (var i = 0; i < object.name.length; ++i) { + if (typeof object.name[i] !== "object") + throw TypeError(".google.protobuf.UninterpretedOption.name: object expected"); + message.name[i] = $root.google.protobuf.UninterpretedOption.NamePart.fromObject(object.name[i]); + } + } + if (object.identifierValue != null) + message.identifierValue = String(object.identifierValue); + if (object.positiveIntValue != null) + if ($util.Long) + (message.positiveIntValue = $util.Long.fromValue(object.positiveIntValue)).unsigned = true; + else if (typeof object.positiveIntValue === "string") + message.positiveIntValue = parseInt(object.positiveIntValue, 10); + else if (typeof object.positiveIntValue === "number") + message.positiveIntValue = object.positiveIntValue; + else if (typeof object.positiveIntValue === "object") + message.positiveIntValue = new $util.LongBits(object.positiveIntValue.low >>> 0, object.positiveIntValue.high >>> 0).toNumber(true); + if (object.negativeIntValue != null) + if ($util.Long) + (message.negativeIntValue = $util.Long.fromValue(object.negativeIntValue)).unsigned = false; + else if (typeof object.negativeIntValue === "string") + message.negativeIntValue = parseInt(object.negativeIntValue, 10); + else if (typeof object.negativeIntValue === "number") + message.negativeIntValue = object.negativeIntValue; + else if (typeof object.negativeIntValue === "object") + message.negativeIntValue = new $util.LongBits(object.negativeIntValue.low >>> 0, object.negativeIntValue.high >>> 0).toNumber(); + if (object.doubleValue != null) + message.doubleValue = Number(object.doubleValue); + if (object.stringValue != null) + if (typeof object.stringValue === "string") + $util.base64.decode(object.stringValue, message.stringValue = $util.newBuffer($util.base64.length(object.stringValue)), 0); + else if (object.stringValue.length) + message.stringValue = object.stringValue; + if (object.aggregateValue != null) + message.aggregateValue = String(object.aggregateValue); + return message; + }; - /** - * Converts this UpdateSnapshotRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.UpdateSnapshotRequest - * @instance - * @returns {Object.} JSON object - */ - UpdateSnapshotRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from an UninterpretedOption message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {google.protobuf.UninterpretedOption} message UninterpretedOption + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + UninterpretedOption.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.name = []; + if (options.defaults) { + object.identifierValue = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, true); + object.positiveIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.positiveIntValue = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.negativeIntValue = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.negativeIntValue = options.longs === String ? "0" : 0; + object.doubleValue = 0; + if (options.bytes === String) + object.stringValue = ""; + else { + object.stringValue = []; + if (options.bytes !== Array) + object.stringValue = $util.newBuffer(object.stringValue); + } + object.aggregateValue = ""; + } + if (message.name && message.name.length) { + object.name = []; + for (var j = 0; j < message.name.length; ++j) + object.name[j] = $root.google.protobuf.UninterpretedOption.NamePart.toObject(message.name[j], options); + } + if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + object.identifierValue = message.identifierValue; + if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + if (typeof message.positiveIntValue === "number") + object.positiveIntValue = options.longs === String ? String(message.positiveIntValue) : message.positiveIntValue; + else + object.positiveIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.positiveIntValue) : options.longs === Number ? new $util.LongBits(message.positiveIntValue.low >>> 0, message.positiveIntValue.high >>> 0).toNumber(true) : message.positiveIntValue; + if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + if (typeof message.negativeIntValue === "number") + object.negativeIntValue = options.longs === String ? String(message.negativeIntValue) : message.negativeIntValue; + else + object.negativeIntValue = options.longs === String ? $util.Long.prototype.toString.call(message.negativeIntValue) : options.longs === Number ? new $util.LongBits(message.negativeIntValue.low >>> 0, message.negativeIntValue.high >>> 0).toNumber() : message.negativeIntValue; + if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + object.doubleValue = options.json && !isFinite(message.doubleValue) ? String(message.doubleValue) : message.doubleValue; + if (message.stringValue != null && message.hasOwnProperty("stringValue")) + object.stringValue = options.bytes === String ? $util.base64.encode(message.stringValue, 0, message.stringValue.length) : options.bytes === Array ? Array.prototype.slice.call(message.stringValue) : message.stringValue; + if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + object.aggregateValue = message.aggregateValue; + return object; + }; - return UpdateSnapshotRequest; - })(); + /** + * Converts this UninterpretedOption to JSON. + * @function toJSON + * @memberof google.protobuf.UninterpretedOption + * @instance + * @returns {Object.} JSON object + */ + UninterpretedOption.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.Snapshot = (function() { + UninterpretedOption.NamePart = (function() { /** - * Properties of a Snapshot. - * @memberof google.pubsub.v1 - * @interface ISnapshot - * @property {string|null} [name] Snapshot name - * @property {string|null} [topic] Snapshot topic - * @property {google.protobuf.ITimestamp|null} [expireTime] Snapshot expireTime - * @property {Object.|null} [labels] Snapshot labels + * Properties of a NamePart. + * @memberof google.protobuf.UninterpretedOption + * @interface INamePart + * @property {string} namePart NamePart namePart + * @property {boolean} isExtension NamePart isExtension */ /** - * Constructs a new Snapshot. - * @memberof google.pubsub.v1 - * @classdesc Represents a Snapshot. - * @implements ISnapshot + * Constructs a new NamePart. + * @memberof google.protobuf.UninterpretedOption + * @classdesc Represents a NamePart. + * @implements INamePart * @constructor - * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set + * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set */ - function Snapshot(properties) { - this.labels = {}; + function NamePart(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -22993,276 +19652,423 @@ } /** - * Snapshot name. - * @member {string} name - * @memberof google.pubsub.v1.Snapshot - * @instance - */ - Snapshot.prototype.name = ""; - - /** - * Snapshot topic. - * @member {string} topic - * @memberof google.pubsub.v1.Snapshot - * @instance - */ - Snapshot.prototype.topic = ""; - - /** - * Snapshot expireTime. - * @member {google.protobuf.ITimestamp|null|undefined} expireTime - * @memberof google.pubsub.v1.Snapshot + * NamePart namePart. + * @member {string} namePart + * @memberof google.protobuf.UninterpretedOption.NamePart * @instance */ - Snapshot.prototype.expireTime = null; + NamePart.prototype.namePart = ""; /** - * Snapshot labels. - * @member {Object.} labels - * @memberof google.pubsub.v1.Snapshot + * NamePart isExtension. + * @member {boolean} isExtension + * @memberof google.protobuf.UninterpretedOption.NamePart * @instance */ - Snapshot.prototype.labels = $util.emptyObject; + NamePart.prototype.isExtension = false; /** - * Creates a new Snapshot instance using the specified properties. + * Creates a new NamePart instance using the specified properties. * @function create - * @memberof google.pubsub.v1.Snapshot + * @memberof google.protobuf.UninterpretedOption.NamePart * @static - * @param {google.pubsub.v1.ISnapshot=} [properties] Properties to set - * @returns {google.pubsub.v1.Snapshot} Snapshot instance + * @param {google.protobuf.UninterpretedOption.INamePart=} [properties] Properties to set + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart instance */ - Snapshot.create = function create(properties) { - return new Snapshot(properties); + NamePart.create = function create(properties) { + return new NamePart(properties); }; /** - * Encodes the specified Snapshot message. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * Encodes the specified NamePart message. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.Snapshot + * @memberof google.protobuf.UninterpretedOption.NamePart * @static - * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode + * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Snapshot.encode = function encode(message, writer) { + NamePart.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.topic != null && message.hasOwnProperty("topic")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); - if (message.expireTime != null && message.hasOwnProperty("expireTime")) - $root.google.protobuf.Timestamp.encode(message.expireTime, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.labels != null && message.hasOwnProperty("labels")) - for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) - writer.uint32(/* id 4, wireType 2 =*/34).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + writer.uint32(/* id 1, wireType 2 =*/10).string(message.namePart); + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.isExtension); return writer; }; /** - * Encodes the specified Snapshot message, length delimited. Does not implicitly {@link google.pubsub.v1.Snapshot.verify|verify} messages. + * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.Snapshot + * @memberof google.protobuf.UninterpretedOption.NamePart * @static - * @param {google.pubsub.v1.ISnapshot} message Snapshot message or plain object to encode + * @param {google.protobuf.UninterpretedOption.INamePart} message NamePart message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - Snapshot.encodeDelimited = function encodeDelimited(message, writer) { + NamePart.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a Snapshot message from the specified reader or buffer. + * Decodes a NamePart message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.Snapshot + * @memberof google.protobuf.UninterpretedOption.NamePart * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.Snapshot} Snapshot + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Snapshot.decode = function decode(reader, length) { + NamePart.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption.NamePart(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.name = reader.string(); + message.namePart = reader.string(); break; case 2: - message.topic = reader.string(); - break; - case 3: - message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 4: - reader.skip().pos++; - if (message.labels === $util.emptyObject) - message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + message.isExtension = reader.bool(); break; default: reader.skipType(tag & 7); break; } } + if (!message.hasOwnProperty("namePart")) + throw $util.ProtocolError("missing required 'namePart'", { instance: message }); + if (!message.hasOwnProperty("isExtension")) + throw $util.ProtocolError("missing required 'isExtension'", { instance: message }); return message; }; /** - * Decodes a Snapshot message from the specified reader or buffer, length delimited. + * Decodes a NamePart message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.Snapshot + * @memberof google.protobuf.UninterpretedOption.NamePart * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.Snapshot} Snapshot + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Snapshot.decodeDelimited = function decodeDelimited(reader) { + NamePart.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a Snapshot message. - * @function verify - * @memberof google.pubsub.v1.Snapshot - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Snapshot.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.name != null && message.hasOwnProperty("name")) - if (!$util.isString(message.name)) - return "name: string expected"; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.expireTime != null && message.hasOwnProperty("expireTime")) { - var error = $root.google.protobuf.Timestamp.verify(message.expireTime); - if (error) - return "expireTime." + error; - } - if (message.labels != null && message.hasOwnProperty("labels")) { - if (!$util.isObject(message.labels)) - return "labels: object expected"; - var key = Object.keys(message.labels); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.labels[key[i]])) - return "labels: string{k:string} expected"; - } + * Verifies a NamePart message. + * @function verify + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + NamePart.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (!$util.isString(message.namePart)) + return "namePart: string expected"; + if (typeof message.isExtension !== "boolean") + return "isExtension: boolean expected"; return null; }; /** - * Creates a Snapshot message from a plain object. Also converts values to their respective internal types. + * Creates a NamePart message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.Snapshot + * @memberof google.protobuf.UninterpretedOption.NamePart * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.Snapshot} Snapshot + * @returns {google.protobuf.UninterpretedOption.NamePart} NamePart */ - Snapshot.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.Snapshot) + NamePart.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.UninterpretedOption.NamePart) return object; - var message = new $root.google.pubsub.v1.Snapshot(); - if (object.name != null) - message.name = String(object.name); - if (object.topic != null) - message.topic = String(object.topic); - if (object.expireTime != null) { - if (typeof object.expireTime !== "object") - throw TypeError(".google.pubsub.v1.Snapshot.expireTime: object expected"); - message.expireTime = $root.google.protobuf.Timestamp.fromObject(object.expireTime); - } - if (object.labels) { - if (typeof object.labels !== "object") - throw TypeError(".google.pubsub.v1.Snapshot.labels: object expected"); - message.labels = {}; - for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) - message.labels[keys[i]] = String(object.labels[keys[i]]); - } + var message = new $root.google.protobuf.UninterpretedOption.NamePart(); + if (object.namePart != null) + message.namePart = String(object.namePart); + if (object.isExtension != null) + message.isExtension = Boolean(object.isExtension); return message; }; /** - * Creates a plain object from a Snapshot message. Also converts values to other types if specified. + * Creates a plain object from a NamePart message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.Snapshot + * @memberof google.protobuf.UninterpretedOption.NamePart * @static - * @param {google.pubsub.v1.Snapshot} message Snapshot + * @param {google.protobuf.UninterpretedOption.NamePart} message NamePart * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - Snapshot.toObject = function toObject(message, options) { + NamePart.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; - if (options.objects || options.defaults) - object.labels = {}; if (options.defaults) { - object.name = ""; - object.topic = ""; - object.expireTime = null; - } - if (message.name != null && message.hasOwnProperty("name")) - object.name = message.name; - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.expireTime != null && message.hasOwnProperty("expireTime")) - object.expireTime = $root.google.protobuf.Timestamp.toObject(message.expireTime, options); - var keys2; - if (message.labels && (keys2 = Object.keys(message.labels)).length) { - object.labels = {}; - for (var j = 0; j < keys2.length; ++j) - object.labels[keys2[j]] = message.labels[keys2[j]]; + object.namePart = ""; + object.isExtension = false; } + if (message.namePart != null && message.hasOwnProperty("namePart")) + object.namePart = message.namePart; + if (message.isExtension != null && message.hasOwnProperty("isExtension")) + object.isExtension = message.isExtension; return object; }; /** - * Converts this Snapshot to JSON. + * Converts this NamePart to JSON. * @function toJSON - * @memberof google.pubsub.v1.Snapshot + * @memberof google.protobuf.UninterpretedOption.NamePart * @instance * @returns {Object.} JSON object */ - Snapshot.prototype.toJSON = function toJSON() { + NamePart.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return Snapshot; - })(); + return NamePart; + })(); + + return UninterpretedOption; + })(); + + protobuf.SourceCodeInfo = (function() { + + /** + * Properties of a SourceCodeInfo. + * @memberof google.protobuf + * @interface ISourceCodeInfo + * @property {Array.|null} [location] SourceCodeInfo location + */ + + /** + * Constructs a new SourceCodeInfo. + * @memberof google.protobuf + * @classdesc Represents a SourceCodeInfo. + * @implements ISourceCodeInfo + * @constructor + * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set + */ + function SourceCodeInfo(properties) { + this.location = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * SourceCodeInfo location. + * @member {Array.} location + * @memberof google.protobuf.SourceCodeInfo + * @instance + */ + SourceCodeInfo.prototype.location = $util.emptyArray; + + /** + * Creates a new SourceCodeInfo instance using the specified properties. + * @function create + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {google.protobuf.ISourceCodeInfo=} [properties] Properties to set + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo instance + */ + SourceCodeInfo.create = function create(properties) { + return new SourceCodeInfo(properties); + }; + + /** + * Encodes the specified SourceCodeInfo message. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @function encode + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SourceCodeInfo.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.location != null && message.location.length) + for (var i = 0; i < message.location.length; ++i) + $root.google.protobuf.SourceCodeInfo.Location.encode(message.location[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {google.protobuf.ISourceCodeInfo} message SourceCodeInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SourceCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SourceCodeInfo.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.location && message.location.length)) + message.location = []; + message.location.push($root.google.protobuf.SourceCodeInfo.Location.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SourceCodeInfo message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SourceCodeInfo.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SourceCodeInfo message. + * @function verify + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SourceCodeInfo.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.location != null && message.hasOwnProperty("location")) { + if (!Array.isArray(message.location)) + return "location: array expected"; + for (var i = 0; i < message.location.length; ++i) { + var error = $root.google.protobuf.SourceCodeInfo.Location.verify(message.location[i]); + if (error) + return "location." + error; + } + } + return null; + }; + + /** + * Creates a SourceCodeInfo message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.SourceCodeInfo} SourceCodeInfo + */ + SourceCodeInfo.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.SourceCodeInfo) + return object; + var message = new $root.google.protobuf.SourceCodeInfo(); + if (object.location) { + if (!Array.isArray(object.location)) + throw TypeError(".google.protobuf.SourceCodeInfo.location: array expected"); + message.location = []; + for (var i = 0; i < object.location.length; ++i) { + if (typeof object.location[i] !== "object") + throw TypeError(".google.protobuf.SourceCodeInfo.location: object expected"); + message.location[i] = $root.google.protobuf.SourceCodeInfo.Location.fromObject(object.location[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a SourceCodeInfo message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {google.protobuf.SourceCodeInfo} message SourceCodeInfo + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SourceCodeInfo.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.location = []; + if (message.location && message.location.length) { + object.location = []; + for (var j = 0; j < message.location.length; ++j) + object.location[j] = $root.google.protobuf.SourceCodeInfo.Location.toObject(message.location[j], options); + } + return object; + }; - v1.GetSnapshotRequest = (function() { + /** + * Converts this SourceCodeInfo to JSON. + * @function toJSON + * @memberof google.protobuf.SourceCodeInfo + * @instance + * @returns {Object.} JSON object + */ + SourceCodeInfo.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + SourceCodeInfo.Location = (function() { /** - * Properties of a GetSnapshotRequest. - * @memberof google.pubsub.v1 - * @interface IGetSnapshotRequest - * @property {string|null} [snapshot] GetSnapshotRequest snapshot + * Properties of a Location. + * @memberof google.protobuf.SourceCodeInfo + * @interface ILocation + * @property {Array.|null} [path] Location path + * @property {Array.|null} [span] Location span + * @property {string|null} [leadingComments] Location leadingComments + * @property {string|null} [trailingComments] Location trailingComments + * @property {Array.|null} [leadingDetachedComments] Location leadingDetachedComments */ /** - * Constructs a new GetSnapshotRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a GetSnapshotRequest. - * @implements IGetSnapshotRequest + * Constructs a new Location. + * @memberof google.protobuf.SourceCodeInfo + * @classdesc Represents a Location. + * @implements ILocation * @constructor - * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set + * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set */ - function GetSnapshotRequest(properties) { + function Location(properties) { + this.path = []; + this.span = []; + this.leadingDetachedComments = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -23270,290 +20076,152 @@ } /** - * GetSnapshotRequest snapshot. - * @member {string} snapshot - * @memberof google.pubsub.v1.GetSnapshotRequest + * Location path. + * @member {Array.} path + * @memberof google.protobuf.SourceCodeInfo.Location * @instance */ - GetSnapshotRequest.prototype.snapshot = ""; - - /** - * Creates a new GetSnapshotRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {google.pubsub.v1.IGetSnapshotRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest instance - */ - GetSnapshotRequest.create = function create(properties) { - return new GetSnapshotRequest(properties); - }; - - /** - * Encodes the specified GetSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSnapshotRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); - return writer; - }; - - /** - * Encodes the specified GetSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSnapshotRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {google.pubsub.v1.IGetSnapshotRequest} message GetSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GetSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSnapshotRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSnapshotRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.snapshot = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a GetSnapshotRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GetSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a GetSnapshotRequest message. - * @function verify - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - GetSnapshotRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - if (!$util.isString(message.snapshot)) - return "snapshot: string expected"; - return null; - }; - - /** - * Creates a GetSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.GetSnapshotRequest} GetSnapshotRequest - */ - GetSnapshotRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.GetSnapshotRequest) - return object; - var message = new $root.google.pubsub.v1.GetSnapshotRequest(); - if (object.snapshot != null) - message.snapshot = String(object.snapshot); - return message; - }; - - /** - * Creates a plain object from a GetSnapshotRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.GetSnapshotRequest - * @static - * @param {google.pubsub.v1.GetSnapshotRequest} message GetSnapshotRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - GetSnapshotRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.snapshot = ""; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - object.snapshot = message.snapshot; - return object; - }; + Location.prototype.path = $util.emptyArray; /** - * Converts this GetSnapshotRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.GetSnapshotRequest + * Location span. + * @member {Array.} span + * @memberof google.protobuf.SourceCodeInfo.Location * @instance - * @returns {Object.} JSON object */ - GetSnapshotRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return GetSnapshotRequest; - })(); - - v1.ListSnapshotsRequest = (function() { - - /** - * Properties of a ListSnapshotsRequest. - * @memberof google.pubsub.v1 - * @interface IListSnapshotsRequest - * @property {string|null} [project] ListSnapshotsRequest project - * @property {number|null} [pageSize] ListSnapshotsRequest pageSize - * @property {string|null} [pageToken] ListSnapshotsRequest pageToken - */ - - /** - * Constructs a new ListSnapshotsRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListSnapshotsRequest. - * @implements IListSnapshotsRequest - * @constructor - * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set - */ - function ListSnapshotsRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + Location.prototype.span = $util.emptyArray; /** - * ListSnapshotsRequest project. - * @member {string} project - * @memberof google.pubsub.v1.ListSnapshotsRequest + * Location leadingComments. + * @member {string} leadingComments + * @memberof google.protobuf.SourceCodeInfo.Location * @instance */ - ListSnapshotsRequest.prototype.project = ""; + Location.prototype.leadingComments = ""; /** - * ListSnapshotsRequest pageSize. - * @member {number} pageSize - * @memberof google.pubsub.v1.ListSnapshotsRequest + * Location trailingComments. + * @member {string} trailingComments + * @memberof google.protobuf.SourceCodeInfo.Location * @instance */ - ListSnapshotsRequest.prototype.pageSize = 0; + Location.prototype.trailingComments = ""; /** - * ListSnapshotsRequest pageToken. - * @member {string} pageToken - * @memberof google.pubsub.v1.ListSnapshotsRequest + * Location leadingDetachedComments. + * @member {Array.} leadingDetachedComments + * @memberof google.protobuf.SourceCodeInfo.Location * @instance */ - ListSnapshotsRequest.prototype.pageToken = ""; + Location.prototype.leadingDetachedComments = $util.emptyArray; /** - * Creates a new ListSnapshotsRequest instance using the specified properties. + * Creates a new Location instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @static - * @param {google.pubsub.v1.IListSnapshotsRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest instance + * @param {google.protobuf.SourceCodeInfo.ILocation=} [properties] Properties to set + * @returns {google.protobuf.SourceCodeInfo.Location} Location instance */ - ListSnapshotsRequest.create = function create(properties) { - return new ListSnapshotsRequest(properties); + Location.create = function create(properties) { + return new Location(properties); }; /** - * Encodes the specified ListSnapshotsRequest message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * Encodes the specified Location message. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @static - * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode + * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListSnapshotsRequest.encode = function encode(message, writer) { + Location.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); + if (message.path != null && message.path.length) { + writer.uint32(/* id 1, wireType 2 =*/10).fork(); + for (var i = 0; i < message.path.length; ++i) + writer.int32(message.path[i]); + writer.ldelim(); + } + if (message.span != null && message.span.length) { + writer.uint32(/* id 2, wireType 2 =*/18).fork(); + for (var i = 0; i < message.span.length; ++i) + writer.int32(message.span[i]); + writer.ldelim(); + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.leadingComments); + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.trailingComments); + if (message.leadingDetachedComments != null && message.leadingDetachedComments.length) + for (var i = 0; i < message.leadingDetachedComments.length; ++i) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.leadingDetachedComments[i]); return writer; }; /** - * Encodes the specified ListSnapshotsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsRequest.verify|verify} messages. + * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @static - * @param {google.pubsub.v1.IListSnapshotsRequest} message ListSnapshotsRequest message or plain object to encode + * @param {google.protobuf.SourceCodeInfo.ILocation} message Location message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListSnapshotsRequest.encodeDelimited = function encodeDelimited(message, writer) { + Location.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer. + * Decodes a Location message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest + * @returns {google.protobuf.SourceCodeInfo.Location} Location * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSnapshotsRequest.decode = function decode(reader, length) { + Location.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsRequest(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo.Location(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.project = reader.string(); + if (!(message.path && message.path.length)) + message.path = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.path.push(reader.int32()); + } else + message.path.push(reader.int32()); break; case 2: - message.pageSize = reader.int32(); + if (!(message.span && message.span.length)) + message.span = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.span.push(reader.int32()); + } else + message.span.push(reader.int32()); break; case 3: - message.pageToken = reader.string(); + message.leadingComments = reader.string(); + break; + case 4: + message.trailingComments = reader.string(); + break; + case 6: + if (!(message.leadingDetachedComments && message.leadingDetachedComments.length)) + message.leadingDetachedComments = []; + message.leadingDetachedComments.push(reader.string()); break; default: reader.skipType(tag & 7); @@ -23564,126 +20232,390 @@ }; /** - * Decodes a ListSnapshotsRequest message from the specified reader or buffer, length delimited. + * Decodes a Location message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest + * @returns {google.protobuf.SourceCodeInfo.Location} Location * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSnapshotsRequest.decodeDelimited = function decodeDelimited(reader) { + Location.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListSnapshotsRequest message. + * Verifies a Location message. * @function verify - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListSnapshotsRequest.verify = function verify(message) { + Location.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.project != null && message.hasOwnProperty("project")) - if (!$util.isString(message.project)) - return "project: string expected"; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - if (!$util.isInteger(message.pageSize)) - return "pageSize: integer expected"; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - if (!$util.isString(message.pageToken)) - return "pageToken: string expected"; + if (message.path != null && message.hasOwnProperty("path")) { + if (!Array.isArray(message.path)) + return "path: array expected"; + for (var i = 0; i < message.path.length; ++i) + if (!$util.isInteger(message.path[i])) + return "path: integer[] expected"; + } + if (message.span != null && message.hasOwnProperty("span")) { + if (!Array.isArray(message.span)) + return "span: array expected"; + for (var i = 0; i < message.span.length; ++i) + if (!$util.isInteger(message.span[i])) + return "span: integer[] expected"; + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + if (!$util.isString(message.leadingComments)) + return "leadingComments: string expected"; + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + if (!$util.isString(message.trailingComments)) + return "trailingComments: string expected"; + if (message.leadingDetachedComments != null && message.hasOwnProperty("leadingDetachedComments")) { + if (!Array.isArray(message.leadingDetachedComments)) + return "leadingDetachedComments: array expected"; + for (var i = 0; i < message.leadingDetachedComments.length; ++i) + if (!$util.isString(message.leadingDetachedComments[i])) + return "leadingDetachedComments: string[] expected"; + } return null; }; /** - * Creates a ListSnapshotsRequest message from a plain object. Also converts values to their respective internal types. + * Creates a Location message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListSnapshotsRequest} ListSnapshotsRequest + * @returns {google.protobuf.SourceCodeInfo.Location} Location */ - ListSnapshotsRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListSnapshotsRequest) + Location.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.SourceCodeInfo.Location) return object; - var message = new $root.google.pubsub.v1.ListSnapshotsRequest(); - if (object.project != null) - message.project = String(object.project); - if (object.pageSize != null) - message.pageSize = object.pageSize | 0; - if (object.pageToken != null) - message.pageToken = String(object.pageToken); + var message = new $root.google.protobuf.SourceCodeInfo.Location(); + if (object.path) { + if (!Array.isArray(object.path)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.path: array expected"); + message.path = []; + for (var i = 0; i < object.path.length; ++i) + message.path[i] = object.path[i] | 0; + } + if (object.span) { + if (!Array.isArray(object.span)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.span: array expected"); + message.span = []; + for (var i = 0; i < object.span.length; ++i) + message.span[i] = object.span[i] | 0; + } + if (object.leadingComments != null) + message.leadingComments = String(object.leadingComments); + if (object.trailingComments != null) + message.trailingComments = String(object.trailingComments); + if (object.leadingDetachedComments) { + if (!Array.isArray(object.leadingDetachedComments)) + throw TypeError(".google.protobuf.SourceCodeInfo.Location.leadingDetachedComments: array expected"); + message.leadingDetachedComments = []; + for (var i = 0; i < object.leadingDetachedComments.length; ++i) + message.leadingDetachedComments[i] = String(object.leadingDetachedComments[i]); + } return message; }; /** - * Creates a plain object from a ListSnapshotsRequest message. Also converts values to other types if specified. + * Creates a plain object from a Location message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @static - * @param {google.pubsub.v1.ListSnapshotsRequest} message ListSnapshotsRequest + * @param {google.protobuf.SourceCodeInfo.Location} message Location * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListSnapshotsRequest.toObject = function toObject(message, options) { + Location.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; + if (options.arrays || options.defaults) { + object.path = []; + object.span = []; + object.leadingDetachedComments = []; + } if (options.defaults) { - object.project = ""; - object.pageSize = 0; - object.pageToken = ""; + object.leadingComments = ""; + object.trailingComments = ""; + } + if (message.path && message.path.length) { + object.path = []; + for (var j = 0; j < message.path.length; ++j) + object.path[j] = message.path[j]; + } + if (message.span && message.span.length) { + object.span = []; + for (var j = 0; j < message.span.length; ++j) + object.span[j] = message.span[j]; + } + if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + object.leadingComments = message.leadingComments; + if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + object.trailingComments = message.trailingComments; + if (message.leadingDetachedComments && message.leadingDetachedComments.length) { + object.leadingDetachedComments = []; + for (var j = 0; j < message.leadingDetachedComments.length; ++j) + object.leadingDetachedComments[j] = message.leadingDetachedComments[j]; } - if (message.project != null && message.hasOwnProperty("project")) - object.project = message.project; - if (message.pageSize != null && message.hasOwnProperty("pageSize")) - object.pageSize = message.pageSize; - if (message.pageToken != null && message.hasOwnProperty("pageToken")) - object.pageToken = message.pageToken; return object; }; /** - * Converts this ListSnapshotsRequest to JSON. + * Converts this Location to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListSnapshotsRequest + * @memberof google.protobuf.SourceCodeInfo.Location * @instance * @returns {Object.} JSON object */ - ListSnapshotsRequest.prototype.toJSON = function toJSON() { + Location.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListSnapshotsRequest; + return Location; })(); - v1.ListSnapshotsResponse = (function() { + return SourceCodeInfo; + })(); + + protobuf.GeneratedCodeInfo = (function() { + + /** + * Properties of a GeneratedCodeInfo. + * @memberof google.protobuf + * @interface IGeneratedCodeInfo + * @property {Array.|null} [annotation] GeneratedCodeInfo annotation + */ + + /** + * Constructs a new GeneratedCodeInfo. + * @memberof google.protobuf + * @classdesc Represents a GeneratedCodeInfo. + * @implements IGeneratedCodeInfo + * @constructor + * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set + */ + function GeneratedCodeInfo(properties) { + this.annotation = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GeneratedCodeInfo annotation. + * @member {Array.} annotation + * @memberof google.protobuf.GeneratedCodeInfo + * @instance + */ + GeneratedCodeInfo.prototype.annotation = $util.emptyArray; + + /** + * Creates a new GeneratedCodeInfo instance using the specified properties. + * @function create + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.IGeneratedCodeInfo=} [properties] Properties to set + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo instance + */ + GeneratedCodeInfo.create = function create(properties) { + return new GeneratedCodeInfo(properties); + }; + + /** + * Encodes the specified GeneratedCodeInfo message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @function encode + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GeneratedCodeInfo.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.annotation != null && message.annotation.length) + for (var i = 0; i < message.annotation.length; ++i) + $root.google.protobuf.GeneratedCodeInfo.Annotation.encode(message.annotation[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.IGeneratedCodeInfo} message GeneratedCodeInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GeneratedCodeInfo.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GeneratedCodeInfo.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.annotation && message.annotation.length)) + message.annotation = []; + message.annotation.push($root.google.protobuf.GeneratedCodeInfo.Annotation.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GeneratedCodeInfo message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GeneratedCodeInfo.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GeneratedCodeInfo message. + * @function verify + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GeneratedCodeInfo.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.annotation != null && message.hasOwnProperty("annotation")) { + if (!Array.isArray(message.annotation)) + return "annotation: array expected"; + for (var i = 0; i < message.annotation.length; ++i) { + var error = $root.google.protobuf.GeneratedCodeInfo.Annotation.verify(message.annotation[i]); + if (error) + return "annotation." + error; + } + } + return null; + }; + + /** + * Creates a GeneratedCodeInfo message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.GeneratedCodeInfo} GeneratedCodeInfo + */ + GeneratedCodeInfo.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.GeneratedCodeInfo) + return object; + var message = new $root.google.protobuf.GeneratedCodeInfo(); + if (object.annotation) { + if (!Array.isArray(object.annotation)) + throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: array expected"); + message.annotation = []; + for (var i = 0; i < object.annotation.length; ++i) { + if (typeof object.annotation[i] !== "object") + throw TypeError(".google.protobuf.GeneratedCodeInfo.annotation: object expected"); + message.annotation[i] = $root.google.protobuf.GeneratedCodeInfo.Annotation.fromObject(object.annotation[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a GeneratedCodeInfo message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {google.protobuf.GeneratedCodeInfo} message GeneratedCodeInfo + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GeneratedCodeInfo.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.annotation = []; + if (message.annotation && message.annotation.length) { + object.annotation = []; + for (var j = 0; j < message.annotation.length; ++j) + object.annotation[j] = $root.google.protobuf.GeneratedCodeInfo.Annotation.toObject(message.annotation[j], options); + } + return object; + }; + + /** + * Converts this GeneratedCodeInfo to JSON. + * @function toJSON + * @memberof google.protobuf.GeneratedCodeInfo + * @instance + * @returns {Object.} JSON object + */ + GeneratedCodeInfo.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + GeneratedCodeInfo.Annotation = (function() { /** - * Properties of a ListSnapshotsResponse. - * @memberof google.pubsub.v1 - * @interface IListSnapshotsResponse - * @property {Array.|null} [snapshots] ListSnapshotsResponse snapshots - * @property {string|null} [nextPageToken] ListSnapshotsResponse nextPageToken + * Properties of an Annotation. + * @memberof google.protobuf.GeneratedCodeInfo + * @interface IAnnotation + * @property {Array.|null} [path] Annotation path + * @property {string|null} [sourceFile] Annotation sourceFile + * @property {number|null} [begin] Annotation begin + * @property {number|null} [end] Annotation end */ /** - * Constructs a new ListSnapshotsResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a ListSnapshotsResponse. - * @implements IListSnapshotsResponse + * Constructs a new Annotation. + * @memberof google.protobuf.GeneratedCodeInfo + * @classdesc Represents an Annotation. + * @implements IAnnotation * @constructor - * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set */ - function ListSnapshotsResponse(properties) { - this.snapshots = []; + function Annotation(properties) { + this.path = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -23691,91 +20623,125 @@ } /** - * ListSnapshotsResponse snapshots. - * @member {Array.} snapshots - * @memberof google.pubsub.v1.ListSnapshotsResponse + * Annotation path. + * @member {Array.} path + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.path = $util.emptyArray; + + /** + * Annotation sourceFile. + * @member {string} sourceFile + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.sourceFile = ""; + + /** + * Annotation begin. + * @member {number} begin + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @instance */ - ListSnapshotsResponse.prototype.snapshots = $util.emptyArray; + Annotation.prototype.begin = 0; /** - * ListSnapshotsResponse nextPageToken. - * @member {string} nextPageToken - * @memberof google.pubsub.v1.ListSnapshotsResponse + * Annotation end. + * @member {number} end + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @instance */ - ListSnapshotsResponse.prototype.nextPageToken = ""; + Annotation.prototype.end = 0; /** - * Creates a new ListSnapshotsResponse instance using the specified properties. + * Creates a new Annotation instance using the specified properties. * @function create - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @static - * @param {google.pubsub.v1.IListSnapshotsResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse instance + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation=} [properties] Properties to set + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation instance */ - ListSnapshotsResponse.create = function create(properties) { - return new ListSnapshotsResponse(properties); + Annotation.create = function create(properties) { + return new Annotation(properties); }; /** - * Encodes the specified ListSnapshotsResponse message. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * Encodes the specified Annotation message. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @static - * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListSnapshotsResponse.encode = function encode(message, writer) { + Annotation.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.snapshots != null && message.snapshots.length) - for (var i = 0; i < message.snapshots.length; ++i) - $root.google.pubsub.v1.Snapshot.encode(message.snapshots[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + if (message.path != null && message.path.length) { + writer.uint32(/* id 1, wireType 2 =*/10).fork(); + for (var i = 0; i < message.path.length; ++i) + writer.int32(message.path[i]); + writer.ldelim(); + } + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.sourceFile); + if (message.begin != null && message.hasOwnProperty("begin")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.begin); + if (message.end != null && message.hasOwnProperty("end")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.end); return writer; }; /** - * Encodes the specified ListSnapshotsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSnapshotsResponse.verify|verify} messages. + * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @static - * @param {google.pubsub.v1.IListSnapshotsResponse} message ListSnapshotsResponse message or plain object to encode + * @param {google.protobuf.GeneratedCodeInfo.IAnnotation} message Annotation message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ListSnapshotsResponse.encodeDelimited = function encodeDelimited(message, writer) { + Annotation.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer. + * Decodes an Annotation message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSnapshotsResponse.decode = function decode(reader, length) { + Annotation.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsResponse(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: - if (!(message.snapshots && message.snapshots.length)) - message.snapshots = []; - message.snapshots.push($root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32())); + if (!(message.path && message.path.length)) + message.path = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.path.push(reader.int32()); + } else + message.path.push(reader.int32()); break; case 2: - message.nextPageToken = reader.string(); + message.sourceFile = reader.string(); + break; + case 3: + message.begin = reader.int32(); + break; + case 4: + message.end = reader.int32(); break; default: reader.skipType(tag & 7); @@ -23786,728 +20752,942 @@ }; /** - * Decodes a ListSnapshotsResponse message from the specified reader or buffer, length delimited. + * Decodes an Annotation message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSnapshotsResponse.decodeDelimited = function decodeDelimited(reader) { + Annotation.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a ListSnapshotsResponse message. + * Verifies an Annotation message. * @function verify - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ListSnapshotsResponse.verify = function verify(message) { + Annotation.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; - if (message.snapshots != null && message.hasOwnProperty("snapshots")) { - if (!Array.isArray(message.snapshots)) - return "snapshots: array expected"; - for (var i = 0; i < message.snapshots.length; ++i) { - var error = $root.google.pubsub.v1.Snapshot.verify(message.snapshots[i]); - if (error) - return "snapshots." + error; - } + if (message.path != null && message.hasOwnProperty("path")) { + if (!Array.isArray(message.path)) + return "path: array expected"; + for (var i = 0; i < message.path.length; ++i) + if (!$util.isInteger(message.path[i])) + return "path: integer[] expected"; } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - if (!$util.isString(message.nextPageToken)) - return "nextPageToken: string expected"; + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + if (!$util.isString(message.sourceFile)) + return "sourceFile: string expected"; + if (message.begin != null && message.hasOwnProperty("begin")) + if (!$util.isInteger(message.begin)) + return "begin: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; return null; }; /** - * Creates a ListSnapshotsResponse message from a plain object. Also converts values to their respective internal types. + * Creates an Annotation message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.ListSnapshotsResponse} ListSnapshotsResponse + * @returns {google.protobuf.GeneratedCodeInfo.Annotation} Annotation */ - ListSnapshotsResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.ListSnapshotsResponse) + Annotation.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.GeneratedCodeInfo.Annotation) return object; - var message = new $root.google.pubsub.v1.ListSnapshotsResponse(); - if (object.snapshots) { - if (!Array.isArray(object.snapshots)) - throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: array expected"); - message.snapshots = []; - for (var i = 0; i < object.snapshots.length; ++i) { - if (typeof object.snapshots[i] !== "object") - throw TypeError(".google.pubsub.v1.ListSnapshotsResponse.snapshots: object expected"); - message.snapshots[i] = $root.google.pubsub.v1.Snapshot.fromObject(object.snapshots[i]); - } + var message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); + if (object.path) { + if (!Array.isArray(object.path)) + throw TypeError(".google.protobuf.GeneratedCodeInfo.Annotation.path: array expected"); + message.path = []; + for (var i = 0; i < object.path.length; ++i) + message.path[i] = object.path[i] | 0; } - if (object.nextPageToken != null) - message.nextPageToken = String(object.nextPageToken); + if (object.sourceFile != null) + message.sourceFile = String(object.sourceFile); + if (object.begin != null) + message.begin = object.begin | 0; + if (object.end != null) + message.end = object.end | 0; return message; }; /** - * Creates a plain object from a ListSnapshotsResponse message. Also converts values to other types if specified. + * Creates a plain object from an Annotation message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @static - * @param {google.pubsub.v1.ListSnapshotsResponse} message ListSnapshotsResponse + * @param {google.protobuf.GeneratedCodeInfo.Annotation} message Annotation * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ListSnapshotsResponse.toObject = function toObject(message, options) { + Annotation.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.arrays || options.defaults) - object.snapshots = []; - if (options.defaults) - object.nextPageToken = ""; - if (message.snapshots && message.snapshots.length) { - object.snapshots = []; - for (var j = 0; j < message.snapshots.length; ++j) - object.snapshots[j] = $root.google.pubsub.v1.Snapshot.toObject(message.snapshots[j], options); + object.path = []; + if (options.defaults) { + object.sourceFile = ""; + object.begin = 0; + object.end = 0; } - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) - object.nextPageToken = message.nextPageToken; + if (message.path && message.path.length) { + object.path = []; + for (var j = 0; j < message.path.length; ++j) + object.path[j] = message.path[j]; + } + if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + object.sourceFile = message.sourceFile; + if (message.begin != null && message.hasOwnProperty("begin")) + object.begin = message.begin; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; return object; }; /** - * Converts this ListSnapshotsResponse to JSON. + * Converts this Annotation to JSON. * @function toJSON - * @memberof google.pubsub.v1.ListSnapshotsResponse + * @memberof google.protobuf.GeneratedCodeInfo.Annotation * @instance * @returns {Object.} JSON object */ - ListSnapshotsResponse.prototype.toJSON = function toJSON() { + Annotation.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ListSnapshotsResponse; + return Annotation; })(); - v1.DeleteSnapshotRequest = (function() { + return GeneratedCodeInfo; + })(); + + protobuf.Duration = (function() { + + /** + * Properties of a Duration. + * @memberof google.protobuf + * @interface IDuration + * @property {number|Long|null} [seconds] Duration seconds + * @property {number|null} [nanos] Duration nanos + */ + + /** + * Constructs a new Duration. + * @memberof google.protobuf + * @classdesc Represents a Duration. + * @implements IDuration + * @constructor + * @param {google.protobuf.IDuration=} [properties] Properties to set + */ + function Duration(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Duration seconds. + * @member {number|Long} seconds + * @memberof google.protobuf.Duration + * @instance + */ + Duration.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * Duration nanos. + * @member {number} nanos + * @memberof google.protobuf.Duration + * @instance + */ + Duration.prototype.nanos = 0; + + /** + * Creates a new Duration instance using the specified properties. + * @function create + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.IDuration=} [properties] Properties to set + * @returns {google.protobuf.Duration} Duration instance + */ + Duration.create = function create(properties) { + return new Duration(properties); + }; + + /** + * Encodes the specified Duration message. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @function encode + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.IDuration} message Duration message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Duration.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.seconds != null && message.hasOwnProperty("seconds")) + writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); + if (message.nanos != null && message.hasOwnProperty("nanos")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); + return writer; + }; - /** - * Properties of a DeleteSnapshotRequest. - * @memberof google.pubsub.v1 - * @interface IDeleteSnapshotRequest - * @property {string|null} [snapshot] DeleteSnapshotRequest snapshot - */ + /** + * Encodes the specified Duration message, length delimited. Does not implicitly {@link google.protobuf.Duration.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.IDuration} message Duration message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Duration.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Constructs a new DeleteSnapshotRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a DeleteSnapshotRequest. - * @implements IDeleteSnapshotRequest - * @constructor - * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set - */ - function DeleteSnapshotRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Decodes a Duration message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.Duration + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.Duration} Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Duration.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Duration(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.seconds = reader.int64(); + break; + case 2: + message.nanos = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } } + return message; + }; - /** - * DeleteSnapshotRequest snapshot. - * @member {string} snapshot - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @instance - */ - DeleteSnapshotRequest.prototype.snapshot = ""; - - /** - * Creates a new DeleteSnapshotRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {google.pubsub.v1.IDeleteSnapshotRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest instance - */ - DeleteSnapshotRequest.create = function create(properties) { - return new DeleteSnapshotRequest(properties); - }; - - /** - * Encodes the specified DeleteSnapshotRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteSnapshotRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); - return writer; - }; + /** + * Decodes a Duration message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.Duration + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.Duration} Duration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Duration.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Encodes the specified DeleteSnapshotRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSnapshotRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {google.pubsub.v1.IDeleteSnapshotRequest} message DeleteSnapshotRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DeleteSnapshotRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Verifies a Duration message. + * @function verify + * @memberof google.protobuf.Duration + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Duration.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) + return "seconds: integer|Long expected"; + if (message.nanos != null && message.hasOwnProperty("nanos")) + if (!$util.isInteger(message.nanos)) + return "nanos: integer expected"; + return null; + }; - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteSnapshotRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.snapshot = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Creates a Duration message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.Duration + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.Duration} Duration + */ + Duration.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Duration) + return object; + var message = new $root.google.protobuf.Duration(); + if (object.seconds != null) + if ($util.Long) + (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; + else if (typeof object.seconds === "string") + message.seconds = parseInt(object.seconds, 10); + else if (typeof object.seconds === "number") + message.seconds = object.seconds; + else if (typeof object.seconds === "object") + message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); + if (object.nanos != null) + message.nanos = object.nanos | 0; + return message; + }; - /** - * Decodes a DeleteSnapshotRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DeleteSnapshotRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Creates a plain object from a Duration message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.Duration + * @static + * @param {google.protobuf.Duration} message Duration + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Duration.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.seconds = options.longs === String ? "0" : 0; + object.nanos = 0; + } + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (typeof message.seconds === "number") + object.seconds = options.longs === String ? String(message.seconds) : message.seconds; + else + object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; + if (message.nanos != null && message.hasOwnProperty("nanos")) + object.nanos = message.nanos; + return object; + }; - /** - * Verifies a DeleteSnapshotRequest message. - * @function verify - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DeleteSnapshotRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - if (!$util.isString(message.snapshot)) - return "snapshot: string expected"; - return null; - }; + /** + * Converts this Duration to JSON. + * @function toJSON + * @memberof google.protobuf.Duration + * @instance + * @returns {Object.} JSON object + */ + Duration.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Creates a DeleteSnapshotRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.DeleteSnapshotRequest} DeleteSnapshotRequest - */ - DeleteSnapshotRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.DeleteSnapshotRequest) - return object; - var message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); - if (object.snapshot != null) - message.snapshot = String(object.snapshot); - return message; - }; + return Duration; + })(); - /** - * Creates a plain object from a DeleteSnapshotRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @static - * @param {google.pubsub.v1.DeleteSnapshotRequest} message DeleteSnapshotRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DeleteSnapshotRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.snapshot = ""; - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - object.snapshot = message.snapshot; - return object; - }; + protobuf.Empty = (function() { - /** - * Converts this DeleteSnapshotRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.DeleteSnapshotRequest - * @instance - * @returns {Object.} JSON object - */ - DeleteSnapshotRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Properties of an Empty. + * @memberof google.protobuf + * @interface IEmpty + */ - return DeleteSnapshotRequest; - })(); + /** + * Constructs a new Empty. + * @memberof google.protobuf + * @classdesc Represents an Empty. + * @implements IEmpty + * @constructor + * @param {google.protobuf.IEmpty=} [properties] Properties to set + */ + function Empty(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - v1.SeekRequest = (function() { + /** + * Creates a new Empty instance using the specified properties. + * @function create + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.IEmpty=} [properties] Properties to set + * @returns {google.protobuf.Empty} Empty instance + */ + Empty.create = function create(properties) { + return new Empty(properties); + }; - /** - * Properties of a SeekRequest. - * @memberof google.pubsub.v1 - * @interface ISeekRequest - * @property {string|null} [subscription] SeekRequest subscription - * @property {google.protobuf.ITimestamp|null} [time] SeekRequest time - * @property {string|null} [snapshot] SeekRequest snapshot - */ + /** + * Encodes the specified Empty message. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @function encode + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.IEmpty} message Empty message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Empty.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; - /** - * Constructs a new SeekRequest. - * @memberof google.pubsub.v1 - * @classdesc Represents a SeekRequest. - * @implements ISeekRequest - * @constructor - * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set - */ - function SeekRequest(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; + /** + * Encodes the specified Empty message, length delimited. Does not implicitly {@link google.protobuf.Empty.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.IEmpty} message Empty message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Empty.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an Empty message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.Empty + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.Empty} Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Empty.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Empty(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } } + return message; + }; - /** - * SeekRequest subscription. - * @member {string} subscription - * @memberof google.pubsub.v1.SeekRequest - * @instance - */ - SeekRequest.prototype.subscription = ""; + /** + * Decodes an Empty message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.Empty + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.Empty} Empty + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Empty.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * SeekRequest time. - * @member {google.protobuf.ITimestamp|null|undefined} time - * @memberof google.pubsub.v1.SeekRequest - * @instance - */ - SeekRequest.prototype.time = null; + /** + * Verifies an Empty message. + * @function verify + * @memberof google.protobuf.Empty + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Empty.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates an Empty message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.Empty + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.Empty} Empty + */ + Empty.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Empty) + return object; + return new $root.google.protobuf.Empty(); + }; + + /** + * Creates a plain object from an Empty message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.Empty + * @static + * @param {google.protobuf.Empty} message Empty + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Empty.toObject = function toObject() { + return {}; + }; - /** - * SeekRequest snapshot. - * @member {string} snapshot - * @memberof google.pubsub.v1.SeekRequest - * @instance - */ - SeekRequest.prototype.snapshot = ""; + /** + * Converts this Empty to JSON. + * @function toJSON + * @memberof google.protobuf.Empty + * @instance + * @returns {Object.} JSON object + */ + Empty.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + return Empty; + })(); - /** - * SeekRequest target. - * @member {"time"|"snapshot"|undefined} target - * @memberof google.pubsub.v1.SeekRequest - * @instance - */ - Object.defineProperty(SeekRequest.prototype, "target", { - get: $util.oneOfGetter($oneOfFields = ["time", "snapshot"]), - set: $util.oneOfSetter($oneOfFields) - }); + protobuf.FieldMask = (function() { - /** - * Creates a new SeekRequest instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {google.pubsub.v1.ISeekRequest=} [properties] Properties to set - * @returns {google.pubsub.v1.SeekRequest} SeekRequest instance - */ - SeekRequest.create = function create(properties) { - return new SeekRequest(properties); - }; + /** + * Properties of a FieldMask. + * @memberof google.protobuf + * @interface IFieldMask + * @property {Array.|null} [paths] FieldMask paths + */ - /** - * Encodes the specified SeekRequest message. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SeekRequest.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.time != null && message.hasOwnProperty("time")) - $root.google.protobuf.Timestamp.encode(message.time, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) - writer.uint32(/* id 3, wireType 2 =*/26).string(message.snapshot); - return writer; - }; + /** + * Constructs a new FieldMask. + * @memberof google.protobuf + * @classdesc Represents a FieldMask. + * @implements IFieldMask + * @constructor + * @param {google.protobuf.IFieldMask=} [properties] Properties to set + */ + function FieldMask(properties) { + this.paths = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Encodes the specified SeekRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekRequest.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {google.pubsub.v1.ISeekRequest} message SeekRequest message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SeekRequest.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * FieldMask paths. + * @member {Array.} paths + * @memberof google.protobuf.FieldMask + * @instance + */ + FieldMask.prototype.paths = $util.emptyArray; - /** - * Decodes a SeekRequest message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.SeekRequest} SeekRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SeekRequest.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekRequest(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.time = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 3: - message.snapshot = reader.string(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * Creates a new FieldMask instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask=} [properties] Properties to set + * @returns {google.protobuf.FieldMask} FieldMask instance + */ + FieldMask.create = function create(properties) { + return new FieldMask(properties); + }; - /** - * Decodes a SeekRequest message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.SeekRequest} SeekRequest - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SeekRequest.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * Encodes the specified FieldMask message. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldMask.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.paths != null && message.paths.length) + for (var i = 0; i < message.paths.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.paths[i]); + return writer; + }; - /** - * Verifies a SeekRequest message. - * @function verify - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - SeekRequest.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - var properties = {}; - if (message.subscription != null && message.hasOwnProperty("subscription")) - if (!$util.isString(message.subscription)) - return "subscription: string expected"; - if (message.time != null && message.hasOwnProperty("time")) { - properties.target = 1; - { - var error = $root.google.protobuf.Timestamp.verify(message.time); - if (error) - return "time." + error; - } - } - if (message.snapshot != null && message.hasOwnProperty("snapshot")) { - if (properties.target === 1) - return "target: multiple values"; - properties.target = 1; - if (!$util.isString(message.snapshot)) - return "snapshot: string expected"; - } - return null; - }; + /** + * Encodes the specified FieldMask message, length delimited. Does not implicitly {@link google.protobuf.FieldMask.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.IFieldMask} message FieldMask message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FieldMask.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Creates a SeekRequest message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.SeekRequest} SeekRequest - */ - SeekRequest.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.SeekRequest) - return object; - var message = new $root.google.pubsub.v1.SeekRequest(); - if (object.subscription != null) - message.subscription = String(object.subscription); - if (object.time != null) { - if (typeof object.time !== "object") - throw TypeError(".google.pubsub.v1.SeekRequest.time: object expected"); - message.time = $root.google.protobuf.Timestamp.fromObject(object.time); + /** + * Decodes a FieldMask message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldMask + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldMask} FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldMask.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldMask(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.paths && message.paths.length)) + message.paths = []; + message.paths.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; } - if (object.snapshot != null) - message.snapshot = String(object.snapshot); - return message; - }; + } + return message; + }; - /** - * Creates a plain object from a SeekRequest message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.SeekRequest - * @static - * @param {google.pubsub.v1.SeekRequest} message SeekRequest - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - SeekRequest.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.subscription = ""; - if (message.subscription != null && message.hasOwnProperty("subscription")) - object.subscription = message.subscription; - if (message.time != null && message.hasOwnProperty("time")) { - object.time = $root.google.protobuf.Timestamp.toObject(message.time, options); - if (options.oneofs) - object.target = "time"; - } - if (message.snapshot != null && message.hasOwnProperty("snapshot")) { - object.snapshot = message.snapshot; - if (options.oneofs) - object.target = "snapshot"; - } + /** + * Decodes a FieldMask message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldMask + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldMask} FieldMask + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FieldMask.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FieldMask message. + * @function verify + * @memberof google.protobuf.FieldMask + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FieldMask.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.paths != null && message.hasOwnProperty("paths")) { + if (!Array.isArray(message.paths)) + return "paths: array expected"; + for (var i = 0; i < message.paths.length; ++i) + if (!$util.isString(message.paths[i])) + return "paths: string[] expected"; + } + return null; + }; + + /** + * Creates a FieldMask message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldMask + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldMask} FieldMask + */ + FieldMask.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldMask) return object; - }; + var message = new $root.google.protobuf.FieldMask(); + if (object.paths) { + if (!Array.isArray(object.paths)) + throw TypeError(".google.protobuf.FieldMask.paths: array expected"); + message.paths = []; + for (var i = 0; i < object.paths.length; ++i) + message.paths[i] = String(object.paths[i]); + } + return message; + }; - /** - * Converts this SeekRequest to JSON. - * @function toJSON - * @memberof google.pubsub.v1.SeekRequest - * @instance - * @returns {Object.} JSON object - */ - SeekRequest.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a FieldMask message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldMask + * @static + * @param {google.protobuf.FieldMask} message FieldMask + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FieldMask.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.paths = []; + if (message.paths && message.paths.length) { + object.paths = []; + for (var j = 0; j < message.paths.length; ++j) + object.paths[j] = message.paths[j]; + } + return object; + }; - return SeekRequest; - })(); + /** + * Converts this FieldMask to JSON. + * @function toJSON + * @memberof google.protobuf.FieldMask + * @instance + * @returns {Object.} JSON object + */ + FieldMask.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - v1.SeekResponse = (function() { + return FieldMask; + })(); - /** - * Properties of a SeekResponse. - * @memberof google.pubsub.v1 - * @interface ISeekResponse - */ + protobuf.Timestamp = (function() { - /** - * Constructs a new SeekResponse. - * @memberof google.pubsub.v1 - * @classdesc Represents a SeekResponse. - * @implements ISeekResponse - * @constructor - * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set - */ - function SeekResponse(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Properties of a Timestamp. + * @memberof google.protobuf + * @interface ITimestamp + * @property {number|Long|null} [seconds] Timestamp seconds + * @property {number|null} [nanos] Timestamp nanos + */ - /** - * Creates a new SeekResponse instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {google.pubsub.v1.ISeekResponse=} [properties] Properties to set - * @returns {google.pubsub.v1.SeekResponse} SeekResponse instance - */ - SeekResponse.create = function create(properties) { - return new SeekResponse(properties); - }; + /** + * Constructs a new Timestamp. + * @memberof google.protobuf + * @classdesc Represents a Timestamp. + * @implements ITimestamp + * @constructor + * @param {google.protobuf.ITimestamp=} [properties] Properties to set + */ + function Timestamp(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Encodes the specified SeekResponse message. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SeekResponse.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - return writer; - }; + /** + * Timestamp seconds. + * @member {number|Long} seconds + * @memberof google.protobuf.Timestamp + * @instance + */ + Timestamp.prototype.seconds = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * Timestamp nanos. + * @member {number} nanos + * @memberof google.protobuf.Timestamp + * @instance + */ + Timestamp.prototype.nanos = 0; + + /** + * Creates a new Timestamp instance using the specified properties. + * @function create + * @memberof google.protobuf.Timestamp + * @static + * @param {google.protobuf.ITimestamp=} [properties] Properties to set + * @returns {google.protobuf.Timestamp} Timestamp instance + */ + Timestamp.create = function create(properties) { + return new Timestamp(properties); + }; + + /** + * Encodes the specified Timestamp message. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @function encode + * @memberof google.protobuf.Timestamp + * @static + * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Timestamp.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.seconds != null && message.hasOwnProperty("seconds")) + writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); + if (message.nanos != null && message.hasOwnProperty("nanos")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); + return writer; + }; - /** - * Encodes the specified SeekResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.SeekResponse.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {google.pubsub.v1.ISeekResponse} message SeekResponse message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - SeekResponse.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified Timestamp message, length delimited. Does not implicitly {@link google.protobuf.Timestamp.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.Timestamp + * @static + * @param {google.protobuf.ITimestamp} message Timestamp message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Timestamp.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; - /** - * Decodes a SeekResponse message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.SeekResponse} SeekResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SeekResponse.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekResponse(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - default: - reader.skipType(tag & 7); - break; - } + /** + * Decodes a Timestamp message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.Timestamp + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.Timestamp} Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Timestamp.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Timestamp(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.seconds = reader.int64(); + break; + case 2: + message.nanos = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; } - return message; - }; - - /** - * Decodes a SeekResponse message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.SeekResponse} SeekResponse - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - SeekResponse.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + } + return message; + }; - /** - * Verifies a SeekResponse message. - * @function verify - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - SeekResponse.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - return null; - }; + /** + * Decodes a Timestamp message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.Timestamp + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.Timestamp} Timestamp + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Timestamp.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a SeekResponse message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.SeekResponse} SeekResponse - */ - SeekResponse.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.SeekResponse) - return object; - return new $root.google.pubsub.v1.SeekResponse(); - }; + /** + * Verifies a Timestamp message. + * @function verify + * @memberof google.protobuf.Timestamp + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Timestamp.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (!$util.isInteger(message.seconds) && !(message.seconds && $util.isInteger(message.seconds.low) && $util.isInteger(message.seconds.high))) + return "seconds: integer|Long expected"; + if (message.nanos != null && message.hasOwnProperty("nanos")) + if (!$util.isInteger(message.nanos)) + return "nanos: integer expected"; + return null; + }; - /** - * Creates a plain object from a SeekResponse message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.SeekResponse - * @static - * @param {google.pubsub.v1.SeekResponse} message SeekResponse - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - SeekResponse.toObject = function toObject() { - return {}; - }; + /** + * Creates a Timestamp message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.Timestamp + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.Timestamp} Timestamp + */ + Timestamp.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.Timestamp) + return object; + var message = new $root.google.protobuf.Timestamp(); + if (object.seconds != null) + if ($util.Long) + (message.seconds = $util.Long.fromValue(object.seconds)).unsigned = false; + else if (typeof object.seconds === "string") + message.seconds = parseInt(object.seconds, 10); + else if (typeof object.seconds === "number") + message.seconds = object.seconds; + else if (typeof object.seconds === "object") + message.seconds = new $util.LongBits(object.seconds.low >>> 0, object.seconds.high >>> 0).toNumber(); + if (object.nanos != null) + message.nanos = object.nanos | 0; + return message; + }; - /** - * Converts this SeekResponse to JSON. - * @function toJSON - * @memberof google.pubsub.v1.SeekResponse - * @instance - * @returns {Object.} JSON object - */ - SeekResponse.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a Timestamp message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.Timestamp + * @static + * @param {google.protobuf.Timestamp} message Timestamp + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Timestamp.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.seconds = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.seconds = options.longs === String ? "0" : 0; + object.nanos = 0; + } + if (message.seconds != null && message.hasOwnProperty("seconds")) + if (typeof message.seconds === "number") + object.seconds = options.longs === String ? String(message.seconds) : message.seconds; + else + object.seconds = options.longs === String ? $util.Long.prototype.toString.call(message.seconds) : options.longs === Number ? new $util.LongBits(message.seconds.low >>> 0, message.seconds.high >>> 0).toNumber() : message.seconds; + if (message.nanos != null && message.hasOwnProperty("nanos")) + object.nanos = message.nanos; + return object; + }; - return SeekResponse; - })(); + /** + * Converts this Timestamp to JSON. + * @function toJSON + * @memberof google.protobuf.Timestamp + * @instance + * @returns {Object.} JSON object + */ + Timestamp.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return v1; + return Timestamp; })(); - return pubsub; + return protobuf; })(); return google; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 1edead9dd67..9dc9164f946 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2,176 +2,199 @@ "nested": { "google": { "nested": { - "iam": { + "pubsub": { "nested": { "v1": { "options": { "cc_enable_arenas": true, - "csharp_namespace": "Google.Cloud.Iam.V1", - "go_package": "google.golang.org/genproto/googleapis/iam/v1;iam", + "csharp_namespace": "Google.Cloud.PubSub.V1", + "go_package": "google.golang.org/genproto/googleapis/pubsub/v1;pubsub", "java_multiple_files": true, - "java_outer_classname": "IamPolicyProto", - "java_package": "com.google.iam.v1", - "php_namespace": "Google\\Cloud\\Iam\\V1" + "java_outer_classname": "PubsubProto", + "java_package": "com.google.pubsub.v1", + "php_namespace": "Google\\Cloud\\PubSub\\V1", + "ruby_package": "Google::Cloud::PubSub::V1" }, "nested": { - "Policy": { - "fields": { - "version": { - "type": "int32", - "id": 1 + "Publisher": { + "options": { + "(google.api.default_host)": "pubsub.googleapis.com", + "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" + }, + "methods": { + "CreateTopic": { + "requestType": "Topic", + "responseType": "Topic", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/topics/*}", + "(google.api.http).body": "*", + "(google.api.method_signature)": "name" + } }, - "bindings": { - "rule": "repeated", - "type": "Binding", - "id": 4 + "UpdateTopic": { + "requestType": "UpdateTopicRequest", + "responseType": "Topic", + "options": { + "(google.api.http).patch": "/v1/{topic.name=projects/*/topics/*}", + "(google.api.http).body": "*" + } }, - "etag": { - "type": "bytes", - "id": 3 - } - } - }, - "Binding": { - "fields": { - "role": { - "type": "string", - "id": 1 + "Publish": { + "requestType": "PublishRequest", + "responseType": "PublishResponse", + "options": { + "(google.api.http).post": "/v1/{topic=projects/*/topics/*}:publish", + "(google.api.http).body": "*", + "(google.api.method_signature)": "topic,messages" + } }, - "members": { - "rule": "repeated", - "type": "string", - "id": 2 + "GetTopic": { + "requestType": "GetTopicRequest", + "responseType": "Topic", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}", + "(google.api.method_signature)": "topic" + } }, - "condition": { - "type": "google.type.Expr", - "id": 3 + "ListTopics": { + "requestType": "ListTopicsRequest", + "responseType": "ListTopicsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/topics", + "(google.api.method_signature)": "project" + } + }, + "ListTopicSubscriptions": { + "requestType": "ListTopicSubscriptionsRequest", + "responseType": "ListTopicSubscriptionsResponse", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/subscriptions", + "(google.api.method_signature)": "topic" + } + }, + "ListTopicSnapshots": { + "requestType": "ListTopicSnapshotsRequest", + "responseType": "ListTopicSnapshotsResponse", + "options": { + "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/snapshots", + "(google.api.method_signature)": "topic" + } + }, + "DeleteTopic": { + "requestType": "DeleteTopicRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}", + "(google.api.method_signature)": "topic" + } } } }, - "PolicyDelta": { + "MessageStoragePolicy": { "fields": { - "bindingDeltas": { + "allowedPersistenceRegions": { "rule": "repeated", - "type": "BindingDelta", + "type": "string", "id": 1 - }, - "auditConfigDeltas": { - "rule": "repeated", - "type": "AuditConfigDelta", - "id": 2 } } }, - "BindingDelta": { + "Topic": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Topic", + "(google.api.resource).pattern": "_deleted-topic_" + }, "fields": { - "action": { - "type": "Action", - "id": 1 + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, - "role": { + "labels": { + "keyType": "string", "type": "string", "id": 2 }, - "member": { - "type": "string", + "messageStoragePolicy": { + "type": "MessageStoragePolicy", "id": 3 }, - "condition": { - "type": "google.type.Expr", - "id": 4 - } - }, - "nested": { - "Action": { - "values": { - "ACTION_UNSPECIFIED": 0, - "ADD": 1, - "REMOVE": 2 - } + "kmsKeyName": { + "type": "string", + "id": 5 } } }, - "AuditConfigDelta": { + "PubsubMessage": { "fields": { - "action": { - "type": "Action", + "data": { + "type": "bytes", "id": 1 }, - "service": { + "attributes": { + "keyType": "string", "type": "string", "id": 2 }, - "exemptedMember": { + "messageId": { "type": "string", "id": 3 }, - "logType": { - "type": "string", + "publishTime": { + "type": "google.protobuf.Timestamp", "id": 4 - } - }, - "nested": { - "Action": { - "values": { - "ACTION_UNSPECIFIED": 0, - "ADD": 1, - "REMOVE": 2 - } + }, + "orderingKey": { + "type": "string", + "id": 5 } } }, - "GetPolicyOptions": { + "GetTopicRequest": { "fields": { - "requestedPolicyVersion": { - "type": "int32", - "id": 1 + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } } } }, - "IAMPolicy": { - "options": { - "(google.api.default_host)": "iam-meta-api.googleapis.com" - }, - "methods": { - "SetIamPolicy": { - "requestType": "SetIamPolicyRequest", - "responseType": "Policy", - "options": { - "(google.api.http).post": "/v1/{resource=**}:setIamPolicy", - "(google.api.http).body": "*" - } - }, - "GetIamPolicy": { - "requestType": "GetIamPolicyRequest", - "responseType": "Policy", + "UpdateTopicRequest": { + "fields": { + "topic": { + "type": "Topic", + "id": 1, "options": { - "(google.api.http).post": "/v1/{resource=**}:getIamPolicy", - "(google.api.http).body": "*" + "(google.api.field_behavior)": "REQUIRED" } }, - "TestIamPermissions": { - "requestType": "TestIamPermissionsRequest", - "responseType": "TestIamPermissionsResponse", + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2, "options": { - "(google.api.http).post": "/v1/{resource=**}:testIamPermissions", - "(google.api.http).body": "*" + "(google.api.field_behavior)": "REQUIRED" } } } }, - "SetIamPolicyRequest": { + "PublishRequest": { "fields": { - "resource": { + "topic": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "*" + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" } }, - "policy": { - "type": "Policy", + "messages": { + "rule": "repeated", + "type": "PubsubMessage", "id": 2, "options": { "(google.api.field_behavior)": "REQUIRED" @@ -179,1385 +202,589 @@ } } }, - "GetIamPolicyRequest": { + "PublishResponse": { + "fields": { + "messageIds": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "ListTopicsRequest": { "fields": { - "resource": { + "project": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "*" + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" } }, - "options": { - "type": "GetPolicyOptions", + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListTopicsResponse": { + "fields": { + "topics": { + "rule": "repeated", + "type": "Topic", + "id": 1 + }, + "nextPageToken": { + "type": "string", "id": 2 } } }, - "TestIamPermissionsRequest": { + "ListTopicSubscriptionsRequest": { "fields": { - "resource": { + "topic": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "*" + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" } }, - "permissions": { + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 + } + } + }, + "ListTopicSubscriptionsResponse": { + "fields": { + "subscriptions": { "rule": "repeated", "type": "string", - "id": 2, + "id": 1, "options": { - "(google.api.field_behavior)": "REQUIRED" + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "ListTopicSnapshotsRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" } + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 } } }, - "TestIamPermissionsResponse": { + "ListTopicSnapshotsResponse": { "fields": { - "permissions": { + "snapshots": { "rule": "repeated", "type": "string", "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 } } - } - } - } - } - }, - "type": { - "options": { - "go_package": "google.golang.org/genproto/googleapis/type/expr;expr", - "java_multiple_files": true, - "java_outer_classname": "ExprProto", - "java_package": "com.google.type", - "objc_class_prefix": "GTP" - }, - "nested": { - "Expr": { - "fields": { - "expression": { - "type": "string", - "id": 1 - }, - "title": { - "type": "string", - "id": 2 - }, - "description": { - "type": "string", - "id": 3 - }, - "location": { - "type": "string", - "id": 4 - } - } - } - } - }, - "api": { - "options": { - "go_package": "google.golang.org/genproto/googleapis/api/annotations;annotations", - "java_multiple_files": true, - "java_outer_classname": "ResourceProto", - "java_package": "com.google.api", - "objc_class_prefix": "GAPI", - "cc_enable_arenas": true - }, - "nested": { - "http": { - "type": "HttpRule", - "id": 72295728, - "extend": "google.protobuf.MethodOptions" - }, - "Http": { - "fields": { - "rules": { - "rule": "repeated", - "type": "HttpRule", - "id": 1 - }, - "fullyDecodeReservedExpansion": { - "type": "bool", - "id": 2 - } - } - }, - "HttpRule": { - "oneofs": { - "pattern": { - "oneof": [ - "get", - "put", - "post", - "delete", - "patch", - "custom" - ] - } - }, - "fields": { - "selector": { - "type": "string", - "id": 1 - }, - "get": { - "type": "string", - "id": 2 - }, - "put": { - "type": "string", - "id": 3 - }, - "post": { - "type": "string", - "id": 4 - }, - "delete": { - "type": "string", - "id": 5 - }, - "patch": { - "type": "string", - "id": 6 - }, - "custom": { - "type": "CustomHttpPattern", - "id": 8 - }, - "body": { - "type": "string", - "id": 7 - }, - "responseBody": { - "type": "string", - "id": 12 - }, - "additionalBindings": { - "rule": "repeated", - "type": "HttpRule", - "id": 11 - } - } - }, - "CustomHttpPattern": { - "fields": { - "kind": { - "type": "string", - "id": 1 - }, - "path": { - "type": "string", - "id": 2 - } - } - }, - "methodSignature": { - "rule": "repeated", - "type": "string", - "id": 1051, - "extend": "google.protobuf.MethodOptions" - }, - "defaultHost": { - "type": "string", - "id": 1049, - "extend": "google.protobuf.ServiceOptions" - }, - "oauthScopes": { - "type": "string", - "id": 1050, - "extend": "google.protobuf.ServiceOptions" - }, - "fieldBehavior": { - "rule": "repeated", - "type": "google.api.FieldBehavior", - "id": 1052, - "extend": "google.protobuf.FieldOptions" - }, - "FieldBehavior": { - "values": { - "FIELD_BEHAVIOR_UNSPECIFIED": 0, - "OPTIONAL": 1, - "REQUIRED": 2, - "OUTPUT_ONLY": 3, - "INPUT_ONLY": 4, - "IMMUTABLE": 5 - } - }, - "resourceReference": { - "type": "google.api.ResourceReference", - "id": 1055, - "extend": "google.protobuf.FieldOptions" - }, - "resourceDefinition": { - "rule": "repeated", - "type": "google.api.ResourceDescriptor", - "id": 1053, - "extend": "google.protobuf.FileOptions" - }, - "resource": { - "type": "google.api.ResourceDescriptor", - "id": 1053, - "extend": "google.protobuf.MessageOptions" - }, - "ResourceDescriptor": { - "fields": { - "type": { - "type": "string", - "id": 1 - }, - "pattern": { - "rule": "repeated", - "type": "string", - "id": 2 - }, - "nameField": { - "type": "string", - "id": 3 - }, - "history": { - "type": "History", - "id": 4 - }, - "plural": { - "type": "string", - "id": 5 - }, - "singular": { - "type": "string", - "id": 6 - } - }, - "nested": { - "History": { - "values": { - "HISTORY_UNSPECIFIED": 0, - "ORIGINALLY_SINGLE_PATTERN": 1, - "FUTURE_MULTI_PATTERN": 2 - } - } - } - }, - "ResourceReference": { - "fields": { - "type": { - "type": "string", - "id": 1 - }, - "childType": { - "type": "string", - "id": 2 - } - } - } - } - }, - "protobuf": { - "options": { - "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", - "java_package": "com.google.protobuf", - "java_outer_classname": "DescriptorProtos", - "csharp_namespace": "Google.Protobuf.Reflection", - "objc_class_prefix": "GPB", - "cc_enable_arenas": true, - "optimize_for": "SPEED" - }, - "nested": { - "FileDescriptorSet": { - "fields": { - "file": { - "rule": "repeated", - "type": "FileDescriptorProto", - "id": 1 - } - } - }, - "FileDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "package": { - "type": "string", - "id": 2 - }, - "dependency": { - "rule": "repeated", - "type": "string", - "id": 3 - }, - "publicDependency": { - "rule": "repeated", - "type": "int32", - "id": 10, - "options": { - "packed": false - } - }, - "weakDependency": { - "rule": "repeated", - "type": "int32", - "id": 11, - "options": { - "packed": false - } - }, - "messageType": { - "rule": "repeated", - "type": "DescriptorProto", - "id": 4 - }, - "enumType": { - "rule": "repeated", - "type": "EnumDescriptorProto", - "id": 5 - }, - "service": { - "rule": "repeated", - "type": "ServiceDescriptorProto", - "id": 6 - }, - "extension": { - "rule": "repeated", - "type": "FieldDescriptorProto", - "id": 7 - }, - "options": { - "type": "FileOptions", - "id": 8 - }, - "sourceCodeInfo": { - "type": "SourceCodeInfo", - "id": 9 - }, - "syntax": { - "type": "string", - "id": 12 - } - } - }, - "DescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "field": { - "rule": "repeated", - "type": "FieldDescriptorProto", - "id": 2 - }, - "extension": { - "rule": "repeated", - "type": "FieldDescriptorProto", - "id": 6 - }, - "nestedType": { - "rule": "repeated", - "type": "DescriptorProto", - "id": 3 - }, - "enumType": { - "rule": "repeated", - "type": "EnumDescriptorProto", - "id": 4 - }, - "extensionRange": { - "rule": "repeated", - "type": "ExtensionRange", - "id": 5 - }, - "oneofDecl": { - "rule": "repeated", - "type": "OneofDescriptorProto", - "id": 8 - }, - "options": { - "type": "MessageOptions", - "id": 7 - }, - "reservedRange": { - "rule": "repeated", - "type": "ReservedRange", - "id": 9 - }, - "reservedName": { - "rule": "repeated", - "type": "string", - "id": 10 - } - }, - "nested": { - "ExtensionRange": { - "fields": { - "start": { - "type": "int32", - "id": 1 - }, - "end": { - "type": "int32", - "id": 2 - }, - "options": { - "type": "ExtensionRangeOptions", - "id": 3 - } - } - }, - "ReservedRange": { - "fields": { - "start": { - "type": "int32", - "id": 1 - }, - "end": { - "type": "int32", - "id": 2 - } - } - } - } - }, - "ExtensionRangeOptions": { - "fields": { - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, - "FieldDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "number": { - "type": "int32", - "id": 3 - }, - "label": { - "type": "Label", - "id": 4 - }, - "type": { - "type": "Type", - "id": 5 - }, - "typeName": { - "type": "string", - "id": 6 - }, - "extendee": { - "type": "string", - "id": 2 - }, - "defaultValue": { - "type": "string", - "id": 7 - }, - "oneofIndex": { - "type": "int32", - "id": 9 - }, - "jsonName": { - "type": "string", - "id": 10 - }, - "options": { - "type": "FieldOptions", - "id": 8 - } - }, - "nested": { - "Type": { - "values": { - "TYPE_DOUBLE": 1, - "TYPE_FLOAT": 2, - "TYPE_INT64": 3, - "TYPE_UINT64": 4, - "TYPE_INT32": 5, - "TYPE_FIXED64": 6, - "TYPE_FIXED32": 7, - "TYPE_BOOL": 8, - "TYPE_STRING": 9, - "TYPE_GROUP": 10, - "TYPE_MESSAGE": 11, - "TYPE_BYTES": 12, - "TYPE_UINT32": 13, - "TYPE_ENUM": 14, - "TYPE_SFIXED32": 15, - "TYPE_SFIXED64": 16, - "TYPE_SINT32": 17, - "TYPE_SINT64": 18 - } - }, - "Label": { - "values": { - "LABEL_OPTIONAL": 1, - "LABEL_REQUIRED": 2, - "LABEL_REPEATED": 3 - } - } - } - }, - "OneofDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "options": { - "type": "OneofOptions", - "id": 2 - } - } - }, - "EnumDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "value": { - "rule": "repeated", - "type": "EnumValueDescriptorProto", - "id": 2 - }, - "options": { - "type": "EnumOptions", - "id": 3 - }, - "reservedRange": { - "rule": "repeated", - "type": "EnumReservedRange", - "id": 4 - }, - "reservedName": { - "rule": "repeated", - "type": "string", - "id": 5 - } - }, - "nested": { - "EnumReservedRange": { - "fields": { - "start": { - "type": "int32", - "id": 1 - }, - "end": { - "type": "int32", - "id": 2 - } - } - } - } - }, - "EnumValueDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "number": { - "type": "int32", - "id": 2 - }, - "options": { - "type": "EnumValueOptions", - "id": 3 - } - } - }, - "ServiceDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "method": { - "rule": "repeated", - "type": "MethodDescriptorProto", - "id": 2 - }, - "options": { - "type": "ServiceOptions", - "id": 3 - } - } - }, - "MethodDescriptorProto": { - "fields": { - "name": { - "type": "string", - "id": 1 - }, - "inputType": { - "type": "string", - "id": 2 - }, - "outputType": { - "type": "string", - "id": 3 - }, - "options": { - "type": "MethodOptions", - "id": 4 - }, - "clientStreaming": { - "type": "bool", - "id": 5, - "options": { - "default": false - } - }, - "serverStreaming": { - "type": "bool", - "id": 6, - "options": { - "default": false - } - } - } - }, - "FileOptions": { - "fields": { - "javaPackage": { - "type": "string", - "id": 1 - }, - "javaOuterClassname": { - "type": "string", - "id": 8 - }, - "javaMultipleFiles": { - "type": "bool", - "id": 10, - "options": { - "default": false - } - }, - "javaGenerateEqualsAndHash": { - "type": "bool", - "id": 20, - "options": { - "deprecated": true - } - }, - "javaStringCheckUtf8": { - "type": "bool", - "id": 27, - "options": { - "default": false - } - }, - "optimizeFor": { - "type": "OptimizeMode", - "id": 9, - "options": { - "default": "SPEED" - } - }, - "goPackage": { - "type": "string", - "id": 11 - }, - "ccGenericServices": { - "type": "bool", - "id": 16, - "options": { - "default": false - } - }, - "javaGenericServices": { - "type": "bool", - "id": 17, - "options": { - "default": false - } - }, - "pyGenericServices": { - "type": "bool", - "id": 18, - "options": { - "default": false - } - }, - "phpGenericServices": { - "type": "bool", - "id": 42, - "options": { - "default": false - } - }, - "deprecated": { - "type": "bool", - "id": 23, - "options": { - "default": false - } - }, - "ccEnableArenas": { - "type": "bool", - "id": 31, - "options": { - "default": false - } - }, - "objcClassPrefix": { - "type": "string", - "id": 36 - }, - "csharpNamespace": { - "type": "string", - "id": 37 - }, - "swiftPrefix": { - "type": "string", - "id": 39 - }, - "phpClassPrefix": { - "type": "string", - "id": 40 - }, - "phpNamespace": { - "type": "string", - "id": 41 - }, - "phpMetadataNamespace": { - "type": "string", - "id": 44 - }, - "rubyPackage": { - "type": "string", - "id": 45 - }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ], - "reserved": [ - [ - 38, - 38 - ] - ], - "nested": { - "OptimizeMode": { - "values": { - "SPEED": 1, - "CODE_SIZE": 2, - "LITE_RUNTIME": 3 - } - } - } - }, - "MessageOptions": { - "fields": { - "messageSetWireFormat": { - "type": "bool", - "id": 1, - "options": { - "default": false - } - }, - "noStandardDescriptorAccessor": { - "type": "bool", - "id": 2, - "options": { - "default": false - } - }, - "deprecated": { - "type": "bool", - "id": 3, - "options": { - "default": false - } - }, - "mapEntry": { - "type": "bool", - "id": 7 - }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ], - "reserved": [ - [ - 8, - 8 - ], - [ - 9, - 9 - ] - ] - }, - "FieldOptions": { - "fields": { - "ctype": { - "type": "CType", - "id": 1, - "options": { - "default": "STRING" - } - }, - "packed": { - "type": "bool", - "id": 2 - }, - "jstype": { - "type": "JSType", - "id": 6, - "options": { - "default": "JS_NORMAL" - } - }, - "lazy": { - "type": "bool", - "id": 5, - "options": { - "default": false - } - }, - "deprecated": { - "type": "bool", - "id": 3, - "options": { - "default": false - } - }, - "weak": { - "type": "bool", - "id": 10, - "options": { - "default": false - } - }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ], - "reserved": [ - [ - 4, - 4 - ] - ], - "nested": { - "CType": { - "values": { - "STRING": 0, - "CORD": 1, - "STRING_PIECE": 2 - } - }, - "JSType": { - "values": { - "JS_NORMAL": 0, - "JS_STRING": 1, - "JS_NUMBER": 2 - } - } - } - }, - "OneofOptions": { - "fields": { - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, - "EnumOptions": { - "fields": { - "allowAlias": { - "type": "bool", - "id": 2 - }, - "deprecated": { - "type": "bool", - "id": 3, - "options": { - "default": false - } - }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ], - "reserved": [ - [ - 5, - 5 - ] - ] - }, - "EnumValueOptions": { - "fields": { - "deprecated": { - "type": "bool", - "id": 1, - "options": { - "default": false - } - }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, - "ServiceOptions": { - "fields": { - "deprecated": { - "type": "bool", - "id": 33, - "options": { - "default": false - } }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, - "MethodOptions": { - "fields": { - "deprecated": { - "type": "bool", - "id": 33, - "options": { - "default": false + "DeleteTopicRequest": { + "fields": { + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } + } } }, - "idempotencyLevel": { - "type": "IdempotencyLevel", - "id": 34, + "Subscriber": { "options": { - "default": "IDEMPOTENCY_UNKNOWN" - } - }, - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ], - "nested": { - "IdempotencyLevel": { - "values": { - "IDEMPOTENCY_UNKNOWN": 0, - "NO_SIDE_EFFECTS": 1, - "IDEMPOTENT": 2 + "(google.api.default_host)": "pubsub.googleapis.com", + "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" + }, + "methods": { + "CreateSubscription": { + "requestType": "Subscription", + "responseType": "Subscription", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/subscriptions/*}", + "(google.api.http).body": "*", + "(google.api.method_signature)": "name,topic,push_config,ack_deadline_seconds" + } + }, + "GetSubscription": { + "requestType": "GetSubscriptionRequest", + "responseType": "Subscription", + "options": { + "(google.api.http).get": "/v1/{subscription=projects/*/subscriptions/*}", + "(google.api.method_signature)": "subscription" + } + }, + "UpdateSubscription": { + "requestType": "UpdateSubscriptionRequest", + "responseType": "Subscription", + "options": { + "(google.api.http).patch": "/v1/{subscription.name=projects/*/subscriptions/*}", + "(google.api.http).body": "*" + } + }, + "ListSubscriptions": { + "requestType": "ListSubscriptionsRequest", + "responseType": "ListSubscriptionsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/subscriptions", + "(google.api.method_signature)": "project" + } + }, + "DeleteSubscription": { + "requestType": "DeleteSubscriptionRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{subscription=projects/*/subscriptions/*}", + "(google.api.method_signature)": "subscription" + } + }, + "ModifyAckDeadline": { + "requestType": "ModifyAckDeadlineRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline", + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,ack_ids,ack_deadline_seconds" + } + }, + "Acknowledge": { + "requestType": "AcknowledgeRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:acknowledge", + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,ack_ids" + } + }, + "Pull": { + "requestType": "PullRequest", + "responseType": "PullResponse", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:pull", + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,return_immediately,max_messages" + } + }, + "StreamingPull": { + "requestType": "StreamingPullRequest", + "requestStream": true, + "responseType": "StreamingPullResponse", + "responseStream": true + }, + "ModifyPushConfig": { + "requestType": "ModifyPushConfigRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig", + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,push_config" + } + }, + "GetSnapshot": { + "requestType": "GetSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).get": "/v1/{snapshot=projects/*/snapshots/*}", + "(google.api.method_signature)": "snapshot" + } + }, + "ListSnapshots": { + "requestType": "ListSnapshotsRequest", + "responseType": "ListSnapshotsResponse", + "options": { + "(google.api.http).get": "/v1/{project=projects/*}/snapshots", + "(google.api.method_signature)": "project" + } + }, + "CreateSnapshot": { + "requestType": "CreateSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).put": "/v1/{name=projects/*/snapshots/*}", + "(google.api.http).body": "*", + "(google.api.method_signature)": "name,subscription" + } + }, + "UpdateSnapshot": { + "requestType": "UpdateSnapshotRequest", + "responseType": "Snapshot", + "options": { + "(google.api.http).patch": "/v1/{snapshot.name=projects/*/snapshots/*}", + "(google.api.http).body": "*" + } + }, + "DeleteSnapshot": { + "requestType": "DeleteSnapshotRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{snapshot=projects/*/snapshots/*}", + "(google.api.method_signature)": "snapshot" + } + }, + "Seek": { + "requestType": "SeekRequest", + "responseType": "SeekResponse", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:seek", + "(google.api.http).body": "*" + } + } } - } - } - }, - "UninterpretedOption": { - "fields": { - "name": { - "rule": "repeated", - "type": "NamePart", - "id": 2 - }, - "identifierValue": { - "type": "string", - "id": 3 - }, - "positiveIntValue": { - "type": "uint64", - "id": 4 - }, - "negativeIntValue": { - "type": "int64", - "id": 5 - }, - "doubleValue": { - "type": "double", - "id": 6 - }, - "stringValue": { - "type": "bytes", - "id": 7 }, - "aggregateValue": { - "type": "string", - "id": 8 - } - }, - "nested": { - "NamePart": { + "Subscription": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Subscription", + "(google.api.resource).pattern": "projects/{project}/subscriptions/{subscription}" + }, "fields": { - "namePart": { - "rule": "required", + "name": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, - "isExtension": { - "rule": "required", - "type": "bool", - "id": 2 - } - } - } - } - }, - "SourceCodeInfo": { - "fields": { - "location": { - "rule": "repeated", - "type": "Location", - "id": 1 - } - }, - "nested": { - "Location": { - "fields": { - "path": { - "rule": "repeated", - "type": "int32", - "id": 1 + "topic": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + } }, - "span": { - "rule": "repeated", + "pushConfig": { + "type": "PushConfig", + "id": 4 + }, + "ackDeadlineSeconds": { "type": "int32", - "id": 2 + "id": 5 }, - "leadingComments": { - "type": "string", - "id": 3 + "retainAckedMessages": { + "type": "bool", + "id": 7 }, - "trailingComments": { + "messageRetentionDuration": { + "type": "google.protobuf.Duration", + "id": 8 + }, + "labels": { + "keyType": "string", "type": "string", - "id": 4 + "id": 9 }, - "leadingDetachedComments": { - "rule": "repeated", + "enableMessageOrdering": { + "type": "bool", + "id": 10 + }, + "expirationPolicy": { + "type": "ExpirationPolicy", + "id": 11 + }, + "filter": { "type": "string", - "id": 6 + "id": 12 + }, + "deadLetterPolicy": { + "type": "DeadLetterPolicy", + "id": 13 + }, + "retryPolicy": { + "type": "RetryPolicy", + "id": 14 } } - } - } - }, - "GeneratedCodeInfo": { - "fields": { - "annotation": { - "rule": "repeated", - "type": "Annotation", - "id": 1 - } - }, - "nested": { - "Annotation": { + }, + "RetryPolicy": { "fields": { - "path": { - "rule": "repeated", - "type": "int32", + "minimumBackoff": { + "type": "google.protobuf.Duration", "id": 1 }, - "sourceFile": { - "type": "string", + "maximumBackoff": { + "type": "google.protobuf.Duration", "id": 2 + } + } + }, + "DeadLetterPolicy": { + "fields": { + "deadLetterTopic": { + "type": "string", + "id": 1 }, - "begin": { - "type": "int32", - "id": 3 - }, - "end": { + "maxDeliveryAttempts": { "type": "int32", - "id": 4 + "id": 2 } } - } - } - }, - "Duration": { - "fields": { - "seconds": { - "type": "int64", - "id": 1 }, - "nanos": { - "type": "int32", - "id": 2 - } - } - }, - "Empty": { - "fields": {} - }, - "FieldMask": { - "fields": { - "paths": { - "rule": "repeated", - "type": "string", - "id": 1 - } - } - }, - "Timestamp": { - "fields": { - "seconds": { - "type": "int64", - "id": 1 + "ExpirationPolicy": { + "fields": { + "ttl": { + "type": "google.protobuf.Duration", + "id": 1 + } + } }, - "nanos": { - "type": "int32", - "id": 2 - } - } - } - } - }, - "pubsub": { - "nested": { - "v1": { - "options": { - "cc_enable_arenas": true, - "csharp_namespace": "Google.Cloud.PubSub.V1", - "go_package": "google.golang.org/genproto/googleapis/pubsub/v1;pubsub", - "java_multiple_files": true, - "java_outer_classname": "PubsubProto", - "java_package": "com.google.pubsub.v1", - "php_namespace": "Google\\Cloud\\PubSub\\V1", - "ruby_package": "Google::Cloud::PubSub::V1" - }, - "nested": { - "Publisher": { - "options": { - "(google.api.default_host)": "pubsub.googleapis.com", - "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" + "PushConfig": { + "oneofs": { + "authenticationMethod": { + "oneof": [ + "oidcToken" + ] + } }, - "methods": { - "CreateTopic": { - "requestType": "Topic", - "responseType": "Topic", - "options": { - "(google.api.http).put": "/v1/{name=projects/*/topics/*}", - "(google.api.http).body": "*", - "(google.api.method_signature)": "name" - } + "fields": { + "pushEndpoint": { + "type": "string", + "id": 1 }, - "UpdateTopic": { - "requestType": "UpdateTopicRequest", - "responseType": "Topic", - "options": { - "(google.api.http).patch": "/v1/{topic.name=projects/*/topics/*}", - "(google.api.http).body": "*" - } + "attributes": { + "keyType": "string", + "type": "string", + "id": 2 }, - "Publish": { - "requestType": "PublishRequest", - "responseType": "PublishResponse", - "options": { - "(google.api.http).post": "/v1/{topic=projects/*/topics/*}:publish", - "(google.api.http).body": "*", - "(google.api.method_signature)": "topic,messages" + "oidcToken": { + "type": "OidcToken", + "id": 3 + } + }, + "nested": { + "OidcToken": { + "fields": { + "serviceAccountEmail": { + "type": "string", + "id": 1 + }, + "audience": { + "type": "string", + "id": 2 + } } + } + } + }, + "ReceivedMessage": { + "fields": { + "ackId": { + "type": "string", + "id": 1 }, - "GetTopic": { - "requestType": "GetTopicRequest", - "responseType": "Topic", - "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}", - "(google.api.method_signature)": "topic" - } + "message": { + "type": "PubsubMessage", + "id": 2 }, - "ListTopics": { - "requestType": "ListTopicsRequest", - "responseType": "ListTopicsResponse", + "deliveryAttempt": { + "type": "int32", + "id": 3 + } + } + }, + "GetSubscriptionRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1, "options": { - "(google.api.http).get": "/v1/{project=projects/*}/topics", - "(google.api.method_signature)": "project" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" } - }, - "ListTopicSubscriptions": { - "requestType": "ListTopicSubscriptionsRequest", - "responseType": "ListTopicSubscriptionsResponse", + } + } + }, + "UpdateSubscriptionRequest": { + "fields": { + "subscription": { + "type": "Subscription", + "id": 1, "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/subscriptions", - "(google.api.method_signature)": "topic" + "(google.api.field_behavior)": "REQUIRED" } }, - "ListTopicSnapshots": { - "requestType": "ListTopicSnapshotsRequest", - "responseType": "ListTopicSnapshotsResponse", + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2, "options": { - "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/snapshots", - "(google.api.method_signature)": "topic" + "(google.api.field_behavior)": "REQUIRED" } - }, - "DeleteTopic": { - "requestType": "DeleteTopicRequest", - "responseType": "google.protobuf.Empty", + } + } + }, + "ListSubscriptionsRequest": { + "fields": { + "project": { + "type": "string", + "id": 1, "options": { - "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}", - "(google.api.method_signature)": "topic" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" } + }, + "pageSize": { + "type": "int32", + "id": 2 + }, + "pageToken": { + "type": "string", + "id": 3 } } }, - "MessageStoragePolicy": { + "ListSubscriptionsResponse": { "fields": { - "allowedPersistenceRegions": { + "subscriptions": { "rule": "repeated", - "type": "string", + "type": "Subscription", "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 } } }, - "Topic": { - "options": { - "(google.api.resource).type": "pubsub.googleapis.com/Topic", - "(google.api.resource).pattern": "_deleted-topic_" - }, + "DeleteSubscriptionRequest": { "fields": { - "name": { + "subscription": { "type": "string", "id": 1, "options": { - "(google.api.field_behavior)": "REQUIRED" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" } - }, - "labels": { - "keyType": "string", - "type": "string", - "id": 2 - }, - "messageStoragePolicy": { - "type": "MessageStoragePolicy", - "id": 3 - }, - "kmsKeyName": { - "type": "string", - "id": 5 } } }, - "PubsubMessage": { + "ModifyPushConfigRequest": { "fields": { - "data": { - "type": "bytes", - "id": 1 - }, - "attributes": { - "keyType": "string", + "subscription": { "type": "string", - "id": 2 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, - "messageId": { + "pushConfig": { + "type": "PushConfig", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "PullRequest": { + "fields": { + "subscription": { "type": "string", - "id": 3 + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, - "publishTime": { - "type": "google.protobuf.Timestamp", - "id": 4 + "returnImmediately": { + "type": "bool", + "id": 2, + "options": { + "deprecated": true, + "(google.api.field_behavior)": "OPTIONAL" + } }, - "orderingKey": { - "type": "string", - "id": 5 + "maxMessages": { + "type": "int32", + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, - "GetTopicRequest": { + "PullResponse": { "fields": { - "topic": { + "receivedMessages": { + "rule": "repeated", + "type": "ReceivedMessage", + "id": 1 + } + } + }, + "ModifyAckDeadlineRequest": { + "fields": { + "subscription": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } + }, + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 4, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "ackDeadlineSeconds": { + "type": "int32", + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" } } } }, - "UpdateTopicRequest": { + "AcknowledgeRequest": { "fields": { - "topic": { - "type": "Topic", + "subscription": { + "type": "string", "id": 1, "options": { - "(google.api.field_behavior)": "REQUIRED" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" } }, - "updateMask": { - "type": "google.protobuf.FieldMask", + "ackIds": { + "rule": "repeated", + "type": "string", "id": 2, "options": { "(google.api.field_behavior)": "REQUIRED" @@ -1565,112 +792,144 @@ } } }, - "PublishRequest": { + "StreamingPullRequest": { "fields": { - "topic": { + "subscription": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" } }, - "messages": { + "ackIds": { "rule": "repeated", - "type": "PubsubMessage", - "id": 2, + "type": "string", + "id": 2 + }, + "modifyDeadlineSeconds": { + "rule": "repeated", + "type": "int32", + "id": 3 + }, + "modifyDeadlineAckIds": { + "rule": "repeated", + "type": "string", + "id": 4 + }, + "streamAckDeadlineSeconds": { + "type": "int32", + "id": 5, "options": { "(google.api.field_behavior)": "REQUIRED" } + }, + "clientId": { + "type": "string", + "id": 6 } } }, - "PublishResponse": { + "StreamingPullResponse": { "fields": { - "messageIds": { + "receivedMessages": { "rule": "repeated", - "type": "string", + "type": "ReceivedMessage", "id": 1 } } }, - "ListTopicsRequest": { + "CreateSnapshotRequest": { "fields": { - "project": { + "name": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" } }, - "pageSize": { - "type": "int32", - "id": 2 + "subscription": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } }, - "pageToken": { + "labels": { + "keyType": "string", "type": "string", "id": 3 } } }, - "ListTopicsResponse": { + "UpdateSnapshotRequest": { "fields": { - "topics": { - "rule": "repeated", - "type": "Topic", - "id": 1 + "snapshot": { + "type": "Snapshot", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } }, - "nextPageToken": { - "type": "string", - "id": 2 + "updateMask": { + "type": "google.protobuf.FieldMask", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } } } }, - "ListTopicSubscriptionsRequest": { + "Snapshot": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Snapshot", + "(google.api.resource).pattern": "projects/{project}/snapshots/{snapshot}" + }, "fields": { + "name": { + "type": "string", + "id": 1 + }, "topic": { "type": "string", - "id": 1, + "id": 2, "options": { - "(google.api.field_behavior)": "REQUIRED", "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" } }, - "pageSize": { - "type": "int32", - "id": 2 + "expireTime": { + "type": "google.protobuf.Timestamp", + "id": 3 }, - "pageToken": { + "labels": { + "keyType": "string", "type": "string", - "id": 3 + "id": 4 } } }, - "ListTopicSubscriptionsResponse": { + "GetSnapshotRequest": { "fields": { - "subscriptions": { - "rule": "repeated", + "snapshot": { "type": "string", "id": 1, "options": { - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" } - }, - "nextPageToken": { - "type": "string", - "id": 2 } } }, - "ListTopicSnapshotsRequest": { + "ListSnapshotsRequest": { "fields": { - "topic": { + "project": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" } }, "pageSize": { @@ -1683,11 +942,11 @@ } } }, - "ListTopicSnapshotsResponse": { + "ListSnapshotsResponse": { "fields": { "snapshots": { "rule": "repeated", - "type": "string", + "type": "Snapshot", "id": 1 }, "nextPageToken": { @@ -1696,693 +955,1177 @@ } } }, - "DeleteTopicRequest": { + "DeleteSnapshotRequest": { "fields": { - "topic": { + "snapshot": { "type": "string", "id": 1, "options": { "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" } } } }, - "Subscriber": { - "options": { - "(google.api.default_host)": "pubsub.googleapis.com", - "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" - }, - "methods": { - "CreateSubscription": { - "requestType": "Subscription", - "responseType": "Subscription", - "options": { - "(google.api.http).put": "/v1/{name=projects/*/subscriptions/*}", - "(google.api.http).body": "*", - "(google.api.method_signature)": "name,topic,push_config,ack_deadline_seconds" - } - }, - "GetSubscription": { - "requestType": "GetSubscriptionRequest", - "responseType": "Subscription", - "options": { - "(google.api.http).get": "/v1/{subscription=projects/*/subscriptions/*}", - "(google.api.method_signature)": "subscription" - } - }, - "UpdateSubscription": { - "requestType": "UpdateSubscriptionRequest", - "responseType": "Subscription", - "options": { - "(google.api.http).patch": "/v1/{subscription.name=projects/*/subscriptions/*}", - "(google.api.http).body": "*" - } - }, - "ListSubscriptions": { - "requestType": "ListSubscriptionsRequest", - "responseType": "ListSubscriptionsResponse", - "options": { - "(google.api.http).get": "/v1/{project=projects/*}/subscriptions", - "(google.api.method_signature)": "project" - } - }, - "DeleteSubscription": { - "requestType": "DeleteSubscriptionRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).delete": "/v1/{subscription=projects/*/subscriptions/*}", - "(google.api.method_signature)": "subscription" - } - }, - "ModifyAckDeadline": { - "requestType": "ModifyAckDeadlineRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline", - "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,ack_ids,ack_deadline_seconds" - } - }, - "Acknowledge": { - "requestType": "AcknowledgeRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:acknowledge", - "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,ack_ids" - } - }, - "Pull": { - "requestType": "PullRequest", - "responseType": "PullResponse", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:pull", - "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,return_immediately,max_messages" - } - }, - "StreamingPull": { - "requestType": "StreamingPullRequest", - "requestStream": true, - "responseType": "StreamingPullResponse", - "responseStream": true - }, - "ModifyPushConfig": { - "requestType": "ModifyPushConfigRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig", - "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,push_config" - } - }, - "GetSnapshot": { - "requestType": "GetSnapshotRequest", - "responseType": "Snapshot", - "options": { - "(google.api.http).get": "/v1/{snapshot=projects/*/snapshots/*}", - "(google.api.method_signature)": "snapshot" - } - }, - "ListSnapshots": { - "requestType": "ListSnapshotsRequest", - "responseType": "ListSnapshotsResponse", - "options": { - "(google.api.http).get": "/v1/{project=projects/*}/snapshots", - "(google.api.method_signature)": "project" - } - }, - "CreateSnapshot": { - "requestType": "CreateSnapshotRequest", - "responseType": "Snapshot", - "options": { - "(google.api.http).put": "/v1/{name=projects/*/snapshots/*}", - "(google.api.http).body": "*", - "(google.api.method_signature)": "name,subscription" - } - }, - "UpdateSnapshot": { - "requestType": "UpdateSnapshotRequest", - "responseType": "Snapshot", + "SeekRequest": { + "oneofs": { + "target": { + "oneof": [ + "time", + "snapshot" + ] + } + }, + "fields": { + "subscription": { + "type": "string", + "id": 1, "options": { - "(google.api.http).patch": "/v1/{snapshot.name=projects/*/snapshots/*}", - "(google.api.http).body": "*" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" } }, - "DeleteSnapshot": { - "requestType": "DeleteSnapshotRequest", - "responseType": "google.protobuf.Empty", - "options": { - "(google.api.http).delete": "/v1/{snapshot=projects/*/snapshots/*}", - "(google.api.method_signature)": "snapshot" - } + "time": { + "type": "google.protobuf.Timestamp", + "id": 2 }, - "Seek": { - "requestType": "SeekRequest", - "responseType": "SeekResponse", + "snapshot": { + "type": "string", + "id": 3, "options": { - "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:seek", - "(google.api.http).body": "*" + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" } } } }, - "Subscription": { + "SeekResponse": { + "fields": {} + } + } + } + } + }, + "api": { + "options": { + "go_package": "google.golang.org/genproto/googleapis/api/annotations;annotations", + "java_multiple_files": true, + "java_outer_classname": "ResourceProto", + "java_package": "com.google.api", + "objc_class_prefix": "GAPI", + "cc_enable_arenas": true + }, + "nested": { + "http": { + "type": "HttpRule", + "id": 72295728, + "extend": "google.protobuf.MethodOptions" + }, + "Http": { + "fields": { + "rules": { + "rule": "repeated", + "type": "HttpRule", + "id": 1 + }, + "fullyDecodeReservedExpansion": { + "type": "bool", + "id": 2 + } + } + }, + "HttpRule": { + "oneofs": { + "pattern": { + "oneof": [ + "get", + "put", + "post", + "delete", + "patch", + "custom" + ] + } + }, + "fields": { + "selector": { + "type": "string", + "id": 1 + }, + "get": { + "type": "string", + "id": 2 + }, + "put": { + "type": "string", + "id": 3 + }, + "post": { + "type": "string", + "id": 4 + }, + "delete": { + "type": "string", + "id": 5 + }, + "patch": { + "type": "string", + "id": 6 + }, + "custom": { + "type": "CustomHttpPattern", + "id": 8 + }, + "body": { + "type": "string", + "id": 7 + }, + "responseBody": { + "type": "string", + "id": 12 + }, + "additionalBindings": { + "rule": "repeated", + "type": "HttpRule", + "id": 11 + } + } + }, + "CustomHttpPattern": { + "fields": { + "kind": { + "type": "string", + "id": 1 + }, + "path": { + "type": "string", + "id": 2 + } + } + }, + "methodSignature": { + "rule": "repeated", + "type": "string", + "id": 1051, + "extend": "google.protobuf.MethodOptions" + }, + "defaultHost": { + "type": "string", + "id": 1049, + "extend": "google.protobuf.ServiceOptions" + }, + "oauthScopes": { + "type": "string", + "id": 1050, + "extend": "google.protobuf.ServiceOptions" + }, + "fieldBehavior": { + "rule": "repeated", + "type": "google.api.FieldBehavior", + "id": 1052, + "extend": "google.protobuf.FieldOptions" + }, + "FieldBehavior": { + "values": { + "FIELD_BEHAVIOR_UNSPECIFIED": 0, + "OPTIONAL": 1, + "REQUIRED": 2, + "OUTPUT_ONLY": 3, + "INPUT_ONLY": 4, + "IMMUTABLE": 5 + } + }, + "resourceReference": { + "type": "google.api.ResourceReference", + "id": 1055, + "extend": "google.protobuf.FieldOptions" + }, + "resourceDefinition": { + "rule": "repeated", + "type": "google.api.ResourceDescriptor", + "id": 1053, + "extend": "google.protobuf.FileOptions" + }, + "resource": { + "type": "google.api.ResourceDescriptor", + "id": 1053, + "extend": "google.protobuf.MessageOptions" + }, + "ResourceDescriptor": { + "fields": { + "type": { + "type": "string", + "id": 1 + }, + "pattern": { + "rule": "repeated", + "type": "string", + "id": 2 + }, + "nameField": { + "type": "string", + "id": 3 + }, + "history": { + "type": "History", + "id": 4 + }, + "plural": { + "type": "string", + "id": 5 + }, + "singular": { + "type": "string", + "id": 6 + } + }, + "nested": { + "History": { + "values": { + "HISTORY_UNSPECIFIED": 0, + "ORIGINALLY_SINGLE_PATTERN": 1, + "FUTURE_MULTI_PATTERN": 2 + } + } + } + }, + "ResourceReference": { + "fields": { + "type": { + "type": "string", + "id": 1 + }, + "childType": { + "type": "string", + "id": 2 + } + } + } + } + }, + "protobuf": { + "options": { + "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", + "java_package": "com.google.protobuf", + "java_outer_classname": "DescriptorProtos", + "csharp_namespace": "Google.Protobuf.Reflection", + "objc_class_prefix": "GPB", + "cc_enable_arenas": true, + "optimize_for": "SPEED" + }, + "nested": { + "FileDescriptorSet": { + "fields": { + "file": { + "rule": "repeated", + "type": "FileDescriptorProto", + "id": 1 + } + } + }, + "FileDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "package": { + "type": "string", + "id": 2 + }, + "dependency": { + "rule": "repeated", + "type": "string", + "id": 3 + }, + "publicDependency": { + "rule": "repeated", + "type": "int32", + "id": 10, + "options": { + "packed": false + } + }, + "weakDependency": { + "rule": "repeated", + "type": "int32", + "id": 11, "options": { - "(google.api.resource).type": "pubsub.googleapis.com/Subscription", - "(google.api.resource).pattern": "projects/{project}/subscriptions/{subscription}" - }, + "packed": false + } + }, + "messageType": { + "rule": "repeated", + "type": "DescriptorProto", + "id": 4 + }, + "enumType": { + "rule": "repeated", + "type": "EnumDescriptorProto", + "id": 5 + }, + "service": { + "rule": "repeated", + "type": "ServiceDescriptorProto", + "id": 6 + }, + "extension": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 7 + }, + "options": { + "type": "FileOptions", + "id": 8 + }, + "sourceCodeInfo": { + "type": "SourceCodeInfo", + "id": 9 + }, + "syntax": { + "type": "string", + "id": 12 + } + } + }, + "DescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "field": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 2 + }, + "extension": { + "rule": "repeated", + "type": "FieldDescriptorProto", + "id": 6 + }, + "nestedType": { + "rule": "repeated", + "type": "DescriptorProto", + "id": 3 + }, + "enumType": { + "rule": "repeated", + "type": "EnumDescriptorProto", + "id": 4 + }, + "extensionRange": { + "rule": "repeated", + "type": "ExtensionRange", + "id": 5 + }, + "oneofDecl": { + "rule": "repeated", + "type": "OneofDescriptorProto", + "id": 8 + }, + "options": { + "type": "MessageOptions", + "id": 7 + }, + "reservedRange": { + "rule": "repeated", + "type": "ReservedRange", + "id": 9 + }, + "reservedName": { + "rule": "repeated", + "type": "string", + "id": 10 + } + }, + "nested": { + "ExtensionRange": { "fields": { - "name": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "topic": { - "type": "string", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" - } - }, - "pushConfig": { - "type": "PushConfig", - "id": 4 - }, - "ackDeadlineSeconds": { + "start": { "type": "int32", - "id": 5 - }, - "retainAckedMessages": { - "type": "bool", - "id": 7 - }, - "messageRetentionDuration": { - "type": "google.protobuf.Duration", - "id": 8 - }, - "labels": { - "keyType": "string", - "type": "string", - "id": 9 - }, - "enableMessageOrdering": { - "type": "bool", - "id": 10 - }, - "expirationPolicy": { - "type": "ExpirationPolicy", - "id": 11 + "id": 1 }, - "filter": { - "type": "string", - "id": 12 + "end": { + "type": "int32", + "id": 2 }, - "deadLetterPolicy": { - "type": "DeadLetterPolicy", - "id": 13 + "options": { + "type": "ExtensionRangeOptions", + "id": 3 + } + } + }, + "ReservedRange": { + "fields": { + "start": { + "type": "int32", + "id": 1 }, - "retryPolicy": { - "type": "RetryPolicy", - "id": 14 + "end": { + "type": "int32", + "id": 2 } } + } + } + }, + "ExtensionRangeOptions": { + "fields": { + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "FieldDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "number": { + "type": "int32", + "id": 3 + }, + "label": { + "type": "Label", + "id": 4 + }, + "type": { + "type": "Type", + "id": 5 + }, + "typeName": { + "type": "string", + "id": 6 + }, + "extendee": { + "type": "string", + "id": 2 + }, + "defaultValue": { + "type": "string", + "id": 7 + }, + "oneofIndex": { + "type": "int32", + "id": 9 + }, + "jsonName": { + "type": "string", + "id": 10 + }, + "options": { + "type": "FieldOptions", + "id": 8 + } + }, + "nested": { + "Type": { + "values": { + "TYPE_DOUBLE": 1, + "TYPE_FLOAT": 2, + "TYPE_INT64": 3, + "TYPE_UINT64": 4, + "TYPE_INT32": 5, + "TYPE_FIXED64": 6, + "TYPE_FIXED32": 7, + "TYPE_BOOL": 8, + "TYPE_STRING": 9, + "TYPE_GROUP": 10, + "TYPE_MESSAGE": 11, + "TYPE_BYTES": 12, + "TYPE_UINT32": 13, + "TYPE_ENUM": 14, + "TYPE_SFIXED32": 15, + "TYPE_SFIXED64": 16, + "TYPE_SINT32": 17, + "TYPE_SINT64": 18 + } }, - "RetryPolicy": { - "fields": { - "minimumBackoff": { - "type": "google.protobuf.Duration", - "id": 1 - }, - "maximumBackoff": { - "type": "google.protobuf.Duration", - "id": 2 - } + "Label": { + "values": { + "LABEL_OPTIONAL": 1, + "LABEL_REQUIRED": 2, + "LABEL_REPEATED": 3 } + } + } + }, + "OneofDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 }, - "DeadLetterPolicy": { + "options": { + "type": "OneofOptions", + "id": 2 + } + } + }, + "EnumDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "value": { + "rule": "repeated", + "type": "EnumValueDescriptorProto", + "id": 2 + }, + "options": { + "type": "EnumOptions", + "id": 3 + }, + "reservedRange": { + "rule": "repeated", + "type": "EnumReservedRange", + "id": 4 + }, + "reservedName": { + "rule": "repeated", + "type": "string", + "id": 5 + } + }, + "nested": { + "EnumReservedRange": { "fields": { - "deadLetterTopic": { - "type": "string", + "start": { + "type": "int32", "id": 1 }, - "maxDeliveryAttempts": { + "end": { "type": "int32", "id": 2 } } + } + } + }, + "EnumValueDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 }, - "ExpirationPolicy": { - "fields": { - "ttl": { - "type": "google.protobuf.Duration", - "id": 1 - } + "number": { + "type": "int32", + "id": 2 + }, + "options": { + "type": "EnumValueOptions", + "id": 3 + } + } + }, + "ServiceDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "method": { + "rule": "repeated", + "type": "MethodDescriptorProto", + "id": 2 + }, + "options": { + "type": "ServiceOptions", + "id": 3 + } + } + }, + "MethodDescriptorProto": { + "fields": { + "name": { + "type": "string", + "id": 1 + }, + "inputType": { + "type": "string", + "id": 2 + }, + "outputType": { + "type": "string", + "id": 3 + }, + "options": { + "type": "MethodOptions", + "id": 4 + }, + "clientStreaming": { + "type": "bool", + "id": 5, + "options": { + "default": false } }, - "PushConfig": { - "oneofs": { - "authenticationMethod": { - "oneof": [ - "oidcToken" - ] - } - }, - "fields": { - "pushEndpoint": { - "type": "string", - "id": 1 - }, - "attributes": { - "keyType": "string", - "type": "string", - "id": 2 - }, - "oidcToken": { - "type": "OidcToken", - "id": 3 - } - }, - "nested": { - "OidcToken": { - "fields": { - "serviceAccountEmail": { - "type": "string", - "id": 1 - }, - "audience": { - "type": "string", - "id": 2 - } - } - } + "serverStreaming": { + "type": "bool", + "id": 6, + "options": { + "default": false + } + } + } + }, + "FileOptions": { + "fields": { + "javaPackage": { + "type": "string", + "id": 1 + }, + "javaOuterClassname": { + "type": "string", + "id": 8 + }, + "javaMultipleFiles": { + "type": "bool", + "id": 10, + "options": { + "default": false + } + }, + "javaGenerateEqualsAndHash": { + "type": "bool", + "id": 20, + "options": { + "deprecated": true + } + }, + "javaStringCheckUtf8": { + "type": "bool", + "id": 27, + "options": { + "default": false + } + }, + "optimizeFor": { + "type": "OptimizeMode", + "id": 9, + "options": { + "default": "SPEED" + } + }, + "goPackage": { + "type": "string", + "id": 11 + }, + "ccGenericServices": { + "type": "bool", + "id": 16, + "options": { + "default": false + } + }, + "javaGenericServices": { + "type": "bool", + "id": 17, + "options": { + "default": false + } + }, + "pyGenericServices": { + "type": "bool", + "id": 18, + "options": { + "default": false + } + }, + "phpGenericServices": { + "type": "bool", + "id": 42, + "options": { + "default": false } }, - "ReceivedMessage": { - "fields": { - "ackId": { - "type": "string", - "id": 1 - }, - "message": { - "type": "PubsubMessage", - "id": 2 - }, - "deliveryAttempt": { - "type": "int32", - "id": 3 - } + "deprecated": { + "type": "bool", + "id": 23, + "options": { + "default": false } }, - "GetSubscriptionRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - } + "ccEnableArenas": { + "type": "bool", + "id": 31, + "options": { + "default": false } }, - "UpdateSubscriptionRequest": { - "fields": { - "subscription": { - "type": "Subscription", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "updateMask": { - "type": "google.protobuf.FieldMask", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } + "objcClassPrefix": { + "type": "string", + "id": 36 + }, + "csharpNamespace": { + "type": "string", + "id": 37 + }, + "swiftPrefix": { + "type": "string", + "id": 39 + }, + "phpClassPrefix": { + "type": "string", + "id": 40 + }, + "phpNamespace": { + "type": "string", + "id": 41 + }, + "phpMetadataNamespace": { + "type": "string", + "id": 44 + }, + "rubyPackage": { + "type": "string", + "id": 45 + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 38, + 38 + ] + ], + "nested": { + "OptimizeMode": { + "values": { + "SPEED": 1, + "CODE_SIZE": 2, + "LITE_RUNTIME": 3 + } + } + } + }, + "MessageOptions": { + "fields": { + "messageSetWireFormat": { + "type": "bool", + "id": 1, + "options": { + "default": false } }, - "ListSubscriptionsRequest": { - "fields": { - "project": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" - } - }, - "pageSize": { - "type": "int32", - "id": 2 - }, - "pageToken": { - "type": "string", - "id": 3 - } + "noStandardDescriptorAccessor": { + "type": "bool", + "id": 2, + "options": { + "default": false } }, - "ListSubscriptionsResponse": { - "fields": { - "subscriptions": { - "rule": "repeated", - "type": "Subscription", - "id": 1 - }, - "nextPageToken": { - "type": "string", - "id": 2 - } + "deprecated": { + "type": "bool", + "id": 3, + "options": { + "default": false } }, - "DeleteSubscriptionRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - } + "mapEntry": { + "type": "bool", + "id": 7 + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 8, + 8 + ], + [ + 9, + 9 + ] + ] + }, + "FieldOptions": { + "fields": { + "ctype": { + "type": "CType", + "id": 1, + "options": { + "default": "STRING" } }, - "ModifyPushConfigRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "pushConfig": { - "type": "PushConfig", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } + "packed": { + "type": "bool", + "id": 2 + }, + "jstype": { + "type": "JSType", + "id": 6, + "options": { + "default": "JS_NORMAL" } }, - "PullRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "returnImmediately": { - "type": "bool", - "id": 2, - "options": { - "deprecated": true, - "(google.api.field_behavior)": "OPTIONAL" - } - }, - "maxMessages": { - "type": "int32", - "id": 3, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } + "lazy": { + "type": "bool", + "id": 5, + "options": { + "default": false + } + }, + "deprecated": { + "type": "bool", + "id": 3, + "options": { + "default": false } }, - "PullResponse": { - "fields": { - "receivedMessages": { - "rule": "repeated", - "type": "ReceivedMessage", - "id": 1 - } + "weak": { + "type": "bool", + "id": 10, + "options": { + "default": false } }, - "ModifyAckDeadlineRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "ackIds": { - "rule": "repeated", - "type": "string", - "id": 4, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "ackDeadlineSeconds": { - "type": "int32", - "id": 3, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 4, + 4 + ] + ], + "nested": { + "CType": { + "values": { + "STRING": 0, + "CORD": 1, + "STRING_PIECE": 2 } }, - "AcknowledgeRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "ackIds": { - "rule": "repeated", - "type": "string", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } + "JSType": { + "values": { + "JS_NORMAL": 0, + "JS_STRING": 1, + "JS_NUMBER": 2 } + } + } + }, + "OneofOptions": { + "fields": { + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "EnumOptions": { + "fields": { + "allowAlias": { + "type": "bool", + "id": 2 }, - "StreamingPullRequest": { - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "ackIds": { - "rule": "repeated", - "type": "string", - "id": 2 - }, - "modifyDeadlineSeconds": { - "rule": "repeated", - "type": "int32", - "id": 3 - }, - "modifyDeadlineAckIds": { - "rule": "repeated", - "type": "string", - "id": 4 - }, - "streamAckDeadlineSeconds": { - "type": "int32", - "id": 5, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "clientId": { - "type": "string", - "id": 6 - } + "deprecated": { + "type": "bool", + "id": 3, + "options": { + "default": false } }, - "StreamingPullResponse": { - "fields": { - "receivedMessages": { - "rule": "repeated", - "type": "ReceivedMessage", - "id": 1 - } + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "reserved": [ + [ + 5, + 5 + ] + ] + }, + "EnumValueOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 1, + "options": { + "default": false } }, - "CreateSnapshotRequest": { - "fields": { - "name": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" - } - }, - "subscription": { - "type": "string", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } - }, - "labels": { - "keyType": "string", - "type": "string", - "id": 3 - } + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "ServiceOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 33, + "options": { + "default": false + } + }, + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, + "MethodOptions": { + "fields": { + "deprecated": { + "type": "bool", + "id": 33, + "options": { + "default": false + } + }, + "idempotencyLevel": { + "type": "IdempotencyLevel", + "id": 34, + "options": { + "default": "IDEMPOTENCY_UNKNOWN" } }, - "UpdateSnapshotRequest": { - "fields": { - "snapshot": { - "type": "Snapshot", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - }, - "updateMask": { - "type": "google.protobuf.FieldMask", - "id": 2, - "options": { - "(google.api.field_behavior)": "REQUIRED" - } - } + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ], + "nested": { + "IdempotencyLevel": { + "values": { + "IDEMPOTENCY_UNKNOWN": 0, + "NO_SIDE_EFFECTS": 1, + "IDEMPOTENT": 2 } + } + } + }, + "UninterpretedOption": { + "fields": { + "name": { + "rule": "repeated", + "type": "NamePart", + "id": 2 }, - "Snapshot": { - "options": { - "(google.api.resource).type": "pubsub.googleapis.com/Snapshot", - "(google.api.resource).pattern": "projects/{project}/snapshots/{snapshot}" - }, + "identifierValue": { + "type": "string", + "id": 3 + }, + "positiveIntValue": { + "type": "uint64", + "id": 4 + }, + "negativeIntValue": { + "type": "int64", + "id": 5 + }, + "doubleValue": { + "type": "double", + "id": 6 + }, + "stringValue": { + "type": "bytes", + "id": 7 + }, + "aggregateValue": { + "type": "string", + "id": 8 + } + }, + "nested": { + "NamePart": { "fields": { - "name": { + "namePart": { + "rule": "required", "type": "string", "id": 1 }, - "topic": { - "type": "string", - "id": 2, - "options": { - "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" - } - }, - "expireTime": { - "type": "google.protobuf.Timestamp", - "id": 3 - }, - "labels": { - "keyType": "string", - "type": "string", - "id": 4 - } - } - }, - "GetSnapshotRequest": { - "fields": { - "snapshot": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" - } + "isExtension": { + "rule": "required", + "type": "bool", + "id": 2 } } - }, - "ListSnapshotsRequest": { + } + } + }, + "SourceCodeInfo": { + "fields": { + "location": { + "rule": "repeated", + "type": "Location", + "id": 1 + } + }, + "nested": { + "Location": { "fields": { - "project": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" - } + "path": { + "rule": "repeated", + "type": "int32", + "id": 1 }, - "pageSize": { + "span": { + "rule": "repeated", "type": "int32", "id": 2 }, - "pageToken": { + "leadingComments": { "type": "string", "id": 3 + }, + "trailingComments": { + "type": "string", + "id": 4 + }, + "leadingDetachedComments": { + "rule": "repeated", + "type": "string", + "id": 6 } } - }, - "ListSnapshotsResponse": { + } + } + }, + "GeneratedCodeInfo": { + "fields": { + "annotation": { + "rule": "repeated", + "type": "Annotation", + "id": 1 + } + }, + "nested": { + "Annotation": { "fields": { - "snapshots": { + "path": { "rule": "repeated", - "type": "Snapshot", + "type": "int32", "id": 1 }, - "nextPageToken": { + "sourceFile": { "type": "string", "id": 2 - } - } - }, - "DeleteSnapshotRequest": { - "fields": { - "snapshot": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" - } - } - } - }, - "SeekRequest": { - "oneofs": { - "target": { - "oneof": [ - "time", - "snapshot" - ] - } - }, - "fields": { - "subscription": { - "type": "string", - "id": 1, - "options": { - "(google.api.field_behavior)": "REQUIRED", - "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" - } }, - "time": { - "type": "google.protobuf.Timestamp", - "id": 2 + "begin": { + "type": "int32", + "id": 3 }, - "snapshot": { - "type": "string", - "id": 3, - "options": { - "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" - } + "end": { + "type": "int32", + "id": 4 } } + } + } + }, + "Duration": { + "fields": { + "seconds": { + "type": "int64", + "id": 1 }, - "SeekResponse": { - "fields": {} + "nanos": { + "type": "int32", + "id": 2 + } + } + }, + "Empty": { + "fields": {} + }, + "FieldMask": { + "fields": { + "paths": { + "rule": "repeated", + "type": "string", + "id": 1 + } + } + }, + "Timestamp": { + "fields": { + "seconds": { + "type": "int64", + "id": 1 + }, + "nanos": { + "type": "int32", + "id": 2 } } } diff --git a/handwritten/pubsub/src/helper.ts b/handwritten/pubsub/src/helper.ts deleted file mode 100644 index c81bffa7b77..00000000000 --- a/handwritten/pubsub/src/helper.ts +++ /dev/null @@ -1,262 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -// ** This file is automatically generated by gapic-generator-typescript. ** -// ** https://github.com/googleapis/gapic-generator-typescript ** -// ** All changes to this file may be overwritten. ** - -import * as gax from 'google-gax'; -import {Descriptors, ClientOptions} from 'google-gax'; -import * as path from 'path'; -import * as gapicConfig from './iam_policy_service_client_config.json'; -import {ProjectIdCallback} from 'google-auth-library'; -import * as protosTypes from '../protos/protos'; -// eslint-disable-next-line @typescript-eslint/no-var-requires -const {version} = require('../../package.json'); -/** - * Google Cloud IAM Client. - * This is manually written for providing methods [setIamPolicy, getIamPolicy, testIamPerssion] to the KMS client. - * We don't support it now in micro-generators. - * New feature request link: [https://github.com/googleapis/gapic-generator-typescript/issues/315] - */ -export class IamClient { - private _descriptors: Descriptors = {page: {}, stream: {}, longrunning: {}}; - private _innerApiCalls: {[name: string]: Function} = {}; - private _terminated = false; - auth: gax.GoogleAuth; - - constructor(opts?: ClientOptions) { - // Ensure that options include the service address and port. - const staticMembers = this.constructor as typeof IamClient; - const servicePath = - opts && opts.servicePath - ? opts.servicePath - : opts && opts.apiEndpoint - ? opts.apiEndpoint - : staticMembers.servicePath; - const port = opts && opts.port ? opts.port : staticMembers.port; - - if (!opts) { - opts = {servicePath, port}; - } - opts.servicePath = opts.servicePath || servicePath; - opts.port = opts.port || port; - opts.clientConfig = opts.clientConfig || {}; - - const isBrowser = typeof window !== 'undefined'; - if (isBrowser) { - opts.fallback = true; - } - const gaxModule = !isBrowser && opts.fallback ? gax.fallback : gax; - - // Create a `gaxGrpc` object, with any grpc-specific options - // sent to the client. - opts.scopes = (this.constructor as typeof IamClient).scopes; - const gaxGrpc = new gaxModule.GrpcClient(opts); - - // Save the auth object to the client, for use by other methods. - this.auth = gaxGrpc.auth as gax.GoogleAuth; - const clientHeader = [`gax/${gaxModule.version}`, `gapic/${version}`]; - if (typeof process !== 'undefined' && 'versions' in process) { - clientHeader.push(`gl-node/${process.versions.node}`); - } else { - clientHeader.push(`gl-web/${gaxModule.version}`); - } - if (!opts.fallback) { - clientHeader.push(`grpc/${gaxGrpc.grpcVersion}`); - } - if (opts.libName && opts.libVersion) { - clientHeader.push(`${opts.libName}/${opts.libVersion}`); - } - const nodejsProtoPath = path.join(__dirname, '..', 'protos', 'protos.json'); - - const protos = gaxGrpc.loadProto( - opts.fallback ? require('../protos/protos.json') : nodejsProtoPath - ); - // Put together the default options sent with requests. - const defaults = gaxGrpc.constructSettings( - 'google.iam.v1.IAMPolicy', - gapicConfig as gax.ClientConfig, - opts!.clientConfig || {}, - {'x-goog-api-client': clientHeader.join(' ')} - ); - // Put together the "service stub" for - // google.iam.v1.IAMPolicy. - const iamPolicyStub = gaxGrpc.createStub( - opts.fallback - ? (protos as protobuf.Root).lookupService('google.iam.v1.IAMPolicy') - : // eslint-disable-next-line @typescript-eslint/no-explicit-any - (protos as any).google.iam.v1.IAMPolicy, - opts - ) as Promise<{[method: string]: Function}>; - this._innerApiCalls = {}; - // Iterate over each of the methods that the service provides - // and create an API call method for each. - const iamPolicyStubMethods = [ - 'getIamPolicy', - 'setIamPolicy', - 'testIamPermissions', - ]; - - for (const methodName of iamPolicyStubMethods) { - const innerCallPromise = iamPolicyStub.then( - stub => (...args: Array<{}>) => { - if (this._terminated) { - return Promise.reject('The client has already been closed.'); - } - // eslint-disable-next-line prefer-spread - return stub[methodName].apply(stub, args); - }, - (err: Error | null | undefined) => () => { - throw err; - } - ); - this._innerApiCalls[methodName] = gaxModule.createApiCall( - innerCallPromise, - defaults[methodName], - this._descriptors.page[methodName] - ); - } - } - - /** - * The DNS address for this API service. - */ - static get servicePath() { - return 'cloudkms.googleapis.com'; - } - - /** - * The DNS address for this API service - same as servicePath(), - * exists for compatibility reasons. - */ - static get apiEndpoint() { - return 'cloudkms.googleapis.com'; - } - - /** - * The port for this API service. - */ - static get port() { - return 443; - } - /** - * The scopes needed to make gRPC calls for every method defined - * in this service. - */ - static get scopes() { - return [ - 'https://www.googleapis.com/auth/cloud-platform', - 'https://www.googleapis.com/auth/cloudkms', - ]; - } - /** - * Return the project ID used by this class. - * @param {function(Error, string)} callback - the callback to - * be called with the current project Id. - */ - getProjectId(callback: ProjectIdCallback) { - return this.auth.getProjectId(callback); - } - - getIamPolicy(request: protosTypes.google.iam.v1.GetIamPolicyRequest): void; - getIamPolicy( - request: protosTypes.google.iam.v1.GetIamPolicyRequest, - options?: gax.CallOptions, - callback?: protosTypes.google.iam.v1.IAMPolicy.GetIamPolicyCallback - ): Promise { - if (options instanceof Function && callback === undefined) { - callback = (options as unknown) as protosTypes.google.iam.v1.IAMPolicy.GetIamPolicyCallback; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - return this._innerApiCalls.getIamPolicy(request, options, callback); - } - setIamPolicy(request: protosTypes.google.iam.v1.SetIamPolicyRequest): void; - setIamPolicy( - request: protosTypes.google.iam.v1.SetIamPolicyRequest, - options?: gax.CallOptions, - callback?: protosTypes.google.iam.v1.IAMPolicy.SetIamPolicyCallback - ): Promise { - if (options instanceof Function && callback === undefined) { - callback = (options as unknown) as protosTypes.google.iam.v1.IAMPolicy.SetIamPolicyCallback; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - - return this._innerApiCalls.setIamPolicy(request, options, callback); - } - testIamPermissions( - request: protosTypes.google.iam.v1.TestIamPermissionsRequest - ): void; - testIamPermissions( - request: protosTypes.google.iam.v1.TestIamPermissionsRequest, - options?: gax.CallOptions, - callback?: protosTypes.google.iam.v1.IAMPolicy.TestIamPermissionsCallback - ): Promise { - if (options instanceof Function && callback === undefined) { - callback = (options as unknown) as protosTypes.google.iam.v1.IAMPolicy.TestIamPermissionsCallback; - options = {}; - } - request = request || {}; - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - resource: request.resource, - }); - - return this._innerApiCalls.testIamPermissions(request, options, callback); - } -} -export interface IamClient { - getIamPolicy(request: protosTypes.google.iam.v1.GetIamPolicyRequest): void; - getIamPolicy( - request: protosTypes.google.iam.v1.GetIamPolicyRequest, - options?: gax.CallOptions, - callback?: protosTypes.google.iam.v1.IAMPolicy.GetIamPolicyCallback - ): Promise; - setIamPolicy(request: protosTypes.google.iam.v1.SetIamPolicyRequest): void; - setIamPolicy( - request: protosTypes.google.iam.v1.SetIamPolicyRequest, - options?: gax.CallOptions, - callback?: protosTypes.google.iam.v1.IAMPolicy.SetIamPolicyCallback - ): Promise; - testIamPermissions( - request: protosTypes.google.iam.v1.TestIamPermissionsRequest - ): void; - testIamPermissions( - request: protosTypes.google.iam.v1.TestIamPermissionsRequest, - options?: gax.CallOptions, - callback?: protosTypes.google.iam.v1.IAMPolicy.TestIamPermissionsCallback - ): Promise; -} diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index a3096bdbf2c..62acbb79eda 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -20,7 +20,7 @@ import {promisifyAll} from '@google-cloud/promisify'; import arrify = require('arrify'); -import {CallOptions} from 'google-gax'; +import {CallOptions, IamProtos} from 'google-gax'; import {google} from '../protos/protos'; @@ -28,7 +28,7 @@ import {Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; export type Policy = { etag?: string | Buffer; -} & Omit; +} & Omit; export type GetPolicyCallback = RequestCallback; export type SetPolicyCallback = RequestCallback; @@ -47,11 +47,11 @@ export interface IamPermissionsMap { export type TestIamPermissionsResponse = [ IamPermissionsMap, - google.iam.v1.ITestIamPermissionsResponse + IamProtos.google.iam.v1.ITestIamPermissionsResponse ]; export type TestIamPermissionsCallback = ResourceCallback< IamPermissionsMap, - google.iam.v1.ITestIamPermissionsResponse + IamProtos.google.iam.v1.ITestIamPermissionsResponse >; /** @@ -370,7 +370,7 @@ export class IAM { permissions: arrify(permissions), }; - this.request( + this.request( { client: 'SubscriberClient', method: 'testIamPermissions', diff --git a/handwritten/pubsub/src/iam_policy_service_client_config.json b/handwritten/pubsub/src/iam_policy_service_client_config.json deleted file mode 100644 index a63e357559b..00000000000 --- a/handwritten/pubsub/src/iam_policy_service_client_config.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "interfaces": { - "google.iam.v1.IAMPolicy": { - "retry_codes": { - "non_idempotent": [], - "idempotent": [ - "DEADLINE_EXCEEDED", - "UNAVAILABLE" - ] - }, - "retry_params": { - "default": { - "initial_retry_delay_millis": 100, - "retry_delay_multiplier": 1.3, - "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 20000, - "rpc_timeout_multiplier": 1, - "max_rpc_timeout_millis": 20000, - "total_timeout_millis": 600000 - } - }, - "methods": { - "GetIamPolicy": { - "retry_codes_name": "non_idempotent", - "retry_params_name": "default" - }, - "SetIamPolicy": { - "retry_codes_name": "non_idempotent", - "retry_params_name": "default" - }, - "TestIamPermissions": { - "retry_codes_name": "non_idempotent", - "retry_params_name": "default" - } - } - } - } -} diff --git a/handwritten/pubsub/src/service_proto_list.json b/handwritten/pubsub/src/service_proto_list.json deleted file mode 100644 index 03bfe23c6c1..00000000000 --- a/handwritten/pubsub/src/service_proto_list.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "../../protos/google/iam/v1/policy.proto", - "../../protos/google/iam/v1/options.proto", - "../../protos/google/iam/v1/iam_policy.proto" -] diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 257b403fae7..2639e16777d 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -24,6 +24,8 @@ import { ClientOptions, PaginationCallback, GaxCall, + IamClient, + IamProtos, } from 'google-gax'; import * as path from 'path'; @@ -31,7 +33,6 @@ import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; import * as gapicConfig from './publisher_client_config.json'; -import {IamClient} from '../helper'; const version = require('../../../package.json').version; @@ -43,7 +44,6 @@ const version = require('../../../package.json').version; */ export class PublisherClient { private _terminated = false; - private _iamClient: IamClient; private _opts: ClientOptions; private _gaxModule: typeof gax | typeof gax.fallback; private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; @@ -57,6 +57,7 @@ export class PublisherClient { batching: {}, }; innerApiCalls: {[name: string]: Function}; + iamClient: IamClient; pathTemplates: {[name: string]: gax.PathTemplate}; publisherStub?: Promise<{[name: string]: Function}>; @@ -123,8 +124,8 @@ export class PublisherClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + this.iamClient = new IamClient(this._gaxGrpc, opts); - this._iamClient = new IamClient(opts); // Determine the client header string. const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; if (typeof process !== 'undefined' && 'versions' in process) { @@ -1394,6 +1395,146 @@ export class PublisherClient { callSettings ) as AsyncIterable; } + /** + * Gets the access control policy for a resource. Returns an empty policy + * if the resource exists and does not have a policy set. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {Object} [request.options] + * OPTIONAL: A `GetPolicyOptions` object for specifying options to + * `GetIamPolicy`. This field is only used by Cloud IAM. + * + * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + getIamPolicy( + request: IamProtos.google.iam.v1.GetIamPolicyRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.getIamPolicy(request, options, callback); + } + + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. + * + * Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization + * checking. This operation may "fail open" without warning. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + setIamPolicy( + request: IamProtos.google.iam.v1.SetIamPolicyRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.setIamPolicy(request, options, callback); + } + + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. + * + * Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization + * checking. This operation may "fail open" without warning. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + */ + testIamPermissions( + request: IamProtos.google.iam.v1.TestIamPermissionsRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.TestIamPermissionsResponse, + IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.TestIamPermissionsResponse, + IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.testIamPermissions(request, options, callback); + } + // -------------------- // -- Path templates -- // -------------------- @@ -1548,36 +1689,4 @@ export class PublisherClient { } return Promise.resolve(); } - /** - * This part will be added into src/v1/key_management_service_client.ts by synth.py. - * KMS service requires IAM client for [setIamPolicy, getIamPolicy, testIamPerssion] methods. - * But we don't support it now in micro-generators for rerouting one service to another and mix them in. - * New feature request link: [https://github.com/googleapis/gapic-generator-typescript/issues/315] - * - * So this is manually written for providing methods to the KMS client. - * IamClient is created for KMS client in the constructor using src/helper.ts. - * [setIamPolicy, getIamPolicy, testIamPerssion] methods are created which is calling the corresponding methods from IamClient in `helper.ts`. - */ - - getIamPolicy( - request: protos.google.iam.v1.GetIamPolicyRequest, - options: gax.CallOptions, - callback: protos.google.iam.v1.IAMPolicy.GetIamPolicyCallback - ) { - return this._iamClient.getIamPolicy(request, options, callback); - } - setIamPolicy( - request: protos.google.iam.v1.SetIamPolicyRequest, - options: gax.CallOptions, - callback: protos.google.iam.v1.IAMPolicy.SetIamPolicyCallback - ) { - return this._iamClient.setIamPolicy(request, options, callback); - } - testIamPermissions( - request: protos.google.iam.v1.TestIamPermissionsRequest, - options: gax.CallOptions, - callback?: protos.google.iam.v1.IAMPolicy.TestIamPermissionsCallback - ) { - return this._iamClient.testIamPermissions(request, options, callback); - } } diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 9a0801050a3..c0abc53dae4 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -24,6 +24,8 @@ import { ClientOptions, PaginationCallback, GaxCall, + IamClient, + IamProtos, } from 'google-gax'; import * as path from 'path'; @@ -31,7 +33,6 @@ import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; import * as gapicConfig from './subscriber_client_config.json'; -import {IamClient} from '../helper'; const version = require('../../../package.json').version; @@ -44,7 +45,6 @@ const version = require('../../../package.json').version; */ export class SubscriberClient { private _terminated = false; - private _iamClient: IamClient; private _opts: ClientOptions; private _gaxModule: typeof gax | typeof gax.fallback; private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; @@ -58,6 +58,7 @@ export class SubscriberClient { batching: {}, }; innerApiCalls: {[name: string]: Function}; + iamClient: IamClient; pathTemplates: {[name: string]: gax.PathTemplate}; subscriberStub?: Promise<{[name: string]: Function}>; @@ -124,8 +125,8 @@ export class SubscriberClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + this.iamClient = new IamClient(this._gaxGrpc, opts); - this._iamClient = new IamClient(opts); // Determine the client header string. const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; if (typeof process !== 'undefined' && 'versions' in process) { @@ -2054,6 +2055,146 @@ export class SubscriberClient { callSettings ) as AsyncIterable; } + /** + * Gets the access control policy for a resource. Returns an empty policy + * if the resource exists and does not have a policy set. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {Object} [request.options] + * OPTIONAL: A `GetPolicyOptions` object for specifying options to + * `GetIamPolicy`. This field is only used by Cloud IAM. + * + * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + getIamPolicy( + request: IamProtos.google.iam.v1.GetIamPolicyRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.getIamPolicy(request, options, callback); + } + + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. + * + * Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization + * checking. This operation may "fail open" without warning. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + setIamPolicy( + request: IamProtos.google.iam.v1.SetIamPolicyRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.setIamPolicy(request, options, callback); + } + + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. + * + * Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization + * checking. This operation may "fail open" without warning. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + */ + testIamPermissions( + request: IamProtos.google.iam.v1.TestIamPermissionsRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.TestIamPermissionsResponse, + IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.TestIamPermissionsResponse, + IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.testIamPermissions(request, options, callback); + } + // -------------------- // -- Path templates -- // -------------------- @@ -2208,36 +2349,4 @@ export class SubscriberClient { } return Promise.resolve(); } - /** - * This part will be added into src/v1/key_management_service_client.ts by synth.py. - * KMS service requires IAM client for [setIamPolicy, getIamPolicy, testIamPerssion] methods. - * But we don't support it now in micro-generators for rerouting one service to another and mix them in. - * New feature request link: [https://github.com/googleapis/gapic-generator-typescript/issues/315] - * - * So this is manually written for providing methods to the KMS client. - * IamClient is created for KMS client in the constructor using src/helper.ts. - * [setIamPolicy, getIamPolicy, testIamPerssion] methods are created which is calling the corresponding methods from IamClient in `helper.ts`. - */ - - getIamPolicy( - request: protos.google.iam.v1.GetIamPolicyRequest, - options: gax.CallOptions, - callback: protos.google.iam.v1.IAMPolicy.GetIamPolicyCallback - ) { - return this._iamClient.getIamPolicy(request, options, callback); - } - setIamPolicy( - request: protos.google.iam.v1.SetIamPolicyRequest, - options: gax.CallOptions, - callback: protos.google.iam.v1.IAMPolicy.SetIamPolicyCallback - ) { - return this._iamClient.setIamPolicy(request, options, callback); - } - testIamPermissions( - request: protos.google.iam.v1.TestIamPermissionsRequest, - options: gax.CallOptions, - callback?: protos.google.iam.v1.IAMPolicy.TestIamPermissionsCallback - ) { - return this._iamClient.testIamPermissions(request, options, callback); - } } diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index a1247e01afd..0386c935e54 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -3,24 +3,23 @@ { "git": { "name": ".", - "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "7b14efcf4d6ae595c9a987de9258c31ffad493a6" + "remote": "git@github.com:googleapis/nodejs-pubsub.git", + "sha": "e85fcd0e8aa9ff3c67257ebc04a1e7c42b1ec207" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "26523a96798ce1a6caa1b3c912119059cfcc98a7", - "internalRef": "306320014" + "sha": "629e6bea8418ad4a5d081ab9eb48bb327ad368e1", + "internalRef": "306660765" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "52638600f387deb98efb5f9c85fec39e82aa9052", - "log": "52638600f387deb98efb5f9c85fec39e82aa9052\nbuild(java): set GOOGLE_CLOUD_PROJECT env for samples/integration tests (#484)\n\n* build(java): set GOOGLE_CLOUD_PROJECT env variable for samples/integration tests\n\n* ci: use java-docs-samples-testing for sample tests\n3df869dd6eb546ef13beeb7a9efa6ee0226afafd\nci: add dependency list completeness check (#490)\n\n\n682c0c37d1054966ca662a44259e96cc7aea4413\nbuild(nodejs): update lint ignore rules (#488)\n\n\n97c7ccfdceb927db1cbe6f3bb09616aa02bafd89\ndoc: document context-aware commit flags (#481)\n\nAlso, delete obsolete blurb about cleaning up old, dead files.\n\nCo-authored-by: Jeff Ching \n8eff3790f88b50706a0c4b6a20b385f24e9ac4e7\nfeat: common postprocessing for node libraries (#485)\n\nCo-authored-by: Justin Beckwith \n21c3b57ae54ae9db6a3a6b48b31c970c6ab56f19\nbuild(nodejs): remove unused codecov config (#486)\n\n\n" + "sha": "85cbc7f954f4c4c3534f0caafbaed22a8f80f602" } } ], diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index e2d66b301c0..72f623f1a93 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -17,10 +17,11 @@ version, generator_args={ 'grpc-service-config': f'google/pubsub/{version}/pubsub_grpc_service_config.json', - 'package-name': f'@google-cloud/pubsub', - 'main-service': f'pubsub', + 'package-name': '@google-cloud/pubsub', + 'main-service': 'pubsub', 'bundle-config': f'google/pubsub/{version}/pubsub_gapic.yaml', - 'template': f'typescript_gapic' + 'template': 'typescript_gapic', + 'iam-service': 'true' }, proto_path=f'/google/pubsub/{version}', extra_proto_files=['google/cloud/common_resources.proto'] @@ -34,38 +35,6 @@ templates = common_templates.node_library(source_location='build/src') s.copy(templates) -# TODO: remove this surgery once IAM service injected in nodejs-gax https://github.com/googleapis/gax-nodejs/pull/762/ -# surgery in client.ts file to call IAM service -clients = ['publisher', 'subscriber'] -for client_name in clients: - client_file = f'src/v1/{client_name}_client.ts' - s.replace(client_file, - f'import \* as gapicConfig from \'\.\/{client_name}_client_config\.json\';', - f'import * as gapicConfig from \'./%s_client_config.json\';\nimport {{IamClient}} from \'../helper\';' % client_name, - ) - - s.replace(client_file, - 'private \_terminated = false;', - 'private _terminated = false; \n private _iamClient: IamClient;') - - s.replace(client_file, - '\/\/ Determine the client header string.', - 'this._iamClient = new IamClient(opts); \n // Determine the client header string.') - - # TODO: it should be removed once pubsub upgrade gts 2.0.0 - # fix tslint issue due to mismatch gts version with gapic-generator-typescript - s.replace(client_file, '\/\/ eslint\-disable\-next\-line\ \@typescript\-eslint\/no\-explicit\-any', - '// eslint-disable-next-line @typescript-eslint/no-explicit-any') - - with open('helperMethods.ts.tmpl', 'r') as helper_file: - content = helper_file.read() - s.replace(client_file, '^}', content) - -# TODO: it should be removed once pubsub upgrade gts 2.0.0 -# fix tslint issue due to mismatch gts version with gapic-generator-typescript -s.replace('test/gapic_publisher_v1.ts', - 'const\ expectedResponse\ \=\ \[new\ String\(\)\,\ new\ String\(\)\,\ new\ String\(\)\];', 'const expectedResponse: string[] | undefined = [];') - # Node.js specific cleanup subprocess.run(['npm', 'install']) subprocess.run(['npm', 'run', 'fix']) diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 8f0d1682c3e..329d4b7d837 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -25,7 +25,7 @@ import * as publisherModule from '../src'; import {PassThrough} from 'stream'; -import {protobuf} from 'google-gax'; +import {protobuf, IamProtos} from 'google-gax'; function generateSampleMessage(instance: T) { const filledObject = (instance.constructor as typeof protobuf.Message).toObject( @@ -1066,7 +1066,7 @@ describe('v1.PublisherClient', () => { }, }, }; - const expectedResponse: string[] | undefined = []; + const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSubscriptions = stubSimpleCall( expectedResponse ); @@ -1097,7 +1097,7 @@ describe('v1.PublisherClient', () => { }, }, }; - const expectedResponse: string[] | undefined = []; + const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSubscriptions = stubSimpleCallWithCallback( expectedResponse ); @@ -1166,7 +1166,7 @@ describe('v1.PublisherClient', () => { ); request.topic = ''; const expectedHeaderRequestParams = 'topic='; - const expectedResponse: string[] | undefined = []; + const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall( expectedResponse ); @@ -1258,7 +1258,7 @@ describe('v1.PublisherClient', () => { ); request.topic = ''; const expectedHeaderRequestParams = 'topic='; - const expectedResponse: string[] | undefined = []; + const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall( expectedResponse ); @@ -1339,7 +1339,7 @@ describe('v1.PublisherClient', () => { }, }, }; - const expectedResponse: string[] | undefined = []; + const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSnapshots = stubSimpleCall( expectedResponse ); @@ -1370,7 +1370,7 @@ describe('v1.PublisherClient', () => { }, }, }; - const expectedResponse: string[] | undefined = []; + const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSnapshots = stubSimpleCallWithCallback( expectedResponse ); @@ -1439,7 +1439,7 @@ describe('v1.PublisherClient', () => { ); request.topic = ''; const expectedHeaderRequestParams = 'topic='; - const expectedResponse: string[] | undefined = []; + const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall( expectedResponse ); @@ -1529,7 +1529,7 @@ describe('v1.PublisherClient', () => { ); request.topic = ''; const expectedHeaderRequestParams = 'topic='; - const expectedResponse: string[] | undefined = []; + const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall( expectedResponse ); @@ -1590,6 +1590,327 @@ describe('v1.PublisherClient', () => { ); }); }); + describe('getIamPolicy', () => { + it('invokes getIamPolicy without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.getIamPolicy = stubSimpleCall(expectedResponse); + const response = await client.getIamPolicy(request, expectedOptions); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.getIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes getIamPolicy without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.getIamPolicy = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.getIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.getIamPolicy as SinonStub).getCall(0)); + }); + it('invokes getIamPolicy with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.getIamPolicy = stubSimpleCall(undefined, expectedError); + await assert.rejects(async () => { + await client.getIamPolicy(request, expectedOptions); + }, expectedError); + assert( + (client.iamClient.getIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + describe('setIamPolicy', () => { + it('invokes setIamPolicy without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.setIamPolicy = stubSimpleCall(expectedResponse); + const response = await client.setIamPolicy(request, expectedOptions); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.setIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes setIamPolicy without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.setIamPolicy = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.setIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.setIamPolicy as SinonStub).getCall(0)); + }); + it('invokes setIamPolicy with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.setIamPolicy = stubSimpleCall(undefined, expectedError); + await assert.rejects(async () => { + await client.setIamPolicy(request, expectedOptions); + }, expectedError); + assert( + (client.iamClient.setIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + describe('testIamPermissions', () => { + it('invokes testIamPermissions without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsResponse() + ); + client.iamClient.testIamPermissions = stubSimpleCall(expectedResponse); + const response = await client.testIamPermissions( + request, + expectedOptions + ); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.testIamPermissions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes testIamPermissions without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsResponse() + ); + client.iamClient.testIamPermissions = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.testIamPermissions( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.testIamPermissions as SinonStub).getCall(0)); + }); + it('invokes testIamPermissions with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.testIamPermissions = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.testIamPermissions(request, expectedOptions); + }, expectedError); + assert( + (client.iamClient.testIamPermissions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); describe('Path templates', () => { describe('project', () => { diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index f5ef3f95266..b407a8ea801 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -25,7 +25,7 @@ import * as subscriberModule from '../src'; import {PassThrough} from 'stream'; -import {protobuf} from 'google-gax'; +import {protobuf, IamProtos} from 'google-gax'; function generateSampleMessage(instance: T) { const filledObject = (instance.constructor as typeof protobuf.Message).toObject( @@ -2357,6 +2357,327 @@ describe('v1.SubscriberClient', () => { ); }); }); + describe('getIamPolicy', () => { + it('invokes getIamPolicy without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.getIamPolicy = stubSimpleCall(expectedResponse); + const response = await client.getIamPolicy(request, expectedOptions); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.getIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes getIamPolicy without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.getIamPolicy = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.getIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.getIamPolicy as SinonStub).getCall(0)); + }); + it('invokes getIamPolicy with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.getIamPolicy = stubSimpleCall(undefined, expectedError); + await assert.rejects(async () => { + await client.getIamPolicy(request, expectedOptions); + }, expectedError); + assert( + (client.iamClient.getIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + describe('setIamPolicy', () => { + it('invokes setIamPolicy without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.setIamPolicy = stubSimpleCall(expectedResponse); + const response = await client.setIamPolicy(request, expectedOptions); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.setIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes setIamPolicy without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.setIamPolicy = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.setIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.setIamPolicy as SinonStub).getCall(0)); + }); + it('invokes setIamPolicy with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.setIamPolicy = stubSimpleCall(undefined, expectedError); + await assert.rejects(async () => { + await client.setIamPolicy(request, expectedOptions); + }, expectedError); + assert( + (client.iamClient.setIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + describe('testIamPermissions', () => { + it('invokes testIamPermissions without error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsResponse() + ); + client.iamClient.testIamPermissions = stubSimpleCall(expectedResponse); + const response = await client.testIamPermissions( + request, + expectedOptions + ); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.testIamPermissions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes testIamPermissions without error using callback', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsResponse() + ); + client.iamClient.testIamPermissions = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.testIamPermissions( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.testIamPermissions as SinonStub).getCall(0)); + }); + it('invokes testIamPermissions with error', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.testIamPermissions = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(async () => { + await client.testIamPermissions(request, expectedOptions); + }, expectedError); + assert( + (client.iamClient.testIamPermissions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); describe('Path templates', () => { describe('project', () => { diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 4de26f4e6d2..a96a29e2f62 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -31,15 +31,19 @@ import {Message, Subscriber} from '../src/subscriber'; class FakeClient { async acknowledge( + // eslint-disable-next-line @typescript-eslint/no-unused-vars reqOpts: {subscription: string; ackIds: string[]}, + // eslint-disable-next-line @typescript-eslint/no-unused-vars callOptions: CallOptions ): Promise {} async modifyAckDeadline( + // eslint-disable-next-line @typescript-eslint/no-unused-vars reqOpts: { subscription: string; ackIds: string[]; ackDeadlineSeconds: number; }, + // eslint-disable-next-line @typescript-eslint/no-unused-vars callOptions: CallOptions ): Promise {} } diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index df1208ec56d..7c128f6f80f 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -46,7 +46,9 @@ class FakeQueue extends EventEmitter { super(); this.publisher = publisher; } + // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: p.PubsubMessage, callback: p.PublishCallback): void {} + // eslint-disable-next-line @typescript-eslint/no-unused-vars publish(callback: (err: Error | null) => void) {} } @@ -58,6 +60,7 @@ class FakeOrderedQueue extends FakeQueue { this.orderingKey = key; } resumePublishing(): void {} + // eslint-disable-next-line @typescript-eslint/no-unused-vars publish(callback: (err: Error | null) => void) {} } diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 9a33f09032e..b4c6901f1c4 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -63,7 +63,9 @@ class FakeHistogram { const key = options ? 'histogram' : 'latencies'; stubs.set(key, this); } + // eslint-disable-next-line @typescript-eslint/no-unused-vars add(seconds: number): void {} + // eslint-disable-next-line @typescript-eslint/no-unused-vars percentile(percentile: number): number { return 10; } @@ -76,8 +78,10 @@ class FakeLeaseManager extends EventEmitter { this.options = options; stubs.set('inventory', this); } + // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: s.Message): void {} clear(): void {} + // eslint-disable-next-line @typescript-eslint/no-unused-vars remove(message: s.Message): void {} } @@ -89,6 +93,7 @@ class FakeQueue { constructor(sub: s.Subscriber, options: BatchOptions) { this.options = options; } + // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: s.Message, deadline?: number): void {} async flush(): Promise {} async onFlush(): Promise {} @@ -116,6 +121,7 @@ class FakeMessageStream extends PassThrough { this.options = options; stubs.set('messageStream', this); } + // eslint-disable-next-line @typescript-eslint/no-unused-vars destroy(error?: Error): void {} } diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 858ad91041d..69a73833430 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -26,6 +26,7 @@ import { Subscription, SubscriptionOptions, } from '../src/subscription'; +// eslint-disable-next-line @typescript-eslint/no-unused-vars import {GetTopicMetadataCallback, Topic} from '../src/topic'; import * as util from '../src/util'; From 4a434faaa0c5ce1949b3aaea1c4e0df1f7ed6840 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 20 Apr 2020 14:51:41 -0700 Subject: [PATCH 0616/1115] chore!: dropp support for custom promises (#970) --- handwritten/pubsub/src/iam.ts | 5 ----- handwritten/pubsub/src/publisher/index.ts | 6 ------ handwritten/pubsub/src/snapshot.ts | 5 ----- handwritten/pubsub/src/topic.ts | 5 ----- handwritten/pubsub/test/iam.ts | 5 ----- handwritten/pubsub/test/publisher/index.ts | 6 ------ handwritten/pubsub/test/pubsub.ts | 1 - handwritten/pubsub/test/snapshot.ts | 6 ------ handwritten/pubsub/test/subscription.ts | 1 - handwritten/pubsub/test/topic.ts | 5 ----- 10 files changed, 45 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 62acbb79eda..6c2c1048934 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -93,16 +93,11 @@ export type TestIamPermissionsCallback = ResourceCallback< * // subscription.iam */ export class IAM { - // tslint:disable-next-line variable-name - Promise?: PromiseConstructor; pubsub: PubSub; request: typeof PubSub.prototype.request; id: string; constructor(pubsub: PubSub, id: string) { - if (pubsub.Promise) { - this.Promise = pubsub.Promise; - } this.pubsub = pubsub; this.request = pubsub.request.bind(pubsub); this.id = id; diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 4e9ca41ba01..04e6fc75e6a 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -56,17 +56,11 @@ export const BATCH_LIMITS: BatchPublishOptions = { * @param {PublishOptions} [options] Configuration object. */ export class Publisher { - // tslint:disable-next-line variable-name - Promise?: PromiseConstructor; topic: Topic; settings!: PublishOptions; queue: Queue; orderedQueues: Map; constructor(topic: Topic, options?: PublishOptions) { - if (topic.Promise) { - this.Promise = topic.Promise; - } - this.setOptions(options); this.topic = topic; this.queue = new Queue(this); diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index f6e62814318..f2369e5cfe3 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -103,13 +103,8 @@ export type SeekResponse = [google.pubsub.v1.ISeekResponse]; export class Snapshot { parent: Subscription | PubSub; name: string; - // tslint:disable-next-line variable-name - Promise?: PromiseConstructor; metadata?: google.pubsub.v1.ISnapshot; constructor(parent: Subscription | PubSub, name: string) { - if (parent instanceof PubSub) { - this.Promise = parent.Promise; - } this.parent = parent; this.name = Snapshot.formatName_(parent.projectId, name); } diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 3cc761240c6..0825f41942d 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -100,8 +100,6 @@ export type MessageOptions = PubsubMessage & {json?: any}; * const topic = pubsub.topic('ordered-topic', {enableMessageOrdering: true}); */ export class Topic { - // tslint:disable-next-line variable-name - Promise?: PromiseConstructor; name: string; parent: PubSub; pubsub: PubSub; @@ -114,9 +112,6 @@ export class Topic { ) as () => ObjectStream; constructor(pubsub: PubSub, name: string, options?: PublishOptions) { - if (pubsub.Promise) { - this.Promise = pubsub.Promise; - } /** * The fully qualified name of this topic. * @name Topic#name diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index 0bc0dfa8740..b916313f1de 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -37,7 +37,6 @@ describe('IAM', () => { const PUBSUB = ({ options: {}, - Promise: {}, request: util.noop, } as {}) as PubSub; const ID = 'id'; @@ -53,10 +52,6 @@ describe('IAM', () => { }); describe('initialization', () => { - it('should localize pubsub.Promise', () => { - assert.strictEqual(iam.Promise, PUBSUB.Promise); - }); - it('should localize pubsub', () => { assert.strictEqual(iam.pubsub, PUBSUB); }); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 7c128f6f80f..910b1df27f6 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -97,12 +97,6 @@ describe('Publisher', () => { assert(promisified); }); - it('should localize Promise class if set', () => { - const t = {Promise} as Topic; - publisher = new Publisher(t); - assert.strictEqual(publisher.Promise, Promise); - }); - it('should capture user options', () => { const stub = sandbox.stub(Publisher.prototype, 'setOptions'); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index fae1212aa23..b30aa13fb3e 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -151,7 +151,6 @@ describe('PubSub', () => { let pubsub: pubsubTypes.PubSub; const OPTIONS = { projectId: PROJECT_ID, - promise: {}, } as pubsubTypes.ClientConfig; const PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 0465a1adff3..4a2171bc08f 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -84,12 +84,6 @@ describe('Snapshot', () => { assert(promisified); }); - it('should localize parent.Promise', () => { - const pubsub = new PubSub(); - snapshot = new Snapshot(pubsub, SNAPSHOT_NAME); - assert.strictEqual(snapshot.Promise, pubsub.Promise); - }); - it('should localize the parent', () => { assert.strictEqual(snapshot.parent, SUBSCRIPTION); }); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 58247909775..830a272372a 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -89,7 +89,6 @@ describe('Subscription', () => { const PUBSUB = ({ projectId: PROJECT_ID, - Promise: {}, request: util.noop, createSubscription: util.noop, } as {}) as PubSub; diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 69a73833430..d366da48347 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -95,7 +95,6 @@ describe('Topic', () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any const PUBSUB: any = { - Promise: {}, projectId: PROJECT_ID, createTopic: util.noop, request: util.noop, @@ -132,10 +131,6 @@ describe('Topic', () => { assert(promisified); }); - it('should localize pubsub.Promise', () => { - assert.strictEqual(topic.Promise, PUBSUB.Promise); - }); - it('should format the name', () => { const formattedName = 'a/b/c/d'; From 3152af271c42b1fd0f721a7eacc788f025fa78a0 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 20 Apr 2020 15:09:46 -0700 Subject: [PATCH 0617/1115] docs: update proto comments (#968) Co-authored-by: Justin Beckwith --- .../pubsub/protos/google/pubsub/v1/pubsub.proto | 9 +++------ handwritten/pubsub/src/v1/publisher_client.ts | 6 +++--- handwritten/pubsub/src/v1/subscriber_client.ts | 3 --- handwritten/pubsub/synth.metadata | 10 +++++----- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index abcbcacc517..832e0649c9c 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -222,9 +222,9 @@ message UpdateTopicRequest { // Required. Indicates which fields in the provided topic to update. Must be // specified and non-empty. Note that if `update_mask` contains - // "message_storage_policy" then the new value will be determined based on the - // policy configured at the project or organization level. The - // `message_storage_policy` must not be set in the `topic` provided above. + // "message_storage_policy" but the `message_storage_policy` is not set in + // the `topic` provided above, then the updated value is determined by the + // policy configured at the project or organization level. google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED]; } @@ -689,9 +689,6 @@ message Subscription { // parent project (i.e., // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have // permission to Acknowledge() messages on this subscription. - // EXPERIMENTAL: This feature is part of a closed alpha release. This - // API might be changed in backward-incompatible ways and is not recommended - // for production use. It is not subject to any SLA or deprecation policy. DeadLetterPolicy dead_letter_policy = 13; // A policy that specifies how Cloud Pub/Sub retries message delivery for this diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 2639e16777d..e74e6ee4aaf 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -494,9 +494,9 @@ export class PublisherClient { * @param {google.protobuf.FieldMask} request.updateMask * Required. Indicates which fields in the provided topic to update. Must be * specified and non-empty. Note that if `update_mask` contains - * "message_storage_policy" then the new value will be determined based on the - * policy configured at the project or organization level. The - * `message_storage_policy` must not be set in the `topic` provided above. + * "message_storage_policy" but the `message_storage_policy` is not set in + * the `topic` provided above, then the updated value is determined by the + * policy configured at the project or organization level. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index c0abc53dae4..73982b12229 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -474,9 +474,6 @@ export class SubscriberClient { * parent project (i.e., * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have * permission to Acknowledge() messages on this subscription. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. * @param {google.pubsub.v1.RetryPolicy} request.retryPolicy * A policy that specifies how Cloud Pub/Sub retries message delivery for this * subscription. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 0386c935e54..12fbacb89cb 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -3,23 +3,23 @@ { "git": { "name": ".", - "remote": "git@github.com:googleapis/nodejs-pubsub.git", - "sha": "e85fcd0e8aa9ff3c67257ebc04a1e7c42b1ec207" + "remote": "https://github.com/googleapis/nodejs-pubsub.git", + "sha": "966614d43db9bbffc6d821f713733168d3e1d67f" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "629e6bea8418ad4a5d081ab9eb48bb327ad368e1", - "internalRef": "306660765" + "sha": "cdf13efacdea0649e940452f9c5d320b93735974", + "internalRef": "306783437" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "85cbc7f954f4c4c3534f0caafbaed22a8f80f602" + "sha": "6980131905b652563280e4d2482384d4acc9eafc" } } ], From 7643df27e6ff108862dbc9998d3d49475dc4bd5f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 21 Apr 2020 20:30:01 -0700 Subject: [PATCH 0618/1115] build: adopt changes to generator formatter (#975) --- handwritten/pubsub/protos/protos.js | 420 ++++++++++++++-------------- handwritten/pubsub/synth.metadata | 8 +- 2 files changed, 214 insertions(+), 214 deletions(-) diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 95384639c07..620ec99137d 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -643,14 +643,14 @@ Topic.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.labels != null && message.hasOwnProperty("labels")) + if (message.labels != null && Object.hasOwnProperty.call(message, "labels")) for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - if (message.messageStoragePolicy != null && message.hasOwnProperty("messageStoragePolicy")) + if (message.messageStoragePolicy != null && Object.hasOwnProperty.call(message, "messageStoragePolicy")) $root.google.pubsub.v1.MessageStoragePolicy.encode(message.messageStoragePolicy, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) + if (message.kmsKeyName != null && Object.hasOwnProperty.call(message, "kmsKeyName")) writer.uint32(/* id 5, wireType 2 =*/42).string(message.kmsKeyName); return writer; }; @@ -933,16 +933,16 @@ PubsubMessage.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.data != null && message.hasOwnProperty("data")) + if (message.data != null && Object.hasOwnProperty.call(message, "data")) writer.uint32(/* id 1, wireType 2 =*/10).bytes(message.data); - if (message.attributes != null && message.hasOwnProperty("attributes")) + if (message.attributes != null && Object.hasOwnProperty.call(message, "attributes")) for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); - if (message.messageId != null && message.hasOwnProperty("messageId")) + if (message.messageId != null && Object.hasOwnProperty.call(message, "messageId")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.messageId); - if (message.publishTime != null && message.hasOwnProperty("publishTime")) + if (message.publishTime != null && Object.hasOwnProperty.call(message, "publishTime")) $root.google.protobuf.Timestamp.encode(message.publishTime, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.orderingKey != null && message.hasOwnProperty("orderingKey")) + if (message.orderingKey != null && Object.hasOwnProperty.call(message, "orderingKey")) writer.uint32(/* id 5, wireType 2 =*/42).string(message.orderingKey); return writer; }; @@ -1208,7 +1208,7 @@ GetTopicRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); return writer; }; @@ -1404,9 +1404,9 @@ UpdateTopicRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) $root.google.pubsub.v1.Topic.encode(message.topic, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) + if (message.updateMask != null && Object.hasOwnProperty.call(message, "updateMask")) $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -1625,7 +1625,7 @@ PublishRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); if (message.messages != null && message.messages.length) for (var i = 0; i < message.messages.length; ++i) @@ -2067,11 +2067,11 @@ ListTopicsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) + if (message.project != null && Object.hasOwnProperty.call(message, "project")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (message.pageSize != null && Object.hasOwnProperty.call(message, "pageSize")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (message.pageToken != null && Object.hasOwnProperty.call(message, "pageToken")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; @@ -2294,7 +2294,7 @@ if (message.topics != null && message.topics.length) for (var i = 0; i < message.topics.length; ++i) $root.google.pubsub.v1.Topic.encode(message.topics[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (message.nextPageToken != null && Object.hasOwnProperty.call(message, "nextPageToken")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); return writer; }; @@ -2530,11 +2530,11 @@ ListTopicSubscriptionsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (message.pageSize != null && Object.hasOwnProperty.call(message, "pageSize")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (message.pageToken != null && Object.hasOwnProperty.call(message, "pageToken")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; @@ -2757,7 +2757,7 @@ if (message.subscriptions != null && message.subscriptions.length) for (var i = 0; i < message.subscriptions.length; ++i) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscriptions[i]); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (message.nextPageToken != null && Object.hasOwnProperty.call(message, "nextPageToken")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); return writer; }; @@ -2988,11 +2988,11 @@ ListTopicSnapshotsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (message.pageSize != null && Object.hasOwnProperty.call(message, "pageSize")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (message.pageToken != null && Object.hasOwnProperty.call(message, "pageToken")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; @@ -3215,7 +3215,7 @@ if (message.snapshots != null && message.snapshots.length) for (var i = 0; i < message.snapshots.length; ++i) writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshots[i]); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (message.nextPageToken != null && Object.hasOwnProperty.call(message, "nextPageToken")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); return writer; }; @@ -3428,7 +3428,7 @@ DeleteTopicRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.topic != null && message.hasOwnProperty("topic")) + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); return writer; }; @@ -4278,30 +4278,30 @@ Subscription.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.topic != null && message.hasOwnProperty("topic")) + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + if (message.pushConfig != null && Object.hasOwnProperty.call(message, "pushConfig")) $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + if (message.ackDeadlineSeconds != null && Object.hasOwnProperty.call(message, "ackDeadlineSeconds")) writer.uint32(/* id 5, wireType 0 =*/40).int32(message.ackDeadlineSeconds); - if (message.retainAckedMessages != null && message.hasOwnProperty("retainAckedMessages")) + if (message.retainAckedMessages != null && Object.hasOwnProperty.call(message, "retainAckedMessages")) writer.uint32(/* id 7, wireType 0 =*/56).bool(message.retainAckedMessages); - if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) + if (message.messageRetentionDuration != null && Object.hasOwnProperty.call(message, "messageRetentionDuration")) $root.google.protobuf.Duration.encode(message.messageRetentionDuration, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.labels != null && message.hasOwnProperty("labels")) + if (message.labels != null && Object.hasOwnProperty.call(message, "labels")) for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) writer.uint32(/* id 9, wireType 2 =*/74).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); - if (message.enableMessageOrdering != null && message.hasOwnProperty("enableMessageOrdering")) + if (message.enableMessageOrdering != null && Object.hasOwnProperty.call(message, "enableMessageOrdering")) writer.uint32(/* id 10, wireType 0 =*/80).bool(message.enableMessageOrdering); - if (message.expirationPolicy != null && message.hasOwnProperty("expirationPolicy")) + if (message.expirationPolicy != null && Object.hasOwnProperty.call(message, "expirationPolicy")) $root.google.pubsub.v1.ExpirationPolicy.encode(message.expirationPolicy, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.filter != null && message.hasOwnProperty("filter")) + if (message.filter != null && Object.hasOwnProperty.call(message, "filter")) writer.uint32(/* id 12, wireType 2 =*/98).string(message.filter); - if (message.deadLetterPolicy != null && message.hasOwnProperty("deadLetterPolicy")) + if (message.deadLetterPolicy != null && Object.hasOwnProperty.call(message, "deadLetterPolicy")) $root.google.pubsub.v1.DeadLetterPolicy.encode(message.deadLetterPolicy, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); - if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) + if (message.retryPolicy != null && Object.hasOwnProperty.call(message, "retryPolicy")) $root.google.pubsub.v1.RetryPolicy.encode(message.retryPolicy, writer.uint32(/* id 14, wireType 2 =*/114).fork()).ldelim(); return writer; }; @@ -4664,9 +4664,9 @@ RetryPolicy.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.minimumBackoff != null && message.hasOwnProperty("minimumBackoff")) + if (message.minimumBackoff != null && Object.hasOwnProperty.call(message, "minimumBackoff")) $root.google.protobuf.Duration.encode(message.minimumBackoff, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.maximumBackoff != null && message.hasOwnProperty("maximumBackoff")) + if (message.maximumBackoff != null && Object.hasOwnProperty.call(message, "maximumBackoff")) $root.google.protobuf.Duration.encode(message.maximumBackoff, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -4884,9 +4884,9 @@ DeadLetterPolicy.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.deadLetterTopic != null && message.hasOwnProperty("deadLetterTopic")) + if (message.deadLetterTopic != null && Object.hasOwnProperty.call(message, "deadLetterTopic")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.deadLetterTopic); - if (message.maxDeliveryAttempts != null && message.hasOwnProperty("maxDeliveryAttempts")) + if (message.maxDeliveryAttempts != null && Object.hasOwnProperty.call(message, "maxDeliveryAttempts")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.maxDeliveryAttempts); return writer; }; @@ -5085,7 +5085,7 @@ ExpirationPolicy.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.ttl != null && message.hasOwnProperty("ttl")) + if (message.ttl != null && Object.hasOwnProperty.call(message, "ttl")) $root.google.protobuf.Duration.encode(message.ttl, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); return writer; }; @@ -5310,12 +5310,12 @@ PushConfig.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.pushEndpoint != null && message.hasOwnProperty("pushEndpoint")) + if (message.pushEndpoint != null && Object.hasOwnProperty.call(message, "pushEndpoint")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.pushEndpoint); - if (message.attributes != null && message.hasOwnProperty("attributes")) + if (message.attributes != null && Object.hasOwnProperty.call(message, "attributes")) for (var keys = Object.keys(message.attributes), i = 0; i < keys.length; ++i) writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); - if (message.oidcToken != null && message.hasOwnProperty("oidcToken")) + if (message.oidcToken != null && Object.hasOwnProperty.call(message, "oidcToken")) $root.google.pubsub.v1.PushConfig.OidcToken.encode(message.oidcToken, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; @@ -5561,9 +5561,9 @@ OidcToken.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + if (message.serviceAccountEmail != null && Object.hasOwnProperty.call(message, "serviceAccountEmail")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.serviceAccountEmail); - if (message.audience != null && message.hasOwnProperty("audience")) + if (message.audience != null && Object.hasOwnProperty.call(message, "audience")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.audience); return writer; }; @@ -5783,11 +5783,11 @@ ReceivedMessage.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.ackId != null && message.hasOwnProperty("ackId")) + if (message.ackId != null && Object.hasOwnProperty.call(message, "ackId")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.ackId); - if (message.message != null && message.hasOwnProperty("message")) + if (message.message != null && Object.hasOwnProperty.call(message, "message")) $root.google.pubsub.v1.PubsubMessage.encode(message.message, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.deliveryAttempt != null && message.hasOwnProperty("deliveryAttempt")) + if (message.deliveryAttempt != null && Object.hasOwnProperty.call(message, "deliveryAttempt")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.deliveryAttempt); return writer; }; @@ -6002,7 +6002,7 @@ GetSubscriptionRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); return writer; }; @@ -6198,9 +6198,9 @@ UpdateSubscriptionRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) $root.google.pubsub.v1.Subscription.encode(message.subscription, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) + if (message.updateMask != null && Object.hasOwnProperty.call(message, "updateMask")) $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -6427,11 +6427,11 @@ ListSubscriptionsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) + if (message.project != null && Object.hasOwnProperty.call(message, "project")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (message.pageSize != null && Object.hasOwnProperty.call(message, "pageSize")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (message.pageToken != null && Object.hasOwnProperty.call(message, "pageToken")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; @@ -6654,7 +6654,7 @@ if (message.subscriptions != null && message.subscriptions.length) for (var i = 0; i < message.subscriptions.length; ++i) $root.google.pubsub.v1.Subscription.encode(message.subscriptions[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (message.nextPageToken != null && Object.hasOwnProperty.call(message, "nextPageToken")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); return writer; }; @@ -6872,7 +6872,7 @@ DeleteSubscriptionRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); return writer; }; @@ -7068,9 +7068,9 @@ ModifyPushConfigRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.pushConfig != null && message.hasOwnProperty("pushConfig")) + if (message.pushConfig != null && Object.hasOwnProperty.call(message, "pushConfig")) $root.google.pubsub.v1.PushConfig.encode(message.pushConfig, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -7292,11 +7292,11 @@ PullRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.returnImmediately != null && message.hasOwnProperty("returnImmediately")) + if (message.returnImmediately != null && Object.hasOwnProperty.call(message, "returnImmediately")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.returnImmediately); - if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + if (message.maxMessages != null && Object.hasOwnProperty.call(message, "maxMessages")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.maxMessages); return writer; }; @@ -7733,9 +7733,9 @@ ModifyAckDeadlineRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) + if (message.ackDeadlineSeconds != null && Object.hasOwnProperty.call(message, "ackDeadlineSeconds")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.ackDeadlineSeconds); if (message.ackIds != null && message.ackIds.length) for (var i = 0; i < message.ackIds.length; ++i) @@ -7973,7 +7973,7 @@ AcknowledgeRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); if (message.ackIds != null && message.ackIds.length) for (var i = 0; i < message.ackIds.length; ++i) @@ -8237,7 +8237,7 @@ StreamingPullRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); if (message.ackIds != null && message.ackIds.length) for (var i = 0; i < message.ackIds.length; ++i) @@ -8251,9 +8251,9 @@ if (message.modifyDeadlineAckIds != null && message.modifyDeadlineAckIds.length) for (var i = 0; i < message.modifyDeadlineAckIds.length; ++i) writer.uint32(/* id 4, wireType 2 =*/34).string(message.modifyDeadlineAckIds[i]); - if (message.streamAckDeadlineSeconds != null && message.hasOwnProperty("streamAckDeadlineSeconds")) + if (message.streamAckDeadlineSeconds != null && Object.hasOwnProperty.call(message, "streamAckDeadlineSeconds")) writer.uint32(/* id 5, wireType 0 =*/40).int32(message.streamAckDeadlineSeconds); - if (message.clientId != null && message.hasOwnProperty("clientId")) + if (message.clientId != null && Object.hasOwnProperty.call(message, "clientId")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.clientId); return writer; }; @@ -8772,11 +8772,11 @@ CreateSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.subscription); - if (message.labels != null && message.hasOwnProperty("labels")) + if (message.labels != null && Object.hasOwnProperty.call(message, "labels")) for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) writer.uint32(/* id 3, wireType 2 =*/26).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); return writer; @@ -9016,9 +9016,9 @@ UpdateSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (message.snapshot != null && Object.hasOwnProperty.call(message, "snapshot")) $root.google.pubsub.v1.Snapshot.encode(message.snapshot, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.updateMask != null && message.hasOwnProperty("updateMask")) + if (message.updateMask != null && Object.hasOwnProperty.call(message, "updateMask")) $root.google.protobuf.FieldMask.encode(message.updateMask, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -9255,13 +9255,13 @@ Snapshot.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.topic != null && message.hasOwnProperty("topic")) + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.topic); - if (message.expireTime != null && message.hasOwnProperty("expireTime")) + if (message.expireTime != null && Object.hasOwnProperty.call(message, "expireTime")) $root.google.protobuf.Timestamp.encode(message.expireTime, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.labels != null && message.hasOwnProperty("labels")) + if (message.labels != null && Object.hasOwnProperty.call(message, "labels")) for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) writer.uint32(/* id 4, wireType 2 =*/34).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); return writer; @@ -9508,7 +9508,7 @@ GetSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (message.snapshot != null && Object.hasOwnProperty.call(message, "snapshot")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); return writer; }; @@ -9713,11 +9713,11 @@ ListSnapshotsRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.project != null && message.hasOwnProperty("project")) + if (message.project != null && Object.hasOwnProperty.call(message, "project")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.project); - if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (message.pageSize != null && Object.hasOwnProperty.call(message, "pageSize")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.pageSize); - if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (message.pageToken != null && Object.hasOwnProperty.call(message, "pageToken")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.pageToken); return writer; }; @@ -9940,7 +9940,7 @@ if (message.snapshots != null && message.snapshots.length) for (var i = 0; i < message.snapshots.length; ++i) $root.google.pubsub.v1.Snapshot.encode(message.snapshots[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (message.nextPageToken != null && Object.hasOwnProperty.call(message, "nextPageToken")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); return writer; }; @@ -10158,7 +10158,7 @@ DeleteSnapshotRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (message.snapshot != null && Object.hasOwnProperty.call(message, "snapshot")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.snapshot); return writer; }; @@ -10377,11 +10377,11 @@ SeekRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.subscription != null && message.hasOwnProperty("subscription")) + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); - if (message.time != null && message.hasOwnProperty("time")) + if (message.time != null && Object.hasOwnProperty.call(message, "time")) $root.google.protobuf.Timestamp.encode(message.time, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.snapshot != null && message.hasOwnProperty("snapshot")) + if (message.snapshot != null && Object.hasOwnProperty.call(message, "snapshot")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.snapshot); return writer; }; @@ -10795,7 +10795,7 @@ if (message.rules != null && message.rules.length) for (var i = 0; i < message.rules.length; ++i) $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + if (message.fullyDecodeReservedExpansion != null && Object.hasOwnProperty.call(message, "fullyDecodeReservedExpansion")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); return writer; }; @@ -11109,26 +11109,26 @@ HttpRule.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.selector != null && message.hasOwnProperty("selector")) + if (message.selector != null && Object.hasOwnProperty.call(message, "selector")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); - if (message.get != null && message.hasOwnProperty("get")) + if (message.get != null && Object.hasOwnProperty.call(message, "get")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.get); - if (message.put != null && message.hasOwnProperty("put")) + if (message.put != null && Object.hasOwnProperty.call(message, "put")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.put); - if (message.post != null && message.hasOwnProperty("post")) + if (message.post != null && Object.hasOwnProperty.call(message, "post")) writer.uint32(/* id 4, wireType 2 =*/34).string(message.post); - if (message["delete"] != null && message.hasOwnProperty("delete")) + if (message["delete"] != null && Object.hasOwnProperty.call(message, "delete")) writer.uint32(/* id 5, wireType 2 =*/42).string(message["delete"]); - if (message.patch != null && message.hasOwnProperty("patch")) + if (message.patch != null && Object.hasOwnProperty.call(message, "patch")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.patch); - if (message.body != null && message.hasOwnProperty("body")) + if (message.body != null && Object.hasOwnProperty.call(message, "body")) writer.uint32(/* id 7, wireType 2 =*/58).string(message.body); - if (message.custom != null && message.hasOwnProperty("custom")) + if (message.custom != null && Object.hasOwnProperty.call(message, "custom")) $root.google.api.CustomHttpPattern.encode(message.custom, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); if (message.additionalBindings != null && message.additionalBindings.length) for (var i = 0; i < message.additionalBindings.length; ++i) $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.responseBody != null && message.hasOwnProperty("responseBody")) + if (message.responseBody != null && Object.hasOwnProperty.call(message, "responseBody")) writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); return writer; }; @@ -11485,9 +11485,9 @@ CustomHttpPattern.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.kind != null && message.hasOwnProperty("kind")) + if (message.kind != null && Object.hasOwnProperty.call(message, "kind")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.kind); - if (message.path != null && message.hasOwnProperty("path")) + if (message.path != null && Object.hasOwnProperty.call(message, "path")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.path); return writer; }; @@ -11633,7 +11633,7 @@ /** * FieldBehavior enum. * @name google.api.FieldBehavior - * @enum {string} + * @enum {number} * @property {number} FIELD_BEHAVIOR_UNSPECIFIED=0 FIELD_BEHAVIOR_UNSPECIFIED value * @property {number} OPTIONAL=1 OPTIONAL value * @property {number} REQUIRED=2 REQUIRED value @@ -11754,18 +11754,18 @@ ResourceDescriptor.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.type != null && message.hasOwnProperty("type")) + if (message.type != null && Object.hasOwnProperty.call(message, "type")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); if (message.pattern != null && message.pattern.length) for (var i = 0; i < message.pattern.length; ++i) writer.uint32(/* id 2, wireType 2 =*/18).string(message.pattern[i]); - if (message.nameField != null && message.hasOwnProperty("nameField")) + if (message.nameField != null && Object.hasOwnProperty.call(message, "nameField")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.nameField); - if (message.history != null && message.hasOwnProperty("history")) + if (message.history != null && Object.hasOwnProperty.call(message, "history")) writer.uint32(/* id 4, wireType 0 =*/32).int32(message.history); - if (message.plural != null && message.hasOwnProperty("plural")) + if (message.plural != null && Object.hasOwnProperty.call(message, "plural")) writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); - if (message.singular != null && message.hasOwnProperty("singular")) + if (message.singular != null && Object.hasOwnProperty.call(message, "singular")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); return writer; }; @@ -11985,7 +11985,7 @@ /** * History enum. * @name google.api.ResourceDescriptor.History - * @enum {string} + * @enum {number} * @property {number} HISTORY_UNSPECIFIED=0 HISTORY_UNSPECIFIED value * @property {number} ORIGINALLY_SINGLE_PATTERN=1 ORIGINALLY_SINGLE_PATTERN value * @property {number} FUTURE_MULTI_PATTERN=2 FUTURE_MULTI_PATTERN value @@ -12066,9 +12066,9 @@ ResourceReference.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.type != null && message.hasOwnProperty("type")) + if (message.type != null && Object.hasOwnProperty.call(message, "type")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); - if (message.childType != null && message.hasOwnProperty("childType")) + if (message.childType != null && Object.hasOwnProperty.call(message, "childType")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.childType); return writer; }; @@ -12593,9 +12593,9 @@ FileDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message["package"] != null && message.hasOwnProperty("package")) + if (message["package"] != null && Object.hasOwnProperty.call(message, "package")) writer.uint32(/* id 2, wireType 2 =*/18).string(message["package"]); if (message.dependency != null && message.dependency.length) for (var i = 0; i < message.dependency.length; ++i) @@ -12612,9 +12612,9 @@ if (message.extension != null && message.extension.length) for (var i = 0; i < message.extension.length; ++i) $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.FileOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.sourceCodeInfo != null && message.hasOwnProperty("sourceCodeInfo")) + if (message.sourceCodeInfo != null && Object.hasOwnProperty.call(message, "sourceCodeInfo")) $root.google.protobuf.SourceCodeInfo.encode(message.sourceCodeInfo, writer.uint32(/* id 9, wireType 2 =*/74).fork()).ldelim(); if (message.publicDependency != null && message.publicDependency.length) for (var i = 0; i < message.publicDependency.length; ++i) @@ -12622,7 +12622,7 @@ if (message.weakDependency != null && message.weakDependency.length) for (var i = 0; i < message.weakDependency.length; ++i) writer.uint32(/* id 11, wireType 0 =*/88).int32(message.weakDependency[i]); - if (message.syntax != null && message.hasOwnProperty("syntax")) + if (message.syntax != null && Object.hasOwnProperty.call(message, "syntax")) writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); return writer; }; @@ -13160,7 +13160,7 @@ DescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); if (message.field != null && message.field.length) for (var i = 0; i < message.field.length; ++i) @@ -13177,7 +13177,7 @@ if (message.extension != null && message.extension.length) for (var i = 0; i < message.extension.length; ++i) $root.google.protobuf.FieldDescriptorProto.encode(message.extension[i], writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.MessageOptions.encode(message.options, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); if (message.oneofDecl != null && message.oneofDecl.length) for (var i = 0; i < message.oneofDecl.length; ++i) @@ -13642,11 +13642,11 @@ ExtensionRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) + if (message.start != null && Object.hasOwnProperty.call(message, "start")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) + if (message.end != null && Object.hasOwnProperty.call(message, "end")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.ExtensionRangeOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; @@ -13870,9 +13870,9 @@ ReservedRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) + if (message.start != null && Object.hasOwnProperty.call(message, "start")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) + if (message.end != null && Object.hasOwnProperty.call(message, "end")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); return writer; }; @@ -14363,25 +14363,25 @@ FieldDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.extendee != null && message.hasOwnProperty("extendee")) + if (message.extendee != null && Object.hasOwnProperty.call(message, "extendee")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.extendee); - if (message.number != null && message.hasOwnProperty("number")) + if (message.number != null && Object.hasOwnProperty.call(message, "number")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.number); - if (message.label != null && message.hasOwnProperty("label")) + if (message.label != null && Object.hasOwnProperty.call(message, "label")) writer.uint32(/* id 4, wireType 0 =*/32).int32(message.label); - if (message.type != null && message.hasOwnProperty("type")) + if (message.type != null && Object.hasOwnProperty.call(message, "type")) writer.uint32(/* id 5, wireType 0 =*/40).int32(message.type); - if (message.typeName != null && message.hasOwnProperty("typeName")) + if (message.typeName != null && Object.hasOwnProperty.call(message, "typeName")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.typeName); - if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) + if (message.defaultValue != null && Object.hasOwnProperty.call(message, "defaultValue")) writer.uint32(/* id 7, wireType 2 =*/58).string(message.defaultValue); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.FieldOptions.encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.oneofIndex != null && message.hasOwnProperty("oneofIndex")) + if (message.oneofIndex != null && Object.hasOwnProperty.call(message, "oneofIndex")) writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); - if (message.jsonName != null && message.hasOwnProperty("jsonName")) + if (message.jsonName != null && Object.hasOwnProperty.call(message, "jsonName")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); return writer; }; @@ -14728,7 +14728,7 @@ /** * Type enum. * @name google.protobuf.FieldDescriptorProto.Type - * @enum {string} + * @enum {number} * @property {number} TYPE_DOUBLE=1 TYPE_DOUBLE value * @property {number} TYPE_FLOAT=2 TYPE_FLOAT value * @property {number} TYPE_INT64=3 TYPE_INT64 value @@ -14774,7 +14774,7 @@ /** * Label enum. * @name google.protobuf.FieldDescriptorProto.Label - * @enum {string} + * @enum {number} * @property {number} LABEL_OPTIONAL=1 LABEL_OPTIONAL value * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value * @property {number} LABEL_REPEATED=3 LABEL_REPEATED value @@ -14855,9 +14855,9 @@ OneofDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.OneofOptions.encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -15100,12 +15100,12 @@ EnumDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); if (message.value != null && message.value.length) for (var i = 0; i < message.value.length; ++i) $root.google.protobuf.EnumValueDescriptorProto.encode(message.value[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.EnumOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); if (message.reservedRange != null && message.reservedRange.length) for (var i = 0; i < message.reservedRange.length; ++i) @@ -15408,9 +15408,9 @@ EnumReservedRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start != null && message.hasOwnProperty("start")) + if (message.start != null && Object.hasOwnProperty.call(message, "start")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && message.hasOwnProperty("end")) + if (message.end != null && Object.hasOwnProperty.call(message, "end")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); return writer; }; @@ -15630,11 +15630,11 @@ EnumValueDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.number != null && message.hasOwnProperty("number")) + if (message.number != null && Object.hasOwnProperty.call(message, "number")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.number); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.EnumValueOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; @@ -15868,12 +15868,12 @@ ServiceDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); if (message.method != null && message.method.length) for (var i = 0; i < message.method.length; ++i) $root.google.protobuf.MethodDescriptorProto.encode(message.method[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.ServiceOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; @@ -16153,17 +16153,17 @@ MethodDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name != null && message.hasOwnProperty("name")) + if (message.name != null && Object.hasOwnProperty.call(message, "name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.inputType != null && message.hasOwnProperty("inputType")) + if (message.inputType != null && Object.hasOwnProperty.call(message, "inputType")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.inputType); - if (message.outputType != null && message.hasOwnProperty("outputType")) + if (message.outputType != null && Object.hasOwnProperty.call(message, "outputType")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputType); - if (message.options != null && message.hasOwnProperty("options")) + if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.MethodOptions.encode(message.options, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.clientStreaming != null && message.hasOwnProperty("clientStreaming")) + if (message.clientStreaming != null && Object.hasOwnProperty.call(message, "clientStreaming")) writer.uint32(/* id 5, wireType 0 =*/40).bool(message.clientStreaming); - if (message.serverStreaming != null && message.hasOwnProperty("serverStreaming")) + if (message.serverStreaming != null && Object.hasOwnProperty.call(message, "serverStreaming")) writer.uint32(/* id 6, wireType 0 =*/48).bool(message.serverStreaming); return writer; }; @@ -16602,45 +16602,45 @@ FileOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) + if (message.javaPackage != null && Object.hasOwnProperty.call(message, "javaPackage")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.javaPackage); - if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) + if (message.javaOuterClassname != null && Object.hasOwnProperty.call(message, "javaOuterClassname")) writer.uint32(/* id 8, wireType 2 =*/66).string(message.javaOuterClassname); - if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) + if (message.optimizeFor != null && Object.hasOwnProperty.call(message, "optimizeFor")) writer.uint32(/* id 9, wireType 0 =*/72).int32(message.optimizeFor); - if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) + if (message.javaMultipleFiles != null && Object.hasOwnProperty.call(message, "javaMultipleFiles")) writer.uint32(/* id 10, wireType 0 =*/80).bool(message.javaMultipleFiles); - if (message.goPackage != null && message.hasOwnProperty("goPackage")) + if (message.goPackage != null && Object.hasOwnProperty.call(message, "goPackage")) writer.uint32(/* id 11, wireType 2 =*/90).string(message.goPackage); - if (message.ccGenericServices != null && message.hasOwnProperty("ccGenericServices")) + if (message.ccGenericServices != null && Object.hasOwnProperty.call(message, "ccGenericServices")) writer.uint32(/* id 16, wireType 0 =*/128).bool(message.ccGenericServices); - if (message.javaGenericServices != null && message.hasOwnProperty("javaGenericServices")) + if (message.javaGenericServices != null && Object.hasOwnProperty.call(message, "javaGenericServices")) writer.uint32(/* id 17, wireType 0 =*/136).bool(message.javaGenericServices); - if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) + if (message.pyGenericServices != null && Object.hasOwnProperty.call(message, "pyGenericServices")) writer.uint32(/* id 18, wireType 0 =*/144).bool(message.pyGenericServices); - if (message.javaGenerateEqualsAndHash != null && message.hasOwnProperty("javaGenerateEqualsAndHash")) + if (message.javaGenerateEqualsAndHash != null && Object.hasOwnProperty.call(message, "javaGenerateEqualsAndHash")) writer.uint32(/* id 20, wireType 0 =*/160).bool(message.javaGenerateEqualsAndHash); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 23, wireType 0 =*/184).bool(message.deprecated); - if (message.javaStringCheckUtf8 != null && message.hasOwnProperty("javaStringCheckUtf8")) + if (message.javaStringCheckUtf8 != null && Object.hasOwnProperty.call(message, "javaStringCheckUtf8")) writer.uint32(/* id 27, wireType 0 =*/216).bool(message.javaStringCheckUtf8); - if (message.ccEnableArenas != null && message.hasOwnProperty("ccEnableArenas")) + if (message.ccEnableArenas != null && Object.hasOwnProperty.call(message, "ccEnableArenas")) writer.uint32(/* id 31, wireType 0 =*/248).bool(message.ccEnableArenas); - if (message.objcClassPrefix != null && message.hasOwnProperty("objcClassPrefix")) + if (message.objcClassPrefix != null && Object.hasOwnProperty.call(message, "objcClassPrefix")) writer.uint32(/* id 36, wireType 2 =*/290).string(message.objcClassPrefix); - if (message.csharpNamespace != null && message.hasOwnProperty("csharpNamespace")) + if (message.csharpNamespace != null && Object.hasOwnProperty.call(message, "csharpNamespace")) writer.uint32(/* id 37, wireType 2 =*/298).string(message.csharpNamespace); - if (message.swiftPrefix != null && message.hasOwnProperty("swiftPrefix")) + if (message.swiftPrefix != null && Object.hasOwnProperty.call(message, "swiftPrefix")) writer.uint32(/* id 39, wireType 2 =*/314).string(message.swiftPrefix); - if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) + if (message.phpClassPrefix != null && Object.hasOwnProperty.call(message, "phpClassPrefix")) writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + if (message.phpNamespace != null && Object.hasOwnProperty.call(message, "phpNamespace")) writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + if (message.phpGenericServices != null && Object.hasOwnProperty.call(message, "phpGenericServices")) writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + if (message.phpMetadataNamespace != null && Object.hasOwnProperty.call(message, "phpMetadataNamespace")) writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + if (message.rubyPackage != null && Object.hasOwnProperty.call(message, "rubyPackage")) writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -17067,7 +17067,7 @@ /** * OptimizeMode enum. * @name google.protobuf.FileOptions.OptimizeMode - * @enum {string} + * @enum {number} * @property {number} SPEED=1 SPEED value * @property {number} CODE_SIZE=2 CODE_SIZE value * @property {number} LITE_RUNTIME=3 LITE_RUNTIME value @@ -17185,18 +17185,18 @@ MessageOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) + if (message.messageSetWireFormat != null && Object.hasOwnProperty.call(message, "messageSetWireFormat")) writer.uint32(/* id 1, wireType 0 =*/8).bool(message.messageSetWireFormat); - if (message.noStandardDescriptorAccessor != null && message.hasOwnProperty("noStandardDescriptorAccessor")) + if (message.noStandardDescriptorAccessor != null && Object.hasOwnProperty.call(message, "noStandardDescriptorAccessor")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.noStandardDescriptorAccessor); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) + if (message.mapEntry != null && Object.hasOwnProperty.call(message, "mapEntry")) writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.resource"] != null && message.hasOwnProperty(".google.api.resource")) + if (message[".google.api.resource"] != null && Object.hasOwnProperty.call(message, ".google.api.resource")) $root.google.api.ResourceDescriptor.encode(message[".google.api.resource"], writer.uint32(/* id 1053, wireType 2 =*/8426).fork()).ldelim(); return writer; }; @@ -17538,17 +17538,17 @@ FieldOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.ctype != null && message.hasOwnProperty("ctype")) + if (message.ctype != null && Object.hasOwnProperty.call(message, "ctype")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.ctype); - if (message.packed != null && message.hasOwnProperty("packed")) + if (message.packed != null && Object.hasOwnProperty.call(message, "packed")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.packed); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.lazy != null && message.hasOwnProperty("lazy")) + if (message.lazy != null && Object.hasOwnProperty.call(message, "lazy")) writer.uint32(/* id 5, wireType 0 =*/40).bool(message.lazy); - if (message.jstype != null && message.hasOwnProperty("jstype")) + if (message.jstype != null && Object.hasOwnProperty.call(message, "jstype")) writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jstype); - if (message.weak != null && message.hasOwnProperty("weak")) + if (message.weak != null && Object.hasOwnProperty.call(message, "weak")) writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -17559,7 +17559,7 @@ writer.int32(message[".google.api.fieldBehavior"][i]); writer.ldelim(); } - if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) + if (message[".google.api.resourceReference"] != null && Object.hasOwnProperty.call(message, ".google.api.resourceReference")) $root.google.api.ResourceReference.encode(message[".google.api.resourceReference"], writer.uint32(/* id 1055, wireType 2 =*/8442).fork()).ldelim(); return writer; }; @@ -17895,7 +17895,7 @@ /** * CType enum. * @name google.protobuf.FieldOptions.CType - * @enum {string} + * @enum {number} * @property {number} STRING=0 STRING value * @property {number} CORD=1 CORD value * @property {number} STRING_PIECE=2 STRING_PIECE value @@ -17911,7 +17911,7 @@ /** * JSType enum. * @name google.protobuf.FieldOptions.JSType - * @enum {string} + * @enum {number} * @property {number} JS_NORMAL=0 JS_NORMAL value * @property {number} JS_STRING=1 JS_STRING value * @property {number} JS_NUMBER=2 JS_NUMBER value @@ -18210,9 +18210,9 @@ EnumOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) + if (message.allowAlias != null && Object.hasOwnProperty.call(message, "allowAlias")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -18455,7 +18455,7 @@ EnumValueOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 1, wireType 0 =*/8).bool(message.deprecated); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -18704,14 +18704,14 @@ ServiceOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.defaultHost"] != null && message.hasOwnProperty(".google.api.defaultHost")) + if (message[".google.api.defaultHost"] != null && Object.hasOwnProperty.call(message, ".google.api.defaultHost")) writer.uint32(/* id 1049, wireType 2 =*/8394).string(message[".google.api.defaultHost"]); - if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) + if (message[".google.api.oauthScopes"] != null && Object.hasOwnProperty.call(message, ".google.api.oauthScopes")) writer.uint32(/* id 1050, wireType 2 =*/8402).string(message[".google.api.oauthScopes"]); return writer; }; @@ -18990,9 +18990,9 @@ MethodOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.deprecated != null && message.hasOwnProperty("deprecated")) + if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); - if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) + if (message.idempotencyLevel != null && Object.hasOwnProperty.call(message, "idempotencyLevel")) writer.uint32(/* id 34, wireType 0 =*/272).int32(message.idempotencyLevel); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -19000,7 +19000,7 @@ if (message[".google.api.methodSignature"] != null && message[".google.api.methodSignature"].length) for (var i = 0; i < message[".google.api.methodSignature"].length; ++i) writer.uint32(/* id 1051, wireType 2 =*/8410).string(message[".google.api.methodSignature"][i]); - if (message[".google.api.http"] != null && message.hasOwnProperty(".google.api.http")) + if (message[".google.api.http"] != null && Object.hasOwnProperty.call(message, ".google.api.http")) $root.google.api.HttpRule.encode(message[".google.api.http"], writer.uint32(/* id 72295728, wireType 2 =*/578365826).fork()).ldelim(); return writer; }; @@ -19234,7 +19234,7 @@ /** * IdempotencyLevel enum. * @name google.protobuf.MethodOptions.IdempotencyLevel - * @enum {string} + * @enum {number} * @property {number} IDEMPOTENCY_UNKNOWN=0 IDEMPOTENCY_UNKNOWN value * @property {number} NO_SIDE_EFFECTS=1 NO_SIDE_EFFECTS value * @property {number} IDEMPOTENT=2 IDEMPOTENT value @@ -19364,17 +19364,17 @@ if (message.name != null && message.name.length) for (var i = 0; i < message.name.length; ++i) $root.google.protobuf.UninterpretedOption.NamePart.encode(message.name[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.identifierValue != null && message.hasOwnProperty("identifierValue")) + if (message.identifierValue != null && Object.hasOwnProperty.call(message, "identifierValue")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.identifierValue); - if (message.positiveIntValue != null && message.hasOwnProperty("positiveIntValue")) + if (message.positiveIntValue != null && Object.hasOwnProperty.call(message, "positiveIntValue")) writer.uint32(/* id 4, wireType 0 =*/32).uint64(message.positiveIntValue); - if (message.negativeIntValue != null && message.hasOwnProperty("negativeIntValue")) + if (message.negativeIntValue != null && Object.hasOwnProperty.call(message, "negativeIntValue")) writer.uint32(/* id 5, wireType 0 =*/40).int64(message.negativeIntValue); - if (message.doubleValue != null && message.hasOwnProperty("doubleValue")) + if (message.doubleValue != null && Object.hasOwnProperty.call(message, "doubleValue")) writer.uint32(/* id 6, wireType 1 =*/49).double(message.doubleValue); - if (message.stringValue != null && message.hasOwnProperty("stringValue")) + if (message.stringValue != null && Object.hasOwnProperty.call(message, "stringValue")) writer.uint32(/* id 7, wireType 2 =*/58).bytes(message.stringValue); - if (message.aggregateValue != null && message.hasOwnProperty("aggregateValue")) + if (message.aggregateValue != null && Object.hasOwnProperty.call(message, "aggregateValue")) writer.uint32(/* id 8, wireType 2 =*/66).string(message.aggregateValue); return writer; }; @@ -20151,9 +20151,9 @@ writer.int32(message.span[i]); writer.ldelim(); } - if (message.leadingComments != null && message.hasOwnProperty("leadingComments")) + if (message.leadingComments != null && Object.hasOwnProperty.call(message, "leadingComments")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.leadingComments); - if (message.trailingComments != null && message.hasOwnProperty("trailingComments")) + if (message.trailingComments != null && Object.hasOwnProperty.call(message, "trailingComments")) writer.uint32(/* id 4, wireType 2 =*/34).string(message.trailingComments); if (message.leadingDetachedComments != null && message.leadingDetachedComments.length) for (var i = 0; i < message.leadingDetachedComments.length; ++i) @@ -20684,11 +20684,11 @@ writer.int32(message.path[i]); writer.ldelim(); } - if (message.sourceFile != null && message.hasOwnProperty("sourceFile")) + if (message.sourceFile != null && Object.hasOwnProperty.call(message, "sourceFile")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.sourceFile); - if (message.begin != null && message.hasOwnProperty("begin")) + if (message.begin != null && Object.hasOwnProperty.call(message, "begin")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.begin); - if (message.end != null && message.hasOwnProperty("end")) + if (message.end != null && Object.hasOwnProperty.call(message, "end")) writer.uint32(/* id 4, wireType 0 =*/32).int32(message.end); return writer; }; @@ -20941,9 +20941,9 @@ Duration.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.seconds != null && message.hasOwnProperty("seconds")) + if (message.seconds != null && Object.hasOwnProperty.call(message, "seconds")) writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); - if (message.nanos != null && message.hasOwnProperty("nanos")) + if (message.nanos != null && Object.hasOwnProperty.call(message, "nanos")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); return writer; }; @@ -21528,9 +21528,9 @@ Timestamp.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.seconds != null && message.hasOwnProperty("seconds")) + if (message.seconds != null && Object.hasOwnProperty.call(message, "seconds")) writer.uint32(/* id 1, wireType 0 =*/8).int64(message.seconds); - if (message.nanos != null && message.hasOwnProperty("nanos")) + if (message.nanos != null && Object.hasOwnProperty.call(message, "nanos")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.nanos); return writer; }; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 12fbacb89cb..a5cd4afdea5 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "966614d43db9bbffc6d821f713733168d3e1d67f" + "sha": "aef28daccfbf0be39c740bde6cdd51a499571555" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "cdf13efacdea0649e940452f9c5d320b93735974", - "internalRef": "306783437" + "sha": "42ee97c1b93a0e3759bbba3013da309f670a90ab", + "internalRef": "307114445" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6980131905b652563280e4d2482384d4acc9eafc" + "sha": "f5e4c17dc78a966dbf29961dd01f9bbd63e20a04" } } ], From 4168c15cd0c477929c0d417b775ec625b2432891 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 23 Apr 2020 19:31:20 -0700 Subject: [PATCH 0619/1115] chore: update npm scripts and synth.py (#982) Update npm scripts: add clean, prelint, prefix; make sure that lint and fix are set properly. Use post-process feature of synthtool. --- handwritten/pubsub/package.json | 5 +++-- handwritten/pubsub/synth.py | 7 ++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2d7d0147a6d..472fb597bd9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -31,7 +31,7 @@ "system-test": "mocha build/system-test --timeout 600000", "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", "test": "c8 mocha build/test", - "lint": "gts fix", + "lint": "gts check", "predocs": "npm run compile", "docs": "jsdoc -c .jsdoc.js", "fix": "gts fix", @@ -43,7 +43,8 @@ "docs-test": "linkinator docs", "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js", - "prelint": "cd samples; npm link ../; npm install" + "prelint": "cd samples; npm link ../; npm install", + "precompile": "gts clean" }, "dependencies": { "@google-cloud/paginator": "^3.0.0", diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 72f623f1a93..81d0ba28e27 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -1,7 +1,7 @@ import synthtool as s import synthtool.gcp as gcp +import synthtool.languages.node as node import logging -import subprocess import json import os @@ -35,7 +35,4 @@ templates = common_templates.node_library(source_location='build/src') s.copy(templates) -# Node.js specific cleanup -subprocess.run(['npm', 'install']) -subprocess.run(['npm', 'run', 'fix']) -subprocess.run(['npx', 'compileProtos', 'src']) +node.postprocess_gapic_library() From 1d8515e59d4c6042cdda2e91478eda6ed684980b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 27 Apr 2020 19:56:27 +0200 Subject: [PATCH 0620/1115] chore(deps): update dependency tmp to ^0.2.0 (#984) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [tmp](https://togithub.com/raszi/node-tmp) | devDependencies | minor | [`^0.1.0` -> `^0.2.0`](https://renovatebot.com/diffs/npm/tmp/0.1.0/0.2.0) | --- ### Release Notes
raszi/node-tmp ### [`v0.2.0`](https://togithub.com/raszi/node-tmp/blob/master/CHANGELOG.md#tmp-v020) [Compare Source](https://togithub.com/raszi/node-tmp/compare/v0.1.0...v0.2.0) - drop support for node version < v8.17.0 **_BREAKING CHANGE_** node versions < v8.17.0 are no longer supported. - [#​216](https://togithub.com/raszi/node-tmp/issues/216) **_BREAKING CHANGE_** SIGINT handler has been removed. Users must install their own SIGINT handler and call process.exit() so that tmp's process exit handler can do the cleanup. A simple handler would be process.on('SIGINT', process.exit); - [#​156](https://togithub.com/raszi/node-tmp/issues/156) **_BREAKING CHANGE_** template option no longer accepts arbitrary paths. all paths must be relative to os.tmpdir(). the template option can point to an absolute path that is located under os.tmpdir(). this can now be used in conjunction with the dir option. - [#​207](https://togithub.com/raszi/node-tmp/issues/TBD) **_BREAKING CHANGE_** dir option no longer accepts arbitrary paths. all paths must be relative to os.tmpdir(). the dir option can point to an absolute path that is located under os.tmpdir(). - [#​218](https://togithub.com/raszi/node-tmp/issues/TBD) **_BREAKING CHANGE_** name option no longer accepts arbitrary paths. name must no longer contain a path and will always be made relative to the current os.tmpdir() and the optional dir option. - [#​197](https://togithub.com/raszi/node-tmp/issues/197) **_BUG FIX_** sync cleanup callback must be returned when using the sync API functions. fs.rmdirSync() must not be called with a second parameter that is a function. - [#​176](https://togithub.com/raszi/node-tmp/issues/176) **_BUG FIX_** fail early if no os.tmpdir() was specified. previous versions of Electron did return undefined when calling os.tmpdir(). \_getTmpDir() now tries to resolve the path returned by os.tmpdir(). now using rimraf for removing directory trees. - [#​246](https://togithub.com/raszi/node-tmp/issues/246) **_BUG FIX_** os.tmpdir() might return a value that includes single or double quotes, similarly so the dir option, the template option and the name option - [#​240](https://togithub.com/raszi/node-tmp/issues/240) **_DOCUMENTATION_** better documentation for `tmp.setGracefulCleanup()`. - [#​206](https://togithub.com/raszi/node-tmp/issues/206) **_DOCUMENTATION_** document name option. - [#​236](https://togithub.com/raszi/node-tmp/issues/236) **_DOCUMENTATION_** document discardDescriptor option. - [#​237](https://togithub.com/raszi/node-tmp/issues/237) **_DOCUMENTATION_** document detachDescriptor option. - [#​238](https://togithub.com/raszi/node-tmp/issues/238) **_DOCUMENTATION_** document mode option. - [#​175](https://togithub.com/raszi/node-tmp/issues/175) **_DOCUMENTATION_** document unsafeCleanup option. ##### Miscellaneous - stabilized tests - general clean up - update jsdoc
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 472fb597bd9..01ca08792d9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -92,7 +92,7 @@ "null-loader": "^4.0.0", "proxyquire": "^2.0.0", "sinon": "^9.0.0", - "tmp": "^0.1.0", + "tmp": "^0.2.0", "ts-loader": "^7.0.0", "typescript": "3.6.4", "uuid": "^7.0.0", From 4b2caeaa6f04eab2331ea2ea0629b3dcea8589f2 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 7 May 2020 22:03:34 -0700 Subject: [PATCH 0621/1115] refactor: use grpc from google-gax (#994) --- handwritten/pubsub/bin/benchwrapper.js | 15 ++++-- handwritten/pubsub/package.json | 3 +- handwritten/pubsub/src/index.ts | 7 ++- handwritten/pubsub/src/message-queues.ts | 12 ++--- handwritten/pubsub/src/message-stream.ts | 39 +++++++-------- .../pubsub/src/publisher/publish-error.ts | 22 ++++----- handwritten/pubsub/src/pubsub.ts | 18 +++---- handwritten/pubsub/src/pull-retry.ts | 30 ++++++------ handwritten/pubsub/test/message-queues.ts | 12 ++--- handwritten/pubsub/test/message-stream.ts | 11 ++--- .../pubsub/test/publisher/publish-error.ts | 7 ++- handwritten/pubsub/test/pubsub.ts | 37 ++++++++------- handwritten/pubsub/test/pull-retry.ts | 47 +++++++++---------- 13 files changed, 128 insertions(+), 132 deletions(-) diff --git a/handwritten/pubsub/bin/benchwrapper.js b/handwritten/pubsub/bin/benchwrapper.js index d4571051d6a..3b8a6d91f81 100644 --- a/handwritten/pubsub/bin/benchwrapper.js +++ b/handwritten/pubsub/bin/benchwrapper.js @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -const grpc = require('grpc'); +const {grpc} = require('google-gax'); const protoLoader = require('@grpc/proto-loader'); const {PubSub} = require('../build/src'); @@ -67,5 +67,14 @@ server.addService(pubsubBenchWrapper['PubsubBenchWrapper']['service'], { Recv: recv, }); console.log(`starting on localhost:${argv.port}`); -server.bind(`0.0.0.0:${argv.port}`, grpc.ServerCredentials.createInsecure()); -server.start(); +server.bindAsync( + `0.0.0.0:${argv.port}`, + grpc.ServerCredentials.createInsecure(), + err => { + if (err) { + throw err; + } else { + server.start(); + } + } +); diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 01ca08792d9..66edfd34893 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -64,7 +64,7 @@ "protobufjs": "^6.8.1" }, "devDependencies": { - "@grpc/proto-loader": "^0.5.2", + "@grpc/proto-loader": "^0.5.4", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", @@ -79,7 +79,6 @@ "c8": "^7.0.0", "codecov": "^3.0.0", "execa": "^4.0.0", - "grpc": "^1.24.0", "gts": "^2.0.0", "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 5aa45083735..6b95a919879 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -148,10 +148,9 @@ export { if (process.env.DEBUG_GRPC) { console.info('gRPC logging set to verbose'); - // eslint-disable-next-line - const {setLogger, setLogVerbosity, logVerbosity} = require('@grpc/grpc-js'); - setLogger(console); - setLogVerbosity(logVerbosity.DEBUG); + const grpc = require('google-gax').grpc; + grpc.setLogger(console); + grpc.setLogVerbosity(grpc.logVerbosity.DEBUG); } import * as protos from '../protos/protos'; export {protos}; diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 62282707ae6..82493a4d2ce 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -14,9 +14,7 @@ * limitations under the License. */ -import {CallOptions} from 'google-gax'; -// eslint-disable-next-line node/no-extraneous-import -import {Metadata, ServiceError, status} from '@grpc/grpc-js'; +import {CallOptions, grpc} from 'google-gax'; import defer = require('p-defer'); import {Message, Subscriber} from './subscriber'; @@ -37,12 +35,12 @@ export interface BatchOptions { * @param {string} message The error message. * @param {ServiceError} err The grpc service error. */ -export class BatchError extends Error implements ServiceError { +export class BatchError extends Error implements grpc.ServiceError { ackIds: string[]; - code: status; + code: grpc.status; details: string; - metadata: Metadata; - constructor(err: ServiceError, ackIds: string[], rpc: string) { + metadata: grpc.Metadata; + constructor(err: grpc.ServiceError, ackIds: string[], rpc: string) { super( `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ process.env.DEBUG_GRPC ? err.stack : err.message diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 87c95a1ce05..5d019bc4d5a 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -15,15 +15,7 @@ */ import {promisify} from '@google-cloud/promisify'; -import {ClientStub} from 'google-gax'; -import { - ClientDuplexStream, - Metadata, - ServiceError, - status, - StatusObject, - // eslint-disable-next-line node/no-extraneous-import -} from '@grpc/grpc-js'; +import {ClientStub, grpc} from 'google-gax'; import * as isStreamEnded from 'is-stream-ended'; import {PassThrough} from 'stream'; @@ -59,7 +51,10 @@ interface StreamState { type StreamingPullRequest = google.pubsub.v1.IStreamingPullRequest; type PullResponse = google.pubsub.v1.IPullResponse; -type PullStream = ClientDuplexStream & { +type PullStream = grpc.ClientDuplexStream< + StreamingPullRequest, + PullResponse +> & { _readableState: StreamState; }; @@ -70,11 +65,11 @@ type PullStream = ClientDuplexStream & { * * @param {object} status The gRPC status object. */ -export class StatusError extends Error implements ServiceError { - code: status; +export class StatusError extends Error implements grpc.ServiceError { + code: grpc.status; details: string; - metadata: Metadata; - constructor(status: StatusObject) { + metadata: grpc.Metadata; + constructor(status: grpc.StatusObject) { super(status.details); this.code = status.code; this.details = status.details; @@ -89,10 +84,10 @@ export class StatusError extends Error implements ServiceError { * * @param {Error} err The original error. */ -export class ChannelError extends Error implements ServiceError { - code: status; +export class ChannelError extends Error implements grpc.ServiceError { + code: grpc.status; details: string; - metadata: Metadata; + metadata: grpc.Metadata; constructor(err: Error) { super( `Failed to connect to channel. Reason: ${ @@ -100,10 +95,10 @@ export class ChannelError extends Error implements ServiceError { }` ); this.code = err.message.includes('deadline') - ? status.DEADLINE_EXCEEDED - : status.UNKNOWN; + ? grpc.status.DEADLINE_EXCEEDED + : grpc.status.UNKNOWN; this.details = err.message; - this.metadata = new Metadata(); + this.metadata = new grpc.Metadata(); } } @@ -287,7 +282,7 @@ export class MessageStream extends PassThrough { * @param {Duplex} stream The ended stream. * @param {object} status The stream status. */ - private _onEnd(stream: PullStream, status: StatusObject): void { + private _onEnd(stream: PullStream, status: grpc.StatusObject): void { this._removeStream(stream); if (this._fillHandle) { @@ -331,7 +326,7 @@ export class MessageStream extends PassThrough { * @param {stream} stream The stream that was closed. * @param {object} status The status message stating why it was closed. */ - private _onStatus(stream: PullStream, status: StatusObject): void { + private _onStatus(stream: PullStream, status: grpc.StatusObject): void { if (this.destroyed) { return; } diff --git a/handwritten/pubsub/src/publisher/publish-error.ts b/handwritten/pubsub/src/publisher/publish-error.ts index d59d1d27e6b..6669cf658fe 100644 --- a/handwritten/pubsub/src/publisher/publish-error.ts +++ b/handwritten/pubsub/src/publisher/publish-error.ts @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -// eslint-disable-next-line node/no-extraneous-import -import {ServiceError, Metadata, status} from '@grpc/grpc-js'; +import {grpc} from 'google-gax'; /** * Exception to be thrown during failed ordered publish. @@ -23,17 +21,17 @@ import {ServiceError, Metadata, status} from '@grpc/grpc-js'; * @class * @extends Error */ -export class PublishError extends Error implements ServiceError { - code: status; +export class PublishError extends Error implements grpc.ServiceError { + code: grpc.status; details: string; - metadata: Metadata; + metadata: grpc.Metadata; orderingKey: string; - error: ServiceError; - constructor(key: string, err: ServiceError) { + error: grpc.ServiceError; + constructor(key: string, err: grpc.ServiceError) { super(`Unable to publish for key "${key}". Reason: ${err.message}`); /** - * The gRPC status code. + * The gRPC grpc.status code. * * @name PublishError#code * @type {number} @@ -41,7 +39,7 @@ export class PublishError extends Error implements ServiceError { this.code = err.code; /** - * The gRPC status details. + * The gRPC grpc.status details. * * @name PublishError#details * @type {string} @@ -49,9 +47,9 @@ export class PublishError extends Error implements ServiceError { this.details = err.details; /** - * The gRPC metadata object. + * The gRPC grpc.Metadata object. * - * @name PublishError#metadata + * @name PublishError#grpc.Metadata * @type {object} */ this.metadata = err.metadata; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 5e2cbc0d5b1..69a9f0a7d51 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -20,10 +20,6 @@ import {promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; import * as gax from 'google-gax'; -// eslint-disable-next-line node/no-extraneous-import -import * as grpc from '@grpc/grpc-js'; -// eslint-disable-next-line node/no-extraneous-import -import {ServiceError, ChannelCredentials} from '@grpc/grpc-js'; // eslint-disable-next-line @typescript-eslint/no-var-requires const PKG = require('../../package.json'); @@ -64,7 +60,7 @@ export interface ClientConfig extends gax.GrpcClientOptions { apiEndpoint?: string; servicePath?: string; port?: string | number; - sslCreds?: ChannelCredentials; + sslCreds?: gax.grpc.ChannelCredentials; } export interface PageOptions { @@ -132,7 +128,7 @@ export interface RequestConfig extends GetClientConfig { export interface ResourceCallback { ( - err: ServiceError | null, + err: gax.grpc.ServiceError | null, resource?: Resource | null, response?: Response | null ): void; @@ -143,12 +139,12 @@ export type RequestCallback = R extends void : PagedCallback; export interface NormalCallback { - (err: ServiceError | null, res?: TResponse | null): void; + (err: gax.grpc.ServiceError | null, res?: TResponse | null): void; } export interface PagedCallback { ( - err: ServiceError | null, + err: gax.grpc.ServiceError | null, results?: Item[] | null, nextQuery?: {} | null, response?: Response | null @@ -559,7 +555,7 @@ export class PubSub { return; } - const grpcInstance = this.options.grpc || grpc; + const grpcInstance = this.options.grpc || gax.grpc; const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; const leadingProtocol = new RegExp('^https*://'); const trailingSlashes = new RegExp('/*$'); @@ -1009,13 +1005,13 @@ export class PubSub { }; const err = new Error(statusObject.details); Object.assign(err, statusObject); - callback(err as ServiceError); + callback(err as gax.grpc.ServiceError); return; } this.getClient_(config, (err, client) => { if (err) { - callback(err as ServiceError); + callback(err as gax.grpc.ServiceError); return; } let reqOpts = extend(true, {}, config.reqOpts); diff --git a/handwritten/pubsub/src/pull-retry.ts b/handwritten/pubsub/src/pull-retry.ts index cd4d77842ac..00db9e2fcf3 100644 --- a/handwritten/pubsub/src/pull-retry.ts +++ b/handwritten/pubsub/src/pull-retry.ts @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// eslint-disable-next-line node/no-extraneous-import -import {StatusObject, status} from '@grpc/grpc-js'; +import {grpc} from 'google-gax'; /*! - * retryable status codes + * retryable grpc.status codes */ -export const RETRY_CODES: status[] = [ - status.DEADLINE_EXCEEDED, - status.RESOURCE_EXHAUSTED, - status.ABORTED, - status.INTERNAL, - status.UNAVAILABLE, +export const RETRY_CODES: grpc.status[] = [ + grpc.status.DEADLINE_EXCEEDED, + grpc.status.RESOURCE_EXHAUSTED, + grpc.status.ABORTED, + grpc.status.INTERNAL, + grpc.status.UNAVAILABLE, ]; /** @@ -51,7 +50,7 @@ export class PullRetry { return Math.pow(2, this.failures) * 1000 + Math.floor(Math.random() * 1000); } /** - * Determines if a request status should be retried. + * Determines if a request grpc.status should be retried. * * Deadlines behave kind of unexpectedly on streams, rather than using it as * an indicator of when to give up trying to connect, it actually dictates @@ -60,18 +59,21 @@ export class PullRetry { * the server closing the stream or if we timed out waiting for a connection. * * @private - * @param {object} status The request status. + * @param {object} grpc.status The request grpc.status. * @returns {boolean} */ - retry(err: StatusObject): boolean { - if (err.code === status.OK || err.code === status.DEADLINE_EXCEEDED) { + retry(err: grpc.StatusObject): boolean { + if ( + err.code === grpc.status.OK || + err.code === grpc.status.DEADLINE_EXCEEDED + ) { this.failures = 0; } else { this.failures += 1; } if ( - err.code === status.UNAVAILABLE && + err.code === grpc.status.UNAVAILABLE && err.details && err.details.match(/Server shutdownNow invoked/) ) { diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index a96a29e2f62..4f264674f38 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -17,9 +17,7 @@ import * as assert from 'assert'; import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; -import {CallOptions} from 'google-gax'; -// eslint-disable-next-line node/no-extraneous-import -import {Metadata, ServiceError} from '@grpc/grpc-js'; +import {CallOptions, grpc} from 'google-gax'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import * as uuid from 'uuid'; @@ -373,9 +371,9 @@ describe('MessageQueues', () => { const ackIds = messages.map(message => message.ackId); - const fakeError = new Error('Err.') as ServiceError; + const fakeError = new Error('Err.') as grpc.ServiceError; fakeError.code = 2; - fakeError.metadata = new Metadata(); + fakeError.metadata = new grpc.Metadata(); const expectedMessage = 'Failed to "acknowledge" for 3 message(s). Reason: Err.'; @@ -498,9 +496,9 @@ describe('MessageQueues', () => { const ackIds = messages.map(message => message.ackId); - const fakeError = new Error('Err.') as ServiceError; + const fakeError = new Error('Err.') as grpc.ServiceError; fakeError.code = 2; - fakeError.metadata = new Metadata(); + fakeError.metadata = new grpc.Metadata(); const expectedMessage = 'Failed to "modifyAckDeadline" for 3 message(s). Reason: Err.'; diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 4bc71b22bba..511f2f8faca 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -16,8 +16,7 @@ import * as assert from 'assert'; import {describe, it, before, beforeEach, afterEach, after} from 'mocha'; -// eslint-disable-next-line node/no-extraneous-import -import {Metadata, ServiceError} from '@grpc/grpc-js'; +import {grpc} from 'google-gax'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {Duplex, PassThrough} from 'stream'; @@ -88,7 +87,7 @@ class FakeGrpcStream extends Duplex { const status = { code: 1, details: 'Canceled.', - metadata: new Metadata(), + metadata: new grpc.Metadata(), }; process.nextTick(() => { @@ -429,7 +428,7 @@ describe('MessageStream', () => { const fakeError = new Error('err'); const expectedMessage = 'Failed to connect to channel. Reason: err'; - ms.on('error', (err: ServiceError) => { + ms.on('error', (err: grpc.ServiceError) => { assert.strictEqual(err.code, 2); assert.strictEqual(err.message, expectedMessage); assert.strictEqual(ms.destroyed, true); @@ -447,7 +446,7 @@ describe('MessageStream', () => { const ms = new MessageStream(subscriber); const fakeError = new Error('Failed to connect before the deadline'); - ms.on('error', (err: ServiceError) => { + ms.on('error', (err: grpc.ServiceError) => { assert.strictEqual(err.code, 4); done(); }); @@ -533,7 +532,7 @@ describe('MessageStream', () => { details: 'Err', }; - messageStream.on('error', (err: ServiceError) => { + messageStream.on('error', (err: grpc.ServiceError) => { assert(err instanceof Error); assert.strictEqual(err.code, fakeStatus.code); assert.strictEqual(err.message, fakeStatus.details); diff --git a/handwritten/pubsub/test/publisher/publish-error.ts b/handwritten/pubsub/test/publisher/publish-error.ts index 9646feec1f3..2d2cd71cd2b 100644 --- a/handwritten/pubsub/test/publisher/publish-error.ts +++ b/handwritten/pubsub/test/publisher/publish-error.ts @@ -16,19 +16,18 @@ import * as assert from 'assert'; import {describe, it, beforeEach} from 'mocha'; -// eslint-disable-next-line node/no-extraneous-import -import {ServiceError, Metadata} from '@grpc/grpc-js'; +import {grpc} from 'google-gax'; import {PublishError} from '../../src/publisher/publish-error'; describe('PublishError', () => { let error: PublishError; const orderingKey = 'abcd'; - const fakeError = new Error('Oh noes') as ServiceError; + const fakeError = new Error('Oh noes') as grpc.ServiceError; fakeError.code = 1; fakeError.details = 'Something went wrong!'; - fakeError.metadata = new Metadata(); + fakeError.metadata = new grpc.Metadata(); beforeEach(() => { error = new PublishError(orderingKey, fakeError); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index b30aa13fb3e..56897ded83d 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -18,10 +18,6 @@ import arrify = require('arrify'); import * as assert from 'assert'; import {describe, it, before, beforeEach, after, afterEach} from 'mocha'; import * as gax from 'google-gax'; -// eslint-disable-next-line node/no-extraneous-import -import * as grpc from '@grpc/grpc-js'; -// eslint-disable-next-line node/no-extraneous-import -import {CallOptions, ChannelCredentials, ServiceError} from '@grpc/grpc-js'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -36,8 +32,8 @@ import * as util from '../src/util'; const PKG = require('../../package.json'); const sandbox = sinon.createSandbox(); -const fakeCreds = {} as ChannelCredentials; -sandbox.stub(grpc.credentials, 'createInsecure').returns(fakeCreds); +const fakeCreds = {} as gax.grpc.ChannelCredentials; +sandbox.stub(gax.grpc.credentials, 'createInsecure').returns(fakeCreds); const subscriptionCached = subby.Subscription; @@ -172,7 +168,7 @@ describe('PubSub', () => { 'google-auth-library': { GoogleAuth: fakeGoogleAuth, }, - grpc, + grpc: gax.grpc, './snapshot': {Snapshot: FakeSnapshot}, './subscription': {Subscription}, './topic': {Topic: FakeTopic}, @@ -692,7 +688,7 @@ describe('PubSub', () => { }; setHost('localhost'); - pubsub.options.grpc = (fakeGrpc as unknown) as typeof grpc; + pubsub.options.grpc = (fakeGrpc as unknown) as typeof gax.grpc; pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.sslCreds, fakeCredentials); }); @@ -782,7 +778,11 @@ describe('PubSub', () => { pubsub.getSnapshots((err: any, snapshots: any) => { assert.ifError(err); assert.strictEqual(snapshots![0], snapshot); - assert.strictEqual(snapshots![0].metadata, apiResponse.snapshots[0]); + assert.strictEqual( + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (snapshots![0] as any).metadata, + apiResponse.snapshots[0] + ); done(); }); }); @@ -869,7 +869,7 @@ describe('PubSub', () => { it('should return Subscription instances', done => { pubsub.getSubscriptions( ( - err: ServiceError | null, + err: gax.grpc.ServiceError | null, subscriptions?: subby.Subscription[] | null ) => { assert.ifError(err); @@ -891,7 +891,7 @@ describe('PubSub', () => { pubsub.getSubscriptions( ( - err: ServiceError | null, + err: gax.grpc.ServiceError | null, subs?: subby.Subscription[] | null, apiResponse?: google.pubsub.v1.IListSubscriptionsResponse | null ) => { @@ -1008,7 +1008,8 @@ describe('PubSub', () => { pubsub.getTopics((err: any, topics: any) => { assert.ifError(err); assert.strictEqual(topics![0], topic); - assert.strictEqual(topics![0].metadata, apiResponse.topics[0]); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + assert.strictEqual((topics![0] as any).metadata, apiResponse.topics[0]); done(); }); }); @@ -1084,7 +1085,7 @@ describe('PubSub', () => { callback(expectedError); }; - pubsub.request(CONFIG, (err: ServiceError | null) => { + pubsub.request(CONFIG, (err: gax.grpc.ServiceError | null) => { assert.strictEqual(expectedError, err); done(); }); @@ -1093,7 +1094,11 @@ describe('PubSub', () => { it('should call client method with correct options', done => { const fakeClient = {}; // eslint-disable-next-line @typescript-eslint/no-explicit-any - (fakeClient as any).fakeMethod = (reqOpts: any, gaxOpts: CallOptions) => { + (fakeClient as any).fakeMethod = ( + // eslint-disable-next-line @typescript-eslint/no-explicit-any + reqOpts: any, + gaxOpts: gax.CallOptions + ) => { assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); done(); @@ -1301,7 +1306,7 @@ describe('PubSub', () => { callback(error); }; - pubsub.request(CONFIG, (err: ServiceError | null) => { + pubsub.request(CONFIG, (err: gax.ServiceError | null) => { assert.strictEqual(err, error); done(); }); @@ -1334,7 +1339,7 @@ describe('PubSub', () => { const fakeClient = { // eslint-disable-next-line @typescript-eslint/no-explicit-any - fakeMethod(reqOpts: any, gaxOpts: CallOptions) { + fakeMethod(reqOpts: any, gaxOpts: gax.CallOptions) { assert.strictEqual(reqOpts, replacedReqOpts); assert.strictEqual(gaxOpts, CONFIG.gaxOpts); done(); diff --git a/handwritten/pubsub/test/pull-retry.ts b/handwritten/pubsub/test/pull-retry.ts index 2a1ba3c82a2..8a44759a533 100644 --- a/handwritten/pubsub/test/pull-retry.ts +++ b/handwritten/pubsub/test/pull-retry.ts @@ -15,8 +15,7 @@ import * as assert from 'assert'; import * as sinon from 'sinon'; import {describe, it, beforeEach, afterEach} from 'mocha'; -// eslint-disable-next-line node/no-extraneous-import -import {StatusObject, status} from '@grpc/grpc-js'; +import {grpc} from 'google-gax'; import {PullRetry} from '../src/pull-retry'; describe('PullRetry', () => { @@ -43,7 +42,7 @@ describe('PullRetry', () => { sandbox.stub(global.Math, 'random').returns(random); - retrier.retry({code: status.CANCELLED} as StatusObject); + retrier.retry({code: grpc.status.CANCELLED} as grpc.StatusObject); assert.strictEqual(retrier.createTimeout(), expected); }); }); @@ -51,47 +50,47 @@ describe('PullRetry', () => { describe('retry', () => { it('should return true for retryable errors', () => { [ - status.DEADLINE_EXCEEDED, - status.RESOURCE_EXHAUSTED, - status.ABORTED, - status.INTERNAL, - status.UNAVAILABLE, - ].forEach((code: status) => { - const shouldRetry = retrier.retry({code} as StatusObject); + grpc.status.DEADLINE_EXCEEDED, + grpc.status.RESOURCE_EXHAUSTED, + grpc.status.ABORTED, + grpc.status.INTERNAL, + grpc.status.UNAVAILABLE, + ].forEach((code: grpc.status) => { + const shouldRetry = retrier.retry({code} as grpc.StatusObject); assert.strictEqual(shouldRetry, true); }); const serverShutdown = retrier.retry({ - code: status.UNAVAILABLE, + code: grpc.status.UNAVAILABLE, details: 'Server shutdownNow invoked', - } as StatusObject); + } as grpc.StatusObject); assert.strictEqual(serverShutdown, true); }); it('should return false for non-retryable errors', () => { [ - status.INVALID_ARGUMENT, - status.NOT_FOUND, - status.PERMISSION_DENIED, - status.FAILED_PRECONDITION, - status.OUT_OF_RANGE, - status.UNIMPLEMENTED, - ].forEach((code: status) => { - const shouldRetry = retrier.retry({code} as StatusObject); + grpc.status.INVALID_ARGUMENT, + grpc.status.NOT_FOUND, + grpc.status.PERMISSION_DENIED, + grpc.status.FAILED_PRECONDITION, + grpc.status.OUT_OF_RANGE, + grpc.status.UNIMPLEMENTED, + ].forEach((code: grpc.status) => { + const shouldRetry = retrier.retry({code} as grpc.StatusObject); assert.strictEqual(shouldRetry, false); }); }); it('should reset the failure count on OK', () => { - retrier.retry({code: status.CANCELLED} as StatusObject); - retrier.retry({code: status.OK} as StatusObject); + retrier.retry({code: grpc.status.CANCELLED} as grpc.StatusObject); + retrier.retry({code: grpc.status.OK} as grpc.StatusObject); assert.strictEqual(retrier.createTimeout(), 0); }); it('should reset the failure count on DEADLINE_EXCEEDED', () => { - retrier.retry({code: status.CANCELLED} as StatusObject); - retrier.retry({code: status.DEADLINE_EXCEEDED} as StatusObject); + retrier.retry({code: grpc.status.CANCELLED} as grpc.StatusObject); + retrier.retry({code: grpc.status.DEADLINE_EXCEEDED} as grpc.StatusObject); assert.strictEqual(retrier.createTimeout(), 0); }); From c39d9695fa9f6a91bb6052945e0374456274201f Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 7 May 2020 22:14:06 -0700 Subject: [PATCH 0622/1115] fix: regen protos and tests, formatting (#991) --- handwritten/pubsub/synth.metadata | 14 +-- handwritten/pubsub/test/gapic_publisher_v1.ts | 68 ++++++-------- .../pubsub/test/gapic_subscriber_v1.ts | 93 ++++++------------- 3 files changed, 59 insertions(+), 116 deletions(-) diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index a5cd4afdea5..0c9f43e935d 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -3,23 +3,15 @@ { "git": { "name": ".", - "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "aef28daccfbf0be39c740bde6cdd51a499571555" - } - }, - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "42ee97c1b93a0e3759bbba3013da309f670a90ab", - "internalRef": "307114445" + "remote": "git@github.com:googleapis/nodejs-pubsub.git", + "sha": "2e973a55008c4d50ef3f7d47ac4ba761cd2ea9cb" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f5e4c17dc78a966dbf29961dd01f9bbd63e20a04" + "sha": "ab883569eb0257bbf16a6d825fd018b3adde3912" } } ], diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 329d4b7d837..5296549caf1 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -297,9 +297,7 @@ describe('v1.PublisherClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.createTopic(request); - }, expectedError); + await assert.rejects(client.createTopic(request), expectedError); assert( (client.innerApiCalls.createTopic as SinonStub) .getCall(0) @@ -414,9 +412,7 @@ describe('v1.PublisherClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.updateTopic(request); - }, expectedError); + await assert.rejects(client.updateTopic(request), expectedError); assert( (client.innerApiCalls.updateTopic as SinonStub) .getCall(0) @@ -525,9 +521,7 @@ describe('v1.PublisherClient', () => { }; const expectedError = new Error('expected'); client.innerApiCalls.publish = stubSimpleCall(undefined, expectedError); - await assert.rejects(async () => { - await client.publish(request); - }, expectedError); + await assert.rejects(client.publish(request), expectedError); assert( (client.innerApiCalls.publish as SinonStub) .getCall(0) @@ -636,9 +630,7 @@ describe('v1.PublisherClient', () => { }; const expectedError = new Error('expected'); client.innerApiCalls.getTopic = stubSimpleCall(undefined, expectedError); - await assert.rejects(async () => { - await client.getTopic(request); - }, expectedError); + await assert.rejects(client.getTopic(request), expectedError); assert( (client.innerApiCalls.getTopic as SinonStub) .getCall(0) @@ -750,9 +742,7 @@ describe('v1.PublisherClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.deleteTopic(request); - }, expectedError); + await assert.rejects(client.deleteTopic(request), expectedError); assert( (client.innerApiCalls.deleteTopic as SinonStub) .getCall(0) @@ -868,9 +858,7 @@ describe('v1.PublisherClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.listTopics(request); - }, expectedError); + await assert.rejects(client.listTopics(request), expectedError); assert( (client.innerApiCalls.listTopics as SinonStub) .getCall(0) @@ -954,9 +942,7 @@ describe('v1.PublisherClient', () => { reject(err); }); }); - await assert.rejects(async () => { - await promise; - }, expectedError); + await assert.rejects(promise, expectedError); assert( (client.descriptors.page.listTopics.createStream as SinonStub) .getCall(0) @@ -1145,9 +1131,10 @@ describe('v1.PublisherClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.listTopicSubscriptions(request); - }, expectedError); + await assert.rejects( + client.listTopicSubscriptions(request), + expectedError + ); assert( (client.innerApiCalls.listTopicSubscriptions as SinonStub) .getCall(0) @@ -1229,9 +1216,7 @@ describe('v1.PublisherClient', () => { reject(err); }); }); - await assert.rejects(async () => { - await promise; - }, expectedError); + await assert.rejects(promise, expectedError); assert( (client.descriptors.page.listTopicSubscriptions .createStream as SinonStub) @@ -1418,9 +1403,7 @@ describe('v1.PublisherClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.listTopicSnapshots(request); - }, expectedError); + await assert.rejects(client.listTopicSnapshots(request), expectedError); assert( (client.innerApiCalls.listTopicSnapshots as SinonStub) .getCall(0) @@ -1501,9 +1484,7 @@ describe('v1.PublisherClient', () => { reject(err); }); }); - await assert.rejects(async () => { - await promise; - }, expectedError); + await assert.rejects(promise, expectedError); assert( (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) .getCall(0) @@ -1685,9 +1666,10 @@ describe('v1.PublisherClient', () => { }; const expectedError = new Error('expected'); client.iamClient.getIamPolicy = stubSimpleCall(undefined, expectedError); - await assert.rejects(async () => { - await client.getIamPolicy(request, expectedOptions); - }, expectedError); + await assert.rejects( + client.getIamPolicy(request, expectedOptions), + expectedError + ); assert( (client.iamClient.getIamPolicy as SinonStub) .getCall(0) @@ -1790,9 +1772,10 @@ describe('v1.PublisherClient', () => { }; const expectedError = new Error('expected'); client.iamClient.setIamPolicy = stubSimpleCall(undefined, expectedError); - await assert.rejects(async () => { - await client.setIamPolicy(request, expectedOptions); - }, expectedError); + await assert.rejects( + client.setIamPolicy(request, expectedOptions), + expectedError + ); assert( (client.iamClient.setIamPolicy as SinonStub) .getCall(0) @@ -1901,9 +1884,10 @@ describe('v1.PublisherClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.testIamPermissions(request, expectedOptions); - }, expectedError); + await assert.rejects( + client.testIamPermissions(request, expectedOptions), + expectedError + ); assert( (client.iamClient.testIamPermissions as SinonStub) .getCall(0) diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index b407a8ea801..162282feeab 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -313,9 +313,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.createSubscription(request); - }, expectedError); + await assert.rejects(client.createSubscription(request), expectedError); assert( (client.innerApiCalls.createSubscription as SinonStub) .getCall(0) @@ -427,9 +425,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.getSubscription(request); - }, expectedError); + await assert.rejects(client.getSubscription(request), expectedError); assert( (client.innerApiCalls.getSubscription as SinonStub) .getCall(0) @@ -546,9 +542,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.updateSubscription(request); - }, expectedError); + await assert.rejects(client.updateSubscription(request), expectedError); assert( (client.innerApiCalls.updateSubscription as SinonStub) .getCall(0) @@ -662,9 +656,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.deleteSubscription(request); - }, expectedError); + await assert.rejects(client.deleteSubscription(request), expectedError); assert( (client.innerApiCalls.deleteSubscription as SinonStub) .getCall(0) @@ -776,9 +768,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.modifyAckDeadline(request); - }, expectedError); + await assert.rejects(client.modifyAckDeadline(request), expectedError); assert( (client.innerApiCalls.modifyAckDeadline as SinonStub) .getCall(0) @@ -890,9 +880,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.acknowledge(request); - }, expectedError); + await assert.rejects(client.acknowledge(request), expectedError); assert( (client.innerApiCalls.acknowledge as SinonStub) .getCall(0) @@ -999,9 +987,7 @@ describe('v1.SubscriberClient', () => { }; const expectedError = new Error('expected'); client.innerApiCalls.pull = stubSimpleCall(undefined, expectedError); - await assert.rejects(async () => { - await client.pull(request); - }, expectedError); + await assert.rejects(client.pull(request), expectedError); assert( (client.innerApiCalls.pull as SinonStub) .getCall(0) @@ -1113,9 +1099,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.modifyPushConfig(request); - }, expectedError); + await assert.rejects(client.modifyPushConfig(request), expectedError); assert( (client.innerApiCalls.modifyPushConfig as SinonStub) .getCall(0) @@ -1227,9 +1211,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.getSnapshot(request); - }, expectedError); + await assert.rejects(client.getSnapshot(request), expectedError); assert( (client.innerApiCalls.getSnapshot as SinonStub) .getCall(0) @@ -1341,9 +1323,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.createSnapshot(request); - }, expectedError); + await assert.rejects(client.createSnapshot(request), expectedError); assert( (client.innerApiCalls.createSnapshot as SinonStub) .getCall(0) @@ -1458,9 +1438,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.updateSnapshot(request); - }, expectedError); + await assert.rejects(client.updateSnapshot(request), expectedError); assert( (client.innerApiCalls.updateSnapshot as SinonStub) .getCall(0) @@ -1572,9 +1550,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.deleteSnapshot(request); - }, expectedError); + await assert.rejects(client.deleteSnapshot(request), expectedError); assert( (client.innerApiCalls.deleteSnapshot as SinonStub) .getCall(0) @@ -1681,9 +1657,7 @@ describe('v1.SubscriberClient', () => { }; const expectedError = new Error('expected'); client.innerApiCalls.seek = stubSimpleCall(undefined, expectedError); - await assert.rejects(async () => { - await client.seek(request); - }, expectedError); + await assert.rejects(client.seek(request), expectedError); assert( (client.innerApiCalls.seek as SinonStub) .getCall(0) @@ -1765,9 +1739,7 @@ describe('v1.SubscriberClient', () => { stream.write(request); stream.end(); }); - await assert.rejects(async () => { - await promise; - }, expectedError); + await assert.rejects(promise, expectedError); assert( (client.innerApiCalls.streamingPull as SinonStub) .getCall(0) @@ -1889,9 +1861,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.listSubscriptions(request); - }, expectedError); + await assert.rejects(client.listSubscriptions(request), expectedError); assert( (client.innerApiCalls.listSubscriptions as SinonStub) .getCall(0) @@ -1976,9 +1946,7 @@ describe('v1.SubscriberClient', () => { reject(err); }); }); - await assert.rejects(async () => { - await promise; - }, expectedError); + await assert.rejects(promise, expectedError); assert( (client.descriptors.page.listSubscriptions.createStream as SinonStub) .getCall(0) @@ -2177,9 +2145,7 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.listSnapshots(request); - }, expectedError); + await assert.rejects(client.listSnapshots(request), expectedError); assert( (client.innerApiCalls.listSnapshots as SinonStub) .getCall(0) @@ -2264,9 +2230,7 @@ describe('v1.SubscriberClient', () => { reject(err); }); }); - await assert.rejects(async () => { - await promise; - }, expectedError); + await assert.rejects(promise, expectedError); assert( (client.descriptors.page.listSnapshots.createStream as SinonStub) .getCall(0) @@ -2452,9 +2416,10 @@ describe('v1.SubscriberClient', () => { }; const expectedError = new Error('expected'); client.iamClient.getIamPolicy = stubSimpleCall(undefined, expectedError); - await assert.rejects(async () => { - await client.getIamPolicy(request, expectedOptions); - }, expectedError); + await assert.rejects( + client.getIamPolicy(request, expectedOptions), + expectedError + ); assert( (client.iamClient.getIamPolicy as SinonStub) .getCall(0) @@ -2557,9 +2522,10 @@ describe('v1.SubscriberClient', () => { }; const expectedError = new Error('expected'); client.iamClient.setIamPolicy = stubSimpleCall(undefined, expectedError); - await assert.rejects(async () => { - await client.setIamPolicy(request, expectedOptions); - }, expectedError); + await assert.rejects( + client.setIamPolicy(request, expectedOptions), + expectedError + ); assert( (client.iamClient.setIamPolicy as SinonStub) .getCall(0) @@ -2668,9 +2634,10 @@ describe('v1.SubscriberClient', () => { undefined, expectedError ); - await assert.rejects(async () => { - await client.testIamPermissions(request, expectedOptions); - }, expectedError); + await assert.rejects( + client.testIamPermissions(request, expectedOptions), + expectedError + ); assert( (client.iamClient.testIamPermissions as SinonStub) .getCall(0) From 173db747c9acbac7cc18b4744f0eed0e2fe744a8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 8 May 2020 07:44:11 +0200 Subject: [PATCH 0623/1115] chore(deps): update dependency @types/tmp to ^0.2.0 (#988) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@types/tmp](https://togithub.com/DefinitelyTyped/DefinitelyTyped) | devDependencies | minor | [`^0.1.0` -> `^0.2.0`](https://renovatebot.com/diffs/npm/@types%2ftmp/0.1.0/0.2.0) | --- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 66edfd34893..97bbb64b07c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -74,7 +74,7 @@ "@types/node": "^12.12.30", "@types/proxyquire": "^1.3.28", "@types/sinon": "^9.0.0", - "@types/tmp": "^0.1.0", + "@types/tmp": "^0.2.0", "@types/uuid": "^7.0.0", "c8": "^7.0.0", "codecov": "^3.0.0", From 7aded9e807b95ae7401dc66de6ae19b36eb7a144 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 8 May 2020 10:26:06 +0200 Subject: [PATCH 0624/1115] chore(deps): update dependency uuid to v8 (#987) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [uuid](https://togithub.com/uuidjs/uuid) | devDependencies | major | [`^7.0.0` -> `^8.0.0`](https://renovatebot.com/diffs/npm/uuid/7.0.3/8.0.0) | --- ### Release Notes
uuidjs/uuid ### [`v8.0.0`](https://togithub.com/uuidjs/uuid/blob/master/CHANGELOG.md#​800-httpsgithubcomuuidjsuuidcomparev703v800-2020-04-29) [Compare Source](https://togithub.com/uuidjs/uuid/compare/v7.0.3...v8.0.0) ##### ⚠ BREAKING CHANGES - For native ECMAScript Module (ESM) usage in Node.js only named exports are exposed, there is no more default export. ```diff -import uuid from 'uuid'; -console.log(uuid.v4()); // -> 'cd6c3b08-0adc-4f4b-a6ef-36087a1c9869' +import { v4 as uuidv4 } from 'uuid'; +uuidv4(); // ⇨ '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d' ``` - Deep requiring specific algorithms of this library like `require('uuid/v4')`, which has been deprecated in `uuid@7`, is no longer supported. Instead use the named exports that this module exports. For ECMAScript Modules (ESM): ```diff -import uuidv4 from 'uuid/v4'; +import { v4 as uuidv4 } from 'uuid'; uuidv4(); ``` For CommonJS: ```diff -const uuidv4 = require('uuid/v4'); +const { v4: uuidv4 } = require('uuid'); uuidv4(); ``` ##### Features - native Node.js ES Modules (wrapper approach) ([#​423](https://togithub.com/uuidjs/uuid/issues/423)) ([2d9f590](https://togithub.com/uuidjs/uuid/commit/2d9f590ad9701d692625c07ed62f0a0f91227991)), closes [#​245](https://togithub.com/uuidjs/uuid/issues/245) [#​419](https://togithub.com/uuidjs/uuid/issues/419) [#​342](https://togithub.com/uuidjs/uuid/issues/342) - remove deep requires ([#​426](https://togithub.com/uuidjs/uuid/issues/426)) ([daf72b8](https://togithub.com/uuidjs/uuid/commit/daf72b84ceb20272a81bb5fbddb05dd95922cbba)) ##### Bug Fixes - add CommonJS syntax example to README quickstart section ([#​417](https://togithub.com/uuidjs/uuid/issues/417)) ([e0ec840](https://togithub.com/uuidjs/uuid/commit/e0ec8402c7ad44b7ef0453036c612f5db513fda0)) ##### [7.0.3](https://togithub.com/uuidjs/uuid/compare/v7.0.2...v7.0.3) (2020-03-31) ##### Bug Fixes - make deep require deprecation warning work in browsers ([#​409](https://togithub.com/uuidjs/uuid/issues/409)) ([4b71107](https://togithub.com/uuidjs/uuid/commit/4b71107d8c0d2ef56861ede6403fc9dc35a1e6bf)), closes [#​408](https://togithub.com/uuidjs/uuid/issues/408) ##### [7.0.2](https://togithub.com/uuidjs/uuid/compare/v7.0.1...v7.0.2) (2020-03-04) ##### Bug Fixes - make access to msCrypto consistent ([#​393](https://togithub.com/uuidjs/uuid/issues/393)) ([8bf2a20](https://togithub.com/uuidjs/uuid/commit/8bf2a20f3565df743da7215eebdbada9d2df118c)) - simplify link in deprecation warning ([#​391](https://togithub.com/uuidjs/uuid/issues/391)) ([bb2c8e4](https://togithub.com/uuidjs/uuid/commit/bb2c8e4e9f4c5f9c1eaaf3ea59710c633cd90cb7)) - update links to match content in readme ([#​386](https://togithub.com/uuidjs/uuid/issues/386)) ([44f2f86](https://togithub.com/uuidjs/uuid/commit/44f2f86e9d2bbf14ee5f0f00f72a3db1292666d4)) ##### [7.0.1](https://togithub.com/uuidjs/uuid/compare/v7.0.0...v7.0.1) (2020-02-25) ##### Bug Fixes - clean up esm builds for node and browser ([#​383](https://togithub.com/uuidjs/uuid/issues/383)) ([59e6a49](https://togithub.com/uuidjs/uuid/commit/59e6a49e7ce7b3e8fb0f3ee52b9daae72af467dc)) - provide browser versions independent from module system ([#​380](https://togithub.com/uuidjs/uuid/issues/380)) ([4344a22](https://togithub.com/uuidjs/uuid/commit/4344a22e7aed33be8627eeaaf05360f256a21753)), closes [#​378](https://togithub.com/uuidjs/uuid/issues/378)
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 97bbb64b07c..3774e8b4ea9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -94,7 +94,7 @@ "tmp": "^0.2.0", "ts-loader": "^7.0.0", "typescript": "3.6.4", - "uuid": "^7.0.0", + "uuid": "^8.0.0", "webpack": "^4.42.0", "webpack-cli": "^3.3.11", "yargs": "^15.0.0" From 37d8654ae60c606eb18a552369d9329b1dab2a25 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 8 May 2020 11:34:07 -0700 Subject: [PATCH 0625/1115] build: do not fail builds on codecov errors (#528) (#996) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/2f68300a-9812-4342-86c6-33ab267ece4f/targets Source-Link: https://github.com/googleapis/synthtool/commit/be74d3e532faa47eb59f1a0eaebde0860d1d8ab4 --- handwritten/pubsub/synth.metadata | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 0c9f43e935d..6620e5bab08 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -3,15 +3,23 @@ { "git": { "name": ".", - "remote": "git@github.com:googleapis/nodejs-pubsub.git", - "sha": "2e973a55008c4d50ef3f7d47ac4ba761cd2ea9cb" + "remote": "https://github.com/googleapis/nodejs-pubsub.git", + "sha": "27f7b770aff062a780173c6781cb0879a18bd9d2" + } + }, + { + "git": { + "name": "googleapis", + "remote": "https://github.com/googleapis/googleapis.git", + "sha": "83816bb3093686a28af2891db5b7506614a820b1", + "internalRef": "310509915" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ab883569eb0257bbf16a6d825fd018b3adde3912" + "sha": "be74d3e532faa47eb59f1a0eaebde0860d1d8ab4" } } ], From a2b5ecad8b1f21550e9ad2ecc5505d9cb23a3d46 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 12 May 2020 10:01:51 -0700 Subject: [PATCH 0626/1115] fix: remove unused dependencies (#998) --- handwritten/pubsub/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3774e8b4ea9..d38a8352ef9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,6 @@ "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", - "async-each": "^1.0.1", "extend": "^3.0.2", "google-auth-library": "^6.0.0", "google-gax": "^2.1.0", @@ -84,7 +83,6 @@ "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", "linkinator": "^2.0.0", - "mkdirp": "^1.0.0", "mocha": "^7.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", From 24c0e079245fd79db37aae6e6e622161ddca1260 Mon Sep 17 00:00:00 2001 From: Stephen Date: Tue, 19 May 2020 16:35:40 -0400 Subject: [PATCH 0627/1115] fix(docs): link to correct gaxOptions docs (#999) --- handwritten/pubsub/src/iam.ts | 6 +++--- handwritten/pubsub/src/pubsub.ts | 10 +++++----- handwritten/pubsub/src/subscription.ts | 14 +++++++------- handwritten/pubsub/src/topic.ts | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 6c2c1048934..9dbfb2dc812 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -119,7 +119,7 @@ export class IAM { * Get the IAM policy * * @param {object} [gaxOptions] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {GetPolicyCallback} [callback] Callback function. * @returns {Promise} * @@ -193,7 +193,7 @@ export class IAM { * @param {Array} [policy.rules] Rules to be applied to the policy. * @param {string} [policy.etag] Etags are used to perform a read-modify-write. * @param {object} [gaxOptions] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {SetPolicyCallback} callback Callback function. * @returns {Promise} * @@ -297,7 +297,7 @@ export class IAM { * * @param {string|string[]} permissions The permission(s) to test for. * @param {object} [gaxOptions] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {TestIamPermissionsCallback} [callback] Callback function. * @returns {Promise} * diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 69a9f0a7d51..fbfb9344fa5 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -350,7 +350,7 @@ export class PubSub { * of un-acked messages to allow before the subscription pauses incoming * messages. * @property {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @property {number|google.protobuf.Duration} [messageRetentionDuration] Set * this to override the default duration of 7 days. This value is expected * in seconds. Acceptable values are in the range of 10 minutes and 7 @@ -489,7 +489,7 @@ export class PubSub { * * @param {string} name Name of the topic. * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {CreateTopicCallback} [callback] Callback function. * @returns {Promise} * @@ -583,7 +583,7 @@ export class PubSub { * @property {boolean} [autoPaginate=true] Have pagination handled * automatically. * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @property {number} [options.pageSize] Maximum number of results to return. * @property {string} [options.pageToken] Page token. */ @@ -689,7 +689,7 @@ export class PubSub { * @property {boolean} [autoPaginate=true] Have pagination handled * automatically. * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @property {number} [options.pageSize] Maximum number of results to return. * @property {string} [options.pageToken] Page token. * @param {string|Topic} options.topic - The name of the topic to @@ -808,7 +808,7 @@ export class PubSub { * @property {boolean} [autoPaginate=true] Have pagination handled * automatically. * @property {object} [options.gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @property {number} [options.pageSize] Maximum number of results to return. * @property {string} [options.pageToken] Page token. */ diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 5fe5851beb4..1ca28b73fe5 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -409,7 +409,7 @@ export class Subscription extends EventEmitter { * * @param {string} name Name of the snapshot. * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {CreateSnapshotCallback} [callback] Callback function. * @returns {Promise} * @@ -480,7 +480,7 @@ export class Subscription extends EventEmitter { * @see [Subscriptions: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/delete} * * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {function} [callback] The callback function. * @param {?error} callback.err An error returned while making this * request. @@ -594,7 +594,7 @@ export class Subscription extends EventEmitter { * Get a subscription if it exists. * * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the * subscription if it does not already exist. * @param {GetSubscriptionCallback} [callback] Callback function. @@ -663,7 +663,7 @@ export class Subscription extends EventEmitter { * Fetches the subscriptions metadata. * * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {GetSubscriptionMetadataCallback} [callback] Callback function. * @returns {Promise} * @@ -745,7 +745,7 @@ export class Subscription extends EventEmitter { * request for every pushed message. This object should have the same * structure as [OidcToken]{@link google.pubsub.v1.OidcToken} * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {ModifyPushConfigCallback} [callback] Callback function. * @returns {Promise} * @@ -853,7 +853,7 @@ export class Subscription extends EventEmitter { * @param {string|date} snapshot The point to seek to. This will accept the * name of the snapshot or a Date object. * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {SeekCallback} [callback] Callback function. * @returns {Promise} * @@ -937,7 +937,7 @@ export class Subscription extends EventEmitter { * * @param {object} metadata The subscription metadata. * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {SetSubscriptionMetadataCallback} [callback] Callback function. * @returns {Promise} * diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 0825f41942d..fdf7a21e2d8 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -198,7 +198,7 @@ export class Topic { * Create a topic. * * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {CreateTopicCallback} [callback] Callback function. * @returns {Promise} * @@ -304,7 +304,7 @@ export class Topic { * @see [Topics: delete API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/delete} * * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {function} [callback] The callback function. * @param {?error} callback.err An error returned while making this * request. @@ -411,7 +411,7 @@ export class Topic { * Get a topic if it exists. * * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {boolean} [gaxOpts.autoCreate=false] Automatically create the topic * does not already exist. * @param {GetTopicCallback} [callback] Callback function. @@ -476,7 +476,7 @@ export class Topic { * @see [Topics: get API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics/get} * * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {GetTopicMetadataCallback} [callback] Callback function. * @returns {Promise} * @@ -851,7 +851,7 @@ export class Topic { * https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.topics#Topic|Topic * object}. * @param {object} [gaxOpts] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/CallSettings.html. + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @param {SetTopicMetadataCallback} [callback] Callback function. * @returns {Promise} * From 02b88f1f6facab3bad48b640e84b925823adabb6 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 19 May 2020 16:05:55 -0700 Subject: [PATCH 0628/1115] Removing the experimental tag from dead letter policy related fields. (#997) PiperOrigin-RevId: 310595049 Source-Author: Google APIs Source-Date: Fri May 8 11:29:18 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 73d4b5d9a791f8b1ee63d439ffe909bb8ffa07f7 Source-Link: https://github.com/googleapis/googleapis/commit/73d4b5d9a791f8b1ee63d439ffe909bb8ffa07f7 Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- .../pubsub/protos/google/pubsub/v1/pubsub.proto | 14 +++++++------- handwritten/pubsub/synth.metadata | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 832e0649c9c..a42d03220b3 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -839,8 +839,11 @@ message ReceivedMessage { // The message. PubsubMessage message = 2; - // Delivery attempt counter is 1 + (the sum of number of NACKs and number of - // ack_deadline exceeds) for this message. + // The approximate number of times that Cloud Pub/Sub has attempted to deliver + // the associated message to a subscriber. + // + // More precisely, this is 1 + (number of NACKs) + + // (number of ack_deadline exceeds) for this message. // // A NACK is any call to ModifyAckDeadline with a 0 deadline. An ack_deadline // exceeds event is whenever a message is not acknowledged within @@ -848,13 +851,10 @@ message ReceivedMessage { // Subscription.ackDeadlineSeconds, but may get extended automatically by // the client library. // - // The first delivery of a given message will have this value as 1. The value - // is calculated at best effort and is approximate. + // Upon the first delivery of a given message, `delivery_attempt` will have a + // value of 1. The value is calculated at best effort and is approximate. // // If a DeadLetterPolicy is not set on the subscription, this will be 0. - // EXPERIMENTAL: This feature is part of a closed alpha release. This - // API might be changed in backward-incompatible ways and is not recommended - // for production use. It is not subject to any SLA or deprecation policy. int32 delivery_attempt = 3; } diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 6620e5bab08..3ad93bd2dc7 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "27f7b770aff062a780173c6781cb0879a18bd9d2" + "sha": "e7c9806171886b45ef60c2b95ebaf142815985ef" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "83816bb3093686a28af2891db5b7506614a820b1", - "internalRef": "310509915" + "sha": "73d4b5d9a791f8b1ee63d439ffe909bb8ffa07f7", + "internalRef": "310595049" } }, { From 09b9bd29a0f319b58c3671fb238f9c0f462d8e5e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 20 May 2020 21:56:53 +0200 Subject: [PATCH 0629/1115] chore(deps): update dependency @types/uuid to v8 (#1004) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@types/uuid](https://togithub.com/DefinitelyTyped/DefinitelyTyped) | devDependencies | major | [`^7.0.0` -> `^8.0.0`](https://renovatebot.com/diffs/npm/@types%2fuuid/7.0.4/8.0.0) | --- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d38a8352ef9..72d5b6e9be8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -74,7 +74,7 @@ "@types/proxyquire": "^1.3.28", "@types/sinon": "^9.0.0", "@types/tmp": "^0.2.0", - "@types/uuid": "^7.0.0", + "@types/uuid": "^8.0.0", "c8": "^7.0.0", "codecov": "^3.0.0", "execa": "^4.0.0", From 8ebe59edfd7be54d3c363013f5f71314649125aa Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 20 May 2020 14:36:55 -0700 Subject: [PATCH 0630/1115] chore: release 2.0.0 (#1005) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json [ci skip] * docs: add node 8 notice and fix typo * docs: fix one more typo --- handwritten/pubsub/CHANGELOG.md | 34 +++++++++++++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index b00808fd572..79c8e821f18 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,40 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.0.0](https://www.github.com/googleapis/nodejs-pubsub/compare/vv1.7.1...v2.0.0) (2020-05-20) + +Please note that Node 8 is no longer supported, and Node 10 is the new minimum version of the runtime. + +### ⚠ BREAKING CHANGES + +* Please note that Node 8 is no longer supported, and Node 10 is the new minimum version of the runtime. +* drop support for custom promises (#970) +* convert to typescript (#923) +* **deps:** update dependency @google-cloud/projectify to v2 (#929) + +### Bug Fixes + +* **docs:** link to correct gaxOptions docs ([#999](https://www.github.com/googleapis/nodejs-pubsub/issues/999)) ([312e318](https://www.github.com/googleapis/nodejs-pubsub/commit/312e318ceb36eafbeb487ede7e5dbf9ccd5dfb81)) +* regen protos and tests, formatting ([#991](https://www.github.com/googleapis/nodejs-pubsub/issues/991)) ([e350b97](https://www.github.com/googleapis/nodejs-pubsub/commit/e350b97ad19e49e5fe52d5eeb1ad67c8bb6ddf33)) +* remove eslint, update gax, fix generated protos, run the generator ([#955](https://www.github.com/googleapis/nodejs-pubsub/issues/955)) ([544a061](https://www.github.com/googleapis/nodejs-pubsub/commit/544a061b1b6d7fdc4051486c2b8ae5d14e1ec141)) +* remove unused dependencies ([#998](https://www.github.com/googleapis/nodejs-pubsub/issues/998)) ([7b242a3](https://www.github.com/googleapis/nodejs-pubsub/commit/7b242a36212e0871b3918621fe9a5f51d1e6b733)) +* **close:** ensure in-flight messages are drained ([#952](https://www.github.com/googleapis/nodejs-pubsub/issues/952)) ([93a2bd7](https://www.github.com/googleapis/nodejs-pubsub/commit/93a2bd726660b134fbd3e12335bfde29d13a2b78)) +* **deps:** update dependency @google-cloud/paginator to v3 ([#931](https://www.github.com/googleapis/nodejs-pubsub/issues/931)) ([b621854](https://www.github.com/googleapis/nodejs-pubsub/commit/b62185426b7f958ee41a1cff429bc5fb70635b4a)) +* **deps:** update dependency @google-cloud/precise-date to v2 ([#934](https://www.github.com/googleapis/nodejs-pubsub/issues/934)) ([72b8d78](https://www.github.com/googleapis/nodejs-pubsub/commit/72b8d781ed3cbf9049101b9c2675f211fb3924ba)) +* **deps:** update dependency @google-cloud/projectify to v2 ([#929](https://www.github.com/googleapis/nodejs-pubsub/issues/929)) ([45d9880](https://www.github.com/googleapis/nodejs-pubsub/commit/45d988077d2db2fddbb4d22aac43c7f8a77e4dcc)) +* **deps:** update dependency @google-cloud/promisify to v2 ([#928](https://www.github.com/googleapis/nodejs-pubsub/issues/928)) ([3819877](https://www.github.com/googleapis/nodejs-pubsub/commit/3819877752d39cd042364bdd9ed01ff230aeed0b)) +* **deps:** update dependency google-auth-library to v6 ([#935](https://www.github.com/googleapis/nodejs-pubsub/issues/935)) ([73fc887](https://www.github.com/googleapis/nodejs-pubsub/commit/73fc887c662b526690167286d2d5afda0cccad1b)) + + +### Build System + +* convert to typescript ([#923](https://www.github.com/googleapis/nodejs-pubsub/issues/923)) ([2fc68ba](https://www.github.com/googleapis/nodejs-pubsub/commit/2fc68baff0cc2013468da7ef3dc8d547d4745989)) + + +### Miscellaneous Chores + +* drop support for custom promises ([#970](https://www.github.com/googleapis/nodejs-pubsub/issues/970)) ([df462d3](https://www.github.com/googleapis/nodejs-pubsub/commit/df462d3dec4f733cb309eb6413aad382424e2125)) + ### [1.7.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v1.7.0...v1.7.1) (2020-04-06) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 72d5b6e9be8..852464ef915 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "1.7.1", + "version": "2.0.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 3d8cc12c29216dc2c4ffae3b7a66e37c2c87f480 Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 27 May 2020 17:53:40 -0400 Subject: [PATCH 0631/1115] fix: use any to unblock typescript compilation bug (#1012) Co-authored-by: Alexander Fenster --- handwritten/pubsub/test/publisher/message-queues.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 40581a0d31e..786fb8b2587 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -295,7 +295,8 @@ describe('Message Queues', () => { }); it('should cancel any pending publish calls', () => { - const fakeHandle = (1234 as unknown) as NodeJS.Timer; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const fakeHandle = (1234 as unknown) as any; const stub = sandbox.stub(global, 'clearTimeout').withArgs(fakeHandle); queue.pending = fakeHandle; From 501f69654aa02196cd8fc6ce07544d61941b35cd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 2 Jun 2020 15:23:05 -0700 Subject: [PATCH 0632/1115] feat: re-generated to pick up changes from googleapis (#1014) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * Add DetachSubscription RPC PiperOrigin-RevId: 313276022 Source-Author: Google APIs Source-Date: Tue May 26 15:11:32 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: f5f268f5293e60143ac742a4eeb7dd6306ebf505 Source-Link: https://github.com/googleapis/googleapis/commit/f5f268f5293e60143ac742a4eeb7dd6306ebf505 * Use correct resource type for DetachSubscriptionRequest PiperOrigin-RevId: 313488995 Source-Author: Google APIs Source-Date: Wed May 27 16:45:32 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: eafa840ceec23b44a5c21670288107c661252711 Source-Link: https://github.com/googleapis/googleapis/commit/eafa840ceec23b44a5c21670288107c661252711 Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- .../protos/google/pubsub/v1/pubsub.proto | 31 +- handwritten/pubsub/protos/protos.d.ts | 195 +++++++++ handwritten/pubsub/protos/protos.js | 382 +++++++++++++++++- handwritten/pubsub/protos/protos.json | 22 + handwritten/pubsub/src/v1/publisher_client.ts | 87 +++- .../src/v1/publisher_client_config.json | 5 + handwritten/pubsub/synth.metadata | 6 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 114 ++++++ 8 files changed, 835 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index a42d03220b3..a0179774ffe 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -88,7 +88,7 @@ service Publisher { option (google.api.method_signature) = "project"; } - // Lists the names of the subscriptions on this topic. + // Lists the names of the attached subscriptions on this topic. rpc ListTopicSubscriptions(ListTopicSubscriptionsRequest) returns (ListTopicSubscriptionsResponse) { option (google.api.http) = { @@ -122,6 +122,17 @@ service Publisher { }; option (google.api.method_signature) = "topic"; } + + // Detaches a subscription from this topic. All messages retained in the + // subscription are dropped. Subsequent `Pull` and `StreamingPull` requests + // will return FAILED_PRECONDITION. If the subscription is a push + // subscription, pushes to the endpoint will stop. + rpc DetachSubscription(DetachSubscriptionRequest) + returns (DetachSubscriptionResponse) { + option (google.api.http) = { + post: "/v1/{subscription=projects/*/subscriptions/*}:detach" + }; + } } message MessageStoragePolicy { @@ -300,7 +311,7 @@ message ListTopicSubscriptionsRequest { // Response for the `ListTopicSubscriptions` method. message ListTopicSubscriptionsResponse { - // The names of the subscriptions that match the request. + // The names of subscriptions attached to the topic specified in the request. repeated string subscriptions = 1 [(google.api.resource_reference) = { type: "pubsub.googleapis.com/Subscription" }]; @@ -350,6 +361,22 @@ message DeleteTopicRequest { ]; } +// Request for the DetachSubscription method. +message DetachSubscriptionRequest { + // Required. The subscription to detach. + // Format is `projects/{project}/subscriptions/{subscription}`. + string subscription = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; +} + +// Response for the DetachSubscription method. +// Reserved for future use. +message DetachSubscriptionResponse {} + // The service that an application uses to manipulate subscriptions and to // consume messages from a subscription via the `Pull` method or by // establishing a bi-directional stream using the `StreamingPull` method. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 2b21f96ccc6..daa9a86be66 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -154,6 +154,20 @@ export namespace google { * @returns Promise */ public deleteTopic(request: google.pubsub.v1.IDeleteTopicRequest): Promise; + + /** + * Calls DetachSubscription. + * @param request DetachSubscriptionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and DetachSubscriptionResponse + */ + public detachSubscription(request: google.pubsub.v1.IDetachSubscriptionRequest, callback: google.pubsub.v1.Publisher.DetachSubscriptionCallback): void; + + /** + * Calls DetachSubscription. + * @param request DetachSubscriptionRequest message or plain object + * @returns Promise + */ + public detachSubscription(request: google.pubsub.v1.IDetachSubscriptionRequest): Promise; } namespace Publisher { @@ -213,6 +227,13 @@ export namespace google { * @param [response] Empty */ type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.Publisher#detachSubscription}. + * @param error Error, if any + * @param [response] DetachSubscriptionResponse + */ + type DetachSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.DetachSubscriptionResponse) => void; } /** Properties of a MessageStoragePolicy. */ @@ -1583,6 +1604,180 @@ export namespace google { public toJSON(): { [k: string]: any }; } + /** Properties of a DetachSubscriptionRequest. */ + interface IDetachSubscriptionRequest { + + /** DetachSubscriptionRequest subscription */ + subscription?: (string|null); + } + + /** Represents a DetachSubscriptionRequest. */ + class DetachSubscriptionRequest implements IDetachSubscriptionRequest { + + /** + * Constructs a new DetachSubscriptionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDetachSubscriptionRequest); + + /** DetachSubscriptionRequest subscription. */ + public subscription: string; + + /** + * Creates a new DetachSubscriptionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DetachSubscriptionRequest instance + */ + public static create(properties?: google.pubsub.v1.IDetachSubscriptionRequest): google.pubsub.v1.DetachSubscriptionRequest; + + /** + * Encodes the specified DetachSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DetachSubscriptionRequest.verify|verify} messages. + * @param message DetachSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDetachSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DetachSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DetachSubscriptionRequest.verify|verify} messages. + * @param message DetachSubscriptionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDetachSubscriptionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DetachSubscriptionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DetachSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DetachSubscriptionRequest; + + /** + * Decodes a DetachSubscriptionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DetachSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DetachSubscriptionRequest; + + /** + * Verifies a DetachSubscriptionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DetachSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DetachSubscriptionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DetachSubscriptionRequest; + + /** + * Creates a plain object from a DetachSubscriptionRequest message. Also converts values to other types if specified. + * @param message DetachSubscriptionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DetachSubscriptionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DetachSubscriptionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DetachSubscriptionResponse. */ + interface IDetachSubscriptionResponse { + } + + /** Represents a DetachSubscriptionResponse. */ + class DetachSubscriptionResponse implements IDetachSubscriptionResponse { + + /** + * Constructs a new DetachSubscriptionResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDetachSubscriptionResponse); + + /** + * Creates a new DetachSubscriptionResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns DetachSubscriptionResponse instance + */ + public static create(properties?: google.pubsub.v1.IDetachSubscriptionResponse): google.pubsub.v1.DetachSubscriptionResponse; + + /** + * Encodes the specified DetachSubscriptionResponse message. Does not implicitly {@link google.pubsub.v1.DetachSubscriptionResponse.verify|verify} messages. + * @param message DetachSubscriptionResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDetachSubscriptionResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DetachSubscriptionResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.DetachSubscriptionResponse.verify|verify} messages. + * @param message DetachSubscriptionResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDetachSubscriptionResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DetachSubscriptionResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DetachSubscriptionResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DetachSubscriptionResponse; + + /** + * Decodes a DetachSubscriptionResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DetachSubscriptionResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DetachSubscriptionResponse; + + /** + * Verifies a DetachSubscriptionResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DetachSubscriptionResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DetachSubscriptionResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DetachSubscriptionResponse; + + /** + * Creates a plain object from a DetachSubscriptionResponse message. Also converts values to other types if specified. + * @param message DetachSubscriptionResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DetachSubscriptionResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DetachSubscriptionResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + /** Represents a Subscriber */ class Subscriber extends $protobuf.rpc.Service { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 620ec99137d..51963973434 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -28,7 +28,7 @@ var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; // Exported root namespace - var $root = $protobuf.roots._google_cloud_pubsub_1_7_1_protos || ($protobuf.roots._google_cloud_pubsub_1_7_1_protos = {}); + var $root = $protobuf.roots._google_cloud_pubsub_2_0_0_protos || ($protobuf.roots._google_cloud_pubsub_2_0_0_protos = {}); $root.google = (function() { @@ -353,6 +353,39 @@ * @variation 2 */ + /** + * Callback as used by {@link google.pubsub.v1.Publisher#detachSubscription}. + * @memberof google.pubsub.v1.Publisher + * @typedef DetachSubscriptionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.DetachSubscriptionResponse} [response] DetachSubscriptionResponse + */ + + /** + * Calls DetachSubscription. + * @function detachSubscription + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IDetachSubscriptionRequest} request DetachSubscriptionRequest message or plain object + * @param {google.pubsub.v1.Publisher.DetachSubscriptionCallback} callback Node-style callback called with the error, if any, and DetachSubscriptionResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(Publisher.prototype.detachSubscription = function detachSubscription(request, callback) { + return this.rpcCall(detachSubscription, $root.google.pubsub.v1.DetachSubscriptionRequest, $root.google.pubsub.v1.DetachSubscriptionResponse, request, callback); + }, "name", { value: "DetachSubscription" }); + + /** + * Calls DetachSubscription. + * @function detachSubscription + * @memberof google.pubsub.v1.Publisher + * @instance + * @param {google.pubsub.v1.IDetachSubscriptionRequest} request DetachSubscriptionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + return Publisher; })(); @@ -3559,6 +3592,353 @@ return DeleteTopicRequest; })(); + v1.DetachSubscriptionRequest = (function() { + + /** + * Properties of a DetachSubscriptionRequest. + * @memberof google.pubsub.v1 + * @interface IDetachSubscriptionRequest + * @property {string|null} [subscription] DetachSubscriptionRequest subscription + */ + + /** + * Constructs a new DetachSubscriptionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DetachSubscriptionRequest. + * @implements IDetachSubscriptionRequest + * @constructor + * @param {google.pubsub.v1.IDetachSubscriptionRequest=} [properties] Properties to set + */ + function DetachSubscriptionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DetachSubscriptionRequest subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @instance + */ + DetachSubscriptionRequest.prototype.subscription = ""; + + /** + * Creates a new DetachSubscriptionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDetachSubscriptionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DetachSubscriptionRequest} DetachSubscriptionRequest instance + */ + DetachSubscriptionRequest.create = function create(properties) { + return new DetachSubscriptionRequest(properties); + }; + + /** + * Encodes the specified DetachSubscriptionRequest message. Does not implicitly {@link google.pubsub.v1.DetachSubscriptionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDetachSubscriptionRequest} message DetachSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DetachSubscriptionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.subscription); + return writer; + }; + + /** + * Encodes the specified DetachSubscriptionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DetachSubscriptionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {google.pubsub.v1.IDetachSubscriptionRequest} message DetachSubscriptionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DetachSubscriptionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DetachSubscriptionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DetachSubscriptionRequest} DetachSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DetachSubscriptionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DetachSubscriptionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.subscription = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DetachSubscriptionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DetachSubscriptionRequest} DetachSubscriptionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DetachSubscriptionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DetachSubscriptionRequest message. + * @function verify + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DetachSubscriptionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + return null; + }; + + /** + * Creates a DetachSubscriptionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DetachSubscriptionRequest} DetachSubscriptionRequest + */ + DetachSubscriptionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DetachSubscriptionRequest) + return object; + var message = new $root.google.pubsub.v1.DetachSubscriptionRequest(); + if (object.subscription != null) + message.subscription = String(object.subscription); + return message; + }; + + /** + * Creates a plain object from a DetachSubscriptionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {google.pubsub.v1.DetachSubscriptionRequest} message DetachSubscriptionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DetachSubscriptionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.subscription = ""; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + return object; + }; + + /** + * Converts this DetachSubscriptionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @instance + * @returns {Object.} JSON object + */ + DetachSubscriptionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return DetachSubscriptionRequest; + })(); + + v1.DetachSubscriptionResponse = (function() { + + /** + * Properties of a DetachSubscriptionResponse. + * @memberof google.pubsub.v1 + * @interface IDetachSubscriptionResponse + */ + + /** + * Constructs a new DetachSubscriptionResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a DetachSubscriptionResponse. + * @implements IDetachSubscriptionResponse + * @constructor + * @param {google.pubsub.v1.IDetachSubscriptionResponse=} [properties] Properties to set + */ + function DetachSubscriptionResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new DetachSubscriptionResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {google.pubsub.v1.IDetachSubscriptionResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.DetachSubscriptionResponse} DetachSubscriptionResponse instance + */ + DetachSubscriptionResponse.create = function create(properties) { + return new DetachSubscriptionResponse(properties); + }; + + /** + * Encodes the specified DetachSubscriptionResponse message. Does not implicitly {@link google.pubsub.v1.DetachSubscriptionResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {google.pubsub.v1.IDetachSubscriptionResponse} message DetachSubscriptionResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DetachSubscriptionResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified DetachSubscriptionResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.DetachSubscriptionResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {google.pubsub.v1.IDetachSubscriptionResponse} message DetachSubscriptionResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DetachSubscriptionResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DetachSubscriptionResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DetachSubscriptionResponse} DetachSubscriptionResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DetachSubscriptionResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DetachSubscriptionResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DetachSubscriptionResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DetachSubscriptionResponse} DetachSubscriptionResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DetachSubscriptionResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DetachSubscriptionResponse message. + * @function verify + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DetachSubscriptionResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a DetachSubscriptionResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DetachSubscriptionResponse} DetachSubscriptionResponse + */ + DetachSubscriptionResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DetachSubscriptionResponse) + return object; + return new $root.google.pubsub.v1.DetachSubscriptionResponse(); + }; + + /** + * Creates a plain object from a DetachSubscriptionResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {google.pubsub.v1.DetachSubscriptionResponse} message DetachSubscriptionResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DetachSubscriptionResponse.toObject = function toObject() { + return {}; + }; + + /** + * Converts this DetachSubscriptionResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @instance + * @returns {Object.} JSON object + */ + DetachSubscriptionResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return DetachSubscriptionResponse; + })(); + v1.Subscriber = (function() { /** diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 9dc9164f946..ad04ecbdbe6 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -87,6 +87,13 @@ "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}", "(google.api.method_signature)": "topic" } + }, + "DetachSubscription": { + "requestType": "DetachSubscriptionRequest", + "responseType": "DetachSubscriptionResponse", + "options": { + "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:detach" + } } } }, @@ -325,6 +332,21 @@ } } }, + "DetachSubscriptionRequest": { + "fields": { + "subscription": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" + } + } + } + }, + "DetachSubscriptionResponse": { + "fields": {} + }, "Subscriber": { "options": { "(google.api.default_host)": "pubsub.googleapis.com", diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index e74e6ee4aaf..20e86125863 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -275,6 +275,7 @@ export class PublisherClient { 'listTopicSubscriptions', 'listTopicSnapshots', 'deleteTopic', + 'detachSubscription', ]; for (const methodName of publisherStubMethods) { const callPromise = this.publisherStub.then( @@ -793,6 +794,90 @@ export class PublisherClient { this.initialize(); return this.innerApiCalls.deleteTopic(request, options, callback); } + detachSubscription( + request: protos.google.pubsub.v1.IDetachSubscriptionRequest, + options?: gax.CallOptions + ): Promise< + [ + protos.google.pubsub.v1.IDetachSubscriptionResponse, + protos.google.pubsub.v1.IDetachSubscriptionRequest | undefined, + {} | undefined + ] + >; + detachSubscription( + request: protos.google.pubsub.v1.IDetachSubscriptionRequest, + options: gax.CallOptions, + callback: Callback< + protos.google.pubsub.v1.IDetachSubscriptionResponse, + protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): void; + detachSubscription( + request: protos.google.pubsub.v1.IDetachSubscriptionRequest, + callback: Callback< + protos.google.pubsub.v1.IDetachSubscriptionResponse, + protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Detaches a subscription from this topic. All messages retained in the + * subscription are dropped. Subsequent `Pull` and `StreamingPull` requests + * will return FAILED_PRECONDITION. If the subscription is a push + * subscription, pushes to the endpoint will stop. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The subscription to detach. + * Format is `projects/{project}/subscriptions/{subscription}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [DetachSubscriptionResponse]{@link google.pubsub.v1.DetachSubscriptionResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + detachSubscription( + request: protos.google.pubsub.v1.IDetachSubscriptionRequest, + optionsOrCallback?: + | gax.CallOptions + | Callback< + protos.google.pubsub.v1.IDetachSubscriptionResponse, + protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.IDetachSubscriptionResponse, + protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.IDetachSubscriptionResponse, + protos.google.pubsub.v1.IDetachSubscriptionRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: gax.CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as gax.CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); + this.initialize(); + return this.innerApiCalls.detachSubscription(request, options, callback); + } listTopics( request: protos.google.pubsub.v1.IListTopicsRequest, @@ -1020,7 +1105,7 @@ export class PublisherClient { > ): void; /** - * Lists the names of the subscriptions on this topic. + * Lists the names of the attached subscriptions on this topic. * * @param {Object} request * The request object that will be sent. diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 57cd432354c..381824599ad 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -82,6 +82,11 @@ "timeout_millis": 60000, "retry_codes_name": "unavailable", "retry_params_name": "default" + }, + "DetachSubscription": { + "timeout_millis": 60000, + "retry_codes_name": "unavailable", + "retry_params_name": "default" } } } diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 3ad93bd2dc7..17e329885b7 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "e7c9806171886b45ef60c2b95ebaf142815985ef" + "sha": "1e8ced3f06d12487fdf00b443bb447e1ec1a911b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "73d4b5d9a791f8b1ee63d439ffe909bb8ffa07f7", - "internalRef": "310595049" + "sha": "eafa840ceec23b44a5c21670288107c661252711", + "internalRef": "313488995" } }, { diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 5296549caf1..74eaba4e159 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -751,6 +751,120 @@ describe('v1.PublisherClient', () => { }); }); + describe('detachSubscription', () => { + it('invokes detachSubscription without error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DetachSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.DetachSubscriptionResponse() + ); + client.innerApiCalls.detachSubscription = stubSimpleCall( + expectedResponse + ); + const [response] = await client.detachSubscription(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.detachSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes detachSubscription without error using callback', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DetachSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.DetachSubscriptionResponse() + ); + client.innerApiCalls.detachSubscription = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.detachSubscription( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.IDetachSubscriptionResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.detachSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes detachSubscription with error', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DetachSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.detachSubscription = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.detachSubscription(request), expectedError); + assert( + (client.innerApiCalls.detachSubscription as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + describe('listTopics', () => { it('invokes listTopics without error', async () => { const client = new publisherModule.v1.PublisherClient({ From 8b4af57285f11dc7742ae9817ca21287787801e7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 2 Jun 2020 16:31:44 -0700 Subject: [PATCH 0633/1115] chore: release 2.1.0 (#1015) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 79c8e821f18..aba8257f73d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.1.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.0.0...v2.1.0) (2020-06-02) + + +### Features + +* re-generated to pick up changes from googleapis ([#1014](https://www.github.com/googleapis/nodejs-pubsub/issues/1014)) ([1ad3552](https://www.github.com/googleapis/nodejs-pubsub/commit/1ad35528f0d8b5420f9fbe122db2ff1962e32acb)) + + +### Bug Fixes + +* use any to unblock typescript compilation bug ([#1012](https://www.github.com/googleapis/nodejs-pubsub/issues/1012)) ([1e8ced3](https://www.github.com/googleapis/nodejs-pubsub/commit/1e8ced3f06d12487fdf00b443bb447e1ec1a911b)) + ## [2.0.0](https://www.github.com/googleapis/nodejs-pubsub/compare/vv1.7.1...v2.0.0) (2020-05-20) Please note that Node 8 is no longer supported, and Node 10 is the new minimum version of the runtime. diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 852464ef915..e25eb1ca1d2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.0.0", + "version": "2.1.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 311b1b0782f7a24576b089732134df7705c2df3b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 4 Jun 2020 10:33:18 -0700 Subject: [PATCH 0634/1115] docs: update list of available samples (#1016) --- handwritten/pubsub/README.md | 4 ++++ handwritten/pubsub/protos/protos.d.ts | 6 ++++++ handwritten/pubsub/protos/protos.js | 28 ++++++++++++++++++++++++--- handwritten/pubsub/protos/protos.json | 6 +++++- handwritten/pubsub/synth.metadata | 2 +- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index b26192f5459..b675c16d450 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -105,6 +105,7 @@ has instructions for running the samples. | --------------------------- | --------------------------------- | ------ | | Create Push Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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/master/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 Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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) | | Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | | Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | @@ -124,13 +125,16 @@ has instructions for running the samples. | Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | | Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | | Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/quickstart.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/quickstart.js,samples/README.md) | +| Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | | Set Subscription IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setSubscriptionPolicy.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/setSubscriptionPolicy.js,samples/README.md) | | Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | | Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | | Synchronous Pull | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPull.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/synchronousPull.js,samples/README.md) | +| Synchronous Pull with delivery attempt. | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPullWithDeliveryAttempts.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/synchronousPullWithDeliveryAttempts.js,samples/README.md) | | Synchronous Pull With Lease Management | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPullWithLeaseManagement.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/synchronousPullWithLeaseManagement.js,samples/README.md) | | Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | | Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | +| Update Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/updateDeadLetterPolicy.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/updateDeadLetterPolicy.js,samples/README.md) | diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index daa9a86be66..69cccf4d4c0 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -6222,6 +6222,9 @@ export namespace google { /** FieldDescriptorProto options */ options?: (google.protobuf.IFieldOptions|null); + + /** FieldDescriptorProto proto3Optional */ + proto3Optional?: (boolean|null); } /** Represents a FieldDescriptorProto. */ @@ -6263,6 +6266,9 @@ export namespace google { /** FieldDescriptorProto options. */ public options?: (google.protobuf.IFieldOptions|null); + /** FieldDescriptorProto proto3Optional. */ + public proto3Optional: boolean; + /** * Creates a new FieldDescriptorProto instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 51963973434..33b63124924 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -28,7 +28,7 @@ var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; // Exported root namespace - var $root = $protobuf.roots._google_cloud_pubsub_2_0_0_protos || ($protobuf.roots._google_cloud_pubsub_2_0_0_protos = {}); + var $root = $protobuf.roots._google_cloud_pubsub_2_1_0_protos || ($protobuf.roots._google_cloud_pubsub_2_1_0_protos = {}); $root.google = (function() { @@ -14622,6 +14622,7 @@ * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex * @property {string|null} [jsonName] FieldDescriptorProto jsonName * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options + * @property {boolean|null} [proto3Optional] FieldDescriptorProto proto3Optional */ /** @@ -14719,6 +14720,14 @@ */ FieldDescriptorProto.prototype.options = null; + /** + * FieldDescriptorProto proto3Optional. + * @member {boolean} proto3Optional + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.proto3Optional = false; + /** * Creates a new FieldDescriptorProto instance using the specified properties. * @function create @@ -14763,6 +14772,8 @@ writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); if (message.jsonName != null && Object.hasOwnProperty.call(message, "jsonName")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); + if (message.proto3Optional != null && Object.hasOwnProperty.call(message, "proto3Optional")) + writer.uint32(/* id 17, wireType 0 =*/136).bool(message.proto3Optional); return writer; }; @@ -14827,6 +14838,9 @@ case 8: message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); break; + case 17: + message.proto3Optional = reader.bool(); + break; default: reader.skipType(tag & 7); break; @@ -14921,6 +14935,9 @@ if (error) return "options." + error; } + if (message.proto3Optional != null && message.hasOwnProperty("proto3Optional")) + if (typeof message.proto3Optional !== "boolean") + return "proto3Optional: boolean expected"; return null; }; @@ -15043,6 +15060,8 @@ throw TypeError(".google.protobuf.FieldDescriptorProto.options: object expected"); message.options = $root.google.protobuf.FieldOptions.fromObject(object.options); } + if (object.proto3Optional != null) + message.proto3Optional = Boolean(object.proto3Optional); return message; }; @@ -15070,6 +15089,7 @@ object.options = null; object.oneofIndex = 0; object.jsonName = ""; + object.proto3Optional = false; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -15091,6 +15111,8 @@ object.oneofIndex = message.oneofIndex; if (message.jsonName != null && message.hasOwnProperty("jsonName")) object.jsonName = message.jsonName; + if (message.proto3Optional != null && message.hasOwnProperty("proto3Optional")) + object.proto3Optional = message.proto3Optional; return object; }; @@ -16884,7 +16906,7 @@ * @memberof google.protobuf.FileOptions * @instance */ - FileOptions.prototype.ccEnableArenas = false; + FileOptions.prototype.ccEnableArenas = true; /** * FileOptions objcClassPrefix. @@ -17370,7 +17392,7 @@ object.javaGenerateEqualsAndHash = false; object.deprecated = false; object.javaStringCheckUtf8 = false; - object.ccEnableArenas = false; + object.ccEnableArenas = true; object.objcClassPrefix = ""; object.csharpNamespace = ""; object.swiftPrefix = ""; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index ad04ecbdbe6..b968a930bc3 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1447,6 +1447,10 @@ "options": { "type": "FieldOptions", "id": 8 + }, + "proto3Optional": { + "type": "bool", + "id": 17 } }, "nested": { @@ -1682,7 +1686,7 @@ "type": "bool", "id": 31, "options": { - "default": false + "default": true } }, "objcClassPrefix": { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 17e329885b7..951e30a7c6b 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "1e8ced3f06d12487fdf00b443bb447e1ec1a911b" + "sha": "8a0255127fe460df8ea0781d032994d4c82310b8" } }, { From d2351f55933be70514f066cfdcda28c73e792e08 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 9 Jun 2020 17:41:03 -0700 Subject: [PATCH 0635/1115] feat: move ts target to es2018 from es2016 (#1022) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/9b55eba7-85ee-48d5-a737-8b677439db4d/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/1c92077459db3dc50741e878f98b08c6261181e0 --- .../pubsub/.kokoro/populate-secrets.sh | 32 +++++++++++++++++++ handwritten/pubsub/.kokoro/publish.sh | 2 +- .../pubsub/.kokoro/release/publish.cfg | 10 ++---- handwritten/pubsub/.kokoro/trampoline.sh | 1 + handwritten/pubsub/protos/protos.js | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 7 ++++ .../pubsub/src/v1/subscriber_client.ts | 7 ++++ handwritten/pubsub/synth.metadata | 4 +-- handwritten/pubsub/tsconfig.json | 2 +- 9 files changed, 55 insertions(+), 12 deletions(-) create mode 100755 handwritten/pubsub/.kokoro/populate-secrets.sh diff --git a/handwritten/pubsub/.kokoro/populate-secrets.sh b/handwritten/pubsub/.kokoro/populate-secrets.sh new file mode 100755 index 00000000000..85801f403e2 --- /dev/null +++ b/handwritten/pubsub/.kokoro/populate-secrets.sh @@ -0,0 +1,32 @@ +#!/bin/bash +# Copyright 2020 Google LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +# Populates requested secrets set in SECRET_MANAGER_KEYS from service account: +# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com +SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" +mkdir -p ${SECRET_LOCATION} +for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g") +do + docker run --entrypoint=gcloud \ + --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \ + gcr.io/google.com/cloudsdktool/cloud-sdk \ + secrets versions access latest \ + --credential-file-override=${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json \ + --project cloud-devrel-kokoro-resources \ + --secret $key > \ + "$SECRET_LOCATION/$key" +done diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh index c0a8c7dda8e..24957d71def 100755 --- a/handwritten/pubsub/.kokoro/publish.sh +++ b/handwritten/pubsub/.kokoro/publish.sh @@ -24,7 +24,7 @@ python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source / cd $(dirname $0)/.. -NPM_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_google-cloud-pubsub-npm-token) +NPM_TOKEN=$(cat $KOKORO_GFILE_DIR/secret_manager/npm_publish_token echo "//wombat-dressing-room.appspot.com/:_authToken=${NPM_TOKEN}" > ~/.npmrc npm install diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index e747a8e2fda..2ceba7dcc6e 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -47,13 +47,9 @@ before_action { } } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "google-cloud-pubsub-npm-token" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "npm_publish_token" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/trampoline.sh b/handwritten/pubsub/.kokoro/trampoline.sh index 9bd4905c4b5..a4241db23f4 100755 --- a/handwritten/pubsub/.kokoro/trampoline.sh +++ b/handwritten/pubsub/.kokoro/trampoline.sh @@ -24,4 +24,5 @@ function cleanup() { } trap cleanup EXIT +$(dirname $0)/populate-secrets.sh # Secret Manager secrets. python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 33b63124924..87e7c2653d2 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -28,7 +28,7 @@ var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; // Exported root namespace - var $root = $protobuf.roots._google_cloud_pubsub_2_1_0_protos || ($protobuf.roots._google_cloud_pubsub_2_1_0_protos = {}); + var $root = $protobuf.roots._google_cloud_pubsub_protos || ($protobuf.roots._google_cloud_pubsub_protos = {}); $root.google = (function() { diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 20e86125863..871a86269eb 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -103,6 +103,13 @@ export class PublisherClient { } opts.servicePath = opts.servicePath || servicePath; opts.port = opts.port || port; + + // users can override the config from client side, like retry codes name. + // The detailed structure of the clientConfig can be found here: https://github.com/googleapis/gax-nodejs/blob/master/src/gax.ts#L546 + // The way to override client config for Showcase API: + // + // const customConfig = {"interfaces": {"google.showcase.v1beta1.Echo": {"methods": {"Echo": {"retry_codes_name": "idempotent", "retry_params_name": "default"}}}}} + // const showcaseClient = new showcaseClient({ projectId, customConfig }); opts.clientConfig = opts.clientConfig || {}; const isBrowser = typeof window !== 'undefined'; diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 73982b12229..77d883b5f99 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -104,6 +104,13 @@ export class SubscriberClient { } opts.servicePath = opts.servicePath || servicePath; opts.port = opts.port || port; + + // users can override the config from client side, like retry codes name. + // The detailed structure of the clientConfig can be found here: https://github.com/googleapis/gax-nodejs/blob/master/src/gax.ts#L546 + // The way to override client config for Showcase API: + // + // const customConfig = {"interfaces": {"google.showcase.v1beta1.Echo": {"methods": {"Echo": {"retry_codes_name": "idempotent", "retry_params_name": "default"}}}}} + // const showcaseClient = new showcaseClient({ projectId, customConfig }); opts.clientConfig = opts.clientConfig || {}; const isBrowser = typeof window !== 'undefined'; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 951e30a7c6b..deaba17179f 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "8a0255127fe460df8ea0781d032994d4c82310b8" + "sha": "3ad4809f60b6ca26078723f35b17397e22d1a9ca" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "be74d3e532faa47eb59f1a0eaebde0860d1d8ab4" + "sha": "1c92077459db3dc50741e878f98b08c6261181e0" } } ], diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index 613d35597b5..c78f1c884ef 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "build", "resolveJsonModule": true, "lib": [ - "es2016", + "es2018", "dom" ] }, From 19010be42d74a99faacb7ac672d9af85a1fdba28 Mon Sep 17 00:00:00 2001 From: Bryan Ricker Date: Wed, 10 Jun 2020 13:53:59 -0700 Subject: [PATCH 0636/1115] Fix documentation typo (#1024) --- handwritten/pubsub/src/subscriber.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 1bf311bff05..5efdecadede 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -46,7 +46,7 @@ export type PullResponse = google.pubsub.v1.IPullResponse; * // { * // ackId: 'RUFeQBJMJAxESVMrQwsqWBFOBCEhPjA', * // attributes: {key: 'value'}, - * // data: Buffer.from('Hello, world!), + * // data: Buffer.from('Hello, world!'), * // id: '1551297743043', * // orderingKey: 'ordering-key', * // publishTime: new PreciseDate('2019-02-27T20:02:19.029534186Z'), From cd0c2c3df043f39e2a3c7c77b1a19865139f1e05 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 10 Jun 2020 16:00:04 -0700 Subject: [PATCH 0637/1115] patch: re-generated to pick up changes from googleapis (#1021) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * docs: Add comment for MessageStoragePolicy message PiperOrigin-RevId: 313795529 Source-Author: Google APIs Source-Date: Fri May 29 09:33:18 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: f4bd71cc173d848ec24d28eede271cca9abc411f Source-Link: https://github.com/googleapis/googleapis/commit/f4bd71cc173d848ec24d28eede271cca9abc411f * Drop the experimental tag on the Subscription filter and retry policy fields Clarify some retry policy comments PiperOrigin-RevId: 313812131 Source-Author: Google APIs Source-Date: Fri May 29 10:59:34 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: fb21971becb6c0441efc855dabc371825732872c Source-Link: https://github.com/googleapis/googleapis/commit/fb21971becb6c0441efc855dabc371825732872c * Add "detached" bool to Subscription PiperOrigin-RevId: 314795690 Source-Author: Google APIs Source-Date: Thu Jun 4 13:43:59 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 86285bbd54fbf9708838219e3422aa47fb8fc0b0 Source-Link: https://github.com/googleapis/googleapis/commit/86285bbd54fbf9708838219e3422aa47fb8fc0b0 Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- .../protos/google/pubsub/v1/pubsub.proto | 16 ++++++++------ handwritten/pubsub/protos/protos.d.ts | 6 +++++ handwritten/pubsub/protos/protos.js | 22 +++++++++++++++++++ handwritten/pubsub/protos/protos.json | 4 ++++ .../pubsub/src/v1/subscriber_client.ts | 14 ++++++------ handwritten/pubsub/synth.metadata | 4 ++-- 6 files changed, 50 insertions(+), 16 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index a0179774ffe..d85f2734e68 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -135,6 +135,7 @@ service Publisher { } } +// A policy constraining the storage of messages published to the topic. message MessageStoragePolicy { // A list of IDs of GCP regions where messages that are published to the topic // may be persisted in storage. Messages published by publishers running in @@ -703,9 +704,6 @@ message Subscription { // then only `PubsubMessage`s whose `attributes` field matches the filter are // delivered on this subscription. If empty, then no messages are filtered // out. - // EXPERIMENTAL: This feature is part of a closed alpha release. This - // API might be changed in backward-incompatible ways and is not recommended - // for production use. It is not subject to any SLA or deprecation policy. string filter = 12; // A policy that specifies the conditions for dead lettering messages in @@ -718,17 +716,21 @@ message Subscription { // permission to Acknowledge() messages on this subscription. DeadLetterPolicy dead_letter_policy = 13; - // A policy that specifies how Cloud Pub/Sub retries message delivery for this + // A policy that specifies how Pub/Sub retries message delivery for this // subscription. // // If not set, the default retry policy is applied. This generally implies // that messages will be retried as soon as possible for healthy subscribers. // RetryPolicy will be triggered on NACKs or acknowledgement deadline // exceeded events for a given message. - // EXPERIMENTAL: This API might be changed in backward-incompatible - // ways and is not recommended for production use. It is not subject to any - // SLA or deprecation policy. RetryPolicy retry_policy = 14; + + // Indicates whether the subscription is detached from its topic. Detached + // subscriptions don't receive messages from their topic and don't retain any + // backlog. `Pull` and `StreamingPull` requests will return + // FAILED_PRECONDITION. If the subscription is a push subscription, pushes to + // the endpoint will not be made. + bool detached = 15; } // A policy that specifies how Cloud Pub/Sub retries message delivery. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 69cccf4d4c0..52599b7822f 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -2176,6 +2176,9 @@ export namespace google { /** Subscription retryPolicy */ retryPolicy?: (google.pubsub.v1.IRetryPolicy|null); + + /** Subscription detached */ + detached?: (boolean|null); } /** Represents a Subscription. */ @@ -2223,6 +2226,9 @@ export namespace google { /** Subscription retryPolicy. */ public retryPolicy?: (google.pubsub.v1.IRetryPolicy|null); + /** Subscription detached. */ + public detached: boolean; + /** * Creates a new Subscription instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 87e7c2653d2..b8507186141 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -4520,6 +4520,7 @@ * @property {string|null} [filter] Subscription filter * @property {google.pubsub.v1.IDeadLetterPolicy|null} [deadLetterPolicy] Subscription deadLetterPolicy * @property {google.pubsub.v1.IRetryPolicy|null} [retryPolicy] Subscription retryPolicy + * @property {boolean|null} [detached] Subscription detached */ /** @@ -4634,6 +4635,14 @@ */ Subscription.prototype.retryPolicy = null; + /** + * Subscription detached. + * @member {boolean} detached + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.detached = false; + /** * Creates a new Subscription instance using the specified properties. * @function create @@ -4683,6 +4692,8 @@ $root.google.pubsub.v1.DeadLetterPolicy.encode(message.deadLetterPolicy, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); if (message.retryPolicy != null && Object.hasOwnProperty.call(message, "retryPolicy")) $root.google.pubsub.v1.RetryPolicy.encode(message.retryPolicy, writer.uint32(/* id 14, wireType 2 =*/114).fork()).ldelim(); + if (message.detached != null && Object.hasOwnProperty.call(message, "detached")) + writer.uint32(/* id 15, wireType 0 =*/120).bool(message.detached); return writer; }; @@ -4758,6 +4769,9 @@ case 14: message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.decode(reader, reader.uint32()); break; + case 15: + message.detached = reader.bool(); + break; default: reader.skipType(tag & 7); break; @@ -4844,6 +4858,9 @@ if (error) return "retryPolicy." + error; } + if (message.detached != null && message.hasOwnProperty("detached")) + if (typeof message.detached !== "boolean") + return "detached: boolean expected"; return null; }; @@ -4903,6 +4920,8 @@ throw TypeError(".google.pubsub.v1.Subscription.retryPolicy: object expected"); message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.fromObject(object.retryPolicy); } + if (object.detached != null) + message.detached = Boolean(object.detached); return message; }; @@ -4933,6 +4952,7 @@ object.filter = ""; object.deadLetterPolicy = null; object.retryPolicy = null; + object.detached = false; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -4962,6 +4982,8 @@ object.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.toObject(message.deadLetterPolicy, options); if (message.retryPolicy != null && message.hasOwnProperty("retryPolicy")) object.retryPolicy = $root.google.pubsub.v1.RetryPolicy.toObject(message.retryPolicy, options); + if (message.detached != null && message.hasOwnProperty("detached")) + object.detached = message.detached; return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index b968a930bc3..17d51698153 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -548,6 +548,10 @@ "retryPolicy": { "type": "RetryPolicy", "id": 14 + }, + "detached": { + "type": "bool", + "id": 15 } } }, diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 77d883b5f99..15eb10a0b7b 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -469,9 +469,6 @@ export class SubscriberClient { * then only `PubsubMessage`s whose `attributes` field matches the filter are * delivered on this subscription. If empty, then no messages are filtered * out. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. * @param {google.pubsub.v1.DeadLetterPolicy} request.deadLetterPolicy * A policy that specifies the conditions for dead lettering messages in * this subscription. If dead_letter_policy is not set, dead lettering @@ -482,16 +479,19 @@ export class SubscriberClient { * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have * permission to Acknowledge() messages on this subscription. * @param {google.pubsub.v1.RetryPolicy} request.retryPolicy - * A policy that specifies how Cloud Pub/Sub retries message delivery for this + * A policy that specifies how Pub/Sub retries message delivery for this * subscription. * * If not set, the default retry policy is applied. This generally implies * that messages will be retried as soon as possible for healthy subscribers. * RetryPolicy will be triggered on NACKs or acknowledgement deadline * exceeded events for a given message. - * EXPERIMENTAL: This API might be changed in backward-incompatible - * ways and is not recommended for production use. It is not subject to any - * SLA or deprecation policy. + * @param {boolean} request.detached + * Indicates whether the subscription is detached from its topic. Detached + * subscriptions don't receive messages from their topic and don't retain any + * backlog. `Pull` and `StreamingPull` requests will return + * FAILED_PRECONDITION. If the subscription is a push subscription, pushes to + * the endpoint will not be made. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index deaba17179f..7eabba4a5e9 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "eafa840ceec23b44a5c21670288107c661252711", - "internalRef": "313488995" + "sha": "86285bbd54fbf9708838219e3422aa47fb8fc0b0", + "internalRef": "314795690" } }, { From 043654f590607821dc7cf2e91f0bf0686fdd17ad Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 11 Jun 2020 17:48:05 +0200 Subject: [PATCH 0638/1115] chore(deps): update dependency mocha to v8 (#1025) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [mocha](https://mochajs.org/) ([source](https://togithub.com/mochajs/mocha)) | devDependencies | major | [`^7.0.0` -> `^8.0.0`](https://renovatebot.com/diffs/npm/mocha/7.2.0/8.0.1) | --- ### Release Notes
mochajs/mocha ### [`v8.0.1`](https://togithub.com/mochajs/mocha/blob/master/CHANGELOG.md#​801--2020-06-10) [Compare Source](https://togithub.com/mochajs/mocha/compare/v8.0.0...v8.0.1) The obligatory patch after a major. #### :bug: Fixes - [#​4328](https://togithub.com/mochajs/mocha/issues/4328): Fix `--parallel` when combined with `--watch` ([**@​boneskull**](https://togithub.com/boneskull)) ### [`v8.0.0`](https://togithub.com/mochajs/mocha/blob/master/CHANGELOG.md#​800--2020-06-10) [Compare Source](https://togithub.com/mochajs/mocha/compare/v7.2.0...v8.0.0) In this major release, Mocha adds the ability to _run tests in parallel_. Better late than never! Please note the **breaking changes** detailed below. Let's welcome [**@​giltayar**](https://togithub.com/giltayar) and [**@​nicojs**](https://togithub.com/nicojs) to the maintenance team! #### :boom: Breaking Changes - [#​4164](https://togithub.com/mochajs/mocha/issues/4164): **Mocha v8.0.0 now requires Node.js v10.0.0 or newer.** Mocha no longer supports the Node.js v8.x line ("Carbon"), which entered End-of-Life at the end of 2019 ([**@​UlisesGascon**](https://togithub.com/UlisesGascon)) - [#​4175](https://togithub.com/mochajs/mocha/issues/4175): Having been deprecated with a warning since v7.0.0, **`mocha.opts` is no longer supported** ([**@​juergba**](https://togithub.com/juergba)) :sparkles: **WORKAROUND:** Replace `mocha.opts` with a [configuration file](https://mochajs.org/#configuring-mocha-nodejs). - [#​4260](https://togithub.com/mochajs/mocha/issues/4260): Remove `enableTimeout()` (`this.enableTimeout()`) from the context object ([**@​craigtaub**](https://togithub.com/craigtaub)) :sparkles: **WORKAROUND:** Replace usage of `this.enableTimeout(false)` in your tests with `this.timeout(0)`. - [#​4315](https://togithub.com/mochajs/mocha/issues/4315): The `spec` option no longer supports a comma-delimited list of files ([**@​juergba**](https://togithub.com/juergba)) :sparkles: **WORKAROUND**: Use an array instead (e.g., `"spec": "foo.js,bar.js"` becomes `"spec": ["foo.js", "bar.js"]`). - [#​4309](https://togithub.com/mochajs/mocha/issues/4309): Drop support for Node.js v13.x line, which is now End-of-Life ([**@​juergba**](https://togithub.com/juergba)) - [#​4282](https://togithub.com/mochajs/mocha/issues/4282): `--forbid-only` will throw an error even if exclusive tests are avoided via `--grep` or other means ([**@​arvidOtt**](https://togithub.com/arvidOtt)) - [#​4223](https://togithub.com/mochajs/mocha/issues/4223): The context object's `skip()` (`this.skip()`) in a "before all" (`before()`) hook will no longer execute subsequent sibling hooks, in addition to hooks in child suites ([**@​juergba**](https://togithub.com/juergba)) - [#​4178](https://togithub.com/mochajs/mocha/issues/4178): Remove previously soft-deprecated APIs ([**@​wnghdcjfe**](https://togithub.com/wnghdcjfe)): - `Mocha.prototype.ignoreLeaks()` - `Mocha.prototype.useColors()` - `Mocha.prototype.useInlineDiffs()` - `Mocha.prototype.hideDiff()` #### :tada: Enhancements - [#​4245](https://togithub.com/mochajs/mocha/issues/4245): Add ability to run tests in parallel for Node.js (see [docs](https://mochajs.org/#parallel-tests)) ([**@​boneskull**](https://togithub.com/boneskull)) :exclamation: See also [#​4244](https://togithub.com/mochajs/mocha/issues/4244); [Root Hook Plugins (docs)](https://mochajs.org/#root-hook-plugins) -- _root hooks must be defined via Root Hook Plugins to work in parallel mode_ - [#​4304](https://togithub.com/mochajs/mocha/issues/4304): `--require` now works with ES modules ([**@​JacobLey**](https://togithub.com/JacobLey)) - [#​4299](https://togithub.com/mochajs/mocha/issues/4299): In some circumstances, Mocha can run ES modules under Node.js v10 -- _use at your own risk!_ ([**@​giltayar**](https://togithub.com/giltayar)) #### :book: Documentation - [#​4246](https://togithub.com/mochajs/mocha/issues/4246): Add documentation for parallel mode and Root Hook plugins ([**@​boneskull**](https://togithub.com/boneskull)) #### :bug: Fixes (All bug fixes in Mocha v8.0.0 are also breaking changes, and are listed above)
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e25eb1ca1d2..7417e7ceee6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -83,7 +83,7 @@ "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", "linkinator": "^2.0.0", - "mocha": "^7.0.0", + "mocha": "^8.0.0", "mv": "^2.1.1", "ncp": "^2.0.0", "null-loader": "^4.0.0", From f555b1546e913fd6703bc11212d5a5d6b280aa03 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 11 Jun 2020 14:54:24 -0700 Subject: [PATCH 0639/1115] chore(nodejs_templates): add script logging to node_library populate-secrets.sh (#1026) --- handwritten/pubsub/.kokoro/populate-secrets.sh | 12 ++++++++++++ handwritten/pubsub/synth.metadata | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.kokoro/populate-secrets.sh b/handwritten/pubsub/.kokoro/populate-secrets.sh index 85801f403e2..e6ce8200d75 100755 --- a/handwritten/pubsub/.kokoro/populate-secrets.sh +++ b/handwritten/pubsub/.kokoro/populate-secrets.sh @@ -15,12 +15,19 @@ set -eo pipefail +function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;} +function msg { println "$*" >&2 ;} +function println { printf '%s\n' "$(now) $*" ;} + + # Populates requested secrets set in SECRET_MANAGER_KEYS from service account: # kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" +msg "Creating folder on disk for secrets: ${SECRET_LOCATION}" mkdir -p ${SECRET_LOCATION} for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g") do + msg "Retrieving secret ${key}" docker run --entrypoint=gcloud \ --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \ gcr.io/google.com/cloudsdktool/cloud-sdk \ @@ -29,4 +36,9 @@ do --project cloud-devrel-kokoro-resources \ --secret $key > \ "$SECRET_LOCATION/$key" + if [[ $? == 0 ]]; then + msg "Secret written to ${SECRET_LOCATION}/${key}" + else + msg "Error retrieving secret ${key}" + fi done diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 7eabba4a5e9..ea8da94c93f 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "3ad4809f60b6ca26078723f35b17397e22d1a9ca" + "sha": "444252a00e833b4574481c293d1b754d47b1f41c" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1c92077459db3dc50741e878f98b08c6261181e0" + "sha": "e7034945fbdc0e79d3c57f6e299e5c90b0f11469" } } ], From 5cfb80fefae34b6fd47d6fb5a18317d8dbd759cb Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 12 Jun 2020 10:43:53 -0700 Subject: [PATCH 0640/1115] fix: handle fallback option properly (#1028) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * docs: Add a link to Pub/Sub filtering language public documentation to pubsub.proto PiperOrigin-RevId: 315930680 Source-Author: Google APIs Source-Date: Thu Jun 11 10:43:34 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: a19b46e54cc5195557f70ff68f1696d1e3b4702e Source-Link: https://github.com/googleapis/googleapis/commit/a19b46e54cc5195557f70ff68f1696d1e3b4702e --- .../pubsub/protos/google/pubsub/v1/pubsub.proto | 6 ++++-- handwritten/pubsub/src/v1/publisher_client.ts | 13 +++++-------- handwritten/pubsub/src/v1/subscriber_client.ts | 16 +++++++--------- handwritten/pubsub/synth.metadata | 6 +++--- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index d85f2734e68..5bb1f14a5e9 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -191,7 +191,8 @@ message PubsubMessage { bytes data = 1; // Attributes for this message. If this field is empty, the message must - // contain non-empty data. + // contain non-empty data. This can be used to filter messages on the + // subscription. map attributes = 2; // ID of this message, assigned by the server when the message is published. @@ -700,7 +701,8 @@ message Subscription { // value for `expiration_policy.ttl` is 1 day. ExpirationPolicy expiration_policy = 11; - // An expression written in the Cloud Pub/Sub filter language. If non-empty, + // An expression written in the Pub/Sub [filter + // language](https://cloud.google.com/pubsub/docs/filtering). If non-empty, // then only `PubsubMessage`s whose `attributes` field matches the filter are // delivered on this subscription. If empty, then no messages are filtered // out. diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 871a86269eb..d7ee77ce165 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -112,14 +112,11 @@ export class PublisherClient { // const showcaseClient = new showcaseClient({ projectId, customConfig }); opts.clientConfig = opts.clientConfig || {}; - const isBrowser = typeof window !== 'undefined'; - if (isBrowser) { - opts.fallback = true; - } - // If we are in browser, we are already using fallback because of the - // "browser" field in package.json. - // But if we were explicitly requested to use fallback, let's do it now. - this._gaxModule = !isBrowser && opts.fallback ? gax.fallback : gax; + // If we're running in browser, it's OK to omit `fallback` since + // google-gax has `browser` field in its `package.json`. + // For Electron (which does not respect `browser` field), + // pass `{fallback: true}` to the PublisherClient constructor. + this._gaxModule = opts.fallback ? gax.fallback : gax; // Create a `gaxGrpc` object, with any grpc-specific options // sent to the client. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 15eb10a0b7b..117a7efe117 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -113,14 +113,11 @@ export class SubscriberClient { // const showcaseClient = new showcaseClient({ projectId, customConfig }); opts.clientConfig = opts.clientConfig || {}; - const isBrowser = typeof window !== 'undefined'; - if (isBrowser) { - opts.fallback = true; - } - // If we are in browser, we are already using fallback because of the - // "browser" field in package.json. - // But if we were explicitly requested to use fallback, let's do it now. - this._gaxModule = !isBrowser && opts.fallback ? gax.fallback : gax; + // If we're running in browser, it's OK to omit `fallback` since + // google-gax has `browser` field in its `package.json`. + // For Electron (which does not respect `browser` field), + // pass `{fallback: true}` to the SubscriberClient constructor. + this._gaxModule = opts.fallback ? gax.fallback : gax; // Create a `gaxGrpc` object, with any grpc-specific options // sent to the client. @@ -465,7 +462,8 @@ export class SubscriberClient { * *default policy* with `ttl` of 31 days will be used. The minimum allowed * value for `expiration_policy.ttl` is 1 day. * @param {string} request.filter - * An expression written in the Cloud Pub/Sub filter language. If non-empty, + * An expression written in the Pub/Sub [filter + * language](https://cloud.google.com/pubsub/docs/filtering). If non-empty, * then only `PubsubMessage`s whose `attributes` field matches the filter are * delivered on this subscription. If empty, then no messages are filtered * out. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index ea8da94c93f..ef86d73d7a0 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "444252a00e833b4574481c293d1b754d47b1f41c" + "sha": "11309929018495ce7111cd5bcd022921acc5f6bb" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "86285bbd54fbf9708838219e3422aa47fb8fc0b0", - "internalRef": "314795690" + "sha": "a19b46e54cc5195557f70ff68f1696d1e3b4702e", + "internalRef": "315930680" } }, { From 9030bd956978ec8be5f43ff6c748bcaffa504e0a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 18 Jun 2020 11:04:42 -0700 Subject: [PATCH 0641/1115] fix: update node issue template (#1033) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/37f383f8-7560-459e-b66c-def10ff830cb/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/b10590a4a1568548dd13cfcea9aa11d40898144b --- .../pubsub/.github/ISSUE_TEMPLATE/bug_report.md | 11 ++++++++--- handwritten/pubsub/synth.metadata | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md index ae9631e1c1a..a0e5d5dd239 100644 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,13 +8,18 @@ Thanks for stopping by to let us know something could be better! **PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. -Please run down the following list and make sure you've tried the usual "quick fixes": +1) Is this a client library issue or a product issue? +This is the client library for . We will only be able to assist with issues that pertain to the behaviors of this library. If the issue you're experiencing is due to the behavior of the product itself, please visit the [ Support page]() to reach the most relevant engineers. +2) Did someone already solve this? - Search the issues already opened: https://github.com/googleapis/nodejs-pubsub/issues - Search the issues on our "catch-all" repository: https://github.com/googleapis/google-cloud-node - - Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js + - Search or ask on StackOverflow (engineers monitor these tags): http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js -If you are still having issues, please be sure to include as much information as possible: +3) Do you have a support contract? +Please create an issue in the [support console](https://cloud.google.com/support/) to ensure a timely response. + +If the support paths suggested above still do not result in a resolution, please provide the following details. #### Environment details diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index ef86d73d7a0..2d34c156bcf 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "11309929018495ce7111cd5bcd022921acc5f6bb" + "sha": "5dc18270220dbf39f5a871716b4dd9d002d0c536" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e7034945fbdc0e79d3c57f6e299e5c90b0f11469" + "sha": "b10590a4a1568548dd13cfcea9aa11d40898144b" } } ], From 096721423a52210d0a9d461aeaf3752b8001efe1 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 25 Jun 2020 16:16:12 -0700 Subject: [PATCH 0642/1115] feat: add flow control settings for StreamingPullRequest to pubsub.proto (#1035) PiperOrigin-RevId: 317914250 Source-Author: Google APIs Source-Date: Tue Jun 23 12:05:24 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 14f0c2cc9392234707247ab2b0782c118cb179aa Source-Link: https://github.com/googleapis/googleapis/commit/14f0c2cc9392234707247ab2b0782c118cb179aa --- .../protos/google/pubsub/v1/pubsub.proto | 22 ++++++ handwritten/pubsub/protos/protos.d.ts | 12 ++++ handwritten/pubsub/protos/protos.js | 72 +++++++++++++++++++ handwritten/pubsub/protos/protos.json | 8 +++ handwritten/pubsub/synth.metadata | 6 +- 5 files changed, 117 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 5bb1f14a5e9..dc9151446fe 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1109,6 +1109,28 @@ message StreamingPullRequest { // transferred to the new stream. The same client_id should not be used for // different client instances. string client_id = 6; + + // Flow control settings for the maximum number of outstanding messages. When + // there are `max_outstanding_messages` or more currently sent to the + // streaming pull client that have not yet been acked or nacked, the server + // stops sending more messages. The sending of messages resumes once the + // number of outstanding messages is less than this value. If the value is + // <= 0, there is no limit to the number of outstanding messages. This + // property can only be set on the initial StreamingPullRequest. If it is set + // on a subsequent request, the stream will be aborted with status + // `INVALID_ARGUMENT`. + int64 max_outstanding_messages = 7; + + // Flow control settings for the maximum number of outstanding bytes. When + // there are `max_outstanding_bytes` or more worth of messages currently sent + // to the streaming pull client that have not yet been acked or nacked, the + // server will stop sending more messages. The sending of messages resumes + // once the number of outstanding bytes is less than this value. If the value + // is <= 0, there is no limit to the number of outstanding bytes. This + // property can only be set on the initial StreamingPullRequest. If it is set + // on a subsequent request, the stream will be aborted with status + // `INVALID_ARGUMENT`. + int64 max_outstanding_bytes = 8; } // Response for the `StreamingPull` method. This response is used to stream diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 52599b7822f..78a99999cc6 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -3868,6 +3868,12 @@ export namespace google { /** StreamingPullRequest clientId */ clientId?: (string|null); + + /** StreamingPullRequest maxOutstandingMessages */ + maxOutstandingMessages?: (number|Long|string|null); + + /** StreamingPullRequest maxOutstandingBytes */ + maxOutstandingBytes?: (number|Long|string|null); } /** Represents a StreamingPullRequest. */ @@ -3897,6 +3903,12 @@ export namespace google { /** StreamingPullRequest clientId. */ public clientId: string; + /** StreamingPullRequest maxOutstandingMessages. */ + public maxOutstandingMessages: (number|Long|string); + + /** StreamingPullRequest maxOutstandingBytes. */ + public maxOutstandingBytes: (number|Long|string); + /** * Creates a new StreamingPullRequest instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index b8507186141..27f09ddbd1f 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -8547,6 +8547,8 @@ * @property {Array.|null} [modifyDeadlineAckIds] StreamingPullRequest modifyDeadlineAckIds * @property {number|null} [streamAckDeadlineSeconds] StreamingPullRequest streamAckDeadlineSeconds * @property {string|null} [clientId] StreamingPullRequest clientId + * @property {number|Long|null} [maxOutstandingMessages] StreamingPullRequest maxOutstandingMessages + * @property {number|Long|null} [maxOutstandingBytes] StreamingPullRequest maxOutstandingBytes */ /** @@ -8615,6 +8617,22 @@ */ StreamingPullRequest.prototype.clientId = ""; + /** + * StreamingPullRequest maxOutstandingMessages. + * @member {number|Long} maxOutstandingMessages + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.maxOutstandingMessages = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * StreamingPullRequest maxOutstandingBytes. + * @member {number|Long} maxOutstandingBytes + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.maxOutstandingBytes = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + /** * Creates a new StreamingPullRequest instance using the specified properties. * @function create @@ -8657,6 +8675,10 @@ writer.uint32(/* id 5, wireType 0 =*/40).int32(message.streamAckDeadlineSeconds); if (message.clientId != null && Object.hasOwnProperty.call(message, "clientId")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.clientId); + if (message.maxOutstandingMessages != null && Object.hasOwnProperty.call(message, "maxOutstandingMessages")) + writer.uint32(/* id 7, wireType 0 =*/56).int64(message.maxOutstandingMessages); + if (message.maxOutstandingBytes != null && Object.hasOwnProperty.call(message, "maxOutstandingBytes")) + writer.uint32(/* id 8, wireType 0 =*/64).int64(message.maxOutstandingBytes); return writer; }; @@ -8720,6 +8742,12 @@ case 6: message.clientId = reader.string(); break; + case 7: + message.maxOutstandingMessages = reader.int64(); + break; + case 8: + message.maxOutstandingBytes = reader.int64(); + break; default: reader.skipType(tag & 7); break; @@ -8785,6 +8813,12 @@ if (message.clientId != null && message.hasOwnProperty("clientId")) if (!$util.isString(message.clientId)) return "clientId: string expected"; + if (message.maxOutstandingMessages != null && message.hasOwnProperty("maxOutstandingMessages")) + if (!$util.isInteger(message.maxOutstandingMessages) && !(message.maxOutstandingMessages && $util.isInteger(message.maxOutstandingMessages.low) && $util.isInteger(message.maxOutstandingMessages.high))) + return "maxOutstandingMessages: integer|Long expected"; + if (message.maxOutstandingBytes != null && message.hasOwnProperty("maxOutstandingBytes")) + if (!$util.isInteger(message.maxOutstandingBytes) && !(message.maxOutstandingBytes && $util.isInteger(message.maxOutstandingBytes.low) && $util.isInteger(message.maxOutstandingBytes.high))) + return "maxOutstandingBytes: integer|Long expected"; return null; }; @@ -8827,6 +8861,24 @@ message.streamAckDeadlineSeconds = object.streamAckDeadlineSeconds | 0; if (object.clientId != null) message.clientId = String(object.clientId); + if (object.maxOutstandingMessages != null) + if ($util.Long) + (message.maxOutstandingMessages = $util.Long.fromValue(object.maxOutstandingMessages)).unsigned = false; + else if (typeof object.maxOutstandingMessages === "string") + message.maxOutstandingMessages = parseInt(object.maxOutstandingMessages, 10); + else if (typeof object.maxOutstandingMessages === "number") + message.maxOutstandingMessages = object.maxOutstandingMessages; + else if (typeof object.maxOutstandingMessages === "object") + message.maxOutstandingMessages = new $util.LongBits(object.maxOutstandingMessages.low >>> 0, object.maxOutstandingMessages.high >>> 0).toNumber(); + if (object.maxOutstandingBytes != null) + if ($util.Long) + (message.maxOutstandingBytes = $util.Long.fromValue(object.maxOutstandingBytes)).unsigned = false; + else if (typeof object.maxOutstandingBytes === "string") + message.maxOutstandingBytes = parseInt(object.maxOutstandingBytes, 10); + else if (typeof object.maxOutstandingBytes === "number") + message.maxOutstandingBytes = object.maxOutstandingBytes; + else if (typeof object.maxOutstandingBytes === "object") + message.maxOutstandingBytes = new $util.LongBits(object.maxOutstandingBytes.low >>> 0, object.maxOutstandingBytes.high >>> 0).toNumber(); return message; }; @@ -8852,6 +8904,16 @@ object.subscription = ""; object.streamAckDeadlineSeconds = 0; object.clientId = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.maxOutstandingMessages = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.maxOutstandingMessages = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.maxOutstandingBytes = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.maxOutstandingBytes = options.longs === String ? "0" : 0; } if (message.subscription != null && message.hasOwnProperty("subscription")) object.subscription = message.subscription; @@ -8874,6 +8936,16 @@ object.streamAckDeadlineSeconds = message.streamAckDeadlineSeconds; if (message.clientId != null && message.hasOwnProperty("clientId")) object.clientId = message.clientId; + if (message.maxOutstandingMessages != null && message.hasOwnProperty("maxOutstandingMessages")) + if (typeof message.maxOutstandingMessages === "number") + object.maxOutstandingMessages = options.longs === String ? String(message.maxOutstandingMessages) : message.maxOutstandingMessages; + else + object.maxOutstandingMessages = options.longs === String ? $util.Long.prototype.toString.call(message.maxOutstandingMessages) : options.longs === Number ? new $util.LongBits(message.maxOutstandingMessages.low >>> 0, message.maxOutstandingMessages.high >>> 0).toNumber() : message.maxOutstandingMessages; + if (message.maxOutstandingBytes != null && message.hasOwnProperty("maxOutstandingBytes")) + if (typeof message.maxOutstandingBytes === "number") + object.maxOutstandingBytes = options.longs === String ? String(message.maxOutstandingBytes) : message.maxOutstandingBytes; + else + object.maxOutstandingBytes = options.longs === String ? $util.Long.prototype.toString.call(message.maxOutstandingBytes) : options.longs === Number ? new $util.LongBits(message.maxOutstandingBytes.low >>> 0, message.maxOutstandingBytes.high >>> 0).toNumber() : message.maxOutstandingBytes; return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 17d51698153..526bf020db9 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -853,6 +853,14 @@ "clientId": { "type": "string", "id": 6 + }, + "maxOutstandingMessages": { + "type": "int64", + "id": 7 + }, + "maxOutstandingBytes": { + "type": "int64", + "id": 8 } } }, diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 2d34c156bcf..d3505052ec4 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "5dc18270220dbf39f5a871716b4dd9d002d0c536" + "sha": "52ba0ae0218c0859a03d8ad9e4f27130ceb4cc61" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a19b46e54cc5195557f70ff68f1696d1e3b4702e", - "internalRef": "315930680" + "sha": "14f0c2cc9392234707247ab2b0782c118cb179aa", + "internalRef": "317914250" } }, { From a9d1d4fe7bc495a2475300c23c11516f489a6deb Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 29 Jun 2020 13:25:16 -0700 Subject: [PATCH 0643/1115] build: add config .gitattributes (#1037) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/e6ac0f7f-2fc1-4ac2-9eb5-23ba1215b6a2/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/dc9caca650c77b7039e2bbc3339ffb34ae78e5b7 --- handwritten/pubsub/.gitattributes | 3 +++ handwritten/pubsub/synth.metadata | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 handwritten/pubsub/.gitattributes diff --git a/handwritten/pubsub/.gitattributes b/handwritten/pubsub/.gitattributes new file mode 100644 index 00000000000..2e63216ae9c --- /dev/null +++ b/handwritten/pubsub/.gitattributes @@ -0,0 +1,3 @@ +*.ts text eol=lf +*.js test eol=lf +protos/* linguist-generated diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index d3505052ec4..1e34e828551 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "52ba0ae0218c0859a03d8ad9e4f27130ceb4cc61" + "sha": "a7dff65c1a4115e75251b775f679e6beb092928e" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "b10590a4a1568548dd13cfcea9aa11d40898144b" + "sha": "dc9caca650c77b7039e2bbc3339ffb34ae78e5b7" } } ], From 53ecb6cf567e39f5081a96181a65e12a5034cb3e Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Mon, 6 Jul 2020 10:50:10 -0700 Subject: [PATCH 0644/1115] build: bazel build (#1042) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/e6ac0f7f-2fc1-4ac2-9eb5-23ba1215b6a2/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/dc9caca650c77b7039e2bbc3339ffb34ae78e5b7 --- handwritten/pubsub/.gitattributes | 3 --- handwritten/pubsub/synth.metadata | 6 +++--- handwritten/pubsub/synth.py | 17 ++--------------- 3 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 handwritten/pubsub/.gitattributes diff --git a/handwritten/pubsub/.gitattributes b/handwritten/pubsub/.gitattributes deleted file mode 100644 index 2e63216ae9c..00000000000 --- a/handwritten/pubsub/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -*.ts text eol=lf -*.js test eol=lf -protos/* linguist-generated diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 1e34e828551..567ac1b9542 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -29,9 +29,9 @@ "source": "googleapis", "apiName": "pubsub", "apiVersion": "v1", - "language": "typescript", - "generator": "gapic-generator-typescript" + "language": "nodejs", + "generator": "bazel" } } ] -} \ No newline at end of file +} diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py index 81d0ba28e27..ca9a5103924 100644 --- a/handwritten/pubsub/synth.py +++ b/handwritten/pubsub/synth.py @@ -7,25 +7,12 @@ logging.basicConfig(level=logging.DEBUG) -gapic = gcp.GAPICMicrogenerator() +gapic = gcp.GAPICBazel() common_templates = gcp.CommonTemplates() # tasks has two product names, and a poorly named artman yaml version = 'v1' -library = gapic.typescript_library( - 'pubsub', - version, - generator_args={ - 'grpc-service-config': f'google/pubsub/{version}/pubsub_grpc_service_config.json', - 'package-name': '@google-cloud/pubsub', - 'main-service': 'pubsub', - 'bundle-config': f'google/pubsub/{version}/pubsub_gapic.yaml', - 'template': 'typescript_gapic', - 'iam-service': 'true' - }, - proto_path=f'/google/pubsub/{version}', - extra_proto_files=['google/cloud/common_resources.proto'] -) +library = gapic.node_library('pubsub', version, proto_path=f'google/pubsub/{version}') # skip index, protos, package.json, and README.md s.copy( From ba7838743af77cf454d05a74bb016dc816a193d8 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 6 Jul 2020 11:36:42 -0700 Subject: [PATCH 0645/1115] chore: update CODEOWNERS (#1043) --- handwritten/pubsub/.github/CODEOWNERS | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 handwritten/pubsub/.github/CODEOWNERS diff --git a/handwritten/pubsub/.github/CODEOWNERS b/handwritten/pubsub/.github/CODEOWNERS new file mode 100644 index 00000000000..ea801edc730 --- /dev/null +++ b/handwritten/pubsub/.github/CODEOWNERS @@ -0,0 +1,9 @@ +# Code owners file. +# This file controls who is tagged for review for any given pull request. +# +# For syntax help see: +# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax + + +# The yoshi-nodejs team is the default owner for nodejs repositories. +* @googleapis/yoshi-nodejs @googleapis/api-pubsub From 438aa20c37d3698ecee6b69fe495d29bf66da5d4 Mon Sep 17 00:00:00 2001 From: Lalji Kanjareeya <46327204+laljikanjareeya@users.noreply.github.com> Date: Tue, 7 Jul 2020 10:20:04 +0530 Subject: [PATCH 0646/1115] feat: Re-export ClientConfig from pubsub.ts in package index.ts (#1038) Fixes #972 --- handwritten/pubsub/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 6b95a919879..5ff8378338a 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -104,6 +104,7 @@ export { ExistsCallback, ExistsResponse, PubSub, + ClientConfig, } from './pubsub'; export { CreateSnapshotCallback, From f7179d38e1ea36306510ee3c8f75dd2119bc7c8c Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 9 Jul 2020 16:41:45 -0700 Subject: [PATCH 0647/1115] chore: add .gitattributes, run synth (#1047) --- handwritten/pubsub/.gitattributes | 3 +++ handwritten/pubsub/synth.metadata | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 handwritten/pubsub/.gitattributes diff --git a/handwritten/pubsub/.gitattributes b/handwritten/pubsub/.gitattributes new file mode 100644 index 00000000000..2e63216ae9c --- /dev/null +++ b/handwritten/pubsub/.gitattributes @@ -0,0 +1,3 @@ +*.ts text eol=lf +*.js test eol=lf +protos/* linguist-generated diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 567ac1b9542..61e4d77ac09 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -3,23 +3,23 @@ { "git": { "name": ".", - "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "a7dff65c1a4115e75251b775f679e6beb092928e" + "remote": "git@github.com:googleapis/nodejs-pubsub.git", + "sha": "c2ac083fdb5f3b71dcb3be482b8ee5c9d527342d" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "14f0c2cc9392234707247ab2b0782c118cb179aa", - "internalRef": "317914250" + "sha": "6c35ede4fe3055d3c8491718c78ce46b7126645c", + "internalRef": "320175744" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "dc9caca650c77b7039e2bbc3339ffb34ae78e5b7" + "sha": "d53e4b70cf091cba04362c2fac3cda0546121641" } } ], @@ -34,4 +34,4 @@ } } ] -} +} \ No newline at end of file From 91982a86855b620cb7cad05d05491207c747a332 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 10 Jul 2020 01:14:20 +0000 Subject: [PATCH 0648/1115] chore: release 2.2.0 (#1023) :robot: I have created a release \*beep\* \*boop\* --- ## [2.2.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.1.0...v2.2.0) (2020-07-09) ### Features * add flow control settings for StreamingPullRequest to pubsub.proto ([#1035](https://www.github.com/googleapis/nodejs-pubsub/issues/1035)) ([a7dff65](https://www.github.com/googleapis/nodejs-pubsub/commit/a7dff65c1a4115e75251b775f679e6beb092928e)) * move ts target to es2018 from es2016 ([#1022](https://www.github.com/googleapis/nodejs-pubsub/issues/1022)) ([016568d](https://www.github.com/googleapis/nodejs-pubsub/commit/016568df466c2a543762ab4f194b785a426ad880)) * Re-export ClientConfig from pubsub.ts in package index.ts ([#1038](https://www.github.com/googleapis/nodejs-pubsub/issues/1038)) ([c2ac083](https://www.github.com/googleapis/nodejs-pubsub/commit/c2ac083fdb5f3b71dcb3be482b8ee5c9d527342d)), closes [#972](https://www.github.com/googleapis/nodejs-pubsub/issues/972) ### Bug Fixes * handle fallback option properly ([#1028](https://www.github.com/googleapis/nodejs-pubsub/issues/1028)) ([5dc1827](https://www.github.com/googleapis/nodejs-pubsub/commit/5dc18270220dbf39f5a871716b4dd9d002d0c536)) * update node issue template ([#1033](https://www.github.com/googleapis/nodejs-pubsub/issues/1033)) ([52ba0ae](https://www.github.com/googleapis/nodejs-pubsub/commit/52ba0ae0218c0859a03d8ad9e4f27130ceb4cc61)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- handwritten/pubsub/CHANGELOG.md | 15 +++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index aba8257f73d..6305c5ec159 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,21 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.2.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.1.0...v2.2.0) (2020-07-09) + + +### Features + +* add flow control settings for StreamingPullRequest to pubsub.proto ([#1035](https://www.github.com/googleapis/nodejs-pubsub/issues/1035)) ([a7dff65](https://www.github.com/googleapis/nodejs-pubsub/commit/a7dff65c1a4115e75251b775f679e6beb092928e)) +* move ts target to es2018 from es2016 ([#1022](https://www.github.com/googleapis/nodejs-pubsub/issues/1022)) ([016568d](https://www.github.com/googleapis/nodejs-pubsub/commit/016568df466c2a543762ab4f194b785a426ad880)) +* Re-export ClientConfig from pubsub.ts in package index.ts ([#1038](https://www.github.com/googleapis/nodejs-pubsub/issues/1038)) ([c2ac083](https://www.github.com/googleapis/nodejs-pubsub/commit/c2ac083fdb5f3b71dcb3be482b8ee5c9d527342d)), closes [#972](https://www.github.com/googleapis/nodejs-pubsub/issues/972) + + +### Bug Fixes + +* handle fallback option properly ([#1028](https://www.github.com/googleapis/nodejs-pubsub/issues/1028)) ([5dc1827](https://www.github.com/googleapis/nodejs-pubsub/commit/5dc18270220dbf39f5a871716b4dd9d002d0c536)) +* update node issue template ([#1033](https://www.github.com/googleapis/nodejs-pubsub/issues/1033)) ([52ba0ae](https://www.github.com/googleapis/nodejs-pubsub/commit/52ba0ae0218c0859a03d8ad9e4f27130ceb4cc61)) + ## [2.1.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.0.0...v2.1.0) (2020-06-02) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7417e7ceee6..e8f9b874e50 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.1.0", + "version": "2.2.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From c2f274bcca6f77f90e8acdfe634cc4c6c991fa92 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 10 Jul 2020 18:51:36 +0200 Subject: [PATCH 0649/1115] chore(deps): update dependency ts-loader to v8 (#1048) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [ts-loader](https://togithub.com/TypeStrong/ts-loader) | devDependencies | major | [`^7.0.0` -> `^8.0.0`](https://renovatebot.com/diffs/npm/ts-loader/7.0.5/8.0.0) | --- ### Release Notes
TypeStrong/ts-loader ### [`v8.0.0`](https://togithub.com/TypeStrong/ts-loader/blob/master/CHANGELOG.md#v800) [Compare Source](https://togithub.com/TypeStrong/ts-loader/compare/v7.0.5...v8.0.0) - [Support for symlinks in project references](https://togithub.com/TypeStrong/ts-loader/pull/1136) - thanks [@​sheetalkamat](https://togithub.com/sheetalkamat)! - `ts-loader` now supports TypeScript 3.6 and greater **BREAKING CHANGE**
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e8f9b874e50..fb902062a4d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -90,7 +90,7 @@ "proxyquire": "^2.0.0", "sinon": "^9.0.0", "tmp": "^0.2.0", - "ts-loader": "^7.0.0", + "ts-loader": "^8.0.0", "typescript": "3.6.4", "uuid": "^8.0.0", "webpack": "^4.42.0", From 549a7662bc3bc09bd7878b484a6dfbafb4b935fa Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 10 Jul 2020 15:19:58 -0700 Subject: [PATCH 0650/1115] fix: typeo in nodejs .gitattribute (#1049) replace `test` to `text` Source-Author: Summer Ji Source-Date: Wed Jul 8 14:02:57 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: 799d8e6522c1ef7cb55a70d9ea0b15e045c3d00b Source-Link: https://github.com/googleapis/synthtool/commit/799d8e6522c1ef7cb55a70d9ea0b15e045c3d00b Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> --- handwritten/pubsub/.gitattributes | 2 +- handwritten/pubsub/synth.metadata | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.gitattributes b/handwritten/pubsub/.gitattributes index 2e63216ae9c..d4f4169b28b 100644 --- a/handwritten/pubsub/.gitattributes +++ b/handwritten/pubsub/.gitattributes @@ -1,3 +1,3 @@ *.ts text eol=lf -*.js test eol=lf +*.js text eol=lf protos/* linguist-generated diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 61e4d77ac09..0776311e2fd 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -3,8 +3,8 @@ { "git": { "name": ".", - "remote": "git@github.com:googleapis/nodejs-pubsub.git", - "sha": "c2ac083fdb5f3b71dcb3be482b8ee5c9d527342d" + "remote": "https://github.com/googleapis/nodejs-pubsub.git", + "sha": "48c18aed8b0d2944796224ffd0d9aeb9fa9fbb71" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "d53e4b70cf091cba04362c2fac3cda0546121641" + "sha": "799d8e6522c1ef7cb55a70d9ea0b15e045c3d00b" } } ], From e64469935ba8c561c131a351a66b73a1f3bb484e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sun, 12 Jul 2020 18:48:18 +0200 Subject: [PATCH 0651/1115] chore(deps): update dependency @types/mocha to v8 (#1051) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@types/mocha](https://togithub.com/DefinitelyTyped/DefinitelyTyped) | devDependencies | major | [`^7.0.0` -> `^8.0.0`](https://renovatebot.com/diffs/npm/@types%2fmocha/7.0.2/8.0.0) | --- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index fb902062a4d..2ca7a37cc42 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -67,7 +67,7 @@ "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", - "@types/mocha": "^7.0.0", + "@types/mocha": "^8.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", "@types/node": "^12.12.30", From 59cf0c5a5d0ab4cc96312e16b485ba77288c6cb3 Mon Sep 17 00:00:00 2001 From: Kamal Aboul-Hosn Date: Mon, 13 Jul 2020 07:12:27 -0400 Subject: [PATCH 0652/1115] feat: Add support for server-side flow control (#1041) * chore: Remove notes about ordering keys being experimental. * feat: Add support for server-side flow control * Revert "chore: Remove notes about ordering keys being experimental." This reverts commit d02f328896628067ef071031ea3c56ca6b3c9da6. --- handwritten/pubsub/src/message-stream.ts | 2 ++ handwritten/pubsub/src/subscriber.ts | 28 +++++++++++++++-------- handwritten/pubsub/test/message-stream.ts | 4 ++++ handwritten/pubsub/test/subscriber.ts | 15 +++++++++++- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 5d019bc4d5a..abbefa51ad0 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -226,6 +226,8 @@ export class MessageStream extends PassThrough { const request: StreamingPullRequest = { subscription: this._subscriber.name, streamAckDeadlineSeconds: this._subscriber.ackDeadline, + maxOutstandingMessages: this._subscriber.maxMessages, + maxOutstandingBytes: this._subscriber.maxBytes, }; delete this._fillHandle; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 5efdecadede..eee532dc6ff 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -224,6 +224,8 @@ export interface SubscriberOptions { */ export class Subscriber extends EventEmitter { ackDeadline: number; + maxMessages: number; + maxBytes: number; isOpen: boolean; private _acks!: AckQueue; private _histogram: Histogram; @@ -239,6 +241,8 @@ export class Subscriber extends EventEmitter { super(); this.ackDeadline = 10; + this.maxMessages = defaultOptions.subscription.maxOutstandingMessages; + this.maxBytes = defaultOptions.subscription.maxOutstandingBytes; this.isOpen = false; this._isUserSetDeadline = false; this._histogram = new Histogram({min: 10, max: 600}); @@ -395,15 +399,18 @@ export class Subscriber extends EventEmitter { this._isUserSetDeadline = true; } - // In the event that the user has specified the maxMessages option, we want - // to make sure that the maxStreams option isn't higher. - // It doesn't really make sense to open 5 streams if the user only wants - // 1 message at a time. if (options.flowControl) { - const { - maxMessages = defaultOptions.subscription.maxOutstandingMessages, - } = options.flowControl; - + this.maxMessages = + options.flowControl!.maxMessages || + defaultOptions.subscription.maxOutstandingMessages; + this.maxBytes = + options.flowControl!.maxBytes || + defaultOptions.subscription.maxOutstandingBytes; + + // In the event that the user has specified the maxMessages option, we + // want to make sure that the maxStreams option isn't higher. + // It doesn't really make sense to open 5 streams if the user only wants + // 1 message at a time. if (!options.streamingOptions) { options.streamingOptions = {} as MessageStreamOptions; } @@ -411,7 +418,10 @@ export class Subscriber extends EventEmitter { const { maxStreams = defaultOptions.subscription.maxStreams, } = options.streamingOptions; - options.streamingOptions.maxStreams = Math.min(maxStreams, maxMessages); + options.streamingOptions.maxStreams = Math.min( + maxStreams, + this.maxMessages + ); } } /** diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 511f2f8faca..bd10b3c8954 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -140,10 +140,14 @@ class FakeGrpcClient { class FakeSubscriber { name: string; ackDeadline: number; + maxMessages: number; + maxBytes: number; client: FakeGaxClient; constructor(client: FakeGaxClient) { this.name = uuid.v4(); this.ackDeadline = Math.floor(Math.random() * 600); + this.maxMessages = 20; + this.maxBytes = 4000; this.client = client; } async getClient(): Promise { diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index b4c6901f1c4..7b69a8d2a4a 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -191,6 +191,14 @@ describe('Subscriber', () => { assert.strictEqual(subscriber.ackDeadline, 10); }); + it('should default maxMessages to 1000', () => { + assert.strictEqual(subscriber.maxMessages, 1000); + }); + + it('should default maxBytes to 100MB', () => { + assert.strictEqual(subscriber.maxBytes, 100 * 1024 * 1024); + }); + it('should set isOpen to false', () => { const s = new Subscriber(subscription); assert.strictEqual(s.isOpen, false); @@ -271,11 +279,16 @@ describe('Subscriber', () => { it('should not update the deadline if user specified', () => { const histogram: FakeHistogram = stubs.get('histogram'); const ackDeadline = 543; + const maxMessages = 20; + const maxBytes = 20000; sandbox.stub(histogram, 'add').throws(); sandbox.stub(histogram, 'percentile').throws(); - subscriber.setOptions({ackDeadline}); + subscriber.setOptions({ + ackDeadline, + flowControl: {maxMessages: maxMessages, maxBytes: maxBytes}, + }); subscriber.ack(message); assert.strictEqual(subscriber.ackDeadline, ackDeadline); From 1fe7140664178d9cdbd75ed278d0129b868e2bc0 Mon Sep 17 00:00:00 2001 From: "F. Hinkelmann" Date: Tue, 14 Jul 2020 14:36:04 -0400 Subject: [PATCH 0653/1115] chore: delete Node 8 presubmit tests (#1053) --- .../pubsub/.kokoro/presubmit/node8/common.cfg | 24 ------------------- .../pubsub/.kokoro/presubmit/node8/test.cfg | 0 2 files changed, 24 deletions(-) delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg deleted file mode 100644 index 623fa5f5190..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 From d8b82a7036addfff1dc2aab55740fb36e175fb59 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 17 Jul 2020 16:01:03 -0700 Subject: [PATCH 0654/1115] build: add Node 8 tests (#1058) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/5b03461e-47c0-40e8-a8ad-c465ee146cc5/targets - [ ] To automatically regenerate this PR, check this box. --- .../pubsub/.kokoro/presubmit/node8/common.cfg | 24 +++ .../pubsub/.kokoro/presubmit/node8/test.cfg | 0 handwritten/pubsub/protos/protos.js | 144 ++++++++++++++---- handwritten/pubsub/synth.metadata | 2 +- 4 files changed, 139 insertions(+), 31 deletions(-) create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/common.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg new file mode 100644 index 00000000000..623fa5f5190 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 27f09ddbd1f..eafb2a8f660 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -715,7 +715,7 @@ Topic.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -723,12 +723,26 @@ message.name = reader.string(); break; case 2: - reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.labels[key] = value; break; case 3: message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); @@ -1007,7 +1021,7 @@ PubsubMessage.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -1015,12 +1029,26 @@ message.data = reader.bytes(); break; case 2: - reader.skip().pos++; if (message.attributes === $util.emptyObject) message.attributes = {}; - key = reader.string(); - reader.pos++; - message.attributes[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.attributes[key] = value; break; case 3: message.messageId = reader.string(); @@ -4724,7 +4752,7 @@ Subscription.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -4747,12 +4775,26 @@ message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); break; case 9: - reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.labels[key] = value; break; case 10: message.enableMessageOrdering = reader.bool(); @@ -5749,7 +5791,7 @@ PushConfig.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -5757,12 +5799,26 @@ message.pushEndpoint = reader.string(); break; case 2: - reader.skip().pos++; if (message.attributes === $util.emptyObject) message.attributes = {}; - key = reader.string(); - reader.pos++; - message.attributes[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.attributes[key] = value; break; case 3: message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); @@ -9283,7 +9339,7 @@ CreateSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -9294,12 +9350,26 @@ message.subscription = reader.string(); break; case 3: - reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.labels[key] = value; break; default: reader.skipType(tag & 7); @@ -9768,7 +9838,7 @@ Snapshot.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -9782,12 +9852,26 @@ message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); break; case 4: - reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.labels[key] = value; break; default: reader.skipType(tag & 7); diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 0776311e2fd..56fe0b68a35 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "48c18aed8b0d2944796224ffd0d9aeb9fa9fbb71" + "sha": "628e4c25ec0ba001751bfa8b0a1d93f7a97096a3" } }, { From c3d26b6ef4671b4bedb42898e233b3d07065ed5f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 17 Jul 2020 16:32:12 -0700 Subject: [PATCH 0655/1115] build: missing closing paren in publish script, delete template for Node 8, add config files for cloud-rad (#1059) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/5b03461e-47c0-40e8-a8ad-c465ee146cc5/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/21f1470ecd01424dc91c70f1a7c798e4e87d1eec Source-Link: https://github.com/googleapis/synthtool/commit/388e10f5ae302d3e8de1fac99f3a95d1ab8f824a Source-Link: https://github.com/googleapis/synthtool/commit/d82deccf657a66e31bd5da9efdb96c6fa322fc7e --- handwritten/pubsub/.kokoro/publish.sh | 2 +- .../pubsub/.kokoro/release/docs-devsite.cfg | 26 ++ .../pubsub/.kokoro/release/docs-devsite.sh | 62 +++ handwritten/pubsub/api-extractor.json | 369 ++++++++++++++++++ handwritten/pubsub/synth.metadata | 2 +- 5 files changed, 459 insertions(+), 2 deletions(-) create mode 100644 handwritten/pubsub/.kokoro/release/docs-devsite.cfg create mode 100755 handwritten/pubsub/.kokoro/release/docs-devsite.sh create mode 100644 handwritten/pubsub/api-extractor.json diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh index 24957d71def..f056d861729 100755 --- a/handwritten/pubsub/.kokoro/publish.sh +++ b/handwritten/pubsub/.kokoro/publish.sh @@ -24,7 +24,7 @@ python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source / cd $(dirname $0)/.. -NPM_TOKEN=$(cat $KOKORO_GFILE_DIR/secret_manager/npm_publish_token +NPM_TOKEN=$(cat $KOKORO_GFILE_DIR/secret_manager/npm_publish_token) echo "//wombat-dressing-room.appspot.com/:_authToken=${NPM_TOKEN}" > ~/.npmrc npm install diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg new file mode 100644 index 00000000000..77a501f8f20 --- /dev/null +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg @@ -0,0 +1,26 @@ +# service account used to publish up-to-date docs. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "docuploader_service_account" + } + } +} + +# doc publications use a Python image. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-scheduler/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-scheduler/.kokoro/release/docs-devsite.sh" +} diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh new file mode 100755 index 00000000000..b679c48c044 --- /dev/null +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -0,0 +1,62 @@ +#!/bin/bash + +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eo pipefail + +# build jsdocs (Python is installed on the Node 10 docker image). +if [[ -z "$CREDENTIALS" ]]; then + # if CREDENTIALS are explicitly set, assume we're testing locally + # and don't set NPM_CONFIG_PREFIX. + export NPM_CONFIG_PREFIX=/home/node/.npm-global + export PATH="$PATH:/home/node/.npm-global/bin" + cd $(dirname $0)/../.. +fi + +mkdir ./etc + +npm install +npm run api-extractor +npm run api-documenter + +npm i json@9.0.6 -g +NAME=$(cat .repo-metadata.json | json name) + +mkdir ./_devsite +cp ./yaml/$NAME/* ./_devsite +cp ./yaml/toc.yml ./_devsite/_toc.yaml + +# create docs.metadata, based on package.json and .repo-metadata.json. +pip install -U pip +python3 -m pip install --user gcp-docuploader +python3 -m docuploader create-metadata \ + --name=$NAME \ + --version=$(cat package.json | json version) \ + --language=$(cat .repo-metadata.json | json language) \ + --distribution-name=$(cat .repo-metadata.json | json distribution_name) \ + --product-page=$(cat .repo-metadata.json | json product_documentation) \ + --github-repository=$(cat .repo-metadata.json | json repo) \ + --issue-tracker=$(cat .repo-metadata.json | json issue_tracker) +cp docs.metadata ./_devsite/docs.metadata + +# deploy the docs. +if [[ -z "$CREDENTIALS" ]]; then + CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account +fi +if [[ -z "$BUCKET" ]]; then + BUCKET=docs-staging-v2-staging +fi + +python3 -m docuploader upload ./_devsite --destination-prefix docfx --credentials $CREDENTIALS --staging-bucket $BUCKET diff --git a/handwritten/pubsub/api-extractor.json b/handwritten/pubsub/api-extractor.json new file mode 100644 index 00000000000..de228294b23 --- /dev/null +++ b/handwritten/pubsub/api-extractor.json @@ -0,0 +1,369 @@ +/** + * Config file for API Extractor. For more info, please visit: https://api-extractor.com + */ +{ + "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", + + /** + * Optionally specifies another JSON config file that this file extends from. This provides a way for + * standard settings to be shared across multiple projects. + * + * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains + * the "extends" field. Otherwise, the first path segment is interpreted as an NPM package name, and will be + * resolved using NodeJS require(). + * + * SUPPORTED TOKENS: none + * DEFAULT VALUE: "" + */ + // "extends": "./shared/api-extractor-base.json" + // "extends": "my-package/include/api-extractor-base.json" + + /** + * Determines the "" token that can be used with other config file settings. The project folder + * typically contains the tsconfig.json and package.json config files, but the path is user-defined. + * + * The path is resolved relative to the folder of the config file that contains the setting. + * + * The default value for "projectFolder" is the token "", which means the folder is determined by traversing + * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder + * that contains a tsconfig.json file. If a tsconfig.json file cannot be found in this way, then an error + * will be reported. + * + * SUPPORTED TOKENS: + * DEFAULT VALUE: "" + */ + // "projectFolder": "..", + + /** + * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis. API Extractor + * analyzes the symbols exported by this module. + * + * The file extension must be ".d.ts" and not ".ts". + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + */ + "mainEntryPointFilePath": "/protos/protos.d.ts", + + /** + * A list of NPM package names whose exports should be treated as part of this package. + * + * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1", + * and another NPM package "library2" is embedded in this bundle. Some types from library2 may become part + * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly + * imports library2. To avoid this, we can specify: + * + * "bundledPackages": [ "library2" ], + * + * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been + * local files for library1. + */ + "bundledPackages": [ ], + + /** + * Determines how the TypeScript compiler engine will be invoked by API Extractor. + */ + "compiler": { + /** + * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * Note: This setting will be ignored if "overrideTsconfig" is used. + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/tsconfig.json" + */ + // "tsconfigFilePath": "/tsconfig.json", + + /** + * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk. + * The object must conform to the TypeScript tsconfig schema: + * + * http://json.schemastore.org/tsconfig + * + * If omitted, then the tsconfig.json file will be read from the "projectFolder". + * + * DEFAULT VALUE: no overrideTsconfig section + */ + // "overrideTsconfig": { + // . . . + // } + + /** + * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended + * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when + * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses + * for its analysis. Where possible, the underlying issue should be fixed rather than relying on skipLibCheck. + * + * DEFAULT VALUE: false + */ + // "skipLibCheck": true, + }, + + /** + * Configures how the API report file (*.api.md) will be generated. + */ + "apiReport": { + /** + * (REQUIRED) Whether to generate an API report. + */ + "enabled": true, + + /** + * The filename for the API report files. It will be combined with "reportFolder" or "reportTempFolder" to produce + * a full file path. + * + * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/". + * + * SUPPORTED TOKENS: , + * DEFAULT VALUE: ".api.md" + */ + // "reportFileName": ".api.md", + + /** + * Specifies the folder where the API report file is written. The file name portion is determined by + * the "reportFileName" setting. + * + * The API report file is normally tracked by Git. Changes to it can be used to trigger a branch policy, + * e.g. for an API review. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/etc/" + */ + // "reportFolder": "/etc/", + + /** + * Specifies the folder where the temporary report file is written. The file name portion is determined by + * the "reportFileName" setting. + * + * After the temporary file is written to disk, it is compared with the file in the "reportFolder". + * If they are different, a production build will fail. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/temp/" + */ + // "reportTempFolder": "/temp/" + }, + + /** + * Configures how the doc model file (*.api.json) will be generated. + */ + "docModel": { + /** + * (REQUIRED) Whether to generate a doc model file. + */ + "enabled": true, + + /** + * The output path for the doc model file. The file extension should be ".api.json". + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/temp/.api.json" + */ + // "apiJsonFilePath": "/temp/.api.json" + }, + + /** + * Configures how the .d.ts rollup file will be generated. + */ + "dtsRollup": { + /** + * (REQUIRED) Whether to generate the .d.ts rollup file. + */ + "enabled": true, + + /** + * Specifies the output path for a .d.ts rollup file to be generated without any trimming. + * This file will include all declarations that are exported by the main entry point. + * + * If the path is an empty string, then this file will not be written. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "/dist/.d.ts" + */ + // "untrimmedFilePath": "/dist/.d.ts", + + /** + * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release. + * This file will include only declarations that are marked as "@public" or "@beta". + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "" + */ + // "betaTrimmedFilePath": "/dist/-beta.d.ts", + + + /** + * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release. + * This file will include only declarations that are marked as "@public". + * + * If the path is an empty string, then this file will not be written. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "" + */ + // "publicTrimmedFilePath": "/dist/-public.d.ts", + + /** + * When a declaration is trimmed, by default it will be replaced by a code comment such as + * "Excluded from this release type: exampleMember". Set "omitTrimmingComments" to true to remove the + * declaration completely. + * + * DEFAULT VALUE: false + */ + // "omitTrimmingComments": true + }, + + /** + * Configures how the tsdoc-metadata.json file will be generated. + */ + "tsdocMetadata": { + /** + * Whether to generate the tsdoc-metadata.json file. + * + * DEFAULT VALUE: true + */ + // "enabled": true, + + /** + * Specifies where the TSDoc metadata file should be written. + * + * The path is resolved relative to the folder of the config file that contains the setting; to change this, + * prepend a folder token such as "". + * + * The default value is "", which causes the path to be automatically inferred from the "tsdocMetadata", + * "typings" or "main" fields of the project's package.json. If none of these fields are set, the lookup + * falls back to "tsdoc-metadata.json" in the package folder. + * + * SUPPORTED TOKENS: , , + * DEFAULT VALUE: "" + */ + // "tsdocMetadataFilePath": "/dist/tsdoc-metadata.json" + }, + + /** + * Specifies what type of newlines API Extractor should use when writing output files. By default, the output files + * will be written with Windows-style newlines. To use POSIX-style newlines, specify "lf" instead. + * To use the OS's default newline kind, specify "os". + * + * DEFAULT VALUE: "crlf" + */ + // "newlineKind": "crlf", + + /** + * Configures how API Extractor reports error and warning messages produced during analysis. + * + * There are three sources of messages: compiler messages, API Extractor messages, and TSDoc messages. + */ + "messages": { + /** + * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing + * the input .d.ts files. + * + * TypeScript message identifiers start with "TS" followed by an integer. For example: "TS2551" + * + * DEFAULT VALUE: A single "default" entry with logLevel=warning. + */ + "compilerMessageReporting": { + /** + * Configures the default routing for messages that don't match an explicit rule in this table. + */ + "default": { + /** + * Specifies whether the message should be written to the the tool's output log. Note that + * the "addToApiReportFile" property may supersede this option. + * + * Possible values: "error", "warning", "none" + * + * Errors cause the build to fail and return a nonzero exit code. Warnings cause a production build fail + * and return a nonzero exit code. For a non-production build (e.g. when "api-extractor run" includes + * the "--local" option), the warning is displayed but the build will not fail. + * + * DEFAULT VALUE: "warning" + */ + "logLevel": "warning", + + /** + * When addToApiReportFile is true: If API Extractor is configured to write an API report file (.api.md), + * then the message will be written inside that file; otherwise, the message is instead logged according to + * the "logLevel" option. + * + * DEFAULT VALUE: false + */ + // "addToApiReportFile": false + }, + + // "TS2551": { + // "logLevel": "warning", + // "addToApiReportFile": true + // }, + // + // . . . + }, + + /** + * Configures handling of messages reported by API Extractor during its analysis. + * + * API Extractor message identifiers start with "ae-". For example: "ae-extra-release-tag" + * + * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings + */ + "extractorMessageReporting": { + "default": { + "logLevel": "warning", + // "addToApiReportFile": false + }, + + // "ae-extra-release-tag": { + // "logLevel": "warning", + // "addToApiReportFile": true + // }, + // + // . . . + }, + + /** + * Configures handling of messages reported by the TSDoc parser when analyzing code comments. + * + * TSDoc message identifiers start with "tsdoc-". For example: "tsdoc-link-tag-unescaped-text" + * + * DEFAULT VALUE: A single "default" entry with logLevel=warning. + */ + "tsdocMessageReporting": { + "default": { + "logLevel": "warning", + // "addToApiReportFile": false + } + + // "tsdoc-link-tag-unescaped-text": { + // "logLevel": "warning", + // "addToApiReportFile": true + // }, + // + // . . . + } + } + +} diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 56fe0b68a35..a720c5901bf 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "799d8e6522c1ef7cb55a70d9ea0b15e045c3d00b" + "sha": "21f1470ecd01424dc91c70f1a7c798e4e87d1eec" } } ], From f6aff62c5fbf80f640b952f57aac56e72ba4a79f Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 20 Jul 2020 16:21:45 -0700 Subject: [PATCH 0656/1115] feat: support for detaching subscriptions (#1032) * feat: add porcelain support for detaching subscriptions * docs: update comment for createSubscription test * samples: add detach subscription sample * docs: update doc links for subscription detach * feat: add detached() method as an easy shortcut for grabbing the 'detached' metadata from a subscription * docs: update the new detach subscription sample to use the better detached() call (and a few CR comments) * tests: add a sample system-test for testing the detach subscriptions sample * fix: properly handle alternate API endpoints (not all of which are emulators) * feat: move detach methods into the main PubSub object * tests: don't try to system-test the detach sample yet * feat: remove the detach call from Topic since it doesn't need any topic-related info * fix: allow multiple trailing slashes in API endpoint again * fix: revert alterate API endpoint changes, to put into another PR * docs: use arrow functions for examples * tests: re-enable the detach subscription test * tests: add missing unit tests for the newly added library bits * tests: add a system-test for the subscription detach methods --- handwritten/pubsub/src/pubsub.ts | 72 ++++++++++++++++++++ handwritten/pubsub/src/subscription.ts | 48 +++++++++++++ handwritten/pubsub/system-test/pubsub.ts | 18 +++++ handwritten/pubsub/test/pubsub.ts | 87 ++++++++++++++++++++++++ 4 files changed, 225 insertions(+) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index fbfb9344fa5..056eaa68dfb 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -34,6 +34,8 @@ import { CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, + DetachSubscriptionCallback, + DetachSubscriptionResponse, } from './subscription'; import { Topic, @@ -116,6 +118,9 @@ export type EmptyResponse = [google.protobuf.IEmpty]; export type ExistsCallback = RequestCallback; export type ExistsResponse = [boolean]; +export type DetachedCallback = RequestCallback; +export type DetachedResponse = [boolean]; + export interface GetClientConfig { client: 'PublisherClient' | 'SubscriberClient'; } @@ -541,6 +546,73 @@ export class PubSub { } ); } + + detachSubscription( + name: string, + gaxOpts?: CallOptions + ): Promise; + detachSubscription(name: string, callback: DetachSubscriptionCallback): void; + detachSubscription( + name: string, + gaxOpts: CallOptions, + callback: DetachSubscriptionCallback + ): void; + /** + * Detach a subscription with the given name. + * + * @see [Admin: Pub/Sub administration API Documentation]{@link https://cloud.google.com/pubsub/docs/admin} + * + * @param {string} name Name of the subscription. + * @param {object} [gaxOpts] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @param {DetachSubscriptionCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * pubsub.detachSubscription('my-sub', (err, topic, apiResponse) => { + * if (!err) { + * // The topic was created successfully. + * } + * }); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * pubsub.detachSubscription('my-sub').then(data => { + * const apiResponse = data[0]; + * }); + */ + detachSubscription( + name: string, + optsOrCallback?: CallOptions | DetachSubscriptionCallback, + callback?: DetachSubscriptionCallback + ): Promise | void { + if (typeof name !== 'string') { + throw new Error('A subscription name is required.'); + } + + const sub = this.subscription(name); + const reqOpts = { + subscription: sub.name, + }; + + const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; + callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; + + this.request( + { + client: 'PublisherClient', + method: 'detachSubscription', + reqOpts, + gaxOpts: gaxOpts as CallOptions, + }, + callback! + ); + } + /** * Determine the appropriate endpoint to use for API requests, first trying * the local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 1ca28b73fe5..589c602bf30 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -25,6 +25,8 @@ import {google} from '../protos/protos'; import {IAM} from './iam'; import {FlowControlOptions} from './lease-manager'; import { + DetachedCallback, + DetachedResponse, EmptyCallback, EmptyResponse, ExistsCallback, @@ -83,6 +85,9 @@ export type GetSubscriptionMetadataResponse = MetadataResponse; export type SetSubscriptionMetadataCallback = MetadataCallback; export type SetSubscriptionMetadataResponse = MetadataResponse; +export type DetachSubscriptionCallback = EmptyCallback; +export type DetachSubscriptionResponse = EmptyResponse; + /** * @typedef {object} ExpirationPolicy * A policy that specifies the conditions for this subscription's expiration. A @@ -528,6 +533,49 @@ export class Subscription extends EventEmitter { ); } + detached(): Promise; + detached(callback: DetachedCallback): void; + /** + * @typedef {array} SubscriptionDetachedResponse + * @property {boolean} 0 Whether the subscription is detached. + */ + /** + * @callback SubscriptionDetachedCallback + * @param {?Error} err Request error, if any. + * @param {boolean} exists Whether the subscription is detached. + */ + /** + * Check if a subscription is detached. + * + * @param {SubscriptionDetachedCallback} [callback] Callback function. + * @returns {Promise} + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * const subscription = topic.subscription('my-subscription'); + * + * subscription.detached((err, exists) => {}); + * + * //- + * // If the callback is omitted, we'll return a Promise. + * //- + * subscription.detached().then((data) => { + * const detached = data[0]; + * }); + */ + detached(callback?: DetachedCallback): void | Promise { + this.getMetadata((err, metadata) => { + if (err) { + callback!(err); + } else { + callback!(null, metadata!.detached); + } + }); + } + exists(): Promise; exists(callback: ExistsCallback): void; /** diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index d5a5fe941c5..83ec943ee1c 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -68,6 +68,13 @@ describe('pubsub', () => { return generateName('subscription'); } + // This is a temporary situation - we'll eventually fall back to the + // regular generateSubName() call, but this has to be used for the + // pre-release allow list. + function generateSubForDetach() { + return `testdetachsubsxyz-${generateSubName()}`; + } + function generateTopicName() { return generateName('topic'); } @@ -352,10 +359,12 @@ describe('pubsub', () => { const topic = pubsub.topic(TOPIC_NAME); const SUB_NAMES = [generateSubName(), generateSubName()]; + const SUB_DETACH_NAME = generateSubForDetach(); const SUBSCRIPTIONS = [ topic.subscription(SUB_NAMES[0], {ackDeadline: 30}), topic.subscription(SUB_NAMES[1], {ackDeadline: 60}), + topic.subscription(SUB_DETACH_NAME, {ackDeadline: 30}), ]; before(async () => { @@ -655,6 +664,15 @@ describe('pubsub', () => { ); }); + it('should detach subscriptions', async () => { + const subscription = topic.subscription(SUB_DETACH_NAME); + const [before] = await subscription.detached(); + assert.strictEqual(before, false); + await pubsub.detachSubscription(SUB_DETACH_NAME); + const [after] = await subscription.detached(); + assert.strictEqual(after, true); + }); + // can be ran manually to test options/memory usage/etc. // tslint:disable-next-line ban it.skip('should handle a large volume of messages', async function () { diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 56897ded83d..c6a245d97af 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -630,6 +630,93 @@ describe('PubSub', () => { }); }); + describe('detachSubscription', () => { + pubsub = new pubsubTypes.PubSub({}); + const SUB_NAME = 'subscription'; + const SUBSCRIPTION = { + name: 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME, + }; + const apiResponse = 'responseToCheck'; + + it('should throw if no subscription name is provided', () => { + assert.throws(() => { + pubsub.detachSubscription(undefined!); + }, /A subscription name is required./); + }); + + it('should not require configuration options', done => { + sandbox + .stub(pubsub, 'request') + .callsArgOnWith(1, undefined, undefined, apiResponse); + + pubsub.detachSubscription(SUB_NAME, (err, response) => { + assert.strictEqual(response, apiResponse); + done(); + }); + }); + + it('should allow undefined/optional configuration options', done => { + sandbox + .stub(pubsub, 'request') + .callsArgOnWith(1, undefined, undefined, apiResponse); + + pubsub.detachSubscription(SUB_NAME, undefined!, (_err, _response) => { + assert.strictEqual(_response, apiResponse); + done(); + }); + }); + + it('should detach a Subscription from a string', async () => { + sandbox.stub(pubsub, 'request').returns(); + sandbox.stub(pubsub, 'subscription').callsFake(subName => { + assert.strictEqual(subName, SUB_NAME); + return SUBSCRIPTION as subby.Subscription; + }); + + await pubsub.detachSubscription(SUB_NAME); + }); + + it('should send correct request', done => { + const options = {}; + + sandbox.stub(pubsub, 'subscription').callsFake(subName => { + assert.strictEqual(subName, SUB_NAME); + return SUBSCRIPTION as subby.Subscription; + }); + + const reqOpts = {subscription: SUBSCRIPTION.name}; + + sandbox.stub(pubsub, 'request').callsFake(config => { + assert.strictEqual(config.client, 'PublisherClient'); + assert.strictEqual(config.method, 'detachSubscription'); + assert.deepStrictEqual(config.reqOpts, reqOpts); + assert.deepStrictEqual(config.gaxOpts, options); + done(); + }); + + pubsub.detachSubscription(SUB_NAME, options, assert.ifError); + }); + + it('should pass options to the api request', done => { + const options = { + pageSize: 5, + maxResults: 10, + }; + + sandbox.stub(pubsub, 'subscription').returns({ + name: SUB_NAME, + } as subby.Subscription); + + sandbox.stub(pubsub, 'request').callsFake(config => { + assert.notStrictEqual(config.reqOpts, options); + assert.deepStrictEqual(config.gaxOpts, options); + done(); + }); + + pubsub.detachSubscription(SUB_NAME, options, assert.ifError); + }); + }); + describe('determineBaseUrl_', () => { function setHost(host: string) { process.env.PUBSUB_EMULATOR_HOST = host; From f4145ec19fd9ab57208ab295a549144ce9f3b97b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2020 10:28:48 -0700 Subject: [PATCH 0657/1115] chore: release 2.3.0 (#1052) * updated CHANGELOG.md [ci skip] * updated package.json [ci skip] * updated samples/package.json Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 13 +++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 6305c5ec159..3a340008bac 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,19 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.3.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.2.0...v2.3.0) (2020-07-20) + + +### Features + +* Add support for server-side flow control ([#1041](https://www.github.com/googleapis/nodejs-pubsub/issues/1041)) ([a53f6c7](https://www.github.com/googleapis/nodejs-pubsub/commit/a53f6c755317f2fdcb107989321a78fa05e0c455)) +* support for detaching subscriptions ([#1032](https://www.github.com/googleapis/nodejs-pubsub/issues/1032)) ([c5af3a9](https://www.github.com/googleapis/nodejs-pubsub/commit/c5af3a9988e318c3d884aed1777010faa8545ab1)) + + +### Bug Fixes + +* typeo in nodejs .gitattribute ([#1049](https://www.github.com/googleapis/nodejs-pubsub/issues/1049)) ([b4c6dc0](https://www.github.com/googleapis/nodejs-pubsub/commit/b4c6dc0264a4f62283ceb3b5e1e2ae58e06c56c1)) + ## [2.2.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.1.0...v2.2.0) (2020-07-09) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2ca7a37cc42..6be0ab4ad6b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.2.0", + "version": "2.3.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From bac273670227dd96c94d388444679312450cf785 Mon Sep 17 00:00:00 2001 From: "F. Hinkelmann" Date: Wed, 22 Jul 2020 02:08:12 -0400 Subject: [PATCH 0658/1115] chore: add dev dependencies for cloud-rad ref docs (#1064) --- handwritten/pubsub/package.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6be0ab4ad6b..586a1b4758d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -44,7 +44,9 @@ "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js", "prelint": "cd samples; npm link ../; npm install", - "precompile": "gts clean" + "precompile": "gts clean", + "api-extractor": "api-extractor run --local", + "api-documenter": "api-documenter yaml --input-folder=temp" }, "dependencies": { "@google-cloud/paginator": "^3.0.0", @@ -95,6 +97,8 @@ "uuid": "^8.0.0", "webpack": "^4.42.0", "webpack-cli": "^3.3.11", - "yargs": "^15.0.0" + "yargs": "^15.0.0", + "@microsoft/api-documenter": "^7.8.10", + "@microsoft/api-extractor": "^7.8.10" } } From ffcde8afbfef6bb5bc821d5388feed94ae3920b5 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 22 Jul 2020 17:38:13 -0700 Subject: [PATCH 0659/1115] build: rename _toc to toc (#1066) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * fix: rename _toc to toc Source-Author: F. Hinkelmann Source-Date: Tue Jul 21 10:53:20 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: 99c93fe09f8c1dca09dfc0301c8668e3a70dd796 Source-Link: https://github.com/googleapis/synthtool/commit/99c93fe09f8c1dca09dfc0301c8668e3a70dd796 Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> --- handwritten/pubsub/.kokoro/release/docs-devsite.sh | 2 +- handwritten/pubsub/README.md | 1 + handwritten/pubsub/synth.metadata | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh index b679c48c044..3b93137d4db 100755 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.sh +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -36,7 +36,7 @@ NAME=$(cat .repo-metadata.json | json name) mkdir ./_devsite cp ./yaml/$NAME/* ./_devsite -cp ./yaml/toc.yml ./_devsite/_toc.yaml +cp ./yaml/toc.yml ./_devsite/toc.yml # create docs.metadata, based on package.json and .repo-metadata.json. pip install -U pip diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index b675c16d450..a092c1b7948 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -109,6 +109,7 @@ has instructions for running the samples. | Create Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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) | | Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | | Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | +| Detach Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/detachSubscription.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/detachSubscription.js,samples/README.md) | | Get Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSubscription.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/getSubscription.js,samples/README.md) | | Get Subscription Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSubscriptionPolicy.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/getSubscriptionPolicy.js,samples/README.md) | | Get Topic Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getTopicPolicy.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/getTopicPolicy.js,samples/README.md) | diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index a720c5901bf..c111e542507 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "628e4c25ec0ba001751bfa8b0a1d93f7a97096a3" + "sha": "c5af3a9988e318c3d884aed1777010faa8545ab1" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "21f1470ecd01424dc91c70f1a7c798e4e87d1eec" + "sha": "99c93fe09f8c1dca09dfc0301c8668e3a70dd796" } } ], From 9fbfd3ee038f8c1a8f0ebafe9fadb65a3fbfbc3c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 24 Jul 2020 10:23:00 -0700 Subject: [PATCH 0660/1115] build: move gitattributes files to node templates (#1070) Source-Author: F. Hinkelmann Source-Date: Thu Jul 23 01:45:04 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: 3a00b7fea8c4c83eaff8eb207f530a2e3e8e1de3 Source-Link: https://github.com/googleapis/synthtool/commit/3a00b7fea8c4c83eaff8eb207f530a2e3e8e1de3 --- handwritten/pubsub/.gitattributes | 1 + handwritten/pubsub/synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.gitattributes b/handwritten/pubsub/.gitattributes index d4f4169b28b..33739cb74e4 100644 --- a/handwritten/pubsub/.gitattributes +++ b/handwritten/pubsub/.gitattributes @@ -1,3 +1,4 @@ *.ts text eol=lf *.js text eol=lf protos/* linguist-generated +**/api-extractor.json linguist-language=JSON-with-Comments diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index c111e542507..942bc48855b 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "c5af3a9988e318c3d884aed1777010faa8545ab1" + "sha": "dcdec71e3a496b041dc8d1d0f03eda85d5d0cf63" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "99c93fe09f8c1dca09dfc0301c8668e3a70dd796" + "sha": "3a00b7fea8c4c83eaff8eb207f530a2e3e8e1de3" } } ], From 36caff56e16ffd29ba1e9b8d1a8b89328de30e88 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 29 Jul 2020 16:36:21 -0700 Subject: [PATCH 0661/1115] chore(node): fix kokoro build path for cloud-rad (#1073) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/4bdc1826-2f69-49f1-a63b-94f99cceb5ee/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/89d431fb2975fc4e0ed24995a6e6dfc8ff4c24fa --- handwritten/pubsub/.kokoro/release/docs-devsite.cfg | 4 ++-- handwritten/pubsub/synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg index 77a501f8f20..f1f4e0a4947 100644 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg @@ -18,9 +18,9 @@ env_vars: { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-scheduler/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline.sh" env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-scheduler/.kokoro/release/docs-devsite.sh" + value: "github/nodejs-pubsub/.kokoro/release/docs-devsite.sh" } diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 942bc48855b..85de20100d1 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "dcdec71e3a496b041dc8d1d0f03eda85d5d0cf63" + "sha": "3bf1f595fdc8b1766a3a0e184dff3e2153fb55db" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "3a00b7fea8c4c83eaff8eb207f530a2e3e8e1de3" + "sha": "89d431fb2975fc4e0ed24995a6e6dfc8ff4c24fa" } } ], From 4ac0749b3938f91a6c60c94a467fc1d9e8c520dd Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 7 Aug 2020 17:31:11 -0700 Subject: [PATCH 0662/1115] feat: update to TypeScript 3.8+ to match gax/protobufjs (to allow things to compile again) (#1079) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/test/message-stream.ts | 4 ++-- handwritten/pubsub/test/pubsub.ts | 15 +++++++-------- handwritten/pubsub/test/subscription.ts | 5 ++++- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 586a1b4758d..1e18d30db4e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -93,7 +93,7 @@ "sinon": "^9.0.0", "tmp": "^0.2.0", "ts-loader": "^8.0.0", - "typescript": "3.6.4", + "typescript": "^3.8.3", "uuid": "^8.0.0", "webpack": "^4.42.0", "webpack-cli": "^3.3.11", diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index bd10b3c8954..1a9bcaecc49 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -69,7 +69,7 @@ class FakePassThrough extends PassThrough { this.options = options; } destroy(err?: Error): void { - if (super.destroy) { + if (typeof super.destroy === 'function') { return super.destroy(err); } destroy(this, err); @@ -96,7 +96,7 @@ class FakeGrpcStream extends Duplex { }); } destroy(err?: Error): void { - if (super.destroy) { + if (typeof super.destroy === 'function') { return super.destroy(err); } destroy(this, err); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index c6a245d97af..ceae807f76e 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -307,11 +307,12 @@ describe('PubSub', () => { name: 'subscription-name', }; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const subClass = Subscription as any; + beforeEach(() => { - ((Subscription as {}) as typeof subby.Subscription).formatMetadata_ = ( - metadata: subby.SubscriptionMetadata - ) => { - return Object.assign({}, metadata) as subby.SubscriptionMetadata; + subClass.formatMetadata_ = (metadata: {}) => { + return Object.assign({}, metadata); }; }); @@ -469,11 +470,9 @@ describe('PubSub', () => { a: 'a', }; - ((Subscription as {}) as typeof subby.Subscription).formatMetadata_ = ( - metadata: subby.SubscriptionMetadata - ) => { + subClass.formatMetadata_ = (metadata: {}) => { assert.deepStrictEqual(metadata, fakeMetadata); - return (formatted as {}) as subby.SubscriptionMetadata; + return formatted; }; pubsub.request = (config: pubsubTypes.RequestConfig) => { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 830a272372a..06b49ca0c8d 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -919,8 +919,11 @@ describe('Subscription', () => { pushEndpoint: 'http://noop.com/push', }; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const subClass = subby.Subscription as any; + beforeEach(() => { - Subscription.formatMetadata_ = (metadata: subby.SubscriptionMetadata) => { + subClass.formatMetadata_ = (metadata: {}) => { return Object.assign({}, metadata); }; }); From b4a5aeee765b2002a33e2accbed4e66d86fcb6cc Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 7 Aug 2020 19:02:44 -0700 Subject: [PATCH 0663/1115] chore: release 2.4.0 (#1080) * chore: updated samples/package.json [ci skip] * chore: updated CHANGELOG.md [ci skip] * chore: updated package.json Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 3a340008bac..a76b3d237c0 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.4.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.3.0...v2.4.0) (2020-08-08) + + +### Features + +* update to TypeScript 3.8+ to match gax/protobufjs (to allow things to compile again) ([#1079](https://www.github.com/googleapis/nodejs-pubsub/issues/1079)) ([cd39d38](https://www.github.com/googleapis/nodejs-pubsub/commit/cd39d38c525b3ed0383c63eb379c96aed6f53d94)) + ## [2.3.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.2.0...v2.3.0) (2020-07-20) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1e18d30db4e..83cbebc75a6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.3.0", + "version": "2.4.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 1d6c4f2a0389f022ff064d92fe100a6ba0445d99 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 10 Aug 2020 11:59:32 -0700 Subject: [PATCH 0664/1115] fix: properly handle non-emulator alternate endpoints for pub/sub (#1060) * fix: properly handle non-emulator alternate endpoints for pub/sub * docs: update comments about apiEndpoint to reflect its meaning in both places * fix: switch around the resolution order for the API endpoints so it matches the previous order, just adding the CLOUD_API one --- handwritten/pubsub/src/pubsub.ts | 65 ++++++++++++++++++++++++------- handwritten/pubsub/test/pubsub.ts | 60 +++++++++++++++++++++++++--- 2 files changed, 104 insertions(+), 21 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 056eaa68dfb..101e5b3bfe1 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -190,9 +190,11 @@ interface GetClientCallback { * JSON file, the `projectId` option above is not necessary. NOTE: .pem and * .p12 require you to specify the `email` option as well. * @property {string} [apiEndpoint] The `apiEndpoint` from options will set the - * host. If not set, the `PUBSUB_EMULATOR_HOST` environment variable from - * the gcloud SDK is honored, otherwise the actual API endpoint will be - * used. + * host. If not set, the `PUBSUB_EMULATOR_HOST` environment variable from the + * gcloud SDK is honored. We also check the `CLOUD_API_ENDPOINT_OVERRIDES_PUBSUB` + * environment variable used by `gcloud alpha pubsub`. Otherwise the actual API + * endpoint will be used. Note that if the URL doesn't end in '.googleapis.com', + * we will assume that it's an emulator and disable strict SSL checks. * @property {string} [email] Account email address. Required when using a .pem * or .p12 keyFilename. * @property {object} [credentials] Credentials object. @@ -615,30 +617,63 @@ export class PubSub { /** * Determine the appropriate endpoint to use for API requests, first trying - * the local `apiEndpoint` parameter. If the `apiEndpoint` parameter is null - * we try Pub/Sub emulator environment variable (PUBSUB_EMULATOR_HOST), - * otherwise the default JSON API. + * the `apiEndpoint` parameter. If that isn't set, we try the Pub/Sub emulator + * environment variable (PUBSUB_EMULATOR_HOST). If that is also null, we try + * the standard `gcloud alpha pubsub` environment variable + * (CLOUDSDK_API_ENDPOINT_OVERRIDES_PUBSUB). Otherwise the default production + * API is used. + * + * Note that if the URL doesn't end in '.googleapis.com', we will assume that + * it's an emulator and disable strict SSL checks. * * @private */ determineBaseUrl_() { - const apiEndpoint = this.options.apiEndpoint; - if (!apiEndpoint && !process.env.PUBSUB_EMULATOR_HOST) { + // We allow an override from the client object options, or from + // one of these variables. The CLOUDSDK variable is provided for + // compatibility with the `gcloud alpha` utility. + const gcloudVarName = 'CLOUDSDK_API_ENDPOINT_OVERRIDES_PUBSUB'; + const emulatorVarName = 'PUBSUB_EMULATOR_HOST'; + const apiEndpoint = + this.options.apiEndpoint || + process.env[emulatorVarName] || + process.env[gcloudVarName]; + if (!apiEndpoint) { return; } - const grpcInstance = this.options.grpc || gax.grpc; - const baseUrl = apiEndpoint || process.env.PUBSUB_EMULATOR_HOST; - const leadingProtocol = new RegExp('^https*://'); + // Parse the URL into a hostname and port, if possible. + const leadingProtocol = new RegExp('^https?://'); const trailingSlashes = new RegExp('/*$'); - const baseUrlParts = baseUrl! + const baseUrlParts = apiEndpoint! .replace(leadingProtocol, '') .replace(trailingSlashes, '') .split(':'); this.options.servicePath = baseUrlParts[0]; - this.options.port = baseUrlParts[1]; - this.options.sslCreds = grpcInstance.credentials.createInsecure(); - this.isEmulator = true; + if (!baseUrlParts[1]) { + // No port was given -- figure it out from the protocol. + if (apiEndpoint!.startsWith('https')) { + this.options.port = 443; + } else if (apiEndpoint!.startsWith('http')) { + this.options.port = 80; + } else { + this.options.port = undefined; + } + } else { + this.options.port = parseInt(baseUrlParts[1], 10); + } + + // If this looks like a GCP URL of some kind, don't go into emulator + // mode. Otherwise, supply a fake SSL provider so a real cert isn't + // required for running the emulator. + const officialUrlMatch = this.options.servicePath!.endsWith( + '.googleapis.com' + ); + if (!officialUrlMatch) { + const grpcInstance = this.options.grpc || gax.grpc; + this.options.sslCreds = grpcInstance.credentials.createInsecure(); + this.isEmulator = true; + } if (!this.options.projectId && process.env.PUBSUB_PROJECT_ID) { this.options.projectId = process.env.PUBSUB_PROJECT_ID; diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index ceae807f76e..64e0466274f 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -721,8 +721,17 @@ describe('PubSub', () => { process.env.PUBSUB_EMULATOR_HOST = host; } - beforeEach(() => { + function setSdkUrl(url: string) { + process.env.CLOUDSDK_API_ENDPOINT_OVERRIDES_PUBSUB = url; + } + + function unsetVariables() { delete process.env.PUBSUB_EMULATOR_HOST; + delete process.env.CLOUDSDK_API_ENDPOINT_OVERRIDES_PUBSUB; + } + + beforeEach(() => { + unsetVariables(); }); it('should do nothing if correct options are not set', () => { @@ -741,7 +750,7 @@ describe('PubSub', () => { pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, '8085'); + assert.strictEqual(pubsub.options.port, 8085); assert.strictEqual(pubsub.options.sslCreds, fakeCreds); assert.strictEqual(pubsub.isEmulator, true); }); @@ -750,12 +759,12 @@ describe('PubSub', () => { setHost('localhost:8080/'); pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, '8080'); + assert.strictEqual(pubsub.options.port, 8080); setHost('localhost:8081//'); pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, '8081'); + assert.strictEqual(pubsub.options.port, 8081); }); it('should set the port to undefined if not set', () => { @@ -765,6 +774,20 @@ describe('PubSub', () => { assert.strictEqual(pubsub.options.port, undefined); }); + it('should set the port to 80 for http with no port specified', () => { + setHost('http://localhost/'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, 80); + }); + + it('should set the port to 443 for https with no port specified', () => { + setHost('https://localhost/'); + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, 443); + }); + it('should create credentials from local grpc if present', () => { const fakeCredentials = {}; const fakeGrpc = { @@ -779,6 +802,8 @@ describe('PubSub', () => { assert.strictEqual(pubsub.options.sslCreds, fakeCredentials); }); + // This tests both the EMULATOR environment variable and detecting + // an emulator URL. describe('with PUBSUB_EMULATOR_HOST environment variable', () => { const PUBSUB_EMULATOR_HOST = 'localhost:9090'; @@ -787,16 +812,39 @@ describe('PubSub', () => { }); after(() => { - delete process.env.PUBSUB_EMULATOR_HOST; + unsetVariables(); }); it('should use the PUBSUB_EMULATOR_HOST env var', () => { pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, '9090'); + assert.strictEqual(pubsub.options.port, 9090); assert.strictEqual(pubsub.isEmulator, true); }); }); + + // This tests both the CLOUDSDK environment variable and detecting + // a non-emulator URL. + describe('with CLOUDSDK_API_ENDPOINT_OVERRIDES_PUBSUB environment variable', () => { + const server = 'some.test.server.googleapis.com'; + const apiUrl = `https://${server}/`; + + beforeEach(() => { + setSdkUrl(apiUrl); + }); + + after(() => { + unsetVariables(); + }); + + it('should use the CLOUDSDK_API_ENDPOINT_OVERRIDES_PUBSUB env var', () => { + pubsub.determineBaseUrl_(); + assert.strictEqual(pubsub.options.servicePath, server); + assert.strictEqual(pubsub.options.port, 443); + assert.strictEqual(pubsub.isEmulator, false); + assert.strictEqual(pubsub.options.sslCreds, undefined); + }); + }); }); describe('getSnapshots', () => { From eb3634008f8191d43417e3876ddc474cdd499dc0 Mon Sep 17 00:00:00 2001 From: Lalji Kanjareeya <46327204+laljikanjareeya@users.noreply.github.com> Date: Tue, 11 Aug 2020 01:00:07 +0530 Subject: [PATCH 0665/1115] docs: improve document (#1077) Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/publisher/index.ts | 12 ++++++++++++ handwritten/pubsub/src/publisher/message-batch.ts | 6 +++--- handwritten/pubsub/src/pubsub.ts | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 04e6fc75e6a..a5b44b874ca 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -39,6 +39,18 @@ export interface PublishOptions { messageOrdering?: boolean; } +/** + * @typedef PublishOptions + * @property {BatchPublishOptions} [batching] The maximum number of bytes to + * buffer before sending a payload. + * @property {object} [gaxOpts] Request configuration options, outlined + * {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html|here.} + * @property {boolean} [messageOrdering] If true, messages published with the + * same order key in Message will be delivered to the subscribers in the order in which they + * are received by the Pub/Sub system. Otherwise, they may be delivered in + * any order. + */ + export const BATCH_LIMITS: BatchPublishOptions = { maxBytes: Math.pow(1024, 2) * 9, maxMessages: 1000, diff --git a/handwritten/pubsub/src/publisher/message-batch.ts b/handwritten/pubsub/src/publisher/message-batch.ts index bb2a4862af3..9e475d6194d 100644 --- a/handwritten/pubsub/src/publisher/message-batch.ts +++ b/handwritten/pubsub/src/publisher/message-batch.ts @@ -24,11 +24,11 @@ export interface BatchPublishOptions { /** * @typedef BatchPublishOptions - * @property {number} [maxBytes=1024^2 * 5] The maximum number of bytes to + * @property {number} [maxBytes=1 * 1024 * 1024] The maximum number of bytes to * buffer before sending a payload. - * @property {number} [maxMessages=1000] The maximum number of messages to + * @property {number} [maxMessages=100] The maximum number of messages to * buffer before sending a payload. - * @property {number} [maxMilliseconds=100] The maximum duration to wait before + * @property {number} [maxMilliseconds=10] The maximum duration to wait before * sending a payload. */ /** diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 101e5b3bfe1..8a8171f70df 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -1186,6 +1186,7 @@ export class PubSub { * @throws {Error} If a name is not provided. * * @param {string} name The name of the topic. + * @param {PublishOptions} [options] Publisher configuration object. * @returns {Topic} A {@link Topic} instance. * * @example From 499a0f302fd3d2ae361344e032f88d5710db1170 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 10 Aug 2020 16:26:21 -0700 Subject: [PATCH 0666/1115] Remove experimental warning for ordering keys properties. (#1072) PiperOrigin-RevId: 323803770 Source-Author: Google APIs Source-Date: Wed Jul 29 09:31:38 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 706053bbfb3f16ef752e513c2898a1f26cdd8e41 Source-Link: https://github.com/googleapis/googleapis/commit/706053bbfb3f16ef752e513c2898a1f26cdd8e41 Co-authored-by: Kamal Aboul-Hosn Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- .../protos/google/pubsub/v1/pubsub.proto | 118 ++++++++---------- handwritten/pubsub/src/v1/publisher_client.ts | 18 ++- .../pubsub/src/v1/subscriber_client.ts | 74 +++++------ handwritten/pubsub/synth.metadata | 4 +- 4 files changed, 91 insertions(+), 123 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index dc9151446fe..909863eb98b 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -42,9 +42,8 @@ service Publisher { "https://www.googleapis.com/auth/cloud-platform," "https://www.googleapis.com/auth/pubsub"; - // Creates the given topic with the given name. See the - // - // resource name rules. + // Creates the given topic with the given name. See the [resource name rules]( + // https://cloud.google.com/pubsub/docs/admin#resource_names). rpc CreateTopic(Topic) returns (Topic) { option (google.api.http) = { put: "/v1/{name=projects/*/topics/*}" @@ -98,11 +97,10 @@ service Publisher { } // Lists the names of the snapshots on this topic. Snapshots are used in - // Seek - // operations, which allow - // you to manage message acknowledgments in bulk. That is, you can set the - // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot. + // [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, + // which allow you to manage message acknowledgments in bulk. That is, you can + // set the acknowledgment state of messages in an existing subscription to the + // state captured by a snapshot. rpc ListTopicSnapshots(ListTopicSnapshotsRequest) returns (ListTopicSnapshotsResponse) { option (google.api.http) = { @@ -161,8 +159,8 @@ message Topic { // must not start with `"goog"`. string name = 1 [(google.api.field_behavior) = REQUIRED]; - // See Creating and - // managing labels. + // See [Creating and managing labels] + // (https://cloud.google.com/pubsub/docs/labels). map labels = 2; // Policy constraining the set of Google Cloud Platform regions where messages @@ -180,11 +178,11 @@ message Topic { // A message that is published by publishers and consumed by subscribers. The // message must contain either a non-empty data field or at least one attribute. // Note that client libraries represent this object differently -// depending on the language. See the corresponding -// client -// library documentation for more information. See -// Quotas and limits -// for more information about message limits. +// depending on the language. See the corresponding [client library +// documentation](https://cloud.google.com/pubsub/docs/reference/libraries) for +// more information. See [quotas and limits] +// (https://cloud.google.com/pubsub/quotas) for more information about message +// limits. message PubsubMessage { // The message data field. If this field is empty, the message must contain // at least one attribute. @@ -212,9 +210,6 @@ message PubsubMessage { // delivered to subscribers in the order in which they are received by the // Pub/Sub system. All `PubsubMessage`s published in a given `PublishRequest` // must specify the same `ordering_key` value. - // EXPERIMENTAL: This feature is part of a closed alpha release. This - // API might be changed in backward-incompatible ways and is not recommended - // for production use. It is not subject to any SLA or deprecation policy. string ordering_key = 5; } @@ -388,19 +383,17 @@ service Subscriber { "https://www.googleapis.com/auth/cloud-platform," "https://www.googleapis.com/auth/pubsub"; - // Creates a subscription to a given topic. See the - // - // resource name rules. + // Creates a subscription to a given topic. See the [resource name rules] + // (https://cloud.google.com/pubsub/docs/admin#resource_names). // If the subscription already exists, returns `ALREADY_EXISTS`. // If the corresponding topic doesn't exist, returns `NOT_FOUND`. // // If the name is not provided in the request, the server will assign a random // name for this subscription on the same project as the topic, conforming - // to the - // [resource name - // format](https://cloud.google.com/pubsub/docs/admin#resource_names). The - // generated name is populated in the returned Subscription object. Note that - // for REST API requests, you must specify a name in the request. + // to the [resource name format] + // (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated + // name is populated in the returned Subscription object. Note that for REST + // API requests, you must specify a name in the request. rpc CreateSubscription(Subscription) returns (Subscription) { option (google.api.http) = { put: "/v1/{name=projects/*/subscriptions/*}" @@ -528,12 +521,11 @@ service Subscriber { option (google.api.method_signature) = "snapshot"; } - // Lists the existing snapshots. Snapshots are used in - // Seek - // operations, which allow - // you to manage message acknowledgments in bulk. That is, you can set the - // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot. + // Lists the existing snapshots. Snapshots are used in [Seek]( + // https://cloud.google.com/pubsub/docs/replay-overview) operations, which + // allow you to manage message acknowledgments in bulk. That is, you can set + // the acknowledgment state of messages in an existing subscription to the + // state captured by a snapshot. rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) { option (google.api.http) = { get: "/v1/{project=projects/*}/snapshots" @@ -542,21 +534,19 @@ service Subscriber { } // Creates a snapshot from the requested subscription. Snapshots are used in - // Seek - // operations, which allow - // you to manage message acknowledgments in bulk. That is, you can set the - // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot. - //

If the snapshot already exists, returns `ALREADY_EXISTS`. + // [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, + // which allow you to manage message acknowledgments in bulk. That is, you can + // set the acknowledgment state of messages in an existing subscription to the + // state captured by a snapshot. + // If the snapshot already exists, returns `ALREADY_EXISTS`. // If the requested subscription doesn't exist, returns `NOT_FOUND`. // If the backlog in the subscription is too old -- and the resulting snapshot // would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. // See also the `Snapshot.expire_time` field. If the name is not provided in // the request, the server will assign a random // name for this snapshot on the same project as the subscription, conforming - // to the - // [resource name - // format](https://cloud.google.com/pubsub/docs/admin#resource_names). The + // to the [resource name format] + // (https://cloud.google.com/pubsub/docs/admin#resource_names). The // generated name is populated in the returned Snapshot object. Note that for // REST API requests, you must specify a name in the request. rpc CreateSnapshot(CreateSnapshotRequest) returns (Snapshot) { @@ -580,12 +570,11 @@ service Subscriber { }; } - // Removes an existing snapshot. Snapshots are used in - // Seek - // operations, which allow - // you to manage message acknowledgments in bulk. That is, you can set the - // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot.

+ // Removes an existing snapshot. Snapshots are used in [Seek] + // (https://cloud.google.com/pubsub/docs/replay-overview) operations, which + // allow you to manage message acknowledgments in bulk. That is, you can set + // the acknowledgment state of messages in an existing subscription to the + // state captured by a snapshot. // When the snapshot is deleted, all messages retained in the snapshot // are immediately dropped. After a snapshot is deleted, a new one may be // created with the same name, but the new one has no association with the old @@ -598,13 +587,12 @@ service Subscriber { } // Seeks an existing subscription to a point in time or to a given snapshot, - // whichever is provided in the request. Snapshots are used in - // Seek - // operations, which allow - // you to manage message acknowledgments in bulk. That is, you can set the - // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot. Note that both the subscription and the snapshot - // must be on the same topic. + // whichever is provided in the request. Snapshots are used in [Seek]( + // https://cloud.google.com/pubsub/docs/replay-overview) operations, which + // allow you to manage message acknowledgments in bulk. That is, you can set + // the acknowledgment state of messages in an existing subscription to the + // state captured by a snapshot. Note that both the subscription and the + // snapshot must be on the same topic. rpc Seek(SeekRequest) returns (SeekResponse) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:seek" @@ -666,10 +654,8 @@ message Subscription { // Indicates whether to retain acknowledged messages. If true, then // messages are not expunged from the subscription's backlog, even if they are // acknowledged, until they fall out of the `message_retention_duration` - // window. This must be true if you would like to - // - // Seek to a timestamp. + // window. This must be true if you would like to [Seek to a timestamp] + // (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time). bool retain_acked_messages = 7; // How long to retain unacknowledged messages in the subscription's backlog, @@ -688,9 +674,6 @@ message Subscription { // will be delivered to the subscribers in the order in which they // are received by the Pub/Sub system. Otherwise, they may be delivered in // any order. - // EXPERIMENTAL: This feature is part of a closed alpha release. This - // API might be changed in backward-incompatible ways and is not recommended - // for production use. It is not subject to any SLA or deprecation policy. bool enable_message_ordering = 10; // A policy that specifies the conditions for this subscription's expiration. @@ -1186,11 +1169,10 @@ message UpdateSnapshotRequest { } // A snapshot resource. Snapshots are used in -// Seek -// operations, which allow -// you to manage message acknowledgments in bulk. That is, you can set the -// acknowledgment state of messages in an existing subscription to the state -// captured by a snapshot. +// [Seek](https://cloud.google.com/pubsub/docs/replay-overview) +// operations, which allow you to manage message acknowledgments in bulk. That +// is, you can set the acknowledgment state of messages in an existing +// subscription to the state captured by a snapshot. message Snapshot { option (google.api.resource) = { type: "pubsub.googleapis.com/Snapshot" @@ -1217,8 +1199,8 @@ message Snapshot { // snapshot that would expire in less than 1 hour after creation. google.protobuf.Timestamp expire_time = 3; - // See Creating and - // managing labels. + // See [Creating and managing labels] + // (https://cloud.google.com/pubsub/docs/labels). map labels = 4; } diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index d7ee77ce165..d4b2adfb36d 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -390,9 +390,8 @@ export class PublisherClient { > ): void; /** - * Creates the given topic with the given name. See the - * - * resource name rules. + * Creates the given topic with the given name. See the [resource name rules]( + * https://cloud.google.com/pubsub/docs/admin#resource_names). * * @param {Object} request * The request object that will be sent. @@ -404,8 +403,8 @@ export class PublisherClient { * signs (`%`). It must be between 3 and 255 characters in length, and it * must not start with `"goog"`. * @param {number[]} request.labels - * See Creating and - * managing labels. + * See [Creating and managing labels] + * (https://cloud.google.com/pubsub/docs/labels). * @param {google.pubsub.v1.MessageStoragePolicy} request.messageStoragePolicy * Policy constraining the set of Google Cloud Platform regions where messages * published to the topic may be stored. If not present, then no constraints @@ -1312,11 +1311,10 @@ export class PublisherClient { ): void; /** * Lists the names of the snapshots on this topic. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. + * [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, + * which allow you to manage message acknowledgments in bulk. That is, you can + * set the acknowledgment state of messages in an existing subscription to the + * state captured by a snapshot. * * @param {Object} request * The request object that will be sent. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 117a7efe117..0ea26d8e4e2 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -376,19 +376,17 @@ export class SubscriberClient { > ): void; /** - * Creates a subscription to a given topic. See the - * - * resource name rules. + * Creates a subscription to a given topic. See the [resource name rules] + * (https://cloud.google.com/pubsub/docs/admin#resource_names). * If the subscription already exists, returns `ALREADY_EXISTS`. * If the corresponding topic doesn't exist, returns `NOT_FOUND`. * * If the name is not provided in the request, the server will assign a random * name for this subscription on the same project as the topic, conforming - * to the - * [resource name - * format](https://cloud.google.com/pubsub/docs/admin#resource_names). The - * generated name is populated in the returned Subscription object. Note that - * for REST API requests, you must specify a name in the request. + * to the [resource name format] + * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated + * name is populated in the returned Subscription object. Note that for REST + * API requests, you must specify a name in the request. * * @param {Object} request * The request object that will be sent. @@ -432,10 +430,8 @@ export class SubscriberClient { * Indicates whether to retain acknowledged messages. If true, then * messages are not expunged from the subscription's backlog, even if they are * acknowledged, until they fall out of the `message_retention_duration` - * window. This must be true if you would like to - * - * Seek to a timestamp. + * window. This must be true if you would like to [Seek to a timestamp] + * (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time). * @param {google.protobuf.Duration} request.messageRetentionDuration * How long to retain unacknowledged messages in the subscription's backlog, * from the moment a message is published. @@ -451,9 +447,6 @@ export class SubscriberClient { * will be delivered to the subscribers in the order in which they * are received by the Pub/Sub system. Otherwise, they may be delivered in * any order. - * EXPERIMENTAL: This feature is part of a closed alpha release. This - * API might be changed in backward-incompatible ways and is not recommended - * for production use. It is not subject to any SLA or deprecation policy. * @param {google.pubsub.v1.ExpirationPolicy} request.expirationPolicy * A policy that specifies the conditions for this subscription's expiration. * A subscription is considered active as long as any connected subscriber is @@ -1275,21 +1268,19 @@ export class SubscriberClient { ): void; /** * Creates a snapshot from the requested subscription. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. - *

If the snapshot already exists, returns `ALREADY_EXISTS`. + * [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, + * which allow you to manage message acknowledgments in bulk. That is, you can + * set the acknowledgment state of messages in an existing subscription to the + * state captured by a snapshot. + * If the snapshot already exists, returns `ALREADY_EXISTS`. * If the requested subscription doesn't exist, returns `NOT_FOUND`. * If the backlog in the subscription is too old -- and the resulting snapshot * would expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. * See also the `Snapshot.expire_time` field. If the name is not provided in * the request, the server will assign a random * name for this snapshot on the same project as the subscription, conforming - * to the - * [resource name - * format](https://cloud.google.com/pubsub/docs/admin#resource_names). The + * to the [resource name format] + * (https://cloud.google.com/pubsub/docs/admin#resource_names). The * generated name is populated in the returned Snapshot object. Note that for * REST API requests, you must specify a name in the request. * @@ -1477,12 +1468,11 @@ export class SubscriberClient { > ): void; /** - * Removes an existing snapshot. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot.

+ * Removes an existing snapshot. Snapshots are used in [Seek] + * (https://cloud.google.com/pubsub/docs/replay-overview) operations, which + * allow you to manage message acknowledgments in bulk. That is, you can set + * the acknowledgment state of messages in an existing subscription to the + * state captured by a snapshot. * When the snapshot is deleted, all messages retained in the snapshot * are immediately dropped. After a snapshot is deleted, a new one may be * created with the same name, but the new one has no association with the old @@ -1568,13 +1558,12 @@ export class SubscriberClient { ): void; /** * Seeks an existing subscription to a point in time or to a given snapshot, - * whichever is provided in the request. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. Note that both the subscription and the snapshot - * must be on the same topic. + * whichever is provided in the request. Snapshots are used in [Seek]( + * https://cloud.google.com/pubsub/docs/replay-overview) operations, which + * allow you to manage message acknowledgments in bulk. That is, you can set + * the acknowledgment state of messages in an existing subscription to the + * state captured by a snapshot. Note that both the subscription and the + * snapshot must be on the same topic. * * @param {Object} request * The request object that will be sent. @@ -1886,12 +1875,11 @@ export class SubscriberClient { > ): void; /** - * Lists the existing snapshots. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. + * Lists the existing snapshots. Snapshots are used in [Seek]( + * https://cloud.google.com/pubsub/docs/replay-overview) operations, which + * allow you to manage message acknowledgments in bulk. That is, you can set + * the acknowledgment state of messages in an existing subscription to the + * state captured by a snapshot. * * @param {Object} request * The request object that will be sent. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 85de20100d1..05295207f58 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "6c35ede4fe3055d3c8491718c78ce46b7126645c", - "internalRef": "320175744" + "sha": "706053bbfb3f16ef752e513c2898a1f26cdd8e41", + "internalRef": "323803770" } }, { From 680626742f000b9b436e734586e36900ee38cf21 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 10 Aug 2020 19:28:06 -0700 Subject: [PATCH 0667/1115] build: stop passing credential file when running gcloud container (#1083) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/96fb0e9d-e02a-4451-878f-e646368369cc/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/94421c47802f56a44c320257b2b4c190dc7d6b68 Source-Link: https://github.com/googleapis/synthtool/commit/5936421202fb53ed4641bcb824017dd393a3dbcc --- handwritten/pubsub/.kokoro/populate-secrets.sh | 1 - handwritten/pubsub/README.md | 3 +++ handwritten/pubsub/protos/protos.d.ts | 2 +- handwritten/pubsub/protos/protos.js | 2 +- handwritten/pubsub/synth.metadata | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/.kokoro/populate-secrets.sh b/handwritten/pubsub/.kokoro/populate-secrets.sh index e6ce8200d75..6f9d228859d 100755 --- a/handwritten/pubsub/.kokoro/populate-secrets.sh +++ b/handwritten/pubsub/.kokoro/populate-secrets.sh @@ -32,7 +32,6 @@ do --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \ gcr.io/google.com/cloudsdktool/cloud-sdk \ secrets versions access latest \ - --credential-file-override=${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json \ --project cloud-devrel-kokoro-resources \ --secret $key > \ "$SECRET_LOCATION/$key" diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index a092c1b7948..10d218f5974 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -22,6 +22,9 @@ For additional help developing Pub/Sub applications, in Node.js and other langua guides. +A comprehensive list of changes in each version may be found in +[the CHANGELOG](https://github.com/googleapis/nodejs-pubsub/blob/master/CHANGELOG.md). + * [Google Cloud Pub/Sub Node.js Client API Reference][client-docs] * [Google Cloud Pub/Sub Documentation][product-docs] * [github.com/googleapis/nodejs-pubsub](https://github.com/googleapis/nodejs-pubsub) diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 78a99999cc6..ea22b475ecd 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -13,7 +13,7 @@ // limitations under the License. import * as Long from "long"; -import * as $protobuf from "protobufjs"; +import {protobuf as $protobuf} from "google-gax"; /** Namespace google. */ export namespace google { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index eafb2a8f660..d24ee24953b 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -19,7 +19,7 @@ define(["protobufjs/minimal"], factory); /* CommonJS */ else if (typeof require === 'function' && typeof module === 'object' && module && module.exports) - module.exports = factory(require("protobufjs/minimal")); + module.exports = factory(require("google-gax").protobufMinimal); })(this, function($protobuf) { "use strict"; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 05295207f58..f4e6542e229 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "3bf1f595fdc8b1766a3a0e184dff3e2153fb55db" + "sha": "99ae7fbcb3cb7f1273e68cfa88e855bfce25b76f" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "89d431fb2975fc4e0ed24995a6e6dfc8ff4c24fa" + "sha": "94421c47802f56a44c320257b2b4c190dc7d6b68" } } ], From 523f0a7916a65b2733aef0288c172c42a7128280 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 12 Aug 2020 14:00:16 -0700 Subject: [PATCH 0668/1115] fix: make request batching work again (#1087) --- handwritten/pubsub/.kokoro/release/docs-devsite.sh | 5 +++++ handwritten/pubsub/.kokoro/release/publish.cfg | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 10 ++++++---- handwritten/pubsub/src/v1/subscriber_client.ts | 8 +++++--- handwritten/pubsub/synth.metadata | 10 +++++----- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh index 3b93137d4db..fa089cf290e 100755 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.sh +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -36,6 +36,11 @@ NAME=$(cat .repo-metadata.json | json name) mkdir ./_devsite cp ./yaml/$NAME/* ./_devsite + +# Delete SharePoint item, see https://github.com/microsoft/rushstack/issues/1229 +sed -i -e '1,3d' ./yaml/toc.yml +sed -i -e 's/^ //' ./yaml/toc.yml + cp ./yaml/toc.yml ./_devsite/toc.yml # create docs.metadata, based on package.json and .repo-metadata.json. diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 2ceba7dcc6e..e3ab2b51deb 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -61,7 +61,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" } env_vars: { diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index d4b2adfb36d..f58a3f46a42 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -214,7 +214,7 @@ export class PublisherClient { // requests; denote this. this.descriptors.batching = { - Publish: new this._gaxModule.BundleDescriptor( + publish: new this._gaxModule.BundleDescriptor( 'messages', ['topic'], 'message_ids', @@ -295,12 +295,14 @@ export class PublisherClient { } ); + const descriptor = + this.descriptors.page[methodName] || + this.descriptors.batching?.[methodName] || + undefined; const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], - this.descriptors.page[methodName] || - this.descriptors.stream[methodName] || - this.descriptors.longrunning[methodName] + descriptor ); this.innerApiCalls[methodName] = apiCall; diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 0ea26d8e4e2..c4b15288640 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -281,12 +281,14 @@ export class SubscriberClient { } ); + const descriptor = + this.descriptors.page[methodName] || + this.descriptors.stream[methodName] || + undefined; const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], - this.descriptors.page[methodName] || - this.descriptors.stream[methodName] || - this.descriptors.longrunning[methodName] + descriptor ); this.innerApiCalls[methodName] = apiCall; diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index f4e6542e229..8963630d11e 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -3,23 +3,23 @@ { "git": { "name": ".", - "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "99ae7fbcb3cb7f1273e68cfa88e855bfce25b76f" + "remote": "git@github.com:googleapis/nodejs-pubsub.git", + "sha": "869ecc992bbee934ee630e7f38d7e88234c9e80a" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "706053bbfb3f16ef752e513c2898a1f26cdd8e41", - "internalRef": "323803770" + "sha": "874846a1917ee5c3fe271449f3cb9a06e75407be", + "internalRef": "326288259" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "94421c47802f56a44c320257b2b4c190dc7d6b68" + "sha": "5747555f7620113d9a2078a48f4c047a99d31b3e" } } ], From 13da2a781959bef04bbc7e2f8d8427f05bb1a341 Mon Sep 17 00:00:00 2001 From: Seth Maxwell Date: Fri, 14 Aug 2020 14:00:18 -0400 Subject: [PATCH 0669/1115] feat: Opentelemetry integration (#1078) * Add opentelemetry tracing * build: rename _toc to toc (#1066) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * fix: rename _toc to toc Source-Author: F. Hinkelmann Source-Date: Tue Jul 21 10:53:20 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: 99c93fe09f8c1dca09dfc0301c8668e3a70dd796 Source-Link: https://github.com/googleapis/synthtool/commit/99c93fe09f8c1dca09dfc0301c8668e3a70dd796 Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> * build: move gitattributes files to node templates (#1070) Source-Author: F. Hinkelmann Source-Date: Thu Jul 23 01:45:04 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: 3a00b7fea8c4c83eaff8eb207f530a2e3e8e1de3 Source-Link: https://github.com/googleapis/synthtool/commit/3a00b7fea8c4c83eaff8eb207f530a2e3e8e1de3 * Add opentelemetry instrumentation * Add create span test * Refactor tracing * Add publisher key test * Fix linting issues * Add docs * Add example for opentelemetry * Add tracing example * Update headers * Add microsoft api documenter * Fix linting in samples/package.json * Add optional tracing * Fix linting issues * Re-add api-documenter * Update package.json * Update package.json * Update package.json * Fix docs * Add more unit tests * Fix linting * Add disable tracing tests * Update opentelemetryTracing sample Co-authored-by: Yoshi Automation Bot Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> Co-authored-by: Benjamin E. Coe Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/package.json | 8 +- .../pubsub/src/opentelemetry-tracing.ts | 43 ++++++++ handwritten/pubsub/src/publisher/index.ts | 69 +++++++++++- handwritten/pubsub/src/subscriber.ts | 44 +++++++- .../pubsub/test/opentelemetry-tracing.ts | 63 +++++++++++ handwritten/pubsub/test/publisher/index.ts | 80 +++++++++++++- handwritten/pubsub/test/subscriber.ts | 103 ++++++++++++++++++ 7 files changed, 399 insertions(+), 11 deletions(-) create mode 100644 handwritten/pubsub/src/opentelemetry-tracing.ts create mode 100644 handwritten/pubsub/test/opentelemetry-tracing.ts diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 83cbebc75a6..bdb076f472d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -30,7 +30,7 @@ "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", - "test": "c8 mocha build/test", + "test": "c8 mocha build/test --recursive", "lint": "gts check", "predocs": "npm run compile", "docs": "jsdoc -c .jsdoc.js", @@ -44,15 +44,17 @@ "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js", "prelint": "cd samples; npm link ../; npm install", - "precompile": "gts clean", "api-extractor": "api-extractor run --local", - "api-documenter": "api-documenter yaml --input-folder=temp" + "api-documenter": "api-documenter yaml --input-folder=temp", + "precompile": "gts clean" }, "dependencies": { "@google-cloud/paginator": "^3.0.0", "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", + "@opentelemetry/api": "^0.9.0", + "@opentelemetry/tracing": "^0.9.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", diff --git a/handwritten/pubsub/src/opentelemetry-tracing.ts b/handwritten/pubsub/src/opentelemetry-tracing.ts new file mode 100644 index 00000000000..3c51dd440af --- /dev/null +++ b/handwritten/pubsub/src/opentelemetry-tracing.ts @@ -0,0 +1,43 @@ +/*! + * Copyright 2020 Google LLC + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {Attributes, SpanContext, Span, trace} from '@opentelemetry/api'; +import {Tracer} from '@opentelemetry/tracing'; + +/** + * Wrapper for creating OpenTelemetry Spans + * + * @class + */ +export class OpenTelemetryTracer { + /** + * Creates a new span with the given properties + * + * @param {string} spanName the name for the span + * @param {Attributes?} attributes an object containing the attributes to be set for the span + * @param {SpanContext?} parent the context of the parent span to link to the span + */ + createSpan( + spanName: string, + attributes?: Attributes, + parent?: SpanContext + ): Span { + const tracerProvider: Tracer = trace.getTracer('default') as Tracer; + return tracerProvider.startSpan(spanName, { + parent: parent, + attributes: attributes, + }); + } +} diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index a5b44b874ca..0dc0099d398 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -17,6 +17,7 @@ import {promisify, promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; +import {Span} from '@opentelemetry/api'; import {BatchPublishOptions} from './message-batch'; import {Queue, OrderedQueue} from './message-queues'; @@ -24,6 +25,7 @@ import {Topic} from '../topic'; import {RequestCallback, EmptyCallback} from '../pubsub'; import {google} from '../../protos/protos'; import {defaultOptions} from '../default-options'; +import {OpenTelemetryTracer} from '../opentelemetry-tracing'; export type PubsubMessage = google.pubsub.v1.IPubsubMessage; @@ -37,6 +39,7 @@ export interface PublishOptions { batching?: BatchPublishOptions; gaxOpts?: CallOptions; messageOrdering?: boolean; + enableOpenTelemetryTracing?: boolean; } /** @@ -72,11 +75,16 @@ export class Publisher { settings!: PublishOptions; queue: Queue; orderedQueues: Map; + tracing: OpenTelemetryTracer | undefined; constructor(topic: Topic, options?: PublishOptions) { this.setOptions(options); this.topic = topic; this.queue = new Queue(this); this.orderedQueues = new Map(); + this.tracing = + this.settings && this.settings.enableOpenTelemetryTracing + ? new OpenTelemetryTracer() + : undefined; } flush(): Promise; @@ -162,8 +170,13 @@ export class Publisher { } } + const span: Span | undefined = this.constructSpan(message); + if (!message.orderingKey) { this.queue.add(message, callback); + if (span) { + span.end(); + } return; } @@ -177,6 +190,10 @@ export class Publisher { const queue = this.orderedQueues.get(key)!; queue.add(message, callback); + + if (span) { + span.end(); + } } /** * Indicates to the publisher that it is safe to continue publishing for the @@ -211,13 +228,19 @@ export class Publisher { gaxOpts: { isBundling: false, }, + enableOpenTelemetryTracing: false, }; - const {batching, gaxOpts, messageOrdering} = extend( - true, - defaults, - options - ); + const { + batching, + gaxOpts, + messageOrdering, + enableOpenTelemetryTracing, + } = extend(true, defaults, options); + + this.tracing = enableOpenTelemetryTracing + ? new OpenTelemetryTracer() + : undefined; this.settings = { batching: { @@ -227,11 +250,45 @@ export class Publisher { }, gaxOpts, messageOrdering, + enableOpenTelemetryTracing, }; } + + /** + * Constructs an OpenTelemetry span + * + * @private + * + * @param {PubsubMessage} message The message to create a span for + */ + constructSpan(message: PubsubMessage): Span | undefined { + const spanAttributes = { + data: message.data, + }; + const span: Span | undefined = this.tracing + ? this.tracing.createSpan(`${this.topic.name} publisher`, spanAttributes) + : undefined; + if (span) { + if ( + message.attributes && + message.attributes['googclient_OpenTelemetrySpanContext'] + ) { + console.warn( + 'googclient_OpenTelemetrySpanContext key set as message attribute, but will be overridden.' + ); + } + if (!message.attributes) { + message.attributes = {}; + } + message.attributes[ + 'googclient_OpenTelemetrySpanContext' + ] = JSON.stringify(span.context()); + } + return span; + } } promisifyAll(Publisher, { singular: true, - exclude: ['publish', 'setOptions'], + exclude: ['publish', 'setOptions', 'constructSpan'], }); diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index eee532dc6ff..9b746636cd0 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -18,6 +18,7 @@ import {DateStruct, PreciseDate} from '@google-cloud/precise-date'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisify} from '@google-cloud/promisify'; import {EventEmitter} from 'events'; +import {SpanContext, Span} from '@opentelemetry/api'; import {google} from '../protos/protos'; import {Histogram} from './histogram'; @@ -27,6 +28,7 @@ import {MessageStream, MessageStreamOptions} from './message-stream'; import {Subscription} from './subscription'; import {defaultOptions} from './default-options'; import {SubscriberClient} from './v1'; +import {OpenTelemetryTracer} from './opentelemetry-tracing'; export type PullResponse = google.pubsub.v1.IPullResponse; @@ -202,6 +204,7 @@ export interface SubscriberOptions { batching?: BatchOptions; flowControl?: FlowControlOptions; streamingOptions?: MessageStreamOptions; + enableOpenTelemetryTracing?: boolean; } /** @@ -237,6 +240,7 @@ export class Subscriber extends EventEmitter { private _options!: SubscriberOptions; private _stream!: MessageStream; private _subscription: Subscription; + private _tracing: OpenTelemetryTracer | undefined; constructor(subscription: Subscription, options = {}) { super(); @@ -248,7 +252,6 @@ export class Subscriber extends EventEmitter { this._histogram = new Histogram({min: 10, max: 600}); this._latencies = new Histogram(); this._subscription = subscription; - this.setOptions(options); } /** @@ -423,7 +426,42 @@ export class Subscriber extends EventEmitter { this.maxMessages ); } + this._tracing = options.enableOpenTelemetryTracing + ? new OpenTelemetryTracer() + : undefined; + } + + /** + * Constructs an OpenTelemetry span from the incoming message. + * + * @param {Message} message One of the received messages + * @private + */ + private _constructSpan(message: Message): Span | undefined { + // Handle cases where OpenTelemetry is disabled or no span context was sent through message + if ( + !this._tracing || + !message.attributes || + !message.attributes['googclient_OpenTelemetrySpanContext'] + ) { + return undefined; + } + const spanValue = message.attributes['googclient_OpenTelemetrySpanContext']; + const parentSpanContext: SpanContext | undefined = spanValue + ? JSON.parse(spanValue) + : undefined; + const spanAttributes = { + ackId: message.ackId, + deliveryAttempt: message.deliveryAttempt, + }; + // Subscriber spans should always have a publisher span as a parent. + // Return undefined if no parent is provided + const span = parentSpanContext + ? this._tracing.createSpan(this._name, spanAttributes, parentSpanContext) + : undefined; + return span; } + /** * Callback to be invoked when a new message is available. * @@ -445,12 +483,16 @@ export class Subscriber extends EventEmitter { for (const data of receivedMessages!) { const message = new Message(this, data); + const span: Span | undefined = this._constructSpan(message); if (this.isOpen) { message.modAck(this.ackDeadline); this._inventory.add(message); } else { message.nack(); } + if (span) { + span.end(); + } } } diff --git a/handwritten/pubsub/test/opentelemetry-tracing.ts b/handwritten/pubsub/test/opentelemetry-tracing.ts new file mode 100644 index 00000000000..032a235330b --- /dev/null +++ b/handwritten/pubsub/test/opentelemetry-tracing.ts @@ -0,0 +1,63 @@ +/*! + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; + +import * as api from '@opentelemetry/api'; +import * as trace from '@opentelemetry/tracing'; +import {OpenTelemetryTracer} from '../src/opentelemetry-tracing'; +import {SimpleSpanProcessor} from '@opentelemetry/tracing'; + +describe('OpenTelemetryTracer', () => { + let tracing: OpenTelemetryTracer; + let span: trace.Span; + const spanName = 'test-span'; + const spanContext: api.SpanContext = { + traceId: 'd4cda95b652f4a1592b449d5929fda1b', + spanId: '6e0c63257de34c92', + traceFlags: api.TraceFlags.SAMPLED, + }; + const spanAttributes: api.Attributes = { + foo: 'bar', + }; + + before(() => { + const provider = new trace.BasicTracerProvider(); + const exporter = new trace.InMemorySpanExporter(); + provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); + api.trace.setGlobalTracerProvider(provider); + }); + + beforeEach(() => { + tracing = new OpenTelemetryTracer(); + }); + + afterEach(() => { + span.end(); + }); + + it('creates a span', () => { + span = tracing.createSpan( + spanName, + spanAttributes, + spanContext + ) as trace.Span; + assert.strictEqual(span.name, spanName); + assert.deepStrictEqual(span.attributes, spanAttributes); + assert.strictEqual(span.parentSpanId, spanContext.spanId); + }); +}); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 910b1df27f6..8af07b479d8 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -20,6 +20,12 @@ import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; +import { + BasicTracerProvider, + InMemorySpanExporter, + SimpleSpanProcessor, +} from '@opentelemetry/tracing'; +import * as opentelemetry from '@opentelemetry/api'; import {Topic} from '../../src'; import * as p from '../../src/publisher'; @@ -36,7 +42,11 @@ const fakePromisify = Object.assign({}, pfy, { } promisified = true; assert.ok(options.singular); - assert.deepStrictEqual(options.exclude, ['publish', 'setOptions']); + assert.deepStrictEqual(options.exclude, [ + 'publish', + 'setOptions', + 'constructSpan', + ]); }, }); @@ -146,6 +156,58 @@ describe('Publisher', () => { }); }); + describe('OpenTelemetry tracing', () => { + let tracingPublisher: p.Publisher = {} as p.Publisher; + const enableTracing: p.PublishOptions = { + enableOpenTelemetryTracing: true, + }; + const disableTracing: p.PublishOptions = { + enableOpenTelemetryTracing: false, + }; + const buffer = Buffer.from('Hello, world!'); + + beforeEach(() => { + // Declare tracingPublisher as type any and pre-define _tracing + // to gain access to the private field after publisher init + tracingPublisher['tracing'] = undefined; + }); + it('should not instantiate a tracer when tracing is disabled', () => { + tracingPublisher = new Publisher(topic); + assert.strictEqual(tracingPublisher['tracing'], undefined); + }); + + it('should instantiate a tracer when tracing is enabled through constructor', () => { + tracingPublisher = new Publisher(topic, enableTracing); + assert.ok(tracingPublisher['tracing']); + }); + + it('should instantiate a tracer when tracing is enabled through setOptions', () => { + tracingPublisher = new Publisher(topic); + tracingPublisher.setOptions(enableTracing); + assert.ok(tracingPublisher['tracing']); + }); + + it('should disable tracing when tracing is disabled through setOptions', () => { + tracingPublisher = new Publisher(topic, enableTracing); + tracingPublisher.setOptions(disableTracing); + assert.strictEqual(tracingPublisher['tracing'], undefined); + }); + + it('export created spans', () => { + tracingPublisher = new Publisher(topic, enableTracing); + + // Setup trace exporting + const provider: BasicTracerProvider = new BasicTracerProvider(); + const exporter: InMemorySpanExporter = new InMemorySpanExporter(); + provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); + provider.register(); + opentelemetry.trace.setGlobalTracerProvider(provider); + + tracingPublisher.publish(buffer); + assert.ok(exporter.getFinishedSpans()); + }); + }); + describe('publishMessage', () => { const data = Buffer.from('hello, world!'); const spy = sandbox.spy(); @@ -266,6 +328,20 @@ describe('Publisher', () => { done(); }); }); + + it('should issue a warning if OpenTelemetry span context key is set', () => { + const warnSpy = sinon.spy(console, 'warn'); + const attributes = { + googclient_OpenTelemetrySpanContext: 'foobar', + }; + const fakeMessageWithOTKey = {data, attributes}; + const publisherTracing = new Publisher(topic, { + enableOpenTelemetryTracing: true, + }); + publisherTracing.publishMessage(fakeMessageWithOTKey, warnSpy); + assert.ok(warnSpy.called); + warnSpy.restore(); + }); }); }); @@ -299,6 +375,7 @@ describe('Publisher', () => { gaxOpts: { isBundling: false, }, + enableOpenTelemetryTracing: false, }); }); @@ -313,6 +390,7 @@ describe('Publisher', () => { gaxOpts: { isBundling: true, }, + enableOpenTelemetryTracing: true, }; publisher.setOptions(options); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 7b69a8d2a4a..82064954f33 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -22,6 +22,12 @@ import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {PassThrough} from 'stream'; import * as uuid from 'uuid'; +import { + SimpleSpanProcessor, + BasicTracerProvider, + InMemorySpanExporter, +} from '@opentelemetry/tracing'; +import * as opentelemetry from '@opentelemetry/api'; import {HistogramOptions} from '../src/histogram'; import {FlowControlOptions} from '../src/lease-manager'; @@ -631,6 +637,103 @@ describe('Subscriber', () => { }); }); + describe('OpenTelemetry tracing', () => { + let tracingSubscriber: s.Subscriber = {} as s.Subscriber; + const enableTracing: s.SubscriberOptions = { + enableOpenTelemetryTracing: true, + }; + const disableTracing: s.SubscriberOptions = { + enableOpenTelemetryTracing: false, + }; + + beforeEach(() => { + // Pre-define _tracing to gain access to the private field after subscriber init + tracingSubscriber['_tracing'] = undefined; + }); + + it('should not instantiate a tracer when tracing is disabled', () => { + tracingSubscriber = new Subscriber(subscription); + assert.strictEqual(tracingSubscriber['_tracing'], undefined); + }); + + it('should instantiate a tracer when tracing is enabled through constructor', () => { + tracingSubscriber = new Subscriber(subscription, enableTracing); + assert.ok(tracingSubscriber['_tracing']); + }); + + it('should instantiate a tracer when tracing is enabled through setOptions', () => { + tracingSubscriber = new Subscriber(subscription); + tracingSubscriber.setOptions(enableTracing); + assert.ok(tracingSubscriber['_tracing']); + }); + + it('should disable tracing when tracing is disabled through setOptions', () => { + tracingSubscriber = new Subscriber(subscription, enableTracing); + tracingSubscriber.setOptions(disableTracing); + assert.strictEqual(tracingSubscriber['_tracing'], undefined); + }); + + it('exports a span once it is created', () => { + tracingSubscriber = new Subscriber(subscription, enableTracing); + + // Setup trace exporting + const provider: BasicTracerProvider = new BasicTracerProvider(); + const exporter: InMemorySpanExporter = new InMemorySpanExporter(); + provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); + provider.register(); + opentelemetry.trace.setGlobalTracerProvider(provider); + + // Construct mock of received message with span context + const parentSpanContext: opentelemetry.SpanContext = { + traceId: 'd4cda95b652f4a1592b449d5929fda1b', + spanId: '6e0c63257de34c92', + traceFlags: opentelemetry.TraceFlags.SAMPLED, + }; + const messageWithSpanContext = { + ackId: uuid.v4(), + message: { + attributes: { + googclient_OpenTelemetrySpanContext: JSON.stringify( + parentSpanContext + ), + }, + data: Buffer.from('Hello, world!'), + messageId: uuid.v4(), + orderingKey: 'ordering-key', + publishTime: {seconds: 12, nanos: 32}, + }, + }; + const pullResponse: s.PullResponse = { + receivedMessages: [messageWithSpanContext], + }; + + // Receive message and assert that it was exported + const stream: FakeMessageStream = stubs.get('messageStream'); + stream.emit('data', pullResponse); + assert.ok(exporter.getFinishedSpans()); + }); + + it('does not export a span when a span context is not present on message', () => { + tracingSubscriber = new Subscriber(subscription, enableTracing); + + // Setup trace exporting + const provider: BasicTracerProvider = new BasicTracerProvider(); + const exporter: InMemorySpanExporter = new InMemorySpanExporter(); + provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); + provider.register(); + opentelemetry.trace.setGlobalTracerProvider(provider); + + const pullResponse: s.PullResponse = { + receivedMessages: [RECEIVED_MESSAGE], + }; + + // Receive message and assert that it was exported + const stream: FakeMessageStream = stubs.get('messageStream'); + stream.emit('data', pullResponse); + assert.strictEqual(exporter.getFinishedSpans().length, 0); + }); + }); + describe('Message', () => { describe('initialization', () => { it('should localize ackId', () => { From fac281e049ae0b6a6ac1930e7bbd20a97b1bf6ac Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 15 Aug 2020 18:06:10 +0200 Subject: [PATCH 0670/1115] fix(deps): update opentelemetry monorepo to ^0.10.0 (#1090) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index bdb076f472d..011ecde0f79 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,8 +53,8 @@ "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", - "@opentelemetry/api": "^0.9.0", - "@opentelemetry/tracing": "^0.9.0", + "@opentelemetry/api": "^0.10.0", + "@opentelemetry/tracing": "^0.10.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From 05e538c4bd9f14c2a545c13fe9e9731084b7c269 Mon Sep 17 00:00:00 2001 From: Kamal Aboul-Hosn Date: Mon, 17 Aug 2020 16:33:45 -0400 Subject: [PATCH 0671/1115] docs: Add and improve ordering keys examples (#1071) * chore: Remove notes about ordering keys being experimental. * feat: Add support for server-side flow control * Revert "chore: Remove notes about ordering keys being experimental." This reverts commit d02f328896628067ef071031ea3c56ca6b3c9da6. * docs: Add and improve ordering keys samples * Fix test format and documentation * Lint fixes Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/protos/protos.js | 144 ++++++---------------------- 1 file changed, 30 insertions(+), 114 deletions(-) diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index d24ee24953b..374b6140d5b 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -715,7 +715,7 @@ Topic.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key, value; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -723,26 +723,12 @@ message.name = reader.string(); break; case 2: + reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; - } - } - message.labels[key] = value; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); break; case 3: message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); @@ -1021,7 +1007,7 @@ PubsubMessage.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key, value; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -1029,26 +1015,12 @@ message.data = reader.bytes(); break; case 2: + reader.skip().pos++; if (message.attributes === $util.emptyObject) message.attributes = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; - } - } - message.attributes[key] = value; + key = reader.string(); + reader.pos++; + message.attributes[key] = reader.string(); break; case 3: message.messageId = reader.string(); @@ -4752,7 +4724,7 @@ Subscription.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key, value; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -4775,26 +4747,12 @@ message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); break; case 9: + reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; - } - } - message.labels[key] = value; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); break; case 10: message.enableMessageOrdering = reader.bool(); @@ -5791,7 +5749,7 @@ PushConfig.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key, value; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -5799,26 +5757,12 @@ message.pushEndpoint = reader.string(); break; case 2: + reader.skip().pos++; if (message.attributes === $util.emptyObject) message.attributes = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; - } - } - message.attributes[key] = value; + key = reader.string(); + reader.pos++; + message.attributes[key] = reader.string(); break; case 3: message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); @@ -9339,7 +9283,7 @@ CreateSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key, value; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -9350,26 +9294,12 @@ message.subscription = reader.string(); break; case 3: + reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; - } - } - message.labels[key] = value; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); break; default: reader.skipType(tag & 7); @@ -9838,7 +9768,7 @@ Snapshot.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key, value; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -9852,26 +9782,12 @@ message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); break; case 4: + reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; - } - } - message.labels[key] = value; + key = reader.string(); + reader.pos++; + message.labels[key] = reader.string(); break; default: reader.skipType(tag & 7); From a739545c33fecb793f3c6658c56069d560580f0b Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 17 Aug 2020 15:27:06 -0700 Subject: [PATCH 0672/1115] fix: update minimum gax version to 2.7.0 to fix recent protobuf errors (#1085) * fix: update google-gax minimum version to cover the protobuf changes, and commit those changes * fix: remove direct protobuf dependency since that's brought in through gax now * fix: protobufjs is still used in the tests for types Co-authored-by: Benjamin E. Coe --- handwritten/pubsub/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 011ecde0f79..883525ae292 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -60,11 +60,10 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^6.0.0", - "google-gax": "^2.1.0", + "google-gax": "^2.7.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", - "p-defer": "^3.0.0", - "protobufjs": "^6.8.1" + "p-defer": "^3.0.0" }, "devDependencies": { "@grpc/proto-loader": "^0.5.4", @@ -91,6 +90,7 @@ "mv": "^2.1.1", "ncp": "^2.0.0", "null-loader": "^4.0.0", + "protobufjs": "^6.10.1", "proxyquire": "^2.0.0", "sinon": "^9.0.0", "tmp": "^0.2.0", From bcf700a6124d2303ecb5e74481ac44ba8716f8f1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 17 Aug 2020 16:00:29 -0700 Subject: [PATCH 0673/1115] chore: release 2.5.0 (#1089) * chore: updated samples/package.json [ci skip] * chore: updated CHANGELOG.md [ci skip] * chore: updated package.json Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 15 +++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index a76b3d237c0..7ebe66b2787 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,21 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.5.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.4.0...v2.5.0) (2020-08-17) + + +### Features + +* Opentelemetry integration ([#1078](https://www.github.com/googleapis/nodejs-pubsub/issues/1078)) ([76db007](https://www.github.com/googleapis/nodejs-pubsub/commit/76db007f270a646e8570768fa827ea2a97b62cbc)), closes [#1066](https://www.github.com/googleapis/nodejs-pubsub/issues/1066) [#1070](https://www.github.com/googleapis/nodejs-pubsub/issues/1070) + + +### Bug Fixes + +* make request batching work again ([#1087](https://www.github.com/googleapis/nodejs-pubsub/issues/1087)) ([80e0ee3](https://www.github.com/googleapis/nodejs-pubsub/commit/80e0ee3a4ef0da325e61ce2b869f4c0f9829b136)) +* properly handle non-emulator alternate endpoints for pub/sub ([#1060](https://www.github.com/googleapis/nodejs-pubsub/issues/1060)) ([195ebf6](https://www.github.com/googleapis/nodejs-pubsub/commit/195ebf648e00ba35f567cef06a06c31f3f9c57d9)) +* **deps:** update opentelemetry monorepo to ^0.10.0 ([#1090](https://www.github.com/googleapis/nodejs-pubsub/issues/1090)) ([78a45ff](https://www.github.com/googleapis/nodejs-pubsub/commit/78a45ff1cb8fb921e5ca05e435554d684a777185)) +* update minimum gax version to 2.7.0 to fix recent protobuf errors ([#1085](https://www.github.com/googleapis/nodejs-pubsub/issues/1085)) ([904348c](https://www.github.com/googleapis/nodejs-pubsub/commit/904348cd6471f267a54635fcd65fe4191896308e)) + ## [2.4.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.3.0...v2.4.0) (2020-08-08) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 883525ae292..269bc23e8fe 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.4.0", + "version": "2.5.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 96ead44e3ac54011c104673a9eb5e7ed58a3e3cf Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 18 Aug 2020 08:11:40 -0700 Subject: [PATCH 0674/1115] docs: add detach subscription sample link to README (#1065) --- handwritten/pubsub/README.md | 3 + handwritten/pubsub/protos/protos.js | 144 ++++++++++++++++++++++------ handwritten/pubsub/synth.metadata | 4 +- 3 files changed, 119 insertions(+), 32 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 10d218f5974..c4893df9203 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -109,6 +109,7 @@ has instructions for running the samples. | Create Push Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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/master/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 Subscription with ordering enabled | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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) | | Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | | Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | @@ -123,6 +124,7 @@ has instructions for running the samples. | Listen For Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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 For Ordered Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listenForOrderedMessages.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/listenForOrderedMessages.js,samples/README.md) | | Modify Push Configuration | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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) | +| OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/opentelemetryTracing.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/opentelemetryTracing.js,samples/README.md) | | Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | | Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessage.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/publishMessage.js,samples/README.md) | | Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | @@ -130,6 +132,7 @@ has instructions for running the samples. | Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | | Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/quickstart.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/quickstart.js,samples/README.md) | | Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | +| Resume Publish | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/resumePublish.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/resumePublish.js,samples/README.md) | | Set Subscription IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setSubscriptionPolicy.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/setSubscriptionPolicy.js,samples/README.md) | | Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | | Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 374b6140d5b..d24ee24953b 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -715,7 +715,7 @@ Topic.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -723,12 +723,26 @@ message.name = reader.string(); break; case 2: - reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.labels[key] = value; break; case 3: message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); @@ -1007,7 +1021,7 @@ PubsubMessage.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -1015,12 +1029,26 @@ message.data = reader.bytes(); break; case 2: - reader.skip().pos++; if (message.attributes === $util.emptyObject) message.attributes = {}; - key = reader.string(); - reader.pos++; - message.attributes[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.attributes[key] = value; break; case 3: message.messageId = reader.string(); @@ -4724,7 +4752,7 @@ Subscription.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -4747,12 +4775,26 @@ message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); break; case 9: - reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.labels[key] = value; break; case 10: message.enableMessageOrdering = reader.bool(); @@ -5749,7 +5791,7 @@ PushConfig.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -5757,12 +5799,26 @@ message.pushEndpoint = reader.string(); break; case 2: - reader.skip().pos++; if (message.attributes === $util.emptyObject) message.attributes = {}; - key = reader.string(); - reader.pos++; - message.attributes[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.attributes[key] = value; break; case 3: message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); @@ -9283,7 +9339,7 @@ CreateSnapshotRequest.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -9294,12 +9350,26 @@ message.subscription = reader.string(); break; case 3: - reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.labels[key] = value; break; default: reader.skipType(tag & 7); @@ -9768,7 +9838,7 @@ Snapshot.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key; + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -9782,12 +9852,26 @@ message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); break; case 4: - reader.skip().pos++; if (message.labels === $util.emptyObject) message.labels = {}; - key = reader.string(); - reader.pos++; - message.labels[key] = reader.string(); + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.labels[key] = value; break; default: reader.skipType(tag & 7); diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 8963630d11e..b14963a9bb0 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -3,8 +3,8 @@ { "git": { "name": ".", - "remote": "git@github.com:googleapis/nodejs-pubsub.git", - "sha": "869ecc992bbee934ee630e7f38d7e88234c9e80a" + "remote": "https://github.com/googleapis/nodejs-pubsub.git", + "sha": "2d33358c0329f84741aa3e787c164a7bdef54845" } }, { From 988d25eec6ad8ce00e384a1a861836ecef0389be Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 19 Aug 2020 09:42:25 -0700 Subject: [PATCH 0675/1115] chore: start tracking obsolete files (#1092) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/7a1b0b96-8ddb-4836-a1a2-d2f73b7e6ffe/targets - [ ] To automatically regenerate this PR, check this box. --- handwritten/pubsub/synth.metadata | 80 +++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index b14963a9bb0..d835cfb0e8d 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "2d33358c0329f84741aa3e787c164a7bdef54845" + "sha": "8981113753728d3f64b06f14a85956aac8f18fb8" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "874846a1917ee5c3fe271449f3cb9a06e75407be", - "internalRef": "326288259" + "sha": "4c5071b615d96ef9dfd6a63d8429090f1f2872bb", + "internalRef": "327369997" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5747555f7620113d9a2078a48f4c047a99d31b3e" + "sha": "1a60ff2a3975c2f5054431588bd95db9c3b862ba" } } ], @@ -33,5 +33,77 @@ "generator": "bazel" } } + ], + "generatedFiles": [ + ".eslintignore", + ".eslintrc.json", + ".gitattributes", + ".github/ISSUE_TEMPLATE/bug_report.md", + ".github/ISSUE_TEMPLATE/feature_request.md", + ".github/ISSUE_TEMPLATE/support_request.md", + ".github/PULL_REQUEST_TEMPLATE.md", + ".github/publish.yml", + ".github/release-please.yml", + ".github/workflows/ci.yaml", + ".gitignore", + ".jsdoc.js", + ".kokoro/.gitattributes", + ".kokoro/common.cfg", + ".kokoro/continuous/node10/common.cfg", + ".kokoro/continuous/node10/docs.cfg", + ".kokoro/continuous/node10/lint.cfg", + ".kokoro/continuous/node10/samples-test.cfg", + ".kokoro/continuous/node10/system-test.cfg", + ".kokoro/continuous/node10/test.cfg", + ".kokoro/continuous/node12/common.cfg", + ".kokoro/continuous/node12/test.cfg", + ".kokoro/docs.sh", + ".kokoro/lint.sh", + ".kokoro/populate-secrets.sh", + ".kokoro/presubmit/node10/common.cfg", + ".kokoro/presubmit/node10/samples-test.cfg", + ".kokoro/presubmit/node10/system-test.cfg", + ".kokoro/presubmit/node12/common.cfg", + ".kokoro/presubmit/node12/test.cfg", + ".kokoro/publish.sh", + ".kokoro/release/docs-devsite.cfg", + ".kokoro/release/docs-devsite.sh", + ".kokoro/release/docs.cfg", + ".kokoro/release/docs.sh", + ".kokoro/release/publish.cfg", + ".kokoro/samples-test.sh", + ".kokoro/system-test.sh", + ".kokoro/test.bat", + ".kokoro/test.sh", + ".kokoro/trampoline.sh", + ".mocharc.js", + ".nycrc", + ".prettierignore", + ".prettierrc.js", + "CODE_OF_CONDUCT.md", + "CONTRIBUTING.md", + "LICENSE", + "README.md", + "api-extractor.json", + "linkinator.config.json", + "package-lock.json.4066392497", + "protos/google/pubsub/v1/pubsub.proto", + "protos/protos.d.ts", + "protos/protos.js", + "protos/protos.json", + "renovate.json", + "samples/README.md", + "samples/package-lock.json.485022242", + "src/v1/index.ts", + "src/v1/publisher_client.ts", + "src/v1/publisher_client_config.json", + "src/v1/publisher_proto_list.json", + "src/v1/subscriber_client.ts", + "src/v1/subscriber_client_config.json", + "src/v1/subscriber_proto_list.json", + "test/gapic_publisher_v1.ts", + "test/gapic_subscriber_v1.ts", + "tsconfig.json", + "webpack.config.js" ] } \ No newline at end of file From e9d32507162c625899bec6e15f5b59a20e4333ce Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 21 Aug 2020 14:12:00 -0700 Subject: [PATCH 0676/1115] fix: move system and samples test from Node 10 to Node 12 (#1094) Source-Author: sofisl <55454395+sofisl@users.noreply.github.com> Source-Date: Thu Aug 20 18:29:50 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: 05de3e1e14a0b07eab8b474e669164dbd31f81fb Source-Link: https://github.com/googleapis/synthtool/commit/05de3e1e14a0b07eab8b474e669164dbd31f81fb --- .../continuous/{node10 => node12}/lint.cfg | 0 .../{node10 => node12}/samples-test.cfg | 0 .../{node10 => node12}/system-test.cfg | 0 .../{node10 => node12}/samples-test.cfg | 0 .../presubmit/{node10 => node12}/system-test.cfg | 0 handwritten/pubsub/synth.metadata | 16 +++++++--------- 6 files changed, 7 insertions(+), 9 deletions(-) rename handwritten/pubsub/.kokoro/continuous/{node10 => node12}/lint.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node10 => node12}/samples-test.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node10 => node12}/system-test.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node10 => node12}/samples-test.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node10 => node12}/system-test.cfg (100%) diff --git a/handwritten/pubsub/.kokoro/continuous/node10/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node12/lint.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node10/lint.cfg rename to handwritten/pubsub/.kokoro/continuous/node12/lint.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node10/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node10/samples-test.cfg rename to handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node10/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node10/system-test.cfg rename to handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node10/samples-test.cfg rename to handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node10/system-test.cfg rename to handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index d835cfb0e8d..098b5ebc170 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "8981113753728d3f64b06f14a85956aac8f18fb8" + "sha": "6e8b2316dd88499aecfe7eb15cfd76af3e6a9e9e" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1a60ff2a3975c2f5054431588bd95db9c3b862ba" + "sha": "05de3e1e14a0b07eab8b474e669164dbd31f81fb" } } ], @@ -51,19 +51,19 @@ ".kokoro/common.cfg", ".kokoro/continuous/node10/common.cfg", ".kokoro/continuous/node10/docs.cfg", - ".kokoro/continuous/node10/lint.cfg", - ".kokoro/continuous/node10/samples-test.cfg", - ".kokoro/continuous/node10/system-test.cfg", ".kokoro/continuous/node10/test.cfg", ".kokoro/continuous/node12/common.cfg", + ".kokoro/continuous/node12/lint.cfg", + ".kokoro/continuous/node12/samples-test.cfg", + ".kokoro/continuous/node12/system-test.cfg", ".kokoro/continuous/node12/test.cfg", ".kokoro/docs.sh", ".kokoro/lint.sh", ".kokoro/populate-secrets.sh", ".kokoro/presubmit/node10/common.cfg", - ".kokoro/presubmit/node10/samples-test.cfg", - ".kokoro/presubmit/node10/system-test.cfg", ".kokoro/presubmit/node12/common.cfg", + ".kokoro/presubmit/node12/samples-test.cfg", + ".kokoro/presubmit/node12/system-test.cfg", ".kokoro/presubmit/node12/test.cfg", ".kokoro/publish.sh", ".kokoro/release/docs-devsite.cfg", @@ -86,14 +86,12 @@ "README.md", "api-extractor.json", "linkinator.config.json", - "package-lock.json.4066392497", "protos/google/pubsub/v1/pubsub.proto", "protos/protos.d.ts", "protos/protos.js", "protos/protos.json", "renovate.json", "samples/README.md", - "samples/package-lock.json.485022242", "src/v1/index.ts", "src/v1/publisher_client.ts", "src/v1/publisher_client_config.json", From 385c70241300a30aa45e20974649acb00791b18c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 28 Aug 2020 10:18:09 -0700 Subject: [PATCH 0677/1115] build: track flaky tests for "nightly", add new secrets for tagging (#1099) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/36077dab-6428-471f-9375-a14a1a227f45/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/8cf6d2834ad14318e64429c3b94f6443ae83daf9 --- handwritten/pubsub/.github/publish.yml | 0 handwritten/pubsub/.kokoro/release/publish.cfg | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- handwritten/pubsub/synth.metadata | 5 ++--- 6 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 handwritten/pubsub/.github/publish.yml diff --git a/handwritten/pubsub/.github/publish.yml b/handwritten/pubsub/.github/publish.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index e3ab2b51deb..221c8995934 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -49,7 +49,7 @@ before_action { env_vars: { key: "SECRET_MANAGER_KEYS" - value: "npm_publish_token" + value: "npm_publish_token,releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 86e83c9d3da..c0c40139cb7 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -41,7 +41,7 @@ if [ -f samples/package.json ]; then cd .. # If tests are running against master, configure Build Cop # to open issues on failures: - if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then + if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml export MOCHA_REPORTER=xunit cleanup() { diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index dfae142a231..283f1700fef 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -35,7 +35,7 @@ npm install # If tests are running against master, configure Build Cop # to open issues on failures: -if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then +if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml export MOCHA_REPORTER=xunit cleanup() { diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 8d9c2954579..47be59b987c 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -23,7 +23,7 @@ cd $(dirname $0)/.. npm install # If tests are running against master, configure Build Cop # to open issues on failures: -if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then +if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml export MOCHA_REPORTER=xunit cleanup() { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 098b5ebc170..adc8750a507 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "6e8b2316dd88499aecfe7eb15cfd76af3e6a9e9e" + "sha": "693116afb3776a8696c52d890edf9a57423896dc" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "05de3e1e14a0b07eab8b474e669164dbd31f81fb" + "sha": "8cf6d2834ad14318e64429c3b94f6443ae83daf9" } } ], @@ -42,7 +42,6 @@ ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", - ".github/publish.yml", ".github/release-please.yml", ".github/workflows/ci.yaml", ".gitignore", From 0dd760daa8a43d6f6b758467b3d6c4b261cdf526 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 3 Sep 2020 23:14:01 +0200 Subject: [PATCH 0678/1115] fix(deps): update opentelemetry monorepo to ^0.11.0 (#1102) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 269bc23e8fe..016b8284732 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,8 +53,8 @@ "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", - "@opentelemetry/api": "^0.10.0", - "@opentelemetry/tracing": "^0.10.0", + "@opentelemetry/api": "^0.11.0", + "@opentelemetry/tracing": "^0.11.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From a507daf7cabafca5d2c2a92876dc806c18c20ee7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 9 Sep 2020 19:04:17 +0200 Subject: [PATCH 0679/1115] chore(deps): update dependency yargs to v16 (#1107) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [yargs](https://yargs.js.org/) ([source](https://togithub.com/yargs/yargs)) | devDependencies | major | [`^15.0.0` -> `^16.0.0`](https://renovatebot.com/diffs/npm/yargs/15.4.1/16.0.1) | --- ### Release Notes
yargs/yargs ### [`v16.0.1`](https://togithub.com/yargs/yargs/blob/master/CHANGELOG.md#​1601-httpswwwgithubcomyargsyargscomparev1600v1601-2020-09-09) [Compare Source](https://togithub.com/yargs/yargs/compare/v16.0.0...v16.0.1) ### [`v16.0.0`](https://togithub.com/yargs/yargs/blob/master/CHANGELOG.md#​1600-httpswwwgithubcomyargsyargscomparev1542v1600-2020-09-09) [Compare Source](https://togithub.com/yargs/yargs/compare/v15.4.1...v16.0.0) ##### ⚠ BREAKING CHANGES - tweaks to ESM/Deno API surface: now exports yargs function by default; getProcessArgvWithoutBin becomes hideBin; types now exported for Deno. - find-up replaced with escalade; export map added (limits importable files in Node >= 12); yarser-parser@19.x.x (new decamelize/camelcase implementation). - **usage:** single character aliases are now shown first in help output - rebase helper is no longer provided on yargs instance. - drop support for EOL Node 8 ([#​1686](https://togithub.com/yargs/yargs/issues/1686)) ##### Features - adds strictOptions() ([#​1738](https://www.github.com/yargs/yargs/issues/1738)) ([b215fba](https://www.github.com/yargs/yargs/commit/b215fba0ed6e124e5aad6cf22c8d5875661c63a3)) - **helpers:** rebase, Parser, applyExtends now blessed helpers ([#​1733](https://www.github.com/yargs/yargs/issues/1733)) ([c7debe8](https://www.github.com/yargs/yargs/commit/c7debe8eb1e5bc6ea20b5ed68026c56e5ebec9e1)) - adds support for ESM and Deno ([#​1708](https://www.github.com/yargs/yargs/issues/1708)) ([ac6d5d1](https://www.github.com/yargs/yargs/commit/ac6d5d105a75711fe703f6a39dad5181b383d6c6)) - drop support for EOL Node 8 ([#​1686](https://www.github.com/yargs/yargs/issues/1686)) ([863937f](https://www.github.com/yargs/yargs/commit/863937f23c3102f804cdea78ee3097e28c7c289f)) - i18n for ESM and Deno ([#​1735](https://www.github.com/yargs/yargs/issues/1735)) ([c71783a](https://www.github.com/yargs/yargs/commit/c71783a5a898a0c0e92ac501c939a3ec411ac0c1)) - tweaks to API surface based on user feedback ([#​1726](https://www.github.com/yargs/yargs/issues/1726)) ([4151fee](https://www.github.com/yargs/yargs/commit/4151fee4c33a97d26bc40de7e623e5b0eb87e9bb)) - **usage:** single char aliases first in help ([#​1574](https://www.github.com/yargs/yargs/issues/1574)) ([a552990](https://www.github.com/yargs/yargs/commit/a552990c120646c2d85a5c9b628e1ce92a68e797)) ##### Bug Fixes - **yargs:** add missing command(module) signature ([#​1707](https://www.github.com/yargs/yargs/issues/1707)) ([0f81024](https://www.github.com/yargs/yargs/commit/0f810245494ccf13a35b7786d021b30fc95ecad5)), closes [#​1704](https://www.github.com/yargs/yargs/issues/1704)
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 016b8284732..ed8dde58493 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -99,7 +99,7 @@ "uuid": "^8.0.0", "webpack": "^4.42.0", "webpack-cli": "^3.3.11", - "yargs": "^15.0.0", + "yargs": "^16.0.0", "@microsoft/api-documenter": "^7.8.10", "@microsoft/api-extractor": "^7.8.10" } From 264a19316ca17f15c10eb32a2bf05c175617cd22 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Fri, 11 Sep 2020 18:46:49 -0700 Subject: [PATCH 0680/1115] build: test config updates (#1108) --- handwritten/pubsub/.mocharc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.mocharc.js b/handwritten/pubsub/.mocharc.js index ff7b34fa5d1..0b600509bed 100644 --- a/handwritten/pubsub/.mocharc.js +++ b/handwritten/pubsub/.mocharc.js @@ -14,7 +14,8 @@ const config = { "enable-source-maps": true, "throw-deprecation": true, - "timeout": 10000 + "timeout": 10000, + "recursive": true } if (process.env.MOCHA_THROW_DEPRECATION === 'false') { delete config['throw-deprecation']; From 464b43571138cc360f6a1319843ef32ef19ff39b Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 21 Sep 2020 16:42:38 -0700 Subject: [PATCH 0681/1115] docs: maxRetries no longer exists on the ClientConfig interface for the PubSub object (#1110) --- handwritten/pubsub/src/pubsub.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 8a8171f70df..e697a976221 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -203,8 +203,6 @@ interface GetClientCallback { * @property {boolean} [autoRetry=true] Automatically retry requests if the * response is related to rate limits or certain intermittent server errors. * We will exponentially backoff subsequent requests by default. - * @property {number} [maxRetries=3] Maximum number of automatic retries - * attempted before returning the error. * @property {Constructor} [promise] Custom promise module to use instead of * native Promises. */ From 1c40a6c06a81a9a7dc12344856f0c3daaaedcbd2 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 28 Sep 2020 16:04:25 -0700 Subject: [PATCH 0682/1115] tests: fix zalgo flakiness in seek tests, and convert them to async/promises to make the logic more rigorous (#1112) --- handwritten/pubsub/system-test/pubsub.ts | 126 ++++++++++++++--------- 1 file changed, 76 insertions(+), 50 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 83ec943ee1c..31039e7de09 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -873,52 +873,71 @@ describe('pubsub', () => { let subscription: Subscription; let snapshot: Snapshot; let messageId: string; + let errorPromise: Promise<{}>; beforeEach(async () => { subscription = topic.subscription(generateSubName()); snapshot = subscription.snapshot(generateSnapshotName()); - return subscription - .create() - .then(() => { - return snapshot.create(); - }) - .then(() => { - return topic.publish(Buffer.from('Hello, world!')); - }) - .then((_messageId: string) => { - messageId = _messageId; - }); + await subscription.create(); + await snapshot.create(); + + errorPromise = new Promise((_, reject) => + subscription.on('error', reject) + ); }); - it('should seek to a snapshot', done => { + // This creates a Promise that hooks the 'message' callback of the + // subscription above, and resolves when that callback calls `resolve`. + type WorkCallback = (arg: T, resolve: Function) => void; + function makeMessagePromise( + workCallback: WorkCallback + ): Promise { + return new Promise(resolve => { + subscription.on('message', (arg: T) => { + workCallback(arg, resolve); + }); + }); + } + + async function publishTestMessage() { + messageId = await topic.publish(Buffer.from('Hello, world!')); + } + + it('should seek to a snapshot', async () => { let messageCount = 0; - subscription.on('error', done); - subscription.on('message', (message: {id: string; ack: () => void}) => { - if (message.id !== messageId) { - return; - } - message.ack(); + type EventParameter = {id: string; ack: () => void}; + const messagePromise = makeMessagePromise( + async (message: EventParameter, resolve) => { + if (message.id !== messageId) { + return; + } + message.ack(); - if (++messageCount === 1) { - snapshot!.seek(assert.ifError); - return; + if (++messageCount === 1) { + await snapshot!.seek(); + return; + } + + assert.strictEqual(messageCount, 2); + await subscription.close(); + + resolve(); } + ); - assert.strictEqual(messageCount, 2); - subscription.close(done); - }); + await publishTestMessage(); + await Promise.race([errorPromise, messagePromise]); }); - it('should seek to a date', done => { + it('should seek to a date', async () => { let messageCount = 0; - subscription.on('error', done); - subscription.on( - 'message', - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (message: {id: string; ack: () => void; publishTime: any}) => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + type EventParameter = {id: string; ack: () => void; publishTime: any}; + const messagePromise = makeMessagePromise( + async (message: EventParameter, resolve) => { if (message.id !== messageId) { return; } @@ -936,36 +955,43 @@ describe('pubsub', () => { } assert.strictEqual(messageCount, 2); - subscription.close(done); + await subscription.close(); + + resolve(); } ); + + await publishTestMessage(); + await Promise.race([errorPromise, messagePromise]); }); - it('should seek to a future date (purge)', done => { + it('should seek to a future date (purge)', async () => { const testText = 'Oh no!'; + await publishTestMessage(); + // Forward-seek to remove any messages from the queue (those were // placed there in before()). // // We... probably won't be using this in 3000? - subscription - .seek(new Date('3000-01-01')) - .then(() => { - // Drop a second message and make sure it's the right ID. - return topic.publish(Buffer.from(testText)); - }) - .then(() => { - subscription.on('error', done); - subscription.on( - 'message', - (message: {data: {toString: () => string}; ack: () => void}) => { - // If we get the default message from before() then this fails. - assert.equal(message.data.toString(), testText); - message.ack(); - subscription.close(done); - } - ); - }); + await subscription.seek(new Date('3000-01-01')); + + // Drop a second message and make sure it's the right ID. + await topic.publish(Buffer.from(testText)); + + type EventParameter = {data: {toString: () => string}; ack: () => void}; + const messagePromise = makeMessagePromise( + async (message: EventParameter, resolve) => { + // If we get the default message from before() then this fails. + assert.equal(message.data.toString(), testText); + message.ack(); + await subscription.close(); + + resolve(); + } + ); + + await Promise.race([errorPromise, messagePromise]); }); }); }); From 7fa5f2cf8292e8301da9bbc17cd9af6ae8094648 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 1 Oct 2020 13:22:11 -0700 Subject: [PATCH 0683/1115] chore: update bucket for cloud-rad (#1118) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/d5dc594d-067f-40c2-83fa-c3be5360d1dd/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/079dcce498117f9570cebe6e6cff254b38ba3860 Source-Link: https://github.com/googleapis/synthtool/commit/fdd03c161003ab97657cc0218f25c82c89ddf4b6 --- handwritten/pubsub/.kokoro/release/docs-devsite.sh | 2 +- handwritten/pubsub/synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh index fa089cf290e..458fe4f9062 100755 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.sh +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -61,7 +61,7 @@ if [[ -z "$CREDENTIALS" ]]; then CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account fi if [[ -z "$BUCKET" ]]; then - BUCKET=docs-staging-v2-staging + BUCKET=docs-staging-v2 fi python3 -m docuploader upload ./_devsite --destination-prefix docfx --credentials $CREDENTIALS --staging-bucket $BUCKET diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index adc8750a507..1068dbc2e95 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "693116afb3776a8696c52d890edf9a57423896dc" + "sha": "ee2081b568d022eea9a694a81ad4b725c465f5b6" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8cf6d2834ad14318e64429c3b94f6443ae83daf9" + "sha": "079dcce498117f9570cebe6e6cff254b38ba3860" } } ], From 341ded6f03cee3192544f162c83446c833d424ea Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 7 Oct 2020 20:41:53 -0700 Subject: [PATCH 0684/1115] build(node_library): migrate to Trampoline V2 (#1120) Source-Author: Takashi Matsuo Source-Date: Fri Oct 2 12:13:27 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: 0c868d49b8e05bc1f299bc773df9eb4ef9ed96e9 Source-Link: https://github.com/googleapis/synthtool/commit/0c868d49b8e05bc1f299bc773df9eb4ef9ed96e9 --- handwritten/pubsub/.kokoro/common.cfg | 2 +- .../.kokoro/continuous/node10/common.cfg | 2 +- .../.kokoro/continuous/node12/common.cfg | 2 +- handwritten/pubsub/.kokoro/docs.sh | 2 +- handwritten/pubsub/.kokoro/lint.sh | 2 +- .../pubsub/.kokoro/populate-secrets.sh | 65 ++- .../.kokoro/presubmit/node10/common.cfg | 2 +- .../.kokoro/presubmit/node12/common.cfg | 2 +- handwritten/pubsub/.kokoro/publish.sh | 2 +- .../pubsub/.kokoro/release/docs-devsite.cfg | 2 +- .../pubsub/.kokoro/release/docs-devsite.sh | 4 +- handwritten/pubsub/.kokoro/release/docs.cfg | 2 +- handwritten/pubsub/.kokoro/release/docs.sh | 4 +- .../pubsub/.kokoro/release/publish.cfg | 6 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- handwritten/pubsub/.kokoro/trampoline.sh | 4 + handwritten/pubsub/.kokoro/trampoline_v2.sh | 488 ++++++++++++++++++ handwritten/pubsub/.trampolinerc | 51 ++ handwritten/pubsub/synth.metadata | 6 +- 21 files changed, 616 insertions(+), 38 deletions(-) create mode 100755 handwritten/pubsub/.kokoro/trampoline_v2.sh create mode 100644 handwritten/pubsub/.trampolinerc diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index abfbbfb207d..17b223296fc 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -11,7 +11,7 @@ action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { diff --git a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg index 43ee965c88c..a52f5a1240d 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg @@ -21,7 +21,7 @@ before_action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { diff --git a/handwritten/pubsub/.kokoro/continuous/node12/common.cfg b/handwritten/pubsub/.kokoro/continuous/node12/common.cfg index f5f54f91e51..821605f9662 100644 --- a/handwritten/pubsub/.kokoro/continuous/node12/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node12/common.cfg @@ -11,7 +11,7 @@ action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { diff --git a/handwritten/pubsub/.kokoro/docs.sh b/handwritten/pubsub/.kokoro/docs.sh index 952403faede..85901242b5e 100755 --- a/handwritten/pubsub/.kokoro/docs.sh +++ b/handwritten/pubsub/.kokoro/docs.sh @@ -16,7 +16,7 @@ set -eo pipefail -export NPM_CONFIG_PREFIX=/home/node/.npm-global +export NPM_CONFIG_PREFIX=${HOME}/.npm-global cd $(dirname $0)/.. diff --git a/handwritten/pubsub/.kokoro/lint.sh b/handwritten/pubsub/.kokoro/lint.sh index b03cb0439a6..aef4866e4c4 100755 --- a/handwritten/pubsub/.kokoro/lint.sh +++ b/handwritten/pubsub/.kokoro/lint.sh @@ -16,7 +16,7 @@ set -eo pipefail -export NPM_CONFIG_PREFIX=/home/node/.npm-global +export NPM_CONFIG_PREFIX=${HOME}/.npm-global cd $(dirname $0)/.. diff --git a/handwritten/pubsub/.kokoro/populate-secrets.sh b/handwritten/pubsub/.kokoro/populate-secrets.sh index 6f9d228859d..deb2b199eb4 100755 --- a/handwritten/pubsub/.kokoro/populate-secrets.sh +++ b/handwritten/pubsub/.kokoro/populate-secrets.sh @@ -13,31 +13,64 @@ # See the License for the specific language governing permissions and # limitations under the License. +# This file is called in the early stage of `trampoline_v2.sh` to +# populate secrets needed for the CI builds. + set -eo pipefail function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;} function msg { println "$*" >&2 ;} function println { printf '%s\n' "$(now) $*" ;} +# Populates requested secrets set in SECRET_MANAGER_KEYS + +# In Kokoro CI builds, we use the service account attached to the +# Kokoro VM. This means we need to setup auth on other CI systems. +# For local run, we just use the gcloud command for retrieving the +# secrets. + +if [[ "${RUNNING_IN_CI:-}" == "true" ]]; then + GCLOUD_COMMANDS=( + "docker" + "run" + "--entrypoint=gcloud" + "--volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR}" + "gcr.io/google.com/cloudsdktool/cloud-sdk" + ) + if [[ "${TRAMPOLINE_CI:-}" == "kokoro" ]]; then + SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" + else + echo "Authentication for this CI system is not implemented yet." + exit 2 + # TODO: Determine appropriate SECRET_LOCATION and the GCLOUD_COMMANDS. + fi +else + # For local run, use /dev/shm or temporary directory for + # KOKORO_GFILE_DIR. + if [[ -d "/dev/shm" ]]; then + export KOKORO_GFILE_DIR=/dev/shm + else + export KOKORO_GFILE_DIR=$(mktemp -d -t ci-XXXXXXXX) + fi + SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" + GCLOUD_COMMANDS=("gcloud") +fi -# Populates requested secrets set in SECRET_MANAGER_KEYS from service account: -# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com -SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" msg "Creating folder on disk for secrets: ${SECRET_LOCATION}" mkdir -p ${SECRET_LOCATION} + for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g") do - msg "Retrieving secret ${key}" - docker run --entrypoint=gcloud \ - --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \ - gcr.io/google.com/cloudsdktool/cloud-sdk \ - secrets versions access latest \ - --project cloud-devrel-kokoro-resources \ - --secret $key > \ - "$SECRET_LOCATION/$key" - if [[ $? == 0 ]]; then - msg "Secret written to ${SECRET_LOCATION}/${key}" - else - msg "Error retrieving secret ${key}" - fi + msg "Retrieving secret ${key}" + "${GCLOUD_COMMANDS[@]}" \ + secrets versions access latest \ + --project cloud-devrel-kokoro-resources \ + --secret $key > \ + "$SECRET_LOCATION/$key" + if [[ $? == 0 ]]; then + msg "Secret written to ${SECRET_LOCATION}/${key}" + else + msg "Error retrieving secret ${key}" + exit 2 + fi done diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg index 43ee965c88c..a52f5a1240d 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg @@ -21,7 +21,7 @@ before_action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { diff --git a/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg index f5f54f91e51..821605f9662 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg @@ -11,7 +11,7 @@ action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh index f056d861729..4db6bf1c7f5 100755 --- a/handwritten/pubsub/.kokoro/publish.sh +++ b/handwritten/pubsub/.kokoro/publish.sh @@ -16,7 +16,7 @@ set -eo pipefail -export NPM_CONFIG_PREFIX=/home/node/.npm-global +export NPM_CONFIG_PREFIX=${HOME}/.npm-global # Start the releasetool reporter python3 -m pip install gcp-releasetool diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg index f1f4e0a4947..2e945a41cd5 100644 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg @@ -18,7 +18,7 @@ env_vars: { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh index 458fe4f9062..0d11b7ae951 100755 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.sh +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -20,8 +20,8 @@ set -eo pipefail if [[ -z "$CREDENTIALS" ]]; then # if CREDENTIALS are explicitly set, assume we're testing locally # and don't set NPM_CONFIG_PREFIX. - export NPM_CONFIG_PREFIX=/home/node/.npm-global - export PATH="$PATH:/home/node/.npm-global/bin" + export NPM_CONFIG_PREFIX=${HOME}/.npm-global + export PATH="$PATH:${NPM_CONFIG_PREFIX}/bin" cd $(dirname $0)/../.. fi diff --git a/handwritten/pubsub/.kokoro/release/docs.cfg b/handwritten/pubsub/.kokoro/release/docs.cfg index 178ab697396..a43443b994f 100644 --- a/handwritten/pubsub/.kokoro/release/docs.cfg +++ b/handwritten/pubsub/.kokoro/release/docs.cfg @@ -18,7 +18,7 @@ env_vars: { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/release/docs.sh b/handwritten/pubsub/.kokoro/release/docs.sh index 4d3a0868531..4c866c86000 100755 --- a/handwritten/pubsub/.kokoro/release/docs.sh +++ b/handwritten/pubsub/.kokoro/release/docs.sh @@ -20,8 +20,8 @@ set -eo pipefail if [[ -z "$CREDENTIALS" ]]; then # if CREDENTIALS are explicitly set, assume we're testing locally # and don't set NPM_CONFIG_PREFIX. - export NPM_CONFIG_PREFIX=/home/node/.npm-global - export PATH="$PATH:/home/node/.npm-global/bin" + export NPM_CONFIG_PREFIX=${HOME}/.npm-global + export PATH="$PATH:${NPM_CONFIG_PREFIX}/bin" cd $(dirname $0)/../.. fi npm install diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 221c8995934..773936beca5 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -27,7 +27,7 @@ before_action { } } -# Fetch magictoken to use with Magic Github Proxy +# Fetch magictoken to use with Magic Github Proxy before_action { fetch_keystore { keystore_resource { @@ -37,7 +37,7 @@ before_action { } } -# Fetch api key to use with Magic Github Proxy +# Fetch api key to use with Magic Github Proxy before_action { fetch_keystore { keystore_resource { @@ -56,7 +56,7 @@ env_vars: { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index c0c40139cb7..bab7ba4e967 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -16,7 +16,7 @@ set -eo pipefail -export NPM_CONFIG_PREFIX=/home/node/.npm-global +export NPM_CONFIG_PREFIX=${HOME}/.npm-global # Setup service account credentials. export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 283f1700fef..8a08400484a 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -16,7 +16,7 @@ set -eo pipefail -export NPM_CONFIG_PREFIX=/home/node/.npm-global +export NPM_CONFIG_PREFIX=${HOME}/.npm-global # Setup service account credentials. export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 47be59b987c..5be385fef64 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -16,7 +16,7 @@ set -eo pipefail -export NPM_CONFIG_PREFIX=/home/node/.npm-global +export NPM_CONFIG_PREFIX=${HOME}/.npm-global cd $(dirname $0)/.. diff --git a/handwritten/pubsub/.kokoro/trampoline.sh b/handwritten/pubsub/.kokoro/trampoline.sh index a4241db23f4..f693a1ce7aa 100755 --- a/handwritten/pubsub/.kokoro/trampoline.sh +++ b/handwritten/pubsub/.kokoro/trampoline.sh @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +# This file is not used any more, but we keep this file for making it +# easy to roll back. +# TODO: Remove this file from the template. + set -eo pipefail # Always run the cleanup script, regardless of the success of bouncing into diff --git a/handwritten/pubsub/.kokoro/trampoline_v2.sh b/handwritten/pubsub/.kokoro/trampoline_v2.sh new file mode 100755 index 00000000000..5ae75f977d7 --- /dev/null +++ b/handwritten/pubsub/.kokoro/trampoline_v2.sh @@ -0,0 +1,488 @@ +#!/usr/bin/env bash +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# trampoline_v2.sh +# +# If you want to make a change to this file, consider doing so at: +# https://github.com/googlecloudplatform/docker-ci-helper +# +# This script is for running CI builds. For Kokoro builds, we +# set this script to `build_file` field in the Kokoro configuration. + +# This script does 3 things. +# +# 1. Prepare the Docker image for the test +# 2. Run the Docker with appropriate flags to run the test +# 3. Upload the newly built Docker image +# +# in a way that is somewhat compatible with trampoline_v1. +# +# These environment variables are required: +# TRAMPOLINE_IMAGE: The docker image to use. +# TRAMPOLINE_DOCKERFILE: The location of the Dockerfile. +# +# You can optionally change these environment variables: +# TRAMPOLINE_IMAGE_UPLOAD: +# (true|false): Whether to upload the Docker image after the +# successful builds. +# TRAMPOLINE_BUILD_FILE: The script to run in the docker container. +# TRAMPOLINE_WORKSPACE: The workspace path in the docker container. +# Defaults to /workspace. +# Potentially there are some repo specific envvars in .trampolinerc in +# the project root. +# +# Here is an example for running this script. +# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:10-user \ +# TRAMPOLINE_BUILD_FILE=.kokoro/system-test.sh \ +# .kokoro/trampoline_v2.sh + +set -euo pipefail + +TRAMPOLINE_VERSION="2.0.7" + +if command -v tput >/dev/null && [[ -n "${TERM:-}" ]]; then + readonly IO_COLOR_RED="$(tput setaf 1)" + readonly IO_COLOR_GREEN="$(tput setaf 2)" + readonly IO_COLOR_YELLOW="$(tput setaf 3)" + readonly IO_COLOR_RESET="$(tput sgr0)" +else + readonly IO_COLOR_RED="" + readonly IO_COLOR_GREEN="" + readonly IO_COLOR_YELLOW="" + readonly IO_COLOR_RESET="" +fi + +function function_exists { + [ $(LC_ALL=C type -t $1)"" == "function" ] +} + +# Logs a message using the given color. The first argument must be one +# of the IO_COLOR_* variables defined above, such as +# "${IO_COLOR_YELLOW}". The remaining arguments will be logged in the +# given color. The log message will also have an RFC-3339 timestamp +# prepended (in UTC). You can disable the color output by setting +# TERM=vt100. +function log_impl() { + local color="$1" + shift + local timestamp="$(date -u "+%Y-%m-%dT%H:%M:%SZ")" + echo "================================================================" + echo "${color}${timestamp}:" "$@" "${IO_COLOR_RESET}" + echo "================================================================" +} + +# Logs the given message with normal coloring and a timestamp. +function log() { + log_impl "${IO_COLOR_RESET}" "$@" +} + +# Logs the given message in green with a timestamp. +function log_green() { + log_impl "${IO_COLOR_GREEN}" "$@" +} + +# Logs the given message in yellow with a timestamp. +function log_yellow() { + log_impl "${IO_COLOR_YELLOW}" "$@" +} + +# Logs the given message in red with a timestamp. +function log_red() { + log_impl "${IO_COLOR_RED}" "$@" +} + +readonly tmpdir=$(mktemp -d -t ci-XXXXXXXX) +readonly tmphome="${tmpdir}/h" +mkdir -p "${tmphome}" + +function cleanup() { + rm -rf "${tmpdir}" +} +trap cleanup EXIT + +RUNNING_IN_CI="${RUNNING_IN_CI:-false}" + +# The workspace in the container, defaults to /workspace. +TRAMPOLINE_WORKSPACE="${TRAMPOLINE_WORKSPACE:-/workspace}" + +pass_down_envvars=( + # TRAMPOLINE_V2 variables. + # Tells scripts whether they are running as part of CI or not. + "RUNNING_IN_CI" + # Indicates which CI system we're in. + "TRAMPOLINE_CI" + # Indicates the version of the script. + "TRAMPOLINE_VERSION" +) + +log_yellow "Building with Trampoline ${TRAMPOLINE_VERSION}" + +# Detect which CI systems we're in. If we're in any of the CI systems +# we support, `RUNNING_IN_CI` will be true and `TRAMPOLINE_CI` will be +# the name of the CI system. Both envvars will be passing down to the +# container for telling which CI system we're in. +if [[ -n "${KOKORO_BUILD_ID:-}" ]]; then + # descriptive env var for indicating it's on CI. + RUNNING_IN_CI="true" + TRAMPOLINE_CI="kokoro" + if [[ "${TRAMPOLINE_USE_LEGACY_SERVICE_ACCOUNT:-}" == "true" ]]; then + if [[ ! -f "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json" ]]; then + log_red "${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json does not exist. Did you forget to mount cloud-devrel-kokoro-resources/trampoline? Aborting." + exit 1 + fi + # This service account will be activated later. + TRAMPOLINE_SERVICE_ACCOUNT="${KOKORO_GFILE_DIR}/kokoro-trampoline.service-account.json" + else + if [[ "${TRAMPOLINE_VERBOSE:-}" == "true" ]]; then + gcloud auth list + fi + log_yellow "Configuring Container Registry access" + gcloud auth configure-docker --quiet + fi + pass_down_envvars+=( + # KOKORO dynamic variables. + "KOKORO_BUILD_NUMBER" + "KOKORO_BUILD_ID" + "KOKORO_JOB_NAME" + "KOKORO_GIT_COMMIT" + "KOKORO_GITHUB_COMMIT" + "KOKORO_GITHUB_PULL_REQUEST_NUMBER" + "KOKORO_GITHUB_PULL_REQUEST_COMMIT" + # For Build Cop Bot + "KOKORO_GITHUB_COMMIT_URL" + "KOKORO_GITHUB_PULL_REQUEST_URL" + ) +elif [[ "${TRAVIS:-}" == "true" ]]; then + RUNNING_IN_CI="true" + TRAMPOLINE_CI="travis" + pass_down_envvars+=( + "TRAVIS_BRANCH" + "TRAVIS_BUILD_ID" + "TRAVIS_BUILD_NUMBER" + "TRAVIS_BUILD_WEB_URL" + "TRAVIS_COMMIT" + "TRAVIS_COMMIT_MESSAGE" + "TRAVIS_COMMIT_RANGE" + "TRAVIS_JOB_NAME" + "TRAVIS_JOB_NUMBER" + "TRAVIS_JOB_WEB_URL" + "TRAVIS_PULL_REQUEST" + "TRAVIS_PULL_REQUEST_BRANCH" + "TRAVIS_PULL_REQUEST_SHA" + "TRAVIS_PULL_REQUEST_SLUG" + "TRAVIS_REPO_SLUG" + "TRAVIS_SECURE_ENV_VARS" + "TRAVIS_TAG" + ) +elif [[ -n "${GITHUB_RUN_ID:-}" ]]; then + RUNNING_IN_CI="true" + TRAMPOLINE_CI="github-workflow" + pass_down_envvars+=( + "GITHUB_WORKFLOW" + "GITHUB_RUN_ID" + "GITHUB_RUN_NUMBER" + "GITHUB_ACTION" + "GITHUB_ACTIONS" + "GITHUB_ACTOR" + "GITHUB_REPOSITORY" + "GITHUB_EVENT_NAME" + "GITHUB_EVENT_PATH" + "GITHUB_SHA" + "GITHUB_REF" + "GITHUB_HEAD_REF" + "GITHUB_BASE_REF" + ) +elif [[ "${CIRCLECI:-}" == "true" ]]; then + RUNNING_IN_CI="true" + TRAMPOLINE_CI="circleci" + pass_down_envvars+=( + "CIRCLE_BRANCH" + "CIRCLE_BUILD_NUM" + "CIRCLE_BUILD_URL" + "CIRCLE_COMPARE_URL" + "CIRCLE_JOB" + "CIRCLE_NODE_INDEX" + "CIRCLE_NODE_TOTAL" + "CIRCLE_PREVIOUS_BUILD_NUM" + "CIRCLE_PROJECT_REPONAME" + "CIRCLE_PROJECT_USERNAME" + "CIRCLE_REPOSITORY_URL" + "CIRCLE_SHA1" + "CIRCLE_STAGE" + "CIRCLE_USERNAME" + "CIRCLE_WORKFLOW_ID" + "CIRCLE_WORKFLOW_JOB_ID" + "CIRCLE_WORKFLOW_UPSTREAM_JOB_IDS" + "CIRCLE_WORKFLOW_WORKSPACE_ID" + ) +fi + +# Configure the service account for pulling the docker image. +function repo_root() { + local dir="$1" + while [[ ! -d "${dir}/.git" ]]; do + dir="$(dirname "$dir")" + done + echo "${dir}" +} + +# Detect the project root. In CI builds, we assume the script is in +# the git tree and traverse from there, otherwise, traverse from `pwd` +# to find `.git` directory. +if [[ "${RUNNING_IN_CI:-}" == "true" ]]; then + PROGRAM_PATH="$(realpath "$0")" + PROGRAM_DIR="$(dirname "${PROGRAM_PATH}")" + PROJECT_ROOT="$(repo_root "${PROGRAM_DIR}")" +else + PROJECT_ROOT="$(repo_root $(pwd))" +fi + +log_yellow "Changing to the project root: ${PROJECT_ROOT}." +cd "${PROJECT_ROOT}" + +# To support relative path for `TRAMPOLINE_SERVICE_ACCOUNT`, we need +# to use this environment variable in `PROJECT_ROOT`. +if [[ -n "${TRAMPOLINE_SERVICE_ACCOUNT:-}" ]]; then + + mkdir -p "${tmpdir}/gcloud" + gcloud_config_dir="${tmpdir}/gcloud" + + log_yellow "Using isolated gcloud config: ${gcloud_config_dir}." + export CLOUDSDK_CONFIG="${gcloud_config_dir}" + + log_yellow "Using ${TRAMPOLINE_SERVICE_ACCOUNT} for authentication." + gcloud auth activate-service-account \ + --key-file "${TRAMPOLINE_SERVICE_ACCOUNT}" + log_yellow "Configuring Container Registry access" + gcloud auth configure-docker --quiet +fi + +required_envvars=( + # The basic trampoline configurations. + "TRAMPOLINE_IMAGE" + "TRAMPOLINE_BUILD_FILE" +) + +if [[ -f "${PROJECT_ROOT}/.trampolinerc" ]]; then + source "${PROJECT_ROOT}/.trampolinerc" +fi + +log_yellow "Checking environment variables." +for e in "${required_envvars[@]}" +do + if [[ -z "${!e:-}" ]]; then + log "Missing ${e} env var. Aborting." + exit 1 + fi +done + +# We want to support legacy style TRAMPOLINE_BUILD_FILE used with V1 +# script: e.g. "github/repo-name/.kokoro/run_tests.sh" +TRAMPOLINE_BUILD_FILE="${TRAMPOLINE_BUILD_FILE#github/*/}" +log_yellow "Using TRAMPOLINE_BUILD_FILE: ${TRAMPOLINE_BUILD_FILE}" + +# ignore error on docker operations and test execution +set +e + +log_yellow "Preparing Docker image." +# We only download the docker image in CI builds. +if [[ "${RUNNING_IN_CI:-}" == "true" ]]; then + # Download the docker image specified by `TRAMPOLINE_IMAGE` + + # We may want to add --max-concurrent-downloads flag. + + log_yellow "Start pulling the Docker image: ${TRAMPOLINE_IMAGE}." + if docker pull "${TRAMPOLINE_IMAGE}"; then + log_green "Finished pulling the Docker image: ${TRAMPOLINE_IMAGE}." + has_image="true" + else + log_red "Failed pulling the Docker image: ${TRAMPOLINE_IMAGE}." + has_image="false" + fi +else + # For local run, check if we have the image. + if docker images "${TRAMPOLINE_IMAGE}" | grep "${TRAMPOLINE_IMAGE%:*}"; then + has_image="true" + else + has_image="false" + fi +fi + + +# The default user for a Docker container has uid 0 (root). To avoid +# creating root-owned files in the build directory we tell docker to +# use the current user ID. +user_uid="$(id -u)" +user_gid="$(id -g)" +user_name="$(id -un)" + +# To allow docker in docker, we add the user to the docker group in +# the host os. +docker_gid=$(cut -d: -f3 < <(getent group docker)) + +update_cache="false" +if [[ "${TRAMPOLINE_DOCKERFILE:-none}" != "none" ]]; then + # Build the Docker image from the source. + context_dir=$(dirname "${TRAMPOLINE_DOCKERFILE}") + docker_build_flags=( + "-f" "${TRAMPOLINE_DOCKERFILE}" + "-t" "${TRAMPOLINE_IMAGE}" + "--build-arg" "UID=${user_uid}" + "--build-arg" "USERNAME=${user_name}" + ) + if [[ "${has_image}" == "true" ]]; then + docker_build_flags+=("--cache-from" "${TRAMPOLINE_IMAGE}") + fi + + log_yellow "Start building the docker image." + if [[ "${TRAMPOLINE_VERBOSE:-false}" == "true" ]]; then + echo "docker build" "${docker_build_flags[@]}" "${context_dir}" + fi + + # ON CI systems, we want to suppress docker build logs, only + # output the logs when it fails. + if [[ "${RUNNING_IN_CI:-}" == "true" ]]; then + if docker build "${docker_build_flags[@]}" "${context_dir}" \ + > "${tmpdir}/docker_build.log" 2>&1; then + if [[ "${TRAMPOLINE_VERBOSE:-}" == "true" ]]; then + cat "${tmpdir}/docker_build.log" + fi + + log_green "Finished building the docker image." + update_cache="true" + else + log_red "Failed to build the Docker image, aborting." + log_yellow "Dumping the build logs:" + cat "${tmpdir}/docker_build.log" + exit 1 + fi + else + if docker build "${docker_build_flags[@]}" "${context_dir}"; then + log_green "Finished building the docker image." + update_cache="true" + else + log_red "Failed to build the Docker image, aborting." + exit 1 + fi + fi +else + if [[ "${has_image}" != "true" ]]; then + log_red "We do not have ${TRAMPOLINE_IMAGE} locally, aborting." + exit 1 + fi +fi + +# We use an array for the flags so they are easier to document. +docker_flags=( + # Remove the container after it exists. + "--rm" + + # Use the host network. + "--network=host" + + # Run in priviledged mode. We are not using docker for sandboxing or + # isolation, just for packaging our dev tools. + "--privileged" + + # Run the docker script with the user id. Because the docker image gets to + # write in ${PWD} you typically want this to be your user id. + # To allow docker in docker, we need to use docker gid on the host. + "--user" "${user_uid}:${docker_gid}" + + # Pass down the USER. + "--env" "USER=${user_name}" + + # Mount the project directory inside the Docker container. + "--volume" "${PROJECT_ROOT}:${TRAMPOLINE_WORKSPACE}" + "--workdir" "${TRAMPOLINE_WORKSPACE}" + "--env" "PROJECT_ROOT=${TRAMPOLINE_WORKSPACE}" + + # Mount the temporary home directory. + "--volume" "${tmphome}:/h" + "--env" "HOME=/h" + + # Allow docker in docker. + "--volume" "/var/run/docker.sock:/var/run/docker.sock" + + # Mount the /tmp so that docker in docker can mount the files + # there correctly. + "--volume" "/tmp:/tmp" + # Pass down the KOKORO_GFILE_DIR and KOKORO_KEYSTORE_DIR + # TODO(tmatsuo): This part is not portable. + "--env" "TRAMPOLINE_SECRET_DIR=/secrets" + "--volume" "${KOKORO_GFILE_DIR:-/dev/shm}:/secrets/gfile" + "--env" "KOKORO_GFILE_DIR=/secrets/gfile" + "--volume" "${KOKORO_KEYSTORE_DIR:-/dev/shm}:/secrets/keystore" + "--env" "KOKORO_KEYSTORE_DIR=/secrets/keystore" +) + +# Add an option for nicer output if the build gets a tty. +if [[ -t 0 ]]; then + docker_flags+=("-it") +fi + +# Passing down env vars +for e in "${pass_down_envvars[@]}" +do + if [[ -n "${!e:-}" ]]; then + docker_flags+=("--env" "${e}=${!e}") + fi +done + +# If arguments are given, all arguments will become the commands run +# in the container, otherwise run TRAMPOLINE_BUILD_FILE. +if [[ $# -ge 1 ]]; then + log_yellow "Running the given commands '" "${@:1}" "' in the container." + readonly commands=("${@:1}") + if [[ "${TRAMPOLINE_VERBOSE:-}" == "true" ]]; then + echo docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}" "${commands[@]}" + fi + docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}" "${commands[@]}" +else + log_yellow "Running the tests in a Docker container." + docker_flags+=("--entrypoint=${TRAMPOLINE_BUILD_FILE}") + if [[ "${TRAMPOLINE_VERBOSE:-}" == "true" ]]; then + echo docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}" + fi + docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}" +fi + + +test_retval=$? + +if [[ ${test_retval} -eq 0 ]]; then + log_green "Build finished with ${test_retval}" +else + log_red "Build finished with ${test_retval}" +fi + +# Only upload it when the test passes. +if [[ "${update_cache}" == "true" ]] && \ + [[ $test_retval == 0 ]] && \ + [[ "${TRAMPOLINE_IMAGE_UPLOAD:-false}" == "true" ]]; then + log_yellow "Uploading the Docker image." + if docker push "${TRAMPOLINE_IMAGE}"; then + log_green "Finished uploading the Docker image." + else + log_red "Failed uploading the Docker image." + fi + # Call trampoline_after_upload_hook if it's defined. + if function_exists trampoline_after_upload_hook; then + trampoline_after_upload_hook + fi + +fi + +exit "${test_retval}" diff --git a/handwritten/pubsub/.trampolinerc b/handwritten/pubsub/.trampolinerc new file mode 100644 index 00000000000..164613b9e6a --- /dev/null +++ b/handwritten/pubsub/.trampolinerc @@ -0,0 +1,51 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Template for .trampolinerc + +# Add required env vars here. +required_envvars+=( +) + +# Add env vars which are passed down into the container here. +pass_down_envvars+=( + "AUTORELEASE_PR" +) + +# Prevent unintentional override on the default image. +if [[ "${TRAMPOLINE_IMAGE_UPLOAD:-false}" == "true" ]] && \ + [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then + echo "Please set TRAMPOLINE_IMAGE if you want to upload the Docker image." + exit 1 +fi + +# Define the default value if it makes sense. +if [[ -z "${TRAMPOLINE_IMAGE_UPLOAD:-}" ]]; then + TRAMPOLINE_IMAGE_UPLOAD="" +fi + +if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then + TRAMPOLINE_IMAGE="" +fi + +if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then + TRAMPOLINE_DOCKERFILE="" +fi + +if [[ -z "${TRAMPOLINE_BUILD_FILE:-}" ]]; then + TRAMPOLINE_BUILD_FILE="" +fi + +# Secret Manager secrets. +source ${PROJECT_ROOT}/.kokoro/populate-secrets.sh diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 1068dbc2e95..9f63689c528 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "ee2081b568d022eea9a694a81ad4b725c465f5b6" + "sha": "85fec09bfd956adbeeb8a819af796a3cedb3befe" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "079dcce498117f9570cebe6e6cff254b38ba3860" + "sha": "0c868d49b8e05bc1f299bc773df9eb4ef9ed96e9" } } ], @@ -75,10 +75,12 @@ ".kokoro/test.bat", ".kokoro/test.sh", ".kokoro/trampoline.sh", + ".kokoro/trampoline_v2.sh", ".mocharc.js", ".nycrc", ".prettierignore", ".prettierrc.js", + ".trampolinerc", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", From 4b5d99c988a11619ad95180dce0ab3d92771268e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 12 Oct 2020 21:54:37 +0200 Subject: [PATCH 0685/1115] chore(deps): update dependency webpack-cli to v4 (#1126) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [webpack-cli](https://togithub.com/webpack/webpack-cli) | devDependencies | major | [`^3.3.11` -> `^4.0.0`](https://renovatebot.com/diffs/npm/webpack-cli/3.3.12/4.0.0) | --- ### Release Notes
webpack/webpack-cli ### [`v4.0.0`](https://togithub.com/webpack/webpack-cli/blob/master/CHANGELOG.md#​400-httpsgithubcomwebpackwebpack-clicomparewebpack-cli400-rc1webpack-cli400-2020-10-10) [Compare Source](https://togithub.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.0.0) ##### Bug Fixes - add compilation lifecycle in watch instance ([#​1903](https://togithub.com/webpack/webpack-cli/issues/1903)) ([02b6d21](https://togithub.com/webpack/webpack-cli/commit/02b6d21eaa20166a7ed37816de716b8fc22b756a)) - cleanup `package-utils` package ([#​1822](https://togithub.com/webpack/webpack-cli/issues/1822)) ([fd5b92b](https://togithub.com/webpack/webpack-cli/commit/fd5b92b3cd40361daec5bf4486e455a41f4c9738)) - cli-executer supplies args further up ([#​1904](https://togithub.com/webpack/webpack-cli/issues/1904)) ([097564a](https://togithub.com/webpack/webpack-cli/commit/097564a851b36b63e0a6bf88144997ef65aa057a)) - exit code for validation errors ([59f6303](https://togithub.com/webpack/webpack-cli/commit/59f63037fcbdbb8934b578b9adf5725bc4ae1235)) - exit process in case of schema errors ([71e89b4](https://togithub.com/webpack/webpack-cli/commit/71e89b4092d953ea587cc4f606451ab78cbcdb93)) ##### Features - assign config paths in build dependencies in cache config ([#​1900](https://togithub.com/webpack/webpack-cli/issues/1900)) ([7e90f11](https://togithub.com/webpack/webpack-cli/commit/7e90f110b119f36ef9def4f66cf4e17ccf1438cd))
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ed8dde58493..a3f3d3733ab 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -98,7 +98,7 @@ "typescript": "^3.8.3", "uuid": "^8.0.0", "webpack": "^4.42.0", - "webpack-cli": "^3.3.11", + "webpack-cli": "^4.0.0", "yargs": "^16.0.0", "@microsoft/api-documenter": "^7.8.10", "@microsoft/api-extractor": "^7.8.10" From 76f16b7c91c7edbe1d0ef109ef9f470ecbefe7cc Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 15 Oct 2020 15:42:54 -0700 Subject: [PATCH 0686/1115] feat: update synthtool generation for latest changes (#1128) --- handwritten/pubsub/README.md | 25 ++++++++-- handwritten/pubsub/synth.metadata | 79 ++----------------------------- 2 files changed, 26 insertions(+), 78 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index c4893df9203..68f5e47f46d 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -71,14 +71,33 @@ const {PubSub} = require('@google-cloud/pubsub'); async function quickstart( projectId = 'your-project-id', // Your Google Cloud Platform project ID - topicName = 'my-topic' // Name for the new topic to create + topicName = 'my-topic', // Name for the new topic to create + subscriptionName = 'my-sub' // Name for the new subscription to create ) { // Instantiates a client const pubsub = new PubSub({projectId}); - // Creates the new topic + // Creates a new topic const [topic] = await pubsub.createTopic(topicName); console.log(`Topic ${topic.name} created.`); + + // Creates a subscription on that new topic + const [subscription] = await topic.createSubscription(subscriptionName); + + // Receive callbacks for new messages on the subscription + subscription.on('message', message => { + console.log('Received message:', message.data.toString()); + process.exit(0); + }); + + // Receive callbacks for errors on the subscription + subscription.on('error', error => { + console.error('Received error:', error); + process.exit(1); + }); + + // Send a message to the topic + topic.publish(Buffer.from('Test message!')); } ``` @@ -122,7 +141,7 @@ has instructions for running the samples. | List Subscriptions On a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listTopicSubscriptions.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/listTopicSubscriptions.js,samples/README.md) | | Listen For Errors | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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 For Ordered Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listenForOrderedMessages.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/listenForOrderedMessages.js,samples/README.md) | +| Listen For Messages With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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) | | OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/opentelemetryTracing.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/opentelemetryTracing.js,samples/README.md) | | Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 9f63689c528..f2c2a64dbdc 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "85fec09bfd956adbeeb8a819af796a3cedb3befe" + "sha": "f0c45105c8a07c5814418cc83414494e594d4515" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "4c5071b615d96ef9dfd6a63d8429090f1f2872bb", - "internalRef": "327369997" + "sha": "4004f5e26358d3bcce180a2f9c15e890971fa2f3", + "internalRef": "337386065" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "0c868d49b8e05bc1f299bc773df9eb4ef9ed96e9" + "sha": "27e0e916cbfdb3d5ff6639b686cc04f78a0b0386" } } ], @@ -33,76 +33,5 @@ "generator": "bazel" } } - ], - "generatedFiles": [ - ".eslintignore", - ".eslintrc.json", - ".gitattributes", - ".github/ISSUE_TEMPLATE/bug_report.md", - ".github/ISSUE_TEMPLATE/feature_request.md", - ".github/ISSUE_TEMPLATE/support_request.md", - ".github/PULL_REQUEST_TEMPLATE.md", - ".github/release-please.yml", - ".github/workflows/ci.yaml", - ".gitignore", - ".jsdoc.js", - ".kokoro/.gitattributes", - ".kokoro/common.cfg", - ".kokoro/continuous/node10/common.cfg", - ".kokoro/continuous/node10/docs.cfg", - ".kokoro/continuous/node10/test.cfg", - ".kokoro/continuous/node12/common.cfg", - ".kokoro/continuous/node12/lint.cfg", - ".kokoro/continuous/node12/samples-test.cfg", - ".kokoro/continuous/node12/system-test.cfg", - ".kokoro/continuous/node12/test.cfg", - ".kokoro/docs.sh", - ".kokoro/lint.sh", - ".kokoro/populate-secrets.sh", - ".kokoro/presubmit/node10/common.cfg", - ".kokoro/presubmit/node12/common.cfg", - ".kokoro/presubmit/node12/samples-test.cfg", - ".kokoro/presubmit/node12/system-test.cfg", - ".kokoro/presubmit/node12/test.cfg", - ".kokoro/publish.sh", - ".kokoro/release/docs-devsite.cfg", - ".kokoro/release/docs-devsite.sh", - ".kokoro/release/docs.cfg", - ".kokoro/release/docs.sh", - ".kokoro/release/publish.cfg", - ".kokoro/samples-test.sh", - ".kokoro/system-test.sh", - ".kokoro/test.bat", - ".kokoro/test.sh", - ".kokoro/trampoline.sh", - ".kokoro/trampoline_v2.sh", - ".mocharc.js", - ".nycrc", - ".prettierignore", - ".prettierrc.js", - ".trampolinerc", - "CODE_OF_CONDUCT.md", - "CONTRIBUTING.md", - "LICENSE", - "README.md", - "api-extractor.json", - "linkinator.config.json", - "protos/google/pubsub/v1/pubsub.proto", - "protos/protos.d.ts", - "protos/protos.js", - "protos/protos.json", - "renovate.json", - "samples/README.md", - "src/v1/index.ts", - "src/v1/publisher_client.ts", - "src/v1/publisher_client_config.json", - "src/v1/publisher_proto_list.json", - "src/v1/subscriber_client.ts", - "src/v1/subscriber_client_config.json", - "src/v1/subscriber_proto_list.json", - "test/gapic_publisher_v1.ts", - "test/gapic_subscriber_v1.ts", - "tsconfig.json", - "webpack.config.js" ] } \ No newline at end of file From 92369b4374bc3138f77a5f140eda8b908e166091 Mon Sep 17 00:00:00 2001 From: Lalji Kanjareeya <46327204+laljikanjareeya@users.noreply.github.com> Date: Fri, 16 Oct 2020 10:49:11 +0530 Subject: [PATCH 0687/1115] fix(deps): upgrade google-auth-library (#1122) Co-authored-by: Stephen Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a3f3d3733ab..32dd55cc510 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -59,7 +59,7 @@ "@types/long": "^4.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-auth-library": "^6.0.0", + "google-auth-library": "^6.1.1", "google-gax": "^2.7.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 55b9c9e999330643126ed645cb4f363efbf9f9ac Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 16 Oct 2020 10:08:21 -0700 Subject: [PATCH 0688/1115] build: only check --engine-strict for production deps (#1130) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/a30f98da-7f8e-4a25-a598-8357af693448/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/5451633881133e5573cc271a18e73b18caca8b1b --- handwritten/pubsub/synth.metadata | 75 ++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index f2c2a64dbdc..563718f92a6 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "f0c45105c8a07c5814418cc83414494e594d4515" + "sha": "54310a771b4b39c896f62fc18aea040cc42bfcd7" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "27e0e916cbfdb3d5ff6639b686cc04f78a0b0386" + "sha": "5451633881133e5573cc271a18e73b18caca8b1b" } } ], @@ -33,5 +33,76 @@ "generator": "bazel" } } + ], + "generatedFiles": [ + ".eslintignore", + ".eslintrc.json", + ".gitattributes", + ".github/ISSUE_TEMPLATE/bug_report.md", + ".github/ISSUE_TEMPLATE/feature_request.md", + ".github/ISSUE_TEMPLATE/support_request.md", + ".github/PULL_REQUEST_TEMPLATE.md", + ".github/release-please.yml", + ".github/workflows/ci.yaml", + ".gitignore", + ".jsdoc.js", + ".kokoro/.gitattributes", + ".kokoro/common.cfg", + ".kokoro/continuous/node10/common.cfg", + ".kokoro/continuous/node10/docs.cfg", + ".kokoro/continuous/node10/test.cfg", + ".kokoro/continuous/node12/common.cfg", + ".kokoro/continuous/node12/lint.cfg", + ".kokoro/continuous/node12/samples-test.cfg", + ".kokoro/continuous/node12/system-test.cfg", + ".kokoro/continuous/node12/test.cfg", + ".kokoro/docs.sh", + ".kokoro/lint.sh", + ".kokoro/populate-secrets.sh", + ".kokoro/presubmit/node10/common.cfg", + ".kokoro/presubmit/node12/common.cfg", + ".kokoro/presubmit/node12/samples-test.cfg", + ".kokoro/presubmit/node12/system-test.cfg", + ".kokoro/presubmit/node12/test.cfg", + ".kokoro/publish.sh", + ".kokoro/release/docs-devsite.cfg", + ".kokoro/release/docs-devsite.sh", + ".kokoro/release/docs.cfg", + ".kokoro/release/docs.sh", + ".kokoro/release/publish.cfg", + ".kokoro/samples-test.sh", + ".kokoro/system-test.sh", + ".kokoro/test.bat", + ".kokoro/test.sh", + ".kokoro/trampoline.sh", + ".kokoro/trampoline_v2.sh", + ".mocharc.js", + ".nycrc", + ".prettierignore", + ".prettierrc.js", + ".trampolinerc", + "CODE_OF_CONDUCT.md", + "CONTRIBUTING.md", + "LICENSE", + "README.md", + "api-extractor.json", + "linkinator.config.json", + "protos/google/pubsub/v1/pubsub.proto", + "protos/protos.d.ts", + "protos/protos.js", + "protos/protos.json", + "renovate.json", + "samples/README.md", + "src/v1/index.ts", + "src/v1/publisher_client.ts", + "src/v1/publisher_client_config.json", + "src/v1/publisher_proto_list.json", + "src/v1/subscriber_client.ts", + "src/v1/subscriber_client_config.json", + "src/v1/subscriber_proto_list.json", + "test/gapic_publisher_v1.ts", + "test/gapic_subscriber_v1.ts", + "tsconfig.json", + "webpack.config.js" ] } \ No newline at end of file From c52fd8e358752a4460f5d2b2451b8ce18c891405 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 20 Oct 2020 10:25:57 -0700 Subject: [PATCH 0689/1115] fix: add CANCELLED back to the auto-retry codes for pull subscriptions, for now (#1132) * fix: add CANCELLED back to the auto-retry codes for pull subscriptions, for now * tests: remove afterEach cleanup for topic sample tests for now * tests: don't require afterEach since we're not using it anymore --- handwritten/pubsub/src/pull-retry.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/src/pull-retry.ts b/handwritten/pubsub/src/pull-retry.ts index 00db9e2fcf3..8240deb995b 100644 --- a/handwritten/pubsub/src/pull-retry.ts +++ b/handwritten/pubsub/src/pull-retry.ts @@ -24,6 +24,7 @@ export const RETRY_CODES: grpc.status[] = [ grpc.status.ABORTED, grpc.status.INTERNAL, grpc.status.UNAVAILABLE, + grpc.status.CANCELLED, ]; /** From 72bb7afb3f96363e82fdd44bf4e4ef3f2f5ddecd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 20 Oct 2020 20:21:10 +0200 Subject: [PATCH 0690/1115] chore(deps): update dependency webpack to v5 (#1125) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 32dd55cc510..0a3fef7fd71 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -97,7 +97,7 @@ "ts-loader": "^8.0.0", "typescript": "^3.8.3", "uuid": "^8.0.0", - "webpack": "^4.42.0", + "webpack": "^5.0.0", "webpack-cli": "^4.0.0", "yargs": "^16.0.0", "@microsoft/api-documenter": "^7.8.10", From 5211282e67da0d33317514abd4accbef9a0c708a Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 20 Oct 2020 15:55:54 -0700 Subject: [PATCH 0691/1115] chore(deps): update google-auth-library for security fix (#1133) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0a3fef7fd71..e5060ebc1f7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -59,7 +59,7 @@ "@types/long": "^4.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-auth-library": "^6.1.1", + "google-auth-library": "^6.1.2", "google-gax": "^2.7.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From c2d005f7c8027f8738f2d32f170c2c8208a9f181 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 21 Oct 2020 10:47:00 -0700 Subject: [PATCH 0692/1115] chore: release 2.6.0 (#1129) * chore: release 2.6.0 * docs: update the readme release-please doesn't seem to be doing it on its own. Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 16 ++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 7ebe66b2787..d135fcf4910 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,22 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.6.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.5.0...v2.6.0) (2020-10-20) + + +### Features + +* update synthtool generation for latest changes ([#1128](https://www.github.com/googleapis/nodejs-pubsub/issues/1128)) ([bdbe80f](https://www.github.com/googleapis/nodejs-pubsub/commit/bdbe80f9183fae77dd8ac3e7ffa4bbc5282b030c)) + + +### Bug Fixes + +* **deps:** update google-auth-library for security fix ([#1122](https://www.github.com/googleapis/nodejs-pubsub/issues/1122)) ([1eaf850](https://github.com/googleapis/nodejs-pubsub/commit/1eaf850bf4ea44ae3269d4f33d5aa6574af76705)) +* add CANCELLED back to the auto-retry codes for pull subscriptions, for now ([#1132](https://www.github.com/googleapis/nodejs-pubsub/issues/1132)) ([47cd89c](https://www.github.com/googleapis/nodejs-pubsub/commit/47cd89c99cad62e603f4c5345ce2857c6abf6f47)) +* **deps:** update opentelemetry monorepo to ^0.11.0 ([#1102](https://www.github.com/googleapis/nodejs-pubsub/issues/1102)) ([c9d5638](https://www.github.com/googleapis/nodejs-pubsub/commit/c9d5638031d047b80df82bc4afed1aecdd708406)) +* **deps:** upgrade google-auth-library ([#1122](https://www.github.com/googleapis/nodejs-pubsub/issues/1122)) ([54310a7](https://www.github.com/googleapis/nodejs-pubsub/commit/54310a771b4b39c896f62fc18aea040cc42bfcd7)) +* move system and samples test from Node 10 to Node 12 ([#1094](https://www.github.com/googleapis/nodejs-pubsub/issues/1094)) ([693116a](https://www.github.com/googleapis/nodejs-pubsub/commit/693116afb3776a8696c52d890edf9a57423896dc)) + ## [2.5.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.4.0...v2.5.0) (2020-08-17) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e5060ebc1f7..1ac970c5577 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.5.0", + "version": "2.6.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 738ca3f8c0263686cbb9ce45e4b4cbb047ec1602 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 21 Oct 2020 11:28:16 -0700 Subject: [PATCH 0693/1115] chore: clean up Node.js TOC for cloud-rad (#1134) * chore: clean up Node.js TOC for cloud-rad Source-Author: F. Hinkelmann Source-Date: Wed Oct 21 09:26:04 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: f96d3b455fe27c3dc7bc37c3c9cd27b1c6d269c8 Source-Link: https://github.com/googleapis/synthtool/commit/f96d3b455fe27c3dc7bc37c3c9cd27b1c6d269c8 * chore: fix Node.js TOC for cloud-rad Source-Author: F. Hinkelmann Source-Date: Wed Oct 21 12:01:24 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: 901ddd44e9ef7887ee681b9183bbdea99437fdcc Source-Link: https://github.com/googleapis/synthtool/commit/901ddd44e9ef7887ee681b9183bbdea99437fdcc Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> --- handwritten/pubsub/.kokoro/release/docs-devsite.sh | 4 ++++ handwritten/pubsub/synth.metadata | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh index 0d11b7ae951..7657be3377a 100755 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.sh +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -37,9 +37,13 @@ NAME=$(cat .repo-metadata.json | json name) mkdir ./_devsite cp ./yaml/$NAME/* ./_devsite +# Clean up TOC # Delete SharePoint item, see https://github.com/microsoft/rushstack/issues/1229 sed -i -e '1,3d' ./yaml/toc.yml sed -i -e 's/^ //' ./yaml/toc.yml +# Delete interfaces from TOC (name and uid) +sed -i -e '/name: I[A-Z]/{N;d;}' ./yaml/toc.yml +sed -i -e '/^ *\@google-cloud.*:interface/d' ./yaml/toc.yml cp ./yaml/toc.yml ./_devsite/toc.yml diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 563718f92a6..0ac19712618 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "54310a771b4b39c896f62fc18aea040cc42bfcd7" + "sha": "1eaf850bf4ea44ae3269d4f33d5aa6574af76705" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5451633881133e5573cc271a18e73b18caca8b1b" + "sha": "901ddd44e9ef7887ee681b9183bbdea99437fdcc" } } ], From 5b8fad09181a691d7d3f19ed5e30e7b48f1af29f Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 18 Nov 2020 07:47:35 -0800 Subject: [PATCH 0694/1115] fix: node 14+ changes how multiple destroy() calls work (#1153) * fix: node 14+ changes how multiple destroy() calls work, and this relied on node <14 behavior. also removed some node <8 cruft. * chore: actually run on Node 14 and 15 * chore: no scripts on first install * chore: finally make it work * style: remove extraneous underscores * style: remove now-extraneous import from message-stream tests Co-authored-by: Alexander Fenster --- handwritten/pubsub/src/message-stream.ts | 29 ++++++++-------- handwritten/pubsub/test/message-stream.ts | 40 ++--------------------- 2 files changed, 16 insertions(+), 53 deletions(-) diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index abbefa51ad0..042cbf49bce 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -127,7 +127,6 @@ export interface MessageStreamOptions { * @param {MessageStreamOptions} [options] The message stream options. */ export class MessageStream extends PassThrough { - destroyed: boolean; private _keepAliveHandle: NodeJS.Timer; private _fillHandle?: NodeJS.Timer; private _options: MessageStreamOptions; @@ -139,7 +138,6 @@ export class MessageStream extends PassThrough { super({objectMode: true, highWaterMark: options.highWaterMark}); - this.destroyed = false; this._options = options; this._retrier = new PullRetry(); this._streams = new Map(); @@ -156,14 +154,24 @@ export class MessageStream extends PassThrough { /** * Destroys the stream and any underlying streams. * - * @param {error?} err An error to emit, if any. + * @param {error?} error An error to emit, if any. * @private */ - destroy(err?: Error): void { + destroy(error?: Error | null): void { + // We can't assume Node has taken care of this in <14. if (this.destroyed) { return; } - + super.destroy(error ? error : undefined); + } + /** + * Destroys the stream and any underlying streams. + * + * @param {error?} error An error to emit, if any. + * @param {Function} callback Callback for completion of any destruction. + * @private + */ + _destroy(error: Error | null, callback: (error: Error | null) => void): void { this.destroyed = true; clearInterval(this._keepAliveHandle); @@ -172,16 +180,7 @@ export class MessageStream extends PassThrough { stream.cancel(); } - if (typeof super.destroy === 'function') { - return super.destroy(err); - } - - process.nextTick(() => { - if (err) { - this.emit('error', err); - } - this.emit('close'); - }); + callback(error); } /** * Adds a StreamingPull stream to the combined stream. diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 1a9bcaecc49..4c5fa171959 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import {describe, it, before, beforeEach, afterEach, after} from 'mocha'; +import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {grpc} from 'google-gax'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -302,13 +302,7 @@ describe('MessageStream', () => { describe('destroy', () => { it('should noop if already destroyed', done => { - sandbox - .stub(FakePassThrough.prototype, 'destroy') - .callsFake(function (this: Duplex) { - if (this === messageStream) { - done(); - } - }); + messageStream.on('close', done); messageStream.destroy(); messageStream.destroy(); @@ -350,36 +344,6 @@ describe('MessageStream', () => { assert.strictEqual(stub.callCount, 1); }); }); - - describe('without native destroy', () => { - let destroy: (err?: Error) => void; - - before(() => { - destroy = FakePassThrough.prototype.destroy; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - FakePassThrough.prototype.destroy = false as any; - }); - - after(() => { - FakePassThrough.prototype.destroy = destroy; - }); - - it('should emit close', done => { - messageStream.on('close', done); - messageStream.destroy(); - }); - - it('should emit an error if present', done => { - const fakeError = new Error('err'); - - messageStream.on('error', err => { - assert.strictEqual(err, fakeError); - done(); - }); - - messageStream.destroy(fakeError); - }); - }); }); describe('pull stream lifecycle', () => { From 908862ce1254f7a1101f095d2ccad89a1bf82568 Mon Sep 17 00:00:00 2001 From: fayssalmartanigcp <73672393+fayssalmartanigcp@users.noreply.github.com> Date: Wed, 18 Nov 2020 11:16:05 -0500 Subject: [PATCH 0695/1115] feat: Enable server side flow control by default with the option to turn it off (#1147) This change enables sending flow control settings automatically to the server. If flowControl.maxMessages > 0 or flowControl.maxBytes > 0, flow control will be enforced at the server side (in addition to the client side). This behavior is enabled by default and SubscriberOptions.useLegacyFlowControl can be used for users who would like to opt-out of this feature in case they encounter issues with server side flow control. --- handwritten/pubsub/src/message-stream.ts | 8 ++++++-- handwritten/pubsub/src/subscriber.ts | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 042cbf49bce..7bd6df0795f 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -225,8 +225,12 @@ export class MessageStream extends PassThrough { const request: StreamingPullRequest = { subscription: this._subscriber.name, streamAckDeadlineSeconds: this._subscriber.ackDeadline, - maxOutstandingMessages: this._subscriber.maxMessages, - maxOutstandingBytes: this._subscriber.maxBytes, + maxOutstandingMessages: this._subscriber.useLegacyFlowControl + ? 0 + : this._subscriber.maxMessages, + maxOutstandingBytes: this._subscriber.useLegacyFlowControl + ? 0 + : this._subscriber.maxBytes, }; delete this._fillHandle; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 9b746636cd0..97b8630940e 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -203,6 +203,7 @@ export interface SubscriberOptions { ackDeadline?: number; batching?: BatchOptions; flowControl?: FlowControlOptions; + useLegacyFlowControl?: boolean; streamingOptions?: MessageStreamOptions; enableOpenTelemetryTracing?: boolean; } @@ -214,6 +215,9 @@ export interface SubscriberOptions { * 99th percentile time it takes to acknowledge a message. * @property {BatchOptions} [batching] Request batching options. * @property {FlowControlOptions} [flowControl] Flow control options. + * @property {boolean} [useLegacyFlowControl] Disables enforcing flow control + * settings at the Cloud PubSub server and uses the less accurate method + * of only enforcing flow control at the client side. * @property {MessageStreamOptions} [streamingOptions] Streaming options. */ /** @@ -229,6 +233,7 @@ export class Subscriber extends EventEmitter { ackDeadline: number; maxMessages: number; maxBytes: number; + useLegacyFlowControl: boolean; isOpen: boolean; private _acks!: AckQueue; private _histogram: Histogram; @@ -247,6 +252,7 @@ export class Subscriber extends EventEmitter { this.ackDeadline = 10; this.maxMessages = defaultOptions.subscription.maxOutstandingMessages; this.maxBytes = defaultOptions.subscription.maxOutstandingBytes; + this.useLegacyFlowControl = false; this.isOpen = false; this._isUserSetDeadline = false; this._histogram = new Histogram({min: 10, max: 600}); @@ -402,6 +408,7 @@ export class Subscriber extends EventEmitter { this._isUserSetDeadline = true; } + this.useLegacyFlowControl = options.useLegacyFlowControl || false; if (options.flowControl) { this.maxMessages = options.flowControl!.maxMessages || From 9ebe79f50afd32be0a66f015f9f0cff7c44ca106 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 18 Nov 2020 11:44:03 -0800 Subject: [PATCH 0696/1115] docs: updated code of conduct (includes update to actions) (#1142) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/313ec1b8-2bb0-49a2-a59d-9211defb7a66/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/89c849ba5013e45e8fb688b138f33c2ec6083dc5 Source-Link: https://github.com/googleapis/synthtool/commit/a783321fd55f010709294455584a553f4b24b944 Source-Link: https://github.com/googleapis/synthtool/commit/b7413d38b763827c72c0360f0a3d286c84656eeb Source-Link: https://github.com/googleapis/synthtool/commit/5f6ef0ec5501d33c4667885b37a7685a30d41a76 --- handwritten/pubsub/CODE_OF_CONDUCT.md | 123 ++++++++++++++++++-------- handwritten/pubsub/synth.metadata | 4 +- 2 files changed, 89 insertions(+), 38 deletions(-) diff --git a/handwritten/pubsub/CODE_OF_CONDUCT.md b/handwritten/pubsub/CODE_OF_CONDUCT.md index 46b2a08ea6d..2add2547a81 100644 --- a/handwritten/pubsub/CODE_OF_CONDUCT.md +++ b/handwritten/pubsub/CODE_OF_CONDUCT.md @@ -1,43 +1,94 @@ -# Contributor Code of Conduct + +# Code of Conduct -As contributors and maintainers of this project, -and in the interest of fostering an open and welcoming community, -we pledge to respect all people who contribute through reporting issues, -posting feature requests, updating documentation, -submitting pull requests or patches, and other activities. +## Our Pledge -We are committed to making participation in this project -a harassment-free experience for everyone, -regardless of level of experience, gender, gender identity and expression, -sexual orientation, disability, personal appearance, -body size, race, ethnicity, age, religion, or nationality. +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of +experience, education, socio-economic status, nationality, personal appearance, +race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members Examples of unacceptable behavior by participants include: -* The use of sexualized language or imagery -* Personal attacks -* Trolling or insulting/derogatory comments -* Public or private harassment -* Publishing other's private information, -such as physical or electronic -addresses, without explicit permission -* Other unethical or unprofessional conduct. +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. Project maintainers have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct. -By adopting this Code of Conduct, -project maintainers commit themselves to fairly and consistently -applying these principles to every aspect of managing this project. -Project maintainers who do not follow or enforce the Code of Conduct -may be permanently removed from the project team. - -This code of conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. - -Instances of abusive, harassing, or otherwise unacceptable behavior -may be reported by opening an issue -or contacting one or more of the project maintainers. - -This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, -available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, or to ban temporarily or permanently any +contributor for other behaviors that they deem inappropriate, threatening, +offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +This Code of Conduct also applies outside the project spaces when the Project +Steward has a reasonable belief that an individual's behavior may have a +negative impact on the project or its community. + +## Conflict Resolution + +We do not believe that all conflict is bad; healthy debate and disagreement +often yield positive results. However, it is never okay to be disrespectful or +to engage in behavior that violates the project’s code of conduct. + +If you see someone violating the code of conduct, you are encouraged to address +the behavior directly with those involved. Many issues can be resolved quickly +and easily, and this gives people more control over the outcome of their +dispute. If you are unable to resolve the matter for any reason, or if the +behavior is threatening or harassing, report it. We are dedicated to providing +an environment where participants feel welcome and safe. + +Reports should be directed to *googleapis-stewards@google.com*, the +Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to +receive and address reported violations of the code of conduct. They will then +work with a committee consisting of representatives from the Open Source +Programs Office and the Google Open Source Strategy team. If for any reason you +are uncomfortable reaching out to the Project Steward, please email +opensource@google.com. + +We will investigate every complaint, but you may not receive a direct response. +We will use our discretion in determining when and how to follow up on reported +incidents, which may range from not taking action to permanent expulsion from +the project and project-sponsored spaces. We will notify the accused of the +report and provide them an opportunity to discuss it before any action is taken. +The identity of the reporter will be omitted from the details of the report +supplied to the accused. In potentially harmful situations, such as ongoing +harassment or threats to anyone's safety, we may take action without notice. + +## Attribution + +This Code of Conduct is adapted from the Contributor Covenant, version 1.4, +available at +https://www.contributor-covenant.org/version/1/4/code-of-conduct.html \ No newline at end of file diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 0ac19712618..63c5711bed0 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "1eaf850bf4ea44ae3269d4f33d5aa6574af76705" + "sha": "db1f69c4aac5b3abfea12f70d45ceb8b7c957388" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "901ddd44e9ef7887ee681b9183bbdea99437fdcc" + "sha": "89c849ba5013e45e8fb688b138f33c2ec6083dc5" } } ], From a5fb84884549ea2a76b816fae1cfbb62abe8bfff Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 18 Nov 2020 17:48:29 -0800 Subject: [PATCH 0697/1115] fix: do not modify options object, use defaultScopes (#1148) * fix: do not modify options object, use defaultScopes Regenerated the library using gapic-generator-typescript v1.2.1. * fix(deps): require google-gax ^2.9.2 Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.kokoro/trampoline_v2.sh | 2 + handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 273 ++++++++++-------- .../pubsub/src/v1/subscriber_client.ts | 267 ++++++++++------- handwritten/pubsub/synth.metadata | 4 +- 5 files changed, 323 insertions(+), 225 deletions(-) diff --git a/handwritten/pubsub/.kokoro/trampoline_v2.sh b/handwritten/pubsub/.kokoro/trampoline_v2.sh index 5ae75f977d7..606d4321458 100755 --- a/handwritten/pubsub/.kokoro/trampoline_v2.sh +++ b/handwritten/pubsub/.kokoro/trampoline_v2.sh @@ -125,6 +125,8 @@ pass_down_envvars=( "TRAMPOLINE_CI" # Indicates the version of the script. "TRAMPOLINE_VERSION" + # Contains path to build artifacts being executed. + "KOKORO_BUILD_ARTIFACTS_SUBDIR" ) log_yellow "Building with Trampoline ${TRAMPOLINE_VERSION}" diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1ac970c5577..3d22e171612 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -60,7 +60,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^6.1.2", - "google-gax": "^2.7.0", + "google-gax": "^2.9.2", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index f58a3f46a42..29c5c71bf5f 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -64,8 +64,10 @@ export class PublisherClient { /** * Construct an instance of PublisherClient. * - * @param {object} [options] - The configuration object. See the subsequent - * parameters for more details. + * @param {object} [options] - The configuration object. + * The options accepted by the constructor are described in detail + * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). + * The common options are: * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] * @param {string} [options.credentials.private_key] @@ -85,42 +87,33 @@ export class PublisherClient { * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. + * @param {gax.ClientConfig} [options.clientConfig] - client configuration override. + * TODO(@alexander-fenster): link to gax documentation. + * @param {boolean} fallback - Use HTTP fallback mode. + * In fallback mode, a special browser-compatible transport implementation is used + * instead of gRPC transport. In browser context (if the `window` object is defined) + * the fallback mode is enabled automatically; set `options.fallback` to `false` + * if you need to override this behavior. */ - constructor(opts?: ClientOptions) { - // Ensure that options include the service address and port. + // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof PublisherClient; const servicePath = - opts && opts.servicePath - ? opts.servicePath - : opts && opts.apiEndpoint - ? opts.apiEndpoint - : staticMembers.servicePath; - const port = opts && opts.port ? opts.port : staticMembers.port; + opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + const port = opts?.port || staticMembers.port; + const clientConfig = opts?.clientConfig ?? {}; + const fallback = opts?.fallback ?? typeof window !== 'undefined'; + opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); - if (!opts) { - opts = {servicePath, port}; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. + if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { + opts['scopes'] = staticMembers.scopes; } - opts.servicePath = opts.servicePath || servicePath; - opts.port = opts.port || port; - - // users can override the config from client side, like retry codes name. - // The detailed structure of the clientConfig can be found here: https://github.com/googleapis/gax-nodejs/blob/master/src/gax.ts#L546 - // The way to override client config for Showcase API: - // - // const customConfig = {"interfaces": {"google.showcase.v1beta1.Echo": {"methods": {"Echo": {"retry_codes_name": "idempotent", "retry_params_name": "default"}}}}} - // const showcaseClient = new showcaseClient({ projectId, customConfig }); - opts.clientConfig = opts.clientConfig || {}; - // If we're running in browser, it's OK to omit `fallback` since - // google-gax has `browser` field in its `package.json`. - // For Electron (which does not respect `browser` field), - // pass `{fallback: true}` to the PublisherClient constructor. + // Choose either gRPC or proto-over-HTTP implementation of google-gax. this._gaxModule = opts.fallback ? gax.fallback : gax; - // Create a `gaxGrpc` object, with any grpc-specific options - // sent to the client. - opts.scopes = (this.constructor as typeof PublisherClient).scopes; + // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. this._gaxGrpc = new this._gaxModule.GrpcClient(opts); // Save options to use in initialize() method. @@ -128,6 +121,11 @@ export class PublisherClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + + // Set the default scopes in auth client if needed. + if (servicePath === staticMembers.servicePath) { + this.auth.defaultScopes = staticMembers.scopes; + } this.iamClient = new IamClient(this._gaxGrpc, opts); // Determine the client header string. @@ -313,6 +311,7 @@ export class PublisherClient { /** * The DNS address for this API service. + * @returns {string} The DNS address for this service. */ static get servicePath() { return 'pubsub.googleapis.com'; @@ -321,6 +320,7 @@ export class PublisherClient { /** * The DNS address for this API service - same as servicePath(), * exists for compatibility reasons. + * @returns {string} The DNS address for this service. */ static get apiEndpoint() { return 'pubsub.googleapis.com'; @@ -328,6 +328,7 @@ export class PublisherClient { /** * The port for this API service. + * @returns {number} The default port for this service. */ static get port() { return 443; @@ -336,6 +337,7 @@ export class PublisherClient { /** * The scopes needed to make gRPC calls for every method defined * in this service. + * @returns {string[]} List of default scopes. */ static get scopes() { return [ @@ -348,8 +350,7 @@ export class PublisherClient { getProjectId(callback: Callback): void; /** * Return the project ID used by this class. - * @param {function(Error, string)} callback - the callback to - * be called with the current project Id. + * @returns {Promise} A promise that resolves to string containing the project ID. */ getProjectId( callback?: Callback @@ -420,7 +421,11 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.createTopic(request); */ createTopic( request: protos.google.pubsub.v1.ITopic, @@ -507,7 +512,11 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.updateTopic(request); */ updateTopic( request: protos.google.pubsub.v1.IUpdateTopicRequest, @@ -591,7 +600,11 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.publish(request); */ publish( request: protos.google.pubsub.v1.IPublishRequest, @@ -672,7 +685,11 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.getTopic(request); */ getTopic( request: protos.google.pubsub.v1.IGetTopicRequest, @@ -757,7 +774,11 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.deleteTopic(request); */ deleteTopic( request: protos.google.pubsub.v1.IDeleteTopicRequest, @@ -841,7 +862,11 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [DetachSubscriptionResponse]{@link google.pubsub.v1.DetachSubscriptionResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.detachSubscription(request); */ detachSubscription( request: protos.google.pubsub.v1.IDetachSubscriptionRequest, @@ -929,19 +954,14 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Topic]{@link google.pubsub.v1.Topic}. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Topic]{@link google.pubsub.v1.Topic} that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListTopicsRequest]{@link google.pubsub.v1.ListTopicsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListTopicsResponse]{@link google.pubsub.v1.ListTopicsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listTopicsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopics( request: protos.google.pubsub.v1.IListTopicsRequest, @@ -985,18 +1005,7 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopics}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopics} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1012,6 +1021,13 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Topic]{@link google.pubsub.v1.Topic} on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listTopicsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicsStream( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1036,10 +1052,9 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopics}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listTopics`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1054,7 +1069,18 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * [Topic]{@link google.pubsub.v1.Topic}. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listTopicsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listTopicsAsync( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1127,19 +1153,14 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of string. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of string that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListTopicSubscriptionsRequest]{@link google.pubsub.v1.ListTopicSubscriptionsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListTopicSubscriptionsResponse]{@link google.pubsub.v1.ListTopicSubscriptionsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listTopicSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicSubscriptions( request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1191,18 +1212,7 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopicSubscriptions}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopicSubscriptions} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1218,6 +1228,13 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing string on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listTopicSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicSubscriptionsStream( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1242,10 +1259,9 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopicSubscriptions}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listTopicSubscriptions`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1260,7 +1276,18 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * string. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listTopicSubscriptionsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listTopicSubscriptionsAsync( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1333,19 +1360,14 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of string. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of string that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListTopicSnapshotsRequest]{@link google.pubsub.v1.ListTopicSnapshotsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListTopicSnapshotsResponse]{@link google.pubsub.v1.ListTopicSnapshotsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listTopicSnapshotsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicSnapshots( request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1391,18 +1413,7 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopicSnapshots}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopicSnapshots} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1418,6 +1429,13 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing string on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listTopicSnapshotsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicSnapshotsStream( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1442,10 +1460,9 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopicSnapshots}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listTopicSnapshots`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1460,7 +1477,18 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * string. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listTopicSnapshotsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listTopicSnapshotsAsync( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1764,9 +1792,10 @@ export class PublisherClient { } /** - * Terminate the GRPC channel and close the client. + * Terminate the gRPC channel and close the client. * * The client will no longer be usable and all future behavior is undefined. + * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { this.initialize(); diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index c4b15288640..c36d8ad17a4 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -65,8 +65,10 @@ export class SubscriberClient { /** * Construct an instance of SubscriberClient. * - * @param {object} [options] - The configuration object. See the subsequent - * parameters for more details. + * @param {object} [options] - The configuration object. + * The options accepted by the constructor are described in detail + * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). + * The common options are: * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] * @param {string} [options.credentials.private_key] @@ -86,42 +88,33 @@ export class SubscriberClient { * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. + * @param {gax.ClientConfig} [options.clientConfig] - client configuration override. + * TODO(@alexander-fenster): link to gax documentation. + * @param {boolean} fallback - Use HTTP fallback mode. + * In fallback mode, a special browser-compatible transport implementation is used + * instead of gRPC transport. In browser context (if the `window` object is defined) + * the fallback mode is enabled automatically; set `options.fallback` to `false` + * if you need to override this behavior. */ - constructor(opts?: ClientOptions) { - // Ensure that options include the service address and port. + // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof SubscriberClient; const servicePath = - opts && opts.servicePath - ? opts.servicePath - : opts && opts.apiEndpoint - ? opts.apiEndpoint - : staticMembers.servicePath; - const port = opts && opts.port ? opts.port : staticMembers.port; + opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + const port = opts?.port || staticMembers.port; + const clientConfig = opts?.clientConfig ?? {}; + const fallback = opts?.fallback ?? typeof window !== 'undefined'; + opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); - if (!opts) { - opts = {servicePath, port}; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. + if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { + opts['scopes'] = staticMembers.scopes; } - opts.servicePath = opts.servicePath || servicePath; - opts.port = opts.port || port; - - // users can override the config from client side, like retry codes name. - // The detailed structure of the clientConfig can be found here: https://github.com/googleapis/gax-nodejs/blob/master/src/gax.ts#L546 - // The way to override client config for Showcase API: - // - // const customConfig = {"interfaces": {"google.showcase.v1beta1.Echo": {"methods": {"Echo": {"retry_codes_name": "idempotent", "retry_params_name": "default"}}}}} - // const showcaseClient = new showcaseClient({ projectId, customConfig }); - opts.clientConfig = opts.clientConfig || {}; - // If we're running in browser, it's OK to omit `fallback` since - // google-gax has `browser` field in its `package.json`. - // For Electron (which does not respect `browser` field), - // pass `{fallback: true}` to the SubscriberClient constructor. + // Choose either gRPC or proto-over-HTTP implementation of google-gax. this._gaxModule = opts.fallback ? gax.fallback : gax; - // Create a `gaxGrpc` object, with any grpc-specific options - // sent to the client. - opts.scopes = (this.constructor as typeof SubscriberClient).scopes; + // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. this._gaxGrpc = new this._gaxModule.GrpcClient(opts); // Save options to use in initialize() method. @@ -129,6 +122,11 @@ export class SubscriberClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + + // Set the default scopes in auth client if needed. + if (servicePath === staticMembers.servicePath) { + this.auth.defaultScopes = staticMembers.scopes; + } this.iamClient = new IamClient(this._gaxGrpc, opts); // Determine the client header string. @@ -299,6 +297,7 @@ export class SubscriberClient { /** * The DNS address for this API service. + * @returns {string} The DNS address for this service. */ static get servicePath() { return 'pubsub.googleapis.com'; @@ -307,6 +306,7 @@ export class SubscriberClient { /** * The DNS address for this API service - same as servicePath(), * exists for compatibility reasons. + * @returns {string} The DNS address for this service. */ static get apiEndpoint() { return 'pubsub.googleapis.com'; @@ -314,6 +314,7 @@ export class SubscriberClient { /** * The port for this API service. + * @returns {number} The default port for this service. */ static get port() { return 443; @@ -322,6 +323,7 @@ export class SubscriberClient { /** * The scopes needed to make gRPC calls for every method defined * in this service. + * @returns {string[]} List of default scopes. */ static get scopes() { return [ @@ -334,8 +336,7 @@ export class SubscriberClient { getProjectId(callback: Callback): void; /** * Return the project ID used by this class. - * @param {function(Error, string)} callback - the callback to - * be called with the current project Id. + * @returns {Promise} A promise that resolves to string containing the project ID. */ getProjectId( callback?: Callback @@ -489,7 +490,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.createSubscription(request); */ createSubscription( request: protos.google.pubsub.v1.ISubscription, @@ -570,7 +575,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.getSubscription(request); */ getSubscription( request: protos.google.pubsub.v1.IGetSubscriptionRequest, @@ -654,7 +663,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.updateSubscription(request); */ updateSubscription( request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, @@ -739,7 +752,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.deleteSubscription(request); */ deleteSubscription( request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, @@ -835,7 +852,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.modifyAckDeadline(request); */ modifyAckDeadline( request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, @@ -926,7 +947,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.acknowledge(request); */ acknowledge( request: protos.google.pubsub.v1.IAcknowledgeRequest, @@ -1021,7 +1046,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.pull(request); */ pull( request: protos.google.pubsub.v1.IPullRequest, @@ -1114,7 +1143,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.modifyPushConfig(request); */ modifyPushConfig( request: protos.google.pubsub.v1.IModifyPushConfigRequest, @@ -1199,7 +1232,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.getSnapshot(request); */ getSnapshot( request: protos.google.pubsub.v1.IGetSnapshotRequest, @@ -1312,7 +1349,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.createSnapshot(request); */ createSnapshot( request: protos.google.pubsub.v1.ICreateSnapshotRequest, @@ -1400,7 +1441,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.updateSnapshot(request); */ updateSnapshot( request: protos.google.pubsub.v1.IUpdateSnapshotRequest, @@ -1489,7 +1534,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.deleteSnapshot(request); */ deleteSnapshot( request: protos.google.pubsub.v1.IDeleteSnapshotRequest, @@ -1591,7 +1640,11 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.seek(request); */ seek( request: protos.google.pubsub.v1.ISeekRequest, @@ -1649,6 +1702,15 @@ export class SubscriberClient { * An object stream which is both readable and writable. It accepts objects * representing [StreamingPullRequest]{@link google.pubsub.v1.StreamingPullRequest} for write() method, and * will emit objects representing [StreamingPullResponse]{@link google.pubsub.v1.StreamingPullResponse} on 'data' event asynchronously. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming) + * for more details and examples. + * @example + * const stream = client.streamingPull(); + * stream.on('data', (response) => { ... }); + * stream.on('end', () => { ... }); + * stream.write(request); + * stream.end(); */ streamingPull(options?: gax.CallOptions): gax.CancellableStream { this.initialize(); @@ -1700,19 +1762,14 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Subscription]{@link google.pubsub.v1.Subscription}. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Subscription]{@link google.pubsub.v1.Subscription} that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListSubscriptionsRequest]{@link google.pubsub.v1.ListSubscriptionsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListSubscriptionsResponse]{@link google.pubsub.v1.ListSubscriptionsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listSubscriptions( request: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1756,18 +1813,7 @@ export class SubscriberClient { } /** - * Equivalent to {@link listSubscriptions}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listSubscriptions} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1783,6 +1829,13 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Subscription]{@link google.pubsub.v1.Subscription} on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listSubscriptionsStream( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1807,10 +1860,9 @@ export class SubscriberClient { } /** - * Equivalent to {@link listSubscriptions}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listSubscriptions`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1825,7 +1877,18 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * [Subscription]{@link google.pubsub.v1.Subscription}. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listSubscriptionsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listSubscriptionsAsync( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1898,19 +1961,14 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Snapshot]{@link google.pubsub.v1.Snapshot} that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListSnapshotsRequest]{@link google.pubsub.v1.ListSnapshotsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListSnapshotsResponse]{@link google.pubsub.v1.ListSnapshotsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listSnapshotsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listSnapshots( request: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -1954,18 +2012,7 @@ export class SubscriberClient { } /** - * Equivalent to {@link listSnapshots}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listSnapshots} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1981,6 +2028,13 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Snapshot]{@link google.pubsub.v1.Snapshot} on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listSnapshotsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listSnapshotsStream( request?: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2005,10 +2059,9 @@ export class SubscriberClient { } /** - * Equivalent to {@link listSnapshots}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listSnapshots`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -2023,7 +2076,18 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * [Snapshot]{@link google.pubsub.v1.Snapshot}. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listSnapshotsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listSnapshotsAsync( request?: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2327,9 +2391,10 @@ export class SubscriberClient { } /** - * Terminate the GRPC channel and close the client. + * Terminate the gRPC channel and close the client. * * The client will no longer be usable and all future behavior is undefined. + * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { this.initialize(); diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 63c5711bed0..48ac20fdc68 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "89c849ba5013e45e8fb688b138f33c2ec6083dc5" + "sha": "1f1148d3c7a7a52f0c98077f976bd9b3c948ee2b" } } ], @@ -87,12 +87,14 @@ "README.md", "api-extractor.json", "linkinator.config.json", + "package-lock.json.255908478", "protos/google/pubsub/v1/pubsub.proto", "protos/protos.d.ts", "protos/protos.js", "protos/protos.json", "renovate.json", "samples/README.md", + "samples/package-lock.json.4146806285", "src/v1/index.ts", "src/v1/publisher_client.ts", "src/v1/publisher_client_config.json", From ab165a2681bd4d442d4d6afece5a047a49c86233 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 20 Nov 2020 11:39:17 -0800 Subject: [PATCH 0698/1115] feat: update generator to a new version (#1157) --- handwritten/pubsub/protos/protos.json | 285 ++++++++++++++++-- handwritten/pubsub/src/v1/publisher_client.ts | 273 ++++++++--------- .../pubsub/src/v1/subscriber_client.ts | 267 +++++++--------- handwritten/pubsub/synth.metadata | 4 +- 4 files changed, 485 insertions(+), 344 deletions(-) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 526bf020db9..c67c2cfab0a 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -29,7 +29,18 @@ "(google.api.http).put": "/v1/{name=projects/*/topics/*}", "(google.api.http).body": "*", "(google.api.method_signature)": "name" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "put": "/v1/{name=projects/*/topics/*}", + "body": "*" + } + }, + { + "(google.api.method_signature)": "name" + } + ] }, "UpdateTopic": { "requestType": "UpdateTopicRequest", @@ -37,7 +48,15 @@ "options": { "(google.api.http).patch": "/v1/{topic.name=projects/*/topics/*}", "(google.api.http).body": "*" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "patch": "/v1/{topic.name=projects/*/topics/*}", + "body": "*" + } + } + ] }, "Publish": { "requestType": "PublishRequest", @@ -46,7 +65,18 @@ "(google.api.http).post": "/v1/{topic=projects/*/topics/*}:publish", "(google.api.http).body": "*", "(google.api.method_signature)": "topic,messages" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{topic=projects/*/topics/*}:publish", + "body": "*" + } + }, + { + "(google.api.method_signature)": "topic,messages" + } + ] }, "GetTopic": { "requestType": "GetTopicRequest", @@ -54,7 +84,17 @@ "options": { "(google.api.http).get": "/v1/{topic=projects/*/topics/*}", "(google.api.method_signature)": "topic" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{topic=projects/*/topics/*}" + } + }, + { + "(google.api.method_signature)": "topic" + } + ] }, "ListTopics": { "requestType": "ListTopicsRequest", @@ -62,7 +102,17 @@ "options": { "(google.api.http).get": "/v1/{project=projects/*}/topics", "(google.api.method_signature)": "project" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{project=projects/*}/topics" + } + }, + { + "(google.api.method_signature)": "project" + } + ] }, "ListTopicSubscriptions": { "requestType": "ListTopicSubscriptionsRequest", @@ -70,7 +120,17 @@ "options": { "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/subscriptions", "(google.api.method_signature)": "topic" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{topic=projects/*/topics/*}/subscriptions" + } + }, + { + "(google.api.method_signature)": "topic" + } + ] }, "ListTopicSnapshots": { "requestType": "ListTopicSnapshotsRequest", @@ -78,7 +138,17 @@ "options": { "(google.api.http).get": "/v1/{topic=projects/*/topics/*}/snapshots", "(google.api.method_signature)": "topic" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{topic=projects/*/topics/*}/snapshots" + } + }, + { + "(google.api.method_signature)": "topic" + } + ] }, "DeleteTopic": { "requestType": "DeleteTopicRequest", @@ -86,14 +156,31 @@ "options": { "(google.api.http).delete": "/v1/{topic=projects/*/topics/*}", "(google.api.method_signature)": "topic" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "delete": "/v1/{topic=projects/*/topics/*}" + } + }, + { + "(google.api.method_signature)": "topic" + } + ] }, "DetachSubscription": { "requestType": "DetachSubscriptionRequest", "responseType": "DetachSubscriptionResponse", "options": { "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:detach" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{subscription=projects/*/subscriptions/*}:detach" + } + } + ] } } }, @@ -360,7 +447,18 @@ "(google.api.http).put": "/v1/{name=projects/*/subscriptions/*}", "(google.api.http).body": "*", "(google.api.method_signature)": "name,topic,push_config,ack_deadline_seconds" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "put": "/v1/{name=projects/*/subscriptions/*}", + "body": "*" + } + }, + { + "(google.api.method_signature)": "name,topic,push_config,ack_deadline_seconds" + } + ] }, "GetSubscription": { "requestType": "GetSubscriptionRequest", @@ -368,7 +466,17 @@ "options": { "(google.api.http).get": "/v1/{subscription=projects/*/subscriptions/*}", "(google.api.method_signature)": "subscription" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{subscription=projects/*/subscriptions/*}" + } + }, + { + "(google.api.method_signature)": "subscription" + } + ] }, "UpdateSubscription": { "requestType": "UpdateSubscriptionRequest", @@ -376,7 +484,15 @@ "options": { "(google.api.http).patch": "/v1/{subscription.name=projects/*/subscriptions/*}", "(google.api.http).body": "*" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "patch": "/v1/{subscription.name=projects/*/subscriptions/*}", + "body": "*" + } + } + ] }, "ListSubscriptions": { "requestType": "ListSubscriptionsRequest", @@ -384,7 +500,17 @@ "options": { "(google.api.http).get": "/v1/{project=projects/*}/subscriptions", "(google.api.method_signature)": "project" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{project=projects/*}/subscriptions" + } + }, + { + "(google.api.method_signature)": "project" + } + ] }, "DeleteSubscription": { "requestType": "DeleteSubscriptionRequest", @@ -392,7 +518,17 @@ "options": { "(google.api.http).delete": "/v1/{subscription=projects/*/subscriptions/*}", "(google.api.method_signature)": "subscription" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "delete": "/v1/{subscription=projects/*/subscriptions/*}" + } + }, + { + "(google.api.method_signature)": "subscription" + } + ] }, "ModifyAckDeadline": { "requestType": "ModifyAckDeadlineRequest", @@ -401,7 +537,18 @@ "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline", "(google.api.http).body": "*", "(google.api.method_signature)": "subscription,ack_ids,ack_deadline_seconds" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{subscription=projects/*/subscriptions/*}:modifyAckDeadline", + "body": "*" + } + }, + { + "(google.api.method_signature)": "subscription,ack_ids,ack_deadline_seconds" + } + ] }, "Acknowledge": { "requestType": "AcknowledgeRequest", @@ -410,7 +557,18 @@ "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:acknowledge", "(google.api.http).body": "*", "(google.api.method_signature)": "subscription,ack_ids" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{subscription=projects/*/subscriptions/*}:acknowledge", + "body": "*" + } + }, + { + "(google.api.method_signature)": "subscription,ack_ids" + } + ] }, "Pull": { "requestType": "PullRequest", @@ -419,7 +577,18 @@ "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:pull", "(google.api.http).body": "*", "(google.api.method_signature)": "subscription,return_immediately,max_messages" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{subscription=projects/*/subscriptions/*}:pull", + "body": "*" + } + }, + { + "(google.api.method_signature)": "subscription,return_immediately,max_messages" + } + ] }, "StreamingPull": { "requestType": "StreamingPullRequest", @@ -434,7 +603,18 @@ "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig", "(google.api.http).body": "*", "(google.api.method_signature)": "subscription,push_config" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{subscription=projects/*/subscriptions/*}:modifyPushConfig", + "body": "*" + } + }, + { + "(google.api.method_signature)": "subscription,push_config" + } + ] }, "GetSnapshot": { "requestType": "GetSnapshotRequest", @@ -442,7 +622,17 @@ "options": { "(google.api.http).get": "/v1/{snapshot=projects/*/snapshots/*}", "(google.api.method_signature)": "snapshot" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{snapshot=projects/*/snapshots/*}" + } + }, + { + "(google.api.method_signature)": "snapshot" + } + ] }, "ListSnapshots": { "requestType": "ListSnapshotsRequest", @@ -450,7 +640,17 @@ "options": { "(google.api.http).get": "/v1/{project=projects/*}/snapshots", "(google.api.method_signature)": "project" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{project=projects/*}/snapshots" + } + }, + { + "(google.api.method_signature)": "project" + } + ] }, "CreateSnapshot": { "requestType": "CreateSnapshotRequest", @@ -459,7 +659,18 @@ "(google.api.http).put": "/v1/{name=projects/*/snapshots/*}", "(google.api.http).body": "*", "(google.api.method_signature)": "name,subscription" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "put": "/v1/{name=projects/*/snapshots/*}", + "body": "*" + } + }, + { + "(google.api.method_signature)": "name,subscription" + } + ] }, "UpdateSnapshot": { "requestType": "UpdateSnapshotRequest", @@ -467,7 +678,15 @@ "options": { "(google.api.http).patch": "/v1/{snapshot.name=projects/*/snapshots/*}", "(google.api.http).body": "*" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "patch": "/v1/{snapshot.name=projects/*/snapshots/*}", + "body": "*" + } + } + ] }, "DeleteSnapshot": { "requestType": "DeleteSnapshotRequest", @@ -475,7 +694,17 @@ "options": { "(google.api.http).delete": "/v1/{snapshot=projects/*/snapshots/*}", "(google.api.method_signature)": "snapshot" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "delete": "/v1/{snapshot=projects/*/snapshots/*}" + } + }, + { + "(google.api.method_signature)": "snapshot" + } + ] }, "Seek": { "requestType": "SeekRequest", @@ -483,7 +712,15 @@ "options": { "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:seek", "(google.api.http).body": "*" - } + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{subscription=projects/*/subscriptions/*}:seek", + "body": "*" + } + } + ] } } }, diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 29c5c71bf5f..f58a3f46a42 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -64,10 +64,8 @@ export class PublisherClient { /** * Construct an instance of PublisherClient. * - * @param {object} [options] - The configuration object. - * The options accepted by the constructor are described in detail - * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). - * The common options are: + * @param {object} [options] - The configuration object. See the subsequent + * parameters for more details. * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] * @param {string} [options.credentials.private_key] @@ -87,33 +85,42 @@ export class PublisherClient { * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. - * @param {gax.ClientConfig} [options.clientConfig] - client configuration override. - * TODO(@alexander-fenster): link to gax documentation. - * @param {boolean} fallback - Use HTTP fallback mode. - * In fallback mode, a special browser-compatible transport implementation is used - * instead of gRPC transport. In browser context (if the `window` object is defined) - * the fallback mode is enabled automatically; set `options.fallback` to `false` - * if you need to override this behavior. */ + constructor(opts?: ClientOptions) { - // Ensure that options include all the required fields. + // Ensure that options include the service address and port. const staticMembers = this.constructor as typeof PublisherClient; const servicePath = - opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; - const port = opts?.port || staticMembers.port; - const clientConfig = opts?.clientConfig ?? {}; - const fallback = opts?.fallback ?? typeof window !== 'undefined'; - opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + opts && opts.servicePath + ? opts.servicePath + : opts && opts.apiEndpoint + ? opts.apiEndpoint + : staticMembers.servicePath; + const port = opts && opts.port ? opts.port : staticMembers.port; - // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. - if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { - opts['scopes'] = staticMembers.scopes; + if (!opts) { + opts = {servicePath, port}; } + opts.servicePath = opts.servicePath || servicePath; + opts.port = opts.port || port; + + // users can override the config from client side, like retry codes name. + // The detailed structure of the clientConfig can be found here: https://github.com/googleapis/gax-nodejs/blob/master/src/gax.ts#L546 + // The way to override client config for Showcase API: + // + // const customConfig = {"interfaces": {"google.showcase.v1beta1.Echo": {"methods": {"Echo": {"retry_codes_name": "idempotent", "retry_params_name": "default"}}}}} + // const showcaseClient = new showcaseClient({ projectId, customConfig }); + opts.clientConfig = opts.clientConfig || {}; - // Choose either gRPC or proto-over-HTTP implementation of google-gax. + // If we're running in browser, it's OK to omit `fallback` since + // google-gax has `browser` field in its `package.json`. + // For Electron (which does not respect `browser` field), + // pass `{fallback: true}` to the PublisherClient constructor. this._gaxModule = opts.fallback ? gax.fallback : gax; - // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. + // Create a `gaxGrpc` object, with any grpc-specific options + // sent to the client. + opts.scopes = (this.constructor as typeof PublisherClient).scopes; this._gaxGrpc = new this._gaxModule.GrpcClient(opts); // Save options to use in initialize() method. @@ -121,11 +128,6 @@ export class PublisherClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; - - // Set the default scopes in auth client if needed. - if (servicePath === staticMembers.servicePath) { - this.auth.defaultScopes = staticMembers.scopes; - } this.iamClient = new IamClient(this._gaxGrpc, opts); // Determine the client header string. @@ -311,7 +313,6 @@ export class PublisherClient { /** * The DNS address for this API service. - * @returns {string} The DNS address for this service. */ static get servicePath() { return 'pubsub.googleapis.com'; @@ -320,7 +321,6 @@ export class PublisherClient { /** * The DNS address for this API service - same as servicePath(), * exists for compatibility reasons. - * @returns {string} The DNS address for this service. */ static get apiEndpoint() { return 'pubsub.googleapis.com'; @@ -328,7 +328,6 @@ export class PublisherClient { /** * The port for this API service. - * @returns {number} The default port for this service. */ static get port() { return 443; @@ -337,7 +336,6 @@ export class PublisherClient { /** * The scopes needed to make gRPC calls for every method defined * in this service. - * @returns {string[]} List of default scopes. */ static get scopes() { return [ @@ -350,7 +348,8 @@ export class PublisherClient { getProjectId(callback: Callback): void; /** * Return the project ID used by this class. - * @returns {Promise} A promise that resolves to string containing the project ID. + * @param {function(Error, string)} callback - the callback to + * be called with the current project Id. */ getProjectId( callback?: Callback @@ -421,11 +420,7 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.createTopic(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ createTopic( request: protos.google.pubsub.v1.ITopic, @@ -512,11 +507,7 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.updateTopic(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ updateTopic( request: protos.google.pubsub.v1.IUpdateTopicRequest, @@ -600,11 +591,7 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.publish(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ publish( request: protos.google.pubsub.v1.IPublishRequest, @@ -685,11 +672,7 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.getTopic(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ getTopic( request: protos.google.pubsub.v1.IGetTopicRequest, @@ -774,11 +757,7 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.deleteTopic(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ deleteTopic( request: protos.google.pubsub.v1.IDeleteTopicRequest, @@ -862,11 +841,7 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [DetachSubscriptionResponse]{@link google.pubsub.v1.DetachSubscriptionResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.detachSubscription(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ detachSubscription( request: protos.google.pubsub.v1.IDetachSubscriptionRequest, @@ -954,14 +929,19 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Topic]{@link google.pubsub.v1.Topic}. - * The client library will perform auto-pagination by default: it will call the API as many + * The client library support auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * Note that it can affect your quota. - * We recommend using `listTopicsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Topic]{@link google.pubsub.v1.Topic} that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListTopicsRequest]{@link google.pubsub.v1.ListTopicsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListTopicsResponse]{@link google.pubsub.v1.ListTopicsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. */ listTopics( request: protos.google.pubsub.v1.IListTopicsRequest, @@ -1005,7 +985,18 @@ export class PublisherClient { } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to {@link listTopics}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopics} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1021,13 +1012,6 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Topic]{@link google.pubsub.v1.Topic} on 'data' event. - * The client library will perform auto-pagination by default: it will call the API as many - * times as needed. Note that it can affect your quota. - * We recommend using `listTopicsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. */ listTopicsStream( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1052,9 +1036,10 @@ export class PublisherClient { } /** - * Equivalent to `listTopics`, but returns an iterable object. + * Equivalent to {@link listTopics}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. * - * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1069,18 +1054,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). - * When you iterate the returned iterable, each element will be an object representing - * [Topic]{@link google.pubsub.v1.Topic}. The API will be called under the hood as needed, once per the page, - * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. - * @example - * const iterable = client.listTopicsAsync(request); - * for await (const response of iterable) { - * // process response - * } + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. */ listTopicsAsync( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1153,14 +1127,19 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of string. - * The client library will perform auto-pagination by default: it will call the API as many + * The client library support auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * Note that it can affect your quota. - * We recommend using `listTopicSubscriptionsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of string that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListTopicSubscriptionsRequest]{@link google.pubsub.v1.ListTopicSubscriptionsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListTopicSubscriptionsResponse]{@link google.pubsub.v1.ListTopicSubscriptionsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. */ listTopicSubscriptions( request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1212,7 +1191,18 @@ export class PublisherClient { } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to {@link listTopicSubscriptions}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopicSubscriptions} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1228,13 +1218,6 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing string on 'data' event. - * The client library will perform auto-pagination by default: it will call the API as many - * times as needed. Note that it can affect your quota. - * We recommend using `listTopicSubscriptionsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. */ listTopicSubscriptionsStream( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1259,9 +1242,10 @@ export class PublisherClient { } /** - * Equivalent to `listTopicSubscriptions`, but returns an iterable object. + * Equivalent to {@link listTopicSubscriptions}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. * - * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1276,18 +1260,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). - * When you iterate the returned iterable, each element will be an object representing - * string. The API will be called under the hood as needed, once per the page, - * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. - * @example - * const iterable = client.listTopicSubscriptionsAsync(request); - * for await (const response of iterable) { - * // process response - * } + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. */ listTopicSubscriptionsAsync( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1360,14 +1333,19 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of string. - * The client library will perform auto-pagination by default: it will call the API as many + * The client library support auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * Note that it can affect your quota. - * We recommend using `listTopicSnapshotsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of string that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListTopicSnapshotsRequest]{@link google.pubsub.v1.ListTopicSnapshotsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListTopicSnapshotsResponse]{@link google.pubsub.v1.ListTopicSnapshotsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. */ listTopicSnapshots( request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1413,7 +1391,18 @@ export class PublisherClient { } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to {@link listTopicSnapshots}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listTopicSnapshots} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1429,13 +1418,6 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing string on 'data' event. - * The client library will perform auto-pagination by default: it will call the API as many - * times as needed. Note that it can affect your quota. - * We recommend using `listTopicSnapshotsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. */ listTopicSnapshotsStream( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1460,9 +1442,10 @@ export class PublisherClient { } /** - * Equivalent to `listTopicSnapshots`, but returns an iterable object. + * Equivalent to {@link listTopicSnapshots}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. * - * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1477,18 +1460,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). - * When you iterate the returned iterable, each element will be an object representing - * string. The API will be called under the hood as needed, once per the page, - * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. - * @example - * const iterable = client.listTopicSnapshotsAsync(request); - * for await (const response of iterable) { - * // process response - * } + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. */ listTopicSnapshotsAsync( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1792,10 +1764,9 @@ export class PublisherClient { } /** - * Terminate the gRPC channel and close the client. + * Terminate the GRPC channel and close the client. * * The client will no longer be usable and all future behavior is undefined. - * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { this.initialize(); diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index c36d8ad17a4..c4b15288640 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -65,10 +65,8 @@ export class SubscriberClient { /** * Construct an instance of SubscriberClient. * - * @param {object} [options] - The configuration object. - * The options accepted by the constructor are described in detail - * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). - * The common options are: + * @param {object} [options] - The configuration object. See the subsequent + * parameters for more details. * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] * @param {string} [options.credentials.private_key] @@ -88,33 +86,42 @@ export class SubscriberClient { * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. - * @param {gax.ClientConfig} [options.clientConfig] - client configuration override. - * TODO(@alexander-fenster): link to gax documentation. - * @param {boolean} fallback - Use HTTP fallback mode. - * In fallback mode, a special browser-compatible transport implementation is used - * instead of gRPC transport. In browser context (if the `window` object is defined) - * the fallback mode is enabled automatically; set `options.fallback` to `false` - * if you need to override this behavior. */ + constructor(opts?: ClientOptions) { - // Ensure that options include all the required fields. + // Ensure that options include the service address and port. const staticMembers = this.constructor as typeof SubscriberClient; const servicePath = - opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; - const port = opts?.port || staticMembers.port; - const clientConfig = opts?.clientConfig ?? {}; - const fallback = opts?.fallback ?? typeof window !== 'undefined'; - opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + opts && opts.servicePath + ? opts.servicePath + : opts && opts.apiEndpoint + ? opts.apiEndpoint + : staticMembers.servicePath; + const port = opts && opts.port ? opts.port : staticMembers.port; - // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. - if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { - opts['scopes'] = staticMembers.scopes; + if (!opts) { + opts = {servicePath, port}; } + opts.servicePath = opts.servicePath || servicePath; + opts.port = opts.port || port; + + // users can override the config from client side, like retry codes name. + // The detailed structure of the clientConfig can be found here: https://github.com/googleapis/gax-nodejs/blob/master/src/gax.ts#L546 + // The way to override client config for Showcase API: + // + // const customConfig = {"interfaces": {"google.showcase.v1beta1.Echo": {"methods": {"Echo": {"retry_codes_name": "idempotent", "retry_params_name": "default"}}}}} + // const showcaseClient = new showcaseClient({ projectId, customConfig }); + opts.clientConfig = opts.clientConfig || {}; - // Choose either gRPC or proto-over-HTTP implementation of google-gax. + // If we're running in browser, it's OK to omit `fallback` since + // google-gax has `browser` field in its `package.json`. + // For Electron (which does not respect `browser` field), + // pass `{fallback: true}` to the SubscriberClient constructor. this._gaxModule = opts.fallback ? gax.fallback : gax; - // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. + // Create a `gaxGrpc` object, with any grpc-specific options + // sent to the client. + opts.scopes = (this.constructor as typeof SubscriberClient).scopes; this._gaxGrpc = new this._gaxModule.GrpcClient(opts); // Save options to use in initialize() method. @@ -122,11 +129,6 @@ export class SubscriberClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; - - // Set the default scopes in auth client if needed. - if (servicePath === staticMembers.servicePath) { - this.auth.defaultScopes = staticMembers.scopes; - } this.iamClient = new IamClient(this._gaxGrpc, opts); // Determine the client header string. @@ -297,7 +299,6 @@ export class SubscriberClient { /** * The DNS address for this API service. - * @returns {string} The DNS address for this service. */ static get servicePath() { return 'pubsub.googleapis.com'; @@ -306,7 +307,6 @@ export class SubscriberClient { /** * The DNS address for this API service - same as servicePath(), * exists for compatibility reasons. - * @returns {string} The DNS address for this service. */ static get apiEndpoint() { return 'pubsub.googleapis.com'; @@ -314,7 +314,6 @@ export class SubscriberClient { /** * The port for this API service. - * @returns {number} The default port for this service. */ static get port() { return 443; @@ -323,7 +322,6 @@ export class SubscriberClient { /** * The scopes needed to make gRPC calls for every method defined * in this service. - * @returns {string[]} List of default scopes. */ static get scopes() { return [ @@ -336,7 +334,8 @@ export class SubscriberClient { getProjectId(callback: Callback): void; /** * Return the project ID used by this class. - * @returns {Promise} A promise that resolves to string containing the project ID. + * @param {function(Error, string)} callback - the callback to + * be called with the current project Id. */ getProjectId( callback?: Callback @@ -490,11 +489,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.createSubscription(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ createSubscription( request: protos.google.pubsub.v1.ISubscription, @@ -575,11 +570,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.getSubscription(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ getSubscription( request: protos.google.pubsub.v1.IGetSubscriptionRequest, @@ -663,11 +654,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.updateSubscription(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ updateSubscription( request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, @@ -752,11 +739,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.deleteSubscription(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ deleteSubscription( request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, @@ -852,11 +835,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.modifyAckDeadline(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ modifyAckDeadline( request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, @@ -947,11 +926,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.acknowledge(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ acknowledge( request: protos.google.pubsub.v1.IAcknowledgeRequest, @@ -1046,11 +1021,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.pull(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ pull( request: protos.google.pubsub.v1.IPullRequest, @@ -1143,11 +1114,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.modifyPushConfig(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ modifyPushConfig( request: protos.google.pubsub.v1.IModifyPushConfigRequest, @@ -1232,11 +1199,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.getSnapshot(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ getSnapshot( request: protos.google.pubsub.v1.IGetSnapshotRequest, @@ -1349,11 +1312,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.createSnapshot(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ createSnapshot( request: protos.google.pubsub.v1.ICreateSnapshotRequest, @@ -1441,11 +1400,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.updateSnapshot(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ updateSnapshot( request: protos.google.pubsub.v1.IUpdateSnapshotRequest, @@ -1534,11 +1489,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.deleteSnapshot(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ deleteSnapshot( request: protos.google.pubsub.v1.IDeleteSnapshotRequest, @@ -1640,11 +1591,7 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * const [response] = await client.seek(request); + * The promise has a method named "cancel" which cancels the ongoing API call. */ seek( request: protos.google.pubsub.v1.ISeekRequest, @@ -1702,15 +1649,6 @@ export class SubscriberClient { * An object stream which is both readable and writable. It accepts objects * representing [StreamingPullRequest]{@link google.pubsub.v1.StreamingPullRequest} for write() method, and * will emit objects representing [StreamingPullResponse]{@link google.pubsub.v1.StreamingPullResponse} on 'data' event asynchronously. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming) - * for more details and examples. - * @example - * const stream = client.streamingPull(); - * stream.on('data', (response) => { ... }); - * stream.on('end', () => { ... }); - * stream.write(request); - * stream.end(); */ streamingPull(options?: gax.CallOptions): gax.CancellableStream { this.initialize(); @@ -1762,14 +1700,19 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Subscription]{@link google.pubsub.v1.Subscription}. - * The client library will perform auto-pagination by default: it will call the API as many + * The client library support auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * Note that it can affect your quota. - * We recommend using `listSubscriptionsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Subscription]{@link google.pubsub.v1.Subscription} that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListSubscriptionsRequest]{@link google.pubsub.v1.ListSubscriptionsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListSubscriptionsResponse]{@link google.pubsub.v1.ListSubscriptionsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. */ listSubscriptions( request: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1813,7 +1756,18 @@ export class SubscriberClient { } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to {@link listSubscriptions}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listSubscriptions} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1829,13 +1783,6 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Subscription]{@link google.pubsub.v1.Subscription} on 'data' event. - * The client library will perform auto-pagination by default: it will call the API as many - * times as needed. Note that it can affect your quota. - * We recommend using `listSubscriptionsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. */ listSubscriptionsStream( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1860,9 +1807,10 @@ export class SubscriberClient { } /** - * Equivalent to `listSubscriptions`, but returns an iterable object. + * Equivalent to {@link listSubscriptions}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. * - * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1877,18 +1825,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). - * When you iterate the returned iterable, each element will be an object representing - * [Subscription]{@link google.pubsub.v1.Subscription}. The API will be called under the hood as needed, once per the page, - * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. - * @example - * const iterable = client.listSubscriptionsAsync(request); - * for await (const response of iterable) { - * // process response - * } + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. */ listSubscriptionsAsync( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1961,14 +1898,19 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The client library will perform auto-pagination by default: it will call the API as many + * The client library support auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * Note that it can affect your quota. - * We recommend using `listSnapshotsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. + * + * When autoPaginate: false is specified through options, the array has three elements. + * The first element is Array of [Snapshot]{@link google.pubsub.v1.Snapshot} that corresponds to + * the one page received from the API server. + * If the second element is not null it contains the request object of type [ListSnapshotsRequest]{@link google.pubsub.v1.ListSnapshotsRequest} + * that can be used to obtain the next page of the results. + * If it is null, the next page does not exist. + * The third element contains the raw response received from the API server. Its type is + * [ListSnapshotsResponse]{@link google.pubsub.v1.ListSnapshotsResponse}. + * + * The promise has a method named "cancel" which cancels the ongoing API call. */ listSnapshots( request: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2012,7 +1954,18 @@ export class SubscriberClient { } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to {@link listSnapshots}, but returns a NodeJS Stream object. + * + * This fetches the paged responses for {@link listSnapshots} continuously + * and invokes the callback registered for 'data' event for each element in the + * responses. + * + * The returned object has 'end' method when no more elements are required. + * + * autoPaginate option will be ignored. + * + * @see {@link https://nodejs.org/api/stream.html} + * * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -2028,13 +1981,6 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Snapshot]{@link google.pubsub.v1.Snapshot} on 'data' event. - * The client library will perform auto-pagination by default: it will call the API as many - * times as needed. Note that it can affect your quota. - * We recommend using `listSnapshotsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. */ listSnapshotsStream( request?: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2059,9 +2005,10 @@ export class SubscriberClient { } /** - * Equivalent to `listSnapshots`, but returns an iterable object. + * Equivalent to {@link listSnapshots}, but returns an iterable object. + * + * for-await-of syntax is used with the iterable to recursively get response element on-demand. * - * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -2076,18 +2023,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). - * When you iterate the returned iterable, each element will be an object representing - * [Snapshot]{@link google.pubsub.v1.Snapshot}. The API will be called under the hood as needed, once per the page, - * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. - * @example - * const iterable = client.listSnapshotsAsync(request); - * for await (const response of iterable) { - * // process response - * } + * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. */ listSnapshotsAsync( request?: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2391,10 +2327,9 @@ export class SubscriberClient { } /** - * Terminate the gRPC channel and close the client. + * Terminate the GRPC channel and close the client. * * The client will no longer be usable and all future behavior is undefined. - * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { this.initialize(); diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 48ac20fdc68..5c58375c00a 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "db1f69c4aac5b3abfea12f70d45ceb8b7c957388" + "sha": "4745c10eb062b1816516ce79cec496b388e48b2b" } }, { @@ -87,14 +87,12 @@ "README.md", "api-extractor.json", "linkinator.config.json", - "package-lock.json.255908478", "protos/google/pubsub/v1/pubsub.proto", "protos/protos.d.ts", "protos/protos.js", "protos/protos.json", "renovate.json", "samples/README.md", - "samples/package-lock.json.4146806285", "src/v1/index.ts", "src/v1/publisher_client.ts", "src/v1/publisher_client_config.json", From 1de7b5af903577a42aff45373b025b0163f3042b Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 24 Nov 2020 19:26:52 -0800 Subject: [PATCH 0699/1115] build: stop tracking generated files (#1158) autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. --- handwritten/pubsub/src/pubsub.ts | 6 +- handwritten/pubsub/synth.metadata | 73 +---------------------- handwritten/pubsub/test/message-queues.ts | 4 +- 3 files changed, 7 insertions(+), 76 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index e697a976221..94f0339111e 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -247,9 +247,9 @@ export class PubSub { getSnapshotsStream = paginator.streamify( 'getSnapshots' ) as () => ObjectStream; - getTopicsStream = paginator.streamify('getTopics') as () => ObjectStream< - Topic - >; + getTopicsStream = paginator.streamify( + 'getTopics' + ) as () => ObjectStream; isOpen = true; constructor(options?: ClientConfig) { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 5c58375c00a..199d6a4134c 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "4745c10eb062b1816516ce79cec496b388e48b2b" + "sha": "3b1e99ebde72653a1fa0317820d1218e1c04eb8f" } }, { @@ -33,76 +33,5 @@ "generator": "bazel" } } - ], - "generatedFiles": [ - ".eslintignore", - ".eslintrc.json", - ".gitattributes", - ".github/ISSUE_TEMPLATE/bug_report.md", - ".github/ISSUE_TEMPLATE/feature_request.md", - ".github/ISSUE_TEMPLATE/support_request.md", - ".github/PULL_REQUEST_TEMPLATE.md", - ".github/release-please.yml", - ".github/workflows/ci.yaml", - ".gitignore", - ".jsdoc.js", - ".kokoro/.gitattributes", - ".kokoro/common.cfg", - ".kokoro/continuous/node10/common.cfg", - ".kokoro/continuous/node10/docs.cfg", - ".kokoro/continuous/node10/test.cfg", - ".kokoro/continuous/node12/common.cfg", - ".kokoro/continuous/node12/lint.cfg", - ".kokoro/continuous/node12/samples-test.cfg", - ".kokoro/continuous/node12/system-test.cfg", - ".kokoro/continuous/node12/test.cfg", - ".kokoro/docs.sh", - ".kokoro/lint.sh", - ".kokoro/populate-secrets.sh", - ".kokoro/presubmit/node10/common.cfg", - ".kokoro/presubmit/node12/common.cfg", - ".kokoro/presubmit/node12/samples-test.cfg", - ".kokoro/presubmit/node12/system-test.cfg", - ".kokoro/presubmit/node12/test.cfg", - ".kokoro/publish.sh", - ".kokoro/release/docs-devsite.cfg", - ".kokoro/release/docs-devsite.sh", - ".kokoro/release/docs.cfg", - ".kokoro/release/docs.sh", - ".kokoro/release/publish.cfg", - ".kokoro/samples-test.sh", - ".kokoro/system-test.sh", - ".kokoro/test.bat", - ".kokoro/test.sh", - ".kokoro/trampoline.sh", - ".kokoro/trampoline_v2.sh", - ".mocharc.js", - ".nycrc", - ".prettierignore", - ".prettierrc.js", - ".trampolinerc", - "CODE_OF_CONDUCT.md", - "CONTRIBUTING.md", - "LICENSE", - "README.md", - "api-extractor.json", - "linkinator.config.json", - "protos/google/pubsub/v1/pubsub.proto", - "protos/protos.d.ts", - "protos/protos.js", - "protos/protos.json", - "renovate.json", - "samples/README.md", - "src/v1/index.ts", - "src/v1/publisher_client.ts", - "src/v1/publisher_client_config.json", - "src/v1/publisher_proto_list.json", - "src/v1/subscriber_client.ts", - "src/v1/subscriber_client_config.json", - "src/v1/subscriber_proto_list.json", - "test/gapic_publisher_v1.ts", - "test/gapic_subscriber_v1.ts", - "tsconfig.json", - "webpack.config.js" ] } \ No newline at end of file diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 4f264674f38..5c197d00568 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -87,7 +87,9 @@ describe('MessageQueues', () => { AckQueue = queues.AckQueue; ModAckQueue = queues.ModAckQueue; - MessageQueue = class MessageQueue extends queues.MessageQueue { + MessageQueue = class MessageQueue extends ( + queues.MessageQueue + ) { batches = [] as QueuedMessages[]; protected async _sendBatch(batch: QueuedMessages): Promise { this.batches.push(batch); From ead2ec6085b09c6deff6ae7cb4250cc1e204f1af Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 25 Nov 2020 01:48:57 -0800 Subject: [PATCH 0700/1115] docs: spelling correction for "targetting" (#1159) Co-authored-by: Benjamin E. Coe Source-Author: Samyak Jain Source-Date: Tue Nov 24 20:27:51 2020 +0530 Source-Repo: googleapis/synthtool Source-Sha: 15013eff642a7e7e855aed5a29e6e83c39beba2a Source-Link: https://github.com/googleapis/synthtool/commit/15013eff642a7e7e855aed5a29e6e83c39beba2a --- handwritten/pubsub/README.md | 2 +- handwritten/pubsub/synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 68f5e47f46d..f2536e132a9 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -173,7 +173,7 @@ Our client libraries follow the [Node.js release schedule](https://nodejs.org/en Libraries are compatible with all current _active_ and _maintenance_ versions of Node.js. -Client libraries targetting some end-of-life versions of Node.js are available, and +Client libraries targeting some end-of-life versions of Node.js are available, and can be installed via npm [dist-tags](https://docs.npmjs.com/cli/dist-tag). The dist-tags follow the naming convention `legacy-(version)`. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 199d6a4134c..fc341c98a50 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "3b1e99ebde72653a1fa0317820d1218e1c04eb8f" + "sha": "9bc8241fcf1f063c71a4ff2a97ecae60c9ae405c" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1f1148d3c7a7a52f0c98077f976bd9b3c948ee2b" + "sha": "15013eff642a7e7e855aed5a29e6e83c39beba2a" } } ], From 902b4949c5cc5d63c3c99e446a1df1ba1be296bd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Sun, 29 Nov 2020 22:41:44 -0800 Subject: [PATCH 0701/1115] types: fix lint issue autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. --- handwritten/pubsub/synth.metadata | 2 +- handwritten/pubsub/test/message-queues.ts | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index fc341c98a50..f5ac70b99f7 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "9bc8241fcf1f063c71a4ff2a97ecae60c9ae405c" + "sha": "54745d42d4a13681bfade5eef891a6856d6e4843" } }, { diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 5c197d00568..4f264674f38 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -87,9 +87,7 @@ describe('MessageQueues', () => { AckQueue = queues.AckQueue; ModAckQueue = queues.ModAckQueue; - MessageQueue = class MessageQueue extends ( - queues.MessageQueue - ) { + MessageQueue = class MessageQueue extends queues.MessageQueue { batches = [] as QueuedMessages[]; protected async _sendBatch(batch: QueuedMessages): Promise { this.batches.push(batch); From 2b53d0846b4f9e47f93c1af380646a140038594b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 13:14:35 -0800 Subject: [PATCH 0702/1115] chore: release 2.7.0 (#1156) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 14 ++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index d135fcf4910..a5a5b6e0af9 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,20 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.7.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.6.0...v2.7.0) (2020-11-30) + + +### Features + +* Enable server side flow control by default with the option to turn it off ([#1147](https://www.github.com/googleapis/nodejs-pubsub/issues/1147)) ([a9c7e0b](https://www.github.com/googleapis/nodejs-pubsub/commit/a9c7e0b216a0c228793eeead150cc21b16bd2dcb)) +* update generator to a new version ([#1157](https://www.github.com/googleapis/nodejs-pubsub/issues/1157)) ([3b1e99e](https://www.github.com/googleapis/nodejs-pubsub/commit/3b1e99ebde72653a1fa0317820d1218e1c04eb8f)) + + +### Bug Fixes + +* do not modify options object, use defaultScopes ([#1148](https://www.github.com/googleapis/nodejs-pubsub/issues/1148)) ([4745c10](https://www.github.com/googleapis/nodejs-pubsub/commit/4745c10eb062b1816516ce79cec496b388e48b2b)) +* node 14+ changes how multiple destroy() calls work ([#1153](https://www.github.com/googleapis/nodejs-pubsub/issues/1153)) ([e421749](https://www.github.com/googleapis/nodejs-pubsub/commit/e42174987ec4669b31882943606c871c9b6c08d7)) + ## [2.6.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.5.0...v2.6.0) (2020-10-20) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3d22e171612..ca5d1bbcf36 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.6.0", + "version": "2.7.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 4a326e41001d7055da10211640d4030b16872d33 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 3 Dec 2020 10:56:01 +0100 Subject: [PATCH 0703/1115] chore(deps): update dependency execa to v5 (#1164) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ca5d1bbcf36..b70dac7581b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -80,7 +80,7 @@ "@types/uuid": "^8.0.0", "c8": "^7.0.0", "codecov": "^3.0.0", - "execa": "^4.0.0", + "execa": "^5.0.0", "gts": "^2.0.0", "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", From 2990a662235290e27a8844f9d58d93a60fe2a24a Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 8 Dec 2020 10:02:03 -0800 Subject: [PATCH 0704/1115] tests: add some diagnostics to this potentially flaky test to get more debug info if it happens again (#1167) * tests: add some diagnostics to this potentially flaky test to get more debug info if it happens again * tests: linting nit --- handwritten/pubsub/system-test/pubsub.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 31039e7de09..d4d96e32b43 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -327,6 +327,21 @@ describe('pubsub', () => { const key = message.orderingKey || ''; const data = message.data.toString(); const messages = pending[key]; + + if (!messages) { + deferred.reject( + new Error( + `Unknown key "${key}" for test data: ${JSON.stringify( + pending, + null, + 4 + )}` + ) + ); + subscription.close(); + return; + } + const expected = messages[0]; if (key && data !== expected) { From b80088cc69067ee9f3fa315e1c44082bb05b3848 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 22 Dec 2020 11:42:16 -0800 Subject: [PATCH 0705/1115] docs: add instructions for authenticating for system tests (#1171) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/e893c041-f585-44a0-8a3b-f1f3eee08f43/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/363fe305e9ce34a6cd53951c6ee5f997094b54ee --- handwritten/pubsub/CONTRIBUTING.md | 15 +++++++++++++-- handwritten/pubsub/README.md | 3 +-- handwritten/pubsub/synth.metadata | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/CONTRIBUTING.md b/handwritten/pubsub/CONTRIBUTING.md index f6c4cf010e3..ddc61938c5b 100644 --- a/handwritten/pubsub/CONTRIBUTING.md +++ b/handwritten/pubsub/CONTRIBUTING.md @@ -37,6 +37,15 @@ accept your pull requests. 1. Title your pull request following [Conventional Commits](https://www.conventionalcommits.org/) styling. 1. Submit a pull request. +### Before you begin + +1. [Select or create a Cloud Platform project][projects]. +1. [Enable billing for your project][billing]. +1. [Enable the Google Cloud Pub/Sub API][enable_api]. +1. [Set up authentication with a service account][auth] so you can access the + API from your local workstation. + + ## Running the tests 1. [Prepare your environment for Node.js setup][setup]. @@ -51,11 +60,9 @@ accept your pull requests. npm test # Run sample integration tests. - gcloud auth application-default login npm run samples-test # Run all system tests. - gcloud auth application-default login npm run system-test 1. Lint (and maybe fix) any changes: @@ -63,3 +70,7 @@ accept your pull requests. npm run fix [setup]: https://cloud.google.com/nodejs/docs/setup +[projects]: https://console.cloud.google.com/project +[billing]: https://support.google.com/cloud/answer/6293499#enable-billing +[enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com +[auth]: https://cloud.google.com/docs/authentication/getting-started \ No newline at end of file diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index f2536e132a9..ea2ad0063e0 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -120,8 +120,7 @@ To configure `@google-cloud/pubsub` to use an alternative `grpc` transport: ## Samples -Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree/master/samples) directory. The samples' `README.md` -has instructions for running the samples. +Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree/master/samples) directory. Each sample's `README.md` has instructions for running its sample. | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index f5ac70b99f7..0b2d7215359 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "54745d42d4a13681bfade5eef891a6856d6e4843" + "sha": "15c9ffa0bbf9c29ae70330cb9abd7f9934a697b6" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "15013eff642a7e7e855aed5a29e6e83c39beba2a" + "sha": "363fe305e9ce34a6cd53951c6ee5f997094b54ee" } } ], From f156db8756f988e4bfbaad0f2554e285d6cb98ec Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 1 Jan 2021 02:57:16 -0800 Subject: [PATCH 0706/1115] chore: update license headers (#1172) --- handwritten/pubsub/.jsdoc.js | 4 ++-- handwritten/pubsub/protos/protos.d.ts | 2 +- handwritten/pubsub/protos/protos.js | 2 +- handwritten/pubsub/src/v1/index.ts | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 2 +- handwritten/pubsub/src/v1/subscriber_client.ts | 2 +- handwritten/pubsub/synth.metadata | 2 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 2 +- handwritten/pubsub/test/gapic_subscriber_v1.ts | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index c3850f8ac41..af53b5ba234 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 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 2020 Google LLC', + copyright: 'Copyright 2021 Google LLC', includeDate: false, sourceFiles: false, systemName: '@google-cloud/pubsub', diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index ea22b475ecd..0d71ba59135 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index d24ee24953b..c5313f23ccd 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/index.ts b/handwritten/pubsub/src/v1/index.ts index e2984775c7b..9b1a8d2eb7e 100644 --- a/handwritten/pubsub/src/v1/index.ts +++ b/handwritten/pubsub/src/v1/index.ts @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index f58a3f46a42..a0527bc6e7c 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index c4b15288640..790489db5fe 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 0b2d7215359..61a40a21708 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "15c9ffa0bbf9c29ae70330cb9abd7f9934a697b6" + "sha": "eacade43372ea8058615157c30aaf5e2dfc4e29e" } }, { diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 74eaba4e159..868d224b0d7 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 162282feeab..86d84260d42 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From b8e5f06a432470b3426d6aa47fc3ed14e711f809 Mon Sep 17 00:00:00 2001 From: Lalji Kanjareeya <46327204+laljikanjareeya@users.noreply.github.com> Date: Fri, 8 Jan 2021 01:33:49 +0530 Subject: [PATCH 0707/1115] fix(deps): update opentelemetry monorepo to ^0.12.0 (#1162) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/package.json | 4 ++-- handwritten/pubsub/src/publisher/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b70dac7581b..14e347b38e8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,8 +53,8 @@ "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", - "@opentelemetry/api": "^0.11.0", - "@opentelemetry/tracing": "^0.11.0", + "@opentelemetry/api": "^0.12.0", + "@opentelemetry/tracing": "^0.12.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 0dc0099d398..27ee9bf3b29 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -264,7 +264,7 @@ export class Publisher { constructSpan(message: PubsubMessage): Span | undefined { const spanAttributes = { data: message.data, - }; + } as Attributes; const span: Span | undefined = this.tracing ? this.tracing.createSpan(`${this.topic.name} publisher`, spanAttributes) : undefined; From a0d0ce691e1b4f0dd1ab57eee1e484a61fac749c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 8 Jan 2021 12:27:19 -0800 Subject: [PATCH 0708/1115] changes without context (#1175) autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/protos/protos.d.ts | 12 +++++ handwritten/pubsub/protos/protos.js | 78 ++++++++++++++++++++++++++- handwritten/pubsub/protos/protos.json | 13 ++++- handwritten/pubsub/synth.metadata | 2 +- 4 files changed, 102 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 0d71ba59135..a224ed79f2e 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -5317,6 +5317,9 @@ export namespace google { /** ResourceDescriptor singular */ singular?: (string|null); + + /** ResourceDescriptor style */ + style?: (google.api.ResourceDescriptor.Style[]|null); } /** Represents a ResourceDescriptor. */ @@ -5346,6 +5349,9 @@ export namespace google { /** ResourceDescriptor singular. */ public singular: string; + /** ResourceDescriptor style. */ + public style: google.api.ResourceDescriptor.Style[]; + /** * Creates a new ResourceDescriptor instance using the specified properties. * @param [properties] Properties to set @@ -5425,6 +5431,12 @@ export namespace google { ORIGINALLY_SINGLE_PATTERN = 1, FUTURE_MULTI_PATTERN = 2 } + + /** Style enum. */ + enum Style { + STYLE_UNSPECIFIED = 0, + DECLARATIVE_FRIENDLY = 1 + } } /** Properties of a ResourceReference. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index c5313f23ccd..95137e36259 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -12222,6 +12222,7 @@ * @property {google.api.ResourceDescriptor.History|null} [history] ResourceDescriptor history * @property {string|null} [plural] ResourceDescriptor plural * @property {string|null} [singular] ResourceDescriptor singular + * @property {Array.|null} [style] ResourceDescriptor style */ /** @@ -12234,6 +12235,7 @@ */ function ResourceDescriptor(properties) { this.pattern = []; + this.style = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -12288,6 +12290,14 @@ */ ResourceDescriptor.prototype.singular = ""; + /** + * ResourceDescriptor style. + * @member {Array.} style + * @memberof google.api.ResourceDescriptor + * @instance + */ + ResourceDescriptor.prototype.style = $util.emptyArray; + /** * Creates a new ResourceDescriptor instance using the specified properties. * @function create @@ -12325,6 +12335,12 @@ writer.uint32(/* id 5, wireType 2 =*/42).string(message.plural); if (message.singular != null && Object.hasOwnProperty.call(message, "singular")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.singular); + if (message.style != null && message.style.length) { + writer.uint32(/* id 10, wireType 2 =*/82).fork(); + for (var i = 0; i < message.style.length; ++i) + writer.int32(message.style[i]); + writer.ldelim(); + } return writer; }; @@ -12379,6 +12395,16 @@ case 6: message.singular = reader.string(); break; + case 10: + if (!(message.style && message.style.length)) + message.style = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.style.push(reader.int32()); + } else + message.style.push(reader.int32()); + break; default: reader.skipType(tag & 7); break; @@ -12442,6 +12468,18 @@ if (message.singular != null && message.hasOwnProperty("singular")) if (!$util.isString(message.singular)) return "singular: string expected"; + if (message.style != null && message.hasOwnProperty("style")) { + if (!Array.isArray(message.style)) + return "style: array expected"; + for (var i = 0; i < message.style.length; ++i) + switch (message.style[i]) { + default: + return "style: enum value[] expected"; + case 0: + case 1: + break; + } + } return null; }; @@ -12486,6 +12524,23 @@ message.plural = String(object.plural); if (object.singular != null) message.singular = String(object.singular); + if (object.style) { + if (!Array.isArray(object.style)) + throw TypeError(".google.api.ResourceDescriptor.style: array expected"); + message.style = []; + for (var i = 0; i < object.style.length; ++i) + switch (object.style[i]) { + default: + case "STYLE_UNSPECIFIED": + case 0: + message.style[i] = 0; + break; + case "DECLARATIVE_FRIENDLY": + case 1: + message.style[i] = 1; + break; + } + } return message; }; @@ -12502,8 +12557,10 @@ if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) + if (options.arrays || options.defaults) { object.pattern = []; + object.style = []; + } if (options.defaults) { object.type = ""; object.nameField = ""; @@ -12526,6 +12583,11 @@ object.plural = message.plural; if (message.singular != null && message.hasOwnProperty("singular")) object.singular = message.singular; + if (message.style && message.style.length) { + object.style = []; + for (var j = 0; j < message.style.length; ++j) + object.style[j] = options.enums === String ? $root.google.api.ResourceDescriptor.Style[message.style[j]] : message.style[j]; + } return object; }; @@ -12556,6 +12618,20 @@ return values; })(); + /** + * Style enum. + * @name google.api.ResourceDescriptor.Style + * @enum {number} + * @property {number} STYLE_UNSPECIFIED=0 STYLE_UNSPECIFIED value + * @property {number} DECLARATIVE_FRIENDLY=1 DECLARATIVE_FRIENDLY value + */ + ResourceDescriptor.Style = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STYLE_UNSPECIFIED"] = 0; + values[valuesById[1] = "DECLARATIVE_FRIENDLY"] = 1; + return values; + })(); + return ResourceDescriptor; })(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index c67c2cfab0a..cb4b5356b9f 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1447,6 +1447,11 @@ "singular": { "type": "string", "id": 6 + }, + "style": { + "rule": "repeated", + "type": "Style", + "id": 10 } }, "nested": { @@ -1456,6 +1461,12 @@ "ORIGINALLY_SINGLE_PATTERN": 1, "FUTURE_MULTI_PATTERN": 2 } + }, + "Style": { + "values": { + "STYLE_UNSPECIFIED": 0, + "DECLARATIVE_FRIENDLY": 1 + } } } }, @@ -1475,7 +1486,7 @@ }, "protobuf": { "options": { - "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", + "go_package": "google.golang.org/protobuf/types/descriptorpb", "java_package": "com.google.protobuf", "java_outer_classname": "DescriptorProtos", "csharp_namespace": "Google.Protobuf.Reflection", diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 61a40a21708..61e7c5b3021 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "eacade43372ea8058615157c30aaf5e2dfc4e29e" + "sha": "cf3f31f70156a450054428aa1054e641af0d6531" } }, { From 0391b13e826655ebfb53bd234b7b5ac62225f41c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 8 Jan 2021 13:04:55 -0800 Subject: [PATCH 0709/1115] feat: schema proto support (#1176) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * fix: do not modify options object, use defaultScopes docs: regenerated jsdoc comments with examples build: use gapic-generator-typescript v1.2.1 Note: these change require google-gax "^2.9.2". @alexander-fenster will make sure the google-gax version is bumped across libraries. PiperOrigin-RevId: 341102751 Source-Author: Google APIs Source-Date: Fri Nov 6 12:56:54 2020 -0800 Source-Repo: googleapis/googleapis Source-Sha: b759c563bacf9cd15749be4d2bdd276d3f48ee29 Source-Link: https://github.com/googleapis/googleapis/commit/b759c563bacf9cd15749be4d2bdd276d3f48ee29 * fix: better fallback feature detection, jsdoc update Use gapic-generator-typescript v1.2.2. PiperOrigin-RevId: 342778480 Source-Author: Google APIs Source-Date: Mon Nov 16 20:22:00 2020 -0800 Source-Repo: googleapis/googleapis Source-Sha: c6b1c72942991b1c605fe56a6041e06a86a9443e Source-Link: https://github.com/googleapis/googleapis/commit/c6b1c72942991b1c605fe56a6041e06a86a9443e * fix: linting, updated jsdoc blocks Use gapic-generator-typescript v1.2.3. PiperOrigin-RevId: 342976840 Source-Author: Google APIs Source-Date: Tue Nov 17 17:04:11 2020 -0800 Source-Repo: googleapis/googleapis Source-Sha: c979fbeb80d1b940790a69183629d799e4c05b4c Source-Link: https://github.com/googleapis/googleapis/commit/c979fbeb80d1b940790a69183629d799e4c05b4c * fix: use optional chaining for window.fetch feature detection Use gapic-generator-typescript v1.2.4. Committer: @alexander-fenster PiperOrigin-RevId: 343136730 Source-Author: Google APIs Source-Date: Wed Nov 18 12:49:25 2020 -0800 Source-Repo: googleapis/googleapis Source-Sha: 2cda8d285b66c14da57363201b7e4efbca47d034 Source-Link: https://github.com/googleapis/googleapis/commit/2cda8d285b66c14da57363201b7e4efbca47d034 * fix: mark window as global for linter Use gapic-generator-typescript v1.2.5. Committer: @alexander-fenster PiperOrigin-RevId: 343187793 Source-Author: Google APIs Source-Date: Wed Nov 18 17:10:02 2020 -0800 Source-Repo: googleapis/googleapis Source-Sha: 5587028631d4d743fd906c4eb4e4e4649a7ee5ce Source-Link: https://github.com/googleapis/googleapis/commit/5587028631d4d743fd906c4eb4e4e4649a7ee5ce * feat: add schema service PiperOrigin-RevId: 348038736 Source-Author: Google APIs Source-Date: Thu Dec 17 09:47:03 2020 -0800 Source-Repo: googleapis/googleapis Source-Sha: 41d8fbfec9d4bc4a8859f78185713950913b4bf3 Source-Link: https://github.com/googleapis/googleapis/commit/41d8fbfec9d4bc4a8859f78185713950913b4bf3 Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- .../protos/google/pubsub/v1/pubsub.proto | 33 +- .../protos/google/pubsub/v1/schema.proto | 289 ++ handwritten/pubsub/protos/protos.d.ts | 1257 ++++++++ handwritten/pubsub/protos/protos.js | 2832 +++++++++++++++++ handwritten/pubsub/protos/protos.json | 342 +- handwritten/pubsub/src/v1/index.ts | 1 + handwritten/pubsub/src/v1/publisher_client.ts | 433 ++- .../pubsub/src/v1/publisher_proto_list.json | 3 +- .../pubsub/src/v1/schema_service_client.ts | 1328 ++++++++ .../src/v1/schema_service_client_config.json | 50 + .../src/v1/schema_service_proto_list.json | 4 + .../pubsub/src/v1/subscriber_client.ts | 478 +-- .../pubsub/src/v1/subscriber_proto_list.json | 3 +- handwritten/pubsub/synth.metadata | 4 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 49 + .../pubsub/test/gapic_schema_service_v1.ts | 1598 ++++++++++ .../pubsub/test/gapic_subscriber_v1.ts | 49 + 17 files changed, 8386 insertions(+), 367 deletions(-) create mode 100644 handwritten/pubsub/protos/google/pubsub/v1/schema.proto create mode 100644 handwritten/pubsub/src/v1/schema_service_client.ts create mode 100644 handwritten/pubsub/src/v1/schema_service_client_config.json create mode 100644 handwritten/pubsub/src/v1/schema_service_proto_list.json create mode 100644 handwritten/pubsub/test/gapic_schema_service_v1.ts diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 909863eb98b..9bc678e3ae7 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -24,6 +24,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; +import "google/pubsub/v1/schema.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.PubSub.V1"; @@ -42,8 +43,8 @@ service Publisher { "https://www.googleapis.com/auth/cloud-platform," "https://www.googleapis.com/auth/pubsub"; - // Creates the given topic with the given name. See the [resource name rules]( - // https://cloud.google.com/pubsub/docs/admin#resource_names). + // Creates the given topic with the given name. See the [resource name rules] + // (https://cloud.google.com/pubsub/docs/admin#resource_names). rpc CreateTopic(Topic) returns (Topic) { option (google.api.http) = { put: "/v1/{name=projects/*/topics/*}" @@ -143,6 +144,21 @@ message MessageStoragePolicy { repeated string allowed_persistence_regions = 1; } +// Settings for validating messages published against a schema. +message SchemaSettings { + // Required. The name of the schema that messages published should be + // validated against. Format is `projects/{project}/schemas/{schema}`. The + // value of this field will be `_deleted-schema_` if the schema has been + // deleted. + string schema = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } + ]; + + // The encoding of messages validated against `schema`. + Encoding encoding = 2; +} + // A topic resource. message Topic { option (google.api.resource) = { @@ -173,6 +189,15 @@ message Topic { // // The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*`. string kms_key_name = 5; + + // Settings for validating messages published against a schema. + // + // EXPERIMENTAL: Schema support is in development and may not work yet. + SchemaSettings schema_settings = 6; + + // Reserved for future use. This field is set only in responses from the + // server; it is ignored if it is set in any requests. + bool satisfies_pzs = 7; } // A message that is published by publishers and consumed by subscribers. The @@ -587,8 +612,8 @@ service Subscriber { } // Seeks an existing subscription to a point in time or to a given snapshot, - // whichever is provided in the request. Snapshots are used in [Seek]( - // https://cloud.google.com/pubsub/docs/replay-overview) operations, which + // whichever is provided in the request. Snapshots are used in [Seek] + // (https://cloud.google.com/pubsub/docs/replay-overview) operations, which // allow you to manage message acknowledgments in bulk. That is, you can set // the acknowledgment state of messages in an existing subscription to the // state captured by a snapshot. Note that both the subscription and the diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto new file mode 100644 index 00000000000..ae402ac4de2 --- /dev/null +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -0,0 +1,289 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.pubsub.v1; + +import "google/api/annotations.proto"; +import "google/api/client.proto"; +import "google/api/field_behavior.proto"; +import "google/api/resource.proto"; +import "google/protobuf/empty.proto"; + +option cc_enable_arenas = true; +option csharp_namespace = "Google.Cloud.PubSub.V1"; +option go_package = "google.golang.org/genproto/googleapis/pubsub/v1;pubsub"; +option java_multiple_files = true; +option java_outer_classname = "SchemaProto"; +option java_package = "com.google.pubsub.v1"; +option php_namespace = "Google\\Cloud\\PubSub\\V1"; +option ruby_package = "Google::Cloud::PubSub::V1"; + +// Service for doing schema-related operations. +// +// EXPERIMENTAL: The Schema service is in development and may not work yet. + +service SchemaService { + option (google.api.default_host) = "pubsub.googleapis.com"; + option (google.api.oauth_scopes) = + "https://www.googleapis.com/auth/cloud-platform," + "https://www.googleapis.com/auth/pubsub"; + + // Creates a schema. + rpc CreateSchema(CreateSchemaRequest) returns (Schema) { + option (google.api.http) = { + post: "/v1/{parent=projects/*}/schemas" + body: "schema" + }; + option (google.api.method_signature) = "parent,schema,schema_id"; + } + + // Gets a schema. + rpc GetSchema(GetSchemaRequest) returns (Schema) { + option (google.api.http) = { + get: "/v1/{name=projects/*/schemas/*}" + }; + option (google.api.method_signature) = "name"; + } + + // Lists schemas in a project. + rpc ListSchemas(ListSchemasRequest) returns (ListSchemasResponse) { + option (google.api.http) = { + get: "/v1/{parent=projects/*}/schemas" + }; + option (google.api.method_signature) = "parent"; + } + + // Deletes a schema. + rpc DeleteSchema(DeleteSchemaRequest) returns (google.protobuf.Empty) { + option (google.api.http) = { + delete: "/v1/{name=projects/*/schemas/*}" + }; + option (google.api.method_signature) = "name"; + } + + // Validates a schema. + rpc ValidateSchema(ValidateSchemaRequest) returns (ValidateSchemaResponse) { + option (google.api.http) = { + post: "/v1/{parent=projects/*}/schemas:validate" + body: "*" + }; + option (google.api.method_signature) = "parent,schema"; + } + + // Validates a message against a schema. + rpc ValidateMessage(ValidateMessageRequest) + returns (ValidateMessageResponse) { + option (google.api.http) = { + post: "/v1/{parent=projects/*}/schemas:validateMessage" + body: "*" + }; + } +} + +// A schema resource. +message Schema { + option (google.api.resource) = { + type: "pubsub.googleapis.com/Schema" + pattern: "projects/{project}/schemas/{schema}" + }; + + // Possible schema definition types. + enum Type { + // Default value. This value is unused. + TYPE_UNSPECIFIED = 0; + + // A Protocol Buffer schema definition. + PROTOCOL_BUFFER = 1; + + // An Avro schema definition. + AVRO = 2; + } + + // Required. Name of the schema. + // Format is `projects/{project}/schemas/{schema}`. + string name = 1 [(google.api.field_behavior) = REQUIRED]; + + // The type of the schema definition. + Type type = 2; + + // The definition of the schema. This should contain a string representing + // the full definition of the schema that is a valid schema definition of + // the type specified in `type`. + string definition = 3; +} + +// Request for the CreateSchema method. +message CreateSchemaRequest { + // Required. The name of the project in which to create the schema. + // Format is `projects/{project-id}`. + string parent = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + child_type: "pubsub.googleapis.com/Schema" + } + ]; + + // Required. The schema object to create. + // + // This schema's `name` parameter is ignored. The schema object returned + // by CreateSchema will have a `name` made using the given `parent` and + // `schema_id`. + Schema schema = 2 [(google.api.field_behavior) = REQUIRED]; + + // The ID to use for the schema, which will become the final component of + // the schema's resource name. + // + // See https://cloud.google.com/pubsub/docs/admin#resource_names for resource + // name constraints. + string schema_id = 3; +} + +// View of Schema object fields to be returned by GetSchema and ListSchemas. +enum SchemaView { + // The default / unset value. + // The API will default to the BASIC view. + SCHEMA_VIEW_UNSPECIFIED = 0; + + // Include the name and type of the schema, but not the definition. + BASIC = 1; + + // Include all Schema object fields. + FULL = 2; +} + +// Request for the GetSchema method. +message GetSchemaRequest { + // Required. The name of the schema to get. + // Format is `projects/{project}/schemas/{schema}`. + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } + ]; + + // The set of fields to return in the response. If not set, returns a Schema + // with `name` and `type`, but not `definition`. Set to `FULL` to retrieve all + // fields. + SchemaView view = 2; +} + +// Request for the `ListSchemas` method. +message ListSchemasRequest { + // Required. The name of the project in which to list schemas. + // Format is `projects/{project-id}`. + string parent = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "cloudresourcemanager.googleapis.com/Project" + } + ]; + + // The set of Schema fields to return in the response. If not set, returns + // Schemas with `name` and `type`, but not `definition`. Set to `FULL` to + // retrieve all fields. + SchemaView view = 2; + + // Maximum number of schemas to return. + int32 page_size = 3; + + // The value returned by the last `ListSchemasResponse`; indicates that + // this is a continuation of a prior `ListSchemas` call, and that the + // system should return the next page of data. + string page_token = 4; +} + +// Response for the `ListSchemas` method. +message ListSchemasResponse { + // The resulting schemas. + repeated Schema schemas = 1; + + // If not empty, indicates that there may be more schemas that match the + // request; this value should be passed in a new `ListSchemasRequest`. + string next_page_token = 2; +} + +// Request for the `DeleteSchema` method. +message DeleteSchemaRequest { + // Required. Name of the schema to delete. + // Format is `projects/{project}/schemas/{schema}`. + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } + ]; +} + +// Request for the `ValidateSchema` method. +message ValidateSchemaRequest { + // Required. The name of the project in which to validate schemas. + // Format is `projects/{project-id}`. + string parent = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "cloudresourcemanager.googleapis.com/Project" + } + ]; + + // Required. The schema object to validate. + Schema schema = 2 [(google.api.field_behavior) = REQUIRED]; +} + +// Response for the `ValidateSchema` method. +message ValidateSchemaResponse {} + +// Request for the `ValidateMessage` method. +message ValidateMessageRequest { + // Required. The name of the project in which to validate schemas. + // Format is `projects/{project-id}`. + string parent = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + type: "cloudresourcemanager.googleapis.com/Project" + } + ]; + + oneof schema_spec { + // Name of the schema against which to validate. + // + // Format is `projects/{project}/schemas/{schema}`. + string name = 2 [ + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } + ]; + + // Ad-hoc schema against which to validate + Schema schema = 3; + } + + // Message to validate against the provided `schema_spec`. + bytes message = 4; + + // The encoding expected for messages + Encoding encoding = 5; +} + +// Response for the `ValidateMessage` method. +message ValidateMessageResponse {} + +// Possible encoding types for messages. +enum Encoding { + // Unspecified + ENCODING_UNSPECIFIED = 0; + + // JSON encoding + JSON = 1; + + // Binary encoding, as defined by the schema type. For some schema types, + // binary encoding may not be available. + BINARY = 2; +} diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index a224ed79f2e..3f1eff32313 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -326,6 +326,102 @@ export namespace google { public toJSON(): { [k: string]: any }; } + /** Properties of a SchemaSettings. */ + interface ISchemaSettings { + + /** SchemaSettings schema */ + schema?: (string|null); + + /** SchemaSettings encoding */ + encoding?: (google.pubsub.v1.Encoding|keyof typeof google.pubsub.v1.Encoding|null); + } + + /** Represents a SchemaSettings. */ + class SchemaSettings implements ISchemaSettings { + + /** + * Constructs a new SchemaSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISchemaSettings); + + /** SchemaSettings schema. */ + public schema: string; + + /** SchemaSettings encoding. */ + public encoding: (google.pubsub.v1.Encoding|keyof typeof google.pubsub.v1.Encoding); + + /** + * Creates a new SchemaSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns SchemaSettings instance + */ + public static create(properties?: google.pubsub.v1.ISchemaSettings): google.pubsub.v1.SchemaSettings; + + /** + * Encodes the specified SchemaSettings message. Does not implicitly {@link google.pubsub.v1.SchemaSettings.verify|verify} messages. + * @param message SchemaSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISchemaSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SchemaSettings message, length delimited. Does not implicitly {@link google.pubsub.v1.SchemaSettings.verify|verify} messages. + * @param message SchemaSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISchemaSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SchemaSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SchemaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.SchemaSettings; + + /** + * Decodes a SchemaSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SchemaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.SchemaSettings; + + /** + * Verifies a SchemaSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SchemaSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SchemaSettings + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.SchemaSettings; + + /** + * Creates a plain object from a SchemaSettings message. Also converts values to other types if specified. + * @param message SchemaSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.SchemaSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SchemaSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + /** Properties of a Topic. */ interface ITopic { @@ -340,6 +436,12 @@ export namespace google { /** Topic kmsKeyName */ kmsKeyName?: (string|null); + + /** Topic schemaSettings */ + schemaSettings?: (google.pubsub.v1.ISchemaSettings|null); + + /** Topic satisfiesPzs */ + satisfiesPzs?: (boolean|null); } /** Represents a Topic. */ @@ -363,6 +465,12 @@ export namespace google { /** Topic kmsKeyName. */ public kmsKeyName: string; + /** Topic schemaSettings. */ + public schemaSettings?: (google.pubsub.v1.ISchemaSettings|null); + + /** Topic satisfiesPzs. */ + public satisfiesPzs: boolean; + /** * Creates a new Topic instance using the specified properties. * @param [properties] Properties to set @@ -4942,6 +5050,1155 @@ export namespace google { */ public toJSON(): { [k: string]: any }; } + + /** Represents a SchemaService */ + class SchemaService extends $protobuf.rpc.Service { + + /** + * Constructs a new SchemaService service. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + */ + constructor(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean); + + /** + * Creates new SchemaService service using the specified rpc implementation. + * @param rpcImpl RPC implementation + * @param [requestDelimited=false] Whether requests are length-delimited + * @param [responseDelimited=false] Whether responses are length-delimited + * @returns RPC service. Useful where requests and/or responses are streamed. + */ + public static create(rpcImpl: $protobuf.RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): SchemaService; + + /** + * Calls CreateSchema. + * @param request CreateSchemaRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Schema + */ + public createSchema(request: google.pubsub.v1.ICreateSchemaRequest, callback: google.pubsub.v1.SchemaService.CreateSchemaCallback): void; + + /** + * Calls CreateSchema. + * @param request CreateSchemaRequest message or plain object + * @returns Promise + */ + public createSchema(request: google.pubsub.v1.ICreateSchemaRequest): Promise; + + /** + * Calls GetSchema. + * @param request GetSchemaRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Schema + */ + public getSchema(request: google.pubsub.v1.IGetSchemaRequest, callback: google.pubsub.v1.SchemaService.GetSchemaCallback): void; + + /** + * Calls GetSchema. + * @param request GetSchemaRequest message or plain object + * @returns Promise + */ + public getSchema(request: google.pubsub.v1.IGetSchemaRequest): Promise; + + /** + * Calls ListSchemas. + * @param request ListSchemasRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSchemasResponse + */ + public listSchemas(request: google.pubsub.v1.IListSchemasRequest, callback: google.pubsub.v1.SchemaService.ListSchemasCallback): void; + + /** + * Calls ListSchemas. + * @param request ListSchemasRequest message or plain object + * @returns Promise + */ + public listSchemas(request: google.pubsub.v1.IListSchemasRequest): Promise; + + /** + * Calls DeleteSchema. + * @param request DeleteSchemaRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Empty + */ + public deleteSchema(request: google.pubsub.v1.IDeleteSchemaRequest, callback: google.pubsub.v1.SchemaService.DeleteSchemaCallback): void; + + /** + * Calls DeleteSchema. + * @param request DeleteSchemaRequest message or plain object + * @returns Promise + */ + public deleteSchema(request: google.pubsub.v1.IDeleteSchemaRequest): Promise; + + /** + * Calls ValidateSchema. + * @param request ValidateSchemaRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ValidateSchemaResponse + */ + public validateSchema(request: google.pubsub.v1.IValidateSchemaRequest, callback: google.pubsub.v1.SchemaService.ValidateSchemaCallback): void; + + /** + * Calls ValidateSchema. + * @param request ValidateSchemaRequest message or plain object + * @returns Promise + */ + public validateSchema(request: google.pubsub.v1.IValidateSchemaRequest): Promise; + + /** + * Calls ValidateMessage. + * @param request ValidateMessageRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ValidateMessageResponse + */ + public validateMessage(request: google.pubsub.v1.IValidateMessageRequest, callback: google.pubsub.v1.SchemaService.ValidateMessageCallback): void; + + /** + * Calls ValidateMessage. + * @param request ValidateMessageRequest message or plain object + * @returns Promise + */ + public validateMessage(request: google.pubsub.v1.IValidateMessageRequest): Promise; + } + + namespace SchemaService { + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#createSchema}. + * @param error Error, if any + * @param [response] Schema + */ + type CreateSchemaCallback = (error: (Error|null), response?: google.pubsub.v1.Schema) => void; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#getSchema}. + * @param error Error, if any + * @param [response] Schema + */ + type GetSchemaCallback = (error: (Error|null), response?: google.pubsub.v1.Schema) => void; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#listSchemas}. + * @param error Error, if any + * @param [response] ListSchemasResponse + */ + type ListSchemasCallback = (error: (Error|null), response?: google.pubsub.v1.ListSchemasResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#deleteSchema}. + * @param error Error, if any + * @param [response] Empty + */ + type DeleteSchemaCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#validateSchema}. + * @param error Error, if any + * @param [response] ValidateSchemaResponse + */ + type ValidateSchemaCallback = (error: (Error|null), response?: google.pubsub.v1.ValidateSchemaResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#validateMessage}. + * @param error Error, if any + * @param [response] ValidateMessageResponse + */ + type ValidateMessageCallback = (error: (Error|null), response?: google.pubsub.v1.ValidateMessageResponse) => void; + } + + /** Properties of a Schema. */ + interface ISchema { + + /** Schema name */ + name?: (string|null); + + /** Schema type */ + type?: (google.pubsub.v1.Schema.Type|keyof typeof google.pubsub.v1.Schema.Type|null); + + /** Schema definition */ + definition?: (string|null); + } + + /** Represents a Schema. */ + class Schema implements ISchema { + + /** + * Constructs a new Schema. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ISchema); + + /** Schema name. */ + public name: string; + + /** Schema type. */ + public type: (google.pubsub.v1.Schema.Type|keyof typeof google.pubsub.v1.Schema.Type); + + /** Schema definition. */ + public definition: string; + + /** + * Creates a new Schema instance using the specified properties. + * @param [properties] Properties to set + * @returns Schema instance + */ + public static create(properties?: google.pubsub.v1.ISchema): google.pubsub.v1.Schema; + + /** + * Encodes the specified Schema message. Does not implicitly {@link google.pubsub.v1.Schema.verify|verify} messages. + * @param message Schema message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ISchema, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Schema message, length delimited. Does not implicitly {@link google.pubsub.v1.Schema.verify|verify} messages. + * @param message Schema message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ISchema, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Schema message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Schema + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Schema; + + /** + * Decodes a Schema message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Schema + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Schema; + + /** + * Verifies a Schema message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Schema message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Schema + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Schema; + + /** + * Creates a plain object from a Schema message. Also converts values to other types if specified. + * @param message Schema + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Schema, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Schema to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace Schema { + + /** Type enum. */ + enum Type { + TYPE_UNSPECIFIED = 0, + PROTOCOL_BUFFER = 1, + AVRO = 2 + } + } + + /** Properties of a CreateSchemaRequest. */ + interface ICreateSchemaRequest { + + /** CreateSchemaRequest parent */ + parent?: (string|null); + + /** CreateSchemaRequest schema */ + schema?: (google.pubsub.v1.ISchema|null); + + /** CreateSchemaRequest schemaId */ + schemaId?: (string|null); + } + + /** Represents a CreateSchemaRequest. */ + class CreateSchemaRequest implements ICreateSchemaRequest { + + /** + * Constructs a new CreateSchemaRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ICreateSchemaRequest); + + /** CreateSchemaRequest parent. */ + public parent: string; + + /** CreateSchemaRequest schema. */ + public schema?: (google.pubsub.v1.ISchema|null); + + /** CreateSchemaRequest schemaId. */ + public schemaId: string; + + /** + * Creates a new CreateSchemaRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns CreateSchemaRequest instance + */ + public static create(properties?: google.pubsub.v1.ICreateSchemaRequest): google.pubsub.v1.CreateSchemaRequest; + + /** + * Encodes the specified CreateSchemaRequest message. Does not implicitly {@link google.pubsub.v1.CreateSchemaRequest.verify|verify} messages. + * @param message CreateSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ICreateSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CreateSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSchemaRequest.verify|verify} messages. + * @param message CreateSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ICreateSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CreateSchemaRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CreateSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CreateSchemaRequest; + + /** + * Decodes a CreateSchemaRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CreateSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CreateSchemaRequest; + + /** + * Verifies a CreateSchemaRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CreateSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CreateSchemaRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CreateSchemaRequest; + + /** + * Creates a plain object from a CreateSchemaRequest message. Also converts values to other types if specified. + * @param message CreateSchemaRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.CreateSchemaRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CreateSchemaRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** SchemaView enum. */ + enum SchemaView { + SCHEMA_VIEW_UNSPECIFIED = 0, + BASIC = 1, + FULL = 2 + } + + /** Properties of a GetSchemaRequest. */ + interface IGetSchemaRequest { + + /** GetSchemaRequest name */ + name?: (string|null); + + /** GetSchemaRequest view */ + view?: (google.pubsub.v1.SchemaView|keyof typeof google.pubsub.v1.SchemaView|null); + } + + /** Represents a GetSchemaRequest. */ + class GetSchemaRequest implements IGetSchemaRequest { + + /** + * Constructs a new GetSchemaRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IGetSchemaRequest); + + /** GetSchemaRequest name. */ + public name: string; + + /** GetSchemaRequest view. */ + public view: (google.pubsub.v1.SchemaView|keyof typeof google.pubsub.v1.SchemaView); + + /** + * Creates a new GetSchemaRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns GetSchemaRequest instance + */ + public static create(properties?: google.pubsub.v1.IGetSchemaRequest): google.pubsub.v1.GetSchemaRequest; + + /** + * Encodes the specified GetSchemaRequest message. Does not implicitly {@link google.pubsub.v1.GetSchemaRequest.verify|verify} messages. + * @param message GetSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IGetSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GetSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSchemaRequest.verify|verify} messages. + * @param message GetSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IGetSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GetSchemaRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GetSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.GetSchemaRequest; + + /** + * Decodes a GetSchemaRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GetSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.GetSchemaRequest; + + /** + * Verifies a GetSchemaRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GetSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GetSchemaRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.GetSchemaRequest; + + /** + * Creates a plain object from a GetSchemaRequest message. Also converts values to other types if specified. + * @param message GetSchemaRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.GetSchemaRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GetSchemaRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSchemasRequest. */ + interface IListSchemasRequest { + + /** ListSchemasRequest parent */ + parent?: (string|null); + + /** ListSchemasRequest view */ + view?: (google.pubsub.v1.SchemaView|keyof typeof google.pubsub.v1.SchemaView|null); + + /** ListSchemasRequest pageSize */ + pageSize?: (number|null); + + /** ListSchemasRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListSchemasRequest. */ + class ListSchemasRequest implements IListSchemasRequest { + + /** + * Constructs a new ListSchemasRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSchemasRequest); + + /** ListSchemasRequest parent. */ + public parent: string; + + /** ListSchemasRequest view. */ + public view: (google.pubsub.v1.SchemaView|keyof typeof google.pubsub.v1.SchemaView); + + /** ListSchemasRequest pageSize. */ + public pageSize: number; + + /** ListSchemasRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListSchemasRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSchemasRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSchemasRequest): google.pubsub.v1.ListSchemasRequest; + + /** + * Encodes the specified ListSchemasRequest message. Does not implicitly {@link google.pubsub.v1.ListSchemasRequest.verify|verify} messages. + * @param message ListSchemasRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSchemasRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSchemasRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSchemasRequest.verify|verify} messages. + * @param message ListSchemasRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSchemasRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSchemasRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSchemasRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSchemasRequest; + + /** + * Decodes a ListSchemasRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSchemasRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSchemasRequest; + + /** + * Verifies a ListSchemasRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSchemasRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSchemasRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSchemasRequest; + + /** + * Creates a plain object from a ListSchemasRequest message. Also converts values to other types if specified. + * @param message ListSchemasRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSchemasRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSchemasRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ListSchemasResponse. */ + interface IListSchemasResponse { + + /** ListSchemasResponse schemas */ + schemas?: (google.pubsub.v1.ISchema[]|null); + + /** ListSchemasResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListSchemasResponse. */ + class ListSchemasResponse implements IListSchemasResponse { + + /** + * Constructs a new ListSchemasResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSchemasResponse); + + /** ListSchemasResponse schemas. */ + public schemas: google.pubsub.v1.ISchema[]; + + /** ListSchemasResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListSchemasResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSchemasResponse instance + */ + public static create(properties?: google.pubsub.v1.IListSchemasResponse): google.pubsub.v1.ListSchemasResponse; + + /** + * Encodes the specified ListSchemasResponse message. Does not implicitly {@link google.pubsub.v1.ListSchemasResponse.verify|verify} messages. + * @param message ListSchemasResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSchemasResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSchemasResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSchemasResponse.verify|verify} messages. + * @param message ListSchemasResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSchemasResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSchemasResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSchemasResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSchemasResponse; + + /** + * Decodes a ListSchemasResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSchemasResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSchemasResponse; + + /** + * Verifies a ListSchemasResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSchemasResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSchemasResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSchemasResponse; + + /** + * Creates a plain object from a ListSchemasResponse message. Also converts values to other types if specified. + * @param message ListSchemasResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSchemasResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSchemasResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a DeleteSchemaRequest. */ + interface IDeleteSchemaRequest { + + /** DeleteSchemaRequest name */ + name?: (string|null); + } + + /** Represents a DeleteSchemaRequest. */ + class DeleteSchemaRequest implements IDeleteSchemaRequest { + + /** + * Constructs a new DeleteSchemaRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteSchemaRequest); + + /** DeleteSchemaRequest name. */ + public name: string; + + /** + * Creates a new DeleteSchemaRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteSchemaRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteSchemaRequest): google.pubsub.v1.DeleteSchemaRequest; + + /** + * Encodes the specified DeleteSchemaRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSchemaRequest.verify|verify} messages. + * @param message DeleteSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeleteSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSchemaRequest.verify|verify} messages. + * @param message DeleteSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeleteSchemaRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSchemaRequest; + + /** + * Decodes a DeleteSchemaRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSchemaRequest; + + /** + * Verifies a DeleteSchemaRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeleteSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteSchemaRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSchemaRequest; + + /** + * Creates a plain object from a DeleteSchemaRequest message. Also converts values to other types if specified. + * @param message DeleteSchemaRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteSchemaRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeleteSchemaRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ValidateSchemaRequest. */ + interface IValidateSchemaRequest { + + /** ValidateSchemaRequest parent */ + parent?: (string|null); + + /** ValidateSchemaRequest schema */ + schema?: (google.pubsub.v1.ISchema|null); + } + + /** Represents a ValidateSchemaRequest. */ + class ValidateSchemaRequest implements IValidateSchemaRequest { + + /** + * Constructs a new ValidateSchemaRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IValidateSchemaRequest); + + /** ValidateSchemaRequest parent. */ + public parent: string; + + /** ValidateSchemaRequest schema. */ + public schema?: (google.pubsub.v1.ISchema|null); + + /** + * Creates a new ValidateSchemaRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ValidateSchemaRequest instance + */ + public static create(properties?: google.pubsub.v1.IValidateSchemaRequest): google.pubsub.v1.ValidateSchemaRequest; + + /** + * Encodes the specified ValidateSchemaRequest message. Does not implicitly {@link google.pubsub.v1.ValidateSchemaRequest.verify|verify} messages. + * @param message ValidateSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IValidateSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ValidateSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ValidateSchemaRequest.verify|verify} messages. + * @param message ValidateSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IValidateSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ValidateSchemaRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ValidateSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ValidateSchemaRequest; + + /** + * Decodes a ValidateSchemaRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ValidateSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ValidateSchemaRequest; + + /** + * Verifies a ValidateSchemaRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ValidateSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ValidateSchemaRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ValidateSchemaRequest; + + /** + * Creates a plain object from a ValidateSchemaRequest message. Also converts values to other types if specified. + * @param message ValidateSchemaRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ValidateSchemaRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ValidateSchemaRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ValidateSchemaResponse. */ + interface IValidateSchemaResponse { + } + + /** Represents a ValidateSchemaResponse. */ + class ValidateSchemaResponse implements IValidateSchemaResponse { + + /** + * Constructs a new ValidateSchemaResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IValidateSchemaResponse); + + /** + * Creates a new ValidateSchemaResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ValidateSchemaResponse instance + */ + public static create(properties?: google.pubsub.v1.IValidateSchemaResponse): google.pubsub.v1.ValidateSchemaResponse; + + /** + * Encodes the specified ValidateSchemaResponse message. Does not implicitly {@link google.pubsub.v1.ValidateSchemaResponse.verify|verify} messages. + * @param message ValidateSchemaResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IValidateSchemaResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ValidateSchemaResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ValidateSchemaResponse.verify|verify} messages. + * @param message ValidateSchemaResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IValidateSchemaResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ValidateSchemaResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ValidateSchemaResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ValidateSchemaResponse; + + /** + * Decodes a ValidateSchemaResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ValidateSchemaResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ValidateSchemaResponse; + + /** + * Verifies a ValidateSchemaResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ValidateSchemaResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ValidateSchemaResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ValidateSchemaResponse; + + /** + * Creates a plain object from a ValidateSchemaResponse message. Also converts values to other types if specified. + * @param message ValidateSchemaResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ValidateSchemaResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ValidateSchemaResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ValidateMessageRequest. */ + interface IValidateMessageRequest { + + /** ValidateMessageRequest parent */ + parent?: (string|null); + + /** ValidateMessageRequest name */ + name?: (string|null); + + /** ValidateMessageRequest schema */ + schema?: (google.pubsub.v1.ISchema|null); + + /** ValidateMessageRequest message */ + message?: (Uint8Array|string|null); + + /** ValidateMessageRequest encoding */ + encoding?: (google.pubsub.v1.Encoding|keyof typeof google.pubsub.v1.Encoding|null); + } + + /** Represents a ValidateMessageRequest. */ + class ValidateMessageRequest implements IValidateMessageRequest { + + /** + * Constructs a new ValidateMessageRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IValidateMessageRequest); + + /** ValidateMessageRequest parent. */ + public parent: string; + + /** ValidateMessageRequest name. */ + public name: string; + + /** ValidateMessageRequest schema. */ + public schema?: (google.pubsub.v1.ISchema|null); + + /** ValidateMessageRequest message. */ + public message: (Uint8Array|string); + + /** ValidateMessageRequest encoding. */ + public encoding: (google.pubsub.v1.Encoding|keyof typeof google.pubsub.v1.Encoding); + + /** ValidateMessageRequest schemaSpec. */ + public schemaSpec?: ("name"|"schema"); + + /** + * Creates a new ValidateMessageRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ValidateMessageRequest instance + */ + public static create(properties?: google.pubsub.v1.IValidateMessageRequest): google.pubsub.v1.ValidateMessageRequest; + + /** + * Encodes the specified ValidateMessageRequest message. Does not implicitly {@link google.pubsub.v1.ValidateMessageRequest.verify|verify} messages. + * @param message ValidateMessageRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IValidateMessageRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ValidateMessageRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ValidateMessageRequest.verify|verify} messages. + * @param message ValidateMessageRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IValidateMessageRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ValidateMessageRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ValidateMessageRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ValidateMessageRequest; + + /** + * Decodes a ValidateMessageRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ValidateMessageRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ValidateMessageRequest; + + /** + * Verifies a ValidateMessageRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ValidateMessageRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ValidateMessageRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ValidateMessageRequest; + + /** + * Creates a plain object from a ValidateMessageRequest message. Also converts values to other types if specified. + * @param message ValidateMessageRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ValidateMessageRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ValidateMessageRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ValidateMessageResponse. */ + interface IValidateMessageResponse { + } + + /** Represents a ValidateMessageResponse. */ + class ValidateMessageResponse implements IValidateMessageResponse { + + /** + * Constructs a new ValidateMessageResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IValidateMessageResponse); + + /** + * Creates a new ValidateMessageResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ValidateMessageResponse instance + */ + public static create(properties?: google.pubsub.v1.IValidateMessageResponse): google.pubsub.v1.ValidateMessageResponse; + + /** + * Encodes the specified ValidateMessageResponse message. Does not implicitly {@link google.pubsub.v1.ValidateMessageResponse.verify|verify} messages. + * @param message ValidateMessageResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IValidateMessageResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ValidateMessageResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ValidateMessageResponse.verify|verify} messages. + * @param message ValidateMessageResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IValidateMessageResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ValidateMessageResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ValidateMessageResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ValidateMessageResponse; + + /** + * Decodes a ValidateMessageResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ValidateMessageResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ValidateMessageResponse; + + /** + * Verifies a ValidateMessageResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ValidateMessageResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ValidateMessageResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ValidateMessageResponse; + + /** + * Creates a plain object from a ValidateMessageResponse message. Also converts values to other types if specified. + * @param message ValidateMessageResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ValidateMessageResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ValidateMessageResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Encoding enum. */ + enum Encoding { + ENCODING_UNSPECIFIED = 0, + JSON = 1, + BINARY = 2 + } } } diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 95137e36259..fe4e8f5c1c4 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -592,6 +592,234 @@ return MessageStoragePolicy; })(); + v1.SchemaSettings = (function() { + + /** + * Properties of a SchemaSettings. + * @memberof google.pubsub.v1 + * @interface ISchemaSettings + * @property {string|null} [schema] SchemaSettings schema + * @property {google.pubsub.v1.Encoding|null} [encoding] SchemaSettings encoding + */ + + /** + * Constructs a new SchemaSettings. + * @memberof google.pubsub.v1 + * @classdesc Represents a SchemaSettings. + * @implements ISchemaSettings + * @constructor + * @param {google.pubsub.v1.ISchemaSettings=} [properties] Properties to set + */ + function SchemaSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * SchemaSettings schema. + * @member {string} schema + * @memberof google.pubsub.v1.SchemaSettings + * @instance + */ + SchemaSettings.prototype.schema = ""; + + /** + * SchemaSettings encoding. + * @member {google.pubsub.v1.Encoding} encoding + * @memberof google.pubsub.v1.SchemaSettings + * @instance + */ + SchemaSettings.prototype.encoding = 0; + + /** + * Creates a new SchemaSettings instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {google.pubsub.v1.ISchemaSettings=} [properties] Properties to set + * @returns {google.pubsub.v1.SchemaSettings} SchemaSettings instance + */ + SchemaSettings.create = function create(properties) { + return new SchemaSettings(properties); + }; + + /** + * Encodes the specified SchemaSettings message. Does not implicitly {@link google.pubsub.v1.SchemaSettings.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {google.pubsub.v1.ISchemaSettings} message SchemaSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SchemaSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.schema != null && Object.hasOwnProperty.call(message, "schema")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.schema); + if (message.encoding != null && Object.hasOwnProperty.call(message, "encoding")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.encoding); + return writer; + }; + + /** + * Encodes the specified SchemaSettings message, length delimited. Does not implicitly {@link google.pubsub.v1.SchemaSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {google.pubsub.v1.ISchemaSettings} message SchemaSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SchemaSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SchemaSettings message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.SchemaSettings} SchemaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SchemaSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SchemaSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.schema = reader.string(); + break; + case 2: + message.encoding = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SchemaSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.SchemaSettings} SchemaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SchemaSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SchemaSettings message. + * @function verify + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SchemaSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.schema != null && message.hasOwnProperty("schema")) + if (!$util.isString(message.schema)) + return "schema: string expected"; + if (message.encoding != null && message.hasOwnProperty("encoding")) + switch (message.encoding) { + default: + return "encoding: enum value expected"; + case 0: + case 1: + case 2: + break; + } + return null; + }; + + /** + * Creates a SchemaSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.SchemaSettings} SchemaSettings + */ + SchemaSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.SchemaSettings) + return object; + var message = new $root.google.pubsub.v1.SchemaSettings(); + if (object.schema != null) + message.schema = String(object.schema); + switch (object.encoding) { + case "ENCODING_UNSPECIFIED": + case 0: + message.encoding = 0; + break; + case "JSON": + case 1: + message.encoding = 1; + break; + case "BINARY": + case 2: + message.encoding = 2; + break; + } + return message; + }; + + /** + * Creates a plain object from a SchemaSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {google.pubsub.v1.SchemaSettings} message SchemaSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SchemaSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.schema = ""; + object.encoding = options.enums === String ? "ENCODING_UNSPECIFIED" : 0; + } + if (message.schema != null && message.hasOwnProperty("schema")) + object.schema = message.schema; + if (message.encoding != null && message.hasOwnProperty("encoding")) + object.encoding = options.enums === String ? $root.google.pubsub.v1.Encoding[message.encoding] : message.encoding; + return object; + }; + + /** + * Converts this SchemaSettings to JSON. + * @function toJSON + * @memberof google.pubsub.v1.SchemaSettings + * @instance + * @returns {Object.} JSON object + */ + SchemaSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return SchemaSettings; + })(); + v1.Topic = (function() { /** @@ -602,6 +830,8 @@ * @property {Object.|null} [labels] Topic labels * @property {google.pubsub.v1.IMessageStoragePolicy|null} [messageStoragePolicy] Topic messageStoragePolicy * @property {string|null} [kmsKeyName] Topic kmsKeyName + * @property {google.pubsub.v1.ISchemaSettings|null} [schemaSettings] Topic schemaSettings + * @property {boolean|null} [satisfiesPzs] Topic satisfiesPzs */ /** @@ -652,6 +882,22 @@ */ Topic.prototype.kmsKeyName = ""; + /** + * Topic schemaSettings. + * @member {google.pubsub.v1.ISchemaSettings|null|undefined} schemaSettings + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.schemaSettings = null; + + /** + * Topic satisfiesPzs. + * @member {boolean} satisfiesPzs + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.satisfiesPzs = false; + /** * Creates a new Topic instance using the specified properties. * @function create @@ -685,6 +931,10 @@ $root.google.pubsub.v1.MessageStoragePolicy.encode(message.messageStoragePolicy, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); if (message.kmsKeyName != null && Object.hasOwnProperty.call(message, "kmsKeyName")) writer.uint32(/* id 5, wireType 2 =*/42).string(message.kmsKeyName); + if (message.schemaSettings != null && Object.hasOwnProperty.call(message, "schemaSettings")) + $root.google.pubsub.v1.SchemaSettings.encode(message.schemaSettings, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.satisfiesPzs != null && Object.hasOwnProperty.call(message, "satisfiesPzs")) + writer.uint32(/* id 7, wireType 0 =*/56).bool(message.satisfiesPzs); return writer; }; @@ -750,6 +1000,12 @@ case 5: message.kmsKeyName = reader.string(); break; + case 6: + message.schemaSettings = $root.google.pubsub.v1.SchemaSettings.decode(reader, reader.uint32()); + break; + case 7: + message.satisfiesPzs = reader.bool(); + break; default: reader.skipType(tag & 7); break; @@ -804,6 +1060,14 @@ if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) if (!$util.isString(message.kmsKeyName)) return "kmsKeyName: string expected"; + if (message.schemaSettings != null && message.hasOwnProperty("schemaSettings")) { + var error = $root.google.pubsub.v1.SchemaSettings.verify(message.schemaSettings); + if (error) + return "schemaSettings." + error; + } + if (message.satisfiesPzs != null && message.hasOwnProperty("satisfiesPzs")) + if (typeof message.satisfiesPzs !== "boolean") + return "satisfiesPzs: boolean expected"; return null; }; @@ -835,6 +1099,13 @@ } if (object.kmsKeyName != null) message.kmsKeyName = String(object.kmsKeyName); + if (object.schemaSettings != null) { + if (typeof object.schemaSettings !== "object") + throw TypeError(".google.pubsub.v1.Topic.schemaSettings: object expected"); + message.schemaSettings = $root.google.pubsub.v1.SchemaSettings.fromObject(object.schemaSettings); + } + if (object.satisfiesPzs != null) + message.satisfiesPzs = Boolean(object.satisfiesPzs); return message; }; @@ -857,6 +1128,8 @@ object.name = ""; object.messageStoragePolicy = null; object.kmsKeyName = ""; + object.schemaSettings = null; + object.satisfiesPzs = false; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -870,6 +1143,10 @@ object.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.toObject(message.messageStoragePolicy, options); if (message.kmsKeyName != null && message.hasOwnProperty("kmsKeyName")) object.kmsKeyName = message.kmsKeyName; + if (message.schemaSettings != null && message.hasOwnProperty("schemaSettings")) + object.schemaSettings = $root.google.pubsub.v1.SchemaSettings.toObject(message.schemaSettings, options); + if (message.satisfiesPzs != null && message.hasOwnProperty("satisfiesPzs")) + object.satisfiesPzs = message.satisfiesPzs; return object; }; @@ -11269,6 +11546,2561 @@ return SeekResponse; })(); + v1.SchemaService = (function() { + + /** + * Constructs a new SchemaService service. + * @memberof google.pubsub.v1 + * @classdesc Represents a SchemaService + * @extends $protobuf.rpc.Service + * @constructor + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + */ + function SchemaService(rpcImpl, requestDelimited, responseDelimited) { + $protobuf.rpc.Service.call(this, rpcImpl, requestDelimited, responseDelimited); + } + + (SchemaService.prototype = Object.create($protobuf.rpc.Service.prototype)).constructor = SchemaService; + + /** + * Creates new SchemaService service using the specified rpc implementation. + * @function create + * @memberof google.pubsub.v1.SchemaService + * @static + * @param {$protobuf.RPCImpl} rpcImpl RPC implementation + * @param {boolean} [requestDelimited=false] Whether requests are length-delimited + * @param {boolean} [responseDelimited=false] Whether responses are length-delimited + * @returns {SchemaService} RPC service. Useful where requests and/or responses are streamed. + */ + SchemaService.create = function create(rpcImpl, requestDelimited, responseDelimited) { + return new this(rpcImpl, requestDelimited, responseDelimited); + }; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#createSchema}. + * @memberof google.pubsub.v1.SchemaService + * @typedef CreateSchemaCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Schema} [response] Schema + */ + + /** + * Calls CreateSchema. + * @function createSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.ICreateSchemaRequest} request CreateSchemaRequest message or plain object + * @param {google.pubsub.v1.SchemaService.CreateSchemaCallback} callback Node-style callback called with the error, if any, and Schema + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.createSchema = function createSchema(request, callback) { + return this.rpcCall(createSchema, $root.google.pubsub.v1.CreateSchemaRequest, $root.google.pubsub.v1.Schema, request, callback); + }, "name", { value: "CreateSchema" }); + + /** + * Calls CreateSchema. + * @function createSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.ICreateSchemaRequest} request CreateSchemaRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#getSchema}. + * @memberof google.pubsub.v1.SchemaService + * @typedef GetSchemaCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Schema} [response] Schema + */ + + /** + * Calls GetSchema. + * @function getSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IGetSchemaRequest} request GetSchemaRequest message or plain object + * @param {google.pubsub.v1.SchemaService.GetSchemaCallback} callback Node-style callback called with the error, if any, and Schema + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.getSchema = function getSchema(request, callback) { + return this.rpcCall(getSchema, $root.google.pubsub.v1.GetSchemaRequest, $root.google.pubsub.v1.Schema, request, callback); + }, "name", { value: "GetSchema" }); + + /** + * Calls GetSchema. + * @function getSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IGetSchemaRequest} request GetSchemaRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#listSchemas}. + * @memberof google.pubsub.v1.SchemaService + * @typedef ListSchemasCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListSchemasResponse} [response] ListSchemasResponse + */ + + /** + * Calls ListSchemas. + * @function listSchemas + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IListSchemasRequest} request ListSchemasRequest message or plain object + * @param {google.pubsub.v1.SchemaService.ListSchemasCallback} callback Node-style callback called with the error, if any, and ListSchemasResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.listSchemas = function listSchemas(request, callback) { + return this.rpcCall(listSchemas, $root.google.pubsub.v1.ListSchemasRequest, $root.google.pubsub.v1.ListSchemasResponse, request, callback); + }, "name", { value: "ListSchemas" }); + + /** + * Calls ListSchemas. + * @function listSchemas + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IListSchemasRequest} request ListSchemasRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#deleteSchema}. + * @memberof google.pubsub.v1.SchemaService + * @typedef DeleteSchemaCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.protobuf.Empty} [response] Empty + */ + + /** + * Calls DeleteSchema. + * @function deleteSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IDeleteSchemaRequest} request DeleteSchemaRequest message or plain object + * @param {google.pubsub.v1.SchemaService.DeleteSchemaCallback} callback Node-style callback called with the error, if any, and Empty + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.deleteSchema = function deleteSchema(request, callback) { + return this.rpcCall(deleteSchema, $root.google.pubsub.v1.DeleteSchemaRequest, $root.google.protobuf.Empty, request, callback); + }, "name", { value: "DeleteSchema" }); + + /** + * Calls DeleteSchema. + * @function deleteSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IDeleteSchemaRequest} request DeleteSchemaRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#validateSchema}. + * @memberof google.pubsub.v1.SchemaService + * @typedef ValidateSchemaCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ValidateSchemaResponse} [response] ValidateSchemaResponse + */ + + /** + * Calls ValidateSchema. + * @function validateSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IValidateSchemaRequest} request ValidateSchemaRequest message or plain object + * @param {google.pubsub.v1.SchemaService.ValidateSchemaCallback} callback Node-style callback called with the error, if any, and ValidateSchemaResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.validateSchema = function validateSchema(request, callback) { + return this.rpcCall(validateSchema, $root.google.pubsub.v1.ValidateSchemaRequest, $root.google.pubsub.v1.ValidateSchemaResponse, request, callback); + }, "name", { value: "ValidateSchema" }); + + /** + * Calls ValidateSchema. + * @function validateSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IValidateSchemaRequest} request ValidateSchemaRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService#validateMessage}. + * @memberof google.pubsub.v1.SchemaService + * @typedef ValidateMessageCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ValidateMessageResponse} [response] ValidateMessageResponse + */ + + /** + * Calls ValidateMessage. + * @function validateMessage + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IValidateMessageRequest} request ValidateMessageRequest message or plain object + * @param {google.pubsub.v1.SchemaService.ValidateMessageCallback} callback Node-style callback called with the error, if any, and ValidateMessageResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.validateMessage = function validateMessage(request, callback) { + return this.rpcCall(validateMessage, $root.google.pubsub.v1.ValidateMessageRequest, $root.google.pubsub.v1.ValidateMessageResponse, request, callback); + }, "name", { value: "ValidateMessage" }); + + /** + * Calls ValidateMessage. + * @function validateMessage + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IValidateMessageRequest} request ValidateMessageRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + return SchemaService; + })(); + + v1.Schema = (function() { + + /** + * Properties of a Schema. + * @memberof google.pubsub.v1 + * @interface ISchema + * @property {string|null} [name] Schema name + * @property {google.pubsub.v1.Schema.Type|null} [type] Schema type + * @property {string|null} [definition] Schema definition + */ + + /** + * Constructs a new Schema. + * @memberof google.pubsub.v1 + * @classdesc Represents a Schema. + * @implements ISchema + * @constructor + * @param {google.pubsub.v1.ISchema=} [properties] Properties to set + */ + function Schema(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Schema name. + * @member {string} name + * @memberof google.pubsub.v1.Schema + * @instance + */ + Schema.prototype.name = ""; + + /** + * Schema type. + * @member {google.pubsub.v1.Schema.Type} type + * @memberof google.pubsub.v1.Schema + * @instance + */ + Schema.prototype.type = 0; + + /** + * Schema definition. + * @member {string} definition + * @memberof google.pubsub.v1.Schema + * @instance + */ + Schema.prototype.definition = ""; + + /** + * Creates a new Schema instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.Schema + * @static + * @param {google.pubsub.v1.ISchema=} [properties] Properties to set + * @returns {google.pubsub.v1.Schema} Schema instance + */ + Schema.create = function create(properties) { + return new Schema(properties); + }; + + /** + * Encodes the specified Schema message. Does not implicitly {@link google.pubsub.v1.Schema.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.Schema + * @static + * @param {google.pubsub.v1.ISchema} message Schema message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Schema.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && Object.hasOwnProperty.call(message, "name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.type != null && Object.hasOwnProperty.call(message, "type")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.type); + if (message.definition != null && Object.hasOwnProperty.call(message, "definition")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.definition); + return writer; + }; + + /** + * Encodes the specified Schema message, length delimited. Does not implicitly {@link google.pubsub.v1.Schema.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.Schema + * @static + * @param {google.pubsub.v1.ISchema} message Schema message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Schema.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Schema message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.Schema + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.Schema} Schema + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Schema.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Schema(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.type = reader.int32(); + break; + case 3: + message.definition = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Schema message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.Schema + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.Schema} Schema + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Schema.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Schema message. + * @function verify + * @memberof google.pubsub.v1.Schema + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Schema.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.type != null && message.hasOwnProperty("type")) + switch (message.type) { + default: + return "type: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.definition != null && message.hasOwnProperty("definition")) + if (!$util.isString(message.definition)) + return "definition: string expected"; + return null; + }; + + /** + * Creates a Schema message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.Schema + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.Schema} Schema + */ + Schema.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Schema) + return object; + var message = new $root.google.pubsub.v1.Schema(); + if (object.name != null) + message.name = String(object.name); + switch (object.type) { + case "TYPE_UNSPECIFIED": + case 0: + message.type = 0; + break; + case "PROTOCOL_BUFFER": + case 1: + message.type = 1; + break; + case "AVRO": + case 2: + message.type = 2; + break; + } + if (object.definition != null) + message.definition = String(object.definition); + return message; + }; + + /** + * Creates a plain object from a Schema message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.Schema + * @static + * @param {google.pubsub.v1.Schema} message Schema + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Schema.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.type = options.enums === String ? "TYPE_UNSPECIFIED" : 0; + object.definition = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.type != null && message.hasOwnProperty("type")) + object.type = options.enums === String ? $root.google.pubsub.v1.Schema.Type[message.type] : message.type; + if (message.definition != null && message.hasOwnProperty("definition")) + object.definition = message.definition; + return object; + }; + + /** + * Converts this Schema to JSON. + * @function toJSON + * @memberof google.pubsub.v1.Schema + * @instance + * @returns {Object.} JSON object + */ + Schema.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Type enum. + * @name google.pubsub.v1.Schema.Type + * @enum {number} + * @property {number} TYPE_UNSPECIFIED=0 TYPE_UNSPECIFIED value + * @property {number} PROTOCOL_BUFFER=1 PROTOCOL_BUFFER value + * @property {number} AVRO=2 AVRO value + */ + Schema.Type = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "TYPE_UNSPECIFIED"] = 0; + values[valuesById[1] = "PROTOCOL_BUFFER"] = 1; + values[valuesById[2] = "AVRO"] = 2; + return values; + })(); + + return Schema; + })(); + + v1.CreateSchemaRequest = (function() { + + /** + * Properties of a CreateSchemaRequest. + * @memberof google.pubsub.v1 + * @interface ICreateSchemaRequest + * @property {string|null} [parent] CreateSchemaRequest parent + * @property {google.pubsub.v1.ISchema|null} [schema] CreateSchemaRequest schema + * @property {string|null} [schemaId] CreateSchemaRequest schemaId + */ + + /** + * Constructs a new CreateSchemaRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a CreateSchemaRequest. + * @implements ICreateSchemaRequest + * @constructor + * @param {google.pubsub.v1.ICreateSchemaRequest=} [properties] Properties to set + */ + function CreateSchemaRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CreateSchemaRequest parent. + * @member {string} parent + * @memberof google.pubsub.v1.CreateSchemaRequest + * @instance + */ + CreateSchemaRequest.prototype.parent = ""; + + /** + * CreateSchemaRequest schema. + * @member {google.pubsub.v1.ISchema|null|undefined} schema + * @memberof google.pubsub.v1.CreateSchemaRequest + * @instance + */ + CreateSchemaRequest.prototype.schema = null; + + /** + * CreateSchemaRequest schemaId. + * @member {string} schemaId + * @memberof google.pubsub.v1.CreateSchemaRequest + * @instance + */ + CreateSchemaRequest.prototype.schemaId = ""; + + /** + * Creates a new CreateSchemaRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {google.pubsub.v1.ICreateSchemaRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.CreateSchemaRequest} CreateSchemaRequest instance + */ + CreateSchemaRequest.create = function create(properties) { + return new CreateSchemaRequest(properties); + }; + + /** + * Encodes the specified CreateSchemaRequest message. Does not implicitly {@link google.pubsub.v1.CreateSchemaRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {google.pubsub.v1.ICreateSchemaRequest} message CreateSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CreateSchemaRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.parent != null && Object.hasOwnProperty.call(message, "parent")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.parent); + if (message.schema != null && Object.hasOwnProperty.call(message, "schema")) + $root.google.pubsub.v1.Schema.encode(message.schema, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.schemaId != null && Object.hasOwnProperty.call(message, "schemaId")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.schemaId); + return writer; + }; + + /** + * Encodes the specified CreateSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CreateSchemaRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {google.pubsub.v1.ICreateSchemaRequest} message CreateSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CreateSchemaRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CreateSchemaRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.CreateSchemaRequest} CreateSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CreateSchemaRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSchemaRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.parent = reader.string(); + break; + case 2: + message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); + break; + case 3: + message.schemaId = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CreateSchemaRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.CreateSchemaRequest} CreateSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CreateSchemaRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CreateSchemaRequest message. + * @function verify + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CreateSchemaRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.parent != null && message.hasOwnProperty("parent")) + if (!$util.isString(message.parent)) + return "parent: string expected"; + if (message.schema != null && message.hasOwnProperty("schema")) { + var error = $root.google.pubsub.v1.Schema.verify(message.schema); + if (error) + return "schema." + error; + } + if (message.schemaId != null && message.hasOwnProperty("schemaId")) + if (!$util.isString(message.schemaId)) + return "schemaId: string expected"; + return null; + }; + + /** + * Creates a CreateSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.CreateSchemaRequest} CreateSchemaRequest + */ + CreateSchemaRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.CreateSchemaRequest) + return object; + var message = new $root.google.pubsub.v1.CreateSchemaRequest(); + if (object.parent != null) + message.parent = String(object.parent); + if (object.schema != null) { + if (typeof object.schema !== "object") + throw TypeError(".google.pubsub.v1.CreateSchemaRequest.schema: object expected"); + message.schema = $root.google.pubsub.v1.Schema.fromObject(object.schema); + } + if (object.schemaId != null) + message.schemaId = String(object.schemaId); + return message; + }; + + /** + * Creates a plain object from a CreateSchemaRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {google.pubsub.v1.CreateSchemaRequest} message CreateSchemaRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CreateSchemaRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.parent = ""; + object.schema = null; + object.schemaId = ""; + } + if (message.parent != null && message.hasOwnProperty("parent")) + object.parent = message.parent; + if (message.schema != null && message.hasOwnProperty("schema")) + object.schema = $root.google.pubsub.v1.Schema.toObject(message.schema, options); + if (message.schemaId != null && message.hasOwnProperty("schemaId")) + object.schemaId = message.schemaId; + return object; + }; + + /** + * Converts this CreateSchemaRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.CreateSchemaRequest + * @instance + * @returns {Object.} JSON object + */ + CreateSchemaRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return CreateSchemaRequest; + })(); + + /** + * SchemaView enum. + * @name google.pubsub.v1.SchemaView + * @enum {number} + * @property {number} SCHEMA_VIEW_UNSPECIFIED=0 SCHEMA_VIEW_UNSPECIFIED value + * @property {number} BASIC=1 BASIC value + * @property {number} FULL=2 FULL value + */ + v1.SchemaView = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "SCHEMA_VIEW_UNSPECIFIED"] = 0; + values[valuesById[1] = "BASIC"] = 1; + values[valuesById[2] = "FULL"] = 2; + return values; + })(); + + v1.GetSchemaRequest = (function() { + + /** + * Properties of a GetSchemaRequest. + * @memberof google.pubsub.v1 + * @interface IGetSchemaRequest + * @property {string|null} [name] GetSchemaRequest name + * @property {google.pubsub.v1.SchemaView|null} [view] GetSchemaRequest view + */ + + /** + * Constructs a new GetSchemaRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a GetSchemaRequest. + * @implements IGetSchemaRequest + * @constructor + * @param {google.pubsub.v1.IGetSchemaRequest=} [properties] Properties to set + */ + function GetSchemaRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GetSchemaRequest name. + * @member {string} name + * @memberof google.pubsub.v1.GetSchemaRequest + * @instance + */ + GetSchemaRequest.prototype.name = ""; + + /** + * GetSchemaRequest view. + * @member {google.pubsub.v1.SchemaView} view + * @memberof google.pubsub.v1.GetSchemaRequest + * @instance + */ + GetSchemaRequest.prototype.view = 0; + + /** + * Creates a new GetSchemaRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {google.pubsub.v1.IGetSchemaRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.GetSchemaRequest} GetSchemaRequest instance + */ + GetSchemaRequest.create = function create(properties) { + return new GetSchemaRequest(properties); + }; + + /** + * Encodes the specified GetSchemaRequest message. Does not implicitly {@link google.pubsub.v1.GetSchemaRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {google.pubsub.v1.IGetSchemaRequest} message GetSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetSchemaRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && Object.hasOwnProperty.call(message, "name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.view != null && Object.hasOwnProperty.call(message, "view")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.view); + return writer; + }; + + /** + * Encodes the specified GetSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.GetSchemaRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {google.pubsub.v1.IGetSchemaRequest} message GetSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GetSchemaRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GetSchemaRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.GetSchemaRequest} GetSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetSchemaRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSchemaRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + case 2: + message.view = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GetSchemaRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.GetSchemaRequest} GetSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GetSchemaRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GetSchemaRequest message. + * @function verify + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GetSchemaRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.view != null && message.hasOwnProperty("view")) + switch (message.view) { + default: + return "view: enum value expected"; + case 0: + case 1: + case 2: + break; + } + return null; + }; + + /** + * Creates a GetSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.GetSchemaRequest} GetSchemaRequest + */ + GetSchemaRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.GetSchemaRequest) + return object; + var message = new $root.google.pubsub.v1.GetSchemaRequest(); + if (object.name != null) + message.name = String(object.name); + switch (object.view) { + case "SCHEMA_VIEW_UNSPECIFIED": + case 0: + message.view = 0; + break; + case "BASIC": + case 1: + message.view = 1; + break; + case "FULL": + case 2: + message.view = 2; + break; + } + return message; + }; + + /** + * Creates a plain object from a GetSchemaRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {google.pubsub.v1.GetSchemaRequest} message GetSchemaRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GetSchemaRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.view = options.enums === String ? "SCHEMA_VIEW_UNSPECIFIED" : 0; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.view != null && message.hasOwnProperty("view")) + object.view = options.enums === String ? $root.google.pubsub.v1.SchemaView[message.view] : message.view; + return object; + }; + + /** + * Converts this GetSchemaRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.GetSchemaRequest + * @instance + * @returns {Object.} JSON object + */ + GetSchemaRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return GetSchemaRequest; + })(); + + v1.ListSchemasRequest = (function() { + + /** + * Properties of a ListSchemasRequest. + * @memberof google.pubsub.v1 + * @interface IListSchemasRequest + * @property {string|null} [parent] ListSchemasRequest parent + * @property {google.pubsub.v1.SchemaView|null} [view] ListSchemasRequest view + * @property {number|null} [pageSize] ListSchemasRequest pageSize + * @property {string|null} [pageToken] ListSchemasRequest pageToken + */ + + /** + * Constructs a new ListSchemasRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSchemasRequest. + * @implements IListSchemasRequest + * @constructor + * @param {google.pubsub.v1.IListSchemasRequest=} [properties] Properties to set + */ + function ListSchemasRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListSchemasRequest parent. + * @member {string} parent + * @memberof google.pubsub.v1.ListSchemasRequest + * @instance + */ + ListSchemasRequest.prototype.parent = ""; + + /** + * ListSchemasRequest view. + * @member {google.pubsub.v1.SchemaView} view + * @memberof google.pubsub.v1.ListSchemasRequest + * @instance + */ + ListSchemasRequest.prototype.view = 0; + + /** + * ListSchemasRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListSchemasRequest + * @instance + */ + ListSchemasRequest.prototype.pageSize = 0; + + /** + * ListSchemasRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListSchemasRequest + * @instance + */ + ListSchemasRequest.prototype.pageToken = ""; + + /** + * Creates a new ListSchemasRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {google.pubsub.v1.IListSchemasRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSchemasRequest} ListSchemasRequest instance + */ + ListSchemasRequest.create = function create(properties) { + return new ListSchemasRequest(properties); + }; + + /** + * Encodes the specified ListSchemasRequest message. Does not implicitly {@link google.pubsub.v1.ListSchemasRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {google.pubsub.v1.IListSchemasRequest} message ListSchemasRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSchemasRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.parent != null && Object.hasOwnProperty.call(message, "parent")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.parent); + if (message.view != null && Object.hasOwnProperty.call(message, "view")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.view); + if (message.pageSize != null && Object.hasOwnProperty.call(message, "pageSize")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.pageSize); + if (message.pageToken != null && Object.hasOwnProperty.call(message, "pageToken")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.pageToken); + return writer; + }; + + /** + * Encodes the specified ListSchemasRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSchemasRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {google.pubsub.v1.IListSchemasRequest} message ListSchemasRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSchemasRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListSchemasRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSchemasRequest} ListSchemasRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSchemasRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSchemasRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.parent = reader.string(); + break; + case 2: + message.view = reader.int32(); + break; + case 3: + message.pageSize = reader.int32(); + break; + case 4: + message.pageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListSchemasRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSchemasRequest} ListSchemasRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSchemasRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListSchemasRequest message. + * @function verify + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSchemasRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.parent != null && message.hasOwnProperty("parent")) + if (!$util.isString(message.parent)) + return "parent: string expected"; + if (message.view != null && message.hasOwnProperty("view")) + switch (message.view) { + default: + return "view: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListSchemasRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSchemasRequest} ListSchemasRequest + */ + ListSchemasRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSchemasRequest) + return object; + var message = new $root.google.pubsub.v1.ListSchemasRequest(); + if (object.parent != null) + message.parent = String(object.parent); + switch (object.view) { + case "SCHEMA_VIEW_UNSPECIFIED": + case 0: + message.view = 0; + break; + case "BASIC": + case 1: + message.view = 1; + break; + case "FULL": + case 2: + message.view = 2; + break; + } + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; + + /** + * Creates a plain object from a ListSchemasRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {google.pubsub.v1.ListSchemasRequest} message ListSchemasRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSchemasRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.parent = ""; + object.view = options.enums === String ? "SCHEMA_VIEW_UNSPECIFIED" : 0; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.parent != null && message.hasOwnProperty("parent")) + object.parent = message.parent; + if (message.view != null && message.hasOwnProperty("view")) + object.view = options.enums === String ? $root.google.pubsub.v1.SchemaView[message.view] : message.view; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; + + /** + * Converts this ListSchemasRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSchemasRequest + * @instance + * @returns {Object.} JSON object + */ + ListSchemasRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListSchemasRequest; + })(); + + v1.ListSchemasResponse = (function() { + + /** + * Properties of a ListSchemasResponse. + * @memberof google.pubsub.v1 + * @interface IListSchemasResponse + * @property {Array.|null} [schemas] ListSchemasResponse schemas + * @property {string|null} [nextPageToken] ListSchemasResponse nextPageToken + */ + + /** + * Constructs a new ListSchemasResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSchemasResponse. + * @implements IListSchemasResponse + * @constructor + * @param {google.pubsub.v1.IListSchemasResponse=} [properties] Properties to set + */ + function ListSchemasResponse(properties) { + this.schemas = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListSchemasResponse schemas. + * @member {Array.} schemas + * @memberof google.pubsub.v1.ListSchemasResponse + * @instance + */ + ListSchemasResponse.prototype.schemas = $util.emptyArray; + + /** + * ListSchemasResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListSchemasResponse + * @instance + */ + ListSchemasResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListSchemasResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {google.pubsub.v1.IListSchemasResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSchemasResponse} ListSchemasResponse instance + */ + ListSchemasResponse.create = function create(properties) { + return new ListSchemasResponse(properties); + }; + + /** + * Encodes the specified ListSchemasResponse message. Does not implicitly {@link google.pubsub.v1.ListSchemasResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {google.pubsub.v1.IListSchemasResponse} message ListSchemasResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSchemasResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.schemas != null && message.schemas.length) + for (var i = 0; i < message.schemas.length; ++i) + $root.google.pubsub.v1.Schema.encode(message.schemas[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && Object.hasOwnProperty.call(message, "nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListSchemasResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSchemasResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {google.pubsub.v1.IListSchemasResponse} message ListSchemasResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSchemasResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListSchemasResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSchemasResponse} ListSchemasResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSchemasResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSchemasResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.schemas && message.schemas.length)) + message.schemas = []; + message.schemas.push($root.google.pubsub.v1.Schema.decode(reader, reader.uint32())); + break; + case 2: + message.nextPageToken = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListSchemasResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSchemasResponse} ListSchemasResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSchemasResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListSchemasResponse message. + * @function verify + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSchemasResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.schemas != null && message.hasOwnProperty("schemas")) { + if (!Array.isArray(message.schemas)) + return "schemas: array expected"; + for (var i = 0; i < message.schemas.length; ++i) { + var error = $root.google.pubsub.v1.Schema.verify(message.schemas[i]); + if (error) + return "schemas." + error; + } + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; + + /** + * Creates a ListSchemasResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSchemasResponse} ListSchemasResponse + */ + ListSchemasResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSchemasResponse) + return object; + var message = new $root.google.pubsub.v1.ListSchemasResponse(); + if (object.schemas) { + if (!Array.isArray(object.schemas)) + throw TypeError(".google.pubsub.v1.ListSchemasResponse.schemas: array expected"); + message.schemas = []; + for (var i = 0; i < object.schemas.length; ++i) { + if (typeof object.schemas[i] !== "object") + throw TypeError(".google.pubsub.v1.ListSchemasResponse.schemas: object expected"); + message.schemas[i] = $root.google.pubsub.v1.Schema.fromObject(object.schemas[i]); + } + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; + + /** + * Creates a plain object from a ListSchemasResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {google.pubsub.v1.ListSchemasResponse} message ListSchemasResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSchemasResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.schemas = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.schemas && message.schemas.length) { + object.schemas = []; + for (var j = 0; j < message.schemas.length; ++j) + object.schemas[j] = $root.google.pubsub.v1.Schema.toObject(message.schemas[j], options); + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListSchemasResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSchemasResponse + * @instance + * @returns {Object.} JSON object + */ + ListSchemasResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ListSchemasResponse; + })(); + + v1.DeleteSchemaRequest = (function() { + + /** + * Properties of a DeleteSchemaRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteSchemaRequest + * @property {string|null} [name] DeleteSchemaRequest name + */ + + /** + * Constructs a new DeleteSchemaRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteSchemaRequest. + * @implements IDeleteSchemaRequest + * @constructor + * @param {google.pubsub.v1.IDeleteSchemaRequest=} [properties] Properties to set + */ + function DeleteSchemaRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DeleteSchemaRequest name. + * @member {string} name + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @instance + */ + DeleteSchemaRequest.prototype.name = ""; + + /** + * Creates a new DeleteSchemaRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {google.pubsub.v1.IDeleteSchemaRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteSchemaRequest} DeleteSchemaRequest instance + */ + DeleteSchemaRequest.create = function create(properties) { + return new DeleteSchemaRequest(properties); + }; + + /** + * Encodes the specified DeleteSchemaRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSchemaRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {google.pubsub.v1.IDeleteSchemaRequest} message DeleteSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSchemaRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && Object.hasOwnProperty.call(message, "name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + return writer; + }; + + /** + * Encodes the specified DeleteSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSchemaRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {google.pubsub.v1.IDeleteSchemaRequest} message DeleteSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSchemaRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DeleteSchemaRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteSchemaRequest} DeleteSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSchemaRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSchemaRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.name = reader.string(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DeleteSchemaRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteSchemaRequest} DeleteSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSchemaRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DeleteSchemaRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteSchemaRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + return null; + }; + + /** + * Creates a DeleteSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteSchemaRequest} DeleteSchemaRequest + */ + DeleteSchemaRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteSchemaRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteSchemaRequest(); + if (object.name != null) + message.name = String(object.name); + return message; + }; + + /** + * Creates a plain object from a DeleteSchemaRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {google.pubsub.v1.DeleteSchemaRequest} message DeleteSchemaRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteSchemaRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.name = ""; + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + return object; + }; + + /** + * Converts this DeleteSchemaRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteSchemaRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return DeleteSchemaRequest; + })(); + + v1.ValidateSchemaRequest = (function() { + + /** + * Properties of a ValidateSchemaRequest. + * @memberof google.pubsub.v1 + * @interface IValidateSchemaRequest + * @property {string|null} [parent] ValidateSchemaRequest parent + * @property {google.pubsub.v1.ISchema|null} [schema] ValidateSchemaRequest schema + */ + + /** + * Constructs a new ValidateSchemaRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ValidateSchemaRequest. + * @implements IValidateSchemaRequest + * @constructor + * @param {google.pubsub.v1.IValidateSchemaRequest=} [properties] Properties to set + */ + function ValidateSchemaRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ValidateSchemaRequest parent. + * @member {string} parent + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @instance + */ + ValidateSchemaRequest.prototype.parent = ""; + + /** + * ValidateSchemaRequest schema. + * @member {google.pubsub.v1.ISchema|null|undefined} schema + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @instance + */ + ValidateSchemaRequest.prototype.schema = null; + + /** + * Creates a new ValidateSchemaRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {google.pubsub.v1.IValidateSchemaRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ValidateSchemaRequest} ValidateSchemaRequest instance + */ + ValidateSchemaRequest.create = function create(properties) { + return new ValidateSchemaRequest(properties); + }; + + /** + * Encodes the specified ValidateSchemaRequest message. Does not implicitly {@link google.pubsub.v1.ValidateSchemaRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {google.pubsub.v1.IValidateSchemaRequest} message ValidateSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ValidateSchemaRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.parent != null && Object.hasOwnProperty.call(message, "parent")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.parent); + if (message.schema != null && Object.hasOwnProperty.call(message, "schema")) + $root.google.pubsub.v1.Schema.encode(message.schema, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ValidateSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ValidateSchemaRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {google.pubsub.v1.IValidateSchemaRequest} message ValidateSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ValidateSchemaRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ValidateSchemaRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ValidateSchemaRequest} ValidateSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ValidateSchemaRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ValidateSchemaRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.parent = reader.string(); + break; + case 2: + message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ValidateSchemaRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ValidateSchemaRequest} ValidateSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ValidateSchemaRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ValidateSchemaRequest message. + * @function verify + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ValidateSchemaRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.parent != null && message.hasOwnProperty("parent")) + if (!$util.isString(message.parent)) + return "parent: string expected"; + if (message.schema != null && message.hasOwnProperty("schema")) { + var error = $root.google.pubsub.v1.Schema.verify(message.schema); + if (error) + return "schema." + error; + } + return null; + }; + + /** + * Creates a ValidateSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ValidateSchemaRequest} ValidateSchemaRequest + */ + ValidateSchemaRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ValidateSchemaRequest) + return object; + var message = new $root.google.pubsub.v1.ValidateSchemaRequest(); + if (object.parent != null) + message.parent = String(object.parent); + if (object.schema != null) { + if (typeof object.schema !== "object") + throw TypeError(".google.pubsub.v1.ValidateSchemaRequest.schema: object expected"); + message.schema = $root.google.pubsub.v1.Schema.fromObject(object.schema); + } + return message; + }; + + /** + * Creates a plain object from a ValidateSchemaRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {google.pubsub.v1.ValidateSchemaRequest} message ValidateSchemaRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ValidateSchemaRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.parent = ""; + object.schema = null; + } + if (message.parent != null && message.hasOwnProperty("parent")) + object.parent = message.parent; + if (message.schema != null && message.hasOwnProperty("schema")) + object.schema = $root.google.pubsub.v1.Schema.toObject(message.schema, options); + return object; + }; + + /** + * Converts this ValidateSchemaRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @instance + * @returns {Object.} JSON object + */ + ValidateSchemaRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ValidateSchemaRequest; + })(); + + v1.ValidateSchemaResponse = (function() { + + /** + * Properties of a ValidateSchemaResponse. + * @memberof google.pubsub.v1 + * @interface IValidateSchemaResponse + */ + + /** + * Constructs a new ValidateSchemaResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ValidateSchemaResponse. + * @implements IValidateSchemaResponse + * @constructor + * @param {google.pubsub.v1.IValidateSchemaResponse=} [properties] Properties to set + */ + function ValidateSchemaResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new ValidateSchemaResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {google.pubsub.v1.IValidateSchemaResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ValidateSchemaResponse} ValidateSchemaResponse instance + */ + ValidateSchemaResponse.create = function create(properties) { + return new ValidateSchemaResponse(properties); + }; + + /** + * Encodes the specified ValidateSchemaResponse message. Does not implicitly {@link google.pubsub.v1.ValidateSchemaResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {google.pubsub.v1.IValidateSchemaResponse} message ValidateSchemaResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ValidateSchemaResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified ValidateSchemaResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ValidateSchemaResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {google.pubsub.v1.IValidateSchemaResponse} message ValidateSchemaResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ValidateSchemaResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ValidateSchemaResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ValidateSchemaResponse} ValidateSchemaResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ValidateSchemaResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ValidateSchemaResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ValidateSchemaResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ValidateSchemaResponse} ValidateSchemaResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ValidateSchemaResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ValidateSchemaResponse message. + * @function verify + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ValidateSchemaResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a ValidateSchemaResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ValidateSchemaResponse} ValidateSchemaResponse + */ + ValidateSchemaResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ValidateSchemaResponse) + return object; + return new $root.google.pubsub.v1.ValidateSchemaResponse(); + }; + + /** + * Creates a plain object from a ValidateSchemaResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {google.pubsub.v1.ValidateSchemaResponse} message ValidateSchemaResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ValidateSchemaResponse.toObject = function toObject() { + return {}; + }; + + /** + * Converts this ValidateSchemaResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @instance + * @returns {Object.} JSON object + */ + ValidateSchemaResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ValidateSchemaResponse; + })(); + + v1.ValidateMessageRequest = (function() { + + /** + * Properties of a ValidateMessageRequest. + * @memberof google.pubsub.v1 + * @interface IValidateMessageRequest + * @property {string|null} [parent] ValidateMessageRequest parent + * @property {string|null} [name] ValidateMessageRequest name + * @property {google.pubsub.v1.ISchema|null} [schema] ValidateMessageRequest schema + * @property {Uint8Array|null} [message] ValidateMessageRequest message + * @property {google.pubsub.v1.Encoding|null} [encoding] ValidateMessageRequest encoding + */ + + /** + * Constructs a new ValidateMessageRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ValidateMessageRequest. + * @implements IValidateMessageRequest + * @constructor + * @param {google.pubsub.v1.IValidateMessageRequest=} [properties] Properties to set + */ + function ValidateMessageRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ValidateMessageRequest parent. + * @member {string} parent + * @memberof google.pubsub.v1.ValidateMessageRequest + * @instance + */ + ValidateMessageRequest.prototype.parent = ""; + + /** + * ValidateMessageRequest name. + * @member {string} name + * @memberof google.pubsub.v1.ValidateMessageRequest + * @instance + */ + ValidateMessageRequest.prototype.name = ""; + + /** + * ValidateMessageRequest schema. + * @member {google.pubsub.v1.ISchema|null|undefined} schema + * @memberof google.pubsub.v1.ValidateMessageRequest + * @instance + */ + ValidateMessageRequest.prototype.schema = null; + + /** + * ValidateMessageRequest message. + * @member {Uint8Array} message + * @memberof google.pubsub.v1.ValidateMessageRequest + * @instance + */ + ValidateMessageRequest.prototype.message = $util.newBuffer([]); + + /** + * ValidateMessageRequest encoding. + * @member {google.pubsub.v1.Encoding} encoding + * @memberof google.pubsub.v1.ValidateMessageRequest + * @instance + */ + ValidateMessageRequest.prototype.encoding = 0; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * ValidateMessageRequest schemaSpec. + * @member {"name"|"schema"|undefined} schemaSpec + * @memberof google.pubsub.v1.ValidateMessageRequest + * @instance + */ + Object.defineProperty(ValidateMessageRequest.prototype, "schemaSpec", { + get: $util.oneOfGetter($oneOfFields = ["name", "schema"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new ValidateMessageRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {google.pubsub.v1.IValidateMessageRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ValidateMessageRequest} ValidateMessageRequest instance + */ + ValidateMessageRequest.create = function create(properties) { + return new ValidateMessageRequest(properties); + }; + + /** + * Encodes the specified ValidateMessageRequest message. Does not implicitly {@link google.pubsub.v1.ValidateMessageRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {google.pubsub.v1.IValidateMessageRequest} message ValidateMessageRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ValidateMessageRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.parent != null && Object.hasOwnProperty.call(message, "parent")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.parent); + if (message.name != null && Object.hasOwnProperty.call(message, "name")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.name); + if (message.schema != null && Object.hasOwnProperty.call(message, "schema")) + $root.google.pubsub.v1.Schema.encode(message.schema, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.message != null && Object.hasOwnProperty.call(message, "message")) + writer.uint32(/* id 4, wireType 2 =*/34).bytes(message.message); + if (message.encoding != null && Object.hasOwnProperty.call(message, "encoding")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.encoding); + return writer; + }; + + /** + * Encodes the specified ValidateMessageRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ValidateMessageRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {google.pubsub.v1.IValidateMessageRequest} message ValidateMessageRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ValidateMessageRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ValidateMessageRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ValidateMessageRequest} ValidateMessageRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ValidateMessageRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ValidateMessageRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.parent = reader.string(); + break; + case 2: + message.name = reader.string(); + break; + case 3: + message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); + break; + case 4: + message.message = reader.bytes(); + break; + case 5: + message.encoding = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ValidateMessageRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ValidateMessageRequest} ValidateMessageRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ValidateMessageRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ValidateMessageRequest message. + * @function verify + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ValidateMessageRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.parent != null && message.hasOwnProperty("parent")) + if (!$util.isString(message.parent)) + return "parent: string expected"; + if (message.name != null && message.hasOwnProperty("name")) { + properties.schemaSpec = 1; + if (!$util.isString(message.name)) + return "name: string expected"; + } + if (message.schema != null && message.hasOwnProperty("schema")) { + if (properties.schemaSpec === 1) + return "schemaSpec: multiple values"; + properties.schemaSpec = 1; + { + var error = $root.google.pubsub.v1.Schema.verify(message.schema); + if (error) + return "schema." + error; + } + } + if (message.message != null && message.hasOwnProperty("message")) + if (!(message.message && typeof message.message.length === "number" || $util.isString(message.message))) + return "message: buffer expected"; + if (message.encoding != null && message.hasOwnProperty("encoding")) + switch (message.encoding) { + default: + return "encoding: enum value expected"; + case 0: + case 1: + case 2: + break; + } + return null; + }; + + /** + * Creates a ValidateMessageRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ValidateMessageRequest} ValidateMessageRequest + */ + ValidateMessageRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ValidateMessageRequest) + return object; + var message = new $root.google.pubsub.v1.ValidateMessageRequest(); + if (object.parent != null) + message.parent = String(object.parent); + if (object.name != null) + message.name = String(object.name); + if (object.schema != null) { + if (typeof object.schema !== "object") + throw TypeError(".google.pubsub.v1.ValidateMessageRequest.schema: object expected"); + message.schema = $root.google.pubsub.v1.Schema.fromObject(object.schema); + } + if (object.message != null) + if (typeof object.message === "string") + $util.base64.decode(object.message, message.message = $util.newBuffer($util.base64.length(object.message)), 0); + else if (object.message.length) + message.message = object.message; + switch (object.encoding) { + case "ENCODING_UNSPECIFIED": + case 0: + message.encoding = 0; + break; + case "JSON": + case 1: + message.encoding = 1; + break; + case "BINARY": + case 2: + message.encoding = 2; + break; + } + return message; + }; + + /** + * Creates a plain object from a ValidateMessageRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {google.pubsub.v1.ValidateMessageRequest} message ValidateMessageRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ValidateMessageRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.parent = ""; + if (options.bytes === String) + object.message = ""; + else { + object.message = []; + if (options.bytes !== Array) + object.message = $util.newBuffer(object.message); + } + object.encoding = options.enums === String ? "ENCODING_UNSPECIFIED" : 0; + } + if (message.parent != null && message.hasOwnProperty("parent")) + object.parent = message.parent; + if (message.name != null && message.hasOwnProperty("name")) { + object.name = message.name; + if (options.oneofs) + object.schemaSpec = "name"; + } + if (message.schema != null && message.hasOwnProperty("schema")) { + object.schema = $root.google.pubsub.v1.Schema.toObject(message.schema, options); + if (options.oneofs) + object.schemaSpec = "schema"; + } + if (message.message != null && message.hasOwnProperty("message")) + object.message = options.bytes === String ? $util.base64.encode(message.message, 0, message.message.length) : options.bytes === Array ? Array.prototype.slice.call(message.message) : message.message; + if (message.encoding != null && message.hasOwnProperty("encoding")) + object.encoding = options.enums === String ? $root.google.pubsub.v1.Encoding[message.encoding] : message.encoding; + return object; + }; + + /** + * Converts this ValidateMessageRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ValidateMessageRequest + * @instance + * @returns {Object.} JSON object + */ + ValidateMessageRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ValidateMessageRequest; + })(); + + v1.ValidateMessageResponse = (function() { + + /** + * Properties of a ValidateMessageResponse. + * @memberof google.pubsub.v1 + * @interface IValidateMessageResponse + */ + + /** + * Constructs a new ValidateMessageResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ValidateMessageResponse. + * @implements IValidateMessageResponse + * @constructor + * @param {google.pubsub.v1.IValidateMessageResponse=} [properties] Properties to set + */ + function ValidateMessageResponse(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new ValidateMessageResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {google.pubsub.v1.IValidateMessageResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ValidateMessageResponse} ValidateMessageResponse instance + */ + ValidateMessageResponse.create = function create(properties) { + return new ValidateMessageResponse(properties); + }; + + /** + * Encodes the specified ValidateMessageResponse message. Does not implicitly {@link google.pubsub.v1.ValidateMessageResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {google.pubsub.v1.IValidateMessageResponse} message ValidateMessageResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ValidateMessageResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified ValidateMessageResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ValidateMessageResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {google.pubsub.v1.IValidateMessageResponse} message ValidateMessageResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ValidateMessageResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ValidateMessageResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ValidateMessageResponse} ValidateMessageResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ValidateMessageResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ValidateMessageResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ValidateMessageResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ValidateMessageResponse} ValidateMessageResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ValidateMessageResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ValidateMessageResponse message. + * @function verify + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ValidateMessageResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a ValidateMessageResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ValidateMessageResponse} ValidateMessageResponse + */ + ValidateMessageResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ValidateMessageResponse) + return object; + return new $root.google.pubsub.v1.ValidateMessageResponse(); + }; + + /** + * Creates a plain object from a ValidateMessageResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {google.pubsub.v1.ValidateMessageResponse} message ValidateMessageResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ValidateMessageResponse.toObject = function toObject() { + return {}; + }; + + /** + * Converts this ValidateMessageResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ValidateMessageResponse + * @instance + * @returns {Object.} JSON object + */ + ValidateMessageResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ValidateMessageResponse; + })(); + + /** + * Encoding enum. + * @name google.pubsub.v1.Encoding + * @enum {number} + * @property {number} ENCODING_UNSPECIFIED=0 ENCODING_UNSPECIFIED value + * @property {number} JSON=1 JSON value + * @property {number} BINARY=2 BINARY value + */ + v1.Encoding = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "ENCODING_UNSPECIFIED"] = 0; + values[valuesById[1] = "JSON"] = 1; + values[valuesById[2] = "BINARY"] = 2; + return values; + })(); + return v1; })(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index cb4b5356b9f..6a97de5b47c 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -10,7 +10,7 @@ "csharp_namespace": "Google.Cloud.PubSub.V1", "go_package": "google.golang.org/genproto/googleapis/pubsub/v1;pubsub", "java_multiple_files": true, - "java_outer_classname": "PubsubProto", + "java_outer_classname": "SchemaProto", "java_package": "com.google.pubsub.v1", "php_namespace": "Google\\Cloud\\PubSub\\V1", "ruby_package": "Google::Cloud::PubSub::V1" @@ -193,6 +193,22 @@ } } }, + "SchemaSettings": { + "fields": { + "schema": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Schema" + } + }, + "encoding": { + "type": "Encoding", + "id": 2 + } + } + }, "Topic": { "options": { "(google.api.resource).type": "pubsub.googleapis.com/Topic", @@ -218,6 +234,14 @@ "kmsKeyName": { "type": "string", "id": 5 + }, + "schemaSettings": { + "type": "SchemaSettings", + "id": 6 + }, + "satisfiesPzs": { + "type": "bool", + "id": 7 } } }, @@ -1271,6 +1295,322 @@ }, "SeekResponse": { "fields": {} + }, + "SchemaService": { + "options": { + "(google.api.default_host)": "pubsub.googleapis.com", + "(google.api.oauth_scopes)": "https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/pubsub" + }, + "methods": { + "CreateSchema": { + "requestType": "CreateSchemaRequest", + "responseType": "Schema", + "options": { + "(google.api.http).post": "/v1/{parent=projects/*}/schemas", + "(google.api.http).body": "schema", + "(google.api.method_signature)": "parent,schema,schema_id" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{parent=projects/*}/schemas", + "body": "schema" + } + }, + { + "(google.api.method_signature)": "parent,schema,schema_id" + } + ] + }, + "GetSchema": { + "requestType": "GetSchemaRequest", + "responseType": "Schema", + "options": { + "(google.api.http).get": "/v1/{name=projects/*/schemas/*}", + "(google.api.method_signature)": "name" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{name=projects/*/schemas/*}" + } + }, + { + "(google.api.method_signature)": "name" + } + ] + }, + "ListSchemas": { + "requestType": "ListSchemasRequest", + "responseType": "ListSchemasResponse", + "options": { + "(google.api.http).get": "/v1/{parent=projects/*}/schemas", + "(google.api.method_signature)": "parent" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{parent=projects/*}/schemas" + } + }, + { + "(google.api.method_signature)": "parent" + } + ] + }, + "DeleteSchema": { + "requestType": "DeleteSchemaRequest", + "responseType": "google.protobuf.Empty", + "options": { + "(google.api.http).delete": "/v1/{name=projects/*/schemas/*}", + "(google.api.method_signature)": "name" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "delete": "/v1/{name=projects/*/schemas/*}" + } + }, + { + "(google.api.method_signature)": "name" + } + ] + }, + "ValidateSchema": { + "requestType": "ValidateSchemaRequest", + "responseType": "ValidateSchemaResponse", + "options": { + "(google.api.http).post": "/v1/{parent=projects/*}/schemas:validate", + "(google.api.http).body": "*", + "(google.api.method_signature)": "parent,schema" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{parent=projects/*}/schemas:validate", + "body": "*" + } + }, + { + "(google.api.method_signature)": "parent,schema" + } + ] + }, + "ValidateMessage": { + "requestType": "ValidateMessageRequest", + "responseType": "ValidateMessageResponse", + "options": { + "(google.api.http).post": "/v1/{parent=projects/*}/schemas:validateMessage", + "(google.api.http).body": "*" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{parent=projects/*}/schemas:validateMessage", + "body": "*" + } + } + ] + } + } + }, + "Schema": { + "options": { + "(google.api.resource).type": "pubsub.googleapis.com/Schema", + "(google.api.resource).pattern": "projects/{project}/schemas/{schema}" + }, + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "type": { + "type": "Type", + "id": 2 + }, + "definition": { + "type": "string", + "id": 3 + } + }, + "nested": { + "Type": { + "values": { + "TYPE_UNSPECIFIED": 0, + "PROTOCOL_BUFFER": 1, + "AVRO": 2 + } + } + } + }, + "CreateSchemaRequest": { + "fields": { + "parent": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).child_type": "pubsub.googleapis.com/Schema" + } + }, + "schema": { + "type": "Schema", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "schemaId": { + "type": "string", + "id": 3 + } + } + }, + "SchemaView": { + "values": { + "SCHEMA_VIEW_UNSPECIFIED": 0, + "BASIC": 1, + "FULL": 2 + } + }, + "GetSchemaRequest": { + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Schema" + } + }, + "view": { + "type": "SchemaView", + "id": 2 + } + } + }, + "ListSchemasRequest": { + "fields": { + "parent": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } + }, + "view": { + "type": "SchemaView", + "id": 2 + }, + "pageSize": { + "type": "int32", + "id": 3 + }, + "pageToken": { + "type": "string", + "id": 4 + } + } + }, + "ListSchemasResponse": { + "fields": { + "schemas": { + "rule": "repeated", + "type": "Schema", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "DeleteSchemaRequest": { + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Schema" + } + } + } + }, + "ValidateSchemaRequest": { + "fields": { + "parent": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } + }, + "schema": { + "type": "Schema", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "ValidateSchemaResponse": { + "fields": {} + }, + "ValidateMessageRequest": { + "oneofs": { + "schemaSpec": { + "oneof": [ + "name", + "schema" + ] + } + }, + "fields": { + "parent": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "cloudresourcemanager.googleapis.com/Project" + } + }, + "name": { + "type": "string", + "id": 2, + "options": { + "(google.api.resource_reference).type": "pubsub.googleapis.com/Schema" + } + }, + "schema": { + "type": "Schema", + "id": 3 + }, + "message": { + "type": "bytes", + "id": 4 + }, + "encoding": { + "type": "Encoding", + "id": 5 + } + } + }, + "ValidateMessageResponse": { + "fields": {} + }, + "Encoding": { + "values": { + "ENCODING_UNSPECIFIED": 0, + "JSON": 1, + "BINARY": 2 + } } } } diff --git a/handwritten/pubsub/src/v1/index.ts b/handwritten/pubsub/src/v1/index.ts index 9b1a8d2eb7e..3eeadbcf0d2 100644 --- a/handwritten/pubsub/src/v1/index.ts +++ b/handwritten/pubsub/src/v1/index.ts @@ -17,4 +17,5 @@ // ** All changes to this file may be overwritten. ** export {PublisherClient} from './publisher_client'; +export {SchemaServiceClient} from './schema_service_client'; export {SubscriberClient} from './subscriber_client'; diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index a0527bc6e7c..97975ee5cf3 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -16,6 +16,7 @@ // ** https://github.com/googleapis/gapic-generator-typescript ** // ** All changes to this file may be overwritten. ** +/* global window */ import * as gax from 'google-gax'; import { Callback, @@ -32,6 +33,11 @@ import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +/** + * Client JSON configuration object, loaded from + * `src/v1/publisher_client_config.json`. + * This file defines retry strategy and timeouts for all API methods in this library. + */ import * as gapicConfig from './publisher_client_config.json'; const version = require('../../../package.json').version; @@ -64,8 +70,10 @@ export class PublisherClient { /** * Construct an instance of PublisherClient. * - * @param {object} [options] - The configuration object. See the subsequent - * parameters for more details. + * @param {object} [options] - The configuration object. + * The options accepted by the constructor are described in detail + * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). + * The common options are: * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] * @param {string} [options.credentials.private_key] @@ -85,42 +93,35 @@ export class PublisherClient { * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. + * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. + * Follows the structure of {@link gapicConfig}. + * @param {boolean} [options.fallback] - Use HTTP fallback mode. + * In fallback mode, a special browser-compatible transport implementation is used + * instead of gRPC transport. In browser context (if the `window` object is defined) + * the fallback mode is enabled automatically; set `options.fallback` to `false` + * if you need to override this behavior. */ - constructor(opts?: ClientOptions) { - // Ensure that options include the service address and port. + // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof PublisherClient; const servicePath = - opts && opts.servicePath - ? opts.servicePath - : opts && opts.apiEndpoint - ? opts.apiEndpoint - : staticMembers.servicePath; - const port = opts && opts.port ? opts.port : staticMembers.port; + opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + const port = opts?.port || staticMembers.port; + const clientConfig = opts?.clientConfig ?? {}; + const fallback = + opts?.fallback ?? + (typeof window !== 'undefined' && typeof window?.fetch === 'function'); + opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); - if (!opts) { - opts = {servicePath, port}; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. + if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { + opts['scopes'] = staticMembers.scopes; } - opts.servicePath = opts.servicePath || servicePath; - opts.port = opts.port || port; - // users can override the config from client side, like retry codes name. - // The detailed structure of the clientConfig can be found here: https://github.com/googleapis/gax-nodejs/blob/master/src/gax.ts#L546 - // The way to override client config for Showcase API: - // - // const customConfig = {"interfaces": {"google.showcase.v1beta1.Echo": {"methods": {"Echo": {"retry_codes_name": "idempotent", "retry_params_name": "default"}}}}} - // const showcaseClient = new showcaseClient({ projectId, customConfig }); - opts.clientConfig = opts.clientConfig || {}; - - // If we're running in browser, it's OK to omit `fallback` since - // google-gax has `browser` field in its `package.json`. - // For Electron (which does not respect `browser` field), - // pass `{fallback: true}` to the PublisherClient constructor. + // Choose either gRPC or proto-over-HTTP implementation of google-gax. this._gaxModule = opts.fallback ? gax.fallback : gax; - // Create a `gaxGrpc` object, with any grpc-specific options - // sent to the client. - opts.scopes = (this.constructor as typeof PublisherClient).scopes; + // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. this._gaxGrpc = new this._gaxModule.GrpcClient(opts); // Save options to use in initialize() method. @@ -128,6 +129,11 @@ export class PublisherClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + + // Set the default scopes in auth client if needed. + if (servicePath === staticMembers.servicePath) { + this.auth.defaultScopes = staticMembers.scopes; + } this.iamClient = new IamClient(this._gaxGrpc, opts); // Determine the client header string. @@ -171,6 +177,9 @@ export class PublisherClient { projectTopicPathTemplate: new this._gaxModule.PathTemplate( 'projects/{project}/topics/{topic}' ), + schemaPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/schemas/{schema}' + ), snapshotPathTemplate: new this._gaxModule.PathTemplate( 'projects/{project}/snapshots/{snapshot}' ), @@ -313,6 +322,7 @@ export class PublisherClient { /** * The DNS address for this API service. + * @returns {string} The DNS address for this service. */ static get servicePath() { return 'pubsub.googleapis.com'; @@ -321,6 +331,7 @@ export class PublisherClient { /** * The DNS address for this API service - same as servicePath(), * exists for compatibility reasons. + * @returns {string} The DNS address for this service. */ static get apiEndpoint() { return 'pubsub.googleapis.com'; @@ -328,6 +339,7 @@ export class PublisherClient { /** * The port for this API service. + * @returns {number} The default port for this service. */ static get port() { return 443; @@ -336,6 +348,7 @@ export class PublisherClient { /** * The scopes needed to make gRPC calls for every method defined * in this service. + * @returns {string[]} List of default scopes. */ static get scopes() { return [ @@ -348,8 +361,7 @@ export class PublisherClient { getProjectId(callback: Callback): void; /** * Return the project ID used by this class. - * @param {function(Error, string)} callback - the callback to - * be called with the current project Id. + * @returns {Promise} A promise that resolves to string containing the project ID. */ getProjectId( callback?: Callback @@ -366,7 +378,7 @@ export class PublisherClient { // ------------------- createTopic( request: protos.google.pubsub.v1.ITopic, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -376,7 +388,7 @@ export class PublisherClient { >; createTopic( request: protos.google.pubsub.v1.ITopic, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.ITopic | null | undefined, @@ -392,8 +404,8 @@ export class PublisherClient { > ): void; /** - * Creates the given topic with the given name. See the [resource name rules]( - * https://cloud.google.com/pubsub/docs/admin#resource_names). + * Creates the given topic with the given name. See the [resource name rules] + * (https://cloud.google.com/pubsub/docs/admin#resource_names). * * @param {Object} request * The request object that will be sent. @@ -416,16 +428,27 @@ export class PublisherClient { * to messages published on this topic. * * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. + * @param {google.pubsub.v1.SchemaSettings} request.schemaSettings + * Settings for validating messages published against a schema. + * + * EXPERIMENTAL: Schema support is in development and may not work yet. + * @param {boolean} request.satisfiesPzs + * Reserved for future use. This field is set only in responses from the + * server; it is ignored if it is set in any requests. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.createTopic(request); */ createTopic( request: protos.google.pubsub.v1.ITopic, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.ITopic | null | undefined, @@ -444,12 +467,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -464,7 +487,7 @@ export class PublisherClient { } updateTopic( request: protos.google.pubsub.v1.IUpdateTopicRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -474,7 +497,7 @@ export class PublisherClient { >; updateTopic( request: protos.google.pubsub.v1.IUpdateTopicRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, @@ -507,12 +530,16 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.updateTopic(request); */ updateTopic( request: protos.google.pubsub.v1.IUpdateTopicRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, @@ -531,12 +558,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -551,7 +578,7 @@ export class PublisherClient { } publish( request: protos.google.pubsub.v1.IPublishRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.IPublishResponse, @@ -561,7 +588,7 @@ export class PublisherClient { >; publish( request: protos.google.pubsub.v1.IPublishRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.IPublishResponse, protos.google.pubsub.v1.IPublishRequest | null | undefined, @@ -591,12 +618,16 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.publish(request); */ publish( request: protos.google.pubsub.v1.IPublishRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.IPublishResponse, protos.google.pubsub.v1.IPublishRequest | null | undefined, @@ -615,12 +646,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -635,7 +666,7 @@ export class PublisherClient { } getTopic( request: protos.google.pubsub.v1.IGetTopicRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -645,7 +676,7 @@ export class PublisherClient { >; getTopic( request: protos.google.pubsub.v1.IGetTopicRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IGetTopicRequest | null | undefined, @@ -672,12 +703,16 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.getTopic(request); */ getTopic( request: protos.google.pubsub.v1.IGetTopicRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IGetTopicRequest | null | undefined, @@ -696,12 +731,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -716,7 +751,7 @@ export class PublisherClient { } deleteTopic( request: protos.google.pubsub.v1.IDeleteTopicRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.protobuf.IEmpty, @@ -726,7 +761,7 @@ export class PublisherClient { >; deleteTopic( request: protos.google.pubsub.v1.IDeleteTopicRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, @@ -757,12 +792,16 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.deleteTopic(request); */ deleteTopic( request: protos.google.pubsub.v1.IDeleteTopicRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, @@ -781,12 +820,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -801,7 +840,7 @@ export class PublisherClient { } detachSubscription( request: protos.google.pubsub.v1.IDetachSubscriptionRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.IDetachSubscriptionResponse, @@ -811,7 +850,7 @@ export class PublisherClient { >; detachSubscription( request: protos.google.pubsub.v1.IDetachSubscriptionRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.IDetachSubscriptionResponse, protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, @@ -841,12 +880,16 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [DetachSubscriptionResponse]{@link google.pubsub.v1.DetachSubscriptionResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.detachSubscription(request); */ detachSubscription( request: protos.google.pubsub.v1.IDetachSubscriptionRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.IDetachSubscriptionResponse, protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, @@ -865,12 +908,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -886,7 +929,7 @@ export class PublisherClient { listTopics( request: protos.google.pubsub.v1.IListTopicsRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ITopic[], @@ -896,7 +939,7 @@ export class PublisherClient { >; listTopics( request: protos.google.pubsub.v1.IListTopicsRequest, - options: gax.CallOptions, + options: CallOptions, callback: PaginationCallback< protos.google.pubsub.v1.IListTopicsRequest, protos.google.pubsub.v1.IListTopicsResponse | null | undefined, @@ -929,24 +972,19 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Topic]{@link google.pubsub.v1.Topic}. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Topic]{@link google.pubsub.v1.Topic} that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListTopicsRequest]{@link google.pubsub.v1.ListTopicsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListTopicsResponse]{@link google.pubsub.v1.ListTopicsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listTopicsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopics( request: protos.google.pubsub.v1.IListTopicsRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | PaginationCallback< protos.google.pubsub.v1.IListTopicsRequest, protos.google.pubsub.v1.IListTopicsResponse | null | undefined, @@ -965,12 +1003,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -985,18 +1023,7 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopics}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopics} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1012,10 +1039,17 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Topic]{@link google.pubsub.v1.Topic} on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listTopicsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicsStream( request?: protos.google.pubsub.v1.IListTopicsRequest, - options?: gax.CallOptions + options?: CallOptions ): Transform { request = request || {}; options = options || {}; @@ -1036,10 +1070,9 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopics}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listTopics`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1054,11 +1087,22 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * [Topic]{@link google.pubsub.v1.Topic}. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listTopicsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listTopicsAsync( request?: protos.google.pubsub.v1.IListTopicsRequest, - options?: gax.CallOptions + options?: CallOptions ): AsyncIterable { request = request || {}; options = options || {}; @@ -1080,7 +1124,7 @@ export class PublisherClient { } listTopicSubscriptions( request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ string[], @@ -1090,7 +1134,7 @@ export class PublisherClient { >; listTopicSubscriptions( request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, - options: gax.CallOptions, + options: CallOptions, callback: PaginationCallback< protos.google.pubsub.v1.IListTopicSubscriptionsRequest, | protos.google.pubsub.v1.IListTopicSubscriptionsResponse @@ -1127,24 +1171,19 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of string. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of string that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListTopicSubscriptionsRequest]{@link google.pubsub.v1.ListTopicSubscriptionsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListTopicSubscriptionsResponse]{@link google.pubsub.v1.ListTopicSubscriptionsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listTopicSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicSubscriptions( request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | PaginationCallback< protos.google.pubsub.v1.IListTopicSubscriptionsRequest, | protos.google.pubsub.v1.IListTopicSubscriptionsResponse @@ -1167,12 +1206,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1191,18 +1230,7 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopicSubscriptions}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopicSubscriptions} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1218,10 +1246,17 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing string on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listTopicSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicSubscriptionsStream( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, - options?: gax.CallOptions + options?: CallOptions ): Transform { request = request || {}; options = options || {}; @@ -1242,10 +1277,9 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopicSubscriptions}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listTopicSubscriptions`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1260,11 +1294,22 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * string. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listTopicSubscriptionsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listTopicSubscriptionsAsync( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, - options?: gax.CallOptions + options?: CallOptions ): AsyncIterable { request = request || {}; options = options || {}; @@ -1286,7 +1331,7 @@ export class PublisherClient { } listTopicSnapshots( request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ string[], @@ -1296,7 +1341,7 @@ export class PublisherClient { >; listTopicSnapshots( request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options: gax.CallOptions, + options: CallOptions, callback: PaginationCallback< protos.google.pubsub.v1.IListTopicSnapshotsRequest, protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, @@ -1333,24 +1378,19 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of string. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of string that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListTopicSnapshotsRequest]{@link google.pubsub.v1.ListTopicSnapshotsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListTopicSnapshotsResponse]{@link google.pubsub.v1.ListTopicSnapshotsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listTopicSnapshotsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicSnapshots( request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | PaginationCallback< protos.google.pubsub.v1.IListTopicSnapshotsRequest, | protos.google.pubsub.v1.IListTopicSnapshotsResponse @@ -1371,12 +1411,12 @@ export class PublisherClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1391,18 +1431,7 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopicSnapshots}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listTopicSnapshots} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1418,10 +1447,17 @@ export class PublisherClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing string on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listTopicSnapshotsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listTopicSnapshotsStream( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options?: gax.CallOptions + options?: CallOptions ): Transform { request = request || {}; options = options || {}; @@ -1442,10 +1478,9 @@ export class PublisherClient { } /** - * Equivalent to {@link listTopicSnapshots}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listTopicSnapshots`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1460,11 +1495,22 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * string. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listTopicSnapshotsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listTopicSnapshotsAsync( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options?: gax.CallOptions + options?: CallOptions ): AsyncIterable { request = request || {}; options = options || {}; @@ -1689,6 +1735,42 @@ export class PublisherClient { .topic; } + /** + * Return a fully-qualified schema resource name string. + * + * @param {string} project + * @param {string} schema + * @returns {string} Resource name string. + */ + schemaPath(project: string, schema: string) { + return this.pathTemplates.schemaPathTemplate.render({ + project: project, + schema: schema, + }); + } + + /** + * Parse the project from Schema resource. + * + * @param {string} schemaName + * A fully-qualified path representing Schema resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSchemaName(schemaName: string) { + return this.pathTemplates.schemaPathTemplate.match(schemaName).project; + } + + /** + * Parse the schema from Schema resource. + * + * @param {string} schemaName + * A fully-qualified path representing Schema resource. + * @returns {string} A string representing the schema. + */ + matchSchemaFromSchemaName(schemaName: string) { + return this.pathTemplates.schemaPathTemplate.match(schemaName).schema; + } + /** * Return a fully-qualified snapshot resource name string. * @@ -1764,9 +1846,10 @@ export class PublisherClient { } /** - * Terminate the GRPC channel and close the client. + * Terminate the gRPC channel and close the client. * * The client will no longer be usable and all future behavior is undefined. + * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { this.initialize(); diff --git a/handwritten/pubsub/src/v1/publisher_proto_list.json b/handwritten/pubsub/src/v1/publisher_proto_list.json index 23484bf6695..91011aec150 100644 --- a/handwritten/pubsub/src/v1/publisher_proto_list.json +++ b/handwritten/pubsub/src/v1/publisher_proto_list.json @@ -1,3 +1,4 @@ [ - "../../protos/google/pubsub/v1/pubsub.proto" + "../../protos/google/pubsub/v1/pubsub.proto", + "../../protos/google/pubsub/v1/schema.proto" ] diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts new file mode 100644 index 00000000000..d2df824606a --- /dev/null +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -0,0 +1,1328 @@ +// Copyright 2021 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** + +/* global window */ +import * as gax from 'google-gax'; +import { + Callback, + CallOptions, + Descriptors, + ClientOptions, + PaginationCallback, + GaxCall, + IamClient, + IamProtos, +} from 'google-gax'; +import * as path from 'path'; + +import {Transform} from 'stream'; +import {RequestType} from 'google-gax/build/src/apitypes'; +import * as protos from '../../protos/protos'; +/** + * Client JSON configuration object, loaded from + * `src/v1/schema_service_client_config.json`. + * This file defines retry strategy and timeouts for all API methods in this library. + */ +import * as gapicConfig from './schema_service_client_config.json'; + +const version = require('../../../package.json').version; + +/** + * @class + * @memberof v1 + */ +export class SchemaServiceClient { + private _terminated = false; + private _opts: ClientOptions; + private _gaxModule: typeof gax | typeof gax.fallback; + private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; + private _protos: {}; + private _defaults: {[method: string]: gax.CallSettings}; + auth: gax.GoogleAuth; + descriptors: Descriptors = { + page: {}, + stream: {}, + longrunning: {}, + batching: {}, + }; + innerApiCalls: {[name: string]: Function}; + iamClient: IamClient; + pathTemplates: {[name: string]: gax.PathTemplate}; + schemaServiceStub?: Promise<{[name: string]: Function}>; + + /** + * Construct an instance of SchemaServiceClient. + * + * @param {object} [options] - The configuration object. + * The options accepted by the constructor are described in detail + * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). + * The common options are: + * @param {object} [options.credentials] - Credentials object. + * @param {string} [options.credentials.client_email] + * @param {string} [options.credentials.private_key] + * @param {string} [options.email] - Account email address. Required when + * using a .pem or .p12 keyFilename. + * @param {string} [options.keyFilename] - Full path to the a .json, .pem, or + * .p12 key downloaded from the Google Developers Console. If you provide + * a path to a JSON file, the projectId option below is not necessary. + * NOTE: .pem and .p12 require you to specify options.email as well. + * @param {number} [options.port] - The port on which to connect to + * the remote host. + * @param {string} [options.projectId] - The project ID from the Google + * Developer's Console, e.g. 'grape-spaceship-123'. We will also check + * the environment variable GCLOUD_PROJECT for your project ID. If your + * app is running in an environment which supports + * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, + * your project ID will be detected automatically. + * @param {string} [options.apiEndpoint] - The domain name of the + * API remote host. + * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. + * Follows the structure of {@link gapicConfig}. + * @param {boolean} [options.fallback] - Use HTTP fallback mode. + * In fallback mode, a special browser-compatible transport implementation is used + * instead of gRPC transport. In browser context (if the `window` object is defined) + * the fallback mode is enabled automatically; set `options.fallback` to `false` + * if you need to override this behavior. + */ + constructor(opts?: ClientOptions) { + // Ensure that options include all the required fields. + const staticMembers = this.constructor as typeof SchemaServiceClient; + const servicePath = + opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + const port = opts?.port || staticMembers.port; + const clientConfig = opts?.clientConfig ?? {}; + const fallback = + opts?.fallback ?? + (typeof window !== 'undefined' && typeof window?.fetch === 'function'); + opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. + if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { + opts['scopes'] = staticMembers.scopes; + } + + // Choose either gRPC or proto-over-HTTP implementation of google-gax. + this._gaxModule = opts.fallback ? gax.fallback : gax; + + // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. + this._gaxGrpc = new this._gaxModule.GrpcClient(opts); + + // Save options to use in initialize() method. + this._opts = opts; + + // Save the auth object to the client, for use by other methods. + this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + + // Set the default scopes in auth client if needed. + if (servicePath === staticMembers.servicePath) { + this.auth.defaultScopes = staticMembers.scopes; + } + this.iamClient = new IamClient(this._gaxGrpc, opts); + + // Determine the client header string. + const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; + if (typeof process !== 'undefined' && 'versions' in process) { + clientHeader.push(`gl-node/${process.versions.node}`); + } else { + clientHeader.push(`gl-web/${this._gaxModule.version}`); + } + if (!opts.fallback) { + clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } + if (opts.libName && opts.libVersion) { + clientHeader.push(`${opts.libName}/${opts.libVersion}`); + } + // Load the applicable protos. + // For Node.js, pass the path to JSON proto file. + // For browsers, pass the JSON content. + + const nodejsProtoPath = path.join( + __dirname, + '..', + '..', + 'protos', + 'protos.json' + ); + this._protos = this._gaxGrpc.loadProto( + opts.fallback + ? // eslint-disable-next-line @typescript-eslint/no-var-requires + require('../../protos/protos.json') + : nodejsProtoPath + ); + + // This API contains "path templates"; forward-slash-separated + // identifiers to uniquely identify resources within the API. + // Create useful helper objects for these. + this.pathTemplates = { + projectPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}' + ), + projectTopicPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/topics/{topic}' + ), + schemaPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/schemas/{schema}' + ), + snapshotPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/snapshots/{snapshot}' + ), + subscriptionPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/subscriptions/{subscription}' + ), + }; + + // Some of the methods on this service return "paged" results, + // (e.g. 50 results at a time, with tokens to get subsequent + // pages). Denote the keys used for pagination and results. + this.descriptors.page = { + listSchemas: new this._gaxModule.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'schemas' + ), + }; + + // Put together the default options sent with requests. + this._defaults = this._gaxGrpc.constructSettings( + 'google.pubsub.v1.SchemaService', + gapicConfig as gax.ClientConfig, + opts.clientConfig || {}, + {'x-goog-api-client': clientHeader.join(' ')} + ); + + // Set up a dictionary of "inner API calls"; the core implementation + // of calling the API is handled in `google-gax`, with this code + // merely providing the destination and request information. + this.innerApiCalls = {}; + } + + /** + * Initialize the client. + * Performs asynchronous operations (such as authentication) and prepares the client. + * This function will be called automatically when any class method is called for the + * first time, but if you need to initialize it before calling an actual method, + * feel free to call initialize() directly. + * + * You can await on this method if you want to make sure the client is initialized. + * + * @returns {Promise} A promise that resolves to an authenticated service stub. + */ + initialize() { + // If the client stub promise is already initialized, return immediately. + if (this.schemaServiceStub) { + return this.schemaServiceStub; + } + + // Put together the "service stub" for + // google.pubsub.v1.SchemaService. + this.schemaServiceStub = this._gaxGrpc.createStub( + this._opts.fallback + ? (this._protos as protobuf.Root).lookupService( + 'google.pubsub.v1.SchemaService' + ) + : // eslint-disable-next-line @typescript-eslint/no-explicit-any + (this._protos as any).google.pubsub.v1.SchemaService, + this._opts + ) as Promise<{[method: string]: Function}>; + + // Iterate over each of the methods that the service provides + // and create an API call method for each. + const schemaServiceStubMethods = [ + 'createSchema', + 'getSchema', + 'listSchemas', + 'deleteSchema', + 'validateSchema', + 'validateMessage', + ]; + for (const methodName of schemaServiceStubMethods) { + const callPromise = this.schemaServiceStub.then( + stub => (...args: Array<{}>) => { + if (this._terminated) { + return Promise.reject('The client has already been closed.'); + } + const func = stub[methodName]; + return func.apply(stub, args); + }, + (err: Error | null | undefined) => () => { + throw err; + } + ); + + const descriptor = this.descriptors.page[methodName] || undefined; + const apiCall = this._gaxModule.createApiCall( + callPromise, + this._defaults[methodName], + descriptor + ); + + this.innerApiCalls[methodName] = apiCall; + } + + return this.schemaServiceStub; + } + + /** + * The DNS address for this API service. + * @returns {string} The DNS address for this service. + */ + static get servicePath() { + return 'pubsub.googleapis.com'; + } + + /** + * The DNS address for this API service - same as servicePath(), + * exists for compatibility reasons. + * @returns {string} The DNS address for this service. + */ + static get apiEndpoint() { + return 'pubsub.googleapis.com'; + } + + /** + * The port for this API service. + * @returns {number} The default port for this service. + */ + static get port() { + return 443; + } + + /** + * The scopes needed to make gRPC calls for every method defined + * in this service. + * @returns {string[]} List of default scopes. + */ + static get scopes() { + return [ + 'https://www.googleapis.com/auth/cloud-platform', + 'https://www.googleapis.com/auth/pubsub', + ]; + } + + getProjectId(): Promise; + getProjectId(callback: Callback): void; + /** + * Return the project ID used by this class. + * @returns {Promise} A promise that resolves to string containing the project ID. + */ + getProjectId( + callback?: Callback + ): Promise | void { + if (callback) { + this.auth.getProjectId(callback); + return; + } + return this.auth.getProjectId(); + } + + // ------------------- + // -- Service calls -- + // ------------------- + createSchema( + request: protos.google.pubsub.v1.ICreateSchemaRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | undefined, + {} | undefined + ] + >; + createSchema( + request: protos.google.pubsub.v1.ICreateSchemaRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + createSchema( + request: protos.google.pubsub.v1.ICreateSchemaRequest, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Creates a schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.parent + * Required. The name of the project in which to create the schema. + * Format is `projects/{project-id}`. + * @param {google.pubsub.v1.Schema} request.schema + * Required. The schema object to create. + * + * This schema's `name` parameter is ignored. The schema object returned + * by CreateSchema will have a `name` made using the given `parent` and + * `schema_id`. + * @param {string} request.schemaId + * The ID to use for the schema, which will become the final component of + * the schema's resource name. + * + * See https://cloud.google.com/pubsub/docs/admin#resource_names for resource + * name constraints. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.createSchema(request); + */ + createSchema( + request: protos.google.pubsub.v1.ICreateSchemaRequest, + optionsOrCallback?: + | CallOptions + | Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + parent: request.parent || '', + }); + this.initialize(); + return this.innerApiCalls.createSchema(request, options, callback); + } + getSchema( + request: protos.google.pubsub.v1.IGetSchemaRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IGetSchemaRequest | undefined, + {} | undefined + ] + >; + getSchema( + request: protos.google.pubsub.v1.IGetSchemaRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IGetSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + getSchema( + request: protos.google.pubsub.v1.IGetSchemaRequest, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IGetSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Gets a schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the schema to get. + * Format is `projects/{project}/schemas/{schema}`. + * @param {google.pubsub.v1.SchemaView} request.view + * The set of fields to return in the response. If not set, returns a Schema + * with `name` and `type`, but not `definition`. Set to `FULL` to retrieve all + * fields. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.getSchema(request); + */ + getSchema( + request: protos.google.pubsub.v1.IGetSchemaRequest, + optionsOrCallback?: + | CallOptions + | Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IGetSchemaRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IGetSchemaRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IGetSchemaRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + name: request.name || '', + }); + this.initialize(); + return this.innerApiCalls.getSchema(request, options, callback); + } + deleteSchema( + request: protos.google.pubsub.v1.IDeleteSchemaRequest, + options?: CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSchemaRequest | undefined, + {} | undefined + ] + >; + deleteSchema( + request: protos.google.pubsub.v1.IDeleteSchemaRequest, + options: CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + deleteSchema( + request: protos.google.pubsub.v1.IDeleteSchemaRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Deletes a schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. Name of the schema to delete. + * Format is `projects/{project}/schemas/{schema}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.deleteSchema(request); + */ + deleteSchema( + request: protos.google.pubsub.v1.IDeleteSchemaRequest, + optionsOrCallback?: + | CallOptions + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSchemaRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSchemaRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSchemaRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + name: request.name || '', + }); + this.initialize(); + return this.innerApiCalls.deleteSchema(request, options, callback); + } + validateSchema( + request: protos.google.pubsub.v1.IValidateSchemaRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.IValidateSchemaResponse, + protos.google.pubsub.v1.IValidateSchemaRequest | undefined, + {} | undefined + ] + >; + validateSchema( + request: protos.google.pubsub.v1.IValidateSchemaRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.IValidateSchemaResponse, + protos.google.pubsub.v1.IValidateSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + validateSchema( + request: protos.google.pubsub.v1.IValidateSchemaRequest, + callback: Callback< + protos.google.pubsub.v1.IValidateSchemaResponse, + protos.google.pubsub.v1.IValidateSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Validates a schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.parent + * Required. The name of the project in which to validate schemas. + * Format is `projects/{project-id}`. + * @param {google.pubsub.v1.Schema} request.schema + * Required. The schema object to validate. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [ValidateSchemaResponse]{@link google.pubsub.v1.ValidateSchemaResponse}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.validateSchema(request); + */ + validateSchema( + request: protos.google.pubsub.v1.IValidateSchemaRequest, + optionsOrCallback?: + | CallOptions + | Callback< + protos.google.pubsub.v1.IValidateSchemaResponse, + protos.google.pubsub.v1.IValidateSchemaRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.IValidateSchemaResponse, + protos.google.pubsub.v1.IValidateSchemaRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.IValidateSchemaResponse, + protos.google.pubsub.v1.IValidateSchemaRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + parent: request.parent || '', + }); + this.initialize(); + return this.innerApiCalls.validateSchema(request, options, callback); + } + validateMessage( + request: protos.google.pubsub.v1.IValidateMessageRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | undefined, + {} | undefined + ] + >; + validateMessage( + request: protos.google.pubsub.v1.IValidateMessageRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, + {} | null | undefined + > + ): void; + validateMessage( + request: protos.google.pubsub.v1.IValidateMessageRequest, + callback: Callback< + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, + {} | null | undefined + > + ): void; + /** + * Validates a message against a schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.parent + * Required. The name of the project in which to validate schemas. + * Format is `projects/{project-id}`. + * @param {string} request.name + * Name of the schema against which to validate. + * + * Format is `projects/{project}/schemas/{schema}`. + * @param {google.pubsub.v1.Schema} request.schema + * Ad-hoc schema against which to validate + * @param {Buffer} request.message + * Message to validate against the provided `schema_spec`. + * @param {google.pubsub.v1.Encoding} request.encoding + * The encoding expected for messages + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [ValidateMessageResponse]{@link google.pubsub.v1.ValidateMessageResponse}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.validateMessage(request); + */ + validateMessage( + request: protos.google.pubsub.v1.IValidateMessageRequest, + optionsOrCallback?: + | CallOptions + | Callback< + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + parent: request.parent || '', + }); + this.initialize(); + return this.innerApiCalls.validateMessage(request, options, callback); + } + + listSchemas( + request: protos.google.pubsub.v1.IListSchemasRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema[], + protos.google.pubsub.v1.IListSchemasRequest | null, + protos.google.pubsub.v1.IListSchemasResponse + ] + >; + listSchemas( + request: protos.google.pubsub.v1.IListSchemasRequest, + options: CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSchemasRequest, + protos.google.pubsub.v1.IListSchemasResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + ): void; + listSchemas( + request: protos.google.pubsub.v1.IListSchemasRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSchemasRequest, + protos.google.pubsub.v1.IListSchemasResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + ): void; + /** + * Lists schemas in a project. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.parent + * Required. The name of the project in which to list schemas. + * Format is `projects/{project-id}`. + * @param {google.pubsub.v1.SchemaView} request.view + * The set of Schema fields to return in the response. If not set, returns + * Schemas with `name` and `type`, but not `definition`. Set to `FULL` to + * retrieve all fields. + * @param {number} request.pageSize + * Maximum number of schemas to return. + * @param {string} request.pageToken + * The value returned by the last `ListSchemasResponse`; indicates that + * this is a continuation of a prior `ListSchemas` call, and that the + * system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Schema]{@link google.pubsub.v1.Schema}. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed and will merge results from all the pages into this array. + * Note that it can affect your quota. + * We recommend using `listSchemasAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + */ + listSchemas( + request: protos.google.pubsub.v1.IListSchemasRequest, + optionsOrCallback?: + | CallOptions + | PaginationCallback< + protos.google.pubsub.v1.IListSchemasRequest, + protos.google.pubsub.v1.IListSchemasResponse | null | undefined, + protos.google.pubsub.v1.ISchema + >, + callback?: PaginationCallback< + protos.google.pubsub.v1.IListSchemasRequest, + protos.google.pubsub.v1.IListSchemasResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + ): Promise< + [ + protos.google.pubsub.v1.ISchema[], + protos.google.pubsub.v1.IListSchemasRequest | null, + protos.google.pubsub.v1.IListSchemasResponse + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + parent: request.parent || '', + }); + this.initialize(); + return this.innerApiCalls.listSchemas(request, options, callback); + } + + /** + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * @param {Object} request + * The request object that will be sent. + * @param {string} request.parent + * Required. The name of the project in which to list schemas. + * Format is `projects/{project-id}`. + * @param {google.pubsub.v1.SchemaView} request.view + * The set of Schema fields to return in the response. If not set, returns + * Schemas with `name` and `type`, but not `definition`. Set to `FULL` to + * retrieve all fields. + * @param {number} request.pageSize + * Maximum number of schemas to return. + * @param {string} request.pageToken + * The value returned by the last `ListSchemasResponse`; indicates that + * this is a continuation of a prior `ListSchemas` call, and that the + * system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Stream} + * An object stream which emits an object representing [Schema]{@link google.pubsub.v1.Schema} on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listSchemasAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + */ + listSchemasStream( + request?: protos.google.pubsub.v1.IListSchemasRequest, + options?: CallOptions + ): Transform { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + parent: request.parent || '', + }); + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listSchemas.createStream( + this.innerApiCalls.listSchemas as gax.GaxCall, + request, + callSettings + ); + } + + /** + * Equivalent to `listSchemas`, but returns an iterable object. + * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. + * @param {Object} request + * The request object that will be sent. + * @param {string} request.parent + * Required. The name of the project in which to list schemas. + * Format is `projects/{project-id}`. + * @param {google.pubsub.v1.SchemaView} request.view + * The set of Schema fields to return in the response. If not set, returns + * Schemas with `name` and `type`, but not `definition`. Set to `FULL` to + * retrieve all fields. + * @param {number} request.pageSize + * Maximum number of schemas to return. + * @param {string} request.pageToken + * The value returned by the last `ListSchemasResponse`; indicates that + * this is a continuation of a prior `ListSchemas` call, and that the + * system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Object} + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * [Schema]{@link google.pubsub.v1.Schema}. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listSchemasAsync(request); + * for await (const response of iterable) { + * // process response + * } + */ + listSchemasAsync( + request?: protos.google.pubsub.v1.IListSchemasRequest, + options?: CallOptions + ): AsyncIterable { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers[ + 'x-goog-request-params' + ] = gax.routingHeader.fromParams({ + parent: request.parent || '', + }); + options = options || {}; + const callSettings = new gax.CallSettings(options); + this.initialize(); + return this.descriptors.page.listSchemas.asyncIterate( + this.innerApiCalls['listSchemas'] as GaxCall, + (request as unknown) as RequestType, + callSettings + ) as AsyncIterable; + } + /** + * Gets the access control policy for a resource. Returns an empty policy + * if the resource exists and does not have a policy set. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {Object} [request.options] + * OPTIONAL: A `GetPolicyOptions` object for specifying options to + * `GetIamPolicy`. This field is only used by Cloud IAM. + * + * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + getIamPolicy( + request: IamProtos.google.iam.v1.GetIamPolicyRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.getIamPolicy(request, options, callback); + } + + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. + * + * Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization + * checking. This operation may "fail open" without warning. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + */ + setIamPolicy( + request: IamProtos.google.iam.v1.SetIamPolicyRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.Policy, + IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.setIamPolicy(request, options, callback); + } + + /** + * Returns permissions that a caller has on the specified resource. If the + * resource does not exist, this will return an empty set of + * permissions, not a NOT_FOUND error. + * + * Note: This operation is designed to be used for building + * permission-aware UIs and command-line tools, not for authorization + * checking. This operation may "fail open" without warning. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.resource + * REQUIRED: The resource for which the policy detail is being requested. + * See the operation documentation for the appropriate value for this field. + * @param {string[]} request.permissions + * The set of permissions to check for the `resource`. Permissions with + * wildcards (such as '*' or 'storage.*') are not allowed. For more + * information see + * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * @param {Object} [options] + * Optional parameters. You can override the default settings for this call, e.g, timeout, + * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * @param {function(?Error, ?Object)} [callback] + * The function which will be called with the result of the API call. + * + * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The promise has a method named "cancel" which cancels the ongoing API call. + * + */ + testIamPermissions( + request: IamProtos.google.iam.v1.TestIamPermissionsRequest, + options?: + | gax.CallOptions + | Callback< + IamProtos.google.iam.v1.TestIamPermissionsResponse, + IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + IamProtos.google.iam.v1.TestIamPermissionsResponse, + IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, + {} | null | undefined + > + ): Promise { + return this.iamClient.testIamPermissions(request, options, callback); + } + + // -------------------- + // -- Path templates -- + // -------------------- + + /** + * Return a fully-qualified project resource name string. + * + * @param {string} project + * @returns {string} Resource name string. + */ + projectPath(project: string) { + return this.pathTemplates.projectPathTemplate.render({ + project: project, + }); + } + + /** + * Parse the project from Project resource. + * + * @param {string} projectName + * A fully-qualified path representing Project resource. + * @returns {string} A string representing the project. + */ + matchProjectFromProjectName(projectName: string) { + return this.pathTemplates.projectPathTemplate.match(projectName).project; + } + + /** + * Return a fully-qualified projectTopic resource name string. + * + * @param {string} project + * @param {string} topic + * @returns {string} Resource name string. + */ + projectTopicPath(project: string, topic: string) { + return this.pathTemplates.projectTopicPathTemplate.render({ + project: project, + topic: topic, + }); + } + + /** + * Parse the project from ProjectTopic resource. + * + * @param {string} projectTopicName + * A fully-qualified path representing project_topic resource. + * @returns {string} A string representing the project. + */ + matchProjectFromProjectTopicName(projectTopicName: string) { + return this.pathTemplates.projectTopicPathTemplate.match(projectTopicName) + .project; + } + + /** + * Parse the topic from ProjectTopic resource. + * + * @param {string} projectTopicName + * A fully-qualified path representing project_topic resource. + * @returns {string} A string representing the topic. + */ + matchTopicFromProjectTopicName(projectTopicName: string) { + return this.pathTemplates.projectTopicPathTemplate.match(projectTopicName) + .topic; + } + + /** + * Return a fully-qualified schema resource name string. + * + * @param {string} project + * @param {string} schema + * @returns {string} Resource name string. + */ + schemaPath(project: string, schema: string) { + return this.pathTemplates.schemaPathTemplate.render({ + project: project, + schema: schema, + }); + } + + /** + * Parse the project from Schema resource. + * + * @param {string} schemaName + * A fully-qualified path representing Schema resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSchemaName(schemaName: string) { + return this.pathTemplates.schemaPathTemplate.match(schemaName).project; + } + + /** + * Parse the schema from Schema resource. + * + * @param {string} schemaName + * A fully-qualified path representing Schema resource. + * @returns {string} A string representing the schema. + */ + matchSchemaFromSchemaName(schemaName: string) { + return this.pathTemplates.schemaPathTemplate.match(schemaName).schema; + } + + /** + * Return a fully-qualified snapshot resource name string. + * + * @param {string} project + * @param {string} snapshot + * @returns {string} Resource name string. + */ + snapshotPath(project: string, snapshot: string) { + return this.pathTemplates.snapshotPathTemplate.render({ + project: project, + snapshot: snapshot, + }); + } + + /** + * Parse the project from Snapshot resource. + * + * @param {string} snapshotName + * A fully-qualified path representing Snapshot resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSnapshotName(snapshotName: string) { + return this.pathTemplates.snapshotPathTemplate.match(snapshotName).project; + } + + /** + * Parse the snapshot from Snapshot resource. + * + * @param {string} snapshotName + * A fully-qualified path representing Snapshot resource. + * @returns {string} A string representing the snapshot. + */ + matchSnapshotFromSnapshotName(snapshotName: string) { + return this.pathTemplates.snapshotPathTemplate.match(snapshotName).snapshot; + } + + /** + * Return a fully-qualified subscription resource name string. + * + * @param {string} project + * @param {string} subscription + * @returns {string} Resource name string. + */ + subscriptionPath(project: string, subscription: string) { + return this.pathTemplates.subscriptionPathTemplate.render({ + project: project, + subscription: subscription, + }); + } + + /** + * Parse the project from Subscription resource. + * + * @param {string} subscriptionName + * A fully-qualified path representing Subscription resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSubscriptionName(subscriptionName: string) { + return this.pathTemplates.subscriptionPathTemplate.match(subscriptionName) + .project; + } + + /** + * Parse the subscription from Subscription resource. + * + * @param {string} subscriptionName + * A fully-qualified path representing Subscription resource. + * @returns {string} A string representing the subscription. + */ + matchSubscriptionFromSubscriptionName(subscriptionName: string) { + return this.pathTemplates.subscriptionPathTemplate.match(subscriptionName) + .subscription; + } + + /** + * Terminate the gRPC channel and close the client. + * + * The client will no longer be usable and all future behavior is undefined. + * @returns {Promise} A promise that resolves when the client is closed. + */ + close(): Promise { + this.initialize(); + if (!this._terminated) { + return this.schemaServiceStub!.then(stub => { + this._terminated = true; + stub.close(); + }); + } + return Promise.resolve(); + } +} diff --git a/handwritten/pubsub/src/v1/schema_service_client_config.json b/handwritten/pubsub/src/v1/schema_service_client_config.json new file mode 100644 index 00000000000..8928eccdf5b --- /dev/null +++ b/handwritten/pubsub/src/v1/schema_service_client_config.json @@ -0,0 +1,50 @@ +{ + "interfaces": { + "google.pubsub.v1.SchemaService": { + "retry_codes": { + "non_idempotent": [], + "idempotent": [ + "DEADLINE_EXCEEDED", + "UNAVAILABLE" + ] + }, + "retry_params": { + "default": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 1.3, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 60000, + "rpc_timeout_multiplier": 1, + "max_rpc_timeout_millis": 60000, + "total_timeout_millis": 600000 + } + }, + "methods": { + "CreateSchema": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "GetSchema": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "ListSchemas": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "DeleteSchema": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "ValidateSchema": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "ValidateMessage": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + } + } + } + } +} diff --git a/handwritten/pubsub/src/v1/schema_service_proto_list.json b/handwritten/pubsub/src/v1/schema_service_proto_list.json new file mode 100644 index 00000000000..91011aec150 --- /dev/null +++ b/handwritten/pubsub/src/v1/schema_service_proto_list.json @@ -0,0 +1,4 @@ +[ + "../../protos/google/pubsub/v1/pubsub.proto", + "../../protos/google/pubsub/v1/schema.proto" +] diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 790489db5fe..4b88455442a 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -16,6 +16,7 @@ // ** https://github.com/googleapis/gapic-generator-typescript ** // ** All changes to this file may be overwritten. ** +/* global window */ import * as gax from 'google-gax'; import { Callback, @@ -32,6 +33,11 @@ import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +/** + * Client JSON configuration object, loaded from + * `src/v1/subscriber_client_config.json`. + * This file defines retry strategy and timeouts for all API methods in this library. + */ import * as gapicConfig from './subscriber_client_config.json'; const version = require('../../../package.json').version; @@ -65,8 +71,10 @@ export class SubscriberClient { /** * Construct an instance of SubscriberClient. * - * @param {object} [options] - The configuration object. See the subsequent - * parameters for more details. + * @param {object} [options] - The configuration object. + * The options accepted by the constructor are described in detail + * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). + * The common options are: * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] * @param {string} [options.credentials.private_key] @@ -86,42 +94,35 @@ export class SubscriberClient { * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. + * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. + * Follows the structure of {@link gapicConfig}. + * @param {boolean} [options.fallback] - Use HTTP fallback mode. + * In fallback mode, a special browser-compatible transport implementation is used + * instead of gRPC transport. In browser context (if the `window` object is defined) + * the fallback mode is enabled automatically; set `options.fallback` to `false` + * if you need to override this behavior. */ - constructor(opts?: ClientOptions) { - // Ensure that options include the service address and port. + // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof SubscriberClient; const servicePath = - opts && opts.servicePath - ? opts.servicePath - : opts && opts.apiEndpoint - ? opts.apiEndpoint - : staticMembers.servicePath; - const port = opts && opts.port ? opts.port : staticMembers.port; + opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + const port = opts?.port || staticMembers.port; + const clientConfig = opts?.clientConfig ?? {}; + const fallback = + opts?.fallback ?? + (typeof window !== 'undefined' && typeof window?.fetch === 'function'); + opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); - if (!opts) { - opts = {servicePath, port}; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. + if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { + opts['scopes'] = staticMembers.scopes; } - opts.servicePath = opts.servicePath || servicePath; - opts.port = opts.port || port; - // users can override the config from client side, like retry codes name. - // The detailed structure of the clientConfig can be found here: https://github.com/googleapis/gax-nodejs/blob/master/src/gax.ts#L546 - // The way to override client config for Showcase API: - // - // const customConfig = {"interfaces": {"google.showcase.v1beta1.Echo": {"methods": {"Echo": {"retry_codes_name": "idempotent", "retry_params_name": "default"}}}}} - // const showcaseClient = new showcaseClient({ projectId, customConfig }); - opts.clientConfig = opts.clientConfig || {}; - - // If we're running in browser, it's OK to omit `fallback` since - // google-gax has `browser` field in its `package.json`. - // For Electron (which does not respect `browser` field), - // pass `{fallback: true}` to the SubscriberClient constructor. + // Choose either gRPC or proto-over-HTTP implementation of google-gax. this._gaxModule = opts.fallback ? gax.fallback : gax; - // Create a `gaxGrpc` object, with any grpc-specific options - // sent to the client. - opts.scopes = (this.constructor as typeof SubscriberClient).scopes; + // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. this._gaxGrpc = new this._gaxModule.GrpcClient(opts); // Save options to use in initialize() method. @@ -129,6 +130,11 @@ export class SubscriberClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + + // Set the default scopes in auth client if needed. + if (servicePath === staticMembers.servicePath) { + this.auth.defaultScopes = staticMembers.scopes; + } this.iamClient = new IamClient(this._gaxGrpc, opts); // Determine the client header string. @@ -172,6 +178,9 @@ export class SubscriberClient { projectTopicPathTemplate: new this._gaxModule.PathTemplate( 'projects/{project}/topics/{topic}' ), + schemaPathTemplate: new this._gaxModule.PathTemplate( + 'projects/{project}/schemas/{schema}' + ), snapshotPathTemplate: new this._gaxModule.PathTemplate( 'projects/{project}/snapshots/{snapshot}' ), @@ -299,6 +308,7 @@ export class SubscriberClient { /** * The DNS address for this API service. + * @returns {string} The DNS address for this service. */ static get servicePath() { return 'pubsub.googleapis.com'; @@ -307,6 +317,7 @@ export class SubscriberClient { /** * The DNS address for this API service - same as servicePath(), * exists for compatibility reasons. + * @returns {string} The DNS address for this service. */ static get apiEndpoint() { return 'pubsub.googleapis.com'; @@ -314,6 +325,7 @@ export class SubscriberClient { /** * The port for this API service. + * @returns {number} The default port for this service. */ static get port() { return 443; @@ -322,6 +334,7 @@ export class SubscriberClient { /** * The scopes needed to make gRPC calls for every method defined * in this service. + * @returns {string[]} List of default scopes. */ static get scopes() { return [ @@ -334,8 +347,7 @@ export class SubscriberClient { getProjectId(callback: Callback): void; /** * Return the project ID used by this class. - * @param {function(Error, string)} callback - the callback to - * be called with the current project Id. + * @returns {Promise} A promise that resolves to string containing the project ID. */ getProjectId( callback?: Callback @@ -352,7 +364,7 @@ export class SubscriberClient { // ------------------- createSubscription( request: protos.google.pubsub.v1.ISubscription, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -362,7 +374,7 @@ export class SubscriberClient { >; createSubscription( request: protos.google.pubsub.v1.ISubscription, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.ISubscription | null | undefined, @@ -489,12 +501,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.createSubscription(request); */ createSubscription( request: protos.google.pubsub.v1.ISubscription, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.ISubscription | null | undefined, @@ -513,12 +529,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -533,7 +549,7 @@ export class SubscriberClient { } getSubscription( request: protos.google.pubsub.v1.IGetSubscriptionRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -543,7 +559,7 @@ export class SubscriberClient { >; getSubscription( request: protos.google.pubsub.v1.IGetSubscriptionRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, @@ -570,12 +586,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.getSubscription(request); */ getSubscription( request: protos.google.pubsub.v1.IGetSubscriptionRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, @@ -594,12 +614,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -614,7 +634,7 @@ export class SubscriberClient { } updateSubscription( request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -624,7 +644,7 @@ export class SubscriberClient { >; updateSubscription( request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, @@ -654,12 +674,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.updateSubscription(request); */ updateSubscription( request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, @@ -678,12 +702,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -698,7 +722,7 @@ export class SubscriberClient { } deleteSubscription( request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.protobuf.IEmpty, @@ -708,7 +732,7 @@ export class SubscriberClient { >; deleteSubscription( request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, @@ -739,12 +763,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.deleteSubscription(request); */ deleteSubscription( request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, @@ -763,12 +791,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -783,7 +811,7 @@ export class SubscriberClient { } modifyAckDeadline( request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.protobuf.IEmpty, @@ -793,7 +821,7 @@ export class SubscriberClient { >; modifyAckDeadline( request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, @@ -835,12 +863,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.modifyAckDeadline(request); */ modifyAckDeadline( request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, @@ -859,12 +891,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -879,7 +911,7 @@ export class SubscriberClient { } acknowledge( request: protos.google.pubsub.v1.IAcknowledgeRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.protobuf.IEmpty, @@ -889,7 +921,7 @@ export class SubscriberClient { >; acknowledge( request: protos.google.pubsub.v1.IAcknowledgeRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, @@ -926,12 +958,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.acknowledge(request); */ acknowledge( request: protos.google.pubsub.v1.IAcknowledgeRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, @@ -950,12 +986,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -970,7 +1006,7 @@ export class SubscriberClient { } pull( request: protos.google.pubsub.v1.IPullRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.IPullResponse, @@ -980,7 +1016,7 @@ export class SubscriberClient { >; pull( request: protos.google.pubsub.v1.IPullRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.IPullResponse, protos.google.pubsub.v1.IPullRequest | null | undefined, @@ -1021,12 +1057,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.pull(request); */ pull( request: protos.google.pubsub.v1.IPullRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.IPullResponse, protos.google.pubsub.v1.IPullRequest | null | undefined, @@ -1045,12 +1085,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1065,7 +1105,7 @@ export class SubscriberClient { } modifyPushConfig( request: protos.google.pubsub.v1.IModifyPushConfigRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.protobuf.IEmpty, @@ -1075,7 +1115,7 @@ export class SubscriberClient { >; modifyPushConfig( request: protos.google.pubsub.v1.IModifyPushConfigRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, @@ -1114,12 +1154,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.modifyPushConfig(request); */ modifyPushConfig( request: protos.google.pubsub.v1.IModifyPushConfigRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, @@ -1138,12 +1182,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1158,7 +1202,7 @@ export class SubscriberClient { } getSnapshot( request: protos.google.pubsub.v1.IGetSnapshotRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1168,7 +1212,7 @@ export class SubscriberClient { >; getSnapshot( request: protos.google.pubsub.v1.IGetSnapshotRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, @@ -1199,12 +1243,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.getSnapshot(request); */ getSnapshot( request: protos.google.pubsub.v1.IGetSnapshotRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, @@ -1223,12 +1271,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1243,7 +1291,7 @@ export class SubscriberClient { } createSnapshot( request: protos.google.pubsub.v1.ICreateSnapshotRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1253,7 +1301,7 @@ export class SubscriberClient { >; createSnapshot( request: protos.google.pubsub.v1.ICreateSnapshotRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, @@ -1312,12 +1360,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.createSnapshot(request); */ createSnapshot( request: protos.google.pubsub.v1.ICreateSnapshotRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, @@ -1336,12 +1388,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1356,7 +1408,7 @@ export class SubscriberClient { } updateSnapshot( request: protos.google.pubsub.v1.IUpdateSnapshotRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1366,7 +1418,7 @@ export class SubscriberClient { >; updateSnapshot( request: protos.google.pubsub.v1.IUpdateSnapshotRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, @@ -1400,12 +1452,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.updateSnapshot(request); */ updateSnapshot( request: protos.google.pubsub.v1.IUpdateSnapshotRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, @@ -1424,12 +1480,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1444,7 +1500,7 @@ export class SubscriberClient { } deleteSnapshot( request: protos.google.pubsub.v1.IDeleteSnapshotRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.protobuf.IEmpty, @@ -1454,7 +1510,7 @@ export class SubscriberClient { >; deleteSnapshot( request: protos.google.pubsub.v1.IDeleteSnapshotRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, @@ -1489,12 +1545,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.deleteSnapshot(request); */ deleteSnapshot( request: protos.google.pubsub.v1.IDeleteSnapshotRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, @@ -1513,12 +1573,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1533,7 +1593,7 @@ export class SubscriberClient { } seek( request: protos.google.pubsub.v1.ISeekRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISeekResponse, @@ -1543,7 +1603,7 @@ export class SubscriberClient { >; seek( request: protos.google.pubsub.v1.ISeekRequest, - options: gax.CallOptions, + options: CallOptions, callback: Callback< protos.google.pubsub.v1.ISeekResponse, protos.google.pubsub.v1.ISeekRequest | null | undefined, @@ -1560,8 +1620,8 @@ export class SubscriberClient { ): void; /** * Seeks an existing subscription to a point in time or to a given snapshot, - * whichever is provided in the request. Snapshots are used in [Seek]( - * https://cloud.google.com/pubsub/docs/replay-overview) operations, which + * whichever is provided in the request. Snapshots are used in [Seek] + * (https://cloud.google.com/pubsub/docs/replay-overview) operations, which * allow you to manage message acknowledgments in bulk. That is, you can set * the acknowledgment state of messages in an existing subscription to the * state captured by a snapshot. Note that both the subscription and the @@ -1591,12 +1651,16 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. - * The promise has a method named "cancel" which cancels the ongoing API call. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * const [response] = await client.seek(request); */ seek( request: protos.google.pubsub.v1.ISeekRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | Callback< protos.google.pubsub.v1.ISeekResponse, protos.google.pubsub.v1.ISeekRequest | null | undefined, @@ -1615,12 +1679,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1649,15 +1713,24 @@ export class SubscriberClient { * An object stream which is both readable and writable. It accepts objects * representing [StreamingPullRequest]{@link google.pubsub.v1.StreamingPullRequest} for write() method, and * will emit objects representing [StreamingPullResponse]{@link google.pubsub.v1.StreamingPullResponse} on 'data' event asynchronously. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming) + * for more details and examples. + * @example + * const stream = client.streamingPull(); + * stream.on('data', (response) => { ... }); + * stream.on('end', () => { ... }); + * stream.write(request); + * stream.end(); */ - streamingPull(options?: gax.CallOptions): gax.CancellableStream { + streamingPull(options?: CallOptions): gax.CancellableStream { this.initialize(); return this.innerApiCalls.streamingPull(options); } listSubscriptions( request: protos.google.pubsub.v1.IListSubscriptionsRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISubscription[], @@ -1667,7 +1740,7 @@ export class SubscriberClient { >; listSubscriptions( request: protos.google.pubsub.v1.IListSubscriptionsRequest, - options: gax.CallOptions, + options: CallOptions, callback: PaginationCallback< protos.google.pubsub.v1.IListSubscriptionsRequest, protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, @@ -1700,24 +1773,19 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Subscription]{@link google.pubsub.v1.Subscription}. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Subscription]{@link google.pubsub.v1.Subscription} that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListSubscriptionsRequest]{@link google.pubsub.v1.ListSubscriptionsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListSubscriptionsResponse]{@link google.pubsub.v1.ListSubscriptionsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listSubscriptions( request: protos.google.pubsub.v1.IListSubscriptionsRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | PaginationCallback< protos.google.pubsub.v1.IListSubscriptionsRequest, protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, @@ -1736,12 +1804,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1756,18 +1824,7 @@ export class SubscriberClient { } /** - * Equivalent to {@link listSubscriptions}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listSubscriptions} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1783,10 +1840,17 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Subscription]{@link google.pubsub.v1.Subscription} on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listSubscriptionsStream( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, - options?: gax.CallOptions + options?: CallOptions ): Transform { request = request || {}; options = options || {}; @@ -1807,10 +1871,9 @@ export class SubscriberClient { } /** - * Equivalent to {@link listSubscriptions}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listSubscriptions`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1825,11 +1888,22 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * [Subscription]{@link google.pubsub.v1.Subscription}. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listSubscriptionsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listSubscriptionsAsync( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, - options?: gax.CallOptions + options?: CallOptions ): AsyncIterable { request = request || {}; options = options || {}; @@ -1851,7 +1925,7 @@ export class SubscriberClient { } listSnapshots( request: protos.google.pubsub.v1.IListSnapshotsRequest, - options?: gax.CallOptions + options?: CallOptions ): Promise< [ protos.google.pubsub.v1.ISnapshot[], @@ -1861,7 +1935,7 @@ export class SubscriberClient { >; listSnapshots( request: protos.google.pubsub.v1.IListSnapshotsRequest, - options: gax.CallOptions, + options: CallOptions, callback: PaginationCallback< protos.google.pubsub.v1.IListSnapshotsRequest, protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, @@ -1898,24 +1972,19 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. - * The client library support auto-pagination by default: it will call the API as many + * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. - * - * When autoPaginate: false is specified through options, the array has three elements. - * The first element is Array of [Snapshot]{@link google.pubsub.v1.Snapshot} that corresponds to - * the one page received from the API server. - * If the second element is not null it contains the request object of type [ListSnapshotsRequest]{@link google.pubsub.v1.ListSnapshotsRequest} - * that can be used to obtain the next page of the results. - * If it is null, the next page does not exist. - * The third element contains the raw response received from the API server. Its type is - * [ListSnapshotsResponse]{@link google.pubsub.v1.ListSnapshotsResponse}. - * - * The promise has a method named "cancel" which cancels the ongoing API call. + * Note that it can affect your quota. + * We recommend using `listSnapshotsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listSnapshots( request: protos.google.pubsub.v1.IListSnapshotsRequest, optionsOrCallback?: - | gax.CallOptions + | CallOptions | PaginationCallback< protos.google.pubsub.v1.IListSnapshotsRequest, protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, @@ -1934,12 +2003,12 @@ export class SubscriberClient { ] > | void { request = request || {}; - let options: gax.CallOptions; + let options: CallOptions; if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; } else { - options = optionsOrCallback as gax.CallOptions; + options = optionsOrCallback as CallOptions; } options = options || {}; options.otherArgs = options.otherArgs || {}; @@ -1954,18 +2023,7 @@ export class SubscriberClient { } /** - * Equivalent to {@link listSnapshots}, but returns a NodeJS Stream object. - * - * This fetches the paged responses for {@link listSnapshots} continuously - * and invokes the callback registered for 'data' event for each element in the - * responses. - * - * The returned object has 'end' method when no more elements are required. - * - * autoPaginate option will be ignored. - * - * @see {@link https://nodejs.org/api/stream.html} - * + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1981,10 +2039,17 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which emits an object representing [Snapshot]{@link google.pubsub.v1.Snapshot} on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listSnapshotsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. */ listSnapshotsStream( request?: protos.google.pubsub.v1.IListSnapshotsRequest, - options?: gax.CallOptions + options?: CallOptions ): Transform { request = request || {}; options = options || {}; @@ -2005,10 +2070,9 @@ export class SubscriberClient { } /** - * Equivalent to {@link listSnapshots}, but returns an iterable object. - * - * for-await-of syntax is used with the iterable to recursively get response element on-demand. + * Equivalent to `listSnapshots`, but returns an iterable object. * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -2023,11 +2087,22 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that conforms to @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols. + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * [Snapshot]{@link google.pubsub.v1.Snapshot}. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + * @example + * const iterable = client.listSnapshotsAsync(request); + * for await (const response of iterable) { + * // process response + * } */ listSnapshotsAsync( request?: protos.google.pubsub.v1.IListSnapshotsRequest, - options?: gax.CallOptions + options?: CallOptions ): AsyncIterable { request = request || {}; options = options || {}; @@ -2252,6 +2327,42 @@ export class SubscriberClient { .topic; } + /** + * Return a fully-qualified schema resource name string. + * + * @param {string} project + * @param {string} schema + * @returns {string} Resource name string. + */ + schemaPath(project: string, schema: string) { + return this.pathTemplates.schemaPathTemplate.render({ + project: project, + schema: schema, + }); + } + + /** + * Parse the project from Schema resource. + * + * @param {string} schemaName + * A fully-qualified path representing Schema resource. + * @returns {string} A string representing the project. + */ + matchProjectFromSchemaName(schemaName: string) { + return this.pathTemplates.schemaPathTemplate.match(schemaName).project; + } + + /** + * Parse the schema from Schema resource. + * + * @param {string} schemaName + * A fully-qualified path representing Schema resource. + * @returns {string} A string representing the schema. + */ + matchSchemaFromSchemaName(schemaName: string) { + return this.pathTemplates.schemaPathTemplate.match(schemaName).schema; + } + /** * Return a fully-qualified snapshot resource name string. * @@ -2327,9 +2438,10 @@ export class SubscriberClient { } /** - * Terminate the GRPC channel and close the client. + * Terminate the gRPC channel and close the client. * * The client will no longer be usable and all future behavior is undefined. + * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { this.initialize(); diff --git a/handwritten/pubsub/src/v1/subscriber_proto_list.json b/handwritten/pubsub/src/v1/subscriber_proto_list.json index 23484bf6695..91011aec150 100644 --- a/handwritten/pubsub/src/v1/subscriber_proto_list.json +++ b/handwritten/pubsub/src/v1/subscriber_proto_list.json @@ -1,3 +1,4 @@ [ - "../../protos/google/pubsub/v1/pubsub.proto" + "../../protos/google/pubsub/v1/pubsub.proto", + "../../protos/google/pubsub/v1/schema.proto" ] diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 61e7c5b3021..7b1f90e8ff5 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "4004f5e26358d3bcce180a2f9c15e890971fa2f3", - "internalRef": "337386065" + "sha": "41d8fbfec9d4bc4a8859f78185713950913b4bf3", + "internalRef": "348038736" } }, { diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 868d224b0d7..29e25905dd4 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -2098,6 +2098,55 @@ describe('v1.PublisherClient', () => { }); }); + describe('schema', () => { + const fakePath = '/rendered/path/schema'; + const expectedParameters = { + project: 'projectValue', + schema: 'schemaValue', + }; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.schemaPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.schemaPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('schemaPath', () => { + const result = client.schemaPath('projectValue', 'schemaValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.schemaPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSchemaName', () => { + const result = client.matchProjectFromSchemaName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.schemaPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSchemaFromSchemaName', () => { + const result = client.matchSchemaFromSchemaName(fakePath); + assert.strictEqual(result, 'schemaValue'); + assert( + (client.pathTemplates.schemaPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + describe('snapshot', () => { const fakePath = '/rendered/path/snapshot'; const expectedParameters = { diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts new file mode 100644 index 00000000000..9fb79f0711c --- /dev/null +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -0,0 +1,1598 @@ +// Copyright 2021 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// ** This file is automatically generated by gapic-generator-typescript. ** +// ** https://github.com/googleapis/gapic-generator-typescript ** +// ** All changes to this file may be overwritten. ** + +import * as protos from '../protos/protos'; +import * as assert from 'assert'; +import * as sinon from 'sinon'; +import {SinonStub} from 'sinon'; +import {describe, it} from 'mocha'; +import * as schemaserviceModule from '../src'; + +import {PassThrough} from 'stream'; + +import {protobuf, IamProtos} from 'google-gax'; + +function generateSampleMessage(instance: T) { + const filledObject = (instance.constructor as typeof protobuf.Message).toObject( + instance as protobuf.Message, + {defaults: true} + ); + return (instance.constructor as typeof protobuf.Message).fromObject( + filledObject + ) as T; +} + +function stubSimpleCall(response?: ResponseType, error?: Error) { + return error + ? sinon.stub().rejects(error) + : sinon.stub().resolves([response]); +} + +function stubSimpleCallWithCallback( + response?: ResponseType, + error?: Error +) { + return error + ? sinon.stub().callsArgWith(2, error) + : sinon.stub().callsArgWith(2, null, response); +} + +function stubPageStreamingCall( + responses?: ResponseType[], + error?: Error +) { + const pagingStub = sinon.stub(); + if (responses) { + for (let i = 0; i < responses.length; ++i) { + pagingStub.onCall(i).callsArgWith(2, null, responses[i]); + } + } + const transformStub = error + ? sinon.stub().callsArgWith(2, error) + : pagingStub; + const mockStream = new PassThrough({ + objectMode: true, + transform: transformStub, + }); + // trigger as many responses as needed + if (responses) { + for (let i = 0; i < responses.length; ++i) { + setImmediate(() => { + mockStream.write({}); + }); + } + setImmediate(() => { + mockStream.end(); + }); + } else { + setImmediate(() => { + mockStream.write({}); + }); + setImmediate(() => { + mockStream.end(); + }); + } + return sinon.stub().returns(mockStream); +} + +function stubAsyncIterationCall( + responses?: ResponseType[], + error?: Error +) { + let counter = 0; + const asyncIterable = { + [Symbol.asyncIterator]() { + return { + async next() { + if (error) { + return Promise.reject(error); + } + if (counter >= responses!.length) { + return Promise.resolve({done: true, value: undefined}); + } + return Promise.resolve({done: false, value: responses![counter++]}); + }, + }; + }, + }; + return sinon.stub().returns(asyncIterable); +} + +describe('v1.SchemaServiceClient', () => { + it('has servicePath', () => { + const servicePath = schemaserviceModule.v1.SchemaServiceClient.servicePath; + assert(servicePath); + }); + + it('has apiEndpoint', () => { + const apiEndpoint = schemaserviceModule.v1.SchemaServiceClient.apiEndpoint; + assert(apiEndpoint); + }); + + it('has port', () => { + const port = schemaserviceModule.v1.SchemaServiceClient.port; + assert(port); + assert(typeof port === 'number'); + }); + + it('should create a client with no option', () => { + const client = new schemaserviceModule.v1.SchemaServiceClient(); + assert(client); + }); + + it('should create a client with gRPC fallback', () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + fallback: true, + }); + assert(client); + }); + + it('has initialize method and supports deferred initialization', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.schemaServiceStub, undefined); + await client.initialize(); + assert(client.schemaServiceStub); + }); + + it('has close method', () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.close(); + }); + + it('has getProjectId method', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); + const result = await client.getProjectId(); + assert.strictEqual(result, fakeProjectId); + assert((client.auth.getProjectId as SinonStub).calledWithExactly()); + }); + + it('has getProjectId method with callback', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon + .stub() + .callsArgWith(0, null, fakeProjectId); + const promise = new Promise((resolve, reject) => { + client.getProjectId((err?: Error | null, projectId?: string | null) => { + if (err) { + reject(err); + } else { + resolve(projectId); + } + }); + }); + const result = await promise; + assert.strictEqual(result, fakeProjectId); + }); + + describe('createSchema', () => { + it('invokes createSchema without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CreateSchemaRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.createSchema = stubSimpleCall(expectedResponse); + const [response] = await client.createSchema(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.createSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes createSchema without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CreateSchemaRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.createSchema = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.createSchema( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISchema | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.createSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes createSchema with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CreateSchemaRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.createSchema = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.createSchema(request), expectedError); + assert( + (client.innerApiCalls.createSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('getSchema', () => { + it('invokes getSchema without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSchemaRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.getSchema = stubSimpleCall(expectedResponse); + const [response] = await client.getSchema(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.getSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes getSchema without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSchemaRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.getSchema = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.getSchema( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISchema | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.getSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes getSchema with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSchemaRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.getSchema = stubSimpleCall(undefined, expectedError); + await assert.rejects(client.getSchema(request), expectedError); + assert( + (client.innerApiCalls.getSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('deleteSchema', () => { + it('invokes deleteSchema without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSchemaRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.deleteSchema = stubSimpleCall(expectedResponse); + const [response] = await client.deleteSchema(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.deleteSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes deleteSchema without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSchemaRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.protobuf.Empty() + ); + client.innerApiCalls.deleteSchema = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.deleteSchema( + request, + ( + err?: Error | null, + result?: protos.google.protobuf.IEmpty | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.deleteSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes deleteSchema with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSchemaRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.deleteSchema = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.deleteSchema(request), expectedError); + assert( + (client.innerApiCalls.deleteSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('validateSchema', () => { + it('invokes validateSchema without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ValidateSchemaRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.ValidateSchemaResponse() + ); + client.innerApiCalls.validateSchema = stubSimpleCall(expectedResponse); + const [response] = await client.validateSchema(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.validateSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes validateSchema without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ValidateSchemaRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.ValidateSchemaResponse() + ); + client.innerApiCalls.validateSchema = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.validateSchema( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.IValidateSchemaResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.validateSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes validateSchema with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ValidateSchemaRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.validateSchema = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.validateSchema(request), expectedError); + assert( + (client.innerApiCalls.validateSchema as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('validateMessage', () => { + it('invokes validateMessage without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ValidateMessageRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.ValidateMessageResponse() + ); + client.innerApiCalls.validateMessage = stubSimpleCall(expectedResponse); + const [response] = await client.validateMessage(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.validateMessage as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes validateMessage without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ValidateMessageRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.ValidateMessageResponse() + ); + client.innerApiCalls.validateMessage = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.validateMessage( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.IValidateMessageResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.validateMessage as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes validateMessage with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ValidateMessageRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.validateMessage = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.validateMessage(request), expectedError); + assert( + (client.innerApiCalls.validateMessage as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('listSchemas', () => { + it('invokes listSchemas without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemasRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + ]; + client.innerApiCalls.listSchemas = stubSimpleCall(expectedResponse); + const [response] = await client.listSchemas(request); + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listSchemas as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listSchemas without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemasRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + ]; + client.innerApiCalls.listSchemas = stubSimpleCallWithCallback( + expectedResponse + ); + const promise = new Promise((resolve, reject) => { + client.listSchemas( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISchema[] | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert( + (client.innerApiCalls.listSchemas as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions /*, callback defined above */) + ); + }); + + it('invokes listSchemas with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemasRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.innerApiCalls.listSchemas = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.listSchemas(request), expectedError); + assert( + (client.innerApiCalls.listSchemas as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + + it('invokes listSchemasStream without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemasRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + ]; + client.descriptors.page.listSchemas.createStream = stubPageStreamingCall( + expectedResponse + ); + const stream = client.listSchemasStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Schema[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Schema) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + const responses = await promise; + assert.deepStrictEqual(responses, expectedResponse); + assert( + (client.descriptors.page.listSchemas.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listSchemas, request) + ); + assert.strictEqual( + (client.descriptors.page.listSchemas.createStream as SinonStub).getCall( + 0 + ).args[2].otherArgs.headers['x-goog-request-params'], + expectedHeaderRequestParams + ); + }); + + it('invokes listSchemasStream with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemasRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedError = new Error('expected'); + client.descriptors.page.listSchemas.createStream = stubPageStreamingCall( + undefined, + expectedError + ); + const stream = client.listSchemasStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Schema[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Schema) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + await assert.rejects(promise, expectedError); + assert( + (client.descriptors.page.listSchemas.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listSchemas, request) + ); + assert.strictEqual( + (client.descriptors.page.listSchemas.createStream as SinonStub).getCall( + 0 + ).args[2].otherArgs.headers['x-goog-request-params'], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listSchemas without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemasRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + ]; + client.descriptors.page.listSchemas.asyncIterate = stubAsyncIterationCall( + expectedResponse + ); + const responses: protos.google.pubsub.v1.ISchema[] = []; + const iterable = client.listSchemasAsync(request); + for await (const resource of iterable) { + responses.push(resource!); + } + assert.deepStrictEqual(responses, expectedResponse); + assert.deepStrictEqual( + (client.descriptors.page.listSchemas.asyncIterate as SinonStub).getCall( + 0 + ).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listSchemas.asyncIterate as SinonStub).getCall( + 0 + ).args[2].otherArgs.headers['x-goog-request-params'], + expectedHeaderRequestParams + ); + }); + + it('uses async iteration with listSchemas with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemasRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedError = new Error('expected'); + client.descriptors.page.listSchemas.asyncIterate = stubAsyncIterationCall( + undefined, + expectedError + ); + const iterable = client.listSchemasAsync(request); + await assert.rejects(async () => { + const responses: protos.google.pubsub.v1.ISchema[] = []; + for await (const resource of iterable) { + responses.push(resource!); + } + }); + assert.deepStrictEqual( + (client.descriptors.page.listSchemas.asyncIterate as SinonStub).getCall( + 0 + ).args[1], + request + ); + assert.strictEqual( + (client.descriptors.page.listSchemas.asyncIterate as SinonStub).getCall( + 0 + ).args[2].otherArgs.headers['x-goog-request-params'], + expectedHeaderRequestParams + ); + }); + }); + describe('getIamPolicy', () => { + it('invokes getIamPolicy without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.getIamPolicy = stubSimpleCall(expectedResponse); + const response = await client.getIamPolicy(request, expectedOptions); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.getIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes getIamPolicy without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.getIamPolicy = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.getIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.getIamPolicy as SinonStub).getCall(0)); + }); + it('invokes getIamPolicy with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.GetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.getIamPolicy = stubSimpleCall(undefined, expectedError); + await assert.rejects( + client.getIamPolicy(request, expectedOptions), + expectedError + ); + assert( + (client.iamClient.getIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + describe('setIamPolicy', () => { + it('invokes setIamPolicy without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.setIamPolicy = stubSimpleCall(expectedResponse); + const response = await client.setIamPolicy(request, expectedOptions); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.setIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes setIamPolicy without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.Policy() + ); + client.iamClient.setIamPolicy = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.setIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.setIamPolicy as SinonStub).getCall(0)); + }); + it('invokes setIamPolicy with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.SetIamPolicyRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.setIamPolicy = stubSimpleCall(undefined, expectedError); + await assert.rejects( + client.setIamPolicy(request, expectedOptions), + expectedError + ); + assert( + (client.iamClient.setIamPolicy as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + describe('testIamPermissions', () => { + it('invokes testIamPermissions without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsResponse() + ); + client.iamClient.testIamPermissions = stubSimpleCall(expectedResponse); + const response = await client.testIamPermissions( + request, + expectedOptions + ); + assert.deepStrictEqual(response, [expectedResponse]); + assert( + (client.iamClient.testIamPermissions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + it('invokes testIamPermissions without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedResponse = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsResponse() + ); + client.iamClient.testIamPermissions = sinon + .stub() + .callsArgWith(2, null, expectedResponse); + const promise = new Promise((resolve, reject) => { + client.testIamPermissions( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + assert((client.iamClient.testIamPermissions as SinonStub).getCall(0)); + }); + it('invokes testIamPermissions with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new IamProtos.google.iam.v1.TestIamPermissionsRequest() + ); + request.resource = ''; + const expectedHeaderRequestParams = 'resource='; + const expectedOptions = { + otherArgs: { + headers: { + 'x-goog-request-params': expectedHeaderRequestParams, + }, + }, + }; + const expectedError = new Error('expected'); + client.iamClient.testIamPermissions = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects( + client.testIamPermissions(request, expectedOptions), + expectedError + ); + assert( + (client.iamClient.testIamPermissions as SinonStub) + .getCall(0) + .calledWith(request, expectedOptions, undefined) + ); + }); + }); + + describe('Path templates', () => { + describe('project', () => { + const fakePath = '/rendered/path/project'; + const expectedParameters = { + project: 'projectValue', + }; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.projectPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.projectPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('projectPath', () => { + const result = client.projectPath('projectValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.projectPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromProjectName', () => { + const result = client.matchProjectFromProjectName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.projectPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('projectTopic', () => { + const fakePath = '/rendered/path/projectTopic'; + const expectedParameters = { + project: 'projectValue', + topic: 'topicValue', + }; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.projectTopicPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.projectTopicPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('projectTopicPath', () => { + const result = client.projectTopicPath('projectValue', 'topicValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.projectTopicPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromProjectTopicName', () => { + const result = client.matchProjectFromProjectTopicName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchTopicFromProjectTopicName', () => { + const result = client.matchTopicFromProjectTopicName(fakePath); + assert.strictEqual(result, 'topicValue'); + assert( + (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('schema', () => { + const fakePath = '/rendered/path/schema'; + const expectedParameters = { + project: 'projectValue', + schema: 'schemaValue', + }; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.schemaPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.schemaPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('schemaPath', () => { + const result = client.schemaPath('projectValue', 'schemaValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.schemaPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSchemaName', () => { + const result = client.matchProjectFromSchemaName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.schemaPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSchemaFromSchemaName', () => { + const result = client.matchSchemaFromSchemaName(fakePath); + assert.strictEqual(result, 'schemaValue'); + assert( + (client.pathTemplates.schemaPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('snapshot', () => { + const fakePath = '/rendered/path/snapshot'; + const expectedParameters = { + project: 'projectValue', + snapshot: 'snapshotValue', + }; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.snapshotPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.snapshotPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('snapshotPath', () => { + const result = client.snapshotPath('projectValue', 'snapshotValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.snapshotPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSnapshotName', () => { + const result = client.matchProjectFromSnapshotName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.snapshotPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSnapshotFromSnapshotName', () => { + const result = client.matchSnapshotFromSnapshotName(fakePath); + assert.strictEqual(result, 'snapshotValue'); + assert( + (client.pathTemplates.snapshotPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + + describe('subscription', () => { + const fakePath = '/rendered/path/subscription'; + const expectedParameters = { + project: 'projectValue', + subscription: 'subscriptionValue', + }; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.subscriptionPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.subscriptionPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('subscriptionPath', () => { + const result = client.subscriptionPath( + 'projectValue', + 'subscriptionValue' + ); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.subscriptionPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSubscriptionName', () => { + const result = client.matchProjectFromSubscriptionName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSubscriptionFromSubscriptionName', () => { + const result = client.matchSubscriptionFromSubscriptionName(fakePath); + assert.strictEqual(result, 'subscriptionValue'); + assert( + (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + }); +}); diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 86d84260d42..1ead2c3c352 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -2734,6 +2734,55 @@ describe('v1.SubscriberClient', () => { }); }); + describe('schema', () => { + const fakePath = '/rendered/path/schema'; + const expectedParameters = { + project: 'projectValue', + schema: 'schemaValue', + }; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + client.pathTemplates.schemaPathTemplate.render = sinon + .stub() + .returns(fakePath); + client.pathTemplates.schemaPathTemplate.match = sinon + .stub() + .returns(expectedParameters); + + it('schemaPath', () => { + const result = client.schemaPath('projectValue', 'schemaValue'); + assert.strictEqual(result, fakePath); + assert( + (client.pathTemplates.schemaPathTemplate.render as SinonStub) + .getCall(-1) + .calledWith(expectedParameters) + ); + }); + + it('matchProjectFromSchemaName', () => { + const result = client.matchProjectFromSchemaName(fakePath); + assert.strictEqual(result, 'projectValue'); + assert( + (client.pathTemplates.schemaPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + + it('matchSchemaFromSchemaName', () => { + const result = client.matchSchemaFromSchemaName(fakePath); + assert.strictEqual(result, 'schemaValue'); + assert( + (client.pathTemplates.schemaPathTemplate.match as SinonStub) + .getCall(-1) + .calledWith(fakePath) + ); + }); + }); + describe('snapshot', () => { const fakePath = '/rendered/path/snapshot'; const expectedParameters = { From d43bfff87afb4317c54d0a6440dd340a1162cc86 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 08:23:22 -0800 Subject: [PATCH 0710/1115] chore: release 2.8.0 (#1182) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index a5a5b6e0af9..625d805907c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.8.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.7.0...v2.8.0) (2021-01-08) + + +### Features + +* schema proto support ([#1176](https://www.github.com/googleapis/nodejs-pubsub/issues/1176)) ([ac29561](https://www.github.com/googleapis/nodejs-pubsub/commit/ac2956123b361892290ece66ab9a9dfaa7f61d2d)) + + +### Bug Fixes + +* **deps:** update opentelemetry monorepo to ^0.12.0 ([#1162](https://www.github.com/googleapis/nodejs-pubsub/issues/1162)) ([f459a91](https://www.github.com/googleapis/nodejs-pubsub/commit/f459a91949fca1fbd573ecc1442bc3e5f54e8ee8)) + ## [2.7.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.6.0...v2.7.0) (2020-11-30) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 14e347b38e8..f04499111d9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.7.0", + "version": "2.8.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 3d57c51ace5b94a7bdd433b925ee700c7b7189b1 Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Wed, 20 Jan 2021 00:54:56 +0000 Subject: [PATCH 0711/1115] fix: bind promisify calls for flush() so they have a 'this' value (#1184) * tests: failing tests for #1178 * fix: bind promisify calls for flush() so they have a 'this' value --- handwritten/pubsub/src/publisher/index.ts | 4 +- handwritten/pubsub/test/publisher/index.ts | 48 +++++++++++++++------- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 27ee9bf3b29..483990f96b1 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -102,9 +102,9 @@ export class Publisher { flush(callback?: EmptyCallback): Promise | void { const definedCallback = callback ? callback : () => {}; - const publishes = [promisify(this.queue.publish)()]; + const publishes = [promisify(this.queue.publish).bind(this.queue)()]; Array.from(this.orderedQueues.values()).forEach(q => - publishes.push(promisify(q.publish)()) + publishes.push(promisify(q.publish).bind(q)()) ); const allPublishes = Promise.all(publishes); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 8af07b479d8..ad59e3604f0 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -58,8 +58,17 @@ class FakeQueue extends EventEmitter { } // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: p.PubsubMessage, callback: p.PublishCallback): void {} - // eslint-disable-next-line @typescript-eslint/no-unused-vars - publish(callback: (err: Error | null) => void) {} + publish(callback: (err: Error | null) => void) { + this._publish([], [], callback); + } + _publish( + // eslint-disable-next-line @typescript-eslint/no-unused-vars + messages: p.PubsubMessage[], + // eslint-disable-next-line @typescript-eslint/no-unused-vars + callbacks: p.PublishCallback[], + // eslint-disable-next-line @typescript-eslint/no-unused-vars + callback?: q.PublishDone + ) {} } class FakeOrderedQueue extends FakeQueue { @@ -71,7 +80,17 @@ class FakeOrderedQueue extends FakeQueue { } resumePublishing(): void {} // eslint-disable-next-line @typescript-eslint/no-unused-vars - publish(callback: (err: Error | null) => void) {} + publish(callback: (err: Error | null) => void) { + this._publish([], [], callback); + } + _publish( + // eslint-disable-next-line @typescript-eslint/no-unused-vars + messages: p.PubsubMessage[], + // eslint-disable-next-line @typescript-eslint/no-unused-vars + callbacks: p.PublishCallback[], + // eslint-disable-next-line @typescript-eslint/no-unused-vars + callback?: q.PublishDone + ) {} } describe('Publisher', () => { @@ -304,19 +323,19 @@ describe('Publisher', () => { it('should drain any ordered queues on flush', done => { // We have to stub out the regular queue as well, so that the flush() operation finishes. sandbox - .stub(FakeQueue.prototype, 'publish') - .callsFake((callback: (err: Error | null) => void) => { - callback(null); + .stub(FakeQueue.prototype, '_publish') + .callsFake((messages, callbacks, callback) => { + if (typeof callback === 'function') callback(null); }); sandbox - .stub(FakeOrderedQueue.prototype, 'publish') - .callsFake((callback: (err: Error | null) => void) => { + .stub(FakeOrderedQueue.prototype, '_publish') + .callsFake((messages, callbacks, callback) => { const queue = (publisher.orderedQueues.get( orderingKey ) as unknown) as FakeOrderedQueue; queue.emit('drain'); - callback(null); + if (typeof callback === 'function') callback(null); }); publisher.orderedQueues.clear(); @@ -422,11 +441,12 @@ describe('Publisher', () => { describe('flush', () => { // The ordered queue drain test is above with the ordered queue tests. it('should drain the main publish queue', done => { - sandbox.stub(publisher.queue, 'publish').callsFake(cb => { - if (cb) { - cb(null); - } - }); + sandbox + .stub(publisher.queue, '_publish') + .callsFake((messages, callbacks, callback) => { + if (typeof callback === 'function') callback(null); + }); + publisher.flush(err => { assert.strictEqual(err, null); assert.strictEqual( From ab33203a373fd38b73b1d657802323df30ae5ac2 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 27 Jan 2021 08:42:23 -0800 Subject: [PATCH 0712/1115] refactor(nodejs): move build cop to flakybot (#1199) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/6e88bfd3-7b66-4bc8-a7e5-10642f2428f5/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/57c23fa5705499a4181095ced81f0ee0933b64f6 --- handwritten/pubsub/.kokoro/samples-test.sh | 6 +++--- handwritten/pubsub/.kokoro/system-test.sh | 6 +++--- handwritten/pubsub/.kokoro/test.sh | 6 +++--- handwritten/pubsub/.kokoro/trampoline_v2.sh | 2 +- handwritten/pubsub/synth.metadata | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index bab7ba4e967..950f8483428 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -39,14 +39,14 @@ if [ -f samples/package.json ]; then npm link ../ npm install cd .. - # If tests are running against master, configure Build Cop + # If tests are running against master, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml export MOCHA_REPORTER=xunit cleanup() { - chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop - $KOKORO_GFILE_DIR/linux_amd64/buildcop + chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot + $KOKORO_GFILE_DIR/linux_amd64/flakybot } trap cleanup EXIT HUP fi diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 8a08400484a..319d1e0eda8 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -33,14 +33,14 @@ fi npm install -# If tests are running against master, configure Build Cop +# If tests are running against master, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml export MOCHA_REPORTER=xunit cleanup() { - chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop - $KOKORO_GFILE_DIR/linux_amd64/buildcop + chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot + $KOKORO_GFILE_DIR/linux_amd64/flakybot } trap cleanup EXIT HUP fi diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 5be385fef64..5d6383fcb78 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -21,14 +21,14 @@ export NPM_CONFIG_PREFIX=${HOME}/.npm-global cd $(dirname $0)/.. npm install -# If tests are running against master, configure Build Cop +# If tests are running against master, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml export MOCHA_REPORTER=xunit cleanup() { - chmod +x $KOKORO_GFILE_DIR/linux_amd64/buildcop - $KOKORO_GFILE_DIR/linux_amd64/buildcop + chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot + $KOKORO_GFILE_DIR/linux_amd64/flakybot } trap cleanup EXIT HUP fi diff --git a/handwritten/pubsub/.kokoro/trampoline_v2.sh b/handwritten/pubsub/.kokoro/trampoline_v2.sh index 606d4321458..4d03112128a 100755 --- a/handwritten/pubsub/.kokoro/trampoline_v2.sh +++ b/handwritten/pubsub/.kokoro/trampoline_v2.sh @@ -162,7 +162,7 @@ if [[ -n "${KOKORO_BUILD_ID:-}" ]]; then "KOKORO_GITHUB_COMMIT" "KOKORO_GITHUB_PULL_REQUEST_NUMBER" "KOKORO_GITHUB_PULL_REQUEST_COMMIT" - # For Build Cop Bot + # For flakybot "KOKORO_GITHUB_COMMIT_URL" "KOKORO_GITHUB_PULL_REQUEST_URL" ) diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 7b1f90e8ff5..345352981a5 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "cf3f31f70156a450054428aa1054e641af0d6531" + "sha": "e494fb7303ae58b08f3f75aa87ea1f10c86f648e" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "363fe305e9ce34a6cd53951c6ee5f997094b54ee" + "sha": "57c23fa5705499a4181095ced81f0ee0933b64f6" } } ], From 9a28599d0986e6df2b87357e4deb806a88f60cac Mon Sep 17 00:00:00 2001 From: Maxime David Date: Thu, 28 Jan 2021 18:30:02 -0500 Subject: [PATCH 0713/1115] fix: openTelemetry doc fails to generate for #1185 (#1200) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that the file rename make the doc generation fails, here is a README only PR to fix it (I run locally npm run docs-test) - [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) Fixes #1185 🦕 --- handwritten/pubsub/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index ea2ad0063e0..b65e981487d 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -142,7 +142,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Listen For Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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 For Messages With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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) | -| OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/opentelemetryTracing.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/opentelemetryTracing.js,samples/README.md) | +| OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/openTelemetryTracing.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/openTelemetryTracing.js,samples/README.md) | | Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | | Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessage.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/publishMessage.js,samples/README.md) | | Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | From e3ad713ada2bac29b32933eb78116e442e5f5719 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Tue, 2 Feb 2021 17:52:31 -0800 Subject: [PATCH 0714/1115] chore: update CODEOWNERS config (#1202) --- handwritten/pubsub/.repo-metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json index ed687cd1957..9e297608e90 100644 --- a/handwritten/pubsub/.repo-metadata.json +++ b/handwritten/pubsub/.repo-metadata.json @@ -9,5 +9,6 @@ "repo": "googleapis/nodejs-pubsub", "distribution_name": "@google-cloud/pubsub", "api_id": "pubsub.googleapis.com", - "requires_billing": true + "requires_billing": true, + "codeowner_team": "@googleapis/api-pubsub" } From 76b6fea7290df8be2e3f95353401693f6bd7f744 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 9 Feb 2021 19:22:04 +0100 Subject: [PATCH 0715/1115] fix(deps): update dependency google-auth-library to v7 (#1207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-auth-library](https://togithub.com/googleapis/google-auth-library-nodejs) | [`^6.1.2` -> `^7.0.0`](https://renovatebot.com/diffs/npm/google-auth-library/6.1.6/7.0.0) | [![age](https://badges.renovateapi.com/packages/npm/google-auth-library/7.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-auth-library/7.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-auth-library/7.0.0/compatibility-slim/6.1.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-auth-library/7.0.0/confidence-slim/6.1.6)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/google-auth-library-nodejs ### [`v7.0.0`](https://togithub.com/googleapis/google-auth-library-nodejs/blob/master/CHANGELOG.md#​700-httpswwwgithubcomgoogleapisgoogle-auth-library-nodejscomparev616v700-2021-02-08) [Compare Source](https://togithub.com/googleapis/google-auth-library-nodejs/compare/v6.1.6...v7.0.0) ##### ⚠ BREAKING CHANGES - integrates external_accounts with `GoogleAuth` and ADC ([#​1052](https://togithub.com/googleapis/google-auth-library-nodejs/issues/1052)) - workload identity federation support ([#​1131](https://togithub.com/googleapis/google-auth-library-nodejs/issues/1131)) ##### Features - adds service account impersonation to `ExternalAccountClient` ([#​1041](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1041)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - adds text/json credential_source support to IdentityPoolClients ([#​1059](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1059)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - defines `ExternalAccountClient` used to instantiate external account clients ([#​1050](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1050)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - defines `IdentityPoolClient` used for K8s and Azure workloads ([#​1042](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1042)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - defines ExternalAccountClient abstract class for external_account credentials ([#​1030](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1030)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - get AWS region from environment variable ([#​1067](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1067)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - implements AWS signature version 4 for signing requests ([#​1047](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1047)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - implements the OAuth token exchange spec based on rfc8693 ([#​1026](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1026)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - integrates external_accounts with `GoogleAuth` and ADC ([#​1052](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1052)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) - workload identity federation support ([#​1131](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1131)) ([997f124](https://www.github.com/googleapis/google-auth-library-nodejs/commit/997f124a5c02dfa44879a759bf701a9fa4c3ba90)) ##### Bug Fixes - **deps:** update dependency puppeteer to v6 ([#​1129](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1129)) ([5240fb0](https://www.github.com/googleapis/google-auth-library-nodejs/commit/5240fb0e7ba5503d562659a0d1d7c952bc44ce0e)) - **deps:** update dependency puppeteer to v7 ([#​1134](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1134)) ([02d0d73](https://www.github.com/googleapis/google-auth-library-nodejs/commit/02d0d73a5f0d2fc7de9b13b160e4e7074652f9d0)) ##### [6.1.6](https://www.github.com/googleapis/google-auth-library-nodejs/compare/v6.1.5...v6.1.6) (2021-01-27) ##### Bug Fixes - call addSharedMetadataHeaders even when token has not expired ([#​1116](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1116)) ([aad043d](https://www.github.com/googleapis/google-auth-library-nodejs/commit/aad043d20df3f1e44f56c58a21f15000b6fe970d)) ##### [6.1.5](https://www.github.com/googleapis/google-auth-library-nodejs/compare/v6.1.4...v6.1.5) (2021-01-22) ##### Bug Fixes - support PEM and p12 when using factory ([#​1120](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1120)) ([c2ead4c](https://www.github.com/googleapis/google-auth-library-nodejs/commit/c2ead4cc7650f100b883c9296fce628f17085992)) ##### [6.1.4](https://www.github.com/googleapis/google-auth-library-nodejs/compare/v6.1.3...v6.1.4) (2020-12-22) ##### Bug Fixes - move accessToken to headers instead of parameter ([#​1108](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1108)) ([67b0cc3](https://www.github.com/googleapis/google-auth-library-nodejs/commit/67b0cc3077860a1583bcf18ce50aeff58bbb5496)) ##### [6.1.3](https://www.github.com/googleapis/google-auth-library-nodejs/compare/v6.1.2...v6.1.3) (2020-10-22) ##### Bug Fixes - **deps:** update dependency gaxios to v4 ([#​1086](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1086)) ([f2678ff](https://www.github.com/googleapis/google-auth-library-nodejs/commit/f2678ff5f8f5a0ee33924278b58e0a6e3122cb12)) ##### [6.1.2](https://www.github.com/googleapis/google-auth-library-nodejs/compare/v6.1.1...v6.1.2) (2020-10-19) ##### Bug Fixes - update gcp-metadata to catch a json-bigint security fix ([#​1078](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1078)) ([125fe09](https://www.github.com/googleapis/google-auth-library-nodejs/commit/125fe0924a2206ebb0c83ece9947524e7b135803)) ##### [6.1.1](https://www.github.com/googleapis/google-auth-library-nodejs/compare/v6.1.0...v6.1.1) (2020-10-06) ##### Bug Fixes - **deps:** upgrade gtoken ([#​1064](https://www.github.com/googleapis/google-auth-library-nodejs/issues/1064)) ([9116f24](https://www.github.com/googleapis/google-auth-library-nodejs/commit/9116f247486d6376feca505bbfa42a91d5e579e2))
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f04499111d9..c3d40c9abdb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -59,7 +59,7 @@ "@types/long": "^4.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-auth-library": "^6.1.2", + "google-auth-library": "^7.0.0", "google-gax": "^2.9.2", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 27eb746d381f3d34fc51b5ab23b0197468df13fc Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 10 Feb 2021 09:01:49 -0800 Subject: [PATCH 0716/1115] feat: update protos from upstream (#1206) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * fix: use repo metadata to populate nodejs CODEOWNERS * fix: use repo metadata to populate nodejs CODEOWNERS * chore: small formatting tweaks Co-authored-by: Benjamin Coe Source-Author: Justin Beckwith Source-Date: Wed Feb 3 15:09:55 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 318e351e26ba65b2b3cfa3f61b3b64e3540c3525 Source-Link: https://github.com/googleapis/synthtool/commit/318e351e26ba65b2b3cfa3f61b3b64e3540c3525 * docs: fix case in README for samples Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/CODEOWNERS | 2 +- handwritten/pubsub/protos/protos.d.ts | 3 ++- handwritten/pubsub/protos/protos.js | 7 +++++++ handwritten/pubsub/protos/protos.json | 3 ++- handwritten/pubsub/synth.metadata | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/.github/CODEOWNERS b/handwritten/pubsub/.github/CODEOWNERS index ea801edc730..568138297be 100644 --- a/handwritten/pubsub/.github/CODEOWNERS +++ b/handwritten/pubsub/.github/CODEOWNERS @@ -6,4 +6,4 @@ # The yoshi-nodejs team is the default owner for nodejs repositories. -* @googleapis/yoshi-nodejs @googleapis/api-pubsub +* @googleapis/yoshi-nodejs @googleapis/api-pubsub diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 3f1eff32313..2bc15192ae9 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -6551,7 +6551,8 @@ export namespace google { REQUIRED = 2, OUTPUT_ONLY = 3, INPUT_ONLY = 4, - IMMUTABLE = 5 + IMMUTABLE = 5, + UNORDERED_LIST = 6 } /** Properties of a ResourceDescriptor. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index fe4e8f5c1c4..2d3c27e7191 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -15030,6 +15030,7 @@ * @property {number} OUTPUT_ONLY=3 OUTPUT_ONLY value * @property {number} INPUT_ONLY=4 INPUT_ONLY value * @property {number} IMMUTABLE=5 IMMUTABLE value + * @property {number} UNORDERED_LIST=6 UNORDERED_LIST value */ api.FieldBehavior = (function() { var valuesById = {}, values = Object.create(valuesById); @@ -15039,6 +15040,7 @@ values[valuesById[3] = "OUTPUT_ONLY"] = 3; values[valuesById[4] = "INPUT_ONLY"] = 4; values[valuesById[5] = "IMMUTABLE"] = 5; + values[valuesById[6] = "UNORDERED_LIST"] = 6; return values; })(); @@ -21206,6 +21208,7 @@ case 3: case 4: case 5: + case 6: break; } } @@ -21306,6 +21309,10 @@ case 5: message[".google.api.fieldBehavior"][i] = 5; break; + case "UNORDERED_LIST": + case 6: + message[".google.api.fieldBehavior"][i] = 6; + break; } } if (object[".google.api.resourceReference"] != null) { diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 6a97de5b47c..f81292a93c7 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1742,7 +1742,8 @@ "REQUIRED": 2, "OUTPUT_ONLY": 3, "INPUT_ONLY": 4, - "IMMUTABLE": 5 + "IMMUTABLE": 5, + "UNORDERED_LIST": 6 } }, "resourceReference": { diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 345352981a5..939b6098490 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "e494fb7303ae58b08f3f75aa87ea1f10c86f648e" + "sha": "ccebf72508ba9f410c539eedaa879ec6fa423c0b" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "57c23fa5705499a4181095ced81f0ee0933b64f6" + "sha": "318e351e26ba65b2b3cfa3f61b3b64e3540c3525" } } ], From 1a4c7030babb0f76f270a18e179988d40524080a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 13:31:47 -0500 Subject: [PATCH 0717/1115] chore: release 2.9.0 (#1210) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 15 +++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 625d805907c..ceac55307f9 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,21 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.9.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.8.0...v2.9.0) (2021-02-10) + + +### Features + +* update protos from upstream ([#1206](https://www.github.com/googleapis/nodejs-pubsub/issues/1206)) ([33526b0](https://www.github.com/googleapis/nodejs-pubsub/commit/33526b04373bd1ea40930d14b6fc6a344a814eff)) + + +### Bug Fixes + +* bind promisify calls for flush() so they have a 'this' value ([#1184](https://www.github.com/googleapis/nodejs-pubsub/issues/1184)) ([e494fb7](https://www.github.com/googleapis/nodejs-pubsub/commit/e494fb7303ae58b08f3f75aa87ea1f10c86f648e)) +* **deps:** update dependency google-auth-library to v7 ([#1207](https://www.github.com/googleapis/nodejs-pubsub/issues/1207)) ([fce2af1](https://www.github.com/googleapis/nodejs-pubsub/commit/fce2af18ef932b722dcaa9e1132ee145318bd81e)) +* openTelemetry doc fails to generate for [#1185](https://www.github.com/googleapis/nodejs-pubsub/issues/1185) ([#1200](https://www.github.com/googleapis/nodejs-pubsub/issues/1200)) ([0600bde](https://www.github.com/googleapis/nodejs-pubsub/commit/0600bdef9447440605d129396c1915e7640f80ea)) +* update synchronousPull example to avoid INVALID_ARGUMENT error ([#1194](https://www.github.com/googleapis/nodejs-pubsub/issues/1194)) ([1f85345](https://www.github.com/googleapis/nodejs-pubsub/commit/1f853450e0822ebbaeab5892f5d76f5bc0e29537)) + ## [2.8.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.7.0...v2.8.0) (2021-01-08) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c3d40c9abdb..27fa81638eb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.8.0", + "version": "2.9.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From f18616b3fbe99b57a7c9f9d2b126149df4815229 Mon Sep 17 00:00:00 2001 From: Piotr Kuczynski Date: Mon, 22 Feb 2021 18:24:03 +0100 Subject: [PATCH 0718/1115] feat: export PublishError (#1216) Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) Fixes #1215 --- handwritten/pubsub/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 5ff8378338a..8320ea3c760 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -91,6 +91,7 @@ export { IAM, } from './iam'; export {Attributes, PublishCallback} from './publisher'; +export {PublishError} from './publisher/publish-error'; export { PageOptions, GetSnapshotsCallback, From b4967dea184d3c6552159fdf2c054c018f28b62d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 22 Feb 2021 15:23:05 -0500 Subject: [PATCH 0719/1115] chore: release 2.10.0 (#1217) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index ceac55307f9..e4bf83150e0 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.10.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.9.0...v2.10.0) (2021-02-22) + + +### Features + +* export PublishError ([#1216](https://www.github.com/googleapis/nodejs-pubsub/issues/1216)) ([7c75d70](https://www.github.com/googleapis/nodejs-pubsub/commit/7c75d70e12545859d011c289b251d2ef746de589)), closes [#1215](https://www.github.com/googleapis/nodejs-pubsub/issues/1215) + ## [2.9.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.8.0...v2.9.0) (2021-02-10) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 27fa81638eb..a74fb923f4a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.9.0", + "version": "2.10.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 501d16cf95492230bf06b4673b245db9b59cf8e3 Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Tue, 16 Mar 2021 19:32:55 +0000 Subject: [PATCH 0720/1115] fix: prevent attempt to publish 0 messages (#1218) --- handwritten/pubsub/src/publisher/message-queues.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 1b372d1c9f4..43f2b3ad8f3 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -74,6 +74,12 @@ export abstract class MessageQueue extends EventEmitter { topic: topic.name, messages, }; + if (messages.length === 0) { + if (typeof callback === 'function') { + callback(null); + } + return; + } topic.request( { From 9a061352c2430f4ff9b5ff3c9fbb72caa893f89a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 16 Mar 2021 12:48:02 -0700 Subject: [PATCH 0721/1115] docs: Remove experimental note for schema APIs (#1222) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/260f3fb5-d0da-4dbb-9151-a0f7137c41d2/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 360714464 Source-Link: https://github.com/googleapis/googleapis/commit/479acf6990eada1213f8666f1c795a018f8496f9 --- handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto | 2 -- handwritten/pubsub/protos/google/pubsub/v1/schema.proto | 3 --- handwritten/pubsub/src/v1/publisher_client.ts | 2 -- handwritten/pubsub/src/v1/schema_service_client.ts | 1 + handwritten/pubsub/synth.metadata | 6 +++--- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 9bc678e3ae7..0da37dd7dad 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -191,8 +191,6 @@ message Topic { string kms_key_name = 5; // Settings for validating messages published against a schema. - // - // EXPERIMENTAL: Schema support is in development and may not work yet. SchemaSettings schema_settings = 6; // Reserved for future use. This field is set only in responses from the diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index ae402ac4de2..1ace7ef3b0d 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -32,9 +32,6 @@ option php_namespace = "Google\\Cloud\\PubSub\\V1"; option ruby_package = "Google::Cloud::PubSub::V1"; // Service for doing schema-related operations. -// -// EXPERIMENTAL: The Schema service is in development and may not work yet. - service SchemaService { option (google.api.default_host) = "pubsub.googleapis.com"; option (google.api.oauth_scopes) = diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 97975ee5cf3..93509242d83 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -430,8 +430,6 @@ export class PublisherClient { * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. * @param {google.pubsub.v1.SchemaSettings} request.schemaSettings * Settings for validating messages published against a schema. - * - * EXPERIMENTAL: Schema support is in development and may not work yet. * @param {boolean} request.satisfiesPzs * Reserved for future use. This field is set only in responses from the * server; it is ignored if it is set in any requests. diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index d2df824606a..5c04c065117 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -43,6 +43,7 @@ import * as gapicConfig from './schema_service_client_config.json'; const version = require('../../../package.json').version; /** + * Service for doing schema-related operations. * @class * @memberof v1 */ diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 939b6098490..3e06f81f819 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "ccebf72508ba9f410c539eedaa879ec6fa423c0b" + "sha": "a4a15135eddb0d1b97039676d4db6a815f1d43cb" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "41d8fbfec9d4bc4a8859f78185713950913b4bf3", - "internalRef": "348038736" + "sha": "479acf6990eada1213f8666f1c795a018f8496f9", + "internalRef": "360714464" } }, { From 767c06b8fff292026c5cc315f263b0451a3cac75 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Wed, 17 Mar 2021 12:06:03 -0700 Subject: [PATCH 0722/1115] fix: remove common protos (#1232) Common protos do not belong here, they are a part of google-gax. Should undo the changes that autosynth is trying to make in #1229 and #1230. --- .../protos/google/api/annotations.proto | 31 - .../pubsub/protos/google/api/auth.proto | 183 ---- .../pubsub/protos/google/api/backend.proto | 47 - .../pubsub/protos/google/api/billing.proto | 98 --- .../protos/google/api/config_change.proto | 85 -- .../pubsub/protos/google/api/consumer.proto | 83 -- .../pubsub/protos/google/api/context.proto | 63 -- .../pubsub/protos/google/api/control.proto | 33 - .../protos/google/api/distribution.proto | 185 ---- .../protos/google/api/documentation.proto | 159 ---- .../pubsub/protos/google/api/endpoint.proto | 74 -- .../experimental/authorization_config.proto | 40 - .../api/experimental/experimental.proto | 34 - .../pubsub/protos/google/api/http.proto | 291 ------ .../pubsub/protos/google/api/httpbody.proto | 70 -- .../pubsub/protos/google/api/label.proto | 49 -- .../pubsub/protos/google/api/log.proto | 55 -- .../pubsub/protos/google/api/logging.proto | 83 -- .../pubsub/protos/google/api/metric.proto | 196 ----- .../google/api/monitored_resource.proto | 91 -- .../pubsub/protos/google/api/monitoring.proto | 89 -- .../pubsub/protos/google/api/quota.proto | 259 ------ .../pubsub/protos/google/api/service.proto | 176 ---- .../api/servicecontrol/v1/check_error.proto | 95 -- .../api/servicecontrol/v1/distribution.proto | 159 ---- .../api/servicecontrol/v1/log_entry.proto | 67 -- .../api/servicecontrol/v1/metric_value.proto | 78 -- .../api/servicecontrol/v1/operation.proto | 112 --- .../v1/service_controller.proto | 161 ---- .../api/servicemanagement/v1/resources.proto | 286 ------ .../servicemanagement/v1/servicemanager.proto | 392 --------- .../protos/google/api/source_info.proto | 32 - .../protos/google/api/system_parameter.proto | 96 -- .../pubsub/protos/google/api/usage.proto | 85 -- .../protos/google/iam/v1/iam_policy.proto | 145 --- .../google/iam/v1/logging/audit_data.proto | 34 - .../pubsub/protos/google/iam/v1/options.proto | 41 - .../pubsub/protos/google/iam/v1/policy.proto | 240 ----- .../pubsub/protos/google/protobuf/any.proto | 139 --- .../pubsub/protos/google/protobuf/api.proto | 202 ----- .../protos/google/protobuf/descriptor.proto | 831 ------------------ .../protos/google/protobuf/duration.proto | 117 --- .../pubsub/protos/google/protobuf/empty.proto | 52 -- .../protos/google/protobuf/field_mask.proto | 246 ------ .../google/protobuf/source_context.proto | 48 - .../protos/google/protobuf/struct.proto | 96 -- .../protos/google/protobuf/timestamp.proto | 133 --- .../pubsub/protos/google/protobuf/type.proto | 187 ---- .../protobuf/util/json_format_proto3.proto | 183 ---- .../protos/google/protobuf/wrappers.proto | 118 --- .../pubsub/protos/google/type/expr.proto | 52 -- 51 files changed, 6901 deletions(-) delete mode 100644 handwritten/pubsub/protos/google/api/annotations.proto delete mode 100644 handwritten/pubsub/protos/google/api/auth.proto delete mode 100644 handwritten/pubsub/protos/google/api/backend.proto delete mode 100644 handwritten/pubsub/protos/google/api/billing.proto delete mode 100644 handwritten/pubsub/protos/google/api/config_change.proto delete mode 100644 handwritten/pubsub/protos/google/api/consumer.proto delete mode 100644 handwritten/pubsub/protos/google/api/context.proto delete mode 100644 handwritten/pubsub/protos/google/api/control.proto delete mode 100644 handwritten/pubsub/protos/google/api/distribution.proto delete mode 100644 handwritten/pubsub/protos/google/api/documentation.proto delete mode 100644 handwritten/pubsub/protos/google/api/endpoint.proto delete mode 100644 handwritten/pubsub/protos/google/api/experimental/authorization_config.proto delete mode 100644 handwritten/pubsub/protos/google/api/experimental/experimental.proto delete mode 100644 handwritten/pubsub/protos/google/api/http.proto delete mode 100644 handwritten/pubsub/protos/google/api/httpbody.proto delete mode 100644 handwritten/pubsub/protos/google/api/label.proto delete mode 100644 handwritten/pubsub/protos/google/api/log.proto delete mode 100644 handwritten/pubsub/protos/google/api/logging.proto delete mode 100644 handwritten/pubsub/protos/google/api/metric.proto delete mode 100644 handwritten/pubsub/protos/google/api/monitored_resource.proto delete mode 100644 handwritten/pubsub/protos/google/api/monitoring.proto delete mode 100644 handwritten/pubsub/protos/google/api/quota.proto delete mode 100644 handwritten/pubsub/protos/google/api/service.proto delete mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/check_error.proto delete mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/distribution.proto delete mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/log_entry.proto delete mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/metric_value.proto delete mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/operation.proto delete mode 100644 handwritten/pubsub/protos/google/api/servicecontrol/v1/service_controller.proto delete mode 100644 handwritten/pubsub/protos/google/api/servicemanagement/v1/resources.proto delete mode 100644 handwritten/pubsub/protos/google/api/servicemanagement/v1/servicemanager.proto delete mode 100644 handwritten/pubsub/protos/google/api/source_info.proto delete mode 100644 handwritten/pubsub/protos/google/api/system_parameter.proto delete mode 100644 handwritten/pubsub/protos/google/api/usage.proto delete mode 100644 handwritten/pubsub/protos/google/iam/v1/iam_policy.proto delete mode 100644 handwritten/pubsub/protos/google/iam/v1/logging/audit_data.proto delete mode 100644 handwritten/pubsub/protos/google/iam/v1/options.proto delete mode 100644 handwritten/pubsub/protos/google/iam/v1/policy.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/any.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/api.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/descriptor.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/duration.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/empty.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/field_mask.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/source_context.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/struct.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/timestamp.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/type.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/util/json_format_proto3.proto delete mode 100644 handwritten/pubsub/protos/google/protobuf/wrappers.proto delete mode 100644 handwritten/pubsub/protos/google/type/expr.proto diff --git a/handwritten/pubsub/protos/google/api/annotations.proto b/handwritten/pubsub/protos/google/api/annotations.proto deleted file mode 100644 index 85c361b47fe..00000000000 --- a/handwritten/pubsub/protos/google/api/annotations.proto +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2015, Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/http.proto"; -import "google/protobuf/descriptor.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "AnnotationsProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -extend google.protobuf.MethodOptions { - // See `HttpRule`. - HttpRule http = 72295728; -} diff --git a/handwritten/pubsub/protos/google/api/auth.proto b/handwritten/pubsub/protos/google/api/auth.proto deleted file mode 100644 index 0ef63863192..00000000000 --- a/handwritten/pubsub/protos/google/api/auth.proto +++ /dev/null @@ -1,183 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "AuthProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// `Authentication` defines the authentication configuration for an API. -// -// Example for an API targeted for external use: -// -// name: calendar.googleapis.com -// authentication: -// providers: -// - id: google_calendar_auth -// jwks_uri: https://www.googleapis.com/oauth2/v1/certs -// issuer: https://securetoken.google.com -// rules: -// - selector: "*" -// requirements: -// provider_id: google_calendar_auth -message Authentication { - // A list of authentication rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated AuthenticationRule rules = 3; - - // Defines a set of authentication providers that a service supports. - repeated AuthProvider providers = 4; -} - -// Authentication rules for the service. -// -// By default, if a method has any authentication requirements, every request -// must include a valid credential matching one of the requirements. -// It's an error to include more than one kind of credential in a single -// request. -// -// If a method doesn't have any auth requirements, request credentials will be -// ignored. -message AuthenticationRule { - // Selects the methods to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // The requirements for OAuth credentials. - OAuthRequirements oauth = 2; - - // Whether to allow requests without a credential. The credential can be - // an OAuth token, Google cookies (first-party auth) or EndUserCreds. - // - // For requests without credentials, if the service control environment is - // specified, each incoming request **must** be associated with a service - // consumer. This can be done by passing an API key that belongs to a consumer - // project. - bool allow_without_credential = 5; - - // Requirements for additional authentication providers. - repeated AuthRequirement requirements = 7; -} - -// Configuration for an anthentication provider, including support for -// [JSON Web Token (JWT)](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32). -message AuthProvider { - // The unique identifier of the auth provider. It will be referred to by - // `AuthRequirement.provider_id`. - // - // Example: "bookstore_auth". - string id = 1; - - // Identifies the principal that issued the JWT. See - // https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.1 - // Usually a URL or an email address. - // - // Example: https://securetoken.google.com - // Example: 1234567-compute@developer.gserviceaccount.com - string issuer = 2; - - // URL of the provider's public key set to validate signature of the JWT. See - // [OpenID Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata). - // Optional if the key set document: - // - can be retrieved from - // [OpenID Discovery](https://openid.net/specs/openid-connect-discovery-1_0.html - // of the issuer. - // - can be inferred from the email domain of the issuer (e.g. a Google service account). - // - // Example: https://www.googleapis.com/oauth2/v1/certs - string jwks_uri = 3; - - // The list of JWT - // [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3). - // that are allowed to access. A JWT containing any of these audiences will - // be accepted. When this setting is absent, only JWTs with audience - // "https://[Service_name][google.api.Service.name]/[API_name][google.protobuf.Api.name]" - // will be accepted. For example, if no audiences are in the setting, - // LibraryService API will only accept JWTs with the following audience - // "https://library-example.googleapis.com/google.example.library.v1.LibraryService". - // - // Example: - // - // audiences: bookstore_android.apps.googleusercontent.com, - // bookstore_web.apps.googleusercontent.com - string audiences = 4; -} - -// OAuth scopes are a way to define data and permissions on data. For example, -// there are scopes defined for "Read-only access to Google Calendar" and -// "Access to Cloud Platform". Users can consent to a scope for an application, -// giving it permission to access that data on their behalf. -// -// OAuth scope specifications should be fairly coarse grained; a user will need -// to see and understand the text description of what your scope means. -// -// In most cases: use one or at most two OAuth scopes for an entire family of -// products. If your product has multiple APIs, you should probably be sharing -// the OAuth scope across all of those APIs. -// -// When you need finer grained OAuth consent screens: talk with your product -// management about how developers will use them in practice. -// -// Please note that even though each of the canonical scopes is enough for a -// request to be accepted and passed to the backend, a request can still fail -// due to the backend requiring additional scopes or permissions. -message OAuthRequirements { - // The list of publicly documented OAuth scopes that are allowed access. An - // OAuth token containing any of these scopes will be accepted. - // - // Example: - // - // canonical_scopes: https://www.googleapis.com/auth/calendar, - // https://www.googleapis.com/auth/calendar.read - string canonical_scopes = 1; -} - -// User-defined authentication requirements, including support for -// [JSON Web Token (JWT)](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32). -message AuthRequirement { - // [id][google.api.AuthProvider.id] from authentication provider. - // - // Example: - // - // provider_id: bookstore_auth - string provider_id = 1; - - // NOTE: This will be deprecated soon, once AuthProvider.audiences is - // implemented and accepted in all the runtime components. - // - // The list of JWT - // [audiences](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32#section-4.1.3). - // that are allowed to access. A JWT containing any of these audiences will - // be accepted. When this setting is absent, only JWTs with audience - // "https://[Service_name][google.api.Service.name]/[API_name][google.protobuf.Api.name]" - // will be accepted. For example, if no audiences are in the setting, - // LibraryService API will only accept JWTs with the following audience - // "https://library-example.googleapis.com/google.example.library.v1.LibraryService". - // - // Example: - // - // audiences: bookstore_android.apps.googleusercontent.com, - // bookstore_web.apps.googleusercontent.com - string audiences = 2; -} diff --git a/handwritten/pubsub/protos/google/api/backend.proto b/handwritten/pubsub/protos/google/api/backend.proto deleted file mode 100644 index 61a72e14d19..00000000000 --- a/handwritten/pubsub/protos/google/api/backend.proto +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "BackendProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// `Backend` defines the backend configuration for a service. -message Backend { - // A list of API backend rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated BackendRule rules = 1; -} - -// A backend rule provides configuration for an individual API element. -message BackendRule { - // Selects the methods to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // The address of the API backend. - string address = 2; - - // The number of seconds to wait for a response from a request. The - // default depends on the deployment context. - double deadline = 3; -} diff --git a/handwritten/pubsub/protos/google/api/billing.proto b/handwritten/pubsub/protos/google/api/billing.proto deleted file mode 100644 index 6ecffd5451e..00000000000 --- a/handwritten/pubsub/protos/google/api/billing.proto +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; -import "google/api/metric.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "BillingProto"; -option java_package = "com.google.api"; - - -// Billing related configuration of the service. -// -// The following example shows how to configure metrics for billing: -// -// metrics: -// - name: library.googleapis.com/read_calls -// metric_kind: DELTA -// value_type: INT64 -// - name: library.googleapis.com/write_calls -// metric_kind: DELTA -// value_type: INT64 -// billing: -// metrics: -// - library.googleapis.com/read_calls -// - library.googleapis.com/write_calls -// -// The next example shows how to enable billing status check and customize the -// check behavior. It makes sure billing status check is included in the `Check` -// method of [Service Control API](https://cloud.google.com/service-control/). -// In the example, "google.storage.Get" method can be served when the billing -// status is either `current` or `delinquent`, while "google.storage.Write" -// method can only be served when the billing status is `current`: -// -// billing: -// rules: -// - selector: google.storage.Get -// allowed_statuses: -// - current -// - delinquent -// - selector: google.storage.Write -// allowed_statuses: current -// -// Mostly services should only allow `current` status when serving requests. -// In addition, services can choose to allow both `current` and `delinquent` -// statuses when serving read-only requests to resources. If there's no -// matching selector for operation, no billing status check will be performed. -// -message Billing { - // Names of the metrics to report to billing. Each name must - // be defined in [Service.metrics][google.api.Service.metrics] section. - repeated string metrics = 1; - - // A list of billing status rules for configuring billing status check. - repeated BillingStatusRule rules = 5; -} - -// Defines the billing status requirements for operations. -// -// When used with -// [Service Control API](https://cloud.google.com/service-control/), the -// following statuses are supported: -// -// - **current**: the associated billing account is up to date and capable of -// paying for resource usages. -// - **delinquent**: the associated billing account has a correctable problem, -// such as late payment. -// -// Mostly services should only allow `current` status when serving requests. -// In addition, services can choose to allow both `current` and `delinquent` -// statuses when serving read-only requests to resources. If the list of -// allowed_statuses is empty, it means no billing requirement. -// -message BillingStatusRule { - // Selects the operation names to which this rule applies. - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // Allowed billing statuses. The billing status check passes if the actual - // billing status matches any of the provided values here. - repeated string allowed_statuses = 2; -} diff --git a/handwritten/pubsub/protos/google/api/config_change.proto b/handwritten/pubsub/protos/google/api/config_change.proto deleted file mode 100644 index 3c416164ec5..00000000000 --- a/handwritten/pubsub/protos/google/api/config_change.proto +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api/configchange;configchange"; -option java_multiple_files = true; -option java_outer_classname = "ConfigChangeProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Output generated from semantically comparing two versions of a service -// configuration. -// -// Includes detailed information about a field that have changed with -// applicable advice about potential consequences for the change, such as -// backwards-incompatibility. -message ConfigChange { - // Object hierarchy path to the change, with levels separated by a '.' - // character. For repeated fields, an applicable unique identifier field is - // used for the index (usually selector, name, or id). For maps, the term - // 'key' is used. If the field has no unique identifier, the numeric index - // is used. - // Examples: - // - visibility.rules[selector=="google.LibraryService.CreateBook"].restriction - // - quota.metric_rules[selector=="google"].metric_costs[key=="reads"].value - // - logging.producer_destinations[0] - string element = 1; - - // Value of the changed object in the old Service configuration, - // in JSON format. This field will not be populated if ChangeType == ADDED. - string old_value = 2; - - // Value of the changed object in the new Service configuration, - // in JSON format. This field will not be populated if ChangeType == REMOVED. - string new_value = 3; - - // The type for this change, either ADDED, REMOVED, or MODIFIED. - ChangeType change_type = 4; - - // Collection of advice provided for this change, useful for determining the - // possible impact of this change. - repeated Advice advices = 5; -} - -// Generated advice about this change, used for providing more -// information about how a change will affect the existing service. -message Advice { - // Useful description for why this advice was applied and what actions should - // be taken to mitigate any implied risks. - string description = 2; -} - -// Classifies set of possible modifications to an object in the service -// configuration. -enum ChangeType { - // No value was provided. - CHANGE_TYPE_UNSPECIFIED = 0; - - // The changed object exists in the 'new' service configuration, but not - // in the 'old' service configuration. - ADDED = 1; - - // The changed object exists in the 'old' service configuration, but not - // in the 'new' service configuration. - REMOVED = 2; - - // The changed object exists in both service configurations, but its value - // is different. - MODIFIED = 3; -} diff --git a/handwritten/pubsub/protos/google/api/consumer.proto b/handwritten/pubsub/protos/google/api/consumer.proto deleted file mode 100644 index 4e963168efc..00000000000 --- a/handwritten/pubsub/protos/google/api/consumer.proto +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "ConsumerProto"; -option java_package = "com.google.api"; - - -// A descriptor for defining project properties for a service. One service may -// have many consumer projects, and the service may want to behave differently -// depending on some properties on the project. For example, a project may be -// associated with a school, or a business, or a government agency, a business -// type property on the project may affect how a service responds to the client. -// This descriptor defines which properties are allowed to be set on a project. -// -// Example: -// -// project_properties: -// properties: -// - name: NO_WATERMARK -// type: BOOL -// description: Allows usage of the API without watermarks. -// - name: EXTENDED_TILE_CACHE_PERIOD -// type: INT64 -message ProjectProperties { - // List of per consumer project-specific properties. - repeated Property properties = 1; -} - -// Defines project properties. -// -// API services can define properties that can be assigned to consumer projects -// so that backends can perform response customization without having to make -// additional calls or maintain additional storage. For example, Maps API -// defines properties that controls map tile cache period, or whether to embed a -// watermark in a result. -// -// These values can be set via API producer console. Only API providers can -// define and set these properties. -message Property { - // Supported data type of the property values - enum PropertyType { - // The type is unspecified, and will result in an error. - UNSPECIFIED = 0; - - // The type is `int64`. - INT64 = 1; - - // The type is `bool`. - BOOL = 2; - - // The type is `string`. - STRING = 3; - - // The type is 'double'. - DOUBLE = 4; - } - - // The name of the property (a.k.a key). - string name = 1; - - // The type of this property. - PropertyType type = 2; - - // The description of the property - string description = 3; -} diff --git a/handwritten/pubsub/protos/google/api/context.proto b/handwritten/pubsub/protos/google/api/context.proto deleted file mode 100644 index fd03fcae916..00000000000 --- a/handwritten/pubsub/protos/google/api/context.proto +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "ContextProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// `Context` defines which contexts an API requests. -// -// Example: -// -// context: -// rules: -// - selector: "*" -// requested: -// - google.rpc.context.ProjectContext -// - google.rpc.context.OriginContext -// -// The above specifies that all methods in the API request -// `google.rpc.context.ProjectContext` and -// `google.rpc.context.OriginContext`. -// -// Available context types are defined in package -// `google.rpc.context`. -message Context { - // A list of RPC context rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated ContextRule rules = 1; -} - -// A context rule provides information about the context for an individual API -// element. -message ContextRule { - // Selects the methods to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // A list of full type names of requested contexts. - repeated string requested = 2; - - // A list of full type names of provided contexts. - repeated string provided = 3; -} diff --git a/handwritten/pubsub/protos/google/api/control.proto b/handwritten/pubsub/protos/google/api/control.proto deleted file mode 100644 index acad56cbdde..00000000000 --- a/handwritten/pubsub/protos/google/api/control.proto +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "ControlProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Selects and configures the service controller used by the service. The -// service controller handles features like abuse, quota, billing, logging, -// monitoring, etc. -message Control { - // The service control environment to use. If empty, no control plane - // feature (like quota and billing) will be enabled. - string environment = 1; -} diff --git a/handwritten/pubsub/protos/google/api/distribution.proto b/handwritten/pubsub/protos/google/api/distribution.proto deleted file mode 100644 index 2861e9b6f3a..00000000000 --- a/handwritten/pubsub/protos/google/api/distribution.proto +++ /dev/null @@ -1,185 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; -import "google/protobuf/any.proto"; -import "google/protobuf/timestamp.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/distribution;distribution"; -option java_multiple_files = true; -option java_outer_classname = "DistributionProto"; -option java_package = "com.google.api"; - - -// Distribution contains summary statistics for a population of values and, -// optionally, a histogram representing the distribution of those values across -// a specified set of histogram buckets. -// -// The summary statistics are the count, mean, sum of the squared deviation from -// the mean, the minimum, and the maximum of the set of population of values. -// -// The histogram is based on a sequence of buckets and gives a count of values -// that fall into each bucket. The boundaries of the buckets are given either -// explicitly or by specifying parameters for a method of computing them -// (buckets of fixed width or buckets of exponentially increasing width). -// -// Although it is not forbidden, it is generally a bad idea to include -// non-finite values (infinities or NaNs) in the population of values, as this -// will render the `mean` and `sum_of_squared_deviation` fields meaningless. -message Distribution { - // The range of the population values. - message Range { - // The minimum of the population values. - double min = 1; - - // The maximum of the population values. - double max = 2; - } - - // A Distribution may optionally contain a histogram of the values in the - // population. The histogram is given in `bucket_counts` as counts of values - // that fall into one of a sequence of non-overlapping buckets. The sequence - // of buckets is described by `bucket_options`. - // - // A bucket specifies an inclusive lower bound and exclusive upper bound for - // the values that are counted for that bucket. The upper bound of a bucket - // is strictly greater than the lower bound. - // - // The sequence of N buckets for a Distribution consists of an underflow - // bucket (number 0), zero or more finite buckets (number 1 through N - 2) and - // an overflow bucket (number N - 1). The buckets are contiguous: the lower - // bound of bucket i (i > 0) is the same as the upper bound of bucket i - 1. - // The buckets span the whole range of finite values: lower bound of the - // underflow bucket is -infinity and the upper bound of the overflow bucket is - // +infinity. The finite buckets are so-called because both bounds are - // finite. - // - // `BucketOptions` describes bucket boundaries in one of three ways. Two - // describe the boundaries by giving parameters for a formula to generate - // boundaries and one gives the bucket boundaries explicitly. - // - // If `bucket_boundaries` is not given, then no `bucket_counts` may be given. - message BucketOptions { - // Specify a sequence of buckets that all have the same width (except - // overflow and underflow). Each bucket represents a constant absolute - // uncertainty on the specific value in the bucket. - // - // Defines `num_finite_buckets + 2` (= N) buckets with these boundaries for - // bucket `i`: - // - // Upper bound (0 <= i < N-1): offset + (width * i). - // Lower bound (1 <= i < N): offset + (width * (i - 1)). - message Linear { - // Must be greater than 0. - int32 num_finite_buckets = 1; - - // Must be greater than 0. - double width = 2; - - // Lower bound of the first bucket. - double offset = 3; - } - - // Specify a sequence of buckets that have a width that is proportional to - // the value of the lower bound. Each bucket represents a constant relative - // uncertainty on a specific value in the bucket. - // - // Defines `num_finite_buckets + 2` (= N) buckets with these boundaries for - // bucket i: - // - // Upper bound (0 <= i < N-1): scale * (growth_factor ^ i). - // Lower bound (1 <= i < N): scale * (growth_factor ^ (i - 1)). - message Exponential { - // Must be greater than 0. - int32 num_finite_buckets = 1; - - // Must be greater than 1. - double growth_factor = 2; - - // Must be greater than 0. - double scale = 3; - } - - // A set of buckets with arbitrary widths. - // - // Defines `size(bounds) + 1` (= N) buckets with these boundaries for - // bucket i: - // - // Upper bound (0 <= i < N-1): bounds[i] - // Lower bound (1 <= i < N); bounds[i - 1] - // - // There must be at least one element in `bounds`. If `bounds` has only one - // element, there are no finite buckets, and that single element is the - // common boundary of the overflow and underflow buckets. - message Explicit { - // The values must be monotonically increasing. - repeated double bounds = 1; - } - - // Exactly one of these three fields must be set. - oneof options { - // The linear bucket. - Linear linear_buckets = 1; - - // The exponential buckets. - Exponential exponential_buckets = 2; - - // The explicit buckets. - Explicit explicit_buckets = 3; - } - } - - // The number of values in the population. Must be non-negative. - int64 count = 1; - - // The arithmetic mean of the values in the population. If `count` is zero - // then this field must be zero. - double mean = 2; - - // The sum of squared deviations from the mean of the values in the - // population. For values x_i this is: - // - // Sum[i=1..n]((x_i - mean)^2) - // - // Knuth, "The Art of Computer Programming", Vol. 2, page 323, 3rd edition - // describes Welford's method for accumulating this sum in one pass. - // - // If `count` is zero then this field must be zero. - double sum_of_squared_deviation = 3; - - // If specified, contains the range of the population values. The field - // must not be present if the `count` is zero. - Range range = 4; - - // Defines the histogram bucket boundaries. - BucketOptions bucket_options = 6; - - // If `bucket_options` is given, then the sum of the values in `bucket_counts` - // must equal the value in `count`. If `bucket_options` is not given, no - // `bucket_counts` fields may be given. - // - // Bucket counts are given in order under the numbering scheme described - // above (the underflow bucket has number 0; the finite buckets, if any, - // have numbers 1 through N-2; the overflow bucket has number N-1). - // - // The size of `bucket_counts` must be no greater than N as defined in - // `bucket_options`. - // - // Any suffix of trailing zero bucket_count fields may be omitted. - repeated int64 bucket_counts = 7; -} diff --git a/handwritten/pubsub/protos/google/api/documentation.proto b/handwritten/pubsub/protos/google/api/documentation.proto deleted file mode 100644 index 0b85eca51e5..00000000000 --- a/handwritten/pubsub/protos/google/api/documentation.proto +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "DocumentationProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// `Documentation` provides the information for describing a service. -// -// Example: -// 
documentation:
-//   summary: >
-//     The Google Calendar API gives access
-//     to most calendar features.
-//   pages:
-//   - name: Overview
-//     content: (== include google/foo/overview.md ==)
-//   - name: Tutorial
-//     content: (== include google/foo/tutorial.md ==)
-//     subpages;
-//     - name: Java
-//       content: (== include google/foo/tutorial_java.md ==)
-//   rules:
-//   - selector: google.calendar.Calendar.Get
-//     description: >
-//       ...
-//   - selector: google.calendar.Calendar.Put
-//     description: >
-//       ...
-//
-// Documentation is provided in markdown syntax. In addition to -// standard markdown features, definition lists, tables and fenced -// code blocks are supported. Section headers can be provided and are -// interpreted relative to the section nesting of the context where -// a documentation fragment is embedded. -// -// Documentation from the IDL is merged with documentation defined -// via the config at normalization time, where documentation provided -// by config rules overrides IDL provided. -// -// A number of constructs specific to the API platform are supported -// in documentation text. -// -// In order to reference a proto element, the following -// notation can be used: -// 
[fully.qualified.proto.name][]
-// To override the display text used for the link, this can be used: -// 
[display text][fully.qualified.proto.name]
-// Text can be excluded from doc using the following notation: -// 
(-- internal comment --)
-// Comments can be made conditional using a visibility label. The below -// text will be only rendered if the `BETA` label is available: -// 
(--BETA: comment for BETA users --)
-// A few directives are available in documentation. Note that -// directives must appear on a single line to be properly -// identified. The `include` directive includes a markdown file from -// an external source: -// 
(== include path/to/file ==)
-// The `resource_for` directive marks a message to be the resource of -// a collection in REST view. If it is not specified, tools attempt -// to infer the resource from the operations in a collection: -// 
(== resource_for v1.shelves.books ==)
-// The directive `suppress_warning` does not directly affect documentation -// and is documented together with service config validation. -message Documentation { - // A short summary of what the service does. Can only be provided by - // plain text. - string summary = 1; - - // The top level pages for the documentation set. - repeated Page pages = 5; - - // A list of documentation rules that apply to individual API elements. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated DocumentationRule rules = 3; - - // The URL to the root of documentation. - string documentation_root_url = 4; - - // Declares a single overview page. For example: - // 
documentation:
-  //   summary: ...
-  //   overview: (== include overview.md ==)
-  //
- // This is a shortcut for the following declaration (using pages style): - // 
documentation:
-  //   summary: ...
-  //   pages:
-  //   - name: Overview
-  //     content: (== include overview.md ==)
-  //
- // Note: you cannot specify both `overview` field and `pages` field. - string overview = 2; -} - -// A documentation rule provides information about individual API elements. -message DocumentationRule { - // The selector is a comma-separated list of patterns. Each pattern is a - // qualified name of the element which may end in "*", indicating a wildcard. - // Wildcards are only allowed at the end and for a whole component of the - // qualified name, i.e. "foo.*" is ok, but not "foo.b*" or "foo.*.bar". To - // specify a default for all applicable elements, the whole pattern "*" - // is used. - string selector = 1; - - // Description of the selected API(s). - string description = 2; - - // Deprecation description of the selected element(s). It can be provided if an - // element is marked as `deprecated`. - string deprecation_description = 3; -} - -// Represents a documentation page. A page can contain subpages to represent -// nested documentation set structure. -message Page { - // The name of the page. It will be used as an identity of the page to - // generate URI of the page, text of the link to this page in navigation, - // etc. The full page name (start from the root page name to this page - // concatenated with `.`) can be used as reference to the page in your - // documentation. For example: - // 
pages:
-  // - name: Tutorial
-  //   content: (== include tutorial.md ==)
-  //   subpages:
-  //   - name: Java
-  //     content: (== include tutorial_java.md ==)
-  //
- // You can reference `Java` page using Markdown reference link syntax: - // `[Java][Tutorial.Java]`. - string name = 1; - - // The Markdown content of the page. You can use (== include {path} ==) - // to include content from a Markdown file. - string content = 2; - - // Subpages of this page. The order of subpages specified here will be - // honored in the generated docset. - repeated Page subpages = 3; -} diff --git a/handwritten/pubsub/protos/google/api/endpoint.proto b/handwritten/pubsub/protos/google/api/endpoint.proto deleted file mode 100644 index 68655b26a08..00000000000 --- a/handwritten/pubsub/protos/google/api/endpoint.proto +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "EndpointProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// `Endpoint` describes a network endpoint that serves a set of APIs. -// A service may expose any number of endpoints, and all endpoints share the -// same service configuration, such as quota configuration and monitoring -// configuration. -// -// Example service configuration: -// -// name: library-example.googleapis.com -// endpoints: -// # Below entry makes 'google.example.library.v1.Library' -// # API be served from endpoint address library-example.googleapis.com. -// # It also allows HTTP OPTIONS calls to be passed to the backend, for -// # it to decide whether the subsequent cross-origin request is -// # allowed to proceed. -// - name: library-example.googleapis.com -// allow_cors: true -message Endpoint { - // The canonical name of this endpoint. - string name = 1; - - // DEPRECATED: This field is no longer supported. Instead of using aliases, - // please specify multiple [google.api.Endpoint][google.api.Endpoint] for each of the intented - // alias. - // - // Additional names that this endpoint will be hosted on. - repeated string aliases = 2; - - // The list of APIs served by this endpoint. - repeated string apis = 3; - - // The list of features enabled on this endpoint. - repeated string features = 4; - - // The specification of an Internet routable address of API frontend that will - // handle requests to this [API Endpoint](https://cloud.google.com/apis/design/glossary). - // It should be either a valid IPv4 address or a fully-qualified domain name. - // For example, "8.8.8.8" or "myservice.appspot.com". - string target = 101; - - // Allowing - // [CORS](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing), aka - // cross-domain traffic, would allow the backends served from this endpoint to - // receive and respond to HTTP OPTIONS requests. The response will be used by - // the browser to determine whether the subsequent cross-origin request is - // allowed to proceed. - bool allow_cors = 5; -} diff --git a/handwritten/pubsub/protos/google/api/experimental/authorization_config.proto b/handwritten/pubsub/protos/google/api/experimental/authorization_config.proto deleted file mode 100644 index 5c213c62531..00000000000 --- a/handwritten/pubsub/protos/google/api/experimental/authorization_config.proto +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api;api"; -option java_multiple_files = true; -option java_outer_classname = "AuthorizationConfigProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Configuration of authorization. -// -// This section determines the authorization provider, if unspecified, then no -// authorization check will be done. -// -// Example: -// -// experimental: -// authorization: -// provider: firebaserules.googleapis.com -message AuthorizationConfig { - // The name of the authorization provider, such as - // firebaserules.googleapis.com. - string provider = 1; -} diff --git a/handwritten/pubsub/protos/google/api/experimental/experimental.proto b/handwritten/pubsub/protos/google/api/experimental/experimental.proto deleted file mode 100644 index b98097df54a..00000000000 --- a/handwritten/pubsub/protos/google/api/experimental/experimental.proto +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; -import "google/api/experimental/authorization_config.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api;api"; -option java_multiple_files = true; -option java_outer_classname = "ExperimentalProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Experimental service configuration. These configuration options can -// only be used by whitelisted users. -message Experimental { - // Authorization configuration. - AuthorizationConfig authorization = 8; -} diff --git a/handwritten/pubsub/protos/google/api/http.proto b/handwritten/pubsub/protos/google/api/http.proto deleted file mode 100644 index 5f8538a0164..00000000000 --- a/handwritten/pubsub/protos/google/api/http.proto +++ /dev/null @@ -1,291 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "HttpProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Defines the HTTP configuration for a service. It contains a list of -// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method -// to one or more HTTP REST API methods. -message Http { - // A list of HTTP configuration rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated HttpRule rules = 1; -} - -// `HttpRule` defines the mapping of an RPC method to one or more HTTP -// REST APIs. The mapping determines what portions of the request -// message are populated from the path, query parameters, or body of -// the HTTP request. The mapping is typically specified as an -// `google.api.http` annotation, see "google/api/annotations.proto" -// for details. -// -// The mapping consists of a field specifying the path template and -// method kind. The path template can refer to fields in the request -// message, as in the example below which describes a REST GET -// operation on a resource collection of messages: -// -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http).get = "/v1/messages/{message_id}/{sub.subfield}"; -// } -// } -// message GetMessageRequest { -// message SubMessage { -// string subfield = 1; -// } -// string message_id = 1; // mapped to the URL -// SubMessage sub = 2; // `sub.subfield` is url-mapped -// } -// message Message { -// string text = 1; // content of the resource -// } -// -// The same http annotation can alternatively be expressed inside the -// `GRPC API Configuration` YAML file. -// -// http: -// rules: -// - selector: .Messaging.GetMessage -// get: /v1/messages/{message_id}/{sub.subfield} -// -// This definition enables an automatic, bidrectional mapping of HTTP -// JSON to RPC. Example: -// -// HTTP | RPC -// -----|----- -// `GET /v1/messages/123456/foo` | `GetMessage(message_id: "123456" sub: SubMessage(subfield: "foo"))` -// -// In general, not only fields but also field paths can be referenced -// from a path pattern. Fields mapped to the path pattern cannot be -// repeated and must have a primitive (non-message) type. -// -// Any fields in the request message which are not bound by the path -// pattern automatically become (optional) HTTP query -// parameters. Assume the following definition of the request message: -// -// -// message GetMessageRequest { -// message SubMessage { -// string subfield = 1; -// } -// string message_id = 1; // mapped to the URL -// int64 revision = 2; // becomes a parameter -// SubMessage sub = 3; // `sub.subfield` becomes a parameter -// } -// -// -// This enables a HTTP JSON to RPC mapping as below: -// -// HTTP | RPC -// -----|----- -// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: "foo"))` -// -// Note that fields which are mapped to HTTP parameters must have a -// primitive type or a repeated primitive type. Message types are not -// allowed. In the case of a repeated type, the parameter can be -// repeated in the URL, as in `...?param=A¶m=B`. -// -// For HTTP method kinds which allow a request body, the `body` field -// specifies the mapping. Consider a REST update method on the -// message resource collection: -// -// -// service Messaging { -// rpc UpdateMessage(UpdateMessageRequest) returns (Message) { -// option (google.api.http) = { -// put: "/v1/messages/{message_id}" -// body: "message" -// }; -// } -// } -// message UpdateMessageRequest { -// string message_id = 1; // mapped to the URL -// Message message = 2; // mapped to the body -// } -// -// -// The following HTTP JSON to RPC mapping is enabled, where the -// representation of the JSON in the request body is determined by -// protos JSON encoding: -// -// HTTP | RPC -// -----|----- -// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })` -// -// The special name `*` can be used in the body mapping to define that -// every field not bound by the path template should be mapped to the -// request body. This enables the following alternative definition of -// the update method: -// -// service Messaging { -// rpc UpdateMessage(Message) returns (Message) { -// option (google.api.http) = { -// put: "/v1/messages/{message_id}" -// body: "*" -// }; -// } -// } -// message Message { -// string message_id = 1; -// string text = 2; -// } -// -// -// The following HTTP JSON to RPC mapping is enabled: -// -// HTTP | RPC -// -----|----- -// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")` -// -// Note that when using `*` in the body mapping, it is not possible to -// have HTTP parameters, as all fields not bound by the path end in -// the body. This makes this option more rarely used in practice of -// defining REST APIs. The common usage of `*` is in custom methods -// which don't use the URL at all for transferring data. -// -// It is possible to define multiple HTTP methods for one RPC by using -// the `additional_bindings` option. Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/messages/{message_id}" -// additional_bindings { -// get: "/v1/users/{user_id}/messages/{message_id}" -// } -// }; -// } -// } -// message GetMessageRequest { -// string message_id = 1; -// string user_id = 2; -// } -// -// -// This enables the following two alternative HTTP JSON to RPC -// mappings: -// -// HTTP | RPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` -// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")` -// -// # Rules for HTTP mapping -// -// The rules for mapping HTTP path, query parameters, and body fields -// to the request message are as follows: -// -// 1. The `body` field specifies either `*` or a field path, or is -// omitted. If omitted, it assumes there is no HTTP body. -// 2. Leaf fields (recursive expansion of nested messages in the -// request) can be classified into three types: -// (a) Matched in the URL template. -// (b) Covered by body (if body is `*`, everything except (a) fields; -// else everything under the body field) -// (c) All other fields. -// 3. URL query parameters found in the HTTP request are mapped to (c) fields. -// 4. Any body sent with an HTTP request can contain only (b) fields. -// -// The syntax of the path template is as follows: -// -// Template = "/" Segments [ Verb ] ; -// Segments = Segment { "/" Segment } ; -// Segment = "*" | "**" | LITERAL | Variable ; -// Variable = "{" FieldPath [ "=" Segments ] "}" ; -// FieldPath = IDENT { "." IDENT } ; -// Verb = ":" LITERAL ; -// -// The syntax `*` matches a single path segment. It follows the semantics of -// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String -// Expansion. -// -// The syntax `**` matches zero or more path segments. It follows the semantics -// of [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.3 Reserved -// Expansion. NOTE: it must be the last segment in the path except the Verb. -// -// The syntax `LITERAL` matches literal text in the URL path. -// -// The syntax `Variable` matches the entire path as specified by its template; -// this nested template must not contain further variables. If a variable -// matches a single path segment, its template may be omitted, e.g. `{var}` -// is equivalent to `{var=*}`. -// -// NOTE: the field paths in variables and in the `body` must not refer to -// repeated fields or map fields. -// -// Use CustomHttpPattern to specify any HTTP method that is not included in the -// `pattern` field, such as HEAD, or "*" to leave the HTTP method unspecified for -// a given URL path rule. The wild-card rule is useful for services that provide -// content to Web (HTML) clients. -message HttpRule { - // Selects methods to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // Determines the URL pattern is matched by this rules. This pattern can be - // used with any of the {get|put|post|delete|patch} methods. A custom method - // can be defined using the 'custom' field. - oneof pattern { - // Used for listing and getting information about resources. - string get = 2; - - // Used for updating a resource. - string put = 3; - - // Used for creating a resource. - string post = 4; - - // Used for deleting a resource. - string delete = 5; - - // Used for updating a resource. - string patch = 6; - - // Custom pattern is used for defining custom verbs. - CustomHttpPattern custom = 8; - } - - // The name of the request field whose value is mapped to the HTTP body, or - // `*` for mapping all fields not captured by the path pattern to the HTTP - // body. NOTE: the referred field must not be a repeated field and must be - // present at the top-level of request message type. - string body = 7; - - // Additional HTTP bindings for the selector. Nested bindings must - // not contain an `additional_bindings` field themselves (that is, - // the nesting may only be one level deep). - repeated HttpRule additional_bindings = 11; -} - -// A custom pattern is used for defining custom HTTP verb. -message CustomHttpPattern { - // The name of this custom HTTP verb. - string kind = 1; - - // The path matched by this custom verb. - string path = 2; -} diff --git a/handwritten/pubsub/protos/google/api/httpbody.proto b/handwritten/pubsub/protos/google/api/httpbody.proto deleted file mode 100644 index f5176634b0b..00000000000 --- a/handwritten/pubsub/protos/google/api/httpbody.proto +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api/httpbody;httpbody"; -option java_multiple_files = true; -option java_outer_classname = "HttpBodyProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Message that represents an arbitrary HTTP body. It should only be used for -// payload formats that can't be represented as JSON, such as raw binary or -// an HTML page. -// -// -// This message can be used both in streaming and non-streaming API methods in -// the request as well as the response. -// -// It can be used as a top-level request field, which is convenient if one -// wants to extract parameters from either the URL or HTTP template into the -// request fields and also want access to the raw HTTP body. -// -// Example: -// -// message GetResourceRequest { -// // A unique request id. -// string request_id = 1; -// -// // The raw HTTP body is bound to this field. -// google.api.HttpBody http_body = 2; -// } -// -// service ResourceService { -// rpc GetResource(GetResourceRequest) returns (google.api.HttpBody); -// rpc UpdateResource(google.api.HttpBody) returns (google.protobuf.Empty); -// } -// -// Example with streaming methods: -// -// service CaldavService { -// rpc GetCalendar(stream google.api.HttpBody) -// returns (stream google.api.HttpBody); -// rpc UpdateCalendar(stream google.api.HttpBody) -// returns (stream google.api.HttpBody); -// } -// -// Use of this type only changes how the request and response bodies are -// handled, all other features will continue to work unchanged. -message HttpBody { - // The HTTP Content-Type string representing the content type of the body. - string content_type = 1; - - // HTTP body binary data. - bytes data = 2; -} diff --git a/handwritten/pubsub/protos/google/api/label.proto b/handwritten/pubsub/protos/google/api/label.proto deleted file mode 100644 index ec2c14f0c35..00000000000 --- a/handwritten/pubsub/protos/google/api/label.proto +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/label;label"; -option java_multiple_files = true; -option java_outer_classname = "LabelProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// A description of a label. -message LabelDescriptor { - // Value types that can be used as label values. - enum ValueType { - // A variable-length string. This is the default. - STRING = 0; - - // Boolean; true or false. - BOOL = 1; - - // A 64-bit signed integer. - INT64 = 2; - } - - // The label key. - string key = 1; - - // The type of data that can be assigned to the label. - ValueType value_type = 2; - - // A human-readable description for the label. - string description = 3; -} diff --git a/handwritten/pubsub/protos/google/api/log.proto b/handwritten/pubsub/protos/google/api/log.proto deleted file mode 100644 index d64f2439581..00000000000 --- a/handwritten/pubsub/protos/google/api/log.proto +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/label.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "LogProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// A description of a log type. Example in YAML format: -// -// - name: library.googleapis.com/activity_history -// description: The history of borrowing and returning library items. -// display_name: Activity -// labels: -// - key: /customer_id -// description: Identifier of a library customer -message LogDescriptor { - // The name of the log. It must be less than 512 characters long and can - // include the following characters: upper- and lower-case alphanumeric - // characters [A-Za-z0-9], and punctuation characters including - // slash, underscore, hyphen, period [/_-.]. - string name = 1; - - // The set of labels that are available to describe a specific log entry. - // Runtime requests that contain labels not specified here are - // considered invalid. - repeated LabelDescriptor labels = 2; - - // A human-readable description of this log. This information appears in - // the documentation and can contain details. - string description = 3; - - // The human-readable name for this log. This information appears on - // the user interface and should be concise. - string display_name = 4; -} diff --git a/handwritten/pubsub/protos/google/api/logging.proto b/handwritten/pubsub/protos/google/api/logging.proto deleted file mode 100644 index 15c8a996e97..00000000000 --- a/handwritten/pubsub/protos/google/api/logging.proto +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "LoggingProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Logging configuration of the service. -// -// The following example shows how to configure logs to be sent to the -// producer and consumer projects. In the example, the `activity_history` -// log is sent to both the producer and consumer projects, whereas the -// `purchase_history` log is only sent to the producer project. -// -// monitored_resources: -// - type: library.googleapis.com/branch -// labels: -// - key: /city -// description: The city where the library branch is located in. -// - key: /name -// description: The name of the branch. -// logs: -// - name: activity_history -// labels: -// - key: /customer_id -// - name: purchase_history -// logging: -// producer_destinations: -// - monitored_resource: library.googleapis.com/branch -// logs: -// - activity_history -// - purchase_history -// consumer_destinations: -// - monitored_resource: library.googleapis.com/branch -// logs: -// - activity_history -message Logging { - // Configuration of a specific logging destination (the producer project - // or the consumer project). - message LoggingDestination { - // The monitored resource type. The type must be defined in the - // [Service.monitored_resources][google.api.Service.monitored_resources] section. - string monitored_resource = 3; - - // Names of the logs to be sent to this destination. Each name must - // be defined in the [Service.logs][google.api.Service.logs] section. If the log name is - // not a domain scoped name, it will be automatically prefixed with - // the service name followed by "/". - repeated string logs = 1; - } - - // Logging configurations for sending logs to the producer project. - // There can be multiple producer destinations, each one must have a - // different monitored resource type. A log can be used in at most - // one producer destination. - repeated LoggingDestination producer_destinations = 1; - - // Logging configurations for sending logs to the consumer project. - // There can be multiple consumer destinations, each one must have a - // different monitored resource type. A log can be used in at most - // one consumer destination. - repeated LoggingDestination consumer_destinations = 2; -} diff --git a/handwritten/pubsub/protos/google/api/metric.proto b/handwritten/pubsub/protos/google/api/metric.proto deleted file mode 100644 index 17b7263a334..00000000000 --- a/handwritten/pubsub/protos/google/api/metric.proto +++ /dev/null @@ -1,196 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/label.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/metric;metric"; -option java_multiple_files = true; -option java_outer_classname = "MetricProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Defines a metric type and its schema. Once a metric descriptor is created, -// deleting or altering it stops data collection and makes the metric type's -// existing data unusable. -message MetricDescriptor { - // The kind of measurement. It describes how the data is reported. - enum MetricKind { - // Do not use this default value. - METRIC_KIND_UNSPECIFIED = 0; - - // An instantaneous measurement of a value. - GAUGE = 1; - - // The change in a value during a time interval. - DELTA = 2; - - // A value accumulated over a time interval. Cumulative - // measurements in a time series should have the same start time - // and increasing end times, until an event resets the cumulative - // value to zero and sets a new start time for the following - // points. - CUMULATIVE = 3; - } - - // The value type of a metric. - enum ValueType { - // Do not use this default value. - VALUE_TYPE_UNSPECIFIED = 0; - - // The value is a boolean. - // This value type can be used only if the metric kind is `GAUGE`. - BOOL = 1; - - // The value is a signed 64-bit integer. - INT64 = 2; - - // The value is a double precision floating point number. - DOUBLE = 3; - - // The value is a text string. - // This value type can be used only if the metric kind is `GAUGE`. - STRING = 4; - - // The value is a [`Distribution`][google.api.Distribution]. - DISTRIBUTION = 5; - - // The value is money. - MONEY = 6; - } - - // The resource name of the metric descriptor. Depending on the - // implementation, the name typically includes: (1) the parent resource name - // that defines the scope of the metric type or of its data; and (2) the - // metric's URL-encoded type, which also appears in the `type` field of this - // descriptor. For example, following is the resource name of a custom - // metric within the GCP project `my-project-id`: - // - // "projects/my-project-id/metricDescriptors/custom.googleapis.com%2Finvoice%2Fpaid%2Famount" - string name = 1; - - // The metric type, including its DNS name prefix. The type is not - // URL-encoded. All user-defined custom metric types have the DNS name - // `custom.googleapis.com`. Metric types should use a natural hierarchical - // grouping. For example: - // - // "custom.googleapis.com/invoice/paid/amount" - // "appengine.googleapis.com/http/server/response_latencies" - string type = 8; - - // The set of labels that can be used to describe a specific - // instance of this metric type. For example, the - // `appengine.googleapis.com/http/server/response_latencies` metric - // type has a label for the HTTP response code, `response_code`, so - // you can look at latencies for successful responses or just - // for responses that failed. - repeated LabelDescriptor labels = 2; - - // Whether the metric records instantaneous values, changes to a value, etc. - // Some combinations of `metric_kind` and `value_type` might not be supported. - MetricKind metric_kind = 3; - - // Whether the measurement is an integer, a floating-point number, etc. - // Some combinations of `metric_kind` and `value_type` might not be supported. - ValueType value_type = 4; - - // The unit in which the metric value is reported. It is only applicable - // if the `value_type` is `INT64`, `DOUBLE`, or `DISTRIBUTION`. The - // supported units are a subset of [The Unified Code for Units of - // Measure](http://unitsofmeasure.org/ucum.html) standard: - // - // **Basic units (UNIT)** - // - // * `bit` bit - // * `By` byte - // * `s` second - // * `min` minute - // * `h` hour - // * `d` day - // - // **Prefixes (PREFIX)** - // - // * `k` kilo (10**3) - // * `M` mega (10**6) - // * `G` giga (10**9) - // * `T` tera (10**12) - // * `P` peta (10**15) - // * `E` exa (10**18) - // * `Z` zetta (10**21) - // * `Y` yotta (10**24) - // * `m` milli (10**-3) - // * `u` micro (10**-6) - // * `n` nano (10**-9) - // * `p` pico (10**-12) - // * `f` femto (10**-15) - // * `a` atto (10**-18) - // * `z` zepto (10**-21) - // * `y` yocto (10**-24) - // * `Ki` kibi (2**10) - // * `Mi` mebi (2**20) - // * `Gi` gibi (2**30) - // * `Ti` tebi (2**40) - // - // **Grammar** - // - // The grammar includes the dimensionless unit `1`, such as `1/s`. - // - // The grammar also includes these connectors: - // - // * `/` division (as an infix operator, e.g. `1/s`). - // * `.` multiplication (as an infix operator, e.g. `GBy.d`) - // - // The grammar for a unit is as follows: - // - // Expression = Component { "." Component } { "/" Component } ; - // - // Component = [ PREFIX ] UNIT [ Annotation ] - // | Annotation - // | "1" - // ; - // - // Annotation = "{" NAME "}" ; - // - // Notes: - // - // * `Annotation` is just a comment if it follows a `UNIT` and is - // equivalent to `1` if it is used alone. For examples, - // `{requests}/s == 1/s`, `By{transmitted}/s == By/s`. - // * `NAME` is a sequence of non-blank printable ASCII characters not - // containing '{' or '}'. - string unit = 5; - - // A detailed description of the metric, which can be used in documentation. - string description = 6; - - // A concise name for the metric, which can be displayed in user interfaces. - // Use sentence case without an ending period, for example "Request count". - string display_name = 7; -} - -// A specific metric, identified by specifying values for all of the -// labels of a [`MetricDescriptor`][google.api.MetricDescriptor]. -message Metric { - // An existing metric type, see [google.api.MetricDescriptor][google.api.MetricDescriptor]. - // For example, `custom.googleapis.com/invoice/paid/amount`. - string type = 3; - - // The set of label values that uniquely identify this metric. All - // labels listed in the `MetricDescriptor` must be assigned values. - map labels = 2; -} diff --git a/handwritten/pubsub/protos/google/api/monitored_resource.proto b/handwritten/pubsub/protos/google/api/monitored_resource.proto deleted file mode 100644 index 612ffa18da4..00000000000 --- a/handwritten/pubsub/protos/google/api/monitored_resource.proto +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/label.proto"; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/monitoredres;monitoredres"; -option java_multiple_files = true; -option java_outer_classname = "MonitoredResourceProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// An object that describes the schema of a [MonitoredResource][google.api.MonitoredResource] object using a -// type name and a set of labels. For example, the monitored resource -// descriptor for Google Compute Engine VM instances has a type of -// `"gce_instance"` and specifies the use of the labels `"instance_id"` and -// `"zone"` to identify particular VM instances. -// -// Different APIs can support different monitored resource types. APIs generally -// provide a `list` method that returns the monitored resource descriptors used -// by the API. -message MonitoredResourceDescriptor { - // Optional. The resource name of the monitored resource descriptor: - // `"projects/{project_id}/monitoredResourceDescriptors/{type}"` where - // {type} is the value of the `type` field in this object and - // {project_id} is a project ID that provides API-specific context for - // accessing the type. APIs that do not use project information can use the - // resource name format `"monitoredResourceDescriptors/{type}"`. - string name = 5; - - // Required. The monitored resource type. For example, the type - // `"cloudsql_database"` represents databases in Google Cloud SQL. - // The maximum length of this value is 256 characters. - string type = 1; - - // Optional. A concise name for the monitored resource type that might be - // displayed in user interfaces. It should be a Title Cased Noun Phrase, - // without any article or other determiners. For example, - // `"Google Cloud SQL Database"`. - string display_name = 2; - - // Optional. A detailed description of the monitored resource type that might - // be used in documentation. - string description = 3; - - // Required. A set of labels used to describe instances of this monitored - // resource type. For example, an individual Google Cloud SQL database is - // identified by values for the labels `"database_id"` and `"zone"`. - repeated LabelDescriptor labels = 4; -} - -// An object representing a resource that can be used for monitoring, logging, -// billing, or other purposes. Examples include virtual machine instances, -// databases, and storage devices such as disks. The `type` field identifies a -// [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] object that describes the resource's -// schema. Information in the `labels` field identifies the actual resource and -// its attributes according to the schema. For example, a particular Compute -// Engine VM instance could be represented by the following object, because the -// [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] for `"gce_instance"` has labels -// `"instance_id"` and `"zone"`: -// -// { "type": "gce_instance", -// "labels": { "instance_id": "12345678901234", -// "zone": "us-central1-a" }} -message MonitoredResource { - // Required. The monitored resource type. This field must match - // the `type` field of a [MonitoredResourceDescriptor][google.api.MonitoredResourceDescriptor] object. For - // example, the type of a Cloud SQL database is `"cloudsql_database"`. - string type = 1; - - // Required. Values for all of the labels listed in the associated monitored - // resource descriptor. For example, Cloud SQL databases use the labels - // `"database_id"` and `"zone"`. - map labels = 2; -} diff --git a/handwritten/pubsub/protos/google/api/monitoring.proto b/handwritten/pubsub/protos/google/api/monitoring.proto deleted file mode 100644 index f49c85f85ee..00000000000 --- a/handwritten/pubsub/protos/google/api/monitoring.proto +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "MonitoringProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Monitoring configuration of the service. -// -// The example below shows how to configure monitored resources and metrics -// for monitoring. In the example, a monitored resource and two metrics are -// defined. The `library.googleapis.com/book/returned_count` metric is sent -// to both producer and consumer projects, whereas the -// `library.googleapis.com/book/overdue_count` metric is only sent to the -// consumer project. -// -// monitored_resources: -// - type: library.googleapis.com/branch -// labels: -// - key: /city -// description: The city where the library branch is located in. -// - key: /name -// description: The name of the branch. -// metrics: -// - name: library.googleapis.com/book/returned_count -// metric_kind: DELTA -// value_type: INT64 -// labels: -// - key: /customer_id -// - name: library.googleapis.com/book/overdue_count -// metric_kind: GAUGE -// value_type: INT64 -// labels: -// - key: /customer_id -// monitoring: -// producer_destinations: -// - monitored_resource: library.googleapis.com/branch -// metrics: -// - library.googleapis.com/book/returned_count -// consumer_destinations: -// - monitored_resource: library.googleapis.com/branch -// metrics: -// - library.googleapis.com/book/returned_count -// - library.googleapis.com/book/overdue_count -message Monitoring { - // Configuration of a specific monitoring destination (the producer project - // or the consumer project). - message MonitoringDestination { - // The monitored resource type. The type must be defined in - // [Service.monitored_resources][google.api.Service.monitored_resources] section. - string monitored_resource = 1; - - // Names of the metrics to report to this monitoring destination. - // Each name must be defined in [Service.metrics][google.api.Service.metrics] section. - repeated string metrics = 2; - } - - // Monitoring configurations for sending metrics to the producer project. - // There can be multiple producer destinations, each one must have a - // different monitored resource type. A metric can be used in at most - // one producer destination. - repeated MonitoringDestination producer_destinations = 1; - - // Monitoring configurations for sending metrics to the consumer project. - // There can be multiple consumer destinations, each one must have a - // different monitored resource type. A metric can be used in at most - // one consumer destination. - repeated MonitoringDestination consumer_destinations = 2; -} diff --git a/handwritten/pubsub/protos/google/api/quota.proto b/handwritten/pubsub/protos/google/api/quota.proto deleted file mode 100644 index aa327a19694..00000000000 --- a/handwritten/pubsub/protos/google/api/quota.proto +++ /dev/null @@ -1,259 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "QuotaProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Quota configuration helps to achieve fairness and budgeting in service -// usage. -// -// The quota configuration works this way: -// - The service configuration defines a set of metrics. -// - For API calls, the quota.metric_rules maps methods to metrics with -// corresponding costs. -// - The quota.limits defines limits on the metrics, which will be used for -// quota checks at runtime. -// -// An example quota configuration in yaml format: -// -// quota: -// limits: -// -// - name: apiWriteQpsPerProject -// metric: library.googleapis.com/write_calls -// unit: "1/min/{project}" # rate limit for consumer projects -// values: -// STANDARD: 10000 -// -// # The metric rules bind all methods to the read_calls metric, -// # except for the UpdateBook and DeleteBook methods. These two methods -// # are mapped to the write_calls metric, with the UpdateBook method -// # consuming at twice rate as the DeleteBook method. -// metric_rules: -// - selector: "*" -// metric_costs: -// library.googleapis.com/read_calls: 1 -// - selector: google.example.library.v1.LibraryService.UpdateBook -// metric_costs: -// library.googleapis.com/write_calls: 2 -// - selector: google.example.library.v1.LibraryService.DeleteBook -// metric_costs: -// library.googleapis.com/write_calls: 1 -// -// Corresponding Metric definition: -// -// metrics: -// - name: library.googleapis.com/read_calls -// display_name: Read requests -// metric_kind: DELTA -// value_type: INT64 -// -// - name: library.googleapis.com/write_calls -// display_name: Write requests -// metric_kind: DELTA -// value_type: INT64 -// -message Quota { - // List of `QuotaLimit` definitions for the service. - // - // Used by metric-based quotas only. - repeated QuotaLimit limits = 3; - - // List of `MetricRule` definitions, each one mapping a selected method to one - // or more metrics. - // - // Used by metric-based quotas only. - repeated MetricRule metric_rules = 4; -} - -// Bind API methods to metrics. Binding a method to a metric causes that -// metric's configured quota, billing, and monitoring behaviors to apply to the -// method call. -// -// Used by metric-based quotas only. -message MetricRule { - // Selects the methods to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // Metrics to update when the selected methods are called, and the associated - // cost applied to each metric. - // - // The key of the map is the metric name, and the values are the amount - // increased for the metric against which the quota limits are defined. - // The value must not be negative. - map metric_costs = 2; -} - -// `QuotaLimit` defines a specific limit that applies over a specified duration -// for a limit type. There can be at most one limit for a duration and limit -// type combination defined within a `QuotaGroup`. -message QuotaLimit { - // Name of the quota limit. The name is used to refer to the limit when - // overriding the default limit on per-consumer basis. - // - // For group-based quota limits, the name must be unique within the quota - // group. If a name is not provided, it will be generated from the limit_by - // and duration fields. - // - // For metric-based quota limits, the name must be provided, and it must be - // unique within the service. The name can only include alphanumeric - // characters as well as '-'. - // - // The maximum length of the limit name is 64 characters. - // - // The name of a limit is used as a unique identifier for this limit. - // Therefore, once a limit has been put into use, its name should be - // immutable. You can use the display_name field to provide a user-friendly - // name for the limit. The display name can be evolved over time without - // affecting the identity of the limit. - string name = 6; - - // Optional. User-visible, extended description for this quota limit. - // Should be used only when more context is needed to understand this limit - // than provided by the limit's display name (see: `display_name`). - string description = 2; - - // Default number of tokens that can be consumed during the specified - // duration. This is the number of tokens assigned when a client - // application developer activates the service for his/her project. - // - // Specifying a value of 0 will block all requests. This can be used if you - // are provisioning quota to selected consumers and blocking others. - // Similarly, a value of -1 will indicate an unlimited quota. No other - // negative values are allowed. - // - // Used by group-based quotas only. - int64 default_limit = 3; - - // Maximum number of tokens that can be consumed during the specified - // duration. Client application developers can override the default limit up - // to this maximum. If specified, this value cannot be set to a value less - // than the default limit. If not specified, it is set to the default limit. - // - // To allow clients to apply overrides with no upper bound, set this to -1, - // indicating unlimited maximum quota. - // - // Used by group-based quotas only. - int64 max_limit = 4; - - // Free tier value displayed in the Developers Console for this limit. - // The free tier is the number of tokens that will be subtracted from the - // billed amount when billing is enabled. - // This field can only be set on a limit with duration "1d", in a billable - // group; it is invalid on any other limit. If this field is not set, it - // defaults to 0, indicating that there is no free tier for this service. - // - // Used by group-based quotas only. - int64 free_tier = 7; - - // Duration of this limit in textual notation. Example: "100s", "24h", "1d". - // For duration longer than a day, only multiple of days is supported. We - // support only "100s" and "1d" for now. Additional support will be added in - // the future. "0" indicates indefinite duration. - // - // Used by group-based quotas only. - string duration = 5; - - // The name of the metric this quota limit applies to. The quota limits with - // the same metric will be checked together during runtime. The metric must be - // defined within the service config. - // - // Used by metric-based quotas only. - string metric = 8; - - // Specify the unit of the quota limit. It uses the same syntax as - // [Metric.unit][]. The supported unit kinds are determined by the quota - // backend system. - // - // The [Google Service Control](https://cloud.google.com/service-control) - // supports the following unit components: - // * One of the time intevals: - // * "/min" for quota every minute. - // * "/d" for quota every 24 hours, starting 00:00 US Pacific Time. - // * Otherwise the quota won't be reset by time, such as storage limit. - // * One and only one of the granted containers: - // * "/{organization}" quota for an organization. - // * "/{project}" quota for a project. - // * "/{folder}" quota for a folder. - // * "/{resource}" quota for a universal resource. - // * Zero or more quota segmentation dimension. Not all combos are valid. - // * "/{region}" quota for every region. Not to be used with time intervals. - // * Otherwise the resources granted on the target is not segmented. - // * "/{zone}" quota for every zone. Not to be used with time intervals. - // * Otherwise the resources granted on the target is not segmented. - // * "/{resource}" quota for a resource associated with a project or org. - // - // Here are some examples: - // * "1/min/{project}" for quota per minute per project. - // * "1/min/{user}" for quota per minute per user. - // * "1/min/{organization}" for quota per minute per organization. - // - // Note: the order of unit components is insignificant. - // The "1" at the beginning is required to follow the metric unit syntax. - // - // Used by metric-based quotas only. - string unit = 9; - - // Tiered limit values. Also allows for regional or zone overrides for these - // values if "/{region}" or "/{zone}" is specified in the unit field. - // - // Currently supported tiers from low to high: - // VERY_LOW, LOW, STANDARD, HIGH, VERY_HIGH - // - // To apply different limit values for users according to their tiers, specify - // the values for the tiers you want to differentiate. For example: - // {LOW:100, STANDARD:500, HIGH:1000, VERY_HIGH:5000} - // - // The limit value for each tier is optional except for the tier STANDARD. - // The limit value for an unspecified tier falls to the value of its next - // tier towards tier STANDARD. For the above example, the limit value for tier - // STANDARD is 500. - // - // To apply the same limit value for all users, just specify limit value for - // tier STANDARD. For example: {STANDARD:500}. - // - // To apply a regional overide for a tier, add a map entry with key - // "/", where is a region name. Similarly, for a zone - // override, add a map entry with key "/{zone}". - // Further, a wildcard can be used at the end of a zone name in order to - // specify zone level overrides. For example: - // LOW: 10, STANDARD: 50, HIGH: 100, - // LOW/us-central1: 20, STANDARD/us-central1: 60, HIGH/us-central1: 200, - // LOW/us-central1-*: 10, STANDARD/us-central1-*: 20, HIGH/us-central1-*: 80 - // - // The regional overrides tier set for each region must be the same as - // the tier set for default limit values. Same rule applies for zone overrides - // tier as well. - // - // Used by metric-based quotas only. - map values = 10; - - // User-visible display name for this limit. - // Optional. If not set, the UI will provide a default display name based on - // the quota configuration. This field can be used to override the default - // display name generated from the configuration. - string display_name = 12; -} diff --git a/handwritten/pubsub/protos/google/api/service.proto b/handwritten/pubsub/protos/google/api/service.proto deleted file mode 100644 index 04c7fd700b1..00000000000 --- a/handwritten/pubsub/protos/google/api/service.proto +++ /dev/null @@ -1,176 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; -import "google/api/auth.proto"; -import "google/api/backend.proto"; -import "google/api/context.proto"; -import "google/api/control.proto"; -import "google/api/documentation.proto"; -import "google/api/endpoint.proto"; -import "google/api/experimental/experimental.proto"; -import "google/api/http.proto"; -import "google/api/label.proto"; -import "google/api/log.proto"; -import "google/api/logging.proto"; -import "google/api/metric.proto"; -import "google/api/monitored_resource.proto"; -import "google/api/monitoring.proto"; -import "google/api/quota.proto"; -import "google/api/source_info.proto"; -import "google/api/system_parameter.proto"; -import "google/api/usage.proto"; -import "google/protobuf/any.proto"; -import "google/protobuf/api.proto"; -import "google/protobuf/type.proto"; -import "google/protobuf/wrappers.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "ServiceProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// `Service` is the root object of Google service configuration schema. It -// describes basic information about a service, such as the name and the -// title, and delegates other aspects to sub-sections. Each sub-section is -// either a proto message or a repeated proto message that configures a -// specific aspect, such as auth. See each proto message definition for details. -// -// Example: -// -// type: google.api.Service -// config_version: 3 -// name: calendar.googleapis.com -// title: Google Calendar API -// apis: -// - name: google.calendar.v3.Calendar -// authentication: -// providers: -// - id: google_calendar_auth -// jwks_uri: https://www.googleapis.com/oauth2/v1/certs -// issuer: https://securetoken.google.com -// rules: -// - selector: "*" -// requirements: -// provider_id: google_calendar_auth -message Service { - // The version of the service configuration. The config version may - // influence interpretation of the configuration, for example, to - // determine defaults. This is documented together with applicable - // options. The current default for the config version itself is `3`. - google.protobuf.UInt32Value config_version = 20; - - // The DNS address at which this service is available, - // e.g. `calendar.googleapis.com`. - string name = 1; - - // A unique ID for a specific instance of this message, typically assigned - // by the client for tracking purpose. If empty, the server may choose to - // generate one instead. - string id = 33; - - // The product title associated with this service. - string title = 2; - - // The id of the Google developer project that owns the service. - // Members of this project can manage the service configuration, - // manage consumption of the service, etc. - string producer_project_id = 22; - - // A list of API interfaces exported by this service. Only the `name` field - // of the [google.protobuf.Api][google.protobuf.Api] needs to be provided by the configuration - // author, as the remaining fields will be derived from the IDL during the - // normalization process. It is an error to specify an API interface here - // which cannot be resolved against the associated IDL files. - repeated google.protobuf.Api apis = 3; - - // A list of all proto message types included in this API service. - // Types referenced directly or indirectly by the `apis` are - // automatically included. Messages which are not referenced but - // shall be included, such as types used by the `google.protobuf.Any` type, - // should be listed here by name. Example: - // - // types: - // - name: google.protobuf.Int32 - repeated google.protobuf.Type types = 4; - - // A list of all enum types included in this API service. Enums - // referenced directly or indirectly by the `apis` are automatically - // included. Enums which are not referenced but shall be included - // should be listed here by name. Example: - // - // enums: - // - name: google.someapi.v1.SomeEnum - repeated google.protobuf.Enum enums = 5; - - // Additional API documentation. - Documentation documentation = 6; - - // API backend configuration. - Backend backend = 8; - - // HTTP configuration. - Http http = 9; - - // Quota configuration. - Quota quota = 10; - - // Auth configuration. - Authentication authentication = 11; - - // Context configuration. - Context context = 12; - - // Configuration controlling usage of this service. - Usage usage = 15; - - // Configuration for network endpoints. If this is empty, then an endpoint - // with the same name as the service is automatically generated to service all - // defined APIs. - repeated Endpoint endpoints = 18; - - // Configuration for the service control plane. - Control control = 21; - - // Defines the logs used by this service. - repeated LogDescriptor logs = 23; - - // Defines the metrics used by this service. - repeated MetricDescriptor metrics = 24; - - // Defines the monitored resources used by this service. This is required - // by the [Service.monitoring][google.api.Service.monitoring] and [Service.logging][google.api.Service.logging] configurations. - repeated MonitoredResourceDescriptor monitored_resources = 25; - - // Logging configuration. - Logging logging = 27; - - // Monitoring configuration. - Monitoring monitoring = 28; - - // System parameter configuration. - SystemParameters system_parameters = 29; - - // Output only. The source information for this configuration if available. - SourceInfo source_info = 37; - - // Experimental configuration. - Experimental experimental = 101; -} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/check_error.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/check_error.proto deleted file mode 100644 index 4fa31cf4c26..00000000000 --- a/handwritten/pubsub/protos/google/api/servicecontrol/v1/check_error.proto +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api.servicecontrol.v1; - -import "google/api/annotations.proto"; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; -option java_multiple_files = true; -option java_outer_classname = "CheckErrorProto"; -option java_package = "com.google.api.servicecontrol.v1"; - - -// Defines the errors to be returned in -// [google.api.servicecontrol.v1.CheckResponse.check_errors][google.api.servicecontrol.v1.CheckResponse.check_errors]. -message CheckError { - // Error codes for Check responses. - enum Code { - // This is never used in `CheckResponse`. - ERROR_CODE_UNSPECIFIED = 0; - - // The consumer's project id was not found. - // Same as [google.rpc.Code.NOT_FOUND][]. - NOT_FOUND = 5; - - // The consumer doesn't have access to the specified resource. - // Same as [google.rpc.Code.PERMISSION_DENIED][]. - PERMISSION_DENIED = 7; - - // Quota check failed. Same as [google.rpc.Code.RESOURCE_EXHAUSTED][]. - RESOURCE_EXHAUSTED = 8; - - // The consumer hasn't activated the service. - SERVICE_NOT_ACTIVATED = 104; - - // The consumer cannot access the service because billing is disabled. - BILLING_DISABLED = 107; - - // The consumer's project has been marked as deleted (soft deletion). - PROJECT_DELETED = 108; - - // The consumer's project number or id does not represent a valid project. - PROJECT_INVALID = 114; - - // The IP address of the consumer is invalid for the specific consumer - // project. - IP_ADDRESS_BLOCKED = 109; - - // The referer address of the consumer request is invalid for the specific - // consumer project. - REFERER_BLOCKED = 110; - - // The client application of the consumer request is invalid for the - // specific consumer project. - CLIENT_APP_BLOCKED = 111; - - // The consumer's API key is invalid. - API_KEY_INVALID = 105; - - // The consumer's API Key has expired. - API_KEY_EXPIRED = 112; - - // The consumer's API Key was not found in config record. - API_KEY_NOT_FOUND = 113; - - // The backend server for looking up project id/number is unavailable. - NAMESPACE_LOOKUP_UNAVAILABLE = 300; - - // The backend server for checking service status is unavailable. - SERVICE_STATUS_UNAVAILABLE = 301; - - // The backend server for checking billing status is unavailable. - BILLING_STATUS_UNAVAILABLE = 302; - } - - // The error code. - Code code = 1; - - // Free-form text providing details on the error cause of the error. - string detail = 2; -} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/distribution.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/distribution.proto deleted file mode 100644 index 93ec2e4d675..00000000000 --- a/handwritten/pubsub/protos/google/api/servicecontrol/v1/distribution.proto +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api.servicecontrol.v1; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; -option java_multiple_files = true; -option java_outer_classname = "DistributionProto"; -option java_package = "com.google.api.servicecontrol.v1"; - - -// Distribution represents a frequency distribution of double-valued sample -// points. It contains the size of the population of sample points plus -// additional optional information: -// -// - the arithmetic mean of the samples -// - the minimum and maximum of the samples -// - the sum-squared-deviation of the samples, used to compute variance -// - a histogram of the values of the sample points -message Distribution { - // Describing buckets with constant width. - message LinearBuckets { - // The number of finite buckets. With the underflow and overflow buckets, - // the total number of buckets is `num_finite_buckets` + 2. - // See comments on `bucket_options` for details. - int32 num_finite_buckets = 1; - - // The i'th linear bucket covers the interval - // [offset + (i-1) * width, offset + i * width) - // where i ranges from 1 to num_finite_buckets, inclusive. - // Must be strictly positive. - double width = 2; - - // The i'th linear bucket covers the interval - // [offset + (i-1) * width, offset + i * width) - // where i ranges from 1 to num_finite_buckets, inclusive. - double offset = 3; - } - - // Describing buckets with exponentially growing width. - message ExponentialBuckets { - // The number of finite buckets. With the underflow and overflow buckets, - // the total number of buckets is `num_finite_buckets` + 2. - // See comments on `bucket_options` for details. - int32 num_finite_buckets = 1; - - // The i'th exponential bucket covers the interval - // [scale * growth_factor^(i-1), scale * growth_factor^i) - // where i ranges from 1 to num_finite_buckets inclusive. - // Must be larger than 1.0. - double growth_factor = 2; - - // The i'th exponential bucket covers the interval - // [scale * growth_factor^(i-1), scale * growth_factor^i) - // where i ranges from 1 to num_finite_buckets inclusive. - // Must be > 0. - double scale = 3; - } - - // Describing buckets with arbitrary user-provided width. - message ExplicitBuckets { - // 'bound' is a list of strictly increasing boundaries between - // buckets. Note that a list of length N-1 defines N buckets because - // of fenceposting. See comments on `bucket_options` for details. - // - // The i'th finite bucket covers the interval - // [bound[i-1], bound[i]) - // where i ranges from 1 to bound_size() - 1. Note that there are no - // finite buckets at all if 'bound' only contains a single element; in - // that special case the single bound defines the boundary between the - // underflow and overflow buckets. - // - // bucket number lower bound upper bound - // i == 0 (underflow) -inf bound[i] - // 0 < i < bound_size() bound[i-1] bound[i] - // i == bound_size() (overflow) bound[i-1] +inf - repeated double bounds = 1; - } - - // The total number of samples in the distribution. Must be >= 0. - int64 count = 1; - - // The arithmetic mean of the samples in the distribution. If `count` is - // zero then this field must be zero. - double mean = 2; - - // The minimum of the population of values. Ignored if `count` is zero. - double minimum = 3; - - // The maximum of the population of values. Ignored if `count` is zero. - double maximum = 4; - - // The sum of squared deviations from the mean: - // Sum[i=1..count]((x_i - mean)^2) - // where each x_i is a sample values. If `count` is zero then this field - // must be zero, otherwise validation of the request fails. - double sum_of_squared_deviation = 5; - - // The number of samples in each histogram bucket. `bucket_counts` are - // optional. If present, they must sum to the `count` value. - // - // The buckets are defined below in `bucket_option`. There are N buckets. - // `bucket_counts[0]` is the number of samples in the underflow bucket. - // `bucket_counts[1]` to `bucket_counts[N-1]` are the numbers of samples - // in each of the finite buckets. And `bucket_counts[N] is the number - // of samples in the overflow bucket. See the comments of `bucket_option` - // below for more details. - // - // Any suffix of trailing zeros may be omitted. - repeated int64 bucket_counts = 6; - - // Defines the buckets in the histogram. `bucket_option` and `bucket_counts` - // must be both set, or both unset. - // - // Buckets are numbered the the range of [0, N], with a total of N+1 buckets. - // There must be at least two buckets (a single-bucket histogram gives - // no information that isn't already provided by `count`). - // - // The first bucket is the underflow bucket which has a lower bound - // of -inf. The last bucket is the overflow bucket which has an - // upper bound of +inf. All other buckets (if any) are called "finite" - // buckets because they have finite lower and upper bounds. As described - // below, there are three ways to define the finite buckets. - // - // (1) Buckets with constant width. - // (2) Buckets with exponentially growing widths. - // (3) Buckets with arbitrary user-provided widths. - // - // In all cases, the buckets cover the entire real number line (-inf, - // +inf). Bucket upper bounds are exclusive and lower bounds are - // inclusive. The upper bound of the underflow bucket is equal to the - // lower bound of the smallest finite bucket; the lower bound of the - // overflow bucket is equal to the upper bound of the largest finite - // bucket. - oneof bucket_option { - // Buckets with constant width. - LinearBuckets linear_buckets = 7; - - // Buckets with exponentially growing width. - ExponentialBuckets exponential_buckets = 8; - - // Buckets with arbitrary user-provided width. - ExplicitBuckets explicit_buckets = 9; - } -} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/log_entry.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/log_entry.proto deleted file mode 100644 index fddb9851eca..00000000000 --- a/handwritten/pubsub/protos/google/api/servicecontrol/v1/log_entry.proto +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api.servicecontrol.v1; - -import "google/api/annotations.proto"; -import "google/logging/type/log_severity.proto"; -import "google/protobuf/any.proto"; -import "google/protobuf/struct.proto"; -import "google/protobuf/timestamp.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; -option java_multiple_files = true; -option java_outer_classname = "LogEntryProto"; -option java_package = "com.google.api.servicecontrol.v1"; - - -// An individual log entry. -message LogEntry { - // Required. The log to which this log entry belongs. Examples: `"syslog"`, - // `"book_log"`. - string name = 10; - - // The time the event described by the log entry occurred. If - // omitted, defaults to operation start time. - google.protobuf.Timestamp timestamp = 11; - - // The severity of the log entry. The default value is - // `LogSeverity.DEFAULT`. - google.logging.type.LogSeverity severity = 12; - - // A unique ID for the log entry used for deduplication. If omitted, - // the implementation will generate one based on operation_id. - string insert_id = 4; - - // A set of user-defined (key, value) data that provides additional - // information about the log entry. - map labels = 13; - - // The log entry payload, which can be one of multiple types. - oneof payload { - // The log entry payload, represented as a protocol buffer that is - // expressed as a JSON object. You can only pass `protoPayload` - // values that belong to a set of approved types. - google.protobuf.Any proto_payload = 2; - - // The log entry payload, represented as a Unicode string (UTF-8). - string text_payload = 3; - - // The log entry payload, represented as a structure that - // is expressed as a JSON object. - google.protobuf.Struct struct_payload = 6; - } -} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/metric_value.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/metric_value.proto deleted file mode 100644 index d5e5803b7a0..00000000000 --- a/handwritten/pubsub/protos/google/api/servicecontrol/v1/metric_value.proto +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api.servicecontrol.v1; - -import "google/api/annotations.proto"; -import "google/api/servicecontrol/v1/distribution.proto"; -import "google/protobuf/timestamp.proto"; -import "google/type/money.proto"; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; -option java_multiple_files = true; -option java_outer_classname = "MetricValueSetProto"; -option java_package = "com.google.api.servicecontrol.v1"; - - -// Represents a single metric value. -message MetricValue { - // The labels describing the metric value. - // See comments on [google.api.servicecontrol.v1.Operation.labels][google.api.servicecontrol.v1.Operation.labels] for - // the overriding relationship. - map labels = 1; - - // The start of the time period over which this metric value's measurement - // applies. The time period has different semantics for different metric - // types (cumulative, delta, and gauge). See the metric definition - // documentation in the service configuration for details. - google.protobuf.Timestamp start_time = 2; - - // The end of the time period over which this metric value's measurement - // applies. - google.protobuf.Timestamp end_time = 3; - - // The value. The type of value used in the request must - // agree with the metric definition in the service configuration, otherwise - // the MetricValue is rejected. - oneof value { - // A boolean value. - bool bool_value = 4; - - // A signed 64-bit integer value. - int64 int64_value = 5; - - // A double precision floating point value. - double double_value = 6; - - // A text string value. - string string_value = 7; - - // A distribution value. - Distribution distribution_value = 8; - } -} - -// Represents a set of metric values in the same metric. -// Each metric value in the set should have a unique combination of start time, -// end time, and label values. -message MetricValueSet { - // The metric name defined in the service configuration. - string metric_name = 1; - - // The values in this metric. - repeated MetricValue metric_values = 2; -} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/operation.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/operation.proto deleted file mode 100644 index 568108af539..00000000000 --- a/handwritten/pubsub/protos/google/api/servicecontrol/v1/operation.proto +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api.servicecontrol.v1; - -import "google/api/annotations.proto"; -import "google/api/servicecontrol/v1/log_entry.proto"; -import "google/api/servicecontrol/v1/metric_value.proto"; -import "google/protobuf/timestamp.proto"; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; -option java_multiple_files = true; -option java_outer_classname = "OperationProto"; -option java_package = "com.google.api.servicecontrol.v1"; - - -// Represents information regarding an operation. -message Operation { - // Defines the importance of the data contained in the operation. - enum Importance { - // The API implementation may cache and aggregate the data. - // The data may be lost when rare and unexpected system failures occur. - LOW = 0; - - // The API implementation doesn't cache and aggregate the data. - // If the method returns successfully, it's guaranteed that the data has - // been persisted in durable storage. - HIGH = 1; - } - - // Identity of the operation. This must be unique within the scope of the - // service that generated the operation. If the service calls - // Check() and Report() on the same operation, the two calls should carry - // the same id. - // - // UUID version 4 is recommended, though not required. - // In scenarios where an operation is computed from existing information - // and an idempotent id is desirable for deduplication purpose, UUID version 5 - // is recommended. See RFC 4122 for details. - string operation_id = 1; - - // Fully qualified name of the operation. Reserved for future use. - string operation_name = 2; - - // Identity of the consumer who is using the service. - // This field should be filled in for the operations initiated by a - // consumer, but not for service-initiated operations that are - // not related to a specific consumer. - // - // This can be in one of the following formats: - // project:, - // project_number:, - // api_key:. - string consumer_id = 3; - - // Required. Start time of the operation. - google.protobuf.Timestamp start_time = 4; - - // End time of the operation. - // Required when the operation is used in [ServiceController.Report][google.api.servicecontrol.v1.ServiceController.Report], - // but optional when the operation is used in [ServiceController.Check][google.api.servicecontrol.v1.ServiceController.Check]. - google.protobuf.Timestamp end_time = 5; - - // Labels describing the operation. Only the following labels are allowed: - // - // - Labels describing monitored resources as defined in - // the service configuration. - // - Default labels of metric values. When specified, labels defined in the - // metric value override these default. - // - The following labels defined by Google Cloud Platform: - // - `cloud.googleapis.com/location` describing the location where the - // operation happened, - // - `servicecontrol.googleapis.com/user_agent` describing the user agent - // of the API request, - // - `servicecontrol.googleapis.com/service_agent` describing the service - // used to handle the API request (e.g. ESP), - // - `servicecontrol.googleapis.com/platform` describing the platform - // where the API is served (e.g. GAE, GCE, GKE). - map labels = 6; - - // Represents information about this operation. Each MetricValueSet - // corresponds to a metric defined in the service configuration. - // The data type used in the MetricValueSet must agree with - // the data type specified in the metric definition. - // - // Within a single operation, it is not allowed to have more than one - // MetricValue instances that have the same metric names and identical - // label value combinations. If a request has such duplicated MetricValue - // instances, the entire request is rejected with - // an invalid argument error. - repeated MetricValueSet metric_value_sets = 7; - - // Represents information to be logged. - repeated LogEntry log_entries = 8; - - // DO NOT USE. This is an experimental field. - Importance importance = 11; -} diff --git a/handwritten/pubsub/protos/google/api/servicecontrol/v1/service_controller.proto b/handwritten/pubsub/protos/google/api/servicecontrol/v1/service_controller.proto deleted file mode 100644 index 2d0ec8e9fd7..00000000000 --- a/handwritten/pubsub/protos/google/api/servicecontrol/v1/service_controller.proto +++ /dev/null @@ -1,161 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api.servicecontrol.v1; - -import "google/api/annotations.proto"; -import "google/api/servicecontrol/v1/check_error.proto"; -import "google/api/servicecontrol/v1/operation.proto"; -import "google/rpc/status.proto"; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/servicecontrol/v1;servicecontrol"; -option java_multiple_files = true; -option java_outer_classname = "ServiceControllerProto"; -option java_package = "com.google.api.servicecontrol.v1"; -option objc_class_prefix = "GASC"; - - -// [Google Service Control API](/service-control/overview) -// -// Lets clients check and report operations against -// a [managed service][google.api.servicemanagement.v1.ManagedService]. -service ServiceController { - // Checks an operation with Google Service Control to decide whether - // the given operation should proceed. It should be called before the - // operation is executed. - // - // If feasible, the client should cache the check results and reuse them for - // up to 60s. In case of server errors, the client may rely on the cached - // results for longer time. - // - // This method requires the `servicemanagement.services.check` permission - // on the specified service. For more information, see - // [Google Cloud IAM](https://cloud.google.com/iam). - rpc Check(CheckRequest) returns (CheckResponse) { - option (google.api.http) = { post: "/v1/services/{service_name}:check" body: "*" }; - } - - // Reports operations to Google Service Control. It should be called - // after the operation is completed. - // - // If feasible, the client should aggregate reporting data for up to 5s to - // reduce API traffic. Limiting aggregation to 5s is to reduce data loss - // during client crashes. Clients should carefully choose the aggregation - // window to avoid data loss risk more than 0.01% for business and - // compliance reasons. - // - // This method requires the `servicemanagement.services.report` permission - // on the specified service. For more information, see - // [Google Cloud IAM](https://cloud.google.com/iam). - rpc Report(ReportRequest) returns (ReportResponse) { - option (google.api.http) = { post: "/v1/services/{service_name}:report" body: "*" }; - } -} - -// Request message for the Check method. -message CheckRequest { - // The service name as specified in its service configuration. For example, - // `"pubsub.googleapis.com"`. - // - // See [google.api.Service][google.api.Service] for the definition of a service name. - string service_name = 1; - - // The operation to be checked. - Operation operation = 2; - - // Specifies which version of service configuration should be used to process - // the request. - // - // If unspecified or no matching version can be found, the - // latest one will be used. - string service_config_id = 4; -} - -// Response message for the Check method. -message CheckResponse { - // The same operation_id value used in the CheckRequest. - // Used for logging and diagnostics purposes. - string operation_id = 1; - - // Indicate the decision of the check. - // - // If no check errors are present, the service should process the operation. - // Otherwise the service should use the list of errors to determine the - // appropriate action. - repeated CheckError check_errors = 2; - - // The actual config id used to process the request. - string service_config_id = 5; -} - -// Request message for the Report method. -message ReportRequest { - // The service name as specified in its service configuration. For example, - // `"pubsub.googleapis.com"`. - // - // See [google.api.Service][google.api.Service] for the definition of a service name. - string service_name = 1; - - // Operations to be reported. - // - // Typically the service should report one operation per request. - // Putting multiple operations into a single request is allowed, but should - // be used only when multiple operations are natually available at the time - // of the report. - // - // If multiple operations are in a single request, the total request size - // should be no larger than 1MB. See [ReportResponse.report_errors][google.api.servicecontrol.v1.ReportResponse.report_errors] for - // partial failure behavior. - repeated Operation operations = 2; - - // Specifies which version of service config should be used to process the - // request. - // - // If unspecified or no matching version can be found, the - // latest one will be used. - string service_config_id = 3; -} - -// Response message for the Report method. -message ReportResponse { - // Represents the processing error of one `Operation` in the request. - message ReportError { - // The [Operation.operation_id][google.api.servicecontrol.v1.Operation.operation_id] value from the request. - string operation_id = 1; - - // Details of the error when processing the `Operation`. - google.rpc.Status status = 2; - } - - // Partial failures, one for each `Operation` in the request that failed - // processing. There are three possible combinations of the RPC status: - // - // 1. The combination of a successful RPC status and an empty `report_errors` - // list indicates a complete success where all `Operations` in the - // request are processed successfully. - // 2. The combination of a successful RPC status and a non-empty - // `report_errors` list indicates a partial success where some - // `Operations` in the request succeeded. Each - // `Operation` that failed processing has a corresponding item - // in this list. - // 3. A failed RPC status indicates a complete failure where none of the - // `Operations` in the request succeeded. - repeated ReportError report_errors = 1; - - // The actual config id used to process the request. - string service_config_id = 2; -} diff --git a/handwritten/pubsub/protos/google/api/servicemanagement/v1/resources.proto b/handwritten/pubsub/protos/google/api/servicemanagement/v1/resources.proto deleted file mode 100644 index 0d0f34d62ef..00000000000 --- a/handwritten/pubsub/protos/google/api/servicemanagement/v1/resources.proto +++ /dev/null @@ -1,286 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api.servicemanagement.v1; - -import "google/api/annotations.proto"; -import "google/api/config_change.proto"; -import "google/api/service.proto"; -import "google/longrunning/operations.proto"; -import "google/protobuf/any.proto"; -import "google/protobuf/field_mask.proto"; -import "google/protobuf/struct.proto"; -import "google/protobuf/timestamp.proto"; -import "google/rpc/status.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/servicemanagement/v1;servicemanagement"; -option java_multiple_files = true; -option java_outer_classname = "ResourcesProto"; -option java_package = "com.google.api.servicemanagement.v1"; -option objc_class_prefix = "GASM"; - - -// The full representation of a Service that is managed by -// Google Service Management. -message ManagedService { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. - string service_name = 2; - - // ID of the project that produces and owns this service. - string producer_project_id = 3; -} - -// The metadata associated with a long running operation resource. -message OperationMetadata { - // Represents the status of one operation step. - message Step { - // The short description of the step. - string description = 2; - - // The status code. - Status status = 4; - } - - // Code describes the status of one operation step. - enum Status { - // Unspecifed code. - STATUS_UNSPECIFIED = 0; - - // The step has completed without errors. - DONE = 1; - - // The step has not started yet. - NOT_STARTED = 2; - - // The step is in progress. - IN_PROGRESS = 3; - - // The step has completed with errors. - FAILED = 4; - - // The step has completed with cancellation. - CANCELLED = 5; - } - - // The full name of the resources that this operation is directly - // associated with. - repeated string resource_names = 1; - - // Detailed status information for each step. The order is undetermined. - repeated Step steps = 2; - - // Percentage of completion of this operation, ranging from 0 to 100. - int32 progress_percentage = 3; - - // The start time of the operation. - google.protobuf.Timestamp start_time = 4; -} - -// Represents a diagnostic message (error or warning) -message Diagnostic { - // The kind of diagnostic information possible. - enum Kind { - // Warnings and errors - WARNING = 0; - - // Only errors - ERROR = 1; - } - - // File name and line number of the error or warning. - string location = 1; - - // The kind of diagnostic information provided. - Kind kind = 2; - - // Message describing the error or warning. - string message = 3; -} - -// Represents a source file which is used to generate the service configuration -// defined by `google.api.Service`. -message ConfigSource { - // A unique ID for a specific instance of this message, typically assigned - // by the client for tracking purpose. If empty, the server may choose to - // generate one instead. - string id = 5; - - // Set of source configuration files that are used to generate a service - // configuration (`google.api.Service`). - repeated ConfigFile files = 2; -} - -// Generic specification of a source configuration file -message ConfigFile { - enum FileType { - // Unknown file type. - FILE_TYPE_UNSPECIFIED = 0; - - // YAML-specification of service. - SERVICE_CONFIG_YAML = 1; - - // OpenAPI specification, serialized in JSON. - OPEN_API_JSON = 2; - - // OpenAPI specification, serialized in YAML. - OPEN_API_YAML = 3; - - // FileDescriptorSet, generated by protoc. - // - // To generate, use protoc with imports and source info included. - // For an example test.proto file, the following command would put the value - // in a new file named out.pb. - // - // $protoc --include_imports --include_source_info test.proto -o out.pb - FILE_DESCRIPTOR_SET_PROTO = 4; - } - - // The file name of the configuration file (full or relative path). - string file_path = 1; - - // The bytes that constitute the file. - bytes file_contents = 3; - - // The type of configuration file this represents. - FileType file_type = 4; -} - -// Represents a service configuration with its name and id. -message ConfigRef { - // Resource name of a service config. It must have the following - // format: "services/{service name}/configs/{config id}". - string name = 1; -} - -// Change report associated with a particular service configuration. -// -// It contains a list of ConfigChanges based on the comparison between -// two service configurations. -message ChangeReport { - // List of changes between two service configurations. - // The changes will be alphabetically sorted based on the identifier - // of each change. - // A ConfigChange identifier is a dot separated path to the configuration. - // Example: visibility.rules[selector='LibraryService.CreateBook'].restriction - repeated google.api.ConfigChange config_changes = 1; -} - -// A rollout resource that defines how service configuration versions are pushed -// to control plane systems. Typically, you create a new version of the -// service config, and then create a Rollout to push the service config. -message Rollout { - // Strategy that specifies how Google Service Control should select - // different - // versions of service configurations based on traffic percentage. - // - // One example of how to gradually rollout a new service configuration using - // this - // strategy: - // Day 1 - // - // Rollout { - // id: "example.googleapis.com/rollout_20160206" - // traffic_percent_strategy { - // percentages: { - // "example.googleapis.com/20160201": 70.00 - // "example.googleapis.com/20160206": 30.00 - // } - // } - // } - // - // Day 2 - // - // Rollout { - // id: "example.googleapis.com/rollout_20160207" - // traffic_percent_strategy: { - // percentages: { - // "example.googleapis.com/20160206": 100.00 - // } - // } - // } - message TrafficPercentStrategy { - // Maps service configuration IDs to their corresponding traffic percentage. - // Key is the service configuration ID, Value is the traffic percentage - // which must be greater than 0.0 and the sum must equal to 100.0. - map percentages = 1; - } - - // Strategy used to delete a service. This strategy is a placeholder only - // used by the system generated rollout to delete a service. - message DeleteServiceStrategy { - - } - - // Status of a Rollout. - enum RolloutStatus { - // No status specified. - ROLLOUT_STATUS_UNSPECIFIED = 0; - - // The Rollout is in progress. - IN_PROGRESS = 1; - - // The Rollout has completed successfully. - SUCCESS = 2; - - // The Rollout has been cancelled. This can happen if you have overlapping - // Rollout pushes, and the previous ones will be cancelled. - CANCELLED = 3; - - // The Rollout has failed. It is typically caused by configuration errors. - FAILED = 4; - - // The Rollout has not started yet and is pending for execution. - PENDING = 5; - } - - // Optional unique identifier of this Rollout. Only lower case letters, digits - // and '-' are allowed. - // - // If not specified by client, the server will generate one. The generated id - // will have the form of , where "date" is the create - // date in ISO 8601 format. "revision number" is a monotonically increasing - // positive number that is reset every day for each service. - // An example of the generated rollout_id is '2016-02-16r1' - string rollout_id = 1; - - // Creation time of the rollout. Readonly. - google.protobuf.Timestamp create_time = 2; - - // The user who created the Rollout. Readonly. - string created_by = 3; - - // The status of this rollout. Readonly. In case of a failed rollout, - // the system will automatically rollback to the current Rollout - // version. Readonly. - RolloutStatus status = 4; - - // Strategy that defines which versions of service configurations should be - // pushed - // and how they should be used at runtime. - oneof strategy { - // Google Service Control selects service configurations based on - // traffic percentage. - TrafficPercentStrategy traffic_percent_strategy = 5; - - // The strategy associated with a rollout to delete a `ManagedService`. - // Readonly. - DeleteServiceStrategy delete_service_strategy = 200; - } - - // The name of the service associated with this Rollout. - string service_name = 8; -} diff --git a/handwritten/pubsub/protos/google/api/servicemanagement/v1/servicemanager.proto b/handwritten/pubsub/protos/google/api/servicemanagement/v1/servicemanager.proto deleted file mode 100644 index 62af1893ec2..00000000000 --- a/handwritten/pubsub/protos/google/api/servicemanagement/v1/servicemanager.proto +++ /dev/null @@ -1,392 +0,0 @@ -// Copyright 2016 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api.servicemanagement.v1; - -import "google/api/annotations.proto"; -import "google/api/service.proto"; -import "google/api/servicemanagement/v1/resources.proto"; -import "google/longrunning/operations.proto"; -import "google/protobuf/any.proto"; -import "google/protobuf/empty.proto"; -import "google/protobuf/field_mask.proto"; -import "google/protobuf/struct.proto"; -import "google/rpc/status.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/servicemanagement/v1;servicemanagement"; -option java_multiple_files = true; -option java_outer_classname = "ServiceManagerProto"; -option java_package = "com.google.api.servicemanagement.v1"; -option objc_class_prefix = "GASM"; - - -// [Google Service Management API](/service-management/overview) -service ServiceManager { - // Lists all managed services. - rpc ListServices(ListServicesRequest) returns (ListServicesResponse) { - option (google.api.http) = { get: "/v1/services" }; - } - - // Gets a managed service. - rpc GetService(GetServiceRequest) returns (ManagedService) { - option (google.api.http) = { get: "/v1/services/{service_name}" }; - } - - // Creates a new managed service. - // Please note one producer project can own no more than 20 services. - // - // Operation - rpc CreateService(CreateServiceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/services" body: "service" }; - } - - // Deletes a managed service. This method will change the serivce in the - // `Soft-Delete` state for 30 days. Within this period, service producers may - // call [UndeleteService][google.api.servicemanagement.v1.ServiceManager.UndeleteService] to restore the service. - // After 30 days, the service will be permanently deleted. - // - // Operation - rpc DeleteService(DeleteServiceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { delete: "/v1/services/{service_name}" }; - } - - // Revives a previously deleted managed service. The method restores the - // service using the configuration at the time the service was deleted. - // The target service must exist and must have been deleted within the - // last 30 days. - // - // Operation - rpc UndeleteService(UndeleteServiceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/services/{service_name}:undelete" body: "" }; - } - - // Lists the history of the service configuration for a managed service, - // from the newest to the oldest. - rpc ListServiceConfigs(ListServiceConfigsRequest) returns (ListServiceConfigsResponse) { - option (google.api.http) = { get: "/v1/services/{service_name}/configs" }; - } - - // Gets a service configuration (version) for a managed service. - rpc GetServiceConfig(GetServiceConfigRequest) returns (google.api.Service) { - option (google.api.http) = { get: "/v1/services/{service_name}/configs/{config_id}" }; - } - - // Creates a new service configuration (version) for a managed service. - // This method only stores the service configuration. To roll out the service - // configuration to backend systems please call - // [CreateServiceRollout][google.api.servicemanagement.v1.ServiceManager.CreateServiceRollout]. - rpc CreateServiceConfig(CreateServiceConfigRequest) returns (google.api.Service) { - option (google.api.http) = { post: "/v1/services/{service_name}/configs" body: "service_config" }; - } - - // Creates a new service configuration (version) for a managed service based - // on - // user-supplied configuration source files (for example: OpenAPI - // Specification). This method stores the source configurations as well as the - // generated service configuration. To rollout the service configuration to - // other services, - // please call [CreateServiceRollout][google.api.servicemanagement.v1.ServiceManager.CreateServiceRollout]. - // - // Operation - rpc SubmitConfigSource(SubmitConfigSourceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/services/{service_name}/configs:submit" body: "*" }; - } - - // Lists the history of the service configuration rollouts for a managed - // service, from the newest to the oldest. - rpc ListServiceRollouts(ListServiceRolloutsRequest) returns (ListServiceRolloutsResponse) { - option (google.api.http) = { get: "/v1/services/{service_name}/rollouts" }; - } - - // Gets a service configuration [rollout][google.api.servicemanagement.v1.Rollout]. - rpc GetServiceRollout(GetServiceRolloutRequest) returns (Rollout) { - option (google.api.http) = { get: "/v1/services/{service_name}/rollouts/{rollout_id}" }; - } - - // Creates a new service configuration rollout. Based on rollout, the - // Google Service Management will roll out the service configurations to - // different backend services. For example, the logging configuration will be - // pushed to Google Cloud Logging. - // - // Please note that any previous pending and running Rollouts and associated - // Operations will be automatically cancelled so that the latest Rollout will - // not be blocked by previous Rollouts. - // - // Operation - rpc CreateServiceRollout(CreateServiceRolloutRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/services/{service_name}/rollouts" body: "rollout" }; - } - - // Generates and returns a report (errors, warnings and changes from - // existing configurations) associated with - // GenerateConfigReportRequest.new_value - // - // If GenerateConfigReportRequest.old_value is specified, - // GenerateConfigReportRequest will contain a single ChangeReport based on the - // comparison between GenerateConfigReportRequest.new_value and - // GenerateConfigReportRequest.old_value. - // If GenerateConfigReportRequest.old_value is not specified, this method - // will compare GenerateConfigReportRequest.new_value with the last pushed - // service configuration. - rpc GenerateConfigReport(GenerateConfigReportRequest) returns (GenerateConfigReportResponse) { - option (google.api.http) = { post: "/v1/services:generateConfigReport" body: "*" }; - } - - // Enable a managed service for a project with default setting. - // - // Operation - // - // [google.rpc.Status][google.rpc.Status] errors may contain a - // [google.rpc.PreconditionFailure][] error detail. - rpc EnableService(EnableServiceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/services/{service_name}:enable" body: "*" }; - } - - // Disable a managed service for a project. - // - // Operation - rpc DisableService(DisableServiceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/services/{service_name}:disable" body: "*" }; - } -} - -// Request message for `ListServices` method. -message ListServicesRequest { - // Include services produced by the specified project. - string producer_project_id = 1; - - // Requested size of the next page of data. - int32 page_size = 5; - - // Token identifying which result to start with; returned by a previous list - // call. - string page_token = 6; -} - -// Response message for `ListServices` method. -message ListServicesResponse { - // The results of the query. - repeated ManagedService services = 1; - - // Token that can be passed to `ListServices` to resume a paginated query. - string next_page_token = 2; -} - -// Request message for `GetService` method. -message GetServiceRequest { - // The name of the service. See the `ServiceManager` overview for naming - // requirements. For example: `example.googleapis.com`. - string service_name = 1; -} - -// Request message for CreateService method. -message CreateServiceRequest { - // Initial values for the service resource. - ManagedService service = 1; -} - -// Request message for DeleteService method. -message DeleteServiceRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; -} - -// Request message for UndeleteService method. -message UndeleteServiceRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; -} - -// Response message for UndeleteService method. -message UndeleteServiceResponse { - // Revived service resource. - ManagedService service = 1; -} - -// Request message for GetServiceConfig method. -message GetServiceConfigRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; - - string config_id = 2; -} - -// Request message for ListServiceConfigs method. -message ListServiceConfigsRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; - - // The token of the page to retrieve. - string page_token = 2; - - // The max number of items to include in the response list. - int32 page_size = 3; -} - -// Response message for ListServiceConfigs method. -message ListServiceConfigsResponse { - // The list of service configuration resources. - repeated google.api.Service service_configs = 1; - - // The token of the next page of results. - string next_page_token = 2; -} - -// Request message for CreateServiceConfig method. -message CreateServiceConfigRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; - - // The service configuration resource. - google.api.Service service_config = 2; -} - -// Request message for SubmitConfigSource method. -message SubmitConfigSourceRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; - - // The source configuration for the service. - ConfigSource config_source = 2; - - // Optional. If set, this will result in the generation of a - // `google.api.Service` configuration based on the `ConfigSource` provided, - // but the generated config and the sources will NOT be persisted. - bool validate_only = 3; -} - -// Response message for SubmitConfigSource method. -message SubmitConfigSourceResponse { - // The generated service configuration. - google.api.Service service_config = 1; -} - -// Request message for 'CreateServiceRollout' -message CreateServiceRolloutRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; - - // The rollout resource. The `service_name` field is output only. - Rollout rollout = 2; -} - -// Request message for 'ListServiceRollouts' -message ListServiceRolloutsRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; - - // The token of the page to retrieve. - string page_token = 2; - - // The max number of items to include in the response list. - int32 page_size = 3; -} - -// Response message for ListServiceRollouts method. -message ListServiceRolloutsResponse { - // The list of rollout resources. - repeated Rollout rollouts = 1; - - // The token of the next page of results. - string next_page_token = 2; -} - -// Request message for GetServiceRollout method. -message GetServiceRolloutRequest { - // The name of the service. See the [overview](/service-management/overview) - // for naming requirements. For example: `example.googleapis.com`. - string service_name = 1; - - // The id of the rollout resource. - string rollout_id = 2; -} - -// Request message for EnableService method. -message EnableServiceRequest { - // Name of the service to enable. Specifying an unknown service name will - // cause the request to fail. - string service_name = 1; - - // The identity of consumer resource which service enablement will be - // applied to. - // - // The Google Service Management implementation accepts the following - // forms: "project:", "project_number:". - // - // Note: this is made compatible with - // google.api.servicecontrol.v1.Operation.consumer_id. - string consumer_id = 2; -} - -// Request message for DisableService method. -message DisableServiceRequest { - // Name of the service to disable. Specifying an unknown service name - // will cause the request to fail. - string service_name = 1; - - // The identity of consumer resource which service disablement will be - // applied to. - // - // The Google Service Management implementation accepts the following - // forms: "project:", "project_number:". - // - // Note: this is made compatible with - // google.api.servicecontrol.v1.Operation.consumer_id. - string consumer_id = 2; -} - -// Request message for GenerateConfigReport method. -message GenerateConfigReportRequest { - // Service configuration for which we want to generate the report. - // For this version of API, the supported types are - // [google.api.servicemanagement.v1.ConfigRef][google.api.servicemanagement.v1.ConfigRef], - // [google.api.servicemanagement.v1.ConfigSource][google.api.servicemanagement.v1.ConfigSource], - // and [google.api.Service][google.api.Service] - google.protobuf.Any new_config = 1; - - // Service configuration against which the comparison will be done. - // For this version of API, the supported types are - // [google.api.servicemanagement.v1.ConfigRef][google.api.servicemanagement.v1.ConfigRef], - // [google.api.servicemanagement.v1.ConfigSource][google.api.servicemanagement.v1.ConfigSource], - // and [google.api.Service][google.api.Service] - google.protobuf.Any old_config = 2; -} - -// Response message for GenerateConfigReport method. -message GenerateConfigReportResponse { - // Name of the service this report belongs to. - string service_name = 1; - - // ID of the service configuration this report belongs to. - string id = 2; - - // list of ChangeReport, each corresponding to comparison between two - // service configurations. - repeated ChangeReport change_reports = 3; - - // Errors / Linter warnings associated with the service definition this - // report - // belongs to. - repeated Diagnostic diagnostics = 4; -} diff --git a/handwritten/pubsub/protos/google/api/source_info.proto b/handwritten/pubsub/protos/google/api/source_info.proto deleted file mode 100644 index 5d0f7bd721f..00000000000 --- a/handwritten/pubsub/protos/google/api/source_info.proto +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/protobuf/any.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "SourceInfoProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Source information used to create a Service Config -message SourceInfo { - // All files used during config generation. - repeated google.protobuf.Any source_files = 1; -} diff --git a/handwritten/pubsub/protos/google/api/system_parameter.proto b/handwritten/pubsub/protos/google/api/system_parameter.proto deleted file mode 100644 index ed36a3d0bce..00000000000 --- a/handwritten/pubsub/protos/google/api/system_parameter.proto +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "SystemParameterProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// ### System parameter configuration -// -// A system parameter is a special kind of parameter defined by the API -// system, not by an individual API. It is typically mapped to an HTTP header -// and/or a URL query parameter. This configuration specifies which methods -// change the names of the system parameters. -message SystemParameters { - // Define system parameters. - // - // The parameters defined here will override the default parameters - // implemented by the system. If this field is missing from the service - // config, default system parameters will be used. Default system parameters - // and names is implementation-dependent. - // - // Example: define api key for all methods - // - // system_parameters - // rules: - // - selector: "*" - // parameters: - // - name: api_key - // url_query_parameter: api_key - // - // - // Example: define 2 api key names for a specific method. - // - // system_parameters - // rules: - // - selector: "/ListShelves" - // parameters: - // - name: api_key - // http_header: Api-Key1 - // - name: api_key - // http_header: Api-Key2 - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated SystemParameterRule rules = 1; -} - -// Define a system parameter rule mapping system parameter definitions to -// methods. -message SystemParameterRule { - // Selects the methods to which this rule applies. Use '*' to indicate all - // methods in all APIs. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // Define parameters. Multiple names may be defined for a parameter. - // For a given method call, only one of them should be used. If multiple - // names are used the behavior is implementation-dependent. - // If none of the specified names are present the behavior is - // parameter-dependent. - repeated SystemParameter parameters = 2; -} - -// Define a parameter's name and location. The parameter may be passed as either -// an HTTP header or a URL query parameter, and if both are passed the behavior -// is implementation-dependent. -message SystemParameter { - // Define the name of the parameter, such as "api_key" . It is case sensitive. - string name = 1; - - // Define the HTTP header name to use for the parameter. It is case - // insensitive. - string http_header = 2; - - // Define the URL query parameter name to use for the parameter. It is case - // sensitive. - string url_query_parameter = 3; -} diff --git a/handwritten/pubsub/protos/google/api/usage.proto b/handwritten/pubsub/protos/google/api/usage.proto deleted file mode 100644 index 29c601382d4..00000000000 --- a/handwritten/pubsub/protos/google/api/usage.proto +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/annotations.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig"; -option java_multiple_files = true; -option java_outer_classname = "UsageProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - - -// Configuration controlling usage of a service. -message Usage { - // Requirements that must be satisfied before a consumer project can use the - // service. Each requirement is of the form /; - // for example 'serviceusage.googleapis.com/billing-enabled'. - repeated string requirements = 1; - - // A list of usage rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated UsageRule rules = 6; - - // The full resource name of a channel used for sending notifications to the - // service producer. - // - // Google Service Management currently only supports - // [Google Cloud Pub/Sub](https://cloud.google.com/pubsub) as a notification - // channel. To use Google Cloud Pub/Sub as the channel, this must be the name - // of a Cloud Pub/Sub topic that uses the Cloud Pub/Sub topic name format - // documented in https://cloud.google.com/pubsub/docs/overview. - string producer_notification_channel = 7; -} - -// Usage configuration rules for the service. -// -// NOTE: Under development. -// -// -// Use this rule to configure unregistered calls for the service. Unregistered -// calls are calls that do not contain consumer project identity. -// (Example: calls that do not contain an API key). -// By default, API methods do not allow unregistered calls, and each method call -// must be identified by a consumer project identity. Use this rule to -// allow/disallow unregistered calls. -// -// Example of an API that wants to allow unregistered calls for entire service. -// -// usage: -// rules: -// - selector: "*" -// allow_unregistered_calls: true -// -// Example of a method that wants to allow unregistered calls. -// -// usage: -// rules: -// - selector: "google.example.library.v1.LibraryService.CreateBook" -// allow_unregistered_calls: true -message UsageRule { - // Selects the methods to which this rule applies. Use '*' to indicate all - // methods in all APIs. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // True, if the method allows unregistered calls; false otherwise. - bool allow_unregistered_calls = 2; -} diff --git a/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto b/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto deleted file mode 100644 index 7072854e4c0..00000000000 --- a/handwritten/pubsub/protos/google/iam/v1/iam_policy.proto +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright 2019 Google LLC. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -syntax = "proto3"; - -package google.iam.v1; - -import "google/iam/v1/options.proto"; -import "google/iam/v1/policy.proto"; -import "google/api/annotations.proto"; -import "google/api/client.proto"; -import "google/api/field_behavior.proto"; -import "google/api/resource.proto"; - -option cc_enable_arenas = true; -option csharp_namespace = "Google.Cloud.Iam.V1"; -option go_package = "google.golang.org/genproto/googleapis/iam/v1;iam"; -option java_multiple_files = true; -option java_outer_classname = "IamPolicyProto"; -option java_package = "com.google.iam.v1"; -option php_namespace = "Google\\Cloud\\Iam\\V1"; - -// ## API Overview -// -// Manages Identity and Access Management (IAM) policies. -// -// Any implementation of an API that offers access control features -// implements the google.iam.v1.IAMPolicy interface. -// -// ## Data model -// -// Access control is applied when a principal (user or service account), takes -// some action on a resource exposed by a service. Resources, identified by -// URI-like names, are the unit of access control specification. Service -// implementations can choose the granularity of access control and the -// supported permissions for their resources. -// For example one database service may allow access control to be -// specified only at the Table level, whereas another might allow access control -// to also be specified at the Column level. -// -// ## Policy Structure -// -// See google.iam.v1.Policy -// -// This is intentionally not a CRUD style API because access control policies -// are created and deleted implicitly with the resources to which they are -// attached. -service IAMPolicy { - option (google.api.default_host) = "iam-meta-api.googleapis.com"; - - // Sets the access control policy on the specified resource. Replaces any - // existing policy. - rpc SetIamPolicy(SetIamPolicyRequest) returns (Policy) { - option (google.api.http) = { - post: "/v1/{resource=**}:setIamPolicy" - body: "*" - }; - } - - // Gets the access control policy for a resource. - // Returns an empty policy if the resource exists and does not have a policy - // set. - rpc GetIamPolicy(GetIamPolicyRequest) returns (Policy) { - option (google.api.http) = { - post: "/v1/{resource=**}:getIamPolicy" - body: "*" - }; - } - - // Returns permissions that a caller has on the specified resource. - // If the resource does not exist, this will return an empty set of - // permissions, not a NOT_FOUND error. - // - // Note: This operation is designed to be used for building permission-aware - // UIs and command-line tools, not for authorization checking. This operation - // may "fail open" without warning. - rpc TestIamPermissions(TestIamPermissionsRequest) returns (TestIamPermissionsResponse) { - option (google.api.http) = { - post: "/v1/{resource=**}:testIamPermissions" - body: "*" - }; - } -} - -// Request message for `SetIamPolicy` method. -message SetIamPolicyRequest { - // REQUIRED: The resource for which the policy is being specified. - // See the operation documentation for the appropriate value for this field. - string resource = 1 [ - (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference).type = "*"]; - - // REQUIRED: The complete policy to be applied to the `resource`. The size of - // the policy is limited to a few 10s of KB. An empty policy is a - // valid policy but certain Cloud Platform services (such as Projects) - // might reject them. - Policy policy = 2 [(google.api.field_behavior) = REQUIRED]; -} - -// Request message for `GetIamPolicy` method. -message GetIamPolicyRequest { - // REQUIRED: The resource for which the policy is being requested. - // See the operation documentation for the appropriate value for this field. - string resource = 1 [ - (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference).type = "*"]; - - // OPTIONAL: A `GetPolicyOptions` object for specifying options to - // `GetIamPolicy`. This field is only used by Cloud IAM. - GetPolicyOptions options = 2; -} - -// Request message for `TestIamPermissions` method. -message TestIamPermissionsRequest { - // REQUIRED: The resource for which the policy detail is being requested. - // See the operation documentation for the appropriate value for this field. - string resource = 1[ - (google.api.field_behavior) = REQUIRED, - (google.api.resource_reference).type = "*"]; - - // The set of permissions to check for the `resource`. Permissions with - // wildcards (such as '*' or 'storage.*') are not allowed. For more - // information see - // [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). - repeated string permissions = 2 [(google.api.field_behavior) = REQUIRED]; -} - -// Response message for `TestIamPermissions` method. -message TestIamPermissionsResponse { - // A subset of `TestPermissionsRequest.permissions` that the caller is - // allowed. - repeated string permissions = 1; -} diff --git a/handwritten/pubsub/protos/google/iam/v1/logging/audit_data.proto b/handwritten/pubsub/protos/google/iam/v1/logging/audit_data.proto deleted file mode 100644 index dfe441ba663..00000000000 --- a/handwritten/pubsub/protos/google/iam/v1/logging/audit_data.proto +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2017 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.iam.v1.logging; - -import "google/api/annotations.proto"; -import "google/iam/v1/policy.proto"; - -option csharp_namespace = "Google.Cloud.Iam.V1.Logging"; -option go_package = "google.golang.org/genproto/googleapis/iam/v1/logging;logging"; -option java_multiple_files = true; -option java_outer_classname = "AuditDataProto"; -option java_package = "com.google.iam.v1.logging"; - -// Audit log information specific to Cloud IAM. This message is serialized -// as an `Any` type in the `ServiceData` message of an -// `AuditLog` message. -message AuditData { - // Policy delta between the original policy and the newly set policy. - google.iam.v1.PolicyDelta policy_delta = 2; -} diff --git a/handwritten/pubsub/protos/google/iam/v1/options.proto b/handwritten/pubsub/protos/google/iam/v1/options.proto deleted file mode 100644 index a4e17e588db..00000000000 --- a/handwritten/pubsub/protos/google/iam/v1/options.proto +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2019 Google LLC. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -syntax = "proto3"; - -package google.iam.v1; - -import "google/api/annotations.proto"; - -option cc_enable_arenas = true; -option csharp_namespace = "Google.Cloud.Iam.V1"; -option go_package = "google.golang.org/genproto/googleapis/iam/v1;iam"; -option java_multiple_files = true; -option java_outer_classname = "OptionsProto"; -option java_package = "com.google.iam.v1"; -option php_namespace = "Google\\Cloud\\Iam\\V1"; - -// Encapsulates settings provided to GetIamPolicy. -message GetPolicyOptions { - // Optional. The policy format version to be returned. - // - // Valid values are 0, 1, and 3. Requests specifying an invalid value will be - // rejected. - // - // Requests for policies with any conditional bindings must specify version 3. - // Policies without any conditional bindings may specify any valid value or - // leave the field unset. - int32 requested_policy_version = 1; -} diff --git a/handwritten/pubsub/protos/google/iam/v1/policy.proto b/handwritten/pubsub/protos/google/iam/v1/policy.proto deleted file mode 100644 index e3aba47e8ea..00000000000 --- a/handwritten/pubsub/protos/google/iam/v1/policy.proto +++ /dev/null @@ -1,240 +0,0 @@ -// Copyright 2019 Google LLC. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -syntax = "proto3"; - -package google.iam.v1; - -import "google/type/expr.proto"; -import "google/api/annotations.proto"; - -option cc_enable_arenas = true; -option csharp_namespace = "Google.Cloud.Iam.V1"; -option go_package = "google.golang.org/genproto/googleapis/iam/v1;iam"; -option java_multiple_files = true; -option java_outer_classname = "PolicyProto"; -option java_package = "com.google.iam.v1"; -option php_namespace = "Google\\Cloud\\Iam\\V1"; - -// Defines an Identity and Access Management (IAM) policy. It is used to -// specify access control policies for Cloud Platform resources. -// -// -// A `Policy` is a collection of `bindings`. A `binding` binds one or more -// `members` to a single `role`. Members can be user accounts, service accounts, -// Google groups, and domains (such as G Suite). A `role` is a named list of -// permissions (defined by IAM or configured by users). A `binding` can -// optionally specify a `condition`, which is a logic expression that further -// constrains the role binding based on attributes about the request and/or -// target resource. -// -// **JSON Example** -// -// { -// "bindings": [ -// { -// "role": "roles/resourcemanager.organizationAdmin", -// "members": [ -// "user:mike@example.com", -// "group:admins@example.com", -// "domain:google.com", -// "serviceAccount:my-project-id@appspot.gserviceaccount.com" -// ] -// }, -// { -// "role": "roles/resourcemanager.organizationViewer", -// "members": ["user:eve@example.com"], -// "condition": { -// "title": "expirable access", -// "description": "Does not grant access after Sep 2020", -// "expression": "request.time < -// timestamp('2020-10-01T00:00:00.000Z')", -// } -// } -// ] -// } -// -// **YAML Example** -// -// bindings: -// - members: -// - user:mike@example.com -// - group:admins@example.com -// - domain:google.com -// - serviceAccount:my-project-id@appspot.gserviceaccount.com -// role: roles/resourcemanager.organizationAdmin -// - members: -// - user:eve@example.com -// role: roles/resourcemanager.organizationViewer -// condition: -// title: expirable access -// description: Does not grant access after Sep 2020 -// expression: request.time < timestamp('2020-10-01T00:00:00.000Z') -// -// For a description of IAM and its features, see the -// [IAM developer's guide](https://cloud.google.com/iam/docs). -message Policy { - // Specifies the format of the policy. - // - // Valid values are 0, 1, and 3. Requests specifying an invalid value will be - // rejected. - // - // Operations affecting conditional bindings must specify version 3. This can - // be either setting a conditional policy, modifying a conditional binding, - // or removing a binding (conditional or unconditional) from the stored - // conditional policy. - // Operations on non-conditional policies may specify any valid value or - // leave the field unset. - // - // If no etag is provided in the call to `setIamPolicy`, version compliance - // checks against the stored policy is skipped. - int32 version = 1; - - // Associates a list of `members` to a `role`. Optionally may specify a - // `condition` that determines when binding is in effect. - // `bindings` with no members will result in an error. - repeated Binding bindings = 4; - - // `etag` is used for optimistic concurrency control as a way to help - // prevent simultaneous updates of a policy from overwriting each other. - // It is strongly suggested that systems make use of the `etag` in the - // read-modify-write cycle to perform policy updates in order to avoid race - // conditions: An `etag` is returned in the response to `getIamPolicy`, and - // systems are expected to put that etag in the request to `setIamPolicy` to - // ensure that their change will be applied to the same version of the policy. - // - // If no `etag` is provided in the call to `setIamPolicy`, then the existing - // policy is overwritten. Due to blind-set semantics of an etag-less policy, - // 'setIamPolicy' will not fail even if the incoming policy version does not - // meet the requirements for modifying the stored policy. - bytes etag = 3; -} - -// Associates `members` with a `role`. -message Binding { - // Role that is assigned to `members`. - // For example, `roles/viewer`, `roles/editor`, or `roles/owner`. - string role = 1; - - // Specifies the identities requesting access for a Cloud Platform resource. - // `members` can have the following values: - // - // * `allUsers`: A special identifier that represents anyone who is - // on the internet; with or without a Google account. - // - // * `allAuthenticatedUsers`: A special identifier that represents anyone - // who is authenticated with a Google account or a service account. - // - // * `user:{emailid}`: An email address that represents a specific Google - // account. For example, `alice@example.com` . - // - // - // * `serviceAccount:{emailid}`: An email address that represents a service - // account. For example, `my-other-app@appspot.gserviceaccount.com`. - // - // * `group:{emailid}`: An email address that represents a Google group. - // For example, `admins@example.com`. - // - // - // * `domain:{domain}`: The G Suite domain (primary) that represents all the - // users of that domain. For example, `google.com` or `example.com`. - // - // - repeated string members = 2; - - // The condition that is associated with this binding. - // NOTE: An unsatisfied condition will not allow user access via current - // binding. Different bindings, including their conditions, are examined - // independently. - google.type.Expr condition = 3; -} - -// The difference delta between two policies. -message PolicyDelta { - // The delta for Bindings between two policies. - repeated BindingDelta binding_deltas = 1; - - // The delta for AuditConfigs between two policies. - repeated AuditConfigDelta audit_config_deltas = 2; -} - -// One delta entry for Binding. Each individual change (only one member in each -// entry) to a binding will be a separate entry. -message BindingDelta { - // The type of action performed on a Binding in a policy. - enum Action { - // Unspecified. - ACTION_UNSPECIFIED = 0; - - // Addition of a Binding. - ADD = 1; - - // Removal of a Binding. - REMOVE = 2; - } - - // The action that was performed on a Binding. - // Required - Action action = 1; - - // Role that is assigned to `members`. - // For example, `roles/viewer`, `roles/editor`, or `roles/owner`. - // Required - string role = 2; - - // A single identity requesting access for a Cloud Platform resource. - // Follows the same format of Binding.members. - // Required - string member = 3; - - // The condition that is associated with this binding. - google.type.Expr condition = 4; -} - -// One delta entry for AuditConfig. Each individual change (only one -// exempted_member in each entry) to a AuditConfig will be a separate entry. -message AuditConfigDelta { - // The type of action performed on an audit configuration in a policy. - enum Action { - // Unspecified. - ACTION_UNSPECIFIED = 0; - - // Addition of an audit configuration. - ADD = 1; - - // Removal of an audit configuration. - REMOVE = 2; - } - - // The action that was performed on an audit configuration in a policy. - // Required - Action action = 1; - - // Specifies a service that was configured for Cloud Audit Logging. - // For example, `storage.googleapis.com`, `cloudsql.googleapis.com`. - // `allServices` is a special value that covers all services. - // Required - string service = 2; - - // A single identity that is exempted from "data access" audit - // logging for the `service` specified above. - // Follows the same format of Binding.members. - string exempted_member = 3; - - // Specifies the log_type that was be enabled. ADMIN_ACTIVITY is always - // enabled, and cannot be configured. - // Required - string log_type = 4; -} diff --git a/handwritten/pubsub/protos/google/protobuf/any.proto b/handwritten/pubsub/protos/google/protobuf/any.proto deleted file mode 100644 index 9bd3f50a453..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/any.proto +++ /dev/null @@ -1,139 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option go_package = "github.com/golang/protobuf/ptypes/any"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "AnyProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// `Any` contains an arbitrary serialized protocol buffer message along with a -// URL that describes the type of the serialized message. -// -// Protobuf library provides support to pack/unpack Any values in the form -// of utility functions or additional generated methods of the Any type. -// -// Example 1: Pack and unpack a message in C++. -// -// Foo foo = ...; -// Any any; -// any.PackFrom(foo); -// ... -// if (any.UnpackTo(&foo)) { -// ... -// } -// -// Example 2: Pack and unpack a message in Java. -// -// Foo foo = ...; -// Any any = Any.pack(foo); -// ... -// if (any.is(Foo.class)) { -// foo = any.unpack(Foo.class); -// } -// -// Example 3: Pack and unpack a message in Python. -// -// foo = Foo(...) -// any = Any() -// any.Pack(foo) -// ... -// if any.Is(Foo.DESCRIPTOR): -// any.Unpack(foo) -// ... -// -// The pack methods provided by protobuf library will by default use -// 'type.googleapis.com/full.type.name' as the type URL and the unpack -// methods only use the fully qualified type name after the last '/' -// in the type URL, for example "foo.bar.com/x/y.z" will yield type -// name "y.z". -// -// -// JSON -// ==== -// The JSON representation of an `Any` value uses the regular -// representation of the deserialized, embedded message, with an -// additional field `@type` which contains the type URL. Example: -// -// package google.profile; -// message Person { -// string first_name = 1; -// string last_name = 2; -// } -// -// { -// "@type": "type.googleapis.com/google.profile.Person", -// "firstName": , -// "lastName": -// } -// -// If the embedded message type is well-known and has a custom JSON -// representation, that representation will be embedded adding a field -// `value` which holds the custom JSON in addition to the `@type` -// field. Example (for message [google.protobuf.Duration][]): -// -// { -// "@type": "type.googleapis.com/google.protobuf.Duration", -// "value": "1.212s" -// } -// -message Any { - // A URL/resource name whose content describes the type of the - // serialized protocol buffer message. - // - // For URLs which use the scheme `http`, `https`, or no scheme, the - // following restrictions and interpretations apply: - // - // * If no scheme is provided, `https` is assumed. - // * The last segment of the URL's path must represent the fully - // qualified name of the type (as in `path/google.protobuf.Duration`). - // The name should be in a canonical form (e.g., leading "." is - // not accepted). - // * An HTTP GET on the URL must yield a [google.protobuf.Type][] - // value in binary format, or produce an error. - // * Applications are allowed to cache lookup results based on the - // URL, or have them precompiled into a binary to avoid any - // lookup. Therefore, binary compatibility needs to be preserved - // on changes to types. (Use versioned type names to manage - // breaking changes.) - // - // Schemes other than `http`, `https` (or the empty scheme) might be - // used with implementation specific semantics. - // - string type_url = 1; - - // Must be a valid serialized protocol buffer of the above specified type. - bytes value = 2; -} diff --git a/handwritten/pubsub/protos/google/protobuf/api.proto b/handwritten/pubsub/protos/google/protobuf/api.proto deleted file mode 100644 index 7c30e8b7ad3..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/api.proto +++ /dev/null @@ -1,202 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -import "google/protobuf/source_context.proto"; -import "google/protobuf/type.proto"; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "ApiProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option go_package = "google.golang.org/genproto/protobuf/api;api"; - -// Api is a light-weight descriptor for a protocol buffer service. -message Api { - - // The fully qualified name of this api, including package name - // followed by the api's simple name. - string name = 1; - - // The methods of this api, in unspecified order. - repeated Method methods = 2; - - // Any metadata attached to the API. - repeated Option options = 3; - - // A version string for this api. If specified, must have the form - // `major-version.minor-version`, as in `1.10`. If the minor version - // is omitted, it defaults to zero. If the entire version field is - // empty, the major version is derived from the package name, as - // outlined below. If the field is not empty, the version in the - // package name will be verified to be consistent with what is - // provided here. - // - // The versioning schema uses [semantic - // versioning](http://semver.org) where the major version number - // indicates a breaking change and the minor version an additive, - // non-breaking change. Both version numbers are signals to users - // what to expect from different versions, and should be carefully - // chosen based on the product plan. - // - // The major version is also reflected in the package name of the - // API, which must end in `v`, as in - // `google.feature.v1`. For major versions 0 and 1, the suffix can - // be omitted. Zero major versions must only be used for - // experimental, none-GA apis. - // - // - string version = 4; - - // Source context for the protocol buffer service represented by this - // message. - SourceContext source_context = 5; - - // Included APIs. See [Mixin][]. - repeated Mixin mixins = 6; - - // The source syntax of the service. - Syntax syntax = 7; -} - -// Method represents a method of an api. -message Method { - - // The simple name of this method. - string name = 1; - - // A URL of the input message type. - string request_type_url = 2; - - // If true, the request is streamed. - bool request_streaming = 3; - - // The URL of the output message type. - string response_type_url = 4; - - // If true, the response is streamed. - bool response_streaming = 5; - - // Any metadata attached to the method. - repeated Option options = 6; - - // The source syntax of this method. - Syntax syntax = 7; -} - -// Declares an API to be included in this API. The including API must -// redeclare all the methods from the included API, but documentation -// and options are inherited as follows: -// -// - If after comment and whitespace stripping, the documentation -// string of the redeclared method is empty, it will be inherited -// from the original method. -// -// - Each annotation belonging to the service config (http, -// visibility) which is not set in the redeclared method will be -// inherited. -// -// - If an http annotation is inherited, the path pattern will be -// modified as follows. Any version prefix will be replaced by the -// version of the including API plus the [root][] path if specified. -// -// Example of a simple mixin: -// -// package google.acl.v1; -// service AccessControl { -// // Get the underlying ACL object. -// rpc GetAcl(GetAclRequest) returns (Acl) { -// option (google.api.http).get = "/v1/{resource=**}:getAcl"; -// } -// } -// -// package google.storage.v2; -// service Storage { -// rpc GetAcl(GetAclRequest) returns (Acl); -// -// // Get a data record. -// rpc GetData(GetDataRequest) returns (Data) { -// option (google.api.http).get = "/v2/{resource=**}"; -// } -// } -// -// Example of a mixin configuration: -// -// apis: -// - name: google.storage.v2.Storage -// mixins: -// - name: google.acl.v1.AccessControl -// -// The mixin construct implies that all methods in `AccessControl` are -// also declared with same name and request/response types in -// `Storage`. A documentation generator or annotation processor will -// see the effective `Storage.GetAcl` method after inherting -// documentation and annotations as follows: -// -// service Storage { -// // Get the underlying ACL object. -// rpc GetAcl(GetAclRequest) returns (Acl) { -// option (google.api.http).get = "/v2/{resource=**}:getAcl"; -// } -// ... -// } -// -// Note how the version in the path pattern changed from `v1` to `v2`. -// -// If the `root` field in the mixin is specified, it should be a -// relative path under which inherited HTTP paths are placed. Example: -// -// apis: -// - name: google.storage.v2.Storage -// mixins: -// - name: google.acl.v1.AccessControl -// root: acls -// -// This implies the following inherited HTTP annotation: -// -// service Storage { -// // Get the underlying ACL object. -// rpc GetAcl(GetAclRequest) returns (Acl) { -// option (google.api.http).get = "/v2/acls/{resource=**}:getAcl"; -// } -// ... -// } -message Mixin { - // The fully qualified name of the API which is included. - string name = 1; - - // If non-empty specifies a path under which inherited HTTP paths - // are rooted. - string root = 2; -} diff --git a/handwritten/pubsub/protos/google/protobuf/descriptor.proto b/handwritten/pubsub/protos/google/protobuf/descriptor.proto deleted file mode 100644 index f859c42972f..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/descriptor.proto +++ /dev/null @@ -1,831 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Author: kenton@google.com (Kenton Varda) -// Based on original Protocol Buffers design by -// Sanjay Ghemawat, Jeff Dean, and others. -// -// The messages in this file describe the definitions found in .proto files. -// A valid .proto file can be translated directly to a FileDescriptorProto -// without any other information (e.g. without reading its imports). - - -syntax = "proto2"; - -package google.protobuf; -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "DescriptorProtos"; -option csharp_namespace = "Google.Protobuf.Reflection"; -option objc_class_prefix = "GPB"; - -// descriptor.proto must be optimized for speed because reflection-based -// algorithms don't work during bootstrapping. -option optimize_for = SPEED; - -// The protocol compiler can output a FileDescriptorSet containing the .proto -// files it parses. -message FileDescriptorSet { - repeated FileDescriptorProto file = 1; -} - -// Describes a complete .proto file. -message FileDescriptorProto { - optional string name = 1; // file name, relative to root of source tree - optional string package = 2; // e.g. "foo", "foo.bar", etc. - - // Names of files imported by this file. - repeated string dependency = 3; - // Indexes of the public imported files in the dependency list above. - repeated int32 public_dependency = 10; - // Indexes of the weak imported files in the dependency list. - // For Google-internal migration only. Do not use. - repeated int32 weak_dependency = 11; - - // All top-level definitions in this file. - repeated DescriptorProto message_type = 4; - repeated EnumDescriptorProto enum_type = 5; - repeated ServiceDescriptorProto service = 6; - repeated FieldDescriptorProto extension = 7; - - optional FileOptions options = 8; - - // This field contains optional information about the original source code. - // You may safely remove this entire field without harming runtime - // functionality of the descriptors -- the information is needed only by - // development tools. - optional SourceCodeInfo source_code_info = 9; - - // The syntax of the proto file. - // The supported values are "proto2" and "proto3". - optional string syntax = 12; -} - -// Describes a message type. -message DescriptorProto { - optional string name = 1; - - repeated FieldDescriptorProto field = 2; - repeated FieldDescriptorProto extension = 6; - - repeated DescriptorProto nested_type = 3; - repeated EnumDescriptorProto enum_type = 4; - - message ExtensionRange { - optional int32 start = 1; - optional int32 end = 2; - } - repeated ExtensionRange extension_range = 5; - - repeated OneofDescriptorProto oneof_decl = 8; - - optional MessageOptions options = 7; - - // Range of reserved tag numbers. Reserved tag numbers may not be used by - // fields or extension ranges in the same message. Reserved ranges may - // not overlap. - message ReservedRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Exclusive. - } - repeated ReservedRange reserved_range = 9; - // Reserved field names, which may not be used by fields in the same message. - // A given name may only be reserved once. - repeated string reserved_name = 10; -} - -// Describes a field within a message. -message FieldDescriptorProto { - enum Type { - // 0 is reserved for errors. - // Order is weird for historical reasons. - TYPE_DOUBLE = 1; - TYPE_FLOAT = 2; - // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if - // negative values are likely. - TYPE_INT64 = 3; - TYPE_UINT64 = 4; - // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if - // negative values are likely. - TYPE_INT32 = 5; - TYPE_FIXED64 = 6; - TYPE_FIXED32 = 7; - TYPE_BOOL = 8; - TYPE_STRING = 9; - // Tag-delimited aggregate. - // Group type is deprecated and not supported in proto3. However, Proto3 - // implementations should still be able to parse the group wire format and - // treat group fields as unknown fields. - TYPE_GROUP = 10; - TYPE_MESSAGE = 11; // Length-delimited aggregate. - - // New in version 2. - TYPE_BYTES = 12; - TYPE_UINT32 = 13; - TYPE_ENUM = 14; - TYPE_SFIXED32 = 15; - TYPE_SFIXED64 = 16; - TYPE_SINT32 = 17; // Uses ZigZag encoding. - TYPE_SINT64 = 18; // Uses ZigZag encoding. - }; - - enum Label { - // 0 is reserved for errors - LABEL_OPTIONAL = 1; - LABEL_REQUIRED = 2; - LABEL_REPEATED = 3; - }; - - optional string name = 1; - optional int32 number = 3; - optional Label label = 4; - - // If type_name is set, this need not be set. If both this and type_name - // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. - optional Type type = 5; - - // For message and enum types, this is the name of the type. If the name - // starts with a '.', it is fully-qualified. Otherwise, C++-like scoping - // rules are used to find the type (i.e. first the nested types within this - // message are searched, then within the parent, on up to the root - // namespace). - optional string type_name = 6; - - // For extensions, this is the name of the type being extended. It is - // resolved in the same manner as type_name. - optional string extendee = 2; - - // For numeric types, contains the original text representation of the value. - // For booleans, "true" or "false". - // For strings, contains the default text contents (not escaped in any way). - // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? - optional string default_value = 7; - - // If set, gives the index of a oneof in the containing type's oneof_decl - // list. This field is a member of that oneof. - optional int32 oneof_index = 9; - - // JSON name of this field. The value is set by protocol compiler. If the - // user has set a "json_name" option on this field, that option's value - // will be used. Otherwise, it's deduced from the field's name by converting - // it to camelCase. - optional string json_name = 10; - - optional FieldOptions options = 8; -} - -// Describes a oneof. -message OneofDescriptorProto { - optional string name = 1; - optional OneofOptions options = 2; -} - -// Describes an enum type. -message EnumDescriptorProto { - optional string name = 1; - - repeated EnumValueDescriptorProto value = 2; - - optional EnumOptions options = 3; -} - -// Describes a value within an enum. -message EnumValueDescriptorProto { - optional string name = 1; - optional int32 number = 2; - - optional EnumValueOptions options = 3; -} - -// Describes a service. -message ServiceDescriptorProto { - optional string name = 1; - repeated MethodDescriptorProto method = 2; - - optional ServiceOptions options = 3; -} - -// Describes a method of a service. -message MethodDescriptorProto { - optional string name = 1; - - // Input and output type names. These are resolved in the same way as - // FieldDescriptorProto.type_name, but must refer to a message type. - optional string input_type = 2; - optional string output_type = 3; - - optional MethodOptions options = 4; - - // Identifies if client streams multiple client messages - optional bool client_streaming = 5 [default=false]; - // Identifies if server streams multiple server messages - optional bool server_streaming = 6 [default=false]; -} - - -// =================================================================== -// Options - -// Each of the definitions above may have "options" attached. These are -// just annotations which may cause code to be generated slightly differently -// or may contain hints for code that manipulates protocol messages. -// -// Clients may define custom options as extensions of the *Options messages. -// These extensions may not yet be known at parsing time, so the parser cannot -// store the values in them. Instead it stores them in a field in the *Options -// message called uninterpreted_option. This field must have the same name -// across all *Options messages. We then use this field to populate the -// extensions when we build a descriptor, at which point all protos have been -// parsed and so all extensions are known. -// -// Extension numbers for custom options may be chosen as follows: -// * For options which will only be used within a single application or -// organization, or for experimental options, use field numbers 50000 -// through 99999. It is up to you to ensure that you do not use the -// same number for multiple options. -// * For options which will be published and used publicly by multiple -// independent entities, e-mail protobuf-global-extension-registry@google.com -// to reserve extension numbers. Simply provide your project name (e.g. -// Objective-C plugin) and your project website (if available) -- there's no -// need to explain how you intend to use them. Usually you only need one -// extension number. You can declare multiple options with only one extension -// number by putting them in a sub-message. See the Custom Options section of -// the docs for examples: -// https://developers.google.com/protocol-buffers/docs/proto#options -// If this turns out to be popular, a web service will be set up -// to automatically assign option numbers. - - -message FileOptions { - - // Sets the Java package where classes generated from this .proto will be - // placed. By default, the proto package is used, but this is often - // inappropriate because proto packages do not normally start with backwards - // domain names. - optional string java_package = 1; - - - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). - optional string java_outer_classname = 8; - - // If set true, then the Java code generator will generate a separate .java - // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be - // generated to contain the file's getDescriptor() method as well as any - // top-level extensions defined in the file. - optional bool java_multiple_files = 10 [default=false]; - - // This option does nothing. - optional bool java_generate_equals_and_hash = 20 [deprecated=true]; - - // If set true, then the Java2 code generator will generate code that - // throws an exception whenever an attempt is made to assign a non-UTF-8 - // byte sequence to a string field. - // Message reflection will do the same. - // However, an extension field still accepts non-UTF-8 byte sequences. - // This option has no effect on when used with the lite runtime. - optional bool java_string_check_utf8 = 27 [default=false]; - - - // Generated classes can be optimized for speed or code size. - enum OptimizeMode { - SPEED = 1; // Generate complete code for parsing, serialization, - // etc. - CODE_SIZE = 2; // Use ReflectionOps to implement these methods. - LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. - } - optional OptimizeMode optimize_for = 9 [default=SPEED]; - - // Sets the Go package where structs generated from this .proto will be - // placed. If omitted, the Go package will be derived from the following: - // - The basename of the package import path, if provided. - // - Otherwise, the package statement in the .proto file, if present. - // - Otherwise, the basename of the .proto file, without extension. - optional string go_package = 11; - - - - // Should generic services be generated in each language? "Generic" services - // are not specific to any particular RPC system. They are generated by the - // main code generators in each language (without additional plugins). - // Generic services were the only kind of service generation supported by - // early versions of google.protobuf. - // - // Generic services are now considered deprecated in favor of using plugins - // that generate code specific to your particular RPC system. Therefore, - // these default to false. Old code which depends on generic services should - // explicitly set them to true. - optional bool cc_generic_services = 16 [default=false]; - optional bool java_generic_services = 17 [default=false]; - optional bool py_generic_services = 18 [default=false]; - - // Is this file deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for everything in the file, or it will be completely ignored; in the very - // least, this is a formalization for deprecating files. - optional bool deprecated = 23 [default=false]; - - // Enables the use of arenas for the proto messages in this file. This applies - // only to generated classes for C++. - optional bool cc_enable_arenas = 31 [default=false]; - - - // Sets the objective c class prefix which is prepended to all objective c - // generated classes from this .proto. There is no default. - optional string objc_class_prefix = 36; - - // Namespace for generated classes; defaults to the package. - optional string csharp_namespace = 37; - - // By default Swift generators will take the proto package and CamelCase it - // replacing '.' with underscore and use that to prefix the types/symbols - // defined. When this options is provided, they will use this value instead - // to prefix the types/symbols defined. - optional string swift_prefix = 39; - - // Sets the php class prefix which is prepended to all php generated classes - // from this .proto. Default is empty. - optional string php_class_prefix = 40; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; - - reserved 38; -} - -message MessageOptions { - // Set true to use the old proto1 MessageSet wire format for extensions. - // This is provided for backwards-compatibility with the MessageSet wire - // format. You should not use this for any other reason: It's less - // efficient, has fewer features, and is more complicated. - // - // The message must be defined exactly as follows: - // message Foo { - // option message_set_wire_format = true; - // extensions 4 to max; - // } - // Note that the message cannot have any defined fields; MessageSets only - // have extensions. - // - // All extensions of your type must be singular messages; e.g. they cannot - // be int32s, enums, or repeated messages. - // - // Because this is an option, the above two restrictions are not enforced by - // the protocol compiler. - optional bool message_set_wire_format = 1 [default=false]; - - // Disables the generation of the standard "descriptor()" accessor, which can - // conflict with a field of the same name. This is meant to make migration - // from proto1 easier; new code should avoid fields named "descriptor". - optional bool no_standard_descriptor_accessor = 2 [default=false]; - - // Is this message deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the message, or it will be completely ignored; in the very least, - // this is a formalization for deprecating messages. - optional bool deprecated = 3 [default=false]; - - // Whether the message is an automatically generated map entry type for the - // maps field. - // - // For maps fields: - // map map_field = 1; - // The parsed descriptor looks like: - // message MapFieldEntry { - // option map_entry = true; - // optional KeyType key = 1; - // optional ValueType value = 2; - // } - // repeated MapFieldEntry map_field = 1; - // - // Implementations may choose not to generate the map_entry=true message, but - // use a native map in the target language to hold the keys and values. - // The reflection APIs in such implementions still need to work as - // if the field is a repeated message field. - // - // NOTE: Do not set the option in .proto files. Always use the maps syntax - // instead. The option should only be implicitly set by the proto compiler - // parser. - optional bool map_entry = 7; - - reserved 8; // javalite_serializable - reserved 9; // javanano_as_lite - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message FieldOptions { - // The ctype option instructs the C++ code generator to use a different - // representation of the field than it normally would. See the specific - // options below. This option is not yet implemented in the open source - // release -- sorry, we'll try to include it in a future version! - optional CType ctype = 1 [default = STRING]; - enum CType { - // Default mode. - STRING = 0; - - CORD = 1; - - STRING_PIECE = 2; - } - // The packed option can be enabled for repeated primitive fields to enable - // a more efficient representation on the wire. Rather than repeatedly - // writing the tag and type for each element, the entire array is encoded as - // a single length-delimited blob. In proto3, only explicit setting it to - // false will avoid using packed encoding. - optional bool packed = 2; - - // The jstype option determines the JavaScript type used for values of the - // field. The option is permitted only for 64 bit integral and fixed types - // (int64, uint64, sint64, fixed64, sfixed64). By default these types are - // represented as JavaScript strings. This avoids loss of precision that can - // happen when a large value is converted to a floating point JavaScript - // numbers. Specifying JS_NUMBER for the jstype causes the generated - // JavaScript code to use the JavaScript "number" type instead of strings. - // This option is an enum to permit additional types to be added, - // e.g. goog.math.Integer. - optional JSType jstype = 6 [default = JS_NORMAL]; - enum JSType { - // Use the default type. - JS_NORMAL = 0; - - // Use JavaScript strings. - JS_STRING = 1; - - // Use JavaScript numbers. - JS_NUMBER = 2; - } - - // Should this field be parsed lazily? Lazy applies only to message-type - // fields. It means that when the outer message is initially parsed, the - // inner message's contents will not be parsed but instead stored in encoded - // form. The inner message will actually be parsed when it is first accessed. - // - // This is only a hint. Implementations are free to choose whether to use - // eager or lazy parsing regardless of the value of this option. However, - // setting this option true suggests that the protocol author believes that - // using lazy parsing on this field is worth the additional bookkeeping - // overhead typically needed to implement it. - // - // This option does not affect the public interface of any generated code; - // all method signatures remain the same. Furthermore, thread-safety of the - // interface is not affected by this option; const methods remain safe to - // call from multiple threads concurrently, while non-const methods continue - // to require exclusive access. - // - // - // Note that implementations may choose not to check required fields within - // a lazy sub-message. That is, calling IsInitialized() on the outer message - // may return true even if the inner message has missing required fields. - // This is necessary because otherwise the inner message would have to be - // parsed in order to perform the check, defeating the purpose of lazy - // parsing. An implementation which chooses not to check required fields - // must be consistent about it. That is, for any particular sub-message, the - // implementation must either *always* check its required fields, or *never* - // check its required fields, regardless of whether or not the message has - // been parsed. - optional bool lazy = 5 [default=false]; - - // Is this field deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for accessors, or it will be completely ignored; in the very least, this - // is a formalization for deprecating fields. - optional bool deprecated = 3 [default=false]; - - // For Google-internal migration only. Do not use. - optional bool weak = 10 [default=false]; - - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; - - reserved 4; // removed jtype -} - -message OneofOptions { - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message EnumOptions { - - // Set this option to true to allow mapping different tag names to the same - // value. - optional bool allow_alias = 2; - - // Is this enum deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the enum, or it will be completely ignored; in the very least, this - // is a formalization for deprecating enums. - optional bool deprecated = 3 [default=false]; - - reserved 5; // javanano_as_lite - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message EnumValueOptions { - // Is this enum value deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the enum value, or it will be completely ignored; in the very least, - // this is a formalization for deprecating enum values. - optional bool deprecated = 1 [default=false]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message ServiceOptions { - - // Note: Field numbers 1 through 32 are reserved for Google's internal RPC - // framework. We apologize for hoarding these numbers to ourselves, but - // we were already using them long before we decided to release Protocol - // Buffers. - - // Is this service deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the service, or it will be completely ignored; in the very least, - // this is a formalization for deprecating services. - optional bool deprecated = 33 [default=false]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message MethodOptions { - - // Note: Field numbers 1 through 32 are reserved for Google's internal RPC - // framework. We apologize for hoarding these numbers to ourselves, but - // we were already using them long before we decided to release Protocol - // Buffers. - - // Is this method deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the method, or it will be completely ignored; in the very least, - // this is a formalization for deprecating methods. - optional bool deprecated = 33 [default=false]; - - // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, - // or neither? HTTP based RPC implementation may choose GET verb for safe - // methods, and PUT verb for idempotent methods instead of the default POST. - enum IdempotencyLevel { - IDEMPOTENCY_UNKNOWN = 0; - NO_SIDE_EFFECTS = 1; // implies idempotent - IDEMPOTENT = 2; // idempotent, but may have side effects - } - optional IdempotencyLevel idempotency_level = - 34 [default=IDEMPOTENCY_UNKNOWN]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - - -// A message representing a option the parser does not recognize. This only -// appears in options protos created by the compiler::Parser class. -// DescriptorPool resolves these when building Descriptor objects. Therefore, -// options protos in descriptor objects (e.g. returned by Descriptor::options(), -// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions -// in them. -message UninterpretedOption { - // The name of the uninterpreted option. Each string represents a segment in - // a dot-separated name. is_extension is true iff a segment represents an - // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". - message NamePart { - required string name_part = 1; - required bool is_extension = 2; - } - repeated NamePart name = 2; - - // The value of the uninterpreted option, in whatever type the tokenizer - // identified it as during parsing. Exactly one of these should be set. - optional string identifier_value = 3; - optional uint64 positive_int_value = 4; - optional int64 negative_int_value = 5; - optional double double_value = 6; - optional bytes string_value = 7; - optional string aggregate_value = 8; -} - -// =================================================================== -// Optional source code info - -// Encapsulates information about the original source file from which a -// FileDescriptorProto was generated. -message SourceCodeInfo { - // A Location identifies a piece of source code in a .proto file which - // corresponds to a particular definition. This information is intended - // to be useful to IDEs, code indexers, documentation generators, and similar - // tools. - // - // For example, say we have a file like: - // message Foo { - // optional string foo = 1; - // } - // Let's look at just the field definition: - // optional string foo = 1; - // ^ ^^ ^^ ^ ^^^ - // a bc de f ghi - // We have the following locations: - // span path represents - // [a,i) [ 4, 0, 2, 0 ] The whole field definition. - // [a,b) [ 4, 0, 2, 0, 4 ] The label (optional). - // [c,d) [ 4, 0, 2, 0, 5 ] The type (string). - // [e,f) [ 4, 0, 2, 0, 1 ] The name (foo). - // [g,h) [ 4, 0, 2, 0, 3 ] The number (1). - // - // Notes: - // - A location may refer to a repeated field itself (i.e. not to any - // particular index within it). This is used whenever a set of elements are - // logically enclosed in a single code segment. For example, an entire - // extend block (possibly containing multiple extension definitions) will - // have an outer location whose path refers to the "extensions" repeated - // field without an index. - // - Multiple locations may have the same path. This happens when a single - // logical declaration is spread out across multiple places. The most - // obvious example is the "extend" block again -- there may be multiple - // extend blocks in the same scope, each of which will have the same path. - // - A location's span is not always a subset of its parent's span. For - // example, the "extendee" of an extension declaration appears at the - // beginning of the "extend" block and is shared by all extensions within - // the block. - // - Just because a location's span is a subset of some other location's span - // does not mean that it is a descendent. For example, a "group" defines - // both a type and a field in a single declaration. Thus, the locations - // corresponding to the type and field and their components will overlap. - // - Code which tries to interpret locations should probably be designed to - // ignore those that it doesn't understand, as more types of locations could - // be recorded in the future. - repeated Location location = 1; - message Location { - // Identifies which part of the FileDescriptorProto was defined at this - // location. - // - // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: - // [ 4, 3, 2, 7, 1 ] - // refers to: - // file.message_type(3) // 4, 3 - // .field(7) // 2, 7 - // .name() // 1 - // This is because FileDescriptorProto.message_type has field number 4: - // repeated DescriptorProto message_type = 4; - // and DescriptorProto.field has field number 2: - // repeated FieldDescriptorProto field = 2; - // and FieldDescriptorProto.name has field number 1: - // optional string name = 1; - // - // Thus, the above path gives the location of a field name. If we removed - // the last element: - // [ 4, 3, 2, 7 ] - // this path refers to the whole field declaration (from the beginning - // of the label to the terminating semicolon). - repeated int32 path = 1 [packed=true]; - - // Always has exactly three or four elements: start line, start column, - // end line (optional, otherwise assumed same as start line), end column. - // These are packed into a single field for efficiency. Note that line - // and column numbers are zero-based -- typically you will want to add - // 1 to each before displaying to a user. - repeated int32 span = 2 [packed=true]; - - // If this SourceCodeInfo represents a complete declaration, these are any - // comments appearing before and after the declaration which appear to be - // attached to the declaration. - // - // A series of line comments appearing on consecutive lines, with no other - // tokens appearing on those lines, will be treated as a single comment. - // - // leading_detached_comments will keep paragraphs of comments that appear - // before (but not connected to) the current element. Each paragraph, - // separated by empty lines, will be one comment element in the repeated - // field. - // - // Only the comment content is provided; comment markers (e.g. //) are - // stripped out. For block comments, leading whitespace and an asterisk - // will be stripped from the beginning of each line other than the first. - // Newlines are included in the output. - // - // Examples: - // - // optional int32 foo = 1; // Comment attached to foo. - // // Comment attached to bar. - // optional int32 bar = 2; - // - // optional string baz = 3; - // // Comment attached to baz. - // // Another line attached to baz. - // - // // Comment attached to qux. - // // - // // Another line attached to qux. - // optional double qux = 4; - // - // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from - // // both. - // - // // Detached comment for corge paragraph 2. - // - // optional string corge = 5; - // /* Block comment attached - // * to corge. Leading asterisks - // * will be removed. */ - // /* Block comment attached to - // * grault. */ - // optional int32 grault = 6; - // - // // ignored detached comments. - optional string leading_comments = 3; - optional string trailing_comments = 4; - repeated string leading_detached_comments = 6; - } -} - -// Describes the relationship between generated code and its original source -// file. A GeneratedCodeInfo message is associated with only one generated -// source file, but may contain references to different source .proto files. -message GeneratedCodeInfo { - // An Annotation connects some span of text in generated code to an element - // of its generating .proto file. - repeated Annotation annotation = 1; - message Annotation { - // Identifies the element in the original source .proto file. This field - // is formatted the same as SourceCodeInfo.Location.path. - repeated int32 path = 1 [packed=true]; - - // Identifies the filesystem path to the original source .proto. - optional string source_file = 2; - - // Identifies the starting offset in bytes in the generated code - // that relates to the identified object. - optional int32 begin = 3; - - // Identifies the ending offset in bytes in the generated code that - // relates to the identified offset. The end offset should be one past - // the last relevant byte (so the length of the text = end - begin). - optional int32 end = 4; - } -} diff --git a/handwritten/pubsub/protos/google/protobuf/duration.proto b/handwritten/pubsub/protos/google/protobuf/duration.proto deleted file mode 100644 index 975fce41aae..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/duration.proto +++ /dev/null @@ -1,117 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option go_package = "github.com/golang/protobuf/ptypes/duration"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "DurationProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// A Duration represents a signed, fixed-length span of time represented -// as a count of seconds and fractions of seconds at nanosecond -// resolution. It is independent of any calendar and concepts like "day" -// or "month". It is related to Timestamp in that the difference between -// two Timestamp values is a Duration and it can be added or subtracted -// from a Timestamp. Range is approximately +-10,000 years. -// -// # Examples -// -// Example 1: Compute Duration from two Timestamps in pseudo code. -// -// Timestamp start = ...; -// Timestamp end = ...; -// Duration duration = ...; -// -// duration.seconds = end.seconds - start.seconds; -// duration.nanos = end.nanos - start.nanos; -// -// if (duration.seconds < 0 && duration.nanos > 0) { -// duration.seconds += 1; -// duration.nanos -= 1000000000; -// } else if (durations.seconds > 0 && duration.nanos < 0) { -// duration.seconds -= 1; -// duration.nanos += 1000000000; -// } -// -// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. -// -// Timestamp start = ...; -// Duration duration = ...; -// Timestamp end = ...; -// -// end.seconds = start.seconds + duration.seconds; -// end.nanos = start.nanos + duration.nanos; -// -// if (end.nanos < 0) { -// end.seconds -= 1; -// end.nanos += 1000000000; -// } else if (end.nanos >= 1000000000) { -// end.seconds += 1; -// end.nanos -= 1000000000; -// } -// -// Example 3: Compute Duration from datetime.timedelta in Python. -// -// td = datetime.timedelta(days=3, minutes=10) -// duration = Duration() -// duration.FromTimedelta(td) -// -// # JSON Mapping -// -// In JSON format, the Duration type is encoded as a string rather than an -// object, where the string ends in the suffix "s" (indicating seconds) and -// is preceded by the number of seconds, with nanoseconds expressed as -// fractional seconds. For example, 3 seconds with 0 nanoseconds should be -// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should -// be expressed in JSON format as "3.000000001s", and 3 seconds and 1 -// microsecond should be expressed in JSON format as "3.000001s". -// -// -message Duration { - - // Signed seconds of the span of time. Must be from -315,576,000,000 - // to +315,576,000,000 inclusive. Note: these bounds are computed from: - // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years - int64 seconds = 1; - - // Signed fractions of a second at nanosecond resolution of the span - // of time. Durations less than one second are represented with a 0 - // `seconds` field and a positive or negative `nanos` field. For durations - // of one second or more, a non-zero value for the `nanos` field must be - // of the same sign as the `seconds` field. Must be from -999,999,999 - // to +999,999,999 inclusive. - int32 nanos = 2; -} diff --git a/handwritten/pubsub/protos/google/protobuf/empty.proto b/handwritten/pubsub/protos/google/protobuf/empty.proto deleted file mode 100644 index 03cacd23308..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/empty.proto +++ /dev/null @@ -1,52 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option go_package = "github.com/golang/protobuf/ptypes/empty"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "EmptyProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option cc_enable_arenas = true; - -// A generic empty message that you can re-use to avoid defining duplicated -// empty messages in your APIs. A typical example is to use it as the request -// or the response type of an API method. For instance: -// -// service Foo { -// rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty); -// } -// -// The JSON representation for `Empty` is empty JSON object `{}`. -message Empty {} diff --git a/handwritten/pubsub/protos/google/protobuf/field_mask.proto b/handwritten/pubsub/protos/google/protobuf/field_mask.proto deleted file mode 100644 index c68d247c8a4..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/field_mask.proto +++ /dev/null @@ -1,246 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "FieldMaskProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option go_package = "google.golang.org/genproto/protobuf/field_mask;field_mask"; - -// `FieldMask` represents a set of symbolic field paths, for example: -// -// paths: "f.a" -// paths: "f.b.d" -// -// Here `f` represents a field in some root message, `a` and `b` -// fields in the message found in `f`, and `d` a field found in the -// message in `f.b`. -// -// Field masks are used to specify a subset of fields that should be -// returned by a get operation or modified by an update operation. -// Field masks also have a custom JSON encoding (see below). -// -// # Field Masks in Projections -// -// When used in the context of a projection, a response message or -// sub-message is filtered by the API to only contain those fields as -// specified in the mask. For example, if the mask in the previous -// example is applied to a response message as follows: -// -// f { -// a : 22 -// b { -// d : 1 -// x : 2 -// } -// y : 13 -// } -// z: 8 -// -// The result will not contain specific values for fields x,y and z -// (their value will be set to the default, and omitted in proto text -// output): -// -// -// f { -// a : 22 -// b { -// d : 1 -// } -// } -// -// A repeated field is not allowed except at the last position of a -// paths string. -// -// If a FieldMask object is not present in a get operation, the -// operation applies to all fields (as if a FieldMask of all fields -// had been specified). -// -// Note that a field mask does not necessarily apply to the -// top-level response message. In case of a REST get operation, the -// field mask applies directly to the response, but in case of a REST -// list operation, the mask instead applies to each individual message -// in the returned resource list. In case of a REST custom method, -// other definitions may be used. Where the mask applies will be -// clearly documented together with its declaration in the API. In -// any case, the effect on the returned resource/resources is required -// behavior for APIs. -// -// # Field Masks in Update Operations -// -// A field mask in update operations specifies which fields of the -// targeted resource are going to be updated. The API is required -// to only change the values of the fields as specified in the mask -// and leave the others untouched. If a resource is passed in to -// describe the updated values, the API ignores the values of all -// fields not covered by the mask. -// -// If a repeated field is specified for an update operation, the existing -// repeated values in the target resource will be overwritten by the new values. -// Note that a repeated field is only allowed in the last position of a `paths` -// string. -// -// If a sub-message is specified in the last position of the field mask for an -// update operation, then the existing sub-message in the target resource is -// overwritten. Given the target message: -// -// f { -// b { -// d : 1 -// x : 2 -// } -// c : 1 -// } -// -// And an update message: -// -// f { -// b { -// d : 10 -// } -// } -// -// then if the field mask is: -// -// paths: "f.b" -// -// then the result will be: -// -// f { -// b { -// d : 10 -// } -// c : 1 -// } -// -// However, if the update mask was: -// -// paths: "f.b.d" -// -// then the result would be: -// -// f { -// b { -// d : 10 -// x : 2 -// } -// c : 1 -// } -// -// In order to reset a field's value to the default, the field must -// be in the mask and set to the default value in the provided resource. -// Hence, in order to reset all fields of a resource, provide a default -// instance of the resource and set all fields in the mask, or do -// not provide a mask as described below. -// -// If a field mask is not present on update, the operation applies to -// all fields (as if a field mask of all fields has been specified). -// Note that in the presence of schema evolution, this may mean that -// fields the client does not know and has therefore not filled into -// the request will be reset to their default. If this is unwanted -// behavior, a specific service may require a client to always specify -// a field mask, producing an error if not. -// -// As with get operations, the location of the resource which -// describes the updated values in the request message depends on the -// operation kind. In any case, the effect of the field mask is -// required to be honored by the API. -// -// ## Considerations for HTTP REST -// -// The HTTP kind of an update operation which uses a field mask must -// be set to PATCH instead of PUT in order to satisfy HTTP semantics -// (PUT must only be used for full updates). -// -// # JSON Encoding of Field Masks -// -// In JSON, a field mask is encoded as a single string where paths are -// separated by a comma. Fields name in each path are converted -// to/from lower-camel naming conventions. -// -// As an example, consider the following message declarations: -// -// message Profile { -// User user = 1; -// Photo photo = 2; -// } -// message User { -// string display_name = 1; -// string address = 2; -// } -// -// In proto a field mask for `Profile` may look as such: -// -// mask { -// paths: "user.display_name" -// paths: "photo" -// } -// -// In JSON, the same mask is represented as below: -// -// { -// mask: "user.displayName,photo" -// } -// -// # Field Masks and Oneof Fields -// -// Field masks treat fields in oneofs just as regular fields. Consider the -// following message: -// -// message SampleMessage { -// oneof test_oneof { -// string name = 4; -// SubMessage sub_message = 9; -// } -// } -// -// The field mask can be: -// -// mask { -// paths: "name" -// } -// -// Or: -// -// mask { -// paths: "sub_message" -// } -// -// Note that oneof type names ("test_oneof" in this case) cannot be used in -// paths. -message FieldMask { - // The set of field mask paths. - repeated string paths = 1; -} diff --git a/handwritten/pubsub/protos/google/protobuf/source_context.proto b/handwritten/pubsub/protos/google/protobuf/source_context.proto deleted file mode 100644 index f3b2c966811..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/source_context.proto +++ /dev/null @@ -1,48 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "SourceContextProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option go_package = "google.golang.org/genproto/protobuf/source_context;source_context"; - -// `SourceContext` represents information about the source of a -// protobuf element, like the file in which it is defined. -message SourceContext { - // The path-qualified name of the .proto file that contained the associated - // protobuf element. For example: `"google/protobuf/source_context.proto"`. - string file_name = 1; -} diff --git a/handwritten/pubsub/protos/google/protobuf/struct.proto b/handwritten/pubsub/protos/google/protobuf/struct.proto deleted file mode 100644 index 7d7808e7fbb..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/struct.proto +++ /dev/null @@ -1,96 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option go_package = "github.com/golang/protobuf/ptypes/struct;structpb"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "StructProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - - -// `Struct` represents a structured data value, consisting of fields -// which map to dynamically typed values. In some languages, `Struct` -// might be supported by a native representation. For example, in -// scripting languages like JS a struct is represented as an -// object. The details of that representation are described together -// with the proto support for the language. -// -// The JSON representation for `Struct` is JSON object. -message Struct { - // Unordered map of dynamically typed values. - map fields = 1; -} - -// `Value` represents a dynamically typed value which can be either -// null, a number, a string, a boolean, a recursive struct value, or a -// list of values. A producer of value is expected to set one of that -// variants, absence of any variant indicates an error. -// -// The JSON representation for `Value` is JSON value. -message Value { - // The kind of value. - oneof kind { - // Represents a null value. - NullValue null_value = 1; - // Represents a double value. - double number_value = 2; - // Represents a string value. - string string_value = 3; - // Represents a boolean value. - bool bool_value = 4; - // Represents a structured value. - Struct struct_value = 5; - // Represents a repeated `Value`. - ListValue list_value = 6; - } -} - -// `NullValue` is a singleton enumeration to represent the null value for the -// `Value` type union. -// -// The JSON representation for `NullValue` is JSON `null`. -enum NullValue { - // Null value. - NULL_VALUE = 0; -} - -// `ListValue` is a wrapper around a repeated field of values. -// -// The JSON representation for `ListValue` is JSON array. -message ListValue { - // Repeated field of dynamically typed values. - repeated Value values = 1; -} diff --git a/handwritten/pubsub/protos/google/protobuf/timestamp.proto b/handwritten/pubsub/protos/google/protobuf/timestamp.proto deleted file mode 100644 index b7cbd17502f..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/timestamp.proto +++ /dev/null @@ -1,133 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option go_package = "github.com/golang/protobuf/ptypes/timestamp"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "TimestampProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// A Timestamp represents a point in time independent of any time zone -// or calendar, represented as seconds and fractions of seconds at -// nanosecond resolution in UTC Epoch time. It is encoded using the -// Proleptic Gregorian Calendar which extends the Gregorian calendar -// backwards to year one. It is encoded assuming all minutes are 60 -// seconds long, i.e. leap seconds are "smeared" so that no leap second -// table is needed for interpretation. Range is from -// 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. -// By restricting to that range, we ensure that we can convert to -// and from RFC 3339 date strings. -// See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt). -// -// # Examples -// -// Example 1: Compute Timestamp from POSIX `time()`. -// -// Timestamp timestamp; -// timestamp.set_seconds(time(NULL)); -// timestamp.set_nanos(0); -// -// Example 2: Compute Timestamp from POSIX `gettimeofday()`. -// -// struct timeval tv; -// gettimeofday(&tv, NULL); -// -// Timestamp timestamp; -// timestamp.set_seconds(tv.tv_sec); -// timestamp.set_nanos(tv.tv_usec * 1000); -// -// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. -// -// FILETIME ft; -// GetSystemTimeAsFileTime(&ft); -// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; -// -// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z -// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. -// Timestamp timestamp; -// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); -// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); -// -// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. -// -// long millis = System.currentTimeMillis(); -// -// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) -// .setNanos((int) ((millis % 1000) * 1000000)).build(); -// -// -// Example 5: Compute Timestamp from current time in Python. -// -// timestamp = Timestamp() -// timestamp.GetCurrentTime() -// -// # JSON Mapping -// -// In JSON format, the Timestamp type is encoded as a string in the -// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the -// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z" -// where {year} is always expressed using four digits while {month}, {day}, -// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional -// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), -// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone -// is required, though only UTC (as indicated by "Z") is presently supported. -// -// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past -// 01:30 UTC on January 15, 2017. -// -// In JavaScript, one can convert a Date object to this format using the -// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString] -// method. In Python, a standard `datetime.datetime` object can be converted -// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) -// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one -// can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( -// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()) -// to obtain a formatter capable of generating timestamps in this format. -// -// -message Timestamp { - - // Represents seconds of UTC time since Unix epoch - // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to - // 9999-12-31T23:59:59Z inclusive. - int64 seconds = 1; - - // Non-negative fractions of a second at nanosecond resolution. Negative - // second values with fractions must still have non-negative nanos values - // that count forward in time. Must be from 0 to 999,999,999 - // inclusive. - int32 nanos = 2; -} diff --git a/handwritten/pubsub/protos/google/protobuf/type.proto b/handwritten/pubsub/protos/google/protobuf/type.proto deleted file mode 100644 index 624c15ee616..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/type.proto +++ /dev/null @@ -1,187 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -import "google/protobuf/any.proto"; -import "google/protobuf/source_context.proto"; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option java_package = "com.google.protobuf"; -option java_outer_classname = "TypeProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option go_package = "google.golang.org/genproto/protobuf/ptype;ptype"; - -// A protocol buffer message type. -message Type { - // The fully qualified message name. - string name = 1; - // The list of fields. - repeated Field fields = 2; - // The list of types appearing in `oneof` definitions in this type. - repeated string oneofs = 3; - // The protocol buffer options. - repeated Option options = 4; - // The source context. - SourceContext source_context = 5; - // The source syntax. - Syntax syntax = 6; -} - -// A single field of a message type. -message Field { - // Basic field types. - enum Kind { - // Field type unknown. - TYPE_UNKNOWN = 0; - // Field type double. - TYPE_DOUBLE = 1; - // Field type float. - TYPE_FLOAT = 2; - // Field type int64. - TYPE_INT64 = 3; - // Field type uint64. - TYPE_UINT64 = 4; - // Field type int32. - TYPE_INT32 = 5; - // Field type fixed64. - TYPE_FIXED64 = 6; - // Field type fixed32. - TYPE_FIXED32 = 7; - // Field type bool. - TYPE_BOOL = 8; - // Field type string. - TYPE_STRING = 9; - // Field type group. Proto2 syntax only, and deprecated. - TYPE_GROUP = 10; - // Field type message. - TYPE_MESSAGE = 11; - // Field type bytes. - TYPE_BYTES = 12; - // Field type uint32. - TYPE_UINT32 = 13; - // Field type enum. - TYPE_ENUM = 14; - // Field type sfixed32. - TYPE_SFIXED32 = 15; - // Field type sfixed64. - TYPE_SFIXED64 = 16; - // Field type sint32. - TYPE_SINT32 = 17; - // Field type sint64. - TYPE_SINT64 = 18; - }; - - // Whether a field is optional, required, or repeated. - enum Cardinality { - // For fields with unknown cardinality. - CARDINALITY_UNKNOWN = 0; - // For optional fields. - CARDINALITY_OPTIONAL = 1; - // For required fields. Proto2 syntax only. - CARDINALITY_REQUIRED = 2; - // For repeated fields. - CARDINALITY_REPEATED = 3; - }; - - // The field type. - Kind kind = 1; - // The field cardinality. - Cardinality cardinality = 2; - // The field number. - int32 number = 3; - // The field name. - string name = 4; - // The field type URL, without the scheme, for message or enumeration - // types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`. - string type_url = 6; - // The index of the field type in `Type.oneofs`, for message or enumeration - // types. The first type has index 1; zero means the type is not in the list. - int32 oneof_index = 7; - // Whether to use alternative packed wire representation. - bool packed = 8; - // The protocol buffer options. - repeated Option options = 9; - // The field JSON name. - string json_name = 10; - // The string value of the default value of this field. Proto2 syntax only. - string default_value = 11; -} - -// Enum type definition. -message Enum { - // Enum type name. - string name = 1; - // Enum value definitions. - repeated EnumValue enumvalue = 2; - // Protocol buffer options. - repeated Option options = 3; - // The source context. - SourceContext source_context = 4; - // The source syntax. - Syntax syntax = 5; -} - -// Enum value definition. -message EnumValue { - // Enum value name. - string name = 1; - // Enum value number. - int32 number = 2; - // Protocol buffer options. - repeated Option options = 3; -} - -// A protocol buffer option, which can be attached to a message, field, -// enumeration, etc. -message Option { - // The option's name. For protobuf built-in options (options defined in - // descriptor.proto), this is the short name. For example, `"map_entry"`. - // For custom options, it should be the fully-qualified name. For example, - // `"google.api.http"`. - string name = 1; - // The option's value packed in an Any message. If the value is a primitive, - // the corresponding wrapper type defined in google/protobuf/wrappers.proto - // should be used. If the value is an enum, it should be stored as an int32 - // value using the google.protobuf.Int32Value type. - Any value = 2; -} - -// The syntax in which a protocol buffer element is defined. -enum Syntax { - // Syntax `proto2`. - SYNTAX_PROTO2 = 0; - // Syntax `proto3`. - SYNTAX_PROTO3 = 1; -} diff --git a/handwritten/pubsub/protos/google/protobuf/util/json_format_proto3.proto b/handwritten/pubsub/protos/google/protobuf/util/json_format_proto3.proto deleted file mode 100644 index 8a0441c8f64..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/util/json_format_proto3.proto +++ /dev/null @@ -1,183 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package proto3; - -option java_package = "com.google.protobuf.util"; -option java_outer_classname = "JsonFormatProto3"; - -import "google/protobuf/duration.proto"; -import "google/protobuf/timestamp.proto"; -import "google/protobuf/wrappers.proto"; -import "google/protobuf/struct.proto"; -import "google/protobuf/any.proto"; -import "google/protobuf/field_mask.proto"; -import "google/protobuf/unittest.proto"; - -enum EnumType { - FOO = 0; - BAR = 1; -} - -message MessageType { - int32 value = 1; -} - -message TestMessage { - bool bool_value = 1; - int32 int32_value = 2; - int64 int64_value = 3; - uint32 uint32_value = 4; - uint64 uint64_value = 5; - float float_value = 6; - double double_value = 7; - string string_value = 8; - bytes bytes_value = 9; - EnumType enum_value = 10; - MessageType message_value = 11; - - repeated bool repeated_bool_value = 21; - repeated int32 repeated_int32_value = 22; - repeated int64 repeated_int64_value = 23; - repeated uint32 repeated_uint32_value = 24; - repeated uint64 repeated_uint64_value = 25; - repeated float repeated_float_value = 26; - repeated double repeated_double_value = 27; - repeated string repeated_string_value = 28; - repeated bytes repeated_bytes_value = 29; - repeated EnumType repeated_enum_value = 30; - repeated MessageType repeated_message_value = 31; -} - -message TestOneof { - // In JSON format oneof fields behave mostly the same as optional - // fields except that: - // 1. Oneof fields have field presence information and will be - // printed if it's set no matter whether it's the default value. - // 2. Multiple oneof fields in the same oneof cannot appear at the - // same time in the input. - oneof oneof_value { - int32 oneof_int32_value = 1; - string oneof_string_value = 2; - bytes oneof_bytes_value = 3; - EnumType oneof_enum_value = 4; - MessageType oneof_message_value = 5; - } -} - -message TestMap { - map bool_map = 1; - map int32_map = 2; - map int64_map = 3; - map uint32_map = 4; - map uint64_map = 5; - map string_map = 6; -} - -message TestNestedMap { - map bool_map = 1; - map int32_map = 2; - map int64_map = 3; - map uint32_map = 4; - map uint64_map = 5; - map string_map = 6; - map map_map = 7; -} - -message TestWrapper { - google.protobuf.BoolValue bool_value = 1; - google.protobuf.Int32Value int32_value = 2; - google.protobuf.Int64Value int64_value = 3; - google.protobuf.UInt32Value uint32_value = 4; - google.protobuf.UInt64Value uint64_value = 5; - google.protobuf.FloatValue float_value = 6; - google.protobuf.DoubleValue double_value = 7; - google.protobuf.StringValue string_value = 8; - google.protobuf.BytesValue bytes_value = 9; - - repeated google.protobuf.BoolValue repeated_bool_value = 11; - repeated google.protobuf.Int32Value repeated_int32_value = 12; - repeated google.protobuf.Int64Value repeated_int64_value = 13; - repeated google.protobuf.UInt32Value repeated_uint32_value = 14; - repeated google.protobuf.UInt64Value repeated_uint64_value = 15; - repeated google.protobuf.FloatValue repeated_float_value = 16; - repeated google.protobuf.DoubleValue repeated_double_value = 17; - repeated google.protobuf.StringValue repeated_string_value = 18; - repeated google.protobuf.BytesValue repeated_bytes_value = 19; -} - -message TestTimestamp { - google.protobuf.Timestamp value = 1; - repeated google.protobuf.Timestamp repeated_value = 2; -} - -message TestDuration { - google.protobuf.Duration value = 1; - repeated google.protobuf.Duration repeated_value = 2; -} - -message TestFieldMask { - google.protobuf.FieldMask value = 1; -} - -message TestStruct { - google.protobuf.Struct value = 1; - repeated google.protobuf.Struct repeated_value = 2; -} - -message TestAny { - google.protobuf.Any value = 1; - repeated google.protobuf.Any repeated_value = 2; -} - -message TestValue { - google.protobuf.Value value = 1; - repeated google.protobuf.Value repeated_value = 2; -} - -message TestListValue { - google.protobuf.ListValue value = 1; - repeated google.protobuf.ListValue repeated_value = 2; -} - -message TestBoolValue { - bool bool_value = 1; - map bool_map = 2; -} - -message TestCustomJsonName { - int32 value = 1 [json_name = "@value"]; -} - -message TestExtensions { - .protobuf_unittest.TestAllExtensions extensions = 1; -} diff --git a/handwritten/pubsub/protos/google/protobuf/wrappers.proto b/handwritten/pubsub/protos/google/protobuf/wrappers.proto deleted file mode 100644 index 01947639ac4..00000000000 --- a/handwritten/pubsub/protos/google/protobuf/wrappers.proto +++ /dev/null @@ -1,118 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Wrappers for primitive (non-message) types. These types are useful -// for embedding primitives in the `google.protobuf.Any` type and for places -// where we need to distinguish between the absence of a primitive -// typed field and its default value. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option go_package = "github.com/golang/protobuf/ptypes/wrappers"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "WrappersProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// Wrapper message for `double`. -// -// The JSON representation for `DoubleValue` is JSON number. -message DoubleValue { - // The double value. - double value = 1; -} - -// Wrapper message for `float`. -// -// The JSON representation for `FloatValue` is JSON number. -message FloatValue { - // The float value. - float value = 1; -} - -// Wrapper message for `int64`. -// -// The JSON representation for `Int64Value` is JSON string. -message Int64Value { - // The int64 value. - int64 value = 1; -} - -// Wrapper message for `uint64`. -// -// The JSON representation for `UInt64Value` is JSON string. -message UInt64Value { - // The uint64 value. - uint64 value = 1; -} - -// Wrapper message for `int32`. -// -// The JSON representation for `Int32Value` is JSON number. -message Int32Value { - // The int32 value. - int32 value = 1; -} - -// Wrapper message for `uint32`. -// -// The JSON representation for `UInt32Value` is JSON number. -message UInt32Value { - // The uint32 value. - uint32 value = 1; -} - -// Wrapper message for `bool`. -// -// The JSON representation for `BoolValue` is JSON `true` and `false`. -message BoolValue { - // The bool value. - bool value = 1; -} - -// Wrapper message for `string`. -// -// The JSON representation for `StringValue` is JSON string. -message StringValue { - // The string value. - string value = 1; -} - -// Wrapper message for `bytes`. -// -// The JSON representation for `BytesValue` is JSON string. -message BytesValue { - // The bytes value. - bytes value = 1; -} diff --git a/handwritten/pubsub/protos/google/type/expr.proto b/handwritten/pubsub/protos/google/type/expr.proto deleted file mode 100644 index 444742513a6..00000000000 --- a/handwritten/pubsub/protos/google/type/expr.proto +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2019 Google LLC. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -syntax = "proto3"; - -package google.type; - -option go_package = "google.golang.org/genproto/googleapis/type/expr;expr"; -option java_multiple_files = true; -option java_outer_classname = "ExprProto"; -option java_package = "com.google.type"; -option objc_class_prefix = "GTP"; - - -// Represents an expression text. Example: -// -// title: "User account presence" -// description: "Determines whether the request has a user account" -// expression: "size(request.user) > 0" -message Expr { - // Textual representation of an expression in - // Common Expression Language syntax. - // - // The application context of the containing message determines which - // well-known feature set of CEL is supported. - string expression = 1; - - // An optional title for the expression, i.e. a short string describing - // its purpose. This can be used e.g. in UIs which allow to enter the - // expression. - string title = 2; - - // An optional description of the expression. This is a longer text which - // describes the expression, e.g. when hovered over it in a UI. - string description = 3; - - // An optional string indicating the location of the expression for error - // reporting, e.g. a file name and a position in the file. - string location = 4; -} From b92c41ac697f0821119745bb6789e569d77b4a38 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 19 Mar 2021 14:11:26 -0400 Subject: [PATCH 0723/1115] docs: add typings, plus new documentation, on the on() methods of Subscriber (#1225) * docs: add optional typings, plus new documentation, on the on() methods of Subscriber * build: i'm not sure why it keeps wanting to shift these lines around, but sure * docs: update typings to be a bit more specific again, and fix a system-test that was broken by it * fix: deactive typings for Subscription.on() for now, and revert typing change to the listener event handler --- handwritten/pubsub/src/subscription.ts | 37 +++++++++++++++++++++++- handwritten/pubsub/system-test/pubsub.ts | 6 ++-- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 589c602bf30..0c8a4cf379c 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -88,6 +88,32 @@ export type SetSubscriptionMetadataResponse = MetadataResponse; export type DetachSubscriptionCallback = EmptyCallback; export type DetachSubscriptionResponse = EmptyResponse; +// JSDoc won't see these, so this is just to let you get typings +// in your editor of choice. +// +// NOTE: These are commented out for now because we don't want to +// break any existing clients that rely on not-entirely-correct +// typings. We'll re-enable on the next major. +/* export declare interface Subscription { + on( + event: 'message', + listener: (message: Message) => void + ): this; + on( + event: 'error', + listener: (error: StatusError) => void + ): this; + on(event: 'close', listener: () => void): this; + + // Only used internally. + on(event: 'newListener', listener: Function): this; + on(event: 'removeListener', listener: Function): this; + + // Catch-all. If you get an error about this line, it means you're + // using an unsupported event type or listener type. + on(event: string, listener: void): this; +} */ + /** * @typedef {object} ExpirationPolicy * A policy that specifies the conditions for this subscription's expiration. A @@ -120,7 +146,16 @@ export type DetachSubscriptionResponse = EmptyResponse; * All Subscription objects are instances of an * [EventEmitter](http://nodejs.org/api/events.html). The subscription will pull * for messages automatically as long as there is at least one listener assigned - * for the `message` event. + * for the `message` event. Available events: + * + * Upon receipt of a message: + * on(event: 'message', listener: (message: {@link Message}) => void): this; + * + * Upon receipt of an error: + * on(event: 'error', listener: (error: Error) => void): this; + * + * Upon the closing of the subscriber: + * on(event: 'close', listener: Function): this; * * By default Subscription objects allow you to process 100 messages at the same * time. You can fine tune this value by adjusting the diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index d4d96e32b43..c1ea0159c2d 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -904,12 +904,12 @@ describe('pubsub', () => { // This creates a Promise that hooks the 'message' callback of the // subscription above, and resolves when that callback calls `resolve`. - type WorkCallback = (arg: T, resolve: Function) => void; + type WorkCallback = (arg: Message, resolve: Function) => void; function makeMessagePromise( - workCallback: WorkCallback + workCallback: WorkCallback ): Promise { return new Promise(resolve => { - subscription.on('message', (arg: T) => { + subscription.on('message', (arg: Message) => { workCallback(arg, resolve); }); }); From fe335399df9c73c3be9cbf8a7e0cdf462251ad11 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 19 Mar 2021 12:00:03 -0700 Subject: [PATCH 0724/1115] fix: follow-on proto updates from the removal of the common protos (#1229) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/b2e473bb-8cb9-437a-99a7-b397eb8b7938/targets - [ ] To automatically regenerate this PR, check this box. --- handwritten/pubsub/protos/protos.d.ts | 249 ---------- handwritten/pubsub/protos/protos.js | 688 +------------------------- handwritten/pubsub/protos/protos.json | 79 +-- handwritten/pubsub/synth.metadata | 2 +- 4 files changed, 6 insertions(+), 1012 deletions(-) diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 2bc15192ae9..6ae2e2767a1 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -6210,9 +6210,6 @@ export namespace google { /** Http rules */ rules?: (google.api.IHttpRule[]|null); - - /** Http fullyDecodeReservedExpansion */ - fullyDecodeReservedExpansion?: (boolean|null); } /** Represents a Http. */ @@ -6227,9 +6224,6 @@ export namespace google { /** Http rules. */ public rules: google.api.IHttpRule[]; - /** Http fullyDecodeReservedExpansion. */ - public fullyDecodeReservedExpansion: boolean; - /** * Creates a new Http instance using the specified properties. * @param [properties] Properties to set @@ -6328,9 +6322,6 @@ export namespace google { /** HttpRule body */ body?: (string|null); - /** HttpRule responseBody */ - responseBody?: (string|null); - /** HttpRule additionalBindings */ additionalBindings?: (google.api.IHttpRule[]|null); } @@ -6368,9 +6359,6 @@ export namespace google { /** HttpRule body. */ public body: string; - /** HttpRule responseBody. */ - public responseBody: string; - /** HttpRule additionalBindings. */ public additionalBindings: google.api.IHttpRule[]; @@ -7197,9 +7185,6 @@ export namespace google { /** ExtensionRange end */ end?: (number|null); - - /** ExtensionRange options */ - options?: (google.protobuf.IExtensionRangeOptions|null); } /** Represents an ExtensionRange. */ @@ -7217,9 +7202,6 @@ export namespace google { /** ExtensionRange end. */ public end: number; - /** ExtensionRange options. */ - public options?: (google.protobuf.IExtensionRangeOptions|null); - /** * Creates a new ExtensionRange instance using the specified properties. * @param [properties] Properties to set @@ -7388,96 +7370,6 @@ export namespace google { } } - /** Properties of an ExtensionRangeOptions. */ - interface IExtensionRangeOptions { - - /** ExtensionRangeOptions uninterpretedOption */ - uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); - } - - /** Represents an ExtensionRangeOptions. */ - class ExtensionRangeOptions implements IExtensionRangeOptions { - - /** - * Constructs a new ExtensionRangeOptions. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.IExtensionRangeOptions); - - /** ExtensionRangeOptions uninterpretedOption. */ - public uninterpretedOption: google.protobuf.IUninterpretedOption[]; - - /** - * Creates a new ExtensionRangeOptions instance using the specified properties. - * @param [properties] Properties to set - * @returns ExtensionRangeOptions instance - */ - public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; - - /** - * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @param message ExtensionRangeOptions message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; - - /** - * Verifies an ExtensionRangeOptions message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ExtensionRangeOptions - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; - - /** - * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. - * @param message ExtensionRangeOptions - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ExtensionRangeOptions to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - /** Properties of a FieldDescriptorProto. */ interface IFieldDescriptorProto { @@ -7510,9 +7402,6 @@ export namespace google { /** FieldDescriptorProto options */ options?: (google.protobuf.IFieldOptions|null); - - /** FieldDescriptorProto proto3Optional */ - proto3Optional?: (boolean|null); } /** Represents a FieldDescriptorProto. */ @@ -7554,9 +7443,6 @@ export namespace google { /** FieldDescriptorProto options. */ public options?: (google.protobuf.IFieldOptions|null); - /** FieldDescriptorProto proto3Optional. */ - public proto3Optional: boolean; - /** * Creates a new FieldDescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -7767,12 +7653,6 @@ export namespace google { /** EnumDescriptorProto options */ options?: (google.protobuf.IEnumOptions|null); - - /** EnumDescriptorProto reservedRange */ - reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); - - /** EnumDescriptorProto reservedName */ - reservedName?: (string[]|null); } /** Represents an EnumDescriptorProto. */ @@ -7793,12 +7673,6 @@ export namespace google { /** EnumDescriptorProto options. */ public options?: (google.protobuf.IEnumOptions|null); - /** EnumDescriptorProto reservedRange. */ - public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; - - /** EnumDescriptorProto reservedName. */ - public reservedName: string[]; - /** * Creates a new EnumDescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -7870,105 +7744,6 @@ export namespace google { public toJSON(): { [k: string]: any }; } - namespace EnumDescriptorProto { - - /** Properties of an EnumReservedRange. */ - interface IEnumReservedRange { - - /** EnumReservedRange start */ - start?: (number|null); - - /** EnumReservedRange end */ - end?: (number|null); - } - - /** Represents an EnumReservedRange. */ - class EnumReservedRange implements IEnumReservedRange { - - /** - * Constructs a new EnumReservedRange. - * @param [properties] Properties to set - */ - constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); - - /** EnumReservedRange start. */ - public start: number; - - /** EnumReservedRange end. */ - public end: number; - - /** - * Creates a new EnumReservedRange instance using the specified properties. - * @param [properties] Properties to set - * @returns EnumReservedRange instance - */ - public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @param message EnumReservedRange message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes an EnumReservedRange message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns EnumReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns EnumReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Verifies an EnumReservedRange message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns EnumReservedRange - */ - public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; - - /** - * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. - * @param message EnumReservedRange - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this EnumReservedRange to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - } - } - /** Properties of an EnumValueDescriptorProto. */ interface IEnumValueDescriptorProto { @@ -8326,9 +8101,6 @@ export namespace google { /** FileOptions pyGenericServices */ pyGenericServices?: (boolean|null); - /** FileOptions phpGenericServices */ - phpGenericServices?: (boolean|null); - /** FileOptions deprecated */ deprecated?: (boolean|null); @@ -8347,15 +8119,6 @@ export namespace google { /** FileOptions phpClassPrefix */ phpClassPrefix?: (string|null); - /** FileOptions phpNamespace */ - phpNamespace?: (string|null); - - /** FileOptions phpMetadataNamespace */ - phpMetadataNamespace?: (string|null); - - /** FileOptions rubyPackage */ - rubyPackage?: (string|null); - /** FileOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -8402,9 +8165,6 @@ export namespace google { /** FileOptions pyGenericServices. */ public pyGenericServices: boolean; - /** FileOptions phpGenericServices. */ - public phpGenericServices: boolean; - /** FileOptions deprecated. */ public deprecated: boolean; @@ -8423,15 +8183,6 @@ export namespace google { /** FileOptions phpClassPrefix. */ public phpClassPrefix: string; - /** FileOptions phpNamespace. */ - public phpNamespace: string; - - /** FileOptions phpMetadataNamespace. */ - public phpMetadataNamespace: string; - - /** FileOptions rubyPackage. */ - public rubyPackage: string; - /** FileOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 2d3c27e7191..456396fe54c 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -14123,7 +14123,6 @@ * @memberof google.api * @interface IHttp * @property {Array.|null} [rules] Http rules - * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion */ /** @@ -14150,14 +14149,6 @@ */ Http.prototype.rules = $util.emptyArray; - /** - * Http fullyDecodeReservedExpansion. - * @member {boolean} fullyDecodeReservedExpansion - * @memberof google.api.Http - * @instance - */ - Http.prototype.fullyDecodeReservedExpansion = false; - /** * Creates a new Http instance using the specified properties. * @function create @@ -14185,8 +14176,6 @@ if (message.rules != null && message.rules.length) for (var i = 0; i < message.rules.length; ++i) $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.fullyDecodeReservedExpansion != null && Object.hasOwnProperty.call(message, "fullyDecodeReservedExpansion")) - writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); return writer; }; @@ -14226,9 +14215,6 @@ message.rules = []; message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); break; - case 2: - message.fullyDecodeReservedExpansion = reader.bool(); - break; default: reader.skipType(tag & 7); break; @@ -14273,9 +14259,6 @@ return "rules." + error; } } - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - if (typeof message.fullyDecodeReservedExpansion !== "boolean") - return "fullyDecodeReservedExpansion: boolean expected"; return null; }; @@ -14301,8 +14284,6 @@ message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); } } - if (object.fullyDecodeReservedExpansion != null) - message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); return message; }; @@ -14321,15 +14302,11 @@ var object = {}; if (options.arrays || options.defaults) object.rules = []; - if (options.defaults) - object.fullyDecodeReservedExpansion = false; if (message.rules && message.rules.length) { object.rules = []; for (var j = 0; j < message.rules.length; ++j) object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); } - if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) - object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; return object; }; @@ -14361,7 +14338,6 @@ * @property {string|null} [patch] HttpRule patch * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom * @property {string|null} [body] HttpRule body - * @property {string|null} [responseBody] HttpRule responseBody * @property {Array.|null} [additionalBindings] HttpRule additionalBindings */ @@ -14445,14 +14421,6 @@ */ HttpRule.prototype.body = ""; - /** - * HttpRule responseBody. - * @member {string} responseBody - * @memberof google.api.HttpRule - * @instance - */ - HttpRule.prototype.responseBody = ""; - /** * HttpRule additionalBindings. * @member {Array.} additionalBindings @@ -14518,8 +14486,6 @@ if (message.additionalBindings != null && message.additionalBindings.length) for (var i = 0; i < message.additionalBindings.length; ++i) $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.responseBody != null && Object.hasOwnProperty.call(message, "responseBody")) - writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); return writer; }; @@ -14578,9 +14544,6 @@ case 7: message.body = reader.string(); break; - case 12: - message.responseBody = reader.string(); - break; case 11: if (!(message.additionalBindings && message.additionalBindings.length)) message.additionalBindings = []; @@ -14671,9 +14634,6 @@ if (message.body != null && message.hasOwnProperty("body")) if (!$util.isString(message.body)) return "body: string expected"; - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - if (!$util.isString(message.responseBody)) - return "responseBody: string expected"; if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { if (!Array.isArray(message.additionalBindings)) return "additionalBindings: array expected"; @@ -14717,8 +14677,6 @@ } if (object.body != null) message.body = String(object.body); - if (object.responseBody != null) - message.responseBody = String(object.responseBody); if (object.additionalBindings) { if (!Array.isArray(object.additionalBindings)) throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); @@ -14750,7 +14708,6 @@ if (options.defaults) { object.selector = ""; object.body = ""; - object.responseBody = ""; } if (message.selector != null && message.hasOwnProperty("selector")) object.selector = message.selector; @@ -14791,8 +14748,6 @@ for (var j = 0; j < message.additionalBindings.length; ++j) object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); } - if (message.responseBody != null && message.hasOwnProperty("responseBody")) - object.responseBody = message.responseBody; return object; }; @@ -17044,7 +16999,6 @@ * @interface IExtensionRange * @property {number|null} [start] ExtensionRange start * @property {number|null} [end] ExtensionRange end - * @property {google.protobuf.IExtensionRangeOptions|null} [options] ExtensionRange options */ /** @@ -17078,14 +17032,6 @@ */ ExtensionRange.prototype.end = 0; - /** - * ExtensionRange options. - * @member {google.protobuf.IExtensionRangeOptions|null|undefined} options - * @memberof google.protobuf.DescriptorProto.ExtensionRange - * @instance - */ - ExtensionRange.prototype.options = null; - /** * Creates a new ExtensionRange instance using the specified properties. * @function create @@ -17114,8 +17060,6 @@ writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); if (message.end != null && Object.hasOwnProperty.call(message, "end")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); - if (message.options != null && Object.hasOwnProperty.call(message, "options")) - $root.google.protobuf.ExtensionRangeOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; @@ -17156,9 +17100,6 @@ case 2: message.end = reader.int32(); break; - case 3: - message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); - break; default: reader.skipType(tag & 7); break; @@ -17200,11 +17141,6 @@ if (message.end != null && message.hasOwnProperty("end")) if (!$util.isInteger(message.end)) return "end: integer expected"; - if (message.options != null && message.hasOwnProperty("options")) { - var error = $root.google.protobuf.ExtensionRangeOptions.verify(message.options); - if (error) - return "options." + error; - } return null; }; @@ -17224,11 +17160,6 @@ message.start = object.start | 0; if (object.end != null) message.end = object.end | 0; - if (object.options != null) { - if (typeof object.options !== "object") - throw TypeError(".google.protobuf.DescriptorProto.ExtensionRange.options: object expected"); - message.options = $root.google.protobuf.ExtensionRangeOptions.fromObject(object.options); - } return message; }; @@ -17248,14 +17179,11 @@ if (options.defaults) { object.start = 0; object.end = 0; - object.options = null; } if (message.start != null && message.hasOwnProperty("start")) object.start = message.start; if (message.end != null && message.hasOwnProperty("end")) object.end = message.end; - if (message.options != null && message.hasOwnProperty("options")) - object.options = $root.google.protobuf.ExtensionRangeOptions.toObject(message.options, options); return object; }; @@ -17486,214 +17414,6 @@ return DescriptorProto; })(); - protobuf.ExtensionRangeOptions = (function() { - - /** - * Properties of an ExtensionRangeOptions. - * @memberof google.protobuf - * @interface IExtensionRangeOptions - * @property {Array.|null} [uninterpretedOption] ExtensionRangeOptions uninterpretedOption - */ - - /** - * Constructs a new ExtensionRangeOptions. - * @memberof google.protobuf - * @classdesc Represents an ExtensionRangeOptions. - * @implements IExtensionRangeOptions - * @constructor - * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set - */ - function ExtensionRangeOptions(properties) { - this.uninterpretedOption = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ExtensionRangeOptions uninterpretedOption. - * @member {Array.} uninterpretedOption - * @memberof google.protobuf.ExtensionRangeOptions - * @instance - */ - ExtensionRangeOptions.prototype.uninterpretedOption = $util.emptyArray; - - /** - * Creates a new ExtensionRangeOptions instance using the specified properties. - * @function create - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions instance - */ - ExtensionRangeOptions.create = function create(properties) { - return new ExtensionRangeOptions(properties); - }; - - /** - * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @function encode - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExtensionRangeOptions.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.uninterpretedOption != null && message.uninterpretedOption.length) - for (var i = 0; i < message.uninterpretedOption.length; ++i) - $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ExtensionRangeOptions.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExtensionRangeOptions.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ExtensionRangeOptions.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an ExtensionRangeOptions message. - * @function verify - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ExtensionRangeOptions.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { - if (!Array.isArray(message.uninterpretedOption)) - return "uninterpretedOption: array expected"; - for (var i = 0; i < message.uninterpretedOption.length; ++i) { - var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); - if (error) - return "uninterpretedOption." + error; - } - } - return null; - }; - - /** - * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions - */ - ExtensionRangeOptions.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.ExtensionRangeOptions) - return object; - var message = new $root.google.protobuf.ExtensionRangeOptions(); - if (object.uninterpretedOption) { - if (!Array.isArray(object.uninterpretedOption)) - throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: array expected"); - message.uninterpretedOption = []; - for (var i = 0; i < object.uninterpretedOption.length; ++i) { - if (typeof object.uninterpretedOption[i] !== "object") - throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: object expected"); - message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); - } - } - return message; - }; - - /** - * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.ExtensionRangeOptions - * @static - * @param {google.protobuf.ExtensionRangeOptions} message ExtensionRangeOptions - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ExtensionRangeOptions.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.uninterpretedOption = []; - if (message.uninterpretedOption && message.uninterpretedOption.length) { - object.uninterpretedOption = []; - for (var j = 0; j < message.uninterpretedOption.length; ++j) - object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); - } - return object; - }; - - /** - * Converts this ExtensionRangeOptions to JSON. - * @function toJSON - * @memberof google.protobuf.ExtensionRangeOptions - * @instance - * @returns {Object.} JSON object - */ - ExtensionRangeOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return ExtensionRangeOptions; - })(); - protobuf.FieldDescriptorProto = (function() { /** @@ -17710,7 +17430,6 @@ * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex * @property {string|null} [jsonName] FieldDescriptorProto jsonName * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options - * @property {boolean|null} [proto3Optional] FieldDescriptorProto proto3Optional */ /** @@ -17808,14 +17527,6 @@ */ FieldDescriptorProto.prototype.options = null; - /** - * FieldDescriptorProto proto3Optional. - * @member {boolean} proto3Optional - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.proto3Optional = false; - /** * Creates a new FieldDescriptorProto instance using the specified properties. * @function create @@ -17860,8 +17571,6 @@ writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); if (message.jsonName != null && Object.hasOwnProperty.call(message, "jsonName")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); - if (message.proto3Optional != null && Object.hasOwnProperty.call(message, "proto3Optional")) - writer.uint32(/* id 17, wireType 0 =*/136).bool(message.proto3Optional); return writer; }; @@ -17926,9 +17635,6 @@ case 8: message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); break; - case 17: - message.proto3Optional = reader.bool(); - break; default: reader.skipType(tag & 7); break; @@ -18023,9 +17729,6 @@ if (error) return "options." + error; } - if (message.proto3Optional != null && message.hasOwnProperty("proto3Optional")) - if (typeof message.proto3Optional !== "boolean") - return "proto3Optional: boolean expected"; return null; }; @@ -18148,8 +17851,6 @@ throw TypeError(".google.protobuf.FieldDescriptorProto.options: object expected"); message.options = $root.google.protobuf.FieldOptions.fromObject(object.options); } - if (object.proto3Optional != null) - message.proto3Optional = Boolean(object.proto3Optional); return message; }; @@ -18177,7 +17878,6 @@ object.options = null; object.oneofIndex = 0; object.jsonName = ""; - object.proto3Optional = false; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -18199,8 +17899,6 @@ object.oneofIndex = message.oneofIndex; if (message.jsonName != null && message.hasOwnProperty("jsonName")) object.jsonName = message.jsonName; - if (message.proto3Optional != null && message.hasOwnProperty("proto3Optional")) - object.proto3Optional = message.proto3Optional; return object; }; @@ -18504,8 +18202,6 @@ * @property {string|null} [name] EnumDescriptorProto name * @property {Array.|null} [value] EnumDescriptorProto value * @property {google.protobuf.IEnumOptions|null} [options] EnumDescriptorProto options - * @property {Array.|null} [reservedRange] EnumDescriptorProto reservedRange - * @property {Array.|null} [reservedName] EnumDescriptorProto reservedName */ /** @@ -18518,8 +18214,6 @@ */ function EnumDescriptorProto(properties) { this.value = []; - this.reservedRange = []; - this.reservedName = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -18550,22 +18244,6 @@ */ EnumDescriptorProto.prototype.options = null; - /** - * EnumDescriptorProto reservedRange. - * @member {Array.} reservedRange - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.reservedRange = $util.emptyArray; - - /** - * EnumDescriptorProto reservedName. - * @member {Array.} reservedName - * @memberof google.protobuf.EnumDescriptorProto - * @instance - */ - EnumDescriptorProto.prototype.reservedName = $util.emptyArray; - /** * Creates a new EnumDescriptorProto instance using the specified properties. * @function create @@ -18597,12 +18275,6 @@ $root.google.protobuf.EnumValueDescriptorProto.encode(message.value[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.EnumOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.reservedRange != null && message.reservedRange.length) - for (var i = 0; i < message.reservedRange.length; ++i) - $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.reservedName != null && message.reservedName.length) - for (var i = 0; i < message.reservedName.length; ++i) - writer.uint32(/* id 5, wireType 2 =*/42).string(message.reservedName[i]); return writer; }; @@ -18648,16 +18320,6 @@ case 3: message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); break; - case 4: - if (!(message.reservedRange && message.reservedRange.length)) - message.reservedRange = []; - message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.reservedName && message.reservedName.length)) - message.reservedName = []; - message.reservedName.push(reader.string()); - break; default: reader.skipType(tag & 7); break; @@ -18710,22 +18372,6 @@ if (error) return "options." + error; } - if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { - if (!Array.isArray(message.reservedRange)) - return "reservedRange: array expected"; - for (var i = 0; i < message.reservedRange.length; ++i) { - var error = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.verify(message.reservedRange[i]); - if (error) - return "reservedRange." + error; - } - } - if (message.reservedName != null && message.hasOwnProperty("reservedName")) { - if (!Array.isArray(message.reservedName)) - return "reservedName: array expected"; - for (var i = 0; i < message.reservedName.length; ++i) - if (!$util.isString(message.reservedName[i])) - return "reservedName: string[] expected"; - } return null; }; @@ -18758,23 +18404,6 @@ throw TypeError(".google.protobuf.EnumDescriptorProto.options: object expected"); message.options = $root.google.protobuf.EnumOptions.fromObject(object.options); } - if (object.reservedRange) { - if (!Array.isArray(object.reservedRange)) - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: array expected"); - message.reservedRange = []; - for (var i = 0; i < object.reservedRange.length; ++i) { - if (typeof object.reservedRange[i] !== "object") - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: object expected"); - message.reservedRange[i] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.fromObject(object.reservedRange[i]); - } - } - if (object.reservedName) { - if (!Array.isArray(object.reservedName)) - throw TypeError(".google.protobuf.EnumDescriptorProto.reservedName: array expected"); - message.reservedName = []; - for (var i = 0; i < object.reservedName.length; ++i) - message.reservedName[i] = String(object.reservedName[i]); - } return message; }; @@ -18791,11 +18420,8 @@ if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) { + if (options.arrays || options.defaults) object.value = []; - object.reservedRange = []; - object.reservedName = []; - } if (options.defaults) { object.name = ""; object.options = null; @@ -18809,16 +18435,6 @@ } if (message.options != null && message.hasOwnProperty("options")) object.options = $root.google.protobuf.EnumOptions.toObject(message.options, options); - if (message.reservedRange && message.reservedRange.length) { - object.reservedRange = []; - for (var j = 0; j < message.reservedRange.length; ++j) - object.reservedRange[j] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.toObject(message.reservedRange[j], options); - } - if (message.reservedName && message.reservedName.length) { - object.reservedName = []; - for (var j = 0; j < message.reservedName.length; ++j) - object.reservedName[j] = message.reservedName[j]; - } return object; }; @@ -18833,216 +18449,6 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - EnumDescriptorProto.EnumReservedRange = (function() { - - /** - * Properties of an EnumReservedRange. - * @memberof google.protobuf.EnumDescriptorProto - * @interface IEnumReservedRange - * @property {number|null} [start] EnumReservedRange start - * @property {number|null} [end] EnumReservedRange end - */ - - /** - * Constructs a new EnumReservedRange. - * @memberof google.protobuf.EnumDescriptorProto - * @classdesc Represents an EnumReservedRange. - * @implements IEnumReservedRange - * @constructor - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set - */ - function EnumReservedRange(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * EnumReservedRange start. - * @member {number} start - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @instance - */ - EnumReservedRange.prototype.start = 0; - - /** - * EnumReservedRange end. - * @member {number} end - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @instance - */ - EnumReservedRange.prototype.end = 0; - - /** - * Creates a new EnumReservedRange instance using the specified properties. - * @function create - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange instance - */ - EnumReservedRange.create = function create(properties) { - return new EnumReservedRange(properties); - }; - - /** - * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @function encode - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumReservedRange.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.start != null && Object.hasOwnProperty.call(message, "start")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end != null && Object.hasOwnProperty.call(message, "end")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); - return writer; - }; - - /** - * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. - * @function encodeDelimited - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @static - * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - EnumReservedRange.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes an EnumReservedRange message from the specified reader or buffer. - * @function decode - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumReservedRange.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: - message.start = reader.int32(); - break; - case 2: - message.end = reader.int32(); - break; - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - EnumReservedRange.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies an EnumReservedRange message. - * @function verify - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - EnumReservedRange.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.start != null && message.hasOwnProperty("start")) - if (!$util.isInteger(message.start)) - return "start: integer expected"; - if (message.end != null && message.hasOwnProperty("end")) - if (!$util.isInteger(message.end)) - return "end: integer expected"; - return null; - }; - - /** - * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @static - * @param {Object.} object Plain object - * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange - */ - EnumReservedRange.fromObject = function fromObject(object) { - if (object instanceof $root.google.protobuf.EnumDescriptorProto.EnumReservedRange) - return object; - var message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); - if (object.start != null) - message.start = object.start | 0; - if (object.end != null) - message.end = object.end | 0; - return message; - }; - - /** - * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. - * @function toObject - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @static - * @param {google.protobuf.EnumDescriptorProto.EnumReservedRange} message EnumReservedRange - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - EnumReservedRange.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.start = 0; - object.end = 0; - } - if (message.start != null && message.hasOwnProperty("start")) - object.start = message.start; - if (message.end != null && message.hasOwnProperty("end")) - object.end = message.end; - return object; - }; - - /** - * Converts this EnumReservedRange to JSON. - * @function toJSON - * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange - * @instance - * @returns {Object.} JSON object - */ - EnumReservedRange.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - return EnumReservedRange; - })(); - return EnumDescriptorProto; })(); @@ -19861,16 +19267,12 @@ * @property {boolean|null} [ccGenericServices] FileOptions ccGenericServices * @property {boolean|null} [javaGenericServices] FileOptions javaGenericServices * @property {boolean|null} [pyGenericServices] FileOptions pyGenericServices - * @property {boolean|null} [phpGenericServices] FileOptions phpGenericServices * @property {boolean|null} [deprecated] FileOptions deprecated * @property {boolean|null} [ccEnableArenas] FileOptions ccEnableArenas * @property {string|null} [objcClassPrefix] FileOptions objcClassPrefix * @property {string|null} [csharpNamespace] FileOptions csharpNamespace * @property {string|null} [swiftPrefix] FileOptions swiftPrefix * @property {string|null} [phpClassPrefix] FileOptions phpClassPrefix - * @property {string|null} [phpNamespace] FileOptions phpNamespace - * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace - * @property {string|null} [rubyPackage] FileOptions rubyPackage * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption * @property {Array.|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition */ @@ -19972,14 +19374,6 @@ */ FileOptions.prototype.pyGenericServices = false; - /** - * FileOptions phpGenericServices. - * @member {boolean} phpGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpGenericServices = false; - /** * FileOptions deprecated. * @member {boolean} deprecated @@ -19994,7 +19388,7 @@ * @memberof google.protobuf.FileOptions * @instance */ - FileOptions.prototype.ccEnableArenas = true; + FileOptions.prototype.ccEnableArenas = false; /** * FileOptions objcClassPrefix. @@ -20028,30 +19422,6 @@ */ FileOptions.prototype.phpClassPrefix = ""; - /** - * FileOptions phpNamespace. - * @member {string} phpNamespace - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpNamespace = ""; - - /** - * FileOptions phpMetadataNamespace. - * @member {string} phpMetadataNamespace - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpMetadataNamespace = ""; - - /** - * FileOptions rubyPackage. - * @member {string} rubyPackage - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.rubyPackage = ""; - /** * FileOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -20124,14 +19494,6 @@ writer.uint32(/* id 39, wireType 2 =*/314).string(message.swiftPrefix); if (message.phpClassPrefix != null && Object.hasOwnProperty.call(message, "phpClassPrefix")) writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); - if (message.phpNamespace != null && Object.hasOwnProperty.call(message, "phpNamespace")) - writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); - if (message.phpGenericServices != null && Object.hasOwnProperty.call(message, "phpGenericServices")) - writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); - if (message.phpMetadataNamespace != null && Object.hasOwnProperty.call(message, "phpMetadataNamespace")) - writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); - if (message.rubyPackage != null && Object.hasOwnProperty.call(message, "rubyPackage")) - writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -20202,9 +19564,6 @@ case 18: message.pyGenericServices = reader.bool(); break; - case 42: - message.phpGenericServices = reader.bool(); - break; case 23: message.deprecated = reader.bool(); break; @@ -20223,15 +19582,6 @@ case 40: message.phpClassPrefix = reader.string(); break; - case 41: - message.phpNamespace = reader.string(); - break; - case 44: - message.phpMetadataNamespace = reader.string(); - break; - case 45: - message.rubyPackage = reader.string(); - break; case 999: if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -20313,9 +19663,6 @@ if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) if (typeof message.pyGenericServices !== "boolean") return "pyGenericServices: boolean expected"; - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - if (typeof message.phpGenericServices !== "boolean") - return "phpGenericServices: boolean expected"; if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; @@ -20334,15 +19681,6 @@ if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) if (!$util.isString(message.phpClassPrefix)) return "phpClassPrefix: string expected"; - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) - if (!$util.isString(message.phpNamespace)) - return "phpNamespace: string expected"; - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) - if (!$util.isString(message.phpMetadataNamespace)) - return "phpMetadataNamespace: string expected"; - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) - if (!$util.isString(message.rubyPackage)) - return "rubyPackage: string expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -20408,8 +19746,6 @@ message.javaGenericServices = Boolean(object.javaGenericServices); if (object.pyGenericServices != null) message.pyGenericServices = Boolean(object.pyGenericServices); - if (object.phpGenericServices != null) - message.phpGenericServices = Boolean(object.phpGenericServices); if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); if (object.ccEnableArenas != null) @@ -20422,12 +19758,6 @@ message.swiftPrefix = String(object.swiftPrefix); if (object.phpClassPrefix != null) message.phpClassPrefix = String(object.phpClassPrefix); - if (object.phpNamespace != null) - message.phpNamespace = String(object.phpNamespace); - if (object.phpMetadataNamespace != null) - message.phpMetadataNamespace = String(object.phpMetadataNamespace); - if (object.rubyPackage != null) - message.rubyPackage = String(object.rubyPackage); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: array expected"); @@ -20480,15 +19810,11 @@ object.javaGenerateEqualsAndHash = false; object.deprecated = false; object.javaStringCheckUtf8 = false; - object.ccEnableArenas = true; + object.ccEnableArenas = false; object.objcClassPrefix = ""; object.csharpNamespace = ""; object.swiftPrefix = ""; object.phpClassPrefix = ""; - object.phpNamespace = ""; - object.phpGenericServices = false; - object.phpMetadataNamespace = ""; - object.rubyPackage = ""; } if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) object.javaPackage = message.javaPackage; @@ -20522,14 +19848,6 @@ object.swiftPrefix = message.swiftPrefix; if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) object.phpClassPrefix = message.phpClassPrefix; - if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) - object.phpNamespace = message.phpNamespace; - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - object.phpGenericServices = message.phpGenericServices; - if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) - object.phpMetadataNamespace = message.phpMetadataNamespace; - if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) - object.rubyPackage = message.rubyPackage; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index f81292a93c7..ac1aae86d0e 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1637,10 +1637,6 @@ "rule": "repeated", "type": "HttpRule", "id": 1 - }, - "fullyDecodeReservedExpansion": { - "type": "bool", - "id": 2 } } }, @@ -1690,10 +1686,6 @@ "type": "string", "id": 7 }, - "responseBody": { - "type": "string", - "id": 12 - }, "additionalBindings": { "rule": "repeated", "type": "HttpRule", @@ -1827,12 +1819,11 @@ }, "protobuf": { "options": { - "go_package": "google.golang.org/protobuf/types/descriptorpb", + "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", "java_package": "com.google.protobuf", "java_outer_classname": "DescriptorProtos", "csharp_namespace": "Google.Protobuf.Reflection", "objc_class_prefix": "GPB", - "cc_enable_arenas": true, "optimize_for": "SPEED" }, "nested": { @@ -1971,10 +1962,6 @@ "end": { "type": "int32", "id": 2 - }, - "options": { - "type": "ExtensionRangeOptions", - "id": 3 } } }, @@ -1992,21 +1979,6 @@ } } }, - "ExtensionRangeOptions": { - "fields": { - "uninterpretedOption": { - "rule": "repeated", - "type": "UninterpretedOption", - "id": 999 - } - }, - "extensions": [ - [ - 1000, - 536870911 - ] - ] - }, "FieldDescriptorProto": { "fields": { "name": { @@ -2048,10 +2020,6 @@ "options": { "type": "FieldOptions", "id": 8 - }, - "proto3Optional": { - "type": "bool", - "id": 17 } }, "nested": { @@ -2112,30 +2080,6 @@ "options": { "type": "EnumOptions", "id": 3 - }, - "reservedRange": { - "rule": "repeated", - "type": "EnumReservedRange", - "id": 4 - }, - "reservedName": { - "rule": "repeated", - "type": "string", - "id": 5 - } - }, - "nested": { - "EnumReservedRange": { - "fields": { - "start": { - "type": "int32", - "id": 1 - }, - "end": { - "type": "int32", - "id": 2 - } - } } } }, @@ -2269,13 +2213,6 @@ "default": false } }, - "phpGenericServices": { - "type": "bool", - "id": 42, - "options": { - "default": false - } - }, "deprecated": { "type": "bool", "id": 23, @@ -2287,7 +2224,7 @@ "type": "bool", "id": 31, "options": { - "default": true + "default": false } }, "objcClassPrefix": { @@ -2306,18 +2243,6 @@ "type": "string", "id": 40 }, - "phpNamespace": { - "type": "string", - "id": 41 - }, - "phpMetadataNamespace": { - "type": "string", - "id": 44 - }, - "rubyPackage": { - "type": "string", - "id": 45 - }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 3e06f81f819..139f97fb788 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "a4a15135eddb0d1b97039676d4db6a815f1d43cb" + "sha": "b954fd92703c8e7ac99b668ee4991c2e4ec81885" } }, { From 28f108d820d94af5969fa13a31da24345d241a2f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 23 Mar 2021 17:48:13 +0100 Subject: [PATCH 0725/1115] chore(deps): update dependency sinon to v10 (#1242) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [sinon](https://sinonjs.org/) ([source](https://togithub.com/sinonjs/sinon)) | [`^9.0.0` -> `^10.0.0`](https://renovatebot.com/diffs/npm/sinon/9.2.4/10.0.0) | [![age](https://badges.renovateapi.com/packages/npm/sinon/10.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/sinon/10.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/sinon/10.0.0/compatibility-slim/9.2.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/sinon/10.0.0/confidence-slim/9.2.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sinonjs/sinon ### [`v10.0.0`](https://togithub.com/sinonjs/sinon/blob/master/CHANGELOG.md#​1000--2021-03-22) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v9.2.4...v10.0.0) ================== - Upgrade nise to 4.1.0 - Use [@​sinonjs/eslint-config](https://togithub.com/sinonjs/eslint-config)[@​4](https://togithub.com/4) => Adopts ES2017 => Drops support for IE 11, Legacy Edge and legacy Safari
--- ### Renovate configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a74fb923f4a..aed81c25741 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -92,7 +92,7 @@ "null-loader": "^4.0.0", "protobufjs": "^6.10.1", "proxyquire": "^2.0.0", - "sinon": "^9.0.0", + "sinon": "^10.0.0", "tmp": "^0.2.0", "ts-loader": "^8.0.0", "typescript": "^3.8.3", From db2feaa1961d6f3c1e2f5bd32cb9c4559174c059 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 7 Apr 2021 18:51:06 +0200 Subject: [PATCH 0726/1115] chore(deps): update dependency @grpc/proto-loader to ^0.6.0 (#1247) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index aed81c25741..fee2026836c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -66,7 +66,7 @@ "p-defer": "^3.0.0" }, "devDependencies": { - "@grpc/proto-loader": "^0.5.4", + "@grpc/proto-loader": "^0.6.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", From 381d372df68c12b7bad9fc30e0115adef595d995 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 9 Apr 2021 17:48:45 -0400 Subject: [PATCH 0727/1115] fix: temporarily pin sinon at 10.0.0 (#1252) * fix: temporarily pin sinon at 10.0.0 until this is fixed: https://github.com/sinonjs/sinon/issues/2352 * chore: let npm rearrange the imports for some devDependencies --- handwritten/pubsub/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index fee2026836c..ccacebd6ec9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -67,6 +67,8 @@ }, "devDependencies": { "@grpc/proto-loader": "^0.6.0", + "@microsoft/api-documenter": "^7.8.10", + "@microsoft/api-extractor": "^7.8.10", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", @@ -92,15 +94,13 @@ "null-loader": "^4.0.0", "protobufjs": "^6.10.1", "proxyquire": "^2.0.0", - "sinon": "^10.0.0", + "sinon": "10.0.0", "tmp": "^0.2.0", "ts-loader": "^8.0.0", "typescript": "^3.8.3", "uuid": "^8.0.0", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", - "yargs": "^16.0.0", - "@microsoft/api-documenter": "^7.8.10", - "@microsoft/api-extractor": "^7.8.10" + "yargs": "^16.0.0" } } From 110027ecb533cfc5e8c6e088eecd2240148de93a Mon Sep 17 00:00:00 2001 From: Weyert de Boer Date: Wed, 14 Apr 2021 20:26:00 +0100 Subject: [PATCH 0728/1115] fix: added support for Opentelemetry 0.18 (#1234) * fix: added support for Opentelemetry 0.18 Introduces support for Opentelemetry 0.18 API which implements the Tracing 1.0 specification. * style: remove unused import declaration * refactor: removed the `OpenTelemetryTracer`-class and just expose createSpan as function * test: updated the span related tests * test: updated the tests * test: updated the tests * refactor: move the tracer out of the `createSpan`-function Small refactor to ensure no new tracer gets created for each call to the `createSpan`-functio by initiating the `libraryTracer`-variable * fix: get the unit test for publisher opentelemetry working again * test: fix the subscriber unit tests for opentelemetry * chore: remove describe.only * chore: latest changes * test: updated the tests * test: improve the tests * chore: maybe its need to be Google LLC? * feat: add messaging attributes to otel spans * fix: include package.json version as instrumentation version * docs: update the opentelemetry example code * style: remove unused code * fix: remove peer name for now * style: improve explanation regarding otel trace provider * chore: update the opentelemetry versios in the samples `package.json` * test: remove extranous logging in the opentelemetry example app * test: remove the check for `traceId` that doesn't get outputted * fix: remove unnecessary messaging span attribute and added comments * style: use shiny new syntax for undefined check in `subscriber`-class * fix: match the span name with the operation kind in `subscriber`-class * chore: improved code based on PR feedback * fix: BREAKING CHANGE: The Opentelemetry tracing span doesn't expose the `data`-attribute anymore to avoid accidentally exposing privacy/personal data * fix: only include `googclient_OpenTelemetrySpanContext`-attribute when valid span context exists * fix: change the way `package.json` is being imported * fix: revert bad merge that removed tracing on devDependencies At least I think that's what happened... * style: remove unnecessary comment * style: remove unused imports * build: downgrade @sinonjs/fake-timers to v6 The v10 of sinonjs comes with v7 of fake-timers which comes with typescript type definitions that are generated by jsdoc comments which seems to cause trouble when compiling the app it. Downgrading to v6 to avoid needing to solve this problem now. * style: cleanup type definition Removed the `| undefined` for the `span` in the `Publisher`-class Co-authored-by: Aaron Abbott * build: remove `package.json` after compilation step * build: put back package.json in the build * build: explicitly add package.json to the npm pack build * fix: revert "fix: change the way `package.json` is being imported" This reverts commit 0c2c76f8efa66e5f66d97430964fd30ac7e19261. * fix: revert "build: explicitly add package.json to the npm pack build" This reverts commit 14de6257bf63acc6168c4b51c18088a5c74e673b. Co-authored-by: Weyert de Boer Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> Co-authored-by: Megan Potter Co-authored-by: Aaron Abbott --- handwritten/pubsub/package.json | 7 +- handwritten/pubsub/protos/protos.d.ts | 249 +++++++ handwritten/pubsub/protos/protos.js | 688 +++++++++++++++++- handwritten/pubsub/protos/protos.json | 79 +- .../pubsub/src/opentelemetry-tracing.ts | 63 +- handwritten/pubsub/src/publisher/index.ts | 46 +- handwritten/pubsub/src/subscriber.ts | 41 +- .../pubsub/test/opentelemetry-tracing.ts | 39 +- handwritten/pubsub/test/publisher/index.ts | 95 ++- handwritten/pubsub/test/subscriber.ts | 122 ++-- handwritten/pubsub/test/tracing.ts | 41 ++ 11 files changed, 1302 insertions(+), 168 deletions(-) create mode 100644 handwritten/pubsub/test/tracing.ts diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ccacebd6ec9..5c2a98526c6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,8 +53,8 @@ "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", - "@opentelemetry/api": "^0.12.0", - "@opentelemetry/tracing": "^0.12.0", + "@opentelemetry/api": "^0.18.1", + "@opentelemetry/semantic-conventions": "^0.18.2", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", @@ -69,6 +69,7 @@ "@grpc/proto-loader": "^0.6.0", "@microsoft/api-documenter": "^7.8.10", "@microsoft/api-extractor": "^7.8.10", + "@opentelemetry/tracing": "^0.18.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", @@ -77,7 +78,7 @@ "@types/ncp": "^2.0.1", "@types/node": "^12.12.30", "@types/proxyquire": "^1.3.28", - "@types/sinon": "^9.0.0", + "@types/sinon": "^9.0.11", "@types/tmp": "^0.2.0", "@types/uuid": "^8.0.0", "c8": "^7.0.0", diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 6ae2e2767a1..2bc15192ae9 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -6210,6 +6210,9 @@ export namespace google { /** Http rules */ rules?: (google.api.IHttpRule[]|null); + + /** Http fullyDecodeReservedExpansion */ + fullyDecodeReservedExpansion?: (boolean|null); } /** Represents a Http. */ @@ -6224,6 +6227,9 @@ export namespace google { /** Http rules. */ public rules: google.api.IHttpRule[]; + /** Http fullyDecodeReservedExpansion. */ + public fullyDecodeReservedExpansion: boolean; + /** * Creates a new Http instance using the specified properties. * @param [properties] Properties to set @@ -6322,6 +6328,9 @@ export namespace google { /** HttpRule body */ body?: (string|null); + /** HttpRule responseBody */ + responseBody?: (string|null); + /** HttpRule additionalBindings */ additionalBindings?: (google.api.IHttpRule[]|null); } @@ -6359,6 +6368,9 @@ export namespace google { /** HttpRule body. */ public body: string; + /** HttpRule responseBody. */ + public responseBody: string; + /** HttpRule additionalBindings. */ public additionalBindings: google.api.IHttpRule[]; @@ -7185,6 +7197,9 @@ export namespace google { /** ExtensionRange end */ end?: (number|null); + + /** ExtensionRange options */ + options?: (google.protobuf.IExtensionRangeOptions|null); } /** Represents an ExtensionRange. */ @@ -7202,6 +7217,9 @@ export namespace google { /** ExtensionRange end. */ public end: number; + /** ExtensionRange options. */ + public options?: (google.protobuf.IExtensionRangeOptions|null); + /** * Creates a new ExtensionRange instance using the specified properties. * @param [properties] Properties to set @@ -7370,6 +7388,96 @@ export namespace google { } } + /** Properties of an ExtensionRangeOptions. */ + interface IExtensionRangeOptions { + + /** ExtensionRangeOptions uninterpretedOption */ + uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + } + + /** Represents an ExtensionRangeOptions. */ + class ExtensionRangeOptions implements IExtensionRangeOptions { + + /** + * Constructs a new ExtensionRangeOptions. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IExtensionRangeOptions); + + /** ExtensionRangeOptions uninterpretedOption. */ + public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @param [properties] Properties to set + * @returns ExtensionRangeOptions instance + */ + public static create(properties?: google.protobuf.IExtensionRangeOptions): google.protobuf.ExtensionRangeOptions; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @param message ExtensionRangeOptions message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IExtensionRangeOptions, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions; + + /** + * Verifies an ExtensionRangeOptions message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExtensionRangeOptions + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions; + + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @param message ExtensionRangeOptions + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ExtensionRangeOptions, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExtensionRangeOptions to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + /** Properties of a FieldDescriptorProto. */ interface IFieldDescriptorProto { @@ -7402,6 +7510,9 @@ export namespace google { /** FieldDescriptorProto options */ options?: (google.protobuf.IFieldOptions|null); + + /** FieldDescriptorProto proto3Optional */ + proto3Optional?: (boolean|null); } /** Represents a FieldDescriptorProto. */ @@ -7443,6 +7554,9 @@ export namespace google { /** FieldDescriptorProto options. */ public options?: (google.protobuf.IFieldOptions|null); + /** FieldDescriptorProto proto3Optional. */ + public proto3Optional: boolean; + /** * Creates a new FieldDescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -7653,6 +7767,12 @@ export namespace google { /** EnumDescriptorProto options */ options?: (google.protobuf.IEnumOptions|null); + + /** EnumDescriptorProto reservedRange */ + reservedRange?: (google.protobuf.EnumDescriptorProto.IEnumReservedRange[]|null); + + /** EnumDescriptorProto reservedName */ + reservedName?: (string[]|null); } /** Represents an EnumDescriptorProto. */ @@ -7673,6 +7793,12 @@ export namespace google { /** EnumDescriptorProto options. */ public options?: (google.protobuf.IEnumOptions|null); + /** EnumDescriptorProto reservedRange. */ + public reservedRange: google.protobuf.EnumDescriptorProto.IEnumReservedRange[]; + + /** EnumDescriptorProto reservedName. */ + public reservedName: string[]; + /** * Creates a new EnumDescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -7744,6 +7870,105 @@ export namespace google { public toJSON(): { [k: string]: any }; } + namespace EnumDescriptorProto { + + /** Properties of an EnumReservedRange. */ + interface IEnumReservedRange { + + /** EnumReservedRange start */ + start?: (number|null); + + /** EnumReservedRange end */ + end?: (number|null); + } + + /** Represents an EnumReservedRange. */ + class EnumReservedRange implements IEnumReservedRange { + + /** + * Constructs a new EnumReservedRange. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange); + + /** EnumReservedRange start. */ + public start: number; + + /** EnumReservedRange end. */ + public end: number; + + /** + * Creates a new EnumReservedRange instance using the specified properties. + * @param [properties] Properties to set + * @returns EnumReservedRange instance + */ + public static create(properties?: google.protobuf.EnumDescriptorProto.IEnumReservedRange): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @param message EnumReservedRange message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.EnumDescriptorProto.IEnumReservedRange, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Verifies an EnumReservedRange message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EnumReservedRange + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.EnumDescriptorProto.EnumReservedRange; + + /** + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * @param message EnumReservedRange + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.EnumDescriptorProto.EnumReservedRange, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EnumReservedRange to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + /** Properties of an EnumValueDescriptorProto. */ interface IEnumValueDescriptorProto { @@ -8101,6 +8326,9 @@ export namespace google { /** FileOptions pyGenericServices */ pyGenericServices?: (boolean|null); + /** FileOptions phpGenericServices */ + phpGenericServices?: (boolean|null); + /** FileOptions deprecated */ deprecated?: (boolean|null); @@ -8119,6 +8347,15 @@ export namespace google { /** FileOptions phpClassPrefix */ phpClassPrefix?: (string|null); + /** FileOptions phpNamespace */ + phpNamespace?: (string|null); + + /** FileOptions phpMetadataNamespace */ + phpMetadataNamespace?: (string|null); + + /** FileOptions rubyPackage */ + rubyPackage?: (string|null); + /** FileOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -8165,6 +8402,9 @@ export namespace google { /** FileOptions pyGenericServices. */ public pyGenericServices: boolean; + /** FileOptions phpGenericServices. */ + public phpGenericServices: boolean; + /** FileOptions deprecated. */ public deprecated: boolean; @@ -8183,6 +8423,15 @@ export namespace google { /** FileOptions phpClassPrefix. */ public phpClassPrefix: string; + /** FileOptions phpNamespace. */ + public phpNamespace: string; + + /** FileOptions phpMetadataNamespace. */ + public phpMetadataNamespace: string; + + /** FileOptions rubyPackage. */ + public rubyPackage: string; + /** FileOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 456396fe54c..2d3c27e7191 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -14123,6 +14123,7 @@ * @memberof google.api * @interface IHttp * @property {Array.|null} [rules] Http rules + * @property {boolean|null} [fullyDecodeReservedExpansion] Http fullyDecodeReservedExpansion */ /** @@ -14149,6 +14150,14 @@ */ Http.prototype.rules = $util.emptyArray; + /** + * Http fullyDecodeReservedExpansion. + * @member {boolean} fullyDecodeReservedExpansion + * @memberof google.api.Http + * @instance + */ + Http.prototype.fullyDecodeReservedExpansion = false; + /** * Creates a new Http instance using the specified properties. * @function create @@ -14176,6 +14185,8 @@ if (message.rules != null && message.rules.length) for (var i = 0; i < message.rules.length; ++i) $root.google.api.HttpRule.encode(message.rules[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.fullyDecodeReservedExpansion != null && Object.hasOwnProperty.call(message, "fullyDecodeReservedExpansion")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.fullyDecodeReservedExpansion); return writer; }; @@ -14215,6 +14226,9 @@ message.rules = []; message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); break; + case 2: + message.fullyDecodeReservedExpansion = reader.bool(); + break; default: reader.skipType(tag & 7); break; @@ -14259,6 +14273,9 @@ return "rules." + error; } } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + if (typeof message.fullyDecodeReservedExpansion !== "boolean") + return "fullyDecodeReservedExpansion: boolean expected"; return null; }; @@ -14284,6 +14301,8 @@ message.rules[i] = $root.google.api.HttpRule.fromObject(object.rules[i]); } } + if (object.fullyDecodeReservedExpansion != null) + message.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); return message; }; @@ -14302,11 +14321,15 @@ var object = {}; if (options.arrays || options.defaults) object.rules = []; + if (options.defaults) + object.fullyDecodeReservedExpansion = false; if (message.rules && message.rules.length) { object.rules = []; for (var j = 0; j < message.rules.length; ++j) object.rules[j] = $root.google.api.HttpRule.toObject(message.rules[j], options); } + if (message.fullyDecodeReservedExpansion != null && message.hasOwnProperty("fullyDecodeReservedExpansion")) + object.fullyDecodeReservedExpansion = message.fullyDecodeReservedExpansion; return object; }; @@ -14338,6 +14361,7 @@ * @property {string|null} [patch] HttpRule patch * @property {google.api.ICustomHttpPattern|null} [custom] HttpRule custom * @property {string|null} [body] HttpRule body + * @property {string|null} [responseBody] HttpRule responseBody * @property {Array.|null} [additionalBindings] HttpRule additionalBindings */ @@ -14421,6 +14445,14 @@ */ HttpRule.prototype.body = ""; + /** + * HttpRule responseBody. + * @member {string} responseBody + * @memberof google.api.HttpRule + * @instance + */ + HttpRule.prototype.responseBody = ""; + /** * HttpRule additionalBindings. * @member {Array.} additionalBindings @@ -14486,6 +14518,8 @@ if (message.additionalBindings != null && message.additionalBindings.length) for (var i = 0; i < message.additionalBindings.length; ++i) $root.google.api.HttpRule.encode(message.additionalBindings[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.responseBody != null && Object.hasOwnProperty.call(message, "responseBody")) + writer.uint32(/* id 12, wireType 2 =*/98).string(message.responseBody); return writer; }; @@ -14544,6 +14578,9 @@ case 7: message.body = reader.string(); break; + case 12: + message.responseBody = reader.string(); + break; case 11: if (!(message.additionalBindings && message.additionalBindings.length)) message.additionalBindings = []; @@ -14634,6 +14671,9 @@ if (message.body != null && message.hasOwnProperty("body")) if (!$util.isString(message.body)) return "body: string expected"; + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + if (!$util.isString(message.responseBody)) + return "responseBody: string expected"; if (message.additionalBindings != null && message.hasOwnProperty("additionalBindings")) { if (!Array.isArray(message.additionalBindings)) return "additionalBindings: array expected"; @@ -14677,6 +14717,8 @@ } if (object.body != null) message.body = String(object.body); + if (object.responseBody != null) + message.responseBody = String(object.responseBody); if (object.additionalBindings) { if (!Array.isArray(object.additionalBindings)) throw TypeError(".google.api.HttpRule.additionalBindings: array expected"); @@ -14708,6 +14750,7 @@ if (options.defaults) { object.selector = ""; object.body = ""; + object.responseBody = ""; } if (message.selector != null && message.hasOwnProperty("selector")) object.selector = message.selector; @@ -14748,6 +14791,8 @@ for (var j = 0; j < message.additionalBindings.length; ++j) object.additionalBindings[j] = $root.google.api.HttpRule.toObject(message.additionalBindings[j], options); } + if (message.responseBody != null && message.hasOwnProperty("responseBody")) + object.responseBody = message.responseBody; return object; }; @@ -16999,6 +17044,7 @@ * @interface IExtensionRange * @property {number|null} [start] ExtensionRange start * @property {number|null} [end] ExtensionRange end + * @property {google.protobuf.IExtensionRangeOptions|null} [options] ExtensionRange options */ /** @@ -17032,6 +17078,14 @@ */ ExtensionRange.prototype.end = 0; + /** + * ExtensionRange options. + * @member {google.protobuf.IExtensionRangeOptions|null|undefined} options + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @instance + */ + ExtensionRange.prototype.options = null; + /** * Creates a new ExtensionRange instance using the specified properties. * @function create @@ -17060,6 +17114,8 @@ writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); if (message.end != null && Object.hasOwnProperty.call(message, "end")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + if (message.options != null && Object.hasOwnProperty.call(message, "options")) + $root.google.protobuf.ExtensionRangeOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; @@ -17100,6 +17156,9 @@ case 2: message.end = reader.int32(); break; + case 3: + message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -17141,6 +17200,11 @@ if (message.end != null && message.hasOwnProperty("end")) if (!$util.isInteger(message.end)) return "end: integer expected"; + if (message.options != null && message.hasOwnProperty("options")) { + var error = $root.google.protobuf.ExtensionRangeOptions.verify(message.options); + if (error) + return "options." + error; + } return null; }; @@ -17160,6 +17224,11 @@ message.start = object.start | 0; if (object.end != null) message.end = object.end | 0; + if (object.options != null) { + if (typeof object.options !== "object") + throw TypeError(".google.protobuf.DescriptorProto.ExtensionRange.options: object expected"); + message.options = $root.google.protobuf.ExtensionRangeOptions.fromObject(object.options); + } return message; }; @@ -17179,11 +17248,14 @@ if (options.defaults) { object.start = 0; object.end = 0; + object.options = null; } if (message.start != null && message.hasOwnProperty("start")) object.start = message.start; if (message.end != null && message.hasOwnProperty("end")) object.end = message.end; + if (message.options != null && message.hasOwnProperty("options")) + object.options = $root.google.protobuf.ExtensionRangeOptions.toObject(message.options, options); return object; }; @@ -17414,6 +17486,214 @@ return DescriptorProto; })(); + protobuf.ExtensionRangeOptions = (function() { + + /** + * Properties of an ExtensionRangeOptions. + * @memberof google.protobuf + * @interface IExtensionRangeOptions + * @property {Array.|null} [uninterpretedOption] ExtensionRangeOptions uninterpretedOption + */ + + /** + * Constructs a new ExtensionRangeOptions. + * @memberof google.protobuf + * @classdesc Represents an ExtensionRangeOptions. + * @implements IExtensionRangeOptions + * @constructor + * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set + */ + function ExtensionRangeOptions(properties) { + this.uninterpretedOption = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ExtensionRangeOptions uninterpretedOption. + * @member {Array.} uninterpretedOption + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + */ + ExtensionRangeOptions.prototype.uninterpretedOption = $util.emptyArray; + + /** + * Creates a new ExtensionRangeOptions instance using the specified properties. + * @function create + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions=} [properties] Properties to set + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions instance + */ + ExtensionRangeOptions.create = function create(properties) { + return new ExtensionRangeOptions(properties); + }; + + /** + * Encodes the specified ExtensionRangeOptions message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRangeOptions.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.uninterpretedOption != null && message.uninterpretedOption.length) + for (var i = 0; i < message.uninterpretedOption.length; ++i) + $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ExtensionRangeOptions message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.IExtensionRangeOptions} message ExtensionRangeOptions message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExtensionRangeOptions.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRangeOptions.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 999: + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an ExtensionRangeOptions message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExtensionRangeOptions.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ExtensionRangeOptions message. + * @function verify + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExtensionRangeOptions.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { + if (!Array.isArray(message.uninterpretedOption)) + return "uninterpretedOption: array expected"; + for (var i = 0; i < message.uninterpretedOption.length; ++i) { + var error = $root.google.protobuf.UninterpretedOption.verify(message.uninterpretedOption[i]); + if (error) + return "uninterpretedOption." + error; + } + } + return null; + }; + + /** + * Creates an ExtensionRangeOptions message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ExtensionRangeOptions} ExtensionRangeOptions + */ + ExtensionRangeOptions.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ExtensionRangeOptions) + return object; + var message = new $root.google.protobuf.ExtensionRangeOptions(); + if (object.uninterpretedOption) { + if (!Array.isArray(object.uninterpretedOption)) + throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: array expected"); + message.uninterpretedOption = []; + for (var i = 0; i < object.uninterpretedOption.length; ++i) { + if (typeof object.uninterpretedOption[i] !== "object") + throw TypeError(".google.protobuf.ExtensionRangeOptions.uninterpretedOption: object expected"); + message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); + } + } + return message; + }; + + /** + * Creates a plain object from an ExtensionRangeOptions message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {google.protobuf.ExtensionRangeOptions} message ExtensionRangeOptions + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExtensionRangeOptions.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.uninterpretedOption = []; + if (message.uninterpretedOption && message.uninterpretedOption.length) { + object.uninterpretedOption = []; + for (var j = 0; j < message.uninterpretedOption.length; ++j) + object.uninterpretedOption[j] = $root.google.protobuf.UninterpretedOption.toObject(message.uninterpretedOption[j], options); + } + return object; + }; + + /** + * Converts this ExtensionRangeOptions to JSON. + * @function toJSON + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + * @returns {Object.} JSON object + */ + ExtensionRangeOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ExtensionRangeOptions; + })(); + protobuf.FieldDescriptorProto = (function() { /** @@ -17430,6 +17710,7 @@ * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex * @property {string|null} [jsonName] FieldDescriptorProto jsonName * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options + * @property {boolean|null} [proto3Optional] FieldDescriptorProto proto3Optional */ /** @@ -17527,6 +17808,14 @@ */ FieldDescriptorProto.prototype.options = null; + /** + * FieldDescriptorProto proto3Optional. + * @member {boolean} proto3Optional + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.proto3Optional = false; + /** * Creates a new FieldDescriptorProto instance using the specified properties. * @function create @@ -17571,6 +17860,8 @@ writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); if (message.jsonName != null && Object.hasOwnProperty.call(message, "jsonName")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); + if (message.proto3Optional != null && Object.hasOwnProperty.call(message, "proto3Optional")) + writer.uint32(/* id 17, wireType 0 =*/136).bool(message.proto3Optional); return writer; }; @@ -17635,6 +17926,9 @@ case 8: message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); break; + case 17: + message.proto3Optional = reader.bool(); + break; default: reader.skipType(tag & 7); break; @@ -17729,6 +18023,9 @@ if (error) return "options." + error; } + if (message.proto3Optional != null && message.hasOwnProperty("proto3Optional")) + if (typeof message.proto3Optional !== "boolean") + return "proto3Optional: boolean expected"; return null; }; @@ -17851,6 +18148,8 @@ throw TypeError(".google.protobuf.FieldDescriptorProto.options: object expected"); message.options = $root.google.protobuf.FieldOptions.fromObject(object.options); } + if (object.proto3Optional != null) + message.proto3Optional = Boolean(object.proto3Optional); return message; }; @@ -17878,6 +18177,7 @@ object.options = null; object.oneofIndex = 0; object.jsonName = ""; + object.proto3Optional = false; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -17899,6 +18199,8 @@ object.oneofIndex = message.oneofIndex; if (message.jsonName != null && message.hasOwnProperty("jsonName")) object.jsonName = message.jsonName; + if (message.proto3Optional != null && message.hasOwnProperty("proto3Optional")) + object.proto3Optional = message.proto3Optional; return object; }; @@ -18202,6 +18504,8 @@ * @property {string|null} [name] EnumDescriptorProto name * @property {Array.|null} [value] EnumDescriptorProto value * @property {google.protobuf.IEnumOptions|null} [options] EnumDescriptorProto options + * @property {Array.|null} [reservedRange] EnumDescriptorProto reservedRange + * @property {Array.|null} [reservedName] EnumDescriptorProto reservedName */ /** @@ -18214,6 +18518,8 @@ */ function EnumDescriptorProto(properties) { this.value = []; + this.reservedRange = []; + this.reservedName = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -18244,6 +18550,22 @@ */ EnumDescriptorProto.prototype.options = null; + /** + * EnumDescriptorProto reservedRange. + * @member {Array.} reservedRange + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.reservedRange = $util.emptyArray; + + /** + * EnumDescriptorProto reservedName. + * @member {Array.} reservedName + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.reservedName = $util.emptyArray; + /** * Creates a new EnumDescriptorProto instance using the specified properties. * @function create @@ -18275,6 +18597,12 @@ $root.google.protobuf.EnumValueDescriptorProto.encode(message.value[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); if (message.options != null && Object.hasOwnProperty.call(message, "options")) $root.google.protobuf.EnumOptions.encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.reservedRange != null && message.reservedRange.length) + for (var i = 0; i < message.reservedRange.length; ++i) + $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.encode(message.reservedRange[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.reservedName != null && message.reservedName.length) + for (var i = 0; i < message.reservedName.length; ++i) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.reservedName[i]); return writer; }; @@ -18320,6 +18648,16 @@ case 3: message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); break; + case 4: + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); + break; + case 5: + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; default: reader.skipType(tag & 7); break; @@ -18372,6 +18710,22 @@ if (error) return "options." + error; } + if (message.reservedRange != null && message.hasOwnProperty("reservedRange")) { + if (!Array.isArray(message.reservedRange)) + return "reservedRange: array expected"; + for (var i = 0; i < message.reservedRange.length; ++i) { + var error = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.verify(message.reservedRange[i]); + if (error) + return "reservedRange." + error; + } + } + if (message.reservedName != null && message.hasOwnProperty("reservedName")) { + if (!Array.isArray(message.reservedName)) + return "reservedName: array expected"; + for (var i = 0; i < message.reservedName.length; ++i) + if (!$util.isString(message.reservedName[i])) + return "reservedName: string[] expected"; + } return null; }; @@ -18404,6 +18758,23 @@ throw TypeError(".google.protobuf.EnumDescriptorProto.options: object expected"); message.options = $root.google.protobuf.EnumOptions.fromObject(object.options); } + if (object.reservedRange) { + if (!Array.isArray(object.reservedRange)) + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: array expected"); + message.reservedRange = []; + for (var i = 0; i < object.reservedRange.length; ++i) { + if (typeof object.reservedRange[i] !== "object") + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedRange: object expected"); + message.reservedRange[i] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.fromObject(object.reservedRange[i]); + } + } + if (object.reservedName) { + if (!Array.isArray(object.reservedName)) + throw TypeError(".google.protobuf.EnumDescriptorProto.reservedName: array expected"); + message.reservedName = []; + for (var i = 0; i < object.reservedName.length; ++i) + message.reservedName[i] = String(object.reservedName[i]); + } return message; }; @@ -18420,8 +18791,11 @@ if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) + if (options.arrays || options.defaults) { object.value = []; + object.reservedRange = []; + object.reservedName = []; + } if (options.defaults) { object.name = ""; object.options = null; @@ -18435,6 +18809,16 @@ } if (message.options != null && message.hasOwnProperty("options")) object.options = $root.google.protobuf.EnumOptions.toObject(message.options, options); + if (message.reservedRange && message.reservedRange.length) { + object.reservedRange = []; + for (var j = 0; j < message.reservedRange.length; ++j) + object.reservedRange[j] = $root.google.protobuf.EnumDescriptorProto.EnumReservedRange.toObject(message.reservedRange[j], options); + } + if (message.reservedName && message.reservedName.length) { + object.reservedName = []; + for (var j = 0; j < message.reservedName.length; ++j) + object.reservedName[j] = message.reservedName[j]; + } return object; }; @@ -18449,6 +18833,216 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + EnumDescriptorProto.EnumReservedRange = (function() { + + /** + * Properties of an EnumReservedRange. + * @memberof google.protobuf.EnumDescriptorProto + * @interface IEnumReservedRange + * @property {number|null} [start] EnumReservedRange start + * @property {number|null} [end] EnumReservedRange end + */ + + /** + * Constructs a new EnumReservedRange. + * @memberof google.protobuf.EnumDescriptorProto + * @classdesc Represents an EnumReservedRange. + * @implements IEnumReservedRange + * @constructor + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set + */ + function EnumReservedRange(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EnumReservedRange start. + * @member {number} start + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @instance + */ + EnumReservedRange.prototype.start = 0; + + /** + * EnumReservedRange end. + * @member {number} end + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @instance + */ + EnumReservedRange.prototype.end = 0; + + /** + * Creates a new EnumReservedRange instance using the specified properties. + * @function create + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange=} [properties] Properties to set + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange instance + */ + EnumReservedRange.create = function create(properties) { + return new EnumReservedRange(properties); + }; + + /** + * Encodes the specified EnumReservedRange message. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @function encode + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumReservedRange.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.start != null && Object.hasOwnProperty.call(message, "start")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); + if (message.end != null && Object.hasOwnProperty.call(message, "end")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); + return writer; + }; + + /** + * Encodes the specified EnumReservedRange message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.EnumReservedRange.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {google.protobuf.EnumDescriptorProto.IEnumReservedRange} message EnumReservedRange message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EnumReservedRange.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumReservedRange.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.start = reader.int32(); + break; + case 2: + message.end = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an EnumReservedRange message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EnumReservedRange.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EnumReservedRange message. + * @function verify + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EnumReservedRange.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.start != null && message.hasOwnProperty("start")) + if (!$util.isInteger(message.start)) + return "start: integer expected"; + if (message.end != null && message.hasOwnProperty("end")) + if (!$util.isInteger(message.end)) + return "end: integer expected"; + return null; + }; + + /** + * Creates an EnumReservedRange message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.EnumDescriptorProto.EnumReservedRange} EnumReservedRange + */ + EnumReservedRange.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.EnumDescriptorProto.EnumReservedRange) + return object; + var message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); + if (object.start != null) + message.start = object.start | 0; + if (object.end != null) + message.end = object.end | 0; + return message; + }; + + /** + * Creates a plain object from an EnumReservedRange message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {google.protobuf.EnumDescriptorProto.EnumReservedRange} message EnumReservedRange + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EnumReservedRange.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.start = 0; + object.end = 0; + } + if (message.start != null && message.hasOwnProperty("start")) + object.start = message.start; + if (message.end != null && message.hasOwnProperty("end")) + object.end = message.end; + return object; + }; + + /** + * Converts this EnumReservedRange to JSON. + * @function toJSON + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @instance + * @returns {Object.} JSON object + */ + EnumReservedRange.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return EnumReservedRange; + })(); + return EnumDescriptorProto; })(); @@ -19267,12 +19861,16 @@ * @property {boolean|null} [ccGenericServices] FileOptions ccGenericServices * @property {boolean|null} [javaGenericServices] FileOptions javaGenericServices * @property {boolean|null} [pyGenericServices] FileOptions pyGenericServices + * @property {boolean|null} [phpGenericServices] FileOptions phpGenericServices * @property {boolean|null} [deprecated] FileOptions deprecated * @property {boolean|null} [ccEnableArenas] FileOptions ccEnableArenas * @property {string|null} [objcClassPrefix] FileOptions objcClassPrefix * @property {string|null} [csharpNamespace] FileOptions csharpNamespace * @property {string|null} [swiftPrefix] FileOptions swiftPrefix * @property {string|null} [phpClassPrefix] FileOptions phpClassPrefix + * @property {string|null} [phpNamespace] FileOptions phpNamespace + * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace + * @property {string|null} [rubyPackage] FileOptions rubyPackage * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption * @property {Array.|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition */ @@ -19374,6 +19972,14 @@ */ FileOptions.prototype.pyGenericServices = false; + /** + * FileOptions phpGenericServices. + * @member {boolean} phpGenericServices + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpGenericServices = false; + /** * FileOptions deprecated. * @member {boolean} deprecated @@ -19388,7 +19994,7 @@ * @memberof google.protobuf.FileOptions * @instance */ - FileOptions.prototype.ccEnableArenas = false; + FileOptions.prototype.ccEnableArenas = true; /** * FileOptions objcClassPrefix. @@ -19422,6 +20028,30 @@ */ FileOptions.prototype.phpClassPrefix = ""; + /** + * FileOptions phpNamespace. + * @member {string} phpNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpNamespace = ""; + + /** + * FileOptions phpMetadataNamespace. + * @member {string} phpMetadataNamespace + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.phpMetadataNamespace = ""; + + /** + * FileOptions rubyPackage. + * @member {string} rubyPackage + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.rubyPackage = ""; + /** * FileOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -19494,6 +20124,14 @@ writer.uint32(/* id 39, wireType 2 =*/314).string(message.swiftPrefix); if (message.phpClassPrefix != null && Object.hasOwnProperty.call(message, "phpClassPrefix")) writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); + if (message.phpNamespace != null && Object.hasOwnProperty.call(message, "phpNamespace")) + writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); + if (message.phpGenericServices != null && Object.hasOwnProperty.call(message, "phpGenericServices")) + writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); + if (message.phpMetadataNamespace != null && Object.hasOwnProperty.call(message, "phpMetadataNamespace")) + writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); + if (message.rubyPackage != null && Object.hasOwnProperty.call(message, "rubyPackage")) + writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -19564,6 +20202,9 @@ case 18: message.pyGenericServices = reader.bool(); break; + case 42: + message.phpGenericServices = reader.bool(); + break; case 23: message.deprecated = reader.bool(); break; @@ -19582,6 +20223,15 @@ case 40: message.phpClassPrefix = reader.string(); break; + case 41: + message.phpNamespace = reader.string(); + break; + case 44: + message.phpMetadataNamespace = reader.string(); + break; + case 45: + message.rubyPackage = reader.string(); + break; case 999: if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -19663,6 +20313,9 @@ if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) if (typeof message.pyGenericServices !== "boolean") return "pyGenericServices: boolean expected"; + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + if (typeof message.phpGenericServices !== "boolean") + return "phpGenericServices: boolean expected"; if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; @@ -19681,6 +20334,15 @@ if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) if (!$util.isString(message.phpClassPrefix)) return "phpClassPrefix: string expected"; + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + if (!$util.isString(message.phpNamespace)) + return "phpNamespace: string expected"; + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + if (!$util.isString(message.phpMetadataNamespace)) + return "phpMetadataNamespace: string expected"; + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + if (!$util.isString(message.rubyPackage)) + return "rubyPackage: string expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -19746,6 +20408,8 @@ message.javaGenericServices = Boolean(object.javaGenericServices); if (object.pyGenericServices != null) message.pyGenericServices = Boolean(object.pyGenericServices); + if (object.phpGenericServices != null) + message.phpGenericServices = Boolean(object.phpGenericServices); if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); if (object.ccEnableArenas != null) @@ -19758,6 +20422,12 @@ message.swiftPrefix = String(object.swiftPrefix); if (object.phpClassPrefix != null) message.phpClassPrefix = String(object.phpClassPrefix); + if (object.phpNamespace != null) + message.phpNamespace = String(object.phpNamespace); + if (object.phpMetadataNamespace != null) + message.phpMetadataNamespace = String(object.phpMetadataNamespace); + if (object.rubyPackage != null) + message.rubyPackage = String(object.rubyPackage); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: array expected"); @@ -19810,11 +20480,15 @@ object.javaGenerateEqualsAndHash = false; object.deprecated = false; object.javaStringCheckUtf8 = false; - object.ccEnableArenas = false; + object.ccEnableArenas = true; object.objcClassPrefix = ""; object.csharpNamespace = ""; object.swiftPrefix = ""; object.phpClassPrefix = ""; + object.phpNamespace = ""; + object.phpGenericServices = false; + object.phpMetadataNamespace = ""; + object.rubyPackage = ""; } if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) object.javaPackage = message.javaPackage; @@ -19848,6 +20522,14 @@ object.swiftPrefix = message.swiftPrefix; if (message.phpClassPrefix != null && message.hasOwnProperty("phpClassPrefix")) object.phpClassPrefix = message.phpClassPrefix; + if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) + object.phpNamespace = message.phpNamespace; + if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) + object.phpGenericServices = message.phpGenericServices; + if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) + object.phpMetadataNamespace = message.phpMetadataNamespace; + if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) + object.rubyPackage = message.rubyPackage; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index ac1aae86d0e..f81292a93c7 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1637,6 +1637,10 @@ "rule": "repeated", "type": "HttpRule", "id": 1 + }, + "fullyDecodeReservedExpansion": { + "type": "bool", + "id": 2 } } }, @@ -1686,6 +1690,10 @@ "type": "string", "id": 7 }, + "responseBody": { + "type": "string", + "id": 12 + }, "additionalBindings": { "rule": "repeated", "type": "HttpRule", @@ -1819,11 +1827,12 @@ }, "protobuf": { "options": { - "go_package": "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor", + "go_package": "google.golang.org/protobuf/types/descriptorpb", "java_package": "com.google.protobuf", "java_outer_classname": "DescriptorProtos", "csharp_namespace": "Google.Protobuf.Reflection", "objc_class_prefix": "GPB", + "cc_enable_arenas": true, "optimize_for": "SPEED" }, "nested": { @@ -1962,6 +1971,10 @@ "end": { "type": "int32", "id": 2 + }, + "options": { + "type": "ExtensionRangeOptions", + "id": 3 } } }, @@ -1979,6 +1992,21 @@ } } }, + "ExtensionRangeOptions": { + "fields": { + "uninterpretedOption": { + "rule": "repeated", + "type": "UninterpretedOption", + "id": 999 + } + }, + "extensions": [ + [ + 1000, + 536870911 + ] + ] + }, "FieldDescriptorProto": { "fields": { "name": { @@ -2020,6 +2048,10 @@ "options": { "type": "FieldOptions", "id": 8 + }, + "proto3Optional": { + "type": "bool", + "id": 17 } }, "nested": { @@ -2080,6 +2112,30 @@ "options": { "type": "EnumOptions", "id": 3 + }, + "reservedRange": { + "rule": "repeated", + "type": "EnumReservedRange", + "id": 4 + }, + "reservedName": { + "rule": "repeated", + "type": "string", + "id": 5 + } + }, + "nested": { + "EnumReservedRange": { + "fields": { + "start": { + "type": "int32", + "id": 1 + }, + "end": { + "type": "int32", + "id": 2 + } + } } } }, @@ -2213,6 +2269,13 @@ "default": false } }, + "phpGenericServices": { + "type": "bool", + "id": 42, + "options": { + "default": false + } + }, "deprecated": { "type": "bool", "id": 23, @@ -2224,7 +2287,7 @@ "type": "bool", "id": 31, "options": { - "default": false + "default": true } }, "objcClassPrefix": { @@ -2243,6 +2306,18 @@ "type": "string", "id": 40 }, + "phpNamespace": { + "type": "string", + "id": 41 + }, + "phpMetadataNamespace": { + "type": "string", + "id": 44 + }, + "rubyPackage": { + "type": "string", + "id": 45 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", diff --git a/handwritten/pubsub/src/opentelemetry-tracing.ts b/handwritten/pubsub/src/opentelemetry-tracing.ts index 3c51dd440af..42261a91aae 100644 --- a/handwritten/pubsub/src/opentelemetry-tracing.ts +++ b/handwritten/pubsub/src/opentelemetry-tracing.ts @@ -13,31 +13,50 @@ * limitations under the License. */ -import {Attributes, SpanContext, Span, trace} from '@opentelemetry/api'; -import {Tracer} from '@opentelemetry/tracing'; +import { + Tracer, + SpanAttributes, + SpanContext, + Span, + context, + trace, + setSpanContext, + SpanKind, +} from '@opentelemetry/api'; + +// eslint-disable-next-line @typescript-eslint/no-var-requires +const PKG = require('../../package.json'); + +/** + * @internal + * Instantiates a Opentelemetry tracer for the library + */ +const libraryTracer: Tracer = trace.getTracer( + '@google-cloud/pubsub', + PKG.version +); /** - * Wrapper for creating OpenTelemetry Spans + * Creates a new span with the given properties * - * @class + * @param {string} spanName the name for the span + * @param {Attributes?} attributes an object containing the attributes to be set for the span + * @param {SpanContext?} parent the context of the parent span to link to the span */ -export class OpenTelemetryTracer { - /** - * Creates a new span with the given properties - * - * @param {string} spanName the name for the span - * @param {Attributes?} attributes an object containing the attributes to be set for the span - * @param {SpanContext?} parent the context of the parent span to link to the span - */ - createSpan( - spanName: string, - attributes?: Attributes, - parent?: SpanContext - ): Span { - const tracerProvider: Tracer = trace.getTracer('default') as Tracer; - return tracerProvider.startSpan(spanName, { - parent: parent, +export function createSpan( + spanName: string, + kind: SpanKind, + attributes?: SpanAttributes, + parent?: SpanContext +): Span { + return libraryTracer.startSpan( + spanName, + { + // set the kind of the span + kind, + // set the attributes of the span attributes: attributes, - }); - } + }, + parent ? setSpanContext(context.active(), parent) : undefined + ); } diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 483990f96b1..bcd8d9e332d 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -17,7 +17,8 @@ import {promisify, promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; -import {Span} from '@opentelemetry/api'; +import {MessagingAttribute} from '@opentelemetry/semantic-conventions'; +import {isSpanContextValid, Span, SpanKind} from '@opentelemetry/api'; import {BatchPublishOptions} from './message-batch'; import {Queue, OrderedQueue} from './message-queues'; @@ -25,7 +26,7 @@ import {Topic} from '../topic'; import {RequestCallback, EmptyCallback} from '../pubsub'; import {google} from '../../protos/protos'; import {defaultOptions} from '../default-options'; -import {OpenTelemetryTracer} from '../opentelemetry-tracing'; +import {createSpan} from '../opentelemetry-tracing'; export type PubsubMessage = google.pubsub.v1.IPubsubMessage; @@ -75,16 +76,11 @@ export class Publisher { settings!: PublishOptions; queue: Queue; orderedQueues: Map; - tracing: OpenTelemetryTracer | undefined; constructor(topic: Topic, options?: PublishOptions) { this.setOptions(options); this.topic = topic; this.queue = new Queue(this); this.orderedQueues = new Map(); - this.tracing = - this.settings && this.settings.enableOpenTelemetryTracing - ? new OpenTelemetryTracer() - : undefined; } flush(): Promise; @@ -238,10 +234,6 @@ export class Publisher { enableOpenTelemetryTracing, } = extend(true, defaults, options); - this.tracing = enableOpenTelemetryTracing - ? new OpenTelemetryTracer() - : undefined; - this.settings = { batching: { maxBytes: Math.min(batching.maxBytes, BATCH_LIMITS.maxBytes!), @@ -262,13 +254,33 @@ export class Publisher { * @param {PubsubMessage} message The message to create a span for */ constructSpan(message: PubsubMessage): Span | undefined { + if (!this.settings.enableOpenTelemetryTracing) { + return undefined; + } + const spanAttributes = { - data: message.data, + // Add Opentelemetry semantic convention attributes to the span, based on: + // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.1.0/specification/trace/semantic_conventions/messaging.md + [MessagingAttribute.MESSAGING_TEMP_DESTINATION]: false, + [MessagingAttribute.MESSAGING_SYSTEM]: 'pubsub', + [MessagingAttribute.MESSAGING_OPERATION]: 'send', + [MessagingAttribute.MESSAGING_DESTINATION]: this.topic.name, + [MessagingAttribute.MESSAGING_DESTINATION_KIND]: 'topic', + [MessagingAttribute.MESSAGING_MESSAGE_ID]: message.messageId, + [MessagingAttribute.MESSAGING_PROTOCOL]: 'pubsub', + [MessagingAttribute.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: + message.data?.length, + 'messaging.pubsub.ordering_key': message.orderingKey, } as Attributes; - const span: Span | undefined = this.tracing - ? this.tracing.createSpan(`${this.topic.name} publisher`, spanAttributes) - : undefined; - if (span) { + + const span: Span = createSpan( + `${this.topic.name} send`, + SpanKind.PRODUCER, + spanAttributes + ); + + // If the span's context is valid we should pass the span context special attribute + if (isSpanContextValid(span.context())) { if ( message.attributes && message.attributes['googclient_OpenTelemetrySpanContext'] @@ -280,10 +292,12 @@ export class Publisher { if (!message.attributes) { message.attributes = {}; } + message.attributes[ 'googclient_OpenTelemetrySpanContext' ] = JSON.stringify(span.context()); } + return span; } } diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 97b8630940e..bff1bb98d4e 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -18,7 +18,8 @@ import {DateStruct, PreciseDate} from '@google-cloud/precise-date'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisify} from '@google-cloud/promisify'; import {EventEmitter} from 'events'; -import {SpanContext, Span} from '@opentelemetry/api'; +import {SpanContext, Span, SpanKind} from '@opentelemetry/api'; +import {MessagingAttribute} from '@opentelemetry/semantic-conventions'; import {google} from '../protos/protos'; import {Histogram} from './histogram'; @@ -28,7 +29,7 @@ import {MessageStream, MessageStreamOptions} from './message-stream'; import {Subscription} from './subscription'; import {defaultOptions} from './default-options'; import {SubscriberClient} from './v1'; -import {OpenTelemetryTracer} from './opentelemetry-tracing'; +import {createSpan} from './opentelemetry-tracing'; export type PullResponse = google.pubsub.v1.IPullResponse; @@ -239,13 +240,13 @@ export class Subscriber extends EventEmitter { private _histogram: Histogram; private _inventory!: LeaseManager; private _isUserSetDeadline: boolean; + private _useOpentelemetry: boolean; private _latencies: Histogram; private _modAcks!: ModAckQueue; private _name!: string; private _options!: SubscriberOptions; private _stream!: MessageStream; private _subscription: Subscription; - private _tracing: OpenTelemetryTracer | undefined; constructor(subscription: Subscription, options = {}) { super(); @@ -255,6 +256,7 @@ export class Subscriber extends EventEmitter { this.useLegacyFlowControl = false; this.isOpen = false; this._isUserSetDeadline = false; + this._useOpentelemetry = false; this._histogram = new Histogram({min: 10, max: 600}); this._latencies = new Histogram(); this._subscription = subscription; @@ -403,6 +405,8 @@ export class Subscriber extends EventEmitter { setOptions(options: SubscriberOptions): void { this._options = options; + this._useOpentelemetry = options.enableOpenTelemetryTracing || false; + if (options.ackDeadline) { this.ackDeadline = options.ackDeadline; this._isUserSetDeadline = true; @@ -433,9 +437,6 @@ export class Subscriber extends EventEmitter { this.maxMessages ); } - this._tracing = options.enableOpenTelemetryTracing - ? new OpenTelemetryTracer() - : undefined; } /** @@ -447,24 +448,47 @@ export class Subscriber extends EventEmitter { private _constructSpan(message: Message): Span | undefined { // Handle cases where OpenTelemetry is disabled or no span context was sent through message if ( - !this._tracing || + !this._useOpentelemetry || !message.attributes || !message.attributes['googclient_OpenTelemetrySpanContext'] ) { return undefined; } + const spanValue = message.attributes['googclient_OpenTelemetrySpanContext']; const parentSpanContext: SpanContext | undefined = spanValue ? JSON.parse(spanValue) : undefined; const spanAttributes = { + // Original span attributes ackId: message.ackId, deliveryAttempt: message.deliveryAttempt, + // + // based on https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/messaging.md#topic-with-multiple-consumers + [MessagingAttribute.MESSAGING_SYSTEM]: 'pubsub', + [MessagingAttribute.MESSAGING_OPERATION]: 'process', + [MessagingAttribute.MESSAGING_DESTINATION]: this.name, + [MessagingAttribute.MESSAGING_DESTINATION_KIND]: 'topic', + [MessagingAttribute.MESSAGING_MESSAGE_ID]: message.id, + [MessagingAttribute.MESSAGING_PROTOCOL]: 'pubsub', + [MessagingAttribute.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: (message.data as Buffer) + .length, + // Not in Opentelemetry semantic convention but mimics naming + 'messaging.pubsub.received_at': message.received, + 'messaging.pubsub.acknowlege_id': message.ackId, + 'messaging.pubsub.delivery_attempt': message.deliveryAttempt, }; + // Subscriber spans should always have a publisher span as a parent. // Return undefined if no parent is provided + const spanName = `${this.name} process`; const span = parentSpanContext - ? this._tracing.createSpan(this._name, spanAttributes, parentSpanContext) + ? createSpan( + spanName.trim(), + SpanKind.CONSUMER, + spanAttributes, + parentSpanContext + ) : undefined; return span; } @@ -491,6 +515,7 @@ export class Subscriber extends EventEmitter { const message = new Message(this, data); const span: Span | undefined = this._constructSpan(message); + if (this.isOpen) { message.modAck(this.ackDeadline); this._inventory.add(message); diff --git a/handwritten/pubsub/test/opentelemetry-tracing.ts b/handwritten/pubsub/test/opentelemetry-tracing.ts index 032a235330b..dc6a1423ed5 100644 --- a/handwritten/pubsub/test/opentelemetry-tracing.ts +++ b/handwritten/pubsub/test/opentelemetry-tracing.ts @@ -15,15 +15,15 @@ */ import * as assert from 'assert'; -import {describe, it, before, beforeEach, afterEach} from 'mocha'; +import {describe, it, beforeEach} from 'mocha'; import * as api from '@opentelemetry/api'; import * as trace from '@opentelemetry/tracing'; -import {OpenTelemetryTracer} from '../src/opentelemetry-tracing'; -import {SimpleSpanProcessor} from '@opentelemetry/tracing'; +import {createSpan} from '../src/opentelemetry-tracing'; +import {exporter} from './tracing'; +import {SpanKind} from '@opentelemetry/api'; describe('OpenTelemetryTracer', () => { - let tracing: OpenTelemetryTracer; let span: trace.Span; const spanName = 'test-span'; const spanContext: api.SpanContext = { @@ -31,33 +31,30 @@ describe('OpenTelemetryTracer', () => { spanId: '6e0c63257de34c92', traceFlags: api.TraceFlags.SAMPLED, }; - const spanAttributes: api.Attributes = { + const spanAttributes: api.SpanAttributes = { foo: 'bar', }; - before(() => { - const provider = new trace.BasicTracerProvider(); - const exporter = new trace.InMemorySpanExporter(); - provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); - api.trace.setGlobalTracerProvider(provider); - }); - beforeEach(() => { - tracing = new OpenTelemetryTracer(); - }); - - afterEach(() => { - span.end(); + exporter.reset(); }); it('creates a span', () => { - span = tracing.createSpan( + span = createSpan( spanName, + SpanKind.PRODUCER, spanAttributes, spanContext ) as trace.Span; - assert.strictEqual(span.name, spanName); - assert.deepStrictEqual(span.attributes, spanAttributes); - assert.strictEqual(span.parentSpanId, spanContext.spanId); + span.end(); + + const spans = exporter.getFinishedSpans(); + assert.notStrictEqual(spans.length, 0); + const exportedSpan = spans.concat().pop()!; + + assert.strictEqual(exportedSpan.name, spanName); + assert.deepStrictEqual(exportedSpan.attributes, spanAttributes); + assert.strictEqual(exportedSpan.parentSpanId, spanContext.spanId); + assert.strictEqual(exportedSpan.kind, SpanKind.PRODUCER); }); }); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index ad59e3604f0..7440bad6691 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -16,23 +16,20 @@ import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; -import {describe, it, before, beforeEach, afterEach} from 'mocha'; +import {describe, it, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; -import { - BasicTracerProvider, - InMemorySpanExporter, - SimpleSpanProcessor, -} from '@opentelemetry/tracing'; import * as opentelemetry from '@opentelemetry/api'; - import {Topic} from '../../src'; import * as p from '../../src/publisher'; import * as q from '../../src/publisher/message-queues'; import {PublishError} from '../../src/publisher/publish-error'; import {defaultOptions} from '../../src/default-options'; +import {exporter} from '../tracing'; +import {SpanKind} from '@opentelemetry/api'; +import {MessagingAttribute} from '@opentelemetry/semantic-conventions'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { @@ -94,14 +91,21 @@ class FakeOrderedQueue extends FakeQueue { } describe('Publisher', () => { - const sandbox = sinon.createSandbox(); - const topic = {} as Topic; + let sandbox: sinon.SinonSandbox; + let spy: sinon.SinonSpyStatic; + const topic = { + name: 'topic-name', + pubsub: {projectId: 'PROJECT_ID'}, + } as Topic; // tslint:disable-next-line variable-name let Publisher: typeof p.Publisher; let publisher: p.Publisher; - before(() => { + beforeEach(() => { + sandbox = sinon.createSandbox(); + spy = sandbox.spy(); + const mocked = proxyquire('../../src/publisher/index.js', { '@google-cloud/promisify': fakePromisify, './message-queues': { @@ -111,9 +115,7 @@ describe('Publisher', () => { }); Publisher = mocked.Publisher; - }); - beforeEach(() => { publisher = new Publisher(topic); }); @@ -151,7 +153,6 @@ describe('Publisher', () => { describe('publish', () => { const buffer = Buffer.from('Hello, world!'); - const spy = sandbox.spy(); it('should call through to publishMessage', () => { const stub = sandbox.stub(publisher, 'publishMessage'); @@ -180,56 +181,52 @@ describe('Publisher', () => { const enableTracing: p.PublishOptions = { enableOpenTelemetryTracing: true, }; - const disableTracing: p.PublishOptions = { - enableOpenTelemetryTracing: false, - }; const buffer = Buffer.from('Hello, world!'); beforeEach(() => { - // Declare tracingPublisher as type any and pre-define _tracing - // to gain access to the private field after publisher init - tracingPublisher['tracing'] = undefined; - }); - it('should not instantiate a tracer when tracing is disabled', () => { - tracingPublisher = new Publisher(topic); - assert.strictEqual(tracingPublisher['tracing'], undefined); - }); - - it('should instantiate a tracer when tracing is enabled through constructor', () => { - tracingPublisher = new Publisher(topic, enableTracing); - assert.ok(tracingPublisher['tracing']); - }); - - it('should instantiate a tracer when tracing is enabled through setOptions', () => { - tracingPublisher = new Publisher(topic); - tracingPublisher.setOptions(enableTracing); - assert.ok(tracingPublisher['tracing']); - }); - - it('should disable tracing when tracing is disabled through setOptions', () => { - tracingPublisher = new Publisher(topic, enableTracing); - tracingPublisher.setOptions(disableTracing); - assert.strictEqual(tracingPublisher['tracing'], undefined); + exporter.reset(); }); it('export created spans', () => { - tracingPublisher = new Publisher(topic, enableTracing); - // Setup trace exporting - const provider: BasicTracerProvider = new BasicTracerProvider(); - const exporter: InMemorySpanExporter = new InMemorySpanExporter(); - provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); - provider.register(); - opentelemetry.trace.setGlobalTracerProvider(provider); + tracingPublisher = new Publisher(topic, enableTracing); tracingPublisher.publish(buffer); - assert.ok(exporter.getFinishedSpans()); + const spans = exporter.getFinishedSpans(); + assert.notStrictEqual(spans.length, 0, 'has span'); + const createdSpan = spans.concat().pop()!; + assert.strictEqual( + createdSpan.status.code, + opentelemetry.SpanStatusCode.UNSET + ); + assert.strictEqual( + createdSpan.attributes[MessagingAttribute.MESSAGING_OPERATION], + 'send' + ); + assert.strictEqual( + createdSpan.attributes[MessagingAttribute.MESSAGING_SYSTEM], + 'pubsub' + ); + assert.strictEqual( + createdSpan.attributes[MessagingAttribute.MESSAGING_DESTINATION], + topic.name + ); + assert.strictEqual( + createdSpan.attributes[MessagingAttribute.MESSAGING_DESTINATION_KIND], + 'topic' + ); + assert.strictEqual(createdSpan.name, 'topic-name send'); + assert.strictEqual( + createdSpan.kind, + SpanKind.PRODUCER, + 'span kind should be PRODUCER' + ); + assert.ok(spans); }); }); describe('publishMessage', () => { const data = Buffer.from('hello, world!'); - const spy = sandbox.spy(); it('should throw an error if data is not a Buffer', () => { const badData = {} as Buffer; diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 82064954f33..031934e0374 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -14,19 +14,15 @@ * limitations under the License. */ +import {exporter} from './tracing'; import * as assert from 'assert'; -import {describe, it, before, beforeEach, afterEach} from 'mocha'; +import {describe, it, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import {common as protobuf} from 'protobufjs'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {PassThrough} from 'stream'; import * as uuid from 'uuid'; -import { - SimpleSpanProcessor, - BasicTracerProvider, - InMemorySpanExporter, -} from '@opentelemetry/tracing'; import * as opentelemetry from '@opentelemetry/api'; import {HistogramOptions} from '../src/histogram'; @@ -35,6 +31,8 @@ import {BatchOptions} from '../src/message-queues'; import {MessageStreamOptions} from '../src/message-stream'; import * as s from '../src/subscriber'; import {Subscription} from '../src/subscription'; +import {SpanKind} from '@opentelemetry/api'; +import {MessagingAttribute} from '@opentelemetry/semantic-conventions'; const stubs = new Map(); @@ -150,10 +148,9 @@ const RECEIVED_MESSAGE = { }; describe('Subscriber', () => { - const sandbox = sinon.createSandbox(); - - const fakeProjectify = {replaceProjectIdToken: sandbox.stub()}; + let sandbox: sinon.SinonSandbox; + let fakeProjectify: any; let subscription: Subscription; // tslint:disable-next-line variable-name @@ -163,7 +160,14 @@ describe('Subscriber', () => { let Subscriber: typeof s.Subscriber; let subscriber: s.Subscriber; - before(() => { + beforeEach(() => { + sandbox = sinon.createSandbox(); + fakeProjectify = { + replaceProjectIdToken: sandbox.stub().callsFake((name, projectId) => { + return `projects/${projectId}/name/${name}`; + }), + }; + const s = proxyquire('../src/subscriber.js', { '@google-cloud/precise-date': {PreciseDate: FakePreciseDate}, '@google-cloud/projectify': fakeProjectify, @@ -178,9 +182,8 @@ describe('Subscriber', () => { Message = s.Message; Subscriber = s.Subscriber; - }); - beforeEach(() => { + // Create standard instance subscription = (new FakeSubscription() as {}) as Subscription; subscriber = new Subscriber(subscription); message = new Message(subscriber, RECEIVED_MESSAGE); @@ -638,7 +641,6 @@ describe('Subscriber', () => { }); describe('OpenTelemetry tracing', () => { - let tracingSubscriber: s.Subscriber = {} as s.Subscriber; const enableTracing: s.SubscriberOptions = { enableOpenTelemetryTracing: true, }; @@ -647,41 +649,42 @@ describe('Subscriber', () => { }; beforeEach(() => { - // Pre-define _tracing to gain access to the private field after subscriber init - tracingSubscriber['_tracing'] = undefined; + exporter.reset(); + }); + + afterEach(() => { + exporter.reset(); + subscriber.close(); }); it('should not instantiate a tracer when tracing is disabled', () => { - tracingSubscriber = new Subscriber(subscription); - assert.strictEqual(tracingSubscriber['_tracing'], undefined); + subscriber = new Subscriber(subscription, {}); + assert.strictEqual(subscriber['_useOpentelemetry'], false); }); it('should instantiate a tracer when tracing is enabled through constructor', () => { - tracingSubscriber = new Subscriber(subscription, enableTracing); - assert.ok(tracingSubscriber['_tracing']); + subscriber = new Subscriber(subscription, enableTracing); + assert.ok(subscriber['_useOpentelemetry']); }); it('should instantiate a tracer when tracing is enabled through setOptions', () => { - tracingSubscriber = new Subscriber(subscription); - tracingSubscriber.setOptions(enableTracing); - assert.ok(tracingSubscriber['_tracing']); + subscriber = new Subscriber(subscription, {}); + subscriber.setOptions(enableTracing); + assert.ok(subscriber['_useOpentelemetry']); }); it('should disable tracing when tracing is disabled through setOptions', () => { - tracingSubscriber = new Subscriber(subscription, enableTracing); - tracingSubscriber.setOptions(disableTracing); - assert.strictEqual(tracingSubscriber['_tracing'], undefined); + subscriber = new Subscriber(subscription, enableTracing); + subscriber.setOptions(disableTracing); + assert.strictEqual(subscriber['_useOpentelemetry'], false); }); it('exports a span once it is created', () => { - tracingSubscriber = new Subscriber(subscription, enableTracing); - - // Setup trace exporting - const provider: BasicTracerProvider = new BasicTracerProvider(); - const exporter: InMemorySpanExporter = new InMemorySpanExporter(); - provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); - provider.register(); - opentelemetry.trace.setGlobalTracerProvider(provider); + subscription = (new FakeSubscription() as {}) as Subscription; + subscriber = new Subscriber(subscription, enableTracing); + message = new Message(subscriber, RECEIVED_MESSAGE); + assert.strictEqual(subscriber['_useOpentelemetry'], true); + subscriber.open(); // Construct mock of received message with span context const parentSpanContext: opentelemetry.SpanContext = { @@ -708,20 +711,51 @@ describe('Subscriber', () => { }; // Receive message and assert that it was exported - const stream: FakeMessageStream = stubs.get('messageStream'); - stream.emit('data', pullResponse); - assert.ok(exporter.getFinishedSpans()); + const msgStream = stubs.get('messageStream'); + msgStream.emit('data', pullResponse); + + const spans = exporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + const firstSpan = spans.concat().shift(); + assert.ok(firstSpan); + assert.strictEqual(firstSpan.parentSpanId, parentSpanContext.spanId); + assert.strictEqual( + firstSpan.name, + `${subscriber.name} process`, + 'name of span should match' + ); + assert.strictEqual( + firstSpan.kind, + SpanKind.CONSUMER, + 'span kind should be CONSUMER' + ); + assert.strictEqual( + firstSpan.attributes[MessagingAttribute.MESSAGING_OPERATION], + 'process', + 'span messaging operation should match' + ); + assert.strictEqual( + firstSpan.attributes[MessagingAttribute.MESSAGING_SYSTEM], + 'pubsub' + ); + assert.strictEqual( + firstSpan.attributes[MessagingAttribute.MESSAGING_MESSAGE_ID], + messageWithSpanContext.message.messageId, + 'span messaging id should match' + ); + assert.strictEqual( + firstSpan.attributes[MessagingAttribute.MESSAGING_DESTINATION], + subscriber.name, + 'span messaging destination should match' + ); + assert.strictEqual( + firstSpan.attributes[MessagingAttribute.MESSAGING_DESTINATION_KIND], + 'topic' + ); }); it('does not export a span when a span context is not present on message', () => { - tracingSubscriber = new Subscriber(subscription, enableTracing); - - // Setup trace exporting - const provider: BasicTracerProvider = new BasicTracerProvider(); - const exporter: InMemorySpanExporter = new InMemorySpanExporter(); - provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); - provider.register(); - opentelemetry.trace.setGlobalTracerProvider(provider); + subscriber = new Subscriber(subscription, enableTracing); const pullResponse: s.PullResponse = { receivedMessages: [RECEIVED_MESSAGE], diff --git a/handwritten/pubsub/test/tracing.ts b/handwritten/pubsub/test/tracing.ts new file mode 100644 index 00000000000..8b1b3114628 --- /dev/null +++ b/handwritten/pubsub/test/tracing.ts @@ -0,0 +1,41 @@ +/*! + * Copyright 2021 Google LLC. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + BasicTracerProvider, + InMemorySpanExporter, + SimpleSpanProcessor, +} from '@opentelemetry/tracing'; + +/** + * This file is used to initialise a global tracing provider and span exporter + * for our tests used in our project. This was the only way I was able to get + * the tracing tests to work. + * + * Now before each test related or touches Opentelemetry + * we are resetting the exporter defined below to ensure there are no spans + * from previous tests still in memory. This is achived by calling `reset` + * on the exporter in the unit tests while keeping one instance of + * the trace provider and exporter. + * + * The tracing provider is being registered as a global trace provider before + * we are importing our actual code which uses the Opentelemetry API to ensure + * its defined beforehand. + */ +export const exporter: InMemorySpanExporter = new InMemorySpanExporter(); +export const provider: BasicTracerProvider = new BasicTracerProvider(); +provider.addSpanProcessor(new SimpleSpanProcessor(exporter)); +provider.register(); From 20cc2892e4276371f1ded818680802206d92dc6f Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 14 Apr 2021 16:10:02 -0400 Subject: [PATCH 0729/1115] chore: unpin sinon again (#1256) fixes: https://github.com/googleapis/nodejs-pubsub/issues/1253 --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5c2a98526c6..7438326d3b5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -95,7 +95,7 @@ "null-loader": "^4.0.0", "protobufjs": "^6.10.1", "proxyquire": "^2.0.0", - "sinon": "10.0.0", + "sinon": "^10.0.0", "tmp": "^0.2.0", "ts-loader": "^8.0.0", "typescript": "^3.8.3", From 6fa7a08110b8abb3522f8c528afbf438dbccc6d7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 14 Apr 2021 23:00:08 +0200 Subject: [PATCH 0730/1115] chore(deps): update dependency @types/sinon to v10 (#1254) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/sinon](https://togithub.com/DefinitelyTyped/DefinitelyTyped) | [`^9.0.11` -> `^10.0.0`](https://renovatebot.com/diffs/npm/@types%2fsinon/9.0.11/10.0.0) | [![age](https://badges.renovateapi.com/packages/npm/@types%2fsinon/10.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@types%2fsinon/10.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@types%2fsinon/10.0.0/compatibility-slim/9.0.11)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@types%2fsinon/10.0.0/confidence-slim/9.0.11)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7438326d3b5..62233bcd1ed 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -78,7 +78,7 @@ "@types/ncp": "^2.0.1", "@types/node": "^12.12.30", "@types/proxyquire": "^1.3.28", - "@types/sinon": "^9.0.11", + "@types/sinon": "^10.0.0", "@types/tmp": "^0.2.0", "@types/uuid": "^8.0.0", "c8": "^7.0.0", From 18e8725cff39b1bae6bcd83766424a1cd04fe348 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 15 Apr 2021 19:00:04 +0000 Subject: [PATCH 0731/1115] chore: release 2.11.0 (#1258) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release \*beep\* \*boop\* --- ## [2.11.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.10.0...v2.11.0) (2021-04-14) ### ⚠ BREAKING CHANGES * fix: added support for Opentelemetry 0.18 - makes significant changes to OpenTelemetry support in order to unblock its usage again; the main user-visible change is that you will need to use 0.18+ versions of OpenTelemetry, and different items are passed to the server in spans. ### Bug Fixes * added support for Opentelemetry 0.18 ([#1234](https://www.github.com/googleapis/nodejs-pubsub/issues/1234)) ([aedc36c](https://www.github.com/googleapis/nodejs-pubsub/commit/aedc36c3f8736eff1cb781b9e05457463481b3d6)) * follow-on proto updates from the removal of the common protos ([#1229](https://www.github.com/googleapis/nodejs-pubsub/issues/1229)) ([cb627d5](https://www.github.com/googleapis/nodejs-pubsub/commit/cb627d5555c617eb025181c9f9aaf1d2c9621a86)) * prevent attempt to publish 0 messages ([#1218](https://www.github.com/googleapis/nodejs-pubsub/issues/1218)) ([96e6535](https://www.github.com/googleapis/nodejs-pubsub/commit/96e653514b35d61f74ba2d5d6fa96e19bc45bf8c)) * remove common protos ([#1232](https://www.github.com/googleapis/nodejs-pubsub/issues/1232)) ([8838288](https://www.github.com/googleapis/nodejs-pubsub/commit/883828800c94f7ea21c8306d272b70b4576c664c)) * reverting the major from the OpenTelemetry change (it was already broken) ([#1257](https://www.github.com/googleapis/nodejs-pubsub/issues/1257)) ([09c428a](https://www.github.com/googleapis/nodejs-pubsub/commit/09c428a17eb20fcd0fc45301addb48d2bebc56a3)) * temporarily pin sinon at 10.0.0 ([#1252](https://www.github.com/googleapis/nodejs-pubsub/issues/1252)) ([0922164](https://www.github.com/googleapis/nodejs-pubsub/commit/09221643be0693463ed4e5d56efd0f1ebfbe78b7)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 16 ++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index e4bf83150e0..968aaa26bcc 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,22 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.11.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.10.0...v2.11.0) (2021-04-14) + + +### ⚠ BREAKING CHANGES + +* `fix: added support for Opentelemetry 0.18` - makes significant changes to OpenTelemetry support in order to unblock its usage again; the main user-visible change is that you will need to use 0.18+ versions of OpenTelemetry, and different items are passed to the server in spans. + +### Bug Fixes + +* added support for Opentelemetry 0.18 ([#1234](https://www.github.com/googleapis/nodejs-pubsub/issues/1234)) ([aedc36c](https://www.github.com/googleapis/nodejs-pubsub/commit/aedc36c3f8736eff1cb781b9e05457463481b3d6)) +* follow-on proto updates from the removal of the common protos ([#1229](https://www.github.com/googleapis/nodejs-pubsub/issues/1229)) ([cb627d5](https://www.github.com/googleapis/nodejs-pubsub/commit/cb627d5555c617eb025181c9f9aaf1d2c9621a86)) +* prevent attempt to publish 0 messages ([#1218](https://www.github.com/googleapis/nodejs-pubsub/issues/1218)) ([96e6535](https://www.github.com/googleapis/nodejs-pubsub/commit/96e653514b35d61f74ba2d5d6fa96e19bc45bf8c)) +* remove common protos ([#1232](https://www.github.com/googleapis/nodejs-pubsub/issues/1232)) ([8838288](https://www.github.com/googleapis/nodejs-pubsub/commit/883828800c94f7ea21c8306d272b70b4576c664c)) +* reverting the major from the OpenTelemetry change (it was already broken) ([#1257](https://www.github.com/googleapis/nodejs-pubsub/issues/1257)) ([09c428a](https://www.github.com/googleapis/nodejs-pubsub/commit/09c428a17eb20fcd0fc45301addb48d2bebc56a3)) +* temporarily pin sinon at 10.0.0 ([#1252](https://www.github.com/googleapis/nodejs-pubsub/issues/1252)) ([0922164](https://www.github.com/googleapis/nodejs-pubsub/commit/09221643be0693463ed4e5d56efd0f1ebfbe78b7)) + ## [2.10.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.9.0...v2.10.0) (2021-02-22) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 62233bcd1ed..d3cba5aa8b9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.10.0", + "version": "2.11.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From a9b6d70304c42771a04da3abfb25c9cb4ee75f31 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 20 Apr 2021 00:56:19 +0200 Subject: [PATCH 0732/1115] chore(deps): update dependency ts-loader to v9 (#1264) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ts-loader](https://togithub.com/TypeStrong/ts-loader) | [`^8.0.0` -> `^9.0.0`](https://renovatebot.com/diffs/npm/ts-loader/8.1.0/9.0.0) | [![age](https://badges.renovateapi.com/packages/npm/ts-loader/9.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/ts-loader/9.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/ts-loader/9.0.0/compatibility-slim/8.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/ts-loader/9.0.0/confidence-slim/8.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
TypeStrong/ts-loader ### [`v9.0.0`](https://togithub.com/TypeStrong/ts-loader/blob/master/CHANGELOG.md#v900) [Compare Source](https://togithub.com/TypeStrong/ts-loader/compare/v8.1.0...v9.0.0) Breaking changes: - minimum webpack version: 5 - minimum node version: 12 Changes: - [webpack 5 migration](https://togithub.com/TypeStrong/ts-loader/pull/1251) - thanks [@​johnnyreilly](https://togithub.com/johnnyreilly), [@​jonwallsten](https://togithub.com/jonwallsten), [@​sokra](https://togithub.com/sokra), [@​appzuka](https://togithub.com/appzuka), [@​alexander-akait](https://togithub.com/alexander-akait)
--- ### Configuration :date: **Schedule**: "after 9am and before 3pm" (UTC). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d3cba5aa8b9..1ac0707e020 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -97,7 +97,7 @@ "proxyquire": "^2.0.0", "sinon": "^10.0.0", "tmp": "^0.2.0", - "ts-loader": "^8.0.0", + "ts-loader": "^9.0.0", "typescript": "^3.8.3", "uuid": "^8.0.0", "webpack": "^5.0.0", From ca34ab2388866d5632b689596e7d27d065060cd3 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 20 Apr 2021 11:02:07 -0700 Subject: [PATCH 0733/1115] chore: regenerate common templates (#1263) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/930a0ee2-572e-4cb1-b0f8-b78e3d5d5681/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/c6706ee5d693e9ae5967614170732646590d8374 Source-Link: https://github.com/googleapis/synthtool/commit/b33b0e2056a85fc2264b294f2cf47dcd45e95186 Source-Link: https://github.com/googleapis/synthtool/commit/898b38a6f4fab89a76dfb152480bb034a781331b --- .../pubsub/.kokoro/release/publish.cfg | 40 ------------------- handwritten/pubsub/synth.metadata | 4 +- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 773936beca5..7d7c4c5c523 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -1,23 +1,3 @@ -# Get npm token from Keystore -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "google_cloud_npm_token" - backend_type: FASTCONFIGPUSH - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - } - } -} - before_action { fetch_keystore { keystore_resource { @@ -27,26 +7,6 @@ before_action { } } -# Fetch magictoken to use with Magic Github Proxy -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "releasetool-magictoken" - } - } -} - -# Fetch api key to use with Magic Github Proxy -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "magic-github-proxy-api-key" - } - } -} - env_vars: { key: "SECRET_MANAGER_KEYS" value: "npm_publish_token,releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata index 139f97fb788..ed4f9245252 100644 --- a/handwritten/pubsub/synth.metadata +++ b/handwritten/pubsub/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "b954fd92703c8e7ac99b668ee4991c2e4ec81885" + "sha": "ee21ee68c964d5e354df673648c521dcc7337bb3" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "318e351e26ba65b2b3cfa3f61b3b64e3540c3525" + "sha": "c6706ee5d693e9ae5967614170732646590d8374" } } ], From 0f2c9e5715ca5ec8c598037c2cc50c7e50563926 Mon Sep 17 00:00:00 2001 From: Jeffrey Rennie Date: Wed, 21 Apr 2021 09:09:50 -0700 Subject: [PATCH 0734/1115] chore: migrate to owl bot (#1265) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: migrate to owl bot * chore: copy files from googleapis-gen 94496fa21b40a7f4d0c4881e8ed8b2bf4117e280 * chore: run the post processor * 🦉 Updates from OwlBot * chore: add copyright header Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 +++ handwritten/pubsub/.github/.OwlBot.yaml | 26 ++++++++++++++ handwritten/pubsub/.repo-metadata.json | 17 ++++----- handwritten/pubsub/owlbot.py | 17 +++++++++ handwritten/pubsub/synth.metadata | 37 -------------------- handwritten/pubsub/synth.py | 25 ------------- 6 files changed, 56 insertions(+), 70 deletions(-) create mode 100644 handwritten/pubsub/.github/.OwlBot.lock.yaml create mode 100644 handwritten/pubsub/.github/.OwlBot.yaml create mode 100644 handwritten/pubsub/owlbot.py delete mode 100644 handwritten/pubsub/synth.metadata delete mode 100644 handwritten/pubsub/synth.py diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml new file mode 100644 index 00000000000..278e98ced87 --- /dev/null +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -0,0 +1,4 @@ +docker: + digest: sha256:c3eae37a355402067b97cbeb6f5a7d2dd87aecfd064aeb2d2ea0bde40778cf68 + image: gcr.io/repo-automation-bots/owlbot-nodejs:latest + diff --git a/handwritten/pubsub/.github/.OwlBot.yaml b/handwritten/pubsub/.github/.OwlBot.yaml new file mode 100644 index 00000000000..b45745724c7 --- /dev/null +++ b/handwritten/pubsub/.github/.OwlBot.yaml @@ -0,0 +1,26 @@ +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +docker: + image: gcr.io/repo-automation-bots/owlbot-nodejs:latest + + +deep-remove-regex: + - /owl-bot-staging + +deep-copy-regex: + - source: /google/pubsub/(v.*)/.*-nodejs/(.*) + dest: /owl-bot-staging/$1/$2 + +begin-after-commit-hash: 94496fa21b40a7f4d0c4881e8ed8b2bf4117e280 + diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json index 9e297608e90..7a3d4859bae 100644 --- a/handwritten/pubsub/.repo-metadata.json +++ b/handwritten/pubsub/.repo-metadata.json @@ -1,14 +1,15 @@ { - "name": "pubsub", - "name_pretty": "Google Cloud Pub/Sub", - "product_documentation": "https://cloud.google.com/pubsub/docs/", - "client_documentation": "https://googleapis.dev/nodejs/pubsub/latest", - "issue_tracker": "https://issuetracker.google.com/savedsearches/559741", + "distribution_name": "@google-cloud/pubsub", "release_level": "ga", - "language": "nodejs", + "product_documentation": "https://cloud.google.com/pubsub/docs/", "repo": "googleapis/nodejs-pubsub", - "distribution_name": "@google-cloud/pubsub", - "api_id": "pubsub.googleapis.com", + "default_version": "v1", + "language": "nodejs", "requires_billing": true, + "issue_tracker": "https://issuetracker.google.com/savedsearches/559741", + "client_documentation": "https://googleapis.dev/nodejs/pubsub/latest", + "name": "pubsub", + "name_pretty": "Google Cloud Pub/Sub", + "api_id": "pubsub.googleapis.com", "codeowner_team": "@googleapis/api-pubsub" } diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py new file mode 100644 index 00000000000..114c67b9334 --- /dev/null +++ b/handwritten/pubsub/owlbot.py @@ -0,0 +1,17 @@ +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import synthtool.languages.node as node + +node.owlbot_main(templates_excludes=['src/index.ts']) \ No newline at end of file diff --git a/handwritten/pubsub/synth.metadata b/handwritten/pubsub/synth.metadata deleted file mode 100644 index ed4f9245252..00000000000 --- a/handwritten/pubsub/synth.metadata +++ /dev/null @@ -1,37 +0,0 @@ -{ - "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/nodejs-pubsub.git", - "sha": "ee21ee68c964d5e354df673648c521dcc7337bb3" - } - }, - { - "git": { - "name": "googleapis", - "remote": "https://github.com/googleapis/googleapis.git", - "sha": "479acf6990eada1213f8666f1c795a018f8496f9", - "internalRef": "360714464" - } - }, - { - "git": { - "name": "synthtool", - "remote": "https://github.com/googleapis/synthtool.git", - "sha": "c6706ee5d693e9ae5967614170732646590d8374" - } - } - ], - "destinations": [ - { - "client": { - "source": "googleapis", - "apiName": "pubsub", - "apiVersion": "v1", - "language": "nodejs", - "generator": "bazel" - } - } - ] -} \ No newline at end of file diff --git a/handwritten/pubsub/synth.py b/handwritten/pubsub/synth.py deleted file mode 100644 index ca9a5103924..00000000000 --- a/handwritten/pubsub/synth.py +++ /dev/null @@ -1,25 +0,0 @@ -import synthtool as s -import synthtool.gcp as gcp -import synthtool.languages.node as node -import logging -import json -import os - -logging.basicConfig(level=logging.DEBUG) - -gapic = gcp.GAPICBazel() -common_templates = gcp.CommonTemplates() - -# tasks has two product names, and a poorly named artman yaml -version = 'v1' -library = gapic.node_library('pubsub', version, proto_path=f'google/pubsub/{version}') - -# skip index, protos, package.json, and README.md -s.copy( - library, - excludes=['package.json', 'README.md', 'src/index.ts']) - -templates = common_templates.node_library(source_location='build/src') -s.copy(templates) - -node.postprocess_gapic_library() From 2739161759495b0fbdcc2a235006248d7b56dfe2 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 6 May 2021 16:13:16 -0400 Subject: [PATCH 0735/1115] feat: update publisher options all the way through the topic object tree (#1279) * feat: update publisher options all the way through the topic object tree; add a defaults getter for publishing options * fix: promisifyAll() broke things again; update method lists, and add a test to catch missed methods later * tests: also add back promisifyAll() to the PubSub tests, and clean up the fallout --- handwritten/pubsub/src/publisher/index.ts | 46 ++++++++++++++++--- .../pubsub/src/publisher/message-batch.ts | 10 ++++ .../pubsub/src/publisher/message-queues.ts | 28 +++++++++++ handwritten/pubsub/src/topic.ts | 21 +++++++++ handwritten/pubsub/test/publisher/index.ts | 28 +++++++++++ .../pubsub/test/publisher/message-batch.ts | 8 ++++ .../pubsub/test/publisher/message-queues.ts | 27 +++++++++++ handwritten/pubsub/test/pubsub.ts | 27 ++++++----- handwritten/pubsub/test/topic.ts | 15 ++++++ 9 files changed, 191 insertions(+), 19 deletions(-) diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index bcd8d9e332d..a567232dd68 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -206,14 +206,19 @@ export class Publisher { queue.resumePublishing(); } } + /** - * Sets the Publisher options. + * Returns the set of default options used for {@link Publisher}. The + * returned value is a copy, and editing it will have no effect elsehwere. + * + * This is a non-static method to make it easier to access/stub. * * @private * - * @param {PublishOptions} options The publisher options. + * @returns {PublishOptions} */ - setOptions(options = {} as PublishOptions): void { + getOptionDefaults(): PublishOptions { + // Return a unique copy to avoid shenanigans. const defaults = { batching: { maxBytes: defaultOptions.publish.maxOutstandingBytes, @@ -227,6 +232,19 @@ export class Publisher { enableOpenTelemetryTracing: false, }; + return defaults; + } + + /** + * Sets the Publisher options. + * + * @private + * + * @param {PublishOptions} options The publisher options. + */ + setOptions(options = {} as PublishOptions): void { + const defaults = this.getOptionDefaults(); + const { batching, gaxOpts, @@ -236,14 +254,28 @@ export class Publisher { this.settings = { batching: { - maxBytes: Math.min(batching.maxBytes, BATCH_LIMITS.maxBytes!), - maxMessages: Math.min(batching.maxMessages, BATCH_LIMITS.maxMessages!), - maxMilliseconds: batching.maxMilliseconds, + maxBytes: Math.min(batching!.maxBytes!, BATCH_LIMITS.maxBytes!), + maxMessages: Math.min( + batching!.maxMessages!, + BATCH_LIMITS.maxMessages! + ), + maxMilliseconds: batching!.maxMilliseconds, }, gaxOpts, messageOrdering, enableOpenTelemetryTracing, }; + + // We also need to let all of our queues know that they need to update their options. + // Note that these might be undefined, because setOptions() is called in the constructor. + if (this.queue) { + this.queue.updateOptions(); + } + if (this.orderedQueues) { + for (const q of this.orderedQueues.values()) { + q.updateOptions(); + } + } } /** @@ -304,5 +336,5 @@ export class Publisher { promisifyAll(Publisher, { singular: true, - exclude: ['publish', 'setOptions', 'constructSpan'], + exclude: ['publish', 'setOptions', 'constructSpan', 'getOptionDefaults'], }); diff --git a/handwritten/pubsub/src/publisher/message-batch.ts b/handwritten/pubsub/src/publisher/message-batch.ts index 9e475d6194d..2e7a2559f2d 100644 --- a/handwritten/pubsub/src/publisher/message-batch.ts +++ b/handwritten/pubsub/src/publisher/message-batch.ts @@ -51,6 +51,16 @@ export class MessageBatch { this.created = Date.now(); this.bytes = 0; } + + /** + * Updates our options from new values. + * + * @param {BatchPublishOptions} options The new options. + */ + setOptions(options: BatchPublishOptions) { + this.options = options; + } + /** * Adds a message to the current batch. * diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 43f2b3ad8f3..d3c275895e6 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -42,6 +42,20 @@ export abstract class MessageQueue extends EventEmitter { this.publisher = publisher; this.batchOptions = publisher.settings.batching!; } + + /** + * Forces the queue to update its options from the publisher. + * The specific queue will need to do a bit more to pass the new + * values down into any MessageBatch. + * + * This is only for use by {@link Publisher}. + * + * @private + */ + updateOptions() { + this.batchOptions = this.publisher.settings.batching!; + } + /** * Adds a message to the queue. * @@ -114,6 +128,13 @@ export class Queue extends MessageQueue { super(publisher); this.batch = new MessageBatch(this.batchOptions); } + + // This needs to update our existing message batch. + updateOptions() { + super.updateOptions(); + this.batch.setOptions(this.batchOptions); + } + /** * Adds a message to the queue. * @@ -173,6 +194,13 @@ export class OrderedQueue extends MessageQueue { this.inFlight = false; this.key = key; } + + // This needs to update our existing message batches. + updateOptions() { + super.updateOptions(); + this.batches.forEach(b => b.setOptions(this.batchOptions)); + } + /** * Reference to the batch we're currently filling. * @returns {MessageBatch} diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index fdf7a21e2d8..09d0dea1f3e 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -920,6 +920,26 @@ export class Topic { this.publisher.setOptions(options); } + /** + * Get the default publisher options. These may be modified and passed + * back into {@link Topic#setPublishOptions}. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const topic = pubsub.topic('my-topic'); + * + * const defaults = topic.getPublishOptionDefaults(); + * defaults.batching.maxMilliseconds = 10; + * topic.setPublishOptions(defaults); + */ + getPublishOptionDefaults(): PublishOptions { + // Generally I'd leave this as a static, but it'll be easier for users to + // get at when they're using the veneer objects. + return this.publisher.getOptionDefaults(); + } + /** * Create a Subscription object. This command by itself will not run any API * requests. You will receive a {module:pubsub/subscription} object, @@ -1022,6 +1042,7 @@ promisifyAll(Topic, { 'publishJSON', 'publishMessage', 'setPublishOptions', + 'getPublishOptionDefaults', 'subscription', ], }); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 7440bad6691..463b0a7d78f 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -37,12 +37,18 @@ const fakePromisify = Object.assign({}, pfy, { if (ctor.name !== 'Publisher') { return; } + + // We _also_ need to call it, because unit tests will catch things + // that shouldn't be promisified. + pfy.promisifyAll(ctor, options); + promisified = true; assert.ok(options.singular); assert.deepStrictEqual(options.exclude, [ 'publish', 'setOptions', 'constructSpan', + 'getOptionDefaults', ]); }, }); @@ -53,6 +59,7 @@ class FakeQueue extends EventEmitter { super(); this.publisher = publisher; } + updateOptions() {} // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: p.PubsubMessage, callback: p.PublishCallback): void {} publish(callback: (err: Error | null) => void) { @@ -433,6 +440,27 @@ describe('Publisher', () => { }); assert.strictEqual(publisher.settings.batching!.maxMessages, 1000); }); + + it('should pass new option values into queues after construction', () => { + // Make sure we have some ordering queues. + publisher.orderedQueues.set('a', new q.OrderedQueue(publisher, 'a')); + publisher.orderedQueues.set('b', new q.OrderedQueue(publisher, 'b')); + + const stubs = [sandbox.stub(publisher.queue, 'updateOptions')]; + assert.deepStrictEqual(publisher.orderedQueues.size, 2); + stubs.push( + ...Array.from(publisher.orderedQueues.values()).map(q => + sandbox.stub(q, 'updateOptions') + ) + ); + + const newOptions: p.PublishOptions = { + batching: {}, + }; + publisher.setOptions(newOptions); + + stubs.forEach(s => assert.ok(s.calledOnce)); + }); }); describe('flush', () => { diff --git a/handwritten/pubsub/test/publisher/message-batch.ts b/handwritten/pubsub/test/publisher/message-batch.ts index 402dc39fbae..f4b3ac85612 100644 --- a/handwritten/pubsub/test/publisher/message-batch.ts +++ b/handwritten/pubsub/test/publisher/message-batch.ts @@ -174,4 +174,12 @@ describe('MessageBatch', () => { assert.strictEqual(isFull, false); }); }); + + describe('setOptions', () => { + it('updates the options', () => { + const newOptions = {}; + batch.setOptions(newOptions); + assert.strictEqual(newOptions, batch.options); + }); + }); }); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 786fb8b2587..9db5a4b6cac 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -67,6 +67,9 @@ class FakeMessageBatch { isFull(): boolean { return false; } + setOptions(options: b.BatchPublishOptions) { + this.options = options; + } } class FakePublishError { @@ -213,6 +216,15 @@ describe('Message Queues', () => { assert.ok(queue.batch instanceof FakeMessageBatch); assert.strictEqual(queue.batch.options, queue.batchOptions); }); + + it('should propagate batch options to the message batch when updated', () => { + const newConfig = { + batching: {}, + }; + publisher.settings = newConfig; + queue.updateOptions(); + assert.strictEqual(queue.batch.options, newConfig.batching); + }); }); describe('add', () => { @@ -339,6 +351,21 @@ describe('Message Queues', () => { it('should localize the ordering key', () => { assert.strictEqual(queue.key, key); }); + + it('should propagate batch options to all message batches when updated', () => { + const firstBatch = queue.createBatch(); + const secondBatch = queue.createBatch(); + queue.batches.push(firstBatch, secondBatch); + + const newConfig = { + batching: {}, + }; + publisher.settings = newConfig; + queue.updateOptions(); + + assert.strictEqual(firstBatch.options, newConfig.batching); + assert.strictEqual(secondBatch.options, newConfig.batching); + }); }); describe('currentBatch', () => { diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 64e0466274f..523ca79f064 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -61,6 +61,11 @@ const fakePromisify = Object.assign({}, promisify, { } promisified = true; + + // We _also_ need to call it, because unit tests will catch things + // that shouldn't be promisified. + promisify.promisifyAll(Class, options); + assert.deepStrictEqual(options.exclude, [ 'request', 'snapshot', @@ -316,17 +321,15 @@ describe('PubSub', () => { }; }); - it('should throw if no Topic is provided', () => { - assert.throws(() => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (pubsub as any).createSubscription(); + it('should throw if no Topic is provided', async () => { + await assert.rejects(async () => { + await pubsub.createSubscription(undefined!, undefined!); }, /A Topic is required for a new subscription\./); }); - it('should throw if no subscription name is provided', () => { - assert.throws(() => { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - (pubsub as any).createSubscription(TOPIC_NAME); + it('should throw if no subscription name is provided', async () => { + await assert.rejects(async () => { + await pubsub.createSubscription(TOPIC_NAME, undefined!); }, /A subscription name is required./); }); @@ -637,9 +640,9 @@ describe('PubSub', () => { }; const apiResponse = 'responseToCheck'; - it('should throw if no subscription name is provided', () => { - assert.throws(() => { - pubsub.detachSubscription(undefined!); + it('should throw if no subscription name is provided', async () => { + await assert.rejects(async () => { + await pubsub.detachSubscription(undefined!); }, /A subscription name is required./); }); @@ -666,7 +669,7 @@ describe('PubSub', () => { }); it('should detach a Subscription from a string', async () => { - sandbox.stub(pubsub, 'request').returns(); + sandbox.stub(pubsub, 'request').callsArg(1); sandbox.stub(pubsub, 'subscription').callsFake(subName => { assert.strictEqual(subName, SUB_NAME); return SUBSCRIPTION as subby.Subscription; diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index d366da48347..dde0bf942d5 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -37,11 +37,17 @@ const fakePromisify = Object.assign({}, pfy, { return; } promisified = true; + + // We _also_ need to call it, because unit tests will catch things + // that shouldn't be promisified. + pfy.promisifyAll(klass, options); + assert.deepStrictEqual(options.exclude, [ 'publish', 'publishJSON', 'publishMessage', 'setPublishOptions', + 'getPublishOptionDefaults', 'subscription', ]); }, @@ -67,6 +73,9 @@ class FakePublisher { setOptions(options: object) { this.options_ = options; } + getOptionDefaults() { + return this.options_; + } } let extended = false; @@ -705,6 +714,12 @@ describe('Topic', () => { assert.strictEqual(stub.callCount, 1); }); + + it('should call through to Publisher#getOptionDefaults', () => { + topic.publisher.options_ = {}; + const defaults = topic.getPublishOptionDefaults(); + assert.strictEqual(defaults, topic.publisher.options_); + }); }); describe('subscription', () => { From 1c5e973b4228fa67c389b8f487d69eef1df7426a Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 6 May 2021 18:56:04 -0700 Subject: [PATCH 0736/1115] fix(deps): require google-gax v2.12.0 (#1282) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1ac0707e020..f7e23b91361 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -60,7 +60,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "^2.9.2", + "google-gax": "^2.12.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From 92dcafd3b6495f9dbf6a9ccef476f210ce77cbf2 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Mon, 10 May 2021 12:47:01 -0700 Subject: [PATCH 0737/1115] fix: use require to load proto JSON (#1283) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: use require to load proto JSON * 🦉 Updates from OwlBot Co-authored-by: Owl Bot --- handwritten/pubsub/src/v1/publisher_client.ts | 29 ++----------------- .../pubsub/src/v1/schema_service_client.ts | 19 ++---------- .../pubsub/src/v1/subscriber_client.ts | 19 ++---------- handwritten/pubsub/webpack.config.js | 2 +- 4 files changed, 8 insertions(+), 61 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 93509242d83..b2c771d4889 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -28,11 +28,11 @@ import { IamClient, IamProtos, } from 'google-gax'; -import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1/publisher_client_config.json`. @@ -150,22 +150,7 @@ export class PublisherClient { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. @@ -209,15 +194,7 @@ export class PublisherClient { ), }; - // This API contains "long-running operations", which return a - // an Operation object that allows for tracking of the operation, - // rather than holding a request open. - const protoFilesRoot = opts.fallback - ? this._gaxModule.protobuf.Root.fromJSON( - // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - ) - : this._gaxModule.protobuf.loadSync(nodejsProtoPath); + const protoFilesRoot = this._gaxModule.protobuf.Root.fromJSON(jsonProtos); // Some methods on this API support automatically batching // requests; denote this. diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 5c04c065117..23038577f5f 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -28,11 +28,11 @@ import { IamClient, IamProtos, } from 'google-gax'; -import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1/schema_service_client_config.json`. @@ -149,22 +149,7 @@ export class SchemaServiceClient { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 4b88455442a..258740cb736 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -28,11 +28,11 @@ import { IamClient, IamProtos, } from 'google-gax'; -import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1/subscriber_client_config.json`. @@ -151,22 +151,7 @@ export class SubscriberClient { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. diff --git a/handwritten/pubsub/webpack.config.js b/handwritten/pubsub/webpack.config.js index 16a13980c81..6336ba02165 100644 --- a/handwritten/pubsub/webpack.config.js +++ b/handwritten/pubsub/webpack.config.js @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 5d3ae3524aa0d35bbe0660995a1763c14b2c9b67 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 18:14:03 +0000 Subject: [PATCH 0738/1115] chore: new owl bot post processor docker image (#1284) gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:f93bb861d6f12574437bb9aee426b71eafd63b419669ff0ed029f4b7e7162e3f --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 5 +- .../pubsub/.github/generated-files-bot.yml | 13 + handwritten/pubsub/protos/protos.d.ts | 14 +- handwritten/pubsub/protos/protos.js | 28 +-- handwritten/pubsub/src/iam.ts | 13 +- handwritten/pubsub/src/publisher/index.ts | 13 +- handwritten/pubsub/src/pubsub.ts | 5 +- handwritten/pubsub/src/subscriber.ts | 10 +- handwritten/pubsub/src/topic.ts | 13 +- handwritten/pubsub/src/v1/publisher_client.ts | 156 ++++++------ .../pubsub/src/v1/schema_service_client.ts | 89 ++++--- .../pubsub/src/v1/subscriber_client.ts | 190 +++++++-------- handwritten/pubsub/system-test/install.ts | 2 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 215 ++++++++--------- .../pubsub/test/gapic_schema_service_v1.ts | 47 ++-- .../pubsub/test/gapic_subscriber_v1.ts | 222 ++++++++---------- handwritten/pubsub/test/iam.ts | 8 +- handwritten/pubsub/test/lease-manager.ts | 76 +++--- handwritten/pubsub/test/message-queues.ts | 4 +- handwritten/pubsub/test/message-stream.ts | 6 +- handwritten/pubsub/test/publisher/index.ts | 16 +- .../pubsub/test/publisher/message-queues.ts | 8 +- handwritten/pubsub/test/pubsub.ts | 44 ++-- handwritten/pubsub/test/snapshot.ts | 8 +- handwritten/pubsub/test/subscriber.ts | 13 +- handwritten/pubsub/test/subscription.ts | 9 +- 26 files changed, 564 insertions(+), 663 deletions(-) create mode 100644 handwritten/pubsub/.github/generated-files-bot.yml diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 278e98ced87..a3a3420de72 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,4 +1,3 @@ docker: - digest: sha256:c3eae37a355402067b97cbeb6f5a7d2dd87aecfd064aeb2d2ea0bde40778cf68 - image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - + image: gcr.io/repo-automation-bots/owlbot-nodejs:latest + digest: sha256:f93bb861d6f12574437bb9aee426b71eafd63b419669ff0ed029f4b7e7162e3f diff --git a/handwritten/pubsub/.github/generated-files-bot.yml b/handwritten/pubsub/.github/generated-files-bot.yml new file mode 100644 index 00000000000..1b3ef1c7837 --- /dev/null +++ b/handwritten/pubsub/.github/generated-files-bot.yml @@ -0,0 +1,13 @@ +generatedFiles: +- path: '.kokoro/**' + message: '`.kokoro` files are templated and should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' +- path: '.github/CODEOWNERS' + message: 'CODEOWNERS should instead be modified via the `codeowner_team` property in .repo-metadata.json' +- path: '.github/workflows/**' + message: '`.github/workflows` (GitHub Actions) should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' +- path: '.github/generated-files-bot.+(yml|yaml)' + message: '`.github/generated-files-bot.(yml|yaml)` should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' +- path: 'README.md' + message: '`README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/master/.readme-partials.yaml' +- path: 'samples/README.md' + message: '`samples/README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/master/.readme-partials.yaml' diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 2bc15192ae9..53b30b43dcf 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -4891,7 +4891,7 @@ export namespace google { public time?: (google.protobuf.ITimestamp|null); /** SeekRequest snapshot. */ - public snapshot: string; + public snapshot?: (string|null); /** SeekRequest target. */ public target?: ("time"|"snapshot"); @@ -6024,7 +6024,7 @@ export namespace google { public parent: string; /** ValidateMessageRequest name. */ - public name: string; + public name?: (string|null); /** ValidateMessageRequest schema. */ public schema?: (google.pubsub.v1.ISchema|null); @@ -6348,19 +6348,19 @@ export namespace google { public selector: string; /** HttpRule get. */ - public get: string; + public get?: (string|null); /** HttpRule put. */ - public put: string; + public put?: (string|null); /** HttpRule post. */ - public post: string; + public post?: (string|null); /** HttpRule delete. */ - public delete: string; + public delete?: (string|null); /** HttpRule patch. */ - public patch: string; + public patch?: (string|null); /** HttpRule custom. */ public custom?: (google.api.ICustomHttpPattern|null); diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 2d3c27e7191..9290302f941 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -11168,11 +11168,11 @@ /** * SeekRequest snapshot. - * @member {string} snapshot + * @member {string|null|undefined} snapshot * @memberof google.pubsub.v1.SeekRequest * @instance */ - SeekRequest.prototype.snapshot = ""; + SeekRequest.prototype.snapshot = null; // OneOf field names bound to virtual getters and setters var $oneOfFields; @@ -13629,11 +13629,11 @@ /** * ValidateMessageRequest name. - * @member {string} name + * @member {string|null|undefined} name * @memberof google.pubsub.v1.ValidateMessageRequest * @instance */ - ValidateMessageRequest.prototype.name = ""; + ValidateMessageRequest.prototype.name = null; /** * ValidateMessageRequest schema. @@ -14391,43 +14391,43 @@ /** * HttpRule get. - * @member {string} get + * @member {string|null|undefined} get * @memberof google.api.HttpRule * @instance */ - HttpRule.prototype.get = ""; + HttpRule.prototype.get = null; /** * HttpRule put. - * @member {string} put + * @member {string|null|undefined} put * @memberof google.api.HttpRule * @instance */ - HttpRule.prototype.put = ""; + HttpRule.prototype.put = null; /** * HttpRule post. - * @member {string} post + * @member {string|null|undefined} post * @memberof google.api.HttpRule * @instance */ - HttpRule.prototype.post = ""; + HttpRule.prototype.post = null; /** * HttpRule delete. - * @member {string} delete + * @member {string|null|undefined} delete * @memberof google.api.HttpRule * @instance */ - HttpRule.prototype["delete"] = ""; + HttpRule.prototype["delete"] = null; /** * HttpRule patch. - * @member {string} patch + * @member {string|null|undefined} patch * @memberof google.api.HttpRule * @instance */ - HttpRule.prototype.patch = ""; + HttpRule.prototype.patch = null; /** * HttpRule custom. diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 9dbfb2dc812..b4909281254 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -379,13 +379,12 @@ export class IAM { } const availablePermissions = arrify(resp!.permissions!); - const permissionHash: IamPermissionsMap = (permissions as string[]).reduce( - (acc, permission) => { - acc[permission] = availablePermissions.indexOf(permission) > -1; - return acc; - }, - {} as {[key: string]: boolean} - ); + const permissionHash: IamPermissionsMap = ( + permissions as string[] + ).reduce((acc, permission) => { + acc[permission] = availablePermissions.indexOf(permission) > -1; + return acc; + }, {} as {[key: string]: boolean}); callback!(null, permissionHash, resp!); } ); diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index a567232dd68..914617b28d4 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -245,12 +245,8 @@ export class Publisher { setOptions(options = {} as PublishOptions): void { const defaults = this.getOptionDefaults(); - const { - batching, - gaxOpts, - messageOrdering, - enableOpenTelemetryTracing, - } = extend(true, defaults, options); + const {batching, gaxOpts, messageOrdering, enableOpenTelemetryTracing} = + extend(true, defaults, options); this.settings = { batching: { @@ -325,9 +321,8 @@ export class Publisher { message.attributes = {}; } - message.attributes[ - 'googclient_OpenTelemetrySpanContext' - ] = JSON.stringify(span.context()); + message.attributes['googclient_OpenTelemetrySpanContext'] = + JSON.stringify(span.context()); } return span; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 94f0339111e..9e8d9588663 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -664,9 +664,8 @@ export class PubSub { // If this looks like a GCP URL of some kind, don't go into emulator // mode. Otherwise, supply a fake SSL provider so a real cert isn't // required for running the emulator. - const officialUrlMatch = this.options.servicePath!.endsWith( - '.googleapis.com' - ); + const officialUrlMatch = + this.options.servicePath!.endsWith('.googleapis.com'); if (!officialUrlMatch) { const grpcInstance = this.options.grpc || gax.grpc; this.options.sslCreds = grpcInstance.credentials.createInsecure(); diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index bff1bb98d4e..0c236ae73c9 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -429,9 +429,8 @@ export class Subscriber extends EventEmitter { options.streamingOptions = {} as MessageStreamOptions; } - const { - maxStreams = defaultOptions.subscription.maxStreams, - } = options.streamingOptions; + const {maxStreams = defaultOptions.subscription.maxStreams} = + options.streamingOptions; options.streamingOptions.maxStreams = Math.min( maxStreams, this.maxMessages @@ -471,8 +470,9 @@ export class Subscriber extends EventEmitter { [MessagingAttribute.MESSAGING_DESTINATION_KIND]: 'topic', [MessagingAttribute.MESSAGING_MESSAGE_ID]: message.id, [MessagingAttribute.MESSAGING_PROTOCOL]: 'pubsub', - [MessagingAttribute.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: (message.data as Buffer) - .length, + [MessagingAttribute.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: ( + message.data as Buffer + ).length, // Not in Opentelemetry semantic convention but mimics naming 'messaging.pubsub.received_at': message.received, 'messaging.pubsub.acknowlege_id': message.ackId, diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 09d0dea1f3e..4e82a0f3e89 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -573,12 +573,13 @@ export class Topic { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; - const reqOpts: google.pubsub.v1.IListTopicSubscriptionsRequest = Object.assign( - { - topic: this.name, - }, - options as SubscriptionOptions - ); + const reqOpts: google.pubsub.v1.IListTopicSubscriptionsRequest = + Object.assign( + { + topic: this.name, + }, + options as SubscriptionOptions + ); delete (reqOpts as PageOptions).gaxOpts; delete (reqOpts as PageOptions).autoPaginate; diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index b2c771d4889..af450c13d2f 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -269,13 +269,14 @@ export class PublisherClient { ]; for (const methodName of publisherStubMethods) { const callPromise = this.publisherStub.then( - stub => (...args: Array<{}>) => { - if (this._terminated) { - return Promise.reject('The client has already been closed.'); - } - const func = stub[methodName]; - return func.apply(stub, args); - }, + stub => + (...args: Array<{}>) => { + if (this._terminated) { + return Promise.reject('The client has already been closed.'); + } + const func = stub[methodName]; + return func.apply(stub, args); + }, (err: Error | null | undefined) => () => { throw err; } @@ -452,11 +453,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - name: request.name || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + name: request.name || '', + }); this.initialize(); return this.innerApiCalls.createTopic(request, options, callback); } @@ -543,11 +543,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - 'topic.name': request.topic!.name || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + 'topic.name': request.topic!.name || '', + }); this.initialize(); return this.innerApiCalls.updateTopic(request, options, callback); } @@ -631,11 +630,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); this.initialize(); return this.innerApiCalls.publish(request, options, callback); } @@ -716,11 +714,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); this.initialize(); return this.innerApiCalls.getTopic(request, options, callback); } @@ -805,11 +802,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); this.initialize(); return this.innerApiCalls.deleteTopic(request, options, callback); } @@ -893,11 +889,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); this.initialize(); return this.innerApiCalls.detachSubscription(request, options, callback); } @@ -988,11 +983,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); this.initialize(); return this.innerApiCalls.listTopics(request, options, callback); } @@ -1030,11 +1024,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listTopics.createStream( @@ -1083,17 +1076,16 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); options = options || {}; const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listTopics.asyncIterate( this.innerApiCalls['listTopics'] as GaxCall, - (request as unknown) as RequestType, + request as unknown as RequestType, callSettings ) as AsyncIterable; } @@ -1191,11 +1183,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); this.initialize(); return this.innerApiCalls.listTopicSubscriptions( request, @@ -1237,11 +1228,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listTopicSubscriptions.createStream( @@ -1290,17 +1280,16 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); options = options || {}; const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listTopicSubscriptions.asyncIterate( this.innerApiCalls['listTopicSubscriptions'] as GaxCall, - (request as unknown) as RequestType, + request as unknown as RequestType, callSettings ) as AsyncIterable; } @@ -1396,11 +1385,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); this.initialize(); return this.innerApiCalls.listTopicSnapshots(request, options, callback); } @@ -1438,11 +1426,10 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listTopicSnapshots.createStream( @@ -1491,17 +1478,16 @@ export class PublisherClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - topic: request.topic || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + topic: request.topic || '', + }); options = options || {}; const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listTopicSnapshots.asyncIterate( this.innerApiCalls['listTopicSnapshots'] as GaxCall, - (request as unknown) as RequestType, + request as unknown as RequestType, callSettings ) as AsyncIterable; } diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 23038577f5f..7810a7d077b 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -238,13 +238,14 @@ export class SchemaServiceClient { ]; for (const methodName of schemaServiceStubMethods) { const callPromise = this.schemaServiceStub.then( - stub => (...args: Array<{}>) => { - if (this._terminated) { - return Promise.reject('The client has already been closed.'); - } - const func = stub[methodName]; - return func.apply(stub, args); - }, + stub => + (...args: Array<{}>) => { + if (this._terminated) { + return Promise.reject('The client has already been closed.'); + } + const func = stub[methodName]; + return func.apply(stub, args); + }, (err: Error | null | undefined) => () => { throw err; } @@ -408,11 +409,10 @@ export class SchemaServiceClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - parent: request.parent || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + parent: request.parent || '', + }); this.initialize(); return this.innerApiCalls.createSchema(request, options, callback); } @@ -497,11 +497,10 @@ export class SchemaServiceClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - name: request.name || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + name: request.name || '', + }); this.initialize(); return this.innerApiCalls.getSchema(request, options, callback); } @@ -582,11 +581,10 @@ export class SchemaServiceClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - name: request.name || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + name: request.name || '', + }); this.initialize(); return this.innerApiCalls.deleteSchema(request, options, callback); } @@ -669,11 +667,10 @@ export class SchemaServiceClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - parent: request.parent || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + parent: request.parent || '', + }); this.initialize(); return this.innerApiCalls.validateSchema(request, options, callback); } @@ -764,11 +761,10 @@ export class SchemaServiceClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - parent: request.parent || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + parent: request.parent || '', + }); this.initialize(); return this.innerApiCalls.validateMessage(request, options, callback); } @@ -863,11 +859,10 @@ export class SchemaServiceClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - parent: request.parent || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + parent: request.parent || '', + }); this.initialize(); return this.innerApiCalls.listSchemas(request, options, callback); } @@ -909,11 +904,10 @@ export class SchemaServiceClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - parent: request.parent || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + parent: request.parent || '', + }); const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listSchemas.createStream( @@ -966,17 +960,16 @@ export class SchemaServiceClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - parent: request.parent || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + parent: request.parent || '', + }); options = options || {}; const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listSchemas.asyncIterate( this.innerApiCalls['listSchemas'] as GaxCall, - (request as unknown) as RequestType, + request as unknown as RequestType, callSettings ) as AsyncIterable; } diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 258740cb736..b619413a355 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -263,13 +263,14 @@ export class SubscriberClient { ]; for (const methodName of subscriberStubMethods) { const callPromise = this.subscriberStub.then( - stub => (...args: Array<{}>) => { - if (this._terminated) { - return Promise.reject('The client has already been closed.'); - } - const func = stub[methodName]; - return func.apply(stub, args); - }, + stub => + (...args: Array<{}>) => { + if (this._terminated) { + return Promise.reject('The client has already been closed.'); + } + const func = stub[methodName]; + return func.apply(stub, args); + }, (err: Error | null | undefined) => () => { throw err; } @@ -524,11 +525,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - name: request.name || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + name: request.name || '', + }); this.initialize(); return this.innerApiCalls.createSubscription(request, options, callback); } @@ -609,11 +609,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); this.initialize(); return this.innerApiCalls.getSubscription(request, options, callback); } @@ -697,11 +696,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - 'subscription.name': request.subscription!.name || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + 'subscription.name': request.subscription!.name || '', + }); this.initialize(); return this.innerApiCalls.updateSubscription(request, options, callback); } @@ -786,11 +784,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); this.initialize(); return this.innerApiCalls.deleteSubscription(request, options, callback); } @@ -886,11 +883,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); this.initialize(); return this.innerApiCalls.modifyAckDeadline(request, options, callback); } @@ -981,11 +977,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); this.initialize(); return this.innerApiCalls.acknowledge(request, options, callback); } @@ -1080,11 +1075,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); this.initialize(); return this.innerApiCalls.pull(request, options, callback); } @@ -1177,11 +1171,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); this.initialize(); return this.innerApiCalls.modifyPushConfig(request, options, callback); } @@ -1266,11 +1259,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - snapshot: request.snapshot || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + snapshot: request.snapshot || '', + }); this.initialize(); return this.innerApiCalls.getSnapshot(request, options, callback); } @@ -1383,11 +1375,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - name: request.name || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + name: request.name || '', + }); this.initialize(); return this.innerApiCalls.createSnapshot(request, options, callback); } @@ -1475,11 +1466,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - 'snapshot.name': request.snapshot!.name || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + 'snapshot.name': request.snapshot!.name || '', + }); this.initialize(); return this.innerApiCalls.updateSnapshot(request, options, callback); } @@ -1568,11 +1558,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - snapshot: request.snapshot || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + snapshot: request.snapshot || '', + }); this.initialize(); return this.innerApiCalls.deleteSnapshot(request, options, callback); } @@ -1674,11 +1663,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - subscription: request.subscription || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + subscription: request.subscription || '', + }); this.initialize(); return this.innerApiCalls.seek(request, options, callback); } @@ -1799,11 +1787,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); this.initialize(); return this.innerApiCalls.listSubscriptions(request, options, callback); } @@ -1841,11 +1828,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listSubscriptions.createStream( @@ -1894,17 +1880,16 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); options = options || {}; const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listSubscriptions.asyncIterate( this.innerApiCalls['listSubscriptions'] as GaxCall, - (request as unknown) as RequestType, + request as unknown as RequestType, callSettings ) as AsyncIterable; } @@ -1998,11 +1983,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); this.initialize(); return this.innerApiCalls.listSnapshots(request, options, callback); } @@ -2040,11 +2024,10 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listSnapshots.createStream( @@ -2093,17 +2076,16 @@ export class SubscriberClient { options = options || {}; options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers[ - 'x-goog-request-params' - ] = gax.routingHeader.fromParams({ - project: request.project || '', - }); + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + project: request.project || '', + }); options = options || {}; const callSettings = new gax.CallSettings(options); this.initialize(); return this.descriptors.page.listSnapshots.asyncIterate( this.innerApiCalls['listSnapshots'] as GaxCall, - (request as unknown) as RequestType, + request as unknown as RequestType, callSettings ) as AsyncIterable; } diff --git a/handwritten/pubsub/system-test/install.ts b/handwritten/pubsub/system-test/install.ts index d1b9705ced1..5021ce4d6f8 100644 --- a/handwritten/pubsub/system-test/install.ts +++ b/handwritten/pubsub/system-test/install.ts @@ -20,7 +20,7 @@ import {promisify} from 'util'; import {describe, it, after} from 'mocha'; const keep = false; -const mvp = (promisify(mv) as {}) as (...args: string[]) => Promise; +const mvp = promisify(mv) as {} as (...args: string[]) => Promise; const ncpp = promisify(ncp); const stagingDir = tmp.dirSync({keep, unsafeCleanup: true}); const stagingPath = stagingDir.name; diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 29e25905dd4..b23de6e7ae1 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -28,10 +28,9 @@ import {PassThrough} from 'stream'; import {protobuf, IamProtos} from 'google-gax'; function generateSampleMessage(instance: T) { - const filledObject = (instance.constructor as typeof protobuf.Message).toObject( - instance as protobuf.Message, - {defaults: true} - ); + const filledObject = ( + instance.constructor as typeof protobuf.Message + ).toObject(instance as protobuf.Message, {defaults: true}); return (instance.constructor as typeof protobuf.Message).fromObject( filledObject ) as T; @@ -247,9 +246,8 @@ describe('v1.PublisherClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - client.innerApiCalls.createTopic = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.createTopic = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.createTopic( request, @@ -361,9 +359,8 @@ describe('v1.PublisherClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - client.innerApiCalls.updateTopic = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.updateTopic = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.updateTopic( request, @@ -474,9 +471,8 @@ describe('v1.PublisherClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.PublishResponse() ); - client.innerApiCalls.publish = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.publish = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.publish( request, @@ -583,9 +579,8 @@ describe('v1.PublisherClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - client.innerApiCalls.getTopic = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.getTopic = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.getTopic( request, @@ -692,9 +687,8 @@ describe('v1.PublisherClient', () => { const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); - client.innerApiCalls.deleteTopic = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.deleteTopic = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.deleteTopic( request, @@ -773,9 +767,8 @@ describe('v1.PublisherClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionResponse() ); - client.innerApiCalls.detachSubscription = stubSimpleCall( - expectedResponse - ); + client.innerApiCalls.detachSubscription = + stubSimpleCall(expectedResponse); const [response] = await client.detachSubscription(request); assert.deepStrictEqual(response, expectedResponse); assert( @@ -806,9 +799,8 @@ describe('v1.PublisherClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionResponse() ); - client.innerApiCalls.detachSubscription = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.detachSubscription = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.detachSubscription( request, @@ -922,9 +914,8 @@ describe('v1.PublisherClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), ]; - client.innerApiCalls.listTopics = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.listTopics = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.listTopics( request, @@ -996,9 +987,8 @@ describe('v1.PublisherClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), ]; - client.descriptors.page.listTopics.createStream = stubPageStreamingCall( - expectedResponse - ); + client.descriptors.page.listTopics.createStream = + stubPageStreamingCall(expectedResponse); const stream = client.listTopicsStream(request); const promise = new Promise((resolve, reject) => { const responses: protos.google.pubsub.v1.Topic[] = []; @@ -1086,9 +1076,8 @@ describe('v1.PublisherClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), ]; - client.descriptors.page.listTopics.asyncIterate = stubAsyncIterationCall( - expectedResponse - ); + client.descriptors.page.listTopics.asyncIterate = + stubAsyncIterationCall(expectedResponse); const responses: protos.google.pubsub.v1.ITopic[] = []; const iterable = client.listTopicsAsync(request); for await (const resource of iterable) { @@ -1167,9 +1156,8 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = [new String(), new String(), new String()]; - client.innerApiCalls.listTopicSubscriptions = stubSimpleCall( - expectedResponse - ); + client.innerApiCalls.listTopicSubscriptions = + stubSimpleCall(expectedResponse); const [response] = await client.listTopicSubscriptions(request); assert.deepStrictEqual(response, expectedResponse); assert( @@ -1198,9 +1186,8 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = [new String(), new String(), new String()]; - client.innerApiCalls.listTopicSubscriptions = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.listTopicSubscriptions = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.listTopicSubscriptions( request, @@ -1268,9 +1255,8 @@ describe('v1.PublisherClient', () => { request.topic = ''; const expectedHeaderRequestParams = 'topic='; const expectedResponse = [new String(), new String(), new String()]; - client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall( - expectedResponse - ); + client.descriptors.page.listTopicSubscriptions.createStream = + stubPageStreamingCall(expectedResponse); const stream = client.listTopicSubscriptionsStream(request); const promise = new Promise((resolve, reject) => { const responses: string[] = []; @@ -1287,16 +1273,18 @@ describe('v1.PublisherClient', () => { const responses = await promise; assert.deepStrictEqual(responses, expectedResponse); assert( - (client.descriptors.page.listTopicSubscriptions - .createStream as SinonStub) + ( + client.descriptors.page.listTopicSubscriptions + .createStream as SinonStub + ) .getCall(0) .calledWith(client.innerApiCalls.listTopicSubscriptions, request) ); assert.strictEqual( - (client.descriptors.page.listTopicSubscriptions - .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listTopicSubscriptions + .createStream as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1313,10 +1301,8 @@ describe('v1.PublisherClient', () => { request.topic = ''; const expectedHeaderRequestParams = 'topic='; const expectedError = new Error('expected'); - client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall( - undefined, - expectedError - ); + client.descriptors.page.listTopicSubscriptions.createStream = + stubPageStreamingCall(undefined, expectedError); const stream = client.listTopicSubscriptionsStream(request); const promise = new Promise((resolve, reject) => { const responses: string[] = []; @@ -1332,16 +1318,18 @@ describe('v1.PublisherClient', () => { }); await assert.rejects(promise, expectedError); assert( - (client.descriptors.page.listTopicSubscriptions - .createStream as SinonStub) + ( + client.descriptors.page.listTopicSubscriptions + .createStream as SinonStub + ) .getCall(0) .calledWith(client.innerApiCalls.listTopicSubscriptions, request) ); assert.strictEqual( - (client.descriptors.page.listTopicSubscriptions - .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listTopicSubscriptions + .createStream as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1358,9 +1346,8 @@ describe('v1.PublisherClient', () => { request.topic = ''; const expectedHeaderRequestParams = 'topic='; const expectedResponse = [new String(), new String(), new String()]; - client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall( - expectedResponse - ); + client.descriptors.page.listTopicSubscriptions.asyncIterate = + stubAsyncIterationCall(expectedResponse); const responses: string[] = []; const iterable = client.listTopicSubscriptionsAsync(request); for await (const resource of iterable) { @@ -1368,15 +1355,17 @@ describe('v1.PublisherClient', () => { } assert.deepStrictEqual(responses, expectedResponse); assert.deepStrictEqual( - (client.descriptors.page.listTopicSubscriptions - .asyncIterate as SinonStub).getCall(0).args[1], + ( + client.descriptors.page.listTopicSubscriptions + .asyncIterate as SinonStub + ).getCall(0).args[1], request ); assert.strictEqual( - (client.descriptors.page.listTopicSubscriptions - .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listTopicSubscriptions + .asyncIterate as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1393,10 +1382,8 @@ describe('v1.PublisherClient', () => { request.topic = ''; const expectedHeaderRequestParams = 'topic='; const expectedError = new Error('expected'); - client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall( - undefined, - expectedError - ); + client.descriptors.page.listTopicSubscriptions.asyncIterate = + stubAsyncIterationCall(undefined, expectedError); const iterable = client.listTopicSubscriptionsAsync(request); await assert.rejects(async () => { const responses: string[] = []; @@ -1405,15 +1392,17 @@ describe('v1.PublisherClient', () => { } }); assert.deepStrictEqual( - (client.descriptors.page.listTopicSubscriptions - .asyncIterate as SinonStub).getCall(0).args[1], + ( + client.descriptors.page.listTopicSubscriptions + .asyncIterate as SinonStub + ).getCall(0).args[1], request ); assert.strictEqual( - (client.descriptors.page.listTopicSubscriptions - .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listTopicSubscriptions + .asyncIterate as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1439,9 +1428,8 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = [new String(), new String(), new String()]; - client.innerApiCalls.listTopicSnapshots = stubSimpleCall( - expectedResponse - ); + client.innerApiCalls.listTopicSnapshots = + stubSimpleCall(expectedResponse); const [response] = await client.listTopicSnapshots(request); assert.deepStrictEqual(response, expectedResponse); assert( @@ -1470,9 +1458,8 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = [new String(), new String(), new String()]; - client.innerApiCalls.listTopicSnapshots = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.listTopicSnapshots = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.listTopicSnapshots( request, @@ -1537,9 +1524,8 @@ describe('v1.PublisherClient', () => { request.topic = ''; const expectedHeaderRequestParams = 'topic='; const expectedResponse = [new String(), new String(), new String()]; - client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall( - expectedResponse - ); + client.descriptors.page.listTopicSnapshots.createStream = + stubPageStreamingCall(expectedResponse); const stream = client.listTopicSnapshotsStream(request); const promise = new Promise((resolve, reject) => { const responses: string[] = []; @@ -1561,10 +1547,9 @@ describe('v1.PublisherClient', () => { .calledWith(client.innerApiCalls.listTopicSnapshots, request) ); assert.strictEqual( - (client.descriptors.page.listTopicSnapshots - .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listTopicSnapshots.createStream as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1581,10 +1566,8 @@ describe('v1.PublisherClient', () => { request.topic = ''; const expectedHeaderRequestParams = 'topic='; const expectedError = new Error('expected'); - client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall( - undefined, - expectedError - ); + client.descriptors.page.listTopicSnapshots.createStream = + stubPageStreamingCall(undefined, expectedError); const stream = client.listTopicSnapshotsStream(request); const promise = new Promise((resolve, reject) => { const responses: string[] = []; @@ -1605,10 +1588,9 @@ describe('v1.PublisherClient', () => { .calledWith(client.innerApiCalls.listTopicSnapshots, request) ); assert.strictEqual( - (client.descriptors.page.listTopicSnapshots - .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listTopicSnapshots.createStream as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1625,9 +1607,8 @@ describe('v1.PublisherClient', () => { request.topic = ''; const expectedHeaderRequestParams = 'topic='; const expectedResponse = [new String(), new String(), new String()]; - client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall( - expectedResponse - ); + client.descriptors.page.listTopicSnapshots.asyncIterate = + stubAsyncIterationCall(expectedResponse); const responses: string[] = []; const iterable = client.listTopicSnapshotsAsync(request); for await (const resource of iterable) { @@ -1635,15 +1616,15 @@ describe('v1.PublisherClient', () => { } assert.deepStrictEqual(responses, expectedResponse); assert.deepStrictEqual( - (client.descriptors.page.listTopicSnapshots - .asyncIterate as SinonStub).getCall(0).args[1], + ( + client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub + ).getCall(0).args[1], request ); assert.strictEqual( - (client.descriptors.page.listTopicSnapshots - .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1660,10 +1641,8 @@ describe('v1.PublisherClient', () => { request.topic = ''; const expectedHeaderRequestParams = 'topic='; const expectedError = new Error('expected'); - client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall( - undefined, - expectedError - ); + client.descriptors.page.listTopicSnapshots.asyncIterate = + stubAsyncIterationCall(undefined, expectedError); const iterable = client.listTopicSnapshotsAsync(request); await assert.rejects(async () => { const responses: string[] = []; @@ -1672,15 +1651,15 @@ describe('v1.PublisherClient', () => { } }); assert.deepStrictEqual( - (client.descriptors.page.listTopicSnapshots - .asyncIterate as SinonStub).getCall(0).args[1], + ( + client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub + ).getCall(0).args[1], request ); assert.strictEqual( - (client.descriptors.page.listTopicSnapshots - .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 9fb79f0711c..e91cb764eba 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -28,10 +28,9 @@ import {PassThrough} from 'stream'; import {protobuf, IamProtos} from 'google-gax'; function generateSampleMessage(instance: T) { - const filledObject = (instance.constructor as typeof protobuf.Message).toObject( - instance as protobuf.Message, - {defaults: true} - ); + const filledObject = ( + instance.constructor as typeof protobuf.Message + ).toObject(instance as protobuf.Message, {defaults: true}); return (instance.constructor as typeof protobuf.Message).fromObject( filledObject ) as T; @@ -247,9 +246,8 @@ describe('v1.SchemaServiceClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Schema() ); - client.innerApiCalls.createSchema = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.createSchema = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.createSchema( request, @@ -359,9 +357,8 @@ describe('v1.SchemaServiceClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Schema() ); - client.innerApiCalls.getSchema = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.getSchema = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.getSchema( request, @@ -468,9 +465,8 @@ describe('v1.SchemaServiceClient', () => { const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); - client.innerApiCalls.deleteSchema = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.deleteSchema = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.deleteSchema( request, @@ -580,9 +576,8 @@ describe('v1.SchemaServiceClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaResponse() ); - client.innerApiCalls.validateSchema = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.validateSchema = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.validateSchema( request, @@ -692,9 +687,8 @@ describe('v1.SchemaServiceClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageResponse() ); - client.innerApiCalls.validateMessage = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.validateMessage = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.validateMessage( request, @@ -808,9 +802,8 @@ describe('v1.SchemaServiceClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), ]; - client.innerApiCalls.listSchemas = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.listSchemas = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.listSchemas( request, @@ -882,9 +875,8 @@ describe('v1.SchemaServiceClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), ]; - client.descriptors.page.listSchemas.createStream = stubPageStreamingCall( - expectedResponse - ); + client.descriptors.page.listSchemas.createStream = + stubPageStreamingCall(expectedResponse); const stream = client.listSchemasStream(request); const promise = new Promise((resolve, reject) => { const responses: protos.google.pubsub.v1.Schema[] = []; @@ -972,9 +964,8 @@ describe('v1.SchemaServiceClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), ]; - client.descriptors.page.listSchemas.asyncIterate = stubAsyncIterationCall( - expectedResponse - ); + client.descriptors.page.listSchemas.asyncIterate = + stubAsyncIterationCall(expectedResponse); const responses: protos.google.pubsub.v1.ISchema[] = []; const iterable = client.listSchemasAsync(request); for await (const resource of iterable) { diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 1ead2c3c352..b8cbaa7f79c 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -28,10 +28,9 @@ import {PassThrough} from 'stream'; import {protobuf, IamProtos} from 'google-gax'; function generateSampleMessage(instance: T) { - const filledObject = (instance.constructor as typeof protobuf.Message).toObject( - instance as protobuf.Message, - {defaults: true} - ); + const filledObject = ( + instance.constructor as typeof protobuf.Message + ).toObject(instance as protobuf.Message, {defaults: true}); return (instance.constructor as typeof protobuf.Message).fromObject( filledObject ) as T; @@ -230,9 +229,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - client.innerApiCalls.createSubscription = stubSimpleCall( - expectedResponse - ); + client.innerApiCalls.createSubscription = + stubSimpleCall(expectedResponse); const [response] = await client.createSubscription(request); assert.deepStrictEqual(response, expectedResponse); assert( @@ -263,9 +261,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - client.innerApiCalls.createSubscription = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.createSubscription = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.createSubscription( request, @@ -375,9 +372,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - client.innerApiCalls.getSubscription = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.getSubscription = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.getSubscription( request, @@ -457,9 +453,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - client.innerApiCalls.updateSubscription = stubSimpleCall( - expectedResponse - ); + client.innerApiCalls.updateSubscription = + stubSimpleCall(expectedResponse); const [response] = await client.updateSubscription(request); assert.deepStrictEqual(response, expectedResponse); assert( @@ -491,9 +486,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - client.innerApiCalls.updateSubscription = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.updateSubscription = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.updateSubscription( request, @@ -573,9 +567,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); - client.innerApiCalls.deleteSubscription = stubSimpleCall( - expectedResponse - ); + client.innerApiCalls.deleteSubscription = + stubSimpleCall(expectedResponse); const [response] = await client.deleteSubscription(request); assert.deepStrictEqual(response, expectedResponse); assert( @@ -606,9 +599,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); - client.innerApiCalls.deleteSubscription = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.deleteSubscription = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.deleteSubscription( request, @@ -718,9 +710,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); - client.innerApiCalls.modifyAckDeadline = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.modifyAckDeadline = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.modifyAckDeadline( request, @@ -830,9 +821,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); - client.innerApiCalls.acknowledge = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.acknowledge = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.acknowledge( request, @@ -1049,9 +1039,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); - client.innerApiCalls.modifyPushConfig = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.modifyPushConfig = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.modifyPushConfig( request, @@ -1161,9 +1150,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); - client.innerApiCalls.getSnapshot = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.getSnapshot = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.getSnapshot( request, @@ -1273,9 +1261,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); - client.innerApiCalls.createSnapshot = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.createSnapshot = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.createSnapshot( request, @@ -1387,9 +1374,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); - client.innerApiCalls.updateSnapshot = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.updateSnapshot = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.updateSnapshot( request, @@ -1500,9 +1486,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); - client.innerApiCalls.deleteSnapshot = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.deleteSnapshot = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.deleteSnapshot( request, @@ -1679,9 +1664,8 @@ describe('v1.SubscriberClient', () => { const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.StreamingPullResponse() ); - client.innerApiCalls.streamingPull = stubBidiStreamingCall( - expectedResponse - ); + client.innerApiCalls.streamingPull = + stubBidiStreamingCall(expectedResponse); const stream = client.streamingPull(); const promise = new Promise((resolve, reject) => { stream.on( @@ -1704,9 +1688,8 @@ describe('v1.SubscriberClient', () => { .calledWithExactly(undefined) ); assert.deepStrictEqual( - (((stream as unknown) as PassThrough)._transform as SinonStub).getCall( - 0 - ).args[0], + ((stream as unknown as PassThrough)._transform as SinonStub).getCall(0) + .args[0], request ); }); @@ -1746,9 +1729,8 @@ describe('v1.SubscriberClient', () => { .calledWithExactly(undefined) ); assert.deepStrictEqual( - (((stream as unknown) as PassThrough)._transform as SinonStub).getCall( - 0 - ).args[0], + ((stream as unknown as PassThrough)._transform as SinonStub).getCall(0) + .args[0], request ); }); @@ -1811,9 +1793,8 @@ describe('v1.SubscriberClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), ]; - client.innerApiCalls.listSubscriptions = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.listSubscriptions = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.listSubscriptions( request, @@ -1885,9 +1866,8 @@ describe('v1.SubscriberClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), ]; - client.descriptors.page.listSubscriptions.createStream = stubPageStreamingCall( - expectedResponse - ); + client.descriptors.page.listSubscriptions.createStream = + stubPageStreamingCall(expectedResponse); const stream = client.listSubscriptionsStream(request); const promise = new Promise((resolve, reject) => { const responses: protos.google.pubsub.v1.Subscription[] = []; @@ -1909,10 +1889,9 @@ describe('v1.SubscriberClient', () => { .calledWith(client.innerApiCalls.listSubscriptions, request) ); assert.strictEqual( - (client.descriptors.page.listSubscriptions - .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listSubscriptions.createStream as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1929,10 +1908,8 @@ describe('v1.SubscriberClient', () => { request.project = ''; const expectedHeaderRequestParams = 'project='; const expectedError = new Error('expected'); - client.descriptors.page.listSubscriptions.createStream = stubPageStreamingCall( - undefined, - expectedError - ); + client.descriptors.page.listSubscriptions.createStream = + stubPageStreamingCall(undefined, expectedError); const stream = client.listSubscriptionsStream(request); const promise = new Promise((resolve, reject) => { const responses: protos.google.pubsub.v1.Subscription[] = []; @@ -1953,10 +1930,9 @@ describe('v1.SubscriberClient', () => { .calledWith(client.innerApiCalls.listSubscriptions, request) ); assert.strictEqual( - (client.descriptors.page.listSubscriptions - .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listSubscriptions.createStream as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -1977,9 +1953,8 @@ describe('v1.SubscriberClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), ]; - client.descriptors.page.listSubscriptions.asyncIterate = stubAsyncIterationCall( - expectedResponse - ); + client.descriptors.page.listSubscriptions.asyncIterate = + stubAsyncIterationCall(expectedResponse); const responses: protos.google.pubsub.v1.ISubscription[] = []; const iterable = client.listSubscriptionsAsync(request); for await (const resource of iterable) { @@ -1987,15 +1962,15 @@ describe('v1.SubscriberClient', () => { } assert.deepStrictEqual(responses, expectedResponse); assert.deepStrictEqual( - (client.descriptors.page.listSubscriptions - .asyncIterate as SinonStub).getCall(0).args[1], + ( + client.descriptors.page.listSubscriptions.asyncIterate as SinonStub + ).getCall(0).args[1], request ); assert.strictEqual( - (client.descriptors.page.listSubscriptions - .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listSubscriptions.asyncIterate as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -2012,10 +1987,8 @@ describe('v1.SubscriberClient', () => { request.project = ''; const expectedHeaderRequestParams = 'project='; const expectedError = new Error('expected'); - client.descriptors.page.listSubscriptions.asyncIterate = stubAsyncIterationCall( - undefined, - expectedError - ); + client.descriptors.page.listSubscriptions.asyncIterate = + stubAsyncIterationCall(undefined, expectedError); const iterable = client.listSubscriptionsAsync(request); await assert.rejects(async () => { const responses: protos.google.pubsub.v1.ISubscription[] = []; @@ -2024,15 +1997,15 @@ describe('v1.SubscriberClient', () => { } }); assert.deepStrictEqual( - (client.descriptors.page.listSubscriptions - .asyncIterate as SinonStub).getCall(0).args[1], + ( + client.descriptors.page.listSubscriptions.asyncIterate as SinonStub + ).getCall(0).args[1], request ); assert.strictEqual( - (client.descriptors.page.listSubscriptions - .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listSubscriptions.asyncIterate as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -2095,9 +2068,8 @@ describe('v1.SubscriberClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), ]; - client.innerApiCalls.listSnapshots = stubSimpleCallWithCallback( - expectedResponse - ); + client.innerApiCalls.listSnapshots = + stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { client.listSnapshots( request, @@ -2169,9 +2141,8 @@ describe('v1.SubscriberClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), ]; - client.descriptors.page.listSnapshots.createStream = stubPageStreamingCall( - expectedResponse - ); + client.descriptors.page.listSnapshots.createStream = + stubPageStreamingCall(expectedResponse); const stream = client.listSnapshotsStream(request); const promise = new Promise((resolve, reject) => { const responses: protos.google.pubsub.v1.Snapshot[] = []; @@ -2193,10 +2164,9 @@ describe('v1.SubscriberClient', () => { .calledWith(client.innerApiCalls.listSnapshots, request) ); assert.strictEqual( - (client.descriptors.page.listSnapshots - .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listSnapshots.createStream as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -2213,10 +2183,8 @@ describe('v1.SubscriberClient', () => { request.project = ''; const expectedHeaderRequestParams = 'project='; const expectedError = new Error('expected'); - client.descriptors.page.listSnapshots.createStream = stubPageStreamingCall( - undefined, - expectedError - ); + client.descriptors.page.listSnapshots.createStream = + stubPageStreamingCall(undefined, expectedError); const stream = client.listSnapshotsStream(request); const promise = new Promise((resolve, reject) => { const responses: protos.google.pubsub.v1.Snapshot[] = []; @@ -2237,10 +2205,9 @@ describe('v1.SubscriberClient', () => { .calledWith(client.innerApiCalls.listSnapshots, request) ); assert.strictEqual( - (client.descriptors.page.listSnapshots - .createStream as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listSnapshots.createStream as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -2261,9 +2228,8 @@ describe('v1.SubscriberClient', () => { generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), ]; - client.descriptors.page.listSnapshots.asyncIterate = stubAsyncIterationCall( - expectedResponse - ); + client.descriptors.page.listSnapshots.asyncIterate = + stubAsyncIterationCall(expectedResponse); const responses: protos.google.pubsub.v1.ISnapshot[] = []; const iterable = client.listSnapshotsAsync(request); for await (const resource of iterable) { @@ -2271,15 +2237,15 @@ describe('v1.SubscriberClient', () => { } assert.deepStrictEqual(responses, expectedResponse); assert.deepStrictEqual( - (client.descriptors.page.listSnapshots - .asyncIterate as SinonStub).getCall(0).args[1], + ( + client.descriptors.page.listSnapshots.asyncIterate as SinonStub + ).getCall(0).args[1], request ); assert.strictEqual( - (client.descriptors.page.listSnapshots - .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listSnapshots.asyncIterate as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); @@ -2296,10 +2262,8 @@ describe('v1.SubscriberClient', () => { request.project = ''; const expectedHeaderRequestParams = 'project='; const expectedError = new Error('expected'); - client.descriptors.page.listSnapshots.asyncIterate = stubAsyncIterationCall( - undefined, - expectedError - ); + client.descriptors.page.listSnapshots.asyncIterate = + stubAsyncIterationCall(undefined, expectedError); const iterable = client.listSnapshotsAsync(request); await assert.rejects(async () => { const responses: protos.google.pubsub.v1.ISnapshot[] = []; @@ -2308,15 +2272,15 @@ describe('v1.SubscriberClient', () => { } }); assert.deepStrictEqual( - (client.descriptors.page.listSnapshots - .asyncIterate as SinonStub).getCall(0).args[1], + ( + client.descriptors.page.listSnapshots.asyncIterate as SinonStub + ).getCall(0).args[1], request ); assert.strictEqual( - (client.descriptors.page.listSnapshots - .asyncIterate as SinonStub).getCall(0).args[2].otherArgs.headers[ - 'x-goog-request-params' - ], + ( + client.descriptors.page.listSnapshots.asyncIterate as SinonStub + ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], expectedHeaderRequestParams ); }); diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index b916313f1de..6adaa5e912a 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -35,10 +35,10 @@ describe('IAM', () => { let IAM: typeof iamTypes.IAM; let iam: iamTypes.IAM; - const PUBSUB = ({ + const PUBSUB = { options: {}, request: util.noop, - } as {}) as PubSub; + } as {} as PubSub; const ID = 'id'; before(() => { @@ -58,14 +58,14 @@ describe('IAM', () => { it('should localize pubsub#request', () => { const fakeRequest = () => {}; - const fakePubsub = ({ + const fakePubsub = { request: { bind(context: PubSub) { assert.strictEqual(context, fakePubsub); return fakeRequest; }, }, - } as {}) as PubSub; + } as {} as PubSub; const iam = new IAM(fakePubsub, ID); assert.strictEqual(iam.request, fakeRequest); diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 93d210595dd..d8e4bee86db 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -62,7 +62,7 @@ describe('LeaseManager', () => { }); beforeEach(() => { - subscriber = (new FakeSubscriber() as {}) as Subscriber; + subscriber = new FakeSubscriber() as {} as Subscriber; leaseManager = new LeaseManager(subscriber); }); @@ -89,8 +89,8 @@ describe('LeaseManager', () => { it('should return the number of pending messages', () => { leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); - leaseManager.add((new FakeMessage() as {}) as Message); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); + leaseManager.add(new FakeMessage() as {} as Message); assert.strictEqual(leaseManager.pending, 1); }); @@ -98,8 +98,8 @@ describe('LeaseManager', () => { describe('size', () => { it('should return the number of messages', () => { - leaseManager.add((new FakeMessage() as {}) as Message); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); + leaseManager.add(new FakeMessage() as {} as Message); assert.strictEqual(leaseManager.size, 2); }); @@ -107,7 +107,7 @@ describe('LeaseManager', () => { describe('add', () => { it('should update the bytes/size values', () => { - const message = (new FakeMessage() as {}) as Message; + const message = new FakeMessage() as {} as Message; leaseManager.add(message); @@ -116,7 +116,7 @@ describe('LeaseManager', () => { }); it('should dispatch the message if allowExcessMessages is true', done => { - const fakeMessage = (new FakeMessage() as {}) as Message; + const fakeMessage = new FakeMessage() as {} as Message; leaseManager.isFull = () => true; leaseManager.setOptions({allowExcessMessages: true}); @@ -130,7 +130,7 @@ describe('LeaseManager', () => { }); it('should dispatch the message if the inventory is not full', done => { - const fakeMessage = (new FakeMessage() as {}) as Message; + const fakeMessage = new FakeMessage() as {} as Message; leaseManager.isFull = () => false; leaseManager.setOptions({allowExcessMessages: false}); @@ -144,7 +144,7 @@ describe('LeaseManager', () => { }); it('should not dispatch the message if the inventory is full', done => { - const fakeMessage = (new FakeMessage() as {}) as Message; + const fakeMessage = new FakeMessage() as {} as Message; leaseManager.isFull = () => true; leaseManager.setOptions({allowExcessMessages: false}); @@ -158,7 +158,7 @@ describe('LeaseManager', () => { }); it('should not dispatch the message if the sub closes', done => { - const fakeMessage = (new FakeMessage() as {}) as Message; + const fakeMessage = new FakeMessage() as {} as Message; leaseManager.isFull = () => false; @@ -175,7 +175,7 @@ describe('LeaseManager', () => { leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); leaseManager.on('full', done); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); }); describe('extending deadlines', () => { @@ -196,7 +196,7 @@ describe('LeaseManager', () => { }); it('should schedule a lease extension', () => { - const message = (new FakeMessage() as {}) as Message; + const message = new FakeMessage() as {} as Message; const stub = sandbox .stub(message, 'modAck') .withArgs(subscriber.ackDeadline); @@ -214,12 +214,12 @@ describe('LeaseManager', () => { // since only 1 timeout should be set, even if add messages at different // times, they should all get extended at the same time messages.forEach(message => { - leaseManager.add((message as {}) as Message); + leaseManager.add(message as {} as Message); clock.tick(halfway); }); messages.forEach((fakeMessage, i) => { - const [deadline] = (stubs[i].lastCall.args as {}) as [number]; + const [deadline] = stubs[i].lastCall.args as {} as [number]; assert.strictEqual(deadline, subscriber.ackDeadline); }); }); @@ -230,7 +230,7 @@ describe('LeaseManager', () => { leaseManager.setOptions({maxExtension}); badMessages.forEach(message => - leaseManager.add((message as {}) as Message) + leaseManager.add(message as {} as Message) ); clock.tick(halfway); @@ -239,7 +239,7 @@ describe('LeaseManager', () => { const removeStub = sandbox.stub(leaseManager, 'remove'); const modAckStub = sandbox.stub(goodMessage, 'modAck'); - leaseManager.add((goodMessage as {}) as Message); + leaseManager.add(goodMessage as {} as Message); clock.tick(halfway); // make sure the expired messages were forgotten @@ -250,7 +250,7 @@ describe('LeaseManager', () => { assert.strictEqual(message, fakeMessage); }); - const [deadline] = (modAckStub.lastCall.args as {}) as [number]; + const [deadline] = modAckStub.lastCall.args as {} as [number]; assert.strictEqual(deadline, subscriber.ackDeadline); }); @@ -261,7 +261,7 @@ describe('LeaseManager', () => { .stub(message, 'modAck') .withArgs(subscriber.ackDeadline); - leaseManager.add((message as {}) as Message); + leaseManager.add(message as {} as Message); clock.tick(expectedTimeout); assert.strictEqual(stub.callCount, 1); @@ -273,8 +273,8 @@ describe('LeaseManager', () => { describe('clear', () => { it('should completely clear out the inventory', () => { - leaseManager.add((new FakeMessage() as {}) as Message); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); + leaseManager.add(new FakeMessage() as {} as Message); leaseManager.clear(); assert.strictEqual(leaseManager.bytes, 0); @@ -283,7 +283,7 @@ describe('LeaseManager', () => { it('should emit the free event if it was full', done => { leaseManager.setOptions({maxMessages: 1}); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); leaseManager.on('free', done); setImmediate(() => leaseManager.clear()); @@ -293,7 +293,7 @@ describe('LeaseManager', () => { const clock = sandbox.useFakeTimers(); const stub = sandbox.stub(subscriber, 'modAck').resolves(); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); leaseManager.clear(); // this would otherwise trigger a minimum of 2 modAcks @@ -308,8 +308,8 @@ describe('LeaseManager', () => { const maxMessages = 1; leaseManager.setOptions({maxMessages}); - leaseManager.add((new FakeMessage() as {}) as Message); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); + leaseManager.add(new FakeMessage() as {} as Message); assert.strictEqual(leaseManager.isFull(), true); }); @@ -319,7 +319,7 @@ describe('LeaseManager', () => { const maxBytes = message.length - 1; leaseManager.setOptions({maxBytes}); - leaseManager.add((message as {}) as Message); + leaseManager.add(message as {} as Message); assert.strictEqual(leaseManager.isFull(), true); }); @@ -330,7 +330,7 @@ describe('LeaseManager', () => { const maxBytes = message.length + 1; leaseManager.setOptions({maxMessages, maxBytes}); - leaseManager.add((message as {}) as Message); + leaseManager.add(message as {} as Message); assert.strictEqual(leaseManager.isFull(), false); }); @@ -340,15 +340,15 @@ describe('LeaseManager', () => { it('should noop for unknown messages', () => { const message = new FakeMessage(); - leaseManager.add((message as {}) as Message); - leaseManager.remove((new FakeMessage() as {}) as Message); + leaseManager.add(message as {} as Message); + leaseManager.remove(new FakeMessage() as {} as Message); assert.strictEqual(leaseManager.size, 1); assert.strictEqual(leaseManager.bytes, message.length); }); it('should update the bytes/size values', () => { - const message = (new FakeMessage() as {}) as Message; + const message = new FakeMessage() as {} as Message; leaseManager.add(message); leaseManager.remove(message); @@ -358,7 +358,7 @@ describe('LeaseManager', () => { }); it('should emit the free event if there is free space', done => { - const message = (new FakeMessage() as {}) as Message; + const message = new FakeMessage() as {} as Message; leaseManager.setOptions({maxMessages: 1}); leaseManager.add(message); @@ -371,7 +371,7 @@ describe('LeaseManager', () => { }); it('should remove a message from the pending state', done => { - const pending = (new FakeMessage() as {}) as Message; + const pending = new FakeMessage() as {} as Message; leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); @@ -381,7 +381,7 @@ describe('LeaseManager', () => { } }); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); leaseManager.add(pending); leaseManager.remove(pending); @@ -390,8 +390,8 @@ describe('LeaseManager', () => { }); it('should dispense a pending messages', done => { - const temp = (new FakeMessage() as {}) as Message; - const pending = (new FakeMessage() as {}) as Message; + const temp = new FakeMessage() as {} as Message; + const pending = new FakeMessage() as {} as Message; leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); @@ -412,7 +412,7 @@ describe('LeaseManager', () => { it('should cancel any extensions if no messages are left', () => { const clock = sandbox.useFakeTimers(); - const message = (new FakeMessage() as {}) as Message; + const message = new FakeMessage() as {} as Message; const stub = sandbox.stub(subscriber, 'modAck').resolves(); leaseManager.add(message); @@ -428,7 +428,7 @@ describe('LeaseManager', () => { it('should allow excess messages by default', () => {}); it('should default maxBytes', () => { - const littleMessage = (new FakeMessage() as {}) as Message; + const littleMessage = new FakeMessage() as {} as Message; const bigMessage = new FakeMessage(); leaseManager.add(littleMessage); @@ -436,7 +436,7 @@ describe('LeaseManager', () => { leaseManager.remove(littleMessage); bigMessage.length = defaultOptions.subscription.maxOutstandingBytes * 2; - leaseManager.add((bigMessage as {}) as Message); + leaseManager.add(bigMessage as {} as Message); assert.strictEqual(leaseManager.isFull(), true); }); @@ -447,7 +447,7 @@ describe('LeaseManager', () => { i++ ) { assert.strictEqual(leaseManager.isFull(), false); - leaseManager.add((new FakeMessage() as {}) as Message); + leaseManager.add(new FakeMessage() as {} as Message); } assert.strictEqual(leaseManager.isFull(), true); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 4f264674f38..43bf46fdce7 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -328,7 +328,7 @@ describe('MessageQueues', () => { let ackQueue: messageTypes.AckQueue; beforeEach(() => { - ackQueue = new AckQueue((subscriber as {}) as Subscriber); + ackQueue = new AckQueue(subscriber as {} as Subscriber); }); it('should send batches via Client#acknowledge', async () => { @@ -397,7 +397,7 @@ describe('MessageQueues', () => { let modAckQueue: messageTypes.ModAckQueue; beforeEach(() => { - modAckQueue = new ModAckQueue((subscriber as {}) as Subscriber); + modAckQueue = new ModAckQueue(subscriber as {} as Subscriber); }); it('should send batches via Client#modifyAckDeadline', async () => { diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 4c5fa171959..e888bf12d07 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -180,7 +180,7 @@ describe('MessageStream', () => { const gaxClient = new FakeGaxClient(); client = gaxClient.client; // we hit the grpc client directly - subscriber = (new FakeSubscriber(gaxClient) as {}) as Subscriber; + subscriber = new FakeSubscriber(gaxClient) as {} as Subscriber; messageStream = new MessageStream(subscriber); }); @@ -196,7 +196,7 @@ describe('MessageStream', () => { highWaterMark: 0, }; assert.deepStrictEqual( - ((messageStream as {}) as FakePassThrough).options, + (messageStream as {} as FakePassThrough).options, expectedOptions ); }); @@ -211,7 +211,7 @@ describe('MessageStream', () => { }; assert.deepStrictEqual( - ((ms as {}) as FakePassThrough).options, + (ms as {} as FakePassThrough).options, expectedOptions ); }); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 463b0a7d78f..af9e79a4041 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -273,7 +273,7 @@ describe('Publisher', () => { queue = new FakeOrderedQueue(publisher, orderingKey); publisher.orderedQueues.set( orderingKey, - (queue as unknown) as q.OrderedQueue + queue as unknown as q.OrderedQueue ); }); @@ -281,9 +281,9 @@ describe('Publisher', () => { publisher.orderedQueues.clear(); publisher.publishMessage(fakeMessage, spy); - queue = (publisher.orderedQueues.get( + queue = publisher.orderedQueues.get( orderingKey - ) as unknown) as FakeOrderedQueue; + ) as unknown as FakeOrderedQueue; assert(queue instanceof FakeOrderedQueue); assert.strictEqual(queue.publisher, publisher); @@ -316,9 +316,9 @@ describe('Publisher', () => { publisher.orderedQueues.clear(); publisher.publishMessage(fakeMessage, spy); - queue = (publisher.orderedQueues.get( + queue = publisher.orderedQueues.get( orderingKey - ) as unknown) as FakeOrderedQueue; + ) as unknown as FakeOrderedQueue; queue.emit('drain'); assert.strictEqual(publisher.orderedQueues.size, 0); @@ -335,9 +335,9 @@ describe('Publisher', () => { sandbox .stub(FakeOrderedQueue.prototype, '_publish') .callsFake((messages, callbacks, callback) => { - const queue = (publisher.orderedQueues.get( + const queue = publisher.orderedQueues.get( orderingKey - ) as unknown) as FakeOrderedQueue; + ) as unknown as FakeOrderedQueue; queue.emit('drain'); if (typeof callback === 'function') callback(null); }); @@ -376,7 +376,7 @@ describe('Publisher', () => { publisher.orderedQueues.set( orderingKey, - (queue as unknown) as q.OrderedQueue + queue as unknown as q.OrderedQueue ); publisher.resumePublishing(orderingKey); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 9db5a4b6cac..9cefee6a836 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -286,7 +286,7 @@ describe('Message Queues', () => { const maxMilliseconds = 1234; queue.batchOptions = {maxMilliseconds}; - queue.pending = (1234 as unknown) as NodeJS.Timer; + queue.pending = 1234 as unknown as NodeJS.Timer; queue.add(fakeMessage, spy); clock.tick(maxMilliseconds); @@ -308,7 +308,7 @@ describe('Message Queues', () => { it('should cancel any pending publish calls', () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any - const fakeHandle = (1234 as unknown) as any; + const fakeHandle = 1234 as unknown as any; const stub = sandbox.stub(global, 'clearTimeout').withArgs(fakeHandle); queue.pending = fakeHandle; @@ -488,7 +488,7 @@ describe('Message Queues', () => { it('should noop after adding if a publish is already pending', () => { const stub = sandbox.stub(queue, 'beginNextPublish'); - queue.pending = (1234 as unknown) as NodeJS.Timer; + queue.pending = 1234 as unknown as NodeJS.Timer; queue.add(fakeMessage, spy); assert.strictEqual(stub.callCount, 0); @@ -585,7 +585,7 @@ describe('Message Queues', () => { }); it('should cancel any pending publishes', () => { - const fakeHandle = (1234 as unknown) as NodeJS.Timer; + const fakeHandle = 1234 as unknown as NodeJS.Timer; const stub = sandbox.stub(global, 'clearTimeout'); queue.pending = fakeHandle; diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 523ca79f064..282745a09fa 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -299,9 +299,9 @@ describe('PubSub', () => { describe('createSubscription', () => { const TOPIC_NAME = 'topic'; pubsub = new pubsubTypes.PubSub({}); - const TOPIC = (Object.assign(new FakeTopic(), { + const TOPIC = Object.assign(new FakeTopic(), { name: 'projects/' + PROJECT_ID + '/topics/' + TOPIC_NAME, - }) as {}) as Topic; + }) as {} as Topic; const SUB_NAME = 'subscription'; const SUBSCRIPTION = { @@ -800,7 +800,7 @@ describe('PubSub', () => { }; setHost('localhost'); - pubsub.options.grpc = (fakeGrpc as unknown) as typeof gax.grpc; + pubsub.options.grpc = fakeGrpc as unknown as typeof gax.grpc; pubsub.determineBaseUrl_(); assert.strictEqual(pubsub.options.sslCreds, fakeCredentials); }); @@ -869,14 +869,14 @@ describe('PubSub', () => { }); it('should build the right request', done => { - const options = ({ + const options = { a: 'b', c: 'd', gaxOpts: { e: 'f', }, autoPaginate: false, - } as {}) as pubsubTypes.PageOptions; + } as {} as pubsubTypes.PageOptions; const expectedOptions = Object.assign({}, options, { project: 'projects/' + pubsub.projectId, @@ -961,12 +961,12 @@ describe('PubSub', () => { }); it('should pass the correct arguments to the API', done => { - const options = ({ + const options = { gaxOpts: { a: 'b', }, autoPaginate: false, - } as {}) as pubsubTypes.GetSubscriptionsOptions; + } as {} as pubsubTypes.GetSubscriptionsOptions; const expectedGaxOpts = Object.assign( { @@ -1046,9 +1046,9 @@ describe('PubSub', () => { it('should call topic.getSubscriptions', done => { const topic = new FakeTopic(); - const opts = ({ + const opts = { topic, - } as {}) as pubsubTypes.GetSubscriptionsOptions; + } as {} as pubsubTypes.GetSubscriptionsOptions; topic.getSubscriptions = (options: pubsubTypes.PageOptions) => { assert.strictEqual(options, opts); @@ -1059,9 +1059,9 @@ describe('PubSub', () => { }); it('should create a topic instance from a name', done => { - const opts = ({ + const opts = { topic: TOPIC_NAME, - } as {}) as pubsubTypes.GetSubscriptionsOptions; + } as {} as pubsubTypes.GetSubscriptionsOptions; const fakeTopic = { getSubscriptions(options: pubsubTypes.PageOptions) { @@ -1099,14 +1099,14 @@ describe('PubSub', () => { }); it('should build the right request', done => { - const options = ({ + const options = { a: 'b', c: 'd', gaxOpts: { e: 'f', }, autoPaginate: false, - } as {}) as pubsubTypes.PageOptions; + } as {} as pubsubTypes.PageOptions; const expectedOptions = Object.assign({}, options, { project: 'projects/' + pubsub.projectId, @@ -1262,9 +1262,9 @@ describe('PubSub', () => { const FAKE_CLIENT_INSTANCE = class { close() {} }; - const CONFIG = ({ + const CONFIG = { client: 'FakeClient', - } as {}) as pubsubTypes.GetClientConfig; + } as {} as pubsubTypes.GetClientConfig; beforeEach(() => { sandbox.stub(pubsub, 'auth').value({getProjectId: () => util.noop}); @@ -1375,10 +1375,10 @@ describe('PubSub', () => { }); describe('getClient_', () => { - const FAKE_CLIENT_INSTANCE = ({} as unknown) as gax.ClientStub; - const CONFIG = ({ + const FAKE_CLIENT_INSTANCE = {} as unknown as gax.ClientStub; + const CONFIG = { client: 'FakeClient', - } as {}) as pubsubTypes.GetClientConfig; + } as {} as pubsubTypes.GetClientConfig; it('should get the client', done => { sandbox @@ -1461,12 +1461,12 @@ describe('PubSub', () => { }); it('should call the client method correctly', done => { - const CONFIG = ({ + const CONFIG = { client: 'FakeClient', method: 'fakeMethod', reqOpts: {a: 'a'}, gaxOpts: {}, - } as {}) as pubsubTypes.RequestConfig; + } as {} as pubsubTypes.RequestConfig; const replacedReqOpts = {}; @@ -1502,7 +1502,7 @@ describe('PubSub', () => { it('should return a Snapshot object', () => { const SNAPSHOT_NAME = 'new-snapshot'; const snapshot = pubsub.snapshot(SNAPSHOT_NAME); - const args = ((snapshot as {}) as FakeSnapshot).calledWith_; + const args = (snapshot as {} as FakeSnapshot).calledWith_; assert(snapshot instanceof FakeSnapshot); assert.strictEqual(args[0], pubsub); @@ -1571,7 +1571,7 @@ describe('PubSub', () => { const fakeOptions = {}; const topic = pubsub.topic(fakeName, fakeOptions); - const [ps, name, options] = ((topic as {}) as FakeTopic).calledWith_; + const [ps, name, options] = (topic as {} as FakeTopic).calledWith_; assert.strictEqual(ps, pubsub); assert.strictEqual(name, fakeName); diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 4a2171bc08f..5f06dcfbbe0 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -41,17 +41,17 @@ describe('Snapshot', () => { const SNAPSHOT_NAME = 'a'; const PROJECT_ID = 'grape-spaceship-123'; - const PUBSUB = ({ + const PUBSUB = { projectId: PROJECT_ID, - } as {}) as PubSub; + } as {} as PubSub; - const SUBSCRIPTION = ({ + const SUBSCRIPTION = { projectId: PROJECT_ID, pubsub: PUBSUB, api: {}, createSnapshot() {}, seek() {}, - } as {}) as Subscription; + } as {} as Subscription; before(() => { Snapshot = proxyquire('../src/snapshot', { diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 031934e0374..ffc900c1966 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -184,7 +184,7 @@ describe('Subscriber', () => { Subscriber = s.Subscriber; // Create standard instance - subscription = (new FakeSubscription() as {}) as Subscription; + subscription = new FakeSubscription() as {} as Subscription; subscriber = new Subscriber(subscription); message = new Message(subscriber, RECEIVED_MESSAGE); subscriber.open(); @@ -438,7 +438,7 @@ describe('Subscriber', () => { describe('getClient', () => { it('should get a subscriber client', async () => { - const pubsub = (subscription.pubsub as {}) as FakePubSub; + const pubsub = subscription.pubsub as {} as FakePubSub; const spy = sandbox.spy(pubsub, 'getClient_'); const client = await subscriber.getClient(); const [options] = spy.lastCall.args; @@ -680,7 +680,7 @@ describe('Subscriber', () => { }); it('exports a span once it is created', () => { - subscription = (new FakeSubscription() as {}) as Subscription; + subscription = new FakeSubscription() as {} as Subscription; subscriber = new Subscriber(subscription, enableTracing); message = new Message(subscriber, RECEIVED_MESSAGE); assert.strictEqual(subscriber['_useOpentelemetry'], true); @@ -696,9 +696,8 @@ describe('Subscriber', () => { ackId: uuid.v4(), message: { attributes: { - googclient_OpenTelemetrySpanContext: JSON.stringify( - parentSpanContext - ), + googclient_OpenTelemetrySpanContext: + JSON.stringify(parentSpanContext), }, data: Buffer.from('Hello, world!'), messageId: uuid.v4(), @@ -798,7 +797,7 @@ describe('Subscriber', () => { it('should localize publishTime', () => { const m = new Message(subscriber, RECEIVED_MESSAGE); - const timestamp = (m.publishTime as unknown) as FakePreciseDate; + const timestamp = m.publishTime as unknown as FakePreciseDate; assert(timestamp instanceof FakePreciseDate); assert.strictEqual( diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 06b49ca0c8d..601679e322f 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -87,11 +87,11 @@ describe('Subscription', () => { const SUB_NAME = 'test-subscription'; const SUB_FULL_NAME = 'projects/' + PROJECT_ID + '/subscriptions/' + SUB_NAME; - const PUBSUB = ({ + const PUBSUB = { projectId: PROJECT_ID, request: util.noop, createSubscription: util.noop, - } as {}) as PubSub; + } as {} as PubSub; before(() => { Subscription = proxyquire('../src/subscription.js', { @@ -152,7 +152,7 @@ describe('Subscription', () => { it('should create an IAM object', () => { assert(subscription.iam instanceof FakeIAM); - const args = ((subscription.iam as {}) as FakeIAM).calledWith_; + const args = (subscription.iam as {} as FakeIAM).calledWith_; assert.strictEqual(args[0], PUBSUB); assert.strictEqual(args[1], subscription.name); }); @@ -339,7 +339,8 @@ describe('Subscription', () => { }); it('should throw an error if theres no topic', () => { - const expectedError = /Subscriptions can only be created when accessed through Topics/; + const expectedError = + /Subscriptions can only be created when accessed through Topics/; delete subscription.topic; assert.throws(() => subscription.create(), expectedError); }); From 6fba7f4d04c88010faa62bc674db6d2b217cd04c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 14:30:02 -0400 Subject: [PATCH 0739/1115] chore: release 2.12.0 (#1281) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 13 +++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 968aaa26bcc..15c05269d5d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,19 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.12.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.11.0...v2.12.0) (2021-05-11) + + +### Features + +* update publisher options all the way through the topic object tree ([#1279](https://www.github.com/googleapis/nodejs-pubsub/issues/1279)) ([70402ac](https://www.github.com/googleapis/nodejs-pubsub/commit/70402ac0f6dc905febecae8f4d3dfa8cc93e7c08)) + + +### Bug Fixes + +* **deps:** require google-gax v2.12.0 ([#1282](https://www.github.com/googleapis/nodejs-pubsub/issues/1282)) ([3dee854](https://www.github.com/googleapis/nodejs-pubsub/commit/3dee8548c2111f512b3afc2ffa3041934fee76ff)) +* use require to load proto JSON ([#1283](https://www.github.com/googleapis/nodejs-pubsub/issues/1283)) ([201a56c](https://www.github.com/googleapis/nodejs-pubsub/commit/201a56c4c7c7115cd3a7c8cff864d83223082d12)) + ## [2.11.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.10.0...v2.11.0) (2021-04-14) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f7e23b91361..c3d104995c8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.11.0", + "version": "2.12.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From d54930079405f70e0f27b9b94feef1659423a42e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 01:40:29 +0000 Subject: [PATCH 0740/1115] chore: new owl bot post processor docker image (#1288) gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:b94b09fb24bf804090b8cc60ee726ca161d5e5915151e417f8ef5d8bcfe73cbc --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index a3a3420de72..e26fd96dec1 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:f93bb861d6f12574437bb9aee426b71eafd63b419669ff0ed029f4b7e7162e3f + digest: sha256:b94b09fb24bf804090b8cc60ee726ca161d5e5915151e417f8ef5d8bcfe73cbc From e75ccab5cadbe215a5c8fed065a06f1701fa0e0e Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 17 May 2021 16:35:47 -0400 Subject: [PATCH 0741/1115] feat: schema library support (#1289) * feat: begin support for server-side schema objects * samples: first sample, for creating an avro schema * samples: update avro create sample with the most recent version * docs: fix a small typo * feat: more implementation for schema, and also pubsub unit tests * cleanup: commit bot provided updates for protos and package.json * tests: added tests for Schema, tweaked a few resulting issues * fix: convert getSchema() to an async iterator and update test * cleanup: remove unneeded(?) IAM client in Schema * fix: tweak getSchemas to listSchemas, to match the wording in GAPIC * docs: fix name of listSchemas() in jsdoc, and fix the type for gaxOpts * docs: add missing jsdoc from PubSub for schema * fix: update callbackify exception list for renamed listSchemas * docs: update jsdoc for Schema class * fix: swap promisify() to opt-in in PubSub, to fix accidental promisification of added methods * fix: fix some issues with PubSub promisified methods, and get the AVRO sample test working * docs: add jsdoc comment for PubSub.getClientConfig() * chore: remove accidentally added files * feat: allow full topic metadata to be passed, when creating a topic * feat: add schema message metadata decoding * samples: add most of the rest of the schema samples * samples: add the rest of the listen/publish samples * feat: allow for deferred name resolution for schema objects * tests: update PubSub unit tests to take promisifySome() into account * fix: metadata translation was incorrectly using the proto IDs * samples: update avro samples for latest library changes * samples: finish cleaning up avro/protobuf samples for schema * tests: update system test for schema samples * feat: add support for typescript based samples, and move the listenForProtobufMessages sample over to it * samples: update listenForProtobufMessages and convert two more to TypeScript * samples: move the rest of the schema samples to TypeScript * samples: fix extra spaces in generated samples * chore: add missing header * tests: disable currently not working (very minor) test * chore: remove sample changes to simplify this PR to library and library test changes only * chore: fix linter problems * docs: fix broken schema API links * fix: change promisifySome() to use method names to work around double-shimming, but type check them * tests: pass the class to promisifySome() also, for testing purposes * chore: fix linter dislike * tests: fix potentially flaky tests to unblock CI... these are actually covered in these issues: https://github.com/googleapis/nodejs-pubsub/issues/1287 https://github.com/googleapis/nodejs-pubsub/issues/1278 --- handwritten/pubsub/src/index.ts | 13 + handwritten/pubsub/src/pubsub.ts | 254 ++++++++++++++++--- handwritten/pubsub/src/schema.ts | 302 +++++++++++++++++++++++ handwritten/pubsub/src/util.ts | 24 ++ handwritten/pubsub/system-test/pubsub.ts | 24 +- handwritten/pubsub/test/pubsub.ts | 141 +++++++++-- handwritten/pubsub/test/schema.ts | 190 ++++++++++++++ handwritten/pubsub/test/subscriber.ts | 1 + 8 files changed, 888 insertions(+), 61 deletions(-) create mode 100644 handwritten/pubsub/src/schema.ts create mode 100644 handwritten/pubsub/test/schema.ts diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 8320ea3c760..585bfb99b66 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -115,6 +115,19 @@ export { Snapshot, } from './snapshot'; export {Message} from './subscriber'; +export { + Schema, + CreateSchemaResponse, + ISchema, + SchemaType, + SchemaTypes, + ICreateSchemaRequest, + SchemaEncoding, + SchemaView, + SchemaViews, + Encodings, + SchemaMessageMetadata, +} from './schema'; export { PushConfig, SubscriptionMetadata, diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 9e8d9588663..472f7ecbe34 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -16,7 +16,6 @@ import {paginator} from '@google-cloud/paginator'; import {replaceProjectIdToken} from '@google-cloud/projectify'; -import {promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {GoogleAuth} from 'google-auth-library'; import * as gax from 'google-gax'; @@ -26,6 +25,8 @@ const PKG = require('../../package.json'); // eslint-disable-next-line @typescript-eslint/no-var-requires const v1 = require('./v1'); +import {promisifySome} from './util'; +import {Schema, SchemaType, ICreateSchemaRequest} from './schema'; import {Snapshot} from './snapshot'; import { Subscription, @@ -43,11 +44,13 @@ import { GetTopicSubscriptionsResponse, CreateTopicCallback, CreateTopicResponse, + TopicMetadata, } from './topic'; import {PublishOptions} from './publisher'; import {CallOptions} from 'google-gax'; import {Transform} from 'stream'; import {google} from '../protos/protos'; +import {SchemaServiceClient} from './v1'; /** * Project ID placeholder. @@ -239,6 +242,7 @@ export class PubSub { api: {[key: string]: gax.ClientStub}; auth: GoogleAuth; projectId: string; + name?: string; // tslint:disable-next-line variable-name Promise?: PromiseConstructor; getSubscriptionsStream = paginator.streamify( @@ -252,6 +256,8 @@ export class PubSub { ) as () => ObjectStream; isOpen = true; + private schemaClient?: SchemaServiceClient; + constructor(options?: ClientConfig) { options = options || {}; // Determine what scopes are needed. @@ -280,6 +286,18 @@ export class PubSub { this.api = {}; this.auth = new GoogleAuth(this.options); this.projectId = this.options.projectId || PROJECT_ID_PLACEHOLDER; + if (this.projectId !== PROJECT_ID_PLACEHOLDER) { + this.name = PubSub.formatName_(this.projectId); + } + } + + /** + * Returns true if we have actually resolved the full project name. + * + * @returns {boolean} true if the name is resolved. + */ + get isIdResolved(): boolean { + return this.projectId.indexOf(PROJECT_ID_PLACEHOLDER) < 0; } close(): Promise; @@ -300,6 +318,7 @@ export class PubSub { if (this.isOpen) { this.isOpen = false; this.closeAllClients_() + .then(() => this.schemaClient?.close()) .then(() => { definedCallback(null); }) @@ -309,6 +328,58 @@ export class PubSub { } } + /** + * Create a schema in the project. + * + * @see [Schemas: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/create} + * @see {@link Schema#create} + * + * @throws {Error} If a schema ID or name is not provided. + * @throws {Error} If an invalid SchemaType is provided. + * @throws {Error} If an invalid schema definition is provided. + * + * @param {string} schemaId The name or ID of the subscription. + * @param {SchemaType} type The type of the schema (Protobuf, Avro, etc). + * @param {string} definition The text describing the schema in terms of the type. + * @param {object} [options] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @returns {Promise} + * + * @example Create a schema. + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * await pubsub.createSchema( + * 'messageType', + * SchemaTypes.Avro, + * '{...avro definition...}' + * ); + */ + async createSchema( + schemaId: string, + type: SchemaType, + definition: string, + gaxOpts?: CallOptions + ): Promise { + // This populates projectId for us. + await this.getClientConfig(); + + const schemaName = Schema.formatName_(this.projectId, schemaId); + const request: ICreateSchemaRequest = { + parent: this.name, + schemaId, + schema: { + name: schemaName, + type, + definition, + }, + }; + + const client = await this.getSchemaClient_(); + await client.createSchema(request, gaxOpts); + return new Schema(this, schemaName); + } + createSubscription( topic: Topic | string, name: string, @@ -467,12 +538,15 @@ export class PubSub { } createTopic( - name: string, + name: string | TopicMetadata, gaxOpts?: CallOptions ): Promise; - createTopic(name: string, callback: CreateTopicCallback): void; createTopic( - name: string, + name: string | TopicMetadata, + callback: CreateTopicCallback + ): void; + createTopic( + name: string | TopicMetadata, gaxOpts: CallOptions, callback: CreateTopicCallback ): void; @@ -517,14 +591,22 @@ export class PubSub { * }); */ createTopic( - name: string, + name: string | TopicMetadata, optsOrCallback?: CallOptions | CreateTopicCallback, callback?: CreateTopicCallback ): Promise | void { - const topic = this.topic(name); - const reqOpts = { - name: topic.name, - }; + const reqOpts: TopicMetadata = + typeof name === 'string' + ? { + name, + } + : name; + + // We don't allow a blank name, but this will let topic() handle that case. + const topic = this.topic(reqOpts.name || ''); + + // Topic#constructor might have canonicalized the name. + reqOpts.name = topic.name; const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -677,6 +759,39 @@ export class PubSub { } } + /** + * Get a list of schemas associated with your project. + * + * The returned AsyncIterable will resolve to {@link Schema} objects. + * These can be used for further interactions with each schema. + * + * This method returns an async iterable. These objects can be adapted + * to work in a Promise/then framework, as well as with callbacks, but + * this discussion is considered out of scope for these docs. + * + * @see [Schemas: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/list} + * @see [More about async iterators]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for-await...of} + * + * @param {object} [options] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @returns {AsyncIterable} + * + * @example + * for await (const s of pubsub.listSchemas()) { + * const moreInfo = await s.get(); + * } + */ + async *listSchemas(options?: CallOptions): AsyncIterable { + const client = await this.getSchemaClient_(); + const query = { + parent: this.name, + view: google.pubsub.v1.SchemaView.BASIC, + }; + for await (const s of client.listSchemasAsync(query, options)) { + yield new Schema(this, s.name!); + } + } + getSnapshots(options?: PageOptions): Promise; getSnapshots(callback: GetSnapshotsCallback): void; getSnapshots(options: PageOptions, callback: GetSnapshotsCallback): void; @@ -735,7 +850,7 @@ export class PubSub { const reqOpts = Object.assign( { - project: 'projects/' + this.projectId, + project: PubSub.formatName_(this.projectId), }, options ); @@ -1007,6 +1122,48 @@ export class PubSub { } ); } + + /** + * Retrieve a client configuration, suitable for passing into a GAPIC + * 'v1' class constructor. This will fill out projectId, emulator URLs, + * and so forth. + * + * @returns {Promise} the filled client configuration. + */ + async getClientConfig(): Promise { + if (!this.projectId || this.projectId === PROJECT_ID_PLACEHOLDER) { + let projectId; + + try { + projectId = await this.auth.getProjectId(); + } catch (e) { + if (!this.isEmulator) { + throw e; + } + projectId = ''; + } + + this.projectId = projectId!; + this.name = PubSub.formatName_(this.projectId); + this.options.projectId = projectId!; + } + + return this.options; + } + + /** + * Gets a schema client, creating one if needed. + * @private + */ + async getSchemaClient_(): Promise { + if (!this.schemaClient) { + const options = await this.getClientConfig(); + this.schemaClient = new v1.SchemaServiceClient(options); + } + + return this.schemaClient!; + } + /** * Callback function to PubSub.getClient_(). * @private @@ -1044,27 +1201,14 @@ export class PubSub { * @returns {Promise} */ async getClientAsync_(config: GetClientConfig): Promise { - if (!this.projectId || this.projectId === PROJECT_ID_PLACEHOLDER) { - let projectId; - - try { - projectId = await this.auth.getProjectId(); - } catch (e) { - if (!this.isEmulator) { - throw e; - } - projectId = ''; - } - - this.projectId = projectId!; - this.options.projectId = projectId!; - } + // Make sure we've got a fully created config with projectId and such. + const options = await this.getClientConfig(); let gaxClient = this.api[config.client]; if (!gaxClient) { // Lazily instantiate client. - gaxClient = new v1[config.client](this.options) as gax.ClientStub; + gaxClient = new v1[config.client](options) as gax.ClientStub; this.api[config.client] = gaxClient; } @@ -1123,6 +1267,26 @@ export class PubSub { client![config.method](reqOpts, config.gaxOpts, callback); }); } + + /** + * Create a Schema object, representing a schema within the project. + * See {@link PubSub#createSchema} or {@link Schema#create} to create a schema. + * + * @throws {Error} If a name is not provided. + * + * @param {string} name The ID or name of the schema. + * @returns {Schema} A {@link Schema} instance. + * + * @example + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const schema = pubsub.schema('my-schema'); + */ + schema(idOrName: string): Schema { + return new Schema(this, idOrName); + } + /** * Create a Snapshot object. See {@link Subscription#createSnapshot} to * create a snapshot. @@ -1198,6 +1362,27 @@ export class PubSub { } return new Topic(this, name, options); } + + /*! + * Format the name of a project. A project's full name is in the + * format of projects/{projectId}. + * + * The GAPIC client should do this for us, but since we maintain + * names rather than IDs, this is simpler. + * + * @private + */ + static formatName_(name: string): string { + if (typeof name !== 'string') { + throw new Error('A name is required to identify a project.'); + } + + // Simple check if the name is already formatted. + if (name.indexOf('/') > -1) { + return name; + } + return `projects/${name}`; + } } /** @@ -1303,9 +1488,16 @@ paginator.extend(PubSub, ['getSnapshots', 'getSubscriptions', 'getTopics']); /*! Developer Documentation * - * All async methods (except for streams) will return a Promise in the event - * that a callback is omitted. + * Existing async methods (except for streams) will return a Promise in the event + * that a callback is omitted. Future methods will not allow for a callback. + * (Use .then() on the returned Promise instead.) */ -promisifyAll(PubSub, { - exclude: ['request', 'snapshot', 'subscription', 'topic'], -}); +promisifySome(PubSub, PubSub.prototype, [ + 'close', + 'createSubscription', + 'createTopic', + 'detachSubscription', + 'getSnapshots', + 'getSubscriptions', + 'getTopics', +]); diff --git a/handwritten/pubsub/src/schema.ts b/handwritten/pubsub/src/schema.ts new file mode 100644 index 00000000000..2c5cdb98205 --- /dev/null +++ b/handwritten/pubsub/src/schema.ts @@ -0,0 +1,302 @@ +// Copyright 2021 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {CallOptions} from 'google-gax'; +import {google} from '../protos/protos'; +import {Attributes} from './publisher'; +import {PubSub} from './pubsub'; + +// Unlike the earlier classes, this one does not do its own gax access. +// Rather, it calls back through the schemaClient instance PubSub holds. +// This class is a very lightweight syntactic wrapper around the GAPIC client. + +/** + * A Schema object allows you to interact with a Cloud Pub/Sub schema. + * + * This should only be instantiated by the PubSub class. To obtain an + * instance for end user usage, call pubsub.schema(). + * + * @class + * @param {PubSub} pubsub The PubSub object creating this object. + * @param {id} id name or ID of the schema. + * + * @example Creating an instance of this class. + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const schema = pubsub.schema('my-schema'); + * + * @example Getting the details of a schema. Note that Schema + * methods do not provide a callback interface. Use .then() or await. + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const schema = pubsub.schema('my-schema'); + * schema.get(SchemaViews.Basic).then(console.log); + */ +export class Schema { + id: string; + name_?: string; + pubsub: PubSub; + + constructor(pubsub: PubSub, idOrName: string) { + /** + * The parent {@link PubSub} instance of this topic instance. + * @name Schema#pubsub + * @type {PubSub} + */ + this.pubsub = pubsub; + + /** + * The fully qualified name of this schema. We will qualify this if + * it's only an ID passed (assuming the parent project). Unfortunately, + * we might not be able to do that if our pubsub's client hasn't been + * initialized. In that case, we just set the id and get the name later. + * @name Schema#id + * @type {string} + */ + this.id = + idOrName.indexOf('/') >= 0 + ? idOrName.substr(idOrName.lastIndexOf('/') + 1) + : idOrName; + } + + /** + * Return the fully qualified name of this schema. + * + * Note that we have to verify that we have a projectId before returning this, + * so we have to check that first. + * + * @return {Promise} a Promise that resolves to the full schema name + */ + async getName(): Promise { + if (!this.name_) { + if (!this.pubsub.isIdResolved) { + await this.pubsub.getClientConfig(); + } + this.name_ = Schema.formatName_(this.pubsub.projectId, this.id); + } + return this.name_; + } + + /** + * Create a schema. + * + * @see [Schemas: create API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/create} + * + * @throws {Error} if the schema type is incorrect. + * @throws {Error} if the definition is invalid. + * + * @param {SchemaType} type The type of the schema (Protobuf, Avro, etc). + * @param {string} definition The text describing the schema in terms of the type. + * @param {object} [options] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @returns {Promise} + * + * @example Create a schema. + * const {PubSub} = require('@google-cloud/pubsub'); + * const pubsub = new PubSub(); + * + * const schema = pubsub.schema('messageType'); + * await schema.create( + * SchemaTypes.Avro, + * '{...avro definition...}' + * ); + */ + async create( + type: SchemaType, + definition: string, + gaxOpts?: CallOptions + ): Promise { + const name = await this.getName(); + await this.pubsub.createSchema(name, type, definition, gaxOpts); + } + + /** + * Get full information about the schema from the service. + * + * @see [Schemas: getSchema API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/get} + * + * @param {object} [options] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @returns {Promise} + */ + async get(gaxOpts?: CallOptions): Promise { + const client = await this.pubsub.getSchemaClient_(); + const name = await this.getName(); + const [schema] = await client.getSchema( + { + name, + view: google.pubsub.v1.SchemaView.FULL, + }, + gaxOpts + ); + + return schema; + } + + /** + * Delete the schema from the project. + * + * @see [Schemas: deleteSchema API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/delete} + * + * @param {object} [options] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @returns {Promise} + */ + async delete(gaxOpts?: CallOptions): Promise { + const client = await this.pubsub.getSchemaClient_(); + const name = await this.getName(); + await client.deleteSchema( + { + name, + }, + gaxOpts + ); + } + + /** + * Validate a schema definition. + * + * @see [Schemas: validateSchema API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/validate} + * + * @throws {Error} if the validation fails. + * + * @param {ISchema} schema The schema definition you wish to validate. + * @param {object} [options] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @returns {Promise} + */ + async validateSchema(schema: ISchema, gaxOpts?: CallOptions): Promise { + const client = await this.pubsub.getSchemaClient_(); + await client.validateSchema( + { + parent: this.pubsub.name, + schema, + }, + gaxOpts + ); + } + + /** + * Validate a message against a schema definition. + * + * @see [Schemas: validateMessage API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/validateMessage} + * + * @throws {Error} if the validation fails. + * @throws {Error} if other parameters are invalid. + * + * @param {ISchema} schema The schema definition you wish to validate against. + * @param {string} message The message to validate. + * @param {SchemaEncoding} encoding The encoding of the message to validate. + * @param {object} [options] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @returns {Promise} + */ + async validateMessage( + schema: ISchema, + message: string, + encoding: SchemaEncoding, + gaxOpts?: CallOptions + ): Promise { + const client = await this.pubsub.getSchemaClient_(); + const name = await this.getName(); + await client.validateMessage( + { + parent: this.pubsub.name, + name, + schema, + message, + encoding, + }, + gaxOpts + ); + } + + /*! + * Format the name of a schema. A schema's full name is in the + * format of projects/{projectId}/schemas/{schemaName}. + * + * The GAPIC client should do this for us, but since we maintain + * names rather than IDs, this is simpler. + * + * @private + */ + static formatName_(projectId: string, nameOrId: string): string { + if (typeof nameOrId !== 'string') { + throw new Error('A name is required to identify a schema.'); + } + + // Simple check if the name is already formatted. + if (nameOrId.indexOf('/') > -1) { + return nameOrId; + } + return `projects/${projectId}/schemas/${nameOrId}`; + } + + /** + * Translates the schema attributes in messages delivered from Pub/Sub. + * All resulting fields may end up being blank. + */ + static metadataFromMessage(attributes: Attributes): SchemaMessageMetadata { + return { + name: attributes['googclient_schemaname'], + encoding: attributes[ + 'googclient_schemaencoding' + ] as unknown as keyof typeof google.pubsub.v1.Encoding, + }; + } +} + +/** + * Schema metadata that might be gathered from a Pub/Sub message. + * This is created for you from {@link Schema#metadataForMessage}. + */ +export interface SchemaMessageMetadata { + /** + * Schema name; may be queried using {@link PubSub#schema}. + */ + name?: string; + + /** + * Encoding; this will be Encodings.Json or Encodings.Binary. + */ + encoding: keyof typeof google.pubsub.v1.Encoding | undefined; +} + +// Export all of these so that clients don't have to dig for them. +export type CreateSchemaResponse = google.pubsub.v1.Schema; +export type ISchema = google.pubsub.v1.ISchema; +export type SchemaType = google.pubsub.v1.Schema.Type; +export type SchemaView = google.pubsub.v1.SchemaView; +export type ICreateSchemaRequest = google.pubsub.v1.ICreateSchemaRequest; +export type SchemaEncoding = google.pubsub.v1.Encoding; + +// Also export these for JavaScript compatible usage. +export const SchemaTypes = { + ProtocolBuffer: google.pubsub.v1.Schema.Type.PROTOCOL_BUFFER, + Avro: google.pubsub.v1.Schema.Type.AVRO, +}; + +export const SchemaViews = { + Basic: google.pubsub.v1.SchemaView.BASIC, + Full: google.pubsub.v1.SchemaView.FULL, +}; + +// These are not schema-specific, but this seems to be the +// only place that exports methods that need them. +export const Encodings = { + Json: 'JSON', + Binary: 'BINARY', +}; diff --git a/handwritten/pubsub/src/util.ts b/handwritten/pubsub/src/util.ts index dc0e81abe88..59268c3178b 100644 --- a/handwritten/pubsub/src/util.ts +++ b/handwritten/pubsub/src/util.ts @@ -14,4 +14,28 @@ * limitations under the License. */ +import {promisify} from '@google-cloud/promisify'; + +/** + * This replaces usage of promisifyAll(), going forward. Instead of opting + * some methods out, you will need to opt methods in. Additionally, this + * function validates method names against the class using TypeScript, + * to generate compile-time failures for misspellings and changes. + * + * Future work in the library should all be Promise-first. + * + * @private + */ +export function promisifySome( + class_: Function, + classProto: T, + methods: (keyof T)[] +): void { + methods.forEach(methodName => { + // Do the same stream checks as promisifyAll(). + const m = classProto[methodName] as unknown as Function; + classProto[methodName] = promisify(m); + }); +} + export function noop() {} diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index c1ea0159c2d..be5f5f39f5d 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -617,24 +617,36 @@ describe('pubsub', () => { it('should ack the message', done => { const subscription = topic.subscription(SUB_NAMES[1]); - subscription.on('error', done); + let errored = false; + subscription.on('error', () => { + errored = true; + subscription.close(done); + }); subscription.on('message', ack); function ack(message: Message) { - message.ack(); - subscription.close(done); + if (!errored) { + message.ack(); + subscription.close(done); + } } }); it('should nack the message', done => { const subscription = topic.subscription(SUB_NAMES[1]); - subscription.on('error', done); + let errored = false; + subscription.on('error', () => { + errored = true; + subscription.close(done); + }); subscription.on('message', nack); function nack(message: Message) { - message.nack(); - subscription.close(done); + if (!errored) { + message.nack(); + subscription.close(done); + } } }); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 282745a09fa..4990d88f7a6 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -13,13 +13,13 @@ // limitations under the License. import * as pjy from '@google-cloud/projectify'; -import * as promisify from '@google-cloud/promisify'; import arrify = require('arrify'); import * as assert from 'assert'; import {describe, it, before, beforeEach, after, afterEach} from 'mocha'; import * as gax from 'google-gax'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; +import defer = require('p-defer'); import {google} from '../protos/protos'; import * as pubsubTypes from '../src/pubsub'; @@ -27,6 +27,7 @@ import {Snapshot} from '../src/snapshot'; import * as subby from '../src/subscription'; import {Topic} from '../src/topic'; import * as util from '../src/util'; +import {Schema, SchemaTypes} from '../src'; // eslint-disable-next-line @typescript-eslint/no-var-requires const PKG = require('../../package.json'); @@ -50,28 +51,28 @@ function Subscription( } let promisified = false; -const fakePromisify = Object.assign({}, promisify, { - promisifyAll( - // tslint:disable-next-line variable-name - Class: typeof pubsubTypes.PubSub, - options: promisify.PromisifyAllOptions - ) { - if (Class.name !== 'PubSub') { - return; +const fakeUtil = Object.assign({}, util, { + promisifySome( + class_: Function, + classProtos: object, + methods: string[] + ): void { + console.log('Promisifying some', classProtos, methods); + if (class_.name === 'PubSub') { + promisified = true; + assert.deepStrictEqual(methods, [ + 'close', + 'createSubscription', + 'createTopic', + 'detachSubscription', + 'getSnapshots', + 'getSubscriptions', + 'getTopics', + ]); } - - promisified = true; - - // We _also_ need to call it, because unit tests will catch things - // that shouldn't be promisified. - promisify.promisifyAll(Class, options); - - assert.deepStrictEqual(options.exclude, [ - 'request', - 'snapshot', - 'subscription', - 'topic', - ]); + // Defeats the method name type check. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + util.promisifySome(class_, classProtos, methods as any); }, }); @@ -166,7 +167,6 @@ describe('PubSub', () => { '@google-cloud/paginator': { paginator: fakePaginator, }, - '@google-cloud/promisify': fakePromisify, '@google-cloud/projectify': { replaceProjectIdToken: fakePjy, }, @@ -178,6 +178,7 @@ describe('PubSub', () => { './subscription': {Subscription}, './topic': {Topic: FakeTopic}, './v1': v1Override, + './util': fakeUtil, }).PubSub; }); @@ -211,7 +212,7 @@ describe('PubSub', () => { assert.strictEqual(pubsub.getTopicsStream, 'getTopics'); }); - it('should promisify all the things', () => { + it('should promisify some of the things', () => { assert(promisified); }); @@ -1578,4 +1579,96 @@ describe('PubSub', () => { assert.strictEqual(options, fakeOptions); }); }); + + describe('schema', () => { + it('should close the schema client when it has been opened', async () => { + // Force it to create a client. + const client = await pubsub.getSchemaClient_(); + const stub = sandbox.stub(client, 'close').resolves(); + pubsub.close(); + await stub; + }); + + // I feel like this ought to be a test, but something in getSchemaClient_() + // is trying to talk to auth services, so I'm skipping it for now. + /* it('getSchemaClient_ creates a schema client', async () => { + const client = await pubsub.getSchemaClient_(); + assert.notStrictEqual(client, undefined); + assert.notStrictEqual(client, null); + await pubsub.close(); + }); */ + + it('calls down to createSchema correctly', async () => { + const schemaId = 'id'; + const type = SchemaTypes.Avro; + const definition = 'def'; + const name = Schema.formatName_(pubsub.projectId, schemaId); + + // Grab the schema client it'll be using so we can stub it. + const client = await pubsub.getSchemaClient_(); + const def = defer(); + sandbox.stub(client, 'createSchema').callsFake(req => { + assert.strictEqual(req.parent, pubsub.name); + assert.strictEqual(req.schemaId, schemaId); + assert.strictEqual(req.schema!.name, name); + assert.strictEqual(req.schema!.type, type); + assert.strictEqual(req.schema!.definition, definition); + def.resolve(); + }); + const result = await Promise.all([ + pubsub.createSchema(schemaId, type, definition), + def, + ]); + assert.strictEqual(result[0].id, schemaId); + }); + + it('calls down to listSchemas correctly', async () => { + // Grab the schema client it'll be using so we can stub it. + const client = await pubsub.getSchemaClient_(); + + function* toAsync(arr: T[]) { + for (const i of arr) { + yield i; + } + } + + sandbox.stub(client, 'listSchemasAsync').callsFake((req, gaxOpts) => { + assert.strictEqual(req!.parent, pubsub.name); + assert.strictEqual(req!.view, google.pubsub.v1.SchemaView.BASIC); + assert.ok(gaxOpts); + return toAsync([ + { + name: 'foo1', + }, + { + name: 'foo2', + }, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + ]) as any; + }); + + const ids = [] as string[], + names = [] as string[]; + for await (const s of pubsub.listSchemas({})) { + ids.push(s.id); + names.push(await s.getName()); + } + + const expectedIds = ['foo1', 'foo2']; + const expectedNames = [ + Schema.formatName_(pubsub.projectId, 'foo1'), + Schema.formatName_(pubsub.projectId, 'foo2'), + ]; + assert.deepStrictEqual(ids, expectedIds); + assert.deepStrictEqual(names, expectedNames); + }); + + it('returns a proper Schema object from schema()', async () => { + const schema = pubsub.schema('foo'); + assert.strictEqual(schema.id, 'foo'); + + const name = await schema.getName(); + assert.strictEqual(name, Schema.formatName_(pubsub.projectId, 'foo')); + }); + }); }); diff --git a/handwritten/pubsub/test/schema.ts b/handwritten/pubsub/test/schema.ts new file mode 100644 index 00000000000..a22b4a12a4e --- /dev/null +++ b/handwritten/pubsub/test/schema.ts @@ -0,0 +1,190 @@ +// Copyright 2021 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import * as assert from 'assert'; +import {describe, it, beforeEach, afterEach} from 'mocha'; +import * as sinon from 'sinon'; +import {google} from '../protos/protos'; +import {PubSub} from '../src/pubsub'; +import {ISchema, Schema, SchemaTypes} from '../src/schema'; +import {SchemaServiceClient} from '../src/v1'; + +const sandbox = sinon.createSandbox(); + +describe('Schema', () => { + let pubsub: PubSub; + let schema: Schema; + let schemaClient: SchemaServiceClient; + const projectId = 'testProject'; + const projectName = `projects/${projectId}`; + const schemaId = 'testSchema'; + const schemaName = `projects/${projectId}/schemas/${schemaId}`; + const ischema: ISchema = { + name: schemaName, + type: SchemaTypes.Avro, + definition: 'foo', + }; + const encoding = google.pubsub.v1.Encoding.JSON; + + beforeEach(async () => { + pubsub = new PubSub({ + projectId: 'testProject', + }); + sandbox.stub(pubsub, 'getClientConfig').callsFake(async () => { + pubsub.projectId = projectId; + pubsub.name = projectName; + return {}; + }); + + // These depend on the create-on-first-call structure in PubSub. + // If that changes, this will also need to be updated. + schemaClient = await pubsub.getSchemaClient_(); + schema = pubsub.schema(schemaName); + }); + + afterEach(async () => { + // Sadly I think it's not worthwhile to get this full pipeline + // to work for unit tests - the plan is to test the autoclose in + // the system tests. + // + // await pubsub.close(); + // Private member access: + // eslint-disable-next-line @typescript-eslint/no-explicit-any + // assert.strictEqual((schemaClient as any)._terminated, true); + + sandbox.reset(); + }); + + it('properly sets its id', () => { + assert.strictEqual(schema.id, schemaId); + }); + + it('properly sets its name', async () => { + const name = await schema.getName(); + assert.strictEqual(name, schemaName); + }); + + it('calls PubSub.createSchema() when create() is called', async () => { + let called = false; + sandbox + .stub(pubsub, 'createSchema') + .callsFake(async (name, type, def, gaxOpts) => { + assert.strictEqual(name, schemaName); + assert.strictEqual(type, SchemaTypes.Avro); + assert.strictEqual(def, 'definition'); + assert.ok(gaxOpts); + called = true; + return new Schema(pubsub, name); + }); + + await schema.create(SchemaTypes.Avro, 'definition', {}); + assert.ok(called); + }); + + it('calls getSchema() on the client when get() is called', async () => { + let called = false; + sandbox + .stub(schemaClient, 'getSchema') + .callsFake(async (params, gaxOpts) => { + const name = await schema.getName(); + assert.strictEqual(params.name, name); + assert.strictEqual(params.view, google.pubsub.v1.SchemaView.FULL); + assert.ok(gaxOpts); + + called = true; + return [ischema]; + }); + + const result = await schema.get({}); + assert.ok(called); + assert.strictEqual(result.name, schemaName); + assert.strictEqual(result.type, SchemaTypes.Avro); + assert.strictEqual(result.definition, 'foo'); + }); + + it('calls deleteSchema() on the client when delete() is called', async () => { + let called = false; + sandbox + .stub(schemaClient, 'deleteSchema') + .callsFake(async (params, gaxOpts) => { + assert.strictEqual(params.name, schemaName); + assert.ok(gaxOpts); + called = true; + }); + + await schema.delete({}); + assert.ok(called); + }); + + it('calls validateSchema() on the client when validateSchema() is called on the wrapper', async () => { + let called = false; + sandbox + .stub(schemaClient, 'validateSchema') + .callsFake(async (params, gaxOpts) => { + assert.strictEqual(params.parent, pubsub.name); + assert.deepStrictEqual(params.schema, ischema); + assert.ok(gaxOpts); + called = true; + }); + + await schema.validateSchema(ischema, {}); + assert.ok(called); + }); + + it('calls validateMessage() on the client when validateMessage() is called on the wrapper', async () => { + let called = false; + sandbox + .stub(schemaClient, 'validateMessage') + .callsFake(async (params, gaxOpts) => { + const name = await schema.getName(); + assert.strictEqual(params.parent, pubsub.name); + assert.strictEqual(params.name, name); + assert.deepStrictEqual(params.schema, ischema); + assert.strictEqual(params.message, 'foo'); + assert.strictEqual(params.encoding, encoding); + assert.ok(gaxOpts); + called = true; + }); + + await schema.validateMessage(ischema, 'foo', encoding, {}); + assert.ok(called); + }); + + it('resolves a missing project ID', async () => { + pubsub = new PubSub(); + schema = pubsub.schema(schemaId); + assert.strictEqual(pubsub.isIdResolved, false); + assert.strictEqual(schema.name_, undefined); + sandbox.stub(pubsub, 'getClientConfig').callsFake(async () => { + pubsub.projectId = projectId; + pubsub.name = projectName; + return {}; + }); + const name = await schema.getName(); + assert.strictEqual(pubsub.isIdResolved, true); + assert.strictEqual(name, schemaName); + }); + + it('loads metadata from a received message', () => { + const testAttrs = { + googclient_schemaencoding: 'JSON', + googclient_schemaname: 'foobar', + }; + const metadata = Schema.metadataFromMessage(testAttrs); + assert.deepStrictEqual(metadata, { + name: 'foobar', + encoding: 'JSON', + }); + }); +}); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index ffc900c1966..f6209585b56 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -150,6 +150,7 @@ const RECEIVED_MESSAGE = { describe('Subscriber', () => { let sandbox: sinon.SinonSandbox; + // eslint-disable-next-line @typescript-eslint/no-explicit-any let fakeProjectify: any; let subscription: Subscription; From 5e73dc74cc3bd68d77cbe218273dfdb214cd49a3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 13:58:57 -0700 Subject: [PATCH 0742/1115] chore: new owl bot post processor docker image (#1292) gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:f4734af778c3d0eb58a6db0078907a87f2e53f3c7a6422363fc37ee52e02b25a Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.github/generated-files-bot.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index e26fd96dec1..043a606639e 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:b94b09fb24bf804090b8cc60ee726ca161d5e5915151e417f8ef5d8bcfe73cbc + digest: sha256:f4734af778c3d0eb58a6db0078907a87f2e53f3c7a6422363fc37ee52e02b25a diff --git a/handwritten/pubsub/.github/generated-files-bot.yml b/handwritten/pubsub/.github/generated-files-bot.yml index 1b3ef1c7837..6b04910c0fb 100644 --- a/handwritten/pubsub/.github/generated-files-bot.yml +++ b/handwritten/pubsub/.github/generated-files-bot.yml @@ -11,3 +11,6 @@ generatedFiles: message: '`README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/master/.readme-partials.yaml' - path: 'samples/README.md' message: '`samples/README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/master/.readme-partials.yaml' +ignoreAuthors: +- 'gcf-owl-bot[bot]' +- 'yoshi-automation' From 564f6b23e9dae33556cece06d49827ede38c9723 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 20 May 2021 21:00:15 -0400 Subject: [PATCH 0743/1115] feat: expose list/get options for full/basic on schema methods (#1291) This corrects a review issue in the unreleased PR: https://github.com/googleapis/nodejs-pubsub/pull/1289 --- handwritten/pubsub/src/pubsub.ts | 20 +++++++++----- handwritten/pubsub/src/schema.ts | 10 +++++-- handwritten/pubsub/test/pubsub.ts | 43 +++++++++++++++++++------------ handwritten/pubsub/test/schema.ts | 19 +++++++++++--- 4 files changed, 62 insertions(+), 30 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 472f7ecbe34..303a1840527 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -26,7 +26,7 @@ const PKG = require('../../package.json'); const v1 = require('./v1'); import {promisifySome} from './util'; -import {Schema, SchemaType, ICreateSchemaRequest} from './schema'; +import {Schema, SchemaType, ICreateSchemaRequest, SchemaViews} from './schema'; import {Snapshot} from './snapshot'; import { Subscription, @@ -762,8 +762,7 @@ export class PubSub { /** * Get a list of schemas associated with your project. * - * The returned AsyncIterable will resolve to {@link Schema} objects. - * These can be used for further interactions with each schema. + * The returned AsyncIterable will resolve to {@link google.pubsub.v1.ISchema} objects. * * This method returns an async iterable. These objects can be adapted * to work in a Promise/then framework, as well as with callbacks, but @@ -772,23 +771,30 @@ export class PubSub { * @see [Schemas: list API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/list} * @see [More about async iterators]{@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for-await...of} * + * @param {google.pubsub.v1.SchemaView} [view] The type of schema objects + * requested, which should be an enum value from {@link SchemaViews}. Defaults + * to Full. * @param {object} [options] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. - * @returns {AsyncIterable} + * @returns {AsyncIterable} * * @example * for await (const s of pubsub.listSchemas()) { * const moreInfo = await s.get(); * } */ - async *listSchemas(options?: CallOptions): AsyncIterable { + async *listSchemas( + view: google.pubsub.v1.SchemaView = SchemaViews.Basic, + options?: CallOptions + ): AsyncIterable { const client = await this.getSchemaClient_(); const query = { parent: this.name, - view: google.pubsub.v1.SchemaView.BASIC, + view, }; + for await (const s of client.listSchemasAsync(query, options)) { - yield new Schema(this, s.name!); + yield s; } } diff --git a/handwritten/pubsub/src/schema.ts b/handwritten/pubsub/src/schema.ts index 2c5cdb98205..f8b4a898d05 100644 --- a/handwritten/pubsub/src/schema.ts +++ b/handwritten/pubsub/src/schema.ts @@ -128,17 +128,23 @@ export class Schema { * * @see [Schemas: getSchema API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/get} * + * @param {google.pubsub.v1.SchemaView} [view] The type of schema object + * requested, which should be an enum value from {@link SchemaViews}. Defaults + * to Full. * @param {object} [options] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @returns {Promise} */ - async get(gaxOpts?: CallOptions): Promise { + async get( + view: google.pubsub.v1.SchemaView = SchemaViews.Full, + gaxOpts?: CallOptions + ): Promise { const client = await this.pubsub.getSchemaClient_(); const name = await this.getName(); const [schema] = await client.getSchema( { name, - view: google.pubsub.v1.SchemaView.FULL, + view, }, gaxOpts ); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 4990d88f7a6..87908c1ec27 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -28,6 +28,7 @@ import * as subby from '../src/subscription'; import {Topic} from '../src/topic'; import * as util from '../src/util'; import {Schema, SchemaTypes} from '../src'; +import {SchemaViews} from '../src/schema'; // eslint-disable-next-line @typescript-eslint/no-var-requires const PKG = require('../../package.json'); @@ -1581,6 +1582,12 @@ describe('PubSub', () => { }); describe('schema', () => { + function* toAsync(arr: T[]) { + for (const i of arr) { + yield i; + } + } + it('should close the schema client when it has been opened', async () => { // Force it to create a client. const client = await pubsub.getSchemaClient_(); @@ -1626,16 +1633,10 @@ describe('PubSub', () => { // Grab the schema client it'll be using so we can stub it. const client = await pubsub.getSchemaClient_(); - function* toAsync(arr: T[]) { - for (const i of arr) { - yield i; - } - } - sandbox.stub(client, 'listSchemasAsync').callsFake((req, gaxOpts) => { assert.strictEqual(req!.parent, pubsub.name); assert.strictEqual(req!.view, google.pubsub.v1.SchemaView.BASIC); - assert.ok(gaxOpts); + assert.deepStrictEqual(gaxOpts, {}); return toAsync([ { name: 'foo1', @@ -1647,20 +1648,28 @@ describe('PubSub', () => { ]) as any; }); - const ids = [] as string[], - names = [] as string[]; - for await (const s of pubsub.listSchemas({})) { - ids.push(s.id); - names.push(await s.getName()); + const ids = [] as string[]; + for await (const s of pubsub.listSchemas(SchemaViews.Basic, {})) { + ids.push(s.name!); } const expectedIds = ['foo1', 'foo2']; - const expectedNames = [ - Schema.formatName_(pubsub.projectId, 'foo1'), - Schema.formatName_(pubsub.projectId, 'foo2'), - ]; assert.deepStrictEqual(ids, expectedIds); - assert.deepStrictEqual(names, expectedNames); + }); + + it('defaults to BASIC for listSchemas', async () => { + // Grab the schema client it'll be using so we can stub it. + const client = await pubsub.getSchemaClient_(); + + sandbox.stub(client, 'listSchemasAsync').callsFake(req => { + assert.strictEqual(req!.view, google.pubsub.v1.SchemaView.BASIC); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return toAsync([]) as any; + }); + + for await (const s of pubsub.listSchemas()) { + break; + } }); it('returns a proper Schema object from schema()', async () => { diff --git a/handwritten/pubsub/test/schema.ts b/handwritten/pubsub/test/schema.ts index a22b4a12a4e..3623863b9e4 100644 --- a/handwritten/pubsub/test/schema.ts +++ b/handwritten/pubsub/test/schema.ts @@ -17,7 +17,7 @@ import {describe, it, beforeEach, afterEach} from 'mocha'; import * as sinon from 'sinon'; import {google} from '../protos/protos'; import {PubSub} from '../src/pubsub'; -import {ISchema, Schema, SchemaTypes} from '../src/schema'; +import {ISchema, Schema, SchemaTypes, SchemaViews} from '../src/schema'; import {SchemaServiceClient} from '../src/v1'; const sandbox = sinon.createSandbox(); @@ -100,19 +100,30 @@ describe('Schema', () => { const name = await schema.getName(); assert.strictEqual(params.name, name); assert.strictEqual(params.view, google.pubsub.v1.SchemaView.FULL); - assert.ok(gaxOpts); - + assert.deepStrictEqual(gaxOpts, {}); called = true; return [ischema]; }); - const result = await schema.get({}); + const result = await schema.get(SchemaViews.Full, {}); assert.ok(called); assert.strictEqual(result.name, schemaName); assert.strictEqual(result.type, SchemaTypes.Avro); assert.strictEqual(result.definition, 'foo'); }); + it('defaults to FULL when get() is called', async () => { + let called = false; + sandbox.stub(schemaClient, 'getSchema').callsFake(async params => { + assert.strictEqual(params.view, google.pubsub.v1.SchemaView.FULL); + called = true; + return [ischema]; + }); + + await schema.get(); + assert.ok(called); + }); + it('calls deleteSchema() on the client when delete() is called', async () => { let called = false; sandbox From d715dc53dea01e4d72454ab6c7f3d085cee19a4f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 21 May 2021 19:04:18 +0200 Subject: [PATCH 0744/1115] chore(deps): update dependency @types/node to v14 (#1294) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/node](https://togithub.com/DefinitelyTyped/DefinitelyTyped) | [`^10.3.0` -> `^14.0.0`](https://renovatebot.com/diffs/npm/@types%2fnode/10.17.60/14.17.0) | [![age](https://badges.renovateapi.com/packages/npm/@types%2fnode/14.17.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@types%2fnode/14.17.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@types%2fnode/14.17.0/compatibility-slim/10.17.60)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@types%2fnode/14.17.0/confidence-slim/10.17.60)](https://docs.renovatebot.com/merge-confidence/) | | [@types/node](https://togithub.com/DefinitelyTyped/DefinitelyTyped) | [`^12.12.30` -> `^14.0.0`](https://renovatebot.com/diffs/npm/@types%2fnode/12.20.13/14.17.0) | [![age](https://badges.renovateapi.com/packages/npm/@types%2fnode/14.17.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@types%2fnode/14.17.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@types%2fnode/14.17.0/compatibility-slim/12.20.13)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@types%2fnode/14.17.0/confidence-slim/12.20.13)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/system-test/fixtures/sample/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c3d104995c8..6b3cc4c2e02 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -76,7 +76,7 @@ "@types/mocha": "^8.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", - "@types/node": "^12.12.30", + "@types/node": "^14.0.0", "@types/proxyquire": "^1.3.28", "@types/sinon": "^10.0.0", "@types/tmp": "^0.2.0", diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index faad7813bb5..8a19474c348 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -16,7 +16,7 @@ "@google-cloud/pubsub": "file:./pubsub.tgz" }, "devDependencies": { - "@types/node": "^10.3.0", + "@types/node": "^14.0.0", "typescript": "^3.0.0", "gts": "^2.0.0" } From 11d0000d0bdbbc0a083bb1f9e9cd75d012ebf3c0 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 21 May 2021 17:14:08 -0400 Subject: [PATCH 0745/1115] tests: add system tests for schema additions (#1296) * feat: expose list/get options for full/basic on schema methods (correcting unreleased PR) * chore: add system-tests for schema, and move validateSchema() to the right class * tests: add (non working) system test for validateMessage * docs: add a TODO comment and a link to the bug tracking it * tests: make another pass at fixing the flaky test that's been plaguing schema builds --- handwritten/pubsub/src/pubsub.ts | 31 ++- handwritten/pubsub/src/schema.ts | 41 ++-- .../pubsub/system-test/fixtures/province.json | 1 + .../system-test/fixtures/provinces.avsc | 18 ++ handwritten/pubsub/system-test/pubsub.ts | 186 ++++++++++++++++-- handwritten/pubsub/test/pubsub.ts | 25 ++- handwritten/pubsub/test/schema.ts | 19 +- 7 files changed, 260 insertions(+), 61 deletions(-) create mode 100644 handwritten/pubsub/system-test/fixtures/province.json create mode 100644 handwritten/pubsub/system-test/fixtures/provinces.avsc diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 303a1840527..6ab3b526b6b 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -26,7 +26,13 @@ const PKG = require('../../package.json'); const v1 = require('./v1'); import {promisifySome} from './util'; -import {Schema, SchemaType, ICreateSchemaRequest, SchemaViews} from './schema'; +import { + Schema, + SchemaType, + ICreateSchemaRequest, + SchemaViews, + ISchema, +} from './schema'; import {Snapshot} from './snapshot'; import { Subscription, @@ -1369,6 +1375,29 @@ export class PubSub { return new Topic(this, name, options); } + /** + * Validate a schema definition. + * + * @see [Schemas: validateSchema API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/validate} + * + * @throws {Error} if the validation fails. + * + * @param {ISchema} schema The schema definition you wish to validate. + * @param {object} [options] Request configuration options, outlined + * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. + * @returns {Promise} + */ + async validateSchema(schema: ISchema, gaxOpts?: CallOptions): Promise { + const client = await this.getSchemaClient_(); + await client.validateSchema( + { + parent: this.name, + schema, + }, + gaxOpts + ); + } + /*! * Format the name of a project. A project's full name is in the * format of projects/{projectId}. diff --git a/handwritten/pubsub/src/schema.ts b/handwritten/pubsub/src/schema.ts index f8b4a898d05..c390485cba1 100644 --- a/handwritten/pubsub/src/schema.ts +++ b/handwritten/pubsub/src/schema.ts @@ -173,56 +173,37 @@ export class Schema { } /** - * Validate a schema definition. + * Validate a message against this schema's definition. * - * @see [Schemas: validateSchema API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/validate} - * - * @throws {Error} if the validation fails. - * - * @param {ISchema} schema The schema definition you wish to validate. - * @param {object} [options] Request configuration options, outlined - * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. - * @returns {Promise} - */ - async validateSchema(schema: ISchema, gaxOpts?: CallOptions): Promise { - const client = await this.pubsub.getSchemaClient_(); - await client.validateSchema( - { - parent: this.pubsub.name, - schema, - }, - gaxOpts - ); - } - - /** - * Validate a message against a schema definition. + * If you would like to validate a message against an arbitrary schema, please + * use the {@link SchemaServiceClient} GAPIC class directly, using your + * {@link PubSub} instance's configuration, via {@link PubSub#getClientConfig}. * * @see [Schemas: validateMessage API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.schemas/validateMessage} * * @throws {Error} if the validation fails. * @throws {Error} if other parameters are invalid. * - * @param {ISchema} schema The schema definition you wish to validate against. * @param {string} message The message to validate. - * @param {SchemaEncoding} encoding The encoding of the message to validate. + * @param {Encoding | "JSON" | "BINARY"} encoding The encoding of the message to validate. * @param {object} [options] Request configuration options, outlined * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @returns {Promise} */ async validateMessage( - schema: ISchema, message: string, - encoding: SchemaEncoding, + encoding: + | google.pubsub.v1.Encoding + | keyof typeof google.pubsub.v1.Encoding, gaxOpts?: CallOptions ): Promise { const client = await this.pubsub.getSchemaClient_(); const name = await this.getName(); + await client.validateMessage( { parent: this.pubsub.name, name, - schema, message, encoding, }, @@ -303,6 +284,6 @@ export const SchemaViews = { // These are not schema-specific, but this seems to be the // only place that exports methods that need them. export const Encodings = { - Json: 'JSON', - Binary: 'BINARY', + Json: 'JSON' as 'JSON', + Binary: 'BINARY' as 'BINARY', }; diff --git a/handwritten/pubsub/system-test/fixtures/province.json b/handwritten/pubsub/system-test/fixtures/province.json new file mode 100644 index 00000000000..bfca0395c8d --- /dev/null +++ b/handwritten/pubsub/system-test/fixtures/province.json @@ -0,0 +1 @@ +{"name":"Ontario","post_abbr":"ON"} \ No newline at end of file diff --git a/handwritten/pubsub/system-test/fixtures/provinces.avsc b/handwritten/pubsub/system-test/fixtures/provinces.avsc new file mode 100644 index 00000000000..3997e71a88d --- /dev/null +++ b/handwritten/pubsub/system-test/fixtures/provinces.avsc @@ -0,0 +1,18 @@ +{ + "type":"record", + "name":"Province", + "namespace":"utilities", + "doc":"A list of provinces in Canada.", + "fields":[ + { + "name":"name", + "type":"string", + "doc":"The common name of the province." + }, + { + "name":"post_abbr", + "type":"string", + "doc":"The postal code abbreviation of the province." + } + ] +} \ No newline at end of file diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index be5f5f39f5d..fafba89ccfe 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -18,6 +18,10 @@ import * as crypto from 'crypto'; import defer = require('p-defer'); import * as uuid from 'uuid'; +// This is only in Node 10.17+, but it's used for system tests, should be okay. +// eslint-disable-next-line node/no-unsupported-features/node-builtins +import {promises as fs} from 'fs'; + import { Message, PubSub, @@ -25,6 +29,9 @@ import { Snapshot, Subscription, Topic, + SchemaTypes, + SchemaViews, + ISchema, } from '../src'; import {Policy, IamPermissionsMap} from '../src/iam'; import {MessageOptions} from '../src/topic'; @@ -68,11 +75,12 @@ describe('pubsub', () => { return generateName('subscription'); } - // This is a temporary situation - we'll eventually fall back to the - // regular generateSubName() call, but this has to be used for the - // pre-release allow list. + function generateSchemaName() { + return generateName('schema'); + } + function generateSubForDetach() { - return `testdetachsubsxyz-${generateSubName()}`; + return generateSubName(); } function generateTopicName() { @@ -617,15 +625,18 @@ describe('pubsub', () => { it('should ack the message', done => { const subscription = topic.subscription(SUB_NAMES[1]); - let errored = false; + let finished = false; subscription.on('error', () => { - errored = true; - subscription.close(done); + if (!finished) { + finished = true; + subscription.close(done); + } }); subscription.on('message', ack); function ack(message: Message) { - if (!errored) { + if (!finished) { + finished = true; message.ack(); subscription.close(done); } @@ -635,15 +646,18 @@ describe('pubsub', () => { it('should nack the message', done => { const subscription = topic.subscription(SUB_NAMES[1]); - let errored = false; + let finished = false; subscription.on('error', () => { - errored = true; - subscription.close(done); + if (!finished) { + finished = true; + subscription.close(done); + } }); subscription.on('message', nack); function nack(message: Message) { - if (!errored) { + if (!finished) { + finished = true; message.nack(); subscription.close(done); } @@ -1023,6 +1037,154 @@ describe('pubsub', () => { }); }); + describe('schema', () => { + // This should really be handled by a standard method of Array(), imo, but it's not. + async function aiToArray( + iterator: AsyncIterable, + nameFilter?: string + ): Promise { + const result = [] as ISchema[]; + for await (const i of iterator) { + if (!nameFilter || (nameFilter && i.name?.endsWith(nameFilter))) { + result.push(i); + } + } + + return result; + } + + const getSchemaDef = async () => { + const schemaDef = ( + await fs.readFile('system-test/fixtures/provinces.avsc') + ).toString(); + + return schemaDef; + }; + + const setupTestSchema = async () => { + const schemaDef = await getSchemaDef(); + const schemaId = generateSchemaName(); + await pubsub.createSchema(schemaId, SchemaTypes.Avro, schemaDef); + return schemaId; + }; + + it('should create a schema', async () => { + const schemaId = await setupTestSchema(); + const schemaList = await aiToArray(pubsub.listSchemas(), schemaId); + assert.strictEqual(schemaList.length, 1); + }); + + it('should delete a schema', async () => { + const schemaId = await setupTestSchema(); + + // Validate that we created one, because delete() doesn't throw, and we + // might end up causing a false negative. + const preSchemaList = await aiToArray(pubsub.listSchemas(), schemaId); + assert.strictEqual(preSchemaList.length, 1); + + await pubsub.schema(schemaId).delete(); + + const postSchemaList = await aiToArray(pubsub.listSchemas(), schemaId); + assert.strictEqual(postSchemaList.length, 0); + }); + + it('should list schemas', async () => { + const schemaId = await setupTestSchema(); + + const basicList = await aiToArray( + pubsub.listSchemas(SchemaViews.Basic), + schemaId + ); + assert.strictEqual(basicList.length, 1); + assert.strictEqual(basicList[0].definition, ''); + + const fullList = await aiToArray( + pubsub.listSchemas(SchemaViews.Full), + schemaId + ); + assert.strictEqual(fullList.length, 1); + assert.ok(fullList[0].definition); + }); + + it('should get a schema', async () => { + const schemaId = await setupTestSchema(); + const schema = pubsub.schema(schemaId); + const info = await schema.get(SchemaViews.Basic); + assert.strictEqual(info.definition, ''); + + const fullInfo = await schema.get(SchemaViews.Full); + assert.ok(fullInfo.definition); + }); + + it('should validate a schema', async () => { + const schemaDef = await getSchemaDef(); + + try { + await pubsub.validateSchema({ + type: SchemaTypes.Avro, + definition: schemaDef, + }); + } catch (e) { + assert.strictEqual(e, undefined, 'Error thrown by validateSchema'); + } + + const badSchemaDef = '{"not_actually":"avro"}'; + try { + await pubsub.validateSchema({ + type: SchemaTypes.Avro, + definition: badSchemaDef, + }); + } catch (e) { + assert.ok(e); + } + + const fakeSchemaDef = 'woohoo i am a schema, no really'; + + try { + await pubsub.validateSchema({ + type: SchemaTypes.Avro, + definition: fakeSchemaDef, + }); + } catch (e) { + assert.ok(e); + } + }); + + // The server doesn't seem to be returning proper responses for this. + // Commenting out for now, until it can be discussed. + // TODO(feywind): Uncomment this later. May be solved by b/188927641. + /* it('should validate a message', async () => { + const schemaId = await setupTestSchema(); + const schema = pubsub.schema(schemaId); + const testMessage = ( + await fs.readFile('system-test/fixtures/province.json') + ).toString(); + + try { + await schema.validateMessage(testMessage, Encodings.Json); + } catch (e) { + console.log(e, e.message, e.toString()); + assert.strictEqual(e, undefined, 'Error thrown by validateSchema'); + } + + const badMessage = '{"foo":"bar"}'; + + try { + await schema.validateMessage(badMessage, Encodings.Json); + } catch (e) { + assert.ok(e); + } + + const fakeMessage = 'woohoo i am a message, no really'; + + try { + await schema.validateMessage(fakeMessage, Encodings.Json); + } catch (e) { + assert.ok(e); + } + }); */ + }); + it('should allow closing of publisher clients', async () => { // The full call stack of close() is tested in unit tests; this is mostly // to verify that the close() method is actually there and doesn't error. diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 87908c1ec27..44be6064284 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -28,7 +28,7 @@ import * as subby from '../src/subscription'; import {Topic} from '../src/topic'; import * as util from '../src/util'; import {Schema, SchemaTypes} from '../src'; -import {SchemaViews} from '../src/schema'; +import {ISchema, SchemaViews} from '../src/schema'; // eslint-disable-next-line @typescript-eslint/no-var-requires const PKG = require('../../package.json'); @@ -1667,6 +1667,7 @@ describe('PubSub', () => { return toAsync([]) as any; }); + // eslint-disable-next-line @typescript-eslint/no-unused-vars for await (const s of pubsub.listSchemas()) { break; } @@ -1679,5 +1680,27 @@ describe('PubSub', () => { const name = await schema.getName(); assert.strictEqual(name, Schema.formatName_(pubsub.projectId, 'foo')); }); + + it('calls validateSchema() on the client when validateSchema() is called', async () => { + const client = await pubsub.getSchemaClient_(); + const ischema: ISchema = { + name: 'test', + type: SchemaTypes.Avro, + definition: 'foo', + }; + + let called = false; + sandbox + .stub(client, 'validateSchema') + .callsFake(async (params, gaxOpts) => { + assert.strictEqual(params.parent, pubsub.name); + assert.deepStrictEqual(params.schema, ischema); + assert.ok(gaxOpts); + called = true; + }); + + await pubsub.validateSchema(ischema, {}); + assert.ok(called); + }); }); }); diff --git a/handwritten/pubsub/test/schema.ts b/handwritten/pubsub/test/schema.ts index 3623863b9e4..93342aa505c 100644 --- a/handwritten/pubsub/test/schema.ts +++ b/handwritten/pubsub/test/schema.ts @@ -138,21 +138,6 @@ describe('Schema', () => { assert.ok(called); }); - it('calls validateSchema() on the client when validateSchema() is called on the wrapper', async () => { - let called = false; - sandbox - .stub(schemaClient, 'validateSchema') - .callsFake(async (params, gaxOpts) => { - assert.strictEqual(params.parent, pubsub.name); - assert.deepStrictEqual(params.schema, ischema); - assert.ok(gaxOpts); - called = true; - }); - - await schema.validateSchema(ischema, {}); - assert.ok(called); - }); - it('calls validateMessage() on the client when validateMessage() is called on the wrapper', async () => { let called = false; sandbox @@ -161,14 +146,14 @@ describe('Schema', () => { const name = await schema.getName(); assert.strictEqual(params.parent, pubsub.name); assert.strictEqual(params.name, name); - assert.deepStrictEqual(params.schema, ischema); + assert.strictEqual(params.schema, undefined); assert.strictEqual(params.message, 'foo'); assert.strictEqual(params.encoding, encoding); assert.ok(gaxOpts); called = true; }); - await schema.validateMessage(ischema, 'foo', encoding, {}); + await schema.validateMessage('foo', encoding, {}); assert.ok(called); }); From b230b0ce66c896b1a5ea85b850d917db1ef37b1f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 25 May 2021 17:54:29 +0200 Subject: [PATCH 0746/1115] chore(deps): update dependency sinon to v11 (#1298) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [sinon](https://sinonjs.org/) ([source](https://togithub.com/sinonjs/sinon)) | [`^10.0.0` -> `^11.0.0`](https://renovatebot.com/diffs/npm/sinon/10.0.0/11.1.0) | [![age](https://badges.renovateapi.com/packages/npm/sinon/11.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/sinon/11.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/sinon/11.1.0/compatibility-slim/10.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/sinon/11.1.0/confidence-slim/10.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sinonjs/sinon ### [`v11.1.0`](https://togithub.com/sinonjs/sinon/blob/master/CHANGELOG.md#​1110--2021-05-25) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v11.0.0...31be9a5d5a4762ef01cb195f29024616dfee9ce8) \================== - Add sinon.promise() implementation ([#​2369](https://togithub.com/sinonjs/sinon/issues/2369)) - Set wrappedMethod on getters/setters ([#​2378](https://togithub.com/sinonjs/sinon/issues/2378)) - \[Docs] Update fake-server usage & descriptions ([#​2365](https://togithub.com/sinonjs/sinon/issues/2365)) - Fake docs improvement ([#​2360](https://togithub.com/sinonjs/sinon/issues/2360)) - Update nise to 5.1.0 (fixed [#​2318](https://togithub.com/sinonjs/sinon/issues/2318)) ### [`v11.0.0`](https://togithub.com/sinonjs/sinon/blob/master/CHANGELOG.md#​1100--2021-05-24) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v10.0.1...v11.0.0) \================== - Explicitly use samsam 6.0.2 with fix for [#​2345](https://togithub.com/sinonjs/sinon/issues/2345) - Update most packages ([#​2371](https://togithub.com/sinonjs/sinon/issues/2371)) - Update compatibility docs ([#​2366](https://togithub.com/sinonjs/sinon/issues/2366)) - Update packages (includes breaking fake-timers change, see [#​2352](https://togithub.com/sinonjs/sinon/issues/2352)) - Warn of potential memory leaks ([#​2357](https://togithub.com/sinonjs/sinon/issues/2357)) - Fix clock test errors ### [`v10.0.1`](https://togithub.com/sinonjs/sinon/blob/master/CHANGELOG.md#​1001--2021-04-08) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v10.0.0...v10.0.1) \================== - Upgrade sinon components (bumps y18n to 4.0.1) - Bump y18n from 4.0.0 to 4.0.1
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6b3cc4c2e02..188771a65b8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -95,7 +95,7 @@ "null-loader": "^4.0.0", "protobufjs": "^6.10.1", "proxyquire": "^2.0.0", - "sinon": "^10.0.0", + "sinon": "^11.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", "typescript": "^3.8.3", From d28353ed154d7cb80df1cb39b22102e61b0d44d5 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 20:48:26 +0000 Subject: [PATCH 0747/1115] fix: GoogleAdsError missing using generator version after 1.3.0 (#1299) [PR](https://github.com/googleapis/gapic-generator-typescript/pull/878) within updated gapic-generator-typescript version 1.4.0 Committer: @summer-ji-eng PiperOrigin-RevId: 375759421 Source-Link: https://github.com/googleapis/googleapis/commit/95fa72fdd0d69b02d72c33b37d1e4cc66d4b1446 Source-Link: https://github.com/googleapis/googleapis-gen/commit/f40a34377ad488a7c2bc3992b3c8d5faf5a15c46 --- handwritten/pubsub/src/schema.ts | 4 ++-- handwritten/pubsub/src/v1/publisher_client.ts | 2 ++ handwritten/pubsub/src/v1/schema_service_client.ts | 2 ++ handwritten/pubsub/src/v1/subscriber_client.ts | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/schema.ts b/handwritten/pubsub/src/schema.ts index c390485cba1..c5cd0075946 100644 --- a/handwritten/pubsub/src/schema.ts +++ b/handwritten/pubsub/src/schema.ts @@ -284,6 +284,6 @@ export const SchemaViews = { // These are not schema-specific, but this seems to be the // only place that exports methods that need them. export const Encodings = { - Json: 'JSON' as 'JSON', - Binary: 'BINARY' as 'BINARY', + Json: 'JSON' as const, + Binary: 'BINARY' as const, }; diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index af450c13d2f..063e7beef44 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -145,6 +145,8 @@ export class PublisherClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 7810a7d077b..b9c99ae3add 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -144,6 +144,8 @@ export class SchemaServiceClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index b619413a355..9e7a57e4527 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -146,6 +146,8 @@ export class SubscriberClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); From c90e780bab4e8d13cb13a8c7d92928bc97ab5d35 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 19:02:22 +0000 Subject: [PATCH 0748/1115] chore: Report warning on `.github/workflows/ci.yaml` (#1300) * fix: Report warning on `.github/workflows/ci.yaml` Not all files in `.github/workflows` are managed, only `ci.yaml`. Related false-positive: https://github.com/googleapis/repo-automation-bots/pull/1952#issuecomment-856142886 * fix: Report warning on `.github/workflows/ci.yaml` Not all files in `.github/workflows` are managed, only `ci.yaml`. Source-Link: https://github.com/googleapis/synthtool/commit/2430f8d90ed8a508e8422a3a7191e656d5a6bf53 Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:14aaee566d6fc07716bb92da416195156e47a4777e7d1cd2bb3e28c46fe30fe2 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.github/generated-files-bot.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 043a606639e..3a93af921f1 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:f4734af778c3d0eb58a6db0078907a87f2e53f3c7a6422363fc37ee52e02b25a + digest: sha256:14aaee566d6fc07716bb92da416195156e47a4777e7d1cd2bb3e28c46fe30fe2 diff --git a/handwritten/pubsub/.github/generated-files-bot.yml b/handwritten/pubsub/.github/generated-files-bot.yml index 6b04910c0fb..7bb7ce54c58 100644 --- a/handwritten/pubsub/.github/generated-files-bot.yml +++ b/handwritten/pubsub/.github/generated-files-bot.yml @@ -3,8 +3,8 @@ generatedFiles: message: '`.kokoro` files are templated and should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' - path: '.github/CODEOWNERS' message: 'CODEOWNERS should instead be modified via the `codeowner_team` property in .repo-metadata.json' -- path: '.github/workflows/**' - message: '`.github/workflows` (GitHub Actions) should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' +- path: '.github/workflows/ci.yaml' + message: '`.github/workflows/ci.yaml` (GitHub Actions) should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' - path: '.github/generated-files-bot.+(yml|yaml)' message: '`.github/generated-files-bot.(yml|yaml)` should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' - path: 'README.md' From 9e2e7b99569b3d9d9c95d8ad98a7500412b4739b Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 7 Jun 2021 18:40:06 -0400 Subject: [PATCH 0749/1115] samples: add schema samples, typescript sample support (#1262) fixes: https://github.com/googleapis/nodejs-pubsub/issues/1220 The remainder of this PR is about adding schema sample snippets, as well as some preliminary TypeScript snippet support. There are still some linting issues with the generated samples, and I wanted to talk about the method used here before committing to it, so it's still marked as a work in progress. --- handwritten/pubsub/src/pubsub.ts | 3 ++- handwritten/pubsub/src/schema.ts | 20 ++++++++++---------- handwritten/pubsub/test/pubsub.ts | 9 ++++----- handwritten/pubsub/test/schema.ts | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 6ab3b526b6b..046a2e5ea32 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -32,6 +32,7 @@ import { ICreateSchemaRequest, SchemaViews, ISchema, + SchemaView, } from './schema'; import {Snapshot} from './snapshot'; import { @@ -790,7 +791,7 @@ export class PubSub { * } */ async *listSchemas( - view: google.pubsub.v1.SchemaView = SchemaViews.Basic, + view: SchemaView = SchemaViews.Basic, options?: CallOptions ): AsyncIterable { const client = await this.getSchemaClient_(); diff --git a/handwritten/pubsub/src/schema.ts b/handwritten/pubsub/src/schema.ts index c5cd0075946..a5ca74e0e28 100644 --- a/handwritten/pubsub/src/schema.ts +++ b/handwritten/pubsub/src/schema.ts @@ -136,7 +136,7 @@ export class Schema { * @returns {Promise} */ async get( - view: google.pubsub.v1.SchemaView = SchemaViews.Full, + view: SchemaView = SchemaViews.Full, gaxOpts?: CallOptions ): Promise { const client = await this.pubsub.getSchemaClient_(); @@ -241,7 +241,7 @@ export class Schema { name: attributes['googclient_schemaname'], encoding: attributes[ 'googclient_schemaencoding' - ] as unknown as keyof typeof google.pubsub.v1.Encoding, + ] as unknown as SchemaEncoding, }; } } @@ -259,26 +259,26 @@ export interface SchemaMessageMetadata { /** * Encoding; this will be Encodings.Json or Encodings.Binary. */ - encoding: keyof typeof google.pubsub.v1.Encoding | undefined; + encoding: SchemaEncoding | undefined; } // Export all of these so that clients don't have to dig for them. export type CreateSchemaResponse = google.pubsub.v1.Schema; export type ISchema = google.pubsub.v1.ISchema; -export type SchemaType = google.pubsub.v1.Schema.Type; -export type SchemaView = google.pubsub.v1.SchemaView; +export type SchemaType = keyof typeof google.pubsub.v1.Schema.Type; +export type SchemaView = keyof typeof google.pubsub.v1.SchemaView; export type ICreateSchemaRequest = google.pubsub.v1.ICreateSchemaRequest; -export type SchemaEncoding = google.pubsub.v1.Encoding; +export type SchemaEncoding = keyof typeof google.pubsub.v1.Encoding; // Also export these for JavaScript compatible usage. export const SchemaTypes = { - ProtocolBuffer: google.pubsub.v1.Schema.Type.PROTOCOL_BUFFER, - Avro: google.pubsub.v1.Schema.Type.AVRO, + ProtocolBuffer: 'PROTOCOL_BUFFER' as const, + Avro: 'AVRO' as const, }; export const SchemaViews = { - Basic: google.pubsub.v1.SchemaView.BASIC, - Full: google.pubsub.v1.SchemaView.FULL, + Basic: 'BASIC' as const, + Full: 'FULL' as const, }; // These are not schema-specific, but this seems to be the diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 44be6064284..c7dff0ce3c9 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -1591,9 +1591,8 @@ describe('PubSub', () => { it('should close the schema client when it has been opened', async () => { // Force it to create a client. const client = await pubsub.getSchemaClient_(); - const stub = sandbox.stub(client, 'close').resolves(); - pubsub.close(); - await stub; + sandbox.stub(client, 'close').resolves(); + await pubsub.close(); }); // I feel like this ought to be a test, but something in getSchemaClient_() @@ -1635,7 +1634,7 @@ describe('PubSub', () => { sandbox.stub(client, 'listSchemasAsync').callsFake((req, gaxOpts) => { assert.strictEqual(req!.parent, pubsub.name); - assert.strictEqual(req!.view, google.pubsub.v1.SchemaView.BASIC); + assert.strictEqual(req!.view, 'BASIC'); assert.deepStrictEqual(gaxOpts, {}); return toAsync([ { @@ -1662,7 +1661,7 @@ describe('PubSub', () => { const client = await pubsub.getSchemaClient_(); sandbox.stub(client, 'listSchemasAsync').callsFake(req => { - assert.strictEqual(req!.view, google.pubsub.v1.SchemaView.BASIC); + assert.strictEqual(req!.view, 'BASIC'); // eslint-disable-next-line @typescript-eslint/no-explicit-any return toAsync([]) as any; }); diff --git a/handwritten/pubsub/test/schema.ts b/handwritten/pubsub/test/schema.ts index 93342aa505c..578a1e61da6 100644 --- a/handwritten/pubsub/test/schema.ts +++ b/handwritten/pubsub/test/schema.ts @@ -99,7 +99,7 @@ describe('Schema', () => { .callsFake(async (params, gaxOpts) => { const name = await schema.getName(); assert.strictEqual(params.name, name); - assert.strictEqual(params.view, google.pubsub.v1.SchemaView.FULL); + assert.strictEqual(params.view, 'FULL'); assert.deepStrictEqual(gaxOpts, {}); called = true; return [ischema]; @@ -115,7 +115,7 @@ describe('Schema', () => { it('defaults to FULL when get() is called', async () => { let called = false; sandbox.stub(schemaClient, 'getSchema').callsFake(async params => { - assert.strictEqual(params.view, google.pubsub.v1.SchemaView.FULL); + assert.strictEqual(params.view, 'FULL'); called = true; return [ischema]; }); From 52eadffe7ba67f5b4a96379bea46abe691cd54d7 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 20:32:06 +0000 Subject: [PATCH 0750/1115] chore(nodejs): use cloud-rad publication process (#1112) (#1306) VERSION is used in @google-cloud/cloud-rad to publish ref docs for a particular version. Pass VERSION in via Stubby or Fusion. Source-Link: https://github.com/googleapis/synthtool/commit/740366bbb9a7e0f4b77fc75dc26be1d3a376c3e0 Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:bbdd52de226c00df3356cdf25460397b429ab49552becca645adbc412f6a4ed5 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- .../pubsub/.kokoro/release/docs-devsite.cfg | 2 +- .../pubsub/.kokoro/release/docs-devsite.sh | 48 ++----------------- handwritten/pubsub/.trampolinerc | 3 +- handwritten/pubsub/README.md | 10 ++++ 5 files changed, 17 insertions(+), 48 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 3a93af921f1..f6467c3a493 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:14aaee566d6fc07716bb92da416195156e47a4777e7d1cd2bb3e28c46fe30fe2 + digest: sha256:bbdd52de226c00df3356cdf25460397b429ab49552becca645adbc412f6a4ed5 diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg index 2e945a41cd5..b5638214a65 100644 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh index 7657be3377a..2198e67fe92 100755 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.sh +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2019 Google LLC +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ set -eo pipefail -# build jsdocs (Python is installed on the Node 10 docker image). if [[ -z "$CREDENTIALS" ]]; then # if CREDENTIALS are explicitly set, assume we're testing locally # and don't set NPM_CONFIG_PREFIX. @@ -25,47 +24,6 @@ if [[ -z "$CREDENTIALS" ]]; then cd $(dirname $0)/../.. fi -mkdir ./etc - npm install -npm run api-extractor -npm run api-documenter - -npm i json@9.0.6 -g -NAME=$(cat .repo-metadata.json | json name) - -mkdir ./_devsite -cp ./yaml/$NAME/* ./_devsite - -# Clean up TOC -# Delete SharePoint item, see https://github.com/microsoft/rushstack/issues/1229 -sed -i -e '1,3d' ./yaml/toc.yml -sed -i -e 's/^ //' ./yaml/toc.yml -# Delete interfaces from TOC (name and uid) -sed -i -e '/name: I[A-Z]/{N;d;}' ./yaml/toc.yml -sed -i -e '/^ *\@google-cloud.*:interface/d' ./yaml/toc.yml - -cp ./yaml/toc.yml ./_devsite/toc.yml - -# create docs.metadata, based on package.json and .repo-metadata.json. -pip install -U pip -python3 -m pip install --user gcp-docuploader -python3 -m docuploader create-metadata \ - --name=$NAME \ - --version=$(cat package.json | json version) \ - --language=$(cat .repo-metadata.json | json language) \ - --distribution-name=$(cat .repo-metadata.json | json distribution_name) \ - --product-page=$(cat .repo-metadata.json | json product_documentation) \ - --github-repository=$(cat .repo-metadata.json | json repo) \ - --issue-tracker=$(cat .repo-metadata.json | json issue_tracker) -cp docs.metadata ./_devsite/docs.metadata - -# deploy the docs. -if [[ -z "$CREDENTIALS" ]]; then - CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account -fi -if [[ -z "$BUCKET" ]]; then - BUCKET=docs-staging-v2 -fi - -python3 -m docuploader upload ./_devsite --destination-prefix docfx --credentials $CREDENTIALS --staging-bucket $BUCKET +npm install --no-save @google-cloud/cloud-rad@^0.2.5 +npx @google-cloud/cloud-rad \ No newline at end of file diff --git a/handwritten/pubsub/.trampolinerc b/handwritten/pubsub/.trampolinerc index 164613b9e6a..d4fcb894483 100644 --- a/handwritten/pubsub/.trampolinerc +++ b/handwritten/pubsub/.trampolinerc @@ -20,7 +20,8 @@ required_envvars+=( # Add env vars which are passed down into the container here. pass_down_envvars+=( - "AUTORELEASE_PR" + "AUTORELEASE_PR", + "VERSION" ) # Prevent unintentional override on the default image. diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index b65e981487d..5c77b824353 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -124,29 +124,39 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | +| Create an Avro based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/createAvroSchema.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/createAvroSchema.js,samples/README.md) | +| Create a Proto based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/createProtoSchema.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/createProtoSchema.js,samples/README.md) | | Create Push Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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/master/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 Subscription with ordering enabled | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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) | +| Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | +| Delete a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteSchema.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/deleteSchema.js,samples/README.md) | | Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | | Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | | Detach Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/detachSubscription.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/detachSubscription.js,samples/README.md) | +| Get a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSchema.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/getSchema.js,samples/README.md) | | Get Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSubscription.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/getSubscription.js,samples/README.md) | | Get Subscription Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSubscriptionPolicy.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/getSubscriptionPolicy.js,samples/README.md) | | Get Topic Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getTopicPolicy.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/getTopicPolicy.js,samples/README.md) | | List All Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listAllTopics.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/listAllTopics.js,samples/README.md) | +| List schemas on a project | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listSchemas.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/listSchemas.js,samples/README.md) | | List Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listSubscriptions.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/listSubscriptions.js,samples/README.md) | | List Subscriptions On a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listTopicSubscriptions.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/listTopicSubscriptions.js,samples/README.md) | +| Listen For Avro Records | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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/master/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 For Protobuf Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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/master/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) | | OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/openTelemetryTracing.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/openTelemetryTracing.js,samples/README.md) | +| Publish Avro Records to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishAvroRecords.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/publishAvroRecords.js,samples/README.md) | | Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | | Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessage.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/publishMessage.js,samples/README.md) | | Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | | Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | +| Publish Protobuf Messages to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishProtobufMessages.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/publishProtobufMessages.js,samples/README.md) | | Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | | Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/quickstart.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/quickstart.js,samples/README.md) | | Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | From 4fc4f90f07fe212c8aba8e7686828b9f3c08223a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 06:00:09 +0000 Subject: [PATCH 0751/1115] build: add auto-approve to Node libraries (#1100) (#1307) * build: add auto-approve to Node libraries Co-authored-by: Benjamin E. Coe Source-Link: https://github.com/googleapis/synthtool/commit/5cae043787729a908ed0cab28ca27baf9acee3c4 Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:65aa68f2242c172345d7c1e780bced839bfdc344955d6aa460aa63b4481d93e5 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.github/CODEOWNERS | 3 +++ handwritten/pubsub/.github/auto-approve.yml | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 handwritten/pubsub/.github/auto-approve.yml diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index f6467c3a493..1b520297430 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:bbdd52de226c00df3356cdf25460397b429ab49552becca645adbc412f6a4ed5 + digest: sha256:65aa68f2242c172345d7c1e780bced839bfdc344955d6aa460aa63b4481d93e5 diff --git a/handwritten/pubsub/.github/CODEOWNERS b/handwritten/pubsub/.github/CODEOWNERS index 568138297be..da4ef277490 100644 --- a/handwritten/pubsub/.github/CODEOWNERS +++ b/handwritten/pubsub/.github/CODEOWNERS @@ -7,3 +7,6 @@ # The yoshi-nodejs team is the default owner for nodejs repositories. * @googleapis/yoshi-nodejs @googleapis/api-pubsub + +# The github automation team is the default owner for the auto-approve file. +.github/auto-approve.yml @googleapis/github-automation diff --git a/handwritten/pubsub/.github/auto-approve.yml b/handwritten/pubsub/.github/auto-approve.yml new file mode 100644 index 00000000000..903697974b0 --- /dev/null +++ b/handwritten/pubsub/.github/auto-approve.yml @@ -0,0 +1,7 @@ +rules: +- author: "release-please[bot]" + title: "^chore: release" + changedFiles: + - "package\\.json$" + - "CHANGELOG\\.md$" + maxFiles: 3 \ No newline at end of file From f5a1e6b158c20f18553cfd5108eaa638edde116e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 06:26:13 +0000 Subject: [PATCH 0752/1115] chore: release 2.13.0 (#1290) :robot: I have created a release \*beep\* \*boop\* --- ## [2.13.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.12.0...v2.13.0) (2021-06-10) ### Features * expose list/get options for full/basic on schema methods ([#1291](https://www.github.com/googleapis/nodejs-pubsub/issues/1291)) ([11f9612](https://www.github.com/googleapis/nodejs-pubsub/commit/11f961268429bb691be226aaffae6a88eeb9c600)) * schema library support ([#1289](https://www.github.com/googleapis/nodejs-pubsub/issues/1289)) ([fd275e2](https://www.github.com/googleapis/nodejs-pubsub/commit/fd275e23fec89e6368a47caa1fdc194cbfc5d32b)) ### Bug Fixes * GoogleAdsError missing using generator version after 1.3.0 ([#1299](https://www.github.com/googleapis/nodejs-pubsub/issues/1299)) ([43a8fdb](https://www.github.com/googleapis/nodejs-pubsub/commit/43a8fdbbe2db24556101fb4e0bb29b3d95112ba0)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 13 +++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 15c05269d5d..fdc3b206981 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,19 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.13.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.12.0...v2.13.0) (2021-06-10) + + +### Features + +* expose list/get options for full/basic on schema methods ([#1291](https://www.github.com/googleapis/nodejs-pubsub/issues/1291)) ([11f9612](https://www.github.com/googleapis/nodejs-pubsub/commit/11f961268429bb691be226aaffae6a88eeb9c600)) +* schema library support ([#1289](https://www.github.com/googleapis/nodejs-pubsub/issues/1289)) ([fd275e2](https://www.github.com/googleapis/nodejs-pubsub/commit/fd275e23fec89e6368a47caa1fdc194cbfc5d32b)) + + +### Bug Fixes + +* GoogleAdsError missing using generator version after 1.3.0 ([#1299](https://www.github.com/googleapis/nodejs-pubsub/issues/1299)) ([43a8fdb](https://www.github.com/googleapis/nodejs-pubsub/commit/43a8fdbbe2db24556101fb4e0bb29b3d95112ba0)) + ## [2.12.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.11.0...v2.12.0) (2021-05-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 188771a65b8..df7fa5e4827 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.12.0", + "version": "2.13.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 27079ebf004d4266edfce76cb50c230dc9ae0a18 Mon Sep 17 00:00:00 2001 From: Weyert de Boer Date: Thu, 10 Jun 2021 22:54:11 +0100 Subject: [PATCH 0753/1115] feat: upgrade @opentelemetry/api to version 0.20.0 (#1305) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the Opentelemetry packages to the latest version and updated the code to reflect the API changes This should closely resemble the API of 1.0.0 of the package which is expected to be released shortly. Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [X] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [X] Ensure the tests and linter pass - [X] Code coverage does not decrease (if any source code was changed) - [X] Appropriate docs were updated (if necessary) Fixes #1304 🦕 --- handwritten/pubsub/package.json | 6 ++--- .../pubsub/src/opentelemetry-tracing.ts | 3 +-- handwritten/pubsub/src/publisher/index.ts | 22 +++++++++---------- handwritten/pubsub/src/subscriber.ts | 16 +++++++------- handwritten/pubsub/test/publisher/index.ts | 10 ++++----- handwritten/pubsub/test/subscriber.ts | 12 +++++----- 6 files changed, 34 insertions(+), 35 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index df7fa5e4827..a5a2c169ea9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,8 +53,8 @@ "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", - "@opentelemetry/api": "^0.18.1", - "@opentelemetry/semantic-conventions": "^0.18.2", + "@opentelemetry/api": "^0.20.0", + "@opentelemetry/semantic-conventions": "^0.20.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", @@ -69,7 +69,7 @@ "@grpc/proto-loader": "^0.6.0", "@microsoft/api-documenter": "^7.8.10", "@microsoft/api-extractor": "^7.8.10", - "@opentelemetry/tracing": "^0.18.0", + "@opentelemetry/tracing": "^0.20.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", diff --git a/handwritten/pubsub/src/opentelemetry-tracing.ts b/handwritten/pubsub/src/opentelemetry-tracing.ts index 42261a91aae..df3836f7273 100644 --- a/handwritten/pubsub/src/opentelemetry-tracing.ts +++ b/handwritten/pubsub/src/opentelemetry-tracing.ts @@ -20,7 +20,6 @@ import { Span, context, trace, - setSpanContext, SpanKind, } from '@opentelemetry/api'; @@ -57,6 +56,6 @@ export function createSpan( // set the attributes of the span attributes: attributes, }, - parent ? setSpanContext(context.active(), parent) : undefined + parent ? trace.setSpanContext(context.active(), parent) : undefined ); } diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 914617b28d4..ef169e086f7 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -17,7 +17,7 @@ import {promisify, promisifyAll} from '@google-cloud/promisify'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; -import {MessagingAttribute} from '@opentelemetry/semantic-conventions'; +import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; import {isSpanContextValid, Span, SpanKind} from '@opentelemetry/api'; import {BatchPublishOptions} from './message-batch'; @@ -289,14 +289,14 @@ export class Publisher { const spanAttributes = { // Add Opentelemetry semantic convention attributes to the span, based on: // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.1.0/specification/trace/semantic_conventions/messaging.md - [MessagingAttribute.MESSAGING_TEMP_DESTINATION]: false, - [MessagingAttribute.MESSAGING_SYSTEM]: 'pubsub', - [MessagingAttribute.MESSAGING_OPERATION]: 'send', - [MessagingAttribute.MESSAGING_DESTINATION]: this.topic.name, - [MessagingAttribute.MESSAGING_DESTINATION_KIND]: 'topic', - [MessagingAttribute.MESSAGING_MESSAGE_ID]: message.messageId, - [MessagingAttribute.MESSAGING_PROTOCOL]: 'pubsub', - [MessagingAttribute.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: + [SemanticAttributes.MESSAGING_TEMP_DESTINATION]: false, + [SemanticAttributes.MESSAGING_SYSTEM]: 'pubsub', + [SemanticAttributes.MESSAGING_OPERATION]: 'send', + [SemanticAttributes.MESSAGING_DESTINATION]: this.topic.name, + [SemanticAttributes.MESSAGING_DESTINATION_KIND]: 'topic', + [SemanticAttributes.MESSAGING_MESSAGE_ID]: message.messageId, + [SemanticAttributes.MESSAGING_PROTOCOL]: 'pubsub', + [SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: message.data?.length, 'messaging.pubsub.ordering_key': message.orderingKey, } as Attributes; @@ -308,7 +308,7 @@ export class Publisher { ); // If the span's context is valid we should pass the span context special attribute - if (isSpanContextValid(span.context())) { + if (isSpanContextValid(span.spanContext())) { if ( message.attributes && message.attributes['googclient_OpenTelemetrySpanContext'] @@ -322,7 +322,7 @@ export class Publisher { } message.attributes['googclient_OpenTelemetrySpanContext'] = - JSON.stringify(span.context()); + JSON.stringify(span.spanContext()); } return span; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 0c236ae73c9..534e288ac6d 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -19,7 +19,7 @@ import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisify} from '@google-cloud/promisify'; import {EventEmitter} from 'events'; import {SpanContext, Span, SpanKind} from '@opentelemetry/api'; -import {MessagingAttribute} from '@opentelemetry/semantic-conventions'; +import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; import {google} from '../protos/protos'; import {Histogram} from './histogram'; @@ -464,13 +464,13 @@ export class Subscriber extends EventEmitter { deliveryAttempt: message.deliveryAttempt, // // based on https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/messaging.md#topic-with-multiple-consumers - [MessagingAttribute.MESSAGING_SYSTEM]: 'pubsub', - [MessagingAttribute.MESSAGING_OPERATION]: 'process', - [MessagingAttribute.MESSAGING_DESTINATION]: this.name, - [MessagingAttribute.MESSAGING_DESTINATION_KIND]: 'topic', - [MessagingAttribute.MESSAGING_MESSAGE_ID]: message.id, - [MessagingAttribute.MESSAGING_PROTOCOL]: 'pubsub', - [MessagingAttribute.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: ( + [SemanticAttributes.MESSAGING_SYSTEM]: 'pubsub', + [SemanticAttributes.MESSAGING_OPERATION]: 'process', + [SemanticAttributes.MESSAGING_DESTINATION]: this.name, + [SemanticAttributes.MESSAGING_DESTINATION_KIND]: 'topic', + [SemanticAttributes.MESSAGING_MESSAGE_ID]: message.id, + [SemanticAttributes.MESSAGING_PROTOCOL]: 'pubsub', + [SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: ( message.data as Buffer ).length, // Not in Opentelemetry semantic convention but mimics naming diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index af9e79a4041..4d410e0ead6 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -29,7 +29,7 @@ import {PublishError} from '../../src/publisher/publish-error'; import {defaultOptions} from '../../src/default-options'; import {exporter} from '../tracing'; import {SpanKind} from '@opentelemetry/api'; -import {MessagingAttribute} from '@opentelemetry/semantic-conventions'; +import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; let promisified = false; const fakePromisify = Object.assign({}, pfy, { @@ -207,19 +207,19 @@ describe('Publisher', () => { opentelemetry.SpanStatusCode.UNSET ); assert.strictEqual( - createdSpan.attributes[MessagingAttribute.MESSAGING_OPERATION], + createdSpan.attributes[SemanticAttributes.MESSAGING_OPERATION], 'send' ); assert.strictEqual( - createdSpan.attributes[MessagingAttribute.MESSAGING_SYSTEM], + createdSpan.attributes[SemanticAttributes.MESSAGING_SYSTEM], 'pubsub' ); assert.strictEqual( - createdSpan.attributes[MessagingAttribute.MESSAGING_DESTINATION], + createdSpan.attributes[SemanticAttributes.MESSAGING_DESTINATION], topic.name ); assert.strictEqual( - createdSpan.attributes[MessagingAttribute.MESSAGING_DESTINATION_KIND], + createdSpan.attributes[SemanticAttributes.MESSAGING_DESTINATION_KIND], 'topic' ); assert.strictEqual(createdSpan.name, 'topic-name send'); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index f6209585b56..bbcf8ac6c91 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -32,7 +32,7 @@ import {MessageStreamOptions} from '../src/message-stream'; import * as s from '../src/subscriber'; import {Subscription} from '../src/subscription'; import {SpanKind} from '@opentelemetry/api'; -import {MessagingAttribute} from '@opentelemetry/semantic-conventions'; +import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; const stubs = new Map(); @@ -730,26 +730,26 @@ describe('Subscriber', () => { 'span kind should be CONSUMER' ); assert.strictEqual( - firstSpan.attributes[MessagingAttribute.MESSAGING_OPERATION], + firstSpan.attributes[SemanticAttributes.MESSAGING_OPERATION], 'process', 'span messaging operation should match' ); assert.strictEqual( - firstSpan.attributes[MessagingAttribute.MESSAGING_SYSTEM], + firstSpan.attributes[SemanticAttributes.MESSAGING_SYSTEM], 'pubsub' ); assert.strictEqual( - firstSpan.attributes[MessagingAttribute.MESSAGING_MESSAGE_ID], + firstSpan.attributes[SemanticAttributes.MESSAGING_MESSAGE_ID], messageWithSpanContext.message.messageId, 'span messaging id should match' ); assert.strictEqual( - firstSpan.attributes[MessagingAttribute.MESSAGING_DESTINATION], + firstSpan.attributes[SemanticAttributes.MESSAGING_DESTINATION], subscriber.name, 'span messaging destination should match' ); assert.strictEqual( - firstSpan.attributes[MessagingAttribute.MESSAGING_DESTINATION_KIND], + firstSpan.attributes[SemanticAttributes.MESSAGING_DESTINATION_KIND], 'topic' ); }); From 896508a5b94983dafc5f0d8523c49648710c9c04 Mon Sep 17 00:00:00 2001 From: "F. Hinkelmann" Date: Fri, 11 Jun 2021 00:12:06 +0200 Subject: [PATCH 0754/1115] chore(nodejs): remove api-extractor dependencies (#1309) --- handwritten/pubsub/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a5a2c169ea9..c5513f4dcaf 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -44,8 +44,6 @@ "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js", "prelint": "cd samples; npm link ../; npm install", - "api-extractor": "api-extractor run --local", - "api-documenter": "api-documenter yaml --input-folder=temp", "precompile": "gts clean" }, "dependencies": { @@ -67,8 +65,6 @@ }, "devDependencies": { "@grpc/proto-loader": "^0.6.0", - "@microsoft/api-documenter": "^7.8.10", - "@microsoft/api-extractor": "^7.8.10", "@opentelemetry/tracing": "^0.20.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", From 97b051c93ee5ede23e5e0be59c27c00d31b40538 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 19:12:08 +0000 Subject: [PATCH 0755/1115] build: remove errant comma (#1113) (#1320) Source-Link: https://github.com/googleapis/synthtool/commit/41ccd8cd13ec31f4fb839cf8182aea3c7156e19d Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:c9c7828c165b1985579098978877935ee52dda2b1b538087514fd24fa2443e7a --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.trampolinerc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 1b520297430..e7c45fd36bc 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:65aa68f2242c172345d7c1e780bced839bfdc344955d6aa460aa63b4481d93e5 + digest: sha256:c9c7828c165b1985579098978877935ee52dda2b1b538087514fd24fa2443e7a diff --git a/handwritten/pubsub/.trampolinerc b/handwritten/pubsub/.trampolinerc index d4fcb894483..5fc2253137d 100644 --- a/handwritten/pubsub/.trampolinerc +++ b/handwritten/pubsub/.trampolinerc @@ -20,7 +20,7 @@ required_envvars+=( # Add env vars which are passed down into the container here. pass_down_envvars+=( - "AUTORELEASE_PR", + "AUTORELEASE_PR" "VERSION" ) From d3655579cc66db44ae1a186e8cc2f64a7a27bd7e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 16 Jun 2021 23:18:14 +0000 Subject: [PATCH 0756/1115] chore: release 2.14.0 (#1310) :robot: I have created a release \*beep\* \*boop\* --- ## [2.14.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.13.0...v2.14.0) (2021-06-11) ### Features * upgrade @opentelemetry/api to version 0.20.0 ([#1305](https://www.github.com/googleapis/nodejs-pubsub/issues/1305)) ([ed32369](https://www.github.com/googleapis/nodejs-pubsub/commit/ed32369ab4ccee5a8919f7353ed9eed7f3c1f6d8)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index fdc3b206981..de30b655d79 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.14.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.13.0...v2.14.0) (2021-06-11) + + +### Features + +* upgrade @opentelemetry/api to version 0.20.0 ([#1305](https://www.github.com/googleapis/nodejs-pubsub/issues/1305)) ([ed32369](https://www.github.com/googleapis/nodejs-pubsub/commit/ed32369ab4ccee5a8919f7353ed9eed7f3c1f6d8)) + ## [2.13.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.12.0...v2.13.0) (2021-06-10) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c5513f4dcaf..daa1baa4cf1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.13.0", + "version": "2.14.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From f49c96147afd620cb9f0ed2c14a51086ad844d56 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 18 Jun 2021 19:14:02 +0200 Subject: [PATCH 0757/1115] fix(deps): update opentelemetry monorepo to ^0.21.0 (#1324) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@opentelemetry/api](https://togithub.com/open-telemetry/opentelemetry-js-api) | [`^0.18.1` -> `^0.21.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2fapi/0.18.1/0.21.0) | [![age](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fapi/0.21.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fapi/0.21.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fapi/0.21.0/compatibility-slim/0.18.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fapi/0.21.0/confidence-slim/0.18.1)](https://docs.renovatebot.com/merge-confidence/) | | [@opentelemetry/api](https://togithub.com/open-telemetry/opentelemetry-js-api) | [`^0.20.0` -> `^0.21.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2fapi/0.20.0/0.21.0) | [![age](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fapi/0.21.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fapi/0.21.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fapi/0.21.0/compatibility-slim/0.20.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fapi/0.21.0/confidence-slim/0.20.0)](https://docs.renovatebot.com/merge-confidence/) | | [@opentelemetry/semantic-conventions](https://togithub.com/open-telemetry/opentelemetry-js) | [`^0.20.0` -> `^0.21.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2fsemantic-conventions/0.20.0/0.21.0) | [![age](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fsemantic-conventions/0.21.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fsemantic-conventions/0.21.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fsemantic-conventions/0.21.0/compatibility-slim/0.20.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@opentelemetry%2fsemantic-conventions/0.21.0/confidence-slim/0.20.0)](https://docs.renovatebot.com/merge-confidence/) | | [@opentelemetry/tracing](https://togithub.com/open-telemetry/opentelemetry-js) | [`^0.18.2` -> `^0.21.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2ftracing/0.18.2/0.21.0) | [![age](https://badges.renovateapi.com/packages/npm/@opentelemetry%2ftracing/0.21.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@opentelemetry%2ftracing/0.21.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@opentelemetry%2ftracing/0.21.0/compatibility-slim/0.18.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@opentelemetry%2ftracing/0.21.0/confidence-slim/0.18.2)](https://docs.renovatebot.com/merge-confidence/) | | [@opentelemetry/tracing](https://togithub.com/open-telemetry/opentelemetry-js) | [`^0.20.0` -> `^0.21.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2ftracing/0.20.0/0.21.0) | [![age](https://badges.renovateapi.com/packages/npm/@opentelemetry%2ftracing/0.21.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@opentelemetry%2ftracing/0.21.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@opentelemetry%2ftracing/0.21.0/compatibility-slim/0.20.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@opentelemetry%2ftracing/0.21.0/confidence-slim/0.20.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-js-api ### [`v0.21.0`](https://togithub.com/open-telemetry/opentelemetry-js-api/blob/master/CHANGELOG.md#​0210) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js-api/compare/v0.20.0...v0.21.0) ##### :boom: Breaking Change - [#​78](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/78) feat: unify signatures of `with` and `bind` ([@​Rauno56](https://togithub.com/Rauno56)) - [#​46](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/46) chore: do not export singletons ([@​dyladan](https://togithub.com/dyladan)) ##### :rocket: Enhancement - [#​81](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/81) chore: function overloads implementation of startActiveSpan in noop t… ([@​naseemkullah](https://togithub.com/naseemkullah)) ##### :house: Internal - [#​84](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/84) chore: remove unused backwards compatibility folder ([@​Flarna](https://togithub.com/Flarna)) - [#​85](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/85) chore: add node:16 to the test matrix ([@​Rauno56](https://togithub.com/Rauno56)) - [#​63](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/63) feat: debug log global registrations and logger overwrites ([@​Rauno56](https://togithub.com/Rauno56)) - [#​75](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/75) Add CodeQL Security Scan ([@​xukaren](https://togithub.com/xukaren)) - [#​79](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/79) chore: fix eslint config ([@​Rauno56](https://togithub.com/Rauno56)) ##### Committers: 5 - Daniel Dyla ([@​dyladan](https://togithub.com/dyladan)) - Gerhard Stöbich ([@​Flarna](https://togithub.com/Flarna)) - Karen Xu ([@​xukaren](https://togithub.com/xukaren)) - Naseem ([@​naseemkullah](https://togithub.com/naseemkullah)) - Rauno Viskus ([@​Rauno56](https://togithub.com/Rauno56)) ### [`v0.20.0`](https://togithub.com/open-telemetry/opentelemetry-js-api/blob/master/CHANGELOG.md#​0200) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js-api/compare/v0.19.0...v0.20.0) ##### :rocket: Enhancement - [#​69](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/69) feat(context): add utils method to remove keys from context ([@​vmarchaud](https://togithub.com/vmarchaud)) - [#​71](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/71) chore: export baggage ([@​dyladan](https://togithub.com/dyladan)) ##### Committers: 2 - Daniel Dyla ([@​dyladan](https://togithub.com/dyladan)) - Valentin Marchaud ([@​vmarchaud](https://togithub.com/vmarchaud)) ### [`v0.19.0`](https://togithub.com/open-telemetry/opentelemetry-js-api/blob/master/CHANGELOG.md#​0190) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js-api/compare/0.18.1...v0.19.0) ##### :boom: Breaking Change - [#​55](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/55) chore: move baggage methods in propagation namespace ([@​vmarchaud](https://togithub.com/vmarchaud)) - [#​65](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/65) chore: remove suppress instrumentation ([@​dyladan](https://togithub.com/dyladan)) - [#​60](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/60) chore: removing timed event ([@​obecny](https://togithub.com/obecny)) - [#​58](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/58) chore: use spancontext for link ([@​dyladan](https://togithub.com/dyladan)) - [#​47](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/47) chore: move span method for context in trace API [#​40](https://togithub.com/open-telemetry/opentelemetry-js-api/issues/40) ([@​vmarchaud](https://togithub.com/vmarchaud)) - [#​45](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/45) chore: rename `span#context()` to `span#spanContext` ([@​dyladan](https://togithub.com/dyladan)) - [#​43](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/43) chore: renaming noop span to non recording span ([@​obecny](https://togithub.com/obecny)) - [#​32](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/32) feat!: return boolean success value from setGlobalXXX methods ([@​dyladan](https://togithub.com/dyladan)) ##### :rocket: Enhancement - [#​62](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/62) chore: adding component logger ([@​obecny](https://togithub.com/obecny)) - [#​54](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/54) feat: add tracer.startActiveSpan() ([@​naseemkullah](https://togithub.com/naseemkullah)) - [#​58](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/58) chore: use spancontext for link ([@​dyladan](https://togithub.com/dyladan)) - [#​51](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/51) feat: add function to wrap SpanContext in NonRecordingSpan [#​49](https://togithub.com/open-telemetry/opentelemetry-js-api/issues/49) ([@​dyladan](https://togithub.com/dyladan)) ##### :memo: Documentation - [#​64](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/64) chore: document the reason for symbol.for ([@​dyladan](https://togithub.com/dyladan)) - [#​44](https://togithub.com/open-telemetry/opentelemetry-js-api/pull/44) chore: updating readme headline and fixing links ([@​obecny](https://togithub.com/obecny)) ##### Committers: 6 - Bartlomiej Obecny ([@​obecny](https://togithub.com/obecny)) - Daniel Dyla ([@​dyladan](https://togithub.com/dyladan)) - Gerhard Stöbich ([@​Flarna](https://togithub.com/Flarna)) - Naseem ([@​naseemkullah](https://togithub.com/naseemkullah)) - Valentin Marchaud ([@​vmarchaud](https://togithub.com/vmarchaud)) - t2t2 ([@​t2t2](https://togithub.com/t2t2))
open-telemetry/opentelemetry-js ### [`v0.21.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/master/CHANGELOG.md#​0210) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v0.20.0...v0.21.0) ##### :rocket: (Enhancement) - `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation` - [#​2261](https://togithub.com/open-telemetry/opentelemetry-js/pull/2261) Adding ComponentLogger into instrumentations ([@​obecny](https://togithub.com/obecny)) - `opentelemetry-api-metrics`, `opentelemetry-context-async-hooks`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-propagator-b3`, `opentelemetry-propagator-jaeger`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-sdk-node`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web` - [#​2255](https://togithub.com/open-telemetry/opentelemetry-js/pull/2255) chore: update API to 0.21.0 ([@​dyladan](https://togithub.com/dyladan)) ##### :books: (Refine Doc) - [#​2263](https://togithub.com/open-telemetry/opentelemetry-js/pull/2263) docs(README): update link to [@​opentelemetry/api](https://togithub.com/opentelemetry/api) package ([@​nvenegas](https://togithub.com/nvenegas)) - [#​2254](https://togithub.com/open-telemetry/opentelemetry-js/pull/2254) chore: update compatibility matrix ([@​dyladan](https://togithub.com/dyladan)) - [#​2253](https://togithub.com/open-telemetry/opentelemetry-js/pull/2253) chore: add missing changelog entry ([@​dyladan](https://togithub.com/dyladan)) ##### :house: (Internal) - `opentelemetry-api-metrics`, `opentelemetry-context-async-hooks`, `opentelemetry-context-zone-peer-dep`, `opentelemetry-context-zone`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-instrumentation`, `opentelemetry-metrics`, `opentelemetry-node`, `opentelemetry-propagator-b3`, `opentelemetry-propagator-jaeger`, `opentelemetry-resource-detector-aws`, `opentelemetry-resource-detector-gcp`, `opentelemetry-resources`, `opentelemetry-sdk-node`, `opentelemetry-semantic-conventions`, `opentelemetry-shim-opentracing`, `opentelemetry-tracing`, `opentelemetry-web`, `template` - [#​2244](https://togithub.com/open-telemetry/opentelemetry-js/pull/2244) chore: add node:16 to the test matrix ([@​Rauno56](https://togithub.com/Rauno56)) ##### Committers: 4 - Bartlomiej Obecny ([@​obecny](https://togithub.com/obecny)) - Daniel Dyla ([@​dyladan](https://togithub.com/dyladan)) - Nicolas Venegas ([@​nvenegas](https://togithub.com/nvenegas)) - Rauno Viskus ([@​Rauno56](https://togithub.com/Rauno56))
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index daa1baa4cf1..4384d9e8a79 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,8 +51,8 @@ "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", - "@opentelemetry/api": "^0.20.0", - "@opentelemetry/semantic-conventions": "^0.20.0", + "@opentelemetry/api": "^0.21.0", + "@opentelemetry/semantic-conventions": "^0.21.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", @@ -65,7 +65,7 @@ }, "devDependencies": { "@grpc/proto-loader": "^0.6.0", - "@opentelemetry/tracing": "^0.20.0", + "@opentelemetry/tracing": "^0.21.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", From 712dec3a56318b5fb6f35a9894650378398a1139 Mon Sep 17 00:00:00 2001 From: Weyert de Boer Date: Tue, 22 Jun 2021 19:04:05 +0100 Subject: [PATCH 0758/1115] feat: upgrade the opentelemetry api to 1.0.0 (#1329) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the `@opentelemetry/api`-package to 1.0.0 and use the associated SDK version which supports this API version that is: 0.22.0 Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [X] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [X] Ensure the tests and linter pass - [X] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes #1330 🦕 --- handwritten/pubsub/package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4384d9e8a79..de4a21d9bf6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,8 +51,8 @@ "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", - "@opentelemetry/api": "^0.21.0", - "@opentelemetry/semantic-conventions": "^0.21.0", + "@opentelemetry/api": "^1.0.0", + "@opentelemetry/semantic-conventions": "^0.22.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", @@ -65,7 +65,9 @@ }, "devDependencies": { "@grpc/proto-loader": "^0.6.0", - "@opentelemetry/tracing": "^0.21.0", + "@microsoft/api-documenter": "^7.8.10", + "@microsoft/api-extractor": "^7.8.10", + "@opentelemetry/tracing": "^0.22.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", From 19b1b66bc4cd29b63b2ddeb6e2b0594c56b24525 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 18:18:05 +0000 Subject: [PATCH 0759/1115] chore: release 2.15.0 (#1331) :robot: I have created a release \*beep\* \*boop\* --- ## [2.15.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.14.0...v2.15.0) (2021-06-22) ### Features * upgrade the opentelemetry api to 1.0.0 ([#1329](https://www.github.com/googleapis/nodejs-pubsub/issues/1329)) ([6896ad9](https://www.github.com/googleapis/nodejs-pubsub/commit/6896ad9d73c6d481c02af503b0e9e5a211bdbdf1)) ### Bug Fixes * **deps:** update opentelemetry monorepo to ^0.21.0 ([#1324](https://www.github.com/googleapis/nodejs-pubsub/issues/1324)) ([c6d1750](https://www.github.com/googleapis/nodejs-pubsub/commit/c6d1750de45bbad0f599d328c37085f1f4246f9b)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index de30b655d79..08a3ad068c0 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.15.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.14.0...v2.15.0) (2021-06-22) + + +### Features + +* upgrade the opentelemetry api to 1.0.0 ([#1329](https://www.github.com/googleapis/nodejs-pubsub/issues/1329)) ([6896ad9](https://www.github.com/googleapis/nodejs-pubsub/commit/6896ad9d73c6d481c02af503b0e9e5a211bdbdf1)) + + +### Bug Fixes + +* **deps:** update opentelemetry monorepo to ^0.21.0 ([#1324](https://www.github.com/googleapis/nodejs-pubsub/issues/1324)) ([c6d1750](https://www.github.com/googleapis/nodejs-pubsub/commit/c6d1750de45bbad0f599d328c37085f1f4246f9b)) + ## [2.14.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.13.0...v2.14.0) (2021-06-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index de4a21d9bf6..a6269e7ac64 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.14.0", + "version": "2.15.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From d5797d9cfbaa11b7f401538bdff412ee671218cd Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 20:46:35 +0000 Subject: [PATCH 0760/1115] fix: make request optional in all cases (#1328) ... chore: update gapic-generator-ruby to the latest commit chore: release gapic-generator-typescript 1.5.0 Committer: @miraleung PiperOrigin-RevId: 380641501 Source-Link: https://github.com/googleapis/googleapis/commit/076f7e9f0b258bdb54338895d7251b202e8f0de3 Source-Link: https://github.com/googleapis/googleapis-gen/commit/27e4c88b4048e5f56508d4e1aa417d60a3380892 --- handwritten/pubsub/src/v1/publisher_client.ts | 36 +++++------ .../pubsub/src/v1/schema_service_client.ts | 24 ++++---- .../pubsub/src/v1/subscriber_client.ts | 60 +++++++++---------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 063e7beef44..a829b1709a2 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -357,7 +357,7 @@ export class PublisherClient { // -- Service calls -- // ------------------- createTopic( - request: protos.google.pubsub.v1.ITopic, + request?: protos.google.pubsub.v1.ITopic, options?: CallOptions ): Promise< [ @@ -424,7 +424,7 @@ export class PublisherClient { * const [response] = await client.createTopic(request); */ createTopic( - request: protos.google.pubsub.v1.ITopic, + request?: protos.google.pubsub.v1.ITopic, optionsOrCallback?: | CallOptions | Callback< @@ -463,7 +463,7 @@ export class PublisherClient { return this.innerApiCalls.createTopic(request, options, callback); } updateTopic( - request: protos.google.pubsub.v1.IUpdateTopicRequest, + request?: protos.google.pubsub.v1.IUpdateTopicRequest, options?: CallOptions ): Promise< [ @@ -514,7 +514,7 @@ export class PublisherClient { * const [response] = await client.updateTopic(request); */ updateTopic( - request: protos.google.pubsub.v1.IUpdateTopicRequest, + request?: protos.google.pubsub.v1.IUpdateTopicRequest, optionsOrCallback?: | CallOptions | Callback< @@ -553,7 +553,7 @@ export class PublisherClient { return this.innerApiCalls.updateTopic(request, options, callback); } publish( - request: protos.google.pubsub.v1.IPublishRequest, + request?: protos.google.pubsub.v1.IPublishRequest, options?: CallOptions ): Promise< [ @@ -601,7 +601,7 @@ export class PublisherClient { * const [response] = await client.publish(request); */ publish( - request: protos.google.pubsub.v1.IPublishRequest, + request?: protos.google.pubsub.v1.IPublishRequest, optionsOrCallback?: | CallOptions | Callback< @@ -640,7 +640,7 @@ export class PublisherClient { return this.innerApiCalls.publish(request, options, callback); } getTopic( - request: protos.google.pubsub.v1.IGetTopicRequest, + request?: protos.google.pubsub.v1.IGetTopicRequest, options?: CallOptions ): Promise< [ @@ -685,7 +685,7 @@ export class PublisherClient { * const [response] = await client.getTopic(request); */ getTopic( - request: protos.google.pubsub.v1.IGetTopicRequest, + request?: protos.google.pubsub.v1.IGetTopicRequest, optionsOrCallback?: | CallOptions | Callback< @@ -724,7 +724,7 @@ export class PublisherClient { return this.innerApiCalls.getTopic(request, options, callback); } deleteTopic( - request: protos.google.pubsub.v1.IDeleteTopicRequest, + request?: protos.google.pubsub.v1.IDeleteTopicRequest, options?: CallOptions ): Promise< [ @@ -773,7 +773,7 @@ export class PublisherClient { * const [response] = await client.deleteTopic(request); */ deleteTopic( - request: protos.google.pubsub.v1.IDeleteTopicRequest, + request?: protos.google.pubsub.v1.IDeleteTopicRequest, optionsOrCallback?: | CallOptions | Callback< @@ -812,7 +812,7 @@ export class PublisherClient { return this.innerApiCalls.deleteTopic(request, options, callback); } detachSubscription( - request: protos.google.pubsub.v1.IDetachSubscriptionRequest, + request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, options?: CallOptions ): Promise< [ @@ -860,7 +860,7 @@ export class PublisherClient { * const [response] = await client.detachSubscription(request); */ detachSubscription( - request: protos.google.pubsub.v1.IDetachSubscriptionRequest, + request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, optionsOrCallback?: | CallOptions | Callback< @@ -900,7 +900,7 @@ export class PublisherClient { } listTopics( - request: protos.google.pubsub.v1.IListTopicsRequest, + request?: protos.google.pubsub.v1.IListTopicsRequest, options?: CallOptions ): Promise< [ @@ -954,7 +954,7 @@ export class PublisherClient { * for more details and examples. */ listTopics( - request: protos.google.pubsub.v1.IListTopicsRequest, + request?: protos.google.pubsub.v1.IListTopicsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -1092,7 +1092,7 @@ export class PublisherClient { ) as AsyncIterable; } listTopicSubscriptions( - request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, options?: CallOptions ): Promise< [ @@ -1150,7 +1150,7 @@ export class PublisherClient { * for more details and examples. */ listTopicSubscriptions( - request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -1296,7 +1296,7 @@ export class PublisherClient { ) as AsyncIterable; } listTopicSnapshots( - request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, options?: CallOptions ): Promise< [ @@ -1354,7 +1354,7 @@ export class PublisherClient { * for more details and examples. */ listTopicSnapshots( - request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index b9c99ae3add..ff55841ae5e 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -323,7 +323,7 @@ export class SchemaServiceClient { // -- Service calls -- // ------------------- createSchema( - request: protos.google.pubsub.v1.ICreateSchemaRequest, + request?: protos.google.pubsub.v1.ICreateSchemaRequest, options?: CallOptions ): Promise< [ @@ -380,7 +380,7 @@ export class SchemaServiceClient { * const [response] = await client.createSchema(request); */ createSchema( - request: protos.google.pubsub.v1.ICreateSchemaRequest, + request?: protos.google.pubsub.v1.ICreateSchemaRequest, optionsOrCallback?: | CallOptions | Callback< @@ -419,7 +419,7 @@ export class SchemaServiceClient { return this.innerApiCalls.createSchema(request, options, callback); } getSchema( - request: protos.google.pubsub.v1.IGetSchemaRequest, + request?: protos.google.pubsub.v1.IGetSchemaRequest, options?: CallOptions ): Promise< [ @@ -468,7 +468,7 @@ export class SchemaServiceClient { * const [response] = await client.getSchema(request); */ getSchema( - request: protos.google.pubsub.v1.IGetSchemaRequest, + request?: protos.google.pubsub.v1.IGetSchemaRequest, optionsOrCallback?: | CallOptions | Callback< @@ -507,7 +507,7 @@ export class SchemaServiceClient { return this.innerApiCalls.getSchema(request, options, callback); } deleteSchema( - request: protos.google.pubsub.v1.IDeleteSchemaRequest, + request?: protos.google.pubsub.v1.IDeleteSchemaRequest, options?: CallOptions ): Promise< [ @@ -552,7 +552,7 @@ export class SchemaServiceClient { * const [response] = await client.deleteSchema(request); */ deleteSchema( - request: protos.google.pubsub.v1.IDeleteSchemaRequest, + request?: protos.google.pubsub.v1.IDeleteSchemaRequest, optionsOrCallback?: | CallOptions | Callback< @@ -591,7 +591,7 @@ export class SchemaServiceClient { return this.innerApiCalls.deleteSchema(request, options, callback); } validateSchema( - request: protos.google.pubsub.v1.IValidateSchemaRequest, + request?: protos.google.pubsub.v1.IValidateSchemaRequest, options?: CallOptions ): Promise< [ @@ -638,7 +638,7 @@ export class SchemaServiceClient { * const [response] = await client.validateSchema(request); */ validateSchema( - request: protos.google.pubsub.v1.IValidateSchemaRequest, + request?: protos.google.pubsub.v1.IValidateSchemaRequest, optionsOrCallback?: | CallOptions | Callback< @@ -677,7 +677,7 @@ export class SchemaServiceClient { return this.innerApiCalls.validateSchema(request, options, callback); } validateMessage( - request: protos.google.pubsub.v1.IValidateMessageRequest, + request?: protos.google.pubsub.v1.IValidateMessageRequest, options?: CallOptions ): Promise< [ @@ -732,7 +732,7 @@ export class SchemaServiceClient { * const [response] = await client.validateMessage(request); */ validateMessage( - request: protos.google.pubsub.v1.IValidateMessageRequest, + request?: protos.google.pubsub.v1.IValidateMessageRequest, optionsOrCallback?: | CallOptions | Callback< @@ -772,7 +772,7 @@ export class SchemaServiceClient { } listSchemas( - request: protos.google.pubsub.v1.IListSchemasRequest, + request?: protos.google.pubsub.v1.IListSchemasRequest, options?: CallOptions ): Promise< [ @@ -830,7 +830,7 @@ export class SchemaServiceClient { * for more details and examples. */ listSchemas( - request: protos.google.pubsub.v1.IListSchemasRequest, + request?: protos.google.pubsub.v1.IListSchemasRequest, optionsOrCallback?: | CallOptions | PaginationCallback< diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 9e7a57e4527..8b1348442ec 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -351,7 +351,7 @@ export class SubscriberClient { // -- Service calls -- // ------------------- createSubscription( - request: protos.google.pubsub.v1.ISubscription, + request?: protos.google.pubsub.v1.ISubscription, options?: CallOptions ): Promise< [ @@ -496,7 +496,7 @@ export class SubscriberClient { * const [response] = await client.createSubscription(request); */ createSubscription( - request: protos.google.pubsub.v1.ISubscription, + request?: protos.google.pubsub.v1.ISubscription, optionsOrCallback?: | CallOptions | Callback< @@ -535,7 +535,7 @@ export class SubscriberClient { return this.innerApiCalls.createSubscription(request, options, callback); } getSubscription( - request: protos.google.pubsub.v1.IGetSubscriptionRequest, + request?: protos.google.pubsub.v1.IGetSubscriptionRequest, options?: CallOptions ): Promise< [ @@ -580,7 +580,7 @@ export class SubscriberClient { * const [response] = await client.getSubscription(request); */ getSubscription( - request: protos.google.pubsub.v1.IGetSubscriptionRequest, + request?: protos.google.pubsub.v1.IGetSubscriptionRequest, optionsOrCallback?: | CallOptions | Callback< @@ -619,7 +619,7 @@ export class SubscriberClient { return this.innerApiCalls.getSubscription(request, options, callback); } updateSubscription( - request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, + request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, options?: CallOptions ): Promise< [ @@ -667,7 +667,7 @@ export class SubscriberClient { * const [response] = await client.updateSubscription(request); */ updateSubscription( - request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, + request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, optionsOrCallback?: | CallOptions | Callback< @@ -706,7 +706,7 @@ export class SubscriberClient { return this.innerApiCalls.updateSubscription(request, options, callback); } deleteSubscription( - request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, + request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, options?: CallOptions ): Promise< [ @@ -755,7 +755,7 @@ export class SubscriberClient { * const [response] = await client.deleteSubscription(request); */ deleteSubscription( - request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, + request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, optionsOrCallback?: | CallOptions | Callback< @@ -794,7 +794,7 @@ export class SubscriberClient { return this.innerApiCalls.deleteSubscription(request, options, callback); } modifyAckDeadline( - request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, options?: CallOptions ): Promise< [ @@ -854,7 +854,7 @@ export class SubscriberClient { * const [response] = await client.modifyAckDeadline(request); */ modifyAckDeadline( - request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, optionsOrCallback?: | CallOptions | Callback< @@ -893,7 +893,7 @@ export class SubscriberClient { return this.innerApiCalls.modifyAckDeadline(request, options, callback); } acknowledge( - request: protos.google.pubsub.v1.IAcknowledgeRequest, + request?: protos.google.pubsub.v1.IAcknowledgeRequest, options?: CallOptions ): Promise< [ @@ -948,7 +948,7 @@ export class SubscriberClient { * const [response] = await client.acknowledge(request); */ acknowledge( - request: protos.google.pubsub.v1.IAcknowledgeRequest, + request?: protos.google.pubsub.v1.IAcknowledgeRequest, optionsOrCallback?: | CallOptions | Callback< @@ -987,7 +987,7 @@ export class SubscriberClient { return this.innerApiCalls.acknowledge(request, options, callback); } pull( - request: protos.google.pubsub.v1.IPullRequest, + request?: protos.google.pubsub.v1.IPullRequest, options?: CallOptions ): Promise< [ @@ -1046,7 +1046,7 @@ export class SubscriberClient { * const [response] = await client.pull(request); */ pull( - request: protos.google.pubsub.v1.IPullRequest, + request?: protos.google.pubsub.v1.IPullRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1085,7 +1085,7 @@ export class SubscriberClient { return this.innerApiCalls.pull(request, options, callback); } modifyPushConfig( - request: protos.google.pubsub.v1.IModifyPushConfigRequest, + request?: protos.google.pubsub.v1.IModifyPushConfigRequest, options?: CallOptions ): Promise< [ @@ -1142,7 +1142,7 @@ export class SubscriberClient { * const [response] = await client.modifyPushConfig(request); */ modifyPushConfig( - request: protos.google.pubsub.v1.IModifyPushConfigRequest, + request?: protos.google.pubsub.v1.IModifyPushConfigRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1181,7 +1181,7 @@ export class SubscriberClient { return this.innerApiCalls.modifyPushConfig(request, options, callback); } getSnapshot( - request: protos.google.pubsub.v1.IGetSnapshotRequest, + request?: protos.google.pubsub.v1.IGetSnapshotRequest, options?: CallOptions ): Promise< [ @@ -1230,7 +1230,7 @@ export class SubscriberClient { * const [response] = await client.getSnapshot(request); */ getSnapshot( - request: protos.google.pubsub.v1.IGetSnapshotRequest, + request?: protos.google.pubsub.v1.IGetSnapshotRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1269,7 +1269,7 @@ export class SubscriberClient { return this.innerApiCalls.getSnapshot(request, options, callback); } createSnapshot( - request: protos.google.pubsub.v1.ICreateSnapshotRequest, + request?: protos.google.pubsub.v1.ICreateSnapshotRequest, options?: CallOptions ): Promise< [ @@ -1346,7 +1346,7 @@ export class SubscriberClient { * const [response] = await client.createSnapshot(request); */ createSnapshot( - request: protos.google.pubsub.v1.ICreateSnapshotRequest, + request?: protos.google.pubsub.v1.ICreateSnapshotRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1385,7 +1385,7 @@ export class SubscriberClient { return this.innerApiCalls.createSnapshot(request, options, callback); } updateSnapshot( - request: protos.google.pubsub.v1.IUpdateSnapshotRequest, + request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, options?: CallOptions ): Promise< [ @@ -1437,7 +1437,7 @@ export class SubscriberClient { * const [response] = await client.updateSnapshot(request); */ updateSnapshot( - request: protos.google.pubsub.v1.IUpdateSnapshotRequest, + request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1476,7 +1476,7 @@ export class SubscriberClient { return this.innerApiCalls.updateSnapshot(request, options, callback); } deleteSnapshot( - request: protos.google.pubsub.v1.IDeleteSnapshotRequest, + request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, options?: CallOptions ): Promise< [ @@ -1529,7 +1529,7 @@ export class SubscriberClient { * const [response] = await client.deleteSnapshot(request); */ deleteSnapshot( - request: protos.google.pubsub.v1.IDeleteSnapshotRequest, + request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1568,7 +1568,7 @@ export class SubscriberClient { return this.innerApiCalls.deleteSnapshot(request, options, callback); } seek( - request: protos.google.pubsub.v1.ISeekRequest, + request?: protos.google.pubsub.v1.ISeekRequest, options?: CallOptions ): Promise< [ @@ -1634,7 +1634,7 @@ export class SubscriberClient { * const [response] = await client.seek(request); */ seek( - request: protos.google.pubsub.v1.ISeekRequest, + request?: protos.google.pubsub.v1.ISeekRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1704,7 +1704,7 @@ export class SubscriberClient { } listSubscriptions( - request: protos.google.pubsub.v1.IListSubscriptionsRequest, + request?: protos.google.pubsub.v1.IListSubscriptionsRequest, options?: CallOptions ): Promise< [ @@ -1758,7 +1758,7 @@ export class SubscriberClient { * for more details and examples. */ listSubscriptions( - request: protos.google.pubsub.v1.IListSubscriptionsRequest, + request?: protos.google.pubsub.v1.IListSubscriptionsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -1896,7 +1896,7 @@ export class SubscriberClient { ) as AsyncIterable; } listSnapshots( - request: protos.google.pubsub.v1.IListSnapshotsRequest, + request?: protos.google.pubsub.v1.IListSnapshotsRequest, options?: CallOptions ): Promise< [ @@ -1954,7 +1954,7 @@ export class SubscriberClient { * for more details and examples. */ listSnapshots( - request: protos.google.pubsub.v1.IListSnapshotsRequest, + request?: protos.google.pubsub.v1.IListSnapshotsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< From 43d34f211559a4879fc58b31dbf7060b385080d2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 21:06:25 +0000 Subject: [PATCH 0761/1115] chore: release 2.15.1 (#1332) :robot: I have created a release \*beep\* \*boop\* --- ### [2.15.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.15.0...v2.15.1) (2021-06-22) ### Bug Fixes * make request optional in all cases ([#1328](https://www.github.com/googleapis/nodejs-pubsub/issues/1328)) ([fa74fa1](https://www.github.com/googleapis/nodejs-pubsub/commit/fa74fa16c76f6b25ee1648ee51c397ccf01f71a4)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 08a3ad068c0..b0ad5a27fac 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.15.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.15.0...v2.15.1) (2021-06-22) + + +### Bug Fixes + +* make request optional in all cases ([#1328](https://www.github.com/googleapis/nodejs-pubsub/issues/1328)) ([fa74fa1](https://www.github.com/googleapis/nodejs-pubsub/commit/fa74fa16c76f6b25ee1648ee51c397ccf01f71a4)) + ## [2.15.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.14.0...v2.15.0) (2021-06-22) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a6269e7ac64..b2649c04802 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.15.0", + "version": "2.15.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From e6c5ef11dabb792c1c637189539c337967a066d4 Mon Sep 17 00:00:00 2001 From: "F. Hinkelmann" Date: Wed, 23 Jun 2021 20:55:13 +0200 Subject: [PATCH 0762/1115] chore: delete unused api-extractor dependencies (#1339) Fixes https://github.com/googleapis/nodejs-pubsub/issues/1338 --- handwritten/pubsub/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b2649c04802..dcb4a8e87ba 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -65,8 +65,6 @@ }, "devDependencies": { "@grpc/proto-loader": "^0.6.0", - "@microsoft/api-documenter": "^7.8.10", - "@microsoft/api-extractor": "^7.8.10", "@opentelemetry/tracing": "^0.22.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", From 64f83959d84330ee0c1617f2fbf6ae401a46f4e9 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 17:52:42 +0000 Subject: [PATCH 0763/1115] build(node): don't throw on deprecation in unit tests (#1340) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #1134 🦕 Removes the commit body and relative PR# from the commit message. For example, for this commit: https://github.com/googleapis/synthtool/commit/9763f20e4b7bb1091082462b2f7970e965d0d414 `post-processor-changes.txt` would contain ``` build: enable npm for php/python builds Source-Link: https://github.com/googleapis/synthtool/commit/9763f20e4b7bb1091082462b2f7970e965d0d414 ``` instead of ``` build: enable npm for php/python builds (#1133) * build: enable npm for php/python builds * update comment Source-Link: https://github.com/googleapis/synthtool/commit/9763f20e4b7bb1091082462b2f7970e965d0d414 ``` Source-Link: https://github.com/googleapis/synthtool/commit/e934b93402284f834b510ebbf421864e881dce02 Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:805e2e389eafefa5ed484c30b83a7a875e6b1c7ee125d812e8b01ecc531c3fac --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index e7c45fd36bc..7b83ac87d91 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:c9c7828c165b1985579098978877935ee52dda2b1b538087514fd24fa2443e7a + digest: sha256:805e2e389eafefa5ed484c30b83a7a875e6b1c7ee125d812e8b01ecc531c3fac From 407003cbd02f29b14b8ae0866964eb7893d12a9f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 25 Jun 2021 17:32:16 +0000 Subject: [PATCH 0764/1115] build(node): do not throw on deprecation (#1140) (#1342) Refs https://github.com/googleapis/nodejs-service-usage/issues/22 Source-Link: https://github.com/googleapis/synthtool/commit/6d26b13debbfe3c6a6a9f9f1914c5bccf1e6fadc Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:e59b73e911585903ee6b8a1c5246e93d9e9463420f597b6eb2e4b616ee8a0fee --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.kokoro/test.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 7b83ac87d91..26e91bb2900 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:805e2e389eafefa5ed484c30b83a7a875e6b1c7ee125d812e8b01ecc531c3fac + digest: sha256:e59b73e911585903ee6b8a1c5246e93d9e9463420f597b6eb2e4b616ee8a0fee diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 5d6383fcb78..b5646aeb628 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -32,6 +32,9 @@ if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ART } trap cleanup EXIT HUP fi +# Unit tests exercise the entire API surface, which may include +# deprecation warnings: +export MOCHA_THROW_DEPRECATION=false npm test # codecov combines coverage across integration and unit tests. Include From 1bb06940da927a9d291394913e904bb28904a3d6 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Wed, 30 Jun 2021 12:20:31 -0400 Subject: [PATCH 0765/1115] fix(deps): google-gax v2.17.0 with mTLS (#1344) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index dcb4a8e87ba..38434d7949b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "^2.12.0", + "google-gax": "^2.17.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From e0589ba4bc4f79dd30978454803df54039003e16 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 04:30:55 +0000 Subject: [PATCH 0766/1115] build: auto-approve renovate-bot PRs for minor updates (#1145) (#1347) Source-Link: https://github.com/googleapis/synthtool/commit/39652e3948f455fd0b77535a0145eeec561a3706 Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:41d5457ff79c3945782ab7e23bf4d617fd7bf3f2b03b6d84808010f7d2e10ca2 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.github/auto-approve.yml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 26e91bb2900..9d507eeeb02 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:e59b73e911585903ee6b8a1c5246e93d9e9463420f597b6eb2e4b616ee8a0fee + digest: sha256:41d5457ff79c3945782ab7e23bf4d617fd7bf3f2b03b6d84808010f7d2e10ca2 diff --git a/handwritten/pubsub/.github/auto-approve.yml b/handwritten/pubsub/.github/auto-approve.yml index 903697974b0..a79ba66c2c0 100644 --- a/handwritten/pubsub/.github/auto-approve.yml +++ b/handwritten/pubsub/.github/auto-approve.yml @@ -4,4 +4,9 @@ rules: changedFiles: - "package\\.json$" - "CHANGELOG\\.md$" - maxFiles: 3 \ No newline at end of file + maxFiles: 3 +- author: "renovate-bot" + title: "^(fix\\(deps\\)|chore\\(deps\\)):" + changedFiles: + - "/package\\.json$" + maxFiles: 2 From b6c0542c697cc97faba73bd4aec7adfd3a3c414d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 9 Jul 2021 15:49:23 -0700 Subject: [PATCH 0767/1115] feat: Add method signature for Subscriber.Pull without the deprecated return_immediately field. (#1350) PiperOrigin-RevId: 383459959 --- .../protos/google/pubsub/v1/pubsub.proto | 12 +- handwritten/pubsub/protos/protos.d.ts | 99 ++++++++ handwritten/pubsub/protos/protos.js | 215 ++++++++++++++++++ handwritten/pubsub/protos/protos.json | 19 +- 4 files changed, 343 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 0da37dd7dad..173c4ce7157 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -505,6 +505,7 @@ service Subscriber { }; option (google.api.method_signature) = "subscription,return_immediately,max_messages"; + option (google.api.method_signature) = "subscription,max_messages"; } // Establishes a stream with the server, which sends messages down to the @@ -1142,8 +1143,17 @@ message StreamingPullRequest { // Response for the `StreamingPull` method. This response is used to stream // messages from the server to the client. message StreamingPullResponse { + // Subscription properties sent as part of the response. + message SubscriptionProperties { + // True iff message ordering is enabled for this subscription. + bool message_ordering_enabled = 2; + } + // Received Pub/Sub messages. This will not be empty. repeated ReceivedMessage received_messages = 1; + + // Properties associated with this subscription. + SubscriptionProperties subscription_properties = 4; } // Request for the `CreateSnapshot` method. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 53b30b43dcf..fb224bba9d5 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -4093,6 +4093,9 @@ export namespace google { /** StreamingPullResponse receivedMessages */ receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + + /** StreamingPullResponse subscriptionProperties */ + subscriptionProperties?: (google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null); } /** Represents a StreamingPullResponse. */ @@ -4107,6 +4110,9 @@ export namespace google { /** StreamingPullResponse receivedMessages. */ public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + /** StreamingPullResponse subscriptionProperties. */ + public subscriptionProperties?: (google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null); + /** * Creates a new StreamingPullResponse instance using the specified properties. * @param [properties] Properties to set @@ -4178,6 +4184,99 @@ export namespace google { public toJSON(): { [k: string]: any }; } + namespace StreamingPullResponse { + + /** Properties of a SubscriptionProperties. */ + interface ISubscriptionProperties { + + /** SubscriptionProperties messageOrderingEnabled */ + messageOrderingEnabled?: (boolean|null); + } + + /** Represents a SubscriptionProperties. */ + class SubscriptionProperties implements ISubscriptionProperties { + + /** + * Constructs a new SubscriptionProperties. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties); + + /** SubscriptionProperties messageOrderingEnabled. */ + public messageOrderingEnabled: boolean; + + /** + * Creates a new SubscriptionProperties instance using the specified properties. + * @param [properties] Properties to set + * @returns SubscriptionProperties instance + */ + public static create(properties?: google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties): google.pubsub.v1.StreamingPullResponse.SubscriptionProperties; + + /** + * Encodes the specified SubscriptionProperties message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.verify|verify} messages. + * @param message SubscriptionProperties message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SubscriptionProperties message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.verify|verify} messages. + * @param message SubscriptionProperties message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SubscriptionProperties message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SubscriptionProperties + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse.SubscriptionProperties; + + /** + * Decodes a SubscriptionProperties message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SubscriptionProperties + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse.SubscriptionProperties; + + /** + * Verifies a SubscriptionProperties message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SubscriptionProperties message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SubscriptionProperties + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse.SubscriptionProperties; + + /** + * Creates a plain object from a SubscriptionProperties message. Also converts values to other types if specified. + * @param message SubscriptionProperties + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullResponse.SubscriptionProperties, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SubscriptionProperties to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + } + /** Properties of a CreateSnapshotRequest. */ interface ICreateSnapshotRequest { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 9290302f941..43146104a17 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -9303,6 +9303,7 @@ * @memberof google.pubsub.v1 * @interface IStreamingPullResponse * @property {Array.|null} [receivedMessages] StreamingPullResponse receivedMessages + * @property {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null} [subscriptionProperties] StreamingPullResponse subscriptionProperties */ /** @@ -9329,6 +9330,14 @@ */ StreamingPullResponse.prototype.receivedMessages = $util.emptyArray; + /** + * StreamingPullResponse subscriptionProperties. + * @member {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null|undefined} subscriptionProperties + * @memberof google.pubsub.v1.StreamingPullResponse + * @instance + */ + StreamingPullResponse.prototype.subscriptionProperties = null; + /** * Creates a new StreamingPullResponse instance using the specified properties. * @function create @@ -9356,6 +9365,8 @@ if (message.receivedMessages != null && message.receivedMessages.length) for (var i = 0; i < message.receivedMessages.length; ++i) $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.subscriptionProperties != null && Object.hasOwnProperty.call(message, "subscriptionProperties")) + $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.encode(message.subscriptionProperties, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); return writer; }; @@ -9395,6 +9406,9 @@ message.receivedMessages = []; message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); break; + case 4: + message.subscriptionProperties = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -9439,6 +9453,11 @@ return "receivedMessages." + error; } } + if (message.subscriptionProperties != null && message.hasOwnProperty("subscriptionProperties")) { + var error = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.verify(message.subscriptionProperties); + if (error) + return "subscriptionProperties." + error; + } return null; }; @@ -9464,6 +9483,11 @@ message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); } } + if (object.subscriptionProperties != null) { + if (typeof object.subscriptionProperties !== "object") + throw TypeError(".google.pubsub.v1.StreamingPullResponse.subscriptionProperties: object expected"); + message.subscriptionProperties = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.fromObject(object.subscriptionProperties); + } return message; }; @@ -9482,11 +9506,15 @@ var object = {}; if (options.arrays || options.defaults) object.receivedMessages = []; + if (options.defaults) + object.subscriptionProperties = null; if (message.receivedMessages && message.receivedMessages.length) { object.receivedMessages = []; for (var j = 0; j < message.receivedMessages.length; ++j) object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); } + if (message.subscriptionProperties != null && message.hasOwnProperty("subscriptionProperties")) + object.subscriptionProperties = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.toObject(message.subscriptionProperties, options); return object; }; @@ -9501,6 +9529,193 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + StreamingPullResponse.SubscriptionProperties = (function() { + + /** + * Properties of a SubscriptionProperties. + * @memberof google.pubsub.v1.StreamingPullResponse + * @interface ISubscriptionProperties + * @property {boolean|null} [messageOrderingEnabled] SubscriptionProperties messageOrderingEnabled + */ + + /** + * Constructs a new SubscriptionProperties. + * @memberof google.pubsub.v1.StreamingPullResponse + * @classdesc Represents a SubscriptionProperties. + * @implements ISubscriptionProperties + * @constructor + * @param {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties=} [properties] Properties to set + */ + function SubscriptionProperties(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * SubscriptionProperties messageOrderingEnabled. + * @member {boolean} messageOrderingEnabled + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @instance + */ + SubscriptionProperties.prototype.messageOrderingEnabled = false; + + /** + * Creates a new SubscriptionProperties instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullResponse.SubscriptionProperties} SubscriptionProperties instance + */ + SubscriptionProperties.create = function create(properties) { + return new SubscriptionProperties(properties); + }; + + /** + * Encodes the specified SubscriptionProperties message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties} message SubscriptionProperties message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SubscriptionProperties.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.messageOrderingEnabled != null && Object.hasOwnProperty.call(message, "messageOrderingEnabled")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.messageOrderingEnabled); + return writer; + }; + + /** + * Encodes the specified SubscriptionProperties message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties} message SubscriptionProperties message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SubscriptionProperties.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SubscriptionProperties message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.StreamingPullResponse.SubscriptionProperties} SubscriptionProperties + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SubscriptionProperties.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 2: + message.messageOrderingEnabled = reader.bool(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SubscriptionProperties message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.StreamingPullResponse.SubscriptionProperties} SubscriptionProperties + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SubscriptionProperties.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SubscriptionProperties message. + * @function verify + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SubscriptionProperties.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.messageOrderingEnabled != null && message.hasOwnProperty("messageOrderingEnabled")) + if (typeof message.messageOrderingEnabled !== "boolean") + return "messageOrderingEnabled: boolean expected"; + return null; + }; + + /** + * Creates a SubscriptionProperties message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.StreamingPullResponse.SubscriptionProperties} SubscriptionProperties + */ + SubscriptionProperties.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties) + return object; + var message = new $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties(); + if (object.messageOrderingEnabled != null) + message.messageOrderingEnabled = Boolean(object.messageOrderingEnabled); + return message; + }; + + /** + * Creates a plain object from a SubscriptionProperties message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {google.pubsub.v1.StreamingPullResponse.SubscriptionProperties} message SubscriptionProperties + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SubscriptionProperties.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.messageOrderingEnabled = false; + if (message.messageOrderingEnabled != null && message.hasOwnProperty("messageOrderingEnabled")) + object.messageOrderingEnabled = message.messageOrderingEnabled; + return object; + }; + + /** + * Converts this SubscriptionProperties to JSON. + * @function toJSON + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @instance + * @returns {Object.} JSON object + */ + SubscriptionProperties.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return SubscriptionProperties; + })(); + return StreamingPullResponse; })(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index f81292a93c7..1de6e50a12a 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -600,7 +600,7 @@ "options": { "(google.api.http).post": "/v1/{subscription=projects/*/subscriptions/*}:pull", "(google.api.http).body": "*", - "(google.api.method_signature)": "subscription,return_immediately,max_messages" + "(google.api.method_signature)": "subscription,max_messages" }, "parsedOptions": [ { @@ -611,6 +611,9 @@ }, { "(google.api.method_signature)": "subscription,return_immediately,max_messages" + }, + { + "(google.api.method_signature)": "subscription,max_messages" } ] }, @@ -1131,6 +1134,20 @@ "rule": "repeated", "type": "ReceivedMessage", "id": 1 + }, + "subscriptionProperties": { + "type": "SubscriptionProperties", + "id": 4 + } + }, + "nested": { + "SubscriptionProperties": { + "fields": { + "messageOrderingEnabled": { + "type": "bool", + "id": 2 + } + } } } }, From d2fbaddbf91655e0315964c6440cc2a0fb511e77 Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 12 Jul 2021 17:44:14 -0400 Subject: [PATCH 0768/1115] fix(deps): google-gax v2.17.1 (#1353) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 38434d7949b..9aa26ce8cbe 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "^2.17.0", + "google-gax": "^2.17.1", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From 0497904642bc353c782f3bd3516b24e4d2cb965f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 12 Jul 2021 22:04:13 +0000 Subject: [PATCH 0769/1115] chore: release 2.16.0 (#1351) :robot: I have created a release \*beep\* \*boop\* --- ## [2.16.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.15.1...v2.16.0) (2021-07-12) ### Features * Add method signature for Subscriber.Pull without the deprecated return_immediately field. ([#1350](https://www.github.com/googleapis/nodejs-pubsub/issues/1350)) ([a7922fb](https://www.github.com/googleapis/nodejs-pubsub/commit/a7922fb345337d750789d1b672521c8440472cea)) ### Bug Fixes * **deps:** google-gax v2.17.0 with mTLS ([#1344](https://www.github.com/googleapis/nodejs-pubsub/issues/1344)) ([0cd0a8c](https://www.github.com/googleapis/nodejs-pubsub/commit/0cd0a8c8c79e3ca7dfe1e2d1bf2a2f8894ba4680)) * **deps:** google-gax v2.17.1 ([#1353](https://www.github.com/googleapis/nodejs-pubsub/issues/1353)) ([d5bf563](https://www.github.com/googleapis/nodejs-pubsub/commit/d5bf56325374c5509c6b65c953b41c15533a2a0a)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 13 +++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index b0ad5a27fac..54e0e37ac78 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,19 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.16.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.15.1...v2.16.0) (2021-07-12) + + +### Features + +* Add method signature for Subscriber.Pull without the deprecated return_immediately field. ([#1350](https://www.github.com/googleapis/nodejs-pubsub/issues/1350)) ([a7922fb](https://www.github.com/googleapis/nodejs-pubsub/commit/a7922fb345337d750789d1b672521c8440472cea)) + + +### Bug Fixes + +* **deps:** google-gax v2.17.0 with mTLS ([#1344](https://www.github.com/googleapis/nodejs-pubsub/issues/1344)) ([0cd0a8c](https://www.github.com/googleapis/nodejs-pubsub/commit/0cd0a8c8c79e3ca7dfe1e2d1bf2a2f8894ba4680)) +* **deps:** google-gax v2.17.1 ([#1353](https://www.github.com/googleapis/nodejs-pubsub/issues/1353)) ([d5bf563](https://www.github.com/googleapis/nodejs-pubsub/commit/d5bf56325374c5509c6b65c953b41c15533a2a0a)) + ### [2.15.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.15.0...v2.15.1) (2021-06-22) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9aa26ce8cbe..7d4133ca41b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.15.1", + "version": "2.16.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 40c9cafdf47844ad015ae5dd05462d29850c7bf8 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 16 Jul 2021 19:08:11 +0000 Subject: [PATCH 0770/1115] fix: Updating WORKSPACE files to use the newest version of the Typescript generator. (#1354) Also removing the explicit generator tag for the IAMPolicy mixin for the kms and pubsub APIS as the generator will now read it from the .yaml file. PiperOrigin-RevId: 385101839 Source-Link: https://github.com/googleapis/googleapis/commit/80f404215a9346259db760d80d0671f28c433453 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d3509d2520fb8db862129633f1cf8406d17454e1 --- handwritten/pubsub/src/v1/publisher_client.ts | 11 ++++++++++- handwritten/pubsub/src/v1/schema_service_client.ts | 11 ++++++++++- handwritten/pubsub/src/v1/subscriber_client.ts | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index a829b1709a2..b41a83c6be1 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -51,6 +51,7 @@ const version = require('../../../package.json').version; export class PublisherClient { private _terminated = false; private _opts: ClientOptions; + private _providedCustomServicePath: boolean; private _gaxModule: typeof gax | typeof gax.fallback; private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; private _protos: {}; @@ -62,6 +63,7 @@ export class PublisherClient { longrunning: {}, batching: {}, }; + warn: (code: string, message: string, warnType?: string) => void; innerApiCalls: {[name: string]: Function}; iamClient: IamClient; pathTemplates: {[name: string]: gax.PathTemplate}; @@ -106,6 +108,9 @@ export class PublisherClient { const staticMembers = this.constructor as typeof PublisherClient; const servicePath = opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + this._providedCustomServicePath = !!( + opts?.servicePath || opts?.apiEndpoint + ); const port = opts?.port || staticMembers.port; const clientConfig = opts?.clientConfig ?? {}; const fallback = @@ -225,6 +230,9 @@ export class PublisherClient { // of calling the API is handled in `google-gax`, with this code // merely providing the destination and request information. this.innerApiCalls = {}; + + // Add a warn function to the client constructor so it can be easily tested. + this.warn = gax.warn; } /** @@ -253,7 +261,8 @@ export class PublisherClient { ) : // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._protos as any).google.pubsub.v1.Publisher, - this._opts + this._opts, + this._providedCustomServicePath ) as Promise<{[method: string]: Function}>; // Iterate over each of the methods that the service provides diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index ff55841ae5e..03fbb27f086 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -50,6 +50,7 @@ const version = require('../../../package.json').version; export class SchemaServiceClient { private _terminated = false; private _opts: ClientOptions; + private _providedCustomServicePath: boolean; private _gaxModule: typeof gax | typeof gax.fallback; private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; private _protos: {}; @@ -61,6 +62,7 @@ export class SchemaServiceClient { longrunning: {}, batching: {}, }; + warn: (code: string, message: string, warnType?: string) => void; innerApiCalls: {[name: string]: Function}; iamClient: IamClient; pathTemplates: {[name: string]: gax.PathTemplate}; @@ -105,6 +107,9 @@ export class SchemaServiceClient { const staticMembers = this.constructor as typeof SchemaServiceClient; const servicePath = opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + this._providedCustomServicePath = !!( + opts?.servicePath || opts?.apiEndpoint + ); const port = opts?.port || staticMembers.port; const clientConfig = opts?.clientConfig ?? {}; const fallback = @@ -197,6 +202,9 @@ export class SchemaServiceClient { // of calling the API is handled in `google-gax`, with this code // merely providing the destination and request information. this.innerApiCalls = {}; + + // Add a warn function to the client constructor so it can be easily tested. + this.warn = gax.warn; } /** @@ -225,7 +233,8 @@ export class SchemaServiceClient { ) : // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._protos as any).google.pubsub.v1.SchemaService, - this._opts + this._opts, + this._providedCustomServicePath ) as Promise<{[method: string]: Function}>; // Iterate over each of the methods that the service provides diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 8b1348442ec..31ed465e454 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -52,6 +52,7 @@ const version = require('../../../package.json').version; export class SubscriberClient { private _terminated = false; private _opts: ClientOptions; + private _providedCustomServicePath: boolean; private _gaxModule: typeof gax | typeof gax.fallback; private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; private _protos: {}; @@ -63,6 +64,7 @@ export class SubscriberClient { longrunning: {}, batching: {}, }; + warn: (code: string, message: string, warnType?: string) => void; innerApiCalls: {[name: string]: Function}; iamClient: IamClient; pathTemplates: {[name: string]: gax.PathTemplate}; @@ -107,6 +109,9 @@ export class SubscriberClient { const staticMembers = this.constructor as typeof SubscriberClient; const servicePath = opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + this._providedCustomServicePath = !!( + opts?.servicePath || opts?.apiEndpoint + ); const port = opts?.port || staticMembers.port; const clientConfig = opts?.clientConfig ?? {}; const fallback = @@ -212,6 +217,9 @@ export class SubscriberClient { // of calling the API is handled in `google-gax`, with this code // merely providing the destination and request information. this.innerApiCalls = {}; + + // Add a warn function to the client constructor so it can be easily tested. + this.warn = gax.warn; } /** @@ -240,7 +248,8 @@ export class SubscriberClient { ) : // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._protos as any).google.pubsub.v1.Subscriber, - this._opts + this._opts, + this._providedCustomServicePath ) as Promise<{[method: string]: Function}>; // Iterate over each of the methods that the service provides From 4a95aa31b023d074829f20efbd3e9c9da2c1f401 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 00:14:09 +0000 Subject: [PATCH 0771/1115] build: switch to release-please release tagging (#1129) (#1357) Requires https://github.com/googleapis/releasetool/pull/338 Source-Link: https://github.com/googleapis/synthtool/commit/1563597d28eca099d6411bbc29ecd09314a80746 Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:06c970a44680229c1e8cefa701dbc93b80468ec4a34e6968475084e4ec1e2d7d --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.github/release-please.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 9d507eeeb02..b1434427024 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:41d5457ff79c3945782ab7e23bf4d617fd7bf3f2b03b6d84808010f7d2e10ca2 + digest: sha256:06c970a44680229c1e8cefa701dbc93b80468ec4a34e6968475084e4ec1e2d7d diff --git a/handwritten/pubsub/.github/release-please.yml b/handwritten/pubsub/.github/release-please.yml index 85344b92c7f..a1b41da3cb3 100644 --- a/handwritten/pubsub/.github/release-please.yml +++ b/handwritten/pubsub/.github/release-please.yml @@ -1 +1,2 @@ +handleGHRelease: true releaseType: node From 1798824b83552964e47cc73723411aadd53aab8b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 01:06:15 +0000 Subject: [PATCH 0772/1115] chore: release 2.16.1 (#1355) :robot: I have created a release \*beep\* \*boop\* --- ### [2.16.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.0...v2.16.1) (2021-07-21) ### Bug Fixes * Updating WORKSPACE files to use the newest version of the Typescript generator. ([#1354](https://www.github.com/googleapis/nodejs-pubsub/issues/1354)) ([7288e2e](https://www.github.com/googleapis/nodejs-pubsub/commit/7288e2e06b15bede3e06002a8a3dec2699312aa2)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 54e0e37ac78..116388f162c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.16.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.0...v2.16.1) (2021-07-21) + + +### Bug Fixes + +* Updating WORKSPACE files to use the newest version of the Typescript generator. ([#1354](https://www.github.com/googleapis/nodejs-pubsub/issues/1354)) ([7288e2e](https://www.github.com/googleapis/nodejs-pubsub/commit/7288e2e06b15bede3e06002a8a3dec2699312aa2)) + ## [2.16.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.15.1...v2.16.0) (2021-07-12) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7d4133ca41b..85c295e96c8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.16.0", + "version": "2.16.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 40a35550904376c2ac2b097f5d4ef87c0b206d84 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 30 Jul 2021 17:08:15 +0000 Subject: [PATCH 0773/1115] build: update auto-approve config for new validation (#1169) (#1360) Co-authored-by: Anthonios Partheniou Source-Link: https://github.com/googleapis/synthtool/commit/df7fc1e3a6df4316920ab221431945cdf9aa7217 Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:6245a5be4c0406d9b2f04f380d8b88ffe4655df3cdbb57626f8913e8d620f4dd --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.github/auto-approve.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index b1434427024..9b2b9550d5e 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:06c970a44680229c1e8cefa701dbc93b80468ec4a34e6968475084e4ec1e2d7d + digest: sha256:6245a5be4c0406d9b2f04f380d8b88ffe4655df3cdbb57626f8913e8d620f4dd diff --git a/handwritten/pubsub/.github/auto-approve.yml b/handwritten/pubsub/.github/auto-approve.yml index a79ba66c2c0..49cf942280a 100644 --- a/handwritten/pubsub/.github/auto-approve.yml +++ b/handwritten/pubsub/.github/auto-approve.yml @@ -6,7 +6,7 @@ rules: - "CHANGELOG\\.md$" maxFiles: 3 - author: "renovate-bot" - title: "^(fix\\(deps\\)|chore\\(deps\\)):" + title: "^(fix|chore)\\(deps\\):" changedFiles: - - "/package\\.json$" + - "package\\.json$" maxFiles: 2 From 34926288af4ad34a6e85a673a1d6c5792a39178a Mon Sep 17 00:00:00 2001 From: "F. Hinkelmann" Date: Wed, 4 Aug 2021 16:00:24 -0400 Subject: [PATCH 0774/1115] chore(nodejs): update client ref docs link in metadata (#1365) --- handwritten/pubsub/.repo-metadata.json | 2 +- handwritten/pubsub/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json index 7a3d4859bae..54e8b2a77d2 100644 --- a/handwritten/pubsub/.repo-metadata.json +++ b/handwritten/pubsub/.repo-metadata.json @@ -7,7 +7,7 @@ "language": "nodejs", "requires_billing": true, "issue_tracker": "https://issuetracker.google.com/savedsearches/559741", - "client_documentation": "https://googleapis.dev/nodejs/pubsub/latest", + "client_documentation": "https://cloud.google.com/nodejs/docs/reference/pubsub/latest", "name": "pubsub", "name_pretty": "Google Cloud Pub/Sub", "api_id": "pubsub.googleapis.com", diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 5c77b824353..e09456b38de 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -232,7 +232,7 @@ Apache Version 2.0 See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) -[client-docs]: https://googleapis.dev/nodejs/pubsub/latest +[client-docs]: https://cloud.google.com/nodejs/docs/reference/pubsub/latest [product-docs]: https://cloud.google.com/pubsub/docs/ [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png [projects]: https://console.cloud.google.com/project From b17e07e028cdea0736b87093065076161faf4860 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 11 Aug 2021 02:22:17 +0200 Subject: [PATCH 0775/1115] fix(deps): update opentelemetry monorepo to ^0.24.0 (#1349) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 85c295e96c8..ad3b1f35eb4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", "@opentelemetry/api": "^1.0.0", - "@opentelemetry/semantic-conventions": "^0.22.0", + "@opentelemetry/semantic-conventions": "^0.24.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", @@ -65,7 +65,7 @@ }, "devDependencies": { "@grpc/proto-loader": "^0.6.0", - "@opentelemetry/tracing": "^0.22.0", + "@opentelemetry/tracing": "^0.24.0", "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", From 36fd0127a455ed78162b8c93401e7c4b6162ea07 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 00:34:51 +0000 Subject: [PATCH 0776/1115] chore: release 2.16.2 (#1375) :robot: I have created a release \*beep\* \*boop\* --- ### [2.16.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.1...v2.16.2) (2021-08-11) ### Bug Fixes * **deps:** update opentelemetry monorepo to ^0.24.0 ([#1349](https://www.github.com/googleapis/nodejs-pubsub/issues/1349)) ([cf0d24a](https://www.github.com/googleapis/nodejs-pubsub/commit/cf0d24a9ff090f6f3f235d8d474d75cd9599c49e)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 116388f162c..ea1863e9ff4 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.16.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.1...v2.16.2) (2021-08-11) + + +### Bug Fixes + +* **deps:** update opentelemetry monorepo to ^0.24.0 ([#1349](https://www.github.com/googleapis/nodejs-pubsub/issues/1349)) ([cf0d24a](https://www.github.com/googleapis/nodejs-pubsub/commit/cf0d24a9ff090f6f3f235d8d474d75cd9599c49e)) + ### [2.16.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.0...v2.16.1) (2021-07-21) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ad3b1f35eb4..a6703b37c63 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.16.1", + "version": "2.16.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 7a707a1174c683a6bd7ff175e1746abafee50c36 Mon Sep 17 00:00:00 2001 From: Tyler Bui-Palsulich <26876514+tbpg@users.noreply.github.com> Date: Tue, 10 Aug 2021 20:48:54 -0400 Subject: [PATCH 0777/1115] docs: fix 'individual' typo (#1367) --- handwritten/pubsub/src/iam.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index b4909281254..505a10783e4 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -57,7 +57,7 @@ export type TestIamPermissionsCallback = ResourceCallback< /** * [IAM (Identity and Access * Management)](https://cloud.google.com/pubsub/access_control) allows you to - * set permissions on invidual resources and offers a wider range of roles: + * set permissions on individual resources and offers a wider range of roles: * editor, owner, publisher, subscriber, and viewer. This gives you greater * flexibility and allows you to set more fine-grained access control. * From ee6eb8d276c8fbc6f84d454300fb372a35fd17c3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 16:06:17 +0000 Subject: [PATCH 0778/1115] fix(pubsub): replace IAMPolicy in API config (#1373) PiperOrigin-RevId: 389961627 Source-Link: https://github.com/googleapis/googleapis/commit/e41be609f1e2ae7618bf323748871c591f44742a Source-Link: https://github.com/googleapis/googleapis-gen/commit/68372a8c43f97a79d2403a096324f45d7f8ff0c9 --- .../protos/google/pubsub/v1/pubsub.proto | 24 ++++++++- .../protos/google/pubsub/v1/schema.proto | 4 +- handwritten/pubsub/protos/protos.d.ts | 12 +++++ handwritten/pubsub/protos/protos.js | 54 +++++++++++++++++++ handwritten/pubsub/protos/protos.json | 11 ++++ handwritten/pubsub/src/v1/publisher_client.ts | 9 ++++ .../pubsub/src/v1/subscriber_client.ts | 12 ++++- 7 files changed, 121 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 173c4ce7157..b1d65626cf2 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -196,6 +196,16 @@ message Topic { // Reserved for future use. This field is set only in responses from the // server; it is ignored if it is set in any requests. bool satisfies_pzs = 7; + + // Indicates the minimum duration to retain a message after it is published to + // the topic. If this field is set, messages published to the topic in the + // last `message_retention_duration` are always available to subscribers. For + // instance, it allows any attached subscription to [seek to a + // timestamp](https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) + // that is up to `message_retention_duration` in the past. If this field is + // not set, message retention is controlled by settings on individual + // subscriptions. Cannot be more than 7 days or less than 10 minutes. + google.protobuf.Duration message_retention_duration = 8; } // A message that is published by publishers and consumed by subscribers. The @@ -678,8 +688,9 @@ message Subscription { // Indicates whether to retain acknowledged messages. If true, then // messages are not expunged from the subscription's backlog, even if they are // acknowledged, until they fall out of the `message_retention_duration` - // window. This must be true if you would like to [Seek to a timestamp] - // (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time). + // window. This must be true if you would like to [`Seek` to a timestamp] + // (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) in + // the past to replay previously-acknowledged messages. bool retain_acked_messages = 7; // How long to retain unacknowledged messages in the subscription's backlog, @@ -740,6 +751,15 @@ message Subscription { // FAILED_PRECONDITION. If the subscription is a push subscription, pushes to // the endpoint will not be made. bool detached = 15; + + // Output only. Indicates the minimum duration for which a message is retained + // after it is published to the subscription's topic. If this field is set, + // messages published to the subscription's topic in the last + // `topic_message_retention_duration` are always available to subscribers. See + // the `message_retention_duration` field in `Topic`. This field is set only + // in responses from the server; it is ignored if it is set in any requests. + google.protobuf.Duration topic_message_retention_duration = 17 + [(google.api.field_behavior) = OUTPUT_ONLY]; } // A policy that specifies how Cloud Pub/Sub retries message delivery. diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index 1ace7ef3b0d..3cdf10d9331 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -237,6 +237,7 @@ message ValidateSchemaRequest { } // Response for the `ValidateSchema` method. +// Empty for now. message ValidateSchemaResponse {} // Request for the `ValidateMessage` method. @@ -270,6 +271,7 @@ message ValidateMessageRequest { } // Response for the `ValidateMessage` method. +// Empty for now. message ValidateMessageResponse {} // Possible encoding types for messages. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index fb224bba9d5..6662d8236cd 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -442,6 +442,9 @@ export namespace google { /** Topic satisfiesPzs */ satisfiesPzs?: (boolean|null); + + /** Topic messageRetentionDuration */ + messageRetentionDuration?: (google.protobuf.IDuration|null); } /** Represents a Topic. */ @@ -471,6 +474,9 @@ export namespace google { /** Topic satisfiesPzs. */ public satisfiesPzs: boolean; + /** Topic messageRetentionDuration. */ + public messageRetentionDuration?: (google.protobuf.IDuration|null); + /** * Creates a new Topic instance using the specified properties. * @param [properties] Properties to set @@ -2287,6 +2293,9 @@ export namespace google { /** Subscription detached */ detached?: (boolean|null); + + /** Subscription topicMessageRetentionDuration */ + topicMessageRetentionDuration?: (google.protobuf.IDuration|null); } /** Represents a Subscription. */ @@ -2337,6 +2346,9 @@ export namespace google { /** Subscription detached. */ public detached: boolean; + /** Subscription topicMessageRetentionDuration. */ + public topicMessageRetentionDuration?: (google.protobuf.IDuration|null); + /** * Creates a new Subscription instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 43146104a17..9e7f2cfeca5 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -832,6 +832,7 @@ * @property {string|null} [kmsKeyName] Topic kmsKeyName * @property {google.pubsub.v1.ISchemaSettings|null} [schemaSettings] Topic schemaSettings * @property {boolean|null} [satisfiesPzs] Topic satisfiesPzs + * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Topic messageRetentionDuration */ /** @@ -898,6 +899,14 @@ */ Topic.prototype.satisfiesPzs = false; + /** + * Topic messageRetentionDuration. + * @member {google.protobuf.IDuration|null|undefined} messageRetentionDuration + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.messageRetentionDuration = null; + /** * Creates a new Topic instance using the specified properties. * @function create @@ -935,6 +944,8 @@ $root.google.pubsub.v1.SchemaSettings.encode(message.schemaSettings, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); if (message.satisfiesPzs != null && Object.hasOwnProperty.call(message, "satisfiesPzs")) writer.uint32(/* id 7, wireType 0 =*/56).bool(message.satisfiesPzs); + if (message.messageRetentionDuration != null && Object.hasOwnProperty.call(message, "messageRetentionDuration")) + $root.google.protobuf.Duration.encode(message.messageRetentionDuration, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); return writer; }; @@ -1006,6 +1017,9 @@ case 7: message.satisfiesPzs = reader.bool(); break; + case 8: + message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -1068,6 +1082,11 @@ if (message.satisfiesPzs != null && message.hasOwnProperty("satisfiesPzs")) if (typeof message.satisfiesPzs !== "boolean") return "satisfiesPzs: boolean expected"; + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) { + var error = $root.google.protobuf.Duration.verify(message.messageRetentionDuration); + if (error) + return "messageRetentionDuration." + error; + } return null; }; @@ -1106,6 +1125,11 @@ } if (object.satisfiesPzs != null) message.satisfiesPzs = Boolean(object.satisfiesPzs); + if (object.messageRetentionDuration != null) { + if (typeof object.messageRetentionDuration !== "object") + throw TypeError(".google.pubsub.v1.Topic.messageRetentionDuration: object expected"); + message.messageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.messageRetentionDuration); + } return message; }; @@ -1130,6 +1154,7 @@ object.kmsKeyName = ""; object.schemaSettings = null; object.satisfiesPzs = false; + object.messageRetentionDuration = null; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -1147,6 +1172,8 @@ object.schemaSettings = $root.google.pubsub.v1.SchemaSettings.toObject(message.schemaSettings, options); if (message.satisfiesPzs != null && message.hasOwnProperty("satisfiesPzs")) object.satisfiesPzs = message.satisfiesPzs; + if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) + object.messageRetentionDuration = $root.google.protobuf.Duration.toObject(message.messageRetentionDuration, options); return object; }; @@ -4826,6 +4853,7 @@ * @property {google.pubsub.v1.IDeadLetterPolicy|null} [deadLetterPolicy] Subscription deadLetterPolicy * @property {google.pubsub.v1.IRetryPolicy|null} [retryPolicy] Subscription retryPolicy * @property {boolean|null} [detached] Subscription detached + * @property {google.protobuf.IDuration|null} [topicMessageRetentionDuration] Subscription topicMessageRetentionDuration */ /** @@ -4948,6 +4976,14 @@ */ Subscription.prototype.detached = false; + /** + * Subscription topicMessageRetentionDuration. + * @member {google.protobuf.IDuration|null|undefined} topicMessageRetentionDuration + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.topicMessageRetentionDuration = null; + /** * Creates a new Subscription instance using the specified properties. * @function create @@ -4999,6 +5035,8 @@ $root.google.pubsub.v1.RetryPolicy.encode(message.retryPolicy, writer.uint32(/* id 14, wireType 2 =*/114).fork()).ldelim(); if (message.detached != null && Object.hasOwnProperty.call(message, "detached")) writer.uint32(/* id 15, wireType 0 =*/120).bool(message.detached); + if (message.topicMessageRetentionDuration != null && Object.hasOwnProperty.call(message, "topicMessageRetentionDuration")) + $root.google.protobuf.Duration.encode(message.topicMessageRetentionDuration, writer.uint32(/* id 17, wireType 2 =*/138).fork()).ldelim(); return writer; }; @@ -5091,6 +5129,9 @@ case 15: message.detached = reader.bool(); break; + case 17: + message.topicMessageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; default: reader.skipType(tag & 7); break; @@ -5180,6 +5221,11 @@ if (message.detached != null && message.hasOwnProperty("detached")) if (typeof message.detached !== "boolean") return "detached: boolean expected"; + if (message.topicMessageRetentionDuration != null && message.hasOwnProperty("topicMessageRetentionDuration")) { + var error = $root.google.protobuf.Duration.verify(message.topicMessageRetentionDuration); + if (error) + return "topicMessageRetentionDuration." + error; + } return null; }; @@ -5241,6 +5287,11 @@ } if (object.detached != null) message.detached = Boolean(object.detached); + if (object.topicMessageRetentionDuration != null) { + if (typeof object.topicMessageRetentionDuration !== "object") + throw TypeError(".google.pubsub.v1.Subscription.topicMessageRetentionDuration: object expected"); + message.topicMessageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.topicMessageRetentionDuration); + } return message; }; @@ -5272,6 +5323,7 @@ object.deadLetterPolicy = null; object.retryPolicy = null; object.detached = false; + object.topicMessageRetentionDuration = null; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -5303,6 +5355,8 @@ object.retryPolicy = $root.google.pubsub.v1.RetryPolicy.toObject(message.retryPolicy, options); if (message.detached != null && message.hasOwnProperty("detached")) object.detached = message.detached; + if (message.topicMessageRetentionDuration != null && message.hasOwnProperty("topicMessageRetentionDuration")) + object.topicMessageRetentionDuration = $root.google.protobuf.Duration.toObject(message.topicMessageRetentionDuration, options); return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 1de6e50a12a..6d3bc635ff3 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -242,6 +242,10 @@ "satisfiesPzs": { "type": "bool", "id": 7 + }, + "messageRetentionDuration": { + "type": "google.protobuf.Duration", + "id": 8 } } }, @@ -816,6 +820,13 @@ "detached": { "type": "bool", "id": 15 + }, + "topicMessageRetentionDuration": { + "type": "google.protobuf.Duration", + "id": 17, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } } } }, diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index b41a83c6be1..3216dd457e5 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -422,6 +422,15 @@ export class PublisherClient { * @param {boolean} request.satisfiesPzs * Reserved for future use. This field is set only in responses from the * server; it is ignored if it is set in any requests. + * @param {google.protobuf.Duration} request.messageRetentionDuration + * Indicates the minimum duration to retain a message after it is published to + * the topic. If this field is set, messages published to the topic in the + * last `message_retention_duration` are always available to subscribers. For + * instance, it allows any attached subscription to [seek to a + * timestamp](https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) + * that is up to `message_retention_duration` in the past. If this field is + * not set, message retention is controlled by settings on individual + * subscriptions. Cannot be more than 7 days or less than 10 minutes. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 31ed465e454..8486f1a3df2 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -441,8 +441,9 @@ export class SubscriberClient { * Indicates whether to retain acknowledged messages. If true, then * messages are not expunged from the subscription's backlog, even if they are * acknowledged, until they fall out of the `message_retention_duration` - * window. This must be true if you would like to [Seek to a timestamp] - * (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time). + * window. This must be true if you would like to [`Seek` to a timestamp] + * (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) in + * the past to replay previously-acknowledged messages. * @param {google.protobuf.Duration} request.messageRetentionDuration * How long to retain unacknowledged messages in the subscription's backlog, * from the moment a message is published. @@ -494,6 +495,13 @@ export class SubscriberClient { * backlog. `Pull` and `StreamingPull` requests will return * FAILED_PRECONDITION. If the subscription is a push subscription, pushes to * the endpoint will not be made. + * @param {google.protobuf.Duration} request.topicMessageRetentionDuration + * Output only. Indicates the minimum duration for which a message is retained + * after it is published to the subscription's topic. If this field is set, + * messages published to the subscription's topic in the last + * `topic_message_retention_duration` are always available to subscribers. See + * the `message_retention_duration` field in `Topic`. This field is set only + * in responses from the server; it is ignored if it is set in any requests. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. From 75d708f3b15d338c8e37d707aa18310a00a955a6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 16:22:13 +0000 Subject: [PATCH 0779/1115] chore: release 2.16.3 (#1376) :robot: I have created a release \*beep\* \*boop\* --- ### [2.16.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.2...v2.16.3) (2021-08-11) ### Bug Fixes * **pubsub:** replace IAMPolicy in API config ([#1373](https://www.github.com/googleapis/nodejs-pubsub/issues/1373)) ([435a181](https://www.github.com/googleapis/nodejs-pubsub/commit/435a18110fdefb6964b331047a9ac536d758d1d3)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index ea1863e9ff4..d15da5584d4 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.16.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.2...v2.16.3) (2021-08-11) + + +### Bug Fixes + +* **pubsub:** replace IAMPolicy in API config ([#1373](https://www.github.com/googleapis/nodejs-pubsub/issues/1373)) ([435a181](https://www.github.com/googleapis/nodejs-pubsub/commit/435a18110fdefb6964b331047a9ac536d758d1d3)) + ### [2.16.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.1...v2.16.2) (2021-08-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a6703b37c63..088043d14d3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.16.2", + "version": "2.16.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 99623dfedb083ff3f057d23735f67b44c794f6cc Mon Sep 17 00:00:00 2001 From: "Benjamin E. Coe" Date: Mon, 16 Aug 2021 22:44:22 -0400 Subject: [PATCH 0780/1115] fix(deps): google-gax v2.24.1 (#1377) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 088043d14d3..1457ad7ae60 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "^2.17.1", + "google-gax": "^2.24.1", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From adbb31a8716c948e62fbf26678661522560f7b9c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 17 Aug 2021 03:30:39 +0000 Subject: [PATCH 0781/1115] chore: release 2.16.4 (#1378) :robot: I have created a release \*beep\* \*boop\* --- ### [2.16.4](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.3...v2.16.4) (2021-08-17) ### Bug Fixes * **deps:** google-gax v2.24.1 ([#1377](https://www.github.com/googleapis/nodejs-pubsub/issues/1377)) ([16a1eff](https://www.github.com/googleapis/nodejs-pubsub/commit/16a1eff34897567efa5f2116562e36325edce019)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index d15da5584d4..ce4c0bbb6fd 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.16.4](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.3...v2.16.4) (2021-08-17) + + +### Bug Fixes + +* **deps:** google-gax v2.24.1 ([#1377](https://www.github.com/googleapis/nodejs-pubsub/issues/1377)) ([16a1eff](https://www.github.com/googleapis/nodejs-pubsub/commit/16a1eff34897567efa5f2116562e36325edce019)) + ### [2.16.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.2...v2.16.3) (2021-08-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1457ad7ae60..e3560fc79c6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.16.3", + "version": "2.16.4", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 59fa933cebe0fb4210634cad177336e7d892f36d Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 18 Aug 2021 16:14:24 -0400 Subject: [PATCH 0782/1115] fix: export publish and subscribe options (#1371) Fixes https://github.com/googleapis/nodejs-pubsub/issues/1227 Some of the options objects that are passed down deep don't have all of the types exposed, so users of TypeScript can't set them gracefully. --- handwritten/pubsub/src/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 585bfb99b66..6b26c57fc4f 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -90,7 +90,8 @@ export { TestIamPermissionsCallback, IAM, } from './iam'; -export {Attributes, PublishCallback} from './publisher'; +export {Attributes, PublishCallback, PublishOptions} from './publisher'; +export {BatchPublishOptions} from './publisher/message-batch'; export {PublishError} from './publisher/publish-error'; export { PageOptions, @@ -114,7 +115,7 @@ export { SeekResponse, Snapshot, } from './snapshot'; -export {Message} from './subscriber'; +export {Message, SubscriberOptions} from './subscriber'; export { Schema, CreateSchemaResponse, From 6f53e7fb205d2a487465a6a1798b95b25c05dd1e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 20:28:27 +0000 Subject: [PATCH 0783/1115] chore: release 2.16.5 (#1379) :robot: I have created a release \*beep\* \*boop\* --- ### [2.16.5](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.4...v2.16.5) (2021-08-18) ### Bug Fixes * export publish and subscribe options ([#1371](https://www.github.com/googleapis/nodejs-pubsub/issues/1371)) ([c37e0fd](https://www.github.com/googleapis/nodejs-pubsub/commit/c37e0fd5ee8864597241623e19ec495b5b99d5c3)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index ce4c0bbb6fd..c1b78de8d22 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.16.5](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.4...v2.16.5) (2021-08-18) + + +### Bug Fixes + +* export publish and subscribe options ([#1371](https://www.github.com/googleapis/nodejs-pubsub/issues/1371)) ([c37e0fd](https://www.github.com/googleapis/nodejs-pubsub/commit/c37e0fd5ee8864597241623e19ec495b5b99d5c3)) + ### [2.16.4](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.3...v2.16.4) (2021-08-17) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e3560fc79c6..97e80f684c3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.16.4", + "version": "2.16.5", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 7a7dc42f5e65c95aa494034e9b4a96a8b1e667c9 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 18 Aug 2021 22:08:25 -0400 Subject: [PATCH 0784/1115] fix: don't require a `data` attribute to be passed when sending a message (#1370) Fixes https://github.com/googleapis/nodejs-pubsub/issues/1363 We chatted about this and came to the conclusion that the Node library is probably just wrong here. --- handwritten/pubsub/src/publisher/index.ts | 14 ++++++++++++-- handwritten/pubsub/test/publisher/index.ts | 12 ++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index ef169e086f7..3378e16a4ec 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -154,11 +154,21 @@ export class Publisher { publishMessage(message: PubsubMessage, callback: PublishCallback): void { const {data, attributes = {}} = message; - if (!(data instanceof Buffer)) { + // We must have at least one of: + // - `data` as a Buffer + // - `attributes` that are not empty + if (data && !(data instanceof Buffer)) { throw new TypeError('Data must be in the form of a Buffer.'); } - for (const key of Object.keys(attributes!)) { + const keys = Object.keys(attributes!); + if (!data && keys.length === 0) { + throw new TypeError( + 'If data is undefined, at least one attribute must be present.' + ); + } + + for (const key of keys) { const value = attributes![key]; if (typeof value !== 'string') { throw new TypeError(`All attributes must be in the form of a string. diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 4d410e0ead6..04319b8e537 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -243,6 +243,18 @@ describe('Publisher', () => { ); }); + it('should throw an error if data and attributes are both empty', () => { + assert.throws( + () => publisher.publishMessage({}, spy), + /at least one attribute must be present/ + ); + }); + + it('should allow sending only attributes', () => { + const attributes = {foo: 'bar'} as {}; + assert.doesNotThrow(() => publisher.publishMessage({attributes}, spy)); + }); + it('should throw an error if attributes are wrong format', () => { const attributes = {foo: {bar: 'baz'}} as {}; From 75cbab3cedabbc7ce0e0f316465ab08ce97ff558 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 02:20:29 +0000 Subject: [PATCH 0785/1115] chore: release 2.16.6 (#1381) :robot: I have created a release \*beep\* \*boop\* --- ### [2.16.6](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.5...v2.16.6) (2021-08-19) ### Bug Fixes * don't require a `data` attribute to be passed when sending a message ([#1370](https://www.github.com/googleapis/nodejs-pubsub/issues/1370)) ([97fd4f0](https://www.github.com/googleapis/nodejs-pubsub/commit/97fd4f041c195e0388b0613b2cf9710b89ab4e15)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c1b78de8d22..274d41df626 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.16.6](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.5...v2.16.6) (2021-08-19) + + +### Bug Fixes + +* don't require a `data` attribute to be passed when sending a message ([#1370](https://www.github.com/googleapis/nodejs-pubsub/issues/1370)) ([97fd4f0](https://www.github.com/googleapis/nodejs-pubsub/commit/97fd4f041c195e0388b0613b2cf9710b89ab4e15)) + ### [2.16.5](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.4...v2.16.5) (2021-08-18) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 97e80f684c3..d2eafb37332 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.16.5", + "version": "2.16.6", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 4974b6092afeae1f52ff8c097aff3263c50b8dd9 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 18:30:23 +0000 Subject: [PATCH 0786/1115] feat: turns on self-signed JWT feature flag (#1382) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 392067151 Source-Link: https://github.com/googleapis/googleapis/commit/06345f7b95c4b4a3ffe4303f1f2984ccc304b2e0 Source-Link: https://github.com/googleapis/googleapis-gen/commit/95882b37970e41e4cd51b22fa507cfd46dc7c4b6 --- handwritten/pubsub/src/v1/publisher_client.ts | 7 +++++++ handwritten/pubsub/src/v1/schema_service_client.ts | 7 +++++++ handwritten/pubsub/src/v1/subscriber_client.ts | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 3216dd457e5..7895eed1665 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -135,6 +135,12 @@ export class PublisherClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + // Set useJWTAccessWithScope on the auth object. + this.auth.useJWTAccessWithScope = true; + + // Set defaultServicePath on the auth object. + this.auth.defaultServicePath = staticMembers.servicePath; + // Set the default scopes in auth client if needed. if (servicePath === staticMembers.servicePath) { this.auth.defaultScopes = staticMembers.scopes; @@ -1838,6 +1844,7 @@ export class PublisherClient { return this.publisherStub!.then(stub => { this._terminated = true; stub.close(); + this.iamClient.close(); }); } return Promise.resolve(); diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 03fbb27f086..9a13c78bfb0 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -134,6 +134,12 @@ export class SchemaServiceClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + // Set useJWTAccessWithScope on the auth object. + this.auth.useJWTAccessWithScope = true; + + // Set defaultServicePath on the auth object. + this.auth.defaultServicePath = staticMembers.servicePath; + // Set the default scopes in auth client if needed. if (servicePath === staticMembers.servicePath) { this.auth.defaultScopes = staticMembers.scopes; @@ -1311,6 +1317,7 @@ export class SchemaServiceClient { return this.schemaServiceStub!.then(stub => { this._terminated = true; stub.close(); + this.iamClient.close(); }); } return Promise.resolve(); diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 8486f1a3df2..f7dd6149749 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -136,6 +136,12 @@ export class SubscriberClient { // Save the auth object to the client, for use by other methods. this.auth = this._gaxGrpc.auth as gax.GoogleAuth; + // Set useJWTAccessWithScope on the auth object. + this.auth.useJWTAccessWithScope = true; + + // Set defaultServicePath on the auth object. + this.auth.defaultServicePath = staticMembers.servicePath; + // Set the default scopes in auth client if needed. if (servicePath === staticMembers.servicePath) { this.auth.defaultScopes = staticMembers.scopes; @@ -2435,6 +2441,7 @@ export class SubscriberClient { return this.subscriberStub!.then(stub => { this._terminated = true; stub.close(); + this.iamClient.close(); }); } return Promise.resolve(); From 87ac471408129c5bea9f95cc1c47ed26af482243 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 25 Aug 2021 16:08:28 -0400 Subject: [PATCH 0787/1115] fix(build): move branch references to main (#1174) (#1386) Replaces broken PR https://github.com/googleapis/nodejs-pubsub/pull/1368 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- .../pubsub/.github/generated-files-bot.yml | 4 +- .../.kokoro/continuous/node10/common.cfg | 2 +- .../pubsub/.kokoro/continuous/node10/test.cfg | 2 +- .../.kokoro/presubmit/node10/common.cfg | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- handwritten/pubsub/README.md | 106 +++++++++--------- 9 files changed, 62 insertions(+), 62 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 9b2b9550d5e..144aa60c7d4 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:6245a5be4c0406d9b2f04f380d8b88ffe4655df3cdbb57626f8913e8d620f4dd + digest: sha256:72ff93409133b0cf277b8870f859e1ddde62d2e329f655311d4bfc16735d182e diff --git a/handwritten/pubsub/.github/generated-files-bot.yml b/handwritten/pubsub/.github/generated-files-bot.yml index 7bb7ce54c58..992ccef4a13 100644 --- a/handwritten/pubsub/.github/generated-files-bot.yml +++ b/handwritten/pubsub/.github/generated-files-bot.yml @@ -8,9 +8,9 @@ generatedFiles: - path: '.github/generated-files-bot.+(yml|yaml)' message: '`.github/generated-files-bot.(yml|yaml)` should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' - path: 'README.md' - message: '`README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/master/.readme-partials.yaml' + message: '`README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/main/.readme-partials.yaml' - path: 'samples/README.md' - message: '`samples/README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/master/.readme-partials.yaml' + message: '`samples/README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/main/.readme-partials.yaml' ignoreAuthors: - 'gcf-owl-bot[bot]' - 'yoshi-automation' diff --git a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg index a52f5a1240d..894795cb4d4 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg @@ -7,7 +7,7 @@ action { } } -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token before_action { fetch_keystore { keystore_resource { diff --git a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg index 468b8c7197a..609c0cf0a27 100644 --- a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg @@ -1,4 +1,4 @@ -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token before_action { fetch_keystore { keystore_resource { diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg index a52f5a1240d..894795cb4d4 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg @@ -7,7 +7,7 @@ action { } } -# Bring in codecov.io master token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token +# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token before_action { fetch_keystore { keystore_resource { diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 950f8483428..f249d3e4a2e 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -39,7 +39,7 @@ if [ -f samples/package.json ]; then npm link ../ npm install cd .. - # If tests are running against master, configure flakybot + # If tests are running against main branch, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 319d1e0eda8..0a840452084 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -33,7 +33,7 @@ fi npm install -# If tests are running against master, configure flakybot +# If tests are running against main branch, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index b5646aeb628..af1ce7e33ca 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -21,7 +21,7 @@ export NPM_CONFIG_PREFIX=${HOME}/.npm-global cd $(dirname $0)/.. npm install -# If tests are running against master, configure flakybot +# If tests are running against main branch, configure flakybot # to open issues on failures: if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]] || [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"nightly"* ]]; then export MOCHA_REPORTER_OUTPUT=test_output_sponge_log.xml diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index e09456b38de..c3cf99997a3 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -6,7 +6,7 @@ [![release level](https://img.shields.io/badge/release%20level-general%20availability%20%28GA%29-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.org/package/@google-cloud/pubsub) -[![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-pubsub/master.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-pubsub) +[![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-pubsub/main.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-pubsub) @@ -23,7 +23,7 @@ guides. A comprehensive list of changes in each version may be found in -[the CHANGELOG](https://github.com/googleapis/nodejs-pubsub/blob/master/CHANGELOG.md). +[the CHANGELOG](https://github.com/googleapis/nodejs-pubsub/blob/main/CHANGELOG.md). * [Google Cloud Pub/Sub Node.js Client API Reference][client-docs] * [Google Cloud Pub/Sub Documentation][product-docs] @@ -120,56 +120,56 @@ To configure `@google-cloud/pubsub` to use an alternative `grpc` transport: ## Samples -Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree/master/samples) directory. Each sample's `README.md` has instructions for running its sample. +Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree/main/samples) directory. Each sample's `README.md` has instructions for running its sample. | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | -| Create an Avro based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/createAvroSchema.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/createAvroSchema.js,samples/README.md) | -| Create a Proto based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/createProtoSchema.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/createProtoSchema.js,samples/README.md) | -| Create Push Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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/master/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 Subscription with ordering enabled | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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) | -| Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | -| Delete a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteSchema.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/deleteSchema.js,samples/README.md) | -| Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | -| Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | -| Detach Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/detachSubscription.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/detachSubscription.js,samples/README.md) | -| Get a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSchema.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/getSchema.js,samples/README.md) | -| Get Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSubscription.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/getSubscription.js,samples/README.md) | -| Get Subscription Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getSubscriptionPolicy.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/getSubscriptionPolicy.js,samples/README.md) | -| Get Topic Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/getTopicPolicy.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/getTopicPolicy.js,samples/README.md) | -| List All Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listAllTopics.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/listAllTopics.js,samples/README.md) | -| List schemas on a project | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listSchemas.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/listSchemas.js,samples/README.md) | -| List Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listSubscriptions.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/listSubscriptions.js,samples/README.md) | -| List Subscriptions On a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/listTopicSubscriptions.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/listTopicSubscriptions.js,samples/README.md) | -| Listen For Avro Records | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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/master/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 For Protobuf Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/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/master/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/master/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) | -| OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/openTelemetryTracing.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/openTelemetryTracing.js,samples/README.md) | -| Publish Avro Records to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishAvroRecords.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/publishAvroRecords.js,samples/README.md) | -| Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | -| Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessage.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/publishMessage.js,samples/README.md) | -| Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | -| Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | -| Publish Protobuf Messages to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishProtobufMessages.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/publishProtobufMessages.js,samples/README.md) | -| Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | -| Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/quickstart.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/quickstart.js,samples/README.md) | -| Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | -| Resume Publish | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/resumePublish.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/resumePublish.js,samples/README.md) | -| Set Subscription IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setSubscriptionPolicy.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/setSubscriptionPolicy.js,samples/README.md) | -| Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | -| Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | -| Synchronous Pull | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPull.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/synchronousPull.js,samples/README.md) | -| Synchronous Pull with delivery attempt. | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPullWithDeliveryAttempts.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/synchronousPullWithDeliveryAttempts.js,samples/README.md) | -| Synchronous Pull With Lease Management | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/synchronousPullWithLeaseManagement.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/synchronousPullWithLeaseManagement.js,samples/README.md) | -| Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | -| Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | -| Update Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/master/samples/updateDeadLetterPolicy.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/updateDeadLetterPolicy.js,samples/README.md) | +| Create an Avro based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createAvroSchema.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/createAvroSchema.js,samples/README.md) | +| Create a Proto based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createProtoSchema.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/createProtoSchema.js,samples/README.md) | +| 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 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) | +| Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | +| Delete a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchema.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/deleteSchema.js,samples/README.md) | +| Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | +| Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | +| Detach Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/detachSubscription.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/detachSubscription.js,samples/README.md) | +| Get a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSchema.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/getSchema.js,samples/README.md) | +| Get Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSubscription.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/getSubscription.js,samples/README.md) | +| Get Subscription Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSubscriptionPolicy.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/getSubscriptionPolicy.js,samples/README.md) | +| Get Topic Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getTopicPolicy.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/getTopicPolicy.js,samples/README.md) | +| List All Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listAllTopics.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/listAllTopics.js,samples/README.md) | +| List schemas on a project | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSchemas.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/listSchemas.js,samples/README.md) | +| List Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSubscriptions.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/listSubscriptions.js,samples/README.md) | +| List Subscriptions On a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listTopicSubscriptions.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/listTopicSubscriptions.js,samples/README.md) | +| 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 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) | +| OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/openTelemetryTracing.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/openTelemetryTracing.js,samples/README.md) | +| Publish Avro Records to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishAvroRecords.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/publishAvroRecords.js,samples/README.md) | +| Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | +| Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessage.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/publishMessage.js,samples/README.md) | +| Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | +| Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | +| Publish Protobuf Messages to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishProtobufMessages.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/publishProtobufMessages.js,samples/README.md) | +| Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | +| Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/quickstart.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/quickstart.js,samples/README.md) | +| Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | +| Resume Publish | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/resumePublish.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/resumePublish.js,samples/README.md) | +| Set Subscription IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/setSubscriptionPolicy.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/setSubscriptionPolicy.js,samples/README.md) | +| Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | +| Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | +| Synchronous Pull | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPull.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/synchronousPull.js,samples/README.md) | +| Synchronous Pull with delivery attempt. | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPullWithDeliveryAttempts.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/synchronousPullWithDeliveryAttempts.js,samples/README.md) | +| Synchronous Pull With Lease Management | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPullWithLeaseManagement.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/synchronousPullWithLeaseManagement.js,samples/README.md) | +| Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | +| Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | +| Update Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateDeadLetterPolicy.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/updateDeadLetterPolicy.js,samples/README.md) | @@ -218,19 +218,19 @@ More Information: [Google Cloud Platform Launch Stages][launch_stages] ## Contributing -Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-pubsub/blob/master/CONTRIBUTING.md). +Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-pubsub/blob/main/CONTRIBUTING.md). Please note that this `README.md`, the `samples/README.md`, and a variety of configuration files in this repository (including `.nycrc` and `tsconfig.json`) are generated from a central template. To edit one of these files, make an edit -to its template in this -[directory](https://github.com/googleapis/synthtool/tree/master/synthtool/gcp/templates/node_library). +to its templates in +[directory](https://github.com/googleapis/synthtool). ## License Apache Version 2.0 -See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) +See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/main/LICENSE) [client-docs]: https://cloud.google.com/nodejs/docs/reference/pubsub/latest [product-docs]: https://cloud.google.com/pubsub/docs/ From 7060052a2dc593027e8058d78ecaadf6f2a0a13d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 25 Aug 2021 16:33:38 -0400 Subject: [PATCH 0788/1115] chore: release 2.17.0 (#1383) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 274d41df626..62638ca5f8a 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.17.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.6...v2.17.0) (2021-08-25) + + +### Features + +* turns on self-signed JWT feature flag ([#1382](https://www.github.com/googleapis/nodejs-pubsub/issues/1382)) ([e8b4922](https://www.github.com/googleapis/nodejs-pubsub/commit/e8b49228cffd8016be12ab607363136c2f27c593)) + + +### Bug Fixes + +* **build:** move branch references to main ([#1174](https://www.github.com/googleapis/nodejs-pubsub/issues/1174)) ([#1386](https://www.github.com/googleapis/nodejs-pubsub/issues/1386)) ([16b710a](https://www.github.com/googleapis/nodejs-pubsub/commit/16b710aae29575b9108215479080a8d6c3dad654)) + ### [2.16.6](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.5...v2.16.6) (2021-08-19) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d2eafb37332..b3e6b994d79 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.16.6", + "version": "2.17.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From e889ff877e73f32b6596fc476c1e8d8ad6a06fc2 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 25 Aug 2021 23:50:28 +0000 Subject: [PATCH 0789/1115] chore: disable renovate dependency dashboard (#1194) (#1388) --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 144aa60c7d4..c45b239314f 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:72ff93409133b0cf277b8870f859e1ddde62d2e329f655311d4bfc16735d182e + digest: sha256:667a9e46a9aa5b80240ad164d55ac33bc9d6780b5ef42f125a41f0ad95bc1950 From b6f967878235da0f0c25cde6724d23f13670b071 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 22:18:55 +0000 Subject: [PATCH 0790/1115] build: enable release-trigger bot (#1212) (#1390) --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.github/release-trigger.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 handwritten/pubsub/.github/release-trigger.yml diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index c45b239314f..73bbf7d3210 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-nodejs:latest - digest: sha256:667a9e46a9aa5b80240ad164d55ac33bc9d6780b5ef42f125a41f0ad95bc1950 + digest: sha256:111973c0da7608bf1e60d070e5449d48826c385a6b92a56cb9203f1725d33c3d diff --git a/handwritten/pubsub/.github/release-trigger.yml b/handwritten/pubsub/.github/release-trigger.yml new file mode 100644 index 00000000000..d4ca94189e1 --- /dev/null +++ b/handwritten/pubsub/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true From 70c5b29154186210e06c0e6403ba454e626e74bb Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 16 Sep 2021 21:08:12 -0400 Subject: [PATCH 0791/1115] feat: add publisher side flow control (#1359) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add publisher flow control library support * chore: exorcise promisifyAll() from the rest of the library * feat: finish up working publisher side flow control in the library itself * feat: another pass at the flow control support in the library * chore: water the linters * tests: add a test for the new sample * fix: updates from code reviews and merges from other PRs * fix: shift from deferredCatch() to PublishWhenReadyOptions * tests: update unit tests * build: pin typescript to 4.3.x for generated samples (4.4 breaks catch types) * samples: add sample for publisher flow control, and a test for the sample * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * docs: revert "🦉 Updates from OwlBot" because it's not in `main` yet This reverts commit 3ce3f637ef0dfaa579edcf109a4fd4cf8f8efc31. * fix: renamed a few flow control things in response to API feedback * tests: remove all messages from the test subscription after testing publishWithFlowControl * feat: redo publisher flow control API, once more with feeling * lint: fix a nit * samples: update publisher flow control sample, js flavour * chore: updates from CI results and self-review * chore: fixes from comments on the PR Co-authored-by: Owl Bot --- handwritten/pubsub/src/iam.ts | 13 +- handwritten/pubsub/src/index.ts | 1 + .../pubsub/src/publisher/flow-control.ts | 191 ++++++++++++++++++ .../pubsub/src/publisher/flow-publisher.ts | 137 +++++++++++++ handwritten/pubsub/src/publisher/index.ts | 59 ++++-- .../pubsub/src/publisher/message-batch.ts | 7 +- .../pubsub/src/publisher/message-queues.ts | 1 + .../pubsub/src/publisher/pubsub-message.ts | 81 ++++++++ handwritten/pubsub/src/snapshot.ts | 9 +- handwritten/pubsub/src/subscription.ts | 18 +- handwritten/pubsub/src/topic.ts | 48 +++-- handwritten/pubsub/src/util.ts | 7 +- handwritten/pubsub/test/iam.ts | 24 ++- .../pubsub/test/publisher/flow-control.ts | 107 ++++++++++ .../pubsub/test/publisher/flow-publisher.ts | 132 ++++++++++++ handwritten/pubsub/test/publisher/index.ts | 68 ++++--- .../pubsub/test/publisher/message-batch.ts | 40 ++-- .../pubsub/test/publisher/message-queues.ts | 8 +- .../pubsub/test/publisher/pubsub-message.ts | 73 +++++++ handwritten/pubsub/test/pubsub.ts | 1 - handwritten/pubsub/test/snapshot.ts | 29 ++- handwritten/pubsub/test/subscription.ts | 54 +++-- handwritten/pubsub/test/topic.ts | 48 +++-- 23 files changed, 1010 insertions(+), 146 deletions(-) create mode 100644 handwritten/pubsub/src/publisher/flow-control.ts create mode 100644 handwritten/pubsub/src/publisher/flow-publisher.ts create mode 100644 handwritten/pubsub/src/publisher/pubsub-message.ts create mode 100644 handwritten/pubsub/test/publisher/flow-control.ts create mode 100644 handwritten/pubsub/test/publisher/flow-publisher.ts create mode 100644 handwritten/pubsub/test/publisher/pubsub-message.ts diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 505a10783e4..4b1bc194569 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -18,13 +18,13 @@ * @module pubsub/iam */ -import {promisifyAll} from '@google-cloud/promisify'; import arrify = require('arrify'); import {CallOptions, IamProtos} from 'google-gax'; import {google} from '../protos/protos'; import {Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; +import {promisifySome} from './util'; export type Policy = { etag?: string | Buffer; @@ -393,7 +393,12 @@ export class IAM { /*! Developer Documentation * - * All async methods (except for streams) will return a Promise in the event - * that a callback is omitted. + * Existing async methods (except for streams) will return a Promise in the event + * that a callback is omitted. Future methods will not allow for a callback. + * (Use .then() on the returned Promise instead.) */ -promisifyAll(IAM); +promisifySome(IAM, IAM.prototype, [ + 'getPolicy', + 'setPolicy', + 'testPermissions', +]); diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 6b26c57fc4f..a0094d6ce1c 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -93,6 +93,7 @@ export { export {Attributes, PublishCallback, PublishOptions} from './publisher'; export {BatchPublishOptions} from './publisher/message-batch'; export {PublishError} from './publisher/publish-error'; +export {FlowControlOptions} from './publisher/flow-control'; export { PageOptions, GetSnapshotsCallback, diff --git a/handwritten/pubsub/src/publisher/flow-control.ts b/handwritten/pubsub/src/publisher/flow-control.ts new file mode 100644 index 00000000000..ee467e32988 --- /dev/null +++ b/handwritten/pubsub/src/publisher/flow-control.ts @@ -0,0 +1,191 @@ +/*! + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as defer from 'p-defer'; + +/** + * @typedef FlowControlOptions + * @property {number} [maxOutstandingMessages] The maximum number of messages to + * buffer before publisher flow control kicks in. + * @property {number} [maxOutstandingBytes] The maximum number of bytes to buffer + * before publisher flow control kicks in. + */ +export interface FlowControlOptions { + maxOutstandingMessages?: number; + maxOutstandingBytes?: number; +} + +// Represents a publish request. This details how big the request is, and +// how to let it proceed. +interface QueuedPromise { + promise: Promise; + resolve: () => void; + reject: () => void; + + bytes: number; + messageCount: number; +} + +/** + * Manages flow control handling for max bytes and messages. + * + * Do not use this class externally, it may change without warning. + * @private + * + */ +export class FlowControl { + options: FlowControlOptions = {}; + private bytes: number; + private messages: number; + private requests: QueuedPromise[]; + + constructor(options: FlowControlOptions) { + this.setOptions(options); + this.bytes = this.messages = 0; + this.requests = []; + } + + /** + * Update our options after the fact. + * + * Do not use externally, it may change without warning. + * @private + */ + setOptions(options: FlowControlOptions) { + this.options = options; + + if ( + this.options.maxOutstandingBytes === 0 || + this.options.maxOutstandingMessages === 0 + ) { + // Undefined is okay, but if either is zero, no publishes ever happen. + throw new Error( + 'When using publisher flow control, maxOutstandingBytes and maxOutstandingMessages must not be zero' + ); + } + } + + /** + * @returns {number} The number of bytes that are queued up. + */ + get currentByteCount(): number { + return this.bytes; + } + + /** + * @returns {number} The number of messages that are queued up. + */ + get currentMessageCount(): number { + return this.messages; + } + + /** + * Adds the specified number of bytes or messages to our count. We'll + * assume that this is end running around our queueing mechanisms. + * + * @param {number} bytes The number of bytes to add to the count. + * @param {number} messages The number of messages to add to the count. + */ + addToCount(bytes: number, messages: number): void { + this.bytes += bytes; + this.messages += messages; + } + + /** + * Attempts to queue the specified number of bytes and messages. If + * there are too many things in the publisher flow control queue + * already, we will defer and come back to it. + * + * Do not use externally, it may change without warning. + * @private + */ + async willSend(bytes: number, messages: number): Promise { + // Add this to our queue size. + this.bytes += bytes; + this.messages += messages; + + // If this request won't fit, we have to put it in the queue. + if (this.exceeded()) { + const promise = defer(); + this.requests.push({ + promise: promise.promise, + resolve: promise.resolve, + reject: promise.reject, + bytes, + messageCount: messages, + }); + + // This will pass through when someone else's this.sent() completes. + await promise.promise; + } + } + + /** + * Removes the specified number of bytes and messages from our queued + * counts, after a deferred request was released. If there is enough + * space. + * + * Do not use externally, it may change without warning. + * @private + */ + sent(bytes: number, messages: number) { + this.bytes -= bytes; + this.messages -= messages; + + // This shouldn't happen, but just be sure. + if (this.bytes < 0) this.bytes = 0; + if (this.messages < 0) this.messages = 0; + + // Let things waiting on willSend() have a go, if there's space. + if (this.requests.length > 0 && !this.exceeded()) { + const next = this.requests.shift()!; + next.resolve(); + } + } + + // Just uses wouldExceed() to see if we've already exceeded the limits. + private exceeded(): boolean { + return this.wouldExceed(0, 0); + } + + /** + * Returns true if adding the specified number of bytes or messages + * would exceed limits imposed by configuration. + * + * Do not use externally, it may change without warning. + * @private + */ + wouldExceed(bytes: number, messages: number): boolean { + const totalBytes = this.bytes + bytes; + const totalMessages = this.messages + messages; + + if ( + this.options.maxOutstandingBytes !== undefined && + totalBytes > this.options.maxOutstandingBytes + ) { + return true; + } + + if ( + this.options.maxOutstandingMessages !== undefined && + totalMessages > this.options.maxOutstandingMessages + ) { + return true; + } + + return false; + } +} diff --git a/handwritten/pubsub/src/publisher/flow-publisher.ts b/handwritten/pubsub/src/publisher/flow-publisher.ts new file mode 100644 index 00000000000..c5c51f72593 --- /dev/null +++ b/handwritten/pubsub/src/publisher/flow-publisher.ts @@ -0,0 +1,137 @@ +/*! + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {Publisher} from '.'; +import {FlowControl} from './flow-control'; +import {PubsubMessage, calculateMessageSize} from './pubsub-message'; + +/** + * Encapsulates a series of message publishes from a rapid loop (or similar + * circumstance). + * + * This class is not meant to be instantiated outside of the `@google-cloud/pubsub` + * package. It is returned from {@link Topic#flowControlled}. Messages sent + * through an instance of this class will obey publisher flow control + * settings set through {@link PublisherOptions} on {@link Topic}, across + * all instances returned by {@link Topic#flowControlled} on that {@link Topic}. + */ +export class FlowControlledPublisher { + private publisher: Publisher; + private flowControl: FlowControl; + private idPromises: Promise[]; + + constructor(publisher: Publisher) { + this.publisher = publisher; + this.flowControl = this.publisher.flowControl; + this.idPromises = []; + } + + /** + * Returns true if sending the specified Buffer would result in exceeding the + * limits of the flow control settings. + * + * @param {PubsubMessage} message The data buffer with the message's contents. + * @returns {boolean} True if the message would exceed flow control limits. + */ + wouldExceed(message: PubsubMessage): boolean { + return this.flowControl.wouldExceed(calculateMessageSize(message), 1); + } + + /** + * Publishes a message, subject to flow control restrictions. + * + * If the message can be sent immediately, this will return `null`. Otherwise, + * it will return a Promise that resolves after it's okay to resume + * calling the method. + * + * @param {Buffer} [data] The message contents to be sent. + * @param {Attributes} [attributes] Optional attributes. + * @returns null, or a Promise that resolves when sending may resume. + * + * @example + * const wait = flowControlled.publish({data}); + * if (wait) { + * await wait; + * } + * + * @example + * // It's okay to await unconditionally, it's equivalent to nextTick(). + * await flowControlled.publish(data); + */ + publish(message: PubsubMessage): Promise | null { + const doPublish = () => { + this.doPublish(message); + }; + + const size = calculateMessageSize(message); + if (this.flowControl.wouldExceed(size, 1)) { + const waitPromise = this.flowControl.willSend(size, 1); + return waitPromise.then(doPublish); + } else { + this.flowControl.willSend(size, 1).then(() => {}); + doPublish(); + return null; + } + } + + /** + * Publishes a message unconditionally, updating flow control counters. + * + * You'll generally only want to use this if you want to deal with timing the + * flow control yourself, but you'd like the library to do the bean counting. + * + * @param {Buffer} [data] The message contents to be sent. + * @param {Attributes} [attributes] Optional attributes. + * + * @example + * if (!flowControlled.wouldExceed(data)) { + * flowControlled.publishNow(data); + * } + */ + publishNow(message: PubsubMessage): void { + this.flowControl.addToCount(calculateMessageSize(message), 1); + this.doPublish(message); + } + + private doPublish(message: PubsubMessage): void { + let idPromise = this.publisher.publishMessage(message); + + // This will defer but not eat any errors. + const publishDone = (id: string) => { + this.flowControl.sent(calculateMessageSize(message), 1); + return id; + }; + idPromise.catch(publishDone); + idPromise = idPromise.then(publishDone); + + this.idPromises.push(idPromise); + } + + /** + * Returns a Promise that will resolve to all of the currently sent + * message IDs (or reject if there is an error). This also clears + * out any currently sent messages, so the next call to `all()` will + * be a clean slate. + * + * @returns {Promise} A Promise that resolves when all current + * messages are sent. + */ + all(): Promise { + const allPromise = Promise.all(this.idPromises); + this.idPromises = []; + return allPromise; + } +} diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 3378e16a4ec..60a4668e2f2 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {promisify, promisifyAll} from '@google-cloud/promisify'; +import {promisify} from '@google-cloud/promisify'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; @@ -24,20 +24,20 @@ import {BatchPublishOptions} from './message-batch'; import {Queue, OrderedQueue} from './message-queues'; import {Topic} from '../topic'; import {RequestCallback, EmptyCallback} from '../pubsub'; -import {google} from '../../protos/protos'; import {defaultOptions} from '../default-options'; import {createSpan} from '../opentelemetry-tracing'; -export type PubsubMessage = google.pubsub.v1.IPubsubMessage; +import {FlowControl, FlowControlOptions} from './flow-control'; +import {promisifySome} from '../util'; -export interface Attributes { - [key: string]: string; -} +import {PubsubMessage, Attributes} from './pubsub-message'; +export {PubsubMessage, Attributes} from './pubsub-message'; export type PublishCallback = RequestCallback; export interface PublishOptions { batching?: BatchPublishOptions; + flowControlOptions?: FlowControlOptions; gaxOpts?: CallOptions; messageOrdering?: boolean; enableOpenTelemetryTracing?: boolean; @@ -47,6 +47,8 @@ export interface PublishOptions { * @typedef PublishOptions * @property {BatchPublishOptions} [batching] The maximum number of bytes to * buffer before sending a payload. + * @property {FlowControlOptions} [publisherFlowControl] Publisher-side flow + * control settings. If this is undefined, Ignore will be the assumed action. * @property {object} [gaxOpts] Request configuration options, outlined * {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html|here.} * @property {boolean} [messageOrdering] If true, messages published with the @@ -60,6 +62,11 @@ export const BATCH_LIMITS: BatchPublishOptions = { maxMessages: 1000, }; +export const flowControlDefaults: FlowControlOptions = { + maxOutstandingBytes: undefined, + maxOutstandingMessages: undefined, +}; + /** * A Publisher object allows you to publish messages to a specific topic. * @@ -76,7 +83,12 @@ export class Publisher { settings!: PublishOptions; queue: Queue; orderedQueues: Map; + flowControl: FlowControl; + constructor(topic: Topic, options?: PublishOptions) { + this.flowControl = new FlowControl( + options?.flowControlOptions || flowControlDefaults + ); this.setOptions(options); this.topic = topic; this.queue = new Queue(this); @@ -140,6 +152,9 @@ export class Publisher { callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; return this.publishMessage({data, attributes}, callback!); } + + publishMessage(message: PubsubMessage): Promise; + publishMessage(message: PubsubMessage, callback: PublishCallback): void; /** * Publish the provided message. * @@ -151,7 +166,10 @@ export class Publisher { * @param {PubsubMessage} [message] Options for this message. * @param {PublishCallback} [callback] Callback function. */ - publishMessage(message: PubsubMessage, callback: PublishCallback): void { + publishMessage( + message: PubsubMessage, + callback?: PublishCallback + ): Promise | void { const {data, attributes = {}} = message; // We must have at least one of: @@ -179,7 +197,7 @@ export class Publisher { const span: Span | undefined = this.constructSpan(message); if (!message.orderingKey) { - this.queue.add(message, callback); + this.queue.add(message, callback!); if (span) { span.end(); } @@ -195,12 +213,13 @@ export class Publisher { } const queue = this.orderedQueues.get(key)!; - queue.add(message, callback); + queue.add(message, callback!); if (span) { span.end(); } } + /** * Indicates to the publisher that it is safe to continue publishing for the * supplied ordering key. @@ -229,7 +248,7 @@ export class Publisher { */ getOptionDefaults(): PublishOptions { // Return a unique copy to avoid shenanigans. - const defaults = { + const defaults: PublishOptions = { batching: { maxBytes: defaultOptions.publish.maxOutstandingBytes, maxMessages: defaultOptions.publish.maxOutstandingMessages, @@ -240,6 +259,10 @@ export class Publisher { isBundling: false, }, enableOpenTelemetryTracing: false, + flowControlOptions: Object.assign( + {}, + flowControlDefaults + ) as FlowControlOptions, }; return defaults; @@ -255,8 +278,13 @@ export class Publisher { setOptions(options = {} as PublishOptions): void { const defaults = this.getOptionDefaults(); - const {batching, gaxOpts, messageOrdering, enableOpenTelemetryTracing} = - extend(true, defaults, options); + const { + batching, + gaxOpts, + messageOrdering, + enableOpenTelemetryTracing, + flowControlOptions, + } = extend(true, defaults, options); this.settings = { batching: { @@ -270,6 +298,7 @@ export class Publisher { gaxOpts, messageOrdering, enableOpenTelemetryTracing, + flowControlOptions, }; // We also need to let all of our queues know that they need to update their options. @@ -282,6 +311,9 @@ export class Publisher { q.updateOptions(); } } + + // This will always be filled in by our defaults if nothing else. + this.flowControl.setOptions(this.settings.flowControlOptions!); } /** @@ -339,7 +371,6 @@ export class Publisher { } } -promisifyAll(Publisher, { +promisifySome(Publisher, Publisher.prototype, ['flush', 'publishMessage'], { singular: true, - exclude: ['publish', 'setOptions', 'constructSpan', 'getOptionDefaults'], }); diff --git a/handwritten/pubsub/src/publisher/message-batch.ts b/handwritten/pubsub/src/publisher/message-batch.ts index 2e7a2559f2d..07a6222ce52 100644 --- a/handwritten/pubsub/src/publisher/message-batch.ts +++ b/handwritten/pubsub/src/publisher/message-batch.ts @@ -15,6 +15,7 @@ */ import {BATCH_LIMITS, PubsubMessage, PublishCallback} from './'; +import {calculateMessageSize} from './pubsub-message'; export interface BatchPublishOptions { maxBytes?: number; @@ -70,7 +71,7 @@ export class MessageBatch { add(message: PubsubMessage, callback: PublishCallback): void { this.messages.push(message); this.callbacks.push(callback); - this.bytes += message.data!.length; + this.bytes += calculateMessageSize(message); } /** * Indicates if a given message can fit in the batch. @@ -78,11 +79,11 @@ export class MessageBatch { * @param {object} message The message in question. * @returns {boolean} */ - canFit({data}: PubsubMessage): boolean { + canFit(message: PubsubMessage): boolean { const {maxMessages, maxBytes} = this.options; return ( this.messages.length < maxMessages! && - this.bytes + data!.length <= maxBytes! + this.bytes + calculateMessageSize(message) <= maxBytes! ); } /** diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index d3c275895e6..3b77944275e 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -37,6 +37,7 @@ export abstract class MessageQueue extends EventEmitter { batchOptions: BatchPublishOptions; publisher: Publisher; pending?: NodeJS.Timer; + constructor(publisher: Publisher) { super(); this.publisher = publisher; diff --git a/handwritten/pubsub/src/publisher/pubsub-message.ts b/handwritten/pubsub/src/publisher/pubsub-message.ts new file mode 100644 index 00000000000..a1e1283d5ae --- /dev/null +++ b/handwritten/pubsub/src/publisher/pubsub-message.ts @@ -0,0 +1,81 @@ +/*! + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {google} from '../../protos/protos'; + +/** + * Strings are the only allowed values for keys and values in message attributes. + */ +export type Attributes = Record; + +/** + * The basic {data, attributes} for a message to be published. + */ +export interface PubsubMessage extends google.pubsub.v1.IPubsubMessage { + /** + * If we've calculated the size of this message, it will be cached here. + * This is done to avoid having to build up the attribute size over and over. + * + * This field should not be used outside of this library. Its implementation + * may change, and it may disappear later. + * + * @private + */ + calculatedSize?: number; +} + +/** + * Precisely calculates the size of a message with optional `data` and + * `attributes` fields. If a `data` field is present, its {@link Buffer#length} + * member will be used. If `attributes` are present, each attribute's + * key and value will be calculated for byte length. + * + * When the calculation is complete, the result will be stored in + * `calculatedSize`. Since this calculation is generally only done + * after the message has been handed off to this library, there shouldn't + * be an issue with it being updated after the fact. + * + * This should not be used outside of this library. Its implementation + * may change. + * + * @private + */ +export function calculateMessageSize( + message: PubsubMessage | google.pubsub.v1.IPubsubMessage +) { + // If it's not a PubsubMessage, we'll augment it into one. + const msg = message as unknown as PubsubMessage; + + if (msg.calculatedSize !== undefined) { + return msg.calculatedSize; + } + + let size = 0; + + if (msg.data) { + size += msg.data.length; + } + if (msg.attributes) { + const attrs = msg.attributes; + for (const key of Object.getOwnPropertyNames(attrs)) { + const val = attrs[key] || ''; + size += Buffer.byteLength(key + val); + } + } + + msg.calculatedSize = size; + return size; +} diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index f2369e5cfe3..d6173cc695f 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {promisifyAll} from '@google-cloud/promisify'; import {CallOptions} from 'google-gax'; import {google} from '../protos/protos'; @@ -26,6 +25,7 @@ import { ResourceCallback, } from './pubsub'; import {Subscription} from './subscription'; +import {promisifySome} from './util'; export type CreateSnapshotCallback = ResourceCallback< Snapshot, @@ -263,7 +263,8 @@ export class Snapshot { /*! Developer Documentation * - * All async methods (except for streams) will return a Promise in the event - * that a callback is omitted. + * Existing async methods (except for streams) will return a Promise in the event + * that a callback is omitted. Future methods will not allow for a callback. + * (Use .then() on the returned Promise instead.) */ -promisifyAll(Snapshot); +promisifySome(Snapshot, Snapshot.prototype, ['delete', 'create', 'seek']); diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 0c8a4cf379c..28ae5f6d1de 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {promisifyAll} from '@google-cloud/promisify'; import {EventEmitter} from 'events'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; @@ -45,6 +44,7 @@ import { } from './snapshot'; import {Subscriber, SubscriberOptions} from './subscriber'; import {Topic} from './topic'; +import {promisifySome} from './util'; export type PushConfig = google.pubsub.v1.IPushConfig; export type OidcToken = google.pubsub.v1.PushConfig.IOidcToken; @@ -1165,6 +1165,16 @@ export class Subscription extends EventEmitter { * All async methods (except for streams) will return a Promise in the event * that a callback is omitted. */ -promisifyAll(Subscription, { - exclude: ['open', 'snapshot'], -}); +promisifySome(Subscription, Subscription.prototype, [ + 'close', + 'create', + 'createSnapshot', + 'delete', + 'detached', + 'exists', + 'get', + 'getMetadata', + 'modifyPushConfig', + 'seek', + 'setMetadata', +]); diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 4e82a0f3e89..ca748e5e485 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -15,7 +15,6 @@ */ import {paginator} from '@google-cloud/paginator'; -import {promisifyAll} from '@google-cloud/promisify'; import {CallOptions} from 'google-gax'; import {google} from '../protos/protos'; @@ -28,6 +27,7 @@ import { PublishOptions, PubsubMessage, } from './publisher'; +import {FlowControlledPublisher} from './publisher/flow-publisher'; import { EmptyCallback, EmptyResponse, @@ -47,6 +47,7 @@ import { Subscription, SubscriptionOptions, } from './subscription'; +import {promisifySome} from './util'; export type TopicMetadata = google.pubsub.v1.ITopic; @@ -787,6 +788,8 @@ export class Topic { message: MessageOptions, callback?: PublishCallback ): Promise<[string]> | void { + // Make a copy to ensure that any changes we make to it will not + // propagate up to the user's data. message = Object.assign({}, message); if (message.json && typeof message.json === 'object') { @@ -797,6 +800,23 @@ export class Topic { return this.publisher.publishMessage(message, callback!); } + /** + * Creates a FlowControlledPublisher for this Topic. + * + * FlowControlledPublisher is a helper that lets you control how many messages + * are simultaneously queued to send, to avoid ballooning memory usage on + * a low bandwidth connection to Pub/Sub. + * + * Note that it's perfectly fine to create more than one on the same Topic. + * The actual flow control settings on the Topic will apply across all + * FlowControlledPublisher objects on that Topic. + * + * @returns {FlowControlledPublisher} The flow control helper. + */ + flowControlled(): FlowControlledPublisher { + return new FlowControlledPublisher(this.publisher); + } + /** * In the event that the client fails to publish an ordered message, all * subsequent publish calls using the same ordering key will fail. Calling @@ -1034,18 +1054,20 @@ paginator.extend(Topic, ['getSubscriptions']); /*! Developer Documentation * - * All async methods (except for streams) will return a Promise in the event - * that a callback is omitted. + * Existing async methods (except for streams) will return a Promise in the event + * that a callback is omitted. Future methods will not allow for a callback. + * (Use .then() on the returned Promise instead.) */ -promisifyAll(Topic, { - exclude: [ - 'publish', - 'publishJSON', - 'publishMessage', - 'setPublishOptions', - 'getPublishOptionDefaults', - 'subscription', - ], -}); +promisifySome(Topic, Topic.prototype, [ + 'flush', + 'create', + 'createSubscription', + 'delete', + 'exists', + 'get', + 'getMetadata', + 'getSubscriptions', + 'setMetadata', +]); export {PublishOptions}; diff --git a/handwritten/pubsub/src/util.ts b/handwritten/pubsub/src/util.ts index 59268c3178b..1a19f0a0cf7 100644 --- a/handwritten/pubsub/src/util.ts +++ b/handwritten/pubsub/src/util.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {promisify} from '@google-cloud/promisify'; +import {promisify, PromisifyOptions} from '@google-cloud/promisify'; /** * This replaces usage of promisifyAll(), going forward. Instead of opting @@ -29,12 +29,13 @@ import {promisify} from '@google-cloud/promisify'; export function promisifySome( class_: Function, classProto: T, - methods: (keyof T)[] + methods: (keyof T)[], + options?: PromisifyOptions ): void { methods.forEach(methodName => { // Do the same stream checks as promisifyAll(). const m = classProto[methodName] as unknown as Function; - classProto[methodName] = promisify(m); + classProto[methodName] = promisify(m, options); }); } diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index 6adaa5e912a..a2dab3ddcab 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as promisify from '@google-cloud/promisify'; import * as assert from 'assert'; import {describe, it, before, beforeEach} from 'mocha'; import * as proxyquire from 'proxyquire'; @@ -22,12 +21,23 @@ import {PubSub, RequestConfig} from '../src/pubsub'; import * as util from '../src/util'; let promisified = false; -const fakePromisify = Object.assign({}, promisify, { - // tslint:disable-next-line variable-name - promisifyAll(Class: typeof iamTypes.IAM) { - if (Class.name === 'IAM') { +const fakeUtil = Object.assign({}, util, { + promisifySome( + class_: Function, + classProtos: object, + methods: string[] + ): void { + if (class_.name === 'IAM') { promisified = true; + assert.deepStrictEqual(methods, [ + 'getPolicy', + 'setPolicy', + 'testPermissions', + ]); } + // Defeats the method name type check. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + util.promisifySome(class_, classProtos, methods as any); }, }); @@ -43,7 +53,7 @@ describe('IAM', () => { before(() => { IAM = proxyquire('../src/iam.js', { - '@google-cloud/promisify': fakePromisify, + './util': fakeUtil, }).IAM; }); @@ -75,7 +85,7 @@ describe('IAM', () => { assert.strictEqual(iam.id, ID); }); - it('should promisify all the things', () => { + it('should promisify some of the things', () => { assert(promisified); }); }); diff --git a/handwritten/pubsub/test/publisher/flow-control.ts b/handwritten/pubsub/test/publisher/flow-control.ts new file mode 100644 index 00000000000..75340518644 --- /dev/null +++ b/handwritten/pubsub/test/publisher/flow-control.ts @@ -0,0 +1,107 @@ +/*! + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {describe, it} from 'mocha'; + +import * as fc from '../../src/publisher/flow-control'; + +describe('Flow Controller', () => { + const optionsDefault: fc.FlowControlOptions = { + maxOutstandingMessages: 5, + maxOutstandingBytes: 100, + }; + + it('does basic bookkeeping correctly', async () => { + const flow = new fc.FlowControl(optionsDefault); + await flow.willSend(10, 1); + assert.strictEqual(flow.currentByteCount, 10); + assert.strictEqual(flow.currentMessageCount, 1); + }); + + // This is an internal detail we really don't want to expose even inside + // the library, so this function will get it for us in one place. + function requestQueue(flow: fc.FlowControl) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return (flow as any).requests; + } + + it('queues up a promise when bytes are exceeded', async () => { + const flow = new fc.FlowControl(optionsDefault); + const promise = flow.willSend(1000, 1); + const requests = requestQueue(flow); + assert.strictEqual(requests.length, 1); + requests[0].resolve(); + await promise; + }); + + it('queues up a promise when messages are exceeded', async () => { + const flow = new fc.FlowControl(optionsDefault); + const promise = flow.willSend(10, 100); + const requests = requestQueue(flow); + assert.strictEqual(requests.length, 1); + requests[0].resolve(); + await promise; + }); + + it('releases a publisher when space is freed', async () => { + const flow = new fc.FlowControl(optionsDefault); + const promise = flow.willSend(1000, 1); + const requests = requestQueue(flow); + assert.strictEqual(requests.length, 1); + flow.sent(990, 1); + assert.strictEqual(requests.length, 0); + await promise; + }); + + it('releases a publisher only when enough space is freed', async () => { + const flow = new fc.FlowControl(optionsDefault); + const promise = flow.willSend(1000, 2); + const requests = requestQueue(flow); + assert.strictEqual(requests.length, 1); + flow.sent(800, 1); + assert.strictEqual(requests.length, 1); + flow.sent(150, 1); + assert.strictEqual(requests.length, 0); + await promise; + }); + + it('calculates with wouldExceed correctly', () => { + const flowPause = new fc.FlowControl(optionsDefault); + assert.strictEqual(flowPause.wouldExceed(10000, 1), true); + assert.strictEqual(flowPause.wouldExceed(1, 1000), true); + assert.strictEqual(flowPause.wouldExceed(10000, 1000), true); + assert.strictEqual(flowPause.wouldExceed(5, 1), false); + }); + + it('sets options after the fact', () => { + const flowPause = new fc.FlowControl(optionsDefault); + const newOptions = { + maxOutstandingMessages: 100, + }; + flowPause.setOptions(newOptions); + assert.strictEqual(flowPause.options.maxOutstandingMessages, 100); + }); + + it('does not allow nonsensical option values', () => { + const flowPause = new fc.FlowControl(optionsDefault); + const newOptions = { + maxOutstandingBytes: 0, + maxOutstandingMessages: 0, + }; + assert.throws(() => flowPause.setOptions(newOptions)); + }); +}); diff --git a/handwritten/pubsub/test/publisher/flow-publisher.ts b/handwritten/pubsub/test/publisher/flow-publisher.ts new file mode 100644 index 00000000000..cdeebdb3728 --- /dev/null +++ b/handwritten/pubsub/test/publisher/flow-publisher.ts @@ -0,0 +1,132 @@ +/*! + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {describe, it, beforeEach, afterEach} from 'mocha'; +import * as sinon from 'sinon'; +import * as defer from 'p-defer'; + +import { + Publisher, + flowControlDefaults, + PublishOptions, + PubsubMessage, +} from '../../src/publisher'; +import {FlowControl} from '../../src/publisher/flow-control'; +import * as fp from '../../src/publisher/flow-publisher'; + +class FakePublisher { + flowControl!: FlowControl; + publishMessage() {} + setOptions(options: PublishOptions) { + this.flowControl.setOptions(options.flowControlOptions!); + } +} + +describe('Flow control publisher', () => { + let publisher: Publisher; + const sandbox = sinon.createSandbox(); + + beforeEach(() => { + publisher = new FakePublisher() as unknown as Publisher; + publisher.flowControl = new FlowControl(flowControlDefaults); + }); + + afterEach(() => { + sandbox.restore(); + }); + + it('should get no promise if there is flow control space left', async () => { + publisher.setOptions({ + flowControlOptions: { + maxOutstandingMessages: 1, + }, + }); + + const addStub = sandbox.stub(publisher, 'publishMessage').resolves(''); + + const fcp = new fp.FlowControlledPublisher(publisher); + const publishResult = fcp.publish({data: Buffer.from('foo')}); + + assert.strictEqual(addStub.called, true); + assert.strictEqual(publishResult, null); + }); + + it('should get a promise when there is no flow control space left', async () => { + publisher.setOptions({ + flowControlOptions: { + maxOutstandingMessages: 1, + }, + }); + + const deferred = defer(); + const addStub = sandbox + .stub(publisher, 'publishMessage') + .returns(deferred.promise as unknown as void); + + const fcp = new fp.FlowControlledPublisher(publisher); + const firstResult = fcp.publish({data: Buffer.from('foo')}); + assert.strictEqual(addStub.calledOnce, true); + assert.strictEqual(firstResult, null); + + const secondResult = fcp.publish({data: Buffer.from('bar')}); + assert.ok(secondResult); + assert.strictEqual(addStub.calledOnce, true); + publisher.flowControl.sent(3, 1); + await secondResult; + assert.strictEqual(addStub.calledTwice, true); + }); + + it('should still call sent() on send errors', async () => { + const pubStub = sandbox.stub(publisher, 'publishMessage').rejects(); + const sentStub = sandbox.stub(publisher.flowControl, 'sent'); + + const fcp = new fp.FlowControlledPublisher(publisher); + await fcp.publish({data: Buffer.from('foo')}); + + assert.strictEqual(pubStub.called, true); + assert.strictEqual(sentStub.called, true); + }); + + it('should send messages immediately when publishNow is called', () => { + const pubStub = sandbox.stub(publisher, 'publishMessage').resolves(''); + const addStub = sandbox.stub(publisher.flowControl, 'addToCount'); + + const fcp = new fp.FlowControlledPublisher(publisher); + fcp.publishNow({data: Buffer.from('foo')}); + + assert.strictEqual(pubStub.calledOnce, true); + assert.deepStrictEqual(addStub.args[0], [3, 1]); + }); + + it('should calculate the message size if needed, in wait mode', async () => { + sandbox.stub(publisher, 'publishMessage').resolves(); + const fcp = new fp.FlowControlledPublisher(publisher); + const message: PubsubMessage = {data: Buffer.from('test!')}; + await fcp.publish(message); + + assert.strictEqual(message.calculatedSize, 5); + }); + + it('should calculate the message size if needed, in now mode', () => { + sandbox.stub(publisher, 'publishMessage').resolves(); + const fcp = new fp.FlowControlledPublisher(publisher); + const message: PubsubMessage = {data: Buffer.from('test!')}; + fcp.publishNow(message); + + assert.strictEqual(message.calculatedSize, 5); + }); +}); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 04319b8e537..ab402a6a3ab 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -1,5 +1,5 @@ /*! - * Copyright 2019 Google Inc. All Rights Reserved. + * Copyright 2019 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ import {Topic} from '../../src'; import * as p from '../../src/publisher'; import * as q from '../../src/publisher/message-queues'; import {PublishError} from '../../src/publisher/publish-error'; +import * as util from '../../src/util'; import {defaultOptions} from '../../src/default-options'; import {exporter} from '../tracing'; @@ -32,24 +33,21 @@ import {SpanKind} from '@opentelemetry/api'; import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; let promisified = false; -const fakePromisify = Object.assign({}, pfy, { - promisifyAll: (ctor: Function, options: pfy.PromisifyAllOptions) => { - if (ctor.name !== 'Publisher') { - return; +const fakeUtil = Object.assign({}, util, { + promisifySome( + class_: Function, + classProtos: object, + methods: string[], + options: pfy.PromisifyAllOptions + ): void { + if (class_.name === 'Publisher') { + promisified = true; + assert.deepStrictEqual(methods, ['flush', 'publishMessage']); + assert.strictEqual(options.singular, true); } - - // We _also_ need to call it, because unit tests will catch things - // that shouldn't be promisified. - pfy.promisifyAll(ctor, options); - - promisified = true; - assert.ok(options.singular); - assert.deepStrictEqual(options.exclude, [ - 'publish', - 'setOptions', - 'constructSpan', - 'getOptionDefaults', - ]); + // Defeats the method name type check. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + util.promisifySome(class_, classProtos, methods as any, options); }, }); @@ -99,7 +97,7 @@ class FakeOrderedQueue extends FakeQueue { describe('Publisher', () => { let sandbox: sinon.SinonSandbox; - let spy: sinon.SinonSpyStatic; + let spy: sinon.SinonSpy; const topic = { name: 'topic-name', pubsub: {projectId: 'PROJECT_ID'}, @@ -114,7 +112,7 @@ describe('Publisher', () => { spy = sandbox.spy(); const mocked = proxyquire('../../src/publisher/index.js', { - '@google-cloud/promisify': fakePromisify, + '../util': fakeUtil, './message-queues': { Queue: FakeQueue, OrderedQueue: FakeOrderedQueue, @@ -131,7 +129,7 @@ describe('Publisher', () => { }); describe('initialization', () => { - it('should promisify all the things', () => { + it('should promisify some of the things', () => { assert(promisified); }); @@ -264,15 +262,18 @@ describe('Publisher', () => { ); }); - it('should add non-ordered messages to the message queue', () => { + it('should add non-ordered messages to the message queue', done => { const stub = sandbox.stub(publisher.queue, 'add'); const fakeMessage = {data}; - publisher.publishMessage(fakeMessage, spy); + publisher.publishMessage(fakeMessage, done); const [message, callback] = stub.lastCall.args; assert.strictEqual(message, fakeMessage); - assert.strictEqual(callback, spy); + + // Because of publisher flow control indirection, we have to test + // the callback this way. + callback(null); }); describe('ordered messages', () => { @@ -302,14 +303,19 @@ describe('Publisher', () => { assert.strictEqual(queue.orderingKey, orderingKey); }); - it('should add the ordered message to the correct queue', () => { + it('should add the ordered message to the correct queue', done => { const stub = sandbox.stub(queue, 'add'); - publisher.publishMessage(fakeMessage, spy); + publisher.publishMessage(fakeMessage, done); + // Because of publisher flow control indirection, we can't test + // the callback here. const [message, callback] = stub.lastCall.args; assert.strictEqual(message, fakeMessage); - assert.strictEqual(callback, spy); + + // Because of publisher flow control indirection, we have to test + // the callback this way. + callback(null); }); it('should return an error if the queue encountered an error', done => { @@ -411,6 +417,10 @@ describe('Publisher', () => { isBundling: false, }, enableOpenTelemetryTracing: false, + flowControlOptions: { + maxOutstandingBytes: undefined, + maxOutstandingMessages: undefined, + }, }); }); @@ -426,6 +436,10 @@ describe('Publisher', () => { isBundling: true, }, enableOpenTelemetryTracing: true, + flowControlOptions: { + maxOutstandingBytes: 500, + maxOutstandingMessages: 50, + }, }; publisher.setOptions(options); diff --git a/handwritten/pubsub/test/publisher/message-batch.ts b/handwritten/pubsub/test/publisher/message-batch.ts index f4b3ac85612..161756500b9 100644 --- a/handwritten/pubsub/test/publisher/message-batch.ts +++ b/handwritten/pubsub/test/publisher/message-batch.ts @@ -20,6 +20,7 @@ import {randomBytes} from 'crypto'; import * as sinon from 'sinon'; import {MessageBatch} from '../../src/publisher/message-batch'; +import {PubsubMessage} from '../../src/publisher'; describe('MessageBatch', () => { let batch: MessageBatch; @@ -68,9 +69,14 @@ describe('MessageBatch', () => { describe('add', () => { const callback = sandbox.spy(); - const message = { - data: Buffer.from('Hello, world!'), - }; + let message: PubsubMessage; + let messageSize: number; + beforeEach(() => { + message = { + data: Buffer.from('Hello, world!'), + }; + messageSize = message.data!.length; + }); it('should add the message to the message array', () => { batch.add(message, callback); @@ -84,14 +90,19 @@ describe('MessageBatch', () => { it('should adjust the byte count', () => { batch.add(message, callback); - assert.strictEqual(batch.bytes, message.data.length); + assert.strictEqual(batch.bytes, messageSize); }); }); describe('canFit', () => { - const message = { - data: Buffer.from('Hello, world!'), - }; + let message: PubsubMessage; + let messageSize: number; + beforeEach(() => { + message = { + data: Buffer.from('Hello, world!'), + }; + messageSize = message.data!.length; + }); it('should return false if too many messages', () => { batch.options.maxMessages = 0; @@ -100,7 +111,7 @@ describe('MessageBatch', () => { }); it('should return false if too many bytes', () => { - batch.options.maxBytes = message.data.length - 1; + batch.options.maxBytes = messageSize - 1; const canFit = batch.canFit(message); assert.strictEqual(canFit, false); }); @@ -150,9 +161,14 @@ describe('MessageBatch', () => { }); describe('isFull', () => { - const message = { - data: Buffer.from('Hello, world!'), - }; + let message: PubsubMessage; + let messageSize: number; + beforeEach(() => { + message = { + data: Buffer.from('Hello, world!'), + }; + messageSize = message.data!.length; + }); it('should return true if at max message limit', () => { batch.options.maxMessages = 1; @@ -162,7 +178,7 @@ describe('MessageBatch', () => { }); it('should return true if at max byte limit', () => { - batch.options.maxBytes = message.data.length; + batch.options.maxBytes = messageSize; batch.add(message, sandbox.spy()); const isFull = batch.isFull(); assert.strictEqual(isFull, true); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 9cefee6a836..7ea07647733 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -33,14 +33,18 @@ class FakeTopic { request(config: RequestConfig, callback: RequestCallback): void {} } +class FakeFlowControl {} + class FakePublisher { topic: FakeTopic; settings: p.PublishOptions; + flowControl: FakeFlowControl; constructor(topic: FakeTopic) { this.topic = topic; this.settings = { batching: {}, }; + this.flowControl = new FakeFlowControl(); } } @@ -90,7 +94,7 @@ describe('Message Queues', () => { let OrderedQueue: typeof q.OrderedQueue; let topic: FakeTopic; - let publisher: FakePublisher; + let publisher: p.Publisher; before(() => { const mocked = proxyquire('../../src/publisher/message-queues.js', { @@ -105,7 +109,7 @@ describe('Message Queues', () => { beforeEach(() => { topic = new FakeTopic(); - publisher = new FakePublisher(topic); + publisher = new FakePublisher(topic) as unknown as p.Publisher; }); afterEach(() => { diff --git a/handwritten/pubsub/test/publisher/pubsub-message.ts b/handwritten/pubsub/test/publisher/pubsub-message.ts new file mode 100644 index 00000000000..e2eff60f011 --- /dev/null +++ b/handwritten/pubsub/test/publisher/pubsub-message.ts @@ -0,0 +1,73 @@ +/*! + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {describe, it} from 'mocha'; + +import {PubsubMessage} from '../../src/publisher'; +import * as pm from '../../src/publisher/pubsub-message'; + +describe('PubsubMessage', () => { + it('should calculate properly for blank messages', () => { + const blank: PubsubMessage = {}; + const size = pm.calculateMessageSize(blank); + assert.strictEqual(size, 0); + assert.strictEqual(blank.calculatedSize, size); + }); + + it('should calculate properly for a data only message', () => { + const dataOnly: PubsubMessage = {data: Buffer.from('test')}; + const size = pm.calculateMessageSize(dataOnly); + assert.strictEqual(size, 4); + assert.strictEqual(dataOnly.calculatedSize, size); + }); + + it('should calculate properly for an attr only message', () => { + const attrOnly: PubsubMessage = { + attributes: { + foo: 'bar', + }, + }; + const size = pm.calculateMessageSize(attrOnly); + assert.strictEqual(size, 6); + assert.strictEqual(attrOnly.calculatedSize, size); + }); + + it('should calculate properly for a both message', () => { + const both: PubsubMessage = { + data: Buffer.from('test'), + attributes: { + foo: 'bar', + baz: 'quux', + }, + }; + const size = pm.calculateMessageSize(both); + assert.strictEqual(size, 17); + assert.strictEqual(both.calculatedSize, size); + }); + + // This isn't really part of the spec, but it might happen. + it('should handle undefined attributes', () => { + const weird: PubsubMessage = { + attributes: { + foo: undefined as unknown as string, + }, + }; + const size = pm.calculateMessageSize(weird); + assert.strictEqual(size, 3); + assert.strictEqual(weird.calculatedSize, size); + }); +}); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index c7dff0ce3c9..03fd44a28e2 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -58,7 +58,6 @@ const fakeUtil = Object.assign({}, util, { classProtos: object, methods: string[] ): void { - console.log('Promisifying some', classProtos, methods); if (class_.name === 'PubSub') { promisified = true; assert.deepStrictEqual(methods, [ diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 5f06dcfbbe0..b21ae1a9906 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import {describe, it, beforeEach, before, after, afterEach} from 'mocha'; import * as proxyquire from 'proxyquire'; @@ -21,14 +20,22 @@ import * as sinon from 'sinon'; import {PubSub, RequestConfig} from '../src/pubsub'; import * as snapTypes from '../src/snapshot'; import {Subscription} from '../src/subscription'; +import * as util from '../src/util'; let promisified = false; -const fakePromisify = Object.assign({}, pfy, { - // tslint:disable-next-line variable-name - promisifyAll(Class: Function) { - if (Class.name === 'Snapshot') { +const fakeUtil = Object.assign({}, util, { + promisifySome( + class_: Function, + classProtos: object, + methods: string[] + ): void { + if (class_.name === 'Snapshot') { promisified = true; + assert.deepStrictEqual(methods, ['delete', 'create', 'seek']); } + // Defeats the method name type check. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + util.promisifySome(class_, classProtos, methods as any); }, }); @@ -55,7 +62,7 @@ describe('Snapshot', () => { before(() => { Snapshot = proxyquire('../src/snapshot', { - '@google-cloud/promisify': fakePromisify, + './util': fakeUtil, }).Snapshot; }); @@ -80,7 +87,7 @@ describe('Snapshot', () => { Snapshot.formatName_ = formatName_; }); - it('should promisify all the things', () => { + it('should promisify some of the things', () => { assert(promisified); }); @@ -186,15 +193,15 @@ describe('Snapshot', () => { snapshot = new Snapshot(PUBSUB, SNAPSHOT_NAME); }); - it('should throw on create method', () => { - assert.throws( + it('should throw on create method', async () => { + await assert.rejects( () => snapshot.create(), /This is only available if you accessed this object through Subscription#snapshot/ ); }); - it('should throw on seek method', () => { - assert.throws( + it('should throw on seek method', async () => { + await assert.rejects( () => snapshot.seek(), /This is only available if you accessed this object through Subscription#snapshot/ ); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 601679e322f..e7016bdbcbb 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; @@ -27,16 +26,31 @@ import * as subby from '../src/subscription'; import * as util from '../src/util'; let promisified = false; -const fakePromisify = Object.assign({}, pfy, { - promisifyAll: ( - klass: subby.Subscription, - options: pfy.PromisifyAllOptions - ) => { - if (klass.name !== 'Subscription') { - return; +const fakeUtil = Object.assign({}, util, { + promisifySome( + class_: Function, + classProtos: object, + methods: string[] + ): void { + if (class_.name === 'Subscription') { + promisified = true; + assert.deepStrictEqual(methods, [ + 'close', + 'create', + 'createSnapshot', + 'delete', + 'detached', + 'exists', + 'get', + 'getMetadata', + 'modifyPushConfig', + 'seek', + 'setMetadata', + ]); } - promisified = true; - assert.deepStrictEqual(options.exclude, ['open', 'snapshot']); + // Defeats the method name type check. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + util.promisifySome(class_, classProtos, methods as any); }, }); @@ -95,7 +109,7 @@ describe('Subscription', () => { before(() => { Subscription = proxyquire('../src/subscription.js', { - '@google-cloud/promisify': fakePromisify, + './util': fakeUtil, './iam.js': {IAM: FakeIAM}, './snapshot.js': {Snapshot: FakeSnapshot}, './subscriber.js': {Subscriber: FakeSubscriber}, @@ -111,7 +125,7 @@ describe('Subscription', () => { afterEach(() => sandbox.restore()); describe('initialization', () => { - it('should promisify all the things', () => { + it('should promisify some of the things', () => { assert(promisified); }); @@ -338,11 +352,11 @@ describe('Subscription', () => { subscription.topic = TOPIC_NAME; }); - it('should throw an error if theres no topic', () => { + it('should throw an error if there is no topic', async () => { const expectedError = /Subscriptions can only be created when accessed through Topics/; delete subscription.topic; - assert.throws(() => subscription.create(), expectedError); + await assert.rejects(subscription.create(), expectedError); }); it('should pass the correct params', () => { @@ -425,10 +439,10 @@ describe('Subscription', () => { }; }); - it('should throw an error if a snapshot name is not found', () => { - assert.throws(() => { + it('should throw an error if a snapshot name is not found', async () => { + await assert.rejects(() => { // eslint-disable-next-line @typescript-eslint/no-explicit-any - (subscription as any).createSnapshot(); + return (subscription as any).createSnapshot(); }, /A name is required to create a snapshot\./); }); @@ -859,10 +873,10 @@ describe('Subscription', () => { }; }); - it('should throw if a name or date is not provided', () => { - assert.throws(() => { + it('should throw if a name or date is not provided', async () => { + await assert.rejects(() => { // eslint-disable-next-line @typescript-eslint/no-explicit-any - (subscription as any).seek(); + return (subscription as any).seek(); }, /Either a snapshot name or Date is needed to seek to\./); }); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index dde0bf942d5..f5733a0d4e8 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as pfy from '@google-cloud/promisify'; import * as assert from 'assert'; import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {CallOptions, ServiceError} from 'google-gax'; @@ -31,25 +30,29 @@ import {GetTopicMetadataCallback, Topic} from '../src/topic'; import * as util from '../src/util'; let promisified = false; -const fakePromisify = Object.assign({}, pfy, { - promisifyAll: (klass: Function, options: pfy.PromisifyAllOptions) => { - if (klass.name !== 'Topic') { - return; +const fakeUtil = Object.assign({}, util, { + promisifySome( + class_: Function, + classProtos: object, + methods: string[] + ): void { + if (class_.name === 'Topic') { + promisified = true; + assert.deepStrictEqual(methods, [ + 'flush', + 'create', + 'createSubscription', + 'delete', + 'exists', + 'get', + 'getMetadata', + 'getSubscriptions', + 'setMetadata', + ]); + // Defeats the method name type check. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + util.promisifySome(class_, classProtos, methods as any); } - promisified = true; - - // We _also_ need to call it, because unit tests will catch things - // that shouldn't be promisified. - pfy.promisifyAll(klass, options); - - assert.deepStrictEqual(options.exclude, [ - 'publish', - 'publishJSON', - 'publishMessage', - 'setPublishOptions', - 'getPublishOptionDefaults', - 'subscription', - ]); }, }); @@ -70,6 +73,9 @@ class FakePublisher { publishMessage(...args: Array<{}>) { this.published_ = args; } + publishWhenReady(...args: Array<{}>) { + this.published_ = args; + } setOptions(options: object) { this.options_ = options; } @@ -111,7 +117,7 @@ describe('Topic', () => { before(() => { Topic = proxyquire('../src/topic.js', { - '@google-cloud/promisify': fakePromisify, + './util': fakeUtil, '@google-cloud/paginator': { paginator: fakePaginator, }, @@ -136,7 +142,7 @@ describe('Topic', () => { assert.strictEqual(topic.getSubscriptionsStream, 'getSubscriptions'); }); - it('should promisify all the things', () => { + it('should promisify some of the things', () => { assert(promisified); }); From ce7bb0cb2a2ab20e0297c384315882631a3d8ec6 Mon Sep 17 00:00:00 2001 From: Jeffrey Rennie Date: Tue, 21 Sep 2021 07:14:25 -0700 Subject: [PATCH 0792/1115] chore: relocate owl bot post processor (#1393) chore: relocate owl bot post processor --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.github/.OwlBot.yaml | 2 +- handwritten/pubsub/README.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 73bbf7d3210..7d4006e71e0 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - image: gcr.io/repo-automation-bots/owlbot-nodejs:latest + image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest digest: sha256:111973c0da7608bf1e60d070e5449d48826c385a6b92a56cb9203f1725d33c3d diff --git a/handwritten/pubsub/.github/.OwlBot.yaml b/handwritten/pubsub/.github/.OwlBot.yaml index b45745724c7..5563b4445e9 100644 --- a/handwritten/pubsub/.github/.OwlBot.yaml +++ b/handwritten/pubsub/.github/.OwlBot.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. docker: - image: gcr.io/repo-automation-bots/owlbot-nodejs:latest + image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest deep-remove-regex: diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index c3cf99997a3..c41f946f24a 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -157,6 +157,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | | Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | | Publish Protobuf Messages to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishProtobufMessages.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/publishProtobufMessages.js,samples/README.md) | +| Publish with flow control | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithFlowControl.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/publishWithFlowControl.js,samples/README.md) | | Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | | Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/quickstart.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/quickstart.js,samples/README.md) | | Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | From a116a27abd5b894e0fd3116fb47e028382570422 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 23 Sep 2021 16:31:21 -0400 Subject: [PATCH 0793/1115] fix: update default RPC retry timeouts to match other languages (#1399) Fixes: https://github.com/googleapis/nodejs-pubsub/issues/1398 --- handwritten/pubsub/src/v1/publisher_client_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 381824599ad..88765b9607a 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -30,8 +30,8 @@ "initial_retry_delay_millis": 100, "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 60000, - "rpc_timeout_multiplier": 1, + "initial_rpc_timeout_millis": 5000, + "rpc_timeout_multiplier": 1.3, "max_rpc_timeout_millis": 60000, "total_timeout_millis": 600000 } From 73626589f8b7816b981467e77f1157f5104bd653 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 20:46:12 +0000 Subject: [PATCH 0794/1115] chore: release 2.18.0 (#1391) :robot: I have created a release \*beep\* \*boop\* --- ## [2.18.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.17.0...v2.18.0) (2021-09-23) ### Features * add publisher side flow control ([#1359](https://www.github.com/googleapis/nodejs-pubsub/issues/1359)) ([cc0f61b](https://www.github.com/googleapis/nodejs-pubsub/commit/cc0f61b18258bae0be1a5962a93970cc15dcd304)) ### Bug Fixes * update default RPC retry timeouts to match other languages ([#1399](https://www.github.com/googleapis/nodejs-pubsub/issues/1399)) ([8c1afee](https://www.github.com/googleapis/nodejs-pubsub/commit/8c1afeee26fbff84448b1a9576e4c4ef5c67f9cc)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 62638ca5f8a..95cf6b40cd6 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.18.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.17.0...v2.18.0) (2021-09-23) + + +### Features + +* add publisher side flow control ([#1359](https://www.github.com/googleapis/nodejs-pubsub/issues/1359)) ([cc0f61b](https://www.github.com/googleapis/nodejs-pubsub/commit/cc0f61b18258bae0be1a5962a93970cc15dcd304)) + + +### Bug Fixes + +* update default RPC retry timeouts to match other languages ([#1399](https://www.github.com/googleapis/nodejs-pubsub/issues/1399)) ([8c1afee](https://www.github.com/googleapis/nodejs-pubsub/commit/8c1afeee26fbff84448b1a9576e4c4ef5c67f9cc)) + ## [2.17.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.16.6...v2.17.0) (2021-08-25) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b3e6b994d79..bec3acc9675 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.17.0", + "version": "2.18.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 2d6ba3d1e3d6728f37ffd612a125e76511325835 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 27 Sep 2021 13:24:08 -0400 Subject: [PATCH 0795/1115] fix: deprecate maxExtension in favour of maxExtensionMinutes (#1402) * fix: deprecate maxExtension in favour of maxExtensionMinutes Background: maxExtension was incorrectly interpreted as seconds in the LeaseManager. This means that if users were relying on client side lease extension in subscribers, they would not actually extend leases for 60 minutes, but only 60 seconds. Also if the user passed in values, they'd be interpreted incorrectly. This PR deprecates the old field in favour of a new one that's explicitly named like the defaults, but also converts the old value if needed. * fix: only allow one of maxExtension or maxExtensionMinutes --- handwritten/pubsub/src/lease-manager.ts | 35 ++++++++++++++++++++---- handwritten/pubsub/test/lease-manager.ts | 26 ++++++++++++++++-- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index 716a481020a..be6fe0c80d6 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -21,8 +21,11 @@ import {defaultOptions} from './default-options'; export interface FlowControlOptions { allowExcessMessages?: boolean; maxBytes?: number; - maxExtension?: number; maxMessages?: number; + maxExtensionMinutes?: number; + + /** @deprecated Use maxExtensionMinutes. */ + maxExtension?: number; } /** @@ -36,7 +39,7 @@ export interface FlowControlOptions { * @property {number} [maxBytes=104857600] The desired amount of memory to * allow message data to consume. (Default: 100MB) It's possible that this * value will be exceeded, since messages are received in batches. - * @property {number} [maxExtension=60] The maximum duration (in seconds) + * @property {number} [maxExtensionMinutes=60] The maximum duration (in minutes) * to extend the message deadline before redelivering. * @property {number} [maxMessages=1000] The desired number of messages to allow * in memory before pausing the message stream. Unless allowExcessMessages @@ -179,13 +182,34 @@ export class LeaseManager extends EventEmitter { * Sets options for the LeaseManager. * * @param {FlowControlOptions} [options] The options. + * + * @throws {RangeError} If both maxExtension and maxExtensionMinutes are set. + * * @private */ setOptions(options: FlowControlOptions): void { + // Convert the old deprecated maxExtension to avoid breaking clients, + // but allow only one. + if ( + options.maxExtension !== undefined && + options.maxExtensionMinutes !== undefined + ) { + throw new RangeError( + 'Only one of "maxExtension" or "maxExtensionMinutes" may be set for subscriber lease management options' + ); + } + if ( + options.maxExtension !== undefined && + options.maxExtensionMinutes === undefined + ) { + options.maxExtensionMinutes = options.maxExtension / 60; + delete options.maxExtension; + } + const defaults: FlowControlOptions = { allowExcessMessages: true, maxBytes: defaultOptions.subscription.maxOutstandingBytes, - maxExtension: defaultOptions.subscription.maxExtensionMinutes, + maxExtensionMinutes: defaultOptions.subscription.maxExtensionMinutes, maxMessages: defaultOptions.subscription.maxOutstandingMessages, }; @@ -229,9 +253,10 @@ export class LeaseManager extends EventEmitter { const deadline = this._subscriber.ackDeadline; for (const message of this._messages) { - const lifespan = (Date.now() - message.received) / 1000; + // Lifespan here is in minutes. + const lifespan = (Date.now() - message.received) / (60 * 1000); - if (lifespan < this._options.maxExtension!) { + if (lifespan < this._options.maxExtensionMinutes!) { message.modAck(deadline); } else { this.remove(message); diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index d8e4bee86db..cf8def1a6cd 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -224,11 +224,31 @@ describe('LeaseManager', () => { }); }); - it('should remove any messages that pass the maxExtension value', () => { - const maxExtension = (expectedTimeout - 100) / 1000; + it('should properly convert any legacy maxExtension values', () => { + const maxExtension = 60 * 1000; + leaseManager.setOptions({maxExtension}); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const options = (leaseManager as any)._options; + assert.strictEqual(options.maxExtensionMinutes, maxExtension / 60); + assert.strictEqual(options.maxExtension, undefined); + }); + + it('should not allow both maxExtension and maxExtensionMinutes', () => { + assert.throws(() => { + leaseManager.setOptions({ + maxExtension: 10, + maxExtensionMinutes: 10, + }); + }); + }); + + it('should remove any messages that pass the maxExtensionMinutes value', () => { + const maxExtensionSeconds = (expectedTimeout - 100) / 1000; const badMessages = [new FakeMessage(), new FakeMessage()]; - leaseManager.setOptions({maxExtension}); + leaseManager.setOptions({ + maxExtensionMinutes: maxExtensionSeconds / 60, + }); badMessages.forEach(message => leaseManager.add(message as {} as Message) ); From b2979833d79a6f134e51bd92308912285a2e0c1c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 17:38:19 +0000 Subject: [PATCH 0796/1115] chore: release 2.18.1 (#1403) :robot: I have created a release \*beep\* \*boop\* --- ### [2.18.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.0...v2.18.1) (2021-09-27) ### Bug Fixes * deprecate maxExtension in favour of maxExtensionMinutes ([#1402](https://www.github.com/googleapis/nodejs-pubsub/issues/1402)) ([46b83ba](https://www.github.com/googleapis/nodejs-pubsub/commit/46b83ba14e954cc6bec3f03ca7c3e0bcdfb7597c)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 95cf6b40cd6..d067738ff58 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.18.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.0...v2.18.1) (2021-09-27) + + +### Bug Fixes + +* deprecate maxExtension in favour of maxExtensionMinutes ([#1402](https://www.github.com/googleapis/nodejs-pubsub/issues/1402)) ([46b83ba](https://www.github.com/googleapis/nodejs-pubsub/commit/46b83ba14e954cc6bec3f03ca7c3e0bcdfb7597c)) + ## [2.18.0](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.17.0...v2.18.0) (2021-09-23) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index bec3acc9675..932beb9c3a9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.18.0", + "version": "2.18.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 0829e7646b58849452b5994ef3b541f4122f0c26 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 07:28:15 -0700 Subject: [PATCH 0797/1115] build(node): run linkinator against index.html (#1227) (#1406) Source-Link: https://github.com/googleapis/synthtool/commit/d4236bbde1651ebc03757ca1e5357bef2af4c274 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:c0ad7c54b9210f1d10678955bc37b377e538e15cb07ecc3bac93cc7219ec2bc5 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 7d4006e71e0..86e7063f886 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:111973c0da7608bf1e60d070e5449d48826c385a6b92a56cb9203f1725d33c3d + digest: sha256:c0ad7c54b9210f1d10678955bc37b377e538e15cb07ecc3bac93cc7219ec2bc5 From b27b98f993b0ac3a99163ae0fb9d8ea0941c3dd3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 00:46:28 +0000 Subject: [PATCH 0798/1115] build(node): update deps used during postprocessing (#1243) (#1409) --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/protos/protos.d.ts | 3 ++- handwritten/pubsub/protos/protos.js | 7 +++++++ handwritten/pubsub/protos/protos.json | 15 ++++++++++++++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 86e7063f886..8d0a479d477 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:c0ad7c54b9210f1d10678955bc37b377e538e15cb07ecc3bac93cc7219ec2bc5 + digest: sha256:bbb8dd6576ac58830a07fc17e9511ae898be44f2219d3344449b125df9854441 diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 6662d8236cd..17440306e47 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -6663,7 +6663,8 @@ export namespace google { OUTPUT_ONLY = 3, INPUT_ONLY = 4, IMMUTABLE = 5, - UNORDERED_LIST = 6 + UNORDERED_LIST = 6, + NON_EMPTY_DEFAULT = 7 } /** Properties of a ResourceDescriptor. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 9e7f2cfeca5..4effb2aa971 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -15300,6 +15300,7 @@ * @property {number} INPUT_ONLY=4 INPUT_ONLY value * @property {number} IMMUTABLE=5 IMMUTABLE value * @property {number} UNORDERED_LIST=6 UNORDERED_LIST value + * @property {number} NON_EMPTY_DEFAULT=7 NON_EMPTY_DEFAULT value */ api.FieldBehavior = (function() { var valuesById = {}, values = Object.create(valuesById); @@ -15310,6 +15311,7 @@ values[valuesById[4] = "INPUT_ONLY"] = 4; values[valuesById[5] = "IMMUTABLE"] = 5; values[valuesById[6] = "UNORDERED_LIST"] = 6; + values[valuesById[7] = "NON_EMPTY_DEFAULT"] = 7; return values; })(); @@ -21478,6 +21480,7 @@ case 4: case 5: case 6: + case 7: break; } } @@ -21582,6 +21585,10 @@ case 6: message[".google.api.fieldBehavior"][i] = 6; break; + case "NON_EMPTY_DEFAULT": + case 7: + message[".google.api.fieldBehavior"][i] = 7; + break; } } if (object[".google.api.resourceReference"] != null) { diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 6d3bc635ff3..9ea5fa954d3 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1771,7 +1771,8 @@ "OUTPUT_ONLY": 3, "INPUT_ONLY": 4, "IMMUTABLE": 5, - "UNORDERED_LIST": 6 + "UNORDERED_LIST": 6, + "NON_EMPTY_DEFAULT": 7 } }, "resourceReference": { @@ -2414,6 +2415,18 @@ ] ], "reserved": [ + [ + 4, + 4 + ], + [ + 5, + 5 + ], + [ + 6, + 6 + ], [ 8, 8 From 28700185c1e81a14f73338e17a17b7216dc9aea8 Mon Sep 17 00:00:00 2001 From: "F. Hinkelmann" Date: Thu, 4 Nov 2021 07:01:53 -0400 Subject: [PATCH 0799/1115] chore(cloud-rad): Add code fencing (#1415) Code examples need code fencing around them to distingish from rich text for TSDoc. Internally b/179483748 Script used: https://github.com/fhinkel/cloud-rad-script/blob/main/fixExampleComments.js --- handwritten/pubsub/src/iam.ts | 8 ++ handwritten/pubsub/src/index.ts | 16 +++- .../pubsub/src/publisher/flow-publisher.ts | 6 ++ handwritten/pubsub/src/pubsub.ts | 50 +++++++++++-- handwritten/pubsub/src/schema.ts | 13 +++- handwritten/pubsub/src/snapshot.ts | 8 ++ handwritten/pubsub/src/subscriber.ts | 6 ++ handwritten/pubsub/src/subscription.ts | 65 ++++++++++++++--- handwritten/pubsub/src/topic.ts | 73 ++++++++++++++++--- handwritten/pubsub/src/v1/publisher_client.ts | 18 +++++ .../pubsub/src/v1/schema_service_client.ts | 12 +++ .../pubsub/src/v1/subscriber_client.ts | 32 ++++++++ 12 files changed, 271 insertions(+), 36 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 4b1bc194569..8dfbd672c61 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -83,6 +83,7 @@ export type TestIamPermissionsCallback = ResourceCallback< * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -91,6 +92,7 @@ export type TestIamPermissionsCallback = ResourceCallback< * * const subscription = pubsub.subscription('my-subscription'); * // subscription.iam + * ``` */ export class IAM { pubsub: PubSub; @@ -127,6 +129,7 @@ export class IAM { * @see [Subscriptions: getIamPolicy API Documentation]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/projects.subscriptions/getIamPolicy} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -144,6 +147,7 @@ export class IAM { * const policy = data[0]; * const apiResponse = data[1]; * }); + * ``` */ getPolicy( optsOrCallback?: CallOptions | GetPolicyCallback, @@ -202,6 +206,7 @@ export class IAM { * @see [Policy]{@link https://cloud.google.com/pubsub/docs/reference/rest/v1/Policy} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -230,6 +235,7 @@ export class IAM { * const policy = data[0]; * const apiResponse = data[1]; * }); + * ``` */ setPolicy( policy: Policy, @@ -306,6 +312,7 @@ export class IAM { * @see [Permissions Reference]{@link https://cloud.google.com/pubsub/access_control#permissions} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -347,6 +354,7 @@ export class IAM { * const permissions = data[0]; * const apiResponse = data[1]; * }); + * ``` */ testPermissions( permissions: string | string[], diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index a0094d6ce1c..2744b8a2ba1 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -31,21 +31,29 @@ * @module {PubSub} @google-cloud/pubsub * @alias nodejs-pubsub * - * @example Install the client library with npm: + * @example Install the client library with npm: + * ``` * npm install @google-cloud/pubsub * - * @example Import the client library + * ``` + * @example Import the client library + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * - * @example Create a client that uses Application Default Credentials (ADC): + * ``` + * @example Create a client that uses Application Default Credentials (ADC): + * ``` * const pubsub = new PubSub(); * - * @example Create a client with explicit credentials: + * ``` + * @example Create a client with explicit credentials: + * ``` * const pubsub = new PubSub({ * projectId: 'your-project-id', * keyFilename: '/path/to/keyfile.json' * }); * + * ``` * @example include:samples/quickstart.js * region_tag:pubsub_quickstart_create_topic * Full quickstart example: diff --git a/handwritten/pubsub/src/publisher/flow-publisher.ts b/handwritten/pubsub/src/publisher/flow-publisher.ts index c5c51f72593..ebfee5b0faa 100644 --- a/handwritten/pubsub/src/publisher/flow-publisher.ts +++ b/handwritten/pubsub/src/publisher/flow-publisher.ts @@ -62,14 +62,18 @@ export class FlowControlledPublisher { * @returns null, or a Promise that resolves when sending may resume. * * @example + * ``` * const wait = flowControlled.publish({data}); * if (wait) { * await wait; * } * + * ``` * @example + * ``` * // It's okay to await unconditionally, it's equivalent to nextTick(). * await flowControlled.publish(data); + * ``` */ publish(message: PubsubMessage): Promise | null { const doPublish = () => { @@ -97,9 +101,11 @@ export class FlowControlledPublisher { * @param {Attributes} [attributes] Optional attributes. * * @example + * ``` * if (!flowControlled.wouldExceed(data)) { * flowControlled.publishNow(data); * } + * ``` */ publishNow(message: PubsubMessage): void { this.flowControl.addToCount(calculateMessageSize(message), 1); diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 046a2e5ea32..f277f101b4b 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -227,18 +227,24 @@ interface GetClientCallback { * * @param {ClientConfig} [options] Configuration options. * - * @example Import the client library + * @example Import the client library + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * - * @example Create a client that uses Application Default Credentials (ADC): + * ``` + * @example Create a client that uses Application Default Credentials (ADC): + * ``` * const pubsub = new PubSub(); * - * @example Create a client with explicit credentials: + * ``` + * @example Create a client with explicit credentials: + * ``` * const pubsub = new PubSub({ * projectId: 'your-project-id', * keyFilename: '/path/to/keyfile.json' * }); * + * ``` * @example include:samples/quickstart.js * region_tag:pubsub_quickstart_create_topic * Full quickstart example: @@ -352,7 +358,8 @@ export class PubSub { * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @returns {Promise} * - * @example Create a schema. + * @example Create a schema. + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -361,6 +368,7 @@ export class PubSub { * SchemaTypes.Avro, * '{...avro definition...}' * ); + * ``` */ async createSchema( schemaId: string, @@ -465,7 +473,8 @@ export class PubSub { * @param {CreateSubscriptionCallback} [callback] Callback function. * @returns {Promise} * - * @example Subscribe to a topic. + * @example Subscribe to a topic. + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -476,12 +485,15 @@ export class PubSub { * * pubsub.createSubscription(topic, name, callback); * - * @example If the callback is omitted, we'll return a Promise. + * ``` + * @example If the callback is omitted, we'll return a Promise. + * ``` * pubsub.createSubscription(topic, name) * .then(function(data) { * const subscription = data[0]; * const apiResponse = data[1]; * }); + * ``` */ createSubscription( topic: Topic | string, @@ -580,6 +592,7 @@ export class PubSub { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -596,6 +609,7 @@ export class PubSub { * const topic = data[0]; * const apiResponse = data[1]; * }); + * ``` */ createTopic( name: string | TopicMetadata, @@ -658,6 +672,7 @@ export class PubSub { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -673,6 +688,7 @@ export class PubSub { * pubsub.detachSubscription('my-sub').then(data => { * const apiResponse = data[0]; * }); + * ``` */ detachSubscription( name: string, @@ -786,9 +802,11 @@ export class PubSub { * @returns {AsyncIterable} * * @example + * ``` * for await (const s of pubsub.listSchemas()) { * const moreInfo = await s.get(); * } + * ``` */ async *listSchemas( view: SchemaView = SchemaViews.Basic, @@ -838,6 +856,7 @@ export class PubSub { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -853,6 +872,7 @@ export class PubSub { * pubsub.getSnapshots().then(function(data) { * const snapshots = data[0]; * }); + * ``` */ getSnapshots( optsOrCallback?: PageOptions | GetSnapshotsCallback, @@ -955,6 +975,7 @@ export class PubSub { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -970,6 +991,7 @@ export class PubSub { * pubsub.getSubscriptions().then(function(data) { * const subscriptions = data[0]; * }); + * ``` */ getSubscriptions( optsOrCallback?: GetSubscriptionsOptions | GetSubscriptionsCallback, @@ -1066,6 +1088,7 @@ export class PubSub { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -1088,6 +1111,7 @@ export class PubSub { * pubsub.getTopics().then(function(data) { * const topics = data[0]; * }); + * ``` */ getTopics( optsOrCallback?: PageOptions | GetTopicsCallback, @@ -1291,10 +1315,12 @@ export class PubSub { * @returns {Schema} A {@link Schema} instance. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const schema = pubsub.schema('my-schema'); + * ``` */ schema(idOrName: string): Schema { return new Schema(this, idOrName); @@ -1310,10 +1336,12 @@ export class PubSub { * @returns {Snapshot} A {@link Snapshot} instance. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const snapshot = pubsub.snapshot('my-snapshot'); + * ``` */ snapshot(name: string): Snapshot { if (typeof name !== 'string') { @@ -1333,6 +1361,7 @@ export class PubSub { * @returns {Subscription} A {@link Subscription} instance. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -1347,6 +1376,7 @@ export class PubSub { * // message.attributes = Attributes of the message. * // message.publishTime = Date when Pub/Sub received the message. * }); + * ``` */ subscription(name: string, options?: SubscriptionOptions): Subscription { if (!name) { @@ -1364,10 +1394,12 @@ export class PubSub { * @returns {Topic} A {@link Topic} instance. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); + * ``` */ topic(name: string, options?: PublishOptions): Topic { if (!name) { @@ -1430,6 +1462,7 @@ export class PubSub { * @returns {ReadableStream} A readable stream of {@link Snapshot} instances. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -1450,6 +1483,7 @@ export class PubSub { * .on('data', function(snapshot) { * this.end(); * }); + * ``` */ /** @@ -1462,6 +1496,7 @@ export class PubSub { * @returns {ReadableStream} A readable stream of {@link Subscription} instances. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -1482,6 +1517,7 @@ export class PubSub { * .on('data', function(subscription) { * this.end(); * }); + * ``` */ /** @@ -1494,6 +1530,7 @@ export class PubSub { * @returns {ReadableStream} A readable stream of {@link Topic} instances. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -1514,6 +1551,7 @@ export class PubSub { * .on('data', function(topic) { * this.end(); * }); + * ``` */ /*! Developer Documentation diff --git a/handwritten/pubsub/src/schema.ts b/handwritten/pubsub/src/schema.ts index a5ca74e0e28..93cb624af4f 100644 --- a/handwritten/pubsub/src/schema.ts +++ b/handwritten/pubsub/src/schema.ts @@ -31,19 +31,22 @@ import {PubSub} from './pubsub'; * @param {PubSub} pubsub The PubSub object creating this object. * @param {id} id name or ID of the schema. * - * @example Creating an instance of this class. + * @example Creating an instance of this class. + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const schema = pubsub.schema('my-schema'); * - * @example Getting the details of a schema. Note that Schema - * methods do not provide a callback interface. Use .then() or await. + * ``` + * @example Getting the details of a schema. Note that Schema methods do not provide a callback interface. Use .then() or await. + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const schema = pubsub.schema('my-schema'); * schema.get(SchemaViews.Basic).then(console.log); + * ``` */ export class Schema { id: string; @@ -104,7 +107,8 @@ export class Schema { * here: https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html. * @returns {Promise} * - * @example Create a schema. + * @example Create a schema. + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -113,6 +117,7 @@ export class Schema { * SchemaTypes.Avro, * '{...avro definition...}' * ); + * ``` */ async create( type: SchemaType, diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index d6173cc695f..185e60f828d 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -56,6 +56,7 @@ export type SeekResponse = [google.pubsub.v1.ISeekResponse]; * @class * * @example + * ``` * //- * // From {@link PubSub#getSnapshots}: * //- @@ -99,6 +100,7 @@ export type SeekResponse = [google.pubsub.v1.ISeekResponse]; * // Error handling omitted. * } * }); + * ``` */ export class Snapshot { parent: Subscription | PubSub; @@ -121,6 +123,7 @@ export class Snapshot { * service. * * @example + * ``` * snapshot.delete((err, apiResponse) => {}); * * //- @@ -129,6 +132,7 @@ export class Snapshot { * snapshot.delete().then((data) => { * const apiResponse = data[0]; * }); + * ``` */ delete(callback?: EmptyCallback): void | Promise { const reqOpts = { @@ -174,6 +178,7 @@ export class Snapshot { * service. * * @example + * ``` * const subscription = pubsub.subscription('my-subscription'); * const snapshot = subscription.snapshot('my-snapshot'); * @@ -192,6 +197,7 @@ export class Snapshot { * const snapshot = data[0]; * const apiResponse = data[1]; * }); + * ``` */ create( optsOrCallback?: CallOptions | CreateSnapshotCallback, @@ -236,6 +242,7 @@ export class Snapshot { * service. * * @example + * ``` * const subscription = pubsub.subscription('my-subscription'); * const snapshot = subscription.snapshot('my-snapshot'); * @@ -247,6 +254,7 @@ export class Snapshot { * snapshot.seek().then((data) => { * const apiResponse = data[0]; * }); + * ``` */ seek( gaxOpts?: CallOptions | SeekCallback, diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 534e288ac6d..46c1ebe6091 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -45,6 +45,7 @@ export type PullResponse = google.pubsub.v1.IPullResponse; * acknowledge the message. * * @example + * ``` * subscription.on('message', message => { * // { * // ackId: 'RUFeQBJMJAxESVMrQwsqWBFOBCEhPjA', @@ -57,6 +58,7 @@ export type PullResponse = google.pubsub.v1.IPullResponse; * // length: 13 * // } * }); + * ``` */ export class Message { ackId: string; @@ -163,9 +165,11 @@ export class Message { * Acknowledges the message. * * @example + * ``` * subscription.on('message', message => { * message.ack(); * }); + * ``` */ ack(): void { if (!this._handled) { @@ -188,9 +192,11 @@ export class Message { * Removes the message from our inventory and schedules it to be redelivered. * * @example + * ``` * subscription.on('message', message => { * message.nack(); * }); + * ``` */ nack(): void { if (!this._handled) { diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 28ae5f6d1de..96f6cc968af 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -182,7 +182,8 @@ export type DetachSubscriptionResponse = EmptyResponse; * @param {string} name The name of the subscription. * @param {SubscriberOptions} [options] Options for handling messages. * - * @example From {@link PubSub#getSubscriptions} + * @example From {@link PubSub#getSubscriptions} + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -190,26 +191,32 @@ export type DetachSubscriptionResponse = EmptyResponse; * // `subscriptions` is an array of Subscription objects. * }); * - * @example From {@link Topic#getSubscriptions} + * ``` + * @example From {@link Topic#getSubscriptions} + * ``` * const topic = pubsub.topic('my-topic'); * topic.getSubscriptions((err, subscriptions) => { * // `subscriptions` is an array of Subscription objects. * }); * - * @example {@link Topic#createSubscription} + * ``` + * @example {@link Topic#createSubscription} + * ``` * const topic = pubsub.topic('my-topic'); * topic.createSubscription('new-subscription', (err, subscription) => { * // `subscription` is a Subscription object. * }); * - * @example {@link Topic#subscription} + * ``` + * @example {@link Topic#subscription} + * ``` * const topic = pubsub.topic('my-topic'); * const subscription = topic.subscription('my-subscription'); * // `subscription` is a Subscription object. * - * @example Once you have obtained a subscription object, you may begin - * to register listeners. This will automatically trigger pulling for messages. - * + * ``` + * @example Once you have obtained a subscription object, you may begin to register listeners. This will automatically trigger pulling for messages. + * ``` * // Register an error handler. * subscription.on('error', (err) => {}); * @@ -238,8 +245,9 @@ export type DetachSubscriptionResponse = EmptyResponse; * // Remove the listener from receiving `message` events. * subscription.removeListener('message', onMessage); * - * @example To apply a fine level of flow control, consider the - * following configuration + * ``` + * @example To apply a fine level of flow control, consider the following configuration + * ``` * const subscription = topic.subscription('my-sub', { * flowControl: { * maxMessages: 1, @@ -247,6 +255,7 @@ export type DetachSubscriptionResponse = EmptyResponse; * allowExcessMessages: false * } * }); + * ``` */ export class Subscription extends EventEmitter { pubsub: PubSub; @@ -287,6 +296,7 @@ export class Subscription extends EventEmitter { * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example + * ``` * //- * // Get the IAM policy for your subscription. * //- @@ -301,6 +311,7 @@ export class Subscription extends EventEmitter { * const policy = data[0]; * const apiResponse = data[1]; * }); + * ``` */ this.iam = new IAM(pubsub, this.name); @@ -341,6 +352,7 @@ export class Subscription extends EventEmitter { * Subscription. * * @example + * ``` * subscription.close(err => { * if (err) { * // Error handling omitted. @@ -349,6 +361,7 @@ export class Subscription extends EventEmitter { * * // If the callback is omitted a Promise will be returned. * subscription.close().then(() => {}); + * ``` */ close(callback?: SubscriptionCloseCallback): void | Promise { this._subscriber.close().then(() => callback!(), callback); @@ -377,6 +390,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -386,13 +400,18 @@ export class Subscription extends EventEmitter { * * subscription.create(callback); * - * @example With options + * ``` + * @example With options + * ``` * subscription.create({ * ackDeadlineSeconds: 90 * }, callback); * - * @example If the callback is omitted, we'll return a - * Promise. const [sub, apiResponse] = await subscription.create(); + * ``` + * @example If the callback is omitted, we'll return a Promise. + * ``` + * const [sub, apiResponse] = await subscription.create(); + * ``` */ create( optsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, @@ -454,6 +473,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -475,6 +495,7 @@ export class Subscription extends EventEmitter { * const snapshot = data[0]; * const apiResponse = data[1]; * }); + * ``` */ createSnapshot( name: string, @@ -527,6 +548,7 @@ export class Subscription extends EventEmitter { * @param {object} callback.apiResponse Raw API response. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -541,6 +563,7 @@ export class Subscription extends EventEmitter { * subscription.delete().then((data) => { * const apiResponse = data[0]; * }); + * ``` */ delete( optsOrCallback?: CallOptions | EmptyCallback, @@ -586,6 +609,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -600,6 +624,7 @@ export class Subscription extends EventEmitter { * subscription.detached().then((data) => { * const detached = data[0]; * }); + * ``` */ detached(callback?: DetachedCallback): void | Promise { this.getMetadata((err, metadata) => { @@ -629,6 +654,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -643,6 +669,7 @@ export class Subscription extends EventEmitter { * subscription.exists().then((data) => { * const exists = data[0]; * }); + * ``` */ exists(callback?: ExistsCallback): void | Promise { this.getMetadata(err => { @@ -684,6 +711,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -701,6 +729,7 @@ export class Subscription extends EventEmitter { * const subscription = data[0]; * const apiResponse = data[1]; * }); + * ``` */ get( optsOrCallback?: GetSubscriptionOptions | GetSubscriptionCallback, @@ -751,6 +780,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -769,6 +799,7 @@ export class Subscription extends EventEmitter { * subscription.getMetadata().then((data) => { * const apiResponse = data[0]; * }); + * ``` */ getMetadata( optsOrCallback?: CallOptions | GetSubscriptionMetadataCallback, @@ -833,6 +864,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -862,6 +894,7 @@ export class Subscription extends EventEmitter { * subscription.modifyPushConfig(pushConfig).then((data) => { * const apiResponse = data[0]; * }); + * ``` */ modifyPushConfig( config: PushConfig, @@ -894,6 +927,7 @@ export class Subscription extends EventEmitter { * new `message` event listener which will also re-open the Subscription. * * @example + * ``` * subscription.on('message', message => message.ack()); * * // Close the subscription. @@ -907,6 +941,7 @@ export class Subscription extends EventEmitter { * * // Resume receiving messages. * subscription.open(); + * ``` */ open() { if (!this._subscriber.isOpen) { @@ -941,6 +976,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const callback = (err, resp) => { * if (!err) { * // Seek was successful. @@ -957,6 +993,7 @@ export class Subscription extends EventEmitter { * const date = new Date('October 21 2015'); * * subscription.seek(date, callback); + * ``` */ seek( snapshot: string | Date, @@ -1025,6 +1062,7 @@ export class Subscription extends EventEmitter { * @returns {Promise} * * @example + * ``` * const metadata = { * key: 'value' * }; @@ -1041,6 +1079,7 @@ export class Subscription extends EventEmitter { * subscription.setMetadata(metadata).then((data) => { * const apiResponse = data[0]; * }); + * ``` */ setMetadata( metadata: SubscriptionMetadata, @@ -1087,7 +1126,9 @@ export class Subscription extends EventEmitter { * @returns {Snapshot} * * @example + * ``` * const snapshot = subscription.snapshot('my-snapshot'); + * ``` */ snapshot(name: string): Snapshot { return this.pubsub.snapshot.call(this, name); diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index ca748e5e485..4beb90f2844 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -92,13 +92,17 @@ export type MessageOptions = PubsubMessage & {json?: any}; * @param {PublishOptions} [options] Publisher configuration object. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * * const topic = pubsub.topic('my-topic'); * - * @example To enable message ordering, set `enableMessageOrdering` to true. Please note that this does not persist to an actual topic. + * ``` + * @example To enable message ordering, set `enableMessageOrdering` to true. Please note that this does not persist to an actual topic. + * ``` * const topic = pubsub.topic('ordered-topic', {enableMessageOrdering: true}); + * ``` */ export class Topic { name: string; @@ -153,6 +157,7 @@ export class Topic { * @see [What is Cloud IAM?]{@link https://cloud.google.com/iam/} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -172,6 +177,7 @@ export class Topic { * const policy = data[0]; * const apiResponse = data[1]; * }); + * ``` */ this.iam = new IAM(pubsub, this.name); } @@ -204,6 +210,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -222,6 +229,7 @@ export class Topic { * const topic = data[0]; * const apiResponse = data[1]; * }); + * ``` */ create( optsOrCallback?: CallOptions | CreateTopicCallback, @@ -258,6 +266,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -279,6 +288,7 @@ export class Topic { * const subscription = data[0]; * const apiResponse = data[1]; * }); + * ``` */ createSubscription( name: string, @@ -312,6 +322,7 @@ export class Topic { * @param {object} callback.apiResponse Raw API response. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -325,6 +336,7 @@ export class Topic { * topic.delete().then((data) => { * const apiResponse = data[0]; * }); + * ``` */ delete( optsOrCallback?: CallOptions | EmptyCallback, @@ -366,6 +378,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -379,6 +392,7 @@ export class Topic { * topic.exists().then((data) => { * const exists = data[0]; * }); + * ``` */ exists(callback?: ExistsCallback): void | Promise { this.getMetadata(err => { @@ -419,6 +433,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -435,6 +450,7 @@ export class Topic { * const topic = data[0]; * const apiResponse = data[1]; * }); + * ``` */ get( optsOrCallback?: GetTopicOptions | GetTopicCallback, @@ -482,6 +498,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -495,6 +512,7 @@ export class Topic { * topic.getMetadata().then((data) => { * const apiResponse = data[0]; * }); + * ``` */ getMetadata( optsOrCallback?: CallOptions | GetTopicMetadataCallback, @@ -546,6 +564,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -566,6 +585,7 @@ export class Topic { * topic.getSubscriptions().then((data) => { * const subscriptions = data[0]; * }); + * ``` */ getSubscriptions( optsOrCallback?: PageOptions | GetTopicSubscriptionsCallback, @@ -633,6 +653,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -647,15 +668,20 @@ export class Topic { * * topic.publish(data, callback); * - * @example Optionally you can provide an object containing attributes for the message. Note that all values in the object must be strings. + * ``` + * @example Optionally you can provide an object containing attributes for the message. Note that all values in the object must be strings. + * ``` * const attributes = { * key: 'value' * }; * * topic.publish(data, attributes, callback); * - * @example If the callback is omitted, we'll return a Promise. + * ``` + * @example If the callback is omitted, we'll return a Promise. + * ``` * topic.publish(data).then((messageId) => {}); + * ``` */ publish( data: Buffer, @@ -691,6 +717,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * const topic = pubsub.topic('my-topic'); @@ -707,15 +734,20 @@ export class Topic { * * topic.publishJSON(data, callback); * - * @example Optionally you can provide an object containing attributes for the message. Note that all values in the object must be strings. + * ``` + * @example Optionally you can provide an object containing attributes for the message. Note that all values in the object must be strings. + * ``` * const attributes = { * key: 'value' * }; * * topic.publishJSON(data, attributes, callback); * - * @example If the callback is omitted, we'll return a Promise. + * ``` + * @example If the callback is omitted, we'll return a Promise. + * ``` * topic.publishJSON(data).then((messageId) => {}); + * ``` */ publishJSON( json: object, @@ -756,6 +788,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * const topic = pubsub.topic('my-topic'); @@ -770,19 +803,26 @@ export class Topic { * * topic.publishMessage({data}, callback); * - * @example Publish JSON message data. + * ``` + * @example Publish JSON message data. + * ``` * const json = {foo: 'bar'}; * * topic.publishMessage({json}, callback); * - * @example To publish messages in order (this is still experimental), make sure message ordering is enabled and provide an ordering key + * ``` + * @example To publish messages in order (this is still experimental), make sure message ordering is enabled and provide an ordering key + * ``` * const topic = pubsub.topic('ordered-topic', {messageOrdering: true}); * const orderingKey = 'my-key'; * * topic.publishMessage({data, orderingKey}, callback); * - * @example If the callback is omitted, we'll return a Promise. + * ``` + * @example If the callback is omitted, we'll return a Promise. + * ``` * const [messageId] = await topic.publishMessage({data}); + * ``` */ publishMessage( message: MessageOptions, @@ -826,6 +866,7 @@ export class Topic { * @param {string} orderingKey The ordering key in question. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * const topic = pubsub.topic('my-topic', {messageOrdering: true}); @@ -838,6 +879,7 @@ export class Topic { * topic.resumePublishing(orderingKey); * } * }); + * ``` */ resumePublishing(orderingKey: string): void { this.publisher.resumePublishing(orderingKey); @@ -877,6 +919,7 @@ export class Topic { * @returns {Promise} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -891,11 +934,13 @@ export class Topic { * } * }); * - * @example If the callback is omitted, we'll return a - * Promise. + * ``` + * @example If the callback is omitted, we'll return a Promise. + * ``` * topic.setMetadata(metadata).then((data) => { * const apiResponse = data[0]; * }); + * ``` */ setMetadata( options: TopicMetadata, @@ -926,6 +971,7 @@ export class Topic { * @param {PublishOptions} options The publisher options. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -936,6 +982,7 @@ export class Topic { * maxMilliseconds: 10 * } * }); + * ``` */ setPublishOptions(options: PublishOptions): void { this.publisher.setOptions(options); @@ -946,6 +993,7 @@ export class Topic { * back into {@link Topic#setPublishOptions}. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -954,6 +1002,7 @@ export class Topic { * const defaults = topic.getPublishOptionDefaults(); * defaults.batching.maxMilliseconds = 10; * topic.setPublishOptions(defaults); + * ``` */ getPublishOptionDefaults(): PublishOptions { // Generally I'd leave this as a static, but it'll be easier for users to @@ -973,6 +1022,7 @@ export class Topic { * @return {Subscription} * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -988,6 +1038,7 @@ export class Topic { * // message.attributes = Attributes of the message. * // message.publishTime = Timestamp when Pub/Sub received the message. * }); + * ``` */ subscription(name: string, options?: SubscriptionOptions): Subscription { options = options || {}; @@ -1022,6 +1073,7 @@ export class Topic { * @returns {ReadableStream} A readable stream of {@link Subscription} instances. * * @example + * ``` * const {PubSub} = require('@google-cloud/pubsub'); * const pubsub = new PubSub(); * @@ -1044,6 +1096,7 @@ export class Topic { * .on('data', function(subscription) { * this.end(); * }); + * ``` */ /*! Developer Documentation diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 7895eed1665..c8be975b282 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -445,7 +445,9 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.createTopic(request); + * ``` */ createTopic( request?: protos.google.pubsub.v1.ITopic, @@ -535,7 +537,9 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.updateTopic(request); + * ``` */ updateTopic( request?: protos.google.pubsub.v1.IUpdateTopicRequest, @@ -622,7 +626,9 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.publish(request); + * ``` */ publish( request?: protos.google.pubsub.v1.IPublishRequest, @@ -706,7 +712,9 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.getTopic(request); + * ``` */ getTopic( request?: protos.google.pubsub.v1.IGetTopicRequest, @@ -794,7 +802,9 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.deleteTopic(request); + * ``` */ deleteTopic( request?: protos.google.pubsub.v1.IDeleteTopicRequest, @@ -881,7 +891,9 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.detachSubscription(request); + * ``` */ detachSubscription( request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, @@ -1089,10 +1101,12 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. * @example + * ``` * const iterable = client.listTopicsAsync(request); * for await (const response of iterable) { * // process response * } + * ``` */ listTopicsAsync( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1293,10 +1307,12 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. * @example + * ``` * const iterable = client.listTopicSubscriptionsAsync(request); * for await (const response of iterable) { * // process response * } + * ``` */ listTopicSubscriptionsAsync( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1491,10 +1507,12 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. * @example + * ``` * const iterable = client.listTopicSnapshotsAsync(request); * for await (const response of iterable) { * // process response * } + * ``` */ listTopicSnapshotsAsync( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 9a13c78bfb0..7671dcb95fa 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -392,7 +392,9 @@ export class SchemaServiceClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.createSchema(request); + * ``` */ createSchema( request?: protos.google.pubsub.v1.ICreateSchemaRequest, @@ -480,7 +482,9 @@ export class SchemaServiceClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.getSchema(request); + * ``` */ getSchema( request?: protos.google.pubsub.v1.IGetSchemaRequest, @@ -564,7 +568,9 @@ export class SchemaServiceClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.deleteSchema(request); + * ``` */ deleteSchema( request?: protos.google.pubsub.v1.IDeleteSchemaRequest, @@ -650,7 +656,9 @@ export class SchemaServiceClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.validateSchema(request); + * ``` */ validateSchema( request?: protos.google.pubsub.v1.IValidateSchemaRequest, @@ -744,7 +752,9 @@ export class SchemaServiceClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.validateMessage(request); + * ``` */ validateMessage( request?: protos.google.pubsub.v1.IValidateMessageRequest, @@ -964,10 +974,12 @@ export class SchemaServiceClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. * @example + * ``` * const iterable = client.listSchemasAsync(request); * for await (const response of iterable) { * // process response * } + * ``` */ listSchemasAsync( request?: protos.google.pubsub.v1.IListSchemasRequest, diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index f7dd6149749..88dc39b1703 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -516,7 +516,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.createSubscription(request); + * ``` */ createSubscription( request?: protos.google.pubsub.v1.ISubscription, @@ -600,7 +602,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.getSubscription(request); + * ``` */ getSubscription( request?: protos.google.pubsub.v1.IGetSubscriptionRequest, @@ -687,7 +691,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.updateSubscription(request); + * ``` */ updateSubscription( request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, @@ -775,7 +781,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.deleteSubscription(request); + * ``` */ deleteSubscription( request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, @@ -874,7 +882,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.modifyAckDeadline(request); + * ``` */ modifyAckDeadline( request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, @@ -968,7 +978,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.acknowledge(request); + * ``` */ acknowledge( request?: protos.google.pubsub.v1.IAcknowledgeRequest, @@ -1066,7 +1078,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.pull(request); + * ``` */ pull( request?: protos.google.pubsub.v1.IPullRequest, @@ -1162,7 +1176,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.modifyPushConfig(request); + * ``` */ modifyPushConfig( request?: protos.google.pubsub.v1.IModifyPushConfigRequest, @@ -1250,7 +1266,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.getSnapshot(request); + * ``` */ getSnapshot( request?: protos.google.pubsub.v1.IGetSnapshotRequest, @@ -1366,7 +1384,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.createSnapshot(request); + * ``` */ createSnapshot( request?: protos.google.pubsub.v1.ICreateSnapshotRequest, @@ -1457,7 +1477,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.updateSnapshot(request); + * ``` */ updateSnapshot( request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, @@ -1549,7 +1571,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.deleteSnapshot(request); + * ``` */ deleteSnapshot( request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, @@ -1654,7 +1678,9 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. * @example + * ``` * const [response] = await client.seek(request); + * ``` */ seek( request?: protos.google.pubsub.v1.ISeekRequest, @@ -1715,11 +1741,13 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming) * for more details and examples. * @example + * ``` * const stream = client.streamingPull(); * stream.on('data', (response) => { ... }); * stream.on('end', () => { ... }); * stream.write(request); * stream.end(); + * ``` */ streamingPull(options?: CallOptions): gax.CancellableStream { this.initialize(); @@ -1892,10 +1920,12 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. * @example + * ``` * const iterable = client.listSubscriptionsAsync(request); * for await (const response of iterable) { * // process response * } + * ``` */ listSubscriptionsAsync( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -2088,10 +2118,12 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. * @example + * ``` * const iterable = client.listSnapshotsAsync(request); * for await (const response of iterable) { * // process response * } + * ``` */ listSnapshotsAsync( request?: protos.google.pubsub.v1.IListSnapshotsRequest, From 2d247ae9bd8640789df01ee7dd76431edfb33b4f Mon Sep 17 00:00:00 2001 From: "F. Hinkelmann" Date: Thu, 4 Nov 2021 15:32:17 -0400 Subject: [PATCH 0800/1115] chore(cloud-rad): delete api-extractor config (#1419) --- handwritten/pubsub/api-extractor.json | 369 -------------------------- 1 file changed, 369 deletions(-) delete mode 100644 handwritten/pubsub/api-extractor.json diff --git a/handwritten/pubsub/api-extractor.json b/handwritten/pubsub/api-extractor.json deleted file mode 100644 index de228294b23..00000000000 --- a/handwritten/pubsub/api-extractor.json +++ /dev/null @@ -1,369 +0,0 @@ -/** - * Config file for API Extractor. For more info, please visit: https://api-extractor.com - */ -{ - "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", - - /** - * Optionally specifies another JSON config file that this file extends from. This provides a way for - * standard settings to be shared across multiple projects. - * - * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains - * the "extends" field. Otherwise, the first path segment is interpreted as an NPM package name, and will be - * resolved using NodeJS require(). - * - * SUPPORTED TOKENS: none - * DEFAULT VALUE: "" - */ - // "extends": "./shared/api-extractor-base.json" - // "extends": "my-package/include/api-extractor-base.json" - - /** - * Determines the "" token that can be used with other config file settings. The project folder - * typically contains the tsconfig.json and package.json config files, but the path is user-defined. - * - * The path is resolved relative to the folder of the config file that contains the setting. - * - * The default value for "projectFolder" is the token "", which means the folder is determined by traversing - * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder - * that contains a tsconfig.json file. If a tsconfig.json file cannot be found in this way, then an error - * will be reported. - * - * SUPPORTED TOKENS: - * DEFAULT VALUE: "" - */ - // "projectFolder": "..", - - /** - * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis. API Extractor - * analyzes the symbols exported by this module. - * - * The file extension must be ".d.ts" and not ".ts". - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * SUPPORTED TOKENS: , , - */ - "mainEntryPointFilePath": "/protos/protos.d.ts", - - /** - * A list of NPM package names whose exports should be treated as part of this package. - * - * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1", - * and another NPM package "library2" is embedded in this bundle. Some types from library2 may become part - * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly - * imports library2. To avoid this, we can specify: - * - * "bundledPackages": [ "library2" ], - * - * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been - * local files for library1. - */ - "bundledPackages": [ ], - - /** - * Determines how the TypeScript compiler engine will be invoked by API Extractor. - */ - "compiler": { - /** - * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project. - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * Note: This setting will be ignored if "overrideTsconfig" is used. - * - * SUPPORTED TOKENS: , , - * DEFAULT VALUE: "/tsconfig.json" - */ - // "tsconfigFilePath": "/tsconfig.json", - - /** - * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk. - * The object must conform to the TypeScript tsconfig schema: - * - * http://json.schemastore.org/tsconfig - * - * If omitted, then the tsconfig.json file will be read from the "projectFolder". - * - * DEFAULT VALUE: no overrideTsconfig section - */ - // "overrideTsconfig": { - // . . . - // } - - /** - * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended - * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when - * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses - * for its analysis. Where possible, the underlying issue should be fixed rather than relying on skipLibCheck. - * - * DEFAULT VALUE: false - */ - // "skipLibCheck": true, - }, - - /** - * Configures how the API report file (*.api.md) will be generated. - */ - "apiReport": { - /** - * (REQUIRED) Whether to generate an API report. - */ - "enabled": true, - - /** - * The filename for the API report files. It will be combined with "reportFolder" or "reportTempFolder" to produce - * a full file path. - * - * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/". - * - * SUPPORTED TOKENS: , - * DEFAULT VALUE: ".api.md" - */ - // "reportFileName": ".api.md", - - /** - * Specifies the folder where the API report file is written. The file name portion is determined by - * the "reportFileName" setting. - * - * The API report file is normally tracked by Git. Changes to it can be used to trigger a branch policy, - * e.g. for an API review. - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * SUPPORTED TOKENS: , , - * DEFAULT VALUE: "/etc/" - */ - // "reportFolder": "/etc/", - - /** - * Specifies the folder where the temporary report file is written. The file name portion is determined by - * the "reportFileName" setting. - * - * After the temporary file is written to disk, it is compared with the file in the "reportFolder". - * If they are different, a production build will fail. - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * SUPPORTED TOKENS: , , - * DEFAULT VALUE: "/temp/" - */ - // "reportTempFolder": "/temp/" - }, - - /** - * Configures how the doc model file (*.api.json) will be generated. - */ - "docModel": { - /** - * (REQUIRED) Whether to generate a doc model file. - */ - "enabled": true, - - /** - * The output path for the doc model file. The file extension should be ".api.json". - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * SUPPORTED TOKENS: , , - * DEFAULT VALUE: "/temp/.api.json" - */ - // "apiJsonFilePath": "/temp/.api.json" - }, - - /** - * Configures how the .d.ts rollup file will be generated. - */ - "dtsRollup": { - /** - * (REQUIRED) Whether to generate the .d.ts rollup file. - */ - "enabled": true, - - /** - * Specifies the output path for a .d.ts rollup file to be generated without any trimming. - * This file will include all declarations that are exported by the main entry point. - * - * If the path is an empty string, then this file will not be written. - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * SUPPORTED TOKENS: , , - * DEFAULT VALUE: "/dist/.d.ts" - */ - // "untrimmedFilePath": "/dist/.d.ts", - - /** - * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release. - * This file will include only declarations that are marked as "@public" or "@beta". - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * SUPPORTED TOKENS: , , - * DEFAULT VALUE: "" - */ - // "betaTrimmedFilePath": "/dist/-beta.d.ts", - - - /** - * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release. - * This file will include only declarations that are marked as "@public". - * - * If the path is an empty string, then this file will not be written. - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * SUPPORTED TOKENS: , , - * DEFAULT VALUE: "" - */ - // "publicTrimmedFilePath": "/dist/-public.d.ts", - - /** - * When a declaration is trimmed, by default it will be replaced by a code comment such as - * "Excluded from this release type: exampleMember". Set "omitTrimmingComments" to true to remove the - * declaration completely. - * - * DEFAULT VALUE: false - */ - // "omitTrimmingComments": true - }, - - /** - * Configures how the tsdoc-metadata.json file will be generated. - */ - "tsdocMetadata": { - /** - * Whether to generate the tsdoc-metadata.json file. - * - * DEFAULT VALUE: true - */ - // "enabled": true, - - /** - * Specifies where the TSDoc metadata file should be written. - * - * The path is resolved relative to the folder of the config file that contains the setting; to change this, - * prepend a folder token such as "". - * - * The default value is "", which causes the path to be automatically inferred from the "tsdocMetadata", - * "typings" or "main" fields of the project's package.json. If none of these fields are set, the lookup - * falls back to "tsdoc-metadata.json" in the package folder. - * - * SUPPORTED TOKENS: , , - * DEFAULT VALUE: "" - */ - // "tsdocMetadataFilePath": "/dist/tsdoc-metadata.json" - }, - - /** - * Specifies what type of newlines API Extractor should use when writing output files. By default, the output files - * will be written with Windows-style newlines. To use POSIX-style newlines, specify "lf" instead. - * To use the OS's default newline kind, specify "os". - * - * DEFAULT VALUE: "crlf" - */ - // "newlineKind": "crlf", - - /** - * Configures how API Extractor reports error and warning messages produced during analysis. - * - * There are three sources of messages: compiler messages, API Extractor messages, and TSDoc messages. - */ - "messages": { - /** - * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing - * the input .d.ts files. - * - * TypeScript message identifiers start with "TS" followed by an integer. For example: "TS2551" - * - * DEFAULT VALUE: A single "default" entry with logLevel=warning. - */ - "compilerMessageReporting": { - /** - * Configures the default routing for messages that don't match an explicit rule in this table. - */ - "default": { - /** - * Specifies whether the message should be written to the the tool's output log. Note that - * the "addToApiReportFile" property may supersede this option. - * - * Possible values: "error", "warning", "none" - * - * Errors cause the build to fail and return a nonzero exit code. Warnings cause a production build fail - * and return a nonzero exit code. For a non-production build (e.g. when "api-extractor run" includes - * the "--local" option), the warning is displayed but the build will not fail. - * - * DEFAULT VALUE: "warning" - */ - "logLevel": "warning", - - /** - * When addToApiReportFile is true: If API Extractor is configured to write an API report file (.api.md), - * then the message will be written inside that file; otherwise, the message is instead logged according to - * the "logLevel" option. - * - * DEFAULT VALUE: false - */ - // "addToApiReportFile": false - }, - - // "TS2551": { - // "logLevel": "warning", - // "addToApiReportFile": true - // }, - // - // . . . - }, - - /** - * Configures handling of messages reported by API Extractor during its analysis. - * - * API Extractor message identifiers start with "ae-". For example: "ae-extra-release-tag" - * - * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings - */ - "extractorMessageReporting": { - "default": { - "logLevel": "warning", - // "addToApiReportFile": false - }, - - // "ae-extra-release-tag": { - // "logLevel": "warning", - // "addToApiReportFile": true - // }, - // - // . . . - }, - - /** - * Configures handling of messages reported by the TSDoc parser when analyzing code comments. - * - * TSDoc message identifiers start with "tsdoc-". For example: "tsdoc-link-tag-unescaped-text" - * - * DEFAULT VALUE: A single "default" entry with logLevel=warning. - */ - "tsdocMessageReporting": { - "default": { - "logLevel": "warning", - // "addToApiReportFile": false - } - - // "tsdoc-link-tag-unescaped-text": { - // "logLevel": "warning", - // "addToApiReportFile": true - // }, - // - // . . . - } - } - -} From 0dc8e6dc1cbc6aa36eebde016f6df6d93163c32e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 4 Nov 2021 21:52:21 +0100 Subject: [PATCH 0801/1115] chore(deps): update dependency sinon to v12 (#1417) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [sinon](https://sinonjs.org/) ([source](https://togithub.com/sinonjs/sinon)) | [`^11.0.0` -> `^12.0.0`](https://renovatebot.com/diffs/npm/sinon/11.1.2/12.0.1) | [![age](https://badges.renovateapi.com/packages/npm/sinon/12.0.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/sinon/12.0.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/sinon/12.0.1/compatibility-slim/11.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/sinon/12.0.1/confidence-slim/11.1.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sinonjs/sinon ### [`v12.0.1`](https://togithub.com/sinonjs/sinon/blob/master/CHANGES.md#​1201) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v12.0.0...v12.0.1) - [`3f598221`](https://togithub.com/sinonjs/sinon/commit/3f598221045904681f2b3b3ba1df617ed5e230e3) Fix issue with npm unlink for npm version > 6 (Carl-Erik Kopseng) > 'npm unlink' would implicitly unlink the current dir > until version 7, which requires an argument - [`51417a38`](https://togithub.com/sinonjs/sinon/commit/51417a38111eeeb7cd14338bfb762cc2df487e1b) Fix bundling of cjs module ([#​2412](https://togithub.com/sinonjs/sinon/issues/2412)) (Julian Grinblat) > - Fix bundling of cjs module > > - Run prettier *Released by [Carl-Erik Kopseng](https://togithub.com/fatso83) on 2021-11-04.* #### 12.0.0 ### [`v12.0.0`](https://togithub.com/sinonjs/sinon/compare/v11.1.2...v12.0.0) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v11.1.2...v12.0.0)
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 932beb9c3a9..f8cea798a52 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -91,7 +91,7 @@ "null-loader": "^4.0.0", "protobufjs": "^6.10.1", "proxyquire": "^2.0.0", - "sinon": "^11.0.0", + "sinon": "^12.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", "typescript": "^3.8.3", From c291e62f0fc41840a9dda1598b66dfc098b4071b Mon Sep 17 00:00:00 2001 From: "F. Hinkelmann" Date: Mon, 8 Nov 2021 11:42:15 -0500 Subject: [PATCH 0802/1115] fix(cloud-rad): move comments for TSDoc (#1423) As we move our ref docs to cloud.google.com, we rely on TSDoc rather JSDoc. TSDoc expects comments before the first overloaded function, we currently have those on the last function. Those comments don't make it into the d.ts files. We need to move comments to the first overloaded function rather than the last one. Internally b/190631834 Script used: https://github.com/fhinkel/cloud-rad-script/blob/main/moveComments.js --- handwritten/pubsub/src/iam.ts | 46 +- handwritten/pubsub/src/publisher/index.ts | 22 +- handwritten/pubsub/src/pubsub.ts | 110 +-- handwritten/pubsub/src/snapshot.ts | 16 +- handwritten/pubsub/src/subscription.ts | 132 +-- handwritten/pubsub/src/topic.ts | 120 +-- handwritten/pubsub/src/v1/publisher_client.ts | 452 +++++----- .../pubsub/src/v1/schema_service_client.ts | 298 +++---- .../pubsub/src/v1/subscriber_client.ts | 806 +++++++++--------- 9 files changed, 1001 insertions(+), 1001 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 8dfbd672c61..67732eda0c5 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -105,9 +105,6 @@ export class IAM { this.id = id; } - getPolicy(gaxOpts?: CallOptions): Promise; - getPolicy(callback: GetPolicyCallback): void; - getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; /** * @typedef {array} GetPolicyResponse * @property {object} 0 The policy. @@ -149,6 +146,9 @@ export class IAM { * }); * ``` */ + getPolicy(gaxOpts?: CallOptions): Promise; + getPolicy(callback: GetPolicyCallback): void; + getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; getPolicy( optsOrCallback?: CallOptions | GetPolicyCallback, callback?: GetPolicyCallback @@ -171,13 +171,6 @@ export class IAM { ); } - setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise; - setPolicy( - policy: Policy, - gaxOpts: CallOptions, - callback: SetPolicyCallback - ): void; - setPolicy(policy: Policy, callback: SetPolicyCallback): void; /** * @typedef {array} SetPolicyResponse * @property {object} 0 The policy. @@ -237,6 +230,13 @@ export class IAM { * }); * ``` */ + setPolicy(policy: Policy, gaxOpts?: CallOptions): Promise; + setPolicy( + policy: Policy, + gaxOpts: CallOptions, + callback: SetPolicyCallback + ): void; + setPolicy(policy: Policy, callback: SetPolicyCallback): void; setPolicy( policy: Policy, optsOrCallback?: CallOptions | SetPolicyCallback, @@ -265,19 +265,6 @@ export class IAM { ); } - testPermissions( - permissions: string | string[], - gaxOpts?: CallOptions - ): Promise; - testPermissions( - permissions: string | string[], - gaxOpts: CallOptions, - callback: TestIamPermissionsCallback - ): void; - testPermissions( - permissions: string | string[], - callback: TestIamPermissionsCallback - ): void; /** * @callback TestIamPermissionsCallback * @param {?Error} err Request error, if any. @@ -356,6 +343,19 @@ export class IAM { * }); * ``` */ + testPermissions( + permissions: string | string[], + gaxOpts?: CallOptions + ): Promise; + testPermissions( + permissions: string | string[], + gaxOpts: CallOptions, + callback: TestIamPermissionsCallback + ): void; + testPermissions( + permissions: string | string[], + callback: TestIamPermissionsCallback + ): void; testPermissions( permissions: string | string[], optsOrCallback?: CallOptions | TestIamPermissionsCallback, diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 60a4668e2f2..67619f86c62 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -95,8 +95,6 @@ export class Publisher { this.orderedQueues = new Map(); } - flush(): Promise; - flush(callback: EmptyCallback): void; /** * Immediately sends all remaining queued data. This is mostly useful * if you are planning to call close() on the PubSub object that holds @@ -107,6 +105,8 @@ export class Publisher { * @param {EmptyCallback} [callback] Callback function. * @returns {Promise} */ + flush(): Promise; + flush(callback: EmptyCallback): void; flush(callback?: EmptyCallback): Promise | void { const definedCallback = callback ? callback : () => {}; @@ -122,13 +122,6 @@ export class Publisher { }) .catch(definedCallback); } - publish(data: Buffer, attributes?: Attributes): Promise; - publish(data: Buffer, callback: PublishCallback): void; - publish( - data: Buffer, - attributes: Attributes, - callback: PublishCallback - ): void; /** * Publish the provided message. * @@ -143,6 +136,13 @@ export class Publisher { * @param {PublishCallback} [callback] Callback function. * @returns {Promise} */ + publish(data: Buffer, attributes?: Attributes): Promise; + publish(data: Buffer, callback: PublishCallback): void; + publish( + data: Buffer, + attributes: Attributes, + callback: PublishCallback + ): void; publish( data: Buffer, attrsOrCb?: Attributes | PublishCallback, @@ -153,8 +153,6 @@ export class Publisher { return this.publishMessage({data, attributes}, callback!); } - publishMessage(message: PubsubMessage): Promise; - publishMessage(message: PubsubMessage, callback: PublishCallback): void; /** * Publish the provided message. * @@ -166,6 +164,8 @@ export class Publisher { * @param {PubsubMessage} [message] Options for this message. * @param {PublishCallback} [callback] Callback function. */ + publishMessage(message: PubsubMessage): Promise; + publishMessage(message: PubsubMessage, callback: PublishCallback): void; publishMessage( message: PubsubMessage, callback?: PublishCallback diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index f277f101b4b..beb59ae6aca 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -313,8 +313,6 @@ export class PubSub { return this.projectId.indexOf(PROJECT_ID_PLACEHOLDER) < 0; } - close(): Promise; - close(callback: EmptyCallback): void; /** * Closes out this object, releasing any server connections. Note that once * you close a PubSub object, it may not be used again. Any pending operations @@ -326,6 +324,8 @@ export class PubSub { * @callback EmptyCallback * @returns {Promise} */ + close(): Promise; + close(callback: EmptyCallback): void; close(callback?: EmptyCallback): Promise | void { const definedCallback = callback || (() => {}); if (this.isOpen) { @@ -395,22 +395,6 @@ export class PubSub { return new Schema(this, schemaName); } - createSubscription( - topic: Topic | string, - name: string, - options?: CreateSubscriptionOptions - ): Promise; - createSubscription( - topic: Topic | string, - name: string, - callback: CreateSubscriptionCallback - ): void; - createSubscription( - topic: Topic | string, - name: string, - options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback - ): void; /** * @typedef {array} CreateSubscriptionResponse * @property {Subscription} 0 The new {@link Subscription}. @@ -495,6 +479,22 @@ export class PubSub { * }); * ``` */ + createSubscription( + topic: Topic | string, + name: string, + options?: CreateSubscriptionOptions + ): Promise; + createSubscription( + topic: Topic | string, + name: string, + callback: CreateSubscriptionCallback + ): void; + createSubscription( + topic: Topic | string, + name: string, + options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback + ): void; createSubscription( topic: Topic | string, name: string, @@ -556,19 +556,6 @@ export class PubSub { ); } - createTopic( - name: string | TopicMetadata, - gaxOpts?: CallOptions - ): Promise; - createTopic( - name: string | TopicMetadata, - callback: CreateTopicCallback - ): void; - createTopic( - name: string | TopicMetadata, - gaxOpts: CallOptions, - callback: CreateTopicCallback - ): void; /** * @typedef {array} CreateTopicResponse * @property {Topic} 0 The new {@link Topic}. @@ -611,6 +598,19 @@ export class PubSub { * }); * ``` */ + createTopic( + name: string | TopicMetadata, + gaxOpts?: CallOptions + ): Promise; + createTopic( + name: string | TopicMetadata, + callback: CreateTopicCallback + ): void; + createTopic( + name: string | TopicMetadata, + gaxOpts: CallOptions, + callback: CreateTopicCallback + ): void; createTopic( name: string | TopicMetadata, optsOrCallback?: CallOptions | CreateTopicCallback, @@ -650,16 +650,6 @@ export class PubSub { ); } - detachSubscription( - name: string, - gaxOpts?: CallOptions - ): Promise; - detachSubscription(name: string, callback: DetachSubscriptionCallback): void; - detachSubscription( - name: string, - gaxOpts: CallOptions, - callback: DetachSubscriptionCallback - ): void; /** * Detach a subscription with the given name. * @@ -690,6 +680,16 @@ export class PubSub { * }); * ``` */ + detachSubscription( + name: string, + gaxOpts?: CallOptions + ): Promise; + detachSubscription(name: string, callback: DetachSubscriptionCallback): void; + detachSubscription( + name: string, + gaxOpts: CallOptions, + callback: DetachSubscriptionCallback + ): void; detachSubscription( name: string, optsOrCallback?: CallOptions | DetachSubscriptionCallback, @@ -823,9 +823,6 @@ export class PubSub { } } - getSnapshots(options?: PageOptions): Promise; - getSnapshots(callback: GetSnapshotsCallback): void; - getSnapshots(options: PageOptions, callback: GetSnapshotsCallback): void; /** * Query object for listing snapshots. * @@ -874,6 +871,9 @@ export class PubSub { * }); * ``` */ + getSnapshots(options?: PageOptions): Promise; + getSnapshots(callback: GetSnapshotsCallback): void; + getSnapshots(options: PageOptions, callback: GetSnapshotsCallback): void; getSnapshots( optsOrCallback?: PageOptions | GetSnapshotsCallback, callback?: GetSnapshotsCallback @@ -926,14 +926,6 @@ export class PubSub { ); } - getSubscriptions( - options?: GetSubscriptionsOptions - ): Promise; - getSubscriptions(callback: GetSubscriptionsCallback): void; - getSubscriptions( - options: GetSubscriptionsOptions, - callback: GetSubscriptionsCallback - ): void; /** * Query object for listing subscriptions. * @@ -993,6 +985,14 @@ export class PubSub { * }); * ``` */ + getSubscriptions( + options?: GetSubscriptionsOptions + ): Promise; + getSubscriptions(callback: GetSubscriptionsCallback): void; + getSubscriptions( + options: GetSubscriptionsOptions, + callback: GetSubscriptionsCallback + ): void; getSubscriptions( optsOrCallback?: GetSubscriptionsOptions | GetSubscriptionsCallback, callback?: GetSubscriptionsCallback @@ -1052,9 +1052,6 @@ export class PubSub { ); } - getTopics(options?: PageOptions): Promise; - getTopics(callback: GetTopicsCallback): void; - getTopics(options: PageOptions, callback: GetTopicsCallback): void; /** * Query object for listing topics. * @@ -1113,6 +1110,9 @@ export class PubSub { * }); * ``` */ + getTopics(options?: PageOptions): Promise; + getTopics(callback: GetTopicsCallback): void; + getTopics(options: PageOptions, callback: GetTopicsCallback): void; getTopics( optsOrCallback?: PageOptions | GetTopicsCallback, callback?: GetTopicsCallback diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index 185e60f828d..da907ef60a6 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -111,8 +111,6 @@ export class Snapshot { this.name = Snapshot.formatName_(parent.projectId, name); } - delete(): Promise; - delete(callback: EmptyCallback): void; /** * Delete the snapshot. * @@ -134,6 +132,8 @@ export class Snapshot { * }); * ``` */ + delete(): Promise; + delete(callback: EmptyCallback): void; delete(callback?: EmptyCallback): void | Promise { const reqOpts = { snapshot: this.name, @@ -159,9 +159,6 @@ export class Snapshot { return 'projects/' + projectId + '/snapshots/' + name.split('/').pop(); } - create(gaxOpts?: CallOptions): Promise; - create(callback: CreateSnapshotCallback): void; - create(gaxOpts: CallOptions, callback: CreateSnapshotCallback): void; /** * Create a snapshot with the given name. * @@ -199,6 +196,9 @@ export class Snapshot { * }); * ``` */ + create(gaxOpts?: CallOptions): Promise; + create(callback: CreateSnapshotCallback): void; + create(gaxOpts: CallOptions, callback: CreateSnapshotCallback): void; create( optsOrCallback?: CallOptions | CreateSnapshotCallback, callback?: CreateSnapshotCallback @@ -226,9 +226,6 @@ export class Snapshot { ); } - seek(gaxOpts?: CallOptions): Promise; - seek(callback: SeekCallback): void; - seek(gaxOpts: CallOptions, callback: SeekCallback): void; /** * Seeks an existing subscription to the snapshot. * @@ -256,6 +253,9 @@ export class Snapshot { * }); * ``` */ + seek(gaxOpts?: CallOptions): Promise; + seek(callback: SeekCallback): void; + seek(gaxOpts: CallOptions, callback: SeekCallback): void; seek( gaxOpts?: CallOptions | SeekCallback, callback?: SeekCallback diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 96f6cc968af..87773958cbc 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -340,8 +340,6 @@ export class Subscription extends EventEmitter { return (this.pubsub && this.pubsub.projectId) || '{{projectId}}'; } - close(): Promise; - close(callback: SubscriptionCloseCallback): void; /** * Closes the Subscription, once this is called you will no longer receive * message events unless you call {Subscription#open} or add new message @@ -363,18 +361,12 @@ export class Subscription extends EventEmitter { * subscription.close().then(() => {}); * ``` */ + close(): Promise; + close(callback: SubscriptionCloseCallback): void; close(callback?: SubscriptionCloseCallback): void | Promise { this._subscriber.close().then(() => callback!(), callback); } - create( - options?: CreateSubscriptionOptions - ): Promise; - create(callback: CreateSubscriptionCallback): void; - create( - options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback - ): void; /** * Create a subscription. * @@ -413,6 +405,14 @@ export class Subscription extends EventEmitter { * const [sub, apiResponse] = await subscription.create(); * ``` */ + create( + options?: CreateSubscriptionOptions + ): Promise; + create(callback: CreateSubscriptionCallback): void; + create( + options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback + ): void; create( optsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, callback?: CreateSubscriptionCallback @@ -442,16 +442,6 @@ export class Subscription extends EventEmitter { ); } - createSnapshot( - name: string, - gaxOpts?: CallOptions - ): Promise; - createSnapshot(name: string, callback: CreateSnapshotCallback): void; - createSnapshot( - name: string, - gaxOpts: CallOptions, - callback: CreateSnapshotCallback - ): void; /** * @typedef {array} CreateSnapshotResponse * @property {Snapshot} 0 The new {@link Snapshot}. @@ -497,6 +487,16 @@ export class Subscription extends EventEmitter { * }); * ``` */ + createSnapshot( + name: string, + gaxOpts?: CallOptions + ): Promise; + createSnapshot(name: string, callback: CreateSnapshotCallback): void; + createSnapshot( + name: string, + gaxOpts: CallOptions, + callback: CreateSnapshotCallback + ): void; createSnapshot( name: string, optsOrCallback?: CallOptions | CreateSnapshotCallback, @@ -531,9 +531,6 @@ export class Subscription extends EventEmitter { ); } - delete(gaxOpts?: CallOptions): Promise; - delete(callback: EmptyCallback): void; - delete(gaxOpts: CallOptions, callback: EmptyCallback): void; /** * Delete the subscription. Pull requests from the current subscription will * be errored once unsubscription is complete. @@ -565,6 +562,9 @@ export class Subscription extends EventEmitter { * }); * ``` */ + delete(gaxOpts?: CallOptions): Promise; + delete(callback: EmptyCallback): void; + delete(gaxOpts: CallOptions, callback: EmptyCallback): void; delete( optsOrCallback?: CallOptions | EmptyCallback, callback?: EmptyCallback @@ -591,8 +591,6 @@ export class Subscription extends EventEmitter { ); } - detached(): Promise; - detached(callback: DetachedCallback): void; /** * @typedef {array} SubscriptionDetachedResponse * @property {boolean} 0 Whether the subscription is detached. @@ -626,6 +624,8 @@ export class Subscription extends EventEmitter { * }); * ``` */ + detached(): Promise; + detached(callback: DetachedCallback): void; detached(callback?: DetachedCallback): void | Promise { this.getMetadata((err, metadata) => { if (err) { @@ -636,8 +636,6 @@ export class Subscription extends EventEmitter { }); } - exists(): Promise; - exists(callback: ExistsCallback): void; /** * @typedef {array} SubscriptionExistsResponse * @property {boolean} 0 Whether the subscription exists @@ -671,6 +669,8 @@ export class Subscription extends EventEmitter { * }); * ``` */ + exists(): Promise; + exists(callback: ExistsCallback): void; exists(callback?: ExistsCallback): void | Promise { this.getMetadata(err => { if (!err) { @@ -686,9 +686,6 @@ export class Subscription extends EventEmitter { }); } - get(gaxOpts?: GetSubscriptionOptions): Promise; - get(callback: GetSubscriptionCallback): void; - get(gaxOpts: GetSubscriptionOptions, callback: GetSubscriptionCallback): void; /** * @typedef {array} GetSubscriptionResponse * @property {Subscription} 0 The {@link Subscription}. @@ -731,6 +728,9 @@ export class Subscription extends EventEmitter { * }); * ``` */ + get(gaxOpts?: GetSubscriptionOptions): Promise; + get(callback: GetSubscriptionCallback): void; + get(gaxOpts: GetSubscriptionOptions, callback: GetSubscriptionCallback): void; get( optsOrCallback?: GetSubscriptionOptions | GetSubscriptionCallback, callback?: GetSubscriptionCallback @@ -756,12 +756,6 @@ export class Subscription extends EventEmitter { }); } - getMetadata(gaxOpts?: CallOptions): Promise; - getMetadata(callback: GetSubscriptionMetadataCallback): void; - getMetadata( - gaxOpts: CallOptions, - callback: GetSubscriptionMetadataCallback - ): void; /** * @typedef {array} GetSubscriptionMetadataResponse * @property {object} 0 The full API response. @@ -801,6 +795,12 @@ export class Subscription extends EventEmitter { * }); * ``` */ + getMetadata(gaxOpts?: CallOptions): Promise; + getMetadata(callback: GetSubscriptionMetadataCallback): void; + getMetadata( + gaxOpts: CallOptions, + callback: GetSubscriptionMetadataCallback + ): void; getMetadata( optsOrCallback?: CallOptions | GetSubscriptionMetadataCallback, callback?: GetSubscriptionMetadataCallback @@ -828,16 +828,6 @@ export class Subscription extends EventEmitter { ); } - modifyPushConfig( - config: PushConfig, - gaxOpts?: CallOptions - ): Promise; - modifyPushConfig(config: PushConfig, callback: EmptyCallback): void; - modifyPushConfig( - config: PushConfig, - gaxOpts: CallOptions, - callback: EmptyCallback - ): void; /** * @typedef {array} ModifyPushConfigResponse * @property {object} 0 The full API response. @@ -896,6 +886,16 @@ export class Subscription extends EventEmitter { * }); * ``` */ + modifyPushConfig( + config: PushConfig, + gaxOpts?: CallOptions + ): Promise; + modifyPushConfig(config: PushConfig, callback: EmptyCallback): void; + modifyPushConfig( + config: PushConfig, + gaxOpts: CallOptions, + callback: EmptyCallback + ): void; modifyPushConfig( config: PushConfig, optsOrCallback?: CallOptions | EmptyCallback, @@ -949,13 +949,6 @@ export class Subscription extends EventEmitter { } } - seek(snapshot: string | Date, gaxOpts?: CallOptions): Promise; - seek(snapshot: string | Date, callback: SeekCallback): void; - seek( - snapshot: string | Date, - gaxOpts: CallOptions, - callback: SeekCallback - ): void; /** * @typedef {array} SeekResponse * @property {object} 0 The full API response. @@ -995,6 +988,13 @@ export class Subscription extends EventEmitter { * subscription.seek(date, callback); * ``` */ + seek(snapshot: string | Date, gaxOpts?: CallOptions): Promise; + seek(snapshot: string | Date, callback: SeekCallback): void; + seek( + snapshot: string | Date, + gaxOpts: CallOptions, + callback: SeekCallback + ): void; seek( snapshot: string | Date, optsOrCallback?: CallOptions | SeekCallback, @@ -1030,19 +1030,6 @@ export class Subscription extends EventEmitter { ); } - setMetadata( - metadata: SubscriptionMetadata, - gaxOpts?: CallOptions - ): Promise; - setMetadata( - metadata: SubscriptionMetadata, - callback: SetSubscriptionMetadataCallback - ): void; - setMetadata( - metadata: SubscriptionMetadata, - gaxOpts: CallOptions, - callback: SetSubscriptionMetadataCallback - ): void; /** * @typedef {array} SetSubscriptionMetadataResponse * @property {object} 0 The full API response. @@ -1081,6 +1068,19 @@ export class Subscription extends EventEmitter { * }); * ``` */ + setMetadata( + metadata: SubscriptionMetadata, + gaxOpts?: CallOptions + ): Promise; + setMetadata( + metadata: SubscriptionMetadata, + callback: SetSubscriptionMetadataCallback + ): void; + setMetadata( + metadata: SubscriptionMetadata, + gaxOpts: CallOptions, + callback: SetSubscriptionMetadataCallback + ): void; setMetadata( metadata: SubscriptionMetadata, optsOrCallback?: CallOptions | SetSubscriptionMetadataCallback, diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 4beb90f2844..8ddf2cda4c8 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -182,8 +182,6 @@ export class Topic { this.iam = new IAM(pubsub, this.name); } - flush(): Promise; - flush(callback: EmptyCallback): void; /** * Immediately sends all remaining queued data. This is mostly useful * if you are planning to call close() on the PubSub object that holds @@ -192,15 +190,14 @@ export class Topic { * @param {EmptyCallback} [callback] Callback function. * @returns {Promise} */ + flush(): Promise; + flush(callback: EmptyCallback): void; flush(callback?: EmptyCallback): Promise | void { // It doesn't matter here if callback is undefined; the Publisher // flush() will handle it. this.publisher.flush(callback!); } - create(gaxOpts?: CallOptions): Promise; - create(callback: CreateTopicCallback): void; - create(gaxOpts: CallOptions, callback: CreateTopicCallback): void; /** * Create a topic. * @@ -231,6 +228,9 @@ export class Topic { * }); * ``` */ + create(gaxOpts?: CallOptions): Promise; + create(callback: CreateTopicCallback): void; + create(gaxOpts: CallOptions, callback: CreateTopicCallback): void; create( optsOrCallback?: CallOptions | CreateTopicCallback, callback?: CreateTopicCallback @@ -241,16 +241,6 @@ export class Topic { this.pubsub.createTopic(this.name, gaxOpts, callback!); } - createSubscription(name: string, callback: CreateSubscriptionCallback): void; - createSubscription( - name: string, - options?: CreateSubscriptionOptions - ): Promise; - createSubscription( - name: string, - options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback - ): void; /** * Create a subscription to this topic. * @@ -290,6 +280,16 @@ export class Topic { * }); * ``` */ + createSubscription(name: string, callback: CreateSubscriptionCallback): void; + createSubscription( + name: string, + options?: CreateSubscriptionOptions + ): Promise; + createSubscription( + name: string, + options: CreateSubscriptionOptions, + callback: CreateSubscriptionCallback + ): void; createSubscription( name: string, optsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, @@ -306,9 +306,6 @@ export class Topic { ); } - delete(callback: EmptyCallback): void; - delete(gaxOpts?: CallOptions): Promise; - delete(gaxOpts: CallOptions, callback: EmptyCallback): void; /** * Delete the topic. This will not delete subscriptions to this topic. * @@ -338,6 +335,9 @@ export class Topic { * }); * ``` */ + delete(callback: EmptyCallback): void; + delete(gaxOpts?: CallOptions): Promise; + delete(gaxOpts: CallOptions, callback: EmptyCallback): void; delete( optsOrCallback?: CallOptions | EmptyCallback, callback?: EmptyCallback @@ -360,8 +360,6 @@ export class Topic { ); } - exists(): Promise; - exists(callback: ExistsCallback): void; /** * @typedef {array} TopicExistsResponse * @property {boolean} 0 Whether the topic exists @@ -394,6 +392,8 @@ export class Topic { * }); * ``` */ + exists(): Promise; + exists(callback: ExistsCallback): void; exists(callback?: ExistsCallback): void | Promise { this.getMetadata(err => { if (!err) { @@ -408,9 +408,6 @@ export class Topic { }); } - get(callback: GetTopicCallback): void; - get(gaxOpts?: GetTopicOptions): Promise; - get(gaxOpts: GetTopicOptions, callback: GetTopicCallback): void; /** * @typedef {array} GetTopicResponse * @property {Topic} 0 The {@link Topic}. @@ -452,6 +449,9 @@ export class Topic { * }); * ``` */ + get(callback: GetTopicCallback): void; + get(gaxOpts?: GetTopicOptions): Promise; + get(gaxOpts: GetTopicOptions, callback: GetTopicCallback): void; get( optsOrCallback?: GetTopicOptions | GetTopicCallback, callback?: GetTopicCallback @@ -475,9 +475,6 @@ export class Topic { }); } - getMetadata(callback: GetTopicMetadataCallback): void; - getMetadata(gaxOpts: CallOptions, callback: GetTopicMetadataCallback): void; - getMetadata(gaxOpts?: CallOptions): Promise; /** * @typedef {array} GetTopicMetadataResponse * @property {object} 0 The full API response. @@ -514,6 +511,9 @@ export class Topic { * }); * ``` */ + getMetadata(callback: GetTopicMetadataCallback): void; + getMetadata(gaxOpts: CallOptions, callback: GetTopicMetadataCallback): void; + getMetadata(gaxOpts?: CallOptions): Promise; getMetadata( optsOrCallback?: CallOptions | GetTopicMetadataCallback, callback?: GetTopicMetadataCallback @@ -541,14 +541,6 @@ export class Topic { ); } - getSubscriptions(callback: GetTopicSubscriptionsCallback): void; - getSubscriptions( - options: PageOptions, - callback: GetTopicSubscriptionsCallback - ): void; - getSubscriptions( - options?: PageOptions - ): Promise; /** * Get a list of the subscriptions registered to this topic. You may * optionally provide a query object as the first argument to customize the @@ -587,6 +579,14 @@ export class Topic { * }); * ``` */ + getSubscriptions(callback: GetTopicSubscriptionsCallback): void; + getSubscriptions( + options: PageOptions, + callback: GetTopicSubscriptionsCallback + ): void; + getSubscriptions( + options?: PageOptions + ): Promise; getSubscriptions( optsOrCallback?: PageOptions | GetTopicSubscriptionsCallback, callback?: GetTopicSubscriptionsCallback @@ -631,13 +631,6 @@ export class Topic { ); } - publish(data: Buffer, attributes?: Attributes): Promise; - publish(data: Buffer, callback: PublishCallback): void; - publish( - data: Buffer, - attributes: Attributes, - callback: PublishCallback - ): void; /** * Publish the provided message. * @@ -683,6 +676,13 @@ export class Topic { * topic.publish(data).then((messageId) => {}); * ``` */ + publish(data: Buffer, attributes?: Attributes): Promise; + publish(data: Buffer, callback: PublishCallback): void; + publish( + data: Buffer, + attributes: Attributes, + callback: PublishCallback + ): void; publish( data: Buffer, attrsOrCb?: Attributes | PublishCallback, @@ -693,13 +693,6 @@ export class Topic { return this.publishMessage({data, attributes}, callback!); } - publishJSON(json: object, attributes?: Attributes): Promise; - publishJSON(json: object, callback: PublishCallback): void; - publishJSON( - json: object, - attributes: Attributes, - callback: PublishCallback - ): void; /** * Publish the provided JSON. It should be noted that all messages published * are done so in the form of a Buffer. This is simply a convenience method @@ -749,6 +742,13 @@ export class Topic { * topic.publishJSON(data).then((messageId) => {}); * ``` */ + publishJSON(json: object, attributes?: Attributes): Promise; + publishJSON(json: object, callback: PublishCallback): void; + publishJSON( + json: object, + attributes: Attributes, + callback: PublishCallback + ): void; publishJSON( json: object, attrsOrCb?: Attributes | PublishCallback, @@ -763,8 +763,6 @@ export class Topic { return this.publishMessage({json, attributes}, callback!); } - publishMessage(message: MessageOptions): Promise<[string]>; - publishMessage(message: MessageOptions, callback: PublishCallback): void; /** * @typedef {object} MessageOptions * @property {buffer} [data] The message data. @@ -824,6 +822,8 @@ export class Topic { * const [messageId] = await topic.publishMessage({data}); * ``` */ + publishMessage(message: MessageOptions): Promise<[string]>; + publishMessage(message: MessageOptions, callback: PublishCallback): void; publishMessage( message: MessageOptions, callback?: PublishCallback @@ -885,16 +885,6 @@ export class Topic { this.publisher.resumePublishing(orderingKey); } - setMetadata( - options: TopicMetadata, - gaxOpts?: CallOptions - ): Promise; - setMetadata(options: TopicMetadata, callback: SetTopicMetadataCallback): void; - setMetadata( - options: TopicMetadata, - gaxOpts: CallOptions, - callback: SetTopicMetadataCallback - ): void; /** * @typedef {array} SetTopicMetadataResponse * @property {object} 0 The full API response. @@ -942,6 +932,16 @@ export class Topic { * }); * ``` */ + setMetadata( + options: TopicMetadata, + gaxOpts?: CallOptions + ): Promise; + setMetadata(options: TopicMetadata, callback: SetTopicMetadataCallback): void; + setMetadata( + options: TopicMetadata, + gaxOpts: CallOptions, + callback: SetTopicMetadataCallback + ): void; setMetadata( options: TopicMetadata, optsOrCallback?: CallOptions | SetTopicMetadataCallback, diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index c8be975b282..80998603e99 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -352,12 +352,12 @@ export class PublisherClient { ]; } - getProjectId(): Promise; - getProjectId(callback: Callback): void; /** * Return the project ID used by this class. * @returns {Promise} A promise that resolves to string containing the project ID. */ + getProjectId(): Promise; + getProjectId(callback: Callback): void; getProjectId( callback?: Callback ): Promise | void { @@ -371,33 +371,6 @@ export class PublisherClient { // ------------------- // -- Service calls -- // ------------------- - createTopic( - request?: protos.google.pubsub.v1.ITopic, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ITopic, - protos.google.pubsub.v1.ITopic | undefined, - {} | undefined - ] - >; - createTopic( - request: protos.google.pubsub.v1.ITopic, - options: CallOptions, - callback: Callback< - protos.google.pubsub.v1.ITopic, - protos.google.pubsub.v1.ITopic | null | undefined, - {} | null | undefined - > - ): void; - createTopic( - request: protos.google.pubsub.v1.ITopic, - callback: Callback< - protos.google.pubsub.v1.ITopic, - protos.google.pubsub.v1.ITopic | null | undefined, - {} | null | undefined - > - ): void; /** * Creates the given topic with the given name. See the [resource name rules] * (https://cloud.google.com/pubsub/docs/admin#resource_names). @@ -449,6 +422,33 @@ export class PublisherClient { * const [response] = await client.createTopic(request); * ``` */ + createTopic( + request?: protos.google.pubsub.v1.ITopic, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | undefined, + {} | undefined + ] + >; + createTopic( + request: protos.google.pubsub.v1.ITopic, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | null | undefined, + {} | null | undefined + > + ): void; + createTopic( + request: protos.google.pubsub.v1.ITopic, + callback: Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | null | undefined, + {} | null | undefined + > + ): void; createTopic( request?: protos.google.pubsub.v1.ITopic, optionsOrCallback?: @@ -488,6 +488,32 @@ export class PublisherClient { this.initialize(); return this.innerApiCalls.createTopic(request, options, callback); } + /** + * Updates an existing topic. Note that certain properties of a + * topic are not modifiable. + * + * @param {Object} request + * The request object that will be sent. + * @param {google.pubsub.v1.Topic} request.topic + * Required. The updated topic object. + * @param {google.protobuf.FieldMask} request.updateMask + * Required. Indicates which fields in the provided topic to update. Must be + * specified and non-empty. Note that if `update_mask` contains + * "message_storage_policy" but the `message_storage_policy` is not set in + * the `topic` provided above, then the updated value is determined by the + * policy configured at the project or organization level. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.updateTopic(request); + * ``` + */ updateTopic( request?: protos.google.pubsub.v1.IUpdateTopicRequest, options?: CallOptions @@ -515,32 +541,6 @@ export class PublisherClient { {} | null | undefined > ): void; - /** - * Updates an existing topic. Note that certain properties of a - * topic are not modifiable. - * - * @param {Object} request - * The request object that will be sent. - * @param {google.pubsub.v1.Topic} request.topic - * Required. The updated topic object. - * @param {google.protobuf.FieldMask} request.updateMask - * Required. Indicates which fields in the provided topic to update. Must be - * specified and non-empty. Note that if `update_mask` contains - * "message_storage_policy" but the `message_storage_policy` is not set in - * the `topic` provided above, then the updated value is determined by the - * policy configured at the project or organization level. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.updateTopic(request); - * ``` - */ updateTopic( request?: protos.google.pubsub.v1.IUpdateTopicRequest, optionsOrCallback?: @@ -580,6 +580,29 @@ export class PublisherClient { this.initialize(); return this.innerApiCalls.updateTopic(request, options, callback); } + /** + * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic + * does not exist. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The messages in the request will be published on this topic. + * Format is `projects/{project}/topics/{topic}`. + * @param {number[]} request.messages + * Required. The messages to publish. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.publish(request); + * ``` + */ publish( request?: protos.google.pubsub.v1.IPublishRequest, options?: CallOptions @@ -607,29 +630,6 @@ export class PublisherClient { {} | null | undefined > ): void; - /** - * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic - * does not exist. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. The messages in the request will be published on this topic. - * Format is `projects/{project}/topics/{topic}`. - * @param {number[]} request.messages - * Required. The messages to publish. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.publish(request); - * ``` - */ publish( request?: protos.google.pubsub.v1.IPublishRequest, optionsOrCallback?: @@ -669,6 +669,26 @@ export class PublisherClient { this.initialize(); return this.innerApiCalls.publish(request, options, callback); } + /** + * Gets the configuration of a topic. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic to get. + * Format is `projects/{project}/topics/{topic}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.getTopic(request); + * ``` + */ getTopic( request?: protos.google.pubsub.v1.IGetTopicRequest, options?: CallOptions @@ -696,26 +716,6 @@ export class PublisherClient { {} | null | undefined > ): void; - /** - * Gets the configuration of a topic. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. The name of the topic to get. - * Format is `projects/{project}/topics/{topic}`. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.getTopic(request); - * ``` - */ getTopic( request?: protos.google.pubsub.v1.IGetTopicRequest, optionsOrCallback?: @@ -755,6 +755,30 @@ export class PublisherClient { this.initialize(); return this.innerApiCalls.getTopic(request, options, callback); } + /** + * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic + * does not exist. After a topic is deleted, a new topic may be created with + * the same name; this is an entirely new topic with none of the old + * configuration or subscriptions. Existing subscriptions to this topic are + * not deleted, but their `topic` field is set to `_deleted-topic_`. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. Name of the topic to delete. + * Format is `projects/{project}/topics/{topic}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.deleteTopic(request); + * ``` + */ deleteTopic( request?: protos.google.pubsub.v1.IDeleteTopicRequest, options?: CallOptions @@ -782,30 +806,6 @@ export class PublisherClient { {} | null | undefined > ): void; - /** - * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic - * does not exist. After a topic is deleted, a new topic may be created with - * the same name; this is an entirely new topic with none of the old - * configuration or subscriptions. Existing subscriptions to this topic are - * not deleted, but their `topic` field is set to `_deleted-topic_`. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. Name of the topic to delete. - * Format is `projects/{project}/topics/{topic}`. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.deleteTopic(request); - * ``` - */ deleteTopic( request?: protos.google.pubsub.v1.IDeleteTopicRequest, optionsOrCallback?: @@ -845,6 +845,29 @@ export class PublisherClient { this.initialize(); return this.innerApiCalls.deleteTopic(request, options, callback); } + /** + * Detaches a subscription from this topic. All messages retained in the + * subscription are dropped. Subsequent `Pull` and `StreamingPull` requests + * will return FAILED_PRECONDITION. If the subscription is a push + * subscription, pushes to the endpoint will stop. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The subscription to detach. + * Format is `projects/{project}/subscriptions/{subscription}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [DetachSubscriptionResponse]{@link google.pubsub.v1.DetachSubscriptionResponse}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.detachSubscription(request); + * ``` + */ detachSubscription( request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, options?: CallOptions @@ -872,29 +895,6 @@ export class PublisherClient { {} | null | undefined > ): void; - /** - * Detaches a subscription from this topic. All messages retained in the - * subscription are dropped. Subsequent `Pull` and `StreamingPull` requests - * will return FAILED_PRECONDITION. If the subscription is a push - * subscription, pushes to the endpoint will stop. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The subscription to detach. - * Format is `projects/{project}/subscriptions/{subscription}`. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [DetachSubscriptionResponse]{@link google.pubsub.v1.DetachSubscriptionResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.detachSubscription(request); - * ``` - */ detachSubscription( request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, optionsOrCallback?: @@ -935,33 +935,6 @@ export class PublisherClient { return this.innerApiCalls.detachSubscription(request, options, callback); } - listTopics( - request?: protos.google.pubsub.v1.IListTopicsRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ITopic[], - protos.google.pubsub.v1.IListTopicsRequest | null, - protos.google.pubsub.v1.IListTopicsResponse - ] - >; - listTopics( - request: protos.google.pubsub.v1.IListTopicsRequest, - options: CallOptions, - callback: PaginationCallback< - protos.google.pubsub.v1.IListTopicsRequest, - protos.google.pubsub.v1.IListTopicsResponse | null | undefined, - protos.google.pubsub.v1.ITopic - > - ): void; - listTopics( - request: protos.google.pubsub.v1.IListTopicsRequest, - callback: PaginationCallback< - protos.google.pubsub.v1.IListTopicsRequest, - protos.google.pubsub.v1.IListTopicsResponse | null | undefined, - protos.google.pubsub.v1.ITopic - > - ): void; /** * Lists matching topics. * @@ -989,6 +962,33 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. */ + listTopics( + request?: protos.google.pubsub.v1.IListTopicsRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ITopic[], + protos.google.pubsub.v1.IListTopicsRequest | null, + protos.google.pubsub.v1.IListTopicsResponse + ] + >; + listTopics( + request: protos.google.pubsub.v1.IListTopicsRequest, + options: CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicsRequest, + protos.google.pubsub.v1.IListTopicsResponse | null | undefined, + protos.google.pubsub.v1.ITopic + > + ): void; + listTopics( + request: protos.google.pubsub.v1.IListTopicsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicsRequest, + protos.google.pubsub.v1.IListTopicsResponse | null | undefined, + protos.google.pubsub.v1.ITopic + > + ): void; listTopics( request?: protos.google.pubsub.v1.IListTopicsRequest, optionsOrCallback?: @@ -1129,6 +1129,33 @@ export class PublisherClient { callSettings ) as AsyncIterable; } + /** + * Lists the names of the attached subscriptions on this topic. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.topic + * Required. The name of the topic that subscriptions are attached to. + * Format is `projects/{project}/topics/{topic}`. + * @param {number} request.pageSize + * Maximum number of subscription names to return. + * @param {string} request.pageToken + * The value returned by the last `ListTopicSubscriptionsResponse`; indicates + * that this is a continuation of a prior `ListTopicSubscriptions` call, and + * that the system should return the next page of data. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of string. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed and will merge results from all the pages into this array. + * Note that it can affect your quota. + * We recommend using `listTopicSubscriptionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + */ listTopicSubscriptions( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, options?: CallOptions @@ -1160,33 +1187,6 @@ export class PublisherClient { string > ): void; - /** - * Lists the names of the attached subscriptions on this topic. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.topic - * Required. The name of the topic that subscriptions are attached to. - * Format is `projects/{project}/topics/{topic}`. - * @param {number} request.pageSize - * Maximum number of subscription names to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicSubscriptionsResponse`; indicates - * that this is a continuation of a prior `ListTopicSubscriptions` call, and - * that the system should return the next page of data. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of string. - * The client library will perform auto-pagination by default: it will call the API as many - * times as needed and will merge results from all the pages into this array. - * Note that it can affect your quota. - * We recommend using `listTopicSubscriptionsAsync()` - * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) - * for more details and examples. - */ listTopicSubscriptions( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, optionsOrCallback?: @@ -1335,33 +1335,6 @@ export class PublisherClient { callSettings ) as AsyncIterable; } - listTopicSnapshots( - request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options?: CallOptions - ): Promise< - [ - string[], - protos.google.pubsub.v1.IListTopicSnapshotsRequest | null, - protos.google.pubsub.v1.IListTopicSnapshotsResponse - ] - >; - listTopicSnapshots( - request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options: CallOptions, - callback: PaginationCallback< - protos.google.pubsub.v1.IListTopicSnapshotsRequest, - protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, - string - > - ): void; - listTopicSnapshots( - request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - callback: PaginationCallback< - protos.google.pubsub.v1.IListTopicSnapshotsRequest, - protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, - string - > - ): void; /** * Lists the names of the snapshots on this topic. Snapshots are used in * [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, @@ -1393,6 +1366,33 @@ export class PublisherClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. */ + listTopicSnapshots( + request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + options?: CallOptions + ): Promise< + [ + string[], + protos.google.pubsub.v1.IListTopicSnapshotsRequest | null, + protos.google.pubsub.v1.IListTopicSnapshotsResponse + ] + >; + listTopicSnapshots( + request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + options: CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicSnapshotsRequest, + protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, + string + > + ): void; + listTopicSnapshots( + request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListTopicSnapshotsRequest, + protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, + string + > + ): void; listTopicSnapshots( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, optionsOrCallback?: diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 7671dcb95fa..bc5dc6e1ba5 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -318,12 +318,12 @@ export class SchemaServiceClient { ]; } - getProjectId(): Promise; - getProjectId(callback: Callback): void; /** * Return the project ID used by this class. * @returns {Promise} A promise that resolves to string containing the project ID. */ + getProjectId(): Promise; + getProjectId(callback: Callback): void; getProjectId( callback?: Callback ): Promise | void { @@ -337,33 +337,6 @@ export class SchemaServiceClient { // ------------------- // -- Service calls -- // ------------------- - createSchema( - request?: protos.google.pubsub.v1.ICreateSchemaRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ISchema, - protos.google.pubsub.v1.ICreateSchemaRequest | undefined, - {} | undefined - ] - >; - createSchema( - request: protos.google.pubsub.v1.ICreateSchemaRequest, - options: CallOptions, - callback: Callback< - protos.google.pubsub.v1.ISchema, - protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, - {} | null | undefined - > - ): void; - createSchema( - request: protos.google.pubsub.v1.ICreateSchemaRequest, - callback: Callback< - protos.google.pubsub.v1.ISchema, - protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Creates a schema. * @@ -396,6 +369,33 @@ export class SchemaServiceClient { * const [response] = await client.createSchema(request); * ``` */ + createSchema( + request?: protos.google.pubsub.v1.ICreateSchemaRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | undefined, + {} | undefined + ] + >; + createSchema( + request: protos.google.pubsub.v1.ICreateSchemaRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + createSchema( + request: protos.google.pubsub.v1.ICreateSchemaRequest, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; createSchema( request?: protos.google.pubsub.v1.ICreateSchemaRequest, optionsOrCallback?: @@ -435,6 +435,30 @@ export class SchemaServiceClient { this.initialize(); return this.innerApiCalls.createSchema(request, options, callback); } + /** + * Gets a schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the schema to get. + * Format is `projects/{project}/schemas/{schema}`. + * @param {google.pubsub.v1.SchemaView} request.view + * The set of fields to return in the response. If not set, returns a Schema + * with `name` and `type`, but not `definition`. Set to `FULL` to retrieve all + * fields. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.getSchema(request); + * ``` + */ getSchema( request?: protos.google.pubsub.v1.IGetSchemaRequest, options?: CallOptions @@ -462,30 +486,6 @@ export class SchemaServiceClient { {} | null | undefined > ): void; - /** - * Gets a schema. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.name - * Required. The name of the schema to get. - * Format is `projects/{project}/schemas/{schema}`. - * @param {google.pubsub.v1.SchemaView} request.view - * The set of fields to return in the response. If not set, returns a Schema - * with `name` and `type`, but not `definition`. Set to `FULL` to retrieve all - * fields. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.getSchema(request); - * ``` - */ getSchema( request?: protos.google.pubsub.v1.IGetSchemaRequest, optionsOrCallback?: @@ -525,6 +525,26 @@ export class SchemaServiceClient { this.initialize(); return this.innerApiCalls.getSchema(request, options, callback); } + /** + * Deletes a schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. Name of the schema to delete. + * Format is `projects/{project}/schemas/{schema}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.deleteSchema(request); + * ``` + */ deleteSchema( request?: protos.google.pubsub.v1.IDeleteSchemaRequest, options?: CallOptions @@ -552,26 +572,6 @@ export class SchemaServiceClient { {} | null | undefined > ): void; - /** - * Deletes a schema. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.name - * Required. Name of the schema to delete. - * Format is `projects/{project}/schemas/{schema}`. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.deleteSchema(request); - * ``` - */ deleteSchema( request?: protos.google.pubsub.v1.IDeleteSchemaRequest, optionsOrCallback?: @@ -611,6 +611,28 @@ export class SchemaServiceClient { this.initialize(); return this.innerApiCalls.deleteSchema(request, options, callback); } + /** + * Validates a schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.parent + * Required. The name of the project in which to validate schemas. + * Format is `projects/{project-id}`. + * @param {google.pubsub.v1.Schema} request.schema + * Required. The schema object to validate. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [ValidateSchemaResponse]{@link google.pubsub.v1.ValidateSchemaResponse}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.validateSchema(request); + * ``` + */ validateSchema( request?: protos.google.pubsub.v1.IValidateSchemaRequest, options?: CallOptions @@ -638,28 +660,6 @@ export class SchemaServiceClient { {} | null | undefined > ): void; - /** - * Validates a schema. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.parent - * Required. The name of the project in which to validate schemas. - * Format is `projects/{project-id}`. - * @param {google.pubsub.v1.Schema} request.schema - * Required. The schema object to validate. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [ValidateSchemaResponse]{@link google.pubsub.v1.ValidateSchemaResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.validateSchema(request); - * ``` - */ validateSchema( request?: protos.google.pubsub.v1.IValidateSchemaRequest, optionsOrCallback?: @@ -699,33 +699,6 @@ export class SchemaServiceClient { this.initialize(); return this.innerApiCalls.validateSchema(request, options, callback); } - validateMessage( - request?: protos.google.pubsub.v1.IValidateMessageRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.IValidateMessageResponse, - protos.google.pubsub.v1.IValidateMessageRequest | undefined, - {} | undefined - ] - >; - validateMessage( - request: protos.google.pubsub.v1.IValidateMessageRequest, - options: CallOptions, - callback: Callback< - protos.google.pubsub.v1.IValidateMessageResponse, - protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, - {} | null | undefined - > - ): void; - validateMessage( - request: protos.google.pubsub.v1.IValidateMessageRequest, - callback: Callback< - protos.google.pubsub.v1.IValidateMessageResponse, - protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Validates a message against a schema. * @@ -756,6 +729,33 @@ export class SchemaServiceClient { * const [response] = await client.validateMessage(request); * ``` */ + validateMessage( + request?: protos.google.pubsub.v1.IValidateMessageRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | undefined, + {} | undefined + ] + >; + validateMessage( + request: protos.google.pubsub.v1.IValidateMessageRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, + {} | null | undefined + > + ): void; + validateMessage( + request: protos.google.pubsub.v1.IValidateMessageRequest, + callback: Callback< + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, + {} | null | undefined + > + ): void; validateMessage( request?: protos.google.pubsub.v1.IValidateMessageRequest, optionsOrCallback?: @@ -796,33 +796,6 @@ export class SchemaServiceClient { return this.innerApiCalls.validateMessage(request, options, callback); } - listSchemas( - request?: protos.google.pubsub.v1.IListSchemasRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ISchema[], - protos.google.pubsub.v1.IListSchemasRequest | null, - protos.google.pubsub.v1.IListSchemasResponse - ] - >; - listSchemas( - request: protos.google.pubsub.v1.IListSchemasRequest, - options: CallOptions, - callback: PaginationCallback< - protos.google.pubsub.v1.IListSchemasRequest, - protos.google.pubsub.v1.IListSchemasResponse | null | undefined, - protos.google.pubsub.v1.ISchema - > - ): void; - listSchemas( - request: protos.google.pubsub.v1.IListSchemasRequest, - callback: PaginationCallback< - protos.google.pubsub.v1.IListSchemasRequest, - protos.google.pubsub.v1.IListSchemasResponse | null | undefined, - protos.google.pubsub.v1.ISchema - > - ): void; /** * Lists schemas in a project. * @@ -854,6 +827,33 @@ export class SchemaServiceClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. */ + listSchemas( + request?: protos.google.pubsub.v1.IListSchemasRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema[], + protos.google.pubsub.v1.IListSchemasRequest | null, + protos.google.pubsub.v1.IListSchemasResponse + ] + >; + listSchemas( + request: protos.google.pubsub.v1.IListSchemasRequest, + options: CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSchemasRequest, + protos.google.pubsub.v1.IListSchemasResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + ): void; + listSchemas( + request: protos.google.pubsub.v1.IListSchemasRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSchemasRequest, + protos.google.pubsub.v1.IListSchemasResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + ): void; listSchemas( request?: protos.google.pubsub.v1.IListSchemasRequest, optionsOrCallback?: diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 88dc39b1703..563f8247186 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -346,12 +346,12 @@ export class SubscriberClient { ]; } - getProjectId(): Promise; - getProjectId(callback: Callback): void; /** * Return the project ID used by this class. * @returns {Promise} A promise that resolves to string containing the project ID. */ + getProjectId(): Promise; + getProjectId(callback: Callback): void; getProjectId( callback?: Callback ): Promise | void { @@ -365,33 +365,6 @@ export class SubscriberClient { // ------------------- // -- Service calls -- // ------------------- - createSubscription( - request?: protos.google.pubsub.v1.ISubscription, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ISubscription, - protos.google.pubsub.v1.ISubscription | undefined, - {} | undefined - ] - >; - createSubscription( - request: protos.google.pubsub.v1.ISubscription, - options: CallOptions, - callback: Callback< - protos.google.pubsub.v1.ISubscription, - protos.google.pubsub.v1.ISubscription | null | undefined, - {} | null | undefined - > - ): void; - createSubscription( - request: protos.google.pubsub.v1.ISubscription, - callback: Callback< - protos.google.pubsub.v1.ISubscription, - protos.google.pubsub.v1.ISubscription | null | undefined, - {} | null | undefined - > - ): void; /** * Creates a subscription to a given topic. See the [resource name rules] * (https://cloud.google.com/pubsub/docs/admin#resource_names). @@ -520,6 +493,33 @@ export class SubscriberClient { * const [response] = await client.createSubscription(request); * ``` */ + createSubscription( + request?: protos.google.pubsub.v1.ISubscription, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | undefined, + {} | undefined + ] + >; + createSubscription( + request: protos.google.pubsub.v1.ISubscription, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | null | undefined, + {} | null | undefined + > + ): void; + createSubscription( + request: protos.google.pubsub.v1.ISubscription, + callback: Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | null | undefined, + {} | null | undefined + > + ): void; createSubscription( request?: protos.google.pubsub.v1.ISubscription, optionsOrCallback?: @@ -559,6 +559,26 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.createSubscription(request, options, callback); } + /** + * Gets the configuration details of a subscription. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The name of the subscription to get. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.getSubscription(request); + * ``` + */ getSubscription( request?: protos.google.pubsub.v1.IGetSubscriptionRequest, options?: CallOptions @@ -586,26 +606,6 @@ export class SubscriberClient { {} | null | undefined > ): void; - /** - * Gets the configuration details of a subscription. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The name of the subscription to get. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.getSubscription(request); - * ``` - */ getSubscription( request?: protos.google.pubsub.v1.IGetSubscriptionRequest, optionsOrCallback?: @@ -645,6 +645,29 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.getSubscription(request, options, callback); } + /** + * Updates an existing subscription. Note that certain properties of a + * subscription, such as its topic, are not modifiable. + * + * @param {Object} request + * The request object that will be sent. + * @param {google.pubsub.v1.Subscription} request.subscription + * Required. The updated subscription object. + * @param {google.protobuf.FieldMask} request.updateMask + * Required. Indicates which fields in the provided subscription to update. + * Must be specified and non-empty. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.updateSubscription(request); + * ``` + */ updateSubscription( request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, options?: CallOptions @@ -672,29 +695,6 @@ export class SubscriberClient { {} | null | undefined > ): void; - /** - * Updates an existing subscription. Note that certain properties of a - * subscription, such as its topic, are not modifiable. - * - * @param {Object} request - * The request object that will be sent. - * @param {google.pubsub.v1.Subscription} request.subscription - * Required. The updated subscription object. - * @param {google.protobuf.FieldMask} request.updateMask - * Required. Indicates which fields in the provided subscription to update. - * Must be specified and non-empty. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.updateSubscription(request); - * ``` - */ updateSubscription( request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, optionsOrCallback?: @@ -734,6 +734,30 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.updateSubscription(request, options, callback); } + /** + * Deletes an existing subscription. All messages retained in the subscription + * are immediately dropped. Calls to `Pull` after deletion will return + * `NOT_FOUND`. After a subscription is deleted, a new one may be created with + * the same name, but the new one has no association with the old + * subscription or its topic unless the same topic is specified. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.subscription + * Required. The subscription to delete. + * Format is `projects/{project}/subscriptions/{sub}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.deleteSubscription(request); + * ``` + */ deleteSubscription( request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, options?: CallOptions @@ -761,30 +785,6 @@ export class SubscriberClient { {} | null | undefined > ): void; - /** - * Deletes an existing subscription. All messages retained in the subscription - * are immediately dropped. Calls to `Pull` after deletion will return - * `NOT_FOUND`. After a subscription is deleted, a new one may be created with - * the same name, but the new one has no association with the old - * subscription or its topic unless the same topic is specified. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.subscription - * Required. The subscription to delete. - * Format is `projects/{project}/subscriptions/{sub}`. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.deleteSubscription(request); - * ``` - */ deleteSubscription( request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, optionsOrCallback?: @@ -824,33 +824,6 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.deleteSubscription(request, options, callback); } - modifyAckDeadline( - request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, - options?: CallOptions - ): Promise< - [ - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IModifyAckDeadlineRequest | undefined, - {} | undefined - ] - >; - modifyAckDeadline( - request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, - options: CallOptions, - callback: Callback< - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, - {} | null | undefined - > - ): void; - modifyAckDeadline( - request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, - callback: Callback< - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Modifies the ack deadline for a specific message. This method is useful * to indicate that more time is needed to process a message by the @@ -886,6 +859,33 @@ export class SubscriberClient { * const [response] = await client.modifyAckDeadline(request); * ``` */ + modifyAckDeadline( + request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + options?: CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | undefined, + {} | undefined + ] + >; + modifyAckDeadline( + request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + options: CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, + {} | null | undefined + > + ): void; + modifyAckDeadline( + request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, + {} | null | undefined + > + ): void; modifyAckDeadline( request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, optionsOrCallback?: @@ -925,33 +925,6 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.modifyAckDeadline(request, options, callback); } - acknowledge( - request?: protos.google.pubsub.v1.IAcknowledgeRequest, - options?: CallOptions - ): Promise< - [ - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IAcknowledgeRequest | undefined, - {} | undefined - ] - >; - acknowledge( - request: protos.google.pubsub.v1.IAcknowledgeRequest, - options: CallOptions, - callback: Callback< - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, - {} | null | undefined - > - ): void; - acknowledge( - request: protos.google.pubsub.v1.IAcknowledgeRequest, - callback: Callback< - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Acknowledges the messages associated with the `ack_ids` in the * `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages @@ -982,6 +955,33 @@ export class SubscriberClient { * const [response] = await client.acknowledge(request); * ``` */ + acknowledge( + request?: protos.google.pubsub.v1.IAcknowledgeRequest, + options?: CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | undefined, + {} | undefined + ] + >; + acknowledge( + request: protos.google.pubsub.v1.IAcknowledgeRequest, + options: CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, + {} | null | undefined + > + ): void; + acknowledge( + request: protos.google.pubsub.v1.IAcknowledgeRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, + {} | null | undefined + > + ): void; acknowledge( request?: protos.google.pubsub.v1.IAcknowledgeRequest, optionsOrCallback?: @@ -1021,33 +1021,6 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.acknowledge(request, options, callback); } - pull( - request?: protos.google.pubsub.v1.IPullRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.IPullResponse, - protos.google.pubsub.v1.IPullRequest | undefined, - {} | undefined - ] - >; - pull( - request: protos.google.pubsub.v1.IPullRequest, - options: CallOptions, - callback: Callback< - protos.google.pubsub.v1.IPullResponse, - protos.google.pubsub.v1.IPullRequest | null | undefined, - {} | null | undefined - > - ): void; - pull( - request: protos.google.pubsub.v1.IPullRequest, - callback: Callback< - protos.google.pubsub.v1.IPullResponse, - protos.google.pubsub.v1.IPullRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Pulls messages from the server. The server may return `UNAVAILABLE` if * there are too many concurrent pull requests pending for the given @@ -1082,6 +1055,33 @@ export class SubscriberClient { * const [response] = await client.pull(request); * ``` */ + pull( + request?: protos.google.pubsub.v1.IPullRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | undefined, + {} | undefined + ] + >; + pull( + request: protos.google.pubsub.v1.IPullRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | null | undefined, + {} | null | undefined + > + ): void; + pull( + request: protos.google.pubsub.v1.IPullRequest, + callback: Callback< + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | null | undefined, + {} | null | undefined + > + ): void; pull( request?: protos.google.pubsub.v1.IPullRequest, optionsOrCallback?: @@ -1121,33 +1121,6 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.pull(request, options, callback); } - modifyPushConfig( - request?: protos.google.pubsub.v1.IModifyPushConfigRequest, - options?: CallOptions - ): Promise< - [ - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IModifyPushConfigRequest | undefined, - {} | undefined - ] - >; - modifyPushConfig( - request: protos.google.pubsub.v1.IModifyPushConfigRequest, - options: CallOptions, - callback: Callback< - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, - {} | null | undefined - > - ): void; - modifyPushConfig( - request: protos.google.pubsub.v1.IModifyPushConfigRequest, - callback: Callback< - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Modifies the `PushConfig` for a specified subscription. * @@ -1180,6 +1153,33 @@ export class SubscriberClient { * const [response] = await client.modifyPushConfig(request); * ``` */ + modifyPushConfig( + request?: protos.google.pubsub.v1.IModifyPushConfigRequest, + options?: CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | undefined, + {} | undefined + ] + >; + modifyPushConfig( + request: protos.google.pubsub.v1.IModifyPushConfigRequest, + options: CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, + {} | null | undefined + > + ): void; + modifyPushConfig( + request: protos.google.pubsub.v1.IModifyPushConfigRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, + {} | null | undefined + > + ): void; modifyPushConfig( request?: protos.google.pubsub.v1.IModifyPushConfigRequest, optionsOrCallback?: @@ -1219,6 +1219,30 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.modifyPushConfig(request, options, callback); } + /** + * Gets the configuration details of a snapshot. Snapshots are used in + * Seek + * operations, which allow you to manage message acknowledgments in bulk. That + * is, you can set the acknowledgment state of messages in an existing + * subscription to the state captured by a snapshot. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.snapshot + * Required. The name of the snapshot to get. + * Format is `projects/{project}/snapshots/{snap}`. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + * @example + * ``` + * const [response] = await client.getSnapshot(request); + * ``` + */ getSnapshot( request?: protos.google.pubsub.v1.IGetSnapshotRequest, options?: CallOptions @@ -1246,30 +1270,6 @@ export class SubscriberClient { {} | null | undefined > ): void; - /** - * Gets the configuration details of a snapshot. Snapshots are used in - * Seek - * operations, which allow you to manage message acknowledgments in bulk. That - * is, you can set the acknowledgment state of messages in an existing - * subscription to the state captured by a snapshot. - * - * @param {Object} request - * The request object that will be sent. - * @param {string} request.snapshot - * Required. The name of the snapshot to get. - * Format is `projects/{project}/snapshots/{snap}`. - * @param {object} [options] - * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. - * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) - * for more details and examples. - * @example - * ``` - * const [response] = await client.getSnapshot(request); - * ``` - */ getSnapshot( request?: protos.google.pubsub.v1.IGetSnapshotRequest, optionsOrCallback?: @@ -1309,33 +1309,6 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.getSnapshot(request, options, callback); } - createSnapshot( - request?: protos.google.pubsub.v1.ICreateSnapshotRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ISnapshot, - protos.google.pubsub.v1.ICreateSnapshotRequest | undefined, - {} | undefined - ] - >; - createSnapshot( - request: protos.google.pubsub.v1.ICreateSnapshotRequest, - options: CallOptions, - callback: Callback< - protos.google.pubsub.v1.ISnapshot, - protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, - {} | null | undefined - > - ): void; - createSnapshot( - request: protos.google.pubsub.v1.ICreateSnapshotRequest, - callback: Callback< - protos.google.pubsub.v1.ISnapshot, - protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Creates a snapshot from the requested subscription. Snapshots are used in * [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, @@ -1388,6 +1361,33 @@ export class SubscriberClient { * const [response] = await client.createSnapshot(request); * ``` */ + createSnapshot( + request?: protos.google.pubsub.v1.ICreateSnapshotRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | undefined, + {} | undefined + ] + >; + createSnapshot( + request: protos.google.pubsub.v1.ICreateSnapshotRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + createSnapshot( + request: protos.google.pubsub.v1.ICreateSnapshotRequest, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; createSnapshot( request?: protos.google.pubsub.v1.ICreateSnapshotRequest, optionsOrCallback?: @@ -1414,46 +1414,19 @@ export class SubscriberClient { if (typeof optionsOrCallback === 'function' && callback === undefined) { callback = optionsOrCallback; options = {}; - } else { - options = optionsOrCallback as CallOptions; - } - options = options || {}; - options.otherArgs = options.otherArgs || {}; - options.otherArgs.headers = options.otherArgs.headers || {}; - options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ - name: request.name || '', - }); - this.initialize(); - return this.innerApiCalls.createSnapshot(request, options, callback); - } - updateSnapshot( - request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ISnapshot, - protos.google.pubsub.v1.IUpdateSnapshotRequest | undefined, - {} | undefined - ] - >; - updateSnapshot( - request: protos.google.pubsub.v1.IUpdateSnapshotRequest, - options: CallOptions, - callback: Callback< - protos.google.pubsub.v1.ISnapshot, - protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, - {} | null | undefined - > - ): void; - updateSnapshot( - request: protos.google.pubsub.v1.IUpdateSnapshotRequest, - callback: Callback< - protos.google.pubsub.v1.ISnapshot, - protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, - {} | null | undefined - > - ): void; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers['x-goog-request-params'] = + gax.routingHeader.fromParams({ + name: request.name || '', + }); + this.initialize(); + return this.innerApiCalls.createSnapshot(request, options, callback); + } /** * Updates an existing snapshot. Snapshots are used in * Seek @@ -1481,6 +1454,33 @@ export class SubscriberClient { * const [response] = await client.updateSnapshot(request); * ``` */ + updateSnapshot( + request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | undefined, + {} | undefined + ] + >; + updateSnapshot( + request: protos.google.pubsub.v1.IUpdateSnapshotRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + updateSnapshot( + request: protos.google.pubsub.v1.IUpdateSnapshotRequest, + callback: Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; updateSnapshot( request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, optionsOrCallback?: @@ -1520,33 +1520,6 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.updateSnapshot(request, options, callback); } - deleteSnapshot( - request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, - options?: CallOptions - ): Promise< - [ - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IDeleteSnapshotRequest | undefined, - {} | undefined - ] - >; - deleteSnapshot( - request: protos.google.pubsub.v1.IDeleteSnapshotRequest, - options: CallOptions, - callback: Callback< - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, - {} | null | undefined - > - ): void; - deleteSnapshot( - request: protos.google.pubsub.v1.IDeleteSnapshotRequest, - callback: Callback< - protos.google.protobuf.IEmpty, - protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Removes an existing snapshot. Snapshots are used in [Seek] * (https://cloud.google.com/pubsub/docs/replay-overview) operations, which @@ -1575,6 +1548,33 @@ export class SubscriberClient { * const [response] = await client.deleteSnapshot(request); * ``` */ + deleteSnapshot( + request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, + options?: CallOptions + ): Promise< + [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | undefined, + {} | undefined + ] + >; + deleteSnapshot( + request: protos.google.pubsub.v1.IDeleteSnapshotRequest, + options: CallOptions, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; + deleteSnapshot( + request: protos.google.pubsub.v1.IDeleteSnapshotRequest, + callback: Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, + {} | null | undefined + > + ): void; deleteSnapshot( request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, optionsOrCallback?: @@ -1614,33 +1614,6 @@ export class SubscriberClient { this.initialize(); return this.innerApiCalls.deleteSnapshot(request, options, callback); } - seek( - request?: protos.google.pubsub.v1.ISeekRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ISeekResponse, - protos.google.pubsub.v1.ISeekRequest | undefined, - {} | undefined - ] - >; - seek( - request: protos.google.pubsub.v1.ISeekRequest, - options: CallOptions, - callback: Callback< - protos.google.pubsub.v1.ISeekResponse, - protos.google.pubsub.v1.ISeekRequest | null | undefined, - {} | null | undefined - > - ): void; - seek( - request: protos.google.pubsub.v1.ISeekRequest, - callback: Callback< - protos.google.pubsub.v1.ISeekResponse, - protos.google.pubsub.v1.ISeekRequest | null | undefined, - {} | null | undefined - > - ): void; /** * Seeks an existing subscription to a point in time or to a given snapshot, * whichever is provided in the request. Snapshots are used in [Seek] @@ -1682,6 +1655,33 @@ export class SubscriberClient { * const [response] = await client.seek(request); * ``` */ + seek( + request?: protos.google.pubsub.v1.ISeekRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | undefined, + {} | undefined + ] + >; + seek( + request: protos.google.pubsub.v1.ISeekRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | null | undefined, + {} | null | undefined + > + ): void; + seek( + request: protos.google.pubsub.v1.ISeekRequest, + callback: Callback< + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | null | undefined, + {} | null | undefined + > + ): void; seek( request?: protos.google.pubsub.v1.ISeekRequest, optionsOrCallback?: @@ -1754,33 +1754,6 @@ export class SubscriberClient { return this.innerApiCalls.streamingPull(options); } - listSubscriptions( - request?: protos.google.pubsub.v1.IListSubscriptionsRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ISubscription[], - protos.google.pubsub.v1.IListSubscriptionsRequest | null, - protos.google.pubsub.v1.IListSubscriptionsResponse - ] - >; - listSubscriptions( - request: protos.google.pubsub.v1.IListSubscriptionsRequest, - options: CallOptions, - callback: PaginationCallback< - protos.google.pubsub.v1.IListSubscriptionsRequest, - protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, - protos.google.pubsub.v1.ISubscription - > - ): void; - listSubscriptions( - request: protos.google.pubsub.v1.IListSubscriptionsRequest, - callback: PaginationCallback< - protos.google.pubsub.v1.IListSubscriptionsRequest, - protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, - protos.google.pubsub.v1.ISubscription - > - ): void; /** * Lists matching subscriptions. * @@ -1808,6 +1781,33 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. */ + listSubscriptions( + request?: protos.google.pubsub.v1.IListSubscriptionsRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISubscription[], + protos.google.pubsub.v1.IListSubscriptionsRequest | null, + protos.google.pubsub.v1.IListSubscriptionsResponse + ] + >; + listSubscriptions( + request: protos.google.pubsub.v1.IListSubscriptionsRequest, + options: CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSubscriptionsRequest, + protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, + protos.google.pubsub.v1.ISubscription + > + ): void; + listSubscriptions( + request: protos.google.pubsub.v1.IListSubscriptionsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSubscriptionsRequest, + protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, + protos.google.pubsub.v1.ISubscription + > + ): void; listSubscriptions( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, optionsOrCallback?: @@ -1948,33 +1948,6 @@ export class SubscriberClient { callSettings ) as AsyncIterable; } - listSnapshots( - request?: protos.google.pubsub.v1.IListSnapshotsRequest, - options?: CallOptions - ): Promise< - [ - protos.google.pubsub.v1.ISnapshot[], - protos.google.pubsub.v1.IListSnapshotsRequest | null, - protos.google.pubsub.v1.IListSnapshotsResponse - ] - >; - listSnapshots( - request: protos.google.pubsub.v1.IListSnapshotsRequest, - options: CallOptions, - callback: PaginationCallback< - protos.google.pubsub.v1.IListSnapshotsRequest, - protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, - protos.google.pubsub.v1.ISnapshot - > - ): void; - listSnapshots( - request: protos.google.pubsub.v1.IListSnapshotsRequest, - callback: PaginationCallback< - protos.google.pubsub.v1.IListSnapshotsRequest, - protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, - protos.google.pubsub.v1.ISnapshot - > - ): void; /** * Lists the existing snapshots. Snapshots are used in [Seek]( * https://cloud.google.com/pubsub/docs/replay-overview) operations, which @@ -2006,6 +1979,33 @@ export class SubscriberClient { * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. */ + listSnapshots( + request?: protos.google.pubsub.v1.IListSnapshotsRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISnapshot[], + protos.google.pubsub.v1.IListSnapshotsRequest | null, + protos.google.pubsub.v1.IListSnapshotsResponse + ] + >; + listSnapshots( + request: protos.google.pubsub.v1.IListSnapshotsRequest, + options: CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSnapshotsRequest, + protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, + protos.google.pubsub.v1.ISnapshot + > + ): void; + listSnapshots( + request: protos.google.pubsub.v1.IListSnapshotsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSnapshotsRequest, + protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, + protos.google.pubsub.v1.ISnapshot + > + ): void; listSnapshots( request?: protos.google.pubsub.v1.IListSnapshotsRequest, optionsOrCallback?: From 4e5c6c69fbab0dc6a9d449b3970baa10b9c2cef4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 16:56:13 +0000 Subject: [PATCH 0803/1115] chore: release 2.18.2 (#1424) :robot: I have created a release \*beep\* \*boop\* --- ### [2.18.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.1...v2.18.2) (2021-11-08) ### Bug Fixes * **cloud-rad:** move comments for TSDoc ([#1423](https://www.github.com/googleapis/nodejs-pubsub/issues/1423)) ([a40a23e](https://www.github.com/googleapis/nodejs-pubsub/commit/a40a23ee43c6697000996e0ff7070f41610397f5)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index d067738ff58..9995696f598 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.18.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.1...v2.18.2) (2021-11-08) + + +### Bug Fixes + +* **cloud-rad:** move comments for TSDoc ([#1423](https://www.github.com/googleapis/nodejs-pubsub/issues/1423)) ([a40a23e](https://www.github.com/googleapis/nodejs-pubsub/commit/a40a23ee43c6697000996e0ff7070f41610397f5)) + ### [2.18.1](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.0...v2.18.1) (2021-09-27) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f8cea798a52..f0cb2bf2afd 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.18.1", + "version": "2.18.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From c19d9db9d47bcb562afabb4221f8925dd3ecfecd Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 10 Nov 2021 14:38:48 -0800 Subject: [PATCH 0804/1115] docs(samples): add example tags to generated samples (#1426) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs(samples): add example tags to generated samples PiperOrigin-RevId: 408439482 Source-Link: https://github.com/googleapis/googleapis/commit/b9f61843dc80c7c285fc34fd3a40aae55082c2b9 Source-Link: https://github.com/googleapis/googleapis-gen/commit/eb888bc214efc7bf43bf4634b470254565a659a5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZWI4ODhiYzIxNGVmYzdiZjQzYmY0NjM0YjQ3MDI1NDU2NWE2NTlhNSJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- handwritten/pubsub/linkinator.config.json | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 88 +++++-------- .../src/v1/publisher_client_config.json | 4 +- .../pubsub/src/v1/schema_service_client.ts | 50 +++---- .../pubsub/src/v1/subscriber_client.ts | 124 ++++++------------ 5 files changed, 95 insertions(+), 173 deletions(-) diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json index 29a223b6db6..0121dfa684f 100644 --- a/handwritten/pubsub/linkinator.config.json +++ b/handwritten/pubsub/linkinator.config.json @@ -6,5 +6,5 @@ "img.shields.io" ], "silent": true, - "concurrency": 10 + "concurrency": 5 } diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 80998603e99..66b7273971e 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -352,12 +352,12 @@ export class PublisherClient { ]; } + getProjectId(): Promise; + getProjectId(callback: Callback): void; /** * Return the project ID used by this class. * @returns {Promise} A promise that resolves to string containing the project ID. */ - getProjectId(): Promise; - getProjectId(callback: Callback): void; getProjectId( callback?: Callback ): Promise | void { @@ -417,10 +417,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.createTopic(request); - * ``` + * @example include:samples/generated/v1/publisher.create_topic.js + * region_tag:pubsub_v1_generated_Publisher_CreateTopic_async */ createTopic( request?: protos.google.pubsub.v1.ITopic, @@ -509,10 +507,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.updateTopic(request); - * ``` + * @example include:samples/generated/v1/publisher.update_topic.js + * region_tag:pubsub_v1_generated_Publisher_UpdateTopic_async */ updateTopic( request?: protos.google.pubsub.v1.IUpdateTopicRequest, @@ -598,10 +594,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.publish(request); - * ``` + * @example include:samples/generated/v1/publisher.publish.js + * region_tag:pubsub_v1_generated_Publisher_Publish_async */ publish( request?: protos.google.pubsub.v1.IPublishRequest, @@ -684,10 +678,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.getTopic(request); - * ``` + * @example include:samples/generated/v1/publisher.get_topic.js + * region_tag:pubsub_v1_generated_Publisher_GetTopic_async */ getTopic( request?: protos.google.pubsub.v1.IGetTopicRequest, @@ -774,10 +766,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.deleteTopic(request); - * ``` + * @example include:samples/generated/v1/publisher.delete_topic.js + * region_tag:pubsub_v1_generated_Publisher_DeleteTopic_async */ deleteTopic( request?: protos.google.pubsub.v1.IDeleteTopicRequest, @@ -863,10 +853,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.detachSubscription(request); - * ``` + * @example include:samples/generated/v1/publisher.detach_subscription.js + * region_tag:pubsub_v1_generated_Publisher_DetachSubscription_async */ detachSubscription( request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, @@ -1066,7 +1054,8 @@ export class PublisherClient { gax.routingHeader.fromParams({ project: request.project || '', }); - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listTopics']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopics.createStream( this.innerApiCalls.listTopics as gax.GaxCall, @@ -1100,13 +1089,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example - * ``` - * const iterable = client.listTopicsAsync(request); - * for await (const response of iterable) { - * // process response - * } - * ``` + * @example include:samples/generated/v1/publisher.list_topics.js + * region_tag:pubsub_v1_generated_Publisher_ListTopics_async */ listTopicsAsync( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1120,8 +1104,8 @@ export class PublisherClient { gax.routingHeader.fromParams({ project: request.project || '', }); - options = options || {}; - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listTopics']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopics.asyncIterate( this.innerApiCalls['listTopics'] as GaxCall, @@ -1272,7 +1256,8 @@ export class PublisherClient { gax.routingHeader.fromParams({ topic: request.topic || '', }); - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listTopicSubscriptions']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopicSubscriptions.createStream( this.innerApiCalls.listTopicSubscriptions as gax.GaxCall, @@ -1306,13 +1291,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example - * ``` - * const iterable = client.listTopicSubscriptionsAsync(request); - * for await (const response of iterable) { - * // process response - * } - * ``` + * @example include:samples/generated/v1/publisher.list_topic_subscriptions.js + * region_tag:pubsub_v1_generated_Publisher_ListTopicSubscriptions_async */ listTopicSubscriptionsAsync( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1326,8 +1306,8 @@ export class PublisherClient { gax.routingHeader.fromParams({ topic: request.topic || '', }); - options = options || {}; - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listTopicSubscriptions']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopicSubscriptions.asyncIterate( this.innerApiCalls['listTopicSubscriptions'] as GaxCall, @@ -1472,7 +1452,8 @@ export class PublisherClient { gax.routingHeader.fromParams({ topic: request.topic || '', }); - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listTopicSnapshots']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopicSnapshots.createStream( this.innerApiCalls.listTopicSnapshots as gax.GaxCall, @@ -1506,13 +1487,8 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example - * ``` - * const iterable = client.listTopicSnapshotsAsync(request); - * for await (const response of iterable) { - * // process response - * } - * ``` + * @example include:samples/generated/v1/publisher.list_topic_snapshots.js + * region_tag:pubsub_v1_generated_Publisher_ListTopicSnapshots_async */ listTopicSnapshotsAsync( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1526,8 +1502,8 @@ export class PublisherClient { gax.routingHeader.fromParams({ topic: request.topic || '', }); - options = options || {}; - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listTopicSnapshots']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopicSnapshots.asyncIterate( this.innerApiCalls['listTopicSnapshots'] as GaxCall, diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 88765b9607a..381824599ad 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -30,8 +30,8 @@ "initial_retry_delay_millis": 100, "retry_delay_multiplier": 1.3, "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 5000, - "rpc_timeout_multiplier": 1.3, + "initial_rpc_timeout_millis": 60000, + "rpc_timeout_multiplier": 1, "max_rpc_timeout_millis": 60000, "total_timeout_millis": 600000 } diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index bc5dc6e1ba5..85874a8cc44 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -318,12 +318,12 @@ export class SchemaServiceClient { ]; } + getProjectId(): Promise; + getProjectId(callback: Callback): void; /** * Return the project ID used by this class. * @returns {Promise} A promise that resolves to string containing the project ID. */ - getProjectId(): Promise; - getProjectId(callback: Callback): void; getProjectId( callback?: Callback ): Promise | void { @@ -364,10 +364,8 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.createSchema(request); - * ``` + * @example include:samples/generated/v1/schema_service.create_schema.js + * region_tag:pubsub_v1_generated_SchemaService_CreateSchema_async */ createSchema( request?: protos.google.pubsub.v1.ICreateSchemaRequest, @@ -454,10 +452,8 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.getSchema(request); - * ``` + * @example include:samples/generated/v1/schema_service.get_schema.js + * region_tag:pubsub_v1_generated_SchemaService_GetSchema_async */ getSchema( request?: protos.google.pubsub.v1.IGetSchemaRequest, @@ -540,10 +536,8 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.deleteSchema(request); - * ``` + * @example include:samples/generated/v1/schema_service.delete_schema.js + * region_tag:pubsub_v1_generated_SchemaService_DeleteSchema_async */ deleteSchema( request?: protos.google.pubsub.v1.IDeleteSchemaRequest, @@ -628,10 +622,8 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.validateSchema(request); - * ``` + * @example include:samples/generated/v1/schema_service.validate_schema.js + * region_tag:pubsub_v1_generated_SchemaService_ValidateSchema_async */ validateSchema( request?: protos.google.pubsub.v1.IValidateSchemaRequest, @@ -724,10 +716,8 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.validateMessage(request); - * ``` + * @example include:samples/generated/v1/schema_service.validate_message.js + * region_tag:pubsub_v1_generated_SchemaService_ValidateMessage_async */ validateMessage( request?: protos.google.pubsub.v1.IValidateMessageRequest, @@ -935,7 +925,8 @@ export class SchemaServiceClient { gax.routingHeader.fromParams({ parent: request.parent || '', }); - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listSchemas']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSchemas.createStream( this.innerApiCalls.listSchemas as gax.GaxCall, @@ -973,13 +964,8 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example - * ``` - * const iterable = client.listSchemasAsync(request); - * for await (const response of iterable) { - * // process response - * } - * ``` + * @example include:samples/generated/v1/schema_service.list_schemas.js + * region_tag:pubsub_v1_generated_SchemaService_ListSchemas_async */ listSchemasAsync( request?: protos.google.pubsub.v1.IListSchemasRequest, @@ -993,8 +979,8 @@ export class SchemaServiceClient { gax.routingHeader.fromParams({ parent: request.parent || '', }); - options = options || {}; - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listSchemas']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSchemas.asyncIterate( this.innerApiCalls['listSchemas'] as GaxCall, diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 563f8247186..3d69f68edea 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -346,12 +346,12 @@ export class SubscriberClient { ]; } + getProjectId(): Promise; + getProjectId(callback: Callback): void; /** * Return the project ID used by this class. * @returns {Promise} A promise that resolves to string containing the project ID. */ - getProjectId(): Promise; - getProjectId(callback: Callback): void; getProjectId( callback?: Callback ): Promise | void { @@ -488,10 +488,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.createSubscription(request); - * ``` + * @example include:samples/generated/v1/subscriber.create_subscription.js + * region_tag:pubsub_v1_generated_Subscriber_CreateSubscription_async */ createSubscription( request?: protos.google.pubsub.v1.ISubscription, @@ -574,10 +572,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.getSubscription(request); - * ``` + * @example include:samples/generated/v1/subscriber.get_subscription.js + * region_tag:pubsub_v1_generated_Subscriber_GetSubscription_async */ getSubscription( request?: protos.google.pubsub.v1.IGetSubscriptionRequest, @@ -663,10 +659,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.updateSubscription(request); - * ``` + * @example include:samples/generated/v1/subscriber.update_subscription.js + * region_tag:pubsub_v1_generated_Subscriber_UpdateSubscription_async */ updateSubscription( request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, @@ -753,10 +747,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.deleteSubscription(request); - * ``` + * @example include:samples/generated/v1/subscriber.delete_subscription.js + * region_tag:pubsub_v1_generated_Subscriber_DeleteSubscription_async */ deleteSubscription( request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, @@ -854,10 +846,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.modifyAckDeadline(request); - * ``` + * @example include:samples/generated/v1/subscriber.modify_ack_deadline.js + * region_tag:pubsub_v1_generated_Subscriber_ModifyAckDeadline_async */ modifyAckDeadline( request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, @@ -950,10 +940,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.acknowledge(request); - * ``` + * @example include:samples/generated/v1/subscriber.acknowledge.js + * region_tag:pubsub_v1_generated_Subscriber_Acknowledge_async */ acknowledge( request?: protos.google.pubsub.v1.IAcknowledgeRequest, @@ -1050,10 +1038,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.pull(request); - * ``` + * @example include:samples/generated/v1/subscriber.pull.js + * region_tag:pubsub_v1_generated_Subscriber_Pull_async */ pull( request?: protos.google.pubsub.v1.IPullRequest, @@ -1148,10 +1134,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.modifyPushConfig(request); - * ``` + * @example include:samples/generated/v1/subscriber.modify_push_config.js + * region_tag:pubsub_v1_generated_Subscriber_ModifyPushConfig_async */ modifyPushConfig( request?: protos.google.pubsub.v1.IModifyPushConfigRequest, @@ -1238,10 +1222,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.getSnapshot(request); - * ``` + * @example include:samples/generated/v1/subscriber.get_snapshot.js + * region_tag:pubsub_v1_generated_Subscriber_GetSnapshot_async */ getSnapshot( request?: protos.google.pubsub.v1.IGetSnapshotRequest, @@ -1356,10 +1338,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.createSnapshot(request); - * ``` + * @example include:samples/generated/v1/subscriber.create_snapshot.js + * region_tag:pubsub_v1_generated_Subscriber_CreateSnapshot_async */ createSnapshot( request?: protos.google.pubsub.v1.ICreateSnapshotRequest, @@ -1449,10 +1429,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.updateSnapshot(request); - * ``` + * @example include:samples/generated/v1/subscriber.update_snapshot.js + * region_tag:pubsub_v1_generated_Subscriber_UpdateSnapshot_async */ updateSnapshot( request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, @@ -1543,10 +1521,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.deleteSnapshot(request); - * ``` + * @example include:samples/generated/v1/subscriber.delete_snapshot.js + * region_tag:pubsub_v1_generated_Subscriber_DeleteSnapshot_async */ deleteSnapshot( request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, @@ -1650,10 +1626,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example - * ``` - * const [response] = await client.seek(request); - * ``` + * @example include:samples/generated/v1/subscriber.seek.js + * region_tag:pubsub_v1_generated_Subscriber_Seek_async */ seek( request?: protos.google.pubsub.v1.ISeekRequest, @@ -1740,14 +1714,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming) * for more details and examples. - * @example - * ``` - * const stream = client.streamingPull(); - * stream.on('data', (response) => { ... }); - * stream.on('end', () => { ... }); - * stream.write(request); - * stream.end(); - * ``` + * @example include:samples/generated/v1/subscriber.streaming_pull.js + * region_tag:pubsub_v1_generated_Subscriber_StreamingPull_async */ streamingPull(options?: CallOptions): gax.CancellableStream { this.initialize(); @@ -1885,7 +1853,8 @@ export class SubscriberClient { gax.routingHeader.fromParams({ project: request.project || '', }); - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listSubscriptions']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSubscriptions.createStream( this.innerApiCalls.listSubscriptions as gax.GaxCall, @@ -1919,13 +1888,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example - * ``` - * const iterable = client.listSubscriptionsAsync(request); - * for await (const response of iterable) { - * // process response - * } - * ``` + * @example include:samples/generated/v1/subscriber.list_subscriptions.js + * region_tag:pubsub_v1_generated_Subscriber_ListSubscriptions_async */ listSubscriptionsAsync( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1939,8 +1903,8 @@ export class SubscriberClient { gax.routingHeader.fromParams({ project: request.project || '', }); - options = options || {}; - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listSubscriptions']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSubscriptions.asyncIterate( this.innerApiCalls['listSubscriptions'] as GaxCall, @@ -2083,7 +2047,8 @@ export class SubscriberClient { gax.routingHeader.fromParams({ project: request.project || '', }); - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listSnapshots']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSnapshots.createStream( this.innerApiCalls.listSnapshots as gax.GaxCall, @@ -2117,13 +2082,8 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example - * ``` - * const iterable = client.listSnapshotsAsync(request); - * for await (const response of iterable) { - * // process response - * } - * ``` + * @example include:samples/generated/v1/subscriber.list_snapshots.js + * region_tag:pubsub_v1_generated_Subscriber_ListSnapshots_async */ listSnapshotsAsync( request?: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2137,8 +2097,8 @@ export class SubscriberClient { gax.routingHeader.fromParams({ project: request.project || '', }); - options = options || {}; - const callSettings = new gax.CallSettings(options); + const defaultCallSettings = this._defaults['listSnapshots']; + const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSnapshots.asyncIterate( this.innerApiCalls['listSnapshots'] as GaxCall, From 1c06451f70f222f8e438b248afb8218c5b29b63e Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 15 Nov 2021 16:18:30 -0500 Subject: [PATCH 0805/1115] fix: set only Publish to 5000ms (#1416) Co-authored-by: Justin Beckwith --- handwritten/pubsub/src/v1/publisher_client_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 381824599ad..0e6ba7c07a2 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -48,7 +48,7 @@ "retry_params_name": "default" }, "Publish": { - "timeout_millis": 60000, + "timeout_millis": 5000, "retry_codes_name": "cancelled_unknown_deadline_exceeded_resource_exhausted_aborted_internal_unavailable", "retry_params_name": "default", "bundling": { From 97a922a1a25999dff2cabc4a9c762ee2e455dd62 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:34:48 -0500 Subject: [PATCH 0806/1115] fix: temporary hold-back on google-gax to avoid timeout issues caused by https://github.com/googleapis/gax-nodejs/pull/1100 (#1431) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f0cb2bf2afd..668269dcbfd 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "^2.24.1", + "google-gax": "2.25.3", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From e6af084544514245132257ade3f2dcac872784b2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:47:10 -0500 Subject: [PATCH 0807/1115] chore: release 2.18.3 (#1428) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 9995696f598..98931db3c49 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.18.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.2...v2.18.3) (2021-11-18) + + +### Bug Fixes + +* set only Publish to 5000ms ([#1416](https://www.github.com/googleapis/nodejs-pubsub/issues/1416)) ([1e11001](https://www.github.com/googleapis/nodejs-pubsub/commit/1e110016ea04fc41d2fa80d64a54a11fd4078c60)) +* temporary hold-back on google-gax to avoid timeout issues caused by https://github.com/googleapis/gax-nodejs/pull/1100 ([#1431](https://www.github.com/googleapis/nodejs-pubsub/issues/1431)) ([18c6b18](https://www.github.com/googleapis/nodejs-pubsub/commit/18c6b18f621c410aca968a6bfc850e7a6ea404f4)) + ### [2.18.2](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.1...v2.18.2) (2021-11-08) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 668269dcbfd..ba1910a35c7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.18.2", + "version": "2.18.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From bc56d9b4a82d814f124cceee00701d885cf1b5b5 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 19 Nov 2021 10:16:34 +0100 Subject: [PATCH 0808/1115] fix(deps): update dependency google-gax to v2.28.1 (#1432) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.25.3` -> `2.28.1`](https://renovatebot.com/diffs/npm/google-gax/2.25.3/2.28.1) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.28.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.28.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.28.1/compatibility-slim/2.25.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.28.1/confidence-slim/2.25.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.28.1`](https://togithub.com/googleapis/gax-nodejs/blob/master/CHANGELOG.md#​2281-httpswwwgithubcomgoogleapisgax-nodejscomparev2280v2281-2021-11-10) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.28.0...v2.28.1) ### [`v2.28.0`](https://togithub.com/googleapis/gax-nodejs/blob/master/CHANGELOG.md#​2280-httpswwwgithubcomgoogleapisgax-nodejscomparev2271v2280-2021-10-19) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.27.1...v2.28.0) ##### Features - export google/api/routing.proto ([#​1126](https://www.togithub.com/googleapis/gax-nodejs/issues/1126)) ([c62667e](https://www.github.com/googleapis/gax-nodejs/commit/c62667ed6499b6529203b6d8d66debb854fe1376)) ##### Bug Fixes - **deps:** update dependency [@​grpc/grpc-js](https://togithub.com/grpc/grpc-js) to ~1.4.0 ([#​1123](https://www.togithub.com/googleapis/gax-nodejs/issues/1123)) ([d422711](https://www.github.com/googleapis/gax-nodejs/commit/d4227111154cc4dfee7849750b0eeb8841aa3512)) ##### [2.27.1](https://www.github.com/googleapis/gax-nodejs/compare/v2.27.0...v2.27.1) (2021-10-01) ##### Bug Fixes - clean up grpc error handling and integration test for promote error info field ([#​1110](https://www.togithub.com/googleapis/gax-nodejs/issues/1110)) ([966b596](https://www.github.com/googleapis/gax-nodejs/commit/966b5965419cdae555a8a6959e5c921f3d3a23c4)) ### [`v2.27.1`](https://togithub.com/googleapis/gax-nodejs/blob/master/CHANGELOG.md#​2271-httpswwwgithubcomgoogleapisgax-nodejscomparev2270v2271-2021-10-01) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.27.0...v2.27.1) ### [`v2.27.0`](https://togithub.com/googleapis/gax-nodejs/blob/master/CHANGELOG.md#​2270-httpswwwgithubcomgoogleapisgax-nodejscomparev2260v2270-2021-09-30) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.26.0...v2.27.0) ##### Features - promote error info field in http error ([#​1111](https://www.togithub.com/googleapis/gax-nodejs/issues/1111)) ([a5702bd](https://www.github.com/googleapis/gax-nodejs/commit/a5702bd19ce7daae7fee5b60202bbf834e0621b0)) ### [`v2.26.0`](https://togithub.com/googleapis/gax-nodejs/blob/master/CHANGELOG.md#​2260-httpswwwgithubcomgoogleapisgax-nodejscomparev2254v2260-2021-09-27) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.25.4...v2.26.0) ##### Features - support customize options for grpc-node. ([#​1115](https://www.togithub.com/googleapis/gax-nodejs/issues/1115)) ([82fb0cb](https://www.github.com/googleapis/gax-nodejs/commit/82fb0cb347211ffa511943febcb22c972f3407d3)) ##### [2.25.4](https://www.github.com/googleapis/gax-nodejs/compare/v2.25.3...v2.25.4) (2021-09-15) ##### Bug Fixes - editing retry logic ([#​1100](https://www.togithub.com/googleapis/gax-nodejs/issues/1100)) ([05548d5](https://www.github.com/googleapis/gax-nodejs/commit/05548d5ba287af5a8833402108ac55d900889a38)) ##### [2.25.3](https://www.github.com/googleapis/gax-nodejs/compare/v2.25.2...v2.25.3) (2021-09-14) ##### Bug Fixes - protoCache map key support Buffer type ([#​1106](https://www.togithub.com/googleapis/gax-nodejs/issues/1106)) ([a7ce8ab](https://www.github.com/googleapis/gax-nodejs/commit/a7ce8abc11be39722f6060f74b4d54ce6461dd40)) ##### [2.25.2](https://www.github.com/googleapis/gax-nodejs/compare/v2.25.1...v2.25.2) (2021-09-10) ##### Bug Fixes - **diregapic:** support field name IPProtocol gRPC transcoding ([#​1103](https://www.togithub.com/googleapis/gax-nodejs/issues/1103)) ([d9c2f21](https://www.github.com/googleapis/gax-nodejs/commit/d9c2f21d80dc9c2c6eda427fddc7cbb2ac1c9f2b)) ##### [2.25.1](https://www.github.com/googleapis/gax-nodejs/compare/v2.25.0...v2.25.1) (2021-09-03) ##### Bug Fixes - **build:** migrate to main branch ([#​1101](https://www.togithub.com/googleapis/gax-nodejs/issues/1101)) ([713e245](https://www.github.com/googleapis/gax-nodejs/commit/713e24502d96543cbbffaec218cb079351cea26d)) ### [`v2.25.4`](https://togithub.com/googleapis/gax-nodejs/blob/master/CHANGELOG.md#​2254-httpswwwgithubcomgoogleapisgax-nodejscomparev2253v2254-2021-09-15) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.25.3...v2.25.4)
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ba1910a35c7..049434c6159 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.25.3", + "google-gax": "2.28.1", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From 9cce9e90deda4de673ef19f8765ed40677c6d77e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 22:40:12 +0000 Subject: [PATCH 0809/1115] build: add generated samples to .eslintignore (#1439) --- handwritten/pubsub/.eslintignore | 1 + handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index 9340ad9b86d..ea5b04aebe6 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -4,3 +4,4 @@ test/fixtures build/ docs/ protos/ +samples/generated/ diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 8d0a479d477..8a63b10a9dd 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:bbb8dd6576ac58830a07fc17e9511ae898be44f2219d3344449b125df9854441 + digest: sha256:ba3f2990fefe465f89834e4c46f847ddb141afa54daa6a1d462928fa679ed143 From 706b7ada5d7e2a4a221cea050e9b259ce5f5e081 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 9 Dec 2021 23:04:17 +0000 Subject: [PATCH 0810/1115] chore: release 2.18.4 (#1433) :robot: I have created a release \*beep\* \*boop\* --- ### [2.18.4](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.3...v2.18.4) (2021-12-09) ### Bug Fixes * **deps:** update dependency google-gax to v2.28.1 ([#1432](https://www.github.com/googleapis/nodejs-pubsub/issues/1432)) ([98840fc](https://www.github.com/googleapis/nodejs-pubsub/commit/98840fcc38a05be07de6e7dc97d8a79616940df9)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 98931db3c49..38fbf520438 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.18.4](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.3...v2.18.4) (2021-12-09) + + +### Bug Fixes + +* **deps:** update dependency google-gax to v2.28.1 ([#1432](https://www.github.com/googleapis/nodejs-pubsub/issues/1432)) ([98840fc](https://www.github.com/googleapis/nodejs-pubsub/commit/98840fcc38a05be07de6e7dc97d8a79616940df9)) + ### [2.18.3](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.2...v2.18.3) (2021-11-18) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 049434c6159..e2ebd248b67 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.18.3", + "version": "2.18.4", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 85d54f6612fb97e8a2bdc85acc0e11342ffbd54e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 29 Dec 2021 19:52:31 +0000 Subject: [PATCH 0811/1115] docs(node): support "stable"/"preview" release level (#1312) (#1448) --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 8a63b10a9dd..1b6a76cc483 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:ba3f2990fefe465f89834e4c46f847ddb141afa54daa6a1d462928fa679ed143 + digest: sha256:5ed10ba99cd1ea8c3a0f29b4c53e8a2723a101952705baed6b61783111c64c1c diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index c41f946f24a..832fd145ac1 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -213,6 +213,8 @@ are addressed with the highest priority. + + More Information: [Google Cloud Platform Launch Stages][launch_stages] [launch_stages]: https://cloud.google.com/terms/launch-stages From 97d0f811025c02b4c4061c06b6479cbf2f601cef Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 30 Dec 2021 23:08:28 +0000 Subject: [PATCH 0812/1115] docs(badges): tweak badge to use new preview/stable language (#1314) (#1449) --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/README.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 1b6a76cc483..497345b83de 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:5ed10ba99cd1ea8c3a0f29b4c53e8a2723a101952705baed6b61783111c64c1c + digest: sha256:f092066de33d4a2a13ab13c8fa9dcb4f6b96fa1fb7d391bf19cd0c4921d997c0 diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 832fd145ac1..508d371d670 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -6,7 +6,6 @@ [![release level](https://img.shields.io/badge/release%20level-general%20availability%20%28GA%29-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.org/package/@google-cloud/pubsub) -[![codecov](https://img.shields.io/codecov/c/github/googleapis/nodejs-pubsub/main.svg?style=flat)](https://codecov.io/gh/googleapis/nodejs-pubsub) From 9a9958e22668f56a20ed60cfeeafae2d19a7cd41 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 20 Jan 2022 14:45:06 -0500 Subject: [PATCH 0813/1115] fix: update to work with latest node types (changed the return type of Stream.destroy()) (#1464) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test(nodejs): remove 15 add 16 (#1322) Source-Link: https://github.com/googleapis/synthtool/commit/6981da4f29c0ae3dd783d58f1be5ab222d6a5642 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:3563b6b264989c4f5aa31a3682e4df36c95756cfef275d3201508947cbfc511e * fix: update to work with latest node types (changed the return type of Stream.destroy()) * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/package.json | 4 ++-- handwritten/pubsub/protos/protos.d.ts | 2 +- handwritten/pubsub/protos/protos.js | 2 +- handwritten/pubsub/src/message-stream.ts | 23 +++++--------------- handwritten/pubsub/test/message-stream.ts | 23 -------------------- handwritten/pubsub/test/snapshot.ts | 3 ++- handwritten/pubsub/test/subscriber.ts | 7 ++++-- handwritten/pubsub/test/subscription.ts | 2 +- 9 files changed, 19 insertions(+), 49 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 497345b83de..6831fd8e18c 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:f092066de33d4a2a13ab13c8fa9dcb4f6b96fa1fb7d391bf19cd0c4921d997c0 + digest: sha256:3563b6b264989c4f5aa31a3682e4df36c95756cfef275d3201508947cbfc511e diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e2ebd248b67..83fc2be0989 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -47,7 +47,7 @@ "precompile": "gts clean" }, "dependencies": { - "@google-cloud/paginator": "^3.0.0", + "@google-cloud/paginator": "^3.0.6", "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", @@ -72,7 +72,7 @@ "@types/mocha": "^8.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", - "@types/node": "^14.0.0", + "@types/node": "^16.0.0", "@types/proxyquire": "^1.3.28", "@types/sinon": "^10.0.0", "@types/tmp": "^0.2.0", diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 17440306e47..eb8c32bcf8c 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 4effb2aa971..7b4c8098a0e 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 7bd6df0795f..8eddf364acb 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -151,19 +151,6 @@ export class MessageStream extends PassThrough { ); this._keepAliveHandle.unref(); } - /** - * Destroys the stream and any underlying streams. - * - * @param {error?} error An error to emit, if any. - * @private - */ - destroy(error?: Error | null): void { - // We can't assume Node has taken care of this in <14. - if (this.destroyed) { - return; - } - super.destroy(error ? error : undefined); - } /** * Destroys the stream and any underlying streams. * @@ -172,7 +159,6 @@ export class MessageStream extends PassThrough { * @private */ _destroy(error: Error | null, callback: (error: Error | null) => void): void { - this.destroyed = true; clearInterval(this._keepAliveHandle); for (const stream of this._streams.keys()) { @@ -214,7 +200,8 @@ export class MessageStream extends PassThrough { try { client = await this._getClient(); } catch (e) { - this.destroy(e); + const err = e as Error; + this.destroy(err); } if (this.destroyed) { @@ -244,7 +231,8 @@ export class MessageStream extends PassThrough { try { await this._waitForClientReady(client); } catch (e) { - this.destroy(e); + const err = e as Error; + this.destroy(err); } } /** @@ -386,7 +374,8 @@ export class MessageStream extends PassThrough { try { await promisify(client.waitForReady).call(client, deadline); } catch (e) { - throw new ChannelError(e); + const err = e as Error; + throw new ChannelError(err); } } } diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index e888bf12d07..fc831f81f85 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -38,17 +38,6 @@ const FAKE_CLIENT_CONFIG = { }, }; -// just need this for unit tests.. we have a ponyfill for destroy on -// MessageStream and gax streams use Duplexify -function destroy(stream: Duplex, err?: Error): void { - process.nextTick(() => { - if (err) { - stream.emit('error', err); - } - stream.emit('close'); - }); -} - interface StreamState { highWaterMark: number; } @@ -68,12 +57,6 @@ class FakePassThrough extends PassThrough { super(options); this.options = options; } - destroy(err?: Error): void { - if (typeof super.destroy === 'function') { - return super.destroy(err); - } - destroy(this, err); - } } class FakeGrpcStream extends Duplex { @@ -95,12 +78,6 @@ class FakeGrpcStream extends Duplex { this.end(); }); } - destroy(err?: Error): void { - if (typeof super.destroy === 'function') { - return super.destroy(err); - } - destroy(this, err); - } _write(chunk: object, encoding: string, callback: Function): void { callback(); } diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index b21ae1a9906..2ebe8865da9 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -13,6 +13,7 @@ // limitations under the License. import * as assert from 'assert'; +import {ServiceError} from 'google-gax'; import {describe, it, beforeEach, before, after, afterEach} from 'mocha'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; @@ -158,7 +159,7 @@ describe('Snapshot', () => { }); const callback = stub.lastCall.args[2]; - setImmediate(callback, fakeError, null, fakeResponse); + setImmediate(callback, fakeError as ServiceError, null, fakeResponse); }); it('should return the correct snapshot', done => { diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index bbcf8ac6c91..e3fcbe791e3 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -556,13 +556,16 @@ describe('Subscriber', () => { stream.emit('error', fakeError); }); - it('should close the subscriber if stream closes unexpectedly', () => { + it('should close the subscriber if stream closes unexpectedly', done => { const stub = sandbox.stub(subscriber, 'close'); const stream: FakeMessageStream = stubs.get('messageStream'); stream.emit('close'); - assert.strictEqual(stub.callCount, 1); + process.nextTick(() => { + assert.strictEqual(stub.callCount, 1); + done(); + }); }); it('should add messages to the inventory', done => { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index e7016bdbcbb..860cded5c8d 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -393,7 +393,7 @@ describe('Subscription', () => { }); const callback = stub.lastCall.args[3]; - setImmediate(callback, fakeErr, null, fakeResponse); + setImmediate(callback, fakeErr as ServiceError, null, fakeResponse); }); it('should update the subscription', done => { From 6917756be1144b5485cf3c1bfd069b313a1fb722 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:20:58 -0500 Subject: [PATCH 0814/1115] build: update copyright year to 2022 (#1465) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): upgrade gapic-generator-java to 2.4.1 PiperOrigin-RevId: 422607515 Source-Link: https://github.com/googleapis/googleapis/commit/ba2ffd6fe6642e28b4fed2ffae217b4c5f084034 Source-Link: https://github.com/googleapis/googleapis-gen/commit/73ba4add239a619da567ffbd4e5730fdd6de04d3 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzNiYTRhZGQyMzlhNjE5ZGE1NjdmZmJkNGU1NzMwZmRkNmRlMDRkMyJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: update OwlBot SHA * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot Co-authored-by: Megan Potter --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- .../pubsub/.github/ISSUE_TEMPLATE/bug_report.md | 2 +- handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml | 4 ++++ .../pubsub/.github/ISSUE_TEMPLATE/feature_request.md | 2 +- .../pubsub/.github/ISSUE_TEMPLATE/question.md | 12 ++++++++++++ handwritten/pubsub/.jsdoc.js | 4 ++-- handwritten/pubsub/.kokoro/publish.sh | 2 +- handwritten/pubsub/.kokoro/release/publish.cfg | 11 ++++++++++- handwritten/pubsub/src/v1/index.ts | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 2 +- .../pubsub/src/v1/publisher_client_config.json | 2 +- handwritten/pubsub/src/v1/schema_service_client.ts | 2 +- handwritten/pubsub/src/v1/subscriber_client.ts | 2 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 2 +- handwritten/pubsub/test/gapic_schema_service_v1.ts | 2 +- handwritten/pubsub/test/gapic_subscriber_v1.ts | 2 +- 16 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml create mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/question.md diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 6831fd8e18c..2c37ca7a7b2 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:3563b6b264989c4f5aa31a3682e4df36c95756cfef275d3201508947cbfc511e + digest: sha256:89c5b2f3decec8ad64febbebea671076c119d1ab43700da380846a315600de8a diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md index a0e5d5dd239..490cdb0aadb 100644 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,7 +1,7 @@ --- name: Bug report about: Create a report to help us improve - +labels: 'type: bug, priority: p2' --- Thanks for stopping by to let us know something could be better! diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000000..603b90133b6 --- /dev/null +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,4 @@ +contact_links: + - name: Google Cloud Support + url: https://cloud.google.com/support/ + about: If you have a support contract with Google, please use the Google Cloud Support portal. diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md index 6365857f33c..b0327dfa02e 100644 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,7 +1,7 @@ --- name: Feature request about: Suggest an idea for this library - +labels: 'type: feature request, priority: p3' --- Thanks for stopping by to let us know something could be better! diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/question.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 00000000000..97323113911 --- /dev/null +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,12 @@ +--- +name: Question +about: Ask a question +labels: 'type: question, priority: p3' +--- + +Thanks for stopping by to ask us a question! Please make sure to include: +- What you're trying to do +- What code you've already tried +- Any error messages you're getting + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index af53b5ba234..a3991a63f46 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 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 2021 Google LLC', + copyright: 'Copyright 2022 Google LLC', includeDate: false, sourceFiles: false, systemName: '@google-cloud/pubsub', diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh index 4db6bf1c7f5..77a5defb2b5 100755 --- a/handwritten/pubsub/.kokoro/publish.sh +++ b/handwritten/pubsub/.kokoro/publish.sh @@ -24,7 +24,7 @@ python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source / cd $(dirname $0)/.. -NPM_TOKEN=$(cat $KOKORO_GFILE_DIR/secret_manager/npm_publish_token) +NPM_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_google-cloud-npm-token-1) echo "//wombat-dressing-room.appspot.com/:_authToken=${NPM_TOKEN}" > ~/.npmrc npm install diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 7d7c4c5c523..4bfff45160e 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -7,9 +7,18 @@ before_action { } } +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "google-cloud-npm-token-1" + } + } +} + env_vars: { key: "SECRET_MANAGER_KEYS" - value: "npm_publish_token,releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" + value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" } # Download trampoline resources. diff --git a/handwritten/pubsub/src/v1/index.ts b/handwritten/pubsub/src/v1/index.ts index 3eeadbcf0d2..0d4bf1d4575 100644 --- a/handwritten/pubsub/src/v1/index.ts +++ b/handwritten/pubsub/src/v1/index.ts @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 66b7273971e..b13a9dd27d5 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 0e6ba7c07a2..381824599ad 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -48,7 +48,7 @@ "retry_params_name": "default" }, "Publish": { - "timeout_millis": 5000, + "timeout_millis": 60000, "retry_codes_name": "cancelled_unknown_deadline_exceeded_resource_exhausted_aborted_internal_unavailable", "retry_params_name": "default", "bundling": { diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 85874a8cc44..ab79facf6c6 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 3d69f68edea..03d190a2f59 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index b23de6e7ae1..a647dd6e3fa 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index e91cb764eba..426cb5ee72d 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index b8cbaa7f79c..b53dd81f943 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 3abc116dd660ba6d2e361358c4741495b700e33f Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Thu, 20 Jan 2022 15:56:29 -0500 Subject: [PATCH 0815/1115] chore: add api_shortname and library_type to repo metadata (#1447) Update .repo-metadata.json as required by go/library-data-integrity --- handwritten/pubsub/.repo-metadata.json | 6 ++++-- handwritten/pubsub/README.md | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json index 54e8b2a77d2..60ccff96491 100644 --- a/handwritten/pubsub/.repo-metadata.json +++ b/handwritten/pubsub/.repo-metadata.json @@ -1,6 +1,6 @@ { "distribution_name": "@google-cloud/pubsub", - "release_level": "ga", + "release_level": "stable", "product_documentation": "https://cloud.google.com/pubsub/docs/", "repo": "googleapis/nodejs-pubsub", "default_version": "v1", @@ -11,5 +11,7 @@ "name": "pubsub", "name_pretty": "Google Cloud Pub/Sub", "api_id": "pubsub.googleapis.com", - "codeowner_team": "@googleapis/api-pubsub" + "codeowner_team": "@googleapis/api-pubsub", + "api_shortname": "pubsub", + "library_type": "GAPIC_COMBO" } diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 508d371d670..1a1f3c40f17 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -4,7 +4,7 @@ # [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) -[![release level](https://img.shields.io/badge/release%20level-general%20availability%20%28GA%29-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages) +[![release level](https://img.shields.io/badge/release%20level-stable-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.org/package/@google-cloud/pubsub) @@ -202,10 +202,10 @@ _Legacy Node.js versions are supported as a best effort:_ This library follows [Semantic Versioning](http://semver.org/). -This library is considered to be **General Availability (GA)**. This means it -is stable; the code surface will not change in backwards-incompatible ways + +This library is considered to be **stable**. The code surface will not change in backwards-incompatible ways unless absolutely necessary (e.g. because of critical security issues) or with -an extensive deprecation period. Issues and requests against **GA** libraries +an extensive deprecation period. Issues and requests against **stable** libraries are addressed with the highest priority. @@ -213,7 +213,6 @@ are addressed with the highest priority. - More Information: [Google Cloud Platform Launch Stages][launch_stages] [launch_stages]: https://cloud.google.com/terms/launch-stages From 57f8072874a563cea700902f941c0bab5cbb0375 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 20 Jan 2022 22:14:12 +0100 Subject: [PATCH 0816/1115] fix(deps): update dependency google-gax to v2.29.0 (#1452) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.28.1` -> `2.29.0`](https://renovatebot.com/diffs/npm/google-gax/2.28.1/2.29.0) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.29.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.29.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.29.0/compatibility-slim/2.28.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.29.0/confidence-slim/2.28.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.29.0`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2290-httpswwwgithubcomgoogleapisgax-nodejscomparev2281v2290-2022-01-05) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.28.1...v2.29.0) ##### Features - map http status code to grpc status code ([#​1135](https://www.togithub.com/googleapis/gax-nodejs/issues/1135)) ([772222f](https://www.github.com/googleapis/gax-nodejs/commit/772222f1d2e269ceb96bce71c0f18942507f3d4b)) - support server stream for REST ([#​1122](https://www.togithub.com/googleapis/gax-nodejs/issues/1122)) ([9f62723](https://www.github.com/googleapis/gax-nodejs/commit/9f62723762eb72566997e6c8518517e8efddd62d)) ##### [2.28.1](https://www.github.com/googleapis/gax-nodejs/compare/v2.28.0...v2.28.1) (2021-11-10) ##### Bug Fixes - handle stream has no metadata event ([#​1132](https://www.togithub.com/googleapis/gax-nodejs/issues/1132)) ([ad29bc2](https://www.github.com/googleapis/gax-nodejs/commit/ad29bc26567b588d5d694350844bea5de40963d6))
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 83fc2be0989..51a2be8d560 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.28.1", + "google-gax": "2.29.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From baa4c2c5af2b663b29ef683a3f88c16e928d7076 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 21 Jan 2022 11:48:12 +0100 Subject: [PATCH 0817/1115] fix(deps): update dependency google-gax to v2.29.4 (#1469) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.29.0` -> `2.29.4`](https://renovatebot.com/diffs/npm/google-gax/2.29.0/2.29.4) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.29.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.29.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.29.4/compatibility-slim/2.29.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.29.4/confidence-slim/2.29.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.29.4`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2294-httpsgithubcomgoogleapisgax-nodejscomparev2293v2294-2022-01-19) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.3...v2.29.4) ### [`v2.29.3`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2293-httpsgithubcomgoogleapisgax-nodejscomparev2292v2293-2022-01-11) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.2...v2.29.3) ### [`v2.29.2`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2292-httpsgithubcomgoogleapisgax-nodejscomparev2291v2292-2022-01-11) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.1...v2.29.2) ### [`v2.29.1`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2291-httpswwwgithubcomgoogleapisgax-nodejscomparev2290v2291-2022-01-06) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.0...v2.29.1)
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 51a2be8d560..856455a2aa8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.29.0", + "google-gax": "2.29.4", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From a70e27e0983c67a94e08ab158da8182b63c02037 Mon Sep 17 00:00:00 2001 From: adi-hwn Date: Fri, 21 Jan 2022 14:23:37 -0500 Subject: [PATCH 0818/1115] docs: fix publishMessage return type (#1441) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> Co-authored-by: meredithslota --- handwritten/pubsub/src/topic.ts | 4 ++-- handwritten/pubsub/system-test/pubsub.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 8ddf2cda4c8..4e8b9464692 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -822,12 +822,12 @@ export class Topic { * const [messageId] = await topic.publishMessage({data}); * ``` */ - publishMessage(message: MessageOptions): Promise<[string]>; + publishMessage(message: MessageOptions): Promise; publishMessage(message: MessageOptions, callback: PublishCallback): void; publishMessage( message: MessageOptions, callback?: PublishCallback - ): Promise<[string]> | void { + ): Promise | void { // Make a copy to ensure that any changes we make to it will not // propagate up to the user's data. message = Object.assign({}, message); diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index fafba89ccfe..5ab873905e9 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -775,7 +775,7 @@ describe('pubsub', () => { function publish(messageCount: number) { const data = Buffer.from('Hello, world!'); - const promises: Array> = []; + const promises: Array> = []; let id = 0; From e0d6d17c842c24df6baa159728575bcfd80758d8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 21 Jan 2022 21:46:50 +0100 Subject: [PATCH 0819/1115] chore(deps): update dependency @types/node to v16 (#1413) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/system-test/fixtures/sample/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index 8a19474c348..7eb51d9f8d2 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -16,7 +16,7 @@ "@google-cloud/pubsub": "file:./pubsub.tgz" }, "devDependencies": { - "@types/node": "^14.0.0", + "@types/node": "^16.0.0", "typescript": "^3.0.0", "gts": "^2.0.0" } From 1730f03835009e47d205ffb0e7e742742dca8a9e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 22 Jan 2022 00:25:01 +0100 Subject: [PATCH 0820/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to v1 (#1407) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 856455a2aa8..b26a049a56d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", "@opentelemetry/api": "^1.0.0", - "@opentelemetry/semantic-conventions": "^0.24.0", + "@opentelemetry/semantic-conventions": "^1.0.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From 782f4775b4c42c891783d0787105292e9e732656 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 25 Jan 2022 21:56:10 +0000 Subject: [PATCH 0821/1115] chore(main): release 2.18.5 (#1467) :robot: I have created a release *beep* *boop* --- ### [2.18.5](https://github.com/googleapis/nodejs-pubsub/compare/v2.18.4...v2.18.5) (2022-01-21) ### Bug Fixes * **deps:** update dependency @opentelemetry/semantic-conventions to v1 ([#1407](https://github.com/googleapis/nodejs-pubsub/issues/1407)) ([740d78c](https://github.com/googleapis/nodejs-pubsub/commit/740d78cb285a136a39d7324c9f0e2e0d7fc1f06d)) * **deps:** update dependency google-gax to v2.29.0 ([#1452](https://github.com/googleapis/nodejs-pubsub/issues/1452)) ([f419137](https://github.com/googleapis/nodejs-pubsub/commit/f4191372eabc134454db7d24cb38a29597b153dd)) * **deps:** update dependency google-gax to v2.29.4 ([#1469](https://github.com/googleapis/nodejs-pubsub/issues/1469)) ([8abbfa7](https://github.com/googleapis/nodejs-pubsub/commit/8abbfa77ce9c6e6decbd79c29bcaad8e5e3e1ed6)) * update to work with latest node types (changed the return type of Stream.destroy()) ([#1464](https://github.com/googleapis/nodejs-pubsub/issues/1464)) ([fddc2e7](https://github.com/googleapis/nodejs-pubsub/commit/fddc2e77ed54c1762afb533965da2e0658b58de6)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 10 ++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 38fbf520438..2919f640025 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,16 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.18.5](https://github.com/googleapis/nodejs-pubsub/compare/v2.18.4...v2.18.5) (2022-01-21) + + +### Bug Fixes + +* **deps:** update dependency @opentelemetry/semantic-conventions to v1 ([#1407](https://github.com/googleapis/nodejs-pubsub/issues/1407)) ([740d78c](https://github.com/googleapis/nodejs-pubsub/commit/740d78cb285a136a39d7324c9f0e2e0d7fc1f06d)) +* **deps:** update dependency google-gax to v2.29.0 ([#1452](https://github.com/googleapis/nodejs-pubsub/issues/1452)) ([f419137](https://github.com/googleapis/nodejs-pubsub/commit/f4191372eabc134454db7d24cb38a29597b153dd)) +* **deps:** update dependency google-gax to v2.29.4 ([#1469](https://github.com/googleapis/nodejs-pubsub/issues/1469)) ([8abbfa7](https://github.com/googleapis/nodejs-pubsub/commit/8abbfa77ce9c6e6decbd79c29bcaad8e5e3e1ed6)) +* update to work with latest node types (changed the return type of Stream.destroy()) ([#1464](https://github.com/googleapis/nodejs-pubsub/issues/1464)) ([fddc2e7](https://github.com/googleapis/nodejs-pubsub/commit/fddc2e77ed54c1762afb533965da2e0658b58de6)) + ### [2.18.4](https://www.github.com/googleapis/nodejs-pubsub/compare/v2.18.3...v2.18.4) (2021-12-09) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b26a049a56d..d9712b605fe 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.18.4", + "version": "2.18.5", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From fc7a4ac0fc5ab22977f621db868e96c73a360f69 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 13:35:57 -0500 Subject: [PATCH 0822/1115] chore: update v2.12.0 gapic-generator-typescript (#1470) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update v2.12.0 gapic-generator-typescript Committer: @summer-ji-eng PiperOrigin-RevId: 424244721 Source-Link: https://github.com/googleapis/googleapis/commit/4b6b01f507ebc3df95fdf8e1d76b0ae0ae33e52c Source-Link: https://github.com/googleapis/googleapis-gen/commit/8ac83fba606d008c7e8a42e7d55b6596ec4be35f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGFjODNmYmE2MDZkMDA4YzdlOGE0MmU3ZDU1YjY1OTZlYzRiZTM1ZiJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- handwritten/pubsub/linkinator.config.json | 10 ++++++++-- handwritten/pubsub/src/v1/subscriber_client.ts | 2 +- handwritten/pubsub/test/gapic_subscriber_v1.ts | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/linkinator.config.json b/handwritten/pubsub/linkinator.config.json index 0121dfa684f..befd23c8633 100644 --- a/handwritten/pubsub/linkinator.config.json +++ b/handwritten/pubsub/linkinator.config.json @@ -3,8 +3,14 @@ "skip": [ "https://codecov.io/gh/googleapis/", "www.googleapis.com", - "img.shields.io" + "img.shields.io", + "https://console.cloud.google.com/cloudshell", + "https://support.google.com" ], "silent": true, - "concurrency": 5 + "concurrency": 5, + "retry": true, + "retryErrors": true, + "retryErrorsCount": 5, + "retryErrorsJitter": 3000 } diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 03d190a2f59..f1ddcb03347 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -1719,7 +1719,7 @@ export class SubscriberClient { */ streamingPull(options?: CallOptions): gax.CancellableStream { this.initialize(); - return this.innerApiCalls.streamingPull(options); + return this.innerApiCalls.streamingPull(null, options); } /** diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index b53dd81f943..8f3a913ba05 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -1685,7 +1685,7 @@ describe('v1.SubscriberClient', () => { assert( (client.innerApiCalls.streamingPull as SinonStub) .getCall(0) - .calledWithExactly(undefined) + .calledWith(null) ); assert.deepStrictEqual( ((stream as unknown as PassThrough)._transform as SinonStub).getCall(0) @@ -1726,7 +1726,7 @@ describe('v1.SubscriberClient', () => { assert( (client.innerApiCalls.streamingPull as SinonStub) .getCall(0) - .calledWithExactly(undefined) + .calledWith(null) ); assert.deepStrictEqual( ((stream as unknown as PassThrough)._transform as SinonStub).getCall(0) From 915cdf594634607cdb0bef7140d1f115f2969177 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 28 Jan 2022 11:40:11 +0100 Subject: [PATCH 0823/1115] fix(deps): update dependency google-gax to v2.29.5 (#1474) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.29.4` -> `2.29.5`](https://renovatebot.com/diffs/npm/google-gax/2.29.4/2.29.5) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.29.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.29.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.29.5/compatibility-slim/2.29.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.29.5/confidence-slim/2.29.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.29.5`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2295-httpsgithubcomgoogleapisgax-nodejscomparev2294v2295-2022-01-27) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.4...v2.29.5)
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d9712b605fe..339a8c230d1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.29.4", + "google-gax": "2.29.5", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From 47177ffa0d621bfd6a26b64f70a02f4072f32744 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 31 Jan 2022 22:24:28 +0100 Subject: [PATCH 0824/1115] chore(deps): update dependency sinon to v13 (#1476) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 339a8c230d1..5167cdf6f80 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -91,7 +91,7 @@ "null-loader": "^4.0.0", "protobufjs": "^6.10.1", "proxyquire": "^2.0.0", - "sinon": "^12.0.0", + "sinon": "^13.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", "typescript": "^3.8.3", From eebb6f5d6575868658972eb0d82e80e310f6d3de Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 16:10:46 +0000 Subject: [PATCH 0825/1115] docs(nodejs): version support policy edits (#1346) (#1484) --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 15 +++++++++++- handwritten/pubsub/README.md | 24 ++++++++++---------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 2c37ca7a7b2..84059c19485 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,3 +1,16 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:89c5b2f3decec8ad64febbebea671076c119d1ab43700da380846a315600de8a + digest: sha256:a9d166a74752226923d159cb723df53429e226c9c076dad3ca52ffd073ff3bb4 diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 1a1f3c40f17..48a42e23754 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -181,21 +181,21 @@ also contains samples. Our client libraries follow the [Node.js release schedule](https://nodejs.org/en/about/releases/). Libraries are compatible with all current _active_ and _maintenance_ versions of Node.js. +If you are using an end-of-life version of Node.js, we recommend that you update +as soon as possible to an actively supported LTS version. -Client libraries targeting some end-of-life versions of Node.js are available, and -can be installed via npm [dist-tags](https://docs.npmjs.com/cli/dist-tag). -The dist-tags follow the naming convention `legacy-(version)`. - -_Legacy Node.js versions are supported as a best effort:_ +Google's client libraries support legacy versions of Node.js runtimes on a +best-efforts basis with the following warnings: -* Legacy versions will not be tested in continuous integration. -* Some security patches may not be able to be backported. -* Dependencies will not be kept up-to-date, and features will not be backported. +* Legacy versions are not tested in continuous integration. +* Some security patches and features cannot be backported. +* Dependencies cannot be kept up-to-date. -#### Legacy tags available - -* `legacy-8`: install client libraries from this dist-tag for versions - compatible with Node.js 8. +Client libraries targeting some end-of-life versions of Node.js are available, and +can be installed through npm [dist-tags](https://docs.npmjs.com/cli/dist-tag). +The dist-tags follow the naming convention `legacy-(version)`. +For example, `npm install @google-cloud/pubsub@legacy-8` installs client libraries +for versions compatible with Node.js 8. ## Versioning From a46ade3ffbdbad3ee9afde864a7061c85d4a11b3 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 16 Feb 2022 12:06:53 -0500 Subject: [PATCH 0826/1115] tests: fix another typing issue with streams (#1491) * tests: fix another typing issue with streams --- handwritten/pubsub/test/subscriber.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index e3fcbe791e3..5926066112d 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -125,8 +125,12 @@ class FakeMessageStream extends PassThrough { this.options = options; stubs.set('messageStream', this); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - destroy(error?: Error): void {} + _destroy( + // eslint-disable-next-line @typescript-eslint/no-unused-vars + _error: Error | null, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + _callback: (error: Error | null) => void + ): void {} } class FakePreciseDate { From c1f81049a82b59273d0c7305f621b30f23748ed6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 12:30:01 -0500 Subject: [PATCH 0827/1115] feat: add exactly once delivery flag (#1487) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add exactly once delivery flag PiperOrigin-RevId: 426415626 Source-Link: https://github.com/googleapis/googleapis/commit/1f707ab5f82f83644f2812f5f3d94462c72f9870 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2baebc579ed42c4d17883a14eca64411f69dcc87 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmJhZWJjNTc5ZWQ0MmM0ZDE3ODgzYTE0ZWNhNjQ0MTFmNjlkY2M4NyJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Merge branch 'owl-bot-bf34f5ea-4a0a-4412-b431-76abec1c6c4d' of https://github.com/googleapis/nodejs-pubsub into owl-bot-bf34f5ea-4a0a-4412-b431-76abec1c6c4d 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Merge branch 'owl-bot-bf34f5ea-4a0a-4412-b431-76abec1c6c4d' of https://github.com/googleapis/nodejs-pubsub into owl-bot-bf34f5ea-4a0a-4412-b431-76abec1c6c4d 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Merge branch 'main' into owl-bot-bf34f5ea-4a0a-4412-b431-76abec1c6c4d 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md feat: add exactly once delivery flag PiperOrigin-RevId: 426415626 Source-Link: https://github.com/googleapis/googleapis/commit/1f707ab5f82f83644f2812f5f3d94462c72f9870 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2baebc579ed42c4d17883a14eca64411f69dcc87 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmJhZWJjNTc5ZWQ0MmM0ZDE3ODgzYTE0ZWNhNjQ0MTFmNjlkY2M4NyJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot Co-authored-by: Megan Potter Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/README.md | 4 +- .../protos/google/pubsub/v1/pubsub.proto | 48 ++ handwritten/pubsub/protos/protos.d.ts | 222 +++++++ handwritten/pubsub/protos/protos.js | 626 +++++++++++++++++- handwritten/pubsub/protos/protos.json | 64 ++ .../pubsub/src/v1/subscriber_client.ts | 12 + 6 files changed, 972 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 48a42e23754..7af9f6a7ded 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -70,14 +70,14 @@ const {PubSub} = require('@google-cloud/pubsub'); async function quickstart( projectId = 'your-project-id', // Your Google Cloud Platform project ID - topicName = 'my-topic', // Name for the new topic to create + topicNameOrId = 'my-topic', // Name for the new topic to create subscriptionName = 'my-sub' // Name for the new subscription to create ) { // Instantiates a client const pubsub = new PubSub({projectId}); // Creates a new topic - const [topic] = await pubsub.createTopic(topicName); + const [topic] = await pubsub.createTopic(topicNameOrId); console.log(`Topic ${topic.name} created.`); // Creates a subscription on that new topic diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index b1d65626cf2..a44ba7c9c94 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -752,6 +752,19 @@ message Subscription { // the endpoint will not be made. bool detached = 15; + // If true, Pub/Sub provides the following guarantees for the delivery of + // a message with a given value of `message_id` on this subscription: + // + // * The message sent to a subscriber is guaranteed not to be resent + // before the message's acknowledgement deadline expires. + // * An acknowledged message will not be resent to a subscriber. + // + // Note that subscribers may still receive multiple copies of a message + // when `enable_exactly_once_delivery` is true if the message was published + // multiple times by a publisher client. These copies are considered distinct + // by Pub/Sub and have distinct `message_id` values. + bool enable_exactly_once_delivery = 16; + // Output only. Indicates the minimum duration for which a message is retained // after it is published to the subscription's topic. If this field is set, // messages published to the subscription's topic in the last @@ -1163,8 +1176,35 @@ message StreamingPullRequest { // Response for the `StreamingPull` method. This response is used to stream // messages from the server to the client. message StreamingPullResponse { + // Acknowledgement IDs sent in one or more previous requests to acknowledge a + // previously received message. + message AcknowledgeConfirmation { + // Successfully processed acknowledgement IDs. + repeated string ack_ids = 1 [ctype = CORD]; + + // List of acknowledgement IDs that were malformed or whose acknowledgement + // deadline has expired. + repeated string invalid_ack_ids = 2 [ctype = CORD]; + + // List of acknowledgement IDs that were out of order. + repeated string unordered_ack_ids = 3 [ctype = CORD]; + } + + // 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]; + + // List of acknowledgement IDs that were malformed or whose acknowledgement + // deadline has expired. + repeated string invalid_ack_ids = 2 [ctype = CORD]; + } + // Subscription properties sent as part of the response. message SubscriptionProperties { + // True iff exactly once delivery is enabled for this subscription. + bool exactly_once_delivery_enabled = 1; // True iff message ordering is enabled for this subscription. bool message_ordering_enabled = 2; } @@ -1172,6 +1212,14 @@ message StreamingPullResponse { // Received Pub/Sub messages. This will not be empty. repeated ReceivedMessage received_messages = 1; + // This field will only be set if `enable_exactly_once_delivery` is set to + // `true`. + AcknowledgeConfirmation acknowlege_confirmation = 2; + + // This field will only be set if `enable_exactly_once_delivery` is set to + // `true`. + ModifyAckDeadlineConfirmation modify_ack_deadline_confirmation = 3; + // Properties associated with this subscription. SubscriptionProperties subscription_properties = 4; } diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index eb8c32bcf8c..c82d9bbed7d 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -2294,6 +2294,9 @@ export namespace google { /** Subscription detached */ detached?: (boolean|null); + /** Subscription enableExactlyOnceDelivery */ + enableExactlyOnceDelivery?: (boolean|null); + /** Subscription topicMessageRetentionDuration */ topicMessageRetentionDuration?: (google.protobuf.IDuration|null); } @@ -2346,6 +2349,9 @@ export namespace google { /** Subscription detached. */ public detached: boolean; + /** Subscription enableExactlyOnceDelivery. */ + public enableExactlyOnceDelivery: boolean; + /** Subscription topicMessageRetentionDuration. */ public topicMessageRetentionDuration?: (google.protobuf.IDuration|null); @@ -4106,6 +4112,12 @@ export namespace google { /** StreamingPullResponse receivedMessages */ receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); + /** StreamingPullResponse acknowlegeConfirmation */ + acknowlegeConfirmation?: (google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null); + + /** StreamingPullResponse modifyAckDeadlineConfirmation */ + modifyAckDeadlineConfirmation?: (google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation|null); + /** StreamingPullResponse subscriptionProperties */ subscriptionProperties?: (google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null); } @@ -4122,6 +4134,12 @@ export namespace google { /** StreamingPullResponse receivedMessages. */ public receivedMessages: google.pubsub.v1.IReceivedMessage[]; + /** StreamingPullResponse acknowlegeConfirmation. */ + public acknowlegeConfirmation?: (google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null); + + /** StreamingPullResponse modifyAckDeadlineConfirmation. */ + public modifyAckDeadlineConfirmation?: (google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation|null); + /** StreamingPullResponse subscriptionProperties. */ public subscriptionProperties?: (google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null); @@ -4198,9 +4216,210 @@ export namespace google { namespace StreamingPullResponse { + /** Properties of an AcknowledgeConfirmation. */ + interface IAcknowledgeConfirmation { + + /** AcknowledgeConfirmation ackIds */ + ackIds?: (string[]|null); + + /** AcknowledgeConfirmation invalidAckIds */ + invalidAckIds?: (string[]|null); + + /** AcknowledgeConfirmation unorderedAckIds */ + unorderedAckIds?: (string[]|null); + } + + /** Represents an AcknowledgeConfirmation. */ + class AcknowledgeConfirmation implements IAcknowledgeConfirmation { + + /** + * Constructs a new AcknowledgeConfirmation. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation); + + /** AcknowledgeConfirmation ackIds. */ + public ackIds: string[]; + + /** AcknowledgeConfirmation invalidAckIds. */ + public invalidAckIds: string[]; + + /** AcknowledgeConfirmation unorderedAckIds. */ + public unorderedAckIds: string[]; + + /** + * Creates a new AcknowledgeConfirmation instance using the specified properties. + * @param [properties] Properties to set + * @returns AcknowledgeConfirmation instance + */ + public static create(properties?: google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation): google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation; + + /** + * Encodes the specified AcknowledgeConfirmation message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.verify|verify} messages. + * @param message AcknowledgeConfirmation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AcknowledgeConfirmation message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.verify|verify} messages. + * @param message AcknowledgeConfirmation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AcknowledgeConfirmation message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AcknowledgeConfirmation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation; + + /** + * Decodes an AcknowledgeConfirmation message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AcknowledgeConfirmation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation; + + /** + * Verifies an AcknowledgeConfirmation message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AcknowledgeConfirmation message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AcknowledgeConfirmation + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation; + + /** + * Creates a plain object from an AcknowledgeConfirmation message. Also converts values to other types if specified. + * @param message AcknowledgeConfirmation + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AcknowledgeConfirmation to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + /** Properties of a ModifyAckDeadlineConfirmation. */ + interface IModifyAckDeadlineConfirmation { + + /** ModifyAckDeadlineConfirmation ackIds */ + ackIds?: (string[]|null); + + /** ModifyAckDeadlineConfirmation invalidAckIds */ + invalidAckIds?: (string[]|null); + } + + /** Represents a ModifyAckDeadlineConfirmation. */ + class ModifyAckDeadlineConfirmation implements IModifyAckDeadlineConfirmation { + + /** + * Constructs a new ModifyAckDeadlineConfirmation. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation); + + /** ModifyAckDeadlineConfirmation ackIds. */ + public ackIds: string[]; + + /** ModifyAckDeadlineConfirmation invalidAckIds. */ + public invalidAckIds: string[]; + + /** + * Creates a new ModifyAckDeadlineConfirmation instance using the specified properties. + * @param [properties] Properties to set + * @returns ModifyAckDeadlineConfirmation instance + */ + public static create(properties?: google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation): google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation; + + /** + * Encodes the specified ModifyAckDeadlineConfirmation message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.verify|verify} messages. + * @param message ModifyAckDeadlineConfirmation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ModifyAckDeadlineConfirmation message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.verify|verify} messages. + * @param message ModifyAckDeadlineConfirmation message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ModifyAckDeadlineConfirmation message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ModifyAckDeadlineConfirmation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation; + + /** + * Decodes a ModifyAckDeadlineConfirmation message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ModifyAckDeadlineConfirmation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation; + + /** + * Verifies a ModifyAckDeadlineConfirmation message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ModifyAckDeadlineConfirmation message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ModifyAckDeadlineConfirmation + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation; + + /** + * Creates a plain object from a ModifyAckDeadlineConfirmation message. Also converts values to other types if specified. + * @param message ModifyAckDeadlineConfirmation + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ModifyAckDeadlineConfirmation to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + /** Properties of a SubscriptionProperties. */ interface ISubscriptionProperties { + /** SubscriptionProperties exactlyOnceDeliveryEnabled */ + exactlyOnceDeliveryEnabled?: (boolean|null); + /** SubscriptionProperties messageOrderingEnabled */ messageOrderingEnabled?: (boolean|null); } @@ -4214,6 +4433,9 @@ export namespace google { */ constructor(properties?: google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties); + /** SubscriptionProperties exactlyOnceDeliveryEnabled. */ + public exactlyOnceDeliveryEnabled: boolean; + /** SubscriptionProperties messageOrderingEnabled. */ public messageOrderingEnabled: boolean; diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 7b4c8098a0e..63199572f59 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -4853,6 +4853,7 @@ * @property {google.pubsub.v1.IDeadLetterPolicy|null} [deadLetterPolicy] Subscription deadLetterPolicy * @property {google.pubsub.v1.IRetryPolicy|null} [retryPolicy] Subscription retryPolicy * @property {boolean|null} [detached] Subscription detached + * @property {boolean|null} [enableExactlyOnceDelivery] Subscription enableExactlyOnceDelivery * @property {google.protobuf.IDuration|null} [topicMessageRetentionDuration] Subscription topicMessageRetentionDuration */ @@ -4976,6 +4977,14 @@ */ Subscription.prototype.detached = false; + /** + * Subscription enableExactlyOnceDelivery. + * @member {boolean} enableExactlyOnceDelivery + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.enableExactlyOnceDelivery = false; + /** * Subscription topicMessageRetentionDuration. * @member {google.protobuf.IDuration|null|undefined} topicMessageRetentionDuration @@ -5035,6 +5044,8 @@ $root.google.pubsub.v1.RetryPolicy.encode(message.retryPolicy, writer.uint32(/* id 14, wireType 2 =*/114).fork()).ldelim(); if (message.detached != null && Object.hasOwnProperty.call(message, "detached")) writer.uint32(/* id 15, wireType 0 =*/120).bool(message.detached); + if (message.enableExactlyOnceDelivery != null && Object.hasOwnProperty.call(message, "enableExactlyOnceDelivery")) + writer.uint32(/* id 16, wireType 0 =*/128).bool(message.enableExactlyOnceDelivery); if (message.topicMessageRetentionDuration != null && Object.hasOwnProperty.call(message, "topicMessageRetentionDuration")) $root.google.protobuf.Duration.encode(message.topicMessageRetentionDuration, writer.uint32(/* id 17, wireType 2 =*/138).fork()).ldelim(); return writer; @@ -5129,6 +5140,9 @@ case 15: message.detached = reader.bool(); break; + case 16: + message.enableExactlyOnceDelivery = reader.bool(); + break; case 17: message.topicMessageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); break; @@ -5221,6 +5235,9 @@ if (message.detached != null && message.hasOwnProperty("detached")) if (typeof message.detached !== "boolean") return "detached: boolean expected"; + if (message.enableExactlyOnceDelivery != null && message.hasOwnProperty("enableExactlyOnceDelivery")) + if (typeof message.enableExactlyOnceDelivery !== "boolean") + return "enableExactlyOnceDelivery: boolean expected"; if (message.topicMessageRetentionDuration != null && message.hasOwnProperty("topicMessageRetentionDuration")) { var error = $root.google.protobuf.Duration.verify(message.topicMessageRetentionDuration); if (error) @@ -5287,6 +5304,8 @@ } if (object.detached != null) message.detached = Boolean(object.detached); + if (object.enableExactlyOnceDelivery != null) + message.enableExactlyOnceDelivery = Boolean(object.enableExactlyOnceDelivery); if (object.topicMessageRetentionDuration != null) { if (typeof object.topicMessageRetentionDuration !== "object") throw TypeError(".google.pubsub.v1.Subscription.topicMessageRetentionDuration: object expected"); @@ -5323,6 +5342,7 @@ object.deadLetterPolicy = null; object.retryPolicy = null; object.detached = false; + object.enableExactlyOnceDelivery = false; object.topicMessageRetentionDuration = null; } if (message.name != null && message.hasOwnProperty("name")) @@ -5355,6 +5375,8 @@ object.retryPolicy = $root.google.pubsub.v1.RetryPolicy.toObject(message.retryPolicy, options); if (message.detached != null && message.hasOwnProperty("detached")) object.detached = message.detached; + if (message.enableExactlyOnceDelivery != null && message.hasOwnProperty("enableExactlyOnceDelivery")) + object.enableExactlyOnceDelivery = message.enableExactlyOnceDelivery; if (message.topicMessageRetentionDuration != null && message.hasOwnProperty("topicMessageRetentionDuration")) object.topicMessageRetentionDuration = $root.google.protobuf.Duration.toObject(message.topicMessageRetentionDuration, options); return object; @@ -9357,6 +9379,8 @@ * @memberof google.pubsub.v1 * @interface IStreamingPullResponse * @property {Array.|null} [receivedMessages] StreamingPullResponse receivedMessages + * @property {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null} [acknowlegeConfirmation] StreamingPullResponse acknowlegeConfirmation + * @property {google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation|null} [modifyAckDeadlineConfirmation] StreamingPullResponse modifyAckDeadlineConfirmation * @property {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null} [subscriptionProperties] StreamingPullResponse subscriptionProperties */ @@ -9384,6 +9408,22 @@ */ StreamingPullResponse.prototype.receivedMessages = $util.emptyArray; + /** + * StreamingPullResponse acknowlegeConfirmation. + * @member {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null|undefined} acknowlegeConfirmation + * @memberof google.pubsub.v1.StreamingPullResponse + * @instance + */ + StreamingPullResponse.prototype.acknowlegeConfirmation = null; + + /** + * StreamingPullResponse modifyAckDeadlineConfirmation. + * @member {google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation|null|undefined} modifyAckDeadlineConfirmation + * @memberof google.pubsub.v1.StreamingPullResponse + * @instance + */ + StreamingPullResponse.prototype.modifyAckDeadlineConfirmation = null; + /** * StreamingPullResponse subscriptionProperties. * @member {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null|undefined} subscriptionProperties @@ -9419,6 +9459,10 @@ if (message.receivedMessages != null && message.receivedMessages.length) for (var i = 0; i < message.receivedMessages.length; ++i) $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.acknowlegeConfirmation != null && Object.hasOwnProperty.call(message, "acknowlegeConfirmation")) + $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.encode(message.acknowlegeConfirmation, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.modifyAckDeadlineConfirmation != null && Object.hasOwnProperty.call(message, "modifyAckDeadlineConfirmation")) + $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.encode(message.modifyAckDeadlineConfirmation, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); if (message.subscriptionProperties != null && Object.hasOwnProperty.call(message, "subscriptionProperties")) $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.encode(message.subscriptionProperties, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); return writer; @@ -9460,6 +9504,12 @@ message.receivedMessages = []; message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); break; + case 2: + message.acknowlegeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.decode(reader, reader.uint32()); + break; + case 3: + message.modifyAckDeadlineConfirmation = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.decode(reader, reader.uint32()); + break; case 4: message.subscriptionProperties = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.decode(reader, reader.uint32()); break; @@ -9507,6 +9557,16 @@ return "receivedMessages." + error; } } + if (message.acknowlegeConfirmation != null && message.hasOwnProperty("acknowlegeConfirmation")) { + var error = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.verify(message.acknowlegeConfirmation); + if (error) + return "acknowlegeConfirmation." + error; + } + if (message.modifyAckDeadlineConfirmation != null && message.hasOwnProperty("modifyAckDeadlineConfirmation")) { + var error = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.verify(message.modifyAckDeadlineConfirmation); + if (error) + return "modifyAckDeadlineConfirmation." + error; + } if (message.subscriptionProperties != null && message.hasOwnProperty("subscriptionProperties")) { var error = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.verify(message.subscriptionProperties); if (error) @@ -9537,6 +9597,16 @@ message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); } } + if (object.acknowlegeConfirmation != null) { + if (typeof object.acknowlegeConfirmation !== "object") + throw TypeError(".google.pubsub.v1.StreamingPullResponse.acknowlegeConfirmation: object expected"); + message.acknowlegeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.fromObject(object.acknowlegeConfirmation); + } + if (object.modifyAckDeadlineConfirmation != null) { + if (typeof object.modifyAckDeadlineConfirmation !== "object") + throw TypeError(".google.pubsub.v1.StreamingPullResponse.modifyAckDeadlineConfirmation: object expected"); + message.modifyAckDeadlineConfirmation = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.fromObject(object.modifyAckDeadlineConfirmation); + } if (object.subscriptionProperties != null) { if (typeof object.subscriptionProperties !== "object") throw TypeError(".google.pubsub.v1.StreamingPullResponse.subscriptionProperties: object expected"); @@ -9560,13 +9630,20 @@ var object = {}; if (options.arrays || options.defaults) object.receivedMessages = []; - if (options.defaults) + if (options.defaults) { + object.acknowlegeConfirmation = null; + object.modifyAckDeadlineConfirmation = null; object.subscriptionProperties = null; + } if (message.receivedMessages && message.receivedMessages.length) { object.receivedMessages = []; for (var j = 0; j < message.receivedMessages.length; ++j) object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); } + if (message.acknowlegeConfirmation != null && message.hasOwnProperty("acknowlegeConfirmation")) + object.acknowlegeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.toObject(message.acknowlegeConfirmation, options); + if (message.modifyAckDeadlineConfirmation != null && message.hasOwnProperty("modifyAckDeadlineConfirmation")) + object.modifyAckDeadlineConfirmation = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.toObject(message.modifyAckDeadlineConfirmation, options); if (message.subscriptionProperties != null && message.hasOwnProperty("subscriptionProperties")) object.subscriptionProperties = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.toObject(message.subscriptionProperties, options); return object; @@ -9583,12 +9660,535 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + StreamingPullResponse.AcknowledgeConfirmation = (function() { + + /** + * Properties of an AcknowledgeConfirmation. + * @memberof google.pubsub.v1.StreamingPullResponse + * @interface IAcknowledgeConfirmation + * @property {Array.|null} [ackIds] AcknowledgeConfirmation ackIds + * @property {Array.|null} [invalidAckIds] AcknowledgeConfirmation invalidAckIds + * @property {Array.|null} [unorderedAckIds] AcknowledgeConfirmation unorderedAckIds + */ + + /** + * Constructs a new AcknowledgeConfirmation. + * @memberof google.pubsub.v1.StreamingPullResponse + * @classdesc Represents an AcknowledgeConfirmation. + * @implements IAcknowledgeConfirmation + * @constructor + * @param {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation=} [properties] Properties to set + */ + function AcknowledgeConfirmation(properties) { + this.ackIds = []; + this.invalidAckIds = []; + this.unorderedAckIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * AcknowledgeConfirmation ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @instance + */ + AcknowledgeConfirmation.prototype.ackIds = $util.emptyArray; + + /** + * AcknowledgeConfirmation invalidAckIds. + * @member {Array.} invalidAckIds + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @instance + */ + AcknowledgeConfirmation.prototype.invalidAckIds = $util.emptyArray; + + /** + * AcknowledgeConfirmation unorderedAckIds. + * @member {Array.} unorderedAckIds + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @instance + */ + AcknowledgeConfirmation.prototype.unorderedAckIds = $util.emptyArray; + + /** + * Creates a new AcknowledgeConfirmation instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation} AcknowledgeConfirmation instance + */ + AcknowledgeConfirmation.create = function create(properties) { + return new AcknowledgeConfirmation(properties); + }; + + /** + * Encodes the specified AcknowledgeConfirmation message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation} message AcknowledgeConfirmation message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AcknowledgeConfirmation.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.ackIds[i]); + if (message.invalidAckIds != null && message.invalidAckIds.length) + for (var i = 0; i < message.invalidAckIds.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.invalidAckIds[i]); + if (message.unorderedAckIds != null && message.unorderedAckIds.length) + for (var i = 0; i < message.unorderedAckIds.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.unorderedAckIds[i]); + return writer; + }; + + /** + * Encodes the specified AcknowledgeConfirmation message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation} message AcknowledgeConfirmation message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AcknowledgeConfirmation.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AcknowledgeConfirmation message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation} AcknowledgeConfirmation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AcknowledgeConfirmation.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + case 2: + if (!(message.invalidAckIds && message.invalidAckIds.length)) + message.invalidAckIds = []; + message.invalidAckIds.push(reader.string()); + break; + case 3: + if (!(message.unorderedAckIds && message.unorderedAckIds.length)) + message.unorderedAckIds = []; + message.unorderedAckIds.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AcknowledgeConfirmation message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation} AcknowledgeConfirmation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AcknowledgeConfirmation.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AcknowledgeConfirmation message. + * @function verify + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AcknowledgeConfirmation.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + if (message.invalidAckIds != null && message.hasOwnProperty("invalidAckIds")) { + if (!Array.isArray(message.invalidAckIds)) + return "invalidAckIds: array expected"; + for (var i = 0; i < message.invalidAckIds.length; ++i) + if (!$util.isString(message.invalidAckIds[i])) + return "invalidAckIds: string[] expected"; + } + if (message.unorderedAckIds != null && message.hasOwnProperty("unorderedAckIds")) { + if (!Array.isArray(message.unorderedAckIds)) + return "unorderedAckIds: array expected"; + for (var i = 0; i < message.unorderedAckIds.length; ++i) + if (!$util.isString(message.unorderedAckIds[i])) + return "unorderedAckIds: string[] expected"; + } + return null; + }; + + /** + * Creates an AcknowledgeConfirmation message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation} AcknowledgeConfirmation + */ + AcknowledgeConfirmation.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation) + return object; + var message = new $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation(); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + if (object.invalidAckIds) { + if (!Array.isArray(object.invalidAckIds)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.invalidAckIds: array expected"); + message.invalidAckIds = []; + for (var i = 0; i < object.invalidAckIds.length; ++i) + message.invalidAckIds[i] = String(object.invalidAckIds[i]); + } + if (object.unorderedAckIds) { + if (!Array.isArray(object.unorderedAckIds)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.unorderedAckIds: array expected"); + message.unorderedAckIds = []; + for (var i = 0; i < object.unorderedAckIds.length; ++i) + message.unorderedAckIds[i] = String(object.unorderedAckIds[i]); + } + return message; + }; + + /** + * Creates a plain object from an AcknowledgeConfirmation message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation} message AcknowledgeConfirmation + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AcknowledgeConfirmation.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.ackIds = []; + object.invalidAckIds = []; + object.unorderedAckIds = []; + } + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + if (message.invalidAckIds && message.invalidAckIds.length) { + object.invalidAckIds = []; + for (var j = 0; j < message.invalidAckIds.length; ++j) + object.invalidAckIds[j] = message.invalidAckIds[j]; + } + if (message.unorderedAckIds && message.unorderedAckIds.length) { + object.unorderedAckIds = []; + for (var j = 0; j < message.unorderedAckIds.length; ++j) + object.unorderedAckIds[j] = message.unorderedAckIds[j]; + } + return object; + }; + + /** + * Converts this AcknowledgeConfirmation to JSON. + * @function toJSON + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @instance + * @returns {Object.} JSON object + */ + AcknowledgeConfirmation.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return AcknowledgeConfirmation; + })(); + + StreamingPullResponse.ModifyAckDeadlineConfirmation = (function() { + + /** + * Properties of a ModifyAckDeadlineConfirmation. + * @memberof google.pubsub.v1.StreamingPullResponse + * @interface IModifyAckDeadlineConfirmation + * @property {Array.|null} [ackIds] ModifyAckDeadlineConfirmation ackIds + * @property {Array.|null} [invalidAckIds] ModifyAckDeadlineConfirmation invalidAckIds + */ + + /** + * Constructs a new ModifyAckDeadlineConfirmation. + * @memberof google.pubsub.v1.StreamingPullResponse + * @classdesc Represents a ModifyAckDeadlineConfirmation. + * @implements IModifyAckDeadlineConfirmation + * @constructor + * @param {google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation=} [properties] Properties to set + */ + function ModifyAckDeadlineConfirmation(properties) { + this.ackIds = []; + this.invalidAckIds = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ModifyAckDeadlineConfirmation ackIds. + * @member {Array.} ackIds + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @instance + */ + ModifyAckDeadlineConfirmation.prototype.ackIds = $util.emptyArray; + + /** + * ModifyAckDeadlineConfirmation invalidAckIds. + * @member {Array.} invalidAckIds + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @instance + */ + ModifyAckDeadlineConfirmation.prototype.invalidAckIds = $util.emptyArray; + + /** + * Creates a new ModifyAckDeadlineConfirmation instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation=} [properties] Properties to set + * @returns {google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation} ModifyAckDeadlineConfirmation instance + */ + ModifyAckDeadlineConfirmation.create = function create(properties) { + return new ModifyAckDeadlineConfirmation(properties); + }; + + /** + * Encodes the specified ModifyAckDeadlineConfirmation message. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation} message ModifyAckDeadlineConfirmation message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyAckDeadlineConfirmation.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.ackIds != null && message.ackIds.length) + for (var i = 0; i < message.ackIds.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.ackIds[i]); + if (message.invalidAckIds != null && message.invalidAckIds.length) + for (var i = 0; i < message.invalidAckIds.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.invalidAckIds[i]); + return writer; + }; + + /** + * Encodes the specified ModifyAckDeadlineConfirmation message, length delimited. Does not implicitly {@link google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation} message ModifyAckDeadlineConfirmation message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ModifyAckDeadlineConfirmation.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ModifyAckDeadlineConfirmation message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation} ModifyAckDeadlineConfirmation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyAckDeadlineConfirmation.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + case 2: + if (!(message.invalidAckIds && message.invalidAckIds.length)) + message.invalidAckIds = []; + message.invalidAckIds.push(reader.string()); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ModifyAckDeadlineConfirmation message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation} ModifyAckDeadlineConfirmation + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ModifyAckDeadlineConfirmation.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ModifyAckDeadlineConfirmation message. + * @function verify + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ModifyAckDeadlineConfirmation.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.ackIds != null && message.hasOwnProperty("ackIds")) { + if (!Array.isArray(message.ackIds)) + return "ackIds: array expected"; + for (var i = 0; i < message.ackIds.length; ++i) + if (!$util.isString(message.ackIds[i])) + return "ackIds: string[] expected"; + } + if (message.invalidAckIds != null && message.hasOwnProperty("invalidAckIds")) { + if (!Array.isArray(message.invalidAckIds)) + return "invalidAckIds: array expected"; + for (var i = 0; i < message.invalidAckIds.length; ++i) + if (!$util.isString(message.invalidAckIds[i])) + return "invalidAckIds: string[] expected"; + } + return null; + }; + + /** + * Creates a ModifyAckDeadlineConfirmation message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation} ModifyAckDeadlineConfirmation + */ + ModifyAckDeadlineConfirmation.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation) + return object; + var message = new $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation(); + if (object.ackIds) { + if (!Array.isArray(object.ackIds)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.ackIds: array expected"); + message.ackIds = []; + for (var i = 0; i < object.ackIds.length; ++i) + message.ackIds[i] = String(object.ackIds[i]); + } + if (object.invalidAckIds) { + if (!Array.isArray(object.invalidAckIds)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.invalidAckIds: array expected"); + message.invalidAckIds = []; + for (var i = 0; i < object.invalidAckIds.length; ++i) + message.invalidAckIds[i] = String(object.invalidAckIds[i]); + } + return message; + }; + + /** + * Creates a plain object from a ModifyAckDeadlineConfirmation message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation} message ModifyAckDeadlineConfirmation + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ModifyAckDeadlineConfirmation.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.ackIds = []; + object.invalidAckIds = []; + } + if (message.ackIds && message.ackIds.length) { + object.ackIds = []; + for (var j = 0; j < message.ackIds.length; ++j) + object.ackIds[j] = message.ackIds[j]; + } + if (message.invalidAckIds && message.invalidAckIds.length) { + object.invalidAckIds = []; + for (var j = 0; j < message.invalidAckIds.length; ++j) + object.invalidAckIds[j] = message.invalidAckIds[j]; + } + return object; + }; + + /** + * Converts this ModifyAckDeadlineConfirmation to JSON. + * @function toJSON + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @instance + * @returns {Object.} JSON object + */ + ModifyAckDeadlineConfirmation.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + return ModifyAckDeadlineConfirmation; + })(); + StreamingPullResponse.SubscriptionProperties = (function() { /** * Properties of a SubscriptionProperties. * @memberof google.pubsub.v1.StreamingPullResponse * @interface ISubscriptionProperties + * @property {boolean|null} [exactlyOnceDeliveryEnabled] SubscriptionProperties exactlyOnceDeliveryEnabled * @property {boolean|null} [messageOrderingEnabled] SubscriptionProperties messageOrderingEnabled */ @@ -9607,6 +10207,14 @@ this[keys[i]] = properties[keys[i]]; } + /** + * SubscriptionProperties exactlyOnceDeliveryEnabled. + * @member {boolean} exactlyOnceDeliveryEnabled + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @instance + */ + SubscriptionProperties.prototype.exactlyOnceDeliveryEnabled = false; + /** * SubscriptionProperties messageOrderingEnabled. * @member {boolean} messageOrderingEnabled @@ -9639,6 +10247,8 @@ SubscriptionProperties.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); + if (message.exactlyOnceDeliveryEnabled != null && Object.hasOwnProperty.call(message, "exactlyOnceDeliveryEnabled")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.exactlyOnceDeliveryEnabled); if (message.messageOrderingEnabled != null && Object.hasOwnProperty.call(message, "messageOrderingEnabled")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.messageOrderingEnabled); return writer; @@ -9675,6 +10285,9 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { + case 1: + message.exactlyOnceDeliveryEnabled = reader.bool(); + break; case 2: message.messageOrderingEnabled = reader.bool(); break; @@ -9713,6 +10326,9 @@ SubscriptionProperties.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; + if (message.exactlyOnceDeliveryEnabled != null && message.hasOwnProperty("exactlyOnceDeliveryEnabled")) + if (typeof message.exactlyOnceDeliveryEnabled !== "boolean") + return "exactlyOnceDeliveryEnabled: boolean expected"; if (message.messageOrderingEnabled != null && message.hasOwnProperty("messageOrderingEnabled")) if (typeof message.messageOrderingEnabled !== "boolean") return "messageOrderingEnabled: boolean expected"; @@ -9731,6 +10347,8 @@ if (object instanceof $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties) return object; var message = new $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties(); + if (object.exactlyOnceDeliveryEnabled != null) + message.exactlyOnceDeliveryEnabled = Boolean(object.exactlyOnceDeliveryEnabled); if (object.messageOrderingEnabled != null) message.messageOrderingEnabled = Boolean(object.messageOrderingEnabled); return message; @@ -9749,8 +10367,12 @@ if (!options) options = {}; var object = {}; - if (options.defaults) + if (options.defaults) { + object.exactlyOnceDeliveryEnabled = false; object.messageOrderingEnabled = false; + } + if (message.exactlyOnceDeliveryEnabled != null && message.hasOwnProperty("exactlyOnceDeliveryEnabled")) + object.exactlyOnceDeliveryEnabled = message.exactlyOnceDeliveryEnabled; if (message.messageOrderingEnabled != null && message.hasOwnProperty("messageOrderingEnabled")) object.messageOrderingEnabled = message.messageOrderingEnabled; return object; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 9ea5fa954d3..23cfd15269e 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -821,6 +821,10 @@ "type": "bool", "id": 15 }, + "enableExactlyOnceDelivery": { + "type": "bool", + "id": 16 + }, "topicMessageRetentionDuration": { "type": "google.protobuf.Duration", "id": 17, @@ -1146,14 +1150,74 @@ "type": "ReceivedMessage", "id": 1 }, + "acknowlegeConfirmation": { + "type": "AcknowledgeConfirmation", + "id": 2 + }, + "modifyAckDeadlineConfirmation": { + "type": "ModifyAckDeadlineConfirmation", + "id": 3 + }, "subscriptionProperties": { "type": "SubscriptionProperties", "id": 4 } }, "nested": { + "AcknowledgeConfirmation": { + "fields": { + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 1, + "options": { + "ctype": "CORD" + } + }, + "invalidAckIds": { + "rule": "repeated", + "type": "string", + "id": 2, + "options": { + "ctype": "CORD" + } + }, + "unorderedAckIds": { + "rule": "repeated", + "type": "string", + "id": 3, + "options": { + "ctype": "CORD" + } + } + } + }, + "ModifyAckDeadlineConfirmation": { + "fields": { + "ackIds": { + "rule": "repeated", + "type": "string", + "id": 1, + "options": { + "ctype": "CORD" + } + }, + "invalidAckIds": { + "rule": "repeated", + "type": "string", + "id": 2, + "options": { + "ctype": "CORD" + } + } + } + }, "SubscriptionProperties": { "fields": { + "exactlyOnceDeliveryEnabled": { + "type": "bool", + "id": 1 + }, "messageOrderingEnabled": { "type": "bool", "id": 2 diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index f1ddcb03347..71da17e5e06 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -474,6 +474,18 @@ export class SubscriberClient { * backlog. `Pull` and `StreamingPull` requests will return * FAILED_PRECONDITION. If the subscription is a push subscription, pushes to * the endpoint will not be made. + * @param {boolean} request.enableExactlyOnceDelivery + * If true, Pub/Sub provides the following guarantees for the delivery of + * a message with a given value of `message_id` on this subscription: + * + * * The message sent to a subscriber is guaranteed not to be resent + * before the message's acknowledgement deadline expires. + * * An acknowledged message will not be resent to a subscriber. + * + * Note that subscribers may still receive multiple copies of a message + * when `enable_exactly_once_delivery` is true if the message was published + * multiple times by a publisher client. These copies are considered distinct + * by Pub/Sub and have distinct `message_id` values. * @param {google.protobuf.Duration} request.topicMessageRetentionDuration * Output only. Indicates the minimum duration for which a message is retained * after it is published to the subscription's topic. If this field is set, From ba85829b7357e2d5f8f1c281b77a15d640acb227 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:41:56 -0500 Subject: [PATCH 0828/1115] =?UTF-8?q?fix:=20removing=20misspelled=20field,?= =?UTF-8?q?=20add=20correctly=20spelled=20field=20=F0=9F=A6=89=20Updates?= =?UTF-8?q?=20from=20OwlBot=20(#1490)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md fix: removing misspelled field, add correctly spelled field PiperOrigin-RevId: 428023165 Source-Link: https://github.com/googleapis/googleapis/commit/63d374da58fba5cf1308cf1df74b0b2afa1454f1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6be9b6c6b6c85face18adbdbdd3fc06356810b4a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNmJlOWI2YzZiNmM4NWZhY2UxOGFkYmRiZGQzZmMwNjM1NjgxMGI0YSJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 4 ++- handwritten/pubsub/protos/protos.d.ts | 8 ++--- handwritten/pubsub/protos/protos.js | 36 +++++++++---------- handwritten/pubsub/protos/protos.json | 10 ++++-- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index a44ba7c9c94..172801ba3ff 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1212,9 +1212,11 @@ message StreamingPullResponse { // Received Pub/Sub messages. This will not be empty. repeated ReceivedMessage received_messages = 1; + reserved 2; + // This field will only be set if `enable_exactly_once_delivery` is set to // `true`. - AcknowledgeConfirmation acknowlege_confirmation = 2; + AcknowledgeConfirmation acknowledge_confirmation = 5; // This field will only be set if `enable_exactly_once_delivery` is set to // `true`. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index c82d9bbed7d..92e36484f30 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -4112,8 +4112,8 @@ export namespace google { /** StreamingPullResponse receivedMessages */ receivedMessages?: (google.pubsub.v1.IReceivedMessage[]|null); - /** StreamingPullResponse acknowlegeConfirmation */ - acknowlegeConfirmation?: (google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null); + /** StreamingPullResponse acknowledgeConfirmation */ + acknowledgeConfirmation?: (google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null); /** StreamingPullResponse modifyAckDeadlineConfirmation */ modifyAckDeadlineConfirmation?: (google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation|null); @@ -4134,8 +4134,8 @@ export namespace google { /** StreamingPullResponse receivedMessages. */ public receivedMessages: google.pubsub.v1.IReceivedMessage[]; - /** StreamingPullResponse acknowlegeConfirmation. */ - public acknowlegeConfirmation?: (google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null); + /** StreamingPullResponse acknowledgeConfirmation. */ + public acknowledgeConfirmation?: (google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null); /** StreamingPullResponse modifyAckDeadlineConfirmation. */ public modifyAckDeadlineConfirmation?: (google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation|null); diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 63199572f59..e93dbbbd6ae 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -9379,7 +9379,7 @@ * @memberof google.pubsub.v1 * @interface IStreamingPullResponse * @property {Array.|null} [receivedMessages] StreamingPullResponse receivedMessages - * @property {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null} [acknowlegeConfirmation] StreamingPullResponse acknowlegeConfirmation + * @property {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null} [acknowledgeConfirmation] StreamingPullResponse acknowledgeConfirmation * @property {google.pubsub.v1.StreamingPullResponse.IModifyAckDeadlineConfirmation|null} [modifyAckDeadlineConfirmation] StreamingPullResponse modifyAckDeadlineConfirmation * @property {google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties|null} [subscriptionProperties] StreamingPullResponse subscriptionProperties */ @@ -9409,12 +9409,12 @@ StreamingPullResponse.prototype.receivedMessages = $util.emptyArray; /** - * StreamingPullResponse acknowlegeConfirmation. - * @member {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null|undefined} acknowlegeConfirmation + * StreamingPullResponse acknowledgeConfirmation. + * @member {google.pubsub.v1.StreamingPullResponse.IAcknowledgeConfirmation|null|undefined} acknowledgeConfirmation * @memberof google.pubsub.v1.StreamingPullResponse * @instance */ - StreamingPullResponse.prototype.acknowlegeConfirmation = null; + StreamingPullResponse.prototype.acknowledgeConfirmation = null; /** * StreamingPullResponse modifyAckDeadlineConfirmation. @@ -9459,12 +9459,12 @@ if (message.receivedMessages != null && message.receivedMessages.length) for (var i = 0; i < message.receivedMessages.length; ++i) $root.google.pubsub.v1.ReceivedMessage.encode(message.receivedMessages[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.acknowlegeConfirmation != null && Object.hasOwnProperty.call(message, "acknowlegeConfirmation")) - $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.encode(message.acknowlegeConfirmation, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); if (message.modifyAckDeadlineConfirmation != null && Object.hasOwnProperty.call(message, "modifyAckDeadlineConfirmation")) $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.encode(message.modifyAckDeadlineConfirmation, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); if (message.subscriptionProperties != null && Object.hasOwnProperty.call(message, "subscriptionProperties")) $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.encode(message.subscriptionProperties, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.acknowledgeConfirmation != null && Object.hasOwnProperty.call(message, "acknowledgeConfirmation")) + $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.encode(message.acknowledgeConfirmation, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); return writer; }; @@ -9504,8 +9504,8 @@ message.receivedMessages = []; message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); break; - case 2: - message.acknowlegeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.decode(reader, reader.uint32()); + case 5: + message.acknowledgeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.decode(reader, reader.uint32()); break; case 3: message.modifyAckDeadlineConfirmation = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.decode(reader, reader.uint32()); @@ -9557,10 +9557,10 @@ return "receivedMessages." + error; } } - if (message.acknowlegeConfirmation != null && message.hasOwnProperty("acknowlegeConfirmation")) { - var error = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.verify(message.acknowlegeConfirmation); + if (message.acknowledgeConfirmation != null && message.hasOwnProperty("acknowledgeConfirmation")) { + var error = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.verify(message.acknowledgeConfirmation); if (error) - return "acknowlegeConfirmation." + error; + return "acknowledgeConfirmation." + error; } if (message.modifyAckDeadlineConfirmation != null && message.hasOwnProperty("modifyAckDeadlineConfirmation")) { var error = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.verify(message.modifyAckDeadlineConfirmation); @@ -9597,10 +9597,10 @@ message.receivedMessages[i] = $root.google.pubsub.v1.ReceivedMessage.fromObject(object.receivedMessages[i]); } } - if (object.acknowlegeConfirmation != null) { - if (typeof object.acknowlegeConfirmation !== "object") - throw TypeError(".google.pubsub.v1.StreamingPullResponse.acknowlegeConfirmation: object expected"); - message.acknowlegeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.fromObject(object.acknowlegeConfirmation); + if (object.acknowledgeConfirmation != null) { + if (typeof object.acknowledgeConfirmation !== "object") + throw TypeError(".google.pubsub.v1.StreamingPullResponse.acknowledgeConfirmation: object expected"); + message.acknowledgeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.fromObject(object.acknowledgeConfirmation); } if (object.modifyAckDeadlineConfirmation != null) { if (typeof object.modifyAckDeadlineConfirmation !== "object") @@ -9631,21 +9631,21 @@ if (options.arrays || options.defaults) object.receivedMessages = []; if (options.defaults) { - object.acknowlegeConfirmation = null; object.modifyAckDeadlineConfirmation = null; object.subscriptionProperties = null; + object.acknowledgeConfirmation = null; } if (message.receivedMessages && message.receivedMessages.length) { object.receivedMessages = []; for (var j = 0; j < message.receivedMessages.length; ++j) object.receivedMessages[j] = $root.google.pubsub.v1.ReceivedMessage.toObject(message.receivedMessages[j], options); } - if (message.acknowlegeConfirmation != null && message.hasOwnProperty("acknowlegeConfirmation")) - object.acknowlegeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.toObject(message.acknowlegeConfirmation, options); if (message.modifyAckDeadlineConfirmation != null && message.hasOwnProperty("modifyAckDeadlineConfirmation")) object.modifyAckDeadlineConfirmation = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.toObject(message.modifyAckDeadlineConfirmation, options); if (message.subscriptionProperties != null && message.hasOwnProperty("subscriptionProperties")) object.subscriptionProperties = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.toObject(message.subscriptionProperties, options); + if (message.acknowledgeConfirmation != null && message.hasOwnProperty("acknowledgeConfirmation")) + object.acknowledgeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.toObject(message.acknowledgeConfirmation, options); return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 23cfd15269e..dc897e5afc6 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1150,9 +1150,9 @@ "type": "ReceivedMessage", "id": 1 }, - "acknowlegeConfirmation": { + "acknowledgeConfirmation": { "type": "AcknowledgeConfirmation", - "id": 2 + "id": 5 }, "modifyAckDeadlineConfirmation": { "type": "ModifyAckDeadlineConfirmation", @@ -1163,6 +1163,12 @@ "id": 4 } }, + "reserved": [ + [ + 2, + 2 + ] + ], "nested": { "AcknowledgeConfirmation": { "fields": { From 2d74aff1c4fb676399f3811c70720830c1d3a813 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 16 Feb 2022 22:12:48 +0100 Subject: [PATCH 0829/1115] fix(deps): update dependency google-gax to v2.29.6 (#1489) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.29.5` -> `2.29.6`](https://renovatebot.com/diffs/npm/google-gax/2.29.5/2.29.6) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.29.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.29.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.29.6/compatibility-slim/2.29.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.29.6/confidence-slim/2.29.5)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.29.6`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2296-httpsgithubcomgoogleapisgax-nodejscomparev2295v2296-2022-02-10) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.5...v2.29.6)
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5167cdf6f80..8958d7d7121 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.29.5", + "google-gax": "2.29.6", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From 5fb54834b38b40be5ee8d4ffda721fa43b0d505c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 21:26:51 +0000 Subject: [PATCH 0830/1115] chore(main): release 2.19.0 (#1485) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [2.19.0](https://github.com/googleapis/nodejs-pubsub/compare/v2.18.5...v2.19.0) (2022-02-16) ### Features * add exactly once delivery flag ([#1487](https://github.com/googleapis/nodejs-pubsub/issues/1487)) ([330061c](https://github.com/googleapis/nodejs-pubsub/commit/330061c71e26753b86c637a525742b4f5cb3f02c)) ### Bug Fixes * **deps:** update dependency google-gax to v2.29.5 ([#1474](https://github.com/googleapis/nodejs-pubsub/issues/1474)) ([f855db3](https://github.com/googleapis/nodejs-pubsub/commit/f855db312bcc0e9e885fa391f42b2509ceffc13f)) * **deps:** update dependency google-gax to v2.29.6 ([#1489](https://github.com/googleapis/nodejs-pubsub/issues/1489)) ([62aba28](https://github.com/googleapis/nodejs-pubsub/commit/62aba28ddb191091bc80e9a244b561cedc92f4fe)) * removing misspelled field, add correctly spelled field 🦉 Updates from OwlBot ([#1490](https://github.com/googleapis/nodejs-pubsub/issues/1490)) ([afb9cfe](https://github.com/googleapis/nodejs-pubsub/commit/afb9cfec83524c84d8e207e2b6298996df282a66)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 14 ++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 2919f640025..ec7b4973c96 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,20 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [2.19.0](https://github.com/googleapis/nodejs-pubsub/compare/v2.18.5...v2.19.0) (2022-02-16) + + +### Features + +* add exactly once delivery flag ([#1487](https://github.com/googleapis/nodejs-pubsub/issues/1487)) ([330061c](https://github.com/googleapis/nodejs-pubsub/commit/330061c71e26753b86c637a525742b4f5cb3f02c)) + + +### Bug Fixes + +* **deps:** update dependency google-gax to v2.29.5 ([#1474](https://github.com/googleapis/nodejs-pubsub/issues/1474)) ([f855db3](https://github.com/googleapis/nodejs-pubsub/commit/f855db312bcc0e9e885fa391f42b2509ceffc13f)) +* **deps:** update dependency google-gax to v2.29.6 ([#1489](https://github.com/googleapis/nodejs-pubsub/issues/1489)) ([62aba28](https://github.com/googleapis/nodejs-pubsub/commit/62aba28ddb191091bc80e9a244b561cedc92f4fe)) +* removing misspelled field, add correctly spelled field 🦉 Updates from OwlBot ([#1490](https://github.com/googleapis/nodejs-pubsub/issues/1490)) ([afb9cfe](https://github.com/googleapis/nodejs-pubsub/commit/afb9cfec83524c84d8e207e2b6298996df282a66)) + ### [2.18.5](https://github.com/googleapis/nodejs-pubsub/compare/v2.18.4...v2.18.5) (2022-01-21) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8958d7d7121..d268e531b7d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.18.5", + "version": "2.19.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 9deb5e0daa5ab819266b9c651018442676f2ec18 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 17 Feb 2022 11:42:45 +0100 Subject: [PATCH 0831/1115] fix(deps): update dependency google-gax to v2.29.7 (#1493) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.29.6` -> `2.29.7`](https://renovatebot.com/diffs/npm/google-gax/2.29.6/2.29.7) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.29.7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.29.7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.29.7/compatibility-slim/2.29.6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.29.7/confidence-slim/2.29.6)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.29.7`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2297-httpsgithubcomgoogleapisgax-nodejscomparev2296v2297-2022-02-11) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.6...v2.29.7)
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d268e531b7d..cfa7603fee8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.29.6", + "google-gax": "2.29.7", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From df4c79acd7603148bdde434bb7e92ff93481d323 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 00:56:57 +0000 Subject: [PATCH 0832/1115] docs(samples): include metadata file, add exclusions for samples to handwritten libraries (#1495) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 429395631 Source-Link: https://github.com/googleapis/googleapis/commit/84594b35af0c38efcd6967e8179d801702ad96ff Source-Link: https://github.com/googleapis/googleapis-gen/commit/ed74f970fd82914874e6b27b04763cfa66bafe9b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZWQ3NGY5NzBmZDgyOTE0ODc0ZTZiMjdiMDQ3NjNjZmE2NmJhZmU5YiJ9 --- handwritten/pubsub/src/v1/publisher_client.ts | 23 +- .../pubsub/src/v1/schema_service_client.ts | 17 +- .../pubsub/src/v1/subscriber_client.ts | 49 ++-- handwritten/pubsub/test/gapic_publisher_v1.ts | 116 ++++++++- .../pubsub/test/gapic_schema_service_v1.ts | 99 +++++++- .../pubsub/test/gapic_subscriber_v1.ts | 229 +++++++++++++++++- 6 files changed, 456 insertions(+), 77 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index b13a9dd27d5..1f33c8e432d 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -417,8 +417,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/publisher.create_topic.js - * region_tag:pubsub_v1_generated_Publisher_CreateTopic_async */ createTopic( request?: protos.google.pubsub.v1.ITopic, @@ -507,8 +505,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/publisher.update_topic.js - * region_tag:pubsub_v1_generated_Publisher_UpdateTopic_async */ updateTopic( request?: protos.google.pubsub.v1.IUpdateTopicRequest, @@ -594,8 +590,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/publisher.publish.js - * region_tag:pubsub_v1_generated_Publisher_Publish_async */ publish( request?: protos.google.pubsub.v1.IPublishRequest, @@ -678,8 +672,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/publisher.get_topic.js - * region_tag:pubsub_v1_generated_Publisher_GetTopic_async */ getTopic( request?: protos.google.pubsub.v1.IGetTopicRequest, @@ -766,8 +758,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/publisher.delete_topic.js - * region_tag:pubsub_v1_generated_Publisher_DeleteTopic_async */ deleteTopic( request?: protos.google.pubsub.v1.IDeleteTopicRequest, @@ -853,8 +843,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/publisher.detach_subscription.js - * region_tag:pubsub_v1_generated_Publisher_DetachSubscription_async */ detachSubscription( request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, @@ -1089,8 +1077,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/publisher.list_topics.js - * region_tag:pubsub_v1_generated_Publisher_ListTopics_async */ listTopicsAsync( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1291,8 +1277,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/publisher.list_topic_subscriptions.js - * region_tag:pubsub_v1_generated_Publisher_ListTopicSubscriptions_async */ listTopicSubscriptionsAsync( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1487,8 +1471,6 @@ export class PublisherClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/publisher.list_topic_snapshots.js - * region_tag:pubsub_v1_generated_Publisher_ListTopicSnapshots_async */ listTopicSnapshotsAsync( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1833,9 +1815,8 @@ export class PublisherClient { * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { - this.initialize(); - if (!this._terminated) { - return this.publisherStub!.then(stub => { + if (this.publisherStub && !this._terminated) { + return this.publisherStub.then(stub => { this._terminated = true; stub.close(); this.iamClient.close(); diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index ab79facf6c6..75330c6344c 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -364,8 +364,6 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/schema_service.create_schema.js - * region_tag:pubsub_v1_generated_SchemaService_CreateSchema_async */ createSchema( request?: protos.google.pubsub.v1.ICreateSchemaRequest, @@ -452,8 +450,6 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/schema_service.get_schema.js - * region_tag:pubsub_v1_generated_SchemaService_GetSchema_async */ getSchema( request?: protos.google.pubsub.v1.IGetSchemaRequest, @@ -536,8 +532,6 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/schema_service.delete_schema.js - * region_tag:pubsub_v1_generated_SchemaService_DeleteSchema_async */ deleteSchema( request?: protos.google.pubsub.v1.IDeleteSchemaRequest, @@ -622,8 +616,6 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/schema_service.validate_schema.js - * region_tag:pubsub_v1_generated_SchemaService_ValidateSchema_async */ validateSchema( request?: protos.google.pubsub.v1.IValidateSchemaRequest, @@ -716,8 +708,6 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/schema_service.validate_message.js - * region_tag:pubsub_v1_generated_SchemaService_ValidateMessage_async */ validateMessage( request?: protos.google.pubsub.v1.IValidateMessageRequest, @@ -964,8 +954,6 @@ export class SchemaServiceClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/schema_service.list_schemas.js - * region_tag:pubsub_v1_generated_SchemaService_ListSchemas_async */ listSchemasAsync( request?: protos.google.pubsub.v1.IListSchemasRequest, @@ -1310,9 +1298,8 @@ export class SchemaServiceClient { * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { - this.initialize(); - if (!this._terminated) { - return this.schemaServiceStub!.then(stub => { + if (this.schemaServiceStub && !this._terminated) { + return this.schemaServiceStub.then(stub => { this._terminated = true; stub.close(); this.iamClient.close(); diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 71da17e5e06..a6fa19bdc59 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -25,12 +25,14 @@ import { ClientOptions, PaginationCallback, GaxCall, + GoogleError, IamClient, IamProtos, } from 'google-gax'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; +import {PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); /** @@ -283,6 +285,16 @@ export class SubscriberClient { stub => (...args: Array<{}>) => { if (this._terminated) { + if (methodName in this.descriptors.stream) { + const stream = new PassThrough(); + setImmediate(() => { + stream.emit( + 'error', + new GoogleError('The client has already been closed.') + ); + }); + return stream; + } return Promise.reject('The client has already been closed.'); } const func = stub[methodName]; @@ -500,8 +512,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.create_subscription.js - * region_tag:pubsub_v1_generated_Subscriber_CreateSubscription_async */ createSubscription( request?: protos.google.pubsub.v1.ISubscription, @@ -584,8 +594,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.get_subscription.js - * region_tag:pubsub_v1_generated_Subscriber_GetSubscription_async */ getSubscription( request?: protos.google.pubsub.v1.IGetSubscriptionRequest, @@ -671,8 +679,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.update_subscription.js - * region_tag:pubsub_v1_generated_Subscriber_UpdateSubscription_async */ updateSubscription( request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, @@ -759,8 +765,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.delete_subscription.js - * region_tag:pubsub_v1_generated_Subscriber_DeleteSubscription_async */ deleteSubscription( request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, @@ -858,8 +862,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.modify_ack_deadline.js - * region_tag:pubsub_v1_generated_Subscriber_ModifyAckDeadline_async */ modifyAckDeadline( request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, @@ -952,8 +954,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.acknowledge.js - * region_tag:pubsub_v1_generated_Subscriber_Acknowledge_async */ acknowledge( request?: protos.google.pubsub.v1.IAcknowledgeRequest, @@ -1050,8 +1050,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.pull.js - * region_tag:pubsub_v1_generated_Subscriber_Pull_async */ pull( request?: protos.google.pubsub.v1.IPullRequest, @@ -1146,8 +1144,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.modify_push_config.js - * region_tag:pubsub_v1_generated_Subscriber_ModifyPushConfig_async */ modifyPushConfig( request?: protos.google.pubsub.v1.IModifyPushConfigRequest, @@ -1234,8 +1230,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.get_snapshot.js - * region_tag:pubsub_v1_generated_Subscriber_GetSnapshot_async */ getSnapshot( request?: protos.google.pubsub.v1.IGetSnapshotRequest, @@ -1350,8 +1344,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.create_snapshot.js - * region_tag:pubsub_v1_generated_Subscriber_CreateSnapshot_async */ createSnapshot( request?: protos.google.pubsub.v1.ICreateSnapshotRequest, @@ -1441,8 +1433,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.update_snapshot.js - * region_tag:pubsub_v1_generated_Subscriber_UpdateSnapshot_async */ updateSnapshot( request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, @@ -1533,8 +1523,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.delete_snapshot.js - * region_tag:pubsub_v1_generated_Subscriber_DeleteSnapshot_async */ deleteSnapshot( request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, @@ -1638,8 +1626,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/subscriber.seek.js - * region_tag:pubsub_v1_generated_Subscriber_Seek_async */ seek( request?: protos.google.pubsub.v1.ISeekRequest, @@ -1726,8 +1712,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming) * for more details and examples. - * @example include:samples/generated/v1/subscriber.streaming_pull.js - * region_tag:pubsub_v1_generated_Subscriber_StreamingPull_async */ streamingPull(options?: CallOptions): gax.CancellableStream { this.initialize(); @@ -1900,8 +1884,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/subscriber.list_subscriptions.js - * region_tag:pubsub_v1_generated_Subscriber_ListSubscriptions_async */ listSubscriptionsAsync( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -2094,8 +2076,6 @@ export class SubscriberClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/subscriber.list_snapshots.js - * region_tag:pubsub_v1_generated_Subscriber_ListSnapshots_async */ listSnapshotsAsync( request?: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2440,9 +2420,8 @@ export class SubscriberClient { * @returns {Promise} A promise that resolves when the client is closed. */ close(): Promise { - this.initialize(); - if (!this._terminated) { - return this.subscriberStub!.then(stub => { + if (this.subscriberStub && !this._terminated) { + return this.subscriberStub.then(stub => { this._terminated = true; stub.close(); this.iamClient.close(); diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index a647dd6e3fa..0b4447b77f9 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -151,12 +151,27 @@ describe('v1.PublisherClient', () => { assert(client.publisherStub); }); - it('has close method', () => { + it('has close method for the initialized client', done => { const client = new publisherModule.v1.PublisherClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.close(); + client.initialize(); + assert(client.publisherStub); + client.close().then(() => { + done(); + }); + }); + + it('has close method for the non-initialized client', done => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.publisherStub, undefined); + client.close().then(() => { + done(); + }); }); it('has getProjectId method', async () => { @@ -302,6 +317,22 @@ describe('v1.PublisherClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes createTopic with closed client', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.Topic() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.createTopic(request), expectedError); + }); }); describe('updateTopic', () => { @@ -416,6 +447,23 @@ describe('v1.PublisherClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes updateTopic with closed client', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateTopicRequest() + ); + request.topic = {}; + request.topic.name = ''; + const expectedHeaderRequestParams = 'topic.name='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.updateTopic(request), expectedError); + }); }); describe('publish', () => { @@ -524,6 +572,22 @@ describe('v1.PublisherClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes publish with closed client', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.PublishRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.publish(request), expectedError); + }); }); describe('getTopic', () => { @@ -632,6 +696,22 @@ describe('v1.PublisherClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes getTopic with closed client', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetTopicRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.getTopic(request), expectedError); + }); }); describe('deleteTopic', () => { @@ -743,6 +823,22 @@ describe('v1.PublisherClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes deleteTopic with closed client', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteTopicRequest() + ); + request.topic = ''; + const expectedHeaderRequestParams = 'topic='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.deleteTopic(request), expectedError); + }); }); describe('detachSubscription', () => { @@ -855,6 +951,22 @@ describe('v1.PublisherClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes detachSubscription with closed client', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DetachSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.detachSubscription(request), expectedError); + }); }); describe('listTopics', () => { diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 426cb5ee72d..30f9758728e 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -151,12 +151,27 @@ describe('v1.SchemaServiceClient', () => { assert(client.schemaServiceStub); }); - it('has close method', () => { + it('has close method for the initialized client', done => { const client = new schemaserviceModule.v1.SchemaServiceClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.close(); + client.initialize(); + assert(client.schemaServiceStub); + client.close().then(() => { + done(); + }); + }); + + it('has close method for the non-initialized client', done => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.schemaServiceStub, undefined); + client.close().then(() => { + done(); + }); }); it('has getProjectId method', async () => { @@ -302,6 +317,22 @@ describe('v1.SchemaServiceClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes createSchema with closed client', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CreateSchemaRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.createSchema(request), expectedError); + }); }); describe('getSchema', () => { @@ -410,6 +441,22 @@ describe('v1.SchemaServiceClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes getSchema with closed client', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSchemaRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.getSchema(request), expectedError); + }); }); describe('deleteSchema', () => { @@ -521,6 +568,22 @@ describe('v1.SchemaServiceClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes deleteSchema with closed client', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSchemaRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.deleteSchema(request), expectedError); + }); }); describe('validateSchema', () => { @@ -632,6 +695,22 @@ describe('v1.SchemaServiceClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes validateSchema with closed client', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ValidateSchemaRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.validateSchema(request), expectedError); + }); }); describe('validateMessage', () => { @@ -743,6 +822,22 @@ describe('v1.SchemaServiceClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes validateMessage with closed client', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ValidateMessageRequest() + ); + request.parent = ''; + const expectedHeaderRequestParams = 'parent='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.validateMessage(request), expectedError); + }); }); describe('listSchemas', () => { diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 8f3a913ba05..ec75d96c48b 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -165,12 +165,27 @@ describe('v1.SubscriberClient', () => { assert(client.subscriberStub); }); - it('has close method', () => { + it('has close method for the initialized client', done => { const client = new subscriberModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.close(); + client.initialize(); + assert(client.subscriberStub); + client.close().then(() => { + done(); + }); + }); + + it('has close method for the non-initialized client', done => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.subscriberStub, undefined); + client.close().then(() => { + done(); + }); }); it('has getProjectId method', async () => { @@ -317,6 +332,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes createSubscription with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.Subscription() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.createSubscription(request), expectedError); + }); }); describe('getSubscription', () => { @@ -428,6 +459,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes getSubscription with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.getSubscription(request), expectedError); + }); }); describe('updateSubscription', () => { @@ -543,6 +590,23 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes updateSubscription with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateSubscriptionRequest() + ); + request.subscription = {}; + request.subscription.name = ''; + const expectedHeaderRequestParams = 'subscription.name='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.updateSubscription(request), expectedError); + }); }); describe('deleteSubscription', () => { @@ -655,6 +719,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes deleteSubscription with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSubscriptionRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.deleteSubscription(request), expectedError); + }); }); describe('modifyAckDeadline', () => { @@ -766,6 +846,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes modifyAckDeadline with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ModifyAckDeadlineRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.modifyAckDeadline(request), expectedError); + }); }); describe('acknowledge', () => { @@ -877,6 +973,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes acknowledge with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.AcknowledgeRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.acknowledge(request), expectedError); + }); }); describe('pull', () => { @@ -984,6 +1096,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes pull with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.PullRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.pull(request), expectedError); + }); }); describe('modifyPushConfig', () => { @@ -1095,6 +1223,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes modifyPushConfig with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ModifyPushConfigRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.modifyPushConfig(request), expectedError); + }); }); describe('getSnapshot', () => { @@ -1206,6 +1350,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes getSnapshot with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSnapshotRequest() + ); + request.snapshot = ''; + const expectedHeaderRequestParams = 'snapshot='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.getSnapshot(request), expectedError); + }); }); describe('createSnapshot', () => { @@ -1317,6 +1477,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes createSnapshot with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CreateSnapshotRequest() + ); + request.name = ''; + const expectedHeaderRequestParams = 'name='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.createSnapshot(request), expectedError); + }); }); describe('updateSnapshot', () => { @@ -1431,6 +1607,23 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes updateSnapshot with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.UpdateSnapshotRequest() + ); + request.snapshot = {}; + request.snapshot.name = ''; + const expectedHeaderRequestParams = 'snapshot.name='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.updateSnapshot(request), expectedError); + }); }); describe('deleteSnapshot', () => { @@ -1542,6 +1735,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes deleteSnapshot with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSnapshotRequest() + ); + request.snapshot = ''; + const expectedHeaderRequestParams = 'snapshot='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.deleteSnapshot(request), expectedError); + }); }); describe('seek', () => { @@ -1649,6 +1858,22 @@ describe('v1.SubscriberClient', () => { .calledWith(request, expectedOptions, undefined) ); }); + + it('invokes seek with closed client', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.SeekRequest() + ); + request.subscription = ''; + const expectedHeaderRequestParams = 'subscription='; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.seek(request), expectedError); + }); }); describe('streamingPull', () => { From 4b12733b961c1b5bbcb5fbce114dd4e651f54a44 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 23 Feb 2022 10:22:58 +0100 Subject: [PATCH 0833/1115] fix(deps): update dependency google-gax to v2.30.0 (#1496) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.29.7` -> `2.30.0`](https://renovatebot.com/diffs/npm/google-gax/2.29.7/2.30.0) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.30.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.30.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.30.0/compatibility-slim/2.29.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.30.0/confidence-slim/2.29.7)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.30.0`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2300-httpsgithubcomgoogleapisgax-nodejscomparev2297v2300-2022-02-23) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.7...v2.30.0) ##### Features - **deps:** Update `google-auth-library` ([#​1190](https://togithub.com/googleapis/gax-nodejs/issues/1190)) ([7981dc5](https://togithub.com/googleapis/gax-nodejs/commit/7981dc5c17b509109cb00dda82f603bcb6a2d99c)) ##### Bug Fixes - **deps:** update dependency object-hash to v3 ([#​1188](https://togithub.com/googleapis/gax-nodejs/issues/1188)) ([797e69f](https://togithub.com/googleapis/gax-nodejs/commit/797e69f2dc05785b8a506ea8b91b9178a4db704d)) ##### [2.29.7](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.6...v2.29.7) (2022-02-11) ##### Bug Fixes - add close method in fallbackServiceStub ([#​1182](https://togithub.com/googleapis/gax-nodejs/issues/1182)) ([a1153e9](https://togithub.com/googleapis/gax-nodejs/commit/a1153e9efe4fe011405163aa2279b7a367359c0d)) ##### [2.29.6](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.5...v2.29.6) (2022-02-10) ##### Bug Fixes - catch rejected promise from closed client ([#​1180](https://togithub.com/googleapis/gax-nodejs/issues/1180)) ([9e63e65](https://togithub.com/googleapis/gax-nodejs/commit/9e63e65299b9424088b99cffccc58329c908b793)) - post-process JSDoc link format in proto.d.ts ([#​1178](https://togithub.com/googleapis/gax-nodejs/issues/1178)) ([98dcfcd](https://togithub.com/googleapis/gax-nodejs/commit/98dcfcd41871586fa5d4d1837a24a4fb4c7a469f)) ##### [2.29.5](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.4...v2.29.5) (2022-01-27) ##### Bug Fixes - **deps:** update dependency proto3-json-serializer ([#​1173](https://togithub.com/googleapis/gax-nodejs/issues/1173)) ([dbeb3f7](https://togithub.com/googleapis/gax-nodejs/commit/dbeb3f752f8a43a3f2984946adbeeea63f111044)) - stream callback is undefined ([#​1170](https://togithub.com/googleapis/gax-nodejs/issues/1170)) ([a693903](https://togithub.com/googleapis/gax-nodejs/commit/a693903149b804bddc690cc64f187a2f6186b671)) ##### [2.29.4](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.3...v2.29.4) (2022-01-19) ##### Bug Fixes - support non-alphanumeric field name ([#​1165](https://togithub.com/googleapis/gax-nodejs/issues/1165)) ([4f53efa](https://togithub.com/googleapis/gax-nodejs/commit/4f53efaac9b112c4ee38145bd02a59a736e01308)) ##### [2.29.3](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.2...v2.29.3) (2022-01-11) ##### Bug Fixes - refactor the showcase stream method collect ([#​1162](https://togithub.com/googleapis/gax-nodejs/issues/1162)) ([19d3a5d](https://togithub.com/googleapis/gax-nodejs/commit/19d3a5dd61066ae662454e14cd9c340c500ffec0)) ##### [2.29.2](https://togithub.com/googleapis/gax-nodejs/compare/v2.29.1...v2.29.2) (2022-01-11) ##### Bug Fixes - **deps:** update dependency [@​grpc/grpc-js](https://togithub.com/grpc/grpc-js) to ~1.5.0 ([#​1152](https://togithub.com/googleapis/gax-nodejs/issues/1152)) ([775540b](https://togithub.com/googleapis/gax-nodejs/commit/775540bc81fc9096d96835f4089bf8c508bc23d4)) ##### [2.29.1](https://www.github.com/googleapis/gax-nodejs/compare/v2.29.0...v2.29.1) (2022-01-06) ##### Bug Fixes - support field name with period ([#​1148](https://www.togithub.com/googleapis/gax-nodejs/issues/1148)) ([80c9146](https://www.github.com/googleapis/gax-nodejs/commit/80c914628c046392cf45527dc6456d3eb3bfa768))
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cfa7603fee8..230c312c86a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.29.7", + "google-gax": "2.30.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From 0507a9cddf6b93e4e7373a17ccee045770105700 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 23 Feb 2022 15:45:03 -0500 Subject: [PATCH 0834/1115] samples: add samples for subscription with filtering (#1492) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * samples: add samples for subscription with filtering * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * samples: add sample filter string and fix test Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 7af9f6a7ded..734989c63c6 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -128,6 +128,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 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) | | Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | From 2d4f4a6c304555bcc8de6b1ac43f163be62a793b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 22:56:12 +0000 Subject: [PATCH 0835/1115] chore: update v2.14.2 gapic-generator-typescript (#1503) - [ ] Regenerate this pull request now. Committer: @summer-ji-eng PiperOrigin-RevId: 434859890 Source-Link: https://github.com/googleapis/googleapis/commit/bc2432d50cba657e95212122e3fa112591b5bec2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/930b673103e92523f8cfed38decd7d3afae8ebe7 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTMwYjY3MzEwM2U5MjUyM2Y4Y2ZlZDM4ZGVjZDdkM2FmYWU4ZWJlNyJ9 --- handwritten/pubsub/test/gapic_publisher_v1.ts | 6 ------ handwritten/pubsub/test/gapic_schema_service_v1.ts | 5 ----- handwritten/pubsub/test/gapic_subscriber_v1.ts | 13 ------------- 3 files changed, 24 deletions(-) diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 0b4447b77f9..80cdf6a8e2d 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -328,7 +328,6 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.Topic() ); request.name = ''; - const expectedHeaderRequestParams = 'name='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.createTopic(request), expectedError); @@ -459,7 +458,6 @@ describe('v1.PublisherClient', () => { ); request.topic = {}; request.topic.name = ''; - const expectedHeaderRequestParams = 'topic.name='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.updateTopic(request), expectedError); @@ -583,7 +581,6 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.PublishRequest() ); request.topic = ''; - const expectedHeaderRequestParams = 'topic='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.publish(request), expectedError); @@ -707,7 +704,6 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.GetTopicRequest() ); request.topic = ''; - const expectedHeaderRequestParams = 'topic='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getTopic(request), expectedError); @@ -834,7 +830,6 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.DeleteTopicRequest() ); request.topic = ''; - const expectedHeaderRequestParams = 'topic='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteTopic(request), expectedError); @@ -962,7 +957,6 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.DetachSubscriptionRequest() ); request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.detachSubscription(request), expectedError); diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 30f9758728e..3d903d4824d 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -328,7 +328,6 @@ describe('v1.SchemaServiceClient', () => { new protos.google.pubsub.v1.CreateSchemaRequest() ); request.parent = ''; - const expectedHeaderRequestParams = 'parent='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.createSchema(request), expectedError); @@ -452,7 +451,6 @@ describe('v1.SchemaServiceClient', () => { new protos.google.pubsub.v1.GetSchemaRequest() ); request.name = ''; - const expectedHeaderRequestParams = 'name='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getSchema(request), expectedError); @@ -579,7 +577,6 @@ describe('v1.SchemaServiceClient', () => { new protos.google.pubsub.v1.DeleteSchemaRequest() ); request.name = ''; - const expectedHeaderRequestParams = 'name='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteSchema(request), expectedError); @@ -706,7 +703,6 @@ describe('v1.SchemaServiceClient', () => { new protos.google.pubsub.v1.ValidateSchemaRequest() ); request.parent = ''; - const expectedHeaderRequestParams = 'parent='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.validateSchema(request), expectedError); @@ -833,7 +829,6 @@ describe('v1.SchemaServiceClient', () => { new protos.google.pubsub.v1.ValidateMessageRequest() ); request.parent = ''; - const expectedHeaderRequestParams = 'parent='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.validateMessage(request), expectedError); diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index ec75d96c48b..cedb59b6383 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -343,7 +343,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.Subscription() ); request.name = ''; - const expectedHeaderRequestParams = 'name='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.createSubscription(request), expectedError); @@ -470,7 +469,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.GetSubscriptionRequest() ); request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getSubscription(request), expectedError); @@ -602,7 +600,6 @@ describe('v1.SubscriberClient', () => { ); request.subscription = {}; request.subscription.name = ''; - const expectedHeaderRequestParams = 'subscription.name='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.updateSubscription(request), expectedError); @@ -730,7 +727,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteSubscription(request), expectedError); @@ -857,7 +853,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.modifyAckDeadline(request), expectedError); @@ -984,7 +979,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.AcknowledgeRequest() ); request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.acknowledge(request), expectedError); @@ -1107,7 +1101,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.PullRequest() ); request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.pull(request), expectedError); @@ -1234,7 +1227,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.ModifyPushConfigRequest() ); request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.modifyPushConfig(request), expectedError); @@ -1361,7 +1353,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.GetSnapshotRequest() ); request.snapshot = ''; - const expectedHeaderRequestParams = 'snapshot='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getSnapshot(request), expectedError); @@ -1488,7 +1479,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.CreateSnapshotRequest() ); request.name = ''; - const expectedHeaderRequestParams = 'name='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.createSnapshot(request), expectedError); @@ -1619,7 +1609,6 @@ describe('v1.SubscriberClient', () => { ); request.snapshot = {}; request.snapshot.name = ''; - const expectedHeaderRequestParams = 'snapshot.name='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.updateSnapshot(request), expectedError); @@ -1746,7 +1735,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.DeleteSnapshotRequest() ); request.snapshot = ''; - const expectedHeaderRequestParams = 'snapshot='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteSnapshot(request), expectedError); @@ -1869,7 +1857,6 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.SeekRequest() ); request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.seek(request), expectedError); From c93cc003fada0094731b1aae5d1d4945a9d5faf8 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 18:52:10 +0000 Subject: [PATCH 0836/1115] chore: Enable Size-Label bot in all googleapis NodeJs repositories (#1382) (#1508) * chore: Enable Size-Label bot in all googleapis NodeJs repositories Auto-label T-shirt size indicator should be assigned on every new pull request in all googleapis NodeJs repositories * Remove product Remove product since it is by default true Source-Link: https://github.com/googleapis/synthtool/commit/f1562fa1c219d7176f79e3eea611b268c361e93d Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:bb4d47d0e770abad62699a4664ce6b9ff1629d50c276a6c75860a6a1853dd19b --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 3 ++- handwritten/pubsub/.github/auto-label.yaml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 handwritten/pubsub/.github/auto-label.yaml diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 84059c19485..c6ddf44fb1c 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:a9d166a74752226923d159cb723df53429e226c9c076dad3ca52ffd073ff3bb4 + digest: sha256:bb4d47d0e770abad62699a4664ce6b9ff1629d50c276a6c75860a6a1853dd19b +# created: 2022-04-01T19:19:56.587347289Z diff --git a/handwritten/pubsub/.github/auto-label.yaml b/handwritten/pubsub/.github/auto-label.yaml new file mode 100644 index 00000000000..09c8d735b45 --- /dev/null +++ b/handwritten/pubsub/.github/auto-label.yaml @@ -0,0 +1,2 @@ +requestsize: + enabled: true From c0867df90aa87f0e135060fcc0eddf7f8f209c0d Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:56:53 -0400 Subject: [PATCH 0837/1115] fix: update grpc.max_metadata_size to 4MiB for exactly-once, and shift ack/modack errors to 'debug' stream channel (#1505) * fix: update grpc.max_metadata_size to 4MiB for exactly-once * fix: change ack and modAck errors to be optional debug warnings * tests: update testing to match earlier changes * fix: check against undefined, not falsey --- handwritten/pubsub/src/message-queues.ts | 5 ++++- handwritten/pubsub/src/pubsub.ts | 12 +++++++++++- handwritten/pubsub/src/subscriber.ts | 1 + handwritten/pubsub/src/subscription.ts | 8 ++++++++ handwritten/pubsub/test/message-queues.ts | 12 ++++++------ handwritten/pubsub/test/pubsub.ts | 16 ++++++++++++++++ handwritten/pubsub/test/subscription.ts | 19 +++++++++++++++++++ 7 files changed, 65 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 82493a4d2ce..a46e71927ba 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -141,7 +141,10 @@ export abstract class MessageQueue { try { await this._sendBatch(batch); } catch (e) { - this._subscriber.emit('error', e); + // These queues are used for ack and modAck messages, which should + // never surface an error to the user level. However, we'll emit + // them onto this debug channel in case debug info is needed. + this._subscriber.emit('debug', e); } this.numInFlightRequests -= batchSize; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index beb59ae6aca..e2bb3459491 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -272,7 +272,17 @@ export class PubSub { private schemaClient?: SchemaServiceClient; constructor(options?: ClientConfig) { - options = options || {}; + options = Object.assign({}, options || {}); + + // Needed for potentially large responses that may come from using exactly-once delivery. + // This will get passed down to grpc client objects. + const maxMetadataSize = 'grpc.max_metadata_size'; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const optionsAny = options as any; + if (optionsAny[maxMetadataSize] === undefined) { + optionsAny[maxMetadataSize] = 4 * 1024 * 1024; // 4 MiB + } + // Determine what scopes are needed. // It is the union of the scopes on both clients. const clientClasses = [v1.SubscriberClient, v1.PublisherClient]; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 46c1ebe6091..ee29bdb8d26 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -393,6 +393,7 @@ export class Subscriber extends EventEmitter { this._stream .on('error', err => this.emit('error', err)) + .on('debug', err => this.emit('debug', err)) .on('data', (data: PullResponse) => this._onData(data)) .once('close', () => this.close()); diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 87773958cbc..6accd5adfca 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -104,6 +104,7 @@ export type DetachSubscriptionResponse = EmptyResponse; listener: (error: StatusError) => void ): this; on(event: 'close', listener: () => void): this; + on(event: 'debug', listener: (error: StatusError) => void); this; // Only used internally. on(event: 'newListener', listener: Function): this; @@ -154,6 +155,9 @@ export type DetachSubscriptionResponse = EmptyResponse; * Upon receipt of an error: * on(event: 'error', listener: (error: Error) => void): this; * + * Upon receipt of a (non-fatal) debug warning: + * on(event: 'debug', listener: (error: Error) => void): this; + * * Upon the closing of the subscriber: * on(event: 'close', listener: Function): this; * @@ -220,6 +224,9 @@ export type DetachSubscriptionResponse = EmptyResponse; * // Register an error handler. * subscription.on('error', (err) => {}); * + * // Register a debug handler, to catch non-fatal errors. + * subscription.on('debug', (err) => { console.error(err); }); + * * // Register a close handler in case the subscriber closes unexpectedly * subscription.on('close', () => {}); * @@ -318,6 +325,7 @@ export class Subscription extends EventEmitter { this._subscriber = new Subscriber(this, options); this._subscriber .on('error', err => this.emit('error', err)) + .on('debug', err => this.emit('debug', err)) .on('message', message => this.emit('message', message)) .on('close', () => this.emit('close')); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 43bf46fdce7..d60073cce78 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -195,12 +195,12 @@ describe('MessageQueues', () => { assert.deepStrictEqual(batch, expectedBatch); }); - it('should emit any errors', done => { + it('should emit any errors as debug events', done => { const fakeError = new Error('err'); sandbox.stub(messageQueue.batches, 'push').throws(fakeError); - subscriber.on('error', err => { + subscriber.on('debug', err => { assert.strictEqual(err, fakeError); done(); }); @@ -362,7 +362,7 @@ describe('MessageQueues', () => { assert.strictEqual(callOptions, fakeCallOptions); }); - it('should throw a BatchError if unable to ack', done => { + it('should throw a BatchError on "debug" if unable to ack', done => { const messages = [ new FakeMessage(), new FakeMessage(), @@ -380,7 +380,7 @@ describe('MessageQueues', () => { sandbox.stub(subscriber.client, 'acknowledge').rejects(fakeError); - subscriber.on('error', (err: BatchError) => { + subscriber.on('debug', (err: BatchError) => { assert.strictEqual(err.message, expectedMessage); assert.deepStrictEqual(err.ackIds, ackIds); assert.strictEqual(err.code, fakeError.code); @@ -487,7 +487,7 @@ describe('MessageQueues', () => { assert.strictEqual(callOptions, fakeCallOptions); }); - it('should throw a BatchError if unable to modAck', done => { + it('should throw a BatchError on "debug" if unable to modAck', done => { const messages = [ new FakeMessage(), new FakeMessage(), @@ -505,7 +505,7 @@ describe('MessageQueues', () => { sandbox.stub(subscriber.client, 'modifyAckDeadline').rejects(fakeError); - subscriber.on('error', (err: BatchError) => { + subscriber.on('debug', (err: BatchError) => { assert.strictEqual(err.message, expectedMessage); assert.deepStrictEqual(err.ackIds, ackIds); assert.strictEqual(err.code, fakeError.code); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 03fd44a28e2..d908973d5ef 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -196,10 +196,12 @@ describe('PubSub', () => { }); describe('instantiation', () => { + const maxMetadataSizeKey = 'grpc.max_metadata_size'; const DEFAULT_OPTIONS = { libName: 'gccl', libVersion: PKG.version, scopes: [], + [maxMetadataSizeKey]: 4 * 1024 * 1024, }; it('should extend the correct methods', () => { @@ -220,6 +222,20 @@ describe('PubSub', () => { assert(new PubSub() instanceof PubSub); }); + it('should augment the gRPC options for metadata size', () => { + let pubsub = new PubSub(); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + let optionsAny: any = pubsub.options; + assert.strictEqual(optionsAny[maxMetadataSizeKey], 4 * 1024 * 1024); + + optionsAny = { + [maxMetadataSizeKey]: 1 * 1024 * 1024, + }; + pubsub = new PubSub(optionsAny); + optionsAny = pubsub.options; + assert.strictEqual(optionsAny[maxMetadataSizeKey], 1 * 1024 * 1024); + }); + it('should combine all required scopes', () => { v1ClientOverrides.SubscriberClient = {}; v1ClientOverrides.SubscriberClient.scopes = ['a', 'b', 'c']; diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 860cded5c8d..a5699b8a1a6 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -509,6 +509,25 @@ describe('Subscription', () => { }); }); + describe('debug', () => { + const error = new Error('err') as ServiceError; + + beforeEach(() => { + subscription.request = (config, callback) => { + callback(error); + }; + }); + + it('should return the debug events to the callback', done => { + subscription.on('debug', err => { + assert.strictEqual(err, error); + done(); + }); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (subscription as any)._subscriber.emit('debug', error); + }); + }); + describe('delete', () => { beforeEach(() => { sandbox.stub(subscription, 'removeAllListeners').yields(util.noop); From 5c3eeb893ab4905952bd292f2e45847bd7ebea08 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 22:22:10 +0000 Subject: [PATCH 0838/1115] chore(deps): update actions/checkout action to v3 (#1392) (#1511) Co-authored-by: Jeffrey Rennie Source-Link: https://github.com/googleapis/synthtool/commit/9368bc795a376954920c374406e92efb0e3d0ac4 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:f74e740638e66be7ced1540626217dbb72980eb73885b2339a70592f38c9ff2c --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index c6ddf44fb1c..b4c08f9a4a2 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:bb4d47d0e770abad62699a4664ce6b9ff1629d50c276a6c75860a6a1853dd19b -# created: 2022-04-01T19:19:56.587347289Z + digest: sha256:f74e740638e66be7ced1540626217dbb72980eb73885b2339a70592f38c9ff2c +# created: 2022-04-06T18:36:33.987617127Z From a9c54b6739de48c6c7ce6f6396df2aeb9ed3431f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 7 Apr 2022 12:36:03 -0400 Subject: [PATCH 0839/1115] chore(main): release 2.19.1 (#1494) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 9 +++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index ec7b4973c96..c8c1558fb9d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,15 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.19.1](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.0...v2.19.1) (2022-04-06) + + +### Bug Fixes + +* **deps:** update dependency google-gax to v2.29.7 ([#1493](https://github.com/googleapis/nodejs-pubsub/issues/1493)) ([c8921a7](https://github.com/googleapis/nodejs-pubsub/commit/c8921a7af9205c15c5485f3a3d1c607483a69de4)) +* **deps:** update dependency google-gax to v2.30.0 ([#1496](https://github.com/googleapis/nodejs-pubsub/issues/1496)) ([073a1b8](https://github.com/googleapis/nodejs-pubsub/commit/073a1b86ab516ad78985ce3d09ff16cbdf56151e)) +* update grpc.max_metadata_size to 4MiB for exactly-once, and shift ack/modack errors to 'debug' stream channel ([#1505](https://github.com/googleapis/nodejs-pubsub/issues/1505)) ([abd10cc](https://github.com/googleapis/nodejs-pubsub/commit/abd10cc0c9956256bd06e5b48a412ec0af6dd086)) + ## [2.19.0](https://github.com/googleapis/nodejs-pubsub/compare/v2.18.5...v2.19.0) (2022-02-16) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 230c312c86a..9c25a1f1172 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.19.0", + "version": "2.19.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From e76d5ab4488e8529f3f6a3c9e73ca8c02ad381e9 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 17:36:24 -0400 Subject: [PATCH 0840/1115] build: make ci testing conditional on engines field in package.json, move configs to Node 12 (#1418) (#1520) * build: make ci testing conditional on engines field in package.json, move configs to Node 12 (#1418) * build: make ci testing conditional on engines field in package.json, move configs to Node 12 Co-authored-by: Benjamin E. Coe Source-Link: https://github.com/googleapis/synthtool/commit/2800f5a85af0e0399c71a63169a53ade3e0d42f6 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:dc7bfb4c4bf50496abbdd24bd9e4aaa833dc75248c0a9e3a7f807feda5258873 * samples: fix another potentially flaky test * tests: remove extra import Co-authored-by: Owl Bot Co-authored-by: Benjamin E. Coe Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> Co-authored-by: Megan Potter --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/common.cfg | 2 +- handwritten/pubsub/.kokoro/release/docs.cfg | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index b4c08f9a4a2..11e07e9cf0f 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:f74e740638e66be7ced1540626217dbb72980eb73885b2339a70592f38c9ff2c -# created: 2022-04-06T18:36:33.987617127Z + digest: sha256:dc7bfb4c4bf50496abbdd24bd9e4aaa833dc75248c0a9e3a7f807feda5258873 +# created: 2022-04-14T17:36:54.629564643Z diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index 17b223296fc..821605f9662 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/release/docs.cfg b/handwritten/pubsub/.kokoro/release/docs.cfg index a43443b994f..44f0a875684 100644 --- a/handwritten/pubsub/.kokoro/release/docs.cfg +++ b/handwritten/pubsub/.kokoro/release/docs.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index f249d3e4a2e..fbc058a4ec4 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -56,7 +56,7 @@ fi # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=10 +COVERAGE_NODE=12 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 0a840452084..87fa0653d76 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -49,7 +49,7 @@ npm run system-test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=10 +COVERAGE_NODE=12 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index af1ce7e33ca..a5c7ac04cd3 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -39,7 +39,7 @@ npm test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=10 +COVERAGE_NODE=12 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then From 7b96cfe4e16f1a06de01accdc4c1f7caf26d66e9 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 02:36:31 +0000 Subject: [PATCH 0841/1115] build(node): update client library version in samples metadata (#1356) (#1530) * build(node): add feat in node post-processor to add client library version number in snippet metadata Co-authored-by: Benjamin E. Coe Source-Link: https://github.com/googleapis/synthtool/commit/d337b88dd1494365183718a2de0b7b4056b6fdfe Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:d106724ad2a96daa1b8d88de101ba50bdb30b8df62ffa0aa2b451d93b4556641 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- .../pubsub/.github/sync-repo-settings.yaml | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 handwritten/pubsub/.github/sync-repo-settings.yaml diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 11e07e9cf0f..9017db80d17 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:dc7bfb4c4bf50496abbdd24bd9e4aaa833dc75248c0a9e3a7f807feda5258873 -# created: 2022-04-14T17:36:54.629564643Z + digest: sha256:d106724ad2a96daa1b8d88de101ba50bdb30b8df62ffa0aa2b451d93b4556641 +# created: 2022-04-20T16:59:29.058398639Z diff --git a/handwritten/pubsub/.github/sync-repo-settings.yaml b/handwritten/pubsub/.github/sync-repo-settings.yaml new file mode 100644 index 00000000000..1b36268333a --- /dev/null +++ b/handwritten/pubsub/.github/sync-repo-settings.yaml @@ -0,0 +1,17 @@ +branchProtectionRules: + - pattern: main + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - "ci/kokoro: Samples test" + - "ci/kokoro: System test" + - docs + - lint + - test (10) + - test (12) + - test (14) + - cla/google + - windows + - OwlBot Post Processor From e8a730890b96d10c6633ea4b0465829767bc09e7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 26 Apr 2022 13:03:20 -0400 Subject: [PATCH 0842/1115] chore(main): release 2.19.2 (#1526) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c8c1558fb9d..b867cbec88e 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.19.2](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.1...v2.19.2) (2022-04-21) + + +### Bug Fixes + +* fix flaky schema and subscription tests ([#1518](https://github.com/googleapis/nodejs-pubsub/issues/1518)) ([5ff0105](https://github.com/googleapis/nodejs-pubsub/commit/5ff0105cf84751beb6f06343aaf5228157faae4d)) + ### [2.19.1](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.0...v2.19.1) (2022-04-06) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9c25a1f1172..862292f531c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.19.1", + "version": "2.19.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From ba28e2f14d315547e8d8776345463b54434c6b48 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 26 Apr 2022 21:42:30 +0200 Subject: [PATCH 0843/1115] fix(deps): update dependency google-gax to v2.30.2 (#1502) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.30.0` -> `2.30.2`](https://renovatebot.com/diffs/npm/google-gax/2.30.0/2.30.2) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.30.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.30.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.30.2/compatibility-slim/2.30.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.30.2/confidence-slim/2.30.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.30.2`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2302-httpsgithubcomgoogleapisgax-nodejscomparev2301v2302-2022-04-12) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.30.1...v2.30.2) ### [`v2.30.1`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2301-httpsgithubcomgoogleapisgax-nodejscomparev2300v2301-2022-03-08) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.30.0...v2.30.1)
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 862292f531c..f848e57a2b9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.30.0", + "google-gax": "2.30.2", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From 7c07b77afcba2fb1b54fb879dacde82e14199d23 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 26 Apr 2022 16:09:13 -0400 Subject: [PATCH 0844/1115] chore(main): release 2.19.3 (#1540) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index b867cbec88e..0ba217e3bd2 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.19.3](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.2...v2.19.3) (2022-04-26) + + +### Bug Fixes + +* **deps:** update dependency google-gax to v2.30.2 ([#1502](https://github.com/googleapis/nodejs-pubsub/issues/1502)) ([37d075e](https://github.com/googleapis/nodejs-pubsub/commit/37d075e6ae4e588155a9f0c0506b9a497be6bf06)) + ### [2.19.2](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.1...v2.19.2) (2022-04-21) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f848e57a2b9..c362fb2b075 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.19.2", + "version": "2.19.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From cbb324ef22170c265277cc83f44c41b980596789 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 4 May 2022 13:04:12 +0200 Subject: [PATCH 0845/1115] fix(deps): update dependency google-gax to v2.30.3 (#1549) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.30.2` -> `2.30.3`](https://renovatebot.com/diffs/npm/google-gax/2.30.2/2.30.3) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.30.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.30.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.30.3/compatibility-slim/2.30.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.30.3/confidence-slim/2.30.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.30.3`](https://togithub.com/googleapis/gax-nodejs/blob/HEAD/CHANGELOG.md#​2303-httpsgithubcomgoogleapisgax-nodejscomparev2302v2303-2022-05-03) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.30.2...v2.30.3)
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c362fb2b075..009c6d2636a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.30.2", + "google-gax": "2.30.3", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From 49534239f8a6e428fe1df93e48db549718b386b1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 5 May 2022 23:07:05 +0200 Subject: [PATCH 0846/1115] chore(deps): update dependency @types/mocha to v9 (#1545) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 009c6d2636a..e5556a51559 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -69,7 +69,7 @@ "@types/execa": "^0.9.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", - "@types/mocha": "^8.0.0", + "@types/mocha": "^9.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", "@types/node": "^16.0.0", From 0a2037aa0a7cece6b99f9abd28c7eb9c3f2efad2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 21:22:20 +0000 Subject: [PATCH 0847/1115] chore(main): release 2.19.4 (#1550) :robot: I have created a release *beep* *boop* --- ### [2.19.4](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.3...v2.19.4) (2022-05-05) ### Bug Fixes * **deps:** update dependency google-gax to v2.30.3 ([#1549](https://github.com/googleapis/nodejs-pubsub/issues/1549)) ([5810331](https://github.com/googleapis/nodejs-pubsub/commit/581033199dfe2a80a83b472bc77b1d7eab53b62d)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 0ba217e3bd2..d711861263d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +### [2.19.4](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.3...v2.19.4) (2022-05-05) + + +### Bug Fixes + +* **deps:** update dependency google-gax to v2.30.3 ([#1549](https://github.com/googleapis/nodejs-pubsub/issues/1549)) ([5810331](https://github.com/googleapis/nodejs-pubsub/commit/581033199dfe2a80a83b472bc77b1d7eab53b62d)) + ### [2.19.3](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.2...v2.19.3) (2022-04-26) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e5556a51559..467ec2f6985 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.19.3", + "version": "2.19.4", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From a131ff9505037066d99314977108828824dbe9a4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 6 May 2022 18:44:20 +0000 Subject: [PATCH 0848/1115] build: update auto approve to v2, remove release autoapproving (#1432) (#1551) * build: update auto-approve file to v2 Source-Link: https://github.com/googleapis/synthtool/commit/19eb6fc07dc178a682da6d186dc874017a166438 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:b9e4584a1fe3c749e3c37c92497b13dce653b2e694f0261f0610eb0e15941357 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.github/auto-approve.yml | 15 +++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 9017db80d17..9acbabb1b4c 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:d106724ad2a96daa1b8d88de101ba50bdb30b8df62ffa0aa2b451d93b4556641 -# created: 2022-04-20T16:59:29.058398639Z + digest: sha256:b9e4584a1fe3c749e3c37c92497b13dce653b2e694f0261f0610eb0e15941357 +# created: 2022-05-05T21:08:42.530332893Z diff --git a/handwritten/pubsub/.github/auto-approve.yml b/handwritten/pubsub/.github/auto-approve.yml index 49cf942280a..4cd91cc16ae 100644 --- a/handwritten/pubsub/.github/auto-approve.yml +++ b/handwritten/pubsub/.github/auto-approve.yml @@ -1,12 +1,3 @@ -rules: -- author: "release-please[bot]" - title: "^chore: release" - changedFiles: - - "package\\.json$" - - "CHANGELOG\\.md$" - maxFiles: 3 -- author: "renovate-bot" - title: "^(fix|chore)\\(deps\\):" - changedFiles: - - "package\\.json$" - maxFiles: 2 +processes: + - "NodeDependency" + - "OwlBotTemplateChanges" From c9e39db448d219248449dfedc7f88cd4fe165b94 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 9 May 2022 17:34:29 +0200 Subject: [PATCH 0849/1115] chore(deps): update dependency sinon to v14 (#1553) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [sinon](https://sinonjs.org/) ([source](https://togithub.com/sinonjs/sinon)) | [`^13.0.0` -> `^14.0.0`](https://renovatebot.com/diffs/npm/sinon/13.0.2/14.0.0) | [![age](https://badges.renovateapi.com/packages/npm/sinon/14.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/sinon/14.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/sinon/14.0.0/compatibility-slim/13.0.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/sinon/14.0.0/confidence-slim/13.0.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sinonjs/sinon ### [`v14.0.0`](https://togithub.com/sinonjs/sinon/blob/HEAD/CHANGES.md#​1400) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v13.0.2...v14.0.0) - [`c2bbd826`](https://togithub.com/sinonjs/sinon/commit/c2bbd82641444eb5b32822489ae40f185afbbf00) Drop node 12 (Morgan Roderick) > And embrace Node 18 > > See https://nodejs.org/en/about/releases/ *Released by Morgan Roderick on 2022-05-07.*
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 467ec2f6985..3c789bffca2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -91,7 +91,7 @@ "null-loader": "^4.0.0", "protobufjs": "^6.10.1", "proxyquire": "^2.0.0", - "sinon": "^13.0.0", + "sinon": "^14.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", "typescript": "^3.8.3", From 33cd25b4540f6103d43a34f5b1a144e2fd409316 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 10 May 2022 13:36:11 +0200 Subject: [PATCH 0850/1115] fix(deps): update dependency google-gax to v2.30.4 (#1555) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-gax](https://togithub.com/googleapis/gax-nodejs) | [`2.30.3` -> `2.30.4`](https://renovatebot.com/diffs/npm/google-gax/2.30.3/2.30.4) | [![age](https://badges.renovateapi.com/packages/npm/google-gax/2.30.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/google-gax/2.30.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/google-gax/2.30.4/compatibility-slim/2.30.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/google-gax/2.30.4/confidence-slim/2.30.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs ### [`v2.30.4`](https://togithub.com/googleapis/gax-nodejs/releases/v2.30.4) [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/v2.30.3...v2.30.4) ##### [2.30.4](https://togithub.com/googleapis/gax-nodejs/compare/v2.30.3...v2.30.4) (2022-05-09) ##### Bug Fixes - revert gRPC stream change in [#​1226](https://togithub.com/googleapis/gax-nodejs/issues/1226) ([#​1257](https://togithub.com/googleapis/gax-nodejs/issues/1257)) ([1c3a5a7](https://togithub.com/googleapis/gax-nodejs/commit/1c3a5a7ac54f8fd8e710fe4316c3d5a82072f8f1)) - upgrade proto-loader and add long dev dependency ([#​1253](https://togithub.com/googleapis/gax-nodejs/issues/1253)) ([5dea136](https://togithub.com/googleapis/gax-nodejs/commit/5dea13698c580283083f41d330a1a2faf37adc5d))
--- ### Configuration 📅 **Schedule**: "after 9am and before 3pm" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3c789bffca2..8df7d1c88dc 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^7.0.0", - "google-gax": "2.30.3", + "google-gax": "2.30.4", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" From c1699055d7f7b3a9895ee659c4f7357ed224d95f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 15:17:35 -0400 Subject: [PATCH 0851/1115] feat: add BigQuery configuration for subscriptions (#1563) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add BigQuery configuration for subscriptions PiperOrigin-RevId: 449031535 Source-Link: https://github.com/googleapis/googleapis/commit/feec34dfac930eb0ab8c3e72ff5794c3f4c5924d Source-Link: https://github.com/googleapis/googleapis-gen/commit/89664e9708c19d532c63f7a16fd79cb631d87aa1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODk2NjRlOTcwOGMxOWQ1MzJjNjNmN2ExNmZkNzljYjYzMWQ4N2FhMSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 78 +++- handwritten/pubsub/protos/protos.d.ts | 148 +++++++ handwritten/pubsub/protos/protos.js | 407 ++++++++++++++++++ handwritten/pubsub/protos/protos.json | 58 +++ .../pubsub/src/v1/subscriber_client.ts | 13 +- 5 files changed, 699 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 172801ba3ff..5ab209bbd62 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -642,6 +642,20 @@ message Subscription { pattern: "projects/{project}/subscriptions/{subscription}" }; + // Possible states for a subscription. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // The subscription can actively receive messages + ACTIVE = 1; + + // The subscription cannot receive messages because of an error with the + // resource to which it pushes messages. See the more detailed error state + // in the corresponding configuration. + RESOURCE_ERROR = 2; + } + // Required. The name of the subscription. It must have the format // `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must // start with a letter, and contain only letters (`[A-Za-z]`), numbers @@ -659,10 +673,17 @@ message Subscription { ]; // If push delivery is used with this subscription, this field is - // used to configure it. An empty `pushConfig` signifies that the subscriber - // will pull and ack messages using API methods. + // used to configure it. Either `pushConfig` or `bigQueryConfig` can be set, + // but not both. If both are empty, then the subscriber will pull and ack + // messages using API methods. PushConfig push_config = 4; + // If delivery to BigQuery is used with this subscription, this field is + // used to configure it. Either `pushConfig` or `bigQueryConfig` can be set, + // but not both. If both are empty, then the subscriber will pull and ack + // messages using API methods. + BigQueryConfig bigquery_config = 18; + // The approximate amount of time (on a best-effort basis) Pub/Sub waits for // the subscriber to acknowledge receipt before resending the message. In the // interval after the message is delivered and before it is acknowledged, it @@ -773,6 +794,10 @@ message Subscription { // in responses from the server; it is ignored if it is set in any requests. 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. + State state = 19 [(google.api.field_behavior) = OUTPUT_ONLY]; } // A policy that specifies how Cloud Pub/Sub retries message delivery. @@ -902,6 +927,53 @@ message PushConfig { } } +// Configuration for a BigQuery subscription. +message BigQueryConfig { + // Possible states for a BigQuery subscription. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // The subscription can actively send messages to BigQuery + ACTIVE = 1; + + // Cannot write to the BigQuery table because of permission denied errors. + PERMISSION_DENIED = 2; + + // Cannot write to the BigQuery table because it does not exist. + NOT_FOUND = 3; + + // Cannot write to the BigQuery table due to a schema mismatch. + SCHEMA_MISMATCH = 4; + } + + // The name of the table to which to write data, of the form + // {projectId}:{datasetId}.{tableId} + string table = 1; + + // When true, use the topic's schema as the columns to write to in BigQuery, + // if it exists. + bool use_topic_schema = 2; + + // When true, write the subscription name, message_id, publish_time, + // attributes, and ordering_key to additional columns in the table. The + // subscription name, message_id, and publish_time fields are put in their own + // columns while all other message properties (other than data) are written to + // a JSON object in the attributes column. + bool write_metadata = 3; + + // When true and use_topic_schema is true, any fields that are a part of the + // topic schema that are not part of the BigQuery table schema are dropped + // when writing to BigQuery. Otherwise, the schemas must be kept in sync and + // any messages with extra fields are not written and remain in the + // subscription's backlog. + bool drop_unknown_fields = 4; + + // 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]; +} + // A message and its corresponding acknowledgment ID. message ReceivedMessage { // This ID can be used to acknowledge the received message. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 92e36484f30..b5960417af4 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -2264,6 +2264,9 @@ export namespace google { /** Subscription pushConfig */ pushConfig?: (google.pubsub.v1.IPushConfig|null); + /** Subscription bigqueryConfig */ + bigqueryConfig?: (google.pubsub.v1.IBigQueryConfig|null); + /** Subscription ackDeadlineSeconds */ ackDeadlineSeconds?: (number|null); @@ -2299,6 +2302,9 @@ export namespace google { /** Subscription topicMessageRetentionDuration */ topicMessageRetentionDuration?: (google.protobuf.IDuration|null); + + /** Subscription state */ + state?: (google.pubsub.v1.Subscription.State|keyof typeof google.pubsub.v1.Subscription.State|null); } /** Represents a Subscription. */ @@ -2319,6 +2325,9 @@ export namespace google { /** Subscription pushConfig. */ public pushConfig?: (google.pubsub.v1.IPushConfig|null); + /** Subscription bigqueryConfig. */ + public bigqueryConfig?: (google.pubsub.v1.IBigQueryConfig|null); + /** Subscription ackDeadlineSeconds. */ public ackDeadlineSeconds: number; @@ -2355,6 +2364,9 @@ export namespace google { /** Subscription topicMessageRetentionDuration. */ public topicMessageRetentionDuration?: (google.protobuf.IDuration|null); + /** Subscription state. */ + public state: (google.pubsub.v1.Subscription.State|keyof typeof google.pubsub.v1.Subscription.State); + /** * Creates a new Subscription instance using the specified properties. * @param [properties] Properties to set @@ -2426,6 +2438,16 @@ export namespace google { public toJSON(): { [k: string]: any }; } + namespace Subscription { + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + RESOURCE_ERROR = 2 + } + } + /** Properties of a RetryPolicy. */ interface IRetryPolicy { @@ -2912,6 +2934,132 @@ export namespace google { } } + /** Properties of a BigQueryConfig. */ + interface IBigQueryConfig { + + /** BigQueryConfig table */ + table?: (string|null); + + /** BigQueryConfig useTopicSchema */ + useTopicSchema?: (boolean|null); + + /** BigQueryConfig writeMetadata */ + writeMetadata?: (boolean|null); + + /** BigQueryConfig dropUnknownFields */ + dropUnknownFields?: (boolean|null); + + /** BigQueryConfig state */ + state?: (google.pubsub.v1.BigQueryConfig.State|keyof typeof google.pubsub.v1.BigQueryConfig.State|null); + } + + /** Represents a BigQueryConfig. */ + class BigQueryConfig implements IBigQueryConfig { + + /** + * Constructs a new BigQueryConfig. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IBigQueryConfig); + + /** BigQueryConfig table. */ + public table: string; + + /** BigQueryConfig useTopicSchema. */ + public useTopicSchema: boolean; + + /** BigQueryConfig writeMetadata. */ + public writeMetadata: boolean; + + /** BigQueryConfig dropUnknownFields. */ + public dropUnknownFields: boolean; + + /** BigQueryConfig state. */ + public state: (google.pubsub.v1.BigQueryConfig.State|keyof typeof google.pubsub.v1.BigQueryConfig.State); + + /** + * Creates a new BigQueryConfig instance using the specified properties. + * @param [properties] Properties to set + * @returns BigQueryConfig instance + */ + public static create(properties?: google.pubsub.v1.IBigQueryConfig): google.pubsub.v1.BigQueryConfig; + + /** + * Encodes the specified BigQueryConfig message. Does not implicitly {@link google.pubsub.v1.BigQueryConfig.verify|verify} messages. + * @param message BigQueryConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IBigQueryConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified BigQueryConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.BigQueryConfig.verify|verify} messages. + * @param message BigQueryConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IBigQueryConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a BigQueryConfig message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns BigQueryConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.BigQueryConfig; + + /** + * Decodes a BigQueryConfig message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns BigQueryConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.BigQueryConfig; + + /** + * Verifies a BigQueryConfig message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a BigQueryConfig message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns BigQueryConfig + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.BigQueryConfig; + + /** + * Creates a plain object from a BigQueryConfig message. Also converts values to other types if specified. + * @param message BigQueryConfig + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.BigQueryConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this BigQueryConfig to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + } + + namespace BigQueryConfig { + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + PERMISSION_DENIED = 2, + NOT_FOUND = 3, + SCHEMA_MISMATCH = 4 + } + } + /** Properties of a ReceivedMessage. */ interface IReceivedMessage { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index e93dbbbd6ae..e6e3b207045 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -4843,6 +4843,7 @@ * @property {string|null} [name] Subscription name * @property {string|null} [topic] Subscription topic * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] Subscription pushConfig + * @property {google.pubsub.v1.IBigQueryConfig|null} [bigqueryConfig] Subscription bigqueryConfig * @property {number|null} [ackDeadlineSeconds] Subscription ackDeadlineSeconds * @property {boolean|null} [retainAckedMessages] Subscription retainAckedMessages * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Subscription messageRetentionDuration @@ -4855,6 +4856,7 @@ * @property {boolean|null} [detached] Subscription detached * @property {boolean|null} [enableExactlyOnceDelivery] Subscription enableExactlyOnceDelivery * @property {google.protobuf.IDuration|null} [topicMessageRetentionDuration] Subscription topicMessageRetentionDuration + * @property {google.pubsub.v1.Subscription.State|null} [state] Subscription state */ /** @@ -4897,6 +4899,14 @@ */ Subscription.prototype.pushConfig = null; + /** + * Subscription bigqueryConfig. + * @member {google.pubsub.v1.IBigQueryConfig|null|undefined} bigqueryConfig + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.bigqueryConfig = null; + /** * Subscription ackDeadlineSeconds. * @member {number} ackDeadlineSeconds @@ -4993,6 +5003,14 @@ */ Subscription.prototype.topicMessageRetentionDuration = null; + /** + * Subscription state. + * @member {google.pubsub.v1.Subscription.State} state + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.state = 0; + /** * Creates a new Subscription instance using the specified properties. * @function create @@ -5048,6 +5066,10 @@ writer.uint32(/* id 16, wireType 0 =*/128).bool(message.enableExactlyOnceDelivery); if (message.topicMessageRetentionDuration != null && Object.hasOwnProperty.call(message, "topicMessageRetentionDuration")) $root.google.protobuf.Duration.encode(message.topicMessageRetentionDuration, writer.uint32(/* id 17, wireType 2 =*/138).fork()).ldelim(); + if (message.bigqueryConfig != null && Object.hasOwnProperty.call(message, "bigqueryConfig")) + $root.google.pubsub.v1.BigQueryConfig.encode(message.bigqueryConfig, writer.uint32(/* id 18, wireType 2 =*/146).fork()).ldelim(); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 19, wireType 0 =*/152).int32(message.state); return writer; }; @@ -5091,6 +5113,9 @@ case 4: message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); break; + case 18: + message.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.decode(reader, reader.uint32()); + break; case 5: message.ackDeadlineSeconds = reader.int32(); break; @@ -5146,6 +5171,9 @@ case 17: message.topicMessageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); break; + case 19: + message.state = reader.int32(); + break; default: reader.skipType(tag & 7); break; @@ -5192,6 +5220,11 @@ if (error) return "pushConfig." + error; } + if (message.bigqueryConfig != null && message.hasOwnProperty("bigqueryConfig")) { + var error = $root.google.pubsub.v1.BigQueryConfig.verify(message.bigqueryConfig); + if (error) + return "bigqueryConfig." + error; + } if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) if (!$util.isInteger(message.ackDeadlineSeconds)) return "ackDeadlineSeconds: integer expected"; @@ -5243,6 +5276,15 @@ if (error) return "topicMessageRetentionDuration." + error; } + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + break; + } return null; }; @@ -5267,6 +5309,11 @@ throw TypeError(".google.pubsub.v1.Subscription.pushConfig: object expected"); message.pushConfig = $root.google.pubsub.v1.PushConfig.fromObject(object.pushConfig); } + if (object.bigqueryConfig != null) { + if (typeof object.bigqueryConfig !== "object") + throw TypeError(".google.pubsub.v1.Subscription.bigqueryConfig: object expected"); + message.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.fromObject(object.bigqueryConfig); + } if (object.ackDeadlineSeconds != null) message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; if (object.retainAckedMessages != null) @@ -5311,6 +5358,20 @@ throw TypeError(".google.pubsub.v1.Subscription.topicMessageRetentionDuration: object expected"); message.topicMessageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.topicMessageRetentionDuration); } + switch (object.state) { + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "RESOURCE_ERROR": + case 2: + message.state = 2; + break; + } return message; }; @@ -5344,6 +5405,8 @@ object.detached = false; object.enableExactlyOnceDelivery = false; object.topicMessageRetentionDuration = null; + object.bigqueryConfig = null; + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -5379,6 +5442,10 @@ object.enableExactlyOnceDelivery = message.enableExactlyOnceDelivery; if (message.topicMessageRetentionDuration != null && message.hasOwnProperty("topicMessageRetentionDuration")) object.topicMessageRetentionDuration = $root.google.protobuf.Duration.toObject(message.topicMessageRetentionDuration, options); + if (message.bigqueryConfig != null && message.hasOwnProperty("bigqueryConfig")) + object.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.toObject(message.bigqueryConfig, options); + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.Subscription.State[message.state] : message.state; return object; }; @@ -5393,6 +5460,22 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * State enum. + * @name google.pubsub.v1.Subscription.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} RESOURCE_ERROR=2 RESOURCE_ERROR value + */ + Subscription.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "RESOURCE_ERROR"] = 2; + return values; + })(); + return Subscription; })(); @@ -6520,6 +6603,330 @@ return PushConfig; })(); + v1.BigQueryConfig = (function() { + + /** + * Properties of a BigQueryConfig. + * @memberof google.pubsub.v1 + * @interface IBigQueryConfig + * @property {string|null} [table] BigQueryConfig table + * @property {boolean|null} [useTopicSchema] BigQueryConfig useTopicSchema + * @property {boolean|null} [writeMetadata] BigQueryConfig writeMetadata + * @property {boolean|null} [dropUnknownFields] BigQueryConfig dropUnknownFields + * @property {google.pubsub.v1.BigQueryConfig.State|null} [state] BigQueryConfig state + */ + + /** + * Constructs a new BigQueryConfig. + * @memberof google.pubsub.v1 + * @classdesc Represents a BigQueryConfig. + * @implements IBigQueryConfig + * @constructor + * @param {google.pubsub.v1.IBigQueryConfig=} [properties] Properties to set + */ + function BigQueryConfig(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * BigQueryConfig table. + * @member {string} table + * @memberof google.pubsub.v1.BigQueryConfig + * @instance + */ + BigQueryConfig.prototype.table = ""; + + /** + * BigQueryConfig useTopicSchema. + * @member {boolean} useTopicSchema + * @memberof google.pubsub.v1.BigQueryConfig + * @instance + */ + BigQueryConfig.prototype.useTopicSchema = false; + + /** + * BigQueryConfig writeMetadata. + * @member {boolean} writeMetadata + * @memberof google.pubsub.v1.BigQueryConfig + * @instance + */ + BigQueryConfig.prototype.writeMetadata = false; + + /** + * BigQueryConfig dropUnknownFields. + * @member {boolean} dropUnknownFields + * @memberof google.pubsub.v1.BigQueryConfig + * @instance + */ + BigQueryConfig.prototype.dropUnknownFields = false; + + /** + * BigQueryConfig state. + * @member {google.pubsub.v1.BigQueryConfig.State} state + * @memberof google.pubsub.v1.BigQueryConfig + * @instance + */ + BigQueryConfig.prototype.state = 0; + + /** + * Creates a new BigQueryConfig instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {google.pubsub.v1.IBigQueryConfig=} [properties] Properties to set + * @returns {google.pubsub.v1.BigQueryConfig} BigQueryConfig instance + */ + BigQueryConfig.create = function create(properties) { + return new BigQueryConfig(properties); + }; + + /** + * Encodes the specified BigQueryConfig message. Does not implicitly {@link google.pubsub.v1.BigQueryConfig.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {google.pubsub.v1.IBigQueryConfig} message BigQueryConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + BigQueryConfig.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.table != null && Object.hasOwnProperty.call(message, "table")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.table); + if (message.useTopicSchema != null && Object.hasOwnProperty.call(message, "useTopicSchema")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.useTopicSchema); + if (message.writeMetadata != null && Object.hasOwnProperty.call(message, "writeMetadata")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.writeMetadata); + if (message.dropUnknownFields != null && Object.hasOwnProperty.call(message, "dropUnknownFields")) + writer.uint32(/* id 4, wireType 0 =*/32).bool(message.dropUnknownFields); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.state); + return writer; + }; + + /** + * Encodes the specified BigQueryConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.BigQueryConfig.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {google.pubsub.v1.IBigQueryConfig} message BigQueryConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + BigQueryConfig.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a BigQueryConfig message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.BigQueryConfig} BigQueryConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + BigQueryConfig.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.BigQueryConfig(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: + message.table = reader.string(); + break; + case 2: + message.useTopicSchema = reader.bool(); + break; + case 3: + message.writeMetadata = reader.bool(); + break; + case 4: + message.dropUnknownFields = reader.bool(); + break; + case 5: + message.state = reader.int32(); + break; + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a BigQueryConfig message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.BigQueryConfig} BigQueryConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + BigQueryConfig.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a BigQueryConfig message. + * @function verify + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + BigQueryConfig.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.table != null && message.hasOwnProperty("table")) + if (!$util.isString(message.table)) + return "table: string expected"; + if (message.useTopicSchema != null && message.hasOwnProperty("useTopicSchema")) + if (typeof message.useTopicSchema !== "boolean") + return "useTopicSchema: boolean expected"; + if (message.writeMetadata != null && message.hasOwnProperty("writeMetadata")) + if (typeof message.writeMetadata !== "boolean") + return "writeMetadata: boolean expected"; + if (message.dropUnknownFields != null && message.hasOwnProperty("dropUnknownFields")) + if (typeof message.dropUnknownFields !== "boolean") + return "dropUnknownFields: boolean expected"; + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + break; + } + return null; + }; + + /** + * Creates a BigQueryConfig message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.BigQueryConfig} BigQueryConfig + */ + BigQueryConfig.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.BigQueryConfig) + return object; + var message = new $root.google.pubsub.v1.BigQueryConfig(); + if (object.table != null) + message.table = String(object.table); + if (object.useTopicSchema != null) + message.useTopicSchema = Boolean(object.useTopicSchema); + if (object.writeMetadata != null) + message.writeMetadata = Boolean(object.writeMetadata); + if (object.dropUnknownFields != null) + message.dropUnknownFields = Boolean(object.dropUnknownFields); + switch (object.state) { + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "PERMISSION_DENIED": + case 2: + message.state = 2; + break; + case "NOT_FOUND": + case 3: + message.state = 3; + break; + case "SCHEMA_MISMATCH": + case 4: + message.state = 4; + break; + } + return message; + }; + + /** + * Creates a plain object from a BigQueryConfig message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {google.pubsub.v1.BigQueryConfig} message BigQueryConfig + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + BigQueryConfig.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.table = ""; + object.useTopicSchema = false; + object.writeMetadata = false; + object.dropUnknownFields = false; + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + } + if (message.table != null && message.hasOwnProperty("table")) + object.table = message.table; + if (message.useTopicSchema != null && message.hasOwnProperty("useTopicSchema")) + object.useTopicSchema = message.useTopicSchema; + if (message.writeMetadata != null && message.hasOwnProperty("writeMetadata")) + object.writeMetadata = message.writeMetadata; + if (message.dropUnknownFields != null && message.hasOwnProperty("dropUnknownFields")) + object.dropUnknownFields = message.dropUnknownFields; + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.BigQueryConfig.State[message.state] : message.state; + return object; + }; + + /** + * Converts this BigQueryConfig to JSON. + * @function toJSON + * @memberof google.pubsub.v1.BigQueryConfig + * @instance + * @returns {Object.} JSON object + */ + BigQueryConfig.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * State enum. + * @name google.pubsub.v1.BigQueryConfig.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} PERMISSION_DENIED=2 PERMISSION_DENIED value + * @property {number} NOT_FOUND=3 NOT_FOUND value + * @property {number} SCHEMA_MISMATCH=4 SCHEMA_MISMATCH value + */ + BigQueryConfig.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "PERMISSION_DENIED"] = 2; + values[valuesById[3] = "NOT_FOUND"] = 3; + values[valuesById[4] = "SCHEMA_MISMATCH"] = 4; + return values; + })(); + + return BigQueryConfig; + })(); + v1.ReceivedMessage = (function() { /** diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index dc897e5afc6..1668561e915 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -780,6 +780,10 @@ "type": "PushConfig", "id": 4 }, + "bigqueryConfig": { + "type": "BigQueryConfig", + "id": 18 + }, "ackDeadlineSeconds": { "type": "int32", "id": 5 @@ -831,6 +835,22 @@ "options": { "(google.api.field_behavior)": "OUTPUT_ONLY" } + }, + "state": { + "type": "State", + "id": 19, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + } + }, + "nested": { + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "RESOURCE_ERROR": 2 + } } } }, @@ -904,6 +924,44 @@ } } }, + "BigQueryConfig": { + "fields": { + "table": { + "type": "string", + "id": 1 + }, + "useTopicSchema": { + "type": "bool", + "id": 2 + }, + "writeMetadata": { + "type": "bool", + "id": 3 + }, + "dropUnknownFields": { + "type": "bool", + "id": 4 + }, + "state": { + "type": "State", + "id": 5, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + } + }, + "nested": { + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "PERMISSION_DENIED": 2, + "NOT_FOUND": 3, + "SCHEMA_MISMATCH": 4 + } + } + } + }, "ReceivedMessage": { "fields": { "ackId": { diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index a6fa19bdc59..9474093c14c 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -405,8 +405,14 @@ export class SubscriberClient { * field will be `_deleted-topic_` if the topic has been deleted. * @param {google.pubsub.v1.PushConfig} request.pushConfig * If push delivery is used with this subscription, this field is - * used to configure it. An empty `pushConfig` signifies that the subscriber - * will pull and ack messages using API methods. + * used to configure it. Either `pushConfig` or `bigQueryConfig` can be set, + * but not both. If both are empty, then the subscriber will pull and ack + * messages using API methods. + * @param {google.pubsub.v1.BigQueryConfig} request.bigqueryConfig + * If delivery to BigQuery is used with this subscription, this field is + * used to configure it. Either `pushConfig` or `bigQueryConfig` can be set, + * but not both. If both are empty, then the subscriber will pull and ack + * messages using API methods. * @param {number} request.ackDeadlineSeconds * The approximate amount of time (on a best-effort basis) Pub/Sub waits for * the subscriber to acknowledge receipt before resending the message. In the @@ -505,6 +511,9 @@ export class SubscriberClient { * `topic_message_retention_duration` are always available to subscribers. See * the `message_retention_duration` field in `Topic`. This field is set only * in responses from the server; it is ignored if it is set in any requests. + * @param {google.pubsub.v1.Subscription.State} request.state + * Output only. An output-only field indicating whether or not the subscription can receive + * messages. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. From 8da5e0a2e9e0031431a472408665b46d31e8aac0 Mon Sep 17 00:00:00 2001 From: Jakub Borys Date: Tue, 17 May 2022 20:36:11 +0100 Subject: [PATCH 0852/1115] docs: fix #1559 publishMessage return type documentation (#1560) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) Fixes #1559 🦕 --- handwritten/pubsub/src/topic.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 4e8b9464692..03a54c37cb8 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -819,7 +819,7 @@ export class Topic { * ``` * @example If the callback is omitted, we'll return a Promise. * ``` - * const [messageId] = await topic.publishMessage({data}); + * const messageId = await topic.publishMessage({data}); * ``` */ publishMessage(message: MessageOptions): Promise; From f9816bc580b683155dc70fe9500f6600c7c8298c Mon Sep 17 00:00:00 2001 From: sofisl <55454395+sofisl@users.noreply.github.com> Date: Fri, 20 May 2022 12:43:13 -0700 Subject: [PATCH 0853/1115] build!: update library to use Node 12 (#1564) * build!: Update library to use Node 12 Co-authored-by: Owl Bot --- .../pubsub/.github/sync-repo-settings.yaml | 2 +- .../.kokoro/continuous/node10/common.cfg | 34 --- .../pubsub/.kokoro/continuous/node10/docs.cfg | 4 - .../pubsub/.kokoro/continuous/node10/test.cfg | 9 - .../.kokoro/continuous/node8/common.cfg | 24 -- .../pubsub/.kokoro/continuous/node8/test.cfg | 0 .../.kokoro/presubmit/node10/common.cfg | 34 --- .../pubsub/.kokoro/presubmit/node10/docs.cfg | 4 - .../pubsub/.kokoro/presubmit/node10/lint.cfg | 4 - .../pubsub/.kokoro/presubmit/node10/test.cfg | 0 .../pubsub/.kokoro/presubmit/node8/common.cfg | 24 -- .../pubsub/.kokoro/presubmit/node8/test.cfg | 0 handwritten/pubsub/package.json | 12 +- handwritten/pubsub/src/message-queues.ts | 6 +- handwritten/pubsub/test/pubsub.ts | 241 +++++++++--------- handwritten/pubsub/test/subscription.ts | 108 ++++---- handwritten/pubsub/test/topic.ts | 10 +- 17 files changed, 195 insertions(+), 321 deletions(-) delete mode 100644 handwritten/pubsub/.kokoro/continuous/node10/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node10/docs.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node10/test.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node8/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node8/test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node10/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node10/docs.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node10/lint.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node10/test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node8/test.cfg diff --git a/handwritten/pubsub/.github/sync-repo-settings.yaml b/handwritten/pubsub/.github/sync-repo-settings.yaml index 1b36268333a..d1e8b5e6e1a 100644 --- a/handwritten/pubsub/.github/sync-repo-settings.yaml +++ b/handwritten/pubsub/.github/sync-repo-settings.yaml @@ -9,9 +9,9 @@ branchProtectionRules: - "ci/kokoro: System test" - docs - lint - - test (10) - test (12) - test (14) + - test (16) - cla/google - windows - OwlBot Post Processor diff --git a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg b/handwritten/pubsub/.kokoro/continuous/node10/common.cfg deleted file mode 100644 index 894795cb4d4..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node10/common.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/continuous/node10/docs.cfg b/handwritten/pubsub/.kokoro/continuous/node10/docs.cfg deleted file mode 100644 index c8c5ddbe34b..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node10/docs.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/docs.sh" -} diff --git a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg b/handwritten/pubsub/.kokoro/continuous/node10/test.cfg deleted file mode 100644 index 609c0cf0a27..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node10/test.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} diff --git a/handwritten/pubsub/.kokoro/continuous/node8/common.cfg b/handwritten/pubsub/.kokoro/continuous/node8/common.cfg deleted file mode 100644 index 623fa5f5190..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node8/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/continuous/node8/test.cfg b/handwritten/pubsub/.kokoro/continuous/node8/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg deleted file mode 100644 index 894795cb4d4..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node10/common.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Bring in codecov.io token into the build as $KOKORO_KEYSTORE_DIR/73713_dpebot_codecov_token -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/docs.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/docs.cfg deleted file mode 100644 index c8c5ddbe34b..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node10/docs.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/docs.sh" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/lint.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/lint.cfg deleted file mode 100644 index 219d3808dea..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node10/lint.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/lint.sh" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node10/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg deleted file mode 100644 index 623fa5f5190..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node8/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:8-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node8/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8df7d1c88dc..e458284d4c8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "author": "Google Inc.", "engines": { - "node": ">=10" + "node": ">=12.0.0" }, "repository": "googleapis/nodejs-pubsub", "main": "./build/src/index.js", @@ -57,8 +57,8 @@ "@types/long": "^4.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-auth-library": "^7.0.0", - "google-gax": "2.30.4", + "google-auth-library": "^8.0.2", + "google-gax": "^3.0.1", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" @@ -80,12 +80,12 @@ "c8": "^7.0.0", "codecov": "^3.0.0", "execa": "^5.0.0", - "gts": "^2.0.0", + "gts": "^3.1.0", "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", "jsdoc-region-tag": "^1.0.2", "linkinator": "^2.0.0", - "mocha": "^8.0.0", + "mocha": "^9.2.2", "mv": "^2.1.1", "ncp": "^2.0.0", "null-loader": "^4.0.0", @@ -94,7 +94,7 @@ "sinon": "^14.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", - "typescript": "^3.8.3", + "typescript": "^4.6.4", "uuid": "^8.0.0", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index a46e71927ba..e8f43172036 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {CallOptions, grpc} from 'google-gax'; +import {CallOptions, grpc, ServiceError} from 'google-gax'; import defer = require('p-defer'); import {Message, Subscriber} from './subscriber'; @@ -214,7 +214,7 @@ export class AckQueue extends MessageQueue { try { await client.acknowledge(reqOpts, this._options.callOptions!); } catch (e) { - throw new BatchError(e, ackIds, 'acknowledge'); + throw new BatchError(e as ServiceError, ackIds, 'acknowledge'); } } } @@ -258,7 +258,7 @@ export class ModAckQueue extends MessageQueue { try { await client.modifyAckDeadline(reqOpts, this._options.callOptions!); } catch (e) { - throw new BatchError(e, ackIds, 'modifyAckDeadline'); + throw new BatchError(e as ServiceError, ackIds, 'modifyAckDeadline'); } }); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index d908973d5ef..fc35952349f 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -29,7 +29,6 @@ import {Topic} from '../src/topic'; import * as util from '../src/util'; import {Schema, SchemaTypes} from '../src'; import {ISchema, SchemaViews} from '../src/schema'; - // eslint-disable-next-line @typescript-eslint/no-var-requires const PKG = require('../../package.json'); const sandbox = sinon.createSandbox(); @@ -150,7 +149,7 @@ describe('PubSub', () => { let PubSub: typeof pubsubTypes.PubSub; const PROJECT_ID = 'test-project'; - let pubsub: pubsubTypes.PubSub; + let pubsub: Partial; const OPTIONS = { projectId: PROJECT_ID, } as pubsubTypes.ClientConfig; @@ -272,7 +271,7 @@ describe('PubSub', () => { }); it('should not be in the opened state after close()', async () => { - await pubsub.close(); + await pubsub.close?.(); assert.strictEqual(pubsub.isOpen, false); }); @@ -340,13 +339,13 @@ describe('PubSub', () => { it('should throw if no Topic is provided', async () => { await assert.rejects(async () => { - await pubsub.createSubscription(undefined!, undefined!); + await pubsub.createSubscription?.(undefined!, undefined!); }, /A Topic is required for a new subscription\./); }); it('should throw if no subscription name is provided', async () => { await assert.rejects(async () => { - await pubsub.createSubscription(TOPIC_NAME, undefined!); + await pubsub.createSubscription?.(TOPIC_NAME, undefined!); }, /A subscription name is required./); }); @@ -355,7 +354,7 @@ describe('PubSub', () => { callback(null, apiResponse); }; - pubsub.createSubscription(TOPIC, SUB_NAME, done); + pubsub.createSubscription?.(TOPIC, SUB_NAME, done); }); it('should allow undefined/optional configuration options', done => { @@ -377,7 +376,7 @@ describe('PubSub', () => { setImmediate(done); return SUBSCRIPTION as subby.Subscription; }; - pubsub.createSubscription(TOPIC, SUB_NAME, opts, assert.ifError); + pubsub.createSubscription?.(TOPIC, SUB_NAME, opts, assert.ifError); }); it('should create a Topic object from a string', done => { @@ -389,7 +388,7 @@ describe('PubSub', () => { return TOPIC; }; - pubsub.createSubscription(TOPIC_NAME, SUB_NAME, assert.ifError); + pubsub.createSubscription?.(TOPIC_NAME, SUB_NAME, assert.ifError); }); it('should send correct request', done => { @@ -418,7 +417,7 @@ describe('PubSub', () => { done(); }; - pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); + pubsub.createSubscription?.(TOPIC, SUB_NAME, options, assert.ifError); }); it('should pass options to the api request', done => { @@ -450,7 +449,7 @@ describe('PubSub', () => { done(); }; - pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); + pubsub.createSubscription?.(TOPIC, SUB_NAME, options, assert.ifError); }); it('should discard flow control options', done => { @@ -481,7 +480,7 @@ describe('PubSub', () => { done(); }; - pubsub.createSubscription(TOPIC, SUB_NAME, options, assert.ifError); + pubsub.createSubscription?.(TOPIC, SUB_NAME, options, assert.ifError); }); it('should format the metadata', done => { @@ -500,7 +499,12 @@ describe('PubSub', () => { done(); }; - pubsub.createSubscription(TOPIC, SUB_NAME, fakeMetadata, assert.ifError); + pubsub.createSubscription?.( + TOPIC, + SUB_NAME, + fakeMetadata, + assert.ifError + ); }); describe('error', () => { @@ -529,7 +533,7 @@ describe('PubSub', () => { done(); } - pubsub.createSubscription(TOPIC_NAME, SUB_NAME, callback); + pubsub.createSubscription?.(TOPIC_NAME, SUB_NAME, callback); }); }); @@ -563,7 +567,7 @@ describe('PubSub', () => { done(); } - pubsub.createSubscription(TOPIC_NAME, SUB_NAME, callback); + pubsub.createSubscription?.(TOPIC_NAME, SUB_NAME, callback); }); }); }); @@ -605,7 +609,7 @@ describe('PubSub', () => { }); it('should return an error & API response', done => { - pubsub.createTopic('new-topic', (err, topic, apiResponse_) => { + pubsub.createTopic?.('new-topic', (err, topic, apiResponse_) => { assert.strictEqual(err, error); assert.strictEqual(topic, null); assert.strictEqual(apiResponse_, apiResponse); @@ -632,7 +636,7 @@ describe('PubSub', () => { return topicInstance as Topic; }; - pubsub.createTopic(topicName, (err, topic) => { + pubsub.createTopic?.(topicName, (err, topic) => { assert.ifError(err); assert.strictEqual(topic, topicInstance); done(); @@ -640,7 +644,7 @@ describe('PubSub', () => { }); it('should pass apiResponse to callback', done => { - pubsub.createTopic('new-topic', (err, topic, apiResponse_) => { + pubsub.createTopic?.('new-topic', (err, topic, apiResponse_) => { assert.ifError(err); assert.strictEqual(apiResponse_, apiResponse); done(); @@ -659,7 +663,7 @@ describe('PubSub', () => { it('should throw if no subscription name is provided', async () => { await assert.rejects(async () => { - await pubsub.detachSubscription(undefined!); + await pubsub.detachSubscription?.(undefined!); }, /A subscription name is required./); }); @@ -668,7 +672,7 @@ describe('PubSub', () => { .stub(pubsub, 'request') .callsArgOnWith(1, undefined, undefined, apiResponse); - pubsub.detachSubscription(SUB_NAME, (err, response) => { + pubsub.detachSubscription?.(SUB_NAME, (err, response) => { assert.strictEqual(response, apiResponse); done(); }); @@ -679,7 +683,7 @@ describe('PubSub', () => { .stub(pubsub, 'request') .callsArgOnWith(1, undefined, undefined, apiResponse); - pubsub.detachSubscription(SUB_NAME, undefined!, (_err, _response) => { + pubsub.detachSubscription?.(SUB_NAME, undefined!, (_err, _response) => { assert.strictEqual(_response, apiResponse); done(); }); @@ -692,7 +696,7 @@ describe('PubSub', () => { return SUBSCRIPTION as subby.Subscription; }); - await pubsub.detachSubscription(SUB_NAME); + await pubsub.detachSubscription?.(SUB_NAME); }); it('should send correct request', done => { @@ -713,7 +717,7 @@ describe('PubSub', () => { done(); }); - pubsub.detachSubscription(SUB_NAME, options, assert.ifError); + pubsub.detachSubscription?.(SUB_NAME, options, assert.ifError); }); it('should pass options to the api request', done => { @@ -732,7 +736,7 @@ describe('PubSub', () => { done(); }); - pubsub.detachSubscription(SUB_NAME, options, assert.ifError); + pubsub.detachSubscription?.(SUB_NAME, options, assert.ifError); }); }); @@ -755,10 +759,10 @@ describe('PubSub', () => { }); it('should do nothing if correct options are not set', () => { - pubsub.determineBaseUrl_(); + pubsub.determineBaseUrl_?.(); - assert.strictEqual(pubsub.options.servicePath, undefined); - assert.strictEqual(pubsub.options.port, undefined); + assert.strictEqual(pubsub.options?.servicePath, undefined); + assert.strictEqual(pubsub.options?.port, undefined); }); it('should use the apiEndpoint option', () => { @@ -766,10 +770,10 @@ describe('PubSub', () => { const testingUrl = 'localhost:8085'; setHost(defaultBaseUrl_); - pubsub.options.apiEndpoint = testingUrl; - pubsub.determineBaseUrl_(); + pubsub!.options!.apiEndpoint = testingUrl; + pubsub.determineBaseUrl_?.(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); + assert.strictEqual(pubsub.options?.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, 8085); assert.strictEqual(pubsub.options.sslCreds, fakeCreds); assert.strictEqual(pubsub.isEmulator, true); @@ -777,34 +781,34 @@ describe('PubSub', () => { it('should remove slashes from the baseUrl', () => { setHost('localhost:8080/'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); + pubsub.determineBaseUrl_?.(); + assert.strictEqual(pubsub.options?.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, 8080); setHost('localhost:8081//'); - pubsub.determineBaseUrl_(); + pubsub.determineBaseUrl_?.(); assert.strictEqual(pubsub.options.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, 8081); }); it('should set the port to undefined if not set', () => { setHost('localhost'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); + pubsub.determineBaseUrl_?.(); + assert.strictEqual(pubsub.options?.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, undefined); }); it('should set the port to 80 for http with no port specified', () => { setHost('http://localhost/'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); - assert.strictEqual(pubsub.options.port, 80); + pubsub.determineBaseUrl_?.(); + assert.strictEqual(pubsub.options?.servicePath, 'localhost'); + assert.strictEqual(pubsub.options?.port, 80); }); it('should set the port to 443 for https with no port specified', () => { setHost('https://localhost/'); - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); + pubsub.determineBaseUrl_?.(); + assert.strictEqual(pubsub.options?.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, 443); }); @@ -817,9 +821,9 @@ describe('PubSub', () => { }; setHost('localhost'); - pubsub.options.grpc = fakeGrpc as unknown as typeof gax.grpc; - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.sslCreds, fakeCredentials); + pubsub!.options!.grpc = fakeGrpc as unknown as typeof gax.grpc; + pubsub.determineBaseUrl_?.(); + assert.strictEqual(pubsub.options?.sslCreds, fakeCredentials); }); // This tests both the EMULATOR environment variable and detecting @@ -836,8 +840,8 @@ describe('PubSub', () => { }); it('should use the PUBSUB_EMULATOR_HOST env var', () => { - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, 'localhost'); + pubsub.determineBaseUrl_?.(); + assert.strictEqual(pubsub.options?.servicePath, 'localhost'); assert.strictEqual(pubsub.options.port, 9090); assert.strictEqual(pubsub.isEmulator, true); }); @@ -858,9 +862,9 @@ describe('PubSub', () => { }); it('should use the CLOUDSDK_API_ENDPOINT_OVERRIDES_PUBSUB env var', () => { - pubsub.determineBaseUrl_(); - assert.strictEqual(pubsub.options.servicePath, server); - assert.strictEqual(pubsub.options.port, 443); + pubsub.determineBaseUrl_?.(); + assert.strictEqual(pubsub.options?.servicePath, server); + assert.strictEqual(pubsub.options?.port, 443); assert.strictEqual(pubsub.isEmulator, false); assert.strictEqual(pubsub.options.sslCreds, undefined); }); @@ -878,11 +882,11 @@ describe('PubSub', () => { }); it('should accept a query and a callback', done => { - pubsub.getSnapshots({}, done); + pubsub.getSnapshots?.({}, done); }); it('should accept just a callback', done => { - pubsub.getSnapshots(done); + pubsub.getSnapshots?.(done); }); it('should build the right request', done => { @@ -917,7 +921,7 @@ describe('PubSub', () => { done(); }; - pubsub.getSnapshots(options, assert.ifError); + pubsub.getSnapshots?.(options, assert.ifError); }); it('should return Snapshot instances with metadata', done => { @@ -929,7 +933,7 @@ describe('PubSub', () => { }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - pubsub.getSnapshots((err: any, snapshots: any) => { + pubsub.getSnapshots?.((err: any, snapshots: any) => { assert.ifError(err); assert.strictEqual(snapshots![0], snapshot); assert.strictEqual( @@ -951,7 +955,7 @@ describe('PubSub', () => { callback(err_, snapshots_, nextQuery_, apiResponse_); }; - pubsub.getSnapshots((err, snapshots, apiResponse) => { + pubsub.getSnapshots?.((err, snapshots, apiResponse) => { assert.strictEqual(err, err_); assert.deepStrictEqual(snapshots, snapshots_); assert.strictEqual(apiResponse, nextQuery_); @@ -970,11 +974,11 @@ describe('PubSub', () => { }); it('should accept a query and a callback', done => { - pubsub.getSubscriptions({}, done); + pubsub.getSubscriptions?.({}, done); }); it('should accept just a callback', done => { - pubsub.getSubscriptions(done); + pubsub.getSubscriptions?.(done); }); it('should pass the correct arguments to the API', done => { @@ -1002,7 +1006,7 @@ describe('PubSub', () => { done(); }; - pubsub.getSubscriptions(options, assert.ifError); + pubsub.getSubscriptions?.(options, assert.ifError); }); it('should pass options to API request', done => { @@ -1017,11 +1021,11 @@ describe('PubSub', () => { done(); }; - pubsub.getSubscriptions(opts, assert.ifError); + pubsub.getSubscriptions?.(opts, assert.ifError); }); it('should return Subscription instances', done => { - pubsub.getSubscriptions( + pubsub.getSubscriptions?.( ( err: gax.grpc.ServiceError | null, subscriptions?: subby.Subscription[] | null @@ -1043,7 +1047,7 @@ describe('PubSub', () => { callback(err_, subs_, nextQuery_, apiResponse_); }; - pubsub.getSubscriptions( + pubsub.getSubscriptions?.( ( err: gax.grpc.ServiceError | null, subs?: subby.Subscription[] | null, @@ -1072,7 +1076,7 @@ describe('PubSub', () => { done(); }; - pubsub.getSubscriptions(opts, assert.ifError); + pubsub.getSubscriptions?.(opts, assert.ifError); }); it('should create a topic instance from a name', done => { @@ -1092,7 +1096,7 @@ describe('PubSub', () => { return fakeTopic as Topic; }; - pubsub.getSubscriptions(opts, assert.ifError); + pubsub.getSubscriptions?.(opts, assert.ifError); }); }); }); @@ -1108,11 +1112,11 @@ describe('PubSub', () => { }); it('should accept a query and a callback', done => { - pubsub.getTopics({}, done); + pubsub.getTopics?.({}, done); }); it('should accept just a callback', done => { - pubsub.getTopics(done); + pubsub.getTopics?.(done); }); it('should build the right request', done => { @@ -1147,7 +1151,7 @@ describe('PubSub', () => { done(); }; - pubsub.getTopics(options, assert.ifError); + pubsub.getTopics?.(options, assert.ifError); }); it('should return Topic instances with metadata', done => { @@ -1159,7 +1163,7 @@ describe('PubSub', () => { }; // eslint-disable-next-line @typescript-eslint/no-explicit-any - pubsub.getTopics((err: any, topics: any) => { + pubsub.getTopics?.((err: any, topics: any) => { assert.ifError(err); assert.strictEqual(topics![0], topic); // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -1178,7 +1182,7 @@ describe('PubSub', () => { callback(err_, topics_, nextQuery_, apiResponse_); }; - pubsub.getTopics((err, topics, apiResponse) => { + pubsub.getTopics?.((err, topics, apiResponse) => { assert.strictEqual(err, err_); assert.deepStrictEqual(topics, topics_); assert.strictEqual(apiResponse, nextQuery_); @@ -1210,10 +1214,10 @@ describe('PubSub', () => { }); it('should throw if the PubSub is already closed', done => { - pubsub.close((err: Error | null) => { + pubsub.close?.((err: Error | null) => { assert.strictEqual(err, null); - pubsub.request(CONFIG, (errInner: Error | null) => { + pubsub.request?.(CONFIG, (errInner: Error | null) => { assert.notStrictEqual(errInner, null); assert.strictEqual( errInner!.message.indexOf('closed PubSub object') >= 0, @@ -1230,7 +1234,7 @@ describe('PubSub', () => { done(); }; - pubsub.request(CONFIG, assert.ifError); + pubsub.request?.(CONFIG, assert.ifError); }); it('should return error from getClient_', done => { @@ -1239,7 +1243,7 @@ describe('PubSub', () => { callback(expectedError); }; - pubsub.request(CONFIG, (err: gax.grpc.ServiceError | null) => { + pubsub.request?.(CONFIG, (err: gax.grpc.ServiceError | null) => { assert.strictEqual(expectedError, err); done(); }); @@ -1260,7 +1264,7 @@ describe('PubSub', () => { pubsub.getClient_ = (config, callback: Function) => { callback(null, fakeClient); }; - pubsub.request(CONFIG, assert.ifError); + pubsub.request?.(CONFIG, assert.ifError); }); it('should replace the project id token on reqOpts', done => { @@ -1270,12 +1274,11 @@ describe('PubSub', () => { assert.strictEqual(projectId, PROJECT_ID); done(); }; - pubsub.request(CONFIG, assert.ifError); + pubsub.request?.(CONFIG, assert.ifError); }); }); describe('getClientAsync_', () => { - // eslint-disable-next-line @typescript-eslint/class-name-casing const FAKE_CLIENT_INSTANCE = class { close() {} }; @@ -1293,11 +1296,11 @@ describe('PubSub', () => { describe('closeAllClients_', () => { it('should close out any open client', async () => { // Create a client that we'll close. - const client = await pubsub.getClientAsync_(CONFIG); + const client = await pubsub!.getClientAsync_!(CONFIG); // Stub out its close method, and verify it gets called. const stub = sandbox.stub(client, 'close').resolves(); - await pubsub.closeAllClients_(); + await pubsub.closeAllClients_?.(); assert.strictEqual(stub.called, true); }); @@ -1310,29 +1313,29 @@ describe('PubSub', () => { }); it('should get and cache the project ID', async () => { - sandbox.stub(pubsub.auth, 'getProjectId').resolves(PROJECT_ID); + sandbox.stub(pubsub!.auth!, 'getProjectId').resolves(PROJECT_ID); - await pubsub.getClientAsync_(CONFIG); + await pubsub.getClientAsync_?.(CONFIG); assert.strictEqual(pubsub.projectId, PROJECT_ID); - assert.strictEqual(pubsub.options.projectId, PROJECT_ID); + assert.strictEqual(pubsub.options?.projectId, PROJECT_ID); }); it('should get the project ID if placeholder', async () => { pubsub.projectId = '{{projectId}}'; - sandbox.stub(pubsub.auth, 'getProjectId').resolves(PROJECT_ID); + sandbox.stub(pubsub!.auth!, 'getProjectId').resolves(PROJECT_ID); - await pubsub.getClientAsync_(CONFIG); + await pubsub.getClientAsync_?.(CONFIG); assert.strictEqual(pubsub.projectId, PROJECT_ID); }); it('should return auth errors that occur', async () => { const error = new Error('err'); - sandbox.stub(pubsub.auth, 'getProjectId').rejects(error); + sandbox.stub(pubsub!.auth!, 'getProjectId').rejects(error); try { - await pubsub.getClientAsync_(CONFIG); + await pubsub.getClientAsync_?.(CONFIG); throw new Error('getClientAsync_ should have thrown an error'); } catch (e) { assert.strictEqual(e, error); @@ -1343,9 +1346,9 @@ describe('PubSub', () => { pubsub.isEmulator = true; const error = new Error('err'); - sandbox.stub(pubsub.auth, 'getProjectId').rejects(error); + sandbox.stub(pubsub!.auth!, 'getProjectId').rejects(error); - await pubsub.getClientAsync_(CONFIG); + await pubsub.getClientAsync_?.(CONFIG); assert.strictEqual(pubsub.projectId, ''); }); @@ -1353,14 +1356,14 @@ describe('PubSub', () => { pubsub.projectId = PROJECT_ID; const error = new Error('getProjectId should not be called.'); - sandbox.stub(pubsub.auth, 'getProjectId').rejects(error); + sandbox.stub(pubsub!.auth!, 'getProjectId').rejects(error); - await pubsub.getClientAsync_(CONFIG); + await pubsub.getClientAsync_?.(CONFIG); }); }); it('should cache the client', async () => { - delete pubsub.api.fakeClient; + delete pubsub.api?.fakeClient; let numTimesFakeClientInstantiated = 0; @@ -1370,10 +1373,10 @@ describe('PubSub', () => { return FAKE_CLIENT_INSTANCE; }; - await pubsub.getClientAsync_(CONFIG); - assert.strictEqual(pubsub.api.FakeClient, FAKE_CLIENT_INSTANCE); + await pubsub.getClientAsync_?.(CONFIG); + assert.strictEqual(pubsub.api?.FakeClient, FAKE_CLIENT_INSTANCE); - await pubsub.getClientAsync_(CONFIG); + await pubsub.getClientAsync_?.(CONFIG); assert.strictEqual(numTimesFakeClientInstantiated, 1); }); @@ -1386,7 +1389,7 @@ describe('PubSub', () => { return FAKE_CLIENT_INSTANCE; }; - const client = await pubsub.getClientAsync_(CONFIG); + const client = await pubsub.getClientAsync_?.(CONFIG); assert.strictEqual(client, FAKE_CLIENT_INSTANCE); }); }); @@ -1403,7 +1406,7 @@ describe('PubSub', () => { .withArgs(CONFIG) .resolves(FAKE_CLIENT_INSTANCE); - pubsub.getClient_(CONFIG, (err, client) => { + pubsub.getClient_?.(CONFIG, (err, client) => { assert.ifError(err); assert.strictEqual(client, FAKE_CLIENT_INSTANCE); done(); @@ -1414,7 +1417,7 @@ describe('PubSub', () => { const error = new Error('err'); sandbox.stub(pubsub, 'getClientAsync_').rejects(error); - pubsub.getClient_(CONFIG, err => { + pubsub.getClient_?.(CONFIG, err => { assert.strictEqual(err, error); done(); }); @@ -1450,7 +1453,7 @@ describe('PubSub', () => { done(); }; - pubsub.request(CONFIG, assert.ifError); + pubsub.request?.(CONFIG, assert.ifError); }); it('should return error from getting the client', done => { @@ -1460,7 +1463,7 @@ describe('PubSub', () => { callback(error); }; - pubsub.request(CONFIG, (err: gax.ServiceError | null) => { + pubsub.request?.(CONFIG, (err: gax.ServiceError | null) => { assert.strictEqual(err, error); done(); }); @@ -1474,7 +1477,7 @@ describe('PubSub', () => { done(); }; - pubsub.request(CONFIG, assert.ifError); + pubsub.request?.(CONFIG, assert.ifError); }); it('should call the client method correctly', done => { @@ -1504,7 +1507,7 @@ describe('PubSub', () => { callback(null, fakeClient); }; - pubsub.request(CONFIG, assert.ifError); + pubsub.request?.(CONFIG, assert.ifError); }); }); @@ -1518,7 +1521,7 @@ describe('PubSub', () => { it('should return a Snapshot object', () => { const SNAPSHOT_NAME = 'new-snapshot'; - const snapshot = pubsub.snapshot(SNAPSHOT_NAME); + const snapshot = pubsub.snapshot?.(SNAPSHOT_NAME); const args = (snapshot as {} as FakeSnapshot).calledWith_; assert(snapshot instanceof FakeSnapshot); @@ -1534,7 +1537,7 @@ describe('PubSub', () => { it('should return a Subscription object', () => { // tslint:disable-next-line only-arrow-functions subscriptionOverride = function () {}; - const subscription = pubsub.subscription(SUB_NAME, {}); + const subscription = pubsub.subscription?.(SUB_NAME, {}); assert(subscription instanceof subscriptionOverride); }); @@ -1547,7 +1550,7 @@ describe('PubSub', () => { assert.strictEqual(name, SUB_NAME); done(); }; - pubsub.subscription(SUB_NAME); + pubsub.subscription?.(SUB_NAME); }); it('should honor settings', done => { @@ -1560,7 +1563,7 @@ describe('PubSub', () => { assert.strictEqual(options, CONFIG); done(); }; - pubsub.subscription(SUB_NAME, CONFIG); + pubsub.subscription?.(SUB_NAME, CONFIG); }); it('should throw if a name is not provided', () => { @@ -1580,13 +1583,13 @@ describe('PubSub', () => { }); it('should return a Topic object', () => { - assert(pubsub.topic('new-topic') instanceof FakeTopic); + assert(pubsub.topic?.('new-topic') instanceof FakeTopic); }); it('should pass the correct args', () => { const fakeName = 'with-options'; const fakeOptions = {}; - const topic = pubsub.topic(fakeName, fakeOptions); + const topic = pubsub.topic?.(fakeName, fakeOptions); const [ps, name, options] = (topic as {} as FakeTopic).calledWith_; @@ -1605,9 +1608,9 @@ describe('PubSub', () => { it('should close the schema client when it has been opened', async () => { // Force it to create a client. - const client = await pubsub.getSchemaClient_(); - sandbox.stub(client, 'close').resolves(); - await pubsub.close(); + const client = await pubsub.getSchemaClient_?.(); + sandbox.stub(client!, 'close').resolves(); + await pubsub.close?.(); }); // I feel like this ought to be a test, but something in getSchemaClient_() @@ -1623,10 +1626,10 @@ describe('PubSub', () => { const schemaId = 'id'; const type = SchemaTypes.Avro; const definition = 'def'; - const name = Schema.formatName_(pubsub.projectId, schemaId); + const name = Schema.formatName_(pubsub.projectId!, schemaId); // Grab the schema client it'll be using so we can stub it. - const client = await pubsub.getSchemaClient_(); + const client = await pubsub.getSchemaClient_!(); const def = defer(); sandbox.stub(client, 'createSchema').callsFake(req => { assert.strictEqual(req.parent, pubsub.name); @@ -1637,7 +1640,7 @@ describe('PubSub', () => { def.resolve(); }); const result = await Promise.all([ - pubsub.createSchema(schemaId, type, definition), + pubsub.createSchema!(schemaId, type, definition), def, ]); assert.strictEqual(result[0].id, schemaId); @@ -1645,7 +1648,7 @@ describe('PubSub', () => { it('calls down to listSchemas correctly', async () => { // Grab the schema client it'll be using so we can stub it. - const client = await pubsub.getSchemaClient_(); + const client = await pubsub.getSchemaClient_!(); sandbox.stub(client, 'listSchemasAsync').callsFake((req, gaxOpts) => { assert.strictEqual(req!.parent, pubsub.name); @@ -1663,7 +1666,7 @@ describe('PubSub', () => { }); const ids = [] as string[]; - for await (const s of pubsub.listSchemas(SchemaViews.Basic, {})) { + for await (const s of pubsub.listSchemas!(SchemaViews.Basic, {})) { ids.push(s.name!); } @@ -1673,30 +1676,30 @@ describe('PubSub', () => { it('defaults to BASIC for listSchemas', async () => { // Grab the schema client it'll be using so we can stub it. - const client = await pubsub.getSchemaClient_(); + const client = await pubsub.getSchemaClient_?.(); - sandbox.stub(client, 'listSchemasAsync').callsFake(req => { + sandbox.stub(client!, 'listSchemasAsync').callsFake(req => { assert.strictEqual(req!.view, 'BASIC'); // eslint-disable-next-line @typescript-eslint/no-explicit-any return toAsync([]) as any; }); // eslint-disable-next-line @typescript-eslint/no-unused-vars - for await (const s of pubsub.listSchemas()) { + for await (const s of pubsub.listSchemas!()) { break; } }); it('returns a proper Schema object from schema()', async () => { - const schema = pubsub.schema('foo'); - assert.strictEqual(schema.id, 'foo'); + const schema = pubsub.schema?.('foo'); + assert.strictEqual(schema!.id, 'foo'); - const name = await schema.getName(); - assert.strictEqual(name, Schema.formatName_(pubsub.projectId, 'foo')); + const name = await schema!.getName(); + assert.strictEqual(name, Schema.formatName_(pubsub!.projectId!, 'foo')); }); it('calls validateSchema() on the client when validateSchema() is called', async () => { - const client = await pubsub.getSchemaClient_(); + const client = await pubsub.getSchemaClient_!(); const ischema: ISchema = { name: 'test', type: SchemaTypes.Avro, @@ -1713,7 +1716,7 @@ describe('PubSub', () => { called = true; }); - await pubsub.validateSchema(ischema, {}); + await pubsub.validateSchema!(ischema, {}); assert.ok(called); }); }); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index a5699b8a1a6..1fdaa36f91e 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -95,7 +95,7 @@ class FakeSubscriber extends EventEmitter { describe('Subscription', () => { // tslint:disable-next-line variable-name let Subscription: typeof subby.Subscription; - let subscription: subby.Subscription; + let subscription: Partial; const PROJECT_ID = 'test-project'; const SUB_NAME = 'test-subscription'; @@ -183,7 +183,7 @@ describe('Subscription', () => { it('should open the subscriber when a listener is attached', () => { const stub = sandbox.stub(subscriber, 'open'); - subscription.on('message', () => {}); + subscription.on?.('message', () => {}); assert.strictEqual(stub.callCount, 1); }); @@ -191,8 +191,8 @@ describe('Subscription', () => { const stub = sandbox.stub(subscriber, 'close'); const cb = () => {}; - subscription.on('message', cb); - subscription.removeListener('message', cb); + subscription.on?.('message', cb); + subscription.removeListener?.('message', cb); assert.strictEqual(stub.callCount, 1); }); @@ -200,7 +200,7 @@ describe('Subscription', () => { it('should emit messages', done => { const message = {}; - subscription.on('message', (msg: Message) => { + subscription.on?.('message', (msg: Message) => { assert.strictEqual(msg, message); done(); }); @@ -211,7 +211,7 @@ describe('Subscription', () => { it('should emit errors', done => { const error = new Error('err'); - subscription.on('error', (err: Error) => { + subscription.on?.('error', (err: Error) => { assert.strictEqual(err, error); done(); }); @@ -220,7 +220,7 @@ describe('Subscription', () => { }); it('should emit close events', done => { - subscription.on('close', done); + subscription.on?.('close', done); subscriber.emit('close'); }); }); @@ -330,7 +330,7 @@ describe('Subscription', () => { describe('close', () => { it('should call the success callback', done => { sandbox.stub(subscriber, 'close').resolves(); - subscription.close(done); + subscription.close?.(done); }); it('should pass back any errors that occurs', done => { @@ -338,7 +338,7 @@ describe('Subscription', () => { sandbox.stub(subscriber, 'close').rejects(fakeErr); - subscription.close(err => { + subscription!.close!((err: Error | undefined) => { assert.strictEqual(err, fakeErr); done(); }); @@ -356,14 +356,14 @@ describe('Subscription', () => { const expectedError = /Subscriptions can only be created when accessed through Topics/; delete subscription.topic; - await assert.rejects(subscription.create(), expectedError); + await assert.rejects(subscription.create!(), expectedError); }); it('should pass the correct params', () => { const fakeOptions = {}; const stub = sandbox.stub(PUBSUB, 'createSubscription'); - subscription.create(fakeOptions, assert.ifError); + subscription.create?.(fakeOptions, assert.ifError); const [topic, name, options] = stub.lastCall.args; assert.strictEqual(topic, TOPIC_NAME); @@ -374,7 +374,7 @@ describe('Subscription', () => { it('should optionally accept options', () => { const stub = sandbox.stub(PUBSUB, 'createSubscription'); - subscription.create(assert.ifError); + subscription.create?.(assert.ifError); const options = stub.lastCall.args[2]; assert.deepStrictEqual(options, {}); @@ -385,7 +385,7 @@ describe('Subscription', () => { const fakeResponse = {}; const stub = sandbox.stub(PUBSUB, 'createSubscription'); - subscription.create((err, sub, resp) => { + subscription.create?.((err, sub, resp) => { assert.strictEqual(err, fakeErr); assert.strictEqual(sub, null); assert.strictEqual(resp, fakeResponse); @@ -401,7 +401,7 @@ describe('Subscription', () => { const fakeSub = new Subscription(PUBSUB, SUB_FULL_NAME); const fakeResponse = {}; - subscription.create(err => { + subscription.create?.(err => { assert.ifError(err); assert.strictEqual(subscription.metadata, fakeResponse); done(); @@ -416,7 +416,7 @@ describe('Subscription', () => { const fakeResponse = {}; const stub = sandbox.stub(PUBSUB, 'createSubscription'); - subscription.create((err, sub, resp) => { + subscription.create?.((err, sub, resp) => { assert.ifError(err); assert.strictEqual(sub, subscription); assert.strictEqual(resp, fakeResponse); @@ -457,7 +457,7 @@ describe('Subscription', () => { done(); }; - subscription.createSnapshot(SNAPSHOT_NAME, assert.ifError); + subscription.createSnapshot?.(SNAPSHOT_NAME, assert.ifError); }); it('should optionally accept gax options', done => { @@ -468,7 +468,7 @@ describe('Subscription', () => { done(); }; - subscription.createSnapshot(SNAPSHOT_NAME, gaxOpts, assert.ifError); + subscription.createSnapshot?.(SNAPSHOT_NAME, gaxOpts, assert.ifError); }); it('should pass back any errors to the callback', done => { @@ -479,7 +479,7 @@ describe('Subscription', () => { callback(error, apiResponse); }; - subscription.createSnapshot(SNAPSHOT_NAME, (err, snapshot, resp) => { + subscription.createSnapshot?.(SNAPSHOT_NAME, (err, snapshot, resp) => { assert.strictEqual(err, error); assert.strictEqual(snapshot, null); assert.strictEqual(resp, apiResponse); @@ -499,7 +499,7 @@ describe('Subscription', () => { callback(null, apiResponse); }; - subscription.createSnapshot(SNAPSHOT_NAME, (err, snapshot, resp) => { + subscription.createSnapshot?.(SNAPSHOT_NAME, (err, snapshot, resp) => { assert.ifError(err); assert.strictEqual(snapshot, fakeSnapshot); assert.strictEqual(snapshot!.metadata, apiResponse); @@ -519,7 +519,7 @@ describe('Subscription', () => { }); it('should return the debug events to the callback', done => { - subscription.on('debug', err => { + subscription.on?.('debug', err => { assert.strictEqual(err, error); done(); }); @@ -544,7 +544,7 @@ describe('Subscription', () => { done(); }; - subscription.delete(assert.ifError); + subscription.delete?.(assert.ifError); }); it('should optionally accept gax options', done => { @@ -555,7 +555,7 @@ describe('Subscription', () => { done(); }; - subscription.delete(gaxOpts, assert.ifError); + subscription.delete?.(gaxOpts, assert.ifError); }); describe('success', () => { @@ -568,7 +568,7 @@ describe('Subscription', () => { }); it('should return the api response', done => { - subscription.delete((err, resp) => { + subscription.delete?.((err, resp) => { assert.ifError(err); assert.strictEqual(resp, apiResponse); done(); @@ -578,9 +578,9 @@ describe('Subscription', () => { it('should close the subscriber if open', done => { const stub = sandbox.stub(subscriber, 'close'); - subscription.open(); + subscription.open?.(); - subscription.delete(err => { + subscription.delete?.(err => { assert.ifError(err); assert.strictEqual(stub.callCount, 1); done(); @@ -598,7 +598,7 @@ describe('Subscription', () => { }); it('should return the error to the callback', done => { - subscription.delete(err => { + subscription.delete?.(err => { assert.strictEqual(err, error); done(); }); @@ -610,7 +610,7 @@ describe('Subscription', () => { done(new Error('Should not be called.')); }; - subscription.delete(() => { + subscription.delete?.(() => { done(); }); }); @@ -620,7 +620,7 @@ describe('Subscription', () => { done(new Error('Should not be called.')); }; - subscription.delete(() => { + subscription.delete?.(() => { done(); }); }); @@ -631,7 +631,7 @@ describe('Subscription', () => { it('should return true if it finds metadata', done => { sandbox.stub(subscription, 'getMetadata').yields(null, {}); - subscription.exists((err, exists) => { + subscription.exists?.((err, exists) => { assert.ifError(err); assert(exists); done(); @@ -642,7 +642,7 @@ describe('Subscription', () => { const error = {code: 5} as ServiceError; sandbox.stub(subscription, 'getMetadata').yields(error); - subscription.exists((err, exists) => { + subscription.exists?.((err, exists) => { assert.ifError(err); assert.strictEqual(exists, false); done(); @@ -653,7 +653,7 @@ describe('Subscription', () => { const error = {code: 4} as ServiceError; sandbox.stub(subscription, 'getMetadata').yields(error); - subscription.exists((err, exists) => { + subscription.exists?.((err, exists) => { assert.strictEqual(err, error); assert.strictEqual(exists, undefined); done(); @@ -674,7 +674,7 @@ describe('Subscription', () => { done(); }); - subscription.get(options, assert.ifError); + subscription.get?.(options, assert.ifError); }); describe('success', () => { @@ -687,7 +687,7 @@ describe('Subscription', () => { callback(null, fakeMetadata); }); - subscription.get((err, sub, resp) => { + subscription.get?.((err, sub, resp) => { assert.ifError(err); assert.strictEqual(sub, subscription); assert.strictEqual(resp, fakeMetadata); @@ -704,7 +704,7 @@ describe('Subscription', () => { callback(null); // the done fn }); - subscription.get(options, done); + subscription.get?.(options, done); }); }); @@ -716,7 +716,7 @@ describe('Subscription', () => { .stub(subscription, 'getMetadata') .callsArgWith(1, error, apiResponse); - subscription.get((err, sub, resp) => { + subscription.get?.((err, sub, resp) => { assert.strictEqual(err, error); assert.strictEqual(sub, null); assert.strictEqual(resp, apiResponse); @@ -731,7 +731,7 @@ describe('Subscription', () => { .stub(subscription, 'getMetadata') .callsArgWith(1, error, apiResponse); - subscription.get((err, sub, resp) => { + subscription.get?.((err, sub, resp) => { assert.strictEqual(err, error); assert.strictEqual(sub, null); assert.strictEqual(resp, apiResponse); @@ -748,7 +748,7 @@ describe('Subscription', () => { delete subscription.create; - subscription.get((err, sub, resp) => { + subscription.get?.((err, sub, resp) => { assert.strictEqual(err, error); assert.strictEqual(sub, null); assert.strictEqual(resp, apiResponse); @@ -773,7 +773,7 @@ describe('Subscription', () => { }); subscription.topic = 'hi-ho-silver'; - subscription.get(fakeOptions, assert.ifError); + subscription.get?.(fakeOptions, assert.ifError); }); }); }); @@ -789,7 +789,7 @@ describe('Subscription', () => { done(); }; - subscription.getMetadata(assert.ifError); + subscription.getMetadata?.(assert.ifError); }); it('should optionally accept gax options', done => { @@ -800,7 +800,7 @@ describe('Subscription', () => { done(); }; - subscription.getMetadata(gaxOpts, assert.ifError); + subscription.getMetadata?.(gaxOpts, assert.ifError); }); it('should pass back any errors that occur', done => { @@ -811,7 +811,7 @@ describe('Subscription', () => { callback(error, apiResponse); }; - subscription.getMetadata((err, metadata) => { + subscription.getMetadata?.((err, metadata) => { assert.strictEqual(err, error); assert.strictEqual(metadata, apiResponse); done(); @@ -825,7 +825,7 @@ describe('Subscription', () => { callback(null, apiResponse); }; - subscription.getMetadata((err, metadata) => { + subscription.getMetadata?.((err, metadata) => { assert.ifError(err); assert.strictEqual(metadata, apiResponse); assert.strictEqual(subscription.metadata, apiResponse); @@ -848,7 +848,7 @@ describe('Subscription', () => { done(); }; - subscription.modifyPushConfig(fakeConfig, assert.ifError); + subscription.modifyPushConfig?.(fakeConfig, assert.ifError); }); it('should optionally accept gaxOpts', done => { @@ -859,7 +859,7 @@ describe('Subscription', () => { done(); }; - subscription.modifyPushConfig(fakeConfig, gaxOpts, assert.ifError); + subscription.modifyPushConfig?.(fakeConfig, gaxOpts, assert.ifError); }); }); @@ -867,7 +867,7 @@ describe('Subscription', () => { it('should open the subscriber', () => { const stub = sandbox.stub(subscriber, 'open'); - subscription.open(); + subscription.open?.(); assert.strictEqual(stub.callCount, 1); }); @@ -875,8 +875,8 @@ describe('Subscription', () => { it('should noop if already open', () => { const spy = sandbox.spy(subscriber, 'open'); - subscription.open(); - subscription.open(); + subscription.open?.(); + subscription.open?.(); assert.strictEqual(spy.callCount, 1); }); @@ -916,7 +916,7 @@ describe('Subscription', () => { done(); }; - subscription.seek(FAKE_SNAPSHOT_NAME, assert.ifError); + subscription.seek?.(FAKE_SNAPSHOT_NAME, assert.ifError); }); it('should optionally accept a Date object', done => { @@ -933,7 +933,7 @@ describe('Subscription', () => { done(); }; - subscription.seek(date, assert.ifError); + subscription.seek?.(date, assert.ifError); }); it('should optionally accept gax options', done => { @@ -944,7 +944,7 @@ describe('Subscription', () => { done(); }; - subscription.seek(FAKE_SNAPSHOT_NAME, gaxOpts, assert.ifError); + subscription.seek?.(FAKE_SNAPSHOT_NAME, gaxOpts, assert.ifError); }); }); @@ -995,7 +995,7 @@ describe('Subscription', () => { done(); }; - subscription.setMetadata(METADATA, done); + subscription.setMetadata?.(METADATA, done); }); it('should optionally accept gax options', done => { @@ -1005,7 +1005,7 @@ describe('Subscription', () => { assert.strictEqual(config.gaxOpts, gaxOpts); done(); }; - subscription.setMetadata(METADATA, gaxOpts, done); + subscription.setMetadata?.(METADATA, gaxOpts, done); }); }); @@ -1013,7 +1013,7 @@ describe('Subscription', () => { it('should pass the options to the subscriber', () => { const options = {}; const stub = sandbox.stub(subscriber, 'setOptions').withArgs(options); - subscription.setOptions(options); + subscription.setOptions?.(options); assert.strictEqual(stub.callCount, 1); }); }); @@ -1029,7 +1029,7 @@ describe('Subscription', () => { done(); }; - subscription.snapshot(SNAPSHOT_NAME); + subscription.snapshot?.(SNAPSHOT_NAME); }); }); }); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index f5733a0d4e8..bbd0aa2df1a 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -488,7 +488,15 @@ describe('Topic', () => { describe('getSubscriptions', () => { it('should make the correct request', done => { - const options = { + interface testOptions { + a: string; + b: string; + gaxOpts?: { + e: string; + }; + autoPaginate?: boolean; + } + const options: testOptions = { a: 'a', b: 'b', gaxOpts: { From f3fce691176a0198f18acf11c8fd71c01111b03a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 14:38:35 -0400 Subject: [PATCH 0854/1115] fix: fixes for dynamic routing and streaming descriptors (#1566) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: fixes for dynamic routing and streaming descriptors Use gapic-generator-typescript v2.14.5. PiperOrigin-RevId: 450616838 Source-Link: https://github.com/googleapis/googleapis/commit/7a47b72791e0b84d78beca4c2b26bec42ce31572 Source-Link: https://github.com/googleapis/googleapis-gen/commit/42cc6331bae0b99f61b8e01ae15b05211716c4f9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDJjYzYzMzFiYWUwYjk5ZjYxYjhlMDFhZTE1YjA1MjExNzE2YzRmOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- handwritten/pubsub/src/v1/subscriber_client.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 9474093c14c..7ef33c0c3a6 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -209,7 +209,8 @@ export class SubscriberClient { // Provide descriptors for these. this.descriptors.stream = { streamingPull: new this._gaxModule.StreamDescriptor( - gax.StreamType.BIDI_STREAMING + gax.StreamType.BIDI_STREAMING, + opts.fallback === 'rest' ), }; From 0d3d3e52a4a38b795e614e76bb43ac501c8bd5de Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 18:54:34 +0000 Subject: [PATCH 0855/1115] chore(main): release 3.0.0 (#1556) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [3.0.0](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.4...v3.0.0) (2022-05-26) ### ⚠ BREAKING CHANGES * update library to use Node 12 (#1564) ### Features * add BigQuery configuration for subscriptions ([#1563](https://github.com/googleapis/nodejs-pubsub/issues/1563)) ([29d38a1](https://github.com/googleapis/nodejs-pubsub/commit/29d38a17663adcd02252a5b6c778d053208de12f)) ### Bug Fixes * **deps:** update dependency google-gax to v2.30.4 ([#1555](https://github.com/googleapis/nodejs-pubsub/issues/1555)) ([518fce1](https://github.com/googleapis/nodejs-pubsub/commit/518fce1adbdaae492a1d6db38daadb2be9c0a505)) * fixes for dynamic routing and streaming descriptors ([#1566](https://github.com/googleapis/nodejs-pubsub/issues/1566)) ([158c606](https://github.com/googleapis/nodejs-pubsub/commit/158c606a88077a59ac04d4abcce7c732120c4ebb)) ### Build System * update library to use Node 12 ([#1564](https://github.com/googleapis/nodejs-pubsub/issues/1564)) ([adb4319](https://github.com/googleapis/nodejs-pubsub/commit/adb43190247a6282fc2abdcf75d7b07fe3fdc1dc)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 22 ++++++++++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index d711861263d..42d06ec0408 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,28 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.0.0](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.4...v3.0.0) (2022-05-26) + + +### ⚠ BREAKING CHANGES + +* update library to use Node 12 (#1564) + +### Features + +* add BigQuery configuration for subscriptions ([#1563](https://github.com/googleapis/nodejs-pubsub/issues/1563)) ([29d38a1](https://github.com/googleapis/nodejs-pubsub/commit/29d38a17663adcd02252a5b6c778d053208de12f)) + + +### Bug Fixes + +* **deps:** update dependency google-gax to v2.30.4 ([#1555](https://github.com/googleapis/nodejs-pubsub/issues/1555)) ([518fce1](https://github.com/googleapis/nodejs-pubsub/commit/518fce1adbdaae492a1d6db38daadb2be9c0a505)) +* fixes for dynamic routing and streaming descriptors ([#1566](https://github.com/googleapis/nodejs-pubsub/issues/1566)) ([158c606](https://github.com/googleapis/nodejs-pubsub/commit/158c606a88077a59ac04d4abcce7c732120c4ebb)) + + +### Build System + +* update library to use Node 12 ([#1564](https://github.com/googleapis/nodejs-pubsub/issues/1564)) ([adb4319](https://github.com/googleapis/nodejs-pubsub/commit/adb43190247a6282fc2abdcf75d7b07fe3fdc1dc)) + ### [2.19.4](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.3...v2.19.4) (2022-05-05) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e458284d4c8..73e7710eb11 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "2.19.4", + "version": "3.0.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From c45c8cf5d236bc54415c12acc7cee085f28cb3ad Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 30 May 2022 15:19:08 -0400 Subject: [PATCH 0856/1115] fix: detect subscription properties and warn for exactly-once (#1561) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: detect subscription properties and warn for exactly-once * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: check for changes to subscription options on every message * chore: fix copyright in new file * fix: update copyright header again ("once more with feeling" edition) * fix: still yet more copyright header * fix: timing in CI is tricky, replace setTimeout Co-authored-by: Owl Bot --- handwritten/pubsub/src/subscriber.ts | 41 +++++++++++++++++++++++-- handwritten/pubsub/src/util.ts | 32 +++++++++++++++++++ handwritten/pubsub/test/util.ts | 46 ++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 handwritten/pubsub/test/util.ts diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index ee29bdb8d26..4896d65910a 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -30,8 +30,11 @@ import {Subscription} from './subscription'; import {defaultOptions} from './default-options'; import {SubscriberClient} from './v1'; import {createSpan} from './opentelemetry-tracing'; +import {Throttler} from './util'; -export type PullResponse = google.pubsub.v1.IPullResponse; +export type PullResponse = google.pubsub.v1.IStreamingPullResponse; +export type SubscriptionProperties = + google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties; /** * Date object with nanosecond precision. Supports all standard Date arguments @@ -253,6 +256,10 @@ export class Subscriber extends EventEmitter { private _options!: SubscriberOptions; private _stream!: MessageStream; private _subscription: Subscription; + private _errorLog: Throttler; + + subscriptionProperties?: SubscriptionProperties; + constructor(subscription: Subscription, options = {}) { super(); @@ -266,8 +273,32 @@ export class Subscriber extends EventEmitter { this._histogram = new Histogram({min: 10, max: 600}); this._latencies = new Histogram(); this._subscription = subscription; + this._errorLog = new Throttler(60 * 1000); + this.setOptions(options); } + + /** + * Sets our subscription properties from the first incoming message. + * + * @param {SubscriptionProperties} subscriptionProperties The new properties. + * @private + */ + setSubscriptionProperties(subscriptionProperties: SubscriptionProperties) { + this.subscriptionProperties = subscriptionProperties; + + // If this is an exactly-once subscription, warn the user that they may have difficulty. + if (this.subscriptionProperties.exactlyOnceDeliveryEnabled) { + this._errorLog.doMaybe(() => + console.error( + 'WARNING: Exactly-once subscriptions are not yet supported ' + + 'by the Node client library. This feature will be added ' + + 'in a future release.' + ) + ); + } + } + /** * The 99th percentile of request latencies. * @@ -517,7 +548,13 @@ export class Subscriber extends EventEmitter { * * @private */ - private _onData({receivedMessages}: PullResponse): void { + private _onData(response: PullResponse): void { + // Grab the subscription properties for exactly once and ordering flags. + if (response.subscriptionProperties) { + this.setSubscriptionProperties(response.subscriptionProperties); + } + + const {receivedMessages} = response; for (const data of receivedMessages!) { const message = new Message(this, data); diff --git a/handwritten/pubsub/src/util.ts b/handwritten/pubsub/src/util.ts index 1a19f0a0cf7..753191c057f 100644 --- a/handwritten/pubsub/src/util.ts +++ b/handwritten/pubsub/src/util.ts @@ -40,3 +40,35 @@ export function promisifySome( } export function noop() {} + +/** + * Provides a very simple throttling capability for tasks like error logs. + * This ensures that no task is actually completed unless N millis have passed + * since the last one. + * + * @private + */ +export class Throttler { + minMillis: number; + lastTime?: number; + + constructor(minMillis: number) { + this.minMillis = minMillis; + } + + /** + * Performs the task requested, if enough time has passed since the + * last successful call. + */ + doMaybe(task: Function) { + const now = Date.now(); + const doTask = + !this.lastTime || + (this.lastTime && now - this.lastTime >= this.minMillis); + + if (doTask) { + task(); + this.lastTime = now; + } + } +} diff --git a/handwritten/pubsub/test/util.ts b/handwritten/pubsub/test/util.ts new file mode 100644 index 00000000000..80fe5690e94 --- /dev/null +++ b/handwritten/pubsub/test/util.ts @@ -0,0 +1,46 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {describe, it} from 'mocha'; +import {Throttler} from '../src/util'; +import * as assert from 'assert'; + +describe('utils', () => { + describe('Throttler', () => { + it('does not allow too many calls through at once', () => { + const throttler = new Throttler(300); + let totalCalls = ''; + + // This one should succeed. + throttler.doMaybe(() => { + totalCalls += 'FIRST'; + }); + + // This one should fail. + throttler.doMaybe(() => { + totalCalls += 'SECOND'; + }); + + // Simulate time passing. + throttler.lastTime! -= 1000; + + // This one should succeed. + throttler.doMaybe(() => { + totalCalls += 'THIRD'; + }); + + assert.strictEqual(totalCalls, 'FIRSTTHIRD'); + }); + }); +}); From 2233c48b8c680e1a054ebac0c3e9bc8a1416ef6d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 30 May 2022 21:20:31 +0200 Subject: [PATCH 0857/1115] fix(deps): update dependency @google-cloud/paginator to v4 (#1565) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 73e7710eb11..c2f35a6a981 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -47,7 +47,7 @@ "precompile": "gts clean" }, "dependencies": { - "@google-cloud/paginator": "^3.0.6", + "@google-cloud/paginator": "^4.0.0", "@google-cloud/precise-date": "^2.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", From d8fae81b30521f8729a4448ed2e76aa0f80a3c48 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 19:38:36 +0000 Subject: [PATCH 0858/1115] chore(main): release 3.0.1 (#1569) :robot: I have created a release *beep* *boop* --- ## [3.0.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.0.0...v3.0.1) (2022-05-30) ### Bug Fixes * **deps:** update dependency @google-cloud/paginator to v4 ([#1565](https://github.com/googleapis/nodejs-pubsub/issues/1565)) ([461b58b](https://github.com/googleapis/nodejs-pubsub/commit/461b58b0f4e436bf771be9655c12dd094cde60cc)) * detect subscription properties and warn for exactly-once ([#1561](https://github.com/googleapis/nodejs-pubsub/issues/1561)) ([98cf540](https://github.com/googleapis/nodejs-pubsub/commit/98cf5400ca2e67894d7cf3ed37bcdd72869e691e)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 42d06ec0408..feaa4f52fbe 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.0.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.0.0...v3.0.1) (2022-05-30) + + +### Bug Fixes + +* **deps:** update dependency @google-cloud/paginator to v4 ([#1565](https://github.com/googleapis/nodejs-pubsub/issues/1565)) ([461b58b](https://github.com/googleapis/nodejs-pubsub/commit/461b58b0f4e436bf771be9655c12dd094cde60cc)) +* detect subscription properties and warn for exactly-once ([#1561](https://github.com/googleapis/nodejs-pubsub/issues/1561)) ([98cf540](https://github.com/googleapis/nodejs-pubsub/commit/98cf5400ca2e67894d7cf3ed37bcdd72869e691e)) + ## [3.0.0](https://github.com/googleapis/nodejs-pubsub/compare/v2.19.4...v3.0.0) (2022-05-26) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c2f35a6a981..15d5a03058c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.0.0", + "version": "3.0.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 4d2cd9b7f8936ef0362ccd835310336989fd332d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 7 Jun 2022 22:04:14 +0000 Subject: [PATCH 0859/1115] build(node): add new jsteam + enforce branches up-to-date (#1451) (#1575) Source-Link: https://github.com/googleapis/synthtool/commit/cd785291d51d97003d1263056cd2b9de1849a0ab Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:ddb19a6df6c1fa081bc99fb29658f306dd64668bc26f75d1353b28296f3a78e6 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.github/sync-repo-settings.yaml | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 9acbabb1b4c..f3ca5561cb5 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:b9e4584a1fe3c749e3c37c92497b13dce653b2e694f0261f0610eb0e15941357 -# created: 2022-05-05T21:08:42.530332893Z + digest: sha256:ddb19a6df6c1fa081bc99fb29658f306dd64668bc26f75d1353b28296f3a78e6 +# created: 2022-06-07T21:18:30.024751809Z diff --git a/handwritten/pubsub/.github/sync-repo-settings.yaml b/handwritten/pubsub/.github/sync-repo-settings.yaml index d1e8b5e6e1a..4a30a08e54c 100644 --- a/handwritten/pubsub/.github/sync-repo-settings.yaml +++ b/handwritten/pubsub/.github/sync-repo-settings.yaml @@ -3,7 +3,7 @@ branchProtectionRules: isAdminEnforced: true requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true - requiresStrictStatusChecks: false + requiresStrictStatusChecks: true requiredStatusCheckContexts: - "ci/kokoro: Samples test" - "ci/kokoro: System test" @@ -15,3 +15,10 @@ branchProtectionRules: - cla/google - windows - OwlBot Post Processor +permissionRules: + - team: yoshi-admins + permission: admin + - team: jsteam-admins + permission: admin + - team: jsteam + permission: push From c315f399ca52f244d80f00af40cb038a52dc4173 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 9 Jun 2022 20:44:14 +0200 Subject: [PATCH 0860/1115] fix(deps): update dependency @google-cloud/precise-date to v3 (#1576) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 15d5a03058c..b11524bc31f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@google-cloud/paginator": "^4.0.0", - "@google-cloud/precise-date": "^2.0.0", + "@google-cloud/precise-date": "^3.0.0", "@google-cloud/projectify": "^2.0.0", "@google-cloud/promisify": "^2.0.0", "@opentelemetry/api": "^1.0.0", From 4468e55c08af85a895d3131a7d5df03d3d040d4d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 9 Jun 2022 21:00:16 +0200 Subject: [PATCH 0861/1115] chore(deps): update dependency jsdoc-region-tag to v2 (#1579) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [jsdoc-region-tag](https://togithub.com/googleapis/jsdoc-region-tag) | [`^1.0.2` -> `^2.0.0`](https://renovatebot.com/diffs/npm/jsdoc-region-tag/1.3.1/2.0.0) | [![age](https://badges.renovateapi.com/packages/npm/jsdoc-region-tag/2.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/jsdoc-region-tag/2.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/jsdoc-region-tag/2.0.0/compatibility-slim/1.3.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/jsdoc-region-tag/2.0.0/confidence-slim/1.3.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/jsdoc-region-tag ### [`v2.0.0`](https://togithub.com/googleapis/jsdoc-region-tag/blob/HEAD/CHANGELOG.md#​200-httpsgithubcomgoogleapisjsdoc-region-tagcomparev131v200-2022-05-20) [Compare Source](https://togithub.com/googleapis/jsdoc-region-tag/compare/v1.3.1...v2.0.0) ##### ⚠ BREAKING CHANGES - update library to use Node 12 ([#​107](https://togithub.com/googleapis/jsdoc-region-tag/issues/107)) ##### Build System - update library to use Node 12 ([#​107](https://togithub.com/googleapis/jsdoc-region-tag/issues/107)) ([5b51796](https://togithub.com/googleapis/jsdoc-region-tag/commit/5b51796771984cf8b978990025f14faa03c19923)) ##### [1.3.1](https://www.github.com/googleapis/jsdoc-region-tag/compare/v1.3.0...v1.3.1) (2021-08-11) ##### Bug Fixes - **build:** migrate to using main branch ([#​79](https://www.togithub.com/googleapis/jsdoc-region-tag/issues/79)) ([5050615](https://www.github.com/googleapis/jsdoc-region-tag/commit/50506150b7758592df5e389c6a5c3d82b3b20881))
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b11524bc31f..330aeed5d91 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -83,7 +83,7 @@ "gts": "^3.1.0", "jsdoc": "^3.6.2", "jsdoc-fresh": "^1.0.1", - "jsdoc-region-tag": "^1.0.2", + "jsdoc-region-tag": "^2.0.0", "linkinator": "^2.0.0", "mocha": "^9.2.2", "mv": "^2.1.1", From af1448503f23bb2dc3ed01ce42ec45045f47f1dc Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 13 Jun 2022 22:43:12 +0200 Subject: [PATCH 0862/1115] fix(deps): update dependency @google-cloud/projectify to v3 (#1584) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 330aeed5d91..ef5bb8e1ca3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -49,7 +49,7 @@ "dependencies": { "@google-cloud/paginator": "^4.0.0", "@google-cloud/precise-date": "^3.0.0", - "@google-cloud/projectify": "^2.0.0", + "@google-cloud/projectify": "^3.0.0", "@google-cloud/promisify": "^2.0.0", "@opentelemetry/api": "^1.0.0", "@opentelemetry/semantic-conventions": "^1.0.0", From 86428e458c6e90feab5afe1cb6bde1fee4813c31 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jun 2022 19:44:19 +0200 Subject: [PATCH 0863/1115] chore(deps): update dependency jsdoc-fresh to v2 (#1578) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ef5bb8e1ca3..e9c273ce9df 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -82,7 +82,7 @@ "execa": "^5.0.0", "gts": "^3.1.0", "jsdoc": "^3.6.2", - "jsdoc-fresh": "^1.0.1", + "jsdoc-fresh": "^2.0.0", "jsdoc-region-tag": "^2.0.0", "linkinator": "^2.0.0", "mocha": "^9.2.2", From e88ec8e44e61de14edbfaaa886d3b3e1b297c4a7 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 29 Jun 2022 17:32:14 -0700 Subject: [PATCH 0864/1115] fix(docs): describe fallback rest option (#1591) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(docs): describe fallback rest option Use gapic-generator-typescript v2.15.1. PiperOrigin-RevId: 456946341 Source-Link: https://github.com/googleapis/googleapis/commit/88fd18d9d3b872b3d06a3d9392879f50b5bf3ce5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/accfa371f667439313335c64042b063c1c53102e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWNjZmEzNzFmNjY3NDM5MzEzMzM1YzY0MDQyYjA2M2MxYzUzMTAyZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- handwritten/pubsub/src/v1/publisher_client.ts | 12 +++++------- handwritten/pubsub/src/v1/schema_service_client.ts | 11 +++++------ handwritten/pubsub/src/v1/subscriber_client.ts | 11 +++++------ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 1f33c8e432d..eb1c56df4c7 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -74,7 +74,7 @@ export class PublisherClient { * * @param {object} [options] - The configuration object. * The options accepted by the constructor are described in detail - * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). + * in [this document](https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#creating-the-client-instance). * The common options are: * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] @@ -97,11 +97,10 @@ export class PublisherClient { * API remote host. * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. * Follows the structure of {@link gapicConfig}. - * @param {boolean} [options.fallback] - Use HTTP fallback mode. - * In fallback mode, a special browser-compatible transport implementation is used - * instead of gRPC transport. In browser context (if the `window` object is defined) - * the fallback mode is enabled automatically; set `options.fallback` to `false` - * if you need to override this behavior. + * @param {boolean | "rest"} [options.fallback] - Use HTTP fallback mode. + * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. + * For more information, please check the + * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. */ constructor(opts?: ClientOptions) { // Ensure that options include all the required fields. @@ -208,7 +207,6 @@ export class PublisherClient { }; const protoFilesRoot = this._gaxModule.protobuf.Root.fromJSON(jsonProtos); - // Some methods on this API support automatically batching // requests; denote this. diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 75330c6344c..37c9c2b9746 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -73,7 +73,7 @@ export class SchemaServiceClient { * * @param {object} [options] - The configuration object. * The options accepted by the constructor are described in detail - * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). + * in [this document](https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#creating-the-client-instance). * The common options are: * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] @@ -96,11 +96,10 @@ export class SchemaServiceClient { * API remote host. * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. * Follows the structure of {@link gapicConfig}. - * @param {boolean} [options.fallback] - Use HTTP fallback mode. - * In fallback mode, a special browser-compatible transport implementation is used - * instead of gRPC transport. In browser context (if the `window` object is defined) - * the fallback mode is enabled automatically; set `options.fallback` to `false` - * if you need to override this behavior. + * @param {boolean | "rest"} [options.fallback] - Use HTTP fallback mode. + * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. + * For more information, please check the + * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. */ constructor(opts?: ClientOptions) { // Ensure that options include all the required fields. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 7ef33c0c3a6..730e64935c4 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -77,7 +77,7 @@ export class SubscriberClient { * * @param {object} [options] - The configuration object. * The options accepted by the constructor are described in detail - * in [this document](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#creating-the-client-instance). + * in [this document](https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#creating-the-client-instance). * The common options are: * @param {object} [options.credentials] - Credentials object. * @param {string} [options.credentials.client_email] @@ -100,11 +100,10 @@ export class SubscriberClient { * API remote host. * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. * Follows the structure of {@link gapicConfig}. - * @param {boolean} [options.fallback] - Use HTTP fallback mode. - * In fallback mode, a special browser-compatible transport implementation is used - * instead of gRPC transport. In browser context (if the `window` object is defined) - * the fallback mode is enabled automatically; set `options.fallback` to `false` - * if you need to override this behavior. + * @param {boolean | "rest"} [options.fallback] - Use HTTP fallback mode. + * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. + * For more information, please check the + * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. */ constructor(opts?: ClientOptions) { // Ensure that options include all the required fields. From c06a6c86f8921827ef5e375c212808acf0fcf8dd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 30 Jun 2022 19:14:21 +0000 Subject: [PATCH 0865/1115] chore(main): release 3.0.2 (#1581) :robot: I have created a release *beep* *boop* --- ## [3.0.2](https://github.com/googleapis/nodejs-pubsub/compare/v3.0.1...v3.0.2) (2022-06-30) ### Bug Fixes * **deps:** update dependency @google-cloud/precise-date to v3 ([#1576](https://github.com/googleapis/nodejs-pubsub/issues/1576)) ([69a5461](https://github.com/googleapis/nodejs-pubsub/commit/69a546160284c290e7025bfe6a307d7309b828c9)) * **deps:** update dependency @google-cloud/projectify to v3 ([#1584](https://github.com/googleapis/nodejs-pubsub/issues/1584)) ([af4b13e](https://github.com/googleapis/nodejs-pubsub/commit/af4b13e162a8ad9a1c0d5c117afe784ea5824753)) * **docs:** describe fallback rest option ([#1591](https://github.com/googleapis/nodejs-pubsub/issues/1591)) ([7c08686](https://github.com/googleapis/nodejs-pubsub/commit/7c08686b4ad5a44f4b4a294c96b06e3901dd7368)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 9 +++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index feaa4f52fbe..78ebe83ff8d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,15 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.0.2](https://github.com/googleapis/nodejs-pubsub/compare/v3.0.1...v3.0.2) (2022-06-30) + + +### Bug Fixes + +* **deps:** update dependency @google-cloud/precise-date to v3 ([#1576](https://github.com/googleapis/nodejs-pubsub/issues/1576)) ([69a5461](https://github.com/googleapis/nodejs-pubsub/commit/69a546160284c290e7025bfe6a307d7309b828c9)) +* **deps:** update dependency @google-cloud/projectify to v3 ([#1584](https://github.com/googleapis/nodejs-pubsub/issues/1584)) ([af4b13e](https://github.com/googleapis/nodejs-pubsub/commit/af4b13e162a8ad9a1c0d5c117afe784ea5824753)) +* **docs:** describe fallback rest option ([#1591](https://github.com/googleapis/nodejs-pubsub/issues/1591)) ([7c08686](https://github.com/googleapis/nodejs-pubsub/commit/7c08686b4ad5a44f4b4a294c96b06e3901dd7368)) + ## [3.0.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.0.0...v3.0.1) (2022-05-30) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e9c273ce9df..b636c6a5415 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.0.1", + "version": "3.0.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 3b92227c7951757f54ee83c6f496c049a77f9d34 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 7 Jul 2022 16:13:00 -0400 Subject: [PATCH 0866/1115] fix: pin @opentelemetry/semantic-conventions for Node 12 support (#1596) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b636c6a5415..9eee7c27dc9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^3.0.0", "@google-cloud/promisify": "^2.0.0", "@opentelemetry/api": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0", + "@opentelemetry/semantic-conventions": "~1.3.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From 6601f175ddf873dbe2f7eb78cdce6e1c29db2cdd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 8 Jul 2022 21:27:35 +0200 Subject: [PATCH 0867/1115] chore(deps): update dependency linkinator to v4 (#1599) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9eee7c27dc9..ca6cb094b99 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -84,7 +84,7 @@ "jsdoc": "^3.6.2", "jsdoc-fresh": "^2.0.0", "jsdoc-region-tag": "^2.0.0", - "linkinator": "^2.0.0", + "linkinator": "^4.0.0", "mocha": "^9.2.2", "mv": "^2.1.1", "ncp": "^2.0.0", From e43e5053bf30c6d4a06869f60853000a7b0b7467 Mon Sep 17 00:00:00 2001 From: Kamal Aboul-Hosn Date: Fri, 8 Jul 2022 15:48:11 -0400 Subject: [PATCH 0868/1115] samples: create BigQuery subscription (#1594) --- handwritten/pubsub/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 734989c63c6..f77054073ee 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -124,6 +124,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | | Create an Avro based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createAvroSchema.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/createAvroSchema.js,samples/README.md) | +| Create BigQuery Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createBigQuerySubscription.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/createBigQuerySubscription.js,samples/README.md) | | Create a Proto based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createProtoSchema.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/createProtoSchema.js,samples/README.md) | | 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) | From e32e86e0438ad3cbcca24f806c5dcb5f3729362b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 15:49:53 -0400 Subject: [PATCH 0869/1115] chore(main): release 3.0.3 (#1597) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 78ebe83ff8d..d9c4cf65d3c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [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/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ca6cb094b99..128cde908b2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/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.0.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From ec22c6509f7822866e81fa0bf786fe7ba9c0b1eb Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 15 Jul 2022 15:26:56 -0400 Subject: [PATCH 0870/1115] feat: add minExtension setting and plug it into EOS and ackDeadline settings (#1582) * feat: add minimum lease extensions for exactly-once * feat: put back warning about exactly once support This partially reverts commit 0ca513ac1c7db6c049a31a30b41362ac5fd30d39. * feat: add minExtension setting and plug it into EOS and ackDeadline settings * feat: bring back Duration, and put min/max in the right places * tests: add unit test for Duration * tests: add deadline tests and fix a few bugs * chore: revert partially completed incorrect change * docs: work around jsdoc linking bug * chore: split up updateAckDeadline for readability * fix: clean up min/max deadline extension handling to match other languages * tests: update the histogram test to work within the new default max extension --- handwritten/pubsub/src/default-options.ts | 11 ++ handwritten/pubsub/src/index.ts | 1 + handwritten/pubsub/src/lease-manager.ts | 2 +- handwritten/pubsub/src/subscriber.ts | 151 ++++++++++++++++++---- handwritten/pubsub/src/temporal.ts | 96 ++++++++++++++ handwritten/pubsub/test/subscriber.ts | 65 +++++++++- handwritten/pubsub/test/temporal.ts | 38 ++++++ 7 files changed, 336 insertions(+), 28 deletions(-) create mode 100644 handwritten/pubsub/src/temporal.ts create mode 100644 handwritten/pubsub/test/temporal.ts diff --git a/handwritten/pubsub/src/default-options.ts b/handwritten/pubsub/src/default-options.ts index 1302d5c9daf..4e502e8bdaa 100644 --- a/handwritten/pubsub/src/default-options.ts +++ b/handwritten/pubsub/src/default-options.ts @@ -14,6 +14,8 @@ * limitations under the License. */ +import {Duration} from './temporal'; + // These options will be used library-wide. They're specified here so that // they can be changed easily in the future. export const defaultOptions = { @@ -26,6 +28,12 @@ export const defaultOptions = { // in bytes, with the default lease manager. maxOutstandingBytes: 100 * 1024 * 1024, + // The minimum length of time a message's lease will be extended by. + minAckDeadline: undefined, + + // The maximum length of time a message's lease will be extended by. + maxAckDeadline: Duration.from({minutes: 10}), + // The maximum number of minutes that a message's lease will ever // be extended. maxExtensionMinutes: 60, @@ -33,6 +41,9 @@ export const defaultOptions = { // The maximum number of subscription streams/threads that will ever // be opened. maxStreams: 5, + + // The starting number of seconds that ack deadlines will be extended. + ackDeadline: 10, }, publish: { diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 2744b8a2ba1..b4684e998a5 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -170,6 +170,7 @@ export { Topic, TopicMetadata, } from './topic'; +export {Duration, TotalOfUnit, DurationLike} from './temporal'; if (process.env.DEBUG_GRPC) { console.info('gRPC logging set to verbose'); diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index be6fe0c80d6..b616e0ce297 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -40,7 +40,7 @@ export interface FlowControlOptions { * allow message data to consume. (Default: 100MB) It's possible that this * value will be exceeded, since messages are received in batches. * @property {number} [maxExtensionMinutes=60] The maximum duration (in minutes) - * to extend the message deadline before redelivering. + * to extend the message deadline before redelivering. * @property {number} [maxMessages=1000] The desired number of messages to allow * in memory before pausing the message stream. Unless allowExcessMessages * is set to false, it is very likely that this value will be exceeded since diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 4896d65910a..fe9cf0bc336 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -31,6 +31,7 @@ import {defaultOptions} from './default-options'; import {SubscriberClient} from './v1'; import {createSpan} from './opentelemetry-tracing'; import {Throttler} from './util'; +import {Duration} from './temporal'; export type PullResponse = google.pubsub.v1.IStreamingPullResponse; export type SubscriptionProperties = @@ -156,6 +157,7 @@ export class Message { this._length = this.data.length; this._subscriber = sub; } + /** * The length of the message data. * @@ -164,6 +166,7 @@ export class Message { get length() { return this._length; } + /** * Acknowledges the message. * @@ -180,6 +183,7 @@ export class Message { this._subscriber.ack(this); } } + /** * Modifies the ack deadline. * @@ -191,6 +195,7 @@ export class Message { this._subscriber.modAck(this, deadline); } } + /** * Removes the message from our inventory and schedules it to be redelivered. * @@ -209,20 +214,18 @@ export class Message { } } -export interface SubscriberOptions { - ackDeadline?: number; - batching?: BatchOptions; - flowControl?: FlowControlOptions; - useLegacyFlowControl?: boolean; - streamingOptions?: MessageStreamOptions; - enableOpenTelemetryTracing?: boolean; -} - /** * @typedef {object} SubscriberOptions * @property {number} [ackDeadline=10] Acknowledge deadline in seconds. If left - * unset the initial value will be 10 seconds, but it will evolve into the - * 99th percentile time it takes to acknowledge a message. + * unset, the initial value will be 10 seconds, but it will evolve into the + * 99th percentile time it takes to acknowledge a message, subject to the + * limitations of minAckDeadline and maxAckDeadline. If ackDeadline is set + * by the user, then the min/max values will be set to match it. New code + * should prefer setting minAckDeadline and maxAckDeadline directly. + * @property {Duration} [minAckDeadline] The minimum time that ackDeadline should + * ever have, while it's under library control. + * @property {Duration} [maxAckDeadline] The maximum time that ackDeadline should + * ever have, while it's under library control. * @property {BatchOptions} [batching] Request batching options. * @property {FlowControlOptions} [flowControl] Flow control options. * @property {boolean} [useLegacyFlowControl] Disables enforcing flow control @@ -230,6 +233,21 @@ export interface SubscriberOptions { * of only enforcing flow control at the client side. * @property {MessageStreamOptions} [streamingOptions] Streaming options. */ +export interface SubscriberOptions { + /** @deprecated Use minAckDeadline and maxAckDeadline. */ + ackDeadline?: number; + + minAckDeadline?: Duration; + maxAckDeadline?: Duration; + batching?: BatchOptions; + flowControl?: FlowControlOptions; + useLegacyFlowControl?: boolean; + streamingOptions?: MessageStreamOptions; + enableOpenTelemetryTracing?: boolean; +} + +const minAckDeadlineForExactlyOnce = Duration.from({seconds: 60}); + /** * Subscriber class is used to manage all message related functionality. * @@ -248,7 +266,6 @@ export class Subscriber extends EventEmitter { private _acks!: AckQueue; private _histogram: Histogram; private _inventory!: LeaseManager; - private _isUserSetDeadline: boolean; private _useOpentelemetry: boolean; private _latencies: Histogram; private _modAcks!: ModAckQueue; @@ -263,12 +280,11 @@ export class Subscriber extends EventEmitter { constructor(subscription: Subscription, options = {}) { super(); - this.ackDeadline = 10; + this.ackDeadline = defaultOptions.subscription.ackDeadline; this.maxMessages = defaultOptions.subscription.maxOutstandingMessages; this.maxBytes = defaultOptions.subscription.maxOutstandingBytes; this.useLegacyFlowControl = false; this.isOpen = false; - this._isUserSetDeadline = false; this._useOpentelemetry = false; this._histogram = new Histogram({min: 10, max: 600}); this._latencies = new Histogram(); @@ -279,16 +295,85 @@ export class Subscriber extends EventEmitter { } /** - * Sets our subscription properties from the first incoming message. + * Update our ack extension time that will be used by the lease manager + * for sending modAcks. + * + * Should not be called from outside this class, except for unit tests. + * + * @param {number} [ackTimeSeconds] The number of seconds that the last + * ack took after the message was received. If this is undefined, then + * we won't update the histogram, but we will still recalculate the + * ackDeadline based on the situation. + * + * @private + */ + updateAckDeadline(ackTimeSeconds?: number) { + // Start with the value we already have. + let ackDeadline = this.ackDeadline; + + // If we got an ack time reading, update the histogram (and ackDeadline). + if (ackTimeSeconds) { + this._histogram.add(ackTimeSeconds); + ackDeadline = this._histogram.percentile(99); + } + + // Grab our current min/max deadline values, based on whether exactly-once + // is enabled, and the defaults. + const [minDeadline, maxDeadline] = this.getMinMaxDeadlines(); + + if (minDeadline) { + ackDeadline = Math.max(ackDeadline, minDeadline.totalOf('second')); + } + if (maxDeadline) { + ackDeadline = Math.min(ackDeadline, maxDeadline.totalOf('second')); + } + + // Set the bounded result back. + this.ackDeadline = ackDeadline; + } + + private getMinMaxDeadlines(): [Duration?, Duration?] { + // If this is an exactly-once subscription, and the user didn't set their + // own minimum ack periods, set it to the default for exactly-once. + const defaultMinDeadline = this.isExactlyOnce + ? minAckDeadlineForExactlyOnce + : defaultOptions.subscription.minAckDeadline; + const defaultMaxDeadline = defaultOptions.subscription.maxAckDeadline; + + // Pull in any user-set min/max. + const minDeadline = this._options.minAckDeadline ?? defaultMinDeadline; + const maxDeadline = this._options.maxAckDeadline ?? defaultMaxDeadline; + + return [minDeadline, maxDeadline]; + } + + /** + * Returns true if an exactly once subscription has been detected. + * + * @private + */ + get isExactlyOnce(): boolean { + if (!this.subscriptionProperties) { + return false; + } + + return !!this.subscriptionProperties.exactlyOnceDeliveryEnabled; + } + + /** + * Sets our subscription properties from incoming messages. * * @param {SubscriptionProperties} subscriptionProperties The new properties. * @private */ setSubscriptionProperties(subscriptionProperties: SubscriptionProperties) { + const previouslyEnabled = this.isExactlyOnce; + this.subscriptionProperties = subscriptionProperties; - // If this is an exactly-once subscription, warn the user that they may have difficulty. + // If this is an exactly-once subscription... if (this.subscriptionProperties.exactlyOnceDeliveryEnabled) { + // Warn the user that they may have difficulty. this._errorLog.doMaybe(() => console.error( 'WARNING: Exactly-once subscriptions are not yet supported ' + @@ -297,6 +382,11 @@ export class Subscriber extends EventEmitter { ) ); } + + // Update ackDeadline in case the flag switched. + if (previouslyEnabled !== this.isExactlyOnce) { + this.updateAckDeadline(); + } } /** @@ -315,6 +405,7 @@ export class Subscriber extends EventEmitter { return latency * 1000 + bufferTime; } + /** * The full name of the Subscription. * @@ -329,6 +420,7 @@ export class Subscriber extends EventEmitter { return this._name; } + /** * Acknowledges the supplied message. * @@ -337,16 +429,14 @@ export class Subscriber extends EventEmitter { * @private */ async ack(message: Message): Promise { - if (!this._isUserSetDeadline) { - const ackTimeSeconds = (Date.now() - message.received) / 1000; - this._histogram.add(ackTimeSeconds); - this.ackDeadline = this._histogram.percentile(99); - } + const ackTimeSeconds = (Date.now() - message.received) / 1000; + this.updateAckDeadline(ackTimeSeconds); this._acks.add(message); await this._acks.onFlush(); this._inventory.remove(message); } + /** * Closes the subscriber. The returned promise will resolve once any pending * acks/modAcks are finished. @@ -367,6 +457,7 @@ export class Subscriber extends EventEmitter { this.emit('close'); } + /** * Gets the subscriber client instance. * @@ -381,6 +472,7 @@ export class Subscriber extends EventEmitter { return client; } + /** * Modifies the acknowledge deadline for the provided message. * @@ -398,6 +490,7 @@ export class Subscriber extends EventEmitter { const latency = (Date.now() - startTime) / 1000; this._latencies.add(latency); } + /** * Modfies the acknowledge deadline for the provided message and then removes * it from our inventory. @@ -410,6 +503,7 @@ export class Subscriber extends EventEmitter { await this.modAck(message, 0); this._inventory.remove(message); } + /** * Starts pulling messages. * @private @@ -434,6 +528,7 @@ export class Subscriber extends EventEmitter { this.isOpen = true; } + /** * Sets subscriber options. * @@ -445,18 +540,22 @@ export class Subscriber extends EventEmitter { this._useOpentelemetry = options.enableOpenTelemetryTracing || false; - if (options.ackDeadline) { - this.ackDeadline = options.ackDeadline; - this._isUserSetDeadline = true; + // The user-set ackDeadline value basically pegs the extension time. + // We'll emulate it by overwriting min/max. + const passedAckDeadline = options.ackDeadline; + if (passedAckDeadline !== undefined) { + this.ackDeadline = passedAckDeadline; + options.minAckDeadline = Duration.from({seconds: passedAckDeadline}); + options.maxAckDeadline = Duration.from({seconds: passedAckDeadline}); } this.useLegacyFlowControl = options.useLegacyFlowControl || false; if (options.flowControl) { this.maxMessages = - options.flowControl!.maxMessages || + options.flowControl.maxMessages || defaultOptions.subscription.maxOutstandingMessages; this.maxBytes = - options.flowControl!.maxBytes || + options.flowControl.maxBytes || defaultOptions.subscription.maxOutstandingBytes; // In the event that the user has specified the maxMessages option, we diff --git a/handwritten/pubsub/src/temporal.ts b/handwritten/pubsub/src/temporal.ts new file mode 100644 index 00000000000..d20009960c2 --- /dev/null +++ b/handwritten/pubsub/src/temporal.ts @@ -0,0 +1,96 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/* + * We'd like to use the tc39 Temporal standard, but it isn't out of + * proposal, still, and won't be present in all versions of Node until + * much later. Since even some of the polyfills aren't compatible with + * all of our supported versions of Node, this is a very simplified + * version of the pieces we need. When we're ready to turn on the tap + * for the built-in, we'll just export that here instead of this. + */ + +/** + * Simplified interface analogous to the tc39 Temporal.Duration + * parameter to from(). This doesn't support the full gamut (years, days). + */ +export interface DurationLike { + hours?: number; + minutes?: number; + seconds?: number; + millis?: number; +} + +/** + * Simplified list of values to pass to Duration.totalOf(). This + * list is taken from the tc39 Temporal.Duration proposal, but + * larger and smaller units have been left off. + */ +export type TotalOfUnit = 'hour' | 'minute' | 'second' | 'millisecond'; + +/** + * Duration class with an interface similar to the tc39 Temporal + * proposal. Since it's not fully finalized, and polyfills have + * inconsistent compatibility, for now this shim class will be + * used to set durations in Pub/Sub. + * + * This class will remain here for at least the next major version, + * eventually to be replaced by the tc39 Temporal built-in. + * + * https://tc39.es/proposal-temporal/docs/duration.html + */ +export class Duration { + private millis: number; + + private static secondInMillis = 1000; + private static minuteInMillis = Duration.secondInMillis * 60; + private static hourInMillis = Duration.minuteInMillis * 60; + + private constructor(millis: number) { + this.millis = millis; + } + + /** + * Calculates the total number of units of type 'totalOf' that would + * fit inside this duration. + */ + totalOf(totalOf: TotalOfUnit): number { + switch (totalOf) { + case 'hour': + return this.millis / Duration.hourInMillis; + case 'minute': + return this.millis / Duration.minuteInMillis; + case 'second': + return this.millis / Duration.secondInMillis; + case 'millisecond': + return this.millis; + default: + throw new Error(`Invalid unit in call to totalOf(): ${totalOf}`); + } + } + + /** + * Creates a Duration from a DurationLike, which is an object + * containing zero or more of the following: hours, seconds, + * minutes, millis. + */ + static from(durationLike: DurationLike): Duration { + let millis = durationLike.millis ?? 0; + millis += (durationLike.seconds ?? 0) * Duration.secondInMillis; + millis += (durationLike.minutes ?? 0) * Duration.minuteInMillis; + millis += (durationLike.hours ?? 0) * Duration.hourInMillis; + + return new Duration(millis); + } +} diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 5926066112d..d7ed05c55a0 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -33,6 +33,7 @@ import * as s from '../src/subscriber'; import {Subscription} from '../src/subscription'; import {SpanKind} from '@opentelemetry/api'; import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; +import {Duration} from '../src'; const stubs = new Map(); @@ -280,7 +281,7 @@ describe('Subscriber', () => { const expectedSeconds = (now - message.received) / 1000; const addStub = sandbox.stub(histogram, 'add').withArgs(expectedSeconds); - const fakeDeadline = 312123; + const fakeDeadline = 598; sandbox.stub(histogram, 'percentile').withArgs(99).returns(fakeDeadline); @@ -290,6 +291,68 @@ describe('Subscriber', () => { assert.strictEqual(subscriber.ackDeadline, fakeDeadline); }); + it('should bound ack deadlines if min/max are specified', () => { + const histogram: FakeHistogram = stubs.get('histogram'); + const now = Date.now(); + + message.received = 23842328; + sandbox.stub(global.Date, 'now').returns(now); + + const expectedSeconds = (now - message.received) / 1000; + const addStub = sandbox.stub(histogram, 'add').withArgs(expectedSeconds); + + let fakeDeadline = 312123; + sandbox + .stub(histogram, 'percentile') + .withArgs(99) + .callsFake(() => fakeDeadline); + + subscriber.setOptions({ + maxAckDeadline: Duration.from({seconds: 60}), + }); + subscriber.ack(message); + + assert.strictEqual(addStub.callCount, 1); + assert.strictEqual(subscriber.ackDeadline, 60); + + subscriber.setOptions({ + minAckDeadline: Duration.from({seconds: 10}), + }); + fakeDeadline = 1; + subscriber.ack(message); + + assert.strictEqual(subscriber.ackDeadline, 10); + }); + + it('should default to 60s min for exactly-once subscriptions', () => { + subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; + + const histogram: FakeHistogram = stubs.get('histogram'); + const now = Date.now(); + + message.received = 23842328; + sandbox.stub(global.Date, 'now').returns(now); + + const expectedSeconds = (now - message.received) / 1000; + const addStub = sandbox.stub(histogram, 'add').withArgs(expectedSeconds); + + const fakeDeadline = 10; + sandbox.stub(histogram, 'percentile').withArgs(99).returns(fakeDeadline); + + subscriber.ack(message); + + assert.strictEqual(addStub.callCount, 1); + assert.strictEqual(subscriber.ackDeadline, 60); + + // Also check that if we set a different min, it's honoured. + subscriber.setOptions({ + minAckDeadline: Duration.from({seconds: 5}), + }); + subscriber.ack(message); + + assert.strictEqual(subscriber.ackDeadline, 10); + }); + it('should not update the deadline if user specified', () => { const histogram: FakeHistogram = stubs.get('histogram'); const ackDeadline = 543; diff --git a/handwritten/pubsub/test/temporal.ts b/handwritten/pubsub/test/temporal.ts new file mode 100644 index 00000000000..030af2122b1 --- /dev/null +++ b/handwritten/pubsub/test/temporal.ts @@ -0,0 +1,38 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {describe, it} from 'mocha'; +import {Duration} from '../src/temporal'; +import * as assert from 'assert'; + +describe('temporal', () => { + describe('Duration', () => { + it('can be created from millis', () => { + const duration = Duration.from({millis: 1234}); + assert.strictEqual(duration.totalOf('second'), 1.234); + }); + it('can be created from seconds', () => { + const duration = Duration.from({seconds: 1.234}); + assert.strictEqual(duration.totalOf('millisecond'), 1234); + }); + it('can be created from minutes', () => { + const duration = Duration.from({minutes: 30}); + assert.strictEqual(duration.totalOf('hour'), 0.5); + }); + it('can be created from hours', () => { + const duration = Duration.from({hours: 1.5}); + assert.strictEqual(duration.totalOf('minute'), 90); + }); + }); +}); From 8d9700fac102512701bf04021f803237372eb4c4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 20:02:16 +0000 Subject: [PATCH 0871/1115] chore(main): release 3.1.0 (#1603) :robot: I have created a release *beep* *boop* --- ## [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)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index d9c4cf65d3c..5bef1f5f201 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [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) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 128cde908b2..7296dcb6787 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.0.3", + "version": "3.1.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 84233ea52d42f75244535ed2566e5db89d1da1a0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 22 Jul 2022 01:59:52 +0200 Subject: [PATCH 0872/1115] fix(deps): update dependency protobufjs to v7 (#1602) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7296dcb6787..f68abc0022c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -89,7 +89,7 @@ "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", "tmp": "^0.2.0", From 070a7675515dc1c9f09b054e6c89afc24995b84d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 22 Jul 2022 02:16:11 +0200 Subject: [PATCH 0873/1115] chore(deps): update dependency @grpc/proto-loader to ^0.7.0 (#1604) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@grpc/proto-loader](https://grpc.io/) ([source](https://togithub.com/grpc/grpc-node)) | [`^0.6.0` -> `^0.7.0`](https://renovatebot.com/diffs/npm/@grpc%2fproto-loader/0.6.13/0.7.0) | [![age](https://badges.renovateapi.com/packages/npm/@grpc%2fproto-loader/0.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/@grpc%2fproto-loader/0.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/@grpc%2fproto-loader/0.7.0/compatibility-slim/0.6.13)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/@grpc%2fproto-loader/0.7.0/confidence-slim/0.6.13)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f68abc0022c..cf4e64f62b9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -64,7 +64,7 @@ "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", From d4049f0b7e504ec920baff4b9435be83abbd5f55 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 00:06:20 +0000 Subject: [PATCH 0874/1115] fix: better support for fallback mode (#1610) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 468790263 Source-Link: https://github.com/googleapis/googleapis/commit/873ab456273d105245df0fb82a6c17a814553b80 Source-Link: https://github.com/googleapis/googleapis-gen/commit/cb6f37aeff2a3472e40a7bbace8c67d75e24bee5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2I2ZjM3YWVmZjJhMzQ3MmU0MGE3YmJhY2U4YzY3ZDc1ZTI0YmVlNSJ9 --- handwritten/pubsub/src/v1/publisher_client.ts | 16 +- .../pubsub/src/v1/schema_service_client.ts | 8 +- .../pubsub/src/v1/subscriber_client.ts | 12 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 156 ++++++++--------- .../pubsub/test/gapic_schema_service_v1.ts | 158 +++++++++--------- .../pubsub/test/gapic_subscriber_v1.ts | 156 ++++++++--------- 6 files changed, 257 insertions(+), 249 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index eb1c56df4c7..6dcab350bb8 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -30,7 +30,6 @@ import { } from 'google-gax'; import {Transform} from 'stream'; -import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); /** @@ -304,7 +303,8 @@ export class PublisherClient { const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], - descriptor + descriptor, + this._opts.fallback ); this.innerApiCalls[methodName] = apiCall; @@ -1044,7 +1044,7 @@ export class PublisherClient { const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopics.createStream( - this.innerApiCalls.listTopics as gax.GaxCall, + this.innerApiCalls.listTopics as GaxCall, request, callSettings ); @@ -1093,7 +1093,7 @@ export class PublisherClient { this.initialize(); return this.descriptors.page.listTopics.asyncIterate( this.innerApiCalls['listTopics'] as GaxCall, - request as unknown as RequestType, + request as {}, callSettings ) as AsyncIterable; } @@ -1244,7 +1244,7 @@ export class PublisherClient { const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopicSubscriptions.createStream( - this.innerApiCalls.listTopicSubscriptions as gax.GaxCall, + this.innerApiCalls.listTopicSubscriptions as GaxCall, request, callSettings ); @@ -1293,7 +1293,7 @@ export class PublisherClient { this.initialize(); return this.descriptors.page.listTopicSubscriptions.asyncIterate( this.innerApiCalls['listTopicSubscriptions'] as GaxCall, - request as unknown as RequestType, + request as {}, callSettings ) as AsyncIterable; } @@ -1438,7 +1438,7 @@ export class PublisherClient { const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listTopicSnapshots.createStream( - this.innerApiCalls.listTopicSnapshots as gax.GaxCall, + this.innerApiCalls.listTopicSnapshots as GaxCall, request, callSettings ); @@ -1487,7 +1487,7 @@ export class PublisherClient { this.initialize(); return this.descriptors.page.listTopicSnapshots.asyncIterate( this.innerApiCalls['listTopicSnapshots'] as GaxCall, - request as unknown as RequestType, + request as {}, callSettings ) as AsyncIterable; } diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 37c9c2b9746..c8170bd638a 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -30,7 +30,6 @@ import { } from 'google-gax'; import {Transform} from 'stream'; -import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); /** @@ -271,7 +270,8 @@ export class SchemaServiceClient { const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], - descriptor + descriptor, + this._opts.fallback ); this.innerApiCalls[methodName] = apiCall; @@ -918,7 +918,7 @@ export class SchemaServiceClient { const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSchemas.createStream( - this.innerApiCalls.listSchemas as gax.GaxCall, + this.innerApiCalls.listSchemas as GaxCall, request, callSettings ); @@ -971,7 +971,7 @@ export class SchemaServiceClient { this.initialize(); return this.descriptors.page.listSchemas.asyncIterate( this.innerApiCalls['listSchemas'] as GaxCall, - request as unknown as RequestType, + request as {}, callSettings ) as AsyncIterable; } diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 730e64935c4..aa7b2478035 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -31,7 +31,6 @@ import { } from 'google-gax'; import {Transform} from 'stream'; -import {RequestType} from 'google-gax/build/src/apitypes'; import {PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); @@ -312,7 +311,8 @@ export class SubscriberClient { const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], - descriptor + descriptor, + this._opts.fallback ); this.innerApiCalls[methodName] = apiCall; @@ -1862,7 +1862,7 @@ export class SubscriberClient { const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSubscriptions.createStream( - this.innerApiCalls.listSubscriptions as gax.GaxCall, + this.innerApiCalls.listSubscriptions as GaxCall, request, callSettings ); @@ -1911,7 +1911,7 @@ export class SubscriberClient { this.initialize(); return this.descriptors.page.listSubscriptions.asyncIterate( this.innerApiCalls['listSubscriptions'] as GaxCall, - request as unknown as RequestType, + request as {}, callSettings ) as AsyncIterable; } @@ -2054,7 +2054,7 @@ export class SubscriberClient { const callSettings = defaultCallSettings.merge(options); this.initialize(); return this.descriptors.page.listSnapshots.createStream( - this.innerApiCalls.listSnapshots as gax.GaxCall, + this.innerApiCalls.listSnapshots as GaxCall, request, callSettings ); @@ -2103,7 +2103,7 @@ export class SubscriberClient { this.initialize(); return this.descriptors.page.listSnapshots.asyncIterate( this.innerApiCalls['listSnapshots'] as GaxCall, - request as unknown as RequestType, + request as {}, callSettings ) as AsyncIterable; } diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 80cdf6a8e2d..0e93f3ad599 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -113,99 +113,101 @@ function stubAsyncIterationCall( } describe('v1.PublisherClient', () => { - it('has servicePath', () => { - const servicePath = publisherModule.v1.PublisherClient.servicePath; - assert(servicePath); - }); - - it('has apiEndpoint', () => { - const apiEndpoint = publisherModule.v1.PublisherClient.apiEndpoint; - assert(apiEndpoint); - }); - - it('has port', () => { - const port = publisherModule.v1.PublisherClient.port; - assert(port); - assert(typeof port === 'number'); - }); + describe('Common methods', () => { + it('has servicePath', () => { + const servicePath = publisherModule.v1.PublisherClient.servicePath; + assert(servicePath); + }); - it('should create a client with no option', () => { - const client = new publisherModule.v1.PublisherClient(); - assert(client); - }); + it('has apiEndpoint', () => { + const apiEndpoint = publisherModule.v1.PublisherClient.apiEndpoint; + assert(apiEndpoint); + }); - it('should create a client with gRPC fallback', () => { - const client = new publisherModule.v1.PublisherClient({ - fallback: true, + it('has port', () => { + const port = publisherModule.v1.PublisherClient.port; + assert(port); + assert(typeof port === 'number'); }); - assert(client); - }); - it('has initialize method and supports deferred initialization', async () => { - const client = new publisherModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('should create a client with no option', () => { + const client = new publisherModule.v1.PublisherClient(); + assert(client); }); - assert.strictEqual(client.publisherStub, undefined); - await client.initialize(); - assert(client.publisherStub); - }); - it('has close method for the initialized client', done => { - const client = new publisherModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('should create a client with gRPC fallback', () => { + const client = new publisherModule.v1.PublisherClient({ + fallback: true, + }); + assert(client); }); - client.initialize(); - assert(client.publisherStub); - client.close().then(() => { - done(); + + it('has initialize method and supports deferred initialization', async () => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.publisherStub, undefined); + await client.initialize(); + assert(client.publisherStub); }); - }); - it('has close method for the non-initialized client', done => { - const client = new publisherModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has close method for the initialized client', done => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + assert(client.publisherStub); + client.close().then(() => { + done(); + }); }); - assert.strictEqual(client.publisherStub, undefined); - client.close().then(() => { - done(); + + it('has close method for the non-initialized client', done => { + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.publisherStub, undefined); + client.close().then(() => { + done(); + }); }); - }); - it('has getProjectId method', async () => { - const fakeProjectId = 'fake-project-id'; - const client = new publisherModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has getProjectId method', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); + const result = await client.getProjectId(); + assert.strictEqual(result, fakeProjectId); + assert((client.auth.getProjectId as SinonStub).calledWithExactly()); }); - client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); - const result = await client.getProjectId(); - assert.strictEqual(result, fakeProjectId); - assert((client.auth.getProjectId as SinonStub).calledWithExactly()); - }); - it('has getProjectId method with callback', async () => { - const fakeProjectId = 'fake-project-id'; - const client = new publisherModule.v1.PublisherClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - client.auth.getProjectId = sinon - .stub() - .callsArgWith(0, null, fakeProjectId); - const promise = new Promise((resolve, reject) => { - client.getProjectId((err?: Error | null, projectId?: string | null) => { - if (err) { - reject(err); - } else { - resolve(projectId); - } + it('has getProjectId method with callback', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new publisherModule.v1.PublisherClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon + .stub() + .callsArgWith(0, null, fakeProjectId); + const promise = new Promise((resolve, reject) => { + client.getProjectId((err?: Error | null, projectId?: string | null) => { + if (err) { + reject(err); + } else { + resolve(projectId); + } + }); }); + const result = await promise; + assert.strictEqual(result, fakeProjectId); }); - const result = await promise; - assert.strictEqual(result, fakeProjectId); }); describe('createTopic', () => { diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 3d903d4824d..763b62eecd7 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -113,99 +113,103 @@ function stubAsyncIterationCall( } describe('v1.SchemaServiceClient', () => { - it('has servicePath', () => { - const servicePath = schemaserviceModule.v1.SchemaServiceClient.servicePath; - assert(servicePath); - }); - - it('has apiEndpoint', () => { - const apiEndpoint = schemaserviceModule.v1.SchemaServiceClient.apiEndpoint; - assert(apiEndpoint); - }); - - it('has port', () => { - const port = schemaserviceModule.v1.SchemaServiceClient.port; - assert(port); - assert(typeof port === 'number'); - }); - - it('should create a client with no option', () => { - const client = new schemaserviceModule.v1.SchemaServiceClient(); - assert(client); - }); + describe('Common methods', () => { + it('has servicePath', () => { + const servicePath = + schemaserviceModule.v1.SchemaServiceClient.servicePath; + assert(servicePath); + }); - it('should create a client with gRPC fallback', () => { - const client = new schemaserviceModule.v1.SchemaServiceClient({ - fallback: true, + it('has apiEndpoint', () => { + const apiEndpoint = + schemaserviceModule.v1.SchemaServiceClient.apiEndpoint; + assert(apiEndpoint); }); - assert(client); - }); - it('has initialize method and supports deferred initialization', async () => { - const client = new schemaserviceModule.v1.SchemaServiceClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has port', () => { + const port = schemaserviceModule.v1.SchemaServiceClient.port; + assert(port); + assert(typeof port === 'number'); }); - assert.strictEqual(client.schemaServiceStub, undefined); - await client.initialize(); - assert(client.schemaServiceStub); - }); - it('has close method for the initialized client', done => { - const client = new schemaserviceModule.v1.SchemaServiceClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('should create a client with no option', () => { + const client = new schemaserviceModule.v1.SchemaServiceClient(); + assert(client); }); - client.initialize(); - assert(client.schemaServiceStub); - client.close().then(() => { - done(); + + it('should create a client with gRPC fallback', () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + fallback: true, + }); + assert(client); }); - }); - it('has close method for the non-initialized client', done => { - const client = new schemaserviceModule.v1.SchemaServiceClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has initialize method and supports deferred initialization', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.schemaServiceStub, undefined); + await client.initialize(); + assert(client.schemaServiceStub); }); - assert.strictEqual(client.schemaServiceStub, undefined); - client.close().then(() => { - done(); + + it('has close method for the initialized client', done => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + assert(client.schemaServiceStub); + client.close().then(() => { + done(); + }); }); - }); - it('has getProjectId method', async () => { - const fakeProjectId = 'fake-project-id'; - const client = new schemaserviceModule.v1.SchemaServiceClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has close method for the non-initialized client', done => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.schemaServiceStub, undefined); + client.close().then(() => { + done(); + }); }); - client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); - const result = await client.getProjectId(); - assert.strictEqual(result, fakeProjectId); - assert((client.auth.getProjectId as SinonStub).calledWithExactly()); - }); - it('has getProjectId method with callback', async () => { - const fakeProjectId = 'fake-project-id'; - const client = new schemaserviceModule.v1.SchemaServiceClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has getProjectId method', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); + const result = await client.getProjectId(); + assert.strictEqual(result, fakeProjectId); + assert((client.auth.getProjectId as SinonStub).calledWithExactly()); }); - client.auth.getProjectId = sinon - .stub() - .callsArgWith(0, null, fakeProjectId); - const promise = new Promise((resolve, reject) => { - client.getProjectId((err?: Error | null, projectId?: string | null) => { - if (err) { - reject(err); - } else { - resolve(projectId); - } + + it('has getProjectId method with callback', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon + .stub() + .callsArgWith(0, null, fakeProjectId); + const promise = new Promise((resolve, reject) => { + client.getProjectId((err?: Error | null, projectId?: string | null) => { + if (err) { + reject(err); + } else { + resolve(projectId); + } + }); }); + const result = await promise; + assert.strictEqual(result, fakeProjectId); }); - const result = await promise; - assert.strictEqual(result, fakeProjectId); }); describe('createSchema', () => { diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index cedb59b6383..a8d955ba346 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -127,99 +127,101 @@ function stubAsyncIterationCall( } describe('v1.SubscriberClient', () => { - it('has servicePath', () => { - const servicePath = subscriberModule.v1.SubscriberClient.servicePath; - assert(servicePath); - }); - - it('has apiEndpoint', () => { - const apiEndpoint = subscriberModule.v1.SubscriberClient.apiEndpoint; - assert(apiEndpoint); - }); - - it('has port', () => { - const port = subscriberModule.v1.SubscriberClient.port; - assert(port); - assert(typeof port === 'number'); - }); + describe('Common methods', () => { + it('has servicePath', () => { + const servicePath = subscriberModule.v1.SubscriberClient.servicePath; + assert(servicePath); + }); - it('should create a client with no option', () => { - const client = new subscriberModule.v1.SubscriberClient(); - assert(client); - }); + it('has apiEndpoint', () => { + const apiEndpoint = subscriberModule.v1.SubscriberClient.apiEndpoint; + assert(apiEndpoint); + }); - it('should create a client with gRPC fallback', () => { - const client = new subscriberModule.v1.SubscriberClient({ - fallback: true, + it('has port', () => { + const port = subscriberModule.v1.SubscriberClient.port; + assert(port); + assert(typeof port === 'number'); }); - assert(client); - }); - it('has initialize method and supports deferred initialization', async () => { - const client = new subscriberModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('should create a client with no option', () => { + const client = new subscriberModule.v1.SubscriberClient(); + assert(client); }); - assert.strictEqual(client.subscriberStub, undefined); - await client.initialize(); - assert(client.subscriberStub); - }); - it('has close method for the initialized client', done => { - const client = new subscriberModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('should create a client with gRPC fallback', () => { + const client = new subscriberModule.v1.SubscriberClient({ + fallback: true, + }); + assert(client); }); - client.initialize(); - assert(client.subscriberStub); - client.close().then(() => { - done(); + + it('has initialize method and supports deferred initialization', async () => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.subscriberStub, undefined); + await client.initialize(); + assert(client.subscriberStub); }); - }); - it('has close method for the non-initialized client', done => { - const client = new subscriberModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has close method for the initialized client', done => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + assert(client.subscriberStub); + client.close().then(() => { + done(); + }); }); - assert.strictEqual(client.subscriberStub, undefined); - client.close().then(() => { - done(); + + it('has close method for the non-initialized client', done => { + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + assert.strictEqual(client.subscriberStub, undefined); + client.close().then(() => { + done(); + }); }); - }); - it('has getProjectId method', async () => { - const fakeProjectId = 'fake-project-id'; - const client = new subscriberModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', + it('has getProjectId method', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); + const result = await client.getProjectId(); + assert.strictEqual(result, fakeProjectId); + assert((client.auth.getProjectId as SinonStub).calledWithExactly()); }); - client.auth.getProjectId = sinon.stub().resolves(fakeProjectId); - const result = await client.getProjectId(); - assert.strictEqual(result, fakeProjectId); - assert((client.auth.getProjectId as SinonStub).calledWithExactly()); - }); - it('has getProjectId method with callback', async () => { - const fakeProjectId = 'fake-project-id'; - const client = new subscriberModule.v1.SubscriberClient({ - credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - client.auth.getProjectId = sinon - .stub() - .callsArgWith(0, null, fakeProjectId); - const promise = new Promise((resolve, reject) => { - client.getProjectId((err?: Error | null, projectId?: string | null) => { - if (err) { - reject(err); - } else { - resolve(projectId); - } + it('has getProjectId method with callback', async () => { + const fakeProjectId = 'fake-project-id'; + const client = new subscriberModule.v1.SubscriberClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.auth.getProjectId = sinon + .stub() + .callsArgWith(0, null, fakeProjectId); + const promise = new Promise((resolve, reject) => { + client.getProjectId((err?: Error | null, projectId?: string | null) => { + if (err) { + reject(err); + } else { + resolve(projectId); + } + }); }); + const result = await promise; + assert.strictEqual(result, fakeProjectId); }); - const result = await promise; - assert.strictEqual(result, fakeProjectId); }); describe('createSubscription', () => { From 678e61913c57b574b8689c4bf9c36936976e3058 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 07:38:12 +0000 Subject: [PATCH 0875/1115] fix: change import long to require (#1611) Source-Link: https://github.com/googleapis/synthtool/commit/d229a1258999f599a90a9b674a1c5541e00db588 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:74ab2b3c71ef27e6d8b69b1d0a0c9d31447777b79ac3cd4be82c265b45f37e5e --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 +- handwritten/pubsub/protos/protos.d.ts | 757 ++- handwritten/pubsub/protos/protos.js | 4364 +++++++++++++----- handwritten/pubsub/protos/protos.json | 24 + 4 files changed, 3854 insertions(+), 1295 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index f3ca5561cb5..f7c796c60cd 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # 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:74ab2b3c71ef27e6d8b69b1d0a0c9d31447777b79ac3cd4be82c265b45f37e5e +# created: 2022-08-22T22:07:00.791732705Z diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index b5960417af4..3fe418a9fca 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as Long from "long"; +import Long = require("long"); import {protobuf as $protobuf} from "google-gax"; /** Namespace google. */ export namespace google { @@ -173,63 +173,63 @@ export namespace google { namespace Publisher { /** - * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * Callback as used by {@link google.pubsub.v1.Publisher|createTopic}. * @param error Error, if any * @param [response] Topic */ type CreateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; /** - * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * Callback as used by {@link google.pubsub.v1.Publisher|updateTopic}. * @param error Error, if any * @param [response] Topic */ type UpdateTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; /** - * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * Callback as used by {@link google.pubsub.v1.Publisher|publish}. * @param error Error, if any * @param [response] PublishResponse */ type PublishCallback = (error: (Error|null), response?: google.pubsub.v1.PublishResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * Callback as used by {@link google.pubsub.v1.Publisher|getTopic}. * @param error Error, if any * @param [response] Topic */ type GetTopicCallback = (error: (Error|null), response?: google.pubsub.v1.Topic) => void; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * Callback as used by {@link google.pubsub.v1.Publisher|listTopics}. * @param error Error, if any * @param [response] ListTopicsResponse */ type ListTopicsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicsResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * Callback as used by {@link google.pubsub.v1.Publisher|listTopicSubscriptions}. * @param error Error, if any * @param [response] ListTopicSubscriptionsResponse */ type ListTopicSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSubscriptionsResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * Callback as used by {@link google.pubsub.v1.Publisher|listTopicSnapshots}. * @param error Error, if any * @param [response] ListTopicSnapshotsResponse */ type ListTopicSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListTopicSnapshotsResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * Callback as used by {@link google.pubsub.v1.Publisher|deleteTopic}. * @param error Error, if any * @param [response] Empty */ type DeleteTopicCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; /** - * Callback as used by {@link google.pubsub.v1.Publisher#detachSubscription}. + * Callback as used by {@link google.pubsub.v1.Publisher|detachSubscription}. * @param error Error, if any * @param [response] DetachSubscriptionResponse */ @@ -324,6 +324,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for MessageStoragePolicy + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a SchemaSettings. */ @@ -420,6 +427,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for SchemaSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a Topic. */ @@ -546,6 +560,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Topic + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a PubsubMessage. */ @@ -660,6 +681,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PubsubMessage + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a GetTopicRequest. */ @@ -750,6 +778,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for GetTopicRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an UpdateTopicRequest. */ @@ -846,6 +881,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for UpdateTopicRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a PublishRequest. */ @@ -942,6 +984,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PublishRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a PublishResponse. */ @@ -1032,6 +1081,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PublishResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListTopicsRequest. */ @@ -1134,6 +1190,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListTopicsRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListTopicsResponse. */ @@ -1230,6 +1293,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListTopicsResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListTopicSubscriptionsRequest. */ @@ -1332,6 +1402,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListTopicSubscriptionsRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListTopicSubscriptionsResponse. */ @@ -1428,6 +1505,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListTopicSubscriptionsResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListTopicSnapshotsRequest. */ @@ -1530,6 +1614,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListTopicSnapshotsRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListTopicSnapshotsResponse. */ @@ -1626,6 +1717,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListTopicSnapshotsResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a DeleteTopicRequest. */ @@ -1716,6 +1814,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DeleteTopicRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a DetachSubscriptionRequest. */ @@ -1806,6 +1911,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DetachSubscriptionRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a DetachSubscriptionResponse. */ @@ -1890,6 +2002,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DetachSubscriptionResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Represents a Subscriber */ @@ -2140,112 +2259,112 @@ export namespace google { namespace Subscriber { /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * Callback as used by {@link google.pubsub.v1.Subscriber|createSubscription}. * @param error Error, if any * @param [response] Subscription */ type CreateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * Callback as used by {@link google.pubsub.v1.Subscriber|getSubscription}. * @param error Error, if any * @param [response] Subscription */ type GetSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * Callback as used by {@link google.pubsub.v1.Subscriber|updateSubscription}. * @param error Error, if any * @param [response] Subscription */ type UpdateSubscriptionCallback = (error: (Error|null), response?: google.pubsub.v1.Subscription) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * Callback as used by {@link google.pubsub.v1.Subscriber|listSubscriptions}. * @param error Error, if any * @param [response] ListSubscriptionsResponse */ type ListSubscriptionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSubscriptionsResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * Callback as used by {@link google.pubsub.v1.Subscriber|deleteSubscription}. * @param error Error, if any * @param [response] Empty */ type DeleteSubscriptionCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * Callback as used by {@link google.pubsub.v1.Subscriber|modifyAckDeadline}. * @param error Error, if any * @param [response] Empty */ type ModifyAckDeadlineCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * Callback as used by {@link google.pubsub.v1.Subscriber|acknowledge}. * @param error Error, if any * @param [response] Empty */ type AcknowledgeCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * Callback as used by {@link google.pubsub.v1.Subscriber|pull}. * @param error Error, if any * @param [response] PullResponse */ type PullCallback = (error: (Error|null), response?: google.pubsub.v1.PullResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * Callback as used by {@link google.pubsub.v1.Subscriber|streamingPull}. * @param error Error, if any * @param [response] StreamingPullResponse */ type StreamingPullCallback = (error: (Error|null), response?: google.pubsub.v1.StreamingPullResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * Callback as used by {@link google.pubsub.v1.Subscriber|modifyPushConfig}. * @param error Error, if any * @param [response] Empty */ type ModifyPushConfigCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * Callback as used by {@link google.pubsub.v1.Subscriber|getSnapshot}. * @param error Error, if any * @param [response] Snapshot */ type GetSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * Callback as used by {@link google.pubsub.v1.Subscriber|listSnapshots}. * @param error Error, if any * @param [response] ListSnapshotsResponse */ type ListSnapshotsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSnapshotsResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * Callback as used by {@link google.pubsub.v1.Subscriber|createSnapshot}. * @param error Error, if any * @param [response] Snapshot */ type CreateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * Callback as used by {@link google.pubsub.v1.Subscriber|updateSnapshot}. * @param error Error, if any * @param [response] Snapshot */ type UpdateSnapshotCallback = (error: (Error|null), response?: google.pubsub.v1.Snapshot) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * Callback as used by {@link google.pubsub.v1.Subscriber|deleteSnapshot}. * @param error Error, if any * @param [response] Empty */ type DeleteSnapshotCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * Callback as used by {@link google.pubsub.v1.Subscriber|seek}. * @param error Error, if any * @param [response] SeekResponse */ @@ -2436,6 +2555,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Subscription + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace Subscription { @@ -2542,6 +2668,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for RetryPolicy + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a DeadLetterPolicy. */ @@ -2638,6 +2771,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DeadLetterPolicy + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an ExpirationPolicy. */ @@ -2728,6 +2868,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ExpirationPolicy + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a PushConfig. */ @@ -2833,6 +2980,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PushConfig + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace PushConfig { @@ -2931,6 +3085,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for OidcToken + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } } @@ -3046,6 +3207,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for BigQueryConfig + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace BigQueryConfig { @@ -3160,6 +3328,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ReceivedMessage + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a GetSubscriptionRequest. */ @@ -3250,6 +3425,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for GetSubscriptionRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an UpdateSubscriptionRequest. */ @@ -3346,6 +3528,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for UpdateSubscriptionRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListSubscriptionsRequest. */ @@ -3448,6 +3637,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListSubscriptionsRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListSubscriptionsResponse. */ @@ -3544,6 +3740,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListSubscriptionsResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a DeleteSubscriptionRequest. */ @@ -3634,6 +3837,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DeleteSubscriptionRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ModifyPushConfigRequest. */ @@ -3730,6 +3940,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ModifyPushConfigRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a PullRequest. */ @@ -3832,6 +4049,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PullRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a PullResponse. */ @@ -3922,6 +4146,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PullResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ModifyAckDeadlineRequest. */ @@ -4024,6 +4255,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ModifyAckDeadlineRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an AcknowledgeRequest. */ @@ -4120,6 +4358,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AcknowledgeRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a StreamingPullRequest. */ @@ -4252,6 +4497,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for StreamingPullRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a StreamingPullResponse. */ @@ -4360,6 +4612,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for StreamingPullResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace StreamingPullResponse { @@ -4464,6 +4723,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AcknowledgeConfirmation + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ModifyAckDeadlineConfirmation. */ @@ -4560,6 +4826,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ModifyAckDeadlineConfirmation + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a SubscriptionProperties. */ @@ -4656,6 +4929,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for SubscriptionProperties + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } } @@ -4759,6 +5039,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CreateSnapshotRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an UpdateSnapshotRequest. */ @@ -4855,6 +5142,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for UpdateSnapshotRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a Snapshot. */ @@ -4963,6 +5257,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Snapshot + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a GetSnapshotRequest. */ @@ -5053,6 +5354,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for GetSnapshotRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListSnapshotsRequest. */ @@ -5155,6 +5463,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListSnapshotsRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListSnapshotsResponse. */ @@ -5251,6 +5566,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListSnapshotsResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a DeleteSnapshotRequest. */ @@ -5341,6 +5663,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DeleteSnapshotRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a SeekRequest. */ @@ -5446,6 +5775,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for SeekRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a SeekResponse. */ @@ -5530,6 +5866,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for SeekResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Represents a SchemaService */ @@ -5640,42 +5983,42 @@ export namespace google { namespace SchemaService { /** - * Callback as used by {@link google.pubsub.v1.SchemaService#createSchema}. + * Callback as used by {@link google.pubsub.v1.SchemaService|createSchema}. * @param error Error, if any * @param [response] Schema */ type CreateSchemaCallback = (error: (Error|null), response?: google.pubsub.v1.Schema) => void; /** - * Callback as used by {@link google.pubsub.v1.SchemaService#getSchema}. + * Callback as used by {@link google.pubsub.v1.SchemaService|getSchema}. * @param error Error, if any * @param [response] Schema */ type GetSchemaCallback = (error: (Error|null), response?: google.pubsub.v1.Schema) => void; /** - * Callback as used by {@link google.pubsub.v1.SchemaService#listSchemas}. + * Callback as used by {@link google.pubsub.v1.SchemaService|listSchemas}. * @param error Error, if any * @param [response] ListSchemasResponse */ type ListSchemasCallback = (error: (Error|null), response?: google.pubsub.v1.ListSchemasResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.SchemaService#deleteSchema}. + * Callback as used by {@link google.pubsub.v1.SchemaService|deleteSchema}. * @param error Error, if any * @param [response] Empty */ type DeleteSchemaCallback = (error: (Error|null), response?: google.protobuf.Empty) => void; /** - * Callback as used by {@link google.pubsub.v1.SchemaService#validateSchema}. + * Callback as used by {@link google.pubsub.v1.SchemaService|validateSchema}. * @param error Error, if any * @param [response] ValidateSchemaResponse */ type ValidateSchemaCallback = (error: (Error|null), response?: google.pubsub.v1.ValidateSchemaResponse) => void; /** - * Callback as used by {@link google.pubsub.v1.SchemaService#validateMessage}. + * Callback as used by {@link google.pubsub.v1.SchemaService|validateMessage}. * @param error Error, if any * @param [response] ValidateMessageResponse */ @@ -5782,6 +6125,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Schema + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace Schema { @@ -5894,6 +6244,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CreateSchemaRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** SchemaView enum. */ @@ -5997,6 +6354,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for GetSchemaRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListSchemasRequest. */ @@ -6105,6 +6469,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListSchemasRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ListSchemasResponse. */ @@ -6201,6 +6572,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListSchemasResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a DeleteSchemaRequest. */ @@ -6291,6 +6669,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DeleteSchemaRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ValidateSchemaRequest. */ @@ -6387,6 +6772,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ValidateSchemaRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ValidateSchemaResponse. */ @@ -6471,6 +6863,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ValidateSchemaResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ValidateMessageRequest. */ @@ -6588,6 +6987,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ValidateMessageRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ValidateMessageResponse. */ @@ -6672,6 +7078,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ValidateMessageResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Encoding enum. */ @@ -6780,6 +7193,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Http + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a HttpRule. */ @@ -6927,6 +7347,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for HttpRule + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a CustomHttpPattern. */ @@ -7023,6 +7450,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CustomHttpPattern + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** FieldBehavior enum. */ @@ -7161,6 +7595,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ResourceDescriptor + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace ResourceDescriptor { @@ -7273,6 +7714,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ResourceReference + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } } @@ -7367,6 +7815,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FileDescriptorSet + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a FileDescriptorProto. */ @@ -7407,6 +7862,9 @@ export namespace google { /** FileDescriptorProto syntax */ syntax?: (string|null); + + /** FileDescriptorProto edition */ + edition?: (string|null); } /** Represents a FileDescriptorProto. */ @@ -7454,6 +7912,9 @@ export namespace google { /** FileDescriptorProto syntax. */ public syntax: string; + /** FileDescriptorProto edition. */ + public edition: string; + /** * Creates a new FileDescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -7523,6 +7984,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FileDescriptorProto + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a DescriptorProto. */ @@ -7667,6 +8135,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DescriptorProto + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace DescriptorProto { @@ -7771,6 +8246,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ExtensionRange + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ReservedRange. */ @@ -7867,6 +8349,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ReservedRange + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } } @@ -7958,6 +8447,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ExtensionRangeOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a FieldDescriptorProto. */ @@ -8108,6 +8604,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FieldDescriptorProto + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace FieldDescriptorProto { @@ -8236,6 +8739,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for OneofDescriptorProto + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an EnumDescriptorProto. */ @@ -8350,6 +8860,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for EnumDescriptorProto + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace EnumDescriptorProto { @@ -8448,6 +8965,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for EnumReservedRange + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } } @@ -8551,6 +9075,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for EnumValueDescriptorProto + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ServiceDescriptorProto. */ @@ -8653,6 +9184,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ServiceDescriptorProto + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a MethodDescriptorProto. */ @@ -8773,6 +9311,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for MethodDescriptorProto + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a FileOptions. */ @@ -8986,6 +9531,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FileOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace FileOptions { @@ -9113,6 +9665,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for MessageOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a FieldOptions. */ @@ -9130,6 +9689,9 @@ export namespace google { /** FieldOptions lazy */ lazy?: (boolean|null); + /** FieldOptions unverifiedLazy */ + unverifiedLazy?: (boolean|null); + /** FieldOptions deprecated */ deprecated?: (boolean|null); @@ -9167,6 +9729,9 @@ export namespace google { /** FieldOptions lazy. */ public lazy: boolean; + /** FieldOptions unverifiedLazy. */ + public unverifiedLazy: boolean; + /** FieldOptions deprecated. */ public deprecated: boolean; @@ -9245,6 +9810,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FieldOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace FieldOptions { @@ -9352,6 +9924,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for OneofOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an EnumOptions. */ @@ -9454,6 +10033,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for EnumOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an EnumValueOptions. */ @@ -9550,6 +10136,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for EnumValueOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a ServiceOptions. */ @@ -9652,6 +10245,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ServiceOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a MethodOptions. */ @@ -9760,6 +10360,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for MethodOptions + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace MethodOptions { @@ -9896,6 +10503,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for UninterpretedOption + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace UninterpretedOption { @@ -9994,6 +10608,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for NamePart + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } } @@ -10085,6 +10706,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for SourceCodeInfo + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace SourceCodeInfo { @@ -10201,6 +10829,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Location + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } } @@ -10292,6 +10927,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for GeneratedCodeInfo + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } namespace GeneratedCodeInfo { @@ -10310,6 +10952,9 @@ export namespace google { /** Annotation end */ end?: (number|null); + + /** Annotation semantic */ + semantic?: (google.protobuf.GeneratedCodeInfo.Annotation.Semantic|keyof typeof google.protobuf.GeneratedCodeInfo.Annotation.Semantic|null); } /** Represents an Annotation. */ @@ -10333,6 +10978,9 @@ export namespace google { /** Annotation end. */ public end: number; + /** Annotation semantic. */ + public semantic: (google.protobuf.GeneratedCodeInfo.Annotation.Semantic|keyof typeof google.protobuf.GeneratedCodeInfo.Annotation.Semantic); + /** * Creates a new Annotation instance using the specified properties. * @param [properties] Properties to set @@ -10402,6 +11050,23 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Annotation + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace Annotation { + + /** Semantic enum. */ + enum Semantic { + NONE = 0, + SET = 1, + ALIAS = 2 + } } } @@ -10499,6 +11164,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Duration + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of an Empty. */ @@ -10583,6 +11255,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Empty + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a FieldMask. */ @@ -10673,6 +11352,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FieldMask + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a Timestamp. */ @@ -10769,6 +11455,13 @@ export namespace google { * @returns JSON object */ public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Timestamp + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } } } diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index e6e3b207045..8b1d6fc4619 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -90,7 +90,7 @@ }; /** - * Callback as used by {@link google.pubsub.v1.Publisher#createTopic}. + * Callback as used by {@link google.pubsub.v1.Publisher|createTopic}. * @memberof google.pubsub.v1.Publisher * @typedef CreateTopicCallback * @type {function} @@ -123,7 +123,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#updateTopic}. + * Callback as used by {@link google.pubsub.v1.Publisher|updateTopic}. * @memberof google.pubsub.v1.Publisher * @typedef UpdateTopicCallback * @type {function} @@ -156,7 +156,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#publish}. + * Callback as used by {@link google.pubsub.v1.Publisher|publish}. * @memberof google.pubsub.v1.Publisher * @typedef PublishCallback * @type {function} @@ -189,7 +189,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#getTopic}. + * Callback as used by {@link google.pubsub.v1.Publisher|getTopic}. * @memberof google.pubsub.v1.Publisher * @typedef GetTopicCallback * @type {function} @@ -222,7 +222,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopics}. + * Callback as used by {@link google.pubsub.v1.Publisher|listTopics}. * @memberof google.pubsub.v1.Publisher * @typedef ListTopicsCallback * @type {function} @@ -255,7 +255,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSubscriptions}. + * Callback as used by {@link google.pubsub.v1.Publisher|listTopicSubscriptions}. * @memberof google.pubsub.v1.Publisher * @typedef ListTopicSubscriptionsCallback * @type {function} @@ -288,7 +288,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#listTopicSnapshots}. + * Callback as used by {@link google.pubsub.v1.Publisher|listTopicSnapshots}. * @memberof google.pubsub.v1.Publisher * @typedef ListTopicSnapshotsCallback * @type {function} @@ -321,7 +321,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#deleteTopic}. + * Callback as used by {@link google.pubsub.v1.Publisher|deleteTopic}. * @memberof google.pubsub.v1.Publisher * @typedef DeleteTopicCallback * @type {function} @@ -354,7 +354,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Publisher#detachSubscription}. + * Callback as used by {@link google.pubsub.v1.Publisher|detachSubscription}. * @memberof google.pubsub.v1.Publisher * @typedef DetachSubscriptionCallback * @type {function} @@ -483,11 +483,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.allowedPersistenceRegions && message.allowedPersistenceRegions.length)) - message.allowedPersistenceRegions = []; - message.allowedPersistenceRegions.push(reader.string()); - break; + case 1: { + if (!(message.allowedPersistenceRegions && message.allowedPersistenceRegions.length)) + message.allowedPersistenceRegions = []; + message.allowedPersistenceRegions.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -589,6 +590,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for MessageStoragePolicy + * @function getTypeUrl + * @memberof google.pubsub.v1.MessageStoragePolicy + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + MessageStoragePolicy.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.MessageStoragePolicy"; + }; + return MessageStoragePolicy; })(); @@ -695,12 +711,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.schema = reader.string(); - break; - case 2: - message.encoding = reader.int32(); - break; + case 1: { + message.schema = reader.string(); + break; + } + case 2: { + message.encoding = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -817,6 +835,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for SchemaSettings + * @function getTypeUrl + * @memberof google.pubsub.v1.SchemaSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + SchemaSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.SchemaSettings"; + }; + return SchemaSettings; })(); @@ -980,46 +1013,53 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (message.labels === $util.emptyObject) - message.labels = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + if (message.labels === $util.emptyObject) + message.labels = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } } + message.labels[key] = value; + break; + } + case 3: { + message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); + break; + } + case 5: { + message.kmsKeyName = reader.string(); + break; + } + case 6: { + message.schemaSettings = $root.google.pubsub.v1.SchemaSettings.decode(reader, reader.uint32()); + break; + } + case 7: { + message.satisfiesPzs = reader.bool(); + break; + } + case 8: { + message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; } - message.labels[key] = value; - break; - case 3: - message.messageStoragePolicy = $root.google.pubsub.v1.MessageStoragePolicy.decode(reader, reader.uint32()); - break; - case 5: - message.kmsKeyName = reader.string(); - break; - case 6: - message.schemaSettings = $root.google.pubsub.v1.SchemaSettings.decode(reader, reader.uint32()); - break; - case 7: - message.satisfiesPzs = reader.bool(); - break; - case 8: - message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; default: reader.skipType(tag & 7); break; @@ -1188,6 +1228,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Topic + * @function getTypeUrl + * @memberof google.pubsub.v1.Topic + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Topic.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.Topic"; + }; + return Topic; })(); @@ -1329,40 +1384,45 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.data = reader.bytes(); - break; - case 2: - if (message.attributes === $util.emptyObject) - message.attributes = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; + case 1: { + message.data = reader.bytes(); + break; + } + case 2: { + if (message.attributes === $util.emptyObject) + message.attributes = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } } + message.attributes[key] = value; + break; + } + case 3: { + message.messageId = reader.string(); + break; + } + case 4: { + message.publishTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + } + case 5: { + message.orderingKey = reader.string(); + break; } - message.attributes[key] = value; - break; - case 3: - message.messageId = reader.string(); - break; - case 4: - message.publishTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 5: - message.orderingKey = reader.string(); - break; default: reader.skipType(tag & 7); break; @@ -1438,7 +1498,7 @@ if (object.data != null) if (typeof object.data === "string") $util.base64.decode(object.data, message.data = $util.newBuffer($util.base64.length(object.data)), 0); - else if (object.data.length) + else if (object.data.length >= 0) message.data = object.data; if (object.attributes) { if (typeof object.attributes !== "object") @@ -1514,6 +1574,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for PubsubMessage + * @function getTypeUrl + * @memberof google.pubsub.v1.PubsubMessage + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PubsubMessage.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PubsubMessage"; + }; + return PubsubMessage; })(); @@ -1609,9 +1684,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; + case 1: { + message.topic = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -1701,6 +1777,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for GetTopicRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.GetTopicRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + GetTopicRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.GetTopicRequest"; + }; + return GetTopicRequest; })(); @@ -1807,12 +1898,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.topic = $root.google.pubsub.v1.Topic.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); - break; + case 1: { + message.topic = $root.google.pubsub.v1.Topic.decode(reader, reader.uint32()); + break; + } + case 2: { + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -1921,6 +2014,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for UpdateTopicRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.UpdateTopicRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + UpdateTopicRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.UpdateTopicRequest"; + }; + return UpdateTopicRequest; })(); @@ -2029,14 +2137,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - case 2: - if (!(message.messages && message.messages.length)) - message.messages = []; - message.messages.push($root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32())); - break; + case 1: { + message.topic = reader.string(); + break; + } + case 2: { + if (!(message.messages && message.messages.length)) + message.messages = []; + message.messages.push($root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -2152,6 +2262,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for PublishRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.PublishRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PublishRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PublishRequest"; + }; + return PublishRequest; })(); @@ -2249,11 +2374,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.messageIds && message.messageIds.length)) - message.messageIds = []; - message.messageIds.push(reader.string()); - break; + case 1: { + if (!(message.messageIds && message.messageIds.length)) + message.messageIds = []; + message.messageIds.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -2355,6 +2481,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for PublishResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.PublishResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PublishResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PublishResponse"; + }; + return PublishResponse; })(); @@ -2472,15 +2613,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.project = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; + case 1: { + message.project = reader.string(); + break; + } + case 2: { + message.pageSize = reader.int32(); + break; + } + case 3: { + message.pageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -2587,6 +2731,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListTopicsRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ListTopicsRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListTopicsRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListTopicsRequest"; + }; + return ListTopicsRequest; })(); @@ -2695,14 +2854,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.topics && message.topics.length)) - message.topics = []; - message.topics.push($root.google.pubsub.v1.Topic.decode(reader, reader.uint32())); - break; - case 2: - message.nextPageToken = reader.string(); - break; + case 1: { + if (!(message.topics && message.topics.length)) + message.topics = []; + message.topics.push($root.google.pubsub.v1.Topic.decode(reader, reader.uint32())); + break; + } + case 2: { + message.nextPageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -2818,6 +2979,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListTopicsResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ListTopicsResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListTopicsResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListTopicsResponse"; + }; + return ListTopicsResponse; })(); @@ -2935,15 +3111,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; + case 1: { + message.topic = reader.string(); + break; + } + case 2: { + message.pageSize = reader.int32(); + break; + } + case 3: { + message.pageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -3050,6 +3229,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListTopicSubscriptionsRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ListTopicSubscriptionsRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListTopicSubscriptionsRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListTopicSubscriptionsRequest"; + }; + return ListTopicSubscriptionsRequest; })(); @@ -3158,14 +3352,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.subscriptions && message.subscriptions.length)) - message.subscriptions = []; - message.subscriptions.push(reader.string()); - break; - case 2: - message.nextPageToken = reader.string(); - break; + case 1: { + if (!(message.subscriptions && message.subscriptions.length)) + message.subscriptions = []; + message.subscriptions.push(reader.string()); + break; + } + case 2: { + message.nextPageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -3276,6 +3472,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListTopicSubscriptionsResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ListTopicSubscriptionsResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListTopicSubscriptionsResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListTopicSubscriptionsResponse"; + }; + return ListTopicSubscriptionsResponse; })(); @@ -3393,15 +3604,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; + case 1: { + message.topic = reader.string(); + break; + } + case 2: { + message.pageSize = reader.int32(); + break; + } + case 3: { + message.pageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -3508,6 +3722,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListTopicSnapshotsRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ListTopicSnapshotsRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListTopicSnapshotsRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListTopicSnapshotsRequest"; + }; + return ListTopicSnapshotsRequest; })(); @@ -3616,14 +3845,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.snapshots && message.snapshots.length)) - message.snapshots = []; - message.snapshots.push(reader.string()); - break; - case 2: - message.nextPageToken = reader.string(); - break; + case 1: { + if (!(message.snapshots && message.snapshots.length)) + message.snapshots = []; + message.snapshots.push(reader.string()); + break; + } + case 2: { + message.nextPageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -3734,6 +3965,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListTopicSnapshotsResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ListTopicSnapshotsResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListTopicSnapshotsResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListTopicSnapshotsResponse"; + }; + return ListTopicSnapshotsResponse; })(); @@ -3829,9 +4075,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.topic = reader.string(); - break; + case 1: { + message.topic = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -3921,10 +4168,25 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return DeleteTopicRequest; - })(); - - v1.DetachSubscriptionRequest = (function() { + /** + * Gets the default type url for DeleteTopicRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.DeleteTopicRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DeleteTopicRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.DeleteTopicRequest"; + }; + + return DeleteTopicRequest; + })(); + + v1.DetachSubscriptionRequest = (function() { /** * Properties of a DetachSubscriptionRequest. @@ -4016,9 +4278,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; + case 1: { + message.subscription = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -4108,6 +4371,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for DetachSubscriptionRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.DetachSubscriptionRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DetachSubscriptionRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.DetachSubscriptionRequest"; + }; + return DetachSubscriptionRequest; })(); @@ -4268,6 +4546,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for DetachSubscriptionResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.DetachSubscriptionResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DetachSubscriptionResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.DetachSubscriptionResponse"; + }; + return DetachSubscriptionResponse; })(); @@ -4304,7 +4597,7 @@ }; /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSubscription}. + * Callback as used by {@link google.pubsub.v1.Subscriber|createSubscription}. * @memberof google.pubsub.v1.Subscriber * @typedef CreateSubscriptionCallback * @type {function} @@ -4337,7 +4630,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSubscription}. + * Callback as used by {@link google.pubsub.v1.Subscriber|getSubscription}. * @memberof google.pubsub.v1.Subscriber * @typedef GetSubscriptionCallback * @type {function} @@ -4370,7 +4663,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSubscription}. + * Callback as used by {@link google.pubsub.v1.Subscriber|updateSubscription}. * @memberof google.pubsub.v1.Subscriber * @typedef UpdateSubscriptionCallback * @type {function} @@ -4403,7 +4696,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSubscriptions}. + * Callback as used by {@link google.pubsub.v1.Subscriber|listSubscriptions}. * @memberof google.pubsub.v1.Subscriber * @typedef ListSubscriptionsCallback * @type {function} @@ -4436,7 +4729,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSubscription}. + * Callback as used by {@link google.pubsub.v1.Subscriber|deleteSubscription}. * @memberof google.pubsub.v1.Subscriber * @typedef DeleteSubscriptionCallback * @type {function} @@ -4469,7 +4762,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyAckDeadline}. + * Callback as used by {@link google.pubsub.v1.Subscriber|modifyAckDeadline}. * @memberof google.pubsub.v1.Subscriber * @typedef ModifyAckDeadlineCallback * @type {function} @@ -4502,7 +4795,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#acknowledge}. + * Callback as used by {@link google.pubsub.v1.Subscriber|acknowledge}. * @memberof google.pubsub.v1.Subscriber * @typedef AcknowledgeCallback * @type {function} @@ -4535,7 +4828,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#pull}. + * Callback as used by {@link google.pubsub.v1.Subscriber|pull}. * @memberof google.pubsub.v1.Subscriber * @typedef PullCallback * @type {function} @@ -4568,7 +4861,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#streamingPull}. + * Callback as used by {@link google.pubsub.v1.Subscriber|streamingPull}. * @memberof google.pubsub.v1.Subscriber * @typedef StreamingPullCallback * @type {function} @@ -4601,7 +4894,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#modifyPushConfig}. + * Callback as used by {@link google.pubsub.v1.Subscriber|modifyPushConfig}. * @memberof google.pubsub.v1.Subscriber * @typedef ModifyPushConfigCallback * @type {function} @@ -4634,7 +4927,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#getSnapshot}. + * Callback as used by {@link google.pubsub.v1.Subscriber|getSnapshot}. * @memberof google.pubsub.v1.Subscriber * @typedef GetSnapshotCallback * @type {function} @@ -4667,7 +4960,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#listSnapshots}. + * Callback as used by {@link google.pubsub.v1.Subscriber|listSnapshots}. * @memberof google.pubsub.v1.Subscriber * @typedef ListSnapshotsCallback * @type {function} @@ -4700,7 +4993,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#createSnapshot}. + * Callback as used by {@link google.pubsub.v1.Subscriber|createSnapshot}. * @memberof google.pubsub.v1.Subscriber * @typedef CreateSnapshotCallback * @type {function} @@ -4733,7 +5026,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#updateSnapshot}. + * Callback as used by {@link google.pubsub.v1.Subscriber|updateSnapshot}. * @memberof google.pubsub.v1.Subscriber * @typedef UpdateSnapshotCallback * @type {function} @@ -4766,7 +5059,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#deleteSnapshot}. + * Callback as used by {@link google.pubsub.v1.Subscriber|deleteSnapshot}. * @memberof google.pubsub.v1.Subscriber * @typedef DeleteSnapshotCallback * @type {function} @@ -4799,7 +5092,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.Subscriber#seek}. + * Callback as used by {@link google.pubsub.v1.Subscriber|seek}. * @memberof google.pubsub.v1.Subscriber * @typedef SeekCallback * @type {function} @@ -5104,76 +5397,93 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.topic = reader.string(); - break; - case 4: - message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); - break; - case 18: - message.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.decode(reader, reader.uint32()); - break; - case 5: - message.ackDeadlineSeconds = reader.int32(); - break; - case 7: - message.retainAckedMessages = reader.bool(); - break; - case 8: - message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - case 9: - if (message.labels === $util.emptyObject) - message.labels = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.topic = reader.string(); + break; + } + case 4: { + message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); + break; + } + case 18: { + message.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.decode(reader, reader.uint32()); + break; + } + case 5: { + message.ackDeadlineSeconds = reader.int32(); + break; + } + case 7: { + message.retainAckedMessages = reader.bool(); + break; + } + case 8: { + message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + case 9: { + if (message.labels === $util.emptyObject) + message.labels = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } } + message.labels[key] = value; + break; + } + case 10: { + message.enableMessageOrdering = reader.bool(); + break; + } + case 11: { + message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.decode(reader, reader.uint32()); + break; + } + case 12: { + message.filter = reader.string(); + break; + } + case 13: { + message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.decode(reader, reader.uint32()); + break; + } + case 14: { + message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.decode(reader, reader.uint32()); + break; + } + case 15: { + message.detached = reader.bool(); + break; + } + case 16: { + message.enableExactlyOnceDelivery = reader.bool(); + break; + } + case 17: { + message.topicMessageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + case 19: { + message.state = reader.int32(); + break; } - message.labels[key] = value; - break; - case 10: - message.enableMessageOrdering = reader.bool(); - break; - case 11: - message.expirationPolicy = $root.google.pubsub.v1.ExpirationPolicy.decode(reader, reader.uint32()); - break; - case 12: - message.filter = reader.string(); - break; - case 13: - message.deadLetterPolicy = $root.google.pubsub.v1.DeadLetterPolicy.decode(reader, reader.uint32()); - break; - case 14: - message.retryPolicy = $root.google.pubsub.v1.RetryPolicy.decode(reader, reader.uint32()); - break; - case 15: - message.detached = reader.bool(); - break; - case 16: - message.enableExactlyOnceDelivery = reader.bool(); - break; - case 17: - message.topicMessageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - case 19: - message.state = reader.int32(); - break; default: reader.skipType(tag & 7); break; @@ -5460,6 +5770,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Subscription + * @function getTypeUrl + * @memberof google.pubsub.v1.Subscription + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Subscription.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.Subscription"; + }; + /** * State enum. * @name google.pubsub.v1.Subscription.State @@ -5582,12 +5907,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.minimumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - case 2: - message.maximumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; + case 1: { + message.minimumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + case 2: { + message.maximumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -5696,6 +6023,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for RetryPolicy + * @function getTypeUrl + * @memberof google.pubsub.v1.RetryPolicy + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + RetryPolicy.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.RetryPolicy"; + }; + return RetryPolicy; })(); @@ -5802,12 +6144,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.deadLetterTopic = reader.string(); - break; - case 2: - message.maxDeliveryAttempts = reader.int32(); - break; + case 1: { + message.deadLetterTopic = reader.string(); + break; + } + case 2: { + message.maxDeliveryAttempts = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -5906,6 +6250,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for DeadLetterPolicy + * @function getTypeUrl + * @memberof google.pubsub.v1.DeadLetterPolicy + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DeadLetterPolicy.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.DeadLetterPolicy"; + }; + return DeadLetterPolicy; })(); @@ -6001,9 +6360,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.ttl = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; + case 1: { + message.ttl = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -6098,6 +6458,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ExpirationPolicy + * @function getTypeUrl + * @memberof google.pubsub.v1.ExpirationPolicy + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ExpirationPolicy.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ExpirationPolicy"; + }; + return ExpirationPolicy; })(); @@ -6231,34 +6606,37 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.pushEndpoint = reader.string(); - break; - case 2: - if (message.attributes === $util.emptyObject) - message.attributes = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; + case 1: { + message.pushEndpoint = reader.string(); + break; + } + case 2: { + if (message.attributes === $util.emptyObject) + message.attributes = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } } + message.attributes[key] = value; + break; + } + case 3: { + message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); + break; } - message.attributes[key] = value; - break; - case 3: - message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); - break; default: reader.skipType(tag & 7); break; @@ -6390,6 +6768,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for PushConfig + * @function getTypeUrl + * @memberof google.pubsub.v1.PushConfig + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PushConfig.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PushConfig"; + }; + PushConfig.OidcToken = (function() { /** @@ -6493,12 +6886,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.serviceAccountEmail = reader.string(); - break; - case 2: - message.audience = reader.string(); - break; + case 1: { + message.serviceAccountEmail = reader.string(); + break; + } + case 2: { + message.audience = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -6597,6 +6992,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for OidcToken + * @function getTypeUrl + * @memberof google.pubsub.v1.PushConfig.OidcToken + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + OidcToken.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PushConfig.OidcToken"; + }; + return OidcToken; })(); @@ -6739,21 +7149,26 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.table = reader.string(); - break; - case 2: - message.useTopicSchema = reader.bool(); - break; - case 3: - message.writeMetadata = reader.bool(); - break; - case 4: - message.dropUnknownFields = reader.bool(); - break; - case 5: - message.state = reader.int32(); - break; + case 1: { + message.table = reader.string(); + break; + } + case 2: { + message.useTopicSchema = reader.bool(); + break; + } + case 3: { + message.writeMetadata = reader.bool(); + break; + } + case 4: { + message.dropUnknownFields = reader.bool(); + break; + } + case 5: { + message.state = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -6904,6 +7319,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for BigQueryConfig + * @function getTypeUrl + * @memberof google.pubsub.v1.BigQueryConfig + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + BigQueryConfig.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.BigQueryConfig"; + }; + /** * State enum. * @name google.pubsub.v1.BigQueryConfig.State @@ -7041,15 +7471,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.ackId = reader.string(); - break; - case 2: - message.message = $root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32()); - break; - case 3: - message.deliveryAttempt = reader.int32(); - break; + case 1: { + message.ackId = reader.string(); + break; + } + case 2: { + message.message = $root.google.pubsub.v1.PubsubMessage.decode(reader, reader.uint32()); + break; + } + case 3: { + message.deliveryAttempt = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -7161,6 +7594,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ReceivedMessage + * @function getTypeUrl + * @memberof google.pubsub.v1.ReceivedMessage + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ReceivedMessage.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ReceivedMessage"; + }; + return ReceivedMessage; })(); @@ -7256,9 +7704,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; + case 1: { + message.subscription = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -7348,6 +7797,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for GetSubscriptionRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.GetSubscriptionRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + GetSubscriptionRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.GetSubscriptionRequest"; + }; + return GetSubscriptionRequest; })(); @@ -7454,12 +7918,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = $root.google.pubsub.v1.Subscription.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); - break; + case 1: { + message.subscription = $root.google.pubsub.v1.Subscription.decode(reader, reader.uint32()); + break; + } + case 2: { + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -7568,6 +8034,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for UpdateSubscriptionRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.UpdateSubscriptionRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + UpdateSubscriptionRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.UpdateSubscriptionRequest"; + }; + return UpdateSubscriptionRequest; })(); @@ -7685,15 +8166,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.project = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; + case 1: { + message.project = reader.string(); + break; + } + case 2: { + message.pageSize = reader.int32(); + break; + } + case 3: { + message.pageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -7800,6 +8284,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListSubscriptionsRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ListSubscriptionsRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListSubscriptionsRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListSubscriptionsRequest"; + }; + return ListSubscriptionsRequest; })(); @@ -7908,14 +8407,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.subscriptions && message.subscriptions.length)) - message.subscriptions = []; - message.subscriptions.push($root.google.pubsub.v1.Subscription.decode(reader, reader.uint32())); - break; - case 2: - message.nextPageToken = reader.string(); - break; + case 1: { + if (!(message.subscriptions && message.subscriptions.length)) + message.subscriptions = []; + message.subscriptions.push($root.google.pubsub.v1.Subscription.decode(reader, reader.uint32())); + break; + } + case 2: { + message.nextPageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -8031,6 +8532,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListSubscriptionsResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ListSubscriptionsResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListSubscriptionsResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListSubscriptionsResponse"; + }; + return ListSubscriptionsResponse; })(); @@ -8126,9 +8642,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; + case 1: { + message.subscription = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -8218,6 +8735,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for DeleteSubscriptionRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.DeleteSubscriptionRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DeleteSubscriptionRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.DeleteSubscriptionRequest"; + }; + return DeleteSubscriptionRequest; })(); @@ -8324,12 +8856,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); - break; + case 1: { + message.subscription = reader.string(); + break; + } + case 2: { + message.pushConfig = $root.google.pubsub.v1.PushConfig.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -8433,6 +8967,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ModifyPushConfigRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ModifyPushConfigRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ModifyPushConfigRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ModifyPushConfigRequest"; + }; + return ModifyPushConfigRequest; })(); @@ -8550,15 +9099,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.returnImmediately = reader.bool(); - break; - case 3: - message.maxMessages = reader.int32(); - break; + case 1: { + message.subscription = reader.string(); + break; + } + case 2: { + message.returnImmediately = reader.bool(); + break; + } + case 3: { + message.maxMessages = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -8665,6 +9217,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for PullRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.PullRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PullRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PullRequest"; + }; + return PullRequest; })(); @@ -8762,11 +9329,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.receivedMessages && message.receivedMessages.length)) - message.receivedMessages = []; - message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); - break; + case 1: { + if (!(message.receivedMessages && message.receivedMessages.length)) + message.receivedMessages = []; + message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -8873,6 +9441,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for PullResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.PullResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PullResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PullResponse"; + }; + return PullResponse; })(); @@ -8992,17 +9575,20 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 4: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; - case 3: - message.ackDeadlineSeconds = reader.int32(); - break; + case 1: { + message.subscription = reader.string(); + break; + } + case 4: { + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + } + case 3: { + message.ackDeadlineSeconds = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -9122,6 +9708,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ModifyAckDeadlineRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ModifyAckDeadlineRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ModifyAckDeadlineRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ModifyAckDeadlineRequest"; + }; + return ModifyAckDeadlineRequest; })(); @@ -9230,14 +9831,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; + case 1: { + message.subscription = reader.string(); + break; + } + case 2: { + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -9348,6 +9951,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for AcknowledgeRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.AcknowledgeRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AcknowledgeRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.AcknowledgeRequest"; + }; + return AcknowledgeRequest; })(); @@ -9529,41 +10147,49 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; - case 3: - if (!(message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length)) - message.modifyDeadlineSeconds = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) + case 1: { + message.subscription = reader.string(); + break; + } + case 2: { + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + } + case 3: { + if (!(message.modifyDeadlineSeconds && message.modifyDeadlineSeconds.length)) + message.modifyDeadlineSeconds = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.modifyDeadlineSeconds.push(reader.int32()); + } else message.modifyDeadlineSeconds.push(reader.int32()); - } else - message.modifyDeadlineSeconds.push(reader.int32()); - break; - case 4: - if (!(message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length)) - message.modifyDeadlineAckIds = []; - message.modifyDeadlineAckIds.push(reader.string()); - break; - case 5: - message.streamAckDeadlineSeconds = reader.int32(); - break; - case 6: - message.clientId = reader.string(); - break; - case 7: - message.maxOutstandingMessages = reader.int64(); - break; - case 8: - message.maxOutstandingBytes = reader.int64(); - break; + break; + } + case 4: { + if (!(message.modifyDeadlineAckIds && message.modifyDeadlineAckIds.length)) + message.modifyDeadlineAckIds = []; + message.modifyDeadlineAckIds.push(reader.string()); + break; + } + case 5: { + message.streamAckDeadlineSeconds = reader.int32(); + break; + } + case 6: { + message.clientId = reader.string(); + break; + } + case 7: { + message.maxOutstandingMessages = reader.int64(); + break; + } + case 8: { + message.maxOutstandingBytes = reader.int64(); + break; + } default: reader.skipType(tag & 7); break; @@ -9776,6 +10402,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for StreamingPullRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.StreamingPullRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + StreamingPullRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.StreamingPullRequest"; + }; + return StreamingPullRequest; })(); @@ -9906,20 +10547,24 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.receivedMessages && message.receivedMessages.length)) - message.receivedMessages = []; - message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); - break; - case 5: - message.acknowledgeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.decode(reader, reader.uint32()); - break; - case 3: - message.modifyAckDeadlineConfirmation = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.decode(reader, reader.uint32()); - break; - case 4: - message.subscriptionProperties = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.decode(reader, reader.uint32()); - break; + case 1: { + if (!(message.receivedMessages && message.receivedMessages.length)) + message.receivedMessages = []; + message.receivedMessages.push($root.google.pubsub.v1.ReceivedMessage.decode(reader, reader.uint32())); + break; + } + case 5: { + message.acknowledgeConfirmation = $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.decode(reader, reader.uint32()); + break; + } + case 3: { + message.modifyAckDeadlineConfirmation = $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.decode(reader, reader.uint32()); + break; + } + case 4: { + message.subscriptionProperties = $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -10067,6 +10712,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for StreamingPullResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.StreamingPullResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + StreamingPullResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.StreamingPullResponse"; + }; + StreamingPullResponse.AcknowledgeConfirmation = (function() { /** @@ -10187,21 +10847,24 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; - case 2: - if (!(message.invalidAckIds && message.invalidAckIds.length)) - message.invalidAckIds = []; - message.invalidAckIds.push(reader.string()); - break; - case 3: - if (!(message.unorderedAckIds && message.unorderedAckIds.length)) - message.unorderedAckIds = []; - message.unorderedAckIds.push(reader.string()); - break; + case 1: { + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + } + case 2: { + if (!(message.invalidAckIds && message.invalidAckIds.length)) + message.invalidAckIds = []; + message.invalidAckIds.push(reader.string()); + break; + } + case 3: { + if (!(message.unorderedAckIds && message.unorderedAckIds.length)) + message.unorderedAckIds = []; + message.unorderedAckIds.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -10344,6 +11007,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for AcknowledgeConfirmation + * @function getTypeUrl + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AcknowledgeConfirmation.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation"; + }; + return AcknowledgeConfirmation; })(); @@ -10454,16 +11132,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.ackIds && message.ackIds.length)) - message.ackIds = []; - message.ackIds.push(reader.string()); - break; - case 2: - if (!(message.invalidAckIds && message.invalidAckIds.length)) - message.invalidAckIds = []; - message.invalidAckIds.push(reader.string()); - break; + case 1: { + if (!(message.ackIds && message.ackIds.length)) + message.ackIds = []; + message.ackIds.push(reader.string()); + break; + } + case 2: { + if (!(message.invalidAckIds && message.invalidAckIds.length)) + message.invalidAckIds = []; + message.invalidAckIds.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -10586,6 +11266,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ModifyAckDeadlineConfirmation + * @function getTypeUrl + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ModifyAckDeadlineConfirmation.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation"; + }; + return ModifyAckDeadlineConfirmation; })(); @@ -10692,12 +11387,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.exactlyOnceDeliveryEnabled = reader.bool(); - break; - case 2: - message.messageOrderingEnabled = reader.bool(); - break; + case 1: { + message.exactlyOnceDeliveryEnabled = reader.bool(); + break; + } + case 2: { + message.messageOrderingEnabled = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -10796,6 +11493,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for SubscriptionProperties + * @function getTypeUrl + * @memberof google.pubsub.v1.StreamingPullResponse.SubscriptionProperties + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + SubscriptionProperties.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.StreamingPullResponse.SubscriptionProperties"; + }; + return SubscriptionProperties; })(); @@ -10918,34 +11630,37 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.subscription = reader.string(); - break; - case 3: - if (message.labels === $util.emptyObject) - message.labels = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.subscription = reader.string(); + break; + } + case 3: { + if (message.labels === $util.emptyObject) + message.labels = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } } + message.labels[key] = value; + break; } - message.labels[key] = value; - break; default: reader.skipType(tag & 7); break; @@ -11067,13 +11782,28 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return CreateSnapshotRequest; - })(); - - v1.UpdateSnapshotRequest = (function() { - /** - * Properties of an UpdateSnapshotRequest. + * Gets the default type url for CreateSnapshotRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CreateSnapshotRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.CreateSnapshotRequest"; + }; + + return CreateSnapshotRequest; + })(); + + v1.UpdateSnapshotRequest = (function() { + + /** + * Properties of an UpdateSnapshotRequest. * @memberof google.pubsub.v1 * @interface IUpdateSnapshotRequest * @property {google.pubsub.v1.ISnapshot|null} [snapshot] UpdateSnapshotRequest snapshot @@ -11173,12 +11903,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.snapshot = $root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32()); - break; - case 2: - message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); - break; + case 1: { + message.snapshot = $root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32()); + break; + } + case 2: { + message.updateMask = $root.google.protobuf.FieldMask.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -11287,6 +12019,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for UpdateSnapshotRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.UpdateSnapshotRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + UpdateSnapshotRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.UpdateSnapshotRequest"; + }; + return UpdateSnapshotRequest; })(); @@ -11417,37 +12164,41 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.topic = reader.string(); - break; - case 3: - message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 4: - if (message.labels === $util.emptyObject) - message.labels = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.topic = reader.string(); + break; + } + case 3: { + message.expireTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + } + case 4: { + if (message.labels === $util.emptyObject) + message.labels = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } } + message.labels[key] = value; + break; } - message.labels[key] = value; - break; default: reader.skipType(tag & 7); break; @@ -11582,6 +12333,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Snapshot + * @function getTypeUrl + * @memberof google.pubsub.v1.Snapshot + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Snapshot.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.Snapshot"; + }; + return Snapshot; })(); @@ -11677,9 +12443,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.snapshot = reader.string(); - break; + case 1: { + message.snapshot = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -11769,6 +12536,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for GetSnapshotRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.GetSnapshotRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + GetSnapshotRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.GetSnapshotRequest"; + }; + return GetSnapshotRequest; })(); @@ -11886,15 +12668,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.project = reader.string(); - break; - case 2: - message.pageSize = reader.int32(); - break; - case 3: - message.pageToken = reader.string(); - break; + case 1: { + message.project = reader.string(); + break; + } + case 2: { + message.pageSize = reader.int32(); + break; + } + case 3: { + message.pageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -12001,6 +12786,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListSnapshotsRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ListSnapshotsRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListSnapshotsRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListSnapshotsRequest"; + }; + return ListSnapshotsRequest; })(); @@ -12109,14 +12909,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.snapshots && message.snapshots.length)) - message.snapshots = []; - message.snapshots.push($root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32())); - break; - case 2: - message.nextPageToken = reader.string(); - break; + case 1: { + if (!(message.snapshots && message.snapshots.length)) + message.snapshots = []; + message.snapshots.push($root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32())); + break; + } + case 2: { + message.nextPageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -12232,6 +13034,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListSnapshotsResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ListSnapshotsResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListSnapshotsResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListSnapshotsResponse"; + }; + return ListSnapshotsResponse; })(); @@ -12327,9 +13144,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.snapshot = reader.string(); - break; + case 1: { + message.snapshot = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -12419,6 +13237,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for DeleteSnapshotRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.DeleteSnapshotRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DeleteSnapshotRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.DeleteSnapshotRequest"; + }; + return DeleteSnapshotRequest; })(); @@ -12550,15 +13383,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.subscription = reader.string(); - break; - case 2: - message.time = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); - break; - case 3: - message.snapshot = reader.string(); - break; + case 1: { + message.subscription = reader.string(); + break; + } + case 2: { + message.time = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + } + case 3: { + message.snapshot = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -12681,6 +13517,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for SeekRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.SeekRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + SeekRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.SeekRequest"; + }; + return SeekRequest; })(); @@ -12841,6 +13692,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for SeekResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.SeekResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + SeekResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.SeekResponse"; + }; + return SeekResponse; })(); @@ -12877,7 +13743,7 @@ }; /** - * Callback as used by {@link google.pubsub.v1.SchemaService#createSchema}. + * Callback as used by {@link google.pubsub.v1.SchemaService|createSchema}. * @memberof google.pubsub.v1.SchemaService * @typedef CreateSchemaCallback * @type {function} @@ -12910,7 +13776,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.SchemaService#getSchema}. + * Callback as used by {@link google.pubsub.v1.SchemaService|getSchema}. * @memberof google.pubsub.v1.SchemaService * @typedef GetSchemaCallback * @type {function} @@ -12943,7 +13809,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.SchemaService#listSchemas}. + * Callback as used by {@link google.pubsub.v1.SchemaService|listSchemas}. * @memberof google.pubsub.v1.SchemaService * @typedef ListSchemasCallback * @type {function} @@ -12976,7 +13842,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.SchemaService#deleteSchema}. + * Callback as used by {@link google.pubsub.v1.SchemaService|deleteSchema}. * @memberof google.pubsub.v1.SchemaService * @typedef DeleteSchemaCallback * @type {function} @@ -13009,7 +13875,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.SchemaService#validateSchema}. + * Callback as used by {@link google.pubsub.v1.SchemaService|validateSchema}. * @memberof google.pubsub.v1.SchemaService * @typedef ValidateSchemaCallback * @type {function} @@ -13042,7 +13908,7 @@ */ /** - * Callback as used by {@link google.pubsub.v1.SchemaService#validateMessage}. + * Callback as used by {@link google.pubsub.v1.SchemaService|validateMessage}. * @memberof google.pubsub.v1.SchemaService * @typedef ValidateMessageCallback * @type {function} @@ -13191,15 +14057,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.type = reader.int32(); - break; - case 3: - message.definition = reader.string(); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.type = reader.int32(); + break; + } + case 3: { + message.definition = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -13324,6 +14193,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Schema + * @function getTypeUrl + * @memberof google.pubsub.v1.Schema + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Schema.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.Schema"; + }; + /** * Type enum. * @name google.pubsub.v1.Schema.Type @@ -13457,15 +14341,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.parent = reader.string(); - break; - case 2: - message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); - break; - case 3: - message.schemaId = reader.string(); - break; + case 1: { + message.parent = reader.string(); + break; + } + case 2: { + message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); + break; + } + case 3: { + message.schemaId = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -13577,6 +14464,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for CreateSchemaRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.CreateSchemaRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CreateSchemaRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.CreateSchemaRequest"; + }; + return CreateSchemaRequest; })(); @@ -13699,12 +14601,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.view = reader.int32(); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.view = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -13821,6 +14725,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for GetSchemaRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.GetSchemaRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + GetSchemaRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.GetSchemaRequest"; + }; + return GetSchemaRequest; })(); @@ -13949,18 +14868,22 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.parent = reader.string(); - break; - case 2: - message.view = reader.int32(); - break; - case 3: - message.pageSize = reader.int32(); - break; - case 4: - message.pageToken = reader.string(); - break; + case 1: { + message.parent = reader.string(); + break; + } + case 2: { + message.view = reader.int32(); + break; + } + case 3: { + message.pageSize = reader.int32(); + break; + } + case 4: { + message.pageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -14093,6 +15016,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListSchemasRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ListSchemasRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListSchemasRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListSchemasRequest"; + }; + return ListSchemasRequest; })(); @@ -14201,14 +15139,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.schemas && message.schemas.length)) - message.schemas = []; - message.schemas.push($root.google.pubsub.v1.Schema.decode(reader, reader.uint32())); - break; - case 2: - message.nextPageToken = reader.string(); - break; + case 1: { + if (!(message.schemas && message.schemas.length)) + message.schemas = []; + message.schemas.push($root.google.pubsub.v1.Schema.decode(reader, reader.uint32())); + break; + } + case 2: { + message.nextPageToken = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -14324,6 +15264,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ListSchemasResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ListSchemasResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListSchemasResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListSchemasResponse"; + }; + return ListSchemasResponse; })(); @@ -14419,9 +15374,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; + case 1: { + message.name = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -14511,6 +15467,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for DeleteSchemaRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.DeleteSchemaRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DeleteSchemaRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.DeleteSchemaRequest"; + }; + return DeleteSchemaRequest; })(); @@ -14617,12 +15588,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.parent = reader.string(); - break; - case 2: - message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); - break; + case 1: { + message.parent = reader.string(); + break; + } + case 2: { + message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -14726,11 +15699,26 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; - return ValidateSchemaRequest; - })(); - - v1.ValidateSchemaResponse = (function() { - + /** + * Gets the default type url for ValidateSchemaRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ValidateSchemaRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ValidateSchemaRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ValidateSchemaRequest"; + }; + + return ValidateSchemaRequest; + })(); + + v1.ValidateSchemaResponse = (function() { + /** * Properties of a ValidateSchemaResponse. * @memberof google.pubsub.v1 @@ -14886,6 +15874,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ValidateSchemaResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ValidateSchemaResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ValidateSchemaResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ValidateSchemaResponse"; + }; + return ValidateSchemaResponse; })(); @@ -15039,21 +16042,26 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.parent = reader.string(); - break; - case 2: - message.name = reader.string(); - break; - case 3: - message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); - break; - case 4: - message.message = reader.bytes(); - break; - case 5: - message.encoding = reader.int32(); - break; + case 1: { + message.parent = reader.string(); + break; + } + case 2: { + message.name = reader.string(); + break; + } + case 3: { + message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); + break; + } + case 4: { + message.message = reader.bytes(); + break; + } + case 5: { + message.encoding = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -15147,7 +16155,7 @@ if (object.message != null) if (typeof object.message === "string") $util.base64.decode(object.message, message.message = $util.newBuffer($util.base64.length(object.message)), 0); - else if (object.message.length) + else if (object.message.length >= 0) message.message = object.message; switch (object.encoding) { case "ENCODING_UNSPECIFIED": @@ -15220,6 +16228,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ValidateMessageRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ValidateMessageRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ValidateMessageRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ValidateMessageRequest"; + }; + return ValidateMessageRequest; })(); @@ -15380,6 +16403,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ValidateMessageResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ValidateMessageResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ValidateMessageResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ValidateMessageResponse"; + }; + return ValidateMessageResponse; })(); @@ -15519,14 +16557,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.rules && message.rules.length)) - message.rules = []; - message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); - break; - case 2: - message.fullyDecodeReservedExpansion = reader.bool(); - break; + case 1: { + if (!(message.rules && message.rules.length)) + message.rules = []; + message.rules.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + break; + } + case 2: { + message.fullyDecodeReservedExpansion = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -15642,6 +16682,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Http + * @function getTypeUrl + * @memberof google.api.Http + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Http.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.Http"; + }; + return Http; })(); @@ -15852,38 +16907,48 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.selector = reader.string(); - break; - case 2: - message.get = reader.string(); - break; - case 3: - message.put = reader.string(); - break; - case 4: - message.post = reader.string(); - break; - case 5: - message["delete"] = reader.string(); - break; - case 6: - message.patch = reader.string(); - break; - case 8: - message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); - break; - case 7: - message.body = reader.string(); - break; - case 12: - message.responseBody = reader.string(); - break; - case 11: - if (!(message.additionalBindings && message.additionalBindings.length)) - message.additionalBindings = []; - message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); - break; + case 1: { + message.selector = reader.string(); + break; + } + case 2: { + message.get = reader.string(); + break; + } + case 3: { + message.put = reader.string(); + break; + } + case 4: { + message.post = reader.string(); + break; + } + case 5: { + message["delete"] = reader.string(); + break; + } + case 6: { + message.patch = reader.string(); + break; + } + case 8: { + message.custom = $root.google.api.CustomHttpPattern.decode(reader, reader.uint32()); + break; + } + case 7: { + message.body = reader.string(); + break; + } + case 12: { + message.responseBody = reader.string(); + break; + } + case 11: { + if (!(message.additionalBindings && message.additionalBindings.length)) + message.additionalBindings = []; + message.additionalBindings.push($root.google.api.HttpRule.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -16105,6 +17170,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for HttpRule + * @function getTypeUrl + * @memberof google.api.HttpRule + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + HttpRule.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.HttpRule"; + }; + return HttpRule; })(); @@ -16211,12 +17291,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.kind = reader.string(); - break; - case 2: - message.path = reader.string(); - break; + case 1: { + message.kind = reader.string(); + break; + } + case 2: { + message.path = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -16315,6 +17397,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for CustomHttpPattern + * @function getTypeUrl + * @memberof google.api.CustomHttpPattern + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CustomHttpPattern.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.CustomHttpPattern"; + }; + return CustomHttpPattern; })(); @@ -16509,36 +17606,43 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.type = reader.string(); - break; - case 2: - if (!(message.pattern && message.pattern.length)) - message.pattern = []; - message.pattern.push(reader.string()); - break; - case 3: - message.nameField = reader.string(); - break; - case 4: - message.history = reader.int32(); - break; - case 5: - message.plural = reader.string(); - break; - case 6: - message.singular = reader.string(); - break; - case 10: - if (!(message.style && message.style.length)) - message.style = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) + case 1: { + message.type = reader.string(); + break; + } + case 2: { + if (!(message.pattern && message.pattern.length)) + message.pattern = []; + message.pattern.push(reader.string()); + break; + } + case 3: { + message.nameField = reader.string(); + break; + } + case 4: { + message.history = reader.int32(); + break; + } + case 5: { + message.plural = reader.string(); + break; + } + case 6: { + message.singular = reader.string(); + break; + } + case 10: { + if (!(message.style && message.style.length)) + message.style = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.style.push(reader.int32()); + } else message.style.push(reader.int32()); - } else - message.style.push(reader.int32()); - break; + break; + } default: reader.skipType(tag & 7); break; @@ -16736,6 +17840,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ResourceDescriptor + * @function getTypeUrl + * @memberof google.api.ResourceDescriptor + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ResourceDescriptor.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.ResourceDescriptor"; + }; + /** * History enum. * @name google.api.ResourceDescriptor.History @@ -16872,12 +17991,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.type = reader.string(); - break; - case 2: - message.childType = reader.string(); - break; + case 1: { + message.type = reader.string(); + break; + } + case 2: { + message.childType = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -16976,6 +18097,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ResourceReference + * @function getTypeUrl + * @memberof google.api.ResourceReference + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ResourceReference.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.ResourceReference"; + }; + return ResourceReference; })(); @@ -17085,11 +18221,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.file && message.file.length)) - message.file = []; - message.file.push($root.google.protobuf.FileDescriptorProto.decode(reader, reader.uint32())); - break; + case 1: { + if (!(message.file && message.file.length)) + message.file = []; + message.file.push($root.google.protobuf.FileDescriptorProto.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -17196,6 +18333,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for FileDescriptorSet + * @function getTypeUrl + * @memberof google.protobuf.FileDescriptorSet + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FileDescriptorSet.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FileDescriptorSet"; + }; + return FileDescriptorSet; })(); @@ -17217,6 +18369,7 @@ * @property {google.protobuf.IFileOptions|null} [options] FileDescriptorProto options * @property {google.protobuf.ISourceCodeInfo|null} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo * @property {string|null} [syntax] FileDescriptorProto syntax + * @property {string|null} [edition] FileDescriptorProto edition */ /** @@ -17337,6 +18490,14 @@ */ FileDescriptorProto.prototype.syntax = ""; + /** + * FileDescriptorProto edition. + * @member {string} edition + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.edition = ""; + /** * Creates a new FileDescriptorProto instance using the specified properties. * @function create @@ -17392,6 +18553,8 @@ writer.uint32(/* id 11, wireType 0 =*/88).int32(message.weakDependency[i]); if (message.syntax != null && Object.hasOwnProperty.call(message, "syntax")) writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); + if (message.edition != null && Object.hasOwnProperty.call(message, "edition")) + writer.uint32(/* id 13, wireType 2 =*/106).string(message.edition); return writer; }; @@ -17426,68 +18589,84 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message["package"] = reader.string(); - break; - case 3: - if (!(message.dependency && message.dependency.length)) - message.dependency = []; - message.dependency.push(reader.string()); - break; - case 10: - if (!(message.publicDependency && message.publicDependency.length)) - message.publicDependency = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message["package"] = reader.string(); + break; + } + case 3: { + if (!(message.dependency && message.dependency.length)) + message.dependency = []; + message.dependency.push(reader.string()); + break; + } + case 10: { + if (!(message.publicDependency && message.publicDependency.length)) + message.publicDependency = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.publicDependency.push(reader.int32()); + } else message.publicDependency.push(reader.int32()); - } else - message.publicDependency.push(reader.int32()); - break; - case 11: - if (!(message.weakDependency && message.weakDependency.length)) - message.weakDependency = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) + break; + } + case 11: { + if (!(message.weakDependency && message.weakDependency.length)) + message.weakDependency = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.weakDependency.push(reader.int32()); + } else message.weakDependency.push(reader.int32()); - } else - message.weakDependency.push(reader.int32()); - break; - case 4: - if (!(message.messageType && message.messageType.length)) - message.messageType = []; - message.messageType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.enumType && message.enumType.length)) - message.enumType = []; - message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); - break; - case 6: - if (!(message.service && message.service.length)) - message.service = []; - message.service.push($root.google.protobuf.ServiceDescriptorProto.decode(reader, reader.uint32())); - break; - case 7: - if (!(message.extension && message.extension.length)) - message.extension = []; - message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 8: - message.options = $root.google.protobuf.FileOptions.decode(reader, reader.uint32()); - break; - case 9: - message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.decode(reader, reader.uint32()); - break; - case 12: - message.syntax = reader.string(); - break; - default: - reader.skipType(tag & 7); + break; + } + case 4: { + if (!(message.messageType && message.messageType.length)) + message.messageType = []; + message.messageType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); + break; + } + case 5: { + if (!(message.enumType && message.enumType.length)) + message.enumType = []; + message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 6: { + if (!(message.service && message.service.length)) + message.service = []; + message.service.push($root.google.protobuf.ServiceDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 7: { + if (!(message.extension && message.extension.length)) + message.extension = []; + message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 8: { + message.options = $root.google.protobuf.FileOptions.decode(reader, reader.uint32()); + break; + } + case 9: { + message.sourceCodeInfo = $root.google.protobuf.SourceCodeInfo.decode(reader, reader.uint32()); + break; + } + case 12: { + message.syntax = reader.string(); + break; + } + case 13: { + message.edition = reader.string(); + break; + } + default: + reader.skipType(tag & 7); break; } } @@ -17597,6 +18776,9 @@ if (message.syntax != null && message.hasOwnProperty("syntax")) if (!$util.isString(message.syntax)) return "syntax: string expected"; + if (message.edition != null && message.hasOwnProperty("edition")) + if (!$util.isString(message.edition)) + return "edition: string expected"; return null; }; @@ -17689,6 +18871,8 @@ } if (object.syntax != null) message.syntax = String(object.syntax); + if (object.edition != null) + message.edition = String(object.edition); return message; }; @@ -17720,6 +18904,7 @@ object.options = null; object.sourceCodeInfo = null; object.syntax = ""; + object.edition = ""; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -17766,6 +18951,8 @@ } if (message.syntax != null && message.hasOwnProperty("syntax")) object.syntax = message.syntax; + if (message.edition != null && message.hasOwnProperty("edition")) + object.edition = message.edition; return object; }; @@ -17780,6 +18967,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for FileDescriptorProto + * @function getTypeUrl + * @memberof google.protobuf.FileDescriptorProto + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FileDescriptorProto.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FileDescriptorProto"; + }; + return FileDescriptorProto; })(); @@ -17990,52 +19192,62 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (!(message.field && message.field.length)) - message.field = []; - message.field.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 6: - if (!(message.extension && message.extension.length)) - message.extension = []; - message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - if (!(message.nestedType && message.nestedType.length)) - message.nestedType = []; - message.nestedType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); - break; - case 4: - if (!(message.enumType && message.enumType.length)) - message.enumType = []; - message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.extensionRange && message.extensionRange.length)) - message.extensionRange = []; - message.extensionRange.push($root.google.protobuf.DescriptorProto.ExtensionRange.decode(reader, reader.uint32())); - break; - case 8: - if (!(message.oneofDecl && message.oneofDecl.length)) - message.oneofDecl = []; - message.oneofDecl.push($root.google.protobuf.OneofDescriptorProto.decode(reader, reader.uint32())); - break; - case 7: - message.options = $root.google.protobuf.MessageOptions.decode(reader, reader.uint32()); - break; - case 9: - if (!(message.reservedRange && message.reservedRange.length)) - message.reservedRange = []; - message.reservedRange.push($root.google.protobuf.DescriptorProto.ReservedRange.decode(reader, reader.uint32())); - break; - case 10: - if (!(message.reservedName && message.reservedName.length)) - message.reservedName = []; - message.reservedName.push(reader.string()); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + if (!(message.field && message.field.length)) + message.field = []; + message.field.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 6: { + if (!(message.extension && message.extension.length)) + message.extension = []; + message.extension.push($root.google.protobuf.FieldDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 3: { + if (!(message.nestedType && message.nestedType.length)) + message.nestedType = []; + message.nestedType.push($root.google.protobuf.DescriptorProto.decode(reader, reader.uint32())); + break; + } + case 4: { + if (!(message.enumType && message.enumType.length)) + message.enumType = []; + message.enumType.push($root.google.protobuf.EnumDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 5: { + if (!(message.extensionRange && message.extensionRange.length)) + message.extensionRange = []; + message.extensionRange.push($root.google.protobuf.DescriptorProto.ExtensionRange.decode(reader, reader.uint32())); + break; + } + case 8: { + if (!(message.oneofDecl && message.oneofDecl.length)) + message.oneofDecl = []; + message.oneofDecl.push($root.google.protobuf.OneofDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 7: { + message.options = $root.google.protobuf.MessageOptions.decode(reader, reader.uint32()); + break; + } + case 9: { + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.DescriptorProto.ReservedRange.decode(reader, reader.uint32())); + break; + } + case 10: { + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -18336,6 +19548,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for DescriptorProto + * @function getTypeUrl + * @memberof google.protobuf.DescriptorProto + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DescriptorProto.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.DescriptorProto"; + }; + DescriptorProto.ExtensionRange = (function() { /** @@ -18450,15 +19677,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.start = reader.int32(); - break; - case 2: - message.end = reader.int32(); - break; - case 3: - message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); - break; + case 1: { + message.start = reader.int32(); + break; + } + case 2: { + message.end = reader.int32(); + break; + } + case 3: { + message.options = $root.google.protobuf.ExtensionRangeOptions.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -18570,6 +19800,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ExtensionRange + * @function getTypeUrl + * @memberof google.protobuf.DescriptorProto.ExtensionRange + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ExtensionRange.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.DescriptorProto.ExtensionRange"; + }; + return ExtensionRange; })(); @@ -18676,12 +19921,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.start = reader.int32(); - break; - case 2: - message.end = reader.int32(); - break; + case 1: { + message.start = reader.int32(); + break; + } + case 2: { + message.end = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -18780,6 +20027,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ReservedRange + * @function getTypeUrl + * @memberof google.protobuf.DescriptorProto.ReservedRange + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ReservedRange.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.DescriptorProto.ReservedRange"; + }; + return ReservedRange; })(); @@ -18880,11 +20142,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -18991,6 +20254,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ExtensionRangeOptions + * @function getTypeUrl + * @memberof google.protobuf.ExtensionRangeOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ExtensionRangeOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.ExtensionRangeOptions"; + }; + return ExtensionRangeOptions; })(); @@ -19196,39 +20474,50 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 3: - message.number = reader.int32(); - break; - case 4: - message.label = reader.int32(); - break; - case 5: - message.type = reader.int32(); - break; - case 6: - message.typeName = reader.string(); - break; - case 2: - message.extendee = reader.string(); - break; - case 7: - message.defaultValue = reader.string(); - break; - case 9: - message.oneofIndex = reader.int32(); - break; - case 10: - message.jsonName = reader.string(); - break; - case 8: - message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); - break; - case 17: - message.proto3Optional = reader.bool(); - break; + case 1: { + message.name = reader.string(); + break; + } + case 3: { + message.number = reader.int32(); + break; + } + case 4: { + message.label = reader.int32(); + break; + } + case 5: { + message.type = reader.int32(); + break; + } + case 6: { + message.typeName = reader.string(); + break; + } + case 2: { + message.extendee = reader.string(); + break; + } + case 7: { + message.defaultValue = reader.string(); + break; + } + case 9: { + message.oneofIndex = reader.int32(); + break; + } + case 10: { + message.jsonName = reader.string(); + break; + } + case 8: { + message.options = $root.google.protobuf.FieldOptions.decode(reader, reader.uint32()); + break; + } + case 17: { + message.proto3Optional = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -19515,6 +20804,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for FieldDescriptorProto + * @function getTypeUrl + * @memberof google.protobuf.FieldDescriptorProto + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FieldDescriptorProto.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FieldDescriptorProto"; + }; + /** * Type enum. * @name google.protobuf.FieldDescriptorProto.Type @@ -19683,12 +20987,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.options = $root.google.protobuf.OneofOptions.decode(reader, reader.uint32()); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.options = $root.google.protobuf.OneofOptions.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -19792,6 +21098,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for OneofDescriptorProto + * @function getTypeUrl + * @memberof google.protobuf.OneofDescriptorProto + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + OneofDescriptorProto.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.OneofDescriptorProto"; + }; + return OneofDescriptorProto; })(); @@ -19937,27 +21258,32 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (!(message.value && message.value.length)) - message.value = []; - message.value.push($root.google.protobuf.EnumValueDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); - break; - case 4: - if (!(message.reservedRange && message.reservedRange.length)) - message.reservedRange = []; - message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); - break; - case 5: - if (!(message.reservedName && message.reservedName.length)) - message.reservedName = []; - message.reservedName.push(reader.string()); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + if (!(message.value && message.value.length)) + message.value = []; + message.value.push($root.google.protobuf.EnumValueDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 3: { + message.options = $root.google.protobuf.EnumOptions.decode(reader, reader.uint32()); + break; + } + case 4: { + if (!(message.reservedRange && message.reservedRange.length)) + message.reservedRange = []; + message.reservedRange.push($root.google.protobuf.EnumDescriptorProto.EnumReservedRange.decode(reader, reader.uint32())); + break; + } + case 5: { + if (!(message.reservedName && message.reservedName.length)) + message.reservedName = []; + message.reservedName.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -20133,6 +21459,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for EnumDescriptorProto + * @function getTypeUrl + * @memberof google.protobuf.EnumDescriptorProto + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + EnumDescriptorProto.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.EnumDescriptorProto"; + }; + EnumDescriptorProto.EnumReservedRange = (function() { /** @@ -20236,12 +21577,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.start = reader.int32(); - break; - case 2: - message.end = reader.int32(); - break; + case 1: { + message.start = reader.int32(); + break; + } + case 2: { + message.end = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -20340,6 +21683,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for EnumReservedRange + * @function getTypeUrl + * @memberof google.protobuf.EnumDescriptorProto.EnumReservedRange + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + EnumReservedRange.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.EnumDescriptorProto.EnumReservedRange"; + }; + return EnumReservedRange; })(); @@ -20460,15 +21818,18 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.number = reader.int32(); - break; - case 3: - message.options = $root.google.protobuf.EnumValueOptions.decode(reader, reader.uint32()); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.number = reader.int32(); + break; + } + case 3: { + message.options = $root.google.protobuf.EnumValueOptions.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -20580,6 +21941,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for EnumValueDescriptorProto + * @function getTypeUrl + * @memberof google.protobuf.EnumValueDescriptorProto + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + EnumValueDescriptorProto.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.EnumValueDescriptorProto"; + }; + return EnumValueDescriptorProto; })(); @@ -20699,17 +22075,20 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - if (!(message.method && message.method.length)) - message.method = []; - message.method.push($root.google.protobuf.MethodDescriptorProto.decode(reader, reader.uint32())); - break; - case 3: - message.options = $root.google.protobuf.ServiceOptions.decode(reader, reader.uint32()); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + if (!(message.method && message.method.length)) + message.method = []; + message.method.push($root.google.protobuf.MethodDescriptorProto.decode(reader, reader.uint32())); + break; + } + case 3: { + message.options = $root.google.protobuf.ServiceOptions.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -20839,6 +22218,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ServiceDescriptorProto + * @function getTypeUrl + * @memberof google.protobuf.ServiceDescriptorProto + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ServiceDescriptorProto.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.ServiceDescriptorProto"; + }; + return ServiceDescriptorProto; })(); @@ -20989,24 +22383,30 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.name = reader.string(); - break; - case 2: - message.inputType = reader.string(); - break; - case 3: - message.outputType = reader.string(); - break; - case 4: - message.options = $root.google.protobuf.MethodOptions.decode(reader, reader.uint32()); - break; - case 5: - message.clientStreaming = reader.bool(); - break; - case 6: - message.serverStreaming = reader.bool(); - break; + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.inputType = reader.string(); + break; + } + case 3: { + message.outputType = reader.string(); + break; + } + case 4: { + message.options = $root.google.protobuf.MethodOptions.decode(reader, reader.uint32()); + break; + } + case 5: { + message.clientStreaming = reader.bool(); + break; + } + case 6: { + message.serverStreaming = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -21142,6 +22542,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for MethodDescriptorProto + * @function getTypeUrl + * @memberof google.protobuf.MethodDescriptorProto + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + MethodDescriptorProto.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.MethodDescriptorProto"; + }; + return MethodDescriptorProto; })(); @@ -21472,76 +22887,98 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.javaPackage = reader.string(); - break; - case 8: - message.javaOuterClassname = reader.string(); - break; - case 10: - message.javaMultipleFiles = reader.bool(); - break; - case 20: - message.javaGenerateEqualsAndHash = reader.bool(); - break; - case 27: - message.javaStringCheckUtf8 = reader.bool(); - break; - case 9: - message.optimizeFor = reader.int32(); - break; - case 11: - message.goPackage = reader.string(); - break; - case 16: - message.ccGenericServices = reader.bool(); - break; - case 17: - message.javaGenericServices = reader.bool(); - break; - case 18: - message.pyGenericServices = reader.bool(); - break; - case 42: - message.phpGenericServices = reader.bool(); - break; - case 23: - message.deprecated = reader.bool(); - break; - case 31: - message.ccEnableArenas = reader.bool(); - break; - case 36: - message.objcClassPrefix = reader.string(); - break; - case 37: - message.csharpNamespace = reader.string(); - break; - case 39: - message.swiftPrefix = reader.string(); - break; - case 40: - message.phpClassPrefix = reader.string(); - break; - case 41: - message.phpNamespace = reader.string(); - break; - case 44: - message.phpMetadataNamespace = reader.string(); - break; - case 45: - message.rubyPackage = reader.string(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1053: - if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length)) - message[".google.api.resourceDefinition"] = []; - message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32())); - break; + case 1: { + message.javaPackage = reader.string(); + break; + } + case 8: { + message.javaOuterClassname = reader.string(); + break; + } + case 10: { + message.javaMultipleFiles = reader.bool(); + break; + } + case 20: { + message.javaGenerateEqualsAndHash = reader.bool(); + break; + } + case 27: { + message.javaStringCheckUtf8 = reader.bool(); + break; + } + case 9: { + message.optimizeFor = reader.int32(); + break; + } + case 11: { + message.goPackage = reader.string(); + break; + } + case 16: { + message.ccGenericServices = reader.bool(); + break; + } + case 17: { + message.javaGenericServices = reader.bool(); + break; + } + case 18: { + message.pyGenericServices = reader.bool(); + break; + } + case 42: { + message.phpGenericServices = reader.bool(); + break; + } + case 23: { + message.deprecated = reader.bool(); + break; + } + case 31: { + message.ccEnableArenas = reader.bool(); + break; + } + case 36: { + message.objcClassPrefix = reader.string(); + break; + } + case 37: { + message.csharpNamespace = reader.string(); + break; + } + case 39: { + message.swiftPrefix = reader.string(); + break; + } + case 40: { + message.phpClassPrefix = reader.string(); + break; + } + case 41: { + message.phpNamespace = reader.string(); + break; + } + case 44: { + message.phpMetadataNamespace = reader.string(); + break; + } + case 45: { + message.rubyPackage = reader.string(); + break; + } + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } + case 1053: { + if (!(message[".google.api.resourceDefinition"] && message[".google.api.resourceDefinition"].length)) + message[".google.api.resourceDefinition"] = []; + message[".google.api.resourceDefinition"].push($root.google.api.ResourceDescriptor.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -21854,6 +23291,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for FileOptions + * @function getTypeUrl + * @memberof google.protobuf.FileOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FileOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FileOptions"; + }; + /** * OptimizeMode enum. * @name google.protobuf.FileOptions.OptimizeMode @@ -22022,26 +23474,32 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.messageSetWireFormat = reader.bool(); - break; - case 2: - message.noStandardDescriptorAccessor = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 7: - message.mapEntry = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1053: - message[".google.api.resource"] = $root.google.api.ResourceDescriptor.decode(reader, reader.uint32()); - break; + case 1: { + message.messageSetWireFormat = reader.bool(); + break; + } + case 2: { + message.noStandardDescriptorAccessor = reader.bool(); + break; + } + case 3: { + message.deprecated = reader.bool(); + break; + } + case 7: { + message.mapEntry = reader.bool(); + break; + } + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } + case 1053: { + message[".google.api.resource"] = $root.google.api.ResourceDescriptor.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -22195,6 +23653,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for MessageOptions + * @function getTypeUrl + * @memberof google.protobuf.MessageOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + MessageOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.MessageOptions"; + }; + return MessageOptions; })(); @@ -22208,6 +23681,7 @@ * @property {boolean|null} [packed] FieldOptions packed * @property {google.protobuf.FieldOptions.JSType|null} [jstype] FieldOptions jstype * @property {boolean|null} [lazy] FieldOptions lazy + * @property {boolean|null} [unverifiedLazy] FieldOptions unverifiedLazy * @property {boolean|null} [deprecated] FieldOptions deprecated * @property {boolean|null} [weak] FieldOptions weak * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption @@ -22264,6 +23738,14 @@ */ FieldOptions.prototype.lazy = false; + /** + * FieldOptions unverifiedLazy. + * @member {boolean} unverifiedLazy + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.unverifiedLazy = false; + /** * FieldOptions deprecated. * @member {boolean} deprecated @@ -22340,6 +23822,8 @@ writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jstype); if (message.weak != null && Object.hasOwnProperty.call(message, "weak")) writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); + if (message.unverifiedLazy != null && Object.hasOwnProperty.call(message, "unverifiedLazy")) + writer.uint32(/* id 15, wireType 0 =*/120).bool(message.unverifiedLazy); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -22385,42 +23869,55 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.ctype = reader.int32(); - break; - case 2: - message.packed = reader.bool(); - break; - case 6: - message.jstype = reader.int32(); - break; - case 5: - message.lazy = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 10: - message.weak = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1052: - if (!(message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length)) - message[".google.api.fieldBehavior"] = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) + case 1: { + message.ctype = reader.int32(); + break; + } + case 2: { + message.packed = reader.bool(); + break; + } + case 6: { + message.jstype = reader.int32(); + break; + } + case 5: { + message.lazy = reader.bool(); + break; + } + case 15: { + message.unverifiedLazy = reader.bool(); + break; + } + case 3: { + message.deprecated = reader.bool(); + break; + } + case 10: { + message.weak = reader.bool(); + break; + } + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } + case 1052: { + if (!(message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length)) + message[".google.api.fieldBehavior"] = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message[".google.api.fieldBehavior"].push(reader.int32()); + } else message[".google.api.fieldBehavior"].push(reader.int32()); - } else - message[".google.api.fieldBehavior"].push(reader.int32()); - break; - case 1055: - message[".google.api.resourceReference"] = $root.google.api.ResourceReference.decode(reader, reader.uint32()); - break; + break; + } + case 1055: { + message[".google.api.resourceReference"] = $root.google.api.ResourceReference.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -22480,6 +23977,9 @@ if (message.lazy != null && message.hasOwnProperty("lazy")) if (typeof message.lazy !== "boolean") return "lazy: boolean expected"; + if (message.unverifiedLazy != null && message.hasOwnProperty("unverifiedLazy")) + if (typeof message.unverifiedLazy !== "boolean") + return "unverifiedLazy: boolean expected"; if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; @@ -22565,6 +24065,8 @@ } if (object.lazy != null) message.lazy = Boolean(object.lazy); + if (object.unverifiedLazy != null) + message.unverifiedLazy = Boolean(object.unverifiedLazy); if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); if (object.weak != null) @@ -22652,6 +24154,7 @@ object.lazy = false; object.jstype = options.enums === String ? "JS_NORMAL" : 0; object.weak = false; + object.unverifiedLazy = false; object[".google.api.resourceReference"] = null; } if (message.ctype != null && message.hasOwnProperty("ctype")) @@ -22666,6 +24169,8 @@ object.jstype = options.enums === String ? $root.google.protobuf.FieldOptions.JSType[message.jstype] : message.jstype; if (message.weak != null && message.hasOwnProperty("weak")) object.weak = message.weak; + if (message.unverifiedLazy != null && message.hasOwnProperty("unverifiedLazy")) + object.unverifiedLazy = message.unverifiedLazy; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -22692,6 +24197,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for FieldOptions + * @function getTypeUrl + * @memberof google.protobuf.FieldOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FieldOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FieldOptions"; + }; + /** * CType enum. * @name google.protobuf.FieldOptions.CType @@ -22821,11 +24341,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -22932,6 +24453,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for OneofOptions + * @function getTypeUrl + * @memberof google.protobuf.OneofOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + OneofOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.OneofOptions"; + }; + return OneofOptions; })(); @@ -23051,17 +24587,20 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 2: - message.allowAlias = reader.bool(); - break; - case 3: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; + case 2: { + message.allowAlias = reader.bool(); + break; + } + case 3: { + message.deprecated = reader.bool(); + break; + } + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -23186,6 +24725,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for EnumOptions + * @function getTypeUrl + * @memberof google.protobuf.EnumOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + EnumOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.EnumOptions"; + }; + return EnumOptions; })(); @@ -23294,14 +24848,16 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; + case 1: { + message.deprecated = reader.bool(); + break; + } + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -23410,11 +24966,26 @@ * Converts this EnumValueOptions to JSON. * @function toJSON * @memberof google.protobuf.EnumValueOptions - * @instance - * @returns {Object.} JSON object + * @instance + * @returns {Object.} JSON object + */ + EnumValueOptions.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for EnumValueOptions + * @function getTypeUrl + * @memberof google.protobuf.EnumValueOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url */ - EnumValueOptions.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + EnumValueOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.EnumValueOptions"; }; return EnumValueOptions; @@ -23547,20 +25118,24 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 33: - message.deprecated = reader.bool(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 1049: - message[".google.api.defaultHost"] = reader.string(); - break; - case 1050: - message[".google.api.oauthScopes"] = reader.string(); - break; + case 33: { + message.deprecated = reader.bool(); + break; + } + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } + case 1049: { + message[".google.api.defaultHost"] = reader.string(); + break; + } + case 1050: { + message[".google.api.oauthScopes"] = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -23693,6 +25268,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for ServiceOptions + * @function getTypeUrl + * @memberof google.protobuf.ServiceOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ServiceOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.ServiceOptions"; + }; + return ServiceOptions; })(); @@ -23836,25 +25426,30 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 33: - message.deprecated = reader.bool(); - break; - case 34: - message.idempotencyLevel = reader.int32(); - break; - case 999: - if (!(message.uninterpretedOption && message.uninterpretedOption.length)) - message.uninterpretedOption = []; - message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); - break; - case 72295728: - message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); - break; - case 1051: - if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) - message[".google.api.methodSignature"] = []; - message[".google.api.methodSignature"].push(reader.string()); - break; + case 33: { + message.deprecated = reader.bool(); + break; + } + case 34: { + message.idempotencyLevel = reader.int32(); + break; + } + case 999: { + if (!(message.uninterpretedOption && message.uninterpretedOption.length)) + message.uninterpretedOption = []; + message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); + break; + } + case 72295728: { + message[".google.api.http"] = $root.google.api.HttpRule.decode(reader, reader.uint32()); + break; + } + case 1051: { + if (!(message[".google.api.methodSignature"] && message[".google.api.methodSignature"].length)) + message[".google.api.methodSignature"] = []; + message[".google.api.methodSignature"].push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -24031,6 +25626,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for MethodOptions + * @function getTypeUrl + * @memberof google.protobuf.MethodOptions + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + MethodOptions.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.MethodOptions"; + }; + /** * IdempotencyLevel enum. * @name google.protobuf.MethodOptions.IdempotencyLevel @@ -24210,29 +25820,36 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 2: - if (!(message.name && message.name.length)) - message.name = []; - message.name.push($root.google.protobuf.UninterpretedOption.NamePart.decode(reader, reader.uint32())); - break; - case 3: - message.identifierValue = reader.string(); - break; - case 4: - message.positiveIntValue = reader.uint64(); - break; - case 5: - message.negativeIntValue = reader.int64(); - break; - case 6: - message.doubleValue = reader.double(); - break; - case 7: - message.stringValue = reader.bytes(); - break; - case 8: - message.aggregateValue = reader.string(); - break; + case 2: { + if (!(message.name && message.name.length)) + message.name = []; + message.name.push($root.google.protobuf.UninterpretedOption.NamePart.decode(reader, reader.uint32())); + break; + } + case 3: { + message.identifierValue = reader.string(); + break; + } + case 4: { + message.positiveIntValue = reader.uint64(); + break; + } + case 5: { + message.negativeIntValue = reader.int64(); + break; + } + case 6: { + message.doubleValue = reader.double(); + break; + } + case 7: { + message.stringValue = reader.bytes(); + break; + } + case 8: { + message.aggregateValue = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -24345,7 +25962,7 @@ if (object.stringValue != null) if (typeof object.stringValue === "string") $util.base64.decode(object.stringValue, message.stringValue = $util.newBuffer($util.base64.length(object.stringValue)), 0); - else if (object.stringValue.length) + else if (object.stringValue.length >= 0) message.stringValue = object.stringValue; if (object.aggregateValue != null) message.aggregateValue = String(object.aggregateValue); @@ -24426,6 +26043,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for UninterpretedOption + * @function getTypeUrl + * @memberof google.protobuf.UninterpretedOption + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + UninterpretedOption.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.UninterpretedOption"; + }; + UninterpretedOption.NamePart = (function() { /** @@ -24527,12 +26159,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.namePart = reader.string(); - break; - case 2: - message.isExtension = reader.bool(); - break; + case 1: { + message.namePart = reader.string(); + break; + } + case 2: { + message.isExtension = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -24633,6 +26267,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for NamePart + * @function getTypeUrl + * @memberof google.protobuf.UninterpretedOption.NamePart + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + NamePart.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.UninterpretedOption.NamePart"; + }; + return NamePart; })(); @@ -24733,11 +26382,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.location && message.location.length)) - message.location = []; - message.location.push($root.google.protobuf.SourceCodeInfo.Location.decode(reader, reader.uint32())); - break; + case 1: { + if (!(message.location && message.location.length)) + message.location = []; + message.location.push($root.google.protobuf.SourceCodeInfo.Location.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -24844,6 +26494,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for SourceCodeInfo + * @function getTypeUrl + * @memberof google.protobuf.SourceCodeInfo + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + SourceCodeInfo.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.SourceCodeInfo"; + }; + SourceCodeInfo.Location = (function() { /** @@ -24992,37 +26657,42 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.path && message.path.length)) - message.path = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) + case 1: { + if (!(message.path && message.path.length)) + message.path = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.path.push(reader.int32()); + } else message.path.push(reader.int32()); - } else - message.path.push(reader.int32()); - break; - case 2: - if (!(message.span && message.span.length)) - message.span = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) + break; + } + case 2: { + if (!(message.span && message.span.length)) + message.span = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.span.push(reader.int32()); + } else message.span.push(reader.int32()); - } else - message.span.push(reader.int32()); - break; - case 3: - message.leadingComments = reader.string(); - break; - case 4: - message.trailingComments = reader.string(); - break; - case 6: - if (!(message.leadingDetachedComments && message.leadingDetachedComments.length)) - message.leadingDetachedComments = []; - message.leadingDetachedComments.push(reader.string()); - break; + break; + } + case 3: { + message.leadingComments = reader.string(); + break; + } + case 4: { + message.trailingComments = reader.string(); + break; + } + case 6: { + if (!(message.leadingDetachedComments && message.leadingDetachedComments.length)) + message.leadingDetachedComments = []; + message.leadingDetachedComments.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -25183,6 +26853,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Location + * @function getTypeUrl + * @memberof google.protobuf.SourceCodeInfo.Location + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Location.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.SourceCodeInfo.Location"; + }; + return Location; })(); @@ -25283,11 +26968,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.annotation && message.annotation.length)) - message.annotation = []; - message.annotation.push($root.google.protobuf.GeneratedCodeInfo.Annotation.decode(reader, reader.uint32())); - break; + case 1: { + if (!(message.annotation && message.annotation.length)) + message.annotation = []; + message.annotation.push($root.google.protobuf.GeneratedCodeInfo.Annotation.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -25394,6 +27080,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for GeneratedCodeInfo + * @function getTypeUrl + * @memberof google.protobuf.GeneratedCodeInfo + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + GeneratedCodeInfo.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.GeneratedCodeInfo"; + }; + GeneratedCodeInfo.Annotation = (function() { /** @@ -25404,6 +27105,7 @@ * @property {string|null} [sourceFile] Annotation sourceFile * @property {number|null} [begin] Annotation begin * @property {number|null} [end] Annotation end + * @property {google.protobuf.GeneratedCodeInfo.Annotation.Semantic|null} [semantic] Annotation semantic */ /** @@ -25454,6 +27156,14 @@ */ Annotation.prototype.end = 0; + /** + * Annotation semantic. + * @member {google.protobuf.GeneratedCodeInfo.Annotation.Semantic} semantic + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @instance + */ + Annotation.prototype.semantic = 0; + /** * Creates a new Annotation instance using the specified properties. * @function create @@ -25490,6 +27200,8 @@ writer.uint32(/* id 3, wireType 0 =*/24).int32(message.begin); if (message.end != null && Object.hasOwnProperty.call(message, "end")) writer.uint32(/* id 4, wireType 0 =*/32).int32(message.end); + if (message.semantic != null && Object.hasOwnProperty.call(message, "semantic")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.semantic); return writer; }; @@ -25524,25 +27236,33 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.path && message.path.length)) - message.path = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) + case 1: { + if (!(message.path && message.path.length)) + message.path = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.path.push(reader.int32()); + } else message.path.push(reader.int32()); - } else - message.path.push(reader.int32()); - break; - case 2: - message.sourceFile = reader.string(); - break; - case 3: - message.begin = reader.int32(); - break; - case 4: - message.end = reader.int32(); - break; + break; + } + case 2: { + message.sourceFile = reader.string(); + break; + } + case 3: { + message.begin = reader.int32(); + break; + } + case 4: { + message.end = reader.int32(); + break; + } + case 5: { + message.semantic = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -25594,6 +27314,15 @@ if (message.end != null && message.hasOwnProperty("end")) if (!$util.isInteger(message.end)) return "end: integer expected"; + if (message.semantic != null && message.hasOwnProperty("semantic")) + switch (message.semantic) { + default: + return "semantic: enum value expected"; + case 0: + case 1: + case 2: + break; + } return null; }; @@ -25622,6 +27351,20 @@ message.begin = object.begin | 0; if (object.end != null) message.end = object.end | 0; + switch (object.semantic) { + case "NONE": + case 0: + message.semantic = 0; + break; + case "SET": + case 1: + message.semantic = 1; + break; + case "ALIAS": + case 2: + message.semantic = 2; + break; + } return message; }; @@ -25644,6 +27387,7 @@ object.sourceFile = ""; object.begin = 0; object.end = 0; + object.semantic = options.enums === String ? "NONE" : 0; } if (message.path && message.path.length) { object.path = []; @@ -25656,6 +27400,8 @@ object.begin = message.begin; if (message.end != null && message.hasOwnProperty("end")) object.end = message.end; + if (message.semantic != null && message.hasOwnProperty("semantic")) + object.semantic = options.enums === String ? $root.google.protobuf.GeneratedCodeInfo.Annotation.Semantic[message.semantic] : message.semantic; return object; }; @@ -25670,6 +27416,37 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Annotation + * @function getTypeUrl + * @memberof google.protobuf.GeneratedCodeInfo.Annotation + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Annotation.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.GeneratedCodeInfo.Annotation"; + }; + + /** + * Semantic enum. + * @name google.protobuf.GeneratedCodeInfo.Annotation.Semantic + * @enum {number} + * @property {number} NONE=0 NONE value + * @property {number} SET=1 SET value + * @property {number} ALIAS=2 ALIAS value + */ + Annotation.Semantic = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "NONE"] = 0; + values[valuesById[1] = "SET"] = 1; + values[valuesById[2] = "ALIAS"] = 2; + return values; + })(); + return Annotation; })(); @@ -25779,12 +27556,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.seconds = reader.int64(); - break; - case 2: - message.nanos = reader.int32(); - break; + case 1: { + message.seconds = reader.int64(); + break; + } + case 2: { + message.nanos = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -25897,6 +27676,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Duration + * @function getTypeUrl + * @memberof google.protobuf.Duration + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Duration.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.Duration"; + }; + return Duration; })(); @@ -26057,6 +27851,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Empty + * @function getTypeUrl + * @memberof google.protobuf.Empty + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Empty.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.Empty"; + }; + return Empty; })(); @@ -26154,11 +27963,12 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - if (!(message.paths && message.paths.length)) - message.paths = []; - message.paths.push(reader.string()); - break; + case 1: { + if (!(message.paths && message.paths.length)) + message.paths = []; + message.paths.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -26260,6 +28070,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for FieldMask + * @function getTypeUrl + * @memberof google.protobuf.FieldMask + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FieldMask.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FieldMask"; + }; + return FieldMask; })(); @@ -26366,12 +28191,14 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: - message.seconds = reader.int64(); - break; - case 2: - message.nanos = reader.int32(); - break; + case 1: { + message.seconds = reader.int64(); + break; + } + case 2: { + message.nanos = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -26484,6 +28311,21 @@ return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; + /** + * Gets the default type url for Timestamp + * @function getTypeUrl + * @memberof google.protobuf.Timestamp + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Timestamp.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.Timestamp"; + }; + return Timestamp; })(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 1668561e915..5cbc208797d 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2064,6 +2064,10 @@ "syntax": { "type": "string", "id": 12 + }, + "edition": { + "type": "string", + "id": 13 } } }, @@ -2592,6 +2596,13 @@ "default": false } }, + "unverifiedLazy": { + "type": "bool", + "id": 15, + "options": { + "default": false + } + }, "deprecated": { "type": "bool", "id": 3, @@ -2884,6 +2895,19 @@ "end": { "type": "int32", "id": 4 + }, + "semantic": { + "type": "Semantic", + "id": 5 + } + }, + "nested": { + "Semantic": { + "values": { + "NONE": 0, + "SET": 1, + "ALIAS": 2 + } } } } From 0125cdd84be4bfd9bafda9ff4903171b0b4ca5dd Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 13:34:25 -0400 Subject: [PATCH 0876/1115] fix: add hashes to requirements.txt (#1544) (#1614) * fix: add hashes to requirements.txt and update Docker images so they require hashes. * fix: add hashes to docker/owlbot/java/src * Squashed commit of the following: commit ab7384ea1c30df8ec2e175566ef2508e6c3a2acb Author: Jeffrey Rennie Date: Tue Aug 23 11:38:48 2022 -0700 fix: remove pip install statements (#1546) because the tools are already installed in the docker image as of https://github.com/googleapis/testing-infra-docker/pull/227 commit 302667c9ab7210da42cc337e8f39fe1ea99049ef Author: WhiteSource Renovate Date: Tue Aug 23 19:50:28 2022 +0200 chore(deps): update dependency setuptools to v65.2.0 (#1541) Co-authored-by: Anthonios Partheniou commit 6e9054fd91d1b500cae58ff72ee9aeb626077756 Author: WhiteSource Renovate Date: Tue Aug 23 19:42:51 2022 +0200 chore(deps): update dependency nbconvert to v7 (#1543) Co-authored-by: Anthonios Partheniou commit d229a1258999f599a90a9b674a1c5541e00db588 Author: Alexander Fenster Date: Mon Aug 22 15:04:53 2022 -0700 fix: update google-gax and remove obsolete deps (#1545) commit 13ce62621e70059b2f5e3a7bade735f91c53339c Author: Jeffrey Rennie Date: Mon Aug 22 11:08:21 2022 -0700 chore: remove release config and script (#1540) We don't release to pypi anymore. * chore: rollback java changes to move forward with other languages until Java's docker image is fixed Source-Link: https://github.com/googleapis/synthtool/commit/48263378ad6010ec2fc4d480af7b5d08170338c8 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:7fefeb9e517db2dd8c8202d9239ff6788d6852bc92dd3aac57a46059679ac9de Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/publish.sh | 1 - handwritten/pubsub/.kokoro/release/docs.sh | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index f7c796c60cd..cb86baf88fb 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:74ab2b3c71ef27e6d8b69b1d0a0c9d31447777b79ac3cd4be82c265b45f37e5e -# created: 2022-08-22T22:07:00.791732705Z + digest: sha256:7fefeb9e517db2dd8c8202d9239ff6788d6852bc92dd3aac57a46059679ac9de +# created: 2022-08-24T19:44:03.464675104Z diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh index 77a5defb2b5..949e3e1d0c2 100755 --- a/handwritten/pubsub/.kokoro/publish.sh +++ b/handwritten/pubsub/.kokoro/publish.sh @@ -19,7 +19,6 @@ set -eo pipefail export NPM_CONFIG_PREFIX=${HOME}/.npm-global # Start the releasetool reporter -python3 -m pip install gcp-releasetool python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script cd $(dirname $0)/.. diff --git a/handwritten/pubsub/.kokoro/release/docs.sh b/handwritten/pubsub/.kokoro/release/docs.sh index 4c866c86000..1d8f3f490a5 100755 --- a/handwritten/pubsub/.kokoro/release/docs.sh +++ b/handwritten/pubsub/.kokoro/release/docs.sh @@ -29,7 +29,6 @@ npm run docs # create docs.metadata, based on package.json and .repo-metadata.json. npm i json@9.0.6 -g -python3 -m pip install --user gcp-docuploader python3 -m docuploader create-metadata \ --name=$(cat .repo-metadata.json | json name) \ --version=$(cat package.json | json version) \ From ce3df8b9fb7b20cc859f6a990f131302d5418281 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 27 Aug 2022 05:10:13 +0000 Subject: [PATCH 0877/1115] fix: do not import the whole google-gax from proto JS (#1553) (#1616) fix: use google-gax v3.3.0 Source-Link: https://github.com/googleapis/synthtool/commit/c73d112a11a1f1a93efa67c50495c19aa3a88910 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:b15a6f06cc06dcffa11e1bebdf1a74b6775a134aac24a0f86f51ddf728eb373e --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/protos/protos.d.ts | 2 +- handwritten/pubsub/protos/protos.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index cb86baf88fb..4d586c42063 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:7fefeb9e517db2dd8c8202d9239ff6788d6852bc92dd3aac57a46059679ac9de -# created: 2022-08-24T19:44:03.464675104Z + digest: sha256:b15a6f06cc06dcffa11e1bebdf1a74b6775a134aac24a0f86f51ddf728eb373e +# created: 2022-08-26T22:34:55.905845397Z diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cf4e64f62b9..00fe968b6e6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^8.0.2", - "google-gax": "^3.0.1", + "google-gax": "^3.3.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 3fe418a9fca..6ec325400f3 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -13,7 +13,7 @@ // limitations under the License. import Long = require("long"); -import {protobuf as $protobuf} from "google-gax"; +import type {protobuf as $protobuf} from "google-gax"; /** Namespace google. */ export namespace google { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 8b1d6fc4619..5dcc3e562f6 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -19,7 +19,7 @@ define(["protobufjs/minimal"], factory); /* CommonJS */ else if (typeof require === 'function' && typeof module === 'object' && module && module.exports) - module.exports = factory(require("google-gax").protobufMinimal); + module.exports = factory(require("google-gax/build/src/protobuf").protobufMinimal); })(this, function($protobuf) { "use strict"; From 99e6b64ea8b3a6156f176be70ab350f747a3097a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 21:10:22 +0000 Subject: [PATCH 0878/1115] fix: allow passing gax instance to client constructor (#1617) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 470911839 Source-Link: https://github.com/googleapis/googleapis/commit/352756699ebc5b2144c252867c265ea44448712e Source-Link: https://github.com/googleapis/googleapis-gen/commit/f16a1d224f00a630ea43d6a9a1a31f566f45cdea Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjE2YTFkMjI0ZjAwYTYzMGVhNDNkNmE5YTFhMzFmNTY2ZjQ1Y2RlYSJ9 feat: accept google-gax instance as a parameter Please see the documentation of the client constructor for details. PiperOrigin-RevId: 470332808 Source-Link: https://github.com/googleapis/googleapis/commit/d4a23675457cd8f0b44080e0594ec72de1291b89 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e97a1ac204ead4fe7341f91e72db7c6ac6016341 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTk3YTFhYzIwNGVhZDRmZTczNDFmOTFlNzJkYjdjNmFjNjAxNjM0MSJ9 --- handwritten/pubsub/src/v1/publisher_client.ts | 61 +++++++++------ .../pubsub/src/v1/schema_service_client.ts | 45 +++++++---- .../pubsub/src/v1/subscriber_client.ts | 77 +++++++++++-------- 3 files changed, 111 insertions(+), 72 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 6dcab350bb8..3b127acfbbe 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -17,8 +17,8 @@ // ** All changes to this file may be overwritten. ** /* global window */ -import * as gax from 'google-gax'; -import { +import type * as gax from 'google-gax'; +import type { Callback, CallOptions, Descriptors, @@ -28,7 +28,6 @@ import { IamClient, IamProtos, } from 'google-gax'; - import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); @@ -38,7 +37,6 @@ import jsonProtos = require('../../protos/protos.json'); * This file defines retry strategy and timeouts for all API methods in this library. */ import * as gapicConfig from './publisher_client_config.json'; - const version = require('../../../package.json').version; /** @@ -100,8 +98,18 @@ export class PublisherClient { * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. * For more information, please check the * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. + * @param {gax} [gaxInstance]: loaded instance of `google-gax`. Useful if you + * need to avoid loading the default gRPC version and want to use the fallback + * HTTP implementation. Load only fallback version and pass it to the constructor: + * ``` + * const gax = require('google-gax/build/src/fallback'); // avoids loading google-gax with gRPC + * const client = new PublisherClient({fallback: 'rest'}, gax); + * ``` */ - constructor(opts?: ClientOptions) { + constructor( + opts?: ClientOptions, + gaxInstance?: typeof gax | typeof gax.fallback + ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof PublisherClient; const servicePath = @@ -121,8 +129,13 @@ export class PublisherClient { opts['scopes'] = staticMembers.scopes; } + // Load google-gax module synchronously if needed + if (!gaxInstance) { + gaxInstance = require('google-gax') as typeof gax; + } + // Choose either gRPC or proto-over-HTTP implementation of google-gax. - this._gaxModule = opts.fallback ? gax.fallback : gax; + this._gaxModule = opts.fallback ? gaxInstance.fallback : gaxInstance; // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. this._gaxGrpc = new this._gaxModule.GrpcClient(opts); @@ -143,7 +156,7 @@ export class PublisherClient { if (servicePath === staticMembers.servicePath) { this.auth.defaultScopes = staticMembers.scopes; } - this.iamClient = new IamClient(this._gaxGrpc, opts); + this.iamClient = new this._gaxModule.IamClient(this._gaxGrpc, opts); // Determine the client header string. const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; @@ -214,7 +227,7 @@ export class PublisherClient { 'messages', ['topic'], 'message_ids', - gax.createByteLengthFunction( + this._gaxModule.GrpcClient.createByteLengthFunction( // eslint-disable-next-line @typescript-eslint/no-explicit-any protoFilesRoot.lookupType('google.pubsub.v1.PubsubMessage') as any ) @@ -235,7 +248,7 @@ export class PublisherClient { this.innerApiCalls = {}; // Add a warn function to the client constructor so it can be easily tested. - this.warn = gax.warn; + this.warn = this._gaxModule.warn; } /** @@ -476,7 +489,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ name: request.name || '', }); this.initialize(); @@ -564,7 +577,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ 'topic.name': request.topic!.name || '', }); this.initialize(); @@ -649,7 +662,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); this.initialize(); @@ -731,7 +744,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); this.initialize(); @@ -817,7 +830,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); this.initialize(); @@ -902,7 +915,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ subscription: request.subscription || '', }); this.initialize(); @@ -996,7 +1009,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); this.initialize(); @@ -1037,7 +1050,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); const defaultCallSettings = this._defaults['listTopics']; @@ -1085,7 +1098,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); const defaultCallSettings = this._defaults['listTopics']; @@ -1192,7 +1205,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); this.initialize(); @@ -1237,7 +1250,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); const defaultCallSettings = this._defaults['listTopicSubscriptions']; @@ -1285,7 +1298,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); const defaultCallSettings = this._defaults['listTopicSubscriptions']; @@ -1390,7 +1403,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); this.initialize(); @@ -1431,7 +1444,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); const defaultCallSettings = this._defaults['listTopicSnapshots']; @@ -1479,7 +1492,7 @@ export class PublisherClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ topic: request.topic || '', }); const defaultCallSettings = this._defaults['listTopicSnapshots']; diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index c8170bd638a..b832a588958 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -17,8 +17,8 @@ // ** All changes to this file may be overwritten. ** /* global window */ -import * as gax from 'google-gax'; -import { +import type * as gax from 'google-gax'; +import type { Callback, CallOptions, Descriptors, @@ -28,7 +28,6 @@ import { IamClient, IamProtos, } from 'google-gax'; - import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); @@ -38,7 +37,6 @@ import jsonProtos = require('../../protos/protos.json'); * This file defines retry strategy and timeouts for all API methods in this library. */ import * as gapicConfig from './schema_service_client_config.json'; - const version = require('../../../package.json').version; /** @@ -99,8 +97,18 @@ export class SchemaServiceClient { * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. * For more information, please check the * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. + * @param {gax} [gaxInstance]: loaded instance of `google-gax`. Useful if you + * need to avoid loading the default gRPC version and want to use the fallback + * HTTP implementation. Load only fallback version and pass it to the constructor: + * ``` + * const gax = require('google-gax/build/src/fallback'); // avoids loading google-gax with gRPC + * const client = new SchemaServiceClient({fallback: 'rest'}, gax); + * ``` */ - constructor(opts?: ClientOptions) { + constructor( + opts?: ClientOptions, + gaxInstance?: typeof gax | typeof gax.fallback + ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof SchemaServiceClient; const servicePath = @@ -120,8 +128,13 @@ export class SchemaServiceClient { opts['scopes'] = staticMembers.scopes; } + // Load google-gax module synchronously if needed + if (!gaxInstance) { + gaxInstance = require('google-gax') as typeof gax; + } + // Choose either gRPC or proto-over-HTTP implementation of google-gax. - this._gaxModule = opts.fallback ? gax.fallback : gax; + this._gaxModule = opts.fallback ? gaxInstance.fallback : gaxInstance; // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. this._gaxGrpc = new this._gaxModule.GrpcClient(opts); @@ -142,7 +155,7 @@ export class SchemaServiceClient { if (servicePath === staticMembers.servicePath) { this.auth.defaultScopes = staticMembers.scopes; } - this.iamClient = new IamClient(this._gaxGrpc, opts); + this.iamClient = new this._gaxModule.IamClient(this._gaxGrpc, opts); // Determine the client header string. const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; @@ -208,7 +221,7 @@ export class SchemaServiceClient { this.innerApiCalls = {}; // Add a warn function to the client constructor so it can be easily tested. - this.warn = gax.warn; + this.warn = this._gaxModule.warn; } /** @@ -424,7 +437,7 @@ export class SchemaServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ parent: request.parent || '', }); this.initialize(); @@ -510,7 +523,7 @@ export class SchemaServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ name: request.name || '', }); this.initialize(); @@ -592,7 +605,7 @@ export class SchemaServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ name: request.name || '', }); this.initialize(); @@ -676,7 +689,7 @@ export class SchemaServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ parent: request.parent || '', }); this.initialize(); @@ -768,7 +781,7 @@ export class SchemaServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ parent: request.parent || '', }); this.initialize(); @@ -866,7 +879,7 @@ export class SchemaServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ parent: request.parent || '', }); this.initialize(); @@ -911,7 +924,7 @@ export class SchemaServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ parent: request.parent || '', }); const defaultCallSettings = this._defaults['listSchemas']; @@ -963,7 +976,7 @@ export class SchemaServiceClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ parent: request.parent || '', }); const defaultCallSettings = this._defaults['listSchemas']; diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index aa7b2478035..14e3fd07de7 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -17,21 +17,18 @@ // ** All changes to this file may be overwritten. ** /* global window */ -import * as gax from 'google-gax'; -import { +import type * as gax from 'google-gax'; +import type { Callback, CallOptions, Descriptors, ClientOptions, PaginationCallback, GaxCall, - GoogleError, IamClient, IamProtos, } from 'google-gax'; - -import {Transform} from 'stream'; -import {PassThrough} from 'stream'; +import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); /** @@ -40,7 +37,6 @@ import jsonProtos = require('../../protos/protos.json'); * This file defines retry strategy and timeouts for all API methods in this library. */ import * as gapicConfig from './subscriber_client_config.json'; - const version = require('../../../package.json').version; /** @@ -103,8 +99,18 @@ export class SubscriberClient { * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. * For more information, please check the * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. + * @param {gax} [gaxInstance]: loaded instance of `google-gax`. Useful if you + * need to avoid loading the default gRPC version and want to use the fallback + * HTTP implementation. Load only fallback version and pass it to the constructor: + * ``` + * const gax = require('google-gax/build/src/fallback'); // avoids loading google-gax with gRPC + * const client = new SubscriberClient({fallback: 'rest'}, gax); + * ``` */ - constructor(opts?: ClientOptions) { + constructor( + opts?: ClientOptions, + gaxInstance?: typeof gax | typeof gax.fallback + ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof SubscriberClient; const servicePath = @@ -124,8 +130,13 @@ export class SubscriberClient { opts['scopes'] = staticMembers.scopes; } + // Load google-gax module synchronously if needed + if (!gaxInstance) { + gaxInstance = require('google-gax') as typeof gax; + } + // Choose either gRPC or proto-over-HTTP implementation of google-gax. - this._gaxModule = opts.fallback ? gax.fallback : gax; + this._gaxModule = opts.fallback ? gaxInstance.fallback : gaxInstance; // Create a `gaxGrpc` object, with any grpc-specific options sent to the client. this._gaxGrpc = new this._gaxModule.GrpcClient(opts); @@ -146,7 +157,7 @@ export class SubscriberClient { if (servicePath === staticMembers.servicePath) { this.auth.defaultScopes = staticMembers.scopes; } - this.iamClient = new IamClient(this._gaxGrpc, opts); + this.iamClient = new this._gaxModule.IamClient(this._gaxGrpc, opts); // Determine the client header string. const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; @@ -207,7 +218,7 @@ export class SubscriberClient { // Provide descriptors for these. this.descriptors.stream = { streamingPull: new this._gaxModule.StreamDescriptor( - gax.StreamType.BIDI_STREAMING, + this._gaxModule.StreamType.BIDI_STREAMING, opts.fallback === 'rest' ), }; @@ -226,7 +237,7 @@ export class SubscriberClient { this.innerApiCalls = {}; // Add a warn function to the client constructor so it can be easily tested. - this.warn = gax.warn; + this.warn = this._gaxModule.warn; } /** @@ -289,7 +300,9 @@ export class SubscriberClient { setImmediate(() => { stream.emit( 'error', - new GoogleError('The client has already been closed.') + new this._gaxModule.GoogleError( + 'The client has already been closed.' + ) ); }); return stream; @@ -582,7 +595,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ name: request.name || '', }); this.initialize(); @@ -664,7 +677,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ subscription: request.subscription || '', }); this.initialize(); @@ -749,7 +762,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ 'subscription.name': request.subscription!.name || '', }); this.initialize(); @@ -835,7 +848,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ subscription: request.subscription || '', }); this.initialize(); @@ -932,7 +945,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ subscription: request.subscription || '', }); this.initialize(); @@ -1024,7 +1037,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ subscription: request.subscription || '', }); this.initialize(); @@ -1120,7 +1133,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ subscription: request.subscription || '', }); this.initialize(); @@ -1214,7 +1227,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ subscription: request.subscription || '', }); this.initialize(); @@ -1300,7 +1313,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ snapshot: request.snapshot || '', }); this.initialize(); @@ -1414,7 +1427,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ name: request.name || '', }); this.initialize(); @@ -1503,7 +1516,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ 'snapshot.name': request.snapshot!.name || '', }); this.initialize(); @@ -1593,7 +1606,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ snapshot: request.snapshot || '', }); this.initialize(); @@ -1696,7 +1709,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ subscription: request.subscription || '', }); this.initialize(); @@ -1814,7 +1827,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); this.initialize(); @@ -1855,7 +1868,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); const defaultCallSettings = this._defaults['listSubscriptions']; @@ -1903,7 +1916,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); const defaultCallSettings = this._defaults['listSubscriptions']; @@ -2006,7 +2019,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); this.initialize(); @@ -2047,7 +2060,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); const defaultCallSettings = this._defaults['listSnapshots']; @@ -2095,7 +2108,7 @@ export class SubscriberClient { options.otherArgs = options.otherArgs || {}; options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = - gax.routingHeader.fromParams({ + this._gaxModule.routingHeader.fromParams({ project: request.project || '', }); const defaultCallSettings = this._defaults['listSnapshots']; From fe2c7c60352a10a3bb9a74daf0e807ef298baeff Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 17:49:45 -0400 Subject: [PATCH 0879/1115] chore(main): release 3.1.1 (#1605) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 5bef1f5f201..9e911199b3b 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [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) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 00fe968b6e6..a87a9ccb27a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.1.0", + "version": "3.1.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 835501dfc53c0ab7bfc73d86c90350f761f00f60 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 9 Sep 2022 01:10:17 +0200 Subject: [PATCH 0880/1115] chore(deps): update dependency uuid to v9 (#1619) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [uuid](https://togithub.com/uuidjs/uuid) | [`^8.0.0` -> `^9.0.0`](https://renovatebot.com/diffs/npm/uuid/8.3.2/9.0.0) | [![age](https://badges.renovateapi.com/packages/npm/uuid/9.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/uuid/9.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/uuid/9.0.0/compatibility-slim/8.3.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/uuid/9.0.0/confidence-slim/8.3.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
uuidjs/uuid ### [`v9.0.0`](https://togithub.com/uuidjs/uuid/blob/HEAD/CHANGELOG.md#​900-httpsgithubcomuuidjsuuidcomparev832v900-2022-09-05) [Compare Source](https://togithub.com/uuidjs/uuid/compare/v8.3.2...v9.0.0) ##### ⚠ BREAKING CHANGES - Drop Node.js 10.x support. This library always aims at supporting one EOLed LTS release which by this time now is 12.x which has reached EOL 30 Apr 2022. - Remove the minified UMD build from the package. Minified code is hard to audit and since this is a widely used library it seems more appropriate nowadays to optimize for auditability than to ship a legacy module format that, at best, serves educational purposes nowadays. For production browser use cases, users should be using a bundler. For educational purposes, today's online sandboxes like replit.com offer convenient ways to load npm modules, so the use case for UMD through repos like UNPKG or jsDelivr has largely vanished. - Drop IE 11 and Safari 10 support. Drop support for browsers that don't correctly implement const/let and default arguments, and no longer transpile the browser build to ES2015. This also removes the fallback on msCrypto instead of the crypto API. Browser tests are run in the first supported version of each supported browser and in the latest (as of this commit) version available on Browserstack. ##### Features - optimize uuid.v1 by 1.3x uuid.v4 by 4.3x (430%) ([#​597](https://togithub.com/uuidjs/uuid/issues/597)) ([3a033f6](https://togithub.com/uuidjs/uuid/commit/3a033f6bab6bb3780ece6d645b902548043280bc)) - remove UMD build ([#​645](https://togithub.com/uuidjs/uuid/issues/645)) ([e948a0f](https://togithub.com/uuidjs/uuid/commit/e948a0f22bf22f4619b27bd913885e478e20fe6f)), closes [#​620](https://togithub.com/uuidjs/uuid/issues/620) - use native crypto.randomUUID when available ([#​600](https://togithub.com/uuidjs/uuid/issues/600)) ([c9e076c](https://togithub.com/uuidjs/uuid/commit/c9e076c852edad7e9a06baaa1d148cf4eda6c6c4)) ##### Bug Fixes - add Jest/jsdom compatibility ([#​642](https://togithub.com/uuidjs/uuid/issues/642)) ([16f9c46](https://togithub.com/uuidjs/uuid/commit/16f9c469edf46f0786164cdf4dc980743984a6fd)) - change default export to named function ([#​545](https://togithub.com/uuidjs/uuid/issues/545)) ([c57bc5a](https://togithub.com/uuidjs/uuid/commit/c57bc5a9a0653273aa639cda9177ce52efabe42a)) - handle error when parameter is not set in v3 and v5 ([#​622](https://togithub.com/uuidjs/uuid/issues/622)) ([fcd7388](https://togithub.com/uuidjs/uuid/commit/fcd73881692d9fabb63872576ba28e30ff852091)) - run npm audit fix ([#​644](https://togithub.com/uuidjs/uuid/issues/644)) ([04686f5](https://togithub.com/uuidjs/uuid/commit/04686f54c5fed2cfffc1b619f4970c4bb8532353)) - upgrading from uuid3 broken link ([#​568](https://togithub.com/uuidjs/uuid/issues/568)) ([1c849da](https://togithub.com/uuidjs/uuid/commit/1c849da6e164259e72e18636726345b13a7eddd6)) ##### build - drop Node.js 8.x from babel transpile target ([#​603](https://togithub.com/uuidjs/uuid/issues/603)) ([aa11485](https://togithub.com/uuidjs/uuid/commit/aa114858260402107ec8a1e1a825dea0a259bcb5)) - drop support for legacy browsers (IE11, Safari 10) ([#​604](https://togithub.com/uuidjs/uuid/issues/604)) ([0f433e5](https://togithub.com/uuidjs/uuid/commit/0f433e5ec444edacd53016de67db021102f36148)) - drop node 10.x to upgrade dev dependencies ([#​653](https://togithub.com/uuidjs/uuid/issues/653)) ([28a5712](https://togithub.com/uuidjs/uuid/commit/28a571283f8abda6b9d85e689f95b7d3ee9e282e)), closes [#​643](https://togithub.com/uuidjs/uuid/issues/643) ##### [8.3.2](https://togithub.com/uuidjs/uuid/compare/v8.3.1...v8.3.2) (2020-12-08) ##### Bug Fixes - lazy load getRandomValues ([#​537](https://togithub.com/uuidjs/uuid/issues/537)) ([16c8f6d](https://togithub.com/uuidjs/uuid/commit/16c8f6df2f6b09b4d6235602d6a591188320a82e)), closes [#​536](https://togithub.com/uuidjs/uuid/issues/536) ##### [8.3.1](https://togithub.com/uuidjs/uuid/compare/v8.3.0...v8.3.1) (2020-10-04) ##### Bug Fixes - support expo>=39.0.0 ([#​515](https://togithub.com/uuidjs/uuid/issues/515)) ([c65a0f3](https://togithub.com/uuidjs/uuid/commit/c65a0f3fa73b901959d638d1e3591dfacdbed867)), closes [#​375](https://togithub.com/uuidjs/uuid/issues/375)
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a87a9ccb27a..5d136193c0a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -95,7 +95,7 @@ "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", "yargs": "^16.0.0" From d02ae09eddfe90965d8f48a839db29840656154e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 14 Sep 2022 22:36:20 +0000 Subject: [PATCH 0881/1115] fix: preserve default values in x-goog-request-params header (#1622) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 474338479 Source-Link: https://github.com/googleapis/googleapis/commit/d5d35e0353b59719e8917103b1bc7df2782bf6ba Source-Link: https://github.com/googleapis/googleapis-gen/commit/efcd3f93962a103f68f003e2a1eecde6fa216a27 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZWZjZDNmOTM5NjJhMTAzZjY4ZjAwM2UyYTFlZWNkZTZmYTIxNmEyNyJ9 --- handwritten/pubsub/src/v1/publisher_client.ts | 30 +- .../pubsub/src/v1/schema_service_client.ts | 16 +- .../pubsub/src/v1/subscriber_client.ts | 38 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 977 +++++------ .../pubsub/test/gapic_schema_service_v1.ts | 590 +++---- .../pubsub/test/gapic_subscriber_v1.ts | 1462 +++++++++-------- 6 files changed, 1609 insertions(+), 1504 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 3b127acfbbe..b9b53821456 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -490,7 +490,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - name: request.name || '', + name: request.name ?? '', }); this.initialize(); return this.innerApiCalls.createTopic(request, options, callback); @@ -578,7 +578,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - 'topic.name': request.topic!.name || '', + 'topic.name': request.topic!.name ?? '', }); this.initialize(); return this.innerApiCalls.updateTopic(request, options, callback); @@ -663,7 +663,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); this.initialize(); return this.innerApiCalls.publish(request, options, callback); @@ -745,7 +745,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); this.initialize(); return this.innerApiCalls.getTopic(request, options, callback); @@ -831,7 +831,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); this.initialize(); return this.innerApiCalls.deleteTopic(request, options, callback); @@ -916,7 +916,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - subscription: request.subscription || '', + subscription: request.subscription ?? '', }); this.initialize(); return this.innerApiCalls.detachSubscription(request, options, callback); @@ -1010,7 +1010,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); this.initialize(); return this.innerApiCalls.listTopics(request, options, callback); @@ -1051,7 +1051,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); const defaultCallSettings = this._defaults['listTopics']; const callSettings = defaultCallSettings.merge(options); @@ -1099,7 +1099,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); const defaultCallSettings = this._defaults['listTopics']; const callSettings = defaultCallSettings.merge(options); @@ -1206,7 +1206,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); this.initialize(); return this.innerApiCalls.listTopicSubscriptions( @@ -1251,7 +1251,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); const defaultCallSettings = this._defaults['listTopicSubscriptions']; const callSettings = defaultCallSettings.merge(options); @@ -1299,7 +1299,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); const defaultCallSettings = this._defaults['listTopicSubscriptions']; const callSettings = defaultCallSettings.merge(options); @@ -1404,7 +1404,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); this.initialize(); return this.innerApiCalls.listTopicSnapshots(request, options, callback); @@ -1445,7 +1445,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); const defaultCallSettings = this._defaults['listTopicSnapshots']; const callSettings = defaultCallSettings.merge(options); @@ -1493,7 +1493,7 @@ export class PublisherClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - topic: request.topic || '', + topic: request.topic ?? '', }); const defaultCallSettings = this._defaults['listTopicSnapshots']; const callSettings = defaultCallSettings.merge(options); diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index b832a588958..6f84acc7b86 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -438,7 +438,7 @@ export class SchemaServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - parent: request.parent || '', + parent: request.parent ?? '', }); this.initialize(); return this.innerApiCalls.createSchema(request, options, callback); @@ -524,7 +524,7 @@ export class SchemaServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - name: request.name || '', + name: request.name ?? '', }); this.initialize(); return this.innerApiCalls.getSchema(request, options, callback); @@ -606,7 +606,7 @@ export class SchemaServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - name: request.name || '', + name: request.name ?? '', }); this.initialize(); return this.innerApiCalls.deleteSchema(request, options, callback); @@ -690,7 +690,7 @@ export class SchemaServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - parent: request.parent || '', + parent: request.parent ?? '', }); this.initialize(); return this.innerApiCalls.validateSchema(request, options, callback); @@ -782,7 +782,7 @@ export class SchemaServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - parent: request.parent || '', + parent: request.parent ?? '', }); this.initialize(); return this.innerApiCalls.validateMessage(request, options, callback); @@ -880,7 +880,7 @@ export class SchemaServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - parent: request.parent || '', + parent: request.parent ?? '', }); this.initialize(); return this.innerApiCalls.listSchemas(request, options, callback); @@ -925,7 +925,7 @@ export class SchemaServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - parent: request.parent || '', + parent: request.parent ?? '', }); const defaultCallSettings = this._defaults['listSchemas']; const callSettings = defaultCallSettings.merge(options); @@ -977,7 +977,7 @@ export class SchemaServiceClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - parent: request.parent || '', + parent: request.parent ?? '', }); const defaultCallSettings = this._defaults['listSchemas']; const callSettings = defaultCallSettings.merge(options); diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 14e3fd07de7..f0dbfd657f8 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -596,7 +596,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - name: request.name || '', + name: request.name ?? '', }); this.initialize(); return this.innerApiCalls.createSubscription(request, options, callback); @@ -678,7 +678,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - subscription: request.subscription || '', + subscription: request.subscription ?? '', }); this.initialize(); return this.innerApiCalls.getSubscription(request, options, callback); @@ -763,7 +763,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - 'subscription.name': request.subscription!.name || '', + 'subscription.name': request.subscription!.name ?? '', }); this.initialize(); return this.innerApiCalls.updateSubscription(request, options, callback); @@ -849,7 +849,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - subscription: request.subscription || '', + subscription: request.subscription ?? '', }); this.initialize(); return this.innerApiCalls.deleteSubscription(request, options, callback); @@ -946,7 +946,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - subscription: request.subscription || '', + subscription: request.subscription ?? '', }); this.initialize(); return this.innerApiCalls.modifyAckDeadline(request, options, callback); @@ -1038,7 +1038,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - subscription: request.subscription || '', + subscription: request.subscription ?? '', }); this.initialize(); return this.innerApiCalls.acknowledge(request, options, callback); @@ -1134,7 +1134,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - subscription: request.subscription || '', + subscription: request.subscription ?? '', }); this.initialize(); return this.innerApiCalls.pull(request, options, callback); @@ -1228,7 +1228,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - subscription: request.subscription || '', + subscription: request.subscription ?? '', }); this.initialize(); return this.innerApiCalls.modifyPushConfig(request, options, callback); @@ -1314,7 +1314,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - snapshot: request.snapshot || '', + snapshot: request.snapshot ?? '', }); this.initialize(); return this.innerApiCalls.getSnapshot(request, options, callback); @@ -1428,7 +1428,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - name: request.name || '', + name: request.name ?? '', }); this.initialize(); return this.innerApiCalls.createSnapshot(request, options, callback); @@ -1517,7 +1517,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - 'snapshot.name': request.snapshot!.name || '', + 'snapshot.name': request.snapshot!.name ?? '', }); this.initialize(); return this.innerApiCalls.updateSnapshot(request, options, callback); @@ -1607,7 +1607,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - snapshot: request.snapshot || '', + snapshot: request.snapshot ?? '', }); this.initialize(); return this.innerApiCalls.deleteSnapshot(request, options, callback); @@ -1710,7 +1710,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - subscription: request.subscription || '', + subscription: request.subscription ?? '', }); this.initialize(); return this.innerApiCalls.seek(request, options, callback); @@ -1828,7 +1828,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); this.initialize(); return this.innerApiCalls.listSubscriptions(request, options, callback); @@ -1869,7 +1869,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); const defaultCallSettings = this._defaults['listSubscriptions']; const callSettings = defaultCallSettings.merge(options); @@ -1917,7 +1917,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); const defaultCallSettings = this._defaults['listSubscriptions']; const callSettings = defaultCallSettings.merge(options); @@ -2020,7 +2020,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); this.initialize(); return this.innerApiCalls.listSnapshots(request, options, callback); @@ -2061,7 +2061,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); const defaultCallSettings = this._defaults['listSnapshots']; const callSettings = defaultCallSettings.merge(options); @@ -2109,7 +2109,7 @@ export class SubscriberClient { options.otherArgs.headers = options.otherArgs.headers || {}; options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({ - project: request.project || '', + project: request.project ?? '', }); const defaultCallSettings = this._defaults['listSnapshots']; const callSettings = defaultCallSettings.merge(options); diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 0e93f3ad599..753c73cdadd 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -27,6 +27,21 @@ import {PassThrough} from 'stream'; import {protobuf, IamProtos} from 'google-gax'; +// Dynamically loaded proto JSON is needed to get the type information +// to fill in default values for request objects +const root = protobuf.Root.fromJSON( + require('../protos/protos.json') +).resolveAll(); + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +function getTypeDefaultValue(typeName: string, fields: string[]) { + let type = root.lookupType(typeName) as protobuf.Type; + for (const field of fields.slice(0, -1)) { + type = type.fields[field]?.resolvedType as protobuf.Type; + } + return type.fields[fields[fields.length - 1]]?.defaultValue; +} + function generateSampleMessage(instance: T) { const filledObject = ( instance.constructor as typeof protobuf.Message @@ -220,26 +235,23 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('Topic', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); client.innerApiCalls.createTopic = stubSimpleCall(expectedResponse); const [response] = await client.createTopic(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.createTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.createTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createTopic without error using callback', async () => { @@ -251,15 +263,9 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('Topic', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); @@ -282,11 +288,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.createTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.createTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createTopic with error', async () => { @@ -298,26 +307,23 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('Topic', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.createTopic = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.createTopic(request), expectedError); - assert( - (client.innerApiCalls.createTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.createTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createTopic with closed client', async () => { @@ -329,7 +335,8 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - request.name = ''; + const defaultValue1 = getTypeDefaultValue('Topic', ['name']); + request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.createTopic(request), expectedError); @@ -346,27 +353,27 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateTopicRequest() ); - request.topic = {}; - request.topic.name = ''; - const expectedHeaderRequestParams = 'topic.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.topic ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateTopicRequest', [ + 'topic', + 'name', + ]); + request.topic.name = defaultValue1; + const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); client.innerApiCalls.updateTopic = stubSimpleCall(expectedResponse); const [response] = await client.updateTopic(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.updateTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.updateTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateTopic without error using callback', async () => { @@ -378,16 +385,13 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateTopicRequest() ); - request.topic = {}; - request.topic.name = ''; - const expectedHeaderRequestParams = 'topic.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.topic ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateTopicRequest', [ + 'topic', + 'name', + ]); + request.topic.name = defaultValue1; + const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); @@ -410,11 +414,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.updateTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.updateTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateTopic with error', async () => { @@ -426,27 +433,27 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateTopicRequest() ); - request.topic = {}; - request.topic.name = ''; - const expectedHeaderRequestParams = 'topic.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.topic ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateTopicRequest', [ + 'topic', + 'name', + ]); + request.topic.name = defaultValue1; + const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.updateTopic = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.updateTopic(request), expectedError); - assert( - (client.innerApiCalls.updateTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.updateTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateTopic with closed client', async () => { @@ -458,8 +465,12 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateTopicRequest() ); - request.topic = {}; - request.topic.name = ''; + request.topic ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateTopicRequest', [ + 'topic', + 'name', + ]); + request.topic.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.updateTopic(request), expectedError); @@ -476,26 +487,23 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PublishRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('PublishRequest', ['topic']); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.PublishResponse() ); client.innerApiCalls.publish = stubSimpleCall(expectedResponse); const [response] = await client.publish(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.publish as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = (client.innerApiCalls.publish as SinonStub).getCall( + 0 + ).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.publish as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes publish without error using callback', async () => { @@ -507,15 +515,9 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PublishRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('PublishRequest', ['topic']); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.PublishResponse() ); @@ -538,11 +540,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.publish as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = (client.innerApiCalls.publish as SinonStub).getCall( + 0 + ).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.publish as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes publish with error', async () => { @@ -554,23 +559,20 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PublishRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('PublishRequest', ['topic']); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.publish = stubSimpleCall(undefined, expectedError); await assert.rejects(client.publish(request), expectedError); - assert( - (client.innerApiCalls.publish as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = (client.innerApiCalls.publish as SinonStub).getCall( + 0 + ).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.publish as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes publish with closed client', async () => { @@ -582,7 +584,8 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PublishRequest() ); - request.topic = ''; + const defaultValue1 = getTypeDefaultValue('PublishRequest', ['topic']); + request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.publish(request), expectedError); @@ -599,26 +602,23 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetTopicRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetTopicRequest', ['topic']); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); client.innerApiCalls.getTopic = stubSimpleCall(expectedResponse); const [response] = await client.getTopic(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.getTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.getTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getTopic without error using callback', async () => { @@ -630,15 +630,9 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetTopicRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetTopicRequest', ['topic']); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); @@ -661,11 +655,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.getTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.getTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getTopic with error', async () => { @@ -677,23 +674,20 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetTopicRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetTopicRequest', ['topic']); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.getTopic = stubSimpleCall(undefined, expectedError); await assert.rejects(client.getTopic(request), expectedError); - assert( - (client.innerApiCalls.getTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.getTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getTopic with closed client', async () => { @@ -705,7 +699,8 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetTopicRequest() ); - request.topic = ''; + const defaultValue1 = getTypeDefaultValue('GetTopicRequest', ['topic']); + request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getTopic(request), expectedError); @@ -722,26 +717,25 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteTopicRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteTopicRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); client.innerApiCalls.deleteTopic = stubSimpleCall(expectedResponse); const [response] = await client.deleteTopic(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.deleteTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.deleteTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteTopic without error using callback', async () => { @@ -753,15 +747,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteTopicRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteTopicRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); @@ -784,11 +774,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.deleteTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.deleteTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteTopic with error', async () => { @@ -800,26 +793,25 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteTopicRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteTopicRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteTopic = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.deleteTopic(request), expectedError); - assert( - (client.innerApiCalls.deleteTopic as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.deleteTopic as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteTopic as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteTopic with closed client', async () => { @@ -831,7 +823,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteTopicRequest() ); - request.topic = ''; + const defaultValue1 = getTypeDefaultValue('DeleteTopicRequest', [ + 'topic', + ]); + request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteTopic(request), expectedError); @@ -848,15 +843,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DetachSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionResponse() ); @@ -864,11 +855,14 @@ describe('v1.PublisherClient', () => { stubSimpleCall(expectedResponse); const [response] = await client.detachSubscription(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.detachSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.detachSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.detachSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes detachSubscription without error using callback', async () => { @@ -880,15 +874,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DetachSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionResponse() ); @@ -911,11 +901,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.detachSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.detachSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.detachSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes detachSubscription with error', async () => { @@ -927,26 +920,25 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DetachSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.detachSubscription = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.detachSubscription(request), expectedError); - assert( - (client.innerApiCalls.detachSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.detachSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.detachSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes detachSubscription with closed client', async () => { @@ -958,7 +950,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionRequest() ); - request.subscription = ''; + const defaultValue1 = getTypeDefaultValue('DetachSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.detachSubscription(request), expectedError); @@ -975,15 +970,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), @@ -992,11 +983,14 @@ describe('v1.PublisherClient', () => { client.innerApiCalls.listTopics = stubSimpleCall(expectedResponse); const [response] = await client.listTopics(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listTopics as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listTopics as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopics as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopics without error using callback', async () => { @@ -1008,15 +1002,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), @@ -1041,11 +1031,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listTopics as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.listTopics as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopics as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopics with error', async () => { @@ -1057,26 +1050,25 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.listTopics = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.listTopics(request), expectedError); - assert( - (client.innerApiCalls.listTopics as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listTopics as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopics as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopicsStream without error', async () => { @@ -1088,8 +1080,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), @@ -1117,11 +1112,12 @@ describe('v1.PublisherClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listTopics, request) ); - assert.strictEqual( - (client.descriptors.page.listTopics.createStream as SinonStub).getCall( - 0 - ).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listTopics.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1134,8 +1130,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listTopics.createStream = stubPageStreamingCall( undefined, @@ -1160,11 +1159,12 @@ describe('v1.PublisherClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listTopics, request) ); - assert.strictEqual( - (client.descriptors.page.listTopics.createStream as SinonStub).getCall( - 0 - ).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listTopics.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1177,8 +1177,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), @@ -1198,11 +1201,12 @@ describe('v1.PublisherClient', () => { ).args[1], request ); - assert.strictEqual( - (client.descriptors.page.listTopics.asyncIterate as SinonStub).getCall( - 0 - ).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listTopics.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1215,8 +1219,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listTopics.asyncIterate = stubAsyncIterationCall( undefined, @@ -1235,11 +1242,12 @@ describe('v1.PublisherClient', () => { ).args[1], request ); - assert.strictEqual( - (client.descriptors.page.listTopics.asyncIterate as SinonStub).getCall( - 0 - ).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listTopics.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); }); @@ -1254,25 +1262,25 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue( + 'ListTopicSubscriptionsRequest', + ['topic'] + ); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSubscriptions = stubSimpleCall(expectedResponse); const [response] = await client.listTopicSubscriptions(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listTopicSubscriptions as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listTopicSubscriptions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopicSubscriptions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopicSubscriptions without error using callback', async () => { @@ -1284,15 +1292,12 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue( + 'ListTopicSubscriptionsRequest', + ['topic'] + ); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSubscriptions = stubSimpleCallWithCallback(expectedResponse); @@ -1310,11 +1315,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listTopicSubscriptions as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.listTopicSubscriptions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopicSubscriptions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopicSubscriptions with error', async () => { @@ -1326,15 +1334,12 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue( + 'ListTopicSubscriptionsRequest', + ['topic'] + ); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.listTopicSubscriptions = stubSimpleCall( undefined, @@ -1344,11 +1349,14 @@ describe('v1.PublisherClient', () => { client.listTopicSubscriptions(request), expectedError ); - assert( - (client.innerApiCalls.listTopicSubscriptions as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listTopicSubscriptions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopicSubscriptions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopicSubscriptionsStream without error', async () => { @@ -1360,8 +1368,12 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; + const defaultValue1 = getTypeDefaultValue( + 'ListTopicSubscriptionsRequest', + ['topic'] + ); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall(expectedResponse); @@ -1388,12 +1400,15 @@ describe('v1.PublisherClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listTopicSubscriptions, request) ); - assert.strictEqual( + assert( ( client.descriptors.page.listTopicSubscriptions .createStream as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + ) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1406,8 +1421,12 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; + const defaultValue1 = getTypeDefaultValue( + 'ListTopicSubscriptionsRequest', + ['topic'] + ); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall(undefined, expectedError); @@ -1433,12 +1452,15 @@ describe('v1.PublisherClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listTopicSubscriptions, request) ); - assert.strictEqual( + assert( ( client.descriptors.page.listTopicSubscriptions .createStream as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + ) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1451,8 +1473,12 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; + const defaultValue1 = getTypeDefaultValue( + 'ListTopicSubscriptionsRequest', + ['topic'] + ); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall(expectedResponse); @@ -1469,12 +1495,15 @@ describe('v1.PublisherClient', () => { ).getCall(0).args[1], request ); - assert.strictEqual( + assert( ( client.descriptors.page.listTopicSubscriptions .asyncIterate as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + ) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1487,8 +1516,12 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; + const defaultValue1 = getTypeDefaultValue( + 'ListTopicSubscriptionsRequest', + ['topic'] + ); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -1506,12 +1539,15 @@ describe('v1.PublisherClient', () => { ).getCall(0).args[1], request ); - assert.strictEqual( + assert( ( client.descriptors.page.listTopicSubscriptions .asyncIterate as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + ) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); }); @@ -1526,25 +1562,24 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSnapshots = stubSimpleCall(expectedResponse); const [response] = await client.listTopicSnapshots(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listTopicSnapshots as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listTopicSnapshots as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopicSnapshots as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopicSnapshots without error using callback', async () => { @@ -1556,15 +1591,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSnapshots = stubSimpleCallWithCallback(expectedResponse); @@ -1582,11 +1613,14 @@ describe('v1.PublisherClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listTopicSnapshots as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.listTopicSnapshots as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopicSnapshots as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopicSnapshots with error', async () => { @@ -1598,26 +1632,25 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.listTopicSnapshots = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.listTopicSnapshots(request), expectedError); - assert( - (client.innerApiCalls.listTopicSnapshots as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listTopicSnapshots as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listTopicSnapshots as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listTopicSnapshotsStream without error', async () => { @@ -1629,8 +1662,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; + const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall(expectedResponse); @@ -1654,11 +1690,12 @@ describe('v1.PublisherClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listTopicSnapshots, request) ); - assert.strictEqual( - ( - client.descriptors.page.listTopicSnapshots.createStream as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1671,8 +1708,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; + const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall(undefined, expectedError); @@ -1695,11 +1735,12 @@ describe('v1.PublisherClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listTopicSnapshots, request) ); - assert.strictEqual( - ( - client.descriptors.page.listTopicSnapshots.createStream as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1712,8 +1753,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; + const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall(expectedResponse); @@ -1729,11 +1773,12 @@ describe('v1.PublisherClient', () => { ).getCall(0).args[1], request ); - assert.strictEqual( - ( - client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1746,8 +1791,11 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - request.topic = ''; - const expectedHeaderRequestParams = 'topic='; + const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ + 'topic', + ]); + request.topic = defaultValue1; + const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -1764,11 +1812,12 @@ describe('v1.PublisherClient', () => { ).getCall(0).args[1], request ); - assert.strictEqual( - ( - client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); }); diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 763b62eecd7..1a963ca1d46 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -27,6 +27,21 @@ import {PassThrough} from 'stream'; import {protobuf, IamProtos} from 'google-gax'; +// Dynamically loaded proto JSON is needed to get the type information +// to fill in default values for request objects +const root = protobuf.Root.fromJSON( + require('../protos/protos.json') +).resolveAll(); + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +function getTypeDefaultValue(typeName: string, fields: string[]) { + let type = root.lookupType(typeName) as protobuf.Type; + for (const field of fields.slice(0, -1)) { + type = type.fields[field]?.resolvedType as protobuf.Type; + } + return type.fields[fields[fields.length - 1]]?.defaultValue; +} + function generateSampleMessage(instance: T) { const filledObject = ( instance.constructor as typeof protobuf.Message @@ -222,26 +237,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSchemaRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('CreateSchemaRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Schema() ); client.innerApiCalls.createSchema = stubSimpleCall(expectedResponse); const [response] = await client.createSchema(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.createSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.createSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSchema without error using callback', async () => { @@ -253,15 +267,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSchemaRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('CreateSchemaRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Schema() ); @@ -284,11 +294,14 @@ describe('v1.SchemaServiceClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.createSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.createSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSchema with error', async () => { @@ -300,26 +313,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSchemaRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('CreateSchemaRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.createSchema = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.createSchema(request), expectedError); - assert( - (client.innerApiCalls.createSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.createSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSchema with closed client', async () => { @@ -331,7 +343,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSchemaRequest() ); - request.parent = ''; + const defaultValue1 = getTypeDefaultValue('CreateSchemaRequest', [ + 'parent', + ]); + request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.createSchema(request), expectedError); @@ -348,26 +363,23 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSchemaRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetSchemaRequest', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Schema() ); client.innerApiCalls.getSchema = stubSimpleCall(expectedResponse); const [response] = await client.getSchema(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.getSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.getSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSchema without error using callback', async () => { @@ -379,15 +391,9 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSchemaRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetSchemaRequest', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Schema() ); @@ -410,11 +416,14 @@ describe('v1.SchemaServiceClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.getSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.getSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSchema with error', async () => { @@ -426,23 +435,20 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSchemaRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetSchemaRequest', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.getSchema = stubSimpleCall(undefined, expectedError); await assert.rejects(client.getSchema(request), expectedError); - assert( - (client.innerApiCalls.getSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.getSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSchema with closed client', async () => { @@ -454,7 +460,8 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSchemaRequest() ); - request.name = ''; + const defaultValue1 = getTypeDefaultValue('GetSchemaRequest', ['name']); + request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getSchema(request), expectedError); @@ -471,26 +478,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSchemaRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSchemaRequest', [ + 'name', + ]); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); client.innerApiCalls.deleteSchema = stubSimpleCall(expectedResponse); const [response] = await client.deleteSchema(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.deleteSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.deleteSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSchema without error using callback', async () => { @@ -502,15 +508,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSchemaRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSchemaRequest', [ + 'name', + ]); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); @@ -533,11 +535,14 @@ describe('v1.SchemaServiceClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.deleteSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.deleteSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSchema with error', async () => { @@ -549,26 +554,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSchemaRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSchemaRequest', [ + 'name', + ]); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteSchema = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.deleteSchema(request), expectedError); - assert( - (client.innerApiCalls.deleteSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.deleteSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSchema with closed client', async () => { @@ -580,7 +584,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSchemaRequest() ); - request.name = ''; + const defaultValue1 = getTypeDefaultValue('DeleteSchemaRequest', [ + 'name', + ]); + request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteSchema(request), expectedError); @@ -597,26 +604,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ValidateSchemaRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaResponse() ); client.innerApiCalls.validateSchema = stubSimpleCall(expectedResponse); const [response] = await client.validateSchema(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.validateSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.validateSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.validateSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes validateSchema without error using callback', async () => { @@ -628,15 +634,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ValidateSchemaRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaResponse() ); @@ -659,11 +661,14 @@ describe('v1.SchemaServiceClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.validateSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.validateSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.validateSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes validateSchema with error', async () => { @@ -675,26 +680,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ValidateSchemaRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.validateSchema = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.validateSchema(request), expectedError); - assert( - (client.innerApiCalls.validateSchema as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.validateSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.validateSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes validateSchema with closed client', async () => { @@ -706,7 +710,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaRequest() ); - request.parent = ''; + const defaultValue1 = getTypeDefaultValue('ValidateSchemaRequest', [ + 'parent', + ]); + request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.validateSchema(request), expectedError); @@ -723,26 +730,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ValidateMessageRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageResponse() ); client.innerApiCalls.validateMessage = stubSimpleCall(expectedResponse); const [response] = await client.validateMessage(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.validateMessage as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.validateMessage as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.validateMessage as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes validateMessage without error using callback', async () => { @@ -754,15 +760,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ValidateMessageRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageResponse() ); @@ -785,11 +787,14 @@ describe('v1.SchemaServiceClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.validateMessage as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.validateMessage as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.validateMessage as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes validateMessage with error', async () => { @@ -801,26 +806,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ValidateMessageRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.validateMessage = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.validateMessage(request), expectedError); - assert( - (client.innerApiCalls.validateMessage as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.validateMessage as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.validateMessage as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes validateMessage with closed client', async () => { @@ -832,7 +836,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageRequest() ); - request.parent = ''; + const defaultValue1 = getTypeDefaultValue('ValidateMessageRequest', [ + 'parent', + ]); + request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.validateMessage(request), expectedError); @@ -849,15 +856,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -866,11 +869,14 @@ describe('v1.SchemaServiceClient', () => { client.innerApiCalls.listSchemas = stubSimpleCall(expectedResponse); const [response] = await client.listSchemas(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listSchemas as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listSchemas as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSchemas as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSchemas without error using callback', async () => { @@ -882,15 +888,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -915,11 +917,14 @@ describe('v1.SchemaServiceClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listSchemas as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.listSchemas as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSchemas as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSchemas with error', async () => { @@ -931,26 +936,25 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.listSchemas = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.listSchemas(request), expectedError); - assert( - (client.innerApiCalls.listSchemas as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listSchemas as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSchemas as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSchemasStream without error', async () => { @@ -962,8 +966,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; + const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -991,11 +998,12 @@ describe('v1.SchemaServiceClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listSchemas, request) ); - assert.strictEqual( - (client.descriptors.page.listSchemas.createStream as SinonStub).getCall( - 0 - ).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSchemas.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1008,8 +1016,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; + const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listSchemas.createStream = stubPageStreamingCall( undefined, @@ -1034,11 +1045,12 @@ describe('v1.SchemaServiceClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listSchemas, request) ); - assert.strictEqual( - (client.descriptors.page.listSchemas.createStream as SinonStub).getCall( - 0 - ).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSchemas.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1051,8 +1063,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; + const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1072,11 +1087,12 @@ describe('v1.SchemaServiceClient', () => { ).args[1], request ); - assert.strictEqual( - (client.descriptors.page.listSchemas.asyncIterate as SinonStub).getCall( - 0 - ).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSchemas.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -1089,8 +1105,11 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - request.parent = ''; - const expectedHeaderRequestParams = 'parent='; + const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ + 'parent', + ]); + request.parent = defaultValue1; + const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listSchemas.asyncIterate = stubAsyncIterationCall( undefined, @@ -1109,11 +1128,12 @@ describe('v1.SchemaServiceClient', () => { ).args[1], request ); - assert.strictEqual( - (client.descriptors.page.listSchemas.asyncIterate as SinonStub).getCall( - 0 - ).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSchemas.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); }); diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index a8d955ba346..0160c85b446 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -27,6 +27,21 @@ import {PassThrough} from 'stream'; import {protobuf, IamProtos} from 'google-gax'; +// Dynamically loaded proto JSON is needed to get the type information +// to fill in default values for request objects +const root = protobuf.Root.fromJSON( + require('../protos/protos.json') +).resolveAll(); + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +function getTypeDefaultValue(typeName: string, fields: string[]) { + let type = root.lookupType(typeName) as protobuf.Type; + for (const field of fields.slice(0, -1)) { + type = type.fields[field]?.resolvedType as protobuf.Type; + } + return type.fields[fields[fields.length - 1]]?.defaultValue; +} + function generateSampleMessage(instance: T) { const filledObject = ( instance.constructor as typeof protobuf.Message @@ -234,15 +249,9 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('Subscription', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); @@ -250,11 +259,14 @@ describe('v1.SubscriberClient', () => { stubSimpleCall(expectedResponse); const [response] = await client.createSubscription(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.createSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.createSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSubscription without error using callback', async () => { @@ -266,15 +278,9 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('Subscription', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); @@ -297,11 +303,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.createSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.createSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSubscription with error', async () => { @@ -313,26 +322,23 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('Subscription', ['name']); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.createSubscription = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.createSubscription(request), expectedError); - assert( - (client.innerApiCalls.createSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.createSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSubscription with closed client', async () => { @@ -344,7 +350,8 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - request.name = ''; + const defaultValue1 = getTypeDefaultValue('Subscription', ['name']); + request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.createSubscription(request), expectedError); @@ -361,26 +368,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); client.innerApiCalls.getSubscription = stubSimpleCall(expectedResponse); const [response] = await client.getSubscription(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.getSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.getSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSubscription without error using callback', async () => { @@ -392,15 +398,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); @@ -423,11 +425,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.getSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.getSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSubscription with error', async () => { @@ -439,26 +444,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.getSubscription = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.getSubscription(request), expectedError); - assert( - (client.innerApiCalls.getSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.getSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSubscription with closed client', async () => { @@ -470,7 +474,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSubscriptionRequest() ); - request.subscription = ''; + const defaultValue1 = getTypeDefaultValue('GetSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getSubscription(request), expectedError); @@ -487,16 +494,13 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateSubscriptionRequest() ); - request.subscription = {}; - request.subscription.name = ''; - const expectedHeaderRequestParams = 'subscription.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.subscription ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateSubscriptionRequest', [ + 'subscription', + 'name', + ]); + request.subscription.name = defaultValue1; + const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); @@ -504,11 +508,14 @@ describe('v1.SubscriberClient', () => { stubSimpleCall(expectedResponse); const [response] = await client.updateSubscription(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.updateSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.updateSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateSubscription without error using callback', async () => { @@ -520,16 +527,13 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateSubscriptionRequest() ); - request.subscription = {}; - request.subscription.name = ''; - const expectedHeaderRequestParams = 'subscription.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.subscription ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateSubscriptionRequest', [ + 'subscription', + 'name', + ]); + request.subscription.name = defaultValue1; + const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); @@ -552,11 +556,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.updateSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.updateSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateSubscription with error', async () => { @@ -568,27 +575,27 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateSubscriptionRequest() ); - request.subscription = {}; - request.subscription.name = ''; - const expectedHeaderRequestParams = 'subscription.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.subscription ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateSubscriptionRequest', [ + 'subscription', + 'name', + ]); + request.subscription.name = defaultValue1; + const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.updateSubscription = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.updateSubscription(request), expectedError); - assert( - (client.innerApiCalls.updateSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.updateSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateSubscription with closed client', async () => { @@ -600,8 +607,12 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateSubscriptionRequest() ); - request.subscription = {}; - request.subscription.name = ''; + request.subscription ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateSubscriptionRequest', [ + 'subscription', + 'name', + ]); + request.subscription.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.updateSubscription(request), expectedError); @@ -618,15 +629,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); @@ -634,11 +641,14 @@ describe('v1.SubscriberClient', () => { stubSimpleCall(expectedResponse); const [response] = await client.deleteSubscription(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.deleteSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.deleteSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSubscription without error using callback', async () => { @@ -650,15 +660,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); @@ -681,11 +687,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.deleteSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.deleteSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSubscription with error', async () => { @@ -697,26 +706,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteSubscription = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.deleteSubscription(request), expectedError); - assert( - (client.innerApiCalls.deleteSubscription as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.deleteSubscription as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSubscription as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSubscription with closed client', async () => { @@ -728,7 +736,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); - request.subscription = ''; + const defaultValue1 = getTypeDefaultValue('DeleteSubscriptionRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteSubscription(request), expectedError); @@ -745,26 +756,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ModifyAckDeadlineRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); client.innerApiCalls.modifyAckDeadline = stubSimpleCall(expectedResponse); const [response] = await client.modifyAckDeadline(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.modifyAckDeadline as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.modifyAckDeadline as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.modifyAckDeadline as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes modifyAckDeadline without error using callback', async () => { @@ -776,15 +786,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ModifyAckDeadlineRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); @@ -807,11 +813,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.modifyAckDeadline as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.modifyAckDeadline as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.modifyAckDeadline as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes modifyAckDeadline with error', async () => { @@ -823,26 +832,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ModifyAckDeadlineRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.modifyAckDeadline = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.modifyAckDeadline(request), expectedError); - assert( - (client.innerApiCalls.modifyAckDeadline as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.modifyAckDeadline as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.modifyAckDeadline as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes modifyAckDeadline with closed client', async () => { @@ -854,7 +862,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); - request.subscription = ''; + const defaultValue1 = getTypeDefaultValue('ModifyAckDeadlineRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.modifyAckDeadline(request), expectedError); @@ -871,26 +882,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.AcknowledgeRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('AcknowledgeRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); client.innerApiCalls.acknowledge = stubSimpleCall(expectedResponse); const [response] = await client.acknowledge(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.acknowledge as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.acknowledge as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.acknowledge as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes acknowledge without error using callback', async () => { @@ -902,15 +912,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.AcknowledgeRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('AcknowledgeRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); @@ -933,11 +939,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.acknowledge as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.acknowledge as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.acknowledge as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes acknowledge with error', async () => { @@ -949,26 +958,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.AcknowledgeRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('AcknowledgeRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.acknowledge = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.acknowledge(request), expectedError); - assert( - (client.innerApiCalls.acknowledge as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.acknowledge as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.acknowledge as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes acknowledge with closed client', async () => { @@ -980,7 +988,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.AcknowledgeRequest() ); - request.subscription = ''; + const defaultValue1 = getTypeDefaultValue('AcknowledgeRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.acknowledge(request), expectedError); @@ -997,26 +1008,24 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PullRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('PullRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.PullResponse() ); client.innerApiCalls.pull = stubSimpleCall(expectedResponse); const [response] = await client.pull(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.pull as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = (client.innerApiCalls.pull as SinonStub).getCall(0) + .args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.pull as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes pull without error using callback', async () => { @@ -1028,15 +1037,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PullRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('PullRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.PullResponse() ); @@ -1058,11 +1063,13 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.pull as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = (client.innerApiCalls.pull as SinonStub).getCall(0) + .args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.pull as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes pull with error', async () => { @@ -1074,23 +1081,21 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PullRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('PullRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.pull = stubSimpleCall(undefined, expectedError); await assert.rejects(client.pull(request), expectedError); - assert( - (client.innerApiCalls.pull as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = (client.innerApiCalls.pull as SinonStub).getCall(0) + .args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.pull as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes pull with closed client', async () => { @@ -1102,7 +1107,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PullRequest() ); - request.subscription = ''; + const defaultValue1 = getTypeDefaultValue('PullRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.pull(request), expectedError); @@ -1119,26 +1127,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyPushConfigRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ModifyPushConfigRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); client.innerApiCalls.modifyPushConfig = stubSimpleCall(expectedResponse); const [response] = await client.modifyPushConfig(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.modifyPushConfig as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.modifyPushConfig as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.modifyPushConfig as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes modifyPushConfig without error using callback', async () => { @@ -1150,15 +1157,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyPushConfigRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ModifyPushConfigRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); @@ -1181,11 +1184,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.modifyPushConfig as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.modifyPushConfig as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.modifyPushConfig as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes modifyPushConfig with error', async () => { @@ -1197,26 +1203,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyPushConfigRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ModifyPushConfigRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.modifyPushConfig = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.modifyPushConfig(request), expectedError); - assert( - (client.innerApiCalls.modifyPushConfig as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.modifyPushConfig as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.modifyPushConfig as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes modifyPushConfig with closed client', async () => { @@ -1228,7 +1233,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyPushConfigRequest() ); - request.subscription = ''; + const defaultValue1 = getTypeDefaultValue('ModifyPushConfigRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.modifyPushConfig(request), expectedError); @@ -1239,32 +1247,31 @@ describe('v1.SubscriberClient', () => { it('invokes getSnapshot without error', async () => { const client = new subscriberModule.v1.SubscriberClient({ credentials: {client_email: 'bogus', private_key: 'bogus'}, - projectId: 'bogus', - }); - client.initialize(); - const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSnapshotRequest() - ); - request.snapshot = ''; - const expectedHeaderRequestParams = 'snapshot='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.GetSnapshotRequest() + ); + const defaultValue1 = getTypeDefaultValue('GetSnapshotRequest', [ + 'snapshot', + ]); + request.snapshot = defaultValue1; + const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); client.innerApiCalls.getSnapshot = stubSimpleCall(expectedResponse); const [response] = await client.getSnapshot(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.getSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.getSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSnapshot without error using callback', async () => { @@ -1276,15 +1283,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSnapshotRequest() ); - request.snapshot = ''; - const expectedHeaderRequestParams = 'snapshot='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetSnapshotRequest', [ + 'snapshot', + ]); + request.snapshot = defaultValue1; + const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); @@ -1307,11 +1310,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.getSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.getSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSnapshot with error', async () => { @@ -1323,26 +1329,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSnapshotRequest() ); - request.snapshot = ''; - const expectedHeaderRequestParams = 'snapshot='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('GetSnapshotRequest', [ + 'snapshot', + ]); + request.snapshot = defaultValue1; + const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.getSnapshot = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.getSnapshot(request), expectedError); - assert( - (client.innerApiCalls.getSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.getSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.getSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes getSnapshot with closed client', async () => { @@ -1354,7 +1359,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSnapshotRequest() ); - request.snapshot = ''; + const defaultValue1 = getTypeDefaultValue('GetSnapshotRequest', [ + 'snapshot', + ]); + request.snapshot = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.getSnapshot(request), expectedError); @@ -1371,26 +1379,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSnapshotRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('CreateSnapshotRequest', [ + 'name', + ]); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); client.innerApiCalls.createSnapshot = stubSimpleCall(expectedResponse); const [response] = await client.createSnapshot(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.createSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.createSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSnapshot without error using callback', async () => { @@ -1402,15 +1409,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSnapshotRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('CreateSnapshotRequest', [ + 'name', + ]); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); @@ -1433,11 +1436,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.createSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.createSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSnapshot with error', async () => { @@ -1449,26 +1455,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSnapshotRequest() ); - request.name = ''; - const expectedHeaderRequestParams = 'name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('CreateSnapshotRequest', [ + 'name', + ]); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.createSnapshot = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.createSnapshot(request), expectedError); - assert( - (client.innerApiCalls.createSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.createSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.createSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes createSnapshot with closed client', async () => { @@ -1480,7 +1485,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSnapshotRequest() ); - request.name = ''; + const defaultValue1 = getTypeDefaultValue('CreateSnapshotRequest', [ + 'name', + ]); + request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.createSnapshot(request), expectedError); @@ -1497,27 +1505,27 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateSnapshotRequest() ); - request.snapshot = {}; - request.snapshot.name = ''; - const expectedHeaderRequestParams = 'snapshot.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.snapshot ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateSnapshotRequest', [ + 'snapshot', + 'name', + ]); + request.snapshot.name = defaultValue1; + const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); client.innerApiCalls.updateSnapshot = stubSimpleCall(expectedResponse); const [response] = await client.updateSnapshot(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.updateSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.updateSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateSnapshot without error using callback', async () => { @@ -1529,16 +1537,13 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateSnapshotRequest() ); - request.snapshot = {}; - request.snapshot.name = ''; - const expectedHeaderRequestParams = 'snapshot.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.snapshot ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateSnapshotRequest', [ + 'snapshot', + 'name', + ]); + request.snapshot.name = defaultValue1; + const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.Snapshot() ); @@ -1561,11 +1566,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.updateSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.updateSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateSnapshot with error', async () => { @@ -1577,27 +1585,27 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateSnapshotRequest() ); - request.snapshot = {}; - request.snapshot.name = ''; - const expectedHeaderRequestParams = 'snapshot.name='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + request.snapshot ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateSnapshotRequest', [ + 'snapshot', + 'name', + ]); + request.snapshot.name = defaultValue1; + const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.updateSnapshot = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.updateSnapshot(request), expectedError); - assert( - (client.innerApiCalls.updateSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.updateSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.updateSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes updateSnapshot with closed client', async () => { @@ -1609,8 +1617,12 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.UpdateSnapshotRequest() ); - request.snapshot = {}; - request.snapshot.name = ''; + request.snapshot ??= {}; + const defaultValue1 = getTypeDefaultValue('UpdateSnapshotRequest', [ + 'snapshot', + 'name', + ]); + request.snapshot.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.updateSnapshot(request), expectedError); @@ -1627,26 +1639,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSnapshotRequest() ); - request.snapshot = ''; - const expectedHeaderRequestParams = 'snapshot='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSnapshotRequest', [ + 'snapshot', + ]); + request.snapshot = defaultValue1; + const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); client.innerApiCalls.deleteSnapshot = stubSimpleCall(expectedResponse); const [response] = await client.deleteSnapshot(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.deleteSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.deleteSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSnapshot without error using callback', async () => { @@ -1658,15 +1669,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSnapshotRequest() ); - request.snapshot = ''; - const expectedHeaderRequestParams = 'snapshot='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSnapshotRequest', [ + 'snapshot', + ]); + request.snapshot = defaultValue1; + const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.protobuf.Empty() ); @@ -1689,11 +1696,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.deleteSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.deleteSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSnapshot with error', async () => { @@ -1705,26 +1715,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSnapshotRequest() ); - request.snapshot = ''; - const expectedHeaderRequestParams = 'snapshot='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('DeleteSnapshotRequest', [ + 'snapshot', + ]); + request.snapshot = defaultValue1; + const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteSnapshot = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.deleteSnapshot(request), expectedError); - assert( - (client.innerApiCalls.deleteSnapshot as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.deleteSnapshot as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSnapshot as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes deleteSnapshot with closed client', async () => { @@ -1736,7 +1745,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSnapshotRequest() ); - request.snapshot = ''; + const defaultValue1 = getTypeDefaultValue('DeleteSnapshotRequest', [ + 'snapshot', + ]); + request.snapshot = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.deleteSnapshot(request), expectedError); @@ -1753,26 +1765,24 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.SeekRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('SeekRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.SeekResponse() ); client.innerApiCalls.seek = stubSimpleCall(expectedResponse); const [response] = await client.seek(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.seek as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = (client.innerApiCalls.seek as SinonStub).getCall(0) + .args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.seek as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes seek without error using callback', async () => { @@ -1784,15 +1794,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.SeekRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('SeekRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.SeekResponse() ); @@ -1814,11 +1820,13 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.seek as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = (client.innerApiCalls.seek as SinonStub).getCall(0) + .args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.seek as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes seek with error', async () => { @@ -1830,23 +1838,21 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.SeekRequest() ); - request.subscription = ''; - const expectedHeaderRequestParams = 'subscription='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('SeekRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; + const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.seek = stubSimpleCall(undefined, expectedError); await assert.rejects(client.seek(request), expectedError); - assert( - (client.innerApiCalls.seek as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = (client.innerApiCalls.seek as SinonStub).getCall(0) + .args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.seek as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes seek with closed client', async () => { @@ -1858,7 +1864,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.SeekRequest() ); - request.subscription = ''; + const defaultValue1 = getTypeDefaultValue('SeekRequest', [ + 'subscription', + ]); + request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); await assert.rejects(client.seek(request), expectedError); @@ -1875,6 +1884,7 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.StreamingPullRequest() ); + const expectedResponse = generateSampleMessage( new protos.google.pubsub.v1.StreamingPullResponse() ); @@ -1960,15 +1970,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), @@ -1977,11 +1983,14 @@ describe('v1.SubscriberClient', () => { client.innerApiCalls.listSubscriptions = stubSimpleCall(expectedResponse); const [response] = await client.listSubscriptions(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listSubscriptions as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listSubscriptions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSubscriptions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSubscriptions without error using callback', async () => { @@ -1993,15 +2002,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), @@ -2026,11 +2031,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listSubscriptions as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.listSubscriptions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSubscriptions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSubscriptions with error', async () => { @@ -2042,26 +2050,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.listSubscriptions = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.listSubscriptions(request), expectedError); - assert( - (client.innerApiCalls.listSubscriptions as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listSubscriptions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSubscriptions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSubscriptionsStream without error', async () => { @@ -2073,8 +2080,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), @@ -2102,11 +2112,12 @@ describe('v1.SubscriberClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listSubscriptions, request) ); - assert.strictEqual( - ( - client.descriptors.page.listSubscriptions.createStream as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSubscriptions.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -2119,8 +2130,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listSubscriptions.createStream = stubPageStreamingCall(undefined, expectedError); @@ -2143,11 +2157,12 @@ describe('v1.SubscriberClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listSubscriptions, request) ); - assert.strictEqual( - ( - client.descriptors.page.listSubscriptions.createStream as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSubscriptions.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -2160,8 +2175,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), @@ -2181,11 +2199,12 @@ describe('v1.SubscriberClient', () => { ).getCall(0).args[1], request ); - assert.strictEqual( - ( - client.descriptors.page.listSubscriptions.asyncIterate as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSubscriptions.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -2198,8 +2217,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listSubscriptions.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -2216,11 +2238,12 @@ describe('v1.SubscriberClient', () => { ).getCall(0).args[1], request ); - assert.strictEqual( - ( - client.descriptors.page.listSubscriptions.asyncIterate as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSubscriptions.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); }); @@ -2235,15 +2258,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), @@ -2252,11 +2271,14 @@ describe('v1.SubscriberClient', () => { client.innerApiCalls.listSnapshots = stubSimpleCall(expectedResponse); const [response] = await client.listSnapshots(request); assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listSnapshots as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listSnapshots as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSnapshots as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSnapshots without error using callback', async () => { @@ -2268,15 +2290,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), @@ -2301,11 +2319,14 @@ describe('v1.SubscriberClient', () => { }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); - assert( - (client.innerApiCalls.listSnapshots as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions /*, callback defined above */) - ); + const actualRequest = ( + client.innerApiCalls.listSnapshots as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSnapshots as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSnapshots with error', async () => { @@ -2317,26 +2338,25 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; - const expectedOptions = { - otherArgs: { - headers: { - 'x-goog-request-params': expectedHeaderRequestParams, - }, - }, - }; + const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.innerApiCalls.listSnapshots = stubSimpleCall( undefined, expectedError ); await assert.rejects(client.listSnapshots(request), expectedError); - assert( - (client.innerApiCalls.listSnapshots as SinonStub) - .getCall(0) - .calledWith(request, expectedOptions, undefined) - ); + const actualRequest = ( + client.innerApiCalls.listSnapshots as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSnapshots as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); }); it('invokes listSnapshotsStream without error', async () => { @@ -2348,8 +2368,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), @@ -2377,11 +2400,12 @@ describe('v1.SubscriberClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listSnapshots, request) ); - assert.strictEqual( - ( - client.descriptors.page.listSnapshots.createStream as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSnapshots.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -2394,8 +2418,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listSnapshots.createStream = stubPageStreamingCall(undefined, expectedError); @@ -2418,11 +2445,12 @@ describe('v1.SubscriberClient', () => { .getCall(0) .calledWith(client.innerApiCalls.listSnapshots, request) ); - assert.strictEqual( - ( - client.descriptors.page.listSnapshots.createStream as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSnapshots.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -2435,8 +2463,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), @@ -2456,11 +2487,12 @@ describe('v1.SubscriberClient', () => { ).getCall(0).args[1], request ); - assert.strictEqual( - ( - client.descriptors.page.listSnapshots.asyncIterate as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSnapshots.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); @@ -2473,8 +2505,11 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - request.project = ''; - const expectedHeaderRequestParams = 'project='; + const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ + 'project', + ]); + request.project = defaultValue1; + const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); client.descriptors.page.listSnapshots.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -2491,11 +2526,12 @@ describe('v1.SubscriberClient', () => { ).getCall(0).args[1], request ); - assert.strictEqual( - ( - client.descriptors.page.listSnapshots.asyncIterate as SinonStub - ).getCall(0).args[2].otherArgs.headers['x-goog-request-params'], - expectedHeaderRequestParams + assert( + (client.descriptors.page.listSnapshots.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) ); }); }); From 149abcd0fd9443f45791665cf2f23c6d0a325e11 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 13:23:09 -0400 Subject: [PATCH 0882/1115] test: use fully qualified request type name in tests (#1635) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: use fully qualified request type name in tests PiperOrigin-RevId: 475685359 Source-Link: https://github.com/googleapis/googleapis/commit/7a129736313ceb1f277c3b7f7e16d2e04cc901dd Source-Link: https://github.com/googleapis/googleapis-gen/commit/370c729e2ba062a167449c27882ba5f379c5c34d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzcwYzcyOWUyYmEwNjJhMTY3NDQ5YzI3ODgyYmE1ZjM3OWM1YzM0ZCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- handwritten/pubsub/test/gapic_publisher_v1.ts | 256 ++++++---- .../pubsub/test/gapic_schema_service_v1.ts | 181 ++++--- .../pubsub/test/gapic_subscriber_v1.ts | 462 ++++++++++-------- 3 files changed, 527 insertions(+), 372 deletions(-) diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 753c73cdadd..f4554a45987 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -235,7 +235,9 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - const defaultValue1 = getTypeDefaultValue('Topic', ['name']); + const defaultValue1 = getTypeDefaultValue('.google.pubsub.v1.Topic', [ + 'name', + ]); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -263,7 +265,9 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - const defaultValue1 = getTypeDefaultValue('Topic', ['name']); + const defaultValue1 = getTypeDefaultValue('.google.pubsub.v1.Topic', [ + 'name', + ]); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -307,7 +311,9 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - const defaultValue1 = getTypeDefaultValue('Topic', ['name']); + const defaultValue1 = getTypeDefaultValue('.google.pubsub.v1.Topic', [ + 'name', + ]); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); @@ -335,7 +341,9 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Topic() ); - const defaultValue1 = getTypeDefaultValue('Topic', ['name']); + const defaultValue1 = getTypeDefaultValue('.google.pubsub.v1.Topic', [ + 'name', + ]); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -354,10 +362,10 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.UpdateTopicRequest() ); request.topic ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateTopicRequest', [ - 'topic', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateTopicRequest', + ['topic', 'name'] + ); request.topic.name = defaultValue1; const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -386,10 +394,10 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.UpdateTopicRequest() ); request.topic ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateTopicRequest', [ - 'topic', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateTopicRequest', + ['topic', 'name'] + ); request.topic.name = defaultValue1; const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -434,10 +442,10 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.UpdateTopicRequest() ); request.topic ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateTopicRequest', [ - 'topic', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateTopicRequest', + ['topic', 'name'] + ); request.topic.name = defaultValue1; const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; const expectedError = new Error('expected'); @@ -466,10 +474,10 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.UpdateTopicRequest() ); request.topic ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateTopicRequest', [ - 'topic', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateTopicRequest', + ['topic', 'name'] + ); request.topic.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -487,7 +495,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PublishRequest() ); - const defaultValue1 = getTypeDefaultValue('PublishRequest', ['topic']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.PublishRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -515,7 +526,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PublishRequest() ); - const defaultValue1 = getTypeDefaultValue('PublishRequest', ['topic']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.PublishRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -559,7 +573,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PublishRequest() ); - const defaultValue1 = getTypeDefaultValue('PublishRequest', ['topic']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.PublishRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); @@ -584,7 +601,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PublishRequest() ); - const defaultValue1 = getTypeDefaultValue('PublishRequest', ['topic']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.PublishRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -602,7 +622,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetTopicRequest() ); - const defaultValue1 = getTypeDefaultValue('GetTopicRequest', ['topic']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetTopicRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -630,7 +653,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetTopicRequest() ); - const defaultValue1 = getTypeDefaultValue('GetTopicRequest', ['topic']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetTopicRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -674,7 +700,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetTopicRequest() ); - const defaultValue1 = getTypeDefaultValue('GetTopicRequest', ['topic']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetTopicRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); @@ -699,7 +728,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetTopicRequest() ); - const defaultValue1 = getTypeDefaultValue('GetTopicRequest', ['topic']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetTopicRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -717,9 +749,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteTopicRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteTopicRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteTopicRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -747,9 +780,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteTopicRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteTopicRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteTopicRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -793,9 +827,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteTopicRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteTopicRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteTopicRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); @@ -823,9 +858,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteTopicRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteTopicRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteTopicRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -843,9 +879,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('DetachSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DetachSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -874,9 +911,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('DetachSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DetachSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -920,9 +958,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('DetachSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DetachSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); @@ -950,9 +989,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DetachSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('DetachSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DetachSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -970,9 +1010,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -1002,9 +1043,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -1050,9 +1092,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1080,9 +1123,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -1130,9 +1174,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1177,9 +1222,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -1219,9 +1265,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1263,7 +1310,7 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); const defaultValue1 = getTypeDefaultValue( - 'ListTopicSubscriptionsRequest', + '.google.pubsub.v1.ListTopicSubscriptionsRequest', ['topic'] ); request.topic = defaultValue1; @@ -1293,7 +1340,7 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); const defaultValue1 = getTypeDefaultValue( - 'ListTopicSubscriptionsRequest', + '.google.pubsub.v1.ListTopicSubscriptionsRequest', ['topic'] ); request.topic = defaultValue1; @@ -1335,7 +1382,7 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); const defaultValue1 = getTypeDefaultValue( - 'ListTopicSubscriptionsRequest', + '.google.pubsub.v1.ListTopicSubscriptionsRequest', ['topic'] ); request.topic = defaultValue1; @@ -1369,7 +1416,7 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); const defaultValue1 = getTypeDefaultValue( - 'ListTopicSubscriptionsRequest', + '.google.pubsub.v1.ListTopicSubscriptionsRequest', ['topic'] ); request.topic = defaultValue1; @@ -1422,7 +1469,7 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); const defaultValue1 = getTypeDefaultValue( - 'ListTopicSubscriptionsRequest', + '.google.pubsub.v1.ListTopicSubscriptionsRequest', ['topic'] ); request.topic = defaultValue1; @@ -1474,7 +1521,7 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); const defaultValue1 = getTypeDefaultValue( - 'ListTopicSubscriptionsRequest', + '.google.pubsub.v1.ListTopicSubscriptionsRequest', ['topic'] ); request.topic = defaultValue1; @@ -1517,7 +1564,7 @@ describe('v1.PublisherClient', () => { new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() ); const defaultValue1 = getTypeDefaultValue( - 'ListTopicSubscriptionsRequest', + '.google.pubsub.v1.ListTopicSubscriptionsRequest', ['topic'] ); request.topic = defaultValue1; @@ -1562,9 +1609,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicSnapshotsRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; @@ -1591,9 +1639,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicSnapshotsRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; @@ -1632,9 +1681,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicSnapshotsRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1662,9 +1712,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicSnapshotsRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; @@ -1708,9 +1759,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicSnapshotsRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1753,9 +1805,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicSnapshotsRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedResponse = [new String(), new String(), new String()]; @@ -1791,9 +1844,10 @@ describe('v1.PublisherClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListTopicSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListTopicSnapshotsRequest', [ - 'topic', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListTopicSnapshotsRequest', + ['topic'] + ); request.topic = defaultValue1; const expectedHeaderRequestParams = `topic=${defaultValue1}`; const expectedError = new Error('expected'); diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 1a963ca1d46..6117038253e 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -237,9 +237,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('CreateSchemaRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CreateSchemaRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -267,9 +268,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('CreateSchemaRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CreateSchemaRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -313,9 +315,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('CreateSchemaRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CreateSchemaRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); @@ -343,9 +346,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('CreateSchemaRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CreateSchemaRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -363,7 +367,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSchemaRequest', ['name']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSchemaRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -391,7 +398,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSchemaRequest', ['name']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSchemaRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -435,7 +445,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSchemaRequest', ['name']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSchemaRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); @@ -460,7 +473,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSchemaRequest', ['name']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSchemaRequest', + ['name'] + ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -478,9 +494,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSchemaRequest', [ - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSchemaRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -508,9 +525,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSchemaRequest', [ - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSchemaRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -554,9 +572,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSchemaRequest', [ - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSchemaRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); @@ -584,9 +603,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSchemaRequest', [ - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSchemaRequest', + ['name'] + ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -604,9 +624,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('ValidateSchemaRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ValidateSchemaRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -634,9 +655,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('ValidateSchemaRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ValidateSchemaRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -680,9 +702,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('ValidateSchemaRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ValidateSchemaRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); @@ -710,9 +733,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateSchemaRequest() ); - const defaultValue1 = getTypeDefaultValue('ValidateSchemaRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ValidateSchemaRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -730,9 +754,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageRequest() ); - const defaultValue1 = getTypeDefaultValue('ValidateMessageRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ValidateMessageRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -760,9 +785,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageRequest() ); - const defaultValue1 = getTypeDefaultValue('ValidateMessageRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ValidateMessageRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -806,9 +832,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageRequest() ); - const defaultValue1 = getTypeDefaultValue('ValidateMessageRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ValidateMessageRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); @@ -836,9 +863,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ValidateMessageRequest() ); - const defaultValue1 = getTypeDefaultValue('ValidateMessageRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ValidateMessageRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -856,9 +884,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemasRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = [ @@ -888,9 +917,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemasRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = [ @@ -936,9 +966,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemasRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); @@ -966,9 +997,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemasRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = [ @@ -1016,9 +1048,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemasRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1063,9 +1096,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemasRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedResponse = [ @@ -1105,9 +1139,10 @@ describe('v1.SchemaServiceClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSchemasRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSchemasRequest', [ - 'parent', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemasRequest', + ['parent'] + ); request.parent = defaultValue1; const expectedHeaderRequestParams = `parent=${defaultValue1}`; const expectedError = new Error('expected'); diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 0160c85b446..1fae039398e 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -249,7 +249,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - const defaultValue1 = getTypeDefaultValue('Subscription', ['name']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.Subscription', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -278,7 +281,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - const defaultValue1 = getTypeDefaultValue('Subscription', ['name']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.Subscription', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -322,7 +328,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - const defaultValue1 = getTypeDefaultValue('Subscription', ['name']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.Subscription', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); @@ -350,7 +359,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.Subscription() ); - const defaultValue1 = getTypeDefaultValue('Subscription', ['name']); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.Subscription', + ['name'] + ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -368,9 +380,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -398,9 +411,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -444,9 +458,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); @@ -474,9 +489,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -495,10 +511,10 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.UpdateSubscriptionRequest() ); request.subscription ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateSubscriptionRequest', [ - 'subscription', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateSubscriptionRequest', + ['subscription', 'name'] + ); request.subscription.name = defaultValue1; const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -528,10 +544,10 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.UpdateSubscriptionRequest() ); request.subscription ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateSubscriptionRequest', [ - 'subscription', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateSubscriptionRequest', + ['subscription', 'name'] + ); request.subscription.name = defaultValue1; const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -576,10 +592,10 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.UpdateSubscriptionRequest() ); request.subscription ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateSubscriptionRequest', [ - 'subscription', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateSubscriptionRequest', + ['subscription', 'name'] + ); request.subscription.name = defaultValue1; const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; const expectedError = new Error('expected'); @@ -608,10 +624,10 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.UpdateSubscriptionRequest() ); request.subscription ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateSubscriptionRequest', [ - 'subscription', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateSubscriptionRequest', + ['subscription', 'name'] + ); request.subscription.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -629,9 +645,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -660,9 +677,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -706,9 +724,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); @@ -736,9 +755,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSubscriptionRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSubscriptionRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSubscriptionRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -756,9 +776,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); - const defaultValue1 = getTypeDefaultValue('ModifyAckDeadlineRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ModifyAckDeadlineRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -786,9 +807,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); - const defaultValue1 = getTypeDefaultValue('ModifyAckDeadlineRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ModifyAckDeadlineRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -832,9 +854,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); - const defaultValue1 = getTypeDefaultValue('ModifyAckDeadlineRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ModifyAckDeadlineRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); @@ -862,9 +885,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyAckDeadlineRequest() ); - const defaultValue1 = getTypeDefaultValue('ModifyAckDeadlineRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ModifyAckDeadlineRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -882,9 +906,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.AcknowledgeRequest() ); - const defaultValue1 = getTypeDefaultValue('AcknowledgeRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.AcknowledgeRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -912,9 +937,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.AcknowledgeRequest() ); - const defaultValue1 = getTypeDefaultValue('AcknowledgeRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.AcknowledgeRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -958,9 +984,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.AcknowledgeRequest() ); - const defaultValue1 = getTypeDefaultValue('AcknowledgeRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.AcknowledgeRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); @@ -988,9 +1015,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.AcknowledgeRequest() ); - const defaultValue1 = getTypeDefaultValue('AcknowledgeRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.AcknowledgeRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1008,9 +1036,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PullRequest() ); - const defaultValue1 = getTypeDefaultValue('PullRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.PullRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1037,9 +1066,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PullRequest() ); - const defaultValue1 = getTypeDefaultValue('PullRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.PullRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1081,9 +1111,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PullRequest() ); - const defaultValue1 = getTypeDefaultValue('PullRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.PullRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1107,9 +1138,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.PullRequest() ); - const defaultValue1 = getTypeDefaultValue('PullRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.PullRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1127,9 +1159,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyPushConfigRequest() ); - const defaultValue1 = getTypeDefaultValue('ModifyPushConfigRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ModifyPushConfigRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1157,9 +1190,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyPushConfigRequest() ); - const defaultValue1 = getTypeDefaultValue('ModifyPushConfigRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ModifyPushConfigRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1203,9 +1237,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyPushConfigRequest() ); - const defaultValue1 = getTypeDefaultValue('ModifyPushConfigRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ModifyPushConfigRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1233,9 +1268,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ModifyPushConfigRequest() ); - const defaultValue1 = getTypeDefaultValue('ModifyPushConfigRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ModifyPushConfigRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1253,9 +1289,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSnapshotRequest', [ - 'snapshot', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSnapshotRequest', + ['snapshot'] + ); request.snapshot = defaultValue1; const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1283,9 +1320,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSnapshotRequest', [ - 'snapshot', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSnapshotRequest', + ['snapshot'] + ); request.snapshot = defaultValue1; const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1329,9 +1367,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSnapshotRequest', [ - 'snapshot', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSnapshotRequest', + ['snapshot'] + ); request.snapshot = defaultValue1; const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1359,9 +1398,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.GetSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('GetSnapshotRequest', [ - 'snapshot', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.GetSnapshotRequest', + ['snapshot'] + ); request.snapshot = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1379,9 +1419,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('CreateSnapshotRequest', [ - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CreateSnapshotRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1409,9 +1450,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('CreateSnapshotRequest', [ - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CreateSnapshotRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1455,9 +1497,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('CreateSnapshotRequest', [ - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CreateSnapshotRequest', + ['name'] + ); request.name = defaultValue1; const expectedHeaderRequestParams = `name=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1485,9 +1528,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.CreateSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('CreateSnapshotRequest', [ - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CreateSnapshotRequest', + ['name'] + ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1506,10 +1550,10 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.UpdateSnapshotRequest() ); request.snapshot ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateSnapshotRequest', [ - 'snapshot', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateSnapshotRequest', + ['snapshot', 'name'] + ); request.snapshot.name = defaultValue1; const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1538,10 +1582,10 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.UpdateSnapshotRequest() ); request.snapshot ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateSnapshotRequest', [ - 'snapshot', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateSnapshotRequest', + ['snapshot', 'name'] + ); request.snapshot.name = defaultValue1; const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1586,10 +1630,10 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.UpdateSnapshotRequest() ); request.snapshot ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateSnapshotRequest', [ - 'snapshot', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateSnapshotRequest', + ['snapshot', 'name'] + ); request.snapshot.name = defaultValue1; const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1618,10 +1662,10 @@ describe('v1.SubscriberClient', () => { new protos.google.pubsub.v1.UpdateSnapshotRequest() ); request.snapshot ??= {}; - const defaultValue1 = getTypeDefaultValue('UpdateSnapshotRequest', [ - 'snapshot', - 'name', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.UpdateSnapshotRequest', + ['snapshot', 'name'] + ); request.snapshot.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1639,9 +1683,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSnapshotRequest', [ - 'snapshot', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSnapshotRequest', + ['snapshot'] + ); request.snapshot = defaultValue1; const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1669,9 +1714,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSnapshotRequest', [ - 'snapshot', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSnapshotRequest', + ['snapshot'] + ); request.snapshot = defaultValue1; const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1715,9 +1761,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSnapshotRequest', [ - 'snapshot', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSnapshotRequest', + ['snapshot'] + ); request.snapshot = defaultValue1; const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1745,9 +1792,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.DeleteSnapshotRequest() ); - const defaultValue1 = getTypeDefaultValue('DeleteSnapshotRequest', [ - 'snapshot', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSnapshotRequest', + ['snapshot'] + ); request.snapshot = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1765,9 +1813,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.SeekRequest() ); - const defaultValue1 = getTypeDefaultValue('SeekRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.SeekRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1794,9 +1843,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.SeekRequest() ); - const defaultValue1 = getTypeDefaultValue('SeekRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.SeekRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedResponse = generateSampleMessage( @@ -1838,9 +1888,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.SeekRequest() ); - const defaultValue1 = getTypeDefaultValue('SeekRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.SeekRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedHeaderRequestParams = `subscription=${defaultValue1}`; const expectedError = new Error('expected'); @@ -1864,9 +1915,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.SeekRequest() ); - const defaultValue1 = getTypeDefaultValue('SeekRequest', [ - 'subscription', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.SeekRequest', + ['subscription'] + ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); client.close(); @@ -1970,9 +2022,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSubscriptionsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -2002,9 +2055,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSubscriptionsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -2050,9 +2104,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSubscriptionsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); @@ -2080,9 +2135,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSubscriptionsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -2130,9 +2186,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSubscriptionsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); @@ -2175,9 +2232,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSubscriptionsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -2217,9 +2275,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSubscriptionsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSubscriptionsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSubscriptionsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); @@ -2258,9 +2317,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSnapshotsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -2290,9 +2350,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSnapshotsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -2338,9 +2399,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSnapshotsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); @@ -2368,9 +2430,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSnapshotsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -2418,9 +2481,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSnapshotsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); @@ -2463,9 +2527,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSnapshotsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedResponse = [ @@ -2505,9 +2570,10 @@ describe('v1.SubscriberClient', () => { const request = generateSampleMessage( new protos.google.pubsub.v1.ListSnapshotsRequest() ); - const defaultValue1 = getTypeDefaultValue('ListSnapshotsRequest', [ - 'project', - ]); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSnapshotsRequest', + ['project'] + ); request.project = defaultValue1; const expectedHeaderRequestParams = `project=${defaultValue1}`; const expectedError = new Error('expected'); From 8cde18193824fe0ba652a2c570b72b495c1502c1 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:02:15 -0400 Subject: [PATCH 0883/1115] fix: wait for 'drain' as well (#1636) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's possible to end up in a situation where more publishes are pending when publish() is called, but they aren't actually waited for. This adds 'drain' event support to the main publisher queue and waits for 'drain' on all queues before calling it done. Maybe fixes #1620 🦕 --- handwritten/pubsub/src/publisher/index.ts | 25 ++++++++++++++++--- .../pubsub/src/publisher/message-queues.ts | 15 ++++++++++- handwritten/pubsub/test/publisher/index.ts | 17 ++++++++++++- 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 67619f86c62..1a545784e41 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -110,13 +110,30 @@ export class Publisher { flush(callback?: EmptyCallback): Promise | void { const definedCallback = callback ? callback : () => {}; - const publishes = [promisify(this.queue.publish).bind(this.queue)()]; - Array.from(this.orderedQueues.values()).forEach(q => - publishes.push(promisify(q.publish).bind(q)()) + const toDrain = [this.queue, ...Array.from(this.orderedQueues.values())]; + + const allDrains = Promise.all( + toDrain.map( + q => + new Promise(resolve => { + const flushResolver = () => { + resolve(); + + // flush() maybe called more than once, so remove these + // event listeners after we've completed flush(). + q.removeListener('drain', flushResolver); + }; + return q.on('drain', flushResolver); + }) + ) + ); + + const allPublishes = Promise.all( + toDrain.map(q => promisify(q.publish).bind(q)()) ); - const allPublishes = Promise.all(publishes); allPublishes + .then(() => allDrains) .then(() => { definedCallback(null); }) diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 3b77944275e..4d367b8c4ad 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -158,8 +158,11 @@ export class Queue extends MessageQueue { } /** * Cancels any pending publishes and calls _publish immediately. + * + * @emits Queue#drain when all messages are sent. */ publish(callback?: PublishDone): void { + const definedCallback = callback || (() => {}); const {messages, callbacks} = this.batch; this.batch = new MessageBatch(this.batchOptions); @@ -169,7 +172,17 @@ export class Queue extends MessageQueue { delete this.pending; } - this._publish(messages, callbacks, callback); + this._publish(messages, callbacks, (err: null | ServiceError) => { + if (err) { + definedCallback(err); + } else if (this.batch.messages.length) { + // Make another go-around, we're trying to drain the queues fully. + this.publish(callback); + } else { + this.emit('drain'); + definedCallback(null); + } + }); } } diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index ab402a6a3ab..151d1b96ee5 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -347,6 +347,11 @@ describe('Publisher', () => { sandbox .stub(FakeQueue.prototype, '_publish') .callsFake((messages, callbacks, callback) => { + // Simulate the drain taking longer than the publishes. This can + // happen if more messages are queued during the publish(). + process.nextTick(() => { + publisher.queue.emit('drain'); + }); if (typeof callback === 'function') callback(null); }); @@ -356,7 +361,12 @@ describe('Publisher', () => { const queue = publisher.orderedQueues.get( orderingKey ) as unknown as FakeOrderedQueue; - queue.emit('drain'); + // Simulate the drain taking longer than the publishes. This can + // happen on some ordered queue scenarios, especially if we have more + // than one queue to empty. + process.nextTick(() => { + queue.emit('drain'); + }); if (typeof callback === 'function') callback(null); }); @@ -495,6 +505,11 @@ describe('Publisher', () => { sandbox .stub(publisher.queue, '_publish') .callsFake((messages, callbacks, callback) => { + // Simulate the drain taking longer than the publishes. This can + // happen if more messages are queued during the publish(). + process.nextTick(() => { + publisher.queue.emit('drain'); + }); if (typeof callback === 'function') callback(null); }); From 662cde95d064bb632f58d1fffd06264382162971 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:20:17 -0400 Subject: [PATCH 0884/1115] feat: add support for exactly once subscriptions (#1572) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds support for exactly-once delivery subscriptions. Please see the samples for information on how to interact with exactly-once subscriptions properly (specifically, using the `*WithResponse()` methods). Other client library folks - Mahesh needs to review this, so please don't merge until that happens. Fixes https://github.com/googleapis/nodejs-pubsub/issues/1571 🦕 --- handwritten/pubsub/README.md | 2 + handwritten/pubsub/package.json | 1 + handwritten/pubsub/src/ack-metadata.ts | 118 +++++ handwritten/pubsub/src/exponential-retry.ts | 193 ++++++++ handwritten/pubsub/src/index.ts | 3 + handwritten/pubsub/src/message-queues.ts | 380 ++++++++++++-- handwritten/pubsub/src/message-stream.ts | 18 + handwritten/pubsub/src/subscriber.ts | 223 +++++++-- handwritten/pubsub/src/subscription.ts | 2 + handwritten/pubsub/src/util.ts | 11 + handwritten/pubsub/test/ack-metadata.ts | 225 +++++++++ handwritten/pubsub/test/exponential-retry.ts | 230 +++++++++ handwritten/pubsub/test/message-queues.ts | 492 ++++++++++++++++--- handwritten/pubsub/test/message-stream.ts | 18 + handwritten/pubsub/test/subscriber.ts | 7 +- handwritten/pubsub/test/util.ts | 17 +- 16 files changed, 1810 insertions(+), 130 deletions(-) create mode 100644 handwritten/pubsub/src/ack-metadata.ts create mode 100644 handwritten/pubsub/src/exponential-retry.ts create mode 100644 handwritten/pubsub/test/ack-metadata.ts create mode 100644 handwritten/pubsub/test/exponential-retry.ts diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index f77054073ee..a1821be3861 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/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/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5d136193c0a..463bf293243 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -59,6 +59,7 @@ "extend": "^3.0.2", "google-auth-library": "^8.0.2", "google-gax": "^3.3.0", + "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" diff --git a/handwritten/pubsub/src/ack-metadata.ts b/handwritten/pubsub/src/ack-metadata.ts new file mode 100644 index 00000000000..a26bf23d8e3 --- /dev/null +++ b/handwritten/pubsub/src/ack-metadata.ts @@ -0,0 +1,118 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {GoogleError, Status} from 'google-gax'; +import {AckResponse, AckResponses} from './subscriber'; + +const permanentFailureInvalidAckId = 'PERMANENT_FAILURE_INVALID_ACK_ID'; +const transientFailurePrefix = 'TRANSIENT_'; + +// If we get these as RPC errors, they will trigger a retry. +const exactlyOnceDeliveryTemporaryRetryErrors = [ + Status.DEADLINE_EXCEEDED, + Status.RESOURCE_EXHAUSTED, + Status.ABORTED, + Status.INTERNAL, + Status.UNAVAILABLE, +]; + +/** + * @private + */ +interface StringToString { + [propname: string]: string; +} + +/** + * Contains information about ack responses that may be used to build + * responses to user ack calls. + * + * @private + */ +export interface AckErrorInfo { + transient: boolean; + response?: AckResponse; + rawErrorCode?: string; + grpcErrorCode?: Status; +} + +export type AckErrorCodes = Map; + +/** + * Processes the raw RPC information when sending a batch of acks + * to the Pub/Sub service. + * + * @private + */ +export function processAckErrorInfo(rpcError: GoogleError): AckErrorCodes { + const ret = new Map(); + + if (!rpcError.errorInfoMetadata) { + return ret; + } + + // The typing for errorInfoMetadata is currently incorrect. + const metadata = rpcError.errorInfoMetadata as StringToString; + + for (const ackId of Object.getOwnPropertyNames(metadata)) { + const code = metadata[ackId]; + + if (code === permanentFailureInvalidAckId) { + ret.set(ackId, { + transient: false, + response: AckResponses.Invalid, + rawErrorCode: code, + }); + } else if (code.startsWith(transientFailurePrefix)) { + ret.set(ackId, { + transient: true, + rawErrorCode: code, + }); + } else { + ret.set(ackId, { + transient: false, + response: AckResponses.Other, + rawErrorCode: code, + }); + } + } + + return ret; +} + +/** + * For a completely failed RPC call, this will find the appropriate + * error information to return to an ack() caller. + * + * @private + */ +export function processAckRpcError(grpcCode: Status): AckErrorInfo { + const ackError: AckErrorInfo = { + transient: exactlyOnceDeliveryTemporaryRetryErrors.includes(grpcCode), + grpcErrorCode: grpcCode, + }; + switch (grpcCode) { + case Status.PERMISSION_DENIED: + ackError.response = AckResponses.PermissionDenied; + break; + case Status.FAILED_PRECONDITION: + ackError.response = AckResponses.FailedPrecondition; + break; + default: + ackError.response = AckResponses.Other; + break; + } + + return ackError; +} diff --git a/handwritten/pubsub/src/exponential-retry.ts b/handwritten/pubsub/src/exponential-retry.ts new file mode 100644 index 00000000000..9187559a32b --- /dev/null +++ b/handwritten/pubsub/src/exponential-retry.ts @@ -0,0 +1,193 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import Heap from 'heap-js'; +import {Duration} from './temporal'; + +/** + * This interface specifies what we'll add to retried items in order + * to track them through the exponential backoff. + * + * @private + */ +export interface RetriedItem { + retryInfo?: RetryInfo; +} + +/** + * These items will go inside the added retry metadata. + * + * @private + */ +export interface RetryInfo { + // Date.now() value of when we first started retrying. + firstRetry: number; + + // Date.now() value of when we will next retry. + nextRetry: number; + + // The current multiplier for exponential backoff. + multiplier: number; + + // The user callback to call when it next comes off retry wait. + callback: RetryCallback; +} + +// Compare function for Heap so we can use it as a priority queue. +function comparator(a: RetriedItem, b: RetriedItem) { + return a.retryInfo!.nextRetry - b.retryInfo!.nextRetry; +} + +/** + * Users of this class will pass in a callback in this form when + * an item is ready to be retried. The item must be placed + * back on the queue if it needs to be retried again. + * + * @private + */ +export interface RetryCallback { + (item: T, totalTime: Duration): void; +} + +/** + * Provides a helper that will manage your retries using the "truncated + * exponential backoff" strategy. + * + * Most of the pieces of this library are doing retries via gax, but for + * exactly-once delivery, we have some things where gRPC failures won't + * take care of it. + * + * @private + */ +export class ExponentialRetry { + private _items = new Heap>(comparator); + private _backoffMs: number; + private _maxBackoffMs: number; + private _timer?: NodeJS.Timeout; + + constructor(backoff: Duration, maxBackoff: Duration) { + this._backoffMs = backoff.totalOf('millisecond'); + this._maxBackoffMs = maxBackoff.totalOf('millisecond'); + } + + /** + * Shut down all operations/timers/etc and return a list of + * items that were still pending retry. + * + * @private + */ + close(): T[] { + if (this._timer) { + clearTimeout(this._timer); + } + + const leftovers = this._items.toArray(); + this._items.clear(); + return leftovers as T[]; + } + + /** + * Place an item on the retry queue. It's important that it's the + * same exact item that was already on the queue, if it's being retried + * more than once. + * + * @private + */ + retryLater(item: T, callback: RetryCallback) { + const retried = item as RetriedItem; + const retryInfo = retried.retryInfo; + + if (!retryInfo) { + // This item's first time through. + retried.retryInfo = { + firstRetry: Date.now(), + nextRetry: Date.now() + this.randomizeDelta(this._backoffMs), + multiplier: 1, + callback, + }; + } else { + // Not the first time - handle backoff. + const nextMultiplier = retryInfo.multiplier * 2; + let delta = this.randomizeDelta(nextMultiplier * this._backoffMs); + if (delta > this._maxBackoffMs) { + delta = this.randomizeDelta(this._maxBackoffMs); + } else { + retryInfo.multiplier = nextMultiplier; + } + retryInfo.nextRetry = Date.now() + delta; + } + + // Re-sort it into the heap with the correct position. + // It's my assumption here that any item that is being retried is + // very likely near or at the top. + this._items.remove(retried); + this._items.push(retried); + + // Schedule the next retry. + this.scheduleRetry(); + } + + // Takes a time delta and adds fuzz. + private randomizeDelta(durationMs: number): number { + // The fuzz distance should never exceed one second, but in the + // case of smaller things, don't end up with a negative delta. + const magnitude = durationMs < 1000 ? durationMs : 1000; + const offset = Math.random() * magnitude - magnitude / 2.0; + return durationMs + offset; + } + + // Looks through the queue to see if there's anything to handle. + private doRetries() { + const now = Date.now(); + while (!this._items.isEmpty()) { + const next = this._items.peek()!; + + // Within 10msec is close enough. + if (next.retryInfo!.nextRetry - now < 10) { + this._items.pop(); + + next.retryInfo!.callback( + next as unknown as T, + Duration.from({millis: now - next.retryInfo!.firstRetry}) + ); + } else { + break; + } + } + + // Is there stuff to retry still? + if (!this._items.isEmpty()) { + this.scheduleRetry(); + } + } + + // If there are items to retry, schedule the next timer event. + private scheduleRetry() { + // What's next? + const next = this._items.peek(); + if (next) { + let delta = next.retryInfo!.nextRetry - Date.now(); + if (delta < 0) { + delta = 0; + } + + if (this._timer) { + clearTimeout(this._timer); + } + this._timer = setTimeout(() => { + this.doRetries(); + }, delta); + } + } +} diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index b4684e998a5..787b126eeb1 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -154,6 +154,9 @@ export { SetSubscriptionMetadataCallback, SetSubscriptionMetadataResponse, Subscription, + AckError, + AckResponse, + AckResponses, } from './subscription'; export { CreateTopicCallback, diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index e8f43172036..9d87980b351 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -14,12 +14,39 @@ * limitations under the License. */ -import {CallOptions, grpc, ServiceError} from 'google-gax'; +import {CallOptions, GoogleError, grpc, RetryOptions} from 'google-gax'; import defer = require('p-defer'); +import { + AckErrorInfo, + AckErrorCodes, + processAckErrorInfo, + processAckRpcError, +} from './ack-metadata'; +import {ExponentialRetry} from './exponential-retry'; +import { + AckError, + AckResponse, + AckResponses, + Message, + Subscriber, +} from './subscriber'; +import {Duration} from './temporal'; +import {addToBucket} from './util'; -import {Message, Subscriber} from './subscriber'; +/** + * @private + */ +export interface QueuedMessage { + ackId: string; + deadline?: number; + responsePromise?: defer.DeferredPromise; + retryCount: number; +} -type QueuedMessages = Array<[string, number?]>; +/** + * @private + */ +export type QueuedMessages = Array; export interface BatchOptions { callOptions?: CallOptions; @@ -30,17 +57,19 @@ export interface BatchOptions { /** * Error class used to signal a batch failure. * + * Now that we have exactly-once delivery subscriptions, we'll only + * throw one of these if there was an unknown error. + * * @class * * @param {string} message The error message. - * @param {ServiceError} err The grpc service error. + * @param {GoogleError} err The grpc error. */ -export class BatchError extends Error implements grpc.ServiceError { +export class BatchError extends Error { ackIds: string[]; code: grpc.status; details: string; - metadata: grpc.Metadata; - constructor(err: grpc.ServiceError, ackIds: string[], rpc: string) { + constructor(err: GoogleError, ackIds: string[], rpc: string) { super( `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ process.env.DEBUG_GRPC ? err.stack : err.message @@ -48,9 +77,8 @@ export class BatchError extends Error implements grpc.ServiceError { ); this.ackIds = ackIds; - this.code = err.code; - this.details = err.details; - this.metadata = err.metadata; + this.code = err.code!; + this.details = err.message; } } @@ -76,21 +104,62 @@ export class BatchError extends Error implements grpc.ServiceError { export abstract class MessageQueue { numPendingRequests: number; numInFlightRequests: number; + numInRetryRequests: number; protected _onFlush?: defer.DeferredPromise; protected _onDrain?: defer.DeferredPromise; protected _options!: BatchOptions; protected _requests: QueuedMessages; protected _subscriber: Subscriber; protected _timer?: NodeJS.Timer; - protected abstract _sendBatch(batch: QueuedMessages): Promise; + protected _retrier: ExponentialRetry; + protected _closed = false; + protected abstract _sendBatch(batch: QueuedMessages): Promise; + constructor(sub: Subscriber, options = {} as BatchOptions) { this.numPendingRequests = 0; this.numInFlightRequests = 0; + this.numInRetryRequests = 0; this._requests = []; this._subscriber = sub; + this._retrier = new ExponentialRetry( + Duration.from({seconds: 1}), + Duration.from({seconds: 64}) + ); this.setOptions(options); } + + /** + * Shuts down this message queue gracefully. Any acks/modAcks pending in + * the queue or waiting for retry will be removed. If exactly-once delivery + * is enabled on the subscription, we'll send permanent failures to + * anyone waiting on completions; otherwise we'll send successes. + * + * If a flush is desired first, do it before calling close(). + * + * @private + */ + close() { + let requests = this._requests; + this._requests = []; + this.numInFlightRequests = this.numPendingRequests = 0; + requests = requests.concat(this._retrier.close()); + const isExactlyOnceDelivery = this._subscriber.isExactlyOnceDelivery; + requests.forEach(r => { + if (r.responsePromise) { + if (isExactlyOnceDelivery) { + r.responsePromise.reject( + new AckError(AckResponses.Invalid, 'Subscriber closed') + ); + } else { + r.responsePromise.resolve(); + } + } + }); + + this._closed = true; + } + /** * Gets the default buffer time in ms. * @@ -100,6 +169,7 @@ export abstract class MessageQueue { get maxMilliseconds(): number { return this._options!.maxMilliseconds!; } + /** * Adds a message to the queue. * @@ -107,19 +177,76 @@ export abstract class MessageQueue { * @param {number} [deadline] The deadline. * @private */ - add({ackId}: Message, deadline?: number): void { + add({ackId}: Message, deadline?: number): Promise { + if (this._closed) { + if (this._subscriber.isExactlyOnceDelivery) { + throw new AckError(AckResponses.Invalid, 'Subscriber closed'); + } else { + return Promise.resolve(); + } + } + const {maxMessages, maxMilliseconds} = this._options; - this._requests.push([ackId, deadline]); - this.numPendingRequests += 1; - this.numInFlightRequests += 1; + const responsePromise = defer(); + this._requests.push({ + ackId, + deadline, + responsePromise, + retryCount: 0, + }); + this.numPendingRequests++; + this.numInFlightRequests++; if (this._requests.length >= maxMessages!) { this.flush(); } else if (!this._timer) { this._timer = setTimeout(() => this.flush(), maxMilliseconds!); } + + return responsePromise.promise; } + + /** + * Retry handler for acks/modacks that have transient failures. Unless + * it's passed the final deadline, we will just re-queue it for sending. + * + * @private + */ + private handleRetry(message: QueuedMessage, totalTime: Duration) { + // Has it been too long? + if (totalTime.totalOf('minute') >= 10 || this.shouldFailEarly(message)) { + message.responsePromise?.reject( + new AckError(AckResponses.Invalid, 'Retried for too long') + ); + return; + } + + // Just throw it in for another round of processing on the next batch. + this._requests.push(message); + this.numPendingRequests++; + this.numInFlightRequests++; + this.numInRetryRequests--; + + // Make sure we actually do have another batch scheduled. + if (!this._timer) { + this._timer = setTimeout( + () => this.flush(), + this._options.maxMilliseconds! + ); + } + } + + /** + * This hook lets a subclass tell the retry handler to go ahead and fail early. + * + * @private + */ + protected shouldFailEarly(message: QueuedMessage): boolean { + message; + return false; + } + /** * Sends a batch of messages. * @private @@ -139,7 +266,14 @@ export abstract class MessageQueue { delete this._onFlush; try { - await this._sendBatch(batch); + const toRetry = await this._sendBatch(batch); + + // We'll get back anything that needs a retry for transient errors. + for (const m of toRetry) { + this.numInRetryRequests++; + m.retryCount++; + this._retrier.retryLater(m, this.handleRetry.bind(this)); + } } catch (e) { // These queues are used for ack and modAck messages, which should // never surface an error to the user level. However, we'll emit @@ -152,11 +286,16 @@ export abstract class MessageQueue { deferred.resolve(); } - if (this.numInFlightRequests <= 0 && this._onDrain) { + if ( + this.numInFlightRequests <= 0 && + this.numInRetryRequests <= 0 && + this._onDrain + ) { this._onDrain.resolve(); delete this._onDrain; } } + /** * Returns a promise that resolves after the next flush occurs. * @@ -169,6 +308,7 @@ export abstract class MessageQueue { } return this._onFlush.promise; } + /** * Returns a promise that resolves when all in-flight messages have settled. */ @@ -178,6 +318,7 @@ export abstract class MessageQueue { } return this._onDrain.promise; } + /** * Set the batching options. * @@ -189,6 +330,124 @@ export abstract class MessageQueue { this._options = Object.assign(defaults, options); } + + /** + * Succeed a whole batch of Acks/Modacks for an OK RPC response. + * + * @private + */ + handleAckSuccesses(batch: QueuedMessages) { + // Everyone gets a resolve! + batch.forEach(({responsePromise}) => { + responsePromise?.resolve(); + }); + } + + /** + * If we get an RPC failure of any kind, this will take care of deciding + * what to do for each related ack/modAck. Successful ones will have their + * Promises resolved, permanent errors will have their Promises rejected, + * and transients will be returned for retry. + * + * Note that this is only used for subscriptions with exactly-once + * delivery enabled, so _sendBatch() in the classes below take care of + * resolving errors to success; they don't make it here. + * + * @private + */ + handleAckFailures( + operation: string, + batch: QueuedMessages, + rpcError: GoogleError + ) { + const toSucceed: QueuedMessages = []; + const toRetry: QueuedMessages = []; + const toError = new Map([ + [AckResponses.PermissionDenied, []], + [AckResponses.FailedPrecondition, []], + [AckResponses.Other, []], + ]); + + // Parse any error codes, both for the RPC call and the ErrorInfo. + const error: AckErrorInfo | undefined = rpcError.code + ? processAckRpcError(rpcError.code) + : undefined; + const codes: AckErrorCodes = processAckErrorInfo(rpcError); + + for (const m of batch) { + if (codes.has(m.ackId)) { + // This ack has an ErrorInfo entry, so use that to route it. + const code = codes.get(m.ackId)!; + if (code.transient) { + // Transient errors get retried. + toRetry.push(m); + } else { + // It's a permanent error. + addToBucket(toError, code.response!, m); + } + } else if (error !== undefined) { + // This ack doesn't have an ErrorInfo entry, but we do have an RPC + // error, so use that to route it. + if (error.transient) { + toRetry.push(m); + } else { + addToBucket(toError, error.response!, m); + } + } else { + // Looks like this one worked out. + toSucceed.push(m); + } + } + + // To remain consistent with previous behaviour, we will push a debug + // stream message if an unknown error happens during ack. + const others = toError.get(AckResponses.Other); + if (others?.length) { + const otherIds = others.map(e => e.ackId); + this._subscriber.emit( + 'debug', + new BatchError(rpcError, otherIds, operation) + ); + } + + // Take care of following up on all the Promises. + toSucceed.forEach(m => { + m.responsePromise?.resolve(); + }); + for (const e of toError.entries()) { + e[1].forEach(m => { + const exc = new AckError(e[0], rpcError.message); + m.responsePromise?.reject(exc); + }); + } + return { + toError, + toRetry, + }; + } + + /** + * Since we handle our own retries for ack/modAck calls when exactly-once + * delivery is enabled on a subscription, we conditionally need to disable + * the gax retries. This returns an appropriate CallOptions for the + * subclasses to pass down. + * + * @private + */ + protected getCallOptions(): CallOptions | undefined { + let callOptions = this._options.callOptions; + if (this._subscriber.isExactlyOnceDelivery) { + // If exactly-once-delivery is enabled, tell gax not to do retries for us. + callOptions = Object.assign({}, callOptions ?? {}); + callOptions.retry = new RetryOptions([], { + initialRetryDelayMillis: 0, + retryDelayMultiplier: 0, + maxRetryDelayMillis: 0, + }); + } + + return callOptions; + } } /** @@ -206,15 +465,41 @@ export class AckQueue extends MessageQueue { * @param {Array.>} batch Array of ackIds and deadlines. * @return {Promise} */ - protected async _sendBatch(batch: QueuedMessages): Promise { + protected async _sendBatch(batch: QueuedMessages): Promise { const client = await this._subscriber.getClient(); - const ackIds = batch.map(([ackId]) => ackId); + const ackIds = batch.map(({ackId}) => ackId); const reqOpts = {subscription: this._subscriber.name, ackIds}; try { - await client.acknowledge(reqOpts, this._options.callOptions!); + await client.acknowledge(reqOpts, this.getCallOptions()); + + // It's okay if these pass through since they're successful anyway. + this.handleAckSuccesses(batch); + return []; } catch (e) { - throw new BatchError(e as ServiceError, ackIds, 'acknowledge'); + // If exactly-once delivery isn't enabled, don't do error processing. We'll + // emulate previous behaviour by resolving all pending Promises with + // a success status, and then throwing a BatchError for debug logging. + if (!this._subscriber.isExactlyOnceDelivery) { + batch.forEach(m => { + m.responsePromise?.resolve(); + }); + throw new BatchError(e as GoogleError, ackIds, 'ack'); + } else { + const grpcError = e as GoogleError; + try { + const results = this.handleAckFailures('ack', batch, grpcError); + return results.toRetry; + } catch (e) { + // This should only ever happen if there's a code failure. + this._subscriber.emit('debug', e); + const exc = new AckError(AckResponses.Other, 'Code error'); + batch.forEach(m => { + m.responsePromise?.reject(exc); + }); + return []; + } + } } } } @@ -235,33 +520,66 @@ export class ModAckQueue extends MessageQueue { * @param {Array.>} batch Array of ackIds and deadlines. * @return {Promise} */ - protected async _sendBatch(batch: QueuedMessages): Promise { + protected async _sendBatch(batch: QueuedMessages): Promise { const client = await this._subscriber.getClient(); const subscription = this._subscriber.name; - const modAckTable: {[index: string]: string[]} = batch.reduce( - (table: {[index: string]: string[]}, [ackId, deadline]) => { - if (!table[deadline!]) { - table[deadline!] = []; + const modAckTable: {[index: string]: QueuedMessages} = batch.reduce( + (table: {[index: string]: QueuedMessages}, message) => { + if (!table[message.deadline!]) { + table[message.deadline!] = []; } - table[deadline!].push(ackId); + table[message.deadline!].push(message); return table; }, {} ); + const callOptions = this.getCallOptions(); const modAckRequests = Object.keys(modAckTable).map(async deadline => { - const ackIds = modAckTable[deadline]; + const messages = modAckTable[deadline]; + const ackIds = messages.map(m => m.ackId); const ackDeadlineSeconds = Number(deadline); const reqOpts = {subscription, ackIds, ackDeadlineSeconds}; try { - await client.modifyAckDeadline(reqOpts, this._options.callOptions!); + await client.modifyAckDeadline(reqOpts, callOptions); + + // It's okay if these pass through since they're successful anyway. + this.handleAckSuccesses(messages); + return []; } catch (e) { - throw new BatchError(e as ServiceError, ackIds, 'modifyAckDeadline'); + // If exactly-once delivery isn't enabled, don't do error processing. We'll + // emulate previous behaviour by resolving all pending Promises with + // a success status, and then throwing a BatchError for debug logging. + if (!this._subscriber.isExactlyOnceDelivery) { + batch.forEach(m => { + m.responsePromise?.resolve(); + }); + throw new BatchError(e as GoogleError, ackIds, 'modAck'); + } else { + const grpcError = e as GoogleError; + + const newBatch = this.handleAckFailures( + 'modAck', + messages, + grpcError + ); + return newBatch.toRetry; + } } }); - await Promise.all(modAckRequests); + // This catches the sub-failures and bubbles up anything we need to bubble. + const allNewBatches: QueuedMessages[] = await Promise.all(modAckRequests); + return allNewBatches.reduce((p: QueuedMessage[], c: QueuedMessage[]) => [ + ...(p ?? []), + ...c, + ]); + } + + // For modacks only, we'll stop retrying after 3 tries. + protected shouldFailEarly(message: QueuedMessage): boolean { + return message.retryCount >= 3; } } diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 8eddf364acb..0e8e2017d34 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -23,6 +23,7 @@ import {PullRetry} from './pull-retry'; import {Subscriber} from './subscriber'; import {google} from '../protos/protos'; import {defaultOptions} from './default-options'; +import {Duration} from './temporal'; /*! * Frequency to ping streams. @@ -151,6 +152,23 @@ export class MessageStream extends PassThrough { ); this._keepAliveHandle.unref(); } + + /** + * Updates the stream ack deadline with the server. + * + * @param {Duration} deadline The new deadline value to set. + */ + setStreamAckDeadline(deadline: Duration) { + const request: StreamingPullRequest = { + streamAckDeadlineSeconds: deadline.totalOf('second'), + }; + + for (const stream of this._streams.keys()) { + // We don't need a callback on this one, it's advisory. + stream.write(request); + } + } + /** * Destroys the stream and any underlying streams. * diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index fe9cf0bc336..2011aad63f6 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -30,13 +30,40 @@ import {Subscription} from './subscription'; import {defaultOptions} from './default-options'; import {SubscriberClient} from './v1'; import {createSpan} from './opentelemetry-tracing'; -import {Throttler} from './util'; import {Duration} from './temporal'; export type PullResponse = google.pubsub.v1.IStreamingPullResponse; export type SubscriptionProperties = google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties; +type ValueOf = T[keyof T]; +export const AckResponses = { + PermissionDenied: 'PERMISSION_DENIED' as const, + FailedPrecondition: 'FAILED_PRECONDITION' as const, + Success: 'SUCCESS' as const, + Invalid: 'INVALID' as const, + Other: 'OTHER' as const, +}; +export type AckResponse = ValueOf; + +/** + * Thrown when an error is detected in an ack/nack/modack call, when + * exactly-once delivery is enabled on the subscription. This will + * only be thrown for actual errors that can't be retried. + */ +export class AckError extends Error { + errorCode: AckResponse; + + constructor(errorCode: AckResponse, message?: string) { + let finalMessage = `${errorCode}`; + if (message) { + finalMessage += ` : ${message}`; + } + super(finalMessage); + this.errorCode = errorCode; + } +} + /** * Date object with nanosecond precision. Supports all standard Date arguments * in addition to several custom types. @@ -184,6 +211,31 @@ export class Message { } } + /** + * Acknowledges the message, expecting a response (for exactly-once delivery subscriptions). + * If exactly-once delivery is not enabled, this will immediately resolve successfully. + * + * @example + * ``` + * subscription.on('message', async (message) => { + * const response = await message.ackWithResponse(); + * }); + * ``` + */ + async ackWithResponse(): Promise { + if (!this._subscriber.isExactlyOnceDelivery) { + this.ack(); + return AckResponses.Success; + } + + if (!this._handled) { + this._handled = true; + return await this._subscriber.ackWithResponse(this); + } else { + return AckResponses.Invalid; + } + } + /** * Modifies the ack deadline. * @@ -196,6 +248,26 @@ export class Message { } } + /** + * Modifies the ack deadline, expecting a response (for exactly-once delivery subscriptions). + * If exactly-once delivery is not enabled, this will immediately resolve successfully. + * + * @param {number} deadline The number of seconds to extend the deadline. + * @private + */ + async modAckWithResponse(deadline: number): Promise { + if (!this._subscriber.isExactlyOnceDelivery) { + this.modAck(deadline); + return AckResponses.Success; + } + + if (!this._handled) { + return await this._subscriber.modAckWithResponse(this, deadline); + } else { + return AckResponses.Invalid; + } + } + /** * Removes the message from our inventory and schedules it to be redelivered. * @@ -212,6 +284,32 @@ export class Message { this._subscriber.nack(this); } } + + /** + * Removes the message from our inventory and schedules it to be redelivered, + * with the modAck response being returned (for exactly-once delivery subscriptions). + * If exactly-once delivery is not enabled, this will immediately resolve successfully. + * + * @example + * ``` + * subscription.on('message', async (message) => { + * const response = await message.nackWithResponse(); + * }); + * ``` + */ + async nackWithResponse(): Promise { + if (!this._subscriber.isExactlyOnceDelivery) { + this.nack(); + return AckResponses.Success; + } + + if (!this._handled) { + this._handled = true; + return await this._subscriber.nackWithResponse(this); + } else { + return AckResponses.Invalid; + } + } } /** @@ -246,7 +344,7 @@ export interface SubscriberOptions { enableOpenTelemetryTracing?: boolean; } -const minAckDeadlineForExactlyOnce = Duration.from({seconds: 60}); +const minAckDeadlineForExactlyOnceDelivery = Duration.from({seconds: 60}); /** * Subscriber class is used to manage all message related functionality. @@ -273,7 +371,6 @@ export class Subscriber extends EventEmitter { private _options!: SubscriberOptions; private _stream!: MessageStream; private _subscription: Subscription; - private _errorLog: Throttler; subscriptionProperties?: SubscriptionProperties; @@ -289,7 +386,6 @@ export class Subscriber extends EventEmitter { this._histogram = new Histogram({min: 10, max: 600}); this._latencies = new Histogram(); this._subscription = subscription; - this._errorLog = new Throttler(60 * 1000); this.setOptions(options); } @@ -318,7 +414,7 @@ export class Subscriber extends EventEmitter { } // Grab our current min/max deadline values, based on whether exactly-once - // is enabled, and the defaults. + // delivery is enabled, and the defaults. const [minDeadline, maxDeadline] = this.getMinMaxDeadlines(); if (minDeadline) { @@ -333,10 +429,11 @@ export class Subscriber extends EventEmitter { } private getMinMaxDeadlines(): [Duration?, Duration?] { - // If this is an exactly-once subscription, and the user didn't set their - // own minimum ack periods, set it to the default for exactly-once. - const defaultMinDeadline = this.isExactlyOnce - ? minAckDeadlineForExactlyOnce + // If this is an exactly-once delivery subscription, and the user + // didn't set their own minimum ack periods, set it to the default + // for exactly-once delivery. + const defaultMinDeadline = this.isExactlyOnceDelivery + ? minAckDeadlineForExactlyOnceDelivery : defaultOptions.subscription.minAckDeadline; const defaultMaxDeadline = defaultOptions.subscription.maxAckDeadline; @@ -348,11 +445,11 @@ export class Subscriber extends EventEmitter { } /** - * Returns true if an exactly once subscription has been detected. + * Returns true if an exactly-once delivery subscription has been detected. * * @private */ - get isExactlyOnce(): boolean { + get isExactlyOnceDelivery(): boolean { if (!this.subscriptionProperties) { return false; } @@ -367,25 +464,22 @@ export class Subscriber extends EventEmitter { * @private */ setSubscriptionProperties(subscriptionProperties: SubscriptionProperties) { - const previouslyEnabled = this.isExactlyOnce; + const previouslyEnabled = this.isExactlyOnceDelivery; this.subscriptionProperties = subscriptionProperties; - // If this is an exactly-once subscription... - if (this.subscriptionProperties.exactlyOnceDeliveryEnabled) { - // Warn the user that they may have difficulty. - this._errorLog.doMaybe(() => - console.error( - 'WARNING: Exactly-once subscriptions are not yet supported ' + - 'by the Node client library. This feature will be added ' + - 'in a future release.' - ) - ); - } - // Update ackDeadline in case the flag switched. - if (previouslyEnabled !== this.isExactlyOnce) { + if (previouslyEnabled !== this.isExactlyOnceDelivery) { this.updateAckDeadline(); + + // For exactly-once delivery, make sure the subscription ack deadline is 60. + // (Otherwise fall back to the default of 10 seconds.) + const subscriptionAckDeadlineSeconds = this.isExactlyOnceDelivery + ? 60 + : 10; + this._stream.setStreamAckDeadline( + Duration.from({seconds: subscriptionAckDeadlineSeconds}) + ); } } @@ -425,18 +519,42 @@ export class Subscriber extends EventEmitter { * Acknowledges the supplied message. * * @param {Message} message The message to acknowledge. - * @returns {Promise} + * @returns {Promise} * @private */ async ack(message: Message): Promise { const ackTimeSeconds = (Date.now() - message.received) / 1000; this.updateAckDeadline(ackTimeSeconds); - this._acks.add(message); + // Ignore this in this version of the method (but hook then/catch + // to avoid unhandled exceptions). + const resultPromise = this._acks.add(message); + resultPromise.then(() => {}); + resultPromise.catch(() => {}); + await this._acks.onFlush(); this._inventory.remove(message); } + /** + * Acknowledges the supplied message, expecting a response (for exactly + * once subscriptions). + * + * @param {Message} message The message to acknowledge. + * @returns {Promise} + * @private + */ + async ackWithResponse(message: Message): Promise { + const ackTimeSeconds = (Date.now() - message.received) / 1000; + this.updateAckDeadline(ackTimeSeconds); + + await this._acks.add(message); + this._inventory.remove(message); + + // No exception means Success. + return AckResponses.Success; + } + /** * Closes the subscriber. The returned promise will resolve once any pending * acks/modAcks are finished. @@ -456,6 +574,9 @@ export class Subscriber extends EventEmitter { await this._waitForFlush(); this.emit('close'); + + this._acks.close(); + this._modAcks.close(); } /** @@ -478,25 +599,52 @@ export class Subscriber extends EventEmitter { * * @param {Message} message The message to modify. * @param {number} deadline The deadline. - * @returns {Promise} + * @returns {Promise} * @private */ async modAck(message: Message, deadline: number): Promise { const startTime = Date.now(); - this._modAcks.add(message, deadline); + const responsePromise = this._modAcks.add(message, deadline); + responsePromise.then(() => {}); + responsePromise.catch(() => {}); + await this._modAcks.onFlush(); const latency = (Date.now() - startTime) / 1000; this._latencies.add(latency); } + /** + * Modifies the acknowledge deadline for the provided message, expecting + * a reply (for exactly-once delivery subscriptions). + * + * @param {Message} message The message to modify. + * @param {number} deadline The deadline. + * @returns {Promise} + * @private + */ + async modAckWithResponse( + message: Message, + deadline: number + ): Promise { + const startTime = Date.now(); + + await this._modAcks.add(message, deadline); + + const latency = (Date.now() - startTime) / 1000; + this._latencies.add(latency); + + // No exception means Success. + return AckResponses.Success; + } + /** * Modfies the acknowledge deadline for the provided message and then removes * it from our inventory. * * @param {Message} message The message. - * @return {Promise} + * @return {Promise} * @private */ async nack(message: Message): Promise { @@ -504,6 +652,19 @@ export class Subscriber extends EventEmitter { this._inventory.remove(message); } + /** + * Modfies the acknowledge deadline for the provided message and then removes + * it from our inventory, expecting a response from modAck (for + * exactly-once delivery subscriptions). + * + * @param {Message} message The message. + * @return {Promise} + * @private + */ + async nackWithResponse(message: Message): Promise { + return await this.modAckWithResponse(message, 0); + } + /** * Starts pulling messages. * @private @@ -648,7 +809,7 @@ export class Subscriber extends EventEmitter { * @private */ private _onData(response: PullResponse): void { - // Grab the subscription properties for exactly once and ordering flags. + // Grab the subscription properties for exactly-once delivery and ordering flags. if (response.subscriptionProperties) { this.setSubscriptionProperties(response.subscriptionProperties); } diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 6accd5adfca..29567ca1223 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -46,6 +46,8 @@ import {Subscriber, SubscriberOptions} from './subscriber'; import {Topic} from './topic'; import {promisifySome} from './util'; +export {AckError, AckResponse, AckResponses} from './subscriber'; + export type PushConfig = google.pubsub.v1.IPushConfig; export type OidcToken = google.pubsub.v1.PushConfig.IOidcToken; diff --git a/handwritten/pubsub/src/util.ts b/handwritten/pubsub/src/util.ts index 753191c057f..60cbdc20569 100644 --- a/handwritten/pubsub/src/util.ts +++ b/handwritten/pubsub/src/util.ts @@ -72,3 +72,14 @@ export class Throttler { } } } + +/** + * Takes care of managing a Map of buckets to the bucket arrays themselves. + * + * @private + */ +export function addToBucket(map: Map, bucket: T, item: U) { + const items = map.get(bucket) ?? []; + items.push(item); + map.set(bucket, items); +} diff --git a/handwritten/pubsub/test/ack-metadata.ts b/handwritten/pubsub/test/ack-metadata.ts new file mode 100644 index 00000000000..1b01faf33e8 --- /dev/null +++ b/handwritten/pubsub/test/ack-metadata.ts @@ -0,0 +1,225 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {describe, it} from 'mocha'; +import * as assert from 'assert'; +import { + AckErrorInfo, + processAckErrorInfo, + processAckRpcError, +} from '../src/ack-metadata'; +import {GoogleError, Status} from 'google-gax'; +import {AckResponses} from '../src/subscriber'; + +describe('ack-metadata', () => { + it('deals with no ErrorInfo', () => { + const error = {} as GoogleError; + const results = processAckErrorInfo(error); + assert.strictEqual(results.size, 0); + }); + + it('handles permanent errors', () => { + const ackId = '12345'; + const errorCode = 'PERMANENT_FAILURE_INVALID_ACK_ID'; + const error = { + errorInfoMetadata: { + [ackId]: errorCode, + }, + } as unknown as GoogleError; + + const results = processAckErrorInfo(error); + + assert.deepStrictEqual(Array.from(results.entries()), [ + [ + ackId, + { + transient: false, + response: AckResponses.Invalid, + rawErrorCode: errorCode, + }, + ], + ]); + }); + + it('handles transient errors', () => { + const ackId = '12345'; + const errorCode = 'TRANSIENT_FAILURE_ESPRESSO_BAR_CLOSED'; + const error = { + errorInfoMetadata: { + [ackId]: errorCode, + }, + } as unknown as GoogleError; + + const results = processAckErrorInfo(error); + + assert.deepStrictEqual(Array.from(results.entries()), [ + [ + ackId, + { + transient: true, + rawErrorCode: errorCode, + }, + ], + ]); + }); + + it('handles other errors', () => { + const ackId = '12345'; + const errorCode = 'NO_IDEA_ERROR'; + const error = { + errorInfoMetadata: { + [ackId]: errorCode, + }, + } as unknown as GoogleError; + + const results = processAckErrorInfo(error); + + assert.deepStrictEqual(Array.from(results.entries()), [ + [ + ackId, + { + transient: false, + response: AckResponses.Other, + rawErrorCode: errorCode, + }, + ], + ]); + }); + + it('handles multiple responses', () => { + const ackIds = ['12345', '23456', '34567']; + const errorCodes = [ + 'PERMANENT_FAILURE_INVALID_ACK_ID', + 'TRANSIENT_FAILURE_ESPRESSO_BAR_CLOSED', + 'NO_IDEA_ERROR', + ]; + const expectedResults = new Map([ + [ + ackIds[0], + { + transient: false, + response: AckResponses.Invalid, + rawErrorCode: errorCodes[0], + }, + ], + [ + ackIds[1], + { + transient: true, + rawErrorCode: errorCodes[1], + }, + ], + [ + ackIds[2], + { + transient: false, + response: AckResponses.Other, + rawErrorCode: errorCodes[2], + }, + ], + ]); + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const metaData: any = {}; + for (let i = 0; i < ackIds.length; i++) { + metaData[ackIds[i]] = errorCodes[i]; + } + + const error = { + errorInfoMetadata: metaData, + } as unknown as GoogleError; + + const results = processAckErrorInfo(error); + + ackIds.forEach(id => { + const ackError = results.get(id); + const expected = expectedResults.get(id); + assert.deepStrictEqual(ackError, expected); + }); + }); + + it('handles gRPC errors', () => { + const testTable = [ + { + code: Status.DEADLINE_EXCEEDED, + result: { + transient: true, + grpcErrorCode: Status.DEADLINE_EXCEEDED, + response: AckResponses.Other, + }, + }, + { + code: Status.RESOURCE_EXHAUSTED, + result: { + transient: true, + grpcErrorCode: Status.RESOURCE_EXHAUSTED, + response: AckResponses.Other, + }, + }, + { + code: Status.ABORTED, + result: { + transient: true, + grpcErrorCode: Status.ABORTED, + response: AckResponses.Other, + }, + }, + { + code: Status.INTERNAL, + result: { + transient: true, + grpcErrorCode: Status.INTERNAL, + response: AckResponses.Other, + }, + }, + { + code: Status.UNAVAILABLE, + result: { + transient: true, + grpcErrorCode: Status.UNAVAILABLE, + response: AckResponses.Other, + }, + }, + { + code: Status.PERMISSION_DENIED, + result: { + transient: false, + grpcErrorCode: Status.PERMISSION_DENIED, + response: AckResponses.PermissionDenied, + }, + }, + { + code: Status.FAILED_PRECONDITION, + result: { + transient: false, + grpcErrorCode: Status.FAILED_PRECONDITION, + response: AckResponses.FailedPrecondition, + }, + }, + { + code: Status.UNIMPLEMENTED, + result: { + transient: false, + grpcErrorCode: Status.UNIMPLEMENTED, + response: AckResponses.Other, + }, + }, + ]; + + for (const t of testTable) { + const result = processAckRpcError(t.code); + assert.deepStrictEqual(result, t.result); + } + }); +}); diff --git a/handwritten/pubsub/test/exponential-retry.ts b/handwritten/pubsub/test/exponential-retry.ts new file mode 100644 index 00000000000..f96689165d9 --- /dev/null +++ b/handwritten/pubsub/test/exponential-retry.ts @@ -0,0 +1,230 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {describe, it} from 'mocha'; +import * as assert from 'assert'; +import * as sinon from 'sinon'; + +import {ExponentialRetry} from '../src/exponential-retry'; +import {Duration} from '../src/temporal'; + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +function introspect(obj: unknown): any { + return obj; +} + +interface TestItem { + foo: string; +} + +function makeItem() { + return { + foo: 'an item', + }; +} + +describe('exponential retry class', () => { + const sandbox = sinon.createSandbox(); + afterEach(() => sandbox.restore()); + + it('initializes correctly', () => { + // This one is honestly not terribly interesting except that the + // class is storing the durations as numbers internally. + const er = new ExponentialRetry( + Duration.from({seconds: 1}), + Duration.from({seconds: 2}) + ); + + const eri = introspect(er); + assert.strictEqual(eri._backoffMs, 1000); + assert.strictEqual(eri._maxBackoffMs, 2000); + }); + + it('makes the first callback', () => { + const clock = sandbox.useFakeTimers(); + const er = new ExponentialRetry( + Duration.from({millis: 100}), + Duration.from({millis: 1000}) + ); + sandbox.stub(global.Math, 'random').returns(0.75); + + const item = makeItem(); + er.retryLater(item, (s: typeof item, t: Duration) => { + assert.strictEqual(s, item); + assert.strictEqual(t.totalOf('millisecond'), 125); + }); + + clock.tick(125); + + const leftovers = er.close(); + assert.strictEqual(leftovers.length, 0); + }); + + it('closes gracefully', () => { + const clock = sandbox.useFakeTimers(); + const er = new ExponentialRetry( + Duration.from({millis: 100}), + Duration.from({millis: 1000}) + ); + sandbox.stub(global.Math, 'random').returns(0.75); + + let called = false; + const item = makeItem(); + er.retryLater(item, (s: typeof item, t: Duration) => { + assert.strictEqual(s, item); + assert.strictEqual(t.totalOf('millisecond'), 125); + called = true; + }); + + clock.tick(5); + + const leftovers = er.close(); + + clock.tick(125); + + assert.strictEqual(called, false); + + const eri = introspect(er); + assert.strictEqual(eri._items.isEmpty(), true); + + assert.strictEqual(leftovers.length, 1); + }); + + it('backs off exponentially', () => { + const clock = sandbox.useFakeTimers(); + const er = new ExponentialRetry( + Duration.from({millis: 100}), + Duration.from({millis: 1000}) + ); + sandbox.stub(global.Math, 'random').returns(0.75); + + let callbackCount = 0; + let callbackTime: Duration = Duration.from({millis: 0}); + + const item = makeItem(); + const callback = (s: TestItem, t: Duration) => { + assert.strictEqual(s, item); + callbackTime = t; + callbackCount++; + if (callbackCount === 1) { + er.retryLater(item, callback); + } + }; + er.retryLater(item, callback); + + clock.tick(125); + assert.strictEqual(callbackCount, 1); + assert.strictEqual(callbackTime.totalOf('millisecond'), 125); + + clock.tick(400); + assert.strictEqual(callbackCount, 2); + assert.strictEqual(callbackTime.totalOf('millisecond'), 375); + + const leftovers = er.close(); + assert.strictEqual(leftovers.length, 0); + }); + + it('backs off exponentially until the max backoff', () => { + const clock = sandbox.useFakeTimers(); + const item = makeItem(); + const er = new ExponentialRetry( + Duration.from({millis: 100}), + Duration.from({millis: 150}) + ); + sandbox.stub(global.Math, 'random').returns(0.75); + + let callbackCount = 0; + let callbackTime: Duration = Duration.from({millis: 0}); + + const callback = (s: TestItem, t: Duration) => { + assert.strictEqual(s, item); + callbackTime = t; + callbackCount++; + if (callbackCount === 1) { + er.retryLater(item, callback); + } + }; + er.retryLater(item, callback); + + clock.tick(125); + assert.strictEqual(callbackCount, 1); + assert.strictEqual(callbackTime.totalOf('millisecond'), 125); + + clock.tick(400); + assert.strictEqual(callbackCount, 2); + assert.strictEqual(callbackTime.totalOf('millisecond'), 312); + + const leftovers = er.close(); + assert.strictEqual(leftovers.length, 0); + }); + + it('calls retries in the right order', () => { + const clock = sandbox.useFakeTimers(); + const items = [makeItem(), makeItem()]; + + const er = new ExponentialRetry( + Duration.from({millis: 100}), + Duration.from({millis: 1000}) + ); + + // Just disable the fuzz for this test. + sandbox.stub(global.Math, 'random').returns(0.5); + + const callbackCounts = [0, 0]; + const callbackTimes: Duration[] = [ + Duration.from({millis: 0}), + Duration.from({millis: 0}), + ]; + + const callback = (s: TestItem, t: Duration) => { + const idx = s === items[0] ? 0 : 1; + callbackCounts[idx]++; + callbackTimes[idx] = t; + + if (callbackCounts[idx] < 2) { + er.retryLater(items[idx], callback); + } + }; + + // Load in the first item and get it retrying. + er.retryLater(items[0], callback); + + clock.tick(300); + assert.deepStrictEqual(callbackCounts, [2, 0]); + assert.deepStrictEqual( + callbackTimes.map(d => d.totalOf('millisecond')), + [300, 0] + ); + + // Load in the second item and get it retrying. + er.retryLater(items[1], callback); + + clock.tick(125); + + // The first item should've retried twice and still be in the queue, + // while the second item should've retried once and quit. + assert.deepStrictEqual(callbackCounts, [2, 1]); + assert.deepStrictEqual( + callbackTimes.map(d => d.totalOf('millisecond')), + [300, 100] + ); + + // Make sure that we did in fact set another timer for the next event. + const eri = introspect(er); + assert.ok(eri._timer); + + const leftovers = er.close(); + assert.strictEqual(leftovers.length, 1); + }); +}); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index d60073cce78..8cde622bf23 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -17,15 +17,14 @@ import * as assert from 'assert'; import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; -import {CallOptions, grpc} from 'google-gax'; -import * as proxyquire from 'proxyquire'; +import {CallOptions, GoogleError, Status} from 'google-gax'; import * as sinon from 'sinon'; import * as uuid from 'uuid'; import defer = require('p-defer'); import * as messageTypes from '../src/message-queues'; import {BatchError} from '../src/message-queues'; -import {Message, Subscriber} from '../src/subscriber'; +import {AckError, Message, Subscriber} from '../src/subscriber'; class FakeClient { async acknowledge( @@ -49,15 +48,21 @@ class FakeClient { class FakeSubscriber extends EventEmitter { name: string; client: FakeClient; + iEOS: boolean; + constructor() { super(); this.name = uuid.v4(); this.client = new FakeClient(); + this.iEOS = false; } async getClient(): Promise { return this.client; } + get isExactlyOnceDelivery(): boolean { + return this.iEOS; + } } class FakeMessage { @@ -67,42 +72,79 @@ class FakeMessage { } } -describe('MessageQueues', () => { - const sandbox = sinon.createSandbox(); +function fakeMessage() { + return new FakeMessage() as unknown as Message; +} - let subscriber: FakeSubscriber; +class MessageQueue extends messageTypes.MessageQueue { + batches: messageTypes.QueuedMessages[] = []; + async _sendBatch( + batch: messageTypes.QueuedMessages + ): Promise { + this.batches.push(batch); + return []; + } +} - // eslint-disable-next-line @typescript-eslint/no-explicit-any - let MessageQueue: any; - // tslint:disable-next-line variable-name - let AckQueue: typeof messageTypes.AckQueue; - // tslint:disable-next-line variable-name - let ModAckQueue: typeof messageTypes.ModAckQueue; +class AckQueue extends messageTypes.AckQueue { + get requests() { + return this._requests; + } +} - type QueuedMessages = Array<[string, number?]>; +class ModAckQueue extends messageTypes.ModAckQueue { + get requests() { + return this._requests; + } +} - before(() => { - const queues = proxyquire('../src/message-queues.js', {}); +// This discount polyfill for Promise.allSettled can be removed after we drop Node 12. +type AllSettledResult = { + status: 'fulfilled' | 'rejected'; + value?: T; + reason?: U; +}; +function allSettled( + proms: Promise[] +): Promise[]> { + const checkedProms = proms.map((r: Promise) => + r + .then( + (value: T) => + ({ + status: 'fulfilled', + value, + } as AllSettledResult) + ) + .catch( + (error: U) => + ({ + status: 'rejected', + reason: error, + } as AllSettledResult) + ) + ); + + return Promise.all(checkedProms); +} - AckQueue = queues.AckQueue; - ModAckQueue = queues.ModAckQueue; +describe('MessageQueues', () => { + const sandbox = sinon.createSandbox(); - MessageQueue = class MessageQueue extends queues.MessageQueue { - batches = [] as QueuedMessages[]; - protected async _sendBatch(batch: QueuedMessages): Promise { - this.batches.push(batch); - } - }; - }); + let fakeSubscriber: FakeSubscriber; + let subscriber: Subscriber; + + before(() => {}); beforeEach(() => { - subscriber = new FakeSubscriber(); + fakeSubscriber = new FakeSubscriber(); + subscriber = fakeSubscriber as unknown as Subscriber; }); afterEach(() => sandbox.restore()); describe('MessageQueue', () => { - let messageQueue: typeof MessageQueue; + let messageQueue: MessageQueue; beforeEach(() => { messageQueue = new MessageQueue(subscriber); @@ -159,6 +201,25 @@ describe('MessageQueues', () => { clock.tick(delay); assert.strictEqual(stub.callCount, 1); }); + + it('should return a Promise that resolves when the ack is sent', async () => { + const clock = sandbox.useFakeTimers(); + const delay = 1000; + messageQueue.setOptions({maxMilliseconds: delay}); + + sandbox + .stub(messageQueue, '_sendBatch') + .callsFake((batch: messageTypes.QueuedMessages) => { + batch.forEach(m => { + m.responsePromise?.resolve(); + }); + return Promise.resolve([]); + }); + + const completion = messageQueue.add(new FakeMessage() as Message); + clock.tick(delay); + await completion; + }); }); describe('flush', () => { @@ -189,10 +250,10 @@ describe('MessageQueues', () => { messageQueue.add(message as Message, deadline); messageQueue.flush(); - const expectedBatch = [[message.ackId, deadline]]; const [batch] = messageQueue.batches; - - assert.deepStrictEqual(batch, expectedBatch); + assert.strictEqual(batch[0].ackId, message.ackId); + assert.strictEqual(batch[0].deadline, deadline); + assert.ok(batch[0].responsePromise?.resolve); }); it('should emit any errors as debug events', done => { @@ -221,6 +282,7 @@ describe('MessageQueues', () => { log.push('send:start'); await sendDone.promise; log.push('send:end'); + return []; }); const message = new FakeMessage(); @@ -280,7 +342,7 @@ describe('MessageQueues', () => { for (let i = 0; i < 3000; i++) { assert.strictEqual(stub.callCount, 0); - messageQueue.add(new FakeMessage()); + messageQueue.add(fakeMessage()); } assert.strictEqual(stub.callCount, 1); @@ -294,7 +356,7 @@ describe('MessageQueues', () => { for (let i = 0; i < maxMessages; i++) { assert.strictEqual(stub.callCount, 0); - messageQueue.add(new FakeMessage()); + messageQueue.add(fakeMessage()); } assert.strictEqual(stub.callCount, 1); @@ -304,7 +366,7 @@ describe('MessageQueues', () => { const clock = sandbox.useFakeTimers(); const stub = sandbox.stub(messageQueue, 'flush'); - messageQueue.add(new FakeMessage()); + messageQueue.add(fakeMessage()); clock.tick(100); assert.strictEqual(stub.callCount, 1); @@ -316,7 +378,7 @@ describe('MessageQueues', () => { const maxMilliseconds = 10000; messageQueue.setOptions({maxMilliseconds}); - messageQueue.add(new FakeMessage()); + messageQueue.add(fakeMessage()); clock.tick(maxMilliseconds); assert.strictEqual(stub.callCount, 1); @@ -325,10 +387,10 @@ describe('MessageQueues', () => { }); describe('AckQueue', () => { - let ackQueue: messageTypes.AckQueue; + let ackQueue: AckQueue; beforeEach(() => { - ackQueue = new AckQueue(subscriber as {} as Subscriber); + ackQueue = new AckQueue(subscriber); }); it('should send batches via Client#acknowledge', async () => { @@ -338,7 +400,9 @@ describe('MessageQueues', () => { new FakeMessage(), ]; - const stub = sandbox.stub(subscriber.client, 'acknowledge').resolves(); + const stub = sandbox + .stub(fakeSubscriber.client, 'acknowledge') + .resolves(); const expectedReqOpts = { subscription: subscriber.name, ackIds: messages.map(({ackId}) => ackId), @@ -353,7 +417,9 @@ describe('MessageQueues', () => { it('should send call options', async () => { const fakeCallOptions = {timeout: 10000}; - const stub = sandbox.stub(subscriber.client, 'acknowledge').resolves(); + const stub = sandbox + .stub(fakeSubscriber.client, 'acknowledge') + .resolves(); ackQueue.setOptions({callOptions: fakeCallOptions}); await ackQueue.flush(); @@ -362,7 +428,7 @@ describe('MessageQueues', () => { assert.strictEqual(callOptions, fakeCallOptions); }); - it('should throw a BatchError on "debug" if unable to ack', done => { + it('should throw a BatchError on "debug" if unable to ack due to grpc error', done => { const messages = [ new FakeMessage(), new FakeMessage(), @@ -371,33 +437,195 @@ describe('MessageQueues', () => { const ackIds = messages.map(message => message.ackId); - const fakeError = new Error('Err.') as grpc.ServiceError; - fakeError.code = 2; - fakeError.metadata = new grpc.Metadata(); + const fakeError = new Error('Err.') as GoogleError; + fakeError.code = Status.DATA_LOSS; - const expectedMessage = - 'Failed to "acknowledge" for 3 message(s). Reason: Err.'; + // Since this runs without EOS enabled, we should get the old error handling. + const expectedMessage = 'Failed to "ack" for 3 message(s). Reason: Err.'; - sandbox.stub(subscriber.client, 'acknowledge').rejects(fakeError); + sandbox.stub(fakeSubscriber.client, 'acknowledge').rejects(fakeError); subscriber.on('debug', (err: BatchError) => { - assert.strictEqual(err.message, expectedMessage); - assert.deepStrictEqual(err.ackIds, ackIds); - assert.strictEqual(err.code, fakeError.code); - assert.strictEqual(err.metadata, fakeError.metadata); - done(); + try { + assert.strictEqual(err.message, expectedMessage); + assert.deepStrictEqual(err.ackIds, ackIds); + assert.strictEqual(err.code, fakeError.code); + done(); + } catch (e) { + // I'm unsure why Mocha's regular handler doesn't work here, + // but manually throw the exception from asserts. + done(e); + } }); messages.forEach(message => ackQueue.add(message as Message)); ackQueue.flush(); }); + + // The analogous modAck version is very similar, so please sync changes. + describe('handle ack responses when !isExactlyOnceDelivery', () => { + it('should appropriately resolve result promises when !isExactlyOnceDelivery', async () => { + const fakeError = new Error('Err.') as GoogleError; + fakeError.code = Status.DATA_LOSS; + + const stub = sandbox + .stub(fakeSubscriber.client, 'acknowledge') + .rejects(fakeError); + + const message = new FakeMessage() as Message; + const completion = ackQueue.add(message); + await ackQueue.flush(); + assert.strictEqual(stub.callCount, 1); + await assert.doesNotReject(completion); + }); + }); + + // The analogous modAck version is very similar, so please sync changes. + describe('handle ack responses for exactly-once delivery', () => { + beforeEach(() => { + fakeSubscriber.iEOS = true; + }); + + it('should trigger Promise resolves on no errors', async () => { + const messages = [fakeMessage(), fakeMessage(), fakeMessage()]; + messages.forEach(m => ackQueue.add(m)); + + sandbox.stub(fakeSubscriber.client, 'acknowledge').resolves(); + const proms = ackQueue.requests.map( + (r: messageTypes.QueuedMessage) => r.responsePromise!.promise + ); + await ackQueue.flush(); + const results = await allSettled(proms); + const oneSuccess = {status: 'fulfilled', value: undefined}; + assert.deepStrictEqual(results, [oneSuccess, oneSuccess, oneSuccess]); + }); + + it('should trigger Promise failures on grpc errors', async () => { + const messages = [fakeMessage(), fakeMessage(), fakeMessage()]; + + const fakeError = new Error('Err.') as GoogleError; + fakeError.code = Status.DATA_LOSS; + fakeError.errorInfoMetadata = { + // These should be routed by the errorInfo resolver. + [messages[0].ackId]: 'TRANSIENT_CAT_ATE_HOMEWORK', + }; + + messages.forEach(m => ackQueue.add(m)); + + sandbox.stub(fakeSubscriber.client, 'acknowledge').rejects(fakeError); + const proms = ackQueue.requests.map( + (r: messageTypes.QueuedMessage) => r.responsePromise!.promise + ); + proms.shift(); + await ackQueue.flush(); + + const results = await allSettled(proms); + assert.strictEqual(results[0].status, 'rejected'); + assert.strictEqual(results[0].reason?.errorCode, 'OTHER'); + assert.strictEqual(results[1].status, 'rejected'); + assert.strictEqual(results[1].reason?.errorCode, 'OTHER'); + + // Make sure the one handled by errorInfo was retried. + assert.strictEqual(ackQueue.numInRetryRequests, 1); + }); + + it('should correctly handle a mix of errors and successes', async () => { + const messages = [fakeMessage(), fakeMessage(), fakeMessage()]; + + const fakeError = new Error('Err.') as GoogleError; + delete fakeError.code; + fakeError.errorInfoMetadata = { + [messages[0].ackId]: 'PERMANENT_FAILURE_INVALID_ACK_ID', + [messages[1].ackId]: 'TRANSIENT_CAT_ATE_HOMEWORK', + }; + + messages.forEach(m => ackQueue.add(m)); + + sandbox.stub(fakeSubscriber.client, 'acknowledge').rejects(fakeError); + + const proms = [ + ackQueue.requests[0].responsePromise!.promise, + ackQueue.requests[2].responsePromise!.promise, + ]; + await ackQueue.flush(); + + const results = await allSettled(proms); + assert.strictEqual(results[0].status, 'rejected'); + assert.strictEqual(results[0].reason?.errorCode, 'INVALID'); + + // Since there's no RPC error, the last one should've succeeded. + const oneSuccess = {status: 'fulfilled', value: undefined}; + assert.deepStrictEqual(results[1], oneSuccess); + + // Make sure the transient one was retried. + assert.strictEqual(ackQueue.numInRetryRequests, 1); + }); + + // This is separate because the retry mechanism itself could fail, and + // we want to make sure that transients actually make it back into the + // queue for retry. + // + // This doesn't need to be duplicated down to modAck because it's just + // testing common code. + it('should retry transient failures', async () => { + const clock = sandbox.useFakeTimers(); + sandbox.stub(global.Math, 'random').returns(0.5); + + const message = fakeMessage(); + const fakeError = new Error('Err.') as GoogleError; + fakeError.code = Status.DATA_LOSS; + fakeError.errorInfoMetadata = { + // These should be routed by the errorInfo resolver. + [message.ackId]: 'TRANSIENT_CAT_ATE_HOMEWORK', + }; + + sandbox.stub(fakeSubscriber.client, 'acknowledge').rejects(fakeError); + ackQueue.add(message); + await ackQueue.flush(); + + // Make sure the one handled by errorInfo was retried. + assert.strictEqual(ackQueue.numInRetryRequests, 1); + + // And wait for a second attempt. + clock.tick(1000); + + assert.strictEqual(ackQueue.requests.length, 1); + assert.strictEqual(ackQueue.requests[0].ackId, message.ackId); + assert.strictEqual(ackQueue.numInRetryRequests, 0); + assert.strictEqual(ackQueue.numPendingRequests, 1); + }); + }); + + it('should appropriately resolve result promises', async () => { + const stub = sandbox + .stub(fakeSubscriber.client, 'acknowledge') + .resolves(); + + const message = new FakeMessage() as Message; + const completion = ackQueue.add(message); + await ackQueue.flush(); + assert.strictEqual(stub.callCount, 1); + await completion; + }); + + it('should appropriately reject result promises', async () => { + const stub = sandbox + .stub(fakeSubscriber.client, 'acknowledge') + .resolves(); + + const message = new FakeMessage() as Message; + const completion = ackQueue.add(message); + await ackQueue.flush(); + assert.strictEqual(stub.callCount, 1); + await completion; + }); }); describe('ModAckQueue', () => { - let modAckQueue: messageTypes.ModAckQueue; + let modAckQueue: ModAckQueue; beforeEach(() => { - modAckQueue = new ModAckQueue(subscriber as {} as Subscriber); + modAckQueue = new ModAckQueue(subscriber); }); it('should send batches via Client#modifyAckDeadline', async () => { @@ -409,7 +637,7 @@ describe('MessageQueues', () => { ]; const stub = sandbox - .stub(subscriber.client, 'modifyAckDeadline') + .stub(fakeSubscriber.client, 'modifyAckDeadline') .resolves(); const expectedReqOpts = { @@ -443,7 +671,7 @@ describe('MessageQueues', () => { ]; const stub = sandbox - .stub(subscriber.client, 'modifyAckDeadline') + .stub(fakeSubscriber.client, 'modifyAckDeadline') .resolves(); const expectedReqOpts1 = { @@ -476,7 +704,7 @@ describe('MessageQueues', () => { it('should send call options', async () => { const fakeCallOptions = {timeout: 10000}; const stub = sandbox - .stub(subscriber.client, 'modifyAckDeadline') + .stub(fakeSubscriber.client, 'modifyAckDeadline') .resolves(); modAckQueue.setOptions({callOptions: fakeCallOptions}); @@ -487,7 +715,7 @@ describe('MessageQueues', () => { assert.strictEqual(callOptions, fakeCallOptions); }); - it('should throw a BatchError on "debug" if unable to modAck', done => { + it('should throw a BatchError on "debug" if unable to modAck due to gRPC error', done => { const messages = [ new FakeMessage(), new FakeMessage(), @@ -496,25 +724,159 @@ describe('MessageQueues', () => { const ackIds = messages.map(message => message.ackId); - const fakeError = new Error('Err.') as grpc.ServiceError; - fakeError.code = 2; - fakeError.metadata = new grpc.Metadata(); + const fakeError = new Error('Err.') as GoogleError; + fakeError.code = Status.DATA_LOSS; + // Since this runs without EOS enabled, we should get the old error handling. const expectedMessage = - 'Failed to "modifyAckDeadline" for 3 message(s). Reason: Err.'; + 'Failed to "modAck" for 3 message(s). Reason: Err.'; - sandbox.stub(subscriber.client, 'modifyAckDeadline').rejects(fakeError); + sandbox + .stub(fakeSubscriber.client, 'modifyAckDeadline') + .rejects(fakeError); subscriber.on('debug', (err: BatchError) => { - assert.strictEqual(err.message, expectedMessage); - assert.deepStrictEqual(err.ackIds, ackIds); - assert.strictEqual(err.code, fakeError.code); - assert.strictEqual(err.metadata, fakeError.metadata); - done(); + try { + assert.strictEqual(err.message, expectedMessage); + assert.deepStrictEqual(err.ackIds, ackIds); + assert.strictEqual(err.code, fakeError.code); + done(); + } catch (e) { + // I'm unsure why Mocha's regular handler doesn't work here, + // but manually throw the exception from asserts. + done(e); + } }); messages.forEach(message => modAckQueue.add(message as Message)); modAckQueue.flush(); }); + + describe('handle modAck responses when !isExactlyOnceDelivery', () => { + it('should appropriately resolve result promises when !isExactlyOnceDelivery', async () => { + const fakeError = new Error('Err.') as GoogleError; + fakeError.code = Status.DATA_LOSS; + + const stub = sandbox + .stub(fakeSubscriber.client, 'modifyAckDeadline') + .rejects(fakeError); + + const message = new FakeMessage() as Message; + const completion = modAckQueue.add(message); + await modAckQueue.flush(); + assert.strictEqual(stub.callCount, 1); + await assert.doesNotReject(completion); + }); + }); + + // The analogous ack version is very similar, so please sync changes. + describe('handle modAck responses for exactly-once delivery', () => { + beforeEach(() => { + fakeSubscriber.iEOS = true; + }); + + it('should trigger Promise resolves on no errors', async () => { + const messages = [fakeMessage(), fakeMessage(), fakeMessage()]; + messages.forEach(m => modAckQueue.add(m)); + + sandbox.stub(fakeSubscriber.client, 'modifyAckDeadline').resolves(); + const proms = modAckQueue.requests.map( + (r: messageTypes.QueuedMessage) => r.responsePromise!.promise + ); + await modAckQueue.flush(); + const results = await allSettled(proms); + const oneSuccess = {status: 'fulfilled', value: undefined}; + assert.deepStrictEqual(results, [oneSuccess, oneSuccess, oneSuccess]); + }); + + it('should trigger Promise failures on grpc errors', async () => { + const messages = [fakeMessage(), fakeMessage(), fakeMessage()]; + + const fakeError = new Error('Err.') as GoogleError; + fakeError.code = Status.DATA_LOSS; + fakeError.errorInfoMetadata = { + // These should be routed by the errorInfo resolver. + [messages[0].ackId]: 'TRANSIENT_CAT_ATE_HOMEWORK', + }; + + messages.forEach(m => modAckQueue.add(m)); + + sandbox + .stub(fakeSubscriber.client, 'modifyAckDeadline') + .rejects(fakeError); + const proms = modAckQueue.requests.map( + (r: messageTypes.QueuedMessage) => r.responsePromise!.promise + ); + proms.shift(); + await modAckQueue.flush(); + + const results = await allSettled(proms); + assert.strictEqual(results[0].status, 'rejected'); + assert.strictEqual(results[0].reason?.errorCode, 'OTHER'); + assert.strictEqual(results[1].status, 'rejected'); + assert.strictEqual(results[1].reason?.errorCode, 'OTHER'); + + // Make sure the one handled by errorInfo was retried. + assert.strictEqual(modAckQueue.numInRetryRequests, 1); + }); + + it('should correctly handle a mix of errors and successes', async () => { + const messages = [fakeMessage(), fakeMessage(), fakeMessage()]; + + const fakeError = new Error('Err.') as GoogleError; + delete fakeError.code; + fakeError.errorInfoMetadata = { + [messages[0].ackId]: 'PERMANENT_FAILURE_INVALID_ACK_ID', + [messages[1].ackId]: 'TRANSIENT_CAT_ATE_HOMEWORK', + }; + + messages.forEach(m => modAckQueue.add(m)); + + sandbox + .stub(fakeSubscriber.client, 'modifyAckDeadline') + .rejects(fakeError); + + const proms = [ + modAckQueue.requests[0].responsePromise!.promise, + modAckQueue.requests[2].responsePromise!.promise, + ]; + await modAckQueue.flush(); + + const results = await allSettled(proms); + assert.strictEqual(results[0].status, 'rejected'); + assert.strictEqual(results[0].reason?.errorCode, 'INVALID'); + + // Since there's no RPC error, the last one should've succeeded. + const oneSuccess = {status: 'fulfilled', value: undefined}; + assert.deepStrictEqual(results[1], oneSuccess); + + // Make sure the transient one was retried. + assert.strictEqual(modAckQueue.numInRetryRequests, 1); + }); + }); + + it('should appropriately resolve result promises', async () => { + const stub = sandbox + .stub(fakeSubscriber.client, 'modifyAckDeadline') + .resolves(); + + const message = new FakeMessage() as Message; + const completion = modAckQueue.add(message); + await modAckQueue.flush(); + assert.strictEqual(stub.callCount, 1); + await completion; + }); + + it('should appropriately reject result promises', async () => { + const stub = sandbox + .stub(fakeSubscriber.client, 'modifyAckDeadline') + .resolves(); + + const message = new FakeMessage() as Message; + const completion = modAckQueue.add(message); + await modAckQueue.flush(); + assert.strictEqual(stub.callCount, 1); + await completion; + }); }); }); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index fc831f81f85..9fb3eb3315e 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -24,6 +24,7 @@ import * as uuid from 'uuid'; import * as messageTypes from '../src/message-stream'; import {Subscriber} from '../src/subscriber'; import {defaultOptions} from '../src/default-options'; +import {Duration} from '../src/temporal'; const FAKE_STREAMING_PULL_TIMEOUT = 123456789; const FAKE_CLIENT_CONFIG = { @@ -513,5 +514,22 @@ describe('MessageStream', () => { }); }); }); + + it('should allow updating the ack deadline', async () => { + const stubs = client.streams.map(stream => { + return sandbox.stub(stream, 'write'); + }); + + messageStream.setStreamAckDeadline(Duration.from({seconds: 10})); + + const expected = { + streamAckDeadlineSeconds: 10, + }; + + stubs.forEach(stub => { + const [data] = stub.lastCall.args; + assert.deepStrictEqual(data, expected); + }); + }); }); }); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index d7ed05c55a0..2e31c2d0564 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -98,8 +98,11 @@ class FakeQueue { constructor(sub: s.Subscriber, options: BatchOptions) { this.options = options; } + close() {} // eslint-disable-next-line @typescript-eslint/no-unused-vars - add(message: s.Message, deadline?: number): void {} + async add(message: s.Message, deadline?: number): Promise { + return s.AckResponses.Success; + } async flush(): Promise {} async onFlush(): Promise {} async onDrain(): Promise {} @@ -324,7 +327,7 @@ describe('Subscriber', () => { assert.strictEqual(subscriber.ackDeadline, 10); }); - it('should default to 60s min for exactly-once subscriptions', () => { + it('should default to 60s min for exactly-once delivery subscriptions', () => { subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; const histogram: FakeHistogram = stubs.get('histogram'); diff --git a/handwritten/pubsub/test/util.ts b/handwritten/pubsub/test/util.ts index 80fe5690e94..6dbdd746cbe 100644 --- a/handwritten/pubsub/test/util.ts +++ b/handwritten/pubsub/test/util.ts @@ -13,7 +13,7 @@ // limitations under the License. import {describe, it} from 'mocha'; -import {Throttler} from '../src/util'; +import {addToBucket, Throttler} from '../src/util'; import * as assert from 'assert'; describe('utils', () => { @@ -43,4 +43,19 @@ describe('utils', () => { assert.strictEqual(totalCalls, 'FIRSTTHIRD'); }); }); + + describe('addToBucket', () => { + it('adds to a non-existent bucket', () => { + const map = new Map(); + addToBucket(map, 'a', 'b'); + assert.deepStrictEqual(map.get('a'), ['b']); + }); + + it('adds to an existent bucket', () => { + const map = new Map(); + map.set('a', ['c']); + addToBucket(map, 'a', 'b'); + assert.deepStrictEqual(map.get('a'), ['c', 'b']); + }); + }); }); From d13674e21c755869aaabcdb66a11c2936cf90139 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:40:25 -0400 Subject: [PATCH 0885/1115] chore(main): release 3.2.0 (#1623) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 13 +++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 9e911199b3b..08ea03b1d6b 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,19 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [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) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 463bf293243..ac25fcbc643 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.1.1", + "version": "3.2.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From be8e07b630167a8c9d3a809ad4420a262e411ab3 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 27 Sep 2022 17:56:50 -0400 Subject: [PATCH 0886/1115] chore: add config for releasing from legacy-v2 branch (#1580) * chore: add config for releasing from legacy-v2 branch * chore: fix release-please.yml syntax * chore: add Node 10 to available test matrix for legacy-v2 * build: revert back to standard CI for v3 * build: exclude configs for secondary branches --- handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md | 2 ++ handwritten/pubsub/.github/release-please.yml | 4 ++++ handwritten/pubsub/owlbot.py | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md b/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md index 520a0c2dd83..a4202654c96 100644 --- a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md +++ b/handwritten/pubsub/.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 # 🦕 + +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/handwritten/pubsub/.github/release-please.yml b/handwritten/pubsub/.github/release-please.yml index a1b41da3cb3..e3e0ed917be 100644 --- a/handwritten/pubsub/.github/release-please.yml +++ b/handwritten/pubsub/.github/release-please.yml @@ -1,2 +1,6 @@ handleGHRelease: true releaseType: node +branches: +- branch: legacy-v2 + releaseType: node + handleGHRelease: true diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 114c67b9334..d16a20ffe99 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -14,4 +14,8 @@ import synthtool.languages.node as node -node.owlbot_main(templates_excludes=['src/index.ts']) \ No newline at end of file +node.owlbot_main(templates_excludes=[ + 'src/index.ts', + '.github/PULL_REQUEST_TEMPLATE.md', + '.github/release-please.yml' +]) \ No newline at end of file From 98e7f536750d56bda4ab275d2e0abbe9c0d495f7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 1 Nov 2022 20:53:23 +0100 Subject: [PATCH 0887/1115] chore(deps): update dependency @types/node to v18 (#1647) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/system-test/fixtures/sample/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ac25fcbc643..1fc8f955d35 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -73,7 +73,7 @@ "@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", diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index 7eb51d9f8d2..4958f88b912 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -16,7 +16,7 @@ "@google-cloud/pubsub": "file:./pubsub.tgz" }, "devDependencies": { - "@types/node": "^16.0.0", + "@types/node": "^18.0.0", "typescript": "^3.0.0", "gts": "^2.0.0" } From b52c48c765ad46bb32f3651a67c9611144fa8e92 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 20:12:16 +0000 Subject: [PATCH 0888/1115] build: fix nodejs cloudbuild.yaml syntax (#1651) * build: fix nodejs cloudbuild.yaml syntax * build: fix nodejs_mono_repo cloudbuild.yaml syntax Source-Link: https://togithub.com/googleapis/synthtool/commit/5ae0078c29dd8b4cf198257f1357b8ff210f327d Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:13f1814b7e6c676c87ab435a8b1f13987fc1e2a0513ee4f8a1318fbd4724732b --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 3 +- handwritten/pubsub/protos/protos.d.ts | 2 +- handwritten/pubsub/protos/protos.js | 132 ++++++++++++++++--- 3 files changed, 117 insertions(+), 20 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 4d586c42063..03846747450 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.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:b15a6f06cc06dcffa11e1bebdf1a74b6775a134aac24a0f86f51ddf728eb373e -# created: 2022-08-26T22:34:55.905845397Z + digest: sha256:13f1814b7e6c676c87ab435a8b1f13987fc1e2a0513ee4f8a1318fbd4724732b diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 6ec325400f3..15cf6b1b073 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import Long = require("long"); import type {protobuf as $protobuf} from "google-gax"; +import Long = require("long"); /** Namespace google. */ export namespace google { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 5dcc3e562f6..f8f80dba5e1 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -784,6 +784,12 @@ if (object.schema != null) message.schema = String(object.schema); switch (object.encoding) { + default: + if (typeof object.encoding === "number") { + message.encoding = object.encoding; + break; + } + break; case "ENCODING_UNSPECIFIED": case 0: message.encoding = 0; @@ -820,7 +826,7 @@ if (message.schema != null && message.hasOwnProperty("schema")) object.schema = message.schema; if (message.encoding != null && message.hasOwnProperty("encoding")) - object.encoding = options.enums === String ? $root.google.pubsub.v1.Encoding[message.encoding] : message.encoding; + object.encoding = options.enums === String ? $root.google.pubsub.v1.Encoding[message.encoding] === undefined ? message.encoding : $root.google.pubsub.v1.Encoding[message.encoding] : message.encoding; return object; }; @@ -5669,6 +5675,12 @@ message.topicMessageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.topicMessageRetentionDuration); } switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; case "STATE_UNSPECIFIED": case 0: message.state = 0; @@ -5755,7 +5767,7 @@ if (message.bigqueryConfig != null && message.hasOwnProperty("bigqueryConfig")) object.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.toObject(message.bigqueryConfig, options); if (message.state != null && message.hasOwnProperty("state")) - object.state = options.enums === String ? $root.google.pubsub.v1.Subscription.State[message.state] : message.state; + object.state = options.enums === String ? $root.google.pubsub.v1.Subscription.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.Subscription.State[message.state] : message.state; return object; }; @@ -7251,6 +7263,12 @@ if (object.dropUnknownFields != null) message.dropUnknownFields = Boolean(object.dropUnknownFields); switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; case "STATE_UNSPECIFIED": case 0: message.state = 0; @@ -7304,7 +7322,7 @@ if (message.dropUnknownFields != null && message.hasOwnProperty("dropUnknownFields")) object.dropUnknownFields = message.dropUnknownFields; if (message.state != null && message.hasOwnProperty("state")) - object.state = options.enums === String ? $root.google.pubsub.v1.BigQueryConfig.State[message.state] : message.state; + object.state = options.enums === String ? $root.google.pubsub.v1.BigQueryConfig.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.BigQueryConfig.State[message.state] : message.state; return object; }; @@ -14137,6 +14155,12 @@ if (object.name != null) message.name = String(object.name); switch (object.type) { + default: + if (typeof object.type === "number") { + message.type = object.type; + break; + } + break; case "TYPE_UNSPECIFIED": case 0: message.type = 0; @@ -14176,7 +14200,7 @@ if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; if (message.type != null && message.hasOwnProperty("type")) - object.type = options.enums === String ? $root.google.pubsub.v1.Schema.Type[message.type] : message.type; + object.type = options.enums === String ? $root.google.pubsub.v1.Schema.Type[message.type] === undefined ? message.type : $root.google.pubsub.v1.Schema.Type[message.type] : message.type; if (message.definition != null && message.hasOwnProperty("definition")) object.definition = message.definition; return object; @@ -14674,6 +14698,12 @@ if (object.name != null) message.name = String(object.name); switch (object.view) { + default: + if (typeof object.view === "number") { + message.view = object.view; + break; + } + break; case "SCHEMA_VIEW_UNSPECIFIED": case 0: message.view = 0; @@ -14710,7 +14740,7 @@ if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; if (message.view != null && message.hasOwnProperty("view")) - object.view = options.enums === String ? $root.google.pubsub.v1.SchemaView[message.view] : message.view; + object.view = options.enums === String ? $root.google.pubsub.v1.SchemaView[message.view] === undefined ? message.view : $root.google.pubsub.v1.SchemaView[message.view] : message.view; return object; }; @@ -14955,6 +14985,12 @@ if (object.parent != null) message.parent = String(object.parent); switch (object.view) { + default: + if (typeof object.view === "number") { + message.view = object.view; + break; + } + break; case "SCHEMA_VIEW_UNSPECIFIED": case 0: message.view = 0; @@ -14997,7 +15033,7 @@ if (message.parent != null && message.hasOwnProperty("parent")) object.parent = message.parent; if (message.view != null && message.hasOwnProperty("view")) - object.view = options.enums === String ? $root.google.pubsub.v1.SchemaView[message.view] : message.view; + object.view = options.enums === String ? $root.google.pubsub.v1.SchemaView[message.view] === undefined ? message.view : $root.google.pubsub.v1.SchemaView[message.view] : message.view; if (message.pageSize != null && message.hasOwnProperty("pageSize")) object.pageSize = message.pageSize; if (message.pageToken != null && message.hasOwnProperty("pageToken")) @@ -16158,6 +16194,12 @@ else if (object.message.length >= 0) message.message = object.message; switch (object.encoding) { + default: + if (typeof object.encoding === "number") { + message.encoding = object.encoding; + break; + } + break; case "ENCODING_UNSPECIFIED": case 0: message.encoding = 0; @@ -16213,7 +16255,7 @@ if (message.message != null && message.hasOwnProperty("message")) object.message = options.bytes === String ? $util.base64.encode(message.message, 0, message.message.length) : options.bytes === Array ? Array.prototype.slice.call(message.message) : message.message; if (message.encoding != null && message.hasOwnProperty("encoding")) - object.encoding = options.enums === String ? $root.google.pubsub.v1.Encoding[message.encoding] : message.encoding; + object.encoding = options.enums === String ? $root.google.pubsub.v1.Encoding[message.encoding] === undefined ? message.encoding : $root.google.pubsub.v1.Encoding[message.encoding] : message.encoding; return object; }; @@ -17745,6 +17787,12 @@ if (object.nameField != null) message.nameField = String(object.nameField); switch (object.history) { + default: + if (typeof object.history === "number") { + message.history = object.history; + break; + } + break; case "HISTORY_UNSPECIFIED": case 0: message.history = 0; @@ -17769,6 +17817,10 @@ for (var i = 0; i < object.style.length; ++i) switch (object.style[i]) { default: + if (typeof object.style[i] === "number") { + message.style[i] = object.style[i]; + break; + } case "STYLE_UNSPECIFIED": case 0: message.style[i] = 0; @@ -17816,7 +17868,7 @@ if (message.nameField != null && message.hasOwnProperty("nameField")) object.nameField = message.nameField; if (message.history != null && message.hasOwnProperty("history")) - object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] : message.history; + object.history = options.enums === String ? $root.google.api.ResourceDescriptor.History[message.history] === undefined ? message.history : $root.google.api.ResourceDescriptor.History[message.history] : message.history; if (message.plural != null && message.hasOwnProperty("plural")) object.plural = message.plural; if (message.singular != null && message.hasOwnProperty("singular")) @@ -17824,7 +17876,7 @@ if (message.style && message.style.length) { object.style = []; for (var j = 0; j < message.style.length; ++j) - object.style[j] = options.enums === String ? $root.google.api.ResourceDescriptor.Style[message.style[j]] : message.style[j]; + object.style[j] = options.enums === String ? $root.google.api.ResourceDescriptor.Style[message.style[j]] === undefined ? message.style[j] : $root.google.api.ResourceDescriptor.Style[message.style[j]] : message.style[j]; } return object; }; @@ -20635,6 +20687,12 @@ if (object.number != null) message.number = object.number | 0; switch (object.label) { + default: + if (typeof object.label === "number") { + message.label = object.label; + break; + } + break; case "LABEL_OPTIONAL": case 1: message.label = 1; @@ -20649,6 +20707,12 @@ break; } switch (object.type) { + default: + if (typeof object.type === "number") { + message.type = object.type; + break; + } + break; case "TYPE_DOUBLE": case 1: message.type = 1; @@ -20775,9 +20839,9 @@ if (message.number != null && message.hasOwnProperty("number")) object.number = message.number; if (message.label != null && message.hasOwnProperty("label")) - object.label = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Label[message.label] : message.label; + object.label = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Label[message.label] === undefined ? message.label : $root.google.protobuf.FieldDescriptorProto.Label[message.label] : message.label; if (message.type != null && message.hasOwnProperty("type")) - object.type = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Type[message.type] : message.type; + object.type = options.enums === String ? $root.google.protobuf.FieldDescriptorProto.Type[message.type] === undefined ? message.type : $root.google.protobuf.FieldDescriptorProto.Type[message.type] : message.type; if (message.typeName != null && message.hasOwnProperty("typeName")) object.typeName = message.typeName; if (message.defaultValue != null && message.hasOwnProperty("defaultValue")) @@ -23124,6 +23188,12 @@ if (object.javaStringCheckUtf8 != null) message.javaStringCheckUtf8 = Boolean(object.javaStringCheckUtf8); switch (object.optimizeFor) { + default: + if (typeof object.optimizeFor === "number") { + message.optimizeFor = object.optimizeFor; + break; + } + break; case "SPEED": case 1: message.optimizeFor = 1; @@ -23232,7 +23302,7 @@ if (message.javaOuterClassname != null && message.hasOwnProperty("javaOuterClassname")) object.javaOuterClassname = message.javaOuterClassname; if (message.optimizeFor != null && message.hasOwnProperty("optimizeFor")) - object.optimizeFor = options.enums === String ? $root.google.protobuf.FileOptions.OptimizeMode[message.optimizeFor] : message.optimizeFor; + object.optimizeFor = options.enums === String ? $root.google.protobuf.FileOptions.OptimizeMode[message.optimizeFor] === undefined ? message.optimizeFor : $root.google.protobuf.FileOptions.OptimizeMode[message.optimizeFor] : message.optimizeFor; if (message.javaMultipleFiles != null && message.hasOwnProperty("javaMultipleFiles")) object.javaMultipleFiles = message.javaMultipleFiles; if (message.goPackage != null && message.hasOwnProperty("goPackage")) @@ -24034,6 +24104,12 @@ return object; var message = new $root.google.protobuf.FieldOptions(); switch (object.ctype) { + default: + if (typeof object.ctype === "number") { + message.ctype = object.ctype; + break; + } + break; case "STRING": case 0: message.ctype = 0; @@ -24050,6 +24126,12 @@ if (object.packed != null) message.packed = Boolean(object.packed); switch (object.jstype) { + default: + if (typeof object.jstype === "number") { + message.jstype = object.jstype; + break; + } + break; case "JS_NORMAL": case 0: message.jstype = 0; @@ -24088,6 +24170,10 @@ for (var i = 0; i < object[".google.api.fieldBehavior"].length; ++i) switch (object[".google.api.fieldBehavior"][i]) { default: + if (typeof object[".google.api.fieldBehavior"][i] === "number") { + message[".google.api.fieldBehavior"][i] = object[".google.api.fieldBehavior"][i]; + break; + } case "FIELD_BEHAVIOR_UNSPECIFIED": case 0: message[".google.api.fieldBehavior"][i] = 0; @@ -24158,7 +24244,7 @@ object[".google.api.resourceReference"] = null; } if (message.ctype != null && message.hasOwnProperty("ctype")) - object.ctype = options.enums === String ? $root.google.protobuf.FieldOptions.CType[message.ctype] : message.ctype; + object.ctype = options.enums === String ? $root.google.protobuf.FieldOptions.CType[message.ctype] === undefined ? message.ctype : $root.google.protobuf.FieldOptions.CType[message.ctype] : message.ctype; if (message.packed != null && message.hasOwnProperty("packed")) object.packed = message.packed; if (message.deprecated != null && message.hasOwnProperty("deprecated")) @@ -24166,7 +24252,7 @@ if (message.lazy != null && message.hasOwnProperty("lazy")) object.lazy = message.lazy; if (message.jstype != null && message.hasOwnProperty("jstype")) - object.jstype = options.enums === String ? $root.google.protobuf.FieldOptions.JSType[message.jstype] : message.jstype; + object.jstype = options.enums === String ? $root.google.protobuf.FieldOptions.JSType[message.jstype] === undefined ? message.jstype : $root.google.protobuf.FieldOptions.JSType[message.jstype] : message.jstype; if (message.weak != null && message.hasOwnProperty("weak")) object.weak = message.weak; if (message.unverifiedLazy != null && message.hasOwnProperty("unverifiedLazy")) @@ -24179,7 +24265,7 @@ if (message[".google.api.fieldBehavior"] && message[".google.api.fieldBehavior"].length) { object[".google.api.fieldBehavior"] = []; for (var j = 0; j < message[".google.api.fieldBehavior"].length; ++j) - object[".google.api.fieldBehavior"][j] = options.enums === String ? $root.google.api.FieldBehavior[message[".google.api.fieldBehavior"][j]] : message[".google.api.fieldBehavior"][j]; + object[".google.api.fieldBehavior"][j] = options.enums === String ? $root.google.api.FieldBehavior[message[".google.api.fieldBehavior"][j]] === undefined ? message[".google.api.fieldBehavior"][j] : $root.google.api.FieldBehavior[message[".google.api.fieldBehavior"][j]] : message[".google.api.fieldBehavior"][j]; } if (message[".google.api.resourceReference"] != null && message.hasOwnProperty(".google.api.resourceReference")) object[".google.api.resourceReference"] = $root.google.api.ResourceReference.toObject(message[".google.api.resourceReference"], options); @@ -25536,6 +25622,12 @@ if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); switch (object.idempotencyLevel) { + default: + if (typeof object.idempotencyLevel === "number") { + message.idempotencyLevel = object.idempotencyLevel; + break; + } + break; case "IDEMPOTENCY_UNKNOWN": case 0: message.idempotencyLevel = 0; @@ -25599,7 +25691,7 @@ if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) - object.idempotencyLevel = options.enums === String ? $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] : message.idempotencyLevel; + object.idempotencyLevel = options.enums === String ? $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] === undefined ? message.idempotencyLevel : $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] : message.idempotencyLevel; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -27352,6 +27444,12 @@ if (object.end != null) message.end = object.end | 0; switch (object.semantic) { + default: + if (typeof object.semantic === "number") { + message.semantic = object.semantic; + break; + } + break; case "NONE": case 0: message.semantic = 0; @@ -27401,7 +27499,7 @@ if (message.end != null && message.hasOwnProperty("end")) object.end = message.end; if (message.semantic != null && message.hasOwnProperty("semantic")) - object.semantic = options.enums === String ? $root.google.protobuf.GeneratedCodeInfo.Annotation.Semantic[message.semantic] : message.semantic; + object.semantic = options.enums === String ? $root.google.protobuf.GeneratedCodeInfo.Annotation.Semantic[message.semantic] === undefined ? message.semantic : $root.google.protobuf.GeneratedCodeInfo.Annotation.Semantic[message.semantic] : message.semantic; return object; }; From 0d2f7beb38e4486423a961a7d25f1eb1d7e1659e Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 3 Nov 2022 23:48:59 -0700 Subject: [PATCH 0889/1115] fix(deps): use google-gax v3.5.2 (#1652) * fix(deps): use google-gax v3.5.2 * fix: add comma --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1fc8f955d35..9a3c3504e90 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^8.0.2", - "google-gax": "^3.3.0", + "google-gax": "^3.5.2", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 81276cbeb543ae7f0f2d52f586fca55ce986e6ea Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 4 Nov 2022 18:57:53 +0100 Subject: [PATCH 0890/1115] chore(deps): update dependency jsdoc to v4 (#1655) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9a3c3504e90..c83a8ecc214 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -82,7 +82,7 @@ "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", From 289397427891d8cabffd65173352a1995bcb9489 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 4 Nov 2022 18:14:13 +0000 Subject: [PATCH 0891/1115] chore(main): release 3.2.1 (#1654) :robot: I have created a release *beep* *boop* --- ## [3.2.1](https://togithub.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://togithub.com/googleapis/nodejs-pubsub/issues/1652)) ([ee308b5](https://togithub.com/googleapis/nodejs-pubsub/commit/ee308b596802ad5537a89804a95429d630595eb4)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 08ea03b1d6b..dd8b58b9843 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [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) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c83a8ecc214..6e1afdc16b5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.2.0", + "version": "3.2.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 7fb4e809936dffe1d2581172466e7abd955d2a39 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 1 Dec 2022 23:58:38 +0100 Subject: [PATCH 0892/1115] chore(deps): update dependency @types/uuid to v9 (#1661) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 6e1afdc16b5..3d3d0e84aa9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -77,7 +77,7 @@ "@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", From 13d6ff572b394971b48ae9ed424d079ae74754ae Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Dec 2022 00:16:13 +0100 Subject: [PATCH 0893/1115] chore(deps): update dependency webpack-cli to v5 (#1657) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [webpack-cli](https://togithub.com/webpack/webpack-cli/tree/master/packages/webpack-cli) ([source](https://togithub.com/webpack/webpack-cli)) | [`^4.0.0` -> `^5.0.0`](https://renovatebot.com/diffs/npm/webpack-cli/4.10.0/5.0.0) | [![age](https://badges.renovateapi.com/packages/npm/webpack-cli/5.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/webpack-cli/5.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/webpack-cli/5.0.0/compatibility-slim/4.10.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/webpack-cli/5.0.0/confidence-slim/4.10.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
webpack/webpack-cli ### [`v5.0.0`](https://togithub.com/webpack/webpack-cli/blob/HEAD/CHANGELOG.md#​500-httpsgithubcomwebpackwebpack-clicomparewebpack-cli4100webpack-cli500-2022-11-17) [Compare Source](https://togithub.com/webpack/webpack-cli/compare/webpack-cli@4.10.0...webpack-cli@5.0.0) ##### Bug Fixes - improve description of the `--disable-interpret` option ([#​3364](https://togithub.com/webpack/webpack-cli/issues/3364)) ([bdb7e20](https://togithub.com/webpack/webpack-cli/commit/bdb7e20a3fc5a676bf5ba9912c091a2c9b3a1cfd)) - remove the redundant `utils` export ([#​3343](https://togithub.com/webpack/webpack-cli/issues/3343)) ([a9ce5d0](https://togithub.com/webpack/webpack-cli/commit/a9ce5d077f90492558e2d5c14841b3b5b85f1186)) - respect `NODE_PATH` env variable ([#​3411](https://togithub.com/webpack/webpack-cli/issues/3411)) ([83d1f58](https://togithub.com/webpack/webpack-cli/commit/83d1f58fb52d9dcfa3499efb342dfc47d0cca73a)) - show all CLI specific flags in the minimum help output ([#​3354](https://togithub.com/webpack/webpack-cli/issues/3354)) ([35843e8](https://togithub.com/webpack/webpack-cli/commit/35843e87c61fd27be92afce11bd66ebf4f9519ae)) ##### Features - failOnWarnings option ([#​3317](https://togithub.com/webpack/webpack-cli/issues/3317)) ([c48c848](https://togithub.com/webpack/webpack-cli/commit/c48c848c6c84eb73fbd829dc41bee301b0b7e2de)) - update commander to v9 ([#​3460](https://togithub.com/webpack/webpack-cli/issues/3460)) ([6621c02](https://togithub.com/webpack/webpack-cli/commit/6621c023ab59cc510a5f76e262f2c81676d1920b)) - added the `--define-process-env-node-env` option - update `interpret` to v3 and `rechoir` to v0.8 - add an option for preventing interpret ([#​3329](https://togithub.com/webpack/webpack-cli/issues/3329)) ([c737383](https://togithub.com/webpack/webpack-cli/commit/c7373832b96af499ad0813e07d114bdc927afdf4)) ##### BREAKING CHANGES - the minimum supported webpack version is v5.0.0 ([#​3342](https://togithub.com/webpack/webpack-cli/issues/3342)) ([b1af0dc](https://togithub.com/webpack/webpack-cli/commit/b1af0dc7ebcdf746bc37889e4c1f978c65acc4a5)), closes [#​3342](https://togithub.com/webpack/webpack-cli/issues/3342) - webpack-cli no longer supports webpack v4, the minimum supported version is webpack v5.0.0 - webpack-cli no longer supports webpack-dev-server v3, the minimum supported version is webpack-dev-server v4.0.0 - remove the `migrate` command ([#​3291](https://togithub.com/webpack/webpack-cli/issues/3291)) ([56b43e4](https://togithub.com/webpack/webpack-cli/commit/56b43e4baf76c166ade3b282b40ad9d007cc52b6)), closes [#​3291](https://togithub.com/webpack/webpack-cli/issues/3291) - remove the `--prefetch` option in favor the `PrefetchPlugin` plugin - remove the `--node-env` option in favor `--define-process-env-node-env` - remove the `--hot` option in favor of directly using the `HotModuleReplacement` plugin (only for `build` command, for `serve` it will work) - the behavior logic of the `--entry` option has been changed - previously it replaced your entries, now the option adds a specified entry, if you want to return the previous behavior please use ` webpack --entry-reset --entry './src/my-entry.js' `
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3d3d0e84aa9..ae331736b64 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -98,7 +98,7 @@ "typescript": "^4.6.4", "uuid": "^9.0.0", "webpack": "^5.0.0", - "webpack-cli": "^4.0.0", + "webpack-cli": "^5.0.0", "yargs": "^16.0.0" } } From 41bbd0a8ab1ef3494cc391baf0a9db5eb63b0cdb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Dec 2022 00:34:13 +0100 Subject: [PATCH 0894/1115] chore(deps): update dependency sinon to v15 (#1660) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [sinon](https://sinonjs.org/) ([source](https://togithub.com/sinonjs/sinon)) | [`^14.0.0` -> `^15.0.0`](https://renovatebot.com/diffs/npm/sinon/14.0.2/15.0.0) | [![age](https://badges.renovateapi.com/packages/npm/sinon/15.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/sinon/15.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/sinon/15.0.0/compatibility-slim/14.0.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/sinon/15.0.0/confidence-slim/14.0.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sinonjs/sinon ### [`v15.0.0`](https://togithub.com/sinonjs/sinon/blob/HEAD/CHANGES.md#​1500) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v14.0.2...v15.0.0) - [`b75fbfa9`](https://togithub.com/sinonjs/sinon/commit/b75fbfa9e57ba9b9c1b639b68646b1d054e0a7e3) Fix 2448: remove custom formatter (Morgan Roderick) > Remove option to pass a custom formatter. > > The sub libraries of Sinon has long moved on to use `util.inspect` from > Node. By using that in Sinon itself, we align all the libraries. *Released by Morgan Roderick on 2022-11-28.*
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ae331736b64..7f091f2dd46 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -92,7 +92,7 @@ "null-loader": "^4.0.0", "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", From 8afe77e50e334c42b04f7ceff715a9de18dff9b1 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 2 Dec 2022 16:46:56 -0500 Subject: [PATCH 0895/1115] samples: remove old TS conversion script to make way for typeless sample bot (#1650) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * samples: remove old TS conversion script to make way for typeless sample bot * docs: obey incorrect linting about copyright year * build: revert incorrect ci.yaml change * chore: fix lint issues * build: reverse owlboy.py changes for now * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: test gross fix for babel issue in owlbot * build: remove meaningless gitignore * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: test the right samples for TS * chore: bring back tsconfig and update samples readme * build: put converted typescript samples in the right place for system testing * chore: update owlbot * chore: revert owlbot.py changes to the original form * chore: fix broken samples test for commandFor * chore: remove unneeded JS in the TS folder * chore: update owlbot.py with shim to use newest typeless bot * chore: correctly break out command line parameters for testing * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: don't copy non-existent JS samples * build: update owlbot to typeless 1.1.0 image * chore: clean up owlbot.py comments Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/owlbot.py | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 03846747450..232536774d9 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:13f1814b7e6c676c87ab435a8b1f13987fc1e2a0513ee4f8a1318fbd4724732b + digest: sha256:4befbe2105d11a79fe74c7b2adc0eb411a5e2b68053fddca15efb5414fa37358 diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index d16a20ffe99..c0dc44db3b0 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -14,8 +14,24 @@ import synthtool.languages.node as node +# 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' -]) \ No newline at end of file +]) From a3109eebd99e93d4a5844c059c1beae3e79ca858 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 5 Dec 2022 02:39:07 -0500 Subject: [PATCH 0896/1115] chore: linter fixes (#1662) --- handwritten/pubsub/src/iam.ts | 2 -- handwritten/pubsub/system-test/pubsub.ts | 4 +--- handwritten/pubsub/test/pubsub.ts | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 67732eda0c5..ea6128be332 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -21,8 +21,6 @@ import arrify = require('arrify'); import {CallOptions, IamProtos} from 'google-gax'; -import {google} from '../protos/protos'; - import {Omit, PubSub, RequestCallback, ResourceCallback} from './pubsub'; import {promisifySome} from './util'; diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 5ab873905e9..8d138c8c082 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -931,9 +931,7 @@ describe('pubsub', () => { // This creates a Promise that hooks the 'message' callback of the // subscription above, and resolves when that callback calls `resolve`. type WorkCallback = (arg: Message, resolve: Function) => void; - function makeMessagePromise( - workCallback: WorkCallback - ): Promise { + function makeMessagePromise(workCallback: WorkCallback): Promise { return new Promise(resolve => { subscription.on('message', (arg: Message) => { workCallback(arg, resolve); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index fc35952349f..eef9fccdcf3 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -156,10 +156,6 @@ describe('PubSub', () => { const PUBSUB_EMULATOR_HOST = process.env.PUBSUB_EMULATOR_HOST; - interface PostCloseCallback { - (err: Error | null): void; - } - before(() => { delete process.env.PUBSUB_EMULATOR_HOST; PubSub = proxyquire('../src/pubsub', { From 10c4f1f590f97bca2ae72a74c544926cfcd4b99d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 23:42:31 +0000 Subject: [PATCH 0897/1115] build: have Kokoro grab service account credentials from secret that will be rotated (#1664) * build: have Kokoro grab service account credentials from secret that will be rotated Source-Link: https://togithub.com/googleapis/synthtool/commit/4a0230eb8dc497f36fd3839e6144982131f30a9d Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:f59941869d508c6825deeffce180579545fd528f359f549a80a18ec0458d7094 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- .../pubsub/.kokoro/continuous/node12/samples-test.cfg | 5 +++++ handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg | 5 +++++ handwritten/pubsub/.kokoro/samples-test.sh | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 232536774d9..6c41b3088f5 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:4befbe2105d11a79fe74c7b2adc0eb411a5e2b68053fddca15efb5414fa37358 + digest: sha256:f59941869d508c6825deeffce180579545fd528f359f549a80a18ec0458d7094 diff --git a/handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg index b0b5906e674..698013d7caa 100644 --- a/handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-pubsub/.kokoro/samples-test.sh" } + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg index b0b5906e674..698013d7caa 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-pubsub/.kokoro/samples-test.sh" } + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index fbc058a4ec4..806c0082236 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -19,7 +19,7 @@ set -eo pipefail export NPM_CONFIG_PREFIX=${HOME}/.npm-global # Setup service account credentials. -export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json +export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secret_manager/long-door-651-kokoro-system-test-service-account export GCLOUD_PROJECT=long-door-651 cd $(dirname $0)/.. From ee29d796e822efee25d5d3eb366f783daaccfd58 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 13:59:40 -0500 Subject: [PATCH 0898/1115] chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport (#1663) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport chore: disallow "transport=rest" for services where numeric enums are not confirmed to be supported (except in PHP and Java) PiperOrigin-RevId: 493113566 Source-Link: https://github.com/googleapis/googleapis/commit/758f0d1217d9c7fe398aa5efb1057ce4b6409e55 Source-Link: https://github.com/googleapis/googleapis-gen/commit/78bd8f05e1276363eb14eae70e91fe4bc20703ab Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzhiZDhmMDVlMTI3NjM2M2ViMTRlYWU3MGU5MWZlNGJjMjA3MDNhYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/v1/publisher_client.ts | 3 +++ handwritten/pubsub/src/v1/schema_service_client.ts | 3 +++ handwritten/pubsub/src/v1/subscriber_client.ts | 3 +++ 3 files changed, 9 insertions(+) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index b9b53821456..7398ca91cc9 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -124,6 +124,9 @@ export class PublisherClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + // Request numeric enum values if REST transport is used. + opts.numericEnums = true; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 6f84acc7b86..dda22e59f90 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -123,6 +123,9 @@ export class SchemaServiceClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + // Request numeric enum values if REST transport is used. + opts.numericEnums = true; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index f0dbfd657f8..1844fb61cea 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -125,6 +125,9 @@ export class SubscriberClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + // Request numeric enum values if REST transport is used. + opts.numericEnums = true; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; From 6572785831d3c50654987fc4045048a7367c7c52 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 22:52:19 +0000 Subject: [PATCH 0899/1115] build: have Kokoro grab service account credentials from secret that will be rotated for system tests (#1669) Source-Link: https://togithub.com/googleapis/synthtool/commit/abbc97db69a57dcb991ba97ef503305b701ffb3a Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:fe04ae044dadf5ad88d979dbcc85e0e99372fb5d6316790341e6aca5e4e3fbc8 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg | 5 +++++ handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg | 5 +++++ handwritten/pubsub/.kokoro/system-test.sh | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 6c41b3088f5..788f7a9fdff 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:f59941869d508c6825deeffce180579545fd528f359f549a80a18ec0458d7094 + digest: sha256:fe04ae044dadf5ad88d979dbcc85e0e99372fb5d6316790341e6aca5e4e3fbc8 diff --git a/handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg index 7d6fa1ba740..bf759bd3f1a 100644 --- a/handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-pubsub/.kokoro/system-test.sh" } + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg index 7d6fa1ba740..bf759bd3f1a 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-pubsub/.kokoro/system-test.sh" } + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 87fa0653d76..0201e9dfd71 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -19,7 +19,7 @@ set -eo pipefail export NPM_CONFIG_PREFIX=${HOME}/.npm-global # Setup service account credentials. -export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json +export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secret_manager/long-door-651-kokoro-system-test-service-account export GCLOUD_PROJECT=long-door-651 cd $(dirname $0)/.. From ae932ec7ab76e8c25ec7ed0580a3e096697f8f38 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 15:36:34 -0500 Subject: [PATCH 0900/1115] chore(pubsub): remove extraneous ctype field annotations (#1670) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(pubsub): remove extraneous ctype field annotations PiperOrigin-RevId: 496666857 Source-Link: https://github.com/googleapis/googleapis/commit/bc27df2b63e5fd03e85dbcdc3480fed38bea6d36 Source-Link: https://github.com/googleapis/googleapis-gen/commit/941b568027b145bfb540e8ee1df4d4ccd44977fc Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTQxYjU2ODAyN2IxNDViZmI1NDBlOGVlMWRmNGQ0Y2NkNDQ5NzdmYyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 18 ++++++------- handwritten/pubsub/protos/protos.json | 25 ++++--------------- .../pubsub/src/v1/subscriber_client.ts | 4 +-- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 5ab209bbd62..aa65f9db0b4 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -795,8 +795,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 +969,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 +1252,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. diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 5cbc208797d..7cac400a2fd 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1233,26 +1233,17 @@ "ackIds": { "rule": "repeated", "type": "string", - "id": 1, - "options": { - "ctype": "CORD" - } + "id": 1 }, "invalidAckIds": { "rule": "repeated", "type": "string", - "id": 2, - "options": { - "ctype": "CORD" - } + "id": 2 }, "unorderedAckIds": { "rule": "repeated", "type": "string", - "id": 3, - "options": { - "ctype": "CORD" - } + "id": 3 } } }, @@ -1261,18 +1252,12 @@ "ackIds": { "rule": "repeated", "type": "string", - "id": 1, - "options": { - "ctype": "CORD" - } + "id": 1 }, "invalidAckIds": { "rule": "repeated", "type": "string", - "id": 2, - "options": { - "ctype": "CORD" - } + "id": 2 } } }, diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 1844fb61cea..8ec3ba231ae 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -528,8 +528,8 @@ export class SubscriberClient { * the `message_retention_duration` field in `Topic`. This field is set only * in responses from the server; it is ignored if it is set in any requests. * @param {google.pubsub.v1.Subscription.State} request.state - * 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. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. From a15f1ab9a28e552925d9ba5ba9e2a68247d000ac Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 14:29:16 -0500 Subject: [PATCH 0901/1115] feat: add schema evolution methods and fields (#1672) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add schema evolution methods and fields PiperOrigin-RevId: 500819578 Source-Link: https://github.com/googleapis/googleapis/commit/05a375f20b0e76e0106990aa9fadab98498dbea0 Source-Link: https://github.com/googleapis/googleapis-gen/commit/303c9592c498dc02432daa29acb46d67decfb0c2 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzAzYzk1OTJjNDk4ZGMwMjQzMmRhYTI5YWNiNDZkNjdkZWNmYjBjMiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- handwritten/pubsub/.jsdoc.js | 4 +- .../protos/google/pubsub/v1/pubsub.proto | 10 + .../protos/google/pubsub/v1/schema.proto | 154 +- handwritten/pubsub/protos/protos.d.ts | 651 ++++++- handwritten/pubsub/protos/protos.js | 1494 ++++++++++++++++- handwritten/pubsub/protos/protos.json | 206 ++- handwritten/pubsub/src/v1/index.ts | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 2 +- .../pubsub/src/v1/schema_service_client.ts | 471 +++++- .../src/v1/schema_service_client_config.json | 16 + .../pubsub/src/v1/subscriber_client.ts | 2 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 2 +- .../pubsub/test/gapic_schema_service_v1.ts | 689 +++++++- .../pubsub/test/gapic_subscriber_v1.ts | 2 +- 14 files changed, 3646 insertions(+), 59 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index a3991a63f46..6618d0cc4f7 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.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/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index aa65f9db0b4..661633b6102 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/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. diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index 3cdf10d9331..1b1483b875b 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ import "google/api/client.proto"; import "google/api/field_behavior.proto"; import "google/api/resource.proto"; import "google/protobuf/empty.proto"; +import "google/protobuf/timestamp.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.PubSub.V1"; @@ -63,6 +64,41 @@ service SchemaService { option (google.api.method_signature) = "parent"; } + // Lists all schema revisions for the named schema. + rpc ListSchemaRevisions(ListSchemaRevisionsRequest) + returns (ListSchemaRevisionsResponse) { + option (google.api.http) = { + get: "/v1/{name=projects/*/schemas/*}:listRevisions" + }; + option (google.api.method_signature) = "name"; + } + + // Commits a new schema revision to an existing schema. + rpc CommitSchema(CommitSchemaRequest) returns (Schema) { + option (google.api.http) = { + post: "/v1/{name=projects/*/schemas/*}:commit" + body: "*" + }; + option (google.api.method_signature) = "name,schema"; + } + + // Creates a new schema revision that is a copy of the provided revision_id. + rpc RollbackSchema(RollbackSchemaRequest) returns (Schema) { + option (google.api.http) = { + post: "/v1/{name=projects/*/schemas/*}:rollback" + body: "*" + }; + option (google.api.method_signature) = "name,revision_id"; + } + + // Deletes a specific schema revision. + rpc DeleteSchemaRevision(DeleteSchemaRevisionRequest) returns (Schema) { + option (google.api.http) = { + delete: "/v1/{name=projects/*/schemas/*}:deleteRevision" + }; + option (google.api.method_signature) = "name,revision_id"; + } + // Deletes a schema. rpc DeleteSchema(DeleteSchemaRequest) returns (google.protobuf.Empty) { option (google.api.http) = { @@ -120,6 +156,29 @@ message Schema { // the full definition of the schema that is a valid schema definition of // the type specified in `type`. string definition = 3; + + // Output only. Immutable. The revision ID of the schema. + string revision_id = 4 [ + (google.api.field_behavior) = IMMUTABLE, + (google.api.field_behavior) = OUTPUT_ONLY + ]; + + // Output only. The timestamp that the revision was created. + google.protobuf.Timestamp revision_create_time = 6 + [(google.api.field_behavior) = OUTPUT_ONLY]; +} + +// View of Schema object fields to be returned by GetSchema and ListSchemas. +enum SchemaView { + // The default / unset value. + // The API will default to the BASIC view. + SCHEMA_VIEW_UNSPECIFIED = 0; + + // Include the name and type of the schema, but not the definition. + BASIC = 1; + + // Include all Schema object fields. + FULL = 2; } // Request for the CreateSchema method. @@ -148,19 +207,6 @@ message CreateSchemaRequest { string schema_id = 3; } -// View of Schema object fields to be returned by GetSchema and ListSchemas. -enum SchemaView { - // The default / unset value. - // The API will default to the BASIC view. - SCHEMA_VIEW_UNSPECIFIED = 0; - - // Include the name and type of the schema, but not the definition. - BASIC = 1; - - // Include all Schema object fields. - FULL = 2; -} - // Request for the GetSchema method. message GetSchemaRequest { // Required. The name of the schema to get. @@ -171,8 +217,7 @@ message GetSchemaRequest { ]; // The set of fields to return in the response. If not set, returns a Schema - // with `name` and `type`, but not `definition`. Set to `FULL` to retrieve all - // fields. + // with all fields filled out. Set to `BASIC` to omit the `definition`. SchemaView view = 2; } @@ -211,6 +256,83 @@ message ListSchemasResponse { string next_page_token = 2; } +// Request for the `ListSchemaRevisions` method. +message ListSchemaRevisionsRequest { + // Required. The name of the schema to list revisions for. + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } + ]; + + // The set of Schema fields to return in the response. If not set, returns + // Schemas with `name` and `type`, but not `definition`. Set to `FULL` to + // retrieve all fields. + SchemaView view = 2; + + // The maximum number of revisions to return per page. + int32 page_size = 3; + + // The page token, received from a previous ListSchemaRevisions call. + // Provide this to retrieve the subsequent page. + string page_token = 4; +} + +// Response for the `ListSchemaRevisions` method. +message ListSchemaRevisionsResponse { + // The revisions of the schema. + repeated Schema schemas = 1; + + // A token that can be sent as `page_token` to retrieve the next page. + // If this field is empty, there are no subsequent pages. + string next_page_token = 2; +} + +// Request for CommitSchema method. +message CommitSchemaRequest { + // Required. The name of the schema we are revising. + // Format is `projects/{project}/schemas/{schema}`. + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } + ]; + + // Required. The schema revision to commit. + Schema schema = 2 [(google.api.field_behavior) = REQUIRED]; +} + +// Request for the `RollbackSchema` method. +message RollbackSchemaRequest { + // Required. The schema being rolled back with revision id. + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } + ]; + + // Required. The revision ID to roll back to. + // It must be a revision of the same schema. + // + // Example: c7cfa2a8 + string revision_id = 2 [(google.api.field_behavior) = REQUIRED]; +} + +// Request for the `DeleteSchemaRevision` method. +message DeleteSchemaRevisionRequest { + // Required. The name of the schema revision to be deleted, with a revision ID + // explicitly included. + // + // Example: projects/123/schemas/my-schema@c7cfa2a8 + string name = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } + ]; + + // Required. The revision ID to roll back to. + // It must be a revision of the same schema. + // + // Example: c7cfa2a8 + string revision_id = 2 [(google.api.field_behavior) = REQUIRED]; +} + // Request for the `DeleteSchema` method. message DeleteSchemaRequest { // Required. Name of the schema to delete. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 15cf6b1b073..e40d0e65ed0 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -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. @@ -341,6 +341,12 @@ export namespace google { /** SchemaSettings encoding */ encoding?: (google.pubsub.v1.Encoding|keyof typeof google.pubsub.v1.Encoding|null); + + /** SchemaSettings firstRevisionId */ + firstRevisionId?: (string|null); + + /** SchemaSettings lastRevisionId */ + lastRevisionId?: (string|null); } /** Represents a SchemaSettings. */ @@ -358,6 +364,12 @@ export namespace google { /** SchemaSettings encoding. */ public encoding: (google.pubsub.v1.Encoding|keyof typeof google.pubsub.v1.Encoding); + /** SchemaSettings firstRevisionId. */ + public firstRevisionId: string; + + /** SchemaSettings lastRevisionId. */ + public lastRevisionId: string; + /** * Creates a new SchemaSettings instance using the specified properties. * @param [properties] Properties to set @@ -5937,6 +5949,62 @@ export namespace google { */ public listSchemas(request: google.pubsub.v1.IListSchemasRequest): Promise; + /** + * Calls ListSchemaRevisions. + * @param request ListSchemaRevisionsRequest message or plain object + * @param callback Node-style callback called with the error, if any, and ListSchemaRevisionsResponse + */ + public listSchemaRevisions(request: google.pubsub.v1.IListSchemaRevisionsRequest, callback: google.pubsub.v1.SchemaService.ListSchemaRevisionsCallback): void; + + /** + * Calls ListSchemaRevisions. + * @param request ListSchemaRevisionsRequest message or plain object + * @returns Promise + */ + public listSchemaRevisions(request: google.pubsub.v1.IListSchemaRevisionsRequest): Promise; + + /** + * Calls CommitSchema. + * @param request CommitSchemaRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Schema + */ + public commitSchema(request: google.pubsub.v1.ICommitSchemaRequest, callback: google.pubsub.v1.SchemaService.CommitSchemaCallback): void; + + /** + * Calls CommitSchema. + * @param request CommitSchemaRequest message or plain object + * @returns Promise + */ + public commitSchema(request: google.pubsub.v1.ICommitSchemaRequest): Promise; + + /** + * Calls RollbackSchema. + * @param request RollbackSchemaRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Schema + */ + public rollbackSchema(request: google.pubsub.v1.IRollbackSchemaRequest, callback: google.pubsub.v1.SchemaService.RollbackSchemaCallback): void; + + /** + * Calls RollbackSchema. + * @param request RollbackSchemaRequest message or plain object + * @returns Promise + */ + public rollbackSchema(request: google.pubsub.v1.IRollbackSchemaRequest): Promise; + + /** + * Calls DeleteSchemaRevision. + * @param request DeleteSchemaRevisionRequest message or plain object + * @param callback Node-style callback called with the error, if any, and Schema + */ + public deleteSchemaRevision(request: google.pubsub.v1.IDeleteSchemaRevisionRequest, callback: google.pubsub.v1.SchemaService.DeleteSchemaRevisionCallback): void; + + /** + * Calls DeleteSchemaRevision. + * @param request DeleteSchemaRevisionRequest message or plain object + * @returns Promise + */ + public deleteSchemaRevision(request: google.pubsub.v1.IDeleteSchemaRevisionRequest): Promise; + /** * Calls DeleteSchema. * @param request DeleteSchemaRequest message or plain object @@ -6003,6 +6071,34 @@ export namespace google { */ type ListSchemasCallback = (error: (Error|null), response?: google.pubsub.v1.ListSchemasResponse) => void; + /** + * Callback as used by {@link google.pubsub.v1.SchemaService|listSchemaRevisions}. + * @param error Error, if any + * @param [response] ListSchemaRevisionsResponse + */ + type ListSchemaRevisionsCallback = (error: (Error|null), response?: google.pubsub.v1.ListSchemaRevisionsResponse) => void; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService|commitSchema}. + * @param error Error, if any + * @param [response] Schema + */ + type CommitSchemaCallback = (error: (Error|null), response?: google.pubsub.v1.Schema) => void; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService|rollbackSchema}. + * @param error Error, if any + * @param [response] Schema + */ + type RollbackSchemaCallback = (error: (Error|null), response?: google.pubsub.v1.Schema) => void; + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService|deleteSchemaRevision}. + * @param error Error, if any + * @param [response] Schema + */ + type DeleteSchemaRevisionCallback = (error: (Error|null), response?: google.pubsub.v1.Schema) => void; + /** * Callback as used by {@link google.pubsub.v1.SchemaService|deleteSchema}. * @param error Error, if any @@ -6036,6 +6132,12 @@ export namespace google { /** Schema definition */ definition?: (string|null); + + /** Schema revisionId */ + revisionId?: (string|null); + + /** Schema revisionCreateTime */ + revisionCreateTime?: (google.protobuf.ITimestamp|null); } /** Represents a Schema. */ @@ -6056,6 +6158,12 @@ export namespace google { /** Schema definition. */ public definition: string; + /** Schema revisionId. */ + public revisionId: string; + + /** Schema revisionCreateTime. */ + public revisionCreateTime?: (google.protobuf.ITimestamp|null); + /** * Creates a new Schema instance using the specified properties. * @param [properties] Properties to set @@ -6144,6 +6252,13 @@ export namespace google { } } + /** SchemaView enum. */ + enum SchemaView { + SCHEMA_VIEW_UNSPECIFIED = 0, + BASIC = 1, + FULL = 2 + } + /** Properties of a CreateSchemaRequest. */ interface ICreateSchemaRequest { @@ -6253,13 +6368,6 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } - /** SchemaView enum. */ - enum SchemaView { - SCHEMA_VIEW_UNSPECIFIED = 0, - BASIC = 1, - FULL = 2 - } - /** Properties of a GetSchemaRequest. */ interface IGetSchemaRequest { @@ -6581,6 +6689,533 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + /** Properties of a ListSchemaRevisionsRequest. */ + interface IListSchemaRevisionsRequest { + + /** ListSchemaRevisionsRequest name */ + name?: (string|null); + + /** ListSchemaRevisionsRequest view */ + view?: (google.pubsub.v1.SchemaView|keyof typeof google.pubsub.v1.SchemaView|null); + + /** ListSchemaRevisionsRequest pageSize */ + pageSize?: (number|null); + + /** ListSchemaRevisionsRequest pageToken */ + pageToken?: (string|null); + } + + /** Represents a ListSchemaRevisionsRequest. */ + class ListSchemaRevisionsRequest implements IListSchemaRevisionsRequest { + + /** + * Constructs a new ListSchemaRevisionsRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSchemaRevisionsRequest); + + /** ListSchemaRevisionsRequest name. */ + public name: string; + + /** ListSchemaRevisionsRequest view. */ + public view: (google.pubsub.v1.SchemaView|keyof typeof google.pubsub.v1.SchemaView); + + /** ListSchemaRevisionsRequest pageSize. */ + public pageSize: number; + + /** ListSchemaRevisionsRequest pageToken. */ + public pageToken: string; + + /** + * Creates a new ListSchemaRevisionsRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSchemaRevisionsRequest instance + */ + public static create(properties?: google.pubsub.v1.IListSchemaRevisionsRequest): google.pubsub.v1.ListSchemaRevisionsRequest; + + /** + * Encodes the specified ListSchemaRevisionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSchemaRevisionsRequest.verify|verify} messages. + * @param message ListSchemaRevisionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSchemaRevisionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSchemaRevisionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSchemaRevisionsRequest.verify|verify} messages. + * @param message ListSchemaRevisionsRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSchemaRevisionsRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSchemaRevisionsRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSchemaRevisionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSchemaRevisionsRequest; + + /** + * Decodes a ListSchemaRevisionsRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSchemaRevisionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSchemaRevisionsRequest; + + /** + * Verifies a ListSchemaRevisionsRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSchemaRevisionsRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSchemaRevisionsRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSchemaRevisionsRequest; + + /** + * Creates a plain object from a ListSchemaRevisionsRequest message. Also converts values to other types if specified. + * @param message ListSchemaRevisionsRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSchemaRevisionsRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSchemaRevisionsRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListSchemaRevisionsRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a ListSchemaRevisionsResponse. */ + interface IListSchemaRevisionsResponse { + + /** ListSchemaRevisionsResponse schemas */ + schemas?: (google.pubsub.v1.ISchema[]|null); + + /** ListSchemaRevisionsResponse nextPageToken */ + nextPageToken?: (string|null); + } + + /** Represents a ListSchemaRevisionsResponse. */ + class ListSchemaRevisionsResponse implements IListSchemaRevisionsResponse { + + /** + * Constructs a new ListSchemaRevisionsResponse. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IListSchemaRevisionsResponse); + + /** ListSchemaRevisionsResponse schemas. */ + public schemas: google.pubsub.v1.ISchema[]; + + /** ListSchemaRevisionsResponse nextPageToken. */ + public nextPageToken: string; + + /** + * Creates a new ListSchemaRevisionsResponse instance using the specified properties. + * @param [properties] Properties to set + * @returns ListSchemaRevisionsResponse instance + */ + public static create(properties?: google.pubsub.v1.IListSchemaRevisionsResponse): google.pubsub.v1.ListSchemaRevisionsResponse; + + /** + * Encodes the specified ListSchemaRevisionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSchemaRevisionsResponse.verify|verify} messages. + * @param message ListSchemaRevisionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IListSchemaRevisionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ListSchemaRevisionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSchemaRevisionsResponse.verify|verify} messages. + * @param message ListSchemaRevisionsResponse message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IListSchemaRevisionsResponse, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ListSchemaRevisionsResponse message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ListSchemaRevisionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.ListSchemaRevisionsResponse; + + /** + * Decodes a ListSchemaRevisionsResponse message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ListSchemaRevisionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.ListSchemaRevisionsResponse; + + /** + * Verifies a ListSchemaRevisionsResponse message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ListSchemaRevisionsResponse message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ListSchemaRevisionsResponse + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.ListSchemaRevisionsResponse; + + /** + * Creates a plain object from a ListSchemaRevisionsResponse message. Also converts values to other types if specified. + * @param message ListSchemaRevisionsResponse + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.ListSchemaRevisionsResponse, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ListSchemaRevisionsResponse to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ListSchemaRevisionsResponse + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a CommitSchemaRequest. */ + interface ICommitSchemaRequest { + + /** CommitSchemaRequest name */ + name?: (string|null); + + /** CommitSchemaRequest schema */ + schema?: (google.pubsub.v1.ISchema|null); + } + + /** Represents a CommitSchemaRequest. */ + class CommitSchemaRequest implements ICommitSchemaRequest { + + /** + * Constructs a new CommitSchemaRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ICommitSchemaRequest); + + /** CommitSchemaRequest name. */ + public name: string; + + /** CommitSchemaRequest schema. */ + public schema?: (google.pubsub.v1.ISchema|null); + + /** + * Creates a new CommitSchemaRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns CommitSchemaRequest instance + */ + public static create(properties?: google.pubsub.v1.ICommitSchemaRequest): google.pubsub.v1.CommitSchemaRequest; + + /** + * Encodes the specified CommitSchemaRequest message. Does not implicitly {@link google.pubsub.v1.CommitSchemaRequest.verify|verify} messages. + * @param message CommitSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ICommitSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CommitSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CommitSchemaRequest.verify|verify} messages. + * @param message CommitSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ICommitSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CommitSchemaRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CommitSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CommitSchemaRequest; + + /** + * Decodes a CommitSchemaRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CommitSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CommitSchemaRequest; + + /** + * Verifies a CommitSchemaRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CommitSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CommitSchemaRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CommitSchemaRequest; + + /** + * Creates a plain object from a CommitSchemaRequest message. Also converts values to other types if specified. + * @param message CommitSchemaRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.CommitSchemaRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CommitSchemaRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CommitSchemaRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a RollbackSchemaRequest. */ + interface IRollbackSchemaRequest { + + /** RollbackSchemaRequest name */ + name?: (string|null); + + /** RollbackSchemaRequest revisionId */ + revisionId?: (string|null); + } + + /** Represents a RollbackSchemaRequest. */ + class RollbackSchemaRequest implements IRollbackSchemaRequest { + + /** + * Constructs a new RollbackSchemaRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IRollbackSchemaRequest); + + /** RollbackSchemaRequest name. */ + public name: string; + + /** RollbackSchemaRequest revisionId. */ + public revisionId: string; + + /** + * Creates a new RollbackSchemaRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns RollbackSchemaRequest instance + */ + public static create(properties?: google.pubsub.v1.IRollbackSchemaRequest): google.pubsub.v1.RollbackSchemaRequest; + + /** + * Encodes the specified RollbackSchemaRequest message. Does not implicitly {@link google.pubsub.v1.RollbackSchemaRequest.verify|verify} messages. + * @param message RollbackSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IRollbackSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified RollbackSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.RollbackSchemaRequest.verify|verify} messages. + * @param message RollbackSchemaRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IRollbackSchemaRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a RollbackSchemaRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns RollbackSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.RollbackSchemaRequest; + + /** + * Decodes a RollbackSchemaRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns RollbackSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.RollbackSchemaRequest; + + /** + * Verifies a RollbackSchemaRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a RollbackSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns RollbackSchemaRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.RollbackSchemaRequest; + + /** + * Creates a plain object from a RollbackSchemaRequest message. Also converts values to other types if specified. + * @param message RollbackSchemaRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.RollbackSchemaRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this RollbackSchemaRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for RollbackSchemaRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a DeleteSchemaRevisionRequest. */ + interface IDeleteSchemaRevisionRequest { + + /** DeleteSchemaRevisionRequest name */ + name?: (string|null); + + /** DeleteSchemaRevisionRequest revisionId */ + revisionId?: (string|null); + } + + /** Represents a DeleteSchemaRevisionRequest. */ + class DeleteSchemaRevisionRequest implements IDeleteSchemaRevisionRequest { + + /** + * Constructs a new DeleteSchemaRevisionRequest. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IDeleteSchemaRevisionRequest); + + /** DeleteSchemaRevisionRequest name. */ + public name: string; + + /** DeleteSchemaRevisionRequest revisionId. */ + public revisionId: string; + + /** + * Creates a new DeleteSchemaRevisionRequest instance using the specified properties. + * @param [properties] Properties to set + * @returns DeleteSchemaRevisionRequest instance + */ + public static create(properties?: google.pubsub.v1.IDeleteSchemaRevisionRequest): google.pubsub.v1.DeleteSchemaRevisionRequest; + + /** + * Encodes the specified DeleteSchemaRevisionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSchemaRevisionRequest.verify|verify} messages. + * @param message DeleteSchemaRevisionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IDeleteSchemaRevisionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DeleteSchemaRevisionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSchemaRevisionRequest.verify|verify} messages. + * @param message DeleteSchemaRevisionRequest message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IDeleteSchemaRevisionRequest, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DeleteSchemaRevisionRequest message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DeleteSchemaRevisionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.DeleteSchemaRevisionRequest; + + /** + * Decodes a DeleteSchemaRevisionRequest message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DeleteSchemaRevisionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.DeleteSchemaRevisionRequest; + + /** + * Verifies a DeleteSchemaRevisionRequest message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DeleteSchemaRevisionRequest message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DeleteSchemaRevisionRequest + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.DeleteSchemaRevisionRequest; + + /** + * Creates a plain object from a DeleteSchemaRevisionRequest message. Also converts values to other types if specified. + * @param message DeleteSchemaRevisionRequest + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.DeleteSchemaRevisionRequest, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DeleteSchemaRevisionRequest to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DeleteSchemaRevisionRequest + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + /** Properties of a DeleteSchemaRequest. */ interface IDeleteSchemaRequest { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index f8f80dba5e1..fc79a05642b 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.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. @@ -616,6 +616,8 @@ * @interface ISchemaSettings * @property {string|null} [schema] SchemaSettings schema * @property {google.pubsub.v1.Encoding|null} [encoding] SchemaSettings encoding + * @property {string|null} [firstRevisionId] SchemaSettings firstRevisionId + * @property {string|null} [lastRevisionId] SchemaSettings lastRevisionId */ /** @@ -649,6 +651,22 @@ */ SchemaSettings.prototype.encoding = 0; + /** + * SchemaSettings firstRevisionId. + * @member {string} firstRevisionId + * @memberof google.pubsub.v1.SchemaSettings + * @instance + */ + SchemaSettings.prototype.firstRevisionId = ""; + + /** + * SchemaSettings lastRevisionId. + * @member {string} lastRevisionId + * @memberof google.pubsub.v1.SchemaSettings + * @instance + */ + SchemaSettings.prototype.lastRevisionId = ""; + /** * Creates a new SchemaSettings instance using the specified properties. * @function create @@ -677,6 +695,10 @@ writer.uint32(/* id 1, wireType 2 =*/10).string(message.schema); if (message.encoding != null && Object.hasOwnProperty.call(message, "encoding")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.encoding); + if (message.firstRevisionId != null && Object.hasOwnProperty.call(message, "firstRevisionId")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.firstRevisionId); + if (message.lastRevisionId != null && Object.hasOwnProperty.call(message, "lastRevisionId")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.lastRevisionId); return writer; }; @@ -719,6 +741,14 @@ message.encoding = reader.int32(); break; } + case 3: { + message.firstRevisionId = reader.string(); + break; + } + case 4: { + message.lastRevisionId = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -766,6 +796,12 @@ case 2: break; } + if (message.firstRevisionId != null && message.hasOwnProperty("firstRevisionId")) + if (!$util.isString(message.firstRevisionId)) + return "firstRevisionId: string expected"; + if (message.lastRevisionId != null && message.hasOwnProperty("lastRevisionId")) + if (!$util.isString(message.lastRevisionId)) + return "lastRevisionId: string expected"; return null; }; @@ -803,6 +839,10 @@ message.encoding = 2; break; } + if (object.firstRevisionId != null) + message.firstRevisionId = String(object.firstRevisionId); + if (object.lastRevisionId != null) + message.lastRevisionId = String(object.lastRevisionId); return message; }; @@ -822,11 +862,17 @@ if (options.defaults) { object.schema = ""; object.encoding = options.enums === String ? "ENCODING_UNSPECIFIED" : 0; + object.firstRevisionId = ""; + object.lastRevisionId = ""; } if (message.schema != null && message.hasOwnProperty("schema")) object.schema = message.schema; if (message.encoding != null && message.hasOwnProperty("encoding")) object.encoding = options.enums === String ? $root.google.pubsub.v1.Encoding[message.encoding] === undefined ? message.encoding : $root.google.pubsub.v1.Encoding[message.encoding] : message.encoding; + if (message.firstRevisionId != null && message.hasOwnProperty("firstRevisionId")) + object.firstRevisionId = message.firstRevisionId; + if (message.lastRevisionId != null && message.hasOwnProperty("lastRevisionId")) + object.lastRevisionId = message.lastRevisionId; return object; }; @@ -13859,6 +13905,138 @@ * @variation 2 */ + /** + * Callback as used by {@link google.pubsub.v1.SchemaService|listSchemaRevisions}. + * @memberof google.pubsub.v1.SchemaService + * @typedef ListSchemaRevisionsCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.ListSchemaRevisionsResponse} [response] ListSchemaRevisionsResponse + */ + + /** + * Calls ListSchemaRevisions. + * @function listSchemaRevisions + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IListSchemaRevisionsRequest} request ListSchemaRevisionsRequest message or plain object + * @param {google.pubsub.v1.SchemaService.ListSchemaRevisionsCallback} callback Node-style callback called with the error, if any, and ListSchemaRevisionsResponse + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.listSchemaRevisions = function listSchemaRevisions(request, callback) { + return this.rpcCall(listSchemaRevisions, $root.google.pubsub.v1.ListSchemaRevisionsRequest, $root.google.pubsub.v1.ListSchemaRevisionsResponse, request, callback); + }, "name", { value: "ListSchemaRevisions" }); + + /** + * Calls ListSchemaRevisions. + * @function listSchemaRevisions + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IListSchemaRevisionsRequest} request ListSchemaRevisionsRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService|commitSchema}. + * @memberof google.pubsub.v1.SchemaService + * @typedef CommitSchemaCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Schema} [response] Schema + */ + + /** + * Calls CommitSchema. + * @function commitSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.ICommitSchemaRequest} request CommitSchemaRequest message or plain object + * @param {google.pubsub.v1.SchemaService.CommitSchemaCallback} callback Node-style callback called with the error, if any, and Schema + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.commitSchema = function commitSchema(request, callback) { + return this.rpcCall(commitSchema, $root.google.pubsub.v1.CommitSchemaRequest, $root.google.pubsub.v1.Schema, request, callback); + }, "name", { value: "CommitSchema" }); + + /** + * Calls CommitSchema. + * @function commitSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.ICommitSchemaRequest} request CommitSchemaRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService|rollbackSchema}. + * @memberof google.pubsub.v1.SchemaService + * @typedef RollbackSchemaCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Schema} [response] Schema + */ + + /** + * Calls RollbackSchema. + * @function rollbackSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IRollbackSchemaRequest} request RollbackSchemaRequest message or plain object + * @param {google.pubsub.v1.SchemaService.RollbackSchemaCallback} callback Node-style callback called with the error, if any, and Schema + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.rollbackSchema = function rollbackSchema(request, callback) { + return this.rpcCall(rollbackSchema, $root.google.pubsub.v1.RollbackSchemaRequest, $root.google.pubsub.v1.Schema, request, callback); + }, "name", { value: "RollbackSchema" }); + + /** + * Calls RollbackSchema. + * @function rollbackSchema + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IRollbackSchemaRequest} request RollbackSchemaRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + + /** + * Callback as used by {@link google.pubsub.v1.SchemaService|deleteSchemaRevision}. + * @memberof google.pubsub.v1.SchemaService + * @typedef DeleteSchemaRevisionCallback + * @type {function} + * @param {Error|null} error Error, if any + * @param {google.pubsub.v1.Schema} [response] Schema + */ + + /** + * Calls DeleteSchemaRevision. + * @function deleteSchemaRevision + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IDeleteSchemaRevisionRequest} request DeleteSchemaRevisionRequest message or plain object + * @param {google.pubsub.v1.SchemaService.DeleteSchemaRevisionCallback} callback Node-style callback called with the error, if any, and Schema + * @returns {undefined} + * @variation 1 + */ + Object.defineProperty(SchemaService.prototype.deleteSchemaRevision = function deleteSchemaRevision(request, callback) { + return this.rpcCall(deleteSchemaRevision, $root.google.pubsub.v1.DeleteSchemaRevisionRequest, $root.google.pubsub.v1.Schema, request, callback); + }, "name", { value: "DeleteSchemaRevision" }); + + /** + * Calls DeleteSchemaRevision. + * @function deleteSchemaRevision + * @memberof google.pubsub.v1.SchemaService + * @instance + * @param {google.pubsub.v1.IDeleteSchemaRevisionRequest} request DeleteSchemaRevisionRequest message or plain object + * @returns {Promise} Promise + * @variation 2 + */ + /** * Callback as used by {@link google.pubsub.v1.SchemaService|deleteSchema}. * @memberof google.pubsub.v1.SchemaService @@ -13970,6 +14148,8 @@ * @property {string|null} [name] Schema name * @property {google.pubsub.v1.Schema.Type|null} [type] Schema type * @property {string|null} [definition] Schema definition + * @property {string|null} [revisionId] Schema revisionId + * @property {google.protobuf.ITimestamp|null} [revisionCreateTime] Schema revisionCreateTime */ /** @@ -14011,6 +14191,22 @@ */ Schema.prototype.definition = ""; + /** + * Schema revisionId. + * @member {string} revisionId + * @memberof google.pubsub.v1.Schema + * @instance + */ + Schema.prototype.revisionId = ""; + + /** + * Schema revisionCreateTime. + * @member {google.protobuf.ITimestamp|null|undefined} revisionCreateTime + * @memberof google.pubsub.v1.Schema + * @instance + */ + Schema.prototype.revisionCreateTime = null; + /** * Creates a new Schema instance using the specified properties. * @function create @@ -14041,6 +14237,10 @@ writer.uint32(/* id 2, wireType 0 =*/16).int32(message.type); if (message.definition != null && Object.hasOwnProperty.call(message, "definition")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.definition); + if (message.revisionId != null && Object.hasOwnProperty.call(message, "revisionId")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.revisionId); + if (message.revisionCreateTime != null && Object.hasOwnProperty.call(message, "revisionCreateTime")) + $root.google.protobuf.Timestamp.encode(message.revisionCreateTime, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); return writer; }; @@ -14087,6 +14287,14 @@ message.definition = reader.string(); break; } + case 4: { + message.revisionId = reader.string(); + break; + } + case 6: { + message.revisionCreateTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -14137,6 +14345,14 @@ if (message.definition != null && message.hasOwnProperty("definition")) if (!$util.isString(message.definition)) return "definition: string expected"; + if (message.revisionId != null && message.hasOwnProperty("revisionId")) + if (!$util.isString(message.revisionId)) + return "revisionId: string expected"; + if (message.revisionCreateTime != null && message.hasOwnProperty("revisionCreateTime")) { + var error = $root.google.protobuf.Timestamp.verify(message.revisionCreateTime); + if (error) + return "revisionCreateTime." + error; + } return null; }; @@ -14176,6 +14392,13 @@ } if (object.definition != null) message.definition = String(object.definition); + if (object.revisionId != null) + message.revisionId = String(object.revisionId); + if (object.revisionCreateTime != null) { + if (typeof object.revisionCreateTime !== "object") + throw TypeError(".google.pubsub.v1.Schema.revisionCreateTime: object expected"); + message.revisionCreateTime = $root.google.protobuf.Timestamp.fromObject(object.revisionCreateTime); + } return message; }; @@ -14196,6 +14419,8 @@ object.name = ""; object.type = options.enums === String ? "TYPE_UNSPECIFIED" : 0; object.definition = ""; + object.revisionId = ""; + object.revisionCreateTime = null; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -14203,6 +14428,10 @@ object.type = options.enums === String ? $root.google.pubsub.v1.Schema.Type[message.type] === undefined ? message.type : $root.google.pubsub.v1.Schema.Type[message.type] : message.type; if (message.definition != null && message.hasOwnProperty("definition")) object.definition = message.definition; + if (message.revisionId != null && message.hasOwnProperty("revisionId")) + object.revisionId = message.revisionId; + if (message.revisionCreateTime != null && message.hasOwnProperty("revisionCreateTime")) + object.revisionCreateTime = $root.google.protobuf.Timestamp.toObject(message.revisionCreateTime, options); return object; }; @@ -14251,6 +14480,22 @@ return Schema; })(); + /** + * SchemaView enum. + * @name google.pubsub.v1.SchemaView + * @enum {number} + * @property {number} SCHEMA_VIEW_UNSPECIFIED=0 SCHEMA_VIEW_UNSPECIFIED value + * @property {number} BASIC=1 BASIC value + * @property {number} FULL=2 FULL value + */ + v1.SchemaView = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "SCHEMA_VIEW_UNSPECIFIED"] = 0; + values[valuesById[1] = "BASIC"] = 1; + values[valuesById[2] = "FULL"] = 2; + return values; + })(); + v1.CreateSchemaRequest = (function() { /** @@ -14506,22 +14751,6 @@ return CreateSchemaRequest; })(); - /** - * SchemaView enum. - * @name google.pubsub.v1.SchemaView - * @enum {number} - * @property {number} SCHEMA_VIEW_UNSPECIFIED=0 SCHEMA_VIEW_UNSPECIFIED value - * @property {number} BASIC=1 BASIC value - * @property {number} FULL=2 FULL value - */ - v1.SchemaView = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "SCHEMA_VIEW_UNSPECIFIED"] = 0; - values[valuesById[1] = "BASIC"] = 1; - values[valuesById[2] = "FULL"] = 2; - return values; - })(); - v1.GetSchemaRequest = (function() { /** @@ -15318,6 +15547,1237 @@ return ListSchemasResponse; })(); + v1.ListSchemaRevisionsRequest = (function() { + + /** + * Properties of a ListSchemaRevisionsRequest. + * @memberof google.pubsub.v1 + * @interface IListSchemaRevisionsRequest + * @property {string|null} [name] ListSchemaRevisionsRequest name + * @property {google.pubsub.v1.SchemaView|null} [view] ListSchemaRevisionsRequest view + * @property {number|null} [pageSize] ListSchemaRevisionsRequest pageSize + * @property {string|null} [pageToken] ListSchemaRevisionsRequest pageToken + */ + + /** + * Constructs a new ListSchemaRevisionsRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSchemaRevisionsRequest. + * @implements IListSchemaRevisionsRequest + * @constructor + * @param {google.pubsub.v1.IListSchemaRevisionsRequest=} [properties] Properties to set + */ + function ListSchemaRevisionsRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListSchemaRevisionsRequest name. + * @member {string} name + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @instance + */ + ListSchemaRevisionsRequest.prototype.name = ""; + + /** + * ListSchemaRevisionsRequest view. + * @member {google.pubsub.v1.SchemaView} view + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @instance + */ + ListSchemaRevisionsRequest.prototype.view = 0; + + /** + * ListSchemaRevisionsRequest pageSize. + * @member {number} pageSize + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @instance + */ + ListSchemaRevisionsRequest.prototype.pageSize = 0; + + /** + * ListSchemaRevisionsRequest pageToken. + * @member {string} pageToken + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @instance + */ + ListSchemaRevisionsRequest.prototype.pageToken = ""; + + /** + * Creates a new ListSchemaRevisionsRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {google.pubsub.v1.IListSchemaRevisionsRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSchemaRevisionsRequest} ListSchemaRevisionsRequest instance + */ + ListSchemaRevisionsRequest.create = function create(properties) { + return new ListSchemaRevisionsRequest(properties); + }; + + /** + * Encodes the specified ListSchemaRevisionsRequest message. Does not implicitly {@link google.pubsub.v1.ListSchemaRevisionsRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {google.pubsub.v1.IListSchemaRevisionsRequest} message ListSchemaRevisionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSchemaRevisionsRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && Object.hasOwnProperty.call(message, "name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.view != null && Object.hasOwnProperty.call(message, "view")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.view); + if (message.pageSize != null && Object.hasOwnProperty.call(message, "pageSize")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.pageSize); + if (message.pageToken != null && Object.hasOwnProperty.call(message, "pageToken")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.pageToken); + return writer; + }; + + /** + * Encodes the specified ListSchemaRevisionsRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSchemaRevisionsRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {google.pubsub.v1.IListSchemaRevisionsRequest} message ListSchemaRevisionsRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSchemaRevisionsRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListSchemaRevisionsRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSchemaRevisionsRequest} ListSchemaRevisionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSchemaRevisionsRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSchemaRevisionsRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.view = reader.int32(); + break; + } + case 3: { + message.pageSize = reader.int32(); + break; + } + case 4: { + message.pageToken = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListSchemaRevisionsRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSchemaRevisionsRequest} ListSchemaRevisionsRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSchemaRevisionsRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListSchemaRevisionsRequest message. + * @function verify + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSchemaRevisionsRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.view != null && message.hasOwnProperty("view")) + switch (message.view) { + default: + return "view: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + if (!$util.isInteger(message.pageSize)) + return "pageSize: integer expected"; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + if (!$util.isString(message.pageToken)) + return "pageToken: string expected"; + return null; + }; + + /** + * Creates a ListSchemaRevisionsRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSchemaRevisionsRequest} ListSchemaRevisionsRequest + */ + ListSchemaRevisionsRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSchemaRevisionsRequest) + return object; + var message = new $root.google.pubsub.v1.ListSchemaRevisionsRequest(); + if (object.name != null) + message.name = String(object.name); + switch (object.view) { + default: + if (typeof object.view === "number") { + message.view = object.view; + break; + } + break; + case "SCHEMA_VIEW_UNSPECIFIED": + case 0: + message.view = 0; + break; + case "BASIC": + case 1: + message.view = 1; + break; + case "FULL": + case 2: + message.view = 2; + break; + } + if (object.pageSize != null) + message.pageSize = object.pageSize | 0; + if (object.pageToken != null) + message.pageToken = String(object.pageToken); + return message; + }; + + /** + * Creates a plain object from a ListSchemaRevisionsRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {google.pubsub.v1.ListSchemaRevisionsRequest} message ListSchemaRevisionsRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSchemaRevisionsRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.view = options.enums === String ? "SCHEMA_VIEW_UNSPECIFIED" : 0; + object.pageSize = 0; + object.pageToken = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.view != null && message.hasOwnProperty("view")) + object.view = options.enums === String ? $root.google.pubsub.v1.SchemaView[message.view] === undefined ? message.view : $root.google.pubsub.v1.SchemaView[message.view] : message.view; + if (message.pageSize != null && message.hasOwnProperty("pageSize")) + object.pageSize = message.pageSize; + if (message.pageToken != null && message.hasOwnProperty("pageToken")) + object.pageToken = message.pageToken; + return object; + }; + + /** + * Converts this ListSchemaRevisionsRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @instance + * @returns {Object.} JSON object + */ + ListSchemaRevisionsRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for ListSchemaRevisionsRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.ListSchemaRevisionsRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListSchemaRevisionsRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListSchemaRevisionsRequest"; + }; + + return ListSchemaRevisionsRequest; + })(); + + v1.ListSchemaRevisionsResponse = (function() { + + /** + * Properties of a ListSchemaRevisionsResponse. + * @memberof google.pubsub.v1 + * @interface IListSchemaRevisionsResponse + * @property {Array.|null} [schemas] ListSchemaRevisionsResponse schemas + * @property {string|null} [nextPageToken] ListSchemaRevisionsResponse nextPageToken + */ + + /** + * Constructs a new ListSchemaRevisionsResponse. + * @memberof google.pubsub.v1 + * @classdesc Represents a ListSchemaRevisionsResponse. + * @implements IListSchemaRevisionsResponse + * @constructor + * @param {google.pubsub.v1.IListSchemaRevisionsResponse=} [properties] Properties to set + */ + function ListSchemaRevisionsResponse(properties) { + this.schemas = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ListSchemaRevisionsResponse schemas. + * @member {Array.} schemas + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @instance + */ + ListSchemaRevisionsResponse.prototype.schemas = $util.emptyArray; + + /** + * ListSchemaRevisionsResponse nextPageToken. + * @member {string} nextPageToken + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @instance + */ + ListSchemaRevisionsResponse.prototype.nextPageToken = ""; + + /** + * Creates a new ListSchemaRevisionsResponse instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {google.pubsub.v1.IListSchemaRevisionsResponse=} [properties] Properties to set + * @returns {google.pubsub.v1.ListSchemaRevisionsResponse} ListSchemaRevisionsResponse instance + */ + ListSchemaRevisionsResponse.create = function create(properties) { + return new ListSchemaRevisionsResponse(properties); + }; + + /** + * Encodes the specified ListSchemaRevisionsResponse message. Does not implicitly {@link google.pubsub.v1.ListSchemaRevisionsResponse.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {google.pubsub.v1.IListSchemaRevisionsResponse} message ListSchemaRevisionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSchemaRevisionsResponse.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.schemas != null && message.schemas.length) + for (var i = 0; i < message.schemas.length; ++i) + $root.google.pubsub.v1.Schema.encode(message.schemas[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.nextPageToken != null && Object.hasOwnProperty.call(message, "nextPageToken")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.nextPageToken); + return writer; + }; + + /** + * Encodes the specified ListSchemaRevisionsResponse message, length delimited. Does not implicitly {@link google.pubsub.v1.ListSchemaRevisionsResponse.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {google.pubsub.v1.IListSchemaRevisionsResponse} message ListSchemaRevisionsResponse message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ListSchemaRevisionsResponse.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ListSchemaRevisionsResponse message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.ListSchemaRevisionsResponse} ListSchemaRevisionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSchemaRevisionsResponse.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSchemaRevisionsResponse(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + if (!(message.schemas && message.schemas.length)) + message.schemas = []; + message.schemas.push($root.google.pubsub.v1.Schema.decode(reader, reader.uint32())); + break; + } + case 2: { + message.nextPageToken = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ListSchemaRevisionsResponse message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.ListSchemaRevisionsResponse} ListSchemaRevisionsResponse + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ListSchemaRevisionsResponse.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ListSchemaRevisionsResponse message. + * @function verify + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ListSchemaRevisionsResponse.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.schemas != null && message.hasOwnProperty("schemas")) { + if (!Array.isArray(message.schemas)) + return "schemas: array expected"; + for (var i = 0; i < message.schemas.length; ++i) { + var error = $root.google.pubsub.v1.Schema.verify(message.schemas[i]); + if (error) + return "schemas." + error; + } + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + if (!$util.isString(message.nextPageToken)) + return "nextPageToken: string expected"; + return null; + }; + + /** + * Creates a ListSchemaRevisionsResponse message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.ListSchemaRevisionsResponse} ListSchemaRevisionsResponse + */ + ListSchemaRevisionsResponse.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.ListSchemaRevisionsResponse) + return object; + var message = new $root.google.pubsub.v1.ListSchemaRevisionsResponse(); + if (object.schemas) { + if (!Array.isArray(object.schemas)) + throw TypeError(".google.pubsub.v1.ListSchemaRevisionsResponse.schemas: array expected"); + message.schemas = []; + for (var i = 0; i < object.schemas.length; ++i) { + if (typeof object.schemas[i] !== "object") + throw TypeError(".google.pubsub.v1.ListSchemaRevisionsResponse.schemas: object expected"); + message.schemas[i] = $root.google.pubsub.v1.Schema.fromObject(object.schemas[i]); + } + } + if (object.nextPageToken != null) + message.nextPageToken = String(object.nextPageToken); + return message; + }; + + /** + * Creates a plain object from a ListSchemaRevisionsResponse message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {google.pubsub.v1.ListSchemaRevisionsResponse} message ListSchemaRevisionsResponse + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ListSchemaRevisionsResponse.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.schemas = []; + if (options.defaults) + object.nextPageToken = ""; + if (message.schemas && message.schemas.length) { + object.schemas = []; + for (var j = 0; j < message.schemas.length; ++j) + object.schemas[j] = $root.google.pubsub.v1.Schema.toObject(message.schemas[j], options); + } + if (message.nextPageToken != null && message.hasOwnProperty("nextPageToken")) + object.nextPageToken = message.nextPageToken; + return object; + }; + + /** + * Converts this ListSchemaRevisionsResponse to JSON. + * @function toJSON + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @instance + * @returns {Object.} JSON object + */ + ListSchemaRevisionsResponse.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for ListSchemaRevisionsResponse + * @function getTypeUrl + * @memberof google.pubsub.v1.ListSchemaRevisionsResponse + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ListSchemaRevisionsResponse.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.ListSchemaRevisionsResponse"; + }; + + return ListSchemaRevisionsResponse; + })(); + + v1.CommitSchemaRequest = (function() { + + /** + * Properties of a CommitSchemaRequest. + * @memberof google.pubsub.v1 + * @interface ICommitSchemaRequest + * @property {string|null} [name] CommitSchemaRequest name + * @property {google.pubsub.v1.ISchema|null} [schema] CommitSchemaRequest schema + */ + + /** + * Constructs a new CommitSchemaRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a CommitSchemaRequest. + * @implements ICommitSchemaRequest + * @constructor + * @param {google.pubsub.v1.ICommitSchemaRequest=} [properties] Properties to set + */ + function CommitSchemaRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CommitSchemaRequest name. + * @member {string} name + * @memberof google.pubsub.v1.CommitSchemaRequest + * @instance + */ + CommitSchemaRequest.prototype.name = ""; + + /** + * CommitSchemaRequest schema. + * @member {google.pubsub.v1.ISchema|null|undefined} schema + * @memberof google.pubsub.v1.CommitSchemaRequest + * @instance + */ + CommitSchemaRequest.prototype.schema = null; + + /** + * Creates a new CommitSchemaRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {google.pubsub.v1.ICommitSchemaRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.CommitSchemaRequest} CommitSchemaRequest instance + */ + CommitSchemaRequest.create = function create(properties) { + return new CommitSchemaRequest(properties); + }; + + /** + * Encodes the specified CommitSchemaRequest message. Does not implicitly {@link google.pubsub.v1.CommitSchemaRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {google.pubsub.v1.ICommitSchemaRequest} message CommitSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CommitSchemaRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && Object.hasOwnProperty.call(message, "name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.schema != null && Object.hasOwnProperty.call(message, "schema")) + $root.google.pubsub.v1.Schema.encode(message.schema, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified CommitSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.CommitSchemaRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {google.pubsub.v1.ICommitSchemaRequest} message CommitSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CommitSchemaRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CommitSchemaRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.CommitSchemaRequest} CommitSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CommitSchemaRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CommitSchemaRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.schema = $root.google.pubsub.v1.Schema.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CommitSchemaRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.CommitSchemaRequest} CommitSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CommitSchemaRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CommitSchemaRequest message. + * @function verify + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CommitSchemaRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.schema != null && message.hasOwnProperty("schema")) { + var error = $root.google.pubsub.v1.Schema.verify(message.schema); + if (error) + return "schema." + error; + } + return null; + }; + + /** + * Creates a CommitSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.CommitSchemaRequest} CommitSchemaRequest + */ + CommitSchemaRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.CommitSchemaRequest) + return object; + var message = new $root.google.pubsub.v1.CommitSchemaRequest(); + if (object.name != null) + message.name = String(object.name); + if (object.schema != null) { + if (typeof object.schema !== "object") + throw TypeError(".google.pubsub.v1.CommitSchemaRequest.schema: object expected"); + message.schema = $root.google.pubsub.v1.Schema.fromObject(object.schema); + } + return message; + }; + + /** + * Creates a plain object from a CommitSchemaRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {google.pubsub.v1.CommitSchemaRequest} message CommitSchemaRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CommitSchemaRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.schema = null; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.schema != null && message.hasOwnProperty("schema")) + object.schema = $root.google.pubsub.v1.Schema.toObject(message.schema, options); + return object; + }; + + /** + * Converts this CommitSchemaRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.CommitSchemaRequest + * @instance + * @returns {Object.} JSON object + */ + CommitSchemaRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for CommitSchemaRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.CommitSchemaRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CommitSchemaRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.CommitSchemaRequest"; + }; + + return CommitSchemaRequest; + })(); + + v1.RollbackSchemaRequest = (function() { + + /** + * Properties of a RollbackSchemaRequest. + * @memberof google.pubsub.v1 + * @interface IRollbackSchemaRequest + * @property {string|null} [name] RollbackSchemaRequest name + * @property {string|null} [revisionId] RollbackSchemaRequest revisionId + */ + + /** + * Constructs a new RollbackSchemaRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a RollbackSchemaRequest. + * @implements IRollbackSchemaRequest + * @constructor + * @param {google.pubsub.v1.IRollbackSchemaRequest=} [properties] Properties to set + */ + function RollbackSchemaRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * RollbackSchemaRequest name. + * @member {string} name + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @instance + */ + RollbackSchemaRequest.prototype.name = ""; + + /** + * RollbackSchemaRequest revisionId. + * @member {string} revisionId + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @instance + */ + RollbackSchemaRequest.prototype.revisionId = ""; + + /** + * Creates a new RollbackSchemaRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {google.pubsub.v1.IRollbackSchemaRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.RollbackSchemaRequest} RollbackSchemaRequest instance + */ + RollbackSchemaRequest.create = function create(properties) { + return new RollbackSchemaRequest(properties); + }; + + /** + * Encodes the specified RollbackSchemaRequest message. Does not implicitly {@link google.pubsub.v1.RollbackSchemaRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {google.pubsub.v1.IRollbackSchemaRequest} message RollbackSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + RollbackSchemaRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && Object.hasOwnProperty.call(message, "name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.revisionId != null && Object.hasOwnProperty.call(message, "revisionId")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.revisionId); + return writer; + }; + + /** + * Encodes the specified RollbackSchemaRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.RollbackSchemaRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {google.pubsub.v1.IRollbackSchemaRequest} message RollbackSchemaRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + RollbackSchemaRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a RollbackSchemaRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.RollbackSchemaRequest} RollbackSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + RollbackSchemaRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.RollbackSchemaRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.revisionId = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a RollbackSchemaRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.RollbackSchemaRequest} RollbackSchemaRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + RollbackSchemaRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a RollbackSchemaRequest message. + * @function verify + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + RollbackSchemaRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.revisionId != null && message.hasOwnProperty("revisionId")) + if (!$util.isString(message.revisionId)) + return "revisionId: string expected"; + return null; + }; + + /** + * Creates a RollbackSchemaRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.RollbackSchemaRequest} RollbackSchemaRequest + */ + RollbackSchemaRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.RollbackSchemaRequest) + return object; + var message = new $root.google.pubsub.v1.RollbackSchemaRequest(); + if (object.name != null) + message.name = String(object.name); + if (object.revisionId != null) + message.revisionId = String(object.revisionId); + return message; + }; + + /** + * Creates a plain object from a RollbackSchemaRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {google.pubsub.v1.RollbackSchemaRequest} message RollbackSchemaRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + RollbackSchemaRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.revisionId = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.revisionId != null && message.hasOwnProperty("revisionId")) + object.revisionId = message.revisionId; + return object; + }; + + /** + * Converts this RollbackSchemaRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @instance + * @returns {Object.} JSON object + */ + RollbackSchemaRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for RollbackSchemaRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.RollbackSchemaRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + RollbackSchemaRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.RollbackSchemaRequest"; + }; + + return RollbackSchemaRequest; + })(); + + v1.DeleteSchemaRevisionRequest = (function() { + + /** + * Properties of a DeleteSchemaRevisionRequest. + * @memberof google.pubsub.v1 + * @interface IDeleteSchemaRevisionRequest + * @property {string|null} [name] DeleteSchemaRevisionRequest name + * @property {string|null} [revisionId] DeleteSchemaRevisionRequest revisionId + */ + + /** + * Constructs a new DeleteSchemaRevisionRequest. + * @memberof google.pubsub.v1 + * @classdesc Represents a DeleteSchemaRevisionRequest. + * @implements IDeleteSchemaRevisionRequest + * @constructor + * @param {google.pubsub.v1.IDeleteSchemaRevisionRequest=} [properties] Properties to set + */ + function DeleteSchemaRevisionRequest(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DeleteSchemaRevisionRequest name. + * @member {string} name + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @instance + */ + DeleteSchemaRevisionRequest.prototype.name = ""; + + /** + * DeleteSchemaRevisionRequest revisionId. + * @member {string} revisionId + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @instance + */ + DeleteSchemaRevisionRequest.prototype.revisionId = ""; + + /** + * Creates a new DeleteSchemaRevisionRequest instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {google.pubsub.v1.IDeleteSchemaRevisionRequest=} [properties] Properties to set + * @returns {google.pubsub.v1.DeleteSchemaRevisionRequest} DeleteSchemaRevisionRequest instance + */ + DeleteSchemaRevisionRequest.create = function create(properties) { + return new DeleteSchemaRevisionRequest(properties); + }; + + /** + * Encodes the specified DeleteSchemaRevisionRequest message. Does not implicitly {@link google.pubsub.v1.DeleteSchemaRevisionRequest.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {google.pubsub.v1.IDeleteSchemaRevisionRequest} message DeleteSchemaRevisionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSchemaRevisionRequest.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.name != null && Object.hasOwnProperty.call(message, "name")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); + if (message.revisionId != null && Object.hasOwnProperty.call(message, "revisionId")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.revisionId); + return writer; + }; + + /** + * Encodes the specified DeleteSchemaRevisionRequest message, length delimited. Does not implicitly {@link google.pubsub.v1.DeleteSchemaRevisionRequest.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {google.pubsub.v1.IDeleteSchemaRevisionRequest} message DeleteSchemaRevisionRequest message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DeleteSchemaRevisionRequest.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DeleteSchemaRevisionRequest message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.DeleteSchemaRevisionRequest} DeleteSchemaRevisionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSchemaRevisionRequest.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSchemaRevisionRequest(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.name = reader.string(); + break; + } + case 2: { + message.revisionId = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DeleteSchemaRevisionRequest message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.DeleteSchemaRevisionRequest} DeleteSchemaRevisionRequest + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DeleteSchemaRevisionRequest.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DeleteSchemaRevisionRequest message. + * @function verify + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DeleteSchemaRevisionRequest.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.name != null && message.hasOwnProperty("name")) + if (!$util.isString(message.name)) + return "name: string expected"; + if (message.revisionId != null && message.hasOwnProperty("revisionId")) + if (!$util.isString(message.revisionId)) + return "revisionId: string expected"; + return null; + }; + + /** + * Creates a DeleteSchemaRevisionRequest message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.DeleteSchemaRevisionRequest} DeleteSchemaRevisionRequest + */ + DeleteSchemaRevisionRequest.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.DeleteSchemaRevisionRequest) + return object; + var message = new $root.google.pubsub.v1.DeleteSchemaRevisionRequest(); + if (object.name != null) + message.name = String(object.name); + if (object.revisionId != null) + message.revisionId = String(object.revisionId); + return message; + }; + + /** + * Creates a plain object from a DeleteSchemaRevisionRequest message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {google.pubsub.v1.DeleteSchemaRevisionRequest} message DeleteSchemaRevisionRequest + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DeleteSchemaRevisionRequest.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.name = ""; + object.revisionId = ""; + } + if (message.name != null && message.hasOwnProperty("name")) + object.name = message.name; + if (message.revisionId != null && message.hasOwnProperty("revisionId")) + object.revisionId = message.revisionId; + return object; + }; + + /** + * Converts this DeleteSchemaRevisionRequest to JSON. + * @function toJSON + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @instance + * @returns {Object.} JSON object + */ + DeleteSchemaRevisionRequest.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for DeleteSchemaRevisionRequest + * @function getTypeUrl + * @memberof google.pubsub.v1.DeleteSchemaRevisionRequest + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DeleteSchemaRevisionRequest.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.DeleteSchemaRevisionRequest"; + }; + + return DeleteSchemaRevisionRequest; + })(); + v1.DeleteSchemaRequest = (function() { /** diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 7cac400a2fd..2d55ee337b5 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -206,6 +206,14 @@ "encoding": { "type": "Encoding", "id": 2 + }, + "firstRevisionId": { + "type": "string", + "id": 3 + }, + "lastRevisionId": { + "type": "string", + "id": 4 } } }, @@ -1499,6 +1507,82 @@ } ] }, + "ListSchemaRevisions": { + "requestType": "ListSchemaRevisionsRequest", + "responseType": "ListSchemaRevisionsResponse", + "options": { + "(google.api.http).get": "/v1/{name=projects/*/schemas/*}:listRevisions", + "(google.api.method_signature)": "name" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "get": "/v1/{name=projects/*/schemas/*}:listRevisions" + } + }, + { + "(google.api.method_signature)": "name" + } + ] + }, + "CommitSchema": { + "requestType": "CommitSchemaRequest", + "responseType": "Schema", + "options": { + "(google.api.http).post": "/v1/{name=projects/*/schemas/*}:commit", + "(google.api.http).body": "*", + "(google.api.method_signature)": "name,schema" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{name=projects/*/schemas/*}:commit", + "body": "*" + } + }, + { + "(google.api.method_signature)": "name,schema" + } + ] + }, + "RollbackSchema": { + "requestType": "RollbackSchemaRequest", + "responseType": "Schema", + "options": { + "(google.api.http).post": "/v1/{name=projects/*/schemas/*}:rollback", + "(google.api.http).body": "*", + "(google.api.method_signature)": "name,revision_id" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "post": "/v1/{name=projects/*/schemas/*}:rollback", + "body": "*" + } + }, + { + "(google.api.method_signature)": "name,revision_id" + } + ] + }, + "DeleteSchemaRevision": { + "requestType": "DeleteSchemaRevisionRequest", + "responseType": "Schema", + "options": { + "(google.api.http).delete": "/v1/{name=projects/*/schemas/*}:deleteRevision", + "(google.api.method_signature)": "name,revision_id" + }, + "parsedOptions": [ + { + "(google.api.http)": { + "delete": "/v1/{name=projects/*/schemas/*}:deleteRevision" + } + }, + { + "(google.api.method_signature)": "name,revision_id" + } + ] + }, "DeleteSchema": { "requestType": "DeleteSchemaRequest", "responseType": "google.protobuf.Empty", @@ -1575,6 +1659,20 @@ "definition": { "type": "string", "id": 3 + }, + "revisionId": { + "type": "string", + "id": 4, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + }, + "revisionCreateTime": { + "type": "google.protobuf.Timestamp", + "id": 6, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } } }, "nested": { @@ -1587,6 +1685,13 @@ } } }, + "SchemaView": { + "values": { + "SCHEMA_VIEW_UNSPECIFIED": 0, + "BASIC": 1, + "FULL": 2 + } + }, "CreateSchemaRequest": { "fields": { "parent": { @@ -1610,13 +1715,6 @@ } } }, - "SchemaView": { - "values": { - "SCHEMA_VIEW_UNSPECIFIED": 0, - "BASIC": 1, - "FULL": 2 - } - }, "GetSchemaRequest": { "fields": { "name": { @@ -1670,6 +1768,100 @@ } } }, + "ListSchemaRevisionsRequest": { + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Schema" + } + }, + "view": { + "type": "SchemaView", + "id": 2 + }, + "pageSize": { + "type": "int32", + "id": 3 + }, + "pageToken": { + "type": "string", + "id": 4 + } + } + }, + "ListSchemaRevisionsResponse": { + "fields": { + "schemas": { + "rule": "repeated", + "type": "Schema", + "id": 1 + }, + "nextPageToken": { + "type": "string", + "id": 2 + } + } + }, + "CommitSchemaRequest": { + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Schema" + } + }, + "schema": { + "type": "Schema", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "RollbackSchemaRequest": { + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Schema" + } + }, + "revisionId": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "DeleteSchemaRevisionRequest": { + "fields": { + "name": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Schema" + } + }, + "revisionId": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, "DeleteSchemaRequest": { "fields": { "name": { diff --git a/handwritten/pubsub/src/v1/index.ts b/handwritten/pubsub/src/v1/index.ts index 0d4bf1d4575..8bcd0670632 100644 --- a/handwritten/pubsub/src/v1/index.ts +++ b/handwritten/pubsub/src/v1/index.ts @@ -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. diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 7398ca91cc9..27b0ee2436c 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -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. diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index dda22e59f90..407534903bd 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -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. @@ -208,6 +208,11 @@ export class SchemaServiceClient { 'nextPageToken', 'schemas' ), + listSchemaRevisions: new this._gaxModule.PageDescriptor( + 'pageToken', + 'nextPageToken', + 'schemas' + ), }; // Put together the default options sent with requests. @@ -263,6 +268,10 @@ export class SchemaServiceClient { 'createSchema', 'getSchema', 'listSchemas', + 'listSchemaRevisions', + 'commitSchema', + 'rollbackSchema', + 'deleteSchemaRevision', 'deleteSchema', 'validateSchema', 'validateMessage', @@ -456,8 +465,7 @@ export class SchemaServiceClient { * Format is `projects/{project}/schemas/{schema}`. * @param {google.pubsub.v1.SchemaView} request.view * The set of fields to return in the response. If not set, returns a Schema - * with `name` and `type`, but not `definition`. Set to `FULL` to retrieve all - * fields. + * with all fields filled out. Set to `BASIC` to omit the `definition`. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -532,6 +540,267 @@ export class SchemaServiceClient { this.initialize(); return this.innerApiCalls.getSchema(request, options, callback); } + /** + * Commits a new schema revision to an existing schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the schema we are revising. + * Format is `projects/{project}/schemas/{schema}`. + * @param {google.pubsub.v1.Schema} request.schema + * Required. The schema revision to commit. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + */ + commitSchema( + request?: protos.google.pubsub.v1.ICommitSchemaRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICommitSchemaRequest | undefined, + {} | undefined + ] + >; + commitSchema( + request: protos.google.pubsub.v1.ICommitSchemaRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICommitSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + commitSchema( + request: protos.google.pubsub.v1.ICommitSchemaRequest, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICommitSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + commitSchema( + request?: protos.google.pubsub.v1.ICommitSchemaRequest, + optionsOrCallback?: + | CallOptions + | Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICommitSchemaRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICommitSchemaRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICommitSchemaRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers['x-goog-request-params'] = + this._gaxModule.routingHeader.fromParams({ + name: request.name ?? '', + }); + this.initialize(); + return this.innerApiCalls.commitSchema(request, options, callback); + } + /** + * Creates a new schema revision that is a copy of the provided revision_id. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The schema being rolled back with revision id. + * @param {string} request.revisionId + * Required. The revision ID to roll back to. + * It must be a revision of the same schema. + * + * Example: c7cfa2a8 + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + */ + rollbackSchema( + request?: protos.google.pubsub.v1.IRollbackSchemaRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IRollbackSchemaRequest | undefined, + {} | undefined + ] + >; + rollbackSchema( + request: protos.google.pubsub.v1.IRollbackSchemaRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IRollbackSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + rollbackSchema( + request: protos.google.pubsub.v1.IRollbackSchemaRequest, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IRollbackSchemaRequest | null | undefined, + {} | null | undefined + > + ): void; + rollbackSchema( + request?: protos.google.pubsub.v1.IRollbackSchemaRequest, + optionsOrCallback?: + | CallOptions + | Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IRollbackSchemaRequest | null | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IRollbackSchemaRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IRollbackSchemaRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers['x-goog-request-params'] = + this._gaxModule.routingHeader.fromParams({ + name: request.name ?? '', + }); + this.initialize(); + return this.innerApiCalls.rollbackSchema(request, options, callback); + } + /** + * Deletes a specific schema revision. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the schema revision to be deleted, with a revision ID + * explicitly included. + * + * Example: projects/123/schemas/my-schema@c7cfa2a8 + * @param {string} request.revisionId + * Required. The revision ID to roll back to. + * It must be a revision of the same schema. + * + * Example: c7cfa2a8 + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * for more details and examples. + */ + deleteSchemaRevision( + request?: protos.google.pubsub.v1.IDeleteSchemaRevisionRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | undefined, + {} | undefined + ] + >; + deleteSchemaRevision( + request: protos.google.pubsub.v1.IDeleteSchemaRevisionRequest, + options: CallOptions, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | null | undefined, + {} | null | undefined + > + ): void; + deleteSchemaRevision( + request: protos.google.pubsub.v1.IDeleteSchemaRevisionRequest, + callback: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | null | undefined, + {} | null | undefined + > + ): void; + deleteSchemaRevision( + request?: protos.google.pubsub.v1.IDeleteSchemaRevisionRequest, + optionsOrCallback?: + | CallOptions + | Callback< + protos.google.pubsub.v1.ISchema, + | protos.google.pubsub.v1.IDeleteSchemaRevisionRequest + | null + | undefined, + {} | null | undefined + >, + callback?: Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | null | undefined, + {} | null | undefined + > + ): Promise< + [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | undefined, + {} | undefined + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers['x-goog-request-params'] = + this._gaxModule.routingHeader.fromParams({ + name: request.name ?? '', + }); + this.initialize(); + return this.innerApiCalls.deleteSchemaRevision(request, options, callback); + } /** * Deletes a schema. * @@ -991,6 +1260,202 @@ export class SchemaServiceClient { callSettings ) as AsyncIterable; } + /** + * Lists all schema revisions for the named schema. + * + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the schema to list revisions for. + * @param {google.pubsub.v1.SchemaView} request.view + * The set of Schema fields to return in the response. If not set, returns + * Schemas with `name` and `type`, but not `definition`. Set to `FULL` to + * retrieve all fields. + * @param {number} request.pageSize + * The maximum number of revisions to return per page. + * @param {string} request.pageToken + * The page token, received from a previous ListSchemaRevisions call. + * Provide this to retrieve the subsequent page. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Promise} - The promise which resolves to an array. + * The first element of the array is Array of [Schema]{@link google.pubsub.v1.Schema}. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed and will merge results from all the pages into this array. + * Note that it can affect your quota. + * We recommend using `listSchemaRevisionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + */ + listSchemaRevisions( + request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, + options?: CallOptions + ): Promise< + [ + protos.google.pubsub.v1.ISchema[], + protos.google.pubsub.v1.IListSchemaRevisionsRequest | null, + protos.google.pubsub.v1.IListSchemaRevisionsResponse + ] + >; + listSchemaRevisions( + request: protos.google.pubsub.v1.IListSchemaRevisionsRequest, + options: CallOptions, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSchemaRevisionsRequest, + protos.google.pubsub.v1.IListSchemaRevisionsResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + ): void; + listSchemaRevisions( + request: protos.google.pubsub.v1.IListSchemaRevisionsRequest, + callback: PaginationCallback< + protos.google.pubsub.v1.IListSchemaRevisionsRequest, + protos.google.pubsub.v1.IListSchemaRevisionsResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + ): void; + listSchemaRevisions( + request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, + optionsOrCallback?: + | CallOptions + | PaginationCallback< + protos.google.pubsub.v1.IListSchemaRevisionsRequest, + | protos.google.pubsub.v1.IListSchemaRevisionsResponse + | null + | undefined, + protos.google.pubsub.v1.ISchema + >, + callback?: PaginationCallback< + protos.google.pubsub.v1.IListSchemaRevisionsRequest, + protos.google.pubsub.v1.IListSchemaRevisionsResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + ): Promise< + [ + protos.google.pubsub.v1.ISchema[], + protos.google.pubsub.v1.IListSchemaRevisionsRequest | null, + protos.google.pubsub.v1.IListSchemaRevisionsResponse + ] + > | void { + request = request || {}; + let options: CallOptions; + if (typeof optionsOrCallback === 'function' && callback === undefined) { + callback = optionsOrCallback; + options = {}; + } else { + options = optionsOrCallback as CallOptions; + } + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers['x-goog-request-params'] = + this._gaxModule.routingHeader.fromParams({ + name: request.name ?? '', + }); + this.initialize(); + return this.innerApiCalls.listSchemaRevisions(request, options, callback); + } + + /** + * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the schema to list revisions for. + * @param {google.pubsub.v1.SchemaView} request.view + * The set of Schema fields to return in the response. If not set, returns + * Schemas with `name` and `type`, but not `definition`. Set to `FULL` to + * retrieve all fields. + * @param {number} request.pageSize + * The maximum number of revisions to return per page. + * @param {string} request.pageToken + * The page token, received from a previous ListSchemaRevisions call. + * Provide this to retrieve the subsequent page. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Stream} + * An object stream which emits an object representing [Schema]{@link google.pubsub.v1.Schema} on 'data' event. + * The client library will perform auto-pagination by default: it will call the API as many + * times as needed. Note that it can affect your quota. + * We recommend using `listSchemaRevisionsAsync()` + * method described below for async iteration which you can stop as needed. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + */ + listSchemaRevisionsStream( + request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, + options?: CallOptions + ): Transform { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers['x-goog-request-params'] = + this._gaxModule.routingHeader.fromParams({ + name: request.name ?? '', + }); + const defaultCallSettings = this._defaults['listSchemaRevisions']; + const callSettings = defaultCallSettings.merge(options); + this.initialize(); + return this.descriptors.page.listSchemaRevisions.createStream( + this.innerApiCalls.listSchemaRevisions as GaxCall, + request, + callSettings + ); + } + + /** + * Equivalent to `listSchemaRevisions`, but returns an iterable object. + * + * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand. + * @param {Object} request + * The request object that will be sent. + * @param {string} request.name + * Required. The name of the schema to list revisions for. + * @param {google.pubsub.v1.SchemaView} request.view + * The set of Schema fields to return in the response. If not set, returns + * Schemas with `name` and `type`, but not `definition`. Set to `FULL` to + * retrieve all fields. + * @param {number} request.pageSize + * The maximum number of revisions to return per page. + * @param {string} request.pageToken + * The page token, received from a previous ListSchemaRevisions call. + * Provide this to retrieve the subsequent page. + * @param {object} [options] + * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. + * @returns {Object} + * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * When you iterate the returned iterable, each element will be an object representing + * [Schema]{@link google.pubsub.v1.Schema}. The API will be called under the hood as needed, once per the page, + * so you can stop the iteration when you don't need more results. + * Please see the + * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * for more details and examples. + */ + listSchemaRevisionsAsync( + request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, + options?: CallOptions + ): AsyncIterable { + request = request || {}; + options = options || {}; + options.otherArgs = options.otherArgs || {}; + options.otherArgs.headers = options.otherArgs.headers || {}; + options.otherArgs.headers['x-goog-request-params'] = + this._gaxModule.routingHeader.fromParams({ + name: request.name ?? '', + }); + const defaultCallSettings = this._defaults['listSchemaRevisions']; + const callSettings = defaultCallSettings.merge(options); + this.initialize(); + return this.descriptors.page.listSchemaRevisions.asyncIterate( + this.innerApiCalls['listSchemaRevisions'] as GaxCall, + request as {}, + callSettings + ) as AsyncIterable; + } /** * Gets the access control policy for a resource. Returns an empty policy * if the resource exists and does not have a policy set. diff --git a/handwritten/pubsub/src/v1/schema_service_client_config.json b/handwritten/pubsub/src/v1/schema_service_client_config.json index 8928eccdf5b..05ac8a99177 100644 --- a/handwritten/pubsub/src/v1/schema_service_client_config.json +++ b/handwritten/pubsub/src/v1/schema_service_client_config.json @@ -32,6 +32,22 @@ "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, + "ListSchemaRevisions": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "CommitSchema": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "RollbackSchema": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, + "DeleteSchemaRevision": { + "retry_codes_name": "non_idempotent", + "retry_params_name": "default" + }, "DeleteSchema": { "retry_codes_name": "non_idempotent", "retry_params_name": "default" diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 8ec3ba231ae..4b007c86c42 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -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. diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index f4554a45987..8c868b8eb14 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -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. diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 6117038253e..3641e64c853 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -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. @@ -484,6 +484,397 @@ describe('v1.SchemaServiceClient', () => { }); }); + describe('commitSchema', () => { + it('invokes commitSchema without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CommitSchemaRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CommitSchemaRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.commitSchema = stubSimpleCall(expectedResponse); + const [response] = await client.commitSchema(request); + assert.deepStrictEqual(response, expectedResponse); + const actualRequest = ( + client.innerApiCalls.commitSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.commitSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes commitSchema without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CommitSchemaRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CommitSchemaRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.commitSchema = + stubSimpleCallWithCallback(expectedResponse); + const promise = new Promise((resolve, reject) => { + client.commitSchema( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISchema | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + const actualRequest = ( + client.innerApiCalls.commitSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.commitSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes commitSchema with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CommitSchemaRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CommitSchemaRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedError = new Error('expected'); + client.innerApiCalls.commitSchema = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.commitSchema(request), expectedError); + const actualRequest = ( + client.innerApiCalls.commitSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.commitSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes commitSchema with closed client', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.CommitSchemaRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.CommitSchemaRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.commitSchema(request), expectedError); + }); + }); + + describe('rollbackSchema', () => { + it('invokes rollbackSchema without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.RollbackSchemaRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.RollbackSchemaRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.rollbackSchema = stubSimpleCall(expectedResponse); + const [response] = await client.rollbackSchema(request); + assert.deepStrictEqual(response, expectedResponse); + const actualRequest = ( + client.innerApiCalls.rollbackSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.rollbackSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes rollbackSchema without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.RollbackSchemaRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.RollbackSchemaRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.rollbackSchema = + stubSimpleCallWithCallback(expectedResponse); + const promise = new Promise((resolve, reject) => { + client.rollbackSchema( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISchema | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + const actualRequest = ( + client.innerApiCalls.rollbackSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.rollbackSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes rollbackSchema with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.RollbackSchemaRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.RollbackSchemaRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedError = new Error('expected'); + client.innerApiCalls.rollbackSchema = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.rollbackSchema(request), expectedError); + const actualRequest = ( + client.innerApiCalls.rollbackSchema as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.rollbackSchema as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes rollbackSchema with closed client', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.RollbackSchemaRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.RollbackSchemaRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.rollbackSchema(request), expectedError); + }); + }); + + describe('deleteSchemaRevision', () => { + it('invokes deleteSchemaRevision without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSchemaRevisionRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSchemaRevisionRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.deleteSchemaRevision = + stubSimpleCall(expectedResponse); + const [response] = await client.deleteSchemaRevision(request); + assert.deepStrictEqual(response, expectedResponse); + const actualRequest = ( + client.innerApiCalls.deleteSchemaRevision as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSchemaRevision as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes deleteSchemaRevision without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSchemaRevisionRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSchemaRevisionRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = generateSampleMessage( + new protos.google.pubsub.v1.Schema() + ); + client.innerApiCalls.deleteSchemaRevision = + stubSimpleCallWithCallback(expectedResponse); + const promise = new Promise((resolve, reject) => { + client.deleteSchemaRevision( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISchema | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + const actualRequest = ( + client.innerApiCalls.deleteSchemaRevision as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSchemaRevision as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes deleteSchemaRevision with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSchemaRevisionRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSchemaRevisionRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedError = new Error('expected'); + client.innerApiCalls.deleteSchemaRevision = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.deleteSchemaRevision(request), expectedError); + const actualRequest = ( + client.innerApiCalls.deleteSchemaRevision as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.deleteSchemaRevision as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes deleteSchemaRevision with closed client', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.DeleteSchemaRevisionRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.DeleteSchemaRevisionRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedError = new Error('The client has already been closed.'); + client.close(); + await assert.rejects(client.deleteSchemaRevision(request), expectedError); + }); + }); + describe('deleteSchema', () => { it('invokes deleteSchema without error', async () => { const client = new schemaserviceModule.v1.SchemaServiceClient({ @@ -1172,6 +1563,302 @@ describe('v1.SchemaServiceClient', () => { ); }); }); + + describe('listSchemaRevisions', () => { + it('invokes listSchemaRevisions without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemaRevisionsRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + ]; + client.innerApiCalls.listSchemaRevisions = + stubSimpleCall(expectedResponse); + const [response] = await client.listSchemaRevisions(request); + assert.deepStrictEqual(response, expectedResponse); + const actualRequest = ( + client.innerApiCalls.listSchemaRevisions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSchemaRevisions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes listSchemaRevisions without error using callback', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemaRevisionsRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + ]; + client.innerApiCalls.listSchemaRevisions = + stubSimpleCallWithCallback(expectedResponse); + const promise = new Promise((resolve, reject) => { + client.listSchemaRevisions( + request, + ( + err?: Error | null, + result?: protos.google.pubsub.v1.ISchema[] | null + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + } + ); + }); + const response = await promise; + assert.deepStrictEqual(response, expectedResponse); + const actualRequest = ( + client.innerApiCalls.listSchemaRevisions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSchemaRevisions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes listSchemaRevisions with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemaRevisionsRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedError = new Error('expected'); + client.innerApiCalls.listSchemaRevisions = stubSimpleCall( + undefined, + expectedError + ); + await assert.rejects(client.listSchemaRevisions(request), expectedError); + const actualRequest = ( + client.innerApiCalls.listSchemaRevisions as SinonStub + ).getCall(0).args[0]; + assert.deepStrictEqual(actualRequest, request); + const actualHeaderRequestParams = ( + client.innerApiCalls.listSchemaRevisions as SinonStub + ).getCall(0).args[1].otherArgs.headers['x-goog-request-params']; + assert(actualHeaderRequestParams.includes(expectedHeaderRequestParams)); + }); + + it('invokes listSchemaRevisionsStream without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemaRevisionsRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + ]; + client.descriptors.page.listSchemaRevisions.createStream = + stubPageStreamingCall(expectedResponse); + const stream = client.listSchemaRevisionsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Schema[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Schema) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + const responses = await promise; + assert.deepStrictEqual(responses, expectedResponse); + assert( + (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listSchemaRevisions, request) + ); + assert( + (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) + ); + }); + + it('invokes listSchemaRevisionsStream with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemaRevisionsRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedError = new Error('expected'); + client.descriptors.page.listSchemaRevisions.createStream = + stubPageStreamingCall(undefined, expectedError); + const stream = client.listSchemaRevisionsStream(request); + const promise = new Promise((resolve, reject) => { + const responses: protos.google.pubsub.v1.Schema[] = []; + stream.on('data', (response: protos.google.pubsub.v1.Schema) => { + responses.push(response); + }); + stream.on('end', () => { + resolve(responses); + }); + stream.on('error', (err: Error) => { + reject(err); + }); + }); + await assert.rejects(promise, expectedError); + assert( + (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) + .getCall(0) + .calledWith(client.innerApiCalls.listSchemaRevisions, request) + ); + assert( + (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) + ); + }); + + it('uses async iteration with listSchemaRevisions without error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemaRevisionsRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedResponse = [ + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + generateSampleMessage(new protos.google.pubsub.v1.Schema()), + ]; + client.descriptors.page.listSchemaRevisions.asyncIterate = + stubAsyncIterationCall(expectedResponse); + const responses: protos.google.pubsub.v1.ISchema[] = []; + const iterable = client.listSchemaRevisionsAsync(request); + for await (const resource of iterable) { + responses.push(resource!); + } + assert.deepStrictEqual(responses, expectedResponse); + assert.deepStrictEqual( + ( + client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub + ).getCall(0).args[1], + request + ); + assert( + (client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) + ); + }); + + it('uses async iteration with listSchemaRevisions with error', async () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + credentials: {client_email: 'bogus', private_key: 'bogus'}, + projectId: 'bogus', + }); + client.initialize(); + const request = generateSampleMessage( + new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + ); + const defaultValue1 = getTypeDefaultValue( + '.google.pubsub.v1.ListSchemaRevisionsRequest', + ['name'] + ); + request.name = defaultValue1; + const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedError = new Error('expected'); + client.descriptors.page.listSchemaRevisions.asyncIterate = + stubAsyncIterationCall(undefined, expectedError); + const iterable = client.listSchemaRevisionsAsync(request); + await assert.rejects(async () => { + const responses: protos.google.pubsub.v1.ISchema[] = []; + for await (const resource of iterable) { + responses.push(resource!); + } + }); + assert.deepStrictEqual( + ( + client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub + ).getCall(0).args[1], + request + ); + assert( + (client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub) + .getCall(0) + .args[2].otherArgs.headers['x-goog-request-params'].includes( + expectedHeaderRequestParams + ) + ); + }); + }); describe('getIamPolicy', () => { it('invokes getIamPolicy without error', async () => { const client = new schemaserviceModule.v1.SchemaServiceClient({ diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 1fae039398e..71909289944 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -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. From 4bb6142a006c9dc8f077dbecdbd978b27dc25f9a Mon Sep 17 00:00:00 2001 From: Gary Mathews Date: Mon, 23 Jan 2023 12:52:52 -0800 Subject: [PATCH 0902/1115] fix: remove redundant .then() (#1671) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/subscriber.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 2011aad63f6..9ee2e29f6fc 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -526,10 +526,9 @@ export class Subscriber extends EventEmitter { const ackTimeSeconds = (Date.now() - message.received) / 1000; this.updateAckDeadline(ackTimeSeconds); - // Ignore this in this version of the method (but hook then/catch + // Ignore this in this version of the method (but hook catch // to avoid unhandled exceptions). const resultPromise = this._acks.add(message); - resultPromise.then(() => {}); resultPromise.catch(() => {}); await this._acks.onFlush(); @@ -606,7 +605,6 @@ export class Subscriber extends EventEmitter { const startTime = Date.now(); const responsePromise = this._modAcks.add(message, deadline); - responsePromise.then(() => {}); responsePromise.catch(() => {}); await this._modAcks.onFlush(); From 1e3bcef4a1c7a9eda63a2d2a1e7169a8ac0d7aa0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 16:16:39 -0500 Subject: [PATCH 0903/1115] chore(main): release 3.3.0 (#1673) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index dd8b58b9843..28e32c08855 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [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) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7f091f2dd46..316e9384a4a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.2.1", + "version": "3.3.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From fb6d530f2a16098aa2cd28630fadf130e0a8b695 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 16 Feb 2023 15:42:28 -0500 Subject: [PATCH 0904/1115] docs: update Cloud API reference location (#1684) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: update Cloud API reference location * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: update system test package.json to modern defaults --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.readme-partials.yml | 2 +- handwritten/pubsub/README.md | 2 +- handwritten/pubsub/system-test/fixtures/sample/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.readme-partials.yml b/handwritten/pubsub/.readme-partials.yml index f0879bed5b0..9f3488ec984 100644 --- a/handwritten/pubsub/.readme-partials.yml +++ b/handwritten/pubsub/.readme-partials.yml @@ -2,7 +2,7 @@ introduction: |- [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. - This document contains links to an [API reference](https://googleapis.dev/nodejs/pubsub/latest/index.html#reference), samples, + This document contains links to an [API reference](https://cloud.google.com/nodejs/docs/reference/pubsub/latest/overview), samples, and other resources useful to developing Node.js applications. For additional help developing Pub/Sub applications, in Node.js and other languages, see our [Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index a1821be3861..fc893e079c1 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -13,7 +13,7 @@ [Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. -This document contains links to an [API reference](https://googleapis.dev/nodejs/pubsub/latest/index.html#reference), samples, +This document contains links to an [API reference](https://cloud.google.com/nodejs/docs/reference/pubsub/latest/overview), samples, and other resources useful to developing Node.js applications. For additional help developing Pub/Sub applications, in Node.js and other languages, see our [Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index 4958f88b912..f32bff37dee 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@types/node": "^18.0.0", - "typescript": "^3.0.0", - "gts": "^2.0.0" + "typescript": "^4.6.4", + "gts": "^3.1.0" } } From 95fc7ee8e73e157ed162b05f5dfec063dcf71aae Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 17 Feb 2023 16:06:20 -0500 Subject: [PATCH 0905/1115] samples: add more TS samples (#1666) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * samples: work in progress on sample conversion to TS * chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport (#1663) * chore: Enable requesting numeric enums in "transport=rest" responses for services supporting this (Java, Go, Python, PHP, TypeScript, C#, and Ruby), even if they do not yet turn on REST transport chore: disallow "transport=rest" for services where numeric enums are not confirmed to be supported (except in PHP and Java) PiperOrigin-RevId: 493113566 Source-Link: https://github.com/googleapis/googleapis/commit/758f0d1217d9c7fe398aa5efb1057ce4b6409e55 Source-Link: https://github.com/googleapis/googleapis-gen/commit/78bd8f05e1276363eb14eae70e91fe4bc20703ab Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzhiZDhmMDVlMTI3NjM2M2ViMTRlYWU3MGU5MWZlNGJjMjA3MDNhYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> * build: use typeless bot 1.2.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: also run fix before README generation * samples: add missing validateSchema.ts, and fix copyright dates in setTopicPolicy * build: use hermetic version of gts for owlbot * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * samples: update copyright * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * samples: manually update validateSchema since it's not technically sample snippet * chore: update typeless bot version * chore: linting updates * samples: update module export method for resumePublish.ts * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 3 ++- handwritten/pubsub/owlbot.py | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index fc893e079c1..a475d792c4a 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -96,7 +96,7 @@ async function quickstart( }); // Send a message to the topic - topic.publish(Buffer.from('Test message!')); + topic.publishMessage({data: Buffer.from('Test message!')}); } ``` @@ -174,6 +174,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | | Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | | Update Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateDeadLetterPolicy.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/updateDeadLetterPolicy.js,samples/README.md) | +| Validate a schema definition | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/validateSchema.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/validateSchema.js,samples/README.md) | diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index c0dc44db3b0..5e65c6ad70a 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -17,19 +17,31 @@ # 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"]) +logger.debug("Update typeless sample bot [1.3.0]") +shell.run(["npm", "i", "@google-cloud/typeless-sample-bot@1.3.0"]) os.chdir(old_path) -""" node.typeless_samples_hermetic() +# We need to run this before the main owlbot processing, to make +# sure quickstart.js gets gts fixed before the README is generated. +# This needs to be worked out more properly, this is temporary. +logger.debug("Copy eslint config") +shell.run( + ["cp", "-r", f"/synthtool/node_modules", "."], + check=True, +) +logger.debug("Running fix...") +shell.run( + [f"/synthtool/node_modules/.bin/gts", "fix"], + check=False, +) + node.owlbot_main(templates_excludes=[ 'src/index.ts', '.github/PULL_REQUEST_TEMPLATE.md', From ac2ffcceb235d57881b21656a5e3e3238aac8d81 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 21:32:13 +0000 Subject: [PATCH 0906/1115] feat: Make INTERNAL a retryable error for Pull (#1681) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 510255779 Source-Link: https://togithub.com/googleapis/googleapis/commit/58e4422ffda317bbbb03e30bb4620afa8ad1c7d6 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/d67c1eb9f045f342a1dbad6666af3c1331eae615 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDY3YzFlYjlmMDQ1ZjM0MmExZGJhZDY2NjZhZjNjMTMzMWVhZTYxNSJ9 BEGIN_NESTED_COMMIT feat: Add temporary_failed_ack_ids to ModifyAckDeadlineConfirmation PiperOrigin-RevId: 510255074 Source-Link: https://togithub.com/googleapis/googleapis/commit/7427d37520b0f9ccdcd1a5a83288cdeea43cf826 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/c7d5aacbca6a81c35930abf219536447d0e58702 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzdkNWFhY2JjYTZhODFjMzU5MzBhYmYyMTk1MzY0NDdkMGU1ODcwMiJ9 END_NESTED_COMMIT BEGIN_NESTED_COMMIT docs: Clarify BigQueryConfig PERMISSION_DENIED state PiperOrigin-RevId: 509847316 Source-Link: https://togithub.com/googleapis/googleapis/commit/d753d6386b031aa031b53d7bb1c23a23a78ee615 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/da4e7fe0044b303303ef4c8e46efaf0fcc98e8bf Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGE0ZTdmZTAwNDRiMzAzMzAzZWY0YzhlNDZlZmFmMGZjYzk4ZThiZiJ9 END_NESTED_COMMITBEGIN_NESTED_COMMITdocs: Clarify subscription description PiperOrigin-RevId: 509847159 Source-Link: https://togithub.com/googleapis/googleapis/commit/2a1543a1c0e72f03a95a4be9f32e30fc4cedf879 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/a4996434dc7ede3eb40ee6098130520e7d8049a9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTQ5OTY0MzRkYzdlZGUzZWI0MGVlNjA5ODEzMDUyMGU3ZDgwNDlhOSJ9 END_NESTED_COMMITBEGIN_NESTED_COMMITdocs: Replacing HTML code with Markdown docs: Fix PullResponse description docs: Fix Pull description PiperOrigin-RevId: 509846267 Source-Link: https://togithub.com/googleapis/googleapis/commit/bb626b17c39848285f7f69ed978c843a900cee56 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/34c8b57847276f7d67ced245b56075b9cde86094 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzRjOGI1Nzg0NzI3NmY3ZDY3Y2VkMjQ1YjU2MDc1YjljZGU4NjA5NCJ9 END_NESTED_COMMITBEGIN_NESTED_COMMITdocs: Update Pub/Sub topic retention limit from 7 days to 31 days PiperOrigin-RevId: 509846179 Source-Link: https://togithub.com/googleapis/googleapis/commit/19473b44ae71bd853e30cfdc6cf0adb3818bc9c9 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/db895f1453c272f599f219dcacdd4f08c3f3bb6c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGI4OTVmMTQ1M2MyNzJmNTk5ZjIxOWRjYWNkZDRmMDhjM2YzYmI2YyJ9 END_NESTED_COMMITBEGIN_NESTED_COMMITfeat: Add google.api.method.signature to update methods PiperOrigin-RevId: 509649352 Source-Link: https://togithub.com/googleapis/googleapis/commit/1870ba2163526fa9fba63bf899c92707476d4603 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/515dcdfdd27ff00c30e555bdf17b7743e21457e9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTE1ZGNkZmRkMjdmZjAwYzMwZTU1NWJkZjE3Yjc3NDNlMjE0NTdlOSJ9 END_NESTED_COMMITBEGIN_NESTED_COMMITdocs: changing format of the jsdoc links PiperOrigin-RevId: 509352615 Source-Link: https://togithub.com/googleapis/googleapis/commit/b737d30dae27222d86fa340ecb99292df4585762 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/8efadf3d58780ea1c550268d46a3dc701ba37fcf Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGVmYWRmM2Q1ODc4MGVhMWM1NTAyNjhkNDZhM2RjNzAxYmEzN2ZjZiJ9 END_NESTED_COMMITBEGIN_NESTED_COMMITdocs: Mark revision_id in CommitSchemaRevisionRequest deprecated PiperOrigin-RevId: 508076213 Source-Link: https://togithub.com/googleapis/googleapis/commit/3b9ae88062e8f0f6603cc8bcba945197cc60d314 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/d5e26492de9100eb2cf686ea7bccf2498b6600d4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDVlMjY0OTJkZTkxMDBlYjJjZjY4NmVhN2JjY2YyNDk4YjY2MDBkNCJ9 END_NESTED_COMMITBEGIN_NESTED_COMMITchore(gitignore): only ignore folders in the top level PiperOrigin-RevId: 507603203 Source-Link: https://togithub.com/googleapis/googleapis/commit/a4f2de456480c0a4ed9feeeaa1f8ee620bbef23a Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/dcf882154e7c710ecf2a1abc77b35c95f9062371 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGNmODgyMTU0ZTdjNzEwZWNmMmExYWJjNzdiMzVjOTVmOTA2MjM3MSJ9 END_NESTED_COMMITBEGIN_NESTED_COMMITchore: update .gitignore to always include protos folder Use gapic-generator-typescript v3.0.0. PiperOrigin-RevId: 507004755 Source-Link: https://togithub.com/googleapis/googleapis/commit/d784f3c1043616fc0646e9ce7afa1b9161cc02de Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/5e64ba8615f65fdedb1fcd6ac792e5ea621027e4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWU2NGJhODYxNWY2NWZkZWRiMWZjZDZhYzc5MmU1ZWE2MjEwMjdlNCJ9 END_NESTED_COMMIT --- handwritten/pubsub/.gitignore | 12 +- .../protos/google/pubsub/v1/pubsub.proto | 75 ++++++------ .../protos/google/pubsub/v1/schema.proto | 12 +- handwritten/pubsub/protos/protos.d.ts | 12 ++ handwritten/pubsub/protos/protos.js | 78 +++++++++++++ handwritten/pubsub/protos/protos.json | 37 ++++-- handwritten/pubsub/src/v1/publisher_client.ts | 40 +++---- .../pubsub/src/v1/schema_service_client.ts | 59 +++++----- .../pubsub/src/v1/subscriber_client.ts | 107 ++++++++---------- .../src/v1/subscriber_client_config.json | 8 +- 10 files changed, 277 insertions(+), 163 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 5d32b23782f..d4f03a0df2e 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -1,11 +1,11 @@ **/*.log **/node_modules -.coverage -coverage -.nyc_output -docs/ -out/ -build/ +/.coverage +/coverage +/.nyc_output +/docs/ +/out/ +/build/ system-test/secrets.js system-test/*key.json *.lock diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 661633b6102..61656056cc7 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -60,6 +60,7 @@ service Publisher { patch: "/v1/{topic.name=projects/*/topics/*}" body: "*" }; + option (google.api.method_signature) = "topic,update_mask"; } // Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic @@ -214,7 +215,7 @@ message Topic { // timestamp](https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) // that is up to `message_retention_duration` in the past. If this field is // not set, message retention is controlled by settings on individual - // subscriptions. Cannot be more than 7 days or less than 10 minutes. + // subscriptions. Cannot be more than 31 days or less than 10 minutes. google.protobuf.Duration message_retention_duration = 8; } @@ -461,6 +462,7 @@ service Subscriber { patch: "/v1/{subscription.name=projects/*/subscriptions/*}" body: "*" }; + option (google.api.method_signature) = "subscription,update_mask"; } // Lists matching subscriptions. @@ -515,9 +517,7 @@ service Subscriber { option (google.api.method_signature) = "subscription,ack_ids"; } - // Pulls messages from the server. The server may return `UNAVAILABLE` if - // there are too many concurrent pull requests pending for the given - // subscription. + // Pulls messages from the server. rpc Pull(PullRequest) returns (PullResponse) { option (google.api.http) = { post: "/v1/{subscription=projects/*/subscriptions/*}:pull" @@ -554,10 +554,10 @@ service Subscriber { } // Gets the configuration details of a snapshot. Snapshots are used in - // Seek - // operations, which allow you to manage message acknowledgments in bulk. That - // is, you can set the acknowledgment state of messages in an existing - // subscription to the state captured by a snapshot. + // [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, + // which allow you to manage message acknowledgments in bulk. That is, you can + // set the acknowledgment state of messages in an existing subscription to the + // state captured by a snapshot. rpc GetSnapshot(GetSnapshotRequest) returns (Snapshot) { option (google.api.http) = { get: "/v1/{snapshot=projects/*/snapshots/*}" @@ -602,16 +602,16 @@ service Subscriber { } // Updates an existing snapshot. Snapshots are used in - // Seek - // operations, which allow - // you to manage message acknowledgments in bulk. That is, you can set the - // acknowledgment state of messages in an existing subscription to the state - // captured by a snapshot. + // [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, + // which allow you to manage message acknowledgments in bulk. That is, you can + // set the acknowledgment state of messages in an existing subscription to the + // state captured by a snapshot. rpc UpdateSnapshot(UpdateSnapshotRequest) returns (Snapshot) { option (google.api.http) = { patch: "/v1/{snapshot.name=projects/*/snapshots/*}" body: "*" }; + option (google.api.method_signature) = "snapshot,update_mask"; } // Removes an existing snapshot. Snapshots are used in [Seek] @@ -645,7 +645,9 @@ service Subscriber { } } -// A subscription resource. +// A subscription resource. If none of `push_config` or `bigquery_config` is +// set, then the subscriber will pull and ack messages using API methods. At +// most one of these fields may be set. message Subscription { option (google.api.resource) = { type: "pubsub.googleapis.com/Subscription" @@ -683,21 +685,17 @@ message Subscription { ]; // If push delivery is used with this subscription, this field is - // used to configure it. Either `pushConfig` or `bigQueryConfig` can be set, - // but not both. If both are empty, then the subscriber will pull and ack - // messages using API methods. + // used to configure it. PushConfig push_config = 4; // If delivery to BigQuery is used with this subscription, this field is - // used to configure it. Either `pushConfig` or `bigQueryConfig` can be set, - // but not both. If both are empty, then the subscriber will pull and ack - // messages using API methods. + // used to configure it. BigQueryConfig bigquery_config = 18; // The approximate amount of time (on a best-effort basis) Pub/Sub waits for // the subscriber to acknowledge receipt before resending the message. In the // interval after the message is delivered and before it is acknowledged, it - // is considered to be outstanding. During that time period, the + // is considered to be _outstanding_. During that time period, the // message will not be redelivered (on a best-effort basis). // // For pull subscriptions, this value is used as the initial value for the ack @@ -732,8 +730,8 @@ message Subscription { // minutes. google.protobuf.Duration message_retention_duration = 8; - // See Creating and - // managing labels. + // See [Creating and managing + // labels](https://cloud.google.com/pubsub/docs/labels). map labels = 9; // If true, messages published with the same `ordering_key` in `PubsubMessage` @@ -922,7 +920,7 @@ message PushConfig { // * `v1` or `v1beta2`: uses the push format defined in the v1 Pub/Sub API. // // For example: - // 
attributes { "x-goog-version": "v1" }
+ // `attributes { "x-goog-version": "v1" }` map attributes = 2; // An authentication method used by push endpoints to verify the source of @@ -948,6 +946,11 @@ message BigQueryConfig { ACTIVE = 1; // Cannot write to the BigQuery table because of permission denied errors. + // This can happen if + // - Pub/Sub SA has not been granted the [appropriate BigQuery IAM + // permissions](https://cloud.google.com/pubsub/docs/create-subscription#assign_bigquery_service_account) + // - bigquery.googleapis.com API is not enabled for the project + // ([instructions](https://cloud.google.com/service-usage/docs/enable-disable)) PERMISSION_DENIED = 2; // Cannot write to the BigQuery table because it does not exist. @@ -958,7 +961,7 @@ message BigQueryConfig { } // The name of the table to which to write data, of the form - // {projectId}:{datasetId}.{tableId} + // {projectId}.{datasetId}.{tableId} string table = 1; // When true, use the topic's schema as the columns to write to in BigQuery, @@ -1127,7 +1130,8 @@ message PullRequest { // Response for the `Pull` method. message PullResponse { // Received Pub/Sub messages. The list will be empty if there are no more - // messages available in the backlog. For JSON, the response can be entirely + // messages available in the backlog, or if no messages could be returned + // before the request timeout. For JSON, the response can be entirely // empty. The Pub/Sub system may return fewer than the `maxMessages` requested // even if there are more messages available in the backlog. repeated ReceivedMessage received_messages = 1; @@ -1270,6 +1274,9 @@ message StreamingPullResponse { // List of acknowledgement IDs that were out of order. repeated string unordered_ack_ids = 3; + + // List of acknowledgement IDs that failed processing with temporary issues. + repeated string temporary_failed_ack_ids = 4; } // Acknowledgement IDs sent in one or more previous requests to modify the @@ -1281,12 +1288,16 @@ message StreamingPullResponse { // List of acknowledgement IDs that were malformed or whose acknowledgement // deadline has expired. repeated string invalid_ack_ids = 2; + + // List of acknowledgement IDs that failed processing with temporary issues. + repeated string temporary_failed_ack_ids = 3; } // Subscription properties sent as part of the response. message SubscriptionProperties { // True iff exactly once delivery is enabled for this subscription. bool exactly_once_delivery_enabled = 1; + // True iff message ordering is enabled for this subscription. bool message_ordering_enabled = 2; } @@ -1294,8 +1305,6 @@ message StreamingPullResponse { // Received Pub/Sub messages. This will not be empty. repeated ReceivedMessage received_messages = 1; - reserved 2; - // This field will only be set if `enable_exactly_once_delivery` is set to // `true`. AcknowledgeConfirmation acknowledge_confirmation = 5; @@ -1313,9 +1322,9 @@ message CreateSnapshotRequest { // Required. User-provided name for this snapshot. If the name is not provided // in the request, the server will assign a random name for this snapshot on // the same project as the subscription. Note that for REST API requests, you - // must specify a name. See the resource - // name rules. Format is `projects/{project}/snapshots/{snap}`. + // must specify a name. See the [resource name + // rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format + // is `projects/{project}/snapshots/{snap}`. string name = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { type: "pubsub.googleapis.com/Snapshot" } @@ -1337,8 +1346,8 @@ message CreateSnapshotRequest { } ]; - // See Creating and - // managing labels. + // See [Creating and managing + // labels](https://cloud.google.com/pubsub/docs/labels). map labels = 3; } diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index 1b1483b875b..8c674df1391 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -320,17 +320,17 @@ message DeleteSchemaRevisionRequest { // Required. The name of the schema revision to be deleted, with a revision ID // explicitly included. // - // Example: projects/123/schemas/my-schema@c7cfa2a8 + // Example: `projects/123/schemas/my-schema@c7cfa2a8` string name = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } ]; - // Required. The revision ID to roll back to. - // It must be a revision of the same schema. - // - // Example: c7cfa2a8 - string revision_id = 2 [(google.api.field_behavior) = REQUIRED]; + // Optional. This field is deprecated and should not be used for specifying + // the revision ID. The revision ID should be specified via the `name` + // parameter. + string revision_id = 2 + [deprecated = true, (google.api.field_behavior) = OPTIONAL]; } // Request for the `DeleteSchema` method. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index e40d0e65ed0..d1a8d63b8db 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -4646,6 +4646,9 @@ export namespace google { /** AcknowledgeConfirmation unorderedAckIds */ unorderedAckIds?: (string[]|null); + + /** AcknowledgeConfirmation temporaryFailedAckIds */ + temporaryFailedAckIds?: (string[]|null); } /** Represents an AcknowledgeConfirmation. */ @@ -4666,6 +4669,9 @@ export namespace google { /** AcknowledgeConfirmation unorderedAckIds. */ public unorderedAckIds: string[]; + /** AcknowledgeConfirmation temporaryFailedAckIds. */ + public temporaryFailedAckIds: string[]; + /** * Creates a new AcknowledgeConfirmation instance using the specified properties. * @param [properties] Properties to set @@ -4752,6 +4758,9 @@ export namespace google { /** ModifyAckDeadlineConfirmation invalidAckIds */ invalidAckIds?: (string[]|null); + + /** ModifyAckDeadlineConfirmation temporaryFailedAckIds */ + temporaryFailedAckIds?: (string[]|null); } /** Represents a ModifyAckDeadlineConfirmation. */ @@ -4769,6 +4778,9 @@ export namespace google { /** ModifyAckDeadlineConfirmation invalidAckIds. */ public invalidAckIds: string[]; + /** ModifyAckDeadlineConfirmation temporaryFailedAckIds. */ + public temporaryFailedAckIds: string[]; + /** * Creates a new ModifyAckDeadlineConfirmation instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index fc79a05642b..0d3b5446cd1 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -10800,6 +10800,7 @@ * @property {Array.|null} [ackIds] AcknowledgeConfirmation ackIds * @property {Array.|null} [invalidAckIds] AcknowledgeConfirmation invalidAckIds * @property {Array.|null} [unorderedAckIds] AcknowledgeConfirmation unorderedAckIds + * @property {Array.|null} [temporaryFailedAckIds] AcknowledgeConfirmation temporaryFailedAckIds */ /** @@ -10814,6 +10815,7 @@ this.ackIds = []; this.invalidAckIds = []; this.unorderedAckIds = []; + this.temporaryFailedAckIds = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -10844,6 +10846,14 @@ */ AcknowledgeConfirmation.prototype.unorderedAckIds = $util.emptyArray; + /** + * AcknowledgeConfirmation temporaryFailedAckIds. + * @member {Array.} temporaryFailedAckIds + * @memberof google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation + * @instance + */ + AcknowledgeConfirmation.prototype.temporaryFailedAckIds = $util.emptyArray; + /** * Creates a new AcknowledgeConfirmation instance using the specified properties. * @function create @@ -10877,6 +10887,9 @@ if (message.unorderedAckIds != null && message.unorderedAckIds.length) for (var i = 0; i < message.unorderedAckIds.length; ++i) writer.uint32(/* id 3, wireType 2 =*/26).string(message.unorderedAckIds[i]); + if (message.temporaryFailedAckIds != null && message.temporaryFailedAckIds.length) + for (var i = 0; i < message.temporaryFailedAckIds.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.temporaryFailedAckIds[i]); return writer; }; @@ -10929,6 +10942,12 @@ message.unorderedAckIds.push(reader.string()); break; } + case 4: { + if (!(message.temporaryFailedAckIds && message.temporaryFailedAckIds.length)) + message.temporaryFailedAckIds = []; + message.temporaryFailedAckIds.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -10985,6 +11004,13 @@ if (!$util.isString(message.unorderedAckIds[i])) return "unorderedAckIds: string[] expected"; } + if (message.temporaryFailedAckIds != null && message.hasOwnProperty("temporaryFailedAckIds")) { + if (!Array.isArray(message.temporaryFailedAckIds)) + return "temporaryFailedAckIds: array expected"; + for (var i = 0; i < message.temporaryFailedAckIds.length; ++i) + if (!$util.isString(message.temporaryFailedAckIds[i])) + return "temporaryFailedAckIds: string[] expected"; + } return null; }; @@ -11021,6 +11047,13 @@ for (var i = 0; i < object.unorderedAckIds.length; ++i) message.unorderedAckIds[i] = String(object.unorderedAckIds[i]); } + if (object.temporaryFailedAckIds) { + if (!Array.isArray(object.temporaryFailedAckIds)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation.temporaryFailedAckIds: array expected"); + message.temporaryFailedAckIds = []; + for (var i = 0; i < object.temporaryFailedAckIds.length; ++i) + message.temporaryFailedAckIds[i] = String(object.temporaryFailedAckIds[i]); + } return message; }; @@ -11041,6 +11074,7 @@ object.ackIds = []; object.invalidAckIds = []; object.unorderedAckIds = []; + object.temporaryFailedAckIds = []; } if (message.ackIds && message.ackIds.length) { object.ackIds = []; @@ -11057,6 +11091,11 @@ for (var j = 0; j < message.unorderedAckIds.length; ++j) object.unorderedAckIds[j] = message.unorderedAckIds[j]; } + if (message.temporaryFailedAckIds && message.temporaryFailedAckIds.length) { + object.temporaryFailedAckIds = []; + for (var j = 0; j < message.temporaryFailedAckIds.length; ++j) + object.temporaryFailedAckIds[j] = message.temporaryFailedAckIds[j]; + } return object; }; @@ -11097,6 +11136,7 @@ * @interface IModifyAckDeadlineConfirmation * @property {Array.|null} [ackIds] ModifyAckDeadlineConfirmation ackIds * @property {Array.|null} [invalidAckIds] ModifyAckDeadlineConfirmation invalidAckIds + * @property {Array.|null} [temporaryFailedAckIds] ModifyAckDeadlineConfirmation temporaryFailedAckIds */ /** @@ -11110,6 +11150,7 @@ function ModifyAckDeadlineConfirmation(properties) { this.ackIds = []; this.invalidAckIds = []; + this.temporaryFailedAckIds = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -11132,6 +11173,14 @@ */ ModifyAckDeadlineConfirmation.prototype.invalidAckIds = $util.emptyArray; + /** + * ModifyAckDeadlineConfirmation temporaryFailedAckIds. + * @member {Array.} temporaryFailedAckIds + * @memberof google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation + * @instance + */ + ModifyAckDeadlineConfirmation.prototype.temporaryFailedAckIds = $util.emptyArray; + /** * Creates a new ModifyAckDeadlineConfirmation instance using the specified properties. * @function create @@ -11162,6 +11211,9 @@ if (message.invalidAckIds != null && message.invalidAckIds.length) for (var i = 0; i < message.invalidAckIds.length; ++i) writer.uint32(/* id 2, wireType 2 =*/18).string(message.invalidAckIds[i]); + if (message.temporaryFailedAckIds != null && message.temporaryFailedAckIds.length) + for (var i = 0; i < message.temporaryFailedAckIds.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.temporaryFailedAckIds[i]); return writer; }; @@ -11208,6 +11260,12 @@ message.invalidAckIds.push(reader.string()); break; } + case 3: { + if (!(message.temporaryFailedAckIds && message.temporaryFailedAckIds.length)) + message.temporaryFailedAckIds = []; + message.temporaryFailedAckIds.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -11257,6 +11315,13 @@ if (!$util.isString(message.invalidAckIds[i])) return "invalidAckIds: string[] expected"; } + if (message.temporaryFailedAckIds != null && message.hasOwnProperty("temporaryFailedAckIds")) { + if (!Array.isArray(message.temporaryFailedAckIds)) + return "temporaryFailedAckIds: array expected"; + for (var i = 0; i < message.temporaryFailedAckIds.length; ++i) + if (!$util.isString(message.temporaryFailedAckIds[i])) + return "temporaryFailedAckIds: string[] expected"; + } return null; }; @@ -11286,6 +11351,13 @@ for (var i = 0; i < object.invalidAckIds.length; ++i) message.invalidAckIds[i] = String(object.invalidAckIds[i]); } + if (object.temporaryFailedAckIds) { + if (!Array.isArray(object.temporaryFailedAckIds)) + throw TypeError(".google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation.temporaryFailedAckIds: array expected"); + message.temporaryFailedAckIds = []; + for (var i = 0; i < object.temporaryFailedAckIds.length; ++i) + message.temporaryFailedAckIds[i] = String(object.temporaryFailedAckIds[i]); + } return message; }; @@ -11305,6 +11377,7 @@ if (options.arrays || options.defaults) { object.ackIds = []; object.invalidAckIds = []; + object.temporaryFailedAckIds = []; } if (message.ackIds && message.ackIds.length) { object.ackIds = []; @@ -11316,6 +11389,11 @@ for (var j = 0; j < message.invalidAckIds.length; ++j) object.invalidAckIds[j] = message.invalidAckIds[j]; } + if (message.temporaryFailedAckIds && message.temporaryFailedAckIds.length) { + object.temporaryFailedAckIds = []; + for (var j = 0; j < message.temporaryFailedAckIds.length; ++j) + object.temporaryFailedAckIds[j] = message.temporaryFailedAckIds[j]; + } return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 2d55ee337b5..52e57311794 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -47,7 +47,8 @@ "responseType": "Topic", "options": { "(google.api.http).patch": "/v1/{topic.name=projects/*/topics/*}", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "topic,update_mask" }, "parsedOptions": [ { @@ -55,6 +56,9 @@ "patch": "/v1/{topic.name=projects/*/topics/*}", "body": "*" } + }, + { + "(google.api.method_signature)": "topic,update_mask" } ] }, @@ -519,7 +523,8 @@ "responseType": "Subscription", "options": { "(google.api.http).patch": "/v1/{subscription.name=projects/*/subscriptions/*}", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "subscription,update_mask" }, "parsedOptions": [ { @@ -527,6 +532,9 @@ "patch": "/v1/{subscription.name=projects/*/subscriptions/*}", "body": "*" } + }, + { + "(google.api.method_signature)": "subscription,update_mask" } ] }, @@ -716,7 +724,8 @@ "responseType": "Snapshot", "options": { "(google.api.http).patch": "/v1/{snapshot.name=projects/*/snapshots/*}", - "(google.api.http).body": "*" + "(google.api.http).body": "*", + "(google.api.method_signature)": "snapshot,update_mask" }, "parsedOptions": [ { @@ -724,6 +733,9 @@ "patch": "/v1/{snapshot.name=projects/*/snapshots/*}", "body": "*" } + }, + { + "(google.api.method_signature)": "snapshot,update_mask" } ] }, @@ -1229,12 +1241,6 @@ "id": 4 } }, - "reserved": [ - [ - 2, - 2 - ] - ], "nested": { "AcknowledgeConfirmation": { "fields": { @@ -1252,6 +1258,11 @@ "rule": "repeated", "type": "string", "id": 3 + }, + "temporaryFailedAckIds": { + "rule": "repeated", + "type": "string", + "id": 4 } } }, @@ -1266,6 +1277,11 @@ "rule": "repeated", "type": "string", "id": 2 + }, + "temporaryFailedAckIds": { + "rule": "repeated", + "type": "string", + "id": 3 } } }, @@ -1857,7 +1873,8 @@ "type": "string", "id": 2, "options": { - "(google.api.field_behavior)": "REQUIRED" + "deprecated": true, + "(google.api.field_behavior)": "OPTIONAL" } } } diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 27b0ee2436c..c1dcd61fbc7 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -423,11 +423,11 @@ export class PublisherClient { * timestamp](https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) * that is up to `message_retention_duration` in the past. If this field is * not set, message retention is controlled by settings on individual - * subscriptions. Cannot be more than 7 days or less than 10 minutes. + * subscriptions. Cannot be more than 31 days or less than 10 minutes. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The first element of the array is an object representing {@link google.pubsub.v1.Topic | Topic}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -515,7 +515,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The first element of the array is an object representing {@link google.pubsub.v1.Topic | Topic}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -600,7 +600,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [PublishResponse]{@link google.pubsub.v1.PublishResponse}. + * The first element of the array is an object representing {@link google.pubsub.v1.PublishResponse | PublishResponse}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -682,7 +682,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Topic]{@link google.pubsub.v1.Topic}. + * The first element of the array is an object representing {@link google.pubsub.v1.Topic | Topic}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -768,7 +768,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -853,7 +853,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [DetachSubscriptionResponse]{@link google.pubsub.v1.DetachSubscriptionResponse}. + * The first element of the array is an object representing {@link google.pubsub.v1.DetachSubscriptionResponse | DetachSubscriptionResponse}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -942,7 +942,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Topic]{@link google.pubsub.v1.Topic}. + * The first element of the array is Array of {@link google.pubsub.v1.Topic | Topic}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. @@ -1035,7 +1035,7 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing [Topic]{@link google.pubsub.v1.Topic} on 'data' event. + * An object stream which emits an object representing {@link google.pubsub.v1.Topic | Topic} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listTopicsAsync()` @@ -1086,7 +1086,7 @@ export class PublisherClient { * @returns {Object} * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). * When you iterate the returned iterable, each element will be an object representing - * [Topic]{@link google.pubsub.v1.Topic}. The API will be called under the hood as needed, once per the page, + * {@link google.pubsub.v1.Topic | Topic}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) @@ -1520,16 +1520,16 @@ export class PublisherClient { * OPTIONAL: A `GetPolicyOptions` object for specifying options to * `GetIamPolicy`. This field is only used by Cloud IAM. * - * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} + * This object should have the same structure as {@link google.iam.v1.GetPolicyOptions | GetPolicyOptions}. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * The second parameter to the callback is an object representing {@link google.iam.v1.Policy | Policy}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The first element of the array is an object representing {@link google.iam.v1.Policy | Policy}. * The promise has a method named "cancel" which cancels the ongoing API call. */ getIamPolicy( @@ -1571,13 +1571,13 @@ export class PublisherClient { * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The second parameter to the callback is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The first element of the array is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. */ setIamPolicy( @@ -1619,13 +1619,13 @@ export class PublisherClient { * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The second parameter to the callback is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The first element of the array is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. * */ diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 407534903bd..3d96239ab6b 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -384,7 +384,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -469,7 +469,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -553,7 +553,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -639,7 +639,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -719,16 +719,15 @@ export class SchemaServiceClient { * Required. The name of the schema revision to be deleted, with a revision ID * explicitly included. * - * Example: projects/123/schemas/my-schema@c7cfa2a8 - * @param {string} request.revisionId - * Required. The revision ID to roll back to. - * It must be a revision of the same schema. - * - * Example: c7cfa2a8 + * Example: `projects/123/schemas/my-schema@c7cfa2a8` + * @param {string} [request.revisionId] + * Optional. This field is deprecated and should not be used for specifying + * the revision ID. The revision ID should be specified via the `name` + * parameter. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Schema]{@link google.pubsub.v1.Schema}. + * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -812,7 +811,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -896,7 +895,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [ValidateSchemaResponse]{@link google.pubsub.v1.ValidateSchemaResponse}. + * The first element of the array is an object representing {@link google.pubsub.v1.ValidateSchemaResponse | ValidateSchemaResponse}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -988,7 +987,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [ValidateMessageResponse]{@link google.pubsub.v1.ValidateMessageResponse}. + * The first element of the array is an object representing {@link google.pubsub.v1.ValidateMessageResponse | ValidateMessageResponse}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1081,7 +1080,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Schema]{@link google.pubsub.v1.Schema}. + * The first element of the array is Array of {@link google.pubsub.v1.Schema | Schema}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. @@ -1178,7 +1177,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing [Schema]{@link google.pubsub.v1.Schema} on 'data' event. + * An object stream which emits an object representing {@link google.pubsub.v1.Schema | Schema} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listSchemasAsync()` @@ -1233,7 +1232,7 @@ export class SchemaServiceClient { * @returns {Object} * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). * When you iterate the returned iterable, each element will be an object representing - * [Schema]{@link google.pubsub.v1.Schema}. The API will be called under the hood as needed, once per the page, + * {@link google.pubsub.v1.Schema | Schema}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) @@ -1279,7 +1278,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Schema]{@link google.pubsub.v1.Schema}. + * The first element of the array is Array of {@link google.pubsub.v1.Schema | Schema}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. @@ -1376,7 +1375,7 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing [Schema]{@link google.pubsub.v1.Schema} on 'data' event. + * An object stream which emits an object representing {@link google.pubsub.v1.Schema | Schema} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listSchemaRevisionsAsync()` @@ -1429,7 +1428,7 @@ export class SchemaServiceClient { * @returns {Object} * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). * When you iterate the returned iterable, each element will be an object representing - * [Schema]{@link google.pubsub.v1.Schema}. The API will be called under the hood as needed, once per the page, + * {@link google.pubsub.v1.Schema | Schema}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) @@ -1469,16 +1468,16 @@ export class SchemaServiceClient { * OPTIONAL: A `GetPolicyOptions` object for specifying options to * `GetIamPolicy`. This field is only used by Cloud IAM. * - * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} + * This object should have the same structure as {@link google.iam.v1.GetPolicyOptions | GetPolicyOptions}. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * The second parameter to the callback is an object representing {@link google.iam.v1.Policy | Policy}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The first element of the array is an object representing {@link google.iam.v1.Policy | Policy}. * The promise has a method named "cancel" which cancels the ongoing API call. */ getIamPolicy( @@ -1520,13 +1519,13 @@ export class SchemaServiceClient { * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The second parameter to the callback is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The first element of the array is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. */ setIamPolicy( @@ -1568,13 +1567,13 @@ export class SchemaServiceClient { * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The second parameter to the callback is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The first element of the array is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. * */ diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 4b007c86c42..c13dd97774d 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -421,19 +421,15 @@ export class SubscriberClient { * field will be `_deleted-topic_` if the topic has been deleted. * @param {google.pubsub.v1.PushConfig} request.pushConfig * If push delivery is used with this subscription, this field is - * used to configure it. Either `pushConfig` or `bigQueryConfig` can be set, - * but not both. If both are empty, then the subscriber will pull and ack - * messages using API methods. + * used to configure it. * @param {google.pubsub.v1.BigQueryConfig} request.bigqueryConfig * If delivery to BigQuery is used with this subscription, this field is - * used to configure it. Either `pushConfig` or `bigQueryConfig` can be set, - * but not both. If both are empty, then the subscriber will pull and ack - * messages using API methods. + * used to configure it. * @param {number} request.ackDeadlineSeconds * The approximate amount of time (on a best-effort basis) Pub/Sub waits for * the subscriber to acknowledge receipt before resending the message. In the * interval after the message is delivered and before it is acknowledged, it - * is considered to be outstanding. During that time period, the + * is considered to be _outstanding_. During that time period, the * message will not be redelivered (on a best-effort basis). * * For pull subscriptions, this value is used as the initial value for the ack @@ -465,8 +461,8 @@ export class SubscriberClient { * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 * minutes. * @param {number[]} request.labels - * See Creating and - * managing labels. + * See [Creating and managing + * labels](https://cloud.google.com/pubsub/docs/labels). * @param {boolean} request.enableMessageOrdering * If true, messages published with the same `ordering_key` in `PubsubMessage` * will be delivered to the subscribers in the order in which they @@ -533,7 +529,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The first element of the array is an object representing {@link google.pubsub.v1.Subscription | Subscription}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -615,7 +611,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The first element of the array is an object representing {@link google.pubsub.v1.Subscription | Subscription}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -700,7 +696,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Subscription]{@link google.pubsub.v1.Subscription}. + * The first element of the array is an object representing {@link google.pubsub.v1.Subscription | Subscription}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -786,7 +782,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -883,7 +879,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -975,7 +971,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1047,9 +1043,7 @@ export class SubscriberClient { return this.innerApiCalls.acknowledge(request, options, callback); } /** - * Pulls messages from the server. The server may return `UNAVAILABLE` if - * there are too many concurrent pull requests pending for the given - * subscription. + * Pulls messages from the server. * * @param {Object} request * The request object that will be sent. @@ -1071,7 +1065,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [PullResponse]{@link google.pubsub.v1.PullResponse}. + * The first element of the array is an object representing {@link google.pubsub.v1.PullResponse | PullResponse}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1165,7 +1159,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1238,10 +1232,10 @@ export class SubscriberClient { } /** * Gets the configuration details of a snapshot. Snapshots are used in - * Seek - * operations, which allow you to manage message acknowledgments in bulk. That - * is, you can set the acknowledgment state of messages in an existing - * subscription to the state captured by a snapshot. + * [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, + * which allow you to manage message acknowledgments in bulk. That is, you can + * set the acknowledgment state of messages in an existing subscription to the + * state captured by a snapshot. * * @param {Object} request * The request object that will be sent. @@ -1251,7 +1245,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The first element of the array is an object representing {@link google.pubsub.v1.Snapshot | Snapshot}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1346,9 +1340,9 @@ export class SubscriberClient { * Required. User-provided name for this snapshot. If the name is not provided * in the request, the server will assign a random name for this snapshot on * the same project as the subscription. Note that for REST API requests, you - * must specify a name. See the resource - * name rules. Format is `projects/{project}/snapshots/{snap}`. + * must specify a name. See the [resource name + * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format + * is `projects/{project}/snapshots/{snap}`. * @param {string} request.subscription * Required. The subscription whose backlog the snapshot retains. * Specifically, the created snapshot is guaranteed to retain: @@ -1360,12 +1354,12 @@ export class SubscriberClient { * successful completion of the CreateSnapshot request. * Format is `projects/{project}/subscriptions/{sub}`. * @param {number[]} request.labels - * See Creating and - * managing labels. + * See [Creating and managing + * labels](https://cloud.google.com/pubsub/docs/labels). * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The first element of the array is an object representing {@link google.pubsub.v1.Snapshot | Snapshot}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1438,11 +1432,10 @@ export class SubscriberClient { } /** * Updates an existing snapshot. Snapshots are used in - * Seek - * operations, which allow - * you to manage message acknowledgments in bulk. That is, you can set the - * acknowledgment state of messages in an existing subscription to the state - * captured by a snapshot. + * [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, + * which allow you to manage message acknowledgments in bulk. That is, you can + * set the acknowledgment state of messages in an existing subscription to the + * state captured by a snapshot. * * @param {Object} request * The request object that will be sent. @@ -1454,7 +1447,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The first element of the array is an object representing {@link google.pubsub.v1.Snapshot | Snapshot}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1544,7 +1537,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Empty]{@link google.protobuf.Empty}. + * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1647,7 +1640,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [SeekResponse]{@link google.pubsub.v1.SeekResponse}. + * The first element of the array is an object representing {@link google.pubsub.v1.SeekResponse | SeekResponse}. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. @@ -1732,8 +1725,8 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which is both readable and writable. It accepts objects - * representing [StreamingPullRequest]{@link google.pubsub.v1.StreamingPullRequest} for write() method, and - * will emit objects representing [StreamingPullResponse]{@link google.pubsub.v1.StreamingPullResponse} on 'data' event asynchronously. + * representing {@link google.pubsub.v1.StreamingPullRequest | StreamingPullRequest} for write() method, and + * will emit objects representing {@link google.pubsub.v1.StreamingPullResponse | StreamingPullResponse} on 'data' event asynchronously. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming) * for more details and examples. @@ -1760,7 +1753,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Subscription]{@link google.pubsub.v1.Subscription}. + * The first element of the array is Array of {@link google.pubsub.v1.Subscription | Subscription}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. @@ -1853,7 +1846,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing [Subscription]{@link google.pubsub.v1.Subscription} on 'data' event. + * An object stream which emits an object representing {@link google.pubsub.v1.Subscription | Subscription} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listSubscriptionsAsync()` @@ -1904,7 +1897,7 @@ export class SubscriberClient { * @returns {Object} * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). * When you iterate the returned iterable, each element will be an object representing - * [Subscription]{@link google.pubsub.v1.Subscription}. The API will be called under the hood as needed, once per the page, + * {@link google.pubsub.v1.Subscription | Subscription}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) @@ -1952,7 +1945,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of [Snapshot]{@link google.pubsub.v1.Snapshot}. + * The first element of the array is Array of {@link google.pubsub.v1.Snapshot | Snapshot}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. @@ -2045,7 +2038,7 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing [Snapshot]{@link google.pubsub.v1.Snapshot} on 'data' event. + * An object stream which emits an object representing {@link google.pubsub.v1.Snapshot | Snapshot} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listSnapshotsAsync()` @@ -2096,7 +2089,7 @@ export class SubscriberClient { * @returns {Object} * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). * When you iterate the returned iterable, each element will be an object representing - * [Snapshot]{@link google.pubsub.v1.Snapshot}. The API will be called under the hood as needed, once per the page, + * {@link google.pubsub.v1.Snapshot | Snapshot}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) @@ -2136,16 +2129,16 @@ export class SubscriberClient { * OPTIONAL: A `GetPolicyOptions` object for specifying options to * `GetIamPolicy`. This field is only used by Cloud IAM. * - * This object should have the same structure as [GetPolicyOptions]{@link google.iam.v1.GetPolicyOptions} + * This object should have the same structure as {@link google.iam.v1.GetPolicyOptions | GetPolicyOptions}. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [Policy]{@link google.iam.v1.Policy}. + * The second parameter to the callback is an object representing {@link google.iam.v1.Policy | Policy}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [Policy]{@link google.iam.v1.Policy}. + * The first element of the array is an object representing {@link google.iam.v1.Policy | Policy}. * The promise has a method named "cancel" which cancels the ongoing API call. */ getIamPolicy( @@ -2187,13 +2180,13 @@ export class SubscriberClient { * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The second parameter to the callback is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The first element of the array is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. */ setIamPolicy( @@ -2235,13 +2228,13 @@ export class SubscriberClient { * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, - * retries, paginations, etc. See [gax.CallOptions]{@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html} for the details. + * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. * @param {function(?Error, ?Object)} [callback] * The function which will be called with the result of the API call. * - * The second parameter to the callback is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The second parameter to the callback is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing [TestIamPermissionsResponse]{@link google.iam.v1.TestIamPermissionsResponse}. + * The first element of the array is an object representing {@link google.iam.v1.TestIamPermissionsResponse | TestIamPermissionsResponse}. * The promise has a method named "cancel" which cancels the ongoing API call. * */ diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index aad28643de1..f479198834f 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -15,6 +15,12 @@ "unavailable": [ "UNAVAILABLE" ], + "unknown_aborted_internal_unavailable": [ + "UNKNOWN", + "ABORTED", + "INTERNAL", + "UNAVAILABLE" + ], "deadline_exceeded_resource_exhausted_aborted_internal_unavailable": [ "DEADLINE_EXCEEDED", "RESOURCE_EXHAUSTED", @@ -72,7 +78,7 @@ }, "Pull": { "timeout_millis": 60000, - "retry_codes_name": "unknown_aborted_unavailable", + "retry_codes_name": "unknown_aborted_internal_unavailable", "retry_params_name": "default" }, "StreamingPull": { From c40ab2e279e3406e6f63fb3c177f5e428e87159d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 21:20:18 -0800 Subject: [PATCH 0907/1115] docs: Add x-ref for ordering messages (#1688) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: Add x-ref for ordering messages docs: Clarify subscription expiration policy PiperOrigin-RevId: 511270484 Source-Link: https://github.com/googleapis/googleapis/commit/4dea519175b3ba0697c71249b77f681a3c90af51 Source-Link: https://github.com/googleapis/googleapis-gen/commit/8dbb4dbade5a3a90cc3839dd25976a8c0a675286 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGRiYjRkYmFkZTVhM2E5MGNjMzgzOWRkMjU5NzZhOGMwYTY3NTI4NiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto | 5 ++++- handwritten/pubsub/src/v1/subscriber_client.ts | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 61656056cc7..1e526d5f433 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -254,6 +254,8 @@ message PubsubMessage { // delivered to subscribers in the order in which they are received by the // Pub/Sub system. All `PubsubMessage`s published in a given `PublishRequest` // must specify the same `ordering_key` value. + // For more information, see [ordering + // messages](https://cloud.google.com/pubsub/docs/ordering). string ordering_key = 5; } @@ -745,7 +747,8 @@ message Subscription { // successfully consuming messages from the subscription or is issuing // operations on the subscription. If `expiration_policy` is not set, a // *default policy* with `ttl` of 31 days will be used. The minimum allowed - // value for `expiration_policy.ttl` is 1 day. + // value for `expiration_policy.ttl` is 1 day. If `expiration_policy` is set, + // but `expiration_policy.ttl` is not set, the subscription never expires. ExpirationPolicy expiration_policy = 11; // An expression written in the Pub/Sub [filter diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index c13dd97774d..17c9cb1a6df 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -474,7 +474,8 @@ export class SubscriberClient { * successfully consuming messages from the subscription or is issuing * operations on the subscription. If `expiration_policy` is not set, a * *default policy* with `ttl` of 31 days will be used. The minimum allowed - * value for `expiration_policy.ttl` is 1 day. + * value for `expiration_policy.ttl` is 1 day. If `expiration_policy` is set, + * but `expiration_policy.ttl` is not set, the subscription never expires. * @param {string} request.filter * An expression written in the Pub/Sub [filter * language](https://cloud.google.com/pubsub/docs/filtering). If non-empty, From 8addefdb5472eab04980bcdbbc257f1c3a194d7e Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 6 Mar 2023 12:06:32 -0500 Subject: [PATCH 0908/1115] fix: don't do multiple drains per publish() in message queues unless requested (#1691) --- handwritten/pubsub/.gitignore | 1 + handwritten/pubsub/src/publisher/index.ts | 4 +- .../pubsub/src/publisher/message-queues.ts | 53 ++++++++++++-- handwritten/pubsub/test/publisher/index.ts | 6 ++ .../pubsub/test/publisher/message-queues.ts | 71 +++++++++++++++++++ 5 files changed, 129 insertions(+), 6 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index d4f03a0df2e..a8d155cd1c4 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -8,6 +8,7 @@ /build/ system-test/secrets.js system-test/*key.json +samples/**/build *.lock .DS_Store package-lock.json diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 1a545784e41..dfe340da8db 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -119,7 +119,7 @@ export class Publisher { const flushResolver = () => { resolve(); - // flush() maybe called more than once, so remove these + // flush() may be called more than once, so remove these // event listeners after we've completed flush(). q.removeListener('drain', flushResolver); }; @@ -129,7 +129,7 @@ export class Publisher { ); const allPublishes = Promise.all( - toDrain.map(q => promisify(q.publish).bind(q)()) + toDrain.map(q => promisify(q.publishDrain).bind(q)()) ); allPublishes diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 4d367b8c4ad..16e9e39a96e 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -66,12 +66,23 @@ export abstract class MessageQueue extends EventEmitter { * @param {PublishCallback} callback The publish callback. */ abstract add(message: PubsubMessage, callback: PublishCallback): void; + /** - * Method to initiate publishing. + * Method to initiate publishing. Full drain behaviour depends on whether the + * queues are ordered or not. * * @abstract */ abstract publish(): void; + + /** + * Method to finalize publishing. Does as many publishes as are needed + * to finish emptying the queues, and fires a drain event afterward. + * + * @abstract + */ + abstract publishDrain(): void; + /** * Accepts a batch of messages and publishes them to the API. * @@ -156,12 +167,33 @@ export class Queue extends MessageQueue { this.pending = setTimeout(() => this.publish(), maxMilliseconds!); } } + /** * Cancels any pending publishes and calls _publish immediately. * + * _Does_ attempt to further drain after one batch is sent. + * * @emits Queue#drain when all messages are sent. */ + publishDrain(callback?: PublishDone): void { + this._publishInternal(true, callback); + } + + /** + * Cancels any pending publishes and calls _publish immediately. + * + * Does _not_ attempt to further drain after one batch is sent. + */ publish(callback?: PublishDone): void { + this._publishInternal(false, callback); + } + + /** + * Cancels any pending publishes and calls _publish immediately. + * + * @emits Queue#drain when all messages are sent. + */ + _publishInternal(fullyDrain: boolean, callback?: PublishDone): void { const definedCallback = callback || (() => {}); const {messages, callbacks} = this.batch; @@ -176,8 +208,12 @@ export class Queue extends MessageQueue { if (err) { definedCallback(err); } else if (this.batch.messages.length) { - // Make another go-around, we're trying to drain the queues fully. - this.publish(callback); + // We only do the indefinite go-arounds when we're trying to do a + // final drain for flush(). In all other cases, we want to leave + // subsequent batches alone so that they can time out as needed. + if (fullyDrain) { + this._publishInternal(true, callback); + } } else { this.emit('drain'); definedCallback(null); @@ -279,7 +315,7 @@ export class OrderedQueue extends MessageQueue { * * @returns {MessageBatch} */ - createBatch() { + createBatch(): MessageBatch { return new MessageBatch(this.batchOptions); } /** @@ -333,6 +369,15 @@ export class OrderedQueue extends MessageQueue { }); } + /** + * For ordered queues, this does exactly the same thing as `publish()`. + * + * @fires OrderedQueue#drain + */ + publishDrain(callback?: PublishDone): void { + this.publish(callback); + } + /** * Tells the queue it is ok to continue publishing messages. */ diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 151d1b96ee5..82ba5d61832 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -63,6 +63,9 @@ class FakeQueue extends EventEmitter { publish(callback: (err: Error | null) => void) { this._publish([], [], callback); } + publishDrain(callback: (err: Error | null) => void) { + this.publish(callback); + } _publish( // eslint-disable-next-line @typescript-eslint/no-unused-vars messages: p.PubsubMessage[], @@ -85,6 +88,9 @@ class FakeOrderedQueue extends FakeQueue { publish(callback: (err: Error | null) => void) { this._publish([], [], callback); } + publishDrain(callback: (err: Error | null) => void) { + this.publish(callback); + } _publish( // eslint-disable-next-line @typescript-eslint/no-unused-vars messages: p.PubsubMessage[], diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 7ea07647733..eda38f1fa53 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -53,11 +53,13 @@ class FakeMessageBatch { created: number; messages: p.PubsubMessage[]; options: b.BatchPublishOptions; + bytes: number; constructor(options = {} as b.BatchPublishOptions) { this.callbacks = []; this.created = Date.now(); this.messages = []; this.options = options; + this.bytes = 0; } // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: p.PubsubMessage, callback: p.PublishCallback): void {} @@ -332,6 +334,75 @@ describe('Message Queues', () => { assert.strictEqual(messages, batch.messages); assert.strictEqual(callbacks, batch.callbacks); }); + + describe('publish chaining', () => { + let fakeMessages: p.PubsubMessage[]; + let spies: p.PublishCallback[]; + beforeEach(() => { + fakeMessages = [{}, {}] as p.PubsubMessage[]; + spies = [sandbox.spy(), sandbox.spy()] as p.PublishCallback[]; + }); + + it('should begin another publish(drain) if there are pending batches', () => { + const stub = sandbox.stub(queue, '_publish'); + let once = false; + stub.callsFake((m, c, done) => { + if (!once) { + // Drop in a second batch before calling the callback. + const secondBatch = new FakeMessageBatch(); + secondBatch.messages = fakeMessages; + secondBatch.callbacks = spies; + queue.batch = secondBatch; + } + once = true; + + done!(null); + }); + + queue.batch = new FakeMessageBatch(); + queue.batch.messages = fakeMessages; + queue.batch.callbacks = spies; + queue.publishDrain(); + + assert.strictEqual(stub.callCount, 2); + }); + + it('should not begin another publish(non-drain) if there are pending batches', () => { + const stub = sandbox.stub(queue, '_publish'); + let once = false; + stub.callsFake((m, c, done) => { + if (!once) { + // Drop in a second batch before calling the callback. + const secondBatch = new FakeMessageBatch(); + secondBatch.messages = fakeMessages; + secondBatch.callbacks = spies; + queue.batch = secondBatch; + } + once = true; + + done!(null); + }); + + queue.batch = new FakeMessageBatch(); + queue.batch.messages = fakeMessages; + queue.batch.callbacks = spies; + queue.publish(); + + assert.strictEqual(stub.callCount, 1); + }); + + it('should emit "drain" if there is nothing left to publish', () => { + const spy = sandbox.spy(); + sandbox + .stub(queue, '_publish') + .callsFake((m, c, done) => done!(null)); + + queue.on('drain', spy); + queue.publish(); + + assert.strictEqual(spy.callCount, 1); + }); + }); }); }); From 07a98f1a91356f860dfbcdc64baa588829c15095 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 13:46:12 -0500 Subject: [PATCH 0909/1115] chore(main): release 3.4.0 (#1687) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 14 ++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 28e32c08855..4e981f7fbe9 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,20 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.4.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.3.0...v3.4.0) (2023-03-06) + + +### Features + +* Add google.api.method.signature to update methods ([1e28405](https://github.com/googleapis/nodejs-pubsub/commit/1e2840529a8451c94d5d845062da84729b7843db)) +* Add temporary_failed_ack_ids to ModifyAckDeadlineConfirmation ([1e28405](https://github.com/googleapis/nodejs-pubsub/commit/1e2840529a8451c94d5d845062da84729b7843db)) +* Make INTERNAL a retryable error for Pull ([#1681](https://github.com/googleapis/nodejs-pubsub/issues/1681)) ([1e28405](https://github.com/googleapis/nodejs-pubsub/commit/1e2840529a8451c94d5d845062da84729b7843db)) + + +### Bug Fixes + +* Don't do multiple drains per publish() in message queues unless requested ([#1691](https://github.com/googleapis/nodejs-pubsub/issues/1691)) ([d9b3a63](https://github.com/googleapis/nodejs-pubsub/commit/d9b3a63ddbfec0581a0e05fdbfcf9e9326b3dcf9)) + ## [3.3.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.2.1...v3.3.0) (2023-01-23) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 316e9384a4a..c78498d7d65 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.3.0", + "version": "3.4.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From abf9e945fc443699651c3944938bb9bda289b923 Mon Sep 17 00:00:00 2001 From: Tom Grossman Date: Wed, 8 Mar 2023 21:44:47 +0200 Subject: [PATCH 0910/1115] fix: update minimum google-gax to avoid taffydb vulnerabilities (#1695) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://togithub.com/advisories/GHSA-mxhp-79qh-mcx6 fixes https://togithub.com/googleapis/nodejs-pubsub/issues/1692 Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [x] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) Fixes #1692 🦕 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. --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c78498d7d65..5b9353287e2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^8.0.2", - "google-gax": "^3.5.2", + "google-gax": "^3.5.6", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 7ef3792fdfe3adade24a572d3a7e6fb6991e101e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:18:44 -0500 Subject: [PATCH 0911/1115] chore(main): release 3.4.1 (#1696) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 4e981f7fbe9..ccc8be92488 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.4.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.4.0...v3.4.1) (2023-03-08) + + +### Bug Fixes + +* Update minimum google-gax to avoid taffydb vulnerabilities ([#1695](https://github.com/googleapis/nodejs-pubsub/issues/1695)) ([11372e6](https://github.com/googleapis/nodejs-pubsub/commit/11372e6d40577704a8a22b6c010623be7e36b34a)) + ## [3.4.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.3.0...v3.4.0) (2023-03-06) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5b9353287e2..0fdeff4ff4a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.4.0", + "version": "3.4.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From d6b6b1074ca3d93fb9e24fb0be5311c2ac3aa420 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 12:13:17 -0700 Subject: [PATCH 0912/1115] chore: store nodejs build artifacts in placer (#1699) Source-Link: https://github.com/googleapis/synthtool/commit/3602660ae703daadcb7bc2f87bf601241665f3f8 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:e6d785d6de3cab027f6213d95ccedab4cab3811b0d3172b78db2216faa182e32 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/publish.sh | 14 +++++++++++++- handwritten/pubsub/.kokoro/release/publish.cfg | 12 ++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 788f7a9fdff..0b836e11907 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -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. @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:fe04ae044dadf5ad88d979dbcc85e0e99372fb5d6316790341e6aca5e4e3fbc8 + digest: sha256:e6d785d6de3cab027f6213d95ccedab4cab3811b0d3172b78db2216faa182e32 diff --git a/handwritten/pubsub/.kokoro/publish.sh b/handwritten/pubsub/.kokoro/publish.sh index 949e3e1d0c2..ca1d47af347 100755 --- a/handwritten/pubsub/.kokoro/publish.sh +++ b/handwritten/pubsub/.kokoro/publish.sh @@ -27,4 +27,16 @@ NPM_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_google-cloud-npm-token-1) echo "//wombat-dressing-room.appspot.com/:_authToken=${NPM_TOKEN}" > ~/.npmrc npm install -npm publish --access=public --registry=https://wombat-dressing-room.appspot.com +npm pack . +# npm provides no way to specify, observe, or predict the name of the tarball +# file it generates. We have to look in the current directory for the freshest +# .tgz file. +TARBALL=$(ls -1 -t *.tgz | head -1) + +npm publish --access=public --registry=https://wombat-dressing-room.appspot.com "$TARBALL" + +# Kokoro collects *.tgz and package-lock.json files and stores them in Placer +# so we can generate SBOMs and attestations. +# However, we *don't* want Kokoro to collect package-lock.json and *.tgz files +# that happened to be installed with dependencies. +find node_modules -name package-lock.json -o -name "*.tgz" | xargs rm -f \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 4bfff45160e..42380c077fe 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -37,3 +37,15 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-pubsub/.kokoro/publish.sh" } + +# Store the packages we uploaded to npmjs.org and their corresponding +# package-lock.jsons in Placer. That way, we have a record of exactly +# what we published, and which version of which tools we used to publish +# it, which we can use to generate SBOMs and attestations. +action { + define_artifacts { + regex: "github/**/*.tgz" + regex: "github/**/package-lock.json" + strip_prefix: "github" + } +} From 0119d5c5a8b792dcd2a30dac0d1c873157fcaf73 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 23 Mar 2023 15:20:59 -0400 Subject: [PATCH 0913/1115] samples: add sample for subscription with retry policy (#1700) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * samples: add sample for subscription with retry policy * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index a475d792c4a..0b3091c38a0 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -132,6 +132,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | 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 Subscription With Retry Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithRetryPolicy.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/createSubscriptionWithRetryPolicy.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) | | Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | | Delete a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchema.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/deleteSchema.js,samples/README.md) | From 0eb0922a5462625ac9189860511c0f5b70844877 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 12:56:32 -0400 Subject: [PATCH 0914/1115] chore: update import paths for Go targets to match open source location (#1703) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update import paths for Go targets to match open source location chore: update go_package in protos to match open source location chore: add explicit release levels to Go gapic targets PiperOrigin-RevId: 520705454 Source-Link: https://github.com/googleapis/googleapis/commit/1cfcea4fbef317c44cc13d73017a0b0462c4737d Source-Link: https://github.com/googleapis/googleapis-gen/commit/15732ab75211b0255433d6f87415e8a3ce466826 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTU3MzJhYjc1MjExYjAyNTU0MzNkNmY4NzQxNWU4YTNjZTQ2NjgyNiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.gitignore | 1 - handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto | 2 +- handwritten/pubsub/protos/google/pubsub/v1/schema.proto | 2 +- handwritten/pubsub/protos/protos.json | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index a8d155cd1c4..d4f03a0df2e 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -8,7 +8,6 @@ /build/ system-test/secrets.js system-test/*key.json -samples/**/build *.lock .DS_Store package-lock.json diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 1e526d5f433..699a04e8c09 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -28,7 +28,7 @@ import "google/pubsub/v1/schema.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.PubSub.V1"; -option go_package = "google.golang.org/genproto/googleapis/pubsub/v1;pubsub"; +option go_package = "cloud.google.com/go/pubsub/apiv1/pubsubpb;pubsubpb"; option java_multiple_files = true; option java_outer_classname = "PubsubProto"; option java_package = "com.google.pubsub.v1"; diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index 8c674df1391..877727dedca 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -25,7 +25,7 @@ import "google/protobuf/timestamp.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.PubSub.V1"; -option go_package = "google.golang.org/genproto/googleapis/pubsub/v1;pubsub"; +option go_package = "cloud.google.com/go/pubsub/apiv1/pubsubpb;pubsubpb"; option java_multiple_files = true; option java_outer_classname = "SchemaProto"; option java_package = "com.google.pubsub.v1"; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 52e57311794..536bfd846a6 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -8,7 +8,7 @@ "options": { "cc_enable_arenas": true, "csharp_namespace": "Google.Cloud.PubSub.V1", - "go_package": "google.golang.org/genproto/googleapis/pubsub/v1;pubsub", + "go_package": "cloud.google.com/go/pubsub/apiv1/pubsubpb;pubsubpb", "java_multiple_files": true, "java_outer_classname": "SchemaProto", "java_package": "com.google.pubsub.v1", From ad6e34b10ed6eff664bed7170fa26612eff568d6 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Sat, 15 Apr 2023 21:00:46 -0400 Subject: [PATCH 0915/1115] feat: rework low level message stream retries, add debugging (#1713) * feat: rework how subscriber streams are retried and generally managed * feat: add debug logging from the low level message stream for reconnects * chore: rename retryBackoff * chore: update retry max backoff * feat: clarify 'debug' channel a bit, add explicit debug message class * chore: push stream retries to full individual retry --- handwritten/pubsub/src/debug.ts | 33 +++ handwritten/pubsub/src/exponential-retry.ts | 11 + handwritten/pubsub/src/index.ts | 1 + handwritten/pubsub/src/message-queues.ts | 19 +- handwritten/pubsub/src/message-stream.ts | 272 ++++++++++++++------ handwritten/pubsub/src/pull-retry.ts | 32 +-- handwritten/pubsub/src/subscriber.ts | 7 +- handwritten/pubsub/src/subscription.ts | 10 +- handwritten/pubsub/test/message-queues.ts | 25 +- handwritten/pubsub/test/message-stream.ts | 112 ++++---- handwritten/pubsub/test/pull-retry.ts | 46 +--- handwritten/pubsub/test/subscriber.ts | 1 + handwritten/pubsub/test/subscription.ts | 8 +- 13 files changed, 363 insertions(+), 214 deletions(-) create mode 100644 handwritten/pubsub/src/debug.ts diff --git a/handwritten/pubsub/src/debug.ts b/handwritten/pubsub/src/debug.ts new file mode 100644 index 00000000000..dd8c7963f01 --- /dev/null +++ b/handwritten/pubsub/src/debug.ts @@ -0,0 +1,33 @@ +// 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. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * Represents a debug message the user might want to print out for logging + * while debugging or whatnot. These will always come by way of the 'error' + * channel on streams or other event emitters. It's completely fine to + * ignore them, as some will just be verbose logging info, but they may + * help figure out what's going wrong. Support may also ask you to catch + * these channels, which you can do like so: + * + * ``` + * subscription.on('debug', msg => console.log(msg.message)); + * ``` + * + * These values are _not_ guaranteed to remain stable, even within a major + * version, so don't depend on them for your program logic. Debug outputs + * may be added or removed at any time, without warning. + */ +export class DebugMessage { + constructor(public message: string, public error?: Error) {} +} diff --git a/handwritten/pubsub/src/exponential-retry.ts b/handwritten/pubsub/src/exponential-retry.ts index 9187559a32b..ddd3a4cdccf 100644 --- a/handwritten/pubsub/src/exponential-retry.ts +++ b/handwritten/pubsub/src/exponential-retry.ts @@ -138,6 +138,17 @@ export class ExponentialRetry { this.scheduleRetry(); } + /** + * Resets an item that was previously retried. This is useful if you have + * persistent items that just need to be retried occasionally. + * + * @private + */ + reset(item: T) { + const retried = item as RetriedItem; + delete retried.retryInfo; + } + // Takes a time delta and adds fuzz. private randomizeDelta(durationMs: number): number { // The fuzz distance should never exceed one second, but in the diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 787b126eeb1..aa80682ba42 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -174,6 +174,7 @@ export { TopicMetadata, } from './topic'; export {Duration, TotalOfUnit, DurationLike} from './temporal'; +export {DebugMessage} from './debug'; if (process.env.DEBUG_GRPC) { console.info('gRPC logging set to verbose'); diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 9d87980b351..77da36bd905 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -32,6 +32,7 @@ import { } from './subscriber'; import {Duration} from './temporal'; import {addToBucket} from './util'; +import {DebugMessage} from './debug'; /** * @private @@ -65,7 +66,7 @@ export interface BatchOptions { * @param {string} message The error message. * @param {GoogleError} err The grpc error. */ -export class BatchError extends Error { +export class BatchError extends DebugMessage { ackIds: string[]; code: grpc.status; details: string; @@ -73,7 +74,8 @@ export class BatchError extends Error { super( `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ process.env.DEBUG_GRPC ? err.stack : err.message - }` + }`, + err ); this.ackIds = ackIds; @@ -278,7 +280,9 @@ export abstract class MessageQueue { // These queues are used for ack and modAck messages, which should // never surface an error to the user level. However, we'll emit // them onto this debug channel in case debug info is needed. - this._subscriber.emit('debug', e); + const err = e as Error; + const debugMsg = new DebugMessage(err.message, err); + this._subscriber.emit('debug', debugMsg); } this.numInFlightRequests -= batchSize; @@ -404,10 +408,8 @@ export abstract class MessageQueue { const others = toError.get(AckResponses.Other); if (others?.length) { const otherIds = others.map(e => e.ackId); - this._subscriber.emit( - 'debug', - new BatchError(rpcError, otherIds, operation) - ); + const debugMsg = new BatchError(rpcError, otherIds, operation); + this._subscriber.emit('debug', debugMsg); } // Take care of following up on all the Promises. @@ -492,7 +494,8 @@ export class AckQueue extends MessageQueue { return results.toRetry; } catch (e) { // This should only ever happen if there's a code failure. - this._subscriber.emit('debug', e); + const err = e as Error; + this._subscriber.emit('debug', new DebugMessage(err.message, err)); const exc = new AckError(AckResponses.Other, 'Code error'); batch.forEach(m => { m.responsePromise?.reject(exc); diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 0e8e2017d34..95df7e8aafd 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -24,6 +24,8 @@ import {Subscriber} from './subscriber'; import {google} from '../protos/protos'; import {defaultOptions} from './default-options'; import {Duration} from './temporal'; +import {ExponentialRetry} from './exponential-retry'; +import {DebugMessage} from './debug'; /*! * Frequency to ping streams. @@ -37,6 +39,23 @@ const PULL_TIMEOUT = require('./v1/subscriber_client_config.json').interfaces[ 'google.pubsub.v1.Subscriber' ].methods.StreamingPull.timeout_millis; +/** + * @typedef {object} MessageStreamOptions + * @property {number} [highWaterMark=0] Configures the Buffer level for all + * underlying streams. See + * {@link https://nodejs.org/en/docs/guides/backpressuring-in-streams/} for + * more details. + * @property {number} [maxStreams=5] Number of streaming connections to make. + * @property {number} [timeout=300000] Timeout for establishing a connection. + */ +export interface MessageStreamOptions { + highWaterMark?: number; + maxStreams?: number; + timeout?: number; + retryMinBackoff?: Duration; + retryMaxBackoff?: Duration; +} + /*! * default stream options */ @@ -44,6 +63,8 @@ const DEFAULT_OPTIONS: MessageStreamOptions = { highWaterMark: 0, maxStreams: defaultOptions.subscription.maxStreams, timeout: 300000, + retryMinBackoff: Duration.from({millis: 100}), + retryMaxBackoff: Duration.from({seconds: 60}), }; interface StreamState { @@ -103,21 +124,13 @@ export class ChannelError extends Error implements grpc.ServiceError { } } -export interface MessageStreamOptions { - highWaterMark?: number; - maxStreams?: number; - timeout?: number; +// Provide a lightweight wrapper around streams so we can track them +// deterministically for retries. +interface StreamTracked { + stream?: PullStream; + receivedStatus?: boolean; } -/** - * @typedef {object} MessageStreamOptions - * @property {number} [highWaterMark=0] Configures the Buffer level for all - * underlying streams. See - * {@link https://nodejs.org/en/docs/guides/backpressuring-in-streams/} for - * more details. - * @property {number} [maxStreams=5] Number of streaming connections to make. - * @property {number} [timeout=300000] Timeout for establishing a connection. - */ /** * Streaming class used to manage multiple StreamingPull requests. * @@ -128,11 +141,12 @@ export interface MessageStreamOptions { * @param {MessageStreamOptions} [options] The message stream options. */ export class MessageStream extends PassThrough { - private _keepAliveHandle: NodeJS.Timer; - private _fillHandle?: NodeJS.Timer; + private _keepAliveHandle?: NodeJS.Timer; private _options: MessageStreamOptions; - private _retrier: PullRetry; - private _streams: Map; + private _retrier: ExponentialRetry; + + private _streams: StreamTracked[]; + private _subscriber: Subscriber; constructor(sub: Subscriber, options = {} as MessageStreamOptions) { options = Object.assign({}, DEFAULT_OPTIONS, options); @@ -140,11 +154,27 @@ export class MessageStream extends PassThrough { super({objectMode: true, highWaterMark: options.highWaterMark}); this._options = options; - this._retrier = new PullRetry(); - this._streams = new Map(); + this._retrier = new ExponentialRetry<{}>( + options.retryMinBackoff!, // Filled by DEFAULT_OPTIONS + options.retryMaxBackoff! + ); + + this._streams = []; + for (let i = 0; i < options.maxStreams!; i++) { + this._streams.push({}); + } + this._subscriber = sub; + } - this._fillStreamPool(); + /** + * Actually starts the stream setup and subscription pulls. + * This is separated so that others can properly wait on the promise. + * + * @private + */ + async start(): Promise { + await this._fillStreamPool(); this._keepAliveHandle = setInterval( () => this._keepAlive(), @@ -163,9 +193,11 @@ export class MessageStream extends PassThrough { streamAckDeadlineSeconds: deadline.totalOf('second'), }; - for (const stream of this._streams.keys()) { + for (const tracker of this._streams) { // We don't need a callback on this one, it's advisory. - stream.write(request); + if (tracker.stream) { + tracker.stream.write(request); + } } } @@ -177,15 +209,22 @@ export class MessageStream extends PassThrough { * @private */ _destroy(error: Error | null, callback: (error: Error | null) => void): void { - clearInterval(this._keepAliveHandle); + if (this._keepAliveHandle) { + clearInterval(this._keepAliveHandle); + } + + this._retrier.close(); - for (const stream of this._streams.keys()) { - this._removeStream(stream); - stream.cancel(); + for (let i = 0; i < this._streams.length; i++) { + const tracker = this._streams[i]; + if (tracker.stream) { + this._removeStream(i); + } } callback(error); } + /** * Adds a StreamingPull stream to the combined stream. * @@ -193,15 +232,28 @@ export class MessageStream extends PassThrough { * * @param {stream} stream The StreamingPull stream. */ - private _addStream(stream: PullStream): void { + private _replaceStream(index: number, stream: PullStream): void { + this._removeStream(index); + this._setHighWaterMark(stream); - this._streams.set(stream, false); + const tracker = this._streams[index]; + tracker.stream = stream; + tracker.receivedStatus = false; stream - .on('error', err => this._onError(stream, err)) - .once('status', status => this._onStatus(stream, status)) - .pipe(this, {end: false}); + .on('error', err => this._onError(index, err)) + .once('status', status => this._onStatus(index, status)) + .on('data', (data: PullResponse) => this._onData(index, data)); + } + + private _onData(index: number, data: PullResponse): void { + // Mark this stream as alive again. (reset backoff) + const tracker = this._streams[index]; + this._retrier.reset(tracker); + + this.emit('data', data); } + /** * Attempts to create and cache the desired number of StreamingPull requests. * gRPC does not supply a way to confirm that a stream is connected, so our @@ -213,6 +265,10 @@ export class MessageStream extends PassThrough { * @returns {Promise} */ private async _fillStreamPool(): Promise { + if (this.destroyed) { + return; + } + let client!: ClientStub; try { @@ -222,10 +278,40 @@ export class MessageStream extends PassThrough { this.destroy(err); } + const all: Promise[] = []; + for (let i = 0; i < this._streams.length; i++) { + all.push(this._fillOne(i, client)); + } + await Promise.all(all); + + try { + await this._waitForClientReady(client); + } catch (e) { + const err = e as Error; + this.destroy(err); + } + } + + private async _fillOne(index: number, client?: ClientStub) { if (this.destroyed) { return; } + const tracker = this._streams[index]; + if (tracker.stream) { + return; + } + + if (!client) { + try { + client = await this._getClient(); + } catch (e) { + const err = e as Error; + this.destroy(err); + return; + } + } + const deadline = Date.now() + PULL_TIMEOUT; const request: StreamingPullRequest = { subscription: this._subscriber.name, @@ -238,21 +324,11 @@ export class MessageStream extends PassThrough { : this._subscriber.maxBytes, }; - delete this._fillHandle; - - for (let i = this._streams.size; i < this._options.maxStreams!; i++) { - const stream: PullStream = client.streamingPull({deadline}); - this._addStream(stream); - stream.write(request); - } - - try { - await this._waitForClientReady(client); - } catch (e) { - const err = e as Error; - this.destroy(err); - } + const stream: PullStream = client.streamingPull({deadline}); + this._replaceStream(index, stream); + stream.write(request); } + /** * It is critical that we keep as few `PullResponse` objects in memory as * possible to reduce the number of potential redeliveries. Because of this we @@ -268,6 +344,7 @@ export class MessageStream extends PassThrough { client.initialize(); return client.subscriberStub as Promise; } + /** * Since we do not use the streams to ack/modAck messages, they will close * by themselves unless we periodically send empty messages. @@ -275,38 +352,59 @@ export class MessageStream extends PassThrough { * @private */ private _keepAlive(): void { - this._streams.forEach((receivedStatus, stream) => { - // its possible that a status event fires off (signaling the rpc being - // closed) but the stream hasn't drained yet, writing to this stream will - // result in a `write after end` error - if (!receivedStatus) { - stream.write({}); + this._streams.forEach(tracker => { + // It's possible that a status event fires off (signaling the rpc being + // closed) but the stream hasn't drained yet. Writing to such a stream will + // result in a `write after end` error. + if (!tracker.receivedStatus && tracker.stream) { + tracker.stream.write({}); } }); } + + // Returns the number of tracked streams that contain an actual stream (good or not). + private _activeStreams(): number { + return this._streams.reduce((p, t) => (t.stream ? 1 : 0) + p, 0); + } + /** * Once the stream has nothing left to read, we'll remove it and attempt to * refill our stream pool if needed. * * @private * - * @param {Duplex} stream The ended stream. + * @param {number} index The ended stream. * @param {object} status The stream status. */ - private _onEnd(stream: PullStream, status: grpc.StatusObject): void { - this._removeStream(stream); - - if (this._fillHandle) { - return; - } - - if (this._retrier.retry(status)) { - const delay = this._retrier.createTimeout(); - this._fillHandle = setTimeout(() => this._fillStreamPool(), delay); - } else if (!this._streams.size) { + private _onEnd(index: number, status: grpc.StatusObject): void { + this._removeStream(index); + + if (PullRetry.retry(status)) { + this.emit( + 'debug', + new DebugMessage( + `Subscriber stream ${index} has ended with status ${status.code}; will be retried.` + ) + ); + if (PullRetry.resetFailures(status)) { + this._retrier.reset(this._streams[index]); + } + this._retrier.retryLater(this._streams[index], () => { + this._fillOne(index); + }); + } else if (this._activeStreams() === 0) { + this.emit( + 'debug', + new DebugMessage( + `Subscriber stream ${index} has ended with status ${status.code}; will not be retried.` + ) + ); + + // No streams left, and nothing to retry. this.destroy(new StatusError(status)); } } + /** * gRPC will usually emit a status as a ServiceError via `error` event before * it emits the status itself. In order to cut back on emitted errors, we'll @@ -314,19 +412,22 @@ export class MessageStream extends PassThrough { * * @private * - * @param {stream} stream The stream that errored. + * @param {number} index The stream that errored. * @param {Error} err The error. */ - private async _onError(stream: PullStream, err: Error): Promise { - await promisify(setImmediate)(); + private async _onError(index: number, err: Error): Promise { + await promisify(process.nextTick)(); const code = (err as StatusError).code; - const receivedStatus = this._streams.get(stream) !== false; + const tracker = this._streams[index]; + const receivedStatus = + !tracker.stream || (tracker.stream && !tracker.receivedStatus); if (typeof code !== 'number' || !receivedStatus) { this.emit('error', err); } } + /** * gRPC streams will emit a status event once the connection has been * terminated. This is preferable to end/close events because we'll receive @@ -337,33 +438,45 @@ export class MessageStream extends PassThrough { * @param {stream} stream The stream that was closed. * @param {object} status The status message stating why it was closed. */ - private _onStatus(stream: PullStream, status: grpc.StatusObject): void { + private _onStatus(index: number, status: grpc.StatusObject): void { if (this.destroyed) { return; } - this._streams.set(stream, true); + const tracker = this._streams[index]; + tracker.receivedStatus = true; + if (!tracker.stream) { + // This shouldn't really happen, but in case wires get crossed. + return; + } - if (isStreamEnded(stream)) { - this._onEnd(stream, status); + if (isStreamEnded(tracker.stream)) { + this._onEnd(index, status); } else { - stream.once('end', () => this._onEnd(stream, status)); - stream.push(null); + tracker.stream.once('end', () => this._onEnd(index, status)); + tracker.stream.push(null); } } + /** * Removes a stream from the combined stream. * * @private * - * @param {stream} stream The stream to remove. + * @param {number} index The stream to remove. */ - private _removeStream(stream: PullStream): void { - stream.unpipe(this); - this._streams.delete(stream); + private _removeStream(index: number): void { + const tracker = this._streams[index]; + if (tracker.stream) { + tracker.stream.unpipe(this); + tracker.stream.cancel(); + tracker.stream = undefined; + tracker.receivedStatus = undefined; + } } + /** - * Neither gRPC or gax allow for the highWaterMark option to be specified. + * Neither gRPC nor gax allow for the highWaterMark option to be specified. * However using the default value (16) it is possible to end up with a lot of * PullResponse objects stored in internal buffers. If this were to happen * and the client were slow to process messages, we could potentially see a @@ -378,8 +491,9 @@ export class MessageStream extends PassThrough { private _setHighWaterMark(stream: PullStream): void { stream._readableState.highWaterMark = this._options.highWaterMark!; } + /** - * Promisified version of gRPCs Client#waitForReady function. + * Promisified version of gRPC's Client#waitForReady function. * * @private * diff --git a/handwritten/pubsub/src/pull-retry.ts b/handwritten/pubsub/src/pull-retry.ts index 8240deb995b..4e2e725b259 100644 --- a/handwritten/pubsub/src/pull-retry.ts +++ b/handwritten/pubsub/src/pull-retry.ts @@ -35,21 +35,6 @@ export const RETRY_CODES: grpc.status[] = [ * @private */ export class PullRetry { - private failures = 0; - /** - * Generates a timeout that can be used for applying a backoff based on the - * current number of failed requests. - * - * @see {@link https://cloud.google.com/iot/docs/how-tos/exponential-backoff} - * @private - * @returns {number} - */ - createTimeout(): number { - if (this.failures === 0) { - return 0; - } - return Math.pow(2, this.failures) * 1000 + Math.floor(Math.random() * 1000); - } /** * Determines if a request grpc.status should be retried. * @@ -63,16 +48,7 @@ export class PullRetry { * @param {object} grpc.status The request grpc.status. * @returns {boolean} */ - retry(err: grpc.StatusObject): boolean { - if ( - err.code === grpc.status.OK || - err.code === grpc.status.DEADLINE_EXCEEDED - ) { - this.failures = 0; - } else { - this.failures += 1; - } - + static retry(err: grpc.StatusObject): boolean { if ( err.code === grpc.status.UNAVAILABLE && err.details && @@ -83,4 +59,10 @@ export class PullRetry { return RETRY_CODES.includes(err.code); } + + static resetFailures(err: grpc.StatusObject): boolean { + return ( + err.code === grpc.status.OK || err.code === grpc.status.DEADLINE_EXCEEDED + ); + } } diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 9ee2e29f6fc..46d4b8a84ea 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -677,7 +677,7 @@ export class Subscriber extends EventEmitter { this._stream .on('error', err => this.emit('error', err)) - .on('debug', err => this.emit('debug', err)) + .on('debug', msg => this.emit('debug', msg)) .on('data', (data: PullResponse) => this._onData(data)) .once('close', () => this.close()); @@ -685,6 +685,11 @@ export class Subscriber extends EventEmitter { .on('full', () => this._stream.pause()) .on('free', () => this._stream.resume()); + this._stream.start().catch(err => { + this.emit('error', err); + this.close(); + }); + this.isOpen = true; } diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 29567ca1223..b721a86815b 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -106,7 +106,7 @@ export type DetachSubscriptionResponse = EmptyResponse; listener: (error: StatusError) => void ): this; on(event: 'close', listener: () => void): this; - on(event: 'debug', listener: (error: StatusError) => void); this; + on(event: 'debug', listener: (msg: DebugMessage) => void); this; // Only used internally. on(event: 'newListener', listener: Function): this; @@ -158,7 +158,7 @@ export type DetachSubscriptionResponse = EmptyResponse; * on(event: 'error', listener: (error: Error) => void): this; * * Upon receipt of a (non-fatal) debug warning: - * on(event: 'debug', listener: (error: Error) => void): this; + * on(event: 'debug', listener: (msg: DebugMessage) => void): this; * * Upon the closing of the subscriber: * on(event: 'close', listener: Function): this; @@ -226,8 +226,8 @@ export type DetachSubscriptionResponse = EmptyResponse; * // Register an error handler. * subscription.on('error', (err) => {}); * - * // Register a debug handler, to catch non-fatal errors. - * subscription.on('debug', (err) => { console.error(err); }); + * // Register a debug handler, to catch non-fatal errors and other messages. + * subscription.on('debug', msg => { console.log(msg.message); }); * * // Register a close handler in case the subscriber closes unexpectedly * subscription.on('close', () => {}); @@ -327,7 +327,7 @@ export class Subscription extends EventEmitter { this._subscriber = new Subscriber(this, options); this._subscriber .on('error', err => this.emit('error', err)) - .on('debug', err => this.emit('debug', err)) + .on('debug', msg => this.emit('debug', msg)) .on('message', message => this.emit('message', message)) .on('close', () => this.emit('close')); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 8cde622bf23..55fff7aad11 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -25,6 +25,7 @@ import defer = require('p-defer'); import * as messageTypes from '../src/message-queues'; import {BatchError} from '../src/message-queues'; import {AckError, Message, Subscriber} from '../src/subscriber'; +import {DebugMessage} from '../src/debug'; class FakeClient { async acknowledge( @@ -261,8 +262,8 @@ describe('MessageQueues', () => { sandbox.stub(messageQueue.batches, 'push').throws(fakeError); - subscriber.on('debug', err => { - assert.strictEqual(err, fakeError); + subscriber.on('debug', msg => { + assert.strictEqual(msg.message, fakeError.message); done(); }); @@ -445,11 +446,13 @@ describe('MessageQueues', () => { sandbox.stub(fakeSubscriber.client, 'acknowledge').rejects(fakeError); - subscriber.on('debug', (err: BatchError) => { + subscriber.on('debug', (msg: DebugMessage) => { try { - assert.strictEqual(err.message, expectedMessage); - assert.deepStrictEqual(err.ackIds, ackIds); - assert.strictEqual(err.code, fakeError.code); + assert.strictEqual(msg.message, expectedMessage); + const batchError = msg.error! as unknown as BatchError; + assert.strictEqual(batchError.message, expectedMessage); + assert.deepStrictEqual(batchError.ackIds, ackIds); + assert.strictEqual(batchError.code, fakeError.code); done(); } catch (e) { // I'm unsure why Mocha's regular handler doesn't work here, @@ -735,11 +738,13 @@ describe('MessageQueues', () => { .stub(fakeSubscriber.client, 'modifyAckDeadline') .rejects(fakeError); - subscriber.on('debug', (err: BatchError) => { + subscriber.on('debug', (msg: DebugMessage) => { try { - assert.strictEqual(err.message, expectedMessage); - assert.deepStrictEqual(err.ackIds, ackIds); - assert.strictEqual(err.code, fakeError.code); + assert.strictEqual(msg.message, expectedMessage); + const batchError = msg.error! as unknown as BatchError; + assert.strictEqual(batchError.message, expectedMessage); + assert.deepStrictEqual(batchError.ackIds, ackIds); + assert.strictEqual(batchError.code, fakeError.code); done(); } catch (e) { // I'm unsure why Mocha's regular handler doesn't work here, diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 9fb3eb3315e..494083d5a2e 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -21,10 +21,13 @@ import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; import {Duplex, PassThrough} from 'stream'; import * as uuid from 'uuid'; +import * as defer from 'p-defer'; + import * as messageTypes from '../src/message-stream'; import {Subscriber} from '../src/subscriber'; import {defaultOptions} from '../src/default-options'; import {Duration} from '../src/temporal'; +import {promisify} from 'util'; const FAKE_STREAMING_PULL_TIMEOUT = 123456789; const FAKE_CLIENT_CONFIG = { @@ -152,18 +155,20 @@ describe('MessageStream', () => { }).MessageStream; }); - beforeEach(() => { + beforeEach(async () => { + sandbox.useFakeTimers(); now = Date.now(); - sandbox.stub(global.Date, 'now').returns(now); const gaxClient = new FakeGaxClient(); client = gaxClient.client; // we hit the grpc client directly subscriber = new FakeSubscriber(gaxClient) as {} as Subscriber; messageStream = new MessageStream(subscriber); + await messageStream.start(); }); afterEach(() => { messageStream.destroy(); + sandbox.clock.restore(); sandbox.restore(); }); @@ -235,44 +240,43 @@ describe('MessageStream', () => { delete client.deadline; }); - it('should respect the highWaterMark option', done => { + it('should respect the highWaterMark option', async () => { const highWaterMark = 3; messageStream = new MessageStream(subscriber, {highWaterMark}); + await messageStream.start(); + + await promisify(process.nextTick)(); - setImmediate(() => { + assert.strictEqual( + client.streams.length, + defaultOptions.subscription.maxStreams + ); + client.streams.forEach(stream => { assert.strictEqual( - client.streams.length, - defaultOptions.subscription.maxStreams + stream._readableState.highWaterMark, + highWaterMark ); - client.streams.forEach(stream => { - assert.strictEqual( - stream._readableState.highWaterMark, - highWaterMark - ); - }); - done(); }); }); - it('should respect the maxStreams option', done => { + it('should respect the maxStreams option', async () => { const maxStreams = 3; messageStream = new MessageStream(subscriber, {maxStreams}); + await messageStream.start(); - setImmediate(() => { - assert.strictEqual(client.streams.length, maxStreams); - done(); - }); + await promisify(process.nextTick)(); + assert.strictEqual(client.streams.length, maxStreams); }); - it('should respect the timeout option', done => { + it('should respect the timeout option', async () => { const timeout = 12345; messageStream = new MessageStream(subscriber, {timeout}); - setImmediate(() => { - assert.strictEqual(client.deadline, now + timeout); - done(); - }); + await messageStream.start(); + + await promisify(process.nextTick)(); + assert.strictEqual(client.deadline, now + timeout); }); }); }); @@ -292,14 +296,13 @@ describe('MessageStream', () => { }); it('should stop keeping the streams alive', () => { - const clock = sandbox.useFakeTimers(); const frequency = 30000; const stubs = client.streams.map(stream => { return sandbox.stub(stream, 'write').throws(); }); messageStream.destroy(); - clock.tick(frequency * 2); // for good measure + sandbox.clock.tick(frequency * 2); // for good measure stubs.forEach(stub => { assert.strictEqual(stub.callCount, 0); @@ -338,7 +341,7 @@ describe('MessageStream', () => { }); client.streams.forEach((stream, i) => stream.push(fakeResponses[i])); - setImmediate(() => messageStream.end()); + process.nextTick(() => messageStream.end()); }); it('should not end the message stream', done => { @@ -349,58 +352,71 @@ describe('MessageStream', () => { }); client.streams.forEach(stream => stream.push(null)); - setImmediate(done); + process.nextTick(done); }); }); describe('on error', () => { - it('should destroy the stream if unable to get client', done => { + it('should destroy the stream if unable to get client', async () => { const fakeError = new Error('err'); sandbox.stub(subscriber, 'getClient').rejects(fakeError); const ms = new MessageStream(subscriber); + const prom = defer(); ms.on('error', err => { assert.strictEqual(err, fakeError); assert.strictEqual(ms.destroyed, true); - done(); + prom.resolve(); }); + + await ms.start(); + await prom.promise; }); - it('should destroy the stream if unable to connect to channel', done => { + it('should destroy the stream if unable to connect to channel', async () => { const stub = sandbox.stub(client, 'waitForReady'); const ms = new MessageStream(subscriber); const fakeError = new Error('err'); const expectedMessage = 'Failed to connect to channel. Reason: err'; + const prom = defer(); ms.on('error', (err: grpc.ServiceError) => { assert.strictEqual(err.code, 2); assert.strictEqual(err.message, expectedMessage); assert.strictEqual(ms.destroyed, true); - done(); + prom.resolve(); }); - setImmediate(() => { - const [, callback] = stub.lastCall.args; - callback(fakeError); + stub.callsFake((_, callback) => { + _; + process.nextTick(() => callback(fakeError)); }); + + await ms.start(); + + await prom.promise; }); - it('should give a deadline error if waitForReady times out', done => { + it('should give a deadline error if waitForReady times out', async () => { const stub = sandbox.stub(client, 'waitForReady'); const ms = new MessageStream(subscriber); const fakeError = new Error('Failed to connect before the deadline'); + const prom = defer(); ms.on('error', (err: grpc.ServiceError) => { assert.strictEqual(err.code, 4); - done(); + prom.resolve(); }); - setImmediate(() => { - const [, callback] = stub.lastCall.args; - callback(fakeError); + stub.callsFake((_, callback) => { + _; + process.nextTick(() => callback(fakeError)); }); + + await ms.start(); + await prom.promise; }); it('should emit non-status errors', done => { @@ -422,7 +438,7 @@ describe('MessageStream', () => { stream.emit('error', status); stream.emit('status', status); - setImmediate(done); + process.nextTick(done); }); it('should ignore errors that come in after the status', done => { @@ -432,7 +448,7 @@ describe('MessageStream', () => { stream.emit('status', {code: 0}); stream.emit('error', {code: 2}); - setImmediate(done); + process.nextTick(done); }); }); @@ -447,7 +463,7 @@ describe('MessageStream', () => { assert.strictEqual(stream.listenerCount('end'), expectedCount); stream.push(null); - setImmediate(() => { + process.nextTick(() => { assert.strictEqual(client.streams.length, 5); done(); }); @@ -459,13 +475,13 @@ describe('MessageStream', () => { messageStream.on('error', done); stream.push(null); - setImmediate(() => { + process.nextTick(() => { const count = stream.listenerCount('end'); stream.emit('status', {code: 2}); assert.strictEqual(stream.listenerCount('end'), count); - setImmediate(() => { + process.nextTick(() => { assert.strictEqual(client.streams.length, 5); done(); }); @@ -494,19 +510,13 @@ describe('MessageStream', () => { }); describe('keeping streams alive', () => { - let clock: sinon.SinonFakeTimers; - - before(() => { - clock = sandbox.useFakeTimers(); - }); - it('should keep the streams alive', () => { const frequency = 30000; const stubs = client.streams.map(stream => { return sandbox.stub(stream, 'write'); }); - clock.tick(frequency * 1.5); + sandbox.clock.tick(frequency * 1.5); stubs.forEach(stub => { const [data] = stub.lastCall.args; diff --git a/handwritten/pubsub/test/pull-retry.ts b/handwritten/pubsub/test/pull-retry.ts index 8a44759a533..e5b2523d838 100644 --- a/handwritten/pubsub/test/pull-retry.ts +++ b/handwritten/pubsub/test/pull-retry.ts @@ -21,32 +21,12 @@ import {PullRetry} from '../src/pull-retry'; describe('PullRetry', () => { const sandbox = sinon.createSandbox(); - let retrier: PullRetry; - - beforeEach(() => { - retrier = new PullRetry(); - }); + beforeEach(() => {}); afterEach(() => { sandbox.restore(); }); - describe('createTimeout', () => { - it('should return 0 when no failures have occurred', () => { - assert.strictEqual(retrier.createTimeout(), 0); - }); - - it('should use a backoff factoring in the failure count', () => { - const random = Math.random(); - const expected = Math.pow(2, 1) * 1000 + Math.floor(random * 1000); - - sandbox.stub(global.Math, 'random').returns(random); - - retrier.retry({code: grpc.status.CANCELLED} as grpc.StatusObject); - assert.strictEqual(retrier.createTimeout(), expected); - }); - }); - describe('retry', () => { it('should return true for retryable errors', () => { [ @@ -56,11 +36,11 @@ describe('PullRetry', () => { grpc.status.INTERNAL, grpc.status.UNAVAILABLE, ].forEach((code: grpc.status) => { - const shouldRetry = retrier.retry({code} as grpc.StatusObject); + const shouldRetry = PullRetry.retry({code} as grpc.StatusObject); assert.strictEqual(shouldRetry, true); }); - const serverShutdown = retrier.retry({ + const serverShutdown = PullRetry.retry({ code: grpc.status.UNAVAILABLE, details: 'Server shutdownNow invoked', } as grpc.StatusObject); @@ -76,23 +56,25 @@ describe('PullRetry', () => { grpc.status.OUT_OF_RANGE, grpc.status.UNIMPLEMENTED, ].forEach((code: grpc.status) => { - const shouldRetry = retrier.retry({code} as grpc.StatusObject); + const shouldRetry = PullRetry.retry({code} as grpc.StatusObject); assert.strictEqual(shouldRetry, false); }); }); it('should reset the failure count on OK', () => { - retrier.retry({code: grpc.status.CANCELLED} as grpc.StatusObject); - retrier.retry({code: grpc.status.OK} as grpc.StatusObject); - - assert.strictEqual(retrier.createTimeout(), 0); + assert.ok( + PullRetry.resetFailures({ + code: grpc.status.OK, + } as grpc.StatusObject) + ); }); it('should reset the failure count on DEADLINE_EXCEEDED', () => { - retrier.retry({code: grpc.status.CANCELLED} as grpc.StatusObject); - retrier.retry({code: grpc.status.DEADLINE_EXCEEDED} as grpc.StatusObject); - - assert.strictEqual(retrier.createTimeout(), 0); + assert.ok( + PullRetry.resetFailures({ + code: grpc.status.DEADLINE_EXCEEDED, + } as grpc.StatusObject) + ); }); }); }); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 2e31c2d0564..aa9a953ef93 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -135,6 +135,7 @@ class FakeMessageStream extends PassThrough { // eslint-disable-next-line @typescript-eslint/no-unused-vars _callback: (error: Error | null) => void ): void {} + async start() {} } class FakePreciseDate { diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 1fdaa36f91e..dcf8c0bba6c 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -24,6 +24,7 @@ import {Snapshot} from '../src/snapshot'; import {Message, SubscriberOptions} from '../src/subscriber'; import * as subby from '../src/subscription'; import * as util from '../src/util'; +import {DebugMessage} from '../src/debug'; let promisified = false; const fakeUtil = Object.assign({}, util, { @@ -511,6 +512,7 @@ describe('Subscription', () => { describe('debug', () => { const error = new Error('err') as ServiceError; + const msg = new DebugMessage(error.message, error); beforeEach(() => { subscription.request = (config, callback) => { @@ -519,12 +521,12 @@ describe('Subscription', () => { }); it('should return the debug events to the callback', done => { - subscription.on?.('debug', err => { - assert.strictEqual(err, error); + subscription.on?.('debug', (msg: DebugMessage) => { + assert.strictEqual(msg.error, error); done(); }); // eslint-disable-next-line @typescript-eslint/no-explicit-any - (subscription as any)._subscriber.emit('debug', error); + (subscription as any)._subscriber.emit('debug', msg); }); }); From cf8fa11d99178032e4c06612fc7b85c35e9429b3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 11:09:03 -0400 Subject: [PATCH 0916/1115] chore(main): release 3.5.0 (#1714) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index ccc8be92488..dbe154ca01c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.5.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.4.1...v3.5.0) (2023-04-16) + + +### Features + +* Rework low level message stream retries, add debugging ([#1713](https://github.com/googleapis/nodejs-pubsub/issues/1713)) ([c1cc6e0](https://github.com/googleapis/nodejs-pubsub/commit/c1cc6e043ab2e532f9c8c9f9158c46e9a424d3dd)) + ## [3.4.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.4.0...v3.4.1) (2023-03-08) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0fdeff4ff4a..f100b443ade 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.4.1", + "version": "3.5.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 9dfdcab23f0bbed5acaebbbb772e0debf222b929 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 20 Apr 2023 16:42:52 -0400 Subject: [PATCH 0917/1115] fix: handle receipt modAck and lease extensions with exactly-once delivery correctly (#1709) * fix: don't try to lease messages with failed acks in exactly-once delivery * fix: don't pass messages to clients or start leasing in exactly-once delivery if the receipt modAck fails * fix: handle receipt modAcks and lease extensions properly with exactly-once delivery enabled * fix: permanently fail any ack/modAck/nack that fails once under exactly-once delivery --- handwritten/pubsub/src/lease-manager.ts | 13 +- handwritten/pubsub/src/subscriber.ts | 69 ++++++++- handwritten/pubsub/test/lease-manager.ts | 148 ++++++++++++++++++- handwritten/pubsub/test/subscriber.ts | 179 +++++++++++++++++++++++ 4 files changed, 401 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index b616e0ce297..084f4b75950 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -15,7 +15,7 @@ */ import {EventEmitter} from 'events'; -import {Message, Subscriber} from './subscriber'; +import {AckError, Message, Subscriber} from './subscriber'; import {defaultOptions} from './default-options'; export interface FlowControlOptions { @@ -257,7 +257,16 @@ export class LeaseManager extends EventEmitter { const lifespan = (Date.now() - message.received) / (60 * 1000); if (lifespan < this._options.maxExtensionMinutes!) { - message.modAck(deadline); + if (this._subscriber.isExactlyOnceDelivery) { + message.modAckWithResponse(deadline).catch(e => { + // In the case of a permanent failure (temporary failures are retried), + // we need to stop trying to lease-manage the message. + message.ackFailed(e as AckError); + this.remove(message); + }); + } else { + message.modAck(deadline); + } } else { this.remove(message); } diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 46d4b8a84ea..fe5defc8e53 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -103,6 +103,8 @@ export class Message { private _handled: boolean; private _length: number; private _subscriber: Subscriber; + private _ackFailed?: AckError; + /** * @hideconstructor * @@ -194,6 +196,16 @@ export class Message { return this._length; } + /** + * Sets this message's exactly once delivery acks to permanent failure. This is + * meant for internal library use only. + * + * @private + */ + ackFailed(error: AckError): void { + this._ackFailed = error; + } + /** * Acknowledges the message. * @@ -228,9 +240,18 @@ export class Message { return AckResponses.Success; } + if (this._ackFailed) { + throw this._ackFailed; + } + if (!this._handled) { this._handled = true; - return await this._subscriber.ackWithResponse(this); + try { + return await this._subscriber.ackWithResponse(this); + } catch (e) { + this.ackFailed(e as AckError); + throw e; + } } else { return AckResponses.Invalid; } @@ -261,8 +282,17 @@ export class Message { return AckResponses.Success; } + if (this._ackFailed) { + throw this._ackFailed; + } + if (!this._handled) { - return await this._subscriber.modAckWithResponse(this, deadline); + try { + return await this._subscriber.modAckWithResponse(this, deadline); + } catch (e) { + this.ackFailed(e as AckError); + throw e; + } } else { return AckResponses.Invalid; } @@ -303,9 +333,18 @@ export class Message { return AckResponses.Success; } + if (this._ackFailed) { + throw this._ackFailed; + } + if (!this._handled) { this._handled = true; - return await this._subscriber.nackWithResponse(this); + try { + return await this._subscriber.nackWithResponse(this); + } catch (e) { + this.ackFailed(e as AckError); + throw e; + } } else { return AckResponses.Invalid; } @@ -824,8 +863,23 @@ export class Subscriber extends EventEmitter { const span: Span | undefined = this._constructSpan(message); if (this.isOpen) { - message.modAck(this.ackDeadline); - this._inventory.add(message); + if (this.isExactlyOnceDelivery) { + // For exactly-once delivery, we must validate that we got a valid + // lease on the message before actually leasing it. + message + .modAckWithResponse(this.ackDeadline) + .then(() => { + this._inventory.add(message); + }) + .catch(() => { + // Temporary failures will retry, so if an error reaches us + // here, that means a permanent failure. Silently drop these. + this._discardMessage(message); + }); + } else { + message.modAck(this.ackDeadline); + this._inventory.add(message); + } } else { message.nack(); } @@ -835,6 +889,11 @@ export class Subscriber extends EventEmitter { } } + // Internal: This is here to provide a hook for unit testing, at least for now. + private _discardMessage(message: Message): void { + message; + } + /** * Returns a promise that will resolve once all pending requests have settled. * diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index cf8def1a6cd..2ceb17cf79c 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -19,9 +19,16 @@ import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; import * as proxyquire from 'proxyquire'; import * as sinon from 'sinon'; +import * as defer from 'p-defer'; import * as leaseTypes from '../src/lease-manager'; -import {Message, Subscriber} from '../src/subscriber'; +import { + AckError, + AckResponse, + AckResponses, + Message, + Subscriber, +} from '../src/subscriber'; import {defaultOptions} from '../src/default-options'; const FREE_MEM = 9376387072; @@ -34,6 +41,10 @@ class FakeSubscriber extends EventEmitter { isOpen = true; modAckLatency = 2000; async modAck(): Promise {} + async modAckWithResponse(): Promise { + return AckResponses.Success; + } + isExactlyOnceDelivery = false; } class FakeMessage { @@ -43,6 +54,21 @@ class FakeMessage { this.received = Date.now(); } modAck(): void {} + async modAckWithResponse(): Promise { + return AckResponses.Success; + } + ackFailed() {} +} + +interface LeaseManagerInternals { + _extendDeadlines(): void; + _messages: Set; + _isLeasing: boolean; + _scheduleExtension(): void; +} + +function getLMInternals(mgr: leaseTypes.LeaseManager): LeaseManagerInternals { + return mgr as unknown as LeaseManagerInternals; } describe('LeaseManager', () => { @@ -207,6 +233,18 @@ describe('LeaseManager', () => { assert.strictEqual(stub.callCount, 1); }); + it('should schedule a lease extension for exactly-once delivery', () => { + const message = new FakeMessage() as {} as Message; + const stub = sandbox + .stub(message, 'modAck') + .withArgs(subscriber.ackDeadline); + + leaseManager.add(message); + clock.tick(expectedTimeout); + + assert.strictEqual(stub.callCount, 1); + }); + it('should not schedule a lease extension if already in progress', () => { const messages = [new FakeMessage(), new FakeMessage()]; const stubs = messages.map(message => sandbox.stub(message, 'modAck')); @@ -274,6 +312,32 @@ describe('LeaseManager', () => { assert.strictEqual(deadline, subscriber.ackDeadline); }); + it('should remove and ackFailed any messages that fail to ack', done => { + (subscriber as unknown as FakeSubscriber).isExactlyOnceDelivery = true; + + leaseManager.setOptions({ + maxExtensionMinutes: 600, + }); + + const goodMessage = new FakeMessage(); + + const removeStub = sandbox.stub(leaseManager, 'remove'); + const mawrStub = sandbox + .stub(goodMessage, 'modAckWithResponse') + .rejects(new AckError(AckResponses.Invalid)); + const failed = sandbox.stub(goodMessage, 'ackFailed'); + + removeStub.callsFake(() => { + assert.strictEqual(mawrStub.callCount, 1); + assert.strictEqual(removeStub.callCount, 1); + assert.strictEqual(failed.callCount, 1); + done(); + }); + + leaseManager.add(goodMessage as {} as Message); + clock.tick(halfway * 2 + 1); + }); + it('should continuously extend the deadlines', () => { const message = new FakeMessage(); // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -473,4 +537,86 @@ describe('LeaseManager', () => { assert.strictEqual(leaseManager.isFull(), true); }); }); + + describe('deadline extension', () => { + beforeEach(() => { + sandbox.useFakeTimers(); + }); + afterEach(() => { + sandbox.clock.restore(); + }); + + it('calls regular modAck periodically w/o exactly-once', () => { + const lmi = getLMInternals(leaseManager); + const msg = new Message(subscriber, { + ackId: 'ackack', + message: {data: ''}, + deliveryAttempt: 0, + }); + sandbox.clock.tick(1); + + const maStub = sandbox.stub(msg, 'modAck'); + + lmi._messages.add(msg); + lmi._extendDeadlines(); + + assert.ok(maStub.calledOnce); + }); + + it('calls modAckWithResponse periodically w/exactly-once, successful', async () => { + const lmi = getLMInternals(leaseManager); + const msg = new Message(subscriber, { + ackId: 'ackack', + message: {data: ''}, + deliveryAttempt: 0, + }); + sandbox.clock.tick(1); + (subscriber as unknown as FakeSubscriber).isExactlyOnceDelivery = true; + + const done = defer(); + sandbox.stub(msg, 'modAck').callsFake(() => { + console.error('oops we did it wrong'); + }); + + const maStub = sandbox.stub(msg, 'modAckWithResponse'); + maStub.callsFake(async () => { + done.resolve(); + return AckResponses.Success; + }); + + lmi._messages.add(msg); + lmi._extendDeadlines(); + + await done.promise; + assert.ok(maStub.calledOnce); + }); + + it('calls modAckWithResponse periodically w/exactly-once, failure', async () => { + const lmi = getLMInternals(leaseManager); + const msg = new Message(subscriber, { + ackId: 'ackack', + message: {data: ''}, + deliveryAttempt: 0, + }); + sandbox.clock.tick(1); + (subscriber as unknown as FakeSubscriber).isExactlyOnceDelivery = true; + + const done = defer(); + + const maStub = sandbox.stub(msg, 'modAckWithResponse'); + maStub.callsFake(async () => { + done.resolve(); + throw new AckError(AckResponses.Invalid); + }); + const rmStub = sandbox.stub(leaseManager, 'remove'); + + lmi._messages.add(msg); + lmi._extendDeadlines(); + + await done.promise; + + assert.ok(maStub.calledOnce); + assert.ok(rmStub.calledOnce); + }); + }); }); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index aa9a953ef93..cab00e2863c 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -24,6 +24,8 @@ import * as sinon from 'sinon'; import {PassThrough} from 'stream'; import * as uuid from 'uuid'; import * as opentelemetry from '@opentelemetry/api'; +import {google} from '../protos/protos'; +import * as defer from 'p-defer'; import {HistogramOptions} from '../src/histogram'; import {FlowControlOptions} from '../src/lease-manager'; @@ -35,6 +37,8 @@ import {SpanKind} from '@opentelemetry/api'; import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; import {Duration} from '../src'; +type PullResponse = google.pubsub.v1.IStreamingPullResponse; + const stubs = new Map(); class FakeClient {} @@ -129,6 +133,7 @@ class FakeMessageStream extends PassThrough { this.options = options; stubs.set('messageStream', this); } + setStreamAckDeadline(): void {} _destroy( // eslint-disable-next-line @typescript-eslint/no-unused-vars _error: Error | null, @@ -156,6 +161,17 @@ const RECEIVED_MESSAGE = { }, }; +interface SubInternals { + _stream: FakeMessageStream; + _inventory: FakeLeaseManager; + _onData(response: PullResponse): void; + _discardMessage(message: s.Message): void; +} + +function getSubInternals(sub: s.Subscriber) { + return sub as unknown as SubInternals; +} + describe('Subscriber', () => { let sandbox: sinon.SinonSandbox; @@ -233,6 +249,106 @@ describe('Subscriber', () => { }); }); + describe('receive', () => { + it('should add incoming messages to inventory w/o exactly-once', () => { + const sub = new Subscriber(subscription); + sub.isOpen = true; + const subint = getSubInternals(sub); + const modAckStub = sandbox.stub(sub, 'modAck'); + subint._inventory = new FakeLeaseManager(sub, {}); + const addStub = sandbox.stub(subint._inventory, 'add'); + subint._onData({ + subscriptionProperties: { + exactlyOnceDeliveryEnabled: false, + messageOrderingEnabled: false, + }, + receivedMessages: [ + { + ackId: 'ackack', + message: { + data: 'foo', + attributes: {}, + }, + }, + ], + }); + + assert.ok(modAckStub.calledOnce); + assert.ok(addStub.calledOnce); + }); + + it('should add incoming messages to inventory w/exactly-once, success', async () => { + const sub = new Subscriber(subscription); + sub.isOpen = true; + const subint = getSubInternals(sub); + subint._stream = new FakeMessageStream(sub, {}); + subint._inventory = new FakeLeaseManager(sub, {}); + const modAckStub = sandbox.stub(sub, 'modAckWithResponse'); + modAckStub.callsFake(async () => s.AckResponses.Success); + const addStub = sandbox.stub(subint._inventory, 'add'); + const done = defer(); + addStub.callsFake(() => { + assert.ok(modAckStub.calledOnce); + done.resolve(); + }); + subint._onData({ + subscriptionProperties: { + exactlyOnceDeliveryEnabled: true, + messageOrderingEnabled: false, + }, + receivedMessages: [ + { + ackId: 'ackack', + message: { + data: 'foo', + attributes: {}, + }, + }, + ], + }); + + await done.promise; + }); + + it('should add incoming messages to inventory w/exactly-once, permanent failure', async () => { + const sub = new Subscriber(subscription); + sub.isOpen = true; + const subint = getSubInternals(sub); + subint._stream = new FakeMessageStream(sub, {}); + subint._inventory = new FakeLeaseManager(sub, {}); + + const done = defer(); + + const modAckStub = sandbox.stub(sub, 'modAckWithResponse'); + modAckStub.rejects(new s.AckError(s.AckResponses.Invalid)); + const addStub = sandbox.stub(subint._inventory, 'add'); + const discardStub = sandbox.stub(subint, '_discardMessage'); + discardStub.callsFake(() => { + assert.ok(modAckStub.calledOnce); + assert.ok(addStub.notCalled); + done.resolve(); + }); + + subint._onData({ + subscriptionProperties: { + exactlyOnceDeliveryEnabled: true, + messageOrderingEnabled: false, + }, + receivedMessages: [ + { + ackId: 'ackack', + message: { + data: 'foo', + attributes: {}, + }, + }, + ], + }); + + await done.promise; + }); + }); + describe('modAckLatency', () => { it('should get the 99th percentile latency', () => { const latencies: FakeHistogram = stubs.get('latencies'); @@ -932,6 +1048,27 @@ describe('Subscriber', () => { assert.strictEqual(msg, message); }); + it('should ack the message with response', async () => { + subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; + const stub = sandbox.stub(subscriber, 'ackWithResponse'); + + stub.resolves(s.AckResponses.Success); + const response = await message.ackWithResponse(); + assert.strictEqual(response, s.AckResponses.Success); + }); + + it('should fail to ack the message with response', async () => { + subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; + const stub = sandbox.stub(subscriber, 'ackWithResponse'); + + stub.rejects(new s.AckError(s.AckResponses.Invalid)); + await assert.rejects(message.ackWithResponse()); + + // Should cache the result also. + await assert.rejects(message.ackWithResponse()); + assert.strictEqual(stub.callCount, 1); + }); + it('should not ack the message if its been handled', () => { const stub = sandbox.stub(subscriber, 'ack'); @@ -954,6 +1091,27 @@ describe('Subscriber', () => { assert.strictEqual(deadline, fakeDeadline); }); + it('should modAck the message with response', async () => { + subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; + const stub = sandbox.stub(subscriber, 'modAckWithResponse'); + + stub.resolves(s.AckResponses.Success); + const response = await message.modAckWithResponse(0); + assert.strictEqual(response, s.AckResponses.Success); + }); + + it('should fail to modAck the message with response', async () => { + subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; + const stub = sandbox.stub(subscriber, 'modAckWithResponse'); + + stub.rejects(new s.AckError(s.AckResponses.Invalid)); + await assert.rejects(message.modAckWithResponse(0)); + + // Should cache the result also. + await assert.rejects(message.modAckWithResponse(0)); + assert.strictEqual(stub.callCount, 1); + }); + it('should not modAck the message if its been handled', () => { const deadline = 10; const stub = sandbox.stub(subscriber, 'modAck'); @@ -976,6 +1134,27 @@ describe('Subscriber', () => { assert.strictEqual(delay, 0); }); + it('should nack the message with response', async () => { + subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; + const stub = sandbox.stub(subscriber, 'nackWithResponse'); + + stub.resolves(s.AckResponses.Success); + const response = await message.nackWithResponse(); + assert.strictEqual(response, s.AckResponses.Success); + }); + + it('should fail to nack the message with response', async () => { + subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; + const stub = sandbox.stub(subscriber, 'nackWithResponse'); + + stub.rejects(new s.AckError(s.AckResponses.Invalid)); + await assert.rejects(message.nackWithResponse()); + + // Should cache the result also. + await assert.rejects(message.nackWithResponse()); + assert.strictEqual(stub.callCount, 1); + }); + it('should not nack the message if its been handled', () => { const stub = sandbox.stub(subscriber, 'modAck'); From 6363da3e944fa71341208cde41c2133d54b96fac Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 15:21:50 -0400 Subject: [PATCH 0918/1115] chore(main): release 3.5.1 (#1716) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index dbe154ca01c..354a82e3d2d 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.5.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.5.0...v3.5.1) (2023-04-20) + + +### Bug Fixes + +* Handle receipt modAck and lease extensions with exactly-once delivery correctly ([#1709](https://github.com/googleapis/nodejs-pubsub/issues/1709)) ([d786d22](https://github.com/googleapis/nodejs-pubsub/commit/d786d22bfec61b91891e5049f1b5ae2d9a81d788)) + ## [3.5.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.4.1...v3.5.0) (2023-04-16) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f100b443ade..e64a1c01c62 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.5.0", + "version": "3.5.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From dcf600bf14120e2aeac784179cf7af24d16de28a Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 26 Apr 2023 15:06:12 -0400 Subject: [PATCH 0919/1115] fix: avoid zalgo when calling down to publish messages (#1710) --- handwritten/pubsub/src/publisher/message-queues.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 16e9e39a96e..ff3052cef73 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -102,7 +102,8 @@ export abstract class MessageQueue extends EventEmitter { }; if (messages.length === 0) { if (typeof callback === 'function') { - callback(null); + // Do this on the next tick to avoid Zalgo with the publish request below. + process.nextTick(() => callback(null)); } return; } From 97bc2691a6f0b5bf890532caec1e16e8dd322674 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 22:31:53 -0400 Subject: [PATCH 0920/1115] chore(main): release 3.5.2 (#1718) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 354a82e3d2d..5c1f82cf5fe 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.5.2](https://github.com/googleapis/nodejs-pubsub/compare/v3.5.1...v3.5.2) (2023-04-26) + + +### Bug Fixes + +* Avoid zalgo when calling down to publish messages ([#1710](https://github.com/googleapis/nodejs-pubsub/issues/1710)) ([dedae1e](https://github.com/googleapis/nodejs-pubsub/commit/dedae1e46cb3214abc33578a878a2298cdae6cac)) + ## [3.5.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.5.0...v3.5.1) (2023-04-20) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e64a1c01c62..5c2f338f5a1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.5.1", + "version": "3.5.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From c7d9455f6e2c93d4dbd004efabd73a04131cb397 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 12:26:27 -0400 Subject: [PATCH 0921/1115] feat: add cloud storage subscription fields (#1724) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add cloud storage subscription fields PiperOrigin-RevId: 531202368 Source-Link: https://github.com/googleapis/googleapis/commit/8a4cc94afcb9ecf3c604ebefbfab2c645e977e7d Source-Link: https://github.com/googleapis/googleapis-gen/commit/ec60ad76356d88e99fa4844fbd90fdcca728f5cb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZWM2MGFkNzYzNTZkODhlOTlmYTQ4NDRmYmQ5MGZkY2NhNzI4ZjVjYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 87 +- .../protos/google/pubsub/v1/schema.proto | 2 +- handwritten/pubsub/protos/protos.d.ts | 347 +++++++ handwritten/pubsub/protos/protos.js | 874 ++++++++++++++++++ handwritten/pubsub/protos/protos.json | 75 ++ .../src/v1/schema_service_client_config.json | 33 +- .../pubsub/src/v1/subscriber_client.ts | 3 + 7 files changed, 1403 insertions(+), 18 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 699a04e8c09..29ab6f09be1 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -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. @@ -647,9 +647,9 @@ service Subscriber { } } -// A subscription resource. If none of `push_config` or `bigquery_config` is -// set, then the subscriber will pull and ack messages using API methods. At -// most one of these fields may be set. +// A subscription resource. If none of `push_config`, `bigquery_config`, or +// `cloud_storage_config` is set, then the subscriber will pull and ack messages +// using API methods. At most one of these fields may be set. message Subscription { option (google.api.resource) = { type: "pubsub.googleapis.com/Subscription" @@ -694,6 +694,10 @@ message Subscription { // used to configure it. BigQueryConfig bigquery_config = 18; + // If delivery to Google Cloud Storage is used with this subscription, this + // field is used to configure it. + CloudStorageConfig cloud_storage_config = 22; + // The approximate amount of time (on a best-effort basis) Pub/Sub waits for // the subscriber to acknowledge receipt before resending the message. In the // interval after the message is delivered and before it is acknowledged, it @@ -885,9 +889,9 @@ message PushConfig { message OidcToken { // [Service account // email](https://cloud.google.com/iam/docs/service-accounts) - // to be used for generating the OIDC token. The caller (for - // CreateSubscription, UpdateSubscription, and ModifyPushConfig RPCs) must - // have the iam.serviceAccounts.actAs permission for the service account. + // used for generating the OIDC token. For more information + // on setting up authentication, see + // [Push subscriptions](https://cloud.google.com/pubsub/docs/push). string service_account_email = 1; // Audience to be used when generating OIDC token. The audience claim @@ -990,6 +994,75 @@ message BigQueryConfig { State state = 5 [(google.api.field_behavior) = OUTPUT_ONLY]; } +// Configuration for a Cloud Storage subscription. +message CloudStorageConfig { + // Configuration for writing message data in text format. + // Message payloads will be written to files as raw text, separated by a + // newline. + message TextConfig {} + + // Configuration for writing message data in Avro format. + // Message payloads and metadata will be written to files as an Avro binary. + message AvroConfig { + // When true, write the subscription name, message_id, publish_time, + // attributes, and ordering_key as additional fields in the output. + bool write_metadata = 1; + } + + // Possible states for a Cloud Storage subscription. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // The subscription can actively send messages to Cloud Storage. + ACTIVE = 1; + + // Cannot write to the Cloud Storage bucket because of permission denied + // errors. + PERMISSION_DENIED = 2; + + // Cannot write to the Cloud Storage bucket because it does not exist. + NOT_FOUND = 3; + } + + // Required. User-provided name for the Cloud Storage bucket. + // The bucket must be created by the user. The bucket name must be without + // any prefix like "gs://". See the [bucket naming + // requirements] (https://cloud.google.com/storage/docs/buckets#naming). + string bucket = 1 [(google.api.field_behavior) = REQUIRED]; + + // User-provided prefix for Cloud Storage filename. See the [object naming + // requirements](https://cloud.google.com/storage/docs/objects#naming). + string filename_prefix = 2; + + // User-provided suffix for Cloud Storage filename. See the [object naming + // requirements](https://cloud.google.com/storage/docs/objects#naming). + string filename_suffix = 3; + + // Defaults to text format. + oneof output_format { + // If set, message data will be written to Cloud Storage in text format. + TextConfig text_config = 4; + + // If set, message data will be written to Cloud Storage in Avro format. + AvroConfig avro_config = 5; + } + + // The maximum duration that can elapse before a new Cloud Storage file is + // created. Min 1 minute, max 10 minutes, default 5 minutes. May not exceed + // the subscription's acknowledgement deadline. + google.protobuf.Duration max_duration = 6; + + // The maximum bytes that can be written to a Cloud Storage file before a new + // file is created. Min 1 KB, max 10 GiB. The max_bytes limit may be exceeded + // in cases where messages are larger than the limit. + int64 max_bytes = 7; + + // Output only. An output-only field that indicates whether or not the + // subscription can receive messages. + State state = 9 [(google.api.field_behavior) = OUTPUT_ONLY]; +} + // A message and its corresponding acknowledgment ID. message ReceivedMessage { // This ID can be used to acknowledge the received message. diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index 877727dedca..32aa0d75cd6 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -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. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index d1a8d63b8db..6c6f974ed77 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -2398,6 +2398,9 @@ export namespace google { /** Subscription bigqueryConfig */ bigqueryConfig?: (google.pubsub.v1.IBigQueryConfig|null); + /** Subscription cloudStorageConfig */ + cloudStorageConfig?: (google.pubsub.v1.ICloudStorageConfig|null); + /** Subscription ackDeadlineSeconds */ ackDeadlineSeconds?: (number|null); @@ -2459,6 +2462,9 @@ export namespace google { /** Subscription bigqueryConfig. */ public bigqueryConfig?: (google.pubsub.v1.IBigQueryConfig|null); + /** Subscription cloudStorageConfig. */ + public cloudStorageConfig?: (google.pubsub.v1.ICloudStorageConfig|null); + /** Subscription ackDeadlineSeconds. */ public ackDeadlineSeconds: number; @@ -3240,6 +3246,347 @@ export namespace google { } } + /** Properties of a CloudStorageConfig. */ + interface ICloudStorageConfig { + + /** CloudStorageConfig bucket */ + bucket?: (string|null); + + /** CloudStorageConfig filenamePrefix */ + filenamePrefix?: (string|null); + + /** CloudStorageConfig filenameSuffix */ + filenameSuffix?: (string|null); + + /** CloudStorageConfig textConfig */ + textConfig?: (google.pubsub.v1.CloudStorageConfig.ITextConfig|null); + + /** CloudStorageConfig avroConfig */ + avroConfig?: (google.pubsub.v1.CloudStorageConfig.IAvroConfig|null); + + /** CloudStorageConfig maxDuration */ + maxDuration?: (google.protobuf.IDuration|null); + + /** CloudStorageConfig maxBytes */ + maxBytes?: (number|Long|string|null); + + /** CloudStorageConfig state */ + state?: (google.pubsub.v1.CloudStorageConfig.State|keyof typeof google.pubsub.v1.CloudStorageConfig.State|null); + } + + /** Represents a CloudStorageConfig. */ + class CloudStorageConfig implements ICloudStorageConfig { + + /** + * Constructs a new CloudStorageConfig. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.ICloudStorageConfig); + + /** CloudStorageConfig bucket. */ + public bucket: string; + + /** CloudStorageConfig filenamePrefix. */ + public filenamePrefix: string; + + /** CloudStorageConfig filenameSuffix. */ + public filenameSuffix: string; + + /** CloudStorageConfig textConfig. */ + public textConfig?: (google.pubsub.v1.CloudStorageConfig.ITextConfig|null); + + /** CloudStorageConfig avroConfig. */ + public avroConfig?: (google.pubsub.v1.CloudStorageConfig.IAvroConfig|null); + + /** CloudStorageConfig maxDuration. */ + public maxDuration?: (google.protobuf.IDuration|null); + + /** CloudStorageConfig maxBytes. */ + public maxBytes: (number|Long|string); + + /** CloudStorageConfig state. */ + public state: (google.pubsub.v1.CloudStorageConfig.State|keyof typeof google.pubsub.v1.CloudStorageConfig.State); + + /** CloudStorageConfig outputFormat. */ + public outputFormat?: ("textConfig"|"avroConfig"); + + /** + * Creates a new CloudStorageConfig instance using the specified properties. + * @param [properties] Properties to set + * @returns CloudStorageConfig instance + */ + public static create(properties?: google.pubsub.v1.ICloudStorageConfig): google.pubsub.v1.CloudStorageConfig; + + /** + * Encodes the specified CloudStorageConfig message. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.verify|verify} messages. + * @param message CloudStorageConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.ICloudStorageConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CloudStorageConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.verify|verify} messages. + * @param message CloudStorageConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.ICloudStorageConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CloudStorageConfig message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CloudStorageConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CloudStorageConfig; + + /** + * Decodes a CloudStorageConfig message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CloudStorageConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CloudStorageConfig; + + /** + * Verifies a CloudStorageConfig message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CloudStorageConfig message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CloudStorageConfig + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CloudStorageConfig; + + /** + * Creates a plain object from a CloudStorageConfig message. Also converts values to other types if specified. + * @param message CloudStorageConfig + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.CloudStorageConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CloudStorageConfig to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CloudStorageConfig + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace CloudStorageConfig { + + /** Properties of a TextConfig. */ + interface ITextConfig { + } + + /** Represents a TextConfig. */ + class TextConfig implements ITextConfig { + + /** + * Constructs a new TextConfig. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.CloudStorageConfig.ITextConfig); + + /** + * Creates a new TextConfig instance using the specified properties. + * @param [properties] Properties to set + * @returns TextConfig instance + */ + public static create(properties?: google.pubsub.v1.CloudStorageConfig.ITextConfig): google.pubsub.v1.CloudStorageConfig.TextConfig; + + /** + * Encodes the specified TextConfig message. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.TextConfig.verify|verify} messages. + * @param message TextConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.CloudStorageConfig.ITextConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified TextConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.TextConfig.verify|verify} messages. + * @param message TextConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.CloudStorageConfig.ITextConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TextConfig message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TextConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CloudStorageConfig.TextConfig; + + /** + * Decodes a TextConfig message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns TextConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CloudStorageConfig.TextConfig; + + /** + * Verifies a TextConfig message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a TextConfig message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns TextConfig + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CloudStorageConfig.TextConfig; + + /** + * Creates a plain object from a TextConfig message. Also converts values to other types if specified. + * @param message TextConfig + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.CloudStorageConfig.TextConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this TextConfig to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for TextConfig + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of an AvroConfig. */ + interface IAvroConfig { + + /** AvroConfig writeMetadata */ + writeMetadata?: (boolean|null); + } + + /** Represents an AvroConfig. */ + class AvroConfig implements IAvroConfig { + + /** + * Constructs a new AvroConfig. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.CloudStorageConfig.IAvroConfig); + + /** AvroConfig writeMetadata. */ + public writeMetadata: boolean; + + /** + * Creates a new AvroConfig instance using the specified properties. + * @param [properties] Properties to set + * @returns AvroConfig instance + */ + public static create(properties?: google.pubsub.v1.CloudStorageConfig.IAvroConfig): google.pubsub.v1.CloudStorageConfig.AvroConfig; + + /** + * Encodes the specified AvroConfig message. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.AvroConfig.verify|verify} messages. + * @param message AvroConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.CloudStorageConfig.IAvroConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AvroConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.AvroConfig.verify|verify} messages. + * @param message AvroConfig message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.CloudStorageConfig.IAvroConfig, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AvroConfig message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AvroConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.CloudStorageConfig.AvroConfig; + + /** + * Decodes an AvroConfig message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AvroConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.CloudStorageConfig.AvroConfig; + + /** + * Verifies an AvroConfig message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AvroConfig message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AvroConfig + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.CloudStorageConfig.AvroConfig; + + /** + * Creates a plain object from an AvroConfig message. Also converts values to other types if specified. + * @param message AvroConfig + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.CloudStorageConfig.AvroConfig, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AvroConfig to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AvroConfig + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + PERMISSION_DENIED = 2, + NOT_FOUND = 3 + } + } + /** Properties of a ReceivedMessage. */ interface IReceivedMessage { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 0d3b5446cd1..a6178c72bf7 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -5189,6 +5189,7 @@ * @property {string|null} [topic] Subscription topic * @property {google.pubsub.v1.IPushConfig|null} [pushConfig] Subscription pushConfig * @property {google.pubsub.v1.IBigQueryConfig|null} [bigqueryConfig] Subscription bigqueryConfig + * @property {google.pubsub.v1.ICloudStorageConfig|null} [cloudStorageConfig] Subscription cloudStorageConfig * @property {number|null} [ackDeadlineSeconds] Subscription ackDeadlineSeconds * @property {boolean|null} [retainAckedMessages] Subscription retainAckedMessages * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Subscription messageRetentionDuration @@ -5252,6 +5253,14 @@ */ Subscription.prototype.bigqueryConfig = null; + /** + * Subscription cloudStorageConfig. + * @member {google.pubsub.v1.ICloudStorageConfig|null|undefined} cloudStorageConfig + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.cloudStorageConfig = null; + /** * Subscription ackDeadlineSeconds. * @member {number} ackDeadlineSeconds @@ -5415,6 +5424,8 @@ $root.google.pubsub.v1.BigQueryConfig.encode(message.bigqueryConfig, writer.uint32(/* id 18, wireType 2 =*/146).fork()).ldelim(); if (message.state != null && Object.hasOwnProperty.call(message, "state")) writer.uint32(/* id 19, wireType 0 =*/152).int32(message.state); + if (message.cloudStorageConfig != null && Object.hasOwnProperty.call(message, "cloudStorageConfig")) + $root.google.pubsub.v1.CloudStorageConfig.encode(message.cloudStorageConfig, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); return writer; }; @@ -5465,6 +5476,10 @@ message.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.decode(reader, reader.uint32()); break; } + case 22: { + message.cloudStorageConfig = $root.google.pubsub.v1.CloudStorageConfig.decode(reader, reader.uint32()); + break; + } case 5: { message.ackDeadlineSeconds = reader.int32(); break; @@ -5587,6 +5602,11 @@ if (error) return "bigqueryConfig." + error; } + if (message.cloudStorageConfig != null && message.hasOwnProperty("cloudStorageConfig")) { + var error = $root.google.pubsub.v1.CloudStorageConfig.verify(message.cloudStorageConfig); + if (error) + return "cloudStorageConfig." + error; + } if (message.ackDeadlineSeconds != null && message.hasOwnProperty("ackDeadlineSeconds")) if (!$util.isInteger(message.ackDeadlineSeconds)) return "ackDeadlineSeconds: integer expected"; @@ -5676,6 +5696,11 @@ throw TypeError(".google.pubsub.v1.Subscription.bigqueryConfig: object expected"); message.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.fromObject(object.bigqueryConfig); } + if (object.cloudStorageConfig != null) { + if (typeof object.cloudStorageConfig !== "object") + throw TypeError(".google.pubsub.v1.Subscription.cloudStorageConfig: object expected"); + message.cloudStorageConfig = $root.google.pubsub.v1.CloudStorageConfig.fromObject(object.cloudStorageConfig); + } if (object.ackDeadlineSeconds != null) message.ackDeadlineSeconds = object.ackDeadlineSeconds | 0; if (object.retainAckedMessages != null) @@ -5775,6 +5800,7 @@ object.topicMessageRetentionDuration = null; object.bigqueryConfig = null; object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.cloudStorageConfig = null; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -5814,6 +5840,8 @@ object.bigqueryConfig = $root.google.pubsub.v1.BigQueryConfig.toObject(message.bigqueryConfig, options); if (message.state != null && message.hasOwnProperty("state")) object.state = options.enums === String ? $root.google.pubsub.v1.Subscription.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.Subscription.State[message.state] : message.state; + if (message.cloudStorageConfig != null && message.hasOwnProperty("cloudStorageConfig")) + object.cloudStorageConfig = $root.google.pubsub.v1.CloudStorageConfig.toObject(message.cloudStorageConfig, options); return object; }; @@ -7421,6 +7449,852 @@ return BigQueryConfig; })(); + v1.CloudStorageConfig = (function() { + + /** + * Properties of a CloudStorageConfig. + * @memberof google.pubsub.v1 + * @interface ICloudStorageConfig + * @property {string|null} [bucket] CloudStorageConfig bucket + * @property {string|null} [filenamePrefix] CloudStorageConfig filenamePrefix + * @property {string|null} [filenameSuffix] CloudStorageConfig filenameSuffix + * @property {google.pubsub.v1.CloudStorageConfig.ITextConfig|null} [textConfig] CloudStorageConfig textConfig + * @property {google.pubsub.v1.CloudStorageConfig.IAvroConfig|null} [avroConfig] CloudStorageConfig avroConfig + * @property {google.protobuf.IDuration|null} [maxDuration] CloudStorageConfig maxDuration + * @property {number|Long|null} [maxBytes] CloudStorageConfig maxBytes + * @property {google.pubsub.v1.CloudStorageConfig.State|null} [state] CloudStorageConfig state + */ + + /** + * Constructs a new CloudStorageConfig. + * @memberof google.pubsub.v1 + * @classdesc Represents a CloudStorageConfig. + * @implements ICloudStorageConfig + * @constructor + * @param {google.pubsub.v1.ICloudStorageConfig=} [properties] Properties to set + */ + function CloudStorageConfig(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CloudStorageConfig bucket. + * @member {string} bucket + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.bucket = ""; + + /** + * CloudStorageConfig filenamePrefix. + * @member {string} filenamePrefix + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.filenamePrefix = ""; + + /** + * CloudStorageConfig filenameSuffix. + * @member {string} filenameSuffix + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.filenameSuffix = ""; + + /** + * CloudStorageConfig textConfig. + * @member {google.pubsub.v1.CloudStorageConfig.ITextConfig|null|undefined} textConfig + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.textConfig = null; + + /** + * CloudStorageConfig avroConfig. + * @member {google.pubsub.v1.CloudStorageConfig.IAvroConfig|null|undefined} avroConfig + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.avroConfig = null; + + /** + * CloudStorageConfig maxDuration. + * @member {google.protobuf.IDuration|null|undefined} maxDuration + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.maxDuration = null; + + /** + * CloudStorageConfig maxBytes. + * @member {number|Long} maxBytes + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.maxBytes = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * CloudStorageConfig state. + * @member {google.pubsub.v1.CloudStorageConfig.State} state + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.state = 0; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * CloudStorageConfig outputFormat. + * @member {"textConfig"|"avroConfig"|undefined} outputFormat + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + Object.defineProperty(CloudStorageConfig.prototype, "outputFormat", { + get: $util.oneOfGetter($oneOfFields = ["textConfig", "avroConfig"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new CloudStorageConfig instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {google.pubsub.v1.ICloudStorageConfig=} [properties] Properties to set + * @returns {google.pubsub.v1.CloudStorageConfig} CloudStorageConfig instance + */ + CloudStorageConfig.create = function create(properties) { + return new CloudStorageConfig(properties); + }; + + /** + * Encodes the specified CloudStorageConfig message. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {google.pubsub.v1.ICloudStorageConfig} message CloudStorageConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CloudStorageConfig.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.bucket != null && Object.hasOwnProperty.call(message, "bucket")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.bucket); + if (message.filenamePrefix != null && Object.hasOwnProperty.call(message, "filenamePrefix")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.filenamePrefix); + if (message.filenameSuffix != null && Object.hasOwnProperty.call(message, "filenameSuffix")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.filenameSuffix); + if (message.textConfig != null && Object.hasOwnProperty.call(message, "textConfig")) + $root.google.pubsub.v1.CloudStorageConfig.TextConfig.encode(message.textConfig, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.avroConfig != null && Object.hasOwnProperty.call(message, "avroConfig")) + $root.google.pubsub.v1.CloudStorageConfig.AvroConfig.encode(message.avroConfig, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.maxDuration != null && Object.hasOwnProperty.call(message, "maxDuration")) + $root.google.protobuf.Duration.encode(message.maxDuration, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.maxBytes != null && Object.hasOwnProperty.call(message, "maxBytes")) + writer.uint32(/* id 7, wireType 0 =*/56).int64(message.maxBytes); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 9, wireType 0 =*/72).int32(message.state); + return writer; + }; + + /** + * Encodes the specified CloudStorageConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {google.pubsub.v1.ICloudStorageConfig} message CloudStorageConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CloudStorageConfig.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CloudStorageConfig message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.CloudStorageConfig} CloudStorageConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CloudStorageConfig.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CloudStorageConfig(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.bucket = reader.string(); + break; + } + case 2: { + message.filenamePrefix = reader.string(); + break; + } + case 3: { + message.filenameSuffix = reader.string(); + break; + } + case 4: { + message.textConfig = $root.google.pubsub.v1.CloudStorageConfig.TextConfig.decode(reader, reader.uint32()); + break; + } + case 5: { + message.avroConfig = $root.google.pubsub.v1.CloudStorageConfig.AvroConfig.decode(reader, reader.uint32()); + break; + } + case 6: { + message.maxDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + case 7: { + message.maxBytes = reader.int64(); + break; + } + case 9: { + message.state = reader.int32(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CloudStorageConfig message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.CloudStorageConfig} CloudStorageConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CloudStorageConfig.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CloudStorageConfig message. + * @function verify + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CloudStorageConfig.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.bucket != null && message.hasOwnProperty("bucket")) + if (!$util.isString(message.bucket)) + return "bucket: string expected"; + if (message.filenamePrefix != null && message.hasOwnProperty("filenamePrefix")) + if (!$util.isString(message.filenamePrefix)) + return "filenamePrefix: string expected"; + if (message.filenameSuffix != null && message.hasOwnProperty("filenameSuffix")) + if (!$util.isString(message.filenameSuffix)) + return "filenameSuffix: string expected"; + if (message.textConfig != null && message.hasOwnProperty("textConfig")) { + properties.outputFormat = 1; + { + var error = $root.google.pubsub.v1.CloudStorageConfig.TextConfig.verify(message.textConfig); + if (error) + return "textConfig." + error; + } + } + if (message.avroConfig != null && message.hasOwnProperty("avroConfig")) { + if (properties.outputFormat === 1) + return "outputFormat: multiple values"; + properties.outputFormat = 1; + { + var error = $root.google.pubsub.v1.CloudStorageConfig.AvroConfig.verify(message.avroConfig); + if (error) + return "avroConfig." + error; + } + } + if (message.maxDuration != null && message.hasOwnProperty("maxDuration")) { + var error = $root.google.protobuf.Duration.verify(message.maxDuration); + if (error) + return "maxDuration." + error; + } + if (message.maxBytes != null && message.hasOwnProperty("maxBytes")) + if (!$util.isInteger(message.maxBytes) && !(message.maxBytes && $util.isInteger(message.maxBytes.low) && $util.isInteger(message.maxBytes.high))) + return "maxBytes: integer|Long expected"; + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + case 3: + break; + } + return null; + }; + + /** + * Creates a CloudStorageConfig message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.CloudStorageConfig} CloudStorageConfig + */ + CloudStorageConfig.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.CloudStorageConfig) + return object; + var message = new $root.google.pubsub.v1.CloudStorageConfig(); + if (object.bucket != null) + message.bucket = String(object.bucket); + if (object.filenamePrefix != null) + message.filenamePrefix = String(object.filenamePrefix); + if (object.filenameSuffix != null) + message.filenameSuffix = String(object.filenameSuffix); + if (object.textConfig != null) { + if (typeof object.textConfig !== "object") + throw TypeError(".google.pubsub.v1.CloudStorageConfig.textConfig: object expected"); + message.textConfig = $root.google.pubsub.v1.CloudStorageConfig.TextConfig.fromObject(object.textConfig); + } + if (object.avroConfig != null) { + if (typeof object.avroConfig !== "object") + throw TypeError(".google.pubsub.v1.CloudStorageConfig.avroConfig: object expected"); + message.avroConfig = $root.google.pubsub.v1.CloudStorageConfig.AvroConfig.fromObject(object.avroConfig); + } + if (object.maxDuration != null) { + if (typeof object.maxDuration !== "object") + throw TypeError(".google.pubsub.v1.CloudStorageConfig.maxDuration: object expected"); + message.maxDuration = $root.google.protobuf.Duration.fromObject(object.maxDuration); + } + if (object.maxBytes != null) + if ($util.Long) + (message.maxBytes = $util.Long.fromValue(object.maxBytes)).unsigned = false; + else if (typeof object.maxBytes === "string") + message.maxBytes = parseInt(object.maxBytes, 10); + else if (typeof object.maxBytes === "number") + message.maxBytes = object.maxBytes; + else if (typeof object.maxBytes === "object") + message.maxBytes = new $util.LongBits(object.maxBytes.low >>> 0, object.maxBytes.high >>> 0).toNumber(); + switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "PERMISSION_DENIED": + case 2: + message.state = 2; + break; + case "NOT_FOUND": + case 3: + message.state = 3; + break; + } + return message; + }; + + /** + * Creates a plain object from a CloudStorageConfig message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig} message CloudStorageConfig + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CloudStorageConfig.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.bucket = ""; + object.filenamePrefix = ""; + object.filenameSuffix = ""; + object.maxDuration = null; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.maxBytes = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.maxBytes = options.longs === String ? "0" : 0; + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + } + if (message.bucket != null && message.hasOwnProperty("bucket")) + object.bucket = message.bucket; + if (message.filenamePrefix != null && message.hasOwnProperty("filenamePrefix")) + object.filenamePrefix = message.filenamePrefix; + if (message.filenameSuffix != null && message.hasOwnProperty("filenameSuffix")) + object.filenameSuffix = message.filenameSuffix; + if (message.textConfig != null && message.hasOwnProperty("textConfig")) { + object.textConfig = $root.google.pubsub.v1.CloudStorageConfig.TextConfig.toObject(message.textConfig, options); + if (options.oneofs) + object.outputFormat = "textConfig"; + } + if (message.avroConfig != null && message.hasOwnProperty("avroConfig")) { + object.avroConfig = $root.google.pubsub.v1.CloudStorageConfig.AvroConfig.toObject(message.avroConfig, options); + if (options.oneofs) + object.outputFormat = "avroConfig"; + } + if (message.maxDuration != null && message.hasOwnProperty("maxDuration")) + object.maxDuration = $root.google.protobuf.Duration.toObject(message.maxDuration, options); + if (message.maxBytes != null && message.hasOwnProperty("maxBytes")) + if (typeof message.maxBytes === "number") + object.maxBytes = options.longs === String ? String(message.maxBytes) : message.maxBytes; + else + object.maxBytes = options.longs === String ? $util.Long.prototype.toString.call(message.maxBytes) : options.longs === Number ? new $util.LongBits(message.maxBytes.low >>> 0, message.maxBytes.high >>> 0).toNumber() : message.maxBytes; + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.CloudStorageConfig.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.CloudStorageConfig.State[message.state] : message.state; + return object; + }; + + /** + * Converts this CloudStorageConfig to JSON. + * @function toJSON + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + * @returns {Object.} JSON object + */ + CloudStorageConfig.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for CloudStorageConfig + * @function getTypeUrl + * @memberof google.pubsub.v1.CloudStorageConfig + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CloudStorageConfig.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.CloudStorageConfig"; + }; + + CloudStorageConfig.TextConfig = (function() { + + /** + * Properties of a TextConfig. + * @memberof google.pubsub.v1.CloudStorageConfig + * @interface ITextConfig + */ + + /** + * Constructs a new TextConfig. + * @memberof google.pubsub.v1.CloudStorageConfig + * @classdesc Represents a TextConfig. + * @implements ITextConfig + * @constructor + * @param {google.pubsub.v1.CloudStorageConfig.ITextConfig=} [properties] Properties to set + */ + function TextConfig(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new TextConfig instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig.ITextConfig=} [properties] Properties to set + * @returns {google.pubsub.v1.CloudStorageConfig.TextConfig} TextConfig instance + */ + TextConfig.create = function create(properties) { + return new TextConfig(properties); + }; + + /** + * Encodes the specified TextConfig message. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.TextConfig.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig.ITextConfig} message TextConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TextConfig.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified TextConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.TextConfig.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig.ITextConfig} message TextConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TextConfig.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a TextConfig message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.CloudStorageConfig.TextConfig} TextConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TextConfig.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CloudStorageConfig.TextConfig(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a TextConfig message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.CloudStorageConfig.TextConfig} TextConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TextConfig.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a TextConfig message. + * @function verify + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + TextConfig.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a TextConfig message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.CloudStorageConfig.TextConfig} TextConfig + */ + TextConfig.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.CloudStorageConfig.TextConfig) + return object; + return new $root.google.pubsub.v1.CloudStorageConfig.TextConfig(); + }; + + /** + * Creates a plain object from a TextConfig message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig.TextConfig} message TextConfig + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + TextConfig.toObject = function toObject() { + return {}; + }; + + /** + * Converts this TextConfig to JSON. + * @function toJSON + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @instance + * @returns {Object.} JSON object + */ + TextConfig.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for TextConfig + * @function getTypeUrl + * @memberof google.pubsub.v1.CloudStorageConfig.TextConfig + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + TextConfig.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.CloudStorageConfig.TextConfig"; + }; + + return TextConfig; + })(); + + CloudStorageConfig.AvroConfig = (function() { + + /** + * Properties of an AvroConfig. + * @memberof google.pubsub.v1.CloudStorageConfig + * @interface IAvroConfig + * @property {boolean|null} [writeMetadata] AvroConfig writeMetadata + */ + + /** + * Constructs a new AvroConfig. + * @memberof google.pubsub.v1.CloudStorageConfig + * @classdesc Represents an AvroConfig. + * @implements IAvroConfig + * @constructor + * @param {google.pubsub.v1.CloudStorageConfig.IAvroConfig=} [properties] Properties to set + */ + function AvroConfig(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * AvroConfig writeMetadata. + * @member {boolean} writeMetadata + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @instance + */ + AvroConfig.prototype.writeMetadata = false; + + /** + * Creates a new AvroConfig instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig.IAvroConfig=} [properties] Properties to set + * @returns {google.pubsub.v1.CloudStorageConfig.AvroConfig} AvroConfig instance + */ + AvroConfig.create = function create(properties) { + return new AvroConfig(properties); + }; + + /** + * Encodes the specified AvroConfig message. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.AvroConfig.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig.IAvroConfig} message AvroConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AvroConfig.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.writeMetadata != null && Object.hasOwnProperty.call(message, "writeMetadata")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.writeMetadata); + return writer; + }; + + /** + * Encodes the specified AvroConfig message, length delimited. Does not implicitly {@link google.pubsub.v1.CloudStorageConfig.AvroConfig.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig.IAvroConfig} message AvroConfig message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AvroConfig.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AvroConfig message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.CloudStorageConfig.AvroConfig} AvroConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AvroConfig.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CloudStorageConfig.AvroConfig(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.writeMetadata = reader.bool(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AvroConfig message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.CloudStorageConfig.AvroConfig} AvroConfig + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AvroConfig.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AvroConfig message. + * @function verify + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AvroConfig.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.writeMetadata != null && message.hasOwnProperty("writeMetadata")) + if (typeof message.writeMetadata !== "boolean") + return "writeMetadata: boolean expected"; + return null; + }; + + /** + * Creates an AvroConfig message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.CloudStorageConfig.AvroConfig} AvroConfig + */ + AvroConfig.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.CloudStorageConfig.AvroConfig) + return object; + var message = new $root.google.pubsub.v1.CloudStorageConfig.AvroConfig(); + if (object.writeMetadata != null) + message.writeMetadata = Boolean(object.writeMetadata); + return message; + }; + + /** + * Creates a plain object from an AvroConfig message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {google.pubsub.v1.CloudStorageConfig.AvroConfig} message AvroConfig + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AvroConfig.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.writeMetadata = false; + if (message.writeMetadata != null && message.hasOwnProperty("writeMetadata")) + object.writeMetadata = message.writeMetadata; + return object; + }; + + /** + * Converts this AvroConfig to JSON. + * @function toJSON + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @instance + * @returns {Object.} JSON object + */ + AvroConfig.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AvroConfig + * @function getTypeUrl + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AvroConfig.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.CloudStorageConfig.AvroConfig"; + }; + + return AvroConfig; + })(); + + /** + * State enum. + * @name google.pubsub.v1.CloudStorageConfig.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} PERMISSION_DENIED=2 PERMISSION_DENIED value + * @property {number} NOT_FOUND=3 NOT_FOUND value + */ + CloudStorageConfig.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "PERMISSION_DENIED"] = 2; + values[valuesById[3] = "NOT_FOUND"] = 3; + return values; + })(); + + return CloudStorageConfig; + })(); + v1.ReceivedMessage = (function() { /** diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 536bfd846a6..0e0062a4257 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -804,6 +804,10 @@ "type": "BigQueryConfig", "id": 18 }, + "cloudStorageConfig": { + "type": "CloudStorageConfig", + "id": 22 + }, "ackDeadlineSeconds": { "type": "int32", "id": 5 @@ -982,6 +986,77 @@ } } }, + "CloudStorageConfig": { + "oneofs": { + "outputFormat": { + "oneof": [ + "textConfig", + "avroConfig" + ] + } + }, + "fields": { + "bucket": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "filenamePrefix": { + "type": "string", + "id": 2 + }, + "filenameSuffix": { + "type": "string", + "id": 3 + }, + "textConfig": { + "type": "TextConfig", + "id": 4 + }, + "avroConfig": { + "type": "AvroConfig", + "id": 5 + }, + "maxDuration": { + "type": "google.protobuf.Duration", + "id": 6 + }, + "maxBytes": { + "type": "int64", + "id": 7 + }, + "state": { + "type": "State", + "id": 9, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + } + }, + "nested": { + "TextConfig": { + "fields": {} + }, + "AvroConfig": { + "fields": { + "writeMetadata": { + "type": "bool", + "id": 1 + } + } + }, + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "PERMISSION_DENIED": 2, + "NOT_FOUND": 3 + } + } + } + }, "ReceivedMessage": { "fields": { "ackId": { diff --git a/handwritten/pubsub/src/v1/schema_service_client_config.json b/handwritten/pubsub/src/v1/schema_service_client_config.json index 05ac8a99177..5a2280962fc 100644 --- a/handwritten/pubsub/src/v1/schema_service_client_config.json +++ b/handwritten/pubsub/src/v1/schema_service_client_config.json @@ -6,6 +6,9 @@ "idempotent": [ "DEADLINE_EXCEEDED", "UNAVAILABLE" + ], + "unavailable": [ + "UNAVAILABLE" ] }, "retry_params": { @@ -21,43 +24,53 @@ }, "methods": { "CreateSchema": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "GetSchema": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "ListSchemas": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "ListSchemaRevisions": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "CommitSchema": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "RollbackSchema": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "DeleteSchemaRevision": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "DeleteSchema": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "ValidateSchema": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" }, "ValidateMessage": { - "retry_codes_name": "non_idempotent", + "timeout_millis": 60000, + "retry_codes_name": "unavailable", "retry_params_name": "default" } } diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 17c9cb1a6df..92461b6cdae 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -425,6 +425,9 @@ export class SubscriberClient { * @param {google.pubsub.v1.BigQueryConfig} request.bigqueryConfig * If delivery to BigQuery is used with this subscription, this field is * used to configure it. + * @param {google.pubsub.v1.CloudStorageConfig} request.cloudStorageConfig + * If delivery to Google Cloud Storage is used with this subscription, this + * field is used to configure it. * @param {number} request.ackDeadlineSeconds * The approximate amount of time (on a best-effort basis) Pub/Sub waits for * the subscriber to acknowledge receipt before resending the message. In the From 58acd68e8d23b6044bacfc344638755e7e110007 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 12 May 2023 12:48:41 -0400 Subject: [PATCH 0922/1115] chore: pull promise-based publish out of OTel change (#1723) This shifts the publisher to use Promise-based logic instead of callbacks. This was pulled out of the OpenTelemetry change to make that one simpler. --- handwritten/pubsub/src/publisher/index.ts | 8 +- .../pubsub/src/publisher/message-queues.ts | 142 ++++++++++-------- handwritten/pubsub/test/publisher/index.ts | 62 +++----- .../pubsub/test/publisher/message-queues.ts | 137 +++++++++-------- 4 files changed, 171 insertions(+), 178 deletions(-) diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index dfe340da8db..aa017a46d6d 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {promisify} from '@google-cloud/promisify'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; @@ -123,14 +122,12 @@ export class Publisher { // event listeners after we've completed flush(). q.removeListener('drain', flushResolver); }; - return q.on('drain', flushResolver); + q.on('drain', flushResolver); }) ) ); - const allPublishes = Promise.all( - toDrain.map(q => promisify(q.publishDrain).bind(q)()) - ); + const allPublishes = Promise.all(toDrain.map(q => q.publishDrain())); allPublishes .then(() => allDrains) @@ -139,6 +136,7 @@ export class Publisher { }) .catch(definedCallback); } + /** * Publish the provided message. * diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index ff3052cef73..a9fe4224dda 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -22,9 +22,7 @@ import {PublishError} from './publish-error'; import {Publisher, PubsubMessage, PublishCallback} from './'; import {google} from '../../protos/protos'; -export interface PublishDone { - (err: ServiceError | null): void; -} +import {promisify} from 'util'; /** * Queues are used to manage publishing batches of messages. @@ -73,7 +71,7 @@ export abstract class MessageQueue extends EventEmitter { * * @abstract */ - abstract publish(): void; + abstract publish(): Promise; /** * Method to finalize publishing. Does as many publishes as are needed @@ -81,49 +79,47 @@ export abstract class MessageQueue extends EventEmitter { * * @abstract */ - abstract publishDrain(): void; + abstract publishDrain(): Promise; /** * Accepts a batch of messages and publishes them to the API. * * @param {object[]} messages The messages to publish. * @param {PublishCallback[]} callbacks The corresponding callback functions. - * @param {function} [callback] Callback to be fired when publish is done. */ - _publish( + async _publish( messages: PubsubMessage[], - callbacks: PublishCallback[], - callback?: PublishDone - ): void { + callbacks: PublishCallback[] + ): Promise { const {topic, settings} = this.publisher; const reqOpts = { topic: topic.name, messages, }; if (messages.length === 0) { - if (typeof callback === 'function') { - // Do this on the next tick to avoid Zalgo with the publish request below. - process.nextTick(() => callback(null)); - } return; } - topic.request( - { + const requestCallback = topic.request; + const request = promisify(requestCallback.bind(topic)); + try { + const resp = await request({ client: 'PublisherClient', method: 'publish', reqOpts, gaxOpts: settings.gaxOpts!, - }, - (err, resp) => { - const messageIds = (resp && resp.messageIds) || []; - callbacks.forEach((callback, i) => callback(err, messageIds[i])); - - if (typeof callback === 'function') { - callback(err); - } + }); + + if (resp) { + const messageIds = resp.messageIds || []; + callbacks.forEach((callback, i) => callback(null, messageIds[i])); } - ); + } catch (e) { + const err = e as ServiceError; + callbacks.forEach(callback => callback(err)); + + throw e; + } } } @@ -156,16 +152,25 @@ export class Queue extends MessageQueue { */ add(message: PubsubMessage, callback: PublishCallback): void { if (!this.batch.canFit(message)) { - this.publish(); + // Make a background best-effort attempt to clear out the + // queue. If this fails, we'll basically just be overloaded + // for a bit. + this.publish().catch(() => {}); } this.batch.add(message, callback); if (this.batch.isFull()) { - this.publish(); + // See comment above - best effort. + this.publish().catch(() => {}); } else if (!this.pending) { const {maxMilliseconds} = this.batchOptions; - this.pending = setTimeout(() => this.publish(), maxMilliseconds!); + this.pending = setTimeout(() => { + // See comment above - we are basically making a best effort + // to start clearing out the queue if nothing else happens + // before the batch timeout. + this.publish().catch(() => {}); + }, maxMilliseconds!); } } @@ -176,8 +181,8 @@ export class Queue extends MessageQueue { * * @emits Queue#drain when all messages are sent. */ - publishDrain(callback?: PublishDone): void { - this._publishInternal(true, callback); + async publishDrain(): Promise { + await this._publishInternal(true); } /** @@ -185,8 +190,8 @@ export class Queue extends MessageQueue { * * Does _not_ attempt to further drain after one batch is sent. */ - publish(callback?: PublishDone): void { - this._publishInternal(false, callback); + async publish(): Promise { + await this._publishInternal(false); } /** @@ -194,8 +199,7 @@ export class Queue extends MessageQueue { * * @emits Queue#drain when all messages are sent. */ - _publishInternal(fullyDrain: boolean, callback?: PublishDone): void { - const definedCallback = callback || (() => {}); + async _publishInternal(fullyDrain: boolean): Promise { const {messages, callbacks} = this.batch; this.batch = new MessageBatch(this.batchOptions); @@ -205,21 +209,17 @@ export class Queue extends MessageQueue { delete this.pending; } - this._publish(messages, callbacks, (err: null | ServiceError) => { - if (err) { - definedCallback(err); - } else if (this.batch.messages.length) { - // We only do the indefinite go-arounds when we're trying to do a - // final drain for flush(). In all other cases, we want to leave - // subsequent batches alone so that they can time out as needed. - if (fullyDrain) { - this._publishInternal(true, callback); - } - } else { - this.emit('drain'); - definedCallback(null); + await this._publish(messages, callbacks); + if (this.batch.messages.length) { + // We only do the indefinite go-arounds when we're trying to do a + // final drain for flush(). In all other cases, we want to leave + // subsequent batches alone so that they can time out as needed. + if (fullyDrain) { + await this._publishInternal(true); } - }); + } else { + this.emit('drain'); + } } } @@ -286,7 +286,10 @@ export class OrderedQueue extends MessageQueue { } if (!this.currentBatch.canFit(message)) { - this.publish(); + // Make a best-effort attempt to clear out the publish queue, + // to make more space for the new batch. If this fails, we'll + // just be overfilled for a bit. + this.publish().catch(() => {}); } this.currentBatch.add(message, callback); @@ -295,7 +298,8 @@ export class OrderedQueue extends MessageQueue { // check again here if (!this.inFlight) { if (this.currentBatch.isFull()) { - this.publish(); + // See comment above - best-effort. + this.publish().catch(() => {}); } else if (!this.pending) { this.beginNextPublish(); } @@ -309,7 +313,12 @@ export class OrderedQueue extends MessageQueue { const timeWaiting = Date.now() - this.currentBatch.created; const delay = Math.max(0, maxMilliseconds - timeWaiting); - this.pending = setTimeout(() => this.publish(), delay); + this.pending = setTimeout(() => { + // Make a best-effort attempt to start a publish request. If + // this fails, we'll catch it again later, eventually, when more + // messages try to enter the queue. + this.publish().catch(() => {}); + }, delay); } /** * Creates a new {@link MessageBatch} instance. @@ -344,8 +353,7 @@ export class OrderedQueue extends MessageQueue { * * @fires OrderedQueue#drain */ - publish(callback?: PublishDone): void { - const definedCallback = callback || (() => {}); + async publish(): Promise { this.inFlight = true; if (this.pending) { @@ -355,19 +363,21 @@ export class OrderedQueue extends MessageQueue { const {messages, callbacks} = this.batches.pop()!; - this._publish(messages, callbacks, (err: null | ServiceError) => { + try { + await this._publish(messages, callbacks); + } catch (e) { + const err = e as ServiceError; + this.inFlight = false; + this.handlePublishFailure(err); + } finally { this.inFlight = false; + } - if (err) { - this.handlePublishFailure(err); - definedCallback(err); - } else if (this.batches.length) { - this.beginNextPublish(); - } else { - this.emit('drain'); - definedCallback(null); - } - }); + if (this.batches.length) { + this.beginNextPublish(); + } else { + this.emit('drain'); + } } /** @@ -375,8 +385,8 @@ export class OrderedQueue extends MessageQueue { * * @fires OrderedQueue#drain */ - publishDrain(callback?: PublishDone): void { - this.publish(callback); + async publishDrain(): Promise { + await this.publish(); } /** diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 82ba5d61832..451bb82f27b 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -60,19 +60,17 @@ class FakeQueue extends EventEmitter { updateOptions() {} // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: p.PubsubMessage, callback: p.PublishCallback): void {} - publish(callback: (err: Error | null) => void) { - this._publish([], [], callback); + async publish() { + await this._publish([], []); } - publishDrain(callback: (err: Error | null) => void) { - this.publish(callback); + async publishDrain() { + await this.publish(); } - _publish( + async _publish( // eslint-disable-next-line @typescript-eslint/no-unused-vars messages: p.PubsubMessage[], // eslint-disable-next-line @typescript-eslint/no-unused-vars - callbacks: p.PublishCallback[], - // eslint-disable-next-line @typescript-eslint/no-unused-vars - callback?: q.PublishDone + callbacks: p.PublishCallback[] ) {} } @@ -84,20 +82,17 @@ class FakeOrderedQueue extends FakeQueue { this.orderingKey = key; } resumePublishing(): void {} - // eslint-disable-next-line @typescript-eslint/no-unused-vars - publish(callback: (err: Error | null) => void) { - this._publish([], [], callback); + async publish() { + await this._publish([], []); } - publishDrain(callback: (err: Error | null) => void) { - this.publish(callback); + async publishDrain() { + await this.publish(); } - _publish( + async _publish( // eslint-disable-next-line @typescript-eslint/no-unused-vars messages: p.PubsubMessage[], // eslint-disable-next-line @typescript-eslint/no-unused-vars - callbacks: p.PublishCallback[], - // eslint-disable-next-line @typescript-eslint/no-unused-vars - callback?: q.PublishDone + callbacks: p.PublishCallback[] ) {} } @@ -350,20 +345,17 @@ describe('Publisher', () => { it('should drain any ordered queues on flush', done => { // We have to stub out the regular queue as well, so that the flush() operation finishes. - sandbox - .stub(FakeQueue.prototype, '_publish') - .callsFake((messages, callbacks, callback) => { - // Simulate the drain taking longer than the publishes. This can - // happen if more messages are queued during the publish(). - process.nextTick(() => { - publisher.queue.emit('drain'); - }); - if (typeof callback === 'function') callback(null); + sandbox.stub(FakeQueue.prototype, '_publish').callsFake(async () => { + // Simulate the drain taking longer than the publishes. This can + // happen if more messages are queued during the publish(). + process.nextTick(() => { + publisher.queue.emit('drain'); }); + }); sandbox .stub(FakeOrderedQueue.prototype, '_publish') - .callsFake((messages, callbacks, callback) => { + .callsFake(async () => { const queue = publisher.orderedQueues.get( orderingKey ) as unknown as FakeOrderedQueue; @@ -373,7 +365,6 @@ describe('Publisher', () => { process.nextTick(() => { queue.emit('drain'); }); - if (typeof callback === 'function') callback(null); }); publisher.orderedQueues.clear(); @@ -508,16 +499,13 @@ describe('Publisher', () => { describe('flush', () => { // The ordered queue drain test is above with the ordered queue tests. it('should drain the main publish queue', done => { - sandbox - .stub(publisher.queue, '_publish') - .callsFake((messages, callbacks, callback) => { - // Simulate the drain taking longer than the publishes. This can - // happen if more messages are queued during the publish(). - process.nextTick(() => { - publisher.queue.emit('drain'); - }); - if (typeof callback === 'function') callback(null); + sandbox.stub(publisher.queue, '_publish').callsFake(async () => { + // Simulate the drain taking longer than the publishes. This can + // happen if more messages are queued during the publish(). + process.nextTick(() => { + publisher.queue.emit('drain'); }); + }); publisher.flush(err => { assert.strictEqual(err, null); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index eda38f1fa53..f28b4e33b02 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -169,42 +169,41 @@ describe('Message Queues', () => { assert.strictEqual(gaxOpts, callOptions); }); - it('should pass back any request errors', done => { + it('should pass back any request errors', async () => { const error = new Error('err') as ServiceError; sandbox.stub(topic, 'request').callsFake((config, callback) => { callback(error); }); - queue._publish(messages, callbacks, err => { + try { + await queue._publish(messages, callbacks); + assert.strictEqual(null, error, '_publish did not throw'); + } catch (e) { + const err = e as ServiceError; + assert.strictEqual(err, error); callbacks.forEach(callback => { const [err] = callback.lastCall.args; assert.strictEqual(err, error); }); - - done(); - }); + } }); - it('should pass back message ids', done => { + it('should pass back message ids', async () => { const messageIds = messages.map((_, i) => `message${i}`); sandbox.stub(topic, 'request').callsFake((config, callback) => { callback(null, {messageIds}); }); - queue._publish(messages, callbacks, err => { - assert.ifError(err); + await queue._publish(messages, callbacks); - callbacks.forEach((callback, i) => { - const [, messageId] = callback.lastCall.args; - const expectedId = `message${i}`; - assert.strictEqual(messageId, expectedId); - }); - - done(); + callbacks.forEach((callback, i) => { + const [, messageId] = callback.lastCall.args; + const expectedId = `message${i}`; + assert.strictEqual(messageId, expectedId); }); }); }); @@ -241,20 +240,19 @@ describe('Message Queues', () => { const addStub = sandbox.stub(queue.batch, 'add'); sandbox.stub(queue.batch, 'canFit').returns(false); - sandbox - .stub(queue, 'publish') - .onCall(0) - .callsFake(() => { - assert.strictEqual(addStub.callCount, 0); - done(); - }); + const publishStub = sandbox.stub(queue, 'publish'); + publishStub.onCall(0).callsFake(async () => { + assert.strictEqual(addStub.callCount, 0); + done(); + }); + publishStub.resolves(); queue.add(fakeMessage, spy); }); it('should add the message to the batch', () => { const stub = sandbox.stub(queue.batch, 'add'); - sandbox.stub(queue, 'publish'); + sandbox.stub(queue, 'publish').resolves(); queue.add(fakeMessage, spy); @@ -264,7 +262,7 @@ describe('Message Queues', () => { }); it('should publish immediately if the batch became full', () => { - const stub = sandbox.stub(queue, 'publish'); + const stub = sandbox.stub(queue, 'publish').resolves(); sandbox.stub(queue.batch, 'isFull').returns(true); queue.add(fakeMessage, spy); @@ -274,7 +272,7 @@ describe('Message Queues', () => { it('should set a timeout to publish if need be', () => { const clock = sandbox.useFakeTimers(); - const stub = sandbox.stub(queue, 'publish'); + const stub = sandbox.stub(queue, 'publish').resolves(); const maxMilliseconds = 1234; queue.batchOptions = {maxMilliseconds}; @@ -288,7 +286,7 @@ describe('Message Queues', () => { it('should noop if a timeout is already set', () => { const clock = sandbox.useFakeTimers(); - const stub = sandbox.stub(queue, 'publish'); + const stub = sandbox.stub(queue, 'publish').resolves(); const maxMilliseconds = 1234; queue.batchOptions = {maxMilliseconds}; @@ -343,10 +341,10 @@ describe('Message Queues', () => { spies = [sandbox.spy(), sandbox.spy()] as p.PublishCallback[]; }); - it('should begin another publish(drain) if there are pending batches', () => { + it('should begin another publish(drain) if there are pending batches', done => { const stub = sandbox.stub(queue, '_publish'); let once = false; - stub.callsFake((m, c, done) => { + stub.callsFake(async () => { if (!once) { // Drop in a second batch before calling the callback. const secondBatch = new FakeMessageBatch(); @@ -355,22 +353,23 @@ describe('Message Queues', () => { queue.batch = secondBatch; } once = true; - - done!(null); }); queue.batch = new FakeMessageBatch(); queue.batch.messages = fakeMessages; queue.batch.callbacks = spies; - queue.publishDrain(); - - assert.strictEqual(stub.callCount, 2); + queue.publishDrain().then(() => { + process.nextTick(() => { + assert.strictEqual(stub.callCount, 2); + done(); + }); + }); }); it('should not begin another publish(non-drain) if there are pending batches', () => { const stub = sandbox.stub(queue, '_publish'); let once = false; - stub.callsFake((m, c, done) => { + stub.callsFake(async () => { if (!once) { // Drop in a second batch before calling the callback. const secondBatch = new FakeMessageBatch(); @@ -379,28 +378,27 @@ describe('Message Queues', () => { queue.batch = secondBatch; } once = true; - - done!(null); }); queue.batch = new FakeMessageBatch(); queue.batch.messages = fakeMessages; queue.batch.callbacks = spies; - queue.publish(); - - assert.strictEqual(stub.callCount, 1); + queue.publish().then(() => { + assert.strictEqual(stub.callCount, 1); + }); }); - it('should emit "drain" if there is nothing left to publish', () => { + it('should emit "drain" if there is nothing left to publish', done => { const spy = sandbox.spy(); - sandbox - .stub(queue, '_publish') - .callsFake((m, c, done) => done!(null)); + sandbox.stub(queue, '_publish').callsFake(async () => {}); queue.on('drain', spy); - queue.publish(); - - assert.strictEqual(spy.callCount, 1); + queue.publish().then(() => { + process.nextTick(() => { + assert.strictEqual(spy.callCount, 1); + done(); + }); + }); }); }); }); @@ -506,13 +504,12 @@ describe('Message Queues', () => { const addStub = sandbox.stub(batch, 'add'); sandbox.stub(batch, 'canFit').withArgs(fakeMessage).returns(false); - sandbox - .stub(queue, 'publish') - .onCall(0) - .callsFake(() => { - assert.strictEqual(addStub.callCount, 0); - done(); - }); + const publishStub = sandbox.stub(queue, 'publish'); + publishStub.onCall(0).callsFake(async () => { + assert.strictEqual(addStub.callCount, 0); + done(); + }); + publishStub.resolves(); queue.add(fakeMessage, spy); }); @@ -528,12 +525,12 @@ describe('Message Queues', () => { }); it('should noop after adding if a publish was triggered', () => { - const publishStub = sandbox.stub(queue, 'publish'); + const publishStub = sandbox.stub(queue, 'publish').resolves(); const beginPublishStub = sandbox.stub(queue, 'beginNextPublish'); sandbox.stub(batch, 'canFit').returns(false); - publishStub.onCall(0).callsFake(() => { + publishStub.onCall(0).callsFake(async () => { queue.inFlight = true; }); @@ -544,7 +541,7 @@ describe('Message Queues', () => { }); it('should publish immediately if the batch is full', () => { - const stub = sandbox.stub(queue, 'publish'); + const stub = sandbox.stub(queue, 'publish').resolves(); sandbox.stub(batch, 'isFull').returns(true); queue.add(fakeMessage, spy); @@ -585,14 +582,14 @@ describe('Message Queues', () => { }); it('should set a timeout that will call publish', done => { - sandbox.stub(queue, 'publish').callsFake(done); + sandbox.stub(queue, 'publish').callsFake(async () => done()); queue.beginNextPublish(); clock.tick(maxMilliseconds); }); it('should factor in the time the batch has been sitting', done => { const halfway = maxMilliseconds / 2; - sandbox.stub(queue, 'publish').callsFake(done); + sandbox.stub(queue, 'publish').callsFake(async () => done()); queue.currentBatch.created = Date.now() - halfway; queue.beginNextPublish(); clock.tick(halfway); @@ -689,46 +686,46 @@ describe('Message Queues', () => { assert.strictEqual(callbacks, spies); }); - it('should set inFlight to false after publishing', () => { - sandbox.stub(queue, '_publish').callsFake((m, c, done) => done!(null)); + it('should set inFlight to false after publishing', async () => { + sandbox.stub(queue, '_publish').resolves(); - queue.publish(); + await queue.publish(); assert.strictEqual(queue.inFlight, false); }); - it('should handle any publish failures', () => { + it('should handle any publish failures', async () => { const error = new Error('err') as ServiceError; const stub = sandbox.stub(queue, 'handlePublishFailure'); - sandbox.stub(queue, '_publish').callsFake((m, c, done) => done!(error)); + sandbox.stub(queue, '_publish').rejects(error); - queue.publish(); + await queue.publish(); const [err] = stub.lastCall.args; assert.strictEqual(err, error); }); - it('should begin another publish if there are pending batches', () => { + it('should begin another publish if there are pending batches', async () => { const stub = sandbox.stub(queue, 'beginNextPublish'); - sandbox.stub(queue, '_publish').callsFake((m, c, done) => done!(null)); + sandbox.stub(queue, '_publish').resolves(); const secondBatch = new FakeMessageBatch(); secondBatch.messages = fakeMessages; secondBatch.callbacks = spies; queue.batches.push(secondBatch as b.MessageBatch); - queue.publish(); + await queue.publish(); assert.strictEqual(stub.callCount, 1); }); - it('should emit "drain" if there is nothing left to publish', () => { + it('should emit "drain" if there is nothing left to publish', async () => { const spy = sandbox.spy(); - sandbox.stub(queue, '_publish').callsFake((m, c, done) => done!(null)); + sandbox.stub(queue, '_publish').resolves(); queue.on('drain', spy); - queue.publish(); + await queue.publish(); assert.strictEqual(spy.callCount, 1); }); From 0152e3d112b2dbecbe9b000094da2a0cc1060cdb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 17:14:15 +0000 Subject: [PATCH 0923/1115] chore(main): release 3.6.0 (#1726) :robot: I have created a release *beep* *boop* --- ## [3.6.0](https://togithub.com/googleapis/nodejs-pubsub/compare/v3.5.2...v3.6.0) (2023-05-12) ### Features * Add cloud storage subscription fields ([#1724](https://togithub.com/googleapis/nodejs-pubsub/issues/1724)) ([f61a64a](https://togithub.com/googleapis/nodejs-pubsub/commit/f61a64a2daffdfbf4c7b18d50434899c572d108c)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 5c1f82cf5fe..c0033fe8a32 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.6.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.5.2...v3.6.0) (2023-05-12) + + +### Features + +* Add cloud storage subscription fields ([#1724](https://github.com/googleapis/nodejs-pubsub/issues/1724)) ([f61a64a](https://github.com/googleapis/nodejs-pubsub/commit/f61a64a2daffdfbf4c7b18d50434899c572d108c)) + ## [3.5.2](https://github.com/googleapis/nodejs-pubsub/compare/v3.5.1...v3.5.2) (2023-04-26) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5c2f338f5a1..97435004167 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.5.2", + "version": "3.6.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From c5e9b91b9e89fac0e98b0509668fb6c08a7cdd11 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 09:37:39 -0400 Subject: [PATCH 0924/1115] feat: add push config wrapper fields (#1730) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add push config wrapper fields PiperOrigin-RevId: 534994946 Source-Link: https://github.com/googleapis/googleapis/commit/64ecfebceee57a7fd22723d1b11b729270baf9c5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/03534b3dd4c926f706729d979d893458db7e174d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDM1MzRiM2RkNGM5MjZmNzA2NzI5ZDk3OWQ4OTM0NThkYjdlMTc0ZCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 25 + handwritten/pubsub/protos/protos.d.ts | 203 ++++++++ handwritten/pubsub/protos/protos.js | 457 ++++++++++++++++++ handwritten/pubsub/protos/protos.json | 25 + 4 files changed, 710 insertions(+) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 29ab6f09be1..5f63854a42a 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -903,6 +903,19 @@ message PushConfig { string audience = 2; } + // The payload to the push endpoint is in the form of the JSON representation + // of a PubsubMessage + // (https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#pubsubmessage). + message PubsubWrapper {} + + // Sets the `data` field as the HTTP body for delivery. + message NoWrapper { + // When true, writes the Pub/Sub message metadata to + // `x-goog-pubsub-:` headers of the HTTP request. Writes the + // Pub/Sub message attributes to `:` headers of the HTTP request. + bool write_metadata = 1; + } + // A URL locating the endpoint to which messages should be pushed. // For example, a Webhook endpoint might use `https://example.com/push`. string push_endpoint = 1; @@ -940,6 +953,18 @@ message PushConfig { // `Authorization` header in the HTTP request for every pushed message. OidcToken oidc_token = 3; } + + // The format of the delivered message to the push endpoint is defined by + // the chosen wrapper. When unset, `PubsubWrapper` is used. + oneof wrapper { + // When set, the payload to the push endpoint is in the form of the JSON + // representation of a PubsubMessage + // (https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#pubsubmessage). + PubsubWrapper pubsub_wrapper = 4; + + // When set, the payload to the push endpoint is not wrapped. + NoWrapper no_wrapper = 5; + } } // Configuration for a BigQuery subscription. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 6c6f974ed77..e466657f602 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -2906,6 +2906,12 @@ export namespace google { /** PushConfig oidcToken */ oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + + /** PushConfig pubsubWrapper */ + pubsubWrapper?: (google.pubsub.v1.PushConfig.IPubsubWrapper|null); + + /** PushConfig noWrapper */ + noWrapper?: (google.pubsub.v1.PushConfig.INoWrapper|null); } /** Represents a PushConfig. */ @@ -2926,9 +2932,18 @@ export namespace google { /** PushConfig oidcToken. */ public oidcToken?: (google.pubsub.v1.PushConfig.IOidcToken|null); + /** PushConfig pubsubWrapper. */ + public pubsubWrapper?: (google.pubsub.v1.PushConfig.IPubsubWrapper|null); + + /** PushConfig noWrapper. */ + public noWrapper?: (google.pubsub.v1.PushConfig.INoWrapper|null); + /** PushConfig authenticationMethod. */ public authenticationMethod?: "oidcToken"; + /** PushConfig wrapper. */ + public wrapper?: ("pubsubWrapper"|"noWrapper"); + /** * Creates a new PushConfig instance using the specified properties. * @param [properties] Properties to set @@ -3111,6 +3126,194 @@ export namespace google { */ public static getTypeUrl(typeUrlPrefix?: string): string; } + + /** Properties of a PubsubWrapper. */ + interface IPubsubWrapper { + } + + /** Represents a PubsubWrapper. */ + class PubsubWrapper implements IPubsubWrapper { + + /** + * Constructs a new PubsubWrapper. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.PushConfig.IPubsubWrapper); + + /** + * Creates a new PubsubWrapper instance using the specified properties. + * @param [properties] Properties to set + * @returns PubsubWrapper instance + */ + public static create(properties?: google.pubsub.v1.PushConfig.IPubsubWrapper): google.pubsub.v1.PushConfig.PubsubWrapper; + + /** + * Encodes the specified PubsubWrapper message. Does not implicitly {@link google.pubsub.v1.PushConfig.PubsubWrapper.verify|verify} messages. + * @param message PubsubWrapper message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.PushConfig.IPubsubWrapper, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PubsubWrapper message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.PubsubWrapper.verify|verify} messages. + * @param message PubsubWrapper message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.PushConfig.IPubsubWrapper, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PubsubWrapper message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PubsubWrapper + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.PubsubWrapper; + + /** + * Decodes a PubsubWrapper message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PubsubWrapper + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.PubsubWrapper; + + /** + * Verifies a PubsubWrapper message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PubsubWrapper message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PubsubWrapper + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.PubsubWrapper; + + /** + * Creates a plain object from a PubsubWrapper message. Also converts values to other types if specified. + * @param message PubsubWrapper + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig.PubsubWrapper, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PubsubWrapper to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PubsubWrapper + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a NoWrapper. */ + interface INoWrapper { + + /** NoWrapper writeMetadata */ + writeMetadata?: (boolean|null); + } + + /** Represents a NoWrapper. */ + class NoWrapper implements INoWrapper { + + /** + * Constructs a new NoWrapper. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.PushConfig.INoWrapper); + + /** NoWrapper writeMetadata. */ + public writeMetadata: boolean; + + /** + * Creates a new NoWrapper instance using the specified properties. + * @param [properties] Properties to set + * @returns NoWrapper instance + */ + public static create(properties?: google.pubsub.v1.PushConfig.INoWrapper): google.pubsub.v1.PushConfig.NoWrapper; + + /** + * Encodes the specified NoWrapper message. Does not implicitly {@link google.pubsub.v1.PushConfig.NoWrapper.verify|verify} messages. + * @param message NoWrapper message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.PushConfig.INoWrapper, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified NoWrapper message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.NoWrapper.verify|verify} messages. + * @param message NoWrapper message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.PushConfig.INoWrapper, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a NoWrapper message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns NoWrapper + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PushConfig.NoWrapper; + + /** + * Decodes a NoWrapper message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns NoWrapper + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PushConfig.NoWrapper; + + /** + * Verifies a NoWrapper message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a NoWrapper message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns NoWrapper + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PushConfig.NoWrapper; + + /** + * Creates a plain object from a NoWrapper message. Also converts values to other types if specified. + * @param message NoWrapper + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PushConfig.NoWrapper, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this NoWrapper to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for NoWrapper + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } } /** Properties of a BigQueryConfig. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index a6178c72bf7..12b95492de7 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -6571,6 +6571,8 @@ * @property {string|null} [pushEndpoint] PushConfig pushEndpoint * @property {Object.|null} [attributes] PushConfig attributes * @property {google.pubsub.v1.PushConfig.IOidcToken|null} [oidcToken] PushConfig oidcToken + * @property {google.pubsub.v1.PushConfig.IPubsubWrapper|null} [pubsubWrapper] PushConfig pubsubWrapper + * @property {google.pubsub.v1.PushConfig.INoWrapper|null} [noWrapper] PushConfig noWrapper */ /** @@ -6613,6 +6615,22 @@ */ PushConfig.prototype.oidcToken = null; + /** + * PushConfig pubsubWrapper. + * @member {google.pubsub.v1.PushConfig.IPubsubWrapper|null|undefined} pubsubWrapper + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.pubsubWrapper = null; + + /** + * PushConfig noWrapper. + * @member {google.pubsub.v1.PushConfig.INoWrapper|null|undefined} noWrapper + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + PushConfig.prototype.noWrapper = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; @@ -6627,6 +6645,17 @@ set: $util.oneOfSetter($oneOfFields) }); + /** + * PushConfig wrapper. + * @member {"pubsubWrapper"|"noWrapper"|undefined} wrapper + * @memberof google.pubsub.v1.PushConfig + * @instance + */ + Object.defineProperty(PushConfig.prototype, "wrapper", { + get: $util.oneOfGetter($oneOfFields = ["pubsubWrapper", "noWrapper"]), + set: $util.oneOfSetter($oneOfFields) + }); + /** * Creates a new PushConfig instance using the specified properties. * @function create @@ -6658,6 +6687,10 @@ writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.attributes[keys[i]]).ldelim(); if (message.oidcToken != null && Object.hasOwnProperty.call(message, "oidcToken")) $root.google.pubsub.v1.PushConfig.OidcToken.encode(message.oidcToken, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.pubsubWrapper != null && Object.hasOwnProperty.call(message, "pubsubWrapper")) + $root.google.pubsub.v1.PushConfig.PubsubWrapper.encode(message.pubsubWrapper, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.noWrapper != null && Object.hasOwnProperty.call(message, "noWrapper")) + $root.google.pubsub.v1.PushConfig.NoWrapper.encode(message.noWrapper, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); return writer; }; @@ -6723,6 +6756,14 @@ message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.decode(reader, reader.uint32()); break; } + case 4: { + message.pubsubWrapper = $root.google.pubsub.v1.PushConfig.PubsubWrapper.decode(reader, reader.uint32()); + break; + } + case 5: { + message.noWrapper = $root.google.pubsub.v1.PushConfig.NoWrapper.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -6778,6 +6819,24 @@ return "oidcToken." + error; } } + if (message.pubsubWrapper != null && message.hasOwnProperty("pubsubWrapper")) { + properties.wrapper = 1; + { + var error = $root.google.pubsub.v1.PushConfig.PubsubWrapper.verify(message.pubsubWrapper); + if (error) + return "pubsubWrapper." + error; + } + } + if (message.noWrapper != null && message.hasOwnProperty("noWrapper")) { + if (properties.wrapper === 1) + return "wrapper: multiple values"; + properties.wrapper = 1; + { + var error = $root.google.pubsub.v1.PushConfig.NoWrapper.verify(message.noWrapper); + if (error) + return "noWrapper." + error; + } + } return null; }; @@ -6807,6 +6866,16 @@ throw TypeError(".google.pubsub.v1.PushConfig.oidcToken: object expected"); message.oidcToken = $root.google.pubsub.v1.PushConfig.OidcToken.fromObject(object.oidcToken); } + if (object.pubsubWrapper != null) { + if (typeof object.pubsubWrapper !== "object") + throw TypeError(".google.pubsub.v1.PushConfig.pubsubWrapper: object expected"); + message.pubsubWrapper = $root.google.pubsub.v1.PushConfig.PubsubWrapper.fromObject(object.pubsubWrapper); + } + if (object.noWrapper != null) { + if (typeof object.noWrapper !== "object") + throw TypeError(".google.pubsub.v1.PushConfig.noWrapper: object expected"); + message.noWrapper = $root.google.pubsub.v1.PushConfig.NoWrapper.fromObject(object.noWrapper); + } return message; }; @@ -6840,6 +6909,16 @@ if (options.oneofs) object.authenticationMethod = "oidcToken"; } + if (message.pubsubWrapper != null && message.hasOwnProperty("pubsubWrapper")) { + object.pubsubWrapper = $root.google.pubsub.v1.PushConfig.PubsubWrapper.toObject(message.pubsubWrapper, options); + if (options.oneofs) + object.wrapper = "pubsubWrapper"; + } + if (message.noWrapper != null && message.hasOwnProperty("noWrapper")) { + object.noWrapper = $root.google.pubsub.v1.PushConfig.NoWrapper.toObject(message.noWrapper, options); + if (options.oneofs) + object.wrapper = "noWrapper"; + } return object; }; @@ -7096,6 +7175,384 @@ return OidcToken; })(); + PushConfig.PubsubWrapper = (function() { + + /** + * Properties of a PubsubWrapper. + * @memberof google.pubsub.v1.PushConfig + * @interface IPubsubWrapper + */ + + /** + * Constructs a new PubsubWrapper. + * @memberof google.pubsub.v1.PushConfig + * @classdesc Represents a PubsubWrapper. + * @implements IPubsubWrapper + * @constructor + * @param {google.pubsub.v1.PushConfig.IPubsubWrapper=} [properties] Properties to set + */ + function PubsubWrapper(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new PubsubWrapper instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {google.pubsub.v1.PushConfig.IPubsubWrapper=} [properties] Properties to set + * @returns {google.pubsub.v1.PushConfig.PubsubWrapper} PubsubWrapper instance + */ + PubsubWrapper.create = function create(properties) { + return new PubsubWrapper(properties); + }; + + /** + * Encodes the specified PubsubWrapper message. Does not implicitly {@link google.pubsub.v1.PushConfig.PubsubWrapper.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {google.pubsub.v1.PushConfig.IPubsubWrapper} message PubsubWrapper message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PubsubWrapper.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified PubsubWrapper message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.PubsubWrapper.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {google.pubsub.v1.PushConfig.IPubsubWrapper} message PubsubWrapper message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PubsubWrapper.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PubsubWrapper message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PushConfig.PubsubWrapper} PubsubWrapper + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PubsubWrapper.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.PubsubWrapper(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PubsubWrapper message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PushConfig.PubsubWrapper} PubsubWrapper + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PubsubWrapper.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PubsubWrapper message. + * @function verify + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PubsubWrapper.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a PubsubWrapper message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PushConfig.PubsubWrapper} PubsubWrapper + */ + PubsubWrapper.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PushConfig.PubsubWrapper) + return object; + return new $root.google.pubsub.v1.PushConfig.PubsubWrapper(); + }; + + /** + * Creates a plain object from a PubsubWrapper message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {google.pubsub.v1.PushConfig.PubsubWrapper} message PubsubWrapper + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PubsubWrapper.toObject = function toObject() { + return {}; + }; + + /** + * Converts this PubsubWrapper to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @instance + * @returns {Object.} JSON object + */ + PubsubWrapper.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for PubsubWrapper + * @function getTypeUrl + * @memberof google.pubsub.v1.PushConfig.PubsubWrapper + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PubsubWrapper.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PushConfig.PubsubWrapper"; + }; + + return PubsubWrapper; + })(); + + PushConfig.NoWrapper = (function() { + + /** + * Properties of a NoWrapper. + * @memberof google.pubsub.v1.PushConfig + * @interface INoWrapper + * @property {boolean|null} [writeMetadata] NoWrapper writeMetadata + */ + + /** + * Constructs a new NoWrapper. + * @memberof google.pubsub.v1.PushConfig + * @classdesc Represents a NoWrapper. + * @implements INoWrapper + * @constructor + * @param {google.pubsub.v1.PushConfig.INoWrapper=} [properties] Properties to set + */ + function NoWrapper(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * NoWrapper writeMetadata. + * @member {boolean} writeMetadata + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @instance + */ + NoWrapper.prototype.writeMetadata = false; + + /** + * Creates a new NoWrapper instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {google.pubsub.v1.PushConfig.INoWrapper=} [properties] Properties to set + * @returns {google.pubsub.v1.PushConfig.NoWrapper} NoWrapper instance + */ + NoWrapper.create = function create(properties) { + return new NoWrapper(properties); + }; + + /** + * Encodes the specified NoWrapper message. Does not implicitly {@link google.pubsub.v1.PushConfig.NoWrapper.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {google.pubsub.v1.PushConfig.INoWrapper} message NoWrapper message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NoWrapper.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.writeMetadata != null && Object.hasOwnProperty.call(message, "writeMetadata")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.writeMetadata); + return writer; + }; + + /** + * Encodes the specified NoWrapper message, length delimited. Does not implicitly {@link google.pubsub.v1.PushConfig.NoWrapper.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {google.pubsub.v1.PushConfig.INoWrapper} message NoWrapper message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NoWrapper.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a NoWrapper message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PushConfig.NoWrapper} NoWrapper + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NoWrapper.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.NoWrapper(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.writeMetadata = reader.bool(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a NoWrapper message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PushConfig.NoWrapper} NoWrapper + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NoWrapper.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a NoWrapper message. + * @function verify + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + NoWrapper.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.writeMetadata != null && message.hasOwnProperty("writeMetadata")) + if (typeof message.writeMetadata !== "boolean") + return "writeMetadata: boolean expected"; + return null; + }; + + /** + * Creates a NoWrapper message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PushConfig.NoWrapper} NoWrapper + */ + NoWrapper.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PushConfig.NoWrapper) + return object; + var message = new $root.google.pubsub.v1.PushConfig.NoWrapper(); + if (object.writeMetadata != null) + message.writeMetadata = Boolean(object.writeMetadata); + return message; + }; + + /** + * Creates a plain object from a NoWrapper message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {google.pubsub.v1.PushConfig.NoWrapper} message NoWrapper + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + NoWrapper.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.writeMetadata = false; + if (message.writeMetadata != null && message.hasOwnProperty("writeMetadata")) + object.writeMetadata = message.writeMetadata; + return object; + }; + + /** + * Converts this NoWrapper to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @instance + * @returns {Object.} JSON object + */ + NoWrapper.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for NoWrapper + * @function getTypeUrl + * @memberof google.pubsub.v1.PushConfig.NoWrapper + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + NoWrapper.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PushConfig.NoWrapper"; + }; + + return NoWrapper; + })(); + return PushConfig; })(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 0e0062a4257..646f8fce888 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -916,6 +916,12 @@ "oneof": [ "oidcToken" ] + }, + "wrapper": { + "oneof": [ + "pubsubWrapper", + "noWrapper" + ] } }, "fields": { @@ -931,6 +937,14 @@ "oidcToken": { "type": "OidcToken", "id": 3 + }, + "pubsubWrapper": { + "type": "PubsubWrapper", + "id": 4 + }, + "noWrapper": { + "type": "NoWrapper", + "id": 5 } }, "nested": { @@ -945,6 +959,17 @@ "id": 2 } } + }, + "PubsubWrapper": { + "fields": {} + }, + "NoWrapper": { + "fields": { + "writeMetadata": { + "type": "bool", + "id": 1 + } + } } } }, From f623002722d22f93fe34a1fec3118f447928bfcb Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 26 May 2023 09:49:14 -0400 Subject: [PATCH 0925/1115] docs: update docs-devsite.sh to use latest node-js-rad version (#1729) Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> Source-Link: https://github.com/googleapis/synthtool/commit/b1ced7db5adee08cfa91d6b138679fceff32c004 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:0527a86c10b67742c409dc726ba9a31ec4e69b0006e3d7a49b0e6686c59cdaa9 Co-authored-by: Owl Bot Co-authored-by: danieljbruce --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 3 ++- handwritten/pubsub/.kokoro/release/docs-devsite.sh | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 0b836e11907..21ad18bd722 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:e6d785d6de3cab027f6213d95ccedab4cab3811b0d3172b78db2216faa182e32 + digest: sha256:0527a86c10b67742c409dc726ba9a31ec4e69b0006e3d7a49b0e6686c59cdaa9 +# created: 2023-05-24T20:32:43.844586914Z diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh index 2198e67fe92..3596c1e4cb1 100755 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.sh +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -25,5 +25,6 @@ if [[ -z "$CREDENTIALS" ]]; then fi npm install -npm install --no-save @google-cloud/cloud-rad@^0.2.5 -npx @google-cloud/cloud-rad \ No newline at end of file +npm install --no-save @google-cloud/cloud-rad@^0.3.7 +# publish docs to devsite +npx @google-cloud/cloud-rad . cloud-rad From f22fa3ce8d02656702fe624d33747559ac2671f1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 26 May 2023 13:34:51 -0400 Subject: [PATCH 0926/1115] chore(main): release 3.7.0 (#1731) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c0033fe8a32..09d0ec97d7c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.7.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.6.0...v3.7.0) (2023-05-26) + + +### Features + +* Add push config wrapper fields ([#1730](https://github.com/googleapis/nodejs-pubsub/issues/1730)) ([a552719](https://github.com/googleapis/nodejs-pubsub/commit/a552719dfebda4c1263c352ea99bf8f9570290b7)) + ## [3.6.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.5.2...v3.6.0) (2023-05-12) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 97435004167..1c52169026d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.6.0", + "version": "3.7.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From c884c4c0579923f3dea87d32d76aee06d660b05c Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 26 May 2023 15:12:12 -0400 Subject: [PATCH 0927/1115] tests: make sure to catch all messages on flaky ordered message test (#1728) Maybe fixes: https://togithub.com/googleapis/nodejs-pubsub/issues/1727 --- handwritten/pubsub/system-test/pubsub.ts | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 8d138c8c082..3c328362d76 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -307,20 +307,6 @@ describe('pubsub', () => { // eslint-disable-next-line @typescript-eslint/no-var-requires } = require('../../system-test/fixtures/ordered-messages.json'); - const publishes = input.map(({key, message}: Input) => { - const options: MessageOptions = { - data: Buffer.from(message), - }; - - if (key) { - options.orderingKey = key; - } - - return topic.publishMessage(options); - }); - - await Promise.all(publishes); - const pending: Pending = {}; expected.forEach(({key, messages}: Expected) => { @@ -329,6 +315,7 @@ describe('pubsub', () => { const deferred = defer(); + // Make sure we're listening when the lease manager throws the messages at us. subscription .on('error', deferred.reject) .on('message', (message: Message) => { @@ -371,6 +358,19 @@ describe('pubsub', () => { } }); + const publishes = input.map(({key, message}: Input) => { + const options: MessageOptions = { + data: Buffer.from(message), + }; + + if (key) { + options.orderingKey = key; + } + + return topic.publishMessage(options); + }); + await Promise.all(publishes); + await deferred.promise; await Promise.all([topic.delete(), subscription.delete()]); }); From 4c04c63198ec3831295379d4bc82280bf2036335 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 6 Jun 2023 22:27:09 +0200 Subject: [PATCH 0928/1115] chore(deps): update dependency linkinator to v5 (#1733) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1c52169026d..af9a57aa308 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -85,7 +85,7 @@ "jsdoc": "^4.0.0", "jsdoc-fresh": "^2.0.0", "jsdoc-region-tag": "^2.0.0", - "linkinator": "^4.0.0", + "linkinator": "^5.0.0", "mocha": "^9.2.2", "mv": "^2.1.1", "ncp": "^2.0.0", From d230cbe34585f2cf7e71269a37db28ea361c7a32 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 8 Jun 2023 17:17:46 -0400 Subject: [PATCH 0929/1115] fix: don't crash if an already-drained/removed queue gets flushed again (#1747) --- handwritten/pubsub/src/publisher/message-queues.ts | 8 ++++++++ handwritten/pubsub/test/publisher/message-queues.ts | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index a9fe4224dda..3ff88be2562 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -354,6 +354,14 @@ export class OrderedQueue extends MessageQueue { * @fires OrderedQueue#drain */ async publish(): Promise { + // If there's nothing to flush, don't try, just short-circuit to the drain event. + // This can happen if we get a publish() call after already being drained, in + // the case that topic.flush() pulls a reference to us before we get deleted. + if (!this.batches.length) { + this.emit('drain'); + return; + } + this.inFlight = true; if (this.pending) { diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index f28b4e33b02..4c62917e74c 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -729,6 +729,17 @@ describe('Message Queues', () => { assert.strictEqual(spy.callCount, 1); }); + + it('should emit "drain" if already empty on publish', async () => { + const spy = sandbox.spy(); + sandbox.stub(queue, '_publish').resolves(); + + queue.on('drain', spy); + await queue.publish(); + await queue.publish(); + + assert.strictEqual(spy.callCount, 2); + }); }); describe('resumePublishing', () => { From c2a9f1e2663455243b21db3a6ab4b2493826af57 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 21:46:12 +0000 Subject: [PATCH 0930/1115] chore(main): release 3.7.1 (#1748) :robot: I have created a release *beep* *boop* --- ## [3.7.1](https://togithub.com/googleapis/nodejs-pubsub/compare/v3.7.0...v3.7.1) (2023-06-08) ### Bug Fixes * Don't crash if an already-drained/removed queue gets flushed again ([#1747](https://togithub.com/googleapis/nodejs-pubsub/issues/1747)) ([52ea441](https://togithub.com/googleapis/nodejs-pubsub/commit/52ea441fee302aa6c400b58d4ecebbc96a2ea5ea)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 09d0ec97d7c..53be64d8744 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.7.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.7.0...v3.7.1) (2023-06-08) + + +### Bug Fixes + +* Don't crash if an already-drained/removed queue gets flushed again ([#1747](https://github.com/googleapis/nodejs-pubsub/issues/1747)) ([52ea441](https://github.com/googleapis/nodejs-pubsub/commit/52ea441fee302aa6c400b58d4ecebbc96a2ea5ea)) + ## [3.7.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.6.0...v3.7.0) (2023-05-26) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index af9a57aa308..1dce0ab06d8 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.7.0", + "version": "3.7.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 5a4dcfb513cc51e1c0360773eef6b87ef099cdcd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 14 Jun 2023 17:18:43 +0200 Subject: [PATCH 0931/1115] chore(deps): update dependency c8 to v8 (#1749) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1dce0ab06d8..097562d4185 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -78,7 +78,7 @@ "@types/sinon": "^10.0.0", "@types/tmp": "^0.2.0", "@types/uuid": "^9.0.0", - "c8": "^7.0.0", + "c8": "^8.0.0", "codecov": "^3.0.0", "execa": "^5.0.0", "gts": "^3.1.0", From 89bd4e9689a6904992b8ae52e295b682eee9372b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 14:17:54 -0400 Subject: [PATCH 0932/1115] docs: tightened requirements on cloud storage subscription filename suffixes (#1766) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: tightened requirements on cloud storage subscription filename suffixes PiperOrigin-RevId: 543503563 Source-Link: https://github.com/googleapis/googleapis/commit/212ecef96e3ea7c67465ff3f52680301ad0ea1f9 Source-Link: https://github.com/googleapis/googleapis-gen/commit/532d27eea6ff128fdcbb3332176e894e76dcc685 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTMyZDI3ZWVhNmZmMTI4ZmRjYmIzMzMyMTc2ZTg5NGU3NmRjYzY4NSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 5f63854a42a..9ff80f2f6b5 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1061,7 +1061,8 @@ message CloudStorageConfig { string filename_prefix = 2; // User-provided suffix for Cloud Storage filename. See the [object naming - // requirements](https://cloud.google.com/storage/docs/objects#naming). + // requirements](https://cloud.google.com/storage/docs/objects#naming). Must + // not end in "/". string filename_suffix = 3; // Defaults to text format. From 8c11b247cdfafdf1622de9ba5051715cb0f0b1ad Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 7 Jul 2023 15:39:15 -0400 Subject: [PATCH 0933/1115] tests: add schema cleanup (#1767) --- handwritten/pubsub/system-test/pubsub.ts | 35 ++++++++++++++++++++++-- handwritten/pubsub/test/pubsub.ts | 3 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 3c328362d76..eab472ca883 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -104,14 +104,14 @@ describe('pubsub', () => { } const createdAt = Number(resource.name.split('-').pop()); - const timeDiff = (Date.now() - createdAt) / (1000 * 60 * 60); + const timeDiff = (Date.now() - createdAt) / (2 * 1000 * 60 * 60); if (timeDiff > 1) { resource.delete(); } } - async function deleteTestResources(): Promise { + async function deleteTestResources(): Promise { const topicStream = pubsub.getTopicsStream().on('data', deleteTestResource); const subscriptionStream = pubsub .getSubscriptionsStream() @@ -129,7 +129,36 @@ describe('pubsub', () => { } ); - return Promise.all(streams); + // Schemas might be dependencies on topics, so wait for these first. + await Promise.all(streams); + + const allSchemas: Promise[] = []; + for await (const s of pubsub.listSchemas()) { + let deleteSchema = false; + const name = s.name; + if (!name) { + continue; + } + + // Delete resource from current test run. + if (name.includes(CURRENT_TIME.toString())) { + deleteSchema = true; + } else if (name.includes(PREFIX)) { + // Delete left over resources which are older then 1 hour. + const createdAt = Number(s.name?.split('-').pop()); + const timeDiff = (Date.now() - createdAt) / (2 * 1000 * 60 * 60); + + if (timeDiff > 1) { + deleteSchema = true; + } + } + + if (deleteSchema) { + const wrapped = pubsub.schema(name); + allSchemas.push(wrapped.delete()); + } + } + await Promise.all(allSchemas); } async function publishPop(message: MessageOptions) { diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index eef9fccdcf3..3d56f167c99 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -27,8 +27,7 @@ import {Snapshot} from '../src/snapshot'; import * as subby from '../src/subscription'; import {Topic} from '../src/topic'; import * as util from '../src/util'; -import {Schema, SchemaTypes} from '../src'; -import {ISchema, SchemaViews} from '../src/schema'; +import {Schema, SchemaTypes, ISchema, SchemaViews} from '../src/schema'; // eslint-disable-next-line @typescript-eslint/no-var-requires const PKG = require('../../package.json'); const sandbox = sinon.createSandbox(); From 1f4d0846f0a31ac40bd5e98f765e7ed2bc1de3ff Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 19:58:13 +0000 Subject: [PATCH 0934/1115] chore: upgrade to Node 14 (#1770) Source-Link: https://togithub.com/googleapis/synthtool/commit/2d2d5e5c4e0eb30b0a7c2c95576e4e89c8443b35 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:bfa6fdba19aa7d105167d01fb51f5fd8285e8cd9fca264e43aff849e9e7fa36c --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/common.cfg | 2 +- .../.kokoro/continuous/node14/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/continuous/node14/lint.cfg | 4 ++++ .../continuous/node14/samples-test.cfg | 12 ++++++++++ .../.kokoro/continuous/node14/system-test.cfg | 12 ++++++++++ .../pubsub/.kokoro/continuous/node14/test.cfg | 0 .../.kokoro/presubmit/node14/common.cfg | 24 +++++++++++++++++++ .../.kokoro/presubmit/node14/samples-test.cfg | 12 ++++++++++ .../.kokoro/presubmit/node14/system-test.cfg | 12 ++++++++++ .../pubsub/.kokoro/presubmit/node14/test.cfg | 0 handwritten/pubsub/.kokoro/release/docs.cfg | 2 +- .../pubsub/.kokoro/release/publish.cfg | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- 16 files changed, 108 insertions(+), 8 deletions(-) create mode 100644 handwritten/pubsub/.kokoro/continuous/node14/common.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node14/lint.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node14/samples-test.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node14/system-test.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node14/test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node14/common.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node14/samples-test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node14/system-test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node14/test.cfg diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 21ad18bd722..9e959ba1520 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:0527a86c10b67742c409dc726ba9a31ec4e69b0006e3d7a49b0e6686c59cdaa9 -# created: 2023-05-24T20:32:43.844586914Z + digest: sha256:bfa6fdba19aa7d105167d01fb51f5fd8285e8cd9fca264e43aff849e9e7fa36c +# created: 2023-07-06T17:45:12.014855061Z diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index 821605f9662..d8038cd9917 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node14/common.cfg b/handwritten/pubsub/.kokoro/continuous/node14/common.cfg new file mode 100644 index 00000000000..d8038cd9917 --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node14/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node14/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node14/lint.cfg new file mode 100644 index 00000000000..219d3808dea --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node14/lint.cfg @@ -0,0 +1,4 @@ +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/lint.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node14/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node14/samples-test.cfg new file mode 100644 index 00000000000..698013d7caa --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node14/samples-test.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/samples-test.sh" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/continuous/node14/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node14/system-test.cfg new file mode 100644 index 00000000000..bf759bd3f1a --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node14/system-test.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/system-test.sh" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/continuous/node14/test.cfg b/handwritten/pubsub/.kokoro/continuous/node14/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/presubmit/node14/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node14/common.cfg new file mode 100644 index 00000000000..d8038cd9917 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node14/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node14/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node14/samples-test.cfg new file mode 100644 index 00000000000..698013d7caa --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node14/samples-test.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/samples-test.sh" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node14/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node14/system-test.cfg new file mode 100644 index 00000000000..bf759bd3f1a --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node14/system-test.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/system-test.sh" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node14/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node14/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/release/docs.cfg b/handwritten/pubsub/.kokoro/release/docs.cfg index 44f0a875684..508a0efda3f 100644 --- a/handwritten/pubsub/.kokoro/release/docs.cfg +++ b/handwritten/pubsub/.kokoro/release/docs.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 42380c077fe..91fb161ec90 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -30,7 +30,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" } env_vars: { diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 806c0082236..8c5d108cb58 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -56,7 +56,7 @@ fi # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=12 +COVERAGE_NODE=14 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 0201e9dfd71..0b3043d268c 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -49,7 +49,7 @@ npm run system-test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=12 +COVERAGE_NODE=14 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index a5c7ac04cd3..862d478d324 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -39,7 +39,7 @@ npm test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=12 +COVERAGE_NODE=14 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then From 0473511e6a14d245b4bf94576a54b70a66b16f49 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 15:35:58 -0400 Subject: [PATCH 0935/1115] build: add extra test for Node 20, update windows tests (#1771) * build: add extra test for Node 20, update windows tests Source-Link: https://github.com/googleapis/synthtool/commit/38f5d4bfd5d51116a3cf7f260b8fe5d8a0046cfa Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:ef104a520c849ffde60495342ecf099dfb6256eab0fbd173228f447bc73d1aa9 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/test.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 9e959ba1520..de4fa0a5d94 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:bfa6fdba19aa7d105167d01fb51f5fd8285e8cd9fca264e43aff849e9e7fa36c -# created: 2023-07-06T17:45:12.014855061Z + digest: sha256:ef104a520c849ffde60495342ecf099dfb6256eab0fbd173228f447bc73d1aa9 +# created: 2023-07-10T21:36:52.433664553Z diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat index ae59e59be3e..0bb12405231 100644 --- a/handwritten/pubsub/.kokoro/test.bat +++ b/handwritten/pubsub/.kokoro/test.bat @@ -21,7 +21,7 @@ cd .. @rem we upgrade Node.js in the image: SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm -call nvm use v12.14.1 +call nvm use v14.17.3 call which node call npm install || goto :error From ecc8afe6417a0ebf835f76af3b39e7ab88f34421 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 24 Jul 2023 11:17:05 -0400 Subject: [PATCH 0936/1115] fix: update to gax 3.6.1 for vuln fix (#1775) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 097562d4185..b9922dac04d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^8.0.2", - "google-gax": "^3.5.6", + "google-gax": "^3.6.1", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 5da4326956ed9d33b0c5c02620c64119101251cd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 11:48:07 -0400 Subject: [PATCH 0937/1115] chore(main): release 3.7.2 (#1777) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 53be64d8744..70b27712053 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.7.2](https://github.com/googleapis/nodejs-pubsub/compare/v3.7.1...v3.7.2) (2023-07-24) + + +### Bug Fixes + +* Update to gax 3.6.1 for vuln fix ([#1775](https://github.com/googleapis/nodejs-pubsub/issues/1775)) ([98460db](https://github.com/googleapis/nodejs-pubsub/commit/98460dbd1f31e4ee06356e88fec676a04a68ac88)) + ## [3.7.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.7.0...v3.7.1) (2023-06-08) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b9922dac04d..1983860f8c3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.7.1", + "version": "3.7.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From f8148301bd29e1b4743ab01771daa3f9d0ac1d01 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 26 Jul 2023 13:22:22 -0400 Subject: [PATCH 0938/1115] fix: update masks for topic should be snake case (#1778) * fix: update masks for topic should be snake case * fix: go back to lodash, and add tests * chore: formatting --- handwritten/pubsub/src/topic.ts | 3 ++- handwritten/pubsub/system-test/pubsub.ts | 16 ++++++++++++++++ handwritten/pubsub/test/topic.ts | 5 ++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 03a54c37cb8..96b33490ed6 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -48,6 +48,7 @@ import { SubscriptionOptions, } from './subscription'; import {promisifySome} from './util'; +import snakeCase = require('lodash.snakecase'); export type TopicMetadata = google.pubsub.v1.ITopic; @@ -951,7 +952,7 @@ export class Topic { callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; const topic = Object.assign({name: this.name}, options); - const updateMask = {paths: Object.keys(options)}; + const updateMask = {paths: Object.keys(options).map(snakeCase)}; const reqOpts = {topic, updateMask}; this.request( diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index eab472ca883..4301292aa05 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -307,6 +307,22 @@ describe('pubsub', () => { ); }); + it('should set metadata for a topic', async () => { + const threeDaysInSeconds = 3 * 24 * 60 * 60; + + const topic = pubsub.topic(TOPIC_NAMES[0]); + await topic.setMetadata({ + messageRetentionDuration: { + seconds: threeDaysInSeconds, + }, + }); + const [metadata] = await topic.getMetadata(); + const {seconds, nanos} = metadata.messageRetentionDuration!; + + assert.strictEqual(Number(seconds), threeDaysInSeconds); + assert.strictEqual(Number(nanos), 0); + }); + describe('ordered messages', () => { interface Expected { key: string; diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index bbd0aa2df1a..1179c718b5f 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -671,6 +671,7 @@ describe('Topic', () => { describe('setMetadata', () => { const METADATA = { labels: {yee: 'haw'}, + messageRetentionDuration: {moo: 'cows'}, }; let requestStub: sinon.SinonStub; @@ -691,7 +692,9 @@ describe('Topic', () => { topic.setMetadata(METADATA, assert.ifError); const expectedTopic = Object.assign({name: topic.name}, METADATA); - const expectedUpdateMask = {paths: ['labels']}; + const expectedUpdateMask = { + paths: ['labels', 'message_retention_duration'], + }; const [{reqOpts}] = requestStub.lastCall.args; assert.deepStrictEqual(reqOpts.topic, expectedTopic); From ec299f187f661b4076a9167e312d0c2f78053ae3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:42:13 +0000 Subject: [PATCH 0939/1115] docs: clarified where ordering_key will be written if write_metadata is set (#1781) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 551210991 Source-Link: https://togithub.com/googleapis/googleapis/commit/7c762d770a82da397956b80379a6fb73505835af Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/15fe4c5ff5ebd52911b429b05b992e232f53351e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTVmZTRjNWZmNWViZDUyOTExYjQyOWIwNWI5OTJlMjMyZjUzMzUxZSJ9 --- handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 9ff80f2f6b5..4468de17831 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1030,7 +1030,11 @@ message CloudStorageConfig { // Message payloads and metadata will be written to files as an Avro binary. message AvroConfig { // When true, write the subscription name, message_id, publish_time, - // attributes, and ordering_key as additional fields in the output. + // attributes, and ordering_key as additional fields in the output. The + // subscription name, message_id, and publish_time fields are put in their + // own fields while all other message properties other than data (for + // example, an ordering_key, if present) are added as entries in the + // attributes map. bool write_metadata = 1; } From e0d0f998bdd4abb2e1151a8e37a7ab364913120b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 14:07:18 -0400 Subject: [PATCH 0940/1115] chore(main): release 3.7.3 (#1782) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: liuyunn --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 70b27712053..d5981c75539 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [3.7.3](https://github.com/googleapis/nodejs-pubsub/compare/v3.7.2...v3.7.3) (2023-07-26) + + +### Bug Fixes + +* Update masks for topic should be snake case ([#1778](https://github.com/googleapis/nodejs-pubsub/issues/1778)) ([ba72638](https://github.com/googleapis/nodejs-pubsub/commit/ba7263836e6951454f77f631c9d2eb0a4df98da5)) + ## [3.7.2](https://github.com/googleapis/nodejs-pubsub/compare/v3.7.1...v3.7.2) (2023-07-24) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 1983860f8c3..9da69f11f20 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.7.2", + "version": "3.7.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 35c5e716c9a5f683d3089ada17187758bfe7e7cd Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 2 Aug 2023 13:40:48 -0400 Subject: [PATCH 0941/1115] feat!: node 12 eos (#1774) (#1784) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat!: node 12 eos (#1774) - moving to googleapis * feat!: bring in typing interface for Subscription events * feat!: gax 4 updates - some of this will be regen'd, just testing * fix!(deps): update dependency google-gax to v4 (#1780) * fix!(deps): update dependency google-auth-library to v9 (#1776) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: revert incorrect owlbot change * deps!: update dependencies and kokoro files * build: samples package.json should use the new major * fix!: manually update testIam methods.. not sure why these didn't update * build: make samples always use current version; update to 4.0.0 * build: update check config * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: let sample tests drive npm pack --------- Co-authored-by: Mend Renovate Co-authored-by: Owl Bot --- .../pubsub/.github/sync-repo-settings.yaml | 2 +- handwritten/pubsub/.gitignore | 1 + .../.kokoro/continuous/node12/common.cfg | 24 -------------- .../pubsub/.kokoro/continuous/node12/lint.cfg | 4 --- .../continuous/node12/pubsub_perf_bench.cfg | 0 .../continuous/node12/samples-test.cfg | 12 ------- .../.kokoro/continuous/node12/system-test.cfg | 12 ------- .../pubsub/.kokoro/continuous/node12/test.cfg | 0 .../.kokoro/presubmit/node12/common.cfg | 24 -------------- .../.kokoro/presubmit/node12/samples-test.cfg | 12 ------- .../.kokoro/presubmit/node12/system-test.cfg | 12 ------- .../pubsub/.kokoro/presubmit/node12/test.cfg | 0 handwritten/pubsub/package.json | 26 ++++++++------- handwritten/pubsub/src/subscription.ts | 32 +++++++++---------- handwritten/pubsub/src/v1/publisher_client.ts | 6 ++-- .../pubsub/src/v1/schema_service_client.ts | 6 ++-- .../pubsub/src/v1/subscriber_client.ts | 6 ++-- 17 files changed, 40 insertions(+), 139 deletions(-) delete mode 100644 handwritten/pubsub/.kokoro/continuous/node12/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node12/lint.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node12/pubsub_perf_bench.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node12/test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node12/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node12/test.cfg diff --git a/handwritten/pubsub/.github/sync-repo-settings.yaml b/handwritten/pubsub/.github/sync-repo-settings.yaml index 4a30a08e54c..1350faeff2a 100644 --- a/handwritten/pubsub/.github/sync-repo-settings.yaml +++ b/handwritten/pubsub/.github/sync-repo-settings.yaml @@ -9,9 +9,9 @@ branchProtectionRules: - "ci/kokoro: System test" - docs - lint - - test (12) - test (14) - test (16) + - test (18) - cla/google - windows - OwlBot Post Processor diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index d4f03a0df2e..eb354384645 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -12,3 +12,4 @@ system-test/*key.json .DS_Store package-lock.json __pycache__ +*.tgz diff --git a/handwritten/pubsub/.kokoro/continuous/node12/common.cfg b/handwritten/pubsub/.kokoro/continuous/node12/common.cfg deleted file mode 100644 index 821605f9662..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node12/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/continuous/node12/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node12/lint.cfg deleted file mode 100644 index 219d3808dea..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node12/lint.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/lint.sh" -} diff --git a/handwritten/pubsub/.kokoro/continuous/node12/pubsub_perf_bench.cfg b/handwritten/pubsub/.kokoro/continuous/node12/pubsub_perf_bench.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg deleted file mode 100644 index 698013d7caa..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node12/samples-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/samples-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg deleted file mode 100644 index bf759bd3f1a..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node12/system-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/system-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/continuous/node12/test.cfg b/handwritten/pubsub/.kokoro/continuous/node12/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg deleted file mode 100644 index 821605f9662..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node12/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg deleted file mode 100644 index 698013d7caa..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node12/samples-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/samples-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg deleted file mode 100644 index bf759bd3f1a..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node12/system-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/system-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node12/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node12/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9da69f11f20..5b7973c40eb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,11 +1,11 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "3.7.3", + "version": "4.0.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "repository": "googleapis/nodejs-pubsub", "main": "./build/src/index.js", @@ -29,7 +29,7 @@ "scripts": { "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", - "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", + "samples-test": "cd samples/ && npm install && npm test && cd ../", "test": "c8 mocha build/test --recursive", "lint": "gts check", "predocs": "npm run compile", @@ -43,22 +43,23 @@ "docs-test": "linkinator docs", "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js", - "prelint": "cd samples; npm link ../; npm install", - "precompile": "gts clean" + "prelint": "npm run pack && cd samples; npm install", + "precompile": "gts clean", + "pack": "npm pack && mv google-cloud-pubsub*.tgz samples/pubsub-current.tgz" }, "dependencies": { - "@google-cloud/paginator": "^4.0.0", - "@google-cloud/precise-date": "^3.0.0", + "@google-cloud/paginator": "^4.0.1", + "@google-cloud/precise-date": "^3.0.1", "@google-cloud/projectify": "^3.0.0", - "@google-cloud/promisify": "^2.0.0", + "@google-cloud/promisify": "^3.0.1", "@opentelemetry/api": "^1.0.0", "@opentelemetry/semantic-conventions": "~1.3.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-auth-library": "^8.0.2", - "google-gax": "^3.6.1", + "google-auth-library": "^9.0.0", + "google-gax": "^4.0.2", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", @@ -81,7 +82,8 @@ "c8": "^8.0.0", "codecov": "^3.0.0", "execa": "^5.0.0", - "gts": "^3.1.0", + "gapic-tools": "^0.1.7", + "gts": "^3.1.1", "jsdoc": "^4.0.0", "jsdoc-fresh": "^2.0.0", "jsdoc-region-tag": "^2.0.0", @@ -95,7 +97,7 @@ "sinon": "^15.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", - "typescript": "^4.6.4", + "typescript": "^5.1.6", "uuid": "^9.0.0", "webpack": "^5.0.0", "webpack-cli": "^5.0.0", diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index b721a86815b..b3585b588cd 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -42,9 +42,11 @@ import { SeekResponse, Snapshot, } from './snapshot'; -import {Subscriber, SubscriberOptions} from './subscriber'; +import {Message, Subscriber, SubscriberOptions} from './subscriber'; import {Topic} from './topic'; import {promisifySome} from './util'; +import {StatusError} from './message-stream'; +import {DebugMessage} from './debug'; export {AckError, AckResponse, AckResponses} from './subscriber'; @@ -92,30 +94,26 @@ export type DetachSubscriptionResponse = EmptyResponse; // JSDoc won't see these, so this is just to let you get typings // in your editor of choice. -// -// NOTE: These are commented out for now because we don't want to -// break any existing clients that rely on not-entirely-correct -// typings. We'll re-enable on the next major. -/* export declare interface Subscription { +export declare interface Subscription { + on(event: 'message', listener: (message: Message) => void): this; + on(event: 'error', listener: (error: StatusError) => void): this; + on(event: 'close', listener: () => void): this; + on(event: 'debug', listener: (msg: DebugMessage) => void): this; + + // Only used internally. on( - event: 'message', - listener: (message: Message) => void + event: 'newListener', + listener: (event: string | symbol, listener: Function) => void ): this; on( - event: 'error', - listener: (error: StatusError) => void + event: 'removeListener', + listener: (event: string | symbol, listener: Function) => void ): this; - on(event: 'close', listener: () => void): this; - on(event: 'debug', listener: (msg: DebugMessage) => void); this; - - // Only used internally. - on(event: 'newListener', listener: Function): this; - on(event: 'removeListener', listener: Function): this; // Catch-all. If you get an error about this line, it means you're // using an unsupported event type or listener type. on(event: string, listener: void): this; -} */ +} /** * @typedef {object} ExpirationPolicy diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index c1dcd61fbc7..54da4952ca9 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -1546,7 +1546,7 @@ export class PublisherClient { IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.getIamPolicy(request, options, callback); } @@ -1594,7 +1594,7 @@ export class PublisherClient { IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.setIamPolicy(request, options, callback); } @@ -1643,7 +1643,7 @@ export class PublisherClient { IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.TestIamPermissionsResponse]> { return this.iamClient.testIamPermissions(request, options, callback); } diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 3d96239ab6b..75eff4389cc 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -1494,7 +1494,7 @@ export class SchemaServiceClient { IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.getIamPolicy(request, options, callback); } @@ -1542,7 +1542,7 @@ export class SchemaServiceClient { IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.setIamPolicy(request, options, callback); } @@ -1591,7 +1591,7 @@ export class SchemaServiceClient { IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.TestIamPermissionsResponse]> { return this.iamClient.testIamPermissions(request, options, callback); } diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 92461b6cdae..3fbaaf60c4b 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -2159,7 +2159,7 @@ export class SubscriberClient { IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.getIamPolicy(request, options, callback); } @@ -2207,7 +2207,7 @@ export class SubscriberClient { IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.setIamPolicy(request, options, callback); } @@ -2256,7 +2256,7 @@ export class SubscriberClient { IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, {} | null | undefined > - ): Promise { + ): Promise<[IamProtos.google.iam.v1.TestIamPermissionsResponse]> { return this.iamClient.testIamPermissions(request, options, callback); } From e75a693a9081821e4b758f7cf2de017962a9c8f3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 16:05:51 -0400 Subject: [PATCH 0942/1115] chore(deps): upgrade dependencies for Node.js images (#1789) Source-Link: https://github.com/googleapis/synthtool/commit/1dd93a39c888d50dfaf270d7fcd5b5feb66a4f7f Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:3ad01f4c6671efb094b43f7d3a3e0b9510bd6501f2e65e874dd525373e29de75 Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 +- handwritten/pubsub/README.md | 16 +- handwritten/pubsub/protos/protos.d.ts | 1493 +++++++ handwritten/pubsub/protos/protos.js | 3853 ++++++++++++++++++ handwritten/pubsub/protos/protos.json | 292 ++ 5 files changed, 5648 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index de4fa0a5d94..0c47c8b71d4 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:ef104a520c849ffde60495342ecf099dfb6256eab0fbd173228f447bc73d1aa9 -# created: 2023-07-10T21:36:52.433664553Z + digest: sha256:3ad01f4c6671efb094b43f7d3a3e0b9510bd6501f2e65e874dd525373e29de75 +# created: 2023-08-01T22:29:52.50398591Z diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 0b3091c38a0..9640f7017d1 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -66,15 +66,15 @@ npm install @google-cloud/pubsub ```javascript // Imports the Google Cloud client library -const {PubSub} = require('@google-cloud/pubsub'); +const { PubSub } = require("@google-cloud/pubsub"); async function quickstart( - projectId = 'your-project-id', // Your Google Cloud Platform project ID - topicNameOrId = 'my-topic', // Name for the new topic to create - subscriptionName = 'my-sub' // Name for the new subscription to create +projectId = 'your-project-id', // Your Google Cloud Platform project ID +topicNameOrId = 'my-topic', // Name for the new topic to create +subscriptionName = 'my-sub' // Name for the new subscription to create ) { // Instantiates a client - const pubsub = new PubSub({projectId}); + const pubsub = new PubSub({ projectId }); // Creates a new topic const [topic] = await pubsub.createTopic(topicNameOrId); @@ -84,19 +84,19 @@ async function quickstart( const [subscription] = await topic.createSubscription(subscriptionName); // Receive callbacks for new messages on the subscription - subscription.on('message', message => { + subscription.on('message', (message) => { console.log('Received message:', message.data.toString()); process.exit(0); }); // Receive callbacks for errors on the subscription - subscription.on('error', error => { + subscription.on('error', (error) => { console.error('Received error:', error); process.exit(1); }); // Send a message to the topic - topic.publishMessage({data: Buffer.from('Test message!')}); + topic.publishMessage({ data: Buffer.from('Test message!') }); } ``` diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index e466657f602..443f61fb3b8 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -8656,6 +8656,1448 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + /** Properties of a CommonLanguageSettings. */ + interface ICommonLanguageSettings { + + /** CommonLanguageSettings referenceDocsUri */ + referenceDocsUri?: (string|null); + + /** CommonLanguageSettings destinations */ + destinations?: (google.api.ClientLibraryDestination[]|null); + } + + /** Represents a CommonLanguageSettings. */ + class CommonLanguageSettings implements ICommonLanguageSettings { + + /** + * Constructs a new CommonLanguageSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ICommonLanguageSettings); + + /** CommonLanguageSettings referenceDocsUri. */ + public referenceDocsUri: string; + + /** CommonLanguageSettings destinations. */ + public destinations: google.api.ClientLibraryDestination[]; + + /** + * Creates a new CommonLanguageSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns CommonLanguageSettings instance + */ + public static create(properties?: google.api.ICommonLanguageSettings): google.api.CommonLanguageSettings; + + /** + * Encodes the specified CommonLanguageSettings message. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. + * @param message CommonLanguageSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ICommonLanguageSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CommonLanguageSettings message, length delimited. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. + * @param message CommonLanguageSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ICommonLanguageSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CommonLanguageSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CommonLanguageSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CommonLanguageSettings; + + /** + * Decodes a CommonLanguageSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CommonLanguageSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CommonLanguageSettings; + + /** + * Verifies a CommonLanguageSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CommonLanguageSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CommonLanguageSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.CommonLanguageSettings; + + /** + * Creates a plain object from a CommonLanguageSettings message. Also converts values to other types if specified. + * @param message CommonLanguageSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.CommonLanguageSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CommonLanguageSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CommonLanguageSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a ClientLibrarySettings. */ + interface IClientLibrarySettings { + + /** ClientLibrarySettings version */ + version?: (string|null); + + /** ClientLibrarySettings launchStage */ + launchStage?: (google.api.LaunchStage|keyof typeof google.api.LaunchStage|null); + + /** ClientLibrarySettings restNumericEnums */ + restNumericEnums?: (boolean|null); + + /** ClientLibrarySettings javaSettings */ + javaSettings?: (google.api.IJavaSettings|null); + + /** ClientLibrarySettings cppSettings */ + cppSettings?: (google.api.ICppSettings|null); + + /** ClientLibrarySettings phpSettings */ + phpSettings?: (google.api.IPhpSettings|null); + + /** ClientLibrarySettings pythonSettings */ + pythonSettings?: (google.api.IPythonSettings|null); + + /** ClientLibrarySettings nodeSettings */ + nodeSettings?: (google.api.INodeSettings|null); + + /** ClientLibrarySettings dotnetSettings */ + dotnetSettings?: (google.api.IDotnetSettings|null); + + /** ClientLibrarySettings rubySettings */ + rubySettings?: (google.api.IRubySettings|null); + + /** ClientLibrarySettings goSettings */ + goSettings?: (google.api.IGoSettings|null); + } + + /** Represents a ClientLibrarySettings. */ + class ClientLibrarySettings implements IClientLibrarySettings { + + /** + * Constructs a new ClientLibrarySettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IClientLibrarySettings); + + /** ClientLibrarySettings version. */ + public version: string; + + /** ClientLibrarySettings launchStage. */ + public launchStage: (google.api.LaunchStage|keyof typeof google.api.LaunchStage); + + /** ClientLibrarySettings restNumericEnums. */ + public restNumericEnums: boolean; + + /** ClientLibrarySettings javaSettings. */ + public javaSettings?: (google.api.IJavaSettings|null); + + /** ClientLibrarySettings cppSettings. */ + public cppSettings?: (google.api.ICppSettings|null); + + /** ClientLibrarySettings phpSettings. */ + public phpSettings?: (google.api.IPhpSettings|null); + + /** ClientLibrarySettings pythonSettings. */ + public pythonSettings?: (google.api.IPythonSettings|null); + + /** ClientLibrarySettings nodeSettings. */ + public nodeSettings?: (google.api.INodeSettings|null); + + /** ClientLibrarySettings dotnetSettings. */ + public dotnetSettings?: (google.api.IDotnetSettings|null); + + /** ClientLibrarySettings rubySettings. */ + public rubySettings?: (google.api.IRubySettings|null); + + /** ClientLibrarySettings goSettings. */ + public goSettings?: (google.api.IGoSettings|null); + + /** + * Creates a new ClientLibrarySettings instance using the specified properties. + * @param [properties] Properties to set + * @returns ClientLibrarySettings instance + */ + public static create(properties?: google.api.IClientLibrarySettings): google.api.ClientLibrarySettings; + + /** + * Encodes the specified ClientLibrarySettings message. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. + * @param message ClientLibrarySettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IClientLibrarySettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ClientLibrarySettings message, length delimited. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. + * @param message ClientLibrarySettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IClientLibrarySettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ClientLibrarySettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ClientLibrarySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ClientLibrarySettings; + + /** + * Decodes a ClientLibrarySettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ClientLibrarySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ClientLibrarySettings; + + /** + * Verifies a ClientLibrarySettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ClientLibrarySettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ClientLibrarySettings + */ + public static fromObject(object: { [k: string]: any }): google.api.ClientLibrarySettings; + + /** + * Creates a plain object from a ClientLibrarySettings message. Also converts values to other types if specified. + * @param message ClientLibrarySettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ClientLibrarySettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ClientLibrarySettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ClientLibrarySettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a Publishing. */ + interface IPublishing { + + /** Publishing methodSettings */ + methodSettings?: (google.api.IMethodSettings[]|null); + + /** Publishing newIssueUri */ + newIssueUri?: (string|null); + + /** Publishing documentationUri */ + documentationUri?: (string|null); + + /** Publishing apiShortName */ + apiShortName?: (string|null); + + /** Publishing githubLabel */ + githubLabel?: (string|null); + + /** Publishing codeownerGithubTeams */ + codeownerGithubTeams?: (string[]|null); + + /** Publishing docTagPrefix */ + docTagPrefix?: (string|null); + + /** Publishing organization */ + organization?: (google.api.ClientLibraryOrganization|keyof typeof google.api.ClientLibraryOrganization|null); + + /** Publishing librarySettings */ + librarySettings?: (google.api.IClientLibrarySettings[]|null); + } + + /** Represents a Publishing. */ + class Publishing implements IPublishing { + + /** + * Constructs a new Publishing. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IPublishing); + + /** Publishing methodSettings. */ + public methodSettings: google.api.IMethodSettings[]; + + /** Publishing newIssueUri. */ + public newIssueUri: string; + + /** Publishing documentationUri. */ + public documentationUri: string; + + /** Publishing apiShortName. */ + public apiShortName: string; + + /** Publishing githubLabel. */ + public githubLabel: string; + + /** Publishing codeownerGithubTeams. */ + public codeownerGithubTeams: string[]; + + /** Publishing docTagPrefix. */ + public docTagPrefix: string; + + /** Publishing organization. */ + public organization: (google.api.ClientLibraryOrganization|keyof typeof google.api.ClientLibraryOrganization); + + /** Publishing librarySettings. */ + public librarySettings: google.api.IClientLibrarySettings[]; + + /** + * Creates a new Publishing instance using the specified properties. + * @param [properties] Properties to set + * @returns Publishing instance + */ + public static create(properties?: google.api.IPublishing): google.api.Publishing; + + /** + * Encodes the specified Publishing message. Does not implicitly {@link google.api.Publishing.verify|verify} messages. + * @param message Publishing message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IPublishing, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Publishing message, length delimited. Does not implicitly {@link google.api.Publishing.verify|verify} messages. + * @param message Publishing message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IPublishing, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Publishing message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Publishing + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Publishing; + + /** + * Decodes a Publishing message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Publishing + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Publishing; + + /** + * Verifies a Publishing message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Publishing message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Publishing + */ + public static fromObject(object: { [k: string]: any }): google.api.Publishing; + + /** + * Creates a plain object from a Publishing message. Also converts values to other types if specified. + * @param message Publishing + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.Publishing, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Publishing to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Publishing + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a JavaSettings. */ + interface IJavaSettings { + + /** JavaSettings libraryPackage */ + libraryPackage?: (string|null); + + /** JavaSettings serviceClassNames */ + serviceClassNames?: ({ [k: string]: string }|null); + + /** JavaSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a JavaSettings. */ + class JavaSettings implements IJavaSettings { + + /** + * Constructs a new JavaSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IJavaSettings); + + /** JavaSettings libraryPackage. */ + public libraryPackage: string; + + /** JavaSettings serviceClassNames. */ + public serviceClassNames: { [k: string]: string }; + + /** JavaSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new JavaSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns JavaSettings instance + */ + public static create(properties?: google.api.IJavaSettings): google.api.JavaSettings; + + /** + * Encodes the specified JavaSettings message. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. + * @param message JavaSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IJavaSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified JavaSettings message, length delimited. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. + * @param message JavaSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IJavaSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a JavaSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns JavaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.JavaSettings; + + /** + * Decodes a JavaSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns JavaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.JavaSettings; + + /** + * Verifies a JavaSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a JavaSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns JavaSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.JavaSettings; + + /** + * Creates a plain object from a JavaSettings message. Also converts values to other types if specified. + * @param message JavaSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.JavaSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this JavaSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for JavaSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a CppSettings. */ + interface ICppSettings { + + /** CppSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a CppSettings. */ + class CppSettings implements ICppSettings { + + /** + * Constructs a new CppSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ICppSettings); + + /** CppSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new CppSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns CppSettings instance + */ + public static create(properties?: google.api.ICppSettings): google.api.CppSettings; + + /** + * Encodes the specified CppSettings message. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. + * @param message CppSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ICppSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CppSettings message, length delimited. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. + * @param message CppSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ICppSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CppSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CppSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CppSettings; + + /** + * Decodes a CppSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CppSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CppSettings; + + /** + * Verifies a CppSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CppSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CppSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.CppSettings; + + /** + * Creates a plain object from a CppSettings message. Also converts values to other types if specified. + * @param message CppSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.CppSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CppSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CppSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a PhpSettings. */ + interface IPhpSettings { + + /** PhpSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a PhpSettings. */ + class PhpSettings implements IPhpSettings { + + /** + * Constructs a new PhpSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IPhpSettings); + + /** PhpSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new PhpSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns PhpSettings instance + */ + public static create(properties?: google.api.IPhpSettings): google.api.PhpSettings; + + /** + * Encodes the specified PhpSettings message. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. + * @param message PhpSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IPhpSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PhpSettings message, length delimited. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. + * @param message PhpSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IPhpSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PhpSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PhpSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.PhpSettings; + + /** + * Decodes a PhpSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PhpSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.PhpSettings; + + /** + * Verifies a PhpSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PhpSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PhpSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.PhpSettings; + + /** + * Creates a plain object from a PhpSettings message. Also converts values to other types if specified. + * @param message PhpSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.PhpSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PhpSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PhpSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a PythonSettings. */ + interface IPythonSettings { + + /** PythonSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a PythonSettings. */ + class PythonSettings implements IPythonSettings { + + /** + * Constructs a new PythonSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IPythonSettings); + + /** PythonSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new PythonSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns PythonSettings instance + */ + public static create(properties?: google.api.IPythonSettings): google.api.PythonSettings; + + /** + * Encodes the specified PythonSettings message. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. + * @param message PythonSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IPythonSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PythonSettings message, length delimited. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. + * @param message PythonSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IPythonSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PythonSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PythonSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.PythonSettings; + + /** + * Decodes a PythonSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PythonSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.PythonSettings; + + /** + * Verifies a PythonSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PythonSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PythonSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.PythonSettings; + + /** + * Creates a plain object from a PythonSettings message. Also converts values to other types if specified. + * @param message PythonSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.PythonSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PythonSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PythonSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a NodeSettings. */ + interface INodeSettings { + + /** NodeSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a NodeSettings. */ + class NodeSettings implements INodeSettings { + + /** + * Constructs a new NodeSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.INodeSettings); + + /** NodeSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new NodeSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns NodeSettings instance + */ + public static create(properties?: google.api.INodeSettings): google.api.NodeSettings; + + /** + * Encodes the specified NodeSettings message. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. + * @param message NodeSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.INodeSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified NodeSettings message, length delimited. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. + * @param message NodeSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.INodeSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a NodeSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns NodeSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.NodeSettings; + + /** + * Decodes a NodeSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns NodeSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.NodeSettings; + + /** + * Verifies a NodeSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a NodeSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns NodeSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.NodeSettings; + + /** + * Creates a plain object from a NodeSettings message. Also converts values to other types if specified. + * @param message NodeSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.NodeSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this NodeSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for NodeSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a DotnetSettings. */ + interface IDotnetSettings { + + /** DotnetSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a DotnetSettings. */ + class DotnetSettings implements IDotnetSettings { + + /** + * Constructs a new DotnetSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IDotnetSettings); + + /** DotnetSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new DotnetSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns DotnetSettings instance + */ + public static create(properties?: google.api.IDotnetSettings): google.api.DotnetSettings; + + /** + * Encodes the specified DotnetSettings message. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. + * @param message DotnetSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IDotnetSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DotnetSettings message, length delimited. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. + * @param message DotnetSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IDotnetSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DotnetSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DotnetSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.DotnetSettings; + + /** + * Decodes a DotnetSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DotnetSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.DotnetSettings; + + /** + * Verifies a DotnetSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DotnetSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DotnetSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.DotnetSettings; + + /** + * Creates a plain object from a DotnetSettings message. Also converts values to other types if specified. + * @param message DotnetSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.DotnetSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DotnetSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DotnetSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a RubySettings. */ + interface IRubySettings { + + /** RubySettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a RubySettings. */ + class RubySettings implements IRubySettings { + + /** + * Constructs a new RubySettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IRubySettings); + + /** RubySettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new RubySettings instance using the specified properties. + * @param [properties] Properties to set + * @returns RubySettings instance + */ + public static create(properties?: google.api.IRubySettings): google.api.RubySettings; + + /** + * Encodes the specified RubySettings message. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. + * @param message RubySettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IRubySettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified RubySettings message, length delimited. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. + * @param message RubySettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IRubySettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a RubySettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns RubySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.RubySettings; + + /** + * Decodes a RubySettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns RubySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.RubySettings; + + /** + * Verifies a RubySettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a RubySettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns RubySettings + */ + public static fromObject(object: { [k: string]: any }): google.api.RubySettings; + + /** + * Creates a plain object from a RubySettings message. Also converts values to other types if specified. + * @param message RubySettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.RubySettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this RubySettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for RubySettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a GoSettings. */ + interface IGoSettings { + + /** GoSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a GoSettings. */ + class GoSettings implements IGoSettings { + + /** + * Constructs a new GoSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IGoSettings); + + /** GoSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new GoSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns GoSettings instance + */ + public static create(properties?: google.api.IGoSettings): google.api.GoSettings; + + /** + * Encodes the specified GoSettings message. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. + * @param message GoSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IGoSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GoSettings message, length delimited. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. + * @param message GoSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IGoSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GoSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GoSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.GoSettings; + + /** + * Decodes a GoSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GoSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.GoSettings; + + /** + * Verifies a GoSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GoSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GoSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.GoSettings; + + /** + * Creates a plain object from a GoSettings message. Also converts values to other types if specified. + * @param message GoSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.GoSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GoSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for GoSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a MethodSettings. */ + interface IMethodSettings { + + /** MethodSettings selector */ + selector?: (string|null); + + /** MethodSettings longRunning */ + longRunning?: (google.api.MethodSettings.ILongRunning|null); + } + + /** Represents a MethodSettings. */ + class MethodSettings implements IMethodSettings { + + /** + * Constructs a new MethodSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IMethodSettings); + + /** MethodSettings selector. */ + public selector: string; + + /** MethodSettings longRunning. */ + public longRunning?: (google.api.MethodSettings.ILongRunning|null); + + /** + * Creates a new MethodSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodSettings instance + */ + public static create(properties?: google.api.IMethodSettings): google.api.MethodSettings; + + /** + * Encodes the specified MethodSettings message. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. + * @param message MethodSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IMethodSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MethodSettings message, length delimited. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. + * @param message MethodSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IMethodSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.MethodSettings; + + /** + * Decodes a MethodSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.MethodSettings; + + /** + * Verifies a MethodSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MethodSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.MethodSettings; + + /** + * Creates a plain object from a MethodSettings message. Also converts values to other types if specified. + * @param message MethodSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.MethodSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MethodSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for MethodSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace MethodSettings { + + /** Properties of a LongRunning. */ + interface ILongRunning { + + /** LongRunning initialPollDelay */ + initialPollDelay?: (google.protobuf.IDuration|null); + + /** LongRunning pollDelayMultiplier */ + pollDelayMultiplier?: (number|null); + + /** LongRunning maxPollDelay */ + maxPollDelay?: (google.protobuf.IDuration|null); + + /** LongRunning totalPollTimeout */ + totalPollTimeout?: (google.protobuf.IDuration|null); + } + + /** Represents a LongRunning. */ + class LongRunning implements ILongRunning { + + /** + * Constructs a new LongRunning. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.MethodSettings.ILongRunning); + + /** LongRunning initialPollDelay. */ + public initialPollDelay?: (google.protobuf.IDuration|null); + + /** LongRunning pollDelayMultiplier. */ + public pollDelayMultiplier: number; + + /** LongRunning maxPollDelay. */ + public maxPollDelay?: (google.protobuf.IDuration|null); + + /** LongRunning totalPollTimeout. */ + public totalPollTimeout?: (google.protobuf.IDuration|null); + + /** + * Creates a new LongRunning instance using the specified properties. + * @param [properties] Properties to set + * @returns LongRunning instance + */ + public static create(properties?: google.api.MethodSettings.ILongRunning): google.api.MethodSettings.LongRunning; + + /** + * Encodes the specified LongRunning message. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. + * @param message LongRunning message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.MethodSettings.ILongRunning, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified LongRunning message, length delimited. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. + * @param message LongRunning message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.MethodSettings.ILongRunning, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a LongRunning message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns LongRunning + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.MethodSettings.LongRunning; + + /** + * Decodes a LongRunning message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns LongRunning + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.MethodSettings.LongRunning; + + /** + * Verifies a LongRunning message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a LongRunning message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns LongRunning + */ + public static fromObject(object: { [k: string]: any }): google.api.MethodSettings.LongRunning; + + /** + * Creates a plain object from a LongRunning message. Also converts values to other types if specified. + * @param message LongRunning + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.MethodSettings.LongRunning, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this LongRunning to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for LongRunning + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + } + + /** ClientLibraryOrganization enum. */ + enum ClientLibraryOrganization { + CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED = 0, + CLOUD = 1, + ADS = 2, + PHOTOS = 3, + STREET_VIEW = 4 + } + + /** ClientLibraryDestination enum. */ + enum ClientLibraryDestination { + CLIENT_LIBRARY_DESTINATION_UNSPECIFIED = 0, + GITHUB = 10, + PACKAGE_MANAGER = 20 + } + + /** LaunchStage enum. */ + enum LaunchStage { + LAUNCH_STAGE_UNSPECIFIED = 0, + UNIMPLEMENTED = 6, + PRELAUNCH = 7, + EARLY_ACCESS = 1, + ALPHA = 2, + BETA = 3, + GA = 4, + DEPRECATED = 5 + } + /** FieldBehavior enum. */ enum FieldBehavior { FIELD_BEHAVIOR_UNSPECIFIED = 0, @@ -10762,6 +12204,9 @@ export namespace google { /** MessageOptions mapEntry */ mapEntry?: (boolean|null); + /** MessageOptions deprecatedLegacyJsonFieldConflicts */ + deprecatedLegacyJsonFieldConflicts?: (boolean|null); + /** MessageOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -10790,6 +12235,9 @@ export namespace google { /** MessageOptions mapEntry. */ public mapEntry: boolean; + /** MessageOptions deprecatedLegacyJsonFieldConflicts. */ + public deprecatedLegacyJsonFieldConflicts: boolean; + /** MessageOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -10895,6 +12343,15 @@ export namespace google { /** FieldOptions weak */ weak?: (boolean|null); + /** FieldOptions debugRedact */ + debugRedact?: (boolean|null); + + /** FieldOptions retention */ + retention?: (google.protobuf.FieldOptions.OptionRetention|keyof typeof google.protobuf.FieldOptions.OptionRetention|null); + + /** FieldOptions target */ + target?: (google.protobuf.FieldOptions.OptionTargetType|keyof typeof google.protobuf.FieldOptions.OptionTargetType|null); + /** FieldOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -10935,6 +12392,15 @@ export namespace google { /** FieldOptions weak. */ public weak: boolean; + /** FieldOptions debugRedact. */ + public debugRedact: boolean; + + /** FieldOptions retention. */ + public retention: (google.protobuf.FieldOptions.OptionRetention|keyof typeof google.protobuf.FieldOptions.OptionRetention); + + /** FieldOptions target. */ + public target: (google.protobuf.FieldOptions.OptionTargetType|keyof typeof google.protobuf.FieldOptions.OptionTargetType); + /** FieldOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -11031,6 +12497,27 @@ export namespace google { JS_STRING = 1, JS_NUMBER = 2 } + + /** OptionRetention enum. */ + enum OptionRetention { + RETENTION_UNKNOWN = 0, + RETENTION_RUNTIME = 1, + RETENTION_SOURCE = 2 + } + + /** OptionTargetType enum. */ + enum OptionTargetType { + TARGET_TYPE_UNKNOWN = 0, + TARGET_TYPE_FILE = 1, + TARGET_TYPE_EXTENSION_RANGE = 2, + TARGET_TYPE_MESSAGE = 3, + TARGET_TYPE_FIELD = 4, + TARGET_TYPE_ONEOF = 5, + TARGET_TYPE_ENUM = 6, + TARGET_TYPE_ENUM_ENTRY = 7, + TARGET_TYPE_SERVICE = 8, + TARGET_TYPE_METHOD = 9 + } } /** Properties of an OneofOptions. */ @@ -11139,6 +12626,9 @@ export namespace google { /** EnumOptions deprecated */ deprecated?: (boolean|null); + /** EnumOptions deprecatedLegacyJsonFieldConflicts */ + deprecatedLegacyJsonFieldConflicts?: (boolean|null); + /** EnumOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -11158,6 +12648,9 @@ export namespace google { /** EnumOptions deprecated. */ public deprecated: boolean; + /** EnumOptions deprecatedLegacyJsonFieldConflicts. */ + public deprecatedLegacyJsonFieldConflicts: boolean; + /** EnumOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 12b95492de7..2495a560e15 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -20326,6 +20326,3615 @@ return CustomHttpPattern; })(); + api.CommonLanguageSettings = (function() { + + /** + * Properties of a CommonLanguageSettings. + * @memberof google.api + * @interface ICommonLanguageSettings + * @property {string|null} [referenceDocsUri] CommonLanguageSettings referenceDocsUri + * @property {Array.|null} [destinations] CommonLanguageSettings destinations + */ + + /** + * Constructs a new CommonLanguageSettings. + * @memberof google.api + * @classdesc Represents a CommonLanguageSettings. + * @implements ICommonLanguageSettings + * @constructor + * @param {google.api.ICommonLanguageSettings=} [properties] Properties to set + */ + function CommonLanguageSettings(properties) { + this.destinations = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CommonLanguageSettings referenceDocsUri. + * @member {string} referenceDocsUri + * @memberof google.api.CommonLanguageSettings + * @instance + */ + CommonLanguageSettings.prototype.referenceDocsUri = ""; + + /** + * CommonLanguageSettings destinations. + * @member {Array.} destinations + * @memberof google.api.CommonLanguageSettings + * @instance + */ + CommonLanguageSettings.prototype.destinations = $util.emptyArray; + + /** + * Creates a new CommonLanguageSettings instance using the specified properties. + * @function create + * @memberof google.api.CommonLanguageSettings + * @static + * @param {google.api.ICommonLanguageSettings=} [properties] Properties to set + * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings instance + */ + CommonLanguageSettings.create = function create(properties) { + return new CommonLanguageSettings(properties); + }; + + /** + * Encodes the specified CommonLanguageSettings message. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. + * @function encode + * @memberof google.api.CommonLanguageSettings + * @static + * @param {google.api.ICommonLanguageSettings} message CommonLanguageSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CommonLanguageSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.referenceDocsUri != null && Object.hasOwnProperty.call(message, "referenceDocsUri")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.referenceDocsUri); + if (message.destinations != null && message.destinations.length) { + writer.uint32(/* id 2, wireType 2 =*/18).fork(); + for (var i = 0; i < message.destinations.length; ++i) + writer.int32(message.destinations[i]); + writer.ldelim(); + } + return writer; + }; + + /** + * Encodes the specified CommonLanguageSettings message, length delimited. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.CommonLanguageSettings + * @static + * @param {google.api.ICommonLanguageSettings} message CommonLanguageSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CommonLanguageSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CommonLanguageSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.CommonLanguageSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CommonLanguageSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CommonLanguageSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.referenceDocsUri = reader.string(); + break; + } + case 2: { + if (!(message.destinations && message.destinations.length)) + message.destinations = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.destinations.push(reader.int32()); + } else + message.destinations.push(reader.int32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CommonLanguageSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.CommonLanguageSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CommonLanguageSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CommonLanguageSettings message. + * @function verify + * @memberof google.api.CommonLanguageSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CommonLanguageSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.referenceDocsUri != null && message.hasOwnProperty("referenceDocsUri")) + if (!$util.isString(message.referenceDocsUri)) + return "referenceDocsUri: string expected"; + if (message.destinations != null && message.hasOwnProperty("destinations")) { + if (!Array.isArray(message.destinations)) + return "destinations: array expected"; + for (var i = 0; i < message.destinations.length; ++i) + switch (message.destinations[i]) { + default: + return "destinations: enum value[] expected"; + case 0: + case 10: + case 20: + break; + } + } + return null; + }; + + /** + * Creates a CommonLanguageSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.CommonLanguageSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings + */ + CommonLanguageSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.CommonLanguageSettings) + return object; + var message = new $root.google.api.CommonLanguageSettings(); + if (object.referenceDocsUri != null) + message.referenceDocsUri = String(object.referenceDocsUri); + if (object.destinations) { + if (!Array.isArray(object.destinations)) + throw TypeError(".google.api.CommonLanguageSettings.destinations: array expected"); + message.destinations = []; + for (var i = 0; i < object.destinations.length; ++i) + switch (object.destinations[i]) { + default: + if (typeof object.destinations[i] === "number") { + message.destinations[i] = object.destinations[i]; + break; + } + case "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED": + case 0: + message.destinations[i] = 0; + break; + case "GITHUB": + case 10: + message.destinations[i] = 10; + break; + case "PACKAGE_MANAGER": + case 20: + message.destinations[i] = 20; + break; + } + } + return message; + }; + + /** + * Creates a plain object from a CommonLanguageSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.CommonLanguageSettings + * @static + * @param {google.api.CommonLanguageSettings} message CommonLanguageSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CommonLanguageSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.destinations = []; + if (options.defaults) + object.referenceDocsUri = ""; + if (message.referenceDocsUri != null && message.hasOwnProperty("referenceDocsUri")) + object.referenceDocsUri = message.referenceDocsUri; + if (message.destinations && message.destinations.length) { + object.destinations = []; + for (var j = 0; j < message.destinations.length; ++j) + object.destinations[j] = options.enums === String ? $root.google.api.ClientLibraryDestination[message.destinations[j]] === undefined ? message.destinations[j] : $root.google.api.ClientLibraryDestination[message.destinations[j]] : message.destinations[j]; + } + return object; + }; + + /** + * Converts this CommonLanguageSettings to JSON. + * @function toJSON + * @memberof google.api.CommonLanguageSettings + * @instance + * @returns {Object.} JSON object + */ + CommonLanguageSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for CommonLanguageSettings + * @function getTypeUrl + * @memberof google.api.CommonLanguageSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CommonLanguageSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.CommonLanguageSettings"; + }; + + return CommonLanguageSettings; + })(); + + api.ClientLibrarySettings = (function() { + + /** + * Properties of a ClientLibrarySettings. + * @memberof google.api + * @interface IClientLibrarySettings + * @property {string|null} [version] ClientLibrarySettings version + * @property {google.api.LaunchStage|null} [launchStage] ClientLibrarySettings launchStage + * @property {boolean|null} [restNumericEnums] ClientLibrarySettings restNumericEnums + * @property {google.api.IJavaSettings|null} [javaSettings] ClientLibrarySettings javaSettings + * @property {google.api.ICppSettings|null} [cppSettings] ClientLibrarySettings cppSettings + * @property {google.api.IPhpSettings|null} [phpSettings] ClientLibrarySettings phpSettings + * @property {google.api.IPythonSettings|null} [pythonSettings] ClientLibrarySettings pythonSettings + * @property {google.api.INodeSettings|null} [nodeSettings] ClientLibrarySettings nodeSettings + * @property {google.api.IDotnetSettings|null} [dotnetSettings] ClientLibrarySettings dotnetSettings + * @property {google.api.IRubySettings|null} [rubySettings] ClientLibrarySettings rubySettings + * @property {google.api.IGoSettings|null} [goSettings] ClientLibrarySettings goSettings + */ + + /** + * Constructs a new ClientLibrarySettings. + * @memberof google.api + * @classdesc Represents a ClientLibrarySettings. + * @implements IClientLibrarySettings + * @constructor + * @param {google.api.IClientLibrarySettings=} [properties] Properties to set + */ + function ClientLibrarySettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ClientLibrarySettings version. + * @member {string} version + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.version = ""; + + /** + * ClientLibrarySettings launchStage. + * @member {google.api.LaunchStage} launchStage + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.launchStage = 0; + + /** + * ClientLibrarySettings restNumericEnums. + * @member {boolean} restNumericEnums + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.restNumericEnums = false; + + /** + * ClientLibrarySettings javaSettings. + * @member {google.api.IJavaSettings|null|undefined} javaSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.javaSettings = null; + + /** + * ClientLibrarySettings cppSettings. + * @member {google.api.ICppSettings|null|undefined} cppSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.cppSettings = null; + + /** + * ClientLibrarySettings phpSettings. + * @member {google.api.IPhpSettings|null|undefined} phpSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.phpSettings = null; + + /** + * ClientLibrarySettings pythonSettings. + * @member {google.api.IPythonSettings|null|undefined} pythonSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.pythonSettings = null; + + /** + * ClientLibrarySettings nodeSettings. + * @member {google.api.INodeSettings|null|undefined} nodeSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.nodeSettings = null; + + /** + * ClientLibrarySettings dotnetSettings. + * @member {google.api.IDotnetSettings|null|undefined} dotnetSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.dotnetSettings = null; + + /** + * ClientLibrarySettings rubySettings. + * @member {google.api.IRubySettings|null|undefined} rubySettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.rubySettings = null; + + /** + * ClientLibrarySettings goSettings. + * @member {google.api.IGoSettings|null|undefined} goSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.goSettings = null; + + /** + * Creates a new ClientLibrarySettings instance using the specified properties. + * @function create + * @memberof google.api.ClientLibrarySettings + * @static + * @param {google.api.IClientLibrarySettings=} [properties] Properties to set + * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings instance + */ + ClientLibrarySettings.create = function create(properties) { + return new ClientLibrarySettings(properties); + }; + + /** + * Encodes the specified ClientLibrarySettings message. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. + * @function encode + * @memberof google.api.ClientLibrarySettings + * @static + * @param {google.api.IClientLibrarySettings} message ClientLibrarySettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ClientLibrarySettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.version != null && Object.hasOwnProperty.call(message, "version")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.version); + if (message.launchStage != null && Object.hasOwnProperty.call(message, "launchStage")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.launchStage); + if (message.restNumericEnums != null && Object.hasOwnProperty.call(message, "restNumericEnums")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.restNumericEnums); + if (message.javaSettings != null && Object.hasOwnProperty.call(message, "javaSettings")) + $root.google.api.JavaSettings.encode(message.javaSettings, writer.uint32(/* id 21, wireType 2 =*/170).fork()).ldelim(); + if (message.cppSettings != null && Object.hasOwnProperty.call(message, "cppSettings")) + $root.google.api.CppSettings.encode(message.cppSettings, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); + if (message.phpSettings != null && Object.hasOwnProperty.call(message, "phpSettings")) + $root.google.api.PhpSettings.encode(message.phpSettings, writer.uint32(/* id 23, wireType 2 =*/186).fork()).ldelim(); + if (message.pythonSettings != null && Object.hasOwnProperty.call(message, "pythonSettings")) + $root.google.api.PythonSettings.encode(message.pythonSettings, writer.uint32(/* id 24, wireType 2 =*/194).fork()).ldelim(); + if (message.nodeSettings != null && Object.hasOwnProperty.call(message, "nodeSettings")) + $root.google.api.NodeSettings.encode(message.nodeSettings, writer.uint32(/* id 25, wireType 2 =*/202).fork()).ldelim(); + if (message.dotnetSettings != null && Object.hasOwnProperty.call(message, "dotnetSettings")) + $root.google.api.DotnetSettings.encode(message.dotnetSettings, writer.uint32(/* id 26, wireType 2 =*/210).fork()).ldelim(); + if (message.rubySettings != null && Object.hasOwnProperty.call(message, "rubySettings")) + $root.google.api.RubySettings.encode(message.rubySettings, writer.uint32(/* id 27, wireType 2 =*/218).fork()).ldelim(); + if (message.goSettings != null && Object.hasOwnProperty.call(message, "goSettings")) + $root.google.api.GoSettings.encode(message.goSettings, writer.uint32(/* id 28, wireType 2 =*/226).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ClientLibrarySettings message, length delimited. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.ClientLibrarySettings + * @static + * @param {google.api.IClientLibrarySettings} message ClientLibrarySettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ClientLibrarySettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ClientLibrarySettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.ClientLibrarySettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ClientLibrarySettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ClientLibrarySettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.version = reader.string(); + break; + } + case 2: { + message.launchStage = reader.int32(); + break; + } + case 3: { + message.restNumericEnums = reader.bool(); + break; + } + case 21: { + message.javaSettings = $root.google.api.JavaSettings.decode(reader, reader.uint32()); + break; + } + case 22: { + message.cppSettings = $root.google.api.CppSettings.decode(reader, reader.uint32()); + break; + } + case 23: { + message.phpSettings = $root.google.api.PhpSettings.decode(reader, reader.uint32()); + break; + } + case 24: { + message.pythonSettings = $root.google.api.PythonSettings.decode(reader, reader.uint32()); + break; + } + case 25: { + message.nodeSettings = $root.google.api.NodeSettings.decode(reader, reader.uint32()); + break; + } + case 26: { + message.dotnetSettings = $root.google.api.DotnetSettings.decode(reader, reader.uint32()); + break; + } + case 27: { + message.rubySettings = $root.google.api.RubySettings.decode(reader, reader.uint32()); + break; + } + case 28: { + message.goSettings = $root.google.api.GoSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ClientLibrarySettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.ClientLibrarySettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ClientLibrarySettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ClientLibrarySettings message. + * @function verify + * @memberof google.api.ClientLibrarySettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ClientLibrarySettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.version != null && message.hasOwnProperty("version")) + if (!$util.isString(message.version)) + return "version: string expected"; + if (message.launchStage != null && message.hasOwnProperty("launchStage")) + switch (message.launchStage) { + default: + return "launchStage: enum value expected"; + case 0: + case 6: + case 7: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + if (message.restNumericEnums != null && message.hasOwnProperty("restNumericEnums")) + if (typeof message.restNumericEnums !== "boolean") + return "restNumericEnums: boolean expected"; + if (message.javaSettings != null && message.hasOwnProperty("javaSettings")) { + var error = $root.google.api.JavaSettings.verify(message.javaSettings); + if (error) + return "javaSettings." + error; + } + if (message.cppSettings != null && message.hasOwnProperty("cppSettings")) { + var error = $root.google.api.CppSettings.verify(message.cppSettings); + if (error) + return "cppSettings." + error; + } + if (message.phpSettings != null && message.hasOwnProperty("phpSettings")) { + var error = $root.google.api.PhpSettings.verify(message.phpSettings); + if (error) + return "phpSettings." + error; + } + if (message.pythonSettings != null && message.hasOwnProperty("pythonSettings")) { + var error = $root.google.api.PythonSettings.verify(message.pythonSettings); + if (error) + return "pythonSettings." + error; + } + if (message.nodeSettings != null && message.hasOwnProperty("nodeSettings")) { + var error = $root.google.api.NodeSettings.verify(message.nodeSettings); + if (error) + return "nodeSettings." + error; + } + if (message.dotnetSettings != null && message.hasOwnProperty("dotnetSettings")) { + var error = $root.google.api.DotnetSettings.verify(message.dotnetSettings); + if (error) + return "dotnetSettings." + error; + } + if (message.rubySettings != null && message.hasOwnProperty("rubySettings")) { + var error = $root.google.api.RubySettings.verify(message.rubySettings); + if (error) + return "rubySettings." + error; + } + if (message.goSettings != null && message.hasOwnProperty("goSettings")) { + var error = $root.google.api.GoSettings.verify(message.goSettings); + if (error) + return "goSettings." + error; + } + return null; + }; + + /** + * Creates a ClientLibrarySettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.ClientLibrarySettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings + */ + ClientLibrarySettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ClientLibrarySettings) + return object; + var message = new $root.google.api.ClientLibrarySettings(); + if (object.version != null) + message.version = String(object.version); + switch (object.launchStage) { + default: + if (typeof object.launchStage === "number") { + message.launchStage = object.launchStage; + break; + } + break; + case "LAUNCH_STAGE_UNSPECIFIED": + case 0: + message.launchStage = 0; + break; + case "UNIMPLEMENTED": + case 6: + message.launchStage = 6; + break; + case "PRELAUNCH": + case 7: + message.launchStage = 7; + break; + case "EARLY_ACCESS": + case 1: + message.launchStage = 1; + break; + case "ALPHA": + case 2: + message.launchStage = 2; + break; + case "BETA": + case 3: + message.launchStage = 3; + break; + case "GA": + case 4: + message.launchStage = 4; + break; + case "DEPRECATED": + case 5: + message.launchStage = 5; + break; + } + if (object.restNumericEnums != null) + message.restNumericEnums = Boolean(object.restNumericEnums); + if (object.javaSettings != null) { + if (typeof object.javaSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.javaSettings: object expected"); + message.javaSettings = $root.google.api.JavaSettings.fromObject(object.javaSettings); + } + if (object.cppSettings != null) { + if (typeof object.cppSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.cppSettings: object expected"); + message.cppSettings = $root.google.api.CppSettings.fromObject(object.cppSettings); + } + if (object.phpSettings != null) { + if (typeof object.phpSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.phpSettings: object expected"); + message.phpSettings = $root.google.api.PhpSettings.fromObject(object.phpSettings); + } + if (object.pythonSettings != null) { + if (typeof object.pythonSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.pythonSettings: object expected"); + message.pythonSettings = $root.google.api.PythonSettings.fromObject(object.pythonSettings); + } + if (object.nodeSettings != null) { + if (typeof object.nodeSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.nodeSettings: object expected"); + message.nodeSettings = $root.google.api.NodeSettings.fromObject(object.nodeSettings); + } + if (object.dotnetSettings != null) { + if (typeof object.dotnetSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.dotnetSettings: object expected"); + message.dotnetSettings = $root.google.api.DotnetSettings.fromObject(object.dotnetSettings); + } + if (object.rubySettings != null) { + if (typeof object.rubySettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.rubySettings: object expected"); + message.rubySettings = $root.google.api.RubySettings.fromObject(object.rubySettings); + } + if (object.goSettings != null) { + if (typeof object.goSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.goSettings: object expected"); + message.goSettings = $root.google.api.GoSettings.fromObject(object.goSettings); + } + return message; + }; + + /** + * Creates a plain object from a ClientLibrarySettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.ClientLibrarySettings + * @static + * @param {google.api.ClientLibrarySettings} message ClientLibrarySettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ClientLibrarySettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.version = ""; + object.launchStage = options.enums === String ? "LAUNCH_STAGE_UNSPECIFIED" : 0; + object.restNumericEnums = false; + object.javaSettings = null; + object.cppSettings = null; + object.phpSettings = null; + object.pythonSettings = null; + object.nodeSettings = null; + object.dotnetSettings = null; + object.rubySettings = null; + object.goSettings = null; + } + if (message.version != null && message.hasOwnProperty("version")) + object.version = message.version; + if (message.launchStage != null && message.hasOwnProperty("launchStage")) + object.launchStage = options.enums === String ? $root.google.api.LaunchStage[message.launchStage] === undefined ? message.launchStage : $root.google.api.LaunchStage[message.launchStage] : message.launchStage; + if (message.restNumericEnums != null && message.hasOwnProperty("restNumericEnums")) + object.restNumericEnums = message.restNumericEnums; + if (message.javaSettings != null && message.hasOwnProperty("javaSettings")) + object.javaSettings = $root.google.api.JavaSettings.toObject(message.javaSettings, options); + if (message.cppSettings != null && message.hasOwnProperty("cppSettings")) + object.cppSettings = $root.google.api.CppSettings.toObject(message.cppSettings, options); + if (message.phpSettings != null && message.hasOwnProperty("phpSettings")) + object.phpSettings = $root.google.api.PhpSettings.toObject(message.phpSettings, options); + if (message.pythonSettings != null && message.hasOwnProperty("pythonSettings")) + object.pythonSettings = $root.google.api.PythonSettings.toObject(message.pythonSettings, options); + if (message.nodeSettings != null && message.hasOwnProperty("nodeSettings")) + object.nodeSettings = $root.google.api.NodeSettings.toObject(message.nodeSettings, options); + if (message.dotnetSettings != null && message.hasOwnProperty("dotnetSettings")) + object.dotnetSettings = $root.google.api.DotnetSettings.toObject(message.dotnetSettings, options); + if (message.rubySettings != null && message.hasOwnProperty("rubySettings")) + object.rubySettings = $root.google.api.RubySettings.toObject(message.rubySettings, options); + if (message.goSettings != null && message.hasOwnProperty("goSettings")) + object.goSettings = $root.google.api.GoSettings.toObject(message.goSettings, options); + return object; + }; + + /** + * Converts this ClientLibrarySettings to JSON. + * @function toJSON + * @memberof google.api.ClientLibrarySettings + * @instance + * @returns {Object.} JSON object + */ + ClientLibrarySettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for ClientLibrarySettings + * @function getTypeUrl + * @memberof google.api.ClientLibrarySettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ClientLibrarySettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.ClientLibrarySettings"; + }; + + return ClientLibrarySettings; + })(); + + api.Publishing = (function() { + + /** + * Properties of a Publishing. + * @memberof google.api + * @interface IPublishing + * @property {Array.|null} [methodSettings] Publishing methodSettings + * @property {string|null} [newIssueUri] Publishing newIssueUri + * @property {string|null} [documentationUri] Publishing documentationUri + * @property {string|null} [apiShortName] Publishing apiShortName + * @property {string|null} [githubLabel] Publishing githubLabel + * @property {Array.|null} [codeownerGithubTeams] Publishing codeownerGithubTeams + * @property {string|null} [docTagPrefix] Publishing docTagPrefix + * @property {google.api.ClientLibraryOrganization|null} [organization] Publishing organization + * @property {Array.|null} [librarySettings] Publishing librarySettings + */ + + /** + * Constructs a new Publishing. + * @memberof google.api + * @classdesc Represents a Publishing. + * @implements IPublishing + * @constructor + * @param {google.api.IPublishing=} [properties] Properties to set + */ + function Publishing(properties) { + this.methodSettings = []; + this.codeownerGithubTeams = []; + this.librarySettings = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Publishing methodSettings. + * @member {Array.} methodSettings + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.methodSettings = $util.emptyArray; + + /** + * Publishing newIssueUri. + * @member {string} newIssueUri + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.newIssueUri = ""; + + /** + * Publishing documentationUri. + * @member {string} documentationUri + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.documentationUri = ""; + + /** + * Publishing apiShortName. + * @member {string} apiShortName + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.apiShortName = ""; + + /** + * Publishing githubLabel. + * @member {string} githubLabel + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.githubLabel = ""; + + /** + * Publishing codeownerGithubTeams. + * @member {Array.} codeownerGithubTeams + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.codeownerGithubTeams = $util.emptyArray; + + /** + * Publishing docTagPrefix. + * @member {string} docTagPrefix + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.docTagPrefix = ""; + + /** + * Publishing organization. + * @member {google.api.ClientLibraryOrganization} organization + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.organization = 0; + + /** + * Publishing librarySettings. + * @member {Array.} librarySettings + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.librarySettings = $util.emptyArray; + + /** + * Creates a new Publishing instance using the specified properties. + * @function create + * @memberof google.api.Publishing + * @static + * @param {google.api.IPublishing=} [properties] Properties to set + * @returns {google.api.Publishing} Publishing instance + */ + Publishing.create = function create(properties) { + return new Publishing(properties); + }; + + /** + * Encodes the specified Publishing message. Does not implicitly {@link google.api.Publishing.verify|verify} messages. + * @function encode + * @memberof google.api.Publishing + * @static + * @param {google.api.IPublishing} message Publishing message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Publishing.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.methodSettings != null && message.methodSettings.length) + for (var i = 0; i < message.methodSettings.length; ++i) + $root.google.api.MethodSettings.encode(message.methodSettings[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.newIssueUri != null && Object.hasOwnProperty.call(message, "newIssueUri")) + writer.uint32(/* id 101, wireType 2 =*/810).string(message.newIssueUri); + if (message.documentationUri != null && Object.hasOwnProperty.call(message, "documentationUri")) + writer.uint32(/* id 102, wireType 2 =*/818).string(message.documentationUri); + if (message.apiShortName != null && Object.hasOwnProperty.call(message, "apiShortName")) + writer.uint32(/* id 103, wireType 2 =*/826).string(message.apiShortName); + if (message.githubLabel != null && Object.hasOwnProperty.call(message, "githubLabel")) + writer.uint32(/* id 104, wireType 2 =*/834).string(message.githubLabel); + if (message.codeownerGithubTeams != null && message.codeownerGithubTeams.length) + for (var i = 0; i < message.codeownerGithubTeams.length; ++i) + writer.uint32(/* id 105, wireType 2 =*/842).string(message.codeownerGithubTeams[i]); + if (message.docTagPrefix != null && Object.hasOwnProperty.call(message, "docTagPrefix")) + writer.uint32(/* id 106, wireType 2 =*/850).string(message.docTagPrefix); + if (message.organization != null && Object.hasOwnProperty.call(message, "organization")) + writer.uint32(/* id 107, wireType 0 =*/856).int32(message.organization); + if (message.librarySettings != null && message.librarySettings.length) + for (var i = 0; i < message.librarySettings.length; ++i) + $root.google.api.ClientLibrarySettings.encode(message.librarySettings[i], writer.uint32(/* id 109, wireType 2 =*/874).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified Publishing message, length delimited. Does not implicitly {@link google.api.Publishing.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.Publishing + * @static + * @param {google.api.IPublishing} message Publishing message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Publishing.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Publishing message from the specified reader or buffer. + * @function decode + * @memberof google.api.Publishing + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.Publishing} Publishing + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Publishing.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Publishing(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 2: { + if (!(message.methodSettings && message.methodSettings.length)) + message.methodSettings = []; + message.methodSettings.push($root.google.api.MethodSettings.decode(reader, reader.uint32())); + break; + } + case 101: { + message.newIssueUri = reader.string(); + break; + } + case 102: { + message.documentationUri = reader.string(); + break; + } + case 103: { + message.apiShortName = reader.string(); + break; + } + case 104: { + message.githubLabel = reader.string(); + break; + } + case 105: { + if (!(message.codeownerGithubTeams && message.codeownerGithubTeams.length)) + message.codeownerGithubTeams = []; + message.codeownerGithubTeams.push(reader.string()); + break; + } + case 106: { + message.docTagPrefix = reader.string(); + break; + } + case 107: { + message.organization = reader.int32(); + break; + } + case 109: { + if (!(message.librarySettings && message.librarySettings.length)) + message.librarySettings = []; + message.librarySettings.push($root.google.api.ClientLibrarySettings.decode(reader, reader.uint32())); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Publishing message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.Publishing + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.Publishing} Publishing + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Publishing.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Publishing message. + * @function verify + * @memberof google.api.Publishing + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Publishing.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.methodSettings != null && message.hasOwnProperty("methodSettings")) { + if (!Array.isArray(message.methodSettings)) + return "methodSettings: array expected"; + for (var i = 0; i < message.methodSettings.length; ++i) { + var error = $root.google.api.MethodSettings.verify(message.methodSettings[i]); + if (error) + return "methodSettings." + error; + } + } + if (message.newIssueUri != null && message.hasOwnProperty("newIssueUri")) + if (!$util.isString(message.newIssueUri)) + return "newIssueUri: string expected"; + if (message.documentationUri != null && message.hasOwnProperty("documentationUri")) + if (!$util.isString(message.documentationUri)) + return "documentationUri: string expected"; + if (message.apiShortName != null && message.hasOwnProperty("apiShortName")) + if (!$util.isString(message.apiShortName)) + return "apiShortName: string expected"; + if (message.githubLabel != null && message.hasOwnProperty("githubLabel")) + if (!$util.isString(message.githubLabel)) + return "githubLabel: string expected"; + if (message.codeownerGithubTeams != null && message.hasOwnProperty("codeownerGithubTeams")) { + if (!Array.isArray(message.codeownerGithubTeams)) + return "codeownerGithubTeams: array expected"; + for (var i = 0; i < message.codeownerGithubTeams.length; ++i) + if (!$util.isString(message.codeownerGithubTeams[i])) + return "codeownerGithubTeams: string[] expected"; + } + if (message.docTagPrefix != null && message.hasOwnProperty("docTagPrefix")) + if (!$util.isString(message.docTagPrefix)) + return "docTagPrefix: string expected"; + if (message.organization != null && message.hasOwnProperty("organization")) + switch (message.organization) { + default: + return "organization: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + break; + } + if (message.librarySettings != null && message.hasOwnProperty("librarySettings")) { + if (!Array.isArray(message.librarySettings)) + return "librarySettings: array expected"; + for (var i = 0; i < message.librarySettings.length; ++i) { + var error = $root.google.api.ClientLibrarySettings.verify(message.librarySettings[i]); + if (error) + return "librarySettings." + error; + } + } + return null; + }; + + /** + * Creates a Publishing message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.Publishing + * @static + * @param {Object.} object Plain object + * @returns {google.api.Publishing} Publishing + */ + Publishing.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.Publishing) + return object; + var message = new $root.google.api.Publishing(); + if (object.methodSettings) { + if (!Array.isArray(object.methodSettings)) + throw TypeError(".google.api.Publishing.methodSettings: array expected"); + message.methodSettings = []; + for (var i = 0; i < object.methodSettings.length; ++i) { + if (typeof object.methodSettings[i] !== "object") + throw TypeError(".google.api.Publishing.methodSettings: object expected"); + message.methodSettings[i] = $root.google.api.MethodSettings.fromObject(object.methodSettings[i]); + } + } + if (object.newIssueUri != null) + message.newIssueUri = String(object.newIssueUri); + if (object.documentationUri != null) + message.documentationUri = String(object.documentationUri); + if (object.apiShortName != null) + message.apiShortName = String(object.apiShortName); + if (object.githubLabel != null) + message.githubLabel = String(object.githubLabel); + if (object.codeownerGithubTeams) { + if (!Array.isArray(object.codeownerGithubTeams)) + throw TypeError(".google.api.Publishing.codeownerGithubTeams: array expected"); + message.codeownerGithubTeams = []; + for (var i = 0; i < object.codeownerGithubTeams.length; ++i) + message.codeownerGithubTeams[i] = String(object.codeownerGithubTeams[i]); + } + if (object.docTagPrefix != null) + message.docTagPrefix = String(object.docTagPrefix); + switch (object.organization) { + default: + if (typeof object.organization === "number") { + message.organization = object.organization; + break; + } + break; + case "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED": + case 0: + message.organization = 0; + break; + case "CLOUD": + case 1: + message.organization = 1; + break; + case "ADS": + case 2: + message.organization = 2; + break; + case "PHOTOS": + case 3: + message.organization = 3; + break; + case "STREET_VIEW": + case 4: + message.organization = 4; + break; + } + if (object.librarySettings) { + if (!Array.isArray(object.librarySettings)) + throw TypeError(".google.api.Publishing.librarySettings: array expected"); + message.librarySettings = []; + for (var i = 0; i < object.librarySettings.length; ++i) { + if (typeof object.librarySettings[i] !== "object") + throw TypeError(".google.api.Publishing.librarySettings: object expected"); + message.librarySettings[i] = $root.google.api.ClientLibrarySettings.fromObject(object.librarySettings[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a Publishing message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.Publishing + * @static + * @param {google.api.Publishing} message Publishing + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Publishing.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.methodSettings = []; + object.codeownerGithubTeams = []; + object.librarySettings = []; + } + if (options.defaults) { + object.newIssueUri = ""; + object.documentationUri = ""; + object.apiShortName = ""; + object.githubLabel = ""; + object.docTagPrefix = ""; + object.organization = options.enums === String ? "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED" : 0; + } + if (message.methodSettings && message.methodSettings.length) { + object.methodSettings = []; + for (var j = 0; j < message.methodSettings.length; ++j) + object.methodSettings[j] = $root.google.api.MethodSettings.toObject(message.methodSettings[j], options); + } + if (message.newIssueUri != null && message.hasOwnProperty("newIssueUri")) + object.newIssueUri = message.newIssueUri; + if (message.documentationUri != null && message.hasOwnProperty("documentationUri")) + object.documentationUri = message.documentationUri; + if (message.apiShortName != null && message.hasOwnProperty("apiShortName")) + object.apiShortName = message.apiShortName; + if (message.githubLabel != null && message.hasOwnProperty("githubLabel")) + object.githubLabel = message.githubLabel; + if (message.codeownerGithubTeams && message.codeownerGithubTeams.length) { + object.codeownerGithubTeams = []; + for (var j = 0; j < message.codeownerGithubTeams.length; ++j) + object.codeownerGithubTeams[j] = message.codeownerGithubTeams[j]; + } + if (message.docTagPrefix != null && message.hasOwnProperty("docTagPrefix")) + object.docTagPrefix = message.docTagPrefix; + if (message.organization != null && message.hasOwnProperty("organization")) + object.organization = options.enums === String ? $root.google.api.ClientLibraryOrganization[message.organization] === undefined ? message.organization : $root.google.api.ClientLibraryOrganization[message.organization] : message.organization; + if (message.librarySettings && message.librarySettings.length) { + object.librarySettings = []; + for (var j = 0; j < message.librarySettings.length; ++j) + object.librarySettings[j] = $root.google.api.ClientLibrarySettings.toObject(message.librarySettings[j], options); + } + return object; + }; + + /** + * Converts this Publishing to JSON. + * @function toJSON + * @memberof google.api.Publishing + * @instance + * @returns {Object.} JSON object + */ + Publishing.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for Publishing + * @function getTypeUrl + * @memberof google.api.Publishing + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Publishing.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.Publishing"; + }; + + return Publishing; + })(); + + api.JavaSettings = (function() { + + /** + * Properties of a JavaSettings. + * @memberof google.api + * @interface IJavaSettings + * @property {string|null} [libraryPackage] JavaSettings libraryPackage + * @property {Object.|null} [serviceClassNames] JavaSettings serviceClassNames + * @property {google.api.ICommonLanguageSettings|null} [common] JavaSettings common + */ + + /** + * Constructs a new JavaSettings. + * @memberof google.api + * @classdesc Represents a JavaSettings. + * @implements IJavaSettings + * @constructor + * @param {google.api.IJavaSettings=} [properties] Properties to set + */ + function JavaSettings(properties) { + this.serviceClassNames = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * JavaSettings libraryPackage. + * @member {string} libraryPackage + * @memberof google.api.JavaSettings + * @instance + */ + JavaSettings.prototype.libraryPackage = ""; + + /** + * JavaSettings serviceClassNames. + * @member {Object.} serviceClassNames + * @memberof google.api.JavaSettings + * @instance + */ + JavaSettings.prototype.serviceClassNames = $util.emptyObject; + + /** + * JavaSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.JavaSettings + * @instance + */ + JavaSettings.prototype.common = null; + + /** + * Creates a new JavaSettings instance using the specified properties. + * @function create + * @memberof google.api.JavaSettings + * @static + * @param {google.api.IJavaSettings=} [properties] Properties to set + * @returns {google.api.JavaSettings} JavaSettings instance + */ + JavaSettings.create = function create(properties) { + return new JavaSettings(properties); + }; + + /** + * Encodes the specified JavaSettings message. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. + * @function encode + * @memberof google.api.JavaSettings + * @static + * @param {google.api.IJavaSettings} message JavaSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + JavaSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.libraryPackage != null && Object.hasOwnProperty.call(message, "libraryPackage")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.libraryPackage); + if (message.serviceClassNames != null && Object.hasOwnProperty.call(message, "serviceClassNames")) + for (var keys = Object.keys(message.serviceClassNames), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.serviceClassNames[keys[i]]).ldelim(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified JavaSettings message, length delimited. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.JavaSettings + * @static + * @param {google.api.IJavaSettings} message JavaSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + JavaSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a JavaSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.JavaSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.JavaSettings} JavaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + JavaSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.JavaSettings(), key, value; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.libraryPackage = reader.string(); + break; + } + case 2: { + if (message.serviceClassNames === $util.emptyObject) + message.serviceClassNames = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.serviceClassNames[key] = value; + break; + } + case 3: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a JavaSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.JavaSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.JavaSettings} JavaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + JavaSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a JavaSettings message. + * @function verify + * @memberof google.api.JavaSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + JavaSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.libraryPackage != null && message.hasOwnProperty("libraryPackage")) + if (!$util.isString(message.libraryPackage)) + return "libraryPackage: string expected"; + if (message.serviceClassNames != null && message.hasOwnProperty("serviceClassNames")) { + if (!$util.isObject(message.serviceClassNames)) + return "serviceClassNames: object expected"; + var key = Object.keys(message.serviceClassNames); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.serviceClassNames[key[i]])) + return "serviceClassNames: string{k:string} expected"; + } + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a JavaSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.JavaSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.JavaSettings} JavaSettings + */ + JavaSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.JavaSettings) + return object; + var message = new $root.google.api.JavaSettings(); + if (object.libraryPackage != null) + message.libraryPackage = String(object.libraryPackage); + if (object.serviceClassNames) { + if (typeof object.serviceClassNames !== "object") + throw TypeError(".google.api.JavaSettings.serviceClassNames: object expected"); + message.serviceClassNames = {}; + for (var keys = Object.keys(object.serviceClassNames), i = 0; i < keys.length; ++i) + message.serviceClassNames[keys[i]] = String(object.serviceClassNames[keys[i]]); + } + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.JavaSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a JavaSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.JavaSettings + * @static + * @param {google.api.JavaSettings} message JavaSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + JavaSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.serviceClassNames = {}; + if (options.defaults) { + object.libraryPackage = ""; + object.common = null; + } + if (message.libraryPackage != null && message.hasOwnProperty("libraryPackage")) + object.libraryPackage = message.libraryPackage; + var keys2; + if (message.serviceClassNames && (keys2 = Object.keys(message.serviceClassNames)).length) { + object.serviceClassNames = {}; + for (var j = 0; j < keys2.length; ++j) + object.serviceClassNames[keys2[j]] = message.serviceClassNames[keys2[j]]; + } + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this JavaSettings to JSON. + * @function toJSON + * @memberof google.api.JavaSettings + * @instance + * @returns {Object.} JSON object + */ + JavaSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for JavaSettings + * @function getTypeUrl + * @memberof google.api.JavaSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + JavaSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.JavaSettings"; + }; + + return JavaSettings; + })(); + + api.CppSettings = (function() { + + /** + * Properties of a CppSettings. + * @memberof google.api + * @interface ICppSettings + * @property {google.api.ICommonLanguageSettings|null} [common] CppSettings common + */ + + /** + * Constructs a new CppSettings. + * @memberof google.api + * @classdesc Represents a CppSettings. + * @implements ICppSettings + * @constructor + * @param {google.api.ICppSettings=} [properties] Properties to set + */ + function CppSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CppSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.CppSettings + * @instance + */ + CppSettings.prototype.common = null; + + /** + * Creates a new CppSettings instance using the specified properties. + * @function create + * @memberof google.api.CppSettings + * @static + * @param {google.api.ICppSettings=} [properties] Properties to set + * @returns {google.api.CppSettings} CppSettings instance + */ + CppSettings.create = function create(properties) { + return new CppSettings(properties); + }; + + /** + * Encodes the specified CppSettings message. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. + * @function encode + * @memberof google.api.CppSettings + * @static + * @param {google.api.ICppSettings} message CppSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CppSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified CppSettings message, length delimited. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.CppSettings + * @static + * @param {google.api.ICppSettings} message CppSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CppSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CppSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.CppSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.CppSettings} CppSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CppSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CppSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CppSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.CppSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.CppSettings} CppSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CppSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CppSettings message. + * @function verify + * @memberof google.api.CppSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CppSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a CppSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.CppSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.CppSettings} CppSettings + */ + CppSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.CppSettings) + return object; + var message = new $root.google.api.CppSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.CppSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a CppSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.CppSettings + * @static + * @param {google.api.CppSettings} message CppSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CppSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this CppSettings to JSON. + * @function toJSON + * @memberof google.api.CppSettings + * @instance + * @returns {Object.} JSON object + */ + CppSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for CppSettings + * @function getTypeUrl + * @memberof google.api.CppSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CppSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.CppSettings"; + }; + + return CppSettings; + })(); + + api.PhpSettings = (function() { + + /** + * Properties of a PhpSettings. + * @memberof google.api + * @interface IPhpSettings + * @property {google.api.ICommonLanguageSettings|null} [common] PhpSettings common + */ + + /** + * Constructs a new PhpSettings. + * @memberof google.api + * @classdesc Represents a PhpSettings. + * @implements IPhpSettings + * @constructor + * @param {google.api.IPhpSettings=} [properties] Properties to set + */ + function PhpSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PhpSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.PhpSettings + * @instance + */ + PhpSettings.prototype.common = null; + + /** + * Creates a new PhpSettings instance using the specified properties. + * @function create + * @memberof google.api.PhpSettings + * @static + * @param {google.api.IPhpSettings=} [properties] Properties to set + * @returns {google.api.PhpSettings} PhpSettings instance + */ + PhpSettings.create = function create(properties) { + return new PhpSettings(properties); + }; + + /** + * Encodes the specified PhpSettings message. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. + * @function encode + * @memberof google.api.PhpSettings + * @static + * @param {google.api.IPhpSettings} message PhpSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PhpSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified PhpSettings message, length delimited. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.PhpSettings + * @static + * @param {google.api.IPhpSettings} message PhpSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PhpSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PhpSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.PhpSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.PhpSettings} PhpSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PhpSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PhpSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PhpSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.PhpSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.PhpSettings} PhpSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PhpSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PhpSettings message. + * @function verify + * @memberof google.api.PhpSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PhpSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a PhpSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.PhpSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.PhpSettings} PhpSettings + */ + PhpSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.PhpSettings) + return object; + var message = new $root.google.api.PhpSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.PhpSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a PhpSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.PhpSettings + * @static + * @param {google.api.PhpSettings} message PhpSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PhpSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this PhpSettings to JSON. + * @function toJSON + * @memberof google.api.PhpSettings + * @instance + * @returns {Object.} JSON object + */ + PhpSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for PhpSettings + * @function getTypeUrl + * @memberof google.api.PhpSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PhpSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.PhpSettings"; + }; + + return PhpSettings; + })(); + + api.PythonSettings = (function() { + + /** + * Properties of a PythonSettings. + * @memberof google.api + * @interface IPythonSettings + * @property {google.api.ICommonLanguageSettings|null} [common] PythonSettings common + */ + + /** + * Constructs a new PythonSettings. + * @memberof google.api + * @classdesc Represents a PythonSettings. + * @implements IPythonSettings + * @constructor + * @param {google.api.IPythonSettings=} [properties] Properties to set + */ + function PythonSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PythonSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.PythonSettings + * @instance + */ + PythonSettings.prototype.common = null; + + /** + * Creates a new PythonSettings instance using the specified properties. + * @function create + * @memberof google.api.PythonSettings + * @static + * @param {google.api.IPythonSettings=} [properties] Properties to set + * @returns {google.api.PythonSettings} PythonSettings instance + */ + PythonSettings.create = function create(properties) { + return new PythonSettings(properties); + }; + + /** + * Encodes the specified PythonSettings message. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. + * @function encode + * @memberof google.api.PythonSettings + * @static + * @param {google.api.IPythonSettings} message PythonSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PythonSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified PythonSettings message, length delimited. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.PythonSettings + * @static + * @param {google.api.IPythonSettings} message PythonSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PythonSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PythonSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.PythonSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.PythonSettings} PythonSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PythonSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PythonSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PythonSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.PythonSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.PythonSettings} PythonSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PythonSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PythonSettings message. + * @function verify + * @memberof google.api.PythonSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PythonSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a PythonSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.PythonSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.PythonSettings} PythonSettings + */ + PythonSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.PythonSettings) + return object; + var message = new $root.google.api.PythonSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.PythonSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a PythonSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.PythonSettings + * @static + * @param {google.api.PythonSettings} message PythonSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PythonSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this PythonSettings to JSON. + * @function toJSON + * @memberof google.api.PythonSettings + * @instance + * @returns {Object.} JSON object + */ + PythonSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for PythonSettings + * @function getTypeUrl + * @memberof google.api.PythonSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PythonSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.PythonSettings"; + }; + + return PythonSettings; + })(); + + api.NodeSettings = (function() { + + /** + * Properties of a NodeSettings. + * @memberof google.api + * @interface INodeSettings + * @property {google.api.ICommonLanguageSettings|null} [common] NodeSettings common + */ + + /** + * Constructs a new NodeSettings. + * @memberof google.api + * @classdesc Represents a NodeSettings. + * @implements INodeSettings + * @constructor + * @param {google.api.INodeSettings=} [properties] Properties to set + */ + function NodeSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * NodeSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.NodeSettings + * @instance + */ + NodeSettings.prototype.common = null; + + /** + * Creates a new NodeSettings instance using the specified properties. + * @function create + * @memberof google.api.NodeSettings + * @static + * @param {google.api.INodeSettings=} [properties] Properties to set + * @returns {google.api.NodeSettings} NodeSettings instance + */ + NodeSettings.create = function create(properties) { + return new NodeSettings(properties); + }; + + /** + * Encodes the specified NodeSettings message. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. + * @function encode + * @memberof google.api.NodeSettings + * @static + * @param {google.api.INodeSettings} message NodeSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NodeSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified NodeSettings message, length delimited. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.NodeSettings + * @static + * @param {google.api.INodeSettings} message NodeSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NodeSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a NodeSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.NodeSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.NodeSettings} NodeSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NodeSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.NodeSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a NodeSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.NodeSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.NodeSettings} NodeSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NodeSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a NodeSettings message. + * @function verify + * @memberof google.api.NodeSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + NodeSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a NodeSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.NodeSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.NodeSettings} NodeSettings + */ + NodeSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.NodeSettings) + return object; + var message = new $root.google.api.NodeSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.NodeSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a NodeSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.NodeSettings + * @static + * @param {google.api.NodeSettings} message NodeSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + NodeSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this NodeSettings to JSON. + * @function toJSON + * @memberof google.api.NodeSettings + * @instance + * @returns {Object.} JSON object + */ + NodeSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for NodeSettings + * @function getTypeUrl + * @memberof google.api.NodeSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + NodeSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.NodeSettings"; + }; + + return NodeSettings; + })(); + + api.DotnetSettings = (function() { + + /** + * Properties of a DotnetSettings. + * @memberof google.api + * @interface IDotnetSettings + * @property {google.api.ICommonLanguageSettings|null} [common] DotnetSettings common + */ + + /** + * Constructs a new DotnetSettings. + * @memberof google.api + * @classdesc Represents a DotnetSettings. + * @implements IDotnetSettings + * @constructor + * @param {google.api.IDotnetSettings=} [properties] Properties to set + */ + function DotnetSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DotnetSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.DotnetSettings + * @instance + */ + DotnetSettings.prototype.common = null; + + /** + * Creates a new DotnetSettings instance using the specified properties. + * @function create + * @memberof google.api.DotnetSettings + * @static + * @param {google.api.IDotnetSettings=} [properties] Properties to set + * @returns {google.api.DotnetSettings} DotnetSettings instance + */ + DotnetSettings.create = function create(properties) { + return new DotnetSettings(properties); + }; + + /** + * Encodes the specified DotnetSettings message. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. + * @function encode + * @memberof google.api.DotnetSettings + * @static + * @param {google.api.IDotnetSettings} message DotnetSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DotnetSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified DotnetSettings message, length delimited. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.DotnetSettings + * @static + * @param {google.api.IDotnetSettings} message DotnetSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DotnetSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DotnetSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.DotnetSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.DotnetSettings} DotnetSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DotnetSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.DotnetSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DotnetSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.DotnetSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.DotnetSettings} DotnetSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DotnetSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DotnetSettings message. + * @function verify + * @memberof google.api.DotnetSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DotnetSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a DotnetSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.DotnetSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.DotnetSettings} DotnetSettings + */ + DotnetSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.DotnetSettings) + return object; + var message = new $root.google.api.DotnetSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.DotnetSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a DotnetSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.DotnetSettings + * @static + * @param {google.api.DotnetSettings} message DotnetSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DotnetSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this DotnetSettings to JSON. + * @function toJSON + * @memberof google.api.DotnetSettings + * @instance + * @returns {Object.} JSON object + */ + DotnetSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for DotnetSettings + * @function getTypeUrl + * @memberof google.api.DotnetSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DotnetSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.DotnetSettings"; + }; + + return DotnetSettings; + })(); + + api.RubySettings = (function() { + + /** + * Properties of a RubySettings. + * @memberof google.api + * @interface IRubySettings + * @property {google.api.ICommonLanguageSettings|null} [common] RubySettings common + */ + + /** + * Constructs a new RubySettings. + * @memberof google.api + * @classdesc Represents a RubySettings. + * @implements IRubySettings + * @constructor + * @param {google.api.IRubySettings=} [properties] Properties to set + */ + function RubySettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * RubySettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.RubySettings + * @instance + */ + RubySettings.prototype.common = null; + + /** + * Creates a new RubySettings instance using the specified properties. + * @function create + * @memberof google.api.RubySettings + * @static + * @param {google.api.IRubySettings=} [properties] Properties to set + * @returns {google.api.RubySettings} RubySettings instance + */ + RubySettings.create = function create(properties) { + return new RubySettings(properties); + }; + + /** + * Encodes the specified RubySettings message. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. + * @function encode + * @memberof google.api.RubySettings + * @static + * @param {google.api.IRubySettings} message RubySettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + RubySettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified RubySettings message, length delimited. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.RubySettings + * @static + * @param {google.api.IRubySettings} message RubySettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + RubySettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a RubySettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.RubySettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.RubySettings} RubySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + RubySettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.RubySettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a RubySettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.RubySettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.RubySettings} RubySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + RubySettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a RubySettings message. + * @function verify + * @memberof google.api.RubySettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + RubySettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a RubySettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.RubySettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.RubySettings} RubySettings + */ + RubySettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.RubySettings) + return object; + var message = new $root.google.api.RubySettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.RubySettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a RubySettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.RubySettings + * @static + * @param {google.api.RubySettings} message RubySettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + RubySettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this RubySettings to JSON. + * @function toJSON + * @memberof google.api.RubySettings + * @instance + * @returns {Object.} JSON object + */ + RubySettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for RubySettings + * @function getTypeUrl + * @memberof google.api.RubySettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + RubySettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.RubySettings"; + }; + + return RubySettings; + })(); + + api.GoSettings = (function() { + + /** + * Properties of a GoSettings. + * @memberof google.api + * @interface IGoSettings + * @property {google.api.ICommonLanguageSettings|null} [common] GoSettings common + */ + + /** + * Constructs a new GoSettings. + * @memberof google.api + * @classdesc Represents a GoSettings. + * @implements IGoSettings + * @constructor + * @param {google.api.IGoSettings=} [properties] Properties to set + */ + function GoSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GoSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.GoSettings + * @instance + */ + GoSettings.prototype.common = null; + + /** + * Creates a new GoSettings instance using the specified properties. + * @function create + * @memberof google.api.GoSettings + * @static + * @param {google.api.IGoSettings=} [properties] Properties to set + * @returns {google.api.GoSettings} GoSettings instance + */ + GoSettings.create = function create(properties) { + return new GoSettings(properties); + }; + + /** + * Encodes the specified GoSettings message. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. + * @function encode + * @memberof google.api.GoSettings + * @static + * @param {google.api.IGoSettings} message GoSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GoSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified GoSettings message, length delimited. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.GoSettings + * @static + * @param {google.api.IGoSettings} message GoSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GoSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GoSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.GoSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.GoSettings} GoSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GoSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.GoSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GoSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.GoSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.GoSettings} GoSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GoSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GoSettings message. + * @function verify + * @memberof google.api.GoSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GoSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a GoSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.GoSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.GoSettings} GoSettings + */ + GoSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.GoSettings) + return object; + var message = new $root.google.api.GoSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.GoSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a GoSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.GoSettings + * @static + * @param {google.api.GoSettings} message GoSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GoSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this GoSettings to JSON. + * @function toJSON + * @memberof google.api.GoSettings + * @instance + * @returns {Object.} JSON object + */ + GoSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for GoSettings + * @function getTypeUrl + * @memberof google.api.GoSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + GoSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.GoSettings"; + }; + + return GoSettings; + })(); + + api.MethodSettings = (function() { + + /** + * Properties of a MethodSettings. + * @memberof google.api + * @interface IMethodSettings + * @property {string|null} [selector] MethodSettings selector + * @property {google.api.MethodSettings.ILongRunning|null} [longRunning] MethodSettings longRunning + */ + + /** + * Constructs a new MethodSettings. + * @memberof google.api + * @classdesc Represents a MethodSettings. + * @implements IMethodSettings + * @constructor + * @param {google.api.IMethodSettings=} [properties] Properties to set + */ + function MethodSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * MethodSettings selector. + * @member {string} selector + * @memberof google.api.MethodSettings + * @instance + */ + MethodSettings.prototype.selector = ""; + + /** + * MethodSettings longRunning. + * @member {google.api.MethodSettings.ILongRunning|null|undefined} longRunning + * @memberof google.api.MethodSettings + * @instance + */ + MethodSettings.prototype.longRunning = null; + + /** + * Creates a new MethodSettings instance using the specified properties. + * @function create + * @memberof google.api.MethodSettings + * @static + * @param {google.api.IMethodSettings=} [properties] Properties to set + * @returns {google.api.MethodSettings} MethodSettings instance + */ + MethodSettings.create = function create(properties) { + return new MethodSettings(properties); + }; + + /** + * Encodes the specified MethodSettings message. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. + * @function encode + * @memberof google.api.MethodSettings + * @static + * @param {google.api.IMethodSettings} message MethodSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.selector != null && Object.hasOwnProperty.call(message, "selector")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); + if (message.longRunning != null && Object.hasOwnProperty.call(message, "longRunning")) + $root.google.api.MethodSettings.LongRunning.encode(message.longRunning, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified MethodSettings message, length delimited. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.MethodSettings + * @static + * @param {google.api.IMethodSettings} message MethodSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a MethodSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.MethodSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.MethodSettings} MethodSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.MethodSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.selector = reader.string(); + break; + } + case 2: { + message.longRunning = $root.google.api.MethodSettings.LongRunning.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a MethodSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.MethodSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.MethodSettings} MethodSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a MethodSettings message. + * @function verify + * @memberof google.api.MethodSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MethodSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.selector != null && message.hasOwnProperty("selector")) + if (!$util.isString(message.selector)) + return "selector: string expected"; + if (message.longRunning != null && message.hasOwnProperty("longRunning")) { + var error = $root.google.api.MethodSettings.LongRunning.verify(message.longRunning); + if (error) + return "longRunning." + error; + } + return null; + }; + + /** + * Creates a MethodSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.MethodSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.MethodSettings} MethodSettings + */ + MethodSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.MethodSettings) + return object; + var message = new $root.google.api.MethodSettings(); + if (object.selector != null) + message.selector = String(object.selector); + if (object.longRunning != null) { + if (typeof object.longRunning !== "object") + throw TypeError(".google.api.MethodSettings.longRunning: object expected"); + message.longRunning = $root.google.api.MethodSettings.LongRunning.fromObject(object.longRunning); + } + return message; + }; + + /** + * Creates a plain object from a MethodSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.MethodSettings + * @static + * @param {google.api.MethodSettings} message MethodSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MethodSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.selector = ""; + object.longRunning = null; + } + if (message.selector != null && message.hasOwnProperty("selector")) + object.selector = message.selector; + if (message.longRunning != null && message.hasOwnProperty("longRunning")) + object.longRunning = $root.google.api.MethodSettings.LongRunning.toObject(message.longRunning, options); + return object; + }; + + /** + * Converts this MethodSettings to JSON. + * @function toJSON + * @memberof google.api.MethodSettings + * @instance + * @returns {Object.} JSON object + */ + MethodSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for MethodSettings + * @function getTypeUrl + * @memberof google.api.MethodSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + MethodSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.MethodSettings"; + }; + + MethodSettings.LongRunning = (function() { + + /** + * Properties of a LongRunning. + * @memberof google.api.MethodSettings + * @interface ILongRunning + * @property {google.protobuf.IDuration|null} [initialPollDelay] LongRunning initialPollDelay + * @property {number|null} [pollDelayMultiplier] LongRunning pollDelayMultiplier + * @property {google.protobuf.IDuration|null} [maxPollDelay] LongRunning maxPollDelay + * @property {google.protobuf.IDuration|null} [totalPollTimeout] LongRunning totalPollTimeout + */ + + /** + * Constructs a new LongRunning. + * @memberof google.api.MethodSettings + * @classdesc Represents a LongRunning. + * @implements ILongRunning + * @constructor + * @param {google.api.MethodSettings.ILongRunning=} [properties] Properties to set + */ + function LongRunning(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * LongRunning initialPollDelay. + * @member {google.protobuf.IDuration|null|undefined} initialPollDelay + * @memberof google.api.MethodSettings.LongRunning + * @instance + */ + LongRunning.prototype.initialPollDelay = null; + + /** + * LongRunning pollDelayMultiplier. + * @member {number} pollDelayMultiplier + * @memberof google.api.MethodSettings.LongRunning + * @instance + */ + LongRunning.prototype.pollDelayMultiplier = 0; + + /** + * LongRunning maxPollDelay. + * @member {google.protobuf.IDuration|null|undefined} maxPollDelay + * @memberof google.api.MethodSettings.LongRunning + * @instance + */ + LongRunning.prototype.maxPollDelay = null; + + /** + * LongRunning totalPollTimeout. + * @member {google.protobuf.IDuration|null|undefined} totalPollTimeout + * @memberof google.api.MethodSettings.LongRunning + * @instance + */ + LongRunning.prototype.totalPollTimeout = null; + + /** + * Creates a new LongRunning instance using the specified properties. + * @function create + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {google.api.MethodSettings.ILongRunning=} [properties] Properties to set + * @returns {google.api.MethodSettings.LongRunning} LongRunning instance + */ + LongRunning.create = function create(properties) { + return new LongRunning(properties); + }; + + /** + * Encodes the specified LongRunning message. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. + * @function encode + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {google.api.MethodSettings.ILongRunning} message LongRunning message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + LongRunning.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.initialPollDelay != null && Object.hasOwnProperty.call(message, "initialPollDelay")) + $root.google.protobuf.Duration.encode(message.initialPollDelay, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.pollDelayMultiplier != null && Object.hasOwnProperty.call(message, "pollDelayMultiplier")) + writer.uint32(/* id 2, wireType 5 =*/21).float(message.pollDelayMultiplier); + if (message.maxPollDelay != null && Object.hasOwnProperty.call(message, "maxPollDelay")) + $root.google.protobuf.Duration.encode(message.maxPollDelay, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.totalPollTimeout != null && Object.hasOwnProperty.call(message, "totalPollTimeout")) + $root.google.protobuf.Duration.encode(message.totalPollTimeout, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified LongRunning message, length delimited. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {google.api.MethodSettings.ILongRunning} message LongRunning message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + LongRunning.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a LongRunning message from the specified reader or buffer. + * @function decode + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.MethodSettings.LongRunning} LongRunning + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + LongRunning.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.MethodSettings.LongRunning(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.initialPollDelay = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + case 2: { + message.pollDelayMultiplier = reader.float(); + break; + } + case 3: { + message.maxPollDelay = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + case 4: { + message.totalPollTimeout = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a LongRunning message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.MethodSettings.LongRunning} LongRunning + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + LongRunning.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a LongRunning message. + * @function verify + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + LongRunning.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.initialPollDelay != null && message.hasOwnProperty("initialPollDelay")) { + var error = $root.google.protobuf.Duration.verify(message.initialPollDelay); + if (error) + return "initialPollDelay." + error; + } + if (message.pollDelayMultiplier != null && message.hasOwnProperty("pollDelayMultiplier")) + if (typeof message.pollDelayMultiplier !== "number") + return "pollDelayMultiplier: number expected"; + if (message.maxPollDelay != null && message.hasOwnProperty("maxPollDelay")) { + var error = $root.google.protobuf.Duration.verify(message.maxPollDelay); + if (error) + return "maxPollDelay." + error; + } + if (message.totalPollTimeout != null && message.hasOwnProperty("totalPollTimeout")) { + var error = $root.google.protobuf.Duration.verify(message.totalPollTimeout); + if (error) + return "totalPollTimeout." + error; + } + return null; + }; + + /** + * Creates a LongRunning message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {Object.} object Plain object + * @returns {google.api.MethodSettings.LongRunning} LongRunning + */ + LongRunning.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.MethodSettings.LongRunning) + return object; + var message = new $root.google.api.MethodSettings.LongRunning(); + if (object.initialPollDelay != null) { + if (typeof object.initialPollDelay !== "object") + throw TypeError(".google.api.MethodSettings.LongRunning.initialPollDelay: object expected"); + message.initialPollDelay = $root.google.protobuf.Duration.fromObject(object.initialPollDelay); + } + if (object.pollDelayMultiplier != null) + message.pollDelayMultiplier = Number(object.pollDelayMultiplier); + if (object.maxPollDelay != null) { + if (typeof object.maxPollDelay !== "object") + throw TypeError(".google.api.MethodSettings.LongRunning.maxPollDelay: object expected"); + message.maxPollDelay = $root.google.protobuf.Duration.fromObject(object.maxPollDelay); + } + if (object.totalPollTimeout != null) { + if (typeof object.totalPollTimeout !== "object") + throw TypeError(".google.api.MethodSettings.LongRunning.totalPollTimeout: object expected"); + message.totalPollTimeout = $root.google.protobuf.Duration.fromObject(object.totalPollTimeout); + } + return message; + }; + + /** + * Creates a plain object from a LongRunning message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {google.api.MethodSettings.LongRunning} message LongRunning + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + LongRunning.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.initialPollDelay = null; + object.pollDelayMultiplier = 0; + object.maxPollDelay = null; + object.totalPollTimeout = null; + } + if (message.initialPollDelay != null && message.hasOwnProperty("initialPollDelay")) + object.initialPollDelay = $root.google.protobuf.Duration.toObject(message.initialPollDelay, options); + if (message.pollDelayMultiplier != null && message.hasOwnProperty("pollDelayMultiplier")) + object.pollDelayMultiplier = options.json && !isFinite(message.pollDelayMultiplier) ? String(message.pollDelayMultiplier) : message.pollDelayMultiplier; + if (message.maxPollDelay != null && message.hasOwnProperty("maxPollDelay")) + object.maxPollDelay = $root.google.protobuf.Duration.toObject(message.maxPollDelay, options); + if (message.totalPollTimeout != null && message.hasOwnProperty("totalPollTimeout")) + object.totalPollTimeout = $root.google.protobuf.Duration.toObject(message.totalPollTimeout, options); + return object; + }; + + /** + * Converts this LongRunning to JSON. + * @function toJSON + * @memberof google.api.MethodSettings.LongRunning + * @instance + * @returns {Object.} JSON object + */ + LongRunning.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for LongRunning + * @function getTypeUrl + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + LongRunning.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.MethodSettings.LongRunning"; + }; + + return LongRunning; + })(); + + return MethodSettings; + })(); + + /** + * ClientLibraryOrganization enum. + * @name google.api.ClientLibraryOrganization + * @enum {number} + * @property {number} CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED=0 CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED value + * @property {number} CLOUD=1 CLOUD value + * @property {number} ADS=2 ADS value + * @property {number} PHOTOS=3 PHOTOS value + * @property {number} STREET_VIEW=4 STREET_VIEW value + */ + api.ClientLibraryOrganization = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED"] = 0; + values[valuesById[1] = "CLOUD"] = 1; + values[valuesById[2] = "ADS"] = 2; + values[valuesById[3] = "PHOTOS"] = 3; + values[valuesById[4] = "STREET_VIEW"] = 4; + return values; + })(); + + /** + * ClientLibraryDestination enum. + * @name google.api.ClientLibraryDestination + * @enum {number} + * @property {number} CLIENT_LIBRARY_DESTINATION_UNSPECIFIED=0 CLIENT_LIBRARY_DESTINATION_UNSPECIFIED value + * @property {number} GITHUB=10 GITHUB value + * @property {number} PACKAGE_MANAGER=20 PACKAGE_MANAGER value + */ + api.ClientLibraryDestination = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED"] = 0; + values[valuesById[10] = "GITHUB"] = 10; + values[valuesById[20] = "PACKAGE_MANAGER"] = 20; + return values; + })(); + + /** + * LaunchStage enum. + * @name google.api.LaunchStage + * @enum {number} + * @property {number} LAUNCH_STAGE_UNSPECIFIED=0 LAUNCH_STAGE_UNSPECIFIED value + * @property {number} UNIMPLEMENTED=6 UNIMPLEMENTED value + * @property {number} PRELAUNCH=7 PRELAUNCH value + * @property {number} EARLY_ACCESS=1 EARLY_ACCESS value + * @property {number} ALPHA=2 ALPHA value + * @property {number} BETA=3 BETA value + * @property {number} GA=4 GA value + * @property {number} DEPRECATED=5 DEPRECATED value + */ + api.LaunchStage = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "LAUNCH_STAGE_UNSPECIFIED"] = 0; + values[valuesById[6] = "UNIMPLEMENTED"] = 6; + values[valuesById[7] = "PRELAUNCH"] = 7; + values[valuesById[1] = "EARLY_ACCESS"] = 1; + values[valuesById[2] = "ALPHA"] = 2; + values[valuesById[3] = "BETA"] = 3; + values[valuesById[4] = "GA"] = 4; + values[valuesById[5] = "DEPRECATED"] = 5; + return values; + })(); + /** * FieldBehavior enum. * @name google.api.FieldBehavior @@ -26274,6 +29883,7 @@ * @property {boolean|null} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor * @property {boolean|null} [deprecated] MessageOptions deprecated * @property {boolean|null} [mapEntry] MessageOptions mapEntry + * @property {boolean|null} [deprecatedLegacyJsonFieldConflicts] MessageOptions deprecatedLegacyJsonFieldConflicts * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource */ @@ -26326,6 +29936,14 @@ */ MessageOptions.prototype.mapEntry = false; + /** + * MessageOptions deprecatedLegacyJsonFieldConflicts. + * @member {boolean} deprecatedLegacyJsonFieldConflicts + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.deprecatedLegacyJsonFieldConflicts = false; + /** * MessageOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -26374,6 +29992,8 @@ writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); if (message.mapEntry != null && Object.hasOwnProperty.call(message, "mapEntry")) writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); + if (message.deprecatedLegacyJsonFieldConflicts != null && Object.hasOwnProperty.call(message, "deprecatedLegacyJsonFieldConflicts")) + writer.uint32(/* id 11, wireType 0 =*/88).bool(message.deprecatedLegacyJsonFieldConflicts); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -26429,6 +30049,10 @@ message.mapEntry = reader.bool(); break; } + case 11: { + message.deprecatedLegacyJsonFieldConflicts = reader.bool(); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -26486,6 +30110,9 @@ if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) if (typeof message.mapEntry !== "boolean") return "mapEntry: boolean expected"; + if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) + if (typeof message.deprecatedLegacyJsonFieldConflicts !== "boolean") + return "deprecatedLegacyJsonFieldConflicts: boolean expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -26523,6 +30150,8 @@ message.deprecated = Boolean(object.deprecated); if (object.mapEntry != null) message.mapEntry = Boolean(object.mapEntry); + if (object.deprecatedLegacyJsonFieldConflicts != null) + message.deprecatedLegacyJsonFieldConflicts = Boolean(object.deprecatedLegacyJsonFieldConflicts); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); @@ -26561,6 +30190,7 @@ object.noStandardDescriptorAccessor = false; object.deprecated = false; object.mapEntry = false; + object.deprecatedLegacyJsonFieldConflicts = false; object[".google.api.resource"] = null; } if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) @@ -26571,6 +30201,8 @@ object.deprecated = message.deprecated; if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) object.mapEntry = message.mapEntry; + if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) + object.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -26623,6 +30255,9 @@ * @property {boolean|null} [unverifiedLazy] FieldOptions unverifiedLazy * @property {boolean|null} [deprecated] FieldOptions deprecated * @property {boolean|null} [weak] FieldOptions weak + * @property {boolean|null} [debugRedact] FieldOptions debugRedact + * @property {google.protobuf.FieldOptions.OptionRetention|null} [retention] FieldOptions retention + * @property {google.protobuf.FieldOptions.OptionTargetType|null} [target] FieldOptions target * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference @@ -26701,6 +30336,30 @@ */ FieldOptions.prototype.weak = false; + /** + * FieldOptions debugRedact. + * @member {boolean} debugRedact + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.debugRedact = false; + + /** + * FieldOptions retention. + * @member {google.protobuf.FieldOptions.OptionRetention} retention + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.retention = 0; + + /** + * FieldOptions target. + * @member {google.protobuf.FieldOptions.OptionTargetType} target + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.target = 0; + /** * FieldOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -26763,6 +30422,12 @@ writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); if (message.unverifiedLazy != null && Object.hasOwnProperty.call(message, "unverifiedLazy")) writer.uint32(/* id 15, wireType 0 =*/120).bool(message.unverifiedLazy); + if (message.debugRedact != null && Object.hasOwnProperty.call(message, "debugRedact")) + writer.uint32(/* id 16, wireType 0 =*/128).bool(message.debugRedact); + if (message.retention != null && Object.hasOwnProperty.call(message, "retention")) + writer.uint32(/* id 17, wireType 0 =*/136).int32(message.retention); + if (message.target != null && Object.hasOwnProperty.call(message, "target")) + writer.uint32(/* id 18, wireType 0 =*/144).int32(message.target); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -26836,6 +30501,18 @@ message.weak = reader.bool(); break; } + case 16: { + message.debugRedact = reader.bool(); + break; + } + case 17: { + message.retention = reader.int32(); + break; + } + case 18: { + message.target = reader.int32(); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -26925,6 +30602,34 @@ if (message.weak != null && message.hasOwnProperty("weak")) if (typeof message.weak !== "boolean") return "weak: boolean expected"; + if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) + if (typeof message.debugRedact !== "boolean") + return "debugRedact: boolean expected"; + if (message.retention != null && message.hasOwnProperty("retention")) + switch (message.retention) { + default: + return "retention: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.target != null && message.hasOwnProperty("target")) + switch (message.target) { + default: + return "target: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + break; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -27022,6 +30727,76 @@ message.deprecated = Boolean(object.deprecated); if (object.weak != null) message.weak = Boolean(object.weak); + if (object.debugRedact != null) + message.debugRedact = Boolean(object.debugRedact); + switch (object.retention) { + default: + if (typeof object.retention === "number") { + message.retention = object.retention; + break; + } + break; + case "RETENTION_UNKNOWN": + case 0: + message.retention = 0; + break; + case "RETENTION_RUNTIME": + case 1: + message.retention = 1; + break; + case "RETENTION_SOURCE": + case 2: + message.retention = 2; + break; + } + switch (object.target) { + default: + if (typeof object.target === "number") { + message.target = object.target; + break; + } + break; + case "TARGET_TYPE_UNKNOWN": + case 0: + message.target = 0; + break; + case "TARGET_TYPE_FILE": + case 1: + message.target = 1; + break; + case "TARGET_TYPE_EXTENSION_RANGE": + case 2: + message.target = 2; + break; + case "TARGET_TYPE_MESSAGE": + case 3: + message.target = 3; + break; + case "TARGET_TYPE_FIELD": + case 4: + message.target = 4; + break; + case "TARGET_TYPE_ONEOF": + case 5: + message.target = 5; + break; + case "TARGET_TYPE_ENUM": + case 6: + message.target = 6; + break; + case "TARGET_TYPE_ENUM_ENTRY": + case 7: + message.target = 7; + break; + case "TARGET_TYPE_SERVICE": + case 8: + message.target = 8; + break; + case "TARGET_TYPE_METHOD": + case 9: + message.target = 9; + break; + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); @@ -27110,6 +30885,9 @@ object.jstype = options.enums === String ? "JS_NORMAL" : 0; object.weak = false; object.unverifiedLazy = false; + object.debugRedact = false; + object.retention = options.enums === String ? "RETENTION_UNKNOWN" : 0; + object.target = options.enums === String ? "TARGET_TYPE_UNKNOWN" : 0; object[".google.api.resourceReference"] = null; } if (message.ctype != null && message.hasOwnProperty("ctype")) @@ -27126,6 +30904,12 @@ object.weak = message.weak; if (message.unverifiedLazy != null && message.hasOwnProperty("unverifiedLazy")) object.unverifiedLazy = message.unverifiedLazy; + if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) + object.debugRedact = message.debugRedact; + if (message.retention != null && message.hasOwnProperty("retention")) + object.retention = options.enums === String ? $root.google.protobuf.FieldOptions.OptionRetention[message.retention] === undefined ? message.retention : $root.google.protobuf.FieldOptions.OptionRetention[message.retention] : message.retention; + if (message.target != null && message.hasOwnProperty("target")) + object.target = options.enums === String ? $root.google.protobuf.FieldOptions.OptionTargetType[message.target] === undefined ? message.target : $root.google.protobuf.FieldOptions.OptionTargetType[message.target] : message.target; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -27199,6 +30983,52 @@ return values; })(); + /** + * OptionRetention enum. + * @name google.protobuf.FieldOptions.OptionRetention + * @enum {number} + * @property {number} RETENTION_UNKNOWN=0 RETENTION_UNKNOWN value + * @property {number} RETENTION_RUNTIME=1 RETENTION_RUNTIME value + * @property {number} RETENTION_SOURCE=2 RETENTION_SOURCE value + */ + FieldOptions.OptionRetention = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "RETENTION_UNKNOWN"] = 0; + values[valuesById[1] = "RETENTION_RUNTIME"] = 1; + values[valuesById[2] = "RETENTION_SOURCE"] = 2; + return values; + })(); + + /** + * OptionTargetType enum. + * @name google.protobuf.FieldOptions.OptionTargetType + * @enum {number} + * @property {number} TARGET_TYPE_UNKNOWN=0 TARGET_TYPE_UNKNOWN value + * @property {number} TARGET_TYPE_FILE=1 TARGET_TYPE_FILE value + * @property {number} TARGET_TYPE_EXTENSION_RANGE=2 TARGET_TYPE_EXTENSION_RANGE value + * @property {number} TARGET_TYPE_MESSAGE=3 TARGET_TYPE_MESSAGE value + * @property {number} TARGET_TYPE_FIELD=4 TARGET_TYPE_FIELD value + * @property {number} TARGET_TYPE_ONEOF=5 TARGET_TYPE_ONEOF value + * @property {number} TARGET_TYPE_ENUM=6 TARGET_TYPE_ENUM value + * @property {number} TARGET_TYPE_ENUM_ENTRY=7 TARGET_TYPE_ENUM_ENTRY value + * @property {number} TARGET_TYPE_SERVICE=8 TARGET_TYPE_SERVICE value + * @property {number} TARGET_TYPE_METHOD=9 TARGET_TYPE_METHOD value + */ + FieldOptions.OptionTargetType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "TARGET_TYPE_UNKNOWN"] = 0; + values[valuesById[1] = "TARGET_TYPE_FILE"] = 1; + values[valuesById[2] = "TARGET_TYPE_EXTENSION_RANGE"] = 2; + values[valuesById[3] = "TARGET_TYPE_MESSAGE"] = 3; + values[valuesById[4] = "TARGET_TYPE_FIELD"] = 4; + values[valuesById[5] = "TARGET_TYPE_ONEOF"] = 5; + values[valuesById[6] = "TARGET_TYPE_ENUM"] = 6; + values[valuesById[7] = "TARGET_TYPE_ENUM_ENTRY"] = 7; + values[valuesById[8] = "TARGET_TYPE_SERVICE"] = 8; + values[valuesById[9] = "TARGET_TYPE_METHOD"] = 9; + return values; + })(); + return FieldOptions; })(); @@ -27434,6 +31264,7 @@ * @interface IEnumOptions * @property {boolean|null} [allowAlias] EnumOptions allowAlias * @property {boolean|null} [deprecated] EnumOptions deprecated + * @property {boolean|null} [deprecatedLegacyJsonFieldConflicts] EnumOptions deprecatedLegacyJsonFieldConflicts * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption */ @@ -27469,6 +31300,14 @@ */ EnumOptions.prototype.deprecated = false; + /** + * EnumOptions deprecatedLegacyJsonFieldConflicts. + * @member {boolean} deprecatedLegacyJsonFieldConflicts + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.deprecatedLegacyJsonFieldConflicts = false; + /** * EnumOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -27505,6 +31344,8 @@ writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.deprecatedLegacyJsonFieldConflicts != null && Object.hasOwnProperty.call(message, "deprecatedLegacyJsonFieldConflicts")) + writer.uint32(/* id 6, wireType 0 =*/48).bool(message.deprecatedLegacyJsonFieldConflicts); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -27550,6 +31391,10 @@ message.deprecated = reader.bool(); break; } + case 6: { + message.deprecatedLegacyJsonFieldConflicts = reader.bool(); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -27597,6 +31442,9 @@ if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; + if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) + if (typeof message.deprecatedLegacyJsonFieldConflicts !== "boolean") + return "deprecatedLegacyJsonFieldConflicts: boolean expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -27625,6 +31473,8 @@ message.allowAlias = Boolean(object.allowAlias); if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); + if (object.deprecatedLegacyJsonFieldConflicts != null) + message.deprecatedLegacyJsonFieldConflicts = Boolean(object.deprecatedLegacyJsonFieldConflicts); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); @@ -27656,11 +31506,14 @@ if (options.defaults) { object.allowAlias = false; object.deprecated = false; + object.deprecatedLegacyJsonFieldConflicts = false; } if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) object.allowAlias = message.allowAlias; if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; + if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) + object.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 646f8fce888..d92936908ba 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2179,6 +2179,248 @@ "id": 1050, "extend": "google.protobuf.ServiceOptions" }, + "CommonLanguageSettings": { + "fields": { + "referenceDocsUri": { + "type": "string", + "id": 1, + "options": { + "deprecated": true + } + }, + "destinations": { + "rule": "repeated", + "type": "ClientLibraryDestination", + "id": 2 + } + } + }, + "ClientLibrarySettings": { + "fields": { + "version": { + "type": "string", + "id": 1 + }, + "launchStage": { + "type": "LaunchStage", + "id": 2 + }, + "restNumericEnums": { + "type": "bool", + "id": 3 + }, + "javaSettings": { + "type": "JavaSettings", + "id": 21 + }, + "cppSettings": { + "type": "CppSettings", + "id": 22 + }, + "phpSettings": { + "type": "PhpSettings", + "id": 23 + }, + "pythonSettings": { + "type": "PythonSettings", + "id": 24 + }, + "nodeSettings": { + "type": "NodeSettings", + "id": 25 + }, + "dotnetSettings": { + "type": "DotnetSettings", + "id": 26 + }, + "rubySettings": { + "type": "RubySettings", + "id": 27 + }, + "goSettings": { + "type": "GoSettings", + "id": 28 + } + } + }, + "Publishing": { + "fields": { + "methodSettings": { + "rule": "repeated", + "type": "MethodSettings", + "id": 2 + }, + "newIssueUri": { + "type": "string", + "id": 101 + }, + "documentationUri": { + "type": "string", + "id": 102 + }, + "apiShortName": { + "type": "string", + "id": 103 + }, + "githubLabel": { + "type": "string", + "id": 104 + }, + "codeownerGithubTeams": { + "rule": "repeated", + "type": "string", + "id": 105 + }, + "docTagPrefix": { + "type": "string", + "id": 106 + }, + "organization": { + "type": "ClientLibraryOrganization", + "id": 107 + }, + "librarySettings": { + "rule": "repeated", + "type": "ClientLibrarySettings", + "id": 109 + } + } + }, + "JavaSettings": { + "fields": { + "libraryPackage": { + "type": "string", + "id": 1 + }, + "serviceClassNames": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "common": { + "type": "CommonLanguageSettings", + "id": 3 + } + } + }, + "CppSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "PhpSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "PythonSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "NodeSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "DotnetSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "RubySettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "GoSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "MethodSettings": { + "fields": { + "selector": { + "type": "string", + "id": 1 + }, + "longRunning": { + "type": "LongRunning", + "id": 2 + } + }, + "nested": { + "LongRunning": { + "fields": { + "initialPollDelay": { + "type": "google.protobuf.Duration", + "id": 1 + }, + "pollDelayMultiplier": { + "type": "float", + "id": 2 + }, + "maxPollDelay": { + "type": "google.protobuf.Duration", + "id": 3 + }, + "totalPollTimeout": { + "type": "google.protobuf.Duration", + "id": 4 + } + } + } + } + }, + "ClientLibraryOrganization": { + "values": { + "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED": 0, + "CLOUD": 1, + "ADS": 2, + "PHOTOS": 3, + "STREET_VIEW": 4 + } + }, + "ClientLibraryDestination": { + "values": { + "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED": 0, + "GITHUB": 10, + "PACKAGE_MANAGER": 20 + } + }, + "LaunchStage": { + "values": { + "LAUNCH_STAGE_UNSPECIFIED": 0, + "UNIMPLEMENTED": 6, + "PRELAUNCH": 7, + "EARLY_ACCESS": 1, + "ALPHA": 2, + "BETA": 3, + "GA": 4, + "DEPRECATED": 5 + } + }, "fieldBehavior": { "rule": "repeated", "type": "google.api.FieldBehavior", @@ -2828,6 +3070,13 @@ "type": "bool", "id": 7 }, + "deprecatedLegacyJsonFieldConflicts": { + "type": "bool", + "id": 11, + "options": { + "deprecated": true + } + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -2911,6 +3160,21 @@ "default": false } }, + "debugRedact": { + "type": "bool", + "id": 16, + "options": { + "default": false + } + }, + "retention": { + "type": "OptionRetention", + "id": 17 + }, + "target": { + "type": "OptionTargetType", + "id": 18 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -2943,6 +3207,27 @@ "JS_STRING": 1, "JS_NUMBER": 2 } + }, + "OptionRetention": { + "values": { + "RETENTION_UNKNOWN": 0, + "RETENTION_RUNTIME": 1, + "RETENTION_SOURCE": 2 + } + }, + "OptionTargetType": { + "values": { + "TARGET_TYPE_UNKNOWN": 0, + "TARGET_TYPE_FILE": 1, + "TARGET_TYPE_EXTENSION_RANGE": 2, + "TARGET_TYPE_MESSAGE": 3, + "TARGET_TYPE_FIELD": 4, + "TARGET_TYPE_ONEOF": 5, + "TARGET_TYPE_ENUM": 6, + "TARGET_TYPE_ENUM_ENTRY": 7, + "TARGET_TYPE_SERVICE": 8, + "TARGET_TYPE_METHOD": 9 + } } } }, @@ -2974,6 +3259,13 @@ "default": false } }, + "deprecatedLegacyJsonFieldConflicts": { + "type": "bool", + "id": 6, + "options": { + "deprecated": true + } + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", From 829fd8baf7591591e2ff7900c821bc8d2aebc714 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 3 Aug 2023 16:36:29 -0400 Subject: [PATCH 0943/1115] build: force-update gts version (#1792) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: force-update gts version * chore: update gts linter errors * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: revert "🦉 Updates from OwlBot post-processor" This reverts commit 5e3c2f2eebb1311920270b0e71caa0809329665f. Literally undoes the point of the PR :D * samples: more typeless/gts updates * build: update owlbot image sha --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- handwritten/pubsub/README.md | 16 +- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/protos/protos.d.ts | 1493 ------- handwritten/pubsub/protos/protos.js | 3853 ----------------- handwritten/pubsub/protos/protos.json | 292 -- handwritten/pubsub/src/debug.ts | 5 +- handwritten/pubsub/src/iam.ts | 13 +- handwritten/pubsub/src/v1/publisher_client.ts | 36 +- .../pubsub/src/v1/schema_service_client.ts | 40 +- .../pubsub/src/v1/subscriber_client.ts | 60 +- handwritten/pubsub/test/message-queues.ts | 4 +- handwritten/pubsub/test/subscription.ts | 1 + 13 files changed, 93 insertions(+), 5724 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 0c47c8b71d4..59632da029f 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:3ad01f4c6671efb094b43f7d3a3e0b9510bd6501f2e65e874dd525373e29de75 + digest: sha256:aeccbef8061fc122542e8f381c4e7b66b32e23dda522e94c68346585dc408f0d # created: 2023-08-01T22:29:52.50398591Z diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 9640f7017d1..0b3091c38a0 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -66,15 +66,15 @@ npm install @google-cloud/pubsub ```javascript // Imports the Google Cloud client library -const { PubSub } = require("@google-cloud/pubsub"); +const {PubSub} = require('@google-cloud/pubsub'); async function quickstart( -projectId = 'your-project-id', // Your Google Cloud Platform project ID -topicNameOrId = 'my-topic', // Name for the new topic to create -subscriptionName = 'my-sub' // Name for the new subscription to create + projectId = 'your-project-id', // Your Google Cloud Platform project ID + topicNameOrId = 'my-topic', // Name for the new topic to create + subscriptionName = 'my-sub' // Name for the new subscription to create ) { // Instantiates a client - const pubsub = new PubSub({ projectId }); + const pubsub = new PubSub({projectId}); // Creates a new topic const [topic] = await pubsub.createTopic(topicNameOrId); @@ -84,19 +84,19 @@ subscriptionName = 'my-sub' // Name for the new subscription to create const [subscription] = await topic.createSubscription(subscriptionName); // Receive callbacks for new messages on the subscription - subscription.on('message', (message) => { + subscription.on('message', message => { console.log('Received message:', message.data.toString()); process.exit(0); }); // Receive callbacks for errors on the subscription - subscription.on('error', (error) => { + subscription.on('error', error => { console.error('Received error:', error); process.exit(1); }); // Send a message to the topic - topic.publishMessage({ data: Buffer.from('Test message!') }); + topic.publishMessage({data: Buffer.from('Test message!')}); } ``` diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5b7973c40eb..99e82f4ca36 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -83,7 +83,7 @@ "codecov": "^3.0.0", "execa": "^5.0.0", "gapic-tools": "^0.1.7", - "gts": "^3.1.1", + "gts": "^5.0.0", "jsdoc": "^4.0.0", "jsdoc-fresh": "^2.0.0", "jsdoc-region-tag": "^2.0.0", diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 443f61fb3b8..e466657f602 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -8656,1448 +8656,6 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } - /** Properties of a CommonLanguageSettings. */ - interface ICommonLanguageSettings { - - /** CommonLanguageSettings referenceDocsUri */ - referenceDocsUri?: (string|null); - - /** CommonLanguageSettings destinations */ - destinations?: (google.api.ClientLibraryDestination[]|null); - } - - /** Represents a CommonLanguageSettings. */ - class CommonLanguageSettings implements ICommonLanguageSettings { - - /** - * Constructs a new CommonLanguageSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.ICommonLanguageSettings); - - /** CommonLanguageSettings referenceDocsUri. */ - public referenceDocsUri: string; - - /** CommonLanguageSettings destinations. */ - public destinations: google.api.ClientLibraryDestination[]; - - /** - * Creates a new CommonLanguageSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns CommonLanguageSettings instance - */ - public static create(properties?: google.api.ICommonLanguageSettings): google.api.CommonLanguageSettings; - - /** - * Encodes the specified CommonLanguageSettings message. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. - * @param message CommonLanguageSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.ICommonLanguageSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified CommonLanguageSettings message, length delimited. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. - * @param message CommonLanguageSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.ICommonLanguageSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a CommonLanguageSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CommonLanguageSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CommonLanguageSettings; - - /** - * Decodes a CommonLanguageSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CommonLanguageSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CommonLanguageSettings; - - /** - * Verifies a CommonLanguageSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a CommonLanguageSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CommonLanguageSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.CommonLanguageSettings; - - /** - * Creates a plain object from a CommonLanguageSettings message. Also converts values to other types if specified. - * @param message CommonLanguageSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.CommonLanguageSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this CommonLanguageSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for CommonLanguageSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a ClientLibrarySettings. */ - interface IClientLibrarySettings { - - /** ClientLibrarySettings version */ - version?: (string|null); - - /** ClientLibrarySettings launchStage */ - launchStage?: (google.api.LaunchStage|keyof typeof google.api.LaunchStage|null); - - /** ClientLibrarySettings restNumericEnums */ - restNumericEnums?: (boolean|null); - - /** ClientLibrarySettings javaSettings */ - javaSettings?: (google.api.IJavaSettings|null); - - /** ClientLibrarySettings cppSettings */ - cppSettings?: (google.api.ICppSettings|null); - - /** ClientLibrarySettings phpSettings */ - phpSettings?: (google.api.IPhpSettings|null); - - /** ClientLibrarySettings pythonSettings */ - pythonSettings?: (google.api.IPythonSettings|null); - - /** ClientLibrarySettings nodeSettings */ - nodeSettings?: (google.api.INodeSettings|null); - - /** ClientLibrarySettings dotnetSettings */ - dotnetSettings?: (google.api.IDotnetSettings|null); - - /** ClientLibrarySettings rubySettings */ - rubySettings?: (google.api.IRubySettings|null); - - /** ClientLibrarySettings goSettings */ - goSettings?: (google.api.IGoSettings|null); - } - - /** Represents a ClientLibrarySettings. */ - class ClientLibrarySettings implements IClientLibrarySettings { - - /** - * Constructs a new ClientLibrarySettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IClientLibrarySettings); - - /** ClientLibrarySettings version. */ - public version: string; - - /** ClientLibrarySettings launchStage. */ - public launchStage: (google.api.LaunchStage|keyof typeof google.api.LaunchStage); - - /** ClientLibrarySettings restNumericEnums. */ - public restNumericEnums: boolean; - - /** ClientLibrarySettings javaSettings. */ - public javaSettings?: (google.api.IJavaSettings|null); - - /** ClientLibrarySettings cppSettings. */ - public cppSettings?: (google.api.ICppSettings|null); - - /** ClientLibrarySettings phpSettings. */ - public phpSettings?: (google.api.IPhpSettings|null); - - /** ClientLibrarySettings pythonSettings. */ - public pythonSettings?: (google.api.IPythonSettings|null); - - /** ClientLibrarySettings nodeSettings. */ - public nodeSettings?: (google.api.INodeSettings|null); - - /** ClientLibrarySettings dotnetSettings. */ - public dotnetSettings?: (google.api.IDotnetSettings|null); - - /** ClientLibrarySettings rubySettings. */ - public rubySettings?: (google.api.IRubySettings|null); - - /** ClientLibrarySettings goSettings. */ - public goSettings?: (google.api.IGoSettings|null); - - /** - * Creates a new ClientLibrarySettings instance using the specified properties. - * @param [properties] Properties to set - * @returns ClientLibrarySettings instance - */ - public static create(properties?: google.api.IClientLibrarySettings): google.api.ClientLibrarySettings; - - /** - * Encodes the specified ClientLibrarySettings message. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. - * @param message ClientLibrarySettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IClientLibrarySettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified ClientLibrarySettings message, length delimited. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. - * @param message ClientLibrarySettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IClientLibrarySettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a ClientLibrarySettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns ClientLibrarySettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ClientLibrarySettings; - - /** - * Decodes a ClientLibrarySettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns ClientLibrarySettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ClientLibrarySettings; - - /** - * Verifies a ClientLibrarySettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a ClientLibrarySettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns ClientLibrarySettings - */ - public static fromObject(object: { [k: string]: any }): google.api.ClientLibrarySettings; - - /** - * Creates a plain object from a ClientLibrarySettings message. Also converts values to other types if specified. - * @param message ClientLibrarySettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.ClientLibrarySettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this ClientLibrarySettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for ClientLibrarySettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a Publishing. */ - interface IPublishing { - - /** Publishing methodSettings */ - methodSettings?: (google.api.IMethodSettings[]|null); - - /** Publishing newIssueUri */ - newIssueUri?: (string|null); - - /** Publishing documentationUri */ - documentationUri?: (string|null); - - /** Publishing apiShortName */ - apiShortName?: (string|null); - - /** Publishing githubLabel */ - githubLabel?: (string|null); - - /** Publishing codeownerGithubTeams */ - codeownerGithubTeams?: (string[]|null); - - /** Publishing docTagPrefix */ - docTagPrefix?: (string|null); - - /** Publishing organization */ - organization?: (google.api.ClientLibraryOrganization|keyof typeof google.api.ClientLibraryOrganization|null); - - /** Publishing librarySettings */ - librarySettings?: (google.api.IClientLibrarySettings[]|null); - } - - /** Represents a Publishing. */ - class Publishing implements IPublishing { - - /** - * Constructs a new Publishing. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IPublishing); - - /** Publishing methodSettings. */ - public methodSettings: google.api.IMethodSettings[]; - - /** Publishing newIssueUri. */ - public newIssueUri: string; - - /** Publishing documentationUri. */ - public documentationUri: string; - - /** Publishing apiShortName. */ - public apiShortName: string; - - /** Publishing githubLabel. */ - public githubLabel: string; - - /** Publishing codeownerGithubTeams. */ - public codeownerGithubTeams: string[]; - - /** Publishing docTagPrefix. */ - public docTagPrefix: string; - - /** Publishing organization. */ - public organization: (google.api.ClientLibraryOrganization|keyof typeof google.api.ClientLibraryOrganization); - - /** Publishing librarySettings. */ - public librarySettings: google.api.IClientLibrarySettings[]; - - /** - * Creates a new Publishing instance using the specified properties. - * @param [properties] Properties to set - * @returns Publishing instance - */ - public static create(properties?: google.api.IPublishing): google.api.Publishing; - - /** - * Encodes the specified Publishing message. Does not implicitly {@link google.api.Publishing.verify|verify} messages. - * @param message Publishing message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IPublishing, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified Publishing message, length delimited. Does not implicitly {@link google.api.Publishing.verify|verify} messages. - * @param message Publishing message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IPublishing, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a Publishing message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns Publishing - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Publishing; - - /** - * Decodes a Publishing message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns Publishing - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Publishing; - - /** - * Verifies a Publishing message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a Publishing message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns Publishing - */ - public static fromObject(object: { [k: string]: any }): google.api.Publishing; - - /** - * Creates a plain object from a Publishing message. Also converts values to other types if specified. - * @param message Publishing - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.Publishing, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this Publishing to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for Publishing - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a JavaSettings. */ - interface IJavaSettings { - - /** JavaSettings libraryPackage */ - libraryPackage?: (string|null); - - /** JavaSettings serviceClassNames */ - serviceClassNames?: ({ [k: string]: string }|null); - - /** JavaSettings common */ - common?: (google.api.ICommonLanguageSettings|null); - } - - /** Represents a JavaSettings. */ - class JavaSettings implements IJavaSettings { - - /** - * Constructs a new JavaSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IJavaSettings); - - /** JavaSettings libraryPackage. */ - public libraryPackage: string; - - /** JavaSettings serviceClassNames. */ - public serviceClassNames: { [k: string]: string }; - - /** JavaSettings common. */ - public common?: (google.api.ICommonLanguageSettings|null); - - /** - * Creates a new JavaSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns JavaSettings instance - */ - public static create(properties?: google.api.IJavaSettings): google.api.JavaSettings; - - /** - * Encodes the specified JavaSettings message. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. - * @param message JavaSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IJavaSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified JavaSettings message, length delimited. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. - * @param message JavaSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IJavaSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a JavaSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns JavaSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.JavaSettings; - - /** - * Decodes a JavaSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns JavaSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.JavaSettings; - - /** - * Verifies a JavaSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a JavaSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns JavaSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.JavaSettings; - - /** - * Creates a plain object from a JavaSettings message. Also converts values to other types if specified. - * @param message JavaSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.JavaSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this JavaSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for JavaSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a CppSettings. */ - interface ICppSettings { - - /** CppSettings common */ - common?: (google.api.ICommonLanguageSettings|null); - } - - /** Represents a CppSettings. */ - class CppSettings implements ICppSettings { - - /** - * Constructs a new CppSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.ICppSettings); - - /** CppSettings common. */ - public common?: (google.api.ICommonLanguageSettings|null); - - /** - * Creates a new CppSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns CppSettings instance - */ - public static create(properties?: google.api.ICppSettings): google.api.CppSettings; - - /** - * Encodes the specified CppSettings message. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. - * @param message CppSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.ICppSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified CppSettings message, length delimited. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. - * @param message CppSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.ICppSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a CppSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns CppSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CppSettings; - - /** - * Decodes a CppSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns CppSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CppSettings; - - /** - * Verifies a CppSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a CppSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns CppSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.CppSettings; - - /** - * Creates a plain object from a CppSettings message. Also converts values to other types if specified. - * @param message CppSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.CppSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this CppSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for CppSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a PhpSettings. */ - interface IPhpSettings { - - /** PhpSettings common */ - common?: (google.api.ICommonLanguageSettings|null); - } - - /** Represents a PhpSettings. */ - class PhpSettings implements IPhpSettings { - - /** - * Constructs a new PhpSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IPhpSettings); - - /** PhpSettings common. */ - public common?: (google.api.ICommonLanguageSettings|null); - - /** - * Creates a new PhpSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns PhpSettings instance - */ - public static create(properties?: google.api.IPhpSettings): google.api.PhpSettings; - - /** - * Encodes the specified PhpSettings message. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. - * @param message PhpSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IPhpSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PhpSettings message, length delimited. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. - * @param message PhpSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IPhpSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PhpSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PhpSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.PhpSettings; - - /** - * Decodes a PhpSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PhpSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.PhpSettings; - - /** - * Verifies a PhpSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PhpSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PhpSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.PhpSettings; - - /** - * Creates a plain object from a PhpSettings message. Also converts values to other types if specified. - * @param message PhpSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.PhpSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PhpSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for PhpSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a PythonSettings. */ - interface IPythonSettings { - - /** PythonSettings common */ - common?: (google.api.ICommonLanguageSettings|null); - } - - /** Represents a PythonSettings. */ - class PythonSettings implements IPythonSettings { - - /** - * Constructs a new PythonSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IPythonSettings); - - /** PythonSettings common. */ - public common?: (google.api.ICommonLanguageSettings|null); - - /** - * Creates a new PythonSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns PythonSettings instance - */ - public static create(properties?: google.api.IPythonSettings): google.api.PythonSettings; - - /** - * Encodes the specified PythonSettings message. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. - * @param message PythonSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IPythonSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified PythonSettings message, length delimited. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. - * @param message PythonSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IPythonSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a PythonSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns PythonSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.PythonSettings; - - /** - * Decodes a PythonSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns PythonSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.PythonSettings; - - /** - * Verifies a PythonSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a PythonSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns PythonSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.PythonSettings; - - /** - * Creates a plain object from a PythonSettings message. Also converts values to other types if specified. - * @param message PythonSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.PythonSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this PythonSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for PythonSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a NodeSettings. */ - interface INodeSettings { - - /** NodeSettings common */ - common?: (google.api.ICommonLanguageSettings|null); - } - - /** Represents a NodeSettings. */ - class NodeSettings implements INodeSettings { - - /** - * Constructs a new NodeSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.INodeSettings); - - /** NodeSettings common. */ - public common?: (google.api.ICommonLanguageSettings|null); - - /** - * Creates a new NodeSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns NodeSettings instance - */ - public static create(properties?: google.api.INodeSettings): google.api.NodeSettings; - - /** - * Encodes the specified NodeSettings message. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. - * @param message NodeSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.INodeSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified NodeSettings message, length delimited. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. - * @param message NodeSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.INodeSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a NodeSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns NodeSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.NodeSettings; - - /** - * Decodes a NodeSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns NodeSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.NodeSettings; - - /** - * Verifies a NodeSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a NodeSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns NodeSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.NodeSettings; - - /** - * Creates a plain object from a NodeSettings message. Also converts values to other types if specified. - * @param message NodeSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.NodeSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this NodeSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for NodeSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a DotnetSettings. */ - interface IDotnetSettings { - - /** DotnetSettings common */ - common?: (google.api.ICommonLanguageSettings|null); - } - - /** Represents a DotnetSettings. */ - class DotnetSettings implements IDotnetSettings { - - /** - * Constructs a new DotnetSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IDotnetSettings); - - /** DotnetSettings common. */ - public common?: (google.api.ICommonLanguageSettings|null); - - /** - * Creates a new DotnetSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns DotnetSettings instance - */ - public static create(properties?: google.api.IDotnetSettings): google.api.DotnetSettings; - - /** - * Encodes the specified DotnetSettings message. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. - * @param message DotnetSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IDotnetSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified DotnetSettings message, length delimited. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. - * @param message DotnetSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IDotnetSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a DotnetSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns DotnetSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.DotnetSettings; - - /** - * Decodes a DotnetSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns DotnetSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.DotnetSettings; - - /** - * Verifies a DotnetSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a DotnetSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns DotnetSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.DotnetSettings; - - /** - * Creates a plain object from a DotnetSettings message. Also converts values to other types if specified. - * @param message DotnetSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.DotnetSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this DotnetSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for DotnetSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a RubySettings. */ - interface IRubySettings { - - /** RubySettings common */ - common?: (google.api.ICommonLanguageSettings|null); - } - - /** Represents a RubySettings. */ - class RubySettings implements IRubySettings { - - /** - * Constructs a new RubySettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IRubySettings); - - /** RubySettings common. */ - public common?: (google.api.ICommonLanguageSettings|null); - - /** - * Creates a new RubySettings instance using the specified properties. - * @param [properties] Properties to set - * @returns RubySettings instance - */ - public static create(properties?: google.api.IRubySettings): google.api.RubySettings; - - /** - * Encodes the specified RubySettings message. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. - * @param message RubySettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IRubySettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified RubySettings message, length delimited. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. - * @param message RubySettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IRubySettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a RubySettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns RubySettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.RubySettings; - - /** - * Decodes a RubySettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns RubySettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.RubySettings; - - /** - * Verifies a RubySettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a RubySettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns RubySettings - */ - public static fromObject(object: { [k: string]: any }): google.api.RubySettings; - - /** - * Creates a plain object from a RubySettings message. Also converts values to other types if specified. - * @param message RubySettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.RubySettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this RubySettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for RubySettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a GoSettings. */ - interface IGoSettings { - - /** GoSettings common */ - common?: (google.api.ICommonLanguageSettings|null); - } - - /** Represents a GoSettings. */ - class GoSettings implements IGoSettings { - - /** - * Constructs a new GoSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IGoSettings); - - /** GoSettings common. */ - public common?: (google.api.ICommonLanguageSettings|null); - - /** - * Creates a new GoSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns GoSettings instance - */ - public static create(properties?: google.api.IGoSettings): google.api.GoSettings; - - /** - * Encodes the specified GoSettings message. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. - * @param message GoSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IGoSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified GoSettings message, length delimited. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. - * @param message GoSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IGoSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a GoSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns GoSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.GoSettings; - - /** - * Decodes a GoSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns GoSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.GoSettings; - - /** - * Verifies a GoSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a GoSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns GoSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.GoSettings; - - /** - * Creates a plain object from a GoSettings message. Also converts values to other types if specified. - * @param message GoSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.GoSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this GoSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for GoSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - /** Properties of a MethodSettings. */ - interface IMethodSettings { - - /** MethodSettings selector */ - selector?: (string|null); - - /** MethodSettings longRunning */ - longRunning?: (google.api.MethodSettings.ILongRunning|null); - } - - /** Represents a MethodSettings. */ - class MethodSettings implements IMethodSettings { - - /** - * Constructs a new MethodSettings. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.IMethodSettings); - - /** MethodSettings selector. */ - public selector: string; - - /** MethodSettings longRunning. */ - public longRunning?: (google.api.MethodSettings.ILongRunning|null); - - /** - * Creates a new MethodSettings instance using the specified properties. - * @param [properties] Properties to set - * @returns MethodSettings instance - */ - public static create(properties?: google.api.IMethodSettings): google.api.MethodSettings; - - /** - * Encodes the specified MethodSettings message. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. - * @param message MethodSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.IMethodSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified MethodSettings message, length delimited. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. - * @param message MethodSettings message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.IMethodSettings, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a MethodSettings message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns MethodSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.MethodSettings; - - /** - * Decodes a MethodSettings message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns MethodSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.MethodSettings; - - /** - * Verifies a MethodSettings message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a MethodSettings message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns MethodSettings - */ - public static fromObject(object: { [k: string]: any }): google.api.MethodSettings; - - /** - * Creates a plain object from a MethodSettings message. Also converts values to other types if specified. - * @param message MethodSettings - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.MethodSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this MethodSettings to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for MethodSettings - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - - namespace MethodSettings { - - /** Properties of a LongRunning. */ - interface ILongRunning { - - /** LongRunning initialPollDelay */ - initialPollDelay?: (google.protobuf.IDuration|null); - - /** LongRunning pollDelayMultiplier */ - pollDelayMultiplier?: (number|null); - - /** LongRunning maxPollDelay */ - maxPollDelay?: (google.protobuf.IDuration|null); - - /** LongRunning totalPollTimeout */ - totalPollTimeout?: (google.protobuf.IDuration|null); - } - - /** Represents a LongRunning. */ - class LongRunning implements ILongRunning { - - /** - * Constructs a new LongRunning. - * @param [properties] Properties to set - */ - constructor(properties?: google.api.MethodSettings.ILongRunning); - - /** LongRunning initialPollDelay. */ - public initialPollDelay?: (google.protobuf.IDuration|null); - - /** LongRunning pollDelayMultiplier. */ - public pollDelayMultiplier: number; - - /** LongRunning maxPollDelay. */ - public maxPollDelay?: (google.protobuf.IDuration|null); - - /** LongRunning totalPollTimeout. */ - public totalPollTimeout?: (google.protobuf.IDuration|null); - - /** - * Creates a new LongRunning instance using the specified properties. - * @param [properties] Properties to set - * @returns LongRunning instance - */ - public static create(properties?: google.api.MethodSettings.ILongRunning): google.api.MethodSettings.LongRunning; - - /** - * Encodes the specified LongRunning message. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. - * @param message LongRunning message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encode(message: google.api.MethodSettings.ILongRunning, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Encodes the specified LongRunning message, length delimited. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. - * @param message LongRunning message or plain object to encode - * @param [writer] Writer to encode to - * @returns Writer - */ - public static encodeDelimited(message: google.api.MethodSettings.ILongRunning, writer?: $protobuf.Writer): $protobuf.Writer; - - /** - * Decodes a LongRunning message from the specified reader or buffer. - * @param reader Reader or buffer to decode from - * @param [length] Message length if known beforehand - * @returns LongRunning - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.MethodSettings.LongRunning; - - /** - * Decodes a LongRunning message from the specified reader or buffer, length delimited. - * @param reader Reader or buffer to decode from - * @returns LongRunning - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.MethodSettings.LongRunning; - - /** - * Verifies a LongRunning message. - * @param message Plain object to verify - * @returns `null` if valid, otherwise the reason why it is not - */ - public static verify(message: { [k: string]: any }): (string|null); - - /** - * Creates a LongRunning message from a plain object. Also converts values to their respective internal types. - * @param object Plain object - * @returns LongRunning - */ - public static fromObject(object: { [k: string]: any }): google.api.MethodSettings.LongRunning; - - /** - * Creates a plain object from a LongRunning message. Also converts values to other types if specified. - * @param message LongRunning - * @param [options] Conversion options - * @returns Plain object - */ - public static toObject(message: google.api.MethodSettings.LongRunning, options?: $protobuf.IConversionOptions): { [k: string]: any }; - - /** - * Converts this LongRunning to JSON. - * @returns JSON object - */ - public toJSON(): { [k: string]: any }; - - /** - * Gets the default type url for LongRunning - * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns The default type url - */ - public static getTypeUrl(typeUrlPrefix?: string): string; - } - } - - /** ClientLibraryOrganization enum. */ - enum ClientLibraryOrganization { - CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED = 0, - CLOUD = 1, - ADS = 2, - PHOTOS = 3, - STREET_VIEW = 4 - } - - /** ClientLibraryDestination enum. */ - enum ClientLibraryDestination { - CLIENT_LIBRARY_DESTINATION_UNSPECIFIED = 0, - GITHUB = 10, - PACKAGE_MANAGER = 20 - } - - /** LaunchStage enum. */ - enum LaunchStage { - LAUNCH_STAGE_UNSPECIFIED = 0, - UNIMPLEMENTED = 6, - PRELAUNCH = 7, - EARLY_ACCESS = 1, - ALPHA = 2, - BETA = 3, - GA = 4, - DEPRECATED = 5 - } - /** FieldBehavior enum. */ enum FieldBehavior { FIELD_BEHAVIOR_UNSPECIFIED = 0, @@ -12204,9 +10762,6 @@ export namespace google { /** MessageOptions mapEntry */ mapEntry?: (boolean|null); - /** MessageOptions deprecatedLegacyJsonFieldConflicts */ - deprecatedLegacyJsonFieldConflicts?: (boolean|null); - /** MessageOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -12235,9 +10790,6 @@ export namespace google { /** MessageOptions mapEntry. */ public mapEntry: boolean; - /** MessageOptions deprecatedLegacyJsonFieldConflicts. */ - public deprecatedLegacyJsonFieldConflicts: boolean; - /** MessageOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -12343,15 +10895,6 @@ export namespace google { /** FieldOptions weak */ weak?: (boolean|null); - /** FieldOptions debugRedact */ - debugRedact?: (boolean|null); - - /** FieldOptions retention */ - retention?: (google.protobuf.FieldOptions.OptionRetention|keyof typeof google.protobuf.FieldOptions.OptionRetention|null); - - /** FieldOptions target */ - target?: (google.protobuf.FieldOptions.OptionTargetType|keyof typeof google.protobuf.FieldOptions.OptionTargetType|null); - /** FieldOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -12392,15 +10935,6 @@ export namespace google { /** FieldOptions weak. */ public weak: boolean; - /** FieldOptions debugRedact. */ - public debugRedact: boolean; - - /** FieldOptions retention. */ - public retention: (google.protobuf.FieldOptions.OptionRetention|keyof typeof google.protobuf.FieldOptions.OptionRetention); - - /** FieldOptions target. */ - public target: (google.protobuf.FieldOptions.OptionTargetType|keyof typeof google.protobuf.FieldOptions.OptionTargetType); - /** FieldOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -12497,27 +11031,6 @@ export namespace google { JS_STRING = 1, JS_NUMBER = 2 } - - /** OptionRetention enum. */ - enum OptionRetention { - RETENTION_UNKNOWN = 0, - RETENTION_RUNTIME = 1, - RETENTION_SOURCE = 2 - } - - /** OptionTargetType enum. */ - enum OptionTargetType { - TARGET_TYPE_UNKNOWN = 0, - TARGET_TYPE_FILE = 1, - TARGET_TYPE_EXTENSION_RANGE = 2, - TARGET_TYPE_MESSAGE = 3, - TARGET_TYPE_FIELD = 4, - TARGET_TYPE_ONEOF = 5, - TARGET_TYPE_ENUM = 6, - TARGET_TYPE_ENUM_ENTRY = 7, - TARGET_TYPE_SERVICE = 8, - TARGET_TYPE_METHOD = 9 - } } /** Properties of an OneofOptions. */ @@ -12626,9 +11139,6 @@ export namespace google { /** EnumOptions deprecated */ deprecated?: (boolean|null); - /** EnumOptions deprecatedLegacyJsonFieldConflicts */ - deprecatedLegacyJsonFieldConflicts?: (boolean|null); - /** EnumOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -12648,9 +11158,6 @@ export namespace google { /** EnumOptions deprecated. */ public deprecated: boolean; - /** EnumOptions deprecatedLegacyJsonFieldConflicts. */ - public deprecatedLegacyJsonFieldConflicts: boolean; - /** EnumOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 2495a560e15..12b95492de7 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -20326,3615 +20326,6 @@ return CustomHttpPattern; })(); - api.CommonLanguageSettings = (function() { - - /** - * Properties of a CommonLanguageSettings. - * @memberof google.api - * @interface ICommonLanguageSettings - * @property {string|null} [referenceDocsUri] CommonLanguageSettings referenceDocsUri - * @property {Array.|null} [destinations] CommonLanguageSettings destinations - */ - - /** - * Constructs a new CommonLanguageSettings. - * @memberof google.api - * @classdesc Represents a CommonLanguageSettings. - * @implements ICommonLanguageSettings - * @constructor - * @param {google.api.ICommonLanguageSettings=} [properties] Properties to set - */ - function CommonLanguageSettings(properties) { - this.destinations = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * CommonLanguageSettings referenceDocsUri. - * @member {string} referenceDocsUri - * @memberof google.api.CommonLanguageSettings - * @instance - */ - CommonLanguageSettings.prototype.referenceDocsUri = ""; - - /** - * CommonLanguageSettings destinations. - * @member {Array.} destinations - * @memberof google.api.CommonLanguageSettings - * @instance - */ - CommonLanguageSettings.prototype.destinations = $util.emptyArray; - - /** - * Creates a new CommonLanguageSettings instance using the specified properties. - * @function create - * @memberof google.api.CommonLanguageSettings - * @static - * @param {google.api.ICommonLanguageSettings=} [properties] Properties to set - * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings instance - */ - CommonLanguageSettings.create = function create(properties) { - return new CommonLanguageSettings(properties); - }; - - /** - * Encodes the specified CommonLanguageSettings message. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. - * @function encode - * @memberof google.api.CommonLanguageSettings - * @static - * @param {google.api.ICommonLanguageSettings} message CommonLanguageSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CommonLanguageSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.referenceDocsUri != null && Object.hasOwnProperty.call(message, "referenceDocsUri")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.referenceDocsUri); - if (message.destinations != null && message.destinations.length) { - writer.uint32(/* id 2, wireType 2 =*/18).fork(); - for (var i = 0; i < message.destinations.length; ++i) - writer.int32(message.destinations[i]); - writer.ldelim(); - } - return writer; - }; - - /** - * Encodes the specified CommonLanguageSettings message, length delimited. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.CommonLanguageSettings - * @static - * @param {google.api.ICommonLanguageSettings} message CommonLanguageSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CommonLanguageSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a CommonLanguageSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.CommonLanguageSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CommonLanguageSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CommonLanguageSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.referenceDocsUri = reader.string(); - break; - } - case 2: { - if (!(message.destinations && message.destinations.length)) - message.destinations = []; - if ((tag & 7) === 2) { - var end2 = reader.uint32() + reader.pos; - while (reader.pos < end2) - message.destinations.push(reader.int32()); - } else - message.destinations.push(reader.int32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a CommonLanguageSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.CommonLanguageSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CommonLanguageSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a CommonLanguageSettings message. - * @function verify - * @memberof google.api.CommonLanguageSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - CommonLanguageSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.referenceDocsUri != null && message.hasOwnProperty("referenceDocsUri")) - if (!$util.isString(message.referenceDocsUri)) - return "referenceDocsUri: string expected"; - if (message.destinations != null && message.hasOwnProperty("destinations")) { - if (!Array.isArray(message.destinations)) - return "destinations: array expected"; - for (var i = 0; i < message.destinations.length; ++i) - switch (message.destinations[i]) { - default: - return "destinations: enum value[] expected"; - case 0: - case 10: - case 20: - break; - } - } - return null; - }; - - /** - * Creates a CommonLanguageSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.CommonLanguageSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings - */ - CommonLanguageSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.CommonLanguageSettings) - return object; - var message = new $root.google.api.CommonLanguageSettings(); - if (object.referenceDocsUri != null) - message.referenceDocsUri = String(object.referenceDocsUri); - if (object.destinations) { - if (!Array.isArray(object.destinations)) - throw TypeError(".google.api.CommonLanguageSettings.destinations: array expected"); - message.destinations = []; - for (var i = 0; i < object.destinations.length; ++i) - switch (object.destinations[i]) { - default: - if (typeof object.destinations[i] === "number") { - message.destinations[i] = object.destinations[i]; - break; - } - case "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED": - case 0: - message.destinations[i] = 0; - break; - case "GITHUB": - case 10: - message.destinations[i] = 10; - break; - case "PACKAGE_MANAGER": - case 20: - message.destinations[i] = 20; - break; - } - } - return message; - }; - - /** - * Creates a plain object from a CommonLanguageSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.CommonLanguageSettings - * @static - * @param {google.api.CommonLanguageSettings} message CommonLanguageSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - CommonLanguageSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) - object.destinations = []; - if (options.defaults) - object.referenceDocsUri = ""; - if (message.referenceDocsUri != null && message.hasOwnProperty("referenceDocsUri")) - object.referenceDocsUri = message.referenceDocsUri; - if (message.destinations && message.destinations.length) { - object.destinations = []; - for (var j = 0; j < message.destinations.length; ++j) - object.destinations[j] = options.enums === String ? $root.google.api.ClientLibraryDestination[message.destinations[j]] === undefined ? message.destinations[j] : $root.google.api.ClientLibraryDestination[message.destinations[j]] : message.destinations[j]; - } - return object; - }; - - /** - * Converts this CommonLanguageSettings to JSON. - * @function toJSON - * @memberof google.api.CommonLanguageSettings - * @instance - * @returns {Object.} JSON object - */ - CommonLanguageSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for CommonLanguageSettings - * @function getTypeUrl - * @memberof google.api.CommonLanguageSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - CommonLanguageSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.CommonLanguageSettings"; - }; - - return CommonLanguageSettings; - })(); - - api.ClientLibrarySettings = (function() { - - /** - * Properties of a ClientLibrarySettings. - * @memberof google.api - * @interface IClientLibrarySettings - * @property {string|null} [version] ClientLibrarySettings version - * @property {google.api.LaunchStage|null} [launchStage] ClientLibrarySettings launchStage - * @property {boolean|null} [restNumericEnums] ClientLibrarySettings restNumericEnums - * @property {google.api.IJavaSettings|null} [javaSettings] ClientLibrarySettings javaSettings - * @property {google.api.ICppSettings|null} [cppSettings] ClientLibrarySettings cppSettings - * @property {google.api.IPhpSettings|null} [phpSettings] ClientLibrarySettings phpSettings - * @property {google.api.IPythonSettings|null} [pythonSettings] ClientLibrarySettings pythonSettings - * @property {google.api.INodeSettings|null} [nodeSettings] ClientLibrarySettings nodeSettings - * @property {google.api.IDotnetSettings|null} [dotnetSettings] ClientLibrarySettings dotnetSettings - * @property {google.api.IRubySettings|null} [rubySettings] ClientLibrarySettings rubySettings - * @property {google.api.IGoSettings|null} [goSettings] ClientLibrarySettings goSettings - */ - - /** - * Constructs a new ClientLibrarySettings. - * @memberof google.api - * @classdesc Represents a ClientLibrarySettings. - * @implements IClientLibrarySettings - * @constructor - * @param {google.api.IClientLibrarySettings=} [properties] Properties to set - */ - function ClientLibrarySettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * ClientLibrarySettings version. - * @member {string} version - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.version = ""; - - /** - * ClientLibrarySettings launchStage. - * @member {google.api.LaunchStage} launchStage - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.launchStage = 0; - - /** - * ClientLibrarySettings restNumericEnums. - * @member {boolean} restNumericEnums - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.restNumericEnums = false; - - /** - * ClientLibrarySettings javaSettings. - * @member {google.api.IJavaSettings|null|undefined} javaSettings - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.javaSettings = null; - - /** - * ClientLibrarySettings cppSettings. - * @member {google.api.ICppSettings|null|undefined} cppSettings - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.cppSettings = null; - - /** - * ClientLibrarySettings phpSettings. - * @member {google.api.IPhpSettings|null|undefined} phpSettings - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.phpSettings = null; - - /** - * ClientLibrarySettings pythonSettings. - * @member {google.api.IPythonSettings|null|undefined} pythonSettings - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.pythonSettings = null; - - /** - * ClientLibrarySettings nodeSettings. - * @member {google.api.INodeSettings|null|undefined} nodeSettings - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.nodeSettings = null; - - /** - * ClientLibrarySettings dotnetSettings. - * @member {google.api.IDotnetSettings|null|undefined} dotnetSettings - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.dotnetSettings = null; - - /** - * ClientLibrarySettings rubySettings. - * @member {google.api.IRubySettings|null|undefined} rubySettings - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.rubySettings = null; - - /** - * ClientLibrarySettings goSettings. - * @member {google.api.IGoSettings|null|undefined} goSettings - * @memberof google.api.ClientLibrarySettings - * @instance - */ - ClientLibrarySettings.prototype.goSettings = null; - - /** - * Creates a new ClientLibrarySettings instance using the specified properties. - * @function create - * @memberof google.api.ClientLibrarySettings - * @static - * @param {google.api.IClientLibrarySettings=} [properties] Properties to set - * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings instance - */ - ClientLibrarySettings.create = function create(properties) { - return new ClientLibrarySettings(properties); - }; - - /** - * Encodes the specified ClientLibrarySettings message. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. - * @function encode - * @memberof google.api.ClientLibrarySettings - * @static - * @param {google.api.IClientLibrarySettings} message ClientLibrarySettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ClientLibrarySettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.version != null && Object.hasOwnProperty.call(message, "version")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.version); - if (message.launchStage != null && Object.hasOwnProperty.call(message, "launchStage")) - writer.uint32(/* id 2, wireType 0 =*/16).int32(message.launchStage); - if (message.restNumericEnums != null && Object.hasOwnProperty.call(message, "restNumericEnums")) - writer.uint32(/* id 3, wireType 0 =*/24).bool(message.restNumericEnums); - if (message.javaSettings != null && Object.hasOwnProperty.call(message, "javaSettings")) - $root.google.api.JavaSettings.encode(message.javaSettings, writer.uint32(/* id 21, wireType 2 =*/170).fork()).ldelim(); - if (message.cppSettings != null && Object.hasOwnProperty.call(message, "cppSettings")) - $root.google.api.CppSettings.encode(message.cppSettings, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); - if (message.phpSettings != null && Object.hasOwnProperty.call(message, "phpSettings")) - $root.google.api.PhpSettings.encode(message.phpSettings, writer.uint32(/* id 23, wireType 2 =*/186).fork()).ldelim(); - if (message.pythonSettings != null && Object.hasOwnProperty.call(message, "pythonSettings")) - $root.google.api.PythonSettings.encode(message.pythonSettings, writer.uint32(/* id 24, wireType 2 =*/194).fork()).ldelim(); - if (message.nodeSettings != null && Object.hasOwnProperty.call(message, "nodeSettings")) - $root.google.api.NodeSettings.encode(message.nodeSettings, writer.uint32(/* id 25, wireType 2 =*/202).fork()).ldelim(); - if (message.dotnetSettings != null && Object.hasOwnProperty.call(message, "dotnetSettings")) - $root.google.api.DotnetSettings.encode(message.dotnetSettings, writer.uint32(/* id 26, wireType 2 =*/210).fork()).ldelim(); - if (message.rubySettings != null && Object.hasOwnProperty.call(message, "rubySettings")) - $root.google.api.RubySettings.encode(message.rubySettings, writer.uint32(/* id 27, wireType 2 =*/218).fork()).ldelim(); - if (message.goSettings != null && Object.hasOwnProperty.call(message, "goSettings")) - $root.google.api.GoSettings.encode(message.goSettings, writer.uint32(/* id 28, wireType 2 =*/226).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified ClientLibrarySettings message, length delimited. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.ClientLibrarySettings - * @static - * @param {google.api.IClientLibrarySettings} message ClientLibrarySettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - ClientLibrarySettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a ClientLibrarySettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.ClientLibrarySettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ClientLibrarySettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ClientLibrarySettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.version = reader.string(); - break; - } - case 2: { - message.launchStage = reader.int32(); - break; - } - case 3: { - message.restNumericEnums = reader.bool(); - break; - } - case 21: { - message.javaSettings = $root.google.api.JavaSettings.decode(reader, reader.uint32()); - break; - } - case 22: { - message.cppSettings = $root.google.api.CppSettings.decode(reader, reader.uint32()); - break; - } - case 23: { - message.phpSettings = $root.google.api.PhpSettings.decode(reader, reader.uint32()); - break; - } - case 24: { - message.pythonSettings = $root.google.api.PythonSettings.decode(reader, reader.uint32()); - break; - } - case 25: { - message.nodeSettings = $root.google.api.NodeSettings.decode(reader, reader.uint32()); - break; - } - case 26: { - message.dotnetSettings = $root.google.api.DotnetSettings.decode(reader, reader.uint32()); - break; - } - case 27: { - message.rubySettings = $root.google.api.RubySettings.decode(reader, reader.uint32()); - break; - } - case 28: { - message.goSettings = $root.google.api.GoSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a ClientLibrarySettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.ClientLibrarySettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - ClientLibrarySettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a ClientLibrarySettings message. - * @function verify - * @memberof google.api.ClientLibrarySettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - ClientLibrarySettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.version != null && message.hasOwnProperty("version")) - if (!$util.isString(message.version)) - return "version: string expected"; - if (message.launchStage != null && message.hasOwnProperty("launchStage")) - switch (message.launchStage) { - default: - return "launchStage: enum value expected"; - case 0: - case 6: - case 7: - case 1: - case 2: - case 3: - case 4: - case 5: - break; - } - if (message.restNumericEnums != null && message.hasOwnProperty("restNumericEnums")) - if (typeof message.restNumericEnums !== "boolean") - return "restNumericEnums: boolean expected"; - if (message.javaSettings != null && message.hasOwnProperty("javaSettings")) { - var error = $root.google.api.JavaSettings.verify(message.javaSettings); - if (error) - return "javaSettings." + error; - } - if (message.cppSettings != null && message.hasOwnProperty("cppSettings")) { - var error = $root.google.api.CppSettings.verify(message.cppSettings); - if (error) - return "cppSettings." + error; - } - if (message.phpSettings != null && message.hasOwnProperty("phpSettings")) { - var error = $root.google.api.PhpSettings.verify(message.phpSettings); - if (error) - return "phpSettings." + error; - } - if (message.pythonSettings != null && message.hasOwnProperty("pythonSettings")) { - var error = $root.google.api.PythonSettings.verify(message.pythonSettings); - if (error) - return "pythonSettings." + error; - } - if (message.nodeSettings != null && message.hasOwnProperty("nodeSettings")) { - var error = $root.google.api.NodeSettings.verify(message.nodeSettings); - if (error) - return "nodeSettings." + error; - } - if (message.dotnetSettings != null && message.hasOwnProperty("dotnetSettings")) { - var error = $root.google.api.DotnetSettings.verify(message.dotnetSettings); - if (error) - return "dotnetSettings." + error; - } - if (message.rubySettings != null && message.hasOwnProperty("rubySettings")) { - var error = $root.google.api.RubySettings.verify(message.rubySettings); - if (error) - return "rubySettings." + error; - } - if (message.goSettings != null && message.hasOwnProperty("goSettings")) { - var error = $root.google.api.GoSettings.verify(message.goSettings); - if (error) - return "goSettings." + error; - } - return null; - }; - - /** - * Creates a ClientLibrarySettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.ClientLibrarySettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings - */ - ClientLibrarySettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.ClientLibrarySettings) - return object; - var message = new $root.google.api.ClientLibrarySettings(); - if (object.version != null) - message.version = String(object.version); - switch (object.launchStage) { - default: - if (typeof object.launchStage === "number") { - message.launchStage = object.launchStage; - break; - } - break; - case "LAUNCH_STAGE_UNSPECIFIED": - case 0: - message.launchStage = 0; - break; - case "UNIMPLEMENTED": - case 6: - message.launchStage = 6; - break; - case "PRELAUNCH": - case 7: - message.launchStage = 7; - break; - case "EARLY_ACCESS": - case 1: - message.launchStage = 1; - break; - case "ALPHA": - case 2: - message.launchStage = 2; - break; - case "BETA": - case 3: - message.launchStage = 3; - break; - case "GA": - case 4: - message.launchStage = 4; - break; - case "DEPRECATED": - case 5: - message.launchStage = 5; - break; - } - if (object.restNumericEnums != null) - message.restNumericEnums = Boolean(object.restNumericEnums); - if (object.javaSettings != null) { - if (typeof object.javaSettings !== "object") - throw TypeError(".google.api.ClientLibrarySettings.javaSettings: object expected"); - message.javaSettings = $root.google.api.JavaSettings.fromObject(object.javaSettings); - } - if (object.cppSettings != null) { - if (typeof object.cppSettings !== "object") - throw TypeError(".google.api.ClientLibrarySettings.cppSettings: object expected"); - message.cppSettings = $root.google.api.CppSettings.fromObject(object.cppSettings); - } - if (object.phpSettings != null) { - if (typeof object.phpSettings !== "object") - throw TypeError(".google.api.ClientLibrarySettings.phpSettings: object expected"); - message.phpSettings = $root.google.api.PhpSettings.fromObject(object.phpSettings); - } - if (object.pythonSettings != null) { - if (typeof object.pythonSettings !== "object") - throw TypeError(".google.api.ClientLibrarySettings.pythonSettings: object expected"); - message.pythonSettings = $root.google.api.PythonSettings.fromObject(object.pythonSettings); - } - if (object.nodeSettings != null) { - if (typeof object.nodeSettings !== "object") - throw TypeError(".google.api.ClientLibrarySettings.nodeSettings: object expected"); - message.nodeSettings = $root.google.api.NodeSettings.fromObject(object.nodeSettings); - } - if (object.dotnetSettings != null) { - if (typeof object.dotnetSettings !== "object") - throw TypeError(".google.api.ClientLibrarySettings.dotnetSettings: object expected"); - message.dotnetSettings = $root.google.api.DotnetSettings.fromObject(object.dotnetSettings); - } - if (object.rubySettings != null) { - if (typeof object.rubySettings !== "object") - throw TypeError(".google.api.ClientLibrarySettings.rubySettings: object expected"); - message.rubySettings = $root.google.api.RubySettings.fromObject(object.rubySettings); - } - if (object.goSettings != null) { - if (typeof object.goSettings !== "object") - throw TypeError(".google.api.ClientLibrarySettings.goSettings: object expected"); - message.goSettings = $root.google.api.GoSettings.fromObject(object.goSettings); - } - return message; - }; - - /** - * Creates a plain object from a ClientLibrarySettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.ClientLibrarySettings - * @static - * @param {google.api.ClientLibrarySettings} message ClientLibrarySettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ClientLibrarySettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.version = ""; - object.launchStage = options.enums === String ? "LAUNCH_STAGE_UNSPECIFIED" : 0; - object.restNumericEnums = false; - object.javaSettings = null; - object.cppSettings = null; - object.phpSettings = null; - object.pythonSettings = null; - object.nodeSettings = null; - object.dotnetSettings = null; - object.rubySettings = null; - object.goSettings = null; - } - if (message.version != null && message.hasOwnProperty("version")) - object.version = message.version; - if (message.launchStage != null && message.hasOwnProperty("launchStage")) - object.launchStage = options.enums === String ? $root.google.api.LaunchStage[message.launchStage] === undefined ? message.launchStage : $root.google.api.LaunchStage[message.launchStage] : message.launchStage; - if (message.restNumericEnums != null && message.hasOwnProperty("restNumericEnums")) - object.restNumericEnums = message.restNumericEnums; - if (message.javaSettings != null && message.hasOwnProperty("javaSettings")) - object.javaSettings = $root.google.api.JavaSettings.toObject(message.javaSettings, options); - if (message.cppSettings != null && message.hasOwnProperty("cppSettings")) - object.cppSettings = $root.google.api.CppSettings.toObject(message.cppSettings, options); - if (message.phpSettings != null && message.hasOwnProperty("phpSettings")) - object.phpSettings = $root.google.api.PhpSettings.toObject(message.phpSettings, options); - if (message.pythonSettings != null && message.hasOwnProperty("pythonSettings")) - object.pythonSettings = $root.google.api.PythonSettings.toObject(message.pythonSettings, options); - if (message.nodeSettings != null && message.hasOwnProperty("nodeSettings")) - object.nodeSettings = $root.google.api.NodeSettings.toObject(message.nodeSettings, options); - if (message.dotnetSettings != null && message.hasOwnProperty("dotnetSettings")) - object.dotnetSettings = $root.google.api.DotnetSettings.toObject(message.dotnetSettings, options); - if (message.rubySettings != null && message.hasOwnProperty("rubySettings")) - object.rubySettings = $root.google.api.RubySettings.toObject(message.rubySettings, options); - if (message.goSettings != null && message.hasOwnProperty("goSettings")) - object.goSettings = $root.google.api.GoSettings.toObject(message.goSettings, options); - return object; - }; - - /** - * Converts this ClientLibrarySettings to JSON. - * @function toJSON - * @memberof google.api.ClientLibrarySettings - * @instance - * @returns {Object.} JSON object - */ - ClientLibrarySettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for ClientLibrarySettings - * @function getTypeUrl - * @memberof google.api.ClientLibrarySettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - ClientLibrarySettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.ClientLibrarySettings"; - }; - - return ClientLibrarySettings; - })(); - - api.Publishing = (function() { - - /** - * Properties of a Publishing. - * @memberof google.api - * @interface IPublishing - * @property {Array.|null} [methodSettings] Publishing methodSettings - * @property {string|null} [newIssueUri] Publishing newIssueUri - * @property {string|null} [documentationUri] Publishing documentationUri - * @property {string|null} [apiShortName] Publishing apiShortName - * @property {string|null} [githubLabel] Publishing githubLabel - * @property {Array.|null} [codeownerGithubTeams] Publishing codeownerGithubTeams - * @property {string|null} [docTagPrefix] Publishing docTagPrefix - * @property {google.api.ClientLibraryOrganization|null} [organization] Publishing organization - * @property {Array.|null} [librarySettings] Publishing librarySettings - */ - - /** - * Constructs a new Publishing. - * @memberof google.api - * @classdesc Represents a Publishing. - * @implements IPublishing - * @constructor - * @param {google.api.IPublishing=} [properties] Properties to set - */ - function Publishing(properties) { - this.methodSettings = []; - this.codeownerGithubTeams = []; - this.librarySettings = []; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * Publishing methodSettings. - * @member {Array.} methodSettings - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.methodSettings = $util.emptyArray; - - /** - * Publishing newIssueUri. - * @member {string} newIssueUri - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.newIssueUri = ""; - - /** - * Publishing documentationUri. - * @member {string} documentationUri - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.documentationUri = ""; - - /** - * Publishing apiShortName. - * @member {string} apiShortName - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.apiShortName = ""; - - /** - * Publishing githubLabel. - * @member {string} githubLabel - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.githubLabel = ""; - - /** - * Publishing codeownerGithubTeams. - * @member {Array.} codeownerGithubTeams - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.codeownerGithubTeams = $util.emptyArray; - - /** - * Publishing docTagPrefix. - * @member {string} docTagPrefix - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.docTagPrefix = ""; - - /** - * Publishing organization. - * @member {google.api.ClientLibraryOrganization} organization - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.organization = 0; - - /** - * Publishing librarySettings. - * @member {Array.} librarySettings - * @memberof google.api.Publishing - * @instance - */ - Publishing.prototype.librarySettings = $util.emptyArray; - - /** - * Creates a new Publishing instance using the specified properties. - * @function create - * @memberof google.api.Publishing - * @static - * @param {google.api.IPublishing=} [properties] Properties to set - * @returns {google.api.Publishing} Publishing instance - */ - Publishing.create = function create(properties) { - return new Publishing(properties); - }; - - /** - * Encodes the specified Publishing message. Does not implicitly {@link google.api.Publishing.verify|verify} messages. - * @function encode - * @memberof google.api.Publishing - * @static - * @param {google.api.IPublishing} message Publishing message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Publishing.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.methodSettings != null && message.methodSettings.length) - for (var i = 0; i < message.methodSettings.length; ++i) - $root.google.api.MethodSettings.encode(message.methodSettings[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.newIssueUri != null && Object.hasOwnProperty.call(message, "newIssueUri")) - writer.uint32(/* id 101, wireType 2 =*/810).string(message.newIssueUri); - if (message.documentationUri != null && Object.hasOwnProperty.call(message, "documentationUri")) - writer.uint32(/* id 102, wireType 2 =*/818).string(message.documentationUri); - if (message.apiShortName != null && Object.hasOwnProperty.call(message, "apiShortName")) - writer.uint32(/* id 103, wireType 2 =*/826).string(message.apiShortName); - if (message.githubLabel != null && Object.hasOwnProperty.call(message, "githubLabel")) - writer.uint32(/* id 104, wireType 2 =*/834).string(message.githubLabel); - if (message.codeownerGithubTeams != null && message.codeownerGithubTeams.length) - for (var i = 0; i < message.codeownerGithubTeams.length; ++i) - writer.uint32(/* id 105, wireType 2 =*/842).string(message.codeownerGithubTeams[i]); - if (message.docTagPrefix != null && Object.hasOwnProperty.call(message, "docTagPrefix")) - writer.uint32(/* id 106, wireType 2 =*/850).string(message.docTagPrefix); - if (message.organization != null && Object.hasOwnProperty.call(message, "organization")) - writer.uint32(/* id 107, wireType 0 =*/856).int32(message.organization); - if (message.librarySettings != null && message.librarySettings.length) - for (var i = 0; i < message.librarySettings.length; ++i) - $root.google.api.ClientLibrarySettings.encode(message.librarySettings[i], writer.uint32(/* id 109, wireType 2 =*/874).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified Publishing message, length delimited. Does not implicitly {@link google.api.Publishing.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.Publishing - * @static - * @param {google.api.IPublishing} message Publishing message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - Publishing.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a Publishing message from the specified reader or buffer. - * @function decode - * @memberof google.api.Publishing - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.Publishing} Publishing - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Publishing.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Publishing(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 2: { - if (!(message.methodSettings && message.methodSettings.length)) - message.methodSettings = []; - message.methodSettings.push($root.google.api.MethodSettings.decode(reader, reader.uint32())); - break; - } - case 101: { - message.newIssueUri = reader.string(); - break; - } - case 102: { - message.documentationUri = reader.string(); - break; - } - case 103: { - message.apiShortName = reader.string(); - break; - } - case 104: { - message.githubLabel = reader.string(); - break; - } - case 105: { - if (!(message.codeownerGithubTeams && message.codeownerGithubTeams.length)) - message.codeownerGithubTeams = []; - message.codeownerGithubTeams.push(reader.string()); - break; - } - case 106: { - message.docTagPrefix = reader.string(); - break; - } - case 107: { - message.organization = reader.int32(); - break; - } - case 109: { - if (!(message.librarySettings && message.librarySettings.length)) - message.librarySettings = []; - message.librarySettings.push($root.google.api.ClientLibrarySettings.decode(reader, reader.uint32())); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a Publishing message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.Publishing - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.Publishing} Publishing - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - Publishing.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a Publishing message. - * @function verify - * @memberof google.api.Publishing - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - Publishing.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.methodSettings != null && message.hasOwnProperty("methodSettings")) { - if (!Array.isArray(message.methodSettings)) - return "methodSettings: array expected"; - for (var i = 0; i < message.methodSettings.length; ++i) { - var error = $root.google.api.MethodSettings.verify(message.methodSettings[i]); - if (error) - return "methodSettings." + error; - } - } - if (message.newIssueUri != null && message.hasOwnProperty("newIssueUri")) - if (!$util.isString(message.newIssueUri)) - return "newIssueUri: string expected"; - if (message.documentationUri != null && message.hasOwnProperty("documentationUri")) - if (!$util.isString(message.documentationUri)) - return "documentationUri: string expected"; - if (message.apiShortName != null && message.hasOwnProperty("apiShortName")) - if (!$util.isString(message.apiShortName)) - return "apiShortName: string expected"; - if (message.githubLabel != null && message.hasOwnProperty("githubLabel")) - if (!$util.isString(message.githubLabel)) - return "githubLabel: string expected"; - if (message.codeownerGithubTeams != null && message.hasOwnProperty("codeownerGithubTeams")) { - if (!Array.isArray(message.codeownerGithubTeams)) - return "codeownerGithubTeams: array expected"; - for (var i = 0; i < message.codeownerGithubTeams.length; ++i) - if (!$util.isString(message.codeownerGithubTeams[i])) - return "codeownerGithubTeams: string[] expected"; - } - if (message.docTagPrefix != null && message.hasOwnProperty("docTagPrefix")) - if (!$util.isString(message.docTagPrefix)) - return "docTagPrefix: string expected"; - if (message.organization != null && message.hasOwnProperty("organization")) - switch (message.organization) { - default: - return "organization: enum value expected"; - case 0: - case 1: - case 2: - case 3: - case 4: - break; - } - if (message.librarySettings != null && message.hasOwnProperty("librarySettings")) { - if (!Array.isArray(message.librarySettings)) - return "librarySettings: array expected"; - for (var i = 0; i < message.librarySettings.length; ++i) { - var error = $root.google.api.ClientLibrarySettings.verify(message.librarySettings[i]); - if (error) - return "librarySettings." + error; - } - } - return null; - }; - - /** - * Creates a Publishing message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.Publishing - * @static - * @param {Object.} object Plain object - * @returns {google.api.Publishing} Publishing - */ - Publishing.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.Publishing) - return object; - var message = new $root.google.api.Publishing(); - if (object.methodSettings) { - if (!Array.isArray(object.methodSettings)) - throw TypeError(".google.api.Publishing.methodSettings: array expected"); - message.methodSettings = []; - for (var i = 0; i < object.methodSettings.length; ++i) { - if (typeof object.methodSettings[i] !== "object") - throw TypeError(".google.api.Publishing.methodSettings: object expected"); - message.methodSettings[i] = $root.google.api.MethodSettings.fromObject(object.methodSettings[i]); - } - } - if (object.newIssueUri != null) - message.newIssueUri = String(object.newIssueUri); - if (object.documentationUri != null) - message.documentationUri = String(object.documentationUri); - if (object.apiShortName != null) - message.apiShortName = String(object.apiShortName); - if (object.githubLabel != null) - message.githubLabel = String(object.githubLabel); - if (object.codeownerGithubTeams) { - if (!Array.isArray(object.codeownerGithubTeams)) - throw TypeError(".google.api.Publishing.codeownerGithubTeams: array expected"); - message.codeownerGithubTeams = []; - for (var i = 0; i < object.codeownerGithubTeams.length; ++i) - message.codeownerGithubTeams[i] = String(object.codeownerGithubTeams[i]); - } - if (object.docTagPrefix != null) - message.docTagPrefix = String(object.docTagPrefix); - switch (object.organization) { - default: - if (typeof object.organization === "number") { - message.organization = object.organization; - break; - } - break; - case "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED": - case 0: - message.organization = 0; - break; - case "CLOUD": - case 1: - message.organization = 1; - break; - case "ADS": - case 2: - message.organization = 2; - break; - case "PHOTOS": - case 3: - message.organization = 3; - break; - case "STREET_VIEW": - case 4: - message.organization = 4; - break; - } - if (object.librarySettings) { - if (!Array.isArray(object.librarySettings)) - throw TypeError(".google.api.Publishing.librarySettings: array expected"); - message.librarySettings = []; - for (var i = 0; i < object.librarySettings.length; ++i) { - if (typeof object.librarySettings[i] !== "object") - throw TypeError(".google.api.Publishing.librarySettings: object expected"); - message.librarySettings[i] = $root.google.api.ClientLibrarySettings.fromObject(object.librarySettings[i]); - } - } - return message; - }; - - /** - * Creates a plain object from a Publishing message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.Publishing - * @static - * @param {google.api.Publishing} message Publishing - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - Publishing.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.arrays || options.defaults) { - object.methodSettings = []; - object.codeownerGithubTeams = []; - object.librarySettings = []; - } - if (options.defaults) { - object.newIssueUri = ""; - object.documentationUri = ""; - object.apiShortName = ""; - object.githubLabel = ""; - object.docTagPrefix = ""; - object.organization = options.enums === String ? "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED" : 0; - } - if (message.methodSettings && message.methodSettings.length) { - object.methodSettings = []; - for (var j = 0; j < message.methodSettings.length; ++j) - object.methodSettings[j] = $root.google.api.MethodSettings.toObject(message.methodSettings[j], options); - } - if (message.newIssueUri != null && message.hasOwnProperty("newIssueUri")) - object.newIssueUri = message.newIssueUri; - if (message.documentationUri != null && message.hasOwnProperty("documentationUri")) - object.documentationUri = message.documentationUri; - if (message.apiShortName != null && message.hasOwnProperty("apiShortName")) - object.apiShortName = message.apiShortName; - if (message.githubLabel != null && message.hasOwnProperty("githubLabel")) - object.githubLabel = message.githubLabel; - if (message.codeownerGithubTeams && message.codeownerGithubTeams.length) { - object.codeownerGithubTeams = []; - for (var j = 0; j < message.codeownerGithubTeams.length; ++j) - object.codeownerGithubTeams[j] = message.codeownerGithubTeams[j]; - } - if (message.docTagPrefix != null && message.hasOwnProperty("docTagPrefix")) - object.docTagPrefix = message.docTagPrefix; - if (message.organization != null && message.hasOwnProperty("organization")) - object.organization = options.enums === String ? $root.google.api.ClientLibraryOrganization[message.organization] === undefined ? message.organization : $root.google.api.ClientLibraryOrganization[message.organization] : message.organization; - if (message.librarySettings && message.librarySettings.length) { - object.librarySettings = []; - for (var j = 0; j < message.librarySettings.length; ++j) - object.librarySettings[j] = $root.google.api.ClientLibrarySettings.toObject(message.librarySettings[j], options); - } - return object; - }; - - /** - * Converts this Publishing to JSON. - * @function toJSON - * @memberof google.api.Publishing - * @instance - * @returns {Object.} JSON object - */ - Publishing.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for Publishing - * @function getTypeUrl - * @memberof google.api.Publishing - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - Publishing.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.Publishing"; - }; - - return Publishing; - })(); - - api.JavaSettings = (function() { - - /** - * Properties of a JavaSettings. - * @memberof google.api - * @interface IJavaSettings - * @property {string|null} [libraryPackage] JavaSettings libraryPackage - * @property {Object.|null} [serviceClassNames] JavaSettings serviceClassNames - * @property {google.api.ICommonLanguageSettings|null} [common] JavaSettings common - */ - - /** - * Constructs a new JavaSettings. - * @memberof google.api - * @classdesc Represents a JavaSettings. - * @implements IJavaSettings - * @constructor - * @param {google.api.IJavaSettings=} [properties] Properties to set - */ - function JavaSettings(properties) { - this.serviceClassNames = {}; - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * JavaSettings libraryPackage. - * @member {string} libraryPackage - * @memberof google.api.JavaSettings - * @instance - */ - JavaSettings.prototype.libraryPackage = ""; - - /** - * JavaSettings serviceClassNames. - * @member {Object.} serviceClassNames - * @memberof google.api.JavaSettings - * @instance - */ - JavaSettings.prototype.serviceClassNames = $util.emptyObject; - - /** - * JavaSettings common. - * @member {google.api.ICommonLanguageSettings|null|undefined} common - * @memberof google.api.JavaSettings - * @instance - */ - JavaSettings.prototype.common = null; - - /** - * Creates a new JavaSettings instance using the specified properties. - * @function create - * @memberof google.api.JavaSettings - * @static - * @param {google.api.IJavaSettings=} [properties] Properties to set - * @returns {google.api.JavaSettings} JavaSettings instance - */ - JavaSettings.create = function create(properties) { - return new JavaSettings(properties); - }; - - /** - * Encodes the specified JavaSettings message. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. - * @function encode - * @memberof google.api.JavaSettings - * @static - * @param {google.api.IJavaSettings} message JavaSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - JavaSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.libraryPackage != null && Object.hasOwnProperty.call(message, "libraryPackage")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.libraryPackage); - if (message.serviceClassNames != null && Object.hasOwnProperty.call(message, "serviceClassNames")) - for (var keys = Object.keys(message.serviceClassNames), i = 0; i < keys.length; ++i) - writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.serviceClassNames[keys[i]]).ldelim(); - if (message.common != null && Object.hasOwnProperty.call(message, "common")) - $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified JavaSettings message, length delimited. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.JavaSettings - * @static - * @param {google.api.IJavaSettings} message JavaSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - JavaSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a JavaSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.JavaSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.JavaSettings} JavaSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - JavaSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.JavaSettings(), key, value; - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.libraryPackage = reader.string(); - break; - } - case 2: { - if (message.serviceClassNames === $util.emptyObject) - message.serviceClassNames = {}; - var end2 = reader.uint32() + reader.pos; - key = ""; - value = ""; - while (reader.pos < end2) { - var tag2 = reader.uint32(); - switch (tag2 >>> 3) { - case 1: - key = reader.string(); - break; - case 2: - value = reader.string(); - break; - default: - reader.skipType(tag2 & 7); - break; - } - } - message.serviceClassNames[key] = value; - break; - } - case 3: { - message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a JavaSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.JavaSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.JavaSettings} JavaSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - JavaSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a JavaSettings message. - * @function verify - * @memberof google.api.JavaSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - JavaSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.libraryPackage != null && message.hasOwnProperty("libraryPackage")) - if (!$util.isString(message.libraryPackage)) - return "libraryPackage: string expected"; - if (message.serviceClassNames != null && message.hasOwnProperty("serviceClassNames")) { - if (!$util.isObject(message.serviceClassNames)) - return "serviceClassNames: object expected"; - var key = Object.keys(message.serviceClassNames); - for (var i = 0; i < key.length; ++i) - if (!$util.isString(message.serviceClassNames[key[i]])) - return "serviceClassNames: string{k:string} expected"; - } - if (message.common != null && message.hasOwnProperty("common")) { - var error = $root.google.api.CommonLanguageSettings.verify(message.common); - if (error) - return "common." + error; - } - return null; - }; - - /** - * Creates a JavaSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.JavaSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.JavaSettings} JavaSettings - */ - JavaSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.JavaSettings) - return object; - var message = new $root.google.api.JavaSettings(); - if (object.libraryPackage != null) - message.libraryPackage = String(object.libraryPackage); - if (object.serviceClassNames) { - if (typeof object.serviceClassNames !== "object") - throw TypeError(".google.api.JavaSettings.serviceClassNames: object expected"); - message.serviceClassNames = {}; - for (var keys = Object.keys(object.serviceClassNames), i = 0; i < keys.length; ++i) - message.serviceClassNames[keys[i]] = String(object.serviceClassNames[keys[i]]); - } - if (object.common != null) { - if (typeof object.common !== "object") - throw TypeError(".google.api.JavaSettings.common: object expected"); - message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); - } - return message; - }; - - /** - * Creates a plain object from a JavaSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.JavaSettings - * @static - * @param {google.api.JavaSettings} message JavaSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - JavaSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.objects || options.defaults) - object.serviceClassNames = {}; - if (options.defaults) { - object.libraryPackage = ""; - object.common = null; - } - if (message.libraryPackage != null && message.hasOwnProperty("libraryPackage")) - object.libraryPackage = message.libraryPackage; - var keys2; - if (message.serviceClassNames && (keys2 = Object.keys(message.serviceClassNames)).length) { - object.serviceClassNames = {}; - for (var j = 0; j < keys2.length; ++j) - object.serviceClassNames[keys2[j]] = message.serviceClassNames[keys2[j]]; - } - if (message.common != null && message.hasOwnProperty("common")) - object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); - return object; - }; - - /** - * Converts this JavaSettings to JSON. - * @function toJSON - * @memberof google.api.JavaSettings - * @instance - * @returns {Object.} JSON object - */ - JavaSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for JavaSettings - * @function getTypeUrl - * @memberof google.api.JavaSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - JavaSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.JavaSettings"; - }; - - return JavaSettings; - })(); - - api.CppSettings = (function() { - - /** - * Properties of a CppSettings. - * @memberof google.api - * @interface ICppSettings - * @property {google.api.ICommonLanguageSettings|null} [common] CppSettings common - */ - - /** - * Constructs a new CppSettings. - * @memberof google.api - * @classdesc Represents a CppSettings. - * @implements ICppSettings - * @constructor - * @param {google.api.ICppSettings=} [properties] Properties to set - */ - function CppSettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * CppSettings common. - * @member {google.api.ICommonLanguageSettings|null|undefined} common - * @memberof google.api.CppSettings - * @instance - */ - CppSettings.prototype.common = null; - - /** - * Creates a new CppSettings instance using the specified properties. - * @function create - * @memberof google.api.CppSettings - * @static - * @param {google.api.ICppSettings=} [properties] Properties to set - * @returns {google.api.CppSettings} CppSettings instance - */ - CppSettings.create = function create(properties) { - return new CppSettings(properties); - }; - - /** - * Encodes the specified CppSettings message. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. - * @function encode - * @memberof google.api.CppSettings - * @static - * @param {google.api.ICppSettings} message CppSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CppSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.common != null && Object.hasOwnProperty.call(message, "common")) - $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified CppSettings message, length delimited. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.CppSettings - * @static - * @param {google.api.ICppSettings} message CppSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - CppSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a CppSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.CppSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.CppSettings} CppSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CppSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CppSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a CppSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.CppSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.CppSettings} CppSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - CppSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a CppSettings message. - * @function verify - * @memberof google.api.CppSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - CppSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.common != null && message.hasOwnProperty("common")) { - var error = $root.google.api.CommonLanguageSettings.verify(message.common); - if (error) - return "common." + error; - } - return null; - }; - - /** - * Creates a CppSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.CppSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.CppSettings} CppSettings - */ - CppSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.CppSettings) - return object; - var message = new $root.google.api.CppSettings(); - if (object.common != null) { - if (typeof object.common !== "object") - throw TypeError(".google.api.CppSettings.common: object expected"); - message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); - } - return message; - }; - - /** - * Creates a plain object from a CppSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.CppSettings - * @static - * @param {google.api.CppSettings} message CppSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - CppSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.common = null; - if (message.common != null && message.hasOwnProperty("common")) - object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); - return object; - }; - - /** - * Converts this CppSettings to JSON. - * @function toJSON - * @memberof google.api.CppSettings - * @instance - * @returns {Object.} JSON object - */ - CppSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for CppSettings - * @function getTypeUrl - * @memberof google.api.CppSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - CppSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.CppSettings"; - }; - - return CppSettings; - })(); - - api.PhpSettings = (function() { - - /** - * Properties of a PhpSettings. - * @memberof google.api - * @interface IPhpSettings - * @property {google.api.ICommonLanguageSettings|null} [common] PhpSettings common - */ - - /** - * Constructs a new PhpSettings. - * @memberof google.api - * @classdesc Represents a PhpSettings. - * @implements IPhpSettings - * @constructor - * @param {google.api.IPhpSettings=} [properties] Properties to set - */ - function PhpSettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * PhpSettings common. - * @member {google.api.ICommonLanguageSettings|null|undefined} common - * @memberof google.api.PhpSettings - * @instance - */ - PhpSettings.prototype.common = null; - - /** - * Creates a new PhpSettings instance using the specified properties. - * @function create - * @memberof google.api.PhpSettings - * @static - * @param {google.api.IPhpSettings=} [properties] Properties to set - * @returns {google.api.PhpSettings} PhpSettings instance - */ - PhpSettings.create = function create(properties) { - return new PhpSettings(properties); - }; - - /** - * Encodes the specified PhpSettings message. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. - * @function encode - * @memberof google.api.PhpSettings - * @static - * @param {google.api.IPhpSettings} message PhpSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PhpSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.common != null && Object.hasOwnProperty.call(message, "common")) - $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified PhpSettings message, length delimited. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.PhpSettings - * @static - * @param {google.api.IPhpSettings} message PhpSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PhpSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a PhpSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.PhpSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.PhpSettings} PhpSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PhpSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PhpSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a PhpSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.PhpSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.PhpSettings} PhpSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PhpSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a PhpSettings message. - * @function verify - * @memberof google.api.PhpSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PhpSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.common != null && message.hasOwnProperty("common")) { - var error = $root.google.api.CommonLanguageSettings.verify(message.common); - if (error) - return "common." + error; - } - return null; - }; - - /** - * Creates a PhpSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.PhpSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.PhpSettings} PhpSettings - */ - PhpSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.PhpSettings) - return object; - var message = new $root.google.api.PhpSettings(); - if (object.common != null) { - if (typeof object.common !== "object") - throw TypeError(".google.api.PhpSettings.common: object expected"); - message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); - } - return message; - }; - - /** - * Creates a plain object from a PhpSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.PhpSettings - * @static - * @param {google.api.PhpSettings} message PhpSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PhpSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.common = null; - if (message.common != null && message.hasOwnProperty("common")) - object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); - return object; - }; - - /** - * Converts this PhpSettings to JSON. - * @function toJSON - * @memberof google.api.PhpSettings - * @instance - * @returns {Object.} JSON object - */ - PhpSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for PhpSettings - * @function getTypeUrl - * @memberof google.api.PhpSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - PhpSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.PhpSettings"; - }; - - return PhpSettings; - })(); - - api.PythonSettings = (function() { - - /** - * Properties of a PythonSettings. - * @memberof google.api - * @interface IPythonSettings - * @property {google.api.ICommonLanguageSettings|null} [common] PythonSettings common - */ - - /** - * Constructs a new PythonSettings. - * @memberof google.api - * @classdesc Represents a PythonSettings. - * @implements IPythonSettings - * @constructor - * @param {google.api.IPythonSettings=} [properties] Properties to set - */ - function PythonSettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * PythonSettings common. - * @member {google.api.ICommonLanguageSettings|null|undefined} common - * @memberof google.api.PythonSettings - * @instance - */ - PythonSettings.prototype.common = null; - - /** - * Creates a new PythonSettings instance using the specified properties. - * @function create - * @memberof google.api.PythonSettings - * @static - * @param {google.api.IPythonSettings=} [properties] Properties to set - * @returns {google.api.PythonSettings} PythonSettings instance - */ - PythonSettings.create = function create(properties) { - return new PythonSettings(properties); - }; - - /** - * Encodes the specified PythonSettings message. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. - * @function encode - * @memberof google.api.PythonSettings - * @static - * @param {google.api.IPythonSettings} message PythonSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PythonSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.common != null && Object.hasOwnProperty.call(message, "common")) - $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified PythonSettings message, length delimited. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.PythonSettings - * @static - * @param {google.api.IPythonSettings} message PythonSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PythonSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a PythonSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.PythonSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.PythonSettings} PythonSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PythonSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PythonSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a PythonSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.PythonSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.PythonSettings} PythonSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PythonSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a PythonSettings message. - * @function verify - * @memberof google.api.PythonSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PythonSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.common != null && message.hasOwnProperty("common")) { - var error = $root.google.api.CommonLanguageSettings.verify(message.common); - if (error) - return "common." + error; - } - return null; - }; - - /** - * Creates a PythonSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.PythonSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.PythonSettings} PythonSettings - */ - PythonSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.PythonSettings) - return object; - var message = new $root.google.api.PythonSettings(); - if (object.common != null) { - if (typeof object.common !== "object") - throw TypeError(".google.api.PythonSettings.common: object expected"); - message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); - } - return message; - }; - - /** - * Creates a plain object from a PythonSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.PythonSettings - * @static - * @param {google.api.PythonSettings} message PythonSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PythonSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.common = null; - if (message.common != null && message.hasOwnProperty("common")) - object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); - return object; - }; - - /** - * Converts this PythonSettings to JSON. - * @function toJSON - * @memberof google.api.PythonSettings - * @instance - * @returns {Object.} JSON object - */ - PythonSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for PythonSettings - * @function getTypeUrl - * @memberof google.api.PythonSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - PythonSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.PythonSettings"; - }; - - return PythonSettings; - })(); - - api.NodeSettings = (function() { - - /** - * Properties of a NodeSettings. - * @memberof google.api - * @interface INodeSettings - * @property {google.api.ICommonLanguageSettings|null} [common] NodeSettings common - */ - - /** - * Constructs a new NodeSettings. - * @memberof google.api - * @classdesc Represents a NodeSettings. - * @implements INodeSettings - * @constructor - * @param {google.api.INodeSettings=} [properties] Properties to set - */ - function NodeSettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * NodeSettings common. - * @member {google.api.ICommonLanguageSettings|null|undefined} common - * @memberof google.api.NodeSettings - * @instance - */ - NodeSettings.prototype.common = null; - - /** - * Creates a new NodeSettings instance using the specified properties. - * @function create - * @memberof google.api.NodeSettings - * @static - * @param {google.api.INodeSettings=} [properties] Properties to set - * @returns {google.api.NodeSettings} NodeSettings instance - */ - NodeSettings.create = function create(properties) { - return new NodeSettings(properties); - }; - - /** - * Encodes the specified NodeSettings message. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. - * @function encode - * @memberof google.api.NodeSettings - * @static - * @param {google.api.INodeSettings} message NodeSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - NodeSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.common != null && Object.hasOwnProperty.call(message, "common")) - $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified NodeSettings message, length delimited. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.NodeSettings - * @static - * @param {google.api.INodeSettings} message NodeSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - NodeSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a NodeSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.NodeSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.NodeSettings} NodeSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - NodeSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.NodeSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a NodeSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.NodeSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.NodeSettings} NodeSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - NodeSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a NodeSettings message. - * @function verify - * @memberof google.api.NodeSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - NodeSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.common != null && message.hasOwnProperty("common")) { - var error = $root.google.api.CommonLanguageSettings.verify(message.common); - if (error) - return "common." + error; - } - return null; - }; - - /** - * Creates a NodeSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.NodeSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.NodeSettings} NodeSettings - */ - NodeSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.NodeSettings) - return object; - var message = new $root.google.api.NodeSettings(); - if (object.common != null) { - if (typeof object.common !== "object") - throw TypeError(".google.api.NodeSettings.common: object expected"); - message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); - } - return message; - }; - - /** - * Creates a plain object from a NodeSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.NodeSettings - * @static - * @param {google.api.NodeSettings} message NodeSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - NodeSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.common = null; - if (message.common != null && message.hasOwnProperty("common")) - object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); - return object; - }; - - /** - * Converts this NodeSettings to JSON. - * @function toJSON - * @memberof google.api.NodeSettings - * @instance - * @returns {Object.} JSON object - */ - NodeSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for NodeSettings - * @function getTypeUrl - * @memberof google.api.NodeSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - NodeSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.NodeSettings"; - }; - - return NodeSettings; - })(); - - api.DotnetSettings = (function() { - - /** - * Properties of a DotnetSettings. - * @memberof google.api - * @interface IDotnetSettings - * @property {google.api.ICommonLanguageSettings|null} [common] DotnetSettings common - */ - - /** - * Constructs a new DotnetSettings. - * @memberof google.api - * @classdesc Represents a DotnetSettings. - * @implements IDotnetSettings - * @constructor - * @param {google.api.IDotnetSettings=} [properties] Properties to set - */ - function DotnetSettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * DotnetSettings common. - * @member {google.api.ICommonLanguageSettings|null|undefined} common - * @memberof google.api.DotnetSettings - * @instance - */ - DotnetSettings.prototype.common = null; - - /** - * Creates a new DotnetSettings instance using the specified properties. - * @function create - * @memberof google.api.DotnetSettings - * @static - * @param {google.api.IDotnetSettings=} [properties] Properties to set - * @returns {google.api.DotnetSettings} DotnetSettings instance - */ - DotnetSettings.create = function create(properties) { - return new DotnetSettings(properties); - }; - - /** - * Encodes the specified DotnetSettings message. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. - * @function encode - * @memberof google.api.DotnetSettings - * @static - * @param {google.api.IDotnetSettings} message DotnetSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DotnetSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.common != null && Object.hasOwnProperty.call(message, "common")) - $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified DotnetSettings message, length delimited. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.DotnetSettings - * @static - * @param {google.api.IDotnetSettings} message DotnetSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - DotnetSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a DotnetSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.DotnetSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.DotnetSettings} DotnetSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DotnetSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.DotnetSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a DotnetSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.DotnetSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.DotnetSettings} DotnetSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - DotnetSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a DotnetSettings message. - * @function verify - * @memberof google.api.DotnetSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - DotnetSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.common != null && message.hasOwnProperty("common")) { - var error = $root.google.api.CommonLanguageSettings.verify(message.common); - if (error) - return "common." + error; - } - return null; - }; - - /** - * Creates a DotnetSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.DotnetSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.DotnetSettings} DotnetSettings - */ - DotnetSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.DotnetSettings) - return object; - var message = new $root.google.api.DotnetSettings(); - if (object.common != null) { - if (typeof object.common !== "object") - throw TypeError(".google.api.DotnetSettings.common: object expected"); - message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); - } - return message; - }; - - /** - * Creates a plain object from a DotnetSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.DotnetSettings - * @static - * @param {google.api.DotnetSettings} message DotnetSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - DotnetSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.common = null; - if (message.common != null && message.hasOwnProperty("common")) - object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); - return object; - }; - - /** - * Converts this DotnetSettings to JSON. - * @function toJSON - * @memberof google.api.DotnetSettings - * @instance - * @returns {Object.} JSON object - */ - DotnetSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for DotnetSettings - * @function getTypeUrl - * @memberof google.api.DotnetSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - DotnetSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.DotnetSettings"; - }; - - return DotnetSettings; - })(); - - api.RubySettings = (function() { - - /** - * Properties of a RubySettings. - * @memberof google.api - * @interface IRubySettings - * @property {google.api.ICommonLanguageSettings|null} [common] RubySettings common - */ - - /** - * Constructs a new RubySettings. - * @memberof google.api - * @classdesc Represents a RubySettings. - * @implements IRubySettings - * @constructor - * @param {google.api.IRubySettings=} [properties] Properties to set - */ - function RubySettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * RubySettings common. - * @member {google.api.ICommonLanguageSettings|null|undefined} common - * @memberof google.api.RubySettings - * @instance - */ - RubySettings.prototype.common = null; - - /** - * Creates a new RubySettings instance using the specified properties. - * @function create - * @memberof google.api.RubySettings - * @static - * @param {google.api.IRubySettings=} [properties] Properties to set - * @returns {google.api.RubySettings} RubySettings instance - */ - RubySettings.create = function create(properties) { - return new RubySettings(properties); - }; - - /** - * Encodes the specified RubySettings message. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. - * @function encode - * @memberof google.api.RubySettings - * @static - * @param {google.api.IRubySettings} message RubySettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - RubySettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.common != null && Object.hasOwnProperty.call(message, "common")) - $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified RubySettings message, length delimited. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.RubySettings - * @static - * @param {google.api.IRubySettings} message RubySettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - RubySettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a RubySettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.RubySettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.RubySettings} RubySettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - RubySettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.RubySettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a RubySettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.RubySettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.RubySettings} RubySettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - RubySettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a RubySettings message. - * @function verify - * @memberof google.api.RubySettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - RubySettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.common != null && message.hasOwnProperty("common")) { - var error = $root.google.api.CommonLanguageSettings.verify(message.common); - if (error) - return "common." + error; - } - return null; - }; - - /** - * Creates a RubySettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.RubySettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.RubySettings} RubySettings - */ - RubySettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.RubySettings) - return object; - var message = new $root.google.api.RubySettings(); - if (object.common != null) { - if (typeof object.common !== "object") - throw TypeError(".google.api.RubySettings.common: object expected"); - message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); - } - return message; - }; - - /** - * Creates a plain object from a RubySettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.RubySettings - * @static - * @param {google.api.RubySettings} message RubySettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - RubySettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.common = null; - if (message.common != null && message.hasOwnProperty("common")) - object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); - return object; - }; - - /** - * Converts this RubySettings to JSON. - * @function toJSON - * @memberof google.api.RubySettings - * @instance - * @returns {Object.} JSON object - */ - RubySettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for RubySettings - * @function getTypeUrl - * @memberof google.api.RubySettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - RubySettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.RubySettings"; - }; - - return RubySettings; - })(); - - api.GoSettings = (function() { - - /** - * Properties of a GoSettings. - * @memberof google.api - * @interface IGoSettings - * @property {google.api.ICommonLanguageSettings|null} [common] GoSettings common - */ - - /** - * Constructs a new GoSettings. - * @memberof google.api - * @classdesc Represents a GoSettings. - * @implements IGoSettings - * @constructor - * @param {google.api.IGoSettings=} [properties] Properties to set - */ - function GoSettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * GoSettings common. - * @member {google.api.ICommonLanguageSettings|null|undefined} common - * @memberof google.api.GoSettings - * @instance - */ - GoSettings.prototype.common = null; - - /** - * Creates a new GoSettings instance using the specified properties. - * @function create - * @memberof google.api.GoSettings - * @static - * @param {google.api.IGoSettings=} [properties] Properties to set - * @returns {google.api.GoSettings} GoSettings instance - */ - GoSettings.create = function create(properties) { - return new GoSettings(properties); - }; - - /** - * Encodes the specified GoSettings message. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. - * @function encode - * @memberof google.api.GoSettings - * @static - * @param {google.api.IGoSettings} message GoSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GoSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.common != null && Object.hasOwnProperty.call(message, "common")) - $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified GoSettings message, length delimited. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.GoSettings - * @static - * @param {google.api.IGoSettings} message GoSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - GoSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a GoSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.GoSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.GoSettings} GoSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GoSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.GoSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a GoSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.GoSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.GoSettings} GoSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - GoSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a GoSettings message. - * @function verify - * @memberof google.api.GoSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - GoSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.common != null && message.hasOwnProperty("common")) { - var error = $root.google.api.CommonLanguageSettings.verify(message.common); - if (error) - return "common." + error; - } - return null; - }; - - /** - * Creates a GoSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.GoSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.GoSettings} GoSettings - */ - GoSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.GoSettings) - return object; - var message = new $root.google.api.GoSettings(); - if (object.common != null) { - if (typeof object.common !== "object") - throw TypeError(".google.api.GoSettings.common: object expected"); - message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); - } - return message; - }; - - /** - * Creates a plain object from a GoSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.GoSettings - * @static - * @param {google.api.GoSettings} message GoSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - GoSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.common = null; - if (message.common != null && message.hasOwnProperty("common")) - object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); - return object; - }; - - /** - * Converts this GoSettings to JSON. - * @function toJSON - * @memberof google.api.GoSettings - * @instance - * @returns {Object.} JSON object - */ - GoSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for GoSettings - * @function getTypeUrl - * @memberof google.api.GoSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - GoSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.GoSettings"; - }; - - return GoSettings; - })(); - - api.MethodSettings = (function() { - - /** - * Properties of a MethodSettings. - * @memberof google.api - * @interface IMethodSettings - * @property {string|null} [selector] MethodSettings selector - * @property {google.api.MethodSettings.ILongRunning|null} [longRunning] MethodSettings longRunning - */ - - /** - * Constructs a new MethodSettings. - * @memberof google.api - * @classdesc Represents a MethodSettings. - * @implements IMethodSettings - * @constructor - * @param {google.api.IMethodSettings=} [properties] Properties to set - */ - function MethodSettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * MethodSettings selector. - * @member {string} selector - * @memberof google.api.MethodSettings - * @instance - */ - MethodSettings.prototype.selector = ""; - - /** - * MethodSettings longRunning. - * @member {google.api.MethodSettings.ILongRunning|null|undefined} longRunning - * @memberof google.api.MethodSettings - * @instance - */ - MethodSettings.prototype.longRunning = null; - - /** - * Creates a new MethodSettings instance using the specified properties. - * @function create - * @memberof google.api.MethodSettings - * @static - * @param {google.api.IMethodSettings=} [properties] Properties to set - * @returns {google.api.MethodSettings} MethodSettings instance - */ - MethodSettings.create = function create(properties) { - return new MethodSettings(properties); - }; - - /** - * Encodes the specified MethodSettings message. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. - * @function encode - * @memberof google.api.MethodSettings - * @static - * @param {google.api.IMethodSettings} message MethodSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.selector != null && Object.hasOwnProperty.call(message, "selector")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); - if (message.longRunning != null && Object.hasOwnProperty.call(message, "longRunning")) - $root.google.api.MethodSettings.LongRunning.encode(message.longRunning, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified MethodSettings message, length delimited. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.MethodSettings - * @static - * @param {google.api.IMethodSettings} message MethodSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - MethodSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a MethodSettings message from the specified reader or buffer. - * @function decode - * @memberof google.api.MethodSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.MethodSettings} MethodSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.MethodSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.selector = reader.string(); - break; - } - case 2: { - message.longRunning = $root.google.api.MethodSettings.LongRunning.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a MethodSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.MethodSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.MethodSettings} MethodSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - MethodSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a MethodSettings message. - * @function verify - * @memberof google.api.MethodSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - MethodSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.selector != null && message.hasOwnProperty("selector")) - if (!$util.isString(message.selector)) - return "selector: string expected"; - if (message.longRunning != null && message.hasOwnProperty("longRunning")) { - var error = $root.google.api.MethodSettings.LongRunning.verify(message.longRunning); - if (error) - return "longRunning." + error; - } - return null; - }; - - /** - * Creates a MethodSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.MethodSettings - * @static - * @param {Object.} object Plain object - * @returns {google.api.MethodSettings} MethodSettings - */ - MethodSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.MethodSettings) - return object; - var message = new $root.google.api.MethodSettings(); - if (object.selector != null) - message.selector = String(object.selector); - if (object.longRunning != null) { - if (typeof object.longRunning !== "object") - throw TypeError(".google.api.MethodSettings.longRunning: object expected"); - message.longRunning = $root.google.api.MethodSettings.LongRunning.fromObject(object.longRunning); - } - return message; - }; - - /** - * Creates a plain object from a MethodSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.MethodSettings - * @static - * @param {google.api.MethodSettings} message MethodSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - MethodSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.selector = ""; - object.longRunning = null; - } - if (message.selector != null && message.hasOwnProperty("selector")) - object.selector = message.selector; - if (message.longRunning != null && message.hasOwnProperty("longRunning")) - object.longRunning = $root.google.api.MethodSettings.LongRunning.toObject(message.longRunning, options); - return object; - }; - - /** - * Converts this MethodSettings to JSON. - * @function toJSON - * @memberof google.api.MethodSettings - * @instance - * @returns {Object.} JSON object - */ - MethodSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for MethodSettings - * @function getTypeUrl - * @memberof google.api.MethodSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - MethodSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.MethodSettings"; - }; - - MethodSettings.LongRunning = (function() { - - /** - * Properties of a LongRunning. - * @memberof google.api.MethodSettings - * @interface ILongRunning - * @property {google.protobuf.IDuration|null} [initialPollDelay] LongRunning initialPollDelay - * @property {number|null} [pollDelayMultiplier] LongRunning pollDelayMultiplier - * @property {google.protobuf.IDuration|null} [maxPollDelay] LongRunning maxPollDelay - * @property {google.protobuf.IDuration|null} [totalPollTimeout] LongRunning totalPollTimeout - */ - - /** - * Constructs a new LongRunning. - * @memberof google.api.MethodSettings - * @classdesc Represents a LongRunning. - * @implements ILongRunning - * @constructor - * @param {google.api.MethodSettings.ILongRunning=} [properties] Properties to set - */ - function LongRunning(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } - - /** - * LongRunning initialPollDelay. - * @member {google.protobuf.IDuration|null|undefined} initialPollDelay - * @memberof google.api.MethodSettings.LongRunning - * @instance - */ - LongRunning.prototype.initialPollDelay = null; - - /** - * LongRunning pollDelayMultiplier. - * @member {number} pollDelayMultiplier - * @memberof google.api.MethodSettings.LongRunning - * @instance - */ - LongRunning.prototype.pollDelayMultiplier = 0; - - /** - * LongRunning maxPollDelay. - * @member {google.protobuf.IDuration|null|undefined} maxPollDelay - * @memberof google.api.MethodSettings.LongRunning - * @instance - */ - LongRunning.prototype.maxPollDelay = null; - - /** - * LongRunning totalPollTimeout. - * @member {google.protobuf.IDuration|null|undefined} totalPollTimeout - * @memberof google.api.MethodSettings.LongRunning - * @instance - */ - LongRunning.prototype.totalPollTimeout = null; - - /** - * Creates a new LongRunning instance using the specified properties. - * @function create - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {google.api.MethodSettings.ILongRunning=} [properties] Properties to set - * @returns {google.api.MethodSettings.LongRunning} LongRunning instance - */ - LongRunning.create = function create(properties) { - return new LongRunning(properties); - }; - - /** - * Encodes the specified LongRunning message. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. - * @function encode - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {google.api.MethodSettings.ILongRunning} message LongRunning message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - LongRunning.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.initialPollDelay != null && Object.hasOwnProperty.call(message, "initialPollDelay")) - $root.google.protobuf.Duration.encode(message.initialPollDelay, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); - if (message.pollDelayMultiplier != null && Object.hasOwnProperty.call(message, "pollDelayMultiplier")) - writer.uint32(/* id 2, wireType 5 =*/21).float(message.pollDelayMultiplier); - if (message.maxPollDelay != null && Object.hasOwnProperty.call(message, "maxPollDelay")) - $root.google.protobuf.Duration.encode(message.maxPollDelay, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - if (message.totalPollTimeout != null && Object.hasOwnProperty.call(message, "totalPollTimeout")) - $root.google.protobuf.Duration.encode(message.totalPollTimeout, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - return writer; - }; - - /** - * Encodes the specified LongRunning message, length delimited. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. - * @function encodeDelimited - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {google.api.MethodSettings.ILongRunning} message LongRunning message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - LongRunning.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; - - /** - * Decodes a LongRunning message from the specified reader or buffer. - * @function decode - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.api.MethodSettings.LongRunning} LongRunning - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - LongRunning.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.MethodSettings.LongRunning(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.initialPollDelay = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - } - case 2: { - message.pollDelayMultiplier = reader.float(); - break; - } - case 3: { - message.maxPollDelay = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - } - case 4: { - message.totalPollTimeout = $root.google.protobuf.Duration.decode(reader, reader.uint32()); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; - - /** - * Decodes a LongRunning message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.api.MethodSettings.LongRunning} LongRunning - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - LongRunning.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; - - /** - * Verifies a LongRunning message. - * @function verify - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - LongRunning.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.initialPollDelay != null && message.hasOwnProperty("initialPollDelay")) { - var error = $root.google.protobuf.Duration.verify(message.initialPollDelay); - if (error) - return "initialPollDelay." + error; - } - if (message.pollDelayMultiplier != null && message.hasOwnProperty("pollDelayMultiplier")) - if (typeof message.pollDelayMultiplier !== "number") - return "pollDelayMultiplier: number expected"; - if (message.maxPollDelay != null && message.hasOwnProperty("maxPollDelay")) { - var error = $root.google.protobuf.Duration.verify(message.maxPollDelay); - if (error) - return "maxPollDelay." + error; - } - if (message.totalPollTimeout != null && message.hasOwnProperty("totalPollTimeout")) { - var error = $root.google.protobuf.Duration.verify(message.totalPollTimeout); - if (error) - return "totalPollTimeout." + error; - } - return null; - }; - - /** - * Creates a LongRunning message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {Object.} object Plain object - * @returns {google.api.MethodSettings.LongRunning} LongRunning - */ - LongRunning.fromObject = function fromObject(object) { - if (object instanceof $root.google.api.MethodSettings.LongRunning) - return object; - var message = new $root.google.api.MethodSettings.LongRunning(); - if (object.initialPollDelay != null) { - if (typeof object.initialPollDelay !== "object") - throw TypeError(".google.api.MethodSettings.LongRunning.initialPollDelay: object expected"); - message.initialPollDelay = $root.google.protobuf.Duration.fromObject(object.initialPollDelay); - } - if (object.pollDelayMultiplier != null) - message.pollDelayMultiplier = Number(object.pollDelayMultiplier); - if (object.maxPollDelay != null) { - if (typeof object.maxPollDelay !== "object") - throw TypeError(".google.api.MethodSettings.LongRunning.maxPollDelay: object expected"); - message.maxPollDelay = $root.google.protobuf.Duration.fromObject(object.maxPollDelay); - } - if (object.totalPollTimeout != null) { - if (typeof object.totalPollTimeout !== "object") - throw TypeError(".google.api.MethodSettings.LongRunning.totalPollTimeout: object expected"); - message.totalPollTimeout = $root.google.protobuf.Duration.fromObject(object.totalPollTimeout); - } - return message; - }; - - /** - * Creates a plain object from a LongRunning message. Also converts values to other types if specified. - * @function toObject - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {google.api.MethodSettings.LongRunning} message LongRunning - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - LongRunning.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.initialPollDelay = null; - object.pollDelayMultiplier = 0; - object.maxPollDelay = null; - object.totalPollTimeout = null; - } - if (message.initialPollDelay != null && message.hasOwnProperty("initialPollDelay")) - object.initialPollDelay = $root.google.protobuf.Duration.toObject(message.initialPollDelay, options); - if (message.pollDelayMultiplier != null && message.hasOwnProperty("pollDelayMultiplier")) - object.pollDelayMultiplier = options.json && !isFinite(message.pollDelayMultiplier) ? String(message.pollDelayMultiplier) : message.pollDelayMultiplier; - if (message.maxPollDelay != null && message.hasOwnProperty("maxPollDelay")) - object.maxPollDelay = $root.google.protobuf.Duration.toObject(message.maxPollDelay, options); - if (message.totalPollTimeout != null && message.hasOwnProperty("totalPollTimeout")) - object.totalPollTimeout = $root.google.protobuf.Duration.toObject(message.totalPollTimeout, options); - return object; - }; - - /** - * Converts this LongRunning to JSON. - * @function toJSON - * @memberof google.api.MethodSettings.LongRunning - * @instance - * @returns {Object.} JSON object - */ - LongRunning.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; - - /** - * Gets the default type url for LongRunning - * @function getTypeUrl - * @memberof google.api.MethodSettings.LongRunning - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - LongRunning.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.api.MethodSettings.LongRunning"; - }; - - return LongRunning; - })(); - - return MethodSettings; - })(); - - /** - * ClientLibraryOrganization enum. - * @name google.api.ClientLibraryOrganization - * @enum {number} - * @property {number} CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED=0 CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED value - * @property {number} CLOUD=1 CLOUD value - * @property {number} ADS=2 ADS value - * @property {number} PHOTOS=3 PHOTOS value - * @property {number} STREET_VIEW=4 STREET_VIEW value - */ - api.ClientLibraryOrganization = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED"] = 0; - values[valuesById[1] = "CLOUD"] = 1; - values[valuesById[2] = "ADS"] = 2; - values[valuesById[3] = "PHOTOS"] = 3; - values[valuesById[4] = "STREET_VIEW"] = 4; - return values; - })(); - - /** - * ClientLibraryDestination enum. - * @name google.api.ClientLibraryDestination - * @enum {number} - * @property {number} CLIENT_LIBRARY_DESTINATION_UNSPECIFIED=0 CLIENT_LIBRARY_DESTINATION_UNSPECIFIED value - * @property {number} GITHUB=10 GITHUB value - * @property {number} PACKAGE_MANAGER=20 PACKAGE_MANAGER value - */ - api.ClientLibraryDestination = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED"] = 0; - values[valuesById[10] = "GITHUB"] = 10; - values[valuesById[20] = "PACKAGE_MANAGER"] = 20; - return values; - })(); - - /** - * LaunchStage enum. - * @name google.api.LaunchStage - * @enum {number} - * @property {number} LAUNCH_STAGE_UNSPECIFIED=0 LAUNCH_STAGE_UNSPECIFIED value - * @property {number} UNIMPLEMENTED=6 UNIMPLEMENTED value - * @property {number} PRELAUNCH=7 PRELAUNCH value - * @property {number} EARLY_ACCESS=1 EARLY_ACCESS value - * @property {number} ALPHA=2 ALPHA value - * @property {number} BETA=3 BETA value - * @property {number} GA=4 GA value - * @property {number} DEPRECATED=5 DEPRECATED value - */ - api.LaunchStage = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "LAUNCH_STAGE_UNSPECIFIED"] = 0; - values[valuesById[6] = "UNIMPLEMENTED"] = 6; - values[valuesById[7] = "PRELAUNCH"] = 7; - values[valuesById[1] = "EARLY_ACCESS"] = 1; - values[valuesById[2] = "ALPHA"] = 2; - values[valuesById[3] = "BETA"] = 3; - values[valuesById[4] = "GA"] = 4; - values[valuesById[5] = "DEPRECATED"] = 5; - return values; - })(); - /** * FieldBehavior enum. * @name google.api.FieldBehavior @@ -29883,7 +26274,6 @@ * @property {boolean|null} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor * @property {boolean|null} [deprecated] MessageOptions deprecated * @property {boolean|null} [mapEntry] MessageOptions mapEntry - * @property {boolean|null} [deprecatedLegacyJsonFieldConflicts] MessageOptions deprecatedLegacyJsonFieldConflicts * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource */ @@ -29936,14 +26326,6 @@ */ MessageOptions.prototype.mapEntry = false; - /** - * MessageOptions deprecatedLegacyJsonFieldConflicts. - * @member {boolean} deprecatedLegacyJsonFieldConflicts - * @memberof google.protobuf.MessageOptions - * @instance - */ - MessageOptions.prototype.deprecatedLegacyJsonFieldConflicts = false; - /** * MessageOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -29992,8 +26374,6 @@ writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); if (message.mapEntry != null && Object.hasOwnProperty.call(message, "mapEntry")) writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); - if (message.deprecatedLegacyJsonFieldConflicts != null && Object.hasOwnProperty.call(message, "deprecatedLegacyJsonFieldConflicts")) - writer.uint32(/* id 11, wireType 0 =*/88).bool(message.deprecatedLegacyJsonFieldConflicts); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -30049,10 +26429,6 @@ message.mapEntry = reader.bool(); break; } - case 11: { - message.deprecatedLegacyJsonFieldConflicts = reader.bool(); - break; - } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -30110,9 +26486,6 @@ if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) if (typeof message.mapEntry !== "boolean") return "mapEntry: boolean expected"; - if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) - if (typeof message.deprecatedLegacyJsonFieldConflicts !== "boolean") - return "deprecatedLegacyJsonFieldConflicts: boolean expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -30150,8 +26523,6 @@ message.deprecated = Boolean(object.deprecated); if (object.mapEntry != null) message.mapEntry = Boolean(object.mapEntry); - if (object.deprecatedLegacyJsonFieldConflicts != null) - message.deprecatedLegacyJsonFieldConflicts = Boolean(object.deprecatedLegacyJsonFieldConflicts); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); @@ -30190,7 +26561,6 @@ object.noStandardDescriptorAccessor = false; object.deprecated = false; object.mapEntry = false; - object.deprecatedLegacyJsonFieldConflicts = false; object[".google.api.resource"] = null; } if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) @@ -30201,8 +26571,6 @@ object.deprecated = message.deprecated; if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) object.mapEntry = message.mapEntry; - if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) - object.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -30255,9 +26623,6 @@ * @property {boolean|null} [unverifiedLazy] FieldOptions unverifiedLazy * @property {boolean|null} [deprecated] FieldOptions deprecated * @property {boolean|null} [weak] FieldOptions weak - * @property {boolean|null} [debugRedact] FieldOptions debugRedact - * @property {google.protobuf.FieldOptions.OptionRetention|null} [retention] FieldOptions retention - * @property {google.protobuf.FieldOptions.OptionTargetType|null} [target] FieldOptions target * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference @@ -30336,30 +26701,6 @@ */ FieldOptions.prototype.weak = false; - /** - * FieldOptions debugRedact. - * @member {boolean} debugRedact - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.debugRedact = false; - - /** - * FieldOptions retention. - * @member {google.protobuf.FieldOptions.OptionRetention} retention - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.retention = 0; - - /** - * FieldOptions target. - * @member {google.protobuf.FieldOptions.OptionTargetType} target - * @memberof google.protobuf.FieldOptions - * @instance - */ - FieldOptions.prototype.target = 0; - /** * FieldOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -30422,12 +26763,6 @@ writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); if (message.unverifiedLazy != null && Object.hasOwnProperty.call(message, "unverifiedLazy")) writer.uint32(/* id 15, wireType 0 =*/120).bool(message.unverifiedLazy); - if (message.debugRedact != null && Object.hasOwnProperty.call(message, "debugRedact")) - writer.uint32(/* id 16, wireType 0 =*/128).bool(message.debugRedact); - if (message.retention != null && Object.hasOwnProperty.call(message, "retention")) - writer.uint32(/* id 17, wireType 0 =*/136).int32(message.retention); - if (message.target != null && Object.hasOwnProperty.call(message, "target")) - writer.uint32(/* id 18, wireType 0 =*/144).int32(message.target); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -30501,18 +26836,6 @@ message.weak = reader.bool(); break; } - case 16: { - message.debugRedact = reader.bool(); - break; - } - case 17: { - message.retention = reader.int32(); - break; - } - case 18: { - message.target = reader.int32(); - break; - } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -30602,34 +26925,6 @@ if (message.weak != null && message.hasOwnProperty("weak")) if (typeof message.weak !== "boolean") return "weak: boolean expected"; - if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) - if (typeof message.debugRedact !== "boolean") - return "debugRedact: boolean expected"; - if (message.retention != null && message.hasOwnProperty("retention")) - switch (message.retention) { - default: - return "retention: enum value expected"; - case 0: - case 1: - case 2: - break; - } - if (message.target != null && message.hasOwnProperty("target")) - switch (message.target) { - default: - return "target: enum value expected"; - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - break; - } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -30727,76 +27022,6 @@ message.deprecated = Boolean(object.deprecated); if (object.weak != null) message.weak = Boolean(object.weak); - if (object.debugRedact != null) - message.debugRedact = Boolean(object.debugRedact); - switch (object.retention) { - default: - if (typeof object.retention === "number") { - message.retention = object.retention; - break; - } - break; - case "RETENTION_UNKNOWN": - case 0: - message.retention = 0; - break; - case "RETENTION_RUNTIME": - case 1: - message.retention = 1; - break; - case "RETENTION_SOURCE": - case 2: - message.retention = 2; - break; - } - switch (object.target) { - default: - if (typeof object.target === "number") { - message.target = object.target; - break; - } - break; - case "TARGET_TYPE_UNKNOWN": - case 0: - message.target = 0; - break; - case "TARGET_TYPE_FILE": - case 1: - message.target = 1; - break; - case "TARGET_TYPE_EXTENSION_RANGE": - case 2: - message.target = 2; - break; - case "TARGET_TYPE_MESSAGE": - case 3: - message.target = 3; - break; - case "TARGET_TYPE_FIELD": - case 4: - message.target = 4; - break; - case "TARGET_TYPE_ONEOF": - case 5: - message.target = 5; - break; - case "TARGET_TYPE_ENUM": - case 6: - message.target = 6; - break; - case "TARGET_TYPE_ENUM_ENTRY": - case 7: - message.target = 7; - break; - case "TARGET_TYPE_SERVICE": - case 8: - message.target = 8; - break; - case "TARGET_TYPE_METHOD": - case 9: - message.target = 9; - break; - } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); @@ -30885,9 +27110,6 @@ object.jstype = options.enums === String ? "JS_NORMAL" : 0; object.weak = false; object.unverifiedLazy = false; - object.debugRedact = false; - object.retention = options.enums === String ? "RETENTION_UNKNOWN" : 0; - object.target = options.enums === String ? "TARGET_TYPE_UNKNOWN" : 0; object[".google.api.resourceReference"] = null; } if (message.ctype != null && message.hasOwnProperty("ctype")) @@ -30904,12 +27126,6 @@ object.weak = message.weak; if (message.unverifiedLazy != null && message.hasOwnProperty("unverifiedLazy")) object.unverifiedLazy = message.unverifiedLazy; - if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) - object.debugRedact = message.debugRedact; - if (message.retention != null && message.hasOwnProperty("retention")) - object.retention = options.enums === String ? $root.google.protobuf.FieldOptions.OptionRetention[message.retention] === undefined ? message.retention : $root.google.protobuf.FieldOptions.OptionRetention[message.retention] : message.retention; - if (message.target != null && message.hasOwnProperty("target")) - object.target = options.enums === String ? $root.google.protobuf.FieldOptions.OptionTargetType[message.target] === undefined ? message.target : $root.google.protobuf.FieldOptions.OptionTargetType[message.target] : message.target; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -30983,52 +27199,6 @@ return values; })(); - /** - * OptionRetention enum. - * @name google.protobuf.FieldOptions.OptionRetention - * @enum {number} - * @property {number} RETENTION_UNKNOWN=0 RETENTION_UNKNOWN value - * @property {number} RETENTION_RUNTIME=1 RETENTION_RUNTIME value - * @property {number} RETENTION_SOURCE=2 RETENTION_SOURCE value - */ - FieldOptions.OptionRetention = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "RETENTION_UNKNOWN"] = 0; - values[valuesById[1] = "RETENTION_RUNTIME"] = 1; - values[valuesById[2] = "RETENTION_SOURCE"] = 2; - return values; - })(); - - /** - * OptionTargetType enum. - * @name google.protobuf.FieldOptions.OptionTargetType - * @enum {number} - * @property {number} TARGET_TYPE_UNKNOWN=0 TARGET_TYPE_UNKNOWN value - * @property {number} TARGET_TYPE_FILE=1 TARGET_TYPE_FILE value - * @property {number} TARGET_TYPE_EXTENSION_RANGE=2 TARGET_TYPE_EXTENSION_RANGE value - * @property {number} TARGET_TYPE_MESSAGE=3 TARGET_TYPE_MESSAGE value - * @property {number} TARGET_TYPE_FIELD=4 TARGET_TYPE_FIELD value - * @property {number} TARGET_TYPE_ONEOF=5 TARGET_TYPE_ONEOF value - * @property {number} TARGET_TYPE_ENUM=6 TARGET_TYPE_ENUM value - * @property {number} TARGET_TYPE_ENUM_ENTRY=7 TARGET_TYPE_ENUM_ENTRY value - * @property {number} TARGET_TYPE_SERVICE=8 TARGET_TYPE_SERVICE value - * @property {number} TARGET_TYPE_METHOD=9 TARGET_TYPE_METHOD value - */ - FieldOptions.OptionTargetType = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "TARGET_TYPE_UNKNOWN"] = 0; - values[valuesById[1] = "TARGET_TYPE_FILE"] = 1; - values[valuesById[2] = "TARGET_TYPE_EXTENSION_RANGE"] = 2; - values[valuesById[3] = "TARGET_TYPE_MESSAGE"] = 3; - values[valuesById[4] = "TARGET_TYPE_FIELD"] = 4; - values[valuesById[5] = "TARGET_TYPE_ONEOF"] = 5; - values[valuesById[6] = "TARGET_TYPE_ENUM"] = 6; - values[valuesById[7] = "TARGET_TYPE_ENUM_ENTRY"] = 7; - values[valuesById[8] = "TARGET_TYPE_SERVICE"] = 8; - values[valuesById[9] = "TARGET_TYPE_METHOD"] = 9; - return values; - })(); - return FieldOptions; })(); @@ -31264,7 +27434,6 @@ * @interface IEnumOptions * @property {boolean|null} [allowAlias] EnumOptions allowAlias * @property {boolean|null} [deprecated] EnumOptions deprecated - * @property {boolean|null} [deprecatedLegacyJsonFieldConflicts] EnumOptions deprecatedLegacyJsonFieldConflicts * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption */ @@ -31300,14 +27469,6 @@ */ EnumOptions.prototype.deprecated = false; - /** - * EnumOptions deprecatedLegacyJsonFieldConflicts. - * @member {boolean} deprecatedLegacyJsonFieldConflicts - * @memberof google.protobuf.EnumOptions - * @instance - */ - EnumOptions.prototype.deprecatedLegacyJsonFieldConflicts = false; - /** * EnumOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -31344,8 +27505,6 @@ writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.deprecatedLegacyJsonFieldConflicts != null && Object.hasOwnProperty.call(message, "deprecatedLegacyJsonFieldConflicts")) - writer.uint32(/* id 6, wireType 0 =*/48).bool(message.deprecatedLegacyJsonFieldConflicts); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -31391,10 +27550,6 @@ message.deprecated = reader.bool(); break; } - case 6: { - message.deprecatedLegacyJsonFieldConflicts = reader.bool(); - break; - } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -31442,9 +27597,6 @@ if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; - if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) - if (typeof message.deprecatedLegacyJsonFieldConflicts !== "boolean") - return "deprecatedLegacyJsonFieldConflicts: boolean expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -31473,8 +27625,6 @@ message.allowAlias = Boolean(object.allowAlias); if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); - if (object.deprecatedLegacyJsonFieldConflicts != null) - message.deprecatedLegacyJsonFieldConflicts = Boolean(object.deprecatedLegacyJsonFieldConflicts); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); @@ -31506,14 +27656,11 @@ if (options.defaults) { object.allowAlias = false; object.deprecated = false; - object.deprecatedLegacyJsonFieldConflicts = false; } if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) object.allowAlias = message.allowAlias; if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; - if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) - object.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index d92936908ba..646f8fce888 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2179,248 +2179,6 @@ "id": 1050, "extend": "google.protobuf.ServiceOptions" }, - "CommonLanguageSettings": { - "fields": { - "referenceDocsUri": { - "type": "string", - "id": 1, - "options": { - "deprecated": true - } - }, - "destinations": { - "rule": "repeated", - "type": "ClientLibraryDestination", - "id": 2 - } - } - }, - "ClientLibrarySettings": { - "fields": { - "version": { - "type": "string", - "id": 1 - }, - "launchStage": { - "type": "LaunchStage", - "id": 2 - }, - "restNumericEnums": { - "type": "bool", - "id": 3 - }, - "javaSettings": { - "type": "JavaSettings", - "id": 21 - }, - "cppSettings": { - "type": "CppSettings", - "id": 22 - }, - "phpSettings": { - "type": "PhpSettings", - "id": 23 - }, - "pythonSettings": { - "type": "PythonSettings", - "id": 24 - }, - "nodeSettings": { - "type": "NodeSettings", - "id": 25 - }, - "dotnetSettings": { - "type": "DotnetSettings", - "id": 26 - }, - "rubySettings": { - "type": "RubySettings", - "id": 27 - }, - "goSettings": { - "type": "GoSettings", - "id": 28 - } - } - }, - "Publishing": { - "fields": { - "methodSettings": { - "rule": "repeated", - "type": "MethodSettings", - "id": 2 - }, - "newIssueUri": { - "type": "string", - "id": 101 - }, - "documentationUri": { - "type": "string", - "id": 102 - }, - "apiShortName": { - "type": "string", - "id": 103 - }, - "githubLabel": { - "type": "string", - "id": 104 - }, - "codeownerGithubTeams": { - "rule": "repeated", - "type": "string", - "id": 105 - }, - "docTagPrefix": { - "type": "string", - "id": 106 - }, - "organization": { - "type": "ClientLibraryOrganization", - "id": 107 - }, - "librarySettings": { - "rule": "repeated", - "type": "ClientLibrarySettings", - "id": 109 - } - } - }, - "JavaSettings": { - "fields": { - "libraryPackage": { - "type": "string", - "id": 1 - }, - "serviceClassNames": { - "keyType": "string", - "type": "string", - "id": 2 - }, - "common": { - "type": "CommonLanguageSettings", - "id": 3 - } - } - }, - "CppSettings": { - "fields": { - "common": { - "type": "CommonLanguageSettings", - "id": 1 - } - } - }, - "PhpSettings": { - "fields": { - "common": { - "type": "CommonLanguageSettings", - "id": 1 - } - } - }, - "PythonSettings": { - "fields": { - "common": { - "type": "CommonLanguageSettings", - "id": 1 - } - } - }, - "NodeSettings": { - "fields": { - "common": { - "type": "CommonLanguageSettings", - "id": 1 - } - } - }, - "DotnetSettings": { - "fields": { - "common": { - "type": "CommonLanguageSettings", - "id": 1 - } - } - }, - "RubySettings": { - "fields": { - "common": { - "type": "CommonLanguageSettings", - "id": 1 - } - } - }, - "GoSettings": { - "fields": { - "common": { - "type": "CommonLanguageSettings", - "id": 1 - } - } - }, - "MethodSettings": { - "fields": { - "selector": { - "type": "string", - "id": 1 - }, - "longRunning": { - "type": "LongRunning", - "id": 2 - } - }, - "nested": { - "LongRunning": { - "fields": { - "initialPollDelay": { - "type": "google.protobuf.Duration", - "id": 1 - }, - "pollDelayMultiplier": { - "type": "float", - "id": 2 - }, - "maxPollDelay": { - "type": "google.protobuf.Duration", - "id": 3 - }, - "totalPollTimeout": { - "type": "google.protobuf.Duration", - "id": 4 - } - } - } - } - }, - "ClientLibraryOrganization": { - "values": { - "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED": 0, - "CLOUD": 1, - "ADS": 2, - "PHOTOS": 3, - "STREET_VIEW": 4 - } - }, - "ClientLibraryDestination": { - "values": { - "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED": 0, - "GITHUB": 10, - "PACKAGE_MANAGER": 20 - } - }, - "LaunchStage": { - "values": { - "LAUNCH_STAGE_UNSPECIFIED": 0, - "UNIMPLEMENTED": 6, - "PRELAUNCH": 7, - "EARLY_ACCESS": 1, - "ALPHA": 2, - "BETA": 3, - "GA": 4, - "DEPRECATED": 5 - } - }, "fieldBehavior": { "rule": "repeated", "type": "google.api.FieldBehavior", @@ -3070,13 +2828,6 @@ "type": "bool", "id": 7 }, - "deprecatedLegacyJsonFieldConflicts": { - "type": "bool", - "id": 11, - "options": { - "deprecated": true - } - }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -3160,21 +2911,6 @@ "default": false } }, - "debugRedact": { - "type": "bool", - "id": 16, - "options": { - "default": false - } - }, - "retention": { - "type": "OptionRetention", - "id": 17 - }, - "target": { - "type": "OptionTargetType", - "id": 18 - }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -3207,27 +2943,6 @@ "JS_STRING": 1, "JS_NUMBER": 2 } - }, - "OptionRetention": { - "values": { - "RETENTION_UNKNOWN": 0, - "RETENTION_RUNTIME": 1, - "RETENTION_SOURCE": 2 - } - }, - "OptionTargetType": { - "values": { - "TARGET_TYPE_UNKNOWN": 0, - "TARGET_TYPE_FILE": 1, - "TARGET_TYPE_EXTENSION_RANGE": 2, - "TARGET_TYPE_MESSAGE": 3, - "TARGET_TYPE_FIELD": 4, - "TARGET_TYPE_ONEOF": 5, - "TARGET_TYPE_ENUM": 6, - "TARGET_TYPE_ENUM_ENTRY": 7, - "TARGET_TYPE_SERVICE": 8, - "TARGET_TYPE_METHOD": 9 - } } } }, @@ -3259,13 +2974,6 @@ "default": false } }, - "deprecatedLegacyJsonFieldConflicts": { - "type": "bool", - "id": 6, - "options": { - "deprecated": true - } - }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", diff --git a/handwritten/pubsub/src/debug.ts b/handwritten/pubsub/src/debug.ts index dd8c7963f01..b7856dd4453 100644 --- a/handwritten/pubsub/src/debug.ts +++ b/handwritten/pubsub/src/debug.ts @@ -29,5 +29,8 @@ * may be added or removed at any time, without warning. */ export class DebugMessage { - constructor(public message: string, public error?: Error) {} + constructor( + public message: string, + public error?: Error + ) {} } diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index ea6128be332..87e4184ab5d 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -45,7 +45,7 @@ export interface IamPermissionsMap { export type TestIamPermissionsResponse = [ IamPermissionsMap, - IamProtos.google.iam.v1.ITestIamPermissionsResponse + IamProtos.google.iam.v1.ITestIamPermissionsResponse, ]; export type TestIamPermissionsCallback = ResourceCallback< IamPermissionsMap, @@ -387,10 +387,13 @@ export class IAM { const availablePermissions = arrify(resp!.permissions!); const permissionHash: IamPermissionsMap = ( permissions as string[] - ).reduce((acc, permission) => { - acc[permission] = availablePermissions.indexOf(permission) > -1; - return acc; - }, {} as {[key: string]: boolean}); + ).reduce( + (acc, permission) => { + acc[permission] = availablePermissions.indexOf(permission) > -1; + return acc; + }, + {} as {[key: string]: boolean} + ); callback!(null, permissionHash, resp!); } ); diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 54da4952ca9..1c85b84eaee 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -439,7 +439,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.ITopic | undefined, - {} | undefined + {} | undefined, ] >; createTopic( @@ -477,7 +477,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.ITopic | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -527,7 +527,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IUpdateTopicRequest | undefined, - {} | undefined + {} | undefined, ] >; updateTopic( @@ -565,7 +565,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IUpdateTopicRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -612,7 +612,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.IPublishResponse, protos.google.pubsub.v1.IPublishRequest | undefined, - {} | undefined + {} | undefined, ] >; publish( @@ -650,7 +650,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.IPublishResponse, protos.google.pubsub.v1.IPublishRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -694,7 +694,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IGetTopicRequest | undefined, - {} | undefined + {} | undefined, ] >; getTopic( @@ -732,7 +732,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IGetTopicRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -780,7 +780,7 @@ export class PublisherClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteTopicRequest | undefined, - {} | undefined + {} | undefined, ] >; deleteTopic( @@ -818,7 +818,7 @@ export class PublisherClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteTopicRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -865,7 +865,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.IDetachSubscriptionResponse, protos.google.pubsub.v1.IDetachSubscriptionRequest | undefined, - {} | undefined + {} | undefined, ] >; detachSubscription( @@ -903,7 +903,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.IDetachSubscriptionResponse, protos.google.pubsub.v1.IDetachSubscriptionRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -959,7 +959,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.ITopic[], protos.google.pubsub.v1.IListTopicsRequest | null, - protos.google.pubsub.v1.IListTopicsResponse + protos.google.pubsub.v1.IListTopicsResponse, ] >; listTopics( @@ -997,7 +997,7 @@ export class PublisherClient { [ protos.google.pubsub.v1.ITopic[], protos.google.pubsub.v1.IListTopicsRequest | null, - protos.google.pubsub.v1.IListTopicsResponse + protos.google.pubsub.v1.IListTopicsResponse, ] > | void { request = request || {}; @@ -1147,7 +1147,7 @@ export class PublisherClient { [ string[], protos.google.pubsub.v1.IListTopicSubscriptionsRequest | null, - protos.google.pubsub.v1.IListTopicSubscriptionsResponse + protos.google.pubsub.v1.IListTopicSubscriptionsResponse, ] >; listTopicSubscriptions( @@ -1193,7 +1193,7 @@ export class PublisherClient { [ string[], protos.google.pubsub.v1.IListTopicSubscriptionsRequest | null, - protos.google.pubsub.v1.IListTopicSubscriptionsResponse + protos.google.pubsub.v1.IListTopicSubscriptionsResponse, ] > | void { request = request || {}; @@ -1351,7 +1351,7 @@ export class PublisherClient { [ string[], protos.google.pubsub.v1.IListTopicSnapshotsRequest | null, - protos.google.pubsub.v1.IListTopicSnapshotsResponse + protos.google.pubsub.v1.IListTopicSnapshotsResponse, ] >; listTopicSnapshots( @@ -1391,7 +1391,7 @@ export class PublisherClient { [ string[], protos.google.pubsub.v1.IListTopicSnapshotsRequest | null, - protos.google.pubsub.v1.IListTopicSnapshotsResponse + protos.google.pubsub.v1.IListTopicSnapshotsResponse, ] > | void { request = request || {}; diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 75eff4389cc..2e73791f82e 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -396,7 +396,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICreateSchemaRequest | undefined, - {} | undefined + {} | undefined, ] >; createSchema( @@ -434,7 +434,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICreateSchemaRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -481,7 +481,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IGetSchemaRequest | undefined, - {} | undefined + {} | undefined, ] >; getSchema( @@ -519,7 +519,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IGetSchemaRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -565,7 +565,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICommitSchemaRequest | undefined, - {} | undefined + {} | undefined, ] >; commitSchema( @@ -603,7 +603,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICommitSchemaRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -651,7 +651,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IRollbackSchemaRequest | undefined, - {} | undefined + {} | undefined, ] >; rollbackSchema( @@ -689,7 +689,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IRollbackSchemaRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -739,7 +739,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | undefined, - {} | undefined + {} | undefined, ] >; deleteSchemaRevision( @@ -779,7 +779,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -823,7 +823,7 @@ export class SchemaServiceClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSchemaRequest | undefined, - {} | undefined + {} | undefined, ] >; deleteSchema( @@ -861,7 +861,7 @@ export class SchemaServiceClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSchemaRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -907,7 +907,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.IValidateSchemaResponse, protos.google.pubsub.v1.IValidateSchemaRequest | undefined, - {} | undefined + {} | undefined, ] >; validateSchema( @@ -945,7 +945,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.IValidateSchemaResponse, protos.google.pubsub.v1.IValidateSchemaRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -999,7 +999,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.IValidateMessageResponse, protos.google.pubsub.v1.IValidateMessageRequest | undefined, - {} | undefined + {} | undefined, ] >; validateMessage( @@ -1037,7 +1037,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.IValidateMessageResponse, protos.google.pubsub.v1.IValidateMessageRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1097,7 +1097,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema[], protos.google.pubsub.v1.IListSchemasRequest | null, - protos.google.pubsub.v1.IListSchemasResponse + protos.google.pubsub.v1.IListSchemasResponse, ] >; listSchemas( @@ -1135,7 +1135,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema[], protos.google.pubsub.v1.IListSchemasRequest | null, - protos.google.pubsub.v1.IListSchemasResponse + protos.google.pubsub.v1.IListSchemasResponse, ] > | void { request = request || {}; @@ -1295,7 +1295,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema[], protos.google.pubsub.v1.IListSchemaRevisionsRequest | null, - protos.google.pubsub.v1.IListSchemaRevisionsResponse + protos.google.pubsub.v1.IListSchemaRevisionsResponse, ] >; listSchemaRevisions( @@ -1335,7 +1335,7 @@ export class SchemaServiceClient { [ protos.google.pubsub.v1.ISchema[], protos.google.pubsub.v1.IListSchemaRevisionsRequest | null, - protos.google.pubsub.v1.IListSchemaRevisionsResponse + protos.google.pubsub.v1.IListSchemaRevisionsResponse, ] > | void { request = request || {}; diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 3fbaaf60c4b..2ac21d3e50f 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -545,7 +545,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.ISubscription | undefined, - {} | undefined + {} | undefined, ] >; createSubscription( @@ -583,7 +583,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.ISubscription | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -627,7 +627,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IGetSubscriptionRequest | undefined, - {} | undefined + {} | undefined, ] >; getSubscription( @@ -665,7 +665,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IGetSubscriptionRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -712,7 +712,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IUpdateSubscriptionRequest | undefined, - {} | undefined + {} | undefined, ] >; updateSubscription( @@ -750,7 +750,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IUpdateSubscriptionRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -798,7 +798,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSubscriptionRequest | undefined, - {} | undefined + {} | undefined, ] >; deleteSubscription( @@ -836,7 +836,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSubscriptionRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -895,7 +895,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyAckDeadlineRequest | undefined, - {} | undefined + {} | undefined, ] >; modifyAckDeadline( @@ -933,7 +933,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyAckDeadlineRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -987,7 +987,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IAcknowledgeRequest | undefined, - {} | undefined + {} | undefined, ] >; acknowledge( @@ -1025,7 +1025,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IAcknowledgeRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1081,7 +1081,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.IPullResponse, protos.google.pubsub.v1.IPullRequest | undefined, - {} | undefined + {} | undefined, ] >; pull( @@ -1119,7 +1119,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.IPullResponse, protos.google.pubsub.v1.IPullRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1175,7 +1175,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyPushConfigRequest | undefined, - {} | undefined + {} | undefined, ] >; modifyPushConfig( @@ -1213,7 +1213,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyPushConfigRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1261,7 +1261,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IGetSnapshotRequest | undefined, - {} | undefined + {} | undefined, ] >; getSnapshot( @@ -1299,7 +1299,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IGetSnapshotRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1375,7 +1375,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.ICreateSnapshotRequest | undefined, - {} | undefined + {} | undefined, ] >; createSnapshot( @@ -1413,7 +1413,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.ICreateSnapshotRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1463,7 +1463,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IUpdateSnapshotRequest | undefined, - {} | undefined + {} | undefined, ] >; updateSnapshot( @@ -1501,7 +1501,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IUpdateSnapshotRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1553,7 +1553,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSnapshotRequest | undefined, - {} | undefined + {} | undefined, ] >; deleteSnapshot( @@ -1591,7 +1591,7 @@ export class SubscriberClient { [ protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSnapshotRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1656,7 +1656,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISeekResponse, protos.google.pubsub.v1.ISeekRequest | undefined, - {} | undefined + {} | undefined, ] >; seek( @@ -1694,7 +1694,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISeekResponse, protos.google.pubsub.v1.ISeekRequest | undefined, - {} | undefined + {} | undefined, ] > | void { request = request || {}; @@ -1774,7 +1774,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISubscription[], protos.google.pubsub.v1.IListSubscriptionsRequest | null, - protos.google.pubsub.v1.IListSubscriptionsResponse + protos.google.pubsub.v1.IListSubscriptionsResponse, ] >; listSubscriptions( @@ -1812,7 +1812,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISubscription[], protos.google.pubsub.v1.IListSubscriptionsRequest | null, - protos.google.pubsub.v1.IListSubscriptionsResponse + protos.google.pubsub.v1.IListSubscriptionsResponse, ] > | void { request = request || {}; @@ -1966,7 +1966,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISnapshot[], protos.google.pubsub.v1.IListSnapshotsRequest | null, - protos.google.pubsub.v1.IListSnapshotsResponse + protos.google.pubsub.v1.IListSnapshotsResponse, ] >; listSnapshots( @@ -2004,7 +2004,7 @@ export class SubscriberClient { [ protos.google.pubsub.v1.ISnapshot[], protos.google.pubsub.v1.IListSnapshotsRequest | null, - protos.google.pubsub.v1.IListSnapshotsResponse + protos.google.pubsub.v1.IListSnapshotsResponse, ] > | void { request = request || {}; diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 55fff7aad11..6fe7f829fd7 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -115,14 +115,14 @@ function allSettled( ({ status: 'fulfilled', value, - } as AllSettledResult) + }) as AllSettledResult ) .catch( (error: U) => ({ status: 'rejected', reason: error, - } as AllSettledResult) + }) as AllSettledResult ) ); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index dcf8c0bba6c..c90835c1a17 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -81,6 +81,7 @@ class FakeSubscriber extends EventEmitter { super(); // eslint-disable-next-line prefer-rest-params this.calledWith_ = arguments; + // eslint-disable-next-line @typescript-eslint/no-this-alias subscriber = this; } open(): void { From 451c096c7a4a47379beea8556f166645cb7d0ed3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 17:00:39 -0400 Subject: [PATCH 0944/1115] fix: fix typings for IAM methods (#1785) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: fix typings for IAM methods docs: fixed links in the generated Markdown documentation PiperOrigin-RevId: 551610576 Source-Link: https://github.com/googleapis/googleapis/commit/73b1313cbd1fd0cc1e22684bc89ee1b1a416cfe0 Source-Link: https://github.com/googleapis/googleapis-gen/commit/8bec066492a6da2855b1b8ce562664c0a6b30b01 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGJlYzA2NjQ5MmE2ZGEyODU1YjFiOGNlNTYyNjY0YzBhNmIzMGIwMSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/protos/protos.d.ts | 1493 +++++++ handwritten/pubsub/protos/protos.js | 3853 +++++++++++++++++ handwritten/pubsub/protos/protos.json | 292 ++ handwritten/pubsub/src/v1/publisher_client.ts | 75 +- .../pubsub/src/v1/schema_service_client.ts | 80 +- .../pubsub/src/v1/subscriber_client.ts | 112 +- 6 files changed, 5744 insertions(+), 161 deletions(-) diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index e466657f602..443f61fb3b8 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -8656,6 +8656,1448 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + /** Properties of a CommonLanguageSettings. */ + interface ICommonLanguageSettings { + + /** CommonLanguageSettings referenceDocsUri */ + referenceDocsUri?: (string|null); + + /** CommonLanguageSettings destinations */ + destinations?: (google.api.ClientLibraryDestination[]|null); + } + + /** Represents a CommonLanguageSettings. */ + class CommonLanguageSettings implements ICommonLanguageSettings { + + /** + * Constructs a new CommonLanguageSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ICommonLanguageSettings); + + /** CommonLanguageSettings referenceDocsUri. */ + public referenceDocsUri: string; + + /** CommonLanguageSettings destinations. */ + public destinations: google.api.ClientLibraryDestination[]; + + /** + * Creates a new CommonLanguageSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns CommonLanguageSettings instance + */ + public static create(properties?: google.api.ICommonLanguageSettings): google.api.CommonLanguageSettings; + + /** + * Encodes the specified CommonLanguageSettings message. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. + * @param message CommonLanguageSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ICommonLanguageSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CommonLanguageSettings message, length delimited. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. + * @param message CommonLanguageSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ICommonLanguageSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CommonLanguageSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CommonLanguageSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CommonLanguageSettings; + + /** + * Decodes a CommonLanguageSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CommonLanguageSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CommonLanguageSettings; + + /** + * Verifies a CommonLanguageSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CommonLanguageSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CommonLanguageSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.CommonLanguageSettings; + + /** + * Creates a plain object from a CommonLanguageSettings message. Also converts values to other types if specified. + * @param message CommonLanguageSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.CommonLanguageSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CommonLanguageSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CommonLanguageSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a ClientLibrarySettings. */ + interface IClientLibrarySettings { + + /** ClientLibrarySettings version */ + version?: (string|null); + + /** ClientLibrarySettings launchStage */ + launchStage?: (google.api.LaunchStage|keyof typeof google.api.LaunchStage|null); + + /** ClientLibrarySettings restNumericEnums */ + restNumericEnums?: (boolean|null); + + /** ClientLibrarySettings javaSettings */ + javaSettings?: (google.api.IJavaSettings|null); + + /** ClientLibrarySettings cppSettings */ + cppSettings?: (google.api.ICppSettings|null); + + /** ClientLibrarySettings phpSettings */ + phpSettings?: (google.api.IPhpSettings|null); + + /** ClientLibrarySettings pythonSettings */ + pythonSettings?: (google.api.IPythonSettings|null); + + /** ClientLibrarySettings nodeSettings */ + nodeSettings?: (google.api.INodeSettings|null); + + /** ClientLibrarySettings dotnetSettings */ + dotnetSettings?: (google.api.IDotnetSettings|null); + + /** ClientLibrarySettings rubySettings */ + rubySettings?: (google.api.IRubySettings|null); + + /** ClientLibrarySettings goSettings */ + goSettings?: (google.api.IGoSettings|null); + } + + /** Represents a ClientLibrarySettings. */ + class ClientLibrarySettings implements IClientLibrarySettings { + + /** + * Constructs a new ClientLibrarySettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IClientLibrarySettings); + + /** ClientLibrarySettings version. */ + public version: string; + + /** ClientLibrarySettings launchStage. */ + public launchStage: (google.api.LaunchStage|keyof typeof google.api.LaunchStage); + + /** ClientLibrarySettings restNumericEnums. */ + public restNumericEnums: boolean; + + /** ClientLibrarySettings javaSettings. */ + public javaSettings?: (google.api.IJavaSettings|null); + + /** ClientLibrarySettings cppSettings. */ + public cppSettings?: (google.api.ICppSettings|null); + + /** ClientLibrarySettings phpSettings. */ + public phpSettings?: (google.api.IPhpSettings|null); + + /** ClientLibrarySettings pythonSettings. */ + public pythonSettings?: (google.api.IPythonSettings|null); + + /** ClientLibrarySettings nodeSettings. */ + public nodeSettings?: (google.api.INodeSettings|null); + + /** ClientLibrarySettings dotnetSettings. */ + public dotnetSettings?: (google.api.IDotnetSettings|null); + + /** ClientLibrarySettings rubySettings. */ + public rubySettings?: (google.api.IRubySettings|null); + + /** ClientLibrarySettings goSettings. */ + public goSettings?: (google.api.IGoSettings|null); + + /** + * Creates a new ClientLibrarySettings instance using the specified properties. + * @param [properties] Properties to set + * @returns ClientLibrarySettings instance + */ + public static create(properties?: google.api.IClientLibrarySettings): google.api.ClientLibrarySettings; + + /** + * Encodes the specified ClientLibrarySettings message. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. + * @param message ClientLibrarySettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IClientLibrarySettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ClientLibrarySettings message, length delimited. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. + * @param message ClientLibrarySettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IClientLibrarySettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ClientLibrarySettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ClientLibrarySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.ClientLibrarySettings; + + /** + * Decodes a ClientLibrarySettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ClientLibrarySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.ClientLibrarySettings; + + /** + * Verifies a ClientLibrarySettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ClientLibrarySettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ClientLibrarySettings + */ + public static fromObject(object: { [k: string]: any }): google.api.ClientLibrarySettings; + + /** + * Creates a plain object from a ClientLibrarySettings message. Also converts values to other types if specified. + * @param message ClientLibrarySettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.ClientLibrarySettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ClientLibrarySettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ClientLibrarySettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a Publishing. */ + interface IPublishing { + + /** Publishing methodSettings */ + methodSettings?: (google.api.IMethodSettings[]|null); + + /** Publishing newIssueUri */ + newIssueUri?: (string|null); + + /** Publishing documentationUri */ + documentationUri?: (string|null); + + /** Publishing apiShortName */ + apiShortName?: (string|null); + + /** Publishing githubLabel */ + githubLabel?: (string|null); + + /** Publishing codeownerGithubTeams */ + codeownerGithubTeams?: (string[]|null); + + /** Publishing docTagPrefix */ + docTagPrefix?: (string|null); + + /** Publishing organization */ + organization?: (google.api.ClientLibraryOrganization|keyof typeof google.api.ClientLibraryOrganization|null); + + /** Publishing librarySettings */ + librarySettings?: (google.api.IClientLibrarySettings[]|null); + } + + /** Represents a Publishing. */ + class Publishing implements IPublishing { + + /** + * Constructs a new Publishing. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IPublishing); + + /** Publishing methodSettings. */ + public methodSettings: google.api.IMethodSettings[]; + + /** Publishing newIssueUri. */ + public newIssueUri: string; + + /** Publishing documentationUri. */ + public documentationUri: string; + + /** Publishing apiShortName. */ + public apiShortName: string; + + /** Publishing githubLabel. */ + public githubLabel: string; + + /** Publishing codeownerGithubTeams. */ + public codeownerGithubTeams: string[]; + + /** Publishing docTagPrefix. */ + public docTagPrefix: string; + + /** Publishing organization. */ + public organization: (google.api.ClientLibraryOrganization|keyof typeof google.api.ClientLibraryOrganization); + + /** Publishing librarySettings. */ + public librarySettings: google.api.IClientLibrarySettings[]; + + /** + * Creates a new Publishing instance using the specified properties. + * @param [properties] Properties to set + * @returns Publishing instance + */ + public static create(properties?: google.api.IPublishing): google.api.Publishing; + + /** + * Encodes the specified Publishing message. Does not implicitly {@link google.api.Publishing.verify|verify} messages. + * @param message Publishing message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IPublishing, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Publishing message, length delimited. Does not implicitly {@link google.api.Publishing.verify|verify} messages. + * @param message Publishing message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IPublishing, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Publishing message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Publishing + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.Publishing; + + /** + * Decodes a Publishing message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Publishing + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.Publishing; + + /** + * Verifies a Publishing message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Publishing message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Publishing + */ + public static fromObject(object: { [k: string]: any }): google.api.Publishing; + + /** + * Creates a plain object from a Publishing message. Also converts values to other types if specified. + * @param message Publishing + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.Publishing, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Publishing to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Publishing + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a JavaSettings. */ + interface IJavaSettings { + + /** JavaSettings libraryPackage */ + libraryPackage?: (string|null); + + /** JavaSettings serviceClassNames */ + serviceClassNames?: ({ [k: string]: string }|null); + + /** JavaSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a JavaSettings. */ + class JavaSettings implements IJavaSettings { + + /** + * Constructs a new JavaSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IJavaSettings); + + /** JavaSettings libraryPackage. */ + public libraryPackage: string; + + /** JavaSettings serviceClassNames. */ + public serviceClassNames: { [k: string]: string }; + + /** JavaSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new JavaSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns JavaSettings instance + */ + public static create(properties?: google.api.IJavaSettings): google.api.JavaSettings; + + /** + * Encodes the specified JavaSettings message. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. + * @param message JavaSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IJavaSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified JavaSettings message, length delimited. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. + * @param message JavaSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IJavaSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a JavaSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns JavaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.JavaSettings; + + /** + * Decodes a JavaSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns JavaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.JavaSettings; + + /** + * Verifies a JavaSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a JavaSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns JavaSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.JavaSettings; + + /** + * Creates a plain object from a JavaSettings message. Also converts values to other types if specified. + * @param message JavaSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.JavaSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this JavaSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for JavaSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a CppSettings. */ + interface ICppSettings { + + /** CppSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a CppSettings. */ + class CppSettings implements ICppSettings { + + /** + * Constructs a new CppSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ICppSettings); + + /** CppSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new CppSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns CppSettings instance + */ + public static create(properties?: google.api.ICppSettings): google.api.CppSettings; + + /** + * Encodes the specified CppSettings message. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. + * @param message CppSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ICppSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CppSettings message, length delimited. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. + * @param message CppSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ICppSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CppSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CppSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.CppSettings; + + /** + * Decodes a CppSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CppSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.CppSettings; + + /** + * Verifies a CppSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CppSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CppSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.CppSettings; + + /** + * Creates a plain object from a CppSettings message. Also converts values to other types if specified. + * @param message CppSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.CppSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CppSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CppSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a PhpSettings. */ + interface IPhpSettings { + + /** PhpSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a PhpSettings. */ + class PhpSettings implements IPhpSettings { + + /** + * Constructs a new PhpSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IPhpSettings); + + /** PhpSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new PhpSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns PhpSettings instance + */ + public static create(properties?: google.api.IPhpSettings): google.api.PhpSettings; + + /** + * Encodes the specified PhpSettings message. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. + * @param message PhpSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IPhpSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PhpSettings message, length delimited. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. + * @param message PhpSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IPhpSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PhpSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PhpSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.PhpSettings; + + /** + * Decodes a PhpSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PhpSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.PhpSettings; + + /** + * Verifies a PhpSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PhpSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PhpSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.PhpSettings; + + /** + * Creates a plain object from a PhpSettings message. Also converts values to other types if specified. + * @param message PhpSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.PhpSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PhpSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PhpSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a PythonSettings. */ + interface IPythonSettings { + + /** PythonSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a PythonSettings. */ + class PythonSettings implements IPythonSettings { + + /** + * Constructs a new PythonSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IPythonSettings); + + /** PythonSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new PythonSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns PythonSettings instance + */ + public static create(properties?: google.api.IPythonSettings): google.api.PythonSettings; + + /** + * Encodes the specified PythonSettings message. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. + * @param message PythonSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IPythonSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PythonSettings message, length delimited. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. + * @param message PythonSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IPythonSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PythonSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PythonSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.PythonSettings; + + /** + * Decodes a PythonSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PythonSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.PythonSettings; + + /** + * Verifies a PythonSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PythonSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PythonSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.PythonSettings; + + /** + * Creates a plain object from a PythonSettings message. Also converts values to other types if specified. + * @param message PythonSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.PythonSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PythonSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PythonSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a NodeSettings. */ + interface INodeSettings { + + /** NodeSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a NodeSettings. */ + class NodeSettings implements INodeSettings { + + /** + * Constructs a new NodeSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.INodeSettings); + + /** NodeSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new NodeSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns NodeSettings instance + */ + public static create(properties?: google.api.INodeSettings): google.api.NodeSettings; + + /** + * Encodes the specified NodeSettings message. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. + * @param message NodeSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.INodeSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified NodeSettings message, length delimited. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. + * @param message NodeSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.INodeSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a NodeSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns NodeSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.NodeSettings; + + /** + * Decodes a NodeSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns NodeSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.NodeSettings; + + /** + * Verifies a NodeSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a NodeSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns NodeSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.NodeSettings; + + /** + * Creates a plain object from a NodeSettings message. Also converts values to other types if specified. + * @param message NodeSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.NodeSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this NodeSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for NodeSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a DotnetSettings. */ + interface IDotnetSettings { + + /** DotnetSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a DotnetSettings. */ + class DotnetSettings implements IDotnetSettings { + + /** + * Constructs a new DotnetSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IDotnetSettings); + + /** DotnetSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new DotnetSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns DotnetSettings instance + */ + public static create(properties?: google.api.IDotnetSettings): google.api.DotnetSettings; + + /** + * Encodes the specified DotnetSettings message. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. + * @param message DotnetSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IDotnetSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified DotnetSettings message, length delimited. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. + * @param message DotnetSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IDotnetSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a DotnetSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns DotnetSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.DotnetSettings; + + /** + * Decodes a DotnetSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns DotnetSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.DotnetSettings; + + /** + * Verifies a DotnetSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a DotnetSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns DotnetSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.DotnetSettings; + + /** + * Creates a plain object from a DotnetSettings message. Also converts values to other types if specified. + * @param message DotnetSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.DotnetSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this DotnetSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for DotnetSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a RubySettings. */ + interface IRubySettings { + + /** RubySettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a RubySettings. */ + class RubySettings implements IRubySettings { + + /** + * Constructs a new RubySettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IRubySettings); + + /** RubySettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new RubySettings instance using the specified properties. + * @param [properties] Properties to set + * @returns RubySettings instance + */ + public static create(properties?: google.api.IRubySettings): google.api.RubySettings; + + /** + * Encodes the specified RubySettings message. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. + * @param message RubySettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IRubySettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified RubySettings message, length delimited. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. + * @param message RubySettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IRubySettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a RubySettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns RubySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.RubySettings; + + /** + * Decodes a RubySettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns RubySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.RubySettings; + + /** + * Verifies a RubySettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a RubySettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns RubySettings + */ + public static fromObject(object: { [k: string]: any }): google.api.RubySettings; + + /** + * Creates a plain object from a RubySettings message. Also converts values to other types if specified. + * @param message RubySettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.RubySettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this RubySettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for RubySettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a GoSettings. */ + interface IGoSettings { + + /** GoSettings common */ + common?: (google.api.ICommonLanguageSettings|null); + } + + /** Represents a GoSettings. */ + class GoSettings implements IGoSettings { + + /** + * Constructs a new GoSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IGoSettings); + + /** GoSettings common. */ + public common?: (google.api.ICommonLanguageSettings|null); + + /** + * Creates a new GoSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns GoSettings instance + */ + public static create(properties?: google.api.IGoSettings): google.api.GoSettings; + + /** + * Encodes the specified GoSettings message. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. + * @param message GoSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IGoSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified GoSettings message, length delimited. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. + * @param message GoSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IGoSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a GoSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns GoSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.GoSettings; + + /** + * Decodes a GoSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns GoSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.GoSettings; + + /** + * Verifies a GoSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a GoSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns GoSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.GoSettings; + + /** + * Creates a plain object from a GoSettings message. Also converts values to other types if specified. + * @param message GoSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.GoSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this GoSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for GoSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a MethodSettings. */ + interface IMethodSettings { + + /** MethodSettings selector */ + selector?: (string|null); + + /** MethodSettings longRunning */ + longRunning?: (google.api.MethodSettings.ILongRunning|null); + } + + /** Represents a MethodSettings. */ + class MethodSettings implements IMethodSettings { + + /** + * Constructs a new MethodSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.IMethodSettings); + + /** MethodSettings selector. */ + public selector: string; + + /** MethodSettings longRunning. */ + public longRunning?: (google.api.MethodSettings.ILongRunning|null); + + /** + * Creates a new MethodSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns MethodSettings instance + */ + public static create(properties?: google.api.IMethodSettings): google.api.MethodSettings; + + /** + * Encodes the specified MethodSettings message. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. + * @param message MethodSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.IMethodSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MethodSettings message, length delimited. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. + * @param message MethodSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.IMethodSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MethodSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MethodSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.MethodSettings; + + /** + * Decodes a MethodSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MethodSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.MethodSettings; + + /** + * Verifies a MethodSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MethodSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MethodSettings + */ + public static fromObject(object: { [k: string]: any }): google.api.MethodSettings; + + /** + * Creates a plain object from a MethodSettings message. Also converts values to other types if specified. + * @param message MethodSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.MethodSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MethodSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for MethodSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace MethodSettings { + + /** Properties of a LongRunning. */ + interface ILongRunning { + + /** LongRunning initialPollDelay */ + initialPollDelay?: (google.protobuf.IDuration|null); + + /** LongRunning pollDelayMultiplier */ + pollDelayMultiplier?: (number|null); + + /** LongRunning maxPollDelay */ + maxPollDelay?: (google.protobuf.IDuration|null); + + /** LongRunning totalPollTimeout */ + totalPollTimeout?: (google.protobuf.IDuration|null); + } + + /** Represents a LongRunning. */ + class LongRunning implements ILongRunning { + + /** + * Constructs a new LongRunning. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.MethodSettings.ILongRunning); + + /** LongRunning initialPollDelay. */ + public initialPollDelay?: (google.protobuf.IDuration|null); + + /** LongRunning pollDelayMultiplier. */ + public pollDelayMultiplier: number; + + /** LongRunning maxPollDelay. */ + public maxPollDelay?: (google.protobuf.IDuration|null); + + /** LongRunning totalPollTimeout. */ + public totalPollTimeout?: (google.protobuf.IDuration|null); + + /** + * Creates a new LongRunning instance using the specified properties. + * @param [properties] Properties to set + * @returns LongRunning instance + */ + public static create(properties?: google.api.MethodSettings.ILongRunning): google.api.MethodSettings.LongRunning; + + /** + * Encodes the specified LongRunning message. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. + * @param message LongRunning message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.MethodSettings.ILongRunning, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified LongRunning message, length delimited. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. + * @param message LongRunning message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.MethodSettings.ILongRunning, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a LongRunning message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns LongRunning + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.MethodSettings.LongRunning; + + /** + * Decodes a LongRunning message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns LongRunning + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.MethodSettings.LongRunning; + + /** + * Verifies a LongRunning message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a LongRunning message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns LongRunning + */ + public static fromObject(object: { [k: string]: any }): google.api.MethodSettings.LongRunning; + + /** + * Creates a plain object from a LongRunning message. Also converts values to other types if specified. + * @param message LongRunning + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.MethodSettings.LongRunning, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this LongRunning to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for LongRunning + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + } + + /** ClientLibraryOrganization enum. */ + enum ClientLibraryOrganization { + CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED = 0, + CLOUD = 1, + ADS = 2, + PHOTOS = 3, + STREET_VIEW = 4 + } + + /** ClientLibraryDestination enum. */ + enum ClientLibraryDestination { + CLIENT_LIBRARY_DESTINATION_UNSPECIFIED = 0, + GITHUB = 10, + PACKAGE_MANAGER = 20 + } + + /** LaunchStage enum. */ + enum LaunchStage { + LAUNCH_STAGE_UNSPECIFIED = 0, + UNIMPLEMENTED = 6, + PRELAUNCH = 7, + EARLY_ACCESS = 1, + ALPHA = 2, + BETA = 3, + GA = 4, + DEPRECATED = 5 + } + /** FieldBehavior enum. */ enum FieldBehavior { FIELD_BEHAVIOR_UNSPECIFIED = 0, @@ -10762,6 +12204,9 @@ export namespace google { /** MessageOptions mapEntry */ mapEntry?: (boolean|null); + /** MessageOptions deprecatedLegacyJsonFieldConflicts */ + deprecatedLegacyJsonFieldConflicts?: (boolean|null); + /** MessageOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -10790,6 +12235,9 @@ export namespace google { /** MessageOptions mapEntry. */ public mapEntry: boolean; + /** MessageOptions deprecatedLegacyJsonFieldConflicts. */ + public deprecatedLegacyJsonFieldConflicts: boolean; + /** MessageOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -10895,6 +12343,15 @@ export namespace google { /** FieldOptions weak */ weak?: (boolean|null); + /** FieldOptions debugRedact */ + debugRedact?: (boolean|null); + + /** FieldOptions retention */ + retention?: (google.protobuf.FieldOptions.OptionRetention|keyof typeof google.protobuf.FieldOptions.OptionRetention|null); + + /** FieldOptions target */ + target?: (google.protobuf.FieldOptions.OptionTargetType|keyof typeof google.protobuf.FieldOptions.OptionTargetType|null); + /** FieldOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -10935,6 +12392,15 @@ export namespace google { /** FieldOptions weak. */ public weak: boolean; + /** FieldOptions debugRedact. */ + public debugRedact: boolean; + + /** FieldOptions retention. */ + public retention: (google.protobuf.FieldOptions.OptionRetention|keyof typeof google.protobuf.FieldOptions.OptionRetention); + + /** FieldOptions target. */ + public target: (google.protobuf.FieldOptions.OptionTargetType|keyof typeof google.protobuf.FieldOptions.OptionTargetType); + /** FieldOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -11031,6 +12497,27 @@ export namespace google { JS_STRING = 1, JS_NUMBER = 2 } + + /** OptionRetention enum. */ + enum OptionRetention { + RETENTION_UNKNOWN = 0, + RETENTION_RUNTIME = 1, + RETENTION_SOURCE = 2 + } + + /** OptionTargetType enum. */ + enum OptionTargetType { + TARGET_TYPE_UNKNOWN = 0, + TARGET_TYPE_FILE = 1, + TARGET_TYPE_EXTENSION_RANGE = 2, + TARGET_TYPE_MESSAGE = 3, + TARGET_TYPE_FIELD = 4, + TARGET_TYPE_ONEOF = 5, + TARGET_TYPE_ENUM = 6, + TARGET_TYPE_ENUM_ENTRY = 7, + TARGET_TYPE_SERVICE = 8, + TARGET_TYPE_METHOD = 9 + } } /** Properties of an OneofOptions. */ @@ -11139,6 +12626,9 @@ export namespace google { /** EnumOptions deprecated */ deprecated?: (boolean|null); + /** EnumOptions deprecatedLegacyJsonFieldConflicts */ + deprecatedLegacyJsonFieldConflicts?: (boolean|null); + /** EnumOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -11158,6 +12648,9 @@ export namespace google { /** EnumOptions deprecated. */ public deprecated: boolean; + /** EnumOptions deprecatedLegacyJsonFieldConflicts. */ + public deprecatedLegacyJsonFieldConflicts: boolean; + /** EnumOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 12b95492de7..2495a560e15 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -20326,6 +20326,3615 @@ return CustomHttpPattern; })(); + api.CommonLanguageSettings = (function() { + + /** + * Properties of a CommonLanguageSettings. + * @memberof google.api + * @interface ICommonLanguageSettings + * @property {string|null} [referenceDocsUri] CommonLanguageSettings referenceDocsUri + * @property {Array.|null} [destinations] CommonLanguageSettings destinations + */ + + /** + * Constructs a new CommonLanguageSettings. + * @memberof google.api + * @classdesc Represents a CommonLanguageSettings. + * @implements ICommonLanguageSettings + * @constructor + * @param {google.api.ICommonLanguageSettings=} [properties] Properties to set + */ + function CommonLanguageSettings(properties) { + this.destinations = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CommonLanguageSettings referenceDocsUri. + * @member {string} referenceDocsUri + * @memberof google.api.CommonLanguageSettings + * @instance + */ + CommonLanguageSettings.prototype.referenceDocsUri = ""; + + /** + * CommonLanguageSettings destinations. + * @member {Array.} destinations + * @memberof google.api.CommonLanguageSettings + * @instance + */ + CommonLanguageSettings.prototype.destinations = $util.emptyArray; + + /** + * Creates a new CommonLanguageSettings instance using the specified properties. + * @function create + * @memberof google.api.CommonLanguageSettings + * @static + * @param {google.api.ICommonLanguageSettings=} [properties] Properties to set + * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings instance + */ + CommonLanguageSettings.create = function create(properties) { + return new CommonLanguageSettings(properties); + }; + + /** + * Encodes the specified CommonLanguageSettings message. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. + * @function encode + * @memberof google.api.CommonLanguageSettings + * @static + * @param {google.api.ICommonLanguageSettings} message CommonLanguageSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CommonLanguageSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.referenceDocsUri != null && Object.hasOwnProperty.call(message, "referenceDocsUri")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.referenceDocsUri); + if (message.destinations != null && message.destinations.length) { + writer.uint32(/* id 2, wireType 2 =*/18).fork(); + for (var i = 0; i < message.destinations.length; ++i) + writer.int32(message.destinations[i]); + writer.ldelim(); + } + return writer; + }; + + /** + * Encodes the specified CommonLanguageSettings message, length delimited. Does not implicitly {@link google.api.CommonLanguageSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.CommonLanguageSettings + * @static + * @param {google.api.ICommonLanguageSettings} message CommonLanguageSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CommonLanguageSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CommonLanguageSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.CommonLanguageSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CommonLanguageSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CommonLanguageSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.referenceDocsUri = reader.string(); + break; + } + case 2: { + if (!(message.destinations && message.destinations.length)) + message.destinations = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.destinations.push(reader.int32()); + } else + message.destinations.push(reader.int32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CommonLanguageSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.CommonLanguageSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CommonLanguageSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CommonLanguageSettings message. + * @function verify + * @memberof google.api.CommonLanguageSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CommonLanguageSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.referenceDocsUri != null && message.hasOwnProperty("referenceDocsUri")) + if (!$util.isString(message.referenceDocsUri)) + return "referenceDocsUri: string expected"; + if (message.destinations != null && message.hasOwnProperty("destinations")) { + if (!Array.isArray(message.destinations)) + return "destinations: array expected"; + for (var i = 0; i < message.destinations.length; ++i) + switch (message.destinations[i]) { + default: + return "destinations: enum value[] expected"; + case 0: + case 10: + case 20: + break; + } + } + return null; + }; + + /** + * Creates a CommonLanguageSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.CommonLanguageSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.CommonLanguageSettings} CommonLanguageSettings + */ + CommonLanguageSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.CommonLanguageSettings) + return object; + var message = new $root.google.api.CommonLanguageSettings(); + if (object.referenceDocsUri != null) + message.referenceDocsUri = String(object.referenceDocsUri); + if (object.destinations) { + if (!Array.isArray(object.destinations)) + throw TypeError(".google.api.CommonLanguageSettings.destinations: array expected"); + message.destinations = []; + for (var i = 0; i < object.destinations.length; ++i) + switch (object.destinations[i]) { + default: + if (typeof object.destinations[i] === "number") { + message.destinations[i] = object.destinations[i]; + break; + } + case "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED": + case 0: + message.destinations[i] = 0; + break; + case "GITHUB": + case 10: + message.destinations[i] = 10; + break; + case "PACKAGE_MANAGER": + case 20: + message.destinations[i] = 20; + break; + } + } + return message; + }; + + /** + * Creates a plain object from a CommonLanguageSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.CommonLanguageSettings + * @static + * @param {google.api.CommonLanguageSettings} message CommonLanguageSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CommonLanguageSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.destinations = []; + if (options.defaults) + object.referenceDocsUri = ""; + if (message.referenceDocsUri != null && message.hasOwnProperty("referenceDocsUri")) + object.referenceDocsUri = message.referenceDocsUri; + if (message.destinations && message.destinations.length) { + object.destinations = []; + for (var j = 0; j < message.destinations.length; ++j) + object.destinations[j] = options.enums === String ? $root.google.api.ClientLibraryDestination[message.destinations[j]] === undefined ? message.destinations[j] : $root.google.api.ClientLibraryDestination[message.destinations[j]] : message.destinations[j]; + } + return object; + }; + + /** + * Converts this CommonLanguageSettings to JSON. + * @function toJSON + * @memberof google.api.CommonLanguageSettings + * @instance + * @returns {Object.} JSON object + */ + CommonLanguageSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for CommonLanguageSettings + * @function getTypeUrl + * @memberof google.api.CommonLanguageSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CommonLanguageSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.CommonLanguageSettings"; + }; + + return CommonLanguageSettings; + })(); + + api.ClientLibrarySettings = (function() { + + /** + * Properties of a ClientLibrarySettings. + * @memberof google.api + * @interface IClientLibrarySettings + * @property {string|null} [version] ClientLibrarySettings version + * @property {google.api.LaunchStage|null} [launchStage] ClientLibrarySettings launchStage + * @property {boolean|null} [restNumericEnums] ClientLibrarySettings restNumericEnums + * @property {google.api.IJavaSettings|null} [javaSettings] ClientLibrarySettings javaSettings + * @property {google.api.ICppSettings|null} [cppSettings] ClientLibrarySettings cppSettings + * @property {google.api.IPhpSettings|null} [phpSettings] ClientLibrarySettings phpSettings + * @property {google.api.IPythonSettings|null} [pythonSettings] ClientLibrarySettings pythonSettings + * @property {google.api.INodeSettings|null} [nodeSettings] ClientLibrarySettings nodeSettings + * @property {google.api.IDotnetSettings|null} [dotnetSettings] ClientLibrarySettings dotnetSettings + * @property {google.api.IRubySettings|null} [rubySettings] ClientLibrarySettings rubySettings + * @property {google.api.IGoSettings|null} [goSettings] ClientLibrarySettings goSettings + */ + + /** + * Constructs a new ClientLibrarySettings. + * @memberof google.api + * @classdesc Represents a ClientLibrarySettings. + * @implements IClientLibrarySettings + * @constructor + * @param {google.api.IClientLibrarySettings=} [properties] Properties to set + */ + function ClientLibrarySettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ClientLibrarySettings version. + * @member {string} version + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.version = ""; + + /** + * ClientLibrarySettings launchStage. + * @member {google.api.LaunchStage} launchStage + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.launchStage = 0; + + /** + * ClientLibrarySettings restNumericEnums. + * @member {boolean} restNumericEnums + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.restNumericEnums = false; + + /** + * ClientLibrarySettings javaSettings. + * @member {google.api.IJavaSettings|null|undefined} javaSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.javaSettings = null; + + /** + * ClientLibrarySettings cppSettings. + * @member {google.api.ICppSettings|null|undefined} cppSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.cppSettings = null; + + /** + * ClientLibrarySettings phpSettings. + * @member {google.api.IPhpSettings|null|undefined} phpSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.phpSettings = null; + + /** + * ClientLibrarySettings pythonSettings. + * @member {google.api.IPythonSettings|null|undefined} pythonSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.pythonSettings = null; + + /** + * ClientLibrarySettings nodeSettings. + * @member {google.api.INodeSettings|null|undefined} nodeSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.nodeSettings = null; + + /** + * ClientLibrarySettings dotnetSettings. + * @member {google.api.IDotnetSettings|null|undefined} dotnetSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.dotnetSettings = null; + + /** + * ClientLibrarySettings rubySettings. + * @member {google.api.IRubySettings|null|undefined} rubySettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.rubySettings = null; + + /** + * ClientLibrarySettings goSettings. + * @member {google.api.IGoSettings|null|undefined} goSettings + * @memberof google.api.ClientLibrarySettings + * @instance + */ + ClientLibrarySettings.prototype.goSettings = null; + + /** + * Creates a new ClientLibrarySettings instance using the specified properties. + * @function create + * @memberof google.api.ClientLibrarySettings + * @static + * @param {google.api.IClientLibrarySettings=} [properties] Properties to set + * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings instance + */ + ClientLibrarySettings.create = function create(properties) { + return new ClientLibrarySettings(properties); + }; + + /** + * Encodes the specified ClientLibrarySettings message. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. + * @function encode + * @memberof google.api.ClientLibrarySettings + * @static + * @param {google.api.IClientLibrarySettings} message ClientLibrarySettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ClientLibrarySettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.version != null && Object.hasOwnProperty.call(message, "version")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.version); + if (message.launchStage != null && Object.hasOwnProperty.call(message, "launchStage")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.launchStage); + if (message.restNumericEnums != null && Object.hasOwnProperty.call(message, "restNumericEnums")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.restNumericEnums); + if (message.javaSettings != null && Object.hasOwnProperty.call(message, "javaSettings")) + $root.google.api.JavaSettings.encode(message.javaSettings, writer.uint32(/* id 21, wireType 2 =*/170).fork()).ldelim(); + if (message.cppSettings != null && Object.hasOwnProperty.call(message, "cppSettings")) + $root.google.api.CppSettings.encode(message.cppSettings, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); + if (message.phpSettings != null && Object.hasOwnProperty.call(message, "phpSettings")) + $root.google.api.PhpSettings.encode(message.phpSettings, writer.uint32(/* id 23, wireType 2 =*/186).fork()).ldelim(); + if (message.pythonSettings != null && Object.hasOwnProperty.call(message, "pythonSettings")) + $root.google.api.PythonSettings.encode(message.pythonSettings, writer.uint32(/* id 24, wireType 2 =*/194).fork()).ldelim(); + if (message.nodeSettings != null && Object.hasOwnProperty.call(message, "nodeSettings")) + $root.google.api.NodeSettings.encode(message.nodeSettings, writer.uint32(/* id 25, wireType 2 =*/202).fork()).ldelim(); + if (message.dotnetSettings != null && Object.hasOwnProperty.call(message, "dotnetSettings")) + $root.google.api.DotnetSettings.encode(message.dotnetSettings, writer.uint32(/* id 26, wireType 2 =*/210).fork()).ldelim(); + if (message.rubySettings != null && Object.hasOwnProperty.call(message, "rubySettings")) + $root.google.api.RubySettings.encode(message.rubySettings, writer.uint32(/* id 27, wireType 2 =*/218).fork()).ldelim(); + if (message.goSettings != null && Object.hasOwnProperty.call(message, "goSettings")) + $root.google.api.GoSettings.encode(message.goSettings, writer.uint32(/* id 28, wireType 2 =*/226).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified ClientLibrarySettings message, length delimited. Does not implicitly {@link google.api.ClientLibrarySettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.ClientLibrarySettings + * @static + * @param {google.api.IClientLibrarySettings} message ClientLibrarySettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ClientLibrarySettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ClientLibrarySettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.ClientLibrarySettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ClientLibrarySettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ClientLibrarySettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.version = reader.string(); + break; + } + case 2: { + message.launchStage = reader.int32(); + break; + } + case 3: { + message.restNumericEnums = reader.bool(); + break; + } + case 21: { + message.javaSettings = $root.google.api.JavaSettings.decode(reader, reader.uint32()); + break; + } + case 22: { + message.cppSettings = $root.google.api.CppSettings.decode(reader, reader.uint32()); + break; + } + case 23: { + message.phpSettings = $root.google.api.PhpSettings.decode(reader, reader.uint32()); + break; + } + case 24: { + message.pythonSettings = $root.google.api.PythonSettings.decode(reader, reader.uint32()); + break; + } + case 25: { + message.nodeSettings = $root.google.api.NodeSettings.decode(reader, reader.uint32()); + break; + } + case 26: { + message.dotnetSettings = $root.google.api.DotnetSettings.decode(reader, reader.uint32()); + break; + } + case 27: { + message.rubySettings = $root.google.api.RubySettings.decode(reader, reader.uint32()); + break; + } + case 28: { + message.goSettings = $root.google.api.GoSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ClientLibrarySettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.ClientLibrarySettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ClientLibrarySettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ClientLibrarySettings message. + * @function verify + * @memberof google.api.ClientLibrarySettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ClientLibrarySettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.version != null && message.hasOwnProperty("version")) + if (!$util.isString(message.version)) + return "version: string expected"; + if (message.launchStage != null && message.hasOwnProperty("launchStage")) + switch (message.launchStage) { + default: + return "launchStage: enum value expected"; + case 0: + case 6: + case 7: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + if (message.restNumericEnums != null && message.hasOwnProperty("restNumericEnums")) + if (typeof message.restNumericEnums !== "boolean") + return "restNumericEnums: boolean expected"; + if (message.javaSettings != null && message.hasOwnProperty("javaSettings")) { + var error = $root.google.api.JavaSettings.verify(message.javaSettings); + if (error) + return "javaSettings." + error; + } + if (message.cppSettings != null && message.hasOwnProperty("cppSettings")) { + var error = $root.google.api.CppSettings.verify(message.cppSettings); + if (error) + return "cppSettings." + error; + } + if (message.phpSettings != null && message.hasOwnProperty("phpSettings")) { + var error = $root.google.api.PhpSettings.verify(message.phpSettings); + if (error) + return "phpSettings." + error; + } + if (message.pythonSettings != null && message.hasOwnProperty("pythonSettings")) { + var error = $root.google.api.PythonSettings.verify(message.pythonSettings); + if (error) + return "pythonSettings." + error; + } + if (message.nodeSettings != null && message.hasOwnProperty("nodeSettings")) { + var error = $root.google.api.NodeSettings.verify(message.nodeSettings); + if (error) + return "nodeSettings." + error; + } + if (message.dotnetSettings != null && message.hasOwnProperty("dotnetSettings")) { + var error = $root.google.api.DotnetSettings.verify(message.dotnetSettings); + if (error) + return "dotnetSettings." + error; + } + if (message.rubySettings != null && message.hasOwnProperty("rubySettings")) { + var error = $root.google.api.RubySettings.verify(message.rubySettings); + if (error) + return "rubySettings." + error; + } + if (message.goSettings != null && message.hasOwnProperty("goSettings")) { + var error = $root.google.api.GoSettings.verify(message.goSettings); + if (error) + return "goSettings." + error; + } + return null; + }; + + /** + * Creates a ClientLibrarySettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.ClientLibrarySettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.ClientLibrarySettings} ClientLibrarySettings + */ + ClientLibrarySettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.ClientLibrarySettings) + return object; + var message = new $root.google.api.ClientLibrarySettings(); + if (object.version != null) + message.version = String(object.version); + switch (object.launchStage) { + default: + if (typeof object.launchStage === "number") { + message.launchStage = object.launchStage; + break; + } + break; + case "LAUNCH_STAGE_UNSPECIFIED": + case 0: + message.launchStage = 0; + break; + case "UNIMPLEMENTED": + case 6: + message.launchStage = 6; + break; + case "PRELAUNCH": + case 7: + message.launchStage = 7; + break; + case "EARLY_ACCESS": + case 1: + message.launchStage = 1; + break; + case "ALPHA": + case 2: + message.launchStage = 2; + break; + case "BETA": + case 3: + message.launchStage = 3; + break; + case "GA": + case 4: + message.launchStage = 4; + break; + case "DEPRECATED": + case 5: + message.launchStage = 5; + break; + } + if (object.restNumericEnums != null) + message.restNumericEnums = Boolean(object.restNumericEnums); + if (object.javaSettings != null) { + if (typeof object.javaSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.javaSettings: object expected"); + message.javaSettings = $root.google.api.JavaSettings.fromObject(object.javaSettings); + } + if (object.cppSettings != null) { + if (typeof object.cppSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.cppSettings: object expected"); + message.cppSettings = $root.google.api.CppSettings.fromObject(object.cppSettings); + } + if (object.phpSettings != null) { + if (typeof object.phpSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.phpSettings: object expected"); + message.phpSettings = $root.google.api.PhpSettings.fromObject(object.phpSettings); + } + if (object.pythonSettings != null) { + if (typeof object.pythonSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.pythonSettings: object expected"); + message.pythonSettings = $root.google.api.PythonSettings.fromObject(object.pythonSettings); + } + if (object.nodeSettings != null) { + if (typeof object.nodeSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.nodeSettings: object expected"); + message.nodeSettings = $root.google.api.NodeSettings.fromObject(object.nodeSettings); + } + if (object.dotnetSettings != null) { + if (typeof object.dotnetSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.dotnetSettings: object expected"); + message.dotnetSettings = $root.google.api.DotnetSettings.fromObject(object.dotnetSettings); + } + if (object.rubySettings != null) { + if (typeof object.rubySettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.rubySettings: object expected"); + message.rubySettings = $root.google.api.RubySettings.fromObject(object.rubySettings); + } + if (object.goSettings != null) { + if (typeof object.goSettings !== "object") + throw TypeError(".google.api.ClientLibrarySettings.goSettings: object expected"); + message.goSettings = $root.google.api.GoSettings.fromObject(object.goSettings); + } + return message; + }; + + /** + * Creates a plain object from a ClientLibrarySettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.ClientLibrarySettings + * @static + * @param {google.api.ClientLibrarySettings} message ClientLibrarySettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ClientLibrarySettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.version = ""; + object.launchStage = options.enums === String ? "LAUNCH_STAGE_UNSPECIFIED" : 0; + object.restNumericEnums = false; + object.javaSettings = null; + object.cppSettings = null; + object.phpSettings = null; + object.pythonSettings = null; + object.nodeSettings = null; + object.dotnetSettings = null; + object.rubySettings = null; + object.goSettings = null; + } + if (message.version != null && message.hasOwnProperty("version")) + object.version = message.version; + if (message.launchStage != null && message.hasOwnProperty("launchStage")) + object.launchStage = options.enums === String ? $root.google.api.LaunchStage[message.launchStage] === undefined ? message.launchStage : $root.google.api.LaunchStage[message.launchStage] : message.launchStage; + if (message.restNumericEnums != null && message.hasOwnProperty("restNumericEnums")) + object.restNumericEnums = message.restNumericEnums; + if (message.javaSettings != null && message.hasOwnProperty("javaSettings")) + object.javaSettings = $root.google.api.JavaSettings.toObject(message.javaSettings, options); + if (message.cppSettings != null && message.hasOwnProperty("cppSettings")) + object.cppSettings = $root.google.api.CppSettings.toObject(message.cppSettings, options); + if (message.phpSettings != null && message.hasOwnProperty("phpSettings")) + object.phpSettings = $root.google.api.PhpSettings.toObject(message.phpSettings, options); + if (message.pythonSettings != null && message.hasOwnProperty("pythonSettings")) + object.pythonSettings = $root.google.api.PythonSettings.toObject(message.pythonSettings, options); + if (message.nodeSettings != null && message.hasOwnProperty("nodeSettings")) + object.nodeSettings = $root.google.api.NodeSettings.toObject(message.nodeSettings, options); + if (message.dotnetSettings != null && message.hasOwnProperty("dotnetSettings")) + object.dotnetSettings = $root.google.api.DotnetSettings.toObject(message.dotnetSettings, options); + if (message.rubySettings != null && message.hasOwnProperty("rubySettings")) + object.rubySettings = $root.google.api.RubySettings.toObject(message.rubySettings, options); + if (message.goSettings != null && message.hasOwnProperty("goSettings")) + object.goSettings = $root.google.api.GoSettings.toObject(message.goSettings, options); + return object; + }; + + /** + * Converts this ClientLibrarySettings to JSON. + * @function toJSON + * @memberof google.api.ClientLibrarySettings + * @instance + * @returns {Object.} JSON object + */ + ClientLibrarySettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for ClientLibrarySettings + * @function getTypeUrl + * @memberof google.api.ClientLibrarySettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ClientLibrarySettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.ClientLibrarySettings"; + }; + + return ClientLibrarySettings; + })(); + + api.Publishing = (function() { + + /** + * Properties of a Publishing. + * @memberof google.api + * @interface IPublishing + * @property {Array.|null} [methodSettings] Publishing methodSettings + * @property {string|null} [newIssueUri] Publishing newIssueUri + * @property {string|null} [documentationUri] Publishing documentationUri + * @property {string|null} [apiShortName] Publishing apiShortName + * @property {string|null} [githubLabel] Publishing githubLabel + * @property {Array.|null} [codeownerGithubTeams] Publishing codeownerGithubTeams + * @property {string|null} [docTagPrefix] Publishing docTagPrefix + * @property {google.api.ClientLibraryOrganization|null} [organization] Publishing organization + * @property {Array.|null} [librarySettings] Publishing librarySettings + */ + + /** + * Constructs a new Publishing. + * @memberof google.api + * @classdesc Represents a Publishing. + * @implements IPublishing + * @constructor + * @param {google.api.IPublishing=} [properties] Properties to set + */ + function Publishing(properties) { + this.methodSettings = []; + this.codeownerGithubTeams = []; + this.librarySettings = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Publishing methodSettings. + * @member {Array.} methodSettings + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.methodSettings = $util.emptyArray; + + /** + * Publishing newIssueUri. + * @member {string} newIssueUri + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.newIssueUri = ""; + + /** + * Publishing documentationUri. + * @member {string} documentationUri + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.documentationUri = ""; + + /** + * Publishing apiShortName. + * @member {string} apiShortName + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.apiShortName = ""; + + /** + * Publishing githubLabel. + * @member {string} githubLabel + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.githubLabel = ""; + + /** + * Publishing codeownerGithubTeams. + * @member {Array.} codeownerGithubTeams + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.codeownerGithubTeams = $util.emptyArray; + + /** + * Publishing docTagPrefix. + * @member {string} docTagPrefix + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.docTagPrefix = ""; + + /** + * Publishing organization. + * @member {google.api.ClientLibraryOrganization} organization + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.organization = 0; + + /** + * Publishing librarySettings. + * @member {Array.} librarySettings + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.librarySettings = $util.emptyArray; + + /** + * Creates a new Publishing instance using the specified properties. + * @function create + * @memberof google.api.Publishing + * @static + * @param {google.api.IPublishing=} [properties] Properties to set + * @returns {google.api.Publishing} Publishing instance + */ + Publishing.create = function create(properties) { + return new Publishing(properties); + }; + + /** + * Encodes the specified Publishing message. Does not implicitly {@link google.api.Publishing.verify|verify} messages. + * @function encode + * @memberof google.api.Publishing + * @static + * @param {google.api.IPublishing} message Publishing message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Publishing.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.methodSettings != null && message.methodSettings.length) + for (var i = 0; i < message.methodSettings.length; ++i) + $root.google.api.MethodSettings.encode(message.methodSettings[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.newIssueUri != null && Object.hasOwnProperty.call(message, "newIssueUri")) + writer.uint32(/* id 101, wireType 2 =*/810).string(message.newIssueUri); + if (message.documentationUri != null && Object.hasOwnProperty.call(message, "documentationUri")) + writer.uint32(/* id 102, wireType 2 =*/818).string(message.documentationUri); + if (message.apiShortName != null && Object.hasOwnProperty.call(message, "apiShortName")) + writer.uint32(/* id 103, wireType 2 =*/826).string(message.apiShortName); + if (message.githubLabel != null && Object.hasOwnProperty.call(message, "githubLabel")) + writer.uint32(/* id 104, wireType 2 =*/834).string(message.githubLabel); + if (message.codeownerGithubTeams != null && message.codeownerGithubTeams.length) + for (var i = 0; i < message.codeownerGithubTeams.length; ++i) + writer.uint32(/* id 105, wireType 2 =*/842).string(message.codeownerGithubTeams[i]); + if (message.docTagPrefix != null && Object.hasOwnProperty.call(message, "docTagPrefix")) + writer.uint32(/* id 106, wireType 2 =*/850).string(message.docTagPrefix); + if (message.organization != null && Object.hasOwnProperty.call(message, "organization")) + writer.uint32(/* id 107, wireType 0 =*/856).int32(message.organization); + if (message.librarySettings != null && message.librarySettings.length) + for (var i = 0; i < message.librarySettings.length; ++i) + $root.google.api.ClientLibrarySettings.encode(message.librarySettings[i], writer.uint32(/* id 109, wireType 2 =*/874).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified Publishing message, length delimited. Does not implicitly {@link google.api.Publishing.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.Publishing + * @static + * @param {google.api.IPublishing} message Publishing message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Publishing.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Publishing message from the specified reader or buffer. + * @function decode + * @memberof google.api.Publishing + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.Publishing} Publishing + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Publishing.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Publishing(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 2: { + if (!(message.methodSettings && message.methodSettings.length)) + message.methodSettings = []; + message.methodSettings.push($root.google.api.MethodSettings.decode(reader, reader.uint32())); + break; + } + case 101: { + message.newIssueUri = reader.string(); + break; + } + case 102: { + message.documentationUri = reader.string(); + break; + } + case 103: { + message.apiShortName = reader.string(); + break; + } + case 104: { + message.githubLabel = reader.string(); + break; + } + case 105: { + if (!(message.codeownerGithubTeams && message.codeownerGithubTeams.length)) + message.codeownerGithubTeams = []; + message.codeownerGithubTeams.push(reader.string()); + break; + } + case 106: { + message.docTagPrefix = reader.string(); + break; + } + case 107: { + message.organization = reader.int32(); + break; + } + case 109: { + if (!(message.librarySettings && message.librarySettings.length)) + message.librarySettings = []; + message.librarySettings.push($root.google.api.ClientLibrarySettings.decode(reader, reader.uint32())); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Publishing message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.Publishing + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.Publishing} Publishing + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Publishing.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Publishing message. + * @function verify + * @memberof google.api.Publishing + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Publishing.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.methodSettings != null && message.hasOwnProperty("methodSettings")) { + if (!Array.isArray(message.methodSettings)) + return "methodSettings: array expected"; + for (var i = 0; i < message.methodSettings.length; ++i) { + var error = $root.google.api.MethodSettings.verify(message.methodSettings[i]); + if (error) + return "methodSettings." + error; + } + } + if (message.newIssueUri != null && message.hasOwnProperty("newIssueUri")) + if (!$util.isString(message.newIssueUri)) + return "newIssueUri: string expected"; + if (message.documentationUri != null && message.hasOwnProperty("documentationUri")) + if (!$util.isString(message.documentationUri)) + return "documentationUri: string expected"; + if (message.apiShortName != null && message.hasOwnProperty("apiShortName")) + if (!$util.isString(message.apiShortName)) + return "apiShortName: string expected"; + if (message.githubLabel != null && message.hasOwnProperty("githubLabel")) + if (!$util.isString(message.githubLabel)) + return "githubLabel: string expected"; + if (message.codeownerGithubTeams != null && message.hasOwnProperty("codeownerGithubTeams")) { + if (!Array.isArray(message.codeownerGithubTeams)) + return "codeownerGithubTeams: array expected"; + for (var i = 0; i < message.codeownerGithubTeams.length; ++i) + if (!$util.isString(message.codeownerGithubTeams[i])) + return "codeownerGithubTeams: string[] expected"; + } + if (message.docTagPrefix != null && message.hasOwnProperty("docTagPrefix")) + if (!$util.isString(message.docTagPrefix)) + return "docTagPrefix: string expected"; + if (message.organization != null && message.hasOwnProperty("organization")) + switch (message.organization) { + default: + return "organization: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + break; + } + if (message.librarySettings != null && message.hasOwnProperty("librarySettings")) { + if (!Array.isArray(message.librarySettings)) + return "librarySettings: array expected"; + for (var i = 0; i < message.librarySettings.length; ++i) { + var error = $root.google.api.ClientLibrarySettings.verify(message.librarySettings[i]); + if (error) + return "librarySettings." + error; + } + } + return null; + }; + + /** + * Creates a Publishing message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.Publishing + * @static + * @param {Object.} object Plain object + * @returns {google.api.Publishing} Publishing + */ + Publishing.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.Publishing) + return object; + var message = new $root.google.api.Publishing(); + if (object.methodSettings) { + if (!Array.isArray(object.methodSettings)) + throw TypeError(".google.api.Publishing.methodSettings: array expected"); + message.methodSettings = []; + for (var i = 0; i < object.methodSettings.length; ++i) { + if (typeof object.methodSettings[i] !== "object") + throw TypeError(".google.api.Publishing.methodSettings: object expected"); + message.methodSettings[i] = $root.google.api.MethodSettings.fromObject(object.methodSettings[i]); + } + } + if (object.newIssueUri != null) + message.newIssueUri = String(object.newIssueUri); + if (object.documentationUri != null) + message.documentationUri = String(object.documentationUri); + if (object.apiShortName != null) + message.apiShortName = String(object.apiShortName); + if (object.githubLabel != null) + message.githubLabel = String(object.githubLabel); + if (object.codeownerGithubTeams) { + if (!Array.isArray(object.codeownerGithubTeams)) + throw TypeError(".google.api.Publishing.codeownerGithubTeams: array expected"); + message.codeownerGithubTeams = []; + for (var i = 0; i < object.codeownerGithubTeams.length; ++i) + message.codeownerGithubTeams[i] = String(object.codeownerGithubTeams[i]); + } + if (object.docTagPrefix != null) + message.docTagPrefix = String(object.docTagPrefix); + switch (object.organization) { + default: + if (typeof object.organization === "number") { + message.organization = object.organization; + break; + } + break; + case "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED": + case 0: + message.organization = 0; + break; + case "CLOUD": + case 1: + message.organization = 1; + break; + case "ADS": + case 2: + message.organization = 2; + break; + case "PHOTOS": + case 3: + message.organization = 3; + break; + case "STREET_VIEW": + case 4: + message.organization = 4; + break; + } + if (object.librarySettings) { + if (!Array.isArray(object.librarySettings)) + throw TypeError(".google.api.Publishing.librarySettings: array expected"); + message.librarySettings = []; + for (var i = 0; i < object.librarySettings.length; ++i) { + if (typeof object.librarySettings[i] !== "object") + throw TypeError(".google.api.Publishing.librarySettings: object expected"); + message.librarySettings[i] = $root.google.api.ClientLibrarySettings.fromObject(object.librarySettings[i]); + } + } + return message; + }; + + /** + * Creates a plain object from a Publishing message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.Publishing + * @static + * @param {google.api.Publishing} message Publishing + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Publishing.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) { + object.methodSettings = []; + object.codeownerGithubTeams = []; + object.librarySettings = []; + } + if (options.defaults) { + object.newIssueUri = ""; + object.documentationUri = ""; + object.apiShortName = ""; + object.githubLabel = ""; + object.docTagPrefix = ""; + object.organization = options.enums === String ? "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED" : 0; + } + if (message.methodSettings && message.methodSettings.length) { + object.methodSettings = []; + for (var j = 0; j < message.methodSettings.length; ++j) + object.methodSettings[j] = $root.google.api.MethodSettings.toObject(message.methodSettings[j], options); + } + if (message.newIssueUri != null && message.hasOwnProperty("newIssueUri")) + object.newIssueUri = message.newIssueUri; + if (message.documentationUri != null && message.hasOwnProperty("documentationUri")) + object.documentationUri = message.documentationUri; + if (message.apiShortName != null && message.hasOwnProperty("apiShortName")) + object.apiShortName = message.apiShortName; + if (message.githubLabel != null && message.hasOwnProperty("githubLabel")) + object.githubLabel = message.githubLabel; + if (message.codeownerGithubTeams && message.codeownerGithubTeams.length) { + object.codeownerGithubTeams = []; + for (var j = 0; j < message.codeownerGithubTeams.length; ++j) + object.codeownerGithubTeams[j] = message.codeownerGithubTeams[j]; + } + if (message.docTagPrefix != null && message.hasOwnProperty("docTagPrefix")) + object.docTagPrefix = message.docTagPrefix; + if (message.organization != null && message.hasOwnProperty("organization")) + object.organization = options.enums === String ? $root.google.api.ClientLibraryOrganization[message.organization] === undefined ? message.organization : $root.google.api.ClientLibraryOrganization[message.organization] : message.organization; + if (message.librarySettings && message.librarySettings.length) { + object.librarySettings = []; + for (var j = 0; j < message.librarySettings.length; ++j) + object.librarySettings[j] = $root.google.api.ClientLibrarySettings.toObject(message.librarySettings[j], options); + } + return object; + }; + + /** + * Converts this Publishing to JSON. + * @function toJSON + * @memberof google.api.Publishing + * @instance + * @returns {Object.} JSON object + */ + Publishing.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for Publishing + * @function getTypeUrl + * @memberof google.api.Publishing + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Publishing.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.Publishing"; + }; + + return Publishing; + })(); + + api.JavaSettings = (function() { + + /** + * Properties of a JavaSettings. + * @memberof google.api + * @interface IJavaSettings + * @property {string|null} [libraryPackage] JavaSettings libraryPackage + * @property {Object.|null} [serviceClassNames] JavaSettings serviceClassNames + * @property {google.api.ICommonLanguageSettings|null} [common] JavaSettings common + */ + + /** + * Constructs a new JavaSettings. + * @memberof google.api + * @classdesc Represents a JavaSettings. + * @implements IJavaSettings + * @constructor + * @param {google.api.IJavaSettings=} [properties] Properties to set + */ + function JavaSettings(properties) { + this.serviceClassNames = {}; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * JavaSettings libraryPackage. + * @member {string} libraryPackage + * @memberof google.api.JavaSettings + * @instance + */ + JavaSettings.prototype.libraryPackage = ""; + + /** + * JavaSettings serviceClassNames. + * @member {Object.} serviceClassNames + * @memberof google.api.JavaSettings + * @instance + */ + JavaSettings.prototype.serviceClassNames = $util.emptyObject; + + /** + * JavaSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.JavaSettings + * @instance + */ + JavaSettings.prototype.common = null; + + /** + * Creates a new JavaSettings instance using the specified properties. + * @function create + * @memberof google.api.JavaSettings + * @static + * @param {google.api.IJavaSettings=} [properties] Properties to set + * @returns {google.api.JavaSettings} JavaSettings instance + */ + JavaSettings.create = function create(properties) { + return new JavaSettings(properties); + }; + + /** + * Encodes the specified JavaSettings message. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. + * @function encode + * @memberof google.api.JavaSettings + * @static + * @param {google.api.IJavaSettings} message JavaSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + JavaSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.libraryPackage != null && Object.hasOwnProperty.call(message, "libraryPackage")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.libraryPackage); + if (message.serviceClassNames != null && Object.hasOwnProperty.call(message, "serviceClassNames")) + for (var keys = Object.keys(message.serviceClassNames), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.serviceClassNames[keys[i]]).ldelim(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified JavaSettings message, length delimited. Does not implicitly {@link google.api.JavaSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.JavaSettings + * @static + * @param {google.api.IJavaSettings} message JavaSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + JavaSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a JavaSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.JavaSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.JavaSettings} JavaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + JavaSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.JavaSettings(), key, value; + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.libraryPackage = reader.string(); + break; + } + case 2: { + if (message.serviceClassNames === $util.emptyObject) + message.serviceClassNames = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.serviceClassNames[key] = value; + break; + } + case 3: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a JavaSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.JavaSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.JavaSettings} JavaSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + JavaSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a JavaSettings message. + * @function verify + * @memberof google.api.JavaSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + JavaSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.libraryPackage != null && message.hasOwnProperty("libraryPackage")) + if (!$util.isString(message.libraryPackage)) + return "libraryPackage: string expected"; + if (message.serviceClassNames != null && message.hasOwnProperty("serviceClassNames")) { + if (!$util.isObject(message.serviceClassNames)) + return "serviceClassNames: object expected"; + var key = Object.keys(message.serviceClassNames); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.serviceClassNames[key[i]])) + return "serviceClassNames: string{k:string} expected"; + } + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a JavaSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.JavaSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.JavaSettings} JavaSettings + */ + JavaSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.JavaSettings) + return object; + var message = new $root.google.api.JavaSettings(); + if (object.libraryPackage != null) + message.libraryPackage = String(object.libraryPackage); + if (object.serviceClassNames) { + if (typeof object.serviceClassNames !== "object") + throw TypeError(".google.api.JavaSettings.serviceClassNames: object expected"); + message.serviceClassNames = {}; + for (var keys = Object.keys(object.serviceClassNames), i = 0; i < keys.length; ++i) + message.serviceClassNames[keys[i]] = String(object.serviceClassNames[keys[i]]); + } + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.JavaSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a JavaSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.JavaSettings + * @static + * @param {google.api.JavaSettings} message JavaSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + JavaSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.objects || options.defaults) + object.serviceClassNames = {}; + if (options.defaults) { + object.libraryPackage = ""; + object.common = null; + } + if (message.libraryPackage != null && message.hasOwnProperty("libraryPackage")) + object.libraryPackage = message.libraryPackage; + var keys2; + if (message.serviceClassNames && (keys2 = Object.keys(message.serviceClassNames)).length) { + object.serviceClassNames = {}; + for (var j = 0; j < keys2.length; ++j) + object.serviceClassNames[keys2[j]] = message.serviceClassNames[keys2[j]]; + } + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this JavaSettings to JSON. + * @function toJSON + * @memberof google.api.JavaSettings + * @instance + * @returns {Object.} JSON object + */ + JavaSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for JavaSettings + * @function getTypeUrl + * @memberof google.api.JavaSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + JavaSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.JavaSettings"; + }; + + return JavaSettings; + })(); + + api.CppSettings = (function() { + + /** + * Properties of a CppSettings. + * @memberof google.api + * @interface ICppSettings + * @property {google.api.ICommonLanguageSettings|null} [common] CppSettings common + */ + + /** + * Constructs a new CppSettings. + * @memberof google.api + * @classdesc Represents a CppSettings. + * @implements ICppSettings + * @constructor + * @param {google.api.ICppSettings=} [properties] Properties to set + */ + function CppSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CppSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.CppSettings + * @instance + */ + CppSettings.prototype.common = null; + + /** + * Creates a new CppSettings instance using the specified properties. + * @function create + * @memberof google.api.CppSettings + * @static + * @param {google.api.ICppSettings=} [properties] Properties to set + * @returns {google.api.CppSettings} CppSettings instance + */ + CppSettings.create = function create(properties) { + return new CppSettings(properties); + }; + + /** + * Encodes the specified CppSettings message. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. + * @function encode + * @memberof google.api.CppSettings + * @static + * @param {google.api.ICppSettings} message CppSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CppSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified CppSettings message, length delimited. Does not implicitly {@link google.api.CppSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.CppSettings + * @static + * @param {google.api.ICppSettings} message CppSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CppSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CppSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.CppSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.CppSettings} CppSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CppSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CppSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CppSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.CppSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.CppSettings} CppSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CppSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CppSettings message. + * @function verify + * @memberof google.api.CppSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CppSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a CppSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.CppSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.CppSettings} CppSettings + */ + CppSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.CppSettings) + return object; + var message = new $root.google.api.CppSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.CppSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a CppSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.CppSettings + * @static + * @param {google.api.CppSettings} message CppSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CppSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this CppSettings to JSON. + * @function toJSON + * @memberof google.api.CppSettings + * @instance + * @returns {Object.} JSON object + */ + CppSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for CppSettings + * @function getTypeUrl + * @memberof google.api.CppSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CppSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.CppSettings"; + }; + + return CppSettings; + })(); + + api.PhpSettings = (function() { + + /** + * Properties of a PhpSettings. + * @memberof google.api + * @interface IPhpSettings + * @property {google.api.ICommonLanguageSettings|null} [common] PhpSettings common + */ + + /** + * Constructs a new PhpSettings. + * @memberof google.api + * @classdesc Represents a PhpSettings. + * @implements IPhpSettings + * @constructor + * @param {google.api.IPhpSettings=} [properties] Properties to set + */ + function PhpSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PhpSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.PhpSettings + * @instance + */ + PhpSettings.prototype.common = null; + + /** + * Creates a new PhpSettings instance using the specified properties. + * @function create + * @memberof google.api.PhpSettings + * @static + * @param {google.api.IPhpSettings=} [properties] Properties to set + * @returns {google.api.PhpSettings} PhpSettings instance + */ + PhpSettings.create = function create(properties) { + return new PhpSettings(properties); + }; + + /** + * Encodes the specified PhpSettings message. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. + * @function encode + * @memberof google.api.PhpSettings + * @static + * @param {google.api.IPhpSettings} message PhpSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PhpSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified PhpSettings message, length delimited. Does not implicitly {@link google.api.PhpSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.PhpSettings + * @static + * @param {google.api.IPhpSettings} message PhpSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PhpSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PhpSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.PhpSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.PhpSettings} PhpSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PhpSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PhpSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PhpSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.PhpSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.PhpSettings} PhpSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PhpSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PhpSettings message. + * @function verify + * @memberof google.api.PhpSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PhpSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a PhpSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.PhpSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.PhpSettings} PhpSettings + */ + PhpSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.PhpSettings) + return object; + var message = new $root.google.api.PhpSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.PhpSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a PhpSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.PhpSettings + * @static + * @param {google.api.PhpSettings} message PhpSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PhpSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this PhpSettings to JSON. + * @function toJSON + * @memberof google.api.PhpSettings + * @instance + * @returns {Object.} JSON object + */ + PhpSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for PhpSettings + * @function getTypeUrl + * @memberof google.api.PhpSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PhpSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.PhpSettings"; + }; + + return PhpSettings; + })(); + + api.PythonSettings = (function() { + + /** + * Properties of a PythonSettings. + * @memberof google.api + * @interface IPythonSettings + * @property {google.api.ICommonLanguageSettings|null} [common] PythonSettings common + */ + + /** + * Constructs a new PythonSettings. + * @memberof google.api + * @classdesc Represents a PythonSettings. + * @implements IPythonSettings + * @constructor + * @param {google.api.IPythonSettings=} [properties] Properties to set + */ + function PythonSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PythonSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.PythonSettings + * @instance + */ + PythonSettings.prototype.common = null; + + /** + * Creates a new PythonSettings instance using the specified properties. + * @function create + * @memberof google.api.PythonSettings + * @static + * @param {google.api.IPythonSettings=} [properties] Properties to set + * @returns {google.api.PythonSettings} PythonSettings instance + */ + PythonSettings.create = function create(properties) { + return new PythonSettings(properties); + }; + + /** + * Encodes the specified PythonSettings message. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. + * @function encode + * @memberof google.api.PythonSettings + * @static + * @param {google.api.IPythonSettings} message PythonSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PythonSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified PythonSettings message, length delimited. Does not implicitly {@link google.api.PythonSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.PythonSettings + * @static + * @param {google.api.IPythonSettings} message PythonSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PythonSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PythonSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.PythonSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.PythonSettings} PythonSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PythonSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PythonSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PythonSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.PythonSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.PythonSettings} PythonSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PythonSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PythonSettings message. + * @function verify + * @memberof google.api.PythonSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PythonSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a PythonSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.PythonSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.PythonSettings} PythonSettings + */ + PythonSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.PythonSettings) + return object; + var message = new $root.google.api.PythonSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.PythonSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a PythonSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.PythonSettings + * @static + * @param {google.api.PythonSettings} message PythonSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PythonSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this PythonSettings to JSON. + * @function toJSON + * @memberof google.api.PythonSettings + * @instance + * @returns {Object.} JSON object + */ + PythonSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for PythonSettings + * @function getTypeUrl + * @memberof google.api.PythonSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PythonSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.PythonSettings"; + }; + + return PythonSettings; + })(); + + api.NodeSettings = (function() { + + /** + * Properties of a NodeSettings. + * @memberof google.api + * @interface INodeSettings + * @property {google.api.ICommonLanguageSettings|null} [common] NodeSettings common + */ + + /** + * Constructs a new NodeSettings. + * @memberof google.api + * @classdesc Represents a NodeSettings. + * @implements INodeSettings + * @constructor + * @param {google.api.INodeSettings=} [properties] Properties to set + */ + function NodeSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * NodeSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.NodeSettings + * @instance + */ + NodeSettings.prototype.common = null; + + /** + * Creates a new NodeSettings instance using the specified properties. + * @function create + * @memberof google.api.NodeSettings + * @static + * @param {google.api.INodeSettings=} [properties] Properties to set + * @returns {google.api.NodeSettings} NodeSettings instance + */ + NodeSettings.create = function create(properties) { + return new NodeSettings(properties); + }; + + /** + * Encodes the specified NodeSettings message. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. + * @function encode + * @memberof google.api.NodeSettings + * @static + * @param {google.api.INodeSettings} message NodeSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NodeSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified NodeSettings message, length delimited. Does not implicitly {@link google.api.NodeSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.NodeSettings + * @static + * @param {google.api.INodeSettings} message NodeSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + NodeSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a NodeSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.NodeSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.NodeSettings} NodeSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NodeSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.NodeSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a NodeSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.NodeSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.NodeSettings} NodeSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + NodeSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a NodeSettings message. + * @function verify + * @memberof google.api.NodeSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + NodeSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a NodeSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.NodeSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.NodeSettings} NodeSettings + */ + NodeSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.NodeSettings) + return object; + var message = new $root.google.api.NodeSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.NodeSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a NodeSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.NodeSettings + * @static + * @param {google.api.NodeSettings} message NodeSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + NodeSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this NodeSettings to JSON. + * @function toJSON + * @memberof google.api.NodeSettings + * @instance + * @returns {Object.} JSON object + */ + NodeSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for NodeSettings + * @function getTypeUrl + * @memberof google.api.NodeSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + NodeSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.NodeSettings"; + }; + + return NodeSettings; + })(); + + api.DotnetSettings = (function() { + + /** + * Properties of a DotnetSettings. + * @memberof google.api + * @interface IDotnetSettings + * @property {google.api.ICommonLanguageSettings|null} [common] DotnetSettings common + */ + + /** + * Constructs a new DotnetSettings. + * @memberof google.api + * @classdesc Represents a DotnetSettings. + * @implements IDotnetSettings + * @constructor + * @param {google.api.IDotnetSettings=} [properties] Properties to set + */ + function DotnetSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * DotnetSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.DotnetSettings + * @instance + */ + DotnetSettings.prototype.common = null; + + /** + * Creates a new DotnetSettings instance using the specified properties. + * @function create + * @memberof google.api.DotnetSettings + * @static + * @param {google.api.IDotnetSettings=} [properties] Properties to set + * @returns {google.api.DotnetSettings} DotnetSettings instance + */ + DotnetSettings.create = function create(properties) { + return new DotnetSettings(properties); + }; + + /** + * Encodes the specified DotnetSettings message. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. + * @function encode + * @memberof google.api.DotnetSettings + * @static + * @param {google.api.IDotnetSettings} message DotnetSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DotnetSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified DotnetSettings message, length delimited. Does not implicitly {@link google.api.DotnetSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.DotnetSettings + * @static + * @param {google.api.IDotnetSettings} message DotnetSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + DotnetSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a DotnetSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.DotnetSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.DotnetSettings} DotnetSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DotnetSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.DotnetSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a DotnetSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.DotnetSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.DotnetSettings} DotnetSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + DotnetSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a DotnetSettings message. + * @function verify + * @memberof google.api.DotnetSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + DotnetSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a DotnetSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.DotnetSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.DotnetSettings} DotnetSettings + */ + DotnetSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.DotnetSettings) + return object; + var message = new $root.google.api.DotnetSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.DotnetSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a DotnetSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.DotnetSettings + * @static + * @param {google.api.DotnetSettings} message DotnetSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + DotnetSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this DotnetSettings to JSON. + * @function toJSON + * @memberof google.api.DotnetSettings + * @instance + * @returns {Object.} JSON object + */ + DotnetSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for DotnetSettings + * @function getTypeUrl + * @memberof google.api.DotnetSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + DotnetSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.DotnetSettings"; + }; + + return DotnetSettings; + })(); + + api.RubySettings = (function() { + + /** + * Properties of a RubySettings. + * @memberof google.api + * @interface IRubySettings + * @property {google.api.ICommonLanguageSettings|null} [common] RubySettings common + */ + + /** + * Constructs a new RubySettings. + * @memberof google.api + * @classdesc Represents a RubySettings. + * @implements IRubySettings + * @constructor + * @param {google.api.IRubySettings=} [properties] Properties to set + */ + function RubySettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * RubySettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.RubySettings + * @instance + */ + RubySettings.prototype.common = null; + + /** + * Creates a new RubySettings instance using the specified properties. + * @function create + * @memberof google.api.RubySettings + * @static + * @param {google.api.IRubySettings=} [properties] Properties to set + * @returns {google.api.RubySettings} RubySettings instance + */ + RubySettings.create = function create(properties) { + return new RubySettings(properties); + }; + + /** + * Encodes the specified RubySettings message. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. + * @function encode + * @memberof google.api.RubySettings + * @static + * @param {google.api.IRubySettings} message RubySettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + RubySettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified RubySettings message, length delimited. Does not implicitly {@link google.api.RubySettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.RubySettings + * @static + * @param {google.api.IRubySettings} message RubySettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + RubySettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a RubySettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.RubySettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.RubySettings} RubySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + RubySettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.RubySettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a RubySettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.RubySettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.RubySettings} RubySettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + RubySettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a RubySettings message. + * @function verify + * @memberof google.api.RubySettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + RubySettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a RubySettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.RubySettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.RubySettings} RubySettings + */ + RubySettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.RubySettings) + return object; + var message = new $root.google.api.RubySettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.RubySettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a RubySettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.RubySettings + * @static + * @param {google.api.RubySettings} message RubySettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + RubySettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this RubySettings to JSON. + * @function toJSON + * @memberof google.api.RubySettings + * @instance + * @returns {Object.} JSON object + */ + RubySettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for RubySettings + * @function getTypeUrl + * @memberof google.api.RubySettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + RubySettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.RubySettings"; + }; + + return RubySettings; + })(); + + api.GoSettings = (function() { + + /** + * Properties of a GoSettings. + * @memberof google.api + * @interface IGoSettings + * @property {google.api.ICommonLanguageSettings|null} [common] GoSettings common + */ + + /** + * Constructs a new GoSettings. + * @memberof google.api + * @classdesc Represents a GoSettings. + * @implements IGoSettings + * @constructor + * @param {google.api.IGoSettings=} [properties] Properties to set + */ + function GoSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * GoSettings common. + * @member {google.api.ICommonLanguageSettings|null|undefined} common + * @memberof google.api.GoSettings + * @instance + */ + GoSettings.prototype.common = null; + + /** + * Creates a new GoSettings instance using the specified properties. + * @function create + * @memberof google.api.GoSettings + * @static + * @param {google.api.IGoSettings=} [properties] Properties to set + * @returns {google.api.GoSettings} GoSettings instance + */ + GoSettings.create = function create(properties) { + return new GoSettings(properties); + }; + + /** + * Encodes the specified GoSettings message. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. + * @function encode + * @memberof google.api.GoSettings + * @static + * @param {google.api.IGoSettings} message GoSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GoSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.common != null && Object.hasOwnProperty.call(message, "common")) + $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified GoSettings message, length delimited. Does not implicitly {@link google.api.GoSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.GoSettings + * @static + * @param {google.api.IGoSettings} message GoSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + GoSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a GoSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.GoSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.GoSettings} GoSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GoSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.GoSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a GoSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.GoSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.GoSettings} GoSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + GoSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a GoSettings message. + * @function verify + * @memberof google.api.GoSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + GoSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.common != null && message.hasOwnProperty("common")) { + var error = $root.google.api.CommonLanguageSettings.verify(message.common); + if (error) + return "common." + error; + } + return null; + }; + + /** + * Creates a GoSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.GoSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.GoSettings} GoSettings + */ + GoSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.GoSettings) + return object; + var message = new $root.google.api.GoSettings(); + if (object.common != null) { + if (typeof object.common !== "object") + throw TypeError(".google.api.GoSettings.common: object expected"); + message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); + } + return message; + }; + + /** + * Creates a plain object from a GoSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.GoSettings + * @static + * @param {google.api.GoSettings} message GoSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + GoSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.common = null; + if (message.common != null && message.hasOwnProperty("common")) + object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + return object; + }; + + /** + * Converts this GoSettings to JSON. + * @function toJSON + * @memberof google.api.GoSettings + * @instance + * @returns {Object.} JSON object + */ + GoSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for GoSettings + * @function getTypeUrl + * @memberof google.api.GoSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + GoSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.GoSettings"; + }; + + return GoSettings; + })(); + + api.MethodSettings = (function() { + + /** + * Properties of a MethodSettings. + * @memberof google.api + * @interface IMethodSettings + * @property {string|null} [selector] MethodSettings selector + * @property {google.api.MethodSettings.ILongRunning|null} [longRunning] MethodSettings longRunning + */ + + /** + * Constructs a new MethodSettings. + * @memberof google.api + * @classdesc Represents a MethodSettings. + * @implements IMethodSettings + * @constructor + * @param {google.api.IMethodSettings=} [properties] Properties to set + */ + function MethodSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * MethodSettings selector. + * @member {string} selector + * @memberof google.api.MethodSettings + * @instance + */ + MethodSettings.prototype.selector = ""; + + /** + * MethodSettings longRunning. + * @member {google.api.MethodSettings.ILongRunning|null|undefined} longRunning + * @memberof google.api.MethodSettings + * @instance + */ + MethodSettings.prototype.longRunning = null; + + /** + * Creates a new MethodSettings instance using the specified properties. + * @function create + * @memberof google.api.MethodSettings + * @static + * @param {google.api.IMethodSettings=} [properties] Properties to set + * @returns {google.api.MethodSettings} MethodSettings instance + */ + MethodSettings.create = function create(properties) { + return new MethodSettings(properties); + }; + + /** + * Encodes the specified MethodSettings message. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. + * @function encode + * @memberof google.api.MethodSettings + * @static + * @param {google.api.IMethodSettings} message MethodSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.selector != null && Object.hasOwnProperty.call(message, "selector")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); + if (message.longRunning != null && Object.hasOwnProperty.call(message, "longRunning")) + $root.google.api.MethodSettings.LongRunning.encode(message.longRunning, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified MethodSettings message, length delimited. Does not implicitly {@link google.api.MethodSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.MethodSettings + * @static + * @param {google.api.IMethodSettings} message MethodSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MethodSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a MethodSettings message from the specified reader or buffer. + * @function decode + * @memberof google.api.MethodSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.MethodSettings} MethodSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.MethodSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.selector = reader.string(); + break; + } + case 2: { + message.longRunning = $root.google.api.MethodSettings.LongRunning.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a MethodSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.MethodSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.MethodSettings} MethodSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MethodSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a MethodSettings message. + * @function verify + * @memberof google.api.MethodSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MethodSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.selector != null && message.hasOwnProperty("selector")) + if (!$util.isString(message.selector)) + return "selector: string expected"; + if (message.longRunning != null && message.hasOwnProperty("longRunning")) { + var error = $root.google.api.MethodSettings.LongRunning.verify(message.longRunning); + if (error) + return "longRunning." + error; + } + return null; + }; + + /** + * Creates a MethodSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.MethodSettings + * @static + * @param {Object.} object Plain object + * @returns {google.api.MethodSettings} MethodSettings + */ + MethodSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.MethodSettings) + return object; + var message = new $root.google.api.MethodSettings(); + if (object.selector != null) + message.selector = String(object.selector); + if (object.longRunning != null) { + if (typeof object.longRunning !== "object") + throw TypeError(".google.api.MethodSettings.longRunning: object expected"); + message.longRunning = $root.google.api.MethodSettings.LongRunning.fromObject(object.longRunning); + } + return message; + }; + + /** + * Creates a plain object from a MethodSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.MethodSettings + * @static + * @param {google.api.MethodSettings} message MethodSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MethodSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.selector = ""; + object.longRunning = null; + } + if (message.selector != null && message.hasOwnProperty("selector")) + object.selector = message.selector; + if (message.longRunning != null && message.hasOwnProperty("longRunning")) + object.longRunning = $root.google.api.MethodSettings.LongRunning.toObject(message.longRunning, options); + return object; + }; + + /** + * Converts this MethodSettings to JSON. + * @function toJSON + * @memberof google.api.MethodSettings + * @instance + * @returns {Object.} JSON object + */ + MethodSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for MethodSettings + * @function getTypeUrl + * @memberof google.api.MethodSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + MethodSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.MethodSettings"; + }; + + MethodSettings.LongRunning = (function() { + + /** + * Properties of a LongRunning. + * @memberof google.api.MethodSettings + * @interface ILongRunning + * @property {google.protobuf.IDuration|null} [initialPollDelay] LongRunning initialPollDelay + * @property {number|null} [pollDelayMultiplier] LongRunning pollDelayMultiplier + * @property {google.protobuf.IDuration|null} [maxPollDelay] LongRunning maxPollDelay + * @property {google.protobuf.IDuration|null} [totalPollTimeout] LongRunning totalPollTimeout + */ + + /** + * Constructs a new LongRunning. + * @memberof google.api.MethodSettings + * @classdesc Represents a LongRunning. + * @implements ILongRunning + * @constructor + * @param {google.api.MethodSettings.ILongRunning=} [properties] Properties to set + */ + function LongRunning(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * LongRunning initialPollDelay. + * @member {google.protobuf.IDuration|null|undefined} initialPollDelay + * @memberof google.api.MethodSettings.LongRunning + * @instance + */ + LongRunning.prototype.initialPollDelay = null; + + /** + * LongRunning pollDelayMultiplier. + * @member {number} pollDelayMultiplier + * @memberof google.api.MethodSettings.LongRunning + * @instance + */ + LongRunning.prototype.pollDelayMultiplier = 0; + + /** + * LongRunning maxPollDelay. + * @member {google.protobuf.IDuration|null|undefined} maxPollDelay + * @memberof google.api.MethodSettings.LongRunning + * @instance + */ + LongRunning.prototype.maxPollDelay = null; + + /** + * LongRunning totalPollTimeout. + * @member {google.protobuf.IDuration|null|undefined} totalPollTimeout + * @memberof google.api.MethodSettings.LongRunning + * @instance + */ + LongRunning.prototype.totalPollTimeout = null; + + /** + * Creates a new LongRunning instance using the specified properties. + * @function create + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {google.api.MethodSettings.ILongRunning=} [properties] Properties to set + * @returns {google.api.MethodSettings.LongRunning} LongRunning instance + */ + LongRunning.create = function create(properties) { + return new LongRunning(properties); + }; + + /** + * Encodes the specified LongRunning message. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. + * @function encode + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {google.api.MethodSettings.ILongRunning} message LongRunning message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + LongRunning.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.initialPollDelay != null && Object.hasOwnProperty.call(message, "initialPollDelay")) + $root.google.protobuf.Duration.encode(message.initialPollDelay, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.pollDelayMultiplier != null && Object.hasOwnProperty.call(message, "pollDelayMultiplier")) + writer.uint32(/* id 2, wireType 5 =*/21).float(message.pollDelayMultiplier); + if (message.maxPollDelay != null && Object.hasOwnProperty.call(message, "maxPollDelay")) + $root.google.protobuf.Duration.encode(message.maxPollDelay, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.totalPollTimeout != null && Object.hasOwnProperty.call(message, "totalPollTimeout")) + $root.google.protobuf.Duration.encode(message.totalPollTimeout, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified LongRunning message, length delimited. Does not implicitly {@link google.api.MethodSettings.LongRunning.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {google.api.MethodSettings.ILongRunning} message LongRunning message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + LongRunning.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a LongRunning message from the specified reader or buffer. + * @function decode + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.MethodSettings.LongRunning} LongRunning + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + LongRunning.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.MethodSettings.LongRunning(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.initialPollDelay = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + case 2: { + message.pollDelayMultiplier = reader.float(); + break; + } + case 3: { + message.maxPollDelay = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + case 4: { + message.totalPollTimeout = $root.google.protobuf.Duration.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a LongRunning message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.MethodSettings.LongRunning} LongRunning + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + LongRunning.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a LongRunning message. + * @function verify + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + LongRunning.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.initialPollDelay != null && message.hasOwnProperty("initialPollDelay")) { + var error = $root.google.protobuf.Duration.verify(message.initialPollDelay); + if (error) + return "initialPollDelay." + error; + } + if (message.pollDelayMultiplier != null && message.hasOwnProperty("pollDelayMultiplier")) + if (typeof message.pollDelayMultiplier !== "number") + return "pollDelayMultiplier: number expected"; + if (message.maxPollDelay != null && message.hasOwnProperty("maxPollDelay")) { + var error = $root.google.protobuf.Duration.verify(message.maxPollDelay); + if (error) + return "maxPollDelay." + error; + } + if (message.totalPollTimeout != null && message.hasOwnProperty("totalPollTimeout")) { + var error = $root.google.protobuf.Duration.verify(message.totalPollTimeout); + if (error) + return "totalPollTimeout." + error; + } + return null; + }; + + /** + * Creates a LongRunning message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {Object.} object Plain object + * @returns {google.api.MethodSettings.LongRunning} LongRunning + */ + LongRunning.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.MethodSettings.LongRunning) + return object; + var message = new $root.google.api.MethodSettings.LongRunning(); + if (object.initialPollDelay != null) { + if (typeof object.initialPollDelay !== "object") + throw TypeError(".google.api.MethodSettings.LongRunning.initialPollDelay: object expected"); + message.initialPollDelay = $root.google.protobuf.Duration.fromObject(object.initialPollDelay); + } + if (object.pollDelayMultiplier != null) + message.pollDelayMultiplier = Number(object.pollDelayMultiplier); + if (object.maxPollDelay != null) { + if (typeof object.maxPollDelay !== "object") + throw TypeError(".google.api.MethodSettings.LongRunning.maxPollDelay: object expected"); + message.maxPollDelay = $root.google.protobuf.Duration.fromObject(object.maxPollDelay); + } + if (object.totalPollTimeout != null) { + if (typeof object.totalPollTimeout !== "object") + throw TypeError(".google.api.MethodSettings.LongRunning.totalPollTimeout: object expected"); + message.totalPollTimeout = $root.google.protobuf.Duration.fromObject(object.totalPollTimeout); + } + return message; + }; + + /** + * Creates a plain object from a LongRunning message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {google.api.MethodSettings.LongRunning} message LongRunning + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + LongRunning.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.initialPollDelay = null; + object.pollDelayMultiplier = 0; + object.maxPollDelay = null; + object.totalPollTimeout = null; + } + if (message.initialPollDelay != null && message.hasOwnProperty("initialPollDelay")) + object.initialPollDelay = $root.google.protobuf.Duration.toObject(message.initialPollDelay, options); + if (message.pollDelayMultiplier != null && message.hasOwnProperty("pollDelayMultiplier")) + object.pollDelayMultiplier = options.json && !isFinite(message.pollDelayMultiplier) ? String(message.pollDelayMultiplier) : message.pollDelayMultiplier; + if (message.maxPollDelay != null && message.hasOwnProperty("maxPollDelay")) + object.maxPollDelay = $root.google.protobuf.Duration.toObject(message.maxPollDelay, options); + if (message.totalPollTimeout != null && message.hasOwnProperty("totalPollTimeout")) + object.totalPollTimeout = $root.google.protobuf.Duration.toObject(message.totalPollTimeout, options); + return object; + }; + + /** + * Converts this LongRunning to JSON. + * @function toJSON + * @memberof google.api.MethodSettings.LongRunning + * @instance + * @returns {Object.} JSON object + */ + LongRunning.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for LongRunning + * @function getTypeUrl + * @memberof google.api.MethodSettings.LongRunning + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + LongRunning.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.MethodSettings.LongRunning"; + }; + + return LongRunning; + })(); + + return MethodSettings; + })(); + + /** + * ClientLibraryOrganization enum. + * @name google.api.ClientLibraryOrganization + * @enum {number} + * @property {number} CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED=0 CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED value + * @property {number} CLOUD=1 CLOUD value + * @property {number} ADS=2 ADS value + * @property {number} PHOTOS=3 PHOTOS value + * @property {number} STREET_VIEW=4 STREET_VIEW value + */ + api.ClientLibraryOrganization = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED"] = 0; + values[valuesById[1] = "CLOUD"] = 1; + values[valuesById[2] = "ADS"] = 2; + values[valuesById[3] = "PHOTOS"] = 3; + values[valuesById[4] = "STREET_VIEW"] = 4; + return values; + })(); + + /** + * ClientLibraryDestination enum. + * @name google.api.ClientLibraryDestination + * @enum {number} + * @property {number} CLIENT_LIBRARY_DESTINATION_UNSPECIFIED=0 CLIENT_LIBRARY_DESTINATION_UNSPECIFIED value + * @property {number} GITHUB=10 GITHUB value + * @property {number} PACKAGE_MANAGER=20 PACKAGE_MANAGER value + */ + api.ClientLibraryDestination = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED"] = 0; + values[valuesById[10] = "GITHUB"] = 10; + values[valuesById[20] = "PACKAGE_MANAGER"] = 20; + return values; + })(); + + /** + * LaunchStage enum. + * @name google.api.LaunchStage + * @enum {number} + * @property {number} LAUNCH_STAGE_UNSPECIFIED=0 LAUNCH_STAGE_UNSPECIFIED value + * @property {number} UNIMPLEMENTED=6 UNIMPLEMENTED value + * @property {number} PRELAUNCH=7 PRELAUNCH value + * @property {number} EARLY_ACCESS=1 EARLY_ACCESS value + * @property {number} ALPHA=2 ALPHA value + * @property {number} BETA=3 BETA value + * @property {number} GA=4 GA value + * @property {number} DEPRECATED=5 DEPRECATED value + */ + api.LaunchStage = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "LAUNCH_STAGE_UNSPECIFIED"] = 0; + values[valuesById[6] = "UNIMPLEMENTED"] = 6; + values[valuesById[7] = "PRELAUNCH"] = 7; + values[valuesById[1] = "EARLY_ACCESS"] = 1; + values[valuesById[2] = "ALPHA"] = 2; + values[valuesById[3] = "BETA"] = 3; + values[valuesById[4] = "GA"] = 4; + values[valuesById[5] = "DEPRECATED"] = 5; + return values; + })(); + /** * FieldBehavior enum. * @name google.api.FieldBehavior @@ -26274,6 +29883,7 @@ * @property {boolean|null} [noStandardDescriptorAccessor] MessageOptions noStandardDescriptorAccessor * @property {boolean|null} [deprecated] MessageOptions deprecated * @property {boolean|null} [mapEntry] MessageOptions mapEntry + * @property {boolean|null} [deprecatedLegacyJsonFieldConflicts] MessageOptions deprecatedLegacyJsonFieldConflicts * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource */ @@ -26326,6 +29936,14 @@ */ MessageOptions.prototype.mapEntry = false; + /** + * MessageOptions deprecatedLegacyJsonFieldConflicts. + * @member {boolean} deprecatedLegacyJsonFieldConflicts + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.deprecatedLegacyJsonFieldConflicts = false; + /** * MessageOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -26374,6 +29992,8 @@ writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); if (message.mapEntry != null && Object.hasOwnProperty.call(message, "mapEntry")) writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); + if (message.deprecatedLegacyJsonFieldConflicts != null && Object.hasOwnProperty.call(message, "deprecatedLegacyJsonFieldConflicts")) + writer.uint32(/* id 11, wireType 0 =*/88).bool(message.deprecatedLegacyJsonFieldConflicts); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -26429,6 +30049,10 @@ message.mapEntry = reader.bool(); break; } + case 11: { + message.deprecatedLegacyJsonFieldConflicts = reader.bool(); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -26486,6 +30110,9 @@ if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) if (typeof message.mapEntry !== "boolean") return "mapEntry: boolean expected"; + if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) + if (typeof message.deprecatedLegacyJsonFieldConflicts !== "boolean") + return "deprecatedLegacyJsonFieldConflicts: boolean expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -26523,6 +30150,8 @@ message.deprecated = Boolean(object.deprecated); if (object.mapEntry != null) message.mapEntry = Boolean(object.mapEntry); + if (object.deprecatedLegacyJsonFieldConflicts != null) + message.deprecatedLegacyJsonFieldConflicts = Boolean(object.deprecatedLegacyJsonFieldConflicts); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); @@ -26561,6 +30190,7 @@ object.noStandardDescriptorAccessor = false; object.deprecated = false; object.mapEntry = false; + object.deprecatedLegacyJsonFieldConflicts = false; object[".google.api.resource"] = null; } if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) @@ -26571,6 +30201,8 @@ object.deprecated = message.deprecated; if (message.mapEntry != null && message.hasOwnProperty("mapEntry")) object.mapEntry = message.mapEntry; + if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) + object.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -26623,6 +30255,9 @@ * @property {boolean|null} [unverifiedLazy] FieldOptions unverifiedLazy * @property {boolean|null} [deprecated] FieldOptions deprecated * @property {boolean|null} [weak] FieldOptions weak + * @property {boolean|null} [debugRedact] FieldOptions debugRedact + * @property {google.protobuf.FieldOptions.OptionRetention|null} [retention] FieldOptions retention + * @property {google.protobuf.FieldOptions.OptionTargetType|null} [target] FieldOptions target * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference @@ -26701,6 +30336,30 @@ */ FieldOptions.prototype.weak = false; + /** + * FieldOptions debugRedact. + * @member {boolean} debugRedact + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.debugRedact = false; + + /** + * FieldOptions retention. + * @member {google.protobuf.FieldOptions.OptionRetention} retention + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.retention = 0; + + /** + * FieldOptions target. + * @member {google.protobuf.FieldOptions.OptionTargetType} target + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.target = 0; + /** * FieldOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -26763,6 +30422,12 @@ writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); if (message.unverifiedLazy != null && Object.hasOwnProperty.call(message, "unverifiedLazy")) writer.uint32(/* id 15, wireType 0 =*/120).bool(message.unverifiedLazy); + if (message.debugRedact != null && Object.hasOwnProperty.call(message, "debugRedact")) + writer.uint32(/* id 16, wireType 0 =*/128).bool(message.debugRedact); + if (message.retention != null && Object.hasOwnProperty.call(message, "retention")) + writer.uint32(/* id 17, wireType 0 =*/136).int32(message.retention); + if (message.target != null && Object.hasOwnProperty.call(message, "target")) + writer.uint32(/* id 18, wireType 0 =*/144).int32(message.target); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -26836,6 +30501,18 @@ message.weak = reader.bool(); break; } + case 16: { + message.debugRedact = reader.bool(); + break; + } + case 17: { + message.retention = reader.int32(); + break; + } + case 18: { + message.target = reader.int32(); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -26925,6 +30602,34 @@ if (message.weak != null && message.hasOwnProperty("weak")) if (typeof message.weak !== "boolean") return "weak: boolean expected"; + if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) + if (typeof message.debugRedact !== "boolean") + return "debugRedact: boolean expected"; + if (message.retention != null && message.hasOwnProperty("retention")) + switch (message.retention) { + default: + return "retention: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.target != null && message.hasOwnProperty("target")) + switch (message.target) { + default: + return "target: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + break; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -27022,6 +30727,76 @@ message.deprecated = Boolean(object.deprecated); if (object.weak != null) message.weak = Boolean(object.weak); + if (object.debugRedact != null) + message.debugRedact = Boolean(object.debugRedact); + switch (object.retention) { + default: + if (typeof object.retention === "number") { + message.retention = object.retention; + break; + } + break; + case "RETENTION_UNKNOWN": + case 0: + message.retention = 0; + break; + case "RETENTION_RUNTIME": + case 1: + message.retention = 1; + break; + case "RETENTION_SOURCE": + case 2: + message.retention = 2; + break; + } + switch (object.target) { + default: + if (typeof object.target === "number") { + message.target = object.target; + break; + } + break; + case "TARGET_TYPE_UNKNOWN": + case 0: + message.target = 0; + break; + case "TARGET_TYPE_FILE": + case 1: + message.target = 1; + break; + case "TARGET_TYPE_EXTENSION_RANGE": + case 2: + message.target = 2; + break; + case "TARGET_TYPE_MESSAGE": + case 3: + message.target = 3; + break; + case "TARGET_TYPE_FIELD": + case 4: + message.target = 4; + break; + case "TARGET_TYPE_ONEOF": + case 5: + message.target = 5; + break; + case "TARGET_TYPE_ENUM": + case 6: + message.target = 6; + break; + case "TARGET_TYPE_ENUM_ENTRY": + case 7: + message.target = 7; + break; + case "TARGET_TYPE_SERVICE": + case 8: + message.target = 8; + break; + case "TARGET_TYPE_METHOD": + case 9: + message.target = 9; + break; + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); @@ -27110,6 +30885,9 @@ object.jstype = options.enums === String ? "JS_NORMAL" : 0; object.weak = false; object.unverifiedLazy = false; + object.debugRedact = false; + object.retention = options.enums === String ? "RETENTION_UNKNOWN" : 0; + object.target = options.enums === String ? "TARGET_TYPE_UNKNOWN" : 0; object[".google.api.resourceReference"] = null; } if (message.ctype != null && message.hasOwnProperty("ctype")) @@ -27126,6 +30904,12 @@ object.weak = message.weak; if (message.unverifiedLazy != null && message.hasOwnProperty("unverifiedLazy")) object.unverifiedLazy = message.unverifiedLazy; + if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) + object.debugRedact = message.debugRedact; + if (message.retention != null && message.hasOwnProperty("retention")) + object.retention = options.enums === String ? $root.google.protobuf.FieldOptions.OptionRetention[message.retention] === undefined ? message.retention : $root.google.protobuf.FieldOptions.OptionRetention[message.retention] : message.retention; + if (message.target != null && message.hasOwnProperty("target")) + object.target = options.enums === String ? $root.google.protobuf.FieldOptions.OptionTargetType[message.target] === undefined ? message.target : $root.google.protobuf.FieldOptions.OptionTargetType[message.target] : message.target; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -27199,6 +30983,52 @@ return values; })(); + /** + * OptionRetention enum. + * @name google.protobuf.FieldOptions.OptionRetention + * @enum {number} + * @property {number} RETENTION_UNKNOWN=0 RETENTION_UNKNOWN value + * @property {number} RETENTION_RUNTIME=1 RETENTION_RUNTIME value + * @property {number} RETENTION_SOURCE=2 RETENTION_SOURCE value + */ + FieldOptions.OptionRetention = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "RETENTION_UNKNOWN"] = 0; + values[valuesById[1] = "RETENTION_RUNTIME"] = 1; + values[valuesById[2] = "RETENTION_SOURCE"] = 2; + return values; + })(); + + /** + * OptionTargetType enum. + * @name google.protobuf.FieldOptions.OptionTargetType + * @enum {number} + * @property {number} TARGET_TYPE_UNKNOWN=0 TARGET_TYPE_UNKNOWN value + * @property {number} TARGET_TYPE_FILE=1 TARGET_TYPE_FILE value + * @property {number} TARGET_TYPE_EXTENSION_RANGE=2 TARGET_TYPE_EXTENSION_RANGE value + * @property {number} TARGET_TYPE_MESSAGE=3 TARGET_TYPE_MESSAGE value + * @property {number} TARGET_TYPE_FIELD=4 TARGET_TYPE_FIELD value + * @property {number} TARGET_TYPE_ONEOF=5 TARGET_TYPE_ONEOF value + * @property {number} TARGET_TYPE_ENUM=6 TARGET_TYPE_ENUM value + * @property {number} TARGET_TYPE_ENUM_ENTRY=7 TARGET_TYPE_ENUM_ENTRY value + * @property {number} TARGET_TYPE_SERVICE=8 TARGET_TYPE_SERVICE value + * @property {number} TARGET_TYPE_METHOD=9 TARGET_TYPE_METHOD value + */ + FieldOptions.OptionTargetType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "TARGET_TYPE_UNKNOWN"] = 0; + values[valuesById[1] = "TARGET_TYPE_FILE"] = 1; + values[valuesById[2] = "TARGET_TYPE_EXTENSION_RANGE"] = 2; + values[valuesById[3] = "TARGET_TYPE_MESSAGE"] = 3; + values[valuesById[4] = "TARGET_TYPE_FIELD"] = 4; + values[valuesById[5] = "TARGET_TYPE_ONEOF"] = 5; + values[valuesById[6] = "TARGET_TYPE_ENUM"] = 6; + values[valuesById[7] = "TARGET_TYPE_ENUM_ENTRY"] = 7; + values[valuesById[8] = "TARGET_TYPE_SERVICE"] = 8; + values[valuesById[9] = "TARGET_TYPE_METHOD"] = 9; + return values; + })(); + return FieldOptions; })(); @@ -27434,6 +31264,7 @@ * @interface IEnumOptions * @property {boolean|null} [allowAlias] EnumOptions allowAlias * @property {boolean|null} [deprecated] EnumOptions deprecated + * @property {boolean|null} [deprecatedLegacyJsonFieldConflicts] EnumOptions deprecatedLegacyJsonFieldConflicts * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption */ @@ -27469,6 +31300,14 @@ */ EnumOptions.prototype.deprecated = false; + /** + * EnumOptions deprecatedLegacyJsonFieldConflicts. + * @member {boolean} deprecatedLegacyJsonFieldConflicts + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.deprecatedLegacyJsonFieldConflicts = false; + /** * EnumOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -27505,6 +31344,8 @@ writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); + if (message.deprecatedLegacyJsonFieldConflicts != null && Object.hasOwnProperty.call(message, "deprecatedLegacyJsonFieldConflicts")) + writer.uint32(/* id 6, wireType 0 =*/48).bool(message.deprecatedLegacyJsonFieldConflicts); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -27550,6 +31391,10 @@ message.deprecated = reader.bool(); break; } + case 6: { + message.deprecatedLegacyJsonFieldConflicts = reader.bool(); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -27597,6 +31442,9 @@ if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; + if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) + if (typeof message.deprecatedLegacyJsonFieldConflicts !== "boolean") + return "deprecatedLegacyJsonFieldConflicts: boolean expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -27625,6 +31473,8 @@ message.allowAlias = Boolean(object.allowAlias); if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); + if (object.deprecatedLegacyJsonFieldConflicts != null) + message.deprecatedLegacyJsonFieldConflicts = Boolean(object.deprecatedLegacyJsonFieldConflicts); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); @@ -27656,11 +31506,14 @@ if (options.defaults) { object.allowAlias = false; object.deprecated = false; + object.deprecatedLegacyJsonFieldConflicts = false; } if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) object.allowAlias = message.allowAlias; if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; + if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) + object.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 646f8fce888..d92936908ba 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2179,6 +2179,248 @@ "id": 1050, "extend": "google.protobuf.ServiceOptions" }, + "CommonLanguageSettings": { + "fields": { + "referenceDocsUri": { + "type": "string", + "id": 1, + "options": { + "deprecated": true + } + }, + "destinations": { + "rule": "repeated", + "type": "ClientLibraryDestination", + "id": 2 + } + } + }, + "ClientLibrarySettings": { + "fields": { + "version": { + "type": "string", + "id": 1 + }, + "launchStage": { + "type": "LaunchStage", + "id": 2 + }, + "restNumericEnums": { + "type": "bool", + "id": 3 + }, + "javaSettings": { + "type": "JavaSettings", + "id": 21 + }, + "cppSettings": { + "type": "CppSettings", + "id": 22 + }, + "phpSettings": { + "type": "PhpSettings", + "id": 23 + }, + "pythonSettings": { + "type": "PythonSettings", + "id": 24 + }, + "nodeSettings": { + "type": "NodeSettings", + "id": 25 + }, + "dotnetSettings": { + "type": "DotnetSettings", + "id": 26 + }, + "rubySettings": { + "type": "RubySettings", + "id": 27 + }, + "goSettings": { + "type": "GoSettings", + "id": 28 + } + } + }, + "Publishing": { + "fields": { + "methodSettings": { + "rule": "repeated", + "type": "MethodSettings", + "id": 2 + }, + "newIssueUri": { + "type": "string", + "id": 101 + }, + "documentationUri": { + "type": "string", + "id": 102 + }, + "apiShortName": { + "type": "string", + "id": 103 + }, + "githubLabel": { + "type": "string", + "id": 104 + }, + "codeownerGithubTeams": { + "rule": "repeated", + "type": "string", + "id": 105 + }, + "docTagPrefix": { + "type": "string", + "id": 106 + }, + "organization": { + "type": "ClientLibraryOrganization", + "id": 107 + }, + "librarySettings": { + "rule": "repeated", + "type": "ClientLibrarySettings", + "id": 109 + } + } + }, + "JavaSettings": { + "fields": { + "libraryPackage": { + "type": "string", + "id": 1 + }, + "serviceClassNames": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "common": { + "type": "CommonLanguageSettings", + "id": 3 + } + } + }, + "CppSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "PhpSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "PythonSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "NodeSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "DotnetSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "RubySettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "GoSettings": { + "fields": { + "common": { + "type": "CommonLanguageSettings", + "id": 1 + } + } + }, + "MethodSettings": { + "fields": { + "selector": { + "type": "string", + "id": 1 + }, + "longRunning": { + "type": "LongRunning", + "id": 2 + } + }, + "nested": { + "LongRunning": { + "fields": { + "initialPollDelay": { + "type": "google.protobuf.Duration", + "id": 1 + }, + "pollDelayMultiplier": { + "type": "float", + "id": 2 + }, + "maxPollDelay": { + "type": "google.protobuf.Duration", + "id": 3 + }, + "totalPollTimeout": { + "type": "google.protobuf.Duration", + "id": 4 + } + } + } + } + }, + "ClientLibraryOrganization": { + "values": { + "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED": 0, + "CLOUD": 1, + "ADS": 2, + "PHOTOS": 3, + "STREET_VIEW": 4 + } + }, + "ClientLibraryDestination": { + "values": { + "CLIENT_LIBRARY_DESTINATION_UNSPECIFIED": 0, + "GITHUB": 10, + "PACKAGE_MANAGER": 20 + } + }, + "LaunchStage": { + "values": { + "LAUNCH_STAGE_UNSPECIFIED": 0, + "UNIMPLEMENTED": 6, + "PRELAUNCH": 7, + "EARLY_ACCESS": 1, + "ALPHA": 2, + "BETA": 3, + "GA": 4, + "DEPRECATED": 5 + } + }, "fieldBehavior": { "rule": "repeated", "type": "google.api.FieldBehavior", @@ -2828,6 +3070,13 @@ "type": "bool", "id": 7 }, + "deprecatedLegacyJsonFieldConflicts": { + "type": "bool", + "id": 11, + "options": { + "deprecated": true + } + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -2911,6 +3160,21 @@ "default": false } }, + "debugRedact": { + "type": "bool", + "id": 16, + "options": { + "default": false + } + }, + "retention": { + "type": "OptionRetention", + "id": 17 + }, + "target": { + "type": "OptionTargetType", + "id": 18 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -2943,6 +3207,27 @@ "JS_STRING": 1, "JS_NUMBER": 2 } + }, + "OptionRetention": { + "values": { + "RETENTION_UNKNOWN": 0, + "RETENTION_RUNTIME": 1, + "RETENTION_SOURCE": 2 + } + }, + "OptionTargetType": { + "values": { + "TARGET_TYPE_UNKNOWN": 0, + "TARGET_TYPE_FILE": 1, + "TARGET_TYPE_EXTENSION_RANGE": 2, + "TARGET_TYPE_MESSAGE": 3, + "TARGET_TYPE_FIELD": 4, + "TARGET_TYPE_ONEOF": 5, + "TARGET_TYPE_ENUM": 6, + "TARGET_TYPE_ENUM_ENTRY": 7, + "TARGET_TYPE_SERVICE": 8, + "TARGET_TYPE_METHOD": 9 + } } } }, @@ -2974,6 +3259,13 @@ "default": false } }, + "deprecatedLegacyJsonFieldConflicts": { + "type": "bool", + "id": 6, + "options": { + "deprecated": true + } + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 1c85b84eaee..cfdcf8da3f4 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -427,9 +427,8 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Topic | Topic}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ createTopic( @@ -515,9 +514,8 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Topic | Topic}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ updateTopic( @@ -600,9 +598,8 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.PublishResponse | PublishResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.PublishResponse|PublishResponse}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ publish( @@ -682,9 +679,8 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Topic | Topic}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ getTopic( @@ -768,9 +764,8 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ deleteTopic( @@ -853,9 +848,8 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.DetachSubscriptionResponse | DetachSubscriptionResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.DetachSubscriptionResponse|DetachSubscriptionResponse}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ detachSubscription( @@ -942,14 +936,13 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of {@link google.pubsub.v1.Topic | Topic}. + * The first element of the array is Array of {@link protos.google.pubsub.v1.Topic|Topic}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. * We recommend using `listTopicsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopics( @@ -1035,13 +1028,12 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing {@link google.pubsub.v1.Topic | Topic} on 'data' event. + * An object stream which emits an object representing {@link protos.google.pubsub.v1.Topic|Topic} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listTopicsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopicsStream( @@ -1084,12 +1076,11 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }. * When you iterate the returned iterable, each element will be an object representing - * {@link google.pubsub.v1.Topic | Topic}. The API will be called under the hood as needed, once per the page, + * {@link protos.google.pubsub.v1.Topic|Topic}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopicsAsync( @@ -1136,8 +1127,7 @@ export class PublisherClient { * Note that it can affect your quota. * We recommend using `listTopicSubscriptionsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopicSubscriptions( @@ -1240,8 +1230,7 @@ export class PublisherClient { * times as needed. Note that it can affect your quota. * We recommend using `listTopicSubscriptionsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopicSubscriptionsStream( @@ -1284,12 +1273,11 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }. * When you iterate the returned iterable, each element will be an object representing * string. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopicSubscriptionsAsync( @@ -1340,8 +1328,7 @@ export class PublisherClient { * Note that it can affect your quota. * We recommend using `listTopicSnapshotsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopicSnapshots( @@ -1434,8 +1421,7 @@ export class PublisherClient { * times as needed. Note that it can affect your quota. * We recommend using `listTopicSnapshotsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopicSnapshotsStream( @@ -1478,12 +1464,11 @@ export class PublisherClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }. * When you iterate the returned iterable, each element will be an object representing * string. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listTopicSnapshotsAsync( @@ -1567,8 +1552,7 @@ export class PublisherClient { * @param {string[]} request.permissions * The set of permissions to check for the `resource`. Permissions with * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * information see {@link https://cloud.google.com/iam/docs/overview#permissions | IAM Overview }. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. @@ -1615,8 +1599,7 @@ export class PublisherClient { * @param {string[]} request.permissions * The set of permissions to check for the `resource`. Permissions with * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * information see {@link https://cloud.google.com/iam/docs/overview#permissions | IAM Overview }. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 2e73791f82e..6e0fbd5ea6a 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -384,9 +384,8 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ createSchema( @@ -469,9 +468,8 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ getSchema( @@ -553,9 +551,8 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ commitSchema( @@ -639,9 +636,8 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ rollbackSchema( @@ -727,9 +723,8 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Schema | Schema}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ deleteSchemaRevision( @@ -811,9 +806,8 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ deleteSchema( @@ -895,9 +889,8 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.ValidateSchemaResponse | ValidateSchemaResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.ValidateSchemaResponse|ValidateSchemaResponse}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ validateSchema( @@ -987,9 +980,8 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.ValidateMessageResponse | ValidateMessageResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.ValidateMessageResponse|ValidateMessageResponse}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ validateMessage( @@ -1080,14 +1072,13 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of {@link google.pubsub.v1.Schema | Schema}. + * The first element of the array is Array of {@link protos.google.pubsub.v1.Schema|Schema}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. * We recommend using `listSchemasAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSchemas( @@ -1177,13 +1168,12 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing {@link google.pubsub.v1.Schema | Schema} on 'data' event. + * An object stream which emits an object representing {@link protos.google.pubsub.v1.Schema|Schema} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listSchemasAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSchemasStream( @@ -1230,12 +1220,11 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }. * When you iterate the returned iterable, each element will be an object representing - * {@link google.pubsub.v1.Schema | Schema}. The API will be called under the hood as needed, once per the page, + * {@link protos.google.pubsub.v1.Schema|Schema}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSchemasAsync( @@ -1278,14 +1267,13 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of {@link google.pubsub.v1.Schema | Schema}. + * The first element of the array is Array of {@link protos.google.pubsub.v1.Schema|Schema}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. * We recommend using `listSchemaRevisionsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSchemaRevisions( @@ -1375,13 +1363,12 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing {@link google.pubsub.v1.Schema | Schema} on 'data' event. + * An object stream which emits an object representing {@link protos.google.pubsub.v1.Schema|Schema} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listSchemaRevisionsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSchemaRevisionsStream( @@ -1426,12 +1413,11 @@ export class SchemaServiceClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }. * When you iterate the returned iterable, each element will be an object representing - * {@link google.pubsub.v1.Schema | Schema}. The API will be called under the hood as needed, once per the page, + * {@link protos.google.pubsub.v1.Schema|Schema}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSchemaRevisionsAsync( @@ -1515,8 +1501,7 @@ export class SchemaServiceClient { * @param {string[]} request.permissions * The set of permissions to check for the `resource`. Permissions with * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * information see {@link https://cloud.google.com/iam/docs/overview#permissions | IAM Overview }. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. @@ -1563,8 +1548,7 @@ export class SchemaServiceClient { * @param {string[]} request.permissions * The set of permissions to check for the `resource`. Permissions with * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * information see {@link https://cloud.google.com/iam/docs/overview#permissions | IAM Overview }. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 2ac21d3e50f..7360069495d 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -533,9 +533,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Subscription | Subscription}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ createSubscription( @@ -615,9 +614,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Subscription | Subscription}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ getSubscription( @@ -700,9 +698,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Subscription | Subscription}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ updateSubscription( @@ -786,9 +783,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ deleteSubscription( @@ -883,9 +879,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ modifyAckDeadline( @@ -975,9 +970,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ acknowledge( @@ -1069,9 +1063,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.PullResponse | PullResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.PullResponse|PullResponse}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ pull( @@ -1163,9 +1156,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ modifyPushConfig( @@ -1249,9 +1241,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Snapshot | Snapshot}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ getSnapshot( @@ -1363,9 +1354,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Snapshot | Snapshot}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ createSnapshot( @@ -1451,9 +1441,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.Snapshot | Snapshot}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ updateSnapshot( @@ -1541,9 +1530,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.protobuf.Empty | Empty}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ deleteSnapshot( @@ -1644,9 +1632,8 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is an object representing {@link google.pubsub.v1.SeekResponse | SeekResponse}. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) + * The first element of the array is an object representing {@link protos.google.pubsub.v1.SeekResponse|SeekResponse}. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. */ seek( @@ -1729,10 +1716,9 @@ export class SubscriberClient { * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} * An object stream which is both readable and writable. It accepts objects - * representing {@link google.pubsub.v1.StreamingPullRequest | StreamingPullRequest} for write() method, and - * will emit objects representing {@link google.pubsub.v1.StreamingPullResponse | StreamingPullResponse} on 'data' event asynchronously. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming) + * representing {@link protos.google.pubsub.v1.StreamingPullRequest|StreamingPullRequest} for write() method, and + * will emit objects representing {@link protos.google.pubsub.v1.StreamingPullResponse|StreamingPullResponse} on 'data' event asynchronously. + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming | documentation } * for more details and examples. */ streamingPull(options?: CallOptions): gax.CancellableStream { @@ -1757,14 +1743,13 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of {@link google.pubsub.v1.Subscription | Subscription}. + * The first element of the array is Array of {@link protos.google.pubsub.v1.Subscription|Subscription}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. * We recommend using `listSubscriptionsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSubscriptions( @@ -1850,13 +1835,12 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing {@link google.pubsub.v1.Subscription | Subscription} on 'data' event. + * An object stream which emits an object representing {@link protos.google.pubsub.v1.Subscription|Subscription} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listSubscriptionsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSubscriptionsStream( @@ -1899,12 +1883,11 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }. * When you iterate the returned iterable, each element will be an object representing - * {@link google.pubsub.v1.Subscription | Subscription}. The API will be called under the hood as needed, once per the page, + * {@link protos.google.pubsub.v1.Subscription|Subscription}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSubscriptionsAsync( @@ -1949,14 +1932,13 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. - * The first element of the array is Array of {@link google.pubsub.v1.Snapshot | Snapshot}. + * The first element of the array is Array of {@link protos.google.pubsub.v1.Snapshot|Snapshot}. * The client library will perform auto-pagination by default: it will call the API as many * times as needed and will merge results from all the pages into this array. * Note that it can affect your quota. * We recommend using `listSnapshotsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSnapshots( @@ -2042,13 +2024,12 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} - * An object stream which emits an object representing {@link google.pubsub.v1.Snapshot | Snapshot} on 'data' event. + * An object stream which emits an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot} on 'data' event. * The client library will perform auto-pagination by default: it will call the API as many * times as needed. Note that it can affect your quota. * We recommend using `listSnapshotsAsync()` * method described below for async iteration which you can stop as needed. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSnapshotsStream( @@ -2091,12 +2072,11 @@ export class SubscriberClient { * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} - * An iterable Object that allows [async iteration](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols). + * An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }. * When you iterate the returned iterable, each element will be an object representing - * {@link google.pubsub.v1.Snapshot | Snapshot}. The API will be called under the hood as needed, once per the page, + * {@link protos.google.pubsub.v1.Snapshot|Snapshot}. The API will be called under the hood as needed, once per the page, * so you can stop the iteration when you don't need more results. - * Please see the - * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) + * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. */ listSnapshotsAsync( @@ -2180,8 +2160,7 @@ export class SubscriberClient { * @param {string[]} request.permissions * The set of permissions to check for the `resource`. Permissions with * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * information see {@link https://cloud.google.com/iam/docs/overview#permissions | IAM Overview }. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. @@ -2228,8 +2207,7 @@ export class SubscriberClient { * @param {string[]} request.permissions * The set of permissions to check for the `resource`. Permissions with * wildcards (such as '*' or 'storage.*') are not allowed. For more - * information see - * [IAM Overview](https://cloud.google.com/iam/docs/overview#permissions). + * information see {@link https://cloud.google.com/iam/docs/overview#permissions | IAM Overview }. * @param {Object} [options] * Optional parameters. You can override the default settings for this call, e.g, timeout, * retries, paginations, etc. See {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html | gax.CallOptions} for the details. From 7721862ff7ed440a3e887158597763902ce50b57 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 17:01:58 -0400 Subject: [PATCH 0945/1115] build: update Node.js version and base Debian version (#1793) * build: update Node.js version and base Debian version * test: update Python and Node versions in container test YAMLs Source-Link: https://github.com/googleapis/synthtool/commit/f54a720df6ece8ead2bf2a888df1194d7a339fb6 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:aeccbef8061fc122542e8f381c4e7b66b32e23dda522e94c68346585dc408f0d Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 59632da029f..38c4af2f816 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -14,4 +14,4 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest digest: sha256:aeccbef8061fc122542e8f381c4e7b66b32e23dda522e94c68346585dc408f0d -# created: 2023-08-01T22:29:52.50398591Z +# created: 2023-08-03T18:13:22.932171473Z From 70ba60c63fa0c5e9e0d149ba16ab45bd8cde244e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 17:05:37 -0400 Subject: [PATCH 0946/1115] docs: fix node release schedule link (#1794) Co-authored-by: Jeffrey Rennie Source-Link: https://github.com/googleapis/synthtool/commit/1a2431537d603e95b4b32317fb494542f75a2165 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:e08f9a3757808cdaf7a377e962308c65c4d7eff12db206d4fae702dd50d43430 Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 0b3091c38a0..ceefb38918f 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -184,7 +184,7 @@ also contains samples. ## Supported Node.js Versions -Our client libraries follow the [Node.js release schedule](https://nodejs.org/en/about/releases/). +Our client libraries follow the [Node.js release schedule](https://github.com/nodejs/release#release-schedule). Libraries are compatible with all current _active_ and _maintenance_ versions of Node.js. If you are using an end-of-life version of Node.js, we recommend that you update From fd990ae268a8a52948c986bdeff18e46c0126c47 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 21:30:14 +0000 Subject: [PATCH 0947/1115] chore(main): release 4.0.0 (#1791) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [4.0.0](https://togithub.com/googleapis/nodejs-pubsub/compare/v3.7.3...v4.0.0) (2023-08-03) ### ⚠ BREAKING CHANGES * node 12 eos ([#1774](https://togithub.com/googleapis/nodejs-pubsub/issues/1774)) (#1784) ### Features * Node 12 eos ([#1774](https://togithub.com/googleapis/nodejs-pubsub/issues/1774)) ([#1784](https://togithub.com/googleapis/nodejs-pubsub/issues/1784)) ([47b83c1](https://togithub.com/googleapis/nodejs-pubsub/commit/47b83c18c543a7c8763256f79927a7340db56568)) ### Bug Fixes * Fix typings for IAM methods ([#1785](https://togithub.com/googleapis/nodejs-pubsub/issues/1785)) ([9a6bdbc](https://togithub.com/googleapis/nodejs-pubsub/commit/9a6bdbce952c81cb1a43fecbce16a3e3ab0f1420)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 16 ++++++++++++++++ handwritten/pubsub/README.md | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index d5981c75539..fafdb956caa 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,22 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.0.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.7.3...v4.0.0) (2023-08-03) + + +### ⚠ BREAKING CHANGES + +* node 12 eos ([#1774](https://github.com/googleapis/nodejs-pubsub/issues/1774)) (#1784) + +### Features + +* Node 12 eos ([#1774](https://github.com/googleapis/nodejs-pubsub/issues/1774)) ([#1784](https://github.com/googleapis/nodejs-pubsub/issues/1784)) ([47b83c1](https://github.com/googleapis/nodejs-pubsub/commit/47b83c18c543a7c8763256f79927a7340db56568)) + + +### Bug Fixes + +* Fix typings for IAM methods ([#1785](https://github.com/googleapis/nodejs-pubsub/issues/1785)) ([9a6bdbc](https://github.com/googleapis/nodejs-pubsub/commit/9a6bdbce952c81cb1a43fecbce16a3e3ab0f1420)) + ## [3.7.3](https://github.com/googleapis/nodejs-pubsub/compare/v3.7.2...v3.7.3) (2023-07-26) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index ceefb38918f..0b3091c38a0 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -184,7 +184,7 @@ also contains samples. ## Supported Node.js Versions -Our client libraries follow the [Node.js release schedule](https://github.com/nodejs/release#release-schedule). +Our client libraries follow the [Node.js release schedule](https://nodejs.org/en/about/releases/). Libraries are compatible with all current _active_ and _maintenance_ versions of Node.js. If you are using an end-of-life version of Node.js, we recommend that you update From f0057aaf0484dec2330bf794f7179c74ae885c01 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 12:02:39 -0400 Subject: [PATCH 0948/1115] test: disable retry-request for streaming tests (#1797) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: disable retry-request for streaming tests PiperOrigin-RevId: 554648220 Source-Link: https://github.com/googleapis/googleapis/commit/53cd9ad1b48e40cdd44e0c13e96ac0281b32828f Source-Link: https://github.com/googleapis/googleapis-gen/commit/7e8867efbed7dbfe5ef6ec3c2c92a4bce4280f7a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiN2U4ODY3ZWZiZWQ3ZGJmZTVlZjZlYzNjMmM5MmE0YmNlNDI4MGY3YSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index eb354384645..d4f03a0df2e 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -12,4 +12,3 @@ system-test/*key.json .DS_Store package-lock.json __pycache__ -*.tgz From 8a8611a2977c079190d5656363dbe18b29220d32 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 11 Aug 2023 18:27:35 +0200 Subject: [PATCH 0949/1115] fix(deps): update dependency @google-cloud/promisify to v4 (#1798) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 99e82f4ca36..033d59d0c34 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ "@google-cloud/paginator": "^4.0.1", "@google-cloud/precise-date": "^3.0.1", "@google-cloud/projectify": "^3.0.0", - "@google-cloud/promisify": "^3.0.1", + "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.0.0", "@opentelemetry/semantic-conventions": "~1.3.0", "@types/duplexify": "^3.6.0", From 2d9c1ff597a7f41db1577ed908ab7d1d2ea30d0b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 11 Aug 2023 18:44:13 +0200 Subject: [PATCH 0950/1115] fix(deps): update dependency @google-cloud/paginator to v5 (#1799) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@google-cloud/paginator](https://togithub.com/googleapis/nodejs-paginator) | [`^4.0.1` -> `^5.0.0`](https://renovatebot.com/diffs/npm/@google-cloud%2fpaginator/4.0.1/5.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@google-cloud%2fpaginator/5.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@google-cloud%2fpaginator/5.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@google-cloud%2fpaginator/4.0.1/5.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@google-cloud%2fpaginator/4.0.1/5.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/nodejs-paginator (@​google-cloud/paginator) ### [`v5.0.0`](https://togithub.com/googleapis/nodejs-paginator/blob/HEAD/CHANGELOG.md#500-2023-08-09) [Compare Source](https://togithub.com/googleapis/nodejs-paginator/compare/v4.0.1...v5.0.0) ##### ⚠ BREAKING CHANGES - update to Node 14 ([#​346](https://togithub.com/googleapis/nodejs-paginator/issues/346)) ##### Miscellaneous Chores - Update to Node 14 ([#​346](https://togithub.com/googleapis/nodejs-paginator/issues/346)) ([262ad70](https://togithub.com/googleapis/nodejs-paginator/commit/262ad70d3cc5e1aa8a67ece54c04920b24ceea09))
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 033d59d0c34..5e7915cf8b4 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -48,7 +48,7 @@ "pack": "npm pack && mv google-cloud-pubsub*.tgz samples/pubsub-current.tgz" }, "dependencies": { - "@google-cloud/paginator": "^4.0.1", + "@google-cloud/paginator": "^5.0.0", "@google-cloud/precise-date": "^3.0.1", "@google-cloud/projectify": "^3.0.0", "@google-cloud/promisify": "^4.0.0", From 4606de43b2c0b6851d73f65baa501aed2b06e180 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 11 Aug 2023 19:00:49 +0200 Subject: [PATCH 0951/1115] fix(deps): update dependency @google-cloud/projectify to v4 (#1800) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@google-cloud/projectify](https://togithub.com/googleapis/nodejs-projectify) | [`^3.0.0` -> `^4.0.0`](https://renovatebot.com/diffs/npm/@google-cloud%2fprojectify/3.0.0/4.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@google-cloud%2fprojectify/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@google-cloud%2fprojectify/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@google-cloud%2fprojectify/3.0.0/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@google-cloud%2fprojectify/3.0.0/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/nodejs-projectify (@​google-cloud/projectify) ### [`v4.0.0`](https://togithub.com/googleapis/nodejs-projectify/blob/HEAD/CHANGELOG.md#400-2023-08-09) [Compare Source](https://togithub.com/googleapis/nodejs-projectify/compare/v3.0.0...v4.0.0) ##### ⚠ BREAKING CHANGES - upgrade to Node 14 ([#​318](https://togithub.com/googleapis/nodejs-projectify/issues/318)) ##### Bug Fixes - Remove pip install statements ([#​1546](https://togithub.com/googleapis/nodejs-projectify/issues/1546)) ([#​304](https://togithub.com/googleapis/nodejs-projectify/issues/304)) ([94cfff6](https://togithub.com/googleapis/nodejs-projectify/commit/94cfff665b7c6b8916b5c59e1c7a3cca7ff29303)) ##### Miscellaneous Chores - Upgrade to Node 14 ([#​318](https://togithub.com/googleapis/nodejs-projectify/issues/318)) ([6e9da4d](https://togithub.com/googleapis/nodejs-projectify/commit/6e9da4db77fab7ed6876e755a72156960b376d57))
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 5e7915cf8b4..354f0b4783e 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -50,7 +50,7 @@ "dependencies": { "@google-cloud/paginator": "^5.0.0", "@google-cloud/precise-date": "^3.0.1", - "@google-cloud/projectify": "^3.0.0", + "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.0.0", "@opentelemetry/semantic-conventions": "~1.3.0", From a0c36f24f980e16a82601e88536bee9b3737aa6e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 11 Aug 2023 19:18:13 +0200 Subject: [PATCH 0952/1115] fix(deps): update dependency @google-cloud/precise-date to v4 (#1803) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@google-cloud/precise-date](https://togithub.com/googleapis/nodejs-precise-date) | [`^3.0.1` -> `^4.0.0`](https://renovatebot.com/diffs/npm/@google-cloud%2fprecise-date/3.0.1/4.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@google-cloud%2fprecise-date/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@google-cloud%2fprecise-date/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@google-cloud%2fprecise-date/3.0.1/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@google-cloud%2fprecise-date/3.0.1/4.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/nodejs-precise-date (@​google-cloud/precise-date) ### [`v4.0.0`](https://togithub.com/googleapis/nodejs-precise-date/blob/HEAD/CHANGELOG.md#400-2023-08-10) [Compare Source](https://togithub.com/googleapis/nodejs-precise-date/compare/v3.0.1...v4.0.0) ##### ⚠ BREAKING CHANGES - upgrade to Node 14 ([#​235](https://togithub.com/googleapis/nodejs-precise-date/issues/235)) ##### Miscellaneous Chores - Upgrade to Node 14 ([#​235](https://togithub.com/googleapis/nodejs-precise-date/issues/235)) ([730c500](https://togithub.com/googleapis/nodejs-precise-date/commit/730c50022954bf4c9fbef9b6fa357266859660c3))
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 354f0b4783e..4afc0f026fb 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -49,7 +49,7 @@ }, "dependencies": { "@google-cloud/paginator": "^5.0.0", - "@google-cloud/precise-date": "^3.0.1", + "@google-cloud/precise-date": "^4.0.0", "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.0.0", From 3bac31b54d79b5875b2243b1133d0be142cc1e36 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 11 Aug 2023 19:36:39 +0200 Subject: [PATCH 0953/1115] chore(deps): update dependency jsdoc-region-tag to v3 (#1802) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [jsdoc-region-tag](https://togithub.com/googleapis/jsdoc-region-tag) | [`^2.0.0` -> `^3.0.0`](https://renovatebot.com/diffs/npm/jsdoc-region-tag/2.0.1/3.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/jsdoc-region-tag/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/jsdoc-region-tag/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/jsdoc-region-tag/2.0.1/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/jsdoc-region-tag/2.0.1/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/jsdoc-region-tag (jsdoc-region-tag) ### [`v3.0.0`](https://togithub.com/googleapis/jsdoc-region-tag/blob/HEAD/CHANGELOG.md#300-2023-08-10) [Compare Source](https://togithub.com/googleapis/jsdoc-region-tag/compare/v2.0.1...v3.0.0) ##### ⚠ BREAKING CHANGES - upgrade to Node 14 ([#​126](https://togithub.com/googleapis/jsdoc-region-tag/issues/126)) ##### Miscellaneous Chores - Upgrade to Node 14 ([#​126](https://togithub.com/googleapis/jsdoc-region-tag/issues/126)) ([76629d1](https://togithub.com/googleapis/jsdoc-region-tag/commit/76629d1cb4bd93ee3177edb6e54ce7f3e935787d))
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4afc0f026fb..d17af13d19d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -86,7 +86,7 @@ "gts": "^5.0.0", "jsdoc": "^4.0.0", "jsdoc-fresh": "^2.0.0", - "jsdoc-region-tag": "^2.0.0", + "jsdoc-region-tag": "^3.0.0", "linkinator": "^5.0.0", "mocha": "^9.2.2", "mv": "^2.1.1", From b8112480d1eccd24ff6c39a5effe94827c715b90 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 11 Aug 2023 20:54:13 +0200 Subject: [PATCH 0954/1115] chore(deps): update dependency jsdoc-fresh to v3 (#1801) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [jsdoc-fresh](https://togithub.com/googleapis/jsdoc-fresh) | [`^2.0.0` -> `^3.0.0`](https://renovatebot.com/diffs/npm/jsdoc-fresh/2.0.2/3.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/jsdoc-fresh/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/jsdoc-fresh/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/jsdoc-fresh/2.0.2/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/jsdoc-fresh/2.0.2/3.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/jsdoc-fresh (jsdoc-fresh) ### [`v3.0.0`](https://togithub.com/googleapis/jsdoc-fresh/blob/HEAD/CHANGELOG.md#300-2023-08-10) [Compare Source](https://togithub.com/googleapis/jsdoc-fresh/compare/v2.0.2...v3.0.0) ##### ⚠ BREAKING CHANGES - upgrade to Node 14 ##### Miscellaneous Chores - Upgrade to Node 14 ([50c1a03](https://togithub.com/googleapis/jsdoc-fresh/commit/50c1a0328a2ff7b1940989b6818366535f1c47a2))
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d17af13d19d..99946408c7d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -85,7 +85,7 @@ "gapic-tools": "^0.1.7", "gts": "^5.0.0", "jsdoc": "^4.0.0", - "jsdoc-fresh": "^2.0.0", + "jsdoc-fresh": "^3.0.0", "jsdoc-region-tag": "^3.0.0", "linkinator": "^5.0.0", "mocha": "^9.2.2", From 925a20bff236fd3902058e0ed9de5ad1c261cb36 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 19:14:13 +0000 Subject: [PATCH 0955/1115] chore(main): release 4.0.1 (#1804) :robot: I have created a release *beep* *boop* --- ## [4.0.1](https://togithub.com/googleapis/nodejs-pubsub/compare/v4.0.0...v4.0.1) (2023-08-11) ### Bug Fixes * **deps:** Update dependency @google-cloud/paginator to v5 ([#1799](https://togithub.com/googleapis/nodejs-pubsub/issues/1799)) ([3195d21](https://togithub.com/googleapis/nodejs-pubsub/commit/3195d21bf817cf10daa86b019532c9405dc42405)) * **deps:** Update dependency @google-cloud/precise-date to v4 ([#1803](https://togithub.com/googleapis/nodejs-pubsub/issues/1803)) ([2c22d67](https://togithub.com/googleapis/nodejs-pubsub/commit/2c22d67b0fbaf3409101a830ee0c5be002ed6c7b)) * **deps:** Update dependency @google-cloud/projectify to v4 ([#1800](https://togithub.com/googleapis/nodejs-pubsub/issues/1800)) ([5787d56](https://togithub.com/googleapis/nodejs-pubsub/commit/5787d56b95d46544bf8c59fe4bc4cb374bc53d0a)) * **deps:** Update dependency @google-cloud/promisify to v4 ([#1798](https://togithub.com/googleapis/nodejs-pubsub/issues/1798)) ([093c46b](https://togithub.com/googleapis/nodejs-pubsub/commit/093c46bd0a4713ad9702bde03eaa5e8b0acedb28)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 10 ++++++++++ handwritten/pubsub/package.json | 9 ++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index fafdb956caa..5aafbd96a23 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,16 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.0.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.0...v4.0.1) (2023-08-11) + + +### Bug Fixes + +* **deps:** Update dependency @google-cloud/paginator to v5 ([#1799](https://github.com/googleapis/nodejs-pubsub/issues/1799)) ([3195d21](https://github.com/googleapis/nodejs-pubsub/commit/3195d21bf817cf10daa86b019532c9405dc42405)) +* **deps:** Update dependency @google-cloud/precise-date to v4 ([#1803](https://github.com/googleapis/nodejs-pubsub/issues/1803)) ([2c22d67](https://github.com/googleapis/nodejs-pubsub/commit/2c22d67b0fbaf3409101a830ee0c5be002ed6c7b)) +* **deps:** Update dependency @google-cloud/projectify to v4 ([#1800](https://github.com/googleapis/nodejs-pubsub/issues/1800)) ([5787d56](https://github.com/googleapis/nodejs-pubsub/commit/5787d56b95d46544bf8c59fe4bc4cb374bc53d0a)) +* **deps:** Update dependency @google-cloud/promisify to v4 ([#1798](https://github.com/googleapis/nodejs-pubsub/issues/1798)) ([093c46b](https://github.com/googleapis/nodejs-pubsub/commit/093c46bd0a4713ad9702bde03eaa5e8b0acedb28)) + ## [4.0.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.7.3...v4.0.0) (2023-08-03) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 99946408c7d..b1bdee92377 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.0.0", + "version": "4.0.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { @@ -29,7 +29,7 @@ "scripts": { "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", - "samples-test": "cd samples/ && npm install && npm test && cd ../", + "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", "test": "c8 mocha build/test --recursive", "lint": "gts check", "predocs": "npm run compile", @@ -43,9 +43,8 @@ "docs-test": "linkinator docs", "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js", - "prelint": "npm run pack && cd samples; npm install", - "precompile": "gts clean", - "pack": "npm pack && mv google-cloud-pubsub*.tgz samples/pubsub-current.tgz" + "prelint": "cd samples; npm link ../; npm install", + "precompile": "gts clean" }, "dependencies": { "@google-cloud/paginator": "^5.0.0", From 2a8c13e51333c1299e5c67a681a9a4ab0a667544 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:28:49 -0700 Subject: [PATCH 0956/1115] chore: update release-please post-processing for nodejs apiary (#1805) * chore: update release-please post-processing for nodejs apiary Source-Link: https://github.com/googleapis/synthtool/commit/59fe44fde9866a26e7ee4e4450fd79f67f8cf599 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:606f3d9d99a1c7cdfa7158cbb1a75bfeef490655e246a2052f9ee741740d736c Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 38c4af2f816..d9b4b9749c6 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:aeccbef8061fc122542e8f381c4e7b66b32e23dda522e94c68346585dc408f0d -# created: 2023-08-03T18:13:22.932171473Z + digest: sha256:606f3d9d99a1c7cdfa7158cbb1a75bfeef490655e246a2052f9ee741740d736c +# created: 2023-08-17T19:15:55.176034173Z diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 0b3091c38a0..ceefb38918f 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -184,7 +184,7 @@ also contains samples. ## Supported Node.js Versions -Our client libraries follow the [Node.js release schedule](https://nodejs.org/en/about/releases/). +Our client libraries follow the [Node.js release schedule](https://github.com/nodejs/release#release-schedule). Libraries are compatible with all current _active_ and _maintenance_ versions of Node.js. If you are using an end-of-life version of Node.js, we recommend that you update From 4060ed65eb0123a7100971e124070d6b90d8d560 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 14:08:28 -0400 Subject: [PATCH 0957/1115] fix: Make retry policy back off more aggressively for RPCs that retry RESOURCE_EXHAUSTD (#1806) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Make retry policy back off more aggressively for RPCs that retry RESOURCE_EXHAUSTD PiperOrigin-RevId: 557935020 Source-Link: https://github.com/googleapis/googleapis/commit/38e1f31e46d840075f14d9716b592e8a53c89855 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5bbe39d37218a420b2368c37541de5887db7d6af Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWJiZTM5ZDM3MjE4YTQyMGIyMzY4YzM3NTQxZGU1ODg3ZGI3ZDZhZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../pubsub/src/v1/publisher_client_config.json | 11 ++++++++++- .../pubsub/src/v1/subscriber_client_config.json | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client_config.json b/handwritten/pubsub/src/v1/publisher_client_config.json index 381824599ad..187d70936fc 100644 --- a/handwritten/pubsub/src/v1/publisher_client_config.json +++ b/handwritten/pubsub/src/v1/publisher_client_config.json @@ -34,6 +34,15 @@ "rpc_timeout_multiplier": 1, "max_rpc_timeout_millis": 60000, "total_timeout_millis": 600000 + }, + "693222d32e887d96c8faeadca469f7763ccda85a": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 4, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 60000, + "rpc_timeout_multiplier": 1, + "max_rpc_timeout_millis": 60000, + "total_timeout_millis": 600000 } }, "methods": { @@ -50,7 +59,7 @@ "Publish": { "timeout_millis": 60000, "retry_codes_name": "cancelled_unknown_deadline_exceeded_resource_exhausted_aborted_internal_unavailable", - "retry_params_name": "default", + "retry_params_name": "693222d32e887d96c8faeadca469f7763ccda85a", "bundling": { "element_count_threshold": 100, "request_byte_threshold": 1048576, diff --git a/handwritten/pubsub/src/v1/subscriber_client_config.json b/handwritten/pubsub/src/v1/subscriber_client_config.json index f479198834f..a549d3010b7 100644 --- a/handwritten/pubsub/src/v1/subscriber_client_config.json +++ b/handwritten/pubsub/src/v1/subscriber_client_config.json @@ -38,6 +38,15 @@ "rpc_timeout_multiplier": 1, "max_rpc_timeout_millis": 60000, "total_timeout_millis": 600000 + }, + "693222d32e887d96c8faeadca469f7763ccda85a": { + "initial_retry_delay_millis": 100, + "retry_delay_multiplier": 4, + "max_retry_delay_millis": 60000, + "initial_rpc_timeout_millis": 60000, + "rpc_timeout_multiplier": 1, + "max_rpc_timeout_millis": 60000, + "total_timeout_millis": 600000 } }, "methods": { @@ -84,7 +93,7 @@ "StreamingPull": { "timeout_millis": 900000, "retry_codes_name": "deadline_exceeded_resource_exhausted_aborted_internal_unavailable", - "retry_params_name": "default" + "retry_params_name": "693222d32e887d96c8faeadca469f7763ccda85a" }, "ModifyPushConfig": { "timeout_millis": 60000, From f57c4a2a2b377a788ed83b94f3356bbb4f351ac0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 24 Aug 2023 18:28:13 +0000 Subject: [PATCH 0958/1115] chore(main): release 4.0.2 (#1808) :robot: I have created a release *beep* *boop* --- ## [4.0.2](https://togithub.com/googleapis/nodejs-pubsub/compare/v4.0.1...v4.0.2) (2023-08-24) ### Bug Fixes * Make retry policy back off more aggressively for RPCs that retry RESOURCE_EXHAUSTD ([#1806](https://togithub.com/googleapis/nodejs-pubsub/issues/1806)) ([e9969ba](https://togithub.com/googleapis/nodejs-pubsub/commit/e9969bab92c38f1509b157034fcdbe5d5ec63903)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 5aafbd96a23..2b34d635bed 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.0.2](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.1...v4.0.2) (2023-08-24) + + +### Bug Fixes + +* Make retry policy back off more aggressively for RPCs that retry RESOURCE_EXHAUSTD ([#1806](https://github.com/googleapis/nodejs-pubsub/issues/1806)) ([e9969ba](https://github.com/googleapis/nodejs-pubsub/commit/e9969bab92c38f1509b157034fcdbe5d5ec63903)) + ## [4.0.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.0...v4.0.1) (2023-08-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b1bdee92377..79874621377 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.0.1", + "version": "4.0.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From ca1fa597438ade5ff5ac9c265f51a5f09873644d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:44:17 -0400 Subject: [PATCH 0959/1115] fix: simplify logic for HTTP/1.1 REST fallback option (#1809) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: simplify logic for HTTP/1.1 REST fallback option For the `fallback` parameter, all values considered as `true` in Boolean context will enable HTTP/1.1 REST fallback, since the other fallback transport, proto over HTTP, is removed from `google-gax` v4. PiperOrigin-RevId: 559812260 Source-Link: https://github.com/googleapis/googleapis/commit/6a6fd29a79fe2846001d90d93e79a19fcc303b85 Source-Link: https://github.com/googleapis/googleapis-gen/commit/56c16657e7a59122b1da94771a9ef40989c282c0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTZjMTY2NTdlN2E1OTEyMmIxZGE5NDc3MWE5ZWY0MDk4OWMyODJjMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/src/v1/publisher_client.ts | 7 +++---- handwritten/pubsub/src/v1/schema_service_client.ts | 7 +++---- handwritten/pubsub/src/v1/subscriber_client.ts | 9 ++++----- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index cfdcf8da3f4..7183a2a9419 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -94,8 +94,7 @@ export class PublisherClient { * API remote host. * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. * Follows the structure of {@link gapicConfig}. - * @param {boolean | "rest"} [options.fallback] - Use HTTP fallback mode. - * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. + * @param {boolean} [options.fallback] - Use HTTP/1.1 REST mode. * For more information, please check the * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. * @param {gax} [gaxInstance]: loaded instance of `google-gax`. Useful if you @@ -103,7 +102,7 @@ export class PublisherClient { * HTTP implementation. Load only fallback version and pass it to the constructor: * ``` * const gax = require('google-gax/build/src/fallback'); // avoids loading google-gax with gRPC - * const client = new PublisherClient({fallback: 'rest'}, gax); + * const client = new PublisherClient({fallback: true}, gax); * ``` */ constructor( @@ -170,7 +169,7 @@ export class PublisherClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); - } else if (opts.fallback === 'rest') { + } else { clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 6e0fbd5ea6a..f8ccb60611b 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -93,8 +93,7 @@ export class SchemaServiceClient { * API remote host. * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. * Follows the structure of {@link gapicConfig}. - * @param {boolean | "rest"} [options.fallback] - Use HTTP fallback mode. - * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. + * @param {boolean} [options.fallback] - Use HTTP/1.1 REST mode. * For more information, please check the * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. * @param {gax} [gaxInstance]: loaded instance of `google-gax`. Useful if you @@ -102,7 +101,7 @@ export class SchemaServiceClient { * HTTP implementation. Load only fallback version and pass it to the constructor: * ``` * const gax = require('google-gax/build/src/fallback'); // avoids loading google-gax with gRPC - * const client = new SchemaServiceClient({fallback: 'rest'}, gax); + * const client = new SchemaServiceClient({fallback: true}, gax); * ``` */ constructor( @@ -169,7 +168,7 @@ export class SchemaServiceClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); - } else if (opts.fallback === 'rest') { + } else { clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 7360069495d..661c31e19da 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -95,8 +95,7 @@ export class SubscriberClient { * API remote host. * @param {gax.ClientConfig} [options.clientConfig] - Client configuration override. * Follows the structure of {@link gapicConfig}. - * @param {boolean | "rest"} [options.fallback] - Use HTTP fallback mode. - * Pass "rest" to use HTTP/1.1 REST API instead of gRPC. + * @param {boolean} [options.fallback] - Use HTTP/1.1 REST mode. * For more information, please check the * {@link https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md#http11-rest-api-mode documentation}. * @param {gax} [gaxInstance]: loaded instance of `google-gax`. Useful if you @@ -104,7 +103,7 @@ export class SubscriberClient { * HTTP implementation. Load only fallback version and pass it to the constructor: * ``` * const gax = require('google-gax/build/src/fallback'); // avoids loading google-gax with gRPC - * const client = new SubscriberClient({fallback: 'rest'}, gax); + * const client = new SubscriberClient({fallback: true}, gax); * ``` */ constructor( @@ -171,7 +170,7 @@ export class SubscriberClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); - } else if (opts.fallback === 'rest') { + } else { clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { @@ -222,7 +221,7 @@ export class SubscriberClient { this.descriptors.stream = { streamingPull: new this._gaxModule.StreamDescriptor( this._gaxModule.StreamType.BIDI_STREAMING, - opts.fallback === 'rest' + !!opts.fallback ), }; From 6f990e3c30040824c001a4ebc45413b88653ab81 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:18:27 -0400 Subject: [PATCH 0960/1115] build: add legacy v3 branch to release-please config (#1812) --- handwritten/pubsub/.github/release-please.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/handwritten/pubsub/.github/release-please.yml b/handwritten/pubsub/.github/release-please.yml index e3e0ed917be..a0a47157e0e 100644 --- a/handwritten/pubsub/.github/release-please.yml +++ b/handwritten/pubsub/.github/release-please.yml @@ -4,3 +4,7 @@ branches: - branch: legacy-v2 releaseType: node handleGHRelease: true +- branch: legacy-v3 + releaseType: node + handleGHRelease: true + From dd81dea7954e4d640560493273c48bc886561d9d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 16:04:56 -0400 Subject: [PATCH 0961/1115] chore(main): release 4.0.3 (#1811) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 2b34d635bed..cdf81f0c3ea 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.0.3](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.2...v4.0.3) (2023-08-31) + + +### Bug Fixes + +* Simplify logic for HTTP/1.1 REST fallback option ([#1809](https://github.com/googleapis/nodejs-pubsub/issues/1809)) ([f26008d](https://github.com/googleapis/nodejs-pubsub/commit/f26008de84f201ec6e0180582d8a4bebc3d5ced0)) + ## [4.0.2](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.1...v4.0.2) (2023-08-24) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 79874621377..06860438b11 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.0.2", + "version": "4.0.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 75721c37354f53b1be1d22da27f69b88187daf78 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 5 Sep 2023 17:52:26 -0400 Subject: [PATCH 0962/1115] fix: set grpc keepalive time|outs by default (#1814) --- handwritten/pubsub/src/pubsub.ts | 20 ++++++++++---------- handwritten/pubsub/test/pubsub.ts | 13 ++++++++++++- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index e2bb3459491..edbecab0d57 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -272,16 +272,16 @@ export class PubSub { private schemaClient?: SchemaServiceClient; constructor(options?: ClientConfig) { - options = Object.assign({}, options || {}); - - // Needed for potentially large responses that may come from using exactly-once delivery. - // This will get passed down to grpc client objects. - const maxMetadataSize = 'grpc.max_metadata_size'; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const optionsAny = options as any; - if (optionsAny[maxMetadataSize] === undefined) { - optionsAny[maxMetadataSize] = 4 * 1024 * 1024; // 4 MiB - } + // Needed for potentially large responses that may come from using exactly-once delivery, + // as well as trying to work around silent connection failures. + // + // These will get passed down to grpc client objects. User values will overwrite these. + const grpcDefaults = { + 'grpc.max_metadata_size': 4 * 1024 * 1024, // 4 MiB + 'grpc.keepalive_time_ms': 300000, // 5 minutes + 'grpc.keepalive_timeout_ms': 20000, // 20 seconds + }; + options = Object.assign(grpcDefaults, options || {}); // Determine what scopes are needed. // It is the union of the scopes on both clients. diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 3d56f167c99..3374efacf5b 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -191,11 +191,16 @@ describe('PubSub', () => { describe('instantiation', () => { const maxMetadataSizeKey = 'grpc.max_metadata_size'; + const keepaliveTimeKey = 'grpc.keepalive_time_ms'; + const keepaliveTimeoutKey = 'grpc.keepalive_timeout_ms'; + const DEFAULT_OPTIONS = { libName: 'gccl', libVersion: PKG.version, scopes: [], [maxMetadataSizeKey]: 4 * 1024 * 1024, + [keepaliveTimeKey]: 300000, + [keepaliveTimeoutKey]: 20000, }; it('should extend the correct methods', () => { @@ -216,18 +221,24 @@ describe('PubSub', () => { assert(new PubSub() instanceof PubSub); }); - it('should augment the gRPC options for metadata size', () => { + it('should augment the gRPC options', () => { let pubsub = new PubSub(); // eslint-disable-next-line @typescript-eslint/no-explicit-any let optionsAny: any = pubsub.options; assert.strictEqual(optionsAny[maxMetadataSizeKey], 4 * 1024 * 1024); + assert.strictEqual(optionsAny[keepaliveTimeKey], 300000); + assert.strictEqual(optionsAny[keepaliveTimeoutKey], 20000); optionsAny = { [maxMetadataSizeKey]: 1 * 1024 * 1024, + [keepaliveTimeKey]: 30, + [keepaliveTimeoutKey]: 100, }; pubsub = new PubSub(optionsAny); optionsAny = pubsub.options; assert.strictEqual(optionsAny[maxMetadataSizeKey], 1 * 1024 * 1024); + assert.strictEqual(optionsAny[keepaliveTimeKey], 30); + assert.strictEqual(optionsAny[keepaliveTimeoutKey], 100); }); it('should combine all required scopes', () => { From 7ce33fd6b5accc6b0e2810afbbca624b5cd05ab7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 13:24:52 -0400 Subject: [PATCH 0963/1115] chore(main): release 4.0.4 (#1815) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index cdf81f0c3ea..069c9612c96 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.0.4](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.3...v4.0.4) (2023-09-05) + + +### Bug Fixes + +* Set grpc keepalive time|outs by default ([#1814](https://github.com/googleapis/nodejs-pubsub/issues/1814)) ([13d89a2](https://github.com/googleapis/nodejs-pubsub/commit/13d89a2b4e25f340ef492d586bfa8cc3a9a6d6cf)) + ## [4.0.3](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.2...v4.0.3) (2023-08-31) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 06860438b11..9563f899871 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.0.3", + "version": "4.0.4", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 2559f5b7a9a7ad0d78fcf612727b100afcb027f0 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 7 Sep 2023 13:55:06 -0400 Subject: [PATCH 0964/1115] fix: always fill the topic and sub names when creating from a PubSub object (#1816) --- handwritten/pubsub/src/pubsub.ts | 19 +++++++ handwritten/pubsub/test/pubsub.ts | 92 +++++++++++++++++++++++++++---- 2 files changed, 101 insertions(+), 10 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index edbecab0d57..e7fc0d81958 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -561,6 +561,17 @@ export class PubSub { return; } subscription.metadata = resp!; + + // If this is the first call we've made, the projectId might be empty still. + if (subscription.name?.includes(PROJECT_ID_PLACEHOLDER)) { + if (subscription.metadata && subscription.metadata.name) { + subscription.name = Subscription.formatName_( + this.projectId, + subscription.metadata.name + ); + } + } + callback!(null, subscription, resp!); } ); @@ -655,6 +666,14 @@ export class PubSub { return; } topic.metadata = resp!; + + // If this is the first call we've made, the projectId might be empty still. + if (topic.name?.includes(PROJECT_ID_PLACEHOLDER)) { + if (topic.metadata && topic.metadata.name) { + topic.name = Topic.formatName_(this.projectId, topic.metadata.name); + } + } + callback!(null, topic, resp!); } ); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 3374efacf5b..66885769014 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -33,7 +33,6 @@ const PKG = require('../../package.json'); const sandbox = sinon.createSandbox(); const fakeCreds = {} as gax.grpc.ChannelCredentials; -sandbox.stub(gax.grpc.credentials, 'createInsecure').returns(fakeCreds); const subscriptionCached = subby.Subscription; @@ -49,6 +48,11 @@ function Subscription( return new overrideFn(pubsub, name, options); } +// eslint-disable-next-line @typescript-eslint/no-explicit-any +(Subscription as any).formatName_ = (): string => { + return 'formatted'; +}; + let promisified = false; const fakeUtil = Object.assign({}, util, { promisifySome( @@ -92,6 +96,10 @@ class FakeTopic { constructor(...args: Array<{}>) { this.calledWith_ = args; } + + static formatName_(): string { + return 'foo'; + } } let extended = false; @@ -187,6 +195,11 @@ describe('PubSub', () => { googleAuthOverride = null; pubsub = new PubSub(OPTIONS); pubsub.projectId = PROJECT_ID; + sandbox.stub(gax.grpc.credentials, 'createInsecure').returns(fakeCreds); + }); + + afterEach(() => { + sandbox.restore(); }); describe('instantiation', () => { @@ -554,13 +567,15 @@ describe('PubSub', () => { it('should return Subscription & resp to the callback', done => { const subscription = {}; - pubsub.subscription = () => { + sandbox.stub(pubsub, 'subscription').callsFake(() => { return subscription as subby.Subscription; - }; + }); - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse); - }; + sandbox + .stub(pubsub, 'request') + .callsFake((config, callback: Function) => { + callback(null, apiResponse); + }); function callback( err?: Error | null, @@ -575,6 +590,31 @@ describe('PubSub', () => { pubsub.createSubscription?.(TOPIC_NAME, SUB_NAME, callback); }); + + it('should fill the subscription object name if projectId was empty', async () => { + const subscription = {}; + pubsub.projectId = undefined; + sandbox.stub(pubsub, 'subscription').callsFake(() => { + // Simulate the project ID not being resolved. + const sub = subscription as subby.Subscription; + sub.name = '{{projectId}}/foo/bar'; + return sub; + }); + + sandbox + .stub(pubsub, 'request') + .callsFake((config, callback: Function) => { + callback(null, apiResponse); + }); + + const [sub, resp] = await pubsub.createSubscription!( + TOPIC_NAME, + SUB_NAME + )!; + assert.strictEqual(sub, subscription); + assert.strictEqual(sub.name.includes('{{'), false); + assert.strictEqual(resp, apiResponse); + }); }); }); @@ -625,12 +665,17 @@ describe('PubSub', () => { }); describe('success', () => { - const apiResponse = {}; + const apiResponse = { + name: 'new-topic', + }; + let requestStub: sinon.SinonStub; beforeEach(() => { - pubsub.request = (config, callback: Function) => { - callback(null, apiResponse); - }; + requestStub = sandbox + .stub(pubsub, 'request') + .callsFake((config, callback: Function) => { + callback(null, apiResponse); + }); }); it('should return a Topic object', done => { @@ -656,6 +701,33 @@ describe('PubSub', () => { done(); }); }); + + it('should fill the topic object name if projectId was empty', async () => { + const topicName = 'new-topic'; + const topicInstance = {}; + + sandbox.stub(pubsub, 'topic').callsFake(name => { + assert.strictEqual(name, topicName); + + // Simulate the project ID not being resolved. + const topic = topicInstance as Topic; + topic.name = 'projects/{{projectId}}/topics/new-topic'; + return topic; + }); + + requestStub.restore(); + sandbox + .stub(pubsub, 'request') + .callsFake((config, callback: Function) => { + pubsub.projectId = 'projectId'; + callback(null, apiResponse); + }); + + const [topic, resp] = await pubsub.createTopic!(topicName)!; + assert.strictEqual(topic, topicInstance); + assert.strictEqual(topic.name.includes('{{'), false); + assert.strictEqual(resp, apiResponse); + }); }); }); From b3630c71e610e15bccd5705e38c9489b7c9530db Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:37:22 -0400 Subject: [PATCH 0965/1115] chore(main): release 4.0.5 (#1817) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 069c9612c96..1252c5012b6 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.0.5](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.4...v4.0.5) (2023-09-07) + + +### Bug Fixes + +* Always fill the topic and sub names when creating from a PubSub object ([#1816](https://github.com/googleapis/nodejs-pubsub/issues/1816)) ([be8ed53](https://github.com/googleapis/nodejs-pubsub/commit/be8ed530e327e2bd08a49200492f0a163b3b91d7)) + ## [4.0.4](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.3...v4.0.4) (2023-09-05) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9563f899871..89a1ec91c3a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.0.4", + "version": "4.0.5", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 2f1fa16f9c56d8f51707cde13e63e38c5fc4b774 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Sep 2023 15:34:13 +0200 Subject: [PATCH 0966/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.17.0 (#1824) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@opentelemetry/semantic-conventions](https://togithub.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions) ([source](https://togithub.com/open-telemetry/opentelemetry-js)) | [`~1.3.0` -> `~1.17.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2fsemantic-conventions/1.3.1/1.17.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@opentelemetry%2fsemantic-conventions/1.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@opentelemetry%2fsemantic-conventions/1.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@opentelemetry%2fsemantic-conventions/1.3.1/1.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@opentelemetry%2fsemantic-conventions/1.3.1/1.17.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-js (@​opentelemetry/semantic-conventions) ### [`v1.17.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1170) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.16.0...faf939c77591f709afbc23fadbe629c9d3607ef6) ##### :bug: (Bug Fix) - Revert "feat(api): add attributes argument to recordException API [#​4071](https://togithub.com/open-telemetry/opentelemetry-js/pull/4071)" - This feature was an unintentional breaking change introduced with API 1.5.0 - This PR updates all SDK packages to allow API 1.6.0, where this change has been reverted. ### [`v1.16.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1160) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.15.2...v1.16.0) ##### :rocket: (Enhancement) - feat(sdk-metrics): implement MetricProducer specification [#​4007](https://togithub.com/open-telemetry/opentelemetry-js/pull/4007) - feat: update PeriodicExportingMetricReader and PrometheusExporter to accept optional metric producers [#​4077](https://togithub.com/open-telemetry/opentelemetry-js/pull/4077) [@​aabmass](https://togithub.com/aabmass) ##### :bug: (Bug Fix) - fix(exporter-zipkin): rounding duration to the nearest int to be compliant with zipkin protocol [#​4064](https://togithub.com/open-telemetry/opentelemetry-js/pull/4064) [@​n0cloud](https://togithub.com/n0cloud) - fix(sdk-metrics): metric names should be case-insensitive ##### :books: (Refine Doc) - docs(guidelines): add dependencies guidelines [#​4040](https://togithub.com/open-telemetry/opentelemetry-js/pull/4040) ### [`v1.15.2`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1152) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.15.1...v1.15.2) ##### :bug: (Bug Fix) - fix(core): stop rounding to nearest int in hrTimeTo\*seconds() functions [#​4014](https://togithub.com/open-telemetry/opentelemetry-js/pull/4014/) [@​aabmass](https://togithub.com/aabmass) - fix(sdk-metrics): ignore invalid metric values [#​3988](https://togithub.com/open-telemetry/opentelemetry-js/pull/3988) [@​legendecas](https://togithub.com/legendecas) - fix(core): add baggage support for values containing an equals sign [#​3975](https://togithub.com/open-telemetry/opentelemetry-js/pull/3975) [@​krosenk729](https://togithub.com/krosenk729) ### [`v1.15.1`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1151) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.15.0...v1.15.1) ##### :bug: (Bug Fix) - Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency ([#​3914](https://togithub.com/open-telemetry/opentelemetry-js/issues/3914))" [#​4011](https://togithub.com/open-telemetry/opentelemetry-js/pull/4011) [@​dyladan](https://togithub.com/dyladan) ### [`v1.15.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1150) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.14.0...v1.15.0) ##### :bug: (Bug Fix) - fix(opentelemetry-exporter-prometheus): Update default PrometheusExporter to not append a timestamp to match the text based exposition format [#​3961](https://togithub.com/open-telemetry/opentelemetry-js/pull/3961) [@​JacksonWeber](https://togithub.com/JacksonWeber) - fix(sdk-metrics): Update default Histogram's boundary to match OTEL's spec [#​3893](https://togithub.com/open-telemetry/opentelemetry-js/pull/3893/) [@​chigia001](https://togithub.com/chigia001) - fix(sdk-metrics): preserve startTime for cumulative ExponentialHistograms [#​3934](https://togithub.com/open-telemetry/opentelemetry-js/pull/3934/) [@​aabmass](https://togithub.com/aabmass) - fix(sdk-trace-web): add secureConnectionStart to https only [#​3879](https://togithub.com/open-telemetry/opentelemetry-js/pull/3879) [@​Abinet18](https://togithub.com/Abinet18) ##### :house: (Internal) - feat(minification): \[Minification] Add noEmitHelpers, importHelpers and tslib as a dependency [#​3913](https://togithub.com/open-telemetry/opentelemetry-js/issues/3913) [@​MSNev](https://togithub.com/MSNev) ### [`v1.14.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1140) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.13.0...v1.14.0) ##### :rocket: (Enhancement) - feat(SpanExporter): Add optional forceFlush to SpanExporter interface [#​3753](https://togithub.com/open-telemetry/opentelemetry-js/pull/3753/) [@​sgracias1](https://togithub.com/sgracias1) [@​JacksonWeber](https://togithub.com/JacksonWeber) ### [`v1.13.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1130) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.12.0...v1.13.0) ##### :rocket: (Enhancement) - feat(core): add environment variables for OTLP log exporters. [#​3712](https://togithub.com/open-telemetry/opentelemetry-js/pull/3712/) [@​llc1123](https://togithub.com/llc1123) ##### :bug: (Bug Fix) - fix(http-instrumentation): stop listening to `request`'s `close` event once it has emitted `response` [#​3625](https://togithub.com/open-telemetry/opentelemetry-js/pull/3625) [@​SimenB](https://togithub.com/SimenB) - fix(sdk-node): fix initialization in bundled environments by not loading [@​opentelemetry/exporter-jaeger](https://togithub.com/opentelemetry/exporter-jaeger) [#​3739](https://togithub.com/open-telemetry/opentelemetry-js/pull/3739) [@​pichlermarc](https://togithub.com/pichlermarc) ### [`v1.12.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1120) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.11.0...v1.12.0) ##### :rocket: (Enhancement) - feat(tracing): log span name and IDs when span end is called multiple times [#​3716](https://togithub.com/open-telemetry/opentelemetry-js/pull/3716) - feat(core): add logs environment variables; add timeout utils method. [#​3549](https://togithub.com/open-telemetry/opentelemetry-js/pull/3549/) [@​fuaiyi](https://togithub.com/fuaiyi) ##### :bug: (Bug Fix) - fix(instrumentation-http): fixed description for http.server.duration metric [#​3710](https://togithub.com/open-telemetry/opentelemetry-js/pull/3710) - fix(opentelemetry-sdk-trace-web): don't crash in runtimes where location isn't defined [#​3715](https://togithub.com/open-telemetry/opentelemetry-js/pull/3715) ### [`v1.11.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1110) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.10.1...v1.11.0) ##### :rocket: (Enhancement) - feat(sdk-metrics): add exponential histogram support [#​3505](https://togithub.com/open-telemetry/opentelemetry-js/pull/3505), [#​3506](https://togithub.com/open-telemetry/opentelemetry-js/pull/3506) [@​mwear](https://togithub.com/mwear) - feat(resources): collect additional process attributes [#​3605](https://togithub.com/open-telemetry/opentelemetry-js/pull/3605) [@​mwear](https://togithub.com/mwear) ##### :bug: (Bug Fix) - fix(sdk-metrics): merge uncollected delta accumulations [#​3667](https://togithub.com/open-telemetry/opentelemetry-js/pull/3667) [@​legendecas](https://togithub.com/legendecas) - fix(sdk-trace-web): make `parseUrl()` respect document.baseURI [#​3670](https://togithub.com/open-telemetry/opentelemetry-js/pull/3670) [@​domasx2](https://togithub.com/domasx2) ##### :books: (Refine Doc) - doc(sdk): update NodeSDK example [#​3684](https://togithub.com/open-telemetry/opentelemetry-js/pull/3684) [@​martinkuba](https://togithub.com/martinkuba) - docs: change vmarchaud status from maintainer to emeritus [#​3710](https://togithub.com/open-telemetry/opentelemetry-js/pull/3710) [@​vmarchaud](https://togithub.com/vmarchaud) - docs: change rauno56 status from maintainer to emeritus [#​3706](https://togithub.com/open-telemetry/opentelemetry-js/pull/3706) [@​rauno56](https://togithub.com/rauno56) ### [`v1.10.1`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1101) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.10.0...v1.10.1) ##### :bug: (Bug Fix) - fix(resource): make properties for async resource resolution optional [#​3677](https://togithub.com/open-telemetry/opentelemetry-js/pull/3677) [@​pichlermarc](https://togithub.com/pichlermarc) - fix(resource): change fs/promises import to be node 12 compatible [#​3681](https://togithub.com/open-telemetry/opentelemetry-js/pull/3681) [@​pichlermarc](https://togithub.com/pichlermarc) ### [`v1.10.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1100) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.9.1...v1.10.0) ##### :rocket: (Enhancement) - feat(resource): create sync resource with some attributes that resolve asynchronously [#​3460](https://togithub.com/open-telemetry/opentelemetry-js/pull/3460) [@​samimusallam](https://togithub.com/samimusallam) - feat: collect host id for non-cloud environments [#​3575](https://togithub.com/open-telemetry/opentelemetry-js/pull/3575) [@​mwear](https://togithub.com/mwear) - feat (api-logs): separate Events API into its own package [3550](https://togithub.com/open-telemetry/opentelemetry-js/pull/3550) [@​martinkuba](https://togithub.com/martinkuba) - feat(sdk-metrics): apply binary search in histogram recording [#​3539](https://togithub.com/open-telemetry/opentelemetry-js/pull/3539) [@​legendecas](https://togithub.com/legendecas) - perf(propagator-jaeger): improve deserializeSpanContext performance [#​3541](https://togithub.com/open-telemetry/opentelemetry-js/pull/3541) [@​doochik](https://togithub.com/doochik) - feat: support TraceState in SamplingResult [#​3530](https://togithub.com/open-telemetry/opentelemetry-js/pull/3530) [@​raphael-theriault-swi](https://togithub.com/raphael-theriault-swi) - feat(sdk-trace-base): add diagnostic logging when spans are dropped [#​3610](https://togithub.com/open-telemetry/opentelemetry-js/pull/3610) [@​neoeinstein](https://togithub.com/neoeinstein) - feat: add unit to view instrument selection criteria [#​3647](https://togithub.com/open-telemetry/opentelemetry-js/pull/3647) [@​jlabatut](https://togithub.com/jlabatut) - feat(tracing): expose dropped counts for attributes, events and links on span [#​3576](https://togithub.com/open-telemetry/opentelemetry-js/pull/3576) [@​mohitk05](https://togithub.com/mohitk05) ##### :bug: (Bug Fix) - fix(core): added falsy check to make otel core work with browser where webpack config had process as false or null [#​3613](https://togithub.com/open-telemetry/opentelemetry-js/issues/3613) [@​ravindra-dyte](https://togithub.com/ravindra-dyte) - fix(instrumentation-http): include query params in http.target [#​3646](https://togithub.com/open-telemetry/opentelemetry-js/pull/3646) [@​kobi-co](https://togithub.com/kobi-co) ##### :books: (Refine Doc) - chore: update http example [#​3651](https://togithub.com/open-telemetry/opentelemetry-js/pull/3651) [@​JamieDanielson](https://togithub.com/JamieDanielson) ##### :house: (Internal) - chore(exporter-jaeger): deprecate jaeger exporter [#​3585](https://togithub.com/open-telemetry/opentelemetry-js/pull/3585) [@​pichlermarc](https://togithub.com/pichlermarc) - fix(sdk-metrics): fix flaky LastValueAggregator test by using fake timer [#​3587](https://togithub.com/open-telemetry/opentelemetry-js/pull/3587) [@​pichlermarc](https://togithub.com/pichlermarc) - fix(test): fix failing tests by preventing source-map generation [#​3642](https://togithub.com/open-telemetry/opentelemetry-js/pull/3642) [@​pichlermarc](https://togithub.com/pichlermarc) ### [`v1.9.1`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#191) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.9.0...v1.9.1) ##### :bug: (Bug Fix) - fix: avoid grpc types dependency [#​3551](https://togithub.com/open-telemetry/opentelemetry-js/pull/3551) [@​flarna](https://togithub.com/flarna) - fix(otlp-proto-exporter-base): Match Accept header with Content-Type in the proto exporter [#​3562](https://togithub.com/open-telemetry/opentelemetry-js/pull/3562) [@​scheler](https://togithub.com/scheler) - fix: include tracestate in export [#​3569](https://togithub.com/open-telemetry/opentelemetry-js/pull/3569) [@​flarna](https://togithub.com/flarna) ##### :house: (Internal) - chore: fix cross project links and missing implicitly exported types [#​3533](https://togithub.com/open-telemetry/opentelemetry-js/pull/3533) [@​legendecas](https://togithub.com/legendecas) - feat(sdk-metrics): add exponential histogram mapping functions [#​3504](https://togithub.com/open-telemetry/opentelemetry-js/pull/3504) [@​mwear](https://togithub.com/mwear) ### [`v1.9.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#190) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.8.0...v1.9.0) ##### :rocket: (Enhancement) - feat(instrumentation-grpc): set net.peer.name and net.peer.port on client spans [#​3430](https://togithub.com/open-telemetry/opentelemetry-js/pull/3430) - feat(exporter-trace-otlp-proto): Add protobuf otlp trace exporter support for browser [#​3208](https://togithub.com/open-telemetry/opentelemetry-js/pull/3208) [@​pkanal](https://togithub.com/pkanal) ##### :bug: (Bug Fix) - fix(sdk-metrics): use default Resource to comply with semantic conventions [#​3411](https://togithub.com/open-telemetry/opentelemetry-js/pull/3411) [@​pichlermarc](https://togithub.com/pichlermarc) - Metrics exported by the SDK now contain the following resource attributes by default: - `service.name` - `telemetry.sdk.name` - `telemetry.sdk.language` - `telemetry.sdk.version` - fix(sdk-metrics): use Date.now() for instrument recording timestamps [#​3514](https://togithub.com/open-telemetry/opentelemetry-js/pull/3514) [@​MisterSquishy](https://togithub.com/MisterSquishy) - fix(sdk-trace): make spans resilient to clock drift [#​3434](https://togithub.com/open-telemetry/opentelemetry-js/pull/3434) [@​dyladan](https://togithub.com/dyladan) - fix(selenium-tests): updated webpack version for selenium test issue [#​3456](https://togithub.com/open-telemetry/opentelemetry-js/issues/3456) [@​SaumyaBhushan](https://togithub.com/SaumyaBhushan) - fix(sdk-metrics): collect metrics when periodic exporting metric reader flushes [#​3517](https://togithub.com/open-telemetry/opentelemetry-js/pull/3517) [@​legendecas](https://togithub.com/legendecas) - fix(sdk-metrics): fix duplicated registration of metrics for collectors [#​3488](https://togithub.com/open-telemetry/opentelemetry-js/pull/3488) [@​legendecas](https://togithub.com/legendecas) - fix(core): fix precision loss in numberToHrtime [#​3480](https://togithub.com/open-telemetry/opentelemetry-js/pull/3480) [@​legendecas](https://togithub.com/legendecas) ##### :house: (Internal) - chore: automatically generate tsconfigs [#​3432](https://togithub.com/open-telemetry/opentelemetry-js/pull/3432) [@​legendecas](https://togithub.com/legendecas) - chore: enforce format with prettier [#​3444](https://togithub.com/open-telemetry/opentelemetry-js/pull/3444) [@​legendecas](https://togithub.com/legendecas) ### [`v1.8.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#180) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.7.0...v1.8.0) - `@opentelemetry/sdk-metrics` has been promoted to stable - `@opentelemetry/api-metrics` has been merged into `@opentelemetry/api` and deprecated ##### :boom: Breaking Change - feat(api): merge api-metrics into api [#​3374](https://togithub.com/open-telemetry/opentelemetry-js/pull/3374) [@​legendecas](https://togithub.com/legendecas) ##### :rocket: (Enhancement) - feat(sdk-trace): re-export sdk-trace-base in sdk-trace-node and web [#​3319](https://togithub.com/open-telemetry/opentelemetry-js/pull/3319) [@​legendecas](https://togithub.com/legendecas) - feat: enable tree shaking [#​3329](https://togithub.com/open-telemetry/opentelemetry-js/pull/3329) [@​pkanal](https://togithub.com/pkanal) ##### :bug: (Bug Fix) - fix(sdk-trace): enforce consistent span durations [#​3327](https://togithub.com/open-telemetry/opentelemetry-js/pull/3327) [@​dyladan](https://togithub.com/dyladan) - fix(resources): fix EnvDetector throwing errors when attribute values contain spaces [#​3295](https://togithub.com/open-telemetry/opentelemetry-js/issues/3295) - fix(trace): fix an issue which caused negative span durations in web based spans [#​3359](https://togithub.com/open-telemetry/opentelemetry-js/pull/3359) [@​dyladan](https://togithub.com/dyladan) - fix(resources): strict OTEL_RESOURCE_ATTRIBUTES baggage octet decoding [#​3341](https://togithub.com/open-telemetry/opentelemetry-js/pull/3341) [@​legendecas](https://togithub.com/legendecas) ##### :books: (Refine Doc) - doc: Added Metrics documentation [#​3360](https://togithub.com/open-telemetry/opentelemetry-js/pull/3360) [@​weyert](https://togithub.com/weyert) - docs(api): fix counter negative value wording [#​3396](https://togithub.com/open-telemetry/opentelemetry-js/pull/3396) [@​legendecas](https://togithub.com/legendecas) ##### :house: (Internal) - ci: run browser tests without circle [#​3328](https://togithub.com/open-telemetry/opentelemetry-js/pull/3328) [@​dyladan](https://togithub.com/dyladan) ### [`v1.7.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#170) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.6.0...v1.7.0) ##### :bug: (Bug Fix) - fix(sdk-trace-base): make span start times resistant to hrtime clock drift [#​3129](https://togithub.com/open-telemetry/opentelemetry-js/issues/3129) - fix(sdk-trace-base): validate maxExportBatchSize in BatchSpanProcessorBase [#​3232](https://togithub.com/open-telemetry/opentelemetry-js/issues/3232) ##### :books: (Refine Doc) - docs(metrics): add missing metrics packages to SDK reference documentation [#​3239](https://togithub.com/open-telemetry/opentelemetry-js/pull/3239) [@​dyladan](https://togithub.com/dyladan) ##### :house: (Internal) - deps: update markdownlint-cli to 0.32.2 [#​3253](https://togithub.com/open-telemetry/opentelemetry-js/pull/3253) [@​pichlermarc](https://togithub.com/pichlermarc) ### [`v1.6.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#160) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.5.0...v1.6.0) ##### :rocket: (Enhancement) - perf(opentelemetry-core): improve hexToBase64 performance [#​3178](https://togithub.com/open-telemetry/opentelemetry-js/pull/3178) [@​seemk](https://togithub.com/seemk) - feat(sdk-trace-base): move Sampler declaration into sdk-trace-base [#​3088](https://togithub.com/open-telemetry/opentelemetry-js/pull/3088) [@​legendecas](https://togithub.com/legendecas) - fix(grpc-instrumentation): added grpc attributes in instrumentation [#​3127](https://togithub.com/open-telemetry/opentelemetry-js/pull/3127) [@​andrewzenkov](https://togithub.com/andrewzenkov) - feat: support latest `@opentelemetry/api` [#​3177](https://togithub.com/open-telemetry/opentelemetry-js/pull/3177) [@​dyladan](https://togithub.com/dyladan) ##### :bug: (Bug Fix) - fix(context-async-hooks): Ensure listeners added using `once` can be removed using `removeListener` [#​3133](https://togithub.com/open-telemetry/opentelemetry-js/pull/3133) ##### :books: (Refine Doc) - chore: update trace-web example and rename it to opentelemetry-web [#​3145](https://togithub.com/open-telemetry/opentelemetry-js/pull/3145) [@​pichlermarc](https://togithub.com/pichlermarc) - chore: update https example [#​3152](https://togithub.com/open-telemetry/opentelemetry-js/pull/3152) [@​pichlermarc](https://togithub.com/pichlermarc) ### [`v1.5.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#150) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.4.0...v1.5.0) ##### :rocket: (Enhancement) - feat(sdk-trace-base): Improve extensibility of BasicTracerProvider [#​3023](https://togithub.com/open-telemetry/opentelemetry-js/pull/3023) [@​Rauno56](https://togithub.com/Rauno56) ### [`v1.4.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#140) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/51afd54bd63e46d5d530266761144c7be2f6b3a7...v1.4.0) ##### :rocket: (Enhancement) - fix(resources): fix browser compatibility for host and os detectors [#​3004](https://togithub.com/open-telemetry/opentelemetry-js/pull/3004) [@​legendecas](https://togithub.com/legendecas) - fix(sdk-trace-base): fix crash on environments without global document [#​3000](https://togithub.com/open-telemetry/opentelemetry-js/pull/3000) [@​legendecas](https://togithub.com/legendecas) - fix(sdk-trace-base): fix spanLimits attribute length/count to consider env values [#​3068](https://togithub.com/open-telemetry/opentelemetry-js/pull/3068) [@​svetlanabrennan](https://togithub.com/svetlanabrennan) ##### :house: (Internal) - test: add node 18 and remove EoL node versions [#​3048](https://togithub.com/open-telemetry/opentelemetry-js/pull/3048) [@​dyladan](https://togithub.com/dyladan)
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 89a1ec91c3a..14f639c9dbc 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.0.0", - "@opentelemetry/semantic-conventions": "~1.3.0", + "@opentelemetry/semantic-conventions": "~1.17.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From f6828436fa0012067d20c482ffd3135b375fe2fb Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 14 Sep 2023 15:38:02 -0400 Subject: [PATCH 0967/1115] build: update @opentelemetry/api version (#1826) (#1828) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 14f639c9dbc..a12629630f7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ "@google-cloud/precise-date": "^4.0.0", "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", - "@opentelemetry/api": "^1.0.0", + "@opentelemetry/api": "^1.6.0", "@opentelemetry/semantic-conventions": "~1.17.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", From a9a85511b8193978ef104232b5260aa642e05030 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 14 Sep 2023 21:54:15 +0200 Subject: [PATCH 0968/1115] chore(deps): update dependency sinon to v16 (#1827) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [sinon](https://sinonjs.org/) ([source](https://togithub.com/sinonjs/sinon)) | [`^15.0.0` -> `^16.0.0`](https://renovatebot.com/diffs/npm/sinon/15.2.0/16.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/sinon/16.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/sinon/16.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/sinon/15.2.0/16.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/sinon/15.2.0/16.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sinonjs/sinon (sinon) ### [`v16.0.0`](https://togithub.com/sinonjs/sinon/blob/HEAD/CHANGES.md#1600) [Compare Source](https://togithub.com/sinonjs/sinon/compare/v15.2.0...v16.0.0) - [`c3396058`](https://togithub.com/sinonjs/sinon/commit/c339605834f6fd7ba3afdd179fff3a8544e62bd7) fix(2525): ensure non empty message when error of type string is passed, but no message ([#​2544](https://togithub.com/sinonjs/sinon/issues/2544)) (Mark de Dios) - [`baa1aee9`](https://togithub.com/sinonjs/sinon/commit/baa1aee9e5766ff1bfcbc62d81ddaf3138174c54) .define method ([#​2539](https://togithub.com/sinonjs/sinon/issues/2539)) (Konstantin Gukov) > - .define method for temporarily defining new properties during the tests - [`fe799e78`](https://togithub.com/sinonjs/sinon/commit/fe799e78967cafcdfa29ef1d7cd00c420704b926) Fix issue 2534: spies are not restored ([#​2535](https://togithub.com/sinonjs/sinon/issues/2535)) (Carl-Erik Kopseng) - [`305fb6cc`](https://togithub.com/sinonjs/sinon/commit/305fb6ccb823a4a6059d8440d93c8032bef2afeb) fix: actaully reset 'injectedKeys' ([#​2456](https://togithub.com/sinonjs/sinon/issues/2456)) (Morgan Roderick) - [`de2635dd`](https://togithub.com/sinonjs/sinon/commit/de2635dd4293f21bd1e5a8b3e14d14d4f6e1f1da) Bump LTS version one notch: 20 ([#​2529](https://togithub.com/sinonjs/sinon/issues/2529)) (Carl-Erik Kopseng) *Released by Morgan Roderick on 2023-09-13.*
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a12629630f7..9923f91a67d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -93,7 +93,7 @@ "null-loader": "^4.0.0", "protobufjs": "^7.0.0", "proxyquire": "^2.0.0", - "sinon": "^15.0.0", + "sinon": "^16.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", "typescript": "^5.1.6", From 8fb1cb914f39e7eec9d92a0dda88ebd135bbd2c0 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:05:08 -0400 Subject: [PATCH 0969/1115] fix: bump the minimum gax up to 4.0.4 to get grpc-js fixes (#1829) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9923f91a67d..ed6461bce62 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.0.0", - "google-gax": "^4.0.2", + "google-gax": "^4.0.4", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From b78676c930b4e9016ecb52eb24f08b51a1870e7d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:25:12 -0400 Subject: [PATCH 0970/1115] chore(main): release 4.0.6 (#1825) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 1252c5012b6..a5abdf64009 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.0.6](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.5...v4.0.6) (2023-09-15) + + +### Bug Fixes + +* Bump the minimum gax up to 4.0.4 to get grpc-js fixes ([#1829](https://github.com/googleapis/nodejs-pubsub/issues/1829)) ([cc86e2b](https://github.com/googleapis/nodejs-pubsub/commit/cc86e2b4f3593d3d6046dc5baee76e1431832acb)) +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.17.0 ([#1824](https://github.com/googleapis/nodejs-pubsub/issues/1824)) ([679c6b8](https://github.com/googleapis/nodejs-pubsub/commit/679c6b82bdb6fe28c3bc8c31db2e10de1ee7e089)) + ## [4.0.5](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.4...v4.0.5) (2023-09-07) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ed6461bce62..3d4338f7d8d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.0.5", + "version": "4.0.6", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 75692d57635e2f8431f519db9e253da0cf824f1d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 21 Sep 2023 11:58:14 +0200 Subject: [PATCH 0971/1115] chore(deps): update dependency gapic-tools to ^0.2.0 (#1834) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [gapic-tools](https://togithub.com/googleapis/gax-nodejs) | [`^0.1.7` -> `^0.2.0`](https://renovatebot.com/diffs/npm/gapic-tools/0.1.8/0.2.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/gapic-tools/0.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/gapic-tools/0.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/gapic-tools/0.1.8/0.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/gapic-tools/0.1.8/0.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs (gapic-tools) ### [`v0.2.0`](https://togithub.com/googleapis/gax-nodejs/releases/tag/gapic-tools-v0.2.0): gapic-tools: v0.2.0 ##### Features - add ESM tools in gax ([#​1459](https://togithub.com/googleapis/gax-nodejs/issues/1459)) ([0fb1cf9](https://togithub.com/googleapis/gax-nodejs/commit/0fb1cf9acd32dc1ae03a33279eca9449a7d3fca7)) ##### Bug Fixes - **deps:** update dependency google-proto-files to v4 ([#​1490](https://togithub.com/googleapis/gax-nodejs/issues/1490)) ([4748c9f](https://togithub.com/googleapis/gax-nodejs/commit/4748c9fc3a8cfe31e5abb3e35a6ee0d9a6f0e560)) - **deps:** update dependency protobufjs-cli to v1.1.2 ([#​1495](https://togithub.com/googleapis/gax-nodejs/issues/1495)) ([762591e](https://togithub.com/googleapis/gax-nodejs/commit/762591ed28801e5311ab737b04185781a41752e6)) - make gapic-tools depend on gax-nodejs ([#​1480](https://togithub.com/googleapis/gax-nodejs/issues/1480)) ([d0f410d](https://togithub.com/googleapis/gax-nodejs/commit/d0f410d2e08f393f2661c8c92568a0b518fddf99)) - release new version of gapic-tools ([#​1483](https://togithub.com/googleapis/gax-nodejs/issues/1483)) ([e4f5482](https://togithub.com/googleapis/gax-nodejs/commit/e4f548254bfce3daa3b02ae81764bb3394fc4f23))
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3d4338f7d8d..64fb3b5a103 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -81,7 +81,7 @@ "c8": "^8.0.0", "codecov": "^3.0.0", "execa": "^5.0.0", - "gapic-tools": "^0.1.7", + "gapic-tools": "^0.2.0", "gts": "^5.0.0", "jsdoc": "^4.0.0", "jsdoc-fresh": "^3.0.0", From 1f68cb8093bacbee3a156d1be6ab4755af951dd0 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 16 Oct 2023 15:54:59 -0400 Subject: [PATCH 0972/1115] chore: update for new Node typings (#1841) --- handwritten/pubsub/src/lease-manager.ts | 2 +- handwritten/pubsub/src/message-queues.ts | 2 +- handwritten/pubsub/src/message-stream.ts | 2 +- handwritten/pubsub/src/publisher/message-queues.ts | 2 +- handwritten/pubsub/test/publisher/message-queues.ts | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index 084f4b75950..d31c7111ffc 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -64,7 +64,7 @@ export class LeaseManager extends EventEmitter { private _options!: FlowControlOptions; private _pending: Message[]; private _subscriber: Subscriber; - private _timer?: NodeJS.Timer; + private _timer?: NodeJS.Timeout; constructor(sub: Subscriber, options = {}) { super(); diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 77da36bd905..e40be22659a 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -112,7 +112,7 @@ export abstract class MessageQueue { protected _options!: BatchOptions; protected _requests: QueuedMessages; protected _subscriber: Subscriber; - protected _timer?: NodeJS.Timer; + protected _timer?: NodeJS.Timeout; protected _retrier: ExponentialRetry; protected _closed = false; protected abstract _sendBatch(batch: QueuedMessages): Promise; diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 95df7e8aafd..7ea275ee519 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -141,7 +141,7 @@ interface StreamTracked { * @param {MessageStreamOptions} [options] The message stream options. */ export class MessageStream extends PassThrough { - private _keepAliveHandle?: NodeJS.Timer; + private _keepAliveHandle?: NodeJS.Timeout; private _options: MessageStreamOptions; private _retrier: ExponentialRetry; diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 3ff88be2562..be5742cbf90 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -34,7 +34,7 @@ import {promisify} from 'util'; export abstract class MessageQueue extends EventEmitter { batchOptions: BatchPublishOptions; publisher: Publisher; - pending?: NodeJS.Timer; + pending?: NodeJS.Timeout; constructor(publisher: Publisher) { super(); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 4c62917e74c..a74b60f539b 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -290,7 +290,7 @@ describe('Message Queues', () => { const maxMilliseconds = 1234; queue.batchOptions = {maxMilliseconds}; - queue.pending = 1234 as unknown as NodeJS.Timer; + queue.pending = 1234 as unknown as NodeJS.Timeout; queue.add(fakeMessage, spy); clock.tick(maxMilliseconds); @@ -560,7 +560,7 @@ describe('Message Queues', () => { it('should noop after adding if a publish is already pending', () => { const stub = sandbox.stub(queue, 'beginNextPublish'); - queue.pending = 1234 as unknown as NodeJS.Timer; + queue.pending = 1234 as unknown as NodeJS.Timeout; queue.add(fakeMessage, spy); assert.strictEqual(stub.callCount, 0); @@ -657,7 +657,7 @@ describe('Message Queues', () => { }); it('should cancel any pending publishes', () => { - const fakeHandle = 1234 as unknown as NodeJS.Timer; + const fakeHandle = 1234 as unknown as NodeJS.Timeout; const stub = sandbox.stub(global, 'clearTimeout'); queue.pending = fakeHandle; From f1f2a8ff898afff9c619c7892cae54624dd305f4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 16:36:35 -0400 Subject: [PATCH 0973/1115] chore: call non-hermetic functions since we're installing node_modules directly from the library (#1838) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: call non-hermetic functions since we're installing node_modules directly from the library * chore: call non-hermetic functions since we're installing node_modules directly from the library Source-Link: https://github.com/googleapis/synthtool/commit/4c4063f8395130957a0d49fcec810a7d0a76cf7b Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:8b6a07a38d1583d96b6e251ba208bd4ef0bc2a0cc37471ffc518841651d15bd6 * Update owlbot.py * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 +- .../pubsub/.github/sync-repo-settings.yaml | 1 - handwritten/pubsub/owlbot.py | 2 +- handwritten/pubsub/protos/protos.d.ts | 540 ++++- handwritten/pubsub/protos/protos.js | 2141 +++++++++++++++-- handwritten/pubsub/protos/protos.json | 292 ++- 6 files changed, 2821 insertions(+), 159 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index d9b4b9749c6..807a8916118 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:606f3d9d99a1c7cdfa7158cbb1a75bfeef490655e246a2052f9ee741740d736c -# created: 2023-08-17T19:15:55.176034173Z + digest: sha256:8b6a07a38d1583d96b6e251ba208bd4ef0bc2a0cc37471ffc518841651d15bd6 +# created: 2023-09-25T22:18:27.595486267Z diff --git a/handwritten/pubsub/.github/sync-repo-settings.yaml b/handwritten/pubsub/.github/sync-repo-settings.yaml index 1350faeff2a..b46e4c4d61d 100644 --- a/handwritten/pubsub/.github/sync-repo-settings.yaml +++ b/handwritten/pubsub/.github/sync-repo-settings.yaml @@ -7,7 +7,6 @@ branchProtectionRules: requiredStatusCheckContexts: - "ci/kokoro: Samples test" - "ci/kokoro: System test" - - docs - lint - test (14) - test (16) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 5e65c6ad70a..0e82b17c581 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -38,7 +38,7 @@ ) logger.debug("Running fix...") shell.run( - [f"/synthtool/node_modules/.bin/gts", "fix"], + ["npm", "run", "fix"], check=False, ) diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 443f61fb3b8..e60c2c22a01 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -8945,6 +8945,9 @@ export namespace google { /** Publishing librarySettings */ librarySettings?: (google.api.IClientLibrarySettings[]|null); + + /** Publishing protoReferenceDocumentationUri */ + protoReferenceDocumentationUri?: (string|null); } /** Represents a Publishing. */ @@ -8983,6 +8986,9 @@ export namespace google { /** Publishing librarySettings. */ public librarySettings: google.api.IClientLibrarySettings[]; + /** Publishing protoReferenceDocumentationUri. */ + public protoReferenceDocumentationUri: string; + /** * Creates a new Publishing instance using the specified properties. * @param [properties] Properties to set @@ -9563,6 +9569,21 @@ export namespace google { /** DotnetSettings common */ common?: (google.api.ICommonLanguageSettings|null); + + /** DotnetSettings renamedServices */ + renamedServices?: ({ [k: string]: string }|null); + + /** DotnetSettings renamedResources */ + renamedResources?: ({ [k: string]: string }|null); + + /** DotnetSettings ignoredResources */ + ignoredResources?: (string[]|null); + + /** DotnetSettings forcedNamespaceAliases */ + forcedNamespaceAliases?: (string[]|null); + + /** DotnetSettings handwrittenSignatures */ + handwrittenSignatures?: (string[]|null); } /** Represents a DotnetSettings. */ @@ -9577,6 +9598,21 @@ export namespace google { /** DotnetSettings common. */ public common?: (google.api.ICommonLanguageSettings|null); + /** DotnetSettings renamedServices. */ + public renamedServices: { [k: string]: string }; + + /** DotnetSettings renamedResources. */ + public renamedResources: { [k: string]: string }; + + /** DotnetSettings ignoredResources. */ + public ignoredResources: string[]; + + /** DotnetSettings forcedNamespaceAliases. */ + public forcedNamespaceAliases: string[]; + + /** DotnetSettings handwrittenSignatures. */ + public handwrittenSignatures: string[]; + /** * Creates a new DotnetSettings instance using the specified properties. * @param [properties] Properties to set @@ -10076,7 +10112,10 @@ export namespace google { CLOUD = 1, ADS = 2, PHOTOS = 3, - STREET_VIEW = 4 + STREET_VIEW = 4, + SHOPPING = 5, + GEO = 6, + GENERATIVE_AI = 7 } /** ClientLibraryDestination enum. */ @@ -11003,6 +11042,15 @@ export namespace google { /** ExtensionRangeOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); + + /** ExtensionRangeOptions declaration */ + declaration?: (google.protobuf.ExtensionRangeOptions.IDeclaration[]|null); + + /** ExtensionRangeOptions features */ + features?: (google.protobuf.IFeatureSet|null); + + /** ExtensionRangeOptions verification */ + verification?: (google.protobuf.ExtensionRangeOptions.VerificationState|keyof typeof google.protobuf.ExtensionRangeOptions.VerificationState|null); } /** Represents an ExtensionRangeOptions. */ @@ -11017,6 +11065,15 @@ export namespace google { /** ExtensionRangeOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; + /** ExtensionRangeOptions declaration. */ + public declaration: google.protobuf.ExtensionRangeOptions.IDeclaration[]; + + /** ExtensionRangeOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); + + /** ExtensionRangeOptions verification. */ + public verification: (google.protobuf.ExtensionRangeOptions.VerificationState|keyof typeof google.protobuf.ExtensionRangeOptions.VerificationState); + /** * Creates a new ExtensionRangeOptions instance using the specified properties. * @param [properties] Properties to set @@ -11095,6 +11152,136 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + namespace ExtensionRangeOptions { + + /** Properties of a Declaration. */ + interface IDeclaration { + + /** Declaration number */ + number?: (number|null); + + /** Declaration fullName */ + fullName?: (string|null); + + /** Declaration type */ + type?: (string|null); + + /** Declaration reserved */ + reserved?: (boolean|null); + + /** Declaration repeated */ + repeated?: (boolean|null); + } + + /** Represents a Declaration. */ + class Declaration implements IDeclaration { + + /** + * Constructs a new Declaration. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.ExtensionRangeOptions.IDeclaration); + + /** Declaration number. */ + public number: number; + + /** Declaration fullName. */ + public fullName: string; + + /** Declaration type. */ + public type: string; + + /** Declaration reserved. */ + public reserved: boolean; + + /** Declaration repeated. */ + public repeated: boolean; + + /** + * Creates a new Declaration instance using the specified properties. + * @param [properties] Properties to set + * @returns Declaration instance + */ + public static create(properties?: google.protobuf.ExtensionRangeOptions.IDeclaration): google.protobuf.ExtensionRangeOptions.Declaration; + + /** + * Encodes the specified Declaration message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.Declaration.verify|verify} messages. + * @param message Declaration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.ExtensionRangeOptions.IDeclaration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified Declaration message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.Declaration.verify|verify} messages. + * @param message Declaration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.ExtensionRangeOptions.IDeclaration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a Declaration message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns Declaration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ExtensionRangeOptions.Declaration; + + /** + * Decodes a Declaration message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns Declaration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ExtensionRangeOptions.Declaration; + + /** + * Verifies a Declaration message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a Declaration message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns Declaration + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.ExtensionRangeOptions.Declaration; + + /** + * Creates a plain object from a Declaration message. Also converts values to other types if specified. + * @param message Declaration + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.ExtensionRangeOptions.Declaration, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this Declaration to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for Declaration + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** VerificationState enum. */ + enum VerificationState { + DECLARATION = 0, + UNVERIFIED = 1 + } + } + /** Properties of a FieldDescriptorProto. */ interface IFieldDescriptorProto { @@ -12022,6 +12209,9 @@ export namespace google { /** FileOptions rubyPackage */ rubyPackage?: (string|null); + /** FileOptions features */ + features?: (google.protobuf.IFeatureSet|null); + /** FileOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -12098,6 +12288,9 @@ export namespace google { /** FileOptions rubyPackage. */ public rubyPackage: string; + /** FileOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); + /** FileOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -12207,6 +12400,9 @@ export namespace google { /** MessageOptions deprecatedLegacyJsonFieldConflicts */ deprecatedLegacyJsonFieldConflicts?: (boolean|null); + /** MessageOptions features */ + features?: (google.protobuf.IFeatureSet|null); + /** MessageOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -12238,6 +12434,9 @@ export namespace google { /** MessageOptions deprecatedLegacyJsonFieldConflicts. */ public deprecatedLegacyJsonFieldConflicts: boolean; + /** MessageOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); + /** MessageOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -12349,8 +12548,14 @@ export namespace google { /** FieldOptions retention */ retention?: (google.protobuf.FieldOptions.OptionRetention|keyof typeof google.protobuf.FieldOptions.OptionRetention|null); - /** FieldOptions target */ - target?: (google.protobuf.FieldOptions.OptionTargetType|keyof typeof google.protobuf.FieldOptions.OptionTargetType|null); + /** FieldOptions targets */ + targets?: (google.protobuf.FieldOptions.OptionTargetType[]|null); + + /** FieldOptions editionDefaults */ + editionDefaults?: (google.protobuf.FieldOptions.IEditionDefault[]|null); + + /** FieldOptions features */ + features?: (google.protobuf.IFeatureSet|null); /** FieldOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -12398,8 +12603,14 @@ export namespace google { /** FieldOptions retention. */ public retention: (google.protobuf.FieldOptions.OptionRetention|keyof typeof google.protobuf.FieldOptions.OptionRetention); - /** FieldOptions target. */ - public target: (google.protobuf.FieldOptions.OptionTargetType|keyof typeof google.protobuf.FieldOptions.OptionTargetType); + /** FieldOptions targets. */ + public targets: google.protobuf.FieldOptions.OptionTargetType[]; + + /** FieldOptions editionDefaults. */ + public editionDefaults: google.protobuf.FieldOptions.IEditionDefault[]; + + /** FieldOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); /** FieldOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -12518,11 +12729,117 @@ export namespace google { TARGET_TYPE_SERVICE = 8, TARGET_TYPE_METHOD = 9 } + + /** Properties of an EditionDefault. */ + interface IEditionDefault { + + /** EditionDefault edition */ + edition?: (string|null); + + /** EditionDefault value */ + value?: (string|null); + } + + /** Represents an EditionDefault. */ + class EditionDefault implements IEditionDefault { + + /** + * Constructs a new EditionDefault. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.FieldOptions.IEditionDefault); + + /** EditionDefault edition. */ + public edition: string; + + /** EditionDefault value. */ + public value: string; + + /** + * Creates a new EditionDefault instance using the specified properties. + * @param [properties] Properties to set + * @returns EditionDefault instance + */ + public static create(properties?: google.protobuf.FieldOptions.IEditionDefault): google.protobuf.FieldOptions.EditionDefault; + + /** + * Encodes the specified EditionDefault message. Does not implicitly {@link google.protobuf.FieldOptions.EditionDefault.verify|verify} messages. + * @param message EditionDefault message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.FieldOptions.IEditionDefault, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified EditionDefault message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.EditionDefault.verify|verify} messages. + * @param message EditionDefault message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.FieldOptions.IEditionDefault, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an EditionDefault message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns EditionDefault + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions.EditionDefault; + + /** + * Decodes an EditionDefault message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns EditionDefault + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions.EditionDefault; + + /** + * Verifies an EditionDefault message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an EditionDefault message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns EditionDefault + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions.EditionDefault; + + /** + * Creates a plain object from an EditionDefault message. Also converts values to other types if specified. + * @param message EditionDefault + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldOptions.EditionDefault, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this EditionDefault to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for EditionDefault + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } } /** Properties of an OneofOptions. */ interface IOneofOptions { + /** OneofOptions features */ + features?: (google.protobuf.IFeatureSet|null); + /** OneofOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -12536,6 +12853,9 @@ export namespace google { */ constructor(properties?: google.protobuf.IOneofOptions); + /** OneofOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); + /** OneofOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -12629,6 +12949,9 @@ export namespace google { /** EnumOptions deprecatedLegacyJsonFieldConflicts */ deprecatedLegacyJsonFieldConflicts?: (boolean|null); + /** EnumOptions features */ + features?: (google.protobuf.IFeatureSet|null); + /** EnumOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -12651,6 +12974,9 @@ export namespace google { /** EnumOptions deprecatedLegacyJsonFieldConflicts. */ public deprecatedLegacyJsonFieldConflicts: boolean; + /** EnumOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); + /** EnumOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -12738,6 +13064,12 @@ export namespace google { /** EnumValueOptions deprecated */ deprecated?: (boolean|null); + /** EnumValueOptions features */ + features?: (google.protobuf.IFeatureSet|null); + + /** EnumValueOptions debugRedact */ + debugRedact?: (boolean|null); + /** EnumValueOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -12754,6 +13086,12 @@ export namespace google { /** EnumValueOptions deprecated. */ public deprecated: boolean; + /** EnumValueOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); + + /** EnumValueOptions debugRedact. */ + public debugRedact: boolean; + /** EnumValueOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -12838,6 +13176,9 @@ export namespace google { /** Properties of a ServiceOptions. */ interface IServiceOptions { + /** ServiceOptions features */ + features?: (google.protobuf.IFeatureSet|null); + /** ServiceOptions deprecated */ deprecated?: (boolean|null); @@ -12860,6 +13201,9 @@ export namespace google { */ constructor(properties?: google.protobuf.IServiceOptions); + /** ServiceOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); + /** ServiceOptions deprecated. */ public deprecated: boolean; @@ -12953,6 +13297,9 @@ export namespace google { /** MethodOptions idempotencyLevel */ idempotencyLevel?: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel|null); + /** MethodOptions features */ + features?: (google.protobuf.IFeatureSet|null); + /** MethodOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -12978,6 +13325,9 @@ export namespace google { /** MethodOptions idempotencyLevel. */ public idempotencyLevel: (google.protobuf.MethodOptions.IdempotencyLevel|keyof typeof google.protobuf.MethodOptions.IdempotencyLevel); + /** MethodOptions features. */ + public features?: (google.protobuf.IFeatureSet|null); + /** MethodOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -13308,6 +13658,186 @@ export namespace google { } } + /** Properties of a FeatureSet. */ + interface IFeatureSet { + + /** FeatureSet fieldPresence */ + fieldPresence?: (google.protobuf.FeatureSet.FieldPresence|keyof typeof google.protobuf.FeatureSet.FieldPresence|null); + + /** FeatureSet enumType */ + enumType?: (google.protobuf.FeatureSet.EnumType|keyof typeof google.protobuf.FeatureSet.EnumType|null); + + /** FeatureSet repeatedFieldEncoding */ + repeatedFieldEncoding?: (google.protobuf.FeatureSet.RepeatedFieldEncoding|keyof typeof google.protobuf.FeatureSet.RepeatedFieldEncoding|null); + + /** FeatureSet stringFieldValidation */ + stringFieldValidation?: (google.protobuf.FeatureSet.StringFieldValidation|keyof typeof google.protobuf.FeatureSet.StringFieldValidation|null); + + /** FeatureSet messageEncoding */ + messageEncoding?: (google.protobuf.FeatureSet.MessageEncoding|keyof typeof google.protobuf.FeatureSet.MessageEncoding|null); + + /** FeatureSet jsonFormat */ + jsonFormat?: (google.protobuf.FeatureSet.JsonFormat|keyof typeof google.protobuf.FeatureSet.JsonFormat|null); + + /** FeatureSet rawFeatures */ + rawFeatures?: (google.protobuf.IFeatureSet|null); + } + + /** Represents a FeatureSet. */ + class FeatureSet implements IFeatureSet { + + /** + * Constructs a new FeatureSet. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFeatureSet); + + /** FeatureSet fieldPresence. */ + public fieldPresence: (google.protobuf.FeatureSet.FieldPresence|keyof typeof google.protobuf.FeatureSet.FieldPresence); + + /** FeatureSet enumType. */ + public enumType: (google.protobuf.FeatureSet.EnumType|keyof typeof google.protobuf.FeatureSet.EnumType); + + /** FeatureSet repeatedFieldEncoding. */ + public repeatedFieldEncoding: (google.protobuf.FeatureSet.RepeatedFieldEncoding|keyof typeof google.protobuf.FeatureSet.RepeatedFieldEncoding); + + /** FeatureSet stringFieldValidation. */ + public stringFieldValidation: (google.protobuf.FeatureSet.StringFieldValidation|keyof typeof google.protobuf.FeatureSet.StringFieldValidation); + + /** FeatureSet messageEncoding. */ + public messageEncoding: (google.protobuf.FeatureSet.MessageEncoding|keyof typeof google.protobuf.FeatureSet.MessageEncoding); + + /** FeatureSet jsonFormat. */ + public jsonFormat: (google.protobuf.FeatureSet.JsonFormat|keyof typeof google.protobuf.FeatureSet.JsonFormat); + + /** FeatureSet rawFeatures. */ + public rawFeatures?: (google.protobuf.IFeatureSet|null); + + /** + * Creates a new FeatureSet instance using the specified properties. + * @param [properties] Properties to set + * @returns FeatureSet instance + */ + public static create(properties?: google.protobuf.IFeatureSet): google.protobuf.FeatureSet; + + /** + * Encodes the specified FeatureSet message. Does not implicitly {@link google.protobuf.FeatureSet.verify|verify} messages. + * @param message FeatureSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFeatureSet, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FeatureSet message, length delimited. Does not implicitly {@link google.protobuf.FeatureSet.verify|verify} messages. + * @param message FeatureSet message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFeatureSet, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FeatureSet message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FeatureSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FeatureSet; + + /** + * Decodes a FeatureSet message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FeatureSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FeatureSet; + + /** + * Verifies a FeatureSet message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FeatureSet message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FeatureSet + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FeatureSet; + + /** + * Creates a plain object from a FeatureSet message. Also converts values to other types if specified. + * @param message FeatureSet + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FeatureSet, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FeatureSet to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FeatureSet + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace FeatureSet { + + /** FieldPresence enum. */ + enum FieldPresence { + FIELD_PRESENCE_UNKNOWN = 0, + EXPLICIT = 1, + IMPLICIT = 2, + LEGACY_REQUIRED = 3 + } + + /** EnumType enum. */ + enum EnumType { + ENUM_TYPE_UNKNOWN = 0, + OPEN = 1, + CLOSED = 2 + } + + /** RepeatedFieldEncoding enum. */ + enum RepeatedFieldEncoding { + REPEATED_FIELD_ENCODING_UNKNOWN = 0, + PACKED = 1, + EXPANDED = 2 + } + + /** StringFieldValidation enum. */ + enum StringFieldValidation { + STRING_FIELD_VALIDATION_UNKNOWN = 0, + MANDATORY = 1, + HINT = 2, + NONE = 3 + } + + /** MessageEncoding enum. */ + enum MessageEncoding { + MESSAGE_ENCODING_UNKNOWN = 0, + LENGTH_PREFIXED = 1, + DELIMITED = 2 + } + + /** JsonFormat enum. */ + enum JsonFormat { + JSON_FORMAT_UNKNOWN = 0, + ALLOW = 1, + LEGACY_BEST_EFFORT = 2 + } + } + /** Properties of a SourceCodeInfo. */ interface ISourceCodeInfo { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 2495a560e15..81f10210c3f 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -21139,6 +21139,7 @@ * @property {string|null} [docTagPrefix] Publishing docTagPrefix * @property {google.api.ClientLibraryOrganization|null} [organization] Publishing organization * @property {Array.|null} [librarySettings] Publishing librarySettings + * @property {string|null} [protoReferenceDocumentationUri] Publishing protoReferenceDocumentationUri */ /** @@ -21231,6 +21232,14 @@ */ Publishing.prototype.librarySettings = $util.emptyArray; + /** + * Publishing protoReferenceDocumentationUri. + * @member {string} protoReferenceDocumentationUri + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.protoReferenceDocumentationUri = ""; + /** * Creates a new Publishing instance using the specified properties. * @function create @@ -21276,6 +21285,8 @@ if (message.librarySettings != null && message.librarySettings.length) for (var i = 0; i < message.librarySettings.length; ++i) $root.google.api.ClientLibrarySettings.encode(message.librarySettings[i], writer.uint32(/* id 109, wireType 2 =*/874).fork()).ldelim(); + if (message.protoReferenceDocumentationUri != null && Object.hasOwnProperty.call(message, "protoReferenceDocumentationUri")) + writer.uint32(/* id 110, wireType 2 =*/882).string(message.protoReferenceDocumentationUri); return writer; }; @@ -21352,6 +21363,10 @@ message.librarySettings.push($root.google.api.ClientLibrarySettings.decode(reader, reader.uint32())); break; } + case 110: { + message.protoReferenceDocumentationUri = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -21427,6 +21442,9 @@ case 2: case 3: case 4: + case 5: + case 6: + case 7: break; } if (message.librarySettings != null && message.hasOwnProperty("librarySettings")) { @@ -21438,6 +21456,9 @@ return "librarySettings." + error; } } + if (message.protoReferenceDocumentationUri != null && message.hasOwnProperty("protoReferenceDocumentationUri")) + if (!$util.isString(message.protoReferenceDocumentationUri)) + return "protoReferenceDocumentationUri: string expected"; return null; }; @@ -21507,6 +21528,18 @@ case 4: message.organization = 4; break; + case "SHOPPING": + case 5: + message.organization = 5; + break; + case "GEO": + case 6: + message.organization = 6; + break; + case "GENERATIVE_AI": + case 7: + message.organization = 7; + break; } if (object.librarySettings) { if (!Array.isArray(object.librarySettings)) @@ -21518,6 +21551,8 @@ message.librarySettings[i] = $root.google.api.ClientLibrarySettings.fromObject(object.librarySettings[i]); } } + if (object.protoReferenceDocumentationUri != null) + message.protoReferenceDocumentationUri = String(object.protoReferenceDocumentationUri); return message; }; @@ -21546,6 +21581,7 @@ object.githubLabel = ""; object.docTagPrefix = ""; object.organization = options.enums === String ? "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED" : 0; + object.protoReferenceDocumentationUri = ""; } if (message.methodSettings && message.methodSettings.length) { object.methodSettings = []; @@ -21574,6 +21610,8 @@ for (var j = 0; j < message.librarySettings.length; ++j) object.librarySettings[j] = $root.google.api.ClientLibrarySettings.toObject(message.librarySettings[j], options); } + if (message.protoReferenceDocumentationUri != null && message.hasOwnProperty("protoReferenceDocumentationUri")) + object.protoReferenceDocumentationUri = message.protoReferenceDocumentationUri; return object; }; @@ -22736,6 +22774,11 @@ * @memberof google.api * @interface IDotnetSettings * @property {google.api.ICommonLanguageSettings|null} [common] DotnetSettings common + * @property {Object.|null} [renamedServices] DotnetSettings renamedServices + * @property {Object.|null} [renamedResources] DotnetSettings renamedResources + * @property {Array.|null} [ignoredResources] DotnetSettings ignoredResources + * @property {Array.|null} [forcedNamespaceAliases] DotnetSettings forcedNamespaceAliases + * @property {Array.|null} [handwrittenSignatures] DotnetSettings handwrittenSignatures */ /** @@ -22747,6 +22790,11 @@ * @param {google.api.IDotnetSettings=} [properties] Properties to set */ function DotnetSettings(properties) { + this.renamedServices = {}; + this.renamedResources = {}; + this.ignoredResources = []; + this.forcedNamespaceAliases = []; + this.handwrittenSignatures = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -22761,6 +22809,46 @@ */ DotnetSettings.prototype.common = null; + /** + * DotnetSettings renamedServices. + * @member {Object.} renamedServices + * @memberof google.api.DotnetSettings + * @instance + */ + DotnetSettings.prototype.renamedServices = $util.emptyObject; + + /** + * DotnetSettings renamedResources. + * @member {Object.} renamedResources + * @memberof google.api.DotnetSettings + * @instance + */ + DotnetSettings.prototype.renamedResources = $util.emptyObject; + + /** + * DotnetSettings ignoredResources. + * @member {Array.} ignoredResources + * @memberof google.api.DotnetSettings + * @instance + */ + DotnetSettings.prototype.ignoredResources = $util.emptyArray; + + /** + * DotnetSettings forcedNamespaceAliases. + * @member {Array.} forcedNamespaceAliases + * @memberof google.api.DotnetSettings + * @instance + */ + DotnetSettings.prototype.forcedNamespaceAliases = $util.emptyArray; + + /** + * DotnetSettings handwrittenSignatures. + * @member {Array.} handwrittenSignatures + * @memberof google.api.DotnetSettings + * @instance + */ + DotnetSettings.prototype.handwrittenSignatures = $util.emptyArray; + /** * Creates a new DotnetSettings instance using the specified properties. * @function create @@ -22787,6 +22875,21 @@ writer = $Writer.create(); if (message.common != null && Object.hasOwnProperty.call(message, "common")) $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.renamedServices != null && Object.hasOwnProperty.call(message, "renamedServices")) + for (var keys = Object.keys(message.renamedServices), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.renamedServices[keys[i]]).ldelim(); + if (message.renamedResources != null && Object.hasOwnProperty.call(message, "renamedResources")) + for (var keys = Object.keys(message.renamedResources), i = 0; i < keys.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.renamedResources[keys[i]]).ldelim(); + if (message.ignoredResources != null && message.ignoredResources.length) + for (var i = 0; i < message.ignoredResources.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.ignoredResources[i]); + if (message.forcedNamespaceAliases != null && message.forcedNamespaceAliases.length) + for (var i = 0; i < message.forcedNamespaceAliases.length; ++i) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.forcedNamespaceAliases[i]); + if (message.handwrittenSignatures != null && message.handwrittenSignatures.length) + for (var i = 0; i < message.handwrittenSignatures.length; ++i) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.handwrittenSignatures[i]); return writer; }; @@ -22817,7 +22920,7 @@ DotnetSettings.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.DotnetSettings(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.DotnetSettings(), key, value; while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { @@ -22825,6 +22928,70 @@ message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); break; } + case 2: { + if (message.renamedServices === $util.emptyObject) + message.renamedServices = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.renamedServices[key] = value; + break; + } + case 3: { + if (message.renamedResources === $util.emptyObject) + message.renamedResources = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.renamedResources[key] = value; + break; + } + case 4: { + if (!(message.ignoredResources && message.ignoredResources.length)) + message.ignoredResources = []; + message.ignoredResources.push(reader.string()); + break; + } + case 5: { + if (!(message.forcedNamespaceAliases && message.forcedNamespaceAliases.length)) + message.forcedNamespaceAliases = []; + message.forcedNamespaceAliases.push(reader.string()); + break; + } + case 6: { + if (!(message.handwrittenSignatures && message.handwrittenSignatures.length)) + message.handwrittenSignatures = []; + message.handwrittenSignatures.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -22865,6 +23032,43 @@ if (error) return "common." + error; } + if (message.renamedServices != null && message.hasOwnProperty("renamedServices")) { + if (!$util.isObject(message.renamedServices)) + return "renamedServices: object expected"; + var key = Object.keys(message.renamedServices); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.renamedServices[key[i]])) + return "renamedServices: string{k:string} expected"; + } + if (message.renamedResources != null && message.hasOwnProperty("renamedResources")) { + if (!$util.isObject(message.renamedResources)) + return "renamedResources: object expected"; + var key = Object.keys(message.renamedResources); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.renamedResources[key[i]])) + return "renamedResources: string{k:string} expected"; + } + if (message.ignoredResources != null && message.hasOwnProperty("ignoredResources")) { + if (!Array.isArray(message.ignoredResources)) + return "ignoredResources: array expected"; + for (var i = 0; i < message.ignoredResources.length; ++i) + if (!$util.isString(message.ignoredResources[i])) + return "ignoredResources: string[] expected"; + } + if (message.forcedNamespaceAliases != null && message.hasOwnProperty("forcedNamespaceAliases")) { + if (!Array.isArray(message.forcedNamespaceAliases)) + return "forcedNamespaceAliases: array expected"; + for (var i = 0; i < message.forcedNamespaceAliases.length; ++i) + if (!$util.isString(message.forcedNamespaceAliases[i])) + return "forcedNamespaceAliases: string[] expected"; + } + if (message.handwrittenSignatures != null && message.hasOwnProperty("handwrittenSignatures")) { + if (!Array.isArray(message.handwrittenSignatures)) + return "handwrittenSignatures: array expected"; + for (var i = 0; i < message.handwrittenSignatures.length; ++i) + if (!$util.isString(message.handwrittenSignatures[i])) + return "handwrittenSignatures: string[] expected"; + } return null; }; @@ -22885,6 +23089,41 @@ throw TypeError(".google.api.DotnetSettings.common: object expected"); message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); } + if (object.renamedServices) { + if (typeof object.renamedServices !== "object") + throw TypeError(".google.api.DotnetSettings.renamedServices: object expected"); + message.renamedServices = {}; + for (var keys = Object.keys(object.renamedServices), i = 0; i < keys.length; ++i) + message.renamedServices[keys[i]] = String(object.renamedServices[keys[i]]); + } + if (object.renamedResources) { + if (typeof object.renamedResources !== "object") + throw TypeError(".google.api.DotnetSettings.renamedResources: object expected"); + message.renamedResources = {}; + for (var keys = Object.keys(object.renamedResources), i = 0; i < keys.length; ++i) + message.renamedResources[keys[i]] = String(object.renamedResources[keys[i]]); + } + if (object.ignoredResources) { + if (!Array.isArray(object.ignoredResources)) + throw TypeError(".google.api.DotnetSettings.ignoredResources: array expected"); + message.ignoredResources = []; + for (var i = 0; i < object.ignoredResources.length; ++i) + message.ignoredResources[i] = String(object.ignoredResources[i]); + } + if (object.forcedNamespaceAliases) { + if (!Array.isArray(object.forcedNamespaceAliases)) + throw TypeError(".google.api.DotnetSettings.forcedNamespaceAliases: array expected"); + message.forcedNamespaceAliases = []; + for (var i = 0; i < object.forcedNamespaceAliases.length; ++i) + message.forcedNamespaceAliases[i] = String(object.forcedNamespaceAliases[i]); + } + if (object.handwrittenSignatures) { + if (!Array.isArray(object.handwrittenSignatures)) + throw TypeError(".google.api.DotnetSettings.handwrittenSignatures: array expected"); + message.handwrittenSignatures = []; + for (var i = 0; i < object.handwrittenSignatures.length; ++i) + message.handwrittenSignatures[i] = String(object.handwrittenSignatures[i]); + } return message; }; @@ -22901,10 +23140,45 @@ if (!options) options = {}; var object = {}; + if (options.arrays || options.defaults) { + object.ignoredResources = []; + object.forcedNamespaceAliases = []; + object.handwrittenSignatures = []; + } + if (options.objects || options.defaults) { + object.renamedServices = {}; + object.renamedResources = {}; + } if (options.defaults) object.common = null; if (message.common != null && message.hasOwnProperty("common")) object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + var keys2; + if (message.renamedServices && (keys2 = Object.keys(message.renamedServices)).length) { + object.renamedServices = {}; + for (var j = 0; j < keys2.length; ++j) + object.renamedServices[keys2[j]] = message.renamedServices[keys2[j]]; + } + if (message.renamedResources && (keys2 = Object.keys(message.renamedResources)).length) { + object.renamedResources = {}; + for (var j = 0; j < keys2.length; ++j) + object.renamedResources[keys2[j]] = message.renamedResources[keys2[j]]; + } + if (message.ignoredResources && message.ignoredResources.length) { + object.ignoredResources = []; + for (var j = 0; j < message.ignoredResources.length; ++j) + object.ignoredResources[j] = message.ignoredResources[j]; + } + if (message.forcedNamespaceAliases && message.forcedNamespaceAliases.length) { + object.forcedNamespaceAliases = []; + for (var j = 0; j < message.forcedNamespaceAliases.length; ++j) + object.forcedNamespaceAliases[j] = message.forcedNamespaceAliases[j]; + } + if (message.handwrittenSignatures && message.handwrittenSignatures.length) { + object.handwrittenSignatures = []; + for (var j = 0; j < message.handwrittenSignatures.length; ++j) + object.handwrittenSignatures[j] = message.handwrittenSignatures[j]; + } return object; }; @@ -23882,6 +24156,9 @@ * @property {number} ADS=2 ADS value * @property {number} PHOTOS=3 PHOTOS value * @property {number} STREET_VIEW=4 STREET_VIEW value + * @property {number} SHOPPING=5 SHOPPING value + * @property {number} GEO=6 GEO value + * @property {number} GENERATIVE_AI=7 GENERATIVE_AI value */ api.ClientLibraryOrganization = (function() { var valuesById = {}, values = Object.create(valuesById); @@ -23890,6 +24167,9 @@ values[valuesById[2] = "ADS"] = 2; values[valuesById[3] = "PHOTOS"] = 3; values[valuesById[4] = "STREET_VIEW"] = 4; + values[valuesById[5] = "SHOPPING"] = 5; + values[valuesById[6] = "GEO"] = 6; + values[valuesById[7] = "GENERATIVE_AI"] = 7; return values; })(); @@ -26585,6 +26865,9 @@ * @memberof google.protobuf * @interface IExtensionRangeOptions * @property {Array.|null} [uninterpretedOption] ExtensionRangeOptions uninterpretedOption + * @property {Array.|null} [declaration] ExtensionRangeOptions declaration + * @property {google.protobuf.IFeatureSet|null} [features] ExtensionRangeOptions features + * @property {google.protobuf.ExtensionRangeOptions.VerificationState|null} [verification] ExtensionRangeOptions verification */ /** @@ -26597,6 +26880,7 @@ */ function ExtensionRangeOptions(properties) { this.uninterpretedOption = []; + this.declaration = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -26611,6 +26895,30 @@ */ ExtensionRangeOptions.prototype.uninterpretedOption = $util.emptyArray; + /** + * ExtensionRangeOptions declaration. + * @member {Array.} declaration + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + */ + ExtensionRangeOptions.prototype.declaration = $util.emptyArray; + + /** + * ExtensionRangeOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + */ + ExtensionRangeOptions.prototype.features = null; + + /** + * ExtensionRangeOptions verification. + * @member {google.protobuf.ExtensionRangeOptions.VerificationState} verification + * @memberof google.protobuf.ExtensionRangeOptions + * @instance + */ + ExtensionRangeOptions.prototype.verification = 1; + /** * Creates a new ExtensionRangeOptions instance using the specified properties. * @function create @@ -26635,6 +26943,13 @@ ExtensionRangeOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); + if (message.declaration != null && message.declaration.length) + for (var i = 0; i < message.declaration.length; ++i) + $root.google.protobuf.ExtensionRangeOptions.Declaration.encode(message.declaration[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.verification != null && Object.hasOwnProperty.call(message, "verification")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.verification); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 50, wireType 2 =*/402).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -26678,6 +26993,20 @@ message.uninterpretedOption.push($root.google.protobuf.UninterpretedOption.decode(reader, reader.uint32())); break; } + case 2: { + if (!(message.declaration && message.declaration.length)) + message.declaration = []; + message.declaration.push($root.google.protobuf.ExtensionRangeOptions.Declaration.decode(reader, reader.uint32())); + break; + } + case 50: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } + case 3: { + message.verification = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -26722,6 +27051,28 @@ return "uninterpretedOption." + error; } } + if (message.declaration != null && message.hasOwnProperty("declaration")) { + if (!Array.isArray(message.declaration)) + return "declaration: array expected"; + for (var i = 0; i < message.declaration.length; ++i) { + var error = $root.google.protobuf.ExtensionRangeOptions.Declaration.verify(message.declaration[i]); + if (error) + return "declaration." + error; + } + } + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } + if (message.verification != null && message.hasOwnProperty("verification")) + switch (message.verification) { + default: + return "verification: enum value expected"; + case 0: + case 1: + break; + } return null; }; @@ -26747,6 +27098,37 @@ message.uninterpretedOption[i] = $root.google.protobuf.UninterpretedOption.fromObject(object.uninterpretedOption[i]); } } + if (object.declaration) { + if (!Array.isArray(object.declaration)) + throw TypeError(".google.protobuf.ExtensionRangeOptions.declaration: array expected"); + message.declaration = []; + for (var i = 0; i < object.declaration.length; ++i) { + if (typeof object.declaration[i] !== "object") + throw TypeError(".google.protobuf.ExtensionRangeOptions.declaration: object expected"); + message.declaration[i] = $root.google.protobuf.ExtensionRangeOptions.Declaration.fromObject(object.declaration[i]); + } + } + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.ExtensionRangeOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } + switch (object.verification) { + case "DECLARATION": + case 0: + message.verification = 0; + break; + default: + if (typeof object.verification === "number") { + message.verification = object.verification; + break; + } + break; + case "UNVERIFIED": + case 1: + message.verification = 1; + break; + } return message; }; @@ -26763,8 +27145,23 @@ if (!options) options = {}; var object = {}; - if (options.arrays || options.defaults) + if (options.arrays || options.defaults) { + object.declaration = []; object.uninterpretedOption = []; + } + if (options.defaults) { + object.verification = options.enums === String ? "UNVERIFIED" : 1; + object.features = null; + } + if (message.declaration && message.declaration.length) { + object.declaration = []; + for (var j = 0; j < message.declaration.length; ++j) + object.declaration[j] = $root.google.protobuf.ExtensionRangeOptions.Declaration.toObject(message.declaration[j], options); + } + if (message.verification != null && message.hasOwnProperty("verification")) + object.verification = options.enums === String ? $root.google.protobuf.ExtensionRangeOptions.VerificationState[message.verification] === undefined ? message.verification : $root.google.protobuf.ExtensionRangeOptions.VerificationState[message.verification] : message.verification; + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -26799,86 +27196,396 @@ return typeUrlPrefix + "/google.protobuf.ExtensionRangeOptions"; }; - return ExtensionRangeOptions; - })(); + ExtensionRangeOptions.Declaration = (function() { - protobuf.FieldDescriptorProto = (function() { + /** + * Properties of a Declaration. + * @memberof google.protobuf.ExtensionRangeOptions + * @interface IDeclaration + * @property {number|null} [number] Declaration number + * @property {string|null} [fullName] Declaration fullName + * @property {string|null} [type] Declaration type + * @property {boolean|null} [reserved] Declaration reserved + * @property {boolean|null} [repeated] Declaration repeated + */ - /** - * Properties of a FieldDescriptorProto. - * @memberof google.protobuf - * @interface IFieldDescriptorProto - * @property {string|null} [name] FieldDescriptorProto name - * @property {number|null} [number] FieldDescriptorProto number - * @property {google.protobuf.FieldDescriptorProto.Label|null} [label] FieldDescriptorProto label - * @property {google.protobuf.FieldDescriptorProto.Type|null} [type] FieldDescriptorProto type - * @property {string|null} [typeName] FieldDescriptorProto typeName - * @property {string|null} [extendee] FieldDescriptorProto extendee - * @property {string|null} [defaultValue] FieldDescriptorProto defaultValue - * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex - * @property {string|null} [jsonName] FieldDescriptorProto jsonName - * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options - * @property {boolean|null} [proto3Optional] FieldDescriptorProto proto3Optional - */ + /** + * Constructs a new Declaration. + * @memberof google.protobuf.ExtensionRangeOptions + * @classdesc Represents a Declaration. + * @implements IDeclaration + * @constructor + * @param {google.protobuf.ExtensionRangeOptions.IDeclaration=} [properties] Properties to set + */ + function Declaration(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new FieldDescriptorProto. - * @memberof google.protobuf - * @classdesc Represents a FieldDescriptorProto. - * @implements IFieldDescriptorProto - * @constructor - * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set - */ - function FieldDescriptorProto(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * Declaration number. + * @member {number} number + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @instance + */ + Declaration.prototype.number = 0; - /** - * FieldDescriptorProto name. - * @member {string} name - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.name = ""; + /** + * Declaration fullName. + * @member {string} fullName + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @instance + */ + Declaration.prototype.fullName = ""; - /** - * FieldDescriptorProto number. - * @member {number} number - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.number = 0; + /** + * Declaration type. + * @member {string} type + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @instance + */ + Declaration.prototype.type = ""; - /** - * FieldDescriptorProto label. - * @member {google.protobuf.FieldDescriptorProto.Label} label - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.label = 1; + /** + * Declaration reserved. + * @member {boolean} reserved + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @instance + */ + Declaration.prototype.reserved = false; - /** - * FieldDescriptorProto type. - * @member {google.protobuf.FieldDescriptorProto.Type} type - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.type = 1; + /** + * Declaration repeated. + * @member {boolean} repeated + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @instance + */ + Declaration.prototype.repeated = false; - /** - * FieldDescriptorProto typeName. - * @member {string} typeName - * @memberof google.protobuf.FieldDescriptorProto - * @instance - */ - FieldDescriptorProto.prototype.typeName = ""; + /** + * Creates a new Declaration instance using the specified properties. + * @function create + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {google.protobuf.ExtensionRangeOptions.IDeclaration=} [properties] Properties to set + * @returns {google.protobuf.ExtensionRangeOptions.Declaration} Declaration instance + */ + Declaration.create = function create(properties) { + return new Declaration(properties); + }; - /** - * FieldDescriptorProto extendee. - * @member {string} extendee + /** + * Encodes the specified Declaration message. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.Declaration.verify|verify} messages. + * @function encode + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {google.protobuf.ExtensionRangeOptions.IDeclaration} message Declaration message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Declaration.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.number != null && Object.hasOwnProperty.call(message, "number")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.number); + if (message.fullName != null && Object.hasOwnProperty.call(message, "fullName")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.fullName); + if (message.type != null && Object.hasOwnProperty.call(message, "type")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.type); + if (message.reserved != null && Object.hasOwnProperty.call(message, "reserved")) + writer.uint32(/* id 5, wireType 0 =*/40).bool(message.reserved); + if (message.repeated != null && Object.hasOwnProperty.call(message, "repeated")) + writer.uint32(/* id 6, wireType 0 =*/48).bool(message.repeated); + return writer; + }; + + /** + * Encodes the specified Declaration message, length delimited. Does not implicitly {@link google.protobuf.ExtensionRangeOptions.Declaration.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {google.protobuf.ExtensionRangeOptions.IDeclaration} message Declaration message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + Declaration.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a Declaration message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.ExtensionRangeOptions.Declaration} Declaration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Declaration.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions.Declaration(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.number = reader.int32(); + break; + } + case 2: { + message.fullName = reader.string(); + break; + } + case 3: { + message.type = reader.string(); + break; + } + case 5: { + message.reserved = reader.bool(); + break; + } + case 6: { + message.repeated = reader.bool(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a Declaration message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.ExtensionRangeOptions.Declaration} Declaration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + Declaration.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a Declaration message. + * @function verify + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + Declaration.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.number != null && message.hasOwnProperty("number")) + if (!$util.isInteger(message.number)) + return "number: integer expected"; + if (message.fullName != null && message.hasOwnProperty("fullName")) + if (!$util.isString(message.fullName)) + return "fullName: string expected"; + if (message.type != null && message.hasOwnProperty("type")) + if (!$util.isString(message.type)) + return "type: string expected"; + if (message.reserved != null && message.hasOwnProperty("reserved")) + if (typeof message.reserved !== "boolean") + return "reserved: boolean expected"; + if (message.repeated != null && message.hasOwnProperty("repeated")) + if (typeof message.repeated !== "boolean") + return "repeated: boolean expected"; + return null; + }; + + /** + * Creates a Declaration message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.ExtensionRangeOptions.Declaration} Declaration + */ + Declaration.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.ExtensionRangeOptions.Declaration) + return object; + var message = new $root.google.protobuf.ExtensionRangeOptions.Declaration(); + if (object.number != null) + message.number = object.number | 0; + if (object.fullName != null) + message.fullName = String(object.fullName); + if (object.type != null) + message.type = String(object.type); + if (object.reserved != null) + message.reserved = Boolean(object.reserved); + if (object.repeated != null) + message.repeated = Boolean(object.repeated); + return message; + }; + + /** + * Creates a plain object from a Declaration message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {google.protobuf.ExtensionRangeOptions.Declaration} message Declaration + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + Declaration.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.number = 0; + object.fullName = ""; + object.type = ""; + object.reserved = false; + object.repeated = false; + } + if (message.number != null && message.hasOwnProperty("number")) + object.number = message.number; + if (message.fullName != null && message.hasOwnProperty("fullName")) + object.fullName = message.fullName; + if (message.type != null && message.hasOwnProperty("type")) + object.type = message.type; + if (message.reserved != null && message.hasOwnProperty("reserved")) + object.reserved = message.reserved; + if (message.repeated != null && message.hasOwnProperty("repeated")) + object.repeated = message.repeated; + return object; + }; + + /** + * Converts this Declaration to JSON. + * @function toJSON + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @instance + * @returns {Object.} JSON object + */ + Declaration.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for Declaration + * @function getTypeUrl + * @memberof google.protobuf.ExtensionRangeOptions.Declaration + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + Declaration.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.ExtensionRangeOptions.Declaration"; + }; + + return Declaration; + })(); + + /** + * VerificationState enum. + * @name google.protobuf.ExtensionRangeOptions.VerificationState + * @enum {number} + * @property {number} DECLARATION=0 DECLARATION value + * @property {number} UNVERIFIED=1 UNVERIFIED value + */ + ExtensionRangeOptions.VerificationState = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "DECLARATION"] = 0; + values[valuesById[1] = "UNVERIFIED"] = 1; + return values; + })(); + + return ExtensionRangeOptions; + })(); + + protobuf.FieldDescriptorProto = (function() { + + /** + * Properties of a FieldDescriptorProto. + * @memberof google.protobuf + * @interface IFieldDescriptorProto + * @property {string|null} [name] FieldDescriptorProto name + * @property {number|null} [number] FieldDescriptorProto number + * @property {google.protobuf.FieldDescriptorProto.Label|null} [label] FieldDescriptorProto label + * @property {google.protobuf.FieldDescriptorProto.Type|null} [type] FieldDescriptorProto type + * @property {string|null} [typeName] FieldDescriptorProto typeName + * @property {string|null} [extendee] FieldDescriptorProto extendee + * @property {string|null} [defaultValue] FieldDescriptorProto defaultValue + * @property {number|null} [oneofIndex] FieldDescriptorProto oneofIndex + * @property {string|null} [jsonName] FieldDescriptorProto jsonName + * @property {google.protobuf.IFieldOptions|null} [options] FieldDescriptorProto options + * @property {boolean|null} [proto3Optional] FieldDescriptorProto proto3Optional + */ + + /** + * Constructs a new FieldDescriptorProto. + * @memberof google.protobuf + * @classdesc Represents a FieldDescriptorProto. + * @implements IFieldDescriptorProto + * @constructor + * @param {google.protobuf.IFieldDescriptorProto=} [properties] Properties to set + */ + function FieldDescriptorProto(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FieldDescriptorProto name. + * @member {string} name + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.name = ""; + + /** + * FieldDescriptorProto number. + * @member {number} number + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.number = 0; + + /** + * FieldDescriptorProto label. + * @member {google.protobuf.FieldDescriptorProto.Label} label + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.label = 1; + + /** + * FieldDescriptorProto type. + * @member {google.protobuf.FieldDescriptorProto.Type} type + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.type = 1; + + /** + * FieldDescriptorProto typeName. + * @member {string} typeName + * @memberof google.protobuf.FieldDescriptorProto + * @instance + */ + FieldDescriptorProto.prototype.typeName = ""; + + /** + * FieldDescriptorProto extendee. + * @member {string} extendee * @memberof google.protobuf.FieldDescriptorProto * @instance */ @@ -29128,6 +29835,7 @@ * @property {string|null} [phpNamespace] FileOptions phpNamespace * @property {string|null} [phpMetadataNamespace] FileOptions phpMetadataNamespace * @property {string|null} [rubyPackage] FileOptions rubyPackage + * @property {google.protobuf.IFeatureSet|null} [features] FileOptions features * @property {Array.|null} [uninterpretedOption] FileOptions uninterpretedOption * @property {Array.|null} [".google.api.resourceDefinition"] FileOptions .google.api.resourceDefinition */ @@ -29309,6 +30017,14 @@ */ FileOptions.prototype.rubyPackage = ""; + /** + * FileOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.FileOptions + * @instance + */ + FileOptions.prototype.features = null; + /** * FileOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -29389,6 +30105,8 @@ writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); if (message.rubyPackage != null && Object.hasOwnProperty.call(message, "rubyPackage")) writer.uint32(/* id 45, wireType 2 =*/362).string(message.rubyPackage); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 50, wireType 2 =*/402).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -29509,6 +30227,10 @@ message.rubyPackage = reader.string(); break; } + case 50: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -29622,6 +30344,11 @@ if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) if (!$util.isString(message.rubyPackage)) return "rubyPackage: string expected"; + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -29713,6 +30440,11 @@ message.phpMetadataNamespace = String(object.phpMetadataNamespace); if (object.rubyPackage != null) message.rubyPackage = String(object.rubyPackage); + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.FileOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.FileOptions.uninterpretedOption: array expected"); @@ -29774,6 +30506,7 @@ object.phpGenericServices = false; object.phpMetadataNamespace = ""; object.rubyPackage = ""; + object.features = null; } if (message.javaPackage != null && message.hasOwnProperty("javaPackage")) object.javaPackage = message.javaPackage; @@ -29815,6 +30548,8 @@ object.phpMetadataNamespace = message.phpMetadataNamespace; if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) object.rubyPackage = message.rubyPackage; + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -29884,6 +30619,7 @@ * @property {boolean|null} [deprecated] MessageOptions deprecated * @property {boolean|null} [mapEntry] MessageOptions mapEntry * @property {boolean|null} [deprecatedLegacyJsonFieldConflicts] MessageOptions deprecatedLegacyJsonFieldConflicts + * @property {google.protobuf.IFeatureSet|null} [features] MessageOptions features * @property {Array.|null} [uninterpretedOption] MessageOptions uninterpretedOption * @property {google.api.IResourceDescriptor|null} [".google.api.resource"] MessageOptions .google.api.resource */ @@ -29944,6 +30680,14 @@ */ MessageOptions.prototype.deprecatedLegacyJsonFieldConflicts = false; + /** + * MessageOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.MessageOptions + * @instance + */ + MessageOptions.prototype.features = null; + /** * MessageOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -29994,6 +30738,8 @@ writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); if (message.deprecatedLegacyJsonFieldConflicts != null && Object.hasOwnProperty.call(message, "deprecatedLegacyJsonFieldConflicts")) writer.uint32(/* id 11, wireType 0 =*/88).bool(message.deprecatedLegacyJsonFieldConflicts); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 12, wireType 2 =*/98).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -30053,6 +30799,10 @@ message.deprecatedLegacyJsonFieldConflicts = reader.bool(); break; } + case 12: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -30113,6 +30863,11 @@ if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) if (typeof message.deprecatedLegacyJsonFieldConflicts !== "boolean") return "deprecatedLegacyJsonFieldConflicts: boolean expected"; + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -30152,6 +30907,11 @@ message.mapEntry = Boolean(object.mapEntry); if (object.deprecatedLegacyJsonFieldConflicts != null) message.deprecatedLegacyJsonFieldConflicts = Boolean(object.deprecatedLegacyJsonFieldConflicts); + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.MessageOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.MessageOptions.uninterpretedOption: array expected"); @@ -30191,6 +30951,7 @@ object.deprecated = false; object.mapEntry = false; object.deprecatedLegacyJsonFieldConflicts = false; + object.features = null; object[".google.api.resource"] = null; } if (message.messageSetWireFormat != null && message.hasOwnProperty("messageSetWireFormat")) @@ -30203,6 +30964,8 @@ object.mapEntry = message.mapEntry; if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) object.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts; + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -30257,7 +31020,9 @@ * @property {boolean|null} [weak] FieldOptions weak * @property {boolean|null} [debugRedact] FieldOptions debugRedact * @property {google.protobuf.FieldOptions.OptionRetention|null} [retention] FieldOptions retention - * @property {google.protobuf.FieldOptions.OptionTargetType|null} [target] FieldOptions target + * @property {Array.|null} [targets] FieldOptions targets + * @property {Array.|null} [editionDefaults] FieldOptions editionDefaults + * @property {google.protobuf.IFeatureSet|null} [features] FieldOptions features * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference @@ -30272,6 +31037,8 @@ * @param {google.protobuf.IFieldOptions=} [properties] Properties to set */ function FieldOptions(properties) { + this.targets = []; + this.editionDefaults = []; this.uninterpretedOption = []; this[".google.api.fieldBehavior"] = []; if (properties) @@ -30353,12 +31120,28 @@ FieldOptions.prototype.retention = 0; /** - * FieldOptions target. - * @member {google.protobuf.FieldOptions.OptionTargetType} target + * FieldOptions targets. + * @member {Array.} targets + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.targets = $util.emptyArray; + + /** + * FieldOptions editionDefaults. + * @member {Array.} editionDefaults + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.editionDefaults = $util.emptyArray; + + /** + * FieldOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features * @memberof google.protobuf.FieldOptions * @instance */ - FieldOptions.prototype.target = 0; + FieldOptions.prototype.features = null; /** * FieldOptions uninterpretedOption. @@ -30426,8 +31209,14 @@ writer.uint32(/* id 16, wireType 0 =*/128).bool(message.debugRedact); if (message.retention != null && Object.hasOwnProperty.call(message, "retention")) writer.uint32(/* id 17, wireType 0 =*/136).int32(message.retention); - if (message.target != null && Object.hasOwnProperty.call(message, "target")) - writer.uint32(/* id 18, wireType 0 =*/144).int32(message.target); + if (message.targets != null && message.targets.length) + for (var i = 0; i < message.targets.length; ++i) + writer.uint32(/* id 19, wireType 0 =*/152).int32(message.targets[i]); + if (message.editionDefaults != null && message.editionDefaults.length) + for (var i = 0; i < message.editionDefaults.length; ++i) + $root.google.protobuf.FieldOptions.EditionDefault.encode(message.editionDefaults[i], writer.uint32(/* id 20, wireType 2 =*/162).fork()).ldelim(); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 21, wireType 2 =*/170).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -30509,8 +31298,25 @@ message.retention = reader.int32(); break; } - case 18: { - message.target = reader.int32(); + case 19: { + if (!(message.targets && message.targets.length)) + message.targets = []; + if ((tag & 7) === 2) { + var end2 = reader.uint32() + reader.pos; + while (reader.pos < end2) + message.targets.push(reader.int32()); + } else + message.targets.push(reader.int32()); + break; + } + case 20: { + if (!(message.editionDefaults && message.editionDefaults.length)) + message.editionDefaults = []; + message.editionDefaults.push($root.google.protobuf.FieldOptions.EditionDefault.decode(reader, reader.uint32())); + break; + } + case 21: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); break; } case 999: { @@ -30614,22 +31420,40 @@ case 2: break; } - if (message.target != null && message.hasOwnProperty("target")) - switch (message.target) { - default: - return "target: enum value expected"; - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - break; + if (message.targets != null && message.hasOwnProperty("targets")) { + if (!Array.isArray(message.targets)) + return "targets: array expected"; + for (var i = 0; i < message.targets.length; ++i) + switch (message.targets[i]) { + default: + return "targets: enum value[] expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + break; + } + } + if (message.editionDefaults != null && message.hasOwnProperty("editionDefaults")) { + if (!Array.isArray(message.editionDefaults)) + return "editionDefaults: array expected"; + for (var i = 0; i < message.editionDefaults.length; ++i) { + var error = $root.google.protobuf.FieldOptions.EditionDefault.verify(message.editionDefaults[i]); + if (error) + return "editionDefaults." + error; } + } + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -30749,53 +31573,73 @@ message.retention = 2; break; } - switch (object.target) { - default: - if (typeof object.target === "number") { - message.target = object.target; - break; + if (object.targets) { + if (!Array.isArray(object.targets)) + throw TypeError(".google.protobuf.FieldOptions.targets: array expected"); + message.targets = []; + for (var i = 0; i < object.targets.length; ++i) + switch (object.targets[i]) { + default: + if (typeof object.targets[i] === "number") { + message.targets[i] = object.targets[i]; + break; + } + case "TARGET_TYPE_UNKNOWN": + case 0: + message.targets[i] = 0; + break; + case "TARGET_TYPE_FILE": + case 1: + message.targets[i] = 1; + break; + case "TARGET_TYPE_EXTENSION_RANGE": + case 2: + message.targets[i] = 2; + break; + case "TARGET_TYPE_MESSAGE": + case 3: + message.targets[i] = 3; + break; + case "TARGET_TYPE_FIELD": + case 4: + message.targets[i] = 4; + break; + case "TARGET_TYPE_ONEOF": + case 5: + message.targets[i] = 5; + break; + case "TARGET_TYPE_ENUM": + case 6: + message.targets[i] = 6; + break; + case "TARGET_TYPE_ENUM_ENTRY": + case 7: + message.targets[i] = 7; + break; + case "TARGET_TYPE_SERVICE": + case 8: + message.targets[i] = 8; + break; + case "TARGET_TYPE_METHOD": + case 9: + message.targets[i] = 9; + break; + } + } + if (object.editionDefaults) { + if (!Array.isArray(object.editionDefaults)) + throw TypeError(".google.protobuf.FieldOptions.editionDefaults: array expected"); + message.editionDefaults = []; + for (var i = 0; i < object.editionDefaults.length; ++i) { + if (typeof object.editionDefaults[i] !== "object") + throw TypeError(".google.protobuf.FieldOptions.editionDefaults: object expected"); + message.editionDefaults[i] = $root.google.protobuf.FieldOptions.EditionDefault.fromObject(object.editionDefaults[i]); } - break; - case "TARGET_TYPE_UNKNOWN": - case 0: - message.target = 0; - break; - case "TARGET_TYPE_FILE": - case 1: - message.target = 1; - break; - case "TARGET_TYPE_EXTENSION_RANGE": - case 2: - message.target = 2; - break; - case "TARGET_TYPE_MESSAGE": - case 3: - message.target = 3; - break; - case "TARGET_TYPE_FIELD": - case 4: - message.target = 4; - break; - case "TARGET_TYPE_ONEOF": - case 5: - message.target = 5; - break; - case "TARGET_TYPE_ENUM": - case 6: - message.target = 6; - break; - case "TARGET_TYPE_ENUM_ENTRY": - case 7: - message.target = 7; - break; - case "TARGET_TYPE_SERVICE": - case 8: - message.target = 8; - break; - case "TARGET_TYPE_METHOD": - case 9: - message.target = 9; - break; + } + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.FieldOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) @@ -30874,6 +31718,8 @@ options = {}; var object = {}; if (options.arrays || options.defaults) { + object.targets = []; + object.editionDefaults = []; object.uninterpretedOption = []; object[".google.api.fieldBehavior"] = []; } @@ -30887,7 +31733,7 @@ object.unverifiedLazy = false; object.debugRedact = false; object.retention = options.enums === String ? "RETENTION_UNKNOWN" : 0; - object.target = options.enums === String ? "TARGET_TYPE_UNKNOWN" : 0; + object.features = null; object[".google.api.resourceReference"] = null; } if (message.ctype != null && message.hasOwnProperty("ctype")) @@ -30908,8 +31754,18 @@ object.debugRedact = message.debugRedact; if (message.retention != null && message.hasOwnProperty("retention")) object.retention = options.enums === String ? $root.google.protobuf.FieldOptions.OptionRetention[message.retention] === undefined ? message.retention : $root.google.protobuf.FieldOptions.OptionRetention[message.retention] : message.retention; - if (message.target != null && message.hasOwnProperty("target")) - object.target = options.enums === String ? $root.google.protobuf.FieldOptions.OptionTargetType[message.target] === undefined ? message.target : $root.google.protobuf.FieldOptions.OptionTargetType[message.target] : message.target; + if (message.targets && message.targets.length) { + object.targets = []; + for (var j = 0; j < message.targets.length; ++j) + object.targets[j] = options.enums === String ? $root.google.protobuf.FieldOptions.OptionTargetType[message.targets[j]] === undefined ? message.targets[j] : $root.google.protobuf.FieldOptions.OptionTargetType[message.targets[j]] : message.targets[j]; + } + if (message.editionDefaults && message.editionDefaults.length) { + object.editionDefaults = []; + for (var j = 0; j < message.editionDefaults.length; ++j) + object.editionDefaults[j] = $root.google.protobuf.FieldOptions.EditionDefault.toObject(message.editionDefaults[j], options); + } + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -31029,6 +31885,233 @@ return values; })(); + FieldOptions.EditionDefault = (function() { + + /** + * Properties of an EditionDefault. + * @memberof google.protobuf.FieldOptions + * @interface IEditionDefault + * @property {string|null} [edition] EditionDefault edition + * @property {string|null} [value] EditionDefault value + */ + + /** + * Constructs a new EditionDefault. + * @memberof google.protobuf.FieldOptions + * @classdesc Represents an EditionDefault. + * @implements IEditionDefault + * @constructor + * @param {google.protobuf.FieldOptions.IEditionDefault=} [properties] Properties to set + */ + function EditionDefault(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * EditionDefault edition. + * @member {string} edition + * @memberof google.protobuf.FieldOptions.EditionDefault + * @instance + */ + EditionDefault.prototype.edition = ""; + + /** + * EditionDefault value. + * @member {string} value + * @memberof google.protobuf.FieldOptions.EditionDefault + * @instance + */ + EditionDefault.prototype.value = ""; + + /** + * Creates a new EditionDefault instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {google.protobuf.FieldOptions.IEditionDefault=} [properties] Properties to set + * @returns {google.protobuf.FieldOptions.EditionDefault} EditionDefault instance + */ + EditionDefault.create = function create(properties) { + return new EditionDefault(properties); + }; + + /** + * Encodes the specified EditionDefault message. Does not implicitly {@link google.protobuf.FieldOptions.EditionDefault.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {google.protobuf.FieldOptions.IEditionDefault} message EditionDefault message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EditionDefault.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.edition != null && Object.hasOwnProperty.call(message, "edition")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.edition); + if (message.value != null && Object.hasOwnProperty.call(message, "value")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.value); + return writer; + }; + + /** + * Encodes the specified EditionDefault message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.EditionDefault.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {google.protobuf.FieldOptions.IEditionDefault} message EditionDefault message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + EditionDefault.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an EditionDefault message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldOptions.EditionDefault} EditionDefault + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EditionDefault.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions.EditionDefault(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.edition = reader.string(); + break; + } + case 2: { + message.value = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an EditionDefault message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldOptions.EditionDefault} EditionDefault + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + EditionDefault.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an EditionDefault message. + * @function verify + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + EditionDefault.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.edition != null && message.hasOwnProperty("edition")) + if (!$util.isString(message.edition)) + return "edition: string expected"; + if (message.value != null && message.hasOwnProperty("value")) + if (!$util.isString(message.value)) + return "value: string expected"; + return null; + }; + + /** + * Creates an EditionDefault message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldOptions.EditionDefault} EditionDefault + */ + EditionDefault.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldOptions.EditionDefault) + return object; + var message = new $root.google.protobuf.FieldOptions.EditionDefault(); + if (object.edition != null) + message.edition = String(object.edition); + if (object.value != null) + message.value = String(object.value); + return message; + }; + + /** + * Creates a plain object from an EditionDefault message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {google.protobuf.FieldOptions.EditionDefault} message EditionDefault + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EditionDefault.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.edition = ""; + object.value = ""; + } + if (message.edition != null && message.hasOwnProperty("edition")) + object.edition = message.edition; + if (message.value != null && message.hasOwnProperty("value")) + object.value = message.value; + return object; + }; + + /** + * Converts this EditionDefault to JSON. + * @function toJSON + * @memberof google.protobuf.FieldOptions.EditionDefault + * @instance + * @returns {Object.} JSON object + */ + EditionDefault.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for EditionDefault + * @function getTypeUrl + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + EditionDefault.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FieldOptions.EditionDefault"; + }; + + return EditionDefault; + })(); + return FieldOptions; })(); @@ -31038,6 +32121,7 @@ * Properties of an OneofOptions. * @memberof google.protobuf * @interface IOneofOptions + * @property {google.protobuf.IFeatureSet|null} [features] OneofOptions features * @property {Array.|null} [uninterpretedOption] OneofOptions uninterpretedOption */ @@ -31057,6 +32141,14 @@ this[keys[i]] = properties[keys[i]]; } + /** + * OneofOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.OneofOptions + * @instance + */ + OneofOptions.prototype.features = null; + /** * OneofOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -31089,6 +32181,8 @@ OneofOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -31126,6 +32220,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { + case 1: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -31167,6 +32265,11 @@ OneofOptions.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -31191,6 +32294,11 @@ if (object instanceof $root.google.protobuf.OneofOptions) return object; var message = new $root.google.protobuf.OneofOptions(); + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.OneofOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.OneofOptions.uninterpretedOption: array expected"); @@ -31219,6 +32327,10 @@ var object = {}; if (options.arrays || options.defaults) object.uninterpretedOption = []; + if (options.defaults) + object.features = null; + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -31265,6 +32377,7 @@ * @property {boolean|null} [allowAlias] EnumOptions allowAlias * @property {boolean|null} [deprecated] EnumOptions deprecated * @property {boolean|null} [deprecatedLegacyJsonFieldConflicts] EnumOptions deprecatedLegacyJsonFieldConflicts + * @property {google.protobuf.IFeatureSet|null} [features] EnumOptions features * @property {Array.|null} [uninterpretedOption] EnumOptions uninterpretedOption */ @@ -31308,6 +32421,14 @@ */ EnumOptions.prototype.deprecatedLegacyJsonFieldConflicts = false; + /** + * EnumOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.EnumOptions + * @instance + */ + EnumOptions.prototype.features = null; + /** * EnumOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -31346,6 +32467,8 @@ writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); if (message.deprecatedLegacyJsonFieldConflicts != null && Object.hasOwnProperty.call(message, "deprecatedLegacyJsonFieldConflicts")) writer.uint32(/* id 6, wireType 0 =*/48).bool(message.deprecatedLegacyJsonFieldConflicts); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -31395,6 +32518,10 @@ message.deprecatedLegacyJsonFieldConflicts = reader.bool(); break; } + case 7: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -31445,6 +32572,11 @@ if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) if (typeof message.deprecatedLegacyJsonFieldConflicts !== "boolean") return "deprecatedLegacyJsonFieldConflicts: boolean expected"; + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -31475,6 +32607,11 @@ message.deprecated = Boolean(object.deprecated); if (object.deprecatedLegacyJsonFieldConflicts != null) message.deprecatedLegacyJsonFieldConflicts = Boolean(object.deprecatedLegacyJsonFieldConflicts); + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.EnumOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.EnumOptions.uninterpretedOption: array expected"); @@ -31507,6 +32644,7 @@ object.allowAlias = false; object.deprecated = false; object.deprecatedLegacyJsonFieldConflicts = false; + object.features = null; } if (message.allowAlias != null && message.hasOwnProperty("allowAlias")) object.allowAlias = message.allowAlias; @@ -31514,6 +32652,8 @@ object.deprecated = message.deprecated; if (message.deprecatedLegacyJsonFieldConflicts != null && message.hasOwnProperty("deprecatedLegacyJsonFieldConflicts")) object.deprecatedLegacyJsonFieldConflicts = message.deprecatedLegacyJsonFieldConflicts; + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -31558,6 +32698,8 @@ * @memberof google.protobuf * @interface IEnumValueOptions * @property {boolean|null} [deprecated] EnumValueOptions deprecated + * @property {google.protobuf.IFeatureSet|null} [features] EnumValueOptions features + * @property {boolean|null} [debugRedact] EnumValueOptions debugRedact * @property {Array.|null} [uninterpretedOption] EnumValueOptions uninterpretedOption */ @@ -31585,6 +32727,22 @@ */ EnumValueOptions.prototype.deprecated = false; + /** + * EnumValueOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.features = null; + + /** + * EnumValueOptions debugRedact. + * @member {boolean} debugRedact + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.debugRedact = false; + /** * EnumValueOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -31619,6 +32777,10 @@ writer = $Writer.create(); if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 1, wireType 0 =*/8).bool(message.deprecated); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.debugRedact != null && Object.hasOwnProperty.call(message, "debugRedact")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.debugRedact); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -31660,6 +32822,14 @@ message.deprecated = reader.bool(); break; } + case 2: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } + case 3: { + message.debugRedact = reader.bool(); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -31704,6 +32874,14 @@ if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } + if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) + if (typeof message.debugRedact !== "boolean") + return "debugRedact: boolean expected"; if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -31730,6 +32908,13 @@ var message = new $root.google.protobuf.EnumValueOptions(); if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.EnumValueOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } + if (object.debugRedact != null) + message.debugRedact = Boolean(object.debugRedact); if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: array expected"); @@ -31758,10 +32943,17 @@ var object = {}; if (options.arrays || options.defaults) object.uninterpretedOption = []; - if (options.defaults) + if (options.defaults) { object.deprecated = false; + object.features = null; + object.debugRedact = false; + } if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); + if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) + object.debugRedact = message.debugRedact; if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -31805,6 +32997,7 @@ * Properties of a ServiceOptions. * @memberof google.protobuf * @interface IServiceOptions + * @property {google.protobuf.IFeatureSet|null} [features] ServiceOptions features * @property {boolean|null} [deprecated] ServiceOptions deprecated * @property {Array.|null} [uninterpretedOption] ServiceOptions uninterpretedOption * @property {string|null} [".google.api.defaultHost"] ServiceOptions .google.api.defaultHost @@ -31827,6 +33020,14 @@ this[keys[i]] = properties[keys[i]]; } + /** + * ServiceOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype.features = null; + /** * ServiceOptions deprecated. * @member {boolean} deprecated @@ -31885,6 +33086,8 @@ writer = $Writer.create(); if (message.deprecated != null && Object.hasOwnProperty.call(message, "deprecated")) writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 34, wireType 2 =*/274).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -31926,6 +33129,10 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { + case 34: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } case 33: { message.deprecated = reader.bool(); break; @@ -31979,6 +33186,11 @@ ServiceOptions.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; @@ -32012,6 +33224,11 @@ if (object instanceof $root.google.protobuf.ServiceOptions) return object; var message = new $root.google.protobuf.ServiceOptions(); + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.ServiceOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); if (object.uninterpretedOption) { @@ -32048,11 +33265,14 @@ object.uninterpretedOption = []; if (options.defaults) { object.deprecated = false; + object.features = null; object[".google.api.defaultHost"] = ""; object[".google.api.oauthScopes"] = ""; } if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -32102,6 +33322,7 @@ * @interface IMethodOptions * @property {boolean|null} [deprecated] MethodOptions deprecated * @property {google.protobuf.MethodOptions.IdempotencyLevel|null} [idempotencyLevel] MethodOptions idempotencyLevel + * @property {google.protobuf.IFeatureSet|null} [features] MethodOptions features * @property {Array.|null} [uninterpretedOption] MethodOptions uninterpretedOption * @property {google.api.IHttpRule|null} [".google.api.http"] MethodOptions .google.api.http * @property {Array.|null} [".google.api.methodSignature"] MethodOptions .google.api.methodSignature @@ -32140,6 +33361,14 @@ */ MethodOptions.prototype.idempotencyLevel = 0; + /** + * MethodOptions features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.MethodOptions + * @instance + */ + MethodOptions.prototype.features = null; + /** * MethodOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -32192,6 +33421,8 @@ writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); if (message.idempotencyLevel != null && Object.hasOwnProperty.call(message, "idempotencyLevel")) writer.uint32(/* id 34, wireType 0 =*/272).int32(message.idempotencyLevel); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 35, wireType 2 =*/282).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -32242,6 +33473,10 @@ message.idempotencyLevel = reader.int32(); break; } + case 35: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -32305,6 +33540,11 @@ case 2: break; } + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -32363,6 +33603,11 @@ message.idempotencyLevel = 2; break; } + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.MethodOptions.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.MethodOptions.uninterpretedOption: array expected"); @@ -32408,12 +33653,15 @@ if (options.defaults) { object.deprecated = false; object.idempotencyLevel = options.enums === String ? "IDEMPOTENCY_UNKNOWN" : 0; + object.features = null; object[".google.api.http"] = null; } if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; if (message.idempotencyLevel != null && message.hasOwnProperty("idempotencyLevel")) object.idempotencyLevel = options.enums === String ? $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] === undefined ? message.idempotencyLevel : $root.google.protobuf.MethodOptions.IdempotencyLevel[message.idempotencyLevel] : message.idempotencyLevel; + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -33102,6 +34350,607 @@ return UninterpretedOption; })(); + protobuf.FeatureSet = (function() { + + /** + * Properties of a FeatureSet. + * @memberof google.protobuf + * @interface IFeatureSet + * @property {google.protobuf.FeatureSet.FieldPresence|null} [fieldPresence] FeatureSet fieldPresence + * @property {google.protobuf.FeatureSet.EnumType|null} [enumType] FeatureSet enumType + * @property {google.protobuf.FeatureSet.RepeatedFieldEncoding|null} [repeatedFieldEncoding] FeatureSet repeatedFieldEncoding + * @property {google.protobuf.FeatureSet.StringFieldValidation|null} [stringFieldValidation] FeatureSet stringFieldValidation + * @property {google.protobuf.FeatureSet.MessageEncoding|null} [messageEncoding] FeatureSet messageEncoding + * @property {google.protobuf.FeatureSet.JsonFormat|null} [jsonFormat] FeatureSet jsonFormat + * @property {google.protobuf.IFeatureSet|null} [rawFeatures] FeatureSet rawFeatures + */ + + /** + * Constructs a new FeatureSet. + * @memberof google.protobuf + * @classdesc Represents a FeatureSet. + * @implements IFeatureSet + * @constructor + * @param {google.protobuf.IFeatureSet=} [properties] Properties to set + */ + function FeatureSet(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FeatureSet fieldPresence. + * @member {google.protobuf.FeatureSet.FieldPresence} fieldPresence + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.fieldPresence = 0; + + /** + * FeatureSet enumType. + * @member {google.protobuf.FeatureSet.EnumType} enumType + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.enumType = 0; + + /** + * FeatureSet repeatedFieldEncoding. + * @member {google.protobuf.FeatureSet.RepeatedFieldEncoding} repeatedFieldEncoding + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.repeatedFieldEncoding = 0; + + /** + * FeatureSet stringFieldValidation. + * @member {google.protobuf.FeatureSet.StringFieldValidation} stringFieldValidation + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.stringFieldValidation = 0; + + /** + * FeatureSet messageEncoding. + * @member {google.protobuf.FeatureSet.MessageEncoding} messageEncoding + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.messageEncoding = 0; + + /** + * FeatureSet jsonFormat. + * @member {google.protobuf.FeatureSet.JsonFormat} jsonFormat + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.jsonFormat = 0; + + /** + * FeatureSet rawFeatures. + * @member {google.protobuf.IFeatureSet|null|undefined} rawFeatures + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.rawFeatures = null; + + /** + * Creates a new FeatureSet instance using the specified properties. + * @function create + * @memberof google.protobuf.FeatureSet + * @static + * @param {google.protobuf.IFeatureSet=} [properties] Properties to set + * @returns {google.protobuf.FeatureSet} FeatureSet instance + */ + FeatureSet.create = function create(properties) { + return new FeatureSet(properties); + }; + + /** + * Encodes the specified FeatureSet message. Does not implicitly {@link google.protobuf.FeatureSet.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FeatureSet + * @static + * @param {google.protobuf.IFeatureSet} message FeatureSet message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FeatureSet.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.fieldPresence != null && Object.hasOwnProperty.call(message, "fieldPresence")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.fieldPresence); + if (message.enumType != null && Object.hasOwnProperty.call(message, "enumType")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.enumType); + if (message.repeatedFieldEncoding != null && Object.hasOwnProperty.call(message, "repeatedFieldEncoding")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.repeatedFieldEncoding); + if (message.stringFieldValidation != null && Object.hasOwnProperty.call(message, "stringFieldValidation")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.stringFieldValidation); + if (message.messageEncoding != null && Object.hasOwnProperty.call(message, "messageEncoding")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.messageEncoding); + if (message.jsonFormat != null && Object.hasOwnProperty.call(message, "jsonFormat")) + writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jsonFormat); + if (message.rawFeatures != null && Object.hasOwnProperty.call(message, "rawFeatures")) + $root.google.protobuf.FeatureSet.encode(message.rawFeatures, writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified FeatureSet message, length delimited. Does not implicitly {@link google.protobuf.FeatureSet.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FeatureSet + * @static + * @param {google.protobuf.IFeatureSet} message FeatureSet message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FeatureSet.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FeatureSet message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FeatureSet + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FeatureSet} FeatureSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FeatureSet.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FeatureSet(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.fieldPresence = reader.int32(); + break; + } + case 2: { + message.enumType = reader.int32(); + break; + } + case 3: { + message.repeatedFieldEncoding = reader.int32(); + break; + } + case 4: { + message.stringFieldValidation = reader.int32(); + break; + } + case 5: { + message.messageEncoding = reader.int32(); + break; + } + case 6: { + message.jsonFormat = reader.int32(); + break; + } + case 999: { + message.rawFeatures = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FeatureSet message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FeatureSet + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FeatureSet} FeatureSet + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FeatureSet.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FeatureSet message. + * @function verify + * @memberof google.protobuf.FeatureSet + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FeatureSet.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.fieldPresence != null && message.hasOwnProperty("fieldPresence")) + switch (message.fieldPresence) { + default: + return "fieldPresence: enum value expected"; + case 0: + case 1: + case 2: + case 3: + break; + } + if (message.enumType != null && message.hasOwnProperty("enumType")) + switch (message.enumType) { + default: + return "enumType: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.repeatedFieldEncoding != null && message.hasOwnProperty("repeatedFieldEncoding")) + switch (message.repeatedFieldEncoding) { + default: + return "repeatedFieldEncoding: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.stringFieldValidation != null && message.hasOwnProperty("stringFieldValidation")) + switch (message.stringFieldValidation) { + default: + return "stringFieldValidation: enum value expected"; + case 0: + case 1: + case 2: + case 3: + break; + } + if (message.messageEncoding != null && message.hasOwnProperty("messageEncoding")) + switch (message.messageEncoding) { + default: + return "messageEncoding: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.jsonFormat != null && message.hasOwnProperty("jsonFormat")) + switch (message.jsonFormat) { + default: + return "jsonFormat: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.rawFeatures != null && message.hasOwnProperty("rawFeatures")) { + var error = $root.google.protobuf.FeatureSet.verify(message.rawFeatures); + if (error) + return "rawFeatures." + error; + } + return null; + }; + + /** + * Creates a FeatureSet message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FeatureSet + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FeatureSet} FeatureSet + */ + FeatureSet.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FeatureSet) + return object; + var message = new $root.google.protobuf.FeatureSet(); + switch (object.fieldPresence) { + default: + if (typeof object.fieldPresence === "number") { + message.fieldPresence = object.fieldPresence; + break; + } + break; + case "FIELD_PRESENCE_UNKNOWN": + case 0: + message.fieldPresence = 0; + break; + case "EXPLICIT": + case 1: + message.fieldPresence = 1; + break; + case "IMPLICIT": + case 2: + message.fieldPresence = 2; + break; + case "LEGACY_REQUIRED": + case 3: + message.fieldPresence = 3; + break; + } + switch (object.enumType) { + default: + if (typeof object.enumType === "number") { + message.enumType = object.enumType; + break; + } + break; + case "ENUM_TYPE_UNKNOWN": + case 0: + message.enumType = 0; + break; + case "OPEN": + case 1: + message.enumType = 1; + break; + case "CLOSED": + case 2: + message.enumType = 2; + break; + } + switch (object.repeatedFieldEncoding) { + default: + if (typeof object.repeatedFieldEncoding === "number") { + message.repeatedFieldEncoding = object.repeatedFieldEncoding; + break; + } + break; + case "REPEATED_FIELD_ENCODING_UNKNOWN": + case 0: + message.repeatedFieldEncoding = 0; + break; + case "PACKED": + case 1: + message.repeatedFieldEncoding = 1; + break; + case "EXPANDED": + case 2: + message.repeatedFieldEncoding = 2; + break; + } + switch (object.stringFieldValidation) { + default: + if (typeof object.stringFieldValidation === "number") { + message.stringFieldValidation = object.stringFieldValidation; + break; + } + break; + case "STRING_FIELD_VALIDATION_UNKNOWN": + case 0: + message.stringFieldValidation = 0; + break; + case "MANDATORY": + case 1: + message.stringFieldValidation = 1; + break; + case "HINT": + case 2: + message.stringFieldValidation = 2; + break; + case "NONE": + case 3: + message.stringFieldValidation = 3; + break; + } + switch (object.messageEncoding) { + default: + if (typeof object.messageEncoding === "number") { + message.messageEncoding = object.messageEncoding; + break; + } + break; + case "MESSAGE_ENCODING_UNKNOWN": + case 0: + message.messageEncoding = 0; + break; + case "LENGTH_PREFIXED": + case 1: + message.messageEncoding = 1; + break; + case "DELIMITED": + case 2: + message.messageEncoding = 2; + break; + } + switch (object.jsonFormat) { + default: + if (typeof object.jsonFormat === "number") { + message.jsonFormat = object.jsonFormat; + break; + } + break; + case "JSON_FORMAT_UNKNOWN": + case 0: + message.jsonFormat = 0; + break; + case "ALLOW": + case 1: + message.jsonFormat = 1; + break; + case "LEGACY_BEST_EFFORT": + case 2: + message.jsonFormat = 2; + break; + } + if (object.rawFeatures != null) { + if (typeof object.rawFeatures !== "object") + throw TypeError(".google.protobuf.FeatureSet.rawFeatures: object expected"); + message.rawFeatures = $root.google.protobuf.FeatureSet.fromObject(object.rawFeatures); + } + return message; + }; + + /** + * Creates a plain object from a FeatureSet message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FeatureSet + * @static + * @param {google.protobuf.FeatureSet} message FeatureSet + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FeatureSet.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.fieldPresence = options.enums === String ? "FIELD_PRESENCE_UNKNOWN" : 0; + object.enumType = options.enums === String ? "ENUM_TYPE_UNKNOWN" : 0; + object.repeatedFieldEncoding = options.enums === String ? "REPEATED_FIELD_ENCODING_UNKNOWN" : 0; + object.stringFieldValidation = options.enums === String ? "STRING_FIELD_VALIDATION_UNKNOWN" : 0; + object.messageEncoding = options.enums === String ? "MESSAGE_ENCODING_UNKNOWN" : 0; + object.jsonFormat = options.enums === String ? "JSON_FORMAT_UNKNOWN" : 0; + object.rawFeatures = null; + } + if (message.fieldPresence != null && message.hasOwnProperty("fieldPresence")) + object.fieldPresence = options.enums === String ? $root.google.protobuf.FeatureSet.FieldPresence[message.fieldPresence] === undefined ? message.fieldPresence : $root.google.protobuf.FeatureSet.FieldPresence[message.fieldPresence] : message.fieldPresence; + if (message.enumType != null && message.hasOwnProperty("enumType")) + object.enumType = options.enums === String ? $root.google.protobuf.FeatureSet.EnumType[message.enumType] === undefined ? message.enumType : $root.google.protobuf.FeatureSet.EnumType[message.enumType] : message.enumType; + if (message.repeatedFieldEncoding != null && message.hasOwnProperty("repeatedFieldEncoding")) + object.repeatedFieldEncoding = options.enums === String ? $root.google.protobuf.FeatureSet.RepeatedFieldEncoding[message.repeatedFieldEncoding] === undefined ? message.repeatedFieldEncoding : $root.google.protobuf.FeatureSet.RepeatedFieldEncoding[message.repeatedFieldEncoding] : message.repeatedFieldEncoding; + if (message.stringFieldValidation != null && message.hasOwnProperty("stringFieldValidation")) + object.stringFieldValidation = options.enums === String ? $root.google.protobuf.FeatureSet.StringFieldValidation[message.stringFieldValidation] === undefined ? message.stringFieldValidation : $root.google.protobuf.FeatureSet.StringFieldValidation[message.stringFieldValidation] : message.stringFieldValidation; + if (message.messageEncoding != null && message.hasOwnProperty("messageEncoding")) + object.messageEncoding = options.enums === String ? $root.google.protobuf.FeatureSet.MessageEncoding[message.messageEncoding] === undefined ? message.messageEncoding : $root.google.protobuf.FeatureSet.MessageEncoding[message.messageEncoding] : message.messageEncoding; + if (message.jsonFormat != null && message.hasOwnProperty("jsonFormat")) + object.jsonFormat = options.enums === String ? $root.google.protobuf.FeatureSet.JsonFormat[message.jsonFormat] === undefined ? message.jsonFormat : $root.google.protobuf.FeatureSet.JsonFormat[message.jsonFormat] : message.jsonFormat; + if (message.rawFeatures != null && message.hasOwnProperty("rawFeatures")) + object.rawFeatures = $root.google.protobuf.FeatureSet.toObject(message.rawFeatures, options); + return object; + }; + + /** + * Converts this FeatureSet to JSON. + * @function toJSON + * @memberof google.protobuf.FeatureSet + * @instance + * @returns {Object.} JSON object + */ + FeatureSet.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for FeatureSet + * @function getTypeUrl + * @memberof google.protobuf.FeatureSet + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FeatureSet.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FeatureSet"; + }; + + /** + * FieldPresence enum. + * @name google.protobuf.FeatureSet.FieldPresence + * @enum {number} + * @property {number} FIELD_PRESENCE_UNKNOWN=0 FIELD_PRESENCE_UNKNOWN value + * @property {number} EXPLICIT=1 EXPLICIT value + * @property {number} IMPLICIT=2 IMPLICIT value + * @property {number} LEGACY_REQUIRED=3 LEGACY_REQUIRED value + */ + FeatureSet.FieldPresence = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "FIELD_PRESENCE_UNKNOWN"] = 0; + values[valuesById[1] = "EXPLICIT"] = 1; + values[valuesById[2] = "IMPLICIT"] = 2; + values[valuesById[3] = "LEGACY_REQUIRED"] = 3; + return values; + })(); + + /** + * EnumType enum. + * @name google.protobuf.FeatureSet.EnumType + * @enum {number} + * @property {number} ENUM_TYPE_UNKNOWN=0 ENUM_TYPE_UNKNOWN value + * @property {number} OPEN=1 OPEN value + * @property {number} CLOSED=2 CLOSED value + */ + FeatureSet.EnumType = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "ENUM_TYPE_UNKNOWN"] = 0; + values[valuesById[1] = "OPEN"] = 1; + values[valuesById[2] = "CLOSED"] = 2; + return values; + })(); + + /** + * RepeatedFieldEncoding enum. + * @name google.protobuf.FeatureSet.RepeatedFieldEncoding + * @enum {number} + * @property {number} REPEATED_FIELD_ENCODING_UNKNOWN=0 REPEATED_FIELD_ENCODING_UNKNOWN value + * @property {number} PACKED=1 PACKED value + * @property {number} EXPANDED=2 EXPANDED value + */ + FeatureSet.RepeatedFieldEncoding = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "REPEATED_FIELD_ENCODING_UNKNOWN"] = 0; + values[valuesById[1] = "PACKED"] = 1; + values[valuesById[2] = "EXPANDED"] = 2; + return values; + })(); + + /** + * StringFieldValidation enum. + * @name google.protobuf.FeatureSet.StringFieldValidation + * @enum {number} + * @property {number} STRING_FIELD_VALIDATION_UNKNOWN=0 STRING_FIELD_VALIDATION_UNKNOWN value + * @property {number} MANDATORY=1 MANDATORY value + * @property {number} HINT=2 HINT value + * @property {number} NONE=3 NONE value + */ + FeatureSet.StringFieldValidation = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STRING_FIELD_VALIDATION_UNKNOWN"] = 0; + values[valuesById[1] = "MANDATORY"] = 1; + values[valuesById[2] = "HINT"] = 2; + values[valuesById[3] = "NONE"] = 3; + return values; + })(); + + /** + * MessageEncoding enum. + * @name google.protobuf.FeatureSet.MessageEncoding + * @enum {number} + * @property {number} MESSAGE_ENCODING_UNKNOWN=0 MESSAGE_ENCODING_UNKNOWN value + * @property {number} LENGTH_PREFIXED=1 LENGTH_PREFIXED value + * @property {number} DELIMITED=2 DELIMITED value + */ + FeatureSet.MessageEncoding = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "MESSAGE_ENCODING_UNKNOWN"] = 0; + values[valuesById[1] = "LENGTH_PREFIXED"] = 1; + values[valuesById[2] = "DELIMITED"] = 2; + return values; + })(); + + /** + * JsonFormat enum. + * @name google.protobuf.FeatureSet.JsonFormat + * @enum {number} + * @property {number} JSON_FORMAT_UNKNOWN=0 JSON_FORMAT_UNKNOWN value + * @property {number} ALLOW=1 ALLOW value + * @property {number} LEGACY_BEST_EFFORT=2 LEGACY_BEST_EFFORT value + */ + FeatureSet.JsonFormat = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "JSON_FORMAT_UNKNOWN"] = 0; + values[valuesById[1] = "ALLOW"] = 1; + values[valuesById[2] = "LEGACY_BEST_EFFORT"] = 2; + return values; + })(); + + return FeatureSet; + })(); + protobuf.SourceCodeInfo = (function() { /** diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index d92936908ba..3204fdc7718 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2283,6 +2283,10 @@ "rule": "repeated", "type": "ClientLibrarySettings", "id": 109 + }, + "protoReferenceDocumentationUri": { + "type": "string", + "id": 110 } } }, @@ -2340,6 +2344,31 @@ "common": { "type": "CommonLanguageSettings", "id": 1 + }, + "renamedServices": { + "keyType": "string", + "type": "string", + "id": 2 + }, + "renamedResources": { + "keyType": "string", + "type": "string", + "id": 3 + }, + "ignoredResources": { + "rule": "repeated", + "type": "string", + "id": 4 + }, + "forcedNamespaceAliases": { + "rule": "repeated", + "type": "string", + "id": 5 + }, + "handwrittenSignatures": { + "rule": "repeated", + "type": "string", + "id": 6 } } }, @@ -2399,7 +2428,10 @@ "CLOUD": 1, "ADS": 2, "PHOTOS": 3, - "STREET_VIEW": 4 + "STREET_VIEW": 4, + "SHOPPING": 5, + "GEO": 6, + "GENERATIVE_AI": 7 } }, "ClientLibraryDestination": { @@ -2695,6 +2727,25 @@ "rule": "repeated", "type": "UninterpretedOption", "id": 999 + }, + "declaration": { + "rule": "repeated", + "type": "Declaration", + "id": 2, + "options": { + "retention": "RETENTION_SOURCE" + } + }, + "features": { + "type": "FeatureSet", + "id": 50 + }, + "verification": { + "type": "VerificationState", + "id": 3, + "options": { + "default": "UNVERIFIED" + } } }, "extensions": [ @@ -2702,7 +2753,45 @@ 1000, 536870911 ] - ] + ], + "nested": { + "Declaration": { + "fields": { + "number": { + "type": "int32", + "id": 1 + }, + "fullName": { + "type": "string", + "id": 2 + }, + "type": { + "type": "string", + "id": 3 + }, + "reserved": { + "type": "bool", + "id": 5 + }, + "repeated": { + "type": "bool", + "id": 6 + } + }, + "reserved": [ + [ + 4, + 4 + ] + ] + }, + "VerificationState": { + "values": { + "DECLARATION": 0, + "UNVERIFIED": 1 + } + } + } }, "FieldDescriptorProto": { "fields": { @@ -3015,6 +3104,10 @@ "type": "string", "id": 45 }, + "features": { + "type": "FeatureSet", + "id": 50 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -3077,6 +3170,10 @@ "deprecated": true } }, + "features": { + "type": "FeatureSet", + "id": 12 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -3171,9 +3268,22 @@ "type": "OptionRetention", "id": 17 }, - "target": { + "targets": { + "rule": "repeated", "type": "OptionTargetType", - "id": 18 + "id": 19, + "options": { + "packed": false + } + }, + "editionDefaults": { + "rule": "repeated", + "type": "EditionDefault", + "id": 20 + }, + "features": { + "type": "FeatureSet", + "id": 21 }, "uninterpretedOption": { "rule": "repeated", @@ -3191,6 +3301,10 @@ [ 4, 4 + ], + [ + 18, + 18 ] ], "nested": { @@ -3228,11 +3342,27 @@ "TARGET_TYPE_SERVICE": 8, "TARGET_TYPE_METHOD": 9 } + }, + "EditionDefault": { + "fields": { + "edition": { + "type": "string", + "id": 1 + }, + "value": { + "type": "string", + "id": 2 + } + } } } }, "OneofOptions": { "fields": { + "features": { + "type": "FeatureSet", + "id": 1 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -3266,6 +3396,10 @@ "deprecated": true } }, + "features": { + "type": "FeatureSet", + "id": 7 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -3294,6 +3428,17 @@ "default": false } }, + "features": { + "type": "FeatureSet", + "id": 2 + }, + "debugRedact": { + "type": "bool", + "id": 3, + "options": { + "default": false + } + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -3309,6 +3454,10 @@ }, "ServiceOptions": { "fields": { + "features": { + "type": "FeatureSet", + "id": 34 + }, "deprecated": { "type": "bool", "id": 33, @@ -3345,6 +3494,10 @@ "default": "IDEMPOTENCY_UNKNOWN" } }, + "features": { + "type": "FeatureSet", + "id": 35 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -3416,6 +3569,137 @@ } } }, + "FeatureSet": { + "fields": { + "fieldPresence": { + "type": "FieldPresence", + "id": 1, + "options": { + "retention": "RETENTION_RUNTIME", + "targets": "TARGET_TYPE_FILE", + "edition_defaults.edition": "2023", + "edition_defaults.value": "EXPLICIT" + } + }, + "enumType": { + "type": "EnumType", + "id": 2, + "options": { + "retention": "RETENTION_RUNTIME", + "targets": "TARGET_TYPE_FILE", + "edition_defaults.edition": "2023", + "edition_defaults.value": "OPEN" + } + }, + "repeatedFieldEncoding": { + "type": "RepeatedFieldEncoding", + "id": 3, + "options": { + "retention": "RETENTION_RUNTIME", + "targets": "TARGET_TYPE_FILE", + "edition_defaults.edition": "2023", + "edition_defaults.value": "PACKED" + } + }, + "stringFieldValidation": { + "type": "StringFieldValidation", + "id": 4, + "options": { + "retention": "RETENTION_RUNTIME", + "targets": "TARGET_TYPE_FILE", + "edition_defaults.edition": "2023", + "edition_defaults.value": "MANDATORY" + } + }, + "messageEncoding": { + "type": "MessageEncoding", + "id": 5, + "options": { + "retention": "RETENTION_RUNTIME", + "targets": "TARGET_TYPE_FILE", + "edition_defaults.edition": "2023", + "edition_defaults.value": "LENGTH_PREFIXED" + } + }, + "jsonFormat": { + "type": "JsonFormat", + "id": 6, + "options": { + "retention": "RETENTION_RUNTIME", + "targets": "TARGET_TYPE_FILE", + "edition_defaults.edition": "2023", + "edition_defaults.value": "ALLOW" + } + }, + "rawFeatures": { + "type": "FeatureSet", + "id": 999, + "options": { + "targets": "TARGET_TYPE_UNKNOWN" + } + } + }, + "extensions": [ + [ + 1000, + 1000 + ], + [ + 1001, + 1001 + ], + [ + 9995, + 9999 + ] + ], + "nested": { + "FieldPresence": { + "values": { + "FIELD_PRESENCE_UNKNOWN": 0, + "EXPLICIT": 1, + "IMPLICIT": 2, + "LEGACY_REQUIRED": 3 + } + }, + "EnumType": { + "values": { + "ENUM_TYPE_UNKNOWN": 0, + "OPEN": 1, + "CLOSED": 2 + } + }, + "RepeatedFieldEncoding": { + "values": { + "REPEATED_FIELD_ENCODING_UNKNOWN": 0, + "PACKED": 1, + "EXPANDED": 2 + } + }, + "StringFieldValidation": { + "values": { + "STRING_FIELD_VALIDATION_UNKNOWN": 0, + "MANDATORY": 1, + "HINT": 2, + "NONE": 3 + } + }, + "MessageEncoding": { + "values": { + "MESSAGE_ENCODING_UNKNOWN": 0, + "LENGTH_PREFIXED": 1, + "DELIMITED": 2 + } + }, + "JsonFormat": { + "values": { + "JSON_FORMAT_UNKNOWN": 0, + "ALLOW": 1, + "LEGACY_BEST_EFFORT": 2 + } + } + } + }, "SourceCodeInfo": { "fields": { "location": { From aa5fcec9aafea389d6cb6cd30de67a2186810714 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 17:14:02 -0400 Subject: [PATCH 0974/1115] chore(nodejs): Add `system-test/fixtures` to `.eslintignore` (#1840) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(nodejs): Add `system-test/fixtures` to `.eslintignore` * fix: Add `system-test/fixtures` to `.eslintignore` * refactor: Use `**` Source-Link: https://github.com/googleapis/synthtool/commit/b7858ba70e8acabc89d13558a71dd9318a57034a Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:abc68a9bbf4fa808b25fa16d3b11141059dc757dbc34f024744bba36c200b40f * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.eslintignore | 1 + handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index ea5b04aebe6..c4a0963e9bd 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -5,3 +5,4 @@ build/ docs/ protos/ samples/generated/ +system-test/**/fixtures diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 807a8916118..40b49d2bf81 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:8b6a07a38d1583d96b6e251ba208bd4ef0bc2a0cc37471ffc518841651d15bd6 -# created: 2023-09-25T22:18:27.595486267Z + digest: sha256:abc68a9bbf4fa808b25fa16d3b11141059dc757dbc34f024744bba36c200b40f +# created: 2023-10-04T20:56:40.710775365Z From bc142a3a68dd98a47cd34ff0a784e6415b5c3f5b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:00:18 -0400 Subject: [PATCH 0975/1115] docs: modified some descriptions (#1842) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: modified some descriptions PiperOrigin-RevId: 573936401 Source-Link: https://github.com/googleapis/googleapis/commit/c1f013491bc8dce60e93ca355ea494ee2e522dd8 Source-Link: https://github.com/googleapis/googleapis-gen/commit/a063e1be04179c7386317bb395dea10eb38229b2 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTA2M2UxYmUwNDE3OWM3Mzg2MzE3YmIzOTVkZWExMGViMzgyMjliMiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 27 ++++++++++--------- handwritten/pubsub/src/v1/publisher_client.ts | 2 +- .../pubsub/src/v1/subscriber_client.ts | 14 +++++----- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 4468de17831..700324dc755 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -44,7 +44,7 @@ service Publisher { "https://www.googleapis.com/auth/pubsub"; // Creates the given topic with the given name. See the [resource name rules] - // (https://cloud.google.com/pubsub/docs/admin#resource_names). + // (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). rpc CreateTopic(Topic) returns (Topic) { option (google.api.http) = { put: "/v1/{name=projects/*/topics/*}" @@ -137,11 +137,12 @@ service Publisher { // A policy constraining the storage of messages published to the topic. message MessageStoragePolicy { - // A list of IDs of GCP regions where messages that are published to the topic - // may be persisted in storage. Messages published by publishers running in - // non-allowed GCP regions (or running outside of GCP altogether) will be - // routed for storage in one of the allowed regions. An empty list means that - // no regions are allowed, and is not a valid configuration. + // A list of IDs of Google Cloud regions where messages that are published + // to the topic may be persisted in storage. Messages published by publishers + // running in non-allowed Google Cloud regions (or running outside of Google + // Cloud altogether) are routed for storage in one of the allowed regions. + // An empty list means that no regions are allowed, and is not a valid + // configuration. repeated string allowed_persistence_regions = 1; } @@ -430,16 +431,16 @@ service Subscriber { "https://www.googleapis.com/auth/pubsub"; // Creates a subscription to a given topic. See the [resource name rules] - // (https://cloud.google.com/pubsub/docs/admin#resource_names). + // (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). // If the subscription already exists, returns `ALREADY_EXISTS`. // If the corresponding topic doesn't exist, returns `NOT_FOUND`. // // If the name is not provided in the request, the server will assign a random // name for this subscription on the same project as the topic, conforming // to the [resource name format] - // (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated - // name is populated in the returned Subscription object. Note that for REST - // API requests, you must specify a name in the request. + // (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The + // generated name is populated in the returned Subscription object. Note that + // for REST API requests, you must specify a name in the request. rpc CreateSubscription(Subscription) returns (Subscription) { option (google.api.http) = { put: "/v1/{name=projects/*/subscriptions/*}" @@ -592,7 +593,7 @@ service Subscriber { // the request, the server will assign a random // name for this snapshot on the same project as the subscription, conforming // to the [resource name format] - // (https://cloud.google.com/pubsub/docs/admin#resource_names). The + // (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The // generated name is populated in the returned Snapshot object. Note that for // REST API requests, you must specify a name in the request. rpc CreateSnapshot(CreateSnapshotRequest) returns (Snapshot) { @@ -1429,8 +1430,8 @@ message CreateSnapshotRequest { // in the request, the server will assign a random name for this snapshot on // the same project as the subscription. Note that for REST API requests, you // must specify a name. See the [resource name - // rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format - // is `projects/{project}/snapshots/{snap}`. + // rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). + // Format is `projects/{project}/snapshots/{snap}`. string name = 1 [ (google.api.field_behavior) = REQUIRED, (google.api.resource_reference) = { type: "pubsub.googleapis.com/Snapshot" } diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 7183a2a9419..7eb92ba0cde 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -386,7 +386,7 @@ export class PublisherClient { // ------------------- /** * Creates the given topic with the given name. See the [resource name rules] - * (https://cloud.google.com/pubsub/docs/admin#resource_names). + * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). * * @param {Object} request * The request object that will be sent. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 661c31e19da..a92a9c95158 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -394,16 +394,16 @@ export class SubscriberClient { // ------------------- /** * Creates a subscription to a given topic. See the [resource name rules] - * (https://cloud.google.com/pubsub/docs/admin#resource_names). + * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). * If the subscription already exists, returns `ALREADY_EXISTS`. * If the corresponding topic doesn't exist, returns `NOT_FOUND`. * * If the name is not provided in the request, the server will assign a random * name for this subscription on the same project as the topic, conforming * to the [resource name format] - * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated - * name is populated in the returned Subscription object. Note that for REST - * API requests, you must specify a name in the request. + * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The + * generated name is populated in the returned Subscription object. Note that + * for REST API requests, you must specify a name in the request. * * @param {Object} request * The request object that will be sent. @@ -1324,7 +1324,7 @@ export class SubscriberClient { * the request, the server will assign a random * name for this snapshot on the same project as the subscription, conforming * to the [resource name format] - * (https://cloud.google.com/pubsub/docs/admin#resource_names). The + * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The * generated name is populated in the returned Snapshot object. Note that for * REST API requests, you must specify a name in the request. * @@ -1335,8 +1335,8 @@ export class SubscriberClient { * in the request, the server will assign a random name for this snapshot on * the same project as the subscription. Note that for REST API requests, you * must specify a name. See the [resource name - * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format - * is `projects/{project}/snapshots/{snap}`. + * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). + * Format is `projects/{project}/snapshots/{snap}`. * @param {string} request.subscription * Required. The subscription whose backlog the snapshot retains. * Specifically, the created snapshot is guaranteed to retain: From 873e13117e3f998156dab1e517652ceb38dbf547 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 23 Oct 2023 21:21:47 +0200 Subject: [PATCH 0976/1115] chore(deps): update dependency sinon to v17 (#1844) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 64fb3b5a103..355c2b63f5f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -93,7 +93,7 @@ "null-loader": "^4.0.0", "protobufjs": "^7.0.0", "proxyquire": "^2.0.0", - "sinon": "^16.0.0", + "sinon": "^17.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", "typescript": "^5.1.6", From abcbe0d8f59969db0f2d43b754093479bb524d68 Mon Sep 17 00:00:00 2001 From: Kamal Aboul-Hosn Date: Fri, 3 Nov 2023 13:30:31 -0400 Subject: [PATCH 0977/1115] fix: set x-goog-request-params for streaming pull request (#1849) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * samples: create BigQuery subscription * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: set x-goog-request-params for streaming pull request --------- Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/message-stream.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 7ea275ee519..80b71449685 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -323,8 +323,13 @@ export class MessageStream extends PassThrough { ? 0 : this._subscriber.maxBytes, }; + const otherArgs = { + headers: { + 'x-goog-request-params': 'subscription=' + this._subscriber.name, + }, + }; - const stream: PullStream = client.streamingPull({deadline}); + const stream: PullStream = client.streamingPull({deadline, otherArgs}); this._replaceStream(index, stream); stream.write(request); } From 517e8bacbf769f46eb253acc07da96cc57b60246 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 3 Nov 2023 18:46:16 +0100 Subject: [PATCH 0978/1115] chore(deps): update dependency @types/node to v20 (#1846) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@types/node](https://togithub.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node) ([source](https://togithub.com/DefinitelyTyped/DefinitelyTyped)) | [`^18.0.0` -> `^20.0.0`](https://renovatebot.com/diffs/npm/@types%2fnode/18.18.6/20.8.8) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@types%2fnode/20.8.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@types%2fnode/20.8.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@types%2fnode/18.18.6/20.8.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@types%2fnode/18.18.6/20.8.8?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/system-test/fixtures/sample/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 355c2b63f5f..cf47ab22a06 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -73,7 +73,7 @@ "@types/mocha": "^9.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", - "@types/node": "^18.0.0", + "@types/node": "^20.0.0", "@types/proxyquire": "^1.3.28", "@types/sinon": "^10.0.0", "@types/tmp": "^0.2.0", diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index f32bff37dee..f4596200d9b 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -16,7 +16,7 @@ "@google-cloud/pubsub": "file:./pubsub.tgz" }, "devDependencies": { - "@types/node": "^18.0.0", + "@types/node": "^20.0.0", "typescript": "^4.6.4", "gts": "^3.1.0" } From e7d6df56dfe7fc089aa3e108a5691cf428c03fb3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 7 Nov 2023 15:18:14 +0100 Subject: [PATCH 0979/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.18.0 (#1852) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@opentelemetry/semantic-conventions](https://togithub.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions) ([source](https://togithub.com/open-telemetry/opentelemetry-js)) | [`~1.17.0` -> `~1.18.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2fsemantic-conventions/1.17.1/1.18.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@opentelemetry%2fsemantic-conventions/1.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@opentelemetry%2fsemantic-conventions/1.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@opentelemetry%2fsemantic-conventions/1.17.1/1.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@opentelemetry%2fsemantic-conventions/1.17.1/1.18.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-js (@​opentelemetry/semantic-conventions) ### [`v1.18.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1180) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.17.1...v1.18.0) ##### :rocket: (Enhancement) - feat(metrics): prototype experimental advice support [#​3876](https://togithub.com/open-telemetry/opentelemetry-js/pull/3876) [@​legendecas](https://togithub.com/legendecas) ##### :bug: (Bug Fix) - fix(core): remove re-export of `version.ts` [#​4225](https://togithub.com/open-telemetry/opentelemetry-js/pull/4225) [@​david-luna](https://togithub.com/david-luna) ##### :house: (Internal) - chore: track package-lock.json [#​4238](https://togithub.com/open-telemetry/opentelemetry-js/pull/4238) [@​legendecas](https://togithub.com/legendecas) - Switched to npm workspaces to bootstrap dependencies.
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cf47ab22a06..90f147540b3 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.6.0", - "@opentelemetry/semantic-conventions": "~1.17.0", + "@opentelemetry/semantic-conventions": "~1.18.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From f92e1ef952888f41378f6113d9b6e788d59dfa89 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 9 Nov 2023 23:18:24 +0100 Subject: [PATCH 0980/1115] chore(deps): update dependency @types/sinon to v17 (#1851) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 90f147540b3..e8e3ed42eea 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -75,7 +75,7 @@ "@types/ncp": "^2.0.1", "@types/node": "^20.0.0", "@types/proxyquire": "^1.3.28", - "@types/sinon": "^10.0.0", + "@types/sinon": "^17.0.0", "@types/tmp": "^0.2.0", "@types/uuid": "^9.0.0", "c8": "^8.0.0", From ac2c33370f28175b9283d442cb77ec3d71b80a42 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 22:34:15 +0000 Subject: [PATCH 0981/1115] chore(main): release 4.0.7 (#1850) :robot: I have created a release *beep* *boop* --- ## [4.0.7](https://togithub.com/googleapis/nodejs-pubsub/compare/v4.0.6...v4.0.7) (2023-11-09) ### Bug Fixes * **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.18.0 ([#1852](https://togithub.com/googleapis/nodejs-pubsub/issues/1852)) ([d9a0432](https://togithub.com/googleapis/nodejs-pubsub/commit/d9a0432a37c6d741c9694a5bcff047f4c85b2feb)) * Set x-goog-request-params for streaming pull request ([#1849](https://togithub.com/googleapis/nodejs-pubsub/issues/1849)) ([7b82ff0](https://togithub.com/googleapis/nodejs-pubsub/commit/7b82ff01e5c654b3e339dfdec5b3da8bf45da049)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index a5abdf64009..661d09439ca 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.0.7](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.6...v4.0.7) (2023-11-09) + + +### Bug Fixes + +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.18.0 ([#1852](https://github.com/googleapis/nodejs-pubsub/issues/1852)) ([d9a0432](https://github.com/googleapis/nodejs-pubsub/commit/d9a0432a37c6d741c9694a5bcff047f4c85b2feb)) +* Set x-goog-request-params for streaming pull request ([#1849](https://github.com/googleapis/nodejs-pubsub/issues/1849)) ([7b82ff0](https://github.com/googleapis/nodejs-pubsub/commit/7b82ff01e5c654b3e339dfdec5b3da8bf45da049)) + ## [4.0.6](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.5...v4.0.6) (2023-09-15) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e8e3ed42eea..21fea30cdd9 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.0.6", + "version": "4.0.7", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 717b4269b71fd85ea0d94d37ee69c949440f20c4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 17:25:27 -0500 Subject: [PATCH 0982/1115] chore: update cloud-rad version to ^0.4.0 (#1853) Source-Link: https://github.com/googleapis/synthtool/commit/1063ef32bfe41b112bade7a2dfad4e84d0058ebd Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:e92044720ab3cb6984a70b0c6001081204375959ba3599ef6c42dd99a7783a67 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/release/docs-devsite.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 40b49d2bf81..638efabfb52 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:abc68a9bbf4fa808b25fa16d3b11141059dc757dbc34f024744bba36c200b40f -# created: 2023-10-04T20:56:40.710775365Z + digest: sha256:e92044720ab3cb6984a70b0c6001081204375959ba3599ef6c42dd99a7783a67 +# created: 2023-11-10T00:24:05.581078808Z diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.sh b/handwritten/pubsub/.kokoro/release/docs-devsite.sh index 3596c1e4cb1..81a89f6c172 100755 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.sh +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.sh @@ -25,6 +25,6 @@ if [[ -z "$CREDENTIALS" ]]; then fi npm install -npm install --no-save @google-cloud/cloud-rad@^0.3.7 +npm install --no-save @google-cloud/cloud-rad@^0.4.0 # publish docs to devsite npx @google-cloud/cloud-rad . cloud-rad From c87d382e5636df3e7a427cbab54f531dc89834f3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:04:11 -0500 Subject: [PATCH 0983/1115] feat: add `use_table_schema` field to BigQueryConfig (#1858) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add `use_table_schema` field to BigQueryConfig PiperOrigin-RevId: 587079085 Source-Link: https://github.com/googleapis/googleapis/commit/95fabe6ae89c9206e89fd38a4d5c0f40c13bedfb Source-Link: https://github.com/googleapis/googleapis-gen/commit/90b35e9d8bc6780a80db3bababefc29072fa3506 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTBiMzVlOWQ4YmM2NzgwYTgwZGIzYmFiYWJlZmMyOTA3MmZhMzUwNiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 12 +++++++--- handwritten/pubsub/protos/protos.d.ts | 6 +++++ handwritten/pubsub/protos/protos.js | 23 +++++++++++++++++++ handwritten/pubsub/protos/protos.json | 12 +++++++++- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 700324dc755..393893b1033 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -997,9 +997,10 @@ message BigQueryConfig { // {projectId}.{datasetId}.{tableId} string table = 1; - // When true, use the topic's schema as the columns to write to in BigQuery, - // if it exists. - bool use_topic_schema = 2; + // Optional. When true, use the topic's schema as the columns to write to in + // BigQuery, if it exists. `use_topic_schema` and `use_table_schema` cannot be + // enabled at the same time. + bool use_topic_schema = 2 [(google.api.field_behavior) = OPTIONAL]; // When true, write the subscription name, message_id, publish_time, // attributes, and ordering_key to additional columns in the table. The @@ -1018,6 +1019,11 @@ message BigQueryConfig { // 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]; + + // Optional. When true, use the BigQuery table's schema as the columns to + // write to in BigQuery. `use_table_schema` and `use_topic_schema` cannot be + // enabled at the same time. + bool use_table_schema = 6 [(google.api.field_behavior) = OPTIONAL]; } // Configuration for a Cloud Storage subscription. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index e60c2c22a01..23b89207d97 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -3333,6 +3333,9 @@ export namespace google { /** BigQueryConfig state */ state?: (google.pubsub.v1.BigQueryConfig.State|keyof typeof google.pubsub.v1.BigQueryConfig.State|null); + + /** BigQueryConfig useTableSchema */ + useTableSchema?: (boolean|null); } /** Represents a BigQueryConfig. */ @@ -3359,6 +3362,9 @@ export namespace google { /** BigQueryConfig state. */ public state: (google.pubsub.v1.BigQueryConfig.State|keyof typeof google.pubsub.v1.BigQueryConfig.State); + /** BigQueryConfig useTableSchema. */ + public useTableSchema: boolean; + /** * Creates a new BigQueryConfig instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 81f10210c3f..edfceec8741 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -7567,6 +7567,7 @@ * @property {boolean|null} [writeMetadata] BigQueryConfig writeMetadata * @property {boolean|null} [dropUnknownFields] BigQueryConfig dropUnknownFields * @property {google.pubsub.v1.BigQueryConfig.State|null} [state] BigQueryConfig state + * @property {boolean|null} [useTableSchema] BigQueryConfig useTableSchema */ /** @@ -7624,6 +7625,14 @@ */ BigQueryConfig.prototype.state = 0; + /** + * BigQueryConfig useTableSchema. + * @member {boolean} useTableSchema + * @memberof google.pubsub.v1.BigQueryConfig + * @instance + */ + BigQueryConfig.prototype.useTableSchema = false; + /** * Creates a new BigQueryConfig instance using the specified properties. * @function create @@ -7658,6 +7667,8 @@ writer.uint32(/* id 4, wireType 0 =*/32).bool(message.dropUnknownFields); if (message.state != null && Object.hasOwnProperty.call(message, "state")) writer.uint32(/* id 5, wireType 0 =*/40).int32(message.state); + if (message.useTableSchema != null && Object.hasOwnProperty.call(message, "useTableSchema")) + writer.uint32(/* id 6, wireType 0 =*/48).bool(message.useTableSchema); return writer; }; @@ -7712,6 +7723,10 @@ message.state = reader.int32(); break; } + case 6: { + message.useTableSchema = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -7770,6 +7785,9 @@ case 4: break; } + if (message.useTableSchema != null && message.hasOwnProperty("useTableSchema")) + if (typeof message.useTableSchema !== "boolean") + return "useTableSchema: boolean expected"; return null; }; @@ -7821,6 +7839,8 @@ message.state = 4; break; } + if (object.useTableSchema != null) + message.useTableSchema = Boolean(object.useTableSchema); return message; }; @@ -7843,6 +7863,7 @@ object.writeMetadata = false; object.dropUnknownFields = false; object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.useTableSchema = false; } if (message.table != null && message.hasOwnProperty("table")) object.table = message.table; @@ -7854,6 +7875,8 @@ object.dropUnknownFields = message.dropUnknownFields; if (message.state != null && message.hasOwnProperty("state")) object.state = options.enums === String ? $root.google.pubsub.v1.BigQueryConfig.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.BigQueryConfig.State[message.state] : message.state; + if (message.useTableSchema != null && message.hasOwnProperty("useTableSchema")) + object.useTableSchema = message.useTableSchema; return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 3204fdc7718..f1332af798c 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -981,7 +981,10 @@ }, "useTopicSchema": { "type": "bool", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "writeMetadata": { "type": "bool", @@ -997,6 +1000,13 @@ "options": { "(google.api.field_behavior)": "OUTPUT_ONLY" } + }, + "useTableSchema": { + "type": "bool", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { From e59049b468e5d110e875ef80123fed5605a10c2c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:36:30 -0500 Subject: [PATCH 0984/1115] chore(main): release 4.1.0 (#1859) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 661d09439ca..b8a3217a99c 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.1.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.7...v4.1.0) (2023-12-04) + + +### Features + +* Add `use_table_schema` field to BigQueryConfig ([#1858](https://github.com/googleapis/nodejs-pubsub/issues/1858)) ([2875d83](https://github.com/googleapis/nodejs-pubsub/commit/2875d8383831563e5b748e96094faa94bf25fc15)) + ## [4.0.7](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.6...v4.0.7) (2023-11-09) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 21fea30cdd9..283524836f1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.0.7", + "version": "4.1.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 41280c84411fde0de597cc4fba604ec5b1c814e3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 15 Dec 2023 12:04:15 +0100 Subject: [PATCH 0985/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.19.0 (#1862) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@opentelemetry/semantic-conventions](https://togithub.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions) ([source](https://togithub.com/open-telemetry/opentelemetry-js)) | [`~1.18.0` -> `~1.19.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2fsemantic-conventions/1.18.1/1.19.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@opentelemetry%2fsemantic-conventions/1.19.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@opentelemetry%2fsemantic-conventions/1.19.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@opentelemetry%2fsemantic-conventions/1.18.1/1.19.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@opentelemetry%2fsemantic-conventions/1.18.1/1.19.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-js (@​opentelemetry/semantic-conventions) ### [`v1.19.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1190) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.18.1...v1.19.0) ##### :rocket: (Enhancement) - feat: add node 20 support [#​4336](https://togithub.com/open-telemetry/opentelemetry-js/pull/4336) [@​dyladan](https://togithub.com/dyladan) ##### :house: (Internal) - chore: type reference on zone.js [#​4257](https://togithub.com/open-telemetry/opentelemetry-js/pull/4257) [@​legendecas](https://togithub.com/legendecas) - chore: no need for 'packages' in lerna.json [#​4264](https://togithub.com/open-telemetry/opentelemetry-js/pull/4264) [@​trentm](https://togithub.com/trentm) - test: add node 20 to test matrix [#​4336](https://togithub.com/open-telemetry/opentelemetry-js/pull/4336) [@​dyladan](https://togithub.com/dyladan) ##### :bug: (Bug Fix) - fix(api-logs): allow for TimeInput type for LogRecord timestamps [#​4345](https://togithub.com/open-telemetry/opentelemetry-js/pull/4345) - fix(sdk-trace-web): only access location if it is defined [#​4063](https://togithub.com/open-telemetry/opentelemetry-js/pull/4063) - fix(sdk-trace-base): processor onStart called with a span having empty attributes
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 283524836f1..3c6b5999d15 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.6.0", - "@opentelemetry/semantic-conventions": "~1.18.0", + "@opentelemetry/semantic-conventions": "~1.19.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From 0d443234c329b0a988c49704b183c65117c30fdc Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:22:48 -0500 Subject: [PATCH 0986/1115] fix: correct long audio synthesis HTTP binding (#1867) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: correct long audio synthesis HTTP binding docs: Deprecate the custom voice usage field PiperOrigin-RevId: 595119987 Source-Link: https://github.com/googleapis/googleapis/commit/c22f4081fe394091ff2bb35b39b604ebb0e903cb Source-Link: https://github.com/googleapis/googleapis-gen/commit/4e9ca63d2cc7933eb7c383ce8b794fce152ea2fc Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGU5Y2E2M2QyY2M3OTMzZWI3YzM4M2NlOGI3OTRmY2UxNTJlYTJmYyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.jsdoc.js | 4 ++-- handwritten/pubsub/protos/protos.d.ts | 2 +- handwritten/pubsub/protos/protos.js | 2 +- handwritten/pubsub/src/v1/index.ts | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 2 +- handwritten/pubsub/src/v1/schema_service_client.ts | 2 +- handwritten/pubsub/src/v1/subscriber_client.ts | 2 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 2 +- handwritten/pubsub/test/gapic_schema_service_v1.ts | 2 +- handwritten/pubsub/test/gapic_subscriber_v1.ts | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index 6618d0cc4f7..0093b31424c 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 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 2023 Google LLC', + copyright: 'Copyright 2024 Google LLC', includeDate: false, sourceFiles: false, systemName: '@google-cloud/pubsub', diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 23b89207d97..ee6416f9d48 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index edfceec8741..496d846c048 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/index.ts b/handwritten/pubsub/src/v1/index.ts index 8bcd0670632..f12ac87b422 100644 --- a/handwritten/pubsub/src/v1/index.ts +++ b/handwritten/pubsub/src/v1/index.ts @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 7eb92ba0cde..33e4e85db7b 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index f8ccb60611b..f65bd434f41 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index a92a9c95158..bc0b4fdee20 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 8c868b8eb14..b88c443330e 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 3641e64c853..5c87dc5b747 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 71909289944..ea552b567eb 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 1a6114be0c22bc492feb0e2dc300f540bbbdb530 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 5 Jan 2024 17:13:32 +0100 Subject: [PATCH 0987/1115] chore(deps): update dependency c8 to v9 (#1868) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3c6b5999d15..400bf751d68 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -78,7 +78,7 @@ "@types/sinon": "^17.0.0", "@types/tmp": "^0.2.0", "@types/uuid": "^9.0.0", - "c8": "^8.0.0", + "c8": "^9.0.0", "codecov": "^3.0.0", "execa": "^5.0.0", "gapic-tools": "^0.2.0", From 21c9ea371d73521898cc52a996a8f4059e69757c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:51:12 -0500 Subject: [PATCH 0988/1115] chore(main): release 4.1.1 (#1863) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index b8a3217a99c..8a0a57759c8 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.1.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.1.0...v4.1.1) (2024-01-05) + + +### Bug Fixes + +* Correct long audio synthesis HTTP binding ([#1867](https://github.com/googleapis/nodejs-pubsub/issues/1867)) ([65940a4](https://github.com/googleapis/nodejs-pubsub/commit/65940a40fe8f2301690d26f769571a198f747dd3)) +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.19.0 ([#1862](https://github.com/googleapis/nodejs-pubsub/issues/1862)) ([92259f5](https://github.com/googleapis/nodejs-pubsub/commit/92259f5bffee05036f1746990b021299ea3ea4e7)) + ## [4.1.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.0.7...v4.1.0) (2023-12-04) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 400bf751d68..7284be1a911 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.1.0", + "version": "4.1.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 7b0ee1d98eb52297dbb5f1dc19fc44ef96e39dd5 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:19:01 -0500 Subject: [PATCH 0989/1115] samples: add sample for unwrapped push subscriptions (#1865) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * samples: add sample for push subscription with no wrapper * samples: update samples/createPushSubscriptionNoWrapper.js Co-authored-by: Alex Hong <9397363+hongalex@users.noreply.github.com> * samples: update samples/createPushSubscriptionNoWrapper.js Co-authored-by: Alex Hong <9397363+hongalex@users.noreply.github.com> * samples: update copyright createPushSubscriptionNoWrapper.js * samples: update copyright createPushSubscriptionNoWrapper.ts * samples: update region tag in ts as well * chore: remove commented code in subscriptions.test.ts * docs: update comments to be clearer * samples: update push subscription samples to take a URL parameter for extra clarity * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * tests: use a real URL for the actual testing --------- Co-authored-by: Alex Hong <9397363+hongalex@users.noreply.github.com> Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index ceefb38918f..6a2dfa06d49 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -127,6 +127,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Create BigQuery Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createBigQuerySubscription.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/createBigQuerySubscription.js,samples/README.md) | | Create a Proto based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createProtoSchema.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/createProtoSchema.js,samples/README.md) | | 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 Push Subscription With No Wrapper | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createPushSubscriptionNoWrapper.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/createPushSubscriptionNoWrapper.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) | From 7b68c70f8e0c9152235d437a29b60cc4d8577642 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 31 Jan 2024 19:44:51 +0100 Subject: [PATCH 0990/1115] chore(deps): update dependency gapic-tools to ^0.3.0 (#1872) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency gapic-tools to ^0.3.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/protos/protos.d.ts | 280 ++++++- handwritten/pubsub/protos/protos.js | 1083 ++++++++++++++++++++++--- handwritten/pubsub/protos/protos.json | 118 ++- 4 files changed, 1300 insertions(+), 183 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 7284be1a911..4ad24e80287 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -81,7 +81,7 @@ "c8": "^9.0.0", "codecov": "^3.0.0", "execa": "^5.0.0", - "gapic-tools": "^0.2.0", + "gapic-tools": "^0.3.0", "gts": "^5.0.0", "jsdoc": "^4.0.0", "jsdoc-fresh": "^3.0.0", diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index ee6416f9d48..eb65e4c60a3 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -9899,6 +9899,9 @@ export namespace google { /** MethodSettings longRunning */ longRunning?: (google.api.MethodSettings.ILongRunning|null); + + /** MethodSettings autoPopulatedFields */ + autoPopulatedFields?: (string[]|null); } /** Represents a MethodSettings. */ @@ -9916,6 +9919,9 @@ export namespace google { /** MethodSettings longRunning. */ public longRunning?: (google.api.MethodSettings.ILongRunning|null); + /** MethodSettings autoPopulatedFields. */ + public autoPopulatedFields: string[]; + /** * Creates a new MethodSettings instance using the specified properties. * @param [properties] Properties to set @@ -10152,7 +10158,8 @@ export namespace google { INPUT_ONLY = 4, IMMUTABLE = 5, UNORDERED_LIST = 6, - NON_EMPTY_DEFAULT = 7 + NON_EMPTY_DEFAULT = 7, + IDENTIFIER = 8 } /** Properties of a ResourceDescriptor. */ @@ -10508,6 +10515,21 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + /** Edition enum. */ + enum Edition { + EDITION_UNKNOWN = 0, + EDITION_PROTO2 = 998, + EDITION_PROTO3 = 999, + EDITION_2023 = 1000, + EDITION_2024 = 1001, + EDITION_1_TEST_ONLY = 1, + EDITION_2_TEST_ONLY = 2, + EDITION_99997_TEST_ONLY = 99997, + EDITION_99998_TEST_ONLY = 99998, + EDITION_99999_TEST_ONLY = 99999, + EDITION_MAX = 2147483647 + } + /** Properties of a FileDescriptorProto. */ interface IFileDescriptorProto { @@ -10548,7 +10570,7 @@ export namespace google { syntax?: (string|null); /** FileDescriptorProto edition */ - edition?: (string|null); + edition?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); } /** Represents a FileDescriptorProto. */ @@ -10597,7 +10619,7 @@ export namespace google { public syntax: string; /** FileDescriptorProto edition. */ - public edition: string; + public edition: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); /** * Creates a new FileDescriptorProto instance using the specified properties. @@ -11472,8 +11494,8 @@ export namespace google { /** Label enum. */ enum Label { LABEL_OPTIONAL = 1, - LABEL_REQUIRED = 2, - LABEL_REPEATED = 3 + LABEL_REPEATED = 3, + LABEL_REQUIRED = 2 } } @@ -12185,9 +12207,6 @@ export namespace google { /** FileOptions pyGenericServices */ pyGenericServices?: (boolean|null); - /** FileOptions phpGenericServices */ - phpGenericServices?: (boolean|null); - /** FileOptions deprecated */ deprecated?: (boolean|null); @@ -12264,9 +12283,6 @@ export namespace google { /** FileOptions pyGenericServices. */ public pyGenericServices: boolean; - /** FileOptions phpGenericServices. */ - public phpGenericServices: boolean; - /** FileOptions deprecated. */ public deprecated: boolean; @@ -12740,7 +12756,7 @@ export namespace google { interface IEditionDefault { /** EditionDefault edition */ - edition?: (string|null); + edition?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); /** EditionDefault value */ value?: (string|null); @@ -12756,7 +12772,7 @@ export namespace google { constructor(properties?: google.protobuf.FieldOptions.IEditionDefault); /** EditionDefault edition. */ - public edition: string; + public edition: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); /** EditionDefault value. */ public value: string; @@ -13676,17 +13692,14 @@ export namespace google { /** FeatureSet repeatedFieldEncoding */ repeatedFieldEncoding?: (google.protobuf.FeatureSet.RepeatedFieldEncoding|keyof typeof google.protobuf.FeatureSet.RepeatedFieldEncoding|null); - /** FeatureSet stringFieldValidation */ - stringFieldValidation?: (google.protobuf.FeatureSet.StringFieldValidation|keyof typeof google.protobuf.FeatureSet.StringFieldValidation|null); + /** FeatureSet utf8Validation */ + utf8Validation?: (google.protobuf.FeatureSet.Utf8Validation|keyof typeof google.protobuf.FeatureSet.Utf8Validation|null); /** FeatureSet messageEncoding */ messageEncoding?: (google.protobuf.FeatureSet.MessageEncoding|keyof typeof google.protobuf.FeatureSet.MessageEncoding|null); /** FeatureSet jsonFormat */ jsonFormat?: (google.protobuf.FeatureSet.JsonFormat|keyof typeof google.protobuf.FeatureSet.JsonFormat|null); - - /** FeatureSet rawFeatures */ - rawFeatures?: (google.protobuf.IFeatureSet|null); } /** Represents a FeatureSet. */ @@ -13707,8 +13720,8 @@ export namespace google { /** FeatureSet repeatedFieldEncoding. */ public repeatedFieldEncoding: (google.protobuf.FeatureSet.RepeatedFieldEncoding|keyof typeof google.protobuf.FeatureSet.RepeatedFieldEncoding); - /** FeatureSet stringFieldValidation. */ - public stringFieldValidation: (google.protobuf.FeatureSet.StringFieldValidation|keyof typeof google.protobuf.FeatureSet.StringFieldValidation); + /** FeatureSet utf8Validation. */ + public utf8Validation: (google.protobuf.FeatureSet.Utf8Validation|keyof typeof google.protobuf.FeatureSet.Utf8Validation); /** FeatureSet messageEncoding. */ public messageEncoding: (google.protobuf.FeatureSet.MessageEncoding|keyof typeof google.protobuf.FeatureSet.MessageEncoding); @@ -13716,9 +13729,6 @@ export namespace google { /** FeatureSet jsonFormat. */ public jsonFormat: (google.protobuf.FeatureSet.JsonFormat|keyof typeof google.protobuf.FeatureSet.JsonFormat); - /** FeatureSet rawFeatures. */ - public rawFeatures?: (google.protobuf.IFeatureSet|null); - /** * Creates a new FeatureSet instance using the specified properties. * @param [properties] Properties to set @@ -13821,11 +13831,10 @@ export namespace google { EXPANDED = 2 } - /** StringFieldValidation enum. */ - enum StringFieldValidation { - STRING_FIELD_VALIDATION_UNKNOWN = 0, - MANDATORY = 1, - HINT = 2, + /** Utf8Validation enum. */ + enum Utf8Validation { + UTF8_VALIDATION_UNKNOWN = 0, + VERIFY = 2, NONE = 3 } @@ -13844,6 +13853,221 @@ export namespace google { } } + /** Properties of a FeatureSetDefaults. */ + interface IFeatureSetDefaults { + + /** FeatureSetDefaults defaults */ + defaults?: (google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault[]|null); + + /** FeatureSetDefaults minimumEdition */ + minimumEdition?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); + + /** FeatureSetDefaults maximumEdition */ + maximumEdition?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); + } + + /** Represents a FeatureSetDefaults. */ + class FeatureSetDefaults implements IFeatureSetDefaults { + + /** + * Constructs a new FeatureSetDefaults. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.IFeatureSetDefaults); + + /** FeatureSetDefaults defaults. */ + public defaults: google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault[]; + + /** FeatureSetDefaults minimumEdition. */ + public minimumEdition: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); + + /** FeatureSetDefaults maximumEdition. */ + public maximumEdition: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); + + /** + * Creates a new FeatureSetDefaults instance using the specified properties. + * @param [properties] Properties to set + * @returns FeatureSetDefaults instance + */ + public static create(properties?: google.protobuf.IFeatureSetDefaults): google.protobuf.FeatureSetDefaults; + + /** + * Encodes the specified FeatureSetDefaults message. Does not implicitly {@link google.protobuf.FeatureSetDefaults.verify|verify} messages. + * @param message FeatureSetDefaults message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.IFeatureSetDefaults, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FeatureSetDefaults message, length delimited. Does not implicitly {@link google.protobuf.FeatureSetDefaults.verify|verify} messages. + * @param message FeatureSetDefaults message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.IFeatureSetDefaults, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FeatureSetDefaults message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FeatureSetDefaults + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FeatureSetDefaults; + + /** + * Decodes a FeatureSetDefaults message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FeatureSetDefaults + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FeatureSetDefaults; + + /** + * Verifies a FeatureSetDefaults message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FeatureSetDefaults message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FeatureSetDefaults + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FeatureSetDefaults; + + /** + * Creates a plain object from a FeatureSetDefaults message. Also converts values to other types if specified. + * @param message FeatureSetDefaults + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FeatureSetDefaults, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FeatureSetDefaults to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FeatureSetDefaults + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace FeatureSetDefaults { + + /** Properties of a FeatureSetEditionDefault. */ + interface IFeatureSetEditionDefault { + + /** FeatureSetEditionDefault edition */ + edition?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); + + /** FeatureSetEditionDefault features */ + features?: (google.protobuf.IFeatureSet|null); + } + + /** Represents a FeatureSetEditionDefault. */ + class FeatureSetEditionDefault implements IFeatureSetEditionDefault { + + /** + * Constructs a new FeatureSetEditionDefault. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault); + + /** FeatureSetEditionDefault edition. */ + public edition: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); + + /** FeatureSetEditionDefault features. */ + public features?: (google.protobuf.IFeatureSet|null); + + /** + * Creates a new FeatureSetEditionDefault instance using the specified properties. + * @param [properties] Properties to set + * @returns FeatureSetEditionDefault instance + */ + public static create(properties?: google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault): google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault; + + /** + * Encodes the specified FeatureSetEditionDefault message. Does not implicitly {@link google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.verify|verify} messages. + * @param message FeatureSetEditionDefault message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FeatureSetEditionDefault message, length delimited. Does not implicitly {@link google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.verify|verify} messages. + * @param message FeatureSetEditionDefault message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FeatureSetEditionDefault message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FeatureSetEditionDefault + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault; + + /** + * Decodes a FeatureSetEditionDefault message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FeatureSetEditionDefault + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault; + + /** + * Verifies a FeatureSetEditionDefault message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FeatureSetEditionDefault message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FeatureSetEditionDefault + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault; + + /** + * Creates a plain object from a FeatureSetEditionDefault message. Also converts values to other types if specified. + * @param message FeatureSetEditionDefault + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FeatureSetEditionDefault to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FeatureSetEditionDefault + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + } + /** Properties of a SourceCodeInfo. */ interface ISourceCodeInfo { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 496d846c048..b4d71be6638 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -23658,6 +23658,7 @@ * @interface IMethodSettings * @property {string|null} [selector] MethodSettings selector * @property {google.api.MethodSettings.ILongRunning|null} [longRunning] MethodSettings longRunning + * @property {Array.|null} [autoPopulatedFields] MethodSettings autoPopulatedFields */ /** @@ -23669,6 +23670,7 @@ * @param {google.api.IMethodSettings=} [properties] Properties to set */ function MethodSettings(properties) { + this.autoPopulatedFields = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -23691,6 +23693,14 @@ */ MethodSettings.prototype.longRunning = null; + /** + * MethodSettings autoPopulatedFields. + * @member {Array.} autoPopulatedFields + * @memberof google.api.MethodSettings + * @instance + */ + MethodSettings.prototype.autoPopulatedFields = $util.emptyArray; + /** * Creates a new MethodSettings instance using the specified properties. * @function create @@ -23719,6 +23729,9 @@ writer.uint32(/* id 1, wireType 2 =*/10).string(message.selector); if (message.longRunning != null && Object.hasOwnProperty.call(message, "longRunning")) $root.google.api.MethodSettings.LongRunning.encode(message.longRunning, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.autoPopulatedFields != null && message.autoPopulatedFields.length) + for (var i = 0; i < message.autoPopulatedFields.length; ++i) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.autoPopulatedFields[i]); return writer; }; @@ -23761,6 +23774,12 @@ message.longRunning = $root.google.api.MethodSettings.LongRunning.decode(reader, reader.uint32()); break; } + case 3: { + if (!(message.autoPopulatedFields && message.autoPopulatedFields.length)) + message.autoPopulatedFields = []; + message.autoPopulatedFields.push(reader.string()); + break; + } default: reader.skipType(tag & 7); break; @@ -23804,6 +23823,13 @@ if (error) return "longRunning." + error; } + if (message.autoPopulatedFields != null && message.hasOwnProperty("autoPopulatedFields")) { + if (!Array.isArray(message.autoPopulatedFields)) + return "autoPopulatedFields: array expected"; + for (var i = 0; i < message.autoPopulatedFields.length; ++i) + if (!$util.isString(message.autoPopulatedFields[i])) + return "autoPopulatedFields: string[] expected"; + } return null; }; @@ -23826,6 +23852,13 @@ throw TypeError(".google.api.MethodSettings.longRunning: object expected"); message.longRunning = $root.google.api.MethodSettings.LongRunning.fromObject(object.longRunning); } + if (object.autoPopulatedFields) { + if (!Array.isArray(object.autoPopulatedFields)) + throw TypeError(".google.api.MethodSettings.autoPopulatedFields: array expected"); + message.autoPopulatedFields = []; + for (var i = 0; i < object.autoPopulatedFields.length; ++i) + message.autoPopulatedFields[i] = String(object.autoPopulatedFields[i]); + } return message; }; @@ -23842,6 +23875,8 @@ if (!options) options = {}; var object = {}; + if (options.arrays || options.defaults) + object.autoPopulatedFields = []; if (options.defaults) { object.selector = ""; object.longRunning = null; @@ -23850,6 +23885,11 @@ object.selector = message.selector; if (message.longRunning != null && message.hasOwnProperty("longRunning")) object.longRunning = $root.google.api.MethodSettings.LongRunning.toObject(message.longRunning, options); + if (message.autoPopulatedFields && message.autoPopulatedFields.length) { + object.autoPopulatedFields = []; + for (var j = 0; j < message.autoPopulatedFields.length; ++j) + object.autoPopulatedFields[j] = message.autoPopulatedFields[j]; + } return object; }; @@ -24250,6 +24290,7 @@ * @property {number} IMMUTABLE=5 IMMUTABLE value * @property {number} UNORDERED_LIST=6 UNORDERED_LIST value * @property {number} NON_EMPTY_DEFAULT=7 NON_EMPTY_DEFAULT value + * @property {number} IDENTIFIER=8 IDENTIFIER value */ api.FieldBehavior = (function() { var valuesById = {}, values = Object.create(valuesById); @@ -24261,6 +24302,7 @@ values[valuesById[5] = "IMMUTABLE"] = 5; values[valuesById[6] = "UNORDERED_LIST"] = 6; values[valuesById[7] = "NON_EMPTY_DEFAULT"] = 7; + values[valuesById[8] = "IDENTIFIER"] = 8; return values; })(); @@ -25184,6 +25226,38 @@ return FileDescriptorSet; })(); + /** + * Edition enum. + * @name google.protobuf.Edition + * @enum {number} + * @property {number} EDITION_UNKNOWN=0 EDITION_UNKNOWN value + * @property {number} EDITION_PROTO2=998 EDITION_PROTO2 value + * @property {number} EDITION_PROTO3=999 EDITION_PROTO3 value + * @property {number} EDITION_2023=1000 EDITION_2023 value + * @property {number} EDITION_2024=1001 EDITION_2024 value + * @property {number} EDITION_1_TEST_ONLY=1 EDITION_1_TEST_ONLY value + * @property {number} EDITION_2_TEST_ONLY=2 EDITION_2_TEST_ONLY value + * @property {number} EDITION_99997_TEST_ONLY=99997 EDITION_99997_TEST_ONLY value + * @property {number} EDITION_99998_TEST_ONLY=99998 EDITION_99998_TEST_ONLY value + * @property {number} EDITION_99999_TEST_ONLY=99999 EDITION_99999_TEST_ONLY value + * @property {number} EDITION_MAX=2147483647 EDITION_MAX value + */ + protobuf.Edition = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "EDITION_UNKNOWN"] = 0; + values[valuesById[998] = "EDITION_PROTO2"] = 998; + values[valuesById[999] = "EDITION_PROTO3"] = 999; + values[valuesById[1000] = "EDITION_2023"] = 1000; + values[valuesById[1001] = "EDITION_2024"] = 1001; + values[valuesById[1] = "EDITION_1_TEST_ONLY"] = 1; + values[valuesById[2] = "EDITION_2_TEST_ONLY"] = 2; + values[valuesById[99997] = "EDITION_99997_TEST_ONLY"] = 99997; + values[valuesById[99998] = "EDITION_99998_TEST_ONLY"] = 99998; + values[valuesById[99999] = "EDITION_99999_TEST_ONLY"] = 99999; + values[valuesById[2147483647] = "EDITION_MAX"] = 2147483647; + return values; + })(); + protobuf.FileDescriptorProto = (function() { /** @@ -25202,7 +25276,7 @@ * @property {google.protobuf.IFileOptions|null} [options] FileDescriptorProto options * @property {google.protobuf.ISourceCodeInfo|null} [sourceCodeInfo] FileDescriptorProto sourceCodeInfo * @property {string|null} [syntax] FileDescriptorProto syntax - * @property {string|null} [edition] FileDescriptorProto edition + * @property {google.protobuf.Edition|null} [edition] FileDescriptorProto edition */ /** @@ -25325,11 +25399,11 @@ /** * FileDescriptorProto edition. - * @member {string} edition + * @member {google.protobuf.Edition} edition * @memberof google.protobuf.FileDescriptorProto * @instance */ - FileDescriptorProto.prototype.edition = ""; + FileDescriptorProto.prototype.edition = 0; /** * Creates a new FileDescriptorProto instance using the specified properties. @@ -25387,7 +25461,7 @@ if (message.syntax != null && Object.hasOwnProperty.call(message, "syntax")) writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); if (message.edition != null && Object.hasOwnProperty.call(message, "edition")) - writer.uint32(/* id 13, wireType 2 =*/106).string(message.edition); + writer.uint32(/* id 14, wireType 0 =*/112).int32(message.edition); return writer; }; @@ -25494,8 +25568,8 @@ message.syntax = reader.string(); break; } - case 13: { - message.edition = reader.string(); + case 14: { + message.edition = reader.int32(); break; } default: @@ -25610,8 +25684,22 @@ if (!$util.isString(message.syntax)) return "syntax: string expected"; if (message.edition != null && message.hasOwnProperty("edition")) - if (!$util.isString(message.edition)) - return "edition: string expected"; + switch (message.edition) { + default: + return "edition: enum value expected"; + case 0: + case 998: + case 999: + case 1000: + case 1001: + case 1: + case 2: + case 99997: + case 99998: + case 99999: + case 2147483647: + break; + } return null; }; @@ -25704,8 +25792,58 @@ } if (object.syntax != null) message.syntax = String(object.syntax); - if (object.edition != null) - message.edition = String(object.edition); + switch (object.edition) { + default: + if (typeof object.edition === "number") { + message.edition = object.edition; + break; + } + break; + case "EDITION_UNKNOWN": + case 0: + message.edition = 0; + break; + case "EDITION_PROTO2": + case 998: + message.edition = 998; + break; + case "EDITION_PROTO3": + case 999: + message.edition = 999; + break; + case "EDITION_2023": + case 1000: + message.edition = 1000; + break; + case "EDITION_2024": + case 1001: + message.edition = 1001; + break; + case "EDITION_1_TEST_ONLY": + case 1: + message.edition = 1; + break; + case "EDITION_2_TEST_ONLY": + case 2: + message.edition = 2; + break; + case "EDITION_99997_TEST_ONLY": + case 99997: + message.edition = 99997; + break; + case "EDITION_99998_TEST_ONLY": + case 99998: + message.edition = 99998; + break; + case "EDITION_99999_TEST_ONLY": + case 99999: + message.edition = 99999; + break; + case "EDITION_MAX": + case 2147483647: + message.edition = 2147483647; + break; + } return message; }; @@ -25737,7 +25875,7 @@ object.options = null; object.sourceCodeInfo = null; object.syntax = ""; - object.edition = ""; + object.edition = options.enums === String ? "EDITION_UNKNOWN" : 0; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -25785,7 +25923,7 @@ if (message.syntax != null && message.hasOwnProperty("syntax")) object.syntax = message.syntax; if (message.edition != null && message.hasOwnProperty("edition")) - object.edition = message.edition; + object.edition = options.enums === String ? $root.google.protobuf.Edition[message.edition] === undefined ? message.edition : $root.google.protobuf.Edition[message.edition] : message.edition; return object; }; @@ -27824,8 +27962,8 @@ default: return "label: enum value expected"; case 1: - case 2: case 3: + case 2: break; } if (message.type != null && message.hasOwnProperty("type")) @@ -27905,14 +28043,14 @@ case 1: message.label = 1; break; - case "LABEL_REQUIRED": - case 2: - message.label = 2; - break; case "LABEL_REPEATED": case 3: message.label = 3; break; + case "LABEL_REQUIRED": + case 2: + message.label = 2; + break; } switch (object.type) { default: @@ -28142,14 +28280,14 @@ * @name google.protobuf.FieldDescriptorProto.Label * @enum {number} * @property {number} LABEL_OPTIONAL=1 LABEL_OPTIONAL value - * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value * @property {number} LABEL_REPEATED=3 LABEL_REPEATED value + * @property {number} LABEL_REQUIRED=2 LABEL_REQUIRED value */ FieldDescriptorProto.Label = (function() { var valuesById = {}, values = Object.create(valuesById); values[valuesById[1] = "LABEL_OPTIONAL"] = 1; - values[valuesById[2] = "LABEL_REQUIRED"] = 2; values[valuesById[3] = "LABEL_REPEATED"] = 3; + values[valuesById[2] = "LABEL_REQUIRED"] = 2; return values; })(); @@ -29848,7 +29986,6 @@ * @property {boolean|null} [ccGenericServices] FileOptions ccGenericServices * @property {boolean|null} [javaGenericServices] FileOptions javaGenericServices * @property {boolean|null} [pyGenericServices] FileOptions pyGenericServices - * @property {boolean|null} [phpGenericServices] FileOptions phpGenericServices * @property {boolean|null} [deprecated] FileOptions deprecated * @property {boolean|null} [ccEnableArenas] FileOptions ccEnableArenas * @property {string|null} [objcClassPrefix] FileOptions objcClassPrefix @@ -29960,14 +30097,6 @@ */ FileOptions.prototype.pyGenericServices = false; - /** - * FileOptions phpGenericServices. - * @member {boolean} phpGenericServices - * @memberof google.protobuf.FileOptions - * @instance - */ - FileOptions.prototype.phpGenericServices = false; - /** * FileOptions deprecated. * @member {boolean} deprecated @@ -30122,8 +30251,6 @@ writer.uint32(/* id 40, wireType 2 =*/322).string(message.phpClassPrefix); if (message.phpNamespace != null && Object.hasOwnProperty.call(message, "phpNamespace")) writer.uint32(/* id 41, wireType 2 =*/330).string(message.phpNamespace); - if (message.phpGenericServices != null && Object.hasOwnProperty.call(message, "phpGenericServices")) - writer.uint32(/* id 42, wireType 0 =*/336).bool(message.phpGenericServices); if (message.phpMetadataNamespace != null && Object.hasOwnProperty.call(message, "phpMetadataNamespace")) writer.uint32(/* id 44, wireType 2 =*/354).string(message.phpMetadataNamespace); if (message.rubyPackage != null && Object.hasOwnProperty.call(message, "rubyPackage")) @@ -30210,10 +30337,6 @@ message.pyGenericServices = reader.bool(); break; } - case 42: { - message.phpGenericServices = reader.bool(); - break; - } case 23: { message.deprecated = reader.bool(); break; @@ -30337,9 +30460,6 @@ if (message.pyGenericServices != null && message.hasOwnProperty("pyGenericServices")) if (typeof message.pyGenericServices !== "boolean") return "pyGenericServices: boolean expected"; - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - if (typeof message.phpGenericServices !== "boolean") - return "phpGenericServices: boolean expected"; if (message.deprecated != null && message.hasOwnProperty("deprecated")) if (typeof message.deprecated !== "boolean") return "deprecated: boolean expected"; @@ -30443,8 +30563,6 @@ message.javaGenericServices = Boolean(object.javaGenericServices); if (object.pyGenericServices != null) message.pyGenericServices = Boolean(object.pyGenericServices); - if (object.phpGenericServices != null) - message.phpGenericServices = Boolean(object.phpGenericServices); if (object.deprecated != null) message.deprecated = Boolean(object.deprecated); if (object.ccEnableArenas != null) @@ -30526,7 +30644,6 @@ object.swiftPrefix = ""; object.phpClassPrefix = ""; object.phpNamespace = ""; - object.phpGenericServices = false; object.phpMetadataNamespace = ""; object.rubyPackage = ""; object.features = null; @@ -30565,8 +30682,6 @@ object.phpClassPrefix = message.phpClassPrefix; if (message.phpNamespace != null && message.hasOwnProperty("phpNamespace")) object.phpNamespace = message.phpNamespace; - if (message.phpGenericServices != null && message.hasOwnProperty("phpGenericServices")) - object.phpGenericServices = message.phpGenericServices; if (message.phpMetadataNamespace != null && message.hasOwnProperty("phpMetadataNamespace")) object.phpMetadataNamespace = message.phpMetadataNamespace; if (message.rubyPackage != null && message.hasOwnProperty("rubyPackage")) @@ -31501,6 +31616,7 @@ case 5: case 6: case 7: + case 8: break; } } @@ -31717,6 +31833,10 @@ case 7: message[".google.api.fieldBehavior"][i] = 7; break; + case "IDENTIFIER": + case 8: + message[".google.api.fieldBehavior"][i] = 8; + break; } } if (object[".google.api.resourceReference"] != null) { @@ -31914,7 +32034,7 @@ * Properties of an EditionDefault. * @memberof google.protobuf.FieldOptions * @interface IEditionDefault - * @property {string|null} [edition] EditionDefault edition + * @property {google.protobuf.Edition|null} [edition] EditionDefault edition * @property {string|null} [value] EditionDefault value */ @@ -31935,11 +32055,11 @@ /** * EditionDefault edition. - * @member {string} edition + * @member {google.protobuf.Edition} edition * @memberof google.protobuf.FieldOptions.EditionDefault * @instance */ - EditionDefault.prototype.edition = ""; + EditionDefault.prototype.edition = 0; /** * EditionDefault value. @@ -31973,10 +32093,10 @@ EditionDefault.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.edition != null && Object.hasOwnProperty.call(message, "edition")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.edition); if (message.value != null && Object.hasOwnProperty.call(message, "value")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.value); + if (message.edition != null && Object.hasOwnProperty.call(message, "edition")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.edition); return writer; }; @@ -32011,8 +32131,8 @@ while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { - case 1: { - message.edition = reader.string(); + case 3: { + message.edition = reader.int32(); break; } case 2: { @@ -32055,8 +32175,22 @@ if (typeof message !== "object" || message === null) return "object expected"; if (message.edition != null && message.hasOwnProperty("edition")) - if (!$util.isString(message.edition)) - return "edition: string expected"; + switch (message.edition) { + default: + return "edition: enum value expected"; + case 0: + case 998: + case 999: + case 1000: + case 1001: + case 1: + case 2: + case 99997: + case 99998: + case 99999: + case 2147483647: + break; + } if (message.value != null && message.hasOwnProperty("value")) if (!$util.isString(message.value)) return "value: string expected"; @@ -32075,8 +32209,58 @@ if (object instanceof $root.google.protobuf.FieldOptions.EditionDefault) return object; var message = new $root.google.protobuf.FieldOptions.EditionDefault(); - if (object.edition != null) - message.edition = String(object.edition); + switch (object.edition) { + default: + if (typeof object.edition === "number") { + message.edition = object.edition; + break; + } + break; + case "EDITION_UNKNOWN": + case 0: + message.edition = 0; + break; + case "EDITION_PROTO2": + case 998: + message.edition = 998; + break; + case "EDITION_PROTO3": + case 999: + message.edition = 999; + break; + case "EDITION_2023": + case 1000: + message.edition = 1000; + break; + case "EDITION_2024": + case 1001: + message.edition = 1001; + break; + case "EDITION_1_TEST_ONLY": + case 1: + message.edition = 1; + break; + case "EDITION_2_TEST_ONLY": + case 2: + message.edition = 2; + break; + case "EDITION_99997_TEST_ONLY": + case 99997: + message.edition = 99997; + break; + case "EDITION_99998_TEST_ONLY": + case 99998: + message.edition = 99998; + break; + case "EDITION_99999_TEST_ONLY": + case 99999: + message.edition = 99999; + break; + case "EDITION_MAX": + case 2147483647: + message.edition = 2147483647; + break; + } if (object.value != null) message.value = String(object.value); return message; @@ -32096,13 +32280,13 @@ options = {}; var object = {}; if (options.defaults) { - object.edition = ""; object.value = ""; + object.edition = options.enums === String ? "EDITION_UNKNOWN" : 0; } - if (message.edition != null && message.hasOwnProperty("edition")) - object.edition = message.edition; if (message.value != null && message.hasOwnProperty("value")) object.value = message.value; + if (message.edition != null && message.hasOwnProperty("edition")) + object.edition = options.enums === String ? $root.google.protobuf.Edition[message.edition] === undefined ? message.edition : $root.google.protobuf.Edition[message.edition] : message.edition; return object; }; @@ -34382,10 +34566,9 @@ * @property {google.protobuf.FeatureSet.FieldPresence|null} [fieldPresence] FeatureSet fieldPresence * @property {google.protobuf.FeatureSet.EnumType|null} [enumType] FeatureSet enumType * @property {google.protobuf.FeatureSet.RepeatedFieldEncoding|null} [repeatedFieldEncoding] FeatureSet repeatedFieldEncoding - * @property {google.protobuf.FeatureSet.StringFieldValidation|null} [stringFieldValidation] FeatureSet stringFieldValidation + * @property {google.protobuf.FeatureSet.Utf8Validation|null} [utf8Validation] FeatureSet utf8Validation * @property {google.protobuf.FeatureSet.MessageEncoding|null} [messageEncoding] FeatureSet messageEncoding * @property {google.protobuf.FeatureSet.JsonFormat|null} [jsonFormat] FeatureSet jsonFormat - * @property {google.protobuf.IFeatureSet|null} [rawFeatures] FeatureSet rawFeatures */ /** @@ -34428,12 +34611,12 @@ FeatureSet.prototype.repeatedFieldEncoding = 0; /** - * FeatureSet stringFieldValidation. - * @member {google.protobuf.FeatureSet.StringFieldValidation} stringFieldValidation + * FeatureSet utf8Validation. + * @member {google.protobuf.FeatureSet.Utf8Validation} utf8Validation * @memberof google.protobuf.FeatureSet * @instance */ - FeatureSet.prototype.stringFieldValidation = 0; + FeatureSet.prototype.utf8Validation = 0; /** * FeatureSet messageEncoding. @@ -34451,14 +34634,6 @@ */ FeatureSet.prototype.jsonFormat = 0; - /** - * FeatureSet rawFeatures. - * @member {google.protobuf.IFeatureSet|null|undefined} rawFeatures - * @memberof google.protobuf.FeatureSet - * @instance - */ - FeatureSet.prototype.rawFeatures = null; - /** * Creates a new FeatureSet instance using the specified properties. * @function create @@ -34489,14 +34664,12 @@ writer.uint32(/* id 2, wireType 0 =*/16).int32(message.enumType); if (message.repeatedFieldEncoding != null && Object.hasOwnProperty.call(message, "repeatedFieldEncoding")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.repeatedFieldEncoding); - if (message.stringFieldValidation != null && Object.hasOwnProperty.call(message, "stringFieldValidation")) - writer.uint32(/* id 4, wireType 0 =*/32).int32(message.stringFieldValidation); + if (message.utf8Validation != null && Object.hasOwnProperty.call(message, "utf8Validation")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.utf8Validation); if (message.messageEncoding != null && Object.hasOwnProperty.call(message, "messageEncoding")) writer.uint32(/* id 5, wireType 0 =*/40).int32(message.messageEncoding); if (message.jsonFormat != null && Object.hasOwnProperty.call(message, "jsonFormat")) writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jsonFormat); - if (message.rawFeatures != null && Object.hasOwnProperty.call(message, "rawFeatures")) - $root.google.protobuf.FeatureSet.encode(message.rawFeatures, writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); return writer; }; @@ -34544,7 +34717,7 @@ break; } case 4: { - message.stringFieldValidation = reader.int32(); + message.utf8Validation = reader.int32(); break; } case 5: { @@ -34555,10 +34728,6 @@ message.jsonFormat = reader.int32(); break; } - case 999: { - message.rawFeatures = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); - break; - } default: reader.skipType(tag & 7); break; @@ -34622,12 +34791,11 @@ case 2: break; } - if (message.stringFieldValidation != null && message.hasOwnProperty("stringFieldValidation")) - switch (message.stringFieldValidation) { + if (message.utf8Validation != null && message.hasOwnProperty("utf8Validation")) + switch (message.utf8Validation) { default: - return "stringFieldValidation: enum value expected"; + return "utf8Validation: enum value expected"; case 0: - case 1: case 2: case 3: break; @@ -34650,11 +34818,6 @@ case 2: break; } - if (message.rawFeatures != null && message.hasOwnProperty("rawFeatures")) { - var error = $root.google.protobuf.FeatureSet.verify(message.rawFeatures); - if (error) - return "rawFeatures." + error; - } return null; }; @@ -34734,28 +34897,24 @@ message.repeatedFieldEncoding = 2; break; } - switch (object.stringFieldValidation) { + switch (object.utf8Validation) { default: - if (typeof object.stringFieldValidation === "number") { - message.stringFieldValidation = object.stringFieldValidation; + if (typeof object.utf8Validation === "number") { + message.utf8Validation = object.utf8Validation; break; } break; - case "STRING_FIELD_VALIDATION_UNKNOWN": + case "UTF8_VALIDATION_UNKNOWN": case 0: - message.stringFieldValidation = 0; - break; - case "MANDATORY": - case 1: - message.stringFieldValidation = 1; + message.utf8Validation = 0; break; - case "HINT": + case "VERIFY": case 2: - message.stringFieldValidation = 2; + message.utf8Validation = 2; break; case "NONE": case 3: - message.stringFieldValidation = 3; + message.utf8Validation = 3; break; } switch (object.messageEncoding) { @@ -34798,11 +34957,6 @@ message.jsonFormat = 2; break; } - if (object.rawFeatures != null) { - if (typeof object.rawFeatures !== "object") - throw TypeError(".google.protobuf.FeatureSet.rawFeatures: object expected"); - message.rawFeatures = $root.google.protobuf.FeatureSet.fromObject(object.rawFeatures); - } return message; }; @@ -34823,10 +34977,9 @@ object.fieldPresence = options.enums === String ? "FIELD_PRESENCE_UNKNOWN" : 0; object.enumType = options.enums === String ? "ENUM_TYPE_UNKNOWN" : 0; object.repeatedFieldEncoding = options.enums === String ? "REPEATED_FIELD_ENCODING_UNKNOWN" : 0; - object.stringFieldValidation = options.enums === String ? "STRING_FIELD_VALIDATION_UNKNOWN" : 0; + object.utf8Validation = options.enums === String ? "UTF8_VALIDATION_UNKNOWN" : 0; object.messageEncoding = options.enums === String ? "MESSAGE_ENCODING_UNKNOWN" : 0; object.jsonFormat = options.enums === String ? "JSON_FORMAT_UNKNOWN" : 0; - object.rawFeatures = null; } if (message.fieldPresence != null && message.hasOwnProperty("fieldPresence")) object.fieldPresence = options.enums === String ? $root.google.protobuf.FeatureSet.FieldPresence[message.fieldPresence] === undefined ? message.fieldPresence : $root.google.protobuf.FeatureSet.FieldPresence[message.fieldPresence] : message.fieldPresence; @@ -34834,14 +34987,12 @@ object.enumType = options.enums === String ? $root.google.protobuf.FeatureSet.EnumType[message.enumType] === undefined ? message.enumType : $root.google.protobuf.FeatureSet.EnumType[message.enumType] : message.enumType; if (message.repeatedFieldEncoding != null && message.hasOwnProperty("repeatedFieldEncoding")) object.repeatedFieldEncoding = options.enums === String ? $root.google.protobuf.FeatureSet.RepeatedFieldEncoding[message.repeatedFieldEncoding] === undefined ? message.repeatedFieldEncoding : $root.google.protobuf.FeatureSet.RepeatedFieldEncoding[message.repeatedFieldEncoding] : message.repeatedFieldEncoding; - if (message.stringFieldValidation != null && message.hasOwnProperty("stringFieldValidation")) - object.stringFieldValidation = options.enums === String ? $root.google.protobuf.FeatureSet.StringFieldValidation[message.stringFieldValidation] === undefined ? message.stringFieldValidation : $root.google.protobuf.FeatureSet.StringFieldValidation[message.stringFieldValidation] : message.stringFieldValidation; + if (message.utf8Validation != null && message.hasOwnProperty("utf8Validation")) + object.utf8Validation = options.enums === String ? $root.google.protobuf.FeatureSet.Utf8Validation[message.utf8Validation] === undefined ? message.utf8Validation : $root.google.protobuf.FeatureSet.Utf8Validation[message.utf8Validation] : message.utf8Validation; if (message.messageEncoding != null && message.hasOwnProperty("messageEncoding")) object.messageEncoding = options.enums === String ? $root.google.protobuf.FeatureSet.MessageEncoding[message.messageEncoding] === undefined ? message.messageEncoding : $root.google.protobuf.FeatureSet.MessageEncoding[message.messageEncoding] : message.messageEncoding; if (message.jsonFormat != null && message.hasOwnProperty("jsonFormat")) object.jsonFormat = options.enums === String ? $root.google.protobuf.FeatureSet.JsonFormat[message.jsonFormat] === undefined ? message.jsonFormat : $root.google.protobuf.FeatureSet.JsonFormat[message.jsonFormat] : message.jsonFormat; - if (message.rawFeatures != null && message.hasOwnProperty("rawFeatures")) - object.rawFeatures = $root.google.protobuf.FeatureSet.toObject(message.rawFeatures, options); return object; }; @@ -34922,19 +35073,17 @@ })(); /** - * StringFieldValidation enum. - * @name google.protobuf.FeatureSet.StringFieldValidation + * Utf8Validation enum. + * @name google.protobuf.FeatureSet.Utf8Validation * @enum {number} - * @property {number} STRING_FIELD_VALIDATION_UNKNOWN=0 STRING_FIELD_VALIDATION_UNKNOWN value - * @property {number} MANDATORY=1 MANDATORY value - * @property {number} HINT=2 HINT value + * @property {number} UTF8_VALIDATION_UNKNOWN=0 UTF8_VALIDATION_UNKNOWN value + * @property {number} VERIFY=2 VERIFY value * @property {number} NONE=3 NONE value */ - FeatureSet.StringFieldValidation = (function() { + FeatureSet.Utf8Validation = (function() { var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "STRING_FIELD_VALIDATION_UNKNOWN"] = 0; - values[valuesById[1] = "MANDATORY"] = 1; - values[valuesById[2] = "HINT"] = 2; + values[valuesById[0] = "UTF8_VALIDATION_UNKNOWN"] = 0; + values[valuesById[2] = "VERIFY"] = 2; values[valuesById[3] = "NONE"] = 3; return values; })(); @@ -34974,6 +35123,702 @@ return FeatureSet; })(); + protobuf.FeatureSetDefaults = (function() { + + /** + * Properties of a FeatureSetDefaults. + * @memberof google.protobuf + * @interface IFeatureSetDefaults + * @property {Array.|null} [defaults] FeatureSetDefaults defaults + * @property {google.protobuf.Edition|null} [minimumEdition] FeatureSetDefaults minimumEdition + * @property {google.protobuf.Edition|null} [maximumEdition] FeatureSetDefaults maximumEdition + */ + + /** + * Constructs a new FeatureSetDefaults. + * @memberof google.protobuf + * @classdesc Represents a FeatureSetDefaults. + * @implements IFeatureSetDefaults + * @constructor + * @param {google.protobuf.IFeatureSetDefaults=} [properties] Properties to set + */ + function FeatureSetDefaults(properties) { + this.defaults = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FeatureSetDefaults defaults. + * @member {Array.} defaults + * @memberof google.protobuf.FeatureSetDefaults + * @instance + */ + FeatureSetDefaults.prototype.defaults = $util.emptyArray; + + /** + * FeatureSetDefaults minimumEdition. + * @member {google.protobuf.Edition} minimumEdition + * @memberof google.protobuf.FeatureSetDefaults + * @instance + */ + FeatureSetDefaults.prototype.minimumEdition = 0; + + /** + * FeatureSetDefaults maximumEdition. + * @member {google.protobuf.Edition} maximumEdition + * @memberof google.protobuf.FeatureSetDefaults + * @instance + */ + FeatureSetDefaults.prototype.maximumEdition = 0; + + /** + * Creates a new FeatureSetDefaults instance using the specified properties. + * @function create + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {google.protobuf.IFeatureSetDefaults=} [properties] Properties to set + * @returns {google.protobuf.FeatureSetDefaults} FeatureSetDefaults instance + */ + FeatureSetDefaults.create = function create(properties) { + return new FeatureSetDefaults(properties); + }; + + /** + * Encodes the specified FeatureSetDefaults message. Does not implicitly {@link google.protobuf.FeatureSetDefaults.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {google.protobuf.IFeatureSetDefaults} message FeatureSetDefaults message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FeatureSetDefaults.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.defaults != null && message.defaults.length) + for (var i = 0; i < message.defaults.length; ++i) + $root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.encode(message.defaults[i], writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.minimumEdition != null && Object.hasOwnProperty.call(message, "minimumEdition")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.minimumEdition); + if (message.maximumEdition != null && Object.hasOwnProperty.call(message, "maximumEdition")) + writer.uint32(/* id 5, wireType 0 =*/40).int32(message.maximumEdition); + return writer; + }; + + /** + * Encodes the specified FeatureSetDefaults message, length delimited. Does not implicitly {@link google.protobuf.FeatureSetDefaults.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {google.protobuf.IFeatureSetDefaults} message FeatureSetDefaults message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FeatureSetDefaults.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FeatureSetDefaults message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FeatureSetDefaults} FeatureSetDefaults + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FeatureSetDefaults.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FeatureSetDefaults(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + if (!(message.defaults && message.defaults.length)) + message.defaults = []; + message.defaults.push($root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.decode(reader, reader.uint32())); + break; + } + case 4: { + message.minimumEdition = reader.int32(); + break; + } + case 5: { + message.maximumEdition = reader.int32(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FeatureSetDefaults message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FeatureSetDefaults} FeatureSetDefaults + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FeatureSetDefaults.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FeatureSetDefaults message. + * @function verify + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FeatureSetDefaults.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.defaults != null && message.hasOwnProperty("defaults")) { + if (!Array.isArray(message.defaults)) + return "defaults: array expected"; + for (var i = 0; i < message.defaults.length; ++i) { + var error = $root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.verify(message.defaults[i]); + if (error) + return "defaults." + error; + } + } + if (message.minimumEdition != null && message.hasOwnProperty("minimumEdition")) + switch (message.minimumEdition) { + default: + return "minimumEdition: enum value expected"; + case 0: + case 998: + case 999: + case 1000: + case 1001: + case 1: + case 2: + case 99997: + case 99998: + case 99999: + case 2147483647: + break; + } + if (message.maximumEdition != null && message.hasOwnProperty("maximumEdition")) + switch (message.maximumEdition) { + default: + return "maximumEdition: enum value expected"; + case 0: + case 998: + case 999: + case 1000: + case 1001: + case 1: + case 2: + case 99997: + case 99998: + case 99999: + case 2147483647: + break; + } + return null; + }; + + /** + * Creates a FeatureSetDefaults message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FeatureSetDefaults} FeatureSetDefaults + */ + FeatureSetDefaults.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FeatureSetDefaults) + return object; + var message = new $root.google.protobuf.FeatureSetDefaults(); + if (object.defaults) { + if (!Array.isArray(object.defaults)) + throw TypeError(".google.protobuf.FeatureSetDefaults.defaults: array expected"); + message.defaults = []; + for (var i = 0; i < object.defaults.length; ++i) { + if (typeof object.defaults[i] !== "object") + throw TypeError(".google.protobuf.FeatureSetDefaults.defaults: object expected"); + message.defaults[i] = $root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.fromObject(object.defaults[i]); + } + } + switch (object.minimumEdition) { + default: + if (typeof object.minimumEdition === "number") { + message.minimumEdition = object.minimumEdition; + break; + } + break; + case "EDITION_UNKNOWN": + case 0: + message.minimumEdition = 0; + break; + case "EDITION_PROTO2": + case 998: + message.minimumEdition = 998; + break; + case "EDITION_PROTO3": + case 999: + message.minimumEdition = 999; + break; + case "EDITION_2023": + case 1000: + message.minimumEdition = 1000; + break; + case "EDITION_2024": + case 1001: + message.minimumEdition = 1001; + break; + case "EDITION_1_TEST_ONLY": + case 1: + message.minimumEdition = 1; + break; + case "EDITION_2_TEST_ONLY": + case 2: + message.minimumEdition = 2; + break; + case "EDITION_99997_TEST_ONLY": + case 99997: + message.minimumEdition = 99997; + break; + case "EDITION_99998_TEST_ONLY": + case 99998: + message.minimumEdition = 99998; + break; + case "EDITION_99999_TEST_ONLY": + case 99999: + message.minimumEdition = 99999; + break; + case "EDITION_MAX": + case 2147483647: + message.minimumEdition = 2147483647; + break; + } + switch (object.maximumEdition) { + default: + if (typeof object.maximumEdition === "number") { + message.maximumEdition = object.maximumEdition; + break; + } + break; + case "EDITION_UNKNOWN": + case 0: + message.maximumEdition = 0; + break; + case "EDITION_PROTO2": + case 998: + message.maximumEdition = 998; + break; + case "EDITION_PROTO3": + case 999: + message.maximumEdition = 999; + break; + case "EDITION_2023": + case 1000: + message.maximumEdition = 1000; + break; + case "EDITION_2024": + case 1001: + message.maximumEdition = 1001; + break; + case "EDITION_1_TEST_ONLY": + case 1: + message.maximumEdition = 1; + break; + case "EDITION_2_TEST_ONLY": + case 2: + message.maximumEdition = 2; + break; + case "EDITION_99997_TEST_ONLY": + case 99997: + message.maximumEdition = 99997; + break; + case "EDITION_99998_TEST_ONLY": + case 99998: + message.maximumEdition = 99998; + break; + case "EDITION_99999_TEST_ONLY": + case 99999: + message.maximumEdition = 99999; + break; + case "EDITION_MAX": + case 2147483647: + message.maximumEdition = 2147483647; + break; + } + return message; + }; + + /** + * Creates a plain object from a FeatureSetDefaults message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {google.protobuf.FeatureSetDefaults} message FeatureSetDefaults + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FeatureSetDefaults.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.defaults = []; + if (options.defaults) { + object.minimumEdition = options.enums === String ? "EDITION_UNKNOWN" : 0; + object.maximumEdition = options.enums === String ? "EDITION_UNKNOWN" : 0; + } + if (message.defaults && message.defaults.length) { + object.defaults = []; + for (var j = 0; j < message.defaults.length; ++j) + object.defaults[j] = $root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.toObject(message.defaults[j], options); + } + if (message.minimumEdition != null && message.hasOwnProperty("minimumEdition")) + object.minimumEdition = options.enums === String ? $root.google.protobuf.Edition[message.minimumEdition] === undefined ? message.minimumEdition : $root.google.protobuf.Edition[message.minimumEdition] : message.minimumEdition; + if (message.maximumEdition != null && message.hasOwnProperty("maximumEdition")) + object.maximumEdition = options.enums === String ? $root.google.protobuf.Edition[message.maximumEdition] === undefined ? message.maximumEdition : $root.google.protobuf.Edition[message.maximumEdition] : message.maximumEdition; + return object; + }; + + /** + * Converts this FeatureSetDefaults to JSON. + * @function toJSON + * @memberof google.protobuf.FeatureSetDefaults + * @instance + * @returns {Object.} JSON object + */ + FeatureSetDefaults.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for FeatureSetDefaults + * @function getTypeUrl + * @memberof google.protobuf.FeatureSetDefaults + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FeatureSetDefaults.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FeatureSetDefaults"; + }; + + FeatureSetDefaults.FeatureSetEditionDefault = (function() { + + /** + * Properties of a FeatureSetEditionDefault. + * @memberof google.protobuf.FeatureSetDefaults + * @interface IFeatureSetEditionDefault + * @property {google.protobuf.Edition|null} [edition] FeatureSetEditionDefault edition + * @property {google.protobuf.IFeatureSet|null} [features] FeatureSetEditionDefault features + */ + + /** + * Constructs a new FeatureSetEditionDefault. + * @memberof google.protobuf.FeatureSetDefaults + * @classdesc Represents a FeatureSetEditionDefault. + * @implements IFeatureSetEditionDefault + * @constructor + * @param {google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault=} [properties] Properties to set + */ + function FeatureSetEditionDefault(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FeatureSetEditionDefault edition. + * @member {google.protobuf.Edition} edition + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @instance + */ + FeatureSetEditionDefault.prototype.edition = 0; + + /** + * FeatureSetEditionDefault features. + * @member {google.protobuf.IFeatureSet|null|undefined} features + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @instance + */ + FeatureSetEditionDefault.prototype.features = null; + + /** + * Creates a new FeatureSetEditionDefault instance using the specified properties. + * @function create + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault=} [properties] Properties to set + * @returns {google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault} FeatureSetEditionDefault instance + */ + FeatureSetEditionDefault.create = function create(properties) { + return new FeatureSetEditionDefault(properties); + }; + + /** + * Encodes the specified FeatureSetEditionDefault message. Does not implicitly {@link google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault} message FeatureSetEditionDefault message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FeatureSetEditionDefault.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.features != null && Object.hasOwnProperty.call(message, "features")) + $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.edition != null && Object.hasOwnProperty.call(message, "edition")) + writer.uint32(/* id 3, wireType 0 =*/24).int32(message.edition); + return writer; + }; + + /** + * Encodes the specified FeatureSetEditionDefault message, length delimited. Does not implicitly {@link google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {google.protobuf.FeatureSetDefaults.IFeatureSetEditionDefault} message FeatureSetEditionDefault message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FeatureSetEditionDefault.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FeatureSetEditionDefault message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault} FeatureSetEditionDefault + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FeatureSetEditionDefault.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 3: { + message.edition = reader.int32(); + break; + } + case 2: { + message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FeatureSetEditionDefault message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault} FeatureSetEditionDefault + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FeatureSetEditionDefault.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FeatureSetEditionDefault message. + * @function verify + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FeatureSetEditionDefault.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.edition != null && message.hasOwnProperty("edition")) + switch (message.edition) { + default: + return "edition: enum value expected"; + case 0: + case 998: + case 999: + case 1000: + case 1001: + case 1: + case 2: + case 99997: + case 99998: + case 99999: + case 2147483647: + break; + } + if (message.features != null && message.hasOwnProperty("features")) { + var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (error) + return "features." + error; + } + return null; + }; + + /** + * Creates a FeatureSetEditionDefault message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault} FeatureSetEditionDefault + */ + FeatureSetEditionDefault.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault) + return object; + var message = new $root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault(); + switch (object.edition) { + default: + if (typeof object.edition === "number") { + message.edition = object.edition; + break; + } + break; + case "EDITION_UNKNOWN": + case 0: + message.edition = 0; + break; + case "EDITION_PROTO2": + case 998: + message.edition = 998; + break; + case "EDITION_PROTO3": + case 999: + message.edition = 999; + break; + case "EDITION_2023": + case 1000: + message.edition = 1000; + break; + case "EDITION_2024": + case 1001: + message.edition = 1001; + break; + case "EDITION_1_TEST_ONLY": + case 1: + message.edition = 1; + break; + case "EDITION_2_TEST_ONLY": + case 2: + message.edition = 2; + break; + case "EDITION_99997_TEST_ONLY": + case 99997: + message.edition = 99997; + break; + case "EDITION_99998_TEST_ONLY": + case 99998: + message.edition = 99998; + break; + case "EDITION_99999_TEST_ONLY": + case 99999: + message.edition = 99999; + break; + case "EDITION_MAX": + case 2147483647: + message.edition = 2147483647; + break; + } + if (object.features != null) { + if (typeof object.features !== "object") + throw TypeError(".google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.features: object expected"); + message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + } + return message; + }; + + /** + * Creates a plain object from a FeatureSetEditionDefault message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault} message FeatureSetEditionDefault + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + FeatureSetEditionDefault.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.features = null; + object.edition = options.enums === String ? "EDITION_UNKNOWN" : 0; + } + if (message.features != null && message.hasOwnProperty("features")) + object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); + if (message.edition != null && message.hasOwnProperty("edition")) + object.edition = options.enums === String ? $root.google.protobuf.Edition[message.edition] === undefined ? message.edition : $root.google.protobuf.Edition[message.edition] : message.edition; + return object; + }; + + /** + * Converts this FeatureSetEditionDefault to JSON. + * @function toJSON + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @instance + * @returns {Object.} JSON object + */ + FeatureSetEditionDefault.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for FeatureSetEditionDefault + * @function getTypeUrl + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + FeatureSetEditionDefault.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault"; + }; + + return FeatureSetEditionDefault; + })(); + + return FeatureSetDefaults; + })(); + protobuf.SourceCodeInfo = (function() { /** diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index f1332af798c..3cdd783dd28 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2407,6 +2407,11 @@ "longRunning": { "type": "LongRunning", "id": 2 + }, + "autoPopulatedFields": { + "rule": "repeated", + "type": "string", + "id": 3 } }, "nested": { @@ -2478,7 +2483,8 @@ "INPUT_ONLY": 4, "IMMUTABLE": 5, "UNORDERED_LIST": 6, - "NON_EMPTY_DEFAULT": 7 + "NON_EMPTY_DEFAULT": 7, + "IDENTIFIER": 8 } }, "resourceReference": { @@ -2580,6 +2586,21 @@ } } }, + "Edition": { + "values": { + "EDITION_UNKNOWN": 0, + "EDITION_PROTO2": 998, + "EDITION_PROTO3": 999, + "EDITION_2023": 1000, + "EDITION_2024": 1001, + "EDITION_1_TEST_ONLY": 1, + "EDITION_2_TEST_ONLY": 2, + "EDITION_99997_TEST_ONLY": 99997, + "EDITION_99998_TEST_ONLY": 99998, + "EDITION_99999_TEST_ONLY": 99999, + "EDITION_MAX": 2147483647 + } + }, "FileDescriptorProto": { "fields": { "name": { @@ -2644,8 +2665,8 @@ "id": 12 }, "edition": { - "type": "string", - "id": 13 + "type": "Edition", + "id": 14 } } }, @@ -2754,7 +2775,8 @@ "type": "VerificationState", "id": 3, "options": { - "default": "UNVERIFIED" + "default": "UNVERIFIED", + "retention": "RETENTION_SOURCE" } } }, @@ -2876,8 +2898,8 @@ "Label": { "values": { "LABEL_OPTIONAL": 1, - "LABEL_REQUIRED": 2, - "LABEL_REPEATED": 3 + "LABEL_REPEATED": 3, + "LABEL_REQUIRED": 2 } } } @@ -3065,13 +3087,6 @@ "default": false } }, - "phpGenericServices": { - "type": "bool", - "id": 42, - "options": { - "default": false - } - }, "deprecated": { "type": "bool", "id": 23, @@ -3131,6 +3146,10 @@ ] ], "reserved": [ + [ + 42, + 42 + ], [ 38, 38 @@ -3356,8 +3375,8 @@ "EditionDefault": { "fields": { "edition": { - "type": "string", - "id": 1 + "type": "Edition", + "id": 3 }, "value": { "type": "string", @@ -3587,7 +3606,7 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", - "edition_defaults.edition": "2023", + "edition_defaults.edition": "EDITION_2023", "edition_defaults.value": "EXPLICIT" } }, @@ -3597,7 +3616,7 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", - "edition_defaults.edition": "2023", + "edition_defaults.edition": "EDITION_PROTO3", "edition_defaults.value": "OPEN" } }, @@ -3607,18 +3626,18 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", - "edition_defaults.edition": "2023", + "edition_defaults.edition": "EDITION_PROTO3", "edition_defaults.value": "PACKED" } }, - "stringFieldValidation": { - "type": "StringFieldValidation", + "utf8Validation": { + "type": "Utf8Validation", "id": 4, "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", - "edition_defaults.edition": "2023", - "edition_defaults.value": "MANDATORY" + "edition_defaults.edition": "EDITION_PROTO3", + "edition_defaults.value": "VERIFY" } }, "messageEncoding": { @@ -3627,7 +3646,7 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", - "edition_defaults.edition": "2023", + "edition_defaults.edition": "EDITION_PROTO2", "edition_defaults.value": "LENGTH_PREFIXED" } }, @@ -3637,16 +3656,9 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", - "edition_defaults.edition": "2023", + "edition_defaults.edition": "EDITION_PROTO3", "edition_defaults.value": "ALLOW" } - }, - "rawFeatures": { - "type": "FeatureSet", - "id": 999, - "options": { - "targets": "TARGET_TYPE_UNKNOWN" - } } }, "extensions": [ @@ -3663,6 +3675,12 @@ 9999 ] ], + "reserved": [ + [ + 999, + 999 + ] + ], "nested": { "FieldPresence": { "values": { @@ -3686,11 +3704,10 @@ "EXPANDED": 2 } }, - "StringFieldValidation": { + "Utf8Validation": { "values": { - "STRING_FIELD_VALIDATION_UNKNOWN": 0, - "MANDATORY": 1, - "HINT": 2, + "UTF8_VALIDATION_UNKNOWN": 0, + "VERIFY": 2, "NONE": 3 } }, @@ -3710,6 +3727,37 @@ } } }, + "FeatureSetDefaults": { + "fields": { + "defaults": { + "rule": "repeated", + "type": "FeatureSetEditionDefault", + "id": 1 + }, + "minimumEdition": { + "type": "Edition", + "id": 4 + }, + "maximumEdition": { + "type": "Edition", + "id": 5 + } + }, + "nested": { + "FeatureSetEditionDefault": { + "fields": { + "edition": { + "type": "Edition", + "id": 3 + }, + "features": { + "type": "FeatureSet", + "id": 2 + } + } + } + } + }, "SourceCodeInfo": { "fields": { "location": { From 33edf25804521f252712319b0a1228c5669ad5d5 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:01:37 -0500 Subject: [PATCH 0991/1115] feat: add enforce_in_transit fields and optional annotations (#1873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: improve retry logic for streaming API calls build: update typescript generator version to 4.3.0 The streaming API call retry logic has changed, which in some rare cases may require code changes. Please feel free to reach out to us in the issues if you experience new problems with retrying streaming calls after this update. PiperOrigin-RevId: 599622271 Source-Link: https://github.com/googleapis/googleapis/commit/6239c217f083277d7a43c8bee55969654c3b2fee Source-Link: https://github.com/googleapis/googleapis-gen/commit/da13d8222d3ba33734501999864458640f1405ae Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGExM2Q4MjIyZDNiYTMzNzM0NTAxOTk5ODY0NDU4NjQwZjE0MDVhZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: add `ingestion_data_source_settings` field to `Topic` PiperOrigin-RevId: 600786127 Source-Link: https://github.com/googleapis/googleapis/commit/708f769ea3987faa1b810fcb44d9e0ee9172b352 Source-Link: https://github.com/googleapis/googleapis-gen/commit/3b85818ca8f12ace75390cea24e5f3df5ac70be7 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiM2I4NTgxOGNhOGYxMmFjZTc1MzkwY2VhMjRlNWYzZGY1YWM3MGJlNyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: add enforce_in_transit fields and optional annotations PiperOrigin-RevId: 601205737 Source-Link: https://github.com/googleapis/googleapis/commit/27f83015e8aacb6695f56435b3185f6d45fad995 Source-Link: https://github.com/googleapis/googleapis-gen/commit/daf775c7ecd90de69e1304b840a28d201c025f08 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGFmNzc1YzdlY2Q5MGRlNjllMTMwNGI4NDBhMjhkMjAxYzAyNWYwOCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- .../protos/google/pubsub/v1/pubsub.proto | 855 +++++++++++------- .../protos/google/pubsub/v1/schema.proto | 4 +- handwritten/pubsub/protos/protos.d.ts | 271 +++++- handwritten/pubsub/protos/protos.js | 713 +++++++++++++++ handwritten/pubsub/protos/protos.json | 600 ++++++++++-- handwritten/pubsub/src/v1/publisher_client.ts | 156 ++-- .../pubsub/src/v1/schema_service_client.ts | 4 +- .../pubsub/src/v1/subscriber_client.ts | 206 ++--- 8 files changed, 2175 insertions(+), 634 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 393893b1033..c548b26808d 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -53,8 +53,8 @@ service Publisher { option (google.api.method_signature) = "name"; } - // Updates an existing topic. Note that certain properties of a - // topic are not modifiable. + // Updates an existing topic by updating the fields specified in the update + // mask. Note that certain properties of a topic are not modifiable. rpc UpdateTopic(UpdateTopicRequest) returns (Topic) { option (google.api.http) = { patch: "/v1/{topic.name=projects/*/topics/*}" @@ -137,13 +137,21 @@ service Publisher { // A policy constraining the storage of messages published to the topic. message MessageStoragePolicy { - // A list of IDs of Google Cloud regions where messages that are published - // to the topic may be persisted in storage. Messages published by publishers - // running in non-allowed Google Cloud regions (or running outside of Google - // Cloud altogether) are routed for storage in one of the allowed regions. - // An empty list means that no regions are allowed, and is not a valid - // configuration. - repeated string allowed_persistence_regions = 1; + // Optional. A list of IDs of Google Cloud regions where messages that are + // published to the topic may be persisted in storage. Messages published by + // publishers running in non-allowed Google Cloud regions (or running outside + // of Google Cloud altogether) are routed for storage in one of the allowed + // regions. An empty list means that no regions are allowed, and is not a + // valid configuration. + repeated string allowed_persistence_regions = 1 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. If true, `allowed_persistence_regions` is also used to enforce + // in-transit guarantees for messages. That is, Pub/Sub will fail + // Publish operations on this topic and subscribe operations + // on any subscription attached to this topic in any region that is + // not in `allowed_persistence_regions`. + bool enforce_in_transit = 2 [(google.api.field_behavior) = OPTIONAL]; } // Settings for validating messages published against a schema. @@ -157,18 +165,83 @@ message SchemaSettings { (google.api.resource_reference) = { type: "pubsub.googleapis.com/Schema" } ]; - // The encoding of messages validated against `schema`. - Encoding encoding = 2; + // Optional. The encoding of messages validated against `schema`. + Encoding encoding = 2 [(google.api.field_behavior) = OPTIONAL]; - // 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; + // Optional. 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 [(google.api.field_behavior) = OPTIONAL]; - // 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; + // Optional. 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 [(google.api.field_behavior) = OPTIONAL]; +} + +// Settings for an ingestion data source on a topic. +message IngestionDataSourceSettings { + // Ingestion settings for Amazon Kinesis Data Streams. + message AwsKinesis { + // Possible states for managed ingestion from Amazon Kinesis Data Streams. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // Ingestion is active. + ACTIVE = 1; + + // Permission denied encountered while consuming data from Kinesis. + // This can happen if: + // - The provided `aws_role_arn` does not exist or does not have the + // appropriate permissions attached. + // - The provided `aws_role_arn` is not set up properly for Identity + // Federation using `gcp_service_account`. + // - The Pub/Sub SA is not granted the + // `iam.serviceAccounts.getOpenIdToken` permission on + // `gcp_service_account`. + KINESIS_PERMISSION_DENIED = 2; + + // Permission denied encountered while publishing to the topic. This can + // happen due to Pub/Sub SA has not been granted the [appropriate publish + // permissions](https://cloud.google.com/pubsub/docs/access-control#pubsub.publisher) + PUBLISH_PERMISSION_DENIED = 3; + + // The Kinesis stream does not exist. + STREAM_NOT_FOUND = 4; + + // The Kinesis consumer does not exist. + CONSUMER_NOT_FOUND = 5; + } + + // Output only. An output-only field that indicates the state of the Kinesis + // ingestion source. + State state = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Required. The Kinesis stream ARN to ingest data from. + string stream_arn = 2 [(google.api.field_behavior) = REQUIRED]; + + // Required. The Kinesis consumer ARN to used for ingestion in Enhanced + // Fan-Out mode. The consumer must be already created and ready to be used. + string consumer_arn = 3 [(google.api.field_behavior) = REQUIRED]; + + // Required. AWS role ARN to be used for Federated Identity authentication + // with Kinesis. Check the Pub/Sub docs for how to set up this role and the + // required permissions that need to be attached to it. + string aws_role_arn = 4 [(google.api.field_behavior) = REQUIRED]; + + // Required. The GCP service account to be used for Federated Identity + // authentication with Kinesis (via a `AssumeRoleWithWebIdentity` call for + // the provided role). The `aws_role_arn` must be set up with + // `accounts.google.com:sub` equals to this service account number. + string gcp_service_account = 5 [(google.api.field_behavior) = REQUIRED]; + } + + // Only one source type can have settings set. + oneof source { + // Optional. Amazon Kinesis Data Streams. + AwsKinesis aws_kinesis = 1 [(google.api.field_behavior) = OPTIONAL]; + } } // A topic resource. @@ -179,6 +252,20 @@ message Topic { pattern: "_deleted-topic_" }; + // The state of the topic. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // The topic does not have any persistent errors. + ACTIVE = 1; + + // Ingestion from the data source has encountered a permanent error. + // See the more detailed error state in the corresponding ingestion + // source configuration. + INGESTION_RESOURCE_ERROR = 2; + } + // Required. The name of the topic. It must have the format // `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter, // and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`), @@ -187,37 +274,48 @@ message Topic { // must not start with `"goog"`. string name = 1 [(google.api.field_behavior) = REQUIRED]; - // See [Creating and managing labels] + // Optional. See [Creating and managing labels] // (https://cloud.google.com/pubsub/docs/labels). - map labels = 2; + map labels = 2 [(google.api.field_behavior) = OPTIONAL]; - // Policy constraining the set of Google Cloud Platform regions where messages - // published to the topic may be stored. If not present, then no constraints - // are in effect. - MessageStoragePolicy message_storage_policy = 3; + // Optional. Policy constraining the set of Google Cloud Platform regions + // where messages published to the topic may be stored. If not present, then + // no constraints are in effect. + MessageStoragePolicy message_storage_policy = 3 + [(google.api.field_behavior) = OPTIONAL]; - // The resource name of the Cloud KMS CryptoKey to be used to protect access - // to messages published on this topic. + // Optional. The resource name of the Cloud KMS CryptoKey to be used to + // protect access to messages published on this topic. // // The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*`. - string kms_key_name = 5; + string kms_key_name = 5 [(google.api.field_behavior) = OPTIONAL]; - // Settings for validating messages published against a schema. - SchemaSettings schema_settings = 6; + // Optional. Settings for validating messages published against a schema. + SchemaSettings schema_settings = 6 [(google.api.field_behavior) = OPTIONAL]; - // Reserved for future use. This field is set only in responses from the - // server; it is ignored if it is set in any requests. - bool satisfies_pzs = 7; + // Optional. Reserved for future use. This field is set only in responses from + // the server; it is ignored if it is set in any requests. + bool satisfies_pzs = 7 [(google.api.field_behavior) = OPTIONAL]; - // Indicates the minimum duration to retain a message after it is published to - // the topic. If this field is set, messages published to the topic in the - // last `message_retention_duration` are always available to subscribers. For - // instance, it allows any attached subscription to [seek to a + // Optional. Indicates the minimum duration to retain a message after it is + // published to the topic. If this field is set, messages published to the + // topic in the last `message_retention_duration` are always available to + // subscribers. For instance, it allows any attached subscription to [seek to + // a // timestamp](https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) // that is up to `message_retention_duration` in the past. If this field is // not set, message retention is controlled by settings on individual // subscriptions. Cannot be more than 31 days or less than 10 minutes. - google.protobuf.Duration message_retention_duration = 8; + google.protobuf.Duration message_retention_duration = 8 + [(google.api.field_behavior) = OPTIONAL]; + + // Output only. An output-only field indicating the state of the topic. + State state = 9 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Optional. Settings for managed ingestion from a data source into this + // topic. + IngestionDataSourceSettings ingestion_data_source_settings = 10 + [(google.api.field_behavior) = OPTIONAL]; } // A message that is published by publishers and consumed by subscribers. The @@ -229,14 +327,14 @@ message Topic { // (https://cloud.google.com/pubsub/quotas) for more information about message // limits. message PubsubMessage { - // The message data field. If this field is empty, the message must contain - // at least one attribute. - bytes data = 1; + // Optional. The message data field. If this field is empty, the message must + // contain at least one attribute. + bytes data = 1 [(google.api.field_behavior) = OPTIONAL]; - // Attributes for this message. If this field is empty, the message must - // contain non-empty data. This can be used to filter messages on the + // Optional. Attributes for this message. If this field is empty, the message + // must contain non-empty data. This can be used to filter messages on the // subscription. - map attributes = 2; + map attributes = 2 [(google.api.field_behavior) = OPTIONAL]; // ID of this message, assigned by the server when the message is published. // Guaranteed to be unique within the topic. This value may be read by a @@ -249,15 +347,15 @@ message PubsubMessage { // publisher in a `Publish` call. google.protobuf.Timestamp publish_time = 4; - // If non-empty, identifies related messages for which publish order should be - // respected. If a `Subscription` has `enable_message_ordering` set to `true`, - // messages published with the same non-empty `ordering_key` value will be - // delivered to subscribers in the order in which they are received by the - // Pub/Sub system. All `PubsubMessage`s published in a given `PublishRequest` - // must specify the same `ordering_key` value. - // For more information, see [ordering + // Optional. If non-empty, identifies related messages for which publish order + // should be respected. If a `Subscription` has `enable_message_ordering` set + // to `true`, messages published with the same non-empty `ordering_key` value + // will be delivered to subscribers in the order in which they are received by + // the Pub/Sub system. All `PubsubMessage`s published in a given + // `PublishRequest` must specify the same `ordering_key` value. For more + // information, see [ordering // messages](https://cloud.google.com/pubsub/docs/ordering). - string ordering_key = 5; + string ordering_key = 5 [(google.api.field_behavior) = OPTIONAL]; } // Request for the GetTopic method. @@ -299,10 +397,10 @@ message PublishRequest { // Response for the `Publish` method. message PublishResponse { - // The server-assigned ID of each published message, in the same order as - // the messages in the request. IDs are guaranteed to be unique within - // the topic. - repeated string message_ids = 1; + // Optional. The server-assigned ID of each published message, in the same + // order as the messages in the request. IDs are guaranteed to be unique + // within the topic. + repeated string message_ids = 1 [(google.api.field_behavior) = OPTIONAL]; } // Request for the `ListTopics` method. @@ -316,23 +414,23 @@ message ListTopicsRequest { } ]; - // Maximum number of topics to return. - int32 page_size = 2; + // Optional. Maximum number of topics to return. + int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL]; - // The value returned by the last `ListTopicsResponse`; indicates that this is - // a continuation of a prior `ListTopics` call, and that the system should - // return the next page of data. - string page_token = 3; + // Optional. The value returned by the last `ListTopicsResponse`; indicates + // that this is a continuation of a prior `ListTopics` call, and that the + // system should return the next page of data. + string page_token = 3 [(google.api.field_behavior) = OPTIONAL]; } // Response for the `ListTopics` method. message ListTopicsResponse { - // The resulting topics. - repeated Topic topics = 1; + // Optional. The resulting topics. + repeated Topic topics = 1 [(google.api.field_behavior) = OPTIONAL]; - // If not empty, indicates that there may be more topics that match the - // request; this value should be passed in a new `ListTopicsRequest`. - string next_page_token = 2; + // Optional. If not empty, indicates that there may be more topics that match + // the request; this value should be passed in a new `ListTopicsRequest`. + string next_page_token = 2 [(google.api.field_behavior) = OPTIONAL]; } // Request for the `ListTopicSubscriptions` method. @@ -344,26 +442,30 @@ message ListTopicSubscriptionsRequest { (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; - // Maximum number of subscription names to return. - int32 page_size = 2; + // Optional. Maximum number of subscription names to return. + int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL]; - // The value returned by the last `ListTopicSubscriptionsResponse`; indicates - // that this is a continuation of a prior `ListTopicSubscriptions` call, and - // that the system should return the next page of data. - string page_token = 3; + // Optional. The value returned by the last `ListTopicSubscriptionsResponse`; + // indicates that this is a continuation of a prior `ListTopicSubscriptions` + // call, and that the system should return the next page of data. + string page_token = 3 [(google.api.field_behavior) = OPTIONAL]; } // Response for the `ListTopicSubscriptions` method. message ListTopicSubscriptionsResponse { - // The names of subscriptions attached to the topic specified in the request. - repeated string subscriptions = 1 [(google.api.resource_reference) = { - type: "pubsub.googleapis.com/Subscription" - }]; + // Optional. The names of subscriptions attached to the topic specified in the + // request. + repeated string subscriptions = 1 [ + (google.api.field_behavior) = OPTIONAL, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Subscription" + } + ]; - // If not empty, indicates that there may be more subscriptions that match - // the request; this value should be passed in a new + // Optional. If not empty, indicates that there may be more subscriptions that + // match the request; this value should be passed in a new // `ListTopicSubscriptionsRequest` to get more subscriptions. - string next_page_token = 2; + string next_page_token = 2 [(google.api.field_behavior) = OPTIONAL]; } // Request for the `ListTopicSnapshots` method. @@ -375,24 +477,24 @@ message ListTopicSnapshotsRequest { (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; - // Maximum number of snapshot names to return. - int32 page_size = 2; + // Optional. Maximum number of snapshot names to return. + int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL]; - // The value returned by the last `ListTopicSnapshotsResponse`; indicates - // that this is a continuation of a prior `ListTopicSnapshots` call, and - // that the system should return the next page of data. - string page_token = 3; + // Optional. The value returned by the last `ListTopicSnapshotsResponse`; + // indicates that this is a continuation of a prior `ListTopicSnapshots` call, + // and that the system should return the next page of data. + string page_token = 3 [(google.api.field_behavior) = OPTIONAL]; } // Response for the `ListTopicSnapshots` method. message ListTopicSnapshotsResponse { - // The names of the snapshots that match the request. - repeated string snapshots = 1; + // Optional. The names of the snapshots that match the request. + repeated string snapshots = 1 [(google.api.field_behavior) = OPTIONAL]; - // If not empty, indicates that there may be more snapshots that match - // the request; this value should be passed in a new + // Optional. If not empty, indicates that there may be more snapshots that + // match the request; this value should be passed in a new // `ListTopicSnapshotsRequest` to get more snapshots. - string next_page_token = 2; + string next_page_token = 2 [(google.api.field_behavior) = OPTIONAL]; } // Request for the `DeleteTopic` method. @@ -458,8 +560,9 @@ service Subscriber { option (google.api.method_signature) = "subscription"; } - // Updates an existing subscription. Note that certain properties of a - // subscription, such as its topic, are not modifiable. + // Updates an existing subscription by updating the fields specified in the + // update mask. Note that certain properties of a subscription, such as its + // topic, are not modifiable. rpc UpdateSubscription(UpdateSubscriptionRequest) returns (Subscription) { option (google.api.http) = { patch: "/v1/{subscription.name=projects/*/subscriptions/*}" @@ -604,7 +707,8 @@ service Subscriber { option (google.api.method_signature) = "name,subscription"; } - // Updates an existing snapshot. Snapshots are used in + // Updates an existing snapshot by updating the fields specified in the update + // mask. Snapshots are used in // [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, // which allow you to manage message acknowledgments in bulk. That is, you can // set the acknowledgment state of messages in an existing subscription to the @@ -687,23 +791,24 @@ message Subscription { (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; - // If push delivery is used with this subscription, this field is - // used to configure it. - PushConfig push_config = 4; - - // If delivery to BigQuery is used with this subscription, this field is + // Optional. If push delivery is used with this subscription, this field is // used to configure it. - BigQueryConfig bigquery_config = 18; + PushConfig push_config = 4 [(google.api.field_behavior) = OPTIONAL]; - // If delivery to Google Cloud Storage is used with this subscription, this + // Optional. If delivery to BigQuery is used with this subscription, this // field is used to configure it. - CloudStorageConfig cloud_storage_config = 22; - - // The approximate amount of time (on a best-effort basis) Pub/Sub waits for - // the subscriber to acknowledge receipt before resending the message. In the - // interval after the message is delivered and before it is acknowledged, it - // is considered to be _outstanding_. During that time period, the - // message will not be redelivered (on a best-effort basis). + BigQueryConfig bigquery_config = 18 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. If delivery to Google Cloud Storage is used with this + // subscription, this field is used to configure it. + CloudStorageConfig cloud_storage_config = 22 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The approximate amount of time (on a best-effort basis) Pub/Sub + // waits for the subscriber to acknowledge receipt before resending the + // message. In the interval after the message is delivered and before it is + // acknowledged, it is considered to be _outstanding_. During that time + // period, the message will not be redelivered (on a best-effort basis). // // For pull subscriptions, this value is used as the initial value for the ack // deadline. To override this value for a given message, call @@ -719,78 +824,81 @@ message Subscription { // // If the subscriber never acknowledges the message, the Pub/Sub // system will eventually redeliver the message. - int32 ack_deadline_seconds = 5; + int32 ack_deadline_seconds = 5 [(google.api.field_behavior) = OPTIONAL]; - // Indicates whether to retain acknowledged messages. If true, then + // Optional. Indicates whether to retain acknowledged messages. If true, then // messages are not expunged from the subscription's backlog, even if they are // acknowledged, until they fall out of the `message_retention_duration` // window. This must be true if you would like to [`Seek` to a timestamp] // (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) in // the past to replay previously-acknowledged messages. - bool retain_acked_messages = 7; + bool retain_acked_messages = 7 [(google.api.field_behavior) = OPTIONAL]; - // How long to retain unacknowledged messages in the subscription's backlog, - // from the moment a message is published. - // If `retain_acked_messages` is true, then this also configures the retention - // of acknowledged messages, and thus configures how far back in time a `Seek` - // can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - // minutes. - google.protobuf.Duration message_retention_duration = 8; + // Optional. How long to retain unacknowledged messages in the subscription's + // backlog, from the moment a message is published. If `retain_acked_messages` + // is true, then this also configures the retention of acknowledged messages, + // and thus configures how far back in time a `Seek` can be done. Defaults to + // 7 days. Cannot be more than 7 days or less than 10 minutes. + google.protobuf.Duration message_retention_duration = 8 + [(google.api.field_behavior) = OPTIONAL]; - // See [Creating and managing + // Optional. See [Creating and managing // labels](https://cloud.google.com/pubsub/docs/labels). - map labels = 9; - - // If true, messages published with the same `ordering_key` in `PubsubMessage` - // will be delivered to the subscribers in the order in which they - // are received by the Pub/Sub system. Otherwise, they may be delivered in - // any order. - bool enable_message_ordering = 10; - - // A policy that specifies the conditions for this subscription's expiration. - // A subscription is considered active as long as any connected subscriber is - // successfully consuming messages from the subscription or is issuing - // operations on the subscription. If `expiration_policy` is not set, a - // *default policy* with `ttl` of 31 days will be used. The minimum allowed + map labels = 9 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. If true, messages published with the same `ordering_key` in + // `PubsubMessage` will be delivered to the subscribers in the order in which + // they are received by the Pub/Sub system. Otherwise, they may be delivered + // in any order. + bool enable_message_ordering = 10 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. A policy that specifies the conditions for this subscription's + // expiration. A subscription is considered active as long as any connected + // subscriber is successfully consuming messages from the subscription or is + // issuing operations on the subscription. If `expiration_policy` is not set, + // a *default policy* with `ttl` of 31 days will be used. The minimum allowed // value for `expiration_policy.ttl` is 1 day. If `expiration_policy` is set, // but `expiration_policy.ttl` is not set, the subscription never expires. - ExpirationPolicy expiration_policy = 11; + ExpirationPolicy expiration_policy = 11 + [(google.api.field_behavior) = OPTIONAL]; - // An expression written in the Pub/Sub [filter + // Optional. An expression written in the Pub/Sub [filter // language](https://cloud.google.com/pubsub/docs/filtering). If non-empty, // then only `PubsubMessage`s whose `attributes` field matches the filter are // delivered on this subscription. If empty, then no messages are filtered // out. - string filter = 12; + string filter = 12 [(google.api.field_behavior) = OPTIONAL]; - // A policy that specifies the conditions for dead lettering messages in - // this subscription. If dead_letter_policy is not set, dead lettering - // is disabled. + // Optional. A policy that specifies the conditions for dead lettering + // messages in this subscription. If dead_letter_policy is not set, dead + // lettering is disabled. // - // The Cloud Pub/Sub service account associated with this subscriptions's + // The Pub/Sub service account associated with this subscriptions's // parent project (i.e., // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have // permission to Acknowledge() messages on this subscription. - DeadLetterPolicy dead_letter_policy = 13; + DeadLetterPolicy dead_letter_policy = 13 + [(google.api.field_behavior) = OPTIONAL]; - // A policy that specifies how Pub/Sub retries message delivery for this - // subscription. + // Optional. A policy that specifies how Pub/Sub retries message delivery for + // this subscription. // // If not set, the default retry policy is applied. This generally implies // that messages will be retried as soon as possible for healthy subscribers. // RetryPolicy will be triggered on NACKs or acknowledgement deadline // exceeded events for a given message. - RetryPolicy retry_policy = 14; + RetryPolicy retry_policy = 14 [(google.api.field_behavior) = OPTIONAL]; - // Indicates whether the subscription is detached from its topic. Detached - // subscriptions don't receive messages from their topic and don't retain any - // backlog. `Pull` and `StreamingPull` requests will return + // Optional. Indicates whether the subscription is detached from its topic. + // Detached subscriptions don't receive messages from their topic and don't + // retain any backlog. `Pull` and `StreamingPull` requests will return // FAILED_PRECONDITION. If the subscription is a push subscription, pushes to // the endpoint will not be made. - bool detached = 15; + bool detached = 15 [(google.api.field_behavior) = OPTIONAL]; - // If true, Pub/Sub provides the following guarantees for the delivery of - // a message with a given value of `message_id` on this subscription: + // Optional. If true, Pub/Sub provides the following guarantees for the + // delivery of a message with a given value of `message_id` on this + // subscription: // // * The message sent to a subscriber is guaranteed not to be resent // before the message's acknowledgement deadline expires. @@ -800,7 +908,8 @@ message Subscription { // when `enable_exactly_once_delivery` is true if the message was published // multiple times by a publisher client. These copies are considered distinct // by Pub/Sub and have distinct `message_id` values. - bool enable_exactly_once_delivery = 16; + bool enable_exactly_once_delivery = 16 + [(google.api.field_behavior) = OPTIONAL]; // Output only. Indicates the minimum duration for which a message is retained // after it is published to the subscription's topic. If this field is set, @@ -816,7 +925,7 @@ message Subscription { State state = 19 [(google.api.field_behavior) = OUTPUT_ONLY]; } -// A policy that specifies how Cloud Pub/Sub retries message delivery. +// A policy that specifies how Pub/Sub retries message delivery. // // Retry delay will be exponential based on provided minimum and maximum // backoffs. https://en.wikipedia.org/wiki/Exponential_backoff. @@ -828,13 +937,16 @@ message Subscription { // between consecutive deliveries may not match the configuration. That is, // delay can be more or less than configured backoff. message RetryPolicy { - // The minimum delay between consecutive deliveries of a given message. - // Value should be between 0 and 600 seconds. Defaults to 10 seconds. - google.protobuf.Duration minimum_backoff = 1; - - // The maximum delay between consecutive deliveries of a given message. - // Value should be between 0 and 600 seconds. Defaults to 600 seconds. - google.protobuf.Duration maximum_backoff = 2; + // Optional. The minimum delay between consecutive deliveries of a given + // message. Value should be between 0 and 600 seconds. Defaults to 10 seconds. + google.protobuf.Duration minimum_backoff = 1 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The maximum delay between consecutive deliveries of a given + // message. Value should be between 0 and 600 seconds. Defaults to 600 + // seconds. + google.protobuf.Duration maximum_backoff = 2 + [(google.api.field_behavior) = OPTIONAL]; } // Dead lettering is done on a best effort basis. The same message might be @@ -843,19 +955,19 @@ message RetryPolicy { // If validation on any of the fields fails at subscription creation/updation, // the create/update subscription request will fail. message DeadLetterPolicy { - // The name of the topic to which dead letter messages should be published. - // Format is `projects/{project}/topics/{topic}`.The Cloud Pub/Sub service - // account associated with the enclosing subscription's parent project (i.e., - // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have - // permission to Publish() to this topic. + // Optional. The name of the topic to which dead letter messages should be + // published. Format is `projects/{project}/topics/{topic}`.The Pub/Sub + // service account associated with the enclosing subscription's parent project + // (i.e., service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must + // have permission to Publish() to this topic. // // The operation will fail if the topic does not exist. // Users should ensure that there is a subscription attached to this topic // since messages published to a topic with no subscriptions are lost. - string dead_letter_topic = 1; + string dead_letter_topic = 1 [(google.api.field_behavior) = OPTIONAL]; - // The maximum number of delivery attempts for any message. The value must be - // between 5 and 100. + // Optional. The maximum number of delivery attempts for any message. The + // value must be between 5 and 100. // // The number of delivery attempts is defined as 1 + (the sum of number of // NACKs and number of times the acknowledgement deadline has been exceeded @@ -867,19 +979,19 @@ message DeadLetterPolicy { // This field will be honored on a best effort basis. // // If this parameter is 0, a default value of 5 is used. - int32 max_delivery_attempts = 2; + int32 max_delivery_attempts = 2 [(google.api.field_behavior) = OPTIONAL]; } // A policy that specifies the conditions for resource expiration (i.e., // automatic resource deletion). message ExpirationPolicy { - // Specifies the "time-to-live" duration for an associated resource. The - // resource expires if it is not active for a period of `ttl`. The definition - // of "activity" depends on the type of the associated resource. The minimum - // and maximum allowed values for `ttl` depend on the type of the associated - // resource, as well. If `ttl` is not set, the associated resource never - // expires. - google.protobuf.Duration ttl = 1; + // Optional. Specifies the "time-to-live" duration for an associated resource. + // The resource expires if it is not active for a period of `ttl`. The + // definition of "activity" depends on the type of the associated resource. + // The minimum and maximum allowed values for `ttl` depend on the type of the + // associated resource, as well. If `ttl` is not set, the associated resource + // never expires. + google.protobuf.Duration ttl = 1 [(google.api.field_behavior) = OPTIONAL]; } // Configuration for a push delivery endpoint. @@ -888,20 +1000,21 @@ message PushConfig { // [OpenID Connect // token](https://developers.google.com/identity/protocols/OpenIDConnect). message OidcToken { - // [Service account + // Optional. [Service account // email](https://cloud.google.com/iam/docs/service-accounts) // used for generating the OIDC token. For more information // on setting up authentication, see // [Push subscriptions](https://cloud.google.com/pubsub/docs/push). - string service_account_email = 1; - - // Audience to be used when generating OIDC token. The audience claim - // identifies the recipients that the JWT is intended for. The audience - // value is a single case-sensitive string. Having multiple values (array) - // for the audience field is not supported. More info about the OIDC JWT - // token audience here: https://tools.ietf.org/html/rfc7519#section-4.1.3 - // Note: if not specified, the Push endpoint URL will be used. - string audience = 2; + string service_account_email = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Audience to be used when generating OIDC token. The audience + // claim identifies the recipients that the JWT is intended for. The + // audience value is a single case-sensitive string. Having multiple values + // (array) for the audience field is not supported. More info about the OIDC + // JWT token audience here: + // https://tools.ietf.org/html/rfc7519#section-4.1.3 Note: if not specified, + // the Push endpoint URL will be used. + string audience = 2 [(google.api.field_behavior) = OPTIONAL]; } // The payload to the push endpoint is in the form of the JSON representation @@ -911,18 +1024,18 @@ message PushConfig { // Sets the `data` field as the HTTP body for delivery. message NoWrapper { - // When true, writes the Pub/Sub message metadata to + // Optional. When true, writes the Pub/Sub message metadata to // `x-goog-pubsub-:` headers of the HTTP request. Writes the // Pub/Sub message attributes to `:` headers of the HTTP request. - bool write_metadata = 1; + bool write_metadata = 1 [(google.api.field_behavior) = OPTIONAL]; } - // A URL locating the endpoint to which messages should be pushed. + // Optional. A URL locating the endpoint to which messages should be pushed. // For example, a Webhook endpoint might use `https://example.com/push`. - string push_endpoint = 1; + string push_endpoint = 1 [(google.api.field_behavior) = OPTIONAL]; - // Endpoint configuration attributes that can be used to control different - // aspects of the message delivery. + // Optional. Endpoint configuration attributes that can be used to control + // different aspects of the message delivery. // // The only currently supported attribute is `x-goog-version`, which you can // use to change the format of the pushed message. This attribute @@ -942,29 +1055,30 @@ message PushConfig { // // For example: // `attributes { "x-goog-version": "v1" }` - map attributes = 2; + map attributes = 2 [(google.api.field_behavior) = OPTIONAL]; // An authentication method used by push endpoints to verify the source of // push requests. This can be used with push endpoints that are private by - // default to allow requests only from the Cloud Pub/Sub system, for example. + // default to allow requests only from the Pub/Sub system, for example. // This field is optional and should be set only by users interested in // authenticated push. oneof authentication_method { - // If specified, Pub/Sub will generate and attach an OIDC JWT token as an - // `Authorization` header in the HTTP request for every pushed message. - OidcToken oidc_token = 3; + // Optional. If specified, Pub/Sub will generate and attach an OIDC JWT + // token as an `Authorization` header in the HTTP request for every pushed + // message. + OidcToken oidc_token = 3 [(google.api.field_behavior) = OPTIONAL]; } // The format of the delivered message to the push endpoint is defined by // the chosen wrapper. When unset, `PubsubWrapper` is used. oneof wrapper { - // When set, the payload to the push endpoint is in the form of the JSON - // representation of a PubsubMessage + // Optional. When set, the payload to the push endpoint is in the form of + // the JSON representation of a PubsubMessage // (https://cloud.google.com/pubsub/docs/reference/rpc/google.pubsub.v1#pubsubmessage). - PubsubWrapper pubsub_wrapper = 4; + PubsubWrapper pubsub_wrapper = 4 [(google.api.field_behavior) = OPTIONAL]; - // When set, the payload to the push endpoint is not wrapped. - NoWrapper no_wrapper = 5; + // Optional. When set, the payload to the push endpoint is not wrapped. + NoWrapper no_wrapper = 5 [(google.api.field_behavior) = OPTIONAL]; } } @@ -991,30 +1105,34 @@ message BigQueryConfig { // Cannot write to the BigQuery table due to a schema mismatch. SCHEMA_MISMATCH = 4; + + // Cannot write to the destination because enforce_in_transit is set to true + // and the destination locations are not in the allowed regions. + IN_TRANSIT_LOCATION_RESTRICTION = 5; } - // The name of the table to which to write data, of the form + // Optional. The name of the table to which to write data, of the form // {projectId}.{datasetId}.{tableId} - string table = 1; + string table = 1 [(google.api.field_behavior) = OPTIONAL]; // Optional. When true, use the topic's schema as the columns to write to in // BigQuery, if it exists. `use_topic_schema` and `use_table_schema` cannot be // enabled at the same time. bool use_topic_schema = 2 [(google.api.field_behavior) = OPTIONAL]; - // When true, write the subscription name, message_id, publish_time, + // Optional. When true, write the subscription name, message_id, publish_time, // attributes, and ordering_key to additional columns in the table. The // subscription name, message_id, and publish_time fields are put in their own // columns while all other message properties (other than data) are written to // a JSON object in the attributes column. - bool write_metadata = 3; + bool write_metadata = 3 [(google.api.field_behavior) = OPTIONAL]; - // When true and use_topic_schema is true, any fields that are a part of the - // topic schema that are not part of the BigQuery table schema are dropped - // when writing to BigQuery. Otherwise, the schemas must be kept in sync and - // any messages with extra fields are not written and remain in the + // Optional. When true and use_topic_schema is true, any fields that are a + // part of the topic schema that are not part of the BigQuery table schema are + // dropped when writing to BigQuery. Otherwise, the schemas must be kept in + // sync and any messages with extra fields are not written and remain in the // subscription's backlog. - bool drop_unknown_fields = 4; + bool drop_unknown_fields = 4 [(google.api.field_behavior) = OPTIONAL]; // Output only. An output-only field that indicates whether or not the // subscription can receive messages. @@ -1036,13 +1154,13 @@ message CloudStorageConfig { // Configuration for writing message data in Avro format. // Message payloads and metadata will be written to files as an Avro binary. message AvroConfig { - // When true, write the subscription name, message_id, publish_time, - // attributes, and ordering_key as additional fields in the output. The - // subscription name, message_id, and publish_time fields are put in their - // own fields while all other message properties other than data (for - // example, an ordering_key, if present) are added as entries in the - // attributes map. - bool write_metadata = 1; + // Optional. When true, write the subscription name, message_id, + // publish_time, attributes, and ordering_key as additional fields in the + // output. The subscription name, message_id, and publish_time fields are + // put in their own fields while all other message properties other than + // data (for example, an ordering_key, if present) are added as entries in + // the attributes map. + bool write_metadata = 1 [(google.api.field_behavior) = OPTIONAL]; } // Possible states for a Cloud Storage subscription. @@ -1059,6 +1177,10 @@ message CloudStorageConfig { // Cannot write to the Cloud Storage bucket because it does not exist. NOT_FOUND = 3; + + // Cannot write to the destination because enforce_in_transit is set to true + // and the destination locations are not in the allowed regions. + IN_TRANSIT_LOCATION_RESTRICTION = 4; } // Required. User-provided name for the Cloud Storage bucket. @@ -1067,33 +1189,36 @@ message CloudStorageConfig { // requirements] (https://cloud.google.com/storage/docs/buckets#naming). string bucket = 1 [(google.api.field_behavior) = REQUIRED]; - // User-provided prefix for Cloud Storage filename. See the [object naming - // requirements](https://cloud.google.com/storage/docs/objects#naming). - string filename_prefix = 2; + // Optional. User-provided prefix for Cloud Storage filename. See the [object + // naming requirements](https://cloud.google.com/storage/docs/objects#naming). + string filename_prefix = 2 [(google.api.field_behavior) = OPTIONAL]; - // User-provided suffix for Cloud Storage filename. See the [object naming - // requirements](https://cloud.google.com/storage/docs/objects#naming). Must - // not end in "/". - string filename_suffix = 3; + // Optional. User-provided suffix for Cloud Storage filename. See the [object + // naming requirements](https://cloud.google.com/storage/docs/objects#naming). + // Must not end in "/". + string filename_suffix = 3 [(google.api.field_behavior) = OPTIONAL]; // Defaults to text format. oneof output_format { - // If set, message data will be written to Cloud Storage in text format. - TextConfig text_config = 4; + // Optional. If set, message data will be written to Cloud Storage in text + // format. + TextConfig text_config = 4 [(google.api.field_behavior) = OPTIONAL]; - // If set, message data will be written to Cloud Storage in Avro format. - AvroConfig avro_config = 5; + // Optional. If set, message data will be written to Cloud Storage in Avro + // format. + AvroConfig avro_config = 5 [(google.api.field_behavior) = OPTIONAL]; } - // The maximum duration that can elapse before a new Cloud Storage file is - // created. Min 1 minute, max 10 minutes, default 5 minutes. May not exceed - // the subscription's acknowledgement deadline. - google.protobuf.Duration max_duration = 6; + // Optional. The maximum duration that can elapse before a new Cloud Storage + // file is created. Min 1 minute, max 10 minutes, default 5 minutes. May not + // exceed the subscription's acknowledgement deadline. + google.protobuf.Duration max_duration = 6 + [(google.api.field_behavior) = OPTIONAL]; - // The maximum bytes that can be written to a Cloud Storage file before a new - // file is created. Min 1 KB, max 10 GiB. The max_bytes limit may be exceeded - // in cases where messages are larger than the limit. - int64 max_bytes = 7; + // Optional. The maximum bytes that can be written to a Cloud Storage file + // before a new file is created. Min 1 KB, max 10 GiB. The max_bytes limit may + // be exceeded in cases where messages are larger than the limit. + int64 max_bytes = 7 [(google.api.field_behavior) = OPTIONAL]; // Output only. An output-only field that indicates whether or not the // subscription can receive messages. @@ -1102,14 +1227,14 @@ message CloudStorageConfig { // A message and its corresponding acknowledgment ID. message ReceivedMessage { - // This ID can be used to acknowledge the received message. - string ack_id = 1; + // Optional. This ID can be used to acknowledge the received message. + string ack_id = 1 [(google.api.field_behavior) = OPTIONAL]; - // The message. - PubsubMessage message = 2; + // Optional. The message. + PubsubMessage message = 2 [(google.api.field_behavior) = OPTIONAL]; - // The approximate number of times that Cloud Pub/Sub has attempted to deliver - // the associated message to a subscriber. + // Optional. The approximate number of times that Pub/Sub has attempted to + // deliver the associated message to a subscriber. // // More precisely, this is 1 + (number of NACKs) + // (number of ack_deadline exceeds) for this message. @@ -1124,7 +1249,7 @@ message ReceivedMessage { // value of 1. The value is calculated at best effort and is approximate. // // If a DeadLetterPolicy is not set on the subscription, this will be 0. - int32 delivery_attempt = 3; + int32 delivery_attempt = 3 [(google.api.field_behavior) = OPTIONAL]; } // Request for the GetSubscription method. @@ -1161,24 +1286,25 @@ message ListSubscriptionsRequest { } ]; - // Maximum number of subscriptions to return. - int32 page_size = 2; + // Optional. Maximum number of subscriptions to return. + int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL]; - // The value returned by the last `ListSubscriptionsResponse`; indicates that - // this is a continuation of a prior `ListSubscriptions` call, and that the - // system should return the next page of data. - string page_token = 3; + // Optional. The value returned by the last `ListSubscriptionsResponse`; + // indicates that this is a continuation of a prior `ListSubscriptions` call, + // and that the system should return the next page of data. + string page_token = 3 [(google.api.field_behavior) = OPTIONAL]; } // Response for the `ListSubscriptions` method. message ListSubscriptionsResponse { - // The subscriptions that match the request. - repeated Subscription subscriptions = 1; + // Optional. The subscriptions that match the request. + repeated Subscription subscriptions = 1 + [(google.api.field_behavior) = OPTIONAL]; - // If not empty, indicates that there may be more subscriptions that match - // the request; this value should be passed in a new + // Optional. If not empty, indicates that there may be more subscriptions that + // match the request; this value should be passed in a new // `ListSubscriptionsRequest` to get more subscriptions. - string next_page_token = 2; + string next_page_token = 2 [(google.api.field_behavior) = OPTIONAL]; } // Request for the DeleteSubscription method. @@ -1242,12 +1368,13 @@ message PullRequest { // Response for the `Pull` method. message PullResponse { - // Received Pub/Sub messages. The list will be empty if there are no more - // messages available in the backlog, or if no messages could be returned + // Optional. Received Pub/Sub messages. The list will be empty if there are no + // more messages available in the backlog, or if no messages could be returned // before the request timeout. For JSON, the response can be entirely // empty. The Pub/Sub system may return fewer than the `maxMessages` requested // even if there are more messages available in the backlog. - repeated ReceivedMessage received_messages = 1; + repeated ReceivedMessage received_messages = 1 + [(google.api.field_behavior) = OPTIONAL]; } // Request for the ModifyAckDeadline method. @@ -1271,7 +1398,8 @@ message ModifyAckDeadlineRequest { // delivery to another subscriber client. This typically results in an // increase in the rate of message redeliveries (that is, duplicates). // The minimum deadline you can specify is 0 seconds. - // The maximum deadline you can specify is 600 seconds (10 minutes). + // The maximum deadline you can specify in a single request is 600 seconds + // (10 minutes). int32 ack_deadline_seconds = 3 [(google.api.field_behavior) = REQUIRED]; } @@ -1307,14 +1435,15 @@ message StreamingPullRequest { } ]; - // List of acknowledgement IDs for acknowledging previously received messages - // (received on this stream or a different stream). If an ack ID has expired, - // the corresponding message may be redelivered later. Acknowledging a message - // more than once will not result in an error. If the acknowledgement ID is - // malformed, the stream will be aborted with status `INVALID_ARGUMENT`. - repeated string ack_ids = 2; + // Optional. List of acknowledgement IDs for acknowledging previously received + // messages (received on this stream or a different stream). If an ack ID has + // expired, the corresponding message may be redelivered later. Acknowledging + // a message more than once will not result in an error. If the + // acknowledgement ID is malformed, the stream will be aborted with status + // `INVALID_ARGUMENT`. + repeated string ack_ids = 2 [(google.api.field_behavior) = OPTIONAL]; - // The list of new ack deadlines for the IDs listed in + // Optional. The list of new ack deadlines for the IDs listed in // `modify_deadline_ack_ids`. The size of this list must be the same as the // size of `modify_deadline_ack_ids`. If it differs the stream will be aborted // with `INVALID_ARGUMENT`. Each element in this list is applied to the @@ -1325,14 +1454,16 @@ message StreamingPullRequest { // the message is immediately made available for another streaming or // non-streaming pull request. If the value is < 0 (an error), the stream will // be aborted with status `INVALID_ARGUMENT`. - repeated int32 modify_deadline_seconds = 3; + repeated int32 modify_deadline_seconds = 3 + [(google.api.field_behavior) = OPTIONAL]; - // List of acknowledgement IDs whose deadline will be modified based on the - // corresponding element in `modify_deadline_seconds`. This field can be used - // to indicate that more time is needed to process a message by the + // Optional. List of acknowledgement IDs whose deadline will be modified based + // on the corresponding element in `modify_deadline_seconds`. This field can + // be used to indicate that more time is needed to process a message by the // subscriber, or to make the message available for redelivery if the // processing was interrupted. - repeated string modify_deadline_ack_ids = 4; + repeated string modify_deadline_ack_ids = 4 + [(google.api.field_behavior) = OPTIONAL]; // Required. The ack deadline to use for the stream. This must be provided in // the first request on the stream, but it can also be updated on subsequent @@ -1341,16 +1472,16 @@ message StreamingPullRequest { int32 stream_ack_deadline_seconds = 5 [(google.api.field_behavior) = REQUIRED]; - // A unique identifier that is used to distinguish client instances from each - // other. Only needs to be provided on the initial request. When a stream - // disconnects and reconnects for the same stream, the client_id should be set - // to the same value so that state associated with the old stream can be - // transferred to the new stream. The same client_id should not be used for + // Optional. A unique identifier that is used to distinguish client instances + // from each other. Only needs to be provided on the initial request. When a + // stream disconnects and reconnects for the same stream, the client_id should + // be set to the same value so that state associated with the old stream can + // be transferred to the new stream. The same client_id should not be used for // different client instances. - string client_id = 6; + string client_id = 6 [(google.api.field_behavior) = OPTIONAL]; - // Flow control settings for the maximum number of outstanding messages. When - // there are `max_outstanding_messages` or more currently sent to the + // Optional. Flow control settings for the maximum number of outstanding + // messages. When there are `max_outstanding_messages` currently sent to the // streaming pull client that have not yet been acked or nacked, the server // stops sending more messages. The sending of messages resumes once the // number of outstanding messages is less than this value. If the value is @@ -1358,18 +1489,18 @@ message StreamingPullRequest { // property can only be set on the initial StreamingPullRequest. If it is set // on a subsequent request, the stream will be aborted with status // `INVALID_ARGUMENT`. - int64 max_outstanding_messages = 7; - - // Flow control settings for the maximum number of outstanding bytes. When - // there are `max_outstanding_bytes` or more worth of messages currently sent - // to the streaming pull client that have not yet been acked or nacked, the - // server will stop sending more messages. The sending of messages resumes - // once the number of outstanding bytes is less than this value. If the value - // is <= 0, there is no limit to the number of outstanding bytes. This - // property can only be set on the initial StreamingPullRequest. If it is set - // on a subsequent request, the stream will be aborted with status + int64 max_outstanding_messages = 7 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Flow control settings for the maximum number of outstanding + // bytes. When there are `max_outstanding_bytes` or more worth of messages + // currently sent to the streaming pull client that have not yet been acked or + // nacked, the server will stop sending more messages. The sending of messages + // resumes once the number of outstanding bytes is less than this value. If + // the value is <= 0, there is no limit to the number of outstanding bytes. + // This property can only be set on the initial StreamingPullRequest. If it is + // set on a subsequent request, the stream will be aborted with status // `INVALID_ARGUMENT`. - int64 max_outstanding_bytes = 8; + int64 max_outstanding_bytes = 8 [(google.api.field_behavior) = OPTIONAL]; } // Response for the `StreamingPull` method. This response is used to stream @@ -1378,56 +1509,69 @@ message StreamingPullResponse { // Acknowledgement IDs sent in one or more previous requests to acknowledge a // previously received message. message AcknowledgeConfirmation { - // Successfully processed acknowledgement IDs. - repeated string ack_ids = 1; - - // List of acknowledgement IDs that were malformed or whose acknowledgement - // deadline has expired. - repeated string invalid_ack_ids = 2; - - // List of acknowledgement IDs that were out of order. - repeated string unordered_ack_ids = 3; - - // List of acknowledgement IDs that failed processing with temporary issues. - repeated string temporary_failed_ack_ids = 4; + // Optional. Successfully processed acknowledgement IDs. + repeated string ack_ids = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. List of acknowledgement IDs that were malformed or whose + // acknowledgement deadline has expired. + repeated string invalid_ack_ids = 2 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. List of acknowledgement IDs that were out of order. + repeated string unordered_ack_ids = 3 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. List of acknowledgement IDs that failed processing with + // temporary issues. + repeated string temporary_failed_ack_ids = 4 + [(google.api.field_behavior) = OPTIONAL]; } // 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; - - // List of acknowledgement IDs that were malformed or whose acknowledgement - // deadline has expired. - repeated string invalid_ack_ids = 2; - - // List of acknowledgement IDs that failed processing with temporary issues. - repeated string temporary_failed_ack_ids = 3; + // Optional. Successfully processed acknowledgement IDs. + repeated string ack_ids = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. List of acknowledgement IDs that were malformed or whose + // acknowledgement deadline has expired. + repeated string invalid_ack_ids = 2 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. List of acknowledgement IDs that failed processing with + // temporary issues. + repeated string temporary_failed_ack_ids = 3 + [(google.api.field_behavior) = OPTIONAL]; } // Subscription properties sent as part of the response. message SubscriptionProperties { - // True iff exactly once delivery is enabled for this subscription. - bool exactly_once_delivery_enabled = 1; + // Optional. True iff exactly once delivery is enabled for this + // subscription. + bool exactly_once_delivery_enabled = 1 + [(google.api.field_behavior) = OPTIONAL]; - // True iff message ordering is enabled for this subscription. - bool message_ordering_enabled = 2; + // Optional. True iff message ordering is enabled for this subscription. + bool message_ordering_enabled = 2 [(google.api.field_behavior) = OPTIONAL]; } - // Received Pub/Sub messages. This will not be empty. - repeated ReceivedMessage received_messages = 1; + // Optional. Received Pub/Sub messages. This will not be empty. + repeated ReceivedMessage received_messages = 1 + [(google.api.field_behavior) = OPTIONAL]; - // This field will only be set if `enable_exactly_once_delivery` is set to - // `true`. - AcknowledgeConfirmation acknowledge_confirmation = 5; + // Optional. This field will only be set if `enable_exactly_once_delivery` is + // set to `true`. + AcknowledgeConfirmation acknowledge_confirmation = 5 + [(google.api.field_behavior) = OPTIONAL]; - // This field will only be set if `enable_exactly_once_delivery` is set to - // `true`. - ModifyAckDeadlineConfirmation modify_ack_deadline_confirmation = 3; + // Optional. This field will only be set if `enable_exactly_once_delivery` is + // set to `true`. + ModifyAckDeadlineConfirmation modify_ack_deadline_confirmation = 3 + [(google.api.field_behavior) = OPTIONAL]; - // Properties associated with this subscription. - SubscriptionProperties subscription_properties = 4; + // Optional. Properties associated with this subscription. + SubscriptionProperties subscription_properties = 4 + [(google.api.field_behavior) = OPTIONAL]; } // Request for the `CreateSnapshot` method. @@ -1459,9 +1603,9 @@ message CreateSnapshotRequest { } ]; - // See [Creating and managing + // Optional. See [Creating and managing // labels](https://cloud.google.com/pubsub/docs/labels). - map labels = 3; + map labels = 3 [(google.api.field_behavior) = OPTIONAL]; } // Request for the UpdateSnapshot method. @@ -1486,15 +1630,17 @@ message Snapshot { pattern: "projects/{project}/snapshots/{snapshot}" }; - // The name of the snapshot. - string name = 1; + // Optional. The name of the snapshot. + string name = 1 [(google.api.field_behavior) = OPTIONAL]; - // The name of the topic from which this snapshot is retaining messages. + // Optional. The name of the topic from which this snapshot is retaining + // messages. string topic = 2 [ + (google.api.field_behavior) = OPTIONAL, (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } ]; - // The snapshot is guaranteed to exist up until this time. + // Optional. The snapshot is guaranteed to exist up until this time. // A newly-created snapshot expires no later than 7 days from the time of its // creation. Its exact lifetime is determined at creation by the existing // backlog in the source subscription. Specifically, the lifetime of the @@ -1504,11 +1650,12 @@ message Snapshot { // will always capture this 3-day-old backlog as long as the snapshot // exists -- will expire in 4 days. The service will refuse to create a // snapshot that would expire in less than 1 hour after creation. - google.protobuf.Timestamp expire_time = 3; + google.protobuf.Timestamp expire_time = 3 + [(google.api.field_behavior) = OPTIONAL]; - // See [Creating and managing labels] + // Optional. See [Creating and managing labels] // (https://cloud.google.com/pubsub/docs/labels). - map labels = 4; + map labels = 4 [(google.api.field_behavior) = OPTIONAL]; } // Request for the GetSnapshot method. @@ -1532,23 +1679,24 @@ message ListSnapshotsRequest { } ]; - // Maximum number of snapshots to return. - int32 page_size = 2; + // Optional. Maximum number of snapshots to return. + int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL]; - // The value returned by the last `ListSnapshotsResponse`; indicates that this - // is a continuation of a prior `ListSnapshots` call, and that the system - // should return the next page of data. - string page_token = 3; + // Optional. The value returned by the last `ListSnapshotsResponse`; indicates + // that this is a continuation of a prior `ListSnapshots` call, and that the + // system should return the next page of data. + string page_token = 3 [(google.api.field_behavior) = OPTIONAL]; } // Response for the `ListSnapshots` method. message ListSnapshotsResponse { - // The resulting snapshots. - repeated Snapshot snapshots = 1; + // Optional. The resulting snapshots. + repeated Snapshot snapshots = 1 [(google.api.field_behavior) = OPTIONAL]; - // If not empty, indicates that there may be more snapshot that match the - // request; this value should be passed in a new `ListSnapshotsRequest`. - string next_page_token = 2; + // Optional. If not empty, indicates that there may be more snapshot that + // match the request; this value should be passed in a new + // `ListSnapshotsRequest`. + string next_page_token = 2 [(google.api.field_behavior) = OPTIONAL]; } // Request for the `DeleteSnapshot` method. @@ -1572,7 +1720,7 @@ message SeekRequest { ]; oneof target { - // The time to seek to. + // Optional. The time to seek to. // Messages retained in the subscription that were published before this // time are marked as acknowledged, and messages retained in the // subscription that were published after this time are marked as @@ -1583,14 +1731,17 @@ message SeekRequest { // window (or to a point before the system's notion of the subscription // creation time), only retained messages will be marked as unacknowledged, // and already-expunged messages will not be restored. - google.protobuf.Timestamp time = 2; - - // The snapshot to seek to. The snapshot's topic must be the same as that of - // the provided subscription. - // Format is `projects/{project}/snapshots/{snap}`. - string snapshot = 3 [(google.api.resource_reference) = { - type: "pubsub.googleapis.com/Snapshot" - }]; + google.protobuf.Timestamp time = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The snapshot to seek to. The snapshot's topic must be the same + // as that of the provided subscription. Format is + // `projects/{project}/snapshots/{snap}`. + string snapshot = 3 [ + (google.api.field_behavior) = OPTIONAL, + (google.api.resource_reference) = { + type: "pubsub.googleapis.com/Snapshot" + } + ]; } } diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index 32aa0d75cd6..bd17cf0f892 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -202,8 +202,8 @@ message CreateSchemaRequest { // The ID to use for the schema, which will become the final component of // the schema's resource name. // - // See https://cloud.google.com/pubsub/docs/admin#resource_names for resource - // name constraints. + // See https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names for + // resource name constraints. string schema_id = 3; } diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index eb65e4c60a3..dda11424ebb 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -241,6 +241,9 @@ export namespace google { /** MessageStoragePolicy allowedPersistenceRegions */ allowedPersistenceRegions?: (string[]|null); + + /** MessageStoragePolicy enforceInTransit */ + enforceInTransit?: (boolean|null); } /** Represents a MessageStoragePolicy. */ @@ -255,6 +258,9 @@ export namespace google { /** MessageStoragePolicy allowedPersistenceRegions. */ public allowedPersistenceRegions: string[]; + /** MessageStoragePolicy enforceInTransit. */ + public enforceInTransit: boolean; + /** * Creates a new MessageStoragePolicy instance using the specified properties. * @param [properties] Properties to set @@ -448,6 +454,243 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + /** Properties of an IngestionDataSourceSettings. */ + interface IIngestionDataSourceSettings { + + /** IngestionDataSourceSettings awsKinesis */ + awsKinesis?: (google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis|null); + } + + /** Represents an IngestionDataSourceSettings. */ + class IngestionDataSourceSettings implements IIngestionDataSourceSettings { + + /** + * Constructs a new IngestionDataSourceSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IIngestionDataSourceSettings); + + /** IngestionDataSourceSettings awsKinesis. */ + public awsKinesis?: (google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis|null); + + /** IngestionDataSourceSettings source. */ + public source?: "awsKinesis"; + + /** + * Creates a new IngestionDataSourceSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns IngestionDataSourceSettings instance + */ + public static create(properties?: google.pubsub.v1.IIngestionDataSourceSettings): google.pubsub.v1.IngestionDataSourceSettings; + + /** + * Encodes the specified IngestionDataSourceSettings message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.verify|verify} messages. + * @param message IngestionDataSourceSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IIngestionDataSourceSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified IngestionDataSourceSettings message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.verify|verify} messages. + * @param message IngestionDataSourceSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IIngestionDataSourceSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an IngestionDataSourceSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns IngestionDataSourceSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings; + + /** + * Decodes an IngestionDataSourceSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns IngestionDataSourceSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings; + + /** + * Verifies an IngestionDataSourceSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an IngestionDataSourceSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns IngestionDataSourceSettings + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings; + + /** + * Creates a plain object from an IngestionDataSourceSettings message. Also converts values to other types if specified. + * @param message IngestionDataSourceSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this IngestionDataSourceSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for IngestionDataSourceSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace IngestionDataSourceSettings { + + /** Properties of an AwsKinesis. */ + interface IAwsKinesis { + + /** AwsKinesis state */ + state?: (google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State|null); + + /** AwsKinesis streamArn */ + streamArn?: (string|null); + + /** AwsKinesis consumerArn */ + consumerArn?: (string|null); + + /** AwsKinesis awsRoleArn */ + awsRoleArn?: (string|null); + + /** AwsKinesis gcpServiceAccount */ + gcpServiceAccount?: (string|null); + } + + /** Represents an AwsKinesis. */ + class AwsKinesis implements IAwsKinesis { + + /** + * Constructs a new AwsKinesis. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis); + + /** AwsKinesis state. */ + public state: (google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State); + + /** AwsKinesis streamArn. */ + public streamArn: string; + + /** AwsKinesis consumerArn. */ + public consumerArn: string; + + /** AwsKinesis awsRoleArn. */ + public awsRoleArn: string; + + /** AwsKinesis gcpServiceAccount. */ + public gcpServiceAccount: string; + + /** + * Creates a new AwsKinesis instance using the specified properties. + * @param [properties] Properties to set + * @returns AwsKinesis instance + */ + public static create(properties?: google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis): google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis; + + /** + * Encodes the specified AwsKinesis message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.verify|verify} messages. + * @param message AwsKinesis message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AwsKinesis message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.verify|verify} messages. + * @param message AwsKinesis message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AwsKinesis message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AwsKinesis + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis; + + /** + * Decodes an AwsKinesis message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AwsKinesis + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis; + + /** + * Verifies an AwsKinesis message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AwsKinesis message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AwsKinesis + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis; + + /** + * Creates a plain object from an AwsKinesis message. Also converts values to other types if specified. + * @param message AwsKinesis + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AwsKinesis to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AwsKinesis + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace AwsKinesis { + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + KINESIS_PERMISSION_DENIED = 2, + PUBLISH_PERMISSION_DENIED = 3, + STREAM_NOT_FOUND = 4, + CONSUMER_NOT_FOUND = 5 + } + } + } + /** Properties of a Topic. */ interface ITopic { @@ -471,6 +714,12 @@ export namespace google { /** Topic messageRetentionDuration */ messageRetentionDuration?: (google.protobuf.IDuration|null); + + /** Topic state */ + state?: (google.pubsub.v1.Topic.State|keyof typeof google.pubsub.v1.Topic.State|null); + + /** Topic ingestionDataSourceSettings */ + ingestionDataSourceSettings?: (google.pubsub.v1.IIngestionDataSourceSettings|null); } /** Represents a Topic. */ @@ -503,6 +752,12 @@ export namespace google { /** Topic messageRetentionDuration. */ public messageRetentionDuration?: (google.protobuf.IDuration|null); + /** Topic state. */ + public state: (google.pubsub.v1.Topic.State|keyof typeof google.pubsub.v1.Topic.State); + + /** Topic ingestionDataSourceSettings. */ + public ingestionDataSourceSettings?: (google.pubsub.v1.IIngestionDataSourceSettings|null); + /** * Creates a new Topic instance using the specified properties. * @param [properties] Properties to set @@ -581,6 +836,16 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + namespace Topic { + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + INGESTION_RESOURCE_ERROR = 2 + } + } + /** Properties of a PubsubMessage. */ interface IPubsubMessage { @@ -3451,7 +3716,8 @@ export namespace google { ACTIVE = 1, PERMISSION_DENIED = 2, NOT_FOUND = 3, - SCHEMA_MISMATCH = 4 + SCHEMA_MISMATCH = 4, + IN_TRANSIT_LOCATION_RESTRICTION = 5 } } @@ -3792,7 +4058,8 @@ export namespace google { STATE_UNSPECIFIED = 0, ACTIVE = 1, PERMISSION_DENIED = 2, - NOT_FOUND = 3 + NOT_FOUND = 3, + IN_TRANSIT_LOCATION_RESTRICTION = 4 } } diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index b4d71be6638..fa620f8e5fe 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -396,6 +396,7 @@ * @memberof google.pubsub.v1 * @interface IMessageStoragePolicy * @property {Array.|null} [allowedPersistenceRegions] MessageStoragePolicy allowedPersistenceRegions + * @property {boolean|null} [enforceInTransit] MessageStoragePolicy enforceInTransit */ /** @@ -422,6 +423,14 @@ */ MessageStoragePolicy.prototype.allowedPersistenceRegions = $util.emptyArray; + /** + * MessageStoragePolicy enforceInTransit. + * @member {boolean} enforceInTransit + * @memberof google.pubsub.v1.MessageStoragePolicy + * @instance + */ + MessageStoragePolicy.prototype.enforceInTransit = false; + /** * Creates a new MessageStoragePolicy instance using the specified properties. * @function create @@ -449,6 +458,8 @@ if (message.allowedPersistenceRegions != null && message.allowedPersistenceRegions.length) for (var i = 0; i < message.allowedPersistenceRegions.length; ++i) writer.uint32(/* id 1, wireType 2 =*/10).string(message.allowedPersistenceRegions[i]); + if (message.enforceInTransit != null && Object.hasOwnProperty.call(message, "enforceInTransit")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.enforceInTransit); return writer; }; @@ -489,6 +500,10 @@ message.allowedPersistenceRegions.push(reader.string()); break; } + case 2: { + message.enforceInTransit = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -531,6 +546,9 @@ if (!$util.isString(message.allowedPersistenceRegions[i])) return "allowedPersistenceRegions: string[] expected"; } + if (message.enforceInTransit != null && message.hasOwnProperty("enforceInTransit")) + if (typeof message.enforceInTransit !== "boolean") + return "enforceInTransit: boolean expected"; return null; }; @@ -553,6 +571,8 @@ for (var i = 0; i < object.allowedPersistenceRegions.length; ++i) message.allowedPersistenceRegions[i] = String(object.allowedPersistenceRegions[i]); } + if (object.enforceInTransit != null) + message.enforceInTransit = Boolean(object.enforceInTransit); return message; }; @@ -571,11 +591,15 @@ var object = {}; if (options.arrays || options.defaults) object.allowedPersistenceRegions = []; + if (options.defaults) + object.enforceInTransit = false; if (message.allowedPersistenceRegions && message.allowedPersistenceRegions.length) { object.allowedPersistenceRegions = []; for (var j = 0; j < message.allowedPersistenceRegions.length; ++j) object.allowedPersistenceRegions[j] = message.allowedPersistenceRegions[j]; } + if (message.enforceInTransit != null && message.hasOwnProperty("enforceInTransit")) + object.enforceInTransit = message.enforceInTransit; return object; }; @@ -905,6 +929,590 @@ return SchemaSettings; })(); + v1.IngestionDataSourceSettings = (function() { + + /** + * Properties of an IngestionDataSourceSettings. + * @memberof google.pubsub.v1 + * @interface IIngestionDataSourceSettings + * @property {google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis|null} [awsKinesis] IngestionDataSourceSettings awsKinesis + */ + + /** + * Constructs a new IngestionDataSourceSettings. + * @memberof google.pubsub.v1 + * @classdesc Represents an IngestionDataSourceSettings. + * @implements IIngestionDataSourceSettings + * @constructor + * @param {google.pubsub.v1.IIngestionDataSourceSettings=} [properties] Properties to set + */ + function IngestionDataSourceSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * IngestionDataSourceSettings awsKinesis. + * @member {google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis|null|undefined} awsKinesis + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @instance + */ + IngestionDataSourceSettings.prototype.awsKinesis = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * IngestionDataSourceSettings source. + * @member {"awsKinesis"|undefined} source + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @instance + */ + Object.defineProperty(IngestionDataSourceSettings.prototype, "source", { + get: $util.oneOfGetter($oneOfFields = ["awsKinesis"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new IngestionDataSourceSettings instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {google.pubsub.v1.IIngestionDataSourceSettings=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings} IngestionDataSourceSettings instance + */ + IngestionDataSourceSettings.create = function create(properties) { + return new IngestionDataSourceSettings(properties); + }; + + /** + * Encodes the specified IngestionDataSourceSettings message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {google.pubsub.v1.IIngestionDataSourceSettings} message IngestionDataSourceSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + IngestionDataSourceSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.awsKinesis != null && Object.hasOwnProperty.call(message, "awsKinesis")) + $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.encode(message.awsKinesis, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified IngestionDataSourceSettings message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {google.pubsub.v1.IIngestionDataSourceSettings} message IngestionDataSourceSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + IngestionDataSourceSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an IngestionDataSourceSettings message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings} IngestionDataSourceSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + IngestionDataSourceSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.awsKinesis = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an IngestionDataSourceSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings} IngestionDataSourceSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + IngestionDataSourceSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an IngestionDataSourceSettings message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + IngestionDataSourceSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.awsKinesis != null && message.hasOwnProperty("awsKinesis")) { + properties.source = 1; + { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.verify(message.awsKinesis); + if (error) + return "awsKinesis." + error; + } + } + return null; + }; + + /** + * Creates an IngestionDataSourceSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings} IngestionDataSourceSettings + */ + IngestionDataSourceSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings) + return object; + var message = new $root.google.pubsub.v1.IngestionDataSourceSettings(); + if (object.awsKinesis != null) { + if (typeof object.awsKinesis !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.awsKinesis: object expected"); + message.awsKinesis = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.fromObject(object.awsKinesis); + } + return message; + }; + + /** + * Creates a plain object from an IngestionDataSourceSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings} message IngestionDataSourceSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + IngestionDataSourceSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (message.awsKinesis != null && message.hasOwnProperty("awsKinesis")) { + object.awsKinesis = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.toObject(message.awsKinesis, options); + if (options.oneofs) + object.source = "awsKinesis"; + } + return object; + }; + + /** + * Converts this IngestionDataSourceSettings to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @instance + * @returns {Object.} JSON object + */ + IngestionDataSourceSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for IngestionDataSourceSettings + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + IngestionDataSourceSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings"; + }; + + IngestionDataSourceSettings.AwsKinesis = (function() { + + /** + * Properties of an AwsKinesis. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @interface IAwsKinesis + * @property {google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State|null} [state] AwsKinesis state + * @property {string|null} [streamArn] AwsKinesis streamArn + * @property {string|null} [consumerArn] AwsKinesis consumerArn + * @property {string|null} [awsRoleArn] AwsKinesis awsRoleArn + * @property {string|null} [gcpServiceAccount] AwsKinesis gcpServiceAccount + */ + + /** + * Constructs a new AwsKinesis. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @classdesc Represents an AwsKinesis. + * @implements IAwsKinesis + * @constructor + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis=} [properties] Properties to set + */ + function AwsKinesis(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * AwsKinesis state. + * @member {google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State} state + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @instance + */ + AwsKinesis.prototype.state = 0; + + /** + * AwsKinesis streamArn. + * @member {string} streamArn + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @instance + */ + AwsKinesis.prototype.streamArn = ""; + + /** + * AwsKinesis consumerArn. + * @member {string} consumerArn + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @instance + */ + AwsKinesis.prototype.consumerArn = ""; + + /** + * AwsKinesis awsRoleArn. + * @member {string} awsRoleArn + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @instance + */ + AwsKinesis.prototype.awsRoleArn = ""; + + /** + * AwsKinesis gcpServiceAccount. + * @member {string} gcpServiceAccount + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @instance + */ + AwsKinesis.prototype.gcpServiceAccount = ""; + + /** + * Creates a new AwsKinesis instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis} AwsKinesis instance + */ + AwsKinesis.create = function create(properties) { + return new AwsKinesis(properties); + }; + + /** + * Encodes the specified AwsKinesis message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis} message AwsKinesis message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AwsKinesis.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.state); + if (message.streamArn != null && Object.hasOwnProperty.call(message, "streamArn")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.streamArn); + if (message.consumerArn != null && Object.hasOwnProperty.call(message, "consumerArn")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.consumerArn); + if (message.awsRoleArn != null && Object.hasOwnProperty.call(message, "awsRoleArn")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.awsRoleArn); + if (message.gcpServiceAccount != null && Object.hasOwnProperty.call(message, "gcpServiceAccount")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.gcpServiceAccount); + return writer; + }; + + /** + * Encodes the specified AwsKinesis message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis} message AwsKinesis message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AwsKinesis.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AwsKinesis message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis} AwsKinesis + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AwsKinesis.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.state = reader.int32(); + break; + } + case 2: { + message.streamArn = reader.string(); + break; + } + case 3: { + message.consumerArn = reader.string(); + break; + } + case 4: { + message.awsRoleArn = reader.string(); + break; + } + case 5: { + message.gcpServiceAccount = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AwsKinesis message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis} AwsKinesis + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AwsKinesis.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AwsKinesis message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AwsKinesis.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + if (message.streamArn != null && message.hasOwnProperty("streamArn")) + if (!$util.isString(message.streamArn)) + return "streamArn: string expected"; + if (message.consumerArn != null && message.hasOwnProperty("consumerArn")) + if (!$util.isString(message.consumerArn)) + return "consumerArn: string expected"; + if (message.awsRoleArn != null && message.hasOwnProperty("awsRoleArn")) + if (!$util.isString(message.awsRoleArn)) + return "awsRoleArn: string expected"; + if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) + if (!$util.isString(message.gcpServiceAccount)) + return "gcpServiceAccount: string expected"; + return null; + }; + + /** + * Creates an AwsKinesis message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis} AwsKinesis + */ + AwsKinesis.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis) + return object; + var message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis(); + switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "KINESIS_PERMISSION_DENIED": + case 2: + message.state = 2; + break; + case "PUBLISH_PERMISSION_DENIED": + case 3: + message.state = 3; + break; + case "STREAM_NOT_FOUND": + case 4: + message.state = 4; + break; + case "CONSUMER_NOT_FOUND": + case 5: + message.state = 5; + break; + } + if (object.streamArn != null) + message.streamArn = String(object.streamArn); + if (object.consumerArn != null) + message.consumerArn = String(object.consumerArn); + if (object.awsRoleArn != null) + message.awsRoleArn = String(object.awsRoleArn); + if (object.gcpServiceAccount != null) + message.gcpServiceAccount = String(object.gcpServiceAccount); + return message; + }; + + /** + * Creates a plain object from an AwsKinesis message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis} message AwsKinesis + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AwsKinesis.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.streamArn = ""; + object.consumerArn = ""; + object.awsRoleArn = ""; + object.gcpServiceAccount = ""; + } + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State[message.state] : message.state; + if (message.streamArn != null && message.hasOwnProperty("streamArn")) + object.streamArn = message.streamArn; + if (message.consumerArn != null && message.hasOwnProperty("consumerArn")) + object.consumerArn = message.consumerArn; + if (message.awsRoleArn != null && message.hasOwnProperty("awsRoleArn")) + object.awsRoleArn = message.awsRoleArn; + if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) + object.gcpServiceAccount = message.gcpServiceAccount; + return object; + }; + + /** + * Converts this AwsKinesis to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @instance + * @returns {Object.} JSON object + */ + AwsKinesis.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AwsKinesis + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AwsKinesis.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis"; + }; + + /** + * State enum. + * @name google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} KINESIS_PERMISSION_DENIED=2 KINESIS_PERMISSION_DENIED value + * @property {number} PUBLISH_PERMISSION_DENIED=3 PUBLISH_PERMISSION_DENIED value + * @property {number} STREAM_NOT_FOUND=4 STREAM_NOT_FOUND value + * @property {number} CONSUMER_NOT_FOUND=5 CONSUMER_NOT_FOUND value + */ + AwsKinesis.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "KINESIS_PERMISSION_DENIED"] = 2; + values[valuesById[3] = "PUBLISH_PERMISSION_DENIED"] = 3; + values[valuesById[4] = "STREAM_NOT_FOUND"] = 4; + values[valuesById[5] = "CONSUMER_NOT_FOUND"] = 5; + return values; + })(); + + return AwsKinesis; + })(); + + return IngestionDataSourceSettings; + })(); + v1.Topic = (function() { /** @@ -918,6 +1526,8 @@ * @property {google.pubsub.v1.ISchemaSettings|null} [schemaSettings] Topic schemaSettings * @property {boolean|null} [satisfiesPzs] Topic satisfiesPzs * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Topic messageRetentionDuration + * @property {google.pubsub.v1.Topic.State|null} [state] Topic state + * @property {google.pubsub.v1.IIngestionDataSourceSettings|null} [ingestionDataSourceSettings] Topic ingestionDataSourceSettings */ /** @@ -992,6 +1602,22 @@ */ Topic.prototype.messageRetentionDuration = null; + /** + * Topic state. + * @member {google.pubsub.v1.Topic.State} state + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.state = 0; + + /** + * Topic ingestionDataSourceSettings. + * @member {google.pubsub.v1.IIngestionDataSourceSettings|null|undefined} ingestionDataSourceSettings + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.ingestionDataSourceSettings = null; + /** * Creates a new Topic instance using the specified properties. * @function create @@ -1031,6 +1657,10 @@ writer.uint32(/* id 7, wireType 0 =*/56).bool(message.satisfiesPzs); if (message.messageRetentionDuration != null && Object.hasOwnProperty.call(message, "messageRetentionDuration")) $root.google.protobuf.Duration.encode(message.messageRetentionDuration, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 9, wireType 0 =*/72).int32(message.state); + if (message.ingestionDataSourceSettings != null && Object.hasOwnProperty.call(message, "ingestionDataSourceSettings")) + $root.google.pubsub.v1.IngestionDataSourceSettings.encode(message.ingestionDataSourceSettings, writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim(); return writer; }; @@ -1112,6 +1742,14 @@ message.messageRetentionDuration = $root.google.protobuf.Duration.decode(reader, reader.uint32()); break; } + case 9: { + message.state = reader.int32(); + break; + } + case 10: { + message.ingestionDataSourceSettings = $root.google.pubsub.v1.IngestionDataSourceSettings.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -1179,6 +1817,20 @@ if (error) return "messageRetentionDuration." + error; } + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.ingestionDataSourceSettings != null && message.hasOwnProperty("ingestionDataSourceSettings")) { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.verify(message.ingestionDataSourceSettings); + if (error) + return "ingestionDataSourceSettings." + error; + } return null; }; @@ -1222,6 +1874,31 @@ throw TypeError(".google.pubsub.v1.Topic.messageRetentionDuration: object expected"); message.messageRetentionDuration = $root.google.protobuf.Duration.fromObject(object.messageRetentionDuration); } + switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "INGESTION_RESOURCE_ERROR": + case 2: + message.state = 2; + break; + } + if (object.ingestionDataSourceSettings != null) { + if (typeof object.ingestionDataSourceSettings !== "object") + throw TypeError(".google.pubsub.v1.Topic.ingestionDataSourceSettings: object expected"); + message.ingestionDataSourceSettings = $root.google.pubsub.v1.IngestionDataSourceSettings.fromObject(object.ingestionDataSourceSettings); + } return message; }; @@ -1247,6 +1924,8 @@ object.schemaSettings = null; object.satisfiesPzs = false; object.messageRetentionDuration = null; + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.ingestionDataSourceSettings = null; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -1266,6 +1945,10 @@ object.satisfiesPzs = message.satisfiesPzs; if (message.messageRetentionDuration != null && message.hasOwnProperty("messageRetentionDuration")) object.messageRetentionDuration = $root.google.protobuf.Duration.toObject(message.messageRetentionDuration, options); + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.Topic.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.Topic.State[message.state] : message.state; + if (message.ingestionDataSourceSettings != null && message.hasOwnProperty("ingestionDataSourceSettings")) + object.ingestionDataSourceSettings = $root.google.pubsub.v1.IngestionDataSourceSettings.toObject(message.ingestionDataSourceSettings, options); return object; }; @@ -1295,6 +1978,22 @@ return typeUrlPrefix + "/google.pubsub.v1.Topic"; }; + /** + * State enum. + * @name google.pubsub.v1.Topic.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} INGESTION_RESOURCE_ERROR=2 INGESTION_RESOURCE_ERROR value + */ + Topic.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "INGESTION_RESOURCE_ERROR"] = 2; + return values; + })(); + return Topic; })(); @@ -7783,6 +8482,7 @@ case 2: case 3: case 4: + case 5: break; } if (message.useTableSchema != null && message.hasOwnProperty("useTableSchema")) @@ -7838,6 +8538,10 @@ case 4: message.state = 4; break; + case "IN_TRANSIT_LOCATION_RESTRICTION": + case 5: + message.state = 5; + break; } if (object.useTableSchema != null) message.useTableSchema = Boolean(object.useTableSchema); @@ -7915,6 +8619,7 @@ * @property {number} PERMISSION_DENIED=2 PERMISSION_DENIED value * @property {number} NOT_FOUND=3 NOT_FOUND value * @property {number} SCHEMA_MISMATCH=4 SCHEMA_MISMATCH value + * @property {number} IN_TRANSIT_LOCATION_RESTRICTION=5 IN_TRANSIT_LOCATION_RESTRICTION value */ BigQueryConfig.State = (function() { var valuesById = {}, values = Object.create(valuesById); @@ -7923,6 +8628,7 @@ values[valuesById[2] = "PERMISSION_DENIED"] = 2; values[valuesById[3] = "NOT_FOUND"] = 3; values[valuesById[4] = "SCHEMA_MISMATCH"] = 4; + values[valuesById[5] = "IN_TRANSIT_LOCATION_RESTRICTION"] = 5; return values; })(); @@ -8223,6 +8929,7 @@ case 1: case 2: case 3: + case 4: break; } return null; @@ -8293,6 +9000,10 @@ case 3: message.state = 3; break; + case "IN_TRANSIT_LOCATION_RESTRICTION": + case 4: + message.state = 4; + break; } return message; }; @@ -8762,6 +9473,7 @@ * @property {number} ACTIVE=1 ACTIVE value * @property {number} PERMISSION_DENIED=2 PERMISSION_DENIED value * @property {number} NOT_FOUND=3 NOT_FOUND value + * @property {number} IN_TRANSIT_LOCATION_RESTRICTION=4 IN_TRANSIT_LOCATION_RESTRICTION value */ CloudStorageConfig.State = (function() { var valuesById = {}, values = Object.create(valuesById); @@ -8769,6 +9481,7 @@ values[valuesById[1] = "ACTIVE"] = 1; values[valuesById[2] = "PERMISSION_DENIED"] = 2; values[valuesById[3] = "NOT_FOUND"] = 3; + values[valuesById[4] = "IN_TRANSIT_LOCATION_RESTRICTION"] = 4; return values; })(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 3cdd783dd28..9fecd46b31c 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -193,7 +193,17 @@ "allowedPersistenceRegions": { "rule": "repeated", "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "enforceInTransit": { + "type": "bool", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -209,15 +219,95 @@ }, "encoding": { "type": "Encoding", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "firstRevisionId": { "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "lastRevisionId": { "type": "string", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + } + }, + "IngestionDataSourceSettings": { + "oneofs": { + "source": { + "oneof": [ + "awsKinesis" + ] + } + }, + "fields": { + "awsKinesis": { + "type": "AwsKinesis", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + }, + "nested": { + "AwsKinesis": { + "fields": { + "state": { + "type": "State", + "id": 1, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + }, + "streamArn": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "consumerArn": { + "type": "string", + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "awsRoleArn": { + "type": "string", + "id": 4, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "gcpServiceAccount": { + "type": "string", + "id": 5, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + }, + "nested": { + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "KINESIS_PERMISSION_DENIED": 2, + "PUBLISH_PERMISSION_DENIED": 3, + "STREAM_NOT_FOUND": 4, + "CONSUMER_NOT_FOUND": 5 + } + } + } } } }, @@ -237,27 +327,68 @@ "labels": { "keyType": "string", "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "messageStoragePolicy": { "type": "MessageStoragePolicy", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "kmsKeyName": { "type": "string", - "id": 5 + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "schemaSettings": { "type": "SchemaSettings", - "id": 6 + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "satisfiesPzs": { "type": "bool", - "id": 7 + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "messageRetentionDuration": { "type": "google.protobuf.Duration", - "id": 8 + "id": 8, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "state": { + "type": "State", + "id": 9, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + }, + "ingestionDataSourceSettings": { + "type": "IngestionDataSourceSettings", + "id": 10, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + }, + "nested": { + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "INGESTION_RESOURCE_ERROR": 2 + } } } }, @@ -265,12 +396,18 @@ "fields": { "data": { "type": "bytes", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "attributes": { "keyType": "string", "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "messageId": { "type": "string", @@ -282,7 +419,10 @@ }, "orderingKey": { "type": "string", - "id": 5 + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -341,7 +481,10 @@ "messageIds": { "rule": "repeated", "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -357,11 +500,17 @@ }, "pageSize": { "type": "int32", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "pageToken": { "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -370,11 +519,17 @@ "topics": { "rule": "repeated", "type": "Topic", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "nextPageToken": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -390,11 +545,17 @@ }, "pageSize": { "type": "int32", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "pageToken": { "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -405,12 +566,16 @@ "type": "string", "id": 1, "options": { + "(google.api.field_behavior)": "OPTIONAL", "(google.api.resource_reference).type": "pubsub.googleapis.com/Subscription" } }, "nextPageToken": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -426,11 +591,17 @@ }, "pageSize": { "type": "int32", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "pageToken": { "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -439,11 +610,17 @@ "snapshots": { "rule": "repeated", "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "nextPageToken": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -798,60 +975,102 @@ }, "pushConfig": { "type": "PushConfig", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "bigqueryConfig": { "type": "BigQueryConfig", - "id": 18 + "id": 18, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "cloudStorageConfig": { "type": "CloudStorageConfig", - "id": 22 + "id": 22, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "ackDeadlineSeconds": { "type": "int32", - "id": 5 + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "retainAckedMessages": { "type": "bool", - "id": 7 + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "messageRetentionDuration": { "type": "google.protobuf.Duration", - "id": 8 + "id": 8, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "labels": { "keyType": "string", "type": "string", - "id": 9 + "id": 9, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "enableMessageOrdering": { "type": "bool", - "id": 10 + "id": 10, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "expirationPolicy": { "type": "ExpirationPolicy", - "id": 11 + "id": 11, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "filter": { "type": "string", - "id": 12 + "id": 12, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "deadLetterPolicy": { "type": "DeadLetterPolicy", - "id": 13 + "id": 13, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "retryPolicy": { "type": "RetryPolicy", - "id": 14 + "id": 14, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "detached": { "type": "bool", - "id": 15 + "id": 15, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "enableExactlyOnceDelivery": { "type": "bool", - "id": 16 + "id": 16, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "topicMessageRetentionDuration": { "type": "google.protobuf.Duration", @@ -882,11 +1101,17 @@ "fields": { "minimumBackoff": { "type": "google.protobuf.Duration", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "maximumBackoff": { "type": "google.protobuf.Duration", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -894,11 +1119,17 @@ "fields": { "deadLetterTopic": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "maxDeliveryAttempts": { "type": "int32", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -906,7 +1137,10 @@ "fields": { "ttl": { "type": "google.protobuf.Duration", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -927,24 +1161,39 @@ "fields": { "pushEndpoint": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "attributes": { "keyType": "string", "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "oidcToken": { "type": "OidcToken", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "pubsubWrapper": { "type": "PubsubWrapper", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "noWrapper": { "type": "NoWrapper", - "id": 5 + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -952,11 +1201,17 @@ "fields": { "serviceAccountEmail": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "audience": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -967,7 +1222,10 @@ "fields": { "writeMetadata": { "type": "bool", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } } @@ -977,7 +1235,10 @@ "fields": { "table": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "useTopicSchema": { "type": "bool", @@ -988,11 +1249,17 @@ }, "writeMetadata": { "type": "bool", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "dropUnknownFields": { "type": "bool", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "state": { "type": "State", @@ -1016,7 +1283,8 @@ "ACTIVE": 1, "PERMISSION_DENIED": 2, "NOT_FOUND": 3, - "SCHEMA_MISMATCH": 4 + "SCHEMA_MISMATCH": 4, + "IN_TRANSIT_LOCATION_RESTRICTION": 5 } } } @@ -1040,27 +1308,45 @@ }, "filenamePrefix": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "filenameSuffix": { "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "textConfig": { "type": "TextConfig", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "avroConfig": { "type": "AvroConfig", - "id": 5 + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "maxDuration": { "type": "google.protobuf.Duration", - "id": 6 + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "maxBytes": { "type": "int64", - "id": 7 + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "state": { "type": "State", @@ -1078,7 +1364,10 @@ "fields": { "writeMetadata": { "type": "bool", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1087,7 +1376,8 @@ "STATE_UNSPECIFIED": 0, "ACTIVE": 1, "PERMISSION_DENIED": 2, - "NOT_FOUND": 3 + "NOT_FOUND": 3, + "IN_TRANSIT_LOCATION_RESTRICTION": 4 } } } @@ -1096,15 +1386,24 @@ "fields": { "ackId": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "message": { "type": "PubsubMessage", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "deliveryAttempt": { "type": "int32", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1150,11 +1449,17 @@ }, "pageSize": { "type": "int32", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "pageToken": { "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1163,11 +1468,17 @@ "subscriptions": { "rule": "repeated", "type": "Subscription", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "nextPageToken": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1234,7 +1545,10 @@ "receivedMessages": { "rule": "repeated", "type": "ReceivedMessage", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1298,17 +1612,26 @@ "ackIds": { "rule": "repeated", "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "modifyDeadlineSeconds": { "rule": "repeated", "type": "int32", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "modifyDeadlineAckIds": { "rule": "repeated", "type": "string", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "streamAckDeadlineSeconds": { "type": "int32", @@ -1319,15 +1642,24 @@ }, "clientId": { "type": "string", - "id": 6 + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "maxOutstandingMessages": { "type": "int64", - "id": 7 + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "maxOutstandingBytes": { "type": "int64", - "id": 8 + "id": 8, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1336,19 +1668,31 @@ "receivedMessages": { "rule": "repeated", "type": "ReceivedMessage", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "acknowledgeConfirmation": { "type": "AcknowledgeConfirmation", - "id": 5 + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "modifyAckDeadlineConfirmation": { "type": "ModifyAckDeadlineConfirmation", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "subscriptionProperties": { "type": "SubscriptionProperties", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -1357,22 +1701,34 @@ "ackIds": { "rule": "repeated", "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "invalidAckIds": { "rule": "repeated", "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "unorderedAckIds": { "rule": "repeated", "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "temporaryFailedAckIds": { "rule": "repeated", "type": "string", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1381,17 +1737,26 @@ "ackIds": { "rule": "repeated", "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "invalidAckIds": { "rule": "repeated", "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "temporaryFailedAckIds": { "rule": "repeated", "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1399,11 +1764,17 @@ "fields": { "exactlyOnceDeliveryEnabled": { "type": "bool", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "messageOrderingEnabled": { "type": "bool", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } } @@ -1430,7 +1801,10 @@ "labels": { "keyType": "string", "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1460,23 +1834,33 @@ "fields": { "name": { "type": "string", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "topic": { "type": "string", "id": 2, "options": { + "(google.api.field_behavior)": "OPTIONAL", "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" } }, "expireTime": { "type": "google.protobuf.Timestamp", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "labels": { "keyType": "string", "type": "string", - "id": 4 + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1504,11 +1888,17 @@ }, "pageSize": { "type": "int32", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "pageToken": { "type": "string", - "id": 3 + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1517,11 +1907,17 @@ "snapshots": { "rule": "repeated", "type": "Snapshot", - "id": 1 + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "nextPageToken": { "type": "string", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1557,12 +1953,16 @@ }, "time": { "type": "google.protobuf.Timestamp", - "id": 2 + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } }, "snapshot": { "type": "string", "id": 3, "options": { + "(google.api.field_behavior)": "OPTIONAL", "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" } } diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 33e4e85db7b..d08e1213937 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -397,32 +397,38 @@ export class PublisherClient { * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent * signs (`%`). It must be between 3 and 255 characters in length, and it * must not start with `"goog"`. - * @param {number[]} request.labels - * See [Creating and managing labels] + * @param {number[]} [request.labels] + * Optional. See [Creating and managing labels] * (https://cloud.google.com/pubsub/docs/labels). - * @param {google.pubsub.v1.MessageStoragePolicy} request.messageStoragePolicy - * Policy constraining the set of Google Cloud Platform regions where messages - * published to the topic may be stored. If not present, then no constraints - * are in effect. - * @param {string} request.kmsKeyName - * The resource name of the Cloud KMS CryptoKey to be used to protect access - * to messages published on this topic. + * @param {google.pubsub.v1.MessageStoragePolicy} [request.messageStoragePolicy] + * Optional. Policy constraining the set of Google Cloud Platform regions + * where messages published to the topic may be stored. If not present, then + * no constraints are in effect. + * @param {string} [request.kmsKeyName] + * Optional. The resource name of the Cloud KMS CryptoKey to be used to + * protect access to messages published on this topic. * * The expected format is `projects/* /locations/* /keyRings/* /cryptoKeys/*`. - * @param {google.pubsub.v1.SchemaSettings} request.schemaSettings - * Settings for validating messages published against a schema. - * @param {boolean} request.satisfiesPzs - * Reserved for future use. This field is set only in responses from the - * server; it is ignored if it is set in any requests. - * @param {google.protobuf.Duration} request.messageRetentionDuration - * Indicates the minimum duration to retain a message after it is published to - * the topic. If this field is set, messages published to the topic in the - * last `message_retention_duration` are always available to subscribers. For - * instance, it allows any attached subscription to [seek to a + * @param {google.pubsub.v1.SchemaSettings} [request.schemaSettings] + * Optional. Settings for validating messages published against a schema. + * @param {boolean} [request.satisfiesPzs] + * Optional. Reserved for future use. This field is set only in responses from + * the server; it is ignored if it is set in any requests. + * @param {google.protobuf.Duration} [request.messageRetentionDuration] + * Optional. Indicates the minimum duration to retain a message after it is + * published to the topic. If this field is set, messages published to the + * topic in the last `message_retention_duration` are always available to + * subscribers. For instance, it allows any attached subscription to [seek to + * a * timestamp](https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) * that is up to `message_retention_duration` in the past. If this field is * not set, message retention is controlled by settings on individual * subscriptions. Cannot be more than 31 days or less than 10 minutes. + * @param {google.pubsub.v1.Topic.State} request.state + * Output only. An output-only field indicating the state of the topic. + * @param {google.pubsub.v1.IngestionDataSourceSettings} [request.ingestionDataSourceSettings] + * Optional. Settings for managed ingestion from a data source into this + * topic. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -497,8 +503,8 @@ export class PublisherClient { return this.innerApiCalls.createTopic(request, options, callback); } /** - * Updates an existing topic. Note that certain properties of a - * topic are not modifiable. + * Updates an existing topic by updating the fields specified in the update + * mask. Note that certain properties of a topic are not modifiable. * * @param {Object} request * The request object that will be sent. @@ -926,12 +932,12 @@ export class PublisherClient { * @param {string} request.project * Required. The name of the project in which to list topics. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of topics to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicsResponse`; indicates that this is - * a continuation of a prior `ListTopics` call, and that the system should - * return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of topics to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicsResponse`; indicates + * that this is a continuation of a prior `ListTopics` call, and that the + * system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1018,12 +1024,12 @@ export class PublisherClient { * @param {string} request.project * Required. The name of the project in which to list topics. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of topics to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicsResponse`; indicates that this is - * a continuation of a prior `ListTopics` call, and that the system should - * return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of topics to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicsResponse`; indicates + * that this is a continuation of a prior `ListTopics` call, and that the + * system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} @@ -1066,12 +1072,12 @@ export class PublisherClient { * @param {string} request.project * Required. The name of the project in which to list topics. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of topics to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicsResponse`; indicates that this is - * a continuation of a prior `ListTopics` call, and that the system should - * return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of topics to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicsResponse`; indicates + * that this is a continuation of a prior `ListTopics` call, and that the + * system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} @@ -1111,12 +1117,12 @@ export class PublisherClient { * @param {string} request.topic * Required. The name of the topic that subscriptions are attached to. * Format is `projects/{project}/topics/{topic}`. - * @param {number} request.pageSize - * Maximum number of subscription names to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicSubscriptionsResponse`; indicates - * that this is a continuation of a prior `ListTopicSubscriptions` call, and - * that the system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of subscription names to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicSubscriptionsResponse`; + * indicates that this is a continuation of a prior `ListTopicSubscriptions` + * call, and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1215,12 +1221,12 @@ export class PublisherClient { * @param {string} request.topic * Required. The name of the topic that subscriptions are attached to. * Format is `projects/{project}/topics/{topic}`. - * @param {number} request.pageSize - * Maximum number of subscription names to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicSubscriptionsResponse`; indicates - * that this is a continuation of a prior `ListTopicSubscriptions` call, and - * that the system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of subscription names to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicSubscriptionsResponse`; + * indicates that this is a continuation of a prior `ListTopicSubscriptions` + * call, and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} @@ -1263,12 +1269,12 @@ export class PublisherClient { * @param {string} request.topic * Required. The name of the topic that subscriptions are attached to. * Format is `projects/{project}/topics/{topic}`. - * @param {number} request.pageSize - * Maximum number of subscription names to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicSubscriptionsResponse`; indicates - * that this is a continuation of a prior `ListTopicSubscriptions` call, and - * that the system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of subscription names to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicSubscriptionsResponse`; + * indicates that this is a continuation of a prior `ListTopicSubscriptions` + * call, and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} @@ -1312,12 +1318,12 @@ export class PublisherClient { * @param {string} request.topic * Required. The name of the topic that snapshots are attached to. * Format is `projects/{project}/topics/{topic}`. - * @param {number} request.pageSize - * Maximum number of snapshot names to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicSnapshotsResponse`; indicates - * that this is a continuation of a prior `ListTopicSnapshots` call, and - * that the system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of snapshot names to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicSnapshotsResponse`; + * indicates that this is a continuation of a prior `ListTopicSnapshots` call, + * and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1406,12 +1412,12 @@ export class PublisherClient { * @param {string} request.topic * Required. The name of the topic that snapshots are attached to. * Format is `projects/{project}/topics/{topic}`. - * @param {number} request.pageSize - * Maximum number of snapshot names to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicSnapshotsResponse`; indicates - * that this is a continuation of a prior `ListTopicSnapshots` call, and - * that the system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of snapshot names to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicSnapshotsResponse`; + * indicates that this is a continuation of a prior `ListTopicSnapshots` call, + * and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} @@ -1454,12 +1460,12 @@ export class PublisherClient { * @param {string} request.topic * Required. The name of the topic that snapshots are attached to. * Format is `projects/{project}/topics/{topic}`. - * @param {number} request.pageSize - * Maximum number of snapshot names to return. - * @param {string} request.pageToken - * The value returned by the last `ListTopicSnapshotsResponse`; indicates - * that this is a continuation of a prior `ListTopicSnapshots` call, and - * that the system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of snapshot names to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListTopicSnapshotsResponse`; + * indicates that this is a continuation of a prior `ListTopicSnapshots` call, + * and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index f65bd434f41..3e86492ea36 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -378,8 +378,8 @@ export class SchemaServiceClient { * The ID to use for the schema, which will become the final component of * the schema's resource name. * - * See https://cloud.google.com/pubsub/docs/admin#resource_names for resource - * name constraints. + * See https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names for + * resource name constraints. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index bc0b4fdee20..aab6b661aab 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -221,7 +221,8 @@ export class SubscriberClient { this.descriptors.stream = { streamingPull: new this._gaxModule.StreamDescriptor( this._gaxModule.StreamType.BIDI_STREAMING, - !!opts.fallback + !!opts.fallback, + /* gaxStreamingRetries: */ true ), }; @@ -418,21 +419,21 @@ export class SubscriberClient { * Required. The name of the topic from which this subscription is receiving * messages. Format is `projects/{project}/topics/{topic}`. The value of this * field will be `_deleted-topic_` if the topic has been deleted. - * @param {google.pubsub.v1.PushConfig} request.pushConfig - * If push delivery is used with this subscription, this field is - * used to configure it. - * @param {google.pubsub.v1.BigQueryConfig} request.bigqueryConfig - * If delivery to BigQuery is used with this subscription, this field is + * @param {google.pubsub.v1.PushConfig} [request.pushConfig] + * Optional. If push delivery is used with this subscription, this field is * used to configure it. - * @param {google.pubsub.v1.CloudStorageConfig} request.cloudStorageConfig - * If delivery to Google Cloud Storage is used with this subscription, this + * @param {google.pubsub.v1.BigQueryConfig} [request.bigqueryConfig] + * Optional. If delivery to BigQuery is used with this subscription, this * field is used to configure it. - * @param {number} request.ackDeadlineSeconds - * The approximate amount of time (on a best-effort basis) Pub/Sub waits for - * the subscriber to acknowledge receipt before resending the message. In the - * interval after the message is delivered and before it is acknowledged, it - * is considered to be _outstanding_. During that time period, the - * message will not be redelivered (on a best-effort basis). + * @param {google.pubsub.v1.CloudStorageConfig} [request.cloudStorageConfig] + * Optional. If delivery to Google Cloud Storage is used with this + * subscription, this field is used to configure it. + * @param {number} [request.ackDeadlineSeconds] + * Optional. The approximate amount of time (on a best-effort basis) Pub/Sub + * waits for the subscriber to acknowledge receipt before resending the + * message. In the interval after the message is delivered and before it is + * acknowledged, it is considered to be _outstanding_. During that time + * period, the message will not be redelivered (on a best-effort basis). * * For pull subscriptions, this value is used as the initial value for the ack * deadline. To override this value for a given message, call @@ -448,68 +449,68 @@ export class SubscriberClient { * * If the subscriber never acknowledges the message, the Pub/Sub * system will eventually redeliver the message. - * @param {boolean} request.retainAckedMessages - * Indicates whether to retain acknowledged messages. If true, then + * @param {boolean} [request.retainAckedMessages] + * Optional. Indicates whether to retain acknowledged messages. If true, then * messages are not expunged from the subscription's backlog, even if they are * acknowledged, until they fall out of the `message_retention_duration` * window. This must be true if you would like to [`Seek` to a timestamp] * (https://cloud.google.com/pubsub/docs/replay-overview#seek_to_a_time) in * the past to replay previously-acknowledged messages. - * @param {google.protobuf.Duration} request.messageRetentionDuration - * How long to retain unacknowledged messages in the subscription's backlog, - * from the moment a message is published. - * If `retain_acked_messages` is true, then this also configures the retention - * of acknowledged messages, and thus configures how far back in time a `Seek` - * can be done. Defaults to 7 days. Cannot be more than 7 days or less than 10 - * minutes. - * @param {number[]} request.labels - * See [Creating and managing + * @param {google.protobuf.Duration} [request.messageRetentionDuration] + * Optional. How long to retain unacknowledged messages in the subscription's + * backlog, from the moment a message is published. If `retain_acked_messages` + * is true, then this also configures the retention of acknowledged messages, + * and thus configures how far back in time a `Seek` can be done. Defaults to + * 7 days. Cannot be more than 7 days or less than 10 minutes. + * @param {number[]} [request.labels] + * Optional. See [Creating and managing * labels](https://cloud.google.com/pubsub/docs/labels). - * @param {boolean} request.enableMessageOrdering - * If true, messages published with the same `ordering_key` in `PubsubMessage` - * will be delivered to the subscribers in the order in which they - * are received by the Pub/Sub system. Otherwise, they may be delivered in - * any order. - * @param {google.pubsub.v1.ExpirationPolicy} request.expirationPolicy - * A policy that specifies the conditions for this subscription's expiration. - * A subscription is considered active as long as any connected subscriber is - * successfully consuming messages from the subscription or is issuing - * operations on the subscription. If `expiration_policy` is not set, a - * *default policy* with `ttl` of 31 days will be used. The minimum allowed + * @param {boolean} [request.enableMessageOrdering] + * Optional. If true, messages published with the same `ordering_key` in + * `PubsubMessage` will be delivered to the subscribers in the order in which + * they are received by the Pub/Sub system. Otherwise, they may be delivered + * in any order. + * @param {google.pubsub.v1.ExpirationPolicy} [request.expirationPolicy] + * Optional. A policy that specifies the conditions for this subscription's + * expiration. A subscription is considered active as long as any connected + * subscriber is successfully consuming messages from the subscription or is + * issuing operations on the subscription. If `expiration_policy` is not set, + * a *default policy* with `ttl` of 31 days will be used. The minimum allowed * value for `expiration_policy.ttl` is 1 day. If `expiration_policy` is set, * but `expiration_policy.ttl` is not set, the subscription never expires. - * @param {string} request.filter - * An expression written in the Pub/Sub [filter + * @param {string} [request.filter] + * Optional. An expression written in the Pub/Sub [filter * language](https://cloud.google.com/pubsub/docs/filtering). If non-empty, * then only `PubsubMessage`s whose `attributes` field matches the filter are * delivered on this subscription. If empty, then no messages are filtered * out. - * @param {google.pubsub.v1.DeadLetterPolicy} request.deadLetterPolicy - * A policy that specifies the conditions for dead lettering messages in - * this subscription. If dead_letter_policy is not set, dead lettering - * is disabled. + * @param {google.pubsub.v1.DeadLetterPolicy} [request.deadLetterPolicy] + * Optional. A policy that specifies the conditions for dead lettering + * messages in this subscription. If dead_letter_policy is not set, dead + * lettering is disabled. * - * The Cloud Pub/Sub service account associated with this subscriptions's + * The Pub/Sub service account associated with this subscriptions's * parent project (i.e., * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com) must have * permission to Acknowledge() messages on this subscription. - * @param {google.pubsub.v1.RetryPolicy} request.retryPolicy - * A policy that specifies how Pub/Sub retries message delivery for this - * subscription. + * @param {google.pubsub.v1.RetryPolicy} [request.retryPolicy] + * Optional. A policy that specifies how Pub/Sub retries message delivery for + * this subscription. * * If not set, the default retry policy is applied. This generally implies * that messages will be retried as soon as possible for healthy subscribers. * RetryPolicy will be triggered on NACKs or acknowledgement deadline * exceeded events for a given message. - * @param {boolean} request.detached - * Indicates whether the subscription is detached from its topic. Detached - * subscriptions don't receive messages from their topic and don't retain any - * backlog. `Pull` and `StreamingPull` requests will return + * @param {boolean} [request.detached] + * Optional. Indicates whether the subscription is detached from its topic. + * Detached subscriptions don't receive messages from their topic and don't + * retain any backlog. `Pull` and `StreamingPull` requests will return * FAILED_PRECONDITION. If the subscription is a push subscription, pushes to * the endpoint will not be made. - * @param {boolean} request.enableExactlyOnceDelivery - * If true, Pub/Sub provides the following guarantees for the delivery of - * a message with a given value of `message_id` on this subscription: + * @param {boolean} [request.enableExactlyOnceDelivery] + * Optional. If true, Pub/Sub provides the following guarantees for the + * delivery of a message with a given value of `message_id` on this + * subscription: * * * The message sent to a subscriber is guaranteed not to be resent * before the message's acknowledgement deadline expires. @@ -684,8 +685,9 @@ export class SubscriberClient { return this.innerApiCalls.getSubscription(request, options, callback); } /** - * Updates an existing subscription. Note that certain properties of a - * subscription, such as its topic, are not modifiable. + * Updates an existing subscription by updating the fields specified in the + * update mask. Note that certain properties of a subscription, such as its + * topic, are not modifiable. * * @param {Object} request * The request object that will be sent. @@ -874,7 +876,8 @@ export class SubscriberClient { * delivery to another subscriber client. This typically results in an * increase in the rate of message redeliveries (that is, duplicates). * The minimum deadline you can specify is 0 seconds. - * The maximum deadline you can specify is 600 seconds (10 minutes). + * The maximum deadline you can specify in a single request is 600 seconds + * (10 minutes). * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1347,8 +1350,8 @@ export class SubscriberClient { * (b) Any messages published to the subscription's topic following the * successful completion of the CreateSnapshot request. * Format is `projects/{project}/subscriptions/{sub}`. - * @param {number[]} request.labels - * See [Creating and managing + * @param {number[]} [request.labels] + * Optional. See [Creating and managing * labels](https://cloud.google.com/pubsub/docs/labels). * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. @@ -1424,7 +1427,8 @@ export class SubscriberClient { return this.innerApiCalls.createSnapshot(request, options, callback); } /** - * Updates an existing snapshot. Snapshots are used in + * Updates an existing snapshot by updating the fields specified in the update + * mask. Snapshots are used in * [Seek](https://cloud.google.com/pubsub/docs/replay-overview) operations, * which allow you to manage message acknowledgments in bulk. That is, you can * set the acknowledgment state of messages in an existing subscription to the @@ -1612,8 +1616,8 @@ export class SubscriberClient { * The request object that will be sent. * @param {string} request.subscription * Required. The subscription to affect. - * @param {google.protobuf.Timestamp} request.time - * The time to seek to. + * @param {google.protobuf.Timestamp} [request.time] + * Optional. The time to seek to. * Messages retained in the subscription that were published before this * time are marked as acknowledged, and messages retained in the * subscription that were published after this time are marked as @@ -1624,10 +1628,10 @@ export class SubscriberClient { * window (or to a point before the system's notion of the subscription * creation time), only retained messages will be marked as unacknowledged, * and already-expunged messages will not be restored. - * @param {string} request.snapshot - * The snapshot to seek to. The snapshot's topic must be the same as that of - * the provided subscription. - * Format is `projects/{project}/snapshots/{snap}`. + * @param {string} [request.snapshot] + * Optional. The snapshot to seek to. The snapshot's topic must be the same + * as that of the provided subscription. Format is + * `projects/{project}/snapshots/{snap}`. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1733,12 +1737,12 @@ export class SubscriberClient { * @param {string} request.project * Required. The name of the project in which to list subscriptions. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of subscriptions to return. - * @param {string} request.pageToken - * The value returned by the last `ListSubscriptionsResponse`; indicates that - * this is a continuation of a prior `ListSubscriptions` call, and that the - * system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of subscriptions to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListSubscriptionsResponse`; + * indicates that this is a continuation of a prior `ListSubscriptions` call, + * and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1825,12 +1829,12 @@ export class SubscriberClient { * @param {string} request.project * Required. The name of the project in which to list subscriptions. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of subscriptions to return. - * @param {string} request.pageToken - * The value returned by the last `ListSubscriptionsResponse`; indicates that - * this is a continuation of a prior `ListSubscriptions` call, and that the - * system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of subscriptions to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListSubscriptionsResponse`; + * indicates that this is a continuation of a prior `ListSubscriptions` call, + * and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} @@ -1873,12 +1877,12 @@ export class SubscriberClient { * @param {string} request.project * Required. The name of the project in which to list subscriptions. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of subscriptions to return. - * @param {string} request.pageToken - * The value returned by the last `ListSubscriptionsResponse`; indicates that - * this is a continuation of a prior `ListSubscriptions` call, and that the - * system should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of subscriptions to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListSubscriptionsResponse`; + * indicates that this is a continuation of a prior `ListSubscriptions` call, + * and that the system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} @@ -1922,12 +1926,12 @@ export class SubscriberClient { * @param {string} request.project * Required. The name of the project in which to list snapshots. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of snapshots to return. - * @param {string} request.pageToken - * The value returned by the last `ListSnapshotsResponse`; indicates that this - * is a continuation of a prior `ListSnapshots` call, and that the system - * should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of snapshots to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListSnapshotsResponse`; indicates + * that this is a continuation of a prior `ListSnapshots` call, and that the + * system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -2014,12 +2018,12 @@ export class SubscriberClient { * @param {string} request.project * Required. The name of the project in which to list snapshots. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of snapshots to return. - * @param {string} request.pageToken - * The value returned by the last `ListSnapshotsResponse`; indicates that this - * is a continuation of a prior `ListSnapshots` call, and that the system - * should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of snapshots to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListSnapshotsResponse`; indicates + * that this is a continuation of a prior `ListSnapshots` call, and that the + * system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} @@ -2062,12 +2066,12 @@ export class SubscriberClient { * @param {string} request.project * Required. The name of the project in which to list snapshots. * Format is `projects/{project-id}`. - * @param {number} request.pageSize - * Maximum number of snapshots to return. - * @param {string} request.pageToken - * The value returned by the last `ListSnapshotsResponse`; indicates that this - * is a continuation of a prior `ListSnapshots` call, and that the system - * should return the next page of data. + * @param {number} [request.pageSize] + * Optional. Maximum number of snapshots to return. + * @param {string} [request.pageToken] + * Optional. The value returned by the last `ListSnapshotsResponse`; indicates + * that this is a continuation of a prior `ListSnapshots` call, and that the + * system should return the next page of data. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Object} From 8782153eb117fb46ba7a3c77f93e857e689f01cc Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:18:39 -0500 Subject: [PATCH 0992/1115] feat: add schema revision samples (#1870) This adds support for easily getting a schema gapic client, along with samples for schema revisions. --- handwritten/pubsub/.gitignore | 1 + handwritten/pubsub/README.md | 9 +++++++++ handwritten/pubsub/src/pubsub.ts | 14 ++++++++------ handwritten/pubsub/src/schema.ts | 12 +++++++++--- handwritten/pubsub/test/pubsub.ts | 10 +++++----- handwritten/pubsub/test/schema.ts | 4 +++- 6 files changed, 35 insertions(+), 15 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index d4f03a0df2e..79df0152285 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -12,3 +12,4 @@ system-test/*key.json .DS_Store package-lock.json __pycache__ +samples/build/ diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 6a2dfa06d49..9267ec11e3d 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -123,6 +123,8 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | +| Commit an Avro-Based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/commitAvroSchema.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/commitAvroSchema.js,samples/README.md) | +| Commit an Proto-Based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/commitProtoSchema.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/commitProtoSchema.js,samples/README.md) | | Create an Avro based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createAvroSchema.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/createAvroSchema.js,samples/README.md) | | Create BigQuery Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createBigQuerySubscription.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/createBigQuerySubscription.js,samples/README.md) | | Create a Proto based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createProtoSchema.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/createProtoSchema.js,samples/README.md) | @@ -136,19 +138,24 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Create Subscription With Retry Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithRetryPolicy.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/createSubscriptionWithRetryPolicy.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) | | Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | +| Create Topic With Schema Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchemaRevisions.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/createTopicWithSchemaRevisions.js,samples/README.md) | | Delete a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchema.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/deleteSchema.js,samples/README.md) | +| Delete a Schema Revision | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchemaRevision.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/deleteSchemaRevision.js,samples/README.md) | | Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | | Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | | Detach Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/detachSubscription.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/detachSubscription.js,samples/README.md) | | Get a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSchema.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/getSchema.js,samples/README.md) | +| Get a previously created schema revision | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSchemaRevision.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/getSchemaRevision.js,samples/README.md) | | Get Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSubscription.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/getSubscription.js,samples/README.md) | | Get Subscription Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSubscriptionPolicy.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/getSubscriptionPolicy.js,samples/README.md) | | Get Topic Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getTopicPolicy.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/getTopicPolicy.js,samples/README.md) | | List All Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listAllTopics.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/listAllTopics.js,samples/README.md) | +| List Revisions on a Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSchemaRevisions.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/listSchemaRevisions.js,samples/README.md) | | List schemas on a project | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSchemas.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/listSchemas.js,samples/README.md) | | List Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSubscriptions.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/listSubscriptions.js,samples/README.md) | | List Subscriptions On a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listTopicSubscriptions.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/listTopicSubscriptions.js,samples/README.md) | | 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 Avro Records With Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenForAvroRecordsWithRevisions.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/listenForAvroRecordsWithRevisions.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) | @@ -167,6 +174,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/quickstart.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/quickstart.js,samples/README.md) | | Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | | Resume Publish | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/resumePublish.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/resumePublish.js,samples/README.md) | +| Rollback a Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/rollbackSchema.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/rollbackSchema.js,samples/README.md) | | Set Subscription IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/setSubscriptionPolicy.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/setSubscriptionPolicy.js,samples/README.md) | | Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | | Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | @@ -176,6 +184,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | | Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | | Update Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateDeadLetterPolicy.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/updateDeadLetterPolicy.js,samples/README.md) | +| Update Topic Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateTopicSchema.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/updateTopicSchema.js,samples/README.md) | | Validate a schema definition | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/validateSchema.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/validateSchema.js,samples/README.md) | diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index e7fc0d81958..a0aa2876aa3 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -400,7 +400,7 @@ export class PubSub { }, }; - const client = await this.getSchemaClient_(); + const client = await this.getSchemaClient(); await client.createSchema(request, gaxOpts); return new Schema(this, schemaName); } @@ -841,7 +841,7 @@ export class PubSub { view: SchemaView = SchemaViews.Basic, options?: CallOptions ): AsyncIterable { - const client = await this.getSchemaClient_(); + const client = await this.getSchemaClient(); const query = { parent: this.name, view, @@ -1218,10 +1218,12 @@ export class PubSub { } /** - * Gets a schema client, creating one if needed. - * @private + * Gets a schema client, creating one if needed. This is a shortcut for + * `new v1.SchemaServiceClient(await pubsub.getClientConfig())`. + * + * @returns {Promise} */ - async getSchemaClient_(): Promise { + async getSchemaClient(): Promise { if (!this.schemaClient) { const options = await this.getClientConfig(); this.schemaClient = new v1.SchemaServiceClient(options); @@ -1450,7 +1452,7 @@ export class PubSub { * @returns {Promise} */ async validateSchema(schema: ISchema, gaxOpts?: CallOptions): Promise { - const client = await this.getSchemaClient_(); + const client = await this.getSchemaClient(); await client.validateSchema( { parent: this.name, diff --git a/handwritten/pubsub/src/schema.ts b/handwritten/pubsub/src/schema.ts index 93cb624af4f..a332d0affaa 100644 --- a/handwritten/pubsub/src/schema.ts +++ b/handwritten/pubsub/src/schema.ts @@ -144,7 +144,7 @@ export class Schema { view: SchemaView = SchemaViews.Full, gaxOpts?: CallOptions ): Promise { - const client = await this.pubsub.getSchemaClient_(); + const client = await this.pubsub.getSchemaClient(); const name = await this.getName(); const [schema] = await client.getSchema( { @@ -167,7 +167,7 @@ export class Schema { * @returns {Promise} */ async delete(gaxOpts?: CallOptions): Promise { - const client = await this.pubsub.getSchemaClient_(); + const client = await this.pubsub.getSchemaClient(); const name = await this.getName(); await client.deleteSchema( { @@ -202,7 +202,7 @@ export class Schema { | keyof typeof google.pubsub.v1.Encoding, gaxOpts?: CallOptions ): Promise { - const client = await this.pubsub.getSchemaClient_(); + const client = await this.pubsub.getSchemaClient(); const name = await this.getName(); await client.validateMessage( @@ -244,6 +244,7 @@ export class Schema { static metadataFromMessage(attributes: Attributes): SchemaMessageMetadata { return { name: attributes['googclient_schemaname'], + revision: attributes['googclient_schemarevisionid'], encoding: attributes[ 'googclient_schemaencoding' ] as unknown as SchemaEncoding, @@ -261,6 +262,11 @@ export interface SchemaMessageMetadata { */ name?: string; + /** + * Schema revision; this goes with {@link name} as needed. + */ + revision?: string; + /** * Encoding; this will be Encodings.Json or Encodings.Binary. */ diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 66885769014..08803c0d83b 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -1686,7 +1686,7 @@ describe('PubSub', () => { it('should close the schema client when it has been opened', async () => { // Force it to create a client. - const client = await pubsub.getSchemaClient_?.(); + const client = await pubsub.getSchemaClient?.(); sandbox.stub(client!, 'close').resolves(); await pubsub.close?.(); }); @@ -1707,7 +1707,7 @@ describe('PubSub', () => { const name = Schema.formatName_(pubsub.projectId!, schemaId); // Grab the schema client it'll be using so we can stub it. - const client = await pubsub.getSchemaClient_!(); + const client = await pubsub.getSchemaClient!(); const def = defer(); sandbox.stub(client, 'createSchema').callsFake(req => { assert.strictEqual(req.parent, pubsub.name); @@ -1726,7 +1726,7 @@ describe('PubSub', () => { it('calls down to listSchemas correctly', async () => { // Grab the schema client it'll be using so we can stub it. - const client = await pubsub.getSchemaClient_!(); + const client = await pubsub.getSchemaClient!(); sandbox.stub(client, 'listSchemasAsync').callsFake((req, gaxOpts) => { assert.strictEqual(req!.parent, pubsub.name); @@ -1754,7 +1754,7 @@ describe('PubSub', () => { it('defaults to BASIC for listSchemas', async () => { // Grab the schema client it'll be using so we can stub it. - const client = await pubsub.getSchemaClient_?.(); + const client = await pubsub.getSchemaClient?.(); sandbox.stub(client!, 'listSchemasAsync').callsFake(req => { assert.strictEqual(req!.view, 'BASIC'); @@ -1777,7 +1777,7 @@ describe('PubSub', () => { }); it('calls validateSchema() on the client when validateSchema() is called', async () => { - const client = await pubsub.getSchemaClient_!(); + const client = await pubsub.getSchemaClient!(); const ischema: ISchema = { name: 'test', type: SchemaTypes.Avro, diff --git a/handwritten/pubsub/test/schema.ts b/handwritten/pubsub/test/schema.ts index 578a1e61da6..d1e6294640e 100644 --- a/handwritten/pubsub/test/schema.ts +++ b/handwritten/pubsub/test/schema.ts @@ -49,7 +49,7 @@ describe('Schema', () => { // These depend on the create-on-first-call structure in PubSub. // If that changes, this will also need to be updated. - schemaClient = await pubsub.getSchemaClient_(); + schemaClient = await pubsub.getSchemaClient(); schema = pubsub.schema(schemaName); }); @@ -175,11 +175,13 @@ describe('Schema', () => { it('loads metadata from a received message', () => { const testAttrs = { googclient_schemaencoding: 'JSON', + googclient_schemarevisionid: 'revision', googclient_schemaname: 'foobar', }; const metadata = Schema.metadataFromMessage(testAttrs); assert.deepStrictEqual(metadata, { name: 'foobar', + revision: 'revision', encoding: 'JSON', }); }); From 720ef6fa15b6cc14be3be62654b103b86c0933eb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 31 Jan 2024 20:54:03 +0100 Subject: [PATCH 0993/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.20.0 (#1871) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.20.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4ad24e80287..cbbc91bdb6b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.6.0", - "@opentelemetry/semantic-conventions": "~1.19.0", + "@opentelemetry/semantic-conventions": "~1.20.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From f308b8ff6781168851a8e9dc25b2f784d5a77509 Mon Sep 17 00:00:00 2001 From: Richard Nias <7244202+richardnias@users.noreply.github.com> Date: Wed, 31 Jan 2024 21:24:15 +0100 Subject: [PATCH 0994/1115] docs: correct max messages (#1874) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [X] Make sure to open an issue as a [bug/issue](https://togithub.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) Fixes #1744 🦕 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. --- handwritten/pubsub/src/subscription.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index b3585b588cd..a39f66e8c60 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -161,7 +161,7 @@ export declare interface Subscription { * Upon the closing of the subscriber: * on(event: 'close', listener: Function): this; * - * By default Subscription objects allow you to process 100 messages at the same + * By default Subscription objects allow you to process 1000 messages at the same * time. You can fine tune this value by adjusting the * `options.flowControl.maxMessages` option. * From 06ff4537e9ea060bbf87ab440f9618d07c59f893 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 1 Feb 2024 10:50:15 +0100 Subject: [PATCH 0995/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.21.0 (#1876) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@opentelemetry/semantic-conventions](https://togithub.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-semantic-conventions) ([source](https://togithub.com/open-telemetry/opentelemetry-js)) | [`~1.20.0` -> `~1.21.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2fsemantic-conventions/1.20.0/1.21.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@opentelemetry%2fsemantic-conventions/1.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@opentelemetry%2fsemantic-conventions/1.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@opentelemetry%2fsemantic-conventions/1.20.0/1.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@opentelemetry%2fsemantic-conventions/1.20.0/1.21.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-js (@​opentelemetry/semantic-conventions) ### [`v1.21.0`](https://togithub.com/open-telemetry/opentelemetry-js/blob/HEAD/CHANGELOG.md#1210) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.20.0...v1.21.0) ##### :rocket: (Enhancement) - feat(sdk-metrics): add constructor option to add metric readers [#​4427](https://togithub.com/open-telemetry/opentelemetry-js/pull/4427) [@​pichlermarc](https://togithub.com/pichlermarc) - deprecates `MeterProvider.addMetricReader()` please use the constructor option `readers` instead. ##### :bug: (Bug Fix) - fix(sdk-trace-base): ensure attribute value length limit is enforced on span creation [#​4417](https://togithub.com/open-telemetry/opentelemetry-js/pull/4417) [@​pichlermarc](https://togithub.com/pichlermarc) - fix(sdk-trace-base): Export processed spans while exporter failed [#​4287](https://togithub.com/open-telemetry/opentelemetry-js/pull/4287) [@​Zirak](https://togithub.com/Zirak) ##### :house: (Internal) - chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 [#​4320](https://togithub.com/open-telemetry/opentelemetry-js/pull/4320) - refactor(core): drop unnecessary assignment of HOSTNAME [#​4421](https://togithub.com/open-telemetry/opentelemetry-js/pull/4421) [@​pichlermarc](https://togithub.com/pichlermarc) - test(opentelemetry-context-zone-peer-dep): transpile zone.js in tests [#​4423](https://togithub.com/open-telemetry/opentelemetry-js/pull/4423) [@​legendecas](https://togithub.com/legendecas)
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index cbbc91bdb6b..32aeaba9ee0 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.6.0", - "@opentelemetry/semantic-conventions": "~1.20.0", + "@opentelemetry/semantic-conventions": "~1.21.0", "@types/duplexify": "^3.6.0", "@types/long": "^4.0.0", "arrify": "^2.0.0", From 67b8e5525071591db8dd34dd678afe17e91e7c69 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 13:05:45 -0500 Subject: [PATCH 0996/1115] chore(main): release 4.2.0 (#1875) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 14 ++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 8a0a57759c8..c24b8ff13cc 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,20 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.2.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.1.1...v4.2.0) (2024-02-01) + + +### Features + +* Add enforce_in_transit fields and optional annotations ([#1873](https://github.com/googleapis/nodejs-pubsub/issues/1873)) ([09fc424](https://github.com/googleapis/nodejs-pubsub/commit/09fc4241c8782d2f60c1a78dda316628eca5f751)) +* Add schema revision samples ([#1870](https://github.com/googleapis/nodejs-pubsub/issues/1870)) ([044e149](https://github.com/googleapis/nodejs-pubsub/commit/044e1494d82fd64010f7c6f872982d659e753499)) + + +### Bug Fixes + +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.20.0 ([#1871](https://github.com/googleapis/nodejs-pubsub/issues/1871)) ([2ee0dba](https://github.com/googleapis/nodejs-pubsub/commit/2ee0dba67e6d66d9a678796de6172bcafd28796b)) +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.21.0 ([#1876](https://github.com/googleapis/nodejs-pubsub/issues/1876)) ([0fe61a9](https://github.com/googleapis/nodejs-pubsub/commit/0fe61a95b3bfc21bd1a5176c7fbd7f822ece5a5c)) + ## [4.1.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.1.0...v4.1.1) (2024-01-05) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 32aeaba9ee0..0df8e7ed06a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.1.1", + "version": "4.2.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From d404368952f731761e22bf3cf9e19cc017533eb4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:50:24 -0500 Subject: [PATCH 0997/1115] feat: Trusted Private Cloud support, use the universeDomain parameter (#1878) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Trusted Private Cloud support, use the universeDomain parameter feat: auto populate UUID fields where needed fix: revert changes to streaming retries Use gapic-generator-typescript v4.4.0. PiperOrigin-RevId: 603757799 Source-Link: https://github.com/googleapis/googleapis/commit/1a45bf7393b52407188c82e63101db7dc9c72026 Source-Link: https://github.com/googleapis/googleapis-gen/commit/19ca4b45a53d00cb7bdd94b442b60bd237dfe123 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTljYTRiNDVhNTNkMDBjYjdiZGQ5NGI0NDJiNjBiZDIzN2RmZTEyMyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.gitignore | 1 - handwritten/pubsub/src/v1/publisher_client.ts | 65 ++++++++++++++++-- .../pubsub/src/v1/schema_service_client.ts | 65 ++++++++++++++++-- .../pubsub/src/v1/subscriber_client.ts | 67 +++++++++++++++++-- handwritten/pubsub/test/gapic_publisher_v1.ts | 60 +++++++++++++++-- .../pubsub/test/gapic_schema_service_v1.ts | 64 ++++++++++++++++-- .../pubsub/test/gapic_subscriber_v1.ts | 60 +++++++++++++++-- 7 files changed, 351 insertions(+), 31 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 79df0152285..d4f03a0df2e 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -12,4 +12,3 @@ system-test/*key.json .DS_Store package-lock.json __pycache__ -samples/build/ diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index d08e1213937..6b16728f90d 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -31,6 +31,7 @@ import type { import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); + /** * Client JSON configuration object, loaded from * `src/v1/publisher_client_config.json`. @@ -53,6 +54,8 @@ export class PublisherClient { private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; private _protos: {}; private _defaults: {[method: string]: gax.CallSettings}; + private _universeDomain: string; + private _servicePath: string; auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -111,8 +114,20 @@ export class PublisherClient { ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof PublisherClient; + if ( + opts?.universe_domain && + opts?.universeDomain && + opts?.universe_domain !== opts?.universeDomain + ) { + throw new Error( + 'Please set either universe_domain or universeDomain, but not both.' + ); + } + this._universeDomain = + opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com'; + this._servicePath = 'pubsub.' + this._universeDomain; const servicePath = - opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + opts?.servicePath || opts?.apiEndpoint || this._servicePath; this._providedCustomServicePath = !!( opts?.servicePath || opts?.apiEndpoint ); @@ -127,7 +142,7 @@ export class PublisherClient { opts.numericEnums = true; // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. - if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { + if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; } @@ -152,10 +167,10 @@ export class PublisherClient { this.auth.useJWTAccessWithScope = true; // Set defaultServicePath on the auth object. - this.auth.defaultServicePath = staticMembers.servicePath; + this.auth.defaultServicePath = this._servicePath; // Set the default scopes in auth client if needed. - if (servicePath === staticMembers.servicePath) { + if (servicePath === this._servicePath) { this.auth.defaultScopes = staticMembers.scopes; } this.iamClient = new this._gaxModule.IamClient(this._gaxGrpc, opts); @@ -330,21 +345,61 @@ export class PublisherClient { /** * The DNS address for this API service. + * @deprecated * @returns {string} The DNS address for this service. */ static get servicePath() { + if ( + typeof process !== undefined && + typeof process.emitWarning === 'function' + ) { + process.emitWarning( + 'Static servicePath is deprecated, please use the instance method instead.', + 'DeprecationWarning' + ); + } return 'pubsub.googleapis.com'; } /** - * The DNS address for this API service - same as servicePath(), + * The DNS address for this API service - same as servicePath, * exists for compatibility reasons. + * @deprecated * @returns {string} The DNS address for this service. */ static get apiEndpoint() { + if ( + typeof process !== undefined && + typeof process.emitWarning === 'function' + ) { + process.emitWarning( + 'Static apiEndpoint is deprecated, please use the instance method instead.', + 'DeprecationWarning' + ); + } return 'pubsub.googleapis.com'; } + /** + * The DNS address for this API service. + * @returns {string} The DNS address for this service. + */ + get servicePath() { + return this._servicePath; + } + + /** + * The DNS address for this API service - same as servicePath(). + * @returns {string} The DNS address for this service. + */ + get apiEndpoint() { + return this._servicePath; + } + + get universeDomain() { + return this._universeDomain; + } + /** * The port for this API service. * @returns {number} The default port for this service. diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 3e86492ea36..c320157fdbc 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -31,6 +31,7 @@ import type { import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); + /** * Client JSON configuration object, loaded from * `src/v1/schema_service_client_config.json`. @@ -52,6 +53,8 @@ export class SchemaServiceClient { private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; private _protos: {}; private _defaults: {[method: string]: gax.CallSettings}; + private _universeDomain: string; + private _servicePath: string; auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -110,8 +113,20 @@ export class SchemaServiceClient { ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof SchemaServiceClient; + if ( + opts?.universe_domain && + opts?.universeDomain && + opts?.universe_domain !== opts?.universeDomain + ) { + throw new Error( + 'Please set either universe_domain or universeDomain, but not both.' + ); + } + this._universeDomain = + opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com'; + this._servicePath = 'pubsub.' + this._universeDomain; const servicePath = - opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + opts?.servicePath || opts?.apiEndpoint || this._servicePath; this._providedCustomServicePath = !!( opts?.servicePath || opts?.apiEndpoint ); @@ -126,7 +141,7 @@ export class SchemaServiceClient { opts.numericEnums = true; // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. - if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { + if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; } @@ -151,10 +166,10 @@ export class SchemaServiceClient { this.auth.useJWTAccessWithScope = true; // Set defaultServicePath on the auth object. - this.auth.defaultServicePath = staticMembers.servicePath; + this.auth.defaultServicePath = this._servicePath; // Set the default scopes in auth client if needed. - if (servicePath === staticMembers.servicePath) { + if (servicePath === this._servicePath) { this.auth.defaultScopes = staticMembers.scopes; } this.iamClient = new this._gaxModule.IamClient(this._gaxGrpc, opts); @@ -306,21 +321,61 @@ export class SchemaServiceClient { /** * The DNS address for this API service. + * @deprecated * @returns {string} The DNS address for this service. */ static get servicePath() { + if ( + typeof process !== undefined && + typeof process.emitWarning === 'function' + ) { + process.emitWarning( + 'Static servicePath is deprecated, please use the instance method instead.', + 'DeprecationWarning' + ); + } return 'pubsub.googleapis.com'; } /** - * The DNS address for this API service - same as servicePath(), + * The DNS address for this API service - same as servicePath, * exists for compatibility reasons. + * @deprecated * @returns {string} The DNS address for this service. */ static get apiEndpoint() { + if ( + typeof process !== undefined && + typeof process.emitWarning === 'function' + ) { + process.emitWarning( + 'Static apiEndpoint is deprecated, please use the instance method instead.', + 'DeprecationWarning' + ); + } return 'pubsub.googleapis.com'; } + /** + * The DNS address for this API service. + * @returns {string} The DNS address for this service. + */ + get servicePath() { + return this._servicePath; + } + + /** + * The DNS address for this API service - same as servicePath(). + * @returns {string} The DNS address for this service. + */ + get apiEndpoint() { + return this._servicePath; + } + + get universeDomain() { + return this._universeDomain; + } + /** * The port for this API service. * @returns {number} The default port for this service. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index aab6b661aab..a2b3f303aae 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -31,6 +31,7 @@ import type { import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); + /** * Client JSON configuration object, loaded from * `src/v1/subscriber_client_config.json`. @@ -54,6 +55,8 @@ export class SubscriberClient { private _gaxGrpc: gax.GrpcClient | gax.fallback.GrpcClient; private _protos: {}; private _defaults: {[method: string]: gax.CallSettings}; + private _universeDomain: string; + private _servicePath: string; auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -112,8 +115,20 @@ export class SubscriberClient { ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof SubscriberClient; + if ( + opts?.universe_domain && + opts?.universeDomain && + opts?.universe_domain !== opts?.universeDomain + ) { + throw new Error( + 'Please set either universe_domain or universeDomain, but not both.' + ); + } + this._universeDomain = + opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com'; + this._servicePath = 'pubsub.' + this._universeDomain; const servicePath = - opts?.servicePath || opts?.apiEndpoint || staticMembers.servicePath; + opts?.servicePath || opts?.apiEndpoint || this._servicePath; this._providedCustomServicePath = !!( opts?.servicePath || opts?.apiEndpoint ); @@ -128,7 +143,7 @@ export class SubscriberClient { opts.numericEnums = true; // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. - if (servicePath !== staticMembers.servicePath && !('scopes' in opts)) { + if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; } @@ -153,10 +168,10 @@ export class SubscriberClient { this.auth.useJWTAccessWithScope = true; // Set defaultServicePath on the auth object. - this.auth.defaultServicePath = staticMembers.servicePath; + this.auth.defaultServicePath = this._servicePath; // Set the default scopes in auth client if needed. - if (servicePath === staticMembers.servicePath) { + if (servicePath === this._servicePath) { this.auth.defaultScopes = staticMembers.scopes; } this.iamClient = new this._gaxModule.IamClient(this._gaxGrpc, opts); @@ -222,7 +237,7 @@ export class SubscriberClient { streamingPull: new this._gaxModule.StreamDescriptor( this._gaxModule.StreamType.BIDI_STREAMING, !!opts.fallback, - /* gaxStreamingRetries: */ true + /* gaxStreamingRetries: */ false ), }; @@ -339,21 +354,61 @@ export class SubscriberClient { /** * The DNS address for this API service. + * @deprecated * @returns {string} The DNS address for this service. */ static get servicePath() { + if ( + typeof process !== undefined && + typeof process.emitWarning === 'function' + ) { + process.emitWarning( + 'Static servicePath is deprecated, please use the instance method instead.', + 'DeprecationWarning' + ); + } return 'pubsub.googleapis.com'; } /** - * The DNS address for this API service - same as servicePath(), + * The DNS address for this API service - same as servicePath, * exists for compatibility reasons. + * @deprecated * @returns {string} The DNS address for this service. */ static get apiEndpoint() { + if ( + typeof process !== undefined && + typeof process.emitWarning === 'function' + ) { + process.emitWarning( + 'Static apiEndpoint is deprecated, please use the instance method instead.', + 'DeprecationWarning' + ); + } return 'pubsub.googleapis.com'; } + /** + * The DNS address for this API service. + * @returns {string} The DNS address for this service. + */ + get servicePath() { + return this._servicePath; + } + + /** + * The DNS address for this API service - same as servicePath(). + * @returns {string} The DNS address for this service. + */ + get apiEndpoint() { + return this._servicePath; + } + + get universeDomain() { + return this._universeDomain; + } + /** * The port for this API service. * @returns {number} The default port for this service. diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index b88c443330e..6c2e6ae6a14 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -130,13 +130,65 @@ function stubAsyncIterationCall( describe('v1.PublisherClient', () => { describe('Common methods', () => { it('has servicePath', () => { - const servicePath = publisherModule.v1.PublisherClient.servicePath; - assert(servicePath); + const client = new publisherModule.v1.PublisherClient(); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.googleapis.com'); }); it('has apiEndpoint', () => { - const apiEndpoint = publisherModule.v1.PublisherClient.apiEndpoint; - assert(apiEndpoint); + const client = new publisherModule.v1.PublisherClient(); + const apiEndpoint = client.apiEndpoint; + assert.strictEqual(apiEndpoint, 'pubsub.googleapis.com'); + }); + + it('has universeDomain', () => { + const client = new publisherModule.v1.PublisherClient(); + const universeDomain = client.universeDomain; + assert.strictEqual(universeDomain, 'googleapis.com'); + }); + + if ( + typeof process !== 'undefined' && + typeof process.emitWarning === 'function' + ) { + it('throws DeprecationWarning if static servicePath is used', () => { + const stub = sinon.stub(process, 'emitWarning'); + const servicePath = publisherModule.v1.PublisherClient.servicePath; + assert.strictEqual(servicePath, 'pubsub.googleapis.com'); + assert(stub.called); + stub.restore(); + }); + + it('throws DeprecationWarning if static apiEndpoint is used', () => { + const stub = sinon.stub(process, 'emitWarning'); + const apiEndpoint = publisherModule.v1.PublisherClient.apiEndpoint; + assert.strictEqual(apiEndpoint, 'pubsub.googleapis.com'); + assert(stub.called); + stub.restore(); + }); + } + it('sets servicePath according to universe domain camelCase', () => { + const client = new publisherModule.v1.PublisherClient({ + universeDomain: 'example.com', + }); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.example.com'); + }); + + it('sets servicePath according to universe domain snakeCase', () => { + const client = new publisherModule.v1.PublisherClient({ + universe_domain: 'example.com', + }); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.example.com'); + }); + it('does not allow setting both universeDomain and universe_domain', () => { + assert.throws(() => { + new publisherModule.v1.PublisherClient({ + universe_domain: 'example.com', + universeDomain: 'example.net', + }); + }); }); it('has port', () => { diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 5c87dc5b747..e7235378ca0 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -130,15 +130,67 @@ function stubAsyncIterationCall( describe('v1.SchemaServiceClient', () => { describe('Common methods', () => { it('has servicePath', () => { - const servicePath = - schemaserviceModule.v1.SchemaServiceClient.servicePath; - assert(servicePath); + const client = new schemaserviceModule.v1.SchemaServiceClient(); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.googleapis.com'); }); it('has apiEndpoint', () => { - const apiEndpoint = - schemaserviceModule.v1.SchemaServiceClient.apiEndpoint; - assert(apiEndpoint); + const client = new schemaserviceModule.v1.SchemaServiceClient(); + const apiEndpoint = client.apiEndpoint; + assert.strictEqual(apiEndpoint, 'pubsub.googleapis.com'); + }); + + it('has universeDomain', () => { + const client = new schemaserviceModule.v1.SchemaServiceClient(); + const universeDomain = client.universeDomain; + assert.strictEqual(universeDomain, 'googleapis.com'); + }); + + if ( + typeof process !== 'undefined' && + typeof process.emitWarning === 'function' + ) { + it('throws DeprecationWarning if static servicePath is used', () => { + const stub = sinon.stub(process, 'emitWarning'); + const servicePath = + schemaserviceModule.v1.SchemaServiceClient.servicePath; + assert.strictEqual(servicePath, 'pubsub.googleapis.com'); + assert(stub.called); + stub.restore(); + }); + + it('throws DeprecationWarning if static apiEndpoint is used', () => { + const stub = sinon.stub(process, 'emitWarning'); + const apiEndpoint = + schemaserviceModule.v1.SchemaServiceClient.apiEndpoint; + assert.strictEqual(apiEndpoint, 'pubsub.googleapis.com'); + assert(stub.called); + stub.restore(); + }); + } + it('sets servicePath according to universe domain camelCase', () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + universeDomain: 'example.com', + }); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.example.com'); + }); + + it('sets servicePath according to universe domain snakeCase', () => { + const client = new schemaserviceModule.v1.SchemaServiceClient({ + universe_domain: 'example.com', + }); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.example.com'); + }); + it('does not allow setting both universeDomain and universe_domain', () => { + assert.throws(() => { + new schemaserviceModule.v1.SchemaServiceClient({ + universe_domain: 'example.com', + universeDomain: 'example.net', + }); + }); }); it('has port', () => { diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index ea552b567eb..8bbb15095b4 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -144,13 +144,65 @@ function stubAsyncIterationCall( describe('v1.SubscriberClient', () => { describe('Common methods', () => { it('has servicePath', () => { - const servicePath = subscriberModule.v1.SubscriberClient.servicePath; - assert(servicePath); + const client = new subscriberModule.v1.SubscriberClient(); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.googleapis.com'); }); it('has apiEndpoint', () => { - const apiEndpoint = subscriberModule.v1.SubscriberClient.apiEndpoint; - assert(apiEndpoint); + const client = new subscriberModule.v1.SubscriberClient(); + const apiEndpoint = client.apiEndpoint; + assert.strictEqual(apiEndpoint, 'pubsub.googleapis.com'); + }); + + it('has universeDomain', () => { + const client = new subscriberModule.v1.SubscriberClient(); + const universeDomain = client.universeDomain; + assert.strictEqual(universeDomain, 'googleapis.com'); + }); + + if ( + typeof process !== 'undefined' && + typeof process.emitWarning === 'function' + ) { + it('throws DeprecationWarning if static servicePath is used', () => { + const stub = sinon.stub(process, 'emitWarning'); + const servicePath = subscriberModule.v1.SubscriberClient.servicePath; + assert.strictEqual(servicePath, 'pubsub.googleapis.com'); + assert(stub.called); + stub.restore(); + }); + + it('throws DeprecationWarning if static apiEndpoint is used', () => { + const stub = sinon.stub(process, 'emitWarning'); + const apiEndpoint = subscriberModule.v1.SubscriberClient.apiEndpoint; + assert.strictEqual(apiEndpoint, 'pubsub.googleapis.com'); + assert(stub.called); + stub.restore(); + }); + } + it('sets servicePath according to universe domain camelCase', () => { + const client = new subscriberModule.v1.SubscriberClient({ + universeDomain: 'example.com', + }); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.example.com'); + }); + + it('sets servicePath according to universe domain snakeCase', () => { + const client = new subscriberModule.v1.SubscriberClient({ + universe_domain: 'example.com', + }); + const servicePath = client.servicePath; + assert.strictEqual(servicePath, 'pubsub.example.com'); + }); + it('does not allow setting both universeDomain and universe_domain', () => { + assert.throws(() => { + new subscriberModule.v1.SubscriberClient({ + universe_domain: 'example.com', + universeDomain: 'example.net', + }); + }); }); it('has port', () => { From 759225ca350c37887f97b52af0756b1ae79d3afa Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:15:07 -0500 Subject: [PATCH 0998/1115] fix: updated google-gax required for TPC (#1882) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0df8e7ed06a..56958780547 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -58,7 +58,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.0.0", - "google-gax": "^4.0.4", + "google-gax": "^4.3.0", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 18232950b2395d67d407159295d1db91121ced57 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 17:15:01 -0500 Subject: [PATCH 0999/1115] chore(main): release 4.3.0 (#1881) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c24b8ff13cc..1dbe83a7e54 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.3.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.2.0...v4.3.0) (2024-02-05) + + +### Features + +* Trusted Private Cloud support, use the universeDomain parameter ([#1878](https://github.com/googleapis/nodejs-pubsub/issues/1878)) ([d89fd1d](https://github.com/googleapis/nodejs-pubsub/commit/d89fd1d90b352f0cc7a50a72c5fec4aab6660f8f)) + + +### Bug Fixes + +* Updated google-gax required for TPC ([#1882](https://github.com/googleapis/nodejs-pubsub/issues/1882)) ([1445856](https://github.com/googleapis/nodejs-pubsub/commit/144585699595b97f1a4cc28551e45fe23305f480)) + ## [4.2.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.1.1...v4.2.0) (2024-02-01) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 56958780547..884fa4a9d4a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.2.0", + "version": "4.3.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 08e01e02a6d5626fc8b1dfb3c01f924c2e974d9e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:52:15 -0500 Subject: [PATCH 1000/1115] build: update gapic-generator-typescript to v4.4.1 (#1883) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: update gapic-generator-typescript to v4.4.1 PiperOrigin-RevId: 604765466 Source-Link: https://github.com/googleapis/googleapis/commit/40203ca1880849480bbff7b8715491060bbccdf1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/07b7f3dad8aa1912d4acdcfd6365bb4236e4b54b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDdiN2YzZGFkOGFhMTkxMmQ0YWNkY2ZkNjM2NWJiNDIzNmU0YjU0YiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/src/v1/publisher_client.ts | 15 +++------------ .../pubsub/src/v1/schema_service_client.ts | 15 +++------------ handwritten/pubsub/src/v1/subscriber_client.ts | 15 +++------------ handwritten/pubsub/test/gapic_publisher_v1.ts | 14 ++++---------- .../pubsub/test/gapic_schema_service_v1.ts | 14 ++++---------- handwritten/pubsub/test/gapic_subscriber_v1.ts | 14 ++++---------- 6 files changed, 21 insertions(+), 66 deletions(-) diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 6b16728f90d..490e935e8d7 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -345,7 +345,7 @@ export class PublisherClient { /** * The DNS address for this API service. - * @deprecated + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get servicePath() { @@ -362,9 +362,8 @@ export class PublisherClient { } /** - * The DNS address for this API service - same as servicePath, - * exists for compatibility reasons. - * @deprecated + * The DNS address for this API service - same as servicePath. + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get apiEndpoint() { @@ -384,14 +383,6 @@ export class PublisherClient { * The DNS address for this API service. * @returns {string} The DNS address for this service. */ - get servicePath() { - return this._servicePath; - } - - /** - * The DNS address for this API service - same as servicePath(). - * @returns {string} The DNS address for this service. - */ get apiEndpoint() { return this._servicePath; } diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index c320157fdbc..2e42e463377 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -321,7 +321,7 @@ export class SchemaServiceClient { /** * The DNS address for this API service. - * @deprecated + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get servicePath() { @@ -338,9 +338,8 @@ export class SchemaServiceClient { } /** - * The DNS address for this API service - same as servicePath, - * exists for compatibility reasons. - * @deprecated + * The DNS address for this API service - same as servicePath. + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get apiEndpoint() { @@ -360,14 +359,6 @@ export class SchemaServiceClient { * The DNS address for this API service. * @returns {string} The DNS address for this service. */ - get servicePath() { - return this._servicePath; - } - - /** - * The DNS address for this API service - same as servicePath(). - * @returns {string} The DNS address for this service. - */ get apiEndpoint() { return this._servicePath; } diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index a2b3f303aae..09b8aee5ca4 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -354,7 +354,7 @@ export class SubscriberClient { /** * The DNS address for this API service. - * @deprecated + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get servicePath() { @@ -371,9 +371,8 @@ export class SubscriberClient { } /** - * The DNS address for this API service - same as servicePath, - * exists for compatibility reasons. - * @deprecated + * The DNS address for this API service - same as servicePath. + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get apiEndpoint() { @@ -393,14 +392,6 @@ export class SubscriberClient { * The DNS address for this API service. * @returns {string} The DNS address for this service. */ - get servicePath() { - return this._servicePath; - } - - /** - * The DNS address for this API service - same as servicePath(). - * @returns {string} The DNS address for this service. - */ get apiEndpoint() { return this._servicePath; } diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 6c2e6ae6a14..d1ded0f7f44 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -129,12 +129,6 @@ function stubAsyncIterationCall( describe('v1.PublisherClient', () => { describe('Common methods', () => { - it('has servicePath', () => { - const client = new publisherModule.v1.PublisherClient(); - const servicePath = client.servicePath; - assert.strictEqual(servicePath, 'pubsub.googleapis.com'); - }); - it('has apiEndpoint', () => { const client = new publisherModule.v1.PublisherClient(); const apiEndpoint = client.apiEndpoint; @@ -167,19 +161,19 @@ describe('v1.PublisherClient', () => { stub.restore(); }); } - it('sets servicePath according to universe domain camelCase', () => { + it('sets apiEndpoint according to universe domain camelCase', () => { const client = new publisherModule.v1.PublisherClient({ universeDomain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); - it('sets servicePath according to universe domain snakeCase', () => { + it('sets apiEndpoint according to universe domain snakeCase', () => { const client = new publisherModule.v1.PublisherClient({ universe_domain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); it('does not allow setting both universeDomain and universe_domain', () => { diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index e7235378ca0..cf463b46cd5 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -129,12 +129,6 @@ function stubAsyncIterationCall( describe('v1.SchemaServiceClient', () => { describe('Common methods', () => { - it('has servicePath', () => { - const client = new schemaserviceModule.v1.SchemaServiceClient(); - const servicePath = client.servicePath; - assert.strictEqual(servicePath, 'pubsub.googleapis.com'); - }); - it('has apiEndpoint', () => { const client = new schemaserviceModule.v1.SchemaServiceClient(); const apiEndpoint = client.apiEndpoint; @@ -169,19 +163,19 @@ describe('v1.SchemaServiceClient', () => { stub.restore(); }); } - it('sets servicePath according to universe domain camelCase', () => { + it('sets apiEndpoint according to universe domain camelCase', () => { const client = new schemaserviceModule.v1.SchemaServiceClient({ universeDomain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); - it('sets servicePath according to universe domain snakeCase', () => { + it('sets apiEndpoint according to universe domain snakeCase', () => { const client = new schemaserviceModule.v1.SchemaServiceClient({ universe_domain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); it('does not allow setting both universeDomain and universe_domain', () => { diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 8bbb15095b4..a266bc046e1 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -143,12 +143,6 @@ function stubAsyncIterationCall( describe('v1.SubscriberClient', () => { describe('Common methods', () => { - it('has servicePath', () => { - const client = new subscriberModule.v1.SubscriberClient(); - const servicePath = client.servicePath; - assert.strictEqual(servicePath, 'pubsub.googleapis.com'); - }); - it('has apiEndpoint', () => { const client = new subscriberModule.v1.SubscriberClient(); const apiEndpoint = client.apiEndpoint; @@ -181,19 +175,19 @@ describe('v1.SubscriberClient', () => { stub.restore(); }); } - it('sets servicePath according to universe domain camelCase', () => { + it('sets apiEndpoint according to universe domain camelCase', () => { const client = new subscriberModule.v1.SubscriberClient({ universeDomain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); - it('sets servicePath according to universe domain snakeCase', () => { + it('sets apiEndpoint according to universe domain snakeCase', () => { const client = new subscriberModule.v1.SubscriberClient({ universe_domain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); it('does not allow setting both universeDomain and universe_domain', () => { From f11cefab6d707086cdaf1681062712192b7869c9 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:53:59 -0500 Subject: [PATCH 1001/1115] fix: add option to disable emulator auth handling (temp fix) (#1861) * fix: add option to disable emulator auth handling (temp fix) * fix: update names to be more palatable(?) * docs: fix incorrect comment --- handwritten/pubsub/src/pubsub.ts | 26 ++++++++++++++++++++++++-- handwritten/pubsub/test/pubsub.ts | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index a0aa2876aa3..a2df1d01ca6 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -70,6 +70,21 @@ export type Omit = Pick>; export interface ClientConfig extends gax.GrpcClientOptions { apiEndpoint?: string; + + /** + * Configures the emulator mode behaviour: + * - If false, disable emulator mode always + * - If true, enable emulator mode always + * - If unset, use heuristics to decide + * Emulator mode notably sets insecure SSL authentication so that you can + * try the library out without needing a cert. + * + * Also notably, if a TPC universeDomain is set, then this will be counted + * as !emulatorMode for the purposes of the heuristics. If you want emulator + * mode but with a TPC universe domain set, set this to true as well. + */ + emulatorMode?: boolean; + servicePath?: string; port?: string | number; sslCreds?: gax.grpc.ChannelCredentials; @@ -798,9 +813,16 @@ export class PubSub { // If this looks like a GCP URL of some kind, don't go into emulator // mode. Otherwise, supply a fake SSL provider so a real cert isn't // required for running the emulator. + // + // Note that users can provide their own URL here, especially with + // TPC, so the emulatorMode flag lets them override this behaviour. const officialUrlMatch = - this.options.servicePath!.endsWith('.googleapis.com'); - if (!officialUrlMatch) { + this.options.servicePath!.endsWith('.googleapis.com') || + this.options.universeDomain; + if ( + (!officialUrlMatch && this.options.emulatorMode !== false) || + this.options.emulatorMode === true + ) { const grpcInstance = this.options.grpc || gax.grpc; this.options.sslCreds = grpcInstance.credentials.createInsecure(); this.isEmulator = true; diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index 08803c0d83b..d76312fd089 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -857,6 +857,30 @@ describe('PubSub', () => { assert.strictEqual(pubsub.isEmulator, true); }); + it('should allow overriding fake cred mode (on)', () => { + pubsub!.options!.apiEndpoint = 'something.googleapis.com'; + pubsub!.options!.emulatorMode = true; + pubsub.determineBaseUrl_?.(); + + assert.strictEqual(pubsub.options!.sslCreds, fakeCreds); + assert.strictEqual(pubsub.isEmulator, true); + }); + + it('should allow overriding fake cred mode (off)', () => { + const defaultBaseUrl_ = 'defaulturl'; + const testingUrl = 'localhost:8085'; + + setHost(defaultBaseUrl_); + pubsub!.options!.apiEndpoint = testingUrl; + pubsub!.options!.emulatorMode = false; + pubsub.determineBaseUrl_?.(); + + assert.strictEqual(pubsub.options?.servicePath, 'localhost'); + assert.strictEqual(pubsub.options.port, 8085); + assert.ok(pubsub.options.sslCreds === undefined); + assert.strictEqual(pubsub.isEmulator, false); + }); + it('should remove slashes from the baseUrl', () => { setHost('localhost:8080/'); pubsub.determineBaseUrl_?.(); From def912ac94b58bf8b8ad52e567dcefd0580b3a15 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:12:16 +0000 Subject: [PATCH 1002/1115] chore(main): release 4.3.1 (#1886) :robot: I have created a release *beep* *boop* --- ## [4.3.1](https://togithub.com/googleapis/nodejs-pubsub/compare/v4.3.0...v4.3.1) (2024-02-08) ### Bug Fixes * Add option to disable emulator auth handling (temp fix) ([#1861](https://togithub.com/googleapis/nodejs-pubsub/issues/1861)) ([761cdc8](https://togithub.com/googleapis/nodejs-pubsub/commit/761cdc898c69715e6775d2f5913ead1fca2def02)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 1dbe83a7e54..14c6f72795f 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.3.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.0...v4.3.1) (2024-02-08) + + +### Bug Fixes + +* Add option to manually control emulator auth handling, and fix heuristics for TPC ([#1861](https://github.com/googleapis/nodejs-pubsub/issues/1861)) ([761cdc8](https://github.com/googleapis/nodejs-pubsub/commit/761cdc898c69715e6775d2f5913ead1fca2def02)) + ## [4.3.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.2.0...v4.3.0) (2024-02-05) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 884fa4a9d4a..f96bcaebcff 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.3.0", + "version": "4.3.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 4e5a0842a9bb83e66fcb0556ebec3b88b85a574e Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:13:49 -0500 Subject: [PATCH 1003/1115] fix: update minimum google-gax versions for auth fixes (#1888) --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f96bcaebcff..0ab3d5bc0d0 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,8 +57,8 @@ "@types/long": "^4.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-auth-library": "^9.0.0", - "google-gax": "^4.3.0", + "google-auth-library": "^9.3.0", + "google-gax": "^4.3.1", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 8d2d0812a87d546bc538bb8759f38c3f9a78daf2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 20:30:19 +0000 Subject: [PATCH 1004/1115] chore(main): release 4.3.2 (#1889) :robot: I have created a release *beep* *boop* --- ## [4.3.2](https://togithub.com/googleapis/nodejs-pubsub/compare/v4.3.1...v4.3.2) (2024-02-13) ### Bug Fixes * Update minimum google-gax versions for auth fixes ([#1888](https://togithub.com/googleapis/nodejs-pubsub/issues/1888)) ([08acade](https://togithub.com/googleapis/nodejs-pubsub/commit/08acadee042c6a3b85344575d5d0be09ae6e4202)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 14c6f72795f..1550d7bad8f 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.3.2](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.1...v4.3.2) (2024-02-13) + + +### Bug Fixes + +* Update minimum google-gax versions for auth fixes ([#1888](https://github.com/googleapis/nodejs-pubsub/issues/1888)) ([08acade](https://github.com/googleapis/nodejs-pubsub/commit/08acadee042c6a3b85344575d5d0be09ae6e4202)) + ## [4.3.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.0...v4.3.1) (2024-02-08) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0ab3d5bc0d0..e03c7b43c66 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.3.1", + "version": "4.3.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 2afb1fc802c30027c14b5e5f373b37a15399fdc9 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 09:59:25 -0500 Subject: [PATCH 1005/1115] fix: Add client library version to headers (#1891) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: small fix in Pub/Sub ingestion comments PiperOrigin-RevId: 606977953 Source-Link: https://github.com/googleapis/googleapis/commit/3d989d19608052ca0e91767129bb55c2ba2572a9 Source-Link: https://github.com/googleapis/googleapis-gen/commit/375142e33353dd56aca4cf6d67b9dc550aad03a3 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzc1MTQyZTMzMzUzZGQ1NmFjYTRjZjZkNjdiOWRjNTUwYWFkMDNhMyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: Add client library version to headers fix: Allow bundlers to bundle JSON files correctly for ESM deps: Update dependency google-gax to ^4.3.1 fix: Export types from protos in ESM PiperOrigin-RevId: 609821360 Source-Link: https://github.com/googleapis/googleapis/commit/5c5ecf0eb9bd8acf5bed57fe1ce0df1770466089 Source-Link: https://github.com/googleapis/googleapis-gen/commit/b875fcdd14b4def65218293003d9bec4b842eca7 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjg3NWZjZGQxNGI0ZGVmNjUyMTgyOTMwMDNkOWJlYzRiODQyZWNhNyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto | 5 ++--- handwritten/pubsub/src/v1/publisher_client.ts | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index c548b26808d..93e1e84a77a 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -183,7 +183,7 @@ message SchemaSettings { message IngestionDataSourceSettings { // Ingestion settings for Amazon Kinesis Data Streams. message AwsKinesis { - // Possible states for managed ingestion from Amazon Kinesis Data Streams. + // Possible states for ingestion from Amazon Kinesis Data Streams. enum State { // Default value. This value is unused. STATE_UNSPECIFIED = 0; @@ -312,8 +312,7 @@ message Topic { // Output only. An output-only field indicating the state of the topic. State state = 9 [(google.api.field_behavior) = OUTPUT_ONLY]; - // Optional. Settings for managed ingestion from a data source into this - // topic. + // Optional. Settings for ingestion from a data source into this topic. IngestionDataSourceSettings ingestion_data_source_settings = 10 [(google.api.field_behavior) = OPTIONAL]; } diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index 490e935e8d7..d12bf10cc9f 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -473,8 +473,7 @@ export class PublisherClient { * @param {google.pubsub.v1.Topic.State} request.state * Output only. An output-only field indicating the state of the topic. * @param {google.pubsub.v1.IngestionDataSourceSettings} [request.ingestionDataSourceSettings] - * Optional. Settings for managed ingestion from a data source into this - * topic. + * Optional. Settings for ingestion from a data source into this topic. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. From aac749408f1a128dfbf40ab4541b763b896c0b99 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sun, 3 Mar 2024 11:12:16 +0100 Subject: [PATCH 1006/1115] chore(deps): update dependency gapic-tools to ^0.4.0 (#1895) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [gapic-tools](https://togithub.com/googleapis/gax-nodejs) ([source](https://togithub.com/googleapis/gax-nodejs/tree/HEAD/gapic-tools)) | [`^0.3.0` -> `^0.4.0`](https://renovatebot.com/diffs/npm/gapic-tools/0.3.0/0.4.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/gapic-tools/0.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/gapic-tools/0.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/gapic-tools/0.3.0/0.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/gapic-tools/0.3.0/0.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/gax-nodejs (gapic-tools) ### [`v0.4.0`](https://togithub.com/googleapis/gax-nodejs/releases/tag/gapic-tools-v0.4.0): gapic-tools: v0.4.0 [Compare Source](https://togithub.com/googleapis/gax-nodejs/compare/gapic-tools-v0.3.0...gapic-tools-v0.4.0) ##### Features - allow passing --keep-case and --force-number to compileProtos ([#​1561](https://togithub.com/googleapis/gax-nodejs/issues/1561)) ([004d112](https://togithub.com/googleapis/gax-nodejs/commit/004d112445f528a6cb143676e8b397b37137adf3))
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index e03c7b43c66..9e74f738d19 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -81,7 +81,7 @@ "c8": "^9.0.0", "codecov": "^3.0.0", "execa": "^5.0.0", - "gapic-tools": "^0.3.0", + "gapic-tools": "^0.4.0", "gts": "^5.0.0", "jsdoc": "^4.0.0", "jsdoc-fresh": "^3.0.0", From 3ee1a3ca4431c6ddeb010145c265dbdd718e6511 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 12:37:22 -0500 Subject: [PATCH 1007/1115] chore(main): release 4.3.3 (#1893) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 1550d7bad8f..4b81185eea1 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.3.3](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.2...v4.3.3) (2024-03-03) + + +### Bug Fixes + +* Add client library version to headers ([#1891](https://github.com/googleapis/nodejs-pubsub/issues/1891)) ([6b59195](https://github.com/googleapis/nodejs-pubsub/commit/6b59195aed8b6c6576e50512aeca9123ad0cc016)) + ## [4.3.2](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.1...v4.3.2) (2024-02-13) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9e74f738d19..b30ccadaa9d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.3.2", + "version": "4.3.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From cd5c08f7ff51368a13ce15a88c51c8eac16730f9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 20 Mar 2024 16:28:03 +0100 Subject: [PATCH 1008/1115] chore(deps): update dependency @types/execa to v2 (#1899) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b30ccadaa9d..f9bd0fc7ac5 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -67,7 +67,7 @@ "devDependencies": { "@grpc/proto-loader": "^0.7.0", "@opentelemetry/tracing": "^0.24.0", - "@types/execa": "^0.9.0", + "@types/execa": "^2.0.0", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", "@types/mocha": "^9.0.0", From e4b28938de489b83ec0491f207af398f35baf881 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 21 Mar 2024 22:12:11 +0100 Subject: [PATCH 1009/1115] fix(deps): update dependency @types/long to v5 (#1901) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f9bd0fc7ac5..987c6d64e45 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@opentelemetry/api": "^1.6.0", "@opentelemetry/semantic-conventions": "~1.21.0", "@types/duplexify": "^3.6.0", - "@types/long": "^4.0.0", + "@types/long": "^5.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", From 23082f4f78de23df0b921de9a8298b9133c82b9d Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 22 Mar 2024 15:04:16 -0400 Subject: [PATCH 1010/1115] samples: add samples for AWS Kinesis ingestion (#1896) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * samples: add samples for AWS Kinesis ingestion * samples: add topic type update sample for kinesis ingestion * tests: add system tests for kinesis samples * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * tests:remove incorrect test for new sample * samples: simplify parameter names --------- Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 9267ec11e3d..175f24bbb2c 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -137,6 +137,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | 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 Subscription With Retry Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithRetryPolicy.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/createSubscriptionWithRetryPolicy.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) | +| Create Topic With Kinesis Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithKinesisIngestion.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/createTopicWithKinesisIngestion.js,samples/README.md) | | Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | | Create Topic With Schema Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchemaRevisions.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/createTopicWithSchemaRevisions.js,samples/README.md) | | Delete a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchema.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/deleteSchema.js,samples/README.md) | @@ -184,6 +185,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | | Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | | Update Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateDeadLetterPolicy.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/updateDeadLetterPolicy.js,samples/README.md) | +| Update Topic Ingestion Type | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateTopicIngestionType.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/updateTopicIngestionType.js,samples/README.md) | | Update Topic Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateTopicSchema.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/updateTopicSchema.js,samples/README.md) | | Validate a schema definition | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/validateSchema.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/validateSchema.js,samples/README.md) | From 799882ef97e3fdb526d6a44d3a7d53bcb4df486a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:00:55 -0400 Subject: [PATCH 1011/1115] feat: add several fields to manage state of database encryption update (#1904) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add custom datetime format for Cloud Storage subscriptions PiperOrigin-RevId: 619178723 Source-Link: https://github.com/googleapis/googleapis/commit/811a857dd5e5a500127d0470f16c2caca366435d Source-Link: https://github.com/googleapis/googleapis-gen/commit/768fb44d4daaea946a291f6795a50af26a515488 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzY4ZmI0NGQ0ZGFhZWE5NDZhMjkxZjY3OTVhNTBhZjI2YTUxNTQ4OCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: add several fields to manage state of database encryption update PiperOrigin-RevId: 619289281 Source-Link: https://github.com/googleapis/googleapis/commit/3a7c33486ca758b180c6d11dd4705fa9a22e8576 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6a8c733062d833d11c5245eda50f5108e0e55324 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNmE4YzczMzA2MmQ4MzNkMTFjNTI0NWVkYTUwZjUxMDhlMGU1NTMyNCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 7 +++- handwritten/pubsub/protos/protos.d.ts | 6 ++++ handwritten/pubsub/protos/protos.js | 23 +++++++++++++ handwritten/pubsub/protos/protos.json | 7 ++++ handwritten/pubsub/src/v1/publisher_client.ts | 15 +++++--- .../pubsub/src/v1/schema_service_client.ts | 15 +++++--- .../pubsub/src/v1/subscriber_client.ts | 15 +++++--- handwritten/pubsub/test/gapic_publisher_v1.ts | 34 ++++++++++++++++++- .../pubsub/test/gapic_schema_service_v1.ts | 34 ++++++++++++++++++- .../pubsub/test/gapic_subscriber_v1.ts | 34 ++++++++++++++++++- 10 files changed, 174 insertions(+), 16 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 93e1e84a77a..c3a90cd401a 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -203,7 +203,7 @@ message IngestionDataSourceSettings { KINESIS_PERMISSION_DENIED = 2; // Permission denied encountered while publishing to the topic. This can - // happen due to Pub/Sub SA has not been granted the [appropriate publish + // happen if the Pub/Sub SA has not been granted the [appropriate publish // permissions](https://cloud.google.com/pubsub/docs/access-control#pubsub.publisher) PUBLISH_PERMISSION_DENIED = 3; @@ -1197,6 +1197,11 @@ message CloudStorageConfig { // Must not end in "/". string filename_suffix = 3 [(google.api.field_behavior) = OPTIONAL]; + // Optional. User-provided format string specifying how to represent datetimes + // in Cloud Storage filenames. See the [datetime format + // guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names). + string filename_datetime_format = 10 [(google.api.field_behavior) = OPTIONAL]; + // Defaults to text format. oneof output_format { // Optional. If set, message data will be written to Cloud Storage in text diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index dda11424ebb..9346f23a8f8 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -3733,6 +3733,9 @@ export namespace google { /** CloudStorageConfig filenameSuffix */ filenameSuffix?: (string|null); + /** CloudStorageConfig filenameDatetimeFormat */ + filenameDatetimeFormat?: (string|null); + /** CloudStorageConfig textConfig */ textConfig?: (google.pubsub.v1.CloudStorageConfig.ITextConfig|null); @@ -3767,6 +3770,9 @@ export namespace google { /** CloudStorageConfig filenameSuffix. */ public filenameSuffix: string; + /** CloudStorageConfig filenameDatetimeFormat. */ + public filenameDatetimeFormat: string; + /** CloudStorageConfig textConfig. */ public textConfig?: (google.pubsub.v1.CloudStorageConfig.ITextConfig|null); diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index fa620f8e5fe..29e7fa6669f 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -8644,6 +8644,7 @@ * @property {string|null} [bucket] CloudStorageConfig bucket * @property {string|null} [filenamePrefix] CloudStorageConfig filenamePrefix * @property {string|null} [filenameSuffix] CloudStorageConfig filenameSuffix + * @property {string|null} [filenameDatetimeFormat] CloudStorageConfig filenameDatetimeFormat * @property {google.pubsub.v1.CloudStorageConfig.ITextConfig|null} [textConfig] CloudStorageConfig textConfig * @property {google.pubsub.v1.CloudStorageConfig.IAvroConfig|null} [avroConfig] CloudStorageConfig avroConfig * @property {google.protobuf.IDuration|null} [maxDuration] CloudStorageConfig maxDuration @@ -8690,6 +8691,14 @@ */ CloudStorageConfig.prototype.filenameSuffix = ""; + /** + * CloudStorageConfig filenameDatetimeFormat. + * @member {string} filenameDatetimeFormat + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.filenameDatetimeFormat = ""; + /** * CloudStorageConfig textConfig. * @member {google.pubsub.v1.CloudStorageConfig.ITextConfig|null|undefined} textConfig @@ -8784,6 +8793,8 @@ writer.uint32(/* id 7, wireType 0 =*/56).int64(message.maxBytes); if (message.state != null && Object.hasOwnProperty.call(message, "state")) writer.uint32(/* id 9, wireType 0 =*/72).int32(message.state); + if (message.filenameDatetimeFormat != null && Object.hasOwnProperty.call(message, "filenameDatetimeFormat")) + writer.uint32(/* id 10, wireType 2 =*/82).string(message.filenameDatetimeFormat); return writer; }; @@ -8830,6 +8841,10 @@ message.filenameSuffix = reader.string(); break; } + case 10: { + message.filenameDatetimeFormat = reader.string(); + break; + } case 4: { message.textConfig = $root.google.pubsub.v1.CloudStorageConfig.TextConfig.decode(reader, reader.uint32()); break; @@ -8895,6 +8910,9 @@ if (message.filenameSuffix != null && message.hasOwnProperty("filenameSuffix")) if (!$util.isString(message.filenameSuffix)) return "filenameSuffix: string expected"; + if (message.filenameDatetimeFormat != null && message.hasOwnProperty("filenameDatetimeFormat")) + if (!$util.isString(message.filenameDatetimeFormat)) + return "filenameDatetimeFormat: string expected"; if (message.textConfig != null && message.hasOwnProperty("textConfig")) { properties.outputFormat = 1; { @@ -8953,6 +8971,8 @@ message.filenamePrefix = String(object.filenamePrefix); if (object.filenameSuffix != null) message.filenameSuffix = String(object.filenameSuffix); + if (object.filenameDatetimeFormat != null) + message.filenameDatetimeFormat = String(object.filenameDatetimeFormat); if (object.textConfig != null) { if (typeof object.textConfig !== "object") throw TypeError(".google.pubsub.v1.CloudStorageConfig.textConfig: object expected"); @@ -9032,6 +9052,7 @@ } else object.maxBytes = options.longs === String ? "0" : 0; object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.filenameDatetimeFormat = ""; } if (message.bucket != null && message.hasOwnProperty("bucket")) object.bucket = message.bucket; @@ -9058,6 +9079,8 @@ object.maxBytes = options.longs === String ? $util.Long.prototype.toString.call(message.maxBytes) : options.longs === Number ? new $util.LongBits(message.maxBytes.low >>> 0, message.maxBytes.high >>> 0).toNumber() : message.maxBytes; if (message.state != null && message.hasOwnProperty("state")) object.state = options.enums === String ? $root.google.pubsub.v1.CloudStorageConfig.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.CloudStorageConfig.State[message.state] : message.state; + if (message.filenameDatetimeFormat != null && message.hasOwnProperty("filenameDatetimeFormat")) + object.filenameDatetimeFormat = message.filenameDatetimeFormat; return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 9fecd46b31c..04ec87360fc 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1320,6 +1320,13 @@ "(google.api.field_behavior)": "OPTIONAL" } }, + "filenameDatetimeFormat": { + "type": "string", + "id": 10, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, "textConfig": { "type": "TextConfig", "id": 4, diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index d12bf10cc9f..d281e1f0e1d 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -123,8 +123,15 @@ export class PublisherClient { 'Please set either universe_domain or universeDomain, but not both.' ); } + const universeDomainEnvVar = + typeof process === 'object' && typeof process.env === 'object' + ? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] + : undefined; this._universeDomain = - opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com'; + opts?.universeDomain ?? + opts?.universe_domain ?? + universeDomainEnvVar ?? + 'googleapis.com'; this._servicePath = 'pubsub.' + this._universeDomain; const servicePath = opts?.servicePath || opts?.apiEndpoint || this._servicePath; @@ -177,7 +184,7 @@ export class PublisherClient { // Determine the client header string. const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; - if (typeof process !== 'undefined' && 'versions' in process) { + if (typeof process === 'object' && 'versions' in process) { clientHeader.push(`gl-node/${process.versions.node}`); } else { clientHeader.push(`gl-web/${this._gaxModule.version}`); @@ -350,7 +357,7 @@ export class PublisherClient { */ static get servicePath() { if ( - typeof process !== undefined && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { process.emitWarning( @@ -368,7 +375,7 @@ export class PublisherClient { */ static get apiEndpoint() { if ( - typeof process !== undefined && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { process.emitWarning( diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 2e42e463377..068b0a247c2 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -122,8 +122,15 @@ export class SchemaServiceClient { 'Please set either universe_domain or universeDomain, but not both.' ); } + const universeDomainEnvVar = + typeof process === 'object' && typeof process.env === 'object' + ? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] + : undefined; this._universeDomain = - opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com'; + opts?.universeDomain ?? + opts?.universe_domain ?? + universeDomainEnvVar ?? + 'googleapis.com'; this._servicePath = 'pubsub.' + this._universeDomain; const servicePath = opts?.servicePath || opts?.apiEndpoint || this._servicePath; @@ -176,7 +183,7 @@ export class SchemaServiceClient { // Determine the client header string. const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; - if (typeof process !== 'undefined' && 'versions' in process) { + if (typeof process === 'object' && 'versions' in process) { clientHeader.push(`gl-node/${process.versions.node}`); } else { clientHeader.push(`gl-web/${this._gaxModule.version}`); @@ -326,7 +333,7 @@ export class SchemaServiceClient { */ static get servicePath() { if ( - typeof process !== undefined && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { process.emitWarning( @@ -344,7 +351,7 @@ export class SchemaServiceClient { */ static get apiEndpoint() { if ( - typeof process !== undefined && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { process.emitWarning( diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 09b8aee5ca4..2c0e820f7ed 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -124,8 +124,15 @@ export class SubscriberClient { 'Please set either universe_domain or universeDomain, but not both.' ); } + const universeDomainEnvVar = + typeof process === 'object' && typeof process.env === 'object' + ? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] + : undefined; this._universeDomain = - opts?.universeDomain ?? opts?.universe_domain ?? 'googleapis.com'; + opts?.universeDomain ?? + opts?.universe_domain ?? + universeDomainEnvVar ?? + 'googleapis.com'; this._servicePath = 'pubsub.' + this._universeDomain; const servicePath = opts?.servicePath || opts?.apiEndpoint || this._servicePath; @@ -178,7 +185,7 @@ export class SubscriberClient { // Determine the client header string. const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`]; - if (typeof process !== 'undefined' && 'versions' in process) { + if (typeof process === 'object' && 'versions' in process) { clientHeader.push(`gl-node/${process.versions.node}`); } else { clientHeader.push(`gl-web/${this._gaxModule.version}`); @@ -359,7 +366,7 @@ export class SubscriberClient { */ static get servicePath() { if ( - typeof process !== undefined && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { process.emitWarning( @@ -377,7 +384,7 @@ export class SubscriberClient { */ static get apiEndpoint() { if ( - typeof process !== undefined && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { process.emitWarning( diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index d1ded0f7f44..f2254a188eb 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -142,7 +142,7 @@ describe('v1.PublisherClient', () => { }); if ( - typeof process !== 'undefined' && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { it('throws DeprecationWarning if static servicePath is used', () => { @@ -176,6 +176,38 @@ describe('v1.PublisherClient', () => { const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); + + if (typeof process === 'object' && 'env' in process) { + describe('GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable', () => { + it('sets apiEndpoint from environment variable', () => { + const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com'; + const client = new publisherModule.v1.PublisherClient(); + const servicePath = client.apiEndpoint; + assert.strictEqual(servicePath, 'pubsub.example.com'); + if (saved) { + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved; + } else { + delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + } + }); + + it('value configured in code has priority over environment variable', () => { + const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com'; + const client = new publisherModule.v1.PublisherClient({ + universeDomain: 'configured.example.com', + }); + const servicePath = client.apiEndpoint; + assert.strictEqual(servicePath, 'pubsub.configured.example.com'); + if (saved) { + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved; + } else { + delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + } + }); + }); + } it('does not allow setting both universeDomain and universe_domain', () => { assert.throws(() => { new publisherModule.v1.PublisherClient({ diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index cf463b46cd5..cd96d3d2341 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -142,7 +142,7 @@ describe('v1.SchemaServiceClient', () => { }); if ( - typeof process !== 'undefined' && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { it('throws DeprecationWarning if static servicePath is used', () => { @@ -178,6 +178,38 @@ describe('v1.SchemaServiceClient', () => { const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); + + if (typeof process === 'object' && 'env' in process) { + describe('GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable', () => { + it('sets apiEndpoint from environment variable', () => { + const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com'; + const client = new schemaserviceModule.v1.SchemaServiceClient(); + const servicePath = client.apiEndpoint; + assert.strictEqual(servicePath, 'pubsub.example.com'); + if (saved) { + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved; + } else { + delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + } + }); + + it('value configured in code has priority over environment variable', () => { + const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com'; + const client = new schemaserviceModule.v1.SchemaServiceClient({ + universeDomain: 'configured.example.com', + }); + const servicePath = client.apiEndpoint; + assert.strictEqual(servicePath, 'pubsub.configured.example.com'); + if (saved) { + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved; + } else { + delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + } + }); + }); + } it('does not allow setting both universeDomain and universe_domain', () => { assert.throws(() => { new schemaserviceModule.v1.SchemaServiceClient({ diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index a266bc046e1..18c097733f4 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -156,7 +156,7 @@ describe('v1.SubscriberClient', () => { }); if ( - typeof process !== 'undefined' && + typeof process === 'object' && typeof process.emitWarning === 'function' ) { it('throws DeprecationWarning if static servicePath is used', () => { @@ -190,6 +190,38 @@ describe('v1.SubscriberClient', () => { const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'pubsub.example.com'); }); + + if (typeof process === 'object' && 'env' in process) { + describe('GOOGLE_CLOUD_UNIVERSE_DOMAIN environment variable', () => { + it('sets apiEndpoint from environment variable', () => { + const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com'; + const client = new subscriberModule.v1.SubscriberClient(); + const servicePath = client.apiEndpoint; + assert.strictEqual(servicePath, 'pubsub.example.com'); + if (saved) { + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved; + } else { + delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + } + }); + + it('value configured in code has priority over environment variable', () => { + const saved = process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = 'example.com'; + const client = new subscriberModule.v1.SubscriberClient({ + universeDomain: 'configured.example.com', + }); + const servicePath = client.apiEndpoint; + assert.strictEqual(servicePath, 'pubsub.configured.example.com'); + if (saved) { + process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] = saved; + } else { + delete process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']; + } + }); + }); + } it('does not allow setting both universeDomain and universe_domain', () => { assert.throws(() => { new subscriberModule.v1.SubscriberClient({ From f9a5003f47beb3725cc64cf1973120527c21d137 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 3 May 2024 12:23:39 -0400 Subject: [PATCH 1012/1115] build: remove some unneeded typings and shuffle others (#1918) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: remove some unneeded typings and shuffle others * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/package.json | 4 +- handwritten/pubsub/protos/protos.d.ts | 9 +++++ handwritten/pubsub/protos/protos.js | 53 ++++++++++++++++++++++++--- handwritten/pubsub/protos/protos.json | 26 ++++++++++++- 4 files changed, 83 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 987c6d64e45..39f311ac9c7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,8 +53,6 @@ "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.6.0", "@opentelemetry/semantic-conventions": "~1.21.0", - "@types/duplexify": "^3.6.0", - "@types/long": "^5.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", @@ -67,7 +65,7 @@ "devDependencies": { "@grpc/proto-loader": "^0.7.0", "@opentelemetry/tracing": "^0.24.0", - "@types/execa": "^2.0.0", + "@types/duplexify": "^3.6.4", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", "@types/mocha": "^9.0.0", diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 9346f23a8f8..e4f1058723c 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -9227,6 +9227,9 @@ export namespace google { /** Publishing protoReferenceDocumentationUri */ protoReferenceDocumentationUri?: (string|null); + + /** Publishing restReferenceDocumentationUri */ + restReferenceDocumentationUri?: (string|null); } /** Represents a Publishing. */ @@ -9268,6 +9271,9 @@ export namespace google { /** Publishing protoReferenceDocumentationUri. */ public protoReferenceDocumentationUri: string; + /** Publishing restReferenceDocumentationUri. */ + public restReferenceDocumentationUri: string; + /** * Creates a new Publishing instance using the specified properties. * @param [properties] Properties to set @@ -13485,6 +13491,9 @@ export namespace google { /** ServiceOptions .google.api.oauthScopes */ ".google.api.oauthScopes"?: (string|null); + + /** ServiceOptions .google.api.apiVersion */ + ".google.api.apiVersion"?: (string|null); } /** Represents a ServiceOptions. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 29e7fa6669f..1bb3b1694ff 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -21899,6 +21899,7 @@ * @property {google.api.ClientLibraryOrganization|null} [organization] Publishing organization * @property {Array.|null} [librarySettings] Publishing librarySettings * @property {string|null} [protoReferenceDocumentationUri] Publishing protoReferenceDocumentationUri + * @property {string|null} [restReferenceDocumentationUri] Publishing restReferenceDocumentationUri */ /** @@ -21999,6 +22000,14 @@ */ Publishing.prototype.protoReferenceDocumentationUri = ""; + /** + * Publishing restReferenceDocumentationUri. + * @member {string} restReferenceDocumentationUri + * @memberof google.api.Publishing + * @instance + */ + Publishing.prototype.restReferenceDocumentationUri = ""; + /** * Creates a new Publishing instance using the specified properties. * @function create @@ -22046,6 +22055,8 @@ $root.google.api.ClientLibrarySettings.encode(message.librarySettings[i], writer.uint32(/* id 109, wireType 2 =*/874).fork()).ldelim(); if (message.protoReferenceDocumentationUri != null && Object.hasOwnProperty.call(message, "protoReferenceDocumentationUri")) writer.uint32(/* id 110, wireType 2 =*/882).string(message.protoReferenceDocumentationUri); + if (message.restReferenceDocumentationUri != null && Object.hasOwnProperty.call(message, "restReferenceDocumentationUri")) + writer.uint32(/* id 111, wireType 2 =*/890).string(message.restReferenceDocumentationUri); return writer; }; @@ -22126,6 +22137,10 @@ message.protoReferenceDocumentationUri = reader.string(); break; } + case 111: { + message.restReferenceDocumentationUri = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -22218,6 +22233,9 @@ if (message.protoReferenceDocumentationUri != null && message.hasOwnProperty("protoReferenceDocumentationUri")) if (!$util.isString(message.protoReferenceDocumentationUri)) return "protoReferenceDocumentationUri: string expected"; + if (message.restReferenceDocumentationUri != null && message.hasOwnProperty("restReferenceDocumentationUri")) + if (!$util.isString(message.restReferenceDocumentationUri)) + return "restReferenceDocumentationUri: string expected"; return null; }; @@ -22312,6 +22330,8 @@ } if (object.protoReferenceDocumentationUri != null) message.protoReferenceDocumentationUri = String(object.protoReferenceDocumentationUri); + if (object.restReferenceDocumentationUri != null) + message.restReferenceDocumentationUri = String(object.restReferenceDocumentationUri); return message; }; @@ -22341,6 +22361,7 @@ object.docTagPrefix = ""; object.organization = options.enums === String ? "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED" : 0; object.protoReferenceDocumentationUri = ""; + object.restReferenceDocumentationUri = ""; } if (message.methodSettings && message.methodSettings.length) { object.methodSettings = []; @@ -22371,6 +22392,8 @@ } if (message.protoReferenceDocumentationUri != null && message.hasOwnProperty("protoReferenceDocumentationUri")) object.protoReferenceDocumentationUri = message.protoReferenceDocumentationUri; + if (message.restReferenceDocumentationUri != null && message.hasOwnProperty("restReferenceDocumentationUri")) + object.restReferenceDocumentationUri = message.restReferenceDocumentationUri; return object; }; @@ -32094,12 +32117,9 @@ if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".google.api.fieldBehavior"] != null && message[".google.api.fieldBehavior"].length) { - writer.uint32(/* id 1052, wireType 2 =*/8418).fork(); + if (message[".google.api.fieldBehavior"] != null && message[".google.api.fieldBehavior"].length) for (var i = 0; i < message[".google.api.fieldBehavior"].length; ++i) - writer.int32(message[".google.api.fieldBehavior"][i]); - writer.ldelim(); - } + writer.uint32(/* id 1052, wireType 0 =*/8416).int32(message[".google.api.fieldBehavior"][i]); if (message[".google.api.resourceReference"] != null && Object.hasOwnProperty.call(message, ".google.api.resourceReference")) $root.google.api.ResourceReference.encode(message[".google.api.resourceReference"], writer.uint32(/* id 1055, wireType 2 =*/8442).fork()).ldelim(); return writer; @@ -33945,6 +33965,7 @@ * @property {Array.|null} [uninterpretedOption] ServiceOptions uninterpretedOption * @property {string|null} [".google.api.defaultHost"] ServiceOptions .google.api.defaultHost * @property {string|null} [".google.api.oauthScopes"] ServiceOptions .google.api.oauthScopes + * @property {string|null} [".google.api.apiVersion"] ServiceOptions .google.api.apiVersion */ /** @@ -34003,6 +34024,14 @@ */ ServiceOptions.prototype[".google.api.oauthScopes"] = ""; + /** + * ServiceOptions .google.api.apiVersion. + * @member {string} .google.api.apiVersion + * @memberof google.protobuf.ServiceOptions + * @instance + */ + ServiceOptions.prototype[".google.api.apiVersion"] = ""; + /** * Creates a new ServiceOptions instance using the specified properties. * @function create @@ -34038,6 +34067,8 @@ writer.uint32(/* id 1049, wireType 2 =*/8394).string(message[".google.api.defaultHost"]); if (message[".google.api.oauthScopes"] != null && Object.hasOwnProperty.call(message, ".google.api.oauthScopes")) writer.uint32(/* id 1050, wireType 2 =*/8402).string(message[".google.api.oauthScopes"]); + if (message[".google.api.apiVersion"] != null && Object.hasOwnProperty.call(message, ".google.api.apiVersion")) + writer.uint32(/* id 525000001, wireType 2 =*/4200000010).string(message[".google.api.apiVersion"]); return writer; }; @@ -34094,6 +34125,10 @@ message[".google.api.oauthScopes"] = reader.string(); break; } + case 525000001: { + message[".google.api.apiVersion"] = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -34152,6 +34187,9 @@ if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) if (!$util.isString(message[".google.api.oauthScopes"])) return ".google.api.oauthScopes: string expected"; + if (message[".google.api.apiVersion"] != null && message.hasOwnProperty(".google.api.apiVersion")) + if (!$util.isString(message[".google.api.apiVersion"])) + return ".google.api.apiVersion: string expected"; return null; }; @@ -34188,6 +34226,8 @@ message[".google.api.defaultHost"] = String(object[".google.api.defaultHost"]); if (object[".google.api.oauthScopes"] != null) message[".google.api.oauthScopes"] = String(object[".google.api.oauthScopes"]); + if (object[".google.api.apiVersion"] != null) + message[".google.api.apiVersion"] = String(object[".google.api.apiVersion"]); return message; }; @@ -34211,6 +34251,7 @@ object.features = null; object[".google.api.defaultHost"] = ""; object[".google.api.oauthScopes"] = ""; + object[".google.api.apiVersion"] = ""; } if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; @@ -34225,6 +34266,8 @@ object[".google.api.defaultHost"] = message[".google.api.defaultHost"]; if (message[".google.api.oauthScopes"] != null && message.hasOwnProperty(".google.api.oauthScopes")) object[".google.api.oauthScopes"] = message[".google.api.oauthScopes"]; + if (message[".google.api.apiVersion"] != null && message.hasOwnProperty(".google.api.apiVersion")) + object[".google.api.apiVersion"] = message[".google.api.apiVersion"]; return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 04ec87360fc..f63d0e5e7fc 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -2596,6 +2596,11 @@ "id": 1050, "extend": "google.protobuf.ServiceOptions" }, + "apiVersion": { + "type": "string", + "id": 525000001, + "extend": "google.protobuf.ServiceOptions" + }, "CommonLanguageSettings": { "fields": { "referenceDocsUri": { @@ -2704,6 +2709,10 @@ "protoReferenceDocumentationUri": { "type": "string", "id": 110 + }, + "restReferenceDocumentationUri": { + "type": "string", + "id": 111 } } }, @@ -2879,7 +2888,10 @@ "rule": "repeated", "type": "google.api.FieldBehavior", "id": 1052, - "extend": "google.protobuf.FieldOptions" + "extend": "google.protobuf.FieldOptions", + "options": { + "packed": false + } }, "FieldBehavior": { "values": { @@ -4077,9 +4089,21 @@ 1001, 1001 ], + [ + 1002, + 1002 + ], + [ + 9990, + 9990 + ], [ 9995, 9999 + ], + [ + 10000, + 10000 ] ], "reserved": [ From 3c82a1fb62fd7ab5c4796fe54a0ad115fc6256f4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 13:22:32 -0400 Subject: [PATCH 1013/1115] chore(main): release 4.4.0 (#1902) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 4b81185eea1..cb30f75e0a6 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.4.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.3...v4.4.0) (2024-05-03) + + +### Features + +* Add several fields to manage state of database encryption update ([#1904](https://github.com/googleapis/nodejs-pubsub/issues/1904)) ([aba9aee](https://github.com/googleapis/nodejs-pubsub/commit/aba9aee0c8ecc840c150aa077892b7bb88f18eca)) + + +### Bug Fixes + +* **deps:** Update dependency @types/long to v5 ([#1901](https://github.com/googleapis/nodejs-pubsub/issues/1901)) ([d13d395](https://github.com/googleapis/nodejs-pubsub/commit/d13d395341efacf926a126bf756873922f6bbab7)) + ## [4.3.3](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.2...v4.3.3) (2024-03-03) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 39f311ac9c7..950b9bf5e2a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.3.3", + "version": "4.4.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 97a9cd6af6b8e015758c7c210b9dfc08fe4d0000 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 23 May 2024 18:19:00 +0200 Subject: [PATCH 1014/1115] chore(deps): update dependency sinon to v18 (#1923) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 950b9bf5e2a..80220e9375c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -91,7 +91,7 @@ "null-loader": "^4.0.0", "protobufjs": "^7.0.0", "proxyquire": "^2.0.0", - "sinon": "^17.0.0", + "sinon": "^18.0.0", "tmp": "^0.2.0", "ts-loader": "^9.0.0", "typescript": "^5.1.6", From 7a37cfabe8069d4f13ad50b9ee9252554becfd19 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 23 May 2024 12:58:37 -0400 Subject: [PATCH 1015/1115] fix: pull in new gax for protobufjs vuln fix (#1925) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 80220e9375c..ff4f9af7c74 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -56,7 +56,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", - "google-gax": "^4.3.1", + "google-gax": "^4.3.3", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From 32cd1cace43fabcd165fc680b8c665115068efba Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 21:42:17 +0000 Subject: [PATCH 1016/1115] feat: update Nodejs generator to send API versions in headers for GAPICs (#1919) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 634109303 Source-Link: https://togithub.com/googleapis/googleapis/commit/998ade8d5e34d18df5ce36ce2baefdd57f4da375 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/000ca6f00801f65b847e6029cb05111404df21ec Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDAwY2E2ZjAwODAxZjY1Yjg0N2U2MDI5Y2IwNTExMTQwNGRmMjFlYyJ9 fix!: An existing method `UpdateVehicleLocation` is removed from service `VehicleService` fix!: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` fix!: An existing message `UpdateVehicleLocationRequest` is removed PiperOrigin-RevId: 631557549 Source-Link: https://togithub.com/googleapis/googleapis/commit/3d50414a7ff3f0b8ffe8ad7858257396e4f18131 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/5ce63d4e636a975175bde2d16c15e70dd5a81ff4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9 --- handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto | 2 +- handwritten/pubsub/protos/google/pubsub/v1/schema.proto | 2 +- handwritten/pubsub/src/v1/subscriber_client.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index c3a90cd401a..2e606060dfd 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index bd17cf0f892..d52c678c595 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 2c0e820f7ed..617d05f67dc 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -244,7 +244,7 @@ export class SubscriberClient { streamingPull: new this._gaxModule.StreamDescriptor( this._gaxModule.StreamType.BIDI_STREAMING, !!opts.fallback, - /* gaxStreamingRetries: */ false + !!opts.gaxServerStreamingRetries ), }; From ea657ab8e1286eeaa5c220a0d3fad2121bb94ae9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 21:36:16 +0000 Subject: [PATCH 1017/1115] chore(main): release 4.4.1 (#1922) :robot: I have created a release *beep* *boop* --- ## [4.4.1](https://togithub.com/googleapis/nodejs-pubsub/compare/v4.4.0...v4.4.1) (2024-05-30) ### Bug Fixes * An existing message `UpdateVehicleLocationRequest` is removed ([5451d15](https://togithub.com/googleapis/nodejs-pubsub/commit/5451d150e77d46a475e7a8e150a7f6b5d04d6448)) * An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` ([5451d15](https://togithub.com/googleapis/nodejs-pubsub/commit/5451d150e77d46a475e7a8e150a7f6b5d04d6448)) * An existing method `UpdateVehicleLocation` is removed from service `VehicleService` ([5451d15](https://togithub.com/googleapis/nodejs-pubsub/commit/5451d150e77d46a475e7a8e150a7f6b5d04d6448)) * **deps:** Update dependency protobufjs to ~7.3.0 ([#1921](https://togithub.com/googleapis/nodejs-pubsub/issues/1921)) ([c5afd34](https://togithub.com/googleapis/nodejs-pubsub/commit/c5afd3400cc8ff9f920b4b232c4e4a5fb41eb07b)) * Pull in new gax for protobufjs vuln fix ([#1925](https://togithub.com/googleapis/nodejs-pubsub/issues/1925)) ([8024c6d](https://togithub.com/googleapis/nodejs-pubsub/commit/8024c6d2e4ce69f97fd8b64bb9f076e33d47c662)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 11 +++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index cb30f75e0a6..c4727016e80 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,17 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.4.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.4.0...v4.4.1) (2024-05-30) + + +### Bug Fixes + +* An existing message `UpdateVehicleLocationRequest` is removed ([5451d15](https://github.com/googleapis/nodejs-pubsub/commit/5451d150e77d46a475e7a8e150a7f6b5d04d6448)) +* An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` ([5451d15](https://github.com/googleapis/nodejs-pubsub/commit/5451d150e77d46a475e7a8e150a7f6b5d04d6448)) +* An existing method `UpdateVehicleLocation` is removed from service `VehicleService` ([5451d15](https://github.com/googleapis/nodejs-pubsub/commit/5451d150e77d46a475e7a8e150a7f6b5d04d6448)) +* **deps:** Update dependency protobufjs to ~7.3.0 ([#1921](https://github.com/googleapis/nodejs-pubsub/issues/1921)) ([c5afd34](https://github.com/googleapis/nodejs-pubsub/commit/c5afd3400cc8ff9f920b4b232c4e4a5fb41eb07b)) +* Pull in new gax for protobufjs vuln fix ([#1925](https://github.com/googleapis/nodejs-pubsub/issues/1925)) ([8024c6d](https://github.com/googleapis/nodejs-pubsub/commit/8024c6d2e4ce69f97fd8b64bb9f076e33d47c662)) + ## [4.4.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.3...v4.4.0) (2024-05-03) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ff4f9af7c74..455576c0d8d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.4.0", + "version": "4.4.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From fd5db291ff3e2a6ca39cb38ba8729ac4944bc589 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 18:52:17 +0000 Subject: [PATCH 1018/1115] chore: [node] add auto-approve templates, and install dependencies with engines-strict (#1928) chore: add auto-approve templates, and install dependencies with engines-strict Source-Link: https://togithub.com/googleapis/synthtool/commit/4a02d97333d1c1642d1b19b00645afdcf4ab36a4 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:68e1cece0d6d3336c4f1cb9d2857b020af5574dff6da6349293d1c6d4eea82d8 --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 6 +++--- handwritten/pubsub/.github/auto-approve.yml | 3 ++- handwritten/pubsub/package.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 638efabfb52..34bb2086de0 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:e92044720ab3cb6984a70b0c6001081204375959ba3599ef6c42dd99a7783a67 -# created: 2023-11-10T00:24:05.581078808Z + digest: sha256:68e1cece0d6d3336c4f1cb9d2857b020af5574dff6da6349293d1c6d4eea82d8 +# created: 2024-05-31T15:46:42.989947733Z diff --git a/handwritten/pubsub/.github/auto-approve.yml b/handwritten/pubsub/.github/auto-approve.yml index 4cd91cc16ae..ec51b072dca 100644 --- a/handwritten/pubsub/.github/auto-approve.yml +++ b/handwritten/pubsub/.github/auto-approve.yml @@ -1,3 +1,4 @@ processes: - "NodeDependency" - - "OwlBotTemplateChanges" + - "OwlBotTemplateChangesNode" + - "OwlBotPRsNode" \ No newline at end of file diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 455576c0d8d..316f9ac54af 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -84,7 +84,7 @@ "jsdoc": "^4.0.0", "jsdoc-fresh": "^3.0.0", "jsdoc-region-tag": "^3.0.0", - "linkinator": "^5.0.0", + "linkinator": "~4.0.0", "mocha": "^9.2.2", "mv": "^2.1.1", "ncp": "^2.0.0", From a0057b64e7b5d299bbc7353bf7f097442d0a6942 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:17:45 -0400 Subject: [PATCH 1019/1115] feat: add service_account_email for export subscriptions (#1927) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add service_account_email for export subscriptions PiperOrigin-RevId: 638641437 Source-Link: https://github.com/googleapis/googleapis/commit/a3016a877a58aee3bef1e93871542ef79993daf7 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2001c330aee62a9d4e8a9852d8e5bf2662818ad4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjAwMWMzMzBhZWU2MmE5ZDRlOGE5ODUyZDhlNWJmMjY2MjgxOGFkNCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../protos/google/pubsub/v1/pubsub.proto | 16 +++++++ handwritten/pubsub/protos/protos.d.ts | 12 +++++ handwritten/pubsub/protos/protos.js | 46 +++++++++++++++++++ handwritten/pubsub/protos/protos.json | 14 ++++++ 4 files changed, 88 insertions(+) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 2e606060dfd..8546dacf952 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1141,6 +1141,14 @@ message BigQueryConfig { // write to in BigQuery. `use_table_schema` and `use_topic_schema` cannot be // enabled at the same time. bool use_table_schema = 6 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The service account to use to write to BigQuery. The subscription + // creator or updater that specifies this field must have + // `iam.serviceAccounts.actAs` permission on the service account. If not + // specified, the Pub/Sub [service + // agent](https://cloud.google.com/iam/docs/service-agents), + // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. + string service_account_email = 7 [(google.api.field_behavior) = OPTIONAL]; } // Configuration for a Cloud Storage subscription. @@ -1227,6 +1235,14 @@ message CloudStorageConfig { // Output only. An output-only field that indicates whether or not the // subscription can receive messages. State state = 9 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Optional. The service account to use to write to Cloud Storage. The + // subscription creator or updater that specifies this field must have + // `iam.serviceAccounts.actAs` permission on the service account. If not + // specified, the Pub/Sub + // [service agent](https://cloud.google.com/iam/docs/service-agents), + // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used. + string service_account_email = 11 [(google.api.field_behavior) = OPTIONAL]; } // A message and its corresponding acknowledgment ID. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index e4f1058723c..17d730c34ed 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -3601,6 +3601,9 @@ export namespace google { /** BigQueryConfig useTableSchema */ useTableSchema?: (boolean|null); + + /** BigQueryConfig serviceAccountEmail */ + serviceAccountEmail?: (string|null); } /** Represents a BigQueryConfig. */ @@ -3630,6 +3633,9 @@ export namespace google { /** BigQueryConfig useTableSchema. */ public useTableSchema: boolean; + /** BigQueryConfig serviceAccountEmail. */ + public serviceAccountEmail: string; + /** * Creates a new BigQueryConfig instance using the specified properties. * @param [properties] Properties to set @@ -3750,6 +3756,9 @@ export namespace google { /** CloudStorageConfig state */ state?: (google.pubsub.v1.CloudStorageConfig.State|keyof typeof google.pubsub.v1.CloudStorageConfig.State|null); + + /** CloudStorageConfig serviceAccountEmail */ + serviceAccountEmail?: (string|null); } /** Represents a CloudStorageConfig. */ @@ -3788,6 +3797,9 @@ export namespace google { /** CloudStorageConfig state. */ public state: (google.pubsub.v1.CloudStorageConfig.State|keyof typeof google.pubsub.v1.CloudStorageConfig.State); + /** CloudStorageConfig serviceAccountEmail. */ + public serviceAccountEmail: string; + /** CloudStorageConfig outputFormat. */ public outputFormat?: ("textConfig"|"avroConfig"); diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 1bb3b1694ff..65103b824d7 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -8267,6 +8267,7 @@ * @property {boolean|null} [dropUnknownFields] BigQueryConfig dropUnknownFields * @property {google.pubsub.v1.BigQueryConfig.State|null} [state] BigQueryConfig state * @property {boolean|null} [useTableSchema] BigQueryConfig useTableSchema + * @property {string|null} [serviceAccountEmail] BigQueryConfig serviceAccountEmail */ /** @@ -8332,6 +8333,14 @@ */ BigQueryConfig.prototype.useTableSchema = false; + /** + * BigQueryConfig serviceAccountEmail. + * @member {string} serviceAccountEmail + * @memberof google.pubsub.v1.BigQueryConfig + * @instance + */ + BigQueryConfig.prototype.serviceAccountEmail = ""; + /** * Creates a new BigQueryConfig instance using the specified properties. * @function create @@ -8368,6 +8377,8 @@ writer.uint32(/* id 5, wireType 0 =*/40).int32(message.state); if (message.useTableSchema != null && Object.hasOwnProperty.call(message, "useTableSchema")) writer.uint32(/* id 6, wireType 0 =*/48).bool(message.useTableSchema); + if (message.serviceAccountEmail != null && Object.hasOwnProperty.call(message, "serviceAccountEmail")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.serviceAccountEmail); return writer; }; @@ -8426,6 +8437,10 @@ message.useTableSchema = reader.bool(); break; } + case 7: { + message.serviceAccountEmail = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -8488,6 +8503,9 @@ if (message.useTableSchema != null && message.hasOwnProperty("useTableSchema")) if (typeof message.useTableSchema !== "boolean") return "useTableSchema: boolean expected"; + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + if (!$util.isString(message.serviceAccountEmail)) + return "serviceAccountEmail: string expected"; return null; }; @@ -8545,6 +8563,8 @@ } if (object.useTableSchema != null) message.useTableSchema = Boolean(object.useTableSchema); + if (object.serviceAccountEmail != null) + message.serviceAccountEmail = String(object.serviceAccountEmail); return message; }; @@ -8568,6 +8588,7 @@ object.dropUnknownFields = false; object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; object.useTableSchema = false; + object.serviceAccountEmail = ""; } if (message.table != null && message.hasOwnProperty("table")) object.table = message.table; @@ -8581,6 +8602,8 @@ object.state = options.enums === String ? $root.google.pubsub.v1.BigQueryConfig.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.BigQueryConfig.State[message.state] : message.state; if (message.useTableSchema != null && message.hasOwnProperty("useTableSchema")) object.useTableSchema = message.useTableSchema; + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + object.serviceAccountEmail = message.serviceAccountEmail; return object; }; @@ -8650,6 +8673,7 @@ * @property {google.protobuf.IDuration|null} [maxDuration] CloudStorageConfig maxDuration * @property {number|Long|null} [maxBytes] CloudStorageConfig maxBytes * @property {google.pubsub.v1.CloudStorageConfig.State|null} [state] CloudStorageConfig state + * @property {string|null} [serviceAccountEmail] CloudStorageConfig serviceAccountEmail */ /** @@ -8739,6 +8763,14 @@ */ CloudStorageConfig.prototype.state = 0; + /** + * CloudStorageConfig serviceAccountEmail. + * @member {string} serviceAccountEmail + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.serviceAccountEmail = ""; + // OneOf field names bound to virtual getters and setters var $oneOfFields; @@ -8795,6 +8827,8 @@ writer.uint32(/* id 9, wireType 0 =*/72).int32(message.state); if (message.filenameDatetimeFormat != null && Object.hasOwnProperty.call(message, "filenameDatetimeFormat")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.filenameDatetimeFormat); + if (message.serviceAccountEmail != null && Object.hasOwnProperty.call(message, "serviceAccountEmail")) + writer.uint32(/* id 11, wireType 2 =*/90).string(message.serviceAccountEmail); return writer; }; @@ -8865,6 +8899,10 @@ message.state = reader.int32(); break; } + case 11: { + message.serviceAccountEmail = reader.string(); + break; + } default: reader.skipType(tag & 7); break; @@ -8950,6 +8988,9 @@ case 4: break; } + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + if (!$util.isString(message.serviceAccountEmail)) + return "serviceAccountEmail: string expected"; return null; }; @@ -9025,6 +9066,8 @@ message.state = 4; break; } + if (object.serviceAccountEmail != null) + message.serviceAccountEmail = String(object.serviceAccountEmail); return message; }; @@ -9053,6 +9096,7 @@ object.maxBytes = options.longs === String ? "0" : 0; object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; object.filenameDatetimeFormat = ""; + object.serviceAccountEmail = ""; } if (message.bucket != null && message.hasOwnProperty("bucket")) object.bucket = message.bucket; @@ -9081,6 +9125,8 @@ object.state = options.enums === String ? $root.google.pubsub.v1.CloudStorageConfig.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.CloudStorageConfig.State[message.state] : message.state; if (message.filenameDatetimeFormat != null && message.hasOwnProperty("filenameDatetimeFormat")) object.filenameDatetimeFormat = message.filenameDatetimeFormat; + if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) + object.serviceAccountEmail = message.serviceAccountEmail; return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index f63d0e5e7fc..e37e3bd2530 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1274,6 +1274,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "serviceAccountEmail": { + "type": "string", + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -1361,6 +1368,13 @@ "options": { "(google.api.field_behavior)": "OUTPUT_ONLY" } + }, + "serviceAccountEmail": { + "type": "string", + "id": 11, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { From 042ab50264f4d72845ba927ecbec06b6e736b3e0 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Jun 2024 12:20:18 -0400 Subject: [PATCH 1020/1115] chore: fix build errors due to non-semver upstream version change (#1938) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 316f9ac54af..f301257e2af 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,7 +51,7 @@ "@google-cloud/precise-date": "^4.0.0", "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", - "@opentelemetry/api": "^1.6.0", + "@opentelemetry/api": "~1.8.0", "@opentelemetry/semantic-conventions": "~1.21.0", "arrify": "^2.0.0", "extend": "^3.0.2", From 830ce79105d6db97228afb131712b77fad137f25 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:22:03 -0400 Subject: [PATCH 1021/1115] chore(main): release 4.5.0 (#1937) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c4727016e80..7dc7dd3a0d1 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.5.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.4.1...v4.5.0) (2024-06-11) + + +### Features + +* Add service_account_email for export subscriptions ([#1927](https://github.com/googleapis/nodejs-pubsub/issues/1927)) ([c532854](https://github.com/googleapis/nodejs-pubsub/commit/c53285473c2c0973baf5932e52d2d135958c6948)) + ## [4.4.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.4.0...v4.4.1) (2024-05-30) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f301257e2af..be0ebb8067a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.4.1", + "version": "4.5.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From f1e70640f5aea5ef1f2194f9cd58338edd57260e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 15:26:06 -0400 Subject: [PATCH 1022/1115] ci: Enable `constraintsFiltering` for Node.js Libraries (#1943) chore: Enable `constraintsFiltering` for Node.js Libraries Source-Link: https://github.com/googleapis/synthtool/commit/dae1282201b64e4da3ad512632cb4dda70a832a1 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:d920257482ca1cd72978f29f7d28765a9f8c758c21ee0708234db5cf4c5016c2 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 34bb2086de0..9e90d54bfb2 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:68e1cece0d6d3336c4f1cb9d2857b020af5574dff6da6349293d1c6d4eea82d8 -# created: 2024-05-31T15:46:42.989947733Z + digest: sha256:d920257482ca1cd72978f29f7d28765a9f8c758c21ee0708234db5cf4c5016c2 +# created: 2024-06-12T16:18:41.688792375Z From 5e278313aeb45fa9660bcfc8430aed02d5776bb2 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:50:19 -0400 Subject: [PATCH 1023/1115] chore: update for linter failures (#1947) Just opening a separate PR for this, to keep it clean. --- handwritten/pubsub/.gitignore | 1 + handwritten/pubsub/owlbot.py | 25 ++-------- handwritten/pubsub/system-test/pubsub.ts | 1 - handwritten/pubsub/test/gapic_publisher_v1.ts | 48 +++++++++---------- .../pubsub/test/gapic_schema_service_v1.ts | 48 +++++++++---------- .../pubsub/test/gapic_subscriber_v1.ts | 48 +++++++++---------- 6 files changed, 76 insertions(+), 95 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index d4f03a0df2e..6e093592722 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -6,6 +6,7 @@ /docs/ /out/ /build/ +samples/build/ system-test/secrets.js system-test/*key.json *.lock diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 0e82b17c581..0fd6e7f91ca 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -14,34 +14,15 @@ import synthtool.languages.node as node -# 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.3.0]") -shell.run(["npm", "i", "@google-cloud/typeless-sample-bot@1.3.0"]) -os.chdir(old_path) - +# Generate JS samples from TS. node.typeless_samples_hermetic() # We need to run this before the main owlbot processing, to make # sure quickstart.js gets gts fixed before the README is generated. # This needs to be worked out more properly, this is temporary. -logger.debug("Copy eslint config") -shell.run( - ["cp", "-r", f"/synthtool/node_modules", "."], - check=True, -) -logger.debug("Running fix...") -shell.run( - ["npm", "run", "fix"], - check=False, -) +node.fix() +# Main OwlBot processing. node.owlbot_main(templates_excludes=[ 'src/index.ts', '.github/PULL_REQUEST_TEMPLATE.md', diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 4301292aa05..ca152fda737 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -19,7 +19,6 @@ import defer = require('p-defer'); import * as uuid from 'uuid'; // This is only in Node 10.17+, but it's used for system tests, should be okay. -// eslint-disable-next-line node/no-unsupported-features/node-builtins import {promises as fs} from 'fs'; import { diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index f2254a188eb..8a15356f1fc 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -1237,9 +1237,9 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopics.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1285,9 +1285,9 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopics.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1328,9 +1328,9 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopics.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1370,9 +1370,9 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopics.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); }); @@ -1822,9 +1822,9 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1868,9 +1868,9 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1907,9 +1907,9 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1947,9 +1947,9 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); }); diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index cd96d3d2341..0f29cc7e145 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -1502,9 +1502,9 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemas.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1550,9 +1550,9 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemas.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1593,9 +1593,9 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemas.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1635,9 +1635,9 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemas.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); }); @@ -1802,9 +1802,9 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1848,9 +1848,9 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1891,9 +1891,9 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -1931,9 +1931,9 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); }); diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 18c097733f4..7a8a738d22a 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -2249,9 +2249,9 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSubscriptions.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -2295,9 +2295,9 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSubscriptions.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -2338,9 +2338,9 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSubscriptions.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -2378,9 +2378,9 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSubscriptions.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); }); @@ -2544,9 +2544,9 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSnapshots.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -2590,9 +2590,9 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSnapshots.createStream as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -2633,9 +2633,9 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSnapshots.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); @@ -2673,9 +2673,9 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSnapshots.asyncIterate as SinonStub) .getCall(0) - .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + .args[2].otherArgs.headers[ + 'x-goog-request-params' + ].includes(expectedHeaderRequestParams) ); }); }); From f6088eeb35e149e5b705d77159a452b0502ac88a Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:31:24 -0400 Subject: [PATCH 1024/1115] samples: add samples for cloud storage buckets (#1931) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: ignore samples/build/ * fix: convert string ports to number ports to match grpc * feat: provide redacted topic and subscription admin clients * tests: allow for storage bucket name gen * samples: add sample for subscription with cloud storage bucket * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * samples: remove gapic getters to be split to another PR * samples: update for review changes * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 1 + handwritten/pubsub/src/pubsub.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 175f24bbb2c..73557136068 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -131,6 +131,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 Push Subscription With No Wrapper | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createPushSubscriptionNoWrapper.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/createPushSubscriptionNoWrapper.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 a Cloud Storage subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithCloudStorage.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/createSubscriptionWithCloudStorage.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) | diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index a2df1d01ca6..03a2ff9eb07 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -307,6 +307,7 @@ export class PubSub { allScopes[scope] = true; } } + this.options = Object.assign( { libName: 'gccl', From c33d06ee9007612700fdafde07a1b4cd750604b6 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:31:26 -0400 Subject: [PATCH 1025/1115] build: we need dev dependencies to fix() (#1953) --- handwritten/pubsub/owlbot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 0fd6e7f91ca..10dfd88ea7c 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -20,6 +20,7 @@ # We need to run this before the main owlbot processing, to make # sure quickstart.js gets gts fixed before the README is generated. # This needs to be worked out more properly, this is temporary. +node.install() node.fix() # Main OwlBot processing. From 3b5352a7ae82e0fc47b3119dd2635e04ae9a7a09 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:58:04 -0400 Subject: [PATCH 1026/1115] feat: add use_topic_schema for Cloud Storage Subscriptions (#1948) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add use_topic_schema for Cloud Storage Subscriptions PiperOrigin-RevId: 643385701 Source-Link: https://github.com/googleapis/googleapis/commit/f29a82a206156fd665eaa01cb7987170ac0250f0 Source-Link: https://github.com/googleapis/googleapis-gen/commit/f8f3f60ad2ab4e81fe024368ad0430900174e82b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjhmM2Y2MGFkMmFiNGU4MWZlMDI0MzY4YWQwNDMwOTAwMTc0ZTgyYiJ9 * build: ignore owl-bot-staging while doing owlbot PRs * build: exclude the owl-bot-staging tree from the header CI * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: more updates to help owlbot --------- Co-authored-by: Owl Bot Co-authored-by: feywind <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.eslintignore | 1 + .../pubsub/.github/.header-checker-lint.yaml | 12 +++++++ handwritten/pubsub/.gitignore | 1 - handwritten/pubsub/owlbot.py | 4 ++- .../protos/google/pubsub/v1/pubsub.proto | 8 +++++ handwritten/pubsub/protos/protos.d.ts | 9 ++++- handwritten/pubsub/protos/protos.js | 33 ++++++++++++++++++- handwritten/pubsub/protos/protos.json | 10 +++++- 8 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 handwritten/pubsub/.github/.header-checker-lint.yaml diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index c4a0963e9bd..a5e47c7e764 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -3,6 +3,7 @@ test/fixtures build/ docs/ +owl-bot-staging/ protos/ samples/generated/ system-test/**/fixtures diff --git a/handwritten/pubsub/.github/.header-checker-lint.yaml b/handwritten/pubsub/.github/.header-checker-lint.yaml new file mode 100644 index 00000000000..e74512f1cd9 --- /dev/null +++ b/handwritten/pubsub/.github/.header-checker-lint.yaml @@ -0,0 +1,12 @@ +allowedCopyrightHolders: + - 'Google LLC' +allowedLicenses: + - 'Apache-2.0' + - 'MIT' + - 'BSD-3' +sourceFileExtensions: + - 'ts' + - 'js' + - 'java' +ignoreFiles: + - 'owl-bot-staging/**' diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 6e093592722..d4f03a0df2e 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -6,7 +6,6 @@ /docs/ /out/ /build/ -samples/build/ system-test/secrets.js system-test/*key.json *.lock diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 10dfd88ea7c..f3e6252cc10 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -27,5 +27,7 @@ node.owlbot_main(templates_excludes=[ 'src/index.ts', '.github/PULL_REQUEST_TEMPLATE.md', - '.github/release-please.yml' + '.github/release-please.yml', + '.github/header-checker-lint.yaml', + '.eslintignore' ]) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 8546dacf952..b70bda11a33 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1168,6 +1168,10 @@ message CloudStorageConfig { // data (for example, an ordering_key, if present) are added as entries in // the attributes map. bool write_metadata = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. When true, the output Cloud Storage file will be serialized + // using the topic schema, if it exists. + bool use_topic_schema = 2 [(google.api.field_behavior) = OPTIONAL]; } // Possible states for a Cloud Storage subscription. @@ -1188,6 +1192,10 @@ message CloudStorageConfig { // Cannot write to the destination because enforce_in_transit is set to true // and the destination locations are not in the allowed regions. IN_TRANSIT_LOCATION_RESTRICTION = 4; + + // Cannot write to the Cloud Storage bucket due to an incompatibility + // between the topic schema and subscription settings. + SCHEMA_MISMATCH = 5; } // Required. User-provided name for the Cloud Storage bucket. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 17d730c34ed..19956f26c79 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -3979,6 +3979,9 @@ export namespace google { /** AvroConfig writeMetadata */ writeMetadata?: (boolean|null); + + /** AvroConfig useTopicSchema */ + useTopicSchema?: (boolean|null); } /** Represents an AvroConfig. */ @@ -3993,6 +3996,9 @@ export namespace google { /** AvroConfig writeMetadata. */ public writeMetadata: boolean; + /** AvroConfig useTopicSchema. */ + public useTopicSchema: boolean; + /** * Creates a new AvroConfig instance using the specified properties. * @param [properties] Properties to set @@ -4077,7 +4083,8 @@ export namespace google { ACTIVE = 1, PERMISSION_DENIED = 2, NOT_FOUND = 3, - IN_TRANSIT_LOCATION_RESTRICTION = 4 + IN_TRANSIT_LOCATION_RESTRICTION = 4, + SCHEMA_MISMATCH = 5 } } diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 65103b824d7..b439f7b680b 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -8986,6 +8986,7 @@ case 2: case 3: case 4: + case 5: break; } if (message.serviceAccountEmail != null && message.hasOwnProperty("serviceAccountEmail")) @@ -9065,6 +9066,10 @@ case 4: message.state = 4; break; + case "SCHEMA_MISMATCH": + case 5: + message.state = 5; + break; } if (object.serviceAccountEmail != null) message.serviceAccountEmail = String(object.serviceAccountEmail); @@ -9338,6 +9343,7 @@ * @memberof google.pubsub.v1.CloudStorageConfig * @interface IAvroConfig * @property {boolean|null} [writeMetadata] AvroConfig writeMetadata + * @property {boolean|null} [useTopicSchema] AvroConfig useTopicSchema */ /** @@ -9363,6 +9369,14 @@ */ AvroConfig.prototype.writeMetadata = false; + /** + * AvroConfig useTopicSchema. + * @member {boolean} useTopicSchema + * @memberof google.pubsub.v1.CloudStorageConfig.AvroConfig + * @instance + */ + AvroConfig.prototype.useTopicSchema = false; + /** * Creates a new AvroConfig instance using the specified properties. * @function create @@ -9389,6 +9403,8 @@ writer = $Writer.create(); if (message.writeMetadata != null && Object.hasOwnProperty.call(message, "writeMetadata")) writer.uint32(/* id 1, wireType 0 =*/8).bool(message.writeMetadata); + if (message.useTopicSchema != null && Object.hasOwnProperty.call(message, "useTopicSchema")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.useTopicSchema); return writer; }; @@ -9427,6 +9443,10 @@ message.writeMetadata = reader.bool(); break; } + case 2: { + message.useTopicSchema = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -9465,6 +9485,9 @@ if (message.writeMetadata != null && message.hasOwnProperty("writeMetadata")) if (typeof message.writeMetadata !== "boolean") return "writeMetadata: boolean expected"; + if (message.useTopicSchema != null && message.hasOwnProperty("useTopicSchema")) + if (typeof message.useTopicSchema !== "boolean") + return "useTopicSchema: boolean expected"; return null; }; @@ -9482,6 +9505,8 @@ var message = new $root.google.pubsub.v1.CloudStorageConfig.AvroConfig(); if (object.writeMetadata != null) message.writeMetadata = Boolean(object.writeMetadata); + if (object.useTopicSchema != null) + message.useTopicSchema = Boolean(object.useTopicSchema); return message; }; @@ -9498,10 +9523,14 @@ if (!options) options = {}; var object = {}; - if (options.defaults) + if (options.defaults) { object.writeMetadata = false; + object.useTopicSchema = false; + } if (message.writeMetadata != null && message.hasOwnProperty("writeMetadata")) object.writeMetadata = message.writeMetadata; + if (message.useTopicSchema != null && message.hasOwnProperty("useTopicSchema")) + object.useTopicSchema = message.useTopicSchema; return object; }; @@ -9543,6 +9572,7 @@ * @property {number} PERMISSION_DENIED=2 PERMISSION_DENIED value * @property {number} NOT_FOUND=3 NOT_FOUND value * @property {number} IN_TRANSIT_LOCATION_RESTRICTION=4 IN_TRANSIT_LOCATION_RESTRICTION value + * @property {number} SCHEMA_MISMATCH=5 SCHEMA_MISMATCH value */ CloudStorageConfig.State = (function() { var valuesById = {}, values = Object.create(valuesById); @@ -9551,6 +9581,7 @@ values[valuesById[2] = "PERMISSION_DENIED"] = 2; values[valuesById[3] = "NOT_FOUND"] = 3; values[valuesById[4] = "IN_TRANSIT_LOCATION_RESTRICTION"] = 4; + values[valuesById[5] = "SCHEMA_MISMATCH"] = 5; return values; })(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index e37e3bd2530..6497622c428 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1389,6 +1389,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "useTopicSchema": { + "type": "bool", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -1398,7 +1405,8 @@ "ACTIVE": 1, "PERMISSION_DENIED": 2, "NOT_FOUND": 3, - "IN_TRANSIT_LOCATION_RESTRICTION": 4 + "IN_TRANSIT_LOCATION_RESTRICTION": 4, + "SCHEMA_MISMATCH": 5 } } } From 9fd6718121ced6b5f1e97d1030a05573324e8d2f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 20:24:20 +0000 Subject: [PATCH 1027/1115] feat: add max messages batching for Cloud Storage subscriptions (#1956) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 651799920 Source-Link: https://togithub.com/googleapis/googleapis/commit/8148b2fde13d3ed79cf285e9c529572aa8cf6ef7 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/1a41634b2c8b7c5c7ea79e9d86f514b532f17d08 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMWE0MTYzNGIyYzhiN2M1YzdlYTc5ZTlkODZmNTE0YjUzMmYxN2QwOCJ9 --- handwritten/pubsub/.eslintignore | 6 +-- .../protos/google/pubsub/v1/pubsub.proto | 4 ++ handwritten/pubsub/protos/protos.d.ts | 6 +++ handwritten/pubsub/protos/protos.js | 37 +++++++++++++++++++ handwritten/pubsub/protos/protos.json | 7 ++++ 5 files changed, 56 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index a5e47c7e764..cfc348ec4d1 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -1,9 +1,7 @@ **/node_modules -**/coverage -test/fixtures +**/.coverage build/ docs/ -owl-bot-staging/ protos/ +system-test/ samples/generated/ -system-test/**/fixtures diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index b70bda11a33..b5092087a37 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1240,6 +1240,10 @@ message CloudStorageConfig { // be exceeded in cases where messages are larger than the limit. int64 max_bytes = 7 [(google.api.field_behavior) = OPTIONAL]; + // Optional. The maximum number of messages that can be written to a Cloud + // Storage file before a new file is created. Min 1000 messages. + int64 max_messages = 8 [(google.api.field_behavior) = OPTIONAL]; + // Output only. An output-only field that indicates whether or not the // subscription can receive messages. State state = 9 [(google.api.field_behavior) = OUTPUT_ONLY]; diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 19956f26c79..69f782b8d97 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -3754,6 +3754,9 @@ export namespace google { /** CloudStorageConfig maxBytes */ maxBytes?: (number|Long|string|null); + /** CloudStorageConfig maxMessages */ + maxMessages?: (number|Long|string|null); + /** CloudStorageConfig state */ state?: (google.pubsub.v1.CloudStorageConfig.State|keyof typeof google.pubsub.v1.CloudStorageConfig.State|null); @@ -3794,6 +3797,9 @@ export namespace google { /** CloudStorageConfig maxBytes. */ public maxBytes: (number|Long|string); + /** CloudStorageConfig maxMessages. */ + public maxMessages: (number|Long|string); + /** CloudStorageConfig state. */ public state: (google.pubsub.v1.CloudStorageConfig.State|keyof typeof google.pubsub.v1.CloudStorageConfig.State); diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index b439f7b680b..5b9a057d58b 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -8672,6 +8672,7 @@ * @property {google.pubsub.v1.CloudStorageConfig.IAvroConfig|null} [avroConfig] CloudStorageConfig avroConfig * @property {google.protobuf.IDuration|null} [maxDuration] CloudStorageConfig maxDuration * @property {number|Long|null} [maxBytes] CloudStorageConfig maxBytes + * @property {number|Long|null} [maxMessages] CloudStorageConfig maxMessages * @property {google.pubsub.v1.CloudStorageConfig.State|null} [state] CloudStorageConfig state * @property {string|null} [serviceAccountEmail] CloudStorageConfig serviceAccountEmail */ @@ -8755,6 +8756,14 @@ */ CloudStorageConfig.prototype.maxBytes = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + /** + * CloudStorageConfig maxMessages. + * @member {number|Long} maxMessages + * @memberof google.pubsub.v1.CloudStorageConfig + * @instance + */ + CloudStorageConfig.prototype.maxMessages = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + /** * CloudStorageConfig state. * @member {google.pubsub.v1.CloudStorageConfig.State} state @@ -8823,6 +8832,8 @@ $root.google.protobuf.Duration.encode(message.maxDuration, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); if (message.maxBytes != null && Object.hasOwnProperty.call(message, "maxBytes")) writer.uint32(/* id 7, wireType 0 =*/56).int64(message.maxBytes); + if (message.maxMessages != null && Object.hasOwnProperty.call(message, "maxMessages")) + writer.uint32(/* id 8, wireType 0 =*/64).int64(message.maxMessages); if (message.state != null && Object.hasOwnProperty.call(message, "state")) writer.uint32(/* id 9, wireType 0 =*/72).int32(message.state); if (message.filenameDatetimeFormat != null && Object.hasOwnProperty.call(message, "filenameDatetimeFormat")) @@ -8895,6 +8906,10 @@ message.maxBytes = reader.int64(); break; } + case 8: { + message.maxMessages = reader.int64(); + break; + } case 9: { message.state = reader.int32(); break; @@ -8977,6 +8992,9 @@ if (message.maxBytes != null && message.hasOwnProperty("maxBytes")) if (!$util.isInteger(message.maxBytes) && !(message.maxBytes && $util.isInteger(message.maxBytes.low) && $util.isInteger(message.maxBytes.high))) return "maxBytes: integer|Long expected"; + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + if (!$util.isInteger(message.maxMessages) && !(message.maxMessages && $util.isInteger(message.maxMessages.low) && $util.isInteger(message.maxMessages.high))) + return "maxMessages: integer|Long expected"; if (message.state != null && message.hasOwnProperty("state")) switch (message.state) { default: @@ -9039,6 +9057,15 @@ message.maxBytes = object.maxBytes; else if (typeof object.maxBytes === "object") message.maxBytes = new $util.LongBits(object.maxBytes.low >>> 0, object.maxBytes.high >>> 0).toNumber(); + if (object.maxMessages != null) + if ($util.Long) + (message.maxMessages = $util.Long.fromValue(object.maxMessages)).unsigned = false; + else if (typeof object.maxMessages === "string") + message.maxMessages = parseInt(object.maxMessages, 10); + else if (typeof object.maxMessages === "number") + message.maxMessages = object.maxMessages; + else if (typeof object.maxMessages === "object") + message.maxMessages = new $util.LongBits(object.maxMessages.low >>> 0, object.maxMessages.high >>> 0).toNumber(); switch (object.state) { default: if (typeof object.state === "number") { @@ -9099,6 +9126,11 @@ object.maxBytes = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; } else object.maxBytes = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.maxMessages = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.maxMessages = options.longs === String ? "0" : 0; object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; object.filenameDatetimeFormat = ""; object.serviceAccountEmail = ""; @@ -9126,6 +9158,11 @@ object.maxBytes = options.longs === String ? String(message.maxBytes) : message.maxBytes; else object.maxBytes = options.longs === String ? $util.Long.prototype.toString.call(message.maxBytes) : options.longs === Number ? new $util.LongBits(message.maxBytes.low >>> 0, message.maxBytes.high >>> 0).toNumber() : message.maxBytes; + if (message.maxMessages != null && message.hasOwnProperty("maxMessages")) + if (typeof message.maxMessages === "number") + object.maxMessages = options.longs === String ? String(message.maxMessages) : message.maxMessages; + else + object.maxMessages = options.longs === String ? $util.Long.prototype.toString.call(message.maxMessages) : options.longs === Number ? new $util.LongBits(message.maxMessages.low >>> 0, message.maxMessages.high >>> 0).toNumber() : message.maxMessages; if (message.state != null && message.hasOwnProperty("state")) object.state = options.enums === String ? $root.google.pubsub.v1.CloudStorageConfig.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.CloudStorageConfig.State[message.state] : message.state; if (message.filenameDatetimeFormat != null && message.hasOwnProperty("filenameDatetimeFormat")) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 6497622c428..70e570e047a 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1362,6 +1362,13 @@ "(google.api.field_behavior)": "OPTIONAL" } }, + "maxMessages": { + "type": "int64", + "id": 8, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, "state": { "type": "State", "id": 9, From 201f99922d02ac056707f3cf8a14ef17aabe22a6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:29:52 -0400 Subject: [PATCH 1028/1115] chore(main): release 4.6.0 (#1950) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 13 +++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 7dc7dd3a0d1..bb5e66b4241 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,19 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.6.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.5.0...v4.6.0) (2024-07-12) + + +### Features + +* Add max messages batching for Cloud Storage subscriptions ([#1956](https://github.com/googleapis/nodejs-pubsub/issues/1956)) ([90546f6](https://github.com/googleapis/nodejs-pubsub/commit/90546f634cc4e510185e20a4d1ba1c74ebc59b85)) +* Add use_topic_schema for Cloud Storage Subscriptions ([#1948](https://github.com/googleapis/nodejs-pubsub/issues/1948)) ([120fa1b](https://github.com/googleapis/nodejs-pubsub/commit/120fa1bca0516185e109260c69ea91eb7ddeecd0)) + + +### Bug Fixes + +* **docs samples:** Update missing argv in sample metadata for push subscription ([#1946](https://github.com/googleapis/nodejs-pubsub/issues/1946)) ([34b8c03](https://github.com/googleapis/nodejs-pubsub/commit/34b8c03f90618ba6ae506764b9d97d9db84dcada)) + ## [4.5.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.4.1...v4.5.0) (2024-06-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index be0ebb8067a..48eb8147444 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.5.0", + "version": "4.6.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From e7c8226be7a0375c3a69b12ecf6f05116ba277f4 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:19:19 -0400 Subject: [PATCH 1029/1115] feat: add support for OTel context propagation and harmonized spans (#1833) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: use the propagation inject framework for OpenTelemetry publishes * feat: add propagation extraction to subscriber for OpenTelemetry * feat: work in progress on adding sub-spans * add more spans * wrap subscriber on() handlers to get better receive process spans * update otel core version for tests * fix: change some span names for doc updates * fix: move emitter wrapper out one level, to catch user functions properly * fix: don't send anything besides what's actually needed during publish * fix: close the publish span at RPC time, not up front * fix: delay caching of the trace provider so the user has a chance to make one * build: bring OTel versions back to compatible with Node 12 * fix: clean up a few more namespace pollution issues in OTel support * tests: manually end the publish span for tests * build: update package names for recent version updates * chore: get versions of OTel that work together and with Node 12 * chore: linter nit * chore: another linter nit * chore: OTel sample formatting * chore: some internal renaming to reflect the function rather than name of telemetry tracing * fix: more work towards the Promise-first publish flow * tests: remove unnecessary init line * fix: add tracing support for updating the topic name in publisher spans * fix: use the most up to date name for topic, subscription, and iam * fix: update telemetry spans before publishing, in case the topic name wasn't ready * chore: calm linter qualms * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: update drain() not to promisify * tests: update unit tests for recent promise changes to publish() * feat: add modAck spans during leasing * docs: add more code comment docs * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * tests: unit test fixes, also include deadline and initial parameters for modAck * fix: make sure the subscriber span ends, update sample * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * tests: update unit test for latest changes * chore: pull promise-based publish out of OTel change * tests: update otel sample test * wip: end all telemetry spans when clear() is called * wip: add more unit tests * fix: include batch size with each published message span * chore: fix lint * fix: separate out the getter and setter classes * chore: rename span related objects in subscriber * chore: rename SpanMaker * docs: improved comments and lint fixes * docs: more class/comment updating * fix: missing spans caused by renames; also do more renames * tests: more renaming issues * tests: add otel test for FlowControlledPublisher * tests: add lease manager tests for otel * tests: add SubscriberSpans unit tests * fix: simplify logic for HTTP/1.1 REST fallback option (#1809) * fix: simplify logic for HTTP/1.1 REST fallback option For the `fallback` parameter, all values considered as `true` in Boolean context will enable HTTP/1.1 REST fallback, since the other fallback transport, proto over HTTP, is removed from `google-gax` v4. PiperOrigin-RevId: 559812260 Source-Link: https://github.com/googleapis/googleapis/commit/6a6fd29a79fe2846001d90d93e79a19fcc303b85 Source-Link: https://github.com/googleapis/googleapis-gen/commit/56c16657e7a59122b1da94771a9ef40989c282c0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTZjMTY2NTdlN2E1OTEyMmIxZGE5NDc3MWE5ZWY0MDk4OWMyODJjMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot * build: update Node.js version and base Debian version (#1793) * build: update Node.js version and base Debian version * test: update Python and Node versions in container test YAMLs Source-Link: https://github.com/googleapis/synthtool/commit/f54a720df6ece8ead2bf2a888df1194d7a339fb6 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:aeccbef8061fc122542e8f381c4e7b66b32e23dda522e94c68346585dc408f0d Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> * docs: fix node release schedule link (#1794) Co-authored-by: Jeffrey Rennie Source-Link: https://github.com/googleapis/synthtool/commit/1a2431537d603e95b4b32317fb494542f75a2165 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:e08f9a3757808cdaf7a377e962308c65c4d7eff12db206d4fae702dd50d43430 Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> * chore: update release-please post-processing for nodejs apiary (#1805) * chore: update release-please post-processing for nodejs apiary Source-Link: https://github.com/googleapis/synthtool/commit/59fe44fde9866a26e7ee4e4450fd79f67f8cf599 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:606f3d9d99a1c7cdfa7158cbb1a75bfeef490655e246a2052f9ee741740d736c Co-authored-by: Owl Bot * fix: Make retry policy back off more aggressively for RPCs that retry RESOURCE_EXHAUSTD (#1806) * fix: Make retry policy back off more aggressively for RPCs that retry RESOURCE_EXHAUSTD PiperOrigin-RevId: 557935020 Source-Link: https://github.com/googleapis/googleapis/commit/38e1f31e46d840075f14d9716b592e8a53c89855 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5bbe39d37218a420b2368c37541de5887db7d6af Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWJiZTM5ZDM3MjE4YTQyMGIyMzY4YzM3NTQxZGU1ODg3ZGI3ZDZhZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot * fix: set grpc keepalive time|outs by default (#1814) * fix: always fill the topic and sub names when creating from a PubSub object (#1816) * chore(legacy-v3): release 3.7.4 (#1820) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> * docs: update copyrights to make header-check happy * chore: remove left-in console.trace * feat: update opentelemetry packages to latest * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * samples: mostly whitespace, but updated OTel sample * feat: updates for the new design doc: batching, events, separate RPC span * tests: fix / update tests for batch changes * feat: change ack/nack/modack to be events * fix: fixes for previous commits * fix: move span closing to subscriber, upon (n)ack * docs: update custom gcp attributes * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * docs: update subscriber comments * tests: add unit tests for shutdown events * fix: missed commits from previous * fix: update span attributes for ordering key Co-authored-by: Anna Levenberg * fix: update gcp.pubsub to gcp_pubsub * feat: add back in receive response spans * docs: fix inadequate comments for deadline * feat: add ack/nack/modack events in processing * fix: publisher -> publish scheduler Co-authored-by: Anna Levenberg * chore: fix intermediate samples build exclusion * feat: update otel span names and attributes to latest spec * chore: remove extraneous import * feat: add publish start/end events * docs: comment updates about modack spans * tests: add a bunch of unit tests for new otel stuff * fix: subId might be undefined * fix: revert incorrect attribute change * docs: clarify some comments * tests: update the test for the last commit * fix: change processing span to use ack/nack instead of callback time * docs: fix copyright ranges on renamed/updated files * chore: OTel changed how semantic attribute names are specified * tests: update otel sample tests for latest changes * samples: update JS otel sample from TS * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * samples: update otel tracing sample with the correct tags and some other cleanup * samples: split otel samples into listen/publish * tests: fix resource name for otel * build: remove defunct typing * feat: add support for globally enabling (and disabling) otel tracing * feat: add bidi links between RPC and message spans, and filter by isSampled * feat: track code.function * docs: update comment based on CR * tests: publishSpan might be undefined if tracing isn't enabled * chore: small merge issue * fix: update spans for ack/modack to match newest spec * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * samples: add the otel enable flag to new otel samples * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * docs: last minute review, mostly adding private/internal doc tags --------- Co-authored-by: Owl Bot Co-authored-by: gcf-owl-bot[bot] <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Anna Levenberg --- handwritten/pubsub/.gitignore | 2 +- handwritten/pubsub/README.md | 3 +- handwritten/pubsub/package.json | 7 +- handwritten/pubsub/protos/protos.json | 3 + handwritten/pubsub/src/iam.ts | 25 +- handwritten/pubsub/src/index.ts | 5 + handwritten/pubsub/src/lease-manager.ts | 37 +- handwritten/pubsub/src/message-queues.ts | 46 +- .../pubsub/src/opentelemetry-tracing.ts | 61 -- .../pubsub/src/publisher/flow-publisher.ts | 5 + handwritten/pubsub/src/publisher/index.ts | 90 +- .../pubsub/src/publisher/message-batch.ts | 33 +- .../pubsub/src/publisher/message-queues.ts | 43 +- .../pubsub/src/publisher/pubsub-message.ts | 74 +- handwritten/pubsub/src/pubsub.ts | 29 +- handwritten/pubsub/src/subscriber.ts | 318 ++++-- handwritten/pubsub/src/subscription.ts | 17 +- handwritten/pubsub/src/telemetry-tracing.ts | 911 ++++++++++++++++++ handwritten/pubsub/src/topic.ts | 15 +- handwritten/pubsub/test/iam.ts | 11 +- handwritten/pubsub/test/lease-manager.ts | 23 + handwritten/pubsub/test/message-queues.ts | 6 +- .../pubsub/test/opentelemetry-tracing.ts | 60 -- .../pubsub/test/publisher/flow-publisher.ts | 27 +- handwritten/pubsub/test/publisher/index.ts | 47 +- .../pubsub/test/publisher/message-batch.ts | 10 +- .../pubsub/test/publisher/message-queues.ts | 12 +- handwritten/pubsub/test/pubsub.ts | 50 +- handwritten/pubsub/test/subscriber.ts | 212 +++- handwritten/pubsub/test/subscription.ts | 9 +- handwritten/pubsub/test/telemetry-tracing.ts | 397 ++++++++ handwritten/pubsub/test/topic.ts | 2 +- handwritten/pubsub/test/tracing.ts | 2 +- 33 files changed, 2187 insertions(+), 405 deletions(-) delete mode 100644 handwritten/pubsub/src/opentelemetry-tracing.ts create mode 100644 handwritten/pubsub/src/telemetry-tracing.ts delete mode 100644 handwritten/pubsub/test/opentelemetry-tracing.ts create mode 100644 handwritten/pubsub/test/telemetry-tracing.ts diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index d4f03a0df2e..661747bf126 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -5,7 +5,7 @@ /.nyc_output /docs/ /out/ -/build/ +**/build/ system-test/secrets.js system-test/*key.json *.lock diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 73557136068..94ac16b3da6 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -163,8 +163,8 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | 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) | +| Subscribe with OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenWithOpenTelemetryTracing.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/listenWithOpenTelemetryTracing.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) | -| OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/openTelemetryTracing.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/openTelemetryTracing.js,samples/README.md) | | Publish Avro Records to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishAvroRecords.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/publishAvroRecords.js,samples/README.md) | | Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | | Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessage.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/publishMessage.js,samples/README.md) | @@ -172,6 +172,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | | Publish Protobuf Messages to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishProtobufMessages.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/publishProtobufMessages.js,samples/README.md) | | Publish with flow control | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithFlowControl.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/publishWithFlowControl.js,samples/README.md) | +| Publish with OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithOpenTelemetryTracing.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/publishWithOpenTelemetryTracing.js,samples/README.md) | | Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | | Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/quickstart.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/quickstart.js,samples/README.md) | | Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 48eb8147444..61816dec22b 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -51,8 +51,8 @@ "@google-cloud/precise-date": "^4.0.0", "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", - "@opentelemetry/api": "~1.8.0", - "@opentelemetry/semantic-conventions": "~1.21.0", + "@opentelemetry/api": "~1.9.0", + "@opentelemetry/semantic-conventions": "~1.25.1", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", @@ -64,7 +64,8 @@ }, "devDependencies": { "@grpc/proto-loader": "^0.7.0", - "@opentelemetry/tracing": "^0.24.0", + "@opentelemetry/core": "^1.17.0", + "@opentelemetry/sdk-trace-base": "^1.17.0", "@types/duplexify": "^3.6.4", "@types/extend": "^3.0.0", "@types/lodash.snakecase": "^4.1.6", diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 70e570e047a..ad639ed00fb 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1,4 +1,7 @@ { + "options": { + "syntax": "proto3" + }, "nested": { "google": { "nested": { diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index 87e4184ab5d..efc77501346 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -34,6 +34,15 @@ export type SetPolicyCallback = RequestCallback; export type SetPolicyResponse = [Policy]; export type GetPolicyResponse = [Policy]; +/** + * Allows us to get the most up to date full name of an object. + * + * @private + */ +export interface Nameable { + name: string; +} + /** * Shows which IAM permissions is allowed. * The key to this object are the IAM permissions (string) and the values are @@ -95,12 +104,22 @@ export type TestIamPermissionsCallback = ResourceCallback< export class IAM { pubsub: PubSub; request: typeof PubSub.prototype.request; - id: string; + private nameable_: Nameable; - constructor(pubsub: PubSub, id: string) { + constructor(pubsub: PubSub, nameOrNameable: Nameable | string) { this.pubsub = pubsub; this.request = pubsub.request.bind(pubsub); - this.id = id; + if (typeof nameOrNameable === 'string') { + this.nameable_ = { + name: nameOrNameable, + }; + } else { + this.nameable_ = nameOrNameable; + } + } + + get id(): string { + return this.nameable_.name; } /** diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index aa80682ba42..abc8afb0899 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -184,3 +184,8 @@ if (process.env.DEBUG_GRPC) { } import * as protos from '../protos/protos'; export {protos}; + +// Deprecated; please see the updated OpenTelemetry sample +// for an example of how to use telemetry in this library. +import {legacyExports} from './telemetry-tracing'; +export {legacyExports as openTelemetry}; diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index d31c7111ffc..88e92640a25 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -17,6 +17,7 @@ import {EventEmitter} from 'events'; import {AckError, Message, Subscriber} from './subscriber'; import {defaultOptions} from './default-options'; +import {Duration} from './temporal'; export interface FlowControlOptions { allowExcessMessages?: boolean; @@ -104,6 +105,8 @@ export class LeaseManager extends EventEmitter { this._messages.add(message); this.bytes += message.length; + message.subSpans.flowStart(); + if (allowExcessMessages! || !wasFull) { this._dispense(message); } else { @@ -120,13 +123,14 @@ export class LeaseManager extends EventEmitter { } } /** - * Removes ALL messages from inventory. + * Removes ALL messages from inventory, and returns the ones removed. * @private */ - clear(): void { + clear(): Message[] { const wasFull = this.isFull(); this._pending = []; + const remaining = Array.from(this._messages); this._messages.clear(); this.bytes = 0; @@ -135,6 +139,8 @@ export class LeaseManager extends EventEmitter { } this._cancelExtension(); + + return remaining; } /** * Indicates if we're at or over capacity. @@ -240,7 +246,11 @@ export class LeaseManager extends EventEmitter { */ private _dispense(message: Message): void { if (this._subscriber.isOpen) { - process.nextTick(() => this._subscriber.emit('message', message)); + message.subSpans.flowEnd(); + process.nextTick(() => { + message.subSpans.processingStart(this._subscriber.name); + this._subscriber.emit('message', message); + }); } } /** @@ -257,15 +267,24 @@ export class LeaseManager extends EventEmitter { const lifespan = (Date.now() - message.received) / (60 * 1000); if (lifespan < this._options.maxExtensionMinutes!) { + const deadlineDuration = Duration.from({seconds: deadline}); + message.subSpans.modAckStart(deadlineDuration, false); + if (this._subscriber.isExactlyOnceDelivery) { - message.modAckWithResponse(deadline).catch(e => { - // In the case of a permanent failure (temporary failures are retried), - // we need to stop trying to lease-manage the message. - message.ackFailed(e as AckError); - this.remove(message); - }); + message + .modAckWithResponse(deadline) + .catch(e => { + // In the case of a permanent failure (temporary failures are retried), + // we need to stop trying to lease-manage the message. + message.ackFailed(e as AckError); + this.remove(message); + }) + .finally(() => { + message.subSpans.modAckEnd(); + }); } else { message.modAck(deadline); + message.subSpans.modAckStart(deadlineDuration, false); } } else { this.remove(message); diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index e40be22659a..6dfefc2cf88 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -33,13 +33,19 @@ import { import {Duration} from './temporal'; import {addToBucket} from './util'; import {DebugMessage} from './debug'; +import * as tracing from './telemetry-tracing'; + +export interface ReducedMessage { + ackId: string; + tracingSpan?: tracing.Span; +} /** * @private */ export interface QueuedMessage { - ackId: string; - deadline?: number; + message: ReducedMessage; + deadline?: number; // seconds responsePromise?: defer.DeferredPromise; retryCount: number; } @@ -176,10 +182,10 @@ export abstract class MessageQueue { * Adds a message to the queue. * * @param {Message} message The message to add. - * @param {number} [deadline] The deadline. + * @param {number} [deadline] The deadline in seconds. * @private */ - add({ackId}: Message, deadline?: number): Promise { + add(message: Message, deadline?: number): Promise { if (this._closed) { if (this._subscriber.isExactlyOnceDelivery) { throw new AckError(AckResponses.Invalid, 'Subscriber closed'); @@ -192,7 +198,10 @@ export abstract class MessageQueue { const responsePromise = defer(); this._requests.push({ - ackId, + message: { + ackId: message.ackId, + tracingSpan: message.parentSpan, + }, deadline, responsePromise, retryCount: 0, @@ -379,9 +388,9 @@ export abstract class MessageQueue { const codes: AckErrorCodes = processAckErrorInfo(rpcError); for (const m of batch) { - if (codes.has(m.ackId)) { + if (codes.has(m.message.ackId)) { // This ack has an ErrorInfo entry, so use that to route it. - const code = codes.get(m.ackId)!; + const code = codes.get(m.message.ackId)!; if (code.transient) { // Transient errors get retried. toRetry.push(m); @@ -407,7 +416,7 @@ export abstract class MessageQueue { // stream message if an unknown error happens during ack. const others = toError.get(AckResponses.Other); if (others?.length) { - const otherIds = others.map(e => e.ackId); + const otherIds = others.map(e => e.message.ackId); const debugMsg = new BatchError(rpcError, otherIds, operation); this._subscriber.emit('debug', debugMsg); } @@ -468,8 +477,13 @@ export class AckQueue extends MessageQueue { * @return {Promise} */ protected async _sendBatch(batch: QueuedMessages): Promise { + const responseSpan = tracing.PubsubSpans.createAckRpcSpan( + batch.map(b => b.message.tracingSpan), + this._subscriber.name, + 'AckQueue._sendBatch' + ); const client = await this._subscriber.getClient(); - const ackIds = batch.map(({ackId}) => ackId); + const ackIds = batch.map(({message}) => message.ackId); const reqOpts = {subscription: this._subscriber.name, ackIds}; try { @@ -477,6 +491,7 @@ export class AckQueue extends MessageQueue { // It's okay if these pass through since they're successful anyway. this.handleAckSuccesses(batch); + responseSpan?.end(); return []; } catch (e) { // If exactly-once delivery isn't enabled, don't do error processing. We'll @@ -500,6 +515,7 @@ export class AckQueue extends MessageQueue { batch.forEach(m => { m.responsePromise?.reject(exc); }); + responseSpan?.end(); return []; } } @@ -541,13 +557,23 @@ export class ModAckQueue extends MessageQueue { const callOptions = this.getCallOptions(); const modAckRequests = Object.keys(modAckTable).map(async deadline => { const messages = modAckTable[deadline]; - const ackIds = messages.map(m => m.ackId); + const ackIds = messages.map(m => m.message.ackId); const ackDeadlineSeconds = Number(deadline); const reqOpts = {subscription, ackIds, ackDeadlineSeconds}; + const responseSpan = tracing.PubsubSpans.createModackRpcSpan( + messages.map(b => b.message.tracingSpan), + this._subscriber.name, + ackDeadlineSeconds === 0 ? 'nack' : 'modack', + 'ModAckQueue._sendBatch', + Duration.from({seconds: ackDeadlineSeconds}) + ); + try { await client.modifyAckDeadline(reqOpts, callOptions); + responseSpan?.end(); + // It's okay if these pass through since they're successful anyway. this.handleAckSuccesses(messages); return []; diff --git a/handwritten/pubsub/src/opentelemetry-tracing.ts b/handwritten/pubsub/src/opentelemetry-tracing.ts deleted file mode 100644 index df3836f7273..00000000000 --- a/handwritten/pubsub/src/opentelemetry-tracing.ts +++ /dev/null @@ -1,61 +0,0 @@ -/*! - * Copyright 2020 Google LLC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - Tracer, - SpanAttributes, - SpanContext, - Span, - context, - trace, - SpanKind, -} from '@opentelemetry/api'; - -// eslint-disable-next-line @typescript-eslint/no-var-requires -const PKG = require('../../package.json'); - -/** - * @internal - * Instantiates a Opentelemetry tracer for the library - */ -const libraryTracer: Tracer = trace.getTracer( - '@google-cloud/pubsub', - PKG.version -); - -/** - * Creates a new span with the given properties - * - * @param {string} spanName the name for the span - * @param {Attributes?} attributes an object containing the attributes to be set for the span - * @param {SpanContext?} parent the context of the parent span to link to the span - */ -export function createSpan( - spanName: string, - kind: SpanKind, - attributes?: SpanAttributes, - parent?: SpanContext -): Span { - return libraryTracer.startSpan( - spanName, - { - // set the kind of the span - kind, - // set the attributes of the span - attributes: attributes, - }, - parent ? trace.setSpanContext(context.active(), parent) : undefined - ); -} diff --git a/handwritten/pubsub/src/publisher/flow-publisher.ts b/handwritten/pubsub/src/publisher/flow-publisher.ts index ebfee5b0faa..74e3b32797f 100644 --- a/handwritten/pubsub/src/publisher/flow-publisher.ts +++ b/handwritten/pubsub/src/publisher/flow-publisher.ts @@ -17,6 +17,7 @@ import {Publisher} from '.'; import {FlowControl} from './flow-control'; import {PubsubMessage, calculateMessageSize} from './pubsub-message'; +import * as tracing from '../telemetry-tracing'; /** * Encapsulates a series of message publishes from a rapid loop (or similar @@ -76,7 +77,11 @@ export class FlowControlledPublisher { * ``` */ publish(message: PubsubMessage): Promise | null { + const flowSpan = message.parentSpan + ? tracing.PubsubSpans.createPublishFlowSpan(message) + : undefined; const doPublish = () => { + flowSpan?.end(); this.doPublish(message); }; diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index aa017a46d6d..a4ab81fa6fb 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -16,15 +16,14 @@ import * as extend from 'extend'; import {CallOptions} from 'google-gax'; -import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; -import {isSpanContextValid, Span, SpanKind} from '@opentelemetry/api'; +import {isSpanContextValid, Span} from '@opentelemetry/api'; import {BatchPublishOptions} from './message-batch'; import {Queue, OrderedQueue} from './message-queues'; import {Topic} from '../topic'; import {RequestCallback, EmptyCallback} from '../pubsub'; import {defaultOptions} from '../default-options'; -import {createSpan} from '../opentelemetry-tracing'; +import * as tracing from '../telemetry-tracing'; import {FlowControl, FlowControlOptions} from './flow-control'; import {promisifySome} from '../util'; @@ -39,6 +38,8 @@ export interface PublishOptions { flowControlOptions?: FlowControlOptions; gaxOpts?: CallOptions; messageOrdering?: boolean; + + /** @deprecated Unset and use context propagation. */ enableOpenTelemetryTracing?: boolean; } @@ -209,29 +210,23 @@ export class Publisher { } } - const span: Span | undefined = this.constructSpan(message); + // Ensure that there's a parent span for subsequent publishes + // to hang off of. + this.getParentSpan(message, 'Publisher.publishMessage'); if (!message.orderingKey) { this.queue.add(message, callback!); - if (span) { - span.end(); - } - return; - } - - const key = message.orderingKey; - - if (!this.orderedQueues.has(key)) { - const queue = new OrderedQueue(this, key); - this.orderedQueues.set(key, queue); - queue.once('drain', () => this.orderedQueues.delete(key)); - } + } else { + const key = message.orderingKey; - const queue = this.orderedQueues.get(key)!; - queue.add(message, callback!); + if (!this.orderedQueues.has(key)) { + const queue = new OrderedQueue(this, key); + this.orderedQueues.set(key, queue); + queue.once('drain', () => this.orderedQueues.delete(key)); + } - if (span) { - span.end(); + const queue = this.orderedQueues.get(key)!; + queue.add(message, callback!); } } @@ -332,54 +327,31 @@ export class Publisher { } /** - * Constructs an OpenTelemetry span + * Finds or constructs an telemetry publish/parent span for a message. * * @private * * @param {PubsubMessage} message The message to create a span for */ - constructSpan(message: PubsubMessage): Span | undefined { - if (!this.settings.enableOpenTelemetryTracing) { + getParentSpan(message: PubsubMessage, caller: string): Span | undefined { + const enabled = tracing.isEnabled(this.settings); + if (!enabled) { return undefined; } - const spanAttributes = { - // Add Opentelemetry semantic convention attributes to the span, based on: - // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.1.0/specification/trace/semantic_conventions/messaging.md - [SemanticAttributes.MESSAGING_TEMP_DESTINATION]: false, - [SemanticAttributes.MESSAGING_SYSTEM]: 'pubsub', - [SemanticAttributes.MESSAGING_OPERATION]: 'send', - [SemanticAttributes.MESSAGING_DESTINATION]: this.topic.name, - [SemanticAttributes.MESSAGING_DESTINATION_KIND]: 'topic', - [SemanticAttributes.MESSAGING_MESSAGE_ID]: message.messageId, - [SemanticAttributes.MESSAGING_PROTOCOL]: 'pubsub', - [SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: - message.data?.length, - 'messaging.pubsub.ordering_key': message.orderingKey, - } as Attributes; - - const span: Span = createSpan( - `${this.topic.name} send`, - SpanKind.PRODUCER, - spanAttributes - ); + if (message.parentSpan) { + return message.parentSpan; + } - // If the span's context is valid we should pass the span context special attribute - if (isSpanContextValid(span.spanContext())) { - if ( - message.attributes && - message.attributes['googclient_OpenTelemetrySpanContext'] - ) { - console.warn( - 'googclient_OpenTelemetrySpanContext key set as message attribute, but will be overridden.' - ); - } - if (!message.attributes) { - message.attributes = {}; - } + const span = tracing.PubsubSpans.createPublisherSpan( + message, + this.topic.name, + caller + ); - message.attributes['googclient_OpenTelemetrySpanContext'] = - JSON.stringify(span.spanContext()); + // If the span's context is valid we should inject the propagation trace context. + if (span && isSpanContextValid(span.spanContext())) { + tracing.injectSpan(span, message, enabled); } return span; diff --git a/handwritten/pubsub/src/publisher/message-batch.ts b/handwritten/pubsub/src/publisher/message-batch.ts index 07a6222ce52..a1ecdb0bfe6 100644 --- a/handwritten/pubsub/src/publisher/message-batch.ts +++ b/handwritten/pubsub/src/publisher/message-batch.ts @@ -16,6 +16,7 @@ import {BATCH_LIMITS, PubsubMessage, PublishCallback} from './'; import {calculateMessageSize} from './pubsub-message'; +import * as tracing from '../telemetry-tracing'; export interface BatchPublishOptions { maxBytes?: number; @@ -23,6 +24,17 @@ export interface BatchPublishOptions { maxMilliseconds?: number; } +/** + * Encapsulates a completed batch of messages. + * + * @private + * @internal + */ +export interface BatchResults { + messages: PubsubMessage[]; + callbacks: PublishCallback[]; +} + /** * @typedef BatchPublishOptions * @property {number} [maxBytes=1 * 1024 * 1024] The maximum number of bytes to @@ -40,13 +52,15 @@ export interface BatchPublishOptions { * @param {BatchPublishOptions} options The batching options. */ export class MessageBatch { - options: BatchPublishOptions; messages: PubsubMessage[]; callbacks: PublishCallback[]; created: number; bytes: number; - constructor(options: BatchPublishOptions) { - this.options = options; + + constructor( + public options: BatchPublishOptions, + public topicName: string + ) { this.messages = []; this.callbacks = []; this.created = Date.now(); @@ -72,7 +86,18 @@ export class MessageBatch { this.messages.push(message); this.callbacks.push(callback); this.bytes += calculateMessageSize(message); + + tracing.PubsubSpans.createPublishSchedulerSpan(message); + } + + end(): BatchResults { + this.messages.forEach(m => m.publishSchedulerSpan?.end()); + return { + messages: this.messages, + callbacks: this.callbacks, + }; } + /** * Indicates if a given message can fit in the batch. * @@ -86,6 +111,7 @@ export class MessageBatch { this.bytes + calculateMessageSize(message) <= maxBytes! ); } + /** * Checks to see if this batch is at the maximum allowed payload size. * When publishing ordered messages, it is ok to exceed the user configured @@ -97,6 +123,7 @@ export class MessageBatch { const {maxMessages, maxBytes} = BATCH_LIMITS; return this.messages.length >= maxMessages! || this.bytes >= maxBytes!; } + /** * Indicates if the batch is at capacity. * diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index be5742cbf90..8ed396bc8b7 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -21,7 +21,8 @@ import {BatchPublishOptions, MessageBatch} from './message-batch'; import {PublishError} from './publish-error'; import {Publisher, PubsubMessage, PublishCallback} from './'; import {google} from '../../protos/protos'; - +import * as tracing from '../telemetry-tracing'; +import {filterMessage} from './pubsub-message'; import {promisify} from 'util'; /** @@ -94,12 +95,32 @@ export abstract class MessageQueue extends EventEmitter { const {topic, settings} = this.publisher; const reqOpts = { topic: topic.name, - messages, + messages: messages.map(filterMessage), }; if (messages.length === 0) { return; } + // Make sure we have a projectId filled in to update telemetry spans. + // The overall spans may not have the correct projectId because it wasn't + // known at the time publishMessage was called. + const spanMessages = messages.filter(m => !!m.parentSpan); + if (spanMessages.length) { + if (!topic.pubsub.isIdResolved) { + await topic.pubsub.getClientConfig(); + } + spanMessages.forEach(m => { + tracing.PubsubSpans.updatePublisherTopicName(m.parentSpan!, topic.name); + tracing.PubsubEvents.publishStart(m); + }); + } + + const rpcSpan = tracing.PubsubSpans.createPublishRpcSpan( + spanMessages, + topic.name, + 'MessageQueue._publish' + ); + const requestCallback = topic.request; const request = promisify(requestCallback.bind(topic)); try { @@ -119,6 +140,14 @@ export abstract class MessageQueue extends EventEmitter { callbacks.forEach(callback => callback(err)); throw e; + } finally { + messages.forEach(m => { + // We're finished with both the RPC and the whole publish operation, + // so close out all of the related spans. + rpcSpan?.end(); + tracing.PubsubEvents.publishEnd(m); + m.parentSpan?.end(); + }); } } } @@ -135,7 +164,7 @@ export class Queue extends MessageQueue { batch: MessageBatch; constructor(publisher: Publisher) { super(publisher); - this.batch = new MessageBatch(this.batchOptions); + this.batch = new MessageBatch(this.batchOptions, this.publisher.topic.name); } // This needs to update our existing message batch. @@ -200,9 +229,9 @@ export class Queue extends MessageQueue { * @emits Queue#drain when all messages are sent. */ async _publishInternal(fullyDrain: boolean): Promise { - const {messages, callbacks} = this.batch; + const {messages, callbacks} = this.batch.end(); - this.batch = new MessageBatch(this.batchOptions); + this.batch = new MessageBatch(this.batchOptions, this.publisher.topic.name); if (this.pending) { clearTimeout(this.pending); @@ -326,7 +355,7 @@ export class OrderedQueue extends MessageQueue { * @returns {MessageBatch} */ createBatch(): MessageBatch { - return new MessageBatch(this.batchOptions); + return new MessageBatch(this.batchOptions, this.publisher.topic.name); } /** * In the event of a publish failure, we need to cache the error in question @@ -369,7 +398,7 @@ export class OrderedQueue extends MessageQueue { delete this.pending; } - const {messages, callbacks} = this.batches.pop()!; + const {messages, callbacks} = this.batches.pop()!.end(); try { await this._publish(messages, callbacks); diff --git a/handwritten/pubsub/src/publisher/pubsub-message.ts b/handwritten/pubsub/src/publisher/pubsub-message.ts index a1e1283d5ae..ac69563b164 100644 --- a/handwritten/pubsub/src/publisher/pubsub-message.ts +++ b/handwritten/pubsub/src/publisher/pubsub-message.ts @@ -15,6 +15,7 @@ */ import {google} from '../../protos/protos'; +import * as tracing from '../telemetry-tracing'; /** * Strings are the only allowed values for keys and values in message attributes. @@ -24,7 +25,9 @@ export type Attributes = Record; /** * The basic {data, attributes} for a message to be published. */ -export interface PubsubMessage extends google.pubsub.v1.IPubsubMessage { +export interface PubsubMessage + extends google.pubsub.v1.IPubsubMessage, + tracing.MessageWithAttributes { /** * If we've calculated the size of this message, it will be cached here. * This is done to avoid having to build up the attribute size over and over. @@ -33,8 +36,76 @@ export interface PubsubMessage extends google.pubsub.v1.IPubsubMessage { * may change, and it may disappear later. * * @private + * @internal */ calculatedSize?: number; + + // The following are here instead of inside an object (like subs) because we + // don't get to control what these objects are. They come from grpc. + + /** + * If tracing is enabled, track the message span. + * + * @private + * @internal + */ + messageSpan?: tracing.Span; + + /** + * If tracing is enabled, track the batching (publish scheduling) period. + * + * @private + * @internal + */ + publishSchedulerSpan?: tracing.Span; + + /** + * If this is a message being received from a subscription, expose the ackId + * internally. Primarily for tracing. + * + * @private + * @internal + */ + ackId?: string; + + /** + * If this is a message being received from a subscription, expose the exactly + * once delivery flag internally. Primarily for tracing. + * + * @private + * @internal + */ + isExactlyOnceDelivery?: boolean; +} + +/** + * Since we tag a fair number of extra things into messages sent to the Pub/Sub + * server, this filters everything down to what needs to be sent. This should be + * used right before gRPC calls. + * + * @private + * @internal + */ +export function filterMessage( + message: PubsubMessage +): google.pubsub.v1.IPubsubMessage { + const filtered = {} as PubsubMessage; + if (message.data) { + filtered.data = message.data; + } + if (message.attributes) { + filtered.attributes = message.attributes; + } + if (message.messageId) { + filtered.messageId = message.messageId; + } + if (message.publishTime) { + filtered.publishTime = message.publishTime; + } + if (message.orderingKey) { + filtered.orderingKey = message.orderingKey; + } + return filtered; } /** @@ -52,6 +123,7 @@ export interface PubsubMessage extends google.pubsub.v1.IPubsubMessage { * may change. * * @private + * @internal */ export function calculateMessageSize( message: PubsubMessage | google.pubsub.v1.IPubsubMessage diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 03a2ff9eb07..cbf0548c597 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -58,6 +58,7 @@ import {CallOptions} from 'google-gax'; import {Transform} from 'stream'; import {google} from '../protos/protos'; import {SchemaServiceClient} from './v1'; +import * as tracing from './telemetry-tracing'; /** * Project ID placeholder. @@ -88,6 +89,12 @@ export interface ClientConfig extends gax.GrpcClientOptions { servicePath?: string; port?: string | number; sslCreds?: gax.grpc.ChannelCredentials; + + /** + * Enables OpenTelemetry tracing (newer, more full implementation). This + * defaults to false/undefined + */ + enableOpenTelemetryTracing?: boolean; } export interface PageOptions { @@ -316,6 +323,11 @@ export class PubSub { }, options ); + + if (this.options.enableOpenTelemetryTracing) { + tracing.setGloballyEnabled(true); + } + /** * @name PubSub#isEmulator * @type {boolean} @@ -578,16 +590,6 @@ export class PubSub { } subscription.metadata = resp!; - // If this is the first call we've made, the projectId might be empty still. - if (subscription.name?.includes(PROJECT_ID_PLACEHOLDER)) { - if (subscription.metadata && subscription.metadata.name) { - subscription.name = Subscription.formatName_( - this.projectId, - subscription.metadata.name - ); - } - } - callback!(null, subscription, resp!); } ); @@ -683,13 +685,6 @@ export class PubSub { } topic.metadata = resp!; - // If this is the first call we've made, the projectId might be empty still. - if (topic.name?.includes(PROJECT_ID_PLACEHOLDER)) { - if (topic.metadata && topic.metadata.name) { - topic.name = Topic.formatName_(this.projectId, topic.metadata.name); - } - } - callback!(null, topic, resp!); } ); diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index fe5defc8e53..731c018f587 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -17,9 +17,6 @@ import {DateStruct, PreciseDate} from '@google-cloud/precise-date'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisify} from '@google-cloud/promisify'; -import {EventEmitter} from 'events'; -import {SpanContext, Span, SpanKind} from '@opentelemetry/api'; -import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; import {google} from '../protos/protos'; import {Histogram} from './histogram'; @@ -29,8 +26,9 @@ import {MessageStream, MessageStreamOptions} from './message-stream'; import {Subscription} from './subscription'; import {defaultOptions} from './default-options'; import {SubscriberClient} from './v1'; -import {createSpan} from './opentelemetry-tracing'; +import * as tracing from './telemetry-tracing'; import {Duration} from './temporal'; +import {EventEmitter} from 'events'; export type PullResponse = google.pubsub.v1.IStreamingPullResponse; export type SubscriptionProperties = @@ -64,6 +62,136 @@ export class AckError extends Error { } } +/** + * Tracks the various spans related to subscriber/receive tracing. + * + * @private + */ +export class SubscriberSpans { + parent: tracing.MessageWithAttributes; + + // These are always attached to a message. + constructor(parent: tracing.MessageWithAttributes) { + this.parent = parent; + } + + // Start a flow control span if needed. + flowStart() { + if (!this.flow) { + this.flow = tracing.PubsubSpans.createReceiveFlowSpan(this.parent); + } + } + + // End any flow control span. + flowEnd() { + if (this.flow) { + this.flow.end(); + this.flow = undefined; + } + } + + // Emit an event for starting to send an ack. + ackStart() { + tracing.PubsubEvents.ackStart(this.parent); + } + + // Emit an event for the ack having been sent. + ackEnd() { + tracing.PubsubEvents.ackEnd(this.parent); + } + + // Emit an event for calling ack. + ackCall() { + if (this.processing) { + tracing.PubsubEvents.ackCalled(this.processing); + } + } + + // Emit an event for starting to send a nack. + nackStart() { + tracing.PubsubEvents.nackStart(this.parent); + } + + // Emit an event for the nack having been sent. + nackEnd() { + tracing.PubsubEvents.nackEnd(this.parent); + } + + // Emit an event for calling nack. + nackCall() { + if (this.processing) { + tracing.PubsubEvents.nackCalled(this.processing); + } + } + + // Emit an event for starting to send a modAck. + modAckStart(deadline: Duration, isInitial: boolean) { + tracing.PubsubEvents.modAckStart(this.parent, deadline, isInitial); + } + + // Emit an event for the modAck having been sent. + modAckEnd() { + tracing.PubsubEvents.modAckEnd(this.parent); + } + + // Emit an event for calling modAck. + // Note that we don't currently support users calling modAck directly, but + // this may be used in the future for things like fully managed pull + // subscriptions. + modAckCall(deadline: Duration) { + if (this.processing) { + tracing.PubsubEvents.modAckCalled(this.processing, deadline); + } + } + + // Start a scheduler span if needed. + // Note: This is not currently used in Node, because there is no + // scheduler process, due to the way messages are delivered one at a time. + schedulerStart() { + if (!this.scheduler) { + this.scheduler = tracing.PubsubSpans.createReceiveSchedulerSpan( + this.parent + ); + } + } + + // End any scheduler span. + schedulerEnd() { + if (this.scheduler) { + this.scheduler.end(); + this.scheduler = undefined; + } + } + + // Start a processing span if needed. + // This is for user processing, during on('message') delivery. + processingStart(subName: string) { + if (!this.processing) { + this.processing = tracing.PubsubSpans.createReceiveProcessSpan( + this.parent, + subName + ); + } + } + + // End any processing span. + processingEnd() { + if (this.processing) { + this.processing.end(); + this.processing = undefined; + } + } + + // If we shut down before processing can finish. + shutdown() { + tracing.PubsubEvents.shutdown(this.parent); + } + + private flow?: tracing.Span; + private scheduler?: tracing.Span; + private processing?: tracing.Span; +} + /** * Date object with nanosecond precision. Supports all standard Date arguments * in addition to several custom types. @@ -91,7 +219,7 @@ export class AckError extends Error { * }); * ``` */ -export class Message { +export class Message implements tracing.MessageWithAttributes { ackId: string; attributes: {[key: string]: string}; data: Buffer; @@ -105,6 +233,46 @@ export class Message { private _subscriber: Subscriber; private _ackFailed?: AckError; + /** + * @private + * + * Tracks a telemetry tracing parent span through the receive process. This will + * be the original publisher-side span if we have one; otherwise we'll create + * a "publisher" span to hang new subscriber spans onto. + * + * This needs to be declared explicitly here, because having a public class + * implement a private interface seems to confuse TypeScript. (And it's needed + * in unit tests.) + */ + parentSpan?: tracing.Span; + + /** + * We'll save the state of the subscription's exactly once delivery flag at the + * time the message was received. This is pretty much only for tracing, as we will + * generally use the live state of the subscription to figure out how to respond. + * + * @private + * @internal + */ + isExactlyOnceDelivery: boolean; + + /** + * @private + * + * Ends any open subscribe telemetry tracing span. + */ + endParentSpan() { + this.parentSpan?.end(); + delete this.parentSpan; + } + + /** + * @private + * + * Tracks subscriber-specific telemetry objects through the library. + */ + subSpans: SubscriberSpans; + /** * @hideconstructor * @@ -182,6 +350,21 @@ export class Message { */ this.received = Date.now(); + /** + * Telemetry tracing objects. + * + * @private + */ + this.subSpans = new SubscriberSpans(this); + + /** + * Save the state of the subscription into the message for later tracing. + * + * @private + * @internal + */ + this.isExactlyOnceDelivery = sub.isExactlyOnceDelivery; + this._handled = false; this._length = this.data.length; this._subscriber = sub; @@ -219,6 +402,8 @@ export class Message { ack(): void { if (!this._handled) { this._handled = true; + this.subSpans.ackCall(); + this.subSpans.processingEnd(); this._subscriber.ack(this); } } @@ -246,6 +431,8 @@ export class Message { if (!this._handled) { this._handled = true; + this.subSpans.ackCall(); + this.subSpans.processingEnd(); try { return await this._subscriber.ackWithResponse(this); } catch (e) { @@ -259,12 +446,14 @@ export class Message { /** * Modifies the ack deadline. + * At present time, this should generally not be called by users. * * @param {number} deadline The number of seconds to extend the deadline. * @private */ modAck(deadline: number): void { if (!this._handled) { + this.subSpans.modAckCall(Duration.from({seconds: deadline})); this._subscriber.modAck(this, deadline); } } @@ -272,6 +461,7 @@ export class Message { /** * Modifies the ack deadline, expecting a response (for exactly-once delivery subscriptions). * If exactly-once delivery is not enabled, this will immediately resolve successfully. + * At present time, this should generally not be called by users. * * @param {number} deadline The number of seconds to extend the deadline. * @private @@ -287,6 +477,7 @@ export class Message { } if (!this._handled) { + this.subSpans.modAckCall(Duration.from({seconds: deadline})); try { return await this._subscriber.modAckWithResponse(this, deadline); } catch (e) { @@ -311,6 +502,8 @@ export class Message { nack(): void { if (!this._handled) { this._handled = true; + this.subSpans.nackCall(); + this.subSpans.processingEnd(); this._subscriber.nack(this); } } @@ -339,6 +532,8 @@ export class Message { if (!this._handled) { this._handled = true; + this.subSpans.nackCall(); + this.subSpans.processingEnd(); try { return await this._subscriber.nackWithResponse(this); } catch (e) { @@ -380,6 +575,9 @@ export interface SubscriberOptions { flowControl?: FlowControlOptions; useLegacyFlowControl?: boolean; streamingOptions?: MessageStreamOptions; + + /** @deprecated Unset this and instantiate a tracer; support will be + * enabled automatically. */ enableOpenTelemetryTracing?: boolean; } @@ -403,7 +601,7 @@ export class Subscriber extends EventEmitter { private _acks!: AckQueue; private _histogram: Histogram; private _inventory!: LeaseManager; - private _useOpentelemetry: boolean; + private _useLegacyOpenTelemetry: boolean; private _latencies: Histogram; private _modAcks!: ModAckQueue; private _name!: string; @@ -421,7 +619,7 @@ export class Subscriber extends EventEmitter { this.maxBytes = defaultOptions.subscription.maxOutstandingBytes; this.useLegacyFlowControl = false; this.isOpen = false; - this._useOpentelemetry = false; + this._useLegacyOpenTelemetry = false; this._histogram = new Histogram({min: 10, max: 600}); this._latencies = new Histogram(); this._subscription = subscription; @@ -565,12 +763,18 @@ export class Subscriber extends EventEmitter { const ackTimeSeconds = (Date.now() - message.received) / 1000; this.updateAckDeadline(ackTimeSeconds); + tracing.PubsubEvents.ackStart(message); + // Ignore this in this version of the method (but hook catch // to avoid unhandled exceptions). const resultPromise = this._acks.add(message); resultPromise.catch(() => {}); await this._acks.onFlush(); + + tracing.PubsubEvents.ackEnd(message); + message.endParentSpan(); + this._inventory.remove(message); } @@ -586,7 +790,13 @@ export class Subscriber extends EventEmitter { const ackTimeSeconds = (Date.now() - message.received) / 1000; this.updateAckDeadline(ackTimeSeconds); + tracing.PubsubEvents.ackStart(message); + await this._acks.add(message); + + tracing.PubsubEvents.ackEnd(message); + message.endParentSpan(); + this._inventory.remove(message); // No exception means Success. @@ -607,10 +817,15 @@ export class Subscriber extends EventEmitter { this.isOpen = false; this._stream.destroy(); - this._inventory.clear(); + const remaining = this._inventory.clear(); await this._waitForFlush(); + remaining.forEach(m => { + m.subSpans.shutdown(); + m.endParentSpan(); + }); + this.emit('close'); this._acks.close(); @@ -636,7 +851,7 @@ export class Subscriber extends EventEmitter { * Modifies the acknowledge deadline for the provided message. * * @param {Message} message The message to modify. - * @param {number} deadline The deadline. + * @param {number} deadline The deadline in seconds. * @returns {Promise} * @private */ @@ -685,7 +900,10 @@ export class Subscriber extends EventEmitter { * @private */ async nack(message: Message): Promise { + message.subSpans.nackStart(); await this.modAck(message, 0); + message.subSpans.nackEnd(); + message.endParentSpan(); this._inventory.remove(message); } @@ -699,7 +917,11 @@ export class Subscriber extends EventEmitter { * @private */ async nackWithResponse(message: Message): Promise { - return await this.modAckWithResponse(message, 0); + message.subSpans.nackStart(); + const response = await this.modAckWithResponse(message, 0); + message.subSpans.nackEnd(); + message.endParentSpan(); + return response; } /** @@ -741,7 +963,7 @@ export class Subscriber extends EventEmitter { setOptions(options: SubscriberOptions): void { this._options = options; - this._useOpentelemetry = options.enableOpenTelemetryTracing || false; + this._useLegacyOpenTelemetry = options.enableOpenTelemetryTracing || false; // The user-set ackDeadline value basically pegs the extension time. // We'll emulate it by overwriting min/max. @@ -779,58 +1001,18 @@ export class Subscriber extends EventEmitter { } /** - * Constructs an OpenTelemetry span from the incoming message. + * Constructs a telemetry span from the incoming message. * * @param {Message} message One of the received messages * @private */ - private _constructSpan(message: Message): Span | undefined { - // Handle cases where OpenTelemetry is disabled or no span context was sent through message - if ( - !this._useOpentelemetry || - !message.attributes || - !message.attributes['googclient_OpenTelemetrySpanContext'] - ) { - return undefined; - } - - const spanValue = message.attributes['googclient_OpenTelemetrySpanContext']; - const parentSpanContext: SpanContext | undefined = spanValue - ? JSON.parse(spanValue) - : undefined; - const spanAttributes = { - // Original span attributes - ackId: message.ackId, - deliveryAttempt: message.deliveryAttempt, - // - // based on https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/messaging.md#topic-with-multiple-consumers - [SemanticAttributes.MESSAGING_SYSTEM]: 'pubsub', - [SemanticAttributes.MESSAGING_OPERATION]: 'process', - [SemanticAttributes.MESSAGING_DESTINATION]: this.name, - [SemanticAttributes.MESSAGING_DESTINATION_KIND]: 'topic', - [SemanticAttributes.MESSAGING_MESSAGE_ID]: message.id, - [SemanticAttributes.MESSAGING_PROTOCOL]: 'pubsub', - [SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_SIZE_BYTES]: ( - message.data as Buffer - ).length, - // Not in Opentelemetry semantic convention but mimics naming - 'messaging.pubsub.received_at': message.received, - 'messaging.pubsub.acknowlege_id': message.ackId, - 'messaging.pubsub.delivery_attempt': message.deliveryAttempt, - }; - - // Subscriber spans should always have a publisher span as a parent. - // Return undefined if no parent is provided - const spanName = `${this.name} process`; - const span = parentSpanContext - ? createSpan( - spanName.trim(), - SpanKind.CONSUMER, - spanAttributes, - parentSpanContext - ) - : undefined; - return span; + private createParentSpan(message: Message): void { + const enabled = tracing.isEnabled({ + enableOpenTelemetryTracing: this._useLegacyOpenTelemetry, + }); + if (enabled) { + tracing.extractSpan(message, this.name, enabled); + } } /** @@ -860,12 +1042,16 @@ export class Subscriber extends EventEmitter { for (const data of receivedMessages!) { const message = new Message(this, data); - const span: Span | undefined = this._constructSpan(message); + this.createParentSpan(message); if (this.isOpen) { if (this.isExactlyOnceDelivery) { // For exactly-once delivery, we must validate that we got a valid // lease on the message before actually leasing it. + message.subSpans.modAckStart( + Duration.from({seconds: this.ackDeadline}), + true + ); message .modAckWithResponse(this.ackDeadline) .then(() => { @@ -875,17 +1061,23 @@ export class Subscriber extends EventEmitter { // Temporary failures will retry, so if an error reaches us // here, that means a permanent failure. Silently drop these. this._discardMessage(message); + }) + .finally(() => { + message.subSpans.modAckEnd(); }); } else { + message.subSpans.modAckStart( + Duration.from({seconds: this.ackDeadline}), + true + ); message.modAck(this.ackDeadline); + message.subSpans.modAckEnd(); this._inventory.add(message); } } else { + message.subSpans.shutdown(); message.nack(); } - if (span) { - span.end(); - } } } diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index a39f66e8c60..0df829a672c 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {EventEmitter} from 'events'; import * as extend from 'extend'; import {CallOptions} from 'google-gax'; import snakeCase = require('lodash.snakecase'); @@ -47,6 +46,7 @@ import {Topic} from './topic'; import {promisifySome} from './util'; import {StatusError} from './message-stream'; import {DebugMessage} from './debug'; +import {EventEmitter} from 'stream'; export {AckError, AckResponse, AckResponses} from './subscriber'; @@ -265,13 +265,16 @@ export declare interface Subscription { * ``` */ export class Subscription extends EventEmitter { + // Note: WrappingEmitter is used here to wrap user processing callbacks. + // We do this to be able to build telemetry spans around them. pubsub: PubSub; iam: IAM; - name: string; topic?: Topic | string; metadata?: google.pubsub.v1.ISubscription; request: typeof PubSub.prototype.request; + private _subscriber: Subscriber; + constructor(pubsub: PubSub, name: string, options?: SubscriptionOptions) { super(); @@ -279,7 +282,7 @@ export class Subscription extends EventEmitter { this.pubsub = pubsub; this.request = pubsub.request.bind(pubsub); - this.name = Subscription.formatName_(this.projectId, name); + this.id_ = name; this.topic = options.topic; /** @@ -320,7 +323,7 @@ export class Subscription extends EventEmitter { * }); * ``` */ - this.iam = new IAM(pubsub, this.name); + this.iam = new IAM(pubsub, this); this._subscriber = new Subscriber(this, options); this._subscriber @@ -332,6 +335,11 @@ export class Subscription extends EventEmitter { this._listen(); } + private id_: string; + get name(): string { + return Subscription.formatName_(this.pubsub.projectId, this.id_); + } + /** * Indicates if the Subscription is open and receiving messages. * @@ -1194,6 +1202,7 @@ export class Subscription extends EventEmitter { return formatted as google.pubsub.v1.ISubscription; } + /*! * Format the name of a subscription. A subscription's full name is in the * format of projects/{projectId}/subscriptions/{subName}. diff --git a/handwritten/pubsub/src/telemetry-tracing.ts b/handwritten/pubsub/src/telemetry-tracing.ts new file mode 100644 index 00000000000..b921518ab27 --- /dev/null +++ b/handwritten/pubsub/src/telemetry-tracing.ts @@ -0,0 +1,911 @@ +/*! + * Copyright 2020-2024 Google LLC + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { + Tracer, + SpanContext, + Span, + context, + trace, + propagation, + SpanKind, + TextMapGetter, + TextMapSetter, + ROOT_CONTEXT, + Context, + Link, +} from '@opentelemetry/api'; +import {Attributes, PubsubMessage} from './publisher/pubsub-message'; +import {PublishOptions} from './publisher/index'; +import {Duration} from './temporal'; + +export {Span}; + +// We need this to get the library version. +// eslint-disable-next-line @typescript-eslint/no-var-requires +const packageJson = require('../../package.json'); + +/** + * Instantiates a Opentelemetry tracer for the library + * + * @private + * @internal + */ +let cachedTracer: Tracer | undefined; +function getTracer(): Tracer { + const tracer = + cachedTracer ?? + trace.getTracer('@google-cloud/pubsub', packageJson.version); + cachedTracer = tracer; + return cachedTracer; +} + +/** + * Determination of the level of OTel support we're providing. + * + * @private + * @internal + */ +export enum OpenTelemetryLevel { + /** + * None: OTel support is not enabled because we found no trace provider, or + * the user has not enabled it. + */ + None = 0, + + /** + * Legacy: We found a trace provider, but the user also specified the old + * manual enable flag; this will trigger the legacy attribute being included. + * The modern propagation attribute will _also_ be included. + */ + Legacy = 1, + + /** + * Modern: We will only inject/extract the modern propagation attribute. + */ + Modern = 2, +} + +// True if user code elsewhere wants to enable OpenTelemetry support. +let globallyEnabled = false; + +/** + * Manually set the OpenTelemetry enabledness. + * + * @param enabled The enabled flag to use, to override any automated methods. + * @private + * @internal + */ +export function setGloballyEnabled(enabled: boolean) { + globallyEnabled = enabled; +} + +/** + * Tries to divine what sort of OpenTelemetry we're supporting. See the enum + * for the meaning of the values, and other notes. + * + * Legacy OTel is no longer officially supported, but we don't want to + * break anyone at a non-major. + * + * @private + * @internal + */ +export function isEnabled( + publishSettings?: PublishOptions +): OpenTelemetryLevel { + // If we're not enabled, skip everything. + if (!globallyEnabled) { + return OpenTelemetryLevel.None; + } + + if (publishSettings?.enableOpenTelemetryTracing) { + return OpenTelemetryLevel.Legacy; + } + + // Enable modern support. + return OpenTelemetryLevel.Modern; +} + +/** + * Our Carrier object for propagation is anything with an 'attributes' + * object, which is one of several possible Message classes. (They're + * different for publish and subscribe.) + * + * Also we add a parentSpan optional member for passing around the + * actual Span object within the client library. This can be a publish + * or subscriber span, depending on the context. + * + * @private + * @internal + */ +export interface MessageWithAttributes { + attributes?: Attributes | null | undefined; + parentSpan?: Span; +} + +/** + * Implements common members for the TextMap getter and setter interfaces for Pub/Sub messages. + * + * @private + * @internal + */ +export class PubsubMessageGetSet { + static keyPrefix = 'googclient_'; + + keys(carrier: MessageWithAttributes): string[] { + return Object.getOwnPropertyNames(carrier.attributes) + .filter(n => n.startsWith(PubsubMessageGetSet.keyPrefix)) + .map(n => n.substring(PubsubMessageGetSet.keyPrefix.length)); + } + + protected attributeName(key: string): string { + return `${PubsubMessageGetSet.keyPrefix}${key}`; + } +} + +/** + * Implements the TextMap getter interface for Pub/Sub messages. + * + * @private + * @internal + */ +export class PubsubMessageGet + extends PubsubMessageGetSet + implements TextMapGetter +{ + get( + carrier: MessageWithAttributes, + key: string + ): string | string[] | undefined { + return carrier?.attributes?.[this.attributeName(key)]; + } +} + +/** + * Implements the TextMap setter interface for Pub/Sub messages. + * + * @private + * @internal + */ +export class PubsubMessageSet + extends PubsubMessageGetSet + implements TextMapSetter +{ + set(carrier: MessageWithAttributes, key: string, value: string): void { + if (!carrier.attributes) { + carrier.attributes = {}; + } + carrier.attributes[this.attributeName(key)] = value; + } +} + +/** + * The getter to use when calling extract() on a Pub/Sub message. + * + * @private + * @internal + */ +export const pubsubGetter = new PubsubMessageGet(); + +/** + * The setter to use when calling inject() on a Pub/Sub message. + * + * @private + * @internal + */ +export const pubsubSetter = new PubsubMessageSet(); + +/** + * Description of the data structure passed for span attributes. + * + * @private + * @internal + */ +export interface SpanAttributes { + [x: string]: string | number | boolean; +} + +/** + * Converts a SpanContext to a full Context, as needed. + * + * @private + * @internal + */ +export function spanContextToContext( + parent?: SpanContext +): Context | undefined { + return parent ? trace.setSpanContext(context.active(), parent) : undefined; +} + +/** + * The modern propagation attribute name. + * + * Technically this is determined by the OpenTelemetry library, but + * in practice, it follows the W3C spec, so this should be the right + * one. The only thing we're using it for, anyway, is emptying user + * supplied attributes. + * + * @private + * @internal + */ +export const modernAttributeName = 'googclient_traceparent'; + +/** + * The old legacy attribute name. + * + * @private + * @internal + */ +export const legacyAttributeName = 'googclient_OpenTelemetrySpanContext'; + +export interface AttributeParams { + // Fully qualified. + topicName?: string; + subName?: string; + + // These are generally split from the fully qualified names. + projectId?: string; + topicId?: string; + subId?: string; +} + +/** + * Break down the subscription's full name into its project and ID. + * + * @private + * @internal + */ +export function getSubscriptionInfo(fullName: string): AttributeParams { + const results = fullName.match(/projects\/([^/]+)\/subscriptions\/(.+)/); + if (!results?.[0]) { + return { + subName: fullName, + }; + } + + return { + subName: fullName, + projectId: results[1], + subId: results[2], + }; +} + +/** + * Break down the subscription's full name into its project and ID. + * + * @private + * @internal + */ +export function getTopicInfo(fullName: string): AttributeParams { + const results = fullName.match(/projects\/([^/]+)\/topics\/(.+)/); + if (!results?.[0]) { + return { + topicName: fullName, + }; + } + + return { + topicName: fullName, + projectId: results[1], + topicId: results[2], + }; +} + +// Determines if a trace is to be sampled. There doesn't appear to be a sanctioned +// way to do this currently (isRecording does something different). +// +// Based on this: https://github.com/open-telemetry/opentelemetry-js/issues/4193 +function isSampled(span: Span) { + const FLAG_MASK_SAMPLED = 0x1; + const spanContext = span.spanContext(); + const traceFlags = spanContext?.traceFlags; + const sampled = !!( + traceFlags && (traceFlags & FLAG_MASK_SAMPLED) === FLAG_MASK_SAMPLED + ); + + return sampled; +} + +/** + * Contains utility methods for creating spans. + * + * @private + * @internal + */ +export class PubsubSpans { + static createAttributes( + params: AttributeParams, + message?: PubsubMessage, + caller?: string + ): SpanAttributes { + const destinationName = params.topicName ?? params.subName; + const destinationId = params.topicId ?? params.subId; + const projectId = params.projectId; + + // Purposefully leaving this debug check here as a comment - this should + // always be true, but we don't want to fail in prod if it's not. + /*if ( + (params.topicName && params.subName) || + (!destinationName && !projectId && !destinationId) + ) { + throw new Error( + 'One of topicName or subName must be specified, and must be fully qualified' + ); + }*/ + + const spanAttributes = { + // Add Opentelemetry semantic convention attributes to the span, based on: + // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.1.0/specification/trace/semantic_conventions/messaging.md + ['messaging.system']: 'gcp_pubsub', + ['messaging.destination.name']: destinationId ?? destinationName, + ['gcp.project_id']: projectId, + ['code.function']: caller ?? 'unknown', + } as SpanAttributes; + + if (message) { + if (message.calculatedSize) { + spanAttributes['messaging.message.envelope.size'] = + message.calculatedSize; + } else { + if (message.data?.length) { + spanAttributes['messaging.message.envelope.size'] = + message.data?.length; + } + } + if (message.orderingKey) { + spanAttributes['messaging.gcp_pubsub.message.ordering_key'] = + message.orderingKey; + } + if (message.isExactlyOnceDelivery) { + spanAttributes['messaging.gcp_pubsub.message.exactly_once_delivery'] = + message.isExactlyOnceDelivery; + } + if (message.ackId) { + spanAttributes['messaging.gcp_pubsub.message.ack_id'] = message.ackId; + } + } + + return spanAttributes; + } + + static createPublisherSpan( + message: PubsubMessage, + topicName: string, + caller: string + ): Span | undefined { + if (!globallyEnabled) { + return undefined; + } + + const topicInfo = getTopicInfo(topicName); + const span: Span = getTracer().startSpan(`${topicName} create`, { + kind: SpanKind.PRODUCER, + attributes: PubsubSpans.createAttributes(topicInfo, message, caller), + }); + if (topicInfo.topicId) { + span.updateName(`${topicInfo.topicId} create`); + span.setAttribute('messaging.destination.name', topicInfo.topicId); + } + + return span; + } + + static updatePublisherTopicName(span: Span, topicName: string) { + const topicInfo = getTopicInfo(topicName); + if (topicInfo.topicId) { + span.updateName(`${topicInfo.topicId} create`); + span.setAttribute('messaging.destination.name', topicInfo.topicId); + } else { + span.updateName(`${topicName} create`); + } + if (topicInfo.projectId) { + span.setAttribute('gcp.project_id', topicInfo.projectId); + } + } + + static createReceiveSpan( + message: PubsubMessage, + subName: string, + parent: Context | undefined, + caller: string + ): Span | undefined { + if (!globallyEnabled) { + return undefined; + } + + const subInfo = getSubscriptionInfo(subName); + const name = `${subInfo.subId ?? subName} subscribe`; + const attributes = this.createAttributes(subInfo, message, caller); + if (subInfo.subId) { + attributes['messaging.destination.name'] = subInfo.subId; + } + + if (context) { + return getTracer().startSpan( + name, + { + kind: SpanKind.CONSUMER, + attributes, + }, + parent + ); + } else { + return getTracer().startSpan(name, { + kind: SpanKind.CONSUMER, + attributes, + }); + } + } + + static createChildSpan( + name: string, + message?: PubsubMessage, + parentSpan?: Span, + attributes?: SpanAttributes + ): Span | undefined { + if (!globallyEnabled) { + return undefined; + } + + const parent = message?.parentSpan ?? parentSpan; + if (parent) { + return getTracer().startSpan( + name, + { + kind: SpanKind.INTERNAL, + attributes: attributes ?? {}, + }, + spanContextToContext(parent.spanContext()) + ); + } else { + return undefined; + } + } + + static createPublishFlowSpan(message: PubsubMessage): Span | undefined { + return PubsubSpans.createChildSpan('publisher flow control', message); + } + + static createPublishSchedulerSpan(message: PubsubMessage): Span | undefined { + return PubsubSpans.createChildSpan('publisher batching', message); + } + + static createPublishRpcSpan( + messages: MessageWithAttributes[], + topicName: string, + caller: string + ): Span | undefined { + if (!globallyEnabled) { + return undefined; + } + + const spanAttributes = PubsubSpans.createAttributes( + getTopicInfo(topicName), + undefined, + caller + ); + const links: Link[] = messages + .filter(m => m.parentSpan && isSampled(m.parentSpan)) + .map(m => ({context: m.parentSpan!.spanContext()}) as Link) + .filter(l => l.context); + const span: Span = getTracer().startSpan( + `${topicName} send`, + { + kind: SpanKind.PRODUCER, + attributes: spanAttributes, + links, + }, + ROOT_CONTEXT + ); + span?.setAttribute('messaging.batch.message_count', messages.length); + if (span) { + // Also attempt to link from message spans back to the publish RPC span. + messages.forEach(m => { + if (m.parentSpan && isSampled(m.parentSpan)) { + m.parentSpan.addLink({context: span.spanContext()}); + } + }); + } + + return span; + } + + static createAckRpcSpan( + messageSpans: (Span | undefined)[], + subName: string, + caller: string + ): Span | undefined { + if (!globallyEnabled) { + return undefined; + } + + const subInfo = getSubscriptionInfo(subName); + + const spanAttributes = PubsubSpans.createAttributes( + subInfo, + undefined, + caller + ); + const links: Link[] = messageSpans + .filter(m => m && isSampled(m)) + .map(m => ({context: m!.spanContext()}) as Link) + .filter(l => l.context); + const span: Span = getTracer().startSpan( + `${subInfo.subId ?? subInfo.subName} ack`, + { + kind: SpanKind.CONSUMER, + attributes: spanAttributes, + links, + }, + ROOT_CONTEXT + ); + + span?.setAttribute('messaging.batch.message_count', messageSpans.length); + + if (span) { + // Also attempt to link from the subscribe span(s) back to the publish RPC span. + messageSpans.forEach(m => { + if (m && isSampled(m)) { + m.addLink({context: span.spanContext()}); + } + }); + } + + return span; + } + + static createModackRpcSpan( + messageSpans: (Span | undefined)[], + subName: string, + type: 'modack' | 'nack', + caller: string, + deadline?: Duration, + isInitial?: boolean + ): Span | undefined { + if (!globallyEnabled) { + return undefined; + } + + const subInfo = getSubscriptionInfo(subName); + + const spanAttributes = PubsubSpans.createAttributes( + subInfo, + undefined, + caller + ); + const links: Link[] = messageSpans + .filter(m => m && isSampled(m)) + .map(m => ({context: m!.spanContext()}) as Link) + .filter(l => l.context); + const span: Span = getTracer().startSpan( + `${subInfo.subId ?? subInfo.subName} ${type}`, + { + kind: SpanKind.CONSUMER, + attributes: spanAttributes, + links, + }, + ROOT_CONTEXT + ); + + span?.setAttribute('messaging.batch.message_count', messageSpans.length); + + if (span) { + // Also attempt to link from the subscribe span(s) back to the publish RPC span. + messageSpans.forEach(m => { + if (m && isSampled(m)) { + m.addLink({context: span.spanContext()}); + } + }); + } + + if (deadline) { + span?.setAttribute( + 'messaging.gcp_pubsub.message.ack_deadline_seconds', + deadline.totalOf('second') + ); + } + + if (isInitial !== undefined) { + span?.setAttribute('messaging.gcp_pubsub.is_receipt_modack', isInitial); + } + + return span; + } + + static createReceiveFlowSpan( + message: MessageWithAttributes + ): Span | undefined { + return PubsubSpans.createChildSpan( + 'subscriber concurrency control', + message + ); + } + + static createReceiveSchedulerSpan( + message: MessageWithAttributes + ): Span | undefined { + return PubsubSpans.createChildSpan('subscriber scheduler', message); + } + + static createReceiveProcessSpan( + message: MessageWithAttributes, + subName: string + ): Span | undefined { + const subInfo = getSubscriptionInfo(subName); + return PubsubSpans.createChildSpan( + `${subInfo.subId ?? subName} process`, + message + ); + } + + static setReceiveProcessResult(span: Span, isAck: boolean) { + span.setAttribute('messaging.gcp_pubsub.result', isAck ? 'ack' : 'nack'); + } +} + +/** + * Creates and manipulates Pub/Sub-related events on spans. + * + * @private + * @internal + */ +export class PubsubEvents { + static addEvent( + text: string, + message: MessageWithAttributes, + attributes?: Attributes + ): void { + const parent = message.parentSpan; + if (!parent) { + return; + } + + parent.addEvent(text, attributes); + } + + static publishStart(message: MessageWithAttributes) { + PubsubEvents.addEvent('publish start', message); + } + + static publishEnd(message: MessageWithAttributes) { + PubsubEvents.addEvent('publish end', message); + } + + static ackStart(message: MessageWithAttributes) { + PubsubEvents.addEvent('ack start', message); + } + + static ackEnd(message: MessageWithAttributes) { + PubsubEvents.addEvent('ack end', message); + } + + static modackStart(message: MessageWithAttributes) { + PubsubEvents.addEvent('modack start', message); + } + + static modackEnd(message: MessageWithAttributes) { + PubsubEvents.addEvent('modack end', message); + } + + static nackStart(message: MessageWithAttributes) { + PubsubEvents.addEvent('nack start', message); + } + + static nackEnd(message: MessageWithAttributes) { + PubsubEvents.addEvent('nack end', message); + } + + static ackCalled(span: Span) { + span.addEvent('ack called'); + } + + static nackCalled(span: Span) { + span.addEvent('nack called'); + } + + static modAckCalled(span: Span, deadline: Duration) { + // User-called modAcks are never initial ones. + span.addEvent('modack called', { + 'messaging.gcp_pubsub.modack_deadline_seconds': `${deadline.totalOf( + 'second' + )}`, + 'messaging.gcp_pubsub.is_receipt_modack': 'false', + }); + } + + static modAckStart( + message: MessageWithAttributes, + deadline: Duration, + isInitial: boolean + ) { + PubsubEvents.addEvent('modack start', message, { + 'messaging.gcp_pubsub.modack_deadline_seconds': `${deadline.totalOf( + 'second' + )}`, + 'messaging.gcp_pubsub.is_receipt_modack': isInitial ? 'true' : 'false', + }); + } + + static modAckEnd(message: MessageWithAttributes) { + PubsubEvents.addEvent('modack end', message); + } + + // Add this event any time the process is shut down before processing + // of the message can complete. + static shutdown(message: MessageWithAttributes) { + PubsubEvents.addEvent('shutdown', message); + } +} + +/** + * Injects the trace context into a Pub/Sub message (or other object with + * an 'attributes' object) for propagation. + * + * This is for the publish side. + * + * @private + * @internal + */ +export function injectSpan( + span: Span, + message: MessageWithAttributes, + enabled: OpenTelemetryLevel +): void { + if (!globallyEnabled) { + return; + } + + if (!message.attributes) { + message.attributes = {}; + } + + if (message.attributes[modernAttributeName]) { + console.warn( + `${modernAttributeName} key set as message attribute, but will be overridden.` + ); + + delete message.attributes[modernAttributeName]; + } + + // If we're in legacy mode, add that header as well. + if (enabled === OpenTelemetryLevel.Legacy) { + if (message.attributes[legacyAttributeName]) { + console.warn( + `${legacyAttributeName} key set as message attribute, but will be overridden.` + ); + } + message.attributes[legacyAttributeName] = JSON.stringify( + span.spanContext() + ); + } + + // Always do propagation injection with the trace context. + const context = trace.setSpanContext(ROOT_CONTEXT, span.spanContext()); + propagation.inject(context, message, pubsubSetter); + + // Also put the direct reference to the Span object for while we're + // passing it around in the client library. + message.parentSpan = span; +} + +/** + * Returns true if this message potentially contains a span context. + * + * @private + * @internal + */ +export function containsSpanContext(message: MessageWithAttributes): boolean { + if (message.parentSpan) { + return true; + } + + if (!message.attributes) { + return false; + } + + const keys = Object.getOwnPropertyNames(message.attributes); + return !!keys.find( + n => n === legacyAttributeName || n === modernAttributeName + ); +} + +/** + * Extracts the trace context from a Pub/Sub message (or other object with + * an 'attributes' object) from a propagation, for receive processing. If no + * context was present, create a new parent span. + * + * This is for the receive side. + * + * @private + * @internal + */ +export function extractSpan( + message: MessageWithAttributes, + subName: string, + enabled: OpenTelemetryLevel +): Span | undefined { + if (!globallyEnabled) { + return undefined; + } + + if (message.parentSpan) { + return message.parentSpan; + } + + const keys = Object.getOwnPropertyNames(message.attributes ?? {}); + + let context: Context | undefined; + + if (enabled === OpenTelemetryLevel.Legacy) { + // Only prefer the legacy attributes to no trace context attribute. + if ( + keys.includes(legacyAttributeName) && + !keys.includes(modernAttributeName) + ) { + const legacyValue = message.attributes?.[legacyAttributeName]; + if (legacyValue) { + const parentSpanContext: SpanContext | undefined = legacyValue + ? JSON.parse(legacyValue) + : undefined; + if (parentSpanContext) { + context = spanContextToContext(parentSpanContext); + } + } + } + } else { + if (keys.includes(modernAttributeName)) { + context = propagation.extract(ROOT_CONTEXT, message, pubsubGetter); + } + } + + const span = PubsubSpans.createReceiveSpan( + message, + subName, + context, + 'extractSpan' + ); + message.parentSpan = span; + return span; +} + +// Since these were exported on the main Pub/Sub index in the previous +// version, we have to export them until the next major. +export const legacyExports = { + /** + * @deprecated + * Use the new telemetry functionality instead; see the updated OpenTelemetry + * sample for an example. + */ + createSpan: function ( + spanName: string, + kind: SpanKind, + attributes?: SpanAttributes, + parent?: SpanContext + ): Span { + if (!globallyEnabled) { + // This isn't great, but it's the fact of the situation. + return undefined as unknown as Span; + } else { + return getTracer().startSpan( + spanName, + { + kind, + attributes, + }, + parent ? trace.setSpanContext(context.active(), parent) : undefined + ); + } + }, +}; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index 96b33490ed6..e0a5d03b686 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -106,7 +106,6 @@ export type MessageOptions = PubsubMessage & {json?: any}; * ``` */ export class Topic { - name: string; parent: PubSub; pubsub: PubSub; request: typeof PubSub.prototype.request; @@ -119,12 +118,12 @@ export class Topic { constructor(pubsub: PubSub, name: string, options?: PublishOptions) { /** - * The fully qualified name of this topic. + * The fully qualified name of this topic. May have a placeholder for + * the projectId if it's not been resolved. * @name Topic#name * @type {string} */ - this.name = Topic.formatName_(pubsub.projectId, name); - this.publisher = new Publisher(this, options); + this.id_ = name; /** * The parent {@link PubSub} instance of this topic instance. * @name Topic#pubsub @@ -136,6 +135,7 @@ export class Topic { * @type {PubSub} */ this.parent = this.pubsub = pubsub; + this.publisher = new Publisher(this, options); this.request = pubsub.request.bind(pubsub); /** * [IAM (Identity and Access @@ -180,7 +180,12 @@ export class Topic { * }); * ``` */ - this.iam = new IAM(pubsub, this.name); + this.iam = new IAM(pubsub, this); + } + + private id_: string; + get name(): string { + return Topic.formatName_(this.parent.projectId, this.id_); } /** diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index a2dab3ddcab..d5f5763e2e4 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -81,10 +81,19 @@ describe('IAM', () => { assert.strictEqual(iam.request, fakeRequest); }); - it('should localize the ID', () => { + it('should localize the ID string', () => { assert.strictEqual(iam.id, ID); }); + it('should localize the ID getter', () => { + iam = new IAM(PUBSUB, { + get name() { + return 'test'; + }, + }); + assert.strictEqual(iam.id, 'test'); + }); + it('should promisify some of the things', () => { assert(promisified); }); diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 2ceb17cf79c..ca26a4be03e 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -47,9 +47,22 @@ class FakeSubscriber extends EventEmitter { isExactlyOnceDelivery = false; } +class FakeSubscriberTelemetry { + flowStart() {} + flowEnd() {} + schedulerStart() {} + schedulerEnd() {} + modAckStart() {} + modAckStop() {} + processingStart() {} + processingEnd() {} +} + class FakeMessage { length = 20; received: number; + subSpans: FakeSubscriberTelemetry = new FakeSubscriberTelemetry(); + constructor() { this.received = Date.now(); } @@ -58,6 +71,7 @@ class FakeMessage { return AckResponses.Success; } ackFailed() {} + endParentSpan() {} } interface LeaseManagerInternals { @@ -132,6 +146,15 @@ describe('LeaseManager', () => { }); describe('add', () => { + it('should start a flow span', () => { + const message = new FakeMessage() as {} as Message; + const stub = sandbox.spy(message.subSpans, 'flowStart'); + + leaseManager.add(message); + + assert.strictEqual(stub.calledOnce, true); + }); + it('should update the bytes/size values', () => { const message = new FakeMessage() as {} as Message; diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 6fe7f829fd7..98e514f984f 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -54,7 +54,7 @@ class FakeSubscriber extends EventEmitter { constructor() { super(); - this.name = uuid.v4(); + this.name = `projects/test/subscriptions/${uuid.v4()}`; this.client = new FakeClient(); this.iEOS = false; } @@ -252,7 +252,7 @@ describe('MessageQueues', () => { messageQueue.flush(); const [batch] = messageQueue.batches; - assert.strictEqual(batch[0].ackId, message.ackId); + assert.strictEqual(batch[0].message.ackId, message.ackId); assert.strictEqual(batch[0].deadline, deadline); assert.ok(batch[0].responsePromise?.resolve); }); @@ -593,7 +593,7 @@ describe('MessageQueues', () => { clock.tick(1000); assert.strictEqual(ackQueue.requests.length, 1); - assert.strictEqual(ackQueue.requests[0].ackId, message.ackId); + assert.strictEqual(ackQueue.requests[0].message.ackId, message.ackId); assert.strictEqual(ackQueue.numInRetryRequests, 0); assert.strictEqual(ackQueue.numPendingRequests, 1); }); diff --git a/handwritten/pubsub/test/opentelemetry-tracing.ts b/handwritten/pubsub/test/opentelemetry-tracing.ts deleted file mode 100644 index dc6a1423ed5..00000000000 --- a/handwritten/pubsub/test/opentelemetry-tracing.ts +++ /dev/null @@ -1,60 +0,0 @@ -/*! - * Copyright 2020 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as assert from 'assert'; -import {describe, it, beforeEach} from 'mocha'; - -import * as api from '@opentelemetry/api'; -import * as trace from '@opentelemetry/tracing'; -import {createSpan} from '../src/opentelemetry-tracing'; -import {exporter} from './tracing'; -import {SpanKind} from '@opentelemetry/api'; - -describe('OpenTelemetryTracer', () => { - let span: trace.Span; - const spanName = 'test-span'; - const spanContext: api.SpanContext = { - traceId: 'd4cda95b652f4a1592b449d5929fda1b', - spanId: '6e0c63257de34c92', - traceFlags: api.TraceFlags.SAMPLED, - }; - const spanAttributes: api.SpanAttributes = { - foo: 'bar', - }; - - beforeEach(() => { - exporter.reset(); - }); - - it('creates a span', () => { - span = createSpan( - spanName, - SpanKind.PRODUCER, - spanAttributes, - spanContext - ) as trace.Span; - span.end(); - - const spans = exporter.getFinishedSpans(); - assert.notStrictEqual(spans.length, 0); - const exportedSpan = spans.concat().pop()!; - - assert.strictEqual(exportedSpan.name, spanName); - assert.deepStrictEqual(exportedSpan.attributes, spanAttributes); - assert.strictEqual(exportedSpan.parentSpanId, spanContext.spanId); - assert.strictEqual(exportedSpan.kind, SpanKind.PRODUCER); - }); -}); diff --git a/handwritten/pubsub/test/publisher/flow-publisher.ts b/handwritten/pubsub/test/publisher/flow-publisher.ts index cdeebdb3728..c4c0ed6d439 100644 --- a/handwritten/pubsub/test/publisher/flow-publisher.ts +++ b/handwritten/pubsub/test/publisher/flow-publisher.ts @@ -27,10 +27,11 @@ import { } from '../../src/publisher'; import {FlowControl} from '../../src/publisher/flow-control'; import * as fp from '../../src/publisher/flow-publisher'; +import * as tracing from '../../src/telemetry-tracing'; class FakePublisher { flowControl!: FlowControl; - publishMessage() {} + async publishMessage() {} setOptions(options: PublishOptions) { this.flowControl.setOptions(options.flowControlOptions!); } @@ -47,6 +48,30 @@ describe('Flow control publisher', () => { afterEach(() => { sandbox.restore(); + tracing.setGloballyEnabled(false); + }); + + it('should create a flow span if a parent exists', async () => { + tracing.setGloballyEnabled(true); + + const fcp = new fp.FlowControlledPublisher(publisher); + const message = { + data: Buffer.from('foo'), + parentSpan: tracing.PubsubSpans.createPublisherSpan( + {}, + 'projects/foo/topics/topic', + 'tests' + ), + }; + fcp.publish(message as unknown as PubsubMessage); + assert.strictEqual(!!message.parentSpan, true); + }); + + it('should not create a flow span if no parent exists', async () => { + const fcp = new fp.FlowControlledPublisher(publisher); + const message = {data: Buffer.from('foo'), parentSpan: undefined}; + fcp.publish(message as unknown as PubsubMessage); + assert.strictEqual(!message.parentSpan, true); }); it('should get no promise if there is flow control space left', async () => { diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 451bb82f27b..a4e6f28fbbb 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -28,9 +28,9 @@ import {PublishError} from '../../src/publisher/publish-error'; import * as util from '../../src/util'; import {defaultOptions} from '../../src/default-options'; +import * as tracing from '../../src/telemetry-tracing'; import {exporter} from '../tracing'; import {SpanKind} from '@opentelemetry/api'; -import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; let promisified = false; const fakeUtil = Object.assign({}, util, { @@ -99,9 +99,11 @@ class FakeOrderedQueue extends FakeQueue { describe('Publisher', () => { let sandbox: sinon.SinonSandbox; let spy: sinon.SinonSpy; + const topicId = 'topic-name'; + const projectId = 'PROJECT_ID'; const topic = { - name: 'topic-name', - pubsub: {projectId: 'PROJECT_ID'}, + name: `projects/${projectId}/topics/${topicId}`, + pubsub: {projectId}, } as Topic; // tslint:disable-next-line variable-name @@ -127,6 +129,7 @@ describe('Publisher', () => { afterEach(() => { sandbox.restore(); + tracing.setGloballyEnabled(false); }); describe('initialization', () => { @@ -184,20 +187,24 @@ describe('Publisher', () => { describe('OpenTelemetry tracing', () => { let tracingPublisher: p.Publisher = {} as p.Publisher; - const enableTracing: p.PublishOptions = { - enableOpenTelemetryTracing: true, - }; const buffer = Buffer.from('Hello, world!'); beforeEach(() => { exporter.reset(); }); - it('export created spans', () => { + it('export created spans', async () => { + tracing.setGloballyEnabled(true); + // Setup trace exporting - tracingPublisher = new Publisher(topic, enableTracing); + tracingPublisher = new Publisher(topic); + const msg = {data: buffer} as p.PubsubMessage; + tracingPublisher.publishMessage(msg); + + // publishMessage is only the first part of the process now, + // so we need to manually end the span. + msg.parentSpan?.end(); - tracingPublisher.publish(buffer); const spans = exporter.getFinishedSpans(); assert.notStrictEqual(spans.length, 0, 'has span'); const createdSpan = spans.concat().pop()!; @@ -206,22 +213,14 @@ describe('Publisher', () => { opentelemetry.SpanStatusCode.UNSET ); assert.strictEqual( - createdSpan.attributes[SemanticAttributes.MESSAGING_OPERATION], - 'send' - ); - assert.strictEqual( - createdSpan.attributes[SemanticAttributes.MESSAGING_SYSTEM], - 'pubsub' + createdSpan.attributes['messaging.system'], + 'gcp_pubsub' ); assert.strictEqual( - createdSpan.attributes[SemanticAttributes.MESSAGING_DESTINATION], - topic.name + createdSpan.attributes['messaging.destination.name'], + topicId ); - assert.strictEqual( - createdSpan.attributes[SemanticAttributes.MESSAGING_DESTINATION_KIND], - 'topic' - ); - assert.strictEqual(createdSpan.name, 'topic-name send'); + assert.strictEqual(createdSpan.name, `${topicId} create`); assert.strictEqual( createdSpan.kind, SpanKind.PRODUCER, @@ -378,9 +377,11 @@ describe('Publisher', () => { }); it('should issue a warning if OpenTelemetry span context key is set', () => { + tracing.setGloballyEnabled(true); + const warnSpy = sinon.spy(console, 'warn'); const attributes = { - googclient_OpenTelemetrySpanContext: 'foobar', + [tracing.legacyAttributeName]: 'foobar', }; const fakeMessageWithOTKey = {data, attributes}; const publisherTracing = new Publisher(topic, { diff --git a/handwritten/pubsub/test/publisher/message-batch.ts b/handwritten/pubsub/test/publisher/message-batch.ts index 161756500b9..f1cfe0b2922 100644 --- a/handwritten/pubsub/test/publisher/message-batch.ts +++ b/handwritten/pubsub/test/publisher/message-batch.ts @@ -33,7 +33,7 @@ describe('MessageBatch', () => { }; beforeEach(() => { - batch = new MessageBatch(Object.assign({}, options)); + batch = new MessageBatch(Object.assign({}, options), 'topicName'); }); afterEach(() => { @@ -57,7 +57,7 @@ describe('MessageBatch', () => { const now = Date.now(); sandbox.stub(Date, 'now').returns(now); - batch = new MessageBatch(options); + batch = new MessageBatch(options, 'topicName'); assert.strictEqual(batch.created, now); }); @@ -198,4 +198,10 @@ describe('MessageBatch', () => { assert.strictEqual(newOptions, batch.options); }); }); + + it('returns data from end()', () => { + const output = batch.end(); + assert.strictEqual(output.messages, batch.messages); + assert.strictEqual(output.callbacks, batch.callbacks); + }); }); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index a74b60f539b..b9cefea53c5 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -28,7 +28,7 @@ import * as q from '../../src/publisher/message-queues'; import {PublishError} from '../../src/publisher/publish-error'; class FakeTopic { - name = 'fake-topic'; + name = 'projects/foo/topics/fake-topic'; // eslint-disable-next-line @typescript-eslint/no-unused-vars request(config: RequestConfig, callback: RequestCallback): void {} } @@ -54,11 +54,13 @@ class FakeMessageBatch { messages: p.PubsubMessage[]; options: b.BatchPublishOptions; bytes: number; - constructor(options = {} as b.BatchPublishOptions) { + topicName: string; + constructor(options = {} as b.BatchPublishOptions, topicName = 'topicName') { this.callbacks = []; this.created = Date.now(); this.messages = []; this.options = options; + this.topicName = topicName; this.bytes = 0; } // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -76,6 +78,12 @@ class FakeMessageBatch { setOptions(options: b.BatchPublishOptions) { this.options = options; } + end() { + return { + messages: this.messages, + callbacks: this.callbacks, + }; + } } class FakePublishError { diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index d76312fd089..df330f69278 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -25,6 +25,7 @@ import {google} from '../protos/protos'; import * as pubsubTypes from '../src/pubsub'; import {Snapshot} from '../src/snapshot'; import * as subby from '../src/subscription'; +import * as tracing from '../src/telemetry-tracing'; import {Topic} from '../src/topic'; import * as util from '../src/util'; import {Schema, SchemaTypes, ISchema, SchemaViews} from '../src/schema'; @@ -97,6 +98,20 @@ class FakeTopic { this.calledWith_ = args; } + // Simulate the on-demand name getter for Topic, unless a test + // explicitly sets one. + setName?: string; + get name() { + if (this.setName) { + return this.setName; + } + const pubsub = this.calledWith_[0] as pubsubTypes.PubSub; + return pubsub.projectId + '/foo'; + } + set name(val: string) { + this.setName = val; + } + static formatName_(): string { return 'foo'; } @@ -289,6 +304,17 @@ describe('PubSub', () => { assert.strictEqual(pubsub.isOpen, true); }); + it('should enable OpenTelemetry if requested', () => { + const options: pubsubTypes.ClientConfig = { + enableOpenTelemetryTracing: true, + }; + const pubsub = new PubSub(options); + assert.strictEqual( + tracing.isEnabled(), + tracing.OpenTelemetryLevel.Modern + ); + }); + it('should not be in the opened state after close()', async () => { await pubsub.close?.(); assert.strictEqual(pubsub.isOpen, false); @@ -592,18 +618,13 @@ describe('PubSub', () => { }); it('should fill the subscription object name if projectId was empty', async () => { - const subscription = {}; - pubsub.projectId = undefined; - sandbox.stub(pubsub, 'subscription').callsFake(() => { - // Simulate the project ID not being resolved. - const sub = subscription as subby.Subscription; - sub.name = '{{projectId}}/foo/bar'; - return sub; - }); + // Simulate the project ID not being resolved. + pubsub.projectId = '{{projectId}}'; sandbox .stub(pubsub, 'request') .callsFake((config, callback: Function) => { + pubsub.projectId = 'something'; callback(null, apiResponse); }); @@ -611,7 +632,6 @@ describe('PubSub', () => { TOPIC_NAME, SUB_NAME )!; - assert.strictEqual(sub, subscription); assert.strictEqual(sub.name.includes('{{'), false); assert.strictEqual(resp, apiResponse); }); @@ -704,16 +724,9 @@ describe('PubSub', () => { it('should fill the topic object name if projectId was empty', async () => { const topicName = 'new-topic'; - const topicInstance = {}; - sandbox.stub(pubsub, 'topic').callsFake(name => { - assert.strictEqual(name, topicName); - - // Simulate the project ID not being resolved. - const topic = topicInstance as Topic; - topic.name = 'projects/{{projectId}}/topics/new-topic'; - return topic; - }); + // Simulate the project ID not being resolved. + pubsub.projectId = '{{projectId}}'; requestStub.restore(); sandbox @@ -724,7 +737,6 @@ describe('PubSub', () => { }); const [topic, resp] = await pubsub.createTopic!(topicName)!; - assert.strictEqual(topic, topicInstance); assert.strictEqual(topic.name.includes('{{'), false); assert.strictEqual(resp, apiResponse); }); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index cab00e2863c..f6bc4d2e212 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -28,14 +28,14 @@ import {google} from '../protos/protos'; import * as defer from 'p-defer'; import {HistogramOptions} from '../src/histogram'; -import {FlowControlOptions} from '../src/lease-manager'; +import {FlowControlOptions, LeaseManager} from '../src/lease-manager'; import {BatchOptions} from '../src/message-queues'; import {MessageStreamOptions} from '../src/message-stream'; import * as s from '../src/subscriber'; import {Subscription} from '../src/subscription'; import {SpanKind} from '@opentelemetry/api'; -import {SemanticAttributes} from '@opentelemetry/semantic-conventions'; import {Duration} from '../src'; +import * as tracing from '../src/telemetry-tracing'; type PullResponse = google.pubsub.v1.IStreamingPullResponse; @@ -58,12 +58,18 @@ class FakePubSub { } } +const projectId = uuid.v4(); +const subId = uuid.v4(); + class FakeSubscription { - name = uuid.v4(); - projectId = uuid.v4(); + name = `projects/${projectId}/subscriptions/${subId}`; pubsub = new FakePubSub(); } +interface PublicInventory { + _inventory: LeaseManager; +} + class FakeHistogram { options?: HistogramOptions; constructor(options?: HistogramOptions) { @@ -89,7 +95,9 @@ class FakeLeaseManager extends EventEmitter { } // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: s.Message): void {} - clear(): void {} + clear(): s.Message[] { + return []; + } // eslint-disable-next-line @typescript-eslint/no-unused-vars remove(message: s.Message): void {} } @@ -189,9 +197,15 @@ describe('Subscriber', () => { beforeEach(() => { sandbox = sinon.createSandbox(); fakeProjectify = { - replaceProjectIdToken: sandbox.stub().callsFake((name, projectId) => { - return `projects/${projectId}/name/${name}`; - }), + replaceProjectIdToken: sandbox + .stub() + .callsFake((name: string, projectId: string) => { + if (name.indexOf('/') >= 0) { + return name; + } else { + return `projects/${projectId}/name/${name}`; + } + }), }; const s = proxyquire('../src/subscriber.js', { @@ -219,6 +233,7 @@ describe('Subscriber', () => { afterEach(() => { sandbox.restore(); subscriber.close(); + tracing.setGloballyEnabled(false); }); describe('initialization', () => { @@ -543,12 +558,15 @@ describe('Subscriber', () => { assert.strictEqual(stub.callCount, 1); }); - it('should clear the inventory', () => { + it('should clear the inventory', async () => { + const message = new Message(subscriber, RECEIVED_MESSAGE); + const shutdownStub = sandbox.stub(tracing.PubsubEvents, 'shutdown'); const inventory: FakeLeaseManager = stubs.get('inventory'); - const stub = sandbox.stub(inventory, 'clear'); + const stub = sandbox.stub(inventory, 'clear').returns([message]); - subscriber.close(); + await subscriber.close(); assert.strictEqual(stub.callCount, 1); + assert.strictEqual(shutdownStub.callCount, 1); }); it('should emit a close event', done => { @@ -559,6 +577,7 @@ describe('Subscriber', () => { it('should nack any messages that come in after', () => { const stream: FakeMessageStream = stubs.get('messageStream'); const stub = sandbox.stub(subscriber, 'nack'); + const shutdownStub = sandbox.stub(tracing.PubsubEvents, 'shutdown'); const pullResponse = {receivedMessages: [RECEIVED_MESSAGE]}; subscriber.close(); @@ -566,6 +585,7 @@ describe('Subscriber', () => { const [{ackId}] = stub.lastCall.args; assert.strictEqual(ackId, RECEIVED_MESSAGE.ackId); + assert.strictEqual(shutdownStub.callCount, 1); }); describe('flushing the queues', () => { @@ -756,6 +776,8 @@ describe('Subscriber', () => { }); it('should add messages to the inventory', done => { + const message = new Message(subscriber, RECEIVED_MESSAGE); + subscriber.open(); const modAckStub = sandbox.stub(subscriber, 'modAck'); @@ -766,6 +788,15 @@ describe('Subscriber', () => { const inventory: FakeLeaseManager = stubs.get('inventory'); const addStub = sandbox.stub(inventory, 'add').callsFake(() => { const [addMsg] = addStub.lastCall.args; + + // OTel is enabled during tests, so we need to delete the baggage. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const [addMsgAny, msgAny] = [addMsg as any, message as any]; + delete addMsgAny.parentSpan; + delete addMsgAny.subSpans; + delete msgAny.parentSpan; + delete msgAny.subSpans; + assert.deepStrictEqual(addMsg, message); // test for receipt @@ -850,31 +881,33 @@ describe('Subscriber', () => { it('should not instantiate a tracer when tracing is disabled', () => { subscriber = new Subscriber(subscription, {}); - assert.strictEqual(subscriber['_useOpentelemetry'], false); + assert.strictEqual(subscriber['_useLegacyOpenTelemetry'], false); }); it('should instantiate a tracer when tracing is enabled through constructor', () => { subscriber = new Subscriber(subscription, enableTracing); - assert.ok(subscriber['_useOpentelemetry']); + assert.ok(subscriber['_useLegacyOpenTelemetry']); }); it('should instantiate a tracer when tracing is enabled through setOptions', () => { subscriber = new Subscriber(subscription, {}); subscriber.setOptions(enableTracing); - assert.ok(subscriber['_useOpentelemetry']); + assert.ok(subscriber['_useLegacyOpenTelemetry']); }); it('should disable tracing when tracing is disabled through setOptions', () => { subscriber = new Subscriber(subscription, enableTracing); subscriber.setOptions(disableTracing); - assert.strictEqual(subscriber['_useOpentelemetry'], false); + assert.strictEqual(subscriber['_useLegacyOpenTelemetry'], false); }); it('exports a span once it is created', () => { + tracing.setGloballyEnabled(true); + subscription = new FakeSubscription() as {} as Subscription; subscriber = new Subscriber(subscription, enableTracing); message = new Message(subscriber, RECEIVED_MESSAGE); - assert.strictEqual(subscriber['_useOpentelemetry'], true); + assert.strictEqual(subscriber['_useLegacyOpenTelemetry'], true); subscriber.open(); // Construct mock of received message with span context @@ -900,18 +933,26 @@ describe('Subscriber', () => { receivedMessages: [messageWithSpanContext], }; + const openedSub = subscriber as unknown as PublicInventory; + sandbox.stub(openedSub._inventory, 'add').callsFake((m: s.Message) => { + message = m; + }); + // Receive message and assert that it was exported const msgStream = stubs.get('messageStream'); msgStream.emit('data', pullResponse); + message.endParentSpan(); + const spans = exporter.getFinishedSpans(); assert.strictEqual(spans.length, 1); - const firstSpan = spans.concat().shift(); + assert.strictEqual(spans[0].events.length, 2); + const firstSpan = spans.pop(); assert.ok(firstSpan); assert.strictEqual(firstSpan.parentSpanId, parentSpanContext.spanId); assert.strictEqual( firstSpan.name, - `${subscriber.name} process`, + `${subId} subscribe`, 'name of span should match' ); assert.strictEqual( @@ -919,42 +960,29 @@ describe('Subscriber', () => { SpanKind.CONSUMER, 'span kind should be CONSUMER' ); - assert.strictEqual( - firstSpan.attributes[SemanticAttributes.MESSAGING_OPERATION], - 'process', - 'span messaging operation should match' - ); - assert.strictEqual( - firstSpan.attributes[SemanticAttributes.MESSAGING_SYSTEM], - 'pubsub' - ); - assert.strictEqual( - firstSpan.attributes[SemanticAttributes.MESSAGING_MESSAGE_ID], - messageWithSpanContext.message.messageId, - 'span messaging id should match' - ); - assert.strictEqual( - firstSpan.attributes[SemanticAttributes.MESSAGING_DESTINATION], - subscriber.name, - 'span messaging destination should match' - ); - assert.strictEqual( - firstSpan.attributes[SemanticAttributes.MESSAGING_DESTINATION_KIND], - 'topic' - ); }); - it('does not export a span when a span context is not present on message', () => { + it('exports a span even when a span context is not present on message', () => { + tracing.setGloballyEnabled(true); + subscriber = new Subscriber(subscription, enableTracing); + subscriber.open(); const pullResponse: s.PullResponse = { receivedMessages: [RECEIVED_MESSAGE], }; + const openedSub = subscriber as unknown as PublicInventory; + sandbox.stub(openedSub._inventory, 'add').callsFake((m: s.Message) => { + message = m; + }); + // Receive message and assert that it was exported const stream: FakeMessageStream = stubs.get('messageStream'); stream.emit('data', pullResponse); - assert.strictEqual(exporter.getFinishedSpans().length, 0); + + message.endParentSpan(); + assert.strictEqual(exporter.getFinishedSpans().length, 1); }); }); @@ -1165,4 +1193,102 @@ describe('Subscriber', () => { }); }); }); + + describe('SubscriberSpans', () => { + const message: tracing.MessageWithAttributes = { + attributes: {}, + parentSpan: undefined, + }; + const spans = new s.SubscriberSpans(message); + const fakeSpan = { + end() {}, + } as unknown as opentelemetry.Span; + + it('starts a flow span', () => { + const stub = sandbox + .stub(tracing.PubsubSpans, 'createReceiveFlowSpan') + .returns(fakeSpan); + spans.flowStart(); + assert.strictEqual(stub.calledOnce, true); + assert.strictEqual(stub.args[0][0], message); + spans.flowStart(); + assert.strictEqual(stub.calledOnce, true); + }); + + it('ends a flow span', () => { + sandbox + .stub(tracing.PubsubSpans, 'createReceiveFlowSpan') + .returns(fakeSpan); + spans.flowStart(); + const spy = sandbox.spy(fakeSpan, 'end'); + spans.flowEnd(); + assert.strictEqual(spy.calledOnce, true); + spans.flowEnd(); + assert.strictEqual(spy.calledOnce, true); + }); + + it('fires a modAck start event', () => { + const stub = sandbox.stub(tracing.PubsubEvents, 'modAckStart'); + spans.modAckStart(Duration.from({seconds: 10}), true); + assert.strictEqual(stub.args[0][0], message); + assert.strictEqual(stub.args[0][1].totalOf('second'), 10); + assert.strictEqual(stub.args[0][2], true); + assert.strictEqual(stub.calledOnce, true); + }); + + it('fires a modAck end event', () => { + const stub = sandbox.stub(tracing.PubsubEvents, 'modAckEnd'); + spans.modAckEnd(); + assert.strictEqual(stub.args[0][0], message); + assert.strictEqual(stub.calledOnce, true); + }); + + it('starts a scheduler span', () => { + const stub = sandbox + .stub(tracing.PubsubSpans, 'createReceiveSchedulerSpan') + .returns(fakeSpan); + spans.schedulerStart(); + assert.strictEqual(stub.args[0][0], message); + assert.strictEqual(stub.calledOnce, true); + spans.schedulerStart(); + assert.strictEqual(stub.calledOnce, true); + }); + + it('ends a scheduler span', () => { + sandbox + .stub(tracing.PubsubSpans, 'createReceiveSchedulerSpan') + .returns(fakeSpan); + spans.schedulerStart(); + const spy = sandbox.spy(fakeSpan, 'end'); + spans.schedulerEnd(); + assert.strictEqual(spy.calledOnce, true); + spans.schedulerEnd(); + assert.strictEqual(spy.calledOnce, true); + }); + + it('starts a processing span', () => { + const stub = sandbox + .stub(tracing.PubsubSpans, 'createReceiveProcessSpan') + .returns(fakeSpan); + const subName = 'foozle'; + spans.processingStart(subName); + assert.strictEqual(stub.args[0][0], message); + assert.strictEqual(stub.args[0][1], subName); + assert.strictEqual(stub.calledOnce, true); + spans.processingStart('boo'); + assert.strictEqual(stub.calledOnce, true); + }); + + it('ends a processing span', () => { + sandbox + .stub(tracing.PubsubSpans, 'createReceiveSchedulerSpan') + .returns(fakeSpan); + spans.processingStart('foozle'); + const spy = sandbox.spy(fakeSpan, 'end'); + spans.processingEnd(); + assert.strictEqual(spy.calledOnce, true); + spans.processingEnd(); + assert.strictEqual(spy.calledOnce, true); + }); + }); }); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index c90835c1a17..77717f61734 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -170,7 +170,7 @@ describe('Subscription', () => { assert(subscription.iam instanceof FakeIAM); const args = (subscription.iam as {} as FakeIAM).calledWith_; assert.strictEqual(args[0], PUBSUB); - assert.strictEqual(args[1], subscription.name); + assert.strictEqual(args[1], subscription); }); it('should create a Subscriber', () => { @@ -200,7 +200,12 @@ describe('Subscription', () => { }); it('should emit messages', done => { - const message = {}; + const message = { + subSpans: { + processingStart() {}, + processingEnd() {}, + }, + }; subscription.on?.('message', (msg: Message) => { assert.strictEqual(msg, message); diff --git a/handwritten/pubsub/test/telemetry-tracing.ts b/handwritten/pubsub/test/telemetry-tracing.ts new file mode 100644 index 00000000000..d624a6146b3 --- /dev/null +++ b/handwritten/pubsub/test/telemetry-tracing.ts @@ -0,0 +1,397 @@ +/*! + * Copyright 2020-2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as assert from 'assert'; +import {describe, it, beforeEach} from 'mocha'; + +import * as trace from '@opentelemetry/sdk-trace-base'; +import * as otel from '../src/telemetry-tracing'; +import {exporter} from './tracing'; +import {SpanKind} from '@opentelemetry/api'; +import sinon = require('sinon'); +import {PubsubMessage} from '../src/publisher'; + +describe('OpenTelemetryTracer', () => { + beforeEach(() => { + exporter.reset(); + otel.setGloballyEnabled(true); + }); + afterEach(() => { + exporter.reset(); + otel.setGloballyEnabled(false); + }); + + describe('project parser', () => { + it('parses subscription info', () => { + const name = 'projects/project-name/subscriptions/sub-name'; + const info = otel.getSubscriptionInfo(name); + assert.strictEqual(info.subName, name); + assert.strictEqual(info.projectId, 'project-name'); + assert.strictEqual(info.subId, 'sub-name'); + assert.strictEqual(info.topicId, undefined); + assert.strictEqual(info.topicName, undefined); + }); + + it('parses topic info', () => { + const name = 'projects/project-name/topics/topic-name'; + const info = otel.getTopicInfo(name); + assert.strictEqual(info.topicName, name); + assert.strictEqual(info.projectId, 'project-name'); + assert.strictEqual(info.topicId, 'topic-name'); + assert.strictEqual(info.subId, undefined); + assert.strictEqual(info.subName, undefined); + }); + + it('parses broken subscription info', () => { + const name = 'projec/foo_foo/subs/sub_sub'; + const info = otel.getSubscriptionInfo(name); + assert.strictEqual(info.subName, name); + assert.strictEqual(info.projectId, undefined); + assert.strictEqual(info.subId, undefined); + assert.strictEqual(info.topicId, undefined); + assert.strictEqual(info.topicName, undefined); + }); + + it('parses broken topic info', () => { + const name = 'projec/foo_foo/tops/top_top'; + const info = otel.getTopicInfo(name); + assert.strictEqual(info.subName, undefined); + assert.strictEqual(info.projectId, undefined); + assert.strictEqual(info.subId, undefined); + assert.strictEqual(info.topicId, undefined); + assert.strictEqual(info.topicName, name); + }); + }); + + describe('basic span creation', () => { + it('creates a span', () => { + const message: PubsubMessage = {}; + const span = otel.PubsubSpans.createPublisherSpan( + message, + 'projects/test/topics/topicfoo', + 'tests' + ) as trace.Span; + span.end(); + + const spans = exporter.getFinishedSpans(); + assert.notStrictEqual(spans.length, 0); + const exportedSpan = spans.concat().pop()!; + + assert.strictEqual(exportedSpan.name, 'topicfoo create'); + assert.strictEqual(exportedSpan.kind, SpanKind.PRODUCER); + }); + + it('injects a trace context', () => { + const message: PubsubMessage = { + attributes: {}, + }; + const span = otel.PubsubSpans.createPublisherSpan( + message, + 'projects/test/topics/topicfoo', + 'tests' + ) as trace.Span; + + otel.injectSpan(span, message, otel.OpenTelemetryLevel.Modern); + + assert.strictEqual( + Object.getOwnPropertyNames(message.attributes).includes( + otel.modernAttributeName + ), + true + ); + }); + }); + + describe('context propagation', () => { + it('injects a trace context and legacy baggage', () => { + const message: PubsubMessage = { + attributes: {}, + }; + const span = otel.PubsubSpans.createPublisherSpan( + message, + 'projects/test/topics/topicfoo', + 'tests' + ); + assert.ok(span); + + otel.injectSpan(span, message, otel.OpenTelemetryLevel.Legacy); + + assert.strictEqual( + Object.getOwnPropertyNames(message.attributes).includes( + otel.modernAttributeName + ), + true + ); + assert.strictEqual( + Object.getOwnPropertyNames(message.attributes).includes( + otel.legacyAttributeName + ), + true + ); + }); + + it('should issue a warning if OpenTelemetry span context key is set', () => { + const message: PubsubMessage = { + attributes: { + [otel.legacyAttributeName]: 'foobar', + [otel.modernAttributeName]: 'bazbar', + }, + }; + const span = otel.PubsubSpans.createPublisherSpan( + message, + 'projects/test/topics/topicfoo', + 'tests' + ); + assert.ok(span); + + const warnSpy = sinon.spy(console, 'warn'); + try { + otel.injectSpan(span, message, otel.OpenTelemetryLevel.Legacy); + assert.strictEqual(warnSpy.callCount, 2); + } finally { + warnSpy.restore(); + } + }); + + it('should be able to determine if attributes are present', () => { + let message: otel.MessageWithAttributes = { + attributes: { + [otel.legacyAttributeName]: 'foobar', + }, + }; + assert.strictEqual(otel.containsSpanContext(message), true); + + message = { + attributes: { + [otel.modernAttributeName]: 'foobar', + }, + }; + assert.strictEqual(otel.containsSpanContext(message), true); + + message = {}; + assert.strictEqual(otel.containsSpanContext(message), false); + }); + + it('extracts a trace context', () => { + const message = { + attributes: { + [otel.modernAttributeName]: + '00-d4cda95b652f4a1592b449d5929fda1b-553964cd9101a314-01', + }, + }; + + const childSpan = otel.extractSpan( + message, + 'projects/test/subscriptions/subfoo', + otel.OpenTelemetryLevel.Modern + ); + assert.strictEqual( + childSpan!.spanContext().traceId, + 'd4cda95b652f4a1592b449d5929fda1b' + ); + }); + }); + + describe('attribute creation', () => { + it('creates attributes for publish', () => { + const topicInfo: otel.AttributeParams = { + topicName: 'projects/foo/topics/top', + topicId: 'top', + projectId: 'foo', + }; + const message: PubsubMessage = { + data: Buffer.from('test'), + attributes: {}, + calculatedSize: 1234, + orderingKey: 'key', + isExactlyOnceDelivery: true, + ackId: 'ackack', + }; + + const topicAttrs = otel.PubsubSpans.createAttributes( + topicInfo, + message, + 'tests' + ); + assert.deepStrictEqual(topicAttrs, { + 'messaging.system': 'gcp_pubsub', + 'messaging.destination.name': topicInfo.topicId, + 'gcp.project_id': topicInfo.projectId, + 'messaging.message.envelope.size': message.calculatedSize, + 'messaging.gcp_pubsub.message.ordering_key': message.orderingKey, + 'messaging.gcp_pubsub.message.exactly_once_delivery': + message.isExactlyOnceDelivery, + 'messaging.gcp_pubsub.message.ack_id': message.ackId, + 'code.function': 'tests', + }); + + // Check again with no calculated size and other parameters missing. + delete message.calculatedSize; + delete message.orderingKey; + delete message.isExactlyOnceDelivery; + delete message.ackId; + + const topicAttrs2 = otel.PubsubSpans.createAttributes( + topicInfo, + message, + 'tests' + ); + assert.deepStrictEqual(topicAttrs2, { + 'messaging.system': 'gcp_pubsub', + 'messaging.destination.name': topicInfo.topicId, + 'gcp.project_id': topicInfo.projectId, + 'messaging.message.envelope.size': message.data?.length, + 'code.function': 'tests', + }); + }); + }); + + describe('specialized span creation', () => { + const tests = { + topicInfo: { + topicName: 'projects/foo/topics/top', + topicId: 'top', + projectId: 'foo', + } as otel.AttributeParams, + subInfo: { + subName: 'projects/foo/subscriptions/sub', + subId: 'sub', + projectId: 'foo', + } as otel.AttributeParams, + message: { + data: Buffer.from('test'), + attributes: {}, + calculatedSize: 1234, + orderingKey: 'key', + isExactlyOnceDelivery: true, + ackId: 'ackack', + } as PubsubMessage, + }; + + it('creates publisher spans', () => { + const span = otel.PubsubSpans.createPublisherSpan( + tests.message, + tests.topicInfo.topicName!, + 'tests' + ); + assert.ok(span); + span.end(); + + const spans = exporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + + const firstSpan = spans.pop(); + assert.ok(firstSpan); + assert.strictEqual(firstSpan.name, `${tests.topicInfo.topicId} create`); + assert.strictEqual( + firstSpan.attributes['messaging.destination.name'], + tests.topicInfo.topicId + ); + assert.strictEqual( + firstSpan.attributes['messaging.system'], + 'gcp_pubsub' + ); + }); + + it('updates publisher topic names', () => { + const span = otel.PubsubSpans.createPublisherSpan( + tests.message, + tests.topicInfo.topicName!, + 'tests' + ); + assert.ok(span); + otel.PubsubSpans.updatePublisherTopicName( + span, + 'projects/foo/topics/other' + ); + span.end(); + + const spans = exporter.getFinishedSpans(); + assert.strictEqual(spans.length, 1); + + const firstSpan = spans.pop(); + assert.ok(firstSpan); + assert.strictEqual(firstSpan.name, 'other create'); + + assert.strictEqual( + firstSpan.attributes['messaging.destination.name'], + 'other' + ); + }); + + it('creates receive spans', () => { + const parentSpan = otel.PubsubSpans.createPublisherSpan( + tests.message, + tests.topicInfo.topicName!, + 'tests' + ); + assert.ok(parentSpan); + const span = otel.PubsubSpans.createReceiveSpan( + tests.message, + tests.subInfo.subName!, + otel.spanContextToContext(parentSpan.spanContext()), + 'tests' + ); + assert.ok(span); + span.end(); + parentSpan.end(); + + const spans = exporter.getFinishedSpans(); + const parentReadSpan = spans.pop(); + const childReadSpan = spans.pop(); + assert.ok(parentReadSpan && childReadSpan); + + assert.strictEqual(childReadSpan.name, 'sub subscribe'); + assert.strictEqual( + childReadSpan.attributes['messaging.destination.name'], + 'sub' + ); + assert.strictEqual(childReadSpan.kind, SpanKind.CONSUMER); + assert.ok(childReadSpan.parentSpanId); + }); + + it('creates publish RPC spans', () => { + const message: PubsubMessage = {}; + const topicName = 'projects/test/topics/topicfoo'; + const span = otel.PubsubSpans.createPublisherSpan( + message, + topicName, + 'test' + ) as trace.Span; + message.parentSpan = span; + span.end(); + + const publishSpan = otel.PubsubSpans.createPublishRpcSpan( + [message], + topicName, + 'test' + ); + + publishSpan?.end(); + const spans = exporter.getFinishedSpans(); + const publishReadSpan = spans.pop(); + const childReadSpan = spans.pop(); + assert.ok(publishReadSpan && childReadSpan); + + assert.strictEqual( + publishReadSpan.attributes['messaging.batch.message_count'], + 1 + ); + assert.strictEqual(publishReadSpan.links.length, 1); + assert.strictEqual(childReadSpan.links.length, 1); + }); + }); +}); diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index 1179c718b5f..bdbb7c808bd 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -188,7 +188,7 @@ describe('Topic', () => { }); it('should create an iam object', () => { - assert.deepStrictEqual(topic.iam.calledWith_, [PUBSUB, TOPIC_NAME]); + assert.deepStrictEqual(topic.iam.calledWith_, [PUBSUB, topic]); }); }); diff --git a/handwritten/pubsub/test/tracing.ts b/handwritten/pubsub/test/tracing.ts index 8b1b3114628..7689253ad43 100644 --- a/handwritten/pubsub/test/tracing.ts +++ b/handwritten/pubsub/test/tracing.ts @@ -18,7 +18,7 @@ import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor, -} from '@opentelemetry/tracing'; +} from '@opentelemetry/sdk-trace-base'; /** * This file is used to initialise a global tracing provider and span exporter From e772e6c39383add653241d33ae62efe218dfb10d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:27:27 -0400 Subject: [PATCH 1030/1115] chore(main): release 4.7.0 (#1960) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index bb5e66b4241..c92964e1bbc 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.7.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.6.0...v4.7.0) (2024-08-24) + + +### Features + +* Add support for OTel context propagation and harmonized spans ([#1833](https://github.com/googleapis/nodejs-pubsub/issues/1833)) ([4b5c90d](https://github.com/googleapis/nodejs-pubsub/commit/4b5c90dc334e90cefb4da3c6fe9ce027b50aacb8)) + ## [4.6.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.5.0...v4.6.0) (2024-07-12) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 61816dec22b..71630a489d6 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.6.0", + "version": "4.7.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From e8a8a5a67b74b30bca67522973ca377c7f90c2b0 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 26 Aug 2024 23:16:20 +0200 Subject: [PATCH 1031/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.26.0 (#1945) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@opentelemetry/semantic-conventions](https://togithub.com/open-telemetry/opentelemetry-js/tree/main/semantic-conventions) ([source](https://togithub.com/open-telemetry/opentelemetry-js)) | [`~1.25.1` -> `~1.26.0`](https://renovatebot.com/diffs/npm/@opentelemetry%2fsemantic-conventions/1.25.1/1.26.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@opentelemetry%2fsemantic-conventions/1.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@opentelemetry%2fsemantic-conventions/1.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@opentelemetry%2fsemantic-conventions/1.25.1/1.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@opentelemetry%2fsemantic-conventions/1.25.1/1.26.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-js (@​opentelemetry/semantic-conventions) ### [`v1.26.0`](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.25.1...3cf1c5215f2656ccb82e6a73cd9e6f2782f8d1cc) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-js/compare/v1.25.1...3cf1c5215f2656ccb82e6a73cd9e6f2782f8d1cc)
--- ### Configuration 📅 **Schedule**: Branch creation - "after 9am and before 3pm" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/nodejs-pubsub). --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 71630a489d6..4813cabe337 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -52,7 +52,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "~1.9.0", - "@opentelemetry/semantic-conventions": "~1.25.1", + "@opentelemetry/semantic-conventions": "~1.26.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", From 965d1d0f9bc28f823b88e857d0c35554e707f241 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 26 Aug 2024 17:56:21 -0400 Subject: [PATCH 1032/1115] fix: propagate set options to LeaseManager (from https://github.com/googleapis/nodejs-pubsub/pull/1880) (#1954) Bringing this over from https://togithub.com/googleapis/nodejs-pubsub/pull/1880 (dermasmid@) so I can work CI on it. Fixes https://togithub.com/googleapis/nodejs-pubsub/issues/1879 --- handwritten/pubsub/src/subscriber.ts | 5 +++++ handwritten/pubsub/test/subscriber.ts | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 731c018f587..fd3dc30a421 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -993,11 +993,16 @@ export class Subscriber extends EventEmitter { const {maxStreams = defaultOptions.subscription.maxStreams} = options.streamingOptions; + options.streamingOptions.maxStreams = Math.min( maxStreams, this.maxMessages ); } + + if (this._inventory) { + this._inventory.setOptions(this._options.flowControl!); + } } /** diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index f6bc4d2e212..7ab85ab67be 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -95,6 +95,8 @@ class FakeLeaseManager extends EventEmitter { } // eslint-disable-next-line @typescript-eslint/no-unused-vars add(message: s.Message): void {} + // eslint-disable-next-line @typescript-eslint/no-unused-vars + setOptions(options: FlowControlOptions): void {} clear(): s.Message[] { return []; } @@ -115,6 +117,8 @@ class FakeQueue { async add(message: s.Message, deadline?: number): Promise { return s.AckResponses.Success; } + // eslint-disable-next-line @typescript-eslint/no-unused-vars + setOptions(options: BatchOptions) {} async flush(): Promise {} async onFlush(): Promise {} async onDrain(): Promise {} From 072c885a8d2fb1aff0832c76b481dee567c62a52 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:46:14 -0400 Subject: [PATCH 1033/1115] chore(main): release 4.7.1 (#1961) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 9 +++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c92964e1bbc..84275198478 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,15 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.7.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.7.0...v4.7.1) (2024-08-26) + + +### Bug Fixes + +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.26.0 ([#1945](https://github.com/googleapis/nodejs-pubsub/issues/1945)) ([f082869](https://github.com/googleapis/nodejs-pubsub/commit/f082869a185c059463654c76c744e44e7b28415e)) +* **deps:** Update dependency protobufjs to ~7.4.0 ([#1959](https://github.com/googleapis/nodejs-pubsub/issues/1959)) ([25946e0](https://github.com/googleapis/nodejs-pubsub/commit/25946e0d4fe794202984cdad6cf48121f72063cf)) +* Propagate set options to LeaseManager (from https://github.com/googleapis/nodejs-pubsub/pull/1880) ([#1954](https://github.com/googleapis/nodejs-pubsub/issues/1954)) ([cdb0916](https://github.com/googleapis/nodejs-pubsub/commit/cdb0916bd30da67f5153c9aead09e7f505954253)) + ## [4.7.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.6.0...v4.7.0) (2024-08-24) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4813cabe337..9eabe553bf7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.7.0", + "version": "4.7.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From d53f92362b0ba2047cde0b6d5da8d05a8e1e0f61 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:11:15 -0400 Subject: [PATCH 1034/1115] fix: set MaxBytes for AckQueue (#1963) * fix: #1864 * feat: update maxBytes changes to use a fixed max size * chore: remove "discount polyfill" for allSettled * tests: add unit tests for maxBytes handling * fix: do the maxMessages and maxBytes checks _before_ adding * fix: roll back nise package to avoid semver breakage * chore: move the nise version fix to devDependencies (oops) * chore: pin rimraf in samples package to avoid typescript breakage in lru-cache * chore: also pin lru-cache, remove unneeded rimraf types --------- Co-authored-by: Cheskel Twersky --- handwritten/pubsub/package.json | 2 + handwritten/pubsub/src/message-queues.ts | 30 ++++++++++-- handwritten/pubsub/test/message-queues.ts | 60 +++++++++-------------- 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9eabe553bf7..366c635314a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -89,7 +89,9 @@ "mocha": "^9.2.2", "mv": "^2.1.1", "ncp": "^2.0.0", + "nise": "6.0.0", "null-loader": "^4.0.0", + "path-to-regexp": "6.2.2", "protobufjs": "^7.0.0", "proxyquire": "^2.0.0", "sinon": "^18.0.0", diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 6dfefc2cf88..a08330a3699 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -61,6 +61,11 @@ export interface BatchOptions { maxMilliseconds?: number; } +// This is the maximum number of bytes we will send for a batch of +// ack/modack messages. The server itself has a maximum of 512KiB, so +// we just pull back a little from that in case of unknown fenceposts. +export const MAX_BATCH_BYTES = 510 * 1024 * 1024; + /** * Error class used to signal a batch failure. * @@ -113,6 +118,7 @@ export abstract class MessageQueue { numPendingRequests: number; numInFlightRequests: number; numInRetryRequests: number; + bytes: number; protected _onFlush?: defer.DeferredPromise; protected _onDrain?: defer.DeferredPromise; protected _options!: BatchOptions; @@ -127,6 +133,7 @@ export abstract class MessageQueue { this.numPendingRequests = 0; this.numInFlightRequests = 0; this.numInRetryRequests = 0; + this.bytes = 0; this._requests = []; this._subscriber = sub; this._retrier = new ExponentialRetry( @@ -195,7 +202,18 @@ export abstract class MessageQueue { } const {maxMessages, maxMilliseconds} = this._options; + const size = Buffer.byteLength(message.ackId, 'utf8'); + // If we will go over maxMessages or MAX_BATCH_BYTES by adding this + // message, flush first. (maxMilliseconds is handled by timers.) + if ( + this._requests.length + 1 >= maxMessages! || + this.bytes + size >= MAX_BATCH_BYTES + ) { + this.flush(); + } + + // Add the message to the current batch. const responsePromise = defer(); this._requests.push({ message: { @@ -208,10 +226,10 @@ export abstract class MessageQueue { }); this.numPendingRequests++; this.numInFlightRequests++; + this.bytes += size; - if (this._requests.length >= maxMessages!) { - this.flush(); - } else if (!this._timer) { + // Ensure that we are counting toward maxMilliseconds by timer. + if (!this._timer) { this._timer = setTimeout(() => this.flush(), maxMilliseconds!); } @@ -273,6 +291,7 @@ export abstract class MessageQueue { const deferred = this._onFlush; this._requests = []; + this.bytes = 0; this.numPendingRequests -= batchSize; delete this._onFlush; @@ -339,7 +358,10 @@ export abstract class MessageQueue { * @private */ setOptions(options: BatchOptions): void { - const defaults: BatchOptions = {maxMessages: 3000, maxMilliseconds: 100}; + const defaults: BatchOptions = { + maxMessages: 3000, + maxMilliseconds: 100, + }; this._options = Object.assign(defaults, options); } diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 98e514f984f..b5d42b768b9 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -24,7 +24,7 @@ import defer = require('p-defer'); import * as messageTypes from '../src/message-queues'; import {BatchError} from '../src/message-queues'; -import {AckError, Message, Subscriber} from '../src/subscriber'; +import {Message, Subscriber} from '../src/subscriber'; import {DebugMessage} from '../src/debug'; class FakeClient { @@ -99,36 +99,6 @@ class ModAckQueue extends messageTypes.ModAckQueue { } } -// This discount polyfill for Promise.allSettled can be removed after we drop Node 12. -type AllSettledResult = { - status: 'fulfilled' | 'rejected'; - value?: T; - reason?: U; -}; -function allSettled( - proms: Promise[] -): Promise[]> { - const checkedProms = proms.map((r: Promise) => - r - .then( - (value: T) => - ({ - status: 'fulfilled', - value, - }) as AllSettledResult - ) - .catch( - (error: U) => - ({ - status: 'rejected', - reason: error, - }) as AllSettledResult - ) - ); - - return Promise.all(checkedProms); -} - describe('MessageQueues', () => { const sandbox = sinon.createSandbox(); @@ -190,6 +160,15 @@ describe('MessageQueues', () => { assert.strictEqual(stub.callCount, 1); }); + it('should flush the queue if at byte capacity', () => { + const stub = sandbox.stub(messageQueue, 'flush'); + + messageQueue.bytes = messageTypes.MAX_BATCH_BYTES - 10; + messageQueue.add(new FakeMessage() as Message); + + assert.strictEqual(stub.callCount, 1); + }); + it('should schedule a flush if needed', () => { const clock = sandbox.useFakeTimers(); const stub = sandbox.stub(messageQueue, 'flush'); @@ -244,6 +223,13 @@ describe('MessageQueues', () => { assert.strictEqual(messageQueue.numPendingRequests, 0); }); + it('should remove the bytes of messages from the queue', () => { + messageQueue.add(new FakeMessage() as Message); + messageQueue.flush(); + + assert.strictEqual(messageQueue.bytes, 0); + }); + it('should send the batch', () => { const message = new FakeMessage(); const deadline = 10; @@ -498,7 +484,7 @@ describe('MessageQueues', () => { (r: messageTypes.QueuedMessage) => r.responsePromise!.promise ); await ackQueue.flush(); - const results = await allSettled(proms); + const results = await Promise.allSettled(proms); const oneSuccess = {status: 'fulfilled', value: undefined}; assert.deepStrictEqual(results, [oneSuccess, oneSuccess, oneSuccess]); }); @@ -522,7 +508,7 @@ describe('MessageQueues', () => { proms.shift(); await ackQueue.flush(); - const results = await allSettled(proms); + const results = await Promise.allSettled(proms); assert.strictEqual(results[0].status, 'rejected'); assert.strictEqual(results[0].reason?.errorCode, 'OTHER'); assert.strictEqual(results[1].status, 'rejected'); @@ -552,7 +538,7 @@ describe('MessageQueues', () => { ]; await ackQueue.flush(); - const results = await allSettled(proms); + const results = await Promise.allSettled(proms); assert.strictEqual(results[0].status, 'rejected'); assert.strictEqual(results[0].reason?.errorCode, 'INVALID'); @@ -789,7 +775,7 @@ describe('MessageQueues', () => { (r: messageTypes.QueuedMessage) => r.responsePromise!.promise ); await modAckQueue.flush(); - const results = await allSettled(proms); + const results = await Promise.allSettled(proms); const oneSuccess = {status: 'fulfilled', value: undefined}; assert.deepStrictEqual(results, [oneSuccess, oneSuccess, oneSuccess]); }); @@ -815,7 +801,7 @@ describe('MessageQueues', () => { proms.shift(); await modAckQueue.flush(); - const results = await allSettled(proms); + const results = await Promise.allSettled(proms); assert.strictEqual(results[0].status, 'rejected'); assert.strictEqual(results[0].reason?.errorCode, 'OTHER'); assert.strictEqual(results[1].status, 'rejected'); @@ -847,7 +833,7 @@ describe('MessageQueues', () => { ]; await modAckQueue.flush(); - const results = await allSettled(proms); + const results = await Promise.allSettled(proms); assert.strictEqual(results[0].status, 'rejected'); assert.strictEqual(results[0].reason?.errorCode, 'INVALID'); From b5127dd6e7497ca4caa10e2ab93c25c6adfa6add Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:16:35 -0400 Subject: [PATCH 1035/1115] chore(main): release 4.7.2 (#1967) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 84275198478..c0f5aecdd7e 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.7.2](https://github.com/googleapis/nodejs-pubsub/compare/v4.7.1...v4.7.2) (2024-09-13) + + +### Bug Fixes + +* Set MaxBytes for AckQueue ([#1963](https://github.com/googleapis/nodejs-pubsub/issues/1963)) ([5945563](https://github.com/googleapis/nodejs-pubsub/commit/594556315f159f4197ffc0e7249ce1b0339c12ec)) + ## [4.7.1](https://github.com/googleapis/nodejs-pubsub/compare/v4.7.0...v4.7.1) (2024-08-26) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 366c635314a..c2b0ff7c437 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.7.1", + "version": "4.7.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 7c7db5774dd2ee2f4cc2f1fbd7bf0312221fca34 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:55:49 -0400 Subject: [PATCH 1036/1115] build: shift typeless bot invocation into library package (#1972) * build: shift typeless invocation into repo * build: use npx * chore: clean up old lint error * build: move typeless invocation to root * build: also npm i on samples when running posttypeless --- handwritten/pubsub/owlbot.py | 12 +++++++++--- handwritten/pubsub/package.json | 5 ++++- handwritten/pubsub/test/pubsub.ts | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index f3e6252cc10..fb4ebecc102 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -12,16 +12,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -import synthtool.languages.node as node +from synthtool.languages import node +from synthtool import shell +from synthtool.log import logger # Generate JS samples from TS. -node.typeless_samples_hermetic() +# node.typeless_samples_hermetic() # We need to run this before the main owlbot processing, to make # sure quickstart.js gets gts fixed before the README is generated. # This needs to be worked out more properly, this is temporary. +logger.debug("Run typeless sample bot") node.install() -node.fix() +shell.run(["npm", "run", "typeless"]) + +# node.fix() + # Main OwlBot processing. node.owlbot_main(templates_excludes=[ diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c2b0ff7c437..c5d3dcc271d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -44,7 +44,9 @@ "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js", "prelint": "cd samples; npm link ../; npm install", - "precompile": "gts clean" + "precompile": "gts clean", + "typeless": "npx typeless-sample-bot --outputpath samples --targets samples --recursive", + "posttypeless": "cd samples; npm i; cd ..; npm run fix" }, "dependencies": { "@google-cloud/paginator": "^5.0.0", @@ -63,6 +65,7 @@ "p-defer": "^3.0.0" }, "devDependencies": { + "@google-cloud/typeless-sample-bot": "^2.1.0", "@grpc/proto-loader": "^0.7.0", "@opentelemetry/core": "^1.17.0", "@opentelemetry/sdk-trace-base": "^1.17.0", diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index df330f69278..d4ceef18b89 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -308,6 +308,7 @@ describe('PubSub', () => { const options: pubsubTypes.ClientConfig = { enableOpenTelemetryTracing: true, }; + // eslint-disable-next-line @typescript-eslint/no-unused-vars const pubsub = new PubSub(options); assert.strictEqual( tracing.isEnabled(), From 90492a8337da55c62e982794e8d30ef0c5719460 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 19:46:24 +0000 Subject: [PATCH 1037/1115] docs: update documentation for 31 day subscription message retention (#1965) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 673028761 Source-Link: https://togithub.com/googleapis/googleapis/commit/394f626e83786b5f2230d10a774c8db961b5e6b7 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/88f68a7024b00ff7e204919a97b87a3007b1123c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODhmNjhhNzAyNGIwMGZmN2UyMDQ5MTlhOTdiODdhMzAwN2IxMTIzYyJ9 --- handwritten/pubsub/.gitignore | 2 +- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto | 2 +- handwritten/pubsub/src/v1/subscriber_client.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/.gitignore b/handwritten/pubsub/.gitignore index 661747bf126..d4f03a0df2e 100644 --- a/handwritten/pubsub/.gitignore +++ b/handwritten/pubsub/.gitignore @@ -5,7 +5,7 @@ /.nyc_output /docs/ /out/ -**/build/ +/build/ system-test/secrets.js system-test/*key.json *.lock diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c5d3dcc271d..88da238cb6a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -46,7 +46,7 @@ "prelint": "cd samples; npm link ../; npm install", "precompile": "gts clean", "typeless": "npx typeless-sample-bot --outputpath samples --targets samples --recursive", - "posttypeless": "cd samples; npm i; cd ..; npm run fix" + "posttypeless": "cd samples && npm i && cd .. && npm run fix" }, "dependencies": { "@google-cloud/paginator": "^5.0.0", diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index b5092087a37..cd765d1c3e6 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -837,7 +837,7 @@ message Subscription { // backlog, from the moment a message is published. If `retain_acked_messages` // is true, then this also configures the retention of acknowledged messages, // and thus configures how far back in time a `Seek` can be done. Defaults to - // 7 days. Cannot be more than 7 days or less than 10 minutes. + // 7 days. Cannot be more than 31 days or less than 10 minutes. google.protobuf.Duration message_retention_duration = 8 [(google.api.field_behavior) = OPTIONAL]; diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 617d05f67dc..0930d8f34a7 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -514,7 +514,7 @@ export class SubscriberClient { * backlog, from the moment a message is published. If `retain_acked_messages` * is true, then this also configures the retention of acknowledged messages, * and thus configures how far back in time a `Seek` can be done. Defaults to - * 7 days. Cannot be more than 7 days or less than 10 minutes. + * 7 days. Cannot be more than 31 days or less than 10 minutes. * @param {number[]} [request.labels] * Optional. See [Creating and managing * labels](https://cloud.google.com/pubsub/docs/labels). From 380c3769a893531bc6440e904ca2a164d583f975 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:11:03 -0400 Subject: [PATCH 1038/1115] samples: add optimisticSubscribe, plus a few small library changes to support it (#1973) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * samples: add optimisticSubscribe, plus a few small library changes to support it * fix: simplify DebugMessage handling of StatusError * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: fix copyright date * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 1 + handwritten/pubsub/src/index.ts | 2 +- handwritten/pubsub/src/message-stream.ts | 8 ++++++-- handwritten/pubsub/src/subscriber.ts | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 94ac16b3da6..cafebdefee0 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -165,6 +165,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | 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) | | Subscribe with OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenWithOpenTelemetryTracing.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/listenWithOpenTelemetryTracing.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) | +| Optimistic Subscribe | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/optimisticSubscribe.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/optimisticSubscribe.js,samples/README.md) | | Publish Avro Records to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishAvroRecords.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/publishAvroRecords.js,samples/README.md) | | Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | | Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessage.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/publishMessage.js,samples/README.md) | diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index abc8afb0899..15b5a1d32eb 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -124,7 +124,7 @@ export { SeekResponse, Snapshot, } from './snapshot'; -export {Message, SubscriberOptions} from './subscriber'; +export {Message, StatusError, SubscriberOptions} from './subscriber'; export { Schema, CreateSchemaResponse, diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 80b71449685..07365838229 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -384,11 +384,14 @@ export class MessageStream extends PassThrough { private _onEnd(index: number, status: grpc.StatusObject): void { this._removeStream(index); + const statusError = new StatusError(status); + if (PullRetry.retry(status)) { this.emit( 'debug', new DebugMessage( - `Subscriber stream ${index} has ended with status ${status.code}; will be retried.` + `Subscriber stream ${index} has ended with status ${status.code}; will be retried.`, + statusError ) ); if (PullRetry.resetFailures(status)) { @@ -401,7 +404,8 @@ export class MessageStream extends PassThrough { this.emit( 'debug', new DebugMessage( - `Subscriber stream ${index} has ended with status ${status.code}; will not be retried.` + `Subscriber stream ${index} has ended with status ${status.code}; will not be retried.`, + statusError ) ); diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index fd3dc30a421..c20b63be637 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -30,6 +30,8 @@ import * as tracing from './telemetry-tracing'; import {Duration} from './temporal'; import {EventEmitter} from 'events'; +export {StatusError} from './message-stream'; + export type PullResponse = google.pubsub.v1.IStreamingPullResponse; export type SubscriptionProperties = google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties; From 683e9b9b05e84448146caa4e966c63c08f0e6674 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 16:15:57 -0400 Subject: [PATCH 1039/1115] feat: add ingestion Cloud Storage fields and Platform Logging fields to Topic (#1974) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add ingestion Cloud Storage fields and Platform Logging fields to Topic PiperOrigin-RevId: 678307181 Source-Link: https://github.com/googleapis/googleapis/commit/69e9dff10df4fa1e338712d38dc26b46791a6e94 Source-Link: https://github.com/googleapis/googleapis-gen/commit/11a52e52723227d3b6120f88f1a580e3958e0cd5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTFhNTJlNTI3MjMyMjdkM2I2MTIwZjg4ZjFhNTgwZTM5NThlMGNkNSJ9 feat: return listing information for subscriptions created via Analytics Hub PiperOrigin-RevId: 676126585 Source-Link: https://github.com/googleapis/googleapis/commit/de3b4b32cdf9edbe6ed687a985af393769052972 Source-Link: https://github.com/googleapis/googleapis-gen/commit/c3df55162ccc9929c97bfec9fa1d5bcd3b65af4a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzNkZjU1MTYyY2NjOTkyOWM5N2JmZWM5ZmExZDViY2QzYjY1YWY0YSJ9 * build: try switching to raw eslint to exclude owl-bot-staging * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: feywind <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/README.md | 16 +- handwritten/pubsub/package.json | 2 +- .../protos/google/pubsub/v1/pubsub.proto | 140 ++ handwritten/pubsub/protos/protos.d.ts | 661 ++++++- handwritten/pubsub/protos/protos.js | 1706 ++++++++++++++++- handwritten/pubsub/protos/protos.json | 164 +- .../pubsub/src/v1/subscriber_client.ts | 3 + 7 files changed, 2631 insertions(+), 61 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index cafebdefee0..be5ef76a707 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -66,15 +66,15 @@ npm install @google-cloud/pubsub ```javascript // Imports the Google Cloud client library -const {PubSub} = require('@google-cloud/pubsub'); +const { PubSub } = require("@google-cloud/pubsub"); async function quickstart( - projectId = 'your-project-id', // Your Google Cloud Platform project ID - topicNameOrId = 'my-topic', // Name for the new topic to create - subscriptionName = 'my-sub' // Name for the new subscription to create +projectId = 'your-project-id', // Your Google Cloud Platform project ID +topicNameOrId = 'my-topic', // Name for the new topic to create +subscriptionName = 'my-sub' // Name for the new subscription to create ) { // Instantiates a client - const pubsub = new PubSub({projectId}); + const pubsub = new PubSub({ projectId }); // Creates a new topic const [topic] = await pubsub.createTopic(topicNameOrId); @@ -84,19 +84,19 @@ async function quickstart( const [subscription] = await topic.createSubscription(subscriptionName); // Receive callbacks for new messages on the subscription - subscription.on('message', message => { + subscription.on('message', (message) => { console.log('Received message:', message.data.toString()); process.exit(0); }); // Receive callbacks for errors on the subscription - subscription.on('error', error => { + subscription.on('error', (error) => { console.error('Received error:', error); process.exit(1); }); // Send a message to the topic - topic.publishMessage({data: Buffer.from('Test message!')}); + topic.publishMessage({ data: Buffer.from('Test message!') }); } ``` diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 88da238cb6a..b3558bf47ed 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -46,7 +46,7 @@ "prelint": "cd samples; npm link ../; npm install", "precompile": "gts clean", "typeless": "npx typeless-sample-bot --outputpath samples --targets samples --recursive", - "posttypeless": "cd samples && npm i && cd .. && npm run fix" + "posttypeless": "cd samples && npm i && cd .. && npx eslint --ignore-pattern owl-bot-staging --fix" }, "dependencies": { "@google-cloud/paginator": "^5.0.0", diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index cd765d1c3e6..54b44b82217 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -237,11 +237,132 @@ message IngestionDataSourceSettings { string gcp_service_account = 5 [(google.api.field_behavior) = REQUIRED]; } + // Ingestion settings for Cloud Storage. + message CloudStorage { + // Possible states for ingestion from Cloud Storage. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // Ingestion is active. + ACTIVE = 1; + + // Permission denied encountered while calling the Cloud Storage API. This + // can happen if the Pub/Sub SA has not been granted the + // [appropriate + // permissions](https://cloud.google.com/storage/docs/access-control/iam-permissions): + // - storage.objects.list: to list the objects in a bucket. + // - storage.objects.get: to read the objects in a bucket. + // - storage.buckets.get: to verify the bucket exists. + CLOUD_STORAGE_PERMISSION_DENIED = 2; + + // Permission denied encountered while publishing to the topic. This can + // happen if the Pub/Sub SA has not been granted the [appropriate publish + // permissions](https://cloud.google.com/pubsub/docs/access-control#pubsub.publisher) + PUBLISH_PERMISSION_DENIED = 3; + + // The provided Cloud Storage bucket doesn't exist. + BUCKET_NOT_FOUND = 4; + + // The Cloud Storage bucket has too many objects, ingestion will be + // paused. + TOO_MANY_OBJECTS = 5; + } + + // Configuration for reading Cloud Storage data in text format. Each line of + // text as specified by the delimiter will be set to the `data` field of a + // Pub/Sub message. + message TextFormat { + // Optional. When unset, '\n' is used. + optional string delimiter = 1 [(google.api.field_behavior) = OPTIONAL]; + } + + // Configuration for reading Cloud Storage data in Avro binary format. The + // bytes of each object will be set to the `data` field of a Pub/Sub + // message. + message AvroFormat {} + + // Configuration for reading Cloud Storage data written via [Cloud Storage + // subscriptions](https://cloud.google.com/pubsub/docs/cloudstorage). The + // data and attributes fields of the originally exported Pub/Sub message + // will be restored when publishing. + message PubSubAvroFormat {} + + // Output only. An output-only field that indicates the state of the Cloud + // Storage ingestion source. + State state = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Optional. Cloud Storage bucket. The bucket name must be without any + // prefix like "gs://". See the [bucket naming requirements] + // (https://cloud.google.com/storage/docs/buckets#naming). + string bucket = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Defaults to text format. + oneof input_format { + // Optional. Data from Cloud Storage will be interpreted as text. + TextFormat text_format = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Data from Cloud Storage will be interpreted in Avro format. + AvroFormat avro_format = 4 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. It will be assumed data from Cloud Storage was written via + // [Cloud Storage + // subscriptions](https://cloud.google.com/pubsub/docs/cloudstorage). + PubSubAvroFormat pubsub_avro_format = 5 + [(google.api.field_behavior) = OPTIONAL]; + } + + // Optional. Only objects with a larger or equal creation timestamp will be + // ingested. + google.protobuf.Timestamp minimum_object_create_time = 6 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Glob pattern used to match objects that will be ingested. If + // unset, all objects will be ingested. See the [supported + // patterns](https://cloud.google.com/storage/docs/json_api/v1/objects/list#list-objects-and-prefixes-using-glob). + string match_glob = 9 [(google.api.field_behavior) = OPTIONAL]; + } + // Only one source type can have settings set. oneof source { // Optional. Amazon Kinesis Data Streams. AwsKinesis aws_kinesis = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Cloud Storage. + CloudStorage cloud_storage = 2 [(google.api.field_behavior) = OPTIONAL]; + } + + // Optional. Platform Logs settings. If unset, no Platform Logs will be + // generated. + PlatformLogsSettings platform_logs_settings = 4 + [(google.api.field_behavior) = OPTIONAL]; +} + +// Settings for Platform Logs produced by Pub/Sub. +message PlatformLogsSettings { + // Severity levels of Platform Logs. + enum Severity { + // Default value. Logs level is unspecified. Logs will be disabled. + SEVERITY_UNSPECIFIED = 0; + + // Logs will be disabled. + DISABLED = 1; + + // Debug logs and higher-severity logs will be written. + DEBUG = 2; + + // Info logs and higher-severity logs will be written. + INFO = 3; + + // Warning logs and higher-severity logs will be written. + WARNING = 4; + + // Only error logs will be written. + ERROR = 5; } + + // Optional. The minimum severity level of Platform Logs that will be written. + Severity severity = 1 [(google.api.field_behavior) = OPTIONAL]; } // A topic resource. @@ -774,6 +895,20 @@ message Subscription { RESOURCE_ERROR = 2; } + // Information about an associated Analytics Hub subscription + // (https://cloud.google.com/bigquery/docs/analytics-hub-manage-subscriptions). + message AnalyticsHubSubscriptionInfo { + // Optional. The name of the associated Analytics Hub listing resource. + // Pattern: + // "projects/{project}/locations/{location}/dataExchanges/{data_exchange}/listings/{listing}" + string listing = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The name of the associated Analytics Hub subscription resource. + // Pattern: + // "projects/{project}/locations/{location}/subscriptions/{subscription}" + string subscription = 2 [(google.api.field_behavior) = OPTIONAL]; + } + // Required. The name of the subscription. It must have the format // `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must // start with a letter, and contain only letters (`[A-Za-z]`), numbers @@ -922,6 +1057,11 @@ message Subscription { // Output only. An output-only field indicating whether or not the // subscription can receive messages. State state = 19 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Output only. Information about the associated Analytics Hub subscription. + // Only set if the subscritpion is created by Analytics Hub. + AnalyticsHubSubscriptionInfo analytics_hub_subscription_info = 23 + [(google.api.field_behavior) = OUTPUT_ONLY]; } // A policy that specifies how Pub/Sub retries message delivery. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 69f782b8d97..eed0f3d039a 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -459,6 +459,12 @@ export namespace google { /** IngestionDataSourceSettings awsKinesis */ awsKinesis?: (google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis|null); + + /** IngestionDataSourceSettings cloudStorage */ + cloudStorage?: (google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage|null); + + /** IngestionDataSourceSettings platformLogsSettings */ + platformLogsSettings?: (google.pubsub.v1.IPlatformLogsSettings|null); } /** Represents an IngestionDataSourceSettings. */ @@ -473,8 +479,14 @@ export namespace google { /** IngestionDataSourceSettings awsKinesis. */ public awsKinesis?: (google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis|null); + /** IngestionDataSourceSettings cloudStorage. */ + public cloudStorage?: (google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage|null); + + /** IngestionDataSourceSettings platformLogsSettings. */ + public platformLogsSettings?: (google.pubsub.v1.IPlatformLogsSettings|null); + /** IngestionDataSourceSettings source. */ - public source?: "awsKinesis"; + public source?: ("awsKinesis"|"cloudStorage"); /** * Creates a new IngestionDataSourceSettings instance using the specified properties. @@ -689,6 +701,544 @@ export namespace google { CONSUMER_NOT_FOUND = 5 } } + + /** Properties of a CloudStorage. */ + interface ICloudStorage { + + /** CloudStorage state */ + state?: (google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State|null); + + /** CloudStorage bucket */ + bucket?: (string|null); + + /** CloudStorage textFormat */ + textFormat?: (google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat|null); + + /** CloudStorage avroFormat */ + avroFormat?: (google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat|null); + + /** CloudStorage pubsubAvroFormat */ + pubsubAvroFormat?: (google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat|null); + + /** CloudStorage minimumObjectCreateTime */ + minimumObjectCreateTime?: (google.protobuf.ITimestamp|null); + + /** CloudStorage matchGlob */ + matchGlob?: (string|null); + } + + /** Represents a CloudStorage. */ + class CloudStorage implements ICloudStorage { + + /** + * Constructs a new CloudStorage. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage); + + /** CloudStorage state. */ + public state: (google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State); + + /** CloudStorage bucket. */ + public bucket: string; + + /** CloudStorage textFormat. */ + public textFormat?: (google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat|null); + + /** CloudStorage avroFormat. */ + public avroFormat?: (google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat|null); + + /** CloudStorage pubsubAvroFormat. */ + public pubsubAvroFormat?: (google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat|null); + + /** CloudStorage minimumObjectCreateTime. */ + public minimumObjectCreateTime?: (google.protobuf.ITimestamp|null); + + /** CloudStorage matchGlob. */ + public matchGlob: string; + + /** CloudStorage inputFormat. */ + public inputFormat?: ("textFormat"|"avroFormat"|"pubsubAvroFormat"); + + /** + * Creates a new CloudStorage instance using the specified properties. + * @param [properties] Properties to set + * @returns CloudStorage instance + */ + public static create(properties?: google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage; + + /** + * Encodes the specified CloudStorage message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.verify|verify} messages. + * @param message CloudStorage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CloudStorage message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.verify|verify} messages. + * @param message CloudStorage message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CloudStorage message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CloudStorage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage; + + /** + * Decodes a CloudStorage message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CloudStorage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage; + + /** + * Verifies a CloudStorage message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CloudStorage message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CloudStorage + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage; + + /** + * Creates a plain object from a CloudStorage message. Also converts values to other types if specified. + * @param message CloudStorage + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CloudStorage to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CloudStorage + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace CloudStorage { + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + CLOUD_STORAGE_PERMISSION_DENIED = 2, + PUBLISH_PERMISSION_DENIED = 3, + BUCKET_NOT_FOUND = 4, + TOO_MANY_OBJECTS = 5 + } + + /** Properties of a TextFormat. */ + interface ITextFormat { + + /** TextFormat delimiter */ + delimiter?: (string|null); + } + + /** Represents a TextFormat. */ + class TextFormat implements ITextFormat { + + /** + * Constructs a new TextFormat. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat); + + /** TextFormat delimiter. */ + public delimiter?: (string|null); + + /** + * Creates a new TextFormat instance using the specified properties. + * @param [properties] Properties to set + * @returns TextFormat instance + */ + public static create(properties?: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat; + + /** + * Encodes the specified TextFormat message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.verify|verify} messages. + * @param message TextFormat message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified TextFormat message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.verify|verify} messages. + * @param message TextFormat message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a TextFormat message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns TextFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat; + + /** + * Decodes a TextFormat message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns TextFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat; + + /** + * Verifies a TextFormat message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a TextFormat message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns TextFormat + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat; + + /** + * Creates a plain object from a TextFormat message. Also converts values to other types if specified. + * @param message TextFormat + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this TextFormat to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for TextFormat + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of an AvroFormat. */ + interface IAvroFormat { + } + + /** Represents an AvroFormat. */ + class AvroFormat implements IAvroFormat { + + /** + * Constructs a new AvroFormat. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat); + + /** + * Creates a new AvroFormat instance using the specified properties. + * @param [properties] Properties to set + * @returns AvroFormat instance + */ + public static create(properties?: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat; + + /** + * Encodes the specified AvroFormat message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.verify|verify} messages. + * @param message AvroFormat message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AvroFormat message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.verify|verify} messages. + * @param message AvroFormat message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AvroFormat message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AvroFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat; + + /** + * Decodes an AvroFormat message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AvroFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat; + + /** + * Verifies an AvroFormat message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AvroFormat message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AvroFormat + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat; + + /** + * Creates a plain object from an AvroFormat message. Also converts values to other types if specified. + * @param message AvroFormat + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AvroFormat to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AvroFormat + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a PubSubAvroFormat. */ + interface IPubSubAvroFormat { + } + + /** Represents a PubSubAvroFormat. */ + class PubSubAvroFormat implements IPubSubAvroFormat { + + /** + * Constructs a new PubSubAvroFormat. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat); + + /** + * Creates a new PubSubAvroFormat instance using the specified properties. + * @param [properties] Properties to set + * @returns PubSubAvroFormat instance + */ + public static create(properties?: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat; + + /** + * Encodes the specified PubSubAvroFormat message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.verify|verify} messages. + * @param message PubSubAvroFormat message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PubSubAvroFormat message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.verify|verify} messages. + * @param message PubSubAvroFormat message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PubSubAvroFormat message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PubSubAvroFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat; + + /** + * Decodes a PubSubAvroFormat message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PubSubAvroFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat; + + /** + * Verifies a PubSubAvroFormat message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PubSubAvroFormat message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PubSubAvroFormat + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat; + + /** + * Creates a plain object from a PubSubAvroFormat message. Also converts values to other types if specified. + * @param message PubSubAvroFormat + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PubSubAvroFormat to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PubSubAvroFormat + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + } + } + + /** Properties of a PlatformLogsSettings. */ + interface IPlatformLogsSettings { + + /** PlatformLogsSettings severity */ + severity?: (google.pubsub.v1.PlatformLogsSettings.Severity|keyof typeof google.pubsub.v1.PlatformLogsSettings.Severity|null); + } + + /** Represents a PlatformLogsSettings. */ + class PlatformLogsSettings implements IPlatformLogsSettings { + + /** + * Constructs a new PlatformLogsSettings. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IPlatformLogsSettings); + + /** PlatformLogsSettings severity. */ + public severity: (google.pubsub.v1.PlatformLogsSettings.Severity|keyof typeof google.pubsub.v1.PlatformLogsSettings.Severity); + + /** + * Creates a new PlatformLogsSettings instance using the specified properties. + * @param [properties] Properties to set + * @returns PlatformLogsSettings instance + */ + public static create(properties?: google.pubsub.v1.IPlatformLogsSettings): google.pubsub.v1.PlatformLogsSettings; + + /** + * Encodes the specified PlatformLogsSettings message. Does not implicitly {@link google.pubsub.v1.PlatformLogsSettings.verify|verify} messages. + * @param message PlatformLogsSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IPlatformLogsSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified PlatformLogsSettings message, length delimited. Does not implicitly {@link google.pubsub.v1.PlatformLogsSettings.verify|verify} messages. + * @param message PlatformLogsSettings message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IPlatformLogsSettings, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a PlatformLogsSettings message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns PlatformLogsSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.PlatformLogsSettings; + + /** + * Decodes a PlatformLogsSettings message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns PlatformLogsSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.PlatformLogsSettings; + + /** + * Verifies a PlatformLogsSettings message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a PlatformLogsSettings message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns PlatformLogsSettings + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.PlatformLogsSettings; + + /** + * Creates a plain object from a PlatformLogsSettings message. Also converts values to other types if specified. + * @param message PlatformLogsSettings + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.PlatformLogsSettings, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this PlatformLogsSettings to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for PlatformLogsSettings + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace PlatformLogsSettings { + + /** Severity enum. */ + enum Severity { + SEVERITY_UNSPECIFIED = 0, + DISABLED = 1, + DEBUG = 2, + INFO = 3, + WARNING = 4, + ERROR = 5 + } } /** Properties of a Topic. */ @@ -2704,6 +3254,9 @@ export namespace google { /** Subscription state */ state?: (google.pubsub.v1.Subscription.State|keyof typeof google.pubsub.v1.Subscription.State|null); + + /** Subscription analyticsHubSubscriptionInfo */ + analyticsHubSubscriptionInfo?: (google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo|null); } /** Represents a Subscription. */ @@ -2769,6 +3322,9 @@ export namespace google { /** Subscription state. */ public state: (google.pubsub.v1.Subscription.State|keyof typeof google.pubsub.v1.Subscription.State); + /** Subscription analyticsHubSubscriptionInfo. */ + public analyticsHubSubscriptionInfo?: (google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo|null); + /** * Creates a new Subscription instance using the specified properties. * @param [properties] Properties to set @@ -2855,6 +3411,109 @@ export namespace google { ACTIVE = 1, RESOURCE_ERROR = 2 } + + /** Properties of an AnalyticsHubSubscriptionInfo. */ + interface IAnalyticsHubSubscriptionInfo { + + /** AnalyticsHubSubscriptionInfo listing */ + listing?: (string|null); + + /** AnalyticsHubSubscriptionInfo subscription */ + subscription?: (string|null); + } + + /** Represents an AnalyticsHubSubscriptionInfo. */ + class AnalyticsHubSubscriptionInfo implements IAnalyticsHubSubscriptionInfo { + + /** + * Constructs a new AnalyticsHubSubscriptionInfo. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo); + + /** AnalyticsHubSubscriptionInfo listing. */ + public listing: string; + + /** AnalyticsHubSubscriptionInfo subscription. */ + public subscription: string; + + /** + * Creates a new AnalyticsHubSubscriptionInfo instance using the specified properties. + * @param [properties] Properties to set + * @returns AnalyticsHubSubscriptionInfo instance + */ + public static create(properties?: google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo): google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo; + + /** + * Encodes the specified AnalyticsHubSubscriptionInfo message. Does not implicitly {@link google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.verify|verify} messages. + * @param message AnalyticsHubSubscriptionInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AnalyticsHubSubscriptionInfo message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.verify|verify} messages. + * @param message AnalyticsHubSubscriptionInfo message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AnalyticsHubSubscriptionInfo message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AnalyticsHubSubscriptionInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo; + + /** + * Decodes an AnalyticsHubSubscriptionInfo message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AnalyticsHubSubscriptionInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo; + + /** + * Verifies an AnalyticsHubSubscriptionInfo message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AnalyticsHubSubscriptionInfo message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AnalyticsHubSubscriptionInfo + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo; + + /** + * Creates a plain object from an AnalyticsHubSubscriptionInfo message. Also converts values to other types if specified. + * @param message AnalyticsHubSubscriptionInfo + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AnalyticsHubSubscriptionInfo to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AnalyticsHubSubscriptionInfo + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } } /** Properties of a RetryPolicy. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 5b9a057d58b..b54729ed3e5 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -936,6 +936,8 @@ * @memberof google.pubsub.v1 * @interface IIngestionDataSourceSettings * @property {google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis|null} [awsKinesis] IngestionDataSourceSettings awsKinesis + * @property {google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage|null} [cloudStorage] IngestionDataSourceSettings cloudStorage + * @property {google.pubsub.v1.IPlatformLogsSettings|null} [platformLogsSettings] IngestionDataSourceSettings platformLogsSettings */ /** @@ -961,17 +963,33 @@ */ IngestionDataSourceSettings.prototype.awsKinesis = null; + /** + * IngestionDataSourceSettings cloudStorage. + * @member {google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage|null|undefined} cloudStorage + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @instance + */ + IngestionDataSourceSettings.prototype.cloudStorage = null; + + /** + * IngestionDataSourceSettings platformLogsSettings. + * @member {google.pubsub.v1.IPlatformLogsSettings|null|undefined} platformLogsSettings + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @instance + */ + IngestionDataSourceSettings.prototype.platformLogsSettings = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * IngestionDataSourceSettings source. - * @member {"awsKinesis"|undefined} source + * @member {"awsKinesis"|"cloudStorage"|undefined} source * @memberof google.pubsub.v1.IngestionDataSourceSettings * @instance */ Object.defineProperty(IngestionDataSourceSettings.prototype, "source", { - get: $util.oneOfGetter($oneOfFields = ["awsKinesis"]), + get: $util.oneOfGetter($oneOfFields = ["awsKinesis", "cloudStorage"]), set: $util.oneOfSetter($oneOfFields) }); @@ -1001,6 +1019,10 @@ writer = $Writer.create(); if (message.awsKinesis != null && Object.hasOwnProperty.call(message, "awsKinesis")) $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.encode(message.awsKinesis, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.cloudStorage != null && Object.hasOwnProperty.call(message, "cloudStorage")) + $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.encode(message.cloudStorage, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.platformLogsSettings != null && Object.hasOwnProperty.call(message, "platformLogsSettings")) + $root.google.pubsub.v1.PlatformLogsSettings.encode(message.platformLogsSettings, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); return writer; }; @@ -1039,6 +1061,14 @@ message.awsKinesis = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.decode(reader, reader.uint32()); break; } + case 2: { + message.cloudStorage = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.decode(reader, reader.uint32()); + break; + } + case 4: { + message.platformLogsSettings = $root.google.pubsub.v1.PlatformLogsSettings.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -1083,6 +1113,21 @@ return "awsKinesis." + error; } } + if (message.cloudStorage != null && message.hasOwnProperty("cloudStorage")) { + if (properties.source === 1) + return "source: multiple values"; + properties.source = 1; + { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.verify(message.cloudStorage); + if (error) + return "cloudStorage." + error; + } + } + if (message.platformLogsSettings != null && message.hasOwnProperty("platformLogsSettings")) { + var error = $root.google.pubsub.v1.PlatformLogsSettings.verify(message.platformLogsSettings); + if (error) + return "platformLogsSettings." + error; + } return null; }; @@ -1103,6 +1148,16 @@ throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.awsKinesis: object expected"); message.awsKinesis = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.fromObject(object.awsKinesis); } + if (object.cloudStorage != null) { + if (typeof object.cloudStorage !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.cloudStorage: object expected"); + message.cloudStorage = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.fromObject(object.cloudStorage); + } + if (object.platformLogsSettings != null) { + if (typeof object.platformLogsSettings !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.platformLogsSettings: object expected"); + message.platformLogsSettings = $root.google.pubsub.v1.PlatformLogsSettings.fromObject(object.platformLogsSettings); + } return message; }; @@ -1119,11 +1174,20 @@ if (!options) options = {}; var object = {}; + if (options.defaults) + object.platformLogsSettings = null; if (message.awsKinesis != null && message.hasOwnProperty("awsKinesis")) { object.awsKinesis = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.toObject(message.awsKinesis, options); if (options.oneofs) object.source = "awsKinesis"; } + if (message.cloudStorage != null && message.hasOwnProperty("cloudStorage")) { + object.cloudStorage = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.toObject(message.cloudStorage, options); + if (options.oneofs) + object.source = "cloudStorage"; + } + if (message.platformLogsSettings != null && message.hasOwnProperty("platformLogsSettings")) + object.platformLogsSettings = $root.google.pubsub.v1.PlatformLogsSettings.toObject(message.platformLogsSettings, options); return object; }; @@ -1457,60 +1521,1347 @@ if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) object.gcpServiceAccount = message.gcpServiceAccount; return object; - }; + }; + + /** + * Converts this AwsKinesis to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @instance + * @returns {Object.} JSON object + */ + AwsKinesis.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AwsKinesis + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AwsKinesis.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis"; + }; + + /** + * State enum. + * @name google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} KINESIS_PERMISSION_DENIED=2 KINESIS_PERMISSION_DENIED value + * @property {number} PUBLISH_PERMISSION_DENIED=3 PUBLISH_PERMISSION_DENIED value + * @property {number} STREAM_NOT_FOUND=4 STREAM_NOT_FOUND value + * @property {number} CONSUMER_NOT_FOUND=5 CONSUMER_NOT_FOUND value + */ + AwsKinesis.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "KINESIS_PERMISSION_DENIED"] = 2; + values[valuesById[3] = "PUBLISH_PERMISSION_DENIED"] = 3; + values[valuesById[4] = "STREAM_NOT_FOUND"] = 4; + values[valuesById[5] = "CONSUMER_NOT_FOUND"] = 5; + return values; + })(); + + return AwsKinesis; + })(); + + IngestionDataSourceSettings.CloudStorage = (function() { + + /** + * Properties of a CloudStorage. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @interface ICloudStorage + * @property {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State|null} [state] CloudStorage state + * @property {string|null} [bucket] CloudStorage bucket + * @property {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat|null} [textFormat] CloudStorage textFormat + * @property {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat|null} [avroFormat] CloudStorage avroFormat + * @property {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat|null} [pubsubAvroFormat] CloudStorage pubsubAvroFormat + * @property {google.protobuf.ITimestamp|null} [minimumObjectCreateTime] CloudStorage minimumObjectCreateTime + * @property {string|null} [matchGlob] CloudStorage matchGlob + */ + + /** + * Constructs a new CloudStorage. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @classdesc Represents a CloudStorage. + * @implements ICloudStorage + * @constructor + * @param {google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage=} [properties] Properties to set + */ + function CloudStorage(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CloudStorage state. + * @member {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State} state + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + */ + CloudStorage.prototype.state = 0; + + /** + * CloudStorage bucket. + * @member {string} bucket + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + */ + CloudStorage.prototype.bucket = ""; + + /** + * CloudStorage textFormat. + * @member {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat|null|undefined} textFormat + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + */ + CloudStorage.prototype.textFormat = null; + + /** + * CloudStorage avroFormat. + * @member {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat|null|undefined} avroFormat + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + */ + CloudStorage.prototype.avroFormat = null; + + /** + * CloudStorage pubsubAvroFormat. + * @member {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat|null|undefined} pubsubAvroFormat + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + */ + CloudStorage.prototype.pubsubAvroFormat = null; + + /** + * CloudStorage minimumObjectCreateTime. + * @member {google.protobuf.ITimestamp|null|undefined} minimumObjectCreateTime + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + */ + CloudStorage.prototype.minimumObjectCreateTime = null; + + /** + * CloudStorage matchGlob. + * @member {string} matchGlob + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + */ + CloudStorage.prototype.matchGlob = ""; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * CloudStorage inputFormat. + * @member {"textFormat"|"avroFormat"|"pubsubAvroFormat"|undefined} inputFormat + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + */ + Object.defineProperty(CloudStorage.prototype, "inputFormat", { + get: $util.oneOfGetter($oneOfFields = ["textFormat", "avroFormat", "pubsubAvroFormat"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new CloudStorage instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage} CloudStorage instance + */ + CloudStorage.create = function create(properties) { + return new CloudStorage(properties); + }; + + /** + * Encodes the specified CloudStorage message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage} message CloudStorage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CloudStorage.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.state); + if (message.bucket != null && Object.hasOwnProperty.call(message, "bucket")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.bucket); + if (message.textFormat != null && Object.hasOwnProperty.call(message, "textFormat")) + $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.encode(message.textFormat, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.avroFormat != null && Object.hasOwnProperty.call(message, "avroFormat")) + $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.encode(message.avroFormat, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.pubsubAvroFormat != null && Object.hasOwnProperty.call(message, "pubsubAvroFormat")) + $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.encode(message.pubsubAvroFormat, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.minimumObjectCreateTime != null && Object.hasOwnProperty.call(message, "minimumObjectCreateTime")) + $root.google.protobuf.Timestamp.encode(message.minimumObjectCreateTime, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.matchGlob != null && Object.hasOwnProperty.call(message, "matchGlob")) + writer.uint32(/* id 9, wireType 2 =*/74).string(message.matchGlob); + return writer; + }; + + /** + * Encodes the specified CloudStorage message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage} message CloudStorage message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CloudStorage.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CloudStorage message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage} CloudStorage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CloudStorage.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.state = reader.int32(); + break; + } + case 2: { + message.bucket = reader.string(); + break; + } + case 3: { + message.textFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.decode(reader, reader.uint32()); + break; + } + case 4: { + message.avroFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.decode(reader, reader.uint32()); + break; + } + case 5: { + message.pubsubAvroFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.decode(reader, reader.uint32()); + break; + } + case 6: { + message.minimumObjectCreateTime = $root.google.protobuf.Timestamp.decode(reader, reader.uint32()); + break; + } + case 9: { + message.matchGlob = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CloudStorage message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage} CloudStorage + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CloudStorage.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CloudStorage message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CloudStorage.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + if (message.bucket != null && message.hasOwnProperty("bucket")) + if (!$util.isString(message.bucket)) + return "bucket: string expected"; + if (message.textFormat != null && message.hasOwnProperty("textFormat")) { + properties.inputFormat = 1; + { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.verify(message.textFormat); + if (error) + return "textFormat." + error; + } + } + if (message.avroFormat != null && message.hasOwnProperty("avroFormat")) { + if (properties.inputFormat === 1) + return "inputFormat: multiple values"; + properties.inputFormat = 1; + { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.verify(message.avroFormat); + if (error) + return "avroFormat." + error; + } + } + if (message.pubsubAvroFormat != null && message.hasOwnProperty("pubsubAvroFormat")) { + if (properties.inputFormat === 1) + return "inputFormat: multiple values"; + properties.inputFormat = 1; + { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.verify(message.pubsubAvroFormat); + if (error) + return "pubsubAvroFormat." + error; + } + } + if (message.minimumObjectCreateTime != null && message.hasOwnProperty("minimumObjectCreateTime")) { + var error = $root.google.protobuf.Timestamp.verify(message.minimumObjectCreateTime); + if (error) + return "minimumObjectCreateTime." + error; + } + if (message.matchGlob != null && message.hasOwnProperty("matchGlob")) + if (!$util.isString(message.matchGlob)) + return "matchGlob: string expected"; + return null; + }; + + /** + * Creates a CloudStorage message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage} CloudStorage + */ + CloudStorage.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage) + return object; + var message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage(); + switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "CLOUD_STORAGE_PERMISSION_DENIED": + case 2: + message.state = 2; + break; + case "PUBLISH_PERMISSION_DENIED": + case 3: + message.state = 3; + break; + case "BUCKET_NOT_FOUND": + case 4: + message.state = 4; + break; + case "TOO_MANY_OBJECTS": + case 5: + message.state = 5; + break; + } + if (object.bucket != null) + message.bucket = String(object.bucket); + if (object.textFormat != null) { + if (typeof object.textFormat !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.textFormat: object expected"); + message.textFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.fromObject(object.textFormat); + } + if (object.avroFormat != null) { + if (typeof object.avroFormat !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.avroFormat: object expected"); + message.avroFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.fromObject(object.avroFormat); + } + if (object.pubsubAvroFormat != null) { + if (typeof object.pubsubAvroFormat !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.pubsubAvroFormat: object expected"); + message.pubsubAvroFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.fromObject(object.pubsubAvroFormat); + } + if (object.minimumObjectCreateTime != null) { + if (typeof object.minimumObjectCreateTime !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.minimumObjectCreateTime: object expected"); + message.minimumObjectCreateTime = $root.google.protobuf.Timestamp.fromObject(object.minimumObjectCreateTime); + } + if (object.matchGlob != null) + message.matchGlob = String(object.matchGlob); + return message; + }; + + /** + * Creates a plain object from a CloudStorage message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage} message CloudStorage + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CloudStorage.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.bucket = ""; + object.minimumObjectCreateTime = null; + object.matchGlob = ""; + } + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State[message.state] : message.state; + if (message.bucket != null && message.hasOwnProperty("bucket")) + object.bucket = message.bucket; + if (message.textFormat != null && message.hasOwnProperty("textFormat")) { + object.textFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.toObject(message.textFormat, options); + if (options.oneofs) + object.inputFormat = "textFormat"; + } + if (message.avroFormat != null && message.hasOwnProperty("avroFormat")) { + object.avroFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.toObject(message.avroFormat, options); + if (options.oneofs) + object.inputFormat = "avroFormat"; + } + if (message.pubsubAvroFormat != null && message.hasOwnProperty("pubsubAvroFormat")) { + object.pubsubAvroFormat = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.toObject(message.pubsubAvroFormat, options); + if (options.oneofs) + object.inputFormat = "pubsubAvroFormat"; + } + if (message.minimumObjectCreateTime != null && message.hasOwnProperty("minimumObjectCreateTime")) + object.minimumObjectCreateTime = $root.google.protobuf.Timestamp.toObject(message.minimumObjectCreateTime, options); + if (message.matchGlob != null && message.hasOwnProperty("matchGlob")) + object.matchGlob = message.matchGlob; + return object; + }; + + /** + * Converts this CloudStorage to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @instance + * @returns {Object.} JSON object + */ + CloudStorage.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for CloudStorage + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CloudStorage.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.CloudStorage"; + }; + + /** + * State enum. + * @name google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} CLOUD_STORAGE_PERMISSION_DENIED=2 CLOUD_STORAGE_PERMISSION_DENIED value + * @property {number} PUBLISH_PERMISSION_DENIED=3 PUBLISH_PERMISSION_DENIED value + * @property {number} BUCKET_NOT_FOUND=4 BUCKET_NOT_FOUND value + * @property {number} TOO_MANY_OBJECTS=5 TOO_MANY_OBJECTS value + */ + CloudStorage.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "CLOUD_STORAGE_PERMISSION_DENIED"] = 2; + values[valuesById[3] = "PUBLISH_PERMISSION_DENIED"] = 3; + values[valuesById[4] = "BUCKET_NOT_FOUND"] = 4; + values[valuesById[5] = "TOO_MANY_OBJECTS"] = 5; + return values; + })(); + + CloudStorage.TextFormat = (function() { + + /** + * Properties of a TextFormat. + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @interface ITextFormat + * @property {string|null} [delimiter] TextFormat delimiter + */ + + /** + * Constructs a new TextFormat. + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @classdesc Represents a TextFormat. + * @implements ITextFormat + * @constructor + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat=} [properties] Properties to set + */ + function TextFormat(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * TextFormat delimiter. + * @member {string|null|undefined} delimiter + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @instance + */ + TextFormat.prototype.delimiter = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + // Virtual OneOf for proto3 optional field + Object.defineProperty(TextFormat.prototype, "_delimiter", { + get: $util.oneOfGetter($oneOfFields = ["delimiter"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new TextFormat instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat} TextFormat instance + */ + TextFormat.create = function create(properties) { + return new TextFormat(properties); + }; + + /** + * Encodes the specified TextFormat message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat} message TextFormat message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TextFormat.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.delimiter != null && Object.hasOwnProperty.call(message, "delimiter")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.delimiter); + return writer; + }; + + /** + * Encodes the specified TextFormat message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.ITextFormat} message TextFormat message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + TextFormat.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a TextFormat message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat} TextFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TextFormat.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.delimiter = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a TextFormat message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat} TextFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + TextFormat.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a TextFormat message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + TextFormat.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.delimiter != null && message.hasOwnProperty("delimiter")) { + properties._delimiter = 1; + if (!$util.isString(message.delimiter)) + return "delimiter: string expected"; + } + return null; + }; + + /** + * Creates a TextFormat message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat} TextFormat + */ + TextFormat.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat) + return object; + var message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat(); + if (object.delimiter != null) + message.delimiter = String(object.delimiter); + return message; + }; + + /** + * Creates a plain object from a TextFormat message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat} message TextFormat + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + TextFormat.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (message.delimiter != null && message.hasOwnProperty("delimiter")) { + object.delimiter = message.delimiter; + if (options.oneofs) + object._delimiter = "delimiter"; + } + return object; + }; + + /** + * Converts this TextFormat to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @instance + * @returns {Object.} JSON object + */ + TextFormat.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for TextFormat + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + TextFormat.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat"; + }; + + return TextFormat; + })(); + + CloudStorage.AvroFormat = (function() { + + /** + * Properties of an AvroFormat. + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @interface IAvroFormat + */ + + /** + * Constructs a new AvroFormat. + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @classdesc Represents an AvroFormat. + * @implements IAvroFormat + * @constructor + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat=} [properties] Properties to set + */ + function AvroFormat(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new AvroFormat instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat} AvroFormat instance + */ + AvroFormat.create = function create(properties) { + return new AvroFormat(properties); + }; + + /** + * Encodes the specified AvroFormat message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat} message AvroFormat message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AvroFormat.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified AvroFormat message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IAvroFormat} message AvroFormat message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AvroFormat.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AvroFormat message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat} AvroFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AvroFormat.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AvroFormat message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat} AvroFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AvroFormat.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AvroFormat message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AvroFormat.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates an AvroFormat message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat} AvroFormat + */ + AvroFormat.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat) + return object; + return new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat(); + }; + + /** + * Creates a plain object from an AvroFormat message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat} message AvroFormat + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AvroFormat.toObject = function toObject() { + return {}; + }; + + /** + * Converts this AvroFormat to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @instance + * @returns {Object.} JSON object + */ + AvroFormat.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AvroFormat + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AvroFormat.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat"; + }; + + return AvroFormat; + })(); + + CloudStorage.PubSubAvroFormat = (function() { + + /** + * Properties of a PubSubAvroFormat. + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @interface IPubSubAvroFormat + */ + + /** + * Constructs a new PubSubAvroFormat. + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage + * @classdesc Represents a PubSubAvroFormat. + * @implements IPubSubAvroFormat + * @constructor + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat=} [properties] Properties to set + */ + function PubSubAvroFormat(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new PubSubAvroFormat instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat} PubSubAvroFormat instance + */ + PubSubAvroFormat.create = function create(properties) { + return new PubSubAvroFormat(properties); + }; + + /** + * Encodes the specified PubSubAvroFormat message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat} message PubSubAvroFormat message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PubSubAvroFormat.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified PubSubAvroFormat message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.IPubSubAvroFormat} message PubSubAvroFormat message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PubSubAvroFormat.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PubSubAvroFormat message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat} PubSubAvroFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PubSubAvroFormat.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PubSubAvroFormat message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat} PubSubAvroFormat + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PubSubAvroFormat.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PubSubAvroFormat message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PubSubAvroFormat.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a PubSubAvroFormat message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat} PubSubAvroFormat + */ + PubSubAvroFormat.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat) + return object; + return new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat(); + }; + + /** + * Creates a plain object from a PubSubAvroFormat message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat} message PubSubAvroFormat + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PubSubAvroFormat.toObject = function toObject() { + return {}; + }; + + /** + * Converts this PubSubAvroFormat to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @instance + * @returns {Object.} JSON object + */ + PubSubAvroFormat.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for PubSubAvroFormat + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PubSubAvroFormat.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat"; + }; + + return PubSubAvroFormat; + })(); + + return CloudStorage; + })(); + + return IngestionDataSourceSettings; + })(); + + v1.PlatformLogsSettings = (function() { + + /** + * Properties of a PlatformLogsSettings. + * @memberof google.pubsub.v1 + * @interface IPlatformLogsSettings + * @property {google.pubsub.v1.PlatformLogsSettings.Severity|null} [severity] PlatformLogsSettings severity + */ + + /** + * Constructs a new PlatformLogsSettings. + * @memberof google.pubsub.v1 + * @classdesc Represents a PlatformLogsSettings. + * @implements IPlatformLogsSettings + * @constructor + * @param {google.pubsub.v1.IPlatformLogsSettings=} [properties] Properties to set + */ + function PlatformLogsSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PlatformLogsSettings severity. + * @member {google.pubsub.v1.PlatformLogsSettings.Severity} severity + * @memberof google.pubsub.v1.PlatformLogsSettings + * @instance + */ + PlatformLogsSettings.prototype.severity = 0; + + /** + * Creates a new PlatformLogsSettings instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {google.pubsub.v1.IPlatformLogsSettings=} [properties] Properties to set + * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings instance + */ + PlatformLogsSettings.create = function create(properties) { + return new PlatformLogsSettings(properties); + }; + + /** + * Encodes the specified PlatformLogsSettings message. Does not implicitly {@link google.pubsub.v1.PlatformLogsSettings.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {google.pubsub.v1.IPlatformLogsSettings} message PlatformLogsSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PlatformLogsSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.severity != null && Object.hasOwnProperty.call(message, "severity")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.severity); + return writer; + }; + + /** + * Encodes the specified PlatformLogsSettings message, length delimited. Does not implicitly {@link google.pubsub.v1.PlatformLogsSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {google.pubsub.v1.IPlatformLogsSettings} message PlatformLogsSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PlatformLogsSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PlatformLogsSettings message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PlatformLogsSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PlatformLogsSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.severity = reader.int32(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PlatformLogsSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PlatformLogsSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PlatformLogsSettings message. + * @function verify + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PlatformLogsSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.severity != null && message.hasOwnProperty("severity")) + switch (message.severity) { + default: + return "severity: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + return null; + }; + + /** + * Creates a PlatformLogsSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings + */ + PlatformLogsSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PlatformLogsSettings) + return object; + var message = new $root.google.pubsub.v1.PlatformLogsSettings(); + switch (object.severity) { + default: + if (typeof object.severity === "number") { + message.severity = object.severity; + break; + } + break; + case "SEVERITY_UNSPECIFIED": + case 0: + message.severity = 0; + break; + case "DISABLED": + case 1: + message.severity = 1; + break; + case "DEBUG": + case 2: + message.severity = 2; + break; + case "INFO": + case 3: + message.severity = 3; + break; + case "WARNING": + case 4: + message.severity = 4; + break; + case "ERROR": + case 5: + message.severity = 5; + break; + } + return message; + }; - /** - * Converts this AwsKinesis to JSON. - * @function toJSON - * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis - * @instance - * @returns {Object.} JSON object - */ - AwsKinesis.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a PlatformLogsSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {google.pubsub.v1.PlatformLogsSettings} message PlatformLogsSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PlatformLogsSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.severity = options.enums === String ? "SEVERITY_UNSPECIFIED" : 0; + if (message.severity != null && message.hasOwnProperty("severity")) + object.severity = options.enums === String ? $root.google.pubsub.v1.PlatformLogsSettings.Severity[message.severity] === undefined ? message.severity : $root.google.pubsub.v1.PlatformLogsSettings.Severity[message.severity] : message.severity; + return object; + }; - /** - * Gets the default type url for AwsKinesis - * @function getTypeUrl - * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - AwsKinesis.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis"; - }; + /** + * Converts this PlatformLogsSettings to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PlatformLogsSettings + * @instance + * @returns {Object.} JSON object + */ + PlatformLogsSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * State enum. - * @name google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.State - * @enum {number} - * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value - * @property {number} ACTIVE=1 ACTIVE value - * @property {number} KINESIS_PERMISSION_DENIED=2 KINESIS_PERMISSION_DENIED value - * @property {number} PUBLISH_PERMISSION_DENIED=3 PUBLISH_PERMISSION_DENIED value - * @property {number} STREAM_NOT_FOUND=4 STREAM_NOT_FOUND value - * @property {number} CONSUMER_NOT_FOUND=5 CONSUMER_NOT_FOUND value - */ - AwsKinesis.State = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; - values[valuesById[1] = "ACTIVE"] = 1; - values[valuesById[2] = "KINESIS_PERMISSION_DENIED"] = 2; - values[valuesById[3] = "PUBLISH_PERMISSION_DENIED"] = 3; - values[valuesById[4] = "STREAM_NOT_FOUND"] = 4; - values[valuesById[5] = "CONSUMER_NOT_FOUND"] = 5; - return values; - })(); + /** + * Gets the default type url for PlatformLogsSettings + * @function getTypeUrl + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PlatformLogsSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PlatformLogsSettings"; + }; - return AwsKinesis; + /** + * Severity enum. + * @name google.pubsub.v1.PlatformLogsSettings.Severity + * @enum {number} + * @property {number} SEVERITY_UNSPECIFIED=0 SEVERITY_UNSPECIFIED value + * @property {number} DISABLED=1 DISABLED value + * @property {number} DEBUG=2 DEBUG value + * @property {number} INFO=3 INFO value + * @property {number} WARNING=4 WARNING value + * @property {number} ERROR=5 ERROR value + */ + PlatformLogsSettings.Severity = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "SEVERITY_UNSPECIFIED"] = 0; + values[valuesById[1] = "DISABLED"] = 1; + values[valuesById[2] = "DEBUG"] = 2; + values[valuesById[3] = "INFO"] = 3; + values[valuesById[4] = "WARNING"] = 4; + values[valuesById[5] = "ERROR"] = 5; + return values; })(); - return IngestionDataSourceSettings; + return PlatformLogsSettings; })(); v1.Topic = (function() { @@ -5902,6 +7253,7 @@ * @property {boolean|null} [enableExactlyOnceDelivery] Subscription enableExactlyOnceDelivery * @property {google.protobuf.IDuration|null} [topicMessageRetentionDuration] Subscription topicMessageRetentionDuration * @property {google.pubsub.v1.Subscription.State|null} [state] Subscription state + * @property {google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo|null} [analyticsHubSubscriptionInfo] Subscription analyticsHubSubscriptionInfo */ /** @@ -6064,6 +7416,14 @@ */ Subscription.prototype.state = 0; + /** + * Subscription analyticsHubSubscriptionInfo. + * @member {google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo|null|undefined} analyticsHubSubscriptionInfo + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.analyticsHubSubscriptionInfo = null; + /** * Creates a new Subscription instance using the specified properties. * @function create @@ -6125,6 +7485,8 @@ writer.uint32(/* id 19, wireType 0 =*/152).int32(message.state); if (message.cloudStorageConfig != null && Object.hasOwnProperty.call(message, "cloudStorageConfig")) $root.google.pubsub.v1.CloudStorageConfig.encode(message.cloudStorageConfig, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); + if (message.analyticsHubSubscriptionInfo != null && Object.hasOwnProperty.call(message, "analyticsHubSubscriptionInfo")) + $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.encode(message.analyticsHubSubscriptionInfo, writer.uint32(/* id 23, wireType 2 =*/186).fork()).ldelim(); return writer; }; @@ -6250,6 +7612,10 @@ message.state = reader.int32(); break; } + case 23: { + message.analyticsHubSubscriptionInfo = $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -6366,6 +7732,11 @@ case 2: break; } + if (message.analyticsHubSubscriptionInfo != null && message.hasOwnProperty("analyticsHubSubscriptionInfo")) { + var error = $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.verify(message.analyticsHubSubscriptionInfo); + if (error) + return "analyticsHubSubscriptionInfo." + error; + } return null; }; @@ -6464,6 +7835,11 @@ message.state = 2; break; } + if (object.analyticsHubSubscriptionInfo != null) { + if (typeof object.analyticsHubSubscriptionInfo !== "object") + throw TypeError(".google.pubsub.v1.Subscription.analyticsHubSubscriptionInfo: object expected"); + message.analyticsHubSubscriptionInfo = $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.fromObject(object.analyticsHubSubscriptionInfo); + } return message; }; @@ -6500,6 +7876,7 @@ object.bigqueryConfig = null; object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; object.cloudStorageConfig = null; + object.analyticsHubSubscriptionInfo = null; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -6541,6 +7918,8 @@ object.state = options.enums === String ? $root.google.pubsub.v1.Subscription.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.Subscription.State[message.state] : message.state; if (message.cloudStorageConfig != null && message.hasOwnProperty("cloudStorageConfig")) object.cloudStorageConfig = $root.google.pubsub.v1.CloudStorageConfig.toObject(message.cloudStorageConfig, options); + if (message.analyticsHubSubscriptionInfo != null && message.hasOwnProperty("analyticsHubSubscriptionInfo")) + object.analyticsHubSubscriptionInfo = $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.toObject(message.analyticsHubSubscriptionInfo, options); return object; }; @@ -6586,6 +7965,233 @@ return values; })(); + Subscription.AnalyticsHubSubscriptionInfo = (function() { + + /** + * Properties of an AnalyticsHubSubscriptionInfo. + * @memberof google.pubsub.v1.Subscription + * @interface IAnalyticsHubSubscriptionInfo + * @property {string|null} [listing] AnalyticsHubSubscriptionInfo listing + * @property {string|null} [subscription] AnalyticsHubSubscriptionInfo subscription + */ + + /** + * Constructs a new AnalyticsHubSubscriptionInfo. + * @memberof google.pubsub.v1.Subscription + * @classdesc Represents an AnalyticsHubSubscriptionInfo. + * @implements IAnalyticsHubSubscriptionInfo + * @constructor + * @param {google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo=} [properties] Properties to set + */ + function AnalyticsHubSubscriptionInfo(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * AnalyticsHubSubscriptionInfo listing. + * @member {string} listing + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @instance + */ + AnalyticsHubSubscriptionInfo.prototype.listing = ""; + + /** + * AnalyticsHubSubscriptionInfo subscription. + * @member {string} subscription + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @instance + */ + AnalyticsHubSubscriptionInfo.prototype.subscription = ""; + + /** + * Creates a new AnalyticsHubSubscriptionInfo instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo=} [properties] Properties to set + * @returns {google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo} AnalyticsHubSubscriptionInfo instance + */ + AnalyticsHubSubscriptionInfo.create = function create(properties) { + return new AnalyticsHubSubscriptionInfo(properties); + }; + + /** + * Encodes the specified AnalyticsHubSubscriptionInfo message. Does not implicitly {@link google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo} message AnalyticsHubSubscriptionInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AnalyticsHubSubscriptionInfo.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.listing != null && Object.hasOwnProperty.call(message, "listing")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.listing); + if (message.subscription != null && Object.hasOwnProperty.call(message, "subscription")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.subscription); + return writer; + }; + + /** + * Encodes the specified AnalyticsHubSubscriptionInfo message, length delimited. Does not implicitly {@link google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo} message AnalyticsHubSubscriptionInfo message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AnalyticsHubSubscriptionInfo.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AnalyticsHubSubscriptionInfo message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo} AnalyticsHubSubscriptionInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AnalyticsHubSubscriptionInfo.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.listing = reader.string(); + break; + } + case 2: { + message.subscription = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AnalyticsHubSubscriptionInfo message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo} AnalyticsHubSubscriptionInfo + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AnalyticsHubSubscriptionInfo.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AnalyticsHubSubscriptionInfo message. + * @function verify + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AnalyticsHubSubscriptionInfo.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.listing != null && message.hasOwnProperty("listing")) + if (!$util.isString(message.listing)) + return "listing: string expected"; + if (message.subscription != null && message.hasOwnProperty("subscription")) + if (!$util.isString(message.subscription)) + return "subscription: string expected"; + return null; + }; + + /** + * Creates an AnalyticsHubSubscriptionInfo message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo} AnalyticsHubSubscriptionInfo + */ + AnalyticsHubSubscriptionInfo.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo) + return object; + var message = new $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo(); + if (object.listing != null) + message.listing = String(object.listing); + if (object.subscription != null) + message.subscription = String(object.subscription); + return message; + }; + + /** + * Creates a plain object from an AnalyticsHubSubscriptionInfo message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo} message AnalyticsHubSubscriptionInfo + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AnalyticsHubSubscriptionInfo.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.listing = ""; + object.subscription = ""; + } + if (message.listing != null && message.hasOwnProperty("listing")) + object.listing = message.listing; + if (message.subscription != null && message.hasOwnProperty("subscription")) + object.subscription = message.subscription; + return object; + }; + + /** + * Converts this AnalyticsHubSubscriptionInfo to JSON. + * @function toJSON + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @instance + * @returns {Object.} JSON object + */ + AnalyticsHubSubscriptionInfo.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AnalyticsHubSubscriptionInfo + * @function getTypeUrl + * @memberof google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AnalyticsHubSubscriptionInfo.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo"; + }; + + return AnalyticsHubSubscriptionInfo; + })(); + return Subscription; })(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index ad639ed00fb..8921f219f22 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -247,7 +247,8 @@ "oneofs": { "source": { "oneof": [ - "awsKinesis" + "awsKinesis", + "cloudStorage" ] } }, @@ -258,6 +259,20 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "cloudStorage": { + "type": "CloudStorage", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "platformLogsSettings": { + "type": "PlatformLogsSettings", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -311,6 +326,128 @@ } } } + }, + "CloudStorage": { + "oneofs": { + "inputFormat": { + "oneof": [ + "textFormat", + "avroFormat", + "pubsubAvroFormat" + ] + } + }, + "fields": { + "state": { + "type": "State", + "id": 1, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + }, + "bucket": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "textFormat": { + "type": "TextFormat", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "avroFormat": { + "type": "AvroFormat", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "pubsubAvroFormat": { + "type": "PubSubAvroFormat", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "minimumObjectCreateTime": { + "type": "google.protobuf.Timestamp", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "matchGlob": { + "type": "string", + "id": 9, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + }, + "nested": { + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "CLOUD_STORAGE_PERMISSION_DENIED": 2, + "PUBLISH_PERMISSION_DENIED": 3, + "BUCKET_NOT_FOUND": 4, + "TOO_MANY_OBJECTS": 5 + } + }, + "TextFormat": { + "oneofs": { + "_delimiter": { + "oneof": [ + "delimiter" + ] + } + }, + "fields": { + "delimiter": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL", + "proto3_optional": true + } + } + } + }, + "AvroFormat": { + "fields": {} + }, + "PubSubAvroFormat": { + "fields": {} + } + } + } + } + }, + "PlatformLogsSettings": { + "fields": { + "severity": { + "type": "Severity", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + }, + "nested": { + "Severity": { + "values": { + "SEVERITY_UNSPECIFIED": 0, + "DISABLED": 1, + "DEBUG": 2, + "INFO": 3, + "WARNING": 4, + "ERROR": 5 + } } } }, @@ -1088,6 +1225,13 @@ "options": { "(google.api.field_behavior)": "OUTPUT_ONLY" } + }, + "analyticsHubSubscriptionInfo": { + "type": "AnalyticsHubSubscriptionInfo", + "id": 23, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } } }, "nested": { @@ -1097,6 +1241,24 @@ "ACTIVE": 1, "RESOURCE_ERROR": 2 } + }, + "AnalyticsHubSubscriptionInfo": { + "fields": { + "listing": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "subscription": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + } } } }, diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 0930d8f34a7..9daf16f61e9 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -583,6 +583,9 @@ export class SubscriberClient { * @param {google.pubsub.v1.Subscription.State} request.state * Output only. An output-only field indicating whether or not the * subscription can receive messages. + * @param {google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo} request.analyticsHubSubscriptionInfo + * Output only. Information about the associated Analytics Hub subscription. + * Only set if the subscritpion is created by Analytics Hub. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. From 3a0b52de3b847020e2366aa5e844f99bac1afeac Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:48:56 -0400 Subject: [PATCH 1040/1115] chore: update issue templates and codeowners (#1975) chore: update issue templates and codeowners Source-Link: https://github.com/googleapis/synthtool/commit/bf182cd41d9a7de56092cafcc7befe6b398332f6 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:a5af6af827a9fffba373151e1453b0498da288024cdd16477900dd42857a42e0 Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 +- handwritten/pubsub/.github/CODEOWNERS | 7 +- .../.github/ISSUE_TEMPLATE/bug_report.yml | 99 +++++++++++++++++++ .../ISSUE_TEMPLATE/documentation_request.yml | 53 ++++++++++ .../ISSUE_TEMPLATE/feature_request.yml | 53 ++++++++++ .../ISSUE_TEMPLATE/processs_request.md | 5 + .../.github/ISSUE_TEMPLATE/questions.md | 8 ++ handwritten/pubsub/.github/auto-approve.yml | 4 +- .../.github/scripts/close-invalid-link.cjs | 53 ++++++++++ .../.github/scripts/close-unresponsive.cjs | 69 +++++++++++++ .../.github/scripts/remove-response-label.cjs | 33 +++++++ handwritten/pubsub/README.md | 4 +- 12 files changed, 380 insertions(+), 12 deletions(-) create mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/documentation_request.yml create mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.yml create mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md create mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/questions.md create mode 100644 handwritten/pubsub/.github/scripts/close-invalid-link.cjs create mode 100644 handwritten/pubsub/.github/scripts/close-unresponsive.cjs create mode 100644 handwritten/pubsub/.github/scripts/remove-response-label.cjs diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 9e90d54bfb2..460f67f2b60 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:d920257482ca1cd72978f29f7d28765a9f8c758c21ee0708234db5cf4c5016c2 -# created: 2024-06-12T16:18:41.688792375Z + digest: sha256:a5af6af827a9fffba373151e1453b0498da288024cdd16477900dd42857a42e0 +# created: 2024-09-20T20:26:11.126243246Z diff --git a/handwritten/pubsub/.github/CODEOWNERS b/handwritten/pubsub/.github/CODEOWNERS index da4ef277490..4a651925386 100644 --- a/handwritten/pubsub/.github/CODEOWNERS +++ b/handwritten/pubsub/.github/CODEOWNERS @@ -5,8 +5,5 @@ # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -# The yoshi-nodejs team is the default owner for nodejs repositories. -* @googleapis/yoshi-nodejs @googleapis/api-pubsub - -# The github automation team is the default owner for the auto-approve file. -.github/auto-approve.yml @googleapis/github-automation +# Unless specified, the jsteam is the default owner for nodejs repositories. +* @googleapis/api-pubsub @googleapis/jsteam \ No newline at end of file diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 00000000000..81b80f911f6 --- /dev/null +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,99 @@ +name: Bug Report +description: Create a report to help us improve +labels: + - bug +body: + - type: markdown + attributes: + value: > + **PLEASE READ**: If you have a support contract with Google, please + create an issue in the [support + console](https://cloud.google.com/support/) instead of filing on GitHub. + This will ensure a timely response. Otherwise, please make sure to + follow the steps below. + - type: checkboxes + attributes: + label: Please make sure you have searched for information in the following + guides. + options: + - label: "Search the issues already opened: + https://github.com/GoogleCloudPlatform/google-cloud-node/issues" + required: true + - label: "Search StackOverflow: + http://stackoverflow.com/questions/tagged/google-cloud-platform+nod\ + e.js" + required: true + - label: "Check our Troubleshooting guide: + https://googlecloudplatform.github.io/google-cloud-node/#/docs/guid\ + es/troubleshooting" + required: true + - label: "Check our FAQ: + https://googlecloudplatform.github.io/google-cloud-node/#/docs/guid\ + es/faq" + required: true + - label: "Check our libraries HOW-TO: + https://github.com/googleapis/gax-nodejs/blob/main/client-libraries\ + .md" + required: true + - label: "Check out our authentication guide: + https://github.com/googleapis/google-auth-library-nodejs" + required: true + - label: "Check out handwritten samples for many of our APIs: + https://github.com/GoogleCloudPlatform/nodejs-docs-samples" + required: true + - type: textarea + attributes: + label: > + A screenshot that you have tested with "Try this API". + description: > + As our client libraries are mostly autogenerated, we kindly request + that you test whether your issue is with the client library, or with the + API itself. To do so, please search for your API + here: https://developers.google.com/apis-explorer and attempt to + reproduce the issue in the given method. Please include a screenshot of + the response in "Try this API". This response should NOT match the current + behavior you are experiencing. If the behavior is the same, it means + that you are likely experiencing a bug with the API itself. In that + case, please submit an issue to the API team, either by submitting an + issue in its issue tracker https://cloud.google.com/support/docs/issue-trackers, or by + submitting an issue in its linked tracker in the .repo-metadata.json + file https://issuetracker.google.com/savedsearches/559741 + validations: + required: true + - type: input + attributes: + label: > + Link to the code that reproduces this issue. A link to a **public** Github Repository or gist with a minimal + reproduction. + description: > + **Skipping this or providing an invalid link will result in the issue being closed** + validations: + required: true + - type: textarea + attributes: + label: > + A step-by-step description of how to reproduce the issue, based on + the linked reproduction. + description: > + Screenshots can be provided in the issue body below. + placeholder: | + 1. Start the application in development (next dev) + 2. Click X + 3. Y will happen + validations: + required: true + - type: textarea + attributes: + label: A clear and concise description of what the bug is, and what you + expected to happen. + placeholder: Following the steps from the previous section, I expected A to + happen, but I observed B instead + validations: + required: true + + - type: textarea + attributes: + label: A clear and concise description WHY you expect this behavior, i.e., was it a recent change, there is documentation that points to this behavior, etc. ** + placeholder: 'Documentation here(link) states that B should happen instead of A' + validations: + required: true diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/documentation_request.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/documentation_request.yml new file mode 100644 index 00000000000..1cb5835bd24 --- /dev/null +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/documentation_request.yml @@ -0,0 +1,53 @@ +name: Documentation Requests +description: Requests for more information +body: + - type: markdown + attributes: + value: > + Please use this issue type to log documentation requests against the library itself. + These requests should involve documentation on Github (`.md` files), and should relate to the library + itself. If you have questions or documentation requests for an API, please + reach out to the API tracker itself. + + Please submit an issue to the API team, either by submitting an + issue in its issue tracker https://cloud.google.com/support/docs/issue-trackers), or by + submitting an issue in its linked tracker in the .repo-metadata.json + file in the API under packages/* ([example](https://issuetracker.google.com/savedsearches/559741)). + You can also submit a request to documentation on cloud.google.com itself with the "Send Feedback" + on the bottom of the page. + + + Please note that documentation requests and questions for specific APIs + will be closed. + - type: checkboxes + attributes: + label: Please make sure you have searched for information in the following + guides. + options: + - label: "Search the issues already opened: + https://github.com/GoogleCloudPlatform/google-cloud-node/issues" + required: true + - label: "Check our Troubleshooting guide: + https://googlecloudplatform.github.io/google-cloud-node/#/docs/guid\ + es/troubleshooting" + required: true + - label: "Check our FAQ: + https://googlecloudplatform.github.io/google-cloud-node/#/docs/guid\ + es/faq" + required: true + - label: "Check our libraries HOW-TO: + https://github.com/googleapis/gax-nodejs/blob/main/client-libraries\ + .md" + required: true + - label: "Check out our authentication guide: + https://github.com/googleapis/google-auth-library-nodejs" + required: true + - label: "Check out handwritten samples for many of our APIs: + https://github.com/GoogleCloudPlatform/nodejs-docs-samples" + required: true + - type: textarea + attributes: + label: > + Documentation Request + validations: + required: true diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 00000000000..781c70a7087 --- /dev/null +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,53 @@ +name: Feature Request +description: Suggest an idea for this library +labels: + - feature request +body: + - type: markdown + attributes: + value: > + **PLEASE READ**: If you have a support contract with Google, please + create an issue in the [support + console](https://cloud.google.com/support/) instead of filing on GitHub. + This will ensure a timely response. Otherwise, please make sure to + follow the steps below. + - type: textarea + attributes: + label: > + A screenshot that you have tested with "Try this API". + description: > + As our client libraries are mostly autogenerated, we kindly request + that you test whether your feature request is with the client library, or with the + API itself. To do so, please search for your API + here: https://developers.google.com/apis-explorer and attempt to + reproduce the issue in the given method. Please include a screenshot of + the response in "Try this API". This response should NOT match the current + behavior you are experiencing. If the behavior is the same, it means + that you are likely requesting a feature for the API itself. In that + case, please submit an issue to the API team, either by submitting an + issue in its issue tracker https://cloud.google.com/support/docs/issue-trackers, or by + submitting an issue in its linked tracker in the .repo-metadata.json + file in the API under packages/* ([example](https://issuetracker.google.com/savedsearches/559741)) + + Example of library specific issues would be: retry strategies, authentication questions, or issues with typings. + Examples of API issues would include: expanding method parameter types, adding functionality to an API. + validations: + required: true + - type: textarea + attributes: + label: > + What would you like to see in the library? + description: > + Screenshots can be provided in the issue body below. + placeholder: | + 1. Set up authentication like so + 2. Run the program like so + 3. X would be nice to happen + + - type: textarea + attributes: + label: Describe alternatives you've considered + + - type: textarea + attributes: + label: Additional context/notes \ No newline at end of file diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md new file mode 100644 index 00000000000..9f88fc1f3b7 --- /dev/null +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md @@ -0,0 +1,5 @@ +--- +name: Process Request +about: Submit a process request to the library. Process requests are any requests related to library infrastructure, including CI/CD, publishing, releasing, etc. This issue template should primarily used by internal members. + +--- \ No newline at end of file diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/questions.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/questions.md new file mode 100644 index 00000000000..62c1dd1b93a --- /dev/null +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/questions.md @@ -0,0 +1,8 @@ +--- +name: Question +about: If you have a question, please use Discussions + +--- + +If you have a general question that goes beyond the library itself, we encourage you to use [Discussions](https://github.com//discussions) +to engage with fellow community members! diff --git a/handwritten/pubsub/.github/auto-approve.yml b/handwritten/pubsub/.github/auto-approve.yml index ec51b072dca..7cba0af636c 100644 --- a/handwritten/pubsub/.github/auto-approve.yml +++ b/handwritten/pubsub/.github/auto-approve.yml @@ -1,4 +1,2 @@ processes: - - "NodeDependency" - - "OwlBotTemplateChangesNode" - - "OwlBotPRsNode" \ No newline at end of file + - "NodeDependency" \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/close-invalid-link.cjs b/handwritten/pubsub/.github/scripts/close-invalid-link.cjs new file mode 100644 index 00000000000..ba7d51372ac --- /dev/null +++ b/handwritten/pubsub/.github/scripts/close-invalid-link.cjs @@ -0,0 +1,53 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +async function closeIssue(github, owner, repo, number) { + await github.rest.issues.createComment({ + owner: owner, + repo: repo, + issue_number: number, + body: 'Issue was opened with an invalid reproduction link. Please make sure the repository is a valid, publicly-accessible github repository, and make sure the url is complete (example: https://github.com/googleapis/google-cloud-node)' + }); + await github.rest.issues.update({ + owner: owner, + repo: repo, + issue_number: number, + state: 'closed' + }); +} +module.exports = async ({github, context}) => { + const owner = context.repo.owner; + const repo = context.repo.repo; + const number = context.issue.number; + + const issue = await github.rest.issues.get({ + owner: owner, + repo: repo, + issue_number: number, + }); + + const isBugTemplate = issue.data.body.includes('Link to the code that reproduces this issue'); + + if (isBugTemplate) { + try { + const link = issue.data.body.split('\n')[18].match(/(https?:\/\/g?i?s?t?\.?github.com\/.*)/); + const isValidLink = (await fetch(link)).ok; + if (!isValidLink) { + await closeIssue(github, owner, repo, number); + } + } catch (err) { + await closeIssue(github, owner, repo, number); + } + } +}; diff --git a/handwritten/pubsub/.github/scripts/close-unresponsive.cjs b/handwritten/pubsub/.github/scripts/close-unresponsive.cjs new file mode 100644 index 00000000000..142dc1265a4 --- /dev/null +++ b/handwritten/pubsub/.github/scripts/close-unresponsive.cjs @@ -0,0 +1,69 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +function labeledEvent(data) { + return data.event === 'labeled' && data.label.name === 'needs more info'; + } + + const numberOfDaysLimit = 15; + const close_message = `This has been closed since a request for information has \ + not been answered for ${numberOfDaysLimit} days. It can be reopened when the \ + requested information is provided.`; + + module.exports = async ({github, context}) => { + const owner = context.repo.owner; + const repo = context.repo.repo; + + const issues = await github.rest.issues.listForRepo({ + owner: owner, + repo: repo, + labels: 'needs more info', + }); + const numbers = issues.data.map((e) => e.number); + + for (const number of numbers) { + const events = await github.paginate( + github.rest.issues.listEventsForTimeline, + { + owner: owner, + repo: repo, + issue_number: number, + }, + (response) => response.data.filter(labeledEvent) + ); + + const latest_response_label = events[events.length - 1]; + + const created_at = new Date(latest_response_label.created_at); + const now = new Date(); + const diff = now - created_at; + const diffDays = diff / (1000 * 60 * 60 * 24); + + if (diffDays > numberOfDaysLimit) { + await github.rest.issues.update({ + owner: owner, + repo: repo, + issue_number: number, + state: 'closed', + }); + + await github.rest.issues.createComment({ + owner: owner, + repo: repo, + issue_number: number, + body: close_message, + }); + } + } + }; diff --git a/handwritten/pubsub/.github/scripts/remove-response-label.cjs b/handwritten/pubsub/.github/scripts/remove-response-label.cjs new file mode 100644 index 00000000000..887cf349e9d --- /dev/null +++ b/handwritten/pubsub/.github/scripts/remove-response-label.cjs @@ -0,0 +1,33 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +module.exports = async ({ github, context }) => { + const commenter = context.actor; + const issue = await github.rest.issues.get({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + }); + const author = issue.data.user.login; + const labels = issue.data.labels.map((e) => e.name); + + if (author === commenter && labels.includes('needs more info')) { + await github.rest.issues.removeLabel({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + name: 'needs more info', + }); + } + }; diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index be5ef76a707..210ec6d799f 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -52,7 +52,7 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained]. 1. [Select or create a Cloud Platform project][projects]. 1. [Enable billing for your project][billing]. 1. [Enable the Google Cloud Pub/Sub API][enable_api]. -1. [Set up authentication with a service account][auth] so you can access the +1. [Set up authentication][auth] so you can access the API from your local workstation. ### Installing the client library @@ -260,4 +260,4 @@ See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/main/LICENSE) [projects]: https://console.cloud.google.com/project [billing]: https://support.google.com/cloud/answer/6293499#enable-billing [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com -[auth]: https://cloud.google.com/docs/authentication/getting-started +[auth]: https://cloud.google.com/docs/authentication/external/set-up-adc-local From 8a4c84f8888f0d66671bc045e1ee2ba2c474ad51 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 17:22:36 -0400 Subject: [PATCH 1041/1115] chore: update links in github issue templates (#1979) * chore: update links in github issue templates Source-Link: https://github.com/googleapis/synthtool/commit/38fa49fb668c2beb27f598ad3dda2aa46b8a10ed Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:609822e3c09b7a1bd90b99655904609f162cc15acb4704f1edf778284c36f429 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- .../pubsub/.github/ISSUE_TEMPLATE/bug_report.yml | 12 ++++++------ .../.github/ISSUE_TEMPLATE/processs_request.md | 5 ++--- .../pubsub/.github/scripts/close-invalid-link.cjs | 5 ++++- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 460f67f2b60..24943e1161e 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:a5af6af827a9fffba373151e1453b0498da288024cdd16477900dd42857a42e0 -# created: 2024-09-20T20:26:11.126243246Z + digest: sha256:609822e3c09b7a1bd90b99655904609f162cc15acb4704f1edf778284c36f429 +# created: 2024-10-01T19:34:30.797530443Z diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml index 81b80f911f6..58aa0c973b6 100644 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml @@ -24,12 +24,12 @@ body: e.js" required: true - label: "Check our Troubleshooting guide: - https://googlecloudplatform.github.io/google-cloud-node/#/docs/guid\ - es/troubleshooting" + https://github.com/googleapis/google-cloud-node/blob/main/docs/trou\ + bleshooting.md" required: true - label: "Check our FAQ: - https://googlecloudplatform.github.io/google-cloud-node/#/docs/guid\ - es/faq" + https://github.com/googleapis/google-cloud-node/blob/main/docs/faq.\ + md" required: true - label: "Check our libraries HOW-TO: https://github.com/googleapis/gax-nodejs/blob/main/client-libraries\ @@ -55,9 +55,9 @@ body: behavior you are experiencing. If the behavior is the same, it means that you are likely experiencing a bug with the API itself. In that case, please submit an issue to the API team, either by submitting an - issue in its issue tracker https://cloud.google.com/support/docs/issue-trackers, or by + issue in its issue tracker (https://cloud.google.com/support/docs/issue-trackers), or by submitting an issue in its linked tracker in the .repo-metadata.json - file https://issuetracker.google.com/savedsearches/559741 + file https://issuetracker.google.com/savedsearches/559741 validations: required: true - type: input diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md index 9f88fc1f3b7..45682e8f117 100644 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md +++ b/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md @@ -1,5 +1,4 @@ --- name: Process Request -about: Submit a process request to the library. Process requests are any requests related to library infrastructure, including CI/CD, publishing, releasing, etc. This issue template should primarily used by internal members. - ---- \ No newline at end of file +about: Submit a process request to the library. Process requests are any requests related to library infrastructure, for example CI/CD, publishing, releasing, broken links. +--- diff --git a/handwritten/pubsub/.github/scripts/close-invalid-link.cjs b/handwritten/pubsub/.github/scripts/close-invalid-link.cjs index ba7d51372ac..d7a3688e755 100644 --- a/handwritten/pubsub/.github/scripts/close-invalid-link.cjs +++ b/handwritten/pubsub/.github/scripts/close-invalid-link.cjs @@ -40,9 +40,12 @@ module.exports = async ({github, context}) => { const isBugTemplate = issue.data.body.includes('Link to the code that reproduces this issue'); if (isBugTemplate) { + console.log(`Issue ${number} is a bug template`) try { - const link = issue.data.body.split('\n')[18].match(/(https?:\/\/g?i?s?t?\.?github.com\/.*)/); + const link = issue.data.body.split('\n')[18].match(/(https?:\/\/(gist\.)?github.com\/.*)/)[0]; + console.log(`Issue ${number} contains this link: ${link}`) const isValidLink = (await fetch(link)).ok; + console.log(`Issue ${number} has a ${isValidLink ? 'valid' : 'invalid'} link`) if (!isValidLink) { await closeIssue(github, owner, repo, number); } From 665db72f4ef70518de6a5d024e2e95b588a53206 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:24:07 -0400 Subject: [PATCH 1042/1115] chore: Support Node 18+ (#1980) * feat: Support Node 18+ * chore: Additional Node 18 upgrades * chore: don't change test fixtures * feat: Move kokoro directories to 18 * chore: Update checkout and setup-node to v4 - https://github.com/actions/checkout/releases/tag/v4.0.0 - https://github.com/actions/setup-node/releases/tag/v4.0.0 Source-Link: https://github.com/googleapis/synthtool/commit/c19dd80df72683437f79151b746c2f22c6bdf8b7 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:8060aba1f6d5617d08091767141ab2a99ea1ccbd9371fd42ffc208c5329caa73 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/common.cfg | 2 +- .../.kokoro/continuous/node18/common.cfg | 24 +++++++++++++++++++ .../pubsub/.kokoro/continuous/node18/lint.cfg | 4 ++++ .../continuous/node18/samples-test.cfg | 12 ++++++++++ .../.kokoro/continuous/node18/system-test.cfg | 12 ++++++++++ .../pubsub/.kokoro/continuous/node18/test.cfg | 0 .../.kokoro/presubmit/node18/common.cfg | 24 +++++++++++++++++++ .../.kokoro/presubmit/node18/samples-test.cfg | 12 ++++++++++ .../.kokoro/presubmit/node18/system-test.cfg | 12 ++++++++++ .../pubsub/.kokoro/presubmit/node18/test.cfg | 0 .../pubsub/.kokoro/release/docs-devsite.cfg | 2 +- handwritten/pubsub/.kokoro/release/docs.cfg | 2 +- handwritten/pubsub/.kokoro/release/docs.sh | 2 +- .../pubsub/.kokoro/release/publish.cfg | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.bat | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- handwritten/pubsub/.kokoro/trampoline_v2.sh | 2 +- 20 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 handwritten/pubsub/.kokoro/continuous/node18/common.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node18/lint.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg create mode 100644 handwritten/pubsub/.kokoro/continuous/node18/test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/common.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg create mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/test.cfg diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 24943e1161e..972a8c7ea57 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:609822e3c09b7a1bd90b99655904609f162cc15acb4704f1edf778284c36f429 -# created: 2024-10-01T19:34:30.797530443Z + digest: sha256:8060aba1f6d5617d08091767141ab2a99ea1ccbd9371fd42ffc208c5329caa73 +# created: 2024-10-04T00:09:31.22876583Z diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index d8038cd9917..dabc141b216 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node18/common.cfg b/handwritten/pubsub/.kokoro/continuous/node18/common.cfg new file mode 100644 index 00000000000..dabc141b216 --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node18/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg new file mode 100644 index 00000000000..219d3808dea --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg @@ -0,0 +1,4 @@ +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/lint.sh" +} diff --git a/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg new file mode 100644 index 00000000000..698013d7caa --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/samples-test.sh" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg new file mode 100644 index 00000000000..bf759bd3f1a --- /dev/null +++ b/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/system-test.sh" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/continuous/node18/test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg new file mode 100644 index 00000000000..dabc141b216 --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" +} +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/test.sh" +} diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg new file mode 100644 index 00000000000..698013d7caa --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/samples-test.sh" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg new file mode 100644 index 00000000000..bf759bd3f1a --- /dev/null +++ b/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg @@ -0,0 +1,12 @@ +# Download resources for system tests (service account key, etc.) +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/nodejs-pubsub/.kokoro/system-test.sh" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "long-door-651-kokoro-system-test-service-account" +} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/test.cfg new file mode 100644 index 00000000000..e69de29bb2d diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg index b5638214a65..b1ebf97bc61 100644 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/release/docs.cfg b/handwritten/pubsub/.kokoro/release/docs.cfg index 508a0efda3f..ef7147c33ad 100644 --- a/handwritten/pubsub/.kokoro/release/docs.cfg +++ b/handwritten/pubsub/.kokoro/release/docs.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/release/docs.sh b/handwritten/pubsub/.kokoro/release/docs.sh index 1d8f3f490a5..e9079a60530 100755 --- a/handwritten/pubsub/.kokoro/release/docs.sh +++ b/handwritten/pubsub/.kokoro/release/docs.sh @@ -16,7 +16,7 @@ set -eo pipefail -# build jsdocs (Python is installed on the Node 10 docker image). +# build jsdocs (Python is installed on the Node 18 docker image). if [[ -z "$CREDENTIALS" ]]; then # if CREDENTIALS are explicitly set, assume we're testing locally # and don't set NPM_CONFIG_PREFIX. diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 91fb161ec90..ae6223c886e 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -30,7 +30,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 8c5d108cb58..c1cb0fc7701 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -56,7 +56,7 @@ fi # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 0b3043d268c..a90d5cfec89 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -49,7 +49,7 @@ npm run system-test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat index 0bb12405231..caf825656c2 100644 --- a/handwritten/pubsub/.kokoro/test.bat +++ b/handwritten/pubsub/.kokoro/test.bat @@ -21,7 +21,7 @@ cd .. @rem we upgrade Node.js in the image: SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm -call nvm use v14.17.3 +call nvm use 18 call which node call npm install || goto :error diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 862d478d324..0d9f6392a75 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -39,7 +39,7 @@ npm test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/trampoline_v2.sh b/handwritten/pubsub/.kokoro/trampoline_v2.sh index 4d03112128a..5d6cfcca528 100755 --- a/handwritten/pubsub/.kokoro/trampoline_v2.sh +++ b/handwritten/pubsub/.kokoro/trampoline_v2.sh @@ -44,7 +44,7 @@ # the project root. # # Here is an example for running this script. -# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:10-user \ +# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:18-user \ # TRAMPOLINE_BUILD_FILE=.kokoro/system-test.sh \ # .kokoro/trampoline_v2.sh From 507df0fa591e76af90bac5905525fcb9ef26af1e Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 10 Oct 2024 13:17:04 -0400 Subject: [PATCH 1043/1115] chore: revert "chore: Support Node 18+ (#1980)" (#1983) This reverts commit b0460becce3fa4b544541dc7ce62ada766890a12, which was merged prematurely. --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/common.cfg | 2 +- .../.kokoro/continuous/node18/common.cfg | 24 ------------------- .../pubsub/.kokoro/continuous/node18/lint.cfg | 4 ---- .../continuous/node18/samples-test.cfg | 12 ---------- .../.kokoro/continuous/node18/system-test.cfg | 12 ---------- .../pubsub/.kokoro/continuous/node18/test.cfg | 0 .../.kokoro/presubmit/node18/common.cfg | 24 ------------------- .../.kokoro/presubmit/node18/samples-test.cfg | 12 ---------- .../.kokoro/presubmit/node18/system-test.cfg | 12 ---------- .../pubsub/.kokoro/presubmit/node18/test.cfg | 0 .../pubsub/.kokoro/release/docs-devsite.cfg | 2 +- handwritten/pubsub/.kokoro/release/docs.cfg | 2 +- handwritten/pubsub/.kokoro/release/docs.sh | 2 +- .../pubsub/.kokoro/release/publish.cfg | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 2 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.bat | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- handwritten/pubsub/.kokoro/trampoline_v2.sh | 2 +- 20 files changed, 12 insertions(+), 112 deletions(-) delete mode 100644 handwritten/pubsub/.kokoro/continuous/node18/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node18/lint.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/continuous/node18/test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/common.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg delete mode 100644 handwritten/pubsub/.kokoro/presubmit/node18/test.cfg diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 972a8c7ea57..24943e1161e 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:8060aba1f6d5617d08091767141ab2a99ea1ccbd9371fd42ffc208c5329caa73 -# created: 2024-10-04T00:09:31.22876583Z + digest: sha256:609822e3c09b7a1bd90b99655904609f162cc15acb4704f1edf778284c36f429 +# created: 2024-10-01T19:34:30.797530443Z diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index dabc141b216..d8038cd9917 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node18/common.cfg b/handwritten/pubsub/.kokoro/continuous/node18/common.cfg deleted file mode 100644 index dabc141b216..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node18/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg deleted file mode 100644 index 219d3808dea..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg +++ /dev/null @@ -1,4 +0,0 @@ -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/lint.sh" -} diff --git a/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg deleted file mode 100644 index 698013d7caa..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/samples-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg deleted file mode 100644 index bf759bd3f1a..00000000000 --- a/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/system-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/continuous/node18/test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg deleted file mode 100644 index dabc141b216..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" -} -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" -} diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg deleted file mode 100644 index 698013d7caa..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/samples-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg deleted file mode 100644 index bf759bd3f1a..00000000000 --- a/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Download resources for system tests (service account key, etc.) -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/system-test.sh" -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "long-door-651-kokoro-system-test-service-account" -} \ No newline at end of file diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/test.cfg deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg index b1ebf97bc61..b5638214a65 100644 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/release/docs.cfg b/handwritten/pubsub/.kokoro/release/docs.cfg index ef7147c33ad..508a0efda3f 100644 --- a/handwritten/pubsub/.kokoro/release/docs.cfg +++ b/handwritten/pubsub/.kokoro/release/docs.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/release/docs.sh b/handwritten/pubsub/.kokoro/release/docs.sh index e9079a60530..1d8f3f490a5 100755 --- a/handwritten/pubsub/.kokoro/release/docs.sh +++ b/handwritten/pubsub/.kokoro/release/docs.sh @@ -16,7 +16,7 @@ set -eo pipefail -# build jsdocs (Python is installed on the Node 18 docker image). +# build jsdocs (Python is installed on the Node 10 docker image). if [[ -z "$CREDENTIALS" ]]; then # if CREDENTIALS are explicitly set, assume we're testing locally # and don't set NPM_CONFIG_PREFIX. diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index ae6223c886e..91fb161ec90 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -30,7 +30,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" } env_vars: { diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index c1cb0fc7701..8c5d108cb58 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -56,7 +56,7 @@ fi # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=18 +COVERAGE_NODE=14 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index a90d5cfec89..0b3043d268c 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -49,7 +49,7 @@ npm run system-test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=18 +COVERAGE_NODE=14 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat index caf825656c2..0bb12405231 100644 --- a/handwritten/pubsub/.kokoro/test.bat +++ b/handwritten/pubsub/.kokoro/test.bat @@ -21,7 +21,7 @@ cd .. @rem we upgrade Node.js in the image: SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm -call nvm use 18 +call nvm use v14.17.3 call which node call npm install || goto :error diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 0d9f6392a75..862d478d324 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -39,7 +39,7 @@ npm test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=18 +COVERAGE_NODE=14 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/trampoline_v2.sh b/handwritten/pubsub/.kokoro/trampoline_v2.sh index 5d6cfcca528..4d03112128a 100755 --- a/handwritten/pubsub/.kokoro/trampoline_v2.sh +++ b/handwritten/pubsub/.kokoro/trampoline_v2.sh @@ -44,7 +44,7 @@ # the project root. # # Here is an example for running this script. -# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:18-user \ +# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:10-user \ # TRAMPOLINE_BUILD_FILE=.kokoro/system-test.sh \ # .kokoro/trampoline_v2.sh From 340a8e9f6ce4f3df5126b984b09a9b71c65450a9 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:56:07 -0400 Subject: [PATCH 1044/1115] samples: add samples for Cloud Storage ingestion, and a few small fixes (#1985) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: fix a small issue with the typeless bot invocation * samples: add samples for cloud storage ingestion * samples: fix a paste-o in Kinesis sample * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * samples: fix paste-o with incorrect sample function name * tests: fix sample test quotes --------- Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 17 +++++++++-------- handwritten/pubsub/package.json | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 210ec6d799f..db9c9ef33eb 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -66,15 +66,15 @@ npm install @google-cloud/pubsub ```javascript // Imports the Google Cloud client library -const { PubSub } = require("@google-cloud/pubsub"); +const {PubSub} = require('@google-cloud/pubsub'); async function quickstart( -projectId = 'your-project-id', // Your Google Cloud Platform project ID -topicNameOrId = 'my-topic', // Name for the new topic to create -subscriptionName = 'my-sub' // Name for the new subscription to create + projectId = 'your-project-id', // Your Google Cloud Platform project ID + topicNameOrId = 'my-topic', // Name for the new topic to create + subscriptionName = 'my-sub' // Name for the new subscription to create ) { // Instantiates a client - const pubsub = new PubSub({ projectId }); + const pubsub = new PubSub({projectId}); // Creates a new topic const [topic] = await pubsub.createTopic(topicNameOrId); @@ -84,19 +84,19 @@ subscriptionName = 'my-sub' // Name for the new subscription to create const [subscription] = await topic.createSubscription(subscriptionName); // Receive callbacks for new messages on the subscription - subscription.on('message', (message) => { + subscription.on('message', message => { console.log('Received message:', message.data.toString()); process.exit(0); }); // Receive callbacks for errors on the subscription - subscription.on('error', (error) => { + subscription.on('error', error => { console.error('Received error:', error); process.exit(1); }); // Send a message to the topic - topic.publishMessage({ data: Buffer.from('Test message!') }); + topic.publishMessage({data: Buffer.from('Test message!')}); } ``` @@ -138,6 +138,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | 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 Subscription With Retry Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithRetryPolicy.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/createSubscriptionWithRetryPolicy.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) | +| Create Topic With Cloud Storage Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithCloudStorageIngestion.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/createTopicWithCloudStorageIngestion.js,samples/README.md) | | Create Topic With Kinesis Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithKinesisIngestion.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/createTopicWithKinesisIngestion.js,samples/README.md) | | Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | | Create Topic With Schema Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchemaRevisions.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/createTopicWithSchemaRevisions.js,samples/README.md) | diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b3558bf47ed..a4ad5eafc99 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -46,7 +46,7 @@ "prelint": "cd samples; npm link ../; npm install", "precompile": "gts clean", "typeless": "npx typeless-sample-bot --outputpath samples --targets samples --recursive", - "posttypeless": "cd samples && npm i && cd .. && npx eslint --ignore-pattern owl-bot-staging --fix" + "posttypeless": "cd samples && npm i && cd .. && npx eslint --ignore-pattern owl-bot-staging --fix samples" }, "dependencies": { "@google-cloud/paginator": "^5.0.0", From 6a4fd7346dcc4166d5d8c099f04b35d06a4c0c84 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 16:59:10 -0400 Subject: [PATCH 1045/1115] chore(main): release 4.8.0 (#1977) * chore(main): release 4.8.0 * chore(main): release 4.8.0 * build: also link the current pubsub version * chore(main): release 4.8.0 --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: feywind <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c0f5aecdd7e..96023ed8aff 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.8.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.7.2...v4.8.0) (2024-10-15) + + +### Features + +* Add ingestion Cloud Storage fields and Platform Logging fields to Topic ([#1974](https://github.com/googleapis/nodejs-pubsub/issues/1974)) ([afec9a1](https://github.com/googleapis/nodejs-pubsub/commit/afec9a1ad3f665a71f08e748623f0fdaa332d17b)) +* Return listing information for subscriptions created via Analytics Hub ([afec9a1](https://github.com/googleapis/nodejs-pubsub/commit/afec9a1ad3f665a71f08e748623f0fdaa332d17b)) + ## [4.7.2](https://github.com/googleapis/nodejs-pubsub/compare/v4.7.1...v4.7.2) (2024-09-13) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a4ad5eafc99..d9bbaa7573f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.7.2", + "version": "4.8.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { @@ -29,7 +29,8 @@ "scripts": { "presystem-test": "npm run compile", "system-test": "mocha build/system-test --timeout 600000", - "samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../", + "samples-test": "npm run link-samples && npm test && cd ../", + "link-samples": "cd samples/ && npm link ../ && npm install", "test": "c8 mocha build/test --recursive", "lint": "gts check", "predocs": "npm run compile", @@ -46,7 +47,7 @@ "prelint": "cd samples; npm link ../; npm install", "precompile": "gts clean", "typeless": "npx typeless-sample-bot --outputpath samples --targets samples --recursive", - "posttypeless": "cd samples && npm i && cd .. && npx eslint --ignore-pattern owl-bot-staging --fix samples" + "posttypeless": "npm run link-samples && npx eslint --ignore-pattern owl-bot-staging --fix samples" }, "dependencies": { "@google-cloud/paginator": "^5.0.0", From 629b2f7528c3c56b81d085225b35d84f145bc04e Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:07:44 -0400 Subject: [PATCH 1046/1115] samples: various sample and doc improvements we had queued up (#1987) * samples: update publishing samples to clarify that topic objects should be cached; also fix a usage of publish() * samples: convert publishWithRetrySettings to use veneer * samples: update publishWithRetrySettings with new defaults; add comment about including all items * docs: clarify what subscriber batching means * samples: update EOD sample with endpoint * samples: add comments about ordered publishing as well --- handwritten/pubsub/src/message-queues.ts | 3 +++ handwritten/pubsub/src/subscriber.ts | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index a08330a3699..b5d1275d27f 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -55,6 +55,9 @@ export interface QueuedMessage { */ export type QueuedMessages = Array; +/** + * Batching options for sending acks and modacks back to the server. + */ export interface BatchOptions { callOptions?: CallOptions; maxMessages?: number; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index c20b63be637..834165c7dbc 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -560,7 +560,8 @@ export class Message implements tracing.MessageWithAttributes { * ever have, while it's under library control. * @property {Duration} [maxAckDeadline] The maximum time that ackDeadline should * ever have, while it's under library control. - * @property {BatchOptions} [batching] Request batching options. + * @property {BatchOptions} [batching] Request batching options; this is for + * batching acks and modacks being sent back to the server. * @property {FlowControlOptions} [flowControl] Flow control options. * @property {boolean} [useLegacyFlowControl] Disables enforcing flow control * settings at the Cloud PubSub server and uses the less accurate method From 4f0315d8f11e5cb7286b03e77082235b370516a0 Mon Sep 17 00:00:00 2001 From: sofisl <55454395+sofisl@users.noreply.github.com> Date: Wed, 23 Oct 2024 12:52:17 -0400 Subject: [PATCH 1047/1115] chore: delete unused templates (#1989) * Delete .github/ISSUE_TEMPLATE/bug_report.md * Delete .github/ISSUE_TEMPLATE/feature_request.md * Delete .github/ISSUE_TEMPLATE/question.md --- .../.github/ISSUE_TEMPLATE/bug_report.md | 38 ------------------- .../.github/ISSUE_TEMPLATE/feature_request.md | 18 --------- .../pubsub/.github/ISSUE_TEMPLATE/question.md | 12 ------ 3 files changed, 68 deletions(-) delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/question.md diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 490cdb0aadb..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -labels: 'type: bug, priority: p2' ---- - -Thanks for stopping by to let us know something could be better! - -**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. - -1) Is this a client library issue or a product issue? -This is the client library for . We will only be able to assist with issues that pertain to the behaviors of this library. If the issue you're experiencing is due to the behavior of the product itself, please visit the [ Support page]() to reach the most relevant engineers. - -2) Did someone already solve this? - - Search the issues already opened: https://github.com/googleapis/nodejs-pubsub/issues - - Search the issues on our "catch-all" repository: https://github.com/googleapis/google-cloud-node - - Search or ask on StackOverflow (engineers monitor these tags): http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js - -3) Do you have a support contract? -Please create an issue in the [support console](https://cloud.google.com/support/) to ensure a timely response. - -If the support paths suggested above still do not result in a resolution, please provide the following details. - -#### Environment details - - - OS: - - Node.js version: - - npm version: - - `@google-cloud/pubsub` version: - -#### Steps to reproduce - - 1. ? - 2. ? - -Making sure to follow these steps will guarantee the quickest resolution possible. - -Thanks! diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index b0327dfa02e..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this library -labels: 'type: feature request, priority: p3' ---- - -Thanks for stopping by to let us know something could be better! - -**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. - - **Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - **Describe the solution you'd like** -A clear and concise description of what you want to happen. - **Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - **Additional context** -Add any other context or screenshots about the feature request here. diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/question.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/question.md deleted file mode 100644 index 97323113911..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/question.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -name: Question -about: Ask a question -labels: 'type: question, priority: p3' ---- - -Thanks for stopping by to ask us a question! Please make sure to include: -- What you're trying to do -- What code you've already tried -- Any error messages you're getting - -**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. From 9e5c4db2d63b5fc9838d9d3bf6d4801a65621e94 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 24 Oct 2024 19:52:09 +0200 Subject: [PATCH 1048/1115] chore(deps): update dependency gts to v6 (#1986) --- handwritten/pubsub/system-test/fixtures/sample/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index f4596200d9b..1792371293b 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -18,6 +18,6 @@ "devDependencies": { "@types/node": "^20.0.0", "typescript": "^4.6.4", - "gts": "^3.1.0" + "gts": "^6.0.0" } } From c8919c8739d38886b9cd89bcdede2c1277f4d283 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:31:02 -0500 Subject: [PATCH 1049/1115] build: revert gts version for system test fixtures, update TS version to match main package (#1995) --- handwritten/pubsub/system-test/fixtures/sample/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index 1792371293b..0fd53d36948 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@types/node": "^20.0.0", - "typescript": "^4.6.4", - "gts": "^6.0.0" + "typescript": "^5.1.6", + "gts": "^5.0.0" } } From 79fb4b3fd90f7e185af16f680140be0f0e884582 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 7 Nov 2024 22:56:52 +0100 Subject: [PATCH 1050/1115] chore(deps): update dependency @types/uuid to v10 (#1991) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index d9bbaa7573f..8beb2b3e27d 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -80,7 +80,7 @@ "@types/proxyquire": "^1.3.28", "@types/sinon": "^17.0.0", "@types/tmp": "^0.2.0", - "@types/uuid": "^9.0.0", + "@types/uuid": "^10.0.0", "c8": "^9.0.0", "codecov": "^3.0.0", "execa": "^5.0.0", From 84bb7cd6fd8fc9702fdeb5df47c2bf3032c70b22 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 7 Nov 2024 23:06:16 +0100 Subject: [PATCH 1051/1115] chore(deps): update dependency @types/node to v22 (#1993) --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/system-test/fixtures/sample/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 8beb2b3e27d..279df9e5c81 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -76,7 +76,7 @@ "@types/mocha": "^9.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", - "@types/node": "^20.0.0", + "@types/node": "^22.0.0", "@types/proxyquire": "^1.3.28", "@types/sinon": "^17.0.0", "@types/tmp": "^0.2.0", diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index 0fd53d36948..1a2e039ef14 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -16,7 +16,7 @@ "@google-cloud/pubsub": "file:./pubsub.tgz" }, "devDependencies": { - "@types/node": "^20.0.0", + "@types/node": "^22.0.0", "typescript": "^5.1.6", "gts": "^5.0.0" } From 8dc9c905398f9c883aaf9d8352c650c098a85d77 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:26:20 -0500 Subject: [PATCH 1052/1115] feat: Add IngestionFailureEvent to the external proto (#1984) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Add IngestionFailureEvent to the external proto PiperOrigin-RevId: 684152766 Source-Link: https://github.com/googleapis/googleapis/commit/d992b0619ee79a2d32f6954cc29351ed8f15f560 Source-Link: https://github.com/googleapis/googleapis-gen/commit/f7405e1dc75cddd10a6aca96211318586fb61fc0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjc0MDVlMWRjNzVjZGRkMTBhNmFjYTk2MjExMzE4NTg2ZmI2MWZjMCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- .../protos/google/pubsub/v1/pubsub.proto | 57 + handwritten/pubsub/protos/protos.d.ts | 421 ++++++++ handwritten/pubsub/protos/protos.js | 972 ++++++++++++++++++ handwritten/pubsub/protos/protos.json | 87 ++ 4 files changed, 1537 insertions(+) diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 54b44b82217..0f269f5252a 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -365,6 +365,63 @@ message PlatformLogsSettings { Severity severity = 1 [(google.api.field_behavior) = OPTIONAL]; } +// Payload of the Platform Log entry sent when a failure is encountered while +// ingesting. +message IngestionFailureEvent { + // Specifies the reason why some data may have been left out of + // the desired Pub/Sub message due to the API message limits + // (https://cloud.google.com/pubsub/quotas#resource_limits). For example, + // when the number of attributes is larger than 100, the number of + // attributes is truncated to 100 to respect the limit on the attribute count. + // Other attribute limits are treated similarly. When the size of the desired + // message would've been larger than 10MB, the message won't be published at + // all, and ingestion of the subsequent messages will proceed as normal. + message ApiViolationReason {} + + // Set when an Avro file is unsupported or its format is not valid. When this + // occurs, one or more Avro objects won't be ingested. + message AvroFailureReason {} + + // Failure when ingesting from a Cloud Storage source. + message CloudStorageFailure { + // Optional. Name of the Cloud Storage bucket used for ingestion. + string bucket = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Name of the Cloud Storage object which contained the section + // that couldn't be ingested. + string object_name = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Generation of the Cloud Storage object which contained the + // section that couldn't be ingested. + int64 object_generation = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Reason why ingestion failed for the specified object. + oneof reason { + // Optional. Failure encountered when parsing an Avro file. + AvroFailureReason avro_failure_reason = 5 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The Pub/Sub API limits prevented the desired message from + // being published. + ApiViolationReason api_violation_reason = 6 + [(google.api.field_behavior) = OPTIONAL]; + } + } + + // Required. Name of the import topic. Format is: + // projects/{project_name}/topics/{topic_name}. + string topic = 1 [(google.api.field_behavior) = REQUIRED]; + + // Required. Error details explaining why ingestion to Pub/Sub has failed. + string error_message = 2 [(google.api.field_behavior) = REQUIRED]; + + oneof failure { + // Optional. Failure when ingesting from Cloud Storage. + CloudStorageFailure cloud_storage_failure = 3 + [(google.api.field_behavior) = OPTIONAL]; + } +} + // A topic resource. message Topic { option (google.api.resource) = { diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index eed0f3d039a..1c673e0fe2c 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1241,6 +1241,427 @@ export namespace google { } } + /** Properties of an IngestionFailureEvent. */ + interface IIngestionFailureEvent { + + /** IngestionFailureEvent topic */ + topic?: (string|null); + + /** IngestionFailureEvent errorMessage */ + errorMessage?: (string|null); + + /** IngestionFailureEvent cloudStorageFailure */ + cloudStorageFailure?: (google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null); + } + + /** Represents an IngestionFailureEvent. */ + class IngestionFailureEvent implements IIngestionFailureEvent { + + /** + * Constructs a new IngestionFailureEvent. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IIngestionFailureEvent); + + /** IngestionFailureEvent topic. */ + public topic: string; + + /** IngestionFailureEvent errorMessage. */ + public errorMessage: string; + + /** IngestionFailureEvent cloudStorageFailure. */ + public cloudStorageFailure?: (google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null); + + /** IngestionFailureEvent failure. */ + public failure?: "cloudStorageFailure"; + + /** + * Creates a new IngestionFailureEvent instance using the specified properties. + * @param [properties] Properties to set + * @returns IngestionFailureEvent instance + */ + public static create(properties?: google.pubsub.v1.IIngestionFailureEvent): google.pubsub.v1.IngestionFailureEvent; + + /** + * Encodes the specified IngestionFailureEvent message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.verify|verify} messages. + * @param message IngestionFailureEvent message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IIngestionFailureEvent, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified IngestionFailureEvent message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.verify|verify} messages. + * @param message IngestionFailureEvent message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IIngestionFailureEvent, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an IngestionFailureEvent message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns IngestionFailureEvent + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent; + + /** + * Decodes an IngestionFailureEvent message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns IngestionFailureEvent + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent; + + /** + * Verifies an IngestionFailureEvent message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an IngestionFailureEvent message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns IngestionFailureEvent + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent; + + /** + * Creates a plain object from an IngestionFailureEvent message. Also converts values to other types if specified. + * @param message IngestionFailureEvent + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this IngestionFailureEvent to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for IngestionFailureEvent + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace IngestionFailureEvent { + + /** Properties of an ApiViolationReason. */ + interface IApiViolationReason { + } + + /** Represents an ApiViolationReason. */ + class ApiViolationReason implements IApiViolationReason { + + /** + * Constructs a new ApiViolationReason. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.IApiViolationReason); + + /** + * Creates a new ApiViolationReason instance using the specified properties. + * @param [properties] Properties to set + * @returns ApiViolationReason instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.IApiViolationReason): google.pubsub.v1.IngestionFailureEvent.ApiViolationReason; + + /** + * Encodes the specified ApiViolationReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify|verify} messages. + * @param message ApiViolationReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.IApiViolationReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ApiViolationReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify|verify} messages. + * @param message ApiViolationReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.IApiViolationReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ApiViolationReason message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ApiViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.ApiViolationReason; + + /** + * Decodes an ApiViolationReason message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ApiViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.ApiViolationReason; + + /** + * Verifies an ApiViolationReason message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ApiViolationReason message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ApiViolationReason + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.ApiViolationReason; + + /** + * Creates a plain object from an ApiViolationReason message. Also converts values to other types if specified. + * @param message ApiViolationReason + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.ApiViolationReason, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ApiViolationReason to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ApiViolationReason + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of an AvroFailureReason. */ + interface IAvroFailureReason { + } + + /** Represents an AvroFailureReason. */ + class AvroFailureReason implements IAvroFailureReason { + + /** + * Constructs a new AvroFailureReason. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason); + + /** + * Creates a new AvroFailureReason instance using the specified properties. + * @param [properties] Properties to set + * @returns AvroFailureReason instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason): google.pubsub.v1.IngestionFailureEvent.AvroFailureReason; + + /** + * Encodes the specified AvroFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify|verify} messages. + * @param message AvroFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AvroFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify|verify} messages. + * @param message AvroFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AvroFailureReason message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AvroFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.AvroFailureReason; + + /** + * Decodes an AvroFailureReason message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AvroFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.AvroFailureReason; + + /** + * Verifies an AvroFailureReason message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AvroFailureReason message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AvroFailureReason + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.AvroFailureReason; + + /** + * Creates a plain object from an AvroFailureReason message. Also converts values to other types if specified. + * @param message AvroFailureReason + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.AvroFailureReason, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AvroFailureReason to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AvroFailureReason + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a CloudStorageFailure. */ + interface ICloudStorageFailure { + + /** CloudStorageFailure bucket */ + bucket?: (string|null); + + /** CloudStorageFailure objectName */ + objectName?: (string|null); + + /** CloudStorageFailure objectGeneration */ + objectGeneration?: (number|Long|string|null); + + /** CloudStorageFailure avroFailureReason */ + avroFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null); + + /** CloudStorageFailure apiViolationReason */ + apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + } + + /** Represents a CloudStorageFailure. */ + class CloudStorageFailure implements ICloudStorageFailure { + + /** + * Constructs a new CloudStorageFailure. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure); + + /** CloudStorageFailure bucket. */ + public bucket: string; + + /** CloudStorageFailure objectName. */ + public objectName: string; + + /** CloudStorageFailure objectGeneration. */ + public objectGeneration: (number|Long|string); + + /** CloudStorageFailure avroFailureReason. */ + public avroFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null); + + /** CloudStorageFailure apiViolationReason. */ + public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + + /** CloudStorageFailure reason. */ + public reason?: ("avroFailureReason"|"apiViolationReason"); + + /** + * Creates a new CloudStorageFailure instance using the specified properties. + * @param [properties] Properties to set + * @returns CloudStorageFailure instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure): google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure; + + /** + * Encodes the specified CloudStorageFailure message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify|verify} messages. + * @param message CloudStorageFailure message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified CloudStorageFailure message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify|verify} messages. + * @param message CloudStorageFailure message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a CloudStorageFailure message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns CloudStorageFailure + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure; + + /** + * Decodes a CloudStorageFailure message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns CloudStorageFailure + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure; + + /** + * Verifies a CloudStorageFailure message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a CloudStorageFailure message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns CloudStorageFailure + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure; + + /** + * Creates a plain object from a CloudStorageFailure message. Also converts values to other types if specified. + * @param message CloudStorageFailure + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this CloudStorageFailure to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for CloudStorageFailure + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + } + /** Properties of a Topic. */ interface ITopic { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index b54729ed3e5..590cfac5bde 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -2864,6 +2864,978 @@ return PlatformLogsSettings; })(); + v1.IngestionFailureEvent = (function() { + + /** + * Properties of an IngestionFailureEvent. + * @memberof google.pubsub.v1 + * @interface IIngestionFailureEvent + * @property {string|null} [topic] IngestionFailureEvent topic + * @property {string|null} [errorMessage] IngestionFailureEvent errorMessage + * @property {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null} [cloudStorageFailure] IngestionFailureEvent cloudStorageFailure + */ + + /** + * Constructs a new IngestionFailureEvent. + * @memberof google.pubsub.v1 + * @classdesc Represents an IngestionFailureEvent. + * @implements IIngestionFailureEvent + * @constructor + * @param {google.pubsub.v1.IIngestionFailureEvent=} [properties] Properties to set + */ + function IngestionFailureEvent(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * IngestionFailureEvent topic. + * @member {string} topic + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.topic = ""; + + /** + * IngestionFailureEvent errorMessage. + * @member {string} errorMessage + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.errorMessage = ""; + + /** + * IngestionFailureEvent cloudStorageFailure. + * @member {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null|undefined} cloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.cloudStorageFailure = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * IngestionFailureEvent failure. + * @member {"cloudStorageFailure"|undefined} failure + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + Object.defineProperty(IngestionFailureEvent.prototype, "failure", { + get: $util.oneOfGetter($oneOfFields = ["cloudStorageFailure"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new IngestionFailureEvent instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {google.pubsub.v1.IIngestionFailureEvent=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent instance + */ + IngestionFailureEvent.create = function create(properties) { + return new IngestionFailureEvent(properties); + }; + + /** + * Encodes the specified IngestionFailureEvent message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {google.pubsub.v1.IIngestionFailureEvent} message IngestionFailureEvent message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + IngestionFailureEvent.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.errorMessage != null && Object.hasOwnProperty.call(message, "errorMessage")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.errorMessage); + if (message.cloudStorageFailure != null && Object.hasOwnProperty.call(message, "cloudStorageFailure")) + $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.encode(message.cloudStorageFailure, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified IngestionFailureEvent message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {google.pubsub.v1.IIngestionFailureEvent} message IngestionFailureEvent message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + IngestionFailureEvent.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an IngestionFailureEvent message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + IngestionFailureEvent.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.topic = reader.string(); + break; + } + case 2: { + message.errorMessage = reader.string(); + break; + } + case 3: { + message.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an IngestionFailureEvent message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + IngestionFailureEvent.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an IngestionFailureEvent message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + IngestionFailureEvent.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.errorMessage != null && message.hasOwnProperty("errorMessage")) + if (!$util.isString(message.errorMessage)) + return "errorMessage: string expected"; + if (message.cloudStorageFailure != null && message.hasOwnProperty("cloudStorageFailure")) { + properties.failure = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify(message.cloudStorageFailure); + if (error) + return "cloudStorageFailure." + error; + } + } + return null; + }; + + /** + * Creates an IngestionFailureEvent message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent + */ + IngestionFailureEvent.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent) + return object; + var message = new $root.google.pubsub.v1.IngestionFailureEvent(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.errorMessage != null) + message.errorMessage = String(object.errorMessage); + if (object.cloudStorageFailure != null) { + if (typeof object.cloudStorageFailure !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.cloudStorageFailure: object expected"); + message.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.fromObject(object.cloudStorageFailure); + } + return message; + }; + + /** + * Creates a plain object from an IngestionFailureEvent message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {google.pubsub.v1.IngestionFailureEvent} message IngestionFailureEvent + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + IngestionFailureEvent.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = ""; + object.errorMessage = ""; + } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.errorMessage != null && message.hasOwnProperty("errorMessage")) + object.errorMessage = message.errorMessage; + if (message.cloudStorageFailure != null && message.hasOwnProperty("cloudStorageFailure")) { + object.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.toObject(message.cloudStorageFailure, options); + if (options.oneofs) + object.failure = "cloudStorageFailure"; + } + return object; + }; + + /** + * Converts this IngestionFailureEvent to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + * @returns {Object.} JSON object + */ + IngestionFailureEvent.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for IngestionFailureEvent + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + IngestionFailureEvent.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent"; + }; + + IngestionFailureEvent.ApiViolationReason = (function() { + + /** + * Properties of an ApiViolationReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface IApiViolationReason + */ + + /** + * Constructs a new ApiViolationReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents an ApiViolationReason. + * @implements IApiViolationReason + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason=} [properties] Properties to set + */ + function ApiViolationReason(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new ApiViolationReason instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason instance + */ + ApiViolationReason.create = function create(properties) { + return new ApiViolationReason(properties); + }; + + /** + * Encodes the specified ApiViolationReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason} message ApiViolationReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ApiViolationReason.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified ApiViolationReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason} message ApiViolationReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ApiViolationReason.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an ApiViolationReason message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ApiViolationReason.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an ApiViolationReason message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ApiViolationReason.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ApiViolationReason message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ApiViolationReason.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates an ApiViolationReason message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + */ + ApiViolationReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason) + return object; + return new $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason(); + }; + + /** + * Creates a plain object from an ApiViolationReason message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} message ApiViolationReason + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ApiViolationReason.toObject = function toObject() { + return {}; + }; + + /** + * Converts this ApiViolationReason to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @instance + * @returns {Object.} JSON object + */ + ApiViolationReason.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for ApiViolationReason + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ApiViolationReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.ApiViolationReason"; + }; + + return ApiViolationReason; + })(); + + IngestionFailureEvent.AvroFailureReason = (function() { + + /** + * Properties of an AvroFailureReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface IAvroFailureReason + */ + + /** + * Constructs a new AvroFailureReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents an AvroFailureReason. + * @implements IAvroFailureReason + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason=} [properties] Properties to set + */ + function AvroFailureReason(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new AvroFailureReason instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason instance + */ + AvroFailureReason.create = function create(properties) { + return new AvroFailureReason(properties); + }; + + /** + * Encodes the specified AvroFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason} message AvroFailureReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AvroFailureReason.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified AvroFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason} message AvroFailureReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AvroFailureReason.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AvroFailureReason message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AvroFailureReason.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AvroFailureReason message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AvroFailureReason.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AvroFailureReason message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AvroFailureReason.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates an AvroFailureReason message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + */ + AvroFailureReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason) + return object; + return new $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason(); + }; + + /** + * Creates a plain object from an AvroFailureReason message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} message AvroFailureReason + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AvroFailureReason.toObject = function toObject() { + return {}; + }; + + /** + * Converts this AvroFailureReason to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @instance + * @returns {Object.} JSON object + */ + AvroFailureReason.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AvroFailureReason + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AvroFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.AvroFailureReason"; + }; + + return AvroFailureReason; + })(); + + IngestionFailureEvent.CloudStorageFailure = (function() { + + /** + * Properties of a CloudStorageFailure. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface ICloudStorageFailure + * @property {string|null} [bucket] CloudStorageFailure bucket + * @property {string|null} [objectName] CloudStorageFailure objectName + * @property {number|Long|null} [objectGeneration] CloudStorageFailure objectGeneration + * @property {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null} [avroFailureReason] CloudStorageFailure avroFailureReason + * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] CloudStorageFailure apiViolationReason + */ + + /** + * Constructs a new CloudStorageFailure. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents a CloudStorageFailure. + * @implements ICloudStorageFailure + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure=} [properties] Properties to set + */ + function CloudStorageFailure(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * CloudStorageFailure bucket. + * @member {string} bucket + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.bucket = ""; + + /** + * CloudStorageFailure objectName. + * @member {string} objectName + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.objectName = ""; + + /** + * CloudStorageFailure objectGeneration. + * @member {number|Long} objectGeneration + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.objectGeneration = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * CloudStorageFailure avroFailureReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null|undefined} avroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.avroFailureReason = null; + + /** + * CloudStorageFailure apiViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null|undefined} apiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.apiViolationReason = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * CloudStorageFailure reason. + * @member {"avroFailureReason"|"apiViolationReason"|undefined} reason + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + Object.defineProperty(CloudStorageFailure.prototype, "reason", { + get: $util.oneOfGetter($oneOfFields = ["avroFailureReason", "apiViolationReason"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new CloudStorageFailure instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure instance + */ + CloudStorageFailure.create = function create(properties) { + return new CloudStorageFailure(properties); + }; + + /** + * Encodes the specified CloudStorageFailure message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure} message CloudStorageFailure message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CloudStorageFailure.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.bucket != null && Object.hasOwnProperty.call(message, "bucket")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.bucket); + if (message.objectName != null && Object.hasOwnProperty.call(message, "objectName")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.objectName); + if (message.objectGeneration != null && Object.hasOwnProperty.call(message, "objectGeneration")) + writer.uint32(/* id 3, wireType 0 =*/24).int64(message.objectGeneration); + if (message.avroFailureReason != null && Object.hasOwnProperty.call(message, "avroFailureReason")) + $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.encode(message.avroFailureReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified CloudStorageFailure message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure} message CloudStorageFailure message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CloudStorageFailure.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CloudStorageFailure message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CloudStorageFailure.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.bucket = reader.string(); + break; + } + case 2: { + message.objectName = reader.string(); + break; + } + case 3: { + message.objectGeneration = reader.int64(); + break; + } + case 5: { + message.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.decode(reader, reader.uint32()); + break; + } + case 6: { + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a CloudStorageFailure message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CloudStorageFailure.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CloudStorageFailure message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CloudStorageFailure.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.bucket != null && message.hasOwnProperty("bucket")) + if (!$util.isString(message.bucket)) + return "bucket: string expected"; + if (message.objectName != null && message.hasOwnProperty("objectName")) + if (!$util.isString(message.objectName)) + return "objectName: string expected"; + if (message.objectGeneration != null && message.hasOwnProperty("objectGeneration")) + if (!$util.isInteger(message.objectGeneration) && !(message.objectGeneration && $util.isInteger(message.objectGeneration.low) && $util.isInteger(message.objectGeneration.high))) + return "objectGeneration: integer|Long expected"; + if (message.avroFailureReason != null && message.hasOwnProperty("avroFailureReason")) { + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify(message.avroFailureReason); + if (error) + return "avroFailureReason." + error; + } + } + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify(message.apiViolationReason); + if (error) + return "apiViolationReason." + error; + } + } + return null; + }; + + /** + * Creates a CloudStorageFailure message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + */ + CloudStorageFailure.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure) + return object; + var message = new $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure(); + if (object.bucket != null) + message.bucket = String(object.bucket); + if (object.objectName != null) + message.objectName = String(object.objectName); + if (object.objectGeneration != null) + if ($util.Long) + (message.objectGeneration = $util.Long.fromValue(object.objectGeneration)).unsigned = false; + else if (typeof object.objectGeneration === "string") + message.objectGeneration = parseInt(object.objectGeneration, 10); + else if (typeof object.objectGeneration === "number") + message.objectGeneration = object.objectGeneration; + else if (typeof object.objectGeneration === "object") + message.objectGeneration = new $util.LongBits(object.objectGeneration.low >>> 0, object.objectGeneration.high >>> 0).toNumber(); + if (object.avroFailureReason != null) { + if (typeof object.avroFailureReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.avroFailureReason: object expected"); + message.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.fromObject(object.avroFailureReason); + } + if (object.apiViolationReason != null) { + if (typeof object.apiViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.apiViolationReason: object expected"); + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); + } + return message; + }; + + /** + * Creates a plain object from a CloudStorageFailure message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} message CloudStorageFailure + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CloudStorageFailure.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.bucket = ""; + object.objectName = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.objectGeneration = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.objectGeneration = options.longs === String ? "0" : 0; + } + if (message.bucket != null && message.hasOwnProperty("bucket")) + object.bucket = message.bucket; + if (message.objectName != null && message.hasOwnProperty("objectName")) + object.objectName = message.objectName; + if (message.objectGeneration != null && message.hasOwnProperty("objectGeneration")) + if (typeof message.objectGeneration === "number") + object.objectGeneration = options.longs === String ? String(message.objectGeneration) : message.objectGeneration; + else + object.objectGeneration = options.longs === String ? $util.Long.prototype.toString.call(message.objectGeneration) : options.longs === Number ? new $util.LongBits(message.objectGeneration.low >>> 0, message.objectGeneration.high >>> 0).toNumber() : message.objectGeneration; + if (message.avroFailureReason != null && message.hasOwnProperty("avroFailureReason")) { + object.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.toObject(message.avroFailureReason, options); + if (options.oneofs) + object.reason = "avroFailureReason"; + } + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + object.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.toObject(message.apiViolationReason, options); + if (options.oneofs) + object.reason = "apiViolationReason"; + } + return object; + }; + + /** + * Converts this CloudStorageFailure to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + * @returns {Object.} JSON object + */ + CloudStorageFailure.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for CloudStorageFailure + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CloudStorageFailure.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure"; + }; + + return CloudStorageFailure; + })(); + + return IngestionFailureEvent; + })(); + v1.Topic = (function() { /** diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 8921f219f22..a72a7296781 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -451,6 +451,93 @@ } } }, + "IngestionFailureEvent": { + "oneofs": { + "failure": { + "oneof": [ + "cloudStorageFailure" + ] + } + }, + "fields": { + "topic": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "errorMessage": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "cloudStorageFailure": { + "type": "CloudStorageFailure", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + }, + "nested": { + "ApiViolationReason": { + "fields": {} + }, + "AvroFailureReason": { + "fields": {} + }, + "CloudStorageFailure": { + "oneofs": { + "reason": { + "oneof": [ + "avroFailureReason", + "apiViolationReason" + ] + } + }, + "fields": { + "bucket": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "objectName": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "objectGeneration": { + "type": "int64", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "avroFailureReason": { + "type": "AvroFailureReason", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "apiViolationReason": { + "type": "ApiViolationReason", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + } + } + } + }, "Topic": { "options": { "(google.api.resource).type": "pubsub.googleapis.com/Topic", From 44c8eb3a01de90e64fd614796da1a6b9a7c6d71c Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:50:25 -0500 Subject: [PATCH 1053/1115] fix: KiB, not MiB for ack size limits (#1999) --- handwritten/pubsub/src/message-queues.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index b5d1275d27f..adc565c3ecd 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -67,7 +67,7 @@ export interface BatchOptions { // This is the maximum number of bytes we will send for a batch of // ack/modack messages. The server itself has a maximum of 512KiB, so // we just pull back a little from that in case of unknown fenceposts. -export const MAX_BATCH_BYTES = 510 * 1024 * 1024; +export const MAX_BATCH_BYTES = 510 * 1024; /** * Error class used to signal a batch failure. From 949083cf23b49cd88c478c6e8185854bc8658ebd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:12:20 -0500 Subject: [PATCH 1054/1115] chore(main): release 4.9.0 (#1997) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 96023ed8aff..2f6317eacf5 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.9.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.8.0...v4.9.0) (2024-11-12) + + +### Features + +* Add IngestionFailureEvent to the external proto ([#1984](https://github.com/googleapis/nodejs-pubsub/issues/1984)) ([7075430](https://github.com/googleapis/nodejs-pubsub/commit/70754309fb600c54d0a573f2d49ad4c419577550)) + + +### Bug Fixes + +* KiB, not MiB for ack size limits ([#1999](https://github.com/googleapis/nodejs-pubsub/issues/1999)) ([798270d](https://github.com/googleapis/nodejs-pubsub/commit/798270db9c5ef71f75c3e24e70d9592bbd068212)) + ## [4.8.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.7.2...v4.8.0) (2024-10-15) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 279df9e5c81..c31ea1b1458 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.8.0", + "version": "4.9.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 9d6f36c1643e5ab06fb0550c256f5e8c48374430 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 21 Nov 2024 21:48:02 +0100 Subject: [PATCH 1055/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.28.0 (#2001) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c31ea1b1458..ad2f60bfa27 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -55,7 +55,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "~1.9.0", - "@opentelemetry/semantic-conventions": "~1.26.0", + "@opentelemetry/semantic-conventions": "~1.28.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", From abcbdca73b8d5c3441ab0077a314984677061ed1 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:30:08 -0500 Subject: [PATCH 1056/1115] feat: Add Kafka-based sources to IngestionDataSourceSettings proto and IngestionFailureEvent proto (#2007) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: remove redundant gRPC service config file feat: specify retry configuration PiperOrigin-RevId: 712493958 Source-Link: https://github.com/googleapis/googleapis/commit/29aea4190aba664659908ff5e381c830e4752502 Source-Link: https://github.com/googleapis/googleapis-gen/commit/04bcbab4505989e984b1403d438fffc0312144af Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDRiY2JhYjQ1MDU5ODllOTg0YjE0MDNkNDM4ZmZmYzAzMTIxNDRhZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Add Kafka-based sources to IngestionDataSourceSettings proto and IngestionFailureEvent proto PiperOrigin-RevId: 712896662 Source-Link: https://github.com/googleapis/googleapis/commit/b062cd1d535ad083ada5d147df30f07494f4acbd Source-Link: https://github.com/googleapis/googleapis-gen/commit/49fbaeb0c6b12755a62f44f2dcb97a5d1ee7d80e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDlmYmFlYjBjNmIxMjc1NWE2MmY0NGYyZGNiOTdhNWQxZWU3ZDgwZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.jsdoc.js | 4 +- .../protos/google/pubsub/v1/pubsub.proto | 252 ++ handwritten/pubsub/protos/protos.d.ts | 843 +++- handwritten/pubsub/protos/protos.js | 3917 +++++++++++++---- handwritten/pubsub/protos/protos.json | 374 +- handwritten/pubsub/src/v1/index.ts | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 2 +- .../pubsub/src/v1/schema_service_client.ts | 2 +- .../pubsub/src/v1/subscriber_client.ts | 2 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 2 +- .../pubsub/test/gapic_schema_service_v1.ts | 2 +- .../pubsub/test/gapic_subscriber_v1.ts | 2 +- 12 files changed, 4652 insertions(+), 752 deletions(-) diff --git a/handwritten/pubsub/.jsdoc.js b/handwritten/pubsub/.jsdoc.js index 0093b31424c..c7aff047479 100644 --- a/handwritten/pubsub/.jsdoc.js +++ b/handwritten/pubsub/.jsdoc.js @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 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 2024 Google LLC', + copyright: 'Copyright 2025 Google LLC', includeDate: false, sourceFiles: false, systemName: '@google-cloud/pubsub', diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 0f269f5252a..6ed87cbba4c 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -323,6 +323,164 @@ message IngestionDataSourceSettings { string match_glob = 9 [(google.api.field_behavior) = OPTIONAL]; } + // Ingestion settings for Azure Event Hubs. + message AzureEventHubs { + // Possible states for managed ingestion from Event Hubs. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // Ingestion is active. + ACTIVE = 1; + + // Permission denied encountered while consuming data from Event Hubs. + // This can happen when `client_id`, or `tenant_id` are invalid. Or the + // right permissions haven't been granted. + EVENT_HUBS_PERMISSION_DENIED = 2; + + // Permission denied encountered while publishing to the topic. + PUBLISH_PERMISSION_DENIED = 3; + + // The provided Event Hubs namespace couldn't be found. + NAMESPACE_NOT_FOUND = 4; + + // The provided Event Hub couldn't be found. + EVENT_HUB_NOT_FOUND = 5; + + // The provided Event Hubs subscription couldn't be found. + SUBSCRIPTION_NOT_FOUND = 6; + + // The provided Event Hubs resource group couldn't be found. + RESOURCE_GROUP_NOT_FOUND = 7; + } + + // Output only. An output-only field that indicates the state of the Event + // Hubs ingestion source. + State state = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Optional. Name of the resource group within the azure subscription. + string resource_group = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The name of the Event Hubs namespace. + string namespace = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The name of the Event Hub. + string event_hub = 4 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The client id of the Azure application that is being used to + // authenticate Pub/Sub. + string client_id = 5 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The tenant id of the Azure application that is being used to + // authenticate Pub/Sub. + string tenant_id = 6 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The Azure subscription id. + string subscription_id = 7 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The GCP service account to be used for Federated Identity + // authentication. + string gcp_service_account = 8 [(google.api.field_behavior) = OPTIONAL]; + } + + // Ingestion settings for Amazon MSK. + message AwsMsk { + // Possible states for managed ingestion from Amazon MSK. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // Ingestion is active. + ACTIVE = 1; + + // Permission denied encountered while consuming data from Amazon MSK. + MSK_PERMISSION_DENIED = 2; + + // Permission denied encountered while publishing to the topic. + PUBLISH_PERMISSION_DENIED = 3; + + // The provided MSK cluster wasn't found. + CLUSTER_NOT_FOUND = 4; + + // The provided topic wasn't found. + TOPIC_NOT_FOUND = 5; + } + + // Output only. An output-only field that indicates the state of the Amazon + // MSK ingestion source. + State state = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Required. The Amazon Resource Name (ARN) that uniquely identifies the + // cluster. + string cluster_arn = 2 [(google.api.field_behavior) = REQUIRED]; + + // Required. The name of the topic in the Amazon MSK cluster that Pub/Sub + // will import from. + string topic = 3 [(google.api.field_behavior) = REQUIRED]; + + // Required. AWS role ARN to be used for Federated Identity authentication + // with Amazon MSK. Check the Pub/Sub docs for how to set up this role and + // the required permissions that need to be attached to it. + string aws_role_arn = 4 [(google.api.field_behavior) = REQUIRED]; + + // Required. The GCP service account to be used for Federated Identity + // authentication with Amazon MSK (via a `AssumeRoleWithWebIdentity` call + // for the provided role). The `aws_role_arn` must be set up with + // `accounts.google.com:sub` equals to this service account number. + string gcp_service_account = 5 [(google.api.field_behavior) = REQUIRED]; + } + + // Ingestion settings for Confluent Cloud. + message ConfluentCloud { + // Possible states for managed ingestion from Confluent Cloud. + enum State { + // Default value. This value is unused. + STATE_UNSPECIFIED = 0; + + // Ingestion is active. + ACTIVE = 1; + + // Permission denied encountered while consuming data from Confluent + // Cloud. + CONFLUENT_CLOUD_PERMISSION_DENIED = 2; + + // Permission denied encountered while publishing to the topic. + PUBLISH_PERMISSION_DENIED = 3; + + // The provided bootstrap server address is unreachable. + UNREACHABLE_BOOTSTRAP_SERVER = 4; + + // The provided cluster wasn't found. + CLUSTER_NOT_FOUND = 5; + + // The provided topic wasn't found. + TOPIC_NOT_FOUND = 6; + } + + // Output only. An output-only field that indicates the state of the + // Confluent Cloud ingestion source. + State state = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Required. The address of the bootstrap server. The format is url:port. + string bootstrap_server = 2 [(google.api.field_behavior) = REQUIRED]; + + // Required. The id of the cluster. + string cluster_id = 3 [(google.api.field_behavior) = REQUIRED]; + + // Required. The name of the topic in the Confluent Cloud cluster that + // Pub/Sub will import from. + string topic = 4 [(google.api.field_behavior) = REQUIRED]; + + // Required. The id of the identity pool to be used for Federated Identity + // authentication with Confluent Cloud. See + // https://docs.confluent.io/cloud/current/security/authenticate/workload-identities/identity-providers/oauth/identity-pools.html#add-oauth-identity-pools. + string identity_pool_id = 5 [(google.api.field_behavior) = REQUIRED]; + + // Required. The GCP service account to be used for Federated Identity + // authentication with `identity_pool_id`. + string gcp_service_account = 6 [(google.api.field_behavior) = REQUIRED]; + } + // Only one source type can have settings set. oneof source { // Optional. Amazon Kinesis Data Streams. @@ -330,6 +488,16 @@ message IngestionDataSourceSettings { // Optional. Cloud Storage. CloudStorage cloud_storage = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Azure Event Hubs. + AzureEventHubs azure_event_hubs = 3 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Amazon MSK. + AwsMsk aws_msk = 5 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Confluent Cloud. + ConfluentCloud confluent_cloud = 6 [(google.api.field_behavior) = OPTIONAL]; } // Optional. Platform Logs settings. If unset, no Platform Logs will be @@ -408,6 +576,78 @@ message IngestionFailureEvent { } } + // Failure when ingesting from an Amazon MSK source. + message AwsMskFailureReason { + // Optional. The ARN of the cluster of the topic being ingested from. + string cluster_arn = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The name of the Kafka topic being ingested from. + string kafka_topic = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The partition ID of the message that failed to be ingested. + int64 partition_id = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The offset within the partition of the message that failed to + // be ingested. + int64 offset = 4 [(google.api.field_behavior) = OPTIONAL]; + + // Reason why ingestion failed for the specified message. + oneof reason { + // Optional. The Pub/Sub API limits prevented the desired message from + // being published. + ApiViolationReason api_violation_reason = 5 + [(google.api.field_behavior) = OPTIONAL]; + } + } + + // Failure when ingesting from an Azure Event Hubs source. + message AzureEventHubsFailureReason { + // Optional. The namespace containing the event hub being ingested from. + string namespace = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The name of the event hub being ingested from. + string event_hub = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The partition ID of the message that failed to be ingested. + int64 partition_id = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The offset within the partition of the message that failed to + // be ingested. + int64 offset = 4 [(google.api.field_behavior) = OPTIONAL]; + + // Reason why ingestion failed for the specified message. + oneof reason { + // Optional. The Pub/Sub API limits prevented the desired message from + // being published. + ApiViolationReason api_violation_reason = 5 + [(google.api.field_behavior) = OPTIONAL]; + } + } + + // Failure when ingesting from a Confluent Cloud source. + message ConfluentCloudFailureReason { + // Optional. The cluster ID containing the topic being ingested from. + string cluster_id = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The name of the Kafka topic being ingested from. + string kafka_topic = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The partition ID of the message that failed to be ingested. + int64 partition_id = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The offset within the partition of the message that failed to + // be ingested. + int64 offset = 4 [(google.api.field_behavior) = OPTIONAL]; + + // Reason why ingestion failed for the specified message. + oneof reason { + // Optional. The Pub/Sub API limits prevented the desired message from + // being published. + ApiViolationReason api_violation_reason = 5 + [(google.api.field_behavior) = OPTIONAL]; + } + } + // Required. Name of the import topic. Format is: // projects/{project_name}/topics/{topic_name}. string topic = 1 [(google.api.field_behavior) = REQUIRED]; @@ -419,6 +659,18 @@ message IngestionFailureEvent { // Optional. Failure when ingesting from Cloud Storage. CloudStorageFailure cloud_storage_failure = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure when ingesting from Amazon MSK. + AwsMskFailureReason aws_msk_failure = 4 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure when ingesting from Azure Event Hubs. + AzureEventHubsFailureReason azure_event_hubs_failure = 5 + [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure when ingesting from Confluent Cloud. + ConfluentCloudFailureReason confluent_cloud_failure = 6 + [(google.api.field_behavior) = OPTIONAL]; } } diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 1c673e0fe2c..3ccad3fc074 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -463,6 +463,15 @@ export namespace google { /** IngestionDataSourceSettings cloudStorage */ cloudStorage?: (google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage|null); + /** IngestionDataSourceSettings azureEventHubs */ + azureEventHubs?: (google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs|null); + + /** IngestionDataSourceSettings awsMsk */ + awsMsk?: (google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk|null); + + /** IngestionDataSourceSettings confluentCloud */ + confluentCloud?: (google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud|null); + /** IngestionDataSourceSettings platformLogsSettings */ platformLogsSettings?: (google.pubsub.v1.IPlatformLogsSettings|null); } @@ -482,11 +491,20 @@ export namespace google { /** IngestionDataSourceSettings cloudStorage. */ public cloudStorage?: (google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage|null); + /** IngestionDataSourceSettings azureEventHubs. */ + public azureEventHubs?: (google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs|null); + + /** IngestionDataSourceSettings awsMsk. */ + public awsMsk?: (google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk|null); + + /** IngestionDataSourceSettings confluentCloud. */ + public confluentCloud?: (google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud|null); + /** IngestionDataSourceSettings platformLogsSettings. */ public platformLogsSettings?: (google.pubsub.v1.IPlatformLogsSettings|null); /** IngestionDataSourceSettings source. */ - public source?: ("awsKinesis"|"cloudStorage"); + public source?: ("awsKinesis"|"cloudStorage"|"azureEventHubs"|"awsMsk"|"confluentCloud"); /** * Creates a new IngestionDataSourceSettings instance using the specified properties. @@ -1129,6 +1147,435 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } } + + /** Properties of an AzureEventHubs. */ + interface IAzureEventHubs { + + /** AzureEventHubs state */ + state?: (google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State|null); + + /** AzureEventHubs resourceGroup */ + resourceGroup?: (string|null); + + /** AzureEventHubs namespace */ + namespace?: (string|null); + + /** AzureEventHubs eventHub */ + eventHub?: (string|null); + + /** AzureEventHubs clientId */ + clientId?: (string|null); + + /** AzureEventHubs tenantId */ + tenantId?: (string|null); + + /** AzureEventHubs subscriptionId */ + subscriptionId?: (string|null); + + /** AzureEventHubs gcpServiceAccount */ + gcpServiceAccount?: (string|null); + } + + /** Represents an AzureEventHubs. */ + class AzureEventHubs implements IAzureEventHubs { + + /** + * Constructs a new AzureEventHubs. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs); + + /** AzureEventHubs state. */ + public state: (google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State); + + /** AzureEventHubs resourceGroup. */ + public resourceGroup: string; + + /** AzureEventHubs namespace. */ + public namespace: string; + + /** AzureEventHubs eventHub. */ + public eventHub: string; + + /** AzureEventHubs clientId. */ + public clientId: string; + + /** AzureEventHubs tenantId. */ + public tenantId: string; + + /** AzureEventHubs subscriptionId. */ + public subscriptionId: string; + + /** AzureEventHubs gcpServiceAccount. */ + public gcpServiceAccount: string; + + /** + * Creates a new AzureEventHubs instance using the specified properties. + * @param [properties] Properties to set + * @returns AzureEventHubs instance + */ + public static create(properties?: google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs): google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs; + + /** + * Encodes the specified AzureEventHubs message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.verify|verify} messages. + * @param message AzureEventHubs message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AzureEventHubs message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.verify|verify} messages. + * @param message AzureEventHubs message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AzureEventHubs message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AzureEventHubs + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs; + + /** + * Decodes an AzureEventHubs message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AzureEventHubs + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs; + + /** + * Verifies an AzureEventHubs message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AzureEventHubs message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AzureEventHubs + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs; + + /** + * Creates a plain object from an AzureEventHubs message. Also converts values to other types if specified. + * @param message AzureEventHubs + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AzureEventHubs to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AzureEventHubs + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace AzureEventHubs { + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + EVENT_HUBS_PERMISSION_DENIED = 2, + PUBLISH_PERMISSION_DENIED = 3, + NAMESPACE_NOT_FOUND = 4, + EVENT_HUB_NOT_FOUND = 5, + SUBSCRIPTION_NOT_FOUND = 6, + RESOURCE_GROUP_NOT_FOUND = 7 + } + } + + /** Properties of an AwsMsk. */ + interface IAwsMsk { + + /** AwsMsk state */ + state?: (google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State|null); + + /** AwsMsk clusterArn */ + clusterArn?: (string|null); + + /** AwsMsk topic */ + topic?: (string|null); + + /** AwsMsk awsRoleArn */ + awsRoleArn?: (string|null); + + /** AwsMsk gcpServiceAccount */ + gcpServiceAccount?: (string|null); + } + + /** Represents an AwsMsk. */ + class AwsMsk implements IAwsMsk { + + /** + * Constructs a new AwsMsk. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk); + + /** AwsMsk state. */ + public state: (google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State); + + /** AwsMsk clusterArn. */ + public clusterArn: string; + + /** AwsMsk topic. */ + public topic: string; + + /** AwsMsk awsRoleArn. */ + public awsRoleArn: string; + + /** AwsMsk gcpServiceAccount. */ + public gcpServiceAccount: string; + + /** + * Creates a new AwsMsk instance using the specified properties. + * @param [properties] Properties to set + * @returns AwsMsk instance + */ + public static create(properties?: google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk): google.pubsub.v1.IngestionDataSourceSettings.AwsMsk; + + /** + * Encodes the specified AwsMsk message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.verify|verify} messages. + * @param message AwsMsk message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AwsMsk message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.verify|verify} messages. + * @param message AwsMsk message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AwsMsk message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AwsMsk + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings.AwsMsk; + + /** + * Decodes an AwsMsk message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AwsMsk + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings.AwsMsk; + + /** + * Verifies an AwsMsk message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AwsMsk message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AwsMsk + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings.AwsMsk; + + /** + * Creates a plain object from an AwsMsk message. Also converts values to other types if specified. + * @param message AwsMsk + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings.AwsMsk, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AwsMsk to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AwsMsk + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace AwsMsk { + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + MSK_PERMISSION_DENIED = 2, + PUBLISH_PERMISSION_DENIED = 3, + CLUSTER_NOT_FOUND = 4, + TOPIC_NOT_FOUND = 5 + } + } + + /** Properties of a ConfluentCloud. */ + interface IConfluentCloud { + + /** ConfluentCloud state */ + state?: (google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State|null); + + /** ConfluentCloud bootstrapServer */ + bootstrapServer?: (string|null); + + /** ConfluentCloud clusterId */ + clusterId?: (string|null); + + /** ConfluentCloud topic */ + topic?: (string|null); + + /** ConfluentCloud identityPoolId */ + identityPoolId?: (string|null); + + /** ConfluentCloud gcpServiceAccount */ + gcpServiceAccount?: (string|null); + } + + /** Represents a ConfluentCloud. */ + class ConfluentCloud implements IConfluentCloud { + + /** + * Constructs a new ConfluentCloud. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud); + + /** ConfluentCloud state. */ + public state: (google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State|keyof typeof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State); + + /** ConfluentCloud bootstrapServer. */ + public bootstrapServer: string; + + /** ConfluentCloud clusterId. */ + public clusterId: string; + + /** ConfluentCloud topic. */ + public topic: string; + + /** ConfluentCloud identityPoolId. */ + public identityPoolId: string; + + /** ConfluentCloud gcpServiceAccount. */ + public gcpServiceAccount: string; + + /** + * Creates a new ConfluentCloud instance using the specified properties. + * @param [properties] Properties to set + * @returns ConfluentCloud instance + */ + public static create(properties?: google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud): google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud; + + /** + * Encodes the specified ConfluentCloud message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.verify|verify} messages. + * @param message ConfluentCloud message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ConfluentCloud message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.verify|verify} messages. + * @param message ConfluentCloud message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ConfluentCloud message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ConfluentCloud + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud; + + /** + * Decodes a ConfluentCloud message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ConfluentCloud + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud; + + /** + * Verifies a ConfluentCloud message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ConfluentCloud message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ConfluentCloud + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud; + + /** + * Creates a plain object from a ConfluentCloud message. Also converts values to other types if specified. + * @param message ConfluentCloud + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ConfluentCloud to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ConfluentCloud + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace ConfluentCloud { + + /** State enum. */ + enum State { + STATE_UNSPECIFIED = 0, + ACTIVE = 1, + CONFLUENT_CLOUD_PERMISSION_DENIED = 2, + PUBLISH_PERMISSION_DENIED = 3, + UNREACHABLE_BOOTSTRAP_SERVER = 4, + CLUSTER_NOT_FOUND = 5, + TOPIC_NOT_FOUND = 6 + } + } } /** Properties of a PlatformLogsSettings. */ @@ -1252,6 +1699,15 @@ export namespace google { /** IngestionFailureEvent cloudStorageFailure */ cloudStorageFailure?: (google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null); + + /** IngestionFailureEvent awsMskFailure */ + awsMskFailure?: (google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason|null); + + /** IngestionFailureEvent azureEventHubsFailure */ + azureEventHubsFailure?: (google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason|null); + + /** IngestionFailureEvent confluentCloudFailure */ + confluentCloudFailure?: (google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason|null); } /** Represents an IngestionFailureEvent. */ @@ -1272,8 +1728,17 @@ export namespace google { /** IngestionFailureEvent cloudStorageFailure. */ public cloudStorageFailure?: (google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null); + /** IngestionFailureEvent awsMskFailure. */ + public awsMskFailure?: (google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason|null); + + /** IngestionFailureEvent azureEventHubsFailure. */ + public azureEventHubsFailure?: (google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason|null); + + /** IngestionFailureEvent confluentCloudFailure. */ + public confluentCloudFailure?: (google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason|null); + /** IngestionFailureEvent failure. */ - public failure?: "cloudStorageFailure"; + public failure?: ("cloudStorageFailure"|"awsMskFailure"|"azureEventHubsFailure"|"confluentCloudFailure"); /** * Creates a new IngestionFailureEvent instance using the specified properties. @@ -1660,6 +2125,378 @@ export namespace google { */ public static getTypeUrl(typeUrlPrefix?: string): string; } + + /** Properties of an AwsMskFailureReason. */ + interface IAwsMskFailureReason { + + /** AwsMskFailureReason clusterArn */ + clusterArn?: (string|null); + + /** AwsMskFailureReason kafkaTopic */ + kafkaTopic?: (string|null); + + /** AwsMskFailureReason partitionId */ + partitionId?: (number|Long|string|null); + + /** AwsMskFailureReason offset */ + offset?: (number|Long|string|null); + + /** AwsMskFailureReason apiViolationReason */ + apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + } + + /** Represents an AwsMskFailureReason. */ + class AwsMskFailureReason implements IAwsMskFailureReason { + + /** + * Constructs a new AwsMskFailureReason. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason); + + /** AwsMskFailureReason clusterArn. */ + public clusterArn: string; + + /** AwsMskFailureReason kafkaTopic. */ + public kafkaTopic: string; + + /** AwsMskFailureReason partitionId. */ + public partitionId: (number|Long|string); + + /** AwsMskFailureReason offset. */ + public offset: (number|Long|string); + + /** AwsMskFailureReason apiViolationReason. */ + public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + + /** AwsMskFailureReason reason. */ + public reason?: "apiViolationReason"; + + /** + * Creates a new AwsMskFailureReason instance using the specified properties. + * @param [properties] Properties to set + * @returns AwsMskFailureReason instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason): google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason; + + /** + * Encodes the specified AwsMskFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.verify|verify} messages. + * @param message AwsMskFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AwsMskFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.verify|verify} messages. + * @param message AwsMskFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AwsMskFailureReason message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AwsMskFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason; + + /** + * Decodes an AwsMskFailureReason message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AwsMskFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason; + + /** + * Verifies an AwsMskFailureReason message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AwsMskFailureReason message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AwsMskFailureReason + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason; + + /** + * Creates a plain object from an AwsMskFailureReason message. Also converts values to other types if specified. + * @param message AwsMskFailureReason + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AwsMskFailureReason to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AwsMskFailureReason + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of an AzureEventHubsFailureReason. */ + interface IAzureEventHubsFailureReason { + + /** AzureEventHubsFailureReason namespace */ + namespace?: (string|null); + + /** AzureEventHubsFailureReason eventHub */ + eventHub?: (string|null); + + /** AzureEventHubsFailureReason partitionId */ + partitionId?: (number|Long|string|null); + + /** AzureEventHubsFailureReason offset */ + offset?: (number|Long|string|null); + + /** AzureEventHubsFailureReason apiViolationReason */ + apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + } + + /** Represents an AzureEventHubsFailureReason. */ + class AzureEventHubsFailureReason implements IAzureEventHubsFailureReason { + + /** + * Constructs a new AzureEventHubsFailureReason. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason); + + /** AzureEventHubsFailureReason namespace. */ + public namespace: string; + + /** AzureEventHubsFailureReason eventHub. */ + public eventHub: string; + + /** AzureEventHubsFailureReason partitionId. */ + public partitionId: (number|Long|string); + + /** AzureEventHubsFailureReason offset. */ + public offset: (number|Long|string); + + /** AzureEventHubsFailureReason apiViolationReason. */ + public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + + /** AzureEventHubsFailureReason reason. */ + public reason?: "apiViolationReason"; + + /** + * Creates a new AzureEventHubsFailureReason instance using the specified properties. + * @param [properties] Properties to set + * @returns AzureEventHubsFailureReason instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason): google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason; + + /** + * Encodes the specified AzureEventHubsFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.verify|verify} messages. + * @param message AzureEventHubsFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AzureEventHubsFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.verify|verify} messages. + * @param message AzureEventHubsFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AzureEventHubsFailureReason message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AzureEventHubsFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason; + + /** + * Decodes an AzureEventHubsFailureReason message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AzureEventHubsFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason; + + /** + * Verifies an AzureEventHubsFailureReason message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AzureEventHubsFailureReason message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AzureEventHubsFailureReason + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason; + + /** + * Creates a plain object from an AzureEventHubsFailureReason message. Also converts values to other types if specified. + * @param message AzureEventHubsFailureReason + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AzureEventHubsFailureReason to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AzureEventHubsFailureReason + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a ConfluentCloudFailureReason. */ + interface IConfluentCloudFailureReason { + + /** ConfluentCloudFailureReason clusterId */ + clusterId?: (string|null); + + /** ConfluentCloudFailureReason kafkaTopic */ + kafkaTopic?: (string|null); + + /** ConfluentCloudFailureReason partitionId */ + partitionId?: (number|Long|string|null); + + /** ConfluentCloudFailureReason offset */ + offset?: (number|Long|string|null); + + /** ConfluentCloudFailureReason apiViolationReason */ + apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + } + + /** Represents a ConfluentCloudFailureReason. */ + class ConfluentCloudFailureReason implements IConfluentCloudFailureReason { + + /** + * Constructs a new ConfluentCloudFailureReason. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason); + + /** ConfluentCloudFailureReason clusterId. */ + public clusterId: string; + + /** ConfluentCloudFailureReason kafkaTopic. */ + public kafkaTopic: string; + + /** ConfluentCloudFailureReason partitionId. */ + public partitionId: (number|Long|string); + + /** ConfluentCloudFailureReason offset. */ + public offset: (number|Long|string); + + /** ConfluentCloudFailureReason apiViolationReason. */ + public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + + /** ConfluentCloudFailureReason reason. */ + public reason?: "apiViolationReason"; + + /** + * Creates a new ConfluentCloudFailureReason instance using the specified properties. + * @param [properties] Properties to set + * @returns ConfluentCloudFailureReason instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason): google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason; + + /** + * Encodes the specified ConfluentCloudFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.verify|verify} messages. + * @param message ConfluentCloudFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ConfluentCloudFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.verify|verify} messages. + * @param message ConfluentCloudFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a ConfluentCloudFailureReason message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ConfluentCloudFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason; + + /** + * Decodes a ConfluentCloudFailureReason message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ConfluentCloudFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason; + + /** + * Verifies a ConfluentCloudFailureReason message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a ConfluentCloudFailureReason message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ConfluentCloudFailureReason + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason; + + /** + * Creates a plain object from a ConfluentCloudFailureReason message. Also converts values to other types if specified. + * @param message ConfluentCloudFailureReason + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ConfluentCloudFailureReason to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ConfluentCloudFailureReason + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } } /** Properties of a Topic. */ diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 590cfac5bde..bc3604fdbac 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -937,6 +937,9 @@ * @interface IIngestionDataSourceSettings * @property {google.pubsub.v1.IngestionDataSourceSettings.IAwsKinesis|null} [awsKinesis] IngestionDataSourceSettings awsKinesis * @property {google.pubsub.v1.IngestionDataSourceSettings.ICloudStorage|null} [cloudStorage] IngestionDataSourceSettings cloudStorage + * @property {google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs|null} [azureEventHubs] IngestionDataSourceSettings azureEventHubs + * @property {google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk|null} [awsMsk] IngestionDataSourceSettings awsMsk + * @property {google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud|null} [confluentCloud] IngestionDataSourceSettings confluentCloud * @property {google.pubsub.v1.IPlatformLogsSettings|null} [platformLogsSettings] IngestionDataSourceSettings platformLogsSettings */ @@ -971,6 +974,30 @@ */ IngestionDataSourceSettings.prototype.cloudStorage = null; + /** + * IngestionDataSourceSettings azureEventHubs. + * @member {google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs|null|undefined} azureEventHubs + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @instance + */ + IngestionDataSourceSettings.prototype.azureEventHubs = null; + + /** + * IngestionDataSourceSettings awsMsk. + * @member {google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk|null|undefined} awsMsk + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @instance + */ + IngestionDataSourceSettings.prototype.awsMsk = null; + + /** + * IngestionDataSourceSettings confluentCloud. + * @member {google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud|null|undefined} confluentCloud + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @instance + */ + IngestionDataSourceSettings.prototype.confluentCloud = null; + /** * IngestionDataSourceSettings platformLogsSettings. * @member {google.pubsub.v1.IPlatformLogsSettings|null|undefined} platformLogsSettings @@ -984,12 +1011,12 @@ /** * IngestionDataSourceSettings source. - * @member {"awsKinesis"|"cloudStorage"|undefined} source + * @member {"awsKinesis"|"cloudStorage"|"azureEventHubs"|"awsMsk"|"confluentCloud"|undefined} source * @memberof google.pubsub.v1.IngestionDataSourceSettings * @instance */ Object.defineProperty(IngestionDataSourceSettings.prototype, "source", { - get: $util.oneOfGetter($oneOfFields = ["awsKinesis", "cloudStorage"]), + get: $util.oneOfGetter($oneOfFields = ["awsKinesis", "cloudStorage", "azureEventHubs", "awsMsk", "confluentCloud"]), set: $util.oneOfSetter($oneOfFields) }); @@ -1021,8 +1048,14 @@ $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.encode(message.awsKinesis, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); if (message.cloudStorage != null && Object.hasOwnProperty.call(message, "cloudStorage")) $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.encode(message.cloudStorage, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.azureEventHubs != null && Object.hasOwnProperty.call(message, "azureEventHubs")) + $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.encode(message.azureEventHubs, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); if (message.platformLogsSettings != null && Object.hasOwnProperty.call(message, "platformLogsSettings")) $root.google.pubsub.v1.PlatformLogsSettings.encode(message.platformLogsSettings, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.awsMsk != null && Object.hasOwnProperty.call(message, "awsMsk")) + $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.encode(message.awsMsk, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.confluentCloud != null && Object.hasOwnProperty.call(message, "confluentCloud")) + $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.encode(message.confluentCloud, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); return writer; }; @@ -1065,6 +1098,18 @@ message.cloudStorage = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.decode(reader, reader.uint32()); break; } + case 3: { + message.azureEventHubs = $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.decode(reader, reader.uint32()); + break; + } + case 5: { + message.awsMsk = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.decode(reader, reader.uint32()); + break; + } + case 6: { + message.confluentCloud = $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.decode(reader, reader.uint32()); + break; + } case 4: { message.platformLogsSettings = $root.google.pubsub.v1.PlatformLogsSettings.decode(reader, reader.uint32()); break; @@ -1123,6 +1168,36 @@ return "cloudStorage." + error; } } + if (message.azureEventHubs != null && message.hasOwnProperty("azureEventHubs")) { + if (properties.source === 1) + return "source: multiple values"; + properties.source = 1; + { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.verify(message.azureEventHubs); + if (error) + return "azureEventHubs." + error; + } + } + if (message.awsMsk != null && message.hasOwnProperty("awsMsk")) { + if (properties.source === 1) + return "source: multiple values"; + properties.source = 1; + { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.verify(message.awsMsk); + if (error) + return "awsMsk." + error; + } + } + if (message.confluentCloud != null && message.hasOwnProperty("confluentCloud")) { + if (properties.source === 1) + return "source: multiple values"; + properties.source = 1; + { + var error = $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.verify(message.confluentCloud); + if (error) + return "confluentCloud." + error; + } + } if (message.platformLogsSettings != null && message.hasOwnProperty("platformLogsSettings")) { var error = $root.google.pubsub.v1.PlatformLogsSettings.verify(message.platformLogsSettings); if (error) @@ -1153,6 +1228,21 @@ throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.cloudStorage: object expected"); message.cloudStorage = $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.fromObject(object.cloudStorage); } + if (object.azureEventHubs != null) { + if (typeof object.azureEventHubs !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.azureEventHubs: object expected"); + message.azureEventHubs = $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.fromObject(object.azureEventHubs); + } + if (object.awsMsk != null) { + if (typeof object.awsMsk !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.awsMsk: object expected"); + message.awsMsk = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.fromObject(object.awsMsk); + } + if (object.confluentCloud != null) { + if (typeof object.confluentCloud !== "object") + throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.confluentCloud: object expected"); + message.confluentCloud = $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.fromObject(object.confluentCloud); + } if (object.platformLogsSettings != null) { if (typeof object.platformLogsSettings !== "object") throw TypeError(".google.pubsub.v1.IngestionDataSourceSettings.platformLogsSettings: object expected"); @@ -1186,8 +1276,23 @@ if (options.oneofs) object.source = "cloudStorage"; } + if (message.azureEventHubs != null && message.hasOwnProperty("azureEventHubs")) { + object.azureEventHubs = $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.toObject(message.azureEventHubs, options); + if (options.oneofs) + object.source = "azureEventHubs"; + } if (message.platformLogsSettings != null && message.hasOwnProperty("platformLogsSettings")) object.platformLogsSettings = $root.google.pubsub.v1.PlatformLogsSettings.toObject(message.platformLogsSettings, options); + if (message.awsMsk != null && message.hasOwnProperty("awsMsk")) { + object.awsMsk = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.toObject(message.awsMsk, options); + if (options.oneofs) + object.source = "awsMsk"; + } + if (message.confluentCloud != null && message.hasOwnProperty("confluentCloud")) { + object.confluentCloud = $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.toObject(message.confluentCloud, options); + if (options.oneofs) + object.source = "confluentCloud"; + } return object; }; @@ -2597,182 +2702,1366 @@ return CloudStorage; })(); - return IngestionDataSourceSettings; - })(); + IngestionDataSourceSettings.AzureEventHubs = (function() { - v1.PlatformLogsSettings = (function() { + /** + * Properties of an AzureEventHubs. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @interface IAzureEventHubs + * @property {google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State|null} [state] AzureEventHubs state + * @property {string|null} [resourceGroup] AzureEventHubs resourceGroup + * @property {string|null} [namespace] AzureEventHubs namespace + * @property {string|null} [eventHub] AzureEventHubs eventHub + * @property {string|null} [clientId] AzureEventHubs clientId + * @property {string|null} [tenantId] AzureEventHubs tenantId + * @property {string|null} [subscriptionId] AzureEventHubs subscriptionId + * @property {string|null} [gcpServiceAccount] AzureEventHubs gcpServiceAccount + */ - /** - * Properties of a PlatformLogsSettings. - * @memberof google.pubsub.v1 - * @interface IPlatformLogsSettings - * @property {google.pubsub.v1.PlatformLogsSettings.Severity|null} [severity] PlatformLogsSettings severity - */ + /** + * Constructs a new AzureEventHubs. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @classdesc Represents an AzureEventHubs. + * @implements IAzureEventHubs + * @constructor + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs=} [properties] Properties to set + */ + function AzureEventHubs(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new PlatformLogsSettings. - * @memberof google.pubsub.v1 - * @classdesc Represents a PlatformLogsSettings. - * @implements IPlatformLogsSettings - * @constructor - * @param {google.pubsub.v1.IPlatformLogsSettings=} [properties] Properties to set - */ - function PlatformLogsSettings(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * AzureEventHubs state. + * @member {google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State} state + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + */ + AzureEventHubs.prototype.state = 0; - /** - * PlatformLogsSettings severity. - * @member {google.pubsub.v1.PlatformLogsSettings.Severity} severity - * @memberof google.pubsub.v1.PlatformLogsSettings - * @instance - */ - PlatformLogsSettings.prototype.severity = 0; + /** + * AzureEventHubs resourceGroup. + * @member {string} resourceGroup + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + */ + AzureEventHubs.prototype.resourceGroup = ""; - /** - * Creates a new PlatformLogsSettings instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {google.pubsub.v1.IPlatformLogsSettings=} [properties] Properties to set - * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings instance - */ - PlatformLogsSettings.create = function create(properties) { - return new PlatformLogsSettings(properties); - }; + /** + * AzureEventHubs namespace. + * @member {string} namespace + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + */ + AzureEventHubs.prototype.namespace = ""; - /** - * Encodes the specified PlatformLogsSettings message. Does not implicitly {@link google.pubsub.v1.PlatformLogsSettings.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {google.pubsub.v1.IPlatformLogsSettings} message PlatformLogsSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PlatformLogsSettings.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.severity != null && Object.hasOwnProperty.call(message, "severity")) - writer.uint32(/* id 1, wireType 0 =*/8).int32(message.severity); - return writer; - }; + /** + * AzureEventHubs eventHub. + * @member {string} eventHub + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + */ + AzureEventHubs.prototype.eventHub = ""; - /** - * Encodes the specified PlatformLogsSettings message, length delimited. Does not implicitly {@link google.pubsub.v1.PlatformLogsSettings.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {google.pubsub.v1.IPlatformLogsSettings} message PlatformLogsSettings message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - PlatformLogsSettings.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * AzureEventHubs clientId. + * @member {string} clientId + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + */ + AzureEventHubs.prototype.clientId = ""; - /** - * Decodes a PlatformLogsSettings message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PlatformLogsSettings.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PlatformLogsSettings(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.severity = reader.int32(); - break; - } - default: - reader.skipType(tag & 7); - break; - } - } - return message; - }; + /** + * AzureEventHubs tenantId. + * @member {string} tenantId + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + */ + AzureEventHubs.prototype.tenantId = ""; - /** - * Decodes a PlatformLogsSettings message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - PlatformLogsSettings.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + /** + * AzureEventHubs subscriptionId. + * @member {string} subscriptionId + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + */ + AzureEventHubs.prototype.subscriptionId = ""; - /** - * Verifies a PlatformLogsSettings message. - * @function verify - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - PlatformLogsSettings.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - if (message.severity != null && message.hasOwnProperty("severity")) - switch (message.severity) { - default: - return "severity: enum value expected"; - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - break; - } - return null; - }; + /** + * AzureEventHubs gcpServiceAccount. + * @member {string} gcpServiceAccount + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + */ + AzureEventHubs.prototype.gcpServiceAccount = ""; - /** - * Creates a PlatformLogsSettings message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings - */ - PlatformLogsSettings.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.PlatformLogsSettings) - return object; - var message = new $root.google.pubsub.v1.PlatformLogsSettings(); - switch (object.severity) { - default: - if (typeof object.severity === "number") { - message.severity = object.severity; - break; - } - break; - case "SEVERITY_UNSPECIFIED": - case 0: - message.severity = 0; - break; - case "DISABLED": - case 1: - message.severity = 1; - break; + /** + * Creates a new AzureEventHubs instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs} AzureEventHubs instance + */ + AzureEventHubs.create = function create(properties) { + return new AzureEventHubs(properties); + }; + + /** + * Encodes the specified AzureEventHubs message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs} message AzureEventHubs message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AzureEventHubs.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.state); + if (message.resourceGroup != null && Object.hasOwnProperty.call(message, "resourceGroup")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.resourceGroup); + if (message.namespace != null && Object.hasOwnProperty.call(message, "namespace")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.namespace); + if (message.eventHub != null && Object.hasOwnProperty.call(message, "eventHub")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.eventHub); + if (message.clientId != null && Object.hasOwnProperty.call(message, "clientId")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.clientId); + if (message.tenantId != null && Object.hasOwnProperty.call(message, "tenantId")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.tenantId); + if (message.subscriptionId != null && Object.hasOwnProperty.call(message, "subscriptionId")) + writer.uint32(/* id 7, wireType 2 =*/58).string(message.subscriptionId); + if (message.gcpServiceAccount != null && Object.hasOwnProperty.call(message, "gcpServiceAccount")) + writer.uint32(/* id 8, wireType 2 =*/66).string(message.gcpServiceAccount); + return writer; + }; + + /** + * Encodes the specified AzureEventHubs message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAzureEventHubs} message AzureEventHubs message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AzureEventHubs.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AzureEventHubs message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs} AzureEventHubs + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AzureEventHubs.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.state = reader.int32(); + break; + } + case 2: { + message.resourceGroup = reader.string(); + break; + } + case 3: { + message.namespace = reader.string(); + break; + } + case 4: { + message.eventHub = reader.string(); + break; + } + case 5: { + message.clientId = reader.string(); + break; + } + case 6: { + message.tenantId = reader.string(); + break; + } + case 7: { + message.subscriptionId = reader.string(); + break; + } + case 8: { + message.gcpServiceAccount = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AzureEventHubs message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs} AzureEventHubs + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AzureEventHubs.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AzureEventHubs message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AzureEventHubs.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + break; + } + if (message.resourceGroup != null && message.hasOwnProperty("resourceGroup")) + if (!$util.isString(message.resourceGroup)) + return "resourceGroup: string expected"; + if (message.namespace != null && message.hasOwnProperty("namespace")) + if (!$util.isString(message.namespace)) + return "namespace: string expected"; + if (message.eventHub != null && message.hasOwnProperty("eventHub")) + if (!$util.isString(message.eventHub)) + return "eventHub: string expected"; + if (message.clientId != null && message.hasOwnProperty("clientId")) + if (!$util.isString(message.clientId)) + return "clientId: string expected"; + if (message.tenantId != null && message.hasOwnProperty("tenantId")) + if (!$util.isString(message.tenantId)) + return "tenantId: string expected"; + if (message.subscriptionId != null && message.hasOwnProperty("subscriptionId")) + if (!$util.isString(message.subscriptionId)) + return "subscriptionId: string expected"; + if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) + if (!$util.isString(message.gcpServiceAccount)) + return "gcpServiceAccount: string expected"; + return null; + }; + + /** + * Creates an AzureEventHubs message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs} AzureEventHubs + */ + AzureEventHubs.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs) + return object; + var message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs(); + switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "EVENT_HUBS_PERMISSION_DENIED": + case 2: + message.state = 2; + break; + case "PUBLISH_PERMISSION_DENIED": + case 3: + message.state = 3; + break; + case "NAMESPACE_NOT_FOUND": + case 4: + message.state = 4; + break; + case "EVENT_HUB_NOT_FOUND": + case 5: + message.state = 5; + break; + case "SUBSCRIPTION_NOT_FOUND": + case 6: + message.state = 6; + break; + case "RESOURCE_GROUP_NOT_FOUND": + case 7: + message.state = 7; + break; + } + if (object.resourceGroup != null) + message.resourceGroup = String(object.resourceGroup); + if (object.namespace != null) + message.namespace = String(object.namespace); + if (object.eventHub != null) + message.eventHub = String(object.eventHub); + if (object.clientId != null) + message.clientId = String(object.clientId); + if (object.tenantId != null) + message.tenantId = String(object.tenantId); + if (object.subscriptionId != null) + message.subscriptionId = String(object.subscriptionId); + if (object.gcpServiceAccount != null) + message.gcpServiceAccount = String(object.gcpServiceAccount); + return message; + }; + + /** + * Creates a plain object from an AzureEventHubs message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs} message AzureEventHubs + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AzureEventHubs.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.resourceGroup = ""; + object.namespace = ""; + object.eventHub = ""; + object.clientId = ""; + object.tenantId = ""; + object.subscriptionId = ""; + object.gcpServiceAccount = ""; + } + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State[message.state] : message.state; + if (message.resourceGroup != null && message.hasOwnProperty("resourceGroup")) + object.resourceGroup = message.resourceGroup; + if (message.namespace != null && message.hasOwnProperty("namespace")) + object.namespace = message.namespace; + if (message.eventHub != null && message.hasOwnProperty("eventHub")) + object.eventHub = message.eventHub; + if (message.clientId != null && message.hasOwnProperty("clientId")) + object.clientId = message.clientId; + if (message.tenantId != null && message.hasOwnProperty("tenantId")) + object.tenantId = message.tenantId; + if (message.subscriptionId != null && message.hasOwnProperty("subscriptionId")) + object.subscriptionId = message.subscriptionId; + if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) + object.gcpServiceAccount = message.gcpServiceAccount; + return object; + }; + + /** + * Converts this AzureEventHubs to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @instance + * @returns {Object.} JSON object + */ + AzureEventHubs.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AzureEventHubs + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AzureEventHubs.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs"; + }; + + /** + * State enum. + * @name google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} EVENT_HUBS_PERMISSION_DENIED=2 EVENT_HUBS_PERMISSION_DENIED value + * @property {number} PUBLISH_PERMISSION_DENIED=3 PUBLISH_PERMISSION_DENIED value + * @property {number} NAMESPACE_NOT_FOUND=4 NAMESPACE_NOT_FOUND value + * @property {number} EVENT_HUB_NOT_FOUND=5 EVENT_HUB_NOT_FOUND value + * @property {number} SUBSCRIPTION_NOT_FOUND=6 SUBSCRIPTION_NOT_FOUND value + * @property {number} RESOURCE_GROUP_NOT_FOUND=7 RESOURCE_GROUP_NOT_FOUND value + */ + AzureEventHubs.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "EVENT_HUBS_PERMISSION_DENIED"] = 2; + values[valuesById[3] = "PUBLISH_PERMISSION_DENIED"] = 3; + values[valuesById[4] = "NAMESPACE_NOT_FOUND"] = 4; + values[valuesById[5] = "EVENT_HUB_NOT_FOUND"] = 5; + values[valuesById[6] = "SUBSCRIPTION_NOT_FOUND"] = 6; + values[valuesById[7] = "RESOURCE_GROUP_NOT_FOUND"] = 7; + return values; + })(); + + return AzureEventHubs; + })(); + + IngestionDataSourceSettings.AwsMsk = (function() { + + /** + * Properties of an AwsMsk. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @interface IAwsMsk + * @property {google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State|null} [state] AwsMsk state + * @property {string|null} [clusterArn] AwsMsk clusterArn + * @property {string|null} [topic] AwsMsk topic + * @property {string|null} [awsRoleArn] AwsMsk awsRoleArn + * @property {string|null} [gcpServiceAccount] AwsMsk gcpServiceAccount + */ + + /** + * Constructs a new AwsMsk. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @classdesc Represents an AwsMsk. + * @implements IAwsMsk + * @constructor + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk=} [properties] Properties to set + */ + function AwsMsk(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * AwsMsk state. + * @member {google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State} state + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @instance + */ + AwsMsk.prototype.state = 0; + + /** + * AwsMsk clusterArn. + * @member {string} clusterArn + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @instance + */ + AwsMsk.prototype.clusterArn = ""; + + /** + * AwsMsk topic. + * @member {string} topic + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @instance + */ + AwsMsk.prototype.topic = ""; + + /** + * AwsMsk awsRoleArn. + * @member {string} awsRoleArn + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @instance + */ + AwsMsk.prototype.awsRoleArn = ""; + + /** + * AwsMsk gcpServiceAccount. + * @member {string} gcpServiceAccount + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @instance + */ + AwsMsk.prototype.gcpServiceAccount = ""; + + /** + * Creates a new AwsMsk instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AwsMsk} AwsMsk instance + */ + AwsMsk.create = function create(properties) { + return new AwsMsk(properties); + }; + + /** + * Encodes the specified AwsMsk message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk} message AwsMsk message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AwsMsk.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.state); + if (message.clusterArn != null && Object.hasOwnProperty.call(message, "clusterArn")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.clusterArn); + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.topic); + if (message.awsRoleArn != null && Object.hasOwnProperty.call(message, "awsRoleArn")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.awsRoleArn); + if (message.gcpServiceAccount != null && Object.hasOwnProperty.call(message, "gcpServiceAccount")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.gcpServiceAccount); + return writer; + }; + + /** + * Encodes the specified AwsMsk message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IAwsMsk} message AwsMsk message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AwsMsk.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AwsMsk message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AwsMsk} AwsMsk + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AwsMsk.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.state = reader.int32(); + break; + } + case 2: { + message.clusterArn = reader.string(); + break; + } + case 3: { + message.topic = reader.string(); + break; + } + case 4: { + message.awsRoleArn = reader.string(); + break; + } + case 5: { + message.gcpServiceAccount = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AwsMsk message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AwsMsk} AwsMsk + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AwsMsk.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AwsMsk message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AwsMsk.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + if (message.clusterArn != null && message.hasOwnProperty("clusterArn")) + if (!$util.isString(message.clusterArn)) + return "clusterArn: string expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.awsRoleArn != null && message.hasOwnProperty("awsRoleArn")) + if (!$util.isString(message.awsRoleArn)) + return "awsRoleArn: string expected"; + if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) + if (!$util.isString(message.gcpServiceAccount)) + return "gcpServiceAccount: string expected"; + return null; + }; + + /** + * Creates an AwsMsk message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings.AwsMsk} AwsMsk + */ + AwsMsk.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk) + return object; + var message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk(); + switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "MSK_PERMISSION_DENIED": + case 2: + message.state = 2; + break; + case "PUBLISH_PERMISSION_DENIED": + case 3: + message.state = 3; + break; + case "CLUSTER_NOT_FOUND": + case 4: + message.state = 4; + break; + case "TOPIC_NOT_FOUND": + case 5: + message.state = 5; + break; + } + if (object.clusterArn != null) + message.clusterArn = String(object.clusterArn); + if (object.topic != null) + message.topic = String(object.topic); + if (object.awsRoleArn != null) + message.awsRoleArn = String(object.awsRoleArn); + if (object.gcpServiceAccount != null) + message.gcpServiceAccount = String(object.gcpServiceAccount); + return message; + }; + + /** + * Creates a plain object from an AwsMsk message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.AwsMsk} message AwsMsk + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AwsMsk.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.clusterArn = ""; + object.topic = ""; + object.awsRoleArn = ""; + object.gcpServiceAccount = ""; + } + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State[message.state] : message.state; + if (message.clusterArn != null && message.hasOwnProperty("clusterArn")) + object.clusterArn = message.clusterArn; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.awsRoleArn != null && message.hasOwnProperty("awsRoleArn")) + object.awsRoleArn = message.awsRoleArn; + if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) + object.gcpServiceAccount = message.gcpServiceAccount; + return object; + }; + + /** + * Converts this AwsMsk to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @instance + * @returns {Object.} JSON object + */ + AwsMsk.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AwsMsk + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.AwsMsk + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AwsMsk.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.AwsMsk"; + }; + + /** + * State enum. + * @name google.pubsub.v1.IngestionDataSourceSettings.AwsMsk.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} MSK_PERMISSION_DENIED=2 MSK_PERMISSION_DENIED value + * @property {number} PUBLISH_PERMISSION_DENIED=3 PUBLISH_PERMISSION_DENIED value + * @property {number} CLUSTER_NOT_FOUND=4 CLUSTER_NOT_FOUND value + * @property {number} TOPIC_NOT_FOUND=5 TOPIC_NOT_FOUND value + */ + AwsMsk.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "MSK_PERMISSION_DENIED"] = 2; + values[valuesById[3] = "PUBLISH_PERMISSION_DENIED"] = 3; + values[valuesById[4] = "CLUSTER_NOT_FOUND"] = 4; + values[valuesById[5] = "TOPIC_NOT_FOUND"] = 5; + return values; + })(); + + return AwsMsk; + })(); + + IngestionDataSourceSettings.ConfluentCloud = (function() { + + /** + * Properties of a ConfluentCloud. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @interface IConfluentCloud + * @property {google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State|null} [state] ConfluentCloud state + * @property {string|null} [bootstrapServer] ConfluentCloud bootstrapServer + * @property {string|null} [clusterId] ConfluentCloud clusterId + * @property {string|null} [topic] ConfluentCloud topic + * @property {string|null} [identityPoolId] ConfluentCloud identityPoolId + * @property {string|null} [gcpServiceAccount] ConfluentCloud gcpServiceAccount + */ + + /** + * Constructs a new ConfluentCloud. + * @memberof google.pubsub.v1.IngestionDataSourceSettings + * @classdesc Represents a ConfluentCloud. + * @implements IConfluentCloud + * @constructor + * @param {google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud=} [properties] Properties to set + */ + function ConfluentCloud(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ConfluentCloud state. + * @member {google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State} state + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @instance + */ + ConfluentCloud.prototype.state = 0; + + /** + * ConfluentCloud bootstrapServer. + * @member {string} bootstrapServer + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @instance + */ + ConfluentCloud.prototype.bootstrapServer = ""; + + /** + * ConfluentCloud clusterId. + * @member {string} clusterId + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @instance + */ + ConfluentCloud.prototype.clusterId = ""; + + /** + * ConfluentCloud topic. + * @member {string} topic + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @instance + */ + ConfluentCloud.prototype.topic = ""; + + /** + * ConfluentCloud identityPoolId. + * @member {string} identityPoolId + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @instance + */ + ConfluentCloud.prototype.identityPoolId = ""; + + /** + * ConfluentCloud gcpServiceAccount. + * @member {string} gcpServiceAccount + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @instance + */ + ConfluentCloud.prototype.gcpServiceAccount = ""; + + /** + * Creates a new ConfluentCloud instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud} ConfluentCloud instance + */ + ConfluentCloud.create = function create(properties) { + return new ConfluentCloud(properties); + }; + + /** + * Encodes the specified ConfluentCloud message. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud} message ConfluentCloud message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ConfluentCloud.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.state != null && Object.hasOwnProperty.call(message, "state")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.state); + if (message.bootstrapServer != null && Object.hasOwnProperty.call(message, "bootstrapServer")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.bootstrapServer); + if (message.clusterId != null && Object.hasOwnProperty.call(message, "clusterId")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.clusterId); + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) + writer.uint32(/* id 4, wireType 2 =*/34).string(message.topic); + if (message.identityPoolId != null && Object.hasOwnProperty.call(message, "identityPoolId")) + writer.uint32(/* id 5, wireType 2 =*/42).string(message.identityPoolId); + if (message.gcpServiceAccount != null && Object.hasOwnProperty.call(message, "gcpServiceAccount")) + writer.uint32(/* id 6, wireType 2 =*/50).string(message.gcpServiceAccount); + return writer; + }; + + /** + * Encodes the specified ConfluentCloud message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.IConfluentCloud} message ConfluentCloud message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ConfluentCloud.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a ConfluentCloud message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud} ConfluentCloud + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ConfluentCloud.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.state = reader.int32(); + break; + } + case 2: { + message.bootstrapServer = reader.string(); + break; + } + case 3: { + message.clusterId = reader.string(); + break; + } + case 4: { + message.topic = reader.string(); + break; + } + case 5: { + message.identityPoolId = reader.string(); + break; + } + case 6: { + message.gcpServiceAccount = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a ConfluentCloud message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud} ConfluentCloud + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ConfluentCloud.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a ConfluentCloud message. + * @function verify + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ConfluentCloud.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.state != null && message.hasOwnProperty("state")) + switch (message.state) { + default: + return "state: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + break; + } + if (message.bootstrapServer != null && message.hasOwnProperty("bootstrapServer")) + if (!$util.isString(message.bootstrapServer)) + return "bootstrapServer: string expected"; + if (message.clusterId != null && message.hasOwnProperty("clusterId")) + if (!$util.isString(message.clusterId)) + return "clusterId: string expected"; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.identityPoolId != null && message.hasOwnProperty("identityPoolId")) + if (!$util.isString(message.identityPoolId)) + return "identityPoolId: string expected"; + if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) + if (!$util.isString(message.gcpServiceAccount)) + return "gcpServiceAccount: string expected"; + return null; + }; + + /** + * Creates a ConfluentCloud message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud} ConfluentCloud + */ + ConfluentCloud.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud) + return object; + var message = new $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud(); + switch (object.state) { + default: + if (typeof object.state === "number") { + message.state = object.state; + break; + } + break; + case "STATE_UNSPECIFIED": + case 0: + message.state = 0; + break; + case "ACTIVE": + case 1: + message.state = 1; + break; + case "CONFLUENT_CLOUD_PERMISSION_DENIED": + case 2: + message.state = 2; + break; + case "PUBLISH_PERMISSION_DENIED": + case 3: + message.state = 3; + break; + case "UNREACHABLE_BOOTSTRAP_SERVER": + case 4: + message.state = 4; + break; + case "CLUSTER_NOT_FOUND": + case 5: + message.state = 5; + break; + case "TOPIC_NOT_FOUND": + case 6: + message.state = 6; + break; + } + if (object.bootstrapServer != null) + message.bootstrapServer = String(object.bootstrapServer); + if (object.clusterId != null) + message.clusterId = String(object.clusterId); + if (object.topic != null) + message.topic = String(object.topic); + if (object.identityPoolId != null) + message.identityPoolId = String(object.identityPoolId); + if (object.gcpServiceAccount != null) + message.gcpServiceAccount = String(object.gcpServiceAccount); + return message; + }; + + /** + * Creates a plain object from a ConfluentCloud message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud} message ConfluentCloud + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ConfluentCloud.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.state = options.enums === String ? "STATE_UNSPECIFIED" : 0; + object.bootstrapServer = ""; + object.clusterId = ""; + object.topic = ""; + object.identityPoolId = ""; + object.gcpServiceAccount = ""; + } + if (message.state != null && message.hasOwnProperty("state")) + object.state = options.enums === String ? $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State[message.state] : message.state; + if (message.bootstrapServer != null && message.hasOwnProperty("bootstrapServer")) + object.bootstrapServer = message.bootstrapServer; + if (message.clusterId != null && message.hasOwnProperty("clusterId")) + object.clusterId = message.clusterId; + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.identityPoolId != null && message.hasOwnProperty("identityPoolId")) + object.identityPoolId = message.identityPoolId; + if (message.gcpServiceAccount != null && message.hasOwnProperty("gcpServiceAccount")) + object.gcpServiceAccount = message.gcpServiceAccount; + return object; + }; + + /** + * Converts this ConfluentCloud to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @instance + * @returns {Object.} JSON object + */ + ConfluentCloud.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for ConfluentCloud + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ConfluentCloud.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud"; + }; + + /** + * State enum. + * @name google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud.State + * @enum {number} + * @property {number} STATE_UNSPECIFIED=0 STATE_UNSPECIFIED value + * @property {number} ACTIVE=1 ACTIVE value + * @property {number} CONFLUENT_CLOUD_PERMISSION_DENIED=2 CONFLUENT_CLOUD_PERMISSION_DENIED value + * @property {number} PUBLISH_PERMISSION_DENIED=3 PUBLISH_PERMISSION_DENIED value + * @property {number} UNREACHABLE_BOOTSTRAP_SERVER=4 UNREACHABLE_BOOTSTRAP_SERVER value + * @property {number} CLUSTER_NOT_FOUND=5 CLUSTER_NOT_FOUND value + * @property {number} TOPIC_NOT_FOUND=6 TOPIC_NOT_FOUND value + */ + ConfluentCloud.State = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "STATE_UNSPECIFIED"] = 0; + values[valuesById[1] = "ACTIVE"] = 1; + values[valuesById[2] = "CONFLUENT_CLOUD_PERMISSION_DENIED"] = 2; + values[valuesById[3] = "PUBLISH_PERMISSION_DENIED"] = 3; + values[valuesById[4] = "UNREACHABLE_BOOTSTRAP_SERVER"] = 4; + values[valuesById[5] = "CLUSTER_NOT_FOUND"] = 5; + values[valuesById[6] = "TOPIC_NOT_FOUND"] = 6; + return values; + })(); + + return ConfluentCloud; + })(); + + return IngestionDataSourceSettings; + })(); + + v1.PlatformLogsSettings = (function() { + + /** + * Properties of a PlatformLogsSettings. + * @memberof google.pubsub.v1 + * @interface IPlatformLogsSettings + * @property {google.pubsub.v1.PlatformLogsSettings.Severity|null} [severity] PlatformLogsSettings severity + */ + + /** + * Constructs a new PlatformLogsSettings. + * @memberof google.pubsub.v1 + * @classdesc Represents a PlatformLogsSettings. + * @implements IPlatformLogsSettings + * @constructor + * @param {google.pubsub.v1.IPlatformLogsSettings=} [properties] Properties to set + */ + function PlatformLogsSettings(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * PlatformLogsSettings severity. + * @member {google.pubsub.v1.PlatformLogsSettings.Severity} severity + * @memberof google.pubsub.v1.PlatformLogsSettings + * @instance + */ + PlatformLogsSettings.prototype.severity = 0; + + /** + * Creates a new PlatformLogsSettings instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {google.pubsub.v1.IPlatformLogsSettings=} [properties] Properties to set + * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings instance + */ + PlatformLogsSettings.create = function create(properties) { + return new PlatformLogsSettings(properties); + }; + + /** + * Encodes the specified PlatformLogsSettings message. Does not implicitly {@link google.pubsub.v1.PlatformLogsSettings.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {google.pubsub.v1.IPlatformLogsSettings} message PlatformLogsSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PlatformLogsSettings.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.severity != null && Object.hasOwnProperty.call(message, "severity")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.severity); + return writer; + }; + + /** + * Encodes the specified PlatformLogsSettings message, length delimited. Does not implicitly {@link google.pubsub.v1.PlatformLogsSettings.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {google.pubsub.v1.IPlatformLogsSettings} message PlatformLogsSettings message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + PlatformLogsSettings.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a PlatformLogsSettings message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PlatformLogsSettings.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PlatformLogsSettings(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.severity = reader.int32(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a PlatformLogsSettings message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + PlatformLogsSettings.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a PlatformLogsSettings message. + * @function verify + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + PlatformLogsSettings.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.severity != null && message.hasOwnProperty("severity")) + switch (message.severity) { + default: + return "severity: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + } + return null; + }; + + /** + * Creates a PlatformLogsSettings message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.PlatformLogsSettings} PlatformLogsSettings + */ + PlatformLogsSettings.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.PlatformLogsSettings) + return object; + var message = new $root.google.pubsub.v1.PlatformLogsSettings(); + switch (object.severity) { + default: + if (typeof object.severity === "number") { + message.severity = object.severity; + break; + } + break; + case "SEVERITY_UNSPECIFIED": + case 0: + message.severity = 0; + break; + case "DISABLED": + case 1: + message.severity = 1; + break; case "DEBUG": case 2: message.severity = 2; @@ -2793,366 +4082,1173 @@ return message; }; - /** - * Creates a plain object from a PlatformLogsSettings message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {google.pubsub.v1.PlatformLogsSettings} message PlatformLogsSettings - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - PlatformLogsSettings.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) - object.severity = options.enums === String ? "SEVERITY_UNSPECIFIED" : 0; - if (message.severity != null && message.hasOwnProperty("severity")) - object.severity = options.enums === String ? $root.google.pubsub.v1.PlatformLogsSettings.Severity[message.severity] === undefined ? message.severity : $root.google.pubsub.v1.PlatformLogsSettings.Severity[message.severity] : message.severity; - return object; - }; + /** + * Creates a plain object from a PlatformLogsSettings message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {google.pubsub.v1.PlatformLogsSettings} message PlatformLogsSettings + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + PlatformLogsSettings.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) + object.severity = options.enums === String ? "SEVERITY_UNSPECIFIED" : 0; + if (message.severity != null && message.hasOwnProperty("severity")) + object.severity = options.enums === String ? $root.google.pubsub.v1.PlatformLogsSettings.Severity[message.severity] === undefined ? message.severity : $root.google.pubsub.v1.PlatformLogsSettings.Severity[message.severity] : message.severity; + return object; + }; + + /** + * Converts this PlatformLogsSettings to JSON. + * @function toJSON + * @memberof google.pubsub.v1.PlatformLogsSettings + * @instance + * @returns {Object.} JSON object + */ + PlatformLogsSettings.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for PlatformLogsSettings + * @function getTypeUrl + * @memberof google.pubsub.v1.PlatformLogsSettings + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + PlatformLogsSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.PlatformLogsSettings"; + }; + + /** + * Severity enum. + * @name google.pubsub.v1.PlatformLogsSettings.Severity + * @enum {number} + * @property {number} SEVERITY_UNSPECIFIED=0 SEVERITY_UNSPECIFIED value + * @property {number} DISABLED=1 DISABLED value + * @property {number} DEBUG=2 DEBUG value + * @property {number} INFO=3 INFO value + * @property {number} WARNING=4 WARNING value + * @property {number} ERROR=5 ERROR value + */ + PlatformLogsSettings.Severity = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "SEVERITY_UNSPECIFIED"] = 0; + values[valuesById[1] = "DISABLED"] = 1; + values[valuesById[2] = "DEBUG"] = 2; + values[valuesById[3] = "INFO"] = 3; + values[valuesById[4] = "WARNING"] = 4; + values[valuesById[5] = "ERROR"] = 5; + return values; + })(); + + return PlatformLogsSettings; + })(); + + v1.IngestionFailureEvent = (function() { + + /** + * Properties of an IngestionFailureEvent. + * @memberof google.pubsub.v1 + * @interface IIngestionFailureEvent + * @property {string|null} [topic] IngestionFailureEvent topic + * @property {string|null} [errorMessage] IngestionFailureEvent errorMessage + * @property {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null} [cloudStorageFailure] IngestionFailureEvent cloudStorageFailure + * @property {google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason|null} [awsMskFailure] IngestionFailureEvent awsMskFailure + * @property {google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason|null} [azureEventHubsFailure] IngestionFailureEvent azureEventHubsFailure + * @property {google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason|null} [confluentCloudFailure] IngestionFailureEvent confluentCloudFailure + */ + + /** + * Constructs a new IngestionFailureEvent. + * @memberof google.pubsub.v1 + * @classdesc Represents an IngestionFailureEvent. + * @implements IIngestionFailureEvent + * @constructor + * @param {google.pubsub.v1.IIngestionFailureEvent=} [properties] Properties to set + */ + function IngestionFailureEvent(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * IngestionFailureEvent topic. + * @member {string} topic + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.topic = ""; + + /** + * IngestionFailureEvent errorMessage. + * @member {string} errorMessage + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.errorMessage = ""; + + /** + * IngestionFailureEvent cloudStorageFailure. + * @member {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null|undefined} cloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.cloudStorageFailure = null; + + /** + * IngestionFailureEvent awsMskFailure. + * @member {google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason|null|undefined} awsMskFailure + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.awsMskFailure = null; + + /** + * IngestionFailureEvent azureEventHubsFailure. + * @member {google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason|null|undefined} azureEventHubsFailure + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.azureEventHubsFailure = null; + + /** + * IngestionFailureEvent confluentCloudFailure. + * @member {google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason|null|undefined} confluentCloudFailure + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.confluentCloudFailure = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * IngestionFailureEvent failure. + * @member {"cloudStorageFailure"|"awsMskFailure"|"azureEventHubsFailure"|"confluentCloudFailure"|undefined} failure + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + Object.defineProperty(IngestionFailureEvent.prototype, "failure", { + get: $util.oneOfGetter($oneOfFields = ["cloudStorageFailure", "awsMskFailure", "azureEventHubsFailure", "confluentCloudFailure"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new IngestionFailureEvent instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {google.pubsub.v1.IIngestionFailureEvent=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent instance + */ + IngestionFailureEvent.create = function create(properties) { + return new IngestionFailureEvent(properties); + }; + + /** + * Encodes the specified IngestionFailureEvent message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {google.pubsub.v1.IIngestionFailureEvent} message IngestionFailureEvent message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + IngestionFailureEvent.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); + if (message.errorMessage != null && Object.hasOwnProperty.call(message, "errorMessage")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.errorMessage); + if (message.cloudStorageFailure != null && Object.hasOwnProperty.call(message, "cloudStorageFailure")) + $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.encode(message.cloudStorageFailure, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); + if (message.awsMskFailure != null && Object.hasOwnProperty.call(message, "awsMskFailure")) + $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.encode(message.awsMskFailure, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.azureEventHubsFailure != null && Object.hasOwnProperty.call(message, "azureEventHubsFailure")) + $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.encode(message.azureEventHubsFailure, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.confluentCloudFailure != null && Object.hasOwnProperty.call(message, "confluentCloudFailure")) + $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.encode(message.confluentCloudFailure, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified IngestionFailureEvent message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {google.pubsub.v1.IIngestionFailureEvent} message IngestionFailureEvent message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + IngestionFailureEvent.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an IngestionFailureEvent message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + IngestionFailureEvent.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.topic = reader.string(); + break; + } + case 2: { + message.errorMessage = reader.string(); + break; + } + case 3: { + message.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.decode(reader, reader.uint32()); + break; + } + case 4: { + message.awsMskFailure = $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.decode(reader, reader.uint32()); + break; + } + case 5: { + message.azureEventHubsFailure = $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.decode(reader, reader.uint32()); + break; + } + case 6: { + message.confluentCloudFailure = $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an IngestionFailureEvent message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + IngestionFailureEvent.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an IngestionFailureEvent message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + IngestionFailureEvent.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.topic != null && message.hasOwnProperty("topic")) + if (!$util.isString(message.topic)) + return "topic: string expected"; + if (message.errorMessage != null && message.hasOwnProperty("errorMessage")) + if (!$util.isString(message.errorMessage)) + return "errorMessage: string expected"; + if (message.cloudStorageFailure != null && message.hasOwnProperty("cloudStorageFailure")) { + properties.failure = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify(message.cloudStorageFailure); + if (error) + return "cloudStorageFailure." + error; + } + } + if (message.awsMskFailure != null && message.hasOwnProperty("awsMskFailure")) { + if (properties.failure === 1) + return "failure: multiple values"; + properties.failure = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.verify(message.awsMskFailure); + if (error) + return "awsMskFailure." + error; + } + } + if (message.azureEventHubsFailure != null && message.hasOwnProperty("azureEventHubsFailure")) { + if (properties.failure === 1) + return "failure: multiple values"; + properties.failure = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.verify(message.azureEventHubsFailure); + if (error) + return "azureEventHubsFailure." + error; + } + } + if (message.confluentCloudFailure != null && message.hasOwnProperty("confluentCloudFailure")) { + if (properties.failure === 1) + return "failure: multiple values"; + properties.failure = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.verify(message.confluentCloudFailure); + if (error) + return "confluentCloudFailure." + error; + } + } + return null; + }; + + /** + * Creates an IngestionFailureEvent message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent + */ + IngestionFailureEvent.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent) + return object; + var message = new $root.google.pubsub.v1.IngestionFailureEvent(); + if (object.topic != null) + message.topic = String(object.topic); + if (object.errorMessage != null) + message.errorMessage = String(object.errorMessage); + if (object.cloudStorageFailure != null) { + if (typeof object.cloudStorageFailure !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.cloudStorageFailure: object expected"); + message.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.fromObject(object.cloudStorageFailure); + } + if (object.awsMskFailure != null) { + if (typeof object.awsMskFailure !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.awsMskFailure: object expected"); + message.awsMskFailure = $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.fromObject(object.awsMskFailure); + } + if (object.azureEventHubsFailure != null) { + if (typeof object.azureEventHubsFailure !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.azureEventHubsFailure: object expected"); + message.azureEventHubsFailure = $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.fromObject(object.azureEventHubsFailure); + } + if (object.confluentCloudFailure != null) { + if (typeof object.confluentCloudFailure !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.confluentCloudFailure: object expected"); + message.confluentCloudFailure = $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.fromObject(object.confluentCloudFailure); + } + return message; + }; + + /** + * Creates a plain object from an IngestionFailureEvent message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {google.pubsub.v1.IngestionFailureEvent} message IngestionFailureEvent + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + IngestionFailureEvent.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.topic = ""; + object.errorMessage = ""; + } + if (message.topic != null && message.hasOwnProperty("topic")) + object.topic = message.topic; + if (message.errorMessage != null && message.hasOwnProperty("errorMessage")) + object.errorMessage = message.errorMessage; + if (message.cloudStorageFailure != null && message.hasOwnProperty("cloudStorageFailure")) { + object.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.toObject(message.cloudStorageFailure, options); + if (options.oneofs) + object.failure = "cloudStorageFailure"; + } + if (message.awsMskFailure != null && message.hasOwnProperty("awsMskFailure")) { + object.awsMskFailure = $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.toObject(message.awsMskFailure, options); + if (options.oneofs) + object.failure = "awsMskFailure"; + } + if (message.azureEventHubsFailure != null && message.hasOwnProperty("azureEventHubsFailure")) { + object.azureEventHubsFailure = $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.toObject(message.azureEventHubsFailure, options); + if (options.oneofs) + object.failure = "azureEventHubsFailure"; + } + if (message.confluentCloudFailure != null && message.hasOwnProperty("confluentCloudFailure")) { + object.confluentCloudFailure = $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.toObject(message.confluentCloudFailure, options); + if (options.oneofs) + object.failure = "confluentCloudFailure"; + } + return object; + }; + + /** + * Converts this IngestionFailureEvent to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + * @returns {Object.} JSON object + */ + IngestionFailureEvent.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for IngestionFailureEvent + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + IngestionFailureEvent.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent"; + }; + + IngestionFailureEvent.ApiViolationReason = (function() { + + /** + * Properties of an ApiViolationReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface IApiViolationReason + */ + + /** + * Constructs a new ApiViolationReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents an ApiViolationReason. + * @implements IApiViolationReason + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason=} [properties] Properties to set + */ + function ApiViolationReason(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new ApiViolationReason instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason instance + */ + ApiViolationReason.create = function create(properties) { + return new ApiViolationReason(properties); + }; + + /** + * Encodes the specified ApiViolationReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason} message ApiViolationReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ApiViolationReason.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified ApiViolationReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason} message ApiViolationReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ApiViolationReason.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an ApiViolationReason message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ApiViolationReason.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an ApiViolationReason message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ApiViolationReason.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ApiViolationReason message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ApiViolationReason.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates an ApiViolationReason message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + */ + ApiViolationReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason) + return object; + return new $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason(); + }; + + /** + * Creates a plain object from an ApiViolationReason message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} message ApiViolationReason + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ApiViolationReason.toObject = function toObject() { + return {}; + }; - /** - * Converts this PlatformLogsSettings to JSON. - * @function toJSON - * @memberof google.pubsub.v1.PlatformLogsSettings - * @instance - * @returns {Object.} JSON object - */ - PlatformLogsSettings.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Converts this ApiViolationReason to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @instance + * @returns {Object.} JSON object + */ + ApiViolationReason.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Gets the default type url for PlatformLogsSettings - * @function getTypeUrl - * @memberof google.pubsub.v1.PlatformLogsSettings - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - PlatformLogsSettings.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; + /** + * Gets the default type url for ApiViolationReason + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ApiViolationReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.ApiViolationReason"; + }; + + return ApiViolationReason; + })(); + + IngestionFailureEvent.AvroFailureReason = (function() { + + /** + * Properties of an AvroFailureReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface IAvroFailureReason + */ + + /** + * Constructs a new AvroFailureReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents an AvroFailureReason. + * @implements IAvroFailureReason + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason=} [properties] Properties to set + */ + function AvroFailureReason(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; } - return typeUrlPrefix + "/google.pubsub.v1.PlatformLogsSettings"; - }; - /** - * Severity enum. - * @name google.pubsub.v1.PlatformLogsSettings.Severity - * @enum {number} - * @property {number} SEVERITY_UNSPECIFIED=0 SEVERITY_UNSPECIFIED value - * @property {number} DISABLED=1 DISABLED value - * @property {number} DEBUG=2 DEBUG value - * @property {number} INFO=3 INFO value - * @property {number} WARNING=4 WARNING value - * @property {number} ERROR=5 ERROR value - */ - PlatformLogsSettings.Severity = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "SEVERITY_UNSPECIFIED"] = 0; - values[valuesById[1] = "DISABLED"] = 1; - values[valuesById[2] = "DEBUG"] = 2; - values[valuesById[3] = "INFO"] = 3; - values[valuesById[4] = "WARNING"] = 4; - values[valuesById[5] = "ERROR"] = 5; - return values; + /** + * Creates a new AvroFailureReason instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason instance + */ + AvroFailureReason.create = function create(properties) { + return new AvroFailureReason(properties); + }; + + /** + * Encodes the specified AvroFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason} message AvroFailureReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AvroFailureReason.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified AvroFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason} message AvroFailureReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AvroFailureReason.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AvroFailureReason message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AvroFailureReason.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AvroFailureReason message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AvroFailureReason.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AvroFailureReason message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AvroFailureReason.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates an AvroFailureReason message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + */ + AvroFailureReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason) + return object; + return new $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason(); + }; + + /** + * Creates a plain object from an AvroFailureReason message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} message AvroFailureReason + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AvroFailureReason.toObject = function toObject() { + return {}; + }; + + /** + * Converts this AvroFailureReason to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @instance + * @returns {Object.} JSON object + */ + AvroFailureReason.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AvroFailureReason + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AvroFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.AvroFailureReason"; + }; + + return AvroFailureReason; })(); - return PlatformLogsSettings; - })(); + IngestionFailureEvent.CloudStorageFailure = (function() { - v1.IngestionFailureEvent = (function() { + /** + * Properties of a CloudStorageFailure. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface ICloudStorageFailure + * @property {string|null} [bucket] CloudStorageFailure bucket + * @property {string|null} [objectName] CloudStorageFailure objectName + * @property {number|Long|null} [objectGeneration] CloudStorageFailure objectGeneration + * @property {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null} [avroFailureReason] CloudStorageFailure avroFailureReason + * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] CloudStorageFailure apiViolationReason + */ - /** - * Properties of an IngestionFailureEvent. - * @memberof google.pubsub.v1 - * @interface IIngestionFailureEvent - * @property {string|null} [topic] IngestionFailureEvent topic - * @property {string|null} [errorMessage] IngestionFailureEvent errorMessage - * @property {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null} [cloudStorageFailure] IngestionFailureEvent cloudStorageFailure - */ + /** + * Constructs a new CloudStorageFailure. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents a CloudStorageFailure. + * @implements ICloudStorageFailure + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure=} [properties] Properties to set + */ + function CloudStorageFailure(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } - /** - * Constructs a new IngestionFailureEvent. - * @memberof google.pubsub.v1 - * @classdesc Represents an IngestionFailureEvent. - * @implements IIngestionFailureEvent - * @constructor - * @param {google.pubsub.v1.IIngestionFailureEvent=} [properties] Properties to set - */ - function IngestionFailureEvent(properties) { - if (properties) - for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) - if (properties[keys[i]] != null) - this[keys[i]] = properties[keys[i]]; - } + /** + * CloudStorageFailure bucket. + * @member {string} bucket + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.bucket = ""; - /** - * IngestionFailureEvent topic. - * @member {string} topic - * @memberof google.pubsub.v1.IngestionFailureEvent - * @instance - */ - IngestionFailureEvent.prototype.topic = ""; + /** + * CloudStorageFailure objectName. + * @member {string} objectName + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.objectName = ""; - /** - * IngestionFailureEvent errorMessage. - * @member {string} errorMessage - * @memberof google.pubsub.v1.IngestionFailureEvent - * @instance - */ - IngestionFailureEvent.prototype.errorMessage = ""; + /** + * CloudStorageFailure objectGeneration. + * @member {number|Long} objectGeneration + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.objectGeneration = $util.Long ? $util.Long.fromBits(0,0,false) : 0; - /** - * IngestionFailureEvent cloudStorageFailure. - * @member {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure|null|undefined} cloudStorageFailure - * @memberof google.pubsub.v1.IngestionFailureEvent - * @instance - */ - IngestionFailureEvent.prototype.cloudStorageFailure = null; + /** + * CloudStorageFailure avroFailureReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null|undefined} avroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.avroFailureReason = null; - // OneOf field names bound to virtual getters and setters - var $oneOfFields; + /** + * CloudStorageFailure apiViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null|undefined} apiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.apiViolationReason = null; - /** - * IngestionFailureEvent failure. - * @member {"cloudStorageFailure"|undefined} failure - * @memberof google.pubsub.v1.IngestionFailureEvent - * @instance - */ - Object.defineProperty(IngestionFailureEvent.prototype, "failure", { - get: $util.oneOfGetter($oneOfFields = ["cloudStorageFailure"]), - set: $util.oneOfSetter($oneOfFields) - }); + // OneOf field names bound to virtual getters and setters + var $oneOfFields; - /** - * Creates a new IngestionFailureEvent instance using the specified properties. - * @function create - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {google.pubsub.v1.IIngestionFailureEvent=} [properties] Properties to set - * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent instance - */ - IngestionFailureEvent.create = function create(properties) { - return new IngestionFailureEvent(properties); - }; + /** + * CloudStorageFailure reason. + * @member {"avroFailureReason"|"apiViolationReason"|undefined} reason + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + Object.defineProperty(CloudStorageFailure.prototype, "reason", { + get: $util.oneOfGetter($oneOfFields = ["avroFailureReason", "apiViolationReason"]), + set: $util.oneOfSetter($oneOfFields) + }); - /** - * Encodes the specified IngestionFailureEvent message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.verify|verify} messages. - * @function encode - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {google.pubsub.v1.IIngestionFailureEvent} message IngestionFailureEvent message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - IngestionFailureEvent.encode = function encode(message, writer) { - if (!writer) - writer = $Writer.create(); - if (message.topic != null && Object.hasOwnProperty.call(message, "topic")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.topic); - if (message.errorMessage != null && Object.hasOwnProperty.call(message, "errorMessage")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.errorMessage); - if (message.cloudStorageFailure != null && Object.hasOwnProperty.call(message, "cloudStorageFailure")) - $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.encode(message.cloudStorageFailure, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); - return writer; - }; + /** + * Creates a new CloudStorageFailure instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure instance + */ + CloudStorageFailure.create = function create(properties) { + return new CloudStorageFailure(properties); + }; - /** - * Encodes the specified IngestionFailureEvent message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.verify|verify} messages. - * @function encodeDelimited - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {google.pubsub.v1.IIngestionFailureEvent} message IngestionFailureEvent message or plain object to encode - * @param {$protobuf.Writer} [writer] Writer to encode to - * @returns {$protobuf.Writer} Writer - */ - IngestionFailureEvent.encodeDelimited = function encodeDelimited(message, writer) { - return this.encode(message, writer).ldelim(); - }; + /** + * Encodes the specified CloudStorageFailure message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure} message CloudStorageFailure message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CloudStorageFailure.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.bucket != null && Object.hasOwnProperty.call(message, "bucket")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.bucket); + if (message.objectName != null && Object.hasOwnProperty.call(message, "objectName")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.objectName); + if (message.objectGeneration != null && Object.hasOwnProperty.call(message, "objectGeneration")) + writer.uint32(/* id 3, wireType 0 =*/24).int64(message.objectGeneration); + if (message.avroFailureReason != null && Object.hasOwnProperty.call(message, "avroFailureReason")) + $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.encode(message.avroFailureReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + return writer; + }; - /** - * Decodes an IngestionFailureEvent message from the specified reader or buffer. - * @function decode - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - IngestionFailureEvent.decode = function decode(reader, length) { - if (!(reader instanceof $Reader)) - reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent(); - while (reader.pos < end) { - var tag = reader.uint32(); - switch (tag >>> 3) { - case 1: { - message.topic = reader.string(); + /** + * Encodes the specified CloudStorageFailure message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure} message CloudStorageFailure message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + CloudStorageFailure.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a CloudStorageFailure message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CloudStorageFailure.decode = function decode(reader, length) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure(); + while (reader.pos < end) { + var tag = reader.uint32(); + switch (tag >>> 3) { + case 1: { + message.bucket = reader.string(); + break; + } + case 2: { + message.objectName = reader.string(); + break; + } + case 3: { + message.objectGeneration = reader.int64(); + break; + } + case 5: { + message.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.decode(reader, reader.uint32()); + break; + } + case 6: { + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); break; } - case 2: { - message.errorMessage = reader.string(); - break; + } + return message; + }; + + /** + * Decodes a CloudStorageFailure message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + CloudStorageFailure.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a CloudStorageFailure message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + CloudStorageFailure.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.bucket != null && message.hasOwnProperty("bucket")) + if (!$util.isString(message.bucket)) + return "bucket: string expected"; + if (message.objectName != null && message.hasOwnProperty("objectName")) + if (!$util.isString(message.objectName)) + return "objectName: string expected"; + if (message.objectGeneration != null && message.hasOwnProperty("objectGeneration")) + if (!$util.isInteger(message.objectGeneration) && !(message.objectGeneration && $util.isInteger(message.objectGeneration.low) && $util.isInteger(message.objectGeneration.high))) + return "objectGeneration: integer|Long expected"; + if (message.avroFailureReason != null && message.hasOwnProperty("avroFailureReason")) { + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify(message.avroFailureReason); + if (error) + return "avroFailureReason." + error; } - case 3: { - message.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.decode(reader, reader.uint32()); - break; + } + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify(message.apiViolationReason); + if (error) + return "apiViolationReason." + error; } - default: - reader.skipType(tag & 7); - break; } - } - return message; - }; - - /** - * Decodes an IngestionFailureEvent message from the specified reader or buffer, length delimited. - * @function decodeDelimited - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent - * @throws {Error} If the payload is not a reader or valid buffer - * @throws {$protobuf.util.ProtocolError} If required fields are missing - */ - IngestionFailureEvent.decodeDelimited = function decodeDelimited(reader) { - if (!(reader instanceof $Reader)) - reader = new $Reader(reader); - return this.decode(reader, reader.uint32()); - }; + return null; + }; - /** - * Verifies an IngestionFailureEvent message. - * @function verify - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {Object.} message Plain object to verify - * @returns {string|null} `null` if valid, otherwise the reason why it is not - */ - IngestionFailureEvent.verify = function verify(message) { - if (typeof message !== "object" || message === null) - return "object expected"; - var properties = {}; - if (message.topic != null && message.hasOwnProperty("topic")) - if (!$util.isString(message.topic)) - return "topic: string expected"; - if (message.errorMessage != null && message.hasOwnProperty("errorMessage")) - if (!$util.isString(message.errorMessage)) - return "errorMessage: string expected"; - if (message.cloudStorageFailure != null && message.hasOwnProperty("cloudStorageFailure")) { - properties.failure = 1; - { - var error = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify(message.cloudStorageFailure); - if (error) - return "cloudStorageFailure." + error; + /** + * Creates a CloudStorageFailure message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + */ + CloudStorageFailure.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure) + return object; + var message = new $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure(); + if (object.bucket != null) + message.bucket = String(object.bucket); + if (object.objectName != null) + message.objectName = String(object.objectName); + if (object.objectGeneration != null) + if ($util.Long) + (message.objectGeneration = $util.Long.fromValue(object.objectGeneration)).unsigned = false; + else if (typeof object.objectGeneration === "string") + message.objectGeneration = parseInt(object.objectGeneration, 10); + else if (typeof object.objectGeneration === "number") + message.objectGeneration = object.objectGeneration; + else if (typeof object.objectGeneration === "object") + message.objectGeneration = new $util.LongBits(object.objectGeneration.low >>> 0, object.objectGeneration.high >>> 0).toNumber(); + if (object.avroFailureReason != null) { + if (typeof object.avroFailureReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.avroFailureReason: object expected"); + message.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.fromObject(object.avroFailureReason); } - } - return null; - }; + if (object.apiViolationReason != null) { + if (typeof object.apiViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.apiViolationReason: object expected"); + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); + } + return message; + }; - /** - * Creates an IngestionFailureEvent message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.IngestionFailureEvent} IngestionFailureEvent - */ - IngestionFailureEvent.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent) - return object; - var message = new $root.google.pubsub.v1.IngestionFailureEvent(); - if (object.topic != null) - message.topic = String(object.topic); - if (object.errorMessage != null) - message.errorMessage = String(object.errorMessage); - if (object.cloudStorageFailure != null) { - if (typeof object.cloudStorageFailure !== "object") - throw TypeError(".google.pubsub.v1.IngestionFailureEvent.cloudStorageFailure: object expected"); - message.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.fromObject(object.cloudStorageFailure); - } - return message; - }; + /** + * Creates a plain object from a CloudStorageFailure message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} message CloudStorageFailure + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + CloudStorageFailure.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.bucket = ""; + object.objectName = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.objectGeneration = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.objectGeneration = options.longs === String ? "0" : 0; + } + if (message.bucket != null && message.hasOwnProperty("bucket")) + object.bucket = message.bucket; + if (message.objectName != null && message.hasOwnProperty("objectName")) + object.objectName = message.objectName; + if (message.objectGeneration != null && message.hasOwnProperty("objectGeneration")) + if (typeof message.objectGeneration === "number") + object.objectGeneration = options.longs === String ? String(message.objectGeneration) : message.objectGeneration; + else + object.objectGeneration = options.longs === String ? $util.Long.prototype.toString.call(message.objectGeneration) : options.longs === Number ? new $util.LongBits(message.objectGeneration.low >>> 0, message.objectGeneration.high >>> 0).toNumber() : message.objectGeneration; + if (message.avroFailureReason != null && message.hasOwnProperty("avroFailureReason")) { + object.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.toObject(message.avroFailureReason, options); + if (options.oneofs) + object.reason = "avroFailureReason"; + } + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + object.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.toObject(message.apiViolationReason, options); + if (options.oneofs) + object.reason = "apiViolationReason"; + } + return object; + }; - /** - * Creates a plain object from an IngestionFailureEvent message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {google.pubsub.v1.IngestionFailureEvent} message IngestionFailureEvent - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - IngestionFailureEvent.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.topic = ""; - object.errorMessage = ""; - } - if (message.topic != null && message.hasOwnProperty("topic")) - object.topic = message.topic; - if (message.errorMessage != null && message.hasOwnProperty("errorMessage")) - object.errorMessage = message.errorMessage; - if (message.cloudStorageFailure != null && message.hasOwnProperty("cloudStorageFailure")) { - object.cloudStorageFailure = $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.toObject(message.cloudStorageFailure, options); - if (options.oneofs) - object.failure = "cloudStorageFailure"; - } - return object; - }; + /** + * Converts this CloudStorageFailure to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + * @returns {Object.} JSON object + */ + CloudStorageFailure.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - /** - * Converts this IngestionFailureEvent to JSON. - * @function toJSON - * @memberof google.pubsub.v1.IngestionFailureEvent - * @instance - * @returns {Object.} JSON object - */ - IngestionFailureEvent.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Gets the default type url for CloudStorageFailure + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + CloudStorageFailure.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure"; + }; - /** - * Gets the default type url for IngestionFailureEvent - * @function getTypeUrl - * @memberof google.pubsub.v1.IngestionFailureEvent - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - IngestionFailureEvent.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent"; - }; + return CloudStorageFailure; + })(); - IngestionFailureEvent.ApiViolationReason = (function() { + IngestionFailureEvent.AwsMskFailureReason = (function() { /** - * Properties of an ApiViolationReason. + * Properties of an AwsMskFailureReason. * @memberof google.pubsub.v1.IngestionFailureEvent - * @interface IApiViolationReason + * @interface IAwsMskFailureReason + * @property {string|null} [clusterArn] AwsMskFailureReason clusterArn + * @property {string|null} [kafkaTopic] AwsMskFailureReason kafkaTopic + * @property {number|Long|null} [partitionId] AwsMskFailureReason partitionId + * @property {number|Long|null} [offset] AwsMskFailureReason offset + * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] AwsMskFailureReason apiViolationReason */ /** - * Constructs a new ApiViolationReason. + * Constructs a new AwsMskFailureReason. * @memberof google.pubsub.v1.IngestionFailureEvent - * @classdesc Represents an ApiViolationReason. - * @implements IApiViolationReason + * @classdesc Represents an AwsMskFailureReason. + * @implements IAwsMskFailureReason * @constructor - * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason=} [properties] Properties to set + * @param {google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason=} [properties] Properties to set */ - function ApiViolationReason(properties) { + function AwsMskFailureReason(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -3160,63 +5256,147 @@ } /** - * Creates a new ApiViolationReason instance using the specified properties. + * AwsMskFailureReason clusterArn. + * @member {string} clusterArn + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason + * @instance + */ + AwsMskFailureReason.prototype.clusterArn = ""; + + /** + * AwsMskFailureReason kafkaTopic. + * @member {string} kafkaTopic + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason + * @instance + */ + AwsMskFailureReason.prototype.kafkaTopic = ""; + + /** + * AwsMskFailureReason partitionId. + * @member {number|Long} partitionId + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason + * @instance + */ + AwsMskFailureReason.prototype.partitionId = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * AwsMskFailureReason offset. + * @member {number|Long} offset + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason + * @instance + */ + AwsMskFailureReason.prototype.offset = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * AwsMskFailureReason apiViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null|undefined} apiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason + * @instance + */ + AwsMskFailureReason.prototype.apiViolationReason = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * AwsMskFailureReason reason. + * @member {"apiViolationReason"|undefined} reason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason + * @instance + */ + Object.defineProperty(AwsMskFailureReason.prototype, "reason", { + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new AwsMskFailureReason instance using the specified properties. * @function create - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason=} [properties] Properties to set - * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason instance + * @param {google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason} AwsMskFailureReason instance */ - ApiViolationReason.create = function create(properties) { - return new ApiViolationReason(properties); + AwsMskFailureReason.create = function create(properties) { + return new AwsMskFailureReason(properties); }; /** - * Encodes the specified ApiViolationReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify|verify} messages. + * Encodes the specified AwsMskFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason} message ApiViolationReason message or plain object to encode + * @param {google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason} message AwsMskFailureReason message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ApiViolationReason.encode = function encode(message, writer) { + AwsMskFailureReason.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); + if (message.clusterArn != null && Object.hasOwnProperty.call(message, "clusterArn")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.clusterArn); + if (message.kafkaTopic != null && Object.hasOwnProperty.call(message, "kafkaTopic")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.kafkaTopic); + if (message.partitionId != null && Object.hasOwnProperty.call(message, "partitionId")) + writer.uint32(/* id 3, wireType 0 =*/24).int64(message.partitionId); + if (message.offset != null && Object.hasOwnProperty.call(message, "offset")) + writer.uint32(/* id 4, wireType 0 =*/32).int64(message.offset); + if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); return writer; }; /** - * Encodes the specified ApiViolationReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify|verify} messages. + * Encodes the specified AwsMskFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason} message ApiViolationReason message or plain object to encode + * @param {google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason} message AwsMskFailureReason message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - ApiViolationReason.encodeDelimited = function encodeDelimited(message, writer) { + AwsMskFailureReason.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an ApiViolationReason message from the specified reader or buffer. + * Decodes an AwsMskFailureReason message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + * @returns {google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason} AwsMskFailureReason * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ApiViolationReason.decode = function decode(reader, length) { + AwsMskFailureReason.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { + case 1: { + message.clusterArn = reader.string(); + break; + } + case 2: { + message.kafkaTopic = reader.string(); + break; + } + case 3: { + message.partitionId = reader.int64(); + break; + } + case 4: { + message.offset = reader.int64(); + break; + } + case 5: { + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -3226,108 +5406,198 @@ }; /** - * Decodes an ApiViolationReason message from the specified reader or buffer, length delimited. + * Decodes an AwsMskFailureReason message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + * @returns {google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason} AwsMskFailureReason * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ApiViolationReason.decodeDelimited = function decodeDelimited(reader) { + AwsMskFailureReason.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an ApiViolationReason message. + * Verifies an AwsMskFailureReason message. * @function verify - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - ApiViolationReason.verify = function verify(message) { + AwsMskFailureReason.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; + var properties = {}; + if (message.clusterArn != null && message.hasOwnProperty("clusterArn")) + if (!$util.isString(message.clusterArn)) + return "clusterArn: string expected"; + if (message.kafkaTopic != null && message.hasOwnProperty("kafkaTopic")) + if (!$util.isString(message.kafkaTopic)) + return "kafkaTopic: string expected"; + if (message.partitionId != null && message.hasOwnProperty("partitionId")) + if (!$util.isInteger(message.partitionId) && !(message.partitionId && $util.isInteger(message.partitionId.low) && $util.isInteger(message.partitionId.high))) + return "partitionId: integer|Long expected"; + if (message.offset != null && message.hasOwnProperty("offset")) + if (!$util.isInteger(message.offset) && !(message.offset && $util.isInteger(message.offset.low) && $util.isInteger(message.offset.high))) + return "offset: integer|Long expected"; + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify(message.apiViolationReason); + if (error) + return "apiViolationReason." + error; + } + } return null; }; /** - * Creates an ApiViolationReason message from a plain object. Also converts values to their respective internal types. + * Creates an AwsMskFailureReason message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} ApiViolationReason + * @returns {google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason} AwsMskFailureReason */ - ApiViolationReason.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason) + AwsMskFailureReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason) return object; - return new $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason(); + var message = new $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason(); + if (object.clusterArn != null) + message.clusterArn = String(object.clusterArn); + if (object.kafkaTopic != null) + message.kafkaTopic = String(object.kafkaTopic); + if (object.partitionId != null) + if ($util.Long) + (message.partitionId = $util.Long.fromValue(object.partitionId)).unsigned = false; + else if (typeof object.partitionId === "string") + message.partitionId = parseInt(object.partitionId, 10); + else if (typeof object.partitionId === "number") + message.partitionId = object.partitionId; + else if (typeof object.partitionId === "object") + message.partitionId = new $util.LongBits(object.partitionId.low >>> 0, object.partitionId.high >>> 0).toNumber(); + if (object.offset != null) + if ($util.Long) + (message.offset = $util.Long.fromValue(object.offset)).unsigned = false; + else if (typeof object.offset === "string") + message.offset = parseInt(object.offset, 10); + else if (typeof object.offset === "number") + message.offset = object.offset; + else if (typeof object.offset === "object") + message.offset = new $util.LongBits(object.offset.low >>> 0, object.offset.high >>> 0).toNumber(); + if (object.apiViolationReason != null) { + if (typeof object.apiViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.apiViolationReason: object expected"); + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); + } + return message; }; /** - * Creates a plain object from an ApiViolationReason message. Also converts values to other types if specified. + * Creates a plain object from an AwsMskFailureReason message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.ApiViolationReason} message ApiViolationReason + * @param {google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason} message AwsMskFailureReason * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - ApiViolationReason.toObject = function toObject() { - return {}; + AwsMskFailureReason.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.clusterArn = ""; + object.kafkaTopic = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.partitionId = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.partitionId = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.offset = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.offset = options.longs === String ? "0" : 0; + } + if (message.clusterArn != null && message.hasOwnProperty("clusterArn")) + object.clusterArn = message.clusterArn; + if (message.kafkaTopic != null && message.hasOwnProperty("kafkaTopic")) + object.kafkaTopic = message.kafkaTopic; + if (message.partitionId != null && message.hasOwnProperty("partitionId")) + if (typeof message.partitionId === "number") + object.partitionId = options.longs === String ? String(message.partitionId) : message.partitionId; + else + object.partitionId = options.longs === String ? $util.Long.prototype.toString.call(message.partitionId) : options.longs === Number ? new $util.LongBits(message.partitionId.low >>> 0, message.partitionId.high >>> 0).toNumber() : message.partitionId; + if (message.offset != null && message.hasOwnProperty("offset")) + if (typeof message.offset === "number") + object.offset = options.longs === String ? String(message.offset) : message.offset; + else + object.offset = options.longs === String ? $util.Long.prototype.toString.call(message.offset) : options.longs === Number ? new $util.LongBits(message.offset.low >>> 0, message.offset.high >>> 0).toNumber() : message.offset; + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + object.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.toObject(message.apiViolationReason, options); + if (options.oneofs) + object.reason = "apiViolationReason"; + } + return object; }; /** - * Converts this ApiViolationReason to JSON. + * Converts this AwsMskFailureReason to JSON. * @function toJSON - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @instance * @returns {Object.} JSON object */ - ApiViolationReason.prototype.toJSON = function toJSON() { + AwsMskFailureReason.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; /** - * Gets the default type url for ApiViolationReason + * Gets the default type url for AwsMskFailureReason * @function getTypeUrl - * @memberof google.pubsub.v1.IngestionFailureEvent.ApiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @static * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") * @returns {string} The default type url */ - ApiViolationReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + AwsMskFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { if (typeUrlPrefix === undefined) { typeUrlPrefix = "type.googleapis.com"; } - return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.ApiViolationReason"; + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason"; }; - return ApiViolationReason; + return AwsMskFailureReason; })(); - IngestionFailureEvent.AvroFailureReason = (function() { + IngestionFailureEvent.AzureEventHubsFailureReason = (function() { /** - * Properties of an AvroFailureReason. + * Properties of an AzureEventHubsFailureReason. * @memberof google.pubsub.v1.IngestionFailureEvent - * @interface IAvroFailureReason + * @interface IAzureEventHubsFailureReason + * @property {string|null} [namespace] AzureEventHubsFailureReason namespace + * @property {string|null} [eventHub] AzureEventHubsFailureReason eventHub + * @property {number|Long|null} [partitionId] AzureEventHubsFailureReason partitionId + * @property {number|Long|null} [offset] AzureEventHubsFailureReason offset + * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] AzureEventHubsFailureReason apiViolationReason */ /** - * Constructs a new AvroFailureReason. + * Constructs a new AzureEventHubsFailureReason. * @memberof google.pubsub.v1.IngestionFailureEvent - * @classdesc Represents an AvroFailureReason. - * @implements IAvroFailureReason + * @classdesc Represents an AzureEventHubsFailureReason. + * @implements IAzureEventHubsFailureReason * @constructor - * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason=} [properties] Properties to set + * @param {google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason=} [properties] Properties to set */ - function AvroFailureReason(properties) { + function AzureEventHubsFailureReason(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -3335,63 +5605,147 @@ } /** - * Creates a new AvroFailureReason instance using the specified properties. + * AzureEventHubsFailureReason namespace. + * @member {string} namespace + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason + * @instance + */ + AzureEventHubsFailureReason.prototype.namespace = ""; + + /** + * AzureEventHubsFailureReason eventHub. + * @member {string} eventHub + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason + * @instance + */ + AzureEventHubsFailureReason.prototype.eventHub = ""; + + /** + * AzureEventHubsFailureReason partitionId. + * @member {number|Long} partitionId + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason + * @instance + */ + AzureEventHubsFailureReason.prototype.partitionId = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * AzureEventHubsFailureReason offset. + * @member {number|Long} offset + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason + * @instance + */ + AzureEventHubsFailureReason.prototype.offset = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + + /** + * AzureEventHubsFailureReason apiViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null|undefined} apiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason + * @instance + */ + AzureEventHubsFailureReason.prototype.apiViolationReason = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * AzureEventHubsFailureReason reason. + * @member {"apiViolationReason"|undefined} reason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason + * @instance + */ + Object.defineProperty(AzureEventHubsFailureReason.prototype, "reason", { + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new AzureEventHubsFailureReason instance using the specified properties. * @function create - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason=} [properties] Properties to set - * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason instance + * @param {google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason} AzureEventHubsFailureReason instance */ - AvroFailureReason.create = function create(properties) { - return new AvroFailureReason(properties); + AzureEventHubsFailureReason.create = function create(properties) { + return new AzureEventHubsFailureReason(properties); }; /** - * Encodes the specified AvroFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify|verify} messages. + * Encodes the specified AzureEventHubsFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason} message AvroFailureReason message or plain object to encode + * @param {google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason} message AzureEventHubsFailureReason message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - AvroFailureReason.encode = function encode(message, writer) { + AzureEventHubsFailureReason.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); + if (message.namespace != null && Object.hasOwnProperty.call(message, "namespace")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.namespace); + if (message.eventHub != null && Object.hasOwnProperty.call(message, "eventHub")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.eventHub); + if (message.partitionId != null && Object.hasOwnProperty.call(message, "partitionId")) + writer.uint32(/* id 3, wireType 0 =*/24).int64(message.partitionId); + if (message.offset != null && Object.hasOwnProperty.call(message, "offset")) + writer.uint32(/* id 4, wireType 0 =*/32).int64(message.offset); + if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); return writer; }; /** - * Encodes the specified AvroFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify|verify} messages. + * Encodes the specified AzureEventHubsFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason} message AvroFailureReason message or plain object to encode + * @param {google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason} message AzureEventHubsFailureReason message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - AvroFailureReason.encodeDelimited = function encodeDelimited(message, writer) { + AzureEventHubsFailureReason.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes an AvroFailureReason message from the specified reader or buffer. + * Decodes an AzureEventHubsFailureReason message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + * @returns {google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason} AzureEventHubsFailureReason * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AvroFailureReason.decode = function decode(reader, length) { + AzureEventHubsFailureReason.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { + case 1: { + message.namespace = reader.string(); + break; + } + case 2: { + message.eventHub = reader.string(); + break; + } + case 3: { + message.partitionId = reader.int64(); + break; + } + case 4: { + message.offset = reader.int64(); + break; + } + case 5: { + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -3401,113 +5755,198 @@ }; /** - * Decodes an AvroFailureReason message from the specified reader or buffer, length delimited. + * Decodes an AzureEventHubsFailureReason message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + * @returns {google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason} AzureEventHubsFailureReason * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AvroFailureReason.decodeDelimited = function decodeDelimited(reader) { + AzureEventHubsFailureReason.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies an AvroFailureReason message. + * Verifies an AzureEventHubsFailureReason message. * @function verify - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - AvroFailureReason.verify = function verify(message) { + AzureEventHubsFailureReason.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; + var properties = {}; + if (message.namespace != null && message.hasOwnProperty("namespace")) + if (!$util.isString(message.namespace)) + return "namespace: string expected"; + if (message.eventHub != null && message.hasOwnProperty("eventHub")) + if (!$util.isString(message.eventHub)) + return "eventHub: string expected"; + if (message.partitionId != null && message.hasOwnProperty("partitionId")) + if (!$util.isInteger(message.partitionId) && !(message.partitionId && $util.isInteger(message.partitionId.low) && $util.isInteger(message.partitionId.high))) + return "partitionId: integer|Long expected"; + if (message.offset != null && message.hasOwnProperty("offset")) + if (!$util.isInteger(message.offset) && !(message.offset && $util.isInteger(message.offset.low) && $util.isInteger(message.offset.high))) + return "offset: integer|Long expected"; + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify(message.apiViolationReason); + if (error) + return "apiViolationReason." + error; + } + } return null; }; /** - * Creates an AvroFailureReason message from a plain object. Also converts values to their respective internal types. + * Creates an AzureEventHubsFailureReason message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} AvroFailureReason + * @returns {google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason} AzureEventHubsFailureReason */ - AvroFailureReason.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason) + AzureEventHubsFailureReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason) return object; - return new $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason(); + var message = new $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason(); + if (object.namespace != null) + message.namespace = String(object.namespace); + if (object.eventHub != null) + message.eventHub = String(object.eventHub); + if (object.partitionId != null) + if ($util.Long) + (message.partitionId = $util.Long.fromValue(object.partitionId)).unsigned = false; + else if (typeof object.partitionId === "string") + message.partitionId = parseInt(object.partitionId, 10); + else if (typeof object.partitionId === "number") + message.partitionId = object.partitionId; + else if (typeof object.partitionId === "object") + message.partitionId = new $util.LongBits(object.partitionId.low >>> 0, object.partitionId.high >>> 0).toNumber(); + if (object.offset != null) + if ($util.Long) + (message.offset = $util.Long.fromValue(object.offset)).unsigned = false; + else if (typeof object.offset === "string") + message.offset = parseInt(object.offset, 10); + else if (typeof object.offset === "number") + message.offset = object.offset; + else if (typeof object.offset === "object") + message.offset = new $util.LongBits(object.offset.low >>> 0, object.offset.high >>> 0).toNumber(); + if (object.apiViolationReason != null) { + if (typeof object.apiViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.apiViolationReason: object expected"); + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); + } + return message; }; /** - * Creates a plain object from an AvroFailureReason message. Also converts values to other types if specified. + * Creates a plain object from an AzureEventHubsFailureReason message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.AvroFailureReason} message AvroFailureReason + * @param {google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason} message AzureEventHubsFailureReason * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - AvroFailureReason.toObject = function toObject() { - return {}; + AzureEventHubsFailureReason.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.namespace = ""; + object.eventHub = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.partitionId = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.partitionId = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.offset = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.offset = options.longs === String ? "0" : 0; + } + if (message.namespace != null && message.hasOwnProperty("namespace")) + object.namespace = message.namespace; + if (message.eventHub != null && message.hasOwnProperty("eventHub")) + object.eventHub = message.eventHub; + if (message.partitionId != null && message.hasOwnProperty("partitionId")) + if (typeof message.partitionId === "number") + object.partitionId = options.longs === String ? String(message.partitionId) : message.partitionId; + else + object.partitionId = options.longs === String ? $util.Long.prototype.toString.call(message.partitionId) : options.longs === Number ? new $util.LongBits(message.partitionId.low >>> 0, message.partitionId.high >>> 0).toNumber() : message.partitionId; + if (message.offset != null && message.hasOwnProperty("offset")) + if (typeof message.offset === "number") + object.offset = options.longs === String ? String(message.offset) : message.offset; + else + object.offset = options.longs === String ? $util.Long.prototype.toString.call(message.offset) : options.longs === Number ? new $util.LongBits(message.offset.low >>> 0, message.offset.high >>> 0).toNumber() : message.offset; + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + object.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.toObject(message.apiViolationReason, options); + if (options.oneofs) + object.reason = "apiViolationReason"; + } + return object; }; /** - * Converts this AvroFailureReason to JSON. + * Converts this AzureEventHubsFailureReason to JSON. * @function toJSON - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @instance * @returns {Object.} JSON object */ - AvroFailureReason.prototype.toJSON = function toJSON() { + AzureEventHubsFailureReason.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; /** - * Gets the default type url for AvroFailureReason + * Gets the default type url for AzureEventHubsFailureReason * @function getTypeUrl - * @memberof google.pubsub.v1.IngestionFailureEvent.AvroFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @static * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") * @returns {string} The default type url */ - AvroFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + AzureEventHubsFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { if (typeUrlPrefix === undefined) { typeUrlPrefix = "type.googleapis.com"; } - return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.AvroFailureReason"; + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason"; }; - return AvroFailureReason; + return AzureEventHubsFailureReason; })(); - IngestionFailureEvent.CloudStorageFailure = (function() { + IngestionFailureEvent.ConfluentCloudFailureReason = (function() { /** - * Properties of a CloudStorageFailure. + * Properties of a ConfluentCloudFailureReason. * @memberof google.pubsub.v1.IngestionFailureEvent - * @interface ICloudStorageFailure - * @property {string|null} [bucket] CloudStorageFailure bucket - * @property {string|null} [objectName] CloudStorageFailure objectName - * @property {number|Long|null} [objectGeneration] CloudStorageFailure objectGeneration - * @property {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null} [avroFailureReason] CloudStorageFailure avroFailureReason - * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] CloudStorageFailure apiViolationReason + * @interface IConfluentCloudFailureReason + * @property {string|null} [clusterId] ConfluentCloudFailureReason clusterId + * @property {string|null} [kafkaTopic] ConfluentCloudFailureReason kafkaTopic + * @property {number|Long|null} [partitionId] ConfluentCloudFailureReason partitionId + * @property {number|Long|null} [offset] ConfluentCloudFailureReason offset + * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] ConfluentCloudFailureReason apiViolationReason */ /** - * Constructs a new CloudStorageFailure. + * Constructs a new ConfluentCloudFailureReason. * @memberof google.pubsub.v1.IngestionFailureEvent - * @classdesc Represents a CloudStorageFailure. - * @implements ICloudStorageFailure + * @classdesc Represents a ConfluentCloudFailureReason. + * @implements IConfluentCloudFailureReason * @constructor - * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure=} [properties] Properties to set + * @param {google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason=} [properties] Properties to set */ - function CloudStorageFailure(properties) { + function ConfluentCloudFailureReason(properties) { if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -3515,144 +5954,144 @@ } /** - * CloudStorageFailure bucket. - * @member {string} bucket - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * ConfluentCloudFailureReason clusterId. + * @member {string} clusterId + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance */ - CloudStorageFailure.prototype.bucket = ""; + ConfluentCloudFailureReason.prototype.clusterId = ""; /** - * CloudStorageFailure objectName. - * @member {string} objectName - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * ConfluentCloudFailureReason kafkaTopic. + * @member {string} kafkaTopic + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance */ - CloudStorageFailure.prototype.objectName = ""; + ConfluentCloudFailureReason.prototype.kafkaTopic = ""; /** - * CloudStorageFailure objectGeneration. - * @member {number|Long} objectGeneration - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * ConfluentCloudFailureReason partitionId. + * @member {number|Long} partitionId + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance */ - CloudStorageFailure.prototype.objectGeneration = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + ConfluentCloudFailureReason.prototype.partitionId = $util.Long ? $util.Long.fromBits(0,0,false) : 0; /** - * CloudStorageFailure avroFailureReason. - * @member {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null|undefined} avroFailureReason - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * ConfluentCloudFailureReason offset. + * @member {number|Long} offset + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance */ - CloudStorageFailure.prototype.avroFailureReason = null; + ConfluentCloudFailureReason.prototype.offset = $util.Long ? $util.Long.fromBits(0,0,false) : 0; /** - * CloudStorageFailure apiViolationReason. + * ConfluentCloudFailureReason apiViolationReason. * @member {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null|undefined} apiViolationReason - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance */ - CloudStorageFailure.prototype.apiViolationReason = null; + ConfluentCloudFailureReason.prototype.apiViolationReason = null; // OneOf field names bound to virtual getters and setters var $oneOfFields; /** - * CloudStorageFailure reason. - * @member {"avroFailureReason"|"apiViolationReason"|undefined} reason - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * ConfluentCloudFailureReason reason. + * @member {"apiViolationReason"|undefined} reason + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance */ - Object.defineProperty(CloudStorageFailure.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["avroFailureReason", "apiViolationReason"]), + Object.defineProperty(ConfluentCloudFailureReason.prototype, "reason", { + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason"]), set: $util.oneOfSetter($oneOfFields) }); /** - * Creates a new CloudStorageFailure instance using the specified properties. + * Creates a new ConfluentCloudFailureReason instance using the specified properties. * @function create - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure=} [properties] Properties to set - * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure instance + * @param {google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} ConfluentCloudFailureReason instance */ - CloudStorageFailure.create = function create(properties) { - return new CloudStorageFailure(properties); + ConfluentCloudFailureReason.create = function create(properties) { + return new ConfluentCloudFailureReason(properties); }; /** - * Encodes the specified CloudStorageFailure message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify|verify} messages. + * Encodes the specified ConfluentCloudFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.verify|verify} messages. * @function encode - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure} message CloudStorageFailure message or plain object to encode + * @param {google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason} message ConfluentCloudFailureReason message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - CloudStorageFailure.encode = function encode(message, writer) { + ConfluentCloudFailureReason.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.bucket != null && Object.hasOwnProperty.call(message, "bucket")) - writer.uint32(/* id 1, wireType 2 =*/10).string(message.bucket); - if (message.objectName != null && Object.hasOwnProperty.call(message, "objectName")) - writer.uint32(/* id 2, wireType 2 =*/18).string(message.objectName); - if (message.objectGeneration != null && Object.hasOwnProperty.call(message, "objectGeneration")) - writer.uint32(/* id 3, wireType 0 =*/24).int64(message.objectGeneration); - if (message.avroFailureReason != null && Object.hasOwnProperty.call(message, "avroFailureReason")) - $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.encode(message.avroFailureReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.clusterId != null && Object.hasOwnProperty.call(message, "clusterId")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.clusterId); + if (message.kafkaTopic != null && Object.hasOwnProperty.call(message, "kafkaTopic")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.kafkaTopic); + if (message.partitionId != null && Object.hasOwnProperty.call(message, "partitionId")) + writer.uint32(/* id 3, wireType 0 =*/24).int64(message.partitionId); + if (message.offset != null && Object.hasOwnProperty.call(message, "offset")) + writer.uint32(/* id 4, wireType 0 =*/32).int64(message.offset); if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) - $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); return writer; }; /** - * Encodes the specified CloudStorageFailure message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.verify|verify} messages. + * Encodes the specified ConfluentCloudFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.verify|verify} messages. * @function encodeDelimited - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.ICloudStorageFailure} message CloudStorageFailure message or plain object to encode + * @param {google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason} message ConfluentCloudFailureReason message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ - CloudStorageFailure.encodeDelimited = function encodeDelimited(message, writer) { + ConfluentCloudFailureReason.encodeDelimited = function encodeDelimited(message, writer) { return this.encode(message, writer).ldelim(); }; /** - * Decodes a CloudStorageFailure message from the specified reader or buffer. + * Decodes a ConfluentCloudFailureReason message from the specified reader or buffer. * @function decode - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from * @param {number} [length] Message length if known beforehand - * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + * @returns {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} ConfluentCloudFailureReason * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CloudStorageFailure.decode = function decode(reader, length) { + ConfluentCloudFailureReason.decode = function decode(reader, length) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason(); while (reader.pos < end) { var tag = reader.uint32(); switch (tag >>> 3) { case 1: { - message.bucket = reader.string(); + message.clusterId = reader.string(); break; } case 2: { - message.objectName = reader.string(); + message.kafkaTopic = reader.string(); break; } case 3: { - message.objectGeneration = reader.int64(); + message.partitionId = reader.int64(); break; } - case 5: { - message.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.decode(reader, reader.uint32()); + case 4: { + message.offset = reader.int64(); break; } - case 6: { + case 5: { message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); break; } @@ -3665,53 +6104,46 @@ }; /** - * Decodes a CloudStorageFailure message from the specified reader or buffer, length delimited. + * Decodes a ConfluentCloudFailureReason message from the specified reader or buffer, length delimited. * @function decodeDelimited - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from - * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + * @returns {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} ConfluentCloudFailureReason * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CloudStorageFailure.decodeDelimited = function decodeDelimited(reader) { + ConfluentCloudFailureReason.decodeDelimited = function decodeDelimited(reader) { if (!(reader instanceof $Reader)) reader = new $Reader(reader); return this.decode(reader, reader.uint32()); }; /** - * Verifies a CloudStorageFailure message. + * Verifies a ConfluentCloudFailureReason message. * @function verify - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static * @param {Object.} message Plain object to verify * @returns {string|null} `null` if valid, otherwise the reason why it is not */ - CloudStorageFailure.verify = function verify(message) { + ConfluentCloudFailureReason.verify = function verify(message) { if (typeof message !== "object" || message === null) return "object expected"; var properties = {}; - if (message.bucket != null && message.hasOwnProperty("bucket")) - if (!$util.isString(message.bucket)) - return "bucket: string expected"; - if (message.objectName != null && message.hasOwnProperty("objectName")) - if (!$util.isString(message.objectName)) - return "objectName: string expected"; - if (message.objectGeneration != null && message.hasOwnProperty("objectGeneration")) - if (!$util.isInteger(message.objectGeneration) && !(message.objectGeneration && $util.isInteger(message.objectGeneration.low) && $util.isInteger(message.objectGeneration.high))) - return "objectGeneration: integer|Long expected"; - if (message.avroFailureReason != null && message.hasOwnProperty("avroFailureReason")) { - properties.reason = 1; - { - var error = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.verify(message.avroFailureReason); - if (error) - return "avroFailureReason." + error; - } - } + if (message.clusterId != null && message.hasOwnProperty("clusterId")) + if (!$util.isString(message.clusterId)) + return "clusterId: string expected"; + if (message.kafkaTopic != null && message.hasOwnProperty("kafkaTopic")) + if (!$util.isString(message.kafkaTopic)) + return "kafkaTopic: string expected"; + if (message.partitionId != null && message.hasOwnProperty("partitionId")) + if (!$util.isInteger(message.partitionId) && !(message.partitionId && $util.isInteger(message.partitionId.low) && $util.isInteger(message.partitionId.high))) + return "partitionId: integer|Long expected"; + if (message.offset != null && message.hasOwnProperty("offset")) + if (!$util.isInteger(message.offset) && !(message.offset && $util.isInteger(message.offset.low) && $util.isInteger(message.offset.high))) + return "offset: integer|Long expected"; if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { - if (properties.reason === 1) - return "reason: multiple values"; properties.reason = 1; { var error = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify(message.apiViolationReason); @@ -3723,79 +6155,88 @@ }; /** - * Creates a CloudStorageFailure message from a plain object. Also converts values to their respective internal types. + * Creates a ConfluentCloudFailureReason message from a plain object. Also converts values to their respective internal types. * @function fromObject - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static * @param {Object.} object Plain object - * @returns {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} CloudStorageFailure + * @returns {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} ConfluentCloudFailureReason */ - CloudStorageFailure.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure) + ConfluentCloudFailureReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason) return object; - var message = new $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure(); - if (object.bucket != null) - message.bucket = String(object.bucket); - if (object.objectName != null) - message.objectName = String(object.objectName); - if (object.objectGeneration != null) + var message = new $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason(); + if (object.clusterId != null) + message.clusterId = String(object.clusterId); + if (object.kafkaTopic != null) + message.kafkaTopic = String(object.kafkaTopic); + if (object.partitionId != null) if ($util.Long) - (message.objectGeneration = $util.Long.fromValue(object.objectGeneration)).unsigned = false; - else if (typeof object.objectGeneration === "string") - message.objectGeneration = parseInt(object.objectGeneration, 10); - else if (typeof object.objectGeneration === "number") - message.objectGeneration = object.objectGeneration; - else if (typeof object.objectGeneration === "object") - message.objectGeneration = new $util.LongBits(object.objectGeneration.low >>> 0, object.objectGeneration.high >>> 0).toNumber(); - if (object.avroFailureReason != null) { - if (typeof object.avroFailureReason !== "object") - throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.avroFailureReason: object expected"); - message.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.fromObject(object.avroFailureReason); - } + (message.partitionId = $util.Long.fromValue(object.partitionId)).unsigned = false; + else if (typeof object.partitionId === "string") + message.partitionId = parseInt(object.partitionId, 10); + else if (typeof object.partitionId === "number") + message.partitionId = object.partitionId; + else if (typeof object.partitionId === "object") + message.partitionId = new $util.LongBits(object.partitionId.low >>> 0, object.partitionId.high >>> 0).toNumber(); + if (object.offset != null) + if ($util.Long) + (message.offset = $util.Long.fromValue(object.offset)).unsigned = false; + else if (typeof object.offset === "string") + message.offset = parseInt(object.offset, 10); + else if (typeof object.offset === "number") + message.offset = object.offset; + else if (typeof object.offset === "object") + message.offset = new $util.LongBits(object.offset.low >>> 0, object.offset.high >>> 0).toNumber(); if (object.apiViolationReason != null) { if (typeof object.apiViolationReason !== "object") - throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.apiViolationReason: object expected"); + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.apiViolationReason: object expected"); message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); } return message; }; /** - * Creates a plain object from a CloudStorageFailure message. Also converts values to other types if specified. + * Creates a plain object from a ConfluentCloudFailureReason message. Also converts values to other types if specified. * @function toObject - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static - * @param {google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure} message CloudStorageFailure + * @param {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} message ConfluentCloudFailureReason * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - CloudStorageFailure.toObject = function toObject(message, options) { + ConfluentCloudFailureReason.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.bucket = ""; - object.objectName = ""; + object.clusterId = ""; + object.kafkaTopic = ""; if ($util.Long) { var long = new $util.Long(0, 0, false); - object.objectGeneration = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + object.partitionId = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; } else - object.objectGeneration = options.longs === String ? "0" : 0; - } - if (message.bucket != null && message.hasOwnProperty("bucket")) - object.bucket = message.bucket; - if (message.objectName != null && message.hasOwnProperty("objectName")) - object.objectName = message.objectName; - if (message.objectGeneration != null && message.hasOwnProperty("objectGeneration")) - if (typeof message.objectGeneration === "number") - object.objectGeneration = options.longs === String ? String(message.objectGeneration) : message.objectGeneration; + object.partitionId = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.offset = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.offset = options.longs === String ? "0" : 0; + } + if (message.clusterId != null && message.hasOwnProperty("clusterId")) + object.clusterId = message.clusterId; + if (message.kafkaTopic != null && message.hasOwnProperty("kafkaTopic")) + object.kafkaTopic = message.kafkaTopic; + if (message.partitionId != null && message.hasOwnProperty("partitionId")) + if (typeof message.partitionId === "number") + object.partitionId = options.longs === String ? String(message.partitionId) : message.partitionId; else - object.objectGeneration = options.longs === String ? $util.Long.prototype.toString.call(message.objectGeneration) : options.longs === Number ? new $util.LongBits(message.objectGeneration.low >>> 0, message.objectGeneration.high >>> 0).toNumber() : message.objectGeneration; - if (message.avroFailureReason != null && message.hasOwnProperty("avroFailureReason")) { - object.avroFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.toObject(message.avroFailureReason, options); - if (options.oneofs) - object.reason = "avroFailureReason"; - } + object.partitionId = options.longs === String ? $util.Long.prototype.toString.call(message.partitionId) : options.longs === Number ? new $util.LongBits(message.partitionId.low >>> 0, message.partitionId.high >>> 0).toNumber() : message.partitionId; + if (message.offset != null && message.hasOwnProperty("offset")) + if (typeof message.offset === "number") + object.offset = options.longs === String ? String(message.offset) : message.offset; + else + object.offset = options.longs === String ? $util.Long.prototype.toString.call(message.offset) : options.longs === Number ? new $util.LongBits(message.offset.low >>> 0, message.offset.high >>> 0).toNumber() : message.offset; if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { object.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.toObject(message.apiViolationReason, options); if (options.oneofs) @@ -3805,32 +6246,32 @@ }; /** - * Converts this CloudStorageFailure to JSON. + * Converts this ConfluentCloudFailureReason to JSON. * @function toJSON - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance * @returns {Object.} JSON object */ - CloudStorageFailure.prototype.toJSON = function toJSON() { + ConfluentCloudFailureReason.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; /** - * Gets the default type url for CloudStorageFailure + * Gets the default type url for ConfluentCloudFailureReason * @function getTypeUrl - * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @static * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") * @returns {string} The default type url */ - CloudStorageFailure.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + ConfluentCloudFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { if (typeUrlPrefix === undefined) { typeUrlPrefix = "type.googleapis.com"; } - return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure"; + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason"; }; - return CloudStorageFailure; + return ConfluentCloudFailureReason; })(); return IngestionFailureEvent; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index a72a7296781..2771ea3bb15 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -248,7 +248,10 @@ "source": { "oneof": [ "awsKinesis", - "cloudStorage" + "cloudStorage", + "azureEventHubs", + "awsMsk", + "confluentCloud" ] } }, @@ -267,6 +270,27 @@ "(google.api.field_behavior)": "OPTIONAL" } }, + "azureEventHubs": { + "type": "AzureEventHubs", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "awsMsk": { + "type": "AwsMsk", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "confluentCloud": { + "type": "ConfluentCloud", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, "platformLogsSettings": { "type": "PlatformLogsSettings", "id": 4, @@ -425,6 +449,190 @@ "fields": {} } } + }, + "AzureEventHubs": { + "fields": { + "state": { + "type": "State", + "id": 1, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + }, + "resourceGroup": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "namespace": { + "type": "string", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "eventHub": { + "type": "string", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "clientId": { + "type": "string", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "tenantId": { + "type": "string", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "subscriptionId": { + "type": "string", + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "gcpServiceAccount": { + "type": "string", + "id": 8, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + }, + "nested": { + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "EVENT_HUBS_PERMISSION_DENIED": 2, + "PUBLISH_PERMISSION_DENIED": 3, + "NAMESPACE_NOT_FOUND": 4, + "EVENT_HUB_NOT_FOUND": 5, + "SUBSCRIPTION_NOT_FOUND": 6, + "RESOURCE_GROUP_NOT_FOUND": 7 + } + } + } + }, + "AwsMsk": { + "fields": { + "state": { + "type": "State", + "id": 1, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + }, + "clusterArn": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "topic": { + "type": "string", + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "awsRoleArn": { + "type": "string", + "id": 4, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "gcpServiceAccount": { + "type": "string", + "id": 5, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + }, + "nested": { + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "MSK_PERMISSION_DENIED": 2, + "PUBLISH_PERMISSION_DENIED": 3, + "CLUSTER_NOT_FOUND": 4, + "TOPIC_NOT_FOUND": 5 + } + } + } + }, + "ConfluentCloud": { + "fields": { + "state": { + "type": "State", + "id": 1, + "options": { + "(google.api.field_behavior)": "OUTPUT_ONLY" + } + }, + "bootstrapServer": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "clusterId": { + "type": "string", + "id": 3, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "topic": { + "type": "string", + "id": 4, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "identityPoolId": { + "type": "string", + "id": 5, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "gcpServiceAccount": { + "type": "string", + "id": 6, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + }, + "nested": { + "State": { + "values": { + "STATE_UNSPECIFIED": 0, + "ACTIVE": 1, + "CONFLUENT_CLOUD_PERMISSION_DENIED": 2, + "PUBLISH_PERMISSION_DENIED": 3, + "UNREACHABLE_BOOTSTRAP_SERVER": 4, + "CLUSTER_NOT_FOUND": 5, + "TOPIC_NOT_FOUND": 6 + } + } + } } } }, @@ -455,7 +663,10 @@ "oneofs": { "failure": { "oneof": [ - "cloudStorageFailure" + "cloudStorageFailure", + "awsMskFailure", + "azureEventHubsFailure", + "confluentCloudFailure" ] } }, @@ -480,6 +691,27 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "awsMskFailure": { + "type": "AwsMskFailureReason", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "azureEventHubsFailure": { + "type": "AzureEventHubsFailureReason", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "confluentCloudFailure": { + "type": "ConfluentCloudFailureReason", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -535,6 +767,144 @@ } } } + }, + "AwsMskFailureReason": { + "oneofs": { + "reason": { + "oneof": [ + "apiViolationReason" + ] + } + }, + "fields": { + "clusterArn": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "kafkaTopic": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "partitionId": { + "type": "int64", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "offset": { + "type": "int64", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "apiViolationReason": { + "type": "ApiViolationReason", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + } + }, + "AzureEventHubsFailureReason": { + "oneofs": { + "reason": { + "oneof": [ + "apiViolationReason" + ] + } + }, + "fields": { + "namespace": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "eventHub": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "partitionId": { + "type": "int64", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "offset": { + "type": "int64", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "apiViolationReason": { + "type": "ApiViolationReason", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + } + }, + "ConfluentCloudFailureReason": { + "oneofs": { + "reason": { + "oneof": [ + "apiViolationReason" + ] + } + }, + "fields": { + "clusterId": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "kafkaTopic": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "partitionId": { + "type": "int64", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "offset": { + "type": "int64", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "apiViolationReason": { + "type": "ApiViolationReason", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + } } } }, diff --git a/handwritten/pubsub/src/v1/index.ts b/handwritten/pubsub/src/v1/index.ts index f12ac87b422..6131eef9934 100644 --- a/handwritten/pubsub/src/v1/index.ts +++ b/handwritten/pubsub/src/v1/index.ts @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index d281e1f0e1d..f8ce9d94291 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 068b0a247c2..d94d5a8e959 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 9daf16f61e9..26c6d905315 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 8a15356f1fc..07023b4cd4e 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 0f29cc7e145..a01b05f34bc 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 7a8a738d22a..92c5fc49a61 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 47b3ccb310ac6db12887dca257f67e5f9125ecce Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:13:39 -0500 Subject: [PATCH 1057/1115] chore(main): release 4.10.0 (#2002) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 12 ++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 2f6317eacf5..83666049c48 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,18 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.10.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.9.0...v4.10.0) (2025-01-13) + + +### Features + +* Add Kafka-based sources to IngestionDataSourceSettings proto and IngestionFailureEvent proto ([#2007](https://github.com/googleapis/nodejs-pubsub/issues/2007)) ([08d00a1](https://github.com/googleapis/nodejs-pubsub/commit/08d00a1e7d30e2ab47f7582ff61b1eb73ad9d25e)) + + +### Bug Fixes + +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.28.0 ([#2001](https://github.com/googleapis/nodejs-pubsub/issues/2001)) ([c8e5811](https://github.com/googleapis/nodejs-pubsub/commit/c8e581124523edcac13d6d6c48d67342482959f3)) + ## [4.9.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.8.0...v4.9.0) (2024-11-12) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index ad2f60bfa27..4e2faeb9799 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.9.0", + "version": "4.10.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 3b6b6f69e001febeb2d0055803293e50b029afbb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 10 Feb 2025 20:46:54 +0100 Subject: [PATCH 1058/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.29.0 (#2012) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4e2faeb9799..a34cf91dff1 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -55,7 +55,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "~1.9.0", - "@opentelemetry/semantic-conventions": "~1.28.0", + "@opentelemetry/semantic-conventions": "~1.29.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", From 537ad3d512bb629fa4fa841a2a4fbfd17ba084c6 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 27 Mar 2025 15:12:47 -0400 Subject: [PATCH 1059/1115] fix: type widening to match gapic, and two typing fixes (#2020) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: type widening to match gapic, and two typing fixes * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: dodge broken version of promisify --------- Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 3 +++ handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/publisher/index.ts | 6 ++++-- handwritten/pubsub/test/publisher/index.ts | 2 +- handwritten/pubsub/test/pubsub.ts | 5 ++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index db9c9ef33eb..1db6a6e2e4d 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -138,7 +138,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | 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 Subscription With Retry Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithRetryPolicy.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/createSubscriptionWithRetryPolicy.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) | +| Create Topic With AWS MSK Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithAwsMskIngestion.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/createTopicWithAwsMskIngestion.js,samples/README.md) | +| Create Topic With Azure Event Hubs Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithAzureEventHubsIngestion.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/createTopicWithAzureEventHubsIngestion.js,samples/README.md) | | Create Topic With Cloud Storage Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithCloudStorageIngestion.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/createTopicWithCloudStorageIngestion.js,samples/README.md) | +| Create Topic With Confluent Cloud Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithConfluentCloudIngestion.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/createTopicWithConfluentCloudIngestion.js,samples/README.md) | | Create Topic With Kinesis Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithKinesisIngestion.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/createTopicWithKinesisIngestion.js,samples/README.md) | | Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | | Create Topic With Schema Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchemaRevisions.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/createTopicWithSchemaRevisions.js,samples/README.md) | diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a34cf91dff1..bec597e2ca7 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,7 +53,7 @@ "@google-cloud/paginator": "^5.0.0", "@google-cloud/precise-date": "^4.0.0", "@google-cloud/projectify": "^4.0.0", - "@google-cloud/promisify": "^4.0.0", + "@google-cloud/promisify": "~4.0.0", "@opentelemetry/api": "~1.9.0", "@opentelemetry/semantic-conventions": "~1.29.0", "arrify": "^2.0.0", diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index a4ab81fa6fb..01692a5a1fb 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -191,8 +191,10 @@ export class Publisher { // We must have at least one of: // - `data` as a Buffer // - `attributes` that are not empty - if (data && !(data instanceof Buffer)) { - throw new TypeError('Data must be in the form of a Buffer.'); + if (data && !(data instanceof Uint8Array)) { + throw new TypeError( + 'Data must be in the form of a Buffer or Uint8Array.' + ); } const keys = Object.keys(attributes!); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index a4e6f28fbbb..9393b470f31 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -237,7 +237,7 @@ describe('Publisher', () => { const badData = {} as Buffer; assert.throws( () => publisher.publishMessage({data: badData}, spy), - /Data must be in the form of a Buffer\./ + /Data must be in the form of a Buffer or Uint8Array\./ ); }); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index d4ceef18b89..d0dd97bcf47 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -689,7 +689,10 @@ describe('PubSub', () => { const apiResponse = { name: 'new-topic', }; - let requestStub: sinon.SinonStub; + + // Types changed, so this is needed instead of `unknown`. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + let requestStub: sinon.SinonStub; beforeEach(() => { requestStub = sandbox From a6ec75d5532781f24e3b152b513fd2305e63a14e Mon Sep 17 00:00:00 2001 From: Amy Chisholm Date: Thu, 27 Mar 2025 13:24:56 -0700 Subject: [PATCH 1060/1115] feat: add required messaging.operation span attrs for OTel sem convs 1.24 (#2019) * Add required messaging.operation span attrs for OTel sem convs 1.31 * fix: Use 1.24 instead of 1.31 as it's not stable --------- Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/telemetry-tracing.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/telemetry-tracing.ts b/handwritten/pubsub/src/telemetry-tracing.ts index b921518ab27..422b2d904eb 100644 --- a/handwritten/pubsub/src/telemetry-tracing.ts +++ b/handwritten/pubsub/src/telemetry-tracing.ts @@ -347,7 +347,7 @@ export class PubsubSpans { const spanAttributes = { // Add Opentelemetry semantic convention attributes to the span, based on: - // https://github.com/open-telemetry/opentelemetry-specification/blob/v1.1.0/specification/trace/semantic_conventions/messaging.md + // https://github.com/open-telemetry/semantic-conventions/blob/v1.24.0/docs/messaging/messaging-spans.md ['messaging.system']: 'gcp_pubsub', ['messaging.destination.name']: destinationId ?? destinationName, ['gcp.project_id']: projectId, @@ -396,6 +396,7 @@ export class PubsubSpans { }); if (topicInfo.topicId) { span.updateName(`${topicInfo.topicId} create`); + span.setAttribute('messaging.operation', 'create'); span.setAttribute('messaging.destination.name', topicInfo.topicId); } @@ -430,6 +431,7 @@ export class PubsubSpans { const attributes = this.createAttributes(subInfo, message, caller); if (subInfo.subId) { attributes['messaging.destination.name'] = subInfo.subId; + attributes['messaging.operation'] = 'receive'; } if (context) { @@ -553,6 +555,7 @@ export class PubsubSpans { ); span?.setAttribute('messaging.batch.message_count', messageSpans.length); + span?.setAttribute('messaging.operation', 'receive'); if (span) { // Also attempt to link from the subscribe span(s) back to the publish RPC span. @@ -600,6 +603,7 @@ export class PubsubSpans { ); span?.setAttribute('messaging.batch.message_count', messageSpans.length); + span?.setAttribute('messaging.operation', 'receive'); if (span) { // Also attempt to link from the subscribe span(s) back to the publish RPC span. @@ -651,7 +655,7 @@ export class PubsubSpans { } static setReceiveProcessResult(span: Span, isAck: boolean) { - span.setAttribute('messaging.gcp_pubsub.result', isAck ? 'ack' : 'nack'); + span?.setAttribute('messaging.gcp_pubsub.result', isAck ? 'ack' : 'nack'); } } From bcac78aa9a3c6507158b656b19be9014ab2fd663 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 27 Mar 2025 21:55:54 +0100 Subject: [PATCH 1061/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.30.0 (#2014) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index bec597e2ca7..9c2eeab5ec2 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -55,7 +55,7 @@ "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "~4.0.0", "@opentelemetry/api": "~1.9.0", - "@opentelemetry/semantic-conventions": "~1.29.0", + "@opentelemetry/semantic-conventions": "~1.30.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", From fe208d442db1e89923c374025dff26b4a09bcba5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 28 Mar 2025 14:35:58 -0400 Subject: [PATCH 1062/1115] chore(main): release 4.11.0 (#2013) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 14 ++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 83666049c48..4cd47399dbc 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,20 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [4.11.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.10.0...v4.11.0) (2025-03-27) + + +### Features + +* Add required messaging.operation span attrs for OTel sem convs 1.24 ([#2019](https://github.com/googleapis/nodejs-pubsub/issues/2019)) ([70ed2d7](https://github.com/googleapis/nodejs-pubsub/commit/70ed2d73588290834dd25bfffb201272433e5614)) + + +### Bug Fixes + +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.29.0 ([#2012](https://github.com/googleapis/nodejs-pubsub/issues/2012)) ([bfe8243](https://github.com/googleapis/nodejs-pubsub/commit/bfe82434492a95fc24ee54ff947d0e52d5e93195)) +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.30.0 ([#2014](https://github.com/googleapis/nodejs-pubsub/issues/2014)) ([7f8366a](https://github.com/googleapis/nodejs-pubsub/commit/7f8366a636398d758aec5b2f933607f5021043a7)) +* Type widening to match gapic, and two typing fixes ([#2020](https://github.com/googleapis/nodejs-pubsub/issues/2020)) ([9cd73b3](https://github.com/googleapis/nodejs-pubsub/commit/9cd73b33980b7f02fe507a3a52042112690ab62c)) + ## [4.10.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.9.0...v4.10.0) (2025-01-13) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 9c2eeab5ec2..599e15c3a14 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.10.0", + "version": "4.11.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 3054944bf306b3bde61c294e80ab058bd4bb3b8a Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Mon, 28 Apr 2025 16:36:08 -0400 Subject: [PATCH 1063/1115] chore!: migrate to Node 18 (#2024) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore!: migrate to Node 18 * chore: linter fix pass * chore: remove accidentally added file * samples: fix linting and typelessing of samples * build: remove typeless bot stuff from owlbot.py * feat: fix a bunch of linter errors, and import new gapic classes * fix: revert some of the promise fixes * tests: fix various test issues caused by version upgrades * chore: linter fixes * chore: try to bypass linting on TS samples for now * build: try updating lint and samples scripts * build: two owlbot related updates * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * build: revert execa to dodge esm for now * chore: also revert execa import for older version * chore: update execa reference once more * chore!: remove legacy otel support * feat!: remove legacy ack deadline parameters, and move maxExtension into subscriber options * build: further revert execa's version * build: more execa adjustments * feat: time to say goodbye to some more old OTel cruft * tests: this will be the day ... that tsc starts paying attention to @internal, apparently * chore: revert package.json version changes so release-please can do it * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.eslintignore | 1 + handwritten/pubsub/.github/.OwlBot.lock.yaml | 5 +- .../pubsub/.github/release-trigger.yml | 1 + .../.github/scripts/close-invalid-link.cjs | 41 +- .../.github/scripts/close-unresponsive.cjs | 108 +-- .../scripts/fixtures/invalidIssueBody.txt | 50 + .../scripts/fixtures/validIssueBody.txt | 50 + .../validIssueBodyDifferentLinkLocation.txt | 50 + .../pubsub/.github/scripts/package.json | 21 + .../.github/scripts/remove-response-label.cjs | 28 +- .../scripts/tests/close-invalid-link.test.cjs | 86 ++ .../close-or-remove-response-label.test.cjs | 109 +++ .../pubsub/.github/sync-repo-settings.yaml | 4 +- handwritten/pubsub/.kokoro/common.cfg | 2 +- .../continuous/{node14 => node18}/common.cfg | 2 +- .../continuous/{node14 => node18}/lint.cfg | 0 .../{node14 => node18}/samples-test.cfg | 0 .../{node14 => node18}/system-test.cfg | 0 .../continuous/{node14 => node18}/test.cfg | 0 .../presubmit/{node14 => node18}/common.cfg | 2 +- .../{node14 => node18}/samples-test.cfg | 0 .../{node14 => node18}/system-test.cfg | 0 .../presubmit/{node14 => node18}/test.cfg | 0 .../pubsub/.kokoro/release/docs-devsite.cfg | 2 +- handwritten/pubsub/.kokoro/release/docs.cfg | 2 +- handwritten/pubsub/.kokoro/release/docs.sh | 2 +- .../pubsub/.kokoro/release/publish.cfg | 2 +- handwritten/pubsub/.kokoro/samples-test.sh | 6 +- handwritten/pubsub/.kokoro/system-test.sh | 2 +- handwritten/pubsub/.kokoro/test.bat | 2 +- handwritten/pubsub/.kokoro/test.sh | 2 +- handwritten/pubsub/.kokoro/trampoline_v2.sh | 2 +- handwritten/pubsub/README.md | 4 +- handwritten/pubsub/bin/benchwrapper.js | 2 +- handwritten/pubsub/owlbot.py | 15 - handwritten/pubsub/package.json | 86 +- handwritten/pubsub/protos/protos.d.ts | 12 +- handwritten/pubsub/protos/protos.js | 564 ++++++++--- handwritten/pubsub/protos/protos.json | 57 +- handwritten/pubsub/src/debug.ts | 2 +- handwritten/pubsub/src/default-options.ts | 6 +- handwritten/pubsub/src/exponential-retry.ts | 2 +- handwritten/pubsub/src/histogram.ts | 2 +- handwritten/pubsub/src/iam.ts | 22 +- handwritten/pubsub/src/index.ts | 5 - handwritten/pubsub/src/lease-manager.ts | 38 +- handwritten/pubsub/src/message-queues.ts | 26 +- handwritten/pubsub/src/message-stream.ts | 22 +- .../pubsub/src/publisher/flow-control.ts | 2 +- .../pubsub/src/publisher/flow-publisher.ts | 2 +- handwritten/pubsub/src/publisher/index.ts | 43 +- .../pubsub/src/publisher/message-batch.ts | 8 +- .../pubsub/src/publisher/message-queues.ts | 4 +- .../pubsub/src/publisher/pubsub-message.ts | 4 +- handwritten/pubsub/src/pubsub.ts | 84 +- handwritten/pubsub/src/schema.ts | 12 +- handwritten/pubsub/src/snapshot.ts | 12 +- handwritten/pubsub/src/subscriber.ts | 74 +- handwritten/pubsub/src/subscription.ts | 64 +- handwritten/pubsub/src/telemetry-tracing.ts | 169 +--- handwritten/pubsub/src/topic.ts | 52 +- handwritten/pubsub/src/util.ts | 2 +- handwritten/pubsub/src/v1/publisher_client.ts | 505 +++++++--- .../pubsub/src/v1/schema_service_client.ts | 495 ++++++++-- .../pubsub/src/v1/subscriber_client.ts | 709 +++++++++++--- handwritten/pubsub/system-test/pubsub.ts | 9 +- handwritten/pubsub/test/exponential-retry.ts | 30 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 650 ++++++------- .../pubsub/test/gapic_schema_service_v1.ts | 654 ++++++------- .../pubsub/test/gapic_subscriber_v1.ts | 880 +++++++++--------- handwritten/pubsub/test/iam.ts | 2 +- handwritten/pubsub/test/lease-manager.ts | 39 +- handwritten/pubsub/test/message-queues.ts | 87 +- handwritten/pubsub/test/message-stream.ts | 35 +- .../pubsub/test/publisher/flow-publisher.ts | 6 +- handwritten/pubsub/test/publisher/index.ts | 58 +- .../pubsub/test/publisher/message-queues.ts | 45 +- .../pubsub/test/publisher/publish-error.ts | 2 +- handwritten/pubsub/test/pubsub.ts | 70 +- handwritten/pubsub/test/pull-retry.ts | 4 +- handwritten/pubsub/test/snapshot.ts | 6 +- handwritten/pubsub/test/subscriber.ts | 129 ++- handwritten/pubsub/test/subscription.ts | 14 +- handwritten/pubsub/test/telemetry-tracing.ts | 71 +- handwritten/pubsub/test/test-utils.ts | 53 ++ handwritten/pubsub/test/topic.ts | 36 +- handwritten/pubsub/tsconfig.json | 4 +- 87 files changed, 4075 insertions(+), 2497 deletions(-) create mode 100644 handwritten/pubsub/.github/scripts/fixtures/invalidIssueBody.txt create mode 100644 handwritten/pubsub/.github/scripts/fixtures/validIssueBody.txt create mode 100644 handwritten/pubsub/.github/scripts/fixtures/validIssueBodyDifferentLinkLocation.txt create mode 100644 handwritten/pubsub/.github/scripts/package.json create mode 100644 handwritten/pubsub/.github/scripts/tests/close-invalid-link.test.cjs create mode 100644 handwritten/pubsub/.github/scripts/tests/close-or-remove-response-label.test.cjs rename handwritten/pubsub/.kokoro/continuous/{node14 => node18}/common.cfg (89%) rename handwritten/pubsub/.kokoro/continuous/{node14 => node18}/lint.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node14 => node18}/samples-test.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node14 => node18}/system-test.cfg (100%) rename handwritten/pubsub/.kokoro/continuous/{node14 => node18}/test.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node14 => node18}/common.cfg (89%) rename handwritten/pubsub/.kokoro/presubmit/{node14 => node18}/samples-test.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node14 => node18}/system-test.cfg (100%) rename handwritten/pubsub/.kokoro/presubmit/{node14 => node18}/test.cfg (100%) create mode 100644 handwritten/pubsub/test/test-utils.ts diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index cfc348ec4d1..88856452d18 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -5,3 +5,4 @@ docs/ protos/ system-test/ samples/generated/ +samples/typescript/ diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 24943e1161e..f06f99a384f 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:609822e3c09b7a1bd90b99655904609f162cc15acb4704f1edf778284c36f429 -# created: 2024-10-01T19:34:30.797530443Z + digest: sha256:c7e4968cfc97a204a4b2381f3ecb55cabc40c4cccf88b1ef8bef0d976be87fee diff --git a/handwritten/pubsub/.github/release-trigger.yml b/handwritten/pubsub/.github/release-trigger.yml index d4ca94189e1..339b88a217b 100644 --- a/handwritten/pubsub/.github/release-trigger.yml +++ b/handwritten/pubsub/.github/release-trigger.yml @@ -1 +1,2 @@ enabled: true +multiScmName: nodejs-pubsub \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/close-invalid-link.cjs b/handwritten/pubsub/.github/scripts/close-invalid-link.cjs index d7a3688e755..fdb51488197 100644 --- a/handwritten/pubsub/.github/scripts/close-invalid-link.cjs +++ b/handwritten/pubsub/.github/scripts/close-invalid-link.cjs @@ -12,21 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. +const fs = require('fs'); +const yaml = require('js-yaml'); +const path = require('path'); +const TEMPLATE_FILE_PATH = path.resolve(__dirname, '../ISSUE_TEMPLATE/bug_report.yml') + async function closeIssue(github, owner, repo, number) { await github.rest.issues.createComment({ owner: owner, repo: repo, issue_number: number, - body: 'Issue was opened with an invalid reproduction link. Please make sure the repository is a valid, publicly-accessible github repository, and make sure the url is complete (example: https://github.com/googleapis/google-cloud-node)' + body: "Issue was opened with an invalid reproduction link. Please make sure the repository is a valid, publicly-accessible github repository, and make sure the url is complete (example: https://github.com/googleapis/google-cloud-node)" }); await github.rest.issues.update({ owner: owner, repo: repo, issue_number: number, - state: 'closed' + state: "closed" }); } -module.exports = async ({github, context}) => { +module.exports = async ({ github, context }) => { const owner = context.repo.owner; const repo = context.repo.repo; const number = context.issue.number; @@ -37,20 +42,32 @@ module.exports = async ({github, context}) => { issue_number: number, }); - const isBugTemplate = issue.data.body.includes('Link to the code that reproduces this issue'); + const yamlData = fs.readFileSync(TEMPLATE_FILE_PATH, 'utf8'); + const obj = yaml.load(yamlData); + const linkMatchingText = (obj.body.find(x => {return x.type === 'input' && x.validations.required === true && x.attributes.label.includes('link')})).attributes.label; + const isBugTemplate = issue.data.body.includes(linkMatchingText); if (isBugTemplate) { console.log(`Issue ${number} is a bug template`) try { - const link = issue.data.body.split('\n')[18].match(/(https?:\/\/(gist\.)?github.com\/.*)/)[0]; - console.log(`Issue ${number} contains this link: ${link}`) - const isValidLink = (await fetch(link)).ok; - console.log(`Issue ${number} has a ${isValidLink ? 'valid' : 'invalid'} link`) - if (!isValidLink) { - await closeIssue(github, owner, repo, number); - } + const text = issue.data.body; + const match = text.indexOf(linkMatchingText); + if (match !== -1) { + const nextLineIndex = text.indexOf('http', match); + if (nextLineIndex == -1) { + await closeIssue(github, owner, repo, number); + return; + } + const link = text.substring(nextLineIndex, text.indexOf('\n', nextLineIndex)); + console.log(`Issue ${number} contains this link: ${link}`); + const isValidLink = (await fetch(link)).ok; + console.log(`Issue ${number} has a ${isValidLink ? "valid" : "invalid"} link`) + if (!isValidLink) { + await closeIssue(github, owner, repo, number); + } + } } catch (err) { await closeIssue(github, owner, repo, number); } } -}; +}; \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/close-unresponsive.cjs b/handwritten/pubsub/.github/scripts/close-unresponsive.cjs index 142dc1265a4..6f81b508fa5 100644 --- a/handwritten/pubsub/.github/scripts/close-unresponsive.cjs +++ b/handwritten/pubsub/.github/scripts/close-unresponsive.cjs @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +/// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,57 +13,57 @@ // limitations under the License. function labeledEvent(data) { - return data.event === 'labeled' && data.label.name === 'needs more info'; - } - - const numberOfDaysLimit = 15; - const close_message = `This has been closed since a request for information has \ - not been answered for ${numberOfDaysLimit} days. It can be reopened when the \ - requested information is provided.`; - - module.exports = async ({github, context}) => { - const owner = context.repo.owner; - const repo = context.repo.repo; - - const issues = await github.rest.issues.listForRepo({ - owner: owner, - repo: repo, - labels: 'needs more info', - }); - const numbers = issues.data.map((e) => e.number); - - for (const number of numbers) { - const events = await github.paginate( - github.rest.issues.listEventsForTimeline, - { - owner: owner, - repo: repo, - issue_number: number, - }, - (response) => response.data.filter(labeledEvent) - ); - - const latest_response_label = events[events.length - 1]; - - const created_at = new Date(latest_response_label.created_at); - const now = new Date(); - const diff = now - created_at; - const diffDays = diff / (1000 * 60 * 60 * 24); - - if (diffDays > numberOfDaysLimit) { - await github.rest.issues.update({ - owner: owner, - repo: repo, - issue_number: number, - state: 'closed', - }); - - await github.rest.issues.createComment({ - owner: owner, - repo: repo, - issue_number: number, - body: close_message, - }); - } + return data.event === "labeled" && data.label.name === "needs more info"; +} + +const numberOfDaysLimit = 15; +const close_message = `This has been closed since a request for information has \ +not been answered for ${numberOfDaysLimit} days. It can be reopened when the \ +requested information is provided.`; + +module.exports = async ({ github, context }) => { + const owner = context.repo.owner; + const repo = context.repo.repo; + + const issues = await github.rest.issues.listForRepo({ + owner: owner, + repo: repo, + labels: "needs more info", + }); + const numbers = issues.data.map((e) => e.number); + + for (const number of numbers) { + const events = await github.paginate( + github.rest.issues.listEventsForTimeline, + { + owner: owner, + repo: repo, + issue_number: number, + }, + (response) => response.data.filter(labeledEvent) + ); + + const latest_response_label = events[events.length - 1]; + + const created_at = new Date(latest_response_label.created_at); + const now = new Date(); + const diff = now - created_at; + const diffDays = diff / (1000 * 60 * 60 * 24); + + if (diffDays > numberOfDaysLimit) { + await github.rest.issues.update({ + owner: owner, + repo: repo, + issue_number: number, + state: "closed", + }); + + await github.rest.issues.createComment({ + owner: owner, + repo: repo, + issue_number: number, + body: close_message, + }); } - }; + } +}; \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/fixtures/invalidIssueBody.txt b/handwritten/pubsub/.github/scripts/fixtures/invalidIssueBody.txt new file mode 100644 index 00000000000..504bd669022 --- /dev/null +++ b/handwritten/pubsub/.github/scripts/fixtures/invalidIssueBody.txt @@ -0,0 +1,50 @@ +### Please make sure you have searched for information in the following guides. + +- [X] Search the issues already opened: https://github.com/GoogleCloudPlatform/google-cloud-node/issues +- [X] Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js +- [X] Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting +- [X] Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq +- [X] Check our libraries HOW-TO: https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md +- [X] Check out our authentication guide: https://github.com/googleapis/google-auth-library-nodejs +- [X] Check out handwritten samples for many of our APIs: https://github.com/GoogleCloudPlatform/nodejs-docs-samples + +### A screenshot that you have tested with "Try this API". + + +N/A + +### Link to the code that reproduces this issue. A link to a **public** Github Repository or gist with a minimal reproduction. + +not-a-link + +### A step-by-step description of how to reproduce the issue, based on the linked reproduction. + + +Change MY_PROJECT to your project name, add credentials if needed and run. + +### A clear and concise description of what the bug is, and what you expected to happen. + +The application crashes with the following exception (which there is no way to catch). It should just emit error, and allow graceful handling. +TypeError [ERR_INVALID_ARG_TYPE]: The "chunk" argument must be of type string or an instance of Buffer or Uint8Array. Received an instance of Object + at _write (node:internal/streams/writable:474:13) + at Writable.write (node:internal/streams/writable:502:10) + at Duplexify._write (/project/node_modules/duplexify/index.js:212:22) + at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) + at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) + at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) + at Pumpify. (/project/node_modules/@google-cloud/speech/build/src/helpers.js:79:27) + at Object.onceWrapper (node:events:633:26) + at Pumpify.emit (node:events:518:28) + at obj. [as _write] (/project/node_modules/stubs/index.js:28:22) + at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) + at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) + at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) + at PassThrough.ondata (node:internal/streams/readable:1007:22) + at PassThrough.emit (node:events:518:28) + at addChunk (node:internal/streams/readable:559:12) { + code: 'ERR_INVALID_ARG_TYPE' + + +### A clear and concise description WHY you expect this behavior, i.e., was it a recent change, there is documentation that points to this behavior, etc. ** + +No library should crash an application this way. \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/fixtures/validIssueBody.txt b/handwritten/pubsub/.github/scripts/fixtures/validIssueBody.txt new file mode 100644 index 00000000000..6e0ace338eb --- /dev/null +++ b/handwritten/pubsub/.github/scripts/fixtures/validIssueBody.txt @@ -0,0 +1,50 @@ +### Please make sure you have searched for information in the following guides. + +- [X] Search the issues already opened: https://github.com/GoogleCloudPlatform/google-cloud-node/issues +- [X] Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js +- [X] Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting +- [X] Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq +- [X] Check our libraries HOW-TO: https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md +- [X] Check out our authentication guide: https://github.com/googleapis/google-auth-library-nodejs +- [X] Check out handwritten samples for many of our APIs: https://github.com/GoogleCloudPlatform/nodejs-docs-samples + +### A screenshot that you have tested with "Try this API". + + +N/A + +### Link to the code that reproduces this issue. A link to a **public** Github Repository or gist with a minimal reproduction. + +https://gist.github.com/orgads/13cbf44c91923da27d8772b5f10489c9 + +### A step-by-step description of how to reproduce the issue, based on the linked reproduction. + + +Change MY_PROJECT to your project name, add credentials if needed and run. + +### A clear and concise description of what the bug is, and what you expected to happen. + +The application crashes with the following exception (which there is no way to catch). It should just emit error, and allow graceful handling. +TypeError [ERR_INVALID_ARG_TYPE]: The "chunk" argument must be of type string or an instance of Buffer or Uint8Array. Received an instance of Object + at _write (node:internal/streams/writable:474:13) + at Writable.write (node:internal/streams/writable:502:10) + at Duplexify._write (/project/node_modules/duplexify/index.js:212:22) + at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) + at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) + at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) + at Pumpify. (/project/node_modules/@google-cloud/speech/build/src/helpers.js:79:27) + at Object.onceWrapper (node:events:633:26) + at Pumpify.emit (node:events:518:28) + at obj. [as _write] (/project/node_modules/stubs/index.js:28:22) + at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) + at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) + at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) + at PassThrough.ondata (node:internal/streams/readable:1007:22) + at PassThrough.emit (node:events:518:28) + at addChunk (node:internal/streams/readable:559:12) { + code: 'ERR_INVALID_ARG_TYPE' + + +### A clear and concise description WHY you expect this behavior, i.e., was it a recent change, there is documentation that points to this behavior, etc. ** + +No library should crash an application this way. \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/fixtures/validIssueBodyDifferentLinkLocation.txt b/handwritten/pubsub/.github/scripts/fixtures/validIssueBodyDifferentLinkLocation.txt new file mode 100644 index 00000000000..984a420e376 --- /dev/null +++ b/handwritten/pubsub/.github/scripts/fixtures/validIssueBodyDifferentLinkLocation.txt @@ -0,0 +1,50 @@ +### Please make sure you have searched for information in the following guides. + +- [X] Search the issues already opened: https://github.com/GoogleCloudPlatform/google-cloud-node/issues +- [X] Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js +- [X] Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting +- [X] Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq +- [X] Check our libraries HOW-TO: https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md +- [X] Check out our authentication guide: https://github.com/googleapis/google-auth-library-nodejs +- [X] Check out handwritten samples for many of our APIs: https://github.com/GoogleCloudPlatform/nodejs-docs-samples + +### A screenshot that you have tested with "Try this API". + + +N/A + +### A step-by-step description of how to reproduce the issue, based on the linked reproduction. + + +Change MY_PROJECT to your project name, add credentials if needed and run. + +### A clear and concise description of what the bug is, and what you expected to happen. + +The application crashes with the following exception (which there is no way to catch). It should just emit error, and allow graceful handling. +TypeError [ERR_INVALID_ARG_TYPE]: The "chunk" argument must be of type string or an instance of Buffer or Uint8Array. Received an instance of Object + at _write (node:internal/streams/writable:474:13) + at Writable.write (node:internal/streams/writable:502:10) + at Duplexify._write (/project/node_modules/duplexify/index.js:212:22) + at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) + at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) + at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) + at Pumpify. (/project/node_modules/@google-cloud/speech/build/src/helpers.js:79:27) + at Object.onceWrapper (node:events:633:26) + at Pumpify.emit (node:events:518:28) + at obj. [as _write] (/project/node_modules/stubs/index.js:28:22) + at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) + at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) + at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) + at PassThrough.ondata (node:internal/streams/readable:1007:22) + at PassThrough.emit (node:events:518:28) + at addChunk (node:internal/streams/readable:559:12) { + code: 'ERR_INVALID_ARG_TYPE' + +### Link to the code that reproduces this issue. A link to a **public** Github Repository with a minimal reproduction. + + +https://gist.github.com/orgads/13cbf44c91923da27d8772b5f10489c9 + +### A clear and concise description WHY you expect this behavior, i.e., was it a recent change, there is documentation that points to this behavior, etc. ** + +No library should crash an application this way. \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json new file mode 100644 index 00000000000..2c2e5207df9 --- /dev/null +++ b/handwritten/pubsub/.github/scripts/package.json @@ -0,0 +1,21 @@ +{ + "name": "tests", + "private": true, + "description": "tests for script", + "scripts": { + "test": "mocha tests/close-invalid-link.test.cjs && mocha tests/close-or-remove-response-label.test.cjs" + }, + "author": "Google Inc.", + "license": "Apache-2.0", + "engines": { + "node": ">=18" + }, + "dependencies": { + "js-yaml": "^4.1.0" + }, + "devDependencies": { + "@octokit/rest": "^19.0.0", + "mocha": "^10.0.0", + "sinon": "^18.0.0" + } +} \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/remove-response-label.cjs b/handwritten/pubsub/.github/scripts/remove-response-label.cjs index 887cf349e9d..4a784ddf7a5 100644 --- a/handwritten/pubsub/.github/scripts/remove-response-label.cjs +++ b/handwritten/pubsub/.github/scripts/remove-response-label.cjs @@ -13,21 +13,21 @@ // limitations under the License. module.exports = async ({ github, context }) => { - const commenter = context.actor; - const issue = await github.rest.issues.get({ + const commenter = context.actor; + const issue = await github.rest.issues.get({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + }); + const author = issue.data.user.login; + const labels = issue.data.labels.map((e) => e.name); + + if (author === commenter && labels.includes("needs more info")) { + await github.rest.issues.removeLabel({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.issue.number, + name: "needs more info", }); - const author = issue.data.user.login; - const labels = issue.data.labels.map((e) => e.name); - - if (author === commenter && labels.includes('needs more info')) { - await github.rest.issues.removeLabel({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.issue.number, - name: 'needs more info', - }); - } - }; + } +}; \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/tests/close-invalid-link.test.cjs b/handwritten/pubsub/.github/scripts/tests/close-invalid-link.test.cjs new file mode 100644 index 00000000000..f63ee89c811 --- /dev/null +++ b/handwritten/pubsub/.github/scripts/tests/close-invalid-link.test.cjs @@ -0,0 +1,86 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +'use strict'; + +const { describe, it } = require('mocha'); +const closeInvalidLink = require('../close-invalid-link.cjs'); +const fs = require('fs'); +const sinon = require('sinon'); + +describe('close issues with invalid links', () => { + let octokitStub; + let issuesStub; + + beforeEach(() => { + issuesStub = { + get: sinon.stub(), + createComment: sinon.stub(), + update: sinon.stub(), + }; + octokitStub = { + rest: { + issues: issuesStub, + }, + }; + }); + + afterEach(() => { + sinon.restore(); + }); + + it('does not do anything if it is not a bug', async () => { + const context = { repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; + issuesStub.get.resolves({ data: { body: "I'm having a problem with this." } }); + + await closeInvalidLink({ github: octokitStub, context }); + + sinon.assert.calledOnce(issuesStub.get); + sinon.assert.notCalled(issuesStub.createComment); + sinon.assert.notCalled(issuesStub.update); + }); + + it('does not do anything if it is a bug with an appropriate link', async () => { + const context = { repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; + issuesStub.get.resolves({ data: { body: fs.readFileSync('./fixtures/validIssueBody.txt', 'utf-8') } }); + + await closeInvalidLink({ github: octokitStub, context }); + + sinon.assert.calledOnce(issuesStub.get); + sinon.assert.notCalled(issuesStub.createComment); + sinon.assert.notCalled(issuesStub.update); + }); + + it('does not do anything if it is a bug with an appropriate link and the template changes', async () => { + const context = { repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; + issuesStub.get.resolves({ data: { body: fs.readFileSync('./fixtures/validIssueBodyDifferentLinkLocation.txt', 'utf-8') } }); + + await closeInvalidLink({ github: octokitStub, context }); + + sinon.assert.calledOnce(issuesStub.get); + sinon.assert.notCalled(issuesStub.createComment); + sinon.assert.notCalled(issuesStub.update); + }); + + it('closes the issue if the link is invalid', async () => { + const context = { repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; + issuesStub.get.resolves({ data: { body: fs.readFileSync('./fixtures/invalidIssueBody.txt', 'utf-8') } }); + + await closeInvalidLink({ github: octokitStub, context }); + + sinon.assert.calledOnce(issuesStub.get); + sinon.assert.calledOnce(issuesStub.createComment); + sinon.assert.calledOnce(issuesStub.update); + }); +}); \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/tests/close-or-remove-response-label.test.cjs b/handwritten/pubsub/.github/scripts/tests/close-or-remove-response-label.test.cjs new file mode 100644 index 00000000000..fb092c53619 --- /dev/null +++ b/handwritten/pubsub/.github/scripts/tests/close-or-remove-response-label.test.cjs @@ -0,0 +1,109 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +'use strict'; + +const { describe, it, beforeEach, afterEach } = require('mocha'); +const removeResponseLabel = require('../remove-response-label.cjs'); +const closeUnresponsive = require('../close-unresponsive.cjs'); +const sinon = require('sinon'); + +function getISODateDaysAgo(days) { + const today = new Date(); + const daysAgo = new Date(today.setDate(today.getDate() - days)); + return daysAgo.toISOString(); +} + +describe('close issues or remove needs more info labels', () => { + let octokitStub; + let issuesStub; + let paginateStub; + + beforeEach(() => { + issuesStub = { + listForRepo: sinon.stub(), + update: sinon.stub(), + createComment: sinon.stub(), + get: sinon.stub(), + removeLabel: sinon.stub(), + }; + paginateStub = sinon.stub(); + octokitStub = { + rest: { + issues: issuesStub, + }, + paginate: paginateStub, + }; + }); + + afterEach(() => { + sinon.restore(); + }); + + it('closes the issue if the OP has not responded within the allotted time and there is a needs-more-info label', async () => { + const context = { owner: 'testOrg', repo: 'testRepo' }; + const issuesInRepo = [{ user: { login: 'OP' }, labels: [{ name: 'needs more info' }] }]; + const eventsInIssue = [{ event: 'labeled', label: { name: 'needs more info' }, created_at: getISODateDaysAgo(16) }]; + + issuesStub.listForRepo.resolves({ data: issuesInRepo }); + paginateStub.resolves(eventsInIssue); + + await closeUnresponsive({ github: octokitStub, context }); + + sinon.assert.calledOnce(issuesStub.listForRepo); + sinon.assert.calledOnce(paginateStub); + sinon.assert.calledOnce(issuesStub.update); + sinon.assert.calledOnce(issuesStub.createComment); + }); + + it('does nothing if not enough time has passed and there is a needs-more-info label', async () => { + const context = { owner: 'testOrg', repo: 'testRepo' }; + const issuesInRepo = [{ user: { login: 'OP' }, labels: [{ name: 'needs more info' }] }]; + const eventsInIssue = [{ event: 'labeled', label: { name: 'needs more info' }, created_at: getISODateDaysAgo(14) }]; + + issuesStub.listForRepo.resolves({ data: issuesInRepo }); + paginateStub.resolves(eventsInIssue); + + await closeUnresponsive({ github: octokitStub, context }); + + sinon.assert.calledOnce(issuesStub.listForRepo); + sinon.assert.calledOnce(paginateStub); + sinon.assert.notCalled(issuesStub.update); + sinon.assert.notCalled(issuesStub.createComment); + }); + + it('removes the label if OP responded', async () => { + const context = { actor: 'OP', repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; + const issueContext = { user: {login: 'OP'}, labels: [{ name: 'needs more info' }] }; + + issuesStub.get.resolves({ data: issueContext }); + + await removeResponseLabel({ github: octokitStub, context }); + + sinon.assert.calledOnce(issuesStub.get); + sinon.assert.calledOnce(issuesStub.removeLabel); + }); + + it('does not remove the label if author responded', async () => { + const context = { actor: 'repo-maintainer', repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; + const issueContext = { user: {login: 'OP'}, labels: [{ name: 'needs more info' }] }; + + issuesStub.get.resolves({ data: issueContext }); + + await removeResponseLabel({ github: octokitStub, context }); + + sinon.assert.calledOnce(issuesStub.get); + sinon.assert.notCalled(issuesStub.removeLabel); + }); +}); \ No newline at end of file diff --git a/handwritten/pubsub/.github/sync-repo-settings.yaml b/handwritten/pubsub/.github/sync-repo-settings.yaml index b46e4c4d61d..a013376d1cb 100644 --- a/handwritten/pubsub/.github/sync-repo-settings.yaml +++ b/handwritten/pubsub/.github/sync-repo-settings.yaml @@ -8,9 +8,9 @@ branchProtectionRules: - "ci/kokoro: Samples test" - "ci/kokoro: System test" - lint - - test (14) - - test (16) - test (18) + - test (20) + - test (22) - cla/google - windows - OwlBot Post Processor diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index d8038cd9917..dabc141b216 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node14/common.cfg b/handwritten/pubsub/.kokoro/continuous/node18/common.cfg similarity index 89% rename from handwritten/pubsub/.kokoro/continuous/node14/common.cfg rename to handwritten/pubsub/.kokoro/continuous/node18/common.cfg index d8038cd9917..dabc141b216 100644 --- a/handwritten/pubsub/.kokoro/continuous/node14/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node18/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/continuous/node14/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node14/lint.cfg rename to handwritten/pubsub/.kokoro/continuous/node18/lint.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node14/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node14/samples-test.cfg rename to handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node14/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node14/system-test.cfg rename to handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg diff --git a/handwritten/pubsub/.kokoro/continuous/node14/test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/continuous/node14/test.cfg rename to handwritten/pubsub/.kokoro/continuous/node18/test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node14/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg similarity index 89% rename from handwritten/pubsub/.kokoro/presubmit/node14/common.cfg rename to handwritten/pubsub/.kokoro/presubmit/node18/common.cfg index d8038cd9917..dabc141b216 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node14/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg @@ -16,7 +16,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/handwritten/pubsub/.kokoro/presubmit/node14/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node14/samples-test.cfg rename to handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node14/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node14/system-test.cfg rename to handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg diff --git a/handwritten/pubsub/.kokoro/presubmit/node14/test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/test.cfg similarity index 100% rename from handwritten/pubsub/.kokoro/presubmit/node14/test.cfg rename to handwritten/pubsub/.kokoro/presubmit/node18/test.cfg diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg index b5638214a65..b1ebf97bc61 100644 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/release/docs.cfg b/handwritten/pubsub/.kokoro/release/docs.cfg index 508a0efda3f..ef7147c33ad 100644 --- a/handwritten/pubsub/.kokoro/release/docs.cfg +++ b/handwritten/pubsub/.kokoro/release/docs.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } # Download trampoline resources. diff --git a/handwritten/pubsub/.kokoro/release/docs.sh b/handwritten/pubsub/.kokoro/release/docs.sh index 1d8f3f490a5..e9079a60530 100755 --- a/handwritten/pubsub/.kokoro/release/docs.sh +++ b/handwritten/pubsub/.kokoro/release/docs.sh @@ -16,7 +16,7 @@ set -eo pipefail -# build jsdocs (Python is installed on the Node 10 docker image). +# build jsdocs (Python is installed on the Node 18 docker image). if [[ -z "$CREDENTIALS" ]]; then # if CREDENTIALS are explicitly set, assume we're testing locally # and don't set NPM_CONFIG_PREFIX. diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 91fb161ec90..ae6223c886e 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -30,7 +30,7 @@ build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { diff --git a/handwritten/pubsub/.kokoro/samples-test.sh b/handwritten/pubsub/.kokoro/samples-test.sh index 8c5d108cb58..528775394e0 100755 --- a/handwritten/pubsub/.kokoro/samples-test.sh +++ b/handwritten/pubsub/.kokoro/samples-test.sh @@ -16,7 +16,9 @@ set -eo pipefail -export NPM_CONFIG_PREFIX=${HOME}/.npm-global +# Ensure the npm global directory is writable, otherwise rebuild `npm` +mkdir -p $NPM_CONFIG_PREFIX +npm config -g ls || npm i -g npm@`npm --version` # Setup service account credentials. export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/secret_manager/long-door-651-kokoro-system-test-service-account @@ -56,7 +58,7 @@ fi # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/system-test.sh b/handwritten/pubsub/.kokoro/system-test.sh index 0b3043d268c..a90d5cfec89 100755 --- a/handwritten/pubsub/.kokoro/system-test.sh +++ b/handwritten/pubsub/.kokoro/system-test.sh @@ -49,7 +49,7 @@ npm run system-test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/test.bat b/handwritten/pubsub/.kokoro/test.bat index 0bb12405231..caf825656c2 100644 --- a/handwritten/pubsub/.kokoro/test.bat +++ b/handwritten/pubsub/.kokoro/test.bat @@ -21,7 +21,7 @@ cd .. @rem we upgrade Node.js in the image: SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm -call nvm use v14.17.3 +call nvm use 18 call which node call npm install || goto :error diff --git a/handwritten/pubsub/.kokoro/test.sh b/handwritten/pubsub/.kokoro/test.sh index 862d478d324..0d9f6392a75 100755 --- a/handwritten/pubsub/.kokoro/test.sh +++ b/handwritten/pubsub/.kokoro/test.sh @@ -39,7 +39,7 @@ npm test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/handwritten/pubsub/.kokoro/trampoline_v2.sh b/handwritten/pubsub/.kokoro/trampoline_v2.sh index 4d03112128a..5d6cfcca528 100755 --- a/handwritten/pubsub/.kokoro/trampoline_v2.sh +++ b/handwritten/pubsub/.kokoro/trampoline_v2.sh @@ -44,7 +44,7 @@ # the project root. # # Here is an example for running this script. -# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:10-user \ +# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:18-user \ # TRAMPOLINE_BUILD_FILE=.kokoro/system-test.sh \ # .kokoro/trampoline_v2.sh diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 1db6a6e2e4d..4972a7433c6 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -71,7 +71,7 @@ const {PubSub} = require('@google-cloud/pubsub'); async function quickstart( projectId = 'your-project-id', // Your Google Cloud Platform project ID topicNameOrId = 'my-topic', // Name for the new topic to create - subscriptionName = 'my-sub' // Name for the new subscription to create + subscriptionName = 'my-sub', // Name for the new subscription to create ) { // Instantiates a client const pubsub = new PubSub({projectId}); @@ -96,7 +96,7 @@ async function quickstart( }); // Send a message to the topic - topic.publishMessage({data: Buffer.from('Test message!')}); + await topic.publishMessage({data: Buffer.from('Test message!')}); } ``` diff --git a/handwritten/pubsub/bin/benchwrapper.js b/handwritten/pubsub/bin/benchwrapper.js index 3b8a6d91f81..f272b4ccfd9 100644 --- a/handwritten/pubsub/bin/benchwrapper.js +++ b/handwritten/pubsub/bin/benchwrapper.js @@ -76,5 +76,5 @@ server.bindAsync( } else { server.start(); } - } + }, ); diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index fb4ebecc102..fd1d28c9877 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -13,21 +13,6 @@ # limitations under the License. from synthtool.languages import node -from synthtool import shell -from synthtool.log import logger - -# Generate JS samples from TS. -# node.typeless_samples_hermetic() - -# We need to run this before the main owlbot processing, to make -# sure quickstart.js gets gts fixed before the README is generated. -# This needs to be worked out more properly, this is temporary. -logger.debug("Run typeless sample bot") -node.install() -shell.run(["npm", "run", "typeless"]) - -# node.fix() - # Main OwlBot processing. node.owlbot_main(templates_excludes=[ diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 599e15c3a14..2bbee45d080 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "author": "Google Inc.", "engines": { - "node": ">=14.0.0" + "node": ">=18" }, "repository": "googleapis/nodejs-pubsub", "main": "./build/src/index.js", @@ -45,66 +45,64 @@ "predocs-test": "npm run docs", "benchwrapper": "node bin/benchwrapper.js", "prelint": "cd samples; npm link ../; npm install", - "precompile": "gts clean", - "typeless": "npx typeless-sample-bot --outputpath samples --targets samples --recursive", - "posttypeless": "npm run link-samples && npx eslint --ignore-pattern owl-bot-staging --fix samples" + "precompile": "gts clean" }, "dependencies": { - "@google-cloud/paginator": "^5.0.0", - "@google-cloud/precise-date": "^4.0.0", - "@google-cloud/projectify": "^4.0.0", - "@google-cloud/promisify": "~4.0.0", + "@google-cloud/paginator": "^6.0.0", + "@google-cloud/precise-date": "^5.0.0", + "@google-cloud/projectify": "^5.0.0", + "@google-cloud/promisify": "^5.0.0", "@opentelemetry/api": "~1.9.0", - "@opentelemetry/semantic-conventions": "~1.30.0", + "@opentelemetry/semantic-conventions": "~1.32.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-auth-library": "^9.3.0", - "google-gax": "^4.3.3", - "heap-js": "^2.2.0", + "google-auth-library": "^10.0.0-rc.1", + "google-gax": "^5.0.1-rc.0", + "heap-js": "^2.6.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", "p-defer": "^3.0.0" }, "devDependencies": { - "@google-cloud/typeless-sample-bot": "^2.1.0", - "@grpc/proto-loader": "^0.7.0", + "@grpc/proto-loader": "^0.7.13", "@opentelemetry/core": "^1.17.0", "@opentelemetry/sdk-trace-base": "^1.17.0", "@types/duplexify": "^3.6.4", - "@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": "^22.0.0", - "@types/proxyquire": "^1.3.28", - "@types/sinon": "^17.0.0", - "@types/tmp": "^0.2.0", + "@types/extend": "^3.0.4", + "@types/lodash.snakecase": "^4.1.9", + "@types/mocha": "^10.0.10", + "@types/mv": "^2.1.4", + "@types/ncp": "^2.0.8", + "@types/node": "^22.14.1", + "@types/proxyquire": "^1.3.31", + "@types/sinon": "^17.0.4", + "@types/tmp": "^0.2.6", "@types/uuid": "^10.0.0", - "c8": "^9.0.0", - "codecov": "^3.0.0", - "execa": "^5.0.0", - "gapic-tools": "^0.4.0", - "gts": "^5.0.0", - "jsdoc": "^4.0.0", + "c8": "^10.1.3", + "codecov": "^3.8.3", + "execa": "~5.0.0", + "gapic-tools": "^1.0.1", + "gts": "^6.0.2", + "jsdoc": "^4.0.4", "jsdoc-fresh": "^3.0.0", "jsdoc-region-tag": "^3.0.0", - "linkinator": "~4.0.0", - "mocha": "^9.2.2", + "linkinator": "^6.1.2", + "mocha": "^11.1.0", "mv": "^2.1.1", "ncp": "^2.0.0", - "nise": "6.0.0", - "null-loader": "^4.0.0", - "path-to-regexp": "6.2.2", - "protobufjs": "^7.0.0", - "proxyquire": "^2.0.0", - "sinon": "^18.0.0", - "tmp": "^0.2.0", - "ts-loader": "^9.0.0", - "typescript": "^5.1.6", - "uuid": "^9.0.0", - "webpack": "^5.0.0", - "webpack-cli": "^5.0.0", - "yargs": "^16.0.0" + "nise": "^6.1.1", + "null-loader": "^4.0.1", + "path-to-regexp": "^8.2.0", + "protobufjs": "^7.4.0", + "proxyquire": "^2.1.3", + "sinon": "^20.0.0", + "tmp": "^0.2.3", + "ts-loader": "^9.5.2", + "typescript": "^5.8.3", + "uuid": "^11.1.0", + "webpack": "^5.99.5", + "webpack-cli": "^6.0.1", + "why-is-node-running": "^2.3.0", + "yargs": "^17.7.2" } } diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 3ccad3fc074..b61594d6bfc 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -2658,7 +2658,7 @@ export namespace google { interface IPubsubMessage { /** PubsubMessage data */ - data?: (Uint8Array|string|null); + data?: (Uint8Array|Buffer|string|null); /** PubsubMessage attributes */ attributes?: ({ [k: string]: string }|null); @@ -2683,7 +2683,7 @@ export namespace google { constructor(properties?: google.pubsub.v1.IPubsubMessage); /** PubsubMessage data. */ - public data: (Uint8Array|string); + public data: (Uint8Array|Buffer|string); /** PubsubMessage attributes. */ public attributes: { [k: string]: string }; @@ -10303,7 +10303,7 @@ export namespace google { schema?: (google.pubsub.v1.ISchema|null); /** ValidateMessageRequest message */ - message?: (Uint8Array|string|null); + message?: (Uint8Array|Buffer|string|null); /** ValidateMessageRequest encoding */ encoding?: (google.pubsub.v1.Encoding|keyof typeof google.pubsub.v1.Encoding|null); @@ -10328,7 +10328,7 @@ export namespace google { public schema?: (google.pubsub.v1.ISchema|null); /** ValidateMessageRequest message. */ - public message: (Uint8Array|string); + public message: (Uint8Array|Buffer|string); /** ValidateMessageRequest encoding. */ public encoding: (google.pubsub.v1.Encoding|keyof typeof google.pubsub.v1.Encoding); @@ -15684,7 +15684,7 @@ export namespace google { doubleValue?: (number|null); /** UninterpretedOption stringValue */ - stringValue?: (Uint8Array|string|null); + stringValue?: (Uint8Array|Buffer|string|null); /** UninterpretedOption aggregateValue */ aggregateValue?: (string|null); @@ -15715,7 +15715,7 @@ export namespace google { public doubleValue: number; /** UninterpretedOption stringValue. */ - public stringValue: (Uint8Array|string); + public stringValue: (Uint8Array|Buffer|string); /** UninterpretedOption aggregateValue. */ public aggregateValue: string; diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index bc3604fdbac..e2eefc5e426 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -487,12 +487,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MessageStoragePolicy.decode = function decode(reader, length) { + MessageStoragePolicy.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.MessageStoragePolicy(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.allowedPersistenceRegions && message.allowedPersistenceRegions.length)) @@ -750,12 +752,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SchemaSettings.decode = function decode(reader, length) { + SchemaSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SchemaSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.schema = reader.string(); @@ -1083,12 +1087,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - IngestionDataSourceSettings.decode = function decode(reader, length) { + IngestionDataSourceSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.awsKinesis = $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis.decode(reader, reader.uint32()); @@ -1451,12 +1457,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AwsKinesis.decode = function decode(reader, length) { + AwsKinesis.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AwsKinesis(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.state = reader.int32(); @@ -1844,12 +1852,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CloudStorage.decode = function decode(reader, length) { + CloudStorage.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.state = reader.int32(); @@ -2227,12 +2237,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TextFormat.decode = function decode(reader, length) { + TextFormat.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.TextFormat(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.delimiter = reader.string(); @@ -2423,12 +2435,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AvroFormat.decode = function decode(reader, length) { + AvroFormat.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.AvroFormat(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -2598,12 +2612,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PubSubAvroFormat.decode = function decode(reader, length) { + PubSubAvroFormat.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.CloudStorage.PubSubAvroFormat(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -2864,12 +2880,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AzureEventHubs.decode = function decode(reader, length) { + AzureEventHubs.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AzureEventHubs(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.state = reader.int32(); @@ -3271,12 +3289,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AwsMsk.decode = function decode(reader, length) { + AwsMsk.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.AwsMsk(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.state = reader.int32(); @@ -3639,12 +3659,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ConfluentCloud.decode = function decode(reader, length) { + ConfluentCloud.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionDataSourceSettings.ConfluentCloud(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.state = reader.int32(); @@ -3974,12 +3996,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PlatformLogsSettings.decode = function decode(reader, length) { + PlatformLogsSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PlatformLogsSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.severity = reader.int32(); @@ -4307,12 +4331,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - IngestionFailureEvent.decode = function decode(reader, length) { + IngestionFailureEvent.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.topic = reader.string(); @@ -4604,12 +4630,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ApiViolationReason.decode = function decode(reader, length) { + ApiViolationReason.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -4779,12 +4807,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AvroFailureReason.decode = function decode(reader, length) { + AvroFailureReason.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -5023,12 +5053,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CloudStorageFailure.decode = function decode(reader, length) { + CloudStorageFailure.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.bucket = reader.string(); @@ -5370,12 +5402,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AwsMskFailureReason.decode = function decode(reader, length) { + AwsMskFailureReason.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.clusterArn = reader.string(); @@ -5719,12 +5753,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AzureEventHubsFailureReason.decode = function decode(reader, length) { + AzureEventHubsFailureReason.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.namespace = reader.string(); @@ -6068,12 +6104,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ConfluentCloudFailureReason.decode = function decode(reader, length) { + ConfluentCloudFailureReason.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.clusterId = reader.string(); @@ -6452,12 +6490,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Topic.decode = function decode(reader, length) { + Topic.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Topic(), key, value; while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -6892,12 +6932,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PubsubMessage.decode = function decode(reader, length) { + PubsubMessage.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PubsubMessage(), key, value; while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.data = reader.bytes(); @@ -7192,12 +7234,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetTopicRequest.decode = function decode(reader, length) { + GetTopicRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetTopicRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.topic = reader.string(); @@ -7406,12 +7450,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UpdateTopicRequest.decode = function decode(reader, length) { + UpdateTopicRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateTopicRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.topic = $root.google.pubsub.v1.Topic.decode(reader, reader.uint32()); @@ -7645,12 +7691,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishRequest.decode = function decode(reader, length) { + PublishRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.topic = reader.string(); @@ -7882,12 +7930,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PublishResponse.decode = function decode(reader, length) { + PublishResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PublishResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.messageIds && message.messageIds.length)) @@ -8121,12 +8171,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsRequest.decode = function decode(reader, length) { + ListTopicsRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.project = reader.string(); @@ -8362,12 +8414,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicsResponse.decode = function decode(reader, length) { + ListTopicsResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicsResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.topics && message.topics.length)) @@ -8619,12 +8673,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicSubscriptionsRequest.decode = function decode(reader, length) { + ListTopicSubscriptionsRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.topic = reader.string(); @@ -8860,12 +8916,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicSubscriptionsResponse.decode = function decode(reader, length) { + ListTopicSubscriptionsResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSubscriptionsResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.subscriptions && message.subscriptions.length)) @@ -9112,12 +9170,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicSnapshotsRequest.decode = function decode(reader, length) { + ListTopicSnapshotsRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.topic = reader.string(); @@ -9353,12 +9413,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListTopicSnapshotsResponse.decode = function decode(reader, length) { + ListTopicSnapshotsResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListTopicSnapshotsResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.snapshots && message.snapshots.length)) @@ -9583,12 +9645,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DeleteTopicRequest.decode = function decode(reader, length) { + DeleteTopicRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteTopicRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.topic = reader.string(); @@ -9786,12 +9850,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DetachSubscriptionRequest.decode = function decode(reader, length) { + DetachSubscriptionRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DetachSubscriptionRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -9978,12 +10044,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DetachSubscriptionResponse.decode = function decode(reader, length) { + DetachSubscriptionResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DetachSubscriptionResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -10927,12 +10995,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Subscription.decode = function decode(reader, length) { + Subscription.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription(), key, value; while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -11474,12 +11544,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AnalyticsHubSubscriptionInfo.decode = function decode(reader, length) { + AnalyticsHubSubscriptionInfo.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.listing = reader.string(); @@ -11704,12 +11776,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - RetryPolicy.decode = function decode(reader, length) { + RetryPolicy.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.RetryPolicy(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.minimumBackoff = $root.google.protobuf.Duration.decode(reader, reader.uint32()); @@ -11941,12 +12015,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DeadLetterPolicy.decode = function decode(reader, length) { + DeadLetterPolicy.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeadLetterPolicy(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.deadLetterTopic = reader.string(); @@ -12157,12 +12233,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ExpirationPolicy.decode = function decode(reader, length) { + ExpirationPolicy.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ExpirationPolicy(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.ttl = $root.google.protobuf.Duration.decode(reader, reader.uint32()); @@ -12436,12 +12514,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PushConfig.decode = function decode(reader, length) { + PushConfig.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig(), key, value; while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.pushEndpoint = reader.string(); @@ -12762,12 +12842,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - OidcToken.decode = function decode(reader, length) { + OidcToken.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.OidcToken(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.serviceAccountEmail = reader.string(); @@ -12967,12 +13049,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PubsubWrapper.decode = function decode(reader, length) { + PubsubWrapper.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.PubsubWrapper(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -13153,12 +13237,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - NoWrapper.decode = function decode(reader, length) { + NoWrapper.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PushConfig.NoWrapper(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.writeMetadata = reader.bool(); @@ -13425,12 +13511,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - BigQueryConfig.decode = function decode(reader, length) { + BigQueryConfig.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.BigQueryConfig(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.table = reader.string(); @@ -13886,12 +13974,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CloudStorageConfig.decode = function decode(reader, length) { + CloudStorageConfig.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CloudStorageConfig(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.bucket = reader.string(); @@ -14291,12 +14381,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - TextConfig.decode = function decode(reader, length) { + TextConfig.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CloudStorageConfig.TextConfig(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -14488,12 +14580,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AvroConfig.decode = function decode(reader, length) { + AvroConfig.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CloudStorageConfig.AvroConfig(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.writeMetadata = reader.bool(); @@ -14751,12 +14845,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ReceivedMessage.decode = function decode(reader, length) { + ReceivedMessage.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ReceivedMessage(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.ackId = reader.string(); @@ -14984,12 +15080,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetSubscriptionRequest.decode = function decode(reader, length) { + GetSubscriptionRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSubscriptionRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -15198,12 +15296,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UpdateSubscriptionRequest.decode = function decode(reader, length) { + UpdateSubscriptionRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSubscriptionRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = $root.google.pubsub.v1.Subscription.decode(reader, reader.uint32()); @@ -15446,12 +15546,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSubscriptionsRequest.decode = function decode(reader, length) { + ListSubscriptionsRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.project = reader.string(); @@ -15687,12 +15789,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSubscriptionsResponse.decode = function decode(reader, length) { + ListSubscriptionsResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSubscriptionsResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.subscriptions && message.subscriptions.length)) @@ -15922,12 +16026,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DeleteSubscriptionRequest.decode = function decode(reader, length) { + DeleteSubscriptionRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSubscriptionRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -16136,12 +16242,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ModifyPushConfigRequest.decode = function decode(reader, length) { + ModifyPushConfigRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyPushConfigRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -16379,12 +16487,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PullRequest.decode = function decode(reader, length) { + PullRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -16609,12 +16719,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PullResponse.decode = function decode(reader, length) { + PullResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.PullResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.receivedMessages && message.receivedMessages.length)) @@ -16855,12 +16967,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ModifyAckDeadlineRequest.decode = function decode(reader, length) { + ModifyAckDeadlineRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ModifyAckDeadlineRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -17111,12 +17225,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AcknowledgeRequest.decode = function decode(reader, length) { + AcknowledgeRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.AcknowledgeRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -17427,12 +17543,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - StreamingPullRequest.decode = function decode(reader, length) { + StreamingPullRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -17827,12 +17945,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - StreamingPullResponse.decode = function decode(reader, length) { + StreamingPullResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.receivedMessages && message.receivedMessages.length)) @@ -18140,12 +18260,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - AcknowledgeConfirmation.decode = function decode(reader, length) { + AcknowledgeConfirmation.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse.AcknowledgeConfirmation(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.ackIds && message.ackIds.length)) @@ -18464,12 +18586,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ModifyAckDeadlineConfirmation.decode = function decode(reader, length) { + ModifyAckDeadlineConfirmation.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse.ModifyAckDeadlineConfirmation(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.ackIds && message.ackIds.length)) @@ -18745,12 +18869,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SubscriptionProperties.decode = function decode(reader, length) { + SubscriptionProperties.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.StreamingPullResponse.SubscriptionProperties(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.exactlyOnceDeliveryEnabled = reader.bool(); @@ -18988,12 +19114,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CreateSnapshotRequest.decode = function decode(reader, length) { + CreateSnapshotRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSnapshotRequest(), key, value; while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -19261,12 +19389,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UpdateSnapshotRequest.decode = function decode(reader, length) { + UpdateSnapshotRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.UpdateSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.snapshot = $root.google.pubsub.v1.Snapshot.decode(reader, reader.uint32()); @@ -19522,12 +19652,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Snapshot.decode = function decode(reader, length) { + Snapshot.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Snapshot(), key, value; while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -19801,12 +19933,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetSnapshotRequest.decode = function decode(reader, length) { + GetSnapshotRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.snapshot = reader.string(); @@ -20026,12 +20160,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSnapshotsRequest.decode = function decode(reader, length) { + ListSnapshotsRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.project = reader.string(); @@ -20267,12 +20403,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSnapshotsResponse.decode = function decode(reader, length) { + ListSnapshotsResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSnapshotsResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.snapshots && message.snapshots.length)) @@ -20502,12 +20640,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DeleteSnapshotRequest.decode = function decode(reader, length) { + DeleteSnapshotRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSnapshotRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.snapshot = reader.string(); @@ -20741,12 +20881,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SeekRequest.decode = function decode(reader, length) { + SeekRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.subscription = reader.string(); @@ -20974,12 +21116,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SeekResponse.decode = function decode(reader, length) { + SeekResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.SeekResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -21569,12 +21713,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Schema.decode = function decode(reader, length) { + Schema.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.Schema(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -21904,12 +22050,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CreateSchemaRequest.decode = function decode(reader, length) { + CreateSchemaRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CreateSchemaRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.parent = reader.string(); @@ -22148,12 +22296,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GetSchemaRequest.decode = function decode(reader, length) { + GetSchemaRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.GetSchemaRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -22421,12 +22571,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSchemasRequest.decode = function decode(reader, length) { + ListSchemasRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSchemasRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.parent = reader.string(); @@ -22698,12 +22850,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSchemasResponse.decode = function decode(reader, length) { + ListSchemasResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSchemasResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.schemas && message.schemas.length)) @@ -22966,12 +23120,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSchemaRevisionsRequest.decode = function decode(reader, length) { + ListSchemaRevisionsRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSchemaRevisionsRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -23243,12 +23399,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ListSchemaRevisionsResponse.decode = function decode(reader, length) { + ListSchemaRevisionsResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ListSchemaRevisionsResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.schemas && message.schemas.length)) @@ -23489,12 +23647,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CommitSchemaRequest.decode = function decode(reader, length) { + CommitSchemaRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.CommitSchemaRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -23721,12 +23881,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - RollbackSchemaRequest.decode = function decode(reader, length) { + RollbackSchemaRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.RollbackSchemaRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -23948,12 +24110,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DeleteSchemaRevisionRequest.decode = function decode(reader, length) { + DeleteSchemaRevisionRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSchemaRevisionRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -24164,12 +24328,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DeleteSchemaRequest.decode = function decode(reader, length) { + DeleteSchemaRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.DeleteSchemaRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -24378,12 +24544,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ValidateSchemaRequest.decode = function decode(reader, length) { + ValidateSchemaRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ValidateSchemaRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.parent = reader.string(); @@ -24588,12 +24756,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ValidateSchemaResponse.decode = function decode(reader, length) { + ValidateSchemaResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ValidateSchemaResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -24832,12 +25002,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ValidateMessageRequest.decode = function decode(reader, length) { + ValidateMessageRequest.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ValidateMessageRequest(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.parent = reader.string(); @@ -25123,12 +25295,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ValidateMessageResponse.decode = function decode(reader, length) { + ValidateMessageResponse.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.ValidateMessageResponse(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -25353,12 +25527,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Http.decode = function decode(reader, length) { + Http.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Http(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.rules && message.rules.length)) @@ -25703,12 +25879,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - HttpRule.decode = function decode(reader, length) { + HttpRule.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.HttpRule(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.selector = reader.string(); @@ -26087,12 +26265,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CustomHttpPattern.decode = function decode(reader, length) { + CustomHttpPattern.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CustomHttpPattern(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.kind = reader.string(); @@ -26319,12 +26499,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CommonLanguageSettings.decode = function decode(reader, length) { + CommonLanguageSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CommonLanguageSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.referenceDocsUri = reader.string(); @@ -26688,12 +26870,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ClientLibrarySettings.decode = function decode(reader, length) { + ClientLibrarySettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ClientLibrarySettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.version = reader.string(); @@ -27217,12 +27401,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Publishing.decode = function decode(reader, length) { + Publishing.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.Publishing(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 2: { if (!(message.methodSettings && message.methodSettings.length)) @@ -27668,12 +27854,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - JavaSettings.decode = function decode(reader, length) { + JavaSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.JavaSettings(), key, value; while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.libraryPackage = reader.string(); @@ -27935,12 +28123,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - CppSettings.decode = function decode(reader, length) { + CppSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.CppSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); @@ -28143,12 +28333,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PhpSettings.decode = function decode(reader, length) { + PhpSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PhpSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); @@ -28351,12 +28543,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - PythonSettings.decode = function decode(reader, length) { + PythonSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PythonSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); @@ -28559,12 +28753,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - NodeSettings.decode = function decode(reader, length) { + NodeSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.NodeSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); @@ -28832,12 +29028,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DotnetSettings.decode = function decode(reader, length) { + DotnetSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.DotnetSettings(), key, value; while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); @@ -29211,12 +29409,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - RubySettings.decode = function decode(reader, length) { + RubySettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.RubySettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); @@ -29419,12 +29619,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GoSettings.decode = function decode(reader, length) { + GoSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.GoSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); @@ -29651,12 +29853,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MethodSettings.decode = function decode(reader, length) { + MethodSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.MethodSettings(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.selector = reader.string(); @@ -29929,12 +30133,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - LongRunning.decode = function decode(reader, length) { + LongRunning.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.MethodSettings.LongRunning(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.initialPollDelay = $root.google.protobuf.Duration.decode(reader, reader.uint32()); @@ -30356,12 +30562,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ResourceDescriptor.decode = function decode(reader, length) { + ResourceDescriptor.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceDescriptor(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.type = reader.string(); @@ -30751,12 +30959,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ResourceReference.decode = function decode(reader, length) { + ResourceReference.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.ResourceReference(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.type = reader.string(); @@ -30981,12 +31191,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FileDescriptorSet.decode = function decode(reader, length) { + FileDescriptorSet.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorSet(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.file && message.file.length)) @@ -31381,12 +31593,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FileDescriptorProto.decode = function decode(reader, length) { + FileDescriptorProto.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileDescriptorProto(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -32048,12 +32262,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - DescriptorProto.decode = function decode(reader, length) { + DescriptorProto.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -32533,12 +32749,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ExtensionRange.decode = function decode(reader, length) { + ExtensionRange.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ExtensionRange(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.start = reader.int32(); @@ -32777,12 +32995,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ReservedRange.decode = function decode(reader, length) { + ReservedRange.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.DescriptorProto.ReservedRange(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.start = reader.int32(); @@ -33033,12 +33253,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ExtensionRangeOptions.decode = function decode(reader, length) { + ExtensionRangeOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) @@ -33378,12 +33600,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Declaration.decode = function decode(reader, length) { + Declaration.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ExtensionRangeOptions.Declaration(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.number = reader.int32(); @@ -33757,12 +33981,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FieldDescriptorProto.decode = function decode(reader, length) { + FieldDescriptorProto.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldDescriptorProto(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -34282,12 +34508,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - OneofDescriptorProto.decode = function decode(reader, length) { + OneofDescriptorProto.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofDescriptorProto(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -34553,12 +34781,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumDescriptorProto.decode = function decode(reader, length) { + EnumDescriptorProto.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -34872,12 +35102,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumReservedRange.decode = function decode(reader, length) { + EnumReservedRange.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumDescriptorProto.EnumReservedRange(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.start = reader.int32(); @@ -35113,12 +35345,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumValueDescriptorProto.decode = function decode(reader, length) { + EnumValueDescriptorProto.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueDescriptorProto(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -35370,12 +35604,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ServiceDescriptorProto.decode = function decode(reader, length) { + ServiceDescriptorProto.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceDescriptorProto(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -35678,12 +35914,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MethodDescriptorProto.decode = function decode(reader, length) { + MethodDescriptorProto.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodDescriptorProto(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.name = reader.string(); @@ -36182,12 +36420,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FileOptions.decode = function decode(reader, length) { + FileOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FileOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.javaPackage = reader.string(); @@ -36802,12 +37042,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MessageOptions.decode = function decode(reader, length) { + MessageOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MessageOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.messageSetWireFormat = reader.bool(); @@ -37282,12 +37524,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FieldOptions.decode = function decode(reader, length) { + FieldOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.ctype = reader.int32(); @@ -38013,12 +38257,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EditionDefault.decode = function decode(reader, length) { + EditionDefault.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions.EditionDefault(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 3: { message.edition = reader.int32(); @@ -38309,12 +38555,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - OneofOptions.decode = function decode(reader, length) { + OneofOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.OneofOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); @@ -38595,12 +38843,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumOptions.decode = function decode(reader, length) { + EnumOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 2: { message.allowAlias = reader.bool(); @@ -38907,12 +39157,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - EnumValueOptions.decode = function decode(reader, length) { + EnumValueOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.EnumValueOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.deprecated = reader.bool(); @@ -39229,12 +39481,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - ServiceOptions.decode = function decode(reader, length) { + ServiceOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.ServiceOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 34: { message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); @@ -39577,12 +39831,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - MethodOptions.decode = function decode(reader, length) { + MethodOptions.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.MethodOptions(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 33: { message.deprecated = reader.bool(); @@ -39994,12 +40250,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - UninterpretedOption.decode = function decode(reader, length) { + UninterpretedOption.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 2: { if (!(message.name && message.name.length)) @@ -40333,12 +40591,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - NamePart.decode = function decode(reader, length) { + NamePart.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.UninterpretedOption.NamePart(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.namePart = reader.string(); @@ -40609,12 +40869,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FeatureSet.decode = function decode(reader, length) { + FeatureSet.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FeatureSet(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.fieldPresence = reader.int32(); @@ -41144,12 +41406,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FeatureSetDefaults.decode = function decode(reader, length) { + FeatureSetDefaults.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FeatureSetDefaults(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.defaults && message.defaults.length)) @@ -41528,12 +41792,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FeatureSetEditionDefault.decode = function decode(reader, length) { + FeatureSetEditionDefault.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 3: { message.edition = reader.int32(); @@ -41818,12 +42084,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - SourceCodeInfo.decode = function decode(reader, length) { + SourceCodeInfo.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.location && message.location.length)) @@ -42093,12 +42361,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Location.decode = function decode(reader, length) { + Location.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.SourceCodeInfo.Location(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.path && message.path.length)) @@ -42404,12 +42674,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - GeneratedCodeInfo.decode = function decode(reader, length) { + GeneratedCodeInfo.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.annotation && message.annotation.length)) @@ -42672,12 +42944,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Annotation.decode = function decode(reader, length) { + Annotation.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.GeneratedCodeInfo.Annotation(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.path && message.path.length)) @@ -42998,12 +43272,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Duration.decode = function decode(reader, length) { + Duration.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Duration(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.seconds = reader.int64(); @@ -43217,12 +43493,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Empty.decode = function decode(reader, length) { + Empty.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Empty(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { default: reader.skipType(tag & 7); @@ -43405,12 +43683,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - FieldMask.decode = function decode(reader, length) { + FieldMask.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldMask(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { if (!(message.paths && message.paths.length)) @@ -43633,12 +43913,14 @@ * @throws {Error} If the payload is not a reader or valid buffer * @throws {$protobuf.util.ProtocolError} If required fields are missing */ - Timestamp.decode = function decode(reader, length) { + Timestamp.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.Timestamp(); while (reader.pos < end) { var tag = reader.uint32(); + if (tag === error) + break; switch (tag >>> 3) { case 1: { message.seconds = reader.int64(); diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 2771ea3bb15..4befa0df29c 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -1,7 +1,4 @@ { - "options": { - "syntax": "proto3" - }, "nested": { "google": { "nested": { @@ -3648,6 +3645,7 @@ }, "nested": { "FileDescriptorSet": { + "edition": "proto2", "fields": { "file": { "rule": "repeated", @@ -3657,6 +3655,7 @@ } }, "Edition": { + "edition": "proto2", "values": { "EDITION_UNKNOWN": 0, "EDITION_PROTO2": 998, @@ -3672,6 +3671,7 @@ } }, "FileDescriptorProto": { + "edition": "proto2", "fields": { "name": { "type": "string", @@ -3689,18 +3689,12 @@ "publicDependency": { "rule": "repeated", "type": "int32", - "id": 10, - "options": { - "packed": false - } + "id": 10 }, "weakDependency": { "rule": "repeated", "type": "int32", - "id": 11, - "options": { - "packed": false - } + "id": 11 }, "messageType": { "rule": "repeated", @@ -3741,6 +3735,7 @@ } }, "DescriptorProto": { + "edition": "proto2", "fields": { "name": { "type": "string", @@ -3823,6 +3818,7 @@ } }, "ExtensionRangeOptions": { + "edition": "proto2", "fields": { "uninterpretedOption": { "rule": "repeated", @@ -3896,6 +3892,7 @@ } }, "FieldDescriptorProto": { + "edition": "proto2", "fields": { "name": { "type": "string", @@ -3975,6 +3972,7 @@ } }, "OneofDescriptorProto": { + "edition": "proto2", "fields": { "name": { "type": "string", @@ -3987,6 +3985,7 @@ } }, "EnumDescriptorProto": { + "edition": "proto2", "fields": { "name": { "type": "string", @@ -4028,6 +4027,7 @@ } }, "EnumValueDescriptorProto": { + "edition": "proto2", "fields": { "name": { "type": "string", @@ -4044,6 +4044,7 @@ } }, "ServiceDescriptorProto": { + "edition": "proto2", "fields": { "name": { "type": "string", @@ -4061,6 +4062,7 @@ } }, "MethodDescriptorProto": { + "edition": "proto2", "fields": { "name": { "type": "string", @@ -4095,6 +4097,7 @@ } }, "FileOptions": { + "edition": "proto2", "fields": { "javaPackage": { "type": "string", @@ -4236,6 +4239,7 @@ } }, "MessageOptions": { + "edition": "proto2", "fields": { "messageSetWireFormat": { "type": "bool", @@ -4309,6 +4313,7 @@ ] }, "FieldOptions": { + "edition": "proto2", "fields": { "ctype": { "type": "CType", @@ -4370,10 +4375,7 @@ "targets": { "rule": "repeated", "type": "OptionTargetType", - "id": 19, - "options": { - "packed": false - } + "id": 19 }, "editionDefaults": { "rule": "repeated", @@ -4457,6 +4459,7 @@ } }, "OneofOptions": { + "edition": "proto2", "fields": { "features": { "type": "FeatureSet", @@ -4476,6 +4479,7 @@ ] }, "EnumOptions": { + "edition": "proto2", "fields": { "allowAlias": { "type": "bool", @@ -4519,6 +4523,7 @@ ] }, "EnumValueOptions": { + "edition": "proto2", "fields": { "deprecated": { "type": "bool", @@ -4552,6 +4557,7 @@ ] }, "ServiceOptions": { + "edition": "proto2", "fields": { "features": { "type": "FeatureSet", @@ -4578,6 +4584,7 @@ ] }, "MethodOptions": { + "edition": "proto2", "fields": { "deprecated": { "type": "bool", @@ -4620,6 +4627,7 @@ } }, "UninterpretedOption": { + "edition": "proto2", "fields": { "name": { "rule": "repeated", @@ -4669,6 +4677,7 @@ } }, "FeatureSet": { + "edition": "proto2", "fields": { "fieldPresence": { "type": "FieldPresence", @@ -4810,6 +4819,7 @@ } }, "FeatureSetDefaults": { + "edition": "proto2", "fields": { "defaults": { "rule": "repeated", @@ -4841,6 +4851,7 @@ } }, "SourceCodeInfo": { + "edition": "proto2", "fields": { "location": { "rule": "repeated", @@ -4854,12 +4865,18 @@ "path": { "rule": "repeated", "type": "int32", - "id": 1 + "id": 1, + "options": { + "packed": true + } }, "span": { "rule": "repeated", "type": "int32", - "id": 2 + "id": 2, + "options": { + "packed": true + } }, "leadingComments": { "type": "string", @@ -4879,6 +4896,7 @@ } }, "GeneratedCodeInfo": { + "edition": "proto2", "fields": { "annotation": { "rule": "repeated", @@ -4892,7 +4910,10 @@ "path": { "rule": "repeated", "type": "int32", - "id": 1 + "id": 1, + "options": { + "packed": true + } }, "sourceFile": { "type": "string", diff --git a/handwritten/pubsub/src/debug.ts b/handwritten/pubsub/src/debug.ts index b7856dd4453..532b6d2febb 100644 --- a/handwritten/pubsub/src/debug.ts +++ b/handwritten/pubsub/src/debug.ts @@ -31,6 +31,6 @@ export class DebugMessage { constructor( public message: string, - public error?: Error + public error?: Error, ) {} } diff --git a/handwritten/pubsub/src/default-options.ts b/handwritten/pubsub/src/default-options.ts index 4e502e8bdaa..7f09392d51d 100644 --- a/handwritten/pubsub/src/default-options.ts +++ b/handwritten/pubsub/src/default-options.ts @@ -34,16 +34,16 @@ export const defaultOptions = { // The maximum length of time a message's lease will be extended by. maxAckDeadline: Duration.from({minutes: 10}), - // The maximum number of minutes that a message's lease will ever + // The maximum amount of time that a message's lease will ever // be extended. - maxExtensionMinutes: 60, + maxExtensionTime: Duration.from({minutes: 60}), // The maximum number of subscription streams/threads that will ever // be opened. maxStreams: 5, // The starting number of seconds that ack deadlines will be extended. - ackDeadline: 10, + startingAckDeadline: Duration.from({seconds: 10}), }, publish: { diff --git a/handwritten/pubsub/src/exponential-retry.ts b/handwritten/pubsub/src/exponential-retry.ts index ddd3a4cdccf..dd12a5b0b60 100644 --- a/handwritten/pubsub/src/exponential-retry.ts +++ b/handwritten/pubsub/src/exponential-retry.ts @@ -170,7 +170,7 @@ export class ExponentialRetry { next.retryInfo!.callback( next as unknown as T, - Duration.from({millis: now - next.retryInfo!.firstRetry}) + Duration.from({millis: now - next.retryInfo!.firstRetry}), ); } else { break; diff --git a/handwritten/pubsub/src/histogram.ts b/handwritten/pubsub/src/histogram.ts index 6a7d50c2b2a..0b00223eed6 100644 --- a/handwritten/pubsub/src/histogram.ts +++ b/handwritten/pubsub/src/histogram.ts @@ -34,7 +34,7 @@ export class Histogram { constructor(options?: HistogramOptions) { this.options = Object.assign( {min: 0, max: Number.MAX_SAFE_INTEGER}, - options + options, ); this.data = new Map(); this.length = 0; diff --git a/handwritten/pubsub/src/iam.ts b/handwritten/pubsub/src/iam.ts index efc77501346..eec8932e990 100644 --- a/handwritten/pubsub/src/iam.ts +++ b/handwritten/pubsub/src/iam.ts @@ -168,7 +168,7 @@ export class IAM { getPolicy(gaxOpts: CallOptions, callback: GetPolicyCallback): void; getPolicy( optsOrCallback?: CallOptions | GetPolicyCallback, - callback?: GetPolicyCallback + callback?: GetPolicyCallback, ): Promise | void { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -184,7 +184,7 @@ export class IAM { reqOpts, gaxOpts, }, - callback! + callback!, ); } @@ -251,13 +251,13 @@ export class IAM { setPolicy( policy: Policy, gaxOpts: CallOptions, - callback: SetPolicyCallback + callback: SetPolicyCallback, ): void; setPolicy(policy: Policy, callback: SetPolicyCallback): void; setPolicy( policy: Policy, optsOrCallback?: CallOptions | SetPolicyCallback, - callback?: SetPolicyCallback + callback?: SetPolicyCallback, ): Promise | void { if (!(typeof policy === 'object')) { throw new Error('A policy object is required.'); @@ -278,7 +278,7 @@ export class IAM { reqOpts, gaxOpts, }, - callback! + callback!, ); } @@ -362,21 +362,21 @@ export class IAM { */ testPermissions( permissions: string | string[], - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise; testPermissions( permissions: string | string[], gaxOpts: CallOptions, - callback: TestIamPermissionsCallback + callback: TestIamPermissionsCallback, ): void; testPermissions( permissions: string | string[], - callback: TestIamPermissionsCallback + callback: TestIamPermissionsCallback, ): void; testPermissions( permissions: string | string[], optsOrCallback?: CallOptions | TestIamPermissionsCallback, - callback?: TestIamPermissionsCallback + callback?: TestIamPermissionsCallback, ): Promise | void { if (!Array.isArray(permissions) && !(typeof permissions === 'string')) { throw new Error('Permissions are required.'); @@ -411,10 +411,10 @@ export class IAM { acc[permission] = availablePermissions.indexOf(permission) > -1; return acc; }, - {} as {[key: string]: boolean} + {} as {[key: string]: boolean}, ); callback!(null, permissionHash, resp!); - } + }, ); } } diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 15b5a1d32eb..2c9371069e7 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -184,8 +184,3 @@ if (process.env.DEBUG_GRPC) { } import * as protos from '../protos/protos'; export {protos}; - -// Deprecated; please see the updated OpenTelemetry sample -// for an example of how to use telemetry in this library. -import {legacyExports} from './telemetry-tracing'; -export {legacyExports as openTelemetry}; diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index 88e92640a25..cb55af2feb4 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -23,10 +23,6 @@ export interface FlowControlOptions { allowExcessMessages?: boolean; maxBytes?: number; maxMessages?: number; - maxExtensionMinutes?: number; - - /** @deprecated Use maxExtensionMinutes. */ - maxExtension?: number; } /** @@ -194,28 +190,9 @@ export class LeaseManager extends EventEmitter { * @private */ setOptions(options: FlowControlOptions): void { - // Convert the old deprecated maxExtension to avoid breaking clients, - // but allow only one. - if ( - options.maxExtension !== undefined && - options.maxExtensionMinutes !== undefined - ) { - throw new RangeError( - 'Only one of "maxExtension" or "maxExtensionMinutes" may be set for subscriber lease management options' - ); - } - if ( - options.maxExtension !== undefined && - options.maxExtensionMinutes === undefined - ) { - options.maxExtensionMinutes = options.maxExtension / 60; - delete options.maxExtension; - } - const defaults: FlowControlOptions = { allowExcessMessages: true, maxBytes: defaultOptions.subscription.maxOutstandingBytes, - maxExtensionMinutes: defaultOptions.subscription.maxExtensionMinutes, maxMessages: defaultOptions.subscription.maxOutstandingMessages, }; @@ -260,19 +237,20 @@ export class LeaseManager extends EventEmitter { * @private */ private _extendDeadlines(): void { - const deadline = this._subscriber.ackDeadline; + const deadline = Duration.from({seconds: this._subscriber.ackDeadline}); + const maxExtensionMinutes = + this._subscriber.maxExtensionTime.totalOf('minute'); for (const message of this._messages) { // Lifespan here is in minutes. const lifespan = (Date.now() - message.received) / (60 * 1000); - if (lifespan < this._options.maxExtensionMinutes!) { - const deadlineDuration = Duration.from({seconds: deadline}); - message.subSpans.modAckStart(deadlineDuration, false); + if (lifespan < maxExtensionMinutes) { + message.subSpans.modAckStart(deadline, false); if (this._subscriber.isExactlyOnceDelivery) { message - .modAckWithResponse(deadline) + .modAckWithResponse(deadline.totalOf('second')) .catch(e => { // In the case of a permanent failure (temporary failures are retried), // we need to stop trying to lease-manage the message. @@ -283,8 +261,8 @@ export class LeaseManager extends EventEmitter { message.subSpans.modAckEnd(); }); } else { - message.modAck(deadline); - message.subSpans.modAckStart(deadlineDuration, false); + message.modAck(deadline.totalOf('second')); + message.subSpans.modAckStart(deadline, false); } } else { this.remove(message); diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index adc565c3ecd..1788991cfb9 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -89,7 +89,7 @@ export class BatchError extends DebugMessage { `Failed to "${rpc}" for ${ackIds.length} message(s). Reason: ${ process.env.DEBUG_GRPC ? err.stack : err.message }`, - err + err, ); this.ackIds = ackIds; @@ -141,7 +141,7 @@ export abstract class MessageQueue { this._subscriber = sub; this._retrier = new ExponentialRetry( Duration.from({seconds: 1}), - Duration.from({seconds: 64}) + Duration.from({seconds: 64}), ); this.setOptions(options); @@ -167,7 +167,7 @@ export abstract class MessageQueue { if (r.responsePromise) { if (isExactlyOnceDelivery) { r.responsePromise.reject( - new AckError(AckResponses.Invalid, 'Subscriber closed') + new AckError(AckResponses.Invalid, 'Subscriber closed'), ); } else { r.responsePromise.resolve(); @@ -195,12 +195,12 @@ export abstract class MessageQueue { * @param {number} [deadline] The deadline in seconds. * @private */ - add(message: Message, deadline?: number): Promise { + async add(message: Message, deadline?: number): Promise { if (this._closed) { if (this._subscriber.isExactlyOnceDelivery) { throw new AckError(AckResponses.Invalid, 'Subscriber closed'); } else { - return Promise.resolve(); + return; } } @@ -213,7 +213,7 @@ export abstract class MessageQueue { this._requests.length + 1 >= maxMessages! || this.bytes + size >= MAX_BATCH_BYTES ) { - this.flush(); + await this.flush(); } // Add the message to the current batch. @@ -249,7 +249,7 @@ export abstract class MessageQueue { // Has it been too long? if (totalTime.totalOf('minute') >= 10 || this.shouldFailEarly(message)) { message.responsePromise?.reject( - new AckError(AckResponses.Invalid, 'Retried for too long') + new AckError(AckResponses.Invalid, 'Retried for too long'), ); return; } @@ -264,7 +264,7 @@ export abstract class MessageQueue { if (!this._timer) { this._timer = setTimeout( () => this.flush(), - this._options.maxMilliseconds! + this._options.maxMilliseconds!, ); } } @@ -396,7 +396,7 @@ export abstract class MessageQueue { handleAckFailures( operation: string, batch: QueuedMessages, - rpcError: GoogleError + rpcError: GoogleError, ) { const toSucceed: QueuedMessages = []; const toRetry: QueuedMessages = []; @@ -505,7 +505,7 @@ export class AckQueue extends MessageQueue { const responseSpan = tracing.PubsubSpans.createAckRpcSpan( batch.map(b => b.message.tracingSpan), this._subscriber.name, - 'AckQueue._sendBatch' + 'AckQueue._sendBatch', ); const client = await this._subscriber.getClient(); const ackIds = batch.map(({message}) => message.ackId); @@ -576,7 +576,7 @@ export class ModAckQueue extends MessageQueue { table[message.deadline!].push(message); return table; }, - {} + {}, ); const callOptions = this.getCallOptions(); @@ -591,7 +591,7 @@ export class ModAckQueue extends MessageQueue { this._subscriber.name, ackDeadlineSeconds === 0 ? 'nack' : 'modack', 'ModAckQueue._sendBatch', - Duration.from({seconds: ackDeadlineSeconds}) + Duration.from({seconds: ackDeadlineSeconds}), ); try { @@ -617,7 +617,7 @@ export class ModAckQueue extends MessageQueue { const newBatch = this.handleAckFailures( 'modAck', messages, - grpcError + grpcError, ); return newBatch.toRetry; } diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 07365838229..0706d3b22c3 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -114,7 +114,7 @@ export class ChannelError extends Error implements grpc.ServiceError { super( `Failed to connect to channel. Reason: ${ process.env.DEBUG_GRPC ? err.stack : err.message - }` + }`, ); this.code = err.message.includes('deadline') ? grpc.status.DEADLINE_EXCEEDED @@ -156,7 +156,7 @@ export class MessageStream extends PassThrough { this._options = options; this._retrier = new ExponentialRetry<{}>( options.retryMinBackoff!, // Filled by DEFAULT_OPTIONS - options.retryMaxBackoff! + options.retryMaxBackoff!, ); this._streams = []; @@ -178,7 +178,7 @@ export class MessageStream extends PassThrough { this._keepAliveHandle = setInterval( () => this._keepAlive(), - KEEP_ALIVE_INTERVAL + KEEP_ALIVE_INTERVAL, ); this._keepAliveHandle.unref(); } @@ -346,7 +346,7 @@ export class MessageStream extends PassThrough { */ private async _getClient(): Promise { const client = await this._subscriber.getClient(); - client.initialize(); + await client.initialize(); return client.subscriberStub as Promise; } @@ -391,22 +391,22 @@ export class MessageStream extends PassThrough { 'debug', new DebugMessage( `Subscriber stream ${index} has ended with status ${status.code}; will be retried.`, - statusError - ) + statusError, + ), ); if (PullRetry.resetFailures(status)) { this._retrier.reset(this._streams[index]); } - this._retrier.retryLater(this._streams[index], () => { - this._fillOne(index); - }); + this._retrier.retryLater(this._streams[index], () => + this._fillOne(index), + ); } else if (this._activeStreams() === 0) { this.emit( 'debug', new DebugMessage( `Subscriber stream ${index} has ended with status ${status.code}; will not be retried.`, - statusError - ) + statusError, + ), ); // No streams left, and nothing to retry. diff --git a/handwritten/pubsub/src/publisher/flow-control.ts b/handwritten/pubsub/src/publisher/flow-control.ts index ee467e32988..6683c9e5ead 100644 --- a/handwritten/pubsub/src/publisher/flow-control.ts +++ b/handwritten/pubsub/src/publisher/flow-control.ts @@ -73,7 +73,7 @@ export class FlowControl { ) { // Undefined is okay, but if either is zero, no publishes ever happen. throw new Error( - 'When using publisher flow control, maxOutstandingBytes and maxOutstandingMessages must not be zero' + 'When using publisher flow control, maxOutstandingBytes and maxOutstandingMessages must not be zero', ); } } diff --git a/handwritten/pubsub/src/publisher/flow-publisher.ts b/handwritten/pubsub/src/publisher/flow-publisher.ts index 74e3b32797f..34e1a8dd07a 100644 --- a/handwritten/pubsub/src/publisher/flow-publisher.ts +++ b/handwritten/pubsub/src/publisher/flow-publisher.ts @@ -90,7 +90,7 @@ export class FlowControlledPublisher { const waitPromise = this.flowControl.willSend(size, 1); return waitPromise.then(doPublish); } else { - this.flowControl.willSend(size, 1).then(() => {}); + void this.flowControl.willSend(size, 1).then(() => {}); doPublish(); return null; } diff --git a/handwritten/pubsub/src/publisher/index.ts b/handwritten/pubsub/src/publisher/index.ts index 01692a5a1fb..2046c61699f 100644 --- a/handwritten/pubsub/src/publisher/index.ts +++ b/handwritten/pubsub/src/publisher/index.ts @@ -38,9 +38,6 @@ export interface PublishOptions { flowControlOptions?: FlowControlOptions; gaxOpts?: CallOptions; messageOrdering?: boolean; - - /** @deprecated Unset and use context propagation. */ - enableOpenTelemetryTracing?: boolean; } /** @@ -87,7 +84,7 @@ export class Publisher { constructor(topic: Topic, options?: PublishOptions) { this.flowControl = new FlowControl( - options?.flowControlOptions || flowControlDefaults + options?.flowControlOptions || flowControlDefaults, ); this.setOptions(options); this.topic = topic; @@ -124,8 +121,8 @@ export class Publisher { q.removeListener('drain', flushResolver); }; q.on('drain', flushResolver); - }) - ) + }), + ), ); const allPublishes = Promise.all(toDrain.map(q => q.publishDrain())); @@ -157,12 +154,12 @@ export class Publisher { publish( data: Buffer, attributes: Attributes, - callback: PublishCallback + callback: PublishCallback, ): void; publish( data: Buffer, attrsOrCb?: Attributes | PublishCallback, - callback?: PublishCallback + callback?: PublishCallback, ): Promise | void { const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; @@ -184,7 +181,7 @@ export class Publisher { publishMessage(message: PubsubMessage, callback: PublishCallback): void; publishMessage( message: PubsubMessage, - callback?: PublishCallback + callback?: PublishCallback, ): Promise | void { const {data, attributes = {}} = message; @@ -193,14 +190,14 @@ export class Publisher { // - `attributes` that are not empty if (data && !(data instanceof Uint8Array)) { throw new TypeError( - 'Data must be in the form of a Buffer or Uint8Array.' + 'Data must be in the form of a Buffer or Uint8Array.', ); } const keys = Object.keys(attributes!); if (!data && keys.length === 0) { throw new TypeError( - 'If data is undefined, at least one attribute must be present.' + 'If data is undefined, at least one attribute must be present.', ); } @@ -270,10 +267,9 @@ export class Publisher { gaxOpts: { isBundling: false, }, - enableOpenTelemetryTracing: false, flowControlOptions: Object.assign( {}, - flowControlDefaults + flowControlDefaults, ) as FlowControlOptions, }; @@ -290,26 +286,23 @@ export class Publisher { setOptions(options = {} as PublishOptions): void { const defaults = this.getOptionDefaults(); - const { - batching, - gaxOpts, - messageOrdering, - enableOpenTelemetryTracing, - flowControlOptions, - } = extend(true, defaults, options); + const {batching, gaxOpts, messageOrdering, flowControlOptions} = extend( + true, + defaults, + options, + ); this.settings = { batching: { maxBytes: Math.min(batching!.maxBytes!, BATCH_LIMITS.maxBytes!), maxMessages: Math.min( batching!.maxMessages!, - BATCH_LIMITS.maxMessages! + BATCH_LIMITS.maxMessages!, ), maxMilliseconds: batching!.maxMilliseconds, }, gaxOpts, messageOrdering, - enableOpenTelemetryTracing, flowControlOptions, }; @@ -336,7 +329,7 @@ export class Publisher { * @param {PubsubMessage} message The message to create a span for */ getParentSpan(message: PubsubMessage, caller: string): Span | undefined { - const enabled = tracing.isEnabled(this.settings); + const enabled = tracing.isEnabled(); if (!enabled) { return undefined; } @@ -348,12 +341,12 @@ export class Publisher { const span = tracing.PubsubSpans.createPublisherSpan( message, this.topic.name, - caller + caller, ); // If the span's context is valid we should inject the propagation trace context. if (span && isSpanContextValid(span.spanContext())) { - tracing.injectSpan(span, message, enabled); + tracing.injectSpan(span, message); } return span; diff --git a/handwritten/pubsub/src/publisher/message-batch.ts b/handwritten/pubsub/src/publisher/message-batch.ts index a1ecdb0bfe6..96e091bc3d3 100644 --- a/handwritten/pubsub/src/publisher/message-batch.ts +++ b/handwritten/pubsub/src/publisher/message-batch.ts @@ -59,7 +59,7 @@ export class MessageBatch { constructor( public options: BatchPublishOptions, - public topicName: string + public topicName: string, ) { this.messages = []; this.callbacks = []; @@ -90,6 +90,12 @@ export class MessageBatch { tracing.PubsubSpans.createPublishSchedulerSpan(message); } + /** + * Ends the current batch, and returns the messages and callbacks we've queued up. + * + * @private + * @internal + */ end(): BatchResults { this.messages.forEach(m => m.publishSchedulerSpan?.end()); return { diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 8ed396bc8b7..23f9ab8fb3d 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -90,7 +90,7 @@ export abstract class MessageQueue extends EventEmitter { */ async _publish( messages: PubsubMessage[], - callbacks: PublishCallback[] + callbacks: PublishCallback[], ): Promise { const {topic, settings} = this.publisher; const reqOpts = { @@ -118,7 +118,7 @@ export abstract class MessageQueue extends EventEmitter { const rpcSpan = tracing.PubsubSpans.createPublishRpcSpan( spanMessages, topic.name, - 'MessageQueue._publish' + 'MessageQueue._publish', ); const requestCallback = topic.request; diff --git a/handwritten/pubsub/src/publisher/pubsub-message.ts b/handwritten/pubsub/src/publisher/pubsub-message.ts index ac69563b164..ac979941680 100644 --- a/handwritten/pubsub/src/publisher/pubsub-message.ts +++ b/handwritten/pubsub/src/publisher/pubsub-message.ts @@ -87,7 +87,7 @@ export interface PubsubMessage * @internal */ export function filterMessage( - message: PubsubMessage + message: PubsubMessage, ): google.pubsub.v1.IPubsubMessage { const filtered = {} as PubsubMessage; if (message.data) { @@ -126,7 +126,7 @@ export function filterMessage( * @internal */ export function calculateMessageSize( - message: PubsubMessage | google.pubsub.v1.IPubsubMessage + message: PubsubMessage | google.pubsub.v1.IPubsubMessage, ) { // If it's not a PubsubMessage, we'll augment it into one. const msg = message as unknown as PubsubMessage; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index cbf0548c597..075d673f5cf 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -167,7 +167,7 @@ export interface ResourceCallback { ( err: gax.grpc.ServiceError | null, resource?: Resource | null, - response?: Response | null + response?: Response | null, ): void; } @@ -184,7 +184,7 @@ export interface PagedCallback { err: gax.grpc.ServiceError | null, results?: Item[] | null, nextQuery?: {} | null, - response?: Response | null + response?: Response | null, ): void; } @@ -200,7 +200,7 @@ export type ObjectStream = { prependListener(event: 'data', listener: (data: O) => void): ObjectStream; prependOnceListener( event: 'data', - listener: (data: O) => void + listener: (data: O) => void, ): ObjectStream; } & Transform; @@ -281,13 +281,13 @@ export class PubSub { // tslint:disable-next-line variable-name Promise?: PromiseConstructor; getSubscriptionsStream = paginator.streamify( - 'getSubscriptions' + 'getSubscriptions', ) as () => ObjectStream; getSnapshotsStream = paginator.streamify( - 'getSnapshots' + 'getSnapshots', ) as () => ObjectStream; getTopicsStream = paginator.streamify( - 'getTopics' + 'getTopics', ) as () => ObjectStream; isOpen = true; @@ -321,7 +321,7 @@ export class PubSub { libVersion: PKG.version, scopes: Object.keys(allScopes), }, - options + options, ); if (this.options.enableOpenTelemetryTracing) { @@ -412,7 +412,7 @@ export class PubSub { schemaId: string, type: SchemaType, definition: string, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise { // This populates projectId for us. await this.getClientConfig(); @@ -520,24 +520,24 @@ export class PubSub { createSubscription( topic: Topic | string, name: string, - options?: CreateSubscriptionOptions + options?: CreateSubscriptionOptions, ): Promise; createSubscription( topic: Topic | string, name: string, - callback: CreateSubscriptionCallback + callback: CreateSubscriptionCallback, ): void; createSubscription( topic: Topic | string, name: string, options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback + callback: CreateSubscriptionCallback, ): void; createSubscription( topic: Topic | string, name: string, optionsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, - callback?: CreateSubscriptionCallback + callback?: CreateSubscriptionCallback, ): Promise | void { if (typeof topic !== 'string' && !(topic instanceof Topic)) { throw new Error('A Topic is required for a new subscription.'); @@ -564,7 +564,7 @@ export class PubSub { delete options.flowControl; const metadata = Subscription.formatMetadata_( - options as SubscriptionMetadata + options as SubscriptionMetadata, ); let subscriptionCtorOptions = flowControl ? {flowControl} : {}; @@ -591,7 +591,7 @@ export class PubSub { subscription.metadata = resp!; callback!(null, subscription, resp!); - } + }, ); } @@ -639,21 +639,21 @@ export class PubSub { */ createTopic( name: string | TopicMetadata, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise; createTopic( name: string | TopicMetadata, - callback: CreateTopicCallback + callback: CreateTopicCallback, ): void; createTopic( name: string | TopicMetadata, gaxOpts: CallOptions, - callback: CreateTopicCallback + callback: CreateTopicCallback, ): void; createTopic( name: string | TopicMetadata, optsOrCallback?: CallOptions | CreateTopicCallback, - callback?: CreateTopicCallback + callback?: CreateTopicCallback, ): Promise | void { const reqOpts: TopicMetadata = typeof name === 'string' @@ -686,7 +686,7 @@ export class PubSub { topic.metadata = resp!; callback!(null, topic, resp!); - } + }, ); } @@ -722,18 +722,18 @@ export class PubSub { */ detachSubscription( name: string, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise; detachSubscription(name: string, callback: DetachSubscriptionCallback): void; detachSubscription( name: string, gaxOpts: CallOptions, - callback: DetachSubscriptionCallback + callback: DetachSubscriptionCallback, ): void; detachSubscription( name: string, optsOrCallback?: CallOptions | DetachSubscriptionCallback, - callback?: DetachSubscriptionCallback + callback?: DetachSubscriptionCallback, ): Promise | void { if (typeof name !== 'string') { throw new Error('A subscription name is required.'); @@ -754,7 +754,7 @@ export class PubSub { reqOpts, gaxOpts: gaxOpts as CallOptions, }, - callback! + callback!, ); } @@ -857,7 +857,7 @@ export class PubSub { */ async *listSchemas( view: SchemaView = SchemaViews.Basic, - options?: CallOptions + options?: CallOptions, ): AsyncIterable { const client = await this.getSchemaClient(); const query = { @@ -923,7 +923,7 @@ export class PubSub { getSnapshots(options: PageOptions, callback: GetSnapshotsCallback): void; getSnapshots( optsOrCallback?: PageOptions | GetSnapshotsCallback, - callback?: GetSnapshotsCallback + callback?: GetSnapshotsCallback, ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -932,7 +932,7 @@ export class PubSub { { project: PubSub.formatName_(this.projectId), }, - options + options, ); delete reqOpts.gaxOpts; @@ -942,7 +942,7 @@ export class PubSub { { autoPaginate: options.autoPaginate, }, - options.gaxOpts + options.gaxOpts, ); this.request< @@ -964,12 +964,12 @@ export class PubSub { const snapshotInstance = this.snapshot(snapshot.name!); snapshotInstance.metadata = snapshot; return snapshotInstance; - } + }, ); } callback!(err, snapshots!, ...args); - } + }, ); } @@ -1033,16 +1033,16 @@ export class PubSub { * ``` */ getSubscriptions( - options?: GetSubscriptionsOptions + options?: GetSubscriptionsOptions, ): Promise; getSubscriptions(callback: GetSubscriptionsCallback): void; getSubscriptions( options: GetSubscriptionsOptions, - callback: GetSubscriptionsCallback + callback: GetSubscriptionsCallback, ): void; getSubscriptions( optsOrCallback?: GetSubscriptionsOptions | GetSubscriptionsCallback, - callback?: GetSubscriptionsCallback + callback?: GetSubscriptionsCallback, ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -1054,12 +1054,12 @@ export class PubSub { } return topic.getSubscriptions( options, - callback as GetTopicSubscriptionsCallback + callback as GetTopicSubscriptionsCallback, ); } const reqOpts = Object.assign( {}, - options + options, ) as google.pubsub.v1.IListSubscriptionsRequest; reqOpts.project = 'projects/' + this.projectId; @@ -1070,7 +1070,7 @@ export class PubSub { { autoPaginate: options.autoPaginate, }, - options.gaxOpts + options.gaxOpts, ); this.request< @@ -1095,7 +1095,7 @@ export class PubSub { } (callback as GetAllSubscriptionsCallback)(err, subscriptions!, ...args); - } + }, ); } @@ -1162,7 +1162,7 @@ export class PubSub { getTopics(options: PageOptions, callback: GetTopicsCallback): void; getTopics( optsOrCallback?: PageOptions | GetTopicsCallback, - callback?: GetTopicsCallback + callback?: GetTopicsCallback, ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -1171,7 +1171,7 @@ export class PubSub { { project: 'projects/' + this.projectId, }, - options + options, ); delete reqOpts.gaxOpts; @@ -1181,7 +1181,7 @@ export class PubSub { { autoPaginate: options.autoPaginate, }, - options.gaxOpts + options.gaxOpts, ); this.request( @@ -1203,7 +1203,7 @@ export class PubSub { } callback!(err, topics!, ...args); - } + }, ); } @@ -1272,7 +1272,7 @@ export class PubSub { getClient_(config: GetClientConfig, callback: GetClientCallback) { this.getClientAsync_(config).then( client => callback(null, client), - callback + callback, ); } /** @@ -1476,7 +1476,7 @@ export class PubSub { parent: this.name, schema, }, - gaxOpts + gaxOpts, ); } diff --git a/handwritten/pubsub/src/schema.ts b/handwritten/pubsub/src/schema.ts index a332d0affaa..f2c97cb67a5 100644 --- a/handwritten/pubsub/src/schema.ts +++ b/handwritten/pubsub/src/schema.ts @@ -122,7 +122,7 @@ export class Schema { async create( type: SchemaType, definition: string, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise { const name = await this.getName(); await this.pubsub.createSchema(name, type, definition, gaxOpts); @@ -142,7 +142,7 @@ export class Schema { */ async get( view: SchemaView = SchemaViews.Full, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise { const client = await this.pubsub.getSchemaClient(); const name = await this.getName(); @@ -151,7 +151,7 @@ export class Schema { name, view, }, - gaxOpts + gaxOpts, ); return schema; @@ -173,7 +173,7 @@ export class Schema { { name, }, - gaxOpts + gaxOpts, ); } @@ -200,7 +200,7 @@ export class Schema { encoding: | google.pubsub.v1.Encoding | keyof typeof google.pubsub.v1.Encoding, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise { const client = await this.pubsub.getSchemaClient(); const name = await this.getName(); @@ -212,7 +212,7 @@ export class Schema { message, encoding, }, - gaxOpts + gaxOpts, ); } diff --git a/handwritten/pubsub/src/snapshot.ts b/handwritten/pubsub/src/snapshot.ts index da907ef60a6..1924015e5cf 100644 --- a/handwritten/pubsub/src/snapshot.ts +++ b/handwritten/pubsub/src/snapshot.ts @@ -145,7 +145,7 @@ export class Snapshot { method: 'deleteSnapshot', reqOpts, }, - callback! + callback!, ); } @@ -201,11 +201,11 @@ export class Snapshot { create(gaxOpts: CallOptions, callback: CreateSnapshotCallback): void; create( optsOrCallback?: CallOptions | CreateSnapshotCallback, - callback?: CreateSnapshotCallback + callback?: CreateSnapshotCallback, ): void | Promise { if (!(this.parent instanceof Subscription)) { throw new Error( - 'This is only available if you accessed this object through Subscription#snapshot' + 'This is only available if you accessed this object through Subscription#snapshot', ); } @@ -222,7 +222,7 @@ export class Snapshot { } Object.assign(this, snapshot); callback!(null, this, resp); - } + }, ); } @@ -258,11 +258,11 @@ export class Snapshot { seek(gaxOpts: CallOptions, callback: SeekCallback): void; seek( gaxOpts?: CallOptions | SeekCallback, - callback?: SeekCallback + callback?: SeekCallback, ): void | Promise { if (!(this.parent instanceof Subscription)) { throw new Error( - 'This is only available if you accessed this object through Subscription#snapshot' + 'This is only available if you accessed this object through Subscription#snapshot', ); } return this.parent.seek(this.name, gaxOpts! as CallOptions, callback!); diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 834165c7dbc..156ebfe55b0 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -152,7 +152,7 @@ export class SubscriberSpans { schedulerStart() { if (!this.scheduler) { this.scheduler = tracing.PubsubSpans.createReceiveSchedulerSpan( - this.parent + this.parent, ); } } @@ -171,7 +171,7 @@ export class SubscriberSpans { if (!this.processing) { this.processing = tracing.PubsubSpans.createReceiveProcessSpan( this.parent, - subName + subName, ); } } @@ -283,7 +283,7 @@ export class Message implements tracing.MessageWithAttributes { */ constructor( sub: Subscriber, - {ackId, message, deliveryAttempt}: google.pubsub.v1.IReceivedMessage + {ackId, message, deliveryAttempt}: google.pubsub.v1.IReceivedMessage, ) { /** * This ID is used to acknowledge the message. @@ -406,7 +406,7 @@ export class Message implements tracing.MessageWithAttributes { this._handled = true; this.subSpans.ackCall(); this.subSpans.processingEnd(); - this._subscriber.ack(this); + void this._subscriber.ack(this); } } @@ -456,7 +456,7 @@ export class Message implements tracing.MessageWithAttributes { modAck(deadline: number): void { if (!this._handled) { this.subSpans.modAckCall(Duration.from({seconds: deadline})); - this._subscriber.modAck(this, deadline); + void this._subscriber.modAck(this, deadline); } } @@ -506,7 +506,7 @@ export class Message implements tracing.MessageWithAttributes { this._handled = true; this.subSpans.nackCall(); this.subSpans.processingEnd(); - this._subscriber.nack(this); + void this._subscriber.nack(this); } } @@ -560,6 +560,8 @@ export class Message implements tracing.MessageWithAttributes { * ever have, while it's under library control. * @property {Duration} [maxAckDeadline] The maximum time that ackDeadline should * ever have, while it's under library control. + * @property {Duration} [maxExtensionTime] The maximum time that ackDeadline should + * ever have, while it's under library control. * @property {BatchOptions} [batching] Request batching options; this is for * batching acks and modacks being sent back to the server. * @property {FlowControlOptions} [flowControl] Flow control options. @@ -569,19 +571,13 @@ export class Message implements tracing.MessageWithAttributes { * @property {MessageStreamOptions} [streamingOptions] Streaming options. */ export interface SubscriberOptions { - /** @deprecated Use minAckDeadline and maxAckDeadline. */ - ackDeadline?: number; - minAckDeadline?: Duration; maxAckDeadline?: Duration; + maxExtensionTime?: Duration; batching?: BatchOptions; flowControl?: FlowControlOptions; useLegacyFlowControl?: boolean; streamingOptions?: MessageStreamOptions; - - /** @deprecated Unset this and instantiate a tracer; support will be - * enabled automatically. */ - enableOpenTelemetryTracing?: boolean; } const minAckDeadlineForExactlyOnceDelivery = Duration.from({seconds: 60}); @@ -601,10 +597,10 @@ export class Subscriber extends EventEmitter { maxBytes: number; useLegacyFlowControl: boolean; isOpen: boolean; + maxExtensionTime: Duration; private _acks!: AckQueue; private _histogram: Histogram; private _inventory!: LeaseManager; - private _useLegacyOpenTelemetry: boolean; private _latencies: Histogram; private _modAcks!: ModAckQueue; private _name!: string; @@ -617,12 +613,13 @@ export class Subscriber extends EventEmitter { constructor(subscription: Subscription, options = {}) { super(); - this.ackDeadline = defaultOptions.subscription.ackDeadline; + this.ackDeadline = + defaultOptions.subscription.startingAckDeadline.totalOf('second'); this.maxMessages = defaultOptions.subscription.maxOutstandingMessages; this.maxBytes = defaultOptions.subscription.maxOutstandingBytes; + this.maxExtensionTime = defaultOptions.subscription.maxExtensionTime; this.useLegacyFlowControl = false; this.isOpen = false; - this._useLegacyOpenTelemetry = false; this._histogram = new Histogram({min: 10, max: 600}); this._latencies = new Histogram(); this._subscription = subscription; @@ -718,7 +715,7 @@ export class Subscriber extends EventEmitter { ? 60 : 10; this._stream.setStreamAckDeadline( - Duration.from({seconds: subscriptionAckDeadlineSeconds}) + Duration.from({seconds: subscriptionAckDeadlineSeconds}), ); } } @@ -881,7 +878,7 @@ export class Subscriber extends EventEmitter { */ async modAckWithResponse( message: Message, - deadline: number + deadline: number, ): Promise { const startTime = Date.now(); @@ -951,7 +948,7 @@ export class Subscriber extends EventEmitter { this._stream.start().catch(err => { this.emit('error', err); - this.close(); + void this.close(); }); this.isOpen = true; @@ -966,17 +963,6 @@ export class Subscriber extends EventEmitter { setOptions(options: SubscriberOptions): void { this._options = options; - this._useLegacyOpenTelemetry = options.enableOpenTelemetryTracing || false; - - // The user-set ackDeadline value basically pegs the extension time. - // We'll emulate it by overwriting min/max. - const passedAckDeadline = options.ackDeadline; - if (passedAckDeadline !== undefined) { - this.ackDeadline = passedAckDeadline; - options.minAckDeadline = Duration.from({seconds: passedAckDeadline}); - options.maxAckDeadline = Duration.from({seconds: passedAckDeadline}); - } - this.useLegacyFlowControl = options.useLegacyFlowControl || false; if (options.flowControl) { this.maxMessages = @@ -999,13 +985,25 @@ export class Subscriber extends EventEmitter { options.streamingOptions.maxStreams = Math.min( maxStreams, - this.maxMessages + this.maxMessages, ); } if (this._inventory) { this._inventory.setOptions(this._options.flowControl!); } + + this.updateAckDeadline(); + } + + /** + * Retrieves our effective options. This is mostly for unit test use. + * + * @private + * @returns {SubscriberOptions} The options. + */ + getOptions(): SubscriberOptions { + return this._options; } /** @@ -1015,11 +1013,9 @@ export class Subscriber extends EventEmitter { * @private */ private createParentSpan(message: Message): void { - const enabled = tracing.isEnabled({ - enableOpenTelemetryTracing: this._useLegacyOpenTelemetry, - }); + const enabled = tracing.isEnabled(); if (enabled) { - tracing.extractSpan(message, this.name, enabled); + tracing.extractSpan(message, this.name); } } @@ -1058,7 +1054,7 @@ export class Subscriber extends EventEmitter { // lease on the message before actually leasing it. message.subSpans.modAckStart( Duration.from({seconds: this.ackDeadline}), - true + true, ); message .modAckWithResponse(this.ackDeadline) @@ -1076,7 +1072,7 @@ export class Subscriber extends EventEmitter { } else { message.subSpans.modAckStart( Duration.from({seconds: this.ackDeadline}), - true + true, ); message.modAck(this.ackDeadline); message.subSpans.modAckEnd(); @@ -1106,12 +1102,12 @@ export class Subscriber extends EventEmitter { if (this._acks.numPendingRequests) { promises.push(this._acks.onFlush()); - this._acks.flush(); + await this._acks.flush(); } if (this._modAcks.numPendingRequests) { promises.push(this._modAcks.onFlush()); - this._modAcks.flush(); + await this._modAcks.flush(); } if (this._acks.numInFlightRequests) { diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 0df829a672c..6a5f6023eab 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -103,11 +103,11 @@ export declare interface Subscription { // Only used internally. on( event: 'newListener', - listener: (event: string | symbol, listener: Function) => void + listener: (event: string | symbol, listener: Function) => void, ): this; on( event: 'removeListener', - listener: (event: string | symbol, listener: Function) => void + listener: (event: string | symbol, listener: Function) => void, ): this; // Catch-all. If you get an error about this line, it means you're @@ -422,20 +422,20 @@ export class Subscription extends EventEmitter { * ``` */ create( - options?: CreateSubscriptionOptions + options?: CreateSubscriptionOptions, ): Promise; create(callback: CreateSubscriptionCallback): void; create( options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback + callback: CreateSubscriptionCallback, ): void; create( optsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, - callback?: CreateSubscriptionCallback + callback?: CreateSubscriptionCallback, ): void | Promise { if (!this.topic) { throw new Error( - 'Subscriptions can only be created when accessed through Topics' + 'Subscriptions can only be created when accessed through Topics', ); } @@ -454,7 +454,7 @@ export class Subscription extends EventEmitter { } Object.assign(this, sub); callback!(null, this, resp); - } + }, ); } @@ -505,18 +505,18 @@ export class Subscription extends EventEmitter { */ createSnapshot( name: string, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise; createSnapshot(name: string, callback: CreateSnapshotCallback): void; createSnapshot( name: string, gaxOpts: CallOptions, - callback: CreateSnapshotCallback + callback: CreateSnapshotCallback, ): void; createSnapshot( name: string, optsOrCallback?: CallOptions | CreateSnapshotCallback, - callback?: CreateSnapshotCallback + callback?: CreateSnapshotCallback, ): void | Promise { if (typeof name !== 'string') { throw new Error('A name is required to create a snapshot.'); @@ -543,7 +543,7 @@ export class Subscription extends EventEmitter { } snapshot.metadata = resp!; callback!(null, snapshot, resp!); - } + }, ); } @@ -583,7 +583,7 @@ export class Subscription extends EventEmitter { delete(gaxOpts: CallOptions, callback: EmptyCallback): void; delete( optsOrCallback?: CallOptions | EmptyCallback, - callback?: EmptyCallback + callback?: EmptyCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -593,7 +593,7 @@ export class Subscription extends EventEmitter { }; if (this.isOpen) { - this._subscriber.close(); + void this._subscriber.close(); } this.request( @@ -603,7 +603,7 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - callback! + callback!, ); } @@ -749,7 +749,7 @@ export class Subscription extends EventEmitter { get(gaxOpts: GetSubscriptionOptions, callback: GetSubscriptionCallback): void; get( optsOrCallback?: GetSubscriptionOptions | GetSubscriptionCallback, - callback?: GetSubscriptionCallback + callback?: GetSubscriptionCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -815,11 +815,11 @@ export class Subscription extends EventEmitter { getMetadata(callback: GetSubscriptionMetadataCallback): void; getMetadata( gaxOpts: CallOptions, - callback: GetSubscriptionMetadataCallback + callback: GetSubscriptionMetadataCallback, ): void; getMetadata( optsOrCallback?: CallOptions | GetSubscriptionMetadataCallback, - callback?: GetSubscriptionMetadataCallback + callback?: GetSubscriptionMetadataCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -840,7 +840,7 @@ export class Subscription extends EventEmitter { this.metadata = apiResponse!; } callback!(err!, apiResponse!); - } + }, ); } @@ -904,18 +904,18 @@ export class Subscription extends EventEmitter { */ modifyPushConfig( config: PushConfig, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise; modifyPushConfig(config: PushConfig, callback: EmptyCallback): void; modifyPushConfig( config: PushConfig, gaxOpts: CallOptions, - callback: EmptyCallback + callback: EmptyCallback, ): void; modifyPushConfig( config: PushConfig, optsOrCallback?: CallOptions | EmptyCallback, - callback?: EmptyCallback + callback?: EmptyCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -932,7 +932,7 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - callback! + callback!, ); } @@ -1009,12 +1009,12 @@ export class Subscription extends EventEmitter { seek( snapshot: string | Date, gaxOpts: CallOptions, - callback: SeekCallback + callback: SeekCallback, ): void; seek( snapshot: string | Date, optsOrCallback?: CallOptions | SeekCallback, - callback?: SeekCallback + callback?: SeekCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -1042,7 +1042,7 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - callback! + callback!, ); } @@ -1086,21 +1086,21 @@ export class Subscription extends EventEmitter { */ setMetadata( metadata: SubscriptionMetadata, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise; setMetadata( metadata: SubscriptionMetadata, - callback: SetSubscriptionMetadataCallback + callback: SetSubscriptionMetadataCallback, ): void; setMetadata( metadata: SubscriptionMetadata, gaxOpts: CallOptions, - callback: SetSubscriptionMetadataCallback + callback: SetSubscriptionMetadataCallback, ): void; setMetadata( metadata: SubscriptionMetadata, optsOrCallback?: CallOptions | SetSubscriptionMetadataCallback, - callback?: SetSubscriptionMetadataCallback + callback?: SetSubscriptionMetadataCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -1121,7 +1121,7 @@ export class Subscription extends EventEmitter { reqOpts, gaxOpts, }, - callback! + callback!, ); } /** @@ -1164,7 +1164,7 @@ export class Subscription extends EventEmitter { this.on('removeListener', () => { if (this.isOpen && this.listenerCount('message') === 0) { - this._subscriber.close(); + void this._subscriber.close(); } }); } @@ -1174,7 +1174,7 @@ export class Subscription extends EventEmitter { * @private */ static formatMetadata_( - metadata: SubscriptionMetadata + metadata: SubscriptionMetadata, ): google.pubsub.v1.ISubscription { const formatted = extend(true, {}, metadata); diff --git a/handwritten/pubsub/src/telemetry-tracing.ts b/handwritten/pubsub/src/telemetry-tracing.ts index 422b2d904eb..137dfc38dd3 100644 --- a/handwritten/pubsub/src/telemetry-tracing.ts +++ b/handwritten/pubsub/src/telemetry-tracing.ts @@ -28,7 +28,6 @@ import { Link, } from '@opentelemetry/api'; import {Attributes, PubsubMessage} from './publisher/pubsub-message'; -import {PublishOptions} from './publisher/index'; import {Duration} from './temporal'; export {Span}; @@ -65,13 +64,6 @@ export enum OpenTelemetryLevel { */ None = 0, - /** - * Legacy: We found a trace provider, but the user also specified the old - * manual enable flag; this will trigger the legacy attribute being included. - * The modern propagation attribute will _also_ be included. - */ - Legacy = 1, - /** * Modern: We will only inject/extract the modern propagation attribute. */ @@ -96,26 +88,11 @@ export function setGloballyEnabled(enabled: boolean) { * Tries to divine what sort of OpenTelemetry we're supporting. See the enum * for the meaning of the values, and other notes. * - * Legacy OTel is no longer officially supported, but we don't want to - * break anyone at a non-major. - * * @private * @internal */ -export function isEnabled( - publishSettings?: PublishOptions -): OpenTelemetryLevel { - // If we're not enabled, skip everything. - if (!globallyEnabled) { - return OpenTelemetryLevel.None; - } - - if (publishSettings?.enableOpenTelemetryTracing) { - return OpenTelemetryLevel.Legacy; - } - - // Enable modern support. - return OpenTelemetryLevel.Modern; +export function isEnabled(): OpenTelemetryLevel { + return globallyEnabled ? OpenTelemetryLevel.Modern : OpenTelemetryLevel.None; } /** @@ -128,7 +105,6 @@ export function isEnabled( * or subscriber span, depending on the context. * * @private - * @internal */ export interface MessageWithAttributes { attributes?: Attributes | null | undefined; @@ -167,7 +143,7 @@ export class PubsubMessageGet { get( carrier: MessageWithAttributes, - key: string + key: string, ): string | string[] | undefined { return carrier?.attributes?.[this.attributeName(key)]; } @@ -224,7 +200,7 @@ export interface SpanAttributes { * @internal */ export function spanContextToContext( - parent?: SpanContext + parent?: SpanContext, ): Context | undefined { return parent ? trace.setSpanContext(context.active(), parent) : undefined; } @@ -242,14 +218,6 @@ export function spanContextToContext( */ export const modernAttributeName = 'googclient_traceparent'; -/** - * The old legacy attribute name. - * - * @private - * @internal - */ -export const legacyAttributeName = 'googclient_OpenTelemetrySpanContext'; - export interface AttributeParams { // Fully qualified. topicName?: string; @@ -328,7 +296,7 @@ export class PubsubSpans { static createAttributes( params: AttributeParams, message?: PubsubMessage, - caller?: string + caller?: string, ): SpanAttributes { const destinationName = params.topicName ?? params.subName; const destinationId = params.topicId ?? params.subId; @@ -383,7 +351,7 @@ export class PubsubSpans { static createPublisherSpan( message: PubsubMessage, topicName: string, - caller: string + caller: string, ): Span | undefined { if (!globallyEnabled) { return undefined; @@ -420,7 +388,7 @@ export class PubsubSpans { message: PubsubMessage, subName: string, parent: Context | undefined, - caller: string + caller: string, ): Span | undefined { if (!globallyEnabled) { return undefined; @@ -441,7 +409,7 @@ export class PubsubSpans { kind: SpanKind.CONSUMER, attributes, }, - parent + parent, ); } else { return getTracer().startSpan(name, { @@ -455,7 +423,7 @@ export class PubsubSpans { name: string, message?: PubsubMessage, parentSpan?: Span, - attributes?: SpanAttributes + attributes?: SpanAttributes, ): Span | undefined { if (!globallyEnabled) { return undefined; @@ -469,7 +437,7 @@ export class PubsubSpans { kind: SpanKind.INTERNAL, attributes: attributes ?? {}, }, - spanContextToContext(parent.spanContext()) + spanContextToContext(parent.spanContext()), ); } else { return undefined; @@ -487,7 +455,7 @@ export class PubsubSpans { static createPublishRpcSpan( messages: MessageWithAttributes[], topicName: string, - caller: string + caller: string, ): Span | undefined { if (!globallyEnabled) { return undefined; @@ -496,7 +464,7 @@ export class PubsubSpans { const spanAttributes = PubsubSpans.createAttributes( getTopicInfo(topicName), undefined, - caller + caller, ); const links: Link[] = messages .filter(m => m.parentSpan && isSampled(m.parentSpan)) @@ -509,7 +477,7 @@ export class PubsubSpans { attributes: spanAttributes, links, }, - ROOT_CONTEXT + ROOT_CONTEXT, ); span?.setAttribute('messaging.batch.message_count', messages.length); if (span) { @@ -527,7 +495,7 @@ export class PubsubSpans { static createAckRpcSpan( messageSpans: (Span | undefined)[], subName: string, - caller: string + caller: string, ): Span | undefined { if (!globallyEnabled) { return undefined; @@ -538,7 +506,7 @@ export class PubsubSpans { const spanAttributes = PubsubSpans.createAttributes( subInfo, undefined, - caller + caller, ); const links: Link[] = messageSpans .filter(m => m && isSampled(m)) @@ -551,7 +519,7 @@ export class PubsubSpans { attributes: spanAttributes, links, }, - ROOT_CONTEXT + ROOT_CONTEXT, ); span?.setAttribute('messaging.batch.message_count', messageSpans.length); @@ -575,7 +543,7 @@ export class PubsubSpans { type: 'modack' | 'nack', caller: string, deadline?: Duration, - isInitial?: boolean + isInitial?: boolean, ): Span | undefined { if (!globallyEnabled) { return undefined; @@ -586,7 +554,7 @@ export class PubsubSpans { const spanAttributes = PubsubSpans.createAttributes( subInfo, undefined, - caller + caller, ); const links: Link[] = messageSpans .filter(m => m && isSampled(m)) @@ -599,7 +567,7 @@ export class PubsubSpans { attributes: spanAttributes, links, }, - ROOT_CONTEXT + ROOT_CONTEXT, ); span?.setAttribute('messaging.batch.message_count', messageSpans.length); @@ -617,7 +585,7 @@ export class PubsubSpans { if (deadline) { span?.setAttribute( 'messaging.gcp_pubsub.message.ack_deadline_seconds', - deadline.totalOf('second') + deadline.totalOf('second'), ); } @@ -629,28 +597,28 @@ export class PubsubSpans { } static createReceiveFlowSpan( - message: MessageWithAttributes + message: MessageWithAttributes, ): Span | undefined { return PubsubSpans.createChildSpan( 'subscriber concurrency control', - message + message, ); } static createReceiveSchedulerSpan( - message: MessageWithAttributes + message: MessageWithAttributes, ): Span | undefined { return PubsubSpans.createChildSpan('subscriber scheduler', message); } static createReceiveProcessSpan( message: MessageWithAttributes, - subName: string + subName: string, ): Span | undefined { const subInfo = getSubscriptionInfo(subName); return PubsubSpans.createChildSpan( `${subInfo.subId ?? subName} process`, - message + message, ); } @@ -669,7 +637,7 @@ export class PubsubEvents { static addEvent( text: string, message: MessageWithAttributes, - attributes?: Attributes + attributes?: Attributes, ): void { const parent = message.parentSpan; if (!parent) { @@ -723,7 +691,7 @@ export class PubsubEvents { // User-called modAcks are never initial ones. span.addEvent('modack called', { 'messaging.gcp_pubsub.modack_deadline_seconds': `${deadline.totalOf( - 'second' + 'second', )}`, 'messaging.gcp_pubsub.is_receipt_modack': 'false', }); @@ -732,11 +700,11 @@ export class PubsubEvents { static modAckStart( message: MessageWithAttributes, deadline: Duration, - isInitial: boolean + isInitial: boolean, ) { PubsubEvents.addEvent('modack start', message, { 'messaging.gcp_pubsub.modack_deadline_seconds': `${deadline.totalOf( - 'second' + 'second', )}`, 'messaging.gcp_pubsub.is_receipt_modack': isInitial ? 'true' : 'false', }); @@ -762,11 +730,7 @@ export class PubsubEvents { * @private * @internal */ -export function injectSpan( - span: Span, - message: MessageWithAttributes, - enabled: OpenTelemetryLevel -): void { +export function injectSpan(span: Span, message: MessageWithAttributes): void { if (!globallyEnabled) { return; } @@ -777,24 +741,12 @@ export function injectSpan( if (message.attributes[modernAttributeName]) { console.warn( - `${modernAttributeName} key set as message attribute, but will be overridden.` + `${modernAttributeName} key set as message attribute, but will be overridden.`, ); delete message.attributes[modernAttributeName]; } - // If we're in legacy mode, add that header as well. - if (enabled === OpenTelemetryLevel.Legacy) { - if (message.attributes[legacyAttributeName]) { - console.warn( - `${legacyAttributeName} key set as message attribute, but will be overridden.` - ); - } - message.attributes[legacyAttributeName] = JSON.stringify( - span.spanContext() - ); - } - // Always do propagation injection with the trace context. const context = trace.setSpanContext(ROOT_CONTEXT, span.spanContext()); propagation.inject(context, message, pubsubSetter); @@ -820,9 +772,7 @@ export function containsSpanContext(message: MessageWithAttributes): boolean { } const keys = Object.getOwnPropertyNames(message.attributes); - return !!keys.find( - n => n === legacyAttributeName || n === modernAttributeName - ); + return !!keys.find(n => n === modernAttributeName); } /** @@ -838,7 +788,6 @@ export function containsSpanContext(message: MessageWithAttributes): boolean { export function extractSpan( message: MessageWithAttributes, subName: string, - enabled: OpenTelemetryLevel ): Span | undefined { if (!globallyEnabled) { return undefined; @@ -852,64 +801,16 @@ export function extractSpan( let context: Context | undefined; - if (enabled === OpenTelemetryLevel.Legacy) { - // Only prefer the legacy attributes to no trace context attribute. - if ( - keys.includes(legacyAttributeName) && - !keys.includes(modernAttributeName) - ) { - const legacyValue = message.attributes?.[legacyAttributeName]; - if (legacyValue) { - const parentSpanContext: SpanContext | undefined = legacyValue - ? JSON.parse(legacyValue) - : undefined; - if (parentSpanContext) { - context = spanContextToContext(parentSpanContext); - } - } - } - } else { - if (keys.includes(modernAttributeName)) { - context = propagation.extract(ROOT_CONTEXT, message, pubsubGetter); - } + if (keys.includes(modernAttributeName)) { + context = propagation.extract(ROOT_CONTEXT, message, pubsubGetter); } const span = PubsubSpans.createReceiveSpan( message, subName, context, - 'extractSpan' + 'extractSpan', ); message.parentSpan = span; return span; } - -// Since these were exported on the main Pub/Sub index in the previous -// version, we have to export them until the next major. -export const legacyExports = { - /** - * @deprecated - * Use the new telemetry functionality instead; see the updated OpenTelemetry - * sample for an example. - */ - createSpan: function ( - spanName: string, - kind: SpanKind, - attributes?: SpanAttributes, - parent?: SpanContext - ): Span { - if (!globallyEnabled) { - // This isn't great, but it's the fact of the situation. - return undefined as unknown as Span; - } else { - return getTracer().startSpan( - spanName, - { - kind, - attributes, - }, - parent ? trace.setSpanContext(context.active(), parent) : undefined - ); - } - }, -}; diff --git a/handwritten/pubsub/src/topic.ts b/handwritten/pubsub/src/topic.ts index e0a5d03b686..633c5f4cbd1 100644 --- a/handwritten/pubsub/src/topic.ts +++ b/handwritten/pubsub/src/topic.ts @@ -113,7 +113,7 @@ export class Topic { metadata?: TopicMetadata; publisher: Publisher; getSubscriptionsStream = paginator.streamify( - 'getSubscriptions' + 'getSubscriptions', ) as () => ObjectStream; constructor(pubsub: PubSub, name: string, options?: PublishOptions) { @@ -239,7 +239,7 @@ export class Topic { create(gaxOpts: CallOptions, callback: CreateTopicCallback): void; create( optsOrCallback?: CallOptions | CreateTopicCallback, - callback?: CreateTopicCallback + callback?: CreateTopicCallback, ): Promise | void { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -289,17 +289,17 @@ export class Topic { createSubscription(name: string, callback: CreateSubscriptionCallback): void; createSubscription( name: string, - options?: CreateSubscriptionOptions + options?: CreateSubscriptionOptions, ): Promise; createSubscription( name: string, options: CreateSubscriptionOptions, - callback: CreateSubscriptionCallback + callback: CreateSubscriptionCallback, ): void; createSubscription( name: string, optsOrCallback?: CreateSubscriptionOptions | CreateSubscriptionCallback, - callback?: CreateSubscriptionCallback + callback?: CreateSubscriptionCallback, ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -308,7 +308,7 @@ export class Topic { this, name, options as CreateSubscriptionOptions, - callback! + callback!, ); } @@ -346,7 +346,7 @@ export class Topic { delete(gaxOpts: CallOptions, callback: EmptyCallback): void; delete( optsOrCallback?: CallOptions | EmptyCallback, - callback?: EmptyCallback + callback?: EmptyCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -362,7 +362,7 @@ export class Topic { reqOpts, gaxOpts: gaxOpts as CallOptions, }, - callback! + callback!, ); } @@ -460,7 +460,7 @@ export class Topic { get(gaxOpts: GetTopicOptions, callback: GetTopicCallback): void; get( optsOrCallback?: GetTopicOptions | GetTopicCallback, - callback?: GetTopicCallback + callback?: GetTopicCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -522,7 +522,7 @@ export class Topic { getMetadata(gaxOpts?: CallOptions): Promise; getMetadata( optsOrCallback?: CallOptions | GetTopicMetadataCallback, - callback?: GetTopicMetadataCallback + callback?: GetTopicMetadataCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -543,7 +543,7 @@ export class Topic { this.metadata = apiResponse!; } callback!(err, apiResponse!); - } + }, ); } @@ -588,14 +588,14 @@ export class Topic { getSubscriptions(callback: GetTopicSubscriptionsCallback): void; getSubscriptions( options: PageOptions, - callback: GetTopicSubscriptionsCallback + callback: GetTopicSubscriptionsCallback, ): void; getSubscriptions( - options?: PageOptions + options?: PageOptions, ): Promise; getSubscriptions( optsOrCallback?: PageOptions | GetTopicSubscriptionsCallback, - callback?: GetTopicSubscriptionsCallback + callback?: GetTopicSubscriptionsCallback, ): void | Promise { const options = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -605,7 +605,7 @@ export class Topic { { topic: this.name, }, - options as SubscriptionOptions + options as SubscriptionOptions, ); delete (reqOpts as PageOptions).gaxOpts; @@ -615,7 +615,7 @@ export class Topic { { autoPaginate: options.autoPaginate, }, - options.gaxOpts + options.gaxOpts, ); this.request( @@ -633,7 +633,7 @@ export class Topic { } callback!(err, subscriptions!, ...args); - } + }, ); } @@ -687,12 +687,12 @@ export class Topic { publish( data: Buffer, attributes: Attributes, - callback: PublishCallback + callback: PublishCallback, ): void; publish( data: Buffer, attrsOrCb?: Attributes | PublishCallback, - callback?: PublishCallback + callback?: PublishCallback, ): Promise | void { const attributes = typeof attrsOrCb === 'object' ? attrsOrCb : {}; callback = typeof attrsOrCb === 'function' ? attrsOrCb : callback; @@ -753,12 +753,12 @@ export class Topic { publishJSON( json: object, attributes: Attributes, - callback: PublishCallback + callback: PublishCallback, ): void; publishJSON( json: object, attrsOrCb?: Attributes | PublishCallback, - callback?: PublishCallback + callback?: PublishCallback, ): Promise | void { if (!json || typeof json !== 'object') { throw new Error('First parameter should be an object.'); @@ -832,7 +832,7 @@ export class Topic { publishMessage(message: MessageOptions, callback: PublishCallback): void; publishMessage( message: MessageOptions, - callback?: PublishCallback + callback?: PublishCallback, ): Promise | void { // Make a copy to ensure that any changes we make to it will not // propagate up to the user's data. @@ -940,18 +940,18 @@ export class Topic { */ setMetadata( options: TopicMetadata, - gaxOpts?: CallOptions + gaxOpts?: CallOptions, ): Promise; setMetadata(options: TopicMetadata, callback: SetTopicMetadataCallback): void; setMetadata( options: TopicMetadata, gaxOpts: CallOptions, - callback: SetTopicMetadataCallback + callback: SetTopicMetadataCallback, ): void; setMetadata( options: TopicMetadata, optsOrCallback?: CallOptions | SetTopicMetadataCallback, - callback?: SetTopicMetadataCallback + callback?: SetTopicMetadataCallback, ): void | Promise { const gaxOpts = typeof optsOrCallback === 'object' ? optsOrCallback : {}; callback = typeof optsOrCallback === 'function' ? optsOrCallback : callback; @@ -967,7 +967,7 @@ export class Topic { reqOpts, gaxOpts, }, - callback! + callback!, ); } diff --git a/handwritten/pubsub/src/util.ts b/handwritten/pubsub/src/util.ts index 60cbdc20569..04bfb270ddb 100644 --- a/handwritten/pubsub/src/util.ts +++ b/handwritten/pubsub/src/util.ts @@ -30,7 +30,7 @@ export function promisifySome( class_: Function, classProto: T, methods: (keyof T)[], - options?: PromisifyOptions + options?: PromisifyOptions, ): void { methods.forEach(methodName => { // Do the same stream checks as promisifyAll(). diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index f8ce9d94291..ae3a4f59136 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -31,6 +31,7 @@ import type { import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import {loggingUtils as logging} from 'google-gax'; /** * Client JSON configuration object, loaded from @@ -56,6 +57,8 @@ export class PublisherClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('pubsub'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -91,7 +94,7 @@ export class PublisherClient { * Developer's Console, e.g. 'grape-spaceship-123'. We will also check * the environment variable GCLOUD_PROJECT for your project ID. If your * app is running in an environment which supports - * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, + * {@link https://cloud.google.com/docs/authentication/application-default-credentials Application Default Credentials}, * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. @@ -110,7 +113,7 @@ export class PublisherClient { */ constructor( opts?: ClientOptions, - gaxInstance?: typeof gax | typeof gax.fallback + gaxInstance?: typeof gax | typeof gax.fallback, ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof PublisherClient; @@ -120,7 +123,7 @@ export class PublisherClient { opts?.universe_domain !== opts?.universeDomain ) { throw new Error( - 'Please set either universe_domain or universeDomain, but not both.' + 'Please set either universe_domain or universeDomain, but not both.', ); } const universeDomainEnvVar = @@ -145,9 +148,6 @@ export class PublisherClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); - // Request numeric enum values if REST transport is used. - opts.numericEnums = true; - // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; @@ -205,19 +205,19 @@ export class PublisherClient { // Create useful helper objects for these. this.pathTemplates = { projectPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}' + 'projects/{project}', ), projectTopicPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/topics/{topic}' + 'projects/{project}/topics/{topic}', ), schemaPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/schemas/{schema}' + 'projects/{project}/schemas/{schema}', ), snapshotPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/snapshots/{snapshot}' + 'projects/{project}/snapshots/{snapshot}', ), subscriptionPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/subscriptions/{subscription}' + 'projects/{project}/subscriptions/{subscription}', ), }; @@ -228,33 +228,17 @@ export class PublisherClient { listTopics: new this._gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', - 'topics' + 'topics', ), listTopicSubscriptions: new this._gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', - 'subscriptions' + 'subscriptions', ), listTopicSnapshots: new this._gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', - 'snapshots' - ), - }; - - const protoFilesRoot = this._gaxModule.protobuf.Root.fromJSON(jsonProtos); - // Some methods on this API support automatically batching - // requests; denote this. - - this.descriptors.batching = { - publish: new this._gaxModule.BundleDescriptor( - 'messages', - ['topic'], - 'message_ids', - this._gaxModule.GrpcClient.createByteLengthFunction( - // eslint-disable-next-line @typescript-eslint/no-explicit-any - protoFilesRoot.lookupType('google.pubsub.v1.PubsubMessage') as any - ) + 'snapshots', ), }; @@ -263,7 +247,7 @@ export class PublisherClient { 'google.pubsub.v1.Publisher', gapicConfig as gax.ClientConfig, opts.clientConfig || {}, - {'x-goog-api-client': clientHeader.join(' ')} + {'x-goog-api-client': clientHeader.join(' ')}, ); // Set up a dictionary of "inner API calls"; the core implementation @@ -297,12 +281,12 @@ export class PublisherClient { this.publisherStub = this._gaxGrpc.createStub( this._opts.fallback ? (this._protos as protobuf.Root).lookupService( - 'google.pubsub.v1.Publisher' + 'google.pubsub.v1.Publisher', ) : // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._protos as any).google.pubsub.v1.Publisher, this._opts, - this._providedCustomServicePath + this._providedCustomServicePath, ) as Promise<{[method: string]: Function}>; // Iterate over each of the methods that the service provides @@ -330,18 +314,15 @@ export class PublisherClient { }, (err: Error | null | undefined) => () => { throw err; - } + }, ); - const descriptor = - this.descriptors.page[methodName] || - this.descriptors.batching?.[methodName] || - undefined; + const descriptor = this.descriptors.page[methodName] || undefined; const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], descriptor, - this._opts.fallback + this._opts.fallback, ); this.innerApiCalls[methodName] = apiCall; @@ -362,7 +343,7 @@ export class PublisherClient { ) { process.emitWarning( 'Static servicePath is deprecated, please use the instance method instead.', - 'DeprecationWarning' + 'DeprecationWarning', ); } return 'pubsub.googleapis.com'; @@ -380,7 +361,7 @@ export class PublisherClient { ) { process.emitWarning( 'Static apiEndpoint is deprecated, please use the instance method instead.', - 'DeprecationWarning' + 'DeprecationWarning', ); } return 'pubsub.googleapis.com'; @@ -425,7 +406,7 @@ export class PublisherClient { * @returns {Promise} A promise that resolves to string containing the project ID. */ getProjectId( - callback?: Callback + callback?: Callback, ): Promise | void { if (callback) { this.auth.getProjectId(callback); @@ -481,16 +462,21 @@ export class PublisherClient { * Output only. An output-only field indicating the state of the topic. * @param {google.pubsub.v1.IngestionDataSourceSettings} [request.ingestionDataSourceSettings] * Optional. Settings for ingestion from a data source into this topic. + * @param {number[]} [request.messageTransforms] + * Optional. Transforms to be applied to messages published to the topic. + * Transforms are applied in the order specified. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.create_topic.js + * region_tag:pubsub_v1_generated_Publisher_CreateTopic_async */ createTopic( request?: protos.google.pubsub.v1.ITopic, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -505,7 +491,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.ITopic | null | undefined, {} | null | undefined - > + >, ): void; createTopic( request: protos.google.pubsub.v1.ITopic, @@ -513,7 +499,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.ITopic | null | undefined, {} | null | undefined - > + >, ): void; createTopic( request?: protos.google.pubsub.v1.ITopic, @@ -528,7 +514,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.ITopic | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -551,8 +537,34 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.createTopic(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('createTopic request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createTopic response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .createTopic(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.ITopic | undefined, + {} | undefined, + ]) => { + this._log.info('createTopic response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Updates an existing topic by updating the fields specified in the update @@ -574,10 +586,12 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.update_topic.js + * region_tag:pubsub_v1_generated_Publisher_UpdateTopic_async */ updateTopic( request?: protos.google.pubsub.v1.IUpdateTopicRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -592,7 +606,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, {} | null | undefined - > + >, ): void; updateTopic( request: protos.google.pubsub.v1.IUpdateTopicRequest, @@ -600,7 +614,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, {} | null | undefined - > + >, ): void; updateTopic( request?: protos.google.pubsub.v1.IUpdateTopicRequest, @@ -615,7 +629,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -638,8 +652,34 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ 'topic.name': request.topic!.name ?? '', }); - this.initialize(); - return this.innerApiCalls.updateTopic(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('updateTopic request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IUpdateTopicRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateTopic response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .updateTopic(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IUpdateTopicRequest | undefined, + {} | undefined, + ]) => { + this._log.info('updateTopic response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic @@ -658,10 +698,12 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.PublishResponse|PublishResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.publish.js + * region_tag:pubsub_v1_generated_Publisher_Publish_async */ publish( request?: protos.google.pubsub.v1.IPublishRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.IPublishResponse, @@ -676,7 +718,7 @@ export class PublisherClient { protos.google.pubsub.v1.IPublishResponse, protos.google.pubsub.v1.IPublishRequest | null | undefined, {} | null | undefined - > + >, ): void; publish( request: protos.google.pubsub.v1.IPublishRequest, @@ -684,7 +726,7 @@ export class PublisherClient { protos.google.pubsub.v1.IPublishResponse, protos.google.pubsub.v1.IPublishRequest | null | undefined, {} | null | undefined - > + >, ): void; publish( request?: protos.google.pubsub.v1.IPublishRequest, @@ -699,7 +741,7 @@ export class PublisherClient { protos.google.pubsub.v1.IPublishResponse, protos.google.pubsub.v1.IPublishRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.IPublishResponse, @@ -722,8 +764,34 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ topic: request.topic ?? '', }); - this.initialize(); - return this.innerApiCalls.publish(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('publish request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.IPublishResponse, + protos.google.pubsub.v1.IPublishRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('publish response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .publish(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.IPublishResponse, + protos.google.pubsub.v1.IPublishRequest | undefined, + {} | undefined, + ]) => { + this._log.info('publish response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Gets the configuration of a topic. @@ -739,10 +807,12 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.get_topic.js + * region_tag:pubsub_v1_generated_Publisher_GetTopic_async */ getTopic( request?: protos.google.pubsub.v1.IGetTopicRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -757,7 +827,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IGetTopicRequest | null | undefined, {} | null | undefined - > + >, ): void; getTopic( request: protos.google.pubsub.v1.IGetTopicRequest, @@ -765,7 +835,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IGetTopicRequest | null | undefined, {} | null | undefined - > + >, ): void; getTopic( request?: protos.google.pubsub.v1.IGetTopicRequest, @@ -780,7 +850,7 @@ export class PublisherClient { protos.google.pubsub.v1.ITopic, protos.google.pubsub.v1.IGetTopicRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ITopic, @@ -803,8 +873,34 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ topic: request.topic ?? '', }); - this.initialize(); - return this.innerApiCalls.getTopic(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('getTopic request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IGetTopicRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getTopic response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .getTopic(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ITopic, + protos.google.pubsub.v1.IGetTopicRequest | undefined, + {} | undefined, + ]) => { + this._log.info('getTopic response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic @@ -824,10 +920,12 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.delete_topic.js + * region_tag:pubsub_v1_generated_Publisher_DeleteTopic_async */ deleteTopic( request?: protos.google.pubsub.v1.IDeleteTopicRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.protobuf.IEmpty, @@ -842,7 +940,7 @@ export class PublisherClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteTopic( request: protos.google.pubsub.v1.IDeleteTopicRequest, @@ -850,7 +948,7 @@ export class PublisherClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteTopic( request?: protos.google.pubsub.v1.IDeleteTopicRequest, @@ -865,7 +963,7 @@ export class PublisherClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.protobuf.IEmpty, @@ -888,8 +986,34 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ topic: request.topic ?? '', }); - this.initialize(); - return this.innerApiCalls.deleteTopic(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('deleteTopic request %j', request); + const wrappedCallback: + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteTopicRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteTopic response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .deleteTopic(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteTopicRequest | undefined, + {} | undefined, + ]) => { + this._log.info('deleteTopic response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Detaches a subscription from this topic. All messages retained in the @@ -908,10 +1032,12 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.DetachSubscriptionResponse|DetachSubscriptionResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.detach_subscription.js + * region_tag:pubsub_v1_generated_Publisher_DetachSubscription_async */ detachSubscription( request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.IDetachSubscriptionResponse, @@ -926,7 +1052,7 @@ export class PublisherClient { protos.google.pubsub.v1.IDetachSubscriptionResponse, protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): void; detachSubscription( request: protos.google.pubsub.v1.IDetachSubscriptionRequest, @@ -934,7 +1060,7 @@ export class PublisherClient { protos.google.pubsub.v1.IDetachSubscriptionResponse, protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): void; detachSubscription( request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, @@ -949,7 +1075,7 @@ export class PublisherClient { protos.google.pubsub.v1.IDetachSubscriptionResponse, protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.IDetachSubscriptionResponse, @@ -972,8 +1098,34 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ subscription: request.subscription ?? '', }); - this.initialize(); - return this.innerApiCalls.detachSubscription(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('detachSubscription request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.IDetachSubscriptionResponse, + protos.google.pubsub.v1.IDetachSubscriptionRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('detachSubscription response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .detachSubscription(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.IDetachSubscriptionResponse, + protos.google.pubsub.v1.IDetachSubscriptionRequest | undefined, + {} | undefined, + ]) => { + this._log.info('detachSubscription response %j', response); + return [response, options, rawResponse]; + }, + ); } /** @@ -1004,7 +1156,7 @@ export class PublisherClient { */ listTopics( request?: protos.google.pubsub.v1.IListTopicsRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ITopic[], @@ -1019,7 +1171,7 @@ export class PublisherClient { protos.google.pubsub.v1.IListTopicsRequest, protos.google.pubsub.v1.IListTopicsResponse | null | undefined, protos.google.pubsub.v1.ITopic - > + >, ): void; listTopics( request: protos.google.pubsub.v1.IListTopicsRequest, @@ -1027,7 +1179,7 @@ export class PublisherClient { protos.google.pubsub.v1.IListTopicsRequest, protos.google.pubsub.v1.IListTopicsResponse | null | undefined, protos.google.pubsub.v1.ITopic - > + >, ): void; listTopics( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1042,7 +1194,7 @@ export class PublisherClient { protos.google.pubsub.v1.IListTopicsRequest, protos.google.pubsub.v1.IListTopicsResponse | null | undefined, protos.google.pubsub.v1.ITopic - > + >, ): Promise< [ protos.google.pubsub.v1.ITopic[], @@ -1065,12 +1217,38 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ project: request.project ?? '', }); - this.initialize(); - return this.innerApiCalls.listTopics(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + const wrappedCallback: + | PaginationCallback< + protos.google.pubsub.v1.IListTopicsRequest, + protos.google.pubsub.v1.IListTopicsResponse | null | undefined, + protos.google.pubsub.v1.ITopic + > + | undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTopics values %j', values); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. + } + : undefined; + this._log.info('listTopics request %j', request); + return this.innerApiCalls + .listTopics(request, options, wrappedCallback) + ?.then( + ([response, input, output]: [ + protos.google.pubsub.v1.ITopic[], + protos.google.pubsub.v1.IListTopicsRequest | null, + protos.google.pubsub.v1.IListTopicsResponse, + ]) => { + this._log.info('listTopics values %j', response); + return [response, input, output]; + }, + ); } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to `listTopics`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1095,7 +1273,7 @@ export class PublisherClient { */ listTopicsStream( request?: protos.google.pubsub.v1.IListTopicsRequest, - options?: CallOptions + options?: CallOptions, ): Transform { request = request || {}; options = options || {}; @@ -1107,11 +1285,14 @@ export class PublisherClient { }); const defaultCallSettings = this._defaults['listTopics']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listTopics stream %j', request); return this.descriptors.page.listTopics.createStream( this.innerApiCalls.listTopics as GaxCall, request, - callSettings + callSettings, ); } @@ -1139,10 +1320,12 @@ export class PublisherClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.list_topics.js + * region_tag:pubsub_v1_generated_Publisher_ListTopics_async */ listTopicsAsync( request?: protos.google.pubsub.v1.IListTopicsRequest, - options?: CallOptions + options?: CallOptions, ): AsyncIterable { request = request || {}; options = options || {}; @@ -1154,11 +1337,14 @@ export class PublisherClient { }); const defaultCallSettings = this._defaults['listTopics']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listTopics iterate %j', request); return this.descriptors.page.listTopics.asyncIterate( this.innerApiCalls['listTopics'] as GaxCall, request as {}, - callSettings + callSettings, ) as AsyncIterable; } /** @@ -1189,7 +1375,7 @@ export class PublisherClient { */ listTopicSubscriptions( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ string[], @@ -1206,7 +1392,7 @@ export class PublisherClient { | null | undefined, string - > + >, ): void; listTopicSubscriptions( request: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1216,7 +1402,7 @@ export class PublisherClient { | null | undefined, string - > + >, ): void; listTopicSubscriptions( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1235,7 +1421,7 @@ export class PublisherClient { | null | undefined, string - > + >, ): Promise< [ string[], @@ -1258,16 +1444,40 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ topic: request.topic ?? '', }); - this.initialize(); - return this.innerApiCalls.listTopicSubscriptions( - request, - options, - callback - ); + this.initialize().catch(err => { + throw err; + }); + const wrappedCallback: + | PaginationCallback< + protos.google.pubsub.v1.IListTopicSubscriptionsRequest, + | protos.google.pubsub.v1.IListTopicSubscriptionsResponse + | null + | undefined, + string + > + | undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTopicSubscriptions values %j', values); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. + } + : undefined; + this._log.info('listTopicSubscriptions request %j', request); + return this.innerApiCalls + .listTopicSubscriptions(request, options, wrappedCallback) + ?.then( + ([response, input, output]: [ + string[], + protos.google.pubsub.v1.IListTopicSubscriptionsRequest | null, + protos.google.pubsub.v1.IListTopicSubscriptionsResponse, + ]) => { + this._log.info('listTopicSubscriptions values %j', response); + return [response, input, output]; + }, + ); } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to `listTopicSubscriptions`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1292,7 +1502,7 @@ export class PublisherClient { */ listTopicSubscriptionsStream( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, - options?: CallOptions + options?: CallOptions, ): Transform { request = request || {}; options = options || {}; @@ -1304,11 +1514,14 @@ export class PublisherClient { }); const defaultCallSettings = this._defaults['listTopicSubscriptions']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listTopicSubscriptions stream %j', request); return this.descriptors.page.listTopicSubscriptions.createStream( this.innerApiCalls.listTopicSubscriptions as GaxCall, request, - callSettings + callSettings, ); } @@ -1336,10 +1549,12 @@ export class PublisherClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.list_topic_subscriptions.js + * region_tag:pubsub_v1_generated_Publisher_ListTopicSubscriptions_async */ listTopicSubscriptionsAsync( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, - options?: CallOptions + options?: CallOptions, ): AsyncIterable { request = request || {}; options = options || {}; @@ -1351,11 +1566,14 @@ export class PublisherClient { }); const defaultCallSettings = this._defaults['listTopicSubscriptions']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listTopicSubscriptions iterate %j', request); return this.descriptors.page.listTopicSubscriptions.asyncIterate( this.innerApiCalls['listTopicSubscriptions'] as GaxCall, request as {}, - callSettings + callSettings, ) as AsyncIterable; } /** @@ -1390,7 +1608,7 @@ export class PublisherClient { */ listTopicSnapshots( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ string[], @@ -1405,7 +1623,7 @@ export class PublisherClient { protos.google.pubsub.v1.IListTopicSnapshotsRequest, protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, string - > + >, ): void; listTopicSnapshots( request: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1413,7 +1631,7 @@ export class PublisherClient { protos.google.pubsub.v1.IListTopicSnapshotsRequest, protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, string - > + >, ): void; listTopicSnapshots( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -1430,7 +1648,7 @@ export class PublisherClient { protos.google.pubsub.v1.IListTopicSnapshotsRequest, protos.google.pubsub.v1.IListTopicSnapshotsResponse | null | undefined, string - > + >, ): Promise< [ string[], @@ -1453,12 +1671,40 @@ export class PublisherClient { this._gaxModule.routingHeader.fromParams({ topic: request.topic ?? '', }); - this.initialize(); - return this.innerApiCalls.listTopicSnapshots(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + const wrappedCallback: + | PaginationCallback< + protos.google.pubsub.v1.IListTopicSnapshotsRequest, + | protos.google.pubsub.v1.IListTopicSnapshotsResponse + | null + | undefined, + string + > + | undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listTopicSnapshots values %j', values); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. + } + : undefined; + this._log.info('listTopicSnapshots request %j', request); + return this.innerApiCalls + .listTopicSnapshots(request, options, wrappedCallback) + ?.then( + ([response, input, output]: [ + string[], + protos.google.pubsub.v1.IListTopicSnapshotsRequest | null, + protos.google.pubsub.v1.IListTopicSnapshotsResponse, + ]) => { + this._log.info('listTopicSnapshots values %j', response); + return [response, input, output]; + }, + ); } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to `listTopicSnapshots`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.topic @@ -1483,7 +1729,7 @@ export class PublisherClient { */ listTopicSnapshotsStream( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options?: CallOptions + options?: CallOptions, ): Transform { request = request || {}; options = options || {}; @@ -1495,11 +1741,14 @@ export class PublisherClient { }); const defaultCallSettings = this._defaults['listTopicSnapshots']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listTopicSnapshots stream %j', request); return this.descriptors.page.listTopicSnapshots.createStream( this.innerApiCalls.listTopicSnapshots as GaxCall, request, - callSettings + callSettings, ); } @@ -1527,10 +1776,12 @@ export class PublisherClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. + * @example include:samples/generated/v1/publisher.list_topic_snapshots.js + * region_tag:pubsub_v1_generated_Publisher_ListTopicSnapshots_async */ listTopicSnapshotsAsync( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, - options?: CallOptions + options?: CallOptions, ): AsyncIterable { request = request || {}; options = options || {}; @@ -1542,11 +1793,14 @@ export class PublisherClient { }); const defaultCallSettings = this._defaults['listTopicSnapshots']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listTopicSnapshots iterate %j', request); return this.descriptors.page.listTopicSnapshots.asyncIterate( this.innerApiCalls['listTopicSnapshots'] as GaxCall, request as {}, - callSettings + callSettings, ) as AsyncIterable; } /** @@ -1587,7 +1841,7 @@ export class PublisherClient { IamProtos.google.iam.v1.Policy, IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.getIamPolicy(request, options, callback); } @@ -1634,7 +1888,7 @@ export class PublisherClient { IamProtos.google.iam.v1.Policy, IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.setIamPolicy(request, options, callback); } @@ -1682,7 +1936,7 @@ export class PublisherClient { IamProtos.google.iam.v1.TestIamPermissionsResponse, IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.TestIamPermissionsResponse]> { return this.iamClient.testIamPermissions(request, options, callback); } @@ -1871,9 +2125,10 @@ export class PublisherClient { close(): Promise { if (this.publisherStub && !this._terminated) { return this.publisherStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); - this.iamClient.close(); + void this.iamClient.close(); }); } return Promise.resolve(); diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index d94d5a8e959..8ff7d28502d 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -31,6 +31,7 @@ import type { import {Transform} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import {loggingUtils as logging} from 'google-gax'; /** * Client JSON configuration object, loaded from @@ -55,6 +56,8 @@ export class SchemaServiceClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('pubsub'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -90,7 +93,7 @@ export class SchemaServiceClient { * Developer's Console, e.g. 'grape-spaceship-123'. We will also check * the environment variable GCLOUD_PROJECT for your project ID. If your * app is running in an environment which supports - * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, + * {@link https://cloud.google.com/docs/authentication/application-default-credentials Application Default Credentials}, * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. @@ -109,7 +112,7 @@ export class SchemaServiceClient { */ constructor( opts?: ClientOptions, - gaxInstance?: typeof gax | typeof gax.fallback + gaxInstance?: typeof gax | typeof gax.fallback, ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof SchemaServiceClient; @@ -119,7 +122,7 @@ export class SchemaServiceClient { opts?.universe_domain !== opts?.universeDomain ) { throw new Error( - 'Please set either universe_domain or universeDomain, but not both.' + 'Please set either universe_domain or universeDomain, but not both.', ); } const universeDomainEnvVar = @@ -144,9 +147,6 @@ export class SchemaServiceClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); - // Request numeric enum values if REST transport is used. - opts.numericEnums = true; - // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; @@ -204,19 +204,19 @@ export class SchemaServiceClient { // Create useful helper objects for these. this.pathTemplates = { projectPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}' + 'projects/{project}', ), projectTopicPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/topics/{topic}' + 'projects/{project}/topics/{topic}', ), schemaPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/schemas/{schema}' + 'projects/{project}/schemas/{schema}', ), snapshotPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/snapshots/{snapshot}' + 'projects/{project}/snapshots/{snapshot}', ), subscriptionPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/subscriptions/{subscription}' + 'projects/{project}/subscriptions/{subscription}', ), }; @@ -227,12 +227,12 @@ export class SchemaServiceClient { listSchemas: new this._gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', - 'schemas' + 'schemas', ), listSchemaRevisions: new this._gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', - 'schemas' + 'schemas', ), }; @@ -241,7 +241,7 @@ export class SchemaServiceClient { 'google.pubsub.v1.SchemaService', gapicConfig as gax.ClientConfig, opts.clientConfig || {}, - {'x-goog-api-client': clientHeader.join(' ')} + {'x-goog-api-client': clientHeader.join(' ')}, ); // Set up a dictionary of "inner API calls"; the core implementation @@ -275,12 +275,12 @@ export class SchemaServiceClient { this.schemaServiceStub = this._gaxGrpc.createStub( this._opts.fallback ? (this._protos as protobuf.Root).lookupService( - 'google.pubsub.v1.SchemaService' + 'google.pubsub.v1.SchemaService', ) : // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._protos as any).google.pubsub.v1.SchemaService, this._opts, - this._providedCustomServicePath + this._providedCustomServicePath, ) as Promise<{[method: string]: Function}>; // Iterate over each of the methods that the service provides @@ -309,7 +309,7 @@ export class SchemaServiceClient { }, (err: Error | null | undefined) => () => { throw err; - } + }, ); const descriptor = this.descriptors.page[methodName] || undefined; @@ -317,7 +317,7 @@ export class SchemaServiceClient { callPromise, this._defaults[methodName], descriptor, - this._opts.fallback + this._opts.fallback, ); this.innerApiCalls[methodName] = apiCall; @@ -338,7 +338,7 @@ export class SchemaServiceClient { ) { process.emitWarning( 'Static servicePath is deprecated, please use the instance method instead.', - 'DeprecationWarning' + 'DeprecationWarning', ); } return 'pubsub.googleapis.com'; @@ -356,7 +356,7 @@ export class SchemaServiceClient { ) { process.emitWarning( 'Static apiEndpoint is deprecated, please use the instance method instead.', - 'DeprecationWarning' + 'DeprecationWarning', ); } return 'pubsub.googleapis.com'; @@ -401,7 +401,7 @@ export class SchemaServiceClient { * @returns {Promise} A promise that resolves to string containing the project ID. */ getProjectId( - callback?: Callback + callback?: Callback, ): Promise | void { if (callback) { this.auth.getProjectId(callback); @@ -439,10 +439,12 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.create_schema.js + * region_tag:pubsub_v1_generated_SchemaService_CreateSchema_async */ createSchema( request?: protos.google.pubsub.v1.ICreateSchemaRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -457,7 +459,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; createSchema( request: protos.google.pubsub.v1.ICreateSchemaRequest, @@ -465,7 +467,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; createSchema( request?: protos.google.pubsub.v1.ICreateSchemaRequest, @@ -480,7 +482,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -503,8 +505,34 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ parent: request.parent ?? '', }); - this.initialize(); - return this.innerApiCalls.createSchema(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('createSchema request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSchema response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .createSchema(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICreateSchemaRequest | undefined, + {} | undefined, + ]) => { + this._log.info('createSchema response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Gets a schema. @@ -523,10 +551,12 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.get_schema.js + * region_tag:pubsub_v1_generated_SchemaService_GetSchema_async */ getSchema( request?: protos.google.pubsub.v1.IGetSchemaRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -541,7 +571,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IGetSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; getSchema( request: protos.google.pubsub.v1.IGetSchemaRequest, @@ -549,7 +579,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IGetSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; getSchema( request?: protos.google.pubsub.v1.IGetSchemaRequest, @@ -564,7 +594,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IGetSchemaRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -587,8 +617,34 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.getSchema(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('getSchema request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IGetSchemaRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSchema response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .getSchema(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IGetSchemaRequest | undefined, + {} | undefined, + ]) => { + this._log.info('getSchema response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Commits a new schema revision to an existing schema. @@ -606,10 +662,12 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.commit_schema.js + * region_tag:pubsub_v1_generated_SchemaService_CommitSchema_async */ commitSchema( request?: protos.google.pubsub.v1.ICommitSchemaRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -624,7 +682,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICommitSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; commitSchema( request: protos.google.pubsub.v1.ICommitSchemaRequest, @@ -632,7 +690,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICommitSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; commitSchema( request?: protos.google.pubsub.v1.ICommitSchemaRequest, @@ -647,7 +705,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.ICommitSchemaRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -670,8 +728,34 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.commitSchema(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('commitSchema request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICommitSchemaRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('commitSchema response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .commitSchema(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.ICommitSchemaRequest | undefined, + {} | undefined, + ]) => { + this._log.info('commitSchema response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Creates a new schema revision that is a copy of the provided revision_id. @@ -691,10 +775,12 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.rollback_schema.js + * region_tag:pubsub_v1_generated_SchemaService_RollbackSchema_async */ rollbackSchema( request?: protos.google.pubsub.v1.IRollbackSchemaRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -709,7 +795,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IRollbackSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; rollbackSchema( request: protos.google.pubsub.v1.IRollbackSchemaRequest, @@ -717,7 +803,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IRollbackSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; rollbackSchema( request?: protos.google.pubsub.v1.IRollbackSchemaRequest, @@ -732,7 +818,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IRollbackSchemaRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -755,8 +841,34 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.rollbackSchema(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('rollbackSchema request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IRollbackSchemaRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('rollbackSchema response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .rollbackSchema(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IRollbackSchemaRequest | undefined, + {} | undefined, + ]) => { + this._log.info('rollbackSchema response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Deletes a specific schema revision. @@ -778,10 +890,12 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.delete_schema_revision.js + * region_tag:pubsub_v1_generated_SchemaService_DeleteSchemaRevision_async */ deleteSchemaRevision( request?: protos.google.pubsub.v1.IDeleteSchemaRevisionRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -796,7 +910,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteSchemaRevision( request: protos.google.pubsub.v1.IDeleteSchemaRevisionRequest, @@ -804,7 +918,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteSchemaRevision( request?: protos.google.pubsub.v1.IDeleteSchemaRevisionRequest, @@ -821,7 +935,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.ISchema, protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISchema, @@ -844,8 +958,36 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.deleteSchemaRevision(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('deleteSchemaRevision request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISchema, + | protos.google.pubsub.v1.IDeleteSchemaRevisionRequest + | null + | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSchemaRevision response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .deleteSchemaRevision(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISchema, + protos.google.pubsub.v1.IDeleteSchemaRevisionRequest | undefined, + {} | undefined, + ]) => { + this._log.info('deleteSchemaRevision response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Deletes a schema. @@ -861,10 +1003,12 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.delete_schema.js + * region_tag:pubsub_v1_generated_SchemaService_DeleteSchema_async */ deleteSchema( request?: protos.google.pubsub.v1.IDeleteSchemaRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.protobuf.IEmpty, @@ -879,7 +1023,7 @@ export class SchemaServiceClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteSchema( request: protos.google.pubsub.v1.IDeleteSchemaRequest, @@ -887,7 +1031,7 @@ export class SchemaServiceClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteSchema( request?: protos.google.pubsub.v1.IDeleteSchemaRequest, @@ -902,7 +1046,7 @@ export class SchemaServiceClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSchemaRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.protobuf.IEmpty, @@ -925,8 +1069,34 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.deleteSchema(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('deleteSchema request %j', request); + const wrappedCallback: + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSchemaRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSchema response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .deleteSchema(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSchemaRequest | undefined, + {} | undefined, + ]) => { + this._log.info('deleteSchema response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Validates a schema. @@ -944,10 +1114,12 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.ValidateSchemaResponse|ValidateSchemaResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.validate_schema.js + * region_tag:pubsub_v1_generated_SchemaService_ValidateSchema_async */ validateSchema( request?: protos.google.pubsub.v1.IValidateSchemaRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.IValidateSchemaResponse, @@ -962,7 +1134,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IValidateSchemaResponse, protos.google.pubsub.v1.IValidateSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; validateSchema( request: protos.google.pubsub.v1.IValidateSchemaRequest, @@ -970,7 +1142,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IValidateSchemaResponse, protos.google.pubsub.v1.IValidateSchemaRequest | null | undefined, {} | null | undefined - > + >, ): void; validateSchema( request?: protos.google.pubsub.v1.IValidateSchemaRequest, @@ -985,7 +1157,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IValidateSchemaResponse, protos.google.pubsub.v1.IValidateSchemaRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.IValidateSchemaResponse, @@ -1008,8 +1180,34 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ parent: request.parent ?? '', }); - this.initialize(); - return this.innerApiCalls.validateSchema(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('validateSchema request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.IValidateSchemaResponse, + protos.google.pubsub.v1.IValidateSchemaRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('validateSchema response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .validateSchema(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.IValidateSchemaResponse, + protos.google.pubsub.v1.IValidateSchemaRequest | undefined, + {} | undefined, + ]) => { + this._log.info('validateSchema response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Validates a message against a schema. @@ -1035,10 +1233,12 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.ValidateMessageResponse|ValidateMessageResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.validate_message.js + * region_tag:pubsub_v1_generated_SchemaService_ValidateMessage_async */ validateMessage( request?: protos.google.pubsub.v1.IValidateMessageRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.IValidateMessageResponse, @@ -1053,7 +1253,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IValidateMessageResponse, protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, {} | null | undefined - > + >, ): void; validateMessage( request: protos.google.pubsub.v1.IValidateMessageRequest, @@ -1061,7 +1261,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IValidateMessageResponse, protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, {} | null | undefined - > + >, ): void; validateMessage( request?: protos.google.pubsub.v1.IValidateMessageRequest, @@ -1076,7 +1276,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IValidateMessageResponse, protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.IValidateMessageResponse, @@ -1099,8 +1299,34 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ parent: request.parent ?? '', }); - this.initialize(); - return this.innerApiCalls.validateMessage(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('validateMessage request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('validateMessage response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .validateMessage(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.IValidateMessageResponse, + protos.google.pubsub.v1.IValidateMessageRequest | undefined, + {} | undefined, + ]) => { + this._log.info('validateMessage response %j', response); + return [response, options, rawResponse]; + }, + ); } /** @@ -1135,7 +1361,7 @@ export class SchemaServiceClient { */ listSchemas( request?: protos.google.pubsub.v1.IListSchemasRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISchema[], @@ -1150,7 +1376,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IListSchemasRequest, protos.google.pubsub.v1.IListSchemasResponse | null | undefined, protos.google.pubsub.v1.ISchema - > + >, ): void; listSchemas( request: protos.google.pubsub.v1.IListSchemasRequest, @@ -1158,7 +1384,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IListSchemasRequest, protos.google.pubsub.v1.IListSchemasResponse | null | undefined, protos.google.pubsub.v1.ISchema - > + >, ): void; listSchemas( request?: protos.google.pubsub.v1.IListSchemasRequest, @@ -1173,7 +1399,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IListSchemasRequest, protos.google.pubsub.v1.IListSchemasResponse | null | undefined, protos.google.pubsub.v1.ISchema - > + >, ): Promise< [ protos.google.pubsub.v1.ISchema[], @@ -1196,12 +1422,38 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ parent: request.parent ?? '', }); - this.initialize(); - return this.innerApiCalls.listSchemas(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + const wrappedCallback: + | PaginationCallback< + protos.google.pubsub.v1.IListSchemasRequest, + protos.google.pubsub.v1.IListSchemasResponse | null | undefined, + protos.google.pubsub.v1.ISchema + > + | undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSchemas values %j', values); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. + } + : undefined; + this._log.info('listSchemas request %j', request); + return this.innerApiCalls + .listSchemas(request, options, wrappedCallback) + ?.then( + ([response, input, output]: [ + protos.google.pubsub.v1.ISchema[], + protos.google.pubsub.v1.IListSchemasRequest | null, + protos.google.pubsub.v1.IListSchemasResponse, + ]) => { + this._log.info('listSchemas values %j', response); + return [response, input, output]; + }, + ); } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to `listSchemas`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.parent @@ -1230,7 +1482,7 @@ export class SchemaServiceClient { */ listSchemasStream( request?: protos.google.pubsub.v1.IListSchemasRequest, - options?: CallOptions + options?: CallOptions, ): Transform { request = request || {}; options = options || {}; @@ -1242,11 +1494,14 @@ export class SchemaServiceClient { }); const defaultCallSettings = this._defaults['listSchemas']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listSchemas stream %j', request); return this.descriptors.page.listSchemas.createStream( this.innerApiCalls.listSchemas as GaxCall, request, - callSettings + callSettings, ); } @@ -1278,10 +1533,12 @@ export class SchemaServiceClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.list_schemas.js + * region_tag:pubsub_v1_generated_SchemaService_ListSchemas_async */ listSchemasAsync( request?: protos.google.pubsub.v1.IListSchemasRequest, - options?: CallOptions + options?: CallOptions, ): AsyncIterable { request = request || {}; options = options || {}; @@ -1293,11 +1550,14 @@ export class SchemaServiceClient { }); const defaultCallSettings = this._defaults['listSchemas']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listSchemas iterate %j', request); return this.descriptors.page.listSchemas.asyncIterate( this.innerApiCalls['listSchemas'] as GaxCall, request as {}, - callSettings + callSettings, ) as AsyncIterable; } /** @@ -1330,7 +1590,7 @@ export class SchemaServiceClient { */ listSchemaRevisions( request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISchema[], @@ -1345,7 +1605,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IListSchemaRevisionsRequest, protos.google.pubsub.v1.IListSchemaRevisionsResponse | null | undefined, protos.google.pubsub.v1.ISchema - > + >, ): void; listSchemaRevisions( request: protos.google.pubsub.v1.IListSchemaRevisionsRequest, @@ -1353,7 +1613,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IListSchemaRevisionsRequest, protos.google.pubsub.v1.IListSchemaRevisionsResponse | null | undefined, protos.google.pubsub.v1.ISchema - > + >, ): void; listSchemaRevisions( request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, @@ -1370,7 +1630,7 @@ export class SchemaServiceClient { protos.google.pubsub.v1.IListSchemaRevisionsRequest, protos.google.pubsub.v1.IListSchemaRevisionsResponse | null | undefined, protos.google.pubsub.v1.ISchema - > + >, ): Promise< [ protos.google.pubsub.v1.ISchema[], @@ -1393,12 +1653,40 @@ export class SchemaServiceClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.listSchemaRevisions(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + const wrappedCallback: + | PaginationCallback< + protos.google.pubsub.v1.IListSchemaRevisionsRequest, + | protos.google.pubsub.v1.IListSchemaRevisionsResponse + | null + | undefined, + protos.google.pubsub.v1.ISchema + > + | undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSchemaRevisions values %j', values); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. + } + : undefined; + this._log.info('listSchemaRevisions request %j', request); + return this.innerApiCalls + .listSchemaRevisions(request, options, wrappedCallback) + ?.then( + ([response, input, output]: [ + protos.google.pubsub.v1.ISchema[], + protos.google.pubsub.v1.IListSchemaRevisionsRequest | null, + protos.google.pubsub.v1.IListSchemaRevisionsResponse, + ]) => { + this._log.info('listSchemaRevisions values %j', response); + return [response, input, output]; + }, + ); } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to `listSchemaRevisions`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.name @@ -1425,7 +1713,7 @@ export class SchemaServiceClient { */ listSchemaRevisionsStream( request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, - options?: CallOptions + options?: CallOptions, ): Transform { request = request || {}; options = options || {}; @@ -1437,11 +1725,14 @@ export class SchemaServiceClient { }); const defaultCallSettings = this._defaults['listSchemaRevisions']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listSchemaRevisions stream %j', request); return this.descriptors.page.listSchemaRevisions.createStream( this.innerApiCalls.listSchemaRevisions as GaxCall, request, - callSettings + callSettings, ); } @@ -1471,10 +1762,12 @@ export class SchemaServiceClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. + * @example include:samples/generated/v1/schema_service.list_schema_revisions.js + * region_tag:pubsub_v1_generated_SchemaService_ListSchemaRevisions_async */ listSchemaRevisionsAsync( request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, - options?: CallOptions + options?: CallOptions, ): AsyncIterable { request = request || {}; options = options || {}; @@ -1486,11 +1779,14 @@ export class SchemaServiceClient { }); const defaultCallSettings = this._defaults['listSchemaRevisions']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listSchemaRevisions iterate %j', request); return this.descriptors.page.listSchemaRevisions.asyncIterate( this.innerApiCalls['listSchemaRevisions'] as GaxCall, request as {}, - callSettings + callSettings, ) as AsyncIterable; } /** @@ -1531,7 +1827,7 @@ export class SchemaServiceClient { IamProtos.google.iam.v1.Policy, IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.getIamPolicy(request, options, callback); } @@ -1578,7 +1874,7 @@ export class SchemaServiceClient { IamProtos.google.iam.v1.Policy, IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.setIamPolicy(request, options, callback); } @@ -1626,7 +1922,7 @@ export class SchemaServiceClient { IamProtos.google.iam.v1.TestIamPermissionsResponse, IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.TestIamPermissionsResponse]> { return this.iamClient.testIamPermissions(request, options, callback); } @@ -1815,9 +2111,10 @@ export class SchemaServiceClient { close(): Promise { if (this.schemaServiceStub && !this._terminated) { return this.schemaServiceStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); - this.iamClient.close(); + void this.iamClient.close(); }); } return Promise.resolve(); diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 26c6d905315..8113e2c15b9 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -31,6 +31,7 @@ import type { import {Transform, PassThrough} from 'stream'; import * as protos from '../../protos/protos'; import jsonProtos = require('../../protos/protos.json'); +import {loggingUtils as logging} from 'google-gax'; /** * Client JSON configuration object, loaded from @@ -57,6 +58,8 @@ export class SubscriberClient { private _defaults: {[method: string]: gax.CallSettings}; private _universeDomain: string; private _servicePath: string; + private _log = logging.log('pubsub'); + auth: gax.GoogleAuth; descriptors: Descriptors = { page: {}, @@ -92,7 +95,7 @@ export class SubscriberClient { * Developer's Console, e.g. 'grape-spaceship-123'. We will also check * the environment variable GCLOUD_PROJECT for your project ID. If your * app is running in an environment which supports - * {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials}, + * {@link https://cloud.google.com/docs/authentication/application-default-credentials Application Default Credentials}, * your project ID will be detected automatically. * @param {string} [options.apiEndpoint] - The domain name of the * API remote host. @@ -111,7 +114,7 @@ export class SubscriberClient { */ constructor( opts?: ClientOptions, - gaxInstance?: typeof gax | typeof gax.fallback + gaxInstance?: typeof gax | typeof gax.fallback, ) { // Ensure that options include all the required fields. const staticMembers = this.constructor as typeof SubscriberClient; @@ -121,7 +124,7 @@ export class SubscriberClient { opts?.universe_domain !== opts?.universeDomain ) { throw new Error( - 'Please set either universe_domain or universeDomain, but not both.' + 'Please set either universe_domain or universeDomain, but not both.', ); } const universeDomainEnvVar = @@ -146,9 +149,6 @@ export class SubscriberClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); - // Request numeric enum values if REST transport is used. - opts.numericEnums = true; - // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; @@ -206,19 +206,19 @@ export class SubscriberClient { // Create useful helper objects for these. this.pathTemplates = { projectPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}' + 'projects/{project}', ), projectTopicPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/topics/{topic}' + 'projects/{project}/topics/{topic}', ), schemaPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/schemas/{schema}' + 'projects/{project}/schemas/{schema}', ), snapshotPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/snapshots/{snapshot}' + 'projects/{project}/snapshots/{snapshot}', ), subscriptionPathTemplate: new this._gaxModule.PathTemplate( - 'projects/{project}/subscriptions/{subscription}' + 'projects/{project}/subscriptions/{subscription}', ), }; @@ -229,12 +229,12 @@ export class SubscriberClient { listSubscriptions: new this._gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', - 'subscriptions' + 'subscriptions', ), listSnapshots: new this._gaxModule.PageDescriptor( 'pageToken', 'nextPageToken', - 'snapshots' + 'snapshots', ), }; @@ -244,7 +244,7 @@ export class SubscriberClient { streamingPull: new this._gaxModule.StreamDescriptor( this._gaxModule.StreamType.BIDI_STREAMING, !!opts.fallback, - !!opts.gaxServerStreamingRetries + !!opts.gaxServerStreamingRetries, ), }; @@ -253,7 +253,7 @@ export class SubscriberClient { 'google.pubsub.v1.Subscriber', gapicConfig as gax.ClientConfig, opts.clientConfig || {}, - {'x-goog-api-client': clientHeader.join(' ')} + {'x-goog-api-client': clientHeader.join(' ')}, ); // Set up a dictionary of "inner API calls"; the core implementation @@ -287,12 +287,12 @@ export class SubscriberClient { this.subscriberStub = this._gaxGrpc.createStub( this._opts.fallback ? (this._protos as protobuf.Root).lookupService( - 'google.pubsub.v1.Subscriber' + 'google.pubsub.v1.Subscriber', ) : // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._protos as any).google.pubsub.v1.Subscriber, this._opts, - this._providedCustomServicePath + this._providedCustomServicePath, ) as Promise<{[method: string]: Function}>; // Iterate over each of the methods that the service provides @@ -321,13 +321,13 @@ export class SubscriberClient { (...args: Array<{}>) => { if (this._terminated) { if (methodName in this.descriptors.stream) { - const stream = new PassThrough(); + const stream = new PassThrough({objectMode: true}); setImmediate(() => { stream.emit( 'error', new this._gaxModule.GoogleError( - 'The client has already been closed.' - ) + 'The client has already been closed.', + ), ); }); return stream; @@ -339,7 +339,7 @@ export class SubscriberClient { }, (err: Error | null | undefined) => () => { throw err; - } + }, ); const descriptor = @@ -350,7 +350,7 @@ export class SubscriberClient { callPromise, this._defaults[methodName], descriptor, - this._opts.fallback + this._opts.fallback, ); this.innerApiCalls[methodName] = apiCall; @@ -371,7 +371,7 @@ export class SubscriberClient { ) { process.emitWarning( 'Static servicePath is deprecated, please use the instance method instead.', - 'DeprecationWarning' + 'DeprecationWarning', ); } return 'pubsub.googleapis.com'; @@ -389,7 +389,7 @@ export class SubscriberClient { ) { process.emitWarning( 'Static apiEndpoint is deprecated, please use the instance method instead.', - 'DeprecationWarning' + 'DeprecationWarning', ); } return 'pubsub.googleapis.com'; @@ -434,7 +434,7 @@ export class SubscriberClient { * @returns {Promise} A promise that resolves to string containing the project ID. */ getProjectId( - callback?: Callback + callback?: Callback, ): Promise | void { if (callback) { this.auth.getProjectId(callback); @@ -586,16 +586,21 @@ export class SubscriberClient { * @param {google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo} request.analyticsHubSubscriptionInfo * Output only. Information about the associated Analytics Hub subscription. * Only set if the subscritpion is created by Analytics Hub. + * @param {number[]} [request.messageTransforms] + * Optional. Transforms to be applied to messages before they are delivered to + * subscribers. Transforms are applied in the order specified. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.create_subscription.js + * region_tag:pubsub_v1_generated_Subscriber_CreateSubscription_async */ createSubscription( request?: protos.google.pubsub.v1.ISubscription, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -610,7 +615,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.ISubscription | null | undefined, {} | null | undefined - > + >, ): void; createSubscription( request: protos.google.pubsub.v1.ISubscription, @@ -618,7 +623,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.ISubscription | null | undefined, {} | null | undefined - > + >, ): void; createSubscription( request?: protos.google.pubsub.v1.ISubscription, @@ -633,7 +638,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.ISubscription | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -656,8 +661,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.createSubscription(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('createSubscription request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSubscription response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .createSubscription(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.ISubscription | undefined, + {} | undefined, + ]) => { + this._log.info('createSubscription response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Gets the configuration details of a subscription. @@ -673,10 +704,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.get_subscription.js + * region_tag:pubsub_v1_generated_Subscriber_GetSubscription_async */ getSubscription( request?: protos.google.pubsub.v1.IGetSubscriptionRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -691,7 +724,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): void; getSubscription( request: protos.google.pubsub.v1.IGetSubscriptionRequest, @@ -699,7 +732,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): void; getSubscription( request?: protos.google.pubsub.v1.IGetSubscriptionRequest, @@ -714,7 +747,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -737,8 +770,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ subscription: request.subscription ?? '', }); - this.initialize(); - return this.innerApiCalls.getSubscription(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('getSubscription request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IGetSubscriptionRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSubscription response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .getSubscription(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IGetSubscriptionRequest | undefined, + {} | undefined, + ]) => { + this._log.info('getSubscription response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Updates an existing subscription by updating the fields specified in the @@ -758,10 +817,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.update_subscription.js + * region_tag:pubsub_v1_generated_Subscriber_UpdateSubscription_async */ updateSubscription( request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -776,7 +837,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): void; updateSubscription( request: protos.google.pubsub.v1.IUpdateSubscriptionRequest, @@ -784,7 +845,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): void; updateSubscription( request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, @@ -799,7 +860,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISubscription, protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISubscription, @@ -822,8 +883,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ 'subscription.name': request.subscription!.name ?? '', }); - this.initialize(); - return this.innerApiCalls.updateSubscription(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('updateSubscription request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IUpdateSubscriptionRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateSubscription response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .updateSubscription(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISubscription, + protos.google.pubsub.v1.IUpdateSubscriptionRequest | undefined, + {} | undefined, + ]) => { + this._log.info('updateSubscription response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Deletes an existing subscription. All messages retained in the subscription @@ -843,10 +930,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.delete_subscription.js + * region_tag:pubsub_v1_generated_Subscriber_DeleteSubscription_async */ deleteSubscription( request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.protobuf.IEmpty, @@ -861,7 +950,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteSubscription( request: protos.google.pubsub.v1.IDeleteSubscriptionRequest, @@ -869,7 +958,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteSubscription( request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, @@ -884,7 +973,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.protobuf.IEmpty, @@ -907,8 +996,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ subscription: request.subscription ?? '', }); - this.initialize(); - return this.innerApiCalls.deleteSubscription(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('deleteSubscription request %j', request); + const wrappedCallback: + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSubscriptionRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSubscription response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .deleteSubscription(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSubscriptionRequest | undefined, + {} | undefined, + ]) => { + this._log.info('deleteSubscription response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Modifies the ack deadline for a specific message. This method is useful @@ -940,10 +1055,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.modify_ack_deadline.js + * region_tag:pubsub_v1_generated_Subscriber_ModifyAckDeadline_async */ modifyAckDeadline( request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.protobuf.IEmpty, @@ -958,7 +1075,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, {} | null | undefined - > + >, ): void; modifyAckDeadline( request: protos.google.pubsub.v1.IModifyAckDeadlineRequest, @@ -966,7 +1083,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, {} | null | undefined - > + >, ): void; modifyAckDeadline( request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, @@ -981,7 +1098,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.protobuf.IEmpty, @@ -1004,8 +1121,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ subscription: request.subscription ?? '', }); - this.initialize(); - return this.innerApiCalls.modifyAckDeadline(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('modifyAckDeadline request %j', request); + const wrappedCallback: + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('modifyAckDeadline response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .modifyAckDeadline(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyAckDeadlineRequest | undefined, + {} | undefined, + ]) => { + this._log.info('modifyAckDeadline response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Acknowledges the messages associated with the `ack_ids` in the @@ -1031,10 +1174,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.acknowledge.js + * region_tag:pubsub_v1_generated_Subscriber_Acknowledge_async */ acknowledge( request?: protos.google.pubsub.v1.IAcknowledgeRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.protobuf.IEmpty, @@ -1049,7 +1194,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, {} | null | undefined - > + >, ): void; acknowledge( request: protos.google.pubsub.v1.IAcknowledgeRequest, @@ -1057,7 +1202,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, {} | null | undefined - > + >, ): void; acknowledge( request?: protos.google.pubsub.v1.IAcknowledgeRequest, @@ -1072,7 +1217,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.protobuf.IEmpty, @@ -1095,8 +1240,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ subscription: request.subscription ?? '', }); - this.initialize(); - return this.innerApiCalls.acknowledge(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('acknowledge request %j', request); + const wrappedCallback: + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('acknowledge response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .acknowledge(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IAcknowledgeRequest | undefined, + {} | undefined, + ]) => { + this._log.info('acknowledge response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Pulls messages from the server. @@ -1124,10 +1295,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.PullResponse|PullResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.pull.js + * region_tag:pubsub_v1_generated_Subscriber_Pull_async */ pull( request?: protos.google.pubsub.v1.IPullRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.IPullResponse, @@ -1142,7 +1315,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IPullResponse, protos.google.pubsub.v1.IPullRequest | null | undefined, {} | null | undefined - > + >, ): void; pull( request: protos.google.pubsub.v1.IPullRequest, @@ -1150,7 +1323,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IPullResponse, protos.google.pubsub.v1.IPullRequest | null | undefined, {} | null | undefined - > + >, ): void; pull( request?: protos.google.pubsub.v1.IPullRequest, @@ -1165,7 +1338,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IPullResponse, protos.google.pubsub.v1.IPullRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.IPullResponse, @@ -1188,8 +1361,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ subscription: request.subscription ?? '', }); - this.initialize(); - return this.innerApiCalls.pull(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('pull request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('pull response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .pull(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.IPullResponse, + protos.google.pubsub.v1.IPullRequest | undefined, + {} | undefined, + ]) => { + this._log.info('pull response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Modifies the `PushConfig` for a specified subscription. @@ -1217,10 +1416,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.modify_push_config.js + * region_tag:pubsub_v1_generated_Subscriber_ModifyPushConfig_async */ modifyPushConfig( request?: protos.google.pubsub.v1.IModifyPushConfigRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.protobuf.IEmpty, @@ -1235,7 +1436,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, {} | null | undefined - > + >, ): void; modifyPushConfig( request: protos.google.pubsub.v1.IModifyPushConfigRequest, @@ -1243,7 +1444,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, {} | null | undefined - > + >, ): void; modifyPushConfig( request?: protos.google.pubsub.v1.IModifyPushConfigRequest, @@ -1258,7 +1459,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.protobuf.IEmpty, @@ -1281,8 +1482,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ subscription: request.subscription ?? '', }); - this.initialize(); - return this.innerApiCalls.modifyPushConfig(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('modifyPushConfig request %j', request); + const wrappedCallback: + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('modifyPushConfig response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .modifyPushConfig(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IModifyPushConfigRequest | undefined, + {} | undefined, + ]) => { + this._log.info('modifyPushConfig response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Gets the configuration details of a snapshot. Snapshots are used in @@ -1302,10 +1529,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.get_snapshot.js + * region_tag:pubsub_v1_generated_Subscriber_GetSnapshot_async */ getSnapshot( request?: protos.google.pubsub.v1.IGetSnapshotRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1320,7 +1549,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): void; getSnapshot( request: protos.google.pubsub.v1.IGetSnapshotRequest, @@ -1328,7 +1557,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): void; getSnapshot( request?: protos.google.pubsub.v1.IGetSnapshotRequest, @@ -1343,7 +1572,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1366,8 +1595,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ snapshot: request.snapshot ?? '', }); - this.initialize(); - return this.innerApiCalls.getSnapshot(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('getSnapshot request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IGetSnapshotRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('getSnapshot response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .getSnapshot(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IGetSnapshotRequest | undefined, + {} | undefined, + ]) => { + this._log.info('getSnapshot response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Creates a snapshot from the requested subscription. Snapshots are used in @@ -1415,10 +1670,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.create_snapshot.js + * region_tag:pubsub_v1_generated_Subscriber_CreateSnapshot_async */ createSnapshot( request?: protos.google.pubsub.v1.ICreateSnapshotRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1433,7 +1690,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): void; createSnapshot( request: protos.google.pubsub.v1.ICreateSnapshotRequest, @@ -1441,7 +1698,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): void; createSnapshot( request?: protos.google.pubsub.v1.ICreateSnapshotRequest, @@ -1456,7 +1713,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1479,8 +1736,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ name: request.name ?? '', }); - this.initialize(); - return this.innerApiCalls.createSnapshot(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('createSnapshot request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('createSnapshot response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .createSnapshot(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.ICreateSnapshotRequest | undefined, + {} | undefined, + ]) => { + this._log.info('createSnapshot response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Updates an existing snapshot by updating the fields specified in the update @@ -1503,10 +1786,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.update_snapshot.js + * region_tag:pubsub_v1_generated_Subscriber_UpdateSnapshot_async */ updateSnapshot( request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1521,7 +1806,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): void; updateSnapshot( request: protos.google.pubsub.v1.IUpdateSnapshotRequest, @@ -1529,7 +1814,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): void; updateSnapshot( request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, @@ -1544,7 +1829,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISnapshot, protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISnapshot, @@ -1567,8 +1852,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ 'snapshot.name': request.snapshot!.name ?? '', }); - this.initialize(); - return this.innerApiCalls.updateSnapshot(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('updateSnapshot request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('updateSnapshot response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .updateSnapshot(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISnapshot, + protos.google.pubsub.v1.IUpdateSnapshotRequest | undefined, + {} | undefined, + ]) => { + this._log.info('updateSnapshot response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Removes an existing snapshot. Snapshots are used in [Seek] @@ -1592,10 +1903,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.delete_snapshot.js + * region_tag:pubsub_v1_generated_Subscriber_DeleteSnapshot_async */ deleteSnapshot( request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.protobuf.IEmpty, @@ -1610,7 +1923,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteSnapshot( request: protos.google.pubsub.v1.IDeleteSnapshotRequest, @@ -1618,7 +1931,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): void; deleteSnapshot( request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, @@ -1633,7 +1946,7 @@ export class SubscriberClient { protos.google.protobuf.IEmpty, protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.protobuf.IEmpty, @@ -1656,8 +1969,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ snapshot: request.snapshot ?? '', }); - this.initialize(); - return this.innerApiCalls.deleteSnapshot(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('deleteSnapshot request %j', request); + const wrappedCallback: + | Callback< + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('deleteSnapshot response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .deleteSnapshot(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.protobuf.IEmpty, + protos.google.pubsub.v1.IDeleteSnapshotRequest | undefined, + {} | undefined, + ]) => { + this._log.info('deleteSnapshot response %j', response); + return [response, options, rawResponse]; + }, + ); } /** * Seeks an existing subscription to a point in time or to a given snapshot, @@ -1694,10 +2033,12 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.SeekResponse|SeekResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.seek.js + * region_tag:pubsub_v1_generated_Subscriber_Seek_async */ seek( request?: protos.google.pubsub.v1.ISeekRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISeekResponse, @@ -1712,7 +2053,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISeekResponse, protos.google.pubsub.v1.ISeekRequest | null | undefined, {} | null | undefined - > + >, ): void; seek( request: protos.google.pubsub.v1.ISeekRequest, @@ -1720,7 +2061,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISeekResponse, protos.google.pubsub.v1.ISeekRequest | null | undefined, {} | null | undefined - > + >, ): void; seek( request?: protos.google.pubsub.v1.ISeekRequest, @@ -1735,7 +2076,7 @@ export class SubscriberClient { protos.google.pubsub.v1.ISeekResponse, protos.google.pubsub.v1.ISeekRequest | null | undefined, {} | null | undefined - > + >, ): Promise< [ protos.google.pubsub.v1.ISeekResponse, @@ -1758,8 +2099,34 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ subscription: request.subscription ?? '', }); - this.initialize(); - return this.innerApiCalls.seek(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + this._log.info('seek request %j', request); + const wrappedCallback: + | Callback< + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | null | undefined, + {} | null | undefined + > + | undefined = callback + ? (error, response, options, rawResponse) => { + this._log.info('seek response %j', response); + callback!(error, response, options, rawResponse); // We verified callback above. + } + : undefined; + return this.innerApiCalls + .seek(request, options, wrappedCallback) + ?.then( + ([response, options, rawResponse]: [ + protos.google.pubsub.v1.ISeekResponse, + protos.google.pubsub.v1.ISeekRequest | undefined, + {} | undefined, + ]) => { + this._log.info('seek response %j', response); + return [response, options, rawResponse]; + }, + ); } /** @@ -1779,9 +2146,14 @@ export class SubscriberClient { * will emit objects representing {@link protos.google.pubsub.v1.StreamingPullResponse|StreamingPullResponse} on 'data' event asynchronously. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.streaming_pull.js + * region_tag:pubsub_v1_generated_Subscriber_StreamingPull_async */ streamingPull(options?: CallOptions): gax.CancellableStream { - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('streamingPull stream %j', options); return this.innerApiCalls.streamingPull(null, options); } @@ -1813,7 +2185,7 @@ export class SubscriberClient { */ listSubscriptions( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISubscription[], @@ -1828,7 +2200,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IListSubscriptionsRequest, protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, protos.google.pubsub.v1.ISubscription - > + >, ): void; listSubscriptions( request: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1836,7 +2208,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IListSubscriptionsRequest, protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, protos.google.pubsub.v1.ISubscription - > + >, ): void; listSubscriptions( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -1851,7 +2223,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IListSubscriptionsRequest, protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, protos.google.pubsub.v1.ISubscription - > + >, ): Promise< [ protos.google.pubsub.v1.ISubscription[], @@ -1874,12 +2246,38 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ project: request.project ?? '', }); - this.initialize(); - return this.innerApiCalls.listSubscriptions(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + const wrappedCallback: + | PaginationCallback< + protos.google.pubsub.v1.IListSubscriptionsRequest, + protos.google.pubsub.v1.IListSubscriptionsResponse | null | undefined, + protos.google.pubsub.v1.ISubscription + > + | undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSubscriptions values %j', values); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. + } + : undefined; + this._log.info('listSubscriptions request %j', request); + return this.innerApiCalls + .listSubscriptions(request, options, wrappedCallback) + ?.then( + ([response, input, output]: [ + protos.google.pubsub.v1.ISubscription[], + protos.google.pubsub.v1.IListSubscriptionsRequest | null, + protos.google.pubsub.v1.IListSubscriptionsResponse, + ]) => { + this._log.info('listSubscriptions values %j', response); + return [response, input, output]; + }, + ); } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to `listSubscriptions`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -1904,7 +2302,7 @@ export class SubscriberClient { */ listSubscriptionsStream( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, - options?: CallOptions + options?: CallOptions, ): Transform { request = request || {}; options = options || {}; @@ -1916,11 +2314,14 @@ export class SubscriberClient { }); const defaultCallSettings = this._defaults['listSubscriptions']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listSubscriptions stream %j', request); return this.descriptors.page.listSubscriptions.createStream( this.innerApiCalls.listSubscriptions as GaxCall, request, - callSettings + callSettings, ); } @@ -1948,10 +2349,12 @@ export class SubscriberClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.list_subscriptions.js + * region_tag:pubsub_v1_generated_Subscriber_ListSubscriptions_async */ listSubscriptionsAsync( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, - options?: CallOptions + options?: CallOptions, ): AsyncIterable { request = request || {}; options = options || {}; @@ -1963,11 +2366,14 @@ export class SubscriberClient { }); const defaultCallSettings = this._defaults['listSubscriptions']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listSubscriptions iterate %j', request); return this.descriptors.page.listSubscriptions.asyncIterate( this.innerApiCalls['listSubscriptions'] as GaxCall, request as {}, - callSettings + callSettings, ) as AsyncIterable; } /** @@ -2002,7 +2408,7 @@ export class SubscriberClient { */ listSnapshots( request?: protos.google.pubsub.v1.IListSnapshotsRequest, - options?: CallOptions + options?: CallOptions, ): Promise< [ protos.google.pubsub.v1.ISnapshot[], @@ -2017,7 +2423,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IListSnapshotsRequest, protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, protos.google.pubsub.v1.ISnapshot - > + >, ): void; listSnapshots( request: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2025,7 +2431,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IListSnapshotsRequest, protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, protos.google.pubsub.v1.ISnapshot - > + >, ): void; listSnapshots( request?: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2040,7 +2446,7 @@ export class SubscriberClient { protos.google.pubsub.v1.IListSnapshotsRequest, protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, protos.google.pubsub.v1.ISnapshot - > + >, ): Promise< [ protos.google.pubsub.v1.ISnapshot[], @@ -2063,12 +2469,38 @@ export class SubscriberClient { this._gaxModule.routingHeader.fromParams({ project: request.project ?? '', }); - this.initialize(); - return this.innerApiCalls.listSnapshots(request, options, callback); + this.initialize().catch(err => { + throw err; + }); + const wrappedCallback: + | PaginationCallback< + protos.google.pubsub.v1.IListSnapshotsRequest, + protos.google.pubsub.v1.IListSnapshotsResponse | null | undefined, + protos.google.pubsub.v1.ISnapshot + > + | undefined = callback + ? (error, values, nextPageRequest, rawResponse) => { + this._log.info('listSnapshots values %j', values); + callback!(error, values, nextPageRequest, rawResponse); // We verified callback above. + } + : undefined; + this._log.info('listSnapshots request %j', request); + return this.innerApiCalls + .listSnapshots(request, options, wrappedCallback) + ?.then( + ([response, input, output]: [ + protos.google.pubsub.v1.ISnapshot[], + protos.google.pubsub.v1.IListSnapshotsRequest | null, + protos.google.pubsub.v1.IListSnapshotsResponse, + ]) => { + this._log.info('listSnapshots values %j', response); + return [response, input, output]; + }, + ); } /** - * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object. + * Equivalent to `listSnapshots`, but returns a NodeJS Stream object. * @param {Object} request * The request object that will be sent. * @param {string} request.project @@ -2093,7 +2525,7 @@ export class SubscriberClient { */ listSnapshotsStream( request?: protos.google.pubsub.v1.IListSnapshotsRequest, - options?: CallOptions + options?: CallOptions, ): Transform { request = request || {}; options = options || {}; @@ -2105,11 +2537,14 @@ export class SubscriberClient { }); const defaultCallSettings = this._defaults['listSnapshots']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listSnapshots stream %j', request); return this.descriptors.page.listSnapshots.createStream( this.innerApiCalls.listSnapshots as GaxCall, request, - callSettings + callSettings, ); } @@ -2137,10 +2572,12 @@ export class SubscriberClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. + * @example include:samples/generated/v1/subscriber.list_snapshots.js + * region_tag:pubsub_v1_generated_Subscriber_ListSnapshots_async */ listSnapshotsAsync( request?: protos.google.pubsub.v1.IListSnapshotsRequest, - options?: CallOptions + options?: CallOptions, ): AsyncIterable { request = request || {}; options = options || {}; @@ -2152,11 +2589,14 @@ export class SubscriberClient { }); const defaultCallSettings = this._defaults['listSnapshots']; const callSettings = defaultCallSettings.merge(options); - this.initialize(); + this.initialize().catch(err => { + throw err; + }); + this._log.info('listSnapshots iterate %j', request); return this.descriptors.page.listSnapshots.asyncIterate( this.innerApiCalls['listSnapshots'] as GaxCall, request as {}, - callSettings + callSettings, ) as AsyncIterable; } /** @@ -2197,7 +2637,7 @@ export class SubscriberClient { IamProtos.google.iam.v1.Policy, IamProtos.google.iam.v1.GetIamPolicyRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.getIamPolicy(request, options, callback); } @@ -2244,7 +2684,7 @@ export class SubscriberClient { IamProtos.google.iam.v1.Policy, IamProtos.google.iam.v1.SetIamPolicyRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.Policy]> { return this.iamClient.setIamPolicy(request, options, callback); } @@ -2292,7 +2732,7 @@ export class SubscriberClient { IamProtos.google.iam.v1.TestIamPermissionsResponse, IamProtos.google.iam.v1.TestIamPermissionsRequest | null | undefined, {} | null | undefined - > + >, ): Promise<[IamProtos.google.iam.v1.TestIamPermissionsResponse]> { return this.iamClient.testIamPermissions(request, options, callback); } @@ -2481,9 +2921,10 @@ export class SubscriberClient { close(): Promise { if (this.subscriberStub && !this._terminated) { return this.subscriberStub.then(stub => { + this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); - this.iamClient.close(); + void this.iamClient.close(); }); } return Promise.resolve(); diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index ca152fda737..82bff2aa3e4 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -31,6 +31,7 @@ import { SchemaTypes, SchemaViews, ISchema, + Duration, } from '../src'; import {Policy, IamPermissionsMap} from '../src/iam'; import {MessageOptions} from '../src/topic'; @@ -428,10 +429,12 @@ describe('pubsub', () => { const SUB_NAMES = [generateSubName(), generateSubName()]; const SUB_DETACH_NAME = generateSubForDetach(); + const thirty = Duration.from({minutes: 30}); + const sixty = Duration.from({minutes: 60}); const SUBSCRIPTIONS = [ - topic.subscription(SUB_NAMES[0], {ackDeadline: 30}), - topic.subscription(SUB_NAMES[1], {ackDeadline: 60}), - topic.subscription(SUB_DETACH_NAME, {ackDeadline: 30}), + topic.subscription(SUB_NAMES[0], {minAckDeadline: thirty, maxAckDeadline: thirty}), + topic.subscription(SUB_NAMES[1], {minAckDeadline: sixty, maxAckDeadline: sixty}), + topic.subscription(SUB_DETACH_NAME, {minAckDeadline: thirty, maxAckDeadline: thirty}), ]; before(async () => { diff --git a/handwritten/pubsub/test/exponential-retry.ts b/handwritten/pubsub/test/exponential-retry.ts index f96689165d9..50834032acb 100644 --- a/handwritten/pubsub/test/exponential-retry.ts +++ b/handwritten/pubsub/test/exponential-retry.ts @@ -18,6 +18,7 @@ import * as sinon from 'sinon'; import {ExponentialRetry} from '../src/exponential-retry'; import {Duration} from '../src/temporal'; +import {TestUtils} from './test-utils'; // eslint-disable-next-line @typescript-eslint/no-explicit-any function introspect(obj: unknown): any { @@ -43,7 +44,7 @@ describe('exponential retry class', () => { // class is storing the durations as numbers internally. const er = new ExponentialRetry( Duration.from({seconds: 1}), - Duration.from({seconds: 2}) + Duration.from({seconds: 2}), ); const eri = introspect(er); @@ -52,30 +53,33 @@ describe('exponential retry class', () => { }); it('makes the first callback', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const er = new ExponentialRetry( Duration.from({millis: 100}), - Duration.from({millis: 1000}) + Duration.from({millis: 1000}), ); sandbox.stub(global.Math, 'random').returns(0.75); const item = makeItem(); + let retried = false; er.retryLater(item, (s: typeof item, t: Duration) => { assert.strictEqual(s, item); assert.strictEqual(t.totalOf('millisecond'), 125); + retried = true; }); clock.tick(125); const leftovers = er.close(); + assert.strictEqual(retried, true); assert.strictEqual(leftovers.length, 0); }); it('closes gracefully', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const er = new ExponentialRetry( Duration.from({millis: 100}), - Duration.from({millis: 1000}) + Duration.from({millis: 1000}), ); sandbox.stub(global.Math, 'random').returns(0.75); @@ -102,10 +106,10 @@ describe('exponential retry class', () => { }); it('backs off exponentially', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const er = new ExponentialRetry( Duration.from({millis: 100}), - Duration.from({millis: 1000}) + Duration.from({millis: 1000}), ); sandbox.stub(global.Math, 'random').returns(0.75); @@ -136,11 +140,11 @@ describe('exponential retry class', () => { }); it('backs off exponentially until the max backoff', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const item = makeItem(); const er = new ExponentialRetry( Duration.from({millis: 100}), - Duration.from({millis: 150}) + Duration.from({millis: 150}), ); sandbox.stub(global.Math, 'random').returns(0.75); @@ -170,12 +174,12 @@ describe('exponential retry class', () => { }); it('calls retries in the right order', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const items = [makeItem(), makeItem()]; const er = new ExponentialRetry( Duration.from({millis: 100}), - Duration.from({millis: 1000}) + Duration.from({millis: 1000}), ); // Just disable the fuzz for this test. @@ -204,7 +208,7 @@ describe('exponential retry class', () => { assert.deepStrictEqual(callbackCounts, [2, 0]); assert.deepStrictEqual( callbackTimes.map(d => d.totalOf('millisecond')), - [300, 0] + [300, 0], ); // Load in the second item and get it retrying. @@ -217,7 +221,7 @@ describe('exponential retry class', () => { assert.deepStrictEqual(callbackCounts, [2, 1]); assert.deepStrictEqual( callbackTimes.map(d => d.totalOf('millisecond')), - [300, 100] + [300, 100], ); // Make sure that we did in fact set another timer for the next event. diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 07023b4cd4e..419f99cc5ec 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -30,7 +30,7 @@ import {protobuf, IamProtos} from 'google-gax'; // Dynamically loaded proto JSON is needed to get the type information // to fill in default values for request objects const root = protobuf.Root.fromJSON( - require('../protos/protos.json') + require('../protos/protos.json'), ).resolveAll(); // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -47,7 +47,7 @@ function generateSampleMessage(instance: T) { instance.constructor as typeof protobuf.Message ).toObject(instance as protobuf.Message, {defaults: true}); return (instance.constructor as typeof protobuf.Message).fromObject( - filledObject + filledObject, ) as T; } @@ -59,7 +59,7 @@ function stubSimpleCall(response?: ResponseType, error?: Error) { function stubSimpleCallWithCallback( response?: ResponseType, - error?: Error + error?: Error, ) { return error ? sinon.stub().callsArgWith(2, error) @@ -68,7 +68,7 @@ function stubSimpleCallWithCallback( function stubPageStreamingCall( responses?: ResponseType[], - error?: Error + error?: Error, ) { const pagingStub = sinon.stub(); if (responses) { @@ -106,7 +106,7 @@ function stubPageStreamingCall( function stubAsyncIterationCall( responses?: ResponseType[], - error?: Error + error?: Error, ) { let counter = 0; const asyncIterable = { @@ -250,9 +250,11 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + client.initialize().catch(err => { + throw err; + }); assert(client.publisherStub); - client.close().then(() => { + void client.close().then(() => { done(); }); }); @@ -263,7 +265,7 @@ describe('v1.PublisherClient', () => { projectId: 'bogus', }); assert.strictEqual(client.publisherStub, undefined); - client.close().then(() => { + void client.close().then(() => { done(); }); }); @@ -309,17 +311,17 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); const defaultValue1 = getTypeDefaultValue('.google.pubsub.v1.Topic', [ 'name', ]); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); client.innerApiCalls.createTopic = stubSimpleCall(expectedResponse); const [response] = await client.createTopic(request); @@ -339,17 +341,17 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); const defaultValue1 = getTypeDefaultValue('.google.pubsub.v1.Topic', [ 'name', ]); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); client.innerApiCalls.createTopic = stubSimpleCallWithCallback(expectedResponse); @@ -358,14 +360,14 @@ describe('v1.PublisherClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ITopic | null + result?: protos.google.pubsub.v1.ITopic | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -385,19 +387,19 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); const defaultValue1 = getTypeDefaultValue('.google.pubsub.v1.Topic', [ 'name', ]); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.createTopic = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.createTopic(request), expectedError); const actualRequest = ( @@ -415,16 +417,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); const defaultValue1 = getTypeDefaultValue('.google.pubsub.v1.Topic', [ 'name', ]); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.createTopic(request), expectedError); }); }); @@ -435,19 +437,19 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateTopicRequest() + new protos.google.pubsub.v1.UpdateTopicRequest(), ); request.topic ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateTopicRequest', - ['topic', 'name'] + ['topic', 'name'], ); request.topic.name = defaultValue1; - const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; + const expectedHeaderRequestParams = `topic.name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); client.innerApiCalls.updateTopic = stubSimpleCall(expectedResponse); const [response] = await client.updateTopic(request); @@ -467,19 +469,19 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateTopicRequest() + new protos.google.pubsub.v1.UpdateTopicRequest(), ); request.topic ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateTopicRequest', - ['topic', 'name'] + ['topic', 'name'], ); request.topic.name = defaultValue1; - const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; + const expectedHeaderRequestParams = `topic.name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); client.innerApiCalls.updateTopic = stubSimpleCallWithCallback(expectedResponse); @@ -488,14 +490,14 @@ describe('v1.PublisherClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ITopic | null + result?: protos.google.pubsub.v1.ITopic | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -515,21 +517,21 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateTopicRequest() + new protos.google.pubsub.v1.UpdateTopicRequest(), ); request.topic ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateTopicRequest', - ['topic', 'name'] + ['topic', 'name'], ); request.topic.name = defaultValue1; - const expectedHeaderRequestParams = `topic.name=${defaultValue1}`; + const expectedHeaderRequestParams = `topic.name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.updateTopic = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.updateTopic(request), expectedError); const actualRequest = ( @@ -547,18 +549,18 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateTopicRequest() + new protos.google.pubsub.v1.UpdateTopicRequest(), ); request.topic ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateTopicRequest', - ['topic', 'name'] + ['topic', 'name'], ); request.topic.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.updateTopic(request), expectedError); }); }); @@ -569,24 +571,24 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.PublishRequest() + new protos.google.pubsub.v1.PublishRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.PublishRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.PublishResponse() + new protos.google.pubsub.v1.PublishResponse(), ); client.innerApiCalls.publish = stubSimpleCall(expectedResponse); const [response] = await client.publish(request); assert.deepStrictEqual(response, expectedResponse); const actualRequest = (client.innerApiCalls.publish as SinonStub).getCall( - 0 + 0, ).args[0]; assert.deepStrictEqual(actualRequest, request); const actualHeaderRequestParams = ( @@ -600,18 +602,18 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.PublishRequest() + new protos.google.pubsub.v1.PublishRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.PublishRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.PublishResponse() + new protos.google.pubsub.v1.PublishResponse(), ); client.innerApiCalls.publish = stubSimpleCallWithCallback(expectedResponse); @@ -620,20 +622,20 @@ describe('v1.PublisherClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.IPublishResponse | null + result?: protos.google.pubsub.v1.IPublishResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); const actualRequest = (client.innerApiCalls.publish as SinonStub).getCall( - 0 + 0, ).args[0]; assert.deepStrictEqual(actualRequest, request); const actualHeaderRequestParams = ( @@ -647,21 +649,21 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.PublishRequest() + new protos.google.pubsub.v1.PublishRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.PublishRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.publish = stubSimpleCall(undefined, expectedError); await assert.rejects(client.publish(request), expectedError); const actualRequest = (client.innerApiCalls.publish as SinonStub).getCall( - 0 + 0, ).args[0]; assert.deepStrictEqual(actualRequest, request); const actualHeaderRequestParams = ( @@ -675,17 +677,17 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.PublishRequest() + new protos.google.pubsub.v1.PublishRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.PublishRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.publish(request), expectedError); }); }); @@ -696,18 +698,18 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetTopicRequest() + new protos.google.pubsub.v1.GetTopicRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetTopicRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); client.innerApiCalls.getTopic = stubSimpleCall(expectedResponse); const [response] = await client.getTopic(request); @@ -727,18 +729,18 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetTopicRequest() + new protos.google.pubsub.v1.GetTopicRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetTopicRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Topic() + new protos.google.pubsub.v1.Topic(), ); client.innerApiCalls.getTopic = stubSimpleCallWithCallback(expectedResponse); @@ -747,14 +749,14 @@ describe('v1.PublisherClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ITopic | null + result?: protos.google.pubsub.v1.ITopic | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -774,16 +776,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetTopicRequest() + new protos.google.pubsub.v1.GetTopicRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetTopicRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.getTopic = stubSimpleCall(undefined, expectedError); await assert.rejects(client.getTopic(request), expectedError); @@ -802,17 +804,17 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetTopicRequest() + new protos.google.pubsub.v1.GetTopicRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetTopicRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.getTopic(request), expectedError); }); }); @@ -823,18 +825,18 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteTopicRequest() + new protos.google.pubsub.v1.DeleteTopicRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteTopicRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.deleteTopic = stubSimpleCall(expectedResponse); const [response] = await client.deleteTopic(request); @@ -854,18 +856,18 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteTopicRequest() + new protos.google.pubsub.v1.DeleteTopicRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteTopicRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.deleteTopic = stubSimpleCallWithCallback(expectedResponse); @@ -874,14 +876,14 @@ describe('v1.PublisherClient', () => { request, ( err?: Error | null, - result?: protos.google.protobuf.IEmpty | null + result?: protos.google.protobuf.IEmpty | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -901,20 +903,20 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteTopicRequest() + new protos.google.pubsub.v1.DeleteTopicRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteTopicRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteTopic = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.deleteTopic(request), expectedError); const actualRequest = ( @@ -932,17 +934,17 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteTopicRequest() + new protos.google.pubsub.v1.DeleteTopicRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteTopicRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.deleteTopic(request), expectedError); }); }); @@ -953,18 +955,18 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DetachSubscriptionRequest() + new protos.google.pubsub.v1.DetachSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DetachSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.DetachSubscriptionResponse() + new protos.google.pubsub.v1.DetachSubscriptionResponse(), ); client.innerApiCalls.detachSubscription = stubSimpleCall(expectedResponse); @@ -985,18 +987,18 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DetachSubscriptionRequest() + new protos.google.pubsub.v1.DetachSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DetachSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.DetachSubscriptionResponse() + new protos.google.pubsub.v1.DetachSubscriptionResponse(), ); client.innerApiCalls.detachSubscription = stubSimpleCallWithCallback(expectedResponse); @@ -1005,14 +1007,14 @@ describe('v1.PublisherClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.IDetachSubscriptionResponse | null + result?: protos.google.pubsub.v1.IDetachSubscriptionResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1032,20 +1034,20 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DetachSubscriptionRequest() + new protos.google.pubsub.v1.DetachSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DetachSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.detachSubscription = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.detachSubscription(request), expectedError); const actualRequest = ( @@ -1063,17 +1065,17 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DetachSubscriptionRequest() + new protos.google.pubsub.v1.DetachSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DetachSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.detachSubscription(request), expectedError); }); }); @@ -1084,16 +1086,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicsRequest() + new protos.google.pubsub.v1.ListTopicsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), @@ -1117,16 +1119,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicsRequest() + new protos.google.pubsub.v1.ListTopicsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), @@ -1139,14 +1141,14 @@ describe('v1.PublisherClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ITopic[] | null + result?: protos.google.pubsub.v1.ITopic[] | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1166,20 +1168,20 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicsRequest() + new protos.google.pubsub.v1.ListTopicsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.listTopics = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.listTopics(request), expectedError); const actualRequest = ( @@ -1197,16 +1199,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicsRequest() + new protos.google.pubsub.v1.ListTopicsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), @@ -1232,14 +1234,14 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopics.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listTopics, request) + .calledWith(client.innerApiCalls.listTopics, request), ); assert( (client.descriptors.page.listTopics.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1248,20 +1250,20 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicsRequest() + new protos.google.pubsub.v1.ListTopicsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listTopics.createStream = stubPageStreamingCall( undefined, - expectedError + expectedError, ); const stream = client.listTopicsStream(request); const promise = new Promise((resolve, reject) => { @@ -1280,14 +1282,14 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopics.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listTopics, request) + .calledWith(client.innerApiCalls.listTopics, request), ); assert( (client.descriptors.page.listTopics.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1296,16 +1298,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicsRequest() + new protos.google.pubsub.v1.ListTopicsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Topic()), generateSampleMessage(new protos.google.pubsub.v1.Topic()), @@ -1321,16 +1323,16 @@ describe('v1.PublisherClient', () => { assert.deepStrictEqual(responses, expectedResponse); assert.deepStrictEqual( (client.descriptors.page.listTopics.asyncIterate as SinonStub).getCall( - 0 + 0, ).args[1], - request + request, ); assert( (client.descriptors.page.listTopics.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1339,20 +1341,20 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicsRequest() + new protos.google.pubsub.v1.ListTopicsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listTopics.asyncIterate = stubAsyncIterationCall( undefined, - expectedError + expectedError, ); const iterable = client.listTopicsAsync(request); await assert.rejects(async () => { @@ -1363,16 +1365,16 @@ describe('v1.PublisherClient', () => { }); assert.deepStrictEqual( (client.descriptors.page.listTopics.asyncIterate as SinonStub).getCall( - 0 + 0, ).args[1], - request + request, ); assert( (client.descriptors.page.listTopics.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); }); @@ -1383,16 +1385,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSubscriptionsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSubscriptions = stubSimpleCall(expectedResponse); @@ -1413,16 +1415,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSubscriptionsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSubscriptions = stubSimpleCallWithCallback(expectedResponse); @@ -1435,7 +1437,7 @@ describe('v1.PublisherClient', () => { } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1455,24 +1457,24 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSubscriptionsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.listTopicSubscriptions = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects( client.listTopicSubscriptions(request), - expectedError + expectedError, ); const actualRequest = ( client.innerApiCalls.listTopicSubscriptions as SinonStub @@ -1489,16 +1491,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSubscriptionsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall(expectedResponse); @@ -1523,7 +1525,7 @@ describe('v1.PublisherClient', () => { .createStream as SinonStub ) .getCall(0) - .calledWith(client.innerApiCalls.listTopicSubscriptions, request) + .calledWith(client.innerApiCalls.listTopicSubscriptions, request), ); assert( ( @@ -1532,8 +1534,8 @@ describe('v1.PublisherClient', () => { ) .getCall(0) .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + expectedHeaderRequestParams, + ), ); }); @@ -1542,16 +1544,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSubscriptionsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listTopicSubscriptions.createStream = stubPageStreamingCall(undefined, expectedError); @@ -1575,7 +1577,7 @@ describe('v1.PublisherClient', () => { .createStream as SinonStub ) .getCall(0) - .calledWith(client.innerApiCalls.listTopicSubscriptions, request) + .calledWith(client.innerApiCalls.listTopicSubscriptions, request), ); assert( ( @@ -1584,8 +1586,8 @@ describe('v1.PublisherClient', () => { ) .getCall(0) .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + expectedHeaderRequestParams, + ), ); }); @@ -1594,16 +1596,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSubscriptionsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall(expectedResponse); @@ -1618,7 +1620,7 @@ describe('v1.PublisherClient', () => { client.descriptors.page.listTopicSubscriptions .asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( ( @@ -1627,8 +1629,8 @@ describe('v1.PublisherClient', () => { ) .getCall(0) .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + expectedHeaderRequestParams, + ), ); }); @@ -1637,16 +1639,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSubscriptionsRequest() + new protos.google.pubsub.v1.ListTopicSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSubscriptionsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listTopicSubscriptions.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -1662,7 +1664,7 @@ describe('v1.PublisherClient', () => { client.descriptors.page.listTopicSubscriptions .asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( ( @@ -1671,8 +1673,8 @@ describe('v1.PublisherClient', () => { ) .getCall(0) .args[2].otherArgs.headers['x-goog-request-params'].includes( - expectedHeaderRequestParams - ) + expectedHeaderRequestParams, + ), ); }); }); @@ -1683,16 +1685,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + new protos.google.pubsub.v1.ListTopicSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSnapshotsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSnapshots = stubSimpleCall(expectedResponse); @@ -1713,16 +1715,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + new protos.google.pubsub.v1.ListTopicSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSnapshotsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = [new String(), new String(), new String()]; client.innerApiCalls.listTopicSnapshots = stubSimpleCallWithCallback(expectedResponse); @@ -1735,7 +1737,7 @@ describe('v1.PublisherClient', () => { } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1755,20 +1757,20 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + new protos.google.pubsub.v1.ListTopicSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSnapshotsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.listTopicSnapshots = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.listTopicSnapshots(request), expectedError); const actualRequest = ( @@ -1786,16 +1788,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + new protos.google.pubsub.v1.ListTopicSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSnapshotsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall(expectedResponse); @@ -1817,14 +1819,14 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listTopicSnapshots, request) + .calledWith(client.innerApiCalls.listTopicSnapshots, request), ); assert( (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1833,16 +1835,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + new protos.google.pubsub.v1.ListTopicSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSnapshotsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listTopicSnapshots.createStream = stubPageStreamingCall(undefined, expectedError); @@ -1863,14 +1865,14 @@ describe('v1.PublisherClient', () => { assert( (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listTopicSnapshots, request) + .calledWith(client.innerApiCalls.listTopicSnapshots, request), ); assert( (client.descriptors.page.listTopicSnapshots.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1879,16 +1881,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + new protos.google.pubsub.v1.ListTopicSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSnapshotsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedResponse = [new String(), new String(), new String()]; client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall(expectedResponse); @@ -1902,14 +1904,14 @@ describe('v1.PublisherClient', () => { ( client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( (client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1918,16 +1920,16 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListTopicSnapshotsRequest() + new protos.google.pubsub.v1.ListTopicSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListTopicSnapshotsRequest', - ['topic'] + ['topic'], ); request.topic = defaultValue1; - const expectedHeaderRequestParams = `topic=${defaultValue1}`; + const expectedHeaderRequestParams = `topic=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listTopicSnapshots.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -1942,14 +1944,14 @@ describe('v1.PublisherClient', () => { ( client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( (client.descriptors.page.listTopicSnapshots.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); }); @@ -1959,9 +1961,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -1973,7 +1975,7 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.getIamPolicy = stubSimpleCall(expectedResponse); const response = await client.getIamPolicy(request, expectedOptions); @@ -1981,7 +1983,7 @@ describe('v1.PublisherClient', () => { assert( (client.iamClient.getIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes getIamPolicy without error using callback', async () => { @@ -1989,9 +1991,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2003,25 +2005,25 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.getIamPolicy = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.getIamPolicy( + void client.getIamPolicy( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null + result?: IamProtos.google.iam.v1.Policy | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2033,9 +2035,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2050,12 +2052,12 @@ describe('v1.PublisherClient', () => { client.iamClient.getIamPolicy = stubSimpleCall(undefined, expectedError); await assert.rejects( client.getIamPolicy(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.getIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); @@ -2065,9 +2067,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2079,7 +2081,7 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.setIamPolicy = stubSimpleCall(expectedResponse); const response = await client.setIamPolicy(request, expectedOptions); @@ -2087,7 +2089,7 @@ describe('v1.PublisherClient', () => { assert( (client.iamClient.setIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes setIamPolicy without error using callback', async () => { @@ -2095,9 +2097,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2109,25 +2111,25 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.setIamPolicy = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.setIamPolicy( + void client.setIamPolicy( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null + result?: IamProtos.google.iam.v1.Policy | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2139,9 +2141,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2156,12 +2158,12 @@ describe('v1.PublisherClient', () => { client.iamClient.setIamPolicy = stubSimpleCall(undefined, expectedError); await assert.rejects( client.setIamPolicy(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.setIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); @@ -2171,9 +2173,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2185,18 +2187,18 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsResponse() + new IamProtos.google.iam.v1.TestIamPermissionsResponse(), ); client.iamClient.testIamPermissions = stubSimpleCall(expectedResponse); const response = await client.testIamPermissions( request, - expectedOptions + expectedOptions, ); assert.deepStrictEqual(response, [expectedResponse]); assert( (client.iamClient.testIamPermissions as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes testIamPermissions without error using callback', async () => { @@ -2204,9 +2206,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2218,25 +2220,25 @@ describe('v1.PublisherClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsResponse() + new IamProtos.google.iam.v1.TestIamPermissionsResponse(), ); client.iamClient.testIamPermissions = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.testIamPermissions( + void client.testIamPermissions( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2248,9 +2250,9 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2264,22 +2266,22 @@ describe('v1.PublisherClient', () => { const expectedError = new Error('expected'); client.iamClient.testIamPermissions = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects( client.testIamPermissions(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.testIamPermissions as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); describe('Path templates', () => { - describe('project', () => { + describe('project', async () => { const fakePath = '/rendered/path/project'; const expectedParameters = { project: 'projectValue', @@ -2288,7 +2290,7 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.projectPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2302,7 +2304,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.projectPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2312,12 +2314,12 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.projectPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('projectTopic', () => { + describe('projectTopic', async () => { const fakePath = '/rendered/path/projectTopic'; const expectedParameters = { project: 'projectValue', @@ -2327,7 +2329,7 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.projectTopicPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2341,7 +2343,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2351,7 +2353,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -2361,12 +2363,12 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('schema', () => { + describe('schema', async () => { const fakePath = '/rendered/path/schema'; const expectedParameters = { project: 'projectValue', @@ -2376,7 +2378,7 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.schemaPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2390,7 +2392,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.schemaPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2400,7 +2402,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.schemaPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -2410,12 +2412,12 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.schemaPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('snapshot', () => { + describe('snapshot', async () => { const fakePath = '/rendered/path/snapshot'; const expectedParameters = { project: 'projectValue', @@ -2425,7 +2427,7 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.snapshotPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2439,7 +2441,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2449,7 +2451,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -2459,12 +2461,12 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('subscription', () => { + describe('subscription', async () => { const fakePath = '/rendered/path/subscription'; const expectedParameters = { project: 'projectValue', @@ -2474,7 +2476,7 @@ describe('v1.PublisherClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.subscriptionPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2485,13 +2487,13 @@ describe('v1.PublisherClient', () => { it('subscriptionPath', () => { const result = client.subscriptionPath( 'projectValue', - 'subscriptionValue' + 'subscriptionValue', ); assert.strictEqual(result, fakePath); assert( (client.pathTemplates.subscriptionPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2501,7 +2503,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -2511,7 +2513,7 @@ describe('v1.PublisherClient', () => { assert( (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index a01b05f34bc..46c951ae385 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -30,7 +30,7 @@ import {protobuf, IamProtos} from 'google-gax'; // Dynamically loaded proto JSON is needed to get the type information // to fill in default values for request objects const root = protobuf.Root.fromJSON( - require('../protos/protos.json') + require('../protos/protos.json'), ).resolveAll(); // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -47,7 +47,7 @@ function generateSampleMessage(instance: T) { instance.constructor as typeof protobuf.Message ).toObject(instance as protobuf.Message, {defaults: true}); return (instance.constructor as typeof protobuf.Message).fromObject( - filledObject + filledObject, ) as T; } @@ -59,7 +59,7 @@ function stubSimpleCall(response?: ResponseType, error?: Error) { function stubSimpleCallWithCallback( response?: ResponseType, - error?: Error + error?: Error, ) { return error ? sinon.stub().callsArgWith(2, error) @@ -68,7 +68,7 @@ function stubSimpleCallWithCallback( function stubPageStreamingCall( responses?: ResponseType[], - error?: Error + error?: Error, ) { const pagingStub = sinon.stub(); if (responses) { @@ -106,7 +106,7 @@ function stubPageStreamingCall( function stubAsyncIterationCall( responses?: ResponseType[], - error?: Error + error?: Error, ) { let counter = 0; const asyncIterable = { @@ -252,9 +252,11 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + client.initialize().catch(err => { + throw err; + }); assert(client.schemaServiceStub); - client.close().then(() => { + void client.close().then(() => { done(); }); }); @@ -265,7 +267,7 @@ describe('v1.SchemaServiceClient', () => { projectId: 'bogus', }); assert.strictEqual(client.schemaServiceStub, undefined); - client.close().then(() => { + void client.close().then(() => { done(); }); }); @@ -311,18 +313,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CreateSchemaRequest() + new protos.google.pubsub.v1.CreateSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CreateSchemaRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.createSchema = stubSimpleCall(expectedResponse); const [response] = await client.createSchema(request); @@ -342,18 +344,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CreateSchemaRequest() + new protos.google.pubsub.v1.CreateSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CreateSchemaRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.createSchema = stubSimpleCallWithCallback(expectedResponse); @@ -362,14 +364,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISchema | null + result?: protos.google.pubsub.v1.ISchema | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -389,20 +391,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CreateSchemaRequest() + new protos.google.pubsub.v1.CreateSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CreateSchemaRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.createSchema = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.createSchema(request), expectedError); const actualRequest = ( @@ -420,17 +422,17 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CreateSchemaRequest() + new protos.google.pubsub.v1.CreateSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CreateSchemaRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.createSchema(request), expectedError); }); }); @@ -441,18 +443,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSchemaRequest() + new protos.google.pubsub.v1.GetSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.getSchema = stubSimpleCall(expectedResponse); const [response] = await client.getSchema(request); @@ -472,18 +474,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSchemaRequest() + new protos.google.pubsub.v1.GetSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.getSchema = stubSimpleCallWithCallback(expectedResponse); @@ -492,14 +494,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISchema | null + result?: protos.google.pubsub.v1.ISchema | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -519,16 +521,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSchemaRequest() + new protos.google.pubsub.v1.GetSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.getSchema = stubSimpleCall(undefined, expectedError); await assert.rejects(client.getSchema(request), expectedError); @@ -547,17 +549,17 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSchemaRequest() + new protos.google.pubsub.v1.GetSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.getSchema(request), expectedError); }); }); @@ -568,18 +570,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CommitSchemaRequest() + new protos.google.pubsub.v1.CommitSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CommitSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.commitSchema = stubSimpleCall(expectedResponse); const [response] = await client.commitSchema(request); @@ -599,18 +601,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CommitSchemaRequest() + new protos.google.pubsub.v1.CommitSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CommitSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.commitSchema = stubSimpleCallWithCallback(expectedResponse); @@ -619,14 +621,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISchema | null + result?: protos.google.pubsub.v1.ISchema | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -646,20 +648,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CommitSchemaRequest() + new protos.google.pubsub.v1.CommitSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CommitSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.commitSchema = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.commitSchema(request), expectedError); const actualRequest = ( @@ -677,17 +679,17 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CommitSchemaRequest() + new protos.google.pubsub.v1.CommitSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CommitSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.commitSchema(request), expectedError); }); }); @@ -698,18 +700,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.RollbackSchemaRequest() + new protos.google.pubsub.v1.RollbackSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.RollbackSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.rollbackSchema = stubSimpleCall(expectedResponse); const [response] = await client.rollbackSchema(request); @@ -729,18 +731,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.RollbackSchemaRequest() + new protos.google.pubsub.v1.RollbackSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.RollbackSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.rollbackSchema = stubSimpleCallWithCallback(expectedResponse); @@ -749,14 +751,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISchema | null + result?: protos.google.pubsub.v1.ISchema | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -776,20 +778,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.RollbackSchemaRequest() + new protos.google.pubsub.v1.RollbackSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.RollbackSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.rollbackSchema = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.rollbackSchema(request), expectedError); const actualRequest = ( @@ -807,17 +809,17 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.RollbackSchemaRequest() + new protos.google.pubsub.v1.RollbackSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.RollbackSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.rollbackSchema(request), expectedError); }); }); @@ -828,18 +830,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSchemaRevisionRequest() + new protos.google.pubsub.v1.DeleteSchemaRevisionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSchemaRevisionRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.deleteSchemaRevision = stubSimpleCall(expectedResponse); @@ -860,18 +862,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSchemaRevisionRequest() + new protos.google.pubsub.v1.DeleteSchemaRevisionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSchemaRevisionRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Schema() + new protos.google.pubsub.v1.Schema(), ); client.innerApiCalls.deleteSchemaRevision = stubSimpleCallWithCallback(expectedResponse); @@ -880,14 +882,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISchema | null + result?: protos.google.pubsub.v1.ISchema | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -907,20 +909,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSchemaRevisionRequest() + new protos.google.pubsub.v1.DeleteSchemaRevisionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSchemaRevisionRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteSchemaRevision = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.deleteSchemaRevision(request), expectedError); const actualRequest = ( @@ -938,17 +940,17 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSchemaRevisionRequest() + new protos.google.pubsub.v1.DeleteSchemaRevisionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSchemaRevisionRequest', - ['name'] + ['name'], ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.deleteSchemaRevision(request), expectedError); }); }); @@ -959,18 +961,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSchemaRequest() + new protos.google.pubsub.v1.DeleteSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.deleteSchema = stubSimpleCall(expectedResponse); const [response] = await client.deleteSchema(request); @@ -990,18 +992,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSchemaRequest() + new protos.google.pubsub.v1.DeleteSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.deleteSchema = stubSimpleCallWithCallback(expectedResponse); @@ -1010,14 +1012,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.protobuf.IEmpty | null + result?: protos.google.protobuf.IEmpty | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1037,20 +1039,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSchemaRequest() + new protos.google.pubsub.v1.DeleteSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteSchema = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.deleteSchema(request), expectedError); const actualRequest = ( @@ -1068,17 +1070,17 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSchemaRequest() + new protos.google.pubsub.v1.DeleteSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSchemaRequest', - ['name'] + ['name'], ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.deleteSchema(request), expectedError); }); }); @@ -1089,18 +1091,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ValidateSchemaRequest() + new protos.google.pubsub.v1.ValidateSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ValidateSchemaRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.ValidateSchemaResponse() + new protos.google.pubsub.v1.ValidateSchemaResponse(), ); client.innerApiCalls.validateSchema = stubSimpleCall(expectedResponse); const [response] = await client.validateSchema(request); @@ -1120,18 +1122,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ValidateSchemaRequest() + new protos.google.pubsub.v1.ValidateSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ValidateSchemaRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.ValidateSchemaResponse() + new protos.google.pubsub.v1.ValidateSchemaResponse(), ); client.innerApiCalls.validateSchema = stubSimpleCallWithCallback(expectedResponse); @@ -1140,14 +1142,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.IValidateSchemaResponse | null + result?: protos.google.pubsub.v1.IValidateSchemaResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1167,20 +1169,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ValidateSchemaRequest() + new protos.google.pubsub.v1.ValidateSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ValidateSchemaRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.validateSchema = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.validateSchema(request), expectedError); const actualRequest = ( @@ -1198,17 +1200,17 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ValidateSchemaRequest() + new protos.google.pubsub.v1.ValidateSchemaRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ValidateSchemaRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.validateSchema(request), expectedError); }); }); @@ -1219,18 +1221,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ValidateMessageRequest() + new protos.google.pubsub.v1.ValidateMessageRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ValidateMessageRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.ValidateMessageResponse() + new protos.google.pubsub.v1.ValidateMessageResponse(), ); client.innerApiCalls.validateMessage = stubSimpleCall(expectedResponse); const [response] = await client.validateMessage(request); @@ -1250,18 +1252,18 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ValidateMessageRequest() + new protos.google.pubsub.v1.ValidateMessageRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ValidateMessageRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.ValidateMessageResponse() + new protos.google.pubsub.v1.ValidateMessageResponse(), ); client.innerApiCalls.validateMessage = stubSimpleCallWithCallback(expectedResponse); @@ -1270,14 +1272,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.IValidateMessageResponse | null + result?: protos.google.pubsub.v1.IValidateMessageResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1297,20 +1299,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ValidateMessageRequest() + new protos.google.pubsub.v1.ValidateMessageRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ValidateMessageRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.validateMessage = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.validateMessage(request), expectedError); const actualRequest = ( @@ -1328,17 +1330,17 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ValidateMessageRequest() + new protos.google.pubsub.v1.ValidateMessageRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ValidateMessageRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.validateMessage(request), expectedError); }); }); @@ -1349,16 +1351,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemasRequest() + new protos.google.pubsub.v1.ListSchemasRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemasRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1382,16 +1384,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemasRequest() + new protos.google.pubsub.v1.ListSchemasRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemasRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1404,14 +1406,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISchema[] | null + result?: protos.google.pubsub.v1.ISchema[] | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1431,20 +1433,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemasRequest() + new protos.google.pubsub.v1.ListSchemasRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemasRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.listSchemas = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.listSchemas(request), expectedError); const actualRequest = ( @@ -1462,16 +1464,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemasRequest() + new protos.google.pubsub.v1.ListSchemasRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemasRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1497,14 +1499,14 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemas.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listSchemas, request) + .calledWith(client.innerApiCalls.listSchemas, request), ); assert( (client.descriptors.page.listSchemas.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1513,20 +1515,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemasRequest() + new protos.google.pubsub.v1.ListSchemasRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemasRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listSchemas.createStream = stubPageStreamingCall( undefined, - expectedError + expectedError, ); const stream = client.listSchemasStream(request); const promise = new Promise((resolve, reject) => { @@ -1545,14 +1547,14 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemas.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listSchemas, request) + .calledWith(client.innerApiCalls.listSchemas, request), ); assert( (client.descriptors.page.listSchemas.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1561,16 +1563,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemasRequest() + new protos.google.pubsub.v1.ListSchemasRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemasRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1586,16 +1588,16 @@ describe('v1.SchemaServiceClient', () => { assert.deepStrictEqual(responses, expectedResponse); assert.deepStrictEqual( (client.descriptors.page.listSchemas.asyncIterate as SinonStub).getCall( - 0 + 0, ).args[1], - request + request, ); assert( (client.descriptors.page.listSchemas.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1604,20 +1606,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemasRequest() + new protos.google.pubsub.v1.ListSchemasRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemasRequest', - ['parent'] + ['parent'], ); request.parent = defaultValue1; - const expectedHeaderRequestParams = `parent=${defaultValue1}`; + const expectedHeaderRequestParams = `parent=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listSchemas.asyncIterate = stubAsyncIterationCall( undefined, - expectedError + expectedError, ); const iterable = client.listSchemasAsync(request); await assert.rejects(async () => { @@ -1628,16 +1630,16 @@ describe('v1.SchemaServiceClient', () => { }); assert.deepStrictEqual( (client.descriptors.page.listSchemas.asyncIterate as SinonStub).getCall( - 0 + 0, ).args[1], - request + request, ); assert( (client.descriptors.page.listSchemas.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); }); @@ -1648,16 +1650,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + new protos.google.pubsub.v1.ListSchemaRevisionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemaRevisionsRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1682,16 +1684,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + new protos.google.pubsub.v1.ListSchemaRevisionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemaRevisionsRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1704,14 +1706,14 @@ describe('v1.SchemaServiceClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISchema[] | null + result?: protos.google.pubsub.v1.ISchema[] | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1731,20 +1733,20 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + new protos.google.pubsub.v1.ListSchemaRevisionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemaRevisionsRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.listSchemaRevisions = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.listSchemaRevisions(request), expectedError); const actualRequest = ( @@ -1762,16 +1764,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + new protos.google.pubsub.v1.ListSchemaRevisionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemaRevisionsRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1797,14 +1799,14 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listSchemaRevisions, request) + .calledWith(client.innerApiCalls.listSchemaRevisions, request), ); assert( (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1813,16 +1815,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + new protos.google.pubsub.v1.ListSchemaRevisionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemaRevisionsRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listSchemaRevisions.createStream = stubPageStreamingCall(undefined, expectedError); @@ -1843,14 +1845,14 @@ describe('v1.SchemaServiceClient', () => { assert( (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listSchemaRevisions, request) + .calledWith(client.innerApiCalls.listSchemaRevisions, request), ); assert( (client.descriptors.page.listSchemaRevisions.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1859,16 +1861,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + new protos.google.pubsub.v1.ListSchemaRevisionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemaRevisionsRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Schema()), generateSampleMessage(new protos.google.pubsub.v1.Schema()), @@ -1886,14 +1888,14 @@ describe('v1.SchemaServiceClient', () => { ( client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( (client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -1902,16 +1904,16 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSchemaRevisionsRequest() + new protos.google.pubsub.v1.ListSchemaRevisionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSchemaRevisionsRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listSchemaRevisions.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -1926,14 +1928,14 @@ describe('v1.SchemaServiceClient', () => { ( client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( (client.descriptors.page.listSchemaRevisions.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); }); @@ -1943,9 +1945,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -1957,7 +1959,7 @@ describe('v1.SchemaServiceClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.getIamPolicy = stubSimpleCall(expectedResponse); const response = await client.getIamPolicy(request, expectedOptions); @@ -1965,7 +1967,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.iamClient.getIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes getIamPolicy without error using callback', async () => { @@ -1973,9 +1975,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -1987,25 +1989,25 @@ describe('v1.SchemaServiceClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.getIamPolicy = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.getIamPolicy( + void client.getIamPolicy( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null + result?: IamProtos.google.iam.v1.Policy | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2017,9 +2019,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2034,12 +2036,12 @@ describe('v1.SchemaServiceClient', () => { client.iamClient.getIamPolicy = stubSimpleCall(undefined, expectedError); await assert.rejects( client.getIamPolicy(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.getIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); @@ -2049,9 +2051,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2063,7 +2065,7 @@ describe('v1.SchemaServiceClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.setIamPolicy = stubSimpleCall(expectedResponse); const response = await client.setIamPolicy(request, expectedOptions); @@ -2071,7 +2073,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.iamClient.setIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes setIamPolicy without error using callback', async () => { @@ -2079,9 +2081,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2093,25 +2095,25 @@ describe('v1.SchemaServiceClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.setIamPolicy = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.setIamPolicy( + void client.setIamPolicy( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null + result?: IamProtos.google.iam.v1.Policy | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2123,9 +2125,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2140,12 +2142,12 @@ describe('v1.SchemaServiceClient', () => { client.iamClient.setIamPolicy = stubSimpleCall(undefined, expectedError); await assert.rejects( client.setIamPolicy(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.setIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); @@ -2155,9 +2157,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2169,18 +2171,18 @@ describe('v1.SchemaServiceClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsResponse() + new IamProtos.google.iam.v1.TestIamPermissionsResponse(), ); client.iamClient.testIamPermissions = stubSimpleCall(expectedResponse); const response = await client.testIamPermissions( request, - expectedOptions + expectedOptions, ); assert.deepStrictEqual(response, [expectedResponse]); assert( (client.iamClient.testIamPermissions as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes testIamPermissions without error using callback', async () => { @@ -2188,9 +2190,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2202,25 +2204,25 @@ describe('v1.SchemaServiceClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsResponse() + new IamProtos.google.iam.v1.TestIamPermissionsResponse(), ); client.iamClient.testIamPermissions = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.testIamPermissions( + void client.testIamPermissions( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2232,9 +2234,9 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2248,22 +2250,22 @@ describe('v1.SchemaServiceClient', () => { const expectedError = new Error('expected'); client.iamClient.testIamPermissions = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects( client.testIamPermissions(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.testIamPermissions as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); describe('Path templates', () => { - describe('project', () => { + describe('project', async () => { const fakePath = '/rendered/path/project'; const expectedParameters = { project: 'projectValue', @@ -2272,7 +2274,7 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.projectPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2286,7 +2288,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.projectPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2296,12 +2298,12 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.projectPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('projectTopic', () => { + describe('projectTopic', async () => { const fakePath = '/rendered/path/projectTopic'; const expectedParameters = { project: 'projectValue', @@ -2311,7 +2313,7 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.projectTopicPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2325,7 +2327,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2335,7 +2337,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -2345,12 +2347,12 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('schema', () => { + describe('schema', async () => { const fakePath = '/rendered/path/schema'; const expectedParameters = { project: 'projectValue', @@ -2360,7 +2362,7 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.schemaPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2374,7 +2376,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.schemaPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2384,7 +2386,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.schemaPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -2394,12 +2396,12 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.schemaPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('snapshot', () => { + describe('snapshot', async () => { const fakePath = '/rendered/path/snapshot'; const expectedParameters = { project: 'projectValue', @@ -2409,7 +2411,7 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.snapshotPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2423,7 +2425,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2433,7 +2435,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -2443,12 +2445,12 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('subscription', () => { + describe('subscription', async () => { const fakePath = '/rendered/path/subscription'; const expectedParameters = { project: 'projectValue', @@ -2458,7 +2460,7 @@ describe('v1.SchemaServiceClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.subscriptionPathTemplate.render = sinon .stub() .returns(fakePath); @@ -2469,13 +2471,13 @@ describe('v1.SchemaServiceClient', () => { it('subscriptionPath', () => { const result = client.subscriptionPath( 'projectValue', - 'subscriptionValue' + 'subscriptionValue', ); assert.strictEqual(result, fakePath); assert( (client.pathTemplates.subscriptionPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -2485,7 +2487,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -2495,7 +2497,7 @@ describe('v1.SchemaServiceClient', () => { assert( (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 92c5fc49a61..55667c97ce9 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -30,7 +30,7 @@ import {protobuf, IamProtos} from 'google-gax'; // Dynamically loaded proto JSON is needed to get the type information // to fill in default values for request objects const root = protobuf.Root.fromJSON( - require('../protos/protos.json') + require('../protos/protos.json'), ).resolveAll(); // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -47,7 +47,7 @@ function generateSampleMessage(instance: T) { instance.constructor as typeof protobuf.Message ).toObject(instance as protobuf.Message, {defaults: true}); return (instance.constructor as typeof protobuf.Message).fromObject( - filledObject + filledObject, ) as T; } @@ -59,7 +59,7 @@ function stubSimpleCall(response?: ResponseType, error?: Error) { function stubSimpleCallWithCallback( response?: ResponseType, - error?: Error + error?: Error, ) { return error ? sinon.stub().callsArgWith(2, error) @@ -68,7 +68,7 @@ function stubSimpleCallWithCallback( function stubBidiStreamingCall( response?: ResponseType, - error?: Error + error?: Error, ) { const transformStub = error ? sinon.stub().callsArgWith(2, error) @@ -82,7 +82,7 @@ function stubBidiStreamingCall( function stubPageStreamingCall( responses?: ResponseType[], - error?: Error + error?: Error, ) { const pagingStub = sinon.stub(); if (responses) { @@ -120,7 +120,7 @@ function stubPageStreamingCall( function stubAsyncIterationCall( responses?: ResponseType[], - error?: Error + error?: Error, ) { let counter = 0; const asyncIterable = { @@ -264,9 +264,11 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + client.initialize().catch(err => { + throw err; + }); assert(client.subscriberStub); - client.close().then(() => { + void client.close().then(() => { done(); }); }); @@ -277,7 +279,7 @@ describe('v1.SubscriberClient', () => { projectId: 'bogus', }); assert.strictEqual(client.subscriberStub, undefined); - client.close().then(() => { + void client.close().then(() => { done(); }); }); @@ -323,18 +325,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.Subscription', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); client.innerApiCalls.createSubscription = stubSimpleCall(expectedResponse); @@ -355,18 +357,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.Subscription', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); client.innerApiCalls.createSubscription = stubSimpleCallWithCallback(expectedResponse); @@ -375,14 +377,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISubscription | null + result?: protos.google.pubsub.v1.ISubscription | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -402,20 +404,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.Subscription', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.createSubscription = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.createSubscription(request), expectedError); const actualRequest = ( @@ -433,17 +435,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.Subscription', - ['name'] + ['name'], ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.createSubscription(request), expectedError); }); }); @@ -454,18 +456,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSubscriptionRequest() + new protos.google.pubsub.v1.GetSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); client.innerApiCalls.getSubscription = stubSimpleCall(expectedResponse); const [response] = await client.getSubscription(request); @@ -485,18 +487,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSubscriptionRequest() + new protos.google.pubsub.v1.GetSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); client.innerApiCalls.getSubscription = stubSimpleCallWithCallback(expectedResponse); @@ -505,14 +507,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISubscription | null + result?: protos.google.pubsub.v1.ISubscription | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -532,20 +534,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSubscriptionRequest() + new protos.google.pubsub.v1.GetSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.getSubscription = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.getSubscription(request), expectedError); const actualRequest = ( @@ -563,17 +565,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSubscriptionRequest() + new protos.google.pubsub.v1.GetSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.getSubscription(request), expectedError); }); }); @@ -584,19 +586,19 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateSubscriptionRequest() + new protos.google.pubsub.v1.UpdateSubscriptionRequest(), ); request.subscription ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateSubscriptionRequest', - ['subscription', 'name'] + ['subscription', 'name'], ); request.subscription.name = defaultValue1; - const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription.name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); client.innerApiCalls.updateSubscription = stubSimpleCall(expectedResponse); @@ -617,19 +619,19 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateSubscriptionRequest() + new protos.google.pubsub.v1.UpdateSubscriptionRequest(), ); request.subscription ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateSubscriptionRequest', - ['subscription', 'name'] + ['subscription', 'name'], ); request.subscription.name = defaultValue1; - const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription.name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Subscription() + new protos.google.pubsub.v1.Subscription(), ); client.innerApiCalls.updateSubscription = stubSimpleCallWithCallback(expectedResponse); @@ -638,14 +640,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISubscription | null + result?: protos.google.pubsub.v1.ISubscription | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -665,21 +667,21 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateSubscriptionRequest() + new protos.google.pubsub.v1.UpdateSubscriptionRequest(), ); request.subscription ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateSubscriptionRequest', - ['subscription', 'name'] + ['subscription', 'name'], ); request.subscription.name = defaultValue1; - const expectedHeaderRequestParams = `subscription.name=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription.name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.updateSubscription = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.updateSubscription(request), expectedError); const actualRequest = ( @@ -697,18 +699,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateSubscriptionRequest() + new protos.google.pubsub.v1.UpdateSubscriptionRequest(), ); request.subscription ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateSubscriptionRequest', - ['subscription', 'name'] + ['subscription', 'name'], ); request.subscription.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.updateSubscription(request), expectedError); }); }); @@ -719,18 +721,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSubscriptionRequest() + new protos.google.pubsub.v1.DeleteSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.deleteSubscription = stubSimpleCall(expectedResponse); @@ -751,18 +753,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSubscriptionRequest() + new protos.google.pubsub.v1.DeleteSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.deleteSubscription = stubSimpleCallWithCallback(expectedResponse); @@ -771,14 +773,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.protobuf.IEmpty | null + result?: protos.google.protobuf.IEmpty | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -798,20 +800,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSubscriptionRequest() + new protos.google.pubsub.v1.DeleteSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteSubscription = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.deleteSubscription(request), expectedError); const actualRequest = ( @@ -829,17 +831,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSubscriptionRequest() + new protos.google.pubsub.v1.DeleteSubscriptionRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSubscriptionRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.deleteSubscription(request), expectedError); }); }); @@ -850,18 +852,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ModifyAckDeadlineRequest() + new protos.google.pubsub.v1.ModifyAckDeadlineRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ModifyAckDeadlineRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.modifyAckDeadline = stubSimpleCall(expectedResponse); const [response] = await client.modifyAckDeadline(request); @@ -881,18 +883,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ModifyAckDeadlineRequest() + new protos.google.pubsub.v1.ModifyAckDeadlineRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ModifyAckDeadlineRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.modifyAckDeadline = stubSimpleCallWithCallback(expectedResponse); @@ -901,14 +903,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.protobuf.IEmpty | null + result?: protos.google.protobuf.IEmpty | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -928,20 +930,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ModifyAckDeadlineRequest() + new protos.google.pubsub.v1.ModifyAckDeadlineRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ModifyAckDeadlineRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.modifyAckDeadline = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.modifyAckDeadline(request), expectedError); const actualRequest = ( @@ -959,17 +961,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ModifyAckDeadlineRequest() + new protos.google.pubsub.v1.ModifyAckDeadlineRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ModifyAckDeadlineRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.modifyAckDeadline(request), expectedError); }); }); @@ -980,18 +982,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.AcknowledgeRequest() + new protos.google.pubsub.v1.AcknowledgeRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.AcknowledgeRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.acknowledge = stubSimpleCall(expectedResponse); const [response] = await client.acknowledge(request); @@ -1011,18 +1013,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.AcknowledgeRequest() + new protos.google.pubsub.v1.AcknowledgeRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.AcknowledgeRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.acknowledge = stubSimpleCallWithCallback(expectedResponse); @@ -1031,14 +1033,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.protobuf.IEmpty | null + result?: protos.google.protobuf.IEmpty | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1058,20 +1060,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.AcknowledgeRequest() + new protos.google.pubsub.v1.AcknowledgeRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.AcknowledgeRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.acknowledge = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.acknowledge(request), expectedError); const actualRequest = ( @@ -1089,17 +1091,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.AcknowledgeRequest() + new protos.google.pubsub.v1.AcknowledgeRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.AcknowledgeRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.acknowledge(request), expectedError); }); }); @@ -1110,18 +1112,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.PullRequest() + new protos.google.pubsub.v1.PullRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.PullRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.PullResponse() + new protos.google.pubsub.v1.PullResponse(), ); client.innerApiCalls.pull = stubSimpleCall(expectedResponse); const [response] = await client.pull(request); @@ -1140,18 +1142,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.PullRequest() + new protos.google.pubsub.v1.PullRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.PullRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.PullResponse() + new protos.google.pubsub.v1.PullResponse(), ); client.innerApiCalls.pull = stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { @@ -1159,14 +1161,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.IPullResponse | null + result?: protos.google.pubsub.v1.IPullResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1185,16 +1187,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.PullRequest() + new protos.google.pubsub.v1.PullRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.PullRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.pull = stubSimpleCall(undefined, expectedError); await assert.rejects(client.pull(request), expectedError); @@ -1212,17 +1214,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.PullRequest() + new protos.google.pubsub.v1.PullRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.PullRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.pull(request), expectedError); }); }); @@ -1233,18 +1235,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ModifyPushConfigRequest() + new protos.google.pubsub.v1.ModifyPushConfigRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ModifyPushConfigRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.modifyPushConfig = stubSimpleCall(expectedResponse); const [response] = await client.modifyPushConfig(request); @@ -1264,18 +1266,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ModifyPushConfigRequest() + new protos.google.pubsub.v1.ModifyPushConfigRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ModifyPushConfigRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.modifyPushConfig = stubSimpleCallWithCallback(expectedResponse); @@ -1284,14 +1286,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.protobuf.IEmpty | null + result?: protos.google.protobuf.IEmpty | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1311,20 +1313,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ModifyPushConfigRequest() + new protos.google.pubsub.v1.ModifyPushConfigRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ModifyPushConfigRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.modifyPushConfig = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.modifyPushConfig(request), expectedError); const actualRequest = ( @@ -1342,17 +1344,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ModifyPushConfigRequest() + new protos.google.pubsub.v1.ModifyPushConfigRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ModifyPushConfigRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.modifyPushConfig(request), expectedError); }); }); @@ -1363,18 +1365,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSnapshotRequest() + new protos.google.pubsub.v1.GetSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSnapshotRequest', - ['snapshot'] + ['snapshot'], ); request.snapshot = defaultValue1; - const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Snapshot() + new protos.google.pubsub.v1.Snapshot(), ); client.innerApiCalls.getSnapshot = stubSimpleCall(expectedResponse); const [response] = await client.getSnapshot(request); @@ -1394,18 +1396,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSnapshotRequest() + new protos.google.pubsub.v1.GetSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSnapshotRequest', - ['snapshot'] + ['snapshot'], ); request.snapshot = defaultValue1; - const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Snapshot() + new protos.google.pubsub.v1.Snapshot(), ); client.innerApiCalls.getSnapshot = stubSimpleCallWithCallback(expectedResponse); @@ -1414,14 +1416,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISnapshot | null + result?: protos.google.pubsub.v1.ISnapshot | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1441,20 +1443,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSnapshotRequest() + new protos.google.pubsub.v1.GetSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSnapshotRequest', - ['snapshot'] + ['snapshot'], ); request.snapshot = defaultValue1; - const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.getSnapshot = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.getSnapshot(request), expectedError); const actualRequest = ( @@ -1472,17 +1474,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.GetSnapshotRequest() + new protos.google.pubsub.v1.GetSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.GetSnapshotRequest', - ['snapshot'] + ['snapshot'], ); request.snapshot = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.getSnapshot(request), expectedError); }); }); @@ -1493,18 +1495,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CreateSnapshotRequest() + new protos.google.pubsub.v1.CreateSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CreateSnapshotRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Snapshot() + new protos.google.pubsub.v1.Snapshot(), ); client.innerApiCalls.createSnapshot = stubSimpleCall(expectedResponse); const [response] = await client.createSnapshot(request); @@ -1524,18 +1526,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CreateSnapshotRequest() + new protos.google.pubsub.v1.CreateSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CreateSnapshotRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Snapshot() + new protos.google.pubsub.v1.Snapshot(), ); client.innerApiCalls.createSnapshot = stubSimpleCallWithCallback(expectedResponse); @@ -1544,14 +1546,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISnapshot | null + result?: protos.google.pubsub.v1.ISnapshot | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1571,20 +1573,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CreateSnapshotRequest() + new protos.google.pubsub.v1.CreateSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CreateSnapshotRequest', - ['name'] + ['name'], ); request.name = defaultValue1; - const expectedHeaderRequestParams = `name=${defaultValue1}`; + const expectedHeaderRequestParams = `name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.createSnapshot = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.createSnapshot(request), expectedError); const actualRequest = ( @@ -1602,17 +1604,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.CreateSnapshotRequest() + new protos.google.pubsub.v1.CreateSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.CreateSnapshotRequest', - ['name'] + ['name'], ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.createSnapshot(request), expectedError); }); }); @@ -1623,19 +1625,19 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateSnapshotRequest() + new protos.google.pubsub.v1.UpdateSnapshotRequest(), ); request.snapshot ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateSnapshotRequest', - ['snapshot', 'name'] + ['snapshot', 'name'], ); request.snapshot.name = defaultValue1; - const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot.name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Snapshot() + new protos.google.pubsub.v1.Snapshot(), ); client.innerApiCalls.updateSnapshot = stubSimpleCall(expectedResponse); const [response] = await client.updateSnapshot(request); @@ -1655,19 +1657,19 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateSnapshotRequest() + new protos.google.pubsub.v1.UpdateSnapshotRequest(), ); request.snapshot ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateSnapshotRequest', - ['snapshot', 'name'] + ['snapshot', 'name'], ); request.snapshot.name = defaultValue1; - const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot.name=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.Snapshot() + new protos.google.pubsub.v1.Snapshot(), ); client.innerApiCalls.updateSnapshot = stubSimpleCallWithCallback(expectedResponse); @@ -1676,14 +1678,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISnapshot | null + result?: protos.google.pubsub.v1.ISnapshot | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1703,21 +1705,21 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateSnapshotRequest() + new protos.google.pubsub.v1.UpdateSnapshotRequest(), ); request.snapshot ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateSnapshotRequest', - ['snapshot', 'name'] + ['snapshot', 'name'], ); request.snapshot.name = defaultValue1; - const expectedHeaderRequestParams = `snapshot.name=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot.name=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.updateSnapshot = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.updateSnapshot(request), expectedError); const actualRequest = ( @@ -1735,18 +1737,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.UpdateSnapshotRequest() + new protos.google.pubsub.v1.UpdateSnapshotRequest(), ); request.snapshot ??= {}; const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.UpdateSnapshotRequest', - ['snapshot', 'name'] + ['snapshot', 'name'], ); request.snapshot.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.updateSnapshot(request), expectedError); }); }); @@ -1757,18 +1759,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSnapshotRequest() + new protos.google.pubsub.v1.DeleteSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSnapshotRequest', - ['snapshot'] + ['snapshot'], ); request.snapshot = defaultValue1; - const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.deleteSnapshot = stubSimpleCall(expectedResponse); const [response] = await client.deleteSnapshot(request); @@ -1788,18 +1790,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSnapshotRequest() + new protos.google.pubsub.v1.DeleteSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSnapshotRequest', - ['snapshot'] + ['snapshot'], ); request.snapshot = defaultValue1; - const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.protobuf.Empty() + new protos.google.protobuf.Empty(), ); client.innerApiCalls.deleteSnapshot = stubSimpleCallWithCallback(expectedResponse); @@ -1808,14 +1810,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.protobuf.IEmpty | null + result?: protos.google.protobuf.IEmpty | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1835,20 +1837,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSnapshotRequest() + new protos.google.pubsub.v1.DeleteSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSnapshotRequest', - ['snapshot'] + ['snapshot'], ); request.snapshot = defaultValue1; - const expectedHeaderRequestParams = `snapshot=${defaultValue1}`; + const expectedHeaderRequestParams = `snapshot=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.deleteSnapshot = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.deleteSnapshot(request), expectedError); const actualRequest = ( @@ -1866,17 +1868,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.DeleteSnapshotRequest() + new protos.google.pubsub.v1.DeleteSnapshotRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.DeleteSnapshotRequest', - ['snapshot'] + ['snapshot'], ); request.snapshot = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.deleteSnapshot(request), expectedError); }); }); @@ -1887,18 +1889,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.SeekRequest() + new protos.google.pubsub.v1.SeekRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.SeekRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.SeekResponse() + new protos.google.pubsub.v1.SeekResponse(), ); client.innerApiCalls.seek = stubSimpleCall(expectedResponse); const [response] = await client.seek(request); @@ -1917,18 +1919,18 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.SeekRequest() + new protos.google.pubsub.v1.SeekRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.SeekRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.SeekResponse() + new protos.google.pubsub.v1.SeekResponse(), ); client.innerApiCalls.seek = stubSimpleCallWithCallback(expectedResponse); const promise = new Promise((resolve, reject) => { @@ -1936,14 +1938,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISeekResponse | null + result?: protos.google.pubsub.v1.ISeekResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -1962,16 +1964,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.SeekRequest() + new protos.google.pubsub.v1.SeekRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.SeekRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; - const expectedHeaderRequestParams = `subscription=${defaultValue1}`; + const expectedHeaderRequestParams = `subscription=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.seek = stubSimpleCall(undefined, expectedError); await assert.rejects(client.seek(request), expectedError); @@ -1989,17 +1991,17 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.SeekRequest() + new protos.google.pubsub.v1.SeekRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.SeekRequest', - ['subscription'] + ['subscription'], ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - client.close(); + void client.close(); await assert.rejects(client.seek(request), expectedError); }); }); @@ -2010,13 +2012,13 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.StreamingPullRequest() + new protos.google.pubsub.v1.StreamingPullRequest(), ); const expectedResponse = generateSampleMessage( - new protos.google.pubsub.v1.StreamingPullResponse() + new protos.google.pubsub.v1.StreamingPullResponse(), ); client.innerApiCalls.streamingPull = stubBidiStreamingCall(expectedResponse); @@ -2026,7 +2028,7 @@ describe('v1.SubscriberClient', () => { 'data', (response: protos.google.pubsub.v1.StreamingPullResponse) => { resolve(response); - } + }, ); stream.on('error', (err: Error) => { reject(err); @@ -2039,12 +2041,12 @@ describe('v1.SubscriberClient', () => { assert( (client.innerApiCalls.streamingPull as SinonStub) .getCall(0) - .calledWith(null) + .calledWith(null), ); assert.deepStrictEqual( ((stream as unknown as PassThrough)._transform as SinonStub).getCall(0) .args[0], - request + request, ); }); @@ -2053,14 +2055,14 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.StreamingPullRequest() + new protos.google.pubsub.v1.StreamingPullRequest(), ); const expectedError = new Error('expected'); client.innerApiCalls.streamingPull = stubBidiStreamingCall( undefined, - expectedError + expectedError, ); const stream = client.streamingPull(); const promise = new Promise((resolve, reject) => { @@ -2068,7 +2070,7 @@ describe('v1.SubscriberClient', () => { 'data', (response: protos.google.pubsub.v1.StreamingPullResponse) => { resolve(response); - } + }, ); stream.on('error', (err: Error) => { reject(err); @@ -2080,12 +2082,12 @@ describe('v1.SubscriberClient', () => { assert( (client.innerApiCalls.streamingPull as SinonStub) .getCall(0) - .calledWith(null) + .calledWith(null), ); assert.deepStrictEqual( ((stream as unknown as PassThrough)._transform as SinonStub).getCall(0) .args[0], - request + request, ); }); }); @@ -2096,16 +2098,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSubscriptionsRequest() + new protos.google.pubsub.v1.ListSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSubscriptionsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), @@ -2129,16 +2131,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSubscriptionsRequest() + new protos.google.pubsub.v1.ListSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSubscriptionsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), @@ -2151,14 +2153,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISubscription[] | null + result?: protos.google.pubsub.v1.ISubscription[] | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2178,20 +2180,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSubscriptionsRequest() + new protos.google.pubsub.v1.ListSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSubscriptionsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.listSubscriptions = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.listSubscriptions(request), expectedError); const actualRequest = ( @@ -2209,16 +2211,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSubscriptionsRequest() + new protos.google.pubsub.v1.ListSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSubscriptionsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), @@ -2244,14 +2246,14 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSubscriptions.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listSubscriptions, request) + .calledWith(client.innerApiCalls.listSubscriptions, request), ); assert( (client.descriptors.page.listSubscriptions.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -2260,16 +2262,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSubscriptionsRequest() + new protos.google.pubsub.v1.ListSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSubscriptionsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listSubscriptions.createStream = stubPageStreamingCall(undefined, expectedError); @@ -2290,14 +2292,14 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSubscriptions.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listSubscriptions, request) + .calledWith(client.innerApiCalls.listSubscriptions, request), ); assert( (client.descriptors.page.listSubscriptions.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -2306,16 +2308,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSubscriptionsRequest() + new protos.google.pubsub.v1.ListSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSubscriptionsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Subscription()), generateSampleMessage(new protos.google.pubsub.v1.Subscription()), @@ -2333,14 +2335,14 @@ describe('v1.SubscriberClient', () => { ( client.descriptors.page.listSubscriptions.asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( (client.descriptors.page.listSubscriptions.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -2349,16 +2351,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSubscriptionsRequest() + new protos.google.pubsub.v1.ListSubscriptionsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSubscriptionsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listSubscriptions.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -2373,14 +2375,14 @@ describe('v1.SubscriberClient', () => { ( client.descriptors.page.listSubscriptions.asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( (client.descriptors.page.listSubscriptions.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); }); @@ -2391,16 +2393,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSnapshotsRequest() + new protos.google.pubsub.v1.ListSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSnapshotsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), @@ -2424,16 +2426,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSnapshotsRequest() + new protos.google.pubsub.v1.ListSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSnapshotsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), @@ -2446,14 +2448,14 @@ describe('v1.SubscriberClient', () => { request, ( err?: Error | null, - result?: protos.google.pubsub.v1.ISnapshot[] | null + result?: protos.google.pubsub.v1.ISnapshot[] | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2473,20 +2475,20 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSnapshotsRequest() + new protos.google.pubsub.v1.ListSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSnapshotsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.innerApiCalls.listSnapshots = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects(client.listSnapshots(request), expectedError); const actualRequest = ( @@ -2504,16 +2506,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSnapshotsRequest() + new protos.google.pubsub.v1.ListSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSnapshotsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), @@ -2539,14 +2541,14 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSnapshots.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listSnapshots, request) + .calledWith(client.innerApiCalls.listSnapshots, request), ); assert( (client.descriptors.page.listSnapshots.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -2555,16 +2557,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSnapshotsRequest() + new protos.google.pubsub.v1.ListSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSnapshotsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listSnapshots.createStream = stubPageStreamingCall(undefined, expectedError); @@ -2585,14 +2587,14 @@ describe('v1.SubscriberClient', () => { assert( (client.descriptors.page.listSnapshots.createStream as SinonStub) .getCall(0) - .calledWith(client.innerApiCalls.listSnapshots, request) + .calledWith(client.innerApiCalls.listSnapshots, request), ); assert( (client.descriptors.page.listSnapshots.createStream as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -2601,16 +2603,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSnapshotsRequest() + new protos.google.pubsub.v1.ListSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSnapshotsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedResponse = [ generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), generateSampleMessage(new protos.google.pubsub.v1.Snapshot()), @@ -2628,14 +2630,14 @@ describe('v1.SubscriberClient', () => { ( client.descriptors.page.listSnapshots.asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( (client.descriptors.page.listSnapshots.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); @@ -2644,16 +2646,16 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new protos.google.pubsub.v1.ListSnapshotsRequest() + new protos.google.pubsub.v1.ListSnapshotsRequest(), ); const defaultValue1 = getTypeDefaultValue( '.google.pubsub.v1.ListSnapshotsRequest', - ['project'] + ['project'], ); request.project = defaultValue1; - const expectedHeaderRequestParams = `project=${defaultValue1}`; + const expectedHeaderRequestParams = `project=${defaultValue1 ?? ''}`; const expectedError = new Error('expected'); client.descriptors.page.listSnapshots.asyncIterate = stubAsyncIterationCall(undefined, expectedError); @@ -2668,14 +2670,14 @@ describe('v1.SubscriberClient', () => { ( client.descriptors.page.listSnapshots.asyncIterate as SinonStub ).getCall(0).args[1], - request + request, ); assert( (client.descriptors.page.listSnapshots.asyncIterate as SinonStub) .getCall(0) .args[2].otherArgs.headers[ 'x-goog-request-params' - ].includes(expectedHeaderRequestParams) + ].includes(expectedHeaderRequestParams), ); }); }); @@ -2685,9 +2687,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2699,7 +2701,7 @@ describe('v1.SubscriberClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.getIamPolicy = stubSimpleCall(expectedResponse); const response = await client.getIamPolicy(request, expectedOptions); @@ -2707,7 +2709,7 @@ describe('v1.SubscriberClient', () => { assert( (client.iamClient.getIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes getIamPolicy without error using callback', async () => { @@ -2715,9 +2717,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2729,25 +2731,25 @@ describe('v1.SubscriberClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.getIamPolicy = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.getIamPolicy( + void client.getIamPolicy( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null + result?: IamProtos.google.iam.v1.Policy | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2759,9 +2761,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.GetIamPolicyRequest() + new IamProtos.google.iam.v1.GetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2776,12 +2778,12 @@ describe('v1.SubscriberClient', () => { client.iamClient.getIamPolicy = stubSimpleCall(undefined, expectedError); await assert.rejects( client.getIamPolicy(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.getIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); @@ -2791,9 +2793,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2805,7 +2807,7 @@ describe('v1.SubscriberClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.setIamPolicy = stubSimpleCall(expectedResponse); const response = await client.setIamPolicy(request, expectedOptions); @@ -2813,7 +2815,7 @@ describe('v1.SubscriberClient', () => { assert( (client.iamClient.setIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes setIamPolicy without error using callback', async () => { @@ -2821,9 +2823,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2835,25 +2837,25 @@ describe('v1.SubscriberClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.Policy() + new IamProtos.google.iam.v1.Policy(), ); client.iamClient.setIamPolicy = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.setIamPolicy( + void client.setIamPolicy( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null + result?: IamProtos.google.iam.v1.Policy | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2865,9 +2867,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.SetIamPolicyRequest() + new IamProtos.google.iam.v1.SetIamPolicyRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2882,12 +2884,12 @@ describe('v1.SubscriberClient', () => { client.iamClient.setIamPolicy = stubSimpleCall(undefined, expectedError); await assert.rejects( client.setIamPolicy(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.setIamPolicy as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); @@ -2897,9 +2899,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2911,18 +2913,18 @@ describe('v1.SubscriberClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsResponse() + new IamProtos.google.iam.v1.TestIamPermissionsResponse(), ); client.iamClient.testIamPermissions = stubSimpleCall(expectedResponse); const response = await client.testIamPermissions( request, - expectedOptions + expectedOptions, ); assert.deepStrictEqual(response, [expectedResponse]); assert( (client.iamClient.testIamPermissions as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); it('invokes testIamPermissions without error using callback', async () => { @@ -2930,9 +2932,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2944,25 +2946,25 @@ describe('v1.SubscriberClient', () => { }, }; const expectedResponse = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsResponse() + new IamProtos.google.iam.v1.TestIamPermissionsResponse(), ); client.iamClient.testIamPermissions = sinon .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - client.testIamPermissions( + void client.testIamPermissions( request, expectedOptions, ( err?: Error | null, - result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, ) => { if (err) { reject(err); } else { resolve(result); } - } + }, ); }); const response = await promise; @@ -2974,9 +2976,9 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); const request = generateSampleMessage( - new IamProtos.google.iam.v1.TestIamPermissionsRequest() + new IamProtos.google.iam.v1.TestIamPermissionsRequest(), ); request.resource = ''; const expectedHeaderRequestParams = 'resource='; @@ -2990,22 +2992,22 @@ describe('v1.SubscriberClient', () => { const expectedError = new Error('expected'); client.iamClient.testIamPermissions = stubSimpleCall( undefined, - expectedError + expectedError, ); await assert.rejects( client.testIamPermissions(request, expectedOptions), - expectedError + expectedError, ); assert( (client.iamClient.testIamPermissions as SinonStub) .getCall(0) - .calledWith(request, expectedOptions, undefined) + .calledWith(request, expectedOptions, undefined), ); }); }); describe('Path templates', () => { - describe('project', () => { + describe('project', async () => { const fakePath = '/rendered/path/project'; const expectedParameters = { project: 'projectValue', @@ -3014,7 +3016,7 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.projectPathTemplate.render = sinon .stub() .returns(fakePath); @@ -3028,7 +3030,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.projectPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -3038,12 +3040,12 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.projectPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('projectTopic', () => { + describe('projectTopic', async () => { const fakePath = '/rendered/path/projectTopic'; const expectedParameters = { project: 'projectValue', @@ -3053,7 +3055,7 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.projectTopicPathTemplate.render = sinon .stub() .returns(fakePath); @@ -3067,7 +3069,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -3077,7 +3079,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -3087,12 +3089,12 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.projectTopicPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('schema', () => { + describe('schema', async () => { const fakePath = '/rendered/path/schema'; const expectedParameters = { project: 'projectValue', @@ -3102,7 +3104,7 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.schemaPathTemplate.render = sinon .stub() .returns(fakePath); @@ -3116,7 +3118,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.schemaPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -3126,7 +3128,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.schemaPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -3136,12 +3138,12 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.schemaPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('snapshot', () => { + describe('snapshot', async () => { const fakePath = '/rendered/path/snapshot'; const expectedParameters = { project: 'projectValue', @@ -3151,7 +3153,7 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.snapshotPathTemplate.render = sinon .stub() .returns(fakePath); @@ -3165,7 +3167,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -3175,7 +3177,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -3185,12 +3187,12 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.snapshotPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); - describe('subscription', () => { + describe('subscription', async () => { const fakePath = '/rendered/path/subscription'; const expectedParameters = { project: 'projectValue', @@ -3200,7 +3202,7 @@ describe('v1.SubscriberClient', () => { credentials: {client_email: 'bogus', private_key: 'bogus'}, projectId: 'bogus', }); - client.initialize(); + await client.initialize(); client.pathTemplates.subscriptionPathTemplate.render = sinon .stub() .returns(fakePath); @@ -3211,13 +3213,13 @@ describe('v1.SubscriberClient', () => { it('subscriptionPath', () => { const result = client.subscriptionPath( 'projectValue', - 'subscriptionValue' + 'subscriptionValue', ); assert.strictEqual(result, fakePath); assert( (client.pathTemplates.subscriptionPathTemplate.render as SinonStub) .getCall(-1) - .calledWith(expectedParameters) + .calledWith(expectedParameters), ); }); @@ -3227,7 +3229,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); @@ -3237,7 +3239,7 @@ describe('v1.SubscriberClient', () => { assert( (client.pathTemplates.subscriptionPathTemplate.match as SinonStub) .getCall(-1) - .calledWith(fakePath) + .calledWith(fakePath), ); }); }); diff --git a/handwritten/pubsub/test/iam.ts b/handwritten/pubsub/test/iam.ts index d5f5763e2e4..a1f73f8bf35 100644 --- a/handwritten/pubsub/test/iam.ts +++ b/handwritten/pubsub/test/iam.ts @@ -25,7 +25,7 @@ const fakeUtil = Object.assign({}, util, { promisifySome( class_: Function, classProtos: object, - methods: string[] + methods: string[], ): void { if (class_.name === 'IAM') { promisified = true; diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index ca26a4be03e..c95b633f92c 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -30,6 +30,8 @@ import { Subscriber, } from '../src/subscriber'; import {defaultOptions} from '../src/default-options'; +import {TestUtils} from './test-utils'; +import {Duration} from '../src'; const FREE_MEM = 9376387072; const fakeos = { @@ -40,6 +42,7 @@ class FakeSubscriber extends EventEmitter { ackDeadline = 10; isOpen = true; modAckLatency = 2000; + maxExtensionTime = Duration.from({minutes: 60}); async modAck(): Promise {} async modAckWithResponse(): Promise { return AckResponses.Success; @@ -237,7 +240,7 @@ describe('LeaseManager', () => { // This random number was generated once to keep the test results stable. random = 0.5756015072052962; sandbox.stub(global.Math, 'random').returns(random); - clock = sandbox.useFakeTimers(); + clock = TestUtils.useFakeTimers(sandbox); expectedTimeout = (subscriber.ackDeadline * 1000 * 0.9 - subscriber.modAckLatency) * random; @@ -285,33 +288,15 @@ describe('LeaseManager', () => { }); }); - it('should properly convert any legacy maxExtension values', () => { - const maxExtension = 60 * 1000; - leaseManager.setOptions({maxExtension}); - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const options = (leaseManager as any)._options; - assert.strictEqual(options.maxExtensionMinutes, maxExtension / 60); - assert.strictEqual(options.maxExtension, undefined); - }); - - it('should not allow both maxExtension and maxExtensionMinutes', () => { - assert.throws(() => { - leaseManager.setOptions({ - maxExtension: 10, - maxExtensionMinutes: 10, - }); - }); - }); - it('should remove any messages that pass the maxExtensionMinutes value', () => { const maxExtensionSeconds = (expectedTimeout - 100) / 1000; const badMessages = [new FakeMessage(), new FakeMessage()]; - leaseManager.setOptions({ - maxExtensionMinutes: maxExtensionSeconds / 60, + subscriber.maxExtensionTime = Duration.from({ + seconds: maxExtensionSeconds, }); badMessages.forEach(message => - leaseManager.add(message as {} as Message) + leaseManager.add(message as {} as Message), ); clock.tick(halfway); @@ -338,9 +323,7 @@ describe('LeaseManager', () => { it('should remove and ackFailed any messages that fail to ack', done => { (subscriber as unknown as FakeSubscriber).isExactlyOnceDelivery = true; - leaseManager.setOptions({ - maxExtensionMinutes: 600, - }); + subscriber.maxExtensionTime = Duration.from({minutes: 600}); const goodMessage = new FakeMessage(); @@ -397,7 +380,7 @@ describe('LeaseManager', () => { }); it('should cancel any lease extensions', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const stub = sandbox.stub(subscriber, 'modAck').resolves(); leaseManager.add(new FakeMessage() as {} as Message); @@ -518,7 +501,7 @@ describe('LeaseManager', () => { }); it('should cancel any extensions if no messages are left', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const message = new FakeMessage() as {} as Message; const stub = sandbox.stub(subscriber, 'modAck').resolves(); @@ -563,7 +546,7 @@ describe('LeaseManager', () => { describe('deadline extension', () => { beforeEach(() => { - sandbox.useFakeTimers(); + TestUtils.useFakeTimers(sandbox); }); afterEach(() => { sandbox.clock.restore(); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index b5d42b768b9..7dc31779a3a 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -26,13 +26,14 @@ import * as messageTypes from '../src/message-queues'; import {BatchError} from '../src/message-queues'; import {Message, Subscriber} from '../src/subscriber'; import {DebugMessage} from '../src/debug'; +import {TestUtils} from './test-utils'; class FakeClient { async acknowledge( // eslint-disable-next-line @typescript-eslint/no-unused-vars reqOpts: {subscription: string; ackIds: string[]}, // eslint-disable-next-line @typescript-eslint/no-unused-vars - callOptions: CallOptions + callOptions: CallOptions, ): Promise {} async modifyAckDeadline( // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -42,7 +43,7 @@ class FakeClient { ackDeadlineSeconds: number; }, // eslint-disable-next-line @typescript-eslint/no-unused-vars - callOptions: CallOptions + callOptions: CallOptions, ): Promise {} } @@ -80,7 +81,7 @@ function fakeMessage() { class MessageQueue extends messageTypes.MessageQueue { batches: messageTypes.QueuedMessages[] = []; async _sendBatch( - batch: messageTypes.QueuedMessages + batch: messageTypes.QueuedMessages, ): Promise { this.batches.push(batch); return []; @@ -147,7 +148,7 @@ describe('MessageQueues', () => { describe('add', () => { it('should increase the number of pending requests', () => { - messageQueue.add(new FakeMessage() as Message); + void messageQueue.add(new FakeMessage() as Message); assert.strictEqual(messageQueue.numPendingRequests, 1); }); @@ -155,7 +156,7 @@ describe('MessageQueues', () => { const stub = sandbox.stub(messageQueue, 'flush'); messageQueue.setOptions({maxMessages: 1}); - messageQueue.add(new FakeMessage() as Message); + void messageQueue.add(new FakeMessage() as Message); assert.strictEqual(stub.callCount, 1); }); @@ -164,18 +165,18 @@ describe('MessageQueues', () => { const stub = sandbox.stub(messageQueue, 'flush'); messageQueue.bytes = messageTypes.MAX_BATCH_BYTES - 10; - messageQueue.add(new FakeMessage() as Message); + void messageQueue.add(new FakeMessage() as Message); assert.strictEqual(stub.callCount, 1); }); it('should schedule a flush if needed', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const stub = sandbox.stub(messageQueue, 'flush'); const delay = 1000; messageQueue.setOptions({maxMilliseconds: delay}); - messageQueue.add(new FakeMessage() as Message); + void messageQueue.add(new FakeMessage() as Message); assert.strictEqual(stub.callCount, 0); clock.tick(delay); @@ -183,7 +184,7 @@ describe('MessageQueues', () => { }); it('should return a Promise that resolves when the ack is sent', async () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const delay = 1000; messageQueue.setOptions({maxMilliseconds: delay}); @@ -204,28 +205,28 @@ describe('MessageQueues', () => { describe('flush', () => { it('should cancel scheduled flushes', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const spy = sandbox.spy(messageQueue, 'flush'); const delay = 1000; messageQueue.setOptions({maxMilliseconds: delay}); - messageQueue.add(new FakeMessage() as Message); - messageQueue.flush(); + void messageQueue.add(new FakeMessage() as Message); + void messageQueue.flush(); clock.tick(delay); assert.strictEqual(spy.callCount, 1); }); it('should remove the messages from the queue', () => { - messageQueue.add(new FakeMessage() as Message); - messageQueue.flush(); + void messageQueue.add(new FakeMessage() as Message); + void messageQueue.flush(); assert.strictEqual(messageQueue.numPendingRequests, 0); }); it('should remove the bytes of messages from the queue', () => { - messageQueue.add(new FakeMessage() as Message); - messageQueue.flush(); + void messageQueue.add(new FakeMessage() as Message); + void messageQueue.flush(); assert.strictEqual(messageQueue.bytes, 0); }); @@ -234,8 +235,8 @@ describe('MessageQueues', () => { const message = new FakeMessage(); const deadline = 10; - messageQueue.add(message as Message, deadline); - messageQueue.flush(); + void messageQueue.add(message as Message, deadline); + void messageQueue.flush(); const [batch] = messageQueue.batches; assert.strictEqual(batch[0].message.ackId, message.ackId); @@ -253,12 +254,12 @@ describe('MessageQueues', () => { done(); }); - messageQueue.flush(); + void messageQueue.flush(); }); - it('should resolve any pending promises', () => { + it('should resolve any pending promises', async () => { const promise = messageQueue.onFlush(); - setImmediate(() => messageQueue.flush()); + setImmediate(async () => await messageQueue.flush()); return promise; }); @@ -277,8 +278,8 @@ describe('MessageQueues', () => { const onDrainBeforeFlush = messageQueue .onDrain() .then(() => log.push('drain1')); - messageQueue.add(message as Message, deadline); - messageQueue.flush(); + void messageQueue.add(message as Message, deadline); + void messageQueue.flush(); assert.deepStrictEqual(log, ['send:start']); sendDone.resolve(); await messageQueue.onDrain().then(() => log.push('drain2')); @@ -329,7 +330,7 @@ describe('MessageQueues', () => { for (let i = 0; i < 3000; i++) { assert.strictEqual(stub.callCount, 0); - messageQueue.add(fakeMessage()); + void messageQueue.add(fakeMessage()); } assert.strictEqual(stub.callCount, 1); @@ -343,29 +344,29 @@ describe('MessageQueues', () => { for (let i = 0; i < maxMessages; i++) { assert.strictEqual(stub.callCount, 0); - messageQueue.add(fakeMessage()); + void messageQueue.add(fakeMessage()); } assert.strictEqual(stub.callCount, 1); }); it('should default maxMilliseconds to 100', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const stub = sandbox.stub(messageQueue, 'flush'); - messageQueue.add(fakeMessage()); + void messageQueue.add(fakeMessage()); clock.tick(100); assert.strictEqual(stub.callCount, 1); }); it('should respect user supplied maxMilliseconds', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const stub = sandbox.stub(messageQueue, 'flush'); const maxMilliseconds = 10000; messageQueue.setOptions({maxMilliseconds}); - messageQueue.add(fakeMessage()); + void messageQueue.add(fakeMessage()); clock.tick(maxMilliseconds); assert.strictEqual(stub.callCount, 1); @@ -448,7 +449,7 @@ describe('MessageQueues', () => { }); messages.forEach(message => ackQueue.add(message as Message)); - ackQueue.flush(); + void ackQueue.flush(); }); // The analogous modAck version is very similar, so please sync changes. @@ -481,7 +482,7 @@ describe('MessageQueues', () => { sandbox.stub(fakeSubscriber.client, 'acknowledge').resolves(); const proms = ackQueue.requests.map( - (r: messageTypes.QueuedMessage) => r.responsePromise!.promise + (r: messageTypes.QueuedMessage) => r.responsePromise!.promise, ); await ackQueue.flush(); const results = await Promise.allSettled(proms); @@ -503,9 +504,9 @@ describe('MessageQueues', () => { sandbox.stub(fakeSubscriber.client, 'acknowledge').rejects(fakeError); const proms = ackQueue.requests.map( - (r: messageTypes.QueuedMessage) => r.responsePromise!.promise + (r: messageTypes.QueuedMessage) => r.responsePromise!.promise, ); - proms.shift(); + void proms.shift(); await ackQueue.flush(); const results = await Promise.allSettled(proms); @@ -557,7 +558,7 @@ describe('MessageQueues', () => { // This doesn't need to be duplicated down to modAck because it's just // testing common code. it('should retry transient failures', async () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); sandbox.stub(global.Math, 'random').returns(0.5); const message = fakeMessage(); @@ -569,7 +570,7 @@ describe('MessageQueues', () => { }; sandbox.stub(fakeSubscriber.client, 'acknowledge').rejects(fakeError); - ackQueue.add(message); + void ackQueue.add(message); await ackQueue.flush(); // Make sure the one handled by errorInfo was retried. @@ -636,7 +637,7 @@ describe('MessageQueues', () => { }; messages.forEach(message => - modAckQueue.add(message as Message, deadline) + modAckQueue.add(message as Message, deadline), ); await modAckQueue.flush(); @@ -676,10 +677,10 @@ describe('MessageQueues', () => { }; messages1.forEach(message => - modAckQueue.add(message as Message, deadline1) + modAckQueue.add(message as Message, deadline1), ); messages2.forEach(message => - modAckQueue.add(message as Message, deadline2) + modAckQueue.add(message as Message, deadline2), ); await modAckQueue.flush(); @@ -697,7 +698,7 @@ describe('MessageQueues', () => { .resolves(); modAckQueue.setOptions({callOptions: fakeCallOptions}); - modAckQueue.add(new FakeMessage() as Message, 10); + await modAckQueue.add(new FakeMessage() as Message, 10); await modAckQueue.flush(); const [, callOptions] = stub.lastCall.args; @@ -740,7 +741,7 @@ describe('MessageQueues', () => { }); messages.forEach(message => modAckQueue.add(message as Message)); - modAckQueue.flush(); + void modAckQueue.flush(); }); describe('handle modAck responses when !isExactlyOnceDelivery', () => { @@ -772,7 +773,7 @@ describe('MessageQueues', () => { sandbox.stub(fakeSubscriber.client, 'modifyAckDeadline').resolves(); const proms = modAckQueue.requests.map( - (r: messageTypes.QueuedMessage) => r.responsePromise!.promise + (r: messageTypes.QueuedMessage) => r.responsePromise!.promise, ); await modAckQueue.flush(); const results = await Promise.allSettled(proms); @@ -796,9 +797,9 @@ describe('MessageQueues', () => { .stub(fakeSubscriber.client, 'modifyAckDeadline') .rejects(fakeError); const proms = modAckQueue.requests.map( - (r: messageTypes.QueuedMessage) => r.responsePromise!.promise + (r: messageTypes.QueuedMessage) => r.responsePromise!.promise, ); - proms.shift(); + void proms.shift(); await modAckQueue.flush(); const results = await Promise.allSettled(proms); diff --git a/handwritten/pubsub/test/message-stream.ts b/handwritten/pubsub/test/message-stream.ts index 494083d5a2e..2463d17eb50 100644 --- a/handwritten/pubsub/test/message-stream.ts +++ b/handwritten/pubsub/test/message-stream.ts @@ -22,12 +22,13 @@ import * as sinon from 'sinon'; import {Duplex, PassThrough} from 'stream'; import * as uuid from 'uuid'; import * as defer from 'p-defer'; +import {promisify} from 'util'; import * as messageTypes from '../src/message-stream'; import {Subscriber} from '../src/subscriber'; import {defaultOptions} from '../src/default-options'; import {Duration} from '../src/temporal'; -import {promisify} from 'util'; +import {TestUtils} from './test-utils'; const FAKE_STREAMING_PULL_TIMEOUT = 123456789; const FAKE_CLIENT_CONFIG = { @@ -63,13 +64,21 @@ class FakePassThrough extends PassThrough { } } +interface AccessReadableState { + _readableState: StreamState; +} + class FakeGrpcStream extends Duplex { options: StreamingPullOptions; - _readableState!: StreamState; constructor(options: StreamingPullOptions) { super({objectMode: true}); this.options = options; } + + get readableState(): StreamState { + return (this as unknown as AccessReadableState)._readableState; + } + cancel(): void { const status = { code: 1, @@ -156,8 +165,8 @@ describe('MessageStream', () => { }); beforeEach(async () => { - sandbox.useFakeTimers(); now = Date.now(); + TestUtils.useFakeTimers(sandbox, now); const gaxClient = new FakeGaxClient(); client = gaxClient.client; // we hit the grpc client directly @@ -180,7 +189,7 @@ describe('MessageStream', () => { }; assert.deepStrictEqual( (messageStream as {} as FakePassThrough).options, - expectedOptions + expectedOptions, ); }); @@ -195,7 +204,7 @@ describe('MessageStream', () => { assert.deepStrictEqual( (ms as {} as FakePassThrough).options, - expectedOptions + expectedOptions, ); }); @@ -207,14 +216,14 @@ describe('MessageStream', () => { describe('defaults', () => { it('should default highWaterMark to 0', () => { client.streams.forEach(stream => { - assert.strictEqual(stream._readableState.highWaterMark, 0); + assert.strictEqual(stream.readableState.highWaterMark, 0); }); }); it('should default maxStreams', () => { assert.strictEqual( client.streams.length, - defaultOptions.subscription.maxStreams + defaultOptions.subscription.maxStreams, ); }); @@ -229,7 +238,10 @@ describe('MessageStream', () => { it('should default timeout to 5 minutes', () => { const expectedTimeout = now + 60000 * 5; - assert.strictEqual(client.deadline, expectedTimeout); + + // Floating point calcuations in Duration might make this a few + // microseconds off. + assert.ok(Math.abs(client.deadline! - expectedTimeout) < 10); }); }); @@ -250,12 +262,13 @@ describe('MessageStream', () => { assert.strictEqual( client.streams.length, - defaultOptions.subscription.maxStreams + defaultOptions.subscription.maxStreams, ); + client.streams.forEach(stream => { assert.strictEqual( - stream._readableState.highWaterMark, - highWaterMark + stream.readableState.highWaterMark, + highWaterMark, ); }); }); diff --git a/handwritten/pubsub/test/publisher/flow-publisher.ts b/handwritten/pubsub/test/publisher/flow-publisher.ts index c4c0ed6d439..0ca59e56783 100644 --- a/handwritten/pubsub/test/publisher/flow-publisher.ts +++ b/handwritten/pubsub/test/publisher/flow-publisher.ts @@ -60,17 +60,17 @@ describe('Flow control publisher', () => { parentSpan: tracing.PubsubSpans.createPublisherSpan( {}, 'projects/foo/topics/topic', - 'tests' + 'tests', ), }; - fcp.publish(message as unknown as PubsubMessage); + await fcp.publish(message as unknown as PubsubMessage); assert.strictEqual(!!message.parentSpan, true); }); it('should not create a flow span if no parent exists', async () => { const fcp = new fp.FlowControlledPublisher(publisher); const message = {data: Buffer.from('foo'), parentSpan: undefined}; - fcp.publish(message as unknown as PubsubMessage); + await fcp.publish(message as unknown as PubsubMessage); assert.strictEqual(!message.parentSpan, true); }); diff --git a/handwritten/pubsub/test/publisher/index.ts b/handwritten/pubsub/test/publisher/index.ts index 9393b470f31..af693c65ebf 100644 --- a/handwritten/pubsub/test/publisher/index.ts +++ b/handwritten/pubsub/test/publisher/index.ts @@ -38,7 +38,7 @@ const fakeUtil = Object.assign({}, util, { class_: Function, classProtos: object, methods: string[], - options: pfy.PromisifyAllOptions + options: pfy.PromisifyAllOptions, ): void { if (class_.name === 'Publisher') { promisified = true; @@ -70,7 +70,7 @@ class FakeQueue extends EventEmitter { // eslint-disable-next-line @typescript-eslint/no-unused-vars messages: p.PubsubMessage[], // eslint-disable-next-line @typescript-eslint/no-unused-vars - callbacks: p.PublishCallback[] + callbacks: p.PublishCallback[], ) {} } @@ -92,7 +92,7 @@ class FakeOrderedQueue extends FakeQueue { // eslint-disable-next-line @typescript-eslint/no-unused-vars messages: p.PubsubMessage[], // eslint-disable-next-line @typescript-eslint/no-unused-vars - callbacks: p.PublishCallback[] + callbacks: p.PublishCallback[], ) {} } @@ -193,13 +193,13 @@ describe('Publisher', () => { exporter.reset(); }); - it('export created spans', async () => { + it('export created spans', () => { tracing.setGloballyEnabled(true); // Setup trace exporting tracingPublisher = new Publisher(topic); const msg = {data: buffer} as p.PubsubMessage; - tracingPublisher.publishMessage(msg); + void tracingPublisher.publishMessage(msg); // publishMessage is only the first part of the process now, // so we need to manually end the span. @@ -210,21 +210,21 @@ describe('Publisher', () => { const createdSpan = spans.concat().pop()!; assert.strictEqual( createdSpan.status.code, - opentelemetry.SpanStatusCode.UNSET + opentelemetry.SpanStatusCode.UNSET, ); assert.strictEqual( createdSpan.attributes['messaging.system'], - 'gcp_pubsub' + 'gcp_pubsub', ); assert.strictEqual( createdSpan.attributes['messaging.destination.name'], - topicId + topicId, ); assert.strictEqual(createdSpan.name, `${topicId} create`); assert.strictEqual( createdSpan.kind, SpanKind.PRODUCER, - 'span kind should be PRODUCER' + 'span kind should be PRODUCER', ); assert.ok(spans); }); @@ -237,14 +237,14 @@ describe('Publisher', () => { const badData = {} as Buffer; assert.throws( () => publisher.publishMessage({data: badData}, spy), - /Data must be in the form of a Buffer or Uint8Array\./ + /Data must be in the form of a Buffer or Uint8Array\./, ); }); it('should throw an error if data and attributes are both empty', () => { assert.throws( () => publisher.publishMessage({}, spy), - /at least one attribute must be present/ + /at least one attribute must be present/, ); }); @@ -258,7 +258,7 @@ describe('Publisher', () => { assert.throws( () => publisher.publishMessage({data, attributes}, spy), - /All attributes must be in the form of a string.\n\nInvalid value of type "object" provided for "foo"\./ + /All attributes must be in the form of a string.\n\nInvalid value of type "object" provided for "foo"\./, ); }); @@ -286,7 +286,7 @@ describe('Publisher', () => { queue = new FakeOrderedQueue(publisher, orderingKey); publisher.orderedQueues.set( orderingKey, - queue as unknown as q.OrderedQueue + queue as unknown as q.OrderedQueue, ); }); @@ -295,7 +295,7 @@ describe('Publisher', () => { publisher.publishMessage(fakeMessage, spy); queue = publisher.orderedQueues.get( - orderingKey + orderingKey, ) as unknown as FakeOrderedQueue; assert(queue instanceof FakeOrderedQueue); @@ -335,7 +335,7 @@ describe('Publisher', () => { publisher.publishMessage(fakeMessage, spy); queue = publisher.orderedQueues.get( - orderingKey + orderingKey, ) as unknown as FakeOrderedQueue; queue.emit('drain'); @@ -356,7 +356,7 @@ describe('Publisher', () => { .stub(FakeOrderedQueue.prototype, '_publish') .callsFake(async () => { const queue = publisher.orderedQueues.get( - orderingKey + orderingKey, ) as unknown as FakeOrderedQueue; // Simulate the drain taking longer than the publishes. This can // happen on some ordered queue scenarios, especially if we have more @@ -375,22 +375,6 @@ describe('Publisher', () => { done(); }); }); - - it('should issue a warning if OpenTelemetry span context key is set', () => { - tracing.setGloballyEnabled(true); - - const warnSpy = sinon.spy(console, 'warn'); - const attributes = { - [tracing.legacyAttributeName]: 'foobar', - }; - const fakeMessageWithOTKey = {data, attributes}; - const publisherTracing = new Publisher(topic, { - enableOpenTelemetryTracing: true, - }); - publisherTracing.publishMessage(fakeMessageWithOTKey, warnSpy); - assert.ok(warnSpy.called); - warnSpy.restore(); - }); }); }); @@ -402,7 +386,7 @@ describe('Publisher', () => { publisher.orderedQueues.set( orderingKey, - queue as unknown as q.OrderedQueue + queue as unknown as q.OrderedQueue, ); publisher.resumePublishing(orderingKey); @@ -424,7 +408,6 @@ describe('Publisher', () => { gaxOpts: { isBundling: false, }, - enableOpenTelemetryTracing: false, flowControlOptions: { maxOutstandingBytes: undefined, maxOutstandingMessages: undefined, @@ -443,7 +426,6 @@ describe('Publisher', () => { gaxOpts: { isBundling: true, }, - enableOpenTelemetryTracing: true, flowControlOptions: { maxOutstandingBytes: 500, maxOutstandingMessages: 50, @@ -484,8 +466,8 @@ describe('Publisher', () => { assert.deepStrictEqual(publisher.orderedQueues.size, 2); stubs.push( ...Array.from(publisher.orderedQueues.values()).map(q => - sandbox.stub(q, 'updateOptions') - ) + sandbox.stub(q, 'updateOptions'), + ), ); const newOptions: p.PublishOptions = { @@ -512,7 +494,7 @@ describe('Publisher', () => { assert.strictEqual(err, null); assert.strictEqual( !publisher.queue.batch || publisher.queue.batch.messages.length === 0, - true + true, ); done(); }); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index b9cefea53c5..873e61c0e56 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -26,6 +26,7 @@ import * as p from '../../src/publisher'; import * as b from '../../src/publisher/message-batch'; import * as q from '../../src/publisher/message-queues'; import {PublishError} from '../../src/publisher/publish-error'; +import {TestUtils} from '../test-utils'; class FakeTopic { name = 'projects/foo/topics/fake-topic'; @@ -158,7 +159,7 @@ describe('Message Queues', () => { it('should make the correct request', () => { const stub = sandbox.stub(topic, 'request'); - queue._publish(messages, callbacks); + void queue._publish(messages, callbacks); const [{client, method, reqOpts}] = stub.lastCall.args; assert.strictEqual(client, 'PublisherClient'); @@ -171,7 +172,7 @@ describe('Message Queues', () => { const callOptions = {}; publisher.settings.gaxOpts = callOptions; - queue._publish(messages, callbacks); + void queue._publish(messages, callbacks); const [{gaxOpts}] = stub.lastCall.args; assert.strictEqual(gaxOpts, callOptions); @@ -279,7 +280,7 @@ describe('Message Queues', () => { }); it('should set a timeout to publish if need be', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const stub = sandbox.stub(queue, 'publish').resolves(); const maxMilliseconds = 1234; @@ -293,7 +294,7 @@ describe('Message Queues', () => { }); it('should noop if a timeout is already set', () => { - const clock = sandbox.useFakeTimers(); + const clock = TestUtils.useFakeTimers(sandbox); const stub = sandbox.stub(queue, 'publish').resolves(); const maxMilliseconds = 1234; @@ -308,33 +309,33 @@ describe('Message Queues', () => { }); describe('publish', () => { - it('should create a new batch', () => { + it('should create a new batch', async () => { const oldBatch = queue.batch; - queue.publish(); + await queue.publish(); assert.notStrictEqual(oldBatch, queue.batch); assert.ok(queue.batch instanceof FakeMessageBatch); assert.strictEqual(queue.batch.options, queue.batchOptions); }); - it('should cancel any pending publish calls', () => { + it('should cancel any pending publish calls', async () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any const fakeHandle = 1234 as unknown as any; const stub = sandbox.stub(global, 'clearTimeout').withArgs(fakeHandle); queue.pending = fakeHandle; - queue.publish(); + await queue.publish(); assert.strictEqual(stub.callCount, 1); assert.strictEqual(queue.pending, undefined); }); - it('should publish the messages', () => { + it('should publish the messages', async () => { const batch = queue.batch; const stub = sandbox.stub(queue, '_publish'); - queue.publish(); + await queue.publish(); const [messages, callbacks] = stub.lastCall.args; assert.strictEqual(messages, batch.messages); @@ -366,7 +367,7 @@ describe('Message Queues', () => { queue.batch = new FakeMessageBatch(); queue.batch.messages = fakeMessages; queue.batch.callbacks = spies; - queue.publishDrain().then(() => { + void queue.publishDrain().then(() => { process.nextTick(() => { assert.strictEqual(stub.callCount, 2); done(); @@ -374,7 +375,7 @@ describe('Message Queues', () => { }); }); - it('should not begin another publish(non-drain) if there are pending batches', () => { + it('should not begin another publish(non-drain) if there are pending batches', async () => { const stub = sandbox.stub(queue, '_publish'); let once = false; stub.callsFake(async () => { @@ -391,9 +392,9 @@ describe('Message Queues', () => { queue.batch = new FakeMessageBatch(); queue.batch.messages = fakeMessages; queue.batch.callbacks = spies; - queue.publish().then(() => { - assert.strictEqual(stub.callCount, 1); - }); + await queue.publish(); + + assert.strictEqual(stub.callCount, 1); }); it('should emit "drain" if there is nothing left to publish', done => { @@ -401,7 +402,7 @@ describe('Message Queues', () => { sandbox.stub(queue, '_publish').callsFake(async () => {}); queue.on('drain', spy); - queue.publish().then(() => { + void queue.publish().then(() => { process.nextTick(() => { assert.strictEqual(spy.callCount, 1); done(); @@ -582,7 +583,7 @@ describe('Message Queues', () => { beforeEach(() => { queue.batchOptions = {maxMilliseconds}; - clock = sinon.useFakeTimers(); + clock = TestUtils.useFakeTimers(sandbox); }); afterEach(() => { @@ -660,7 +661,7 @@ describe('Message Queues', () => { }); it('should set inFlight to true', () => { - queue.publish(); + void queue.publish(); assert.strictEqual(queue.inFlight, true); }); @@ -669,7 +670,7 @@ describe('Message Queues', () => { const stub = sandbox.stub(global, 'clearTimeout'); queue.pending = fakeHandle; - queue.publish(); + void queue.publish(); const [handle] = stub.lastCall.args; assert.strictEqual(handle, fakeHandle); @@ -679,15 +680,15 @@ describe('Message Queues', () => { it('should remove the oldest batch from the batch list', () => { const oldestBatch = queue.currentBatch; - queue.publish(); + void queue.publish(); assert.notStrictEqual(queue.currentBatch, oldestBatch); }); - it('should publish the batch', () => { + it('should publish the batch', async () => { const stub = sandbox.stub(queue, '_publish'); - queue.publish(); + await queue.publish(); const [messages, callbacks] = stub.lastCall.args; assert.strictEqual(messages, fakeMessages); diff --git a/handwritten/pubsub/test/publisher/publish-error.ts b/handwritten/pubsub/test/publisher/publish-error.ts index 2d2cd71cd2b..f7502beb5de 100644 --- a/handwritten/pubsub/test/publisher/publish-error.ts +++ b/handwritten/pubsub/test/publisher/publish-error.ts @@ -36,7 +36,7 @@ describe('PublishError', () => { it('should give a helpful message', () => { assert.strictEqual( error.message, - `Unable to publish for key "${orderingKey}". Reason: ${fakeError.message}` + `Unable to publish for key "${orderingKey}". Reason: ${fakeError.message}`, ); }); diff --git a/handwritten/pubsub/test/pubsub.ts b/handwritten/pubsub/test/pubsub.ts index d0dd97bcf47..facc216299c 100644 --- a/handwritten/pubsub/test/pubsub.ts +++ b/handwritten/pubsub/test/pubsub.ts @@ -43,7 +43,7 @@ let subscriptionOverride: any; function Subscription( pubsub: pubsubTypes.PubSub, name: string, - options: subby.SubscriptionOptions + options: subby.SubscriptionOptions, ) { const overrideFn = subscriptionOverride || subscriptionCached; return new overrideFn(pubsub, name, options); @@ -59,7 +59,7 @@ const fakeUtil = Object.assign({}, util, { promisifySome( class_: Function, classProtos: object, - methods: string[] + methods: string[], ): void { if (class_.name === 'PubSub') { promisified = true; @@ -312,7 +312,7 @@ describe('PubSub', () => { const pubsub = new PubSub(options); assert.strictEqual( tracing.isEnabled(), - tracing.OpenTelemetryLevel.Modern + tracing.OpenTelemetryLevel.Modern, ); }); @@ -356,6 +356,34 @@ describe('PubSub', () => { it('should set isEmulator to false by default', () => { assert.strictEqual(pubsub.isEmulator, false); }); + + describe('tracing', () => { + beforeEach(() => { + tracing.setGloballyEnabled(false); + }); + afterEach(() => { + tracing.setGloballyEnabled(false); + }); + it('should not enable OTel when tracing is disabled', () => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const _pubsub = new PubSub({}); + assert.strictEqual( + tracing.isEnabled(), + tracing.OpenTelemetryLevel.None, + ); + }); + + it('should enable OTel when tracing is enabled through constructor', () => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const _pubsub = new PubSub({ + enableOpenTelemetryTracing: true, + }); + assert.strictEqual( + tracing.isEnabled(), + tracing.OpenTelemetryLevel.Modern, + ); + }); + }); }); describe('createSubscription', () => { @@ -474,7 +502,7 @@ describe('PubSub', () => { const expectedBody = Object.assign( {topic: TOPIC.name, name: SUB_NAME}, - options + options, ); pubsub.topic = () => { @@ -549,7 +577,7 @@ describe('PubSub', () => { TOPIC, SUB_NAME, fakeMetadata, - assert.ifError + assert.ifError, ); }); @@ -571,7 +599,7 @@ describe('PubSub', () => { function callback( err?: Error | null, sub?: subby.Subscription | null, - resp?: google.pubsub.v1.ISubscription | null + resp?: google.pubsub.v1.ISubscription | null, ) { assert.strictEqual(err, error); assert.strictEqual(sub, null); @@ -607,7 +635,7 @@ describe('PubSub', () => { function callback( err?: Error | null, sub?: subby.Subscription | null, - resp?: google.pubsub.v1.ISubscription | null + resp?: google.pubsub.v1.ISubscription | null, ) { assert.ifError(err); assert.strictEqual(sub, subscription); @@ -631,7 +659,7 @@ describe('PubSub', () => { const [sub, resp] = await pubsub.createSubscription!( TOPIC_NAME, - SUB_NAME + SUB_NAME, )!; assert.strictEqual(sub.name.includes('{{'), false); assert.strictEqual(resp, apiResponse); @@ -1025,7 +1053,7 @@ describe('PubSub', () => { { autoPaginate: options.autoPaginate, }, - options.gaxOpts + options.gaxOpts, ); delete expectedOptions.gaxOpts; @@ -1057,7 +1085,7 @@ describe('PubSub', () => { assert.strictEqual( // eslint-disable-next-line @typescript-eslint/no-explicit-any (snapshots![0] as any).metadata, - apiResponse.snapshots[0] + apiResponse.snapshots[0], ); done(); }); @@ -1111,7 +1139,7 @@ describe('PubSub', () => { { autoPaginate: options.autoPaginate, }, - options.gaxOpts + options.gaxOpts, ); const project = 'projects/' + pubsub.projectId; @@ -1146,12 +1174,12 @@ describe('PubSub', () => { pubsub.getSubscriptions?.( ( err: gax.grpc.ServiceError | null, - subscriptions?: subby.Subscription[] | null + subscriptions?: subby.Subscription[] | null, ) => { assert.ifError(err); assert(subscriptions![0] instanceof subscriptionCached); done(); - } + }, ); }); @@ -1169,13 +1197,13 @@ describe('PubSub', () => { ( err: gax.grpc.ServiceError | null, subs?: subby.Subscription[] | null, - apiResponse?: google.pubsub.v1.IListSubscriptionsResponse | null + apiResponse?: google.pubsub.v1.IListSubscriptionsResponse | null, ) => { assert.strictEqual(err, err_); assert.deepStrictEqual(subs, subs_); assert.strictEqual(apiResponse, nextQuery_); done(); - } + }, ); }); @@ -1255,7 +1283,7 @@ describe('PubSub', () => { { autoPaginate: options.autoPaginate, }, - options.gaxOpts + options.gaxOpts, ); delete expectedOptions.gaxOpts; @@ -1339,7 +1367,7 @@ describe('PubSub', () => { assert.notStrictEqual(errInner, null); assert.strictEqual( errInner!.message.indexOf('closed PubSub object') >= 0, - true + true, ); done(); }); @@ -1373,7 +1401,7 @@ describe('PubSub', () => { (fakeClient as any).fakeMethod = ( // eslint-disable-next-line @typescript-eslint/no-explicit-any reqOpts: any, - gaxOpts: gax.CallOptions + gaxOpts: gax.CallOptions, ) => { assert.deepStrictEqual(CONFIG.reqOpts, reqOpts); assert.deepStrictEqual(CONFIG.gaxOpts, gaxOpts); @@ -1501,7 +1529,7 @@ describe('PubSub', () => { it('should return the correct client', async () => { // tslint:disable-next-line only-arrow-functions no-any v1ClientOverrides.FakeClient = function ( - options: pubsubTypes.ClientConfig + options: pubsubTypes.ClientConfig, ) { assert.strictEqual(options, pubsub.options); return FAKE_CLIENT_INSTANCE; @@ -1663,7 +1691,7 @@ describe('PubSub', () => { // tslint:disable-next-line only-arrow-functions subscriptionOverride = function ( pubsub: pubsubTypes.PubSub, - name: string + name: string, ) { assert.strictEqual(name, SUB_NAME); done(); @@ -1676,7 +1704,7 @@ describe('PubSub', () => { subscriptionOverride = function ( pubsub: pubsubTypes.PubSub, name: string, - options: subby.SubscriptionOptions + options: subby.SubscriptionOptions, ) { assert.strictEqual(options, CONFIG); done(); diff --git a/handwritten/pubsub/test/pull-retry.ts b/handwritten/pubsub/test/pull-retry.ts index e5b2523d838..b2f6a711862 100644 --- a/handwritten/pubsub/test/pull-retry.ts +++ b/handwritten/pubsub/test/pull-retry.ts @@ -65,7 +65,7 @@ describe('PullRetry', () => { assert.ok( PullRetry.resetFailures({ code: grpc.status.OK, - } as grpc.StatusObject) + } as grpc.StatusObject), ); }); @@ -73,7 +73,7 @@ describe('PullRetry', () => { assert.ok( PullRetry.resetFailures({ code: grpc.status.DEADLINE_EXCEEDED, - } as grpc.StatusObject) + } as grpc.StatusObject), ); }); }); diff --git a/handwritten/pubsub/test/snapshot.ts b/handwritten/pubsub/test/snapshot.ts index 2ebe8865da9..5e5da3efec7 100644 --- a/handwritten/pubsub/test/snapshot.ts +++ b/handwritten/pubsub/test/snapshot.ts @@ -28,7 +28,7 @@ const fakeUtil = Object.assign({}, util, { promisifySome( class_: Function, classProtos: object, - methods: string[] + methods: string[], ): void { if (class_.name === 'Snapshot') { promisified = true; @@ -197,14 +197,14 @@ describe('Snapshot', () => { it('should throw on create method', async () => { await assert.rejects( () => snapshot.create(), - /This is only available if you accessed this object through Subscription#snapshot/ + /This is only available if you accessed this object through Subscription#snapshot/, ); }); it('should throw on seek method', async () => { await assert.rejects( () => snapshot.seek(), - /This is only available if you accessed this object through Subscription#snapshot/ + /This is only available if you accessed this object through Subscription#snapshot/, ); }); }); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 7ab85ab67be..df95cc1b94a 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -150,7 +150,7 @@ class FakeMessageStream extends PassThrough { // eslint-disable-next-line @typescript-eslint/no-unused-vars _error: Error | null, // eslint-disable-next-line @typescript-eslint/no-unused-vars - _callback: (error: Error | null) => void + _callback: (error: Error | null) => void, ): void {} async start() {} } @@ -234,9 +234,9 @@ describe('Subscriber', () => { subscriber.open(); }); - afterEach(() => { + afterEach(async () => { sandbox.restore(); - subscriber.close(); + await subscriber.close(); tracing.setGloballyEnabled(false); }); @@ -259,12 +259,14 @@ describe('Subscriber', () => { }); it('should set any options passed in', () => { - const stub = sandbox.stub(Subscriber.prototype, 'setOptions'); - const fakeOptions = {}; - new Subscriber(subscription, fakeOptions); - - const [options] = stub.lastCall.args; - assert.strictEqual(options, fakeOptions); + const options = { + streamingOptions: {}, + }; + const subscriber = new Subscriber(subscription, options); + assert.strictEqual( + subscriber.getOptions().streamingOptions, + options.streamingOptions, + ); }); }); @@ -410,7 +412,7 @@ describe('Subscriber', () => { }); describe('ack', () => { - it('should update the ack histogram/deadline', () => { + it('should update the ack histogram/deadline', async () => { const histogram: FakeHistogram = stubs.get('histogram'); const now = Date.now(); @@ -424,13 +426,13 @@ describe('Subscriber', () => { sandbox.stub(histogram, 'percentile').withArgs(99).returns(fakeDeadline); - subscriber.ack(message); + await subscriber.ack(message); assert.strictEqual(addStub.callCount, 1); assert.strictEqual(subscriber.ackDeadline, fakeDeadline); }); - it('should bound ack deadlines if min/max are specified', () => { + it('should bound ack deadlines if min/max are specified', async () => { const histogram: FakeHistogram = stubs.get('histogram'); const now = Date.now(); @@ -449,7 +451,7 @@ describe('Subscriber', () => { subscriber.setOptions({ maxAckDeadline: Duration.from({seconds: 60}), }); - subscriber.ack(message); + await subscriber.ack(message); assert.strictEqual(addStub.callCount, 1); assert.strictEqual(subscriber.ackDeadline, 60); @@ -458,13 +460,13 @@ describe('Subscriber', () => { minAckDeadline: Duration.from({seconds: 10}), }); fakeDeadline = 1; - subscriber.ack(message); + await subscriber.ack(message); assert.strictEqual(subscriber.ackDeadline, 10); }); - it('should default to 60s min for exactly-once delivery subscriptions', () => { - subscriber.subscriptionProperties = {exactlyOnceDeliveryEnabled: true}; + it('should default to 60s min for exactly-once delivery subscriptions', async () => { + subscriber.setSubscriptionProperties({exactlyOnceDeliveryEnabled: true}); const histogram: FakeHistogram = stubs.get('histogram'); const now = Date.now(); @@ -478,7 +480,7 @@ describe('Subscriber', () => { const fakeDeadline = 10; sandbox.stub(histogram, 'percentile').withArgs(99).returns(fakeDeadline); - subscriber.ack(message); + await subscriber.ack(message); assert.strictEqual(addStub.callCount, 1); assert.strictEqual(subscriber.ackDeadline, 60); @@ -487,7 +489,7 @@ describe('Subscriber', () => { subscriber.setOptions({ minAckDeadline: Duration.from({seconds: 5}), }); - subscriber.ack(message); + await subscriber.ack(message); assert.strictEqual(subscriber.ackDeadline, 10); }); @@ -501,11 +503,13 @@ describe('Subscriber', () => { sandbox.stub(histogram, 'add').throws(); sandbox.stub(histogram, 'percentile').throws(); + const deadlineTime = Duration.from({seconds: ackDeadline}); subscriber.setOptions({ - ackDeadline, + minAckDeadline: deadlineTime, + maxAckDeadline: deadlineTime, flowControl: {maxMessages: maxMessages, maxBytes: maxBytes}, }); - subscriber.ack(message); + void subscriber.ack(message); assert.strictEqual(subscriber.ackDeadline, ackDeadline); }); @@ -514,7 +518,7 @@ describe('Subscriber', () => { const ackQueue: FakeAckQueue = stubs.get('ackQueue'); const stub = sandbox.stub(ackQueue, 'add').withArgs(message); - subscriber.ack(message); + void subscriber.ack(message); assert.strictEqual(stub.callCount, 1); }); @@ -533,7 +537,7 @@ describe('Subscriber', () => { done(); }); - subscriber.ack(message); + void subscriber.ack(message); }); }); @@ -549,16 +553,16 @@ describe('Subscriber', () => { return s.close(); }); - it('should set isOpen to false', () => { - subscriber.close(); + it('should set isOpen to false', async () => { + await subscriber.close(); assert.strictEqual(subscriber.isOpen, false); }); - it('should destroy the message stream', () => { + it('should destroy the message stream', async () => { const stream: FakeMessageStream = stubs.get('messageStream'); const stub = sandbox.stub(stream, 'destroy'); - subscriber.close(); + await subscriber.close(); assert.strictEqual(stub.callCount, 1); }); @@ -575,16 +579,16 @@ describe('Subscriber', () => { it('should emit a close event', done => { subscriber.on('close', done); - subscriber.close(); + void subscriber.close(); }); - it('should nack any messages that come in after', () => { + it('should nack any messages that come in after', async () => { const stream: FakeMessageStream = stubs.get('messageStream'); const stub = sandbox.stub(subscriber, 'nack'); const shutdownStub = sandbox.stub(tracing.PubsubEvents, 'shutdown'); const pullResponse = {receivedMessages: [RECEIVED_MESSAGE]}; - subscriber.close(); + await subscriber.close(); stream.emit('data', pullResponse); const [{ackId}] = stub.lastCall.args; @@ -666,7 +670,7 @@ describe('Subscriber', () => { const modAckQueue: FakeModAckQueue = stubs.get('modAckQueue'); const stub = sandbox.stub(modAckQueue, 'add').withArgs(message, deadline); - subscriber.modAck(message, deadline); + void subscriber.modAck(message, deadline); assert.strictEqual(stub.callCount, 1); }); @@ -847,10 +851,13 @@ describe('Subscriber', () => { beforeEach(() => subscriber.close()); it('should capture the ackDeadline', () => { - const ackDeadline = 1232; + const ackDeadline = Duration.from({seconds: 1232}); - subscriber.setOptions({ackDeadline}); - assert.strictEqual(subscriber.ackDeadline, ackDeadline); + subscriber.setOptions({ + minAckDeadline: ackDeadline, + maxAckDeadline: ackDeadline, + }); + assert.strictEqual(subscriber.ackDeadline, ackDeadline.totalOf('second')); }); it('should not set maxStreams higher than maxMessages', () => { @@ -867,51 +874,22 @@ describe('Subscriber', () => { }); describe('OpenTelemetry tracing', () => { - const enableTracing: s.SubscriberOptions = { - enableOpenTelemetryTracing: true, - }; - const disableTracing: s.SubscriberOptions = { - enableOpenTelemetryTracing: false, - }; - beforeEach(() => { exporter.reset(); }); - afterEach(() => { + afterEach(async () => { + tracing.setGloballyEnabled(false); exporter.reset(); - subscriber.close(); - }); - - it('should not instantiate a tracer when tracing is disabled', () => { - subscriber = new Subscriber(subscription, {}); - assert.strictEqual(subscriber['_useLegacyOpenTelemetry'], false); - }); - - it('should instantiate a tracer when tracing is enabled through constructor', () => { - subscriber = new Subscriber(subscription, enableTracing); - assert.ok(subscriber['_useLegacyOpenTelemetry']); - }); - - it('should instantiate a tracer when tracing is enabled through setOptions', () => { - subscriber = new Subscriber(subscription, {}); - subscriber.setOptions(enableTracing); - assert.ok(subscriber['_useLegacyOpenTelemetry']); - }); - - it('should disable tracing when tracing is disabled through setOptions', () => { - subscriber = new Subscriber(subscription, enableTracing); - subscriber.setOptions(disableTracing); - assert.strictEqual(subscriber['_useLegacyOpenTelemetry'], false); + await subscriber.close(); }); it('exports a span once it is created', () => { tracing.setGloballyEnabled(true); subscription = new FakeSubscription() as {} as Subscription; - subscriber = new Subscriber(subscription, enableTracing); + subscriber = new Subscriber(subscription, {}); message = new Message(subscriber, RECEIVED_MESSAGE); - assert.strictEqual(subscriber['_useLegacyOpenTelemetry'], true); subscriber.open(); // Construct mock of received message with span context @@ -920,12 +898,14 @@ describe('Subscriber', () => { spanId: '6e0c63257de34c92', traceFlags: opentelemetry.TraceFlags.SAMPLED, }; + const parentSpan = opentelemetry.trace.getSpan( + tracing.spanContextToContext(parentSpanContext)!, + ); const messageWithSpanContext = { ackId: uuid.v4(), message: { attributes: { - googclient_OpenTelemetrySpanContext: - JSON.stringify(parentSpanContext), + [tracing.modernAttributeName]: JSON.stringify(parentSpanContext), }, data: Buffer.from('Hello, world!'), messageId: uuid.v4(), @@ -933,6 +913,7 @@ describe('Subscriber', () => { publishTime: {seconds: 12, nanos: 32}, }, }; + tracing.injectSpan(parentSpan!, messageWithSpanContext.message); const pullResponse: s.PullResponse = { receivedMessages: [messageWithSpanContext], }; @@ -957,19 +938,19 @@ describe('Subscriber', () => { assert.strictEqual( firstSpan.name, `${subId} subscribe`, - 'name of span should match' + 'name of span should match', ); assert.strictEqual( firstSpan.kind, SpanKind.CONSUMER, - 'span kind should be CONSUMER' + 'span kind should be CONSUMER', ); }); it('exports a span even when a span context is not present on message', () => { tracing.setGloballyEnabled(true); - subscriber = new Subscriber(subscription, enableTracing); + subscriber = new Subscriber(subscription, {}); subscriber.open(); const pullResponse: s.PullResponse = { @@ -999,7 +980,7 @@ describe('Subscriber', () => { it('should localize attributes', () => { assert.strictEqual( message.attributes, - RECEIVED_MESSAGE.message.attributes + RECEIVED_MESSAGE.message.attributes, ); }); @@ -1014,7 +995,7 @@ describe('Subscriber', () => { it('should localize orderingKey', () => { assert.strictEqual( message.orderingKey, - RECEIVED_MESSAGE.message.orderingKey + RECEIVED_MESSAGE.message.orderingKey, ); }); @@ -1025,7 +1006,7 @@ describe('Subscriber', () => { assert(timestamp instanceof FakePreciseDate); assert.strictEqual( timestamp.value, - RECEIVED_MESSAGE.message.publishTime + RECEIVED_MESSAGE.message.publishTime, ); }); diff --git a/handwritten/pubsub/test/subscription.ts b/handwritten/pubsub/test/subscription.ts index 77717f61734..aee0a9f90cf 100644 --- a/handwritten/pubsub/test/subscription.ts +++ b/handwritten/pubsub/test/subscription.ts @@ -31,7 +31,7 @@ const fakeUtil = Object.assign({}, util, { promisifySome( class_: Function, classProtos: object, - methods: string[] + methods: string[], ): void { if (class_.name === 'Subscription') { promisified = true; @@ -254,7 +254,7 @@ describe('Subscription', () => { assert.strictEqual( formatted.messageRetentionDuration!.seconds, - threeDaysInSeconds + threeDaysInSeconds, ); }); @@ -270,7 +270,7 @@ describe('Subscription', () => { assert.strictEqual(formatted.pushConfig!.pushEndpoint, pushEndpoint); assert.strictEqual( (formatted as subby.SubscriptionMetadata).pushEndpoint, - undefined + undefined, ); }); @@ -289,7 +289,7 @@ describe('Subscription', () => { assert.strictEqual(formatted.pushConfig!.oidcToken, oidcToken); assert.strictEqual( (formatted as subby.SubscriptionMetadata).oidcToken, - undefined + undefined, ); }); @@ -311,13 +311,13 @@ describe('Subscription', () => { assert.strictEqual(formatted.pushConfig!.pushEndpoint, pushEndpoint); assert.strictEqual( (formatted as subby.SubscriptionMetadata).pushEndpoint, - undefined + undefined, ); assert.strictEqual(formatted.pushConfig!.oidcToken, oidcToken); assert.strictEqual( (formatted as subby.SubscriptionMetadata).oidcToken, - undefined + undefined, ); }); }); @@ -981,7 +981,7 @@ describe('Subscription', () => { { name: SUB_FULL_NAME, }, - formattedMetadata + formattedMetadata, ); Subscription.formatMetadata_ = metadata => { diff --git a/handwritten/pubsub/test/telemetry-tracing.ts b/handwritten/pubsub/test/telemetry-tracing.ts index d624a6146b3..2bff66e304b 100644 --- a/handwritten/pubsub/test/telemetry-tracing.ts +++ b/handwritten/pubsub/test/telemetry-tracing.ts @@ -82,7 +82,7 @@ describe('OpenTelemetryTracer', () => { const span = otel.PubsubSpans.createPublisherSpan( message, 'projects/test/topics/topicfoo', - 'tests' + 'tests', ) as trace.Span; span.end(); @@ -101,78 +101,66 @@ describe('OpenTelemetryTracer', () => { const span = otel.PubsubSpans.createPublisherSpan( message, 'projects/test/topics/topicfoo', - 'tests' + 'tests', ) as trace.Span; - otel.injectSpan(span, message, otel.OpenTelemetryLevel.Modern); + otel.injectSpan(span, message); assert.strictEqual( Object.getOwnPropertyNames(message.attributes).includes( - otel.modernAttributeName + otel.modernAttributeName, ), - true + true, ); }); }); describe('context propagation', () => { - it('injects a trace context and legacy baggage', () => { + it('injects a trace context', () => { const message: PubsubMessage = { attributes: {}, }; const span = otel.PubsubSpans.createPublisherSpan( message, 'projects/test/topics/topicfoo', - 'tests' + 'tests', ); assert.ok(span); - otel.injectSpan(span, message, otel.OpenTelemetryLevel.Legacy); + otel.injectSpan(span, message); assert.strictEqual( Object.getOwnPropertyNames(message.attributes).includes( - otel.modernAttributeName - ), - true - ); - assert.strictEqual( - Object.getOwnPropertyNames(message.attributes).includes( - otel.legacyAttributeName + otel.modernAttributeName, ), - true + true, ); }); it('should issue a warning if OpenTelemetry span context key is set', () => { const message: PubsubMessage = { attributes: { - [otel.legacyAttributeName]: 'foobar', [otel.modernAttributeName]: 'bazbar', }, }; const span = otel.PubsubSpans.createPublisherSpan( message, 'projects/test/topics/topicfoo', - 'tests' + 'tests', ); assert.ok(span); const warnSpy = sinon.spy(console, 'warn'); try { - otel.injectSpan(span, message, otel.OpenTelemetryLevel.Legacy); - assert.strictEqual(warnSpy.callCount, 2); + otel.injectSpan(span, message); + assert.strictEqual(warnSpy.callCount, 1); } finally { warnSpy.restore(); } }); it('should be able to determine if attributes are present', () => { - let message: otel.MessageWithAttributes = { - attributes: { - [otel.legacyAttributeName]: 'foobar', - }, - }; - assert.strictEqual(otel.containsSpanContext(message), true); + let message: otel.MessageWithAttributes; message = { attributes: { @@ -196,11 +184,10 @@ describe('OpenTelemetryTracer', () => { const childSpan = otel.extractSpan( message, 'projects/test/subscriptions/subfoo', - otel.OpenTelemetryLevel.Modern ); assert.strictEqual( childSpan!.spanContext().traceId, - 'd4cda95b652f4a1592b449d5929fda1b' + 'd4cda95b652f4a1592b449d5929fda1b', ); }); }); @@ -224,7 +211,7 @@ describe('OpenTelemetryTracer', () => { const topicAttrs = otel.PubsubSpans.createAttributes( topicInfo, message, - 'tests' + 'tests', ); assert.deepStrictEqual(topicAttrs, { 'messaging.system': 'gcp_pubsub', @@ -247,7 +234,7 @@ describe('OpenTelemetryTracer', () => { const topicAttrs2 = otel.PubsubSpans.createAttributes( topicInfo, message, - 'tests' + 'tests', ); assert.deepStrictEqual(topicAttrs2, { 'messaging.system': 'gcp_pubsub', @@ -285,7 +272,7 @@ describe('OpenTelemetryTracer', () => { const span = otel.PubsubSpans.createPublisherSpan( tests.message, tests.topicInfo.topicName!, - 'tests' + 'tests', ); assert.ok(span); span.end(); @@ -298,11 +285,11 @@ describe('OpenTelemetryTracer', () => { assert.strictEqual(firstSpan.name, `${tests.topicInfo.topicId} create`); assert.strictEqual( firstSpan.attributes['messaging.destination.name'], - tests.topicInfo.topicId + tests.topicInfo.topicId, ); assert.strictEqual( firstSpan.attributes['messaging.system'], - 'gcp_pubsub' + 'gcp_pubsub', ); }); @@ -310,12 +297,12 @@ describe('OpenTelemetryTracer', () => { const span = otel.PubsubSpans.createPublisherSpan( tests.message, tests.topicInfo.topicName!, - 'tests' + 'tests', ); assert.ok(span); otel.PubsubSpans.updatePublisherTopicName( span, - 'projects/foo/topics/other' + 'projects/foo/topics/other', ); span.end(); @@ -328,7 +315,7 @@ describe('OpenTelemetryTracer', () => { assert.strictEqual( firstSpan.attributes['messaging.destination.name'], - 'other' + 'other', ); }); @@ -336,14 +323,14 @@ describe('OpenTelemetryTracer', () => { const parentSpan = otel.PubsubSpans.createPublisherSpan( tests.message, tests.topicInfo.topicName!, - 'tests' + 'tests', ); assert.ok(parentSpan); const span = otel.PubsubSpans.createReceiveSpan( tests.message, tests.subInfo.subName!, otel.spanContextToContext(parentSpan.spanContext()), - 'tests' + 'tests', ); assert.ok(span); span.end(); @@ -357,7 +344,7 @@ describe('OpenTelemetryTracer', () => { assert.strictEqual(childReadSpan.name, 'sub subscribe'); assert.strictEqual( childReadSpan.attributes['messaging.destination.name'], - 'sub' + 'sub', ); assert.strictEqual(childReadSpan.kind, SpanKind.CONSUMER); assert.ok(childReadSpan.parentSpanId); @@ -369,7 +356,7 @@ describe('OpenTelemetryTracer', () => { const span = otel.PubsubSpans.createPublisherSpan( message, topicName, - 'test' + 'test', ) as trace.Span; message.parentSpan = span; span.end(); @@ -377,7 +364,7 @@ describe('OpenTelemetryTracer', () => { const publishSpan = otel.PubsubSpans.createPublishRpcSpan( [message], topicName, - 'test' + 'test', ); publishSpan?.end(); @@ -388,7 +375,7 @@ describe('OpenTelemetryTracer', () => { assert.strictEqual( publishReadSpan.attributes['messaging.batch.message_count'], - 1 + 1, ); assert.strictEqual(publishReadSpan.links.length, 1); assert.strictEqual(childReadSpan.links.length, 1); diff --git a/handwritten/pubsub/test/test-utils.ts b/handwritten/pubsub/test/test-utils.ts new file mode 100644 index 00000000000..c1eb6b4e618 --- /dev/null +++ b/handwritten/pubsub/test/test-utils.ts @@ -0,0 +1,53 @@ +// Copyright 2025 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {SinonSandbox, SinonFakeTimers} from 'sinon'; + +type FakeTimersParam = Parameters[0]; +interface FakeTimerConfig { + now?: number; + toFake?: string[]; +} + +/** + * Utilities for unit test code. + * + * @private + */ +export class TestUtils { + /** + * This helper should be used to enable fake timers for Sinon sandbox. + * + * @param sandbox The sandbox + * @param now An optional date to set for "now" + * @returns The clock object from useFakeTimers() + */ + static useFakeTimers(sandbox: SinonSandbox, now?: number): SinonFakeTimers { + const config: FakeTimerConfig = { + toFake: [ + 'setTimeout', + 'clearTimeout', + 'setInterval', + 'clearInterval', + 'Date', + ], + }; + if (now) { + config.now = now; + } + + // The types are screwy in useFakeTimers(). I'm just going to pick one. + return sandbox.useFakeTimers(config as FakeTimersParam); + } +} diff --git a/handwritten/pubsub/test/topic.ts b/handwritten/pubsub/test/topic.ts index bdbb7c808bd..c918b21c64e 100644 --- a/handwritten/pubsub/test/topic.ts +++ b/handwritten/pubsub/test/topic.ts @@ -34,7 +34,7 @@ const fakeUtil = Object.assign({}, util, { promisifySome( class_: Function, classProtos: object, - methods: string[] + methods: string[], ): void { if (class_.name === 'Topic') { promisified = true; @@ -196,7 +196,7 @@ describe('Topic', () => { it('should format name', () => { const formattedName = Topic.formatName_( PROJECT_ID, - TOPIC_UNFORMATTED_NAME + TOPIC_UNFORMATTED_NAME, ); assert.strictEqual(formattedName, TOPIC_NAME); }); @@ -229,7 +229,7 @@ describe('Topic', () => { PUBSUB.createSubscription = ( topic_: Topic, name: string, - options: CreateSubscriptionOptions + options: CreateSubscriptionOptions, ) => { assert.strictEqual(topic_, topic); assert.strictEqual(name, NAME); @@ -288,7 +288,7 @@ describe('Topic', () => { beforeEach(() => { topic.getMetadata = ( gaxOpts: CallOptions, - callback: RequestCallback + callback: RequestCallback, ) => { callback(null, fakeMetadata); }; @@ -301,7 +301,7 @@ describe('Topic', () => { assert.strictEqual(_topic, topic); assert.strictEqual(resp, fakeMetadata); done(); - } + }, ); }); @@ -324,7 +324,7 @@ describe('Topic', () => { topic.getMetadata = ( gaxOpts: CallOptions, - callback: GetTopicMetadataCallback + callback: GetTopicMetadataCallback, ) => { callback(error, apiResponse); }; @@ -335,7 +335,7 @@ describe('Topic', () => { assert.strictEqual(_topic, null); assert.strictEqual(resp, apiResponse); done(); - } + }, ); }); @@ -345,7 +345,7 @@ describe('Topic', () => { topic.getMetadata = ( gaxOpts: CallOptions, - callback: GetTopicMetadataCallback + callback: GetTopicMetadataCallback, ) => { callback(error, apiResponse); }; @@ -356,7 +356,7 @@ describe('Topic', () => { assert.strictEqual(_topic, null); assert.strictEqual(resp, apiResponse); done(); - } + }, ); }); @@ -370,7 +370,7 @@ describe('Topic', () => { topic.getMetadata = ( gaxOpts: CallOptions, - callback: GetTopicMetadataCallback + callback: GetTopicMetadataCallback, ) => { callback(error, apiResponse); }; @@ -455,7 +455,7 @@ describe('Topic', () => { topic.request = ( config: RequestConfig, - callback: GetTopicMetadataCallback + callback: GetTopicMetadataCallback, ) => { callback(error, apiResponse); }; @@ -472,7 +472,7 @@ describe('Topic', () => { topic.request = ( config: RequestConfig, - callback: GetTopicMetadataCallback + callback: GetTopicMetadataCallback, ) => { callback(null, apiResponse); }; @@ -509,14 +509,14 @@ describe('Topic', () => { { topic: topic.name, }, - options + options, ); const expectedGaxOpts = Object.assign( { autoPaginate: options.autoPaginate, }, - options.gaxOpts + options.gaxOpts, ); delete expectedOptions.gaxOpts; @@ -554,7 +554,7 @@ describe('Topic', () => { topic.request = ( config: RequestConfig, - callback: RequestCallback + callback: RequestCallback, ) => { callback(null, fakeSubs); }; @@ -590,7 +590,7 @@ describe('Topic', () => { assert.strictEqual(nextQuery, nextQuery_); assert.strictEqual(apiResponse, apiResponse_); done(); - } + }, ); }); }); @@ -746,7 +746,7 @@ describe('Topic', () => { topic.parent.subscription = ( name: string, - options: SubscriptionOptions + options: SubscriptionOptions, ) => { assert.strictEqual(name, subscriptionName); assert.deepStrictEqual(options, opts); @@ -759,7 +759,7 @@ describe('Topic', () => { it('should attach the topic instance to the options', done => { topic.parent.subscription = ( name: string, - options: SubscriptionOptions + options: SubscriptionOptions, ) => { assert.strictEqual(options.topic, topic); done(); diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index c78f1c884ef..51baa557260 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -12,8 +12,10 @@ "include": [ "src/*.ts", "src/**/*.ts", + "src/v1/*.json", "test/*.ts", "test/**/*.ts", - "system-test/*.ts" + "system-test/*.ts", + "protos/**/*.json" ] } From dddda4cf9e6453d65210947d77aeaddb1267956e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 28 Apr 2025 20:56:26 +0000 Subject: [PATCH 1064/1115] chore(main): release 5.0.0 (#2031) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [5.0.0](https://togithub.com/googleapis/nodejs-pubsub/compare/v4.11.0...v5.0.0) (2025-04-28) ### ⚠ BREAKING CHANGES * migrate to Node 18 ([#2024](https://togithub.com/googleapis/nodejs-pubsub/issues/2024)) * remove (broken) legacy OTel support * remove legacy ack deadline options * move maxExtension into subscriber options ### Miscellaneous Chores * Migrate to Node 18 ([#2024](https://togithub.com/googleapis/nodejs-pubsub/issues/2024)) ([9ad808a](https://togithub.com/googleapis/nodejs-pubsub/commit/9ad808adb99b6e64c2c4431991721deae14b6400)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- handwritten/pubsub/CHANGELOG.md | 14 ++++++++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 4cd47399dbc..558c6644428 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,20 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [5.0.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.11.0...v5.0.0) (2025-04-28) + + +### ⚠ BREAKING CHANGES + +* migrate to Node 18 ([#2024](https://github.com/googleapis/nodejs-pubsub/issues/2024)) +* remove (broken) legacy OTel support +* remove legacy ack deadline options +* move maxExtension into subscriber options + +### Miscellaneous Chores + +* Migrate to Node 18 ([#2024](https://github.com/googleapis/nodejs-pubsub/issues/2024)) ([9ad808a](https://github.com/googleapis/nodejs-pubsub/commit/9ad808adb99b6e64c2c4431991721deae14b6400)) + ## [4.11.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.10.0...v4.11.0) (2025-03-27) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2bbee45d080..c6d2c6e3c01 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "4.11.0", + "version": "5.0.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 0864e4f8caa69ac88d43f063831e435f4416ae8d Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 8 May 2025 17:52:04 -0400 Subject: [PATCH 1065/1115] feat: use specific W3CTraceContextPropagator for OTel (#2036) * feat: Use specific W3CTraceContextPropagator for OTel Replaces the use of the global OpenTelemetry propagator (propagation) with a specific instance of W3CTraceContextPropagator within the telemetry-tracing.ts module. This ensures that trace context propagation for Pub/Sub messages always uses the W3C format via the googclient_traceparent attribute, regardless of the global propagator configured by user code. This maintains consistent tracing behaviour as it moves between library instances as a Pub/Sub attribute. * chore: linting fixes * build: move @opentelemetry/core to deps to get the trace propagator --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> --- handwritten/pubsub/package.json | 2 +- handwritten/pubsub/src/telemetry-tracing.ts | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c6d2c6e3c01..fba718dc977 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -53,6 +53,7 @@ "@google-cloud/projectify": "^5.0.0", "@google-cloud/promisify": "^5.0.0", "@opentelemetry/api": "~1.9.0", + "@opentelemetry/core": "^1.30.1", "@opentelemetry/semantic-conventions": "~1.32.0", "arrify": "^2.0.0", "extend": "^3.0.2", @@ -65,7 +66,6 @@ }, "devDependencies": { "@grpc/proto-loader": "^0.7.13", - "@opentelemetry/core": "^1.17.0", "@opentelemetry/sdk-trace-base": "^1.17.0", "@types/duplexify": "^3.6.4", "@types/extend": "^3.0.4", diff --git a/handwritten/pubsub/src/telemetry-tracing.ts b/handwritten/pubsub/src/telemetry-tracing.ts index 137dfc38dd3..459ea7b984f 100644 --- a/handwritten/pubsub/src/telemetry-tracing.ts +++ b/handwritten/pubsub/src/telemetry-tracing.ts @@ -19,7 +19,6 @@ import { Span, context, trace, - propagation, SpanKind, TextMapGetter, TextMapSetter, @@ -27,6 +26,7 @@ import { Context, Link, } from '@opentelemetry/api'; +import {W3CTraceContextPropagator} from '@opentelemetry/core'; import {Attributes, PubsubMessage} from './publisher/pubsub-message'; import {Duration} from './temporal'; @@ -70,6 +70,14 @@ export enum OpenTelemetryLevel { Modern = 2, } +/** + * The W3C trace context propagator, used for injecting/extracting trace context. + * + * @private + * @internal + */ +const w3cTraceContextPropagator = new W3CTraceContextPropagator(); + // True if user code elsewhere wants to enable OpenTelemetry support. let globallyEnabled = false; @@ -749,7 +757,7 @@ export function injectSpan(span: Span, message: MessageWithAttributes): void { // Always do propagation injection with the trace context. const context = trace.setSpanContext(ROOT_CONTEXT, span.spanContext()); - propagation.inject(context, message, pubsubSetter); + w3cTraceContextPropagator.inject(context, message, pubsubSetter); // Also put the direct reference to the Span object for while we're // passing it around in the client library. @@ -802,7 +810,11 @@ export function extractSpan( let context: Context | undefined; if (keys.includes(modernAttributeName)) { - context = propagation.extract(ROOT_CONTEXT, message, pubsubGetter); + context = w3cTraceContextPropagator.extract( + ROOT_CONTEXT, + message, + pubsubGetter, + ); } const span = PubsubSpans.createReceiveSpan( From 6131e18d28c5c8a7936cd46175c2ca8001a03260 Mon Sep 17 00:00:00 2001 From: Amy Chisholm Date: Fri, 9 May 2025 13:50:11 -0700 Subject: [PATCH 1066/1115] fix: set messaging.operation in createAttributes (#2030) * apply messaging operation to createAttributes * fix: Set messaging.operation in createAttributes * chore: linting updates for src/telemetry-tracing.ts after the recent 5.0 merge * chore: linting updates for test/telemetry-tracing.ts after the recent 5.0 merge --------- Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/telemetry-tracing.ts | 25 +++++++++++++++----- handwritten/pubsub/test/telemetry-tracing.ts | 10 +++++++- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/handwritten/pubsub/src/telemetry-tracing.ts b/handwritten/pubsub/src/telemetry-tracing.ts index 459ea7b984f..e6f44b0d2fb 100644 --- a/handwritten/pubsub/src/telemetry-tracing.ts +++ b/handwritten/pubsub/src/telemetry-tracing.ts @@ -305,6 +305,7 @@ export class PubsubSpans { params: AttributeParams, message?: PubsubMessage, caller?: string, + operation?: string, ): SpanAttributes { const destinationName = params.topicName ?? params.subName; const destinationId = params.topicId ?? params.subId; @@ -351,6 +352,9 @@ export class PubsubSpans { if (message.ackId) { spanAttributes['messaging.gcp_pubsub.message.ack_id'] = message.ackId; } + if (operation) { + spanAttributes['messaging.operation'] = operation; + } } return spanAttributes; @@ -368,11 +372,15 @@ export class PubsubSpans { const topicInfo = getTopicInfo(topicName); const span: Span = getTracer().startSpan(`${topicName} create`, { kind: SpanKind.PRODUCER, - attributes: PubsubSpans.createAttributes(topicInfo, message, caller), + attributes: PubsubSpans.createAttributes( + topicInfo, + message, + caller, + 'create', + ), }); if (topicInfo.topicId) { span.updateName(`${topicInfo.topicId} create`); - span.setAttribute('messaging.operation', 'create'); span.setAttribute('messaging.destination.name', topicInfo.topicId); } @@ -404,10 +412,14 @@ export class PubsubSpans { const subInfo = getSubscriptionInfo(subName); const name = `${subInfo.subId ?? subName} subscribe`; - const attributes = this.createAttributes(subInfo, message, caller); + const attributes = this.createAttributes( + subInfo, + message, + caller, + 'receive', + ); if (subInfo.subId) { attributes['messaging.destination.name'] = subInfo.subId; - attributes['messaging.operation'] = 'receive'; } if (context) { @@ -473,6 +485,7 @@ export class PubsubSpans { getTopicInfo(topicName), undefined, caller, + 'create', ); const links: Link[] = messages .filter(m => m.parentSpan && isSampled(m.parentSpan)) @@ -515,6 +528,7 @@ export class PubsubSpans { subInfo, undefined, caller, + 'receive', ); const links: Link[] = messageSpans .filter(m => m && isSampled(m)) @@ -531,7 +545,6 @@ export class PubsubSpans { ); span?.setAttribute('messaging.batch.message_count', messageSpans.length); - span?.setAttribute('messaging.operation', 'receive'); if (span) { // Also attempt to link from the subscribe span(s) back to the publish RPC span. @@ -563,6 +576,7 @@ export class PubsubSpans { subInfo, undefined, caller, + 'receive', ); const links: Link[] = messageSpans .filter(m => m && isSampled(m)) @@ -579,7 +593,6 @@ export class PubsubSpans { ); span?.setAttribute('messaging.batch.message_count', messageSpans.length); - span?.setAttribute('messaging.operation', 'receive'); if (span) { // Also attempt to link from the subscribe span(s) back to the publish RPC span. diff --git a/handwritten/pubsub/test/telemetry-tracing.ts b/handwritten/pubsub/test/telemetry-tracing.ts index 2bff66e304b..02715a3045e 100644 --- a/handwritten/pubsub/test/telemetry-tracing.ts +++ b/handwritten/pubsub/test/telemetry-tracing.ts @@ -212,6 +212,7 @@ describe('OpenTelemetryTracer', () => { topicInfo, message, 'tests', + 'create', ); assert.deepStrictEqual(topicAttrs, { 'messaging.system': 'gcp_pubsub', @@ -222,6 +223,7 @@ describe('OpenTelemetryTracer', () => { 'messaging.gcp_pubsub.message.exactly_once_delivery': message.isExactlyOnceDelivery, 'messaging.gcp_pubsub.message.ack_id': message.ackId, + 'messaging.operation': 'create', 'code.function': 'tests', }); @@ -235,10 +237,12 @@ describe('OpenTelemetryTracer', () => { topicInfo, message, 'tests', + 'create', ); assert.deepStrictEqual(topicAttrs2, { 'messaging.system': 'gcp_pubsub', 'messaging.destination.name': topicInfo.topicId, + 'messaging.operation': 'create', 'gcp.project_id': topicInfo.projectId, 'messaging.message.envelope.size': message.data?.length, 'code.function': 'tests', @@ -283,6 +287,7 @@ describe('OpenTelemetryTracer', () => { const firstSpan = spans.pop(); assert.ok(firstSpan); assert.strictEqual(firstSpan.name, `${tests.topicInfo.topicId} create`); + assert.strictEqual(firstSpan.attributes['messaging.operation'], 'create'); assert.strictEqual( firstSpan.attributes['messaging.destination.name'], tests.topicInfo.topicId, @@ -312,7 +317,6 @@ describe('OpenTelemetryTracer', () => { const firstSpan = spans.pop(); assert.ok(firstSpan); assert.strictEqual(firstSpan.name, 'other create'); - assert.strictEqual( firstSpan.attributes['messaging.destination.name'], 'other', @@ -346,6 +350,10 @@ describe('OpenTelemetryTracer', () => { childReadSpan.attributes['messaging.destination.name'], 'sub', ); + assert.strictEqual( + childReadSpan.attributes['messaging.operation'], + 'receive', + ); assert.strictEqual(childReadSpan.kind, SpanKind.CONSUMER); assert.ok(childReadSpan.parentSpanId); }); From d491d6fec50139d184b82da7a11b3198b47467fa Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 9 May 2025 23:08:05 +0200 Subject: [PATCH 1067/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.33.0 (#2038) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index fba718dc977..c48a714069c 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@google-cloud/promisify": "^5.0.0", "@opentelemetry/api": "~1.9.0", "@opentelemetry/core": "^1.30.1", - "@opentelemetry/semantic-conventions": "~1.32.0", + "@opentelemetry/semantic-conventions": "~1.33.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^10.0.0-rc.1", From c5b5c88e80322cc55efc4d8b7ff4abf28193a60e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 12 May 2025 19:50:28 +0200 Subject: [PATCH 1068/1115] chore(deps): update dependency gts to v6 (#2004) --- handwritten/pubsub/system-test/fixtures/sample/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index 1a2e039ef14..0387c63b409 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -18,6 +18,6 @@ "devDependencies": { "@types/node": "^22.0.0", "typescript": "^5.1.6", - "gts": "^5.0.0" + "gts": "^6.0.0" } } From a893d7819c901f640cddf9bae139125bc8cce892 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 13 May 2025 00:35:00 +0200 Subject: [PATCH 1069/1115] chore(deps): update dependency execa to ~5.1.0 (#2032) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index c48a714069c..0a8ecdd7cef 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -80,7 +80,7 @@ "@types/uuid": "^10.0.0", "c8": "^10.1.3", "codecov": "^3.8.3", - "execa": "~5.0.0", + "execa": "~5.1.0", "gapic-tools": "^1.0.1", "gts": "^6.0.2", "jsdoc": "^4.0.4", From 4e5b59b1090b16accd403c0826a6b54cd5934f76 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 13 May 2025 21:35:19 +0200 Subject: [PATCH 1070/1115] chore(deps): update dependency sinon to v20 (#2017) --- handwritten/pubsub/.github/scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json index 2c2e5207df9..729bda5a04a 100644 --- a/handwritten/pubsub/.github/scripts/package.json +++ b/handwritten/pubsub/.github/scripts/package.json @@ -16,6 +16,6 @@ "devDependencies": { "@octokit/rest": "^19.0.0", "mocha": "^10.0.0", - "sinon": "^18.0.0" + "sinon": "^20.0.0" } } \ No newline at end of file From 44544bc9033370cc7f90cf9f8913c348afecb43d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 14 May 2025 00:49:51 +0200 Subject: [PATCH 1071/1115] chore(deps): update dependency @octokit/rest to v21 (#2033) --- handwritten/pubsub/.github/scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json index 729bda5a04a..9d9fc37253c 100644 --- a/handwritten/pubsub/.github/scripts/package.json +++ b/handwritten/pubsub/.github/scripts/package.json @@ -14,7 +14,7 @@ "js-yaml": "^4.1.0" }, "devDependencies": { - "@octokit/rest": "^19.0.0", + "@octokit/rest": "^21.0.0", "mocha": "^10.0.0", "sinon": "^20.0.0" } From 8aba2ba8da57ef9b3b2d8611110623765f23f9c4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 13 May 2025 18:50:50 -0400 Subject: [PATCH 1072/1115] chore: update owlbot-nodejs dependencies (#2022) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update owlbot-nodejs dependencies * chore: update owlbot-nodejs dependencies * Update container_test.yaml Source-Link: https://github.com/googleapis/synthtool/commit/1e798e6de27c63a88a1768c2a5f73b85e1523a21 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:c7e4968cfc97a204a4b2381f3ecb55cabc40c4cccf88b1ef8bef0d976be87fee * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 1 + handwritten/pubsub/.github/scripts/package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index f06f99a384f..60443342360 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -14,3 +14,4 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest digest: sha256:c7e4968cfc97a204a4b2381f3ecb55cabc40c4cccf88b1ef8bef0d976be87fee +# created: 2025-04-08T17:33:08.498793944Z diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json index 9d9fc37253c..baad0f8f857 100644 --- a/handwritten/pubsub/.github/scripts/package.json +++ b/handwritten/pubsub/.github/scripts/package.json @@ -16,6 +16,6 @@ "devDependencies": { "@octokit/rest": "^21.0.0", "mocha": "^10.0.0", - "sinon": "^20.0.0" + "sinon": "^18.0.0" } } \ No newline at end of file From b8ebce75e5bb5a27d920c8037284cdff5712da93 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 14:23:08 -0400 Subject: [PATCH 1073/1115] feat: Add SchemaViolationReason to IngestionFailureEvent (#2045) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Add SchemaViolationReason to IngestionFailureEvent docs: Standardize spelling of "acknowledgment" in Pub/Sub protos PiperOrigin-RevId: 761506540 Source-Link: https://github.com/googleapis/googleapis/commit/c1af7f23f557e8690a9e16bc41b1a2fae43e9a3e Source-Link: https://github.com/googleapis/googleapis-gen/commit/260979cc648722ece28819665b2ecd1ab0fb61a4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjYwOTc5Y2M2NDg3MjJlY2UyODgxOTY2NWIyZWNkMWFiMGZiNjFhNCJ9 * build: owl-bot-staging can't be linted due to its duplicate .eslintrc.json * build: also update the owl-bot-staging copy of .eslintignore * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: feywind <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.eslintignore | 1 + .../pubsub/.github/scripts/package.json | 2 +- .../protos/google/pubsub/v1/pubsub.proto | 173 +- .../protos/google/pubsub/v1/schema.proto | 5 +- handwritten/pubsub/protos/protos.d.ts | 476 +++++- handwritten/pubsub/protos/protos.js | 1500 +++++++++++++++-- handwritten/pubsub/protos/protos.json | 174 +- handwritten/pubsub/src/v1/publisher_client.ts | 46 +- .../pubsub/src/v1/schema_service_client.ts | 27 +- .../pubsub/src/v1/subscriber_client.ts | 47 +- handwritten/pubsub/test/gapic_publisher_v1.ts | 142 +- .../pubsub/test/gapic_schema_service_v1.ts | 150 +- .../pubsub/test/gapic_subscriber_v1.ts | 170 +- handwritten/pubsub/tsconfig.json | 4 +- 14 files changed, 2492 insertions(+), 425 deletions(-) diff --git a/handwritten/pubsub/.eslintignore b/handwritten/pubsub/.eslintignore index 88856452d18..12728ecfce2 100644 --- a/handwritten/pubsub/.eslintignore +++ b/handwritten/pubsub/.eslintignore @@ -6,3 +6,4 @@ protos/ system-test/ samples/generated/ samples/typescript/ +owl-bot-staging/ diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json index baad0f8f857..2c2e5207df9 100644 --- a/handwritten/pubsub/.github/scripts/package.json +++ b/handwritten/pubsub/.github/scripts/package.json @@ -14,7 +14,7 @@ "js-yaml": "^4.1.0" }, "devDependencies": { - "@octokit/rest": "^21.0.0", + "@octokit/rest": "^19.0.0", "mocha": "^10.0.0", "sinon": "^18.0.0" } diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 6ed87cbba4c..2792133a4ea 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,8 @@ import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; import "google/pubsub/v1/schema.proto"; -option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.PubSub.V1"; -option go_package = "cloud.google.com/go/pubsub/apiv1/pubsubpb;pubsubpb"; +option go_package = "cloud.google.com/go/pubsub/v2/apiv1/pubsubpb;pubsubpb"; option java_multiple_files = true; option java_outer_classname = "PubsubProto"; option java_package = "com.google.pubsub.v1"; @@ -550,6 +549,10 @@ message IngestionFailureEvent { // occurs, one or more Avro objects won't be ingested. message AvroFailureReason {} + // Set when a Pub/Sub message fails to get published due to a schema + // validation violation. + message SchemaViolationReason {} + // Failure when ingesting from a Cloud Storage source. message CloudStorageFailure { // Optional. Name of the Cloud Storage bucket used for ingestion. @@ -573,6 +576,10 @@ message IngestionFailureEvent { // being published. ApiViolationReason api_violation_reason = 6 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The Pub/Sub message failed schema validation. + SchemaViolationReason schema_violation_reason = 7 + [(google.api.field_behavior) = OPTIONAL]; } } @@ -597,6 +604,10 @@ message IngestionFailureEvent { // being published. ApiViolationReason api_violation_reason = 5 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The Pub/Sub message failed schema validation. + SchemaViolationReason schema_violation_reason = 6 + [(google.api.field_behavior) = OPTIONAL]; } } @@ -621,6 +632,10 @@ message IngestionFailureEvent { // being published. ApiViolationReason api_violation_reason = 5 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The Pub/Sub message failed schema validation. + SchemaViolationReason schema_violation_reason = 6 + [(google.api.field_behavior) = OPTIONAL]; } } @@ -645,6 +660,29 @@ message IngestionFailureEvent { // being published. ApiViolationReason api_violation_reason = 5 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The Pub/Sub message failed schema validation. + SchemaViolationReason schema_violation_reason = 6 + [(google.api.field_behavior) = OPTIONAL]; + } + } + + // Failure when ingesting from an AWS Kinesis source. + message AwsKinesisFailureReason { + // Optional. The stream ARN of the Kinesis stream being ingested from. + string stream_arn = 1 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The partition key of the message that failed to be ingested. + string partition_key = 2 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The sequence number of the message that failed to be ingested. + string sequence_number = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Reason why ingestion failed for the specified message. + oneof reason { + // Optional. The Pub/Sub message failed schema validation. + SchemaViolationReason schema_violation_reason = 4 + [(google.api.field_behavior) = OPTIONAL]; } } @@ -671,7 +709,69 @@ message IngestionFailureEvent { // Optional. Failure when ingesting from Confluent Cloud. ConfluentCloudFailureReason confluent_cloud_failure = 6 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure when ingesting from AWS Kinesis. + AwsKinesisFailureReason aws_kinesis_failure = 7 + [(google.api.field_behavior) = OPTIONAL]; + } +} + +// User-defined JavaScript function that can transform or filter a Pub/Sub +// message. +message JavaScriptUDF { + // Required. Name of the JavasScript function that should applied to Pub/Sub + // messages. + string function_name = 1 [(google.api.field_behavior) = REQUIRED]; + + // Required. JavaScript code that contains a function `function_name` with the + // below signature: + // + // ``` + // /** + // * Transforms a Pub/Sub message. + // + // * @return {(Object)>|null)} - To + // * filter a message, return `null`. To transform a message return a map + // * with the following keys: + // * - (required) 'data' : {string} + // * - (optional) 'attributes' : {Object} + // * Returning empty `attributes` will remove all attributes from the + // * message. + // * + // * @param {(Object)>} Pub/Sub + // * message. Keys: + // * - (required) 'data' : {string} + // * - (required) 'attributes' : {Object} + // * + // * @param {Object} metadata - Pub/Sub message metadata. + // * Keys: + // * - (optional) 'message_id' : {string} + // * - (optional) 'publish_time': {string} YYYY-MM-DDTHH:MM:SSZ format + // * - (optional) 'ordering_key': {string} + // */ + // + // function (message, metadata) { + // } + // ``` + string code = 2 [(google.api.field_behavior) = REQUIRED]; +} + +// All supported message transforms types. +message MessageTransform { + // The type of transform to apply to messages. + oneof transform { + // Optional. JavaScript User Defined Function. If multiple JavaScriptUDF's + // are specified on a resource, each must have a unique `function_name`. + JavaScriptUDF javascript_udf = 2 [(google.api.field_behavior) = OPTIONAL]; } + + // Optional. This field is deprecated, use the `disabled` field to disable + // transforms. + bool enabled = 3 [deprecated = true, (google.api.field_behavior) = OPTIONAL]; + + // Optional. If true, the transform is disabled and will not be applied to + // messages. Defaults to `false`. + bool disabled = 4 [(google.api.field_behavior) = OPTIONAL]; } // A topic resource. @@ -680,6 +780,8 @@ message Topic { type: "pubsub.googleapis.com/Topic" pattern: "projects/{project}/topics/{topic}" pattern: "_deleted-topic_" + plural: "topics" + singular: "topic" }; // The state of the topic. @@ -745,6 +847,11 @@ message Topic { // Optional. Settings for ingestion from a data source into this topic. IngestionDataSourceSettings ingestion_data_source_settings = 10 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Transforms to be applied to messages published to the topic. + // Transforms are applied in the order specified. + repeated MessageTransform message_transforms = 13 + [(google.api.field_behavior) = OPTIONAL]; } // A message that is published by publishers and consumed by subscribers. The @@ -1064,7 +1171,7 @@ service Subscriber { } // Establishes a stream with the server, which sends messages down to the - // client. The client streams acknowledgements and ack deadline modifications + // client. The client streams acknowledgments and ack deadline modifications // back to the server. The server will close the stream and return the status // on any error. The server may close the stream with status `UNAVAILABLE` to // reassign server-side resources, in which case, the client should @@ -1188,6 +1295,8 @@ message Subscription { option (google.api.resource) = { type: "pubsub.googleapis.com/Subscription" pattern: "projects/{project}/subscriptions/{subscription}" + plural: "subscriptions" + singular: "subscription" }; // Possible states for a subscription. @@ -1204,8 +1313,8 @@ message Subscription { RESOURCE_ERROR = 2; } - // Information about an associated Analytics Hub subscription - // (https://cloud.google.com/bigquery/docs/analytics-hub-manage-subscriptions). + // Information about an associated [Analytics Hub + // subscription](https://cloud.google.com/bigquery/docs/analytics-hub-manage-subscriptions). message AnalyticsHubSubscriptionInfo { // Optional. The name of the associated Analytics Hub listing resource. // Pattern: @@ -1328,8 +1437,8 @@ message Subscription { // // If not set, the default retry policy is applied. This generally implies // that messages will be retried as soon as possible for healthy subscribers. - // RetryPolicy will be triggered on NACKs or acknowledgement deadline - // exceeded events for a given message. + // RetryPolicy will be triggered on NACKs or acknowledgment deadline exceeded + // events for a given message. RetryPolicy retry_policy = 14 [(google.api.field_behavior) = OPTIONAL]; // Optional. Indicates whether the subscription is detached from its topic. @@ -1344,7 +1453,7 @@ message Subscription { // subscription: // // * The message sent to a subscriber is guaranteed not to be resent - // before the message's acknowledgement deadline expires. + // before the message's acknowledgment deadline expires. // * An acknowledged message will not be resent to a subscriber. // // Note that subscribers may still receive multiple copies of a message @@ -1371,6 +1480,11 @@ message Subscription { // Only set if the subscritpion is created by Analytics Hub. AnalyticsHubSubscriptionInfo analytics_hub_subscription_info = 23 [(google.api.field_behavior) = OUTPUT_ONLY]; + + // Optional. Transforms to be applied to messages before they are delivered to + // subscribers. Transforms are applied in the order specified. + repeated MessageTransform message_transforms = 25 + [(google.api.field_behavior) = OPTIONAL]; } // A policy that specifies how Pub/Sub retries message delivery. @@ -1378,7 +1492,7 @@ message Subscription { // Retry delay will be exponential based on provided minimum and maximum // backoffs. https://en.wikipedia.org/wiki/Exponential_backoff. // -// RetryPolicy will be triggered on NACKs or acknowledgement deadline exceeded +// RetryPolicy will be triggered on NACKs or acknowledgment deadline exceeded // events for a given message. // // Retry Policy is implemented on a best effort basis. At times, the delay @@ -1418,7 +1532,7 @@ message DeadLetterPolicy { // value must be between 5 and 100. // // The number of delivery attempts is defined as 1 + (the sum of number of - // NACKs and number of times the acknowledgement deadline has been exceeded + // NACKs and number of times the acknowledgment deadline has been exceeded // for the message). // // A NACK is any call to ModifyAckDeadline with a 0 deadline. Note that @@ -1680,7 +1794,7 @@ message CloudStorageConfig { // Optional. The maximum duration that can elapse before a new Cloud Storage // file is created. Min 1 minute, max 10 minutes, default 5 minutes. May not - // exceed the subscription's acknowledgement deadline. + // exceed the subscription's acknowledgment deadline. google.protobuf.Duration max_duration = 6 [(google.api.field_behavior) = OPTIONAL]; @@ -1902,7 +2016,7 @@ message AcknowledgeRequest { } // Request for the `StreamingPull` streaming RPC method. This request is used to -// establish the initial stream as well as to stream acknowledgements and ack +// establish the initial stream as well as to stream acknowledgments and ack // deadline modifications from the client to the server. message StreamingPullRequest { // Required. The subscription for which to initialize the new stream. This @@ -1916,12 +2030,11 @@ message StreamingPullRequest { } ]; - // Optional. List of acknowledgement IDs for acknowledging previously received + // Optional. List of acknowledgment IDs for acknowledging previously received // messages (received on this stream or a different stream). If an ack ID has // expired, the corresponding message may be redelivered later. Acknowledging - // a message more than once will not result in an error. If the - // acknowledgement ID is malformed, the stream will be aborted with status - // `INVALID_ARGUMENT`. + // a message more than once will not result in an error. If the acknowledgment + // ID is malformed, the stream will be aborted with status `INVALID_ARGUMENT`. repeated string ack_ids = 2 [(google.api.field_behavior) = OPTIONAL]; // Optional. The list of new ack deadlines for the IDs listed in @@ -1938,7 +2051,7 @@ message StreamingPullRequest { repeated int32 modify_deadline_seconds = 3 [(google.api.field_behavior) = OPTIONAL]; - // Optional. List of acknowledgement IDs whose deadline will be modified based + // Optional. List of acknowledgment IDs whose deadline will be modified based // on the corresponding element in `modify_deadline_seconds`. This field can // be used to indicate that more time is needed to process a message by the // subscriber, or to make the message available for redelivery if the @@ -1987,39 +2100,39 @@ message StreamingPullRequest { // Response for the `StreamingPull` method. This response is used to stream // messages from the server to the client. message StreamingPullResponse { - // Acknowledgement IDs sent in one or more previous requests to acknowledge a + // Acknowledgment IDs sent in one or more previous requests to acknowledge a // previously received message. message AcknowledgeConfirmation { - // Optional. Successfully processed acknowledgement IDs. + // Optional. Successfully processed acknowledgment IDs. repeated string ack_ids = 1 [(google.api.field_behavior) = OPTIONAL]; - // Optional. List of acknowledgement IDs that were malformed or whose - // acknowledgement deadline has expired. + // Optional. List of acknowledgment IDs that were malformed or whose + // acknowledgment deadline has expired. repeated string invalid_ack_ids = 2 [(google.api.field_behavior) = OPTIONAL]; - // Optional. List of acknowledgement IDs that were out of order. + // Optional. List of acknowledgment IDs that were out of order. repeated string unordered_ack_ids = 3 [(google.api.field_behavior) = OPTIONAL]; - // Optional. List of acknowledgement IDs that failed processing with + // Optional. List of acknowledgment IDs that failed processing with // temporary issues. repeated string temporary_failed_ack_ids = 4 [(google.api.field_behavior) = OPTIONAL]; } - // Acknowledgement IDs sent in one or more previous requests to modify the + // Acknowledgment IDs sent in one or more previous requests to modify the // deadline for a specific message. message ModifyAckDeadlineConfirmation { - // Optional. Successfully processed acknowledgement IDs. + // Optional. Successfully processed acknowledgment IDs. repeated string ack_ids = 1 [(google.api.field_behavior) = OPTIONAL]; - // Optional. List of acknowledgement IDs that were malformed or whose - // acknowledgement deadline has expired. + // Optional. List of acknowledgment IDs that were malformed or whose + // acknowledgment deadline has expired. repeated string invalid_ack_ids = 2 [(google.api.field_behavior) = OPTIONAL]; - // Optional. List of acknowledgement IDs that failed processing with + // Optional. List of acknowledgment IDs that failed processing with // temporary issues. repeated string temporary_failed_ack_ids = 3 [(google.api.field_behavior) = OPTIONAL]; @@ -2109,6 +2222,8 @@ message Snapshot { option (google.api.resource) = { type: "pubsub.googleapis.com/Snapshot" pattern: "projects/{project}/snapshots/{snapshot}" + plural: "snapshots" + singular: "snapshot" }; // Optional. The name of the snapshot. diff --git a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto index d52c678c595..37fd2f461c0 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/schema.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/schema.proto @@ -1,4 +1,4 @@ -// Copyright 2024 Google LLC +// Copyright 2025 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,9 +23,8 @@ import "google/api/resource.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; -option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.PubSub.V1"; -option go_package = "cloud.google.com/go/pubsub/apiv1/pubsubpb;pubsubpb"; +option go_package = "cloud.google.com/go/pubsub/v2/apiv1/pubsubpb;pubsubpb"; option java_multiple_files = true; option java_outer_classname = "SchemaProto"; option java_package = "com.google.pubsub.v1"; diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index b61594d6bfc..cd375d6899c 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1708,6 +1708,9 @@ export namespace google { /** IngestionFailureEvent confluentCloudFailure */ confluentCloudFailure?: (google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason|null); + + /** IngestionFailureEvent awsKinesisFailure */ + awsKinesisFailure?: (google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason|null); } /** Represents an IngestionFailureEvent. */ @@ -1737,8 +1740,11 @@ export namespace google { /** IngestionFailureEvent confluentCloudFailure. */ public confluentCloudFailure?: (google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason|null); + /** IngestionFailureEvent awsKinesisFailure. */ + public awsKinesisFailure?: (google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason|null); + /** IngestionFailureEvent failure. */ - public failure?: ("cloudStorageFailure"|"awsMskFailure"|"azureEventHubsFailure"|"confluentCloudFailure"); + public failure?: ("cloudStorageFailure"|"awsMskFailure"|"azureEventHubsFailure"|"confluentCloudFailure"|"awsKinesisFailure"); /** * Creates a new IngestionFailureEvent instance using the specified properties. @@ -2002,6 +2008,97 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + /** Properties of a SchemaViolationReason. */ + interface ISchemaViolationReason { + } + + /** Represents a SchemaViolationReason. */ + class SchemaViolationReason implements ISchemaViolationReason { + + /** + * Constructs a new SchemaViolationReason. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason); + + /** + * Creates a new SchemaViolationReason instance using the specified properties. + * @param [properties] Properties to set + * @returns SchemaViolationReason instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason): google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason; + + /** + * Encodes the specified SchemaViolationReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify|verify} messages. + * @param message SchemaViolationReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SchemaViolationReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify|verify} messages. + * @param message SchemaViolationReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SchemaViolationReason message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SchemaViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason; + + /** + * Decodes a SchemaViolationReason message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SchemaViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason; + + /** + * Verifies a SchemaViolationReason message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SchemaViolationReason message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SchemaViolationReason + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason; + + /** + * Creates a plain object from a SchemaViolationReason message. Also converts values to other types if specified. + * @param message SchemaViolationReason + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SchemaViolationReason to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for SchemaViolationReason + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + /** Properties of a CloudStorageFailure. */ interface ICloudStorageFailure { @@ -2019,6 +2116,9 @@ export namespace google { /** CloudStorageFailure apiViolationReason */ apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + + /** CloudStorageFailure schemaViolationReason */ + schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); } /** Represents a CloudStorageFailure. */ @@ -2045,8 +2145,11 @@ export namespace google { /** CloudStorageFailure apiViolationReason. */ public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + /** CloudStorageFailure schemaViolationReason. */ + public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** CloudStorageFailure reason. */ - public reason?: ("avroFailureReason"|"apiViolationReason"); + public reason?: ("avroFailureReason"|"apiViolationReason"|"schemaViolationReason"); /** * Creates a new CloudStorageFailure instance using the specified properties. @@ -2143,6 +2246,9 @@ export namespace google { /** AwsMskFailureReason apiViolationReason */ apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + + /** AwsMskFailureReason schemaViolationReason */ + schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); } /** Represents an AwsMskFailureReason. */ @@ -2169,8 +2275,11 @@ export namespace google { /** AwsMskFailureReason apiViolationReason. */ public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + /** AwsMskFailureReason schemaViolationReason. */ + public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** AwsMskFailureReason reason. */ - public reason?: "apiViolationReason"; + public reason?: ("apiViolationReason"|"schemaViolationReason"); /** * Creates a new AwsMskFailureReason instance using the specified properties. @@ -2267,6 +2376,9 @@ export namespace google { /** AzureEventHubsFailureReason apiViolationReason */ apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + + /** AzureEventHubsFailureReason schemaViolationReason */ + schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); } /** Represents an AzureEventHubsFailureReason. */ @@ -2293,8 +2405,11 @@ export namespace google { /** AzureEventHubsFailureReason apiViolationReason. */ public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + /** AzureEventHubsFailureReason schemaViolationReason. */ + public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** AzureEventHubsFailureReason reason. */ - public reason?: "apiViolationReason"; + public reason?: ("apiViolationReason"|"schemaViolationReason"); /** * Creates a new AzureEventHubsFailureReason instance using the specified properties. @@ -2391,6 +2506,9 @@ export namespace google { /** ConfluentCloudFailureReason apiViolationReason */ apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + + /** ConfluentCloudFailureReason schemaViolationReason */ + schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); } /** Represents a ConfluentCloudFailureReason. */ @@ -2417,8 +2535,11 @@ export namespace google { /** ConfluentCloudFailureReason apiViolationReason. */ public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + /** ConfluentCloudFailureReason schemaViolationReason. */ + public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** ConfluentCloudFailureReason reason. */ - public reason?: "apiViolationReason"; + public reason?: ("apiViolationReason"|"schemaViolationReason"); /** * Creates a new ConfluentCloudFailureReason instance using the specified properties. @@ -2497,6 +2618,339 @@ export namespace google { */ public static getTypeUrl(typeUrlPrefix?: string): string; } + + /** Properties of an AwsKinesisFailureReason. */ + interface IAwsKinesisFailureReason { + + /** AwsKinesisFailureReason streamArn */ + streamArn?: (string|null); + + /** AwsKinesisFailureReason partitionKey */ + partitionKey?: (string|null); + + /** AwsKinesisFailureReason sequenceNumber */ + sequenceNumber?: (string|null); + + /** AwsKinesisFailureReason schemaViolationReason */ + schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + } + + /** Represents an AwsKinesisFailureReason. */ + class AwsKinesisFailureReason implements IAwsKinesisFailureReason { + + /** + * Constructs a new AwsKinesisFailureReason. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason); + + /** AwsKinesisFailureReason streamArn. */ + public streamArn: string; + + /** AwsKinesisFailureReason partitionKey. */ + public partitionKey: string; + + /** AwsKinesisFailureReason sequenceNumber. */ + public sequenceNumber: string; + + /** AwsKinesisFailureReason schemaViolationReason. */ + public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + + /** AwsKinesisFailureReason reason. */ + public reason?: "schemaViolationReason"; + + /** + * Creates a new AwsKinesisFailureReason instance using the specified properties. + * @param [properties] Properties to set + * @returns AwsKinesisFailureReason instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason): google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason; + + /** + * Encodes the specified AwsKinesisFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.verify|verify} messages. + * @param message AwsKinesisFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified AwsKinesisFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.verify|verify} messages. + * @param message AwsKinesisFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an AwsKinesisFailureReason message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns AwsKinesisFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason; + + /** + * Decodes an AwsKinesisFailureReason message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns AwsKinesisFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason; + + /** + * Verifies an AwsKinesisFailureReason message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an AwsKinesisFailureReason message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns AwsKinesisFailureReason + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason; + + /** + * Creates a plain object from an AwsKinesisFailureReason message. Also converts values to other types if specified. + * @param message AwsKinesisFailureReason + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this AwsKinesisFailureReason to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for AwsKinesisFailureReason + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + } + + /** Properties of a JavaScriptUDF. */ + interface IJavaScriptUDF { + + /** JavaScriptUDF functionName */ + functionName?: (string|null); + + /** JavaScriptUDF code */ + code?: (string|null); + } + + /** Represents a JavaScriptUDF. */ + class JavaScriptUDF implements IJavaScriptUDF { + + /** + * Constructs a new JavaScriptUDF. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IJavaScriptUDF); + + /** JavaScriptUDF functionName. */ + public functionName: string; + + /** JavaScriptUDF code. */ + public code: string; + + /** + * Creates a new JavaScriptUDF instance using the specified properties. + * @param [properties] Properties to set + * @returns JavaScriptUDF instance + */ + public static create(properties?: google.pubsub.v1.IJavaScriptUDF): google.pubsub.v1.JavaScriptUDF; + + /** + * Encodes the specified JavaScriptUDF message. Does not implicitly {@link google.pubsub.v1.JavaScriptUDF.verify|verify} messages. + * @param message JavaScriptUDF message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IJavaScriptUDF, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified JavaScriptUDF message, length delimited. Does not implicitly {@link google.pubsub.v1.JavaScriptUDF.verify|verify} messages. + * @param message JavaScriptUDF message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IJavaScriptUDF, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a JavaScriptUDF message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns JavaScriptUDF + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.JavaScriptUDF; + + /** + * Decodes a JavaScriptUDF message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns JavaScriptUDF + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.JavaScriptUDF; + + /** + * Verifies a JavaScriptUDF message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a JavaScriptUDF message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns JavaScriptUDF + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.JavaScriptUDF; + + /** + * Creates a plain object from a JavaScriptUDF message. Also converts values to other types if specified. + * @param message JavaScriptUDF + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.JavaScriptUDF, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this JavaScriptUDF to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for JavaScriptUDF + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + /** Properties of a MessageTransform. */ + interface IMessageTransform { + + /** MessageTransform javascriptUdf */ + javascriptUdf?: (google.pubsub.v1.IJavaScriptUDF|null); + + /** MessageTransform enabled */ + enabled?: (boolean|null); + + /** MessageTransform disabled */ + disabled?: (boolean|null); + } + + /** Represents a MessageTransform. */ + class MessageTransform implements IMessageTransform { + + /** + * Constructs a new MessageTransform. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IMessageTransform); + + /** MessageTransform javascriptUdf. */ + public javascriptUdf?: (google.pubsub.v1.IJavaScriptUDF|null); + + /** MessageTransform enabled. */ + public enabled: boolean; + + /** MessageTransform disabled. */ + public disabled: boolean; + + /** MessageTransform transform. */ + public transform?: "javascriptUdf"; + + /** + * Creates a new MessageTransform instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageTransform instance + */ + public static create(properties?: google.pubsub.v1.IMessageTransform): google.pubsub.v1.MessageTransform; + + /** + * Encodes the specified MessageTransform message. Does not implicitly {@link google.pubsub.v1.MessageTransform.verify|verify} messages. + * @param message MessageTransform message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IMessageTransform, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MessageTransform message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageTransform.verify|verify} messages. + * @param message MessageTransform message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IMessageTransform, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MessageTransform message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageTransform + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.MessageTransform; + + /** + * Decodes a MessageTransform message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageTransform + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.MessageTransform; + + /** + * Verifies a MessageTransform message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MessageTransform message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageTransform + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.MessageTransform; + + /** + * Creates a plain object from a MessageTransform message. Also converts values to other types if specified. + * @param message MessageTransform + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.MessageTransform, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MessageTransform to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for MessageTransform + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; } /** Properties of a Topic. */ @@ -2528,6 +2982,9 @@ export namespace google { /** Topic ingestionDataSourceSettings */ ingestionDataSourceSettings?: (google.pubsub.v1.IIngestionDataSourceSettings|null); + + /** Topic messageTransforms */ + messageTransforms?: (google.pubsub.v1.IMessageTransform[]|null); } /** Represents a Topic. */ @@ -2566,6 +3023,9 @@ export namespace google { /** Topic ingestionDataSourceSettings. */ public ingestionDataSourceSettings?: (google.pubsub.v1.IIngestionDataSourceSettings|null); + /** Topic messageTransforms. */ + public messageTransforms: google.pubsub.v1.IMessageTransform[]; + /** * Creates a new Topic instance using the specified properties. * @param [properties] Properties to set @@ -4515,6 +4975,9 @@ export namespace google { /** Subscription analyticsHubSubscriptionInfo */ analyticsHubSubscriptionInfo?: (google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo|null); + + /** Subscription messageTransforms */ + messageTransforms?: (google.pubsub.v1.IMessageTransform[]|null); } /** Represents a Subscription. */ @@ -4583,6 +5046,9 @@ export namespace google { /** Subscription analyticsHubSubscriptionInfo. */ public analyticsHubSubscriptionInfo?: (google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo|null); + /** Subscription messageTransforms. */ + public messageTransforms: google.pubsub.v1.IMessageTransform[]; + /** * Creates a new Subscription instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index e2eefc5e426..beb45c49051 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -4189,6 +4189,7 @@ * @property {google.pubsub.v1.IngestionFailureEvent.IAwsMskFailureReason|null} [awsMskFailure] IngestionFailureEvent awsMskFailure * @property {google.pubsub.v1.IngestionFailureEvent.IAzureEventHubsFailureReason|null} [azureEventHubsFailure] IngestionFailureEvent azureEventHubsFailure * @property {google.pubsub.v1.IngestionFailureEvent.IConfluentCloudFailureReason|null} [confluentCloudFailure] IngestionFailureEvent confluentCloudFailure + * @property {google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason|null} [awsKinesisFailure] IngestionFailureEvent awsKinesisFailure */ /** @@ -4254,17 +4255,25 @@ */ IngestionFailureEvent.prototype.confluentCloudFailure = null; + /** + * IngestionFailureEvent awsKinesisFailure. + * @member {google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason|null|undefined} awsKinesisFailure + * @memberof google.pubsub.v1.IngestionFailureEvent + * @instance + */ + IngestionFailureEvent.prototype.awsKinesisFailure = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * IngestionFailureEvent failure. - * @member {"cloudStorageFailure"|"awsMskFailure"|"azureEventHubsFailure"|"confluentCloudFailure"|undefined} failure + * @member {"cloudStorageFailure"|"awsMskFailure"|"azureEventHubsFailure"|"confluentCloudFailure"|"awsKinesisFailure"|undefined} failure * @memberof google.pubsub.v1.IngestionFailureEvent * @instance */ Object.defineProperty(IngestionFailureEvent.prototype, "failure", { - get: $util.oneOfGetter($oneOfFields = ["cloudStorageFailure", "awsMskFailure", "azureEventHubsFailure", "confluentCloudFailure"]), + get: $util.oneOfGetter($oneOfFields = ["cloudStorageFailure", "awsMskFailure", "azureEventHubsFailure", "confluentCloudFailure", "awsKinesisFailure"]), set: $util.oneOfSetter($oneOfFields) }); @@ -4304,6 +4313,8 @@ $root.google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.encode(message.azureEventHubsFailure, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); if (message.confluentCloudFailure != null && Object.hasOwnProperty.call(message, "confluentCloudFailure")) $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.encode(message.confluentCloudFailure, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.awsKinesisFailure != null && Object.hasOwnProperty.call(message, "awsKinesisFailure")) + $root.google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.encode(message.awsKinesisFailure, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); return writer; }; @@ -4364,6 +4375,10 @@ message.confluentCloudFailure = $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.decode(reader, reader.uint32()); break; } + case 7: { + message.awsKinesisFailure = $root.google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -4444,6 +4459,16 @@ return "confluentCloudFailure." + error; } } + if (message.awsKinesisFailure != null && message.hasOwnProperty("awsKinesisFailure")) { + if (properties.failure === 1) + return "failure: multiple values"; + properties.failure = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.verify(message.awsKinesisFailure); + if (error) + return "awsKinesisFailure." + error; + } + } return null; }; @@ -4483,6 +4508,11 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.confluentCloudFailure: object expected"); message.confluentCloudFailure = $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.fromObject(object.confluentCloudFailure); } + if (object.awsKinesisFailure != null) { + if (typeof object.awsKinesisFailure !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.awsKinesisFailure: object expected"); + message.awsKinesisFailure = $root.google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.fromObject(object.awsKinesisFailure); + } return message; }; @@ -4527,6 +4557,11 @@ if (options.oneofs) object.failure = "confluentCloudFailure"; } + if (message.awsKinesisFailure != null && message.hasOwnProperty("awsKinesisFailure")) { + object.awsKinesisFailure = $root.google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.toObject(message.awsKinesisFailure, options); + if (options.oneofs) + object.failure = "awsKinesisFailure"; + } return object; }; @@ -4910,6 +4945,183 @@ return AvroFailureReason; })(); + IngestionFailureEvent.SchemaViolationReason = (function() { + + /** + * Properties of a SchemaViolationReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface ISchemaViolationReason + */ + + /** + * Constructs a new SchemaViolationReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents a SchemaViolationReason. + * @implements ISchemaViolationReason + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason=} [properties] Properties to set + */ + function SchemaViolationReason(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new SchemaViolationReason instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason} SchemaViolationReason instance + */ + SchemaViolationReason.create = function create(properties) { + return new SchemaViolationReason(properties); + }; + + /** + * Encodes the specified SchemaViolationReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason} message SchemaViolationReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SchemaViolationReason.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified SchemaViolationReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason} message SchemaViolationReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SchemaViolationReason.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SchemaViolationReason message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason} SchemaViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SchemaViolationReason.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SchemaViolationReason message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason} SchemaViolationReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SchemaViolationReason.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SchemaViolationReason message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SchemaViolationReason.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a SchemaViolationReason message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason} SchemaViolationReason + */ + SchemaViolationReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason) + return object; + return new $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason(); + }; + + /** + * Creates a plain object from a SchemaViolationReason message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason} message SchemaViolationReason + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SchemaViolationReason.toObject = function toObject() { + return {}; + }; + + /** + * Converts this SchemaViolationReason to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @instance + * @returns {Object.} JSON object + */ + SchemaViolationReason.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for SchemaViolationReason + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + SchemaViolationReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason"; + }; + + return SchemaViolationReason; + })(); + IngestionFailureEvent.CloudStorageFailure = (function() { /** @@ -4921,6 +5133,7 @@ * @property {number|Long|null} [objectGeneration] CloudStorageFailure objectGeneration * @property {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null} [avroFailureReason] CloudStorageFailure avroFailureReason * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] CloudStorageFailure apiViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] CloudStorageFailure schemaViolationReason */ /** @@ -4978,17 +5191,25 @@ */ CloudStorageFailure.prototype.apiViolationReason = null; + /** + * CloudStorageFailure schemaViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null|undefined} schemaViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.schemaViolationReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * CloudStorageFailure reason. - * @member {"avroFailureReason"|"apiViolationReason"|undefined} reason + * @member {"avroFailureReason"|"apiViolationReason"|"schemaViolationReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure * @instance */ Object.defineProperty(CloudStorageFailure.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["avroFailureReason", "apiViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["avroFailureReason", "apiViolationReason", "schemaViolationReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -5026,6 +5247,8 @@ $root.google.pubsub.v1.IngestionFailureEvent.AvroFailureReason.encode(message.avroFailureReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); return writer; }; @@ -5082,6 +5305,10 @@ message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); break; } + case 7: { + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -5145,6 +5372,16 @@ return "apiViolationReason." + error; } } + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify(message.schemaViolationReason); + if (error) + return "schemaViolationReason." + error; + } + } return null; }; @@ -5183,6 +5420,11 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.apiViolationReason: object expected"); message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); } + if (object.schemaViolationReason != null) { + if (typeof object.schemaViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.schemaViolationReason: object expected"); + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); + } return message; }; @@ -5227,6 +5469,11 @@ if (options.oneofs) object.reason = "apiViolationReason"; } + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + object.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.toObject(message.schemaViolationReason, options); + if (options.oneofs) + object.reason = "schemaViolationReason"; + } return object; }; @@ -5270,6 +5517,7 @@ * @property {number|Long|null} [partitionId] AwsMskFailureReason partitionId * @property {number|Long|null} [offset] AwsMskFailureReason offset * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] AwsMskFailureReason apiViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] AwsMskFailureReason schemaViolationReason */ /** @@ -5327,17 +5575,25 @@ */ AwsMskFailureReason.prototype.apiViolationReason = null; + /** + * AwsMskFailureReason schemaViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null|undefined} schemaViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason + * @instance + */ + AwsMskFailureReason.prototype.schemaViolationReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * AwsMskFailureReason reason. - * @member {"apiViolationReason"|undefined} reason + * @member {"apiViolationReason"|"schemaViolationReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @instance */ Object.defineProperty(AwsMskFailureReason.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["apiViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -5375,6 +5631,8 @@ writer.uint32(/* id 4, wireType 0 =*/32).int64(message.offset); if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); return writer; }; @@ -5431,6 +5689,10 @@ message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); break; } + case 6: { + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -5487,6 +5749,16 @@ return "apiViolationReason." + error; } } + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify(message.schemaViolationReason); + if (error) + return "schemaViolationReason." + error; + } + } return null; }; @@ -5529,6 +5801,11 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.apiViolationReason: object expected"); message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); } + if (object.schemaViolationReason != null) { + if (typeof object.schemaViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.schemaViolationReason: object expected"); + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); + } return message; }; @@ -5578,6 +5855,11 @@ if (options.oneofs) object.reason = "apiViolationReason"; } + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + object.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.toObject(message.schemaViolationReason, options); + if (options.oneofs) + object.reason = "schemaViolationReason"; + } return object; }; @@ -5621,6 +5903,7 @@ * @property {number|Long|null} [partitionId] AzureEventHubsFailureReason partitionId * @property {number|Long|null} [offset] AzureEventHubsFailureReason offset * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] AzureEventHubsFailureReason apiViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] AzureEventHubsFailureReason schemaViolationReason */ /** @@ -5678,17 +5961,25 @@ */ AzureEventHubsFailureReason.prototype.apiViolationReason = null; + /** + * AzureEventHubsFailureReason schemaViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null|undefined} schemaViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason + * @instance + */ + AzureEventHubsFailureReason.prototype.schemaViolationReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * AzureEventHubsFailureReason reason. - * @member {"apiViolationReason"|undefined} reason + * @member {"apiViolationReason"|"schemaViolationReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @instance */ Object.defineProperty(AzureEventHubsFailureReason.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["apiViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -5726,6 +6017,8 @@ writer.uint32(/* id 4, wireType 0 =*/32).int64(message.offset); if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); return writer; }; @@ -5782,6 +6075,10 @@ message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); break; } + case 6: { + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -5838,6 +6135,16 @@ return "apiViolationReason." + error; } } + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify(message.schemaViolationReason); + if (error) + return "schemaViolationReason." + error; + } + } return null; }; @@ -5880,6 +6187,11 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.apiViolationReason: object expected"); message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); } + if (object.schemaViolationReason != null) { + if (typeof object.schemaViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.schemaViolationReason: object expected"); + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); + } return message; }; @@ -5929,6 +6241,11 @@ if (options.oneofs) object.reason = "apiViolationReason"; } + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + object.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.toObject(message.schemaViolationReason, options); + if (options.oneofs) + object.reason = "schemaViolationReason"; + } return object; }; @@ -5972,6 +6289,7 @@ * @property {number|Long|null} [partitionId] ConfluentCloudFailureReason partitionId * @property {number|Long|null} [offset] ConfluentCloudFailureReason offset * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] ConfluentCloudFailureReason apiViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] ConfluentCloudFailureReason schemaViolationReason */ /** @@ -6029,17 +6347,25 @@ */ ConfluentCloudFailureReason.prototype.apiViolationReason = null; + /** + * ConfluentCloudFailureReason schemaViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null|undefined} schemaViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason + * @instance + */ + ConfluentCloudFailureReason.prototype.schemaViolationReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * ConfluentCloudFailureReason reason. - * @member {"apiViolationReason"|undefined} reason + * @member {"apiViolationReason"|"schemaViolationReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance */ Object.defineProperty(ConfluentCloudFailureReason.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["apiViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -6077,6 +6403,8 @@ writer.uint32(/* id 4, wireType 0 =*/32).int64(message.offset); if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); return writer; }; @@ -6133,6 +6461,10 @@ message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); break; } + case 6: { + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -6189,130 +6521,956 @@ return "apiViolationReason." + error; } } - return null; - }; + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify(message.schemaViolationReason); + if (error) + return "schemaViolationReason." + error; + } + } + return null; + }; + + /** + * Creates a ConfluentCloudFailureReason message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} ConfluentCloudFailureReason + */ + ConfluentCloudFailureReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason) + return object; + var message = new $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason(); + if (object.clusterId != null) + message.clusterId = String(object.clusterId); + if (object.kafkaTopic != null) + message.kafkaTopic = String(object.kafkaTopic); + if (object.partitionId != null) + if ($util.Long) + (message.partitionId = $util.Long.fromValue(object.partitionId)).unsigned = false; + else if (typeof object.partitionId === "string") + message.partitionId = parseInt(object.partitionId, 10); + else if (typeof object.partitionId === "number") + message.partitionId = object.partitionId; + else if (typeof object.partitionId === "object") + message.partitionId = new $util.LongBits(object.partitionId.low >>> 0, object.partitionId.high >>> 0).toNumber(); + if (object.offset != null) + if ($util.Long) + (message.offset = $util.Long.fromValue(object.offset)).unsigned = false; + else if (typeof object.offset === "string") + message.offset = parseInt(object.offset, 10); + else if (typeof object.offset === "number") + message.offset = object.offset; + else if (typeof object.offset === "object") + message.offset = new $util.LongBits(object.offset.low >>> 0, object.offset.high >>> 0).toNumber(); + if (object.apiViolationReason != null) { + if (typeof object.apiViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.apiViolationReason: object expected"); + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); + } + if (object.schemaViolationReason != null) { + if (typeof object.schemaViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.schemaViolationReason: object expected"); + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); + } + return message; + }; + + /** + * Creates a plain object from a ConfluentCloudFailureReason message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} message ConfluentCloudFailureReason + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ConfluentCloudFailureReason.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.clusterId = ""; + object.kafkaTopic = ""; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.partitionId = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.partitionId = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.offset = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.offset = options.longs === String ? "0" : 0; + } + if (message.clusterId != null && message.hasOwnProperty("clusterId")) + object.clusterId = message.clusterId; + if (message.kafkaTopic != null && message.hasOwnProperty("kafkaTopic")) + object.kafkaTopic = message.kafkaTopic; + if (message.partitionId != null && message.hasOwnProperty("partitionId")) + if (typeof message.partitionId === "number") + object.partitionId = options.longs === String ? String(message.partitionId) : message.partitionId; + else + object.partitionId = options.longs === String ? $util.Long.prototype.toString.call(message.partitionId) : options.longs === Number ? new $util.LongBits(message.partitionId.low >>> 0, message.partitionId.high >>> 0).toNumber() : message.partitionId; + if (message.offset != null && message.hasOwnProperty("offset")) + if (typeof message.offset === "number") + object.offset = options.longs === String ? String(message.offset) : message.offset; + else + object.offset = options.longs === String ? $util.Long.prototype.toString.call(message.offset) : options.longs === Number ? new $util.LongBits(message.offset.low >>> 0, message.offset.high >>> 0).toNumber() : message.offset; + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + object.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.toObject(message.apiViolationReason, options); + if (options.oneofs) + object.reason = "apiViolationReason"; + } + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + object.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.toObject(message.schemaViolationReason, options); + if (options.oneofs) + object.reason = "schemaViolationReason"; + } + return object; + }; + + /** + * Converts this ConfluentCloudFailureReason to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason + * @instance + * @returns {Object.} JSON object + */ + ConfluentCloudFailureReason.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for ConfluentCloudFailureReason + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ConfluentCloudFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason"; + }; + + return ConfluentCloudFailureReason; + })(); + + IngestionFailureEvent.AwsKinesisFailureReason = (function() { + + /** + * Properties of an AwsKinesisFailureReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface IAwsKinesisFailureReason + * @property {string|null} [streamArn] AwsKinesisFailureReason streamArn + * @property {string|null} [partitionKey] AwsKinesisFailureReason partitionKey + * @property {string|null} [sequenceNumber] AwsKinesisFailureReason sequenceNumber + * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] AwsKinesisFailureReason schemaViolationReason + */ + + /** + * Constructs a new AwsKinesisFailureReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents an AwsKinesisFailureReason. + * @implements IAwsKinesisFailureReason + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason=} [properties] Properties to set + */ + function AwsKinesisFailureReason(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * AwsKinesisFailureReason streamArn. + * @member {string} streamArn + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @instance + */ + AwsKinesisFailureReason.prototype.streamArn = ""; + + /** + * AwsKinesisFailureReason partitionKey. + * @member {string} partitionKey + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @instance + */ + AwsKinesisFailureReason.prototype.partitionKey = ""; + + /** + * AwsKinesisFailureReason sequenceNumber. + * @member {string} sequenceNumber + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @instance + */ + AwsKinesisFailureReason.prototype.sequenceNumber = ""; + + /** + * AwsKinesisFailureReason schemaViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null|undefined} schemaViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @instance + */ + AwsKinesisFailureReason.prototype.schemaViolationReason = null; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * AwsKinesisFailureReason reason. + * @member {"schemaViolationReason"|undefined} reason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @instance + */ + Object.defineProperty(AwsKinesisFailureReason.prototype, "reason", { + get: $util.oneOfGetter($oneOfFields = ["schemaViolationReason"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new AwsKinesisFailureReason instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason} AwsKinesisFailureReason instance + */ + AwsKinesisFailureReason.create = function create(properties) { + return new AwsKinesisFailureReason(properties); + }; + + /** + * Encodes the specified AwsKinesisFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason} message AwsKinesisFailureReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AwsKinesisFailureReason.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.streamArn != null && Object.hasOwnProperty.call(message, "streamArn")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.streamArn); + if (message.partitionKey != null && Object.hasOwnProperty.call(message, "partitionKey")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.partitionKey); + if (message.sequenceNumber != null && Object.hasOwnProperty.call(message, "sequenceNumber")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.sequenceNumber); + if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + return writer; + }; + + /** + * Encodes the specified AwsKinesisFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IAwsKinesisFailureReason} message AwsKinesisFailureReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + AwsKinesisFailureReason.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an AwsKinesisFailureReason message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason} AwsKinesisFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AwsKinesisFailureReason.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + case 1: { + message.streamArn = reader.string(); + break; + } + case 2: { + message.partitionKey = reader.string(); + break; + } + case 3: { + message.sequenceNumber = reader.string(); + break; + } + case 4: { + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an AwsKinesisFailureReason message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason} AwsKinesisFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + AwsKinesisFailureReason.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an AwsKinesisFailureReason message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + AwsKinesisFailureReason.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.streamArn != null && message.hasOwnProperty("streamArn")) + if (!$util.isString(message.streamArn)) + return "streamArn: string expected"; + if (message.partitionKey != null && message.hasOwnProperty("partitionKey")) + if (!$util.isString(message.partitionKey)) + return "partitionKey: string expected"; + if (message.sequenceNumber != null && message.hasOwnProperty("sequenceNumber")) + if (!$util.isString(message.sequenceNumber)) + return "sequenceNumber: string expected"; + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.verify(message.schemaViolationReason); + if (error) + return "schemaViolationReason." + error; + } + } + return null; + }; + + /** + * Creates an AwsKinesisFailureReason message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason} AwsKinesisFailureReason + */ + AwsKinesisFailureReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason) + return object; + var message = new $root.google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason(); + if (object.streamArn != null) + message.streamArn = String(object.streamArn); + if (object.partitionKey != null) + message.partitionKey = String(object.partitionKey); + if (object.sequenceNumber != null) + message.sequenceNumber = String(object.sequenceNumber); + if (object.schemaViolationReason != null) { + if (typeof object.schemaViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.schemaViolationReason: object expected"); + message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); + } + return message; + }; + + /** + * Creates a plain object from an AwsKinesisFailureReason message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason} message AwsKinesisFailureReason + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + AwsKinesisFailureReason.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.streamArn = ""; + object.partitionKey = ""; + object.sequenceNumber = ""; + } + if (message.streamArn != null && message.hasOwnProperty("streamArn")) + object.streamArn = message.streamArn; + if (message.partitionKey != null && message.hasOwnProperty("partitionKey")) + object.partitionKey = message.partitionKey; + if (message.sequenceNumber != null && message.hasOwnProperty("sequenceNumber")) + object.sequenceNumber = message.sequenceNumber; + if (message.schemaViolationReason != null && message.hasOwnProperty("schemaViolationReason")) { + object.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.toObject(message.schemaViolationReason, options); + if (options.oneofs) + object.reason = "schemaViolationReason"; + } + return object; + }; + + /** + * Converts this AwsKinesisFailureReason to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @instance + * @returns {Object.} JSON object + */ + AwsKinesisFailureReason.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for AwsKinesisFailureReason + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + AwsKinesisFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason"; + }; + + return AwsKinesisFailureReason; + })(); + + return IngestionFailureEvent; + })(); + + v1.JavaScriptUDF = (function() { + + /** + * Properties of a JavaScriptUDF. + * @memberof google.pubsub.v1 + * @interface IJavaScriptUDF + * @property {string|null} [functionName] JavaScriptUDF functionName + * @property {string|null} [code] JavaScriptUDF code + */ + + /** + * Constructs a new JavaScriptUDF. + * @memberof google.pubsub.v1 + * @classdesc Represents a JavaScriptUDF. + * @implements IJavaScriptUDF + * @constructor + * @param {google.pubsub.v1.IJavaScriptUDF=} [properties] Properties to set + */ + function JavaScriptUDF(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * JavaScriptUDF functionName. + * @member {string} functionName + * @memberof google.pubsub.v1.JavaScriptUDF + * @instance + */ + JavaScriptUDF.prototype.functionName = ""; + + /** + * JavaScriptUDF code. + * @member {string} code + * @memberof google.pubsub.v1.JavaScriptUDF + * @instance + */ + JavaScriptUDF.prototype.code = ""; + + /** + * Creates a new JavaScriptUDF instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {google.pubsub.v1.IJavaScriptUDF=} [properties] Properties to set + * @returns {google.pubsub.v1.JavaScriptUDF} JavaScriptUDF instance + */ + JavaScriptUDF.create = function create(properties) { + return new JavaScriptUDF(properties); + }; + + /** + * Encodes the specified JavaScriptUDF message. Does not implicitly {@link google.pubsub.v1.JavaScriptUDF.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {google.pubsub.v1.IJavaScriptUDF} message JavaScriptUDF message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + JavaScriptUDF.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.functionName != null && Object.hasOwnProperty.call(message, "functionName")) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.functionName); + if (message.code != null && Object.hasOwnProperty.call(message, "code")) + writer.uint32(/* id 2, wireType 2 =*/18).string(message.code); + return writer; + }; + + /** + * Encodes the specified JavaScriptUDF message, length delimited. Does not implicitly {@link google.pubsub.v1.JavaScriptUDF.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {google.pubsub.v1.IJavaScriptUDF} message JavaScriptUDF message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + JavaScriptUDF.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a JavaScriptUDF message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.JavaScriptUDF} JavaScriptUDF + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + JavaScriptUDF.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.JavaScriptUDF(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + case 1: { + message.functionName = reader.string(); + break; + } + case 2: { + message.code = reader.string(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a JavaScriptUDF message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.JavaScriptUDF} JavaScriptUDF + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + JavaScriptUDF.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a JavaScriptUDF message. + * @function verify + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + JavaScriptUDF.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.functionName != null && message.hasOwnProperty("functionName")) + if (!$util.isString(message.functionName)) + return "functionName: string expected"; + if (message.code != null && message.hasOwnProperty("code")) + if (!$util.isString(message.code)) + return "code: string expected"; + return null; + }; + + /** + * Creates a JavaScriptUDF message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.JavaScriptUDF} JavaScriptUDF + */ + JavaScriptUDF.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.JavaScriptUDF) + return object; + var message = new $root.google.pubsub.v1.JavaScriptUDF(); + if (object.functionName != null) + message.functionName = String(object.functionName); + if (object.code != null) + message.code = String(object.code); + return message; + }; + + /** + * Creates a plain object from a JavaScriptUDF message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {google.pubsub.v1.JavaScriptUDF} message JavaScriptUDF + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + JavaScriptUDF.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.functionName = ""; + object.code = ""; + } + if (message.functionName != null && message.hasOwnProperty("functionName")) + object.functionName = message.functionName; + if (message.code != null && message.hasOwnProperty("code")) + object.code = message.code; + return object; + }; + + /** + * Converts this JavaScriptUDF to JSON. + * @function toJSON + * @memberof google.pubsub.v1.JavaScriptUDF + * @instance + * @returns {Object.} JSON object + */ + JavaScriptUDF.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for JavaScriptUDF + * @function getTypeUrl + * @memberof google.pubsub.v1.JavaScriptUDF + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + JavaScriptUDF.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.JavaScriptUDF"; + }; + + return JavaScriptUDF; + })(); + + v1.MessageTransform = (function() { + + /** + * Properties of a MessageTransform. + * @memberof google.pubsub.v1 + * @interface IMessageTransform + * @property {google.pubsub.v1.IJavaScriptUDF|null} [javascriptUdf] MessageTransform javascriptUdf + * @property {boolean|null} [enabled] MessageTransform enabled + * @property {boolean|null} [disabled] MessageTransform disabled + */ + + /** + * Constructs a new MessageTransform. + * @memberof google.pubsub.v1 + * @classdesc Represents a MessageTransform. + * @implements IMessageTransform + * @constructor + * @param {google.pubsub.v1.IMessageTransform=} [properties] Properties to set + */ + function MessageTransform(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * MessageTransform javascriptUdf. + * @member {google.pubsub.v1.IJavaScriptUDF|null|undefined} javascriptUdf + * @memberof google.pubsub.v1.MessageTransform + * @instance + */ + MessageTransform.prototype.javascriptUdf = null; + + /** + * MessageTransform enabled. + * @member {boolean} enabled + * @memberof google.pubsub.v1.MessageTransform + * @instance + */ + MessageTransform.prototype.enabled = false; + + /** + * MessageTransform disabled. + * @member {boolean} disabled + * @memberof google.pubsub.v1.MessageTransform + * @instance + */ + MessageTransform.prototype.disabled = false; + + // OneOf field names bound to virtual getters and setters + var $oneOfFields; + + /** + * MessageTransform transform. + * @member {"javascriptUdf"|undefined} transform + * @memberof google.pubsub.v1.MessageTransform + * @instance + */ + Object.defineProperty(MessageTransform.prototype, "transform", { + get: $util.oneOfGetter($oneOfFields = ["javascriptUdf"]), + set: $util.oneOfSetter($oneOfFields) + }); + + /** + * Creates a new MessageTransform instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {google.pubsub.v1.IMessageTransform=} [properties] Properties to set + * @returns {google.pubsub.v1.MessageTransform} MessageTransform instance + */ + MessageTransform.create = function create(properties) { + return new MessageTransform(properties); + }; + + /** + * Encodes the specified MessageTransform message. Does not implicitly {@link google.pubsub.v1.MessageTransform.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {google.pubsub.v1.IMessageTransform} message MessageTransform message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageTransform.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.javascriptUdf != null && Object.hasOwnProperty.call(message, "javascriptUdf")) + $root.google.pubsub.v1.JavaScriptUDF.encode(message.javascriptUdf, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); + if (message.enabled != null && Object.hasOwnProperty.call(message, "enabled")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.enabled); + if (message.disabled != null && Object.hasOwnProperty.call(message, "disabled")) + writer.uint32(/* id 4, wireType 0 =*/32).bool(message.disabled); + return writer; + }; + + /** + * Encodes the specified MessageTransform message, length delimited. Does not implicitly {@link google.pubsub.v1.MessageTransform.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {google.pubsub.v1.IMessageTransform} message MessageTransform message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageTransform.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a MessageTransform message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.MessageTransform} MessageTransform + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageTransform.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.MessageTransform(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + case 2: { + message.javascriptUdf = $root.google.pubsub.v1.JavaScriptUDF.decode(reader, reader.uint32()); + break; + } + case 3: { + message.enabled = reader.bool(); + break; + } + case 4: { + message.disabled = reader.bool(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; - /** - * Creates a ConfluentCloudFailureReason message from a plain object. Also converts values to their respective internal types. - * @function fromObject - * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason - * @static - * @param {Object.} object Plain object - * @returns {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} ConfluentCloudFailureReason - */ - ConfluentCloudFailureReason.fromObject = function fromObject(object) { - if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason) - return object; - var message = new $root.google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason(); - if (object.clusterId != null) - message.clusterId = String(object.clusterId); - if (object.kafkaTopic != null) - message.kafkaTopic = String(object.kafkaTopic); - if (object.partitionId != null) - if ($util.Long) - (message.partitionId = $util.Long.fromValue(object.partitionId)).unsigned = false; - else if (typeof object.partitionId === "string") - message.partitionId = parseInt(object.partitionId, 10); - else if (typeof object.partitionId === "number") - message.partitionId = object.partitionId; - else if (typeof object.partitionId === "object") - message.partitionId = new $util.LongBits(object.partitionId.low >>> 0, object.partitionId.high >>> 0).toNumber(); - if (object.offset != null) - if ($util.Long) - (message.offset = $util.Long.fromValue(object.offset)).unsigned = false; - else if (typeof object.offset === "string") - message.offset = parseInt(object.offset, 10); - else if (typeof object.offset === "number") - message.offset = object.offset; - else if (typeof object.offset === "object") - message.offset = new $util.LongBits(object.offset.low >>> 0, object.offset.high >>> 0).toNumber(); - if (object.apiViolationReason != null) { - if (typeof object.apiViolationReason !== "object") - throw TypeError(".google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.apiViolationReason: object expected"); - message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); - } - return message; - }; + /** + * Decodes a MessageTransform message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.MessageTransform} MessageTransform + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageTransform.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; - /** - * Creates a plain object from a ConfluentCloudFailureReason message. Also converts values to other types if specified. - * @function toObject - * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason - * @static - * @param {google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason} message ConfluentCloudFailureReason - * @param {$protobuf.IConversionOptions} [options] Conversion options - * @returns {Object.} Plain object - */ - ConfluentCloudFailureReason.toObject = function toObject(message, options) { - if (!options) - options = {}; - var object = {}; - if (options.defaults) { - object.clusterId = ""; - object.kafkaTopic = ""; - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.partitionId = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.partitionId = options.longs === String ? "0" : 0; - if ($util.Long) { - var long = new $util.Long(0, 0, false); - object.offset = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; - } else - object.offset = options.longs === String ? "0" : 0; - } - if (message.clusterId != null && message.hasOwnProperty("clusterId")) - object.clusterId = message.clusterId; - if (message.kafkaTopic != null && message.hasOwnProperty("kafkaTopic")) - object.kafkaTopic = message.kafkaTopic; - if (message.partitionId != null && message.hasOwnProperty("partitionId")) - if (typeof message.partitionId === "number") - object.partitionId = options.longs === String ? String(message.partitionId) : message.partitionId; - else - object.partitionId = options.longs === String ? $util.Long.prototype.toString.call(message.partitionId) : options.longs === Number ? new $util.LongBits(message.partitionId.low >>> 0, message.partitionId.high >>> 0).toNumber() : message.partitionId; - if (message.offset != null && message.hasOwnProperty("offset")) - if (typeof message.offset === "number") - object.offset = options.longs === String ? String(message.offset) : message.offset; - else - object.offset = options.longs === String ? $util.Long.prototype.toString.call(message.offset) : options.longs === Number ? new $util.LongBits(message.offset.low >>> 0, message.offset.high >>> 0).toNumber() : message.offset; - if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { - object.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.toObject(message.apiViolationReason, options); - if (options.oneofs) - object.reason = "apiViolationReason"; + /** + * Verifies a MessageTransform message. + * @function verify + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MessageTransform.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + var properties = {}; + if (message.javascriptUdf != null && message.hasOwnProperty("javascriptUdf")) { + properties.transform = 1; + { + var error = $root.google.pubsub.v1.JavaScriptUDF.verify(message.javascriptUdf); + if (error) + return "javascriptUdf." + error; } + } + if (message.enabled != null && message.hasOwnProperty("enabled")) + if (typeof message.enabled !== "boolean") + return "enabled: boolean expected"; + if (message.disabled != null && message.hasOwnProperty("disabled")) + if (typeof message.disabled !== "boolean") + return "disabled: boolean expected"; + return null; + }; + + /** + * Creates a MessageTransform message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.MessageTransform} MessageTransform + */ + MessageTransform.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.MessageTransform) return object; - }; + var message = new $root.google.pubsub.v1.MessageTransform(); + if (object.javascriptUdf != null) { + if (typeof object.javascriptUdf !== "object") + throw TypeError(".google.pubsub.v1.MessageTransform.javascriptUdf: object expected"); + message.javascriptUdf = $root.google.pubsub.v1.JavaScriptUDF.fromObject(object.javascriptUdf); + } + if (object.enabled != null) + message.enabled = Boolean(object.enabled); + if (object.disabled != null) + message.disabled = Boolean(object.disabled); + return message; + }; - /** - * Converts this ConfluentCloudFailureReason to JSON. - * @function toJSON - * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason - * @instance - * @returns {Object.} JSON object - */ - ConfluentCloudFailureReason.prototype.toJSON = function toJSON() { - return this.constructor.toObject(this, $protobuf.util.toJSONOptions); - }; + /** + * Creates a plain object from a MessageTransform message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {google.pubsub.v1.MessageTransform} message MessageTransform + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MessageTransform.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.enabled = false; + object.disabled = false; + } + if (message.javascriptUdf != null && message.hasOwnProperty("javascriptUdf")) { + object.javascriptUdf = $root.google.pubsub.v1.JavaScriptUDF.toObject(message.javascriptUdf, options); + if (options.oneofs) + object.transform = "javascriptUdf"; + } + if (message.enabled != null && message.hasOwnProperty("enabled")) + object.enabled = message.enabled; + if (message.disabled != null && message.hasOwnProperty("disabled")) + object.disabled = message.disabled; + return object; + }; - /** - * Gets the default type url for ConfluentCloudFailureReason - * @function getTypeUrl - * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason - * @static - * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") - * @returns {string} The default type url - */ - ConfluentCloudFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { - if (typeUrlPrefix === undefined) { - typeUrlPrefix = "type.googleapis.com"; - } - return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason"; - }; + /** + * Converts this MessageTransform to JSON. + * @function toJSON + * @memberof google.pubsub.v1.MessageTransform + * @instance + * @returns {Object.} JSON object + */ + MessageTransform.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; - return ConfluentCloudFailureReason; - })(); + /** + * Gets the default type url for MessageTransform + * @function getTypeUrl + * @memberof google.pubsub.v1.MessageTransform + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + MessageTransform.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.MessageTransform"; + }; - return IngestionFailureEvent; + return MessageTransform; })(); v1.Topic = (function() { @@ -6330,6 +7488,7 @@ * @property {google.protobuf.IDuration|null} [messageRetentionDuration] Topic messageRetentionDuration * @property {google.pubsub.v1.Topic.State|null} [state] Topic state * @property {google.pubsub.v1.IIngestionDataSourceSettings|null} [ingestionDataSourceSettings] Topic ingestionDataSourceSettings + * @property {Array.|null} [messageTransforms] Topic messageTransforms */ /** @@ -6342,6 +7501,7 @@ */ function Topic(properties) { this.labels = {}; + this.messageTransforms = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -6420,6 +7580,14 @@ */ Topic.prototype.ingestionDataSourceSettings = null; + /** + * Topic messageTransforms. + * @member {Array.} messageTransforms + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.messageTransforms = $util.emptyArray; + /** * Creates a new Topic instance using the specified properties. * @function create @@ -6463,6 +7631,9 @@ writer.uint32(/* id 9, wireType 0 =*/72).int32(message.state); if (message.ingestionDataSourceSettings != null && Object.hasOwnProperty.call(message, "ingestionDataSourceSettings")) $root.google.pubsub.v1.IngestionDataSourceSettings.encode(message.ingestionDataSourceSettings, writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim(); + if (message.messageTransforms != null && message.messageTransforms.length) + for (var i = 0; i < message.messageTransforms.length; ++i) + $root.google.pubsub.v1.MessageTransform.encode(message.messageTransforms[i], writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); return writer; }; @@ -6554,6 +7725,12 @@ message.ingestionDataSourceSettings = $root.google.pubsub.v1.IngestionDataSourceSettings.decode(reader, reader.uint32()); break; } + case 13: { + if (!(message.messageTransforms && message.messageTransforms.length)) + message.messageTransforms = []; + message.messageTransforms.push($root.google.pubsub.v1.MessageTransform.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -6635,6 +7812,15 @@ if (error) return "ingestionDataSourceSettings." + error; } + if (message.messageTransforms != null && message.hasOwnProperty("messageTransforms")) { + if (!Array.isArray(message.messageTransforms)) + return "messageTransforms: array expected"; + for (var i = 0; i < message.messageTransforms.length; ++i) { + var error = $root.google.pubsub.v1.MessageTransform.verify(message.messageTransforms[i]); + if (error) + return "messageTransforms." + error; + } + } return null; }; @@ -6703,6 +7889,16 @@ throw TypeError(".google.pubsub.v1.Topic.ingestionDataSourceSettings: object expected"); message.ingestionDataSourceSettings = $root.google.pubsub.v1.IngestionDataSourceSettings.fromObject(object.ingestionDataSourceSettings); } + if (object.messageTransforms) { + if (!Array.isArray(object.messageTransforms)) + throw TypeError(".google.pubsub.v1.Topic.messageTransforms: array expected"); + message.messageTransforms = []; + for (var i = 0; i < object.messageTransforms.length; ++i) { + if (typeof object.messageTransforms[i] !== "object") + throw TypeError(".google.pubsub.v1.Topic.messageTransforms: object expected"); + message.messageTransforms[i] = $root.google.pubsub.v1.MessageTransform.fromObject(object.messageTransforms[i]); + } + } return message; }; @@ -6719,6 +7915,8 @@ if (!options) options = {}; var object = {}; + if (options.arrays || options.defaults) + object.messageTransforms = []; if (options.objects || options.defaults) object.labels = {}; if (options.defaults) { @@ -6753,6 +7951,11 @@ object.state = options.enums === String ? $root.google.pubsub.v1.Topic.State[message.state] === undefined ? message.state : $root.google.pubsub.v1.Topic.State[message.state] : message.state; if (message.ingestionDataSourceSettings != null && message.hasOwnProperty("ingestionDataSourceSettings")) object.ingestionDataSourceSettings = $root.google.pubsub.v1.IngestionDataSourceSettings.toObject(message.ingestionDataSourceSettings, options); + if (message.messageTransforms && message.messageTransforms.length) { + object.messageTransforms = []; + for (var j = 0; j < message.messageTransforms.length; ++j) + object.messageTransforms[j] = $root.google.pubsub.v1.MessageTransform.toObject(message.messageTransforms[j], options); + } return object; }; @@ -10735,6 +11938,7 @@ * @property {google.protobuf.IDuration|null} [topicMessageRetentionDuration] Subscription topicMessageRetentionDuration * @property {google.pubsub.v1.Subscription.State|null} [state] Subscription state * @property {google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo|null} [analyticsHubSubscriptionInfo] Subscription analyticsHubSubscriptionInfo + * @property {Array.|null} [messageTransforms] Subscription messageTransforms */ /** @@ -10747,6 +11951,7 @@ */ function Subscription(properties) { this.labels = {}; + this.messageTransforms = []; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -10905,6 +12110,14 @@ */ Subscription.prototype.analyticsHubSubscriptionInfo = null; + /** + * Subscription messageTransforms. + * @member {Array.} messageTransforms + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.messageTransforms = $util.emptyArray; + /** * Creates a new Subscription instance using the specified properties. * @function create @@ -10968,6 +12181,9 @@ $root.google.pubsub.v1.CloudStorageConfig.encode(message.cloudStorageConfig, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); if (message.analyticsHubSubscriptionInfo != null && Object.hasOwnProperty.call(message, "analyticsHubSubscriptionInfo")) $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.encode(message.analyticsHubSubscriptionInfo, writer.uint32(/* id 23, wireType 2 =*/186).fork()).ldelim(); + if (message.messageTransforms != null && message.messageTransforms.length) + for (var i = 0; i < message.messageTransforms.length; ++i) + $root.google.pubsub.v1.MessageTransform.encode(message.messageTransforms[i], writer.uint32(/* id 25, wireType 2 =*/202).fork()).ldelim(); return writer; }; @@ -11099,6 +12315,12 @@ message.analyticsHubSubscriptionInfo = $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.decode(reader, reader.uint32()); break; } + case 25: { + if (!(message.messageTransforms && message.messageTransforms.length)) + message.messageTransforms = []; + message.messageTransforms.push($root.google.pubsub.v1.MessageTransform.decode(reader, reader.uint32())); + break; + } default: reader.skipType(tag & 7); break; @@ -11220,6 +12442,15 @@ if (error) return "analyticsHubSubscriptionInfo." + error; } + if (message.messageTransforms != null && message.hasOwnProperty("messageTransforms")) { + if (!Array.isArray(message.messageTransforms)) + return "messageTransforms: array expected"; + for (var i = 0; i < message.messageTransforms.length; ++i) { + var error = $root.google.pubsub.v1.MessageTransform.verify(message.messageTransforms[i]); + if (error) + return "messageTransforms." + error; + } + } return null; }; @@ -11323,6 +12554,16 @@ throw TypeError(".google.pubsub.v1.Subscription.analyticsHubSubscriptionInfo: object expected"); message.analyticsHubSubscriptionInfo = $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.fromObject(object.analyticsHubSubscriptionInfo); } + if (object.messageTransforms) { + if (!Array.isArray(object.messageTransforms)) + throw TypeError(".google.pubsub.v1.Subscription.messageTransforms: array expected"); + message.messageTransforms = []; + for (var i = 0; i < object.messageTransforms.length; ++i) { + if (typeof object.messageTransforms[i] !== "object") + throw TypeError(".google.pubsub.v1.Subscription.messageTransforms: object expected"); + message.messageTransforms[i] = $root.google.pubsub.v1.MessageTransform.fromObject(object.messageTransforms[i]); + } + } return message; }; @@ -11339,6 +12580,8 @@ if (!options) options = {}; var object = {}; + if (options.arrays || options.defaults) + object.messageTransforms = []; if (options.objects || options.defaults) object.labels = {}; if (options.defaults) { @@ -11403,6 +12646,11 @@ object.cloudStorageConfig = $root.google.pubsub.v1.CloudStorageConfig.toObject(message.cloudStorageConfig, options); if (message.analyticsHubSubscriptionInfo != null && message.hasOwnProperty("analyticsHubSubscriptionInfo")) object.analyticsHubSubscriptionInfo = $root.google.pubsub.v1.Subscription.AnalyticsHubSubscriptionInfo.toObject(message.analyticsHubSubscriptionInfo, options); + if (message.messageTransforms && message.messageTransforms.length) { + object.messageTransforms = []; + for (var j = 0; j < message.messageTransforms.length; ++j) + object.messageTransforms[j] = $root.google.pubsub.v1.MessageTransform.toObject(message.messageTransforms[j], options); + } return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 4befa0df29c..17de0553e7c 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -6,9 +6,8 @@ "nested": { "v1": { "options": { - "cc_enable_arenas": true, "csharp_namespace": "Google.Cloud.PubSub.V1", - "go_package": "cloud.google.com/go/pubsub/apiv1/pubsubpb;pubsubpb", + "go_package": "cloud.google.com/go/pubsub/v2/apiv1/pubsubpb;pubsubpb", "java_multiple_files": true, "java_outer_classname": "SchemaProto", "java_package": "com.google.pubsub.v1", @@ -663,7 +662,8 @@ "cloudStorageFailure", "awsMskFailure", "azureEventHubsFailure", - "confluentCloudFailure" + "confluentCloudFailure", + "awsKinesisFailure" ] } }, @@ -709,6 +709,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "awsKinesisFailure": { + "type": "AwsKinesisFailureReason", + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -718,12 +725,16 @@ "AvroFailureReason": { "fields": {} }, + "SchemaViolationReason": { + "fields": {} + }, "CloudStorageFailure": { "oneofs": { "reason": { "oneof": [ "avroFailureReason", - "apiViolationReason" + "apiViolationReason", + "schemaViolationReason" ] } }, @@ -762,6 +773,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "schemaViolationReason": { + "type": "SchemaViolationReason", + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -769,7 +787,8 @@ "oneofs": { "reason": { "oneof": [ - "apiViolationReason" + "apiViolationReason", + "schemaViolationReason" ] } }, @@ -808,6 +827,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "schemaViolationReason": { + "type": "SchemaViolationReason", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -815,7 +841,8 @@ "oneofs": { "reason": { "oneof": [ - "apiViolationReason" + "apiViolationReason", + "schemaViolationReason" ] } }, @@ -854,6 +881,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "schemaViolationReason": { + "type": "SchemaViolationReason", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -861,7 +895,8 @@ "oneofs": { "reason": { "oneof": [ - "apiViolationReason" + "apiViolationReason", + "schemaViolationReason" ] } }, @@ -900,15 +935,114 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "schemaViolationReason": { + "type": "SchemaViolationReason", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + } + }, + "AwsKinesisFailureReason": { + "oneofs": { + "reason": { + "oneof": [ + "schemaViolationReason" + ] + } + }, + "fields": { + "streamArn": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "partitionKey": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "sequenceNumber": { + "type": "string", + "id": 3, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "schemaViolationReason": { + "type": "SchemaViolationReason", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } } } }, + "JavaScriptUDF": { + "fields": { + "functionName": { + "type": "string", + "id": 1, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + }, + "code": { + "type": "string", + "id": 2, + "options": { + "(google.api.field_behavior)": "REQUIRED" + } + } + } + }, + "MessageTransform": { + "oneofs": { + "transform": { + "oneof": [ + "javascriptUdf" + ] + } + }, + "fields": { + "javascriptUdf": { + "type": "JavaScriptUDF", + "id": 2, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "enabled": { + "type": "bool", + "id": 3, + "options": { + "deprecated": true, + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "disabled": { + "type": "bool", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + } + } + }, "Topic": { "options": { "(google.api.resource).type": "pubsub.googleapis.com/Topic", - "(google.api.resource).pattern": "_deleted-topic_" + "(google.api.resource).pattern": "_deleted-topic_", + "(google.api.resource).plural": "topics", + "(google.api.resource).singular": "topic" }, "fields": { "name": { @@ -974,6 +1108,14 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "messageTransforms": { + "rule": "repeated", + "type": "MessageTransform", + "id": 13, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -1549,7 +1691,9 @@ "Subscription": { "options": { "(google.api.resource).type": "pubsub.googleapis.com/Subscription", - "(google.api.resource).pattern": "projects/{project}/subscriptions/{subscription}" + "(google.api.resource).pattern": "projects/{project}/subscriptions/{subscription}", + "(google.api.resource).plural": "subscriptions", + "(google.api.resource).singular": "subscription" }, "fields": { "name": { @@ -1686,6 +1830,14 @@ "options": { "(google.api.field_behavior)": "OUTPUT_ONLY" } + }, + "messageTransforms": { + "rule": "repeated", + "type": "MessageTransform", + "id": 25, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -2484,7 +2636,9 @@ "Snapshot": { "options": { "(google.api.resource).type": "pubsub.googleapis.com/Snapshot", - "(google.api.resource).pattern": "projects/{project}/snapshots/{snapshot}" + "(google.api.resource).pattern": "projects/{project}/snapshots/{snapshot}", + "(google.api.resource).plural": "snapshots", + "(google.api.resource).singular": "snapshot" }, "fields": { "name": { diff --git a/handwritten/pubsub/src/v1/publisher_client.ts b/handwritten/pubsub/src/v1/publisher_client.ts index ae3a4f59136..9c3fe64a7fc 100644 --- a/handwritten/pubsub/src/v1/publisher_client.ts +++ b/handwritten/pubsub/src/v1/publisher_client.ts @@ -148,6 +148,9 @@ export class PublisherClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + // Request numeric enum values if REST transport is used. + opts.numericEnums = true; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; @@ -242,6 +245,22 @@ export class PublisherClient { ), }; + const protoFilesRoot = this._gaxModule.protobuf.Root.fromJSON(jsonProtos); + // Some methods on this API support automatically batching + // requests; denote this. + + this.descriptors.batching = { + publish: new this._gaxModule.BundleDescriptor( + 'messages', + ['topic'], + 'message_ids', + this._gaxModule.GrpcClient.createByteLengthFunction( + // eslint-disable-next-line @typescript-eslint/no-explicit-any + protoFilesRoot.lookupType('google.pubsub.v1.PubsubMessage') as any, + ), + ), + }; + // Put together the default options sent with requests. this._defaults = this._gaxGrpc.constructSettings( 'google.pubsub.v1.Publisher', @@ -317,7 +336,10 @@ export class PublisherClient { }, ); - const descriptor = this.descriptors.page[methodName] || undefined; + const descriptor = + this.descriptors.page[methodName] || + this.descriptors.batching?.[methodName] || + undefined; const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], @@ -471,8 +493,6 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.create_topic.js - * region_tag:pubsub_v1_generated_Publisher_CreateTopic_async */ createTopic( request?: protos.google.pubsub.v1.ITopic, @@ -586,8 +606,6 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.update_topic.js - * region_tag:pubsub_v1_generated_Publisher_UpdateTopic_async */ updateTopic( request?: protos.google.pubsub.v1.IUpdateTopicRequest, @@ -698,8 +716,6 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.PublishResponse|PublishResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.publish.js - * region_tag:pubsub_v1_generated_Publisher_Publish_async */ publish( request?: protos.google.pubsub.v1.IPublishRequest, @@ -807,8 +823,6 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Topic|Topic}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.get_topic.js - * region_tag:pubsub_v1_generated_Publisher_GetTopic_async */ getTopic( request?: protos.google.pubsub.v1.IGetTopicRequest, @@ -920,8 +934,6 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.delete_topic.js - * region_tag:pubsub_v1_generated_Publisher_DeleteTopic_async */ deleteTopic( request?: protos.google.pubsub.v1.IDeleteTopicRequest, @@ -1032,8 +1044,6 @@ export class PublisherClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.DetachSubscriptionResponse|DetachSubscriptionResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.detach_subscription.js - * region_tag:pubsub_v1_generated_Publisher_DetachSubscription_async */ detachSubscription( request?: protos.google.pubsub.v1.IDetachSubscriptionRequest, @@ -1320,8 +1330,6 @@ export class PublisherClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.list_topics.js - * region_tag:pubsub_v1_generated_Publisher_ListTopics_async */ listTopicsAsync( request?: protos.google.pubsub.v1.IListTopicsRequest, @@ -1549,8 +1557,6 @@ export class PublisherClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.list_topic_subscriptions.js - * region_tag:pubsub_v1_generated_Publisher_ListTopicSubscriptions_async */ listTopicSubscriptionsAsync( request?: protos.google.pubsub.v1.IListTopicSubscriptionsRequest, @@ -1776,8 +1782,6 @@ export class PublisherClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. - * @example include:samples/generated/v1/publisher.list_topic_snapshots.js - * region_tag:pubsub_v1_generated_Publisher_ListTopicSnapshots_async */ listTopicSnapshotsAsync( request?: protos.google.pubsub.v1.IListTopicSnapshotsRequest, @@ -2128,7 +2132,9 @@ export class PublisherClient { this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); - void this.iamClient.close(); + this.iamClient.close().catch(err => { + throw err; + }); }); } return Promise.resolve(); diff --git a/handwritten/pubsub/src/v1/schema_service_client.ts b/handwritten/pubsub/src/v1/schema_service_client.ts index 8ff7d28502d..c2e03bdfe73 100644 --- a/handwritten/pubsub/src/v1/schema_service_client.ts +++ b/handwritten/pubsub/src/v1/schema_service_client.ts @@ -147,6 +147,9 @@ export class SchemaServiceClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + // Request numeric enum values if REST transport is used. + opts.numericEnums = true; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; @@ -439,8 +442,6 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.create_schema.js - * region_tag:pubsub_v1_generated_SchemaService_CreateSchema_async */ createSchema( request?: protos.google.pubsub.v1.ICreateSchemaRequest, @@ -551,8 +552,6 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.get_schema.js - * region_tag:pubsub_v1_generated_SchemaService_GetSchema_async */ getSchema( request?: protos.google.pubsub.v1.IGetSchemaRequest, @@ -662,8 +661,6 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.commit_schema.js - * region_tag:pubsub_v1_generated_SchemaService_CommitSchema_async */ commitSchema( request?: protos.google.pubsub.v1.ICommitSchemaRequest, @@ -775,8 +772,6 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.rollback_schema.js - * region_tag:pubsub_v1_generated_SchemaService_RollbackSchema_async */ rollbackSchema( request?: protos.google.pubsub.v1.IRollbackSchemaRequest, @@ -890,8 +885,6 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Schema|Schema}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.delete_schema_revision.js - * region_tag:pubsub_v1_generated_SchemaService_DeleteSchemaRevision_async */ deleteSchemaRevision( request?: protos.google.pubsub.v1.IDeleteSchemaRevisionRequest, @@ -1003,8 +996,6 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.delete_schema.js - * region_tag:pubsub_v1_generated_SchemaService_DeleteSchema_async */ deleteSchema( request?: protos.google.pubsub.v1.IDeleteSchemaRequest, @@ -1114,8 +1105,6 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.ValidateSchemaResponse|ValidateSchemaResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.validate_schema.js - * region_tag:pubsub_v1_generated_SchemaService_ValidateSchema_async */ validateSchema( request?: protos.google.pubsub.v1.IValidateSchemaRequest, @@ -1233,8 +1222,6 @@ export class SchemaServiceClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.ValidateMessageResponse|ValidateMessageResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.validate_message.js - * region_tag:pubsub_v1_generated_SchemaService_ValidateMessage_async */ validateMessage( request?: protos.google.pubsub.v1.IValidateMessageRequest, @@ -1533,8 +1520,6 @@ export class SchemaServiceClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.list_schemas.js - * region_tag:pubsub_v1_generated_SchemaService_ListSchemas_async */ listSchemasAsync( request?: protos.google.pubsub.v1.IListSchemasRequest, @@ -1762,8 +1747,6 @@ export class SchemaServiceClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. - * @example include:samples/generated/v1/schema_service.list_schema_revisions.js - * region_tag:pubsub_v1_generated_SchemaService_ListSchemaRevisions_async */ listSchemaRevisionsAsync( request?: protos.google.pubsub.v1.IListSchemaRevisionsRequest, @@ -2114,7 +2097,9 @@ export class SchemaServiceClient { this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); - void this.iamClient.close(); + this.iamClient.close().catch(err => { + throw err; + }); }); } return Promise.resolve(); diff --git a/handwritten/pubsub/src/v1/subscriber_client.ts b/handwritten/pubsub/src/v1/subscriber_client.ts index 8113e2c15b9..47a3969b8ba 100644 --- a/handwritten/pubsub/src/v1/subscriber_client.ts +++ b/handwritten/pubsub/src/v1/subscriber_client.ts @@ -149,6 +149,9 @@ export class SubscriberClient { (typeof window !== 'undefined' && typeof window?.fetch === 'function'); opts = Object.assign({servicePath, port, clientConfig, fallback}, opts); + // Request numeric enum values if REST transport is used. + opts.numericEnums = true; + // If scopes are unset in options and we're connecting to a non-default endpoint, set scopes just in case. if (servicePath !== this._servicePath && !('scopes' in opts)) { opts['scopes'] = staticMembers.scopes; @@ -552,8 +555,8 @@ export class SubscriberClient { * * If not set, the default retry policy is applied. This generally implies * that messages will be retried as soon as possible for healthy subscribers. - * RetryPolicy will be triggered on NACKs or acknowledgement deadline - * exceeded events for a given message. + * RetryPolicy will be triggered on NACKs or acknowledgment deadline exceeded + * events for a given message. * @param {boolean} [request.detached] * Optional. Indicates whether the subscription is detached from its topic. * Detached subscriptions don't receive messages from their topic and don't @@ -566,7 +569,7 @@ export class SubscriberClient { * subscription: * * * The message sent to a subscriber is guaranteed not to be resent - * before the message's acknowledgement deadline expires. + * before the message's acknowledgment deadline expires. * * An acknowledged message will not be resent to a subscriber. * * Note that subscribers may still receive multiple copies of a message @@ -595,8 +598,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.create_subscription.js - * region_tag:pubsub_v1_generated_Subscriber_CreateSubscription_async */ createSubscription( request?: protos.google.pubsub.v1.ISubscription, @@ -704,8 +705,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.get_subscription.js - * region_tag:pubsub_v1_generated_Subscriber_GetSubscription_async */ getSubscription( request?: protos.google.pubsub.v1.IGetSubscriptionRequest, @@ -817,8 +816,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Subscription|Subscription}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.update_subscription.js - * region_tag:pubsub_v1_generated_Subscriber_UpdateSubscription_async */ updateSubscription( request?: protos.google.pubsub.v1.IUpdateSubscriptionRequest, @@ -930,8 +927,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.delete_subscription.js - * region_tag:pubsub_v1_generated_Subscriber_DeleteSubscription_async */ deleteSubscription( request?: protos.google.pubsub.v1.IDeleteSubscriptionRequest, @@ -1055,8 +1050,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.modify_ack_deadline.js - * region_tag:pubsub_v1_generated_Subscriber_ModifyAckDeadline_async */ modifyAckDeadline( request?: protos.google.pubsub.v1.IModifyAckDeadlineRequest, @@ -1174,8 +1167,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.acknowledge.js - * region_tag:pubsub_v1_generated_Subscriber_Acknowledge_async */ acknowledge( request?: protos.google.pubsub.v1.IAcknowledgeRequest, @@ -1295,8 +1286,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.PullResponse|PullResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.pull.js - * region_tag:pubsub_v1_generated_Subscriber_Pull_async */ pull( request?: protos.google.pubsub.v1.IPullRequest, @@ -1416,8 +1405,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.modify_push_config.js - * region_tag:pubsub_v1_generated_Subscriber_ModifyPushConfig_async */ modifyPushConfig( request?: protos.google.pubsub.v1.IModifyPushConfigRequest, @@ -1529,8 +1516,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.get_snapshot.js - * region_tag:pubsub_v1_generated_Subscriber_GetSnapshot_async */ getSnapshot( request?: protos.google.pubsub.v1.IGetSnapshotRequest, @@ -1670,8 +1655,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.create_snapshot.js - * region_tag:pubsub_v1_generated_Subscriber_CreateSnapshot_async */ createSnapshot( request?: protos.google.pubsub.v1.ICreateSnapshotRequest, @@ -1786,8 +1769,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.Snapshot|Snapshot}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.update_snapshot.js - * region_tag:pubsub_v1_generated_Subscriber_UpdateSnapshot_async */ updateSnapshot( request?: protos.google.pubsub.v1.IUpdateSnapshotRequest, @@ -1903,8 +1884,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.protobuf.Empty|Empty}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.delete_snapshot.js - * region_tag:pubsub_v1_generated_Subscriber_DeleteSnapshot_async */ deleteSnapshot( request?: protos.google.pubsub.v1.IDeleteSnapshotRequest, @@ -2033,8 +2012,6 @@ export class SubscriberClient { * The first element of the array is an object representing {@link protos.google.pubsub.v1.SeekResponse|SeekResponse}. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.seek.js - * region_tag:pubsub_v1_generated_Subscriber_Seek_async */ seek( request?: protos.google.pubsub.v1.ISeekRequest, @@ -2131,7 +2108,7 @@ export class SubscriberClient { /** * Establishes a stream with the server, which sends messages down to the - * client. The client streams acknowledgements and ack deadline modifications + * client. The client streams acknowledgments and ack deadline modifications * back to the server. The server will close the stream and return the status * on any error. The server may close the stream with status `UNAVAILABLE` to * reassign server-side resources, in which case, the client should @@ -2146,8 +2123,6 @@ export class SubscriberClient { * will emit objects representing {@link protos.google.pubsub.v1.StreamingPullResponse|StreamingPullResponse} on 'data' event asynchronously. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#bi-directional-streaming | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.streaming_pull.js - * region_tag:pubsub_v1_generated_Subscriber_StreamingPull_async */ streamingPull(options?: CallOptions): gax.CancellableStream { this.initialize().catch(err => { @@ -2349,8 +2324,6 @@ export class SubscriberClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.list_subscriptions.js - * region_tag:pubsub_v1_generated_Subscriber_ListSubscriptions_async */ listSubscriptionsAsync( request?: protos.google.pubsub.v1.IListSubscriptionsRequest, @@ -2572,8 +2545,6 @@ export class SubscriberClient { * so you can stop the iteration when you don't need more results. * Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation } * for more details and examples. - * @example include:samples/generated/v1/subscriber.list_snapshots.js - * region_tag:pubsub_v1_generated_Subscriber_ListSnapshots_async */ listSnapshotsAsync( request?: protos.google.pubsub.v1.IListSnapshotsRequest, @@ -2924,7 +2895,9 @@ export class SubscriberClient { this._log.info('ending gRPC channel'); this._terminated = true; stub.close(); - void this.iamClient.close(); + this.iamClient.close().catch(err => { + throw err; + }); }); } return Promise.resolve(); diff --git a/handwritten/pubsub/test/gapic_publisher_v1.ts b/handwritten/pubsub/test/gapic_publisher_v1.ts index 419f99cc5ec..1e183b71639 100644 --- a/handwritten/pubsub/test/gapic_publisher_v1.ts +++ b/handwritten/pubsub/test/gapic_publisher_v1.ts @@ -254,9 +254,14 @@ describe('v1.PublisherClient', () => { throw err; }); assert(client.publisherStub); - void client.close().then(() => { - done(); - }); + client + .close() + .then(() => { + done(); + }) + .catch(err => { + throw err; + }); }); it('has close method for the non-initialized client', done => { @@ -265,9 +270,14 @@ describe('v1.PublisherClient', () => { projectId: 'bogus', }); assert.strictEqual(client.publisherStub, undefined); - void client.close().then(() => { - done(); - }); + client + .close() + .then(() => { + done(); + }) + .catch(err => { + throw err; + }); }); it('has getProjectId method', async () => { @@ -426,7 +436,9 @@ describe('v1.PublisherClient', () => { ]); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.createTopic(request), expectedError); }); }); @@ -560,7 +572,9 @@ describe('v1.PublisherClient', () => { ); request.topic.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.updateTopic(request), expectedError); }); }); @@ -687,7 +701,9 @@ describe('v1.PublisherClient', () => { ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.publish(request), expectedError); }); }); @@ -814,7 +830,9 @@ describe('v1.PublisherClient', () => { ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.getTopic(request), expectedError); }); }); @@ -944,7 +962,9 @@ describe('v1.PublisherClient', () => { ); request.topic = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.deleteTopic(request), expectedError); }); }); @@ -1075,7 +1095,9 @@ describe('v1.PublisherClient', () => { ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.detachSubscription(request), expectedError); }); }); @@ -2011,20 +2033,24 @@ describe('v1.PublisherClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.getIamPolicy( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .getIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); @@ -2117,20 +2143,24 @@ describe('v1.PublisherClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.setIamPolicy( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .setIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); @@ -2226,20 +2256,24 @@ describe('v1.PublisherClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.testIamPermissions( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .testIamPermissions( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); diff --git a/handwritten/pubsub/test/gapic_schema_service_v1.ts b/handwritten/pubsub/test/gapic_schema_service_v1.ts index 46c951ae385..165864ede35 100644 --- a/handwritten/pubsub/test/gapic_schema_service_v1.ts +++ b/handwritten/pubsub/test/gapic_schema_service_v1.ts @@ -256,9 +256,14 @@ describe('v1.SchemaServiceClient', () => { throw err; }); assert(client.schemaServiceStub); - void client.close().then(() => { - done(); - }); + client + .close() + .then(() => { + done(); + }) + .catch(err => { + throw err; + }); }); it('has close method for the non-initialized client', done => { @@ -267,9 +272,14 @@ describe('v1.SchemaServiceClient', () => { projectId: 'bogus', }); assert.strictEqual(client.schemaServiceStub, undefined); - void client.close().then(() => { - done(); - }); + client + .close() + .then(() => { + done(); + }) + .catch(err => { + throw err; + }); }); it('has getProjectId method', async () => { @@ -432,7 +442,9 @@ describe('v1.SchemaServiceClient', () => { ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.createSchema(request), expectedError); }); }); @@ -559,7 +571,9 @@ describe('v1.SchemaServiceClient', () => { ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.getSchema(request), expectedError); }); }); @@ -689,7 +703,9 @@ describe('v1.SchemaServiceClient', () => { ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.commitSchema(request), expectedError); }); }); @@ -819,7 +835,9 @@ describe('v1.SchemaServiceClient', () => { ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.rollbackSchema(request), expectedError); }); }); @@ -950,7 +968,9 @@ describe('v1.SchemaServiceClient', () => { ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.deleteSchemaRevision(request), expectedError); }); }); @@ -1080,7 +1100,9 @@ describe('v1.SchemaServiceClient', () => { ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.deleteSchema(request), expectedError); }); }); @@ -1210,7 +1232,9 @@ describe('v1.SchemaServiceClient', () => { ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.validateSchema(request), expectedError); }); }); @@ -1340,7 +1364,9 @@ describe('v1.SchemaServiceClient', () => { ); request.parent = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.validateMessage(request), expectedError); }); }); @@ -1995,20 +2021,24 @@ describe('v1.SchemaServiceClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.getIamPolicy( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .getIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); @@ -2101,20 +2131,24 @@ describe('v1.SchemaServiceClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.setIamPolicy( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .setIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); @@ -2210,20 +2244,24 @@ describe('v1.SchemaServiceClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.testIamPermissions( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .testIamPermissions( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); diff --git a/handwritten/pubsub/test/gapic_subscriber_v1.ts b/handwritten/pubsub/test/gapic_subscriber_v1.ts index 55667c97ce9..cfe23b77b9a 100644 --- a/handwritten/pubsub/test/gapic_subscriber_v1.ts +++ b/handwritten/pubsub/test/gapic_subscriber_v1.ts @@ -268,9 +268,14 @@ describe('v1.SubscriberClient', () => { throw err; }); assert(client.subscriberStub); - void client.close().then(() => { - done(); - }); + client + .close() + .then(() => { + done(); + }) + .catch(err => { + throw err; + }); }); it('has close method for the non-initialized client', done => { @@ -279,9 +284,14 @@ describe('v1.SubscriberClient', () => { projectId: 'bogus', }); assert.strictEqual(client.subscriberStub, undefined); - void client.close().then(() => { - done(); - }); + client + .close() + .then(() => { + done(); + }) + .catch(err => { + throw err; + }); }); it('has getProjectId method', async () => { @@ -445,7 +455,9 @@ describe('v1.SubscriberClient', () => { ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.createSubscription(request), expectedError); }); }); @@ -575,7 +587,9 @@ describe('v1.SubscriberClient', () => { ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.getSubscription(request), expectedError); }); }); @@ -710,7 +724,9 @@ describe('v1.SubscriberClient', () => { ); request.subscription.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.updateSubscription(request), expectedError); }); }); @@ -841,7 +857,9 @@ describe('v1.SubscriberClient', () => { ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.deleteSubscription(request), expectedError); }); }); @@ -971,7 +989,9 @@ describe('v1.SubscriberClient', () => { ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.modifyAckDeadline(request), expectedError); }); }); @@ -1101,7 +1121,9 @@ describe('v1.SubscriberClient', () => { ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.acknowledge(request), expectedError); }); }); @@ -1224,7 +1246,9 @@ describe('v1.SubscriberClient', () => { ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.pull(request), expectedError); }); }); @@ -1354,7 +1378,9 @@ describe('v1.SubscriberClient', () => { ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.modifyPushConfig(request), expectedError); }); }); @@ -1484,7 +1510,9 @@ describe('v1.SubscriberClient', () => { ); request.snapshot = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.getSnapshot(request), expectedError); }); }); @@ -1614,7 +1642,9 @@ describe('v1.SubscriberClient', () => { ); request.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.createSnapshot(request), expectedError); }); }); @@ -1748,7 +1778,9 @@ describe('v1.SubscriberClient', () => { ); request.snapshot.name = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.updateSnapshot(request), expectedError); }); }); @@ -1878,7 +1910,9 @@ describe('v1.SubscriberClient', () => { ); request.snapshot = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.deleteSnapshot(request), expectedError); }); }); @@ -2001,7 +2035,9 @@ describe('v1.SubscriberClient', () => { ); request.subscription = defaultValue1; const expectedError = new Error('The client has already been closed.'); - void client.close(); + client.close().catch(err => { + throw err; + }); await assert.rejects(client.seek(request), expectedError); }); }); @@ -2737,20 +2773,24 @@ describe('v1.SubscriberClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.getIamPolicy( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .getIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); @@ -2843,20 +2883,24 @@ describe('v1.SubscriberClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.setIamPolicy( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.Policy | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .setIamPolicy( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.Policy | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); @@ -2952,20 +2996,24 @@ describe('v1.SubscriberClient', () => { .stub() .callsArgWith(2, null, expectedResponse); const promise = new Promise((resolve, reject) => { - void client.testIamPermissions( - request, - expectedOptions, - ( - err?: Error | null, - result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, - ) => { - if (err) { - reject(err); - } else { - resolve(result); - } - }, - ); + client + .testIamPermissions( + request, + expectedOptions, + ( + err?: Error | null, + result?: IamProtos.google.iam.v1.TestIamPermissionsResponse | null, + ) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }, + ) + .catch(err => { + throw err; + }); }); const response = await promise; assert.deepStrictEqual(response, expectedResponse); diff --git a/handwritten/pubsub/tsconfig.json b/handwritten/pubsub/tsconfig.json index 51baa557260..860d6bf027b 100644 --- a/handwritten/pubsub/tsconfig.json +++ b/handwritten/pubsub/tsconfig.json @@ -12,10 +12,10 @@ "include": [ "src/*.ts", "src/**/*.ts", - "src/v1/*.json", "test/*.ts", "test/**/*.ts", "system-test/*.ts", - "protos/**/*.json" + "src/**/*.json", + "protos/protos.json" ] } From f8508ea9d1c1e4ffd32189555372f8b69e16a919 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 15:18:23 -0400 Subject: [PATCH 1074/1115] chore: update NodeJS post-processor to use MOSS approved images and update node version for tests (#2050) * chore: update post-processor to use MOSS approved images * update dockerfile * remove all hyphens * Update Dockerfile * install python from apt-get * Update container_test.yaml * Update container_test.yaml * install node from apt-get * Update container_test.yaml * Update Dockerfile Source-Link: https://github.com/googleapis/synthtool/commit/1752b9049fd76751e49179628ba4f3a0e0844953 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:da69f1fd77b825b0520b1b0a047c270a3f7e3a42e4d46a5321376281cef6e62b Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 60443342360..f434738ced4 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:c7e4968cfc97a204a4b2381f3ecb55cabc40c4cccf88b1ef8bef0d976be87fee -# created: 2025-04-08T17:33:08.498793944Z + digest: sha256:da69f1fd77b825b0520b1b0a047c270a3f7e3a42e4d46a5321376281cef6e62b +# created: 2025-06-02T21:06:54.667555755Z From d84f0fddbc0ae260a07ad5c401456bb9324312bd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Jun 2025 21:38:58 +0200 Subject: [PATCH 1075/1115] chore(deps): update dependency sinon to v20 (#2043) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json index 2c2e5207df9..729bda5a04a 100644 --- a/handwritten/pubsub/.github/scripts/package.json +++ b/handwritten/pubsub/.github/scripts/package.json @@ -16,6 +16,6 @@ "devDependencies": { "@octokit/rest": "^19.0.0", "mocha": "^10.0.0", - "sinon": "^18.0.0" + "sinon": "^20.0.0" } } \ No newline at end of file From ad2c691ae3d9050933cd61de55c625d87471c20a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 4 Jun 2025 21:45:19 +0200 Subject: [PATCH 1076/1115] fix(deps): update dependency @opentelemetry/semantic-conventions to ~1.34.0 (#2048) Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0a8ecdd7cef..22d95590b84 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@google-cloud/promisify": "^5.0.0", "@opentelemetry/api": "~1.9.0", "@opentelemetry/core": "^1.30.1", - "@opentelemetry/semantic-conventions": "~1.33.0", + "@opentelemetry/semantic-conventions": "~1.34.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^10.0.0-rc.1", From 28ed165138a0c4fb8d44c0370275df1dd12af10c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 4 Jun 2025 22:28:36 +0200 Subject: [PATCH 1077/1115] chore(deps): update dependency jsdoc-fresh to v4 (#2049) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 22d95590b84..f43a555dbde 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -84,7 +84,7 @@ "gapic-tools": "^1.0.1", "gts": "^6.0.2", "jsdoc": "^4.0.4", - "jsdoc-fresh": "^3.0.0", + "jsdoc-fresh": "^4.0.0", "jsdoc-region-tag": "^3.0.0", "linkinator": "^6.1.2", "mocha": "^11.1.0", From 57961b3d8d0c4d8021d80a7e9fc1bd9e162bd4d1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 4 Jun 2025 23:59:40 +0200 Subject: [PATCH 1078/1115] chore(deps): update dependency @octokit/rest to v21 (#2051) --- handwritten/pubsub/.github/scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json index 729bda5a04a..9d9fc37253c 100644 --- a/handwritten/pubsub/.github/scripts/package.json +++ b/handwritten/pubsub/.github/scripts/package.json @@ -14,7 +14,7 @@ "js-yaml": "^4.1.0" }, "devDependencies": { - "@octokit/rest": "^19.0.0", + "@octokit/rest": "^21.0.0", "mocha": "^10.0.0", "sinon": "^20.0.0" } From d4e918791fef184b61bcb630c10f2165bcbbe033 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 11 Jun 2025 16:33:23 -0400 Subject: [PATCH 1079/1115] chore(main): release 5.1.0 (#2039) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(main): release 5.1.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Owl Bot Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/scripts/package.json | 4 ++-- handwritten/pubsub/CHANGELOG.md | 16 ++++++++++++++++ handwritten/pubsub/package.json | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json index 9d9fc37253c..2c2e5207df9 100644 --- a/handwritten/pubsub/.github/scripts/package.json +++ b/handwritten/pubsub/.github/scripts/package.json @@ -14,8 +14,8 @@ "js-yaml": "^4.1.0" }, "devDependencies": { - "@octokit/rest": "^21.0.0", + "@octokit/rest": "^19.0.0", "mocha": "^10.0.0", - "sinon": "^20.0.0" + "sinon": "^18.0.0" } } \ No newline at end of file diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index 558c6644428..df4470936de 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,22 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [5.1.0](https://github.com/googleapis/nodejs-pubsub/compare/v5.0.0...v5.1.0) (2025-06-04) + + +### Features + +* Add SchemaViolationReason to IngestionFailureEvent ([#2045](https://github.com/googleapis/nodejs-pubsub/issues/2045)) ([3348e3e](https://github.com/googleapis/nodejs-pubsub/commit/3348e3e6195405608e380e5291e6107bcba855cb)) +* Use specific W3CTraceContextPropagator for OTel ([#2036](https://github.com/googleapis/nodejs-pubsub/issues/2036)) ([c9a9656](https://github.com/googleapis/nodejs-pubsub/commit/c9a9656b8ae4b6e26c0a90c6ea53f5387e1bb846)) + + +### Bug Fixes + +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.33.0 ([#2038](https://github.com/googleapis/nodejs-pubsub/issues/2038)) ([4eb46c5](https://github.com/googleapis/nodejs-pubsub/commit/4eb46c56a941cfb4616785269cc97d9eeca7f174)) +* **deps:** Update dependency @opentelemetry/semantic-conventions to ~1.34.0 ([#2048](https://github.com/googleapis/nodejs-pubsub/issues/2048)) ([1072c2d](https://github.com/googleapis/nodejs-pubsub/commit/1072c2ddbe2445bac92328e58fbf76e45b464e50)) +* **deps:** Update dependency protobufjs to ~7.5.0 ([#2041](https://github.com/googleapis/nodejs-pubsub/issues/2041)) ([b65eaeb](https://github.com/googleapis/nodejs-pubsub/commit/b65eaebdc54974a81f60f1901e2bd68c2bfd9b92)) +* Set messaging.operation in createAttributes ([#2030](https://github.com/googleapis/nodejs-pubsub/issues/2030)) ([b8d513a](https://github.com/googleapis/nodejs-pubsub/commit/b8d513a3901ae6c160c3f797ed0a41fc0d697fac)) + ## [5.0.0](https://github.com/googleapis/nodejs-pubsub/compare/v4.11.0...v5.0.0) (2025-04-28) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f43a555dbde..4d343cb2477 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "5.0.0", + "version": "5.1.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 1c8af449a9307a0c3158f5867eb229873b89d6db Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Tue, 22 Jul 2025 13:19:54 -0400 Subject: [PATCH 1080/1115] feat: ad-hoc, targeted debug logging (#2062) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: first set of logging changes * tests: add unit test for publisher queue logs * feat: more work on logging * feat: client-side subscriber flow control logs * chore: lint fix * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: move all of the logs to sub-logs of pubsub * feat: disambiguate ack vs modack queue logs * fix: a few more log integration fixups * fix: clear up what 99th percentile means * fix: use the grpc constants instead of a number Co-authored-by: Alex Hong <9397363+hongalex@users.noreply.github.com> * fix: tweak wording on 99th percentile log * fix: make the method signature changes extra-non-breaking --------- Co-authored-by: Owl Bot Co-authored-by: Alex Hong <9397363+hongalex@users.noreply.github.com> --- handwritten/pubsub/protos/protos.d.ts | 522 ++++- handwritten/pubsub/protos/protos.js | 1821 ++++++++++++++++- handwritten/pubsub/protos/protos.json | 215 +- handwritten/pubsub/src/lease-manager.ts | 65 +- handwritten/pubsub/src/logs.ts | 24 + handwritten/pubsub/src/message-queues.ts | 61 +- handwritten/pubsub/src/message-stream.ts | 93 +- .../pubsub/src/publisher/message-batch.ts | 54 +- .../pubsub/src/publisher/message-queues.ts | 78 +- handwritten/pubsub/src/subscriber.ts | 84 +- handwritten/pubsub/test/lease-manager.ts | 115 +- handwritten/pubsub/test/message-queues.ts | 95 +- .../pubsub/test/publisher/message-batch.ts | 12 + .../pubsub/test/publisher/message-queues.ts | 67 +- handwritten/pubsub/test/subscriber.ts | 46 + handwritten/pubsub/test/test-utils.ts | 21 + 16 files changed, 3162 insertions(+), 211 deletions(-) create mode 100644 handwritten/pubsub/src/logs.ts diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index cd375d6899c..7cb0f38912f 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -11351,6 +11351,9 @@ export namespace google { /** CommonLanguageSettings destinations */ destinations?: (google.api.ClientLibraryDestination[]|null); + + /** CommonLanguageSettings selectiveGapicGeneration */ + selectiveGapicGeneration?: (google.api.ISelectiveGapicGeneration|null); } /** Represents a CommonLanguageSettings. */ @@ -11368,6 +11371,9 @@ export namespace google { /** CommonLanguageSettings destinations. */ public destinations: google.api.ClientLibraryDestination[]; + /** CommonLanguageSettings selectiveGapicGeneration. */ + public selectiveGapicGeneration?: (google.api.ISelectiveGapicGeneration|null); + /** * Creates a new CommonLanguageSettings instance using the specified properties. * @param [properties] Properties to set @@ -12068,6 +12074,9 @@ export namespace google { /** PythonSettings common */ common?: (google.api.ICommonLanguageSettings|null); + + /** PythonSettings experimentalFeatures */ + experimentalFeatures?: (google.api.PythonSettings.IExperimentalFeatures|null); } /** Represents a PythonSettings. */ @@ -12082,6 +12091,9 @@ export namespace google { /** PythonSettings common. */ public common?: (google.api.ICommonLanguageSettings|null); + /** PythonSettings experimentalFeatures. */ + public experimentalFeatures?: (google.api.PythonSettings.IExperimentalFeatures|null); + /** * Creates a new PythonSettings instance using the specified properties. * @param [properties] Properties to set @@ -12160,6 +12172,118 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + namespace PythonSettings { + + /** Properties of an ExperimentalFeatures. */ + interface IExperimentalFeatures { + + /** ExperimentalFeatures restAsyncIoEnabled */ + restAsyncIoEnabled?: (boolean|null); + + /** ExperimentalFeatures protobufPythonicTypesEnabled */ + protobufPythonicTypesEnabled?: (boolean|null); + + /** ExperimentalFeatures unversionedPackageDisabled */ + unversionedPackageDisabled?: (boolean|null); + } + + /** Represents an ExperimentalFeatures. */ + class ExperimentalFeatures implements IExperimentalFeatures { + + /** + * Constructs a new ExperimentalFeatures. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.PythonSettings.IExperimentalFeatures); + + /** ExperimentalFeatures restAsyncIoEnabled. */ + public restAsyncIoEnabled: boolean; + + /** ExperimentalFeatures protobufPythonicTypesEnabled. */ + public protobufPythonicTypesEnabled: boolean; + + /** ExperimentalFeatures unversionedPackageDisabled. */ + public unversionedPackageDisabled: boolean; + + /** + * Creates a new ExperimentalFeatures instance using the specified properties. + * @param [properties] Properties to set + * @returns ExperimentalFeatures instance + */ + public static create(properties?: google.api.PythonSettings.IExperimentalFeatures): google.api.PythonSettings.ExperimentalFeatures; + + /** + * Encodes the specified ExperimentalFeatures message. Does not implicitly {@link google.api.PythonSettings.ExperimentalFeatures.verify|verify} messages. + * @param message ExperimentalFeatures message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.PythonSettings.IExperimentalFeatures, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified ExperimentalFeatures message, length delimited. Does not implicitly {@link google.api.PythonSettings.ExperimentalFeatures.verify|verify} messages. + * @param message ExperimentalFeatures message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.PythonSettings.IExperimentalFeatures, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes an ExperimentalFeatures message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns ExperimentalFeatures + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.PythonSettings.ExperimentalFeatures; + + /** + * Decodes an ExperimentalFeatures message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns ExperimentalFeatures + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.PythonSettings.ExperimentalFeatures; + + /** + * Verifies an ExperimentalFeatures message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates an ExperimentalFeatures message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns ExperimentalFeatures + */ + public static fromObject(object: { [k: string]: any }): google.api.PythonSettings.ExperimentalFeatures; + + /** + * Creates a plain object from an ExperimentalFeatures message. Also converts values to other types if specified. + * @param message ExperimentalFeatures + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.PythonSettings.ExperimentalFeatures, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this ExperimentalFeatures to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for ExperimentalFeatures + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + } + /** Properties of a NodeSettings. */ interface INodeSettings { @@ -12486,6 +12610,9 @@ export namespace google { /** GoSettings common */ common?: (google.api.ICommonLanguageSettings|null); + + /** GoSettings renamedServices */ + renamedServices?: ({ [k: string]: string }|null); } /** Represents a GoSettings. */ @@ -12500,6 +12627,9 @@ export namespace google { /** GoSettings common. */ public common?: (google.api.ICommonLanguageSettings|null); + /** GoSettings renamedServices. */ + public renamedServices: { [k: string]: string }; + /** * Creates a new GoSettings instance using the specified properties. * @param [properties] Properties to set @@ -12824,6 +12954,109 @@ export namespace google { PACKAGE_MANAGER = 20 } + /** Properties of a SelectiveGapicGeneration. */ + interface ISelectiveGapicGeneration { + + /** SelectiveGapicGeneration methods */ + methods?: (string[]|null); + + /** SelectiveGapicGeneration generateOmittedAsInternal */ + generateOmittedAsInternal?: (boolean|null); + } + + /** Represents a SelectiveGapicGeneration. */ + class SelectiveGapicGeneration implements ISelectiveGapicGeneration { + + /** + * Constructs a new SelectiveGapicGeneration. + * @param [properties] Properties to set + */ + constructor(properties?: google.api.ISelectiveGapicGeneration); + + /** SelectiveGapicGeneration methods. */ + public methods: string[]; + + /** SelectiveGapicGeneration generateOmittedAsInternal. */ + public generateOmittedAsInternal: boolean; + + /** + * Creates a new SelectiveGapicGeneration instance using the specified properties. + * @param [properties] Properties to set + * @returns SelectiveGapicGeneration instance + */ + public static create(properties?: google.api.ISelectiveGapicGeneration): google.api.SelectiveGapicGeneration; + + /** + * Encodes the specified SelectiveGapicGeneration message. Does not implicitly {@link google.api.SelectiveGapicGeneration.verify|verify} messages. + * @param message SelectiveGapicGeneration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.api.ISelectiveGapicGeneration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified SelectiveGapicGeneration message, length delimited. Does not implicitly {@link google.api.SelectiveGapicGeneration.verify|verify} messages. + * @param message SelectiveGapicGeneration message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.api.ISelectiveGapicGeneration, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a SelectiveGapicGeneration message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns SelectiveGapicGeneration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.api.SelectiveGapicGeneration; + + /** + * Decodes a SelectiveGapicGeneration message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns SelectiveGapicGeneration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.api.SelectiveGapicGeneration; + + /** + * Verifies a SelectiveGapicGeneration message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a SelectiveGapicGeneration message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns SelectiveGapicGeneration + */ + public static fromObject(object: { [k: string]: any }): google.api.SelectiveGapicGeneration; + + /** + * Creates a plain object from a SelectiveGapicGeneration message. Also converts values to other types if specified. + * @param message SelectiveGapicGeneration + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.api.SelectiveGapicGeneration, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this SelectiveGapicGeneration to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for SelectiveGapicGeneration + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + /** LaunchStage enum. */ enum LaunchStage { LAUNCH_STAGE_UNSPECIFIED = 0, @@ -13205,6 +13438,7 @@ export namespace google { /** Edition enum. */ enum Edition { EDITION_UNKNOWN = 0, + EDITION_LEGACY = 900, EDITION_PROTO2 = 998, EDITION_PROTO3 = 999, EDITION_2023 = 1000, @@ -13235,6 +13469,9 @@ export namespace google { /** FileDescriptorProto weakDependency */ weakDependency?: (number[]|null); + /** FileDescriptorProto optionDependency */ + optionDependency?: (string[]|null); + /** FileDescriptorProto messageType */ messageType?: (google.protobuf.IDescriptorProto[]|null); @@ -13284,6 +13521,9 @@ export namespace google { /** FileDescriptorProto weakDependency. */ public weakDependency: number[]; + /** FileDescriptorProto optionDependency. */ + public optionDependency: string[]; + /** FileDescriptorProto messageType. */ public messageType: google.protobuf.IDescriptorProto[]; @@ -13418,6 +13658,9 @@ export namespace google { /** DescriptorProto reservedName */ reservedName?: (string[]|null); + + /** DescriptorProto visibility */ + visibility?: (google.protobuf.SymbolVisibility|keyof typeof google.protobuf.SymbolVisibility|null); } /** Represents a DescriptorProto. */ @@ -13459,6 +13702,9 @@ export namespace google { /** DescriptorProto reservedName. */ public reservedName: string[]; + /** DescriptorProto visibility. */ + public visibility: (google.protobuf.SymbolVisibility|keyof typeof google.protobuf.SymbolVisibility); + /** * Creates a new DescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -14306,6 +14552,9 @@ export namespace google { /** EnumDescriptorProto reservedName */ reservedName?: (string[]|null); + + /** EnumDescriptorProto visibility */ + visibility?: (google.protobuf.SymbolVisibility|keyof typeof google.protobuf.SymbolVisibility|null); } /** Represents an EnumDescriptorProto. */ @@ -14332,6 +14581,9 @@ export namespace google { /** EnumDescriptorProto reservedName. */ public reservedName: string[]; + /** EnumDescriptorProto visibility. */ + public visibility: (google.protobuf.SymbolVisibility|keyof typeof google.protobuf.SymbolVisibility); + /** * Creates a new EnumDescriptorProto instance using the specified properties. * @param [properties] Properties to set @@ -15266,6 +15518,9 @@ export namespace google { /** FieldOptions features */ features?: (google.protobuf.IFeatureSet|null); + /** FieldOptions featureSupport */ + featureSupport?: (google.protobuf.FieldOptions.IFeatureSupport|null); + /** FieldOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); @@ -15321,6 +15576,9 @@ export namespace google { /** FieldOptions features. */ public features?: (google.protobuf.IFeatureSet|null); + /** FieldOptions featureSupport. */ + public featureSupport?: (google.protobuf.FieldOptions.IFeatureSupport|null); + /** FieldOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -15541,6 +15799,121 @@ export namespace google { */ public static getTypeUrl(typeUrlPrefix?: string): string; } + + /** Properties of a FeatureSupport. */ + interface IFeatureSupport { + + /** FeatureSupport editionIntroduced */ + editionIntroduced?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); + + /** FeatureSupport editionDeprecated */ + editionDeprecated?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); + + /** FeatureSupport deprecationWarning */ + deprecationWarning?: (string|null); + + /** FeatureSupport editionRemoved */ + editionRemoved?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); + } + + /** Represents a FeatureSupport. */ + class FeatureSupport implements IFeatureSupport { + + /** + * Constructs a new FeatureSupport. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.FieldOptions.IFeatureSupport); + + /** FeatureSupport editionIntroduced. */ + public editionIntroduced: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); + + /** FeatureSupport editionDeprecated. */ + public editionDeprecated: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); + + /** FeatureSupport deprecationWarning. */ + public deprecationWarning: string; + + /** FeatureSupport editionRemoved. */ + public editionRemoved: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); + + /** + * Creates a new FeatureSupport instance using the specified properties. + * @param [properties] Properties to set + * @returns FeatureSupport instance + */ + public static create(properties?: google.protobuf.FieldOptions.IFeatureSupport): google.protobuf.FieldOptions.FeatureSupport; + + /** + * Encodes the specified FeatureSupport message. Does not implicitly {@link google.protobuf.FieldOptions.FeatureSupport.verify|verify} messages. + * @param message FeatureSupport message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.FieldOptions.IFeatureSupport, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified FeatureSupport message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.FeatureSupport.verify|verify} messages. + * @param message FeatureSupport message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.FieldOptions.IFeatureSupport, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a FeatureSupport message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns FeatureSupport + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions.FeatureSupport; + + /** + * Decodes a FeatureSupport message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns FeatureSupport + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions.FeatureSupport; + + /** + * Verifies a FeatureSupport message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a FeatureSupport message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns FeatureSupport + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FieldOptions.FeatureSupport; + + /** + * Creates a plain object from a FeatureSupport message. Also converts values to other types if specified. + * @param message FeatureSupport + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FieldOptions.FeatureSupport, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this FeatureSupport to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for FeatureSupport + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } } /** Properties of an OneofOptions. */ @@ -15779,6 +16152,9 @@ export namespace google { /** EnumValueOptions debugRedact */ debugRedact?: (boolean|null); + /** EnumValueOptions featureSupport */ + featureSupport?: (google.protobuf.FieldOptions.IFeatureSupport|null); + /** EnumValueOptions uninterpretedOption */ uninterpretedOption?: (google.protobuf.IUninterpretedOption[]|null); } @@ -15801,6 +16177,9 @@ export namespace google { /** EnumValueOptions debugRedact. */ public debugRedact: boolean; + /** EnumValueOptions featureSupport. */ + public featureSupport?: (google.protobuf.FieldOptions.IFeatureSupport|null); + /** EnumValueOptions uninterpretedOption. */ public uninterpretedOption: google.protobuf.IUninterpretedOption[]; @@ -16390,6 +16769,12 @@ export namespace google { /** FeatureSet jsonFormat */ jsonFormat?: (google.protobuf.FeatureSet.JsonFormat|keyof typeof google.protobuf.FeatureSet.JsonFormat|null); + + /** FeatureSet enforceNamingStyle */ + enforceNamingStyle?: (google.protobuf.FeatureSet.EnforceNamingStyle|keyof typeof google.protobuf.FeatureSet.EnforceNamingStyle|null); + + /** FeatureSet defaultSymbolVisibility */ + defaultSymbolVisibility?: (google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility|keyof typeof google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility|null); } /** Represents a FeatureSet. */ @@ -16419,6 +16804,12 @@ export namespace google { /** FeatureSet jsonFormat. */ public jsonFormat: (google.protobuf.FeatureSet.JsonFormat|keyof typeof google.protobuf.FeatureSet.JsonFormat); + /** FeatureSet enforceNamingStyle. */ + public enforceNamingStyle: (google.protobuf.FeatureSet.EnforceNamingStyle|keyof typeof google.protobuf.FeatureSet.EnforceNamingStyle); + + /** FeatureSet defaultSymbolVisibility. */ + public defaultSymbolVisibility: (google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility|keyof typeof google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility); + /** * Creates a new FeatureSet instance using the specified properties. * @param [properties] Properties to set @@ -16541,6 +16932,116 @@ export namespace google { ALLOW = 1, LEGACY_BEST_EFFORT = 2 } + + /** EnforceNamingStyle enum. */ + enum EnforceNamingStyle { + ENFORCE_NAMING_STYLE_UNKNOWN = 0, + STYLE2024 = 1, + STYLE_LEGACY = 2 + } + + /** Properties of a VisibilityFeature. */ + interface IVisibilityFeature { + } + + /** Represents a VisibilityFeature. */ + class VisibilityFeature implements IVisibilityFeature { + + /** + * Constructs a new VisibilityFeature. + * @param [properties] Properties to set + */ + constructor(properties?: google.protobuf.FeatureSet.IVisibilityFeature); + + /** + * Creates a new VisibilityFeature instance using the specified properties. + * @param [properties] Properties to set + * @returns VisibilityFeature instance + */ + public static create(properties?: google.protobuf.FeatureSet.IVisibilityFeature): google.protobuf.FeatureSet.VisibilityFeature; + + /** + * Encodes the specified VisibilityFeature message. Does not implicitly {@link google.protobuf.FeatureSet.VisibilityFeature.verify|verify} messages. + * @param message VisibilityFeature message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.protobuf.FeatureSet.IVisibilityFeature, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified VisibilityFeature message, length delimited. Does not implicitly {@link google.protobuf.FeatureSet.VisibilityFeature.verify|verify} messages. + * @param message VisibilityFeature message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.protobuf.FeatureSet.IVisibilityFeature, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a VisibilityFeature message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns VisibilityFeature + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FeatureSet.VisibilityFeature; + + /** + * Decodes a VisibilityFeature message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns VisibilityFeature + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FeatureSet.VisibilityFeature; + + /** + * Verifies a VisibilityFeature message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a VisibilityFeature message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns VisibilityFeature + */ + public static fromObject(object: { [k: string]: any }): google.protobuf.FeatureSet.VisibilityFeature; + + /** + * Creates a plain object from a VisibilityFeature message. Also converts values to other types if specified. + * @param message VisibilityFeature + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.protobuf.FeatureSet.VisibilityFeature, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this VisibilityFeature to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for VisibilityFeature + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + + namespace VisibilityFeature { + + /** DefaultSymbolVisibility enum. */ + enum DefaultSymbolVisibility { + DEFAULT_SYMBOL_VISIBILITY_UNKNOWN = 0, + EXPORT_ALL = 1, + EXPORT_TOP_LEVEL = 2, + LOCAL_ALL = 3, + STRICT = 4 + } + } } /** Properties of a FeatureSetDefaults. */ @@ -16660,8 +17161,11 @@ export namespace google { /** FeatureSetEditionDefault edition */ edition?: (google.protobuf.Edition|keyof typeof google.protobuf.Edition|null); - /** FeatureSetEditionDefault features */ - features?: (google.protobuf.IFeatureSet|null); + /** FeatureSetEditionDefault overridableFeatures */ + overridableFeatures?: (google.protobuf.IFeatureSet|null); + + /** FeatureSetEditionDefault fixedFeatures */ + fixedFeatures?: (google.protobuf.IFeatureSet|null); } /** Represents a FeatureSetEditionDefault. */ @@ -16676,8 +17180,11 @@ export namespace google { /** FeatureSetEditionDefault edition. */ public edition: (google.protobuf.Edition|keyof typeof google.protobuf.Edition); - /** FeatureSetEditionDefault features. */ - public features?: (google.protobuf.IFeatureSet|null); + /** FeatureSetEditionDefault overridableFeatures. */ + public overridableFeatures?: (google.protobuf.IFeatureSet|null); + + /** FeatureSetEditionDefault fixedFeatures. */ + public fixedFeatures?: (google.protobuf.IFeatureSet|null); /** * Creates a new FeatureSetEditionDefault instance using the specified properties. @@ -17210,6 +17717,13 @@ export namespace google { } } + /** SymbolVisibility enum. */ + enum SymbolVisibility { + VISIBILITY_UNSET = 0, + VISIBILITY_LOCAL = 1, + VISIBILITY_EXPORT = 2 + } + /** Properties of a Duration. */ interface IDuration { diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index beb45c49051..0e183b097a1 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -27654,6 +27654,7 @@ * @interface ICommonLanguageSettings * @property {string|null} [referenceDocsUri] CommonLanguageSettings referenceDocsUri * @property {Array.|null} [destinations] CommonLanguageSettings destinations + * @property {google.api.ISelectiveGapicGeneration|null} [selectiveGapicGeneration] CommonLanguageSettings selectiveGapicGeneration */ /** @@ -27688,6 +27689,14 @@ */ CommonLanguageSettings.prototype.destinations = $util.emptyArray; + /** + * CommonLanguageSettings selectiveGapicGeneration. + * @member {google.api.ISelectiveGapicGeneration|null|undefined} selectiveGapicGeneration + * @memberof google.api.CommonLanguageSettings + * @instance + */ + CommonLanguageSettings.prototype.selectiveGapicGeneration = null; + /** * Creates a new CommonLanguageSettings instance using the specified properties. * @function create @@ -27720,6 +27729,8 @@ writer.int32(message.destinations[i]); writer.ldelim(); } + if (message.selectiveGapicGeneration != null && Object.hasOwnProperty.call(message, "selectiveGapicGeneration")) + $root.google.api.SelectiveGapicGeneration.encode(message.selectiveGapicGeneration, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); return writer; }; @@ -27771,6 +27782,10 @@ message.destinations.push(reader.int32()); break; } + case 3: { + message.selectiveGapicGeneration = $root.google.api.SelectiveGapicGeneration.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -27822,6 +27837,11 @@ break; } } + if (message.selectiveGapicGeneration != null && message.hasOwnProperty("selectiveGapicGeneration")) { + var error = $root.google.api.SelectiveGapicGeneration.verify(message.selectiveGapicGeneration); + if (error) + return "selectiveGapicGeneration." + error; + } return null; }; @@ -27864,6 +27884,11 @@ break; } } + if (object.selectiveGapicGeneration != null) { + if (typeof object.selectiveGapicGeneration !== "object") + throw TypeError(".google.api.CommonLanguageSettings.selectiveGapicGeneration: object expected"); + message.selectiveGapicGeneration = $root.google.api.SelectiveGapicGeneration.fromObject(object.selectiveGapicGeneration); + } return message; }; @@ -27882,8 +27907,10 @@ var object = {}; if (options.arrays || options.defaults) object.destinations = []; - if (options.defaults) + if (options.defaults) { object.referenceDocsUri = ""; + object.selectiveGapicGeneration = null; + } if (message.referenceDocsUri != null && message.hasOwnProperty("referenceDocsUri")) object.referenceDocsUri = message.referenceDocsUri; if (message.destinations && message.destinations.length) { @@ -27891,6 +27918,8 @@ for (var j = 0; j < message.destinations.length; ++j) object.destinations[j] = options.enums === String ? $root.google.api.ClientLibraryDestination[message.destinations[j]] === undefined ? message.destinations[j] : $root.google.api.ClientLibraryDestination[message.destinations[j]] : message.destinations[j]; } + if (message.selectiveGapicGeneration != null && message.hasOwnProperty("selectiveGapicGeneration")) + object.selectiveGapicGeneration = $root.google.api.SelectiveGapicGeneration.toObject(message.selectiveGapicGeneration, options); return object; }; @@ -29713,6 +29742,7 @@ * @memberof google.api * @interface IPythonSettings * @property {google.api.ICommonLanguageSettings|null} [common] PythonSettings common + * @property {google.api.PythonSettings.IExperimentalFeatures|null} [experimentalFeatures] PythonSettings experimentalFeatures */ /** @@ -29738,6 +29768,14 @@ */ PythonSettings.prototype.common = null; + /** + * PythonSettings experimentalFeatures. + * @member {google.api.PythonSettings.IExperimentalFeatures|null|undefined} experimentalFeatures + * @memberof google.api.PythonSettings + * @instance + */ + PythonSettings.prototype.experimentalFeatures = null; + /** * Creates a new PythonSettings instance using the specified properties. * @function create @@ -29764,6 +29802,8 @@ writer = $Writer.create(); if (message.common != null && Object.hasOwnProperty.call(message, "common")) $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.experimentalFeatures != null && Object.hasOwnProperty.call(message, "experimentalFeatures")) + $root.google.api.PythonSettings.ExperimentalFeatures.encode(message.experimentalFeatures, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); return writer; }; @@ -29804,6 +29844,10 @@ message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); break; } + case 2: { + message.experimentalFeatures = $root.google.api.PythonSettings.ExperimentalFeatures.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -29844,6 +29888,11 @@ if (error) return "common." + error; } + if (message.experimentalFeatures != null && message.hasOwnProperty("experimentalFeatures")) { + var error = $root.google.api.PythonSettings.ExperimentalFeatures.verify(message.experimentalFeatures); + if (error) + return "experimentalFeatures." + error; + } return null; }; @@ -29864,6 +29913,11 @@ throw TypeError(".google.api.PythonSettings.common: object expected"); message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); } + if (object.experimentalFeatures != null) { + if (typeof object.experimentalFeatures !== "object") + throw TypeError(".google.api.PythonSettings.experimentalFeatures: object expected"); + message.experimentalFeatures = $root.google.api.PythonSettings.ExperimentalFeatures.fromObject(object.experimentalFeatures); + } return message; }; @@ -29880,10 +29934,14 @@ if (!options) options = {}; var object = {}; - if (options.defaults) + if (options.defaults) { object.common = null; + object.experimentalFeatures = null; + } if (message.common != null && message.hasOwnProperty("common")) object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + if (message.experimentalFeatures != null && message.hasOwnProperty("experimentalFeatures")) + object.experimentalFeatures = $root.google.api.PythonSettings.ExperimentalFeatures.toObject(message.experimentalFeatures, options); return object; }; @@ -29913,6 +29971,258 @@ return typeUrlPrefix + "/google.api.PythonSettings"; }; + PythonSettings.ExperimentalFeatures = (function() { + + /** + * Properties of an ExperimentalFeatures. + * @memberof google.api.PythonSettings + * @interface IExperimentalFeatures + * @property {boolean|null} [restAsyncIoEnabled] ExperimentalFeatures restAsyncIoEnabled + * @property {boolean|null} [protobufPythonicTypesEnabled] ExperimentalFeatures protobufPythonicTypesEnabled + * @property {boolean|null} [unversionedPackageDisabled] ExperimentalFeatures unversionedPackageDisabled + */ + + /** + * Constructs a new ExperimentalFeatures. + * @memberof google.api.PythonSettings + * @classdesc Represents an ExperimentalFeatures. + * @implements IExperimentalFeatures + * @constructor + * @param {google.api.PythonSettings.IExperimentalFeatures=} [properties] Properties to set + */ + function ExperimentalFeatures(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * ExperimentalFeatures restAsyncIoEnabled. + * @member {boolean} restAsyncIoEnabled + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @instance + */ + ExperimentalFeatures.prototype.restAsyncIoEnabled = false; + + /** + * ExperimentalFeatures protobufPythonicTypesEnabled. + * @member {boolean} protobufPythonicTypesEnabled + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @instance + */ + ExperimentalFeatures.prototype.protobufPythonicTypesEnabled = false; + + /** + * ExperimentalFeatures unversionedPackageDisabled. + * @member {boolean} unversionedPackageDisabled + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @instance + */ + ExperimentalFeatures.prototype.unversionedPackageDisabled = false; + + /** + * Creates a new ExperimentalFeatures instance using the specified properties. + * @function create + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {google.api.PythonSettings.IExperimentalFeatures=} [properties] Properties to set + * @returns {google.api.PythonSettings.ExperimentalFeatures} ExperimentalFeatures instance + */ + ExperimentalFeatures.create = function create(properties) { + return new ExperimentalFeatures(properties); + }; + + /** + * Encodes the specified ExperimentalFeatures message. Does not implicitly {@link google.api.PythonSettings.ExperimentalFeatures.verify|verify} messages. + * @function encode + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {google.api.PythonSettings.IExperimentalFeatures} message ExperimentalFeatures message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExperimentalFeatures.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.restAsyncIoEnabled != null && Object.hasOwnProperty.call(message, "restAsyncIoEnabled")) + writer.uint32(/* id 1, wireType 0 =*/8).bool(message.restAsyncIoEnabled); + if (message.protobufPythonicTypesEnabled != null && Object.hasOwnProperty.call(message, "protobufPythonicTypesEnabled")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.protobufPythonicTypesEnabled); + if (message.unversionedPackageDisabled != null && Object.hasOwnProperty.call(message, "unversionedPackageDisabled")) + writer.uint32(/* id 3, wireType 0 =*/24).bool(message.unversionedPackageDisabled); + return writer; + }; + + /** + * Encodes the specified ExperimentalFeatures message, length delimited. Does not implicitly {@link google.api.PythonSettings.ExperimentalFeatures.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {google.api.PythonSettings.IExperimentalFeatures} message ExperimentalFeatures message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + ExperimentalFeatures.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes an ExperimentalFeatures message from the specified reader or buffer. + * @function decode + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.PythonSettings.ExperimentalFeatures} ExperimentalFeatures + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExperimentalFeatures.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.PythonSettings.ExperimentalFeatures(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + case 1: { + message.restAsyncIoEnabled = reader.bool(); + break; + } + case 2: { + message.protobufPythonicTypesEnabled = reader.bool(); + break; + } + case 3: { + message.unversionedPackageDisabled = reader.bool(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes an ExperimentalFeatures message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.PythonSettings.ExperimentalFeatures} ExperimentalFeatures + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + ExperimentalFeatures.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies an ExperimentalFeatures message. + * @function verify + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + ExperimentalFeatures.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.restAsyncIoEnabled != null && message.hasOwnProperty("restAsyncIoEnabled")) + if (typeof message.restAsyncIoEnabled !== "boolean") + return "restAsyncIoEnabled: boolean expected"; + if (message.protobufPythonicTypesEnabled != null && message.hasOwnProperty("protobufPythonicTypesEnabled")) + if (typeof message.protobufPythonicTypesEnabled !== "boolean") + return "protobufPythonicTypesEnabled: boolean expected"; + if (message.unversionedPackageDisabled != null && message.hasOwnProperty("unversionedPackageDisabled")) + if (typeof message.unversionedPackageDisabled !== "boolean") + return "unversionedPackageDisabled: boolean expected"; + return null; + }; + + /** + * Creates an ExperimentalFeatures message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {Object.} object Plain object + * @returns {google.api.PythonSettings.ExperimentalFeatures} ExperimentalFeatures + */ + ExperimentalFeatures.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.PythonSettings.ExperimentalFeatures) + return object; + var message = new $root.google.api.PythonSettings.ExperimentalFeatures(); + if (object.restAsyncIoEnabled != null) + message.restAsyncIoEnabled = Boolean(object.restAsyncIoEnabled); + if (object.protobufPythonicTypesEnabled != null) + message.protobufPythonicTypesEnabled = Boolean(object.protobufPythonicTypesEnabled); + if (object.unversionedPackageDisabled != null) + message.unversionedPackageDisabled = Boolean(object.unversionedPackageDisabled); + return message; + }; + + /** + * Creates a plain object from an ExperimentalFeatures message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {google.api.PythonSettings.ExperimentalFeatures} message ExperimentalFeatures + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + ExperimentalFeatures.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.restAsyncIoEnabled = false; + object.protobufPythonicTypesEnabled = false; + object.unversionedPackageDisabled = false; + } + if (message.restAsyncIoEnabled != null && message.hasOwnProperty("restAsyncIoEnabled")) + object.restAsyncIoEnabled = message.restAsyncIoEnabled; + if (message.protobufPythonicTypesEnabled != null && message.hasOwnProperty("protobufPythonicTypesEnabled")) + object.protobufPythonicTypesEnabled = message.protobufPythonicTypesEnabled; + if (message.unversionedPackageDisabled != null && message.hasOwnProperty("unversionedPackageDisabled")) + object.unversionedPackageDisabled = message.unversionedPackageDisabled; + return object; + }; + + /** + * Converts this ExperimentalFeatures to JSON. + * @function toJSON + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @instance + * @returns {Object.} JSON object + */ + ExperimentalFeatures.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for ExperimentalFeatures + * @function getTypeUrl + * @memberof google.api.PythonSettings.ExperimentalFeatures + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + ExperimentalFeatures.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.PythonSettings.ExperimentalFeatures"; + }; + + return ExperimentalFeatures; + })(); + return PythonSettings; })(); @@ -30789,6 +31099,7 @@ * @memberof google.api * @interface IGoSettings * @property {google.api.ICommonLanguageSettings|null} [common] GoSettings common + * @property {Object.|null} [renamedServices] GoSettings renamedServices */ /** @@ -30800,6 +31111,7 @@ * @param {google.api.IGoSettings=} [properties] Properties to set */ function GoSettings(properties) { + this.renamedServices = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -30814,6 +31126,14 @@ */ GoSettings.prototype.common = null; + /** + * GoSettings renamedServices. + * @member {Object.} renamedServices + * @memberof google.api.GoSettings + * @instance + */ + GoSettings.prototype.renamedServices = $util.emptyObject; + /** * Creates a new GoSettings instance using the specified properties. * @function create @@ -30840,6 +31160,9 @@ writer = $Writer.create(); if (message.common != null && Object.hasOwnProperty.call(message, "common")) $root.google.api.CommonLanguageSettings.encode(message.common, writer.uint32(/* id 1, wireType 2 =*/10).fork()).ldelim(); + if (message.renamedServices != null && Object.hasOwnProperty.call(message, "renamedServices")) + for (var keys = Object.keys(message.renamedServices), i = 0; i < keys.length; ++i) + writer.uint32(/* id 2, wireType 2 =*/18).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.renamedServices[keys[i]]).ldelim(); return writer; }; @@ -30870,7 +31193,7 @@ GoSettings.decode = function decode(reader, length, error) { if (!(reader instanceof $Reader)) reader = $Reader.create(reader); - var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.GoSettings(); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.GoSettings(), key, value; while (reader.pos < end) { var tag = reader.uint32(); if (tag === error) @@ -30880,6 +31203,29 @@ message.common = $root.google.api.CommonLanguageSettings.decode(reader, reader.uint32()); break; } + case 2: { + if (message.renamedServices === $util.emptyObject) + message.renamedServices = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.renamedServices[key] = value; + break; + } default: reader.skipType(tag & 7); break; @@ -30920,6 +31266,14 @@ if (error) return "common." + error; } + if (message.renamedServices != null && message.hasOwnProperty("renamedServices")) { + if (!$util.isObject(message.renamedServices)) + return "renamedServices: object expected"; + var key = Object.keys(message.renamedServices); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.renamedServices[key[i]])) + return "renamedServices: string{k:string} expected"; + } return null; }; @@ -30940,6 +31294,13 @@ throw TypeError(".google.api.GoSettings.common: object expected"); message.common = $root.google.api.CommonLanguageSettings.fromObject(object.common); } + if (object.renamedServices) { + if (typeof object.renamedServices !== "object") + throw TypeError(".google.api.GoSettings.renamedServices: object expected"); + message.renamedServices = {}; + for (var keys = Object.keys(object.renamedServices), i = 0; i < keys.length; ++i) + message.renamedServices[keys[i]] = String(object.renamedServices[keys[i]]); + } return message; }; @@ -30956,10 +31317,18 @@ if (!options) options = {}; var object = {}; + if (options.objects || options.defaults) + object.renamedServices = {}; if (options.defaults) object.common = null; if (message.common != null && message.hasOwnProperty("common")) object.common = $root.google.api.CommonLanguageSettings.toObject(message.common, options); + var keys2; + if (message.renamedServices && (keys2 = Object.keys(message.renamedServices)).length) { + object.renamedServices = {}; + for (var j = 0; j < keys2.length; ++j) + object.renamedServices[keys2[j]] = message.renamedServices[keys2[j]]; + } return object; }; @@ -31598,30 +31967,275 @@ return values; })(); - /** - * LaunchStage enum. - * @name google.api.LaunchStage - * @enum {number} - * @property {number} LAUNCH_STAGE_UNSPECIFIED=0 LAUNCH_STAGE_UNSPECIFIED value - * @property {number} UNIMPLEMENTED=6 UNIMPLEMENTED value - * @property {number} PRELAUNCH=7 PRELAUNCH value - * @property {number} EARLY_ACCESS=1 EARLY_ACCESS value - * @property {number} ALPHA=2 ALPHA value - * @property {number} BETA=3 BETA value - * @property {number} GA=4 GA value - * @property {number} DEPRECATED=5 DEPRECATED value - */ - api.LaunchStage = (function() { - var valuesById = {}, values = Object.create(valuesById); - values[valuesById[0] = "LAUNCH_STAGE_UNSPECIFIED"] = 0; - values[valuesById[6] = "UNIMPLEMENTED"] = 6; - values[valuesById[7] = "PRELAUNCH"] = 7; - values[valuesById[1] = "EARLY_ACCESS"] = 1; - values[valuesById[2] = "ALPHA"] = 2; - values[valuesById[3] = "BETA"] = 3; - values[valuesById[4] = "GA"] = 4; - values[valuesById[5] = "DEPRECATED"] = 5; - return values; + api.SelectiveGapicGeneration = (function() { + + /** + * Properties of a SelectiveGapicGeneration. + * @memberof google.api + * @interface ISelectiveGapicGeneration + * @property {Array.|null} [methods] SelectiveGapicGeneration methods + * @property {boolean|null} [generateOmittedAsInternal] SelectiveGapicGeneration generateOmittedAsInternal + */ + + /** + * Constructs a new SelectiveGapicGeneration. + * @memberof google.api + * @classdesc Represents a SelectiveGapicGeneration. + * @implements ISelectiveGapicGeneration + * @constructor + * @param {google.api.ISelectiveGapicGeneration=} [properties] Properties to set + */ + function SelectiveGapicGeneration(properties) { + this.methods = []; + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * SelectiveGapicGeneration methods. + * @member {Array.} methods + * @memberof google.api.SelectiveGapicGeneration + * @instance + */ + SelectiveGapicGeneration.prototype.methods = $util.emptyArray; + + /** + * SelectiveGapicGeneration generateOmittedAsInternal. + * @member {boolean} generateOmittedAsInternal + * @memberof google.api.SelectiveGapicGeneration + * @instance + */ + SelectiveGapicGeneration.prototype.generateOmittedAsInternal = false; + + /** + * Creates a new SelectiveGapicGeneration instance using the specified properties. + * @function create + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {google.api.ISelectiveGapicGeneration=} [properties] Properties to set + * @returns {google.api.SelectiveGapicGeneration} SelectiveGapicGeneration instance + */ + SelectiveGapicGeneration.create = function create(properties) { + return new SelectiveGapicGeneration(properties); + }; + + /** + * Encodes the specified SelectiveGapicGeneration message. Does not implicitly {@link google.api.SelectiveGapicGeneration.verify|verify} messages. + * @function encode + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {google.api.ISelectiveGapicGeneration} message SelectiveGapicGeneration message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SelectiveGapicGeneration.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.methods != null && message.methods.length) + for (var i = 0; i < message.methods.length; ++i) + writer.uint32(/* id 1, wireType 2 =*/10).string(message.methods[i]); + if (message.generateOmittedAsInternal != null && Object.hasOwnProperty.call(message, "generateOmittedAsInternal")) + writer.uint32(/* id 2, wireType 0 =*/16).bool(message.generateOmittedAsInternal); + return writer; + }; + + /** + * Encodes the specified SelectiveGapicGeneration message, length delimited. Does not implicitly {@link google.api.SelectiveGapicGeneration.verify|verify} messages. + * @function encodeDelimited + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {google.api.ISelectiveGapicGeneration} message SelectiveGapicGeneration message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + SelectiveGapicGeneration.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a SelectiveGapicGeneration message from the specified reader or buffer. + * @function decode + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.api.SelectiveGapicGeneration} SelectiveGapicGeneration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SelectiveGapicGeneration.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.api.SelectiveGapicGeneration(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + case 1: { + if (!(message.methods && message.methods.length)) + message.methods = []; + message.methods.push(reader.string()); + break; + } + case 2: { + message.generateOmittedAsInternal = reader.bool(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a SelectiveGapicGeneration message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.api.SelectiveGapicGeneration} SelectiveGapicGeneration + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + SelectiveGapicGeneration.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a SelectiveGapicGeneration message. + * @function verify + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + SelectiveGapicGeneration.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.methods != null && message.hasOwnProperty("methods")) { + if (!Array.isArray(message.methods)) + return "methods: array expected"; + for (var i = 0; i < message.methods.length; ++i) + if (!$util.isString(message.methods[i])) + return "methods: string[] expected"; + } + if (message.generateOmittedAsInternal != null && message.hasOwnProperty("generateOmittedAsInternal")) + if (typeof message.generateOmittedAsInternal !== "boolean") + return "generateOmittedAsInternal: boolean expected"; + return null; + }; + + /** + * Creates a SelectiveGapicGeneration message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {Object.} object Plain object + * @returns {google.api.SelectiveGapicGeneration} SelectiveGapicGeneration + */ + SelectiveGapicGeneration.fromObject = function fromObject(object) { + if (object instanceof $root.google.api.SelectiveGapicGeneration) + return object; + var message = new $root.google.api.SelectiveGapicGeneration(); + if (object.methods) { + if (!Array.isArray(object.methods)) + throw TypeError(".google.api.SelectiveGapicGeneration.methods: array expected"); + message.methods = []; + for (var i = 0; i < object.methods.length; ++i) + message.methods[i] = String(object.methods[i]); + } + if (object.generateOmittedAsInternal != null) + message.generateOmittedAsInternal = Boolean(object.generateOmittedAsInternal); + return message; + }; + + /** + * Creates a plain object from a SelectiveGapicGeneration message. Also converts values to other types if specified. + * @function toObject + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {google.api.SelectiveGapicGeneration} message SelectiveGapicGeneration + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + SelectiveGapicGeneration.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.arrays || options.defaults) + object.methods = []; + if (options.defaults) + object.generateOmittedAsInternal = false; + if (message.methods && message.methods.length) { + object.methods = []; + for (var j = 0; j < message.methods.length; ++j) + object.methods[j] = message.methods[j]; + } + if (message.generateOmittedAsInternal != null && message.hasOwnProperty("generateOmittedAsInternal")) + object.generateOmittedAsInternal = message.generateOmittedAsInternal; + return object; + }; + + /** + * Converts this SelectiveGapicGeneration to JSON. + * @function toJSON + * @memberof google.api.SelectiveGapicGeneration + * @instance + * @returns {Object.} JSON object + */ + SelectiveGapicGeneration.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for SelectiveGapicGeneration + * @function getTypeUrl + * @memberof google.api.SelectiveGapicGeneration + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + SelectiveGapicGeneration.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.api.SelectiveGapicGeneration"; + }; + + return SelectiveGapicGeneration; + })(); + + /** + * LaunchStage enum. + * @name google.api.LaunchStage + * @enum {number} + * @property {number} LAUNCH_STAGE_UNSPECIFIED=0 LAUNCH_STAGE_UNSPECIFIED value + * @property {number} UNIMPLEMENTED=6 UNIMPLEMENTED value + * @property {number} PRELAUNCH=7 PRELAUNCH value + * @property {number} EARLY_ACCESS=1 EARLY_ACCESS value + * @property {number} ALPHA=2 ALPHA value + * @property {number} BETA=3 BETA value + * @property {number} GA=4 GA value + * @property {number} DEPRECATED=5 DEPRECATED value + */ + api.LaunchStage = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "LAUNCH_STAGE_UNSPECIFIED"] = 0; + values[valuesById[6] = "UNIMPLEMENTED"] = 6; + values[valuesById[7] = "PRELAUNCH"] = 7; + values[valuesById[1] = "EARLY_ACCESS"] = 1; + values[valuesById[2] = "ALPHA"] = 2; + values[valuesById[3] = "BETA"] = 3; + values[valuesById[4] = "GA"] = 4; + values[valuesById[5] = "DEPRECATED"] = 5; + return values; })(); /** @@ -32583,6 +33197,7 @@ * @name google.protobuf.Edition * @enum {number} * @property {number} EDITION_UNKNOWN=0 EDITION_UNKNOWN value + * @property {number} EDITION_LEGACY=900 EDITION_LEGACY value * @property {number} EDITION_PROTO2=998 EDITION_PROTO2 value * @property {number} EDITION_PROTO3=999 EDITION_PROTO3 value * @property {number} EDITION_2023=1000 EDITION_2023 value @@ -32597,6 +33212,7 @@ protobuf.Edition = (function() { var valuesById = {}, values = Object.create(valuesById); values[valuesById[0] = "EDITION_UNKNOWN"] = 0; + values[valuesById[900] = "EDITION_LEGACY"] = 900; values[valuesById[998] = "EDITION_PROTO2"] = 998; values[valuesById[999] = "EDITION_PROTO3"] = 999; values[valuesById[1000] = "EDITION_2023"] = 1000; @@ -32621,6 +33237,7 @@ * @property {Array.|null} [dependency] FileDescriptorProto dependency * @property {Array.|null} [publicDependency] FileDescriptorProto publicDependency * @property {Array.|null} [weakDependency] FileDescriptorProto weakDependency + * @property {Array.|null} [optionDependency] FileDescriptorProto optionDependency * @property {Array.|null} [messageType] FileDescriptorProto messageType * @property {Array.|null} [enumType] FileDescriptorProto enumType * @property {Array.|null} [service] FileDescriptorProto service @@ -32643,6 +33260,7 @@ this.dependency = []; this.publicDependency = []; this.weakDependency = []; + this.optionDependency = []; this.messageType = []; this.enumType = []; this.service = []; @@ -32693,6 +33311,14 @@ */ FileDescriptorProto.prototype.weakDependency = $util.emptyArray; + /** + * FileDescriptorProto optionDependency. + * @member {Array.} optionDependency + * @memberof google.protobuf.FileDescriptorProto + * @instance + */ + FileDescriptorProto.prototype.optionDependency = $util.emptyArray; + /** * FileDescriptorProto messageType. * @member {Array.} messageType @@ -32814,6 +33440,9 @@ writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); if (message.edition != null && Object.hasOwnProperty.call(message, "edition")) writer.uint32(/* id 14, wireType 0 =*/112).int32(message.edition); + if (message.optionDependency != null && message.optionDependency.length) + for (var i = 0; i < message.optionDependency.length; ++i) + writer.uint32(/* id 15, wireType 2 =*/122).string(message.optionDependency[i]); return writer; }; @@ -32886,6 +33515,12 @@ message.weakDependency.push(reader.int32()); break; } + case 15: { + if (!(message.optionDependency && message.optionDependency.length)) + message.optionDependency = []; + message.optionDependency.push(reader.string()); + break; + } case 4: { if (!(message.messageType && message.messageType.length)) message.messageType = []; @@ -32988,6 +33623,13 @@ if (!$util.isInteger(message.weakDependency[i])) return "weakDependency: integer[] expected"; } + if (message.optionDependency != null && message.hasOwnProperty("optionDependency")) { + if (!Array.isArray(message.optionDependency)) + return "optionDependency: array expected"; + for (var i = 0; i < message.optionDependency.length; ++i) + if (!$util.isString(message.optionDependency[i])) + return "optionDependency: string[] expected"; + } if (message.messageType != null && message.hasOwnProperty("messageType")) { if (!Array.isArray(message.messageType)) return "messageType: array expected"; @@ -33042,6 +33684,7 @@ default: return "edition: enum value expected"; case 0: + case 900: case 998: case 999: case 1000: @@ -33094,6 +33737,13 @@ for (var i = 0; i < object.weakDependency.length; ++i) message.weakDependency[i] = object.weakDependency[i] | 0; } + if (object.optionDependency) { + if (!Array.isArray(object.optionDependency)) + throw TypeError(".google.protobuf.FileDescriptorProto.optionDependency: array expected"); + message.optionDependency = []; + for (var i = 0; i < object.optionDependency.length; ++i) + message.optionDependency[i] = String(object.optionDependency[i]); + } if (object.messageType) { if (!Array.isArray(object.messageType)) throw TypeError(".google.protobuf.FileDescriptorProto.messageType: array expected"); @@ -33157,6 +33807,10 @@ case 0: message.edition = 0; break; + case "EDITION_LEGACY": + case 900: + message.edition = 900; + break; case "EDITION_PROTO2": case 998: message.edition = 998; @@ -33222,6 +33876,7 @@ object.extension = []; object.publicDependency = []; object.weakDependency = []; + object.optionDependency = []; } if (options.defaults) { object.name = ""; @@ -33278,6 +33933,11 @@ object.syntax = message.syntax; if (message.edition != null && message.hasOwnProperty("edition")) object.edition = options.enums === String ? $root.google.protobuf.Edition[message.edition] === undefined ? message.edition : $root.google.protobuf.Edition[message.edition] : message.edition; + if (message.optionDependency && message.optionDependency.length) { + object.optionDependency = []; + for (var j = 0; j < message.optionDependency.length; ++j) + object.optionDependency[j] = message.optionDependency[j]; + } return object; }; @@ -33326,6 +33986,7 @@ * @property {google.protobuf.IMessageOptions|null} [options] DescriptorProto options * @property {Array.|null} [reservedRange] DescriptorProto reservedRange * @property {Array.|null} [reservedName] DescriptorProto reservedName + * @property {google.protobuf.SymbolVisibility|null} [visibility] DescriptorProto visibility */ /** @@ -33431,6 +34092,14 @@ */ DescriptorProto.prototype.reservedName = $util.emptyArray; + /** + * DescriptorProto visibility. + * @member {google.protobuf.SymbolVisibility} visibility + * @memberof google.protobuf.DescriptorProto + * @instance + */ + DescriptorProto.prototype.visibility = 0; + /** * Creates a new DescriptorProto instance using the specified properties. * @function create @@ -33483,6 +34152,8 @@ if (message.reservedName != null && message.reservedName.length) for (var i = 0; i < message.reservedName.length; ++i) writer.uint32(/* id 10, wireType 2 =*/82).string(message.reservedName[i]); + if (message.visibility != null && Object.hasOwnProperty.call(message, "visibility")) + writer.uint32(/* id 11, wireType 0 =*/88).int32(message.visibility); return writer; }; @@ -33575,6 +34246,10 @@ message.reservedName.push(reader.string()); break; } + case 11: { + message.visibility = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -33688,6 +34363,15 @@ if (!$util.isString(message.reservedName[i])) return "reservedName: string[] expected"; } + if (message.visibility != null && message.hasOwnProperty("visibility")) + switch (message.visibility) { + default: + return "visibility: enum value expected"; + case 0: + case 1: + case 2: + break; + } return null; }; @@ -33787,6 +34471,26 @@ for (var i = 0; i < object.reservedName.length; ++i) message.reservedName[i] = String(object.reservedName[i]); } + switch (object.visibility) { + default: + if (typeof object.visibility === "number") { + message.visibility = object.visibility; + break; + } + break; + case "VISIBILITY_UNSET": + case 0: + message.visibility = 0; + break; + case "VISIBILITY_LOCAL": + case 1: + message.visibility = 1; + break; + case "VISIBILITY_EXPORT": + case 2: + message.visibility = 2; + break; + } return message; }; @@ -33816,6 +34520,7 @@ if (options.defaults) { object.name = ""; object.options = null; + object.visibility = options.enums === String ? "VISIBILITY_UNSET" : 0; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -33861,6 +34566,8 @@ for (var j = 0; j < message.reservedName.length; ++j) object.reservedName[j] = message.reservedName[j]; } + if (message.visibility != null && message.hasOwnProperty("visibility")) + object.visibility = options.enums === String ? $root.google.protobuf.SymbolVisibility[message.visibility] === undefined ? message.visibility : $root.google.protobuf.SymbolVisibility[message.visibility] : message.visibility; return object; }; @@ -35905,6 +36612,7 @@ * @property {google.protobuf.IEnumOptions|null} [options] EnumDescriptorProto options * @property {Array.|null} [reservedRange] EnumDescriptorProto reservedRange * @property {Array.|null} [reservedName] EnumDescriptorProto reservedName + * @property {google.protobuf.SymbolVisibility|null} [visibility] EnumDescriptorProto visibility */ /** @@ -35965,6 +36673,14 @@ */ EnumDescriptorProto.prototype.reservedName = $util.emptyArray; + /** + * EnumDescriptorProto visibility. + * @member {google.protobuf.SymbolVisibility} visibility + * @memberof google.protobuf.EnumDescriptorProto + * @instance + */ + EnumDescriptorProto.prototype.visibility = 0; + /** * Creates a new EnumDescriptorProto instance using the specified properties. * @function create @@ -36002,6 +36718,8 @@ if (message.reservedName != null && message.reservedName.length) for (var i = 0; i < message.reservedName.length; ++i) writer.uint32(/* id 5, wireType 2 =*/42).string(message.reservedName[i]); + if (message.visibility != null && Object.hasOwnProperty.call(message, "visibility")) + writer.uint32(/* id 6, wireType 0 =*/48).int32(message.visibility); return writer; }; @@ -36064,6 +36782,10 @@ message.reservedName.push(reader.string()); break; } + case 6: { + message.visibility = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -36132,6 +36854,15 @@ if (!$util.isString(message.reservedName[i])) return "reservedName: string[] expected"; } + if (message.visibility != null && message.hasOwnProperty("visibility")) + switch (message.visibility) { + default: + return "visibility: enum value expected"; + case 0: + case 1: + case 2: + break; + } return null; }; @@ -36181,6 +36912,26 @@ for (var i = 0; i < object.reservedName.length; ++i) message.reservedName[i] = String(object.reservedName[i]); } + switch (object.visibility) { + default: + if (typeof object.visibility === "number") { + message.visibility = object.visibility; + break; + } + break; + case "VISIBILITY_UNSET": + case 0: + message.visibility = 0; + break; + case "VISIBILITY_LOCAL": + case 1: + message.visibility = 1; + break; + case "VISIBILITY_EXPORT": + case 2: + message.visibility = 2; + break; + } return message; }; @@ -36205,6 +36956,7 @@ if (options.defaults) { object.name = ""; object.options = null; + object.visibility = options.enums === String ? "VISIBILITY_UNSET" : 0; } if (message.name != null && message.hasOwnProperty("name")) object.name = message.name; @@ -36225,6 +36977,8 @@ for (var j = 0; j < message.reservedName.length; ++j) object.reservedName[j] = message.reservedName[j]; } + if (message.visibility != null && message.hasOwnProperty("visibility")) + object.visibility = options.enums === String ? $root.google.protobuf.SymbolVisibility[message.visibility] === undefined ? message.visibility : $root.google.protobuf.SymbolVisibility[message.visibility] : message.visibility; return object; }; @@ -38543,6 +39297,7 @@ * @property {Array.|null} [targets] FieldOptions targets * @property {Array.|null} [editionDefaults] FieldOptions editionDefaults * @property {google.protobuf.IFeatureSet|null} [features] FieldOptions features + * @property {google.protobuf.FieldOptions.IFeatureSupport|null} [featureSupport] FieldOptions featureSupport * @property {Array.|null} [uninterpretedOption] FieldOptions uninterpretedOption * @property {Array.|null} [".google.api.fieldBehavior"] FieldOptions .google.api.fieldBehavior * @property {google.api.IResourceReference|null} [".google.api.resourceReference"] FieldOptions .google.api.resourceReference @@ -38663,6 +39418,14 @@ */ FieldOptions.prototype.features = null; + /** + * FieldOptions featureSupport. + * @member {google.protobuf.FieldOptions.IFeatureSupport|null|undefined} featureSupport + * @memberof google.protobuf.FieldOptions + * @instance + */ + FieldOptions.prototype.featureSupport = null; + /** * FieldOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -38737,6 +39500,8 @@ $root.google.protobuf.FieldOptions.EditionDefault.encode(message.editionDefaults[i], writer.uint32(/* id 20, wireType 2 =*/162).fork()).ldelim(); if (message.features != null && Object.hasOwnProperty.call(message, "features")) $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 21, wireType 2 =*/170).fork()).ldelim(); + if (message.featureSupport != null && Object.hasOwnProperty.call(message, "featureSupport")) + $root.google.protobuf.FieldOptions.FeatureSupport.encode(message.featureSupport, writer.uint32(/* id 22, wireType 2 =*/178).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -38838,6 +39603,10 @@ message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); break; } + case 22: { + message.featureSupport = $root.google.protobuf.FieldOptions.FeatureSupport.decode(reader, reader.uint32()); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -38973,6 +39742,11 @@ if (error) return "features." + error; } + if (message.featureSupport != null && message.hasOwnProperty("featureSupport")) { + var error = $root.google.protobuf.FieldOptions.FeatureSupport.verify(message.featureSupport); + if (error) + return "featureSupport." + error; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -39161,6 +39935,11 @@ throw TypeError(".google.protobuf.FieldOptions.features: object expected"); message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); } + if (object.featureSupport != null) { + if (typeof object.featureSupport !== "object") + throw TypeError(".google.protobuf.FieldOptions.featureSupport: object expected"); + message.featureSupport = $root.google.protobuf.FieldOptions.FeatureSupport.fromObject(object.featureSupport); + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.FieldOptions.uninterpretedOption: array expected"); @@ -39258,6 +40037,7 @@ object.debugRedact = false; object.retention = options.enums === String ? "RETENTION_UNKNOWN" : 0; object.features = null; + object.featureSupport = null; object[".google.api.resourceReference"] = null; } if (message.ctype != null && message.hasOwnProperty("ctype")) @@ -39290,6 +40070,8 @@ } if (message.features != null && message.hasOwnProperty("features")) object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); + if (message.featureSupport != null && message.hasOwnProperty("featureSupport")) + object.featureSupport = $root.google.protobuf.FieldOptions.FeatureSupport.toObject(message.featureSupport, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -39562,6 +40344,7 @@ default: return "edition: enum value expected"; case 0: + case 900: case 998: case 999: case 1000: @@ -39603,6 +40386,10 @@ case 0: message.edition = 0; break; + case "EDITION_LEGACY": + case 900: + message.edition = 900; + break; case "EDITION_PROTO2": case 998: message.edition = 998; @@ -39613,93 +40400,575 @@ break; case "EDITION_2023": case 1000: - message.edition = 1000; + message.edition = 1000; + break; + case "EDITION_2024": + case 1001: + message.edition = 1001; + break; + case "EDITION_1_TEST_ONLY": + case 1: + message.edition = 1; + break; + case "EDITION_2_TEST_ONLY": + case 2: + message.edition = 2; + break; + case "EDITION_99997_TEST_ONLY": + case 99997: + message.edition = 99997; + break; + case "EDITION_99998_TEST_ONLY": + case 99998: + message.edition = 99998; + break; + case "EDITION_99999_TEST_ONLY": + case 99999: + message.edition = 99999; + break; + case "EDITION_MAX": + case 2147483647: + message.edition = 2147483647; + break; + } + if (object.value != null) + message.value = String(object.value); + return message; + }; + + /** + * Creates a plain object from an EditionDefault message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {google.protobuf.FieldOptions.EditionDefault} message EditionDefault + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + EditionDefault.toObject = function toObject(message, options) { + if (!options) + options = {}; + var object = {}; + if (options.defaults) { + object.value = ""; + object.edition = options.enums === String ? "EDITION_UNKNOWN" : 0; + } + if (message.value != null && message.hasOwnProperty("value")) + object.value = message.value; + if (message.edition != null && message.hasOwnProperty("edition")) + object.edition = options.enums === String ? $root.google.protobuf.Edition[message.edition] === undefined ? message.edition : $root.google.protobuf.Edition[message.edition] : message.edition; + return object; + }; + + /** + * Converts this EditionDefault to JSON. + * @function toJSON + * @memberof google.protobuf.FieldOptions.EditionDefault + * @instance + * @returns {Object.} JSON object + */ + EditionDefault.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for EditionDefault + * @function getTypeUrl + * @memberof google.protobuf.FieldOptions.EditionDefault + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + EditionDefault.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FieldOptions.EditionDefault"; + }; + + return EditionDefault; + })(); + + FieldOptions.FeatureSupport = (function() { + + /** + * Properties of a FeatureSupport. + * @memberof google.protobuf.FieldOptions + * @interface IFeatureSupport + * @property {google.protobuf.Edition|null} [editionIntroduced] FeatureSupport editionIntroduced + * @property {google.protobuf.Edition|null} [editionDeprecated] FeatureSupport editionDeprecated + * @property {string|null} [deprecationWarning] FeatureSupport deprecationWarning + * @property {google.protobuf.Edition|null} [editionRemoved] FeatureSupport editionRemoved + */ + + /** + * Constructs a new FeatureSupport. + * @memberof google.protobuf.FieldOptions + * @classdesc Represents a FeatureSupport. + * @implements IFeatureSupport + * @constructor + * @param {google.protobuf.FieldOptions.IFeatureSupport=} [properties] Properties to set + */ + function FeatureSupport(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * FeatureSupport editionIntroduced. + * @member {google.protobuf.Edition} editionIntroduced + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @instance + */ + FeatureSupport.prototype.editionIntroduced = 0; + + /** + * FeatureSupport editionDeprecated. + * @member {google.protobuf.Edition} editionDeprecated + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @instance + */ + FeatureSupport.prototype.editionDeprecated = 0; + + /** + * FeatureSupport deprecationWarning. + * @member {string} deprecationWarning + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @instance + */ + FeatureSupport.prototype.deprecationWarning = ""; + + /** + * FeatureSupport editionRemoved. + * @member {google.protobuf.Edition} editionRemoved + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @instance + */ + FeatureSupport.prototype.editionRemoved = 0; + + /** + * Creates a new FeatureSupport instance using the specified properties. + * @function create + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @static + * @param {google.protobuf.FieldOptions.IFeatureSupport=} [properties] Properties to set + * @returns {google.protobuf.FieldOptions.FeatureSupport} FeatureSupport instance + */ + FeatureSupport.create = function create(properties) { + return new FeatureSupport(properties); + }; + + /** + * Encodes the specified FeatureSupport message. Does not implicitly {@link google.protobuf.FieldOptions.FeatureSupport.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @static + * @param {google.protobuf.FieldOptions.IFeatureSupport} message FeatureSupport message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FeatureSupport.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + if (message.editionIntroduced != null && Object.hasOwnProperty.call(message, "editionIntroduced")) + writer.uint32(/* id 1, wireType 0 =*/8).int32(message.editionIntroduced); + if (message.editionDeprecated != null && Object.hasOwnProperty.call(message, "editionDeprecated")) + writer.uint32(/* id 2, wireType 0 =*/16).int32(message.editionDeprecated); + if (message.deprecationWarning != null && Object.hasOwnProperty.call(message, "deprecationWarning")) + writer.uint32(/* id 3, wireType 2 =*/26).string(message.deprecationWarning); + if (message.editionRemoved != null && Object.hasOwnProperty.call(message, "editionRemoved")) + writer.uint32(/* id 4, wireType 0 =*/32).int32(message.editionRemoved); + return writer; + }; + + /** + * Encodes the specified FeatureSupport message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.FeatureSupport.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @static + * @param {google.protobuf.FieldOptions.IFeatureSupport} message FeatureSupport message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + FeatureSupport.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a FeatureSupport message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FieldOptions.FeatureSupport} FeatureSupport + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FeatureSupport.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FieldOptions.FeatureSupport(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + case 1: { + message.editionIntroduced = reader.int32(); + break; + } + case 2: { + message.editionDeprecated = reader.int32(); + break; + } + case 3: { + message.deprecationWarning = reader.string(); + break; + } + case 4: { + message.editionRemoved = reader.int32(); + break; + } + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a FeatureSupport message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FieldOptions.FeatureSupport} FeatureSupport + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + FeatureSupport.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a FeatureSupport message. + * @function verify + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + FeatureSupport.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + if (message.editionIntroduced != null && message.hasOwnProperty("editionIntroduced")) + switch (message.editionIntroduced) { + default: + return "editionIntroduced: enum value expected"; + case 0: + case 900: + case 998: + case 999: + case 1000: + case 1001: + case 1: + case 2: + case 99997: + case 99998: + case 99999: + case 2147483647: + break; + } + if (message.editionDeprecated != null && message.hasOwnProperty("editionDeprecated")) + switch (message.editionDeprecated) { + default: + return "editionDeprecated: enum value expected"; + case 0: + case 900: + case 998: + case 999: + case 1000: + case 1001: + case 1: + case 2: + case 99997: + case 99998: + case 99999: + case 2147483647: + break; + } + if (message.deprecationWarning != null && message.hasOwnProperty("deprecationWarning")) + if (!$util.isString(message.deprecationWarning)) + return "deprecationWarning: string expected"; + if (message.editionRemoved != null && message.hasOwnProperty("editionRemoved")) + switch (message.editionRemoved) { + default: + return "editionRemoved: enum value expected"; + case 0: + case 900: + case 998: + case 999: + case 1000: + case 1001: + case 1: + case 2: + case 99997: + case 99998: + case 99999: + case 2147483647: + break; + } + return null; + }; + + /** + * Creates a FeatureSupport message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FieldOptions.FeatureSupport + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FieldOptions.FeatureSupport} FeatureSupport + */ + FeatureSupport.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FieldOptions.FeatureSupport) + return object; + var message = new $root.google.protobuf.FieldOptions.FeatureSupport(); + switch (object.editionIntroduced) { + default: + if (typeof object.editionIntroduced === "number") { + message.editionIntroduced = object.editionIntroduced; + break; + } + break; + case "EDITION_UNKNOWN": + case 0: + message.editionIntroduced = 0; + break; + case "EDITION_LEGACY": + case 900: + message.editionIntroduced = 900; + break; + case "EDITION_PROTO2": + case 998: + message.editionIntroduced = 998; + break; + case "EDITION_PROTO3": + case 999: + message.editionIntroduced = 999; + break; + case "EDITION_2023": + case 1000: + message.editionIntroduced = 1000; + break; + case "EDITION_2024": + case 1001: + message.editionIntroduced = 1001; + break; + case "EDITION_1_TEST_ONLY": + case 1: + message.editionIntroduced = 1; + break; + case "EDITION_2_TEST_ONLY": + case 2: + message.editionIntroduced = 2; + break; + case "EDITION_99997_TEST_ONLY": + case 99997: + message.editionIntroduced = 99997; + break; + case "EDITION_99998_TEST_ONLY": + case 99998: + message.editionIntroduced = 99998; + break; + case "EDITION_99999_TEST_ONLY": + case 99999: + message.editionIntroduced = 99999; + break; + case "EDITION_MAX": + case 2147483647: + message.editionIntroduced = 2147483647; + break; + } + switch (object.editionDeprecated) { + default: + if (typeof object.editionDeprecated === "number") { + message.editionDeprecated = object.editionDeprecated; + break; + } + break; + case "EDITION_UNKNOWN": + case 0: + message.editionDeprecated = 0; + break; + case "EDITION_LEGACY": + case 900: + message.editionDeprecated = 900; + break; + case "EDITION_PROTO2": + case 998: + message.editionDeprecated = 998; + break; + case "EDITION_PROTO3": + case 999: + message.editionDeprecated = 999; + break; + case "EDITION_2023": + case 1000: + message.editionDeprecated = 1000; + break; + case "EDITION_2024": + case 1001: + message.editionDeprecated = 1001; + break; + case "EDITION_1_TEST_ONLY": + case 1: + message.editionDeprecated = 1; + break; + case "EDITION_2_TEST_ONLY": + case 2: + message.editionDeprecated = 2; + break; + case "EDITION_99997_TEST_ONLY": + case 99997: + message.editionDeprecated = 99997; + break; + case "EDITION_99998_TEST_ONLY": + case 99998: + message.editionDeprecated = 99998; + break; + case "EDITION_99999_TEST_ONLY": + case 99999: + message.editionDeprecated = 99999; + break; + case "EDITION_MAX": + case 2147483647: + message.editionDeprecated = 2147483647; + break; + } + if (object.deprecationWarning != null) + message.deprecationWarning = String(object.deprecationWarning); + switch (object.editionRemoved) { + default: + if (typeof object.editionRemoved === "number") { + message.editionRemoved = object.editionRemoved; + break; + } + break; + case "EDITION_UNKNOWN": + case 0: + message.editionRemoved = 0; + break; + case "EDITION_LEGACY": + case 900: + message.editionRemoved = 900; + break; + case "EDITION_PROTO2": + case 998: + message.editionRemoved = 998; + break; + case "EDITION_PROTO3": + case 999: + message.editionRemoved = 999; + break; + case "EDITION_2023": + case 1000: + message.editionRemoved = 1000; break; case "EDITION_2024": case 1001: - message.edition = 1001; + message.editionRemoved = 1001; break; case "EDITION_1_TEST_ONLY": case 1: - message.edition = 1; + message.editionRemoved = 1; break; case "EDITION_2_TEST_ONLY": case 2: - message.edition = 2; + message.editionRemoved = 2; break; case "EDITION_99997_TEST_ONLY": case 99997: - message.edition = 99997; + message.editionRemoved = 99997; break; case "EDITION_99998_TEST_ONLY": case 99998: - message.edition = 99998; + message.editionRemoved = 99998; break; case "EDITION_99999_TEST_ONLY": case 99999: - message.edition = 99999; + message.editionRemoved = 99999; break; case "EDITION_MAX": case 2147483647: - message.edition = 2147483647; + message.editionRemoved = 2147483647; break; } - if (object.value != null) - message.value = String(object.value); return message; }; /** - * Creates a plain object from an EditionDefault message. Also converts values to other types if specified. + * Creates a plain object from a FeatureSupport message. Also converts values to other types if specified. * @function toObject - * @memberof google.protobuf.FieldOptions.EditionDefault + * @memberof google.protobuf.FieldOptions.FeatureSupport * @static - * @param {google.protobuf.FieldOptions.EditionDefault} message EditionDefault + * @param {google.protobuf.FieldOptions.FeatureSupport} message FeatureSupport * @param {$protobuf.IConversionOptions} [options] Conversion options * @returns {Object.} Plain object */ - EditionDefault.toObject = function toObject(message, options) { + FeatureSupport.toObject = function toObject(message, options) { if (!options) options = {}; var object = {}; if (options.defaults) { - object.value = ""; - object.edition = options.enums === String ? "EDITION_UNKNOWN" : 0; - } - if (message.value != null && message.hasOwnProperty("value")) - object.value = message.value; - if (message.edition != null && message.hasOwnProperty("edition")) - object.edition = options.enums === String ? $root.google.protobuf.Edition[message.edition] === undefined ? message.edition : $root.google.protobuf.Edition[message.edition] : message.edition; + object.editionIntroduced = options.enums === String ? "EDITION_UNKNOWN" : 0; + object.editionDeprecated = options.enums === String ? "EDITION_UNKNOWN" : 0; + object.deprecationWarning = ""; + object.editionRemoved = options.enums === String ? "EDITION_UNKNOWN" : 0; + } + if (message.editionIntroduced != null && message.hasOwnProperty("editionIntroduced")) + object.editionIntroduced = options.enums === String ? $root.google.protobuf.Edition[message.editionIntroduced] === undefined ? message.editionIntroduced : $root.google.protobuf.Edition[message.editionIntroduced] : message.editionIntroduced; + if (message.editionDeprecated != null && message.hasOwnProperty("editionDeprecated")) + object.editionDeprecated = options.enums === String ? $root.google.protobuf.Edition[message.editionDeprecated] === undefined ? message.editionDeprecated : $root.google.protobuf.Edition[message.editionDeprecated] : message.editionDeprecated; + if (message.deprecationWarning != null && message.hasOwnProperty("deprecationWarning")) + object.deprecationWarning = message.deprecationWarning; + if (message.editionRemoved != null && message.hasOwnProperty("editionRemoved")) + object.editionRemoved = options.enums === String ? $root.google.protobuf.Edition[message.editionRemoved] === undefined ? message.editionRemoved : $root.google.protobuf.Edition[message.editionRemoved] : message.editionRemoved; return object; }; /** - * Converts this EditionDefault to JSON. + * Converts this FeatureSupport to JSON. * @function toJSON - * @memberof google.protobuf.FieldOptions.EditionDefault + * @memberof google.protobuf.FieldOptions.FeatureSupport * @instance * @returns {Object.} JSON object */ - EditionDefault.prototype.toJSON = function toJSON() { + FeatureSupport.prototype.toJSON = function toJSON() { return this.constructor.toObject(this, $protobuf.util.toJSONOptions); }; /** - * Gets the default type url for EditionDefault + * Gets the default type url for FeatureSupport * @function getTypeUrl - * @memberof google.protobuf.FieldOptions.EditionDefault + * @memberof google.protobuf.FieldOptions.FeatureSupport * @static * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") * @returns {string} The default type url */ - EditionDefault.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + FeatureSupport.getTypeUrl = function getTypeUrl(typeUrlPrefix) { if (typeUrlPrefix === undefined) { typeUrlPrefix = "type.googleapis.com"; } - return typeUrlPrefix + "/google.protobuf.FieldOptions.EditionDefault"; + return typeUrlPrefix + "/google.protobuf.FieldOptions.FeatureSupport"; }; - return EditionDefault; + return FeatureSupport; })(); return FieldOptions; @@ -40294,6 +41563,7 @@ * @property {boolean|null} [deprecated] EnumValueOptions deprecated * @property {google.protobuf.IFeatureSet|null} [features] EnumValueOptions features * @property {boolean|null} [debugRedact] EnumValueOptions debugRedact + * @property {google.protobuf.FieldOptions.IFeatureSupport|null} [featureSupport] EnumValueOptions featureSupport * @property {Array.|null} [uninterpretedOption] EnumValueOptions uninterpretedOption */ @@ -40337,6 +41607,14 @@ */ EnumValueOptions.prototype.debugRedact = false; + /** + * EnumValueOptions featureSupport. + * @member {google.protobuf.FieldOptions.IFeatureSupport|null|undefined} featureSupport + * @memberof google.protobuf.EnumValueOptions + * @instance + */ + EnumValueOptions.prototype.featureSupport = null; + /** * EnumValueOptions uninterpretedOption. * @member {Array.} uninterpretedOption @@ -40375,6 +41653,8 @@ $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); if (message.debugRedact != null && Object.hasOwnProperty.call(message, "debugRedact")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.debugRedact); + if (message.featureSupport != null && Object.hasOwnProperty.call(message, "featureSupport")) + $root.google.protobuf.FieldOptions.FeatureSupport.encode(message.featureSupport, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); if (message.uninterpretedOption != null && message.uninterpretedOption.length) for (var i = 0; i < message.uninterpretedOption.length; ++i) $root.google.protobuf.UninterpretedOption.encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); @@ -40426,6 +41706,10 @@ message.debugRedact = reader.bool(); break; } + case 4: { + message.featureSupport = $root.google.protobuf.FieldOptions.FeatureSupport.decode(reader, reader.uint32()); + break; + } case 999: { if (!(message.uninterpretedOption && message.uninterpretedOption.length)) message.uninterpretedOption = []; @@ -40478,6 +41762,11 @@ if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) if (typeof message.debugRedact !== "boolean") return "debugRedact: boolean expected"; + if (message.featureSupport != null && message.hasOwnProperty("featureSupport")) { + var error = $root.google.protobuf.FieldOptions.FeatureSupport.verify(message.featureSupport); + if (error) + return "featureSupport." + error; + } if (message.uninterpretedOption != null && message.hasOwnProperty("uninterpretedOption")) { if (!Array.isArray(message.uninterpretedOption)) return "uninterpretedOption: array expected"; @@ -40511,6 +41800,11 @@ } if (object.debugRedact != null) message.debugRedact = Boolean(object.debugRedact); + if (object.featureSupport != null) { + if (typeof object.featureSupport !== "object") + throw TypeError(".google.protobuf.EnumValueOptions.featureSupport: object expected"); + message.featureSupport = $root.google.protobuf.FieldOptions.FeatureSupport.fromObject(object.featureSupport); + } if (object.uninterpretedOption) { if (!Array.isArray(object.uninterpretedOption)) throw TypeError(".google.protobuf.EnumValueOptions.uninterpretedOption: array expected"); @@ -40543,6 +41837,7 @@ object.deprecated = false; object.features = null; object.debugRedact = false; + object.featureSupport = null; } if (message.deprecated != null && message.hasOwnProperty("deprecated")) object.deprecated = message.deprecated; @@ -40550,6 +41845,8 @@ object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.debugRedact != null && message.hasOwnProperty("debugRedact")) object.debugRedact = message.debugRedact; + if (message.featureSupport != null && message.hasOwnProperty("featureSupport")) + object.featureSupport = $root.google.protobuf.FieldOptions.FeatureSupport.toObject(message.featureSupport, options); if (message.uninterpretedOption && message.uninterpretedOption.length) { object.uninterpretedOption = []; for (var j = 0; j < message.uninterpretedOption.length; ++j) @@ -41989,6 +43286,8 @@ * @property {google.protobuf.FeatureSet.Utf8Validation|null} [utf8Validation] FeatureSet utf8Validation * @property {google.protobuf.FeatureSet.MessageEncoding|null} [messageEncoding] FeatureSet messageEncoding * @property {google.protobuf.FeatureSet.JsonFormat|null} [jsonFormat] FeatureSet jsonFormat + * @property {google.protobuf.FeatureSet.EnforceNamingStyle|null} [enforceNamingStyle] FeatureSet enforceNamingStyle + * @property {google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility|null} [defaultSymbolVisibility] FeatureSet defaultSymbolVisibility */ /** @@ -42054,6 +43353,22 @@ */ FeatureSet.prototype.jsonFormat = 0; + /** + * FeatureSet enforceNamingStyle. + * @member {google.protobuf.FeatureSet.EnforceNamingStyle} enforceNamingStyle + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.enforceNamingStyle = 0; + + /** + * FeatureSet defaultSymbolVisibility. + * @member {google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility} defaultSymbolVisibility + * @memberof google.protobuf.FeatureSet + * @instance + */ + FeatureSet.prototype.defaultSymbolVisibility = 0; + /** * Creates a new FeatureSet instance using the specified properties. * @function create @@ -42090,6 +43405,10 @@ writer.uint32(/* id 5, wireType 0 =*/40).int32(message.messageEncoding); if (message.jsonFormat != null && Object.hasOwnProperty.call(message, "jsonFormat")) writer.uint32(/* id 6, wireType 0 =*/48).int32(message.jsonFormat); + if (message.enforceNamingStyle != null && Object.hasOwnProperty.call(message, "enforceNamingStyle")) + writer.uint32(/* id 7, wireType 0 =*/56).int32(message.enforceNamingStyle); + if (message.defaultSymbolVisibility != null && Object.hasOwnProperty.call(message, "defaultSymbolVisibility")) + writer.uint32(/* id 8, wireType 0 =*/64).int32(message.defaultSymbolVisibility); return writer; }; @@ -42150,6 +43469,14 @@ message.jsonFormat = reader.int32(); break; } + case 7: { + message.enforceNamingStyle = reader.int32(); + break; + } + case 8: { + message.defaultSymbolVisibility = reader.int32(); + break; + } default: reader.skipType(tag & 7); break; @@ -42240,6 +43567,26 @@ case 2: break; } + if (message.enforceNamingStyle != null && message.hasOwnProperty("enforceNamingStyle")) + switch (message.enforceNamingStyle) { + default: + return "enforceNamingStyle: enum value expected"; + case 0: + case 1: + case 2: + break; + } + if (message.defaultSymbolVisibility != null && message.hasOwnProperty("defaultSymbolVisibility")) + switch (message.defaultSymbolVisibility) { + default: + return "defaultSymbolVisibility: enum value expected"; + case 0: + case 1: + case 2: + case 3: + case 4: + break; + } return null; }; @@ -42379,6 +43726,54 @@ message.jsonFormat = 2; break; } + switch (object.enforceNamingStyle) { + default: + if (typeof object.enforceNamingStyle === "number") { + message.enforceNamingStyle = object.enforceNamingStyle; + break; + } + break; + case "ENFORCE_NAMING_STYLE_UNKNOWN": + case 0: + message.enforceNamingStyle = 0; + break; + case "STYLE2024": + case 1: + message.enforceNamingStyle = 1; + break; + case "STYLE_LEGACY": + case 2: + message.enforceNamingStyle = 2; + break; + } + switch (object.defaultSymbolVisibility) { + default: + if (typeof object.defaultSymbolVisibility === "number") { + message.defaultSymbolVisibility = object.defaultSymbolVisibility; + break; + } + break; + case "DEFAULT_SYMBOL_VISIBILITY_UNKNOWN": + case 0: + message.defaultSymbolVisibility = 0; + break; + case "EXPORT_ALL": + case 1: + message.defaultSymbolVisibility = 1; + break; + case "EXPORT_TOP_LEVEL": + case 2: + message.defaultSymbolVisibility = 2; + break; + case "LOCAL_ALL": + case 3: + message.defaultSymbolVisibility = 3; + break; + case "STRICT": + case 4: + message.defaultSymbolVisibility = 4; + break; + } return message; }; @@ -42402,6 +43797,8 @@ object.utf8Validation = options.enums === String ? "UTF8_VALIDATION_UNKNOWN" : 0; object.messageEncoding = options.enums === String ? "MESSAGE_ENCODING_UNKNOWN" : 0; object.jsonFormat = options.enums === String ? "JSON_FORMAT_UNKNOWN" : 0; + object.enforceNamingStyle = options.enums === String ? "ENFORCE_NAMING_STYLE_UNKNOWN" : 0; + object.defaultSymbolVisibility = options.enums === String ? "DEFAULT_SYMBOL_VISIBILITY_UNKNOWN" : 0; } if (message.fieldPresence != null && message.hasOwnProperty("fieldPresence")) object.fieldPresence = options.enums === String ? $root.google.protobuf.FeatureSet.FieldPresence[message.fieldPresence] === undefined ? message.fieldPresence : $root.google.protobuf.FeatureSet.FieldPresence[message.fieldPresence] : message.fieldPresence; @@ -42415,6 +43812,10 @@ object.messageEncoding = options.enums === String ? $root.google.protobuf.FeatureSet.MessageEncoding[message.messageEncoding] === undefined ? message.messageEncoding : $root.google.protobuf.FeatureSet.MessageEncoding[message.messageEncoding] : message.messageEncoding; if (message.jsonFormat != null && message.hasOwnProperty("jsonFormat")) object.jsonFormat = options.enums === String ? $root.google.protobuf.FeatureSet.JsonFormat[message.jsonFormat] === undefined ? message.jsonFormat : $root.google.protobuf.FeatureSet.JsonFormat[message.jsonFormat] : message.jsonFormat; + if (message.enforceNamingStyle != null && message.hasOwnProperty("enforceNamingStyle")) + object.enforceNamingStyle = options.enums === String ? $root.google.protobuf.FeatureSet.EnforceNamingStyle[message.enforceNamingStyle] === undefined ? message.enforceNamingStyle : $root.google.protobuf.FeatureSet.EnforceNamingStyle[message.enforceNamingStyle] : message.enforceNamingStyle; + if (message.defaultSymbolVisibility != null && message.hasOwnProperty("defaultSymbolVisibility")) + object.defaultSymbolVisibility = options.enums === String ? $root.google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility[message.defaultSymbolVisibility] === undefined ? message.defaultSymbolVisibility : $root.google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility[message.defaultSymbolVisibility] : message.defaultSymbolVisibility; return object; }; @@ -42542,6 +43943,219 @@ return values; })(); + /** + * EnforceNamingStyle enum. + * @name google.protobuf.FeatureSet.EnforceNamingStyle + * @enum {number} + * @property {number} ENFORCE_NAMING_STYLE_UNKNOWN=0 ENFORCE_NAMING_STYLE_UNKNOWN value + * @property {number} STYLE2024=1 STYLE2024 value + * @property {number} STYLE_LEGACY=2 STYLE_LEGACY value + */ + FeatureSet.EnforceNamingStyle = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "ENFORCE_NAMING_STYLE_UNKNOWN"] = 0; + values[valuesById[1] = "STYLE2024"] = 1; + values[valuesById[2] = "STYLE_LEGACY"] = 2; + return values; + })(); + + FeatureSet.VisibilityFeature = (function() { + + /** + * Properties of a VisibilityFeature. + * @memberof google.protobuf.FeatureSet + * @interface IVisibilityFeature + */ + + /** + * Constructs a new VisibilityFeature. + * @memberof google.protobuf.FeatureSet + * @classdesc Represents a VisibilityFeature. + * @implements IVisibilityFeature + * @constructor + * @param {google.protobuf.FeatureSet.IVisibilityFeature=} [properties] Properties to set + */ + function VisibilityFeature(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new VisibilityFeature instance using the specified properties. + * @function create + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {google.protobuf.FeatureSet.IVisibilityFeature=} [properties] Properties to set + * @returns {google.protobuf.FeatureSet.VisibilityFeature} VisibilityFeature instance + */ + VisibilityFeature.create = function create(properties) { + return new VisibilityFeature(properties); + }; + + /** + * Encodes the specified VisibilityFeature message. Does not implicitly {@link google.protobuf.FeatureSet.VisibilityFeature.verify|verify} messages. + * @function encode + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {google.protobuf.FeatureSet.IVisibilityFeature} message VisibilityFeature message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + VisibilityFeature.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified VisibilityFeature message, length delimited. Does not implicitly {@link google.protobuf.FeatureSet.VisibilityFeature.verify|verify} messages. + * @function encodeDelimited + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {google.protobuf.FeatureSet.IVisibilityFeature} message VisibilityFeature message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + VisibilityFeature.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a VisibilityFeature message from the specified reader or buffer. + * @function decode + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.protobuf.FeatureSet.VisibilityFeature} VisibilityFeature + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + VisibilityFeature.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.protobuf.FeatureSet.VisibilityFeature(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a VisibilityFeature message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.protobuf.FeatureSet.VisibilityFeature} VisibilityFeature + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + VisibilityFeature.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a VisibilityFeature message. + * @function verify + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + VisibilityFeature.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a VisibilityFeature message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {Object.} object Plain object + * @returns {google.protobuf.FeatureSet.VisibilityFeature} VisibilityFeature + */ + VisibilityFeature.fromObject = function fromObject(object) { + if (object instanceof $root.google.protobuf.FeatureSet.VisibilityFeature) + return object; + return new $root.google.protobuf.FeatureSet.VisibilityFeature(); + }; + + /** + * Creates a plain object from a VisibilityFeature message. Also converts values to other types if specified. + * @function toObject + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {google.protobuf.FeatureSet.VisibilityFeature} message VisibilityFeature + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + VisibilityFeature.toObject = function toObject() { + return {}; + }; + + /** + * Converts this VisibilityFeature to JSON. + * @function toJSON + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @instance + * @returns {Object.} JSON object + */ + VisibilityFeature.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for VisibilityFeature + * @function getTypeUrl + * @memberof google.protobuf.FeatureSet.VisibilityFeature + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + VisibilityFeature.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.protobuf.FeatureSet.VisibilityFeature"; + }; + + /** + * DefaultSymbolVisibility enum. + * @name google.protobuf.FeatureSet.VisibilityFeature.DefaultSymbolVisibility + * @enum {number} + * @property {number} DEFAULT_SYMBOL_VISIBILITY_UNKNOWN=0 DEFAULT_SYMBOL_VISIBILITY_UNKNOWN value + * @property {number} EXPORT_ALL=1 EXPORT_ALL value + * @property {number} EXPORT_TOP_LEVEL=2 EXPORT_TOP_LEVEL value + * @property {number} LOCAL_ALL=3 LOCAL_ALL value + * @property {number} STRICT=4 STRICT value + */ + VisibilityFeature.DefaultSymbolVisibility = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "DEFAULT_SYMBOL_VISIBILITY_UNKNOWN"] = 0; + values[valuesById[1] = "EXPORT_ALL"] = 1; + values[valuesById[2] = "EXPORT_TOP_LEVEL"] = 2; + values[valuesById[3] = "LOCAL_ALL"] = 3; + values[valuesById[4] = "STRICT"] = 4; + return values; + })(); + + return VisibilityFeature; + })(); + return FeatureSet; })(); @@ -42726,6 +44340,7 @@ default: return "minimumEdition: enum value expected"; case 0: + case 900: case 998: case 999: case 1000: @@ -42743,6 +44358,7 @@ default: return "maximumEdition: enum value expected"; case 0: + case 900: case 998: case 999: case 1000: @@ -42791,6 +44407,10 @@ case 0: message.minimumEdition = 0; break; + case "EDITION_LEGACY": + case 900: + message.minimumEdition = 900; + break; case "EDITION_PROTO2": case 998: message.minimumEdition = 998; @@ -42843,6 +44463,10 @@ case 0: message.maximumEdition = 0; break; + case "EDITION_LEGACY": + case 900: + message.maximumEdition = 900; + break; case "EDITION_PROTO2": case 998: message.maximumEdition = 998; @@ -42951,7 +44575,8 @@ * @memberof google.protobuf.FeatureSetDefaults * @interface IFeatureSetEditionDefault * @property {google.protobuf.Edition|null} [edition] FeatureSetEditionDefault edition - * @property {google.protobuf.IFeatureSet|null} [features] FeatureSetEditionDefault features + * @property {google.protobuf.IFeatureSet|null} [overridableFeatures] FeatureSetEditionDefault overridableFeatures + * @property {google.protobuf.IFeatureSet|null} [fixedFeatures] FeatureSetEditionDefault fixedFeatures */ /** @@ -42978,12 +44603,20 @@ FeatureSetEditionDefault.prototype.edition = 0; /** - * FeatureSetEditionDefault features. - * @member {google.protobuf.IFeatureSet|null|undefined} features + * FeatureSetEditionDefault overridableFeatures. + * @member {google.protobuf.IFeatureSet|null|undefined} overridableFeatures + * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault + * @instance + */ + FeatureSetEditionDefault.prototype.overridableFeatures = null; + + /** + * FeatureSetEditionDefault fixedFeatures. + * @member {google.protobuf.IFeatureSet|null|undefined} fixedFeatures * @memberof google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault * @instance */ - FeatureSetEditionDefault.prototype.features = null; + FeatureSetEditionDefault.prototype.fixedFeatures = null; /** * Creates a new FeatureSetEditionDefault instance using the specified properties. @@ -43009,10 +44642,12 @@ FeatureSetEditionDefault.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.features != null && Object.hasOwnProperty.call(message, "features")) - $root.google.protobuf.FeatureSet.encode(message.features, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); if (message.edition != null && Object.hasOwnProperty.call(message, "edition")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.edition); + if (message.overridableFeatures != null && Object.hasOwnProperty.call(message, "overridableFeatures")) + $root.google.protobuf.FeatureSet.encode(message.overridableFeatures, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.fixedFeatures != null && Object.hasOwnProperty.call(message, "fixedFeatures")) + $root.google.protobuf.FeatureSet.encode(message.fixedFeatures, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); return writer; }; @@ -43053,8 +44688,12 @@ message.edition = reader.int32(); break; } - case 2: { - message.features = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + case 4: { + message.overridableFeatures = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); + break; + } + case 5: { + message.fixedFeatures = $root.google.protobuf.FeatureSet.decode(reader, reader.uint32()); break; } default: @@ -43097,6 +44736,7 @@ default: return "edition: enum value expected"; case 0: + case 900: case 998: case 999: case 1000: @@ -43109,10 +44749,15 @@ case 2147483647: break; } - if (message.features != null && message.hasOwnProperty("features")) { - var error = $root.google.protobuf.FeatureSet.verify(message.features); + if (message.overridableFeatures != null && message.hasOwnProperty("overridableFeatures")) { + var error = $root.google.protobuf.FeatureSet.verify(message.overridableFeatures); + if (error) + return "overridableFeatures." + error; + } + if (message.fixedFeatures != null && message.hasOwnProperty("fixedFeatures")) { + var error = $root.google.protobuf.FeatureSet.verify(message.fixedFeatures); if (error) - return "features." + error; + return "fixedFeatures." + error; } return null; }; @@ -43140,6 +44785,10 @@ case 0: message.edition = 0; break; + case "EDITION_LEGACY": + case 900: + message.edition = 900; + break; case "EDITION_PROTO2": case 998: message.edition = 998; @@ -43181,10 +44830,15 @@ message.edition = 2147483647; break; } - if (object.features != null) { - if (typeof object.features !== "object") - throw TypeError(".google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.features: object expected"); - message.features = $root.google.protobuf.FeatureSet.fromObject(object.features); + if (object.overridableFeatures != null) { + if (typeof object.overridableFeatures !== "object") + throw TypeError(".google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.overridableFeatures: object expected"); + message.overridableFeatures = $root.google.protobuf.FeatureSet.fromObject(object.overridableFeatures); + } + if (object.fixedFeatures != null) { + if (typeof object.fixedFeatures !== "object") + throw TypeError(".google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault.fixedFeatures: object expected"); + message.fixedFeatures = $root.google.protobuf.FeatureSet.fromObject(object.fixedFeatures); } return message; }; @@ -43203,13 +44857,16 @@ options = {}; var object = {}; if (options.defaults) { - object.features = null; object.edition = options.enums === String ? "EDITION_UNKNOWN" : 0; + object.overridableFeatures = null; + object.fixedFeatures = null; } - if (message.features != null && message.hasOwnProperty("features")) - object.features = $root.google.protobuf.FeatureSet.toObject(message.features, options); if (message.edition != null && message.hasOwnProperty("edition")) object.edition = options.enums === String ? $root.google.protobuf.Edition[message.edition] === undefined ? message.edition : $root.google.protobuf.Edition[message.edition] : message.edition; + if (message.overridableFeatures != null && message.hasOwnProperty("overridableFeatures")) + object.overridableFeatures = $root.google.protobuf.FeatureSet.toObject(message.overridableFeatures, options); + if (message.fixedFeatures != null && message.hasOwnProperty("fixedFeatures")) + object.fixedFeatures = $root.google.protobuf.FeatureSet.toObject(message.fixedFeatures, options); return object; }; @@ -44424,6 +46081,22 @@ return GeneratedCodeInfo; })(); + /** + * SymbolVisibility enum. + * @name google.protobuf.SymbolVisibility + * @enum {number} + * @property {number} VISIBILITY_UNSET=0 VISIBILITY_UNSET value + * @property {number} VISIBILITY_LOCAL=1 VISIBILITY_LOCAL value + * @property {number} VISIBILITY_EXPORT=2 VISIBILITY_EXPORT value + */ + protobuf.SymbolVisibility = (function() { + var valuesById = {}, values = Object.create(valuesById); + values[valuesById[0] = "VISIBILITY_UNSET"] = 0; + values[valuesById[1] = "VISIBILITY_LOCAL"] = 1; + values[valuesById[2] = "VISIBILITY_EXPORT"] = 2; + return values; + })(); + protobuf.Duration = (function() { /** diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 17de0553e7c..e9562c56182 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -3291,8 +3291,7 @@ "java_multiple_files": true, "java_outer_classname": "ResourceProto", "java_package": "com.google.api", - "objc_class_prefix": "GAPI", - "cc_enable_arenas": true + "objc_class_prefix": "GAPI" }, "nested": { "http": { @@ -3416,6 +3415,10 @@ "rule": "repeated", "type": "ClientLibraryDestination", "id": 2 + }, + "selectiveGapicGeneration": { + "type": "SelectiveGapicGeneration", + "id": 3 } } }, @@ -3556,6 +3559,28 @@ "common": { "type": "CommonLanguageSettings", "id": 1 + }, + "experimentalFeatures": { + "type": "ExperimentalFeatures", + "id": 2 + } + }, + "nested": { + "ExperimentalFeatures": { + "fields": { + "restAsyncIoEnabled": { + "type": "bool", + "id": 1 + }, + "protobufPythonicTypesEnabled": { + "type": "bool", + "id": 2 + }, + "unversionedPackageDisabled": { + "type": "bool", + "id": 3 + } + } } } }, @@ -3613,6 +3638,11 @@ "common": { "type": "CommonLanguageSettings", "id": 1 + }, + "renamedServices": { + "keyType": "string", + "type": "string", + "id": 2 } } }, @@ -3674,6 +3704,19 @@ "PACKAGE_MANAGER": 20 } }, + "SelectiveGapicGeneration": { + "fields": { + "methods": { + "rule": "repeated", + "type": "string", + "id": 1 + }, + "generateOmittedAsInternal": { + "type": "bool", + "id": 2 + } + } + }, "LaunchStage": { "values": { "LAUNCH_STAGE_UNSPECIFIED": 0, @@ -3806,12 +3849,19 @@ "type": "FileDescriptorProto", "id": 1 } - } + }, + "extensions": [ + [ + 536000000, + 536000000 + ] + ] }, "Edition": { "edition": "proto2", "values": { "EDITION_UNKNOWN": 0, + "EDITION_LEGACY": 900, "EDITION_PROTO2": 998, "EDITION_PROTO3": 999, "EDITION_2023": 1000, @@ -3850,6 +3900,11 @@ "type": "int32", "id": 11 }, + "optionDependency": { + "rule": "repeated", + "type": "string", + "id": 15 + }, "messageType": { "rule": "repeated", "type": "DescriptorProto", @@ -3938,6 +3993,10 @@ "rule": "repeated", "type": "string", "id": 10 + }, + "visibility": { + "type": "SymbolVisibility", + "id": 11 } }, "nested": { @@ -4163,6 +4222,10 @@ "rule": "repeated", "type": "string", "id": 5 + }, + "visibility": { + "type": "SymbolVisibility", + "id": 6 } }, "nested": { @@ -4377,6 +4440,7 @@ 42, 42 ], + "php_generic_services", [ 38, 38 @@ -4512,7 +4576,8 @@ "type": "bool", "id": 10, "options": { - "default": false + "default": false, + "deprecated": true } }, "debugRedact": { @@ -4540,6 +4605,10 @@ "type": "FeatureSet", "id": 21 }, + "featureSupport": { + "type": "FeatureSupport", + "id": 22 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -4609,6 +4678,26 @@ "id": 2 } } + }, + "FeatureSupport": { + "fields": { + "editionIntroduced": { + "type": "Edition", + "id": 1 + }, + "editionDeprecated": { + "type": "Edition", + "id": 2 + }, + "deprecationWarning": { + "type": "string", + "id": 3 + }, + "editionRemoved": { + "type": "Edition", + "id": 4 + } + } } } }, @@ -4697,6 +4786,10 @@ "default": false } }, + "featureSupport": { + "type": "FieldOptions.FeatureSupport", + "id": 4 + }, "uninterpretedOption": { "rule": "repeated", "type": "UninterpretedOption", @@ -4839,6 +4932,7 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", + "feature_support.edition_introduced": "EDITION_2023", "edition_defaults.edition": "EDITION_2023", "edition_defaults.value": "EXPLICIT" } @@ -4849,6 +4943,7 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", + "feature_support.edition_introduced": "EDITION_2023", "edition_defaults.edition": "EDITION_PROTO3", "edition_defaults.value": "OPEN" } @@ -4859,6 +4954,7 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", + "feature_support.edition_introduced": "EDITION_2023", "edition_defaults.edition": "EDITION_PROTO3", "edition_defaults.value": "PACKED" } @@ -4869,6 +4965,7 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", + "feature_support.edition_introduced": "EDITION_2023", "edition_defaults.edition": "EDITION_PROTO3", "edition_defaults.value": "VERIFY" } @@ -4879,7 +4976,8 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", - "edition_defaults.edition": "EDITION_PROTO2", + "feature_support.edition_introduced": "EDITION_2023", + "edition_defaults.edition": "EDITION_LEGACY", "edition_defaults.value": "LENGTH_PREFIXED" } }, @@ -4889,27 +4987,38 @@ "options": { "retention": "RETENTION_RUNTIME", "targets": "TARGET_TYPE_FILE", + "feature_support.edition_introduced": "EDITION_2023", "edition_defaults.edition": "EDITION_PROTO3", "edition_defaults.value": "ALLOW" } + }, + "enforceNamingStyle": { + "type": "EnforceNamingStyle", + "id": 7, + "options": { + "retention": "RETENTION_SOURCE", + "targets": "TARGET_TYPE_METHOD", + "feature_support.edition_introduced": "EDITION_2024", + "edition_defaults.edition": "EDITION_2024", + "edition_defaults.value": "STYLE2024" + } + }, + "defaultSymbolVisibility": { + "type": "VisibilityFeature.DefaultSymbolVisibility", + "id": 8, + "options": { + "retention": "RETENTION_SOURCE", + "targets": "TARGET_TYPE_FILE", + "feature_support.edition_introduced": "EDITION_2024", + "edition_defaults.edition": "EDITION_2024", + "edition_defaults.value": "EXPORT_TOP_LEVEL" + } } }, "extensions": [ [ 1000, - 1000 - ], - [ - 1001, - 1001 - ], - [ - 1002, - 1002 - ], - [ - 9990, - 9990 + 9994 ], [ 9995, @@ -4954,7 +5063,13 @@ "UTF8_VALIDATION_UNKNOWN": 0, "VERIFY": 2, "NONE": 3 - } + }, + "reserved": [ + [ + 1, + 1 + ] + ] }, "MessageEncoding": { "values": { @@ -4969,6 +5084,33 @@ "ALLOW": 1, "LEGACY_BEST_EFFORT": 2 } + }, + "EnforceNamingStyle": { + "values": { + "ENFORCE_NAMING_STYLE_UNKNOWN": 0, + "STYLE2024": 1, + "STYLE_LEGACY": 2 + } + }, + "VisibilityFeature": { + "fields": {}, + "reserved": [ + [ + 1, + 536870911 + ] + ], + "nested": { + "DefaultSymbolVisibility": { + "values": { + "DEFAULT_SYMBOL_VISIBILITY_UNKNOWN": 0, + "EXPORT_ALL": 1, + "EXPORT_TOP_LEVEL": 2, + "LOCAL_ALL": 3, + "STRICT": 4 + } + } + } } } }, @@ -4996,11 +5138,26 @@ "type": "Edition", "id": 3 }, - "features": { + "overridableFeatures": { "type": "FeatureSet", - "id": 2 + "id": 4 + }, + "fixedFeatures": { + "type": "FeatureSet", + "id": 5 } - } + }, + "reserved": [ + [ + 1, + 1 + ], + [ + 2, + 2 + ], + "features" + ] } } }, @@ -5013,6 +5170,12 @@ "id": 1 } }, + "extensions": [ + [ + 536000000, + 536000000 + ] + ], "nested": { "Location": { "fields": { @@ -5098,6 +5261,14 @@ } } }, + "SymbolVisibility": { + "edition": "proto2", + "values": { + "VISIBILITY_UNSET": 0, + "VISIBILITY_LOCAL": 1, + "VISIBILITY_EXPORT": 2 + } + }, "Duration": { "fields": { "seconds": { diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index cb55af2feb4..d61998c00e5 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -15,9 +15,24 @@ */ import {EventEmitter} from 'events'; + import {AckError, Message, Subscriber} from './subscriber'; import {defaultOptions} from './default-options'; import {Duration} from './temporal'; +import {DebugMessage} from './debug'; +import {logs as baseLogs} from './logs'; + +/** + * Loggers. Exported for unit tests. + * + * @private + */ +export const logs = { + callbackDelivery: baseLogs.pubsub.sublog('callback-delivery'), + callbackExceptions: baseLogs.pubsub.sublog('callback-exceptions'), + expiry: baseLogs.pubsub.sublog('expiry'), + subscriberFlowControl: baseLogs.pubsub.sublog('subscriber-flow-control'), +}; export interface FlowControlOptions { allowExcessMessages?: boolean; @@ -106,6 +121,12 @@ export class LeaseManager extends EventEmitter { if (allowExcessMessages! || !wasFull) { this._dispense(message); } else { + if (this.pending === 0) { + logs.subscriberFlowControl.info( + 'subscriber for %s is client-side flow blocked', + this._subscriber.name, + ); + } this._pending.push(message); } @@ -125,6 +146,13 @@ export class LeaseManager extends EventEmitter { clear(): Message[] { const wasFull = this.isFull(); + if (this.pending > 0) { + logs.subscriberFlowControl.info( + 'subscriber for %s is unblocking client-side flow due to clear()', + this._subscriber.name, + ); + } + this._pending = []; const remaining = Array.from(this._messages); this._messages.clear(); @@ -173,6 +201,18 @@ export class LeaseManager extends EventEmitter { const index = this._pending.indexOf(message); this._pending.splice(index, 1); } else if (this.pending > 0) { + if (this.pending > 1) { + logs.subscriberFlowControl.info( + 'subscriber for %s dispensing one blocked message', + this._subscriber.name, + ); + } else { + logs.subscriberFlowControl.info( + 'subscriber for %s fully unblocked on client-side flow control', + this._subscriber.name, + ); + } + this._dispense(this._pending.shift()!); } @@ -225,8 +265,26 @@ export class LeaseManager extends EventEmitter { if (this._subscriber.isOpen) { message.subSpans.flowEnd(); process.nextTick(() => { + logs.callbackDelivery.info( + 'message (ID %s, ackID %s) delivery to user callbacks', + message.id, + message.ackId, + ); message.subSpans.processingStart(this._subscriber.name); - this._subscriber.emit('message', message); + try { + this._subscriber.emit('message', message); + } catch (e: unknown) { + logs.callbackExceptions.error( + 'message (ID %s, ackID %s) caused a user callback exception: %o', + message.id, + message.ackId, + e, + ); + this._subscriber.emit( + 'debug', + new DebugMessage('error during user callback', e as Error), + ); + } }); } } @@ -265,6 +323,11 @@ export class LeaseManager extends EventEmitter { message.subSpans.modAckStart(deadline, false); } } else { + logs.expiry.warn( + 'message (ID %s, ackID %s) has been dropped from leasing due to a timeout', + message.id, + message.ackId, + ); this.remove(message); } } diff --git a/handwritten/pubsub/src/logs.ts b/handwritten/pubsub/src/logs.ts new file mode 100644 index 00000000000..b6c9aa68f68 --- /dev/null +++ b/handwritten/pubsub/src/logs.ts @@ -0,0 +1,24 @@ +// Copyright 2025 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {loggingUtils} from 'google-gax'; + +/** + * Base logger. Other loggers will derive from this one. + * + * @private + */ +export const logs = { + pubsub: loggingUtils.log('pubsub'), +}; diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index 1788991cfb9..a0dcf246874 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -34,6 +34,16 @@ import {Duration} from './temporal'; import {addToBucket} from './util'; import {DebugMessage} from './debug'; import * as tracing from './telemetry-tracing'; +import {logs as baseLogs} from './logs'; + +/** + * Loggers. Exported for unit tests. + * + * @private + */ +export const logs = { + ackBatch: baseLogs.pubsub.sublog('ack-batch'), +}; export interface ReducedMessage { ackId: string; @@ -147,6 +157,8 @@ export abstract class MessageQueue { this.setOptions(options); } + protected abstract getType(): string; + /** * Shuts down this message queue gracefully. Any acks/modAcks pending in * the queue or waiting for retry will be removed. If exactly-once delivery @@ -188,6 +200,20 @@ export abstract class MessageQueue { return this._options!.maxMilliseconds!; } + /*! + * Logs about a batch being sent, and why. + * @private + */ + private logBatch(reason: string) { + logs.ackBatch.info( + '%s triggered %s batch of %i messages, a total of %i bytes', + reason, + this.getType(), + this._requests.length, + this.bytes, + ); + } + /** * Adds a message to the queue. * @@ -213,7 +239,11 @@ export abstract class MessageQueue { this._requests.length + 1 >= maxMessages! || this.bytes + size >= MAX_BATCH_BYTES ) { - await this.flush(); + const reason = + this._requests.length + 1 >= maxMessages! + ? 'going over count' + : 'going over size'; + await this.flush(reason); } // Add the message to the current batch. @@ -233,7 +263,10 @@ export abstract class MessageQueue { // Ensure that we are counting toward maxMilliseconds by timer. if (!this._timer) { - this._timer = setTimeout(() => this.flush(), maxMilliseconds!); + this._timer = setTimeout( + () => this.flush('batch timer'), + maxMilliseconds!, + ); } return responsePromise.promise; @@ -263,7 +296,7 @@ export abstract class MessageQueue { // Make sure we actually do have another batch scheduled. if (!this._timer) { this._timer = setTimeout( - () => this.flush(), + () => this.flush('retry timer'), this._options.maxMilliseconds!, ); } @@ -283,7 +316,11 @@ export abstract class MessageQueue { * Sends a batch of messages. * @private */ - async flush(): Promise { + async flush(reason?: string): Promise { + if (reason) { + this.logBatch(reason); + } + if (this._timer) { clearTimeout(this._timer); delete this._timer; @@ -493,6 +530,14 @@ export abstract class MessageQueue { * @class */ export class AckQueue extends MessageQueue { + /** + * @private + * @returns The name of the items in this queue. + */ + protected getType(): string { + return 'ack'; + } + /** * Sends a batch of ack requests. * @@ -555,6 +600,14 @@ export class AckQueue extends MessageQueue { * @class */ export class ModAckQueue extends MessageQueue { + /** + * @private + * @returns The name of the items in this queue. + */ + protected getType(): string { + return 'modack/nack'; + } + /** * Sends a batch of modAck requests. Each deadline requires its own request, * so we have to group all the ackIds by deadline and send multiple requests. diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 0706d3b22c3..0c547d0265f 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -15,7 +15,7 @@ */ import {promisify} from '@google-cloud/promisify'; -import {ClientStub, grpc} from 'google-gax'; +import {ClientStub, GoogleError, grpc} from 'google-gax'; import * as isStreamEnded from 'is-stream-ended'; import {PassThrough} from 'stream'; @@ -26,6 +26,16 @@ import {defaultOptions} from './default-options'; import {Duration} from './temporal'; import {ExponentialRetry} from './exponential-retry'; import {DebugMessage} from './debug'; +import {logs as baseLogs} from './logs'; + +/** + * Loggers. Exported for unit tests. + * + * @private + */ +export const logs = { + subscriberStreams: baseLogs.pubsub.sublog('subscriber-streams'), +}; /*! * Frequency to ping streams. @@ -218,7 +228,7 @@ export class MessageStream extends PassThrough { for (let i = 0; i < this._streams.length; i++) { const tracker = this._streams[i]; if (tracker.stream) { - this._removeStream(i); + this._removeStream(i, 'overall message stream destroyed', 'n/a'); } } @@ -232,8 +242,12 @@ export class MessageStream extends PassThrough { * * @param {stream} stream The StreamingPull stream. */ - private _replaceStream(index: number, stream: PullStream): void { - this._removeStream(index); + private _replaceStream( + index: number, + stream: PullStream, + reason?: string, + ): void { + this._removeStream(index, reason, 'stream replacement'); this._setHighWaterMark(stream); const tracker = this._streams[index]; @@ -280,7 +294,7 @@ export class MessageStream extends PassThrough { const all: Promise[] = []; for (let i = 0; i < this._streams.length; i++) { - all.push(this._fillOne(i, client)); + all.push(this._fillOne(i, client, 'initial fill')); } await Promise.all(all); @@ -292,8 +306,14 @@ export class MessageStream extends PassThrough { } } - private async _fillOne(index: number, client?: ClientStub) { + private async _fillOne(index: number, client?: ClientStub, reason?: string) { if (this.destroyed) { + logs.subscriberStreams.info( + 'not filling stream %i for reason "%s" because already shut down', + index, + reason, + ); + return; } @@ -306,6 +326,11 @@ export class MessageStream extends PassThrough { try { client = await this._getClient(); } catch (e) { + logs.subscriberStreams.error( + 'unable to create stream %i: %o', + index, + e, + ); const err = e as Error; this.destroy(err); return; @@ -330,7 +355,7 @@ export class MessageStream extends PassThrough { }; const stream: PullStream = client.streamingPull({deadline, otherArgs}); - this._replaceStream(index, stream); + this._replaceStream(index, stream, reason); stream.write(request); } @@ -357,6 +382,10 @@ export class MessageStream extends PassThrough { * @private */ private _keepAlive(): void { + logs.subscriberStreams.info( + 'sending keepAlive to %i streams', + this._streams.length, + ); this._streams.forEach(tracker => { // It's possible that a status event fires off (signaling the rpc being // closed) but the stream hasn't drained yet. Writing to such a stream will @@ -382,32 +411,28 @@ export class MessageStream extends PassThrough { * @param {object} status The stream status. */ private _onEnd(index: number, status: grpc.StatusObject): void { - this._removeStream(index); + const willRetry = PullRetry.retry(status); + this._removeStream( + index, + 'stream was closed', + willRetry ? 'will be retried' : 'will not be retried', + ); const statusError = new StatusError(status); - - if (PullRetry.retry(status)) { - this.emit( - 'debug', - new DebugMessage( - `Subscriber stream ${index} has ended with status ${status.code}; will be retried.`, - statusError, - ), - ); + if (willRetry) { + const message = `Subscriber stream ${index} has ended with status ${status.code}; will be retried.`; + logs.subscriberStreams.info('%s', message); + this.emit('debug', new DebugMessage(message, statusError)); if (PullRetry.resetFailures(status)) { this._retrier.reset(this._streams[index]); } this._retrier.retryLater(this._streams[index], () => - this._fillOne(index), + this._fillOne(index, undefined, 'retry'), ); } else if (this._activeStreams() === 0) { - this.emit( - 'debug', - new DebugMessage( - `Subscriber stream ${index} has ended with status ${status.code}; will not be retried.`, - statusError, - ), - ); + const message = `Subscriber stream ${index} has ended with status ${status.code}; will not be retried.`; + logs.subscriberStreams.info('%s', message); + this.emit('debug', new DebugMessage(message, statusError)); // No streams left, and nothing to retry. this.destroy(new StatusError(status)); @@ -432,6 +457,12 @@ export class MessageStream extends PassThrough { const receivedStatus = !tracker.stream || (tracker.stream && !tracker.receivedStatus); + // For the user-cancelled errors, we don't need to show those, we're handling + // notifying of us closing the stream elsewhere. + if ((err as GoogleError).code !== grpc.status.CANCELLED) { + logs.subscriberStreams.error('error on stream %i: %o', index, err); + } + if (typeof code !== 'number' || !receivedStatus) { this.emit('error', err); } @@ -474,9 +505,19 @@ export class MessageStream extends PassThrough { * * @param {number} index The stream to remove. */ - private _removeStream(index: number): void { + private _removeStream( + index: number, + reason?: string, + whatNext?: string, + ): void { const tracker = this._streams[index]; if (tracker.stream) { + logs.subscriberStreams.info( + 'closing stream %i; why: %s; next: %s', + index, + reason, + whatNext, + ); tracker.stream.unpipe(this); tracker.stream.cancel(); tracker.stream = undefined; diff --git a/handwritten/pubsub/src/publisher/message-batch.ts b/handwritten/pubsub/src/publisher/message-batch.ts index 96e091bc3d3..4807acc4b00 100644 --- a/handwritten/pubsub/src/publisher/message-batch.ts +++ b/handwritten/pubsub/src/publisher/message-batch.ts @@ -33,6 +33,7 @@ export interface BatchPublishOptions { export interface BatchResults { messages: PubsubMessage[]; callbacks: PublishCallback[]; + bytes: number; } /** @@ -101,21 +102,39 @@ export class MessageBatch { return { messages: this.messages, callbacks: this.callbacks, + bytes: this.bytes, }; } /** * Indicates if a given message can fit in the batch. * - * @param {object} message The message in question. + * @param {PubsubMessage} message The message in question. * @returns {boolean} */ canFit(message: PubsubMessage): boolean { - const {maxMessages, maxBytes} = this.options; - return ( - this.messages.length < maxMessages! && - this.bytes + calculateMessageSize(message) <= maxBytes! - ); + return this.canFitCount() && this.canFitSize(message); + } + + /** + * Indicates if a given message can fit in the batch, re: message count. + * + * @returns {boolean} + */ + canFitCount(): boolean { + const {maxMessages} = this.options; + return this.messages.length < maxMessages!; + } + + /** + * Indicates if a given message can fit in the batch, re: byte count. + * + * @param {PubsubMessage} message The message in question. + * @returns {boolean} + */ + canFitSize(message: PubsubMessage): boolean { + const {maxBytes} = this.options; + return this.bytes + calculateMessageSize(message) <= maxBytes!; } /** @@ -136,7 +155,26 @@ export class MessageBatch { * @returns {boolean} */ isFull(): boolean { - const {maxMessages, maxBytes} = this.options; - return this.messages.length >= maxMessages! || this.bytes >= maxBytes!; + return this.isFullMessages() || this.isFullSize(); + } + + /** + * True if we are full because of too many messages. + * + * @private + */ + isFullMessages(): boolean { + const {maxMessages} = this.options; + return this.messages.length >= maxMessages!; + } + + /** + * True if we are full because of too many bytes. + * + * @private + */ + isFullSize(): boolean { + const {maxBytes} = this.options; + return this.bytes >= maxBytes!; } } diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 23f9ab8fb3d..2d307cea156 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -24,6 +24,16 @@ import {google} from '../../protos/protos'; import * as tracing from '../telemetry-tracing'; import {filterMessage} from './pubsub-message'; import {promisify} from 'util'; +import {logs as baseLogs} from '../logs'; + +/** + * Loggers. Exported for unit tests. + * + * @private + */ +export const logs = { + publishBatch: baseLogs.pubsub.sublog('publish-batch'), +}; /** * Queues are used to manage publishing batches of messages. @@ -71,8 +81,22 @@ export abstract class MessageQueue extends EventEmitter { * queues are ordered or not. * * @abstract + * @param {string} [reason] Optional log explanation of why the publish is happening. */ - abstract publish(): Promise; + abstract publish(reason: string): Promise; + + /*! + * Logs about a batch being sent, and why. + * @private + */ + private logBatch(reason: string, length: number, bytes: number) { + logs.publishBatch.info( + '%s triggered a publish batch of %i messages, a total of %i bytes', + reason, + length, + bytes, + ); + } /** * Method to finalize publishing. Does as many publishes as are needed @@ -87,10 +111,13 @@ export abstract class MessageQueue extends EventEmitter { * * @param {object[]} messages The messages to publish. * @param {PublishCallback[]} callbacks The corresponding callback functions. + * @private */ async _publish( messages: PubsubMessage[], callbacks: PublishCallback[], + bytes: number, + reason?: string, ): Promise { const {topic, settings} = this.publisher; const reqOpts = { @@ -121,6 +148,10 @@ export abstract class MessageQueue extends EventEmitter { 'MessageQueue._publish', ); + if (reason) { + this.logBatch(reason, messages.length, bytes); + } + const requestCallback = topic.request; const request = promisify(requestCallback.bind(topic)); try { @@ -184,21 +215,25 @@ export class Queue extends MessageQueue { // Make a background best-effort attempt to clear out the // queue. If this fails, we'll basically just be overloaded // for a bit. - this.publish().catch(() => {}); + const reason = !this.batch.canFitCount() ? 'message count' : 'byte count'; + this.publish(reason).catch(() => {}); } this.batch.add(message, callback); if (this.batch.isFull()) { // See comment above - best effort. - this.publish().catch(() => {}); + const reason = this.batch.isFullMessages() + ? 'message count' + : 'byte count'; + this.publish(reason).catch(() => {}); } else if (!this.pending) { const {maxMilliseconds} = this.batchOptions; this.pending = setTimeout(() => { // See comment above - we are basically making a best effort // to start clearing out the queue if nothing else happens // before the batch timeout. - this.publish().catch(() => {}); + this.publish('timeout').catch(() => {}); }, maxMilliseconds!); } } @@ -211,25 +246,28 @@ export class Queue extends MessageQueue { * @emits Queue#drain when all messages are sent. */ async publishDrain(): Promise { - await this._publishInternal(true); + await this._publishInternal(true, 'manual drain'); } /** * Cancels any pending publishes and calls _publish immediately. * * Does _not_ attempt to further drain after one batch is sent. + * @private */ - async publish(): Promise { - await this._publishInternal(false); + async publish(reason?: string): Promise { + await this._publishInternal(false, reason); } /** * Cancels any pending publishes and calls _publish immediately. * * @emits Queue#drain when all messages are sent. + * @private */ - async _publishInternal(fullyDrain: boolean): Promise { + async _publishInternal(fullyDrain: boolean, reason?: string): Promise { const {messages, callbacks} = this.batch.end(); + const bytes = this.batch.bytes; this.batch = new MessageBatch(this.batchOptions, this.publisher.topic.name); @@ -238,13 +276,13 @@ export class Queue extends MessageQueue { delete this.pending; } - await this._publish(messages, callbacks); + await this._publish(messages, callbacks, bytes, reason); if (this.batch.messages.length) { // We only do the indefinite go-arounds when we're trying to do a // final drain for flush(). In all other cases, we want to leave // subsequent batches alone so that they can time out as needed. if (fullyDrain) { - await this._publishInternal(true); + await this._publishInternal(true, 'message count'); } } else { this.emit('drain'); @@ -318,7 +356,10 @@ export class OrderedQueue extends MessageQueue { // Make a best-effort attempt to clear out the publish queue, // to make more space for the new batch. If this fails, we'll // just be overfilled for a bit. - this.publish().catch(() => {}); + const reason = !this.currentBatch.canFitCount() + ? 'message count' + : 'byte count'; + this.publish(reason).catch(() => {}); } this.currentBatch.add(message, callback); @@ -328,7 +369,10 @@ export class OrderedQueue extends MessageQueue { if (!this.inFlight) { if (this.currentBatch.isFull()) { // See comment above - best-effort. - this.publish().catch(() => {}); + const reason = this.currentBatch.isFullMessages() + ? 'message count' + : 'byte count'; + this.publish(reason).catch(() => {}); } else if (!this.pending) { this.beginNextPublish(); } @@ -346,7 +390,7 @@ export class OrderedQueue extends MessageQueue { // Make a best-effort attempt to start a publish request. If // this fails, we'll catch it again later, eventually, when more // messages try to enter the queue. - this.publish().catch(() => {}); + this.publish('timeout').catch(() => {}); }, delay); } /** @@ -382,7 +426,7 @@ export class OrderedQueue extends MessageQueue { * * @fires OrderedQueue#drain */ - async publish(): Promise { + async publish(reason: string): Promise { // If there's nothing to flush, don't try, just short-circuit to the drain event. // This can happen if we get a publish() call after already being drained, in // the case that topic.flush() pulls a reference to us before we get deleted. @@ -398,10 +442,10 @@ export class OrderedQueue extends MessageQueue { delete this.pending; } - const {messages, callbacks} = this.batches.pop()!.end(); + const {messages, callbacks, bytes} = this.batches.pop()!.end(); try { - await this._publish(messages, callbacks); + await this._publish(messages, callbacks, bytes, reason); } catch (e) { const err = e as ServiceError; this.inFlight = false; @@ -423,7 +467,7 @@ export class OrderedQueue extends MessageQueue { * @fires OrderedQueue#drain */ async publishDrain(): Promise { - await this.publish(); + await this.publish('manual drain'); } /** diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 156ebfe55b0..74cfbdc2cc3 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -29,9 +29,20 @@ import {SubscriberClient} from './v1'; import * as tracing from './telemetry-tracing'; import {Duration} from './temporal'; import {EventEmitter} from 'events'; +import {logs as baseLogs} from './logs'; export {StatusError} from './message-stream'; +/** + * Loggers. Exported for unit tests. + * + * @private + */ +export const logs = { + slowAck: baseLogs.pubsub.sublog('slow-ack'), + ackNack: baseLogs.pubsub.sublog('ack-nack'), +}; + export type PullResponse = google.pubsub.v1.IStreamingPullResponse; export type SubscriptionProperties = google.pubsub.v1.StreamingPullResponse.ISubscriptionProperties; @@ -608,6 +619,10 @@ export class Subscriber extends EventEmitter { private _stream!: MessageStream; private _subscription: Subscription; + // We keep this separate from ackDeadline, because ackDeadline could + // end up being bound by min/max deadline configs. + private _99th: number; + subscriptionProperties?: SubscriptionProperties; constructor(subscription: Subscription, options = {}) { @@ -615,6 +630,7 @@ export class Subscriber extends EventEmitter { this.ackDeadline = defaultOptions.subscription.startingAckDeadline.totalOf('second'); + this._99th = this.ackDeadline; this.maxMessages = defaultOptions.subscription.maxOutstandingMessages; this.maxBytes = defaultOptions.subscription.maxOutstandingBytes; this.maxExtensionTime = defaultOptions.subscription.maxExtensionTime; @@ -647,7 +663,7 @@ export class Subscriber extends EventEmitter { // If we got an ack time reading, update the histogram (and ackDeadline). if (ackTimeSeconds) { this._histogram.add(ackTimeSeconds); - ackDeadline = this._histogram.percentile(99); + this._99th = ackDeadline = this._histogram.percentile(99); } // Grab our current min/max deadline values, based on whether exactly-once @@ -763,6 +779,21 @@ export class Subscriber extends EventEmitter { const ackTimeSeconds = (Date.now() - message.received) / 1000; this.updateAckDeadline(ackTimeSeconds); + logs.ackNack.info( + 'message (ID %s, ackID %s) ack', + message.id, + message.ackId, + ); + + if (ackTimeSeconds > this._99th) { + logs.slowAck.info( + 'message (ID %s, ackID %s) ack took longer than the 99th percentile of message processing time (%s s)', + message.id, + message.ackId, + ackTimeSeconds, + ); + } + tracing.PubsubEvents.ackStart(message); // Ignore this in this version of the method (but hook catch @@ -790,6 +821,21 @@ export class Subscriber extends EventEmitter { const ackTimeSeconds = (Date.now() - message.received) / 1000; this.updateAckDeadline(ackTimeSeconds); + logs.ackNack.info( + 'message (ID %s, ackID %s) ack with response', + message.id, + message.ackId, + ); + + if (ackTimeSeconds > this._99th) { + logs.slowAck.info( + 'message (ID %s, ackID %s) ack took longer than the 99th percentile (%s s)', + message.id, + message.ackId, + ackTimeSeconds, + ); + } + tracing.PubsubEvents.ackStart(message); await this._acks.add(message); @@ -900,6 +946,22 @@ export class Subscriber extends EventEmitter { * @private */ async nack(message: Message): Promise { + logs.ackNack.info( + 'message (ID %s, ackID %s) nack', + message.id, + message.ackId, + ); + + const nackTimeSeconds = (Date.now() - message.received) / 1000; + if (nackTimeSeconds > this._99th) { + logs.slowAck.info( + 'message (ID %s, ackID %s) nack took longer than the 99th percentile (%s s)', + message.id, + message.ackId, + nackTimeSeconds, + ); + } + message.subSpans.nackStart(); await this.modAck(message, 0); message.subSpans.nackEnd(); @@ -917,6 +979,22 @@ export class Subscriber extends EventEmitter { * @private */ async nackWithResponse(message: Message): Promise { + logs.ackNack.info( + 'message (ID %s, ackID %s) nack with response', + message.id, + message.ackId, + ); + + const nackTimeSeconds = (Date.now() - message.received) / 1000; + if (nackTimeSeconds > this._99th) { + logs.slowAck.info( + 'message (ID %s, ackID %s) nack took longer than the 99th percentile (%s s)', + message.id, + message.ackId, + nackTimeSeconds, + ); + } + message.subSpans.nackStart(); const response = await this.modAckWithResponse(message, 0); message.subSpans.nackEnd(); @@ -1102,12 +1180,12 @@ export class Subscriber extends EventEmitter { if (this._acks.numPendingRequests) { promises.push(this._acks.onFlush()); - await this._acks.flush(); + await this._acks.flush('message count'); } if (this._modAcks.numPendingRequests) { promises.push(this._modAcks.onFlush()); - await this._modAcks.flush(); + await this._modAcks.flush('message count'); } if (this._acks.numInFlightRequests) { diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index c95b633f92c..4bfddb70a00 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -30,8 +30,9 @@ import { Subscriber, } from '../src/subscriber'; import {defaultOptions} from '../src/default-options'; -import {TestUtils} from './test-utils'; +import {FakeLog, TestUtils} from './test-utils'; import {Duration} from '../src'; +import {loggingUtils} from 'google-gax'; const FREE_MEM = 9376387072; const fakeos = { @@ -181,6 +182,64 @@ describe('LeaseManager', () => { leaseManager.add(fakeMessage); }); + it('should make a log message about the dispatch', done => { + const fakeMessage = new FakeMessage() as {} as Message; + fakeMessage.id = 'a'; + fakeMessage.ackId = 'b'; + + const fakeLog = new FakeLog(leaseTypes.logs.callbackDelivery); + + leaseManager.setOptions({ + allowExcessMessages: true, + }); + + subscriber.on('message', () => { + assert.strictEqual(fakeLog.called, true); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.INFO, + ); + assert.strictEqual(fakeLog.args![1] as string, 'a'); + assert.strictEqual(fakeLog.args![2] as string, 'b'); + done(); + }); + + leaseManager.add(fakeMessage); + }); + + it('should make a log message about a failed dispatch', async () => { + const fakeMessage = new FakeMessage() as {} as Message; + fakeMessage.id = 'a'; + fakeMessage.ackId = 'b'; + + const fakeLog = new FakeLog(leaseTypes.logs.callbackExceptions); + + leaseManager.setOptions({ + allowExcessMessages: true, + }); + + const deferred = defer(); + subscriber.on('message', () => { + process.nextTick(() => deferred.resolve()); + throw new Error('fooz'); + }); + + leaseManager.add(fakeMessage); + await deferred.promise; + + assert.strictEqual(fakeLog.called, true); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.ERROR, + ); + assert.strictEqual( + (fakeLog.args![0] as string).includes('exception'), + true, + ); + assert.strictEqual(fakeLog.args![1] as string, 'a'); + assert.strictEqual(fakeLog.args![2] as string, 'b'); + }); + it('should dispatch the message if the inventory is not full', done => { const fakeMessage = new FakeMessage() as {} as Message; @@ -209,6 +268,24 @@ describe('LeaseManager', () => { setImmediate(done); }); + it('should log if blocked by client-side flow control', () => { + const fakeMessage = new FakeMessage() as {} as Message; + + sandbox.stub(leaseManager, 'isFull').returns(true); + const pendingStub = sandbox.stub(leaseManager, 'pending'); + pendingStub.get(() => 0); + leaseManager.setOptions({allowExcessMessages: false}); + const fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); + + leaseManager.add(fakeMessage); + assert.strictEqual(fakeLog.called, true); + + fakeLog.called = false; + pendingStub.get(() => 1); + leaseManager.add(fakeMessage); + assert.strictEqual(fakeLog.called, false); + }); + it('should not dispatch the message if the sub closes', done => { const fakeMessage = new FakeMessage() as {} as Message; @@ -305,11 +382,18 @@ describe('LeaseManager', () => { const removeStub = sandbox.stub(leaseManager, 'remove'); const modAckStub = sandbox.stub(goodMessage, 'modAck'); + const fakeLog = new FakeLog(leaseTypes.logs.expiry); + leaseManager.add(goodMessage as {} as Message); clock.tick(halfway); // make sure the expired messages were forgotten assert.strictEqual(removeStub.callCount, badMessages.length); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.WARNING, + ); + assert.strictEqual(fakeLog.called, true); badMessages.forEach((fakeMessage, i) => { const [message] = removeStub.getCall(i).args; @@ -379,6 +463,20 @@ describe('LeaseManager', () => { setImmediate(() => leaseManager.clear()); }); + it('should log if it was full and is now empty', () => { + const fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); + const pendingStub = sandbox.stub(leaseManager, 'pending'); + pendingStub.get(() => 0); + leaseManager.add(new FakeMessage() as {} as Message); + leaseManager.clear(); + assert.strictEqual(fakeLog.called, false); + + pendingStub.get(() => 1); + leaseManager.add(new FakeMessage() as {} as Message); + leaseManager.clear(); + assert.strictEqual(fakeLog.called, true); + }); + it('should cancel any lease extensions', () => { const clock = TestUtils.useFakeTimers(sandbox); const stub = sandbox.stub(subscriber, 'modAck').resolves(); @@ -479,7 +577,7 @@ describe('LeaseManager', () => { setImmediate(done); }); - it('should dispense a pending messages', done => { + it('should dispense a pending message', done => { const temp = new FakeMessage() as {} as Message; const pending = new FakeMessage() as {} as Message; @@ -500,6 +598,19 @@ describe('LeaseManager', () => { leaseManager.remove(temp); }); + it('log when dispensing a pending message', () => { + const temp = new FakeMessage() as {} as Message; + const pending = new FakeMessage() as {} as Message; + + leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); + const fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); + + leaseManager.add(temp); + leaseManager.add(pending); + leaseManager.remove(temp); + assert.strictEqual(fakeLog.called, true); + }); + it('should cancel any extensions if no messages are left', () => { const clock = TestUtils.useFakeTimers(sandbox); const message = new FakeMessage() as {} as Message; diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index 7dc31779a3a..bc88de2d533 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; -import {CallOptions, GoogleError, Status} from 'google-gax'; +import {CallOptions, GoogleError, loggingUtils, Status} from 'google-gax'; import * as sinon from 'sinon'; import * as uuid from 'uuid'; import defer = require('p-defer'); @@ -26,7 +26,7 @@ import * as messageTypes from '../src/message-queues'; import {BatchError} from '../src/message-queues'; import {Message, Subscriber} from '../src/subscriber'; import {DebugMessage} from '../src/debug'; -import {TestUtils} from './test-utils'; +import {FakeLog, TestUtils} from './test-utils'; class FakeClient { async acknowledge( @@ -80,6 +80,9 @@ function fakeMessage() { class MessageQueue extends messageTypes.MessageQueue { batches: messageTypes.QueuedMessages[] = []; + protected getType(): string { + return 'test'; + } async _sendBatch( batch: messageTypes.QueuedMessages, ): Promise { @@ -211,7 +214,7 @@ describe('MessageQueues', () => { messageQueue.setOptions({maxMilliseconds: delay}); void messageQueue.add(new FakeMessage() as Message); - void messageQueue.flush(); + void messageQueue.flush('test'); clock.tick(delay); assert.strictEqual(spy.callCount, 1); @@ -219,14 +222,14 @@ describe('MessageQueues', () => { it('should remove the messages from the queue', () => { void messageQueue.add(new FakeMessage() as Message); - void messageQueue.flush(); + void messageQueue.flush('test'); assert.strictEqual(messageQueue.numPendingRequests, 0); }); it('should remove the bytes of messages from the queue', () => { void messageQueue.add(new FakeMessage() as Message); - void messageQueue.flush(); + void messageQueue.flush('test'); assert.strictEqual(messageQueue.bytes, 0); }); @@ -236,7 +239,7 @@ describe('MessageQueues', () => { const deadline = 10; void messageQueue.add(message as Message, deadline); - void messageQueue.flush(); + void messageQueue.flush('test'); const [batch] = messageQueue.batches; assert.strictEqual(batch[0].message.ackId, message.ackId); @@ -254,12 +257,12 @@ describe('MessageQueues', () => { done(); }); - void messageQueue.flush(); + void messageQueue.flush('test'); }); it('should resolve any pending promises', async () => { const promise = messageQueue.onFlush(); - setImmediate(async () => await messageQueue.flush()); + setImmediate(async () => await messageQueue.flush('test')); return promise; }); @@ -279,7 +282,7 @@ describe('MessageQueues', () => { .onDrain() .then(() => log.push('drain1')); void messageQueue.add(message as Message, deadline); - void messageQueue.flush(); + void messageQueue.flush('test'); assert.deepStrictEqual(log, ['send:start']); sendDone.resolve(); await messageQueue.onDrain().then(() => log.push('drain2')); @@ -397,12 +400,29 @@ describe('MessageQueues', () => { }; messages.forEach(message => ackQueue.add(message as Message)); - await ackQueue.flush(); + await ackQueue.flush('test'); const [reqOpts] = stub.lastCall.args; assert.deepStrictEqual(reqOpts, expectedReqOpts); }); + it('should make a log message about batch sends', async () => { + const messages = [new FakeMessage()]; + + sandbox.stub(fakeSubscriber.client, 'acknowledge').resolves(); + const fakeLog = new FakeLog(messageTypes.logs.ackBatch); + + messages.forEach(message => ackQueue.add(message as Message)); + await ackQueue.flush('logtest'); + + assert.strictEqual(fakeLog.called, true); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.INFO, + ); + assert.strictEqual(fakeLog.args![1] as string, 'logtest'); + }); + it('should send call options', async () => { const fakeCallOptions = {timeout: 10000}; const stub = sandbox @@ -410,7 +430,7 @@ describe('MessageQueues', () => { .resolves(); ackQueue.setOptions({callOptions: fakeCallOptions}); - await ackQueue.flush(); + await ackQueue.flush('test'); const [, callOptions] = stub.lastCall.args; assert.strictEqual(callOptions, fakeCallOptions); @@ -449,7 +469,7 @@ describe('MessageQueues', () => { }); messages.forEach(message => ackQueue.add(message as Message)); - void ackQueue.flush(); + void ackQueue.flush('test'); }); // The analogous modAck version is very similar, so please sync changes. @@ -464,7 +484,7 @@ describe('MessageQueues', () => { const message = new FakeMessage() as Message; const completion = ackQueue.add(message); - await ackQueue.flush(); + await ackQueue.flush('test'); assert.strictEqual(stub.callCount, 1); await assert.doesNotReject(completion); }); @@ -484,7 +504,7 @@ describe('MessageQueues', () => { const proms = ackQueue.requests.map( (r: messageTypes.QueuedMessage) => r.responsePromise!.promise, ); - await ackQueue.flush(); + await ackQueue.flush('test'); const results = await Promise.allSettled(proms); const oneSuccess = {status: 'fulfilled', value: undefined}; assert.deepStrictEqual(results, [oneSuccess, oneSuccess, oneSuccess]); @@ -507,7 +527,7 @@ describe('MessageQueues', () => { (r: messageTypes.QueuedMessage) => r.responsePromise!.promise, ); void proms.shift(); - await ackQueue.flush(); + await ackQueue.flush('test'); const results = await Promise.allSettled(proms); assert.strictEqual(results[0].status, 'rejected'); @@ -537,7 +557,7 @@ describe('MessageQueues', () => { ackQueue.requests[0].responsePromise!.promise, ackQueue.requests[2].responsePromise!.promise, ]; - await ackQueue.flush(); + await ackQueue.flush('test'); const results = await Promise.allSettled(proms); assert.strictEqual(results[0].status, 'rejected'); @@ -571,7 +591,7 @@ describe('MessageQueues', () => { sandbox.stub(fakeSubscriber.client, 'acknowledge').rejects(fakeError); void ackQueue.add(message); - await ackQueue.flush(); + await ackQueue.flush('test'); // Make sure the one handled by errorInfo was retried. assert.strictEqual(ackQueue.numInRetryRequests, 1); @@ -593,7 +613,7 @@ describe('MessageQueues', () => { const message = new FakeMessage() as Message; const completion = ackQueue.add(message); - await ackQueue.flush(); + await ackQueue.flush('test'); assert.strictEqual(stub.callCount, 1); await completion; }); @@ -605,7 +625,7 @@ describe('MessageQueues', () => { const message = new FakeMessage() as Message; const completion = ackQueue.add(message); - await ackQueue.flush(); + await ackQueue.flush('test'); assert.strictEqual(stub.callCount, 1); await completion; }); @@ -639,12 +659,29 @@ describe('MessageQueues', () => { messages.forEach(message => modAckQueue.add(message as Message, deadline), ); - await modAckQueue.flush(); + await modAckQueue.flush('test'); const [reqOpts] = stub.lastCall.args; assert.deepStrictEqual(reqOpts, expectedReqOpts); }); + it('should make a log message about batch sends', async () => { + const messages = [new FakeMessage()]; + + sandbox.stub(fakeSubscriber.client, 'modifyAckDeadline').resolves(); + const fakeLog = new FakeLog(messageTypes.logs.ackBatch); + + messages.forEach(message => modAckQueue.add(message as Message)); + await modAckQueue.flush('logtest'); + + assert.strictEqual(fakeLog.called, true); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.INFO, + ); + assert.strictEqual(fakeLog.args![1] as string, 'logtest'); + }); + it('should group ackIds by deadline', async () => { const deadline1 = 600; const deadline2 = 1000; @@ -682,7 +719,7 @@ describe('MessageQueues', () => { messages2.forEach(message => modAckQueue.add(message as Message, deadline2), ); - await modAckQueue.flush(); + await modAckQueue.flush('test'); const [reqOpts1] = stub.getCall(0).args; assert.deepStrictEqual(reqOpts1, expectedReqOpts1); @@ -699,7 +736,7 @@ describe('MessageQueues', () => { modAckQueue.setOptions({callOptions: fakeCallOptions}); await modAckQueue.add(new FakeMessage() as Message, 10); - await modAckQueue.flush(); + await modAckQueue.flush('test'); const [, callOptions] = stub.lastCall.args; assert.strictEqual(callOptions, fakeCallOptions); @@ -741,7 +778,7 @@ describe('MessageQueues', () => { }); messages.forEach(message => modAckQueue.add(message as Message)); - void modAckQueue.flush(); + void modAckQueue.flush('test'); }); describe('handle modAck responses when !isExactlyOnceDelivery', () => { @@ -755,7 +792,7 @@ describe('MessageQueues', () => { const message = new FakeMessage() as Message; const completion = modAckQueue.add(message); - await modAckQueue.flush(); + await modAckQueue.flush('test'); assert.strictEqual(stub.callCount, 1); await assert.doesNotReject(completion); }); @@ -775,7 +812,7 @@ describe('MessageQueues', () => { const proms = modAckQueue.requests.map( (r: messageTypes.QueuedMessage) => r.responsePromise!.promise, ); - await modAckQueue.flush(); + await modAckQueue.flush('test'); const results = await Promise.allSettled(proms); const oneSuccess = {status: 'fulfilled', value: undefined}; assert.deepStrictEqual(results, [oneSuccess, oneSuccess, oneSuccess]); @@ -800,7 +837,7 @@ describe('MessageQueues', () => { (r: messageTypes.QueuedMessage) => r.responsePromise!.promise, ); void proms.shift(); - await modAckQueue.flush(); + await modAckQueue.flush('test'); const results = await Promise.allSettled(proms); assert.strictEqual(results[0].status, 'rejected'); @@ -832,7 +869,7 @@ describe('MessageQueues', () => { modAckQueue.requests[0].responsePromise!.promise, modAckQueue.requests[2].responsePromise!.promise, ]; - await modAckQueue.flush(); + await modAckQueue.flush('test'); const results = await Promise.allSettled(proms); assert.strictEqual(results[0].status, 'rejected'); @@ -854,7 +891,7 @@ describe('MessageQueues', () => { const message = new FakeMessage() as Message; const completion = modAckQueue.add(message); - await modAckQueue.flush(); + await modAckQueue.flush('test'); assert.strictEqual(stub.callCount, 1); await completion; }); @@ -866,7 +903,7 @@ describe('MessageQueues', () => { const message = new FakeMessage() as Message; const completion = modAckQueue.add(message); - await modAckQueue.flush(); + await modAckQueue.flush('test'); assert.strictEqual(stub.callCount, 1); await completion; }); diff --git a/handwritten/pubsub/test/publisher/message-batch.ts b/handwritten/pubsub/test/publisher/message-batch.ts index f1cfe0b2922..273d4fd0dd8 100644 --- a/handwritten/pubsub/test/publisher/message-batch.ts +++ b/handwritten/pubsub/test/publisher/message-batch.ts @@ -108,17 +108,23 @@ describe('MessageBatch', () => { batch.options.maxMessages = 0; const canFit = batch.canFit(message); assert.strictEqual(canFit, false); + assert.strictEqual(batch.canFitCount(), false); + assert.strictEqual(batch.canFitSize(message), true); }); it('should return false if too many bytes', () => { batch.options.maxBytes = messageSize - 1; const canFit = batch.canFit(message); assert.strictEqual(canFit, false); + assert.strictEqual(batch.canFitCount(), true); + assert.strictEqual(batch.canFitSize(message), false); }); it('should return true if it can fit', () => { const canFit = batch.canFit(message); assert.strictEqual(canFit, true); + assert.strictEqual(batch.canFitCount(), true); + assert.strictEqual(batch.canFitSize(message), true); }); }); @@ -175,6 +181,8 @@ describe('MessageBatch', () => { batch.add(message, sandbox.spy()); const isFull = batch.isFull(); assert.strictEqual(isFull, true); + assert.strictEqual(batch.isFullMessages(), true); + assert.strictEqual(batch.isFullSize(), false); }); it('should return true if at max byte limit', () => { @@ -182,12 +190,16 @@ describe('MessageBatch', () => { batch.add(message, sandbox.spy()); const isFull = batch.isFull(); assert.strictEqual(isFull, true); + assert.strictEqual(batch.isFullMessages(), false); + assert.strictEqual(batch.isFullSize(), true); }); it('should return false if it is not full', () => { batch.add(message, sandbox.spy()); const isFull = batch.isFull(); assert.strictEqual(isFull, false); + assert.strictEqual(batch.isFullMessages(), false); + assert.strictEqual(batch.isFullSize(), false); }); }); diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 873e61c0e56..89136b0f052 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ServiceError} from 'google-gax'; +import {loggingUtils, ServiceError} from 'google-gax'; import * as assert from 'assert'; import {describe, it, before, beforeEach, afterEach} from 'mocha'; import {EventEmitter} from 'events'; @@ -26,7 +26,7 @@ import * as p from '../../src/publisher'; import * as b from '../../src/publisher/message-batch'; import * as q from '../../src/publisher/message-queues'; import {PublishError} from '../../src/publisher/publish-error'; -import {TestUtils} from '../test-utils'; +import {FakeLog, TestUtils} from '../test-utils'; class FakeTopic { name = 'projects/foo/topics/fake-topic'; @@ -70,12 +70,24 @@ class FakeMessageBatch { canFit(message: p.PubsubMessage): boolean { return true; } + canFitCount(): boolean { + return true; + } + canFitSize(): boolean { + return true; + } isAtMax(): boolean { return false; } isFull(): boolean { return false; } + isFullMessages(): boolean { + return false; + } + isFullSize(): boolean { + return false; + } setOptions(options: b.BatchPublishOptions) { this.options = options; } @@ -83,6 +95,7 @@ class FakeMessageBatch { return { messages: this.messages, callbacks: this.callbacks, + bytes: 0, }; } } @@ -159,7 +172,7 @@ describe('Message Queues', () => { it('should make the correct request', () => { const stub = sandbox.stub(topic, 'request'); - void queue._publish(messages, callbacks); + void queue._publish(messages, callbacks, 0, 'test'); const [{client, method, reqOpts}] = stub.lastCall.args; assert.strictEqual(client, 'PublisherClient'); @@ -167,12 +180,24 @@ describe('Message Queues', () => { assert.deepStrictEqual(reqOpts, {topic: topic.name, messages}); }); + it('should make a log message about the publish', () => { + sandbox.stub(topic, 'request'); + const fakeLog = new FakeLog(q.logs.publishBatch); + void queue._publish(messages, callbacks, 0, 'test'); + assert.strictEqual(fakeLog.called, true); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.INFO, + ); + assert.strictEqual(fakeLog.args![1] as string, 'test'); + }); + it('should pass along any gax options', () => { const stub = sandbox.stub(topic, 'request'); const callOptions = {}; publisher.settings.gaxOpts = callOptions; - void queue._publish(messages, callbacks); + void queue._publish(messages, callbacks, 0, 'test'); const [{gaxOpts}] = stub.lastCall.args; assert.strictEqual(gaxOpts, callOptions); @@ -186,7 +211,7 @@ describe('Message Queues', () => { }); try { - await queue._publish(messages, callbacks); + await queue._publish(messages, callbacks, 0, 'test'); assert.strictEqual(null, error, '_publish did not throw'); } catch (e) { const err = e as ServiceError; @@ -207,7 +232,7 @@ describe('Message Queues', () => { callback(null, {messageIds}); }); - await queue._publish(messages, callbacks); + await queue._publish(messages, callbacks, 0, 'test'); callbacks.forEach((callback, i) => { const [, messageId] = callback.lastCall.args; @@ -312,7 +337,7 @@ describe('Message Queues', () => { it('should create a new batch', async () => { const oldBatch = queue.batch; - await queue.publish(); + await queue.publish('test'); assert.notStrictEqual(oldBatch, queue.batch); assert.ok(queue.batch instanceof FakeMessageBatch); @@ -325,7 +350,7 @@ describe('Message Queues', () => { const stub = sandbox.stub(global, 'clearTimeout').withArgs(fakeHandle); queue.pending = fakeHandle; - await queue.publish(); + await queue.publish('test'); assert.strictEqual(stub.callCount, 1); assert.strictEqual(queue.pending, undefined); @@ -335,7 +360,7 @@ describe('Message Queues', () => { const batch = queue.batch; const stub = sandbox.stub(queue, '_publish'); - await queue.publish(); + await queue.publish('test'); const [messages, callbacks] = stub.lastCall.args; assert.strictEqual(messages, batch.messages); @@ -392,7 +417,7 @@ describe('Message Queues', () => { queue.batch = new FakeMessageBatch(); queue.batch.messages = fakeMessages; queue.batch.callbacks = spies; - await queue.publish(); + await queue.publish('test'); assert.strictEqual(stub.callCount, 1); }); @@ -402,7 +427,7 @@ describe('Message Queues', () => { sandbox.stub(queue, '_publish').callsFake(async () => {}); queue.on('drain', spy); - void queue.publish().then(() => { + void queue.publish('test').then(() => { process.nextTick(() => { assert.strictEqual(spy.callCount, 1); done(); @@ -661,7 +686,7 @@ describe('Message Queues', () => { }); it('should set inFlight to true', () => { - void queue.publish(); + void queue.publish('test'); assert.strictEqual(queue.inFlight, true); }); @@ -670,7 +695,7 @@ describe('Message Queues', () => { const stub = sandbox.stub(global, 'clearTimeout'); queue.pending = fakeHandle; - void queue.publish(); + void queue.publish('test'); const [handle] = stub.lastCall.args; assert.strictEqual(handle, fakeHandle); @@ -680,7 +705,7 @@ describe('Message Queues', () => { it('should remove the oldest batch from the batch list', () => { const oldestBatch = queue.currentBatch; - void queue.publish(); + void queue.publish('test'); assert.notStrictEqual(queue.currentBatch, oldestBatch); }); @@ -688,7 +713,7 @@ describe('Message Queues', () => { it('should publish the batch', async () => { const stub = sandbox.stub(queue, '_publish'); - await queue.publish(); + await queue.publish('test'); const [messages, callbacks] = stub.lastCall.args; assert.strictEqual(messages, fakeMessages); @@ -698,7 +723,7 @@ describe('Message Queues', () => { it('should set inFlight to false after publishing', async () => { sandbox.stub(queue, '_publish').resolves(); - await queue.publish(); + await queue.publish('test'); assert.strictEqual(queue.inFlight, false); }); @@ -709,7 +734,7 @@ describe('Message Queues', () => { sandbox.stub(queue, '_publish').rejects(error); - await queue.publish(); + await queue.publish('test'); const [err] = stub.lastCall.args; assert.strictEqual(err, error); @@ -724,7 +749,7 @@ describe('Message Queues', () => { secondBatch.callbacks = spies; queue.batches.push(secondBatch as b.MessageBatch); - await queue.publish(); + await queue.publish('test'); assert.strictEqual(stub.callCount, 1); }); @@ -734,7 +759,7 @@ describe('Message Queues', () => { sandbox.stub(queue, '_publish').resolves(); queue.on('drain', spy); - await queue.publish(); + await queue.publish('test'); assert.strictEqual(spy.callCount, 1); }); @@ -744,8 +769,8 @@ describe('Message Queues', () => { sandbox.stub(queue, '_publish').resolves(); queue.on('drain', spy); - await queue.publish(); - await queue.publish(); + await queue.publish('test'); + await queue.publish('test'); assert.strictEqual(spy.callCount, 2); }); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index df95cc1b94a..e022e8bfae4 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -36,6 +36,8 @@ import {Subscription} from '../src/subscription'; import {SpanKind} from '@opentelemetry/api'; import {Duration} from '../src'; import * as tracing from '../src/telemetry-tracing'; +import {FakeLog, TestUtils} from './test-utils'; +import {loggingUtils} from 'google-gax'; type PullResponse = google.pubsub.v1.IStreamingPullResponse; @@ -432,6 +434,37 @@ describe('Subscriber', () => { assert.strictEqual(subscriber.ackDeadline, fakeDeadline); }); + it('should log on ack completion', async () => { + const fakeLog = new FakeLog(s.logs.ackNack); + + await subscriber.ack(message); + + assert.strictEqual(fakeLog.called, true); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.INFO, + ); + assert.strictEqual(fakeLog.args![1], message.id); + }); + + it('should log if the ack time is longer than the 99th percentile', async () => { + const histogram: FakeHistogram = stubs.get('histogram'); + TestUtils.useFakeTimers(sandbox, Date.now()); + + message.received = 0; + sandbox.stub(histogram, 'percentile').withArgs(99).returns(10); + const fakeLog = new FakeLog(s.logs.slowAck); + + await subscriber.ack(message); + + assert.strictEqual(fakeLog.called, true); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.INFO, + ); + assert.strictEqual(fakeLog.args![1], message.id); + }); + it('should bound ack deadlines if min/max are specified', async () => { const histogram: FakeHistogram = stubs.get('histogram'); const now = Date.now(); @@ -709,6 +742,19 @@ describe('Subscriber', () => { assert.strictEqual(deadline, 0); }); + it('should log on ack completion', async () => { + const fakeLog = new FakeLog(s.logs.ackNack); + + await subscriber.nack(message); + + assert.strictEqual(fakeLog.called, true); + assert.strictEqual( + fakeLog.fields!.severity, + loggingUtils.LogSeverity.INFO, + ); + assert.strictEqual(fakeLog.args![1], message.id); + }); + it('should remove the message from the inventory', async () => { const inventory: FakeLeaseManager = stubs.get('inventory'); const stub = sandbox.stub(inventory, 'remove').withArgs(message); diff --git a/handwritten/pubsub/test/test-utils.ts b/handwritten/pubsub/test/test-utils.ts index c1eb6b4e618..a2f20946af5 100644 --- a/handwritten/pubsub/test/test-utils.ts +++ b/handwritten/pubsub/test/test-utils.ts @@ -13,6 +13,7 @@ // limitations under the License. import {SinonSandbox, SinonFakeTimers} from 'sinon'; +import {loggingUtils} from 'google-gax'; type FakeTimersParam = Parameters[0]; interface FakeTimerConfig { @@ -51,3 +52,23 @@ export class TestUtils { return sandbox.useFakeTimers(config as FakeTimersParam); } } + +/** + * Wrapper to hook the output of ad-hoc loggers (loggingUtils.AdhocDebugLogFunction), + * because the sandbox will patch the wrong instance of the methods. + * + * @private + */ +export class FakeLog { + fields?: loggingUtils.LogFields; + args?: unknown[]; + called = false; + + constructor(log: loggingUtils.AdhocDebugLogFunction) { + log.on('log', (lf, a) => { + this.fields = lf; + this.args = a; + this.called = true; + }); + } +} From 9c80e32d3a850bf30f63cff49e737e4f21070993 Mon Sep 17 00:00:00 2001 From: Megan Potter <57276408+feywind@users.noreply.github.com> Date: Thu, 7 Aug 2025 13:57:20 -0400 Subject: [PATCH 1081/1115] feat: add timeout option and graceful shutdown to Subscription.close() (#2068) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Add timeout option to Subscription.close() Implements a new `timeout` option (using `Duration`) for the `Subscription.close()` method. This provides more control over the shutdown process: - If `timeout` is zero, the subscription closes as quickly as possible without nacking buffered messages. - If `timeout` is positive, the subscription attempts to nack any buffered messages (in the lease manager) and waits up to the specified duration for pending acknowledgements and nacks to be sent to the server. - If no timeout is provided, the behavior remains as before (waits indefinitely for pending acks/modacks, no nacking). The core logic is implemented in `Subscriber.close()`. `PubSub.close()` documentation is updated to clarify its scope and recommend using `Subscription.close()` directly for this feature. Includes: - Unit tests for the new timeout behavior in `Subscriber.close()`. - A TypeScript sample (`samples/closeSubscriptionWithTimeout.ts`) demonstrating usage. - Updated JSDoc documentation for relevant methods. * docs: revert README change so release-please can do it * feat: jules' vibin' is too lo-fi, fix some bad assumptions * samples: typeless a JS sample for close with timeout * feat: add awaitWithTimeout and test * tests: also test error results without timeout * feat: update for the current spec, test updates coming * tests: misc fixes before further additions * feat: update Temporal shims to match latest standards * chore: linter fix * feat: update to latest spec doc info, finish unit tests * feat: also move the options from close() parameters to subscriber options * chore: fix linter errors * samples: update to latest API changes * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix: no need to check isEmpty on remove * chore: remove unneeded promise skip code * fix: substantially clarify the awaitWithTimeout interface * chore: hoist timeout logic into its own method * fix: tests were leaking EventEmitter handlers * chore: change constant to CONSTANT_CASE --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: Owl Bot --- handwritten/pubsub/README.md | 1 + handwritten/pubsub/src/exponential-retry.ts | 6 +- handwritten/pubsub/src/index.ts | 2 + handwritten/pubsub/src/lease-manager.ts | 21 ++ handwritten/pubsub/src/message-stream.ts | 2 +- handwritten/pubsub/src/pubsub.ts | 31 ++- handwritten/pubsub/src/subscriber.ts | 182 +++++++++++++++- handwritten/pubsub/src/subscription.ts | 27 +-- handwritten/pubsub/src/temporal.ts | 142 ++++++++++++- handwritten/pubsub/src/util.ts | 50 +++++ handwritten/pubsub/test/exponential-retry.ts | 44 ++-- handwritten/pubsub/test/lease-manager.ts | 33 ++- handwritten/pubsub/test/message-queues.ts | 4 + .../pubsub/test/publisher/message-queues.ts | 2 + handwritten/pubsub/test/subscriber.ts | 201 +++++++++++++++++- handwritten/pubsub/test/temporal.ts | 68 +++++- handwritten/pubsub/test/test-utils.ts | 15 +- handwritten/pubsub/test/util.ts | 85 +++++++- 18 files changed, 833 insertions(+), 83 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 4972a7433c6..6bbb20f75d5 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -123,6 +123,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | +| Close Subscription with Timeout | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/closeSubscriptionWithTimeout.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/closeSubscriptionWithTimeout.js,samples/README.md) | | Commit an Avro-Based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/commitAvroSchema.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/commitAvroSchema.js,samples/README.md) | | Commit an Proto-Based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/commitProtoSchema.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/commitProtoSchema.js,samples/README.md) | | Create an Avro based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createAvroSchema.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/createAvroSchema.js,samples/README.md) | diff --git a/handwritten/pubsub/src/exponential-retry.ts b/handwritten/pubsub/src/exponential-retry.ts index dd12a5b0b60..95cc2b5e39f 100644 --- a/handwritten/pubsub/src/exponential-retry.ts +++ b/handwritten/pubsub/src/exponential-retry.ts @@ -77,8 +77,8 @@ export class ExponentialRetry { private _timer?: NodeJS.Timeout; constructor(backoff: Duration, maxBackoff: Duration) { - this._backoffMs = backoff.totalOf('millisecond'); - this._maxBackoffMs = maxBackoff.totalOf('millisecond'); + this._backoffMs = backoff.milliseconds; + this._maxBackoffMs = maxBackoff.milliseconds; } /** @@ -170,7 +170,7 @@ export class ExponentialRetry { next.retryInfo!.callback( next as unknown as T, - Duration.from({millis: now - next.retryInfo!.firstRetry}), + Duration.from({milliseconds: now - next.retryInfo!.firstRetry}), ); } else { break; diff --git a/handwritten/pubsub/src/index.ts b/handwritten/pubsub/src/index.ts index 2c9371069e7..2b1432cdbdc 100644 --- a/handwritten/pubsub/src/index.ts +++ b/handwritten/pubsub/src/index.ts @@ -143,6 +143,8 @@ export { SubscriptionMetadata, SubscriptionOptions, SubscriptionCloseCallback, + SubscriptionCloseOptions, + SubscriptionCloseBehaviors, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index d61998c00e5..fdc0de141ca 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -145,6 +145,7 @@ export class LeaseManager extends EventEmitter { */ clear(): Message[] { const wasFull = this.isFull(); + const wasEmpty = this.isEmpty(); if (this.pending > 0) { logs.subscriberFlowControl.info( @@ -161,11 +162,15 @@ export class LeaseManager extends EventEmitter { if (wasFull) { process.nextTick(() => this.emit('free')); } + if (!wasEmpty && this.isEmpty()) { + process.nextTick(() => this.emit('empty')); + } this._cancelExtension(); return remaining; } + /** * Indicates if we're at or over capacity. * @@ -176,6 +181,17 @@ export class LeaseManager extends EventEmitter { const {maxBytes, maxMessages} = this._options; return this.size >= maxMessages! || this.bytes >= maxBytes!; } + + /** + * True if we have no messages in leasing. + * + * @returns {boolean} + * @private + */ + isEmpty(): boolean { + return this._messages.size === 0; + } + /** * Removes a message from the inventory. Stopping the deadline extender if no * messages are left over. @@ -216,6 +232,10 @@ export class LeaseManager extends EventEmitter { this._dispense(this._pending.shift()!); } + if (this.isEmpty()) { + this.emit('empty'); + } + if (this.size === 0 && this._isLeasing) { this._cancelExtension(); } @@ -265,6 +285,7 @@ export class LeaseManager extends EventEmitter { if (this._subscriber.isOpen) { message.subSpans.flowEnd(); process.nextTick(() => { + message.dispatched(); logs.callbackDelivery.info( 'message (ID %s, ackID %s) delivery to user callbacks', message.id, diff --git a/handwritten/pubsub/src/message-stream.ts b/handwritten/pubsub/src/message-stream.ts index 0c547d0265f..60c404bcb85 100644 --- a/handwritten/pubsub/src/message-stream.ts +++ b/handwritten/pubsub/src/message-stream.ts @@ -73,7 +73,7 @@ const DEFAULT_OPTIONS: MessageStreamOptions = { highWaterMark: 0, maxStreams: defaultOptions.subscription.maxStreams, timeout: 300000, - retryMinBackoff: Duration.from({millis: 100}), + retryMinBackoff: Duration.from({milliseconds: 100}), retryMaxBackoff: Duration.from({seconds: 60}), }; diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 075d673f5cf..68a905255b6 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -352,15 +352,34 @@ export class PubSub { } /** - * Closes out this object, releasing any server connections. Note that once - * you close a PubSub object, it may not be used again. Any pending operations - * (e.g. queued publish messages) will fail. If you have topic or subscription - * objects that may have pending operations, you should call close() on those - * first if you want any pending messages to be delivered correctly. The + * Closes the PubSub client, releasing any underlying gRPC connections. + * + * Note that once you close a PubSub object, it may not be used again. Any pending + * operations (e.g. queued publish messages) will fail. If you have topic or + * subscription objects that may have pending operations, you should call close() + * on those first if you want any pending messages to be delivered correctly. The * PubSub class doesn't track those. + + * Note that this method primarily closes the gRPC clients (Publisher and Subscriber) + * used for API requests. It does **not** automatically handle the graceful shutdown + * of active subscriptions. + * + * For graceful shutdown of subscriptions with specific timeout behavior (e.g., + * ensuring buffered messages are nacked before closing), please refer to the + * {@link Subscription#close} method. It is recommended to call + * `Subscription.close({timeout: ...})` directly on your active `Subscription` + * objects *before* calling `PubSub.close()` if you require that specific + * shutdown behavior. + * + * Calling `PubSub.close()` without first closing active subscriptions might + * result in abrupt termination of message processing for those subscriptions. + * Any pending operations on associated Topic or Subscription objects (e.g., + * queued publish messages or unacked subscriber messages) may fail after + * `PubSub.close()` is called. * * @callback EmptyCallback - * @returns {Promise} + * @param {Error} [err] Request error, if any. + * @returns {Promise} Resolves when the clients are closed. */ close(): Promise; close(callback: EmptyCallback): void; diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 74cfbdc2cc3..c1299686279 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -17,6 +17,7 @@ import {DateStruct, PreciseDate} from '@google-cloud/precise-date'; import {replaceProjectIdToken} from '@google-cloud/projectify'; import {promisify} from '@google-cloud/promisify'; +import defer = require('p-defer'); import {google} from '../protos/protos'; import {Histogram} from './histogram'; @@ -27,8 +28,10 @@ import {Subscription} from './subscription'; import {defaultOptions} from './default-options'; import {SubscriberClient} from './v1'; import * as tracing from './telemetry-tracing'; -import {Duration} from './temporal'; +import {Duration, atMost as durationAtMost} from './temporal'; import {EventEmitter} from 'events'; + +import {awaitWithTimeout} from './util'; import {logs as baseLogs} from './logs'; export {StatusError} from './message-stream'; @@ -41,6 +44,7 @@ export {StatusError} from './message-stream'; export const logs = { slowAck: baseLogs.pubsub.sublog('slow-ack'), ackNack: baseLogs.pubsub.sublog('ack-nack'), + debug: baseLogs.pubsub.sublog('debug'), }; export type PullResponse = google.pubsub.v1.IStreamingPullResponse; @@ -57,6 +61,30 @@ export const AckResponses = { }; export type AckResponse = ValueOf; +/** + * Enum values for behaviors of the Subscriber.close() method. + */ +export const SubscriberCloseBehaviors = { + NackImmediately: 'NACK' as const, + WaitForProcessing: 'WAIT' as const, +}; +export type SubscriberCloseBehavior = ValueOf; + +/** + * Options to modify the behavior of the Subscriber.close() method. If + * none is passed, the default is SubscriberCloseBehaviors.Wait. + */ +export interface SubscriberCloseOptions { + behavior?: SubscriberCloseBehavior; + timeout?: Duration; +} + +/** + * Specifies how long before the final close timeout, in WaitForProcessing mode, + * that we should give up and start shutting down cleanly. + */ +const FINAL_NACK_TIMEOUT = Duration.from({seconds: 1}); + /** * Thrown when an error is detected in an ack/nack/modack call, when * exactly-once delivery is enabled on the subscription. This will @@ -241,10 +269,12 @@ export class Message implements tracing.MessageWithAttributes { orderingKey?: string; publishTime: PreciseDate; received: number; + private _handledPromise: defer.DeferredPromise; private _handled: boolean; private _length: number; private _subscriber: Subscriber; private _ackFailed?: AckError; + private _dispatched: boolean; /** * @private @@ -378,7 +408,9 @@ export class Message implements tracing.MessageWithAttributes { */ this.isExactlyOnceDelivery = sub.isExactlyOnceDelivery; + this._dispatched = false; this._handled = false; + this._handledPromise = defer(); this._length = this.data.length; this._subscriber = sub; } @@ -392,6 +424,38 @@ export class Message implements tracing.MessageWithAttributes { return this._length; } + /** + * Resolves when the message has been handled fully; a handled message may + * not have any further operations performed on it. + * + * @private + */ + get handledPromise(): Promise { + return this._handledPromise.promise; + } + + /** + * When this message is dispensed to user callback code, this should be called. + * The time between the dispatch and the handledPromise resolving is when the + * message is with the user. + * + * @private + */ + dispatched(): void { + if (!this._dispatched) { + this.subSpans.processingStart(this._subscriber.name); + this._dispatched = true; + } + } + + /** + * @private + * @returns True if this message has been dispatched to user callback code. + */ + isDispatched(): boolean { + return this._dispatched; + } + /** * Sets this message's exactly once delivery acks to permanent failure. This is * meant for internal library use only. @@ -418,6 +482,7 @@ export class Message implements tracing.MessageWithAttributes { this.subSpans.ackCall(); this.subSpans.processingEnd(); void this._subscriber.ack(this); + this._handledPromise.resolve(); } } @@ -451,6 +516,8 @@ export class Message implements tracing.MessageWithAttributes { } catch (e) { this.ackFailed(e as AckError); throw e; + } finally { + this._handledPromise.resolve(); } } else { return AckResponses.Invalid; @@ -518,6 +585,7 @@ export class Message implements tracing.MessageWithAttributes { this.subSpans.nackCall(); this.subSpans.processingEnd(); void this._subscriber.nack(this); + this._handledPromise.resolve(); } } @@ -552,6 +620,8 @@ export class Message implements tracing.MessageWithAttributes { } catch (e) { this.ackFailed(e as AckError); throw e; + } finally { + this._handledPromise.resolve(); } } else { return AckResponses.Invalid; @@ -580,6 +650,18 @@ export class Message implements tracing.MessageWithAttributes { * settings at the Cloud PubSub server and uses the less accurate method * of only enforcing flow control at the client side. * @property {MessageStreamOptions} [streamingOptions] Streaming options. + * If no options are passed, it behaves like `SubscriberCloseBehaviors.Wait`. + * @property {SubscriberCloseOptions} [options] Determines the basic behavior of the + * close() function. + * @property {SubscriberCloseBehavior} [options.behavior] The behavior of the close operation. + * - NackImmediately: Sends nacks for all messages held by the client library, and + * wait for them to send. + * - WaitForProcessing: Continues normal ack/nack and leasing processes until close + * to the timeout, then switches to NackImmediately behavior to close down. + * Use {@link SubscriberCloseBehaviors} for enum values. + * @property {Duration} [options.timeout] In the case of Timeout, the maximum duration + * to wait for pending ack/nack requests to complete before resolving (or rejecting) + * the promise. */ export interface SubscriberOptions { minAckDeadline?: Duration; @@ -589,6 +671,7 @@ export interface SubscriberOptions { flowControl?: FlowControlOptions; useLegacyFlowControl?: boolean; streamingOptions?: MessageStreamOptions; + closeOptions?: SubscriberCloseOptions; } const minAckDeadlineForExactlyOnceDelivery = Duration.from({seconds: 60}); @@ -849,11 +932,31 @@ export class Subscriber extends EventEmitter { return AckResponses.Success; } + async #awaitTimeoutAndCheck( + promise: Promise, + timeout: Duration, + ): Promise { + const result = await awaitWithTimeout(promise, timeout); + if (result.exception || result.timedOut) { + // Don't try to deal with errors at this point, just warn-log. + if (result.timedOut === false) { + // This wasn't a timeout. + logs.debug.warn( + 'Error during Subscriber.close(): %j', + result.exception, + ); + } + } + } + /** - * Closes the subscriber. The returned promise will resolve once any pending - * acks/modAcks are finished. + * Closes the subscriber, stopping the reception of new messages and shutting + * down the underlying stream. The behavior of the returned Promise will depend + * on the closeOptions in the subscriber options. + * + * @returns {Promise} A promise that resolves when the subscriber is closed + * and pending operations are flushed or the timeout is reached. * - * @returns {Promise} * @private */ async close(): Promise { @@ -861,12 +964,72 @@ export class Subscriber extends EventEmitter { return; } + // Always close the stream right away so we don't receive more messages. this.isOpen = false; this._stream.destroy(); + + const options = this._options.closeOptions; + + // If no behavior is specified, default to Wait. + const behavior = + options?.behavior ?? SubscriberCloseBehaviors.WaitForProcessing; + + // The timeout can't realistically be longer than the longest time we're willing + // to lease messages. + let timeout = durationAtMost( + options?.timeout ?? this.maxExtensionTime, + this.maxExtensionTime, + ); + + // If the user specified a zero timeout, just bail immediately. + if (!timeout.milliseconds) { + this._inventory.clear(); + return; + } + + // Warn the user if the timeout is too short for NackImmediately. + if (Duration.compare(timeout, FINAL_NACK_TIMEOUT) < 0) { + logs.debug.warn( + 'Subscriber.close() timeout is less than the final shutdown time (%i ms). This may result in lost nacks.', + timeout.milliseconds, + ); + } + + // If we're in WaitForProcessing mode, then we first need to derive a NackImmediately + // timeout point. If everything finishes before then, we also want to go ahead and bail cleanly. + const shutdownStart = Date.now(); + if ( + behavior === SubscriberCloseBehaviors.WaitForProcessing && + !this._inventory.isEmpty + ) { + const waitTimeout = timeout.subtract(FINAL_NACK_TIMEOUT); + + const emptyPromise = new Promise(r => { + this._inventory.on('empty', r); + }); + + await this.#awaitTimeoutAndCheck(emptyPromise, waitTimeout); + } + + // Now we head into immediate shutdown mode with what time is left. + timeout = timeout.subtract({ + milliseconds: Date.now() - shutdownStart, + }); + if (timeout.milliseconds <= 0) { + // This probably won't work out, but go through the motions. + timeout = Duration.from({milliseconds: 0}); + } + + // Grab everything left in inventory. This includes messages that have already + // been dispatched to user callbacks. const remaining = this._inventory.clear(); + remaining.forEach(m => m.nack()); - await this._waitForFlush(); + // Wait for user callbacks to complete. + const flushCompleted = this._waitForFlush(); + await this.#awaitTimeoutAndCheck(flushCompleted, timeout); + // Clean up OTel spans for any remaining messages. remaining.forEach(m => { m.subSpans.shutdown(); m.endParentSpan(); @@ -1173,21 +1336,23 @@ export class Subscriber extends EventEmitter { * * @private * - * @returns {Promise} + * @returns {Promise} */ private async _waitForFlush(): Promise { const promises: Array> = []; + // Flush any batched requests immediately. if (this._acks.numPendingRequests) { promises.push(this._acks.onFlush()); - await this._acks.flush('message count'); + this._acks.flush('message count').catch(() => {}); } if (this._modAcks.numPendingRequests) { promises.push(this._modAcks.onFlush()); - await this._modAcks.flush('message count'); + this._modAcks.flush('message count').catch(() => {}); } + // Now, prepare the drain promises. if (this._acks.numInFlightRequests) { promises.push(this._acks.onDrain()); } @@ -1196,6 +1361,7 @@ export class Subscriber extends EventEmitter { promises.push(this._modAcks.onDrain()); } + // Wait for the flush promises. await Promise.all(promises); } } diff --git a/handwritten/pubsub/src/subscription.ts b/handwritten/pubsub/src/subscription.ts index 6a5f6023eab..06e4ad602c8 100644 --- a/handwritten/pubsub/src/subscription.ts +++ b/handwritten/pubsub/src/subscription.ts @@ -41,7 +41,13 @@ import { SeekResponse, Snapshot, } from './snapshot'; -import {Message, Subscriber, SubscriberOptions} from './subscriber'; +import { + Message, + Subscriber, + SubscriberOptions, + SubscriberCloseOptions, + SubscriberCloseBehaviors, +} from './subscriber'; import {Topic} from './topic'; import {promisifySome} from './util'; import {StatusError} from './message-stream'; @@ -61,6 +67,8 @@ export type SubscriptionMetadata = { export type SubscriptionOptions = SubscriberOptions & {topic?: Topic}; export type SubscriptionCloseCallback = (err?: Error) => void; +export type SubscriptionCloseOptions = SubscriberCloseOptions; +export const SubscriptionCloseBehaviors = SubscriberCloseBehaviors; type SubscriptionCallback = ResourceCallback< Subscription, @@ -357,24 +365,17 @@ export class Subscription extends EventEmitter { } /** - * Closes the Subscription, once this is called you will no longer receive + * Closes the Subscription. Once this is called you will no longer receive * message events unless you call {Subscription#open} or add new message * listeners. * - * @param {function} [callback] The callback function. - * @param {?error} callback.err An error returned while closing the - * Subscription. + * @param {function} [callback] The callback function, if not using the Promise-based + * call signature. + * @param {?error} [callback.err] An error returned while closing the Subscription. * * @example * ``` - * subscription.close(err => { - * if (err) { - * // Error handling omitted. - * } - * }); - * - * // If the callback is omitted a Promise will be returned. - * subscription.close().then(() => {}); + * await subscription.close(); * ``` */ close(): Promise; diff --git a/handwritten/pubsub/src/temporal.ts b/handwritten/pubsub/src/temporal.ts index d20009960c2..d92aa0c1aaa 100644 --- a/handwritten/pubsub/src/temporal.ts +++ b/handwritten/pubsub/src/temporal.ts @@ -29,15 +29,44 @@ export interface DurationLike { hours?: number; minutes?: number; seconds?: number; + milliseconds?: number; + + /** + * tc39 has renamed this to milliseconds. + * + * @deprecated + */ millis?: number; } /** * Simplified list of values to pass to Duration.totalOf(). This * list is taken from the tc39 Temporal.Duration proposal, but - * larger and smaller units have been left off. + * larger and smaller units have been left off. The latest tc39 spec + * allows for both singular and plural forms. + */ +export type TotalOfUnit = + | 'hour' + | 'minute' + | 'second' + | 'millisecond' + | 'hours' + | 'minutes' + | 'seconds' + | 'milliseconds'; + +interface TypeCheck { + total(): number; +} + +/** + * Is it a Duration or a DurationLike? + * + * @private */ -export type TotalOfUnit = 'hour' | 'minute' | 'second' | 'millisecond'; +export function isDurationObject(value: unknown): value is Duration { + return typeof value === 'object' && !!(value as TypeCheck).total; +} /** * Duration class with an interface similar to the tc39 Temporal @@ -46,9 +75,10 @@ export type TotalOfUnit = 'hour' | 'minute' | 'second' | 'millisecond'; * used to set durations in Pub/Sub. * * This class will remain here for at least the next major version, - * eventually to be replaced by the tc39 Temporal built-in. + * eventually to be replaced by the tc39 Temporal.Duration built-in. * * https://tc39.es/proposal-temporal/docs/duration.html + * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Temporal/Duration */ export class Duration { private millis: number; @@ -64,33 +94,133 @@ export class Duration { /** * Calculates the total number of units of type 'totalOf' that would * fit inside this duration. + * + * No longer part of the tc39 spec, superseded by total(). + * + * @deprecated */ totalOf(totalOf: TotalOfUnit): number { + return this.total(totalOf); + } + + /** + * Calculates the total number of units of type 'totalOf' that would + * fit inside this duration. The tc39 `options` parameter is not supported. + */ + total(totalOf: TotalOfUnit): number { switch (totalOf) { case 'hour': + case 'hours': return this.millis / Duration.hourInMillis; case 'minute': + case 'minutes': return this.millis / Duration.minuteInMillis; case 'second': + case 'seconds': return this.millis / Duration.secondInMillis; case 'millisecond': + case 'milliseconds': return this.millis; default: - throw new Error(`Invalid unit in call to totalOf(): ${totalOf}`); + throw new Error(`Invalid unit in call to total(): ${totalOf}`); } } + /** + * Equivalent to `total('hour')`. + */ + get hours(): number { + return this.total('hour'); + } + + /** + * Equivalent to `total('minute')`. + */ + get minutes(): number { + return this.total('minute'); + } + + /** + * Equivalent to `total('second')`. + */ + get seconds(): number { + return this.total('second'); + } + + /** + * Equivalent to `total('millisecond')`. + */ + get milliseconds(): number { + return this.total('millisecond'); + } + + /** + * Adds another Duration to this one and returns a new Duration. + * + * @param other A Duration or Duration-like object, like from() takes. + * @returns A new Duration. + */ + add(other: DurationLike | Duration): Duration { + const otherDuration = Duration.from(other); + return Duration.from({ + millis: this.milliseconds + otherDuration.milliseconds, + }); + } + + /** + * Subtracts another Duration from this one and returns a new Duration. + * + * @param other A Duration or Duration-like object, like from() takes. + * @returns A new Duration. + */ + subtract(other: DurationLike | Duration): Duration { + const otherDuration = Duration.from(other); + return Duration.from({ + millis: this.milliseconds - otherDuration.milliseconds, + }); + } + /** * Creates a Duration from a DurationLike, which is an object * containing zero or more of the following: hours, seconds, * minutes, millis. */ - static from(durationLike: DurationLike): Duration { - let millis = durationLike.millis ?? 0; + static from(durationLike: DurationLike | Duration): Duration { + if (isDurationObject(durationLike)) { + const d = durationLike as Duration; + return new Duration(d.milliseconds); + } + + let millis = durationLike.milliseconds ?? durationLike.millis ?? 0; millis += (durationLike.seconds ?? 0) * Duration.secondInMillis; millis += (durationLike.minutes ?? 0) * Duration.minuteInMillis; millis += (durationLike.hours ?? 0) * Duration.hourInMillis; return new Duration(millis); } + + /** + * Compare two Duration objects. Returns -1 if the first is less than the + * second, zero if they are equal, 1 if the first is greater than the second. + * + * Unlike tc39, this version does not accept options for relativeTo. + */ + static compare(first: Duration, second: Duration) { + const diffMs = first.total('millisecond') - second.total('millisecond'); + if (diffMs < 0) { + return -1; + } + if (diffMs > 0) { + return 1; + } + return 0; + } } + +// Simple accessors that can be used independent of the class. These are +// functions and not methods because we don't want to add to what's in +// the tc39 spec. +export const atLeast = (d: Duration, min: Duration) => + Duration.compare(d, min) < 0 ? min : d; +export const atMost = (d: Duration, max: Duration) => + Duration.compare(d, max) > 0 ? max : d; diff --git a/handwritten/pubsub/src/util.ts b/handwritten/pubsub/src/util.ts index 04bfb270ddb..9ee6a5e2883 100644 --- a/handwritten/pubsub/src/util.ts +++ b/handwritten/pubsub/src/util.ts @@ -15,6 +15,7 @@ */ import {promisify, PromisifyOptions} from '@google-cloud/promisify'; +import {Duration} from './temporal'; /** * This replaces usage of promisifyAll(), going forward. Instead of opting @@ -83,3 +84,52 @@ export function addToBucket(map: Map, bucket: T, item: U) { items.push(item); map.set(bucket, items); } + +const timeoutToken: unique symbol = Symbol('pubsub promise timeout'); + +/** + * Return value from `awaitWithTimeout`. There are several variations on what + * might happen here, so this bundles it all up into a "report". + */ +export interface TimeoutReturn { + returnedValue?: T; + exception?: Error; + timedOut: boolean; +} + +/** + * Awaits on Promise with a timeout. Resolves on the passed promise resolving or + * rejecting, or on timeout. + * + * @param promise An existing Promise returning type T. + * @param timeout A timeout value as a Duration; if the timeout is exceeded while + * waiting for the promise, the Promise this function returns will resolve, but + * with `timedOut` set. + * @returns A TimeoutReturn with the returned value, if applicable, an exception if + * the promise rejected, or the timedOut set to true if it timed out. + */ +export async function awaitWithTimeout( + promise: Promise, + timeout: Duration, +): Promise> { + let timeoutId: NodeJS.Timeout | undefined; + const timeoutPromise = new Promise((_, rej) => { + timeoutId = setTimeout(() => rej(timeoutToken), timeout.milliseconds); + }); + try { + const value = await Promise.race([timeoutPromise, promise]); + clearTimeout(timeoutId); + return { + returnedValue: value, + timedOut: false, + }; + } catch (e) { + const err: Error | symbol = e as unknown as Error | symbol; + // The timeout passed or the promise rejected. + clearTimeout(timeoutId); + return { + exception: (err !== timeoutToken ? err : undefined) as Error | undefined, + timedOut: err === timeoutToken, + }; + } +} diff --git a/handwritten/pubsub/test/exponential-retry.ts b/handwritten/pubsub/test/exponential-retry.ts index 50834032acb..5a36bd04d5f 100644 --- a/handwritten/pubsub/test/exponential-retry.ts +++ b/handwritten/pubsub/test/exponential-retry.ts @@ -55,8 +55,8 @@ describe('exponential retry class', () => { it('makes the first callback', () => { const clock = TestUtils.useFakeTimers(sandbox); const er = new ExponentialRetry( - Duration.from({millis: 100}), - Duration.from({millis: 1000}), + Duration.from({milliseconds: 100}), + Duration.from({milliseconds: 1000}), ); sandbox.stub(global.Math, 'random').returns(0.75); @@ -64,7 +64,7 @@ describe('exponential retry class', () => { let retried = false; er.retryLater(item, (s: typeof item, t: Duration) => { assert.strictEqual(s, item); - assert.strictEqual(t.totalOf('millisecond'), 125); + assert.strictEqual(t.milliseconds, 125); retried = true; }); @@ -78,8 +78,8 @@ describe('exponential retry class', () => { it('closes gracefully', () => { const clock = TestUtils.useFakeTimers(sandbox); const er = new ExponentialRetry( - Duration.from({millis: 100}), - Duration.from({millis: 1000}), + Duration.from({milliseconds: 100}), + Duration.from({milliseconds: 1000}), ); sandbox.stub(global.Math, 'random').returns(0.75); @@ -87,7 +87,7 @@ describe('exponential retry class', () => { const item = makeItem(); er.retryLater(item, (s: typeof item, t: Duration) => { assert.strictEqual(s, item); - assert.strictEqual(t.totalOf('millisecond'), 125); + assert.strictEqual(t.milliseconds, 125); called = true; }); @@ -108,13 +108,13 @@ describe('exponential retry class', () => { it('backs off exponentially', () => { const clock = TestUtils.useFakeTimers(sandbox); const er = new ExponentialRetry( - Duration.from({millis: 100}), - Duration.from({millis: 1000}), + Duration.from({milliseconds: 100}), + Duration.from({milliseconds: 1000}), ); sandbox.stub(global.Math, 'random').returns(0.75); let callbackCount = 0; - let callbackTime: Duration = Duration.from({millis: 0}); + let callbackTime: Duration = Duration.from({milliseconds: 0}); const item = makeItem(); const callback = (s: TestItem, t: Duration) => { @@ -129,11 +129,11 @@ describe('exponential retry class', () => { clock.tick(125); assert.strictEqual(callbackCount, 1); - assert.strictEqual(callbackTime.totalOf('millisecond'), 125); + assert.strictEqual(callbackTime.milliseconds, 125); clock.tick(400); assert.strictEqual(callbackCount, 2); - assert.strictEqual(callbackTime.totalOf('millisecond'), 375); + assert.strictEqual(callbackTime.milliseconds, 375); const leftovers = er.close(); assert.strictEqual(leftovers.length, 0); @@ -143,13 +143,13 @@ describe('exponential retry class', () => { const clock = TestUtils.useFakeTimers(sandbox); const item = makeItem(); const er = new ExponentialRetry( - Duration.from({millis: 100}), - Duration.from({millis: 150}), + Duration.from({milliseconds: 100}), + Duration.from({milliseconds: 150}), ); sandbox.stub(global.Math, 'random').returns(0.75); let callbackCount = 0; - let callbackTime: Duration = Duration.from({millis: 0}); + let callbackTime: Duration = Duration.from({milliseconds: 0}); const callback = (s: TestItem, t: Duration) => { assert.strictEqual(s, item); @@ -163,11 +163,11 @@ describe('exponential retry class', () => { clock.tick(125); assert.strictEqual(callbackCount, 1); - assert.strictEqual(callbackTime.totalOf('millisecond'), 125); + assert.strictEqual(callbackTime.milliseconds, 125); clock.tick(400); assert.strictEqual(callbackCount, 2); - assert.strictEqual(callbackTime.totalOf('millisecond'), 312); + assert.strictEqual(callbackTime.milliseconds, 312); const leftovers = er.close(); assert.strictEqual(leftovers.length, 0); @@ -178,8 +178,8 @@ describe('exponential retry class', () => { const items = [makeItem(), makeItem()]; const er = new ExponentialRetry( - Duration.from({millis: 100}), - Duration.from({millis: 1000}), + Duration.from({milliseconds: 100}), + Duration.from({milliseconds: 1000}), ); // Just disable the fuzz for this test. @@ -187,8 +187,8 @@ describe('exponential retry class', () => { const callbackCounts = [0, 0]; const callbackTimes: Duration[] = [ - Duration.from({millis: 0}), - Duration.from({millis: 0}), + Duration.from({milliseconds: 0}), + Duration.from({milliseconds: 0}), ]; const callback = (s: TestItem, t: Duration) => { @@ -207,7 +207,7 @@ describe('exponential retry class', () => { clock.tick(300); assert.deepStrictEqual(callbackCounts, [2, 0]); assert.deepStrictEqual( - callbackTimes.map(d => d.totalOf('millisecond')), + callbackTimes.map(d => d.milliseconds), [300, 0], ); @@ -220,7 +220,7 @@ describe('exponential retry class', () => { // while the second item should've retried once and quit. assert.deepStrictEqual(callbackCounts, [2, 1]); assert.deepStrictEqual( - callbackTimes.map(d => d.totalOf('millisecond')), + callbackTimes.map(d => d.milliseconds), [300, 100], ); diff --git a/handwritten/pubsub/test/lease-manager.ts b/handwritten/pubsub/test/lease-manager.ts index 4bfddb70a00..0d74a39639a 100644 --- a/handwritten/pubsub/test/lease-manager.ts +++ b/handwritten/pubsub/test/lease-manager.ts @@ -66,6 +66,7 @@ class FakeMessage { length = 20; received: number; subSpans: FakeSubscriberTelemetry = new FakeSubscriberTelemetry(); + _dispatched = false; constructor() { this.received = Date.now(); @@ -76,6 +77,15 @@ class FakeMessage { } ackFailed() {} endParentSpan() {} + dispatched() { + this._dispatched = true; + } + get isDispatched() { + return this._dispatched; + } + get handledPromise() { + return Promise.resolve(); + } } interface LeaseManagerInternals { @@ -98,6 +108,8 @@ describe('LeaseManager', () => { let LeaseManager: typeof leaseTypes.LeaseManager; let leaseManager: leaseTypes.LeaseManager; + let fakeLog: FakeLog | undefined; + before(() => { LeaseManager = proxyquire('../src/lease-manager.js', { os: fakeos, @@ -111,6 +123,7 @@ describe('LeaseManager', () => { }); afterEach(() => { + fakeLog?.remove(); leaseManager.clear(); sandbox.restore(); }); @@ -187,20 +200,20 @@ describe('LeaseManager', () => { fakeMessage.id = 'a'; fakeMessage.ackId = 'b'; - const fakeLog = new FakeLog(leaseTypes.logs.callbackDelivery); + fakeLog = new FakeLog(leaseTypes.logs.callbackDelivery); leaseManager.setOptions({ allowExcessMessages: true, }); subscriber.on('message', () => { - assert.strictEqual(fakeLog.called, true); + assert.strictEqual(fakeLog!.called, true); assert.strictEqual( - fakeLog.fields!.severity, + fakeLog!.fields!.severity, loggingUtils.LogSeverity.INFO, ); - assert.strictEqual(fakeLog.args![1] as string, 'a'); - assert.strictEqual(fakeLog.args![2] as string, 'b'); + assert.strictEqual(fakeLog!.args![1] as string, 'a'); + assert.strictEqual(fakeLog!.args![2] as string, 'b'); done(); }); @@ -212,7 +225,7 @@ describe('LeaseManager', () => { fakeMessage.id = 'a'; fakeMessage.ackId = 'b'; - const fakeLog = new FakeLog(leaseTypes.logs.callbackExceptions); + fakeLog = new FakeLog(leaseTypes.logs.callbackExceptions); leaseManager.setOptions({ allowExcessMessages: true, @@ -275,7 +288,7 @@ describe('LeaseManager', () => { const pendingStub = sandbox.stub(leaseManager, 'pending'); pendingStub.get(() => 0); leaseManager.setOptions({allowExcessMessages: false}); - const fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); + fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); leaseManager.add(fakeMessage); assert.strictEqual(fakeLog.called, true); @@ -382,7 +395,7 @@ describe('LeaseManager', () => { const removeStub = sandbox.stub(leaseManager, 'remove'); const modAckStub = sandbox.stub(goodMessage, 'modAck'); - const fakeLog = new FakeLog(leaseTypes.logs.expiry); + fakeLog = new FakeLog(leaseTypes.logs.expiry); leaseManager.add(goodMessage as {} as Message); clock.tick(halfway); @@ -464,7 +477,7 @@ describe('LeaseManager', () => { }); it('should log if it was full and is now empty', () => { - const fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); + fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); const pendingStub = sandbox.stub(leaseManager, 'pending'); pendingStub.get(() => 0); leaseManager.add(new FakeMessage() as {} as Message); @@ -603,7 +616,7 @@ describe('LeaseManager', () => { const pending = new FakeMessage() as {} as Message; leaseManager.setOptions({allowExcessMessages: false, maxMessages: 1}); - const fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); + fakeLog = new FakeLog(leaseTypes.logs.subscriberFlowControl); leaseManager.add(temp); leaseManager.add(pending); diff --git a/handwritten/pubsub/test/message-queues.ts b/handwritten/pubsub/test/message-queues.ts index bc88de2d533..f91129e7da6 100644 --- a/handwritten/pubsub/test/message-queues.ts +++ b/handwritten/pubsub/test/message-queues.ts @@ -415,6 +415,8 @@ describe('MessageQueues', () => { messages.forEach(message => ackQueue.add(message as Message)); await ackQueue.flush('logtest'); + fakeLog.remove(); + assert.strictEqual(fakeLog.called, true); assert.strictEqual( fakeLog.fields!.severity, @@ -674,6 +676,8 @@ describe('MessageQueues', () => { messages.forEach(message => modAckQueue.add(message as Message)); await modAckQueue.flush('logtest'); + fakeLog.remove(); + assert.strictEqual(fakeLog.called, true); assert.strictEqual( fakeLog.fields!.severity, diff --git a/handwritten/pubsub/test/publisher/message-queues.ts b/handwritten/pubsub/test/publisher/message-queues.ts index 89136b0f052..7c810a9bebd 100644 --- a/handwritten/pubsub/test/publisher/message-queues.ts +++ b/handwritten/pubsub/test/publisher/message-queues.ts @@ -184,6 +184,8 @@ describe('Message Queues', () => { sandbox.stub(topic, 'request'); const fakeLog = new FakeLog(q.logs.publishBatch); void queue._publish(messages, callbacks, 0, 'test'); + fakeLog.remove(); + assert.strictEqual(fakeLog.called, true); assert.strictEqual( fakeLog.fields!.severity, diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index e022e8bfae4..4e6917b15b0 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -104,6 +104,11 @@ class FakeLeaseManager extends EventEmitter { } // eslint-disable-next-line @typescript-eslint/no-unused-vars remove(message: s.Message): void {} + + _isEmpty = true; + get isEmpty() { + return this._isEmpty; + } } class FakeQueue { @@ -180,6 +185,7 @@ interface SubInternals { _inventory: FakeLeaseManager; _onData(response: PullResponse): void; _discardMessage(message: s.Message): void; + _waitForFlush(timeout?: Duration): Promise; } function getSubInternals(sub: s.Subscriber) { @@ -200,6 +206,8 @@ describe('Subscriber', () => { let Subscriber: typeof s.Subscriber; let subscriber: s.Subscriber; + let fakeLog: FakeLog | undefined; + beforeEach(() => { sandbox = sinon.createSandbox(); fakeProjectify = { @@ -237,6 +245,8 @@ describe('Subscriber', () => { }); afterEach(async () => { + fakeLog?.remove(); + fakeLog = undefined; sandbox.restore(); await subscriber.close(); tracing.setGloballyEnabled(false); @@ -435,7 +445,7 @@ describe('Subscriber', () => { }); it('should log on ack completion', async () => { - const fakeLog = new FakeLog(s.logs.ackNack); + fakeLog = new FakeLog(s.logs.ackNack); await subscriber.ack(message); @@ -453,7 +463,7 @@ describe('Subscriber', () => { message.received = 0; sandbox.stub(histogram, 'percentile').withArgs(99).returns(10); - const fakeLog = new FakeLog(s.logs.slowAck); + fakeLog = new FakeLog(s.logs.slowAck); await subscriber.ack(message); @@ -605,6 +615,10 @@ describe('Subscriber', () => { const inventory: FakeLeaseManager = stubs.get('inventory'); const stub = sandbox.stub(inventory, 'clear').returns([message]); + // The leaser would've immediately called dispatched(). Pretend that + // we're user code. + message.ack(); + await subscriber.close(); assert.strictEqual(stub.callCount, 1); assert.strictEqual(shutdownStub.callCount, 1); @@ -654,7 +668,7 @@ describe('Subscriber', () => { assert.strictEqual(modAckFlush.callCount, 1); }); - it('should resolve if no messages are pending', () => { + it('should resolve if no messages are pending', async () => { const ackQueue: FakeAckQueue = stubs.get('ackQueue'); sandbox.stub(ackQueue, 'flush').rejects(); @@ -666,7 +680,7 @@ describe('Subscriber', () => { sandbox.stub(modAckQueue, 'flush').rejects(); sandbox.stub(modAckQueue, 'onFlush').rejects(); - return subscriber.close(); + await subscriber.close(); }); it('should wait for in-flight messages to drain', async () => { @@ -683,6 +697,179 @@ describe('Subscriber', () => { assert.strictEqual(modAckOnDrain.callCount, 1); }); }); + + describe('close with timeout', () => { + let clock: sinon.SinonFakeTimers; + let inventory: FakeLeaseManager; + let ackQueue: FakeAckQueue; + let modAckQueue: FakeModAckQueue; + let subInternals: SubInternals; + + beforeEach(() => { + clock = sandbox.useFakeTimers(); + inventory = stubs.get('inventory'); + ackQueue = stubs.get('ackQueue'); + modAckQueue = stubs.get('modAckQueue'); + + // Ensure subscriber is open before each test + if (!subscriber.isOpen) { + subscriber.open(); + } + + subInternals = subscriber as unknown as SubInternals; + }); + + afterEach(() => { + clock.restore(); + }); + + it('should do nothing if isOpen = false', async () => { + const destroySpy = sandbox.spy(subInternals._stream, 'destroy'); + subscriber.isOpen = false; + await subscriber.close(); + assert.strictEqual(destroySpy.callCount, 0); + }); + + it('should clear inventory and bail for timeout = 0', async () => { + const clearSpy = sandbox.spy(inventory, 'clear'); + const onSpy = sandbox.spy(inventory, 'on'); + subscriber.setOptions({ + closeOptions: { + timeout: Duration.from({milliseconds: 0}), + }, + }); + await subscriber.close(); + assert.strictEqual(clearSpy.callCount, 1); + assert.strictEqual(onSpy.callCount, 0); + }); + + it('should not wait for an empty inventory in NackImmediately', async () => { + const onSpy = sandbox.spy(inventory, 'on'); + subscriber.setOptions({ + closeOptions: { + behavior: s.SubscriberCloseBehaviors.NackImmediately, + timeout: Duration.from({milliseconds: 100}), + }, + }); + await subscriber.close(); + assert.strictEqual(onSpy.callCount, 0); + }); + + it('should not wait for an empty inventory in WaitForProcessing if empty', async () => { + const onSpy = sandbox.spy(inventory, 'on'); + subscriber.setOptions({ + closeOptions: { + behavior: s.SubscriberCloseBehaviors.WaitForProcessing, + timeout: Duration.from({milliseconds: 100}), + }, + }); + await subscriber.close(); + assert.strictEqual(onSpy.callCount, 0); + }); + + it('should wait for an empty inventory in WaitForProcessing if not empty', async () => { + inventory._isEmpty = false; + const onSpy = sandbox.spy(inventory, 'on'); + subscriber.setOptions({ + closeOptions: { + behavior: s.SubscriberCloseBehaviors.WaitForProcessing, + timeout: Duration.from({seconds: 2}), + }, + }); + const prom = subscriber.close(); + assert.strictEqual(onSpy.callCount, 1); + clock.tick(3000); + await prom; + }); + + it('should nack remaining messages if timeout is non-zero', async () => { + const mockMessages = [ + new Message(subscriber, RECEIVED_MESSAGE), + new Message(subscriber, RECEIVED_MESSAGE), + ]; + sandbox.stub(inventory, 'clear').returns(mockMessages); + const nackSpy = sandbox.spy(subscriber, 'nack'); + + subscriber.setOptions({ + closeOptions: { + timeout: Duration.from({seconds: 5}), + }, + }); + const prom = subscriber.close(); + clock.tick(6000); + await prom; + + assert.strictEqual(nackSpy.callCount, mockMessages.length); + mockMessages.forEach((msg, i) => { + assert.strictEqual(nackSpy.getCall(i).args[0], msg); + }); + }); + + it('should wait for drain promises and respect timeout', async () => { + const ackDrainDeferred = defer(); + const modAckDrainDeferred = defer(); + sandbox.stub(ackQueue, 'onDrain').returns(ackDrainDeferred.promise); + sandbox + .stub(modAckQueue, 'onDrain') + .returns(modAckDrainDeferred.promise); + ackQueue.numInFlightRequests = 1; // Ensure drain is waited for + modAckQueue.numInFlightRequests = 1; + + let closed = false; + subscriber.setOptions({ + closeOptions: { + behavior: s.SubscriberCloseBehaviors.NackImmediately, + timeout: Duration.from({milliseconds: 100}), + }, + }); + const prom = subscriber.close().then(() => { + closed = true; + }); + + // Advance time past the timeout + clock.tick(200); + await prom; + + // Promise should resolve even though drains haven't + assert.strictEqual(closed, true); + + // Resolve drains afterwards to prevent hanging tests if logic fails + ackDrainDeferred.resolve(); + modAckDrainDeferred.resolve(); + }); + + it('should resolve early if drain completes before timeout', async () => { + const ackDrainDeferred = defer(); + const modAckDrainDeferred = defer(); + sandbox.stub(ackQueue, 'onDrain').returns(ackDrainDeferred.promise); + sandbox + .stub(modAckQueue, 'onDrain') + .returns(modAckDrainDeferred.promise); + ackQueue.numInFlightRequests = 1; // Ensure drain is waited for + modAckQueue.numInFlightRequests = 1; + + let closed = false; + subscriber.setOptions({ + closeOptions: { + timeout: Duration.from({milliseconds: 100}), + }, + }); + const prom = subscriber.close().then(() => { + closed = true; + }); + + // Resolve drains quickly + ackDrainDeferred.resolve(); + modAckDrainDeferred.resolve(); + + // Advance time slightly, but less than the timeout + clock.tick(50); + await prom; + + // Promise should resolve. + assert.strictEqual(closed, true); + }); + }); }); describe('getClient', () => { @@ -743,7 +930,7 @@ describe('Subscriber', () => { }); it('should log on ack completion', async () => { - const fakeLog = new FakeLog(s.logs.ackNack); + fakeLog = new FakeLog(s.logs.ackNack); await subscriber.nack(message); @@ -851,6 +1038,10 @@ describe('Subscriber', () => { delete msgAny.parentSpan; delete msgAny.subSpans; + // Delete baggage for discovering unprocessed messages. + delete addMsgAny._handledPromise; + delete msgAny._handledPromise; + assert.deepStrictEqual(addMsg, message); // test for receipt diff --git a/handwritten/pubsub/test/temporal.ts b/handwritten/pubsub/test/temporal.ts index 030af2122b1..2e906ce3b65 100644 --- a/handwritten/pubsub/test/temporal.ts +++ b/handwritten/pubsub/test/temporal.ts @@ -13,26 +13,82 @@ // limitations under the License. import {describe, it} from 'mocha'; -import {Duration} from '../src/temporal'; +import { + Duration, + atLeast as durationAtLeast, + atMost as durationAtMost, +} from '../src/temporal'; import * as assert from 'assert'; describe('temporal', () => { describe('Duration', () => { it('can be created from millis', () => { - const duration = Duration.from({millis: 1234}); - assert.strictEqual(duration.totalOf('second'), 1.234); + const duration = Duration.from({milliseconds: 1234}); + assert.strictEqual(duration.seconds, 1.234); }); + it('can be created from seconds', () => { const duration = Duration.from({seconds: 1.234}); - assert.strictEqual(duration.totalOf('millisecond'), 1234); + assert.strictEqual(duration.milliseconds, 1234); }); + it('can be created from minutes', () => { const duration = Duration.from({minutes: 30}); - assert.strictEqual(duration.totalOf('hour'), 0.5); + assert.strictEqual(duration.total('hour'), 0.5); }); + it('can be created from hours', () => { const duration = Duration.from({hours: 1.5}); - assert.strictEqual(duration.totalOf('minute'), 90); + assert.strictEqual(duration.total('minute'), 90); + }); + + it('can be created from a Duration', () => { + const duration = Duration.from({seconds: 5}); + const second = Duration.from(duration); + assert.strictEqual(duration.milliseconds, second.milliseconds); + }); + + it('adds durations', () => { + const duration = Duration.from({seconds: 10}); + const second = duration.add({milliseconds: 1000}); + assert.strictEqual(second.seconds, 11); + }); + + it('subtracts durations', () => { + const duration = Duration.from({seconds: 10}); + const second = duration.subtract({seconds: 5}); + assert.strictEqual(second.milliseconds, 5000); + }); + + it('compares durations', () => { + const duration = Duration.from({seconds: 10}); + const less = Duration.from({seconds: 5}); + const more = Duration.from({seconds: 15}); + + const minus = Duration.compare(duration, more); + assert.strictEqual(minus, -1); + + const plus = Duration.compare(duration, less); + assert.strictEqual(plus, 1); + + const equal = Duration.compare(duration, duration); + assert.strictEqual(equal, 0); + }); + + it('has working helper functions', () => { + const duration = Duration.from({seconds: 10}); + + const atLeast1 = durationAtLeast(duration, Duration.from({seconds: 5})); + assert.strictEqual(atLeast1.seconds, 10); + + const atLeast2 = durationAtLeast(duration, Duration.from({seconds: 15})); + assert.strictEqual(atLeast2.seconds, 15); + + const atMost1 = durationAtMost(duration, Duration.from({seconds: 5})); + assert.strictEqual(atMost1.seconds, 5); + + const atMost2 = durationAtMost(duration, Duration.from({seconds: 15})); + assert.strictEqual(atMost2.seconds, 10); }); }); }); diff --git a/handwritten/pubsub/test/test-utils.ts b/handwritten/pubsub/test/test-utils.ts index a2f20946af5..f171d468550 100644 --- a/handwritten/pubsub/test/test-utils.ts +++ b/handwritten/pubsub/test/test-utils.ts @@ -63,12 +63,23 @@ export class FakeLog { fields?: loggingUtils.LogFields; args?: unknown[]; called = false; + log: loggingUtils.AdhocDebugLogFunction; + listener: (lf: loggingUtils.LogFields, a: unknown[]) => void; constructor(log: loggingUtils.AdhocDebugLogFunction) { - log.on('log', (lf, a) => { + this.log = log; + this.listener = (lf: loggingUtils.LogFields, a: unknown[]) => { this.fields = lf; this.args = a; this.called = true; - }); + }; + this.log.on('log', this.listener); + } + + remove() { + // This really ought to be properly exposed, but since it's not, we'll + // do this for now to keep the tests from being leaky. + const instance = (this.log as loggingUtils.AdhocDebugLogFunction).instance; + instance.off('log', this.listener); } } diff --git a/handwritten/pubsub/test/util.ts b/handwritten/pubsub/test/util.ts index 6dbdd746cbe..ba8d0e63df6 100644 --- a/handwritten/pubsub/test/util.ts +++ b/handwritten/pubsub/test/util.ts @@ -13,8 +13,10 @@ // limitations under the License. import {describe, it} from 'mocha'; -import {addToBucket, Throttler} from '../src/util'; +import {addToBucket, Throttler, awaitWithTimeout} from '../src/util'; import * as assert from 'assert'; +import * as sinon from 'sinon'; +import {Duration} from '../src'; describe('utils', () => { describe('Throttler', () => { @@ -58,4 +60,85 @@ describe('utils', () => { assert.deepStrictEqual(map.get('a'), ['c', 'b']); }); }); + + describe('awaitWithTimeout', () => { + let sandbox: sinon.SinonSandbox; + beforeEach(() => { + sandbox = sinon.createSandbox(); + }); + afterEach(() => { + sandbox.restore(); + }); + + it('handles non-timeout properly', async () => { + const fakeTimers = sandbox.useFakeTimers(0); + let resolve = () => {}; + const testString = 'fooby'; + const testPromise = new Promise(r => { + resolve = () => r(testString); + }); + fakeTimers.setTimeout(resolve, 500); + const awaitPromise = awaitWithTimeout( + testPromise, + Duration.from({seconds: 1}), + ); + fakeTimers.tick(500); + + const result = await awaitPromise; + assert.strictEqual(result.returnedValue, testString); + assert.strictEqual(result.exception, undefined); + assert.strictEqual( + result.timedOut, + false, + 'timeout was triggered, improperly', + ); + }); + + it('handles non-timeout errors properly', async () => { + const fakeTimers = sandbox.useFakeTimers(0); + let reject = () => {}; + const testString = 'fooby'; + const testPromise = new Promise((res, rej) => { + reject = () => rej(testString); + }); + fakeTimers.setTimeout(reject, 500); + const awaitPromise = awaitWithTimeout( + testPromise, + Duration.from({seconds: 1}), + ); + fakeTimers.tick(500); + + const result = await awaitPromise; + assert.strictEqual( + result.exception, + testString, + 'non-error was triggered, improperly', + ); + assert.strictEqual(result.timedOut, false); + }); + + it('handles timeout properly', async () => { + const fakeTimers = sandbox.useFakeTimers(0); + let resolve = () => {}; + const testString = 'fooby'; + const testPromise = new Promise(r => { + resolve = () => r(testString); + }); + fakeTimers.setTimeout(resolve, 1500); + const awaitPromise = awaitWithTimeout( + testPromise, + Duration.from({seconds: 1}), + ); + fakeTimers.tick(1500); + + const result = await awaitPromise; + assert.strictEqual( + result.timedOut, + true, + 'timeout was not triggered, improperly', + ); + + assert.strictEqual(result.timedOut, true); + }); + }); }); From 81327005318c6e87adfe67a967179d711a70678b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 14:19:04 -0400 Subject: [PATCH 1082/1115] chore(main): release 5.2.0 (#2073) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 8 ++++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index df4470936de..ca44752852f 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [5.2.0](https://github.com/googleapis/nodejs-pubsub/compare/v5.1.0...v5.2.0) (2025-08-07) + + +### Features + +* Ad-hoc, targeted debug logging ([#2062](https://github.com/googleapis/nodejs-pubsub/issues/2062)) ([dce83c7](https://github.com/googleapis/nodejs-pubsub/commit/dce83c71bba54388334f4f73115e7b8da6fbdb67)) +* Add timeout option and graceful shutdown to Subscription.close() ([#2068](https://github.com/googleapis/nodejs-pubsub/issues/2068)) ([8dee024](https://github.com/googleapis/nodejs-pubsub/commit/8dee0248081f7156e42d79c6067902583586faf2)) + ## [5.1.0](https://github.com/googleapis/nodejs-pubsub/compare/v5.0.0...v5.1.0) (2025-06-04) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 4d343cb2477..865fdc1dddc 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "5.1.0", + "version": "5.2.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From e451c2f3301b9278b819ede20c488e734335c0da Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 19 Sep 2025 22:18:33 +0200 Subject: [PATCH 1083/1115] chore(deps): update dependency @grpc/proto-loader to ^0.8.0 (#2072) --- handwritten/pubsub/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 865fdc1dddc..f05314e5f9a 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -65,7 +65,7 @@ "p-defer": "^3.0.0" }, "devDependencies": { - "@grpc/proto-loader": "^0.7.13", + "@grpc/proto-loader": "^0.8.0", "@opentelemetry/sdk-trace-base": "^1.17.0", "@types/duplexify": "^3.6.4", "@types/extend": "^3.0.4", From 8303e817a2084fd61b47f590ada8a6947e09bf50 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 17:41:26 -0400 Subject: [PATCH 1084/1115] chore: update python post processor base image (#2089) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update python post processor base image Source-Link: https://github.com/googleapis/synthtool/commit/fe7743817ba2dced52578706639ba194966fba4e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:84adf917cad8f48c61227febebae7af619882d7c8863d6ab6290a77d45a372cf * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: feywind <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index f434738ced4..50bc3b4e012 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:da69f1fd77b825b0520b1b0a047c270a3f7e3a42e4d46a5321376281cef6e62b -# created: 2025-06-02T21:06:54.667555755Z + digest: sha256:84adf917cad8f48c61227febebae7af619882d7c8863d6ab6290a77d45a372cf +# created: 2025-09-10T20:42:34.536728816Z From 60974cfa1652a1f06ce7adfd5e746e7a806a5d0c Mon Sep 17 00:00:00 2001 From: 1kilobit <113723852+1kilobit@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:05:03 -0700 Subject: [PATCH 1085/1115] fix: check batch size before re-queueing retried messages (#2027) * fix: check batch size before re-queueing retried messages * fix: remove dangling Promise after 5.x linting changes * fix: bring up to date with the logging changes --------- Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/message-queues.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/handwritten/pubsub/src/message-queues.ts b/handwritten/pubsub/src/message-queues.ts index a0dcf246874..3b4600c7ddf 100644 --- a/handwritten/pubsub/src/message-queues.ts +++ b/handwritten/pubsub/src/message-queues.ts @@ -287,11 +287,30 @@ export abstract class MessageQueue { return; } + // If we'd go over maxMessages or MAX_BATCH_BYTES by re-queueing this + // message, flush first + const {maxMessages} = this._options; + const size = Buffer.byteLength(message.message.ackId, 'utf8'); + if ( + this._requests.length + 1 >= maxMessages! || + this.bytes + size >= MAX_BATCH_BYTES + ) { + const reason = + this._requests.length + 1 >= maxMessages! + ? 'going over count' + : 'going over size'; + + // No need to wait on this one; it clears the old batch out, and acks + // are best effort. + this.flush(reason).catch(() => {}); + } + // Just throw it in for another round of processing on the next batch. this._requests.push(message); this.numPendingRequests++; this.numInFlightRequests++; this.numInRetryRequests--; + this.bytes += size; // Make sure we actually do have another batch scheduled. if (!this._timer) { From 51c8900f32408de820602666560fbce940c5e34f Mon Sep 17 00:00:00 2001 From: Bob Evans Date: Wed, 1 Oct 2025 15:36:18 -0400 Subject: [PATCH 1086/1115] fix: updated span kind to CLIENT for ack and modack rpc spans (#2029) * fix: Updated span kind to CLIENT for ack and modack rpc spans * chore: linting nit * chore: lint fixes * tests: ack/modack spans don't get an operation currently; we should look at that in a separate PR if it's problematic --------- Co-authored-by: Megan Potter <57276408+feywind@users.noreply.github.com> Co-authored-by: Alex Hong <9397363+hongalex@users.noreply.github.com> --- handwritten/pubsub/src/telemetry-tracing.ts | 4 +- handwritten/pubsub/test/telemetry-tracing.ts | 93 ++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/telemetry-tracing.ts b/handwritten/pubsub/src/telemetry-tracing.ts index e6f44b0d2fb..54a516d1b6b 100644 --- a/handwritten/pubsub/src/telemetry-tracing.ts +++ b/handwritten/pubsub/src/telemetry-tracing.ts @@ -537,7 +537,7 @@ export class PubsubSpans { const span: Span = getTracer().startSpan( `${subInfo.subId ?? subInfo.subName} ack`, { - kind: SpanKind.CONSUMER, + kind: SpanKind.CLIENT, attributes: spanAttributes, links, }, @@ -585,7 +585,7 @@ export class PubsubSpans { const span: Span = getTracer().startSpan( `${subInfo.subId ?? subInfo.subName} ${type}`, { - kind: SpanKind.CONSUMER, + kind: SpanKind.CLIENT, attributes: spanAttributes, links, }, diff --git a/handwritten/pubsub/test/telemetry-tracing.ts b/handwritten/pubsub/test/telemetry-tracing.ts index 02715a3045e..4ef42f10557 100644 --- a/handwritten/pubsub/test/telemetry-tracing.ts +++ b/handwritten/pubsub/test/telemetry-tracing.ts @@ -23,6 +23,7 @@ import {exporter} from './tracing'; import {SpanKind} from '@opentelemetry/api'; import sinon = require('sinon'); import {PubsubMessage} from '../src/publisher'; +import {Duration} from '../src/temporal'; describe('OpenTelemetryTracer', () => { beforeEach(() => { @@ -292,6 +293,7 @@ describe('OpenTelemetryTracer', () => { firstSpan.attributes['messaging.destination.name'], tests.topicInfo.topicId, ); + assert.strictEqual(firstSpan.attributes['messaging.operation'], 'create'); assert.strictEqual( firstSpan.attributes['messaging.system'], 'gcp_pubsub', @@ -346,6 +348,10 @@ describe('OpenTelemetryTracer', () => { assert.ok(parentReadSpan && childReadSpan); assert.strictEqual(childReadSpan.name, 'sub subscribe'); + assert.strictEqual( + childReadSpan.attributes['messaging.operation'], + 'receive', + ); assert.strictEqual( childReadSpan.attributes['messaging.destination.name'], 'sub', @@ -388,5 +394,92 @@ describe('OpenTelemetryTracer', () => { assert.strictEqual(publishReadSpan.links.length, 1); assert.strictEqual(childReadSpan.links.length, 1); }); + + it('creates ack rpc span', () => { + const message: PubsubMessage = {}; + const topicName = 'projects/test/topics/topicfoo'; + const subName = 'subTest'; + const producerSpan = otel.PubsubSpans.createPublisherSpan( + message, + topicName, + 'test', + ) as trace.Span; + const span = otel.PubsubSpans.createAckRpcSpan( + [producerSpan], + subName, + 'tests', + ); + assert.ok(span); + producerSpan.end(); + span.end(); + + const spans = exporter.getFinishedSpans(); + assert.strictEqual(spans.length, 2); + + const firstSpan = spans.pop(); + assert.ok(firstSpan); + assert.strictEqual(firstSpan.kind, SpanKind.CLIENT); + assert.strictEqual(firstSpan.name, `${subName} ack`); + assert.strictEqual( + firstSpan.attributes['messaging.destination.name'], + subName, + ); + assert.strictEqual( + firstSpan.attributes['messaging.batch.message_count'], + 1, + ); + assert.strictEqual( + firstSpan.attributes['messaging.system'], + 'gcp_pubsub', + ); + }); + + it('creates modack rpc span', () => { + const message: PubsubMessage = {}; + const topicName = 'projects/test/topics/topicfoo'; + const subName = 'subTest'; + const producerSpan = otel.PubsubSpans.createPublisherSpan( + message, + topicName, + 'test', + ) as trace.Span; + const span = otel.PubsubSpans.createModackRpcSpan( + [producerSpan], + subName, + 'modack', + 'test', + Duration.from({seconds: 1}), + true, + ); + assert.ok(span); + producerSpan.end(); + span.end(); + + const spans = exporter.getFinishedSpans(); + assert.strictEqual(spans.length, 2); + + const firstSpan = spans.pop(); + assert.ok(firstSpan); + assert.strictEqual(firstSpan.kind, SpanKind.CLIENT); + assert.strictEqual(firstSpan.name, `${subName} modack`); + assert.strictEqual( + firstSpan.attributes['messaging.destination.name'], + subName, + ); + assert.strictEqual( + firstSpan.attributes[ + 'messaging.gcp_pubsub.message.ack_deadline_seconds' + ], + 1, + ); + assert.strictEqual( + firstSpan.attributes['messaging.gcp_pubsub.is_receipt_modack'], + true, + ); + assert.strictEqual( + firstSpan.attributes['messaging.system'], + 'gcp_pubsub', + ); + }); }); }); From f0ca6e7ed8e2fc3395bddb8183b689b1c5db9bae Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 15:26:59 -0400 Subject: [PATCH 1087/1115] chore: disable renovate for Node github action YAML configs (#2103) chore: disable renovate for github action YAML configs Source-Link: https://github.com/googleapis/synthtool/commit/158d49d854395e4eca4706df556628c418037193 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:bdf89cdfb5b791d382184a7a769862b15c38e94e7d82b268c58d40d8952720f2 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/release/publish.cfg | 2 +- handwritten/pubsub/README.md | 2 +- handwritten/pubsub/protos/protos.json | 9 ++++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 50bc3b4e012..0bb507a615d 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:84adf917cad8f48c61227febebae7af619882d7c8863d6ab6290a77d45a372cf -# created: 2025-09-10T20:42:34.536728816Z + digest: sha256:bdf89cdfb5b791d382184a7a769862b15c38e94e7d82b268c58d40d8952720f2 +# created: 2025-10-03T19:51:38.870830821Z diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index ae6223c886e..9ba7de2b386 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -38,7 +38,7 @@ env_vars: { value: "github/nodejs-pubsub/.kokoro/publish.sh" } -# Store the packages we uploaded to npmjs.org and their corresponding +# Store the packages we uploaded to npmjs.com and their corresponding # package-lock.jsons in Placer. That way, we have a record of exactly # what we published, and which version of which tools we used to publish # it, which we can use to generate SBOMs and attestations. diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 6bbb20f75d5..69ff9cbabc3 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -5,7 +5,7 @@ # [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) [![release level](https://img.shields.io/badge/release%20level-stable-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages) -[![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.org/package/@google-cloud/pubsub) +[![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.com/package/@google-cloud/pubsub) diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index e9562c56182..696cfafed4d 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -4276,7 +4276,14 @@ "type": "ServiceOptions", "id": 3 } - } + }, + "reserved": [ + [ + 4, + 4 + ], + "stream" + ] }, "MethodDescriptorProto": { "edition": "proto2", From 840fd6157a91cfa0308342b54cbb6a94aa5fa230 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Mon, 6 Oct 2025 16:09:04 -0400 Subject: [PATCH 1088/1115] chore: group renovate PRs for this repo, remove renovate template gen for now (#2104) --- handwritten/pubsub/owlbot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index fd1d28c9877..064180b6b55 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -20,5 +20,6 @@ '.github/PULL_REQUEST_TEMPLATE.md', '.github/release-please.yml', '.github/header-checker-lint.yaml', - '.eslintignore' + '.eslintignore', + 'renovate.json' ]) From 1813f98c2fc4ecc04694a379fad329c63077228a Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 11 Nov 2025 13:14:17 -0500 Subject: [PATCH 1089/1115] fix: move off the remaining rc versions (#2112) * fix: move off the remaining rc versions * fix: move off rc version of gax --- handwritten/pubsub/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index f05314e5f9a..eeb0eac3d4f 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -57,8 +57,8 @@ "@opentelemetry/semantic-conventions": "~1.34.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-auth-library": "^10.0.0-rc.1", - "google-gax": "^5.0.1-rc.0", + "google-auth-library": "^10.5.0", + "google-gax": "^5.0.5", "heap-js": "^2.6.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From e9cd70311642a58175fe68e6a00b1761c9695eff Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:25:39 -0500 Subject: [PATCH 1090/1115] build: remove docs check for now, until we can update linkinator (#2114) --- handwritten/pubsub/owlbot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 064180b6b55..0aa5dc0f45d 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -20,6 +20,7 @@ '.github/PULL_REQUEST_TEMPLATE.md', '.github/release-please.yml', '.github/header-checker-lint.yaml', + '.github/workflows/ci.yaml', '.eslintignore', 'renovate.json' ]) From 6a8f9ebeee6b9f97c106e36ac32aea0a89b905b8 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 13:52:41 -0500 Subject: [PATCH 1091/1115] chore: lint failures (#2115) Source-Link: https://github.com/googleapis/synthtool/commit/7751597471a34c54d67f225b3852e86c35d605b8 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:a1e45c1b53fceb5fa7fd5c49cf898048c210eb07001a3355548e7a4545200ee8 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/lint.sh | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 0bb507a615d..3a1abb9410a 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:bdf89cdfb5b791d382184a7a769862b15c38e94e7d82b268c58d40d8952720f2 -# created: 2025-10-03T19:51:38.870830821Z + digest: sha256:a1e45c1b53fceb5fa7fd5c49cf898048c210eb07001a3355548e7a4545200ee8 +# created: 2025-11-21T20:24:19.347250905Z diff --git a/handwritten/pubsub/.kokoro/lint.sh b/handwritten/pubsub/.kokoro/lint.sh index aef4866e4c4..f994f276728 100755 --- a/handwritten/pubsub/.kokoro/lint.sh +++ b/handwritten/pubsub/.kokoro/lint.sh @@ -17,6 +17,11 @@ set -eo pipefail export NPM_CONFIG_PREFIX=${HOME}/.npm-global +export PATH="${NPM_CONFIG_PREFIX}/bin:${PATH}" + +# Ensure the npm global directory is writable, otherwise rebuild `npm` +mkdir -p ${NPM_CONFIG_PREFIX} +npm config -g ls || npm i -g npm@`npm --version` cd $(dirname $0)/.. From 87d1677b70aceeb2ced0cd3bc240ca87989decd6 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Fri, 19 Dec 2025 15:24:07 -0500 Subject: [PATCH 1092/1115] fix: only close the rpcSpan once (#2121) --- handwritten/pubsub/src/publisher/message-queues.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/publisher/message-queues.ts b/handwritten/pubsub/src/publisher/message-queues.ts index 2d307cea156..7f333a5c330 100644 --- a/handwritten/pubsub/src/publisher/message-queues.ts +++ b/handwritten/pubsub/src/publisher/message-queues.ts @@ -172,10 +172,10 @@ export abstract class MessageQueue extends EventEmitter { throw e; } finally { + rpcSpan?.end(); messages.forEach(m => { // We're finished with both the RPC and the whole publish operation, // so close out all of the related spans. - rpcSpan?.end(); tracing.PubsubEvents.publishEnd(m); m.parentSpan?.end(); }); From 068fe318989699644e25369fef2a15c4b5081092 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 6 Jan 2026 16:21:17 -0500 Subject: [PATCH 1093/1115] chore(main): release 5.2.1 (#2092) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(main): release 5.2.1 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Owl Bot --- handwritten/pubsub/CHANGELOG.md | 10 ++++++++++ handwritten/pubsub/package.json | 2 +- handwritten/pubsub/protos/protos.d.ts | 2 +- handwritten/pubsub/protos/protos.js | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index ca44752852f..bab618ee015 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,16 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [5.2.1](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.0...v5.2.1) (2025-12-19) + + +### Bug Fixes + +* Check batch size before re-queueing retried messages ([#2027](https://github.com/googleapis/nodejs-pubsub/issues/2027)) ([6c1613f](https://github.com/googleapis/nodejs-pubsub/commit/6c1613fdc6258ccb85427fc371e7bac8082f4a96)) +* Move off the remaining rc versions ([#2112](https://github.com/googleapis/nodejs-pubsub/issues/2112)) ([a9eb883](https://github.com/googleapis/nodejs-pubsub/commit/a9eb88335df62606ab3e6cbe11c1d760d1ddbc96)) +* Only close the rpcSpan once ([#2121](https://github.com/googleapis/nodejs-pubsub/issues/2121)) ([118a960](https://github.com/googleapis/nodejs-pubsub/commit/118a960b8cfca6203ad1843453c3692b07a94952)) +* Updated span kind to CLIENT for ack and modack rpc spans ([#2029](https://github.com/googleapis/nodejs-pubsub/issues/2029)) ([801c1c8](https://github.com/googleapis/nodejs-pubsub/commit/801c1c862a986eefe1eddd2e014be4612cd394d8)) + ## [5.2.0](https://github.com/googleapis/nodejs-pubsub/compare/v5.1.0...v5.2.0) (2025-08-07) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index eeb0eac3d4f..3c10dde3d50 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "5.2.0", + "version": "5.2.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index 7cb0f38912f..e198396e1d5 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index 0e183b097a1..a3fdcc20c94 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 5112f1ef5d30a78e23d4d3fabd5afc90be23a829 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Tue, 13 Jan 2026 16:40:54 -0500 Subject: [PATCH 1094/1115] tests: clean up system tests with separate resources per test (#2122) * tests: fix two system-test bugs with one scone * tests: modernize system tests with individual resources per test * chore: update the headers on duplicated files to please the bot * tests: remove thirty and sixty constants, shift to number of subs * tests: uncomment commented code for later use --- handwritten/pubsub/system-test/pubsub.ts | 982 ++++++++---------- handwritten/pubsub/test/testResources.test.ts | 84 ++ handwritten/pubsub/test/testResources.ts | 182 ++++ 3 files changed, 702 insertions(+), 546 deletions(-) create mode 100644 handwritten/pubsub/test/testResources.test.ts create mode 100644 handwritten/pubsub/test/testResources.ts diff --git a/handwritten/pubsub/system-test/pubsub.ts b/handwritten/pubsub/system-test/pubsub.ts index 82bff2aa3e4..44aaff74110 100644 --- a/handwritten/pubsub/system-test/pubsub.ts +++ b/handwritten/pubsub/system-test/pubsub.ts @@ -13,12 +13,10 @@ // limitations under the License. import * as assert from 'assert'; -import {describe, it, before, after, beforeEach} from 'mocha'; +import {describe, it, before, after} from 'mocha'; import * as crypto from 'crypto'; import defer = require('p-defer'); -import * as uuid from 'uuid'; -// This is only in Node 10.17+, but it's used for system tests, should be okay. import {promises as fs} from 'fs'; import { @@ -32,223 +30,178 @@ import { SchemaViews, ISchema, Duration, + Schema, + SubscriptionOptions, } from '../src'; -import {Policy, IamPermissionsMap} from '../src/iam'; import {MessageOptions} from '../src/topic'; -import {google} from '../protos/protos'; - -type Resource = Topic | Subscription | Snapshot; - -const PREFIX = 'gcloud-tests'; -const CURRENT_TIME = Date.now(); +import {TestResources} from '../test/testResources'; +import {GoogleError} from 'google-gax'; const pubsub = new PubSub(); -function shortUUID() { - return uuid.v1().split('-').shift(); +interface UsedTopic { + name: string; + fullName: string; + topic: Topic; } -describe('pubsub', () => { - const TOPIC_NAMES = [ - generateTopicName(), - generateTopicName(), - generateTopicName(), - ]; - - const TOPICS = [ - pubsub.topic(TOPIC_NAMES[0]), - pubsub.topic(TOPIC_NAMES[1]), - pubsub.topic(TOPIC_NAMES[2]), - ]; - - const TOPIC_FULL_NAMES = TOPICS.map(getTopicName); - - function generateName(name: string) { - return [PREFIX, name, shortUUID(), CURRENT_TIME].join('-'); - } +interface UsedSub { + name: string; + fullName: string; + sub: Subscription; +} - function generateSnapshotName() { - return generateName('snapshot'); - } +describe('pubsub', () => { + const resources = new TestResources('ps-sys'); - function generateSubName() { - return generateName('subscription'); + async function generateTopic(test: string): Promise { + const name = resources.generateName(test); + const [topic] = await pubsub.topic(name).get({autoCreate: true}); + const fullName = topic.name; + return {name, topic, fullName}; } - function generateSchemaName() { - return generateName('schema'); + async function generateSub(test: string, topicName: string, opts: SubscriptionOptions = {}): Promise { + const name = resources.generateName(test); + const sub = pubsub.topic(topicName).subscription(name, opts); + await sub.create(); + const fullName = sub.name; + return {name, sub, fullName}; } - function generateSubForDetach() { - return generateSubName(); + function generateSnapshotName(test: string) { + return resources.generateName(`ss-${test}`); } - function generateTopicName() { - return generateName('topic'); + function generateSubName(test: string) { + return resources.generateName(`sub-${test}`); } - function getTopicName(topic: Topic) { - return topic.name.split('/').pop(); + function generateSchemaName(test: string) { + return resources.generateName(`sch-${test}`); } - function deleteTestResource(resource: Resource) { - // Delete resource from current test run. - if (resource.name.includes(CURRENT_TIME.toString())) { - resource.delete(); - return; - } - - // Delete left over resources which is older then 1 hour. - if (!resource.name.includes(PREFIX)) { - return; - } - - const createdAt = Number(resource.name.split('-').pop()); - const timeDiff = (Date.now() - createdAt) / (2 * 1000 * 60 * 60); - - if (timeDiff > 1) { - resource.delete(); - } + function generateTopicName(test: string) { + return resources.generateName(`top-${test}`); } async function deleteTestResources(): Promise { - const topicStream = pubsub.getTopicsStream().on('data', deleteTestResource); - const subscriptionStream = pubsub - .getSubscriptionsStream() - .on('data', deleteTestResource); - const snapshotStream = pubsub - .getSnapshotsStream() - .on('data', deleteTestResource); - - const streams = [topicStream, subscriptionStream, snapshotStream].map( - stream => { - return new Promise((resolve, reject) => { - stream.on('error', reject); - stream.on('end', resolve); - }); - } - ); + const [subs] = await pubsub.getSubscriptions(); + const [topics] = await pubsub.getTopics(); + const [snaps] = await pubsub.getSnapshots(); - // Schemas might be dependencies on topics, so wait for these first. - await Promise.all(streams); - - const allSchemas: Promise[] = []; + // Close out schemas first, since other things may be + // depending on them. + const schemas: Schema[] = []; for await (const s of pubsub.listSchemas()) { - let deleteSchema = false; - const name = s.name; - if (!name) { - continue; - } + schemas.push(pubsub.schema(s.name!)); + } + await Promise.all( + resources.filterForCleanup(schemas).map(x => x.delete?.()) + ); - // Delete resource from current test run. - if (name.includes(CURRENT_TIME.toString())) { - deleteSchema = true; - } else if (name.includes(PREFIX)) { - // Delete left over resources which are older then 1 hour. - const createdAt = Number(s.name?.split('-').pop()); - const timeDiff = (Date.now() - createdAt) / (2 * 1000 * 60 * 60); + // Snapshots. + await Promise.all( + resources.filterForCleanup(snaps).map(x => x.delete?.()) + ) - if (timeDiff > 1) { - deleteSchema = true; - } - } + // Subscriptions next. + await Promise.all( + resources.filterForCleanup(subs).map(x => x.delete?.()) + ); - if (deleteSchema) { - const wrapped = pubsub.schema(name); - allSchemas.push(wrapped.delete()); - } - } - await Promise.all(allSchemas); + // Finally topics. + await Promise.all( + resources.filterForCleanup(topics).map(x => x.delete?.()) + ); } - async function publishPop(message: MessageOptions) { - const topic = pubsub.topic(generateTopicName()); - const subscription = topic.subscription(generateSubName()); - await topic.create(); - await subscription.create(); + async function publishPop(test: string, message: MessageOptions) { + const topic = await generateTopic(test); + const sub = await generateSub(test, topic.name); for (let i = 0; i < 6; i++) { - await topic.publishMessage(message); + await topic.topic.publishMessage(message); } return new Promise((resolve, reject) => { - subscription.on('error', reject); - subscription.once('message', resolve); + sub.sub.on('error', reject); + sub.sub.once('message', resolve); }); } before(async () => { await deleteTestResources(); - - // create all needed topics with metadata - await Promise.all(TOPICS.map(t => t.create())); }); after(() => { - // Delete all created test resources return deleteTestResources(); }); describe('Topic', () => { it('should be listed', async () => { + const testTopics = [ + await generateTopic('should-list'), + await generateTopic('should-list'), + ]; const [topics] = await pubsub.getTopics(); const results = topics.filter(topic => { - const name = getTopicName(topic); - return TOPIC_FULL_NAMES.indexOf(name) !== -1; + return testTopics.findIndex(t => t.fullName === topic.name) >= 0; }); - // get all topics in list of known names - assert.strictEqual(results.length, TOPIC_NAMES.length); + assert.strictEqual(results.length, testTopics.length); }); - it('should list topics in a stream', done => { + it('should list topics in a stream', async () => { + const testTopics = [ + await generateTopic('stream-list'), + await generateTopic('stream-list'), + ]; const topicsEmitted = new Array(); - pubsub - .getTopicsStream() - .on('error', done) - .on('data', (topic: Topic) => { - topicsEmitted.push(topic); - }) - .on('end', () => { - const results = topicsEmitted.filter(topic => { - const name = getTopicName(topic); - return TOPIC_FULL_NAMES.indexOf(name) !== -1; + await new Promise((res, rej) => { + pubsub + .getTopicsStream() + .on('error', rej) + .on('data', (topic: Topic) => { + topicsEmitted.push(topic); + }) + .on('end', () => { + const results = topicsEmitted.filter(topic => { + return testTopics.findIndex(t => t.fullName === topic.name) >= 0; + }); + + assert.strictEqual(results.length, testTopics.length); + res(); }); - - assert.strictEqual(results.length, TOPIC_NAMES.length); - done(); - }); + }); }); it('should allow manual paging', async () => { + const testTopics = [ + await generateTopic('man-page'), + await generateTopic('man-page'), + ]; const [topics] = await pubsub.getTopics({ - pageSize: TOPIC_NAMES.length - 1, + pageSize: 1, gaxOpts: {autoPaginate: false}, }); - assert.strictEqual(topics.length, TOPIC_NAMES.length - 1); + assert.strictEqual(topics.length, 1); }); - it('should be created and deleted', done => { - const TOPIC_NAME = generateTopicName(); - pubsub.createTopic(TOPIC_NAME, err => { - assert.ifError(err); - pubsub.topic(TOPIC_NAME).delete(done); - }); + it('should be created and deleted', async () => { + const testTopic = await generateTopic('c-and-d'); + await testTopic.topic.delete(); }); it('should honor the autoCreate option', done => { - const topic = pubsub.topic(generateTopicName()); + const topic = pubsub.topic(generateTopicName('auto')); topic.get({autoCreate: true}, done); }); - it('should confirm if a topic exists', done => { - const topic = pubsub.topic(TOPIC_NAMES[0]); + it('should confirm if a topic exists', async () => { + const testTopic = await generateTopic('c-e'); + const topic = pubsub.topic(testTopic.name); - topic.exists( - (err: Error | null | undefined, exists: boolean | null | undefined) => { - assert.ifError(err); - assert.strictEqual(exists, true); - done(); - } - ); + const [exists] = await topic.exists(); + assert.strictEqual(exists, true); }); it('should confirm if a topic does not exist', done => { @@ -263,24 +216,15 @@ describe('pubsub', () => { ); }); - it('should publish a message', done => { - const topic = pubsub.topic(TOPIC_NAMES[0]); + it('should publish a message', async () => { + const testTopic = await generateTopic('pub-msg'); + const topic = testTopic.topic; const message = { data: Buffer.from('message from me'), orderingKey: 'a', }; - topic.publishMessage( - message, - ( - err: Error | null | undefined, - messageId: string | null | undefined - ) => { - assert.ifError(err); - assert.strictEqual(typeof messageId, 'string'); - done(); - } - ); + const result = await topic.publishMessage(message); }); it('should publish a message with attributes', async () => { @@ -288,29 +232,23 @@ describe('pubsub', () => { const attributes = { customAttribute: 'value', }; - const message = await publishPop({data, attributes}); + const message = await publishPop('pub-attr', {data, attributes}); assert.deepStrictEqual(message.data, data); assert.deepStrictEqual(message.attributes, attributes); }); - it('should get the metadata of a topic', done => { - const topic = pubsub.topic(TOPIC_NAMES[0]); - topic.getMetadata( - ( - err: ServiceError | null | undefined, - metadata: google.pubsub.v1.ITopic | null | undefined - ) => { - assert.ifError(err); - assert.strictEqual(metadata!.name, topic.name); - done(); - } - ); + it('should get the metadata of a topic', async () => { + const testTopic = await generateTopic('md-topic'); + const topic = testTopic.topic; + const [meta] = await topic.getMetadata(); + assert.strictEqual(meta.name, topic.name); }); it('should set metadata for a topic', async () => { const threeDaysInSeconds = 3 * 24 * 60 * 60; + const testTopic = await generateTopic('md-set'); - const topic = pubsub.topic(TOPIC_NAMES[0]); + const topic = testTopic.topic; await topic.setMetadata({ messageRetentionDuration: { seconds: threeDaysInSeconds, @@ -339,9 +277,10 @@ describe('pubsub', () => { } it('should pass the acceptance tests', async () => { - const [topic] = await pubsub.createTopic(generateName('orderedtopic')); + const testTopic = await generateTopic('ordered'); + const topic = testTopic.topic; const [subscription] = await topic.createSubscription( - generateName('orderedsub'), + generateSubName('ordered'), { enableMessageOrdering: true, } @@ -417,168 +356,146 @@ describe('pubsub', () => { await Promise.all(publishes); await deferred.promise; - await Promise.all([topic.delete(), subscription.delete()]); }); }); }); describe('Subscription', () => { - const TOPIC_NAME = generateTopicName(); - const topic = pubsub.topic(TOPIC_NAME); - - const SUB_NAMES = [generateSubName(), generateSubName()]; - const SUB_DETACH_NAME = generateSubForDetach(); - - const thirty = Duration.from({minutes: 30}); - const sixty = Duration.from({minutes: 60}); - const SUBSCRIPTIONS = [ - topic.subscription(SUB_NAMES[0], {minAckDeadline: thirty, maxAckDeadline: thirty}), - topic.subscription(SUB_NAMES[1], {minAckDeadline: sixty, maxAckDeadline: sixty}), - topic.subscription(SUB_DETACH_NAME, {minAckDeadline: thirty, maxAckDeadline: thirty}), - ]; - - before(async () => { - await topic.create(); - await Promise.all(SUBSCRIPTIONS.map(s => s.create())); + async function subPop(testName: string, count: number) { + const testTopic = await generateTopic(testName); + const topic = testTopic.topic; + + const testSubProms: Promise[] = []; + for (let i = 0; i < count; i++) { + testSubProms.push(generateSub(testName, testTopic.name, { + minAckDeadline: Duration.from({seconds: 60}), + maxAckDeadline: Duration.from({seconds: 60}), + })); + } + const testSubs = await Promise.all(testSubProms); + const subs = testSubs.map(t => t.sub); for (let i = 0; i < 10; i++) { const data = Buffer.from('hello'); await topic.publishMessage({data}); } await new Promise(r => setTimeout(r, 2500)); - }); - after(() => { - // Delete subscriptions - return Promise.all( - SUBSCRIPTIONS.map(async s => { - try { - await s.delete(); - } catch (e) { - await topic.delete(); - } - }) - ); - }); + return { + testTopic, + topic, + testSubs, + subs, + }; + } - it('should return error if creating an existing subscription', done => { - // Use a new topic name... - const topic = pubsub.topic(generateTopicName()); + it('should return error if creating an existing subscription', async () => { + // Use a new topic... + const topic = await generateTopic('sub-dup'); - // ...but with the same subscription name that we already created... - const subscription = topic.subscription(SUB_NAMES[0]); + // And make a sub... + const existing = await generateSub('sub-dup', topic.name); - subscription.create(err => { - if (!err) { - assert.fail('Should not have created subscription successfully.'); - } + // ...another but with the same subscription name that we already created... + const subscription = topic.topic.subscription(existing.name); + try { + await subscription.create(); + assert.fail('Should not have created subscription successfully.'); + } catch (e) { // ...and it should fail, because the subscription name is unique to the // project, and not the topic. + const err = e as GoogleError; assert.strictEqual(err!.code, 6); - done(); - }); + } }); - it('should list all subscriptions registered to the topic', done => { - topic.getSubscriptions( - ( - err: Error | null | undefined, - subs: Subscription[] | null | undefined - ) => { - assert.ifError(err); - assert.strictEqual(subs!.length, SUBSCRIPTIONS.length); - assert(subs![0] instanceof Subscription); - done(); - } - ); + it('should list all subscriptions registered to the topic', async () => { + const pop = await subPop('list-subs', 2); + const [subs] = await pop.topic.getSubscriptions(); + assert.strictEqual(subs!.length, 2); + assert(subs![0] instanceof Subscription); }); - it('should list all topic subscriptions as a stream', done => { - const subscriptionsEmitted: Array<{}> = []; - topic - .getSubscriptionsStream() - .on('error', done) - .on('data', (subscription: {}) => { - subscriptionsEmitted.push(subscription); - }) - .on('end', () => { - assert.strictEqual(subscriptionsEmitted.length, SUBSCRIPTIONS.length); - done(); - }); + it('should list all topic subscriptions as a stream', async () => { + const pop = await subPop('list-subs', 2); + + await new Promise((res, rej) => { + const subscriptionsEmitted: Array<{}> = []; + pop.topic + .getSubscriptionsStream() + .on('error', rej) + .on('data', (subscription: {}) => { + subscriptionsEmitted.push(subscription); + }) + .on('end', () => { + assert.strictEqual(subscriptionsEmitted.length, 2); + res(); + }); + }); }); - it('should list all subscriptions regardless of topic', done => { - pubsub.getSubscriptions( - (err: ServiceError | null, subscriptions?: Subscription[] | null) => { - assert.ifError(err); - assert(subscriptions instanceof Array); - done(); - } - ); + it('should list all subscriptions regardless of topic', async () => { + // Make sure there are some subs. + await subPop('all-subs', 1); + + const [results] = await pubsub.getSubscriptions(); + assert(results instanceof Array); }); - it('should list all subscriptions as a stream', done => { - let subscriptionEmitted = false; - - pubsub - .getSubscriptionsStream() - .on('error', done) - .on('data', (subscription: Subscription) => { - subscriptionEmitted = subscription instanceof Subscription; - }) - .on('end', () => { - assert.strictEqual(subscriptionEmitted, true); - done(); - }); + it('should list all subscriptions as a stream', async () => { + // Make sure there are some subs. + await subPop('all-subs', 1); + + await new Promise((res, rej) => { + let subscriptionEmitted = false; + + pubsub + .getSubscriptionsStream() + .on('error', rej) + .on('data', (subscription: Subscription) => { + subscriptionEmitted = subscription instanceof Subscription; + }) + .on('end', () => { + assert.strictEqual(subscriptionEmitted, true); + res(); + }); + }); }); - it('should allow creation and deletion of a subscription', done => { - const subName = generateSubName(); - topic.createSubscription( - subName, - ( - err: Error | null | undefined, - sub: Subscription | null | undefined - ) => { - assert.ifError(err); - assert(sub instanceof Subscription); - sub!.delete(done); - } - ); + it('should allow creation and deletion of a subscription', async () => { + const testTopic = await generateTopic('c-d-sub'); + const subName = generateSubName('c-d-sub'); + const [sub] = await testTopic.topic.createSubscription(subName); + assert(sub instanceof Subscription); + await sub.delete(); }); - it('should honor the autoCreate option', done => { - const sub = topic.subscription(generateSubName()); + it('should honor the autoCreate option', async () => { + const testTopic = await generateTopic('auto-c'); + const sub = testTopic.topic.subscription(generateSubName('auto-c')); - sub.get({autoCreate: true}, done); + await sub.get({autoCreate: true}); }); - it('should confirm if a sub exists', done => { - const sub = topic.subscription(SUB_NAMES[0]); + it('should confirm if a sub exists', async () => { + const testTopic = await generateTopic('exists'); + const testSub = await generateSub('exists', testTopic.name); + const sub = testSub.sub; - sub.exists( - (err: Error | null | undefined, exists: boolean | null | undefined) => { - assert.ifError(err); - assert.strictEqual(exists, true); - done(); - } - ); + const [exists] = await sub.exists(); + assert.strictEqual(exists, true); }); - it('should confirm if a sub does not exist', done => { - const sub = topic.subscription('should-not-exist'); + it('should confirm if a sub does not exist', async () => { + const testTopic = await generateTopic('dne'); + const sub = testTopic.topic.subscription('should-not-exist'); - sub.exists( - (err: Error | null | undefined, exists: boolean | null | undefined) => { - assert.ifError(err); - assert.strictEqual(exists, false); - done(); - } - ); + const [exists] = await sub.exists(); + assert.strictEqual(exists, false); }); - it('should create a subscription with message retention', done => { - const subName = generateSubName(); + it('should create a subscription with message retention', async () => { + const subName = generateSubName('sub-ret'); const threeDaysInSeconds = 3 * 24 * 60 * 60; const callOptions = { messageRetentionDuration: threeDaysInSeconds, @@ -586,183 +503,171 @@ describe('pubsub', () => { name: '', }; - topic.createSubscription( - subName, - callOptions, - ( - err: Error | null | undefined, - sub: Subscription | null | undefined - ) => { - assert.ifError(err); - - sub!.getMetadata( - ( - err: Error | null | undefined, - metadata: google.pubsub.v1.ISubscription | null | undefined - ) => { - assert.ifError(err); - - assert.strictEqual( - Number(metadata!.messageRetentionDuration!.seconds), - threeDaysInSeconds - ); - assert.strictEqual( - Number(metadata!.messageRetentionDuration!.nanos), - 0 - ); - - sub!.delete(done); - } - ); - } + const testTopic = await generateTopic('msg-ret'); + const [sub] = await testTopic.topic.createSubscription(subName, callOptions); + const [metadata] = await sub.getMetadata(); + assert.strictEqual( + Number(metadata!.messageRetentionDuration!.seconds), + threeDaysInSeconds + ); + assert.strictEqual( + Number(metadata!.messageRetentionDuration!.nanos), + 0 ); }); - it('should set metadata for a subscription', () => { - const subscription = topic.subscription(generateSubName()); + it('should set metadata for a subscription', async () => { + const testTopic = await generateTopic('met-sub'); + const subscription = testTopic.topic.subscription(generateSubName('met-sub')); const threeDaysInSeconds = 3 * 24 * 60 * 60; - return subscription - .create() - .then(() => { - return subscription.setMetadata({ - messageRetentionDuration: threeDaysInSeconds, - }); - }) - .then(() => { - return subscription.getMetadata(); - }) - .then(([metadata]) => { - const {seconds, nanos} = metadata.messageRetentionDuration!; - - assert.strictEqual(Number(seconds), threeDaysInSeconds); - assert.strictEqual(Number(nanos), 0); - }); + await subscription.create(); + await subscription.setMetadata({ + messageRetentionDuration: threeDaysInSeconds, + }); + const [metadata] = await subscription.getMetadata(); + const {seconds, nanos} = metadata.messageRetentionDuration!; + + assert.strictEqual(Number(seconds), threeDaysInSeconds); + assert.strictEqual(Number(nanos), 0); }); - it('should error when using a non-existent subscription', done => { - const subscription = topic.subscription(generateSubName()); + it('should error when using a non-existent subscription', async () => { + const testTopic = await generateTopic('dne-sub'); + const subscription = testTopic.topic.subscription(generateSubName('dne-sub')); - subscription.on('error', (err: {code: number}) => { - assert.strictEqual(err.code, 5); - subscription.close(done); - }); + await new Promise((res, rej) => { + subscription.on('error', (err: {code: number}) => { + assert.strictEqual(err.code, 5); + subscription.close(res); + }); - subscription.on('message', () => { - done(new Error('Should not have been called.')); + subscription.on('message', () => { + rej(new Error('Should not have been called.')); + }); }); }); - it('should receive the published messages', done => { + it('should receive the published messages', async () => { + const pop = await subPop('recv', 1); let messageCount = 0; - const subscription = topic.subscription(SUB_NAMES[1]); + const subscription = pop.subs[0]; - subscription.on('error', done); + await new Promise((res, rej) => { + subscription.on('error', rej); - // eslint-disable-next-line @typescript-eslint/no-explicit-any - subscription.on('message', (message: {data: any}) => { - assert.deepStrictEqual(message.data, Buffer.from('hello')); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + subscription.on('message', message => { + assert.deepStrictEqual(message.data, Buffer.from('hello')); + message.ack(); - if (++messageCount === 10) { - subscription.close(done); - } + if (++messageCount === 10) { + subscription.close(res); + } + }); }); }); - it('should ack the message', done => { - const subscription = topic.subscription(SUB_NAMES[1]); + it('should ack the message', async () => { + const pop = await subPop('ack', 1); + const subscription = pop.subs[0]; - let finished = false; - subscription.on('error', () => { - if (!finished) { - finished = true; - subscription.close(done); - } - }); - subscription.on('message', ack); + await new Promise((res, rej) => { + let finished = false; + subscription.on('error', () => { + if (!finished) { + finished = true; + subscription.close(rej); + } + }); + subscription.on('message', ack); - function ack(message: Message) { - if (!finished) { - finished = true; - message.ack(); - subscription.close(done); + function ack(message: Message) { + if (!finished) { + finished = true; + message.ack(); + subscription.close(res); + } } - } + }); }); - it('should nack the message', done => { - const subscription = topic.subscription(SUB_NAMES[1]); + it('should nack the message', async () => { + const pop = await subPop('nack', 1); + const subscription = pop.subs[0]; - let finished = false; - subscription.on('error', () => { - if (!finished) { - finished = true; - subscription.close(done); - } - }); - subscription.on('message', nack); + await new Promise((res, rej) => { + let finished = false; + subscription.on('error', () => { + if (!finished) { + finished = true; + subscription.close(rej); + } + }); + subscription.on('message', nack); - function nack(message: Message) { - if (!finished) { - finished = true; - message.nack(); - subscription.close(done); + function nack(message: Message) { + if (!finished) { + finished = true; + message.nack(); + subscription.close(res); + } } - } + }); }); - it('should respect flow control limits', done => { + it('should respect flow control limits', async () => { const maxMessages = 3; let messageCount = 0; - const subscription = topic.subscription(SUB_NAMES[0], { + const pop = await subPop('fcl', 1); + const subscription = pop.topic.subscription(pop.testSubs[0].name, { flowControl: {maxMessages, allowExcessMessages: false}, }); - subscription.on('error', done); - subscription.on('message', onMessage); + await new Promise((res, rej) => { + subscription.on('error', rej); + subscription.on('message', onMessage); - function onMessage() { - if (++messageCount < maxMessages) { - return; - } + function onMessage() { + if (++messageCount < maxMessages) { + return; + } - subscription.close(done); - } + subscription.close(res); + } + }); }); - it('should send and receive large messages', done => { - const subscription = topic.subscription(SUB_NAMES[0]); + it('should send and receive large messages', async () => { + const pop = await subPop('large', 1); + const subscription = pop.subs[0]; const data = crypto.randomBytes(9000000); // 9mb - topic.publishMessage( - {data}, - (err: ServiceError | null, messageId: string | null | undefined) => { - assert.ifError(err); - - subscription.on('error', done).on('message', (message: Message) => { - if (message.id !== messageId) { - return; - } + const messageId = await pop.topic.publishMessage({data}); + await new Promise((res, rej) => { + subscription.on('error', rej).on('message', (message: Message) => { + if (message.id !== messageId) { + return; + } - assert.deepStrictEqual(data, message.data); - subscription.close(done); - }); - } - ); + assert.deepStrictEqual(data, message.data); + subscription.close(res); + }); + }); }); it('should detach subscriptions', async () => { - const subscription = topic.subscription(SUB_DETACH_NAME); + const pop = await subPop('detach', 1); + const subscription = pop.subs[0]; const [before] = await subscription.detached(); assert.strictEqual(before, false); - await pubsub.detachSubscription(SUB_DETACH_NAME); + await pubsub.detachSubscription(subscription.name); const [after] = await subscription.detached(); assert.strictEqual(after, true); }); // can be ran manually to test options/memory usage/etc. - // tslint:disable-next-line ban it.skip('should handle a large volume of messages', async function () { const MESSAGES = 200000; @@ -773,7 +678,9 @@ describe('pubsub', () => { this.timeout(0); - const subscription = topic.subscription(SUB_NAMES[0]); + const pop = await subPop('many', 1); + const topic = pop.topic; + const subscription = pop.subs[0]; topic.setPublishOptions({batching: {maxMessages: 999}}); await publish(MESSAGES); @@ -839,23 +746,18 @@ describe('pubsub', () => { }); describe('IAM', () => { - it('should get a policy', done => { - const topic = pubsub.topic(TOPIC_NAMES[0]); + it('should get a policy', async () => { + const testTopic = await generateTopic('get-pol'); + const topic = testTopic.topic; - topic.iam.getPolicy( - (err: ServiceError | null, policy: Policy | null | undefined) => { - assert.ifError(err); - - assert.deepStrictEqual(policy!.bindings, []); - assert.strictEqual(policy!.version, 0); - - done(); - } - ); + const [policy] = await topic.iam.getPolicy(); + assert.deepStrictEqual(policy!.bindings, []); + assert.strictEqual(policy!.version, 0); }); - it('should set a policy', done => { - const topic = pubsub.topic(TOPIC_NAMES[0]); + it('should set a policy', async () => { + const testTopic = await generateTopic('set-pol'); + const topic = testTopic.topic; const policy = { bindings: [ { @@ -867,118 +769,98 @@ describe('pubsub', () => { ], }; - topic.iam.setPolicy( - policy, - (err: ServiceError | null, newPolicy?: Policy | null) => { - assert.ifError(err); - const expectedBindings = policy.bindings.map(binding => - Object.assign({condition: null}, binding) - ); - assert.deepStrictEqual(newPolicy!.bindings, expectedBindings); - done(); - } + const [newPolicy] = await topic.iam.setPolicy(policy); + const expectedBindings = policy.bindings.map(binding => + Object.assign({condition: null}, binding) ); + assert.deepStrictEqual(newPolicy!.bindings, expectedBindings); }); - it('should test the iam permissions', done => { - const topic = pubsub.topic(TOPIC_NAMES[0]); + it('should test the iam permissions', async () => { + const testTopic = await generateTopic('set-pol'); + const topic = testTopic.topic; const testPermissions = ['pubsub.topics.get', 'pubsub.topics.update']; - topic.iam.testPermissions( - testPermissions, - ( - err: ServiceError | null, - permissions: IamPermissionsMap | null | undefined - ) => { - assert.ifError(err); - assert.deepStrictEqual(permissions, { - 'pubsub.topics.get': true, - 'pubsub.topics.update': true, - }); - done(); - } - ); + const [permissions] = await topic.iam.testPermissions(testPermissions); + assert.deepStrictEqual(permissions, { + 'pubsub.topics.get': true, + 'pubsub.topics.update': true, + }); }); }); describe('Snapshot', () => { - const SNAPSHOT_NAME = generateSnapshotName(); + async function snapshotPop(test: string) { + const topic: Topic = (await generateTopic('snap')).topic; + const subscription: Subscription = (await generateSub('snap', topic.name)).sub; + const snapshotId: string = generateSnapshotName('snap'); + const snapshot: Snapshot = subscription.snapshot(snapshotId); + + await snapshot.create(); + + return { + topic, + subscription, + snapshotId, + snapshot, + }; + } - let topic: Topic; - let subscription: Subscription; - let snapshot: Snapshot; function getSnapshotName({name}: {name: string}) { return name.split('/').pop(); } before(async () => { - topic = pubsub.topic(generateTopicName()); - subscription = topic.subscription(generateSubName()); - snapshot = subscription.snapshot(SNAPSHOT_NAME); - - await topic.create(); - await subscription.create(); - await snapshot.create(); + await deleteTestResources(); }); after(async () => { - await snapshot.delete(); - await subscription.delete(); - await topic.delete(); + await deleteTestResources(); }); - it('should get a list of snapshots', done => { - pubsub.getSnapshots( - ( - err: Error | null | undefined, - snapshots: Snapshot[] | null | undefined - ) => { - assert.ifError(err); - assert(snapshots!.length > 0); - const names = snapshots!.map(getSnapshotName); - assert(names.includes(SNAPSHOT_NAME)); - done(); - } - ); + it('should get a list of snapshots', async () => { + const pop = await snapshotPop('list'); + const [snapshots] = await pubsub.getSnapshots(); + assert(snapshots!.length > 0); + const names = snapshots!.map(getSnapshotName); + assert(names.includes(pop.snapshotId)); }); - it('should get a list of snapshots as a stream', done => { - const snapshots = new Array(); - pubsub - .getSnapshotsStream() - .on('error', done) - .on('data', (snapshot: Snapshot) => snapshots.push(snapshot)) - .on('end', () => { - assert(snapshots.length > 0); - const names = snapshots.map(getSnapshotName); - assert(names.includes(SNAPSHOT_NAME)); - done(); - }); + it('should get a list of snapshots as a stream', async () => { + const pop = await snapshotPop('list-s'); + const snapshots = await new Promise((res, rej) => { + const snaps = new Array(); + pubsub + .getSnapshotsStream() + .on('error', rej) + .on('data', (snapshot: Snapshot) => snaps.push(snapshot)) + .on('end', () => { + res(snaps); + }); + }); + assert(snapshots.length > 0); + const names = snapshots.map(getSnapshotName); + assert(names.includes(pop.snapshotId)); }); describe('seeking', () => { - let subscription: Subscription; - let snapshot: Snapshot; - let messageId: string; - let errorPromise: Promise<{}>; - - beforeEach(async () => { - subscription = topic.subscription(generateSubName()); - snapshot = subscription.snapshot(generateSnapshotName()); - - await subscription.create(); - await snapshot.create(); - - errorPromise = new Promise((_, reject) => - subscription.on('error', reject) + async function seekPop(test: string) { + const pop = await snapshotPop(test); + const errorPromise = new Promise((_, reject) => + pop.subscription.on('error', reject) ); - }); + + return { + errorPromise, + ...pop, + }; + } // This creates a Promise that hooks the 'message' callback of the // subscription above, and resolves when that callback calls `resolve`. type WorkCallback = (arg: Message, resolve: Function) => void; - function makeMessagePromise(workCallback: WorkCallback): Promise { + function makeMessagePromise(subscription: Subscription, workCallback: WorkCallback): Promise { return new Promise(resolve => { subscription.on('message', (arg: Message) => { workCallback(arg, resolve); @@ -986,15 +868,18 @@ describe('pubsub', () => { }); } - async function publishTestMessage() { - messageId = await topic.publish(Buffer.from('Hello, world!')); + async function publishTestMessage(topic: Topic) { + return await topic.publishMessage({data: Buffer.from('Hello, world!')}); } it('should seek to a snapshot', async () => { + const pop = await seekPop('sn-seek'); let messageCount = 0; type EventParameter = {id: string; ack: () => void}; + let messageId: string; const messagePromise = makeMessagePromise( + pop.subscription, async (message: EventParameter, resolve) => { if (message.id !== messageId) { return; @@ -1002,27 +887,30 @@ describe('pubsub', () => { message.ack(); if (++messageCount === 1) { - await snapshot!.seek(); + await pop.snapshot.seek(); return; } assert.strictEqual(messageCount, 2); - await subscription.close(); + await pop.subscription.close(); resolve(); } ); - await publishTestMessage(); - await Promise.race([errorPromise, messagePromise]); + messageId = await publishTestMessage(pop.topic); + await Promise.race([pop.errorPromise, messagePromise]); }); it('should seek to a date', async () => { + const pop = await seekPop('sn-seek-date'); let messageCount = 0; // eslint-disable-next-line @typescript-eslint/no-explicit-any type EventParameter = {id: string; ack: () => void; publishTime: any}; + let messageId: string; const messagePromise = makeMessagePromise( + pop.subscription, async (message: EventParameter, resolve) => { if (message.id !== messageId) { return; @@ -1031,7 +919,7 @@ describe('pubsub', () => { message.ack(); if (++messageCount === 1) { - subscription.seek( + pop.subscription.seek( message.publishTime, (err: ServiceError | null) => { assert.ifError(err); @@ -1041,43 +929,45 @@ describe('pubsub', () => { } assert.strictEqual(messageCount, 2); - await subscription.close(); + await pop.subscription.close(); resolve(); } ); - await publishTestMessage(); - await Promise.race([errorPromise, messagePromise]); + messageId = await publishTestMessage(pop.topic); + await Promise.race([pop.errorPromise, messagePromise]); }); it('should seek to a future date (purge)', async () => { + const pop = await seekPop('sn-purge'); const testText = 'Oh no!'; - await publishTestMessage(); + await publishTestMessage(pop.topic); // Forward-seek to remove any messages from the queue (those were // placed there in before()). // // We... probably won't be using this in 3000? - await subscription.seek(new Date('3000-01-01')); + await pop.subscription.seek(new Date('3000-01-01')); // Drop a second message and make sure it's the right ID. - await topic.publish(Buffer.from(testText)); + await pop.topic.publishMessage({data: Buffer.from(testText)}); type EventParameter = {data: {toString: () => string}; ack: () => void}; const messagePromise = makeMessagePromise( + pop.subscription, async (message: EventParameter, resolve) => { // If we get the default message from before() then this fails. assert.equal(message.data.toString(), testText); message.ack(); - await subscription.close(); + await pop.subscription.close(); resolve(); } ); - await Promise.race([errorPromise, messagePromise]); + await Promise.race([pop.errorPromise, messagePromise]); }); }); }); @@ -1106,21 +996,21 @@ describe('pubsub', () => { return schemaDef; }; - const setupTestSchema = async () => { + const setupTestSchema = async (test: string) => { const schemaDef = await getSchemaDef(); - const schemaId = generateSchemaName(); + const schemaId = generateSchemaName(test); await pubsub.createSchema(schemaId, SchemaTypes.Avro, schemaDef); return schemaId; }; it('should create a schema', async () => { - const schemaId = await setupTestSchema(); + const schemaId = await setupTestSchema('sc-create'); const schemaList = await aiToArray(pubsub.listSchemas(), schemaId); assert.strictEqual(schemaList.length, 1); }); it('should delete a schema', async () => { - const schemaId = await setupTestSchema(); + const schemaId = await setupTestSchema('sc-del'); // Validate that we created one, because delete() doesn't throw, and we // might end up causing a false negative. @@ -1134,7 +1024,7 @@ describe('pubsub', () => { }); it('should list schemas', async () => { - const schemaId = await setupTestSchema(); + const schemaId = await setupTestSchema('sc-list'); const basicList = await aiToArray( pubsub.listSchemas(SchemaViews.Basic), @@ -1152,7 +1042,7 @@ describe('pubsub', () => { }); it('should get a schema', async () => { - const schemaId = await setupTestSchema(); + const schemaId = await setupTestSchema('sc-get'); const schema = pubsub.schema(schemaId); const info = await schema.get(SchemaViews.Basic); assert.strictEqual(info.definition, ''); diff --git a/handwritten/pubsub/test/testResources.test.ts b/handwritten/pubsub/test/testResources.test.ts new file mode 100644 index 00000000000..b1cf3a67371 --- /dev/null +++ b/handwritten/pubsub/test/testResources.test.ts @@ -0,0 +1,84 @@ +// Copyright 2026 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {describe, it, beforeEach} from 'mocha'; +import {TestResources} from './testResources'; +import * as assert from 'assert'; + +describe('testResources (unit)', () => { + const fixedId = 'fixed'; + const fixedTime = Date.now(); + const fakeTokenMaker = { + uuid: () => fixedId, + timestamp: () => fixedTime, + }; + + const suiteId = 'someSuite'; + let testResources!: TestResources; + + beforeEach(() => { + testResources = new TestResources(suiteId, fakeTokenMaker); + }); + + it('has predictable prefixes', () => { + const prefix = testResources.getPrefix('testId'); + assert.strictEqual(prefix, `${suiteId}-${fixedTime}-testId`); + + const normalizedPrefix = testResources.getPrefix('test-id-dashes'); + assert.strictEqual( + normalizedPrefix, + `${suiteId}-${fixedTime}-test_id_dashes`, + ); + + const suitePrefix = testResources.getPrefix(); + assert.strictEqual(suitePrefix, `${suiteId}-${fixedTime}`); + }); + + it('generates names', () => { + const prefix = testResources.getPrefix('testId'); + const name = testResources.generateName('testId'); + assert.strictEqual(name, `${prefix}-${fixedId}`); + }); + + it('filters for cleanup', () => { + const resources = [ + { + // Not related + name: 'ooga', + }, + { + // For current test run + name: `${suiteId}-${fixedTime}-bob-98719284791`, + }, + { + // For previous test run, but not very old + name: `${suiteId}-${fixedTime - 100}-bob-124897912`, + }, + { + // For previous test run, but old + name: `${suiteId}-${fixedTime - 3000 * 60 * 60}-bob-57823975`, + }, + ]; + const filtered = testResources.filterForCleanup(resources); + assert.strictEqual(filtered.length, 2); + assert.strictEqual( + 1, + filtered.filter(r => r.name?.includes('bob-9871')).length, + ); + assert.strictEqual( + 1, + filtered.filter(r => r.name?.includes('bob-5782')).length, + ); + }); +}); diff --git a/handwritten/pubsub/test/testResources.ts b/handwritten/pubsub/test/testResources.ts new file mode 100644 index 00000000000..05550606d76 --- /dev/null +++ b/handwritten/pubsub/test/testResources.ts @@ -0,0 +1,182 @@ +// Copyright 2026 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// I don't like that these two files (this plus ".test") are duplicated +// across the two test structures, but because of the tangle of rootDirs +// and package.json "files", it's hard to avoid it. + +import * as uuid from 'uuid'; + +// Returns a shortened UUID that can be used to identify a +// specific run of a specific test. +function shortUUID() { + return uuid.v4().split('-').shift()!; +} + +export interface TokenMaker { + uuid(): string; + timestamp(): number; +} + +export const defaultMaker = { + uuid: shortUUID, + timestamp: () => Date.now(), +}; + +export interface Resource { + name?: string | null | undefined; + delete?(): Promise; +} + +function normalizeId(id: string): string { + return id.replace(/-/g, '_'); +} + +/** + * Manages the names of testing resources during a test run. It's + * easily to accidentally leak resources, and it's easy to accidentally + * have conflicts with tests running concurrently, so this class helps + * you manage them. + * + * Used nomenclature: + * Test - a single test for a single aspect of code; for example, + * "create a topic in pub/sub" + * Test Suite - a collection of tests that are generally run together; + * for example, "test topic operations in pub/sub" + * Test Run - a single run of a test suite (or single test within a suite); + * for example, "run the tests for PR #1234, 5th attempt" + */ +export class TestResources { + testSuiteId: string; + currentTime: string; + tokenMaker: TokenMaker; + + /** + * @param testSuiteId [string] A unique ID for a test suite (e.g. + * pubsub-topics). + */ + constructor(testSuiteId: string, tokenMaker: TokenMaker = defaultMaker) { + this.testSuiteId = normalizeId(testSuiteId); + this.currentTime = `${tokenMaker.timestamp()}`; + this.tokenMaker = tokenMaker; + } + + /** + * Returns the resource prefix for the current run of the test suite. + * Optionally, testId may specify the specific ID of a test in the + * suite. + */ + getPrefix(testId?: string): string { + if (testId) { + return [this.testSuiteId, this.currentTime, normalizeId(testId)].join( + '-', + ); + } else { + return [this.testSuiteId, this.currentTime].join('-'); + } + } + + /** + * Generates a unique resource name for one run of a test within + * a test suite. + */ + generateName(testId: string): string { + return [this.getPrefix(testId), this.tokenMaker.uuid()].join('-'); + } + + /** + * Generates a unique resource name for one run of a test within + * a test suite for BigQuery resources. + */ + generateBigQueryName(testId: string): string { + return [normalizeId(this.getPrefix(testId)), this.tokenMaker.uuid()].join( + '_', + ); + } + + /** + * Generates a unique resource name for one run of a test within + * a test suite for Cloud Storage resources. + */ + generateStorageName(testId: string): string { + return [normalizeId(this.getPrefix(testId)), this.tokenMaker.uuid()].join( + '_', + ); + } + + /** + * Given a list of resource names (and a test ID), this will return + * a list of all resources that should be deleted to clean up for + * the current run of that particular test. + */ + filterForTest(testId: string, allResources: Resource[]): Resource[] { + const prefix = this.getPrefix(testId); + return allResources.filter(n => n.name?.includes(prefix)); + } + + /** + * Given a list of resource names, this will return a list of all + * resources that should be deleted to clean up after the current + * run of a test suite. + */ + filterForCurrentRun(allResources: Resource[]): Resource[] { + const prefix = this.getPrefix(); + return allResources.filter(n => n.name?.includes(prefix)); + } + + /** + * Given a list of resource names, this will return a list of all + * resources that should be deleted to clean up after any run + * of the current test suite. Note that some of the names may + * still be in use. + */ + filterForSuite(allResources: Resource[]): Resource[] { + return allResources.filter(n => n.name?.includes(this.testSuiteId)); + } + + /** + * Given a list of resource names, this will return a list of all + * resources that should be deleted to generally clean up after any + * run of the current test suite. This is much like filterForSuite(), + * but it also filters by age - items that are less than 2 hours + * old will not be cleaned. + */ + filterForCleanup(allResources: Resource[]): Resource[] { + const currentRunPrefix = this.getPrefix(); + return allResources.filter(n => { + let name = n.name || undefined; + if (name === undefined) { + return false; + } + + // We'll always get at least one thing. + name = name.split('/').pop()!; + + if (name.startsWith(currentRunPrefix)) { + return true; + } + + if (name.startsWith(this.testSuiteId)) { + const parts = name.split('-'); + const createdAt = Number(parts[1]); + const timeDiff = (Date.now() - createdAt) / (1000 * 60 * 60); + if (timeDiff >= 2) { + return true; + } + } + + return false; + }); + } +} From 6ea22fa34ccbfa97d6152baa9ce3550e48a0e024 Mon Sep 17 00:00:00 2001 From: nico-kn Date: Wed, 14 Jan 2026 19:50:11 +0100 Subject: [PATCH 1095/1115] fix(WaitForProcessing): Shutdown option `WaitForProcessing` never entered on subscription close (#2118) * fix(WaitForProcessing): change entry condition * fix unit test to overwrite isEmpty() as a method instead of a getter * add fired events to docstrings * remove obsolete eslint exclusion * fix: change default to match existing behaviour --------- Co-authored-by: feywind <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/src/lease-manager.ts | 7 +++++++ handwritten/pubsub/src/subscriber.ts | 9 +++++---- handwritten/pubsub/test/subscriber.ts | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index fdc0de141ca..32b1102ccd5 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -106,6 +106,8 @@ export class LeaseManager extends EventEmitter { * Adds a message to the inventory, kicking off the deadline extender if it * isn't already running. * + * @fires LeaseManager#full + * * @param {Message} message The message. * @private */ @@ -141,6 +143,10 @@ export class LeaseManager extends EventEmitter { } /** * Removes ALL messages from inventory, and returns the ones removed. + * + * @fires LeaseManager#free + * @fires LeaseManager#empty + * * @private */ clear(): Message[] { @@ -197,6 +203,7 @@ export class LeaseManager extends EventEmitter { * messages are left over. * * @fires LeaseManager#free + * @fires LeaseManager#empty * * @param {Message} message The message to remove. * @private diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index c1299686279..1989e11d6af 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -655,7 +655,7 @@ export class Message implements tracing.MessageWithAttributes { * close() function. * @property {SubscriberCloseBehavior} [options.behavior] The behavior of the close operation. * - NackImmediately: Sends nacks for all messages held by the client library, and - * wait for them to send. + * wait for them to send. (default to match old behavior) * - WaitForProcessing: Continues normal ack/nack and leasing processes until close * to the timeout, then switches to NackImmediately behavior to close down. * Use {@link SubscriberCloseBehaviors} for enum values. @@ -970,9 +970,10 @@ export class Subscriber extends EventEmitter { const options = this._options.closeOptions; - // If no behavior is specified, default to Wait. + // If no behavior is specified, default to Nack. This most closely matches + // the old behavior. const behavior = - options?.behavior ?? SubscriberCloseBehaviors.WaitForProcessing; + options?.behavior ?? SubscriberCloseBehaviors.NackImmediately; // The timeout can't realistically be longer than the longest time we're willing // to lease messages. @@ -1000,7 +1001,7 @@ export class Subscriber extends EventEmitter { const shutdownStart = Date.now(); if ( behavior === SubscriberCloseBehaviors.WaitForProcessing && - !this._inventory.isEmpty + !this._inventory.isEmpty() ) { const waitTimeout = timeout.subtract(FINAL_NACK_TIMEOUT); diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index 4e6917b15b0..fce888a4e1f 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -106,7 +106,7 @@ class FakeLeaseManager extends EventEmitter { remove(message: s.Message): void {} _isEmpty = true; - get isEmpty() { + isEmpty(): boolean { return this._isEmpty; } } From 0a18e5ceb5735876059b9c3d087e6dda4d3fee0a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 14 Jan 2026 14:34:19 -0500 Subject: [PATCH 1096/1115] chore(main): release 5.2.2 (#2123) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index bab618ee015..b52672b5e67 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [5.2.2](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.1...v5.2.2) (2026-01-14) + + +### Bug Fixes + +* **WaitForProcessing:** Shutdown option `WaitForProcessing` never entered on subscription close ([#2118](https://github.com/googleapis/nodejs-pubsub/issues/2118)) ([e99b37e](https://github.com/googleapis/nodejs-pubsub/commit/e99b37e28ce551ad24325ac951ac33a60f8faa99)) + ## [5.2.1](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.0...v5.2.1) (2025-12-19) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 3c10dde3d50..2f97fb7a2cf 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "5.2.1", + "version": "5.2.2", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 7e0214b37223d3de9a5be337ff25c0ffb2d150e4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 30 Jan 2026 17:42:25 -0500 Subject: [PATCH 1097/1115] chore: fix lint failures (#2116) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: fix lint failures Source-Link: https://github.com/googleapis/synthtool/commit/36ebc332605b7da44be489e597e4a048e4d79e0a Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:1c50961ec998cd24968d5b2628e8d88a36b612ea881e71bfd171c93cc9d08b9e * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: feywind <57276408+feywind@users.noreply.github.com> --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 4 ++-- handwritten/pubsub/.kokoro/lint.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 3a1abb9410a..24f126d8836 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:a1e45c1b53fceb5fa7fd5c49cf898048c210eb07001a3355548e7a4545200ee8 -# created: 2025-11-21T20:24:19.347250905Z + digest: sha256:1c50961ec998cd24968d5b2628e8d88a36b612ea881e71bfd171c93cc9d08b9e +# created: 2025-12-02T19:51:56.208302619Z diff --git a/handwritten/pubsub/.kokoro/lint.sh b/handwritten/pubsub/.kokoro/lint.sh index f994f276728..c7ffa6438b0 100755 --- a/handwritten/pubsub/.kokoro/lint.sh +++ b/handwritten/pubsub/.kokoro/lint.sh @@ -20,7 +20,7 @@ export NPM_CONFIG_PREFIX=${HOME}/.npm-global export PATH="${NPM_CONFIG_PREFIX}/bin:${PATH}" # Ensure the npm global directory is writable, otherwise rebuild `npm` -mkdir -p ${NPM_CONFIG_PREFIX} +mkdir -p ${NPM_CONFIG_PREFIX}/lib npm config -g ls || npm i -g npm@`npm --version` cd $(dirname $0)/.. From 7285b556f81d4515bcaaf3b267afc58827553a93 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Wed, 11 Feb 2026 13:03:34 -0500 Subject: [PATCH 1098/1115] fix: clean up earlier refactor issues with maxExtensionTime (#2127) --- handwritten/pubsub/src/lease-manager.ts | 2 -- handwritten/pubsub/src/subscriber.ts | 4 ++++ handwritten/pubsub/test/subscriber.ts | 11 +++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/src/lease-manager.ts b/handwritten/pubsub/src/lease-manager.ts index 32b1102ccd5..d8afdb11a35 100644 --- a/handwritten/pubsub/src/lease-manager.ts +++ b/handwritten/pubsub/src/lease-manager.ts @@ -51,8 +51,6 @@ export interface FlowControlOptions { * @property {number} [maxBytes=104857600] The desired amount of memory to * allow message data to consume. (Default: 100MB) It's possible that this * value will be exceeded, since messages are received in batches. - * @property {number} [maxExtensionMinutes=60] The maximum duration (in minutes) - * to extend the message deadline before redelivering. * @property {number} [maxMessages=1000] The desired number of messages to allow * in memory before pausing the message stream. Unless allowExcessMessages * is set to false, it is very likely that this value will be exceeded since diff --git a/handwritten/pubsub/src/subscriber.ts b/handwritten/pubsub/src/subscriber.ts index 1989e11d6af..a08dc6d6646 100644 --- a/handwritten/pubsub/src/subscriber.ts +++ b/handwritten/pubsub/src/subscriber.ts @@ -1231,6 +1231,10 @@ export class Subscriber extends EventEmitter { ); } + if (this._options.maxExtensionTime) { + this.maxExtensionTime = this._options.maxExtensionTime; + } + if (this._inventory) { this._inventory.setOptions(this._options.flowControl!); } diff --git a/handwritten/pubsub/test/subscriber.ts b/handwritten/pubsub/test/subscriber.ts index fce888a4e1f..5cf205cfd9b 100644 --- a/handwritten/pubsub/test/subscriber.ts +++ b/handwritten/pubsub/test/subscriber.ts @@ -1108,6 +1108,17 @@ describe('Subscriber', () => { assert.strictEqual(stream.options.maxStreams, maxMessages); }); + + it('should pass through the max extension time', () => { + const maxExtensionTime = Duration.from({seconds: 1232}); + subscriber.setOptions({ + maxExtensionTime, + }); + assert.strictEqual( + subscriber.maxExtensionTime.seconds, + maxExtensionTime.seconds, + ); + }); }); describe('OpenTelemetry tracing', () => { From 56ecb10182c2e0a5e2ea913f9d622fd469dff872 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 11 Feb 2026 13:42:53 -0500 Subject: [PATCH 1099/1115] chore(main): release 5.2.3 (#2128) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index b52672b5e67..b57676a4910 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [5.2.3](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.2...v5.2.3) (2026-02-11) + + +### Bug Fixes + +* Clean up earlier refactor issues with maxExtensionTime ([#2127](https://github.com/googleapis/nodejs-pubsub/issues/2127)) ([c22471d](https://github.com/googleapis/nodejs-pubsub/commit/c22471de60c63d9420c037ca3269af8b7dbf9d92)) + ## [5.2.2](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.1...v5.2.2) (2026-01-14) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 2f97fb7a2cf..507fc90fe90 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "5.2.2", + "version": "5.2.3", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 8423fd4ed228ecdf89e55a1ae1aadee7361a06a1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 11 Feb 2026 19:24:27 +0000 Subject: [PATCH 1100/1115] fix(deps): update all dependencies (#2105) * fix(deps): update all dependencies * build: revert .github/scripts changes, they are templated * build: revert some potentially incompatible changes in samples/package.json * build: revert some potentially incompatible changes in package.json * build: downgrade incompatible trace exporter * build: downgrade to non-ESM uuid * build: downgrade to non-ESM uuid * build: gts update needs other changes * build: gts update needs other changes --------- Co-authored-by: feywind <57276408+feywind@users.noreply.github.com> --- .../pubsub/.github/scripts/package.json | 2 +- handwritten/pubsub/package.json | 18 +++++++++--------- .../system-test/fixtures/sample/package.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json index 2c2e5207df9..40bcc61b28f 100644 --- a/handwritten/pubsub/.github/scripts/package.json +++ b/handwritten/pubsub/.github/scripts/package.json @@ -18,4 +18,4 @@ "mocha": "^10.0.0", "sinon": "^18.0.0" } -} \ No newline at end of file +} diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 507fc90fe90..91058782b84 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -54,7 +54,7 @@ "@google-cloud/promisify": "^5.0.0", "@opentelemetry/api": "~1.9.0", "@opentelemetry/core": "^1.30.1", - "@opentelemetry/semantic-conventions": "~1.34.0", + "@opentelemetry/semantic-conventions": "~1.39.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^10.5.0", @@ -73,19 +73,19 @@ "@types/mocha": "^10.0.10", "@types/mv": "^2.1.4", "@types/ncp": "^2.0.8", - "@types/node": "^22.14.1", + "@types/node": "^24.0.0", "@types/proxyquire": "^1.3.31", - "@types/sinon": "^17.0.4", + "@types/sinon": "^21.0.0", "@types/tmp": "^0.2.6", - "@types/uuid": "^10.0.0", + "@types/uuid": "^11.0.0", "c8": "^10.1.3", "codecov": "^3.8.3", "execa": "~5.1.0", "gapic-tools": "^1.0.1", - "gts": "^6.0.2", + "gts": "^6.0.0", "jsdoc": "^4.0.4", - "jsdoc-fresh": "^4.0.0", - "jsdoc-region-tag": "^3.0.0", + "jsdoc-fresh": "^5.0.0", + "jsdoc-region-tag": "^4.0.0", "linkinator": "^6.1.2", "mocha": "^11.1.0", "mv": "^2.1.1", @@ -93,9 +93,9 @@ "nise": "^6.1.1", "null-loader": "^4.0.1", "path-to-regexp": "^8.2.0", - "protobufjs": "^7.4.0", + "protobufjs": "~7.5.0", "proxyquire": "^2.1.3", - "sinon": "^20.0.0", + "sinon": "^21.0.0", "tmp": "^0.2.3", "ts-loader": "^9.5.2", "typescript": "^5.8.3", diff --git a/handwritten/pubsub/system-test/fixtures/sample/package.json b/handwritten/pubsub/system-test/fixtures/sample/package.json index 0387c63b409..fa3e4f326ad 100644 --- a/handwritten/pubsub/system-test/fixtures/sample/package.json +++ b/handwritten/pubsub/system-test/fixtures/sample/package.json @@ -16,8 +16,8 @@ "@google-cloud/pubsub": "file:./pubsub.tgz" }, "devDependencies": { - "@types/node": "^22.0.0", + "@types/node": "^24.0.0", "typescript": "^5.1.6", - "gts": "^6.0.0" + "gts": "^7.0.0" } } From cf6491fec41f65285cb2598c818c31ef1ca7763d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 18 Feb 2026 17:08:55 -0500 Subject: [PATCH 1101/1115] chore(main): release 5.2.4 (#2129) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index b57676a4910..c9326eef6e9 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [5.2.4](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.3...v5.2.4) (2026-02-11) + + +### Bug Fixes + +* **deps:** Update all dependencies ([#2105](https://github.com/googleapis/nodejs-pubsub/issues/2105)) ([c7d42e3](https://github.com/googleapis/nodejs-pubsub/commit/c7d42e391eac92137abd8aeb2ac25bc89856aa15)) + ## [5.2.3](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.2...v5.2.3) (2026-02-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 91058782b84..fe7cfbf0133 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "5.2.3", + "version": "5.2.4", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 3a4b83945884e101f65609ff06b901ccba57146b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 18 Feb 2026 17:14:07 -0500 Subject: [PATCH 1102/1115] chore(nodejs): remove wheel 0.45.1 (#2133) Source-Link: https://github.com/googleapis/synthtool/commit/b1b05f794f4bf050b0ffe9d5303d7427932d5d93 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:cd5bfcc3d183c1974bca4227785fd397452149bce3785b45a2f735a793ae6241 Co-authored-by: Owl Bot --- handwritten/pubsub/.github/.OwlBot.lock.yaml | 6 +++--- handwritten/pubsub/.github/CODEOWNERS | 2 +- handwritten/pubsub/.github/sync-repo-settings.yaml | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml index 24f126d8836..1a90daec635 100644 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ b/handwritten/pubsub/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2025 Google LLC +# Copyright 2026 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:1c50961ec998cd24968d5b2628e8d88a36b612ea881e71bfd171c93cc9d08b9e -# created: 2025-12-02T19:51:56.208302619Z + digest: sha256:cd5bfcc3d183c1974bca4227785fd397452149bce3785b45a2f735a793ae6241 +# created: 2026-02-12T17:44:25.68637179Z diff --git a/handwritten/pubsub/.github/CODEOWNERS b/handwritten/pubsub/.github/CODEOWNERS index 4a651925386..6b8f272e257 100644 --- a/handwritten/pubsub/.github/CODEOWNERS +++ b/handwritten/pubsub/.github/CODEOWNERS @@ -6,4 +6,4 @@ # Unless specified, the jsteam is the default owner for nodejs repositories. -* @googleapis/api-pubsub @googleapis/jsteam \ No newline at end of file +* @googleapis/api-pubsub @googleapis/cloud-sdk-nodejs-team \ No newline at end of file diff --git a/handwritten/pubsub/.github/sync-repo-settings.yaml b/handwritten/pubsub/.github/sync-repo-settings.yaml index a013376d1cb..9e91ffc8acb 100644 --- a/handwritten/pubsub/.github/sync-repo-settings.yaml +++ b/handwritten/pubsub/.github/sync-repo-settings.yaml @@ -15,9 +15,5 @@ branchProtectionRules: - windows - OwlBot Post Processor permissionRules: - - team: yoshi-admins - permission: admin - - team: jsteam-admins - permission: admin - - team: jsteam + - team: cloud-sdk-nodejs-team permission: push From efeaf8519c90133d29836d2fd91844238fc80529 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Thu, 19 Feb 2026 14:36:41 -0500 Subject: [PATCH 1103/1115] feat: manual proto pushing (#2134) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: manual proto pushing * feat: manually push protos * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../google/cloud/common_resources.proto | 52 -- .../protos/google/pubsub/v1/pubsub.proto | 118 +++- handwritten/pubsub/protos/protos.d.ts | 161 ++++- handwritten/pubsub/protos/protos.js | 624 +++++++++++++++++- handwritten/pubsub/protos/protos.json | 114 +++- 5 files changed, 978 insertions(+), 91 deletions(-) delete mode 100644 handwritten/pubsub/protos/google/cloud/common_resources.proto diff --git a/handwritten/pubsub/protos/google/cloud/common_resources.proto b/handwritten/pubsub/protos/google/cloud/common_resources.proto deleted file mode 100644 index 56c9f800d5e..00000000000 --- a/handwritten/pubsub/protos/google/cloud/common_resources.proto +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2019 Google LLC. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// This file contains stub messages for common resources in GCP. -// It is not intended to be directly generated, and is instead used by -// other tooling to be able to match common resource patterns. -syntax = "proto3"; - -package google.cloud; - -import "google/api/resource.proto"; - - -option (google.api.resource_definition) = { - type: "cloudresourcemanager.googleapis.com/Project" - pattern: "projects/{project}" -}; - - -option (google.api.resource_definition) = { - type: "cloudresourcemanager.googleapis.com/Organization" - pattern: "organizations/{organization}" -}; - - -option (google.api.resource_definition) = { - type: "cloudresourcemanager.googleapis.com/Folder" - pattern: "folders/{folder}" -}; - - -option (google.api.resource_definition) = { - type: "cloudbilling.googleapis.com/BillingAccount" - pattern: "billingAccounts/{billing_account}" -}; - -option (google.api.resource_definition) = { - type: "locations.googleapis.com/Location" - pattern: "projects/{project}/locations/{location}" -}; - diff --git a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto index 2792133a4ea..b542351d9d6 100644 --- a/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto +++ b/handwritten/pubsub/protos/google/pubsub/v1/pubsub.proto @@ -33,6 +33,14 @@ option java_outer_classname = "PubsubProto"; option java_package = "com.google.pubsub.v1"; option php_namespace = "Google\\Cloud\\PubSub\\V1"; option ruby_package = "Google::Cloud::PubSub::V1"; +option (google.api.resource_definition) = { + type: "cloudkms.googleapis.com/CryptoKey" + pattern: "projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}" +}; +option (google.api.resource_definition) = { + type: "analyticshub.googleapis.com/Listing" + pattern: "projects/{project}/locations/{location}/dataExchanges/{data_exchange}/listings/{listing}" +}; // The service that an application uses to manipulate topics, and to send // messages to a topic. @@ -415,7 +423,10 @@ message IngestionDataSourceSettings { // Required. The name of the topic in the Amazon MSK cluster that Pub/Sub // will import from. - string topic = 3 [(google.api.field_behavior) = REQUIRED]; + string topic = 3 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } + ]; // Required. AWS role ARN to be used for Federated Identity authentication // with Amazon MSK. Check the Pub/Sub docs for how to set up this role and @@ -553,6 +564,10 @@ message IngestionFailureEvent { // validation violation. message SchemaViolationReason {} + // Set when a Pub/Sub message fails to get published due to a message + // transformation error. + message MessageTransformationFailureReason {} + // Failure when ingesting from a Cloud Storage source. message CloudStorageFailure { // Optional. Name of the Cloud Storage bucket used for ingestion. @@ -580,6 +595,11 @@ message IngestionFailureEvent { // Optional. The Pub/Sub message failed schema validation. SchemaViolationReason schema_violation_reason = 7 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure encountered when applying a message transformation to + // the Pub/Sub message. + MessageTransformationFailureReason message_transformation_failure_reason = + 8 [(google.api.field_behavior) = OPTIONAL]; } } @@ -608,6 +628,11 @@ message IngestionFailureEvent { // Optional. The Pub/Sub message failed schema validation. SchemaViolationReason schema_violation_reason = 6 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure encountered when applying a message transformation to + // the Pub/Sub message. + MessageTransformationFailureReason message_transformation_failure_reason = + 7 [(google.api.field_behavior) = OPTIONAL]; } } @@ -636,6 +661,11 @@ message IngestionFailureEvent { // Optional. The Pub/Sub message failed schema validation. SchemaViolationReason schema_violation_reason = 6 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure encountered when applying a message transformation to + // the Pub/Sub message. + MessageTransformationFailureReason message_transformation_failure_reason = + 7 [(google.api.field_behavior) = OPTIONAL]; } } @@ -664,6 +694,11 @@ message IngestionFailureEvent { // Optional. The Pub/Sub message failed schema validation. SchemaViolationReason schema_violation_reason = 6 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure encountered when applying a message transformation to + // the Pub/Sub message. + MessageTransformationFailureReason message_transformation_failure_reason = + 7 [(google.api.field_behavior) = OPTIONAL]; } } @@ -683,12 +718,26 @@ message IngestionFailureEvent { // Optional. The Pub/Sub message failed schema validation. SchemaViolationReason schema_violation_reason = 4 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Failure encountered when applying a message transformation to + // the Pub/Sub message. + MessageTransformationFailureReason message_transformation_failure_reason = + 5 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The message failed to be published due to an API violation. + // This is only set when the size of the data field of the Kinesis record + // is zero. + ApiViolationReason api_violation_reason = 6 + [(google.api.field_behavior) = OPTIONAL]; } } // Required. Name of the import topic. Format is: // projects/{project_name}/topics/{topic_name}. - string topic = 1 [(google.api.field_behavior) = REQUIRED]; + string topic = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } + ]; // Required. Error details explaining why ingestion to Pub/Sub has failed. string error_message = 2 [(google.api.field_behavior) = REQUIRED]; @@ -820,7 +869,12 @@ message Topic { // protect access to messages published on this topic. // // The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*`. - string kms_key_name = 5 [(google.api.field_behavior) = OPTIONAL]; + string kms_key_name = 5 [ + (google.api.field_behavior) = OPTIONAL, + (google.api.resource_reference) = { + type: "cloudkms.googleapis.com/CryptoKey" + } + ]; // Optional. Settings for validating messages published against a schema. SchemaSettings schema_settings = 6 [(google.api.field_behavior) = OPTIONAL]; @@ -852,6 +906,16 @@ message Topic { // Transforms are applied in the order specified. repeated MessageTransform message_transforms = 13 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Input only. Immutable. Tag keys/values directly bound to this + // resource. For example: + // "123/environment": "production", + // "123/costCenter": "marketing" + map tags = 14 [ + (google.api.field_behavior) = INPUT_ONLY, + (google.api.field_behavior) = IMMUTABLE, + (google.api.field_behavior) = OPTIONAL + ]; } // A message that is published by publishers and consumed by subscribers. The @@ -1025,7 +1089,10 @@ message ListTopicSnapshotsRequest { // Response for the `ListTopicSnapshots` method. message ListTopicSnapshotsResponse { // Optional. The names of the snapshots that match the request. - repeated string snapshots = 1 [(google.api.field_behavior) = OPTIONAL]; + repeated string snapshots = 1 [ + (google.api.field_behavior) = OPTIONAL, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Snapshot" } + ]; // Optional. If not empty, indicates that there may be more snapshots that // match the request; this value should be passed in a new @@ -1319,7 +1386,12 @@ message Subscription { // Optional. The name of the associated Analytics Hub listing resource. // Pattern: // "projects/{project}/locations/{location}/dataExchanges/{data_exchange}/listings/{listing}" - string listing = 1 [(google.api.field_behavior) = OPTIONAL]; + string listing = 1 [ + (google.api.field_behavior) = OPTIONAL, + (google.api.resource_reference) = { + type: "analyticshub.googleapis.com/Listing" + } + ]; // Optional. The name of the associated Analytics Hub subscription resource. // Pattern: @@ -1485,6 +1557,16 @@ message Subscription { // subscribers. Transforms are applied in the order specified. repeated MessageTransform message_transforms = 25 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Input only. Immutable. Tag keys/values directly bound to this + // resource. For example: + // "123/environment": "production", + // "123/costCenter": "marketing" + map tags = 26 [ + (google.api.field_behavior) = INPUT_ONLY, + (google.api.field_behavior) = IMMUTABLE, + (google.api.field_behavior) = OPTIONAL + ]; } // A policy that specifies how Pub/Sub retries message delivery. @@ -1526,7 +1608,10 @@ message DeadLetterPolicy { // The operation will fail if the topic does not exist. // Users should ensure that there is a subscription attached to this topic // since messages published to a topic with no subscriptions are lost. - string dead_letter_topic = 1 [(google.api.field_behavior) = OPTIONAL]; + string dead_letter_topic = 1 [ + (google.api.field_behavior) = OPTIONAL, + (google.api.resource_reference) = { type: "pubsub.googleapis.com/Topic" } + ]; // Optional. The maximum number of delivery attempts for any message. The // value must be between 5 and 100. @@ -2095,6 +2180,11 @@ message StreamingPullRequest { // set on a subsequent request, the stream will be aborted with status // `INVALID_ARGUMENT`. int64 max_outstanding_bytes = 8 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The protocol version used by the client. This property can only + // be set on the initial StreamingPullRequest. If it is set on a subsequent + // request, the stream will be aborted with status `INVALID_ARGUMENT`. + int64 protocol_version = 10 [(google.api.field_behavior) = OPTIONAL]; } // Response for the `StreamingPull` method. This response is used to stream @@ -2149,17 +2239,17 @@ message StreamingPullResponse { bool message_ordering_enabled = 2 [(google.api.field_behavior) = OPTIONAL]; } - // Optional. Received Pub/Sub messages. This will not be empty. + // Optional. Received Pub/Sub messages. repeated ReceivedMessage received_messages = 1 [(google.api.field_behavior) = OPTIONAL]; // Optional. This field will only be set if `enable_exactly_once_delivery` is - // set to `true`. + // set to `true` and is not guaranteed to be populated. AcknowledgeConfirmation acknowledge_confirmation = 5 [(google.api.field_behavior) = OPTIONAL]; // Optional. This field will only be set if `enable_exactly_once_delivery` is - // set to `true`. + // set to `true` and is not guaranteed to be populated. ModifyAckDeadlineConfirmation modify_ack_deadline_confirmation = 3 [(google.api.field_behavior) = OPTIONAL]; @@ -2200,6 +2290,16 @@ message CreateSnapshotRequest { // Optional. See [Creating and managing // labels](https://cloud.google.com/pubsub/docs/labels). map labels = 3 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. Input only. Immutable. Tag keys/values directly bound to this + // resource. For example: + // "123/environment": "production", + // "123/costCenter": "marketing" + map tags = 4 [ + (google.api.field_behavior) = INPUT_ONLY, + (google.api.field_behavior) = IMMUTABLE, + (google.api.field_behavior) = OPTIONAL + ]; } // Request for the UpdateSnapshot method. diff --git a/handwritten/pubsub/protos/protos.d.ts b/handwritten/pubsub/protos/protos.d.ts index e198396e1d5..6f6201d1f82 100644 --- a/handwritten/pubsub/protos/protos.d.ts +++ b/handwritten/pubsub/protos/protos.d.ts @@ -2099,6 +2099,97 @@ export namespace google { public static getTypeUrl(typeUrlPrefix?: string): string; } + /** Properties of a MessageTransformationFailureReason. */ + interface IMessageTransformationFailureReason { + } + + /** Represents a MessageTransformationFailureReason. */ + class MessageTransformationFailureReason implements IMessageTransformationFailureReason { + + /** + * Constructs a new MessageTransformationFailureReason. + * @param [properties] Properties to set + */ + constructor(properties?: google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason); + + /** + * Creates a new MessageTransformationFailureReason instance using the specified properties. + * @param [properties] Properties to set + * @returns MessageTransformationFailureReason instance + */ + public static create(properties?: google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason): google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason; + + /** + * Encodes the specified MessageTransformationFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify|verify} messages. + * @param message MessageTransformationFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encode(message: google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Encodes the specified MessageTransformationFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify|verify} messages. + * @param message MessageTransformationFailureReason message or plain object to encode + * @param [writer] Writer to encode to + * @returns Writer + */ + public static encodeDelimited(message: google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason, writer?: $protobuf.Writer): $protobuf.Writer; + + /** + * Decodes a MessageTransformationFailureReason message from the specified reader or buffer. + * @param reader Reader or buffer to decode from + * @param [length] Message length if known beforehand + * @returns MessageTransformationFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason; + + /** + * Decodes a MessageTransformationFailureReason message from the specified reader or buffer, length delimited. + * @param reader Reader or buffer to decode from + * @returns MessageTransformationFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason; + + /** + * Verifies a MessageTransformationFailureReason message. + * @param message Plain object to verify + * @returns `null` if valid, otherwise the reason why it is not + */ + public static verify(message: { [k: string]: any }): (string|null); + + /** + * Creates a MessageTransformationFailureReason message from a plain object. Also converts values to their respective internal types. + * @param object Plain object + * @returns MessageTransformationFailureReason + */ + public static fromObject(object: { [k: string]: any }): google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason; + + /** + * Creates a plain object from a MessageTransformationFailureReason message. Also converts values to other types if specified. + * @param message MessageTransformationFailureReason + * @param [options] Conversion options + * @returns Plain object + */ + public static toObject(message: google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason, options?: $protobuf.IConversionOptions): { [k: string]: any }; + + /** + * Converts this MessageTransformationFailureReason to JSON. + * @returns JSON object + */ + public toJSON(): { [k: string]: any }; + + /** + * Gets the default type url for MessageTransformationFailureReason + * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns The default type url + */ + public static getTypeUrl(typeUrlPrefix?: string): string; + } + /** Properties of a CloudStorageFailure. */ interface ICloudStorageFailure { @@ -2119,6 +2210,9 @@ export namespace google { /** CloudStorageFailure schemaViolationReason */ schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + + /** CloudStorageFailure messageTransformationFailureReason */ + messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); } /** Represents a CloudStorageFailure. */ @@ -2148,8 +2242,11 @@ export namespace google { /** CloudStorageFailure schemaViolationReason. */ public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** CloudStorageFailure messageTransformationFailureReason. */ + public messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); + /** CloudStorageFailure reason. */ - public reason?: ("avroFailureReason"|"apiViolationReason"|"schemaViolationReason"); + public reason?: ("avroFailureReason"|"apiViolationReason"|"schemaViolationReason"|"messageTransformationFailureReason"); /** * Creates a new CloudStorageFailure instance using the specified properties. @@ -2249,6 +2346,9 @@ export namespace google { /** AwsMskFailureReason schemaViolationReason */ schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + + /** AwsMskFailureReason messageTransformationFailureReason */ + messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); } /** Represents an AwsMskFailureReason. */ @@ -2278,8 +2378,11 @@ export namespace google { /** AwsMskFailureReason schemaViolationReason. */ public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** AwsMskFailureReason messageTransformationFailureReason. */ + public messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); + /** AwsMskFailureReason reason. */ - public reason?: ("apiViolationReason"|"schemaViolationReason"); + public reason?: ("apiViolationReason"|"schemaViolationReason"|"messageTransformationFailureReason"); /** * Creates a new AwsMskFailureReason instance using the specified properties. @@ -2379,6 +2482,9 @@ export namespace google { /** AzureEventHubsFailureReason schemaViolationReason */ schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + + /** AzureEventHubsFailureReason messageTransformationFailureReason */ + messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); } /** Represents an AzureEventHubsFailureReason. */ @@ -2408,8 +2514,11 @@ export namespace google { /** AzureEventHubsFailureReason schemaViolationReason. */ public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** AzureEventHubsFailureReason messageTransformationFailureReason. */ + public messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); + /** AzureEventHubsFailureReason reason. */ - public reason?: ("apiViolationReason"|"schemaViolationReason"); + public reason?: ("apiViolationReason"|"schemaViolationReason"|"messageTransformationFailureReason"); /** * Creates a new AzureEventHubsFailureReason instance using the specified properties. @@ -2509,6 +2618,9 @@ export namespace google { /** ConfluentCloudFailureReason schemaViolationReason */ schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + + /** ConfluentCloudFailureReason messageTransformationFailureReason */ + messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); } /** Represents a ConfluentCloudFailureReason. */ @@ -2538,8 +2650,11 @@ export namespace google { /** ConfluentCloudFailureReason schemaViolationReason. */ public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** ConfluentCloudFailureReason messageTransformationFailureReason. */ + public messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); + /** ConfluentCloudFailureReason reason. */ - public reason?: ("apiViolationReason"|"schemaViolationReason"); + public reason?: ("apiViolationReason"|"schemaViolationReason"|"messageTransformationFailureReason"); /** * Creates a new ConfluentCloudFailureReason instance using the specified properties. @@ -2633,6 +2748,12 @@ export namespace google { /** AwsKinesisFailureReason schemaViolationReason */ schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + + /** AwsKinesisFailureReason messageTransformationFailureReason */ + messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); + + /** AwsKinesisFailureReason apiViolationReason */ + apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); } /** Represents an AwsKinesisFailureReason. */ @@ -2656,8 +2777,14 @@ export namespace google { /** AwsKinesisFailureReason schemaViolationReason. */ public schemaViolationReason?: (google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null); + /** AwsKinesisFailureReason messageTransformationFailureReason. */ + public messageTransformationFailureReason?: (google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null); + + /** AwsKinesisFailureReason apiViolationReason. */ + public apiViolationReason?: (google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null); + /** AwsKinesisFailureReason reason. */ - public reason?: "schemaViolationReason"; + public reason?: ("schemaViolationReason"|"messageTransformationFailureReason"|"apiViolationReason"); /** * Creates a new AwsKinesisFailureReason instance using the specified properties. @@ -2985,6 +3112,9 @@ export namespace google { /** Topic messageTransforms */ messageTransforms?: (google.pubsub.v1.IMessageTransform[]|null); + + /** Topic tags */ + tags?: ({ [k: string]: string }|null); } /** Represents a Topic. */ @@ -3026,6 +3156,9 @@ export namespace google { /** Topic messageTransforms. */ public messageTransforms: google.pubsub.v1.IMessageTransform[]; + /** Topic tags. */ + public tags: { [k: string]: string }; + /** * Creates a new Topic instance using the specified properties. * @param [properties] Properties to set @@ -4978,6 +5111,9 @@ export namespace google { /** Subscription messageTransforms */ messageTransforms?: (google.pubsub.v1.IMessageTransform[]|null); + + /** Subscription tags */ + tags?: ({ [k: string]: string }|null); } /** Represents a Subscription. */ @@ -5049,6 +5185,9 @@ export namespace google { /** Subscription messageTransforms. */ public messageTransforms: google.pubsub.v1.IMessageTransform[]; + /** Subscription tags. */ + public tags: { [k: string]: string }; + /** * Creates a new Subscription instance using the specified properties. * @param [properties] Properties to set @@ -7642,6 +7781,9 @@ export namespace google { /** StreamingPullRequest maxOutstandingBytes */ maxOutstandingBytes?: (number|Long|string|null); + + /** StreamingPullRequest protocolVersion */ + protocolVersion?: (number|Long|string|null); } /** Represents a StreamingPullRequest. */ @@ -7677,6 +7819,9 @@ export namespace google { /** StreamingPullRequest maxOutstandingBytes. */ public maxOutstandingBytes: (number|Long|string); + /** StreamingPullRequest protocolVersion. */ + public protocolVersion: (number|Long|string); + /** * Creates a new StreamingPullRequest instance using the specified properties. * @param [properties] Properties to set @@ -8211,6 +8356,9 @@ export namespace google { /** CreateSnapshotRequest labels */ labels?: ({ [k: string]: string }|null); + + /** CreateSnapshotRequest tags */ + tags?: ({ [k: string]: string }|null); } /** Represents a CreateSnapshotRequest. */ @@ -8231,6 +8379,9 @@ export namespace google { /** CreateSnapshotRequest labels. */ public labels: { [k: string]: string }; + /** CreateSnapshotRequest tags. */ + public tags: { [k: string]: string }; + /** * Creates a new CreateSnapshotRequest instance using the specified properties. * @param [properties] Properties to set diff --git a/handwritten/pubsub/protos/protos.js b/handwritten/pubsub/protos/protos.js index a3fdcc20c94..319bc79955f 100644 --- a/handwritten/pubsub/protos/protos.js +++ b/handwritten/pubsub/protos/protos.js @@ -5122,6 +5122,183 @@ return SchemaViolationReason; })(); + IngestionFailureEvent.MessageTransformationFailureReason = (function() { + + /** + * Properties of a MessageTransformationFailureReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @interface IMessageTransformationFailureReason + */ + + /** + * Constructs a new MessageTransformationFailureReason. + * @memberof google.pubsub.v1.IngestionFailureEvent + * @classdesc Represents a MessageTransformationFailureReason. + * @implements IMessageTransformationFailureReason + * @constructor + * @param {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason=} [properties] Properties to set + */ + function MessageTransformationFailureReason(properties) { + if (properties) + for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) + if (properties[keys[i]] != null) + this[keys[i]] = properties[keys[i]]; + } + + /** + * Creates a new MessageTransformationFailureReason instance using the specified properties. + * @function create + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason=} [properties] Properties to set + * @returns {google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason} MessageTransformationFailureReason instance + */ + MessageTransformationFailureReason.create = function create(properties) { + return new MessageTransformationFailureReason(properties); + }; + + /** + * Encodes the specified MessageTransformationFailureReason message. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify|verify} messages. + * @function encode + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason} message MessageTransformationFailureReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageTransformationFailureReason.encode = function encode(message, writer) { + if (!writer) + writer = $Writer.create(); + return writer; + }; + + /** + * Encodes the specified MessageTransformationFailureReason message, length delimited. Does not implicitly {@link google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify|verify} messages. + * @function encodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason} message MessageTransformationFailureReason message or plain object to encode + * @param {$protobuf.Writer} [writer] Writer to encode to + * @returns {$protobuf.Writer} Writer + */ + MessageTransformationFailureReason.encodeDelimited = function encodeDelimited(message, writer) { + return this.encode(message, writer).ldelim(); + }; + + /** + * Decodes a MessageTransformationFailureReason message from the specified reader or buffer. + * @function decode + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @param {number} [length] Message length if known beforehand + * @returns {google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason} MessageTransformationFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageTransformationFailureReason.decode = function decode(reader, length, error) { + if (!(reader instanceof $Reader)) + reader = $Reader.create(reader); + var end = length === undefined ? reader.len : reader.pos + length, message = new $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason(); + while (reader.pos < end) { + var tag = reader.uint32(); + if (tag === error) + break; + switch (tag >>> 3) { + default: + reader.skipType(tag & 7); + break; + } + } + return message; + }; + + /** + * Decodes a MessageTransformationFailureReason message from the specified reader or buffer, length delimited. + * @function decodeDelimited + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from + * @returns {google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason} MessageTransformationFailureReason + * @throws {Error} If the payload is not a reader or valid buffer + * @throws {$protobuf.util.ProtocolError} If required fields are missing + */ + MessageTransformationFailureReason.decodeDelimited = function decodeDelimited(reader) { + if (!(reader instanceof $Reader)) + reader = new $Reader(reader); + return this.decode(reader, reader.uint32()); + }; + + /** + * Verifies a MessageTransformationFailureReason message. + * @function verify + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {Object.} message Plain object to verify + * @returns {string|null} `null` if valid, otherwise the reason why it is not + */ + MessageTransformationFailureReason.verify = function verify(message) { + if (typeof message !== "object" || message === null) + return "object expected"; + return null; + }; + + /** + * Creates a MessageTransformationFailureReason message from a plain object. Also converts values to their respective internal types. + * @function fromObject + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {Object.} object Plain object + * @returns {google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason} MessageTransformationFailureReason + */ + MessageTransformationFailureReason.fromObject = function fromObject(object) { + if (object instanceof $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason) + return object; + return new $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason(); + }; + + /** + * Creates a plain object from a MessageTransformationFailureReason message. Also converts values to other types if specified. + * @function toObject + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason} message MessageTransformationFailureReason + * @param {$protobuf.IConversionOptions} [options] Conversion options + * @returns {Object.} Plain object + */ + MessageTransformationFailureReason.toObject = function toObject() { + return {}; + }; + + /** + * Converts this MessageTransformationFailureReason to JSON. + * @function toJSON + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @instance + * @returns {Object.} JSON object + */ + MessageTransformationFailureReason.prototype.toJSON = function toJSON() { + return this.constructor.toObject(this, $protobuf.util.toJSONOptions); + }; + + /** + * Gets the default type url for MessageTransformationFailureReason + * @function getTypeUrl + * @memberof google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason + * @static + * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com") + * @returns {string} The default type url + */ + MessageTransformationFailureReason.getTypeUrl = function getTypeUrl(typeUrlPrefix) { + if (typeUrlPrefix === undefined) { + typeUrlPrefix = "type.googleapis.com"; + } + return typeUrlPrefix + "/google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason"; + }; + + return MessageTransformationFailureReason; + })(); + IngestionFailureEvent.CloudStorageFailure = (function() { /** @@ -5134,6 +5311,7 @@ * @property {google.pubsub.v1.IngestionFailureEvent.IAvroFailureReason|null} [avroFailureReason] CloudStorageFailure avroFailureReason * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] CloudStorageFailure apiViolationReason * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] CloudStorageFailure schemaViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null} [messageTransformationFailureReason] CloudStorageFailure messageTransformationFailureReason */ /** @@ -5199,17 +5377,25 @@ */ CloudStorageFailure.prototype.schemaViolationReason = null; + /** + * CloudStorageFailure messageTransformationFailureReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null|undefined} messageTransformationFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure + * @instance + */ + CloudStorageFailure.prototype.messageTransformationFailureReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * CloudStorageFailure reason. - * @member {"avroFailureReason"|"apiViolationReason"|"schemaViolationReason"|undefined} reason + * @member {"avroFailureReason"|"apiViolationReason"|"schemaViolationReason"|"messageTransformationFailureReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure * @instance */ Object.defineProperty(CloudStorageFailure.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["avroFailureReason", "apiViolationReason", "schemaViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["avroFailureReason", "apiViolationReason", "schemaViolationReason", "messageTransformationFailureReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -5249,6 +5435,8 @@ $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); + if (message.messageTransformationFailureReason != null && Object.hasOwnProperty.call(message, "messageTransformationFailureReason")) + $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.encode(message.messageTransformationFailureReason, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); return writer; }; @@ -5309,6 +5497,10 @@ message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); break; } + case 8: { + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -5382,6 +5574,16 @@ return "schemaViolationReason." + error; } } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify(message.messageTransformationFailureReason); + if (error) + return "messageTransformationFailureReason." + error; + } + } return null; }; @@ -5425,6 +5627,11 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.schemaViolationReason: object expected"); message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); } + if (object.messageTransformationFailureReason != null) { + if (typeof object.messageTransformationFailureReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.CloudStorageFailure.messageTransformationFailureReason: object expected"); + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.fromObject(object.messageTransformationFailureReason); + } return message; }; @@ -5474,6 +5681,11 @@ if (options.oneofs) object.reason = "schemaViolationReason"; } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + object.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.toObject(message.messageTransformationFailureReason, options); + if (options.oneofs) + object.reason = "messageTransformationFailureReason"; + } return object; }; @@ -5518,6 +5730,7 @@ * @property {number|Long|null} [offset] AwsMskFailureReason offset * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] AwsMskFailureReason apiViolationReason * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] AwsMskFailureReason schemaViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null} [messageTransformationFailureReason] AwsMskFailureReason messageTransformationFailureReason */ /** @@ -5583,17 +5796,25 @@ */ AwsMskFailureReason.prototype.schemaViolationReason = null; + /** + * AwsMskFailureReason messageTransformationFailureReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null|undefined} messageTransformationFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason + * @instance + */ + AwsMskFailureReason.prototype.messageTransformationFailureReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * AwsMskFailureReason reason. - * @member {"apiViolationReason"|"schemaViolationReason"|undefined} reason + * @member {"apiViolationReason"|"schemaViolationReason"|"messageTransformationFailureReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason * @instance */ Object.defineProperty(AwsMskFailureReason.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason", "messageTransformationFailureReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -5633,6 +5854,8 @@ $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.messageTransformationFailureReason != null && Object.hasOwnProperty.call(message, "messageTransformationFailureReason")) + $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.encode(message.messageTransformationFailureReason, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); return writer; }; @@ -5693,6 +5916,10 @@ message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); break; } + case 7: { + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -5759,6 +5986,16 @@ return "schemaViolationReason." + error; } } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify(message.messageTransformationFailureReason); + if (error) + return "messageTransformationFailureReason." + error; + } + } return null; }; @@ -5806,6 +6043,11 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.schemaViolationReason: object expected"); message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); } + if (object.messageTransformationFailureReason != null) { + if (typeof object.messageTransformationFailureReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsMskFailureReason.messageTransformationFailureReason: object expected"); + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.fromObject(object.messageTransformationFailureReason); + } return message; }; @@ -5860,6 +6102,11 @@ if (options.oneofs) object.reason = "schemaViolationReason"; } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + object.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.toObject(message.messageTransformationFailureReason, options); + if (options.oneofs) + object.reason = "messageTransformationFailureReason"; + } return object; }; @@ -5904,6 +6151,7 @@ * @property {number|Long|null} [offset] AzureEventHubsFailureReason offset * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] AzureEventHubsFailureReason apiViolationReason * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] AzureEventHubsFailureReason schemaViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null} [messageTransformationFailureReason] AzureEventHubsFailureReason messageTransformationFailureReason */ /** @@ -5969,17 +6217,25 @@ */ AzureEventHubsFailureReason.prototype.schemaViolationReason = null; + /** + * AzureEventHubsFailureReason messageTransformationFailureReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null|undefined} messageTransformationFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason + * @instance + */ + AzureEventHubsFailureReason.prototype.messageTransformationFailureReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * AzureEventHubsFailureReason reason. - * @member {"apiViolationReason"|"schemaViolationReason"|undefined} reason + * @member {"apiViolationReason"|"schemaViolationReason"|"messageTransformationFailureReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason * @instance */ Object.defineProperty(AzureEventHubsFailureReason.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason", "messageTransformationFailureReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -6019,6 +6275,8 @@ $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.messageTransformationFailureReason != null && Object.hasOwnProperty.call(message, "messageTransformationFailureReason")) + $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.encode(message.messageTransformationFailureReason, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); return writer; }; @@ -6079,6 +6337,10 @@ message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); break; } + case 7: { + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -6145,6 +6407,16 @@ return "schemaViolationReason." + error; } } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify(message.messageTransformationFailureReason); + if (error) + return "messageTransformationFailureReason." + error; + } + } return null; }; @@ -6192,6 +6464,11 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.schemaViolationReason: object expected"); message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); } + if (object.messageTransformationFailureReason != null) { + if (typeof object.messageTransformationFailureReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AzureEventHubsFailureReason.messageTransformationFailureReason: object expected"); + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.fromObject(object.messageTransformationFailureReason); + } return message; }; @@ -6246,6 +6523,11 @@ if (options.oneofs) object.reason = "schemaViolationReason"; } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + object.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.toObject(message.messageTransformationFailureReason, options); + if (options.oneofs) + object.reason = "messageTransformationFailureReason"; + } return object; }; @@ -6290,6 +6572,7 @@ * @property {number|Long|null} [offset] ConfluentCloudFailureReason offset * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] ConfluentCloudFailureReason apiViolationReason * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] ConfluentCloudFailureReason schemaViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null} [messageTransformationFailureReason] ConfluentCloudFailureReason messageTransformationFailureReason */ /** @@ -6355,17 +6638,25 @@ */ ConfluentCloudFailureReason.prototype.schemaViolationReason = null; + /** + * ConfluentCloudFailureReason messageTransformationFailureReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null|undefined} messageTransformationFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason + * @instance + */ + ConfluentCloudFailureReason.prototype.messageTransformationFailureReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * ConfluentCloudFailureReason reason. - * @member {"apiViolationReason"|"schemaViolationReason"|undefined} reason + * @member {"apiViolationReason"|"schemaViolationReason"|"messageTransformationFailureReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason * @instance */ Object.defineProperty(ConfluentCloudFailureReason.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["apiViolationReason", "schemaViolationReason", "messageTransformationFailureReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -6405,6 +6696,8 @@ $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); + if (message.messageTransformationFailureReason != null && Object.hasOwnProperty.call(message, "messageTransformationFailureReason")) + $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.encode(message.messageTransformationFailureReason, writer.uint32(/* id 7, wireType 2 =*/58).fork()).ldelim(); return writer; }; @@ -6465,6 +6758,10 @@ message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); break; } + case 7: { + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -6531,6 +6828,16 @@ return "schemaViolationReason." + error; } } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify(message.messageTransformationFailureReason); + if (error) + return "messageTransformationFailureReason." + error; + } + } return null; }; @@ -6578,6 +6885,11 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.schemaViolationReason: object expected"); message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); } + if (object.messageTransformationFailureReason != null) { + if (typeof object.messageTransformationFailureReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.ConfluentCloudFailureReason.messageTransformationFailureReason: object expected"); + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.fromObject(object.messageTransformationFailureReason); + } return message; }; @@ -6632,6 +6944,11 @@ if (options.oneofs) object.reason = "schemaViolationReason"; } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + object.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.toObject(message.messageTransformationFailureReason, options); + if (options.oneofs) + object.reason = "messageTransformationFailureReason"; + } return object; }; @@ -6674,6 +6991,8 @@ * @property {string|null} [partitionKey] AwsKinesisFailureReason partitionKey * @property {string|null} [sequenceNumber] AwsKinesisFailureReason sequenceNumber * @property {google.pubsub.v1.IngestionFailureEvent.ISchemaViolationReason|null} [schemaViolationReason] AwsKinesisFailureReason schemaViolationReason + * @property {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null} [messageTransformationFailureReason] AwsKinesisFailureReason messageTransformationFailureReason + * @property {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null} [apiViolationReason] AwsKinesisFailureReason apiViolationReason */ /** @@ -6723,17 +7042,33 @@ */ AwsKinesisFailureReason.prototype.schemaViolationReason = null; + /** + * AwsKinesisFailureReason messageTransformationFailureReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IMessageTransformationFailureReason|null|undefined} messageTransformationFailureReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @instance + */ + AwsKinesisFailureReason.prototype.messageTransformationFailureReason = null; + + /** + * AwsKinesisFailureReason apiViolationReason. + * @member {google.pubsub.v1.IngestionFailureEvent.IApiViolationReason|null|undefined} apiViolationReason + * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason + * @instance + */ + AwsKinesisFailureReason.prototype.apiViolationReason = null; + // OneOf field names bound to virtual getters and setters var $oneOfFields; /** * AwsKinesisFailureReason reason. - * @member {"schemaViolationReason"|undefined} reason + * @member {"schemaViolationReason"|"messageTransformationFailureReason"|"apiViolationReason"|undefined} reason * @memberof google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason * @instance */ Object.defineProperty(AwsKinesisFailureReason.prototype, "reason", { - get: $util.oneOfGetter($oneOfFields = ["schemaViolationReason"]), + get: $util.oneOfGetter($oneOfFields = ["schemaViolationReason", "messageTransformationFailureReason", "apiViolationReason"]), set: $util.oneOfSetter($oneOfFields) }); @@ -6769,6 +7104,10 @@ writer.uint32(/* id 3, wireType 2 =*/26).string(message.sequenceNumber); if (message.schemaViolationReason != null && Object.hasOwnProperty.call(message, "schemaViolationReason")) $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.encode(message.schemaViolationReason, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); + if (message.messageTransformationFailureReason != null && Object.hasOwnProperty.call(message, "messageTransformationFailureReason")) + $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.encode(message.messageTransformationFailureReason, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); + if (message.apiViolationReason != null && Object.hasOwnProperty.call(message, "apiViolationReason")) + $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.encode(message.apiViolationReason, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); return writer; }; @@ -6821,6 +7160,14 @@ message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.decode(reader, reader.uint32()); break; } + case 5: { + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.decode(reader, reader.uint32()); + break; + } + case 6: { + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.decode(reader, reader.uint32()); + break; + } default: reader.skipType(tag & 7); break; @@ -6874,6 +7221,26 @@ return "schemaViolationReason." + error; } } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.verify(message.messageTransformationFailureReason); + if (error) + return "messageTransformationFailureReason." + error; + } + } + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + if (properties.reason === 1) + return "reason: multiple values"; + properties.reason = 1; + { + var error = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.verify(message.apiViolationReason); + if (error) + return "apiViolationReason." + error; + } + } return null; }; @@ -6900,6 +7267,16 @@ throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.schemaViolationReason: object expected"); message.schemaViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.SchemaViolationReason.fromObject(object.schemaViolationReason); } + if (object.messageTransformationFailureReason != null) { + if (typeof object.messageTransformationFailureReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.messageTransformationFailureReason: object expected"); + message.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.fromObject(object.messageTransformationFailureReason); + } + if (object.apiViolationReason != null) { + if (typeof object.apiViolationReason !== "object") + throw TypeError(".google.pubsub.v1.IngestionFailureEvent.AwsKinesisFailureReason.apiViolationReason: object expected"); + message.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.fromObject(object.apiViolationReason); + } return message; }; @@ -6932,6 +7309,16 @@ if (options.oneofs) object.reason = "schemaViolationReason"; } + if (message.messageTransformationFailureReason != null && message.hasOwnProperty("messageTransformationFailureReason")) { + object.messageTransformationFailureReason = $root.google.pubsub.v1.IngestionFailureEvent.MessageTransformationFailureReason.toObject(message.messageTransformationFailureReason, options); + if (options.oneofs) + object.reason = "messageTransformationFailureReason"; + } + if (message.apiViolationReason != null && message.hasOwnProperty("apiViolationReason")) { + object.apiViolationReason = $root.google.pubsub.v1.IngestionFailureEvent.ApiViolationReason.toObject(message.apiViolationReason, options); + if (options.oneofs) + object.reason = "apiViolationReason"; + } return object; }; @@ -7489,6 +7876,7 @@ * @property {google.pubsub.v1.Topic.State|null} [state] Topic state * @property {google.pubsub.v1.IIngestionDataSourceSettings|null} [ingestionDataSourceSettings] Topic ingestionDataSourceSettings * @property {Array.|null} [messageTransforms] Topic messageTransforms + * @property {Object.|null} [tags] Topic tags */ /** @@ -7502,6 +7890,7 @@ function Topic(properties) { this.labels = {}; this.messageTransforms = []; + this.tags = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -7588,6 +7977,14 @@ */ Topic.prototype.messageTransforms = $util.emptyArray; + /** + * Topic tags. + * @member {Object.} tags + * @memberof google.pubsub.v1.Topic + * @instance + */ + Topic.prototype.tags = $util.emptyObject; + /** * Creates a new Topic instance using the specified properties. * @function create @@ -7634,6 +8031,9 @@ if (message.messageTransforms != null && message.messageTransforms.length) for (var i = 0; i < message.messageTransforms.length; ++i) $root.google.pubsub.v1.MessageTransform.encode(message.messageTransforms[i], writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim(); + if (message.tags != null && Object.hasOwnProperty.call(message, "tags")) + for (var keys = Object.keys(message.tags), i = 0; i < keys.length; ++i) + writer.uint32(/* id 14, wireType 2 =*/114).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.tags[keys[i]]).ldelim(); return writer; }; @@ -7731,6 +8131,29 @@ message.messageTransforms.push($root.google.pubsub.v1.MessageTransform.decode(reader, reader.uint32())); break; } + case 14: { + if (message.tags === $util.emptyObject) + message.tags = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.tags[key] = value; + break; + } default: reader.skipType(tag & 7); break; @@ -7821,6 +8244,14 @@ return "messageTransforms." + error; } } + if (message.tags != null && message.hasOwnProperty("tags")) { + if (!$util.isObject(message.tags)) + return "tags: object expected"; + var key = Object.keys(message.tags); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.tags[key[i]])) + return "tags: string{k:string} expected"; + } return null; }; @@ -7899,6 +8330,13 @@ message.messageTransforms[i] = $root.google.pubsub.v1.MessageTransform.fromObject(object.messageTransforms[i]); } } + if (object.tags) { + if (typeof object.tags !== "object") + throw TypeError(".google.pubsub.v1.Topic.tags: object expected"); + message.tags = {}; + for (var keys = Object.keys(object.tags), i = 0; i < keys.length; ++i) + message.tags[keys[i]] = String(object.tags[keys[i]]); + } return message; }; @@ -7917,8 +8355,10 @@ var object = {}; if (options.arrays || options.defaults) object.messageTransforms = []; - if (options.objects || options.defaults) + if (options.objects || options.defaults) { object.labels = {}; + object.tags = {}; + } if (options.defaults) { object.name = ""; object.messageStoragePolicy = null; @@ -7956,6 +8396,11 @@ for (var j = 0; j < message.messageTransforms.length; ++j) object.messageTransforms[j] = $root.google.pubsub.v1.MessageTransform.toObject(message.messageTransforms[j], options); } + if (message.tags && (keys2 = Object.keys(message.tags)).length) { + object.tags = {}; + for (var j = 0; j < keys2.length; ++j) + object.tags[keys2[j]] = message.tags[keys2[j]]; + } return object; }; @@ -11939,6 +12384,7 @@ * @property {google.pubsub.v1.Subscription.State|null} [state] Subscription state * @property {google.pubsub.v1.Subscription.IAnalyticsHubSubscriptionInfo|null} [analyticsHubSubscriptionInfo] Subscription analyticsHubSubscriptionInfo * @property {Array.|null} [messageTransforms] Subscription messageTransforms + * @property {Object.|null} [tags] Subscription tags */ /** @@ -11952,6 +12398,7 @@ function Subscription(properties) { this.labels = {}; this.messageTransforms = []; + this.tags = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -12118,6 +12565,14 @@ */ Subscription.prototype.messageTransforms = $util.emptyArray; + /** + * Subscription tags. + * @member {Object.} tags + * @memberof google.pubsub.v1.Subscription + * @instance + */ + Subscription.prototype.tags = $util.emptyObject; + /** * Creates a new Subscription instance using the specified properties. * @function create @@ -12184,6 +12639,9 @@ if (message.messageTransforms != null && message.messageTransforms.length) for (var i = 0; i < message.messageTransforms.length; ++i) $root.google.pubsub.v1.MessageTransform.encode(message.messageTransforms[i], writer.uint32(/* id 25, wireType 2 =*/202).fork()).ldelim(); + if (message.tags != null && Object.hasOwnProperty.call(message, "tags")) + for (var keys = Object.keys(message.tags), i = 0; i < keys.length; ++i) + writer.uint32(/* id 26, wireType 2 =*/210).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.tags[keys[i]]).ldelim(); return writer; }; @@ -12321,6 +12779,29 @@ message.messageTransforms.push($root.google.pubsub.v1.MessageTransform.decode(reader, reader.uint32())); break; } + case 26: { + if (message.tags === $util.emptyObject) + message.tags = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.tags[key] = value; + break; + } default: reader.skipType(tag & 7); break; @@ -12451,6 +12932,14 @@ return "messageTransforms." + error; } } + if (message.tags != null && message.hasOwnProperty("tags")) { + if (!$util.isObject(message.tags)) + return "tags: object expected"; + var key = Object.keys(message.tags); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.tags[key[i]])) + return "tags: string{k:string} expected"; + } return null; }; @@ -12564,6 +13053,13 @@ message.messageTransforms[i] = $root.google.pubsub.v1.MessageTransform.fromObject(object.messageTransforms[i]); } } + if (object.tags) { + if (typeof object.tags !== "object") + throw TypeError(".google.pubsub.v1.Subscription.tags: object expected"); + message.tags = {}; + for (var keys = Object.keys(object.tags), i = 0; i < keys.length; ++i) + message.tags[keys[i]] = String(object.tags[keys[i]]); + } return message; }; @@ -12582,8 +13078,10 @@ var object = {}; if (options.arrays || options.defaults) object.messageTransforms = []; - if (options.objects || options.defaults) + if (options.objects || options.defaults) { object.labels = {}; + object.tags = {}; + } if (options.defaults) { object.name = ""; object.topic = ""; @@ -12651,6 +13149,11 @@ for (var j = 0; j < message.messageTransforms.length; ++j) object.messageTransforms[j] = $root.google.pubsub.v1.MessageTransform.toObject(message.messageTransforms[j], options); } + if (message.tags && (keys2 = Object.keys(message.tags)).length) { + object.tags = {}; + for (var j = 0; j < keys2.length; ++j) + object.tags[keys2[j]] = message.tags[keys2[j]]; + } return object; }; @@ -18634,6 +19137,7 @@ * @property {string|null} [clientId] StreamingPullRequest clientId * @property {number|Long|null} [maxOutstandingMessages] StreamingPullRequest maxOutstandingMessages * @property {number|Long|null} [maxOutstandingBytes] StreamingPullRequest maxOutstandingBytes + * @property {number|Long|null} [protocolVersion] StreamingPullRequest protocolVersion */ /** @@ -18718,6 +19222,14 @@ */ StreamingPullRequest.prototype.maxOutstandingBytes = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + /** + * StreamingPullRequest protocolVersion. + * @member {number|Long} protocolVersion + * @memberof google.pubsub.v1.StreamingPullRequest + * @instance + */ + StreamingPullRequest.prototype.protocolVersion = $util.Long ? $util.Long.fromBits(0,0,false) : 0; + /** * Creates a new StreamingPullRequest instance using the specified properties. * @function create @@ -18764,6 +19276,8 @@ writer.uint32(/* id 7, wireType 0 =*/56).int64(message.maxOutstandingMessages); if (message.maxOutstandingBytes != null && Object.hasOwnProperty.call(message, "maxOutstandingBytes")) writer.uint32(/* id 8, wireType 0 =*/64).int64(message.maxOutstandingBytes); + if (message.protocolVersion != null && Object.hasOwnProperty.call(message, "protocolVersion")) + writer.uint32(/* id 10, wireType 0 =*/80).int64(message.protocolVersion); return writer; }; @@ -18843,6 +19357,10 @@ message.maxOutstandingBytes = reader.int64(); break; } + case 10: { + message.protocolVersion = reader.int64(); + break; + } default: reader.skipType(tag & 7); break; @@ -18914,6 +19432,9 @@ if (message.maxOutstandingBytes != null && message.hasOwnProperty("maxOutstandingBytes")) if (!$util.isInteger(message.maxOutstandingBytes) && !(message.maxOutstandingBytes && $util.isInteger(message.maxOutstandingBytes.low) && $util.isInteger(message.maxOutstandingBytes.high))) return "maxOutstandingBytes: integer|Long expected"; + if (message.protocolVersion != null && message.hasOwnProperty("protocolVersion")) + if (!$util.isInteger(message.protocolVersion) && !(message.protocolVersion && $util.isInteger(message.protocolVersion.low) && $util.isInteger(message.protocolVersion.high))) + return "protocolVersion: integer|Long expected"; return null; }; @@ -18974,6 +19495,15 @@ message.maxOutstandingBytes = object.maxOutstandingBytes; else if (typeof object.maxOutstandingBytes === "object") message.maxOutstandingBytes = new $util.LongBits(object.maxOutstandingBytes.low >>> 0, object.maxOutstandingBytes.high >>> 0).toNumber(); + if (object.protocolVersion != null) + if ($util.Long) + (message.protocolVersion = $util.Long.fromValue(object.protocolVersion)).unsigned = false; + else if (typeof object.protocolVersion === "string") + message.protocolVersion = parseInt(object.protocolVersion, 10); + else if (typeof object.protocolVersion === "number") + message.protocolVersion = object.protocolVersion; + else if (typeof object.protocolVersion === "object") + message.protocolVersion = new $util.LongBits(object.protocolVersion.low >>> 0, object.protocolVersion.high >>> 0).toNumber(); return message; }; @@ -19009,6 +19539,11 @@ object.maxOutstandingBytes = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; } else object.maxOutstandingBytes = options.longs === String ? "0" : 0; + if ($util.Long) { + var long = new $util.Long(0, 0, false); + object.protocolVersion = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long; + } else + object.protocolVersion = options.longs === String ? "0" : 0; } if (message.subscription != null && message.hasOwnProperty("subscription")) object.subscription = message.subscription; @@ -19041,6 +19576,11 @@ object.maxOutstandingBytes = options.longs === String ? String(message.maxOutstandingBytes) : message.maxOutstandingBytes; else object.maxOutstandingBytes = options.longs === String ? $util.Long.prototype.toString.call(message.maxOutstandingBytes) : options.longs === Number ? new $util.LongBits(message.maxOutstandingBytes.low >>> 0, message.maxOutstandingBytes.high >>> 0).toNumber() : message.maxOutstandingBytes; + if (message.protocolVersion != null && message.hasOwnProperty("protocolVersion")) + if (typeof message.protocolVersion === "number") + object.protocolVersion = options.longs === String ? String(message.protocolVersion) : message.protocolVersion; + else + object.protocolVersion = options.longs === String ? $util.Long.prototype.toString.call(message.protocolVersion) : options.longs === Number ? new $util.LongBits(message.protocolVersion.low >>> 0, message.protocolVersion.high >>> 0).toNumber() : message.protocolVersion; return object; }; @@ -20262,6 +20802,7 @@ * @property {string|null} [name] CreateSnapshotRequest name * @property {string|null} [subscription] CreateSnapshotRequest subscription * @property {Object.|null} [labels] CreateSnapshotRequest labels + * @property {Object.|null} [tags] CreateSnapshotRequest tags */ /** @@ -20274,6 +20815,7 @@ */ function CreateSnapshotRequest(properties) { this.labels = {}; + this.tags = {}; if (properties) for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) @@ -20304,6 +20846,14 @@ */ CreateSnapshotRequest.prototype.labels = $util.emptyObject; + /** + * CreateSnapshotRequest tags. + * @member {Object.} tags + * @memberof google.pubsub.v1.CreateSnapshotRequest + * @instance + */ + CreateSnapshotRequest.prototype.tags = $util.emptyObject; + /** * Creates a new CreateSnapshotRequest instance using the specified properties. * @function create @@ -20335,6 +20885,9 @@ if (message.labels != null && Object.hasOwnProperty.call(message, "labels")) for (var keys = Object.keys(message.labels), i = 0; i < keys.length; ++i) writer.uint32(/* id 3, wireType 2 =*/26).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.labels[keys[i]]).ldelim(); + if (message.tags != null && Object.hasOwnProperty.call(message, "tags")) + for (var keys = Object.keys(message.tags), i = 0; i < keys.length; ++i) + writer.uint32(/* id 4, wireType 2 =*/34).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.tags[keys[i]]).ldelim(); return writer; }; @@ -20402,6 +20955,29 @@ message.labels[key] = value; break; } + case 4: { + if (message.tags === $util.emptyObject) + message.tags = {}; + var end2 = reader.uint32() + reader.pos; + key = ""; + value = ""; + while (reader.pos < end2) { + var tag2 = reader.uint32(); + switch (tag2 >>> 3) { + case 1: + key = reader.string(); + break; + case 2: + value = reader.string(); + break; + default: + reader.skipType(tag2 & 7); + break; + } + } + message.tags[key] = value; + break; + } default: reader.skipType(tag & 7); break; @@ -20451,6 +21027,14 @@ if (!$util.isString(message.labels[key[i]])) return "labels: string{k:string} expected"; } + if (message.tags != null && message.hasOwnProperty("tags")) { + if (!$util.isObject(message.tags)) + return "tags: object expected"; + var key = Object.keys(message.tags); + for (var i = 0; i < key.length; ++i) + if (!$util.isString(message.tags[key[i]])) + return "tags: string{k:string} expected"; + } return null; }; @@ -20477,6 +21061,13 @@ for (var keys = Object.keys(object.labels), i = 0; i < keys.length; ++i) message.labels[keys[i]] = String(object.labels[keys[i]]); } + if (object.tags) { + if (typeof object.tags !== "object") + throw TypeError(".google.pubsub.v1.CreateSnapshotRequest.tags: object expected"); + message.tags = {}; + for (var keys = Object.keys(object.tags), i = 0; i < keys.length; ++i) + message.tags[keys[i]] = String(object.tags[keys[i]]); + } return message; }; @@ -20493,8 +21084,10 @@ if (!options) options = {}; var object = {}; - if (options.objects || options.defaults) + if (options.objects || options.defaults) { object.labels = {}; + object.tags = {}; + } if (options.defaults) { object.name = ""; object.subscription = ""; @@ -20509,6 +21102,11 @@ for (var j = 0; j < keys2.length; ++j) object.labels[keys2[j]] = message.labels[keys2[j]]; } + if (message.tags && (keys2 = Object.keys(message.tags)).length) { + object.tags = {}; + for (var j = 0; j < keys2.length; ++j) + object.tags[keys2[j]] = message.tags[keys2[j]]; + } return object; }; diff --git a/handwritten/pubsub/protos/protos.json b/handwritten/pubsub/protos/protos.json index 696cfafed4d..ff48d61d449 100644 --- a/handwritten/pubsub/protos/protos.json +++ b/handwritten/pubsub/protos/protos.json @@ -12,7 +12,9 @@ "java_outer_classname": "SchemaProto", "java_package": "com.google.pubsub.v1", "php_namespace": "Google\\Cloud\\PubSub\\V1", - "ruby_package": "Google::Cloud::PubSub::V1" + "ruby_package": "Google::Cloud::PubSub::V1", + "(google.api.resource_definition).type": "analyticshub.googleapis.com/Listing", + "(google.api.resource_definition).pattern": "projects/{project}/locations/{location}/dataExchanges/{data_exchange}/listings/{listing}" }, "nested": { "Publisher": { @@ -540,7 +542,8 @@ "type": "string", "id": 3, "options": { - "(google.api.field_behavior)": "REQUIRED" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" } }, "awsRoleArn": { @@ -672,7 +675,8 @@ "type": "string", "id": 1, "options": { - "(google.api.field_behavior)": "REQUIRED" + "(google.api.field_behavior)": "REQUIRED", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" } }, "errorMessage": { @@ -728,13 +732,17 @@ "SchemaViolationReason": { "fields": {} }, + "MessageTransformationFailureReason": { + "fields": {} + }, "CloudStorageFailure": { "oneofs": { "reason": { "oneof": [ "avroFailureReason", "apiViolationReason", - "schemaViolationReason" + "schemaViolationReason", + "messageTransformationFailureReason" ] } }, @@ -780,6 +788,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "messageTransformationFailureReason": { + "type": "MessageTransformationFailureReason", + "id": 8, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -788,7 +803,8 @@ "reason": { "oneof": [ "apiViolationReason", - "schemaViolationReason" + "schemaViolationReason", + "messageTransformationFailureReason" ] } }, @@ -834,6 +850,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "messageTransformationFailureReason": { + "type": "MessageTransformationFailureReason", + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -842,7 +865,8 @@ "reason": { "oneof": [ "apiViolationReason", - "schemaViolationReason" + "schemaViolationReason", + "messageTransformationFailureReason" ] } }, @@ -888,6 +912,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "messageTransformationFailureReason": { + "type": "MessageTransformationFailureReason", + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -896,7 +927,8 @@ "reason": { "oneof": [ "apiViolationReason", - "schemaViolationReason" + "schemaViolationReason", + "messageTransformationFailureReason" ] } }, @@ -942,6 +974,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "messageTransformationFailureReason": { + "type": "MessageTransformationFailureReason", + "id": 7, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -949,7 +988,9 @@ "oneofs": { "reason": { "oneof": [ - "schemaViolationReason" + "schemaViolationReason", + "messageTransformationFailureReason", + "apiViolationReason" ] } }, @@ -981,6 +1022,20 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "messageTransformationFailureReason": { + "type": "MessageTransformationFailureReason", + "id": 5, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } + }, + "apiViolationReason": { + "type": "ApiViolationReason", + "id": 6, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } } @@ -1071,7 +1126,8 @@ "type": "string", "id": 5, "options": { - "(google.api.field_behavior)": "OPTIONAL" + "(google.api.field_behavior)": "OPTIONAL", + "(google.api.resource_reference).type": "cloudkms.googleapis.com/CryptoKey" } }, "schemaSettings": { @@ -1116,6 +1172,14 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "tags": { + "keyType": "string", + "type": "string", + "id": 14, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -1348,7 +1412,8 @@ "type": "string", "id": 1, "options": { - "(google.api.field_behavior)": "OPTIONAL" + "(google.api.field_behavior)": "OPTIONAL", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Snapshot" } }, "nextPageToken": { @@ -1838,6 +1903,14 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "tags": { + "keyType": "string", + "type": "string", + "id": 26, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } }, "nested": { @@ -1854,7 +1927,8 @@ "type": "string", "id": 1, "options": { - "(google.api.field_behavior)": "OPTIONAL" + "(google.api.field_behavior)": "OPTIONAL", + "(google.api.resource_reference).type": "analyticshub.googleapis.com/Listing" } }, "subscription": { @@ -1892,7 +1966,8 @@ "type": "string", "id": 1, "options": { - "(google.api.field_behavior)": "OPTIONAL" + "(google.api.field_behavior)": "OPTIONAL", + "(google.api.resource_reference).type": "pubsub.googleapis.com/Topic" } }, "maxDeliveryAttempts": { @@ -2467,6 +2542,13 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "protocolVersion": { + "type": "int64", + "id": 10, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, @@ -2612,6 +2694,14 @@ "options": { "(google.api.field_behavior)": "OPTIONAL" } + }, + "tags": { + "keyType": "string", + "type": "string", + "id": 4, + "options": { + "(google.api.field_behavior)": "OPTIONAL" + } } } }, From aac55b09d6d95dad57337d32fb126675f9114564 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 19 Feb 2026 15:49:20 -0500 Subject: [PATCH 1104/1115] chore(main): release 5.3.0 (#2136) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- handwritten/pubsub/CHANGELOG.md | 7 +++++++ handwritten/pubsub/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/handwritten/pubsub/CHANGELOG.md b/handwritten/pubsub/CHANGELOG.md index c9326eef6e9..55636e53161 100644 --- a/handwritten/pubsub/CHANGELOG.md +++ b/handwritten/pubsub/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions +## [5.3.0](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.4...v5.3.0) (2026-02-19) + + +### Features + +* Manual proto pushing ([#2134](https://github.com/googleapis/nodejs-pubsub/issues/2134)) ([2f1e8d1](https://github.com/googleapis/nodejs-pubsub/commit/2f1e8d198ffbc14795f9f0d0a88095d69ac437a3)) + ## [5.2.4](https://github.com/googleapis/nodejs-pubsub/compare/v5.2.3...v5.2.4) (2026-02-11) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index fe7cfbf0133..a911af2ca14 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/pubsub", "description": "Cloud Pub/Sub Client Library for Node.js", - "version": "5.2.4", + "version": "5.3.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { From 5a5606f10544544f3c59b50242d71521708b08b5 Mon Sep 17 00:00:00 2001 From: feywind <57276408+feywind@users.noreply.github.com> Date: Thu, 19 Feb 2026 15:50:48 -0500 Subject: [PATCH 1105/1115] build: don't copy in the new .owlbot.yaml (#2137) --- handwritten/pubsub/owlbot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 0aa5dc0f45d..48f565af0a6 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -22,5 +22,6 @@ '.github/header-checker-lint.yaml', '.github/workflows/ci.yaml', '.eslintignore', + '.OwlBot.yaml', 'renovate.json' ]) From 19d8e4ac782ac4a7697e719eebb0d25469dc4476 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 20 Feb 2026 15:48:39 -0500 Subject: [PATCH 1106/1115] chore: replace old teams with cloud-sdk-nodejs-team and pubsub-team (#2138) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: replace old teams with cloud-sdk-nodejs-team and pubsub-team * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- handwritten/pubsub/.github/CODEOWNERS | 2 +- handwritten/pubsub/.repo-metadata.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/.github/CODEOWNERS b/handwritten/pubsub/.github/CODEOWNERS index 6b8f272e257..36235cfa5b0 100644 --- a/handwritten/pubsub/.github/CODEOWNERS +++ b/handwritten/pubsub/.github/CODEOWNERS @@ -6,4 +6,4 @@ # Unless specified, the jsteam is the default owner for nodejs repositories. -* @googleapis/api-pubsub @googleapis/cloud-sdk-nodejs-team \ No newline at end of file +* @googleapis/pubsub-team @googleapis/cloud-sdk-nodejs-team @googleapis/cloud-sdk-nodejs-team \ No newline at end of file diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json index 60ccff96491..c22e77a355b 100644 --- a/handwritten/pubsub/.repo-metadata.json +++ b/handwritten/pubsub/.repo-metadata.json @@ -11,7 +11,7 @@ "name": "pubsub", "name_pretty": "Google Cloud Pub/Sub", "api_id": "pubsub.googleapis.com", - "codeowner_team": "@googleapis/api-pubsub", + "codeowner_team": "@googleapis/pubsub-team @googleapis/cloud-sdk-nodejs-team", "api_shortname": "pubsub", "library_type": "GAPIC_COMBO" } From 7f5d2646ececf3e3b7c2e9876e79c7ee262d99f3 Mon Sep 17 00:00:00 2001 From: Gautam Sharda Date: Wed, 11 Mar 2026 22:00:58 +0000 Subject: [PATCH 1107/1115] build: add release-please config, fix owlbot-config --- .github/CODEOWNERS | 2 +- .release-please-manifest.json | 1 + handwritten/pubsub/{.github => }/.OwlBot.yaml | 6 +- handwritten/pubsub/.github/.OwlBot.lock.yaml | 17 --- .../pubsub/.github/.header-checker-lint.yaml | 12 -- handwritten/pubsub/.github/CODEOWNERS | 9 -- .../.github/ISSUE_TEMPLATE/bug_report.yml | 99 ---------------- .../pubsub/.github/ISSUE_TEMPLATE/config.yml | 4 - .../ISSUE_TEMPLATE/documentation_request.yml | 53 --------- .../ISSUE_TEMPLATE/feature_request.yml | 53 --------- .../ISSUE_TEMPLATE/processs_request.md | 4 - .../.github/ISSUE_TEMPLATE/questions.md | 8 -- .../.github/ISSUE_TEMPLATE/support_request.md | 7 -- .../pubsub/.github/PULL_REQUEST_TEMPLATE.md | 9 -- handwritten/pubsub/.github/auto-approve.yml | 2 - handwritten/pubsub/.github/auto-label.yaml | 2 - .../pubsub/.github/generated-files-bot.yml | 16 --- handwritten/pubsub/.github/release-please.yml | 10 -- .../pubsub/.github/release-trigger.yml | 2 - .../.github/scripts/close-invalid-link.cjs | 73 ------------ .../.github/scripts/close-unresponsive.cjs | 69 ----------- .../scripts/fixtures/invalidIssueBody.txt | 50 -------- .../scripts/fixtures/validIssueBody.txt | 50 -------- .../validIssueBodyDifferentLinkLocation.txt | 50 -------- .../pubsub/.github/scripts/package.json | 21 ---- .../.github/scripts/remove-response-label.cjs | 33 ------ .../scripts/tests/close-invalid-link.test.cjs | 86 -------------- .../close-or-remove-response-label.test.cjs | 109 ------------------ .../pubsub/.github/sync-repo-settings.yaml | 19 --- handwritten/pubsub/.kokoro/common.cfg | 4 +- .../.kokoro/continuous/node18/common.cfg | 4 +- .../pubsub/.kokoro/continuous/node18/lint.cfg | 2 +- .../continuous/node18/samples-test.cfg | 2 +- .../.kokoro/continuous/node18/system-test.cfg | 2 +- .../.kokoro/presubmit/node18/common.cfg | 4 +- .../.kokoro/presubmit/node18/samples-test.cfg | 2 +- .../.kokoro/presubmit/node18/system-test.cfg | 2 +- .../pubsub/.kokoro/presubmit/windows/test.cfg | 2 +- .../pubsub/.kokoro/release/docs-devsite.cfg | 4 +- handwritten/pubsub/.kokoro/release/docs.cfg | 4 +- .../pubsub/.kokoro/release/publish.cfg | 4 +- handwritten/pubsub/.kokoro/trampoline_v2.sh | 24 +++- handwritten/pubsub/.repo-metadata.json | 2 +- handwritten/pubsub/.trampolinerc | 2 +- handwritten/pubsub/owlbot.py | 2 +- handwritten/pubsub/package.json | 9 +- release-please-submodules.json | 1 + 47 files changed, 55 insertions(+), 897 deletions(-) rename handwritten/pubsub/{.github => }/.OwlBot.yaml (81%) delete mode 100644 handwritten/pubsub/.github/.OwlBot.lock.yaml delete mode 100644 handwritten/pubsub/.github/.header-checker-lint.yaml delete mode 100644 handwritten/pubsub/.github/CODEOWNERS delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/documentation_request.yml delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.yml delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/questions.md delete mode 100644 handwritten/pubsub/.github/ISSUE_TEMPLATE/support_request.md delete mode 100644 handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 handwritten/pubsub/.github/auto-approve.yml delete mode 100644 handwritten/pubsub/.github/auto-label.yaml delete mode 100644 handwritten/pubsub/.github/generated-files-bot.yml delete mode 100644 handwritten/pubsub/.github/release-please.yml delete mode 100644 handwritten/pubsub/.github/release-trigger.yml delete mode 100644 handwritten/pubsub/.github/scripts/close-invalid-link.cjs delete mode 100644 handwritten/pubsub/.github/scripts/close-unresponsive.cjs delete mode 100644 handwritten/pubsub/.github/scripts/fixtures/invalidIssueBody.txt delete mode 100644 handwritten/pubsub/.github/scripts/fixtures/validIssueBody.txt delete mode 100644 handwritten/pubsub/.github/scripts/fixtures/validIssueBodyDifferentLinkLocation.txt delete mode 100644 handwritten/pubsub/.github/scripts/package.json delete mode 100644 handwritten/pubsub/.github/scripts/remove-response-label.cjs delete mode 100644 handwritten/pubsub/.github/scripts/tests/close-invalid-link.test.cjs delete mode 100644 handwritten/pubsub/.github/scripts/tests/close-or-remove-response-label.test.cjs delete mode 100644 handwritten/pubsub/.github/sync-repo-settings.yaml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5a71bf1805d..1bdf4f3519c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,4 +12,4 @@ /handwritten/storage @googleapis/gcs-team /handwritten/firestore @googleapis/firestore-team /handwritten/spanner @googleapis/spanner-team -/handwritten/bigquery-storage @googleapis/bigquery-team \ No newline at end of file +/handwritten/bigquery-storage @googleapis/bigquery-team/handwritten/pubsub @googleapis/pubsub-team diff --git a/.release-please-manifest.json b/.release-please-manifest.json index a69ab64548c..288d7f7168f 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -9,6 +9,7 @@ "handwritten/logging": "11.2.1", "handwritten/logging-bunyan": "5.1.1", "handwritten/logging-winston": "6.0.1", + "handwritten/pubsub": "5.3.0", "handwritten/spanner": "8.6.0", "handwritten/storage": "7.19.0", "packages/gapic-node-processing": "0.1.7", diff --git a/handwritten/pubsub/.github/.OwlBot.yaml b/handwritten/pubsub/.OwlBot.yaml similarity index 81% rename from handwritten/pubsub/.github/.OwlBot.yaml rename to handwritten/pubsub/.OwlBot.yaml index 5563b4445e9..30b4b11de79 100644 --- a/handwritten/pubsub/.github/.OwlBot.yaml +++ b/handwritten/pubsub/.OwlBot.yaml @@ -11,16 +11,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -docker: - image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest deep-remove-regex: - /owl-bot-staging deep-copy-regex: - - source: /google/pubsub/(v.*)/.*-nodejs/(.*) - dest: /owl-bot-staging/$1/$2 + - source: /google/pubsub/(v.*)/.*-nodejs + dest: /owl-bot-staging/pubsub/$1 begin-after-commit-hash: 94496fa21b40a7f4d0c4881e8ed8b2bf4117e280 diff --git a/handwritten/pubsub/.github/.OwlBot.lock.yaml b/handwritten/pubsub/.github/.OwlBot.lock.yaml deleted file mode 100644 index 1a90daec635..00000000000 --- a/handwritten/pubsub/.github/.OwlBot.lock.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2026 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -docker: - image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:cd5bfcc3d183c1974bca4227785fd397452149bce3785b45a2f735a793ae6241 -# created: 2026-02-12T17:44:25.68637179Z diff --git a/handwritten/pubsub/.github/.header-checker-lint.yaml b/handwritten/pubsub/.github/.header-checker-lint.yaml deleted file mode 100644 index e74512f1cd9..00000000000 --- a/handwritten/pubsub/.github/.header-checker-lint.yaml +++ /dev/null @@ -1,12 +0,0 @@ -allowedCopyrightHolders: - - 'Google LLC' -allowedLicenses: - - 'Apache-2.0' - - 'MIT' - - 'BSD-3' -sourceFileExtensions: - - 'ts' - - 'js' - - 'java' -ignoreFiles: - - 'owl-bot-staging/**' diff --git a/handwritten/pubsub/.github/CODEOWNERS b/handwritten/pubsub/.github/CODEOWNERS deleted file mode 100644 index 36235cfa5b0..00000000000 --- a/handwritten/pubsub/.github/CODEOWNERS +++ /dev/null @@ -1,9 +0,0 @@ -# Code owners file. -# This file controls who is tagged for review for any given pull request. -# -# For syntax help see: -# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax - - -# Unless specified, the jsteam is the default owner for nodejs repositories. -* @googleapis/pubsub-team @googleapis/cloud-sdk-nodejs-team @googleapis/cloud-sdk-nodejs-team \ No newline at end of file diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index 58aa0c973b6..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,99 +0,0 @@ -name: Bug Report -description: Create a report to help us improve -labels: - - bug -body: - - type: markdown - attributes: - value: > - **PLEASE READ**: If you have a support contract with Google, please - create an issue in the [support - console](https://cloud.google.com/support/) instead of filing on GitHub. - This will ensure a timely response. Otherwise, please make sure to - follow the steps below. - - type: checkboxes - attributes: - label: Please make sure you have searched for information in the following - guides. - options: - - label: "Search the issues already opened: - https://github.com/GoogleCloudPlatform/google-cloud-node/issues" - required: true - - label: "Search StackOverflow: - http://stackoverflow.com/questions/tagged/google-cloud-platform+nod\ - e.js" - required: true - - label: "Check our Troubleshooting guide: - https://github.com/googleapis/google-cloud-node/blob/main/docs/trou\ - bleshooting.md" - required: true - - label: "Check our FAQ: - https://github.com/googleapis/google-cloud-node/blob/main/docs/faq.\ - md" - required: true - - label: "Check our libraries HOW-TO: - https://github.com/googleapis/gax-nodejs/blob/main/client-libraries\ - .md" - required: true - - label: "Check out our authentication guide: - https://github.com/googleapis/google-auth-library-nodejs" - required: true - - label: "Check out handwritten samples for many of our APIs: - https://github.com/GoogleCloudPlatform/nodejs-docs-samples" - required: true - - type: textarea - attributes: - label: > - A screenshot that you have tested with "Try this API". - description: > - As our client libraries are mostly autogenerated, we kindly request - that you test whether your issue is with the client library, or with the - API itself. To do so, please search for your API - here: https://developers.google.com/apis-explorer and attempt to - reproduce the issue in the given method. Please include a screenshot of - the response in "Try this API". This response should NOT match the current - behavior you are experiencing. If the behavior is the same, it means - that you are likely experiencing a bug with the API itself. In that - case, please submit an issue to the API team, either by submitting an - issue in its issue tracker (https://cloud.google.com/support/docs/issue-trackers), or by - submitting an issue in its linked tracker in the .repo-metadata.json - file https://issuetracker.google.com/savedsearches/559741 - validations: - required: true - - type: input - attributes: - label: > - Link to the code that reproduces this issue. A link to a **public** Github Repository or gist with a minimal - reproduction. - description: > - **Skipping this or providing an invalid link will result in the issue being closed** - validations: - required: true - - type: textarea - attributes: - label: > - A step-by-step description of how to reproduce the issue, based on - the linked reproduction. - description: > - Screenshots can be provided in the issue body below. - placeholder: | - 1. Start the application in development (next dev) - 2. Click X - 3. Y will happen - validations: - required: true - - type: textarea - attributes: - label: A clear and concise description of what the bug is, and what you - expected to happen. - placeholder: Following the steps from the previous section, I expected A to - happen, but I observed B instead - validations: - required: true - - - type: textarea - attributes: - label: A clear and concise description WHY you expect this behavior, i.e., was it a recent change, there is documentation that points to this behavior, etc. ** - placeholder: 'Documentation here(link) states that B should happen instead of A' - validations: - required: true diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 603b90133b6..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,4 +0,0 @@ -contact_links: - - name: Google Cloud Support - url: https://cloud.google.com/support/ - about: If you have a support contract with Google, please use the Google Cloud Support portal. diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/documentation_request.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/documentation_request.yml deleted file mode 100644 index 1cb5835bd24..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/documentation_request.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Documentation Requests -description: Requests for more information -body: - - type: markdown - attributes: - value: > - Please use this issue type to log documentation requests against the library itself. - These requests should involve documentation on Github (`.md` files), and should relate to the library - itself. If you have questions or documentation requests for an API, please - reach out to the API tracker itself. - - Please submit an issue to the API team, either by submitting an - issue in its issue tracker https://cloud.google.com/support/docs/issue-trackers), or by - submitting an issue in its linked tracker in the .repo-metadata.json - file in the API under packages/* ([example](https://issuetracker.google.com/savedsearches/559741)). - You can also submit a request to documentation on cloud.google.com itself with the "Send Feedback" - on the bottom of the page. - - - Please note that documentation requests and questions for specific APIs - will be closed. - - type: checkboxes - attributes: - label: Please make sure you have searched for information in the following - guides. - options: - - label: "Search the issues already opened: - https://github.com/GoogleCloudPlatform/google-cloud-node/issues" - required: true - - label: "Check our Troubleshooting guide: - https://googlecloudplatform.github.io/google-cloud-node/#/docs/guid\ - es/troubleshooting" - required: true - - label: "Check our FAQ: - https://googlecloudplatform.github.io/google-cloud-node/#/docs/guid\ - es/faq" - required: true - - label: "Check our libraries HOW-TO: - https://github.com/googleapis/gax-nodejs/blob/main/client-libraries\ - .md" - required: true - - label: "Check out our authentication guide: - https://github.com/googleapis/google-auth-library-nodejs" - required: true - - label: "Check out handwritten samples for many of our APIs: - https://github.com/GoogleCloudPlatform/nodejs-docs-samples" - required: true - - type: textarea - attributes: - label: > - Documentation Request - validations: - required: true diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.yml b/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.yml deleted file mode 100644 index 781c70a7087..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/feature_request.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Feature Request -description: Suggest an idea for this library -labels: - - feature request -body: - - type: markdown - attributes: - value: > - **PLEASE READ**: If you have a support contract with Google, please - create an issue in the [support - console](https://cloud.google.com/support/) instead of filing on GitHub. - This will ensure a timely response. Otherwise, please make sure to - follow the steps below. - - type: textarea - attributes: - label: > - A screenshot that you have tested with "Try this API". - description: > - As our client libraries are mostly autogenerated, we kindly request - that you test whether your feature request is with the client library, or with the - API itself. To do so, please search for your API - here: https://developers.google.com/apis-explorer and attempt to - reproduce the issue in the given method. Please include a screenshot of - the response in "Try this API". This response should NOT match the current - behavior you are experiencing. If the behavior is the same, it means - that you are likely requesting a feature for the API itself. In that - case, please submit an issue to the API team, either by submitting an - issue in its issue tracker https://cloud.google.com/support/docs/issue-trackers, or by - submitting an issue in its linked tracker in the .repo-metadata.json - file in the API under packages/* ([example](https://issuetracker.google.com/savedsearches/559741)) - - Example of library specific issues would be: retry strategies, authentication questions, or issues with typings. - Examples of API issues would include: expanding method parameter types, adding functionality to an API. - validations: - required: true - - type: textarea - attributes: - label: > - What would you like to see in the library? - description: > - Screenshots can be provided in the issue body below. - placeholder: | - 1. Set up authentication like so - 2. Run the program like so - 3. X would be nice to happen - - - type: textarea - attributes: - label: Describe alternatives you've considered - - - type: textarea - attributes: - label: Additional context/notes \ No newline at end of file diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md deleted file mode 100644 index 45682e8f117..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/processs_request.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -name: Process Request -about: Submit a process request to the library. Process requests are any requests related to library infrastructure, for example CI/CD, publishing, releasing, broken links. ---- diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/questions.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/questions.md deleted file mode 100644 index 62c1dd1b93a..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/questions.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: Question -about: If you have a question, please use Discussions - ---- - -If you have a general question that goes beyond the library itself, we encourage you to use [Discussions](https://github.com//discussions) -to engage with fellow community members! diff --git a/handwritten/pubsub/.github/ISSUE_TEMPLATE/support_request.md b/handwritten/pubsub/.github/ISSUE_TEMPLATE/support_request.md deleted file mode 100644 index 99586903212..00000000000 --- a/handwritten/pubsub/.github/ISSUE_TEMPLATE/support_request.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -name: Support request -about: If you have a support contract with Google, please create an issue in the Google Cloud Support console. - ---- - -**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. diff --git a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md b/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index a4202654c96..00000000000 --- a/handwritten/pubsub/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,9 +0,0 @@ -Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: -- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/nodejs-pubsub/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea -- [ ] Ensure the tests and linter pass -- [ ] Code coverage does not decrease (if any source code was changed) -- [ ] Appropriate docs were updated (if necessary) - -Fixes # 🦕 - -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/handwritten/pubsub/.github/auto-approve.yml b/handwritten/pubsub/.github/auto-approve.yml deleted file mode 100644 index 7cba0af636c..00000000000 --- a/handwritten/pubsub/.github/auto-approve.yml +++ /dev/null @@ -1,2 +0,0 @@ -processes: - - "NodeDependency" \ No newline at end of file diff --git a/handwritten/pubsub/.github/auto-label.yaml b/handwritten/pubsub/.github/auto-label.yaml deleted file mode 100644 index 09c8d735b45..00000000000 --- a/handwritten/pubsub/.github/auto-label.yaml +++ /dev/null @@ -1,2 +0,0 @@ -requestsize: - enabled: true diff --git a/handwritten/pubsub/.github/generated-files-bot.yml b/handwritten/pubsub/.github/generated-files-bot.yml deleted file mode 100644 index 992ccef4a13..00000000000 --- a/handwritten/pubsub/.github/generated-files-bot.yml +++ /dev/null @@ -1,16 +0,0 @@ -generatedFiles: -- path: '.kokoro/**' - message: '`.kokoro` files are templated and should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' -- path: '.github/CODEOWNERS' - message: 'CODEOWNERS should instead be modified via the `codeowner_team` property in .repo-metadata.json' -- path: '.github/workflows/ci.yaml' - message: '`.github/workflows/ci.yaml` (GitHub Actions) should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' -- path: '.github/generated-files-bot.+(yml|yaml)' - message: '`.github/generated-files-bot.(yml|yaml)` should be updated in [`synthtool`](https://github.com/googleapis/synthtool)' -- path: 'README.md' - message: '`README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/main/.readme-partials.yaml' -- path: 'samples/README.md' - message: '`samples/README.md` is managed by [`synthtool`](https://github.com/googleapis/synthtool). However, a partials file can be used to update the README, e.g.: https://github.com/googleapis/nodejs-storage/blob/main/.readme-partials.yaml' -ignoreAuthors: -- 'gcf-owl-bot[bot]' -- 'yoshi-automation' diff --git a/handwritten/pubsub/.github/release-please.yml b/handwritten/pubsub/.github/release-please.yml deleted file mode 100644 index a0a47157e0e..00000000000 --- a/handwritten/pubsub/.github/release-please.yml +++ /dev/null @@ -1,10 +0,0 @@ -handleGHRelease: true -releaseType: node -branches: -- branch: legacy-v2 - releaseType: node - handleGHRelease: true -- branch: legacy-v3 - releaseType: node - handleGHRelease: true - diff --git a/handwritten/pubsub/.github/release-trigger.yml b/handwritten/pubsub/.github/release-trigger.yml deleted file mode 100644 index 339b88a217b..00000000000 --- a/handwritten/pubsub/.github/release-trigger.yml +++ /dev/null @@ -1,2 +0,0 @@ -enabled: true -multiScmName: nodejs-pubsub \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/close-invalid-link.cjs b/handwritten/pubsub/.github/scripts/close-invalid-link.cjs deleted file mode 100644 index fdb51488197..00000000000 --- a/handwritten/pubsub/.github/scripts/close-invalid-link.cjs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -const fs = require('fs'); -const yaml = require('js-yaml'); -const path = require('path'); -const TEMPLATE_FILE_PATH = path.resolve(__dirname, '../ISSUE_TEMPLATE/bug_report.yml') - -async function closeIssue(github, owner, repo, number) { - await github.rest.issues.createComment({ - owner: owner, - repo: repo, - issue_number: number, - body: "Issue was opened with an invalid reproduction link. Please make sure the repository is a valid, publicly-accessible github repository, and make sure the url is complete (example: https://github.com/googleapis/google-cloud-node)" - }); - await github.rest.issues.update({ - owner: owner, - repo: repo, - issue_number: number, - state: "closed" - }); -} -module.exports = async ({ github, context }) => { - const owner = context.repo.owner; - const repo = context.repo.repo; - const number = context.issue.number; - - const issue = await github.rest.issues.get({ - owner: owner, - repo: repo, - issue_number: number, - }); - - const yamlData = fs.readFileSync(TEMPLATE_FILE_PATH, 'utf8'); - const obj = yaml.load(yamlData); - const linkMatchingText = (obj.body.find(x => {return x.type === 'input' && x.validations.required === true && x.attributes.label.includes('link')})).attributes.label; - const isBugTemplate = issue.data.body.includes(linkMatchingText); - - if (isBugTemplate) { - console.log(`Issue ${number} is a bug template`) - try { - const text = issue.data.body; - const match = text.indexOf(linkMatchingText); - if (match !== -1) { - const nextLineIndex = text.indexOf('http', match); - if (nextLineIndex == -1) { - await closeIssue(github, owner, repo, number); - return; - } - const link = text.substring(nextLineIndex, text.indexOf('\n', nextLineIndex)); - console.log(`Issue ${number} contains this link: ${link}`); - const isValidLink = (await fetch(link)).ok; - console.log(`Issue ${number} has a ${isValidLink ? "valid" : "invalid"} link`) - if (!isValidLink) { - await closeIssue(github, owner, repo, number); - } - } - } catch (err) { - await closeIssue(github, owner, repo, number); - } - } -}; \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/close-unresponsive.cjs b/handwritten/pubsub/.github/scripts/close-unresponsive.cjs deleted file mode 100644 index 6f81b508fa5..00000000000 --- a/handwritten/pubsub/.github/scripts/close-unresponsive.cjs +++ /dev/null @@ -1,69 +0,0 @@ -/// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -function labeledEvent(data) { - return data.event === "labeled" && data.label.name === "needs more info"; -} - -const numberOfDaysLimit = 15; -const close_message = `This has been closed since a request for information has \ -not been answered for ${numberOfDaysLimit} days. It can be reopened when the \ -requested information is provided.`; - -module.exports = async ({ github, context }) => { - const owner = context.repo.owner; - const repo = context.repo.repo; - - const issues = await github.rest.issues.listForRepo({ - owner: owner, - repo: repo, - labels: "needs more info", - }); - const numbers = issues.data.map((e) => e.number); - - for (const number of numbers) { - const events = await github.paginate( - github.rest.issues.listEventsForTimeline, - { - owner: owner, - repo: repo, - issue_number: number, - }, - (response) => response.data.filter(labeledEvent) - ); - - const latest_response_label = events[events.length - 1]; - - const created_at = new Date(latest_response_label.created_at); - const now = new Date(); - const diff = now - created_at; - const diffDays = diff / (1000 * 60 * 60 * 24); - - if (diffDays > numberOfDaysLimit) { - await github.rest.issues.update({ - owner: owner, - repo: repo, - issue_number: number, - state: "closed", - }); - - await github.rest.issues.createComment({ - owner: owner, - repo: repo, - issue_number: number, - body: close_message, - }); - } - } -}; \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/fixtures/invalidIssueBody.txt b/handwritten/pubsub/.github/scripts/fixtures/invalidIssueBody.txt deleted file mode 100644 index 504bd669022..00000000000 --- a/handwritten/pubsub/.github/scripts/fixtures/invalidIssueBody.txt +++ /dev/null @@ -1,50 +0,0 @@ -### Please make sure you have searched for information in the following guides. - -- [X] Search the issues already opened: https://github.com/GoogleCloudPlatform/google-cloud-node/issues -- [X] Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js -- [X] Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting -- [X] Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq -- [X] Check our libraries HOW-TO: https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md -- [X] Check out our authentication guide: https://github.com/googleapis/google-auth-library-nodejs -- [X] Check out handwritten samples for many of our APIs: https://github.com/GoogleCloudPlatform/nodejs-docs-samples - -### A screenshot that you have tested with "Try this API". - - -N/A - -### Link to the code that reproduces this issue. A link to a **public** Github Repository or gist with a minimal reproduction. - -not-a-link - -### A step-by-step description of how to reproduce the issue, based on the linked reproduction. - - -Change MY_PROJECT to your project name, add credentials if needed and run. - -### A clear and concise description of what the bug is, and what you expected to happen. - -The application crashes with the following exception (which there is no way to catch). It should just emit error, and allow graceful handling. -TypeError [ERR_INVALID_ARG_TYPE]: The "chunk" argument must be of type string or an instance of Buffer or Uint8Array. Received an instance of Object - at _write (node:internal/streams/writable:474:13) - at Writable.write (node:internal/streams/writable:502:10) - at Duplexify._write (/project/node_modules/duplexify/index.js:212:22) - at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) - at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) - at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) - at Pumpify. (/project/node_modules/@google-cloud/speech/build/src/helpers.js:79:27) - at Object.onceWrapper (node:events:633:26) - at Pumpify.emit (node:events:518:28) - at obj. [as _write] (/project/node_modules/stubs/index.js:28:22) - at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) - at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) - at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) - at PassThrough.ondata (node:internal/streams/readable:1007:22) - at PassThrough.emit (node:events:518:28) - at addChunk (node:internal/streams/readable:559:12) { - code: 'ERR_INVALID_ARG_TYPE' - - -### A clear and concise description WHY you expect this behavior, i.e., was it a recent change, there is documentation that points to this behavior, etc. ** - -No library should crash an application this way. \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/fixtures/validIssueBody.txt b/handwritten/pubsub/.github/scripts/fixtures/validIssueBody.txt deleted file mode 100644 index 6e0ace338eb..00000000000 --- a/handwritten/pubsub/.github/scripts/fixtures/validIssueBody.txt +++ /dev/null @@ -1,50 +0,0 @@ -### Please make sure you have searched for information in the following guides. - -- [X] Search the issues already opened: https://github.com/GoogleCloudPlatform/google-cloud-node/issues -- [X] Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js -- [X] Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting -- [X] Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq -- [X] Check our libraries HOW-TO: https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md -- [X] Check out our authentication guide: https://github.com/googleapis/google-auth-library-nodejs -- [X] Check out handwritten samples for many of our APIs: https://github.com/GoogleCloudPlatform/nodejs-docs-samples - -### A screenshot that you have tested with "Try this API". - - -N/A - -### Link to the code that reproduces this issue. A link to a **public** Github Repository or gist with a minimal reproduction. - -https://gist.github.com/orgads/13cbf44c91923da27d8772b5f10489c9 - -### A step-by-step description of how to reproduce the issue, based on the linked reproduction. - - -Change MY_PROJECT to your project name, add credentials if needed and run. - -### A clear and concise description of what the bug is, and what you expected to happen. - -The application crashes with the following exception (which there is no way to catch). It should just emit error, and allow graceful handling. -TypeError [ERR_INVALID_ARG_TYPE]: The "chunk" argument must be of type string or an instance of Buffer or Uint8Array. Received an instance of Object - at _write (node:internal/streams/writable:474:13) - at Writable.write (node:internal/streams/writable:502:10) - at Duplexify._write (/project/node_modules/duplexify/index.js:212:22) - at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) - at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) - at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) - at Pumpify. (/project/node_modules/@google-cloud/speech/build/src/helpers.js:79:27) - at Object.onceWrapper (node:events:633:26) - at Pumpify.emit (node:events:518:28) - at obj. [as _write] (/project/node_modules/stubs/index.js:28:22) - at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) - at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) - at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) - at PassThrough.ondata (node:internal/streams/readable:1007:22) - at PassThrough.emit (node:events:518:28) - at addChunk (node:internal/streams/readable:559:12) { - code: 'ERR_INVALID_ARG_TYPE' - - -### A clear and concise description WHY you expect this behavior, i.e., was it a recent change, there is documentation that points to this behavior, etc. ** - -No library should crash an application this way. \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/fixtures/validIssueBodyDifferentLinkLocation.txt b/handwritten/pubsub/.github/scripts/fixtures/validIssueBodyDifferentLinkLocation.txt deleted file mode 100644 index 984a420e376..00000000000 --- a/handwritten/pubsub/.github/scripts/fixtures/validIssueBodyDifferentLinkLocation.txt +++ /dev/null @@ -1,50 +0,0 @@ -### Please make sure you have searched for information in the following guides. - -- [X] Search the issues already opened: https://github.com/GoogleCloudPlatform/google-cloud-node/issues -- [X] Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js -- [X] Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting -- [X] Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq -- [X] Check our libraries HOW-TO: https://github.com/googleapis/gax-nodejs/blob/main/client-libraries.md -- [X] Check out our authentication guide: https://github.com/googleapis/google-auth-library-nodejs -- [X] Check out handwritten samples for many of our APIs: https://github.com/GoogleCloudPlatform/nodejs-docs-samples - -### A screenshot that you have tested with "Try this API". - - -N/A - -### A step-by-step description of how to reproduce the issue, based on the linked reproduction. - - -Change MY_PROJECT to your project name, add credentials if needed and run. - -### A clear and concise description of what the bug is, and what you expected to happen. - -The application crashes with the following exception (which there is no way to catch). It should just emit error, and allow graceful handling. -TypeError [ERR_INVALID_ARG_TYPE]: The "chunk" argument must be of type string or an instance of Buffer or Uint8Array. Received an instance of Object - at _write (node:internal/streams/writable:474:13) - at Writable.write (node:internal/streams/writable:502:10) - at Duplexify._write (/project/node_modules/duplexify/index.js:212:22) - at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) - at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) - at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) - at Pumpify. (/project/node_modules/@google-cloud/speech/build/src/helpers.js:79:27) - at Object.onceWrapper (node:events:633:26) - at Pumpify.emit (node:events:518:28) - at obj. [as _write] (/project/node_modules/stubs/index.js:28:22) - at doWrite (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:390:139) - at writeOrBuffer (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:381:5) - at Writable.write (/project/node_modules/duplexify/node_modules/readable-stream/lib/_stream_writable.js:302:11) - at PassThrough.ondata (node:internal/streams/readable:1007:22) - at PassThrough.emit (node:events:518:28) - at addChunk (node:internal/streams/readable:559:12) { - code: 'ERR_INVALID_ARG_TYPE' - -### Link to the code that reproduces this issue. A link to a **public** Github Repository with a minimal reproduction. - - -https://gist.github.com/orgads/13cbf44c91923da27d8772b5f10489c9 - -### A clear and concise description WHY you expect this behavior, i.e., was it a recent change, there is documentation that points to this behavior, etc. ** - -No library should crash an application this way. \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/package.json b/handwritten/pubsub/.github/scripts/package.json deleted file mode 100644 index 40bcc61b28f..00000000000 --- a/handwritten/pubsub/.github/scripts/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "tests", - "private": true, - "description": "tests for script", - "scripts": { - "test": "mocha tests/close-invalid-link.test.cjs && mocha tests/close-or-remove-response-label.test.cjs" - }, - "author": "Google Inc.", - "license": "Apache-2.0", - "engines": { - "node": ">=18" - }, - "dependencies": { - "js-yaml": "^4.1.0" - }, - "devDependencies": { - "@octokit/rest": "^19.0.0", - "mocha": "^10.0.0", - "sinon": "^18.0.0" - } -} diff --git a/handwritten/pubsub/.github/scripts/remove-response-label.cjs b/handwritten/pubsub/.github/scripts/remove-response-label.cjs deleted file mode 100644 index 4a784ddf7a5..00000000000 --- a/handwritten/pubsub/.github/scripts/remove-response-label.cjs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -module.exports = async ({ github, context }) => { - const commenter = context.actor; - const issue = await github.rest.issues.get({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.issue.number, - }); - const author = issue.data.user.login; - const labels = issue.data.labels.map((e) => e.name); - - if (author === commenter && labels.includes("needs more info")) { - await github.rest.issues.removeLabel({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.issue.number, - name: "needs more info", - }); - } -}; \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/tests/close-invalid-link.test.cjs b/handwritten/pubsub/.github/scripts/tests/close-invalid-link.test.cjs deleted file mode 100644 index f63ee89c811..00000000000 --- a/handwritten/pubsub/.github/scripts/tests/close-invalid-link.test.cjs +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -'use strict'; - -const { describe, it } = require('mocha'); -const closeInvalidLink = require('../close-invalid-link.cjs'); -const fs = require('fs'); -const sinon = require('sinon'); - -describe('close issues with invalid links', () => { - let octokitStub; - let issuesStub; - - beforeEach(() => { - issuesStub = { - get: sinon.stub(), - createComment: sinon.stub(), - update: sinon.stub(), - }; - octokitStub = { - rest: { - issues: issuesStub, - }, - }; - }); - - afterEach(() => { - sinon.restore(); - }); - - it('does not do anything if it is not a bug', async () => { - const context = { repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; - issuesStub.get.resolves({ data: { body: "I'm having a problem with this." } }); - - await closeInvalidLink({ github: octokitStub, context }); - - sinon.assert.calledOnce(issuesStub.get); - sinon.assert.notCalled(issuesStub.createComment); - sinon.assert.notCalled(issuesStub.update); - }); - - it('does not do anything if it is a bug with an appropriate link', async () => { - const context = { repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; - issuesStub.get.resolves({ data: { body: fs.readFileSync('./fixtures/validIssueBody.txt', 'utf-8') } }); - - await closeInvalidLink({ github: octokitStub, context }); - - sinon.assert.calledOnce(issuesStub.get); - sinon.assert.notCalled(issuesStub.createComment); - sinon.assert.notCalled(issuesStub.update); - }); - - it('does not do anything if it is a bug with an appropriate link and the template changes', async () => { - const context = { repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; - issuesStub.get.resolves({ data: { body: fs.readFileSync('./fixtures/validIssueBodyDifferentLinkLocation.txt', 'utf-8') } }); - - await closeInvalidLink({ github: octokitStub, context }); - - sinon.assert.calledOnce(issuesStub.get); - sinon.assert.notCalled(issuesStub.createComment); - sinon.assert.notCalled(issuesStub.update); - }); - - it('closes the issue if the link is invalid', async () => { - const context = { repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; - issuesStub.get.resolves({ data: { body: fs.readFileSync('./fixtures/invalidIssueBody.txt', 'utf-8') } }); - - await closeInvalidLink({ github: octokitStub, context }); - - sinon.assert.calledOnce(issuesStub.get); - sinon.assert.calledOnce(issuesStub.createComment); - sinon.assert.calledOnce(issuesStub.update); - }); -}); \ No newline at end of file diff --git a/handwritten/pubsub/.github/scripts/tests/close-or-remove-response-label.test.cjs b/handwritten/pubsub/.github/scripts/tests/close-or-remove-response-label.test.cjs deleted file mode 100644 index fb092c53619..00000000000 --- a/handwritten/pubsub/.github/scripts/tests/close-or-remove-response-label.test.cjs +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -'use strict'; - -const { describe, it, beforeEach, afterEach } = require('mocha'); -const removeResponseLabel = require('../remove-response-label.cjs'); -const closeUnresponsive = require('../close-unresponsive.cjs'); -const sinon = require('sinon'); - -function getISODateDaysAgo(days) { - const today = new Date(); - const daysAgo = new Date(today.setDate(today.getDate() - days)); - return daysAgo.toISOString(); -} - -describe('close issues or remove needs more info labels', () => { - let octokitStub; - let issuesStub; - let paginateStub; - - beforeEach(() => { - issuesStub = { - listForRepo: sinon.stub(), - update: sinon.stub(), - createComment: sinon.stub(), - get: sinon.stub(), - removeLabel: sinon.stub(), - }; - paginateStub = sinon.stub(); - octokitStub = { - rest: { - issues: issuesStub, - }, - paginate: paginateStub, - }; - }); - - afterEach(() => { - sinon.restore(); - }); - - it('closes the issue if the OP has not responded within the allotted time and there is a needs-more-info label', async () => { - const context = { owner: 'testOrg', repo: 'testRepo' }; - const issuesInRepo = [{ user: { login: 'OP' }, labels: [{ name: 'needs more info' }] }]; - const eventsInIssue = [{ event: 'labeled', label: { name: 'needs more info' }, created_at: getISODateDaysAgo(16) }]; - - issuesStub.listForRepo.resolves({ data: issuesInRepo }); - paginateStub.resolves(eventsInIssue); - - await closeUnresponsive({ github: octokitStub, context }); - - sinon.assert.calledOnce(issuesStub.listForRepo); - sinon.assert.calledOnce(paginateStub); - sinon.assert.calledOnce(issuesStub.update); - sinon.assert.calledOnce(issuesStub.createComment); - }); - - it('does nothing if not enough time has passed and there is a needs-more-info label', async () => { - const context = { owner: 'testOrg', repo: 'testRepo' }; - const issuesInRepo = [{ user: { login: 'OP' }, labels: [{ name: 'needs more info' }] }]; - const eventsInIssue = [{ event: 'labeled', label: { name: 'needs more info' }, created_at: getISODateDaysAgo(14) }]; - - issuesStub.listForRepo.resolves({ data: issuesInRepo }); - paginateStub.resolves(eventsInIssue); - - await closeUnresponsive({ github: octokitStub, context }); - - sinon.assert.calledOnce(issuesStub.listForRepo); - sinon.assert.calledOnce(paginateStub); - sinon.assert.notCalled(issuesStub.update); - sinon.assert.notCalled(issuesStub.createComment); - }); - - it('removes the label if OP responded', async () => { - const context = { actor: 'OP', repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; - const issueContext = { user: {login: 'OP'}, labels: [{ name: 'needs more info' }] }; - - issuesStub.get.resolves({ data: issueContext }); - - await removeResponseLabel({ github: octokitStub, context }); - - sinon.assert.calledOnce(issuesStub.get); - sinon.assert.calledOnce(issuesStub.removeLabel); - }); - - it('does not remove the label if author responded', async () => { - const context = { actor: 'repo-maintainer', repo: { owner: 'testOrg', repo: 'testRepo' }, issue: { number: 1 } }; - const issueContext = { user: {login: 'OP'}, labels: [{ name: 'needs more info' }] }; - - issuesStub.get.resolves({ data: issueContext }); - - await removeResponseLabel({ github: octokitStub, context }); - - sinon.assert.calledOnce(issuesStub.get); - sinon.assert.notCalled(issuesStub.removeLabel); - }); -}); \ No newline at end of file diff --git a/handwritten/pubsub/.github/sync-repo-settings.yaml b/handwritten/pubsub/.github/sync-repo-settings.yaml deleted file mode 100644 index 9e91ffc8acb..00000000000 --- a/handwritten/pubsub/.github/sync-repo-settings.yaml +++ /dev/null @@ -1,19 +0,0 @@ -branchProtectionRules: - - pattern: main - isAdminEnforced: true - requiredApprovingReviewCount: 1 - requiresCodeOwnerReviews: true - requiresStrictStatusChecks: true - requiredStatusCheckContexts: - - "ci/kokoro: Samples test" - - "ci/kokoro: System test" - - lint - - test (18) - - test (20) - - test (22) - - cla/google - - windows - - OwlBot Post Processor -permissionRules: - - team: cloud-sdk-nodejs-team - permission: push diff --git a/handwritten/pubsub/.kokoro/common.cfg b/handwritten/pubsub/.kokoro/common.cfg index dabc141b216..7daf577ef56 100644 --- a/handwritten/pubsub/.kokoro/common.cfg +++ b/handwritten/pubsub/.kokoro/common.cfg @@ -11,7 +11,7 @@ action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" +build_file: "nodejs-pubsub/handwritten/pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { @@ -20,5 +20,5 @@ env_vars: { } env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/test.sh" } diff --git a/handwritten/pubsub/.kokoro/continuous/node18/common.cfg b/handwritten/pubsub/.kokoro/continuous/node18/common.cfg index dabc141b216..7daf577ef56 100644 --- a/handwritten/pubsub/.kokoro/continuous/node18/common.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node18/common.cfg @@ -11,7 +11,7 @@ action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" +build_file: "nodejs-pubsub/handwritten/pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { @@ -20,5 +20,5 @@ env_vars: { } env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/test.sh" } diff --git a/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg b/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg index 219d3808dea..e5a4c9758f9 100644 --- a/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node18/lint.cfg @@ -1,4 +1,4 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/lint.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/lint.sh" } diff --git a/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg index 698013d7caa..dddcd761946 100644 --- a/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node18/samples-test.cfg @@ -3,7 +3,7 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/samples-test.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/samples-test.sh" } env_vars: { diff --git a/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg b/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg index bf759bd3f1a..3da815140ff 100644 --- a/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg +++ b/handwritten/pubsub/.kokoro/continuous/node18/system-test.cfg @@ -3,7 +3,7 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/system-test.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/system-test.sh" } env_vars: { diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg index dabc141b216..7daf577ef56 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node18/common.cfg @@ -11,7 +11,7 @@ action { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" +build_file: "nodejs-pubsub/handwritten/pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { @@ -20,5 +20,5 @@ env_vars: { } env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/test.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/test.sh" } diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg index 698013d7caa..dddcd761946 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node18/samples-test.cfg @@ -3,7 +3,7 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/samples-test.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/samples-test.sh" } env_vars: { diff --git a/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg b/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg index bf759bd3f1a..3da815140ff 100644 --- a/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/node18/system-test.cfg @@ -3,7 +3,7 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-cloud-nodejs" env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/system-test.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/system-test.sh" } env_vars: { diff --git a/handwritten/pubsub/.kokoro/presubmit/windows/test.cfg b/handwritten/pubsub/.kokoro/presubmit/windows/test.cfg index 5ecab9ebede..8b865a1df0f 100644 --- a/handwritten/pubsub/.kokoro/presubmit/windows/test.cfg +++ b/handwritten/pubsub/.kokoro/presubmit/windows/test.cfg @@ -1,2 +1,2 @@ # Use the test file directly -build_file: "nodejs-pubsub/.kokoro/test.bat" +build_file: "nodejs-pubsub/handwritten/pubsub/.kokoro/test.bat" diff --git a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg index b1ebf97bc61..0d8c43d3bcc 100644 --- a/handwritten/pubsub/.kokoro/release/docs-devsite.cfg +++ b/handwritten/pubsub/.kokoro/release/docs-devsite.cfg @@ -18,9 +18,9 @@ env_vars: { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" +build_file: "nodejs-pubsub/handwritten/pubsub/.kokoro/trampoline_v2.sh" env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/release/docs-devsite.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/release/docs-devsite.sh" } diff --git a/handwritten/pubsub/.kokoro/release/docs.cfg b/handwritten/pubsub/.kokoro/release/docs.cfg index ef7147c33ad..97deb73f38c 100644 --- a/handwritten/pubsub/.kokoro/release/docs.cfg +++ b/handwritten/pubsub/.kokoro/release/docs.cfg @@ -18,9 +18,9 @@ env_vars: { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" +build_file: "nodejs-pubsub/handwritten/pubsub/.kokoro/trampoline_v2.sh" env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/release/docs.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/release/docs.sh" } diff --git a/handwritten/pubsub/.kokoro/release/publish.cfg b/handwritten/pubsub/.kokoro/release/publish.cfg index 9ba7de2b386..fc23dd72145 100644 --- a/handwritten/pubsub/.kokoro/release/publish.cfg +++ b/handwritten/pubsub/.kokoro/release/publish.cfg @@ -25,7 +25,7 @@ env_vars: { gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" # Use the trampoline script to run in docker. -build_file: "nodejs-pubsub/.kokoro/trampoline_v2.sh" +build_file: "nodejs-pubsub/handwritten/pubsub/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { @@ -35,7 +35,7 @@ env_vars: { env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/nodejs-pubsub/.kokoro/publish.sh" + value: "github/nodejs-pubsub/handwritten/pubsub/.kokoro/publish.sh" } # Store the packages we uploaded to npmjs.com and their corresponding diff --git a/handwritten/pubsub/.kokoro/trampoline_v2.sh b/handwritten/pubsub/.kokoro/trampoline_v2.sh index 5d6cfcca528..682bdefdb06 100755 --- a/handwritten/pubsub/.kokoro/trampoline_v2.sh +++ b/handwritten/pubsub/.kokoro/trampoline_v2.sh @@ -246,14 +246,34 @@ function repo_root() { if [[ "${RUNNING_IN_CI:-}" == "true" ]]; then PROGRAM_PATH="$(realpath "$0")" PROGRAM_DIR="$(dirname "${PROGRAM_PATH}")" - PROJECT_ROOT="$(repo_root "${PROGRAM_DIR}")" + PROJECT_ROOT="$(repo_root "${PROGRAM_DIR}")/handwritten/pubsub" else - PROJECT_ROOT="$(repo_root $(pwd))" + PROJECT_ROOT="$(repo_root $(pwd))/handwritten/pubsub" fi log_yellow "Changing to the project root: ${PROJECT_ROOT}." cd "${PROJECT_ROOT}" +# Auto-injected conditional check +# Check if the package directory has changes. If not, skip tests. +if [[ "${RUNNING_IN_CI:-}" == "true" ]]; then + # The package path is hardcoded during migration + RELATIVE_PKG_PATH="handwritten/pubsub" + + echo "Checking for changes in ${RELATIVE_PKG_PATH}..." + + # Determine the diff range based on the CI system/event + # Safe default: HEAD~1..HEAD + DIFF_RANGE="HEAD~1..HEAD" + + if git diff --quiet "${DIFF_RANGE}" -- "${RELATIVE_PKG_PATH}"; then + echo "No changes detected in ${RELATIVE_PKG_PATH}. Skipping tests." + exit 0 + else + echo "Changes detected in ${RELATIVE_PKG_PATH}. Proceeding with tests." + fi +fi + # To support relative path for `TRAMPOLINE_SERVICE_ACCOUNT`, we need # to use this environment variable in `PROJECT_ROOT`. if [[ -n "${TRAMPOLINE_SERVICE_ACCOUNT:-}" ]]; then diff --git a/handwritten/pubsub/.repo-metadata.json b/handwritten/pubsub/.repo-metadata.json index c22e77a355b..c2522eb0d8d 100644 --- a/handwritten/pubsub/.repo-metadata.json +++ b/handwritten/pubsub/.repo-metadata.json @@ -2,7 +2,7 @@ "distribution_name": "@google-cloud/pubsub", "release_level": "stable", "product_documentation": "https://cloud.google.com/pubsub/docs/", - "repo": "googleapis/nodejs-pubsub", + "repo": "googleapis/google-cloud-node", "default_version": "v1", "language": "nodejs", "requires_billing": true, diff --git a/handwritten/pubsub/.trampolinerc b/handwritten/pubsub/.trampolinerc index 5fc2253137d..a04ed00bb26 100644 --- a/handwritten/pubsub/.trampolinerc +++ b/handwritten/pubsub/.trampolinerc @@ -49,4 +49,4 @@ if [[ -z "${TRAMPOLINE_BUILD_FILE:-}" ]]; then fi # Secret Manager secrets. -source ${PROJECT_ROOT}/.kokoro/populate-secrets.sh +source ${PROJECT_ROOT}/handwritten/pubsub/.kokoro/populate-secrets.sh diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 48f565af0a6..91675b8c2ce 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -15,7 +15,7 @@ from synthtool.languages import node # Main OwlBot processing. -node.owlbot_main(templates_excludes=[ +node.owlbot_main(relative_dir="handwritten/pubsub",templates_excludes=[ 'src/index.ts', '.github/PULL_REQUEST_TEMPLATE.md', '.github/release-please.yml', diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index a911af2ca14..b093799da99 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -7,7 +7,11 @@ "engines": { "node": ">=18" }, - "repository": "googleapis/nodejs-pubsub", + "repository": { + "type": "git", + "directory": "handwritten/pubsub", + "url": "https://github.com/googleapis/google-cloud-node.git" + }, "main": "./build/src/index.js", "types": "./build/src/index.d.ts", "files": [ @@ -104,5 +108,6 @@ "webpack-cli": "^6.0.1", "why-is-node-running": "^2.3.0", "yargs": "^17.7.2" - } + }, + "homepage": "https://github.com/googleapis/google-cloud-node/tree/main/handwritten/pubsub" } diff --git a/release-please-submodules.json b/release-please-submodules.json index d9f2c666ea7..41dab0b6ba8 100644 --- a/release-please-submodules.json +++ b/release-please-submodules.json @@ -32,6 +32,7 @@ "handwritten/logging-winston": { "component": "logging-winston" }, + "handwritten/pubsub": {}, "handwritten/spanner": { "component": "spanner" }, From 8b93e95f57a552d3a7fa417501d781f40b1d2e56 Mon Sep 17 00:00:00 2001 From: Gautam Sharda Date: Wed, 11 Mar 2026 22:16:43 +0000 Subject: [PATCH 1108/1115] chore: fix rp config and codeowners --- .github/CODEOWNERS | 3 ++- release-please-submodules.json | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1bdf4f3519c..5b89347b626 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,4 +12,5 @@ /handwritten/storage @googleapis/gcs-team /handwritten/firestore @googleapis/firestore-team /handwritten/spanner @googleapis/spanner-team -/handwritten/bigquery-storage @googleapis/bigquery-team/handwritten/pubsub @googleapis/pubsub-team +/handwritten/bigquery-storage @googleapis/bigquery-team +/handwritten/pubsub @googleapis/pubsub-team diff --git a/release-please-submodules.json b/release-please-submodules.json index 41dab0b6ba8..c49a4027f8d 100644 --- a/release-please-submodules.json +++ b/release-please-submodules.json @@ -32,7 +32,9 @@ "handwritten/logging-winston": { "component": "logging-winston" }, - "handwritten/pubsub": {}, + "handwritten/pubsub": { + "component": "pubsub" + }, "handwritten/spanner": { "component": "spanner" }, From 64e894e1e607c7b1ac3508a42813d61b1917bf38 Mon Sep 17 00:00:00 2001 From: Gautam Sharda Date: Wed, 11 Mar 2026 22:19:29 +0000 Subject: [PATCH 1109/1115] chore: fix owlbot_main() arg error via new import --- handwritten/pubsub/owlbot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index 91675b8c2ce..ccd73c5b629 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synthtool.languages import node +import synthtool.languages.node_mono_repo as node # Main OwlBot processing. node.owlbot_main(relative_dir="handwritten/pubsub",templates_excludes=[ From 57ccc7b959399aa8f77984ed73497faaaedfd3db Mon Sep 17 00:00:00 2001 From: Gautam Sharda Date: Wed, 11 Mar 2026 22:32:58 +0000 Subject: [PATCH 1110/1115] chore: fix long dependency --- handwritten/pubsub/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index b093799da99..0292bd6ad28 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -66,6 +66,7 @@ "heap-js": "^2.6.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", + "long": "^5.3.1", "p-defer": "^3.0.0" }, "devDependencies": { From 0576e2e3787cd93290de2f68e8a29d10c6e83f4f Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 11 Mar 2026 22:45:49 +0000 Subject: [PATCH 1111/1115] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBo?= =?UTF-8?q?t=20post-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- handwritten/pubsub/.mocharc.js | 2 +- handwritten/pubsub/.prettierrc.js | 2 +- handwritten/pubsub/README.md | 158 ++---------------------------- 3 files changed, 10 insertions(+), 152 deletions(-) diff --git a/handwritten/pubsub/.mocharc.js b/handwritten/pubsub/.mocharc.js index 0b600509bed..2431859019f 100644 --- a/handwritten/pubsub/.mocharc.js +++ b/handwritten/pubsub/.mocharc.js @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/.prettierrc.js b/handwritten/pubsub/.prettierrc.js index d1b95106f4c..d2eddc2ed89 100644 --- a/handwritten/pubsub/.prettierrc.js +++ b/handwritten/pubsub/.prettierrc.js @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 69ff9cbabc3..6f40803ca2d 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -2,7 +2,7 @@ [//]: # "To regenerate it, use `python -m synthtool`." Google Cloud Platform logo -# [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) +# [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/google-cloud-node/tree/main/handwritten/pubsub) [![release level](https://img.shields.io/badge/release%20level-stable-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.com/package/@google-cloud/pubsub) @@ -10,23 +10,15 @@ -[Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows -you to send and receive messages between independent applications. - -This document contains links to an [API reference](https://cloud.google.com/nodejs/docs/reference/pubsub/latest/overview), samples, -and other resources useful to developing Node.js applications. -For additional help developing Pub/Sub applications, in Node.js and other languages, see our -[Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), -[publisher](https://cloud.google.com/pubsub/docs/publisher), and [subscriber](https://cloud.google.com/pubsub/docs/subscriber) -guides. +Cloud Pub/Sub Client Library for Node.js A comprehensive list of changes in each version may be found in -[the CHANGELOG](https://github.com/googleapis/nodejs-pubsub/blob/main/CHANGELOG.md). +[the CHANGELOG](https://github.com/googleapis/google-cloud-node/tree/main/handwritten/pubsub/CHANGELOG.md). * [Google Cloud Pub/Sub Node.js Client API Reference][client-docs] * [Google Cloud Pub/Sub Documentation][product-docs] -* [github.com/googleapis/nodejs-pubsub](https://github.com/googleapis/nodejs-pubsub) +* [github.com/googleapis/google-cloud-node/handwritten/pubsub](https://github.com/googleapis/google-cloud-node/tree/main/handwritten/pubsub) Read more about the client libraries for Cloud APIs, including the older Google APIs Client Libraries, in [Client Libraries Explained][explained]. @@ -39,8 +31,8 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained]. * [Quickstart](#quickstart) * [Before you begin](#before-you-begin) * [Installing the client library](#installing-the-client-library) - * [Using the client library](#using-the-client-library) -* [Samples](#samples) + + * [Versioning](#versioning) * [Contributing](#contributing) * [License](#license) @@ -62,140 +54,6 @@ npm install @google-cloud/pubsub ``` -### Using the client library - -```javascript -// Imports the Google Cloud client library -const {PubSub} = require('@google-cloud/pubsub'); - -async function quickstart( - projectId = 'your-project-id', // Your Google Cloud Platform project ID - topicNameOrId = 'my-topic', // Name for the new topic to create - subscriptionName = 'my-sub', // Name for the new subscription to create -) { - // Instantiates a client - const pubsub = new PubSub({projectId}); - - // Creates a new topic - const [topic] = await pubsub.createTopic(topicNameOrId); - console.log(`Topic ${topic.name} created.`); - - // Creates a subscription on that new topic - const [subscription] = await topic.createSubscription(subscriptionName); - - // Receive callbacks for new messages on the subscription - subscription.on('message', message => { - console.log('Received message:', message.data.toString()); - process.exit(0); - }); - - // Receive callbacks for errors on the subscription - subscription.on('error', error => { - console.error('Received error:', error); - process.exit(1); - }); - - // Send a message to the topic - await topic.publishMessage({data: Buffer.from('Test message!')}); -} - -``` -## Running gRPC C++ bindings - -For some workflows and environments it might make sense to use the C++ gRPC implementation, -instead of the default one (see: [#770](https://github.com/googleapis/nodejs-pubsub/issues/770)): - -To configure `@google-cloud/pubsub` to use an alternative `grpc` transport: - -1. `npm install grpc`, adding `grpc` as a dependency. -1. instantiate `@google-cloud/pubsub` with `grpc`: - - ```js - const {PubSub} = require('@google-cloud/pubsub'); - const grpc = require('grpc'); - const pubsub = new PubSub({grpc}); - ``` - - -## Samples - -Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree/main/samples) directory. Each sample's `README.md` has instructions for running its sample. - -| Sample | Source Code | Try it | -| --------------------------- | --------------------------------- | ------ | -| Close Subscription with Timeout | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/closeSubscriptionWithTimeout.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/closeSubscriptionWithTimeout.js,samples/README.md) | -| Commit an Avro-Based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/commitAvroSchema.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/commitAvroSchema.js,samples/README.md) | -| Commit an Proto-Based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/commitProtoSchema.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/commitProtoSchema.js,samples/README.md) | -| Create an Avro based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createAvroSchema.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/createAvroSchema.js,samples/README.md) | -| Create BigQuery Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createBigQuerySubscription.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/createBigQuerySubscription.js,samples/README.md) | -| Create a Proto based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createProtoSchema.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/createProtoSchema.js,samples/README.md) | -| 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 Push Subscription With No Wrapper | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createPushSubscriptionNoWrapper.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/createPushSubscriptionNoWrapper.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 a Cloud Storage subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithCloudStorage.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/createSubscriptionWithCloudStorage.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 Subscription With Retry Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithRetryPolicy.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/createSubscriptionWithRetryPolicy.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) | -| Create Topic With AWS MSK Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithAwsMskIngestion.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/createTopicWithAwsMskIngestion.js,samples/README.md) | -| Create Topic With Azure Event Hubs Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithAzureEventHubsIngestion.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/createTopicWithAzureEventHubsIngestion.js,samples/README.md) | -| Create Topic With Cloud Storage Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithCloudStorageIngestion.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/createTopicWithCloudStorageIngestion.js,samples/README.md) | -| Create Topic With Confluent Cloud Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithConfluentCloudIngestion.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/createTopicWithConfluentCloudIngestion.js,samples/README.md) | -| Create Topic With Kinesis Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithKinesisIngestion.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/createTopicWithKinesisIngestion.js,samples/README.md) | -| Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | -| Create Topic With Schema Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchemaRevisions.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/createTopicWithSchemaRevisions.js,samples/README.md) | -| Delete a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchema.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/deleteSchema.js,samples/README.md) | -| Delete a Schema Revision | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchemaRevision.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/deleteSchemaRevision.js,samples/README.md) | -| Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | -| Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | -| Detach Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/detachSubscription.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/detachSubscription.js,samples/README.md) | -| Get a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSchema.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/getSchema.js,samples/README.md) | -| Get a previously created schema revision | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSchemaRevision.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/getSchemaRevision.js,samples/README.md) | -| Get Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSubscription.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/getSubscription.js,samples/README.md) | -| Get Subscription Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSubscriptionPolicy.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/getSubscriptionPolicy.js,samples/README.md) | -| Get Topic Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getTopicPolicy.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/getTopicPolicy.js,samples/README.md) | -| List All Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listAllTopics.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/listAllTopics.js,samples/README.md) | -| List Revisions on a Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSchemaRevisions.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/listSchemaRevisions.js,samples/README.md) | -| List schemas on a project | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSchemas.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/listSchemas.js,samples/README.md) | -| List Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSubscriptions.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/listSubscriptions.js,samples/README.md) | -| List Subscriptions On a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listTopicSubscriptions.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/listTopicSubscriptions.js,samples/README.md) | -| 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 Avro Records With Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenForAvroRecordsWithRevisions.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/listenForAvroRecordsWithRevisions.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) | -| Subscribe with OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenWithOpenTelemetryTracing.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/listenWithOpenTelemetryTracing.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) | -| Optimistic Subscribe | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/optimisticSubscribe.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/optimisticSubscribe.js,samples/README.md) | -| Publish Avro Records to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishAvroRecords.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/publishAvroRecords.js,samples/README.md) | -| Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | -| Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessage.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/publishMessage.js,samples/README.md) | -| Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | -| Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | -| Publish Protobuf Messages to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishProtobufMessages.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/publishProtobufMessages.js,samples/README.md) | -| Publish with flow control | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithFlowControl.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/publishWithFlowControl.js,samples/README.md) | -| Publish with OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithOpenTelemetryTracing.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/publishWithOpenTelemetryTracing.js,samples/README.md) | -| Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | -| Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/quickstart.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/quickstart.js,samples/README.md) | -| Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | -| Resume Publish | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/resumePublish.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/resumePublish.js,samples/README.md) | -| Rollback a Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/rollbackSchema.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/rollbackSchema.js,samples/README.md) | -| Set Subscription IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/setSubscriptionPolicy.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/setSubscriptionPolicy.js,samples/README.md) | -| Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | -| Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | -| Synchronous Pull | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPull.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/synchronousPull.js,samples/README.md) | -| Synchronous Pull with delivery attempt. | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPullWithDeliveryAttempts.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/synchronousPullWithDeliveryAttempts.js,samples/README.md) | -| Synchronous Pull With Lease Management | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPullWithLeaseManagement.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/synchronousPullWithLeaseManagement.js,samples/README.md) | -| Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | -| Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | -| Update Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateDeadLetterPolicy.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/updateDeadLetterPolicy.js,samples/README.md) | -| Update Topic Ingestion Type | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateTopicIngestionType.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/updateTopicIngestionType.js,samples/README.md) | -| Update Topic Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateTopicSchema.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/updateTopicSchema.js,samples/README.md) | -| Validate a schema definition | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/validateSchema.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/validateSchema.js,samples/README.md) | @@ -245,7 +103,7 @@ More Information: [Google Cloud Platform Launch Stages][launch_stages] ## Contributing -Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-pubsub/blob/main/CONTRIBUTING.md). +Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/google-cloud-node/blob/main/CONTRIBUTING.md). Please note that this `README.md`, the `samples/README.md`, and a variety of configuration files in this repository (including `.nycrc` and `tsconfig.json`) @@ -257,7 +115,7 @@ to its templates in Apache Version 2.0 -See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/main/LICENSE) +See [LICENSE](https://github.com/googleapis/google-cloud-node/blob/main/LICENSE) [client-docs]: https://cloud.google.com/nodejs/docs/reference/pubsub/latest [product-docs]: https://cloud.google.com/pubsub/docs/ From a35e846735c30bf2d077c0ab0016dbba53831637 Mon Sep 17 00:00:00 2001 From: Gautam Sharda Date: Wed, 11 Mar 2026 22:47:01 +0000 Subject: [PATCH 1112/1115] chore: maintain original README --- handwritten/pubsub/README.md | 2 +- handwritten/pubsub/owlbot.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 69ff9cbabc3..9c27ffdc040 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -265,4 +265,4 @@ See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/main/LICENSE) [projects]: https://console.cloud.google.com/project [billing]: https://support.google.com/cloud/answer/6293499#enable-billing [enable_api]: https://console.cloud.google.com/flows/enableapi?apiid=pubsub.googleapis.com -[auth]: https://cloud.google.com/docs/authentication/external/set-up-adc-local +[auth]: https://cloud.google.com/docs/authentication/external/set-up-adc-local \ No newline at end of file diff --git a/handwritten/pubsub/owlbot.py b/handwritten/pubsub/owlbot.py index ccd73c5b629..67e7eb9d884 100644 --- a/handwritten/pubsub/owlbot.py +++ b/handwritten/pubsub/owlbot.py @@ -23,5 +23,6 @@ '.github/workflows/ci.yaml', '.eslintignore', '.OwlBot.yaml', - 'renovate.json' + 'renovate.json', + "README.md" ]) From c85f86859cc68bd8c35d1726962c8f69474885d5 Mon Sep 17 00:00:00 2001 From: Gautam Sharda Date: Wed, 11 Mar 2026 23:11:18 +0000 Subject: [PATCH 1113/1115] chore: add google-logging-utils dep --- handwritten/pubsub/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/handwritten/pubsub/package.json b/handwritten/pubsub/package.json index 0292bd6ad28..617dabc9f63 100644 --- a/handwritten/pubsub/package.json +++ b/handwritten/pubsub/package.json @@ -63,6 +63,7 @@ "extend": "^3.0.2", "google-auth-library": "^10.5.0", "google-gax": "^5.0.5", + "google-logging-utils": "^1.1.3", "heap-js": "^2.6.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", From bdcf71fb6f80f4d9c22954ac2ed52296b1927bf1 Mon Sep 17 00:00:00 2001 From: Gautam Sharda Date: Thu, 12 Mar 2026 07:46:11 +0000 Subject: [PATCH 1114/1115] chore: revert to original readme --- handwritten/pubsub/README.md | 158 +++++++++++++++++++++++++++++++++-- 1 file changed, 150 insertions(+), 8 deletions(-) diff --git a/handwritten/pubsub/README.md b/handwritten/pubsub/README.md index 8290b8a1f9c..9c27ffdc040 100644 --- a/handwritten/pubsub/README.md +++ b/handwritten/pubsub/README.md @@ -2,7 +2,7 @@ [//]: # "To regenerate it, use `python -m synthtool`." Google Cloud Platform logo -# [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/google-cloud-node/tree/main/handwritten/pubsub) +# [Google Cloud Pub/Sub: Node.js Client](https://github.com/googleapis/nodejs-pubsub) [![release level](https://img.shields.io/badge/release%20level-stable-brightgreen.svg?style=flat)](https://cloud.google.com/terms/launch-stages) [![npm version](https://img.shields.io/npm/v/@google-cloud/pubsub.svg)](https://www.npmjs.com/package/@google-cloud/pubsub) @@ -10,15 +10,23 @@ -Cloud Pub/Sub Client Library for Node.js +[Cloud Pub/Sub](https://cloud.google.com/pubsub/docs) is a fully-managed real-time messaging service that allows +you to send and receive messages between independent applications. + +This document contains links to an [API reference](https://cloud.google.com/nodejs/docs/reference/pubsub/latest/overview), samples, +and other resources useful to developing Node.js applications. +For additional help developing Pub/Sub applications, in Node.js and other languages, see our +[Pub/Sub quickstart](https://cloud.google.com/pubsub/docs/quickstart-client-libraries), +[publisher](https://cloud.google.com/pubsub/docs/publisher), and [subscriber](https://cloud.google.com/pubsub/docs/subscriber) +guides. A comprehensive list of changes in each version may be found in -[the CHANGELOG](https://github.com/googleapis/google-cloud-node/tree/main/handwritten/pubsub/CHANGELOG.md). +[the CHANGELOG](https://github.com/googleapis/nodejs-pubsub/blob/main/CHANGELOG.md). * [Google Cloud Pub/Sub Node.js Client API Reference][client-docs] * [Google Cloud Pub/Sub Documentation][product-docs] -* [github.com/googleapis/google-cloud-node/handwritten/pubsub](https://github.com/googleapis/google-cloud-node/tree/main/handwritten/pubsub) +* [github.com/googleapis/nodejs-pubsub](https://github.com/googleapis/nodejs-pubsub) Read more about the client libraries for Cloud APIs, including the older Google APIs Client Libraries, in [Client Libraries Explained][explained]. @@ -31,8 +39,8 @@ Google APIs Client Libraries, in [Client Libraries Explained][explained]. * [Quickstart](#quickstart) * [Before you begin](#before-you-begin) * [Installing the client library](#installing-the-client-library) - - + * [Using the client library](#using-the-client-library) +* [Samples](#samples) * [Versioning](#versioning) * [Contributing](#contributing) * [License](#license) @@ -54,6 +62,140 @@ npm install @google-cloud/pubsub ``` +### Using the client library + +```javascript +// Imports the Google Cloud client library +const {PubSub} = require('@google-cloud/pubsub'); + +async function quickstart( + projectId = 'your-project-id', // Your Google Cloud Platform project ID + topicNameOrId = 'my-topic', // Name for the new topic to create + subscriptionName = 'my-sub', // Name for the new subscription to create +) { + // Instantiates a client + const pubsub = new PubSub({projectId}); + + // Creates a new topic + const [topic] = await pubsub.createTopic(topicNameOrId); + console.log(`Topic ${topic.name} created.`); + + // Creates a subscription on that new topic + const [subscription] = await topic.createSubscription(subscriptionName); + + // Receive callbacks for new messages on the subscription + subscription.on('message', message => { + console.log('Received message:', message.data.toString()); + process.exit(0); + }); + + // Receive callbacks for errors on the subscription + subscription.on('error', error => { + console.error('Received error:', error); + process.exit(1); + }); + + // Send a message to the topic + await topic.publishMessage({data: Buffer.from('Test message!')}); +} + +``` +## Running gRPC C++ bindings + +For some workflows and environments it might make sense to use the C++ gRPC implementation, +instead of the default one (see: [#770](https://github.com/googleapis/nodejs-pubsub/issues/770)): + +To configure `@google-cloud/pubsub` to use an alternative `grpc` transport: + +1. `npm install grpc`, adding `grpc` as a dependency. +1. instantiate `@google-cloud/pubsub` with `grpc`: + + ```js + const {PubSub} = require('@google-cloud/pubsub'); + const grpc = require('grpc'); + const pubsub = new PubSub({grpc}); + ``` + + +## Samples + +Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree/main/samples) directory. Each sample's `README.md` has instructions for running its sample. + +| Sample | Source Code | Try it | +| --------------------------- | --------------------------------- | ------ | +| Close Subscription with Timeout | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/closeSubscriptionWithTimeout.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/closeSubscriptionWithTimeout.js,samples/README.md) | +| Commit an Avro-Based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/commitAvroSchema.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/commitAvroSchema.js,samples/README.md) | +| Commit an Proto-Based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/commitProtoSchema.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/commitProtoSchema.js,samples/README.md) | +| Create an Avro based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createAvroSchema.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/createAvroSchema.js,samples/README.md) | +| Create BigQuery Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createBigQuerySubscription.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/createBigQuerySubscription.js,samples/README.md) | +| Create a Proto based Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createProtoSchema.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/createProtoSchema.js,samples/README.md) | +| 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 Push Subscription With No Wrapper | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createPushSubscriptionNoWrapper.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/createPushSubscriptionNoWrapper.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 a Cloud Storage subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithCloudStorage.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/createSubscriptionWithCloudStorage.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 Subscription With Retry Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithRetryPolicy.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/createSubscriptionWithRetryPolicy.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) | +| Create Topic With AWS MSK Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithAwsMskIngestion.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/createTopicWithAwsMskIngestion.js,samples/README.md) | +| Create Topic With Azure Event Hubs Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithAzureEventHubsIngestion.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/createTopicWithAzureEventHubsIngestion.js,samples/README.md) | +| Create Topic With Cloud Storage Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithCloudStorageIngestion.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/createTopicWithCloudStorageIngestion.js,samples/README.md) | +| Create Topic With Confluent Cloud Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithConfluentCloudIngestion.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/createTopicWithConfluentCloudIngestion.js,samples/README.md) | +| Create Topic With Kinesis Ingestion | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithKinesisIngestion.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/createTopicWithKinesisIngestion.js,samples/README.md) | +| Create Topic With Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchema.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/createTopicWithSchema.js,samples/README.md) | +| Create Topic With Schema Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopicWithSchemaRevisions.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/createTopicWithSchemaRevisions.js,samples/README.md) | +| Delete a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchema.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/deleteSchema.js,samples/README.md) | +| Delete a Schema Revision | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSchemaRevision.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/deleteSchemaRevision.js,samples/README.md) | +| Delete Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteSubscription.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/deleteSubscription.js,samples/README.md) | +| Delete Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/deleteTopic.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/deleteTopic.js,samples/README.md) | +| Detach Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/detachSubscription.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/detachSubscription.js,samples/README.md) | +| Get a previously created schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSchema.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/getSchema.js,samples/README.md) | +| Get a previously created schema revision | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSchemaRevision.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/getSchemaRevision.js,samples/README.md) | +| Get Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSubscription.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/getSubscription.js,samples/README.md) | +| Get Subscription Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getSubscriptionPolicy.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/getSubscriptionPolicy.js,samples/README.md) | +| Get Topic Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/getTopicPolicy.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/getTopicPolicy.js,samples/README.md) | +| List All Topics | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listAllTopics.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/listAllTopics.js,samples/README.md) | +| List Revisions on a Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSchemaRevisions.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/listSchemaRevisions.js,samples/README.md) | +| List schemas on a project | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSchemas.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/listSchemas.js,samples/README.md) | +| List Subscriptions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listSubscriptions.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/listSubscriptions.js,samples/README.md) | +| List Subscriptions On a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listTopicSubscriptions.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/listTopicSubscriptions.js,samples/README.md) | +| 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 Avro Records With Revisions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenForAvroRecordsWithRevisions.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/listenForAvroRecordsWithRevisions.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) | +| Subscribe with OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenWithOpenTelemetryTracing.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/listenWithOpenTelemetryTracing.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) | +| Optimistic Subscribe | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/optimisticSubscribe.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/optimisticSubscribe.js,samples/README.md) | +| Publish Avro Records to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishAvroRecords.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/publishAvroRecords.js,samples/README.md) | +| Publish Batched Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishBatchedMessages.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/publishBatchedMessages.js,samples/README.md) | +| Publish Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessage.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/publishMessage.js,samples/README.md) | +| Publish Message With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishMessageWithCustomAttributes.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/publishMessageWithCustomAttributes.js,samples/README.md) | +| Publish Ordered Message | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishOrderedMessage.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/publishOrderedMessage.js,samples/README.md) | +| Publish Protobuf Messages to a Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishProtobufMessages.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/publishProtobufMessages.js,samples/README.md) | +| Publish with flow control | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithFlowControl.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/publishWithFlowControl.js,samples/README.md) | +| Publish with OpenTelemetry Tracing | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithOpenTelemetryTracing.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/publishWithOpenTelemetryTracing.js,samples/README.md) | +| Publish With Retry Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/publishWithRetrySettings.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/publishWithRetrySettings.js,samples/README.md) | +| Quickstart | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/quickstart.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/quickstart.js,samples/README.md) | +| Remove Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/removeDeadLetterPolicy.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/removeDeadLetterPolicy.js,samples/README.md) | +| Resume Publish | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/resumePublish.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/resumePublish.js,samples/README.md) | +| Rollback a Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/rollbackSchema.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/rollbackSchema.js,samples/README.md) | +| Set Subscription IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/setSubscriptionPolicy.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/setSubscriptionPolicy.js,samples/README.md) | +| Set Topic IAM Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/setTopicPolicy.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/setTopicPolicy.js,samples/README.md) | +| Subscribe With Flow Control Settings | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/subscribeWithFlowControlSettings.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/subscribeWithFlowControlSettings.js,samples/README.md) | +| Synchronous Pull | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPull.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/synchronousPull.js,samples/README.md) | +| Synchronous Pull with delivery attempt. | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPullWithDeliveryAttempts.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/synchronousPullWithDeliveryAttempts.js,samples/README.md) | +| Synchronous Pull With Lease Management | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/synchronousPullWithLeaseManagement.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/synchronousPullWithLeaseManagement.js,samples/README.md) | +| Test Subscription Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testSubscriptionPermissions.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/testSubscriptionPermissions.js,samples/README.md) | +| Test Topic Permissions | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/testTopicPermissions.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/testTopicPermissions.js,samples/README.md) | +| Update Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateDeadLetterPolicy.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/updateDeadLetterPolicy.js,samples/README.md) | +| Update Topic Ingestion Type | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateTopicIngestionType.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/updateTopicIngestionType.js,samples/README.md) | +| Update Topic Schema | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/updateTopicSchema.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/updateTopicSchema.js,samples/README.md) | +| Validate a schema definition | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/validateSchema.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/validateSchema.js,samples/README.md) | @@ -103,7 +245,7 @@ More Information: [Google Cloud Platform Launch Stages][launch_stages] ## Contributing -Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/google-cloud-node/blob/main/CONTRIBUTING.md). +Contributions welcome! See the [Contributing Guide](https://github.com/googleapis/nodejs-pubsub/blob/main/CONTRIBUTING.md). Please note that this `README.md`, the `samples/README.md`, and a variety of configuration files in this repository (including `.nycrc` and `tsconfig.json`) @@ -115,7 +257,7 @@ to its templates in Apache Version 2.0 -See [LICENSE](https://github.com/googleapis/google-cloud-node/blob/main/LICENSE) +See [LICENSE](https://github.com/googleapis/nodejs-pubsub/blob/main/LICENSE) [client-docs]: https://cloud.google.com/nodejs/docs/reference/pubsub/latest [product-docs]: https://cloud.google.com/pubsub/docs/ From 1bd7b1873eea8b3790f1f0bdf793a0b972e99977 Mon Sep 17 00:00:00 2001 From: Gautam Sharda Date: Thu, 12 Mar 2026 08:00:21 +0000 Subject: [PATCH 1115/1115] chore: fix regex as per codeQL rec --- handwritten/pubsub/src/pubsub.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handwritten/pubsub/src/pubsub.ts b/handwritten/pubsub/src/pubsub.ts index 68a905255b6..c250d9da665 100644 --- a/handwritten/pubsub/src/pubsub.ts +++ b/handwritten/pubsub/src/pubsub.ts @@ -806,7 +806,7 @@ export class PubSub { // Parse the URL into a hostname and port, if possible. const leadingProtocol = new RegExp('^https?://'); - const trailingSlashes = new RegExp('/*$'); + const trailingSlashes = new RegExp('(?